diff --git a/.editorconfig b/.editorconfig
index ccc6a28..242859d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,6 @@ indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[composer.json]
+indent_size = 4
diff --git a/.htaccess b/.htaccess
index 974999a..f4024c6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,7 +3,7 @@
 #
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\..*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock))$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
+<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock))$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -93,7 +93,7 @@ AddEncoding gzip svgz
   # If you do not have mod_rewrite installed, you should remove these
   # directories from your webroot or otherwise protect them from being
   # downloaded.
-  RewriteRule "(^|/)\." - [F]
+  RewriteRule "(^|/)\.(?!well-known)" - [F]
 
   # If your site can be accessed both with and without the 'www.' prefix, you
   # can use one of the following settings to redirect users to your preferred
diff --git a/composer.json b/composer.json
index 7f170ce..727e031 100644
--- a/composer.json
+++ b/composer.json
@@ -1,44 +1,44 @@
 {
-  "name": "drupal/drupal",
-  "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-  "type": "project",
-  "license": "GPL-2.0+",
-  "require": {
-    "composer/installers": "^1.0.21",
-    "wikimedia/composer-merge-plugin": "~1.3"
-  },
-  "replace": {
-    "drupal/core": "~8.0"
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "config": {
-    "preferred-install": "dist",
-    "autoloader-suffix": "Drupal8"
-  },
-  "extra": {
-    "_readme": [
-      "By default Drupal loads the autoloader from ./vendor/autoload.php.",
-      "To change the autoloader you can edit ./autoload.php."
-    ],
-    "merge-plugin": {
-      "include": [
-        "core/composer.json"
-      ],
-      "recurse": false,
-      "replace": false,
-      "merge-extra": false
+    "name": "drupal/drupal",
+    "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+    "type": "project",
+    "license": "GPL-2.0+",
+    "require": {
+        "composer/installers": "^1.0.21",
+        "wikimedia/composer-merge-plugin": "~1.3"
+    },
+    "replace": {
+        "drupal/core": "~8.2"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "config": {
+        "preferred-install": "dist",
+        "autoloader-suffix": "Drupal8"
+    },
+    "extra": {
+        "_readme": [
+            "By default Drupal loads the autoloader from ./vendor/autoload.php.",
+            "To change the autoloader you can edit ./autoload.php."
+        ],
+        "merge-plugin": {
+            "include": [
+                "core/composer.json"
+            ],
+            "recurse": false,
+            "replace": false,
+            "merge-extra": false
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
+        }
+    },
+    "scripts": {
+        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
+        "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess",
+        "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup",
+        "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup"
     }
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
-    }
-  },
-  "scripts": {
-    "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
-    "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess",
-    "post-package-install": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup",
-    "post-package-update": "Drupal\\Core\\Composer\\Composer::vendorTestCodeCleanup"
-  }
 }
diff --git a/composer.lock b/composer.lock
index e20eaab..10bec80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "dac77f10c1f7585fd1f7344c6a376338",
+    "hash": "8ac71fcd7128b95405b61f3ce16fc769",
     "content-hash": "73cbcb262208c5d802cb528279f2a95c",
     "packages": [
         {
@@ -848,6 +848,48 @@
             "time": "2015-08-15 19:32:36"
         },
         {
+            "name": "ircmaxell/password-compat",
+            "version": "v1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ircmaxell/password_compat.git",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/password.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthony Ferrara",
+                    "email": "ircmaxell@php.net",
+                    "homepage": "http://blog.ircmaxell.com"
+                }
+            ],
+            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
+            "homepage": "https://github.com/ircmaxell/password_compat",
+            "keywords": [
+                "hashing",
+                "password"
+            ],
+            "time": "2014-11-20 16:49:30"
+        },
+        {
             "name": "masterminds/html5",
             "version": "2.1.2",
             "source": {
@@ -913,6 +955,54 @@
             "time": "2015-06-07 08:43:18"
         },
         {
+            "name": "paragonie/random_compat",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/a208865a5aeffc2dbbef2a5b3409887272d93f32",
+                "reference": "a208865a5aeffc2dbbef2a5b3409887272d93f32",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/random.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2015-12-01 02:52:15"
+        },
+        {
             "name": "psr/http-message",
             "version": "1.0",
             "source": {
@@ -1107,34 +1197,37 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4"
+                "reference": "98e9089a428ed0e39423b67352c57ef5910a3269"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/320f8d2a9cdbcbeb24be602c124aae9d998474a4",
-                "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/98e9089a428ed0e39423b67352c57ef5910a3269",
+                "reference": "98e9089a428ed0e39423b67352c57ef5910a3269",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9"
             },
             "require-dev": {
-                "symfony/finder": "~2.0,>=2.0.5"
+                "symfony/finder": "~2.0,>=2.0.5|~3.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\ClassLoader\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1152,29 +1245,30 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-23 14:47:27"
+            "time": "2016-01-03 15:33:41"
         },
         {
             "name": "symfony/console",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5efd632294c8320ea52492db22292ff853a43766"
+                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766",
-                "reference": "5efd632294c8320ea52492db22292ff853a43766",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
+                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/process": "~2.1"
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -1184,13 +1278,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Console\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1208,7 +1305,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-20 14:38:46"
+            "time": "2016-01-14 08:33:16"
         },
         {
             "name": "symfony/debug",
@@ -1266,16 +1363,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "af284e795ec8a08c80d1fc47518fd23004b89847"
+                "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/af284e795ec8a08c80d1fc47518fd23004b89847",
-                "reference": "af284e795ec8a08c80d1fc47518fd23004b89847",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ba94a914e244e0d05f0aaef460d5558d5541d2b1",
+                "reference": "ba94a914e244e0d05f0aaef460d5558d5541d2b1",
                 "shasum": ""
             },
             "require": {
@@ -1285,9 +1382,9 @@
                 "symfony/expression-language": "<2.6"
             },
             "require-dev": {
-                "symfony/config": "~2.2",
-                "symfony/expression-language": "~2.6",
-                "symfony/yaml": "~2.1"
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/yaml": "~2.1|~3.0.0"
             },
             "suggest": {
                 "symfony/config": "",
@@ -1297,13 +1394,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\DependencyInjection\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1321,20 +1421,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-27 15:38:06"
+            "time": "2016-01-12 17:46:01"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8"
+                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8",
-                "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda",
+                "reference": "ee278f7c851533e58ca307f66305ccb9188aceda",
                 "shasum": ""
             },
             "require": {
@@ -1342,10 +1442,10 @@
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5",
-                "symfony/dependency-injection": "~2.6",
-                "symfony/expression-language": "~2.6",
-                "symfony/stopwatch": "~2.3"
+                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -1354,13 +1454,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1378,40 +1481,42 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-11 09:39:48"
+            "time": "2016-01-13 10:28:07"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "7598eea151ae3d4134df1f9957364b17809eea75"
+                "reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7598eea151ae3d4134df1f9957364b17809eea75",
-                "reference": "7598eea151ae3d4134df1f9957364b17809eea75",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9194b33c71da8ef4d05d22964376f2f9c95a1bfd",
+                "reference": "9194b33c71da8ef4d05d22964376f2f9c95a1bfd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-php54": "~1.0",
+                "symfony/polyfill-php55": "~1.0"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.4"
+                "symfony/expression-language": "~2.4|~3.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\HttpFoundation\\": ""
                 },
-                "classmap": [
-                    "Resources/stubs"
+                "exclude-from-classmap": [
+                    "/Tests/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1430,48 +1535,48 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-23 14:47:27"
+            "time": "2016-01-13 10:28:07"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77"
+                "reference": "dbe146efdc040dc87cc730a926c7858bb3c3b3bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4260f2273a446a6715063dc9ca89fd0c475c2f77",
-                "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/dbe146efdc040dc87cc730a926c7858bb3c3b3bc",
+                "reference": "dbe146efdc040dc87cc730a926c7858bb3c3b3bc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
                 "psr/log": "~1.0",
                 "symfony/debug": "~2.6,>=2.6.2",
-                "symfony/event-dispatcher": "~2.6,>=2.6.7",
-                "symfony/http-foundation": "~2.5,>=2.5.4"
+                "symfony/event-dispatcher": "~2.6,>=2.6.7|~3.0.0",
+                "symfony/http-foundation": "~2.5,>=2.5.4|~3.0.0"
             },
             "conflict": {
                 "symfony/config": "<2.7"
             },
             "require-dev": {
-                "symfony/browser-kit": "~2.3",
-                "symfony/class-loader": "~2.1",
-                "symfony/config": "~2.7",
-                "symfony/console": "~2.3",
-                "symfony/css-selector": "~2.0,>=2.0.5",
-                "symfony/dependency-injection": "~2.2",
-                "symfony/dom-crawler": "~2.0,>=2.0.5",
-                "symfony/expression-language": "~2.4",
-                "symfony/finder": "~2.0,>=2.0.5",
-                "symfony/process": "~2.0,>=2.0.5",
-                "symfony/routing": "~2.2",
-                "symfony/stopwatch": "~2.3",
-                "symfony/templating": "~2.2",
-                "symfony/translation": "~2.0,>=2.0.5",
-                "symfony/var-dumper": "~2.6"
+                "symfony/browser-kit": "~2.3|~3.0.0",
+                "symfony/class-loader": "~2.1|~3.0.0",
+                "symfony/config": "~2.8",
+                "symfony/console": "~2.3|~3.0.0",
+                "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.8|~3.0.0",
+                "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/process": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/routing": "~2.8|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0",
+                "symfony/templating": "~2.2|~3.0.0",
+                "symfony/translation": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/var-dumper": "~2.6|~3.0.0"
             },
             "suggest": {
                 "symfony/browser-kit": "",
@@ -1485,13 +1590,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\HttpKernel\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1509,20 +1617,252 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-27 19:07:21"
+            "time": "2016-01-14 12:00:59"
+        },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "be8627f0936f86fed0bec16fe79ebb4337299764"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/be8627f0936f86fed0bec16fe79ebb4337299764",
+                "reference": "be8627f0936f86fed0bec16fe79ebb4337299764",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "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"
+            ],
+            "time": "2016-01-20 09:13:37"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "1289d16209491b584839022f29257ad859b8532d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "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 Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-01-20 09:13:37"
+        },
+        {
+            "name": "symfony/polyfill-php54",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php54.git",
+                "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054",
+                "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php54\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "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 backporting some PHP 5.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-01-20 09:13:37"
+        },
+        {
+            "name": "symfony/polyfill-php55",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php55.git",
+                "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
+                "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6",
+                "shasum": ""
+            },
+            "require": {
+                "ircmaxell/password-compat": "~1.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php55\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "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 5.5+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-01-20 09:13:37"
         },
         {
             "name": "symfony/process",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
+                "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
-                "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
+                "reference": "6f1979c3b0f4c22c77a8a8971afaa7dd07f082ac",
                 "shasum": ""
             },
             "require": {
@@ -1531,13 +1871,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Process\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1555,7 +1898,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-23 14:47:27"
+            "time": "2016-01-06 09:59:23"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -1613,16 +1956,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "f353e1f588679c3ec987624e6c617646bd01ba38"
+                "reference": "5451a8a1874fd4e6a4dd347ea611d86cd8441735"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/f353e1f588679c3ec987624e6c617646bd01ba38",
-                "reference": "f353e1f588679c3ec987624e6c617646bd01ba38",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/5451a8a1874fd4e6a4dd347ea611d86cd8441735",
+                "reference": "5451a8a1874fd4e6a4dd347ea611d86cd8441735",
                 "shasum": ""
             },
             "require": {
@@ -1635,27 +1978,31 @@
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.7",
-                "symfony/expression-language": "~2.4",
-                "symfony/http-foundation": "~2.3",
-                "symfony/yaml": "~2.0,>=2.0.5"
+                "symfony/config": "~2.7|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.3|~3.0.0",
+                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
                 "symfony/config": "For using the all-in-one router or any loader",
+                "symfony/dependency-injection": "For loading routes from a service",
                 "symfony/expression-language": "For using expression matching",
                 "symfony/yaml": "For using the YAML loader"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Routing\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1679,31 +2026,32 @@
                 "uri",
                 "url"
             ],
-            "time": "2015-10-27 15:38:06"
+            "time": "2016-01-11 16:43:36"
         },
         {
             "name": "symfony/serializer",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "14056684acad23b8815eb336bccc0b4ac76bd823"
+                "reference": "60d6ea54abf865ab8efa9811e6c146e71f8bdbff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/14056684acad23b8815eb336bccc0b4ac76bd823",
-                "reference": "14056684acad23b8815eb336bccc0b4ac76bd823",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/60d6ea54abf865ab8efa9811e6c146e71f8bdbff",
+                "reference": "60d6ea54abf865ab8efa9811e6c146e71f8bdbff",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-php55": "~1.0"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "symfony/config": "~2.2",
-                "symfony/property-access": "~2.3",
-                "symfony/yaml": "~2.0,>=2.0.5"
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@@ -1715,13 +2063,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Serializer\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1739,33 +2090,34 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-11 09:39:48"
+            "time": "2016-01-13 10:28:07"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8"
+                "reference": "bc0b666903944858f4ffec01c4e50c63e5c276c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
-                "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/bc0b666903944858f4ffec01c4e50c63e5c276c0",
+                "reference": "bc0b666903944858f4ffec01c4e50c63e5c276c0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
                 "symfony/config": "<2.7"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.7",
-                "symfony/intl": "~2.4",
-                "symfony/yaml": "~2.2"
+                "symfony/config": "~2.8",
+                "symfony/intl": "~2.4|~3.0.0",
+                "symfony/yaml": "~2.2|~3.0.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -1775,13 +2127,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Translation\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1799,37 +2154,36 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-27 15:38:06"
+            "time": "2016-01-03 15:33:41"
         },
         {
             "name": "symfony/validator",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "df9021e689aa3d08367881e7f8917219fabe5e64"
+                "reference": "7a325d73cb492d244d9107406fe40650ac070a04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/df9021e689aa3d08367881e7f8917219fabe5e64",
-                "reference": "df9021e689aa3d08367881e7f8917219fabe5e64",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/7a325d73cb492d244d9107406fe40650ac070a04",
+                "reference": "7a325d73cb492d244d9107406fe40650ac070a04",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9",
-                "symfony/translation": "~2.4"
+                "symfony/translation": "~2.4|~3.0.0"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "doctrine/common": "~2.3",
                 "egulias/email-validator": "~1.2,>=1.2.1",
-                "symfony/config": "~2.2",
-                "symfony/expression-language": "~2.4",
-                "symfony/http-foundation": "~2.1",
-                "symfony/intl": "~2.4",
-                "symfony/property-access": "~2.3",
-                "symfony/yaml": "~2.0,>=2.0.5"
+                "symfony/config": "~2.2|~3.0.0",
+                "symfony/expression-language": "~2.4|~3.0.0",
+                "symfony/http-foundation": "~2.1|~3.0.0",
+                "symfony/intl": "~2.4|~3.0.0",
+                "symfony/property-access": "~2.3|~3.0.0",
+                "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
@@ -1845,13 +2199,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Validator\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1869,20 +2226,20 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-18 20:23:18"
+            "time": "2016-01-12 17:46:01"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.7.6",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
+                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
-                "reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8",
+                "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8",
                 "shasum": ""
             },
             "require": {
@@ -1891,13 +2248,16 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1915,7 +2275,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2015-10-11 09:39:48"
+            "time": "2016-01-13 10:28:07"
         },
         {
             "name": "twig/twig",
diff --git a/core/.gitignore b/core/.gitignore
deleted file mode 100644
index 74b6a4c..0000000
--- a/core/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-# SimpleTest breaks with the following files, so avoid adding them.
-vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
-vendor/symfony/class-loader/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php
-vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
-
-# The resources for the Validator component are not required.
-vendor/symfony/validator/Symfony/Component/Validator/Resources
-
-# Symfony Validator depends on Symfony Translation but only requires the
-# TranslatorInterface. Thus, we add only the required interface from Symfony
-# Translation by ignoring everything except the interface.
-vendor/symfony/translation/Symfony/Component/Translation/*
-!vendor/symfony/translation/Symfony/Component/Translation/TranslatorInterface.php
-
-# PHPUnit provides some binary dependencies that are already available.
-vendor/phpunit/phpunit/build/dependencies
-
-# The PHAR file below contains CRLF characters that cause a problem with PIFR.
-vendor/symfony/dependency-injection/Tests/Fixtures/includes/ProjectWithXsdExtensionInPhar.phar
diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index c3e7c2a..1df1297 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -1,6 +1,12 @@
-Drupal 8.0.4, 2016-02-24
+Drupal 8.1.0, xxxx-xx-xx (development version)
 ------------------------
-- Fixed security issues (multiple vulnerabilities). See SA-CORE-2016-001.
+- Removed Composer-managed vendor from the git repository:
+    * Drupal.org packager adds dependencies to zip and tar package. This can be
+      used without any further steps.
+    * When not using zip / tar files, e.g. when using a git clone, run composer
+      install to get dependencies.
+    * See https://www.drupal.org/documentation/install/download#git
+      for instructions.
 
 Drupal 8.0.0, 2015-11-19
 ------------------------
diff --git a/core/MAINTAINERS.txt b/core/MAINTAINERS.txt
index 63748c2..8f456eb 100644
--- a/core/MAINTAINERS.txt
+++ b/core/MAINTAINERS.txt
@@ -261,6 +261,10 @@ Basic Auth module
 - Klaus Purer 'klausi' https://www.drupal.org/u/klausi
 - Juampy Novillo Requena 'juampy' https://www.drupal.org/u/juampy
 
+BigPipe module
+- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
+- Fabian Franz 'Fabianx' https://www.drupal.org/u/fabianx
+
 Block module
 - Tim Plunkett 'tim.plunkett' https://www.drupal.org/u/tim.plunkett
 - Ben Dougherty 'benjy' https://www.drupal.org/u/benjy
@@ -533,7 +537,7 @@ participate in mentoring.
 - Lucas Hedding 'heddn' https://www.drupal.org/u/heddn
 - Valery Lourie 'valthebald' https://www.drupal.org/u/valthebald
 - Alina Mackenzie 'alimac' https://www.drupal.org/u/alimac
-- Chris McCaferty 'cilefen' https://www.drupal.org/u/cilefen
+- Chris McCafferty 'cilefen' https://www.drupal.org/u/cilefen
 - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
 - Andrea Soper 'ZenDoodles' https://www.drupal.org/u/zendoodles
 - Cathy Theys 'YesCT' https://www.drupal.org/u/yesct
diff --git a/core/assets/vendor/ckeditor/CHANGES.md b/core/assets/vendor/ckeditor/CHANGES.md
index 264066b..a11b9aa 100644
--- a/core/assets/vendor/ckeditor/CHANGES.md
+++ b/core/assets/vendor/ckeditor/CHANGES.md
@@ -1,6 +1,48 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.5.7
+
+New Features:
+
+* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization.
+
+Other Changes:
+
+* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
+	* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
+	* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
+	* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
+	* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
+* [#13884](http://dev.ckeditor.com/ticket/13884): Fixed: Copy/paste table in Firefox results in just first cell being pasted.
+* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Embed](http://ckeditor.com/addon/embed) dialog.
+
+## CKEditor 4.5.6
+
+New Features:
+
+* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
+* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
+	- New features:
+		- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
+		- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
+		- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
+		- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
+	- Fixed issues:
+		* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
+		* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
+		* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
+		* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
+		* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
+		* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
+		* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
+		* Issue with pasting SCAYT markup in CKEditor.
+		* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.
+
 ## CKEditor 4.5.5
 
 Fixed Issues:
@@ -23,7 +65,7 @@ Fixed Issues:
 
 Other Changes:
 
-* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `benter.tools.createTestsForEditors` will also receive editor bot as a second parameter.
+* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.
 
 ## CKEditor 4.5.4
 
@@ -56,7 +98,7 @@ Other Changes:
 
 New Features:
 
-* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default filen ame for paste uploads.
+* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
 * [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.
 
 Fixed Issues:
diff --git a/core/assets/vendor/ckeditor/LICENSE.md b/core/assets/vendor/ckeditor/LICENSE.md
index 5e1e06d..55be53a 100644
--- a/core/assets/vendor/ckeditor/LICENSE.md
+++ b/core/assets/vendor/ckeditor/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2015, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2016, CKSource - Frederico Knabben.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
 
diff --git a/core/assets/vendor/ckeditor/build-config.js b/core/assets/vendor/ckeditor/build-config.js
index b44b245..c4eda91 100644
--- a/core/assets/vendor/ckeditor/build-config.js
+++ b/core/assets/vendor/ckeditor/build-config.js
@@ -40,6 +40,8 @@ var CKBUILDER_CONFIG = {
 		'bender-err.log',
 		'bender-out.log',
 		'node_modules',
+		'.jscsrc',
+		'.jshintrc',
 		// Parts of CKEditor that we consciously don't ship with Drupal.
 		'adapters',
 		'config.js',
@@ -69,6 +71,7 @@ var CKBUILDER_CONFIG = {
 		'wysiwygarea' : 1,
 		'indent' : 1,
 		'indentlist' : 1,
+		'language' : 1,
 		'list' : 1,
 		'magicline' : 1,
 		'maximize' : 1,
diff --git a/core/assets/vendor/ckeditor/ckeditor.js b/core/assets/vendor/ckeditor/ckeditor.js
index 14f1840..63e4fee 100644
--- a/core/assets/vendor/ckeditor/ckeditor.js
+++ b/core/assets/vendor/ckeditor/ckeditor.js
@@ -1,618 +1,622 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,e={timestamp:"FAD9",version:"4.5.5",revision:"b34ea4d",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var f=window.CKEDITOR_BASEPATH||"";if(!f)for(var g=document.getElementsByTagName("script"),c=0;c<g.length;c++){var k=g[c].src.match(a);if(k){f=k[1];break}}-1==f.indexOf(":/")&&"//"!=f.slice(0,
-2)&&(f=0===f.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+f:location.href.match(/^[^\?]*\/(?:)/)[0]+f);if(!f)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return f}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},
-domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),g()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),g())}catch(k){}}function g(){for(var k;k=c.shift();)k()}var c=[];return function(k){function b(){try{document.documentElement.doScroll("left")}catch(h){setTimeout(b,1);return}a()}c.push(k);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",
-a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);k=!1;try{k=!window.frameElement}catch(d){}document.documentElement.doScroll&&k&&b()}}}()},c=window.CKEDITOR_GETURL;if(c){var g=e.getUrl;e.getUrl=function(a){return c.call(e,a)||g.call(e,a)}}return e}()),CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var e=CKEDITOR.event.prototype,c;for(c in e)null==a[c]&&(a[c]=e[c])},
-CKEDITOR.event.prototype=function(){function a(a){var f=e(this);return f[a]||(f[a]=new c(a))}var e=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},c=function(a){this.name=a;this.listeners=[]};c.prototype={getListenerIndex:function(a){for(var c=0,e=this.listeners;c<e.length;c++)if(e[c].fn==a)return c;return-1}};return{define:function(c,f){var e=a.call(this,c);CKEDITOR.tools.extend(e,f,!0)},on:function(c,f,e,l,k){function b(h,b,a,k){h={name:c,sender:this,editor:h,
-data:b,listenerData:l,stop:a,cancel:k,removeListener:d};return!1===f.call(e,h)?!1:h.data}function d(){p.removeListener(c,f)}var h=a.call(this,c);if(0>h.getListenerIndex(f)){h=h.listeners;e||(e=this);isNaN(k)&&(k=10);var p=this;b.fn=f;b.priority=k;for(var v=h.length-1;0<=v;v--)if(h[v].priority<=k)return h.splice(v+1,0,b),{removeListener:d};h.unshift(b)}return{removeListener:d}},once:function(){var a=Array.prototype.slice.call(arguments),c=a[1];a[1]=function(a){a.removeListener();return c.apply(this,
-arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,c=function(){a=1},m=0,l=function(){m=1};return function(k,b,d){var h=e(this)[k];k=a;var p=m;a=m=0;if(h){var v=h.listeners;if(v.length)for(var v=v.slice(0),u,t=0;t<v.length;t++){if(h.errorProof)try{u=v[t].call(this,d,b,c,l)}catch(n){}else u=v[t].call(this,d,b,c,l);!1===u?m=1:"undefined"!=typeof u&&(b=u);if(a||m)break}}b=
-m?!1:"undefined"==typeof b?!0:b;a=k;m=p;return b}}(),fireOnce:function(a,c,m){c=this.fire(a,c,m);delete e(this)[a];return c},removeListener:function(a,c){var m=e(this)[a];if(m){var l=m.getListenerIndex(c);0<=l&&m.listeners.splice(l,1)}},removeAllListeners:function(){var a=e(this),c;for(c in a)delete a[c]},hasListeners:function(a){return(a=e(this)[a])&&0<a.listeners.length}}}()),CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=
-function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,e,this)},CKEDITOR.editor.prototype.fireOnce=function(a,e){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,e,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)),CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),e=a.match(/edge[ \/](\d+.?\d*)/),c=-1<a.indexOf("trident/"),c=!(!e&&!c),c={ie:c,edge:!!e,webkit:!c&&
+(function(){window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,f={timestamp:"G22N",version:"4.5.7",revision:"e98277f",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var e=window.CKEDITOR_BASEPATH||"";if(!e)for(var c=document.getElementsByTagName("script"),f=0;f<c.length;f++){var k=c[f].src.match(a);if(k){e=k[1];break}}-1==e.indexOf(":/")&&"//"!=e.slice(0,
+2)&&(e=0===e.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+e:location.href.match(/^[^\?]*\/(?:)/)[0]+e);if(!e)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return e}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},
+domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),e()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),e())}catch(k){}}function e(){for(var a;a=c.shift();)a()}var c=[];return function(k){function b(){try{document.documentElement.doScroll("left")}catch(g){setTimeout(b,1);return}a()}c.push(k);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",
+a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);k=!1;try{k=!window.frameElement}catch(d){}document.documentElement.doScroll&&k&&b()}}}()},c=window.CKEDITOR_GETURL;if(c){var e=f.getUrl;f.getUrl=function(a){return c.call(f,a)||e.call(f,a)}}return f}()),CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var f=CKEDITOR.event.prototype,c;for(c in f)null==a[c]&&(a[c]=f[c])},
+CKEDITOR.event.prototype=function(){function a(a){var h=f(this);return h[a]||(h[a]=new c(a))}var f=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},c=function(a){this.name=a;this.listeners=[]};c.prototype={getListenerIndex:function(a){for(var c=0,f=this.listeners;c<f.length;c++)if(f[c].fn==a)return c;return-1}};return{define:function(e,c){var f=a.call(this,e);CKEDITOR.tools.extend(f,c,!0)},on:function(c,h,f,l,k){function b(g,b,a,p){g={name:c,sender:this,editor:g,
+data:b,listenerData:l,stop:a,cancel:p,removeListener:d};return!1===h.call(f,g)?!1:g.data}function d(){p.removeListener(c,h)}var g=a.call(this,c);if(0>g.getListenerIndex(h)){g=g.listeners;f||(f=this);isNaN(k)&&(k=10);var p=this;b.fn=h;b.priority=k;for(var u=g.length-1;0<=u;u--)if(g[u].priority<=k)return g.splice(u+1,0,b),{removeListener:d};g.unshift(b)}return{removeListener:d}},once:function(){var a=Array.prototype.slice.call(arguments),c=a[1];a[1]=function(a){a.removeListener();return c.apply(this,
+arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,c=function(){a=1},m=0,l=function(){m=1};return function(k,b,d){var g=f(this)[k];k=a;var p=m;a=m=0;if(g){var u=g.listeners;if(u.length)for(var u=u.slice(0),v,r=0;r<u.length;r++){if(g.errorProof)try{v=u[r].call(this,d,b,c,l)}catch(n){}else v=u[r].call(this,d,b,c,l);!1===v?m=1:"undefined"!=typeof v&&(b=v);if(a||m)break}}b=
+m?!1:"undefined"==typeof b?!0:b;a=k;m=p;return b}}(),fireOnce:function(a,c,m){c=this.fire(a,c,m);delete f(this)[a];return c},removeListener:function(a,c){var m=f(this)[a];if(m){var l=m.getListenerIndex(c);0<=l&&m.listeners.splice(l,1)}},removeAllListeners:function(){var a=f(this),c;for(c in a)delete a[c]},hasListeners:function(a){return(a=f(this)[a])&&0<a.listeners.length}}}()),CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=
+function(a,f){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,f,this)},CKEDITOR.editor.prototype.fireOnce=function(a,f){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,f,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype)),CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),f=a.match(/edge[ \/](\d+.?\d*)/),c=-1<a.indexOf("trident/"),c=!(!f&&!c),c={ie:c,edge:!!f,webkit:!c&&
 -1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,c=window.location.hostname;return a!=c&&a!="["+c+"]"},secure:"https:"==location.protocol};c.gecko="Gecko"==navigator.product&&!c.webkit&&!c.ie;c.webkit&&(-1<a.indexOf("chrome")?c.chrome=
-!0:c.safari=!0);var g=0;c.ie&&(g=e?parseFloat(e[1]):c.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,c.ie9Compat=9==g,c.ie8Compat=8==g,c.ie7Compat=7==g,c.ie6Compat=7>g||c.quirks);c.gecko&&(e=a.match(/rv:([\d\.]+)/))&&(e=e[1].split("."),g=1E4*e[0]+100*(e[1]||0)+1*(e[2]||0));c.air&&(g=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));c.webkit&&(g=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));c.version=g;c.isCompatible=!(c.ie&&7>g)&&!(c.gecko&&4E4>g)&&!(c.webkit&&
-534>g);c.hidpi=2<=window.devicePixelRatio;c.needsBrFiller=c.gecko||c.webkit||c.ie&&10<g;c.needsNbspFiller=c.ie&&11>g;c.cssClass="cke_browser_"+(c.ie?"ie":c.gecko?"gecko":c.webkit?"webkit":"unknown");c.quirks&&(c.cssClass+=" cke_browser_quirks");c.ie&&(c.cssClass+=" cke_browser_ie"+(c.quirks?"6 cke_browser_iequirks":c.version));c.air&&(c.cssClass+=" cke_browser_air");c.iOS&&(c.cssClass+=" cke_browser_ios");c.hidpi&&(c.cssClass+=" cke_hidpi");return c}()),"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);
-CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=CKEDITOR.loadFullCore,e=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status=
-"basic_ready",a&&a._load?a():e&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*e))})})();CKEDITOR.status="basic_loaded"}(),"use strict",CKEDITOR.VERBOSITY_WARN=1,CKEDITOR.VERBOSITY_ERROR=2,CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR,CKEDITOR.warn=function(a,e){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:e})},CKEDITOR.error=function(a,e){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",
-{type:"error",errorCode:a,additionalData:e})},CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var e=console[a.data.type]?a.data.type:"log",c=a.data.errorCode;if(a=a.data.additionalData)console[e]("[CKEDITOR] Error code: "+c+".",a);else console[e]("[CKEDITOR] Error code: "+c+".");console[e]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+c)}},null,null,999),CKEDITOR.dom={},function(){var a=[],e=CKEDITOR.env.gecko?"-moz-":
-CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",c=/&/g,g=/>/g,f=/</g,m=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},b=function(d,h){return"#"==h[0]?String.fromCharCode(parseInt(h.slice(1),10)):k[h]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(d,h){if(!d&&!h)return!0;if(!d||!h||d.length!=h.length)return!1;for(var b=0;b<d.length;b++)if(d[b]!=h[b])return!1;return!0},getIndex:function(d,h){for(var b=
-0;b<d.length;++b)if(h(d[b]))return b;return-1},clone:function(d){var h;if(d&&d instanceof Array){h=[];for(var b=0;b<d.length;b++)h[b]=CKEDITOR.tools.clone(d[b]);return h}if(null===d||"object"!=typeof d||d instanceof String||d instanceof Number||d instanceof Boolean||d instanceof Date||d instanceof RegExp||d.nodeType||d.window===d)return d;h=new d.constructor;for(b in d)h[b]=CKEDITOR.tools.clone(d[b]);return h},capitalize:function(d,h){return d.charAt(0).toUpperCase()+(h?d.slice(1):d.slice(1).toLowerCase())},
-extend:function(d){var h=arguments.length,b,a;"boolean"==typeof(b=arguments[h-1])?h--:"boolean"==typeof(b=arguments[h-2])&&(a=arguments[h-1],h-=2);for(var k=1;k<h;k++){var c=arguments[k],n;for(n in c)if(!0===b||null==d[n])if(!a||n in a)d[n]=c[n]}return d},prototypedCopy:function(d){var h=function(){};h.prototype=d;return new h},copy:function(d){var h={},b;for(b in d)h[b]=d[b];return h},isArray:function(d){return"[object Array]"==Object.prototype.toString.call(d)},isEmpty:function(d){for(var h in d)if(d.hasOwnProperty(h))return!1;
-return!0},cssVendorPrefix:function(d,h,b){if(b)return e+d+":"+h+";"+d+":"+h;b={};b[d]=h;b[e+d]=h;return b},cssStyleToDomStyle:function(){var d=document.createElement("div").style,h="undefined"!=typeof d.cssFloat?"cssFloat":"undefined"!=typeof d.styleFloat?"styleFloat":"float";return function(d){return"float"==d?h:d.replace(/-./g,function(h){return h.substr(1).toUpperCase()})}}(),buildStyleHtml:function(d){d=[].concat(d);for(var h,b=[],a=0;a<d.length;a++)if(h=d[a])/@import|[{}]/.test(h)?b.push("\x3cstyle\x3e"+
-h+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+h+'"\x3e');return b.join("")},htmlEncode:function(d){return void 0===d||null===d?"":String(d).replace(c,"\x26amp;").replace(g,"\x26gt;").replace(f,"\x26lt;")},htmlDecode:function(d){return d.replace(l,b)},htmlEncodeAttr:function(d){return CKEDITOR.tools.htmlEncode(d).replace(m,"\x26quot;")},htmlDecodeAttr:function(d){return CKEDITOR.tools.htmlDecode(d)},transformPlainTextToHtml:function(d,h){var b=h==CKEDITOR.ENTER_BR,
-a=this.htmlEncode(d.replace(/\r\n/g,"\n")),a=a.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=h==CKEDITOR.ENTER_P?"p":"div";if(!b){var c=/\n{2}/g;if(c.test(a))var n="\x3c"+k+"\x3e",f="\x3c/"+k+"\x3e",a=n+a.replace(c,function(){return f+n})+f}a=a.replace(/\n/g,"\x3cbr\x3e");b||(a=a.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(h){return CKEDITOR.tools.repeat(h,2)}));a=a.replace(/^ | $/g,"\x26nbsp;");return a=a.replace(/(>|\s) /g,function(h,d){return d+"\x26nbsp;"}).replace(/ (?=<)/g,
-"\x26nbsp;")},getNextNumber:function(){var d=0;return function(){return++d}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var d="e",h=0;8>h;h++)d+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return d},override:function(d,h){var b=h(d);b.prototype=d.prototype;return b},setTimeout:function(d,h,b,a,k){k||(k=window);b||(b=k);return k.setTimeout(function(){a?d.apply(b,[].concat(a)):d.apply(b)},h||0)},trim:function(){var d=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;
-return function(h){return h.replace(d,"")}}(),ltrim:function(){var d=/^[ \t\n\r]+/g;return function(h){return h.replace(d,"")}}(),rtrim:function(){var d=/[ \t\n\r]+$/g;return function(h){return h.replace(d,"")}}(),indexOf:function(d,h){if("function"==typeof h)for(var b=0,a=d.length;b<a;b++){if(h(d[b]))return b}else{if(d.indexOf)return d.indexOf(h);b=0;for(a=d.length;b<a;b++)if(d[b]===h)return b}return-1},search:function(d,h){var b=CKEDITOR.tools.indexOf(d,h);return 0<=b?d[b]:null},bind:function(d,
-h){return function(){return d.apply(h,arguments)}},createClass:function(d){var h=d.$,b=d.base,a=d.privates||d._,k=d.proto;d=d.statics;!h&&(h=function(){b&&this.base.apply(this,arguments)});if(a)var c=h,h=function(){var h=this._||(this._={}),d;for(d in a){var b=a[d];h[d]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}c.apply(this,arguments)};b&&(h.prototype=this.prototypedCopy(b.prototype),h.prototype.constructor=h,h.base=b,h.baseProto=b.prototype,h.prototype.base=function(){this.base=b.prototype.base;
-b.apply(this,arguments);this.base=arguments.callee});k&&this.extend(h.prototype,k,!0);d&&this.extend(h,d,!0);return h},addFunction:function(d,h){return a.push(function(){return d.apply(h||this,arguments)})-1},removeFunction:function(d){a[d]=null},callFunction:function(d){var h=a[d];return h&&h.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var d=/^-?\d+\.?\d*px$/,h;return function(b){h=CKEDITOR.tools.trim(b+"")+"px";return d.test(h)?h:b||""}}(),convertToPx:function(){var d;
-return function(h){d||(d=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(d));return/%$/.test(h)?h:(d.setStyle("width",h),d.$.clientWidth)}}(),repeat:function(d,h){return Array(h+1).join(d)},tryThese:function(){for(var d,h=0,b=arguments.length;h<b;h++){var a=arguments[h];try{d=a();break}catch(k){}}return d},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},
-defer:function(d){return function(){var h=arguments,b=this;window.setTimeout(function(){d.apply(b,h)},0)}},normalizeCssText:function(d,h){var b=[],a,k=CKEDITOR.tools.parseCssText(d,!0,h);for(a in k)b.push(a+":"+k[a]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(b){return b.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(h,b,d,a){h=[b,d,a];for(b=0;3>b;b++)h[b]=("0"+parseInt(h[b],10).toString(16)).slice(-2);return"#"+h.join("")})},parseCssText:function(b,
-h,a){var k={};a&&(a=new CKEDITOR.dom.element("span"),a.setAttribute("style",b),b=CKEDITOR.tools.convertRgbToHex(a.getAttribute("style")||""));if(!b||";"==b)return k;b.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(b,d,a){h&&(d=d.toLowerCase(),"font-family"==d&&(a=a.toLowerCase().replace(/["']/g,"").replace(/\s*,\s*/g,",")),a=CKEDITOR.tools.trim(a));k[d]=a});return k},writeCssText:function(b,h){var a,k=[];for(a in b)k.push(a+":"+b[a]);h&&k.sort();return k.join("; ")},
-objectCompare:function(b,h,a){var k;if(!b&&!h)return!0;if(!b||!h)return!1;for(k in b)if(b[k]!=h[k])return!1;if(!a)for(k in h)if(b[k]!=h[k])return!1;return!0},objectKeys:function(b){var h=[],a;for(a in b)h.push(a);return h},convertArrayToObject:function(b,h){var a={};1==arguments.length&&(h=!0);for(var k=0,c=b.length;k<c;++k)a[b[k]]=h;return a},fixDomain:function(){for(var b;;)try{b=window.parent.document.domain;break}catch(h){b=b?b.replace(/.+?(?:\.|$)/,""):document.domain;if(!b)break;document.domain=
-b}return!!b},eventsBuffer:function(b,h,a){function k(){f=(new Date).getTime();c=!1;a?h.call(a):h()}var c,f=0;return{input:function(){if(!c){var h=(new Date).getTime()-f;h<b?c=setTimeout(k,b-h):k()}},reset:function(){c&&clearTimeout(c);c=f=0}}},enableHtml5Elements:function(b,h){for(var a="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),k=a.length,c;k--;)c=b.createElement(a[k]),
-h&&b.appendChild(c)},checkIfAnyArrayItemMatches:function(b,h){for(var a=0,k=b.length;a<k;++a)if(b[a].match(h))return!0;return!1},checkIfAnyObjectPropertyMatches:function(b,h){for(var a in b)if(a.match(h))return!0;return!1},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d"}}(),CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,e=function(b,h){for(var a=CKEDITOR.tools.clone(b),k=1;k<arguments.length;k++){h=arguments[k];for(var c in h)delete a[c]}return a},
-c={},g={},f={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},m={command:1,link:1,meta:1,noscript:1,script:1,style:1},l={},k={"#":1},b={center:1,dir:1,noframes:1};a(c,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,
-label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(g,f,c,b);e={a:e(c,{a:1,button:1}),abbr:c,address:g,area:l,article:g,aside:g,audio:a({source:1,track:1},g),b:c,base:l,bdi:c,bdo:c,blockquote:g,body:g,br:l,button:e(c,{a:1,button:1}),canvas:c,caption:g,cite:c,code:c,col:l,colgroup:{col:1},
-command:l,datalist:a({option:1},c),dd:g,del:c,details:a({summary:1},g),dfn:c,div:g,dl:{dt:1,dd:1},dt:g,em:c,embed:l,fieldset:a({legend:1},g),figcaption:g,figure:a({figcaption:1},g),footer:g,form:g,h1:c,h2:c,h3:c,h4:c,h5:c,h6:c,head:a({title:1,base:1},m),header:g,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:l,html:a({head:1,body:1},g,m),i:c,iframe:k,img:l,input:l,ins:c,kbd:c,keygen:l,label:c,legend:c,li:g,link:l,main:g,map:g,mark:c,menu:a({li:1},g),meta:l,meter:e(c,{meter:1}),nav:g,noscript:a({link:1,
-meta:1,style:1},c),object:a({param:1},c),ol:{li:1},optgroup:{option:1},option:k,output:c,p:c,param:l,pre:c,progress:e(c,{progress:1}),q:c,rp:c,rt:c,ruby:a({rp:1,rt:1},c),s:c,samp:c,script:k,section:g,select:{optgroup:1,option:1},small:c,source:l,span:c,strong:c,style:k,sub:c,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},c),sup:c,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:g,textarea:k,tfoot:{tr:1},th:g,thead:{tr:1},time:e(c,{time:1}),title:k,tr:{th:1,td:1},track:l,u:c,ul:{li:1},
-"var":c,video:a({source:1,track:1},g),wbr:l,acronym:c,applet:a({param:1},g),basefont:l,big:c,center:g,dialog:l,dir:{li:1},font:c,isindex:l,noframes:g,strike:c,tt:c};a(e,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},f,b),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,
-aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1},$inline:c,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},e.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,
-option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,
-td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return e}(),CKEDITOR.dom.event=function(a){this.$=a},CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;
-this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var e=this.$;e.preventDefault?e.preventDefault():e.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},getTarget:function(){var a=this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;
-return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}},CKEDITOR.CTRL=1114112,CKEDITOR.SHIFT=2228224,CKEDITOR.ALT=4456448,CKEDITOR.EVENT_PHASE_CAPTURING=1,CKEDITOR.EVENT_PHASE_AT_TARGET=2,CKEDITOR.EVENT_PHASE_BUBBLING=3,CKEDITOR.dom.domObject=function(a){a&&(this.$=a)},CKEDITOR.dom.domObject.prototype=function(){var a=function(a,c){return function(g){"undefined"!=typeof CKEDITOR&&a.fire(c,
-new CKEDITOR.dom.event(g))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(e){var c=this.getCustomData("_cke_nativeListeners");c||(c={},this.setCustomData("_cke_nativeListeners",c));c[e]||(c=c[e]=a(this,e),this.$.addEventListener?this.$.addEventListener(e,c,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+e,c));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,
-arguments);if(!this.hasListeners(a)){var c=this.getCustomData("_cke_nativeListeners"),g=c&&c[a];g&&(this.$.removeEventListener?this.$.removeEventListener(a,g,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,g),delete c[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),c;for(c in a){var g=a[c];this.$.detachEvent?this.$.detachEvent("on"+c,g):this.$.removeEventListener&&this.$.removeEventListener(c,g,!1);delete a[c]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}(),
-function(a){var e={};CKEDITOR.on("reset",function(){e={}});a.equals=function(a){try{return a&&a.$===this.$}catch(g){return!1}};a.setCustomData=function(a,g){var f=this.getUniqueId();(e[f]||(e[f]={}))[a]=g;return this};a.getCustomData=function(a){var g=this.$["data-cke-expando"];return(g=g&&e[g])&&a in g?g[a]:null};a.removeCustomData=function(a){var g=this.$["data-cke-expando"],g=g&&e[g],f,m;g&&(f=g[a],m=a in g,delete g[a]);return m?f:null};a.clearCustomData=function(){this.removeAllListeners();var a=
-this.$["data-cke-expando"];a&&delete e[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)}(CKEDITOR.dom.domObject.prototype),CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?
-"documentFragment":"domObject"](a):this},CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject,CKEDITOR.NODE_ELEMENT=1,CKEDITOR.NODE_DOCUMENT=9,CKEDITOR.NODE_TEXT=3,CKEDITOR.NODE_COMMENT=8,CKEDITOR.NODE_DOCUMENT_FRAGMENT=11,CKEDITOR.POSITION_IDENTICAL=0,CKEDITOR.POSITION_DISCONNECTED=1,CKEDITOR.POSITION_FOLLOWING=2,CKEDITOR.POSITION_PRECEDING=4,CKEDITOR.POSITION_IS_CONTAINED=8,CKEDITOR.POSITION_CONTAINS=16,CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,e){a.append(this,e);
-return a},clone:function(a,e){function c(f){f["data-cke-expando"]&&(f["data-cke-expando"]=!1);if(f.nodeType==CKEDITOR.NODE_ELEMENT||f.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(e||f.nodeType!=CKEDITOR.NODE_ELEMENT||f.removeAttribute("id",!1),a){f=f.childNodes;for(var g=0;g<f.length;g++)c(f[g])}}function g(c){if(c.type==CKEDITOR.NODE_ELEMENT||c.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(c.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var f=c.getName();":"==f[0]&&c.renameNode(f.substring(1))}if(a)for(f=0;f<
-c.getChildCount();f++)g(c.getChild(f))}}var f=this.$.cloneNode(a);c(f);f=new CKEDITOR.dom.node(f);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&g(f);return f},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,
-this.$);return a},getAddress:function(a){for(var e=[],c=this.getDocument().$.documentElement,g=this.$;g&&g!=c;){var f=g.parentNode;f&&e.unshift(this.getIndex.call({$:g},a));g=f}return e},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function e(a,c){var k=c?a.nextSibling:a.previousSibling;return k&&k.nodeType==CKEDITOR.NODE_TEXT?k.nodeValue?k:e(k,c):null}var c=this.$,g=-1,f;if(!this.$.parentNode||a&&c.nodeType==
-CKEDITOR.NODE_TEXT&&!c.nodeValue&&!e(c)&&!e(c,!0))return-1;do if(!a||c==this.$||c.nodeType!=CKEDITOR.NODE_TEXT||!f&&c.nodeValue)g++,f=c.nodeType==CKEDITOR.NODE_TEXT;while(c=c.previousSibling);return g},getNextSourceNode:function(a,e,c){if(c&&!c.call){var g=c;c=function(a){return!a.equals(g)}}a=!a&&this.getFirst&&this.getFirst();var f;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getNext()}for(;!a&&(f=(f||this).getParent());){if(c&&!1===c(f,!0))return null;a=f.getNext()}return!a||
-c&&!1===c(a)?null:e&&e!=a.type?a.getNextSourceNode(!1,e,c):a},getPreviousSourceNode:function(a,e,c){if(c&&!c.call){var g=c;c=function(a){return!a.equals(g)}}a=!a&&this.getLast&&this.getLast();var f;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getPrevious()}for(;!a&&(f=(f||this).getParent());){if(c&&!1===c(f,!0))return null;a=f.getPrevious()}return!a||c&&!1===c(a)?null:e&&a.type!=e?a.getPreviousSourceNode(!1,e,c):a},getPrevious:function(a){var e=this.$,c;do c=(e=
-e.previousSibling)&&10!=e.nodeType&&new CKEDITOR.dom.node(e);while(c&&a&&!a(c));return c},getNext:function(a){var e=this.$,c;do c=(e=e.nextSibling)&&new CKEDITOR.dom.node(e);while(c&&a&&!a(c));return c},getParent:function(a){var e=this.$.parentNode;return e&&(e.nodeType==CKEDITOR.NODE_ELEMENT||a&&e.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?new CKEDITOR.dom.node(e):null},getParents:function(a){var e=this,c=[];do c[a?"push":"unshift"](e);while(e=e.getParent());return c},getCommonAncestor:function(a){if(a.equals(this))return this;
-if(a.contains&&a.contains(this))return a;var e=this.contains?this:this.getParent();do if(e.contains(a))return e;while(e=e.getParent());return null},getPosition:function(a){var e=this.$,c=a.$;if(e.compareDocumentPosition)return e.compareDocumentPosition(c);if(e==c)return CKEDITOR.POSITION_IDENTICAL;if(this.type==CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(e.contains){if(e.contains(c))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(c.contains(e))return CKEDITOR.POSITION_IS_CONTAINED+
-CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in e)return 0>e.sourceIndex||0>c.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:e.sourceIndex<c.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}e=this.getAddress();a=a.getAddress();for(var c=Math.min(e.length,a.length),g=0;g<c;g++)if(e[g]!=a[g])return e[g]<a[g]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return e.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},
-getAscendant:function(a,e){var c=this.$,g,f;e||(c=c.parentNode);"function"==typeof a?(f=!0,g=a):(f=!1,g=function(c){c="string"==typeof c.nodeName?c.nodeName.toLowerCase():"";return"string"==typeof a?c==a:c in a});for(;c;){if(g(f?new CKEDITOR.dom.node(c):c))return new CKEDITOR.dom.node(c);try{c=c.parentNode}catch(m){c=null}}return null},hasAscendant:function(a,e){var c=this.$;e||(c=c.parentNode);for(;c;){if(c.nodeName&&c.nodeName.toLowerCase()==a)return!0;c=c.parentNode}return!1},move:function(a,e){a.append(this.remove(),
-e)},remove:function(a){var e=this.$,c=e.parentNode;if(c){if(a)for(;a=e.firstChild;)c.insertBefore(e.removeChild(a),e);c.removeChild(e)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var e=CKEDITOR.tools.ltrim(a.getText()),c=a.getLength();if(e)e.length<c&&(a.split(c-e.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},
-rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var e=CKEDITOR.tools.rtrim(a.getText()),c=a.getLength();if(e)e.length<c&&(a.split(e.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var e=this;this.type!=CKEDITOR.NODE_ELEMENT&&(e=this.getParent());CKEDITOR.env.edge&&
-e&&e.is("textarea","input")&&(a=!0);if(!a&&e&&"undefined"!=typeof e.$.isContentEditable)return!(e.$.isContentEditable||e.data("cke-editable"));for(;e;){if(e.data("cke-editable"))return!1;if(e.hasAttribute("contenteditable"))return"false"==e.getAttribute("contenteditable");e=e.getParent()}return!0}}),CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},
-getViewPaneSize:function(){var a=this.$.document,e="CSS1Compat"==a.compatMode;return{width:(e?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(e?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?
-new CKEDITOR.dom.element.get(a):null}}),CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var e=new CKEDITOR.dom.element("link");e.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(e)}},appendStyleText:function(a){if(this.$.createStyleSheet){var e=
-this.$.createStyleSheet("");e.cssText=a}else{var c=new CKEDITOR.dom.element("style",this);c.append(new CKEDITOR.dom.text(a,this));this.getHead().append(c)}return e||c.$.sheet},createElement:function(a,e){var c=new CKEDITOR.dom.element(a,this);e&&(e.attributes&&c.setAttributes(e.attributes),e.styles&&c.setStyles(e.styles));return c},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(e){return null}return new CKEDITOR.dom.element(a)},
-getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,e){for(var c=this.$.documentElement,g=0;c&&g<a.length;g++){var f=a[g];if(e)for(var m=-1,l=0;l<c.childNodes.length;l++){var k=c.childNodes[l];if(!0!==e||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(m++,m==f){c=k;break}}else c=c.childNodes[f]}return c?new CKEDITOR.dom.node(c):null},getElementsByTag:function(a,e){CKEDITOR.env.ie&&8>=document.documentMode||!e||(a=e+":"+
-a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html",
-"replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,
-!0),this.setCustomData("html5ShivFrag",a));return a}}),CKEDITOR.dom.nodeList=function(a){this.$=a},CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}},CKEDITOR.dom.element=function(a,e){"string"==typeof a&&(a=(e?e.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:
-a)&&(a.$?a:new CKEDITOR.dom.element(a))},CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node,CKEDITOR.dom.element.createFromHtml=function(a,e){var c=new CKEDITOR.dom.element("div",e);c.setHtml(a);return c.getFirst().remove()},CKEDITOR.dom.element.setMarker=function(a,e,c,g){var f=e.getCustomData("list_marker_id")||e.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),m=e.getCustomData("list_marker_names")||e.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");
-a[f]=e;m[c]=1;return e.setCustomData(c,g)},CKEDITOR.dom.element.clearAllMarkers=function(a){for(var e in a)CKEDITOR.dom.element.clearMarkers(a,a[e],1)},CKEDITOR.dom.element.clearMarkers=function(a,e,c){var g=e.getCustomData("list_marker_names"),f=e.getCustomData("list_marker_id"),m;for(m in g)e.removeCustomData(m);e.removeCustomData("list_marker_names");c&&(e.removeCustomData("list_marker_id"),delete a[f])},function(){function a(a,b){return-1<(" "+a+" ").replace(m," ").indexOf(" "+b+" ")}function e(a){var b=
-!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function c(a,b){return"#"+a.$.id+" "+b.split(/,\s*/).join(", #"+a.$.id+" ")}function g(a){for(var b=0,d=0,h=l[a].length;d<h;d++)b+=parseInt(this.getComputedStyle(l[a][d])||0,10)||0;return b}var f=document.createElement("_").classList,f="undefined"!==typeof f&&null!==String(f.add).match(/\[Native code\]/gi),m=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,
-addClass:f?function(a){this.$.classList.add(a);return this}:function(k){var b=this.$.className;b&&(a(b,k)||(b+=" "+k));this.$.className=b||k;return this},removeClass:f?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(k){var b=this.getAttribute("class");b&&a(b,k)&&((b=b.replace(new RegExp("(?:^|\\s+)"+k+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",b):this.removeAttribute("class"));return this},hasClass:function(k){return a(this.$.className,
-k)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=
-this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var d=new CKEDITOR.dom.range(this.getDocument());d.setStartAfter(this);d.setEndAfter(a);var h=d.extractContents(!1,b||!1);d.insertNode(this.remove());h.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&
-16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));
-return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var d=this.getDocument()._getHtml5ShivFrag();d.appendChild(b);b.innerHTML=a;d.removeChild(b);return a}catch(h){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=
-a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;
-case "tabindex":return a=this.$.getAttribute(a,2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},
+!0:c.safari=!0);var e=0;c.ie&&(e=f?parseFloat(f[1]):c.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,c.ie9Compat=9==e,c.ie8Compat=8==e,c.ie7Compat=7==e,c.ie6Compat=7>e||c.quirks);c.gecko&&(f=a.match(/rv:([\d\.]+)/))&&(f=f[1].split("."),e=1E4*f[0]+100*(f[1]||0)+1*(f[2]||0));c.air&&(e=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));c.webkit&&(e=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));c.version=e;c.isCompatible=!(c.ie&&7>e)&&!(c.gecko&&4E4>e)&&!(c.webkit&&
+534>e);c.hidpi=2<=window.devicePixelRatio;c.needsBrFiller=c.gecko||c.webkit||c.ie&&10<e;c.needsNbspFiller=c.ie&&11>e;c.cssClass="cke_browser_"+(c.ie?"ie":c.gecko?"gecko":c.webkit?"webkit":"unknown");c.quirks&&(c.cssClass+=" cke_browser_quirks");c.ie&&(c.cssClass+=" cke_browser_ie"+(c.quirks?"6 cke_browser_iequirks":c.version));c.air&&(c.cssClass+=" cke_browser_air");c.iOS&&(c.cssClass+=" cke_browser_ios");c.hidpi&&(c.cssClass+=" cke_hidpi");return c}()),"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);
+CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=CKEDITOR.loadFullCore,f=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status=
+"basic_ready",a&&a._load?a():f&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*f))})})();CKEDITOR.status="basic_loaded"}(),"use strict",CKEDITOR.VERBOSITY_WARN=1,CKEDITOR.VERBOSITY_ERROR=2,CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR,CKEDITOR.warn=function(a,f){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:f})},CKEDITOR.error=function(a,f){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",
+{type:"error",errorCode:a,additionalData:f})},CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var f=console[a.data.type]?a.data.type:"log",c=a.data.errorCode;if(a=a.data.additionalData)console[f]("[CKEDITOR] Error code: "+c+".",a);else console[f]("[CKEDITOR] Error code: "+c+".");console[f]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+c)}},null,null,999),CKEDITOR.dom={},function(){var a=[],f=CKEDITOR.env.gecko?"-moz-":
+CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",c=/&/g,e=/>/g,h=/</g,m=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,k={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},b=function(d,g){return"#"==g[0]?String.fromCharCode(parseInt(g.slice(1),10)):k[g]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(d,g){if(!d&&!g)return!0;if(!d||!g||d.length!=g.length)return!1;for(var b=0;b<d.length;b++)if(d[b]!=g[b])return!1;return!0},getIndex:function(d,g){for(var b=
+0;b<d.length;++b)if(g(d[b]))return b;return-1},clone:function(d){var g;if(d&&d instanceof Array){g=[];for(var b=0;b<d.length;b++)g[b]=CKEDITOR.tools.clone(d[b]);return g}if(null===d||"object"!=typeof d||d instanceof String||d instanceof Number||d instanceof Boolean||d instanceof Date||d instanceof RegExp||d.nodeType||d.window===d)return d;g=new d.constructor;for(b in d)g[b]=CKEDITOR.tools.clone(d[b]);return g},capitalize:function(d,g){return d.charAt(0).toUpperCase()+(g?d.slice(1):d.slice(1).toLowerCase())},
+extend:function(d){var g=arguments.length,b,a;"boolean"==typeof(b=arguments[g-1])?g--:"boolean"==typeof(b=arguments[g-2])&&(a=arguments[g-1],g-=2);for(var k=1;k<g;k++){var c=arguments[k],n;for(n in c)if(!0===b||null==d[n])if(!a||n in a)d[n]=c[n]}return d},prototypedCopy:function(d){var g=function(){};g.prototype=d;return new g},copy:function(d){var g={},b;for(b in d)g[b]=d[b];return g},isArray:function(d){return"[object Array]"==Object.prototype.toString.call(d)},isEmpty:function(d){for(var g in d)if(d.hasOwnProperty(g))return!1;
+return!0},cssVendorPrefix:function(d,g,b){if(b)return f+d+":"+g+";"+d+":"+g;b={};b[d]=g;b[f+d]=g;return b},cssStyleToDomStyle:function(){var d=document.createElement("div").style,g="undefined"!=typeof d.cssFloat?"cssFloat":"undefined"!=typeof d.styleFloat?"styleFloat":"float";return function(d){return"float"==d?g:d.replace(/-./g,function(g){return g.substr(1).toUpperCase()})}}(),buildStyleHtml:function(d){d=[].concat(d);for(var g,b=[],a=0;a<d.length;a++)if(g=d[a])/@import|[{}]/.test(g)?b.push("\x3cstyle\x3e"+
+g+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+g+'"\x3e');return b.join("")},htmlEncode:function(d){return void 0===d||null===d?"":String(d).replace(c,"\x26amp;").replace(e,"\x26gt;").replace(h,"\x26lt;")},htmlDecode:function(d){return d.replace(l,b)},htmlEncodeAttr:function(d){return CKEDITOR.tools.htmlEncode(d).replace(m,"\x26quot;")},htmlDecodeAttr:function(d){return CKEDITOR.tools.htmlDecode(d)},transformPlainTextToHtml:function(d,g){var b=g==CKEDITOR.ENTER_BR,
+a=this.htmlEncode(d.replace(/\r\n/g,"\n")),a=a.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),k=g==CKEDITOR.ENTER_P?"p":"div";if(!b){var c=/\n{2}/g;if(c.test(a))var n="\x3c"+k+"\x3e",e="\x3c/"+k+"\x3e",a=n+a.replace(c,function(){return e+n})+e}a=a.replace(/\n/g,"\x3cbr\x3e");b||(a=a.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+k+"\x3e)"),function(g){return CKEDITOR.tools.repeat(g,2)}));a=a.replace(/^ | $/g,"\x26nbsp;");return a=a.replace(/(>|\s) /g,function(g,d){return d+"\x26nbsp;"}).replace(/ (?=<)/g,
+"\x26nbsp;")},getNextNumber:function(){var d=0;return function(){return++d}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var d="e",g=0;8>g;g++)d+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return d},override:function(d,g){var b=g(d);b.prototype=d.prototype;return b},setTimeout:function(d,g,b,a,k){k||(k=window);b||(b=k);return k.setTimeout(function(){a?d.apply(b,[].concat(a)):d.apply(b)},g||0)},trim:function(){var d=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;
+return function(g){return g.replace(d,"")}}(),ltrim:function(){var d=/^[ \t\n\r]+/g;return function(g){return g.replace(d,"")}}(),rtrim:function(){var d=/[ \t\n\r]+$/g;return function(g){return g.replace(d,"")}}(),indexOf:function(d,g){if("function"==typeof g)for(var b=0,a=d.length;b<a;b++){if(g(d[b]))return b}else{if(d.indexOf)return d.indexOf(g);b=0;for(a=d.length;b<a;b++)if(d[b]===g)return b}return-1},search:function(d,g){var b=CKEDITOR.tools.indexOf(d,g);return 0<=b?d[b]:null},bind:function(d,
+g){return function(){return d.apply(g,arguments)}},createClass:function(d){var g=d.$,b=d.base,a=d.privates||d._,k=d.proto;d=d.statics;!g&&(g=function(){b&&this.base.apply(this,arguments)});if(a)var c=g,g=function(){var g=this._||(this._={}),d;for(d in a){var b=a[d];g[d]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}c.apply(this,arguments)};b&&(g.prototype=this.prototypedCopy(b.prototype),g.prototype.constructor=g,g.base=b,g.baseProto=b.prototype,g.prototype.base=function(){this.base=b.prototype.base;
+b.apply(this,arguments);this.base=arguments.callee});k&&this.extend(g.prototype,k,!0);d&&this.extend(g,d,!0);return g},addFunction:function(d,g){return a.push(function(){return d.apply(g||this,arguments)})-1},removeFunction:function(d){a[d]=null},callFunction:function(d){var g=a[d];return g&&g.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var d=/^-?\d+\.?\d*px$/,g;return function(b){g=CKEDITOR.tools.trim(b+"")+"px";return d.test(g)?g:b||""}}(),convertToPx:function(){var d;
+return function(g){d||(d=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(d));return/%$/.test(g)?g:(d.setStyle("width",g),d.$.clientWidth)}}(),repeat:function(d,g){return Array(g+1).join(d)},tryThese:function(){for(var d,g=0,b=arguments.length;g<b;g++){var a=arguments[g];try{d=a();break}catch(k){}}return d},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},
+defer:function(d){return function(){var g=arguments,b=this;window.setTimeout(function(){d.apply(b,g)},0)}},normalizeCssText:function(d,g){var b=[],a,k=CKEDITOR.tools.parseCssText(d,!0,g);for(a in k)b.push(a+":"+k[a]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(d){return d.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(g,d,b,a){g=[d,b,a];for(d=0;3>d;d++)g[d]=("0"+parseInt(g[d],10).toString(16)).slice(-2);return"#"+g.join("")})},parseCssText:function(d,
+g,b){var a={};b&&(b=new CKEDITOR.dom.element("span"),b.setAttribute("style",d),d=CKEDITOR.tools.convertRgbToHex(b.getAttribute("style")||""));if(!d||";"==d)return a;d.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(d,b,k){g&&(b=b.toLowerCase(),"font-family"==b&&(k=k.toLowerCase().replace(/["']/g,"").replace(/\s*,\s*/g,",")),k=CKEDITOR.tools.trim(k));a[b]=k});return a},writeCssText:function(d,g){var b,a=[];for(b in d)a.push(b+":"+d[b]);g&&a.sort();return a.join("; ")},
+objectCompare:function(d,g,b){var a;if(!d&&!g)return!0;if(!d||!g)return!1;for(a in d)if(d[a]!=g[a])return!1;if(!b)for(a in g)if(d[a]!=g[a])return!1;return!0},objectKeys:function(d){var g=[],b;for(b in d)g.push(b);return g},convertArrayToObject:function(d,g){var b={};1==arguments.length&&(g=!0);for(var a=0,k=d.length;a<k;++a)b[d[a]]=g;return b},fixDomain:function(){for(var d;;)try{d=window.parent.document.domain;break}catch(g){d=d?d.replace(/.+?(?:\.|$)/,""):document.domain;if(!d)break;document.domain=
+d}return!!d},eventsBuffer:function(d,g,b){function a(){c=(new Date).getTime();k=!1;b?g.call(b):g()}var k,c=0;return{input:function(){if(!k){var g=(new Date).getTime()-c;g<d?k=setTimeout(a,d-g):a()}},reset:function(){k&&clearTimeout(k);k=c=0}}},enableHtml5Elements:function(b,g){for(var a="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),k=a.length,c;k--;)c=b.createElement(a[k]),
+g&&b.appendChild(c)},checkIfAnyArrayItemMatches:function(b,g){for(var a=0,k=b.length;a<k;++a)if(b[a].match(g))return!0;return!1},checkIfAnyObjectPropertyMatches:function(b,g){for(var a in b)if(a.match(g))return!0;return!1},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(b){b=b.toLowerCase();for(var g=document.cookie.split(";"),a,k,c=0;c<g.length;c++)if(a=g[c].split("\x3d"),k=decodeURIComponent(CKEDITOR.tools.trim(a[0]).toLowerCase()),
+k===b)return decodeURIComponent(1<a.length?a[1]:"");return null},setCookie:function(b,g){document.cookie=encodeURIComponent(b)+"\x3d"+encodeURIComponent(g)+";path\x3d/"},getCsrfToken:function(){var b=CKEDITOR.tools.getCookie("ckCsrfToken");if(!b||40!=b.length){var b=[],g="";if(window.crypto&&window.crypto.getRandomValues)b=new Uint8Array(40),window.crypto.getRandomValues(b);else for(var a=0;40>a;a++)b.push(Math.floor(256*Math.random()));for(a=0;a<b.length;a++)var k="abcdefghijklmnopqrstuvwxyz0123456789".charAt(b[a]%
+36),g=g+(.5<Math.random()?k.toUpperCase():k);b=g;CKEDITOR.tools.setCookie("ckCsrfToken",b)}return b}}}(),CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,f=function(b,g){for(var a=CKEDITOR.tools.clone(b),k=1;k<arguments.length;k++){g=arguments[k];for(var c in g)delete a[c]}return a},c={},e={},h={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,
+ul:1},m={command:1,link:1,meta:1,noscript:1,script:1,style:1},l={},k={"#":1},b={center:1,dir:1,noframes:1};a(c,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},k,{acronym:1,applet:1,basefont:1,
+big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(e,h,c,b);f={a:f(c,{a:1,button:1}),abbr:c,address:e,area:l,article:e,aside:e,audio:a({source:1,track:1},e),b:c,base:l,bdi:c,bdo:c,blockquote:e,body:e,br:l,button:f(c,{a:1,button:1}),canvas:c,caption:e,cite:c,code:c,col:l,colgroup:{col:1},command:l,datalist:a({option:1},c),dd:e,del:c,details:a({summary:1},e),dfn:c,div:e,dl:{dt:1,dd:1},dt:e,em:c,embed:l,fieldset:a({legend:1},e),figcaption:e,figure:a({figcaption:1},e),footer:e,form:e,h1:c,h2:c,h3:c,h4:c,
+h5:c,h6:c,head:a({title:1,base:1},m),header:e,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:l,html:a({head:1,body:1},e,m),i:c,iframe:k,img:l,input:l,ins:c,kbd:c,keygen:l,label:c,legend:c,li:e,link:l,main:e,map:e,mark:c,menu:a({li:1},e),meta:l,meter:f(c,{meter:1}),nav:e,noscript:a({link:1,meta:1,style:1},c),object:a({param:1},c),ol:{li:1},optgroup:{option:1},option:k,output:c,p:c,param:l,pre:c,progress:f(c,{progress:1}),q:c,rp:c,rt:c,ruby:a({rp:1,rt:1},c),s:c,samp:c,script:k,section:e,select:{optgroup:1,
+option:1},small:c,source:l,span:c,strong:c,style:k,sub:c,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},c),sup:c,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:e,textarea:k,tfoot:{tr:1},th:e,thead:{tr:1},time:f(c,{time:1}),title:k,tr:{th:1,td:1},track:l,u:c,ul:{li:1},"var":c,video:a({source:1,track:1},e),wbr:l,acronym:c,applet:a({param:1},e),basefont:l,big:c,center:e,dialog:l,dir:{li:1},font:c,isindex:l,noframes:e,strike:c,tt:c};a(f,{$block:a({audio:1,dd:1,dt:1,figcaption:1,
+li:1,video:1},h,b),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,
+col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1},$inline:c,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},f.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,
+cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,
+rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return f}(),CKEDITOR.dom.event=function(a){this.$=a},CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var f=this.$;f.preventDefault?f.preventDefault():f.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=
+this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},getTarget:function(){var a=this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}},CKEDITOR.CTRL=1114112,CKEDITOR.SHIFT=2228224,CKEDITOR.ALT=
+4456448,CKEDITOR.EVENT_PHASE_CAPTURING=1,CKEDITOR.EVENT_PHASE_AT_TARGET=2,CKEDITOR.EVENT_PHASE_BUBBLING=3,CKEDITOR.dom.domObject=function(a){a&&(this.$=a)},CKEDITOR.dom.domObject.prototype=function(){var a=function(a,c){return function(e){"undefined"!=typeof CKEDITOR&&a.fire(c,new CKEDITOR.dom.event(e))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(f){var c=this.getCustomData("_cke_nativeListeners");c||(c={},this.setCustomData("_cke_nativeListeners",
+c));c[f]||(c=c[f]=a(this,f),this.$.addEventListener?this.$.addEventListener(f,c,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+f,c));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var c=this.getCustomData("_cke_nativeListeners"),e=c&&c[a];e&&(this.$.removeEventListener?this.$.removeEventListener(a,e,!1):this.$.detachEvent&&this.$.detachEvent("on"+
+a,e),delete c[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),c;for(c in a){var e=a[c];this.$.detachEvent?this.$.detachEvent("on"+c,e):this.$.removeEventListener&&this.$.removeEventListener(c,e,!1);delete a[c]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}(),function(a){var f={};CKEDITOR.on("reset",function(){f={}});a.equals=function(a){try{return a&&a.$===this.$}catch(e){return!1}};a.setCustomData=function(a,e){var h=this.getUniqueId();(f[h]||(f[h]=
+{}))[a]=e;return this};a.getCustomData=function(a){var e=this.$["data-cke-expando"];return(e=e&&f[e])&&a in e?e[a]:null};a.removeCustomData=function(a){var e=this.$["data-cke-expando"],e=e&&f[e],h,m;e&&(h=e[a],m=a in e,delete e[a]);return m?h:null};a.clearCustomData=function(){this.removeAllListeners();var a=this.$["data-cke-expando"];a&&delete f[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)}(CKEDITOR.dom.domObject.prototype),
+CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?"documentFragment":"domObject"](a):this},CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject,CKEDITOR.NODE_ELEMENT=1,CKEDITOR.NODE_DOCUMENT=9,CKEDITOR.NODE_TEXT=3,CKEDITOR.NODE_COMMENT=8,CKEDITOR.NODE_DOCUMENT_FRAGMENT=11,CKEDITOR.POSITION_IDENTICAL=
+0,CKEDITOR.POSITION_DISCONNECTED=1,CKEDITOR.POSITION_FOLLOWING=2,CKEDITOR.POSITION_PRECEDING=4,CKEDITOR.POSITION_IS_CONTAINED=8,CKEDITOR.POSITION_CONTAINS=16,CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,f){a.append(this,f);return a},clone:function(a,f){function c(e){e["data-cke-expando"]&&(e["data-cke-expando"]=!1);if(e.nodeType==CKEDITOR.NODE_ELEMENT||e.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(f||e.nodeType!=CKEDITOR.NODE_ELEMENT||e.removeAttribute("id",!1),a){e=e.childNodes;
+for(var h=0;h<e.length;h++)c(e[h])}}function e(c){if(c.type==CKEDITOR.NODE_ELEMENT||c.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(c.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=c.getName();":"==h[0]&&c.renameNode(h.substring(1))}if(a)for(h=0;h<c.getChildCount();h++)e(c.getChild(h))}}var h=this.$.cloneNode(a);c(h);h=new CKEDITOR.dom.node(h);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&e(h);return h},hasPrevious:function(){return!!this.$.previousSibling},
+hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var f=[],c=this.getDocument().$.documentElement,e=this.$;e&&e!=c;){var h=e.parentNode;h&&f.unshift(this.getIndex.call({$:e},a));e=h}return f},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||
+this.$.parentNode.ownerDocument)},getIndex:function(a){function f(a,k){var b=k?a.nextSibling:a.previousSibling;return b&&b.nodeType==CKEDITOR.NODE_TEXT?c(b)?f(b,k):b:null}function c(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var e=this.$,h=-1,m;if(!this.$.parentNode||a&&e.nodeType==CKEDITOR.NODE_TEXT&&c(e)&&!f(e)&&!f(e,!0))return-1;do a&&e!=this.$&&e.nodeType==CKEDITOR.NODE_TEXT&&(m||c(e))||(h++,m=e.nodeType==CKEDITOR.NODE_TEXT);while(e=e.previousSibling);return h},
+getNextSourceNode:function(a,f,c){if(c&&!c.call){var e=c;c=function(a){return!a.equals(e)}}a=!a&&this.getFirst&&this.getFirst();var h;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getNext()}for(;!a&&(h=(h||this).getParent());){if(c&&!1===c(h,!0))return null;a=h.getNext()}return!a||c&&!1===c(a)?null:f&&f!=a.type?a.getNextSourceNode(!1,f,c):a},getPreviousSourceNode:function(a,f,c){if(c&&!c.call){var e=c;c=function(a){return!a.equals(e)}}a=!a&&this.getLast&&this.getLast();
+var h;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&c&&!1===c(this,!0))return null;a=this.getPrevious()}for(;!a&&(h=(h||this).getParent());){if(c&&!1===c(h,!0))return null;a=h.getPrevious()}return!a||c&&!1===c(a)?null:f&&a.type!=f?a.getPreviousSourceNode(!1,f,c):a},getPrevious:function(a){var f=this.$,c;do c=(f=f.previousSibling)&&10!=f.nodeType&&new CKEDITOR.dom.node(f);while(c&&a&&!a(c));return c},getNext:function(a){var f=this.$,c;do c=(f=f.nextSibling)&&new CKEDITOR.dom.node(f);while(c&&a&&!a(c));
+return c},getParent:function(a){var f=this.$.parentNode;return f&&(f.nodeType==CKEDITOR.NODE_ELEMENT||a&&f.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?new CKEDITOR.dom.node(f):null},getParents:function(a){var f=this,c=[];do c[a?"push":"unshift"](f);while(f=f.getParent());return c},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var f=this.contains?this:this.getParent();do if(f.contains(a))return f;while(f=f.getParent());return null},getPosition:function(a){var f=
+this.$,c=a.$;if(f.compareDocumentPosition)return f.compareDocumentPosition(c);if(f==c)return CKEDITOR.POSITION_IDENTICAL;if(this.type==CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(f.contains){if(f.contains(c))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(c.contains(f))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in f)return 0>f.sourceIndex||0>c.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:f.sourceIndex<c.sourceIndex?CKEDITOR.POSITION_PRECEDING:
+CKEDITOR.POSITION_FOLLOWING}f=this.getAddress();a=a.getAddress();for(var c=Math.min(f.length,a.length),e=0;e<c;e++)if(f[e]!=a[e])return f[e]<a[e]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return f.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,f){var c=this.$,e,h;f||(c=c.parentNode);"function"==typeof a?(h=!0,e=a):(h=!1,e=function(c){c="string"==typeof c.nodeName?c.nodeName.toLowerCase():
+"";return"string"==typeof a?c==a:c in a});for(;c;){if(e(h?new CKEDITOR.dom.node(c):c))return new CKEDITOR.dom.node(c);try{c=c.parentNode}catch(m){c=null}}return null},hasAscendant:function(a,f){var c=this.$;f||(c=c.parentNode);for(;c;){if(c.nodeName&&c.nodeName.toLowerCase()==a)return!0;c=c.parentNode}return!1},move:function(a,f){a.append(this.remove(),f)},remove:function(a){var f=this.$,c=f.parentNode;if(c){if(a)for(;a=f.firstChild;)c.insertBefore(f.removeChild(a),f);c.removeChild(f)}return this},
+replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var f=CKEDITOR.tools.ltrim(a.getText()),c=a.getLength();if(f)f.length<c&&(a.split(c-f.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var f=CKEDITOR.tools.rtrim(a.getText()),c=a.getLength();
+if(f)f.length<c&&(a.split(f.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var f=this;this.type!=CKEDITOR.NODE_ELEMENT&&(f=this.getParent());CKEDITOR.env.edge&&f&&f.is("textarea","input")&&(a=!0);if(!a&&f&&"undefined"!=typeof f.$.isContentEditable)return!(f.$.isContentEditable||f.data("cke-editable"));for(;f;){if(f.data("cke-editable"))return!1;
+if(f.hasAttribute("contenteditable"))return"false"==f.getAttribute("contenteditable");f=f.getParent()}return!0}}),CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,f="CSS1Compat"==a.compatMode;return{width:(f?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(f?a.documentElement.clientHeight:
+a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}}),CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject,CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,
+{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var f=new CKEDITOR.dom.element("link");f.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(f)}},appendStyleText:function(a){if(this.$.createStyleSheet){var f=this.$.createStyleSheet("");f.cssText=a}else{var c=new CKEDITOR.dom.element("style",this);c.append(new CKEDITOR.dom.text(a,this));this.getHead().append(c)}return f||c.$.sheet},createElement:function(a,
+f){var c=new CKEDITOR.dom.element(a,this);f&&(f.attributes&&c.setAttributes(f.attributes),f.styles&&c.setStyles(f.styles));return c},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(f){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,f){for(var c=this.$.documentElement,e=0;c&&
+e<a.length;e++){var h=a[e];if(f)for(var m=-1,l=0;l<c.childNodes.length;l++){var k=c.childNodes[l];if(!0!==f||3!=k.nodeType||!k.previousSibling||3!=k.previousSibling.nodeType)if(m++,m==h){c=k;break}}else c=c.childNodes[h]}return c?new CKEDITOR.dom.node(c):null},getElementsByTag:function(a,f){CKEDITOR.env.ie&&8>=document.documentMode||!f||(a=f+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];return a=a?new CKEDITOR.dom.element(a):
+this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+CKEDITOR.tools.fixDomain+
+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}}),CKEDITOR.dom.nodeList=function(a){this.$=a},CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},
+getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}},CKEDITOR.dom.element=function(a,f){"string"==typeof a&&(a=(f?f.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))},CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node,CKEDITOR.dom.element.createFromHtml=function(a,f){var c=
+new CKEDITOR.dom.element("div",f);c.setHtml(a);return c.getFirst().remove()},CKEDITOR.dom.element.setMarker=function(a,f,c,e){var h=f.getCustomData("list_marker_id")||f.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),m=f.getCustomData("list_marker_names")||f.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[h]=f;m[c]=1;return f.setCustomData(c,e)},CKEDITOR.dom.element.clearAllMarkers=function(a){for(var f in a)CKEDITOR.dom.element.clearMarkers(a,
+a[f],1)},CKEDITOR.dom.element.clearMarkers=function(a,f,c){var e=f.getCustomData("list_marker_names"),h=f.getCustomData("list_marker_id"),m;for(m in e)f.removeCustomData(m);f.removeCustomData("list_marker_names");c&&(f.removeCustomData("list_marker_id"),delete a[h])},function(){function a(a,b){return-1<(" "+a+" ").replace(m," ").indexOf(" "+b+" ")}function f(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function c(a,b){return"#"+
+a.$.id+" "+b.split(/,\s*/).join(", #"+a.$.id+" ")}function e(a){for(var b=0,d=0,g=l[a].length;d<g;d++)b+=parseInt(this.getComputedStyle(l[a][d])||0,10)||0;return b}var h=document.createElement("_").classList,h="undefined"!==typeof h&&null!==String(h.add).match(/\[Native code\]/gi),m=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:h?function(a){this.$.classList.add(a);return this}:function(k){var b=this.$.className;b&&(a(b,k)||(b+=" "+k));this.$.className=
+b||k;return this},removeClass:h?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(k){var b=this.getAttribute("class");b&&a(b,k)&&((b=b.replace(new RegExp("(?:^|\\s+)"+k+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",b):this.removeAttribute("class"));return this},hasClass:function(k){return a(this.$.className,k)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):
+this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&
+a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var d=new CKEDITOR.dom.range(this.getDocument());d.setStartAfter(this);d.setEndAfter(a);var g=d.extractContents(!1,b||!1);d.insertNode(this.remove());g.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
+b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},
+this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var d=this.getDocument()._getHtml5ShivFrag();d.appendChild(b);b.innerHTML=a;d.removeChild(b);return a}catch(g){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:
+function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,
+2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},
 getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||
 0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},
 getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=
 this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);
 a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var d=this.getParent();d.type==CKEDITOR.NODE_ELEMENT&&(d=d.clone(),d.setHtml(b),b=d.getHtml(),d.setHtml(a),a=d.getHtml())}return b==
-a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,d;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(d=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(d)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;for(var a=this.getChildren(),b=0,d=a.count();b<d;b++){var h=a.getItem(b);if(h.type!=CKEDITOR.NODE_ELEMENT||!h.data("cke-bookmark"))if(h.type==
-CKEDITOR.NODE_ELEMENT&&!h.isEmptyInlineRemoveable()||h.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(h.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var d=a[b];switch(d.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;default:if(d.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,d={"data-cke-expando":1,_moz_dirty:1};
+a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,d;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(d=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(d)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;for(var a=this.getChildren(),b=0,d=a.count();b<d;b++){var g=a.getItem(b);if(g.type!=CKEDITOR.NODE_ELEMENT||!g.data("cke-bookmark"))if(g.type==
+CKEDITOR.NODE_ELEMENT&&!g.isEmptyInlineRemoveable()||g.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(g.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var d=a[b];switch(d.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;default:if(d.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,d={"data-cke-expando":1,_moz_dirty:1};
 return 0<b&&(2<b||!d[a[0].nodeName]||2==b&&!d[a[1].nodeName])},hasAttribute:function(){function a(b){var d=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return d?d.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),
-hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var d=this.$;a=a.$;if(d!=a){var h;if(b)for(;h=d.lastChild;)a.insertBefore(d.removeChild(h),a.firstChild);else for(;h=d.firstChild;)a.appendChild(d.removeChild(h))}},mergeSiblings:function(){function a(b,d,h){if(d&&d.type==CKEDITOR.NODE_ELEMENT){for(var c=[];d.data("cke-bookmark")||d.isEmptyInlineRemoveable();)if(c.push(d),d=h?d.getNext():d.getPrevious(),!d||d.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(d)){for(var k=
-h?b.getLast():b.getFirst();c.length;)c.shift().move(b,!h);d.moveChildren(b,!h);d.remove();k&&k.type==CKEDITOR.NODE_ELEMENT&&k.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",visibility:""})},setAttribute:function(){var a=function(a,d){this.$.setAttribute(a,d);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,
-d){"class"==b?this.$.className=d:"style"==b?this.$.style.cssText=d:"tabindex"==b?this.$.tabIndex=d:"checked"==b?this.$.checked=d:"contenteditable"==b?a.call(this,"contentEditable",d):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,d){if("src"==b&&d.match(/^http:\/\//))try{a.apply(this,arguments)}catch(h){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=
+hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var d=this.$;a=a.$;if(d!=a){var g;if(b)for(;g=d.lastChild;)a.insertBefore(d.removeChild(g),a.firstChild);else for(;g=d.firstChild;)a.appendChild(d.removeChild(g))}},mergeSiblings:function(){function a(b,d,g){if(d&&d.type==CKEDITOR.NODE_ELEMENT){for(var c=[];d.data("cke-bookmark")||d.isEmptyInlineRemoveable();)if(c.push(d),d=g?d.getNext():d.getPrevious(),!d||d.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(d)){for(var e=
+g?b.getLast():b.getFirst();c.length;)c.shift().move(b,!g);d.moveChildren(b,!g);d.remove();e&&e.type==CKEDITOR.NODE_ELEMENT&&e.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",visibility:""})},setAttribute:function(){var a=function(a,d){this.$.setAttribute(a,d);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,
+d){"class"==b?this.$.className=d:"style"==b?this.$.style.cssText=d:"tabindex"==b?this.$.tabIndex=d:"checked"==b?this.$.checked=d:"contenteditable"==b?a.call(this,"contentEditable",d):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,d){if("src"==b&&d.match(/^http:\/\//))try{a.apply(this,arguments)}catch(g){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=
 a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=
-this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var d=["top","left","right","bottom"],h;"border"==a&&(h=["color","style","width"]);for(var b=[],c=0;c<d.length;c++)if(h)for(var f=0;f<h.length;f++)b.push([a,d[c],h[f]].join("-"));else b.push([a,d[c]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,
+this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var d=["top","left","right","bottom"],g;"border"==a&&(g=["color","style","width"]);for(var b=[],c=0;c<d.length;c++)if(g)for(var e=0;e<g.length;e++)b.push([a,d[c],g[e]].join("-"));else b.push([a,d[c]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,
 b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,
-b=this.getElementsByTag("*"),d=0,h=b.count();d<h;d++)a=b.getItem(d),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,d=0,h=this.getDocument(),c=h.getBody(),f="BackCompat"==h.$.compatMode;if(document.documentElement.getBoundingClientRect){var g=this.$.getBoundingClientRect(),e=h.$.documentElement,n=e.clientTop||c.$.clientTop||
-0,q=e.clientLeft||c.$.clientLeft||0,m=!0;CKEDITOR.env.ie&&(m=h.getDocumentElement().contains(this),h=h.getBody().contains(this),m=f&&h||!f&&m);m&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=c.$.scrollLeft||e.scrollLeft,d=c.$.scrollTop||e.scrollTop):(d=f?c.$:e,b=d.scrollLeft,d=d.scrollTop),b=g.left+b-q,d=g.top+d-n)}else for(n=this,q=null;n&&"body"!=n.getName()&&"html"!=n.getName();){b+=n.$.offsetLeft-n.$.scrollLeft;d+=n.$.offsetTop-n.$.scrollTop;n.equals(this)||(b+=n.$.clientLeft||
-0,d+=n.$.clientTop||0);for(;q&&!q.equals(n);)b-=q.$.scrollLeft,d-=q.$.scrollTop,q=q.getParent();q=n;n=(g=n.$.offsetParent)?new CKEDITOR.dom.element(g):null}a&&(g=this.getWindow(),n=a.getWindow(),!g.equals(n)&&g.$.frameElement&&(a=(new CKEDITOR.dom.element(g.$.frameElement)).getDocumentPosition(a),b+=a.x,d+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||f||(b+=this.$.clientLeft?1:0,d+=this.$.clientTop?1:0);return{x:b,y:d}},scrollIntoView:function(a){var b=this.getParent();
-if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var d=b.getWindow();try{var h=d.$.frameElement;h&&(b=new CKEDITOR.dom.element(h))}catch(c){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,d){var h,c,f,g;function e(h,b){/body|html/.test(a.getName())?a.getWindow().$.scrollBy(h,b):(a.$.scrollLeft+=h,a.$.scrollTop+=b)}function n(a,h){var b={x:0,y:0};if(!a.is(l?"body":
-"html")){var d=a.$.getBoundingClientRect();b.x=d.left;b.y=d.top}d=a.getWindow();d.equals(h)||(d=n(CKEDITOR.dom.element.get(d.$.frameElement),h),b.x+=d.x,b.y+=d.y);return b}function m(a,h){return parseInt(a.getComputedStyle("margin-"+h)||0,10)||0}!a&&(a=this.getWindow());f=a.getDocument();var l="BackCompat"==f.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=l?f.getBody():f.getDocumentElement());f=a.getWindow();c=n(this,f);var y=n(a,f),C=this.$.offsetHeight;h=this.$.offsetWidth;var r=a.$.clientHeight,
-x=a.$.clientWidth;f=c.x-m(this,"left")-y.x||0;g=c.y-m(this,"top")-y.y||0;h=c.x+h+m(this,"right")-(y.x+x)||0;c=c.y+C+m(this,"bottom")-(y.y+r)||0;(0>g||0<c)&&e(0,!0===b?g:!1===b?c:0>g?g:c);d&&(0>f||0<h)&&e(0>f?f:h,0)},setState:function(a,b,d){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+"_off");this.removeClass(b+"_disabled");d&&this.setAttribute("aria-pressed",!0);d&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+
+b=this.getElementsByTag("*"),d=0,g=b.count();d<g;d++)a=b.getItem(d),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,d=0,g=this.getDocument(),c=g.getBody(),e="BackCompat"==g.$.compatMode;if(document.documentElement.getBoundingClientRect){var h=this.$.getBoundingClientRect(),f=g.$.documentElement,n=f.clientTop||c.$.clientTop||
+0,q=f.clientLeft||c.$.clientLeft||0,m=!0;CKEDITOR.env.ie&&(m=g.getDocumentElement().contains(this),g=g.getBody().contains(this),m=e&&g||!e&&m);m&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=c.$.scrollLeft||f.scrollLeft,d=c.$.scrollTop||f.scrollTop):(d=e?c.$:f,b=d.scrollLeft,d=d.scrollTop),b=h.left+b-q,d=h.top+d-n)}else for(n=this,q=null;n&&"body"!=n.getName()&&"html"!=n.getName();){b+=n.$.offsetLeft-n.$.scrollLeft;d+=n.$.offsetTop-n.$.scrollTop;n.equals(this)||(b+=n.$.clientLeft||
+0,d+=n.$.clientTop||0);for(;q&&!q.equals(n);)b-=q.$.scrollLeft,d-=q.$.scrollTop,q=q.getParent();q=n;n=(h=n.$.offsetParent)?new CKEDITOR.dom.element(h):null}a&&(h=this.getWindow(),n=a.getWindow(),!h.equals(n)&&h.$.frameElement&&(a=(new CKEDITOR.dom.element(h.$.frameElement)).getDocumentPosition(a),b+=a.x,d+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||e||(b+=this.$.clientLeft?1:0,d+=this.$.clientTop?1:0);return{x:b,y:d}},scrollIntoView:function(a){var b=this.getParent();
+if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var d=b.getWindow();try{var g=d.$.frameElement;g&&(b=new CKEDITOR.dom.element(g))}catch(c){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,d){var g,c,e,h;function f(g,b){/body|html/.test(a.getName())?a.getWindow().$.scrollBy(g,b):(a.$.scrollLeft+=g,a.$.scrollTop+=b)}function n(a,g){var b={x:0,y:0};if(!a.is(m?"body":
+"html")){var d=a.$.getBoundingClientRect();b.x=d.left;b.y=d.top}d=a.getWindow();d.equals(g)||(d=n(CKEDITOR.dom.element.get(d.$.frameElement),g),b.x+=d.x,b.y+=d.y);return b}function q(a,g){return parseInt(a.getComputedStyle("margin-"+g)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var m="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=m?e.getBody():e.getDocumentElement());e=a.getWindow();c=n(this,e);var l=n(a,e),B=this.$.offsetHeight;g=this.$.offsetWidth;var t=a.$.clientHeight,
+x=a.$.clientWidth;e=c.x-q(this,"left")-l.x||0;h=c.y-q(this,"top")-l.y||0;g=c.x+g+q(this,"right")-(l.x+x)||0;c=c.y+B+q(this,"bottom")-(l.y+t)||0;(0>h||0<c)&&f(0,!0===b?h:!1===b?c:0>h?h:c);d&&(0>e||0<g)&&f(0>e?e:g,0)},setState:function(a,b,d){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+"_off");this.removeClass(b+"_disabled");d&&this.setAttribute("aria-pressed",!0);d&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+
 "_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");d&&this.setAttribute("aria-disabled",!0);d&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),d&&this.removeAttribute("aria-pressed"),d&&this.removeAttribute("aria-disabled")}},getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,
-b){var d=this.$.attributes;b=b||{};for(var h=0;h<d.length;h++){var c=d[h],f=c.nodeName.toLowerCase(),g;if(!(f in b))if("checked"==f&&(g=this.getAttribute(f)))a.setAttribute(f,g);else if(!CKEDITOR.env.ie||this.hasAttribute(f))g=this.getAttribute(f),null===g&&(g=c.nodeValue),a.setAttribute(f,g)}""!==this.$.style.cssText&&(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);
-this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,d){var h=b.childNodes;if(0<=d&&d<h.length)return h[d]}return function(b){var d=this.$;if(b.slice)for(b=b.slice();0<b.length&&d;)d=a(d,b.shift());else d=a(d,b);return d?new CKEDITOR.dom.node(d):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&
+b){var d=this.$.attributes;b=b||{};for(var g=0;g<d.length;g++){var c=d[g],e=c.nodeName.toLowerCase(),h;if(!(e in b))if("checked"==e&&(h=this.getAttribute(e)))a.setAttribute(e,h);else if(!CKEDITOR.env.ie||this.hasAttribute(e))h=this.getAttribute(e),null===h&&(h=c.nodeValue),a.setAttribute(e,h)}""!==this.$.style.cssText&&(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);
+this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,d){var g=b.childNodes;if(0<=d&&d<g.length)return g[d]}return function(b){var d=this.$;if(b.slice)for(b=b.slice();0<b.length&&d;)d=a(d,b.shift());else d=a(d,b);return d?new CKEDITOR.dom.node(d):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&
 b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},
-getEditor:function(){var a=CKEDITOR.instances,b,d;for(b in a)if(d=a[b],d.element.equals(this)&&d.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO)return d;return null},find:function(a){var b=e(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(c(this,a)));b();return a},findOne:function(a){var b=e(this);a=this.$.querySelector(c(this,a));b();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,d){if(!(d||b&&this.type!=b))var h=a(this);if(!1!==h){d=this.getChildren();for(var c=0;c<d.count();c++)h=
-d.getItem(c),h.type==CKEDITOR.NODE_ELEMENT?h.forEach(a,b):b&&h.type!=b||a(h)}}});var l={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=g.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],
-this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=g.call(this,a));return d}}(),CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a},CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,
-1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1}),function(){function a(a,h){var b=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(b.collapsed)return this.end(),null;b.optimize()}var d,c=b.startContainer;
-d=b.endContainer;var f=b.startOffset,g=b.endOffset,p,k=this.guard,e=this.type,m=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var l=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),z=d.type==CKEDITOR.NODE_ELEMENT?d.getChild(g):d.getNext();this._.guardLTR=function(a,h){return(!h||!l.equals(a))&&(!z||!a.equals(z))&&(a.type!=CKEDITOR.NODE_ELEMENT||!h||!a.equals(b.root))}}if(a&&!this._.guardRTL){var D=c.type==CKEDITOR.NODE_ELEMENT?c:c.getParent(),G=c.type==CKEDITOR.NODE_ELEMENT?
-f?c.getChild(f-1):null:c.getPrevious();this._.guardRTL=function(a,h){return(!h||!D.equals(a))&&(!G||!a.equals(G))&&(a.type!=CKEDITOR.NODE_ELEMENT||!h||!a.equals(b.root))}}var F=a?this._.guardRTL:this._.guardLTR;p=k?function(a,h){return!1===F(a,h)?!1:k(a,h)}:F;this.current?d=this.current[m](!1,e,p):(a?d.type==CKEDITOR.NODE_ELEMENT&&(d=0<g?d.getChild(g-1):!1===p(d,!0)?null:d.getPreviousSourceNode(!0,e,p)):(d=c,d.type==CKEDITOR.NODE_ELEMENT&&((d=d.getChild(f))||(d=!1===p(c,!0)?null:c.getNextSourceNode(!0,
-e,p)))),d&&!1===p(d)&&(d=null));for(;d&&!this._.end;){this.current=d;if(!this.evaluator||!1!==this.evaluator(d)){if(!h)return d}else if(h&&this.evaluator)return!1;d=d[m](!1,e,p)}this.end();return this.current=null}function e(h){for(var b,d=null;b=a.call(this,h);)d=b;return d}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==
-a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return e.call(this)},lastBackward:function(){return e.call(this,1)},reset:function(){delete this.current;this._={}}}});var c={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,"table-column":1,"table-cell":1,"table-caption":1},g={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=
-this.getComputedStyle("float")||this.getComputedStyle("position")in g||!c[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(h){return!(h.type==CKEDITOR.NODE_ELEMENT&&h.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};CKEDITOR.dom.walker.bookmark=function(a,h){function b(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(d){var c,
-f;c=d&&d.type!=CKEDITOR.NODE_ELEMENT&&(f=d.getParent())&&b(f);c=a?c:c||b(d);return!!(h^c)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(h){var b;h&&h.type==CKEDITOR.NODE_TEXT&&(b=!CKEDITOR.tools.trim(h.getText())||CKEDITOR.env.webkit&&"​"==h.getText());return!!(a^b)}};CKEDITOR.dom.walker.invisible=function(a){var h=CKEDITOR.dom.walker.whitespaces(),b=CKEDITOR.env.webkit?1:0;return function(d){h(d)?d=1:(d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent()),d=d.$.offsetWidth<=b);return!!(a^
-d)}};CKEDITOR.dom.walker.nodeType=function(a,h){return function(b){return!!(h^b.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function h(a){return!m(a)&&!l(a)}return function(b){var d=CKEDITOR.env.needsBrFiller?b.is&&b.is("br"):b.getText&&f.test(b.getText());d&&(d=b.getParent(),b=b.getNext(h),d=d.isBlockBoundary()&&(!b||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()));return!!(a^d)}};CKEDITOR.dom.walker.temp=function(a){return function(h){h.type!=CKEDITOR.NODE_ELEMENT&&(h=h.getParent());h=
-h&&h.hasAttribute("data-cke-temp");return!!(a^h)}};var f=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,m=CKEDITOR.dom.walker.whitespaces(),l=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),b=function(a){return l(a)||m(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=function(a){return function(h){h=m(h)||l(h)||k(h);return!!(a^h)}};var d=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(h){for(var b=
-0,c=h.getChildCount();b<c;++b)if(!d(h.getChild(b)))return!!a;return!a}};var h=CKEDITOR.dom.walker.empty(),p=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var h={},b;for(b in a)CKEDITOR.dtd[b]["#"]&&(h[b]=1);return h}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=d(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||
-!CKEDITOR.env.needsBrFiller&&b.is(p)&&h(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(b(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&f.test(a.getText()))?a:!1}}(),CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var e=a instanceof CKEDITOR.dom.document;this.document=e?a:a.getDocument();this.root=e?a.getBody():a},function(){function a(a){a.collapsed=
-a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function e(a,b,d,c,f){function g(a,h,b,d){var c=b?a.getPrevious():a.getNext();if(d&&m)return c;r||d?h.append(a.clone(!0,f),b):(a.remove(),l&&h.append(a));return c}function k(){var a,h,b,d=Math.min(E.length,P.length);for(a=0;a<d;a++)if(h=E[a],b=P[a],!h.equals(b))return a;return a-1}function e(){var b=T-1,d=F&&J&&!x.equals(B);b<L-1||b<Q-1||d?(d?a.moveToPosition(B,CKEDITOR.POSITION_BEFORE_START):Q==
-b+1&&G?a.moveToPosition(P[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(P[b+1],CKEDITOR.POSITION_BEFORE_START),c&&(b=E[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(d=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),d.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:d}))):a.collapse(!0)}a.optimizeBookmark();var m=0===b,l=1==b,r=2==b;b=r||l;var x=a.startContainer,B=a.endContainer,A=a.startOffset,z=a.endOffset,
-D,G,F,J,I,N;if(r&&B.type==CKEDITOR.NODE_TEXT&&x.equals(B))x=a.document.createText(x.substring(A,z)),d.append(x);else{B.type==CKEDITOR.NODE_TEXT?r?N=!0:B=B.split(z):0<B.getChildCount()?z>=B.getChildCount()?(B=B.getChild(z-1),G=!0):B=B.getChild(z):J=G=!0;x.type==CKEDITOR.NODE_TEXT?r?I=!0:x.split(A):0<x.getChildCount()?0===A?(x=x.getChild(A),D=!0):x=x.getChild(A-1):F=D=!0;for(var E=x.getParents(),P=B.getParents(),T=k(),L=E.length-1,Q=P.length-1,O=d,U,K,V,R=-1,H=T;H<=L;H++){K=E[H];V=K.getNext();for(H!=
-L||K.equals(P[H])&&L<Q?b&&(U=O.append(K.clone(0,f))):D?g(K,O,!1,F):I&&O.append(a.document.createText(K.substring(A)));V;){if(V.equals(P[H])){R=H;break}V=g(V,O)}O=U}O=d;for(H=T;H<=Q;H++)if(d=P[H],V=d.getPrevious(),d.equals(E[H]))b&&(O=O.getChild(0));else{H!=Q||d.equals(E[H])&&Q<L?b&&(U=O.append(d.clone(0,f))):G?g(d,O,!1,J):N&&O.append(a.document.createText(d.substring(0,z)));if(H>R)for(;V;)V=g(V,O,!0);O=U}r||e()}}function c(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!0),
-c=CKEDITOR.dom.walker.bogus();return function(f){return d(f)||b(f)?!0:c(f)&&!a?a=!0:f.type==CKEDITOR.NODE_TEXT&&(f.hasAscendant("pre")||CKEDITOR.tools.trim(f.getText()).length)||f.type==CKEDITOR.NODE_ELEMENT&&!f.is(m)?!1:!0}}function g(a){var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(1);return function(c){return d(c)||b(c)?!0:!a&&l(c)||c.type==CKEDITOR.NODE_ELEMENT&&c.is(CKEDITOR.dtd.$removeEmpty)}}function f(a){return function(){var c;return this[a?"getPreviousNode":"getNextNode"](function(a){!c&&
+getEditor:function(){var a=CKEDITOR.instances,b,d;for(b in a)if(d=a[b],d.element.equals(this)&&d.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO)return d;return null},find:function(a){var b=f(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(c(this,a)));b();return a},findOne:function(a){var b=f(this);a=this.$.querySelector(c(this,a));b();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,d){if(!(d||b&&this.type!=b))var g=a(this);if(!1!==g){d=this.getChildren();for(var c=0;c<d.count();c++)g=
+d.getItem(c),g.type==CKEDITOR.NODE_ELEMENT?g.forEach(a,b):b&&g.type!=b||a(g)}}});var l={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=e.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],
+this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=e.call(this,a));return d}}(),CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a},CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,
+1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1}),function(){function a(a,g){var b=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(b.collapsed)return this.end(),null;b.optimize()}var d,c=b.startContainer;
+d=b.endContainer;var e=b.startOffset,h=b.endOffset,p,k=this.guard,f=this.type,m=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var l=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),z=d.type==CKEDITOR.NODE_ELEMENT?d.getChild(h):d.getNext();this._.guardLTR=function(a,g){return(!g||!l.equals(a))&&(!z||!a.equals(z))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(b.root))}}if(a&&!this._.guardRTL){var C=c.type==CKEDITOR.NODE_ELEMENT?c:c.getParent(),G=c.type==CKEDITOR.NODE_ELEMENT?
+e?c.getChild(e-1):null:c.getPrevious();this._.guardRTL=function(a,g){return(!g||!C.equals(a))&&(!G||!a.equals(G))&&(a.type!=CKEDITOR.NODE_ELEMENT||!g||!a.equals(b.root))}}var E=a?this._.guardRTL:this._.guardLTR;p=k?function(a,g){return!1===E(a,g)?!1:k(a,g)}:E;this.current?d=this.current[m](!1,f,p):(a?d.type==CKEDITOR.NODE_ELEMENT&&(d=0<h?d.getChild(h-1):!1===p(d,!0)?null:d.getPreviousSourceNode(!0,f,p)):(d=c,d.type==CKEDITOR.NODE_ELEMENT&&((d=d.getChild(e))||(d=!1===p(c,!0)?null:c.getNextSourceNode(!0,
+f,p)))),d&&!1===p(d)&&(d=null));for(;d&&!this._.end;){this.current=d;if(!this.evaluator||!1!==this.evaluator(d)){if(!g)return d}else if(g&&this.evaluator)return!1;d=d[m](!1,f,p)}this.end();return this.current=null}function f(g){for(var b,d=null;b=a.call(this,g);)d=b;return d}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==
+a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return f.call(this)},lastBackward:function(){return f.call(this,1)},reset:function(){delete this.current;this._={}}}});var c={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,"table-column":1,"table-cell":1,"table-caption":1},e={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=
+this.getComputedStyle("float")||this.getComputedStyle("position")in e||!c[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(g){return!(g.type==CKEDITOR.NODE_ELEMENT&&g.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};CKEDITOR.dom.walker.bookmark=function(a,g){function b(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(d){var c,
+e;c=d&&d.type!=CKEDITOR.NODE_ELEMENT&&(e=d.getParent())&&b(e);c=a?c:c||b(d);return!!(g^c)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(g){var b;g&&g.type==CKEDITOR.NODE_TEXT&&(b=!CKEDITOR.tools.trim(g.getText())||CKEDITOR.env.webkit&&g.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^b)}};CKEDITOR.dom.walker.invisible=function(a){var g=CKEDITOR.dom.walker.whitespaces(),b=CKEDITOR.env.webkit?1:0;return function(d){g(d)?d=1:(d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent()),
+d=d.$.offsetWidth<=b);return!!(a^d)}};CKEDITOR.dom.walker.nodeType=function(a,g){return function(b){return!!(g^b.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function g(a){return!m(a)&&!l(a)}return function(b){var d=CKEDITOR.env.needsBrFiller?b.is&&b.is("br"):b.getText&&h.test(b.getText());d&&(d=b.getParent(),b=b.getNext(g),d=d.isBlockBoundary()&&(!b||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()));return!!(a^d)}};CKEDITOR.dom.walker.temp=function(a){return function(g){g.type!=CKEDITOR.NODE_ELEMENT&&
+(g=g.getParent());g=g&&g.hasAttribute("data-cke-temp");return!!(a^g)}};var h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,m=CKEDITOR.dom.walker.whitespaces(),l=CKEDITOR.dom.walker.bookmark(),k=CKEDITOR.dom.walker.temp(),b=function(a){return l(a)||m(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=function(a){return function(g){g=m(g)||l(g)||k(g);return!!(a^g)}};var d=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(g){for(var b=
+0,c=g.getChildCount();b<c;++b)if(!d(g.getChild(b)))return!!a;return!a}};var g=CKEDITOR.dom.walker.empty(),p=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var g={},b;for(b in a)CKEDITOR.dtd[b]["#"]&&(g[b]=1);return g}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=d(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||
+!CKEDITOR.env.needsBrFiller&&b.is(p)&&g(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(b(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&h.test(a.getText()))?a:!1}}(),CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var f=a instanceof CKEDITOR.dom.document;this.document=f?a:a.getDocument();this.root=f?a.getBody():a},function(){function a(a){a.collapsed=
+a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function f(a,b,d,c,e){function h(a,g,b,d){var c=b?a.getPrevious():a.getNext();if(d&&m)return c;t||d?g.append(a.clone(!0,e),b):(a.remove(),l&&g.append(a));return c}function k(){var a,g,b,d=Math.min(F.length,P.length);for(a=0;a<d;a++)if(g=F[a],b=P[a],!g.equals(b))return a;return a-1}function f(){var b=R-1,d=E&&J&&!x.equals(D);b<L-1||b<Q-1||d?(d?a.moveToPosition(D,CKEDITOR.POSITION_BEFORE_START):Q==
+b+1&&G?a.moveToPosition(P[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(P[b+1],CKEDITOR.POSITION_BEFORE_START),c&&(b=F[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(d=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),d.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:d}))):a.collapse(!0)}a.optimizeBookmark();var m=0===b,l=1==b,t=2==b;b=t||l;var x=a.startContainer,D=a.endContainer,y=a.startOffset,z=a.endOffset,
+C,G,E,J,I,N;if(t&&D.type==CKEDITOR.NODE_TEXT&&x.equals(D))x=a.document.createText(x.substring(y,z)),d.append(x);else{D.type==CKEDITOR.NODE_TEXT?t?N=!0:D=D.split(z):0<D.getChildCount()?z>=D.getChildCount()?(D=D.getChild(z-1),G=!0):D=D.getChild(z):J=G=!0;x.type==CKEDITOR.NODE_TEXT?t?I=!0:x.split(y):0<x.getChildCount()?0===y?(x=x.getChild(y),C=!0):x=x.getChild(y-1):E=C=!0;for(var F=x.getParents(),P=D.getParents(),R=k(),L=F.length-1,Q=P.length-1,O=d,U,K,V,S=-1,H=R;H<=L;H++){K=F[H];V=K.getNext();for(H!=
+L||K.equals(P[H])&&L<Q?b&&(U=O.append(K.clone(0,e))):C?h(K,O,!1,E):I&&O.append(a.document.createText(K.substring(y)));V;){if(V.equals(P[H])){S=H;break}V=h(V,O)}O=U}O=d;for(H=R;H<=Q;H++)if(d=P[H],V=d.getPrevious(),d.equals(F[H]))b&&(O=O.getChild(0));else{H!=Q||d.equals(F[H])&&Q<L?b&&(U=O.append(d.clone(0,e))):G?h(d,O,!1,J):N&&O.append(a.document.createText(d.substring(0,z)));if(H>S)for(;V;)V=h(V,O,!0);O=U}t||f()}}function c(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!0),
+c=CKEDITOR.dom.walker.bogus();return function(e){return d(e)||b(e)?!0:c(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(m)?!1:!0}}function e(a){var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(1);return function(c){return d(c)||b(c)?!0:!a&&l(c)||c.type==CKEDITOR.NODE_ELEMENT&&c.is(CKEDITOR.dtd.$removeEmpty)}}function h(a){return function(){var c;return this[a?"getPreviousNode":"getNextNode"](function(a){!c&&
 d(a)&&(c=a);return b(a)&&!(l(a)&&a.equals(c))})}}var m={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},l=CKEDITOR.dom.walker.bogus(),k=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,b=CKEDITOR.dom.walker.editable(),d=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;
-a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||e(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||e(this,0,null,
-a)},extractContents:function(a,b){var d=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||e(this,1,d,a,"undefined"==typeof b?!0:b);return d},createBookmark:function(a){var b,d,c,f,g=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(c="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",c+(g?"C":"S")));g||(d=b.clone(),d.setHtml("\x26nbsp;"),a&&d.setAttribute("id",c+"E"),f=this.clone(),f.collapse(),
-f.insertNode(d));f=this.clone();f.collapse(!0);f.insertNode(b);d?(this.setStartAfter(b),this.setEndBefore(d)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?c+(g?"C":"S"):b,endNode:a?c+"E":d,serializable:a,collapsed:g}},createBookmark2:function(){function a(h){var d=h.container,c=h.offset,f;f=d;var g=c;f=f.type!=CKEDITOR.NODE_ELEMENT||0===g||g==f.getChildCount()?0:f.getChild(g-1).type==CKEDITOR.NODE_TEXT&&f.getChild(g).type==CKEDITOR.NODE_TEXT;f&&(d=d.getChild(c-1),c=d.getLength());
-d.type==CKEDITOR.NODE_ELEMENT&&1<c&&(c=d.getChild(c-1).getIndex(!0)+1);if(d.type==CKEDITOR.NODE_TEXT){f=d;for(g=0;(f=f.getPrevious())&&f.type==CKEDITOR.NODE_TEXT;)g+=f.getLength();f=g;d.getText()?c+=f:(g=d.getPrevious(b),f?(c=f,d=g?g.getNext():d.getParent().getFirst()):(d=d.getParent(),c=g?g.getIndex(!0)+1:0))}h.container=d;h.offset=c}var b=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(b){var d=this.collapsed,c={container:this.startContainer,offset:this.startOffset},f={container:this.endContainer,
-offset:this.endOffset};b&&(a(c),d||a(f));return{start:c.container.getAddress(b),end:d?null:f.container.getAddress(b),startOffset:c.offset,endOffset:f.offset,normalized:b,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),d=a.startOffset,c=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,d);c?this.setEnd(c,a):this.collapse(!0)}else b=(d=a.serializable)?this.document.getById(a.startNode):a.startNode,
-a=d?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,d=this.startOffset,c=this.endOffset,f;if(a.type==CKEDITOR.NODE_ELEMENT)if(f=a.getChildCount(),f>d)a=a.getChild(d);else if(1>f)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(f=b.getChildCount(),
-f>c)b=b.getChild(c).getPreviousSourceNode(!0);else if(1>f)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var d=this.startContainer,c=this.endContainer,d=d.equals(c)?a&&d.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?d.getChild(this.startOffset):d:d.getCommonAncestor(c);return b&&!d.is?d.getParent():d},optimize:function(){var a=
-this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},
-trim:function(a,b){var d=this.startContainer,c=this.startOffset,f=this.collapsed;if((!a||f)&&d&&d.type==CKEDITOR.NODE_TEXT){if(c)if(c>=d.getLength())c=d.getIndex()+1,d=d.getParent();else{var g=d.split(c),c=d.getIndex()+1,d=d.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(g,this.endOffset-this.startOffset):d.equals(this.endContainer)&&(this.endOffset+=1)}else c=d.getIndex(),d=d.getParent();this.setStart(d,c);if(f){this.collapse(!0);return}}d=this.endContainer;c=this.endOffset;
-b||f||!d||d.type!=CKEDITOR.NODE_TEXT||(c?(c>=d.getLength()||d.split(c),c=d.getIndex()+1):c=d.getIndex(),d=d.getParent(),this.setEnd(d,c))},enlarge:function(a,b){function d(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var c=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var f=1;case CKEDITOR.ENLARGE_ELEMENT:var g=function(a,b){var d=new CKEDITOR.dom.range(e);d.setStart(a,b);d.setEndAt(e,CKEDITOR.POSITION_BEFORE_END);var d=new CKEDITOR.dom.walker(d),
-h;for(d.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};h=d.next();){if(h.type!=CKEDITOR.NODE_TEXT)return!1;D=h!=a?h.getText():h.substring(b);if(c.test(D))return!1}return!0};if(this.collapsed)break;var k=this.getCommonAncestor(),e=this.root,m,l,r,x,B,A=!1,z,D;z=this.startContainer;var G=this.startOffset;z.type==CKEDITOR.NODE_TEXT?(G&&(z=!CKEDITOR.tools.trim(z.substring(0,G)).length&&z,A=!!z),z&&((x=z.getPrevious())||(r=z.getParent()))):(G&&(x=z.getChild(G-1)||z.getLast()),
-x||(r=z));for(r=d(r);r||x;){if(r&&!x){!B&&r.equals(k)&&(B=!0);if(f?r.isBlockBoundary():!e.contains(r))break;A&&"inline"==r.getComputedStyle("display")||(A=!1,B?m=r:this.setStartBefore(r));x=r.getPrevious()}for(;x;)if(z=!1,x.type==CKEDITOR.NODE_COMMENT)x=x.getPrevious();else{if(x.type==CKEDITOR.NODE_TEXT)D=x.getText(),c.test(D)&&(x=null),z=/[\s\ufeff]$/.test(D);else if((x.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&x.is("br"))&&!x.data("cke-bookmark"))if(A&&CKEDITOR.dtd.$removeEmpty[x.getName()]){D=
-x.getText();if(c.test(D))x=null;else for(var G=x.$.getElementsByTagName("*"),F=0,J;J=G[F++];)if(!CKEDITOR.dtd.$removeEmpty[J.nodeName.toLowerCase()]){x=null;break}x&&(z=!!D.length)}else x=null;z&&(A?B?m=r:r&&this.setStartBefore(r):A=!0);if(x){z=x.getPrevious();if(!r&&!z){r=x;x=null;break}x=z}else r=null}r&&(r=d(r.getParent()))}z=this.endContainer;G=this.endOffset;r=x=null;B=A=!1;z.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(z.substring(G)).length?A=!0:(A=!z.getLength(),G==z.getLength()?(x=z.getNext())||
-(r=z.getParent()):g(z,G)&&(r=z.getParent())):(x=z.getChild(G))||(r=z);for(;r||x;){if(r&&!x){!B&&r.equals(k)&&(B=!0);if(f?r.isBlockBoundary():!e.contains(r))break;A&&"inline"==r.getComputedStyle("display")||(A=!1,B?l=r:r&&this.setEndAfter(r));x=r.getNext()}for(;x;){z=!1;if(x.type==CKEDITOR.NODE_TEXT)D=x.getText(),g(x,0)||(x=null),z=/^[\s\ufeff]/.test(D);else if(x.type==CKEDITOR.NODE_ELEMENT){if((0<x.$.offsetWidth||b&&x.is("br"))&&!x.data("cke-bookmark"))if(A&&CKEDITOR.dtd.$removeEmpty[x.getName()]){D=
-x.getText();if(c.test(D))x=null;else for(G=x.$.getElementsByTagName("*"),F=0;J=G[F++];)if(!CKEDITOR.dtd.$removeEmpty[J.nodeName.toLowerCase()]){x=null;break}x&&(z=!!D.length)}else x=null}else z=1;z&&A&&(B?l=r:this.setEndAfter(r));if(x){z=x.getNext();if(!r&&!z){r=x;x=null;break}x=z}else r=null}r&&(r=d(r.getParent()))}m&&l&&(k=m.contains(l)?l:m,this.setStartBefore(k),this.setEndAfter(k));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:r=new CKEDITOR.dom.range(this.root);
-e=this.root;r.setStartAt(e,CKEDITOR.POSITION_AFTER_START);r.setEnd(this.startContainer,this.startOffset);r=new CKEDITOR.dom.walker(r);var I,N,E=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),P=null,T=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(P){if(P.equals(a)){P=null;return}}else P=a;else if(P)return;var b=E(a);b||(I=a);return b},f=function(a){var b=T(a);!b&&a.is&&a.is("br")&&(N=a);return b};r.guard=T;r=r.lastBackward();
-I=I||e;this.setStartAt(I,!I.is("br")&&(!r&&this.checkStartOfBlock()||r&&I.contains(r))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){r=this.clone();r=new CKEDITOR.dom.walker(r);var L=CKEDITOR.dom.walker.whitespaces(),Q=CKEDITOR.dom.walker.bookmark();r.evaluator=function(a){return!L(a)&&!Q(a)};if((r=r.previous())&&r.type==CKEDITOR.NODE_ELEMENT&&r.is("br"))break}r=this.clone();r.collapse();r.setEndAt(e,CKEDITOR.POSITION_BEFORE_END);r=new CKEDITOR.dom.walker(r);
-r.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?f:T;I=P=N=null;r=r.lastForward();I=I||e;this.setEndAt(I,!r&&this.checkEndOfBlock()||r&&I.contains(r)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);N&&this.setEndAfter(N)}},shrink:function(a,b,d){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var c=this.clone(),f=this.startContainer,g=this.endContainer,k=this.startOffset,e=this.endOffset,m=1,l=1;f&&f.type==CKEDITOR.NODE_TEXT&&(k?k>=f.getLength()?c.setStartAfter(f):(c.setStartBefore(f),m=
-0):c.setStartBefore(f));g&&g.type==CKEDITOR.NODE_TEXT&&(e?e>=g.getLength()?c.setEndAfter(g):(c.setEndAfter(g),l=0):c.setEndBefore(g));var c=new CKEDITOR.dom.walker(c),r=CKEDITOR.dom.walker.bookmark();c.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var x;c.guard=function(b,c){if(r(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(x)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&
-b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(x=b);return!0};m&&(f=c[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(f,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);l&&(c.reset(),(c=c[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(c,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!m&&!l)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,d=b.getChild(this.startOffset);
-d?a.insertBefore(d):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&
-(d=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=d;this.endContainer||(this._setEndContainer(b),this.endOffset=d);a(this)},setEnd:function(b,d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(d=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=d;this.startContainer||(this._setStartContainer(b),this.startOffset=d);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),
-a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},
-setEndAt:function(b,d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,b){var d=this.createBookmark(),c=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(c);
-c.trim();this.insertNode(c);var f=c.getBogus();f&&f.remove();c.appendBogus();this.moveToBookmark(d);return c},splitBlock:function(a,b){var d=new CKEDITOR.dom.elementPath(this.startContainer,this.root),c=new CKEDITOR.dom.elementPath(this.endContainer,this.root),f=d.block,g=c.block,k=null;if(!d.blockLimit.equals(c.blockLimit))return null;"br"!=a&&(f||(f=this.fixBlock(!0,a),g=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),g||(g=this.fixBlock(!1,a)));d=f&&this.checkStartOfBlock();
-c=g&&this.checkEndOfBlock();this.deleteContents();f&&f.equals(g)&&(c?(k=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(g,CKEDITOR.POSITION_AFTER_END),g=null):d?(k=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f=null):(g=this.splitElement(f,b||!1),f.is("ul","ol")||f.appendBogus()));return{previousBlock:f,nextBlock:g,wasStartOfBlock:d,wasEndOfBlock:c,elementPath:k}},splitElement:function(a,b){if(!this.collapsed)return null;
-this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var d=this.extractContents(!1,b||!1),c=a.clone(!1,b||!1);d.appendTo(c);c.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return c},removeEmptyBlocksAtEnd:function(){function a(h){return function(a){return b(a)||d(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||h.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var d=this.createBookmark(),
-c=this[b?"endPath":"startPath"](),f=c.block||c.blockLimit,g;f&&!f.equals(c.root)&&!f.getFirst(a(f));)g=f.getParent(),this[b?"setEndAt":"setStartAt"](f,CKEDITOR.POSITION_AFTER_END),f.remove(1),f=g;this.moveToBookmark(d)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,c=this.clone();c.collapse(d);c[d?"setStartAt":
-"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(c);c.evaluator=g(d);return c[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,b=this.startOffset;CKEDITOR.env.ie&&b&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,b)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);b=this.clone();b.collapse(!0);b.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);
-a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,b=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(b)),k.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);b=this.clone();b.collapse(!1);b.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkForward()},getPreviousNode:function(a,
-b,d){var c=this.clone();c.collapse(1);c.setStartAt(d||this.root,CKEDITOR.POSITION_AFTER_START);d=new CKEDITOR.dom.walker(c);d.evaluator=a;d.guard=b;return d.previous()},getNextNode:function(a,b,d){var c=this.clone();c.collapse();c.setEndAt(d||this.root,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(c);d.evaluator=a;d.guard=b;return d.next()},checkReadOnly:function(){function a(b,d){for(;b;){if(b.type==CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;
-if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(d)||b.equals(d)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,d=this.endContainer;return!(a(b,d)&&a(d,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?
-this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),
-this.setEndAfter(a),!0;var f=a,g=c,n=void 0;f.type==CKEDITOR.NODE_ELEMENT&&f.isEditable(!1)&&(n=f[b?"getLast":"getFirst"](d));g||n||(n=f[b?"getPrevious":"getNext"](d));a=n}return!!c},moveToClosestEditablePosition:function(a,b){var d,c=0,f,g,k=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(d=new CKEDITOR.dom.range(this.root),d.moveToPosition(a,k[b?0:1])):d=this.clone();if(a&&!a.is(CKEDITOR.dtd.$block))c=1;else if(f=d[b?"getNextEditableNode":"getPreviousEditableNode"]())c=1,(g=f.type==
-CKEDITOR.NODE_ELEMENT)&&f.is(CKEDITOR.dtd.$block)&&"false"==f.getAttribute("contenteditable")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),d.setEndAt(f,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&g&&f.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(d.setEnd(f,0),d.collapse()):d.moveToPosition(f,k[b?1:0]);c&&this.moveToRange(d);return!!c},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,
-!0)},getEnclosedNode:function(){var a=this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),d=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return d(a)&&b(a)};var c=a.next();a.reset();return c&&c.equals(a.previous())?c:null},getTouchedStartNode:function(){var a=this.startContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||
-a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:f(),getPreviousEditableNode:f(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,d,c,f=this.clone();f.optimize();(c=f.startContainer.type==CKEDITOR.NODE_TEXT)?(d=f.startContainer.getText(),b=f.startContainer.split(f.startOffset),a.insertAfter(f.startContainer)):
-f.insertNode(a);a.scrollIntoView();c&&(f.startContainer.setText(d),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a}}}(),CKEDITOR.POSITION_AFTER_START=1,CKEDITOR.POSITION_BEFORE_END=2,CKEDITOR.POSITION_BEFORE_START=3,CKEDITOR.POSITION_AFTER_END=4,CKEDITOR.ENLARGE_ELEMENT=1,CKEDITOR.ENLARGE_BLOCK_CONTENTS=2,CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3,CKEDITOR.ENLARGE_INLINE=4,CKEDITOR.START=1,CKEDITOR.END=2,CKEDITOR.SHRINK_ELEMENT=
-1,CKEDITOR.SHRINK_TEXT=2,"use strict",function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function e(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function c(a,b,f,g){a:{null==g&&(g=e(f));for(var k;k=g.shift();)if(k.getDtd().p){g={element:k,remaining:g};break a}g=null}if(!g)return 0;if((k=CKEDITOR.filter.instances[g.element.data("cke-filter")])&&
-!k.check(b))return c(a,b,f,g.remaining);b=new CKEDITOR.dom.range(g.element);b.selectNodeContents(g.element);b=b.createIterator();b.enlargeBr=a.enlargeBr;b.enforceRealBlocks=a.enforceRealBlocks;b.activeFilter=b.filter=k;a._.nestedEditable={element:g.element,container:f,remaining:g.remaining,iterator:b};return 1}function g(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var f=/^[\r\n\t ]+$/,m=CKEDITOR.dom.walker.bookmark(!1,!0),l=CKEDITOR.dom.walker.whitespaces(!0),
-k=function(a){return m(a)&&l(a)},b={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var h,e,l,u,t;a=a||"p";if(this._.nestedEditable){if(h=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,h;this.activeFilter=this.filter;if(c(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
-null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var n=this.range.clone();e=n.startPath();var q=n.endPath(),w=!n.collapsed&&g(n,e.block),y=!n.collapsed&&g(n,q.block,1);n.shrink(CKEDITOR.SHRINK_ELEMENT,!0);w&&n.setStartAt(e.block,CKEDITOR.POSITION_BEFORE_END);y&&n.setEndAt(q.block,CKEDITOR.POSITION_AFTER_START);e=n.endContainer.hasAscendant("pre",!0)||n.startContainer.hasAscendant("pre",!0);n.enlarge(this.forceBrBreak&&!e||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
-n.collapsed||(e=new CKEDITOR.dom.walker(n.clone()),q=CKEDITOR.dom.walker.bookmark(!0,!0),e.evaluator=q,this._.nextNode=e.next(),e=new CKEDITOR.dom.walker(n.clone()),e.evaluator=q,e=e.previous(),this._.lastNode=e.getNextSourceNode(!0,null,n.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(q=this.range.clone(),q.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),q.checkEndOfBlock()&&
-(q=new CKEDITOR.dom.elementPath(q.endContainer,q.root),this._.lastNode=(q.block||q.blockLimit).getNextSourceNode(!0))),this._.lastNode&&n.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=n.document.createText(""),this._.lastNode.insertAfter(e)),n=null);this._.started=1;e=n}q=this._.nextNode;n=this._.lastNode;for(this._.nextNode=null;q;){var w=0,y=q.hasAscendant("pre"),C=q.type!=CKEDITOR.NODE_ELEMENT,r=0;if(C)q.type==CKEDITOR.NODE_TEXT&&f.test(q.getText())&&(C=0);else{var x=q.getName();
-if(CKEDITOR.dtd.$block[x]&&"false"==q.getAttribute("contenteditable")){h=q;c(this,a,h);break}else if(q.isBlockBoundary(this.forceBrBreak&&!y&&{br:1})){if("br"==x)C=1;else if(!e&&!q.getChildCount()&&"hr"!=x){h=q;l=q.equals(n);break}e&&(e.setEndAt(q,CKEDITOR.POSITION_BEFORE_START),"br"!=x&&(this._.nextNode=q));w=1}else{if(q.getFirst()){e||(e=this.range.clone(),e.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));q=q.getFirst();continue}C=1}}C&&!e&&(e=this.range.clone(),e.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));
-l=(!w||C)&&q.equals(n);if(e&&!w)for(;!q.getNext(k)&&!l;){x=q.getParent();if(x.isBlockBoundary(this.forceBrBreak&&!y&&{br:1})){w=1;C=0;l||x.equals(n);e.setEndAt(x,CKEDITOR.POSITION_BEFORE_END);break}q=x;C=1;l=q.equals(n);r=1}C&&e.setEndAt(q,CKEDITOR.POSITION_AFTER_END);q=this._getNextSourceNode(q,r,n);if((l=!q)||w&&e)break}if(!h){if(!e)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;h=new CKEDITOR.dom.elementPath(e.startContainer,e.root);q=h.blockLimit;w={div:1,th:1,td:1};
-h=h.block;!h&&q&&!this.enforceRealBlocks&&w[q.getName()]&&e.checkStartOfBlock()&&e.checkEndOfBlock()&&!q.equals(e.root)?h=q:!h||this.enforceRealBlocks&&h.is(b)?(h=this.range.document.createElement(a),e.extractContents().appendTo(h),h.trim(),e.insertNode(h),u=t=!0):"li"!=h.getName()?e.checkStartOfBlock()&&e.checkEndOfBlock()||(h=h.clone(!1),e.extractContents().appendTo(h),h.trim(),t=e.splitBlock(),u=!t.wasStartOfBlock,t=!t.wasEndOfBlock,e.insertNode(h)):l||(this._.nextNode=h.equals(n)?null:this._getNextSourceNode(e.getBoundaryNodes().endNode,
-1,n))}u&&(u=h.getPrevious())&&u.type==CKEDITOR.NODE_ELEMENT&&("br"==u.getName()?u.remove():u.getLast()&&"br"==u.getLast().$.nodeName.toLowerCase()&&u.getLast().remove());t&&(u=h.getLast())&&u.type==CKEDITOR.NODE_ELEMENT&&"br"==u.getName()&&(!CKEDITOR.env.needsBrFiller||u.getPrevious(m)||u.getNext(m))&&u.remove();this._.nextNode||(this._.nextNode=l||h.equals(n)||!n?null:this._getNextSourceNode(h,1,n));return h},_getNextSourceNode:function(a,b,c){function f(a){return!(a.equals(c)||a.equals(g))}var g=
-this.range.root;for(a=a.getNextSourceNode(b,null,f);!m(a);)a=a.getNextSourceNode(b,null,f);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}}(),CKEDITOR.command=function(a,e){this.uiItems=[];this.exec=function(c){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==e.exec.call(this,a,c)};this.refresh=function(a,c){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!c.isContextFor(this.context)||
-!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",{editor:a,path:c})?!0:e.refresh&&!1!==e.refresh.apply(this,arguments)};var c;this.checkAllowed=function(g){return g||"boolean"!=typeof c?c=a.activeFilter.checkFeature(this):c};CKEDITOR.tools.extend(this,e,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!e.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)},CKEDITOR.command.prototype=
+a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||f(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||f(this,0,null,
+a)},extractContents:function(a,b){var d=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||f(this,1,d,a,"undefined"==typeof b?!0:b);return d},createBookmark:function(a){var b,d,c,e,h=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(c="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",c+(h?"C":"S")));h||(d=b.clone(),d.setHtml("\x26nbsp;"),a&&d.setAttribute("id",c+"E"),e=this.clone(),e.collapse(),
+e.insertNode(d));e=this.clone();e.collapse(!0);e.insertNode(b);d?(this.setStartAfter(b),this.setEndBefore(d)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?c+(h?"C":"S"):b,endNode:a?c+"E":d,serializable:a,collapsed:h}},createBookmark2:function(){function a(g){var b=g.container,c=g.offset,e;e=b;var h=c;e=e.type!=CKEDITOR.NODE_ELEMENT||0===h||h==e.getChildCount()?0:e.getChild(h-1).type==CKEDITOR.NODE_TEXT&&e.getChild(h).type==CKEDITOR.NODE_TEXT;e&&(b=b.getChild(c-1),c=b.getLength());
+if(b.type==CKEDITOR.NODE_ELEMENT&&0<c){a:{for(e=b;c--;)if(h=e.getChild(c).getIndex(!0),0<=h){c=h;break a}c=-1}c+=1}if(b.type==CKEDITOR.NODE_TEXT){e=b;for(h=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)h+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;e=h;b.getText()?c+=e:(h=b.getPrevious(d),e?(c=e,b=h?h.getNext():b.getParent().getFirst()):(b=b.getParent(),c=h?h.getIndex(!0)+1:0))}g.container=b;g.offset=c}function b(a,g){var d=g.getCustomData("cke-fillingChar");if(d){var c=
+a.container;d.equals(c)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=c.getIndex(),a.container=c.getParent()))}}var d=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(d){var c=this.collapsed,e={container:this.startContainer,offset:this.startOffset},h={container:this.endContainer,offset:this.endOffset};d&&(a(e),b(e,this.root),c||(a(h),b(h,this.root)));return{start:e.container.getAddress(d),end:c?null:h.container.getAddress(d),startOffset:e.offset,
+endOffset:h.offset,normalized:d,collapsed:c,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),d=a.startOffset,c=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,d);c?this.setEnd(c,a):this.collapse(!0)}else b=(d=a.serializable)?this.document.getById(a.startNode):a.startNode,a=d?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=
+this.startContainer,b=this.endContainer,d=this.startOffset,c=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>d)a=a.getChild(d);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),e>c)b=b.getChild(c).getPreviousSourceNode(!0);else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&
+CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var d=this.startContainer,c=this.endContainer,d=d.equals(c)?a&&d.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?d.getChild(this.startOffset):d:d.getCommonAncestor(c);return b&&!d.is?d.getParent():d},optimize:function(){var a=this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;
+a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var d=this.startContainer,c=this.startOffset,e=this.collapsed;if((!a||e)&&d&&d.type==CKEDITOR.NODE_TEXT){if(c)if(c>=d.getLength())c=
+d.getIndex()+1,d=d.getParent();else{var h=d.split(c),c=d.getIndex()+1,d=d.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(h,this.endOffset-this.startOffset):d.equals(this.endContainer)&&(this.endOffset+=1)}else c=d.getIndex(),d=d.getParent();this.setStart(d,c);if(e){this.collapse(!0);return}}d=this.endContainer;c=this.endOffset;b||e||!d||d.type!=CKEDITOR.NODE_TEXT||(c?(c>=d.getLength()||d.split(c),c=d.getIndex()+1):c=d.getIndex(),d=d.getParent(),this.setEnd(d,c))},enlarge:function(a,
+b){function d(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var c=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var h=function(a,b){var d=new CKEDITOR.dom.range(f);d.setStart(a,b);d.setEndAt(f,CKEDITOR.POSITION_BEFORE_END);var d=new CKEDITOR.dom.walker(d),g;for(d.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};g=d.next();){if(g.type!=CKEDITOR.NODE_TEXT)return!1;C=g!=a?g.getText():
+g.substring(b);if(c.test(C))return!1}return!0};if(this.collapsed)break;var k=this.getCommonAncestor(),f=this.root,m,l,t,x,D,y=!1,z,C;z=this.startContainer;var G=this.startOffset;z.type==CKEDITOR.NODE_TEXT?(G&&(z=!CKEDITOR.tools.trim(z.substring(0,G)).length&&z,y=!!z),z&&((x=z.getPrevious())||(t=z.getParent()))):(G&&(x=z.getChild(G-1)||z.getLast()),x||(t=z));for(t=d(t);t||x;){if(t&&!x){!D&&t.equals(k)&&(D=!0);if(e?t.isBlockBoundary():!f.contains(t))break;y&&"inline"==t.getComputedStyle("display")||
+(y=!1,D?m=t:this.setStartBefore(t));x=t.getPrevious()}for(;x;)if(z=!1,x.type==CKEDITOR.NODE_COMMENT)x=x.getPrevious();else{if(x.type==CKEDITOR.NODE_TEXT)C=x.getText(),c.test(C)&&(x=null),z=/[\s\ufeff]$/.test(C);else if((x.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&x.is("br"))&&!x.data("cke-bookmark"))if(y&&CKEDITOR.dtd.$removeEmpty[x.getName()]){C=x.getText();if(c.test(C))x=null;else for(var G=x.$.getElementsByTagName("*"),E=0,J;J=G[E++];)if(!CKEDITOR.dtd.$removeEmpty[J.nodeName.toLowerCase()]){x=
+null;break}x&&(z=!!C.length)}else x=null;z&&(y?D?m=t:t&&this.setStartBefore(t):y=!0);if(x){z=x.getPrevious();if(!t&&!z){t=x;x=null;break}x=z}else t=null}t&&(t=d(t.getParent()))}z=this.endContainer;G=this.endOffset;t=x=null;D=y=!1;z.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(z.substring(G)).length?y=!0:(y=!z.getLength(),G==z.getLength()?(x=z.getNext())||(t=z.getParent()):h(z,G)&&(t=z.getParent())):(x=z.getChild(G))||(t=z);for(;t||x;){if(t&&!x){!D&&t.equals(k)&&(D=!0);if(e?t.isBlockBoundary():!f.contains(t))break;
+y&&"inline"==t.getComputedStyle("display")||(y=!1,D?l=t:t&&this.setEndAfter(t));x=t.getNext()}for(;x;){z=!1;if(x.type==CKEDITOR.NODE_TEXT)C=x.getText(),h(x,0)||(x=null),z=/^[\s\ufeff]/.test(C);else if(x.type==CKEDITOR.NODE_ELEMENT){if((0<x.$.offsetWidth||b&&x.is("br"))&&!x.data("cke-bookmark"))if(y&&CKEDITOR.dtd.$removeEmpty[x.getName()]){C=x.getText();if(c.test(C))x=null;else for(G=x.$.getElementsByTagName("*"),E=0;J=G[E++];)if(!CKEDITOR.dtd.$removeEmpty[J.nodeName.toLowerCase()]){x=null;break}x&&
+(z=!!C.length)}else x=null}else z=1;z&&y&&(D?l=t:this.setEndAfter(t));if(x){z=x.getNext();if(!t&&!z){t=x;x=null;break}x=z}else t=null}t&&(t=d(t.getParent()))}m&&l&&(k=m.contains(l)?l:m,this.setStartBefore(k),this.setEndAfter(k));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:t=new CKEDITOR.dom.range(this.root);f=this.root;t.setStartAt(f,CKEDITOR.POSITION_AFTER_START);t.setEnd(this.startContainer,this.startOffset);t=new CKEDITOR.dom.walker(t);var I,N,F=CKEDITOR.dom.walker.blockBoundary(a==
+CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),P=null,R=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(P){if(P.equals(a)){P=null;return}}else P=a;else if(P)return;var b=F(a);b||(I=a);return b},e=function(a){var b=R(a);!b&&a.is&&a.is("br")&&(N=a);return b};t.guard=R;t=t.lastBackward();I=I||f;this.setStartAt(I,!I.is("br")&&(!t&&this.checkStartOfBlock()||t&&I.contains(t))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){t=
+this.clone();t=new CKEDITOR.dom.walker(t);var L=CKEDITOR.dom.walker.whitespaces(),Q=CKEDITOR.dom.walker.bookmark();t.evaluator=function(a){return!L(a)&&!Q(a)};if((t=t.previous())&&t.type==CKEDITOR.NODE_ELEMENT&&t.is("br"))break}t=this.clone();t.collapse();t.setEndAt(f,CKEDITOR.POSITION_BEFORE_END);t=new CKEDITOR.dom.walker(t);t.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:R;I=P=N=null;t=t.lastForward();I=I||f;this.setEndAt(I,!t&&this.checkEndOfBlock()||t&&I.contains(t)?CKEDITOR.POSITION_BEFORE_END:
+CKEDITOR.POSITION_BEFORE_START);N&&this.setEndAfter(N)}},shrink:function(a,b,d){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var c=this.clone(),e=this.startContainer,h=this.endContainer,f=this.startOffset,k=this.endOffset,m=1,l=1;e&&e.type==CKEDITOR.NODE_TEXT&&(f?f>=e.getLength()?c.setStartAfter(e):(c.setStartBefore(e),m=0):c.setStartBefore(e));h&&h.type==CKEDITOR.NODE_TEXT&&(k?k>=h.getLength()?c.setEndAfter(h):(c.setEndAfter(h),l=0):c.setEndBefore(h));var c=new CKEDITOR.dom.walker(c),t=CKEDITOR.dom.walker.bookmark();
+c.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var x;c.guard=function(b,c){if(t(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(x)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(x=b);return!0};m&&(e=c[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(e,b?CKEDITOR.POSITION_AFTER_START:
+CKEDITOR.POSITION_BEFORE_START);l&&(c.reset(),(c=c[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(c,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!m&&!l)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,d=b.getChild(this.startOffset);d?a.insertBefore(d):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,
+b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(d=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=d;this.endContainer||(this._setEndContainer(b),this.endOffset=d);a(this)},setEnd:function(b,
+d){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(d=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=d;this.startContainer||(this._setStartContainer(b),this.startOffset=d);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,
+d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,d){switch(d){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,
+b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,b){var d=this.createBookmark(),c=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(c);c.trim();this.insertNode(c);var e=c.getBogus();e&&e.remove();c.appendBogus();this.moveToBookmark(d);return c},splitBlock:function(a,b){var d=
+new CKEDITOR.dom.elementPath(this.startContainer,this.root),c=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=d.block,h=c.block,f=null;if(!d.blockLimit.equals(c.blockLimit))return null;"br"!=a&&(e||(e=this.fixBlock(!0,a),h=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),h||(h=this.fixBlock(!1,a)));d=e&&this.checkStartOfBlock();c=h&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(h)&&(c?(f=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(h,
+CKEDITOR.POSITION_AFTER_END),h=null):d?(f=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(h=this.splitElement(e,b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:h,wasStartOfBlock:d,wasEndOfBlock:c,elementPath:f}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var d=this.extractContents(!1,b||!1),c=a.clone(!1,b||!1);d.appendTo(c);c.insertAfter(a);
+this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return c},removeEmptyBlocksAtEnd:function(){function a(g){return function(a){return b(a)||d(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||g.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var d=this.createBookmark(),c=this[b?"endPath":"startPath"](),e=c.block||c.blockLimit,h;e&&!e.equals(c.root)&&!e.getFirst(a(e));)h=e.getParent(),this[b?"setEndAt":
+"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=h;this.moveToBookmark(d)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,c=this.clone();c.collapse(d);c[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(c);c.evaluator=e(d);return c[d?
+"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,b=this.startOffset;CKEDITOR.env.ie&&b&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,b)),k.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);b=this.clone();b.collapse(!0);b.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,
+b=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(b)),k.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);b=this.clone();b.collapse(!1);b.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);a=new CKEDITOR.dom.walker(b);a.evaluator=c();return a.checkForward()},getPreviousNode:function(a,b,d){var c=this.clone();c.collapse(1);c.setStartAt(d||this.root,CKEDITOR.POSITION_AFTER_START);d=new CKEDITOR.dom.walker(c);
+d.evaluator=a;d.guard=b;return d.previous()},getNextNode:function(a,b,d){var c=this.clone();c.collapse();c.setEndAt(d||this.root,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(c);d.evaluator=a;d.guard=b;return d.next()},checkReadOnly:function(){function a(b,d){for(;b;){if(b.type==CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(d)||b.equals(d)))break}b=b.getParent()}return 1}
+return function(){var b=this.startContainer,d=this.endContainer;return!(a(b,d)&&a(d,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&k.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:
+CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var e=a,h=c,n=void 0;e.type==CKEDITOR.NODE_ELEMENT&&e.isEditable(!1)&&
+(n=e[b?"getLast":"getFirst"](d));h||n||(n=e[b?"getPrevious":"getNext"](d));a=n}return!!c},moveToClosestEditablePosition:function(a,b){var d,c=0,e,h,f=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(d=new CKEDITOR.dom.range(this.root),d.moveToPosition(a,f[b?0:1])):d=this.clone();if(a&&!a.is(CKEDITOR.dtd.$block))c=1;else if(e=d[b?"getNextEditableNode":"getPreviousEditableNode"]())c=1,(h=e.type==CKEDITOR.NODE_ELEMENT)&&e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?
+(d.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),d.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&h&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(d.setEnd(e,0),d.collapse()):d.moveToPosition(e,f[b?1:0]);c&&this.moveToRange(d);return!!c},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=this.clone();a.optimize();if(a.startContainer.type!=
+CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),d=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return d(a)&&b(a)};var c=a.next();a.reset();return c&&c.equals(a.previous())?c:null},getTouchedStartNode:function(){var a=this.startContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||
+a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:h(),getPreviousEditableNode:h(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,d,c,e=this.clone();e.optimize();(c=e.startContainer.type==CKEDITOR.NODE_TEXT)?(d=e.startContainer.getText(),b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();c&&(e.startContainer.setText(d),b.remove());
+a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a}}}(),CKEDITOR.POSITION_AFTER_START=1,CKEDITOR.POSITION_BEFORE_END=2,CKEDITOR.POSITION_BEFORE_START=3,CKEDITOR.POSITION_AFTER_END=4,CKEDITOR.ENLARGE_ELEMENT=1,CKEDITOR.ENLARGE_BLOCK_CONTENTS=2,CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3,CKEDITOR.ENLARGE_INLINE=4,CKEDITOR.START=1,CKEDITOR.END=2,CKEDITOR.SHRINK_ELEMENT=1,CKEDITOR.SHRINK_TEXT=2,"use strict",function(){function a(a){1>arguments.length||
+(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function f(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function c(a,b,e,h){a:{null==h&&(h=f(e));for(var k;k=h.shift();)if(k.getDtd().p){h={element:k,remaining:h};break a}h=null}if(!h)return 0;if((k=CKEDITOR.filter.instances[h.element.data("cke-filter")])&&!k.check(b))return c(a,b,e,h.remaining);b=new CKEDITOR.dom.range(h.element);
+b.selectNodeContents(h.element);b=b.createIterator();b.enlargeBr=a.enlargeBr;b.enforceRealBlocks=a.enforceRealBlocks;b.activeFilter=b.filter=k;a._.nestedEditable={element:h.element,container:e,remaining:h.remaining,iterator:b};return 1}function e(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var h=/^[\r\n\t ]+$/,m=CKEDITOR.dom.walker.bookmark(!1,!0),l=CKEDITOR.dom.walker.whitespaces(!0),k=function(a){return m(a)&&l(a)},b={dd:1,dt:1,
+li:1};a.prototype={getNextParagraph:function(a){var g,f,l,v,r;a=a||"p";if(this._.nestedEditable){if(g=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,g;this.activeFilter=this.filter;if(c(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=null}if(!this.range.root.getDtd()[a])return null;
+if(!this._.started){var n=this.range.clone();f=n.startPath();var q=n.endPath(),w=!n.collapsed&&e(n,f.block),A=!n.collapsed&&e(n,q.block,1);n.shrink(CKEDITOR.SHRINK_ELEMENT,!0);w&&n.setStartAt(f.block,CKEDITOR.POSITION_BEFORE_END);A&&n.setEndAt(q.block,CKEDITOR.POSITION_AFTER_START);f=n.endContainer.hasAscendant("pre",!0)||n.startContainer.hasAscendant("pre",!0);n.enlarge(this.forceBrBreak&&!f||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);n.collapsed||(f=new CKEDITOR.dom.walker(n.clone()),
+q=CKEDITOR.dom.walker.bookmark(!0,!0),f.evaluator=q,this._.nextNode=f.next(),f=new CKEDITOR.dom.walker(n.clone()),f.evaluator=q,f=f.previous(),this._.lastNode=f.getNextSourceNode(!0,null,n.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(q=this.range.clone(),q.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),q.checkEndOfBlock()&&(q=new CKEDITOR.dom.elementPath(q.endContainer,
+q.root),this._.lastNode=(q.block||q.blockLimit).getNextSourceNode(!0))),this._.lastNode&&n.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=n.document.createText(""),this._.lastNode.insertAfter(f)),n=null);this._.started=1;f=n}q=this._.nextNode;n=this._.lastNode;for(this._.nextNode=null;q;){var w=0,A=q.hasAscendant("pre"),B=q.type!=CKEDITOR.NODE_ELEMENT,t=0;if(B)q.type==CKEDITOR.NODE_TEXT&&h.test(q.getText())&&(B=0);else{var x=q.getName();if(CKEDITOR.dtd.$block[x]&&"false"==q.getAttribute("contenteditable")){g=
+q;c(this,a,g);break}else if(q.isBlockBoundary(this.forceBrBreak&&!A&&{br:1})){if("br"==x)B=1;else if(!f&&!q.getChildCount()&&"hr"!=x){g=q;l=q.equals(n);break}f&&(f.setEndAt(q,CKEDITOR.POSITION_BEFORE_START),"br"!=x&&(this._.nextNode=q));w=1}else{if(q.getFirst()){f||(f=this.range.clone(),f.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));q=q.getFirst();continue}B=1}}B&&!f&&(f=this.range.clone(),f.setStartAt(q,CKEDITOR.POSITION_BEFORE_START));l=(!w||B)&&q.equals(n);if(f&&!w)for(;!q.getNext(k)&&!l;){x=
+q.getParent();if(x.isBlockBoundary(this.forceBrBreak&&!A&&{br:1})){w=1;B=0;l||x.equals(n);f.setEndAt(x,CKEDITOR.POSITION_BEFORE_END);break}q=x;B=1;l=q.equals(n);t=1}B&&f.setEndAt(q,CKEDITOR.POSITION_AFTER_END);q=this._getNextSourceNode(q,t,n);if((l=!q)||w&&f)break}if(!g){if(!f)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;g=new CKEDITOR.dom.elementPath(f.startContainer,f.root);q=g.blockLimit;w={div:1,th:1,td:1};g=g.block;!g&&q&&!this.enforceRealBlocks&&w[q.getName()]&&
+f.checkStartOfBlock()&&f.checkEndOfBlock()&&!q.equals(f.root)?g=q:!g||this.enforceRealBlocks&&g.is(b)?(g=this.range.document.createElement(a),f.extractContents().appendTo(g),g.trim(),f.insertNode(g),v=r=!0):"li"!=g.getName()?f.checkStartOfBlock()&&f.checkEndOfBlock()||(g=g.clone(!1),f.extractContents().appendTo(g),g.trim(),r=f.splitBlock(),v=!r.wasStartOfBlock,r=!r.wasEndOfBlock,f.insertNode(g)):l||(this._.nextNode=g.equals(n)?null:this._getNextSourceNode(f.getBoundaryNodes().endNode,1,n))}v&&(v=
+g.getPrevious())&&v.type==CKEDITOR.NODE_ELEMENT&&("br"==v.getName()?v.remove():v.getLast()&&"br"==v.getLast().$.nodeName.toLowerCase()&&v.getLast().remove());r&&(v=g.getLast())&&v.type==CKEDITOR.NODE_ELEMENT&&"br"==v.getName()&&(!CKEDITOR.env.needsBrFiller||v.getPrevious(m)||v.getNext(m))&&v.remove();this._.nextNode||(this._.nextNode=l||g.equals(n)||!n?null:this._getNextSourceNode(g,1,n));return g},_getNextSourceNode:function(a,b,c){function e(a){return!(a.equals(c)||a.equals(h))}var h=this.range.root;
+for(a=a.getNextSourceNode(b,null,e);!m(a);)a=a.getNextSourceNode(b,null,e);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}}(),CKEDITOR.command=function(a,f){this.uiItems=[];this.exec=function(c){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==f.exec.call(this,a,c)};this.refresh=function(a,c){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!c.isContextFor(this.context)||
+!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",{editor:a,path:c})?!0:f.refresh&&!1!==f.refresh.apply(this,arguments)};var c;this.checkAllowed=function(e){return e||"boolean"!=typeof c?c=a.activeFilter.checkFeature(this):c};CKEDITOR.tools.extend(this,f,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!f.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)},CKEDITOR.command.prototype=
 {enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?this.setState(CKEDITOR.TRISTATE_ON):
 this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}},CKEDITOR.event.implementOn(CKEDITOR.command.prototype),CKEDITOR.ENTER_P=1,CKEDITOR.ENTER_BR=2,CKEDITOR.ENTER_DIV=3,CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),
-extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]},function(){function a(a,b,d,c,h){var f,g;a=[];for(f in b){g=b[f];g="boolean"==typeof g?{}:"function"==typeof g?{match:g}:F(g);"$"!=f.charAt(0)&&(g.elements=f);d&&(g.featureName=d.toLowerCase());var e=g;e.elements=l(e.elements,/\s+/)||null;e.propertiesOnly=e.propertiesOnly||!0===e.elements;var k=/\s*,\s*/,n=void 0;for(n in N){e[n]=l(e[n],
-k)||null;var r=e,m=E[n],p=l(e[E[n]],k),x=e[n],q=[],C=!0,B=void 0;p?C=!1:p={};for(B in x)"!"==B.charAt(0)&&(B=B.slice(1),q.push(B),p[B]=!0,C=!1);for(;B=q.pop();)x[B]=x["!"+B],delete x["!"+B];r[m]=(C?!1:p)||null}e.match=e.match||null;c.push(g);a.push(g)}b=h.elements;h=h.generic;var t;d=0;for(c=a.length;d<c;++d){f=F(a[d]);g=!0===f.classes||!0===f.styles||!0===f.attributes;e=f;n=m=k=void 0;for(k in N)e[k]=w(e[k]);r=!0;for(n in E){k=E[n];m=e[k];p=[];x=void 0;for(x in m)-1<x.indexOf("*")?p.push(new RegExp("^"+
-x.replace(/\*/g,".*")+"$")):p.push(x);m=p;m.length&&(e[k]=m,r=!1)}e.nothingRequired=r;e.noProperties=!(e.attributes||e.classes||e.styles);if(!0===f.elements||null===f.elements)h[g?"unshift":"push"](f);else for(t in e=f.elements,delete f.elements,e)if(b[t])b[t][g?"unshift":"push"](f);else b[t]=[f]}}function e(a,b,d,h){if(!a.match||a.match(b))if(h||k(a,b))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=c(a.attributes,b.attributes,d.validAttributes)),d.allStyles||(d.allStyles=c(a.styles,
-b.styles,d.validStyles)),!d.allClasses){a=a.classes;b=b.classes;h=d.validClasses;if(a)if(!0===a)a=!0;else{for(var f=0,g=b.length,e;f<g;++f)e=b[f],h[e]||(h[e]=a(e));a=!1}else a=!1;d.allClasses=a}}function c(a,b,d){if(!a)return!1;if(!0===a)return!0;for(var c in b)d[c]||(d[c]=a(c));return!1}function g(a,b,d){if(!a.match||a.match(b)){if(a.noProperties)return!1;d.hadInvalidAttribute=f(a.attributes,b.attributes)||d.hadInvalidAttribute;d.hadInvalidStyle=f(a.styles,b.styles)||d.hadInvalidStyle;a=a.classes;
-b=b.classes;if(a){for(var c=!1,h=!0===a,g=b.length;g--;)if(h||a(b[g]))b.splice(g,1),c=!0;a=c}else a=!1;d.hadInvalidClass=a||d.hadInvalidClass}}function f(a,b){if(!a)return!1;var d=!1,c=!0===a,h;for(h in b)if(c||a(h))delete b[h],d=!0;return d}function m(a,b,d){if(a.disabled||a.customConfig&&!d||!b)return!1;a._.cachedChecks={};return!0}function l(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=J(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?
-CKEDITOR.tools.convertArrayToObject(a):!1;var d={},c=0,h;for(h in a)d[h]=a[h],c++;return c?d:!1}function k(a,d){if(a.nothingRequired)return!0;var c,h,f,g;if(f=a.requiredClasses)for(g=d.classes,c=0;c<f.length;++c)if(h=f[c],"string"==typeof h){if(-1==CKEDITOR.tools.indexOf(g,h))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(g,h))return!1;return b(d.styles,a.requiredStyles)&&b(d.attributes,a.requiredAttributes)}function b(a,b){if(!b)return!0;for(var d=0,c;d<b.length;++d)if(c=b[d],"string"==
-typeof c){if(!(c in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,c))return!1;return!0}function d(a){if(!a)return{};a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function h(a){var b,d,c,h,f={},g=1;for(a=J(a);b=a.match(P);)(d=b[2])?(c=p(d,"styles"),h=p(d,"attrs"),d=p(d,"classes")):c=h=d=null,f["$"+g++]={elements:b[1],classes:d,styles:c,attributes:h},a=a.slice(b[0].length);return f}function p(a,b){var d=a.match(T[b]);return d?J(d[1]):null}
-function v(a){var b=a.styleBackup=a.attributes.style,d=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||"",1));a.classes||(a.classes=d?d.split(/\s+/):[])}function u(a,b,d,c){var h=0,f;c.toHtml&&(b.name=b.name.replace(L,"$1"));if(c.doCallbacks&&a.elementCallbacks){a:{f=a.elementCallbacks;for(var k=0,r=f.length,m;k<r;++k)if(m=f[k](b)){f=m;break a}f=void 0}if(f)return f}if(c.doTransform&&(f=a._.transformations[b.name])){v(b);for(k=0;k<f.length;++k)x(a,b,f[k]);n(b)}if(c.doFilter){a:{k=
-b.name;r=a._;a=r.allowedRules.elements[k];f=r.allowedRules.generic;k=r.disallowedRules.elements[k];r=r.disallowedRules.generic;m=c.skipRequired;var p={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},E,l;if(a||f){v(b);if(k)for(E=0,l=k.length;E<l;++E)if(!1===g(k[E],b,p)){a=null;break a}if(r)for(E=0,l=r.length;E<l;++E)g(r[E],b,p);if(a)for(E=0,l=a.length;E<l;++E)e(a[E],b,p,m);if(f)for(E=
-0,l=f.length;E<l;++E)e(f[E],b,p,m);a=p}else a=null}if(!a||!a.valid)return d.push(b),1;l=a.validAttributes;var B=a.validStyles;f=a.validClasses;var k=b.attributes,C=b.styles,r=b.classes;m=b.classBackup;var w=b.styleBackup,t,z,A=[],p=[],u=/^data-cke-/;E=!1;delete k.style;delete k["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(t in k)l[t]||(u.test(t)?t==(z=t.replace(/^data-cke-saved-/,""))||l[z]||(delete k[t],E=!0):(delete k[t],E=!0));if(!a.allStyles||a.hadInvalidStyle){for(t in C)a.allStyles||
-B[t]?A.push(t+":"+C[t]):E=!0;A.length&&(k.style=A.sort().join("; "))}else w&&(k.style=w);if(!a.allClasses||a.hadInvalidClass){for(t=0;t<r.length;++t)(a.allClasses||f[r[t]])&&p.push(r[t]);p.length&&(k["class"]=p.sort().join(" "));m&&p.length<m.split(/\s+/).length&&(E=!0)}else m&&(k["class"]=m);E&&(h=1);if(!c.skipFinalValidation&&!q(b))return d.push(b),1}c.toHtml&&(b.name=b.name.replace(Q,"cke:$1"));return h}function t(a){var b=[],d;for(d in a)-1<d.indexOf("*")&&b.push(d.replace(/\*/g,".*"));return b.length?
-new RegExp("^(?:"+b.join("|")+")$"):null}function n(a){var b=a.attributes,d;delete b.style;delete b["class"];if(d=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=d;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function q(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function w(a){if(!a)return!1;if(!0===a)return!0;var b=t(a);return function(d){return d in a||b&&d.match(b)}}function y(){return new CKEDITOR.htmlParser.element("br")}
-function C(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==a.name||G.$block[a.name])}function r(a,b,d){var c=a.name;if(G.$empty[c]||!a.children.length)"hr"==c&&"br"==b?a.replaceWith(y()):(a.parent&&d.push({check:"it",el:a.parent}),a.remove());else if(G.$block[c]||"tr"==c)if("br"==b)a.previous&&!C(a.previous)&&(b=y(),b.insertBefore(a)),a.next&&!C(a.next)&&(b=y(),b.insertAfter(a)),a.replaceWithChildren();else{var c=a.children,h;b:{h=G[b];for(var f=0,g=c.length,k;f<g;++f)if(k=c[f],k.type==CKEDITOR.NODE_ELEMENT&&
-!h[k.name]){h=!1;break b}h=!0}if(h)a.name=b,a.attributes={},d.push({check:"parent-down",el:a});else{h=a.parent;for(var f=h.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==h.name,e,n,g=c.length;0<g;)k=c[--g],f&&(k.type==CKEDITOR.NODE_TEXT||k.type==CKEDITOR.NODE_ELEMENT&&G.$inline[k.name])?(e||(e=new CKEDITOR.htmlParser.element(b),e.insertAfter(a),d.push({check:"parent-down",el:e})),e.add(k,0)):(e=null,n=G[h.name]||G.span,k.insertAfter(a),h.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||k.type!=CKEDITOR.NODE_ELEMENT||
-n[k.name]||d.push({check:"el-up",el:k}));a.remove()}}else c in{style:1,script:1}?a.remove():(a.parent&&d.push({check:"it",el:a.parent}),a.replaceWithChildren())}function x(a,b,d){var c,h;for(c=0;c<d.length;++c)if(h=d[c],!(h.check&&!a.check(h.check,!1)||h.left&&!h.left(b))){h.right(b,O);break}}function B(a,b){var d=b.getDefinition(),c=d.attributes,h=d.styles,f,g,k,e;if(a.name!=d.element)return!1;for(f in c)if("class"==f)for(d=c[f].split(/\s+/),k=a.classes.join("|");e=d.pop();){if(-1==k.indexOf(e))return!1}else if(a.attributes[f]!=
-c[f])return!1;for(g in h)if(a.styles[g]!=h[g])return!1;return!0}function A(a,b){var d,c;"string"==typeof a?d=a:a instanceof CKEDITOR.style?c=a:(d=a[0],c=a[1]);return[{element:d,left:c,right:function(a,d){d.transform(a,b)}}]}function z(a){return function(b){return B(b,a)}}function D(a){return function(b,d){d[a](b)}}var G=CKEDITOR.dtd,F=CKEDITOR.tools.copy,J=CKEDITOR.tools.trim,I=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=
+extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]},function(){function a(a,b,d,c,g){var e,h;a=[];for(e in b){h=b[e];h="boolean"==typeof h?{}:"function"==typeof h?{match:h}:E(h);"$"!=e.charAt(0)&&(h.elements=e);d&&(h.featureName=d.toLowerCase());var f=h;f.elements=l(f.elements,/\s+/)||null;f.propertiesOnly=f.propertiesOnly||!0===f.elements;var n=/\s*,\s*/,k=void 0;for(k in N){f[k]=l(f[k],
+n)||null;var t=f,m=F[k],p=l(f[F[k]],n),x=f[k],q=[],D=!0,B=void 0;p?D=!1:p={};for(B in x)"!"==B.charAt(0)&&(B=B.slice(1),q.push(B),p[B]=!0,D=!1);for(;B=q.pop();)x[B]=x["!"+B],delete x["!"+B];t[m]=(D?!1:p)||null}f.match=f.match||null;c.push(h);a.push(h)}b=g.elements;g=g.generic;var r;d=0;for(c=a.length;d<c;++d){e=E(a[d]);h=!0===e.classes||!0===e.styles||!0===e.attributes;f=e;k=m=n=void 0;for(n in N)f[n]=w(f[n]);t=!0;for(k in F){n=F[k];m=f[n];p=[];x=void 0;for(x in m)-1<x.indexOf("*")?p.push(new RegExp("^"+
+x.replace(/\*/g,".*")+"$")):p.push(x);m=p;m.length&&(f[n]=m,t=!1)}f.nothingRequired=t;f.noProperties=!(f.attributes||f.classes||f.styles);if(!0===e.elements||null===e.elements)g[h?"unshift":"push"](e);else for(r in f=e.elements,delete e.elements,f)if(b[r])b[r][h?"unshift":"push"](e);else b[r]=[e]}}function f(a,b,d,g){if(!a.match||a.match(b))if(g||k(a,b))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=c(a.attributes,b.attributes,d.validAttributes)),d.allStyles||(d.allStyles=c(a.styles,
+b.styles,d.validStyles)),!d.allClasses){a=a.classes;b=b.classes;g=d.validClasses;if(a)if(!0===a)a=!0;else{for(var e=0,h=b.length,f;e<h;++e)f=b[e],g[f]||(g[f]=a(f));a=!1}else a=!1;d.allClasses=a}}function c(a,b,d){if(!a)return!1;if(!0===a)return!0;for(var c in b)d[c]||(d[c]=a(c));return!1}function e(a,b,d){if(!a.match||a.match(b)){if(a.noProperties)return!1;d.hadInvalidAttribute=h(a.attributes,b.attributes)||d.hadInvalidAttribute;d.hadInvalidStyle=h(a.styles,b.styles)||d.hadInvalidStyle;a=a.classes;
+b=b.classes;if(a){for(var c=!1,g=!0===a,e=b.length;e--;)if(g||a(b[e]))b.splice(e,1),c=!0;a=c}else a=!1;d.hadInvalidClass=a||d.hadInvalidClass}}function h(a,b){if(!a)return!1;var d=!1,c=!0===a,g;for(g in b)if(c||a(g))delete b[g],d=!0;return d}function m(a,b,d){if(a.disabled||a.customConfig&&!d||!b)return!1;a._.cachedChecks={};return!0}function l(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=J(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?
+CKEDITOR.tools.convertArrayToObject(a):!1;var d={},c=0,g;for(g in a)d[g]=a[g],c++;return c?d:!1}function k(a,d){if(a.nothingRequired)return!0;var c,g,e,h;if(e=a.requiredClasses)for(h=d.classes,c=0;c<e.length;++c)if(g=e[c],"string"==typeof g){if(-1==CKEDITOR.tools.indexOf(h,g))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(h,g))return!1;return b(d.styles,a.requiredStyles)&&b(d.attributes,a.requiredAttributes)}function b(a,b){if(!b)return!0;for(var d=0,c;d<b.length;++d)if(c=b[d],"string"==
+typeof c){if(!(c in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,c))return!1;return!0}function d(a){if(!a)return{};a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function g(a){var b,d,c,g,e={},h=1;for(a=J(a);b=a.match(P);)(d=b[2])?(c=p(d,"styles"),g=p(d,"attrs"),d=p(d,"classes")):c=g=d=null,e["$"+h++]={elements:b[1],classes:d,styles:c,attributes:g},a=a.slice(b[0].length);return e}function p(a,b){var d=a.match(R[b]);return d?J(d[1]):null}
+function u(a){var b=a.styleBackup=a.attributes.style,d=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||"",1));a.classes||(a.classes=d?d.split(/\s+/):[])}function v(a,b,d,c){var g=0,h;c.toHtml&&(b.name=b.name.replace(L,"$1"));if(c.doCallbacks&&a.elementCallbacks){a:{h=a.elementCallbacks;for(var k=0,t=h.length,m;k<t;++k)if(m=h[k](b)){h=m;break a}h=void 0}if(h)return h}if(c.doTransform&&(h=a._.transformations[b.name])){u(b);for(k=0;k<h.length;++k)x(a,b,h[k]);n(b)}if(c.doFilter){a:{k=
+b.name;t=a._;a=t.allowedRules.elements[k];h=t.allowedRules.generic;k=t.disallowedRules.elements[k];t=t.disallowedRules.generic;m=c.skipRequired;var p={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},l,F;if(a||h){u(b);if(k)for(l=0,F=k.length;l<F;++l)if(!1===e(k[l],b,p)){a=null;break a}if(t)for(l=0,F=t.length;l<F;++l)e(t[l],b,p);if(a)for(l=0,F=a.length;l<F;++l)f(a[l],b,p,m);if(h)for(l=
+0,F=h.length;l<F;++l)f(h[l],b,p,m);a=p}else a=null}if(!a||!a.valid)return d.push(b),1;F=a.validAttributes;var B=a.validStyles;h=a.validClasses;var k=b.attributes,D=b.styles,t=b.classes;m=b.classBackup;var w=b.styleBackup,r,z,y=[],p=[],v=/^data-cke-/;l=!1;delete k.style;delete k["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(r in k)F[r]||(v.test(r)?r==(z=r.replace(/^data-cke-saved-/,""))||F[z]||(delete k[r],l=!0):(delete k[r],l=!0));if(!a.allStyles||a.hadInvalidStyle){for(r in D)a.allStyles||
+B[r]?y.push(r+":"+D[r]):l=!0;y.length&&(k.style=y.sort().join("; "))}else w&&(k.style=w);if(!a.allClasses||a.hadInvalidClass){for(r=0;r<t.length;++r)(a.allClasses||h[t[r]])&&p.push(t[r]);p.length&&(k["class"]=p.sort().join(" "));m&&p.length<m.split(/\s+/).length&&(l=!0)}else m&&(k["class"]=m);l&&(g=1);if(!c.skipFinalValidation&&!q(b))return d.push(b),1}c.toHtml&&(b.name=b.name.replace(Q,"cke:$1"));return g}function r(a){var b=[],d;for(d in a)-1<d.indexOf("*")&&b.push(d.replace(/\*/g,".*"));return b.length?
+new RegExp("^(?:"+b.join("|")+")$"):null}function n(a){var b=a.attributes,d;delete b.style;delete b["class"];if(d=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=d;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function q(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function w(a){if(!a)return!1;if(!0===a)return!0;var b=r(a);return function(d){return d in a||b&&d.match(b)}}function A(){return new CKEDITOR.htmlParser.element("br")}
+function B(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==a.name||G.$block[a.name])}function t(a,b,d){var c=a.name;if(G.$empty[c]||!a.children.length)"hr"==c&&"br"==b?a.replaceWith(A()):(a.parent&&d.push({check:"it",el:a.parent}),a.remove());else if(G.$block[c]||"tr"==c)if("br"==b)a.previous&&!B(a.previous)&&(b=A(),b.insertBefore(a)),a.next&&!B(a.next)&&(b=A(),b.insertAfter(a)),a.replaceWithChildren();else{var c=a.children,g;b:{g=G[b];for(var e=0,h=c.length,f;e<h;++e)if(f=c[e],f.type==CKEDITOR.NODE_ELEMENT&&
+!g[f.name]){g=!1;break b}g=!0}if(g)a.name=b,a.attributes={},d.push({check:"parent-down",el:a});else{g=a.parent;for(var e=g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==g.name,k,n,h=c.length;0<h;)f=c[--h],e&&(f.type==CKEDITOR.NODE_TEXT||f.type==CKEDITOR.NODE_ELEMENT&&G.$inline[f.name])?(k||(k=new CKEDITOR.htmlParser.element(b),k.insertAfter(a),d.push({check:"parent-down",el:k})),k.add(f,0)):(k=null,n=G[g.name]||G.span,f.insertAfter(a),g.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||f.type!=CKEDITOR.NODE_ELEMENT||
+n[f.name]||d.push({check:"el-up",el:f}));a.remove()}}else c in{style:1,script:1}?a.remove():(a.parent&&d.push({check:"it",el:a.parent}),a.replaceWithChildren())}function x(a,b,d){var c,g;for(c=0;c<d.length;++c)if(g=d[c],!(g.check&&!a.check(g.check,!1)||g.left&&!g.left(b))){g.right(b,O);break}}function D(a,b){var d=b.getDefinition(),c=d.attributes,g=d.styles,e,h,f,k;if(a.name!=d.element)return!1;for(e in c)if("class"==e)for(d=c[e].split(/\s+/),f=a.classes.join("|");k=d.pop();){if(-1==f.indexOf(k))return!1}else if(a.attributes[e]!=
+c[e])return!1;for(h in g)if(a.styles[h]!=g[h])return!1;return!0}function y(a,b){var d,c;"string"==typeof a?d=a:a instanceof CKEDITOR.style?c=a:(d=a[0],c=a[1]);return[{element:d,left:c,right:function(a,d){d.transform(a,b)}}]}function z(a){return function(b){return D(b,a)}}function C(a){return function(b,d){d[a](b)}}var G=CKEDITOR.dtd,E=CKEDITOR.tools.copy,J=CKEDITOR.tools.trim,I=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=
 [];this.elementCallbacks=null;this.disabled=!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(I[a.enterMode]+
-" "+I[a.shiftEnterMode],"default",1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,d,c){if(!m(this,b,c))return!1;var f,g;if("string"==typeof b)b=h(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),d,c);f=b.getDefinition();b={};c=f.attributes;b[f.element]=f={styles:f.styles,requiredStyles:f.styles&&CKEDITOR.tools.objectKeys(f.styles)};
-c&&(c=F(c),f.classes=c["class"]?c["class"].split(/\s+/):null,f.requiredClasses=f.classes,delete c["class"],f.attributes=c,f.requiredAttributes=c&&CKEDITOR.tools.objectKeys(c))}else if(CKEDITOR.tools.isArray(b)){for(f=0;f<b.length;++f)g=this.allow(b[f],d,c);return g}a(this,b,d,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,d,c){if(this.disabled)return!1;var h=this,f=[],g=this.editor&&this.editor.config.protectedSource,k,e=!1,n={doFilter:!d,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(k=u(h,a,f,n),k&1)e=!0;else if(k&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var d;a:{var c=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));d=[];var r,m,p;if(g)for(m=0;m<g.length;++m)if((p=c.match(g[m]))&&p[0].length==c.length){d=!0;
-break a}c=CKEDITOR.htmlParser.fragment.fromHtml(c);1==c.children.length&&(r=c.children[0]).type==CKEDITOR.NODE_ELEMENT&&u(h,r,d,n);d=!d.length}d||f.push(a)}},null,!0);f.length&&(e=!0);var m;a=[];c=I[c||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var p;d=f.pop();)d.type==CKEDITOR.NODE_ELEMENT?r(d,c,a):d.remove();for(;m=a.pop();)if(d=m.el,d.parent)switch(p=G[d.parent.name]||G.span,m.check){case "it":G.$removeEmpty[d.name]&&!d.children.length?r(d,c,a):q(d)||r(d,c,a);break;case "el-up":d.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||r(d,c,a);break;case "parent-down":d.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||r(d.parent,c,a)}return e},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!m(this,b,!0))return!1;"string"==typeof b&&(b=h(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
-addContentForms:function(a){if(!this.disabled&&a){var b,d,c=[],h;for(b=0;b<a.length&&!h;++b)d=a[b],("string"==typeof d||d instanceof CKEDITOR.style)&&this.check(d)&&(h=d);if(h){for(b=0;b<a.length;++b)c.push(A(a[b],h));this.addTransformations(c)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,d;if(!this.disabled&&a){var c=this._.transformations,h;for(h=0;h<a.length;++h){b=a[h];var f=void 0,g=void 0,k=void 0,e=void 0,n=void 0,r=void 0;d=[];for(g=0;g<b.length;++g)k=b[g],"string"==typeof k?(k=k.split(/\s*:\s*/),e=k[0],n=null,r=k[1]):(e=k.check,n=k.left,r=k.right),f||(f=k,f=f.element?f.element:e?e.match(/^([a-z0-9]+)/i)[0]:
-f.left.getDefinition().element),n instanceof CKEDITOR.style&&(n=z(n)),d.push({check:e==f?null:e,left:n,right:"string"==typeof r?D(r):r});b=f;c[b]||(c[b]=[]);c[b].push(d)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var f=a.length;f--;)if(this.check(a[f],b,c))return!0;return!1}var g,k;if("string"==typeof a){k=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(k in this._.cachedChecks)return this._.cachedChecks[k];f=h(a).$1;g=f.styles;var e=f.classes;f.name=f.elements;
-f.classes=e=e?e.split(/\s*,\s*/):[];f.styles=d(g);f.attributes=d(f.attributes);f.children=[];e.length&&(f.attributes["class"]=e.join(" "));g&&(f.attributes.style=CKEDITOR.tools.writeCssText(f.styles));g=f}else f=a.getDefinition(),g=f.styles,e=f.attributes||{},g?(g=F(g),e.style=CKEDITOR.tools.writeCssText(g,!0)):g={},g={name:f.element,attributes:e,classes:e["class"]?e["class"].split(/\s+/):[],styles:g,children:[]};var e=CKEDITOR.tools.clone(g),r=[],m;if(!1!==b&&(m=this._.transformations[g.name])){for(f=
-0;f<m.length;++f)x(this,g,m[f]);n(g)}u(this,e,r,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<r.length?!1:CKEDITOR.tools.objectCompare(g.attributes,e.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[k]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(d,c){var h=a.slice(),f;if(this.check(I[d]))return d;for(c||(h=h.reverse());f=h.pop();)if(this.check(f))return b[f];
-return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var N={styles:1,attributes:1,classes:1},E={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},P=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,T={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},L=/^cke:(object|embed|param)$/,
-Q=/^(object|embed|param)$/,O=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,d){d=d||b;if(!(d in a.styles)){var c=a.attributes[b];c&&(/^\d+$/.test(c)&&(c+="px"),a.styles[d]=c)}delete a.attributes[b]},lengthToAttribute:function(a,b,d){d=d||b;if(!(d in a.attributes)){var c=a.styles[b],h=c&&c.match(/^(\d+)(?:\.\d*)?px$/);
-h?a.attributes[d]=h[1]:"cke-test"==c&&(a.attributes[d]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},matchesStyle:B,transform:function(a,b){if("string"==typeof b)a.name=b;else{var d=b.getDefinition(),c=d.styles,
-h=d.attributes,f,g,k,e;a.name=d.element;for(f in h)if("class"==f)for(d=a.classes.join("|"),k=h[f].split(/\s+/);e=k.pop();)-1==d.indexOf(e)&&a.classes.push(e);else a.attributes[f]=h[f];for(g in c)a.styles[g]=c[g]}}}}(),function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);
-a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=1},unlock:function(){delete this._.locked},blur:function(a){function e(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var c=
-CKEDITOR.focusManager._.blurDelay;a||!c?e.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;e.call(this)},c,this)}},add:function(a,e){var c=a.getCustomData("focusmanager");if(!c||c!=this){c&&c.remove(a);var c="focus",g="blur";e&&(CKEDITOR.env.ie?(c="focusin",g="focusout"):CKEDITOR.event.useCapture=1);var f={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(c,f.focus,this);a.on(g,f.blur,this);e&&(CKEDITOR.event.useCapture=
-0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",f)}},remove:function(a){a.removeCustomData("focusmanager");var e=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",e.blur);a.removeListener("focus",e.focus)}}}(),CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this},function(){var a,e=function(c){c=c.data;var f=c.getKeystroke(),e=this.keystrokes[f],
-l=this._.editor;a=!1===l.fire("key",{keyCode:f,domEvent:c});a||(e&&(a=!1!==l.execCommand(e,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[f]));a&&c.preventDefault(!0);return!a},c=function(c){a&&(a=!1,c.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",e,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",c,this)}}}(),function(){CKEDITOR.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,"en-au":1,"en-ca":1,"en-gb":1,
-en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,e,c){a&&CKEDITOR.lang.languages[a]||(a=this.detect(e,a));var g=this;e=function(){g[a].dir=g.rtl[a]?"rtl":"ltr";c(a,g[a])};this[a]?e():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+
-a+".js"),e,this)},detect:function(a,e){var c=this.languages;e=e||navigator.userLanguage||navigator.language||a;var g=e.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),f=g[1],g=g[2];c[f+"-"+g]?f=f+"-"+g:c[f]||(f=null);CKEDITOR.lang.detect=f?function(){return f}:function(a){return a};return f||a}}}(),CKEDITOR.scriptLoader=function(){var a={},e={};return{load:function(c,g,f,m){var l="string"==typeof c;l&&(c=[c]);f||(f=CKEDITOR);var k=c.length,b=[],d=[],h=function(a){g&&(l?g.call(f,a):g.call(f,b,d))};if(0===
-k)h(!0);else{var p=function(a,c){(c?b:d).push(a);0>=--k&&(m&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),h(c))},v=function(b,d){a[b]=1;var c=e[b];delete e[b];for(var h=0;h<c.length;h++)c[h](b,d)},u=function(b){if(a[b])p(b,!0);else{var d=e[b]||(e[b]=[]);d.push(p);if(!(1<d.length)){var c=new CKEDITOR.dom.element("script");c.setAttributes({type:"text/javascript",src:b});g&&(CKEDITOR.env.ie&&11>CKEDITOR.env.version?c.$.onreadystatechange=function(){if("loaded"==c.$.readyState||"complete"==
-c.$.readyState)c.$.onreadystatechange=null,v(b,!0)}:(c.$.onload=function(){setTimeout(function(){v(b,!0)},0)},c.$.onerror=function(){v(b,!1)}));c.appendTo(CKEDITOR.document.getHead())}}};m&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var t=0;t<k;t++)u(c[t])}},queue:function(){function a(){var c;(c=g[0])&&this.load(c.scriptUrl,c.callback,CKEDITOR,0)}var g=[];return function(f,e){var l=this;g.push({scriptUrl:f,callback:function(){e&&e.apply(this,arguments);g.shift();a.call(l)}});
-1==g.length&&a.call(this)}}()}}(),CKEDITOR.resourceManager=function(a,e){this.basePath=a;this.fileName=e;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}},CKEDITOR.resourceManager.prototype={add:function(a,e){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var c=this.registered[a]=e||{};c.name=a;c.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",c);return this.get(a)},
-get:function(a){return this.registered[a]||null},getPath:function(a){var e=this.externals[a];return CKEDITOR.getUrl(e&&e.dir||this.basePath+a+"/")},getFilePath:function(a){var e=this.externals[a];return CKEDITOR.getUrl(this.getPath(a)+(e?e.file:this.fileName+".js"))},addExternal:function(a,e,c){a=a.split(",");for(var g=0;g<a.length;g++){var f=a[g];c||(e=e.replace(/[^\/]+$/,function(a){c=a;return""}));this.externals[f]={dir:e,file:c||this.fileName+".js"}}},load:function(a,e,c){CKEDITOR.tools.isArray(a)||
-(a=a?[a]:[]);for(var g=this.loaded,f=this.registered,m=[],l={},k={},b=0;b<a.length;b++){var d=a[b];if(d)if(g[d]||f[d])k[d]=this.get(d);else{var h=this.getFilePath(d);m.push(h);h in l||(l[h]=[]);l[h].push(d)}}CKEDITOR.scriptLoader.load(m,function(a,b){if(b.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+l[b[0]].join(",")+'" was not found at "'+b[0]+'".');for(var d=0;d<a.length;d++)for(var h=l[a[d]],f=0;f<h.length;f++){var m=h[f];k[m]=this.get(m);g[m]=1}e.call(c,k)},this)}},CKEDITOR.plugins=
-new CKEDITOR.resourceManager("plugins/","plugin"),CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var e={};return function(c,g,f){var m={},l=function(c){a.call(this,c,function(a){CKEDITOR.tools.extend(m,a);var d=[],c;for(c in a){var k=a[c],v=k&&k.requires;if(!e[c]){if(k.icons)for(var u=k.icons.split(","),t=u.length;t--;)CKEDITOR.skin.addIcon(u[t],k.path+"icons/"+(CKEDITOR.env.hidpi&&k.hidpi?"hidpi/":"")+u[t]+".png");e[c]=1}if(v)for(v.split&&(v=v.split(",")),k=0;k<v.length;k++)m[v[k]]||
-d.push(v[k])}if(d.length)l.call(this,d);else{for(c in m)k=m[c],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete m[c],k.onLoad._called=1);g&&g.call(f||window,m)}},this)};l.call(this,c)}}),CKEDITOR.plugins.setLang=function(a,e,c){var g=this.get(a);a=g.langEntries||(g.langEntries={});g=g.lang||(g.lang=[]);g.split&&(g=g.split(","));-1==CKEDITOR.tools.indexOf(g,e)&&g.push(e);a[e]=c},CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this},
-CKEDITOR.ui.prototype={add:function(a,e,c){c.name=a.toLowerCase();var g=this.items[a]={type:e,command:c.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(g,c)},get:function(a){return this.instances[a]},create:function(a){var e=this.items[a],c=e&&this._.handlers[e.type],g=e&&e.command&&this.editor.getCommand(e.command),c=c&&c.create.apply(this,e.args);this.instances[a]=c;g&&g.uiItems.push(c);c&&!c.type&&(c.type=e.type);return c},addHandler:function(a,e){this._.handlers[a]=
-e},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}},CKEDITOR.event.implementOn(CKEDITOR.ui),function(){function a(a,b,d){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==b){if(!(b instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!d)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&d==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");
-if(!c(b,d))throw Error('The specified element mode is not supported on element: "'+b.getName()+'".');this.element=b;this.elementMode=d;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(b.getId()||b.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||e();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=
-new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",g);this.on("selectionChange",function(a){m(this,a.data.path)});this.on("activeFilterChange",function(){m(this,this.elementPath(),!0)});this.on("mode",g);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},
-0,this)}function e(){do var a="editor"+ ++u;while(CKEDITOR.instances[a]);return a}function c(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function g(){var a=this.commands,b;for(b in a)f(this,a[b])}function f(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function m(a,b,d){if(b){var c,h,f=a.commands;for(h in f)c=f[h],(d||c.contextSensitive)&&
-c.refresh(a,b)}}function l(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),d=t[b]||(t[b]={});d.fn?(d.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&l(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){d.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};l(a)});return!0}function k(a,d){a.on("customConfigLoaded",function(){if(d){if(d.on)for(var c in d.on)a.on(c,d.on[c]);CKEDITOR.tools.extend(a.config,d,!0);delete a.config.on}c=
+" "+I[a.shiftEnterMode],"default",1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,d,c){if(!m(this,b,c))return!1;var e,h;if("string"==typeof b)b=g(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),d,c);e=b.getDefinition();b={};c=e.attributes;b[e.element]=e={styles:e.styles,requiredStyles:e.styles&&CKEDITOR.tools.objectKeys(e.styles)};
+c&&(c=E(c),e.classes=c["class"]?c["class"].split(/\s+/):null,e.requiredClasses=e.classes,delete c["class"],e.attributes=c,e.requiredAttributes=c&&CKEDITOR.tools.objectKeys(c))}else if(CKEDITOR.tools.isArray(b)){for(e=0;e<b.length;++e)h=this.allow(b[e],d,c);return h}a(this,b,d,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,d,c){if(this.disabled)return!1;var g=this,e=[],h=this.editor&&this.editor.config.protectedSource,f,k=!1,n={doFilter:!d,doTransform:!0,doCallbacks:!0,toHtml:b};
+a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(f=v(g,a,e,n),f&1)k=!0;else if(f&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var d;a:{var c=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));d=[];var t,m,p;if(h)for(m=0;m<h.length;++m)if((p=c.match(h[m]))&&p[0].length==c.length){d=!0;
+break a}c=CKEDITOR.htmlParser.fragment.fromHtml(c);1==c.children.length&&(t=c.children[0]).type==CKEDITOR.NODE_ELEMENT&&v(g,t,d,n);d=!d.length}d||e.push(a)}},null,!0);e.length&&(k=!0);var m;a=[];c=I[c||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var p;d=e.pop();)d.type==CKEDITOR.NODE_ELEMENT?t(d,c,a):d.remove();for(;m=a.pop();)if(d=m.el,d.parent)switch(p=G[d.parent.name]||G.span,m.check){case "it":G.$removeEmpty[d.name]&&!d.children.length?t(d,c,a):q(d)||t(d,c,a);break;case "el-up":d.parent.type==
+CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||t(d,c,a);break;case "parent-down":d.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||p[d.name]||t(d.parent,c,a)}return k},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!m(this,b,!0))return!1;"string"==typeof b&&(b=g(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
+addContentForms:function(a){if(!this.disabled&&a){var b,d,c=[],g;for(b=0;b<a.length&&!g;++b)d=a[b],("string"==typeof d||d instanceof CKEDITOR.style)&&this.check(d)&&(g=d);if(g){for(b=0;b<a.length;++b)c.push(y(a[b],g));this.addTransformations(c)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
+this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,d;if(!this.disabled&&a){var c=this._.transformations,g;for(g=0;g<a.length;++g){b=a[g];var e=void 0,h=void 0,f=void 0,k=void 0,n=void 0,t=void 0;d=[];for(h=0;h<b.length;++h)f=b[h],"string"==typeof f?(f=f.split(/\s*:\s*/),k=f[0],n=null,t=f[1]):(k=f.check,n=f.left,t=f.right),e||(e=f,e=e.element?e.element:k?k.match(/^([a-z0-9]+)/i)[0]:
+e.left.getDefinition().element),n instanceof CKEDITOR.style&&(n=z(n)),d.push({check:k==e?null:k,left:n,right:"string"==typeof t?C(t):t});b=e;c[b]||(c[b]=[]);c[b].push(d)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var e=a.length;e--;)if(this.check(a[e],b,c))return!0;return!1}var h,f;if("string"==typeof a){f=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(f in this._.cachedChecks)return this._.cachedChecks[f];e=g(a).$1;h=e.styles;var k=e.classes;e.name=e.elements;
+e.classes=k=k?k.split(/\s*,\s*/):[];e.styles=d(h);e.attributes=d(e.attributes);e.children=[];k.length&&(e.attributes["class"]=k.join(" "));h&&(e.attributes.style=CKEDITOR.tools.writeCssText(e.styles));h=e}else e=a.getDefinition(),h=e.styles,k=e.attributes||{},h?(h=E(h),k.style=CKEDITOR.tools.writeCssText(h,!0)):h={},h={name:e.element,attributes:k,classes:k["class"]?k["class"].split(/\s+/):[],styles:h,children:[]};var k=CKEDITOR.tools.clone(h),t=[],m;if(!1!==b&&(m=this._.transformations[h.name])){for(e=
+0;e<m.length;++e)x(this,h,m[e]);n(h)}v(this,k,t,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<t.length?!1:CKEDITOR.tools.objectCompare(h.attributes,k.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[f]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(d,c){var g=a.slice(),e;if(this.check(I[d]))return d;for(c||(g=g.reverse());e=g.pop();)if(this.check(e))return b[e];
+return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var N={styles:1,attributes:1,classes:1},F={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},P=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,R={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},L=/^cke:(object|embed|param)$/,
+Q=/^(object|embed|param)$/,O=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,d){d=d||b;if(!(d in a.styles)){var c=a.attributes[b];c&&(/^\d+$/.test(c)&&(c+="px"),a.styles[d]=c)}delete a.attributes[b]},lengthToAttribute:function(a,b,d){d=d||b;if(!(d in a.attributes)){var c=a.styles[b],g=c&&c.match(/^(\d+)(?:\.\d*)?px$/);
+g?a.attributes[d]=g[1]:"cke-test"==c&&(a.attributes[d]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},matchesStyle:D,transform:function(a,b){if("string"==typeof b)a.name=b;else{var d=b.getDefinition(),c=d.styles,
+g=d.attributes,e,h,f,k;a.name=d.element;for(e in g)if("class"==e)for(d=a.classes.join("|"),f=g[e].split(/\s+/);k=f.pop();)-1==d.indexOf(k)&&a.classes.push(k);else a.attributes[e]=g[e];for(h in c)a.styles[h]=c[h]}}}}(),function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);
+a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=1},unlock:function(){delete this._.locked},blur:function(a){function f(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var c=
+CKEDITOR.focusManager._.blurDelay;a||!c?f.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;f.call(this)},c,this)}},add:function(a,f){var c=a.getCustomData("focusmanager");if(!c||c!=this){c&&c.remove(a);var c="focus",e="blur";f&&(CKEDITOR.env.ie?(c="focusin",e="focusout"):CKEDITOR.event.useCapture=1);var h={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(c,h.focus,this);a.on(e,h.blur,this);f&&(CKEDITOR.event.useCapture=
+0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",h)}},remove:function(a){a.removeCustomData("focusmanager");var f=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",f.blur);a.removeListener("focus",f.focus)}}}(),CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this},function(){var a,f=function(c){c=c.data;var h=c.getKeystroke(),f=this.keystrokes[h],
+l=this._.editor;a=!1===l.fire("key",{keyCode:h,domEvent:c});a||(f&&(a=!1!==l.execCommand(f,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[h]));a&&c.preventDefault(!0);return!a},c=function(c){a&&(a=!1,c.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",f,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",c,this)}}}(),function(){CKEDITOR.lang={languages:{af:1,ar:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,
+"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,f,c){a&&CKEDITOR.lang.languages[a]||(a=this.detect(f,a));var e=this;f=function(){e[a].dir=e.rtl[a]?"rtl":"ltr";c(a,e[a])};this[a]?f():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+
+a+".js"),f,this)},detect:function(a,f){var c=this.languages;f=f||navigator.userLanguage||navigator.language||a;var e=f.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),h=e[1],e=e[2];c[h+"-"+e]?h=h+"-"+e:c[h]||(h=null);CKEDITOR.lang.detect=h?function(){return h}:function(a){return a};return h||a}}}(),CKEDITOR.scriptLoader=function(){var a={},f={};return{load:function(c,e,h,m){var l="string"==typeof c;l&&(c=[c]);h||(h=CKEDITOR);var k=c.length,b=[],d=[],g=function(a){e&&(l?e.call(h,a):e.call(h,b,d))};if(0===
+k)g(!0);else{var p=function(a,c){(c?b:d).push(a);0>=--k&&(m&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),g(c))},u=function(b,d){a[b]=1;var c=f[b];delete f[b];for(var g=0;g<c.length;g++)c[g](b,d)},v=function(b){if(a[b])p(b,!0);else{var d=f[b]||(f[b]=[]);d.push(p);if(!(1<d.length)){var c=new CKEDITOR.dom.element("script");c.setAttributes({type:"text/javascript",src:b});e&&(CKEDITOR.env.ie&&11>CKEDITOR.env.version?c.$.onreadystatechange=function(){if("loaded"==c.$.readyState||"complete"==
+c.$.readyState)c.$.onreadystatechange=null,u(b,!0)}:(c.$.onload=function(){setTimeout(function(){u(b,!0)},0)},c.$.onerror=function(){u(b,!1)}));c.appendTo(CKEDITOR.document.getHead())}}};m&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var r=0;r<k;r++)v(c[r])}},queue:function(){function a(){var c;(c=e[0])&&this.load(c.scriptUrl,c.callback,CKEDITOR,0)}var e=[];return function(h,f){var l=this;e.push({scriptUrl:h,callback:function(){f&&f.apply(this,arguments);e.shift();a.call(l)}});
+1==e.length&&a.call(this)}}()}}(),CKEDITOR.resourceManager=function(a,f){this.basePath=a;this.fileName=f;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}},CKEDITOR.resourceManager.prototype={add:function(a,f){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var c=this.registered[a]=f||{};c.name=a;c.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",c);return this.get(a)},
+get:function(a){return this.registered[a]||null},getPath:function(a){var f=this.externals[a];return CKEDITOR.getUrl(f&&f.dir||this.basePath+a+"/")},getFilePath:function(a){var f=this.externals[a];return CKEDITOR.getUrl(this.getPath(a)+(f?f.file:this.fileName+".js"))},addExternal:function(a,f,c){a=a.split(",");for(var e=0;e<a.length;e++){var h=a[e];c||(f=f.replace(/[^\/]+$/,function(a){c=a;return""}));this.externals[h]={dir:f,file:c||this.fileName+".js"}}},load:function(a,f,c){CKEDITOR.tools.isArray(a)||
+(a=a?[a]:[]);for(var e=this.loaded,h=this.registered,m=[],l={},k={},b=0;b<a.length;b++){var d=a[b];if(d)if(e[d]||h[d])k[d]=this.get(d);else{var g=this.getFilePath(d);m.push(g);g in l||(l[g]=[]);l[g].push(d)}}CKEDITOR.scriptLoader.load(m,function(a,b){if(b.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+l[b[0]].join(",")+'" was not found at "'+b[0]+'".');for(var d=0;d<a.length;d++)for(var g=l[a[d]],h=0;h<g.length;h++){var m=g[h];k[m]=this.get(m);e[m]=1}f.call(c,k)},this)}},CKEDITOR.plugins=
+new CKEDITOR.resourceManager("plugins/","plugin"),CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var f={};return function(c,e,h){var m={},l=function(c){a.call(this,c,function(a){CKEDITOR.tools.extend(m,a);var d=[],c;for(c in a){var k=a[c],u=k&&k.requires;if(!f[c]){if(k.icons)for(var v=k.icons.split(","),r=v.length;r--;)CKEDITOR.skin.addIcon(v[r],k.path+"icons/"+(CKEDITOR.env.hidpi&&k.hidpi?"hidpi/":"")+v[r]+".png");f[c]=1}if(u)for(u.split&&(u=u.split(",")),k=0;k<u.length;k++)m[u[k]]||
+d.push(u[k])}if(d.length)l.call(this,d);else{for(c in m)k=m[c],k.onLoad&&!k.onLoad._called&&(!1===k.onLoad()&&delete m[c],k.onLoad._called=1);e&&e.call(h||window,m)}},this)};l.call(this,c)}}),CKEDITOR.plugins.setLang=function(a,f,c){var e=this.get(a);a=e.langEntries||(e.langEntries={});e=e.lang||(e.lang=[]);e.split&&(e=e.split(","));-1==CKEDITOR.tools.indexOf(e,f)&&e.push(f);a[f]=c},CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this},
+CKEDITOR.ui.prototype={add:function(a,f,c){c.name=a.toLowerCase();var e=this.items[a]={type:f,command:c.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(e,c)},get:function(a){return this.instances[a]},create:function(a){var f=this.items[a],c=f&&this._.handlers[f.type],e=f&&f.command&&this.editor.getCommand(f.command),c=c&&c.create.apply(this,f.args);this.instances[a]=c;e&&e.uiItems.push(c);c&&!c.type&&(c.type=f.type);return c},addHandler:function(a,f){this._.handlers[a]=
+f},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}},CKEDITOR.event.implementOn(CKEDITOR.ui),function(){function a(a,b,d){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==b){if(!(b instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!d)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&d==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");
+if(!c(b,d))throw Error('The specified element mode is not supported on element: "'+b.getName()+'".');this.element=b;this.elementMode=d;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(b.getId()||b.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||f();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=
+new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",e);this.on("selectionChange",function(a){m(this,a.data.path)});this.on("activeFilterChange",function(){m(this,this.elementPath(),!0)});this.on("mode",e);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?k(this,a):CKEDITOR.warn("editor-incorrect-destroy")},
+0,this)}function f(){do var a="editor"+ ++v;while(CKEDITOR.instances[a]);return a}function c(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function e(){var a=this.commands,b;for(b in a)h(this,a[b])}function h(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function m(a,b,d){if(b){var c,g,e=a.commands;for(g in e)c=e[g],(d||c.contextSensitive)&&
+c.refresh(a,b)}}function l(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),d=r[b]||(r[b]={});d.fn?(d.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&l(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){d.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};l(a)});return!0}function k(a,d){a.on("customConfigLoaded",function(){if(d){if(d.on)for(var c in d.on)a.on(c,d.on[c]);CKEDITOR.tools.extend(a.config,d,!0);delete a.config.on}c=
 a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||
 0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);b(a)});d&&null!=d.customConfig&&(a.config.customConfig=d.customConfig);l(a)||a.fireOnce("customConfigLoaded")}function b(a){CKEDITOR.skin.loadPart("editor",function(){d(a)})}function d(a){CKEDITOR.lang.load(a.config.language,
-a.config.defaultLanguage,function(b,d){var c=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(d);a.title="string"==typeof c||!1===c?c:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");h(a)})}function h(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);p(a)})}function p(a){var b=a.config,
-d=b.plugins,c=b.extraPlugins,h=b.removePlugins;if(c)var f=new RegExp("(?:^|,)(?:"+c.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(f,""),d=d+(","+c);if(h)var g=new RegExp("(?:^|,)(?:"+h.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(g,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),function(d){var c=[],h=[],f=[];a.plugins=d;for(var k in d){var e=d[k],r=e.lang,m=null,p=e.requires,E;CKEDITOR.tools.isArray(p)&&(p=p.join(","));if(p&&(E=p.match(g)))for(;p=E.pop();)CKEDITOR.error("editor-plugin-required",
-{plugin:p.replace(",",""),requiredBy:k});r&&!a.lang[k]&&(r.split&&(r=r.split(",")),0<=CKEDITOR.tools.indexOf(r,a.langCode)?m=a.langCode:(m=a.langCode.replace(/-.*/,""),m=m!=a.langCode&&0<=CKEDITOR.tools.indexOf(r,m)?m:0<=CKEDITOR.tools.indexOf(r,"en")?"en":r[0]),e.langEntries&&e.langEntries[m]?(a.lang[k]=e.langEntries[m],m=null):f.push(CKEDITOR.getUrl(e.path+"lang/"+m+".js")));h.push(m);c.push(e)}CKEDITOR.scriptLoader.load(f,function(){for(var d=["beforeInit","init","afterInit"],f=0;f<d.length;f++)for(var g=
-0;g<c.length;g++){var k=c[g];0===f&&h[g]&&k.lang&&k.langEntries&&(a.lang[k.name]=k.langEntries[h[g]]);if(k[d[f]])k[d[f]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(g=0;g<a.config.blockedKeystrokes.length;g++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[g]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function v(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
-this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var u=0,t={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var d=new CKEDITOR.command(this,b);this.mode&&f(this,d);return this.commands[a]=d},_attachToForm:function(){function a(b){d.updateElement();d._.required&&!c.getValue()&&!1===d.fire("required")&&b.data.preventDefault()}
-function b(a){return!!(a&&a.call&&a.apply)}var d=this,c=d.element,h=new CKEDITOR.dom.element(c.$.form);c.is("textarea")&&h&&(h.on("submit",a),b(h.$.submit)&&(h.$.submit=CKEDITOR.tools.override(h.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),d.on("destroy",function(){h.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&v.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status=
+a.config.defaultLanguage,function(b,d){var c=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(d);a.title="string"==typeof c||!1===c?c:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");g(a)})}function g(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);p(a)})}function p(a){var b=a.config,
+d=b.plugins,c=b.extraPlugins,g=b.removePlugins;if(c)var e=new RegExp("(?:^|,)(?:"+c.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(e,""),d=d+(","+c);if(g)var h=new RegExp("(?:^|,)(?:"+g.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),d=d.replace(h,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),function(d){var c=[],g=[],e=[];a.plugins=d;for(var f in d){var k=d[f],t=k.lang,m=null,p=k.requires,l;CKEDITOR.tools.isArray(p)&&(p=p.join(","));if(p&&(l=p.match(h)))for(;p=l.pop();)CKEDITOR.error("editor-plugin-required",
+{plugin:p.replace(",",""),requiredBy:f});t&&!a.lang[f]&&(t.split&&(t=t.split(",")),0<=CKEDITOR.tools.indexOf(t,a.langCode)?m=a.langCode:(m=a.langCode.replace(/-.*/,""),m=m!=a.langCode&&0<=CKEDITOR.tools.indexOf(t,m)?m:0<=CKEDITOR.tools.indexOf(t,"en")?"en":t[0]),k.langEntries&&k.langEntries[m]?(a.lang[f]=k.langEntries[m],m=null):e.push(CKEDITOR.getUrl(k.path+"lang/"+m+".js")));g.push(m);c.push(k)}CKEDITOR.scriptLoader.load(e,function(){for(var d=["beforeInit","init","afterInit"],e=0;e<d.length;e++)for(var h=
+0;h<c.length;h++){var f=c[h];0===e&&g[h]&&f.lang&&f.langEntries&&(a.lang[f.name]=f.langEntries[g[h]]);if(f[d[e]])f[d[e]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(h=0;h<a.config.blockedKeystrokes.length;h++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[h]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function u(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
+this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var v=0,r={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var d=new CKEDITOR.command(this,b);this.mode&&h(this,d);return this.commands[a]=d},_attachToForm:function(){function a(b){d.updateElement();d._.required&&!c.getValue()&&!1===d.fire("required")&&b.data.preventDefault()}
+function b(a){return!!(a&&a.call&&a.apply)}var d=this,c=d.element,g=new CKEDITOR.dom.element(c.$.form);c.is("textarea")&&g&&(g.on("submit",a),b(g.$.submit)&&(g.$.submit=CKEDITOR.tools.override(g.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),d.on("destroy",function(){g.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&u.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status=
 "destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,b){var d=this.getCommand(a),c={name:a,commandData:b,command:d};return d&&d.state!=CKEDITOR.TRISTATE_DISABLED&&
 !1!==this.fire("beforeCommandExec",c)&&(c.returnValue=d.exec(c.commandData),!d.async&&!1!==this.fire("afterCommandExec",c))?c.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");
-"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,d){var c=!0,h=b;b&&"object"==typeof b&&(d=b.internal,h=b.callback,c=!b.noSnapshot);!d&&c&&this.fire("saveSnapshot");if(h||!d)this.once("dataReady",function(a){!d&&c&&this.fire("saveSnapshot");h&&h.call(a.editor)});a={dataValue:a};!d&&this.fire("setData",a);this._.data=a.dataValue;
+"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,d){var c=!0,g=b;b&&"object"==typeof b&&(d=b.internal,g=b.callback,c=!b.noSnapshot);!d&&c&&this.fire("saveSnapshot");if(g||!d)this.once("dataReady",function(a){!d&&c&&this.fire("saveSnapshot");g&&g.call(a.editor)});a={dataValue:a};!d&&this.fire("setData",a);this._.data=a.dataValue;
 !d&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,d){this.fire("insertHtml",{dataValue:a,mode:b,range:d})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",a)},getSelectedHtml:function(a){var b=this.editable(),d=this.getSelection(),d=d&&d.getRanges();if(!b||!d||0===d.length)return null;
-b=b.getHtmlFromRange(d[0]);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var d=this.editable(),c=this.getSelection().getRanges();if(!d||0===c.length)return null;c=c[0];d=d.extractHtmlFromRange(c,b);b||this.getSelection().selectRanges([c]);return a?d.getHtml():d},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return v.call(this)},
-setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,0)],d,c,h=b.length;h--;)d=b[h],c=0,CKEDITOR.tools.isArray(d)&&(c=d[1],d=d[0]),c?a[d]=c:delete a[d]},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),
-a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})}(),CKEDITOR.ELEMENT_MODE_NONE=0,CKEDITOR.ELEMENT_MODE_REPLACE=1,CKEDITOR.ELEMENT_MODE_APPENDTO=2,CKEDITOR.ELEMENT_MODE_INLINE=
-3,CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}},function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,e={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},
-onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(c){for(var g,f,m=0,l;g=this._.htmlPartsRegex.exec(c);){f=g.index;if(f>m)if(m=c.substring(m,f),l)l.push(m);else this.onText(m);m=this._.htmlPartsRegex.lastIndex;if(f=g[1])if(f=f.toLowerCase(),l&&CKEDITOR.dtd.$cdata[f]&&(this.onCDATA(l.join("")),l=null),!l){this.onTagClose(f);continue}if(l)l.push(g[0]);else if(f=g[3]){if(f=f.toLowerCase(),!/="/.test(f)){var k={},b,d=g[4];g=!!g[5];if(d)for(;b=a.exec(d);){var h=b[1].toLowerCase();
-b=b[2]||b[3]||b[4]||"";k[h]=!b&&e[h]?h:CKEDITOR.tools.htmlDecodeAttr(b)}this.onTagOpen(f,k,g);!l&&CKEDITOR.dtd.$cdata[f]&&(l=[])}}else if(f=g[2])this.onComment(f)}if(c.length>m)this.onText(c.substring(m,c.length))}}}(),CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,e){e?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,e){"string"==typeof e&&(e=
-CKEDITOR.tools.htmlEncodeAttr(e));this._.output.push(" ",a,'\x3d"',e,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var e=this._.output.join("");a&&this.reset();return e}}}),"use strict",function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype=
-{remove:function(){var a=this.parent.children,e=CKEDITOR.tools.indexOf(a,this),c=this.previous,g=this.next;c&&(c.next=g);g&&(g.previous=c);a.splice(e,1);this.parent=null},replaceWith:function(a){var e=this.parent.children,c=CKEDITOR.tools.indexOf(e,this),g=a.previous=this.previous,f=a.next=this.next;g&&(g.next=a);f&&(f.previous=a);e[c]=a;a.parent=this.parent;this.parent=null},insertAfter:function(a){var e=a.parent.children,c=CKEDITOR.tools.indexOf(e,a),g=a.next;e.splice(c+1,0,this);this.next=a.next;
-this.previous=a;a.next=this;g&&(g.previous=this);this.parent=a.parent},insertBefore:function(a){var e=a.parent.children,c=CKEDITOR.tools.indexOf(e,a);e.splice(c,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var e="function"==typeof a?a:"string"==typeof a?function(c){return c.name==a}:function(c){return c.name in a},c=this.parent;for(;c&&c.type==CKEDITOR.NODE_ELEMENT;){if(e(c))return c;c=c.parent}return null},wrapWith:function(a){this.replaceWith(a);
-a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}}(),"use strict",CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}},CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,e){var c=this.value;if(!(c=a.onComment(e,c,this)))return this.remove(),!1;if("string"!=typeof c)return this.replaceWith(c),!1;this.value=
-c;return!0},writeHtml:function(a,e){e&&this.filter(e);a.comment(this.value)}}),"use strict",function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,e){if(!(this.value=a.onText(e,this.value,this)))return this.remove(),!1},writeHtml:function(a,e){e&&this.filter(e);a.text(this.value)}})}(),"use strict",function(){CKEDITOR.htmlParser.cdata=function(a){this.value=
-a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})}(),"use strict",CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}},function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var e=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},
-CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),c={ol:1,ul:1},g=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),f={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=function(m,l,k){function b(a){var b;if(0<q.length)for(var c=0;c<q.length;c++){var h=q[c],f=h.name,g=CKEDITOR.dtd[f],k=y.name&&CKEDITOR.dtd[y.name];k&&!k[f]||a&&g&&!g[a]&&CKEDITOR.dtd[a]?f==
-y.name&&(p(y,y.parent,1),c--):(b||(d(),b=1),h=h.clone(),h.parent=y,y=h,q.splice(c,1),c--)}}function d(){for(;w.length;)p(w.shift(),y)}function h(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,d=a.children[b-1],c;d&&d.type==CKEDITOR.NODE_TEXT&&((c=CKEDITOR.tools.rtrim(d.value))?d.value=c:a.children.length=b-1)}}function p(b,d,c){d=d||y||n;var f=y;void 0===b.previous&&(v(d,b)&&(y=d,t.onTagOpen(k,{}),b.returnPoint=d=y),h(b),a(b)&&!b.children.length||d.add(b),"pre"==
-b.name&&(r=!1),"textarea"==b.name&&(C=!1));b.returnPoint?(y=b.returnPoint,delete b.returnPoint):y=c?d:f}function v(a,b){if((a==n||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var d,c;return(d=b.attributes&&(c=b.attributes["data-cke-real-element-type"])?c:b.name)&&d in CKEDITOR.dtd.$inline&&!(d in CKEDITOR.dtd.head)&&!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function u(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var t=
-new CKEDITOR.htmlParser,n=l instanceof CKEDITOR.htmlParser.element?l:"string"==typeof l?new CKEDITOR.htmlParser.element(l):new CKEDITOR.htmlParser.fragment,q=[],w=[],y=n,C="textarea"==n.name,r="pre"==n.name;t.onTagOpen=function(h,f,k,m){f=new CKEDITOR.htmlParser.element(h,f);f.isUnknown&&k&&(f.isEmpty=!0);f.isOptionalClose=m;if(a(f))q.push(f);else{if("pre"==h)r=!0;else{if("br"==h&&r){y.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==h&&(C=!0)}if("br"==h)w.push(f);else{for(;!(m=(k=y.name)?
-CKEDITOR.dtd[k]||(y._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):g,f.isUnknown||y.isUnknown||m[h]);)if(y.isOptionalClose)t.onTagClose(k);else if(h in c&&k in c)k=y.children,(k=k[k.length-1])&&"li"==k.name||p(k=new CKEDITOR.htmlParser.element("li"),y),!f.returnPoint&&(f.returnPoint=y),y=k;else if(h in CKEDITOR.dtd.$listItem&&!u(h,k))t.onTagOpen("li"==h?"ul":"dl",{},0,1);else if(k in e&&!u(h,k))!f.returnPoint&&(f.returnPoint=y),y=y.parent;else if(k in CKEDITOR.dtd.$inline&&q.unshift(y),y.parent)p(y,
-y.parent,1);else{f.isOrphan=1;break}b(h);d();f.parent=y;f.isEmpty?p(f):y=f}}};t.onTagClose=function(a){for(var b=q.length-1;0<=b;b--)if(a==q[b].name){q.splice(b,1);return}for(var c=[],h=[],f=y;f!=n&&f.name!=a;)f._.isBlockLike||h.unshift(f),c.push(f),f=f.returnPoint||f.parent;if(f!=n){for(b=0;b<c.length;b++){var g=c[b];p(g,g.parent)}y=f;f._.isBlockLike&&d();p(f,f.parent);f==y&&(y=y.parent);q=q.concat(h)}"body"==a&&(k=!1)};t.onText=function(a){if(!(y._.hasInlineStarted&&!w.length||r||C)&&(a=CKEDITOR.tools.ltrim(a),
-0===a.length))return;var c=y.name,h=c?CKEDITOR.dtd[c]||(y._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):g;if(!C&&!h["#"]&&c in e)t.onTagOpen(f[c]||""),t.onText(a);else{d();b();r||C||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(v(y,a))this.onTagOpen(k,{},0,1);y.add(a)}};t.onCDATA=function(a){y.add(new CKEDITOR.htmlParser.cdata(a))};t.onComment=function(a){d();b();y.add(new CKEDITOR.htmlParser.comment(a))};t.parse(m);for(d();y!=n;)p(y,y.parent,1);h(n);return n};
-CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,c){isNaN(c)&&(c=this.children.length);var f=0<c?this.children[c-1]:null;if(f){if(a._.isBlockLike&&f.type==CKEDITOR.NODE_TEXT&&(f.value=CKEDITOR.tools.rtrim(f.value),0===f.value.length)){this.children.pop();this.add(a);return}f.next=a}a.previous=f;a.parent=this;this.children.splice(c,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},
-filter:function(a,c){c=this.getFilterContext(c);a.onRoot(c,this);this.filterChildren(a,!1,c)},filterChildren:function(a,c,f){if(this.childrenFilteredBy!=a.id){f=this.getFilterContext(f);if(c&&!this.parent)a.onRoot(f,this);this.childrenFilteredBy=a.id;for(c=0;c<this.children.length;c++)!1===this.children[c].filter(a,f)&&c--}},writeHtml:function(a,c){c&&this.filter(c);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,c,f){var b=this.getFilterContext();if(f&&!this.parent&&c)c.onRoot(b,this);c&&
-this.filterChildren(c,!1,b);c=0;f=this.children;for(b=f.length;c<b;c++)f[c].writeHtml(a)},forEach:function(a,c,f){if(!(f||c&&this.type!=c))var b=a(this);if(!1!==b){f=this.children;for(var d=0;d<f.length;d++)b=f[d],b.type==CKEDITOR.NODE_ELEMENT?b.forEach(a,c):c&&b.type!=c||a(b)}},getFilterContext:function(a){return a||{}}}}(),"use strict",function(){function a(){this.rules=[]}function e(c,g,f,e){var l,k;for(l in g)(k=c[l])||(k=c[l]=new a),k.add(g[l],f,e)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(c){this.id=
-CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;c&&this.addRules(c,10)},proto:{addRules:function(a,g){var f;"number"==typeof g?f=g:g&&"priority"in g&&(f=g.priority);"number"!=typeof f&&(f=10);"object"!=typeof g&&(g={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,f,g);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,
-f,g);a.elements&&e(this.elementsRules,a.elements,f,g);a.attributes&&e(this.attributesRules,a.attributes,f,g);a.text&&this.textRules.add(a.text,f,g);a.comment&&this.commentRules.add(a.comment,f,g);a.root&&this.rootRules.add(a.root,f,g)},applyTo:function(a){a.filter(this)},onElementName:function(a,g){return this.elementNameRules.execOnName(a,g)},onAttributeName:function(a,g){return this.attributeNameRules.execOnName(a,g)},onText:function(a,g,f){return this.textRules.exec(a,g,f)},onComment:function(a,
-g,f){return this.commentRules.exec(a,g,f)},onRoot:function(a,g){return this.rootRules.exec(a,g)},onElement:function(a,g){for(var f=[this.elementsRules["^"],this.elementsRules[g.name],this.elementsRules.$],e,l=0;3>l;l++)if(e=f[l]){e=e.exec(a,g,this);if(!1===e)return null;if(e&&e!=g)return this.onNode(a,e);if(g.parent&&!g.name)break}return g},onNode:function(a,g){var f=g.type;return f==CKEDITOR.NODE_ELEMENT?this.onElement(a,g):f==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,g.value)):
-f==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,g.value)):null},onAttribute:function(a,g,f,e){return(f=this.attributesRules[f])?f.exec(a,e,g,this):e}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,g,f){this.rules.splice(this.findIndex(g),0,{value:a,priority:g,options:f})},addMany:function(a,g,f){for(var e=[this.findIndex(g),0],l=0,k=a.length;l<k;l++)e.push({value:a[l],priority:g,options:f});this.rules.splice.apply(this.rules,e)},findIndex:function(a){for(var g=
-this.rules,f=g.length-1;0<=f&&a<g[f].priority;)f--;return f+1},exec:function(a,g){var f=g instanceof CKEDITOR.htmlParser.node||g instanceof CKEDITOR.htmlParser.fragment,e=Array.prototype.slice.call(arguments,1),l=this.rules,k=l.length,b,d,h,p;for(p=0;p<k;p++)if(f&&(b=g.type,d=g.name),h=l[p],!(a.nonEditable&&!h.options.applyToAll||a.nestedEditable&&h.options.excludeNestedEditable)){h=h.value.apply(null,e);if(!1===h||f&&h&&(h.name!=d||h.type!=b))return h;null!=h&&(e[0]=g=h)}return g},execOnName:function(a,
-g){for(var f=0,e=this.rules,l=e.length,k;g&&f<l;f++)k=e[f],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(g=g.replace(k.value[0],k.value[1]));return g}}}(),function(){function a(a,b){function d(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function h(a,b){return function(f){if(f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=[],k=c(f),r,p;if(k)for(e(k,1)&&h.push(k);k;)m(k)&&
-(r=g(k))&&e(r)&&((p=g(r))&&!m(p)?h.push(r):(d(E).insertAfter(r),r.remove())),k=k.previous;for(k=0;k<h.length;k++)h[k].remove();if(h=!a||!1!==("function"==typeof b?b(f):b))E||CKEDITOR.env.needsBrFiller||f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?E||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||f.name in CKEDITOR.dtd.tr||f.name in CKEDITOR.dtd.$listItem)?(h=c(f),h=!h||"form"==f.name&&"input"==h.name):h=!1:h=!1;h&&f.add(d(a))}}}function e(a,b){if((!E||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&
-"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var d;return a.type==CKEDITOR.NODE_TEXT&&(d=a.value.match(q))&&(d.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,d.index))).insertBefore(a),a.value=d[0]),!CKEDITOR.env.needsBrFiller&&E&&(!b||a.parent.name in p)||!E&&((d=a.previous)&&"br"==d.name||!d||m(d)))?!0:!1}var k={elements:{}},E="html"==b,p=CKEDITOR.tools.extend({},r),n;for(n in p)"#"in y[n]||delete p[n];for(n in p)k.elements[n]=h(E,a.config.fillEmptyBlocks);k.root=h(E,!1);k.elements.br=
-function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var c=b.attributes;if("data-cke-bogus"in c||"data-cke-eol"in c)delete c["data-cke-bogus"];else{for(c=b.next;c&&f(c);)c=c.next;var h=g(b);!c&&m(b.parent)?l(b.parent,d(a)):m(c)&&h&&!m(h)&&d(a).insertBefore(c)}}}}(E);return k}function e(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function c(a){for(a=a.children[a.children.length-1];a&&f(a);)a=a.previous;return a}function g(a){for(a=a.previous;a&&
-f(a);)a=a.previous;return a}function f(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function m(a){return a&&(a.type==CKEDITOR.NODE_ELEMENT&&a.name in r||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function l(a,b){var d=a.children[a.children.length-1];a.children.push(b);b.parent=a;d&&(d.next=b,b.previous=d)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);
-a.contenteditable="false"}function b(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function d(a){return a.replace(D,function(a,b,d){return"\x3c"+b+d.replace(G,function(a,b){return F.test(b)&&-1==d.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function h(a,b){return a.replace(b,function(a,b,d){0===a.indexOf("\x3ctextarea")&&(a=b+u(d).replace(/</g,"\x26lt;").replace(/>/g,
-"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function p(a){return a.replace(N,function(a,b){return decodeURIComponent(b)})}function v(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,function(a){return"\x3c!--"+w+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function u(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function t(a,b){var d=b._.dataStore;
-return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return d&&d[b]||""})}function n(a,b){var d=[],c=b.config.protectedSource,f=b._.dataStore||(b._.dataStore={id:1}),h=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,c=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(c);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(d.push(a)-
-1)+"--\x3e"});for(var g=0;g<c.length;g++)a=a.replace(c[g],function(a){a=a.replace(h,function(a,b,c){return d[c]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(d.push(a)-1)+"--\x3e"});a=a.replace(h,function(a,b,c){return"\x3c!--"+w+(b?"{C}":"")+encodeURIComponent(d[c]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){f[f.id]=
-decodeURIComponent(b);return"{cke_protected_"+f.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,d,c,f){return"\x3c"+d+c+"\x3e"+t(u(f),b)+"\x3c/"+d+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,f,g=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=f=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(x);c.addRules(B,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});
-f.addRules(A);f.addRules(z,{applyToAll:!0});f.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,f,c=n(c,b),c=h(c,I),c=d(c),c=h(c,J),c=c.replace(E,"$1cke:$2"),c=c.replace(T,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");f=a.context||b.editable().getName();var g;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==f&&(f="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",
-g=1);f=b.document.createElement(f);f.setHtml("a"+c);c=f.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");g&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(P,"$1$2");c=p(c);c=u(c);f=!1===a.fixForBody?!1:e(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,f);f&&(g=c,!g.children.length&&CKEDITOR.dtd[g.name][f]&&(f=new CKEDITOR.htmlParser.element(f),g.add(f)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,
-!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(g.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,d=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(d);b=d.getHtml(!0);a.dataValue=v(b)},null,null,15);b.on("toDataFormat",function(a){var d=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(d=d.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(d,
-a.data.context,e(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(g.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,!1,!0)},null,null,11);b.on("toDataFormat",function(a){var d=a.data.dataValue,c=g.writer;c.reset();d.writeChildrenHtml(c);d=c.getHtml(!0);d=u(d);d=t(d,b);a.data.dataValue=d},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,d,c){var f=this.editor,
-h,g,k,e;b&&"object"==typeof b?(h=b.context,d=b.fixForBody,c=b.dontFilter,g=b.filter,k=b.enterMode,e=b.protectedWhitespaces):h=b;h||null===h||(h=f.editable().getName());return f.fire("toHtml",{dataValue:a,context:h,fixForBody:d,dontFilter:c,filter:g||f.filter,enterMode:k||f.enterMode,protectedWhitespaces:e}).dataValue},toDataFormat:function(a,b){var d,c,f;b&&(d=b.context,c=b.filter,f=b.enterMode);d||null===d||(d=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,
-filter:c||this.editor.filter,context:d,enterMode:f||this.editor.enterMode}).dataValue}};var q=/(?:&nbsp;|\xa0)$/,w="{cke_protected}",y=CKEDITOR.dtd,C="caption colgroup col thead tfoot tbody".split(" "),r=CKEDITOR.tools.extend({},y.$blockLimit,y.$block),x={elements:{input:k,textarea:k}},B={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},A={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var d=b.attributes.width,b=b.attributes.height;d&&(a.attributes.width=d);
-b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},z={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var d=["name","href","src"],c,f=0;f<d.length;f++)c="data-cke-saved-"+d[f],c in b&&delete b[d[f]]}return a},table:function(a){a.children.slice(0).sort(function(a,
-b){var d,c;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(d=CKEDITOR.tools.indexOf(C,a.name),c=CKEDITOR.tools.indexOf(C,b.name));-1<d&&-1<c&&d!=c||(d=a.parent?a.getIndex():-1,c=b.parent?b.getIndex():-1);return d>c?1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},
-style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&l(a,b=new CKEDITOR.htmlParser.text);b.value=a.attributes["data-cke-title"]||""},input:b,textarea:b},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(z.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});
-var D=/<(a|area|img|input|source)\b([^>]*)>/gi,G=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,F=/^(href|src|name)$/i,J=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,I=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,N=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,E=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,P=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,T=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi}(),"use strict",CKEDITOR.htmlParser.element=
-function(a,e){this.name=a;this.attributes=e||{};this.children=[];var c=a||"",g=c.match(/^cke:(.*)/);g&&(c=g[1]);c=!!(CKEDITOR.dtd.$nonBodyContent[c]||CKEDITOR.dtd.$block[c]||CKEDITOR.dtd.$listItem[c]||CKEDITOR.dtd.$tableContent[c]||CKEDITOR.dtd.$nonEditable[c]||"br"==c);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:c,hasInlineStarted:this.isEmpty||!c}},CKEDITOR.htmlParser.cssStyle=function(a){var e={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:
-a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,g,f){"font-family"==g&&(f=f.replace(/["']/g,""));e[g.toLowerCase()]=f});return{rules:e,populate:function(a){var g=this.toString();g&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",g):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=g:a.style=g)},toString:function(){var a=[],g;for(g in e)e[g]&&a.push(g,":",e[g],";");return a.join("")}}},function(){function a(a){return function(c){return c.type==
-CKEDITOR.NODE_ELEMENT&&("string"==typeof a?c.name==a:c.name in a)}}var e=function(a,c){a=a[0];c=c[0];return a<c?-1:a>c?1:0},c=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:c.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,c){var e=this,l,k;c=e.getFilterContext(c);if(c.off)return!0;if(!e.parent)a.onRoot(c,e);for(;;){l=e.name;if(!(k=
-a.onElementName(c,l)))return this.remove(),!1;e.name=k;if(!(e=a.onElement(c,e)))return this.remove(),!1;if(e!==this)return this.replaceWith(e),!1;if(e.name==l)break;if(e.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(e),!1;if(!e.name)return this.replaceWithChildren(),!1}l=e.attributes;var b,d;for(b in l){for(k=l[b];;)if(d=a.onAttributeName(c,b))if(d!=b)delete l[b],b=d;else break;else{delete l[b];break}d&&(!1===(k=a.onAttribute(c,e,d,k))?delete l[d]:l[d]=k)}e.isEmpty||this.filterChildren(a,!1,
-c);return!0},filterChildren:c.filterChildren,writeHtml:function(a,c){c&&this.filter(c);var m=this.name,l=[],k=this.attributes,b,d;a.openTag(m,k);for(b in k)l.push([b,k[b]]);a.sortAttributes&&l.sort(e);b=0;for(d=l.length;b<d;b++)k=l[b],a.attribute(k[0],k[1]);a.openTagClose(m,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(m)},writeChildrenHtml:c.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,c=a.length;c;)a[--c].insertAfter(this);this.remove()},forEach:c.forEach,
-getFirst:function(c){if(!c)return this.children.length?this.children[0]:null;"function"!=typeof c&&(c=a(c));for(var f=0,e=this.children.length;f<e;++f)if(c(this.children[f]))return this.children[f];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var c=0,e=a.length;c<e;++c)a[c].parent=this},getOuterHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;
-this.writeHtml(a);return a.getHtml()},split:function(a){for(var c=this.children.splice(a,this.children.length-a),e=this.clone(),l=0;l<c.length;++l)c[l].parent=e;e.children=c;c[0]&&(c[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(e,this.getIndex()+1);return e},addClass:function(a){if(!this.hasClass(a)){var c=this.attributes["class"]||"";this.attributes["class"]=c+(c?" ":"")+a}},removeClass:function(a){var c=this.attributes["class"];c&&((c=CKEDITOR.tools.trim(c.replace(new RegExp("(?:\\s+|^)"+
-a+"(?:\\s+|$)")," ")))?this.attributes["class"]=c:delete this.attributes["class"])},hasClass:function(a){var c=this.attributes["class"];return c?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(c):!1},getFilterContext:function(a){var c=[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||c.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&c.push("nestedEditable",
-!0):c.push("nonEditable",!0);if(c.length){a=CKEDITOR.tools.copy(a);for(var e=0;e<c.length;e+=2)a[c[e]]=c[e+1]}return a}},!0)}(),function(){var a={},e=/{([^}]+)}/g,c=/([\\'])/g,g=/\n/g,f=/\r/g;CKEDITOR.template=function(m){if(a[m])this.output=a[m];else{var l=m.replace(c,"\\$1").replace(g,"\\n").replace(f,"\\r").replace(e,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[m]=Function("data","buffer","return buffer?buffer.push('"+l+"'):['"+l+"'].join('');")}}}(),
-delete CKEDITOR.loadFullCore,CKEDITOR.instances={},CKEDITOR.document=new CKEDITOR.dom.document(document),CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)},CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]},function(){var a=
-{};CKEDITOR.addTemplate=function(e,c){var g=a[e];if(g)return g;g={name:e,source:c};CKEDITOR.fire("template",g);return a[e]=new CKEDITOR.template(g.source)};CKEDITOR.getTemplate=function(e){return a[e]}}(),function(){var a=[];CKEDITOR.addCss=function(e){a.push(e)};CKEDITOR.getCss=function(){return a.join("\n")}}(),CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")}),CKEDITOR.TRISTATE_ON=1,CKEDITOR.TRISTATE_OFF=2,CKEDITOR.TRISTATE_DISABLED=0,function(){CKEDITOR.inline=
-function(a,e){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var c=new CKEDITOR.editor(e,a,CKEDITOR.ELEMENT_MODE_INLINE),g=a.is("textarea")?a:null;g?(c.setData(g.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!c.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+g.getValue()+"\x3c/div\x3e",CKEDITOR.document),a.insertAfter(g),
-g.hide(),g.$.form&&c._attachToForm()):c.setData(a.getHtml(),null,!0);c.on("loaded",function(){c.fire("uiReady");c.editable(a);c.container=a;c.ui.contentsElement=a;c.setData(c.getData(1));c.resetDirty();c.fire("contentDom");c.mode="wysiwyg";c.fire("mode");c.status="ready";c.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,c)},null,null,1E4);c.on("destroy",function(){g&&(c.container.clearCustomData(),c.container.remove(),g.show());c.element.clearCustomData();delete c.element});return c};
-CKEDITOR.inlineAll=function(){var a,e,c;for(c in CKEDITOR.dtd.$editable)for(var g=CKEDITOR.document.getElementsByTag(c),f=0,m=g.count();f<m;f++)a=g.getItem(f),"true"==a.getAttribute("contenteditable")&&(e={element:a,config:{}},!1!==CKEDITOR.fire("inline",e)&&CKEDITOR.inline(a,e.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})}(),CKEDITOR.replaceClass="ckeditor",function(){function a(a,f,m,l){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);
-if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(f,a,l);l==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=a.hasAttribute("required"),a.removeAttribute("required"));m&&k.setData(m,null,!0);k.on("loaded",function(){c(k);l==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";
-k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",e);return k}function e(){var a=this.container,c=this.element;a&&(a.clearCustomData(),a.remove());c&&(c.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(c.show(),this._.required&&c.setAttribute("required","required")),delete this.element)}function c(a){var c=a.name,e=a.element,l=a.elementMode,k=a.fire("uiSpace",{space:"top",html:""}).html,b=a.fire("uiSpace",{space:"bottom",html:""}).html,d=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+
-CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-c=CKEDITOR.dom.element.createFromHtml(d.output({id:a.id,name:c,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:b?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+b+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));l==CKEDITOR.ELEMENT_MODE_REPLACE?
-(e.hide(),c.insertAfter(e)):e.append(c);a.container=c;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();b&&a.ui.space("bottom").unselectable();e=a.config.width;l=a.config.height;e&&c.setStyle("width",CKEDITOR.tools.cssLength(e));l&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(l));c.disableContextMenu();CKEDITOR.env.webkit&&c.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(c,f){return a(c,f,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(c,f,e){return a(c,f,e,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),c=0;c<a.length;c++){var e=null,l=a[c];if(l.name||l.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(l.className))continue}else if("function"==typeof arguments[0]&&(e={},!1===arguments[0](l,e)))continue;this.replace(l,e)}}};CKEDITOR.editor.prototype.addMode=function(a,c){(this._.modes||(this._.modes=
-{}))[a]=c};CKEDITOR.editor.prototype.setMode=function(a,c){var e=this,l=this._.modes;if(a!=e.mode&&l&&l[a]){e.fire("beforeSetMode",a);if(e.mode){var k=e.checkDirty(),l=e._.previousModeData,b,d=0;e.fire("beforeModeUnload");e.editable(0);e._.previousMode=e.mode;e._.previousModeData=b=e.getData(1);"source"==e.mode&&l==b&&(e.fire("lockSnapshot",{forceUpdate:!0}),d=1);e.ui.space("contents").setHtml("");e.mode=""}else e._.previousModeData=e.getData(1);this._.modes[a](function(){e.mode=a;void 0!==k&&!k&&
-e.resetDirty();d?e.fire("unlockSnapshot"):"wysiwyg"==a&&e.fire("saveSnapshot");setTimeout(function(){e.fire("mode");c&&c.call(e)},0)})}};CKEDITOR.editor.prototype.resize=function(a,c,e,l){var k=this.container,b=this.ui.space("contents"),d=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;l=l?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;l.setSize("width",a,!0);d&&(d.style.width="1%");var h=(l.$.offsetHeight||0)-(b.$.clientHeight||
-0),k=Math.max(c-(e?0:h),0);c=e?c+h:c;b.setStyle("height",k+"px");d&&(d.style.width="100%");this.fire("resize",{outerHeight:c,contentsHeight:k,outerWidth:a||l.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})}(),CKEDITOR.config.startupMode="wysiwyg",function(){function a(a){var b=a.editor,d=a.data.path,c=d.blockLimit,h=a.data.selection,
-f=h.getRanges()[0],k;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(h=e(h,d))h.appendBogus(),k=CKEDITOR.env.ie;l(b,d.block,c)&&f.collapsed&&!f.getCommonAncestor().isReadOnly()&&(d=f.clone(),d.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),c=new CKEDITOR.dom.walker(d),c.guard=function(a){return!g(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!c.checkForward()||d.checkStartOfBlock()&&d.checkEndOfBlock())&&(b=f.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||
-(b=b.getFirst(g))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),k=1,a.cancel());k&&f.select()}function e(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,c=d&&d.getLast(g);if(!(!d||!d.isBlockBoundary()||c&&c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function c(a){var b=a.data.getTarget();b.is("input")&&(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function g(a){return h(a)&&
-p(a)}function f(a,b){return function(d){var c=d.data.$.toElement||d.data.$.fromElement||d.data.$.relatedTarget;(c=c&&c.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(c):null)&&(b.equals(c)||b.contains(c))||a.call(this,d)}}function m(a){function b(a){return function(b,c){c&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(h)&&(d=b);if(!(c||!g(b)||a&&u(b)))return!1}}var d,c=a.getRanges()[0];a=a.root;var h={table:1,ul:1,ol:1,dl:1};if(c.startPath().contains(h)){var f=c.clone();f.collapse(1);f.setStartAt(a,
-CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(f);a.guard=b();a.checkBackward();if(d)return f=c.clone(),f.collapse(),f.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(f),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function l(a,b,d){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(d)&&!b||b&&"true"==b.getAttribute("contenteditable"))}function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?
-a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function d(a,b,d){var c=a.getCommonAncestor(b);for(b=a=d?b:a;(a=a.getParent())&&!c.equals(a)&&1==a.getChildCount();)b=a;b.remove()}CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&
-!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}try{this.$[CKEDITOR.env.ie&&this.getDocument().equals(CKEDITOR.document)?"setActive":"focus"]()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var d=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==
-a?"focusin":"focusout",b=f(b,this),d[0]=a,d[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,d)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,d;for(d in a)a.hasOwnProperty(d)&&(b=a[d],null!==b?this.setAttribute(d,b):
-this.removeAttribute(d))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var d=this.getAttribute(a);b!==d&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=d),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=
-this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,d,c){var h=this.editor;h.focus();h.fire("saveSnapshot");c||(c=h.getSelection().getRanges()[0]);n(this,d||"html",a,c);c.select();b(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,d){n(this,d||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,d){var c=
-this.editor;c.focus();c.fire("saveSnapshot");var h=c.activeEnterMode,c=c.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];d||(d=c.getRanges()[0]);this.insertElementIntoRange(a,d)&&(d.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return g(a)&&!u(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?d.moveToElementEditStart(f):d.moveToElementEditEnd(a):f||h==CKEDITOR.ENTER_BR||(f=d.fixBlock(!0,h==CKEDITOR.ENTER_DIV?"div":"p"),d.moveToElementEditStart(f))));
-c.selectRanges([d]);b(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var d=this.editor,c=d.config.enterMode,h=a.getName(),f=CKEDITOR.dtd.$block[h];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})&&q(b);var e,g;if(f)for(;(e=b.getCommonAncestor(0,1))&&(g=CKEDITOR.dtd[e.getName()])&&(!g||!g[h]);)e.getName()in CKEDITOR.dtd.span?b.splitElement(e):
-b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(e),b.collapse(!0),e.remove()):b.splitBlock(c==CKEDITOR.ENTER_DIV?"div":"p",d.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",
-!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=d.getDocument().$,c=b.getSelection(),h;a:if(c.anchorNode&&c.anchorNode==d.$)h=!0;else{if(CKEDITOR.env.webkit&&(h=d.getDocument().getActive())&&h.equals(d)&&!c.anchorNode){h=!0;break a}h=void 0}h&&(h=new CKEDITOR.dom.range(d),h.moveToElementEditStart(d),
-b=b.createRange(),b.setStart(h.startContainer.$,h.startOffset),b.collapse(!0),c.removeAllRanges(),c.addRange(b))}function b(){var a=d.getDocument().$,c=a.selection,h=d.getDocument().getActive();"None"==c.type&&h.equals(d)&&(c=new CKEDITOR.dom.range(d),a=a.body.createTextRange(),c.moveToElementEditStart(d),c=c.startContainer,c.type!=CKEDITOR.NODE_ELEMENT&&(c=c.getParent()),a.moveToElementText(c.$),a.collapse(!0),a.select())}var d=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&
-(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};w.eol.detect(a,this);w.bogus.exclude(a);w.cell.shrink(a);a.fragment=a.range.cloneContents();w.tree.rebuild(a,this);w.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var d=y,c={range:a,doc:a.document},
-h=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),h;a.enlarge(CKEDITOR.ENLARGE_INLINE,1);d.table.detectPurge(c);c.bookmark=a.createBookmark();delete c.range;var f=this.editor.createRange();f.moveToPosition(c.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);c.targetBookmark=f.createBookmark();d.list.detectMerge(c,this);d.table.detectRanges(c,this);d.block.detectMerge(c,this);c.tableContentsRanges?(d.table.deleteRanges(c),a.moveToBookmark(c.bookmark),c.range=a):(a.moveToBookmark(c.bookmark),
-c.range=a,a.extractContents(d.detectExtractMerge(c)));a.moveToBookmark(c.targetBookmark);a.optimize();d.fixUneditableRangePosition(a);d.list.merge(c,this);d.table.purge(c,this);d.block.merge(c,this);if(b){d=a.startPath();if(c=a.checkStartOfBlock()&&a.checkEndOfBlock()&&d.block&&!a.root.equals(d.block)){a:{var c=d.block.getElementsByTag("span"),f=0,e;if(c)for(;e=c.getItem(f++);)if(!p(e)){c=!0;break a}c=!1}c=!c}c&&(a.moveToPosition(d.block,CKEDITOR.POSITION_BEFORE_START),d.block.remove())}else d.autoParagraph(this.editor,
-a),v(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();return h},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(t,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,
-"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");
-a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);a.focusManager.add(this);
-this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=this.getDocument();a.window=this.getWindow();var b=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var f=a.config.contentsLangDirection;this.getDirection(1)!=f&&this.changeAttr("dir",f);var e=CKEDITOR.getCss();e&&(f=b.getHead(),f.getCustomData("stylesheet")||
-(e=b.appendStyleText(e),e=new CKEDITOR.dom.element(e.ownerNode||e.owningElement),f.setCustomData("stylesheet",e),e.data("cke-temp",1)));f=b.getCustomData("stylesheet_ref")||0;b.setCustomData("stylesheet_ref",f+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var k={8:1,46:1};this.attachListener(a,
-"key",function(b){if(a.readOnly)return!0;var d=b.data.domEvent.getKey(),c;if(d in k){b=a.getSelection();var f,e=b.getRanges()[0],g=e.startPath(),p,E,r,d=8==d;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(f=b.getSelectedElement())||(f=m(b))?(a.fire("saveSnapshot"),e.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f.remove(),e.select(),a.fire("saveSnapshot"),c=1):e.collapsed&&((p=g.block)&&(r=p[d?"getPrevious":"getNext"](h))&&r.type==CKEDITOR.NODE_ELEMENT&&r.is("table")&&e[d?"checkStartOfBlock":"checkEndOfBlock"]()?
-(a.fire("saveSnapshot"),e[d?"checkEndOfBlock":"checkStartOfBlock"]()&&p.remove(),e["moveToElementEdit"+(d?"End":"Start")](r),e.select(),a.fire("saveSnapshot"),c=1):g.blockLimit&&g.blockLimit.is("td")&&(E=g.blockLimit.getAscendant("table"))&&e.checkBoundaryOfElement(E,d?CKEDITOR.START:CKEDITOR.END)&&(r=E[d?"getPrevious":"getNext"](h))?(a.fire("saveSnapshot"),e["moveToElementEdit"+(d?"End":"Start")](r),e.checkStartOfBlock()&&e.checkEndOfBlock()?r.remove():e.select(),a.fire("saveSnapshot"),c=1):(E=g.contains(["td",
-"th","caption"]))&&e.checkBoundaryOfElement(E,d?CKEDITOR.START:CKEDITOR.END)&&(c=1))}return!c});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in k&&!this.getFirst(g)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,
-"click",c);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",function(b){var d=b.data.getTarget();d.is("img","hr","input","textarea","select")&&!d.isReadOnly()&&(a.getSelection().selectElement(d),d.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&
-(b=b.data.getTarget(),!b.getOuterHtml().replace(t,""))){var d=a.createRange();d.moveToElementEditStart(b);d.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in k){var c=
-8==b,h=a.getSelection().getRanges()[0];b=h.startPath();if(h.collapsed)a:{var f=b.block;if(f&&h[c?"checkStartOfBlock":"checkEndOfBlock"]()&&h.moveToClosestEditablePosition(f,!c)&&h.collapsed){if(h.startContainer.type==CKEDITOR.NODE_ELEMENT){var e=h.startContainer.getChild(h.startOffset-(c?1:0));if(e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is("hr")){a.fire("saveSnapshot");e.remove();b=!0;break a}}h=h.startPath().block;if(!h||h&&h.contains(f))b=void 0;else{a.fire("saveSnapshot");var g;(g=(c?h:f).getBogus())&&
-g.remove();g=a.getSelection();e=g.createBookmarks();(c?f:h).moveChildren(c?h:f,!1);b.lastElement.mergeSiblings();d(f,h,!c);g.selectBookmarks(e);b=!0}}else b=!1}else c=h,g=b.block,h=c.endPath().block,g&&h&&!g.equals(h)?(a.fire("saveSnapshot"),(f=g.getBogus())&&f.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),h.getParent()&&(h.moveChildren(g,!1),b.lastElement.mergeSiblings(),d(g,h,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),
-c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var d=a.getCustomData("stylesheet_ref");--d?a.setCustomData("stylesheet_ref",d):(a.removeCustomData("stylesheet_ref"),
-b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var d=b.editor;d.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&
-a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});d.on("selectionChange",function(b){if(!d.readOnly){var c=d.getSelection();c&&!c.isLocked&&(c=d.checkDirty(),d.fire("lockSnapshot"),a(b),d.fire("unlockSnapshot"),!c&&d.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var d=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",d);d&&a.changeAttr("title",
-d);var c=b.fire("ariaEditorHelpLabel",{}).label;if(c&&(d=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var h=CKEDITOR.tools.getNextId(),c=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+h+'" class\x3d"cke_voice_label"\x3e'+c+"\x3c/span\x3e");d.append(c);a.changeAttr("aria-describedby",h)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");var h=CKEDITOR.dom.walker.whitespaces(!0),
-p=CKEDITOR.dom.walker.bookmark(!1,!0),v=CKEDITOR.dom.walker.empty(),u=CKEDITOR.dom.walker.bogus(),t=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(d,c){var h,f,e,g,k=[],n=c.range.startContainer;h=c.range.startPath();for(var n=p[n.getName()],l=0,m=d.getChildren(),t=m.count(),q=-1,x=-1,w=0,u=h.contains(p.$list);l<t;++l)h=m.getItem(l),a(h)?(e=
-h.getName(),u&&e in CKEDITOR.dtd.$list?k=k.concat(b(h,c)):(g=!!n[e],"br"!=e||!h.data("cke-eol")||l&&l!=t-1||(w=(f=l?k[l-1].node:m.getItem(l+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&p.$block[f.getName()]),-1!=q||g||(q=l),g||(x=l),k.push({isElement:1,isLineBreak:w,isBlock:h.isBlockBoundary(),hasBlockSibling:f,node:h,name:e,allowed:g}),f=w=0)):k.push({isElement:0,node:h,allowed:1});-1<q&&(k[q].firstNotAllowed=1);-1<x&&(k[x].lastNotAllowed=1);return k}function d(b,c){var h=[],f=b.getChildren(),e=f.count(),
-g,k=0,r=p[c],n=!b.is(p.$inline)||b.is("br");for(n&&h.push(" ");k<e;k++)g=f.getItem(k),a(g)&&!g.is(r)?h=h.concat(d(g,c)):h.push(g);n&&h.push(" ");return h}function c(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function h(b){return b&&a(b)&&(b.is(p.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function f(b,d,c,h){var e=b.clone(),g,k;e.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);(g=(new CKEDITOR.dom.walker(e)).next())&&a(g)&&n[g.getName()]&&(k=g.getPrevious())&&a(k)&&!k.getParent().equals(b.startContainer)&&
-c.contains(k)&&h.contains(g)&&g.isIdentical(k)&&(g.moveChildren(k),g.remove(),f(b,d,c,h))}function e(b,d){function c(b,d){if(d.isBlock&&d.isElement&&!d.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var h=d.endContainer.getChild(d.endOffset),f=d.endContainer.getChild(d.endOffset-1);h&&c(h,b[b.length-1]);f&&c(f,b[0])&&(d.setEnd(d.endContainer,d.endOffset-1),d.collapse())}var p=CKEDITOR.dtd,n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},m={p:1,div:1,h1:1,h2:1,
-h3:1,h4:1,h5:1,h6:1},t=CKEDITOR.tools.extend({},p.$inline);delete t.br;return function(n,E,q,w){var u=n.editor,v=!1;"unfiltered_html"==E&&(E="html",v=!0);if(!w.checkReadOnly()){var y=(new CKEDITOR.dom.elementPath(w.startContainer,w.root)).blockLimit||w.root;n={type:E,dontFilter:v,editable:n,editor:u,range:w,blockLimit:y,mergeCandidates:[],zombies:[]};E=n.range;w=n.mergeCandidates;var F,K;"text"==n.type&&E.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(F=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",
-E.document),E.insertNode(F),E.setStartAfter(F));v=new CKEDITOR.dom.elementPath(E.startContainer);n.endPath=y=new CKEDITOR.dom.elementPath(E.endContainer);if(!E.collapsed){var u=y.block||y.blockLimit,V=E.getCommonAncestor();u&&!u.equals(V)&&!u.contains(V)&&E.checkEndOfBlock()&&n.zombies.push(u);E.deleteContents()}for(;(K=c(E))&&a(K)&&K.isBlockBoundary()&&v.contains(K);)E.moveToPosition(K,CKEDITOR.POSITION_BEFORE_END);f(E,n.blockLimit,v,y);F&&(E.setEndBefore(F),E.collapse(),F.remove());F=E.startPath();
-if(u=F.contains(h,!1,1))E.splitElement(u),n.inlineStylesRoot=u,n.inlineStylesPeak=F.lastElement;F=E.createBookmark();(u=F.startNode.getPrevious(g))&&a(u)&&h(u)&&w.push(u);(u=F.startNode.getNext(g))&&a(u)&&h(u)&&w.push(u);for(u=F.startNode;(u=u.getParent())&&h(u);)w.push(u);E.moveToBookmark(F);if(F=q){F=n.range;if("text"==n.type&&n.inlineStylesRoot){K=n.inlineStylesPeak;E=K.getDocument().createText("{cke-peak}");for(w=n.inlineStylesRoot.getParent();!K.equals(w);)E=E.appendTo(K.clone()),K=K.getParent();
-q=E.getOuterHtml().split("{cke-peak}").join(q)}K=n.blockLimit.getName();if(/^\s+|\s+$/.test(q)&&"span"in CKEDITOR.dtd[K]){var R='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';q=R+q+R}q=n.editor.dataProcessor.toHtml(q,{context:null,fixForBody:!1,protectedWhitespaces:!!R,dontFilter:n.dontFilter,filter:n.editor.activeFilter,enterMode:n.editor.activeEnterMode});K=F.document.createElement("body");K.setHtml(q);R&&(K.getFirst().remove(),K.getLast().remove());if((R=F.startPath().block)&&(1!=
-R.getChildCount()||!R.getBogus()))a:{var H;if(1==K.getChildCount()&&a(H=K.getFirst())&&H.is(m)&&!H.hasAttribute("contenteditable")){R=H.getElementsByTag("*");F=0;for(w=R.count();F<w;F++)if(E=R.getItem(F),!E.is(t))break a;H.moveChildren(H.getParent(1));H.remove()}}n.dataWrapper=K;F=q}if(F){H=n.range;F=H.document;var M;K=n.blockLimit;w=0;var W,R=[],S,aa;q=u=0;var X,da;E=H.startContainer;var v=n.endPath.elements[0],ba,y=v.getPosition(E),V=!!v.getCommonAncestor(E)&&y!=CKEDITOR.POSITION_IDENTICAL&&!(y&
-CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);E=b(n.dataWrapper,n);for(e(E,H);w<E.length;w++){y=E[w];if(M=y.isLineBreak){M=H;X=K;var Y=void 0,ea=void 0;y.hasBlockSibling?M=1:(Y=M.startContainer.getAscendant(p.$block,1))&&Y.is({div:1,p:1})?(ea=Y.getPosition(X),ea==CKEDITOR.POSITION_IDENTICAL||ea==CKEDITOR.POSITION_CONTAINS?M=0:(X=M.splitElement(Y),M.moveToPosition(X,CKEDITOR.POSITION_AFTER_START),M=1)):M=0}if(M)q=0<w;else{M=H.startPath();!y.isBlock&&l(n.editor,M.block,M.blockLimit)&&(aa=
-k(n.editor))&&(aa=F.createElement(aa),aa.appendBogus(),H.insertNode(aa),CKEDITOR.env.needsBrFiller&&(W=aa.getBogus())&&W.remove(),H.moveToPosition(aa,CKEDITOR.POSITION_BEFORE_END));if((M=H.startPath().block)&&!M.equals(S)){if(W=M.getBogus())W.remove(),R.push(M);S=M}y.firstNotAllowed&&(u=1);if(u&&y.isElement){M=H.startContainer;for(X=null;M&&!p[M.getName()][y.name];){if(M.equals(K)){M=null;break}X=M;M=M.getParent()}if(M)X&&(da=H.splitElement(X),n.zombies.push(da),n.zombies.push(X));else{X=K.getName();
-ba=!w;M=w==E.length-1;X=d(y.node,X);for(var Y=[],ea=X.length,ca=0,ga=void 0,fa=0,ia=-1;ca<ea;ca++)ga=X[ca]," "==ga?(fa||ba&&!ca||(Y.push(new CKEDITOR.dom.text(" ")),ia=Y.length),fa=1):(Y.push(ga),fa=0);M&&ia==Y.length&&Y.pop();ba=Y}}if(ba){for(;M=ba.pop();)H.insertNode(M);ba=0}else H.insertNode(y.node);y.lastNotAllowed&&w<E.length-1&&((da=V?v:da)&&H.setEndAt(da,CKEDITOR.POSITION_AFTER_START),u=0);H.collapse()}}1!=E.length?W=!1:(W=E[0],W=W.isElement&&"false"==W.node.getAttribute("contenteditable"));
-W&&(q=!0,M=E[0].node,H.setStartAt(M,CKEDITOR.POSITION_BEFORE_START),H.setEndAt(M,CKEDITOR.POSITION_AFTER_END));n.dontMoveCaret=q;n.bogusNeededBlocks=R}W=n.range;var Z;da=n.bogusNeededBlocks;for(ba=W.createBookmark();S=n.zombies.pop();)S.getParent()&&(aa=W.clone(),aa.moveToElementEditStart(S),aa.removeEmptyBlocksAtEnd());if(da)for(;S=da.pop();)CKEDITOR.env.needsBrFiller?S.appendBogus():S.append(W.document.createText(" "));for(;S=n.mergeCandidates.pop();)S.mergeSiblings();W.moveToBookmark(ba);if(!n.dontMoveCaret){for(S=
-c(W);S&&a(S)&&!S.is(p.$empty);){if(S.isBlockBoundary())W.moveToPosition(S,CKEDITOR.POSITION_BEFORE_END);else{if(h(S)&&S.getHtml().match(/(\s|&nbsp;)$/g)){Z=null;break}Z=W.clone();Z.moveToPosition(S,CKEDITOR.POSITION_BEFORE_END)}S=S.getLast(g)}Z&&W.moveToRange(Z)}}}}(),q=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}
-function b(a,d,c){d=a.getDocument().createElement(d);a.append(d,c);return d}function d(a){var b=a.count(),c;for(b;0<b--;)c=a.getItem(b),CKEDITOR.tools.trim(c.getHtml())||(c.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&c.getChildCount()&&c.getFirst().remove())}return function(c){var h=c.startContainer,f=h.getAscendant("table",1),e=!1;d(f.getElementsByTag("td"));d(f.getElementsByTag("th"));f=c.clone();f.setStart(h,0);f=a(f).lastBackward();f||(f=c.clone(),f.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),
-f=a(f).lastForward(),e=!0);f||(f=h);f.is("table")?(c.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),c.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",e)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",e)),(h=f.getBogus())&&h.remove(),c.moveToPosition(f,e?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}(),w={eol:{detect:function(a,b){var d=a.range,c=d.clone(),h=d.clone(),f=new CKEDITOR.dom.elementPath(d.startContainer,b),e=new CKEDITOR.dom.elementPath(d.endContainer,
-b);c.collapse(1);h.collapse();f.block&&c.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(d.setStartAfter(f.block),a.prependEolBr=1);e.block&&h.checkBoundaryOfElement(e.block,CKEDITOR.START)&&(d.setEndBefore(e.block),a.appendEolBr=1)},fix:function(a,b){var d=b.getDocument(),c;a.appendEolBr&&(c=this.createEolBr(d),a.fragment.append(c));!a.prependEolBr||c&&!c.getPrevious()||a.fragment.append(this.createEolBr(d),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},
-bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),d=b.startNode,b=b.endNode;!b||!u(b)||d&&d.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var d=a.range,c=d.getCommonAncestor(),h=new CKEDITOR.dom.elementPath(c,b),f=new CKEDITOR.dom.elementPath(d.startContainer,b),d=new CKEDITOR.dom.elementPath(d.endContainer,b),e;c.type==CKEDITOR.NODE_TEXT&&(c=c.getParent());if(h.blockLimit.is({tr:1,table:1})){var g=h.contains("table").getParent();e=function(a){return!a.equals(g)}}else if(h.block&&
-h.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),d=d.contains(CKEDITOR.dtd.$list),!f.equals(d))){var k=h.contains(CKEDITOR.dtd.$list).getParent();e=function(a){return!a.equals(k)}}e||(e=function(a){return!a.equals(h.block)&&!a.equals(h.blockLimit)});this.rebuildFragment(a,b,c,e)},rebuildFragment:function(a,b,d,c){for(var h;d&&!d.equals(b)&&c(d);)h=d.clone(0,1),a.fragment.appendTo(h),a.fragment=h,d=d.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,d=a.endContainer,
-c=a.startOffset,h=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(d)&&b.is("tr")&&++c==h&&a.shrink(CKEDITOR.SHRINK_TEXT)}}},y=function(){function a(b,d){var c=b.getParent();if(c.is(CKEDITOR.dtd.$inline))b[d?"insertBefore":"insertAfter"](c)}function b(d,c,h){a(c);a(h,1);for(var f;f=h.getNext();)f.insertAfter(c),c=f;v(d)&&d.remove()}function d(a,b){var c=new CKEDITOR.dom.range(a);c.setStartAfter(b.startNode);c.setEndBefore(b.endNode);return c}return{list:{detectMerge:function(a,b){var c=d(b,a.bookmark),
-h=c.startPath(),f=c.endPath(),e=h.contains(CKEDITOR.dtd.$list),g=f.contains(CKEDITOR.dtd.$list);a.mergeList=e&&g&&e.getParent().equals(g.getParent())&&!e.equals(g);a.mergeListItems=h.block&&f.block&&h.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)c=c.clone(),c.setStartBefore(a.bookmark.startNode),c.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=c.createBookmark()},merge:function(a,d){if(a.mergeListBookmark){var c=a.mergeListBookmark.startNode,
-h=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(c,d),e=new CKEDITOR.dom.elementPath(h,d);if(a.mergeList){var g=f.contains(CKEDITOR.dtd.$list),k=e.contains(CKEDITOR.dtd.$list);g.equals(k)||(k.moveChildren(g),k.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),e=e.contains(CKEDITOR.dtd.$listItem),f.equals(e)||b(e,c,h));c.remove();h.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var d=new CKEDITOR.dom.range(b);d.setStartBefore(a.bookmark.startNode);
-d.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=d.createBookmark()}},merge:function(a,d){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var c=a.mergeBlockBookmark.startNode,h=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(c,d),e=new CKEDITOR.dom.elementPath(h,d),f=f.block,e=e.block;f&&e&&!f.equals(e)&&b(e,c,h);c.remove();h.remove()}}},table:function(){function a(d){var h=[],f,e=new CKEDITOR.dom.walker(d),g=d.startPath().contains(c),k=d.endPath().contains(c),p={};e.guard=function(a,
-e){if(a.type==CKEDITOR.NODE_ELEMENT){var n="visited_"+(e?"out":"in");if(a.getCustomData(n))return;CKEDITOR.dom.element.setMarker(p,a,n,1)}if(e&&g&&a.equals(g))f=d.clone(),f.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),h.push(f);else if(!e&&k&&a.equals(k))f=d.clone(),f.setStartAt(k,CKEDITOR.POSITION_AFTER_START),h.push(f);else{if(n=!e)n=a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&(!g||b(a,g))&&(!k||b(a,k));n&&(f=d.clone(),f.selectNodeContents(a),h.push(f))}};e.lastForward();CKEDITOR.dom.element.clearAllMarkers(p);
-return h}function b(a,d){var c=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,h=a.getPosition(d);return h===CKEDITOR.POSITION_IDENTICAL?!1:0===(h&c)}var c={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,d=b.clone();d.enlarge(CKEDITOR.ENLARGE_ELEMENT);var d=new CKEDITOR.dom.walker(d),h=0;d.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&++h};d.checkForward();if(1<h){var d=b.startPath().contains("table"),f=b.endPath().contains("table");d&&f&&b.checkBoundaryOfElement(d,
-CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(d),b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(h,f){var e=d(f,h.bookmark),g=e.clone(),k,p,n=e.getCommonAncestor();n.is(CKEDITOR.dtd.$tableContent)&&!n.is(c)&&(n=n.getAscendant("table",!0));p=n;n=new CKEDITOR.dom.elementPath(e.startContainer,p);p=new CKEDITOR.dom.elementPath(e.endContainer,p);n=n.contains("table");p=p.contains("table");if(n||p)n&&p&&b(n,p)?(h.tableSurroundingRange=
-g,g.setStartAt(n,CKEDITOR.POSITION_AFTER_END),g.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),g=e.clone(),g.setEndAt(n,CKEDITOR.POSITION_AFTER_END),k=e.clone(),k.setStartAt(p,CKEDITOR.POSITION_BEFORE_START),k=a(g).concat(a(k))):n?p||(h.tableSurroundingRange=g,g.setStartAt(n,CKEDITOR.POSITION_AFTER_END),e.setEndAt(n,CKEDITOR.POSITION_AFTER_END)):(h.tableSurroundingRange=g,g.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),e.setStartAt(p,CKEDITOR.POSITION_AFTER_START)),h.tableContentsRanges=k?k:a(e)},deleteRanges:function(a){for(var b;b=
-a.tableContentsRanges.pop();)b.extractContents(),v(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,d=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);d.moveToBookmark(a.purgeTableBookmark);d.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&
-a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var d=b.startPath(),c;l(a,d.block,d.blockLimit)&&(c=k(a))&&(c=b.document.createElement(c),c.appendBogus(),b.insertNode(c),b.moveToPosition(c,CKEDITOR.POSITION_AFTER_START))}}}()}(),function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||
-this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();b.compare(this._.selectionPreviousPath)||(CKEDITOR.env.webkit&&(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=b,this.fire("selectionChange",{selection:a,path:b}))}function e(){t=!0;u||(c.call(this),u=CKEDITOR.tools.setTimeout(c,200,this))}function c(){u=null;t&&(CKEDITOR.tools.setTimeout(a,0,this),t=!1)}function g(a){return n(a)||a.type==CKEDITOR.NODE_ELEMENT&&
-!a.is(CKEDITOR.dtd.$empty)?!0:!1}function f(a){function b(d,c){return d&&d.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(c?"End":"Start")](d):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,c=a.getPreviousNode(g,null,d),h=a.getNextNode(g,null,d);return b(c)||b(h,1)||!(c||h||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function m(a){return a.getCustomData("cke-fillingChar")}function l(a,c){var h=a&&a.removeCustomData("cke-fillingChar");
-if(h){if(!1!==c){var f,e=a.getDocument().getSelection().getNative(),g=e&&"None"!=e.type&&e.getRangeAt(0);1<h.getLength()&&g&&g.intersectsNode(h.$)&&(f=b(e),g=e.focusNode==h.$&&0<e.focusOffset,e.anchorNode==h.$&&0<e.anchorOffset&&f[0].offset--,g&&f[1].offset--)}h.setText(k(h.getText()));f&&d(a.getDocument().$,f)}}function k(a){return a.replace(/\u200B( )?/g,function(a){return a[1]?" ":""})}function b(a){return[{node:a.anchorNode,offset:a.anchorOffset},{node:a.focusNode,offset:a.focusOffset}]}function d(a,
-b){var d=a.getSelection(),c=a.createRange();c.setStart(b[0].node,b[0].offset);c.collapse(!0);d.removeAllRanges();d.addRange(c);d.extend(b[1].node,b[1].offset)}function h(a){var b=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e\x26nbsp;\x3c/div\x3e',a.document);a.fire("lockSnapshot");a.editable().append(b);var d=a.getSelection(1),c=a.createRange(),h=d.root.on("selectionchange",
-function(a){a.cancel()},null,null,0);c.setStartAt(b,CKEDITOR.POSITION_AFTER_START);c.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);d.selectRanges([c]);h.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=b}function p(a){var b={37:1,39:1,8:1,46:1};return function(d){var c=d.data.getKeystroke();if(b[c]){var h=a.getSelection().getRanges(),f=h[0];1==h.length&&f.collapsed&&(c=f[38>c?"getPreviousEditableNode":"getNextEditableNode"]())&&c.type==CKEDITOR.NODE_ELEMENT&&"false"==c.getAttribute("contenteditable")&&
-(a.getSelection().fake(c),d.data.preventDefault(),d.cancel())}}}function v(a){for(var b=0;b<a.length;b++){var d=a[b];d.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!d.collapsed){if(d.startContainer.isReadOnly())for(var c=d.startContainer,h;c&&!((h=c.type==CKEDITOR.NODE_ELEMENT)&&c.is("body")||!c.isReadOnly());)h&&"false"==c.getAttribute("contentEditable")&&d.setStartAfter(c),c=c.getParent();c=d.startContainer;h=d.endContainer;var f=d.startOffset,e=d.endOffset,g=d.clone();c&&c.type==CKEDITOR.NODE_TEXT&&
-(f>=c.getLength()?g.setStartAfter(c):g.setStartBefore(c));h&&h.type==CKEDITOR.NODE_TEXT&&(e?g.setEndAfter(h):g.setEndBefore(h));c=new CKEDITOR.dom.walker(g);c.evaluator=function(c){if(c.type==CKEDITOR.NODE_ELEMENT&&c.isReadOnly()){var h=d.clone();d.setEndBefore(c);d.collapsed&&a.splice(b--,1);c.getPosition(g.endContainer)&CKEDITOR.POSITION_CONTAINS||(h.setStartAfter(c),h.collapsed||a.splice(b+1,0,h));return!0}return!1};c.next()}}return a}var u,t,n=CKEDITOR.dom.walker.invisible(1),q=function(){function a(b){return function(a){var d=
-a.editor.createRange();d.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([d]);return!1}}function b(a){return function(b){var d=b.editor,c=d.createRange(),h;(h=c.moveToClosestEditablePosition(b.selected,a))||(h=c.moveToClosestEditablePosition(b.selected,!a));h&&d.getSelection().selectRanges([c]);d.fire("saveSnapshot");b.selected.remove();h||(c.moveToElementEditablePosition(d.editable()),d.getSelection().selectRanges([c]));d.fire("saveSnapshot");return!1}}var d=a(),
-c=a(1);return{37:d,38:d,39:c,40:c,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function d(){var a=c.getSelection();a&&a.removeAllRanges()}var c=b.editor;c.on("contentDom",function(){function b(){r=new CKEDITOR.dom.selection(c.getSelection());r.lock()}function d(){f.removeListener("mouseup",d);n.removeListener("mouseup",d);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==h.$&&b.select()}var h=c.document,f=CKEDITOR.document,g=c.editable(),
-k=h.getBody(),n=h.getDocumentElement(),m=g.isInline(),E,r;CKEDITOR.env.gecko&&g.attachListener(g,"focus",function(a){a.removeListener();0!==E&&(a=c.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==g.$&&(a=c.createRange(),a.moveToElementEditStart(g),a.select())},null,null,-2);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){E&&CKEDITOR.env.webkit&&(E=c._.previousActive&&c._.previousActive.equals(h.getActive()));c.unlockSelection(E);E=0},null,null,-1);g.attachListener(g,
-"mousedown",function(){E=0});if(CKEDITOR.env.ie||m)w?g.attachListener(g,"beforedeactivate",b,null,null,-1):g.attachListener(c,"selectionCheck",b,null,null,-1),g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){c.lockSelection(r);E=1},null,null,-1),g.attachListener(g,"mousedown",function(){E=0});if(CKEDITOR.env.ie&&!m){var t;g.attachListener(g,"mousedown",function(a){2==a.data.$.button&&((a=c.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(t=c.window.getScrollPosition()))});
-g.attachListener(g,"mouseup",function(a){2==a.data.$.button&&t&&(c.document.$.documentElement.scrollLeft=t.x,c.document.$.documentElement.scrollTop=t.y);t=null});if("BackCompat"!=h.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)n.on("mousedown",function(a){function b(a){a=a.data.$;if(c){var d=k.$.createTextRange();try{d.moveToPoint(a.clientX,a.clientY)}catch(h){}c.setEndPoint(0>e.compareEndPoints("StartToStart",d)?"EndToEnd":"StartToStart",d);c.select()}}function d(){n.removeListener("mousemove",
-b);f.removeListener("mouseup",d);n.removeListener("mouseup",d);c.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<n.$.clientHeight&&a.$.x<n.$.clientWidth){var c=k.$.createTextRange();try{c.moveToPoint(a.$.clientX,a.$.clientY)}catch(h){}var e=c.duplicate();n.on("mousemove",b);f.on("mouseup",d);n.on("mouseup",d)}});if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)n.on("mousedown",function(a){a.data.getTarget().is("html")&&(f.on("mouseup",d),n.on("mouseup",d))})}}g.attachListener(g,"selectionchange",
-a,c);g.attachListener(g,"keyup",e,c);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){c.forceNextSelectionCheck();c.selectionChange(1)});if(m&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var q;g.attachListener(g,"mousedown",function(){q=1});g.attachListener(h.getDocumentElement(),"mouseup",function(){q&&e.call(c);q=0})}else g.attachListener(CKEDITOR.env.ie?g:h.getDocumentElement(),"mouseup",e,c);CKEDITOR.env.webkit&&g.attachListener(h,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:l(g)}},
-null,null,-1);g.attachListener(g,"keydown",p(c),null,null,-1)});c.on("setData",function(){c.unlockSelection();CKEDITOR.env.webkit&&d()});c.on("contentDomUnload",function(){c.unlockSelection()});if(CKEDITOR.env.ie9Compat)c.on("beforeDestroy",d,null,null,9);c.on("dataReady",function(){delete c._.fakeSelection;delete c._.hiddenSelectionContainer;c.selectionChange(1)});c.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=c.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&
-(b.remove(),CKEDITOR.env.gecko&&(a=c.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);c.on("key",function(a){if("wysiwyg"==c.mode){var b=c.getSelection();if(b.isFake){var d=q[a.data.keyCode];if(d)return d({editor:c,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});CKEDITOR.on("instanceReady",function(a){function c(){var a=f.editable();if(a&&(a=m(a))){var d=f.document.$.getSelection();"None"==d.type||d.anchorNode!=a.$&&d.focusNode!=
-a.$||(g=b(d));e=a.getText();a.setText(k(e))}}function h(){var a=f.editable();a&&(a=m(a))&&(a.setText(e),g&&(d(f.document.$,g),g=null))}var f=a.editor,e,g;CKEDITOR.env.webkit&&(f.on("selectionChange",function(){var a=f.editable(),b=m(a);b&&(b.getCustomData("ready")?l(a):b.setCustomData("ready",1))},null,null,-1),f.on("beforeSetMode",function(){l(f.editable())},null,null,-1),f.on("beforeUndoImage",c),f.on("afterUndoImage",h),f.on("beforeGetData",c,null,null,0),f.on("getData",h))});CKEDITOR.editor.prototype.selectionChange=
-function(b){(b?a:e).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;
-return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;
-CKEDITOR.SELECTION_ELEMENT=3;var w="function"!=typeof window.getSelection,y=1;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var d=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:y++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=d?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var c,
-h;if(a)if(a.getRangeAt)c=(h=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(h.commonAncestorContainer);else{try{h=a.createRange()}catch(f){}c=h&&CKEDITOR.dom.element.get(h.item&&h.item(0)||h.parentElement())}if(!c||c.type!=CKEDITOR.NODE_ELEMENT&&c.type!=CKEDITOR.NODE_TEXT||!this.root.equals(c)&&!this.root.contains(c))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;
-return this};var C={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=w?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:w?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var d=this.getNative(),c=d.type;
-"Text"==c&&(b=CKEDITOR.SELECTION_TEXT);"Control"==c&&(b=CKEDITOR.SELECTION_ELEMENT);d.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(h){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,d=this.getNative();if(!d||!d.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==d.rangeCount){var d=d.getRangeAt(0),c=d.startContainer;c==d.endContainer&&1==c.nodeType&&1==d.endOffset-d.startOffset&&C[c.childNodes[d.startOffset].nodeName.toLowerCase()]&&
-(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=w?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,d){b=b.duplicate();b.collapse(d);var c=b.parentElement();if(!c.hasChildNodes())return{container:c,offset:0};for(var h=c.children,f,e,g=b.duplicate(),k=0,n=h.length-1,p=-1,l,m;k<=n;)if(p=Math.floor((k+n)/2),f=h[p],g.moveToElementText(f),l=g.compareEndPoints("StartToStart",b),0<l)n=p-1;else if(0>l)k=p+1;else return{container:c,offset:a(f)};
-if(-1==p||p==h.length-1&&0>l){g.moveToElementText(c);g.setEndPoint("StartToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;h=c.childNodes;if(!g)return f=h[h.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:c,offset:h.length}:{container:f,offset:f.nodeValue.length};for(c=h.length;0<g&&0<c;)e=h[--c],e.nodeType==CKEDITOR.NODE_TEXT&&(m=e,g-=e.nodeValue.length);return{container:m,offset:-g}}g.collapse(0<l?!0:!1);g.setEndPoint(0<l?"StartToStart":"EndToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;
-if(!g)return{container:c,offset:a(f)+(0<l?0:1)};for(;0<g;)try{e=f[0<l?"previousSibling":"nextSibling"],e.nodeType==CKEDITOR.NODE_TEXT&&(g-=e.nodeValue.length,m=e),f=e}catch(t){return{container:c,offset:a(f)}}return{container:m,offset:0<l?-g:m.nodeValue.length+g}};return function(){var a=this.getNative(),d=a&&a.createRange(),c=this.getType();if(!a)return[];if(c==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),c=b(d,!0),a.setStart(new CKEDITOR.dom.node(c.container),c.offset),c=b(d),
-a.setEnd(new CKEDITOR.dom.node(c.container),c.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(c==CKEDITOR.SELECTION_ELEMENT){for(var c=[],h=0;h<d.length;h++){for(var f=d.item(h),e=f.parentNode,g=0,a=new CKEDITOR.dom.range(this.root);g<e.childNodes.length&&e.childNodes[g]!=f;g++);a.setStart(new CKEDITOR.dom.node(e),g);a.setEnd(new CKEDITOR.dom.node(e),g+1);c.push(a)}return c}return[]}}():function(){var a=
-[],b,d=this.getNative();if(!d)return a;for(var c=0;c<d.rangeCount;c++){var h=d.getRangeAt(c);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(h.startContainer),h.startOffset);b.setEnd(new CKEDITOR.dom.node(h.endContainer),h.endOffset);a.push(b)}return a};return function(b){var d=this._.cache,c=d.ranges;c||(d.ranges=c=new CKEDITOR.dom.rangeList(a.call(this)));return b?v(new CKEDITOR.dom.rangeList(c.slice())):c}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;
+for(var c=new CKEDITOR.dom.documentFragment,g,e,h,f=0;f<d.length;f++){var k=d[f],m=k.startContainer;m.getName&&"tr"==m.getName()?(g||(g=m.getAscendant("table").clone(),g.append(m.getAscendant("tbody").clone()),c.append(g),g=g.findOne("tbody")),e&&e.equals(m)||(e=m,h=m.clone(),g.append(h)),h.append(k.cloneContents())):c.append(k.cloneContents())}b=g?c:b.getHtmlFromRange(d[0]);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var d=this.editable(),c=this.getSelection().getRanges();if(!d||0===
+c.length)return null;c=c[0];d=d.extractHtmlFromRange(c,b);b||this.getSelection().selectRanges([c]);return a?d.getHtml():d},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return u.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,
+0)],d,c,g=b.length;g--;)d=b[g],c=0,CKEDITOR.tools.isArray(d)&&(c=d[1],d=d[0]),c?a[d]=c:delete a[d]},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:
+a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})}(),CKEDITOR.ELEMENT_MODE_NONE=0,CKEDITOR.ELEMENT_MODE_REPLACE=1,CKEDITOR.ELEMENT_MODE_APPENDTO=2,CKEDITOR.ELEMENT_MODE_INLINE=3,CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}},
+function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,f={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(c){for(var e,h,m=0,l;e=this._.htmlPartsRegex.exec(c);){h=e.index;if(h>m)if(m=c.substring(m,h),l)l.push(m);else this.onText(m);
+m=this._.htmlPartsRegex.lastIndex;if(h=e[1])if(h=h.toLowerCase(),l&&CKEDITOR.dtd.$cdata[h]&&(this.onCDATA(l.join("")),l=null),!l){this.onTagClose(h);continue}if(l)l.push(e[0]);else if(h=e[3]){if(h=h.toLowerCase(),!/="/.test(h)){var k={},b,d=e[4];e=!!e[5];if(d)for(;b=a.exec(d);){var g=b[1].toLowerCase();b=b[2]||b[3]||b[4]||"";k[g]=!b&&f[g]?g:CKEDITOR.tools.htmlDecodeAttr(b)}this.onTagOpen(h,k,e);!l&&CKEDITOR.dtd.$cdata[h]&&(l=[])}}else if(h=e[2])this.onComment(h)}if(c.length>m)this.onText(c.substring(m,
+c.length))}}}(),CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,f){f?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,f){"string"==typeof f&&(f=CKEDITOR.tools.htmlEncodeAttr(f));this._.output.push(" ",a,'\x3d"',f,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",
+a,"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var f=this._.output.join("");a&&this.reset();return f}}}),"use strict",function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype={remove:function(){var a=this.parent.children,f=CKEDITOR.tools.indexOf(a,this),c=this.previous,e=this.next;c&&(c.next=e);e&&(e.previous=c);a.splice(f,1);this.parent=null},replaceWith:function(a){var f=this.parent.children,
+c=CKEDITOR.tools.indexOf(f,this),e=a.previous=this.previous,h=a.next=this.next;e&&(e.next=a);h&&(h.previous=a);f[c]=a;a.parent=this.parent;this.parent=null},insertAfter:function(a){var f=a.parent.children,c=CKEDITOR.tools.indexOf(f,a),e=a.next;f.splice(c+1,0,this);this.next=a.next;this.previous=a;a.next=this;e&&(e.previous=this);this.parent=a.parent},insertBefore:function(a){var f=a.parent.children,c=CKEDITOR.tools.indexOf(f,a);f.splice(c,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=
+this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var f="function"==typeof a?a:"string"==typeof a?function(c){return c.name==a}:function(c){return c.name in a},c=this.parent;for(;c&&c.type==CKEDITOR.NODE_ELEMENT;){if(f(c))return c;c=c.parent}return null},wrapWith:function(a){this.replaceWith(a);a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}}(),"use strict",CKEDITOR.htmlParser.comment=
+function(a){this.value=a;this._={isBlockLike:!1}},CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,f){var c=this.value;if(!(c=a.onComment(f,c,this)))return this.remove(),!1;if("string"!=typeof c)return this.replaceWith(c),!1;this.value=c;return!0},writeHtml:function(a,f){f&&this.filter(f);a.comment(this.value)}}),"use strict",function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=
+CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,f){if(!(this.value=a.onText(f,this.value,this)))return this.remove(),!1},writeHtml:function(a,f){f&&this.filter(f);a.text(this.value)}})}(),"use strict",function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})}(),"use strict",
+CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}},function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var f=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),c={ol:1,ul:1},e=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),h={ul:"li",
+ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=function(m,l,k){function b(a){var b;if(0<q.length)for(var c=0;c<q.length;c++){var g=q[c],e=g.name,h=CKEDITOR.dtd[e],f=A.name&&CKEDITOR.dtd[A.name];f&&!f[e]||a&&h&&!h[a]&&CKEDITOR.dtd[a]?e==A.name&&(p(A,A.parent,1),c--):(b||(d(),b=1),g=g.clone(),g.parent=A,A=g,q.splice(c,1),c--)}}function d(){for(;w.length;)p(w.shift(),A)}function g(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=
+a.children.length,d=a.children[b-1],c;d&&d.type==CKEDITOR.NODE_TEXT&&((c=CKEDITOR.tools.rtrim(d.value))?d.value=c:a.children.length=b-1)}}function p(b,d,c){d=d||A||n;var e=A;void 0===b.previous&&(u(d,b)&&(A=d,r.onTagOpen(k,{}),b.returnPoint=d=A),g(b),a(b)&&!b.children.length||d.add(b),"pre"==b.name&&(t=!1),"textarea"==b.name&&(B=!1));b.returnPoint?(A=b.returnPoint,delete b.returnPoint):A=c?d:e}function u(a,b){if((a==n||"body"==a.name)&&k&&(!a.name||CKEDITOR.dtd[a.name][k])){var d,c;return(d=b.attributes&&
+(c=b.attributes["data-cke-real-element-type"])?c:b.name)&&d in CKEDITOR.dtd.$inline&&!(d in CKEDITOR.dtd.head)&&!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function v(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var r=new CKEDITOR.htmlParser,n=l instanceof CKEDITOR.htmlParser.element?l:"string"==typeof l?new CKEDITOR.htmlParser.element(l):new CKEDITOR.htmlParser.fragment,q=[],w=[],A=n,B="textarea"==n.name,t="pre"==n.name;r.onTagOpen=
+function(g,h,k,m){h=new CKEDITOR.htmlParser.element(g,h);h.isUnknown&&k&&(h.isEmpty=!0);h.isOptionalClose=m;if(a(h))q.push(h);else{if("pre"==g)t=!0;else{if("br"==g&&t){A.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==g&&(B=!0)}if("br"==g)w.push(h);else{for(;!(m=(k=A.name)?CKEDITOR.dtd[k]||(A._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):e,h.isUnknown||A.isUnknown||m[g]);)if(A.isOptionalClose)r.onTagClose(k);else if(g in c&&k in c)k=A.children,(k=k[k.length-1])&&"li"==k.name||p(k=new CKEDITOR.htmlParser.element("li"),
+A),!h.returnPoint&&(h.returnPoint=A),A=k;else if(g in CKEDITOR.dtd.$listItem&&!v(g,k))r.onTagOpen("li"==g?"ul":"dl",{},0,1);else if(k in f&&!v(g,k))!h.returnPoint&&(h.returnPoint=A),A=A.parent;else if(k in CKEDITOR.dtd.$inline&&q.unshift(A),A.parent)p(A,A.parent,1);else{h.isOrphan=1;break}b(g);d();h.parent=A;h.isEmpty?p(h):A=h}}};r.onTagClose=function(a){for(var b=q.length-1;0<=b;b--)if(a==q[b].name){q.splice(b,1);return}for(var c=[],g=[],e=A;e!=n&&e.name!=a;)e._.isBlockLike||g.unshift(e),c.push(e),
+e=e.returnPoint||e.parent;if(e!=n){for(b=0;b<c.length;b++){var h=c[b];p(h,h.parent)}A=e;e._.isBlockLike&&d();p(e,e.parent);e==A&&(A=A.parent);q=q.concat(g)}"body"==a&&(k=!1)};r.onText=function(a){if(!(A._.hasInlineStarted&&!w.length||t||B)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var c=A.name,g=c?CKEDITOR.dtd[c]||(A._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):e;if(!B&&!g["#"]&&c in f)r.onTagOpen(h[c]||""),r.onText(a);else{d();b();t||B||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=
+new CKEDITOR.htmlParser.text(a);if(u(A,a))this.onTagOpen(k,{},0,1);A.add(a)}};r.onCDATA=function(a){A.add(new CKEDITOR.htmlParser.cdata(a))};r.onComment=function(a){d();b();A.add(new CKEDITOR.htmlParser.comment(a))};r.parse(m);for(d();A!=n;)p(A,A.parent,1);g(n);return n};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,c){isNaN(c)&&(c=this.children.length);var e=0<c?this.children[c-1]:null;if(e){if(a._.isBlockLike&&e.type==CKEDITOR.NODE_TEXT&&(e.value=CKEDITOR.tools.rtrim(e.value),
+0===e.value.length)){this.children.pop();this.add(a);return}e.next=a}a.previous=e;a.parent=this;this.children.splice(c,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,c){c=this.getFilterContext(c);a.onRoot(c,this);this.filterChildren(a,!1,c)},filterChildren:function(a,c,e){if(this.childrenFilteredBy!=a.id){e=this.getFilterContext(e);if(c&&!this.parent)a.onRoot(e,this);this.childrenFilteredBy=a.id;
+for(c=0;c<this.children.length;c++)!1===this.children[c].filter(a,e)&&c--}},writeHtml:function(a,c){c&&this.filter(c);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,c,e){var b=this.getFilterContext();if(e&&!this.parent&&c)c.onRoot(b,this);c&&this.filterChildren(c,!1,b);c=0;e=this.children;for(b=e.length;c<b;c++)e[c].writeHtml(a)},forEach:function(a,c,e){if(!(e||c&&this.type!=c))var b=a(this);if(!1!==b){e=this.children;for(var d=0;d<e.length;d++)b=e[d],b.type==CKEDITOR.NODE_ELEMENT?b.forEach(a,
+c):c&&b.type!=c||a(b)}},getFilterContext:function(a){return a||{}}}}(),"use strict",function(){function a(){this.rules=[]}function f(c,e,h,f){var l,k;for(l in e)(k=c[l])||(k=c[l]=new a),k.add(e[l],h,f)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(c){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;c&&this.addRules(c,10)},
+proto:{addRules:function(a,e){var h;"number"==typeof e?h=e:e&&"priority"in e&&(h=e.priority);"number"!=typeof h&&(h=10);"object"!=typeof e&&(e={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,h,e);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,h,e);a.elements&&f(this.elementsRules,a.elements,h,e);a.attributes&&f(this.attributesRules,a.attributes,h,e);a.text&&this.textRules.add(a.text,h,e);a.comment&&this.commentRules.add(a.comment,h,e);a.root&&this.rootRules.add(a.root,
+h,e)},applyTo:function(a){a.filter(this)},onElementName:function(a,e){return this.elementNameRules.execOnName(a,e)},onAttributeName:function(a,e){return this.attributeNameRules.execOnName(a,e)},onText:function(a,e,h){return this.textRules.exec(a,e,h)},onComment:function(a,e,h){return this.commentRules.exec(a,e,h)},onRoot:function(a,e){return this.rootRules.exec(a,e)},onElement:function(a,e){for(var h=[this.elementsRules["^"],this.elementsRules[e.name],this.elementsRules.$],f,l=0;3>l;l++)if(f=h[l]){f=
+f.exec(a,e,this);if(!1===f)return null;if(f&&f!=e)return this.onNode(a,f);if(e.parent&&!e.name)break}return e},onNode:function(a,e){var h=e.type;return h==CKEDITOR.NODE_ELEMENT?this.onElement(a,e):h==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,e.value)):h==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,e.value)):null},onAttribute:function(a,e,h,f){return(h=this.attributesRules[h])?h.exec(a,f,e,this):f}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype=
+{add:function(a,e,h){this.rules.splice(this.findIndex(e),0,{value:a,priority:e,options:h})},addMany:function(a,e,h){for(var f=[this.findIndex(e),0],l=0,k=a.length;l<k;l++)f.push({value:a[l],priority:e,options:h});this.rules.splice.apply(this.rules,f)},findIndex:function(a){for(var e=this.rules,h=e.length-1;0<=h&&a<e[h].priority;)h--;return h+1},exec:function(a,e){var h=e instanceof CKEDITOR.htmlParser.node||e instanceof CKEDITOR.htmlParser.fragment,f=Array.prototype.slice.call(arguments,1),l=this.rules,
+k=l.length,b,d,g,p;for(p=0;p<k;p++)if(h&&(b=e.type,d=e.name),g=l[p],!(a.nonEditable&&!g.options.applyToAll||a.nestedEditable&&g.options.excludeNestedEditable)){g=g.value.apply(null,f);if(!1===g||h&&g&&(g.name!=d||g.type!=b))return g;null!=g&&(f[0]=e=g)}return e},execOnName:function(a,e){for(var h=0,f=this.rules,l=f.length,k;e&&h<l;h++)k=f[h],a.nonEditable&&!k.options.applyToAll||a.nestedEditable&&k.options.excludeNestedEditable||(e=e.replace(k.value[0],k.value[1]));return e}}}(),function(){function a(a,
+b){function d(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function g(a,b){return function(g){if(g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var h=[],k=c(g),t,F;if(k)for(f(k,1)&&h.push(k);k;)m(k)&&(t=e(k))&&f(t)&&((F=e(t))&&!m(F)?h.push(t):(d(p).insertAfter(t),t.remove())),k=k.previous;for(k=0;k<h.length;k++)h[k].remove();if(h=!a||!1!==("function"==typeof b?b(g):b))p||CKEDITOR.env.needsBrFiller||g.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?
+p||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||g.name in CKEDITOR.dtd.tr||g.name in CKEDITOR.dtd.$listItem)?(h=c(g),h=!h||"form"==g.name&&"input"==h.name):h=!1:h=!1;h&&g.add(d(a))}}}function f(a,b){if((!p||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var d;return a.type==CKEDITOR.NODE_TEXT&&(d=a.value.match(q))&&(d.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,d.index))).insertBefore(a),a.value=d[0]),!CKEDITOR.env.needsBrFiller&&
+p&&(!b||a.parent.name in F)||!p&&((d=a.previous)&&"br"==d.name||!d||m(d)))?!0:!1}var k={elements:{}},p="html"==b,F=CKEDITOR.tools.extend({},t),n;for(n in F)"#"in A[n]||delete F[n];for(n in F)k.elements[n]=g(p,a.config.fillEmptyBlocks);k.root=g(p,!1);k.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var c=b.attributes;if("data-cke-bogus"in c||"data-cke-eol"in c)delete c["data-cke-bogus"];else{for(c=b.next;c&&h(c);)c=c.next;var g=e(b);!c&&m(b.parent)?l(b.parent,
+d(a)):m(c)&&g&&!m(g)&&d(a).insertBefore(c)}}}}(p);return k}function f(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function c(a){for(a=a.children[a.children.length-1];a&&h(a);)a=a.previous;return a}function e(a){for(a=a.previous;a&&h(a);)a=a.previous;return a}function h(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function m(a){return a&&(a.type==CKEDITOR.NODE_ELEMENT&&a.name in
+t||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function l(a,b){var d=a.children[a.children.length-1];a.children.push(b);b.parent=a;d&&(d.next=b,b.previous=d)}function k(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function b(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function d(a){return a.replace(C,function(a,b,d){return"\x3c"+b+d.replace(G,
+function(a,b){return E.test(b)&&-1==d.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function g(a,b){return a.replace(b,function(a,b,d){0===a.indexOf("\x3ctextarea")&&(a=b+v(d).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function p(a){return a.replace(N,function(a,b){return decodeURIComponent(b)})}function u(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
+function(a){return"\x3c!--"+w+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function v(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function r(a,b){var d=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return d&&d[b]||""})}function n(a,b){var d=[],c=b.config.protectedSource,g=b._.dataStore||(b._.dataStore=
+{id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,c=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(c);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(d.push(a)-1)+"--\x3e"});for(var h=0;h<c.length;h++)a=a.replace(c[h],function(a){a=a.replace(e,function(a,b,c){return d[c]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(d.push(a)-1)+"--\x3e"});a=a.replace(e,function(a,b,c){return"\x3c!--"+w+(b?"{C}":
+"")+encodeURIComponent(d[c]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){g[g.id]=decodeURIComponent(b);return"{cke_protected_"+g.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,d,c,g){return"\x3c"+d+c+"\x3e"+r(v(g),b)+"\x3c/"+d+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,
+e,h=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=e=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(x);c.addRules(D,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});e.addRules(y);e.addRules(z,{applyToAll:!0});e.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,e,c=n(c,b),c=g(c,I),c=d(c),c=g(c,J),c=c.replace(F,"$1cke:$2"),c=c.replace(R,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),
+c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");e=a.context||b.editable().getName();var h;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==e&&(e="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",h=1);e=b.document.createElement(e);e.setHtml("a"+c);c=e.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");h&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(P,"$1$2");c=p(c);c=v(c);e=!1===a.fixForBody?!1:
+f(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,e);e&&(h=c,!h.children.length&&CKEDITOR.dtd[h.name][e]&&(e=new CKEDITOR.htmlParser.element(e),h.add(e)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(h.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,
+d=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(d);b=d.getHtml(!0);a.dataValue=u(b)},null,null,15);b.on("toDataFormat",function(a){var d=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(d=d.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(d,a.data.context,f(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(h.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,
+!1,!0)},null,null,11);b.on("toDataFormat",function(a){var d=a.data.dataValue,c=h.writer;c.reset();d.writeChildrenHtml(c);d=c.getHtml(!0);d=v(d);d=r(d,b);a.data.dataValue=d},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,d,c){var g=this.editor,e,h,f,k;b&&"object"==typeof b?(e=b.context,d=b.fixForBody,c=b.dontFilter,h=b.filter,f=b.enterMode,k=b.protectedWhitespaces):e=b;e||null===e||(e=g.editable().getName());return g.fire("toHtml",{dataValue:a,context:e,fixForBody:d,dontFilter:c,
+filter:h||g.filter,enterMode:f||g.enterMode,protectedWhitespaces:k}).dataValue},toDataFormat:function(a,b){var d,c,g;b&&(d=b.context,c=b.filter,g=b.enterMode);d||null===d||(d=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:c||this.editor.filter,context:d,enterMode:g||this.editor.enterMode}).dataValue}};var q=/(?:&nbsp;|\xa0)$/,w="{cke_protected}",A=CKEDITOR.dtd,B="caption colgroup col thead tfoot tbody".split(" "),t=CKEDITOR.tools.extend({},A.$blockLimit,
+A.$block),x={elements:{input:k,textarea:k}},D={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},y={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var d=b.attributes.width,b=b.attributes.height;d&&(a.attributes.width=d);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},z={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,
+""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var d=["name","href","src"],c,g=0;g<d.length;g++)c="data-cke-saved-"+d[g],c in b&&delete b[d[g]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var d,c;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(d=CKEDITOR.tools.indexOf(B,a.name),c=CKEDITOR.tools.indexOf(B,b.name));-1<d&&-1<c&&d!=c||(d=a.parent?a.getIndex():-1,c=b.parent?b.getIndex():-1);return d>c?
+1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&l(a,b=new CKEDITOR.htmlParser.text);
+b.value=a.attributes["data-cke-title"]||""},input:b,textarea:b},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(z.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var C=/<(a|area|img|input|source)\b([^>]*)>/gi,G=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,E=/^(href|src|name)$/i,J=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
+I=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,N=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,F=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,P=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,R=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi}(),"use strict",CKEDITOR.htmlParser.element=function(a,f){this.name=a;this.attributes=f||{};this.children=[];var c=a||"",e=c.match(/^cke:(.*)/);e&&(c=e[1]);c=!!(CKEDITOR.dtd.$nonBodyContent[c]||CKEDITOR.dtd.$block[c]||CKEDITOR.dtd.$listItem[c]||
+CKEDITOR.dtd.$tableContent[c]||CKEDITOR.dtd.$nonEditable[c]||"br"==c);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:c,hasInlineStarted:this.isEmpty||!c}},CKEDITOR.htmlParser.cssStyle=function(a){var f={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,e,h){"font-family"==e&&(h=h.replace(/["']/g,""));f[e.toLowerCase()]=h});return{rules:f,populate:function(a){var e=
+this.toString();e&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",e):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=e:a.style=e)},toString:function(){var a=[],e;for(e in f)f[e]&&a.push(e,":",f[e],";");return a.join("")}}},function(){function a(a){return function(c){return c.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?c.name==a:c.name in a)}}var f=function(a,c){a=a[0];c=c[0];return a<c?-1:a>c?1:0},c=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=
+CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:c.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,c){var f=this,l,k;c=f.getFilterContext(c);if(c.off)return!0;if(!f.parent)a.onRoot(c,f);for(;;){l=f.name;if(!(k=a.onElementName(c,l)))return this.remove(),!1;f.name=k;if(!(f=a.onElement(c,f)))return this.remove(),!1;if(f!==this)return this.replaceWith(f),!1;if(f.name==l)break;if(f.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(f),
+!1;if(!f.name)return this.replaceWithChildren(),!1}l=f.attributes;var b,d;for(b in l){for(k=l[b];;)if(d=a.onAttributeName(c,b))if(d!=b)delete l[b],b=d;else break;else{delete l[b];break}d&&(!1===(k=a.onAttribute(c,f,d,k))?delete l[d]:l[d]=k)}f.isEmpty||this.filterChildren(a,!1,c);return!0},filterChildren:c.filterChildren,writeHtml:function(a,c){c&&this.filter(c);var m=this.name,l=[],k=this.attributes,b,d;a.openTag(m,k);for(b in k)l.push([b,k[b]]);a.sortAttributes&&l.sort(f);b=0;for(d=l.length;b<d;b++)k=
+l[b],a.attribute(k[0],k[1]);a.openTagClose(m,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(m)},writeChildrenHtml:c.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,c=a.length;c;)a[--c].insertAfter(this);this.remove()},forEach:c.forEach,getFirst:function(c){if(!c)return this.children.length?this.children[0]:null;"function"!=typeof c&&(c=a(c));for(var h=0,f=this.children.length;h<f;++h)if(c(this.children[h]))return this.children[h];return null},getHtml:function(){var a=
+new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var c=0,f=a.length;c<f;++c)a[c].parent=this},getOuterHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var c=this.children.splice(a,this.children.length-a),f=this.clone(),l=0;l<c.length;++l)c[l].parent=f;f.children=c;c[0]&&(c[0].previous=null);0<a&&(this.children[a-
+1].next=null);this.parent.add(f,this.getIndex()+1);return f},addClass:function(a){if(!this.hasClass(a)){var c=this.attributes["class"]||"";this.attributes["class"]=c+(c?" ":"")+a}},removeClass:function(a){var c=this.attributes["class"];c&&((c=CKEDITOR.tools.trim(c.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=c:delete this.attributes["class"])},hasClass:function(a){var c=this.attributes["class"];return c?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(c):!1},getFilterContext:function(a){var c=
+[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||c.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&c.push("nestedEditable",!0):c.push("nonEditable",!0);if(c.length){a=CKEDITOR.tools.copy(a);for(var f=0;f<c.length;f+=2)a[c[f]]=c[f+1]}return a}},!0)}(),function(){var a={},f=/{([^}]+)}/g,c=/([\\'])/g,e=/\n/g,h=/\r/g;CKEDITOR.template=function(m){if(a[m])this.output=
+a[m];else{var l=m.replace(c,"\\$1").replace(e,"\\n").replace(h,"\\r").replace(f,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[m]=Function("data","buffer","return buffer?buffer.push('"+l+"'):['"+l+"'].join('');")}}}(),delete CKEDITOR.loadFullCore,CKEDITOR.instances={},CKEDITOR.document=new CKEDITOR.dom.document(document),CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=
+a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)},CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]},function(){var a={};CKEDITOR.addTemplate=function(f,c){var e=a[f];if(e)return e;e={name:f,source:c};CKEDITOR.fire("template",e);return a[f]=new CKEDITOR.template(e.source)};CKEDITOR.getTemplate=function(f){return a[f]}}(),function(){var a=[];CKEDITOR.addCss=
+function(f){a.push(f)};CKEDITOR.getCss=function(){return a.join("\n")}}(),CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")}),CKEDITOR.TRISTATE_ON=1,CKEDITOR.TRISTATE_OFF=2,CKEDITOR.TRISTATE_DISABLED=0,function(){CKEDITOR.inline=function(a,f){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var c=new CKEDITOR.editor(f,
+a,CKEDITOR.ELEMENT_MODE_INLINE),e=a.is("textarea")?a:null;e?(c.setData(e.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!c.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+e.getValue()+"\x3c/div\x3e",CKEDITOR.document),a.insertAfter(e),e.hide(),e.$.form&&c._attachToForm()):c.setData(a.getHtml(),null,!0);c.on("loaded",function(){c.fire("uiReady");c.editable(a);c.container=a;c.ui.contentsElement=a;c.setData(c.getData(1));c.resetDirty();c.fire("contentDom");
+c.mode="wysiwyg";c.fire("mode");c.status="ready";c.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,c)},null,null,1E4);c.on("destroy",function(){e&&(c.container.clearCustomData(),c.container.remove(),e.show());c.element.clearCustomData();delete c.element});return c};CKEDITOR.inlineAll=function(){var a,f,c;for(c in CKEDITOR.dtd.$editable)for(var e=CKEDITOR.document.getElementsByTag(c),h=0,m=e.count();h<m;h++)a=e.getItem(h),"true"==a.getAttribute("contenteditable")&&(f={element:a,config:{}},
+!1!==CKEDITOR.fire("inline",f)&&CKEDITOR.inline(a,f.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})}(),CKEDITOR.replaceClass="ckeditor",function(){function a(a,h,m,l){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var k=new CKEDITOR.editor(h,a,l);l==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),k._.required=
+a.hasAttribute("required"),a.removeAttribute("required"));m&&k.setData(m,null,!0);k.on("loaded",function(){c(k);l==CKEDITOR.ELEMENT_MODE_REPLACE&&k.config.autoUpdateElement&&a.$.form&&k._attachToForm();k.setMode(k.config.startupMode,function(){k.resetDirty();k.status="ready";k.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,k)})});k.on("destroy",f);return k}function f(){var a=this.container,c=this.element;a&&(a.clearCustomData(),a.remove());c&&(c.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&
+(c.show(),this._.required&&c.setAttribute("required","required")),delete this.element)}function c(a){var c=a.name,f=a.element,l=a.elementMode,k=a.fire("uiSpace",{space:"top",html:""}).html,b=a.fire("uiSpace",{space:"bottom",html:""}).html,d=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':
+"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),c=CKEDITOR.dom.element.createFromHtml(d.output({id:a.id,name:c,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:k?'\x3cspan id\x3d"'+
+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+k+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:b?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+b+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));l==CKEDITOR.ELEMENT_MODE_REPLACE?(f.hide(),c.insertAfter(f)):f.append(c);a.container=c;a.ui.contentsElement=a.ui.space("contents");k&&a.ui.space("top").unselectable();
+b&&a.ui.space("bottom").unselectable();f=a.config.width;l=a.config.height;f&&c.setStyle("width",CKEDITOR.tools.cssLength(f));l&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(l));c.disableContextMenu();CKEDITOR.env.webkit&&c.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(c,h){return a(c,h,null,CKEDITOR.ELEMENT_MODE_REPLACE)};CKEDITOR.appendTo=function(c,h,f){return a(c,h,f,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=
+document.getElementsByTagName("textarea"),c=0;c<a.length;c++){var f=null,l=a[c];if(l.name||l.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(l.className))continue}else if("function"==typeof arguments[0]&&(f={},!1===arguments[0](l,f)))continue;this.replace(l,f)}}};CKEDITOR.editor.prototype.addMode=function(a,c){(this._.modes||(this._.modes={}))[a]=c};CKEDITOR.editor.prototype.setMode=function(a,c){var f=this,l=this._.modes;if(a!=f.mode&&l&&l[a]){f.fire("beforeSetMode",
+a);if(f.mode){var k=f.checkDirty(),l=f._.previousModeData,b,d=0;f.fire("beforeModeUnload");f.editable(0);f._.previousMode=f.mode;f._.previousModeData=b=f.getData(1);"source"==f.mode&&l==b&&(f.fire("lockSnapshot",{forceUpdate:!0}),d=1);f.ui.space("contents").setHtml("");f.mode=""}else f._.previousModeData=f.getData(1);this._.modes[a](function(){f.mode=a;void 0!==k&&!k&&f.resetDirty();d?f.fire("unlockSnapshot"):"wysiwyg"==a&&f.fire("saveSnapshot");setTimeout(function(){f.fire("mode");c&&c.call(f)},
+0)})}};CKEDITOR.editor.prototype.resize=function(a,c,f,l){var k=this.container,b=this.ui.space("contents"),d=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;l=l?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):k;l.setSize("width",a,!0);d&&(d.style.width="1%");var g=(l.$.offsetHeight||0)-(b.$.clientHeight||0),k=Math.max(c-(f?0:g),0);c=f?c+g:c;b.setStyle("height",k+"px");d&&(d.style.width="100%");this.fire("resize",{outerHeight:c,
+contentsHeight:k,outerWidth:a||l.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})}(),CKEDITOR.config.startupMode="wysiwyg",function(){function a(a){var b=a.editor,d=a.data.path,c=d.blockLimit,g=a.data.selection,h=g.getRanges()[0],k;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=f(g,d))g.appendBogus(),k=CKEDITOR.env.ie;
+l(b,d.block,c)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(d=h.clone(),d.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),c=new CKEDITOR.dom.walker(d),c.guard=function(a){return!e(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!c.checkForward()||d.checkStartOfBlock()&&d.checkEndOfBlock())&&(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(e))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),
+k=1,a.cancel());k&&h.select()}function f(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,c=d&&d.getLast(e);if(!(!d||!d.isBlockBoundary()||c&&c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function c(a){var b=a.data.getTarget();b.is("input")&&(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function e(a){return g(a)&&p(a)}function h(a,b){return function(d){var c=d.data.$.toElement||d.data.$.fromElement||d.data.$.relatedTarget;
+(c=c&&c.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(c):null)&&(b.equals(c)||b.contains(c))||a.call(this,d)}}function m(a){function b(a){return function(b,c){c&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(g)&&(d=b);if(!(c||!e(b)||a&&v(b)))return!1}}var d,c=a.getRanges()[0];a=a.root;var g={table:1,ul:1,ol:1,dl:1};if(c.startPath().contains(g)){var h=c.clone();h.collapse(1);h.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(h);a.guard=b();a.checkBackward();if(d)return h=c.clone(),
+h.collapse(),h.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(h),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function l(a,b,d){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(d)&&!b||b&&"true"==b.getAttribute("contenteditable"))}function k(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){var b=a.editor;b.getSelection().scrollIntoView();
+setTimeout(function(){b.fire("saveSnapshot")},0)}function d(a,b,d){var c=a.getCommonAncestor(b);for(b=a=d?b:a;(a=a.getParent())&&!c.equals(a)&&1==a.getChildCount();)b=a;b.remove()}CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();
+return}try{this.$[CKEDITOR.env.ie&&this.getDocument().equals(CKEDITOR.document)?"setActive":"focus"]()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var d=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=h(b,this),d[0]=a,d[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,d)},
+attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,d;for(d in a)a.hasOwnProperty(d)&&(b=a[d],null!==b?this.setAttribute(d,b):this.removeAttribute(d))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||
+(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var d=this.getAttribute(a);b!==d&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=d),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;
+return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,d,c){var g=this.editor;g.focus();g.fire("saveSnapshot");c||(c=g.getSelection().getRanges()[0]);n(this,d||"html",a,c);c.select();b(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,d){n(this,d||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,d){var c=this.editor;c.focus();c.fire("saveSnapshot");var g=c.activeEnterMode,c=c.getSelection(),h=a.getName(),h=CKEDITOR.dtd.$block[h];
+d||(d=c.getRanges()[0]);this.insertElementIntoRange(a,d)&&(d.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),h&&((h=a.getNext(function(a){return e(a)&&!v(a)}))&&h.type==CKEDITOR.NODE_ELEMENT&&h.is(CKEDITOR.dtd.$block)?h.getDtd()["#"]?d.moveToElementEditStart(h):d.moveToElementEditEnd(a):h||g==CKEDITOR.ENTER_BR||(h=d.fixBlock(!0,g==CKEDITOR.ENTER_DIV?"div":"p"),d.moveToElementEditStart(h))));c.selectRanges([d]);b(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,
+b){var d=this.editor,c=d.config.enterMode,g=a.getName(),e=CKEDITOR.dtd.$block[g];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})&&q(b);var h,f;if(e)for(;(h=b.getCommonAncestor(0,1))&&(f=CKEDITOR.dtd[h.getName()])&&(!f||!f[g]);)h.getName()in CKEDITOR.dtd.span?b.splitElement(h):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(h),b.collapse(!0),h.remove()):b.splitBlock(c==CKEDITOR.ENTER_DIV?
+"div":"p",d.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();
+delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=d.getDocument().$,c=b.getSelection(),g;a:if(c.anchorNode&&c.anchorNode==d.$)g=!0;else{if(CKEDITOR.env.webkit&&(g=d.getDocument().getActive())&&g.equals(d)&&!c.anchorNode){g=!0;break a}g=void 0}g&&(g=new CKEDITOR.dom.range(d),g.moveToElementEditStart(d),b=b.createRange(),b.setStart(g.startContainer.$,g.startOffset),b.collapse(!0),c.removeAllRanges(),
+c.addRange(b))}function b(){var a=d.getDocument().$,c=a.selection,g=d.getDocument().getActive();"None"==c.type&&g.equals(d)&&(c=new CKEDITOR.dom.range(d),a=a.body.createTextRange(),c.moveToElementEditStart(d),c=c.startContainer,c.type!=CKEDITOR.NODE_ELEMENT&&(c=c.getParent()),a.moveToElementText(c.$),a.collapse(!0),a.select())}var d=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",
+function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};w.eol.detect(a,this);w.bogus.exclude(a);w.cell.shrink(a);a.fragment=a.range.cloneContents();w.tree.rebuild(a,this);w.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var d=A,c={range:a,doc:a.document},g=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),g;a.enlarge(CKEDITOR.ENLARGE_INLINE,
+1);d.table.detectPurge(c);c.bookmark=a.createBookmark();delete c.range;var e=this.editor.createRange();e.moveToPosition(c.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);c.targetBookmark=e.createBookmark();d.list.detectMerge(c,this);d.table.detectRanges(c,this);d.block.detectMerge(c,this);c.tableContentsRanges?(d.table.deleteRanges(c),a.moveToBookmark(c.bookmark),c.range=a):(a.moveToBookmark(c.bookmark),c.range=a,a.extractContents(d.detectExtractMerge(c)));a.moveToBookmark(c.targetBookmark);a.optimize();
+d.fixUneditableRangePosition(a);d.list.merge(c,this);d.table.purge(c,this);d.block.merge(c,this);if(b){d=a.startPath();if(c=a.checkStartOfBlock()&&a.checkEndOfBlock()&&d.block&&!a.root.equals(d.block)){a:{var c=d.block.getElementsByTag("span"),e=0,h;if(c)for(;h=c.getItem(e++);)if(!p(h)){c=!0;break a}c=!1}c=!c}c&&(a.moveToPosition(d.block,CKEDITOR.POSITION_BEFORE_START),d.block.remove())}else d.autoParagraph(this.editor,a),u(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
+return g},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(r,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
+"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):
+a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",
+function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=this.getDocument();a.window=this.getWindow();var b=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var h=a.config.contentsLangDirection;this.getDirection(1)!=h&&this.changeAttr("dir",h);var f=CKEDITOR.getCss();f&&(h=b.getHead(),h.getCustomData("stylesheet")||(f=b.appendStyleText(f),f=new CKEDITOR.dom.element(f.ownerNode||f.owningElement),
+h.setCustomData("stylesheet",f),f.data("cke-temp",1)));h=b.getCustomData("stylesheet_ref")||0;b.setCustomData("stylesheet_ref",h+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var k={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var d=b.data.domEvent.getKey(),c;if(d in
+k){b=a.getSelection();var e,h=b.getRanges()[0],f=h.startPath(),p,F,t,d=8==d;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=m(b))?(a.fire("saveSnapshot"),h.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e.remove(),h.select(),a.fire("saveSnapshot"),c=1):h.collapsed&&((p=f.block)&&(t=p[d?"getPrevious":"getNext"](g))&&t.type==CKEDITOR.NODE_ELEMENT&&t.is("table")&&h[d?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),h[d?"checkEndOfBlock":"checkStartOfBlock"]()&&
+p.remove(),h["moveToElementEdit"+(d?"End":"Start")](t),h.select(),a.fire("saveSnapshot"),c=1):f.blockLimit&&f.blockLimit.is("td")&&(F=f.blockLimit.getAscendant("table"))&&h.checkBoundaryOfElement(F,d?CKEDITOR.START:CKEDITOR.END)&&(t=F[d?"getPrevious":"getNext"](g))?(a.fire("saveSnapshot"),h["moveToElementEdit"+(d?"End":"Start")](t),h.checkStartOfBlock()&&h.checkEndOfBlock()?t.remove():h.select(),a.fire("saveSnapshot"),c=1):(F=f.contains(["td","th","caption"]))&&h.checkBoundaryOfElement(F,d?CKEDITOR.START:
+CKEDITOR.END)&&(c=1))}return!c});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in k&&!this.getFirst(e)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",c);CKEDITOR.env.ie&&!CKEDITOR.env.edge||
+this.attachListener(this,"mousedown",function(b){var d=b.data.getTarget();d.is("img","hr","input","textarea","select")&&!d.isReadOnly()&&(a.getSelection().selectElement(d),d.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(r,
+""))){var d=a.createRange();d.moveToElementEditStart(b);d.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in k){var c=8==b,g=a.getSelection().getRanges()[0];b=g.startPath();
+if(g.collapsed)a:{var e=b.block;if(e&&g[c?"checkStartOfBlock":"checkEndOfBlock"]()&&g.moveToClosestEditablePosition(e,!c)&&g.collapsed){if(g.startContainer.type==CKEDITOR.NODE_ELEMENT){var h=g.startContainer.getChild(g.startOffset-(c?1:0));if(h&&h.type==CKEDITOR.NODE_ELEMENT&&h.is("hr")){a.fire("saveSnapshot");h.remove();b=!0;break a}}g=g.startPath().block;if(!g||g&&g.contains(e))b=void 0;else{a.fire("saveSnapshot");var f;(f=(c?g:e).getBogus())&&f.remove();f=a.getSelection();h=f.createBookmarks();
+(c?e:g).moveChildren(c?g:e,!1);b.lastElement.mergeSiblings();d(e,g,!c);f.selectBookmarks(h);b=!0}}else b=!1}else c=g,f=b.block,g=c.endPath().block,f&&g&&!f.equals(g)?(a.fire("saveSnapshot"),(e=f.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),g.getParent()&&(g.moveChildren(f,!1),b.lastElement.mergeSiblings(),d(f,g,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;
+a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var d=a.getCustomData("stylesheet_ref");--d?a.setCustomData("stylesheet_ref",d):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");
+delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var d=b.editor;d.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?
+"true":"1"),a.setAttribute("contentEditable",!1))});d.on("selectionChange",function(b){if(!d.readOnly){var c=d.getSelection();c&&!c.isLocked&&(c=d.checkDirty(),d.fire("lockSnapshot"),a(b),d.fire("unlockSnapshot"),!c&&d.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var d=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",d);d&&a.changeAttr("title",d);var c=b.fire("ariaEditorHelpLabel",{}).label;
+if(c&&(d=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var g=CKEDITOR.tools.getNextId(),c=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+c+"\x3c/span\x3e");d.append(c);a.changeAttr("aria-describedby",g)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");var g=CKEDITOR.dom.walker.whitespaces(!0),p=CKEDITOR.dom.walker.bookmark(!1,!0),u=CKEDITOR.dom.walker.empty(),
+v=CKEDITOR.dom.walker.bogus(),r=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi,n=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(d,c){var g,e,h,f,k=[],l=c.range.startContainer;g=c.range.startPath();for(var l=p[l.getName()],n=0,m=d.getChildren(),r=m.count(),q=-1,x=-1,w=0,u=g.contains(p.$list);n<r;++n)g=m.getItem(n),a(g)?(h=g.getName(),u&&h in CKEDITOR.dtd.$list?k=k.concat(b(g,c)):(f=!!l[h],
+"br"!=h||!g.data("cke-eol")||n&&n!=r-1||(w=(e=n?k[n-1].node:m.getItem(n+1))&&(!a(e)||!e.is("br")),e=e&&a(e)&&p.$block[e.getName()]),-1!=q||f||(q=n),f||(x=n),k.push({isElement:1,isLineBreak:w,isBlock:g.isBlockBoundary(),hasBlockSibling:e,node:g,name:h,allowed:f}),e=w=0)):k.push({isElement:0,node:g,allowed:1});-1<q&&(k[q].firstNotAllowed=1);-1<x&&(k[x].lastNotAllowed=1);return k}function d(b,c){var g=[],e=b.getChildren(),h=e.count(),f,k=0,n=p[c],l=!b.is(p.$inline)||b.is("br");for(l&&g.push(" ");k<h;k++)f=
+e.getItem(k),a(f)&&!f.is(n)?g=g.concat(d(f,c)):g.push(f);l&&g.push(" ");return g}function c(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function g(b){return b&&a(b)&&(b.is(p.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function h(b,d,c,g){var e=b.clone(),f,k;e.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);(f=(new CKEDITOR.dom.walker(e)).next())&&a(f)&&n[f.getName()]&&(k=f.getPrevious())&&a(k)&&!k.getParent().equals(b.startContainer)&&c.contains(k)&&g.contains(f)&&f.isIdentical(k)&&
+(f.moveChildren(k),f.remove(),h(b,d,c,g))}function f(b,d){function c(b,d){if(d.isBlock&&d.isElement&&!d.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var g=d.endContainer.getChild(d.endOffset),e=d.endContainer.getChild(d.endOffset-1);g&&c(g,b[b.length-1]);e&&c(e,b[0])&&(d.setEnd(d.endContainer,d.endOffset-1),d.collapse())}var p=CKEDITOR.dtd,n={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},r=CKEDITOR.tools.extend({},
+p.$inline);delete r.br;return function(n,F,q,w){var u=n.editor,v=!1;"unfiltered_html"==F&&(F="html",v=!0);if(!w.checkReadOnly()){var A=(new CKEDITOR.dom.elementPath(w.startContainer,w.root)).blockLimit||w.root;n={type:F,dontFilter:v,editable:n,editor:u,range:w,blockLimit:A,mergeCandidates:[],zombies:[]};F=n.range;w=n.mergeCandidates;var E,K;"text"==n.type&&F.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(E=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",F.document),F.insertNode(E),
+F.setStartAfter(E));v=new CKEDITOR.dom.elementPath(F.startContainer);n.endPath=A=new CKEDITOR.dom.elementPath(F.endContainer);if(!F.collapsed){var u=A.block||A.blockLimit,V=F.getCommonAncestor();u&&!u.equals(V)&&!u.contains(V)&&F.checkEndOfBlock()&&n.zombies.push(u);F.deleteContents()}for(;(K=c(F))&&a(K)&&K.isBlockBoundary()&&v.contains(K);)F.moveToPosition(K,CKEDITOR.POSITION_BEFORE_END);h(F,n.blockLimit,v,A);E&&(F.setEndBefore(E),F.collapse(),E.remove());E=F.startPath();if(u=E.contains(g,!1,1))F.splitElement(u),
+n.inlineStylesRoot=u,n.inlineStylesPeak=E.lastElement;E=F.createBookmark();(u=E.startNode.getPrevious(e))&&a(u)&&g(u)&&w.push(u);(u=E.startNode.getNext(e))&&a(u)&&g(u)&&w.push(u);for(u=E.startNode;(u=u.getParent())&&g(u);)w.push(u);F.moveToBookmark(E);if(E=q){E=n.range;if("text"==n.type&&n.inlineStylesRoot){K=n.inlineStylesPeak;F=K.getDocument().createText("{cke-peak}");for(w=n.inlineStylesRoot.getParent();!K.equals(w);)F=F.appendTo(K.clone()),K=K.getParent();q=F.getOuterHtml().split("{cke-peak}").join(q)}K=
+n.blockLimit.getName();if(/^\s+|\s+$/.test(q)&&"span"in CKEDITOR.dtd[K]){var S='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';q=S+q+S}q=n.editor.dataProcessor.toHtml(q,{context:null,fixForBody:!1,protectedWhitespaces:!!S,dontFilter:n.dontFilter,filter:n.editor.activeFilter,enterMode:n.editor.activeEnterMode});K=E.document.createElement("body");K.setHtml(q);S&&(K.getFirst().remove(),K.getLast().remove());if((S=E.startPath().block)&&(1!=S.getChildCount()||!S.getBogus()))a:{var H;if(1==
+K.getChildCount()&&a(H=K.getFirst())&&H.is(m)&&!H.hasAttribute("contenteditable")){S=H.getElementsByTag("*");E=0;for(w=S.count();E<w;E++)if(F=S.getItem(E),!F.is(r))break a;H.moveChildren(H.getParent(1));H.remove()}}n.dataWrapper=K;E=q}if(E){H=n.range;E=H.document;var M;K=n.blockLimit;w=0;var W,S=[],T,aa;q=u=0;var X,da;F=H.startContainer;var v=n.endPath.elements[0],ba,A=v.getPosition(F),V=!!v.getCommonAncestor(F)&&A!=CKEDITOR.POSITION_IDENTICAL&&!(A&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);
+F=b(n.dataWrapper,n);for(f(F,H);w<F.length;w++){A=F[w];if(M=A.isLineBreak){M=H;X=K;var Y=void 0,ea=void 0;A.hasBlockSibling?M=1:(Y=M.startContainer.getAscendant(p.$block,1))&&Y.is({div:1,p:1})?(ea=Y.getPosition(X),ea==CKEDITOR.POSITION_IDENTICAL||ea==CKEDITOR.POSITION_CONTAINS?M=0:(X=M.splitElement(Y),M.moveToPosition(X,CKEDITOR.POSITION_AFTER_START),M=1)):M=0}if(M)q=0<w;else{M=H.startPath();!A.isBlock&&l(n.editor,M.block,M.blockLimit)&&(aa=k(n.editor))&&(aa=E.createElement(aa),aa.appendBogus(),H.insertNode(aa),
+CKEDITOR.env.needsBrFiller&&(W=aa.getBogus())&&W.remove(),H.moveToPosition(aa,CKEDITOR.POSITION_BEFORE_END));if((M=H.startPath().block)&&!M.equals(T)){if(W=M.getBogus())W.remove(),S.push(M);T=M}A.firstNotAllowed&&(u=1);if(u&&A.isElement){M=H.startContainer;for(X=null;M&&!p[M.getName()][A.name];){if(M.equals(K)){M=null;break}X=M;M=M.getParent()}if(M)X&&(da=H.splitElement(X),n.zombies.push(da),n.zombies.push(X));else{X=K.getName();ba=!w;M=w==F.length-1;X=d(A.node,X);for(var Y=[],ea=X.length,ca=0,ga=
+void 0,fa=0,ia=-1;ca<ea;ca++)ga=X[ca]," "==ga?(fa||ba&&!ca||(Y.push(new CKEDITOR.dom.text(" ")),ia=Y.length),fa=1):(Y.push(ga),fa=0);M&&ia==Y.length&&Y.pop();ba=Y}}if(ba){for(;M=ba.pop();)H.insertNode(M);ba=0}else H.insertNode(A.node);A.lastNotAllowed&&w<F.length-1&&((da=V?v:da)&&H.setEndAt(da,CKEDITOR.POSITION_AFTER_START),u=0);H.collapse()}}1!=F.length?W=!1:(W=F[0],W=W.isElement&&"false"==W.node.getAttribute("contenteditable"));W&&(q=!0,M=F[0].node,H.setStartAt(M,CKEDITOR.POSITION_BEFORE_START),
+H.setEndAt(M,CKEDITOR.POSITION_AFTER_END));n.dontMoveCaret=q;n.bogusNeededBlocks=S}W=n.range;var Z;da=n.bogusNeededBlocks;for(ba=W.createBookmark();T=n.zombies.pop();)T.getParent()&&(aa=W.clone(),aa.moveToElementEditStart(T),aa.removeEmptyBlocksAtEnd());if(da)for(;T=da.pop();)CKEDITOR.env.needsBrFiller?T.appendBogus():T.append(W.document.createText(" "));for(;T=n.mergeCandidates.pop();)T.mergeSiblings();W.moveToBookmark(ba);if(!n.dontMoveCaret){for(T=c(W);T&&a(T)&&!T.is(p.$empty);){if(T.isBlockBoundary())W.moveToPosition(T,
+CKEDITOR.POSITION_BEFORE_END);else{if(g(T)&&T.getHtml().match(/(\s|&nbsp;)$/g)){Z=null;break}Z=W.clone();Z.moveToPosition(T,CKEDITOR.POSITION_BEFORE_END)}T=T.getLast(e)}Z&&W.moveToRange(Z)}}}}(),q=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,d,c){d=a.getDocument().createElement(d);a.append(d,c);return d}
+function d(a){var b=a.count(),c;for(b;0<b--;)c=a.getItem(b),CKEDITOR.tools.trim(c.getHtml())||(c.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&c.getChildCount()&&c.getFirst().remove())}return function(c){var g=c.startContainer,e=g.getAscendant("table",1),h=!1;d(e.getElementsByTag("td"));d(e.getElementsByTag("th"));e=c.clone();e.setStart(g,0);e=a(e).lastBackward();e||(e=c.clone(),e.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),h=!0);e||(e=g);e.is("table")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),
+c.collapse(!0),e.remove()):(e.is({tbody:1,thead:1,tfoot:1})&&(e=b(e,"tr",h)),e.is("tr")&&(e=b(e,e.getParent().is("thead")?"th":"td",h)),(g=e.getBogus())&&g.remove(),c.moveToPosition(e,h?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}(),w={eol:{detect:function(a,b){var d=a.range,c=d.clone(),g=d.clone(),e=new CKEDITOR.dom.elementPath(d.startContainer,b),h=new CKEDITOR.dom.elementPath(d.endContainer,b);c.collapse(1);g.collapse();e.block&&c.checkBoundaryOfElement(e.block,CKEDITOR.END)&&
+(d.setStartAfter(e.block),a.prependEolBr=1);h.block&&g.checkBoundaryOfElement(h.block,CKEDITOR.START)&&(d.setEndBefore(h.block),a.appendEolBr=1)},fix:function(a,b){var d=b.getDocument(),c;a.appendEolBr&&(c=this.createEolBr(d),a.fragment.append(c));!a.prependEolBr||c&&!c.getPrevious()||a.fragment.append(this.createEolBr(d),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),d=b.startNode,b=b.endNode;
+!b||!v(b)||d&&d.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var d=a.range,c=d.getCommonAncestor(),g=new CKEDITOR.dom.elementPath(c,b),e=new CKEDITOR.dom.elementPath(d.startContainer,b),d=new CKEDITOR.dom.elementPath(d.endContainer,b),h;c.type==CKEDITOR.NODE_TEXT&&(c=c.getParent());if(g.blockLimit.is({tr:1,table:1})){var f=g.contains("table").getParent();h=function(a){return!a.equals(f)}}else if(g.block&&g.block.is(CKEDITOR.dtd.$listItem)&&(e=e.contains(CKEDITOR.dtd.$list),d=d.contains(CKEDITOR.dtd.$list),
+!e.equals(d))){var k=g.contains(CKEDITOR.dtd.$list).getParent();h=function(a){return!a.equals(k)}}h||(h=function(a){return!a.equals(g.block)&&!a.equals(g.blockLimit)});this.rebuildFragment(a,b,c,h)},rebuildFragment:function(a,b,d,c){for(var g;d&&!d.equals(b)&&c(d);)g=d.clone(0,1),a.fragment.appendTo(g),a.fragment=g,d=d.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,d=a.endContainer,c=a.startOffset,g=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(d)&&b.is("tr")&&++c==
+g&&a.shrink(CKEDITOR.SHRINK_TEXT)}}},A=function(){function a(b,d){var c=b.getParent();if(c.is(CKEDITOR.dtd.$inline))b[d?"insertBefore":"insertAfter"](c)}function b(d,c,g){a(c);a(g,1);for(var e;e=g.getNext();)e.insertAfter(c),c=e;u(d)&&d.remove()}function d(a,b){var c=new CKEDITOR.dom.range(a);c.setStartAfter(b.startNode);c.setEndBefore(b.endNode);return c}return{list:{detectMerge:function(a,b){var c=d(b,a.bookmark),g=c.startPath(),e=c.endPath(),h=g.contains(CKEDITOR.dtd.$list),f=e.contains(CKEDITOR.dtd.$list);
+a.mergeList=h&&f&&h.getParent().equals(f.getParent())&&!h.equals(f);a.mergeListItems=g.block&&e.block&&g.block.is(CKEDITOR.dtd.$listItem)&&e.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)c=c.clone(),c.setStartBefore(a.bookmark.startNode),c.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=c.createBookmark()},merge:function(a,d){if(a.mergeListBookmark){var c=a.mergeListBookmark.startNode,g=a.mergeListBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),h=new CKEDITOR.dom.elementPath(g,
+d);if(a.mergeList){var f=e.contains(CKEDITOR.dtd.$list),k=h.contains(CKEDITOR.dtd.$list);f.equals(k)||(k.moveChildren(f),k.remove())}a.mergeListItems&&(e=e.contains(CKEDITOR.dtd.$listItem),h=h.contains(CKEDITOR.dtd.$listItem),e.equals(h)||b(h,c,g));c.remove();g.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var d=new CKEDITOR.dom.range(b);d.setStartBefore(a.bookmark.startNode);d.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=d.createBookmark()}},
+merge:function(a,d){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var c=a.mergeBlockBookmark.startNode,g=a.mergeBlockBookmark.endNode,e=new CKEDITOR.dom.elementPath(c,d),h=new CKEDITOR.dom.elementPath(g,d),e=e.block,h=h.block;e&&h&&!e.equals(h)&&b(h,c,g);c.remove();g.remove()}}},table:function(){function a(d){var g=[],e,h=new CKEDITOR.dom.walker(d),f=d.startPath().contains(c),k=d.endPath().contains(c),p={};h.guard=function(a,h){if(a.type==CKEDITOR.NODE_ELEMENT){var n="visited_"+(h?"out":"in");if(a.getCustomData(n))return;
+CKEDITOR.dom.element.setMarker(p,a,n,1)}if(h&&f&&a.equals(f))e=d.clone(),e.setEndAt(f,CKEDITOR.POSITION_BEFORE_END),g.push(e);else if(!h&&k&&a.equals(k))e=d.clone(),e.setStartAt(k,CKEDITOR.POSITION_AFTER_START),g.push(e);else{if(n=!h)n=a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&(!f||b(a,f))&&(!k||b(a,k));n&&(e=d.clone(),e.selectNodeContents(a),g.push(e))}};h.lastForward();CKEDITOR.dom.element.clearAllMarkers(p);return g}function b(a,d){var c=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,
+g=a.getPosition(d);return g===CKEDITOR.POSITION_IDENTICAL?!1:0===(g&c)}var c={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,d=b.clone();d.enlarge(CKEDITOR.ENLARGE_ELEMENT);var d=new CKEDITOR.dom.walker(d),g=0;d.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(c)&&++g};d.checkForward();if(1<g){var d=b.startPath().contains("table"),e=b.endPath().contains("table");d&&e&&b.checkBoundaryOfElement(d,CKEDITOR.START)&&b.checkBoundaryOfElement(e,CKEDITOR.END)&&(b=a.range.clone(),
+b.setStartBefore(d),b.setEndAfter(e),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(g,e){var h=d(e,g.bookmark),f=h.clone(),k,p,n=h.getCommonAncestor();n.is(CKEDITOR.dtd.$tableContent)&&!n.is(c)&&(n=n.getAscendant("table",!0));p=n;n=new CKEDITOR.dom.elementPath(h.startContainer,p);p=new CKEDITOR.dom.elementPath(h.endContainer,p);n=n.contains("table");p=p.contains("table");if(n||p)n&&p&&b(n,p)?(g.tableSurroundingRange=f,f.setStartAt(n,CKEDITOR.POSITION_AFTER_END),f.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),
+f=h.clone(),f.setEndAt(n,CKEDITOR.POSITION_AFTER_END),k=h.clone(),k.setStartAt(p,CKEDITOR.POSITION_BEFORE_START),k=a(f).concat(a(k))):n?p||(g.tableSurroundingRange=f,f.setStartAt(n,CKEDITOR.POSITION_AFTER_END),h.setEndAt(n,CKEDITOR.POSITION_AFTER_END)):(g.tableSurroundingRange=f,f.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),h.setStartAt(p,CKEDITOR.POSITION_AFTER_START)),g.tableContentsRanges=k?k:a(h)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),u(b.startContainer)&&
+b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,d=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);d.moveToBookmark(a.purgeTableBookmark);d.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},
+fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var d=b.startPath(),c;l(a,d.block,d.blockLimit)&&(c=k(a))&&(c=b.document.createElement(c),c.appendBogus(),b.insertNode(c),b.moveToPosition(c,CKEDITOR.POSITION_AFTER_START))}}}()}(),function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;
+this.fire("selectionCheck",a);b=this.elementPath();b.compare(this._.selectionPreviousPath)||(CKEDITOR.env.webkit&&(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=b,this.fire("selectionChange",{selection:a,path:b}))}function f(){u=!0;p||(c.call(this),p=CKEDITOR.tools.setTimeout(c,200,this))}function c(){p=null;u&&(CKEDITOR.tools.setTimeout(a,0,this),u=!1)}function e(a){return v(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function h(a){function b(d,
+c){return d&&d.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(c?"End":"Start")](d):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,c=a.getPreviousNode(e,null,d),g=a.getNextNode(e,null,d);return b(c)||b(g,1)||!(c||g||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function m(a){l(a,!1);var b=a.getDocument().createText(A);a.setCustomData("cke-fillingChar",b);return b}function l(a,b){var d=a&&a.removeCustomData("cke-fillingChar");if(d){if(!1!==
+b){var c=a.getDocument().getSelection().getNative(),g=c&&"None"!=c.type&&c.getRangeAt(0),e=A.length;if(d.getLength()>e&&g&&g.intersectsNode(d.$)){var h=[{node:c.anchorNode,offset:c.anchorOffset},{node:c.focusNode,offset:c.focusOffset}];c.anchorNode==d.$&&c.anchorOffset>e&&(h[0].offset-=e);c.focusNode==d.$&&c.focusOffset>e&&(h[1].offset-=e)}}d.setText(k(d.getText(),1));h&&(d=a.getDocument().$,c=d.getSelection(),d=d.createRange(),d.setStart(h[0].node,h[0].offset),d.collapse(!0),c.removeAllRanges(),
+c.addRange(d),c.extend(h[1].node,h[1].offset))}}function k(a,b){return b?a.replace(B,function(a,b){return b?" ":""}):a.replace(A,"")}function b(a){var b=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e\x26nbsp;\x3c/div\x3e',a.document);a.fire("lockSnapshot");a.editable().append(b);var d=a.getSelection(1),c=a.createRange(),g=d.root.on("selectionchange",function(a){a.cancel()},
+null,null,0);c.setStartAt(b,CKEDITOR.POSITION_AFTER_START);c.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);d.selectRanges([c]);g.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=b}function d(a){var b={37:1,39:1,8:1,46:1};return function(d){var c=d.data.getKeystroke();if(b[c]){var g=a.getSelection().getRanges(),e=g[0];1==g.length&&e.collapsed&&(c=e[38>c?"getPreviousEditableNode":"getNextEditableNode"]())&&c.type==CKEDITOR.NODE_ELEMENT&&"false"==c.getAttribute("contenteditable")&&(a.getSelection().fake(c),
+d.data.preventDefault(),d.cancel())}}}function g(a){for(var b=0;b<a.length;b++){var d=a[b];d.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!d.collapsed){if(d.startContainer.isReadOnly())for(var c=d.startContainer,g;c&&!((g=c.type==CKEDITOR.NODE_ELEMENT)&&c.is("body")||!c.isReadOnly());)g&&"false"==c.getAttribute("contentEditable")&&d.setStartAfter(c),c=c.getParent();c=d.startContainer;g=d.endContainer;var e=d.startOffset,h=d.endOffset,f=d.clone();c&&c.type==CKEDITOR.NODE_TEXT&&(e>=c.getLength()?
+f.setStartAfter(c):f.setStartBefore(c));g&&g.type==CKEDITOR.NODE_TEXT&&(h?f.setEndAfter(g):f.setEndBefore(g));c=new CKEDITOR.dom.walker(f);c.evaluator=function(c){if(c.type==CKEDITOR.NODE_ELEMENT&&c.isReadOnly()){var g=d.clone();d.setEndBefore(c);d.collapsed&&a.splice(b--,1);c.getPosition(f.endContainer)&CKEDITOR.POSITION_CONTAINS||(g.setStartAfter(c),g.collapsed||a.splice(b+1,0,g));return!0}return!1};c.next()}}return a}var p,u,v=CKEDITOR.dom.walker.invisible(1),r=function(){function a(b){return function(a){var d=
+a.editor.createRange();d.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([d]);return!1}}function b(a){return function(b){var d=b.editor,c=d.createRange(),g;(g=c.moveToClosestEditablePosition(b.selected,a))||(g=c.moveToClosestEditablePosition(b.selected,!a));g&&d.getSelection().selectRanges([c]);d.fire("saveSnapshot");b.selected.remove();g||(c.moveToElementEditablePosition(d.editable()),d.getSelection().selectRanges([c]));d.fire("saveSnapshot");return!1}}var d=a(),
+c=a(1);return{37:d,38:d,39:c,40:c,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function c(){var a=g.getSelection();a&&a.removeAllRanges()}var g=b.editor;g.on("contentDom",function(){function b(){r=new CKEDITOR.dom.selection(g.getSelection());r.lock()}function c(){h.removeListener("mouseup",c);m.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==e.$&&b.select()}var e=g.document,h=CKEDITOR.document,k=g.editable(),
+p=e.getBody(),m=e.getDocumentElement(),t=k.isInline(),F,r;CKEDITOR.env.gecko&&k.attachListener(k,"focus",function(a){a.removeListener();0!==F&&(a=g.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==k.$&&(a=g.createRange(),a.moveToElementEditStart(k),a.select())},null,null,-2);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){F&&CKEDITOR.env.webkit&&(F=g._.previousActive&&g._.previousActive.equals(e.getActive()));g.unlockSelection(F);F=0},null,null,-1);k.attachListener(k,
+"mousedown",function(){F=0});if(CKEDITOR.env.ie||t)n?k.attachListener(k,"beforedeactivate",b,null,null,-1):k.attachListener(g,"selectionCheck",b,null,null,-1),k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){g.lockSelection(r);F=1},null,null,-1),k.attachListener(k,"mousedown",function(){F=0});if(CKEDITOR.env.ie&&!t){var q;k.attachListener(k,"mousedown",function(a){2==a.data.$.button&&((a=g.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(q=g.window.getScrollPosition()))});
+k.attachListener(k,"mouseup",function(a){2==a.data.$.button&&q&&(g.document.$.documentElement.scrollLeft=q.x,g.document.$.documentElement.scrollTop=q.y);q=null});if("BackCompat"!=e.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)m.on("mousedown",function(a){function b(a){a=a.data.$;if(c){var d=p.$.createTextRange();try{d.moveToPoint(a.clientX,a.clientY)}catch(g){}c.setEndPoint(0>e.compareEndPoints("StartToStart",d)?"EndToEnd":"StartToStart",d);c.select()}}function d(){m.removeListener("mousemove",
+b);h.removeListener("mouseup",d);m.removeListener("mouseup",d);c.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<m.$.clientHeight&&a.$.x<m.$.clientWidth){var c=p.$.createTextRange();try{c.moveToPoint(a.$.clientX,a.$.clientY)}catch(g){}var e=c.duplicate();m.on("mousemove",b);h.on("mouseup",d);m.on("mouseup",d)}});if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)m.on("mousedown",function(a){a.data.getTarget().is("html")&&(h.on("mouseup",c),m.on("mouseup",c))})}}k.attachListener(k,"selectionchange",
+a,g);k.attachListener(k,"keyup",f,g);k.attachListener(k,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){g.forceNextSelectionCheck();g.selectionChange(1)});if(t&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var w;k.attachListener(k,"mousedown",function(){w=1});k.attachListener(e.getDocumentElement(),"mouseup",function(){w&&f.call(g);w=0})}else k.attachListener(CKEDITOR.env.ie?k:e.getDocumentElement(),"mouseup",f,g);CKEDITOR.env.webkit&&k.attachListener(e,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:l(k)}},
+null,null,-1);k.attachListener(k,"keydown",d(g),null,null,-1)});g.on("setData",function(){g.unlockSelection();CKEDITOR.env.webkit&&c()});g.on("contentDomUnload",function(){g.unlockSelection()});if(CKEDITOR.env.ie9Compat)g.on("beforeDestroy",c,null,null,9);g.on("dataReady",function(){delete g._.fakeSelection;delete g._.hiddenSelectionContainer;g.selectionChange(1)});g.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=g.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&
+(b.remove(),CKEDITOR.env.gecko&&(a=g.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);g.on("key",function(a){if("wysiwyg"==g.mode){var b=g.getSelection();if(b.isFake){var d=r[a.data.keyCode];if(d)return d({editor:g,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),d=a.getCustomData("cke-fillingChar");
+d&&(d.getCustomData("ready")?l(a):d.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){l(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=k(a.data))},b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=k(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:f).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==
+this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};
+CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;var n="function"!=typeof window.getSelection,q=1;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=
+a;a=a.root}var d=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:q++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=d?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var c,g;if(a)if(a.getRangeAt)c=(g=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(g.commonAncestorContainer);else{try{g=a.createRange()}catch(e){}c=g&&CKEDITOR.dom.element.get(g.item&&
+g.item(0)||g.parentElement())}if(!c||c.type!=CKEDITOR.NODE_ELEMENT&&c.type!=CKEDITOR.NODE_TEXT||!this.root.equals(c)&&!this.root.contains(c))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var w={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1},A=CKEDITOR.tools.repeat("​",
+7),B=new RegExp(A+"( )?","g");CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:k,_createFillingCharSequenceNode:m,FILLING_CHAR_SEQUENCE:A});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=n?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:n?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var d=this.getNative(),
+c=d.type;"Text"==c&&(b=CKEDITOR.SELECTION_TEXT);"Control"==c&&(b=CKEDITOR.SELECTION_ELEMENT);d.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(g){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,d=this.getNative();if(!d||!d.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==d.rangeCount){var d=d.getRangeAt(0),c=d.startContainer;c==d.endContainer&&1==c.nodeType&&1==d.endOffset-d.startOffset&&w[c.childNodes[d.startOffset].nodeName.toLowerCase()]&&
+(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=n?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,d){b=b.duplicate();b.collapse(d);var c=b.parentElement();if(!c.hasChildNodes())return{container:c,offset:0};for(var g=c.children,e,h,f=b.duplicate(),k=0,p=g.length-1,n=-1,l,m;k<=p;)if(n=Math.floor((k+p)/2),e=g[n],f.moveToElementText(e),l=f.compareEndPoints("StartToStart",b),0<l)p=n-1;else if(0>l)k=n+1;else return{container:c,offset:a(e)};
+if(-1==n||n==g.length-1&&0>l){f.moveToElementText(c);f.setEndPoint("StartToStart",b);f=f.text.replace(/(\r\n|\r)/g,"\n").length;g=c.childNodes;if(!f)return e=g[g.length-1],e.nodeType!=CKEDITOR.NODE_TEXT?{container:c,offset:g.length}:{container:e,offset:e.nodeValue.length};for(c=g.length;0<f&&0<c;)h=g[--c],h.nodeType==CKEDITOR.NODE_TEXT&&(m=h,f-=h.nodeValue.length);return{container:m,offset:-f}}f.collapse(0<l?!0:!1);f.setEndPoint(0<l?"StartToStart":"EndToStart",b);f=f.text.replace(/(\r\n|\r)/g,"\n").length;
+if(!f)return{container:c,offset:a(e)+(0<l?0:1)};for(;0<f;)try{h=e[0<l?"previousSibling":"nextSibling"],h.nodeType==CKEDITOR.NODE_TEXT&&(f-=h.nodeValue.length,m=h),e=h}catch(r){return{container:c,offset:a(e)}}return{container:m,offset:0<l?-f:m.nodeValue.length+f}};return function(){var a=this.getNative(),d=a&&a.createRange(),c=this.getType();if(!a)return[];if(c==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),c=b(d,!0),a.setStart(new CKEDITOR.dom.node(c.container),c.offset),c=b(d),
+a.setEnd(new CKEDITOR.dom.node(c.container),c.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(c==CKEDITOR.SELECTION_ELEMENT){for(var c=[],g=0;g<d.length;g++){for(var e=d.item(g),h=e.parentNode,f=0,a=new CKEDITOR.dom.range(this.root);f<h.childNodes.length&&h.childNodes[f]!=e;f++);a.setStart(new CKEDITOR.dom.node(h),f);a.setEnd(new CKEDITOR.dom.node(h),f+1);c.push(a)}return c}return[]}}():function(){var a=
+[],b,d=this.getNative();if(!d)return a;for(var c=0;c<d.rangeCount;c++){var g=d.getRangeAt(c);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(g.startContainer),g.startOffset);b.setEnd(new CKEDITOR.dom.node(g.endContainer),g.endOffset);a.push(b)}return a};return function(b){var d=this._.cache,c=d.ranges;c||(d.ranges=c=new CKEDITOR.dom.rangeList(a.call(this)));return b?g(new CKEDITOR.dom.rangeList(c.slice())):c}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;
 var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var d=this.getRanges()[0];if(d){if(d.collapsed)b=d.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(d.optimize();b=d.startContainer,d.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)d.setStartAfter(b);b=d.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(d.startOffset))&&b.type==
-CKEDITOR.NODE_ELEMENT)for(d=b.getFirst();d&&d.type==CKEDITOR.NODE_ELEMENT;)b=d,d=d.getFirst();else b=d.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,d=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),d,c,h=2;h&&!((d=a.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&C[d.getName()]&&
-(c=d));h--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return c&&c.$});return a.selectedElement=d?new CKEDITOR.dom.element(d):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=w?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=
+CKEDITOR.NODE_ELEMENT)for(d=b.getFirst();d&&d.type==CKEDITOR.NODE_ELEMENT;)b=d,d=d.getFirst();else b=d.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,d=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),d,c,g=2;g&&!((d=a.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&w[d.getName()]&&
+(c=d));g--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return c&&c.$});return a.selectedElement=d?new CKEDITOR.dom.element(d):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=n?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=
 this.getSelectedElement(),d=!b&&this.getRanges(),c=this.isFake;this.isLocked=0;this.reset();a&&(a=b||d[0]&&d[0].getCommonAncestor())&&a.getAscendant("body",1)&&(c?this.fake(b):b?this.selectElement(b):this.selectRanges(d))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var d=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!d&&
-a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=y++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,d,c=0;c<a.length;++c)d=a[c],d.endContainer.equals(b)&&(d.endOffset=Math.min(d.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var h=CKEDITOR.document.getActive();
-this.unlock();this.selectRanges(a);this.lock();h&&!h.equals(this.root)&&h.focus()}else{var e;a:{var g,k;if(1==a.length&&!(k=a[0]).collapsed&&(e=k.getEnclosedNode())&&e.type==CKEDITOR.NODE_ELEMENT&&(k=k.clone(),k.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(g=k.getEnclosedNode())&&g.type==CKEDITOR.NODE_ELEMENT&&(e=g),"false"==e.getAttribute("contenteditable")))break a;e=void 0}if(e)this.fake(e);else{if(w){k=CKEDITOR.dom.walker.whitespaces(!0);g=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(e=a[a.length-
-1],a[0].setEnd(e.endContainer,e.endOffset));e=a[0];a=e.collapsed;var p,n,m;if((d=e.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in C&&(!d.is("a")||!d.getText()))try{m=d.$.createControlRange();m.addElement(d.$);m.select();return}catch(E){}if(e.startContainer.type==CKEDITOR.NODE_ELEMENT&&e.startContainer.getName()in b||e.endContainer.type==CKEDITOR.NODE_ELEMENT&&e.endContainer.getName()in b)e.shrink(CKEDITOR.NODE_ELEMENT,!0),a=e.collapsed;m=e.createBookmark();b=m.startNode;a||(h=m.endNode);
-m=e.document.$.body.createTextRange();m.moveToElementText(b.$);m.moveStart("character",1);h?(g=e.document.$.body.createTextRange(),g.moveToElementText(h.$),m.setEndPoint("EndToEnd",g),m.moveEnd("character",-1)):(p=b.getNext(k),n=b.hasAscendant("pre"),p=!(p&&p.getText&&p.getText().match(g))&&(n||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),n=e.document.createElement("span"),n.setHtml("\x26#65279;"),n.insertBefore(b),p&&e.document.createText("").insertBefore(b));e.setStartBefore(b);
-b.remove();a?(p?(m.moveStart("character",-1),m.select(),e.document.$.selection.clear()):m.select(),e.moveToPosition(n,CKEDITOR.POSITION_BEFORE_START),n.remove()):(e.setEndBefore(h),h.remove(),m.select())}else{h=this.getNative();if(!h)return;this.removeAllRanges();for(m=0;m<a.length;m++){if(m<a.length-1&&(p=a[m],n=a[m+1],g=p.clone(),g.setStart(p.endContainer,p.endOffset),g.setEnd(n.startContainer,n.startOffset),!g.collapsed&&(g.shrink(CKEDITOR.NODE_ELEMENT,!0),e=g.getCommonAncestor(),g=g.getEnclosedNode(),
-e.isReadOnly()||g&&g.isReadOnly()))){n.setStart(p.startContainer,p.startOffset);a.splice(m--,1);continue}e=a[m];n=this.document.$.createRange();e.collapsed&&CKEDITOR.env.webkit&&f(e)&&(p=this.root,l(p,!1),g=p.getDocument().createText("​"),p.setCustomData("cke-fillingChar",g),e.insertNode(g),(p=g.getNext())&&!g.getPrevious()&&p.type==CKEDITOR.NODE_ELEMENT&&"br"==p.getName()?(l(this.root),e.moveToPosition(p,CKEDITOR.POSITION_BEFORE_START)):e.moveToPosition(g,CKEDITOR.POSITION_AFTER_END));n.setStart(e.startContainer.$,
-e.startOffset);try{n.setEnd(e.endContainer.$,e.endOffset)}catch(t){if(0<=t.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))e.collapse(1),n.setEnd(e.endContainer.$,e.endOffset);else throw t;}h.addRange(n)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a){var b=this.root.editor;this.reset();h(b);var d=this._.cache,c=new CKEDITOR.dom.range(this.root);c.setStartBefore(a);c.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(c);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;
-d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=y++;b._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=
-[],d,c=0;c<a.length;c++){var h=new CKEDITOR.dom.range(this.root);h.moveToBookmark(a[c]);b.push(h)}a.isFake&&(d=b[0].getEnclosedNode(),d&&d.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(d):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},
-removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[w?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}}(),"use strict",CKEDITOR.STYLE_BLOCK=1,CKEDITOR.STYLE_INLINE=2,CKEDITOR.STYLE_OBJECT=3,function(){function a(a,b){for(var d,c;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))d=a;else if(!c){var h=a.getAttribute("contentEditable");"false"==h?d=a:"true"==h&&(c=1)}return d}function e(a,b,d,c){return(a.getPosition(b)|c)==c&&
-(!d.childRule||d.childRule(a))}function c(b){var d=b.document;if(b.collapsed)d=w(this,d),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_BEFORE_END);else{var h=this.element,g=this._.definition,k,p=g.ignoreReadonly,n=p||g.includeReadonly;null==n&&(n=b.root.getCustomData("cke_includeReadonly"));var l=CKEDITOR.dtd[h];l||(k=!0,l=CKEDITOR.dtd.span);b.enlarge(CKEDITOR.ENLARGE_INLINE,1);b.trim();var m=b.createBookmark(),q=m.startNode,u=m.endNode,v=q,r;if(!p){var y=b.getCommonAncestor(),p=a(q,y),y=a(u,
-y);p&&(v=p.getNextSourceNode(!0));y&&(u=y)}for(v.getPosition(u)==CKEDITOR.POSITION_FOLLOWING&&(v=0);v;){p=!1;if(v.equals(u))v=null,p=!0;else{var C=v.type==CKEDITOR.NODE_ELEMENT?v.getName():null,y=C&&"false"==v.getAttribute("contentEditable"),x=C&&v.getAttribute("data-nostyle");if(C&&v.data("cke-bookmark")){v=v.getNextSourceNode(!0);continue}if(y&&n&&CKEDITOR.dtd.$block[C])for(var B=v,z=f(B),A=void 0,D=z.length,G=0,B=D&&new CKEDITOR.dom.range(B.getDocument());G<D;++G){var A=z[G],ga=CKEDITOR.filter.instances[A.data("cke-filter")];
-if(ga?ga.check(this):1)B.selectNodeContents(A),c.call(this,B)}z=C?!l[C]||x?0:y&&!n?0:e(v,u,g,I):1;if(z)if(A=v.getParent(),z=g,D=h,G=k,!A||!(A.getDtd()||CKEDITOR.dtd.span)[D]&&!G||z.parentRule&&!z.parentRule(A))p=!0;else{if(r||C&&CKEDITOR.dtd.$removeEmpty[C]&&(v.getPosition(u)|I)!=I||(r=b.clone(),r.setStartBefore(v)),C=v.type,C==CKEDITOR.NODE_TEXT||y||C==CKEDITOR.NODE_ELEMENT&&!v.getChildCount()){for(var C=v,fa;(p=!C.getNext(F))&&(fa=C.getParent(),l[fa.getName()])&&e(fa,q,g,N);)C=fa;r.setEndAfter(C)}}else p=
-!0;v=v.getNextSourceNode(x||y)}if(p&&r&&!r.collapsed){for(var p=w(this,d),y=p.hasAttributes(),x=r.getCommonAncestor(),C={},z={},A={},D={},J,Z,ha;p&&x;){if(x.getName()==h){for(J in g.attributes)!D[J]&&(ha=x.getAttribute(Z))&&(p.getAttribute(J)==ha?z[J]=1:D[J]=1);for(Z in g.styles)!A[Z]&&(ha=x.getStyle(Z))&&(p.getStyle(Z)==ha?C[Z]=1:A[Z]=1)}x=x.getParent()}for(J in z)p.removeAttribute(J);for(Z in C)p.removeStyle(Z);y&&!p.hasAttributes()&&(p=null);p?(r.extractContents().appendTo(p),r.insertNode(p),t.call(this,
-p),p.mergeSiblings(),CKEDITOR.env.ie||p.$.normalize()):(p=new CKEDITOR.dom.element("span"),r.extractContents().appendTo(p),r.insertNode(p),t.call(this,p),p.remove(!0));r=null}}b.moveToBookmark(m);b.shrink(CKEDITOR.SHRINK_TEXT);b.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function g(a){function b(){for(var a=new CKEDITOR.dom.elementPath(c.getParent()),d=new CKEDITOR.dom.elementPath(p.getParent()),h=null,f=null,e=0;e<a.elements.length;e++){var g=a.elements[e];if(g==a.block||g==a.blockLimit)break;l.checkElementRemovable(g,
-!0)&&(h=g)}for(e=0;e<d.elements.length;e++){g=d.elements[e];if(g==d.block||g==d.blockLimit)break;l.checkElementRemovable(g,!0)&&(f=g)}f&&p.breakParent(f);h&&c.breakParent(h)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var d=a.createBookmark(),c=d.startNode;if(a.collapsed){for(var h=new CKEDITOR.dom.elementPath(c.getParent(),a.root),f,e=0,g;e<h.elements.length&&(g=h.elements[e])&&g!=h.block&&g!=h.blockLimit;e++)if(this.checkElementRemovable(g)){var k;a.collapsed&&(a.checkBoundaryOfElement(g,CKEDITOR.END)||
-(k=a.checkBoundaryOfElement(g,CKEDITOR.START)))?(f=g,f.match=k?"start":"end"):(g.mergeSiblings(),g.is(this.element)?u.call(this,g):n(g,r(this)[g.getName()]))}if(f){g=c;for(e=0;;e++){k=h.elements[e];if(k.equals(f))break;else if(k.match)continue;else k=k.clone();k.append(g);g=k}g["start"==f.match?"insertBefore":"insertAfter"](f)}}else{var p=d.endNode,l=this;b();for(h=c;!h.equals(p);)f=h.getNextSourceNode(),h.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(h)&&(h.getName()==this.element?u.call(this,
-h):n(h,r(this)[h.getName()]),f.type==CKEDITOR.NODE_ELEMENT&&f.contains(c)&&(b(),f=c.getNext())),h=f}a.moveToBookmark(d);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function f(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function m(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&y(a,this)}function l(a){var b=a.getCommonAncestor(!0,
-!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,d=b.attributes;if(d)for(var c in d)a.removeAttribute(c,d[c]);if(b.styles)for(var h in b.styles)b.styles.hasOwnProperty(h)&&a.removeStyle(h)}}function k(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var h,f=a.document,e;h=c.getNextParagraph();)!h.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):
-1)&&(e=w(this,f,h),d(h,e));a.moveToBookmark(b)}function b(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var h,f;h=c.getNextParagraph();)this.checkElementRemovable(h)&&(h.is("pre")?((f=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&h.copyAttributes(f),d(h,f)):u.call(this,h));a.moveToBookmark(b)}function d(a,b){var d=!b;d&&(b=a.getDocument().createElement("div"),
-a.copyAttributes(b));var c=b&&b.is("pre"),f=a.is("pre"),e=!c&&f;if(c&&!f){f=b;(e=a.getBogus())&&e.remove();e=a.getHtml();e=p(e,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");e=e.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");e=e.replace(/([ \t\n\r]+|&nbsp;)/g," ");e=e.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var g=a.getDocument().createElement("div");g.append(f);f.$.outerHTML="\x3cpre\x3e"+e+"\x3c/pre\x3e";f.copyAttributes(g.getFirst());f=g.getFirst().remove()}else f.setHtml(e);b=f}else e?b=v(d?
-[a.getHtml()]:h(a),b):a.moveChildren(b);b.replace(a);if(c){var d=b,k;(k=d.getPrevious(J))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(c=p(k.getHtml(),/\n$/,"")+"\n\n"+p(d.getHtml(),/^\n/,""),CKEDITOR.env.ie?d.$.outerHTML="\x3cpre\x3e"+c+"\x3c/pre\x3e":d.setHtml(c),k.remove())}else d&&q(b)}function h(a){var b=[];p(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,d){return b+"\x3c/pre\x3e"+d+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,
-d){b.push(d)});return b}function p(a,b,d){var c="",h="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,d){b&&(c=b);d&&(h=d);return""});return c+a.replace(b,d)+h}function v(a,b){var d;1<a.length&&(d=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var c=0;c<a.length;c++){var h=a[c],h=h.replace(/(\r\n|\r)/g,"\n"),h=p(h,/^[ \t]*\n/,""),h=p(h,/\n$/,""),h=p(h,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",
-a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),h=h.replace(/\n/g,"\x3cbr\x3e"),h=h.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(d){var f=b.clone();f.setHtml(h);d.append(f)}else b.setHtml(h)}return d||b}function u(a,b){var d=this._.definition,c=d.attributes,d=d.styles,h=r(this)[a.getName()],f=CKEDITOR.tools.isEmpty(c)&&CKEDITOR.tools.isEmpty(d),e;for(e in c)if("class"!=e&&!this._.definition.fullMatch||a.getAttribute(e)==x(e,c[e]))b&&
-"data-"==e.slice(0,5)||(f=a.hasAttribute(e),a.removeAttribute(e));for(var g in d)this._.definition.fullMatch&&a.getStyle(g)!=x(g,d[g],!0)||(f=f||!!a.getStyle(g),a.removeStyle(g));n(a,h,A[a.getName()]);f&&(this._.definition.alwaysRemoveElement?q(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?q(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function t(a){for(var b=r(this),d=a.getElementsByTag(this.element),c,h=d.count();0<=--h;)c=d.getItem(h),
-c.isReadOnly()||u.call(this,c,!0);for(var f in b)if(f!=this.element)for(d=a.getElementsByTag(f),h=d.count()-1;0<=h;h--)c=d.getItem(h),c.isReadOnly()||n(c,b[f])}function n(a,b,d){if(b=b&&b.attributes)for(var c=0;c<b.length;c++){var h=b[c][0],f;if(f=a.getAttribute(h)){var e=b[c][1];(null===e||e.test&&e.test(f)||"string"==typeof e&&f==e)&&a.removeAttribute(h)}}d||q(a)}function q(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var d=a.getPrevious(J),c=a.getNext(J);!d||d.type!=CKEDITOR.NODE_TEXT&&
-d.isBlockBoundary({br:1})||a.append("br",1);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else d=a.getFirst(),c=a.getLast(),a.remove(!0),d&&(d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings(),c&&!d.equals(c)&&c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings())}function w(a,b,d){var c;c=a.element;"*"==c&&(c="span");c=new CKEDITOR.dom.element(c,b);d&&d.copyAttributes(c);c=y(c,a);b.getCustomData("doc_processing_style")&&c.hasAttribute("id")?c.removeAttribute("id"):
-b.setCustomData("doc_processing_style",1);return c}function y(a,b){var d=b._.definition,c=d.attributes,d=CKEDITOR.style.getStyleText(d);if(c)for(var h in c)a.setAttribute(h,c[h]);d&&a.setAttribute("style",d);return a}function C(a,b){for(var d in a)a[d]=a[d].replace(G,function(a,d){return b[d]})}function r(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},d=a._.definition.overrides;if(d){CKEDITOR.tools.isArray(d)||(d=[d]);for(var c=0;c<d.length;c++){var h=d[c],f,e;"string"==typeof h?
-f=h.toLowerCase():(f=h.element?h.element.toLowerCase():a.element,e=h.attributes);h=b[f]||(b[f]={});if(e){var h=h.attributes=h.attributes||[],g;for(g in e)h.push([g.toLowerCase(),e[g]])}}}return b}function x(a,b,d){var c=new CKEDITOR.dom.element("span");c[d?"setStyle":"setAttribute"](a,b);return c[d?"getStyle":"getAttribute"](a)}function B(a,b,d){var c=a.document,h=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var f,e=h.createIterator();f=e.getNextRange();)b.call(this,f,d);a.selectRanges(h);
-c.removeCustomData("doc_processing_style")}var A={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},z={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},D=/\s*(?:;\s*|$)/,G=/#\((.+?)\)/g,F=CKEDITOR.dom.walker.bookmark(0,1),J=CKEDITOR.dom.walker.whitespaces(1);
-CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var d=a.attributes;d&&d.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(d.style)),delete d.style);b&&(a=CKEDITOR.tools.clone(a),C(a.attributes,b),C(a.styles,b));d=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(A[d]?CKEDITOR.STYLE_BLOCK:z[d]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&
-(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return B.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);B.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return B.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;
-b||(this._.enterMode=a.activeEnterMode);B.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?m:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?g:this.type==CKEDITOR.STYLE_BLOCK?b:this.type==CKEDITOR.STYLE_OBJECT?l:null;return this.removeFromRange(a)},applyToObject:function(a){y(a,this)},
-checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var d=a.elements,c=0,h;c<d.length;c++)if(h=d[c],this.type!=CKEDITOR.STYLE_INLINE||h!=a.block&&h!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=h.getName();if(!("string"==typeof this.element?f==this.element:f in this.element))continue}if(this.checkElementRemovable(h,!0,b))return!0}}return!1},checkApplicable:function(a,
-b,d){b&&b instanceof CKEDITOR.filter&&(d=b);if(d&&!d.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var d=this._.definition;if(!a||!d.ignoreReadonly&&a.isReadOnly())return!1;var c=a.getName();if("string"==typeof this.element?c==this.element:c in this.element){if(!b&&!a.hasAttributes())return!0;if(c=d._AC)d=c;else{var c={},h=0,f=d.attributes;
-if(f)for(var e in f)h++,c[e]=f[e];if(e=CKEDITOR.style.getStyleText(d))c.style||h++,c.style=e;c._length=h;d=d._AC=c}if(d._length){for(var g in d)if("_length"!=g){h=a.getAttribute(g)||"";if("style"==g)a:{c=d[g];"string"==typeof c&&(c=CKEDITOR.tools.parseCssText(c));"string"==typeof h&&(h=CKEDITOR.tools.parseCssText(h,!0));e=void 0;for(e in c)if(!(e in h)||h[e]!=c[e]&&"inherit"!=c[e]&&"inherit"!=h[e]){c=!1;break a}c=!0}else c=d[g]==h;if(c){if(!b)return!0}else if(b)return!1}if(b)return!0}else return!0}return!1},
-checkElementRemovable:function(a,b,d){if(this.checkElementMatch(a,b,d))return!0;if(b=r(this)[a.getName()]){var c;if(!(b=b.attributes))return!0;for(d=0;d<b.length;d++)if(c=b[d][0],c=a.getAttribute(c)){var h=b[d][1];if(null===h)return!0;if("string"==typeof h){if(c==h)return!0}else if(h.test(c))return!0}}return!1},buildPreview:function(a){var b=this._.definition,d=[],c=b.element;"bdo"==c&&(c="span");var d=["\x3c",c],h=b.attributes;if(h)for(var f in h)d.push(" ",f,'\x3d"',h[f],'"');(h=CKEDITOR.style.getStyleText(b))&&
-d.push(' style\x3d"',h,'"');d.push("\x3e",a||b.name,"\x3c/",c,"\x3e");return d.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,d=a.attributes&&a.attributes.style||"",c="";d.length&&(d=d.replace(D,";"));for(var h in b){var f=b[h],e=(h+":"+f).replace(D,";");"inherit"==f?c+=e:d+=e}d.length&&(d=CKEDITOR.tools.normalizeCssText(d,!0));return a._ST=d+c};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=
-function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var I=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,N=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED}(),CKEDITOR.styleCommand=function(a,e){this.requiredContent=this.allowedContent=
-this.style=a;CKEDITOR.tools.extend(this,e,!0)},CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)},CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet"),CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet),CKEDITOR.loadStylesSet=function(a,e,c){CKEDITOR.stylesSet.addExternal(a,e,"");CKEDITOR.stylesSet.load(a,c)},CKEDITOR.tools.extend(CKEDITOR.editor.prototype,
-{attachStyleStateChange:function(a,e){var c=this._.styleStateChangeCallbacks;c||(c=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var f=0;f<c.length;f++){var e=c[f],l=e.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;e.fn.call(this,l)}}));c.push({style:a,fn:e})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);else{var e=this,c=
-e.config.stylesCombo_stylesSet||e.config.stylesSet;if(!1===c)a(null);else if(c instanceof Array)e._.stylesDefinitions=c,a(c);else{c||(c="default");var c=c.split(":"),g=c[0];CKEDITOR.stylesSet.addExternal(g,c[1]?c.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(g,function(c){e._.stylesDefinitions=c[g];a(e._.stylesDefinitions)})}}}}),CKEDITOR.dom.comment=function(a,e){"string"==typeof a&&(a=(e?e.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.comment.prototype=
-new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}}),"use strict",function(){var a={},e={},c;for(c in CKEDITOR.dtd.$blockLimit)c in CKEDITOR.dtd.$list||(a[c]=1);for(c in CKEDITOR.dtd.$block)c in CKEDITOR.dtd.$blockLimit||c in CKEDITOR.dtd.$empty||(e[c]=1);CKEDITOR.dom.elementPath=function(c,f){var m=null,l=null,k=[],b=c,d;f=f||c.getDocument().getBody();do if(b.type==CKEDITOR.NODE_ELEMENT){k.push(b);
-if(!this.lastElement&&(this.lastElement=b,b.is(CKEDITOR.dtd.$object)||"false"==b.getAttribute("contenteditable")))continue;if(b.equals(f))break;if(!l&&(d=b.getName(),"true"==b.getAttribute("contenteditable")?l=b:!m&&e[d]&&(m=b),a[d])){if(d=!m&&"div"==d){a:{d=b.getChildren();for(var h=0,p=d.count();h<p;h++){var v=d.getItem(h);if(v.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[v.getName()]){d=!0;break a}}d=!1}d=!d}d?m=b:l=b}}while(b=b.getParent());l||(l=f);this.block=m;this.blockLimit=l;this.root=
-f;this.elements=k}}(),CKEDITOR.dom.elementPath.prototype={compare:function(a){var e=this.elements;a=a&&a.elements;if(!a||e.length!=a.length)return!1;for(var c=0;c<e.length;c++)if(!e[c].equals(a[c]))return!1;return!0},contains:function(a,e,c){var g;"string"==typeof a&&(g=function(c){return c.getName()==a});a instanceof CKEDITOR.dom.element?g=function(c){return c.equals(a)}:CKEDITOR.tools.isArray(a)?g=function(c){return-1<CKEDITOR.tools.indexOf(a,c.getName())}:"function"==typeof a?g=a:"object"==typeof a&&
-(g=function(c){return c.getName()in a});var f=this.elements,m=f.length;e&&m--;c&&(f=Array.prototype.slice.call(f,0),f.reverse());for(e=0;e<m;e++)if(g(f[e]))return f[e];return null},isContextFor:function(a){var e;return a in CKEDITOR.dtd.$block?(e=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!e.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}},CKEDITOR.dom.text=function(a,e){"string"==typeof a&&
-(a=(e?e.$:document).createTextNode(a));this.$=a},CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var e=this.$.parentNode,c=e.childNodes.length,g=this.getLength(),f=this.getDocument(),m=new CKEDITOR.dom.text(this.$.splitText(a),f);e.childNodes.length==c&&(a>=g?(m=f.createText(""),
-m.insertAfter(this)):(a=f.createText(""),a.insertAfter(m),a.remove()));return m},substring:function(a,e){return"number"!=typeof e?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,e)}}),function(){function a(a,e,f){var m=a.serializable,l=e[f?"endContainer":"startContainer"],k=f?"endOffset":"startOffset",b=m?e.document.getById(a.startNode):a.startNode;a=m?e.document.getById(a.endNode):a.endNode;l.equals(b.getPrevious())?(e.startOffset=e.startOffset-l.getLength()-a.getPrevious().getLength(),l=
-a.getNext()):l.equals(a.getPrevious())&&(e.startOffset-=l.getLength(),l=a.getNext());l.equals(b.getParent())&&e[k]++;l.equals(a.getParent())&&e[k]++;e[f?"endContainer":"startContainer"]=l;return e}CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,e)};var e={createIterator:function(){var a=this,e=CKEDITOR.dom.walker.bookmark(),f=[],m;return{getNextRange:function(l){m=void 0===m?0:m+1;var k=
-a[m];if(k&&1<a.length){if(!m)for(var b=a.length-1;0<=b;b--)f.unshift(a[b].createBookmark(!0));if(l)for(var d=0;a[m+d+1];){var h=k.document;l=0;b=h.getById(f[d].endNode);for(h=h.getById(f[d+1].startNode);;){b=b.getNextSourceNode(!1);if(h.equals(b))l=1;else if(e(b)||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary())continue;break}if(!l)break;d++}for(k.moveToBookmark(f.shift());d--;)b=a[++m],b.moveToBookmark(f.shift()),k.setEnd(b.endContainer,b.endOffset)}return k}}},createBookmarks:function(c){for(var e=
-[],f,m=0;m<this.length;m++){e.push(f=this[m].createBookmark(c,!0));for(var l=m+1;l<this.length;l++)this[l]=a(f,this[l]),this[l]=a(f,this[l],!0)}return e},createBookmarks2:function(a){for(var e=[],f=0;f<this.length;f++)e.push(this[f].createBookmark2(a));return e},moveToBookmarks:function(a){for(var e=0;e<this.length;e++)this[e].moveToBookmark(a[e])}}}(),function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function e(b){var c=
-CKEDITOR.skin["ua_"+b],f=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),e=0,g;e<c.length;e++)if(g=c[e],f.ie&&(g.replace(/^ie/,"")==f.version||f.quirks&&"iequirks"==g)&&(g="ie"),f[g]){b+="_"+c[e];break}return CKEDITOR.getUrl(a()+b+".css")}function c(a,b){m[a]||(CKEDITOR.document.appendStyleSheet(e(a)),m[a]=1);b&&b()}function g(a){var b=a.getById(l);b||(b=a.getHead().append("style"),b.setAttribute("id",l),b.setAttribute("type","text/css"));return b}function f(a,b,c){var f,
-e,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var k=0;k<a.length;k++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){g=b[e][1];for(f=0;f<c.length;f++)g=g.replace(c[f][0],c[f][1]);a[k].$.sheet.addRule(b[e][0],g)}else{g=b;for(f=0;f<c.length;f++)g=g.replace(c[f][0],c[f][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?a[k].$.styleSheet.cssText+=g:a[k].$.innerHTML+=g}}var m={};CKEDITOR.skin={path:a,loadPart:function(b,h){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?
-CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){c(b,h)}):c(b,h)},getPath:function(a){return CKEDITOR.getUrl(e(a))},icons:{},addIcon:function(a,b,c,f){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:f||"16px"})},getIconStyle:function(a,b,c,f,e){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),g||(g=this.icons[a]));a=c||g&&g.path||"";f=f||g&&g.offset;e=e||g&&g.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+
-"');background-position:0 "+f+"px;background-size:"+e+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var c=g(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var d=CKEDITOR.skin.chameleon,e="",g="";"function"==typeof d&&(e=d(this,"editor"),g=d(this,"panel"));a=[[b,a]];f([c],e,a);f(k,g,a)}).call(this,a)}});var l="cke_ui_color",k=[],b=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||
-!CKEDITOR.env.quirks){var c=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=g(a);k.push(a);var d=c.getUiColor();d&&f([a],CKEDITOR.skin.chameleon(c,"panel"),[[b,d]])}};c.on("panelShow",a);c.on("menuShow",a);c.config.uiColor&&c.setUiColor(c.config.uiColor)}})}(),function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',
-CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var e=a.getComputedStyle("border-top-color"),c=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!e||e!=c)}catch(g){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,e=0;e<a.length;e++)CKEDITOR.editor.prototype.constructor.apply(a[e][0],
-a[e][1]),CKEDITOR.add(a[e][0])}(),CKEDITOR.skin.name="moono",CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8,gecko",CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8",CKEDITOR.skin.chameleon=function(){var a=function(){return function(a,c){for(var e=a.match(/[^#]./g),l=0;3>l;l++){var k=l,b;b=parseInt(e[l],16);b=("0"+(0>c?0|b*(1+c):0|b+(255-b)*c).toString(16)).slice(-2);e[k]=b}return"#"+e.join("")}}(),e=function(){var a=new CKEDITOR.template("background:#{to};background-image:linear-gradient(to bottom,{from},{to});filter:progid:DXImageTransform.Microsoft.gradient(gradientType\x3d0,startColorstr\x3d'{from}',endColorstr\x3d'{to}');");
-return function(c,e){return a.output({from:c,to:e})}}(),c={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ {defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_bottom [{defaultGradient}border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [{defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [{defaultGradient}outline-color:{defaultBorder};border-top-color:{defaultBorder};] {id} .cke_dialog_tab [{lightGradient}border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [{mediumGradient}] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} .cke_toolgroup [{lightGradient}border-color:{defaultBorder};] {id} a.cke_button_off:hover, {id} a.cke_button_off:focus, {id} a.cke_button_off:active [{mediumGradient}] {id} .cke_button_on [{ckeButtonOn}] {id} .cke_toolbar_separator [background-color: {ckeToolbarSeparator};] {id} .cke_combo_button [border-color:{defaultBorder};{lightGradient}] {id} a.cke_combo_button:hover, {id} a.cke_combo_button:focus, {id} .cke_combo_on a.cke_combo_button [border-color:{defaultBorder};{mediumGradient}] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover, {id} a.cke_path_item:focus, {id} a.cke_path_item:active [background-color:{elementsPathBg};] {id}.cke_panel [border-color:{defaultBorder};] "),
+a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=q++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,d,c=0;c<a.length;++c)d=a[c],d.endContainer.equals(b)&&(d.endOffset=Math.min(d.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var g=CKEDITOR.document.getActive();
+this.unlock();this.selectRanges(a);this.lock();g&&!g.equals(this.root)&&g.focus()}else{var e;a:{var f,k;if(1==a.length&&!(k=a[0]).collapsed&&(e=k.getEnclosedNode())&&e.type==CKEDITOR.NODE_ELEMENT&&(k=k.clone(),k.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(f=k.getEnclosedNode())&&f.type==CKEDITOR.NODE_ELEMENT&&(e=f),"false"==e.getAttribute("contenteditable")))break a;e=void 0}if(e)this.fake(e);else{if(n){k=CKEDITOR.dom.walker.whitespaces(!0);f=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(e=a[a.length-
+1],a[0].setEnd(e.endContainer,e.endOffset));e=a[0];a=e.collapsed;var p,r,q;if((d=e.getEnclosedNode())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in w&&(!d.is("a")||!d.getText()))try{q=d.$.createControlRange();q.addElement(d.$);q.select();return}catch(F){}if(e.startContainer.type==CKEDITOR.NODE_ELEMENT&&e.startContainer.getName()in b||e.endContainer.type==CKEDITOR.NODE_ELEMENT&&e.endContainer.getName()in b)e.shrink(CKEDITOR.NODE_ELEMENT,!0),a=e.collapsed;q=e.createBookmark();b=q.startNode;a||(g=q.endNode);
+q=e.document.$.body.createTextRange();q.moveToElementText(b.$);q.moveStart("character",1);g?(f=e.document.$.body.createTextRange(),f.moveToElementText(g.$),q.setEndPoint("EndToEnd",f),q.moveEnd("character",-1)):(p=b.getNext(k),r=b.hasAscendant("pre"),p=!(p&&p.getText&&p.getText().match(f))&&(r||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),r=e.document.createElement("span"),r.setHtml("\x26#65279;"),r.insertBefore(b),p&&e.document.createText("").insertBefore(b));e.setStartBefore(b);
+b.remove();a?(p?(q.moveStart("character",-1),q.select(),e.document.$.selection.clear()):q.select(),e.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START),r.remove()):(e.setEndBefore(g),g.remove(),q.select())}else{g=this.getNative();if(!g)return;this.removeAllRanges();for(q=0;q<a.length;q++){if(q<a.length-1&&(p=a[q],r=a[q+1],f=p.clone(),f.setStart(p.endContainer,p.endOffset),f.setEnd(r.startContainer,r.startOffset),!f.collapsed&&(f.shrink(CKEDITOR.NODE_ELEMENT,!0),e=f.getCommonAncestor(),f=f.getEnclosedNode(),
+e.isReadOnly()||f&&f.isReadOnly()))){r.setStart(p.startContainer,p.startOffset);a.splice(q--,1);continue}e=a[q];r=this.document.$.createRange();e.collapsed&&CKEDITOR.env.webkit&&h(e)&&(f=m(this.root),e.insertNode(f),(p=f.getNext())&&!f.getPrevious()&&p.type==CKEDITOR.NODE_ELEMENT&&"br"==p.getName()?(l(this.root),e.moveToPosition(p,CKEDITOR.POSITION_BEFORE_START)):e.moveToPosition(f,CKEDITOR.POSITION_AFTER_END));r.setStart(e.startContainer.$,e.startOffset);try{r.setEnd(e.endContainer.$,e.endOffset)}catch(u){if(0<=
+u.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))e.collapse(1),r.setEnd(e.endContainer.$,e.endOffset);else throw u;}g.addRange(r)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a){var d=this.root.editor;this.reset();b(d);var c=this._.cache,g=new CKEDITOR.dom.range(this.root);g.setStartBefore(a);g.setEndAfter(a);c.ranges=new CKEDITOR.dom.rangeList(g);c.selectedElement=c.startElement=a;c.type=CKEDITOR.SELECTION_ELEMENT;c.selectedText=c.nativeSel=null;this.isFake=1;this.rev=q++;d._.fakeSelection=
+this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],d,c=0;c<a.length;c++){var g=new CKEDITOR.dom.range(this.root);g.moveToBookmark(a[c]);
+b.push(g)}a.isFake&&(d=b[0].getEnclosedNode(),d&&d.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(d):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=
+this.getNative();try{a&&a[n?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}}(),"use strict",CKEDITOR.STYLE_BLOCK=1,CKEDITOR.STYLE_INLINE=2,CKEDITOR.STYLE_OBJECT=3,function(){function a(a,b){for(var d,c;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))d=a;else if(!c){var g=a.getAttribute("contentEditable");"false"==g?d=a:"true"==g&&(c=1)}return d}function f(a,b,d,c){return(a.getPosition(b)|c)==c&&(!d.childRule||d.childRule(a))}function c(b){var d=b.document;if(b.collapsed)d=
+w(this,d),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,e=this._.definition,k,p=e.ignoreReadonly,n=p||e.includeReadonly;null==n&&(n=b.root.getCustomData("cke_includeReadonly"));var l=CKEDITOR.dtd[g];l||(k=!0,l=CKEDITOR.dtd.span);b.enlarge(CKEDITOR.ENLARGE_INLINE,1);b.trim();var m=b.createBookmark(),q=m.startNode,u=m.endNode,v=q,t;if(!p){var A=b.getCommonAncestor(),p=a(q,A),A=a(u,A);p&&(v=p.getNextSourceNode(!0));A&&(u=A)}for(v.getPosition(u)==CKEDITOR.POSITION_FOLLOWING&&
+(v=0);v;){p=!1;if(v.equals(u))v=null,p=!0;else{var B=v.type==CKEDITOR.NODE_ELEMENT?v.getName():null,A=B&&"false"==v.getAttribute("contentEditable"),x=B&&v.getAttribute("data-nostyle");if(B&&v.data("cke-bookmark")){v=v.getNextSourceNode(!0);continue}if(A&&n&&CKEDITOR.dtd.$block[B])for(var D=v,z=h(D),y=void 0,C=z.length,G=0,D=C&&new CKEDITOR.dom.range(D.getDocument());G<C;++G){var y=z[G],ga=CKEDITOR.filter.instances[y.data("cke-filter")];if(ga?ga.check(this):1)D.selectNodeContents(y),c.call(this,D)}z=
+B?!l[B]||x?0:A&&!n?0:f(v,u,e,I):1;if(z)if(y=v.getParent(),z=e,C=g,G=k,!y||!(y.getDtd()||CKEDITOR.dtd.span)[C]&&!G||z.parentRule&&!z.parentRule(y))p=!0;else{if(t||B&&CKEDITOR.dtd.$removeEmpty[B]&&(v.getPosition(u)|I)!=I||(t=b.clone(),t.setStartBefore(v)),B=v.type,B==CKEDITOR.NODE_TEXT||A||B==CKEDITOR.NODE_ELEMENT&&!v.getChildCount()){for(var B=v,fa;(p=!B.getNext(E))&&(fa=B.getParent(),l[fa.getName()])&&f(fa,q,e,N);)B=fa;t.setEndAfter(B)}}else p=!0;v=v.getNextSourceNode(x||A)}if(p&&t&&!t.collapsed){for(var p=
+w(this,d),A=p.hasAttributes(),x=t.getCommonAncestor(),B={},z={},y={},C={},J,Z,ha;p&&x;){if(x.getName()==g){for(J in e.attributes)!C[J]&&(ha=x.getAttribute(Z))&&(p.getAttribute(J)==ha?z[J]=1:C[J]=1);for(Z in e.styles)!y[Z]&&(ha=x.getStyle(Z))&&(p.getStyle(Z)==ha?B[Z]=1:y[Z]=1)}x=x.getParent()}for(J in z)p.removeAttribute(J);for(Z in B)p.removeStyle(Z);A&&!p.hasAttributes()&&(p=null);p?(t.extractContents().appendTo(p),t.insertNode(p),r.call(this,p),p.mergeSiblings(),CKEDITOR.env.ie||p.$.normalize()):
+(p=new CKEDITOR.dom.element("span"),t.extractContents().appendTo(p),t.insertNode(p),r.call(this,p),p.remove(!0));t=null}}b.moveToBookmark(m);b.shrink(CKEDITOR.SHRINK_TEXT);b.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function e(a){function b(){for(var a=new CKEDITOR.dom.elementPath(c.getParent()),d=new CKEDITOR.dom.elementPath(p.getParent()),g=null,e=null,h=0;h<a.elements.length;h++){var f=a.elements[h];if(f==a.block||f==a.blockLimit)break;l.checkElementRemovable(f,!0)&&(g=f)}for(h=0;h<d.elements.length;h++){f=
+d.elements[h];if(f==d.block||f==d.blockLimit)break;l.checkElementRemovable(f,!0)&&(e=f)}e&&p.breakParent(e);g&&c.breakParent(g)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var d=a.createBookmark(),c=d.startNode;if(a.collapsed){for(var g=new CKEDITOR.dom.elementPath(c.getParent(),a.root),e,h=0,f;h<g.elements.length&&(f=g.elements[h])&&f!=g.block&&f!=g.blockLimit;h++)if(this.checkElementRemovable(f)){var k;a.collapsed&&(a.checkBoundaryOfElement(f,CKEDITOR.END)||(k=a.checkBoundaryOfElement(f,CKEDITOR.START)))?
+(e=f,e.match=k?"start":"end"):(f.mergeSiblings(),f.is(this.element)?v.call(this,f):n(f,t(this)[f.getName()]))}if(e){f=c;for(h=0;;h++){k=g.elements[h];if(k.equals(e))break;else if(k.match)continue;else k=k.clone();k.append(f);f=k}f["start"==e.match?"insertBefore":"insertAfter"](e)}}else{var p=d.endNode,l=this;b();for(g=c;!g.equals(p);)e=g.getNextSourceNode(),g.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(g)&&(g.getName()==this.element?v.call(this,g):n(g,t(this)[g.getName()]),e.type==CKEDITOR.NODE_ELEMENT&&
+e.contains(c)&&(b(),e=c.getNext())),g=e}a.moveToBookmark(d);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function h(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function m(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&A(a,this)}function l(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,
+1)){var b=this._.definition,d=b.attributes;if(d)for(var c in d)a.removeAttribute(c,d[c]);if(b.styles)for(var g in b.styles)b.styles.hasOwnProperty(g)&&a.removeStyle(g)}}function k(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var g,e=a.document,h;g=c.getNextParagraph();)!g.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(h=w(this,e,g),d(g,h));a.moveToBookmark(b)}function b(a){var b=a.createBookmark(1),
+c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var g,e;g=c.getNextParagraph();)this.checkElementRemovable(g)&&(g.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&g.copyAttributes(e),d(g,e)):v.call(this,g));a.moveToBookmark(b)}function d(a,b){var d=!b;d&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var c=b&&b.is("pre"),e=a.is("pre"),h=!c&&e;if(c&&!e){e=b;(h=
+a.getBogus())&&h.remove();h=a.getHtml();h=p(h,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");h=h.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");h=h.replace(/([ \t\n\r]+|&nbsp;)/g," ");h=h.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var f=a.getDocument().createElement("div");f.append(e);e.$.outerHTML="\x3cpre\x3e"+h+"\x3c/pre\x3e";e.copyAttributes(f.getFirst());e=f.getFirst().remove()}else e.setHtml(h);b=e}else h?b=u(d?[a.getHtml()]:g(a),b):a.moveChildren(b);b.replace(a);if(c){var d=b,k;(k=d.getPrevious(J))&&
+k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(c=p(k.getHtml(),/\n$/,"")+"\n\n"+p(d.getHtml(),/^\n/,""),CKEDITOR.env.ie?d.$.outerHTML="\x3cpre\x3e"+c+"\x3c/pre\x3e":d.setHtml(c),k.remove())}else d&&q(b)}function g(a){var b=[];p(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,d){return b+"\x3c/pre\x3e"+d+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,d){b.push(d)});return b}function p(a,b,d){var c="",g="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,
+function(a,b,d){b&&(c=b);d&&(g=d);return""});return c+a.replace(b,d)+g}function u(a,b){var d;1<a.length&&(d=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var c=0;c<a.length;c++){var g=a[c],g=g.replace(/(\r\n|\r)/g,"\n"),g=p(g,/^[ \t]*\n/,""),g=p(g,/\n$/,""),g=p(g,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),g=g.replace(/\n/g,"\x3cbr\x3e"),g=g.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",
+a.length-1)+" "});if(d){var e=b.clone();e.setHtml(g);d.append(e)}else b.setHtml(g)}return d||b}function v(a,b){var d=this._.definition,c=d.attributes,d=d.styles,g=t(this)[a.getName()],e=CKEDITOR.tools.isEmpty(c)&&CKEDITOR.tools.isEmpty(d),h;for(h in c)if("class"!=h&&!this._.definition.fullMatch||a.getAttribute(h)==x(h,c[h]))b&&"data-"==h.slice(0,5)||(e=a.hasAttribute(h),a.removeAttribute(h));for(var f in d)this._.definition.fullMatch&&a.getStyle(f)!=x(f,d[f],!0)||(e=e||!!a.getStyle(f),a.removeStyle(f));
+n(a,g,y[a.getName()]);e&&(this._.definition.alwaysRemoveElement?q(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?q(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function r(a){for(var b=t(this),d=a.getElementsByTag(this.element),c,g=d.count();0<=--g;)c=d.getItem(g),c.isReadOnly()||v.call(this,c,!0);for(var e in b)if(e!=this.element)for(d=a.getElementsByTag(e),g=d.count()-1;0<=g;g--)c=d.getItem(g),c.isReadOnly()||n(c,b[e])}function n(a,
+b,d){if(b=b&&b.attributes)for(var c=0;c<b.length;c++){var g=b[c][0],e;if(e=a.getAttribute(g)){var h=b[c][1];(null===h||h.test&&h.test(e)||"string"==typeof h&&e==h)&&a.removeAttribute(g)}}d||q(a)}function q(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var d=a.getPrevious(J),c=a.getNext(J);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br",1);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else d=a.getFirst(),c=a.getLast(),
+a.remove(!0),d&&(d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings(),c&&!d.equals(c)&&c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings())}function w(a,b,d){var c;c=a.element;"*"==c&&(c="span");c=new CKEDITOR.dom.element(c,b);d&&d.copyAttributes(c);c=A(c,a);b.getCustomData("doc_processing_style")&&c.hasAttribute("id")?c.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return c}function A(a,b){var d=b._.definition,c=d.attributes,d=CKEDITOR.style.getStyleText(d);if(c)for(var g in c)a.setAttribute(g,
+c[g]);d&&a.setAttribute("style",d);return a}function B(a,b){for(var d in a)a[d]=a[d].replace(G,function(a,d){return b[d]})}function t(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},d=a._.definition.overrides;if(d){CKEDITOR.tools.isArray(d)||(d=[d]);for(var c=0;c<d.length;c++){var g=d[c],e,h;"string"==typeof g?e=g.toLowerCase():(e=g.element?g.element.toLowerCase():a.element,h=g.attributes);g=b[e]||(b[e]={});if(h){var g=g.attributes=g.attributes||[],f;for(f in h)g.push([f.toLowerCase(),
+h[f]])}}}return b}function x(a,b,d){var c=new CKEDITOR.dom.element("span");c[d?"setStyle":"setAttribute"](a,b);return c[d?"getStyle":"getAttribute"](a)}function D(a,b,d){var c=a.document,g=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var e,h=g.createIterator();e=h.getNextRange();)b.call(this,e,d);a.selectRanges(g);c.removeCustomData("doc_processing_style")}var y={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,
+hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},z={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},C=/\s*(?:;\s*|$)/,G=/#\((.+?)\)/g,E=CKEDITOR.dom.walker.bookmark(0,1),J=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var d=a.attributes;d&&d.style&&(a.styles=CKEDITOR.tools.extend({},
+a.styles,CKEDITOR.tools.parseCssText(d.style)),delete d.style);b&&(a=CKEDITOR.tools.clone(a),B(a.attributes,b),B(a.styles,b));d=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(y[d]?CKEDITOR.STYLE_BLOCK:z[d]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return D.call(this,a.getSelection());
+if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);D.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return D.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);D.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==
+CKEDITOR.STYLE_BLOCK?k:this.type==CKEDITOR.STYLE_OBJECT?m:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?e:this.type==CKEDITOR.STYLE_BLOCK?b:this.type==CKEDITOR.STYLE_OBJECT?l:null;return this.removeFromRange(a)},applyToObject:function(a){A(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var d=
+a.elements,c=0,g;c<d.length;c++)if(g=d[c],this.type!=CKEDITOR.STYLE_INLINE||g!=a.block&&g!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var e=g.getName();if(!("string"==typeof this.element?e==this.element:e in this.element))continue}if(this.checkElementRemovable(g,!0,b))return!0}}return!1},checkApplicable:function(a,b,d){b&&b instanceof CKEDITOR.filter&&(d=b);if(d&&!d.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},
+checkElementMatch:function(a,b){var d=this._.definition;if(!a||!d.ignoreReadonly&&a.isReadOnly())return!1;var c=a.getName();if("string"==typeof this.element?c==this.element:c in this.element){if(!b&&!a.hasAttributes())return!0;if(c=d._AC)d=c;else{var c={},g=0,e=d.attributes;if(e)for(var h in e)g++,c[h]=e[h];if(h=CKEDITOR.style.getStyleText(d))c.style||g++,c.style=h;c._length=g;d=d._AC=c}if(d._length){for(var f in d)if("_length"!=f){g=a.getAttribute(f)||"";if("style"==f)a:{c=d[f];"string"==typeof c&&
+(c=CKEDITOR.tools.parseCssText(c));"string"==typeof g&&(g=CKEDITOR.tools.parseCssText(g,!0));h=void 0;for(h in c)if(!(h in g)||g[h]!=c[h]&&"inherit"!=c[h]&&"inherit"!=g[h]){c=!1;break a}c=!0}else c=d[f]==g;if(c){if(!b)return!0}else if(b)return!1}if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,d){if(this.checkElementMatch(a,b,d))return!0;if(b=t(this)[a.getName()]){var c;if(!(b=b.attributes))return!0;for(d=0;d<b.length;d++)if(c=b[d][0],c=a.getAttribute(c)){var g=b[d][1];if(null===
+g)return!0;if("string"==typeof g){if(c==g)return!0}else if(g.test(c))return!0}}return!1},buildPreview:function(a){var b=this._.definition,d=[],c=b.element;"bdo"==c&&(c="span");var d=["\x3c",c],g=b.attributes;if(g)for(var e in g)d.push(" ",e,'\x3d"',g[e],'"');(g=CKEDITOR.style.getStyleText(b))&&d.push(' style\x3d"',g,'"');d.push("\x3e",a||b.name,"\x3c/",c,"\x3e");return d.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;
+var b=a.styles,d=a.attributes&&a.attributes.style||"",c="";d.length&&(d=d.replace(C,";"));for(var g in b){var e=b[g],h=(g+":"+e).replace(C,";");"inherit"==e?c+=h:d+=h}d.length&&(d=CKEDITOR.tools.normalizeCssText(d,!0));return a._ST=d+c};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},
+a,!0);return this.customHandlers[a.type]=b};var I=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,N=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED}(),CKEDITOR.styleCommand=function(a,f){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,f,!0)},CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&
+a.removeStyle(this.style)},CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet"),CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet),CKEDITOR.loadStylesSet=function(a,f,c){CKEDITOR.stylesSet.addExternal(a,f,"");CKEDITOR.stylesSet.load(a,c)},CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,f){var c=this._.styleStateChangeCallbacks;c||(c=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var h=0;h<
+c.length;h++){var f=c[h],l=f.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;f.fn.call(this,l)}}));c.push({style:a,fn:f})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);else{var f=this,c=f.config.stylesCombo_stylesSet||f.config.stylesSet;if(!1===c)a(null);else if(c instanceof Array)f._.stylesDefinitions=c,a(c);else{c||(c="default");var c=c.split(":"),e=c[0];
+CKEDITOR.stylesSet.addExternal(e,c[1]?c.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(e,function(c){f._.stylesDefinitions=c[e];a(f._.stylesDefinitions)})}}}}),CKEDITOR.dom.comment=function(a,f){"string"==typeof a&&(a=(f?f.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)},CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+
+"--\x3e"}}),"use strict",function(){var a={},f={},c;for(c in CKEDITOR.dtd.$blockLimit)c in CKEDITOR.dtd.$list||(a[c]=1);for(c in CKEDITOR.dtd.$block)c in CKEDITOR.dtd.$blockLimit||c in CKEDITOR.dtd.$empty||(f[c]=1);CKEDITOR.dom.elementPath=function(c,h){var m=null,l=null,k=[],b=c,d;h=h||c.getDocument().getBody();do if(b.type==CKEDITOR.NODE_ELEMENT){k.push(b);if(!this.lastElement&&(this.lastElement=b,b.is(CKEDITOR.dtd.$object)||"false"==b.getAttribute("contenteditable")))continue;if(b.equals(h))break;
+if(!l&&(d=b.getName(),"true"==b.getAttribute("contenteditable")?l=b:!m&&f[d]&&(m=b),a[d])){if(d=!m&&"div"==d){a:{d=b.getChildren();for(var g=0,p=d.count();g<p;g++){var u=d.getItem(g);if(u.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[u.getName()]){d=!0;break a}}d=!1}d=!d}d?m=b:l=b}}while(b=b.getParent());l||(l=h);this.block=m;this.blockLimit=l;this.root=h;this.elements=k}}(),CKEDITOR.dom.elementPath.prototype={compare:function(a){var f=this.elements;a=a&&a.elements;if(!a||f.length!=a.length)return!1;
+for(var c=0;c<f.length;c++)if(!f[c].equals(a[c]))return!1;return!0},contains:function(a,f,c){var e;"string"==typeof a&&(e=function(c){return c.getName()==a});a instanceof CKEDITOR.dom.element?e=function(c){return c.equals(a)}:CKEDITOR.tools.isArray(a)?e=function(c){return-1<CKEDITOR.tools.indexOf(a,c.getName())}:"function"==typeof a?e=a:"object"==typeof a&&(e=function(c){return c.getName()in a});var h=this.elements,m=h.length;f&&m--;c&&(h=Array.prototype.slice.call(h,0),h.reverse());for(f=0;f<m;f++)if(e(h[f]))return h[f];
+return null},isContextFor:function(a){var f;return a in CKEDITOR.dtd.$block?(f=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!f.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}},CKEDITOR.dom.text=function(a,f){"string"==typeof a&&(a=(f?f.$:document).createTextNode(a));this.$=a},CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node,CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,
+getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var f=this.$.parentNode,c=f.childNodes.length,e=this.getLength(),h=this.getDocument(),m=new CKEDITOR.dom.text(this.$.splitText(a),h);f.childNodes.length==c&&(a>=e?(m=h.createText(""),m.insertAfter(this)):(a=h.createText(""),a.insertAfter(m),a.remove()));return m},substring:function(a,f){return"number"!=typeof f?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,
+f)}}),function(){function a(a,e,h){var f=a.serializable,l=e[h?"endContainer":"startContainer"],k=h?"endOffset":"startOffset",b=f?e.document.getById(a.startNode):a.startNode;a=f?e.document.getById(a.endNode):a.endNode;l.equals(b.getPrevious())?(e.startOffset=e.startOffset-l.getLength()-a.getPrevious().getLength(),l=a.getNext()):l.equals(a.getPrevious())&&(e.startOffset-=l.getLength(),l=a.getNext());l.equals(b.getParent())&&e[k]++;l.equals(a.getParent())&&e[k]++;e[h?"endContainer":"startContainer"]=
+l;return e}CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,f)};var f={createIterator:function(){var a=this,e=CKEDITOR.dom.walker.bookmark(),h=[],f;return{getNextRange:function(l){f=void 0===f?0:f+1;var k=a[f];if(k&&1<a.length){if(!f)for(var b=a.length-1;0<=b;b--)h.unshift(a[b].createBookmark(!0));if(l)for(var d=0;a[f+d+1];){var g=k.document;l=0;b=g.getById(h[d].endNode);for(g=g.getById(h[d+
+1].startNode);;){b=b.getNextSourceNode(!1);if(g.equals(b))l=1;else if(e(b)||b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary())continue;break}if(!l)break;d++}for(k.moveToBookmark(h.shift());d--;)b=a[++f],b.moveToBookmark(h.shift()),k.setEnd(b.endContainer,b.endOffset)}return k}}},createBookmarks:function(c){for(var e=[],h,f=0;f<this.length;f++){e.push(h=this[f].createBookmark(c,!0));for(var l=f+1;l<this.length;l++)this[l]=a(h,this[l]),this[l]=a(h,this[l],!0)}return e},createBookmarks2:function(a){for(var e=
+[],h=0;h<this.length;h++)e.push(this[h].createBookmark2(a));return e},moveToBookmarks:function(a){for(var e=0;e<this.length;e++)this[e].moveToBookmark(a[e])}}}(),function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function f(b){var c=CKEDITOR.skin["ua_"+b],e=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),h=0,f;h<c.length;h++)if(f=c[h],e.ie&&(f.replace(/^ie/,"")==e.version||e.quirks&&"iequirks"==
+f)&&(f="ie"),e[f]){b+="_"+c[h];break}return CKEDITOR.getUrl(a()+b+".css")}function c(a,b){m[a]||(CKEDITOR.document.appendStyleSheet(f(a)),m[a]=1);b&&b()}function e(a){var b=a.getById(l);b||(b=a.getHead().append("style"),b.setAttribute("id",l),b.setAttribute("type","text/css"));return b}function h(a,b,c){var e,h,f;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),h=0;h<b.length;h++)b[h]=b[h].split("{");for(var k=0;k<a.length;k++)if(CKEDITOR.env.webkit)for(h=0;h<b.length;h++){f=b[h][1];for(e=0;e<
+c.length;e++)f=f.replace(c[e][0],c[e][1]);a[k].$.sheet.addRule(b[h][0],f)}else{f=b;for(e=0;e<c.length;e++)f=f.replace(c[e][0],c[e][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?a[k].$.styleSheet.cssText+=f:a[k].$.innerHTML+=f}}var m={};CKEDITOR.skin={path:a,loadPart:function(b,g){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){c(b,g)}):c(b,g)},getPath:function(a){return CKEDITOR.getUrl(f(a))},icons:{},addIcon:function(a,b,c,e){a=
+a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:e||"16px"})},getIconStyle:function(a,b,c,e,h){var f;a&&(a=a.toLowerCase(),b&&(f=this.icons[a+"-rtl"]),f||(f=this.icons[a]));a=c||f&&f.path||"";e=e||f&&f.offset;h=h||f&&f.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+e+"px;background-size:"+h+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var c=
+e(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var d=CKEDITOR.skin.chameleon,e="",f="";"function"==typeof d&&(e=d(this,"editor"),f=d(this,"panel"));a=[[b,a]];h([c],e,a);h(k,f,a)}).call(this,a)}});var l="cke_ui_color",k=[],b=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var c=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=e(a);k.push(a);
+var d=c.getUiColor();d&&h([a],CKEDITOR.skin.chameleon(c,"panel"),[[b,d]])}};c.on("panelShow",a);c.on("menuShow",a);c.config.uiColor&&c.setUiColor(c.config.uiColor)}})}(),function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var f=a.getComputedStyle("border-top-color"),
+c=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!f||f!=c)}catch(e){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,f=0;f<a.length;f++)CKEDITOR.editor.prototype.constructor.apply(a[f][0],a[f][1]),CKEDITOR.add(a[f][0])}(),CKEDITOR.skin.name="moono",CKEDITOR.skin.ua_editor="ie,iequirks,ie7,ie8,gecko",
+CKEDITOR.skin.ua_dialog="ie,iequirks,ie7,ie8",CKEDITOR.skin.chameleon=function(){var a=function(){return function(a,c){for(var f=a.match(/[^#]./g),l=0;3>l;l++){var k=l,b;b=parseInt(f[l],16);b=("0"+(0>c?0|b*(1+c):0|b+(255-b)*c).toString(16)).slice(-2);f[k]=b}return"#"+f.join("")}}(),f=function(){var a=new CKEDITOR.template("background:#{to};background-image:linear-gradient(to bottom,{from},{to});filter:progid:DXImageTransform.Microsoft.gradient(gradientType\x3d0,startColorstr\x3d'{from}',endColorstr\x3d'{to}');");
+return function(c,f){return a.output({from:c,to:f})}}(),c={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ {defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_bottom [{defaultGradient}border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [{defaultGradient}border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [{defaultGradient}outline-color:{defaultBorder};border-top-color:{defaultBorder};] {id} .cke_dialog_tab [{lightGradient}border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [{mediumGradient}] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} .cke_toolgroup [{lightGradient}border-color:{defaultBorder};] {id} a.cke_button_off:hover, {id} a.cke_button_off:focus, {id} a.cke_button_off:active [{mediumGradient}] {id} .cke_button_on [{ckeButtonOn}] {id} .cke_toolbar_separator [background-color: {ckeToolbarSeparator};] {id} .cke_combo_button [border-color:{defaultBorder};{lightGradient}] {id} a.cke_combo_button:hover, {id} a.cke_combo_button:focus, {id} .cke_combo_on a.cke_combo_button [border-color:{defaultBorder};{mediumGradient}] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover, {id} a.cke_path_item:focus, {id} a.cke_path_item:active [background-color:{elementsPathBg};] {id}.cke_panel [border-color:{defaultBorder};] "),
 panel:new CKEDITOR.template(".cke_panel_grouptitle [{lightGradient}border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:focus.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:focus.cke_colorauto, a:focus.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
-return function(g,f){var m=g.uiColor,m={id:"."+g.id,defaultBorder:a(m,-.1),defaultGradient:e(a(m,.9),m),lightGradient:e(a(m,1),a(m,.7)),mediumGradient:e(a(m,.8),a(m,.5)),ckeButtonOn:e(a(m,.6),a(m,.7)),ckeResizer:a(m,-.4),ckeToolbarSeparator:a(m,.5),ckeColorauto:a(m,.8),dialogBody:a(m,.7),dialogTabSelected:e("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:a(m,-.6),elementsPathBg:m,menubuttonIcon:a(m,.5),menubuttonIconHover:a(m,.3)};return c[f].output(m).replace(/\[/g,"{").replace(/\]/g,
-"}")}}(),CKEDITOR.plugins.add("dialogui",{onLoad:function(){var a=function(a){this._||(this._={});this._["default"]=this._.initValue=a["default"]||"";this._.required=a.required||!1;for(var d=[this._],c=1;c<arguments.length;c++)d.push(arguments[c]);d.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,d);return this._},e={build:function(a,d,c){return new CKEDITOR.ui.dialog.textInput(a,d,c)}},c={build:function(a,d,c){return new CKEDITOR.ui.dialog[d.type](a,d,c)}},g={isChanged:function(){return this.getValue()!=
-this.getInitValue()},reset:function(a){this.setValue(this.getInitValue(),a)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},f=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(a,d){this._.domOnChangeRegistered||(a.on("load",function(){this.getInputElement().on("change",function(){a.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
-this)},this),this._.domOnChangeRegistered=!0);this.on("change",d)}},!0),m=/^on([A-Z]\w+)/,l=function(a){for(var d in a)(m.test(d)||"title"==d||"type"==d)&&delete a[d];return a},k=function(a){a=a.data.getKeystroke();a==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):a==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,d,c,f){if(!(4>arguments.length)){var e=a.call(this,d);e.labelId=CKEDITOR.tools.getNextId()+
-"_label";this._.children=[];var g={role:d.role||"presentation"};d.includeLabel&&(g["aria-labelledby"]=e.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"div",null,g,function(){var a=[],c=d.required?" cke_required":"";"horizontal"!=d.labelLayout?a.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" ',' id\x3d"'+e.labelId+'"',e.inputId?' for\x3d"'+e.inputId+'"':"",(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",d.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
-d.controlStyle?' style\x3d"'+d.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,d),"\x3c/div\x3e"):(c={type:"hbox",widths:d.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" id\x3d"'+e.labelId+'" for\x3d"'+e.inputId+'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(d.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(d.controlStyle?' style\x3d"'+d.controlStyle+
-'"':"")+"\x3e"+f.call(this,b,d)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,c,a));return a.join("")})}},textInput:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",e={"class":"cke_dialog_ui_input_"+d.type,id:f,type:d.type};d.validate&&(this.validate=d.validate);d.maxLength&&(e.maxlength=d.maxLength);d.size&&(e.size=d.size);d.inputStyle&&(e.style=d.inputStyle);var g=this,l=!1;b.on("load",function(){g.getInputElement().on("keydown",
-function(a){13==a.data.getKeystroke()&&(l=!0)});g.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&l&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),l=!1);g.bidi&&k.call(g,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=['\x3cdiv class\x3d"cke_dialog_ui_input_',d.type,'" role\x3d"presentation"'];d.width&&a.push('style\x3d"width:'+d.width+'" ');a.push("\x3e\x3cinput ");e["aria-labelledby"]=this._.labelId;this._.required&&
-(e["aria-required"]=this._.required);for(var b in e)a.push(b+'\x3d"'+e[b]+'" ');a.push(" /\x3e\x3c/div\x3e");return a.join("")})}},textarea:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var f=this,e=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",g={};d.validate&&(this.validate=d.validate);g.rows=d.rows||5;g.cols=d.cols||20;g["class"]="cke_dialog_ui_input_textarea "+(d["class"]||"");"undefined"!=typeof d.inputStyle&&(g.style=d.inputStyle);d.dir&&(g.dir=d.dir);if(f.bidi)b.on("load",
-function(){f.getInputElement().on("keyup",k)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){g["aria-labelledby"]=this._.labelId;this._.required&&(g["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',e,'" '],b;for(b in g)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(g[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
-d,c){if(!(3>arguments.length)){var f=a.call(this,d,{"default":!!d["default"]});d.validate&&(this.validate=d.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"span",null,null,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),c=[],h=CKEDITOR.tools.getNextId()+"_label",e={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":h};l(a);d["default"]&&(e.checked="checked");"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);
-f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,a,c,"input",null,e);c.push(' \x3clabel id\x3d"',h,'" for\x3d"',e.id,'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(d.label),"\x3c/label\x3e");return c.join("")})}},radio:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);this._["default"]||(this._["default"]=this._.initValue=d.items[0][1]);d.validate&&(this.validate=d.validate);var f=[],e=this;d.role="radiogroup";d.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
-b,d,c,function(){for(var a=[],c=[],h=(d.id?d.id:CKEDITOR.tools.getNextId())+"_radio",g=0;g<d.items.length;g++){var k=d.items[g],m=void 0!==k[2]?k[2]:k[0],C=void 0!==k[1]?k[1]:k[0],r=CKEDITOR.tools.getNextId()+"_radio_input",x=r+"_label",r=CKEDITOR.tools.extend({},d,{id:r,title:null,type:null},!0),m=CKEDITOR.tools.extend({},r,{title:m},!0),B={type:"radio","class":"cke_dialog_ui_radio_input",name:h,value:C,"aria-labelledby":x},A=[];e._["default"]==C&&(B.checked="checked");l(r);l(m);"undefined"!=typeof r.inputStyle&&
-(r.style=r.inputStyle);r.keyboardFocusable=!0;f.push(new CKEDITOR.ui.dialog.uiElement(b,r,A,"input",null,B));A.push(" ");new CKEDITOR.ui.dialog.uiElement(b,m,A,"label",null,{id:x,"for":B.id},k[0]);a.push(A.join(""))}new CKEDITOR.ui.dialog.hbox(b,f,a,c);return c.join("")});this._.children=f}},button:function(b,d,c){if(arguments.length){"function"==typeof d&&(d=d(b.getParentEditor()));a.call(this,d,{disabled:d.disabled||!1});CKEDITOR.event.implementOn(this);var f=this;b.on("load",function(){var a=this.getElement();
-(function(){a.on("click",function(a){f.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(f.click(),a.data.preventDefault())})})();a.unselectable()},this);var e=CKEDITOR.tools.extend({},d);delete e.style;var g=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,e,c,"a",null,{style:d.style,href:"javascript:void(0)",title:d.label,hidefocus:"true","class":d["class"],role:"button","aria-labelledby":g},'\x3cspan id\x3d"'+g+'" class\x3d"cke_dialog_ui_button"\x3e'+
-CKEDITOR.tools.htmlEncode(d.label)+"\x3c/span\x3e")}},select:function(b,d,c){if(!(3>arguments.length)){var f=a.call(this,d);d.validate&&(this.validate=d.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),c=[],h=[],e={id:f.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};c.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
-d.type,'" role\x3d"presentation"');d.width&&c.push('style\x3d"width:'+d.width+'" ');c.push("\x3e");void 0!==d.size&&(e.size=d.size);void 0!==d.multiple&&(e.multiple=d.multiple);l(a);for(var g=0,k;g<d.items.length&&(k=d.items[g]);g++)h.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==k[1]?k[1]:k[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(k[0]));"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);f.select=new CKEDITOR.ui.dialog.uiElement(b,a,c,"select",null,
-e,h.join(""));c.push("\x3c/div\x3e");return c.join("")})}},file:function(b,d,c){if(!(3>arguments.length)){void 0===d["default"]&&(d["default"]="");var f=CKEDITOR.tools.extend(a.call(this,d),{definition:d,buttons:[]});d.validate&&(this.validate=d.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var a=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
-f.frameId,'" title\x3d"',d.label,'" src\x3d"javascript:void('];a.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");a.push(')"\x3e\x3c/iframe\x3e');return a.join("")})}},fileButton:function(b,d,c){var f=this;if(!(3>arguments.length)){a.call(this,d);d.validate&&(this.validate=d.validate);var e=CKEDITOR.tools.extend({},d),g=e.onClick;e.className=(e.className?e.className+" ":"")+"cke_dialog_ui_button";e.onClick=function(a){var c=
-d["for"];g&&!1===g.call(this,a)||(b.getContentElement(c[0],c[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(d["for"][0],d["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,e,c)}},html:function(){var a=/^\s*<[\w:]+\s+([^>]*)?>/,d=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,c=/\/$/;return function(f,e,g){if(!(3>arguments.length)){var k=[],n=e.html;"\x3c"!=n.charAt(0)&&(n="\x3cspan\x3e"+n+"\x3c/span\x3e");var l=e.focus;if(l){var m=this.focus;this.focus=function(){("function"==
-typeof l?l:m).call(this);this.fire("focus")};e.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,e,k,"span",null,null,"");k=k.join("").match(a);n=n.match(d)||["","",""];c.test(n[1])&&(n[1]=n[1].slice(0,-1),n[2]="/"+n[2]);g.push([n[1]," ",k[1]||"",n[2]].join(""))}}}(),fieldset:function(a,d,c,f,e){var g=e.label;this._={children:d};CKEDITOR.ui.dialog.uiElement.call(this,a,e,f,"fieldset",null,null,function(){var a=[];g&&a.push("\x3clegend"+
-(e.labelStyle?' style\x3d"'+e.labelStyle+'"':"")+"\x3e"+g+"\x3c/legend\x3e");for(var b=0;b<c.length;b++)a.push(c[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(a){var d=CKEDITOR.document.getById(this._.labelId);1>d.getChildCount()?(new CKEDITOR.dom.text(a,CKEDITOR.document)).appendTo(d):d.getChild(0).$.nodeValue=a;return this},getLabel:function(){var a=
-CKEDITOR.document.getById(this._.labelId);return!a||1>a.getChildCount()?"":a.getChild(0).getText()},eventProcessors:f},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var a=this.getElement();a&&a.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},
+return function(e,h){var m=e.uiColor,m={id:"."+e.id,defaultBorder:a(m,-.1),defaultGradient:f(a(m,.9),m),lightGradient:f(a(m,1),a(m,.7)),mediumGradient:f(a(m,.8),a(m,.5)),ckeButtonOn:f(a(m,.6),a(m,.7)),ckeResizer:a(m,-.4),ckeToolbarSeparator:a(m,.5),ckeColorauto:a(m,.8),dialogBody:a(m,.7),dialogTabSelected:f("#FFFFFF","#FFFFFF"),dialogTabSelectedBorder:"#FFF",elementsPathColor:a(m,-.6),elementsPathBg:m,menubuttonIcon:a(m,.5),menubuttonIconHover:a(m,.3)};return c[h].output(m).replace(/\[/g,"{").replace(/\]/g,
+"}")}}(),CKEDITOR.plugins.add("dialogui",{onLoad:function(){var a=function(a){this._||(this._={});this._["default"]=this._.initValue=a["default"]||"";this._.required=a.required||!1;for(var d=[this._],c=1;c<arguments.length;c++)d.push(arguments[c]);d.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,d);return this._},f={build:function(a,d,c){return new CKEDITOR.ui.dialog.textInput(a,d,c)}},c={build:function(a,d,c){return new CKEDITOR.ui.dialog[d.type](a,d,c)}},e={isChanged:function(){return this.getValue()!=
+this.getInitValue()},reset:function(a){this.setValue(this.getInitValue(),a)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},h=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(a,d){this._.domOnChangeRegistered||(a.on("load",function(){this.getInputElement().on("change",function(){a.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
+this)},this),this._.domOnChangeRegistered=!0);this.on("change",d)}},!0),m=/^on([A-Z]\w+)/,l=function(a){for(var d in a)(m.test(d)||"title"==d||"type"==d)&&delete a[d];return a},k=function(a){a=a.data.getKeystroke();a==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):a==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,d,c,e){if(!(4>arguments.length)){var h=a.call(this,d);h.labelId=CKEDITOR.tools.getNextId()+
+"_label";this._.children=[];var f={role:d.role||"presentation"};d.includeLabel&&(f["aria-labelledby"]=h.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"div",null,f,function(){var a=[],c=d.required?" cke_required":"";"horizontal"!=d.labelLayout?a.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" ',' id\x3d"'+h.labelId+'"',h.inputId?' for\x3d"'+h.inputId+'"':"",(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",d.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
+d.controlStyle?' style\x3d"'+d.controlStyle+'"':"",' role\x3d"presentation"\x3e',e.call(this,b,d),"\x3c/div\x3e"):(c={type:"hbox",widths:d.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+c+'" id\x3d"'+h.labelId+'" for\x3d"'+h.inputId+'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(d.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(d.controlStyle?' style\x3d"'+d.controlStyle+
+'"':"")+"\x3e"+e.call(this,b,d)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,c,a));return a.join("")})}},textInput:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var e=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",h={"class":"cke_dialog_ui_input_"+d.type,id:e,type:d.type};d.validate&&(this.validate=d.validate);d.maxLength&&(h.maxlength=d.maxLength);d.size&&(h.size=d.size);d.inputStyle&&(h.style=d.inputStyle);var f=this,l=!1;b.on("load",function(){f.getInputElement().on("keydown",
+function(a){13==a.data.getKeystroke()&&(l=!0)});f.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&l&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),l=!1);f.bidi&&k.call(f,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=['\x3cdiv class\x3d"cke_dialog_ui_input_',d.type,'" role\x3d"presentation"'];d.width&&a.push('style\x3d"width:'+d.width+'" ');a.push("\x3e\x3cinput ");h["aria-labelledby"]=this._.labelId;this._.required&&
+(h["aria-required"]=this._.required);for(var b in h)a.push(b+'\x3d"'+h[b]+'" ');a.push(" /\x3e\x3c/div\x3e");return a.join("")})}},textarea:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);var e=this,h=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",f={};d.validate&&(this.validate=d.validate);f.rows=d.rows||5;f.cols=d.cols||20;f["class"]="cke_dialog_ui_input_textarea "+(d["class"]||"");"undefined"!=typeof d.inputStyle&&(f.style=d.inputStyle);d.dir&&(f.dir=d.dir);if(e.bidi)b.on("load",
+function(){e.getInputElement().on("keyup",k)},e);CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){f["aria-labelledby"]=this._.labelId;this._.required&&(f["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',h,'" '],b;for(b in f)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(f[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(e._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
+d,c){if(!(3>arguments.length)){var e=a.call(this,d,{"default":!!d["default"]});d.validate&&(this.validate=d.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,d,c,"span",null,null,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),c=[],g=CKEDITOR.tools.getNextId()+"_label",h={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":g};l(a);d["default"]&&(h.checked="checked");"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);
+e.checkbox=new CKEDITOR.ui.dialog.uiElement(b,a,c,"input",null,h);c.push(' \x3clabel id\x3d"',g,'" for\x3d"',h.id,'"'+(d.labelStyle?' style\x3d"'+d.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(d.label),"\x3c/label\x3e");return c.join("")})}},radio:function(b,d,c){if(!(3>arguments.length)){a.call(this,d);this._["default"]||(this._["default"]=this._.initValue=d.items[0][1]);d.validate&&(this.validate=d.validate);var e=[],h=this;d.role="radiogroup";d.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
+b,d,c,function(){for(var a=[],c=[],g=(d.id?d.id:CKEDITOR.tools.getNextId())+"_radio",f=0;f<d.items.length;f++){var k=d.items[f],m=void 0!==k[2]?k[2]:k[0],B=void 0!==k[1]?k[1]:k[0],t=CKEDITOR.tools.getNextId()+"_radio_input",x=t+"_label",t=CKEDITOR.tools.extend({},d,{id:t,title:null,type:null},!0),m=CKEDITOR.tools.extend({},t,{title:m},!0),D={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:B,"aria-labelledby":x},y=[];h._["default"]==B&&(D.checked="checked");l(t);l(m);"undefined"!=typeof t.inputStyle&&
+(t.style=t.inputStyle);t.keyboardFocusable=!0;e.push(new CKEDITOR.ui.dialog.uiElement(b,t,y,"input",null,D));y.push(" ");new CKEDITOR.ui.dialog.uiElement(b,m,y,"label",null,{id:x,"for":D.id},k[0]);a.push(y.join(""))}new CKEDITOR.ui.dialog.hbox(b,e,a,c);return c.join("")});this._.children=e}},button:function(b,d,c){if(arguments.length){"function"==typeof d&&(d=d(b.getParentEditor()));a.call(this,d,{disabled:d.disabled||!1});CKEDITOR.event.implementOn(this);var e=this;b.on("load",function(){var a=this.getElement();
+(function(){a.on("click",function(a){e.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(e.click(),a.data.preventDefault())})})();a.unselectable()},this);var h=CKEDITOR.tools.extend({},d);delete h.style;var f=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,h,c,"a",null,{style:d.style,href:"javascript:void(0)",title:d.label,hidefocus:"true","class":d["class"],role:"button","aria-labelledby":f},'\x3cspan id\x3d"'+f+'" class\x3d"cke_dialog_ui_button"\x3e'+
+CKEDITOR.tools.htmlEncode(d.label)+"\x3c/span\x3e")}},select:function(b,d,c){if(!(3>arguments.length)){var e=a.call(this,d);d.validate&&(this.validate=d.validate);e.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){var a=CKEDITOR.tools.extend({},d,{id:d.id?d.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),c=[],g=[],h={id:e.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};c.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
+d.type,'" role\x3d"presentation"');d.width&&c.push('style\x3d"width:'+d.width+'" ');c.push("\x3e");void 0!==d.size&&(h.size=d.size);void 0!==d.multiple&&(h.multiple=d.multiple);l(a);for(var f=0,k;f<d.items.length&&(k=d.items[f]);f++)g.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==k[1]?k[1]:k[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(k[0]));"undefined"!=typeof a.inputStyle&&(a.style=a.inputStyle);e.select=new CKEDITOR.ui.dialog.uiElement(b,a,c,"select",null,
+h,g.join(""));c.push("\x3c/div\x3e");return c.join("")})}},file:function(b,d,c){if(!(3>arguments.length)){void 0===d["default"]&&(d["default"]="");var e=CKEDITOR.tools.extend(a.call(this,d),{definition:d,buttons:[]});d.validate&&(this.validate=d.validate);b.on("load",function(){CKEDITOR.document.getById(e.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,d,c,function(){e.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var a=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
+e.frameId,'" title\x3d"',d.label,'" src\x3d"javascript:void('];a.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");a.push(')"\x3e\x3c/iframe\x3e');return a.join("")})}},fileButton:function(b,d,c){var e=this;if(!(3>arguments.length)){a.call(this,d);d.validate&&(this.validate=d.validate);var h=CKEDITOR.tools.extend({},d),f=h.onClick;h.className=(h.className?h.className+" ":"")+"cke_dialog_ui_button";h.onClick=function(a){var c=
+d["for"];f&&!1===f.call(this,a)||(b.getContentElement(c[0],c[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(d["for"][0],d["for"][1])._.buttons.push(e)});CKEDITOR.ui.dialog.button.call(this,b,h,c)}},html:function(){var a=/^\s*<[\w:]+\s+([^>]*)?>/,d=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,c=/\/$/;return function(e,h,f){if(!(3>arguments.length)){var k=[],n=h.html;"\x3c"!=n.charAt(0)&&(n="\x3cspan\x3e"+n+"\x3c/span\x3e");var l=h.focus;if(l){var m=this.focus;this.focus=function(){("function"==
+typeof l?l:m).call(this);this.fire("focus")};h.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,e,h,k,"span",null,null,"");k=k.join("").match(a);n=n.match(d)||["","",""];c.test(n[1])&&(n[1]=n[1].slice(0,-1),n[2]="/"+n[2]);f.push([n[1]," ",k[1]||"",n[2]].join(""))}}}(),fieldset:function(a,d,c,e,h){var f=h.label;this._={children:d};CKEDITOR.ui.dialog.uiElement.call(this,a,h,e,"fieldset",null,null,function(){var a=[];f&&a.push("\x3clegend"+
+(h.labelStyle?' style\x3d"'+h.labelStyle+'"':"")+"\x3e"+f+"\x3c/legend\x3e");for(var b=0;b<c.length;b++)a.push(c[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(a){var d=CKEDITOR.document.getById(this._.labelId);1>d.getChildCount()?(new CKEDITOR.dom.text(a,CKEDITOR.document)).appendTo(d):d.getChild(0).$.nodeValue=a;return this},getLabel:function(){var a=
+CKEDITOR.document.getById(this._.labelId);return!a||1>a.getChildCount()?"":a.getChild(0).getText()},eventProcessors:h},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var a=this.getElement();a&&a.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},
 isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(a,d){this.on("click",function(){d.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
 focus:function(){var a=this.selectParentTab();setTimeout(function(){var d=a.getInputElement();d&&d.$.focus()},0)},select:function(){var a=this.selectParentTab();setTimeout(function(){var d=a.getInputElement();d&&(d.$.focus(),d.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(a){if(this.bidi){var d=a&&a.charAt(0);(d="‪"==d?"ltr":"‫"==d?"rtl":null)&&(a=a.slice(1));this.setDirectionMarker(d)}a||(a="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
-getValue:function(){var a=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&a){var d=this.getDirectionMarker();d&&(a=("ltr"==d?"‪":"‫")+a)}return a},setDirectionMarker:function(a){var d=this.getInputElement();a?d.setAttributes({dir:a,"data-cke-dir-marker":a}):this.getDirectionMarker()&&d.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},g,!0);CKEDITOR.ui.dialog.textarea.prototype=
-new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(a,d,c){var f=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),e=this.getInputElement().$;f.$.text=a;f.$.value=void 0===d||null===d?a:d;void 0===c||null===c?CKEDITOR.env.ie?e.add(f.$):e.add(f.$,null):e.add(f.$,c);return this},remove:function(a){this.getInputElement().$.remove(a);
-return this},clear:function(){for(var a=this.getInputElement().$;0<a.length;)a.remove(0);return this},keyboardFocusable:!0},g,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(a,d){this.getInputElement().$.checked=a;!d&&this.fire("change",{value:a})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(a,
-d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return f.onChange.apply(this,arguments);a.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",d);return null}},keyboardFocusable:!0},g,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(a,d){for(var c=this._.children,f,e=0;e<c.length&&(f=c[e]);e++)f.getElement().$.checked=
-f.getValue()==a;!d&&this.fire("change",{value:a})},getValue:function(){for(var a=this._.children,d=0;d<a.length;d++)if(a[d].getElement().$.checked)return a[d].getValue();return null},accessKeyUp:function(){var a=this._.children,d;for(d=0;d<a.length;d++)if(a[d].getElement().$.checked){a[d].getElement().focus();return}a[0].getElement().focus()},eventProcessors:{onChange:function(a,d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return f.onChange.apply(this,arguments);a.on("load",function(){for(var a=
-this._.children,b=this,d=0;d<a.length;d++)a[d].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",d);return null}}},g,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,g,{getInputElement:function(){var a=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<a.$.forms.length?new CKEDITOR.dom.element(a.$.forms[0].elements[0]):
-this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(a){var d=/^on([A-Z]\w+)/,c,f=function(a,b,d,c){a.on("formLoaded",function(){a.getInputElement().on(d,c,a)})},e;for(e in a)if(c=e.match(d))this.eventProcessors[e]?this.eventProcessors[e].call(this,this._.dialog,a[e]):f(this,this._.dialog,c[1].toLowerCase(),a[e]);return this},reset:function(){function a(){c.$.open();
-var b="";f.size&&(b=f.size-(CKEDITOR.env.ie?7:0));var m=d.frameId+"_input";c.$.write(['\x3chtml dir\x3d"'+n+'" lang\x3d"'+l+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+n+'" lang\x3d"'+l+'" action\x3d"',CKEDITOR.tools.htmlEncode(f.action),'"\x3e\x3clabel id\x3d"',d.labelId,'" for\x3d"',m,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(f.label),
-'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',m,'" aria-labelledby\x3d"',d.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(f.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+g+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+k+")}","\x3c/script\x3e"].join(""));
-c.$.close();for(b=0;b<e.length;b++)e[b].enable()}var d=this._,c=CKEDITOR.document.getById(d.frameId).getFrameDocument(),f=d.definition,e=d.buttons,g=this.formLoadedNumber,k=this.formUnloadNumber,n=d.dialog._.editor.lang.dir,l=d.dialog._.editor.langCode;g||(g=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),k=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(g);
+getValue:function(){var a=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&a){var d=this.getDirectionMarker();d&&(a=("ltr"==d?"‪":"‫")+a)}return a},setDirectionMarker:function(a){var d=this.getInputElement();a?d.setAttributes({dir:a,"data-cke-dir-marker":a}):this.getDirectionMarker()&&d.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.textarea.prototype=
+new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(a,d,c){var e=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),h=this.getInputElement().$;e.$.text=a;e.$.value=void 0===d||null===d?a:d;void 0===c||null===c?CKEDITOR.env.ie?h.add(e.$):h.add(e.$,null):h.add(e.$,c);return this},remove:function(a){this.getInputElement().$.remove(a);
+return this},clear:function(){for(var a=this.getInputElement().$;0<a.length;)a.remove(0);return this},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(a,d){this.getInputElement().$.checked=a;!d&&this.fire("change",{value:a})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(a,
+d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",d);return null}},keyboardFocusable:!0},e,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(a,d){for(var c=this._.children,e,h=0;h<c.length&&(e=c[h]);h++)e.getElement().$.checked=
+e.getValue()==a;!d&&this.fire("change",{value:a})},getValue:function(){for(var a=this._.children,d=0;d<a.length;d++)if(a[d].getElement().$.checked)return a[d].getValue();return null},accessKeyUp:function(){var a=this._.children,d;for(d=0;d<a.length;d++)if(a[d].getElement().$.checked){a[d].getElement().focus();return}a[0].getElement().focus()},eventProcessors:{onChange:function(a,d){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return h.onChange.apply(this,arguments);a.on("load",function(){for(var a=
+this._.children,b=this,d=0;d<a.length;d++)a[d].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",d);return null}}},e,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,e,{getInputElement:function(){var a=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<a.$.forms.length?new CKEDITOR.dom.element(a.$.forms[0].elements[0]):
+this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(a){var d=/^on([A-Z]\w+)/,c,e=function(a,b,d,c){a.on("formLoaded",function(){a.getInputElement().on(d,c,a)})},h;for(h in a)if(c=h.match(d))this.eventProcessors[h]?this.eventProcessors[h].call(this,this._.dialog,a[h]):e(this,this._.dialog,c[1].toLowerCase(),a[h]);return this},reset:function(){function a(){c.$.open();
+var b="";e.size&&(b=e.size-(CKEDITOR.env.ie?7:0));var m=d.frameId+"_input";c.$.write(['\x3chtml dir\x3d"'+n+'" lang\x3d"'+l+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+n+'" lang\x3d"'+l+'" action\x3d"',CKEDITOR.tools.htmlEncode(e.action),'"\x3e\x3clabel id\x3d"',d.labelId,'" for\x3d"',m,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(e.label),
+'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',m,'" aria-labelledby\x3d"',d.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(e.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+f+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+k+")}","\x3c/script\x3e"].join(""));
+c.$.close();for(b=0;b<h.length;b++)h[b].enable()}var d=this._,c=CKEDITOR.document.getById(d.frameId).getFrameDocument(),e=d.definition,h=d.buttons,f=this.formLoadedNumber,k=this.formUnloadNumber,n=d.dialog._.editor.lang.dir,l=d.dialog._.editor.langCode;f||(f=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),k=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(f);
 CKEDITOR.tools.removeFunction(k)}));CKEDITOR.env.gecko?setTimeout(a,500):a()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(a,d){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",d)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
-new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",e);CKEDITOR.dialog.addUIElement("password",e);CKEDITOR.dialog.addUIElement("textarea",c);CKEDITOR.dialog.addUIElement("checkbox",c);CKEDITOR.dialog.addUIElement("radio",c);CKEDITOR.dialog.addUIElement("button",c);CKEDITOR.dialog.addUIElement("select",c);CKEDITOR.dialog.addUIElement("file",c);CKEDITOR.dialog.addUIElement("fileButton",c);CKEDITOR.dialog.addUIElement("html",
-c);CKEDITOR.dialog.addUIElement("fieldset",{build:function(a,d,c){for(var f=d.children,e,g=[],k=[],n=0;n<f.length&&(e=f[n]);n++){var l=[];g.push(l);k.push(CKEDITOR.dialog._.uiElementBuilders[e.type].build(a,e,l))}return new CKEDITOR.ui.dialog[d.type](a,k,g,c,d)}})}}),CKEDITOR.DIALOG_RESIZE_NONE=0,CKEDITOR.DIALOG_RESIZE_WIDTH=1,CKEDITOR.DIALOG_RESIZE_HEIGHT=2,CKEDITOR.DIALOG_RESIZE_BOTH=3,CKEDITOR.DIALOG_STATE_IDLE=1,CKEDITOR.DIALOG_STATE_BUSY=2,function(){function a(){for(var a=this._.tabIdList.length,
-b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,d=b-1;d>b-a;d--)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function e(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),d=b+1;d<b+a;d++)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function c(a,b){for(var d=a.$.getElementsByTagName("input"),c=0,f=d.length;c<f;c++){var h=new CKEDITOR.dom.element(d[c]);
-"text"==h.getAttribute("type").toLowerCase()&&(b?(h.setAttribute("value",h.getCustomData("fake_value")||""),h.removeCustomData("fake_value")):(h.setCustomData("fake_value",h.getAttribute("value")),h.setAttribute("value","")))}}function g(a,b){var d=this.getInputElement();d&&(a?d.removeAttribute("aria-invalid"):d.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}function f(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}
-function m(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",n).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),d=b.getChild([0,0,0,0,0]),c=d.getChild(0),h=d.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(d);!CKEDITOR.env.ie||CKEDITOR.env.quirks||
-CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(d.getParent()));c.unselectable();h.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:c,close:h,tabs:d.getChild(2),contents:d.getChild([3,0,0,0]),footer:d.getChild([3,0,1,0])}}}function l(a,
+new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",f);CKEDITOR.dialog.addUIElement("password",f);CKEDITOR.dialog.addUIElement("textarea",c);CKEDITOR.dialog.addUIElement("checkbox",c);CKEDITOR.dialog.addUIElement("radio",c);CKEDITOR.dialog.addUIElement("button",c);CKEDITOR.dialog.addUIElement("select",c);CKEDITOR.dialog.addUIElement("file",c);CKEDITOR.dialog.addUIElement("fileButton",c);CKEDITOR.dialog.addUIElement("html",
+c);CKEDITOR.dialog.addUIElement("fieldset",{build:function(a,d,c){for(var e=d.children,h,f=[],k=[],l=0;l<e.length&&(h=e[l]);l++){var m=[];f.push(m);k.push(CKEDITOR.dialog._.uiElementBuilders[h.type].build(a,h,m))}return new CKEDITOR.ui.dialog[d.type](a,k,f,c,d)}})}}),CKEDITOR.DIALOG_RESIZE_NONE=0,CKEDITOR.DIALOG_RESIZE_WIDTH=1,CKEDITOR.DIALOG_RESIZE_HEIGHT=2,CKEDITOR.DIALOG_RESIZE_BOTH=3,CKEDITOR.DIALOG_STATE_IDLE=1,CKEDITOR.DIALOG_STATE_BUSY=2,function(){function a(){for(var a=this._.tabIdList.length,
+b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,d=b-1;d>b-a;d--)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function f(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),d=b+1;d<b+a;d++)if(this._.tabs[this._.tabIdList[d%a]][0].$.offsetHeight)return this._.tabIdList[d%a];return null}function c(a,b){for(var d=a.$.getElementsByTagName("input"),c=0,g=d.length;c<g;c++){var e=new CKEDITOR.dom.element(d[c]);
+"text"==e.getAttribute("type").toLowerCase()&&(b?(e.setAttribute("value",e.getCustomData("fake_value")||""),e.removeCustomData("fake_value")):(e.setCustomData("fake_value",e.getAttribute("value")),e.setAttribute("value","")))}}function e(a,b){var d=this.getInputElement();d&&(a?d.removeAttribute("aria-invalid"):d.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}function h(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}
+function m(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",n).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),d=b.getChild([0,0,0,0,0]),c=d.getChild(0),g=d.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(d);!CKEDITOR.env.ie||CKEDITOR.env.quirks||
+CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(d.getParent()));c.unselectable();g.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:c,close:g,tabs:d.getChild(2),contents:d.getChild([3,0,0,0]),footer:d.getChild([3,0,1,0])}}}function l(a,
 b,d){this.element=b;this.focusIndex=d;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function k(a){function b(){a.layout()}var d=CKEDITOR.document.getWindow();d.on("resize",b);a.on("hide",function(){d.removeListener("resize",
-b)})}function b(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function d(a){function b(d){var k=a.getSize(),p=CKEDITOR.document.getWindow().getViewPaneSize(),n=d.data.$.screenX,l=d.data.$.screenY,m=n-c.x,q=l-c.y;c={x:n,y:l};h.x+=m;h.y+=q;a.move(h.x+g[3]<e?-g[3]:h.x-g[1]>p.width-k.width-e?p.width-k.width+("rtl"==f.lang.dir?0:g[1]):h.x,h.y+g[0]<e?-g[0]:h.y-g[2]>p.height-k.height-e?p.height-k.height+g[2]:h.y,1);d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mousemove",
-b);CKEDITOR.document.removeListener("mouseup",d);if(CKEDITOR.env.ie6Compat){var a=A.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",d)}}var c=null,h=null,f=a.getParentEditor(),e=f.config.dialog_magnetDistance,g=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof e&&(e=20);a.parts.title.on("mousedown",function(f){c={x:f.data.$.screenX,y:f.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);h=a.getPosition();if(CKEDITOR.env.ie6Compat){var e=
-A.getChild(0).getFrameDocument();e.on("mousemove",b);e.on("mouseup",d)}f.data.preventDefault()},a)}function h(a){function b(d){var l="rtl"==f.lang.dir,m=n.width,q=n.height,t=m+(d.data.$.screenX-p.x)*(l?-1:1)*(a._.moved?1:2),w=q+(d.data.$.screenY-p.y)*(a._.moved?1:2),r=a._.element.getFirst(),r=l&&r.getComputedStyle("right"),u=a.getPosition();u.y+w>k.height&&(w=k.height-u.y);(l?r:u.x)+t>k.width&&(t=k.width-(l?r:u.x));if(h==CKEDITOR.DIALOG_RESIZE_WIDTH||h==CKEDITOR.DIALOG_RESIZE_BOTH)m=Math.max(c.minWidth||
-0,t-e);if(h==CKEDITOR.DIALOG_RESIZE_HEIGHT||h==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(c.minHeight||0,w-g);a.resize(m,q);a._.moved||a.layout();d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mouseup",d);CKEDITOR.document.removeListener("mousemove",b);l&&(l.remove(),l=null);if(CKEDITOR.env.ie6Compat){var a=A.getChild(0).getFrameDocument();a.removeListener("mouseup",d);a.removeListener("mousemove",b)}}var c=a.definition,h=c.resizable;if(h!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),
-e,g,k,p,n,l,m=CKEDITOR.tools.addFunction(function(c){n=a.getSize();var h=a.parts.contents;h.$.getElementsByTagName("iframe").length&&(l=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),h.append(l));g=n.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));e=n.width-a.parts.contents.getSize("width",1);p={x:c.screenX,y:c.screenY};k=CKEDITOR.document.getWindow().getViewPaneSize();
-CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);CKEDITOR.env.ie6Compat&&(h=A.getChild(0).getFrameDocument(),h.on("mousemove",b),h.on("mouseup",d));c.preventDefault&&c.preventDefault()});a.on("load",function(){var b="";h==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":h==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+
-'" onmousedown\x3d"CKEDITOR.tools.callFunction('+m+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(m)})}}function p(a){a.data.preventDefault(1)}function v(a){var b=CKEDITOR.document.getWindow(),d=a.config,c=d.dialog_backgroundCoverColor||"white",h=d.dialog_backgroundCoverOpacity,f=d.baseFloatZIndex,d=CKEDITOR.tools.genKey(c,h,f),e=B[d];e?e.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?
-"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+c,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(c="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+c+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),f.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+
-c+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),e=CKEDITOR.dom.element.createFromHtml(f.join("")),e.setOpacity(void 0!==h?h:.5),e.on("keydown",p),e.on("keypress",p),e.on("keyup",p),e.appendTo(CKEDITOR.document.getBody()),B[d]=e);a.focusManager.add(e);A=e;a=function(){var a=b.getViewPaneSize();e.setStyles({width:a.width+"px",height:a.height+
-"px"})};var g=function(){var a=b.getScrollPosition(),d=CKEDITOR.dialog._.currentTop;e.setStyles({left:a.x+"px",top:a.y+"px"});if(d){do a=d.getPosition(),d.move(a.x,a.y);while(d=d._.parentDialog)}};x=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||e.focus();if(CKEDITOR.env.ie6Compat){var k=function(){g();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){k.prevScrollHandler=window.onscroll||function(){};window.onscroll=k},0);g()}}function u(a){A&&(a.focusManager.remove(A),
-a=CKEDITOR.document.getWindow(),A.hide(),a.removeListener("resize",x),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),x=null)}var t=CKEDITOR.tools.cssLength,n='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(b,c){function k(){var a=B._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,d=0;d<b;d++)a[d].focusIndex=d}function p(a){var b=B._.focusList;a=a||0;if(!(1>b.length)){var d=B._.currentFocusIndex;B._.tabBarMode&&0>a&&(d=0);try{b[d].getInputElement().$.blur()}catch(c){}var h=d,f=1<B._.pageCount;do{h+=a;if(f&&!B._.tabBarMode&&(h==b.length||-1==h)){B._.tabBarMode=!0;B._.tabs[B._.currentTabId][0].focus();
-B._.currentFocusIndex=-1;return}h=(h+b.length)%b.length;if(h==d)break}while(a&&!b[h].isFocusable());b[h].focus();"text"==b[h].type&&b[h].select()}}function n(d){if(B==CKEDITOR.dialog._.currentTop){var c=d.data.getKeystroke(),h="rtl"==b.lang.dir,f=[37,38,39,40];v=C=0;if(9==c||c==CKEDITOR.SHIFT+9)p(c==CKEDITOR.SHIFT+9?-1:1),v=1;else if(c==CKEDITOR.ALT+121&&!B._.tabBarMode&&1<B.getPageCount())B._.tabBarMode=!0,B._.tabs[B._.currentTabId][0].focus(),B._.currentFocusIndex=-1,v=1;else if(-1!=CKEDITOR.tools.indexOf(f,
-c)&&B._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([h?39:37,38],c)?a.call(B):e.call(B),B.selectPage(c),B._.tabs[c][0].focus(),v=1;else if(13!=c&&32!=c||!B._.tabBarMode)if(13==c)c=d.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),v=1),C=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),C=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,p(1),v=1;l(d)}}function l(a){v?a.data.preventDefault(1):C&&a.data.stopPropagation()}var t=CKEDITOR.dialog._.dialogDefinitions[c],w=CKEDITOR.tools.clone(q),u=b.config.dialog_buttonsOrder||"OS",y=b.lang.dir,H={},v,C;("OS"==u&&CKEDITOR.env.mac||"rtl"==u&&"ltr"==y||"ltr"==u&&"rtl"==y)&&w.buttons.reverse();t=CKEDITOR.tools.extend(t(b),w);t=CKEDITOR.tools.clone(t);t=new r(this,t);w=m(b);this._={editor:b,element:w.element,name:c,contentSize:{width:0,height:0},
-size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=w.parts;CKEDITOR.tools.setTimeout(function(){b.fire("ariaWidget",this.parts.contents)},0,this);w={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};w["rtl"==y?"right":"left"]=0;this.parts.dialog.setStyles(w);CKEDITOR.event.call(this);this.definition=t=CKEDITOR.fire("dialogDefinition",
-{name:c,definition:t},b).definition;if(!("removeDialogTabs"in b._)&&b.config.removeDialogTabs){w=b.config.removeDialogTabs.split(";");for(y=0;y<w.length;y++)if(u=w[y].split(":"),2==u.length){var x=u[0];H[x]||(H[x]=[]);H[x].push(u[1])}b._.removeDialogTabs=H}if(b._.removeDialogTabs&&(H=b._.removeDialogTabs[c]))for(y=0;y<H.length;y++)t.removeContents(H[y]);if(t.onLoad)this.on("load",t.onLoad);if(t.onShow)this.on("show",t.onShow);if(t.onHide)this.on("hide",t.onHide);if(t.onOk)this.on("ok",function(a){b.fire("saveSnapshot");
-setTimeout(function(){b.fire("saveSnapshot")},0);!1===t.onOk.call(this,a)&&(a.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(t.onCancel)this.on("cancel",function(a){!1===t.onCancel.call(this,a)&&(a.data.hide=!1)});var B=this,z=function(a){var b=B._.contents,d=!1,c;for(c in b)for(var h in b[c])if(d=a.call(this,b[c][h]))return};this.on("ok",function(a){z(function(b){if(b.validate){var d=b.validate(this),c="string"==typeof d||!1===d;c&&(a.data.hide=!1,a.stop());g.call(b,!c,"string"==typeof d?
-d:void 0);return c}})},this,null,0);this.on("cancel",function(a){z(function(d){if(d.isChanged())return b.config.dialog_noConfirmCancel||confirm(b.lang.common.confirmCancel)||(a.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=p;var A=this._.element;b.focusManager.add(A,1);this.on("show",function(){A.on("keydown",n,this);if(CKEDITOR.env.gecko)A.on("keypress",l,this)});this.on("hide",
-function(){A.removeListener("keydown",n);CKEDITOR.env.gecko&&A.removeListener("keypress",l);z(function(a){f.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",n,this,null,0)});this.on("show",function(){k();var a=1<B._.pageCount;b.config.dialog_startupFocusTab&&a?(B._.tabBarMode=!0,B._.tabs[B._.currentTabId][0].focus(),B._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=a?-1:this._.focusList.length-1,t.onFocus?
-(a=t.onFocus.call(this))&&a.focus():p(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);d(this);h(this);(new CKEDITOR.dom.text(t.title,CKEDITOR.document)).appendTo(this.parts.title);for(y=0;y<t.contents.length;y++)(H=t.contents[y])&&this.addPage(H);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,p(1)),a.data.preventDefault())},this);y=[];H=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:t.buttons},y).getChild();this.parts.footer.setHtml(y.join(""));for(y=0;y<H.length;y++)this._.buttons[H[y].id]=H[y]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
+b)})}function b(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function d(a){function b(d){var k=a.getSize(),p=CKEDITOR.document.getWindow().getViewPaneSize(),l=d.data.$.screenX,n=d.data.$.screenY,m=l-c.x,q=n-c.y;c={x:l,y:n};g.x+=m;g.y+=q;a.move(g.x+f[3]<h?-f[3]:g.x-f[1]>p.width-k.width-h?p.width-k.width+("rtl"==e.lang.dir?0:f[1]):g.x,g.y+f[0]<h?-f[0]:g.y-f[2]>p.height-k.height-h?p.height-k.height+f[2]:g.y,1);d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mousemove",
+b);CKEDITOR.document.removeListener("mouseup",d);if(CKEDITOR.env.ie6Compat){var a=y.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",d)}}var c=null,g=null,e=a.getParentEditor(),h=e.config.dialog_magnetDistance,f=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof h&&(h=20);a.parts.title.on("mousedown",function(e){c={x:e.data.$.screenX,y:e.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);g=a.getPosition();if(CKEDITOR.env.ie6Compat){var h=
+y.getChild(0).getFrameDocument();h.on("mousemove",b);h.on("mouseup",d)}e.data.preventDefault()},a)}function g(a){function b(d){var n="rtl"==e.lang.dir,m=l.width,q=l.height,r=m+(d.data.$.screenX-p.x)*(n?-1:1)*(a._.moved?1:2),w=q+(d.data.$.screenY-p.y)*(a._.moved?1:2),t=a._.element.getFirst(),t=n&&t.getComputedStyle("right"),v=a.getPosition();v.y+w>k.height&&(w=k.height-v.y);(n?t:v.x)+r>k.width&&(r=k.width-(n?t:v.x));if(g==CKEDITOR.DIALOG_RESIZE_WIDTH||g==CKEDITOR.DIALOG_RESIZE_BOTH)m=Math.max(c.minWidth||
+0,r-h);if(g==CKEDITOR.DIALOG_RESIZE_HEIGHT||g==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(c.minHeight||0,w-f);a.resize(m,q);a._.moved||a.layout();d.data.preventDefault()}function d(){CKEDITOR.document.removeListener("mouseup",d);CKEDITOR.document.removeListener("mousemove",b);n&&(n.remove(),n=null);if(CKEDITOR.env.ie6Compat){var a=y.getChild(0).getFrameDocument();a.removeListener("mouseup",d);a.removeListener("mousemove",b)}}var c=a.definition,g=c.resizable;if(g!=CKEDITOR.DIALOG_RESIZE_NONE){var e=a.getParentEditor(),
+h,f,k,p,l,n,m=CKEDITOR.tools.addFunction(function(c){l=a.getSize();var g=a.parts.contents;g.$.getElementsByTagName("iframe").length&&(n=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),g.append(n));f=l.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));h=l.width-a.parts.contents.getSize("width",1);p={x:c.screenX,y:c.screenY};k=CKEDITOR.document.getWindow().getViewPaneSize();
+CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",d);CKEDITOR.env.ie6Compat&&(g=y.getChild(0).getFrameDocument(),g.on("mousemove",b),g.on("mouseup",d));c.preventDefault&&c.preventDefault()});a.on("load",function(){var b="";g==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":g==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+b+" cke_resizer_"+e.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(e.lang.common.resize)+
+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+m+', event )"\x3e'+("ltr"==e.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});e.on("destroy",function(){CKEDITOR.tools.removeFunction(m)})}}function p(a){a.data.preventDefault(1)}function u(a){var b=CKEDITOR.document.getWindow(),d=a.config,c=d.dialog_backgroundCoverColor||"white",g=d.dialog_backgroundCoverOpacity,e=d.baseFloatZIndex,d=CKEDITOR.tools.genKey(c,g,e),h=D[d];h?h.show():(e=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?
+"absolute":"fixed","; z-index: ",e,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+c,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(c="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+c+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",e.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),e.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+
+c+"' );document.close();")+"})())"),e.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),e.push("\x3c/div\x3e"),h=CKEDITOR.dom.element.createFromHtml(e.join("")),h.setOpacity(void 0!==g?g:.5),h.on("keydown",p),h.on("keypress",p),h.on("keyup",p),h.appendTo(CKEDITOR.document.getBody()),D[d]=h);a.focusManager.add(h);y=h;a=function(){var a=b.getViewPaneSize();h.setStyles({width:a.width+"px",height:a.height+
+"px"})};var f=function(){var a=b.getScrollPosition(),d=CKEDITOR.dialog._.currentTop;h.setStyles({left:a.x+"px",top:a.y+"px"});if(d){do a=d.getPosition(),d.move(a.x,a.y);while(d=d._.parentDialog)}};x=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||h.focus();if(CKEDITOR.env.ie6Compat){var k=function(){f();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){k.prevScrollHandler=window.onscroll||function(){};window.onscroll=k},0);f()}}function v(a){y&&(a.focusManager.remove(y),
+a=CKEDITOR.document.getWindow(),y.hide(),a.removeListener("resize",x),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),x=null)}var r=CKEDITOR.tools.cssLength,n='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
+CKEDITOR.dialog=function(b,c){function k(){var a=D._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,d=0;d<b;d++)a[d].focusIndex=d}function p(a){var b=D._.focusList;a=a||0;if(!(1>b.length)){var d=D._.currentFocusIndex;D._.tabBarMode&&0>a&&(d=0);try{b[d].getInputElement().$.blur()}catch(c){}var g=d,e=1<D._.pageCount;do{g+=a;if(e&&!D._.tabBarMode&&(g==b.length||-1==g)){D._.tabBarMode=!0;D._.tabs[D._.currentTabId][0].focus();
+D._.currentFocusIndex=-1;return}g=(g+b.length)%b.length;if(g==d)break}while(a&&!b[g].isFocusable());b[g].focus();"text"==b[g].type&&b[g].select()}}function l(d){if(D==CKEDITOR.dialog._.currentTop){var c=d.data.getKeystroke(),g="rtl"==b.lang.dir,e=[37,38,39,40];A=B=0;if(9==c||c==CKEDITOR.SHIFT+9)p(c==CKEDITOR.SHIFT+9?-1:1),A=1;else if(c==CKEDITOR.ALT+121&&!D._.tabBarMode&&1<D.getPageCount())D._.tabBarMode=!0,D._.tabs[D._.currentTabId][0].focus(),D._.currentFocusIndex=-1,A=1;else if(-1!=CKEDITOR.tools.indexOf(e,
+c)&&D._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([g?39:37,38],c)?a.call(D):f.call(D),D.selectPage(c),D._.tabs[c][0].focus(),A=1;else if(13!=c&&32!=c||!D._.tabBarMode)if(13==c)c=d.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),A=1),B=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),B=1;else return;else this.selectPage(this._.currentTabId),
+this._.tabBarMode=!1,this._.currentFocusIndex=-1,p(1),A=1;n(d)}}function n(a){A?a.data.preventDefault(1):B&&a.data.stopPropagation()}var r=CKEDITOR.dialog._.dialogDefinitions[c],w=CKEDITOR.tools.clone(q),v=b.config.dialog_buttonsOrder||"OS",u=b.lang.dir,H={},A,B;("OS"==v&&CKEDITOR.env.mac||"rtl"==v&&"ltr"==u||"ltr"==v&&"rtl"==u)&&w.buttons.reverse();r=CKEDITOR.tools.extend(r(b),w);r=CKEDITOR.tools.clone(r);r=new t(this,r);w=m(b);this._={editor:b,element:w.element,name:c,contentSize:{width:0,height:0},
+size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=w.parts;CKEDITOR.tools.setTimeout(function(){b.fire("ariaWidget",this.parts.contents)},0,this);w={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};w["rtl"==u?"right":"left"]=0;this.parts.dialog.setStyles(w);CKEDITOR.event.call(this);this.definition=r=CKEDITOR.fire("dialogDefinition",
+{name:c,definition:r},b).definition;if(!("removeDialogTabs"in b._)&&b.config.removeDialogTabs){w=b.config.removeDialogTabs.split(";");for(u=0;u<w.length;u++)if(v=w[u].split(":"),2==v.length){var x=v[0];H[x]||(H[x]=[]);H[x].push(v[1])}b._.removeDialogTabs=H}if(b._.removeDialogTabs&&(H=b._.removeDialogTabs[c]))for(u=0;u<H.length;u++)r.removeContents(H[u]);if(r.onLoad)this.on("load",r.onLoad);if(r.onShow)this.on("show",r.onShow);if(r.onHide)this.on("hide",r.onHide);if(r.onOk)this.on("ok",function(a){b.fire("saveSnapshot");
+setTimeout(function(){b.fire("saveSnapshot")},0);!1===r.onOk.call(this,a)&&(a.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(r.onCancel)this.on("cancel",function(a){!1===r.onCancel.call(this,a)&&(a.data.hide=!1)});var D=this,z=function(a){var b=D._.contents,d=!1,c;for(c in b)for(var g in b[c])if(d=a.call(this,b[c][g]))return};this.on("ok",function(a){z(function(b){if(b.validate){var d=b.validate(this),c="string"==typeof d||!1===d;c&&(a.data.hide=!1,a.stop());e.call(b,!c,"string"==typeof d?
+d:void 0);return c}})},this,null,0);this.on("cancel",function(a){z(function(d){if(d.isChanged())return b.config.dialog_noConfirmCancel||confirm(b.lang.common.confirmCancel)||(a.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=p;var y=this._.element;b.focusManager.add(y,1);this.on("show",function(){y.on("keydown",l,this);if(CKEDITOR.env.gecko)y.on("keypress",n,this)});this.on("hide",
+function(){y.removeListener("keydown",l);CKEDITOR.env.gecko&&y.removeListener("keypress",n);z(function(a){h.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",l,this,null,0)});this.on("show",function(){k();var a=1<D._.pageCount;b.config.dialog_startupFocusTab&&a?(D._.tabBarMode=!0,D._.tabs[D._.currentTabId][0].focus(),D._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=a?-1:this._.focusList.length-1,r.onFocus?
+(a=r.onFocus.call(this))&&a.focus():p(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);d(this);g(this);(new CKEDITOR.dom.text(r.title,CKEDITOR.document)).appendTo(this.parts.title);for(u=0;u<r.contents.length;u++)(H=r.contents[u])&&this.addPage(H);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
+this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,p(1)),a.data.preventDefault())},this);u=[];H=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:r.buttons},u).getChild();this.parts.footer.setHtml(u.join(""));for(u=0;u<H.length;u++)this._.buttons[H[u].id]=H[u]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
 a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
-return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,d){var c=this._.element.getFirst(),h="rtl"==this._.editor.lang.dir,f="fixed"==c.getComputedStyle("position");CKEDITOR.env.ie&&c.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),h&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
-b[h?"right":"left"]=(0<a?a:0)+"px",c.setStyles(b),d&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
-null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,v(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
-a.on("keydown",D);a.on("keyup",G);this._.hasFocus=!1;for(var d in b.contents)if(b.contents[d]){var a=b.contents[d],c=this._.tabs[a.id],h=a.requiredContent,f=0;if(c){for(var e in this._.contents[a.id]){var g=this._.contents[a.id][e];"hbox"!=g.type&&"vbox"!=g.type&&g.getInputElement()&&(g.requiredContent&&!this._.editor.activeFilter.check(g.requiredContent)?g.disable():(g.enable(),f++))}!f||h&&!this._.editor.activeFilter.check(h)?c[0].addClass("cke_dialog_tab_disabled"):c[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
-k(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),d=CKEDITOR.document.getWindow().getViewPaneSize(),c=(d.width-b.width)/2,h=(d.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<h?h:0)>d.height||
-b.width+(0<c?c:0)>d.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:c,this._.moved?this._.position.y:h)},foreach:function(a){for(var b in this._.contents)for(var d in this._.contents[b])a.call(this,this._.contents[b][d]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
+return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,d){var c=this._.element.getFirst(),g="rtl"==this._.editor.lang.dir,e="fixed"==c.getComputedStyle("position");CKEDITOR.env.ie&&c.setStyle("zoom","100%");e&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},e||(e=CKEDITOR.document.getWindow().getScrollPosition(),a+=e.x,b+=e.y),g&&(e=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-e.width-a),b={top:(0<b?b:0)+"px"},
+b[g?"right":"left"]=(0<a?a:0)+"px",c.setStyles(b),d&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
+null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,u(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
+a.on("keydown",C);a.on("keyup",G);this._.hasFocus=!1;for(var d in b.contents)if(b.contents[d]){var a=b.contents[d],c=this._.tabs[a.id],g=a.requiredContent,e=0;if(c){for(var h in this._.contents[a.id]){var f=this._.contents[a.id][h];"hbox"!=f.type&&"vbox"!=f.type&&f.getInputElement()&&(f.requiredContent&&!this._.editor.activeFilter.check(f.requiredContent)?f.disable():(f.enable(),e++))}!e||g&&!this._.editor.activeFilter.check(g)?c[0].addClass("cke_dialog_tab_disabled"):c[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
+k(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),d=CKEDITOR.document.getWindow().getViewPaneSize(),c=(d.width-b.width)/2,g=(d.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<g?g:0)>d.height||
+b.width+(0<c?c:0)>d.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:c,this._.moved?this._.position.y:g)},foreach:function(a){for(var b in this._.contents)for(var d in this._.contents[b])a.call(this,this._.contents[b][d]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
 commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(J(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
-if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else u(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",D);a.removeListener("keyup",G);var d=this._.editor;d.focus();setTimeout(function(){d.focusManager.unlock();CKEDITOR.env.iOS&&d.window.focus()},0)}delete this._.parentDialog;
-this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],d=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",c=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),h=this._.contents[a.id]={},f=c.getChild(),
-e=0;c=f.shift();)c.notAllowed||"hbox"==c.type||"vbox"==c.type||e++,h[c.id]=c,"function"==typeof c.getChild&&f.push.apply(f,c.getChild());e||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");c=CKEDITOR.env;h="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();d=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",d,a.hidden?' style\x3d"display:none"':"",' id\x3d"',h,'"',c.gecko&&!c.hc?"":' href\x3d"javascript:void(0)"',
-' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",h);this._.tabs[a.id]=[d,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=d;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);d.unselectable();this.parts.tabs.append(d);a.accessKey&&(F(this,this,"CTRL+"+a.accessKey,N,I),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
-!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var d=this._.tabs[b][0],h=this._.tabs[b][1];b!=a&&(d.removeClass("cke_dialog_tab_selected"),h.hide());h.setAttribute("aria-hidden",b!=a)}var f=this._.tabs[a];f[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(c(f[1]),f[1].show(),setTimeout(function(){c(f[1],1)},0)):f[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
+if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else v(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",C);a.removeListener("keyup",G);var d=this._.editor;d.focus();setTimeout(function(){d.focusManager.unlock();CKEDITOR.env.iOS&&d.window.focus()},0)}delete this._.parentDialog;
+this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],d=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",c=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),g=this._.contents[a.id]={},e=c.getChild(),
+h=0;c=e.shift();)c.notAllowed||"hbox"==c.type||"vbox"==c.type||h++,g[c.id]=c,"function"==typeof c.getChild&&e.push.apply(e,c.getChild());h||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");c=CKEDITOR.env;g="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();d=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",d,a.hidden?' style\x3d"display:none"':"",' id\x3d"',g,'"',c.gecko&&!c.hc?"":' href\x3d"javascript:void(0)"',
+' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",g);this._.tabs[a.id]=[d,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=d;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);d.unselectable();this.parts.tabs.append(d);a.accessKey&&(E(this,this,"CTRL+"+a.accessKey,N,I),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
+!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var d=this._.tabs[b][0],g=this._.tabs[b][1];b!=a&&(d.removeClass("cke_dialog_tab_selected"),g.hide());g.setAttribute("aria-hidden",b!=a)}var e=this._.tabs[a];e[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(c(e[1]),e[1].show(),setTimeout(function(){c(e[1],1)},0)):e[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
 updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(b){var d=this._.tabs[b]&&this._.tabs[b][0];d&&1!=this._.pageCount&&d.isVisible()&&(b==this._.currentTabId&&this.selectPage(a.call(this)),d.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},
 getContentElement:function(a,b){var d=this._.contents[a];return d&&d[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,d){return this.getContentElement(a,b).setValue(d)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},
 getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new l(this,a,b));else{this._.focusList.splice(b,0,new l(this,a,b));for(var d=b+1;d<this._.focusList.length;d++)this._.focusList[d].focusIndex++}},setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,d={attributes:{"class":"cke_dialog_spinner"},
 styles:{"float":"rtl"==b?"right":"left"}};d.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",d);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&
 "function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,d){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+d+"(?:$|;)","i")))},okButton:function(){var a=function(a,b){b=b||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",
 {hide:!0}).hide&&a.hide()}},b,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(d){return a(d,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,b){b=b||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},b,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(d){return a(d,
-b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var q={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},w=function(a,b,d){for(var c=0,h;h=a[c];c++)if(h.id==b||d&&h[d]&&(h=w(h[d],
-b,d)))return h;return null},y=function(a,b,d,c,h){if(d){for(var f=0,e;e=a[f];f++){if(e.id==d)return a.splice(f,0,b),b;if(c&&e[c]&&(e=y(e[c],b,d,c,!0)))return e}if(h)return null}a.push(b);return b},C=function(a,b,d){for(var c=0,h;h=a[c];c++){if(h.id==b)return a.splice(c,1);if(d&&h[d]&&(h=C(h[d],b,d)))return h}return null},r=function(a,d){this.dialog=a;for(var c=d.contents,h=0,f;f=c[h];h++)c[h]=f&&new b(a,f);CKEDITOR.tools.extend(this,d)};r.prototype={getContents:function(a){return w(this.contents,
-a)},getButton:function(a){return w(this.buttons,a)},addContents:function(a,b){return y(this.contents,a,b)},addButton:function(a,b){return y(this.buttons,a,b)},removeContents:function(a){C(this.contents,a)},removeButton:function(a){C(this.buttons,a)}};b.prototype={get:function(a){return w(this.elements,a,"children")},add:function(a,b){return y(this.elements,a,b,"children")},remove:function(a){C(this.elements,a,"children")}};var x,B={},A,z={},D=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=
-a.data.$.altKey,c=a.data.$.shiftKey,h=String.fromCharCode(a.data.$.keyCode);(b=z[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+h])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},G=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=a.data.$.altKey,c=a.data.$.shiftKey,h=String.fromCharCode(a.data.$.keyCode);(b=z[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+h])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
-a.data.preventDefault()))},F=function(a,b,d,c,h){(z[d]||(z[d]=[])).push({uiElement:a,dialog:b,key:d,keyup:h||a.accessKeyUp,keydown:c||a.accessKeyDown})},J=function(a){for(var b in z){for(var d=z[b],c=d.length-1;0<=c;c--)d[c].dialog!=a&&d[c].uiElement!=a||d.splice(c,1);0===d.length&&delete z[b]}},I=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},N=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,d,c,h,f,e){if(!(4>arguments.length)){var g=(c.call?c(b):c)||"div",
-k=["\x3c",g," "],p=(h&&h.call?h(b):h)||{},n=(f&&f.call?f(b):f)||{},l=(e&&e.call?e.call(this,a,b):e)||"",m=this.domId=n.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(p.display="none",this.notAllowed=!0);n.id=m;var t={};b.type&&(t["cke_dialog_ui_"+b.type]=1);b.className&&(t[b.className]=1);b.disabled&&(t.cke_disabled=1);for(var q=n["class"]&&n["class"].split?n["class"].split(" "):[],m=0;m<q.length;m++)q[m]&&(t[q[m]]=1);q=[];for(m in t)q.push(m);
-n["class"]=q.join(" ");b.title&&(n.title=b.title);t=(b.style||"").split(";");b.align&&(q=b.align,p["margin-left"]="left"==q?0:"auto",p["margin-right"]="right"==q?0:"auto");for(m in p)t.push(m+":"+p[m]);b.hidden&&t.push("display:none");for(m=t.length-1;0<=m;m--)""===t[m]&&t.splice(m,1);0<t.length&&(n.style=(n.style?n.style+"; ":"")+t.join("; "));for(m in n)k.push(m+'\x3d"'+CKEDITOR.tools.htmlEncode(n[m])+'" ');k.push("\x3e",l,"\x3c/",g,"\x3e");d.push(k.join(""));(this._||(this._={})).dialog=a;"boolean"==
+b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var q={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},w=function(a,b,d){for(var c=0,g;g=a[c];c++)if(g.id==b||d&&g[d]&&(g=w(g[d],
+b,d)))return g;return null},A=function(a,b,d,c,g){if(d){for(var e=0,h;h=a[e];e++){if(h.id==d)return a.splice(e,0,b),b;if(c&&h[c]&&(h=A(h[c],b,d,c,!0)))return h}if(g)return null}a.push(b);return b},B=function(a,b,d){for(var c=0,g;g=a[c];c++){if(g.id==b)return a.splice(c,1);if(d&&g[d]&&(g=B(g[d],b,d)))return g}return null},t=function(a,d){this.dialog=a;for(var c=d.contents,g=0,e;e=c[g];g++)c[g]=e&&new b(a,e);CKEDITOR.tools.extend(this,d)};t.prototype={getContents:function(a){return w(this.contents,
+a)},getButton:function(a){return w(this.buttons,a)},addContents:function(a,b){return A(this.contents,a,b)},addButton:function(a,b){return A(this.buttons,a,b)},removeContents:function(a){B(this.contents,a)},removeButton:function(a){B(this.buttons,a)}};b.prototype={get:function(a){return w(this.elements,a,"children")},add:function(a,b){return A(this.elements,a,b,"children")},remove:function(a){B(this.elements,a,"children")}};var x,D={},y,z={},C=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=
+a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=z[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},G=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,d=a.data.$.altKey,c=a.data.$.shiftKey,g=String.fromCharCode(a.data.$.keyCode);(b=z[(b?"CTRL+":"")+(d?"ALT+":"")+(c?"SHIFT+":"")+g])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
+a.data.preventDefault()))},E=function(a,b,d,c,g){(z[d]||(z[d]=[])).push({uiElement:a,dialog:b,key:d,keyup:g||a.accessKeyUp,keydown:c||a.accessKeyDown})},J=function(a){for(var b in z){for(var d=z[b],c=d.length-1;0<=c;c--)d[c].dialog!=a&&d[c].uiElement!=a||d.splice(c,1);0===d.length&&delete z[b]}},I=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},N=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,d,c,g,e,h){if(!(4>arguments.length)){var f=(c.call?c(b):c)||"div",
+k=["\x3c",f," "],p=(g&&g.call?g(b):g)||{},l=(e&&e.call?e(b):e)||{},n=(h&&h.call?h.call(this,a,b):h)||"",m=this.domId=l.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(p.display="none",this.notAllowed=!0);l.id=m;var q={};b.type&&(q["cke_dialog_ui_"+b.type]=1);b.className&&(q[b.className]=1);b.disabled&&(q.cke_disabled=1);for(var r=l["class"]&&l["class"].split?l["class"].split(" "):[],m=0;m<r.length;m++)r[m]&&(q[r[m]]=1);r=[];for(m in q)r.push(m);
+l["class"]=r.join(" ");b.title&&(l.title=b.title);q=(b.style||"").split(";");b.align&&(r=b.align,p["margin-left"]="left"==r?0:"auto",p["margin-right"]="right"==r?0:"auto");for(m in p)q.push(m+":"+p[m]);b.hidden&&q.push("display:none");for(m=q.length-1;0<=m;m--)""===q[m]&&q.splice(m,1);0<q.length&&(l.style=(l.style?l.style+"; ":"")+q.join("; "));for(m in l)k.push(m+'\x3d"'+CKEDITOR.tools.htmlEncode(l[m])+'" ');k.push("\x3e",n,"\x3c/",f,"\x3e");d.push(k.join(""));(this._||(this._={})).dialog=a;"boolean"==
 typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(d){a.call(this,b.setValue.call(this,d))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);this.registerEvents(b);
-this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&F(this,a,"CTRL+"+b.accessKey);var w=this;a.on("load",function(){var b=w.getInputElement();if(b){var d=w.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;w.fire("focus");d&&this.addClass(d)});b.on("blur",function(){w.fire("blur");d&&this.removeClass(d)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=
-a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=w.focusIndex}))}},hbox:function(a,b,d,c,h){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,e=h&&h.widths||null,g=h&&h.height||null,k,n={role:"presentation"};h&&h.align&&(n.align=h.align);CKEDITOR.ui.dialog.uiElement.call(this,a,h||{type:"hbox"},c,"table",{},n,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(k=0;k<d.length;k++){var b="cke_dialog_ui_hbox_child",c=[];0===k&&
-(b="cke_dialog_ui_hbox_first");k==d.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');e?e[k]&&c.push("width:"+t(e[k])):c.push("width:"+Math.floor(100/d.length)+"%");g&&c.push("height:"+t(g));h&&void 0!==h.padding&&c.push("padding:"+t(h.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[k].align&&c.push("text-align:"+f[k].align);0<c.length&&a.push('style\x3d"'+c.join("; ")+'" ');a.push("\x3e",d[k],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},
-vbox:function(a,b,d,c,h){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,e=h&&h.width||null,g=h&&h.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,h||{type:"vbox"},c,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');h&&h.expand&&b.push("height:100%;");b.push("width:"+t(e||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(h&&
-h.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var c=0;c<d.length;c++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');e&&k.push("width:"+t(e||"100%"));g?k.push("height:"+t(g[c])):h&&h.expand&&k.push("height:"+Math.floor(100/d.length)+"%");h&&void 0!==h.padding&&k.push("padding:"+t(h.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[c].align&&k.push("text-align:"+f[c].align);0<k.length&&b.push('style\x3d"',k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',
+this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&E(this,a,"CTRL+"+b.accessKey);var w=this;a.on("load",function(){var b=w.getInputElement();if(b){var d=w.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;w.fire("focus");d&&this.addClass(d)});b.on("blur",function(){w.fire("blur");d&&this.removeClass(d)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=
+a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=w.focusIndex}))}},hbox:function(a,b,d,c,g){if(!(4>arguments.length)){this._||(this._={});var e=this._.children=b,h=g&&g.widths||null,f=g&&g.height||null,k,p={role:"presentation"};g&&g.align&&(p.align=g.align);CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"hbox"},c,"table",{},p,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(k=0;k<d.length;k++){var b="cke_dialog_ui_hbox_child",c=[];0===k&&
+(b="cke_dialog_ui_hbox_first");k==d.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');h?h[k]&&c.push("width:"+r(h[k])):c.push("width:"+Math.floor(100/d.length)+"%");f&&c.push("height:"+r(f));g&&void 0!==g.padding&&c.push("padding:"+r(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[k].align&&c.push("text-align:"+e[k].align);0<c.length&&a.push('style\x3d"'+c.join("; ")+'" ');a.push("\x3e",d[k],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},
+vbox:function(a,b,d,c,g){if(!(3>arguments.length)){this._||(this._={});var e=this._.children=b,h=g&&g.width||null,f=g&&g.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,g||{type:"vbox"},c,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');g&&g.expand&&b.push("height:100%;");b.push("width:"+r(h||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(g&&
+g.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var c=0;c<d.length;c++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');h&&k.push("width:"+r(h||"100%"));f?k.push("height:"+r(f[c])):g&&g.expand&&k.push("height:"+Math.floor(100/d.length)+"%");g&&void 0!==g.padding&&k.push("padding:"+r(g.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&e[c].align&&k.push("text-align:"+e[c].align);0<k.length&&b.push('style\x3d"',k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',
 d[c],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},isChanged:function(){return!1},selectParentTab:function(){for(var a=
-this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,d,c=function(a,b,d,c){b.on("load",function(){a.getInputElement().on(d,c,a)})},h;for(h in a)if(d=h.match(b))this.eventProcessors[h]?this.eventProcessors[h].call(this,
-this._.dialog,a[h]):c(this,this._.dialog,d[1].toLowerCase(),a[h]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=this.getElement();this.getInputElement().removeAttribute("disabled");
+this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,d,c=function(a,b,d,c){b.on("load",function(){a.getInputElement().on(d,c,a)})},g;for(g in a)if(d=g.match(b))this.eventProcessors[g]?this.eventProcessors[g].call(this,
+this._.dialog,a[g]):c(this,this._.dialog,d[1].toLowerCase(),a[g]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=this.getElement();this.getInputElement().removeAttribute("disabled");
 a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?
-this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,b,d){for(var c=b.children,h,f=[],e=[],g=0;g<c.length&&(h=c[g]);g++){var k=[];f.push(k);e.push(CKEDITOR.dialog._.uiElementBuilders[h.type].build(a,h,k))}return new CKEDITOR.ui.dialog[b.type](a,e,f,d,b)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;
-CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,d=/^\d*(?:\.\d+)?$/,c=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,h=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=arguments;return function(){var b=this&&this.getValue?this.getValue():
-a[0],d,c=CKEDITOR.VALIDATE_AND,h=[],f;for(f=0;f<a.length;f++)if("function"==typeof a[f])h.push(a[f]);else break;f<a.length&&"string"==typeof a[f]&&(d=a[f],f++);f<a.length&&"number"==typeof a[f]&&(c=a[f]);var e=c==CKEDITOR.VALIDATE_AND?!0:!1;for(f=0;f<h.length;f++)e=c==CKEDITOR.VALIDATE_AND?e&&h[f](b):e||h[f](b);return e?!0:d}},regex:function(a,b){return function(d){d=this&&this.getValue?this.getValue():d;return a.test(d)?!0:b}},notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,
-a)},number:function(a){return this.regex(d,a)},cssLength:function(a){return this.functions(function(a){return h.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return c.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",
-function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var d in B)B[d].remove();B={}}a=a.editor._.storedDialogs;for(var c in a)a[c].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var d=null,c=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&v(this);if("function"==typeof c)d=this._.storedDialogs||(this._.storedDialogs={}),d=d[a]||(d[a]=new CKEDITOR.dialog(this,a)),b&&b.call(d,
-d),d.show();else{if("failed"==c)throw u(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof c&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return d}})}(),CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(a){a.on("doubleclick",function(e){e.data.dialog&&
-a.openDialog(e.data.dialog)},null,null,999)}}),CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var e=a.addCommand("about",new CKEDITOR.dialogCommand("about"));e.modes={wysiwyg:1,source:1};e.canUndo=!1;e.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}}),function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,
-de:1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(a){var e=this;a.addCommand("a11yHelp",{exec:function(){var c=a.langCode,c=e.availableLangs[c]?c:e.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e.path+
-"dialogs/lang/"+c+".js"),function(){a.lang.a11yhelp=e.langEntries[c];a.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});a.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");a.on("ariaEditorHelpLabel",function(c){c.data.label=a.lang.common.editorHelp})}})}(),CKEDITOR.plugins.add("basicstyles",{init:function(a){var e=0,c=function(c,f,b,d){if(d){d=new CKEDITOR.style(d);var h=g[b];h.unshift(d);a.attachStyleStateChange(d,
-function(d){!a.readOnly&&a.getCommand(b).setState(d)});a.addCommand(b,new CKEDITOR.styleCommand(d,{contentForms:h}));a.ui.addButton&&a.ui.addButton(c,{label:f,command:b,toolbar:"basicstyles,"+(e+=10)})}},g={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==
-a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},f=a.config,m=a.lang.basicstyles;c("Bold",m.bold,"bold",f.coreStyles_bold);c("Italic",m.italic,"italic",f.coreStyles_italic);c("Underline",m.underline,"underline",f.coreStyles_underline);c("Strike",m.strike,"strike",f.coreStyles_strike);c("Subscript",m.subscript,"subscript",f.coreStyles_subscript);c("Superscript",m.superscript,"superscript",f.coreStyles_superscript);a.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],
-[CKEDITOR.CTRL+85,"underline"]])}}),CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"},CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"},CKEDITOR.config.coreStyles_underline={element:"u"},CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"},CKEDITOR.config.coreStyles_subscript={element:"sub"},CKEDITOR.config.coreStyles_superscript={element:"sup"},function(){var a={exec:function(a){var c=a.getCommand("blockquote").state,g=a.getSelection(),f=g&&g.getRanges()[0];
-if(f){var m=g.createBookmarks();if(CKEDITOR.env.ie){var l=m[0].startNode,k=m[0].endNode,b;if(l&&"blockquote"==l.getParent().getName())for(b=l;b=b.getNext();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){l.move(b,!0);break}if(k&&"blockquote"==k.getParent().getName())for(b=k;b=b.getPrevious();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){k.move(b);break}}var d=f.createIterator();d.enlargeBr=a.config.enterMode!=CKEDITOR.ENTER_BR;if(c==CKEDITOR.TRISTATE_OFF){for(l=[];c=d.getNextParagraph();)l.push(c);
-1>l.length&&(c=a.document.createElement(a.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),k=m.shift(),f.insertNode(c),c.append(new CKEDITOR.dom.text("",a.document)),f.moveToBookmark(k),f.selectNodeContents(c),f.collapse(!0),k=f.createBookmark(),l.push(c),m.unshift(k));b=l[0].getParent();f=[];for(k=0;k<l.length;k++)c=l[k],b=b.getCommonAncestor(c.getParent());for(c={table:1,tbody:1,tr:1,ol:1,ul:1};c[b.getName()];)b=b.getParent();for(k=null;0<l.length;){for(c=l.shift();!c.getParent().equals(b);)c=c.getParent();
-c.equals(k)||f.push(c);k=c}for(;0<f.length;)if(c=f.shift(),"blockquote"==c.getName()){for(k=new CKEDITOR.dom.documentFragment(a.document);c.getFirst();)k.append(c.getFirst().remove()),l.push(k.getLast());k.replace(c)}else l.push(c);f=a.document.createElement("blockquote");for(f.insertBefore(l[0]);0<l.length;)c=l.shift(),f.append(c)}else if(c==CKEDITOR.TRISTATE_ON){k=[];for(b={};c=d.getNextParagraph();){for(l=f=null;c.getParent();){if("blockquote"==c.getParent().getName()){f=c.getParent();l=c;break}c=
-c.getParent()}f&&l&&!l.getCustomData("blockquote_moveout")&&(k.push(l),CKEDITOR.dom.element.setMarker(b,l,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(b);c=[];l=[];for(b={};0<k.length;)d=k.shift(),f=d.getParent(),d.getPrevious()?d.getNext()?(d.breakParent(d.getParent()),l.push(d.getNext())):d.remove().insertAfter(f):d.remove().insertBefore(f),f.getCustomData("blockquote_processed")||(l.push(f),CKEDITOR.dom.element.setMarker(b,f,"blockquote_processed",!0)),c.push(d);CKEDITOR.dom.element.clearAllMarkers(b);
-for(k=l.length-1;0<=k;k--){f=l[k];a:{b=f;for(var d=0,h=b.getChildCount(),p=void 0;d<h&&(p=b.getChild(d));d++)if(p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary()){b=!1;break a}b=!0}b&&f.remove()}if(a.config.enterMode==CKEDITOR.ENTER_BR)for(f=!0;c.length;)if(d=c.shift(),"div"==d.getName()){k=new CKEDITOR.dom.documentFragment(a.document);!f||!d.getPrevious()||d.getPrevious().type==CKEDITOR.NODE_ELEMENT&&d.getPrevious().isBlockBoundary()||k.append(a.document.createElement("br"));for(f=d.getNext()&&
-!(d.getNext().type==CKEDITOR.NODE_ELEMENT&&d.getNext().isBlockBoundary());d.getFirst();)d.getFirst().remove().appendTo(k);f&&k.append(a.document.createElement("br"));k.replace(d);f=!1}}g.selectBookmarks(m);a.focus()}},refresh:function(a,c){this.setState(a.elementPath(c.block||c.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(e){e.blockless||
-(e.addCommand("blockquote",a),e.ui.addButton&&e.ui.addButton("Blockquote",{label:e.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})}(),"use strict",function(){function a(a,b,d){b.type||(b.type="auto");if(d&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function e(b){function d(){var a=b.editable();
-if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||z.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(z.mainPasteEvent,function(a){"beforepaste"==z.mainPasteEvent&&D||x(a)});"beforepaste"==z.mainPasteEvent&&(a.on("paste",function(a){G||(e(),a.data.preventDefault(),x(a),k("paste")||b.openDialog("paste"))}),a.on("contextmenu",g,null,null,0),
-a.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||g()},null,null,0));a.on("beforecut",function(){!D&&l(b)});var f;a.attachListener(CKEDITOR.env.ie?a:b.document.getDocumentElement(),"mouseup",function(){f=setTimeout(function(){B()},0)});b.on("destroy",function(){clearTimeout(f)});a.on("keyup",B)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,exec:function(){"cut"==this.type&&l();var a;var d=this.type;if(CKEDITOR.env.ie)a=k(d);else try{a=b.document.$.execCommand(d,
-!1,null)}catch(c){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function f(){return{canUndo:!1,async:!0,exec:function(b,d){var c=function(d,c){d&&a(b,d,!!c);b.fire("afterCommandExec",{name:"paste",command:f,returnValue:!!d})},f=this;"string"==typeof d?c({dataValue:d,method:"paste",dataTransfer:z.initPasteDataTransfer()},1):b.getClipboardData(c)}}}function e(){G=1;setTimeout(function(){G=0},100)}function g(){D=1;setTimeout(function(){D=0},10)}function k(a){var d=b.document,
-c=d.getBody(),f=!1,e=function(){f=!0};c.on(a,e);7<CKEDITOR.env.version?d.$.execCommand(a):d.$.selection.createRange().execCommand(a);c.removeListener(a,e);return f}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),d,c,f;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(d=a.getSelectedElement())&&(c=a.getRanges()[0],f=b.document.createText(""),f.insertBefore(d),c.setStartBefore(f),c.setEndAfter(d),a.selectRanges([c]),setTimeout(function(){d.getParent()&&(f.remove(),a.selectElement(d))},
-0))}}function m(a,d){var c=b.document,f=b.editable(),e=function(a){a.cancel()},g;if(!c.getById("cke_pastebin")){var k=b.getSelection(),n=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var p=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!f.is("body")||CKEDITOR.env.ie?"div":"body",c);p.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var l=0,c=c.getWindow();CKEDITOR.env.webkit?(f.append(p),p.addClass("cke_editable"),f.is("body")||(l="static"!=f.getComputedStyle("position")?
-f:CKEDITOR.dom.element.get(f.$.offsetParent),l=l.getDocumentPosition().y)):f.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(p);p.setStyles({position:"absolute",top:c.getScrollPosition().y-l+10+"px",width:"1px",height:Math.max(1,c.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&p.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(l=p.getParent().isReadOnly())?(p.setOpacity(0),p.setAttribute("contenteditable",!0)):p.setStyle("ltr"==b.config.contentsLangDirection?
-"left":"right","-1000px");b.on("selectionChange",e,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)g=f.once("blur",e,null,null,-100);l&&p.focus();l=new CKEDITOR.dom.range(p);l.selectNodeContents(p);var t=l.select();CKEDITOR.env.ie&&(g=f.once("blur",function(){b.lockSelection(t)}));var q=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=q);g&&g.removeListener();CKEDITOR.env.ie&&f.focus();k.selectBookmarks(n);
-p.remove();var a;CKEDITOR.env.webkit&&(a=p.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(p=a);b.removeListener("selectionChange",e);d(p.getHtml())},0)}}function C(){if("paste"==z.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();e();var a=b.focusManager;a.lock();if(b.editable().fire(z.mainPasteEvent)&&!k("paste"))return a.unlock(),!1;a.unlock();return!0}function r(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=
-b.editable();e();"paste"==z.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function x(d){var c={type:"auto",method:"paste",dataTransfer:z.initPasteDataTransfer(d)};c.dataTransfer.cacheData();var f=!1!==b.fire("beforePaste",c);f&&z.canClipboardApiBeTrusted(c.dataTransfer,b)?(d.data.preventDefault(),setTimeout(function(){a(b,c)},0)):m(d,function(d){c.dataValue=d.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,
-"");f&&a(b,c)})}function B(){if("wysiwyg"==b.mode){var a=A("paste");b.getCommand("cut").setState(A("cut"));b.getCommand("copy").setState(A("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function A(a){if(F&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var d=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==d.length&&d[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var z=CKEDITOR.plugins.clipboard,
-D=0,G=0,F=0;(function(){b.on("key",r);b.on("contentDom",d);b.on("selectionChange",function(a){F=a.data.selection.getRanges()[0].checkReadOnly();B()});b.contextMenu&&b.contextMenu.addListener(function(a,b){F=b.getRanges()[0].checkReadOnly();return{cut:A("cut"),copy:A("copy"),paste:A("paste")}})})();(function(){function a(d,c,f,e,g){var k=b.lang.clipboard[c];b.addCommand(c,f);b.ui.addButton&&b.ui.addButton(d,{label:k,command:c,toolbar:"clipboard,"+e});b.addMenuItems&&b.addMenuItem(c,{label:k,command:c,
-group:"clipboard",order:g})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",f(),30,8)})();b.getClipboardData=function(a,d){function c(a){a.removeListener();a.cancel();d(a.data)}function f(a){a.removeListener();a.cancel();n=!0;d({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function e(){this.customTitle=a&&a.title}var g=!1,k="auto",n=!1;d||(d=a,a=null);b.on("paste",c,null,null,0);b.on("beforePaste",function(a){a.removeListener();
-g=!0;k=a.data.type},null,null,1E3);!1===C()&&(b.removeListener("paste",c),g&&b.fire("pasteDialog",e)?(b.on("pasteDialogCommit",f),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",f);setTimeout(function(){n||d(null)},10)})):d(null))}}function c(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
-return"htmlifiedtext"}function g(a,b){function d(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}b=b.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");b=b.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(b.match(/^[^<]$/))return b;CKEDITOR.env.webkit&&-1<b.indexOf("\x3cdiv\x3e")&&(b=b.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
-b.match(/<div>(<br>|)<\/div>/)&&(b="\x3cp\x3e"+b.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return d(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),b=b.replace(/<\/div><div>/g,"\x3cbr\x3e"),b=b.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&a.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(b=b.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<b.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(b="\x3cp\x3e"+b.replace(/(<br>){2,}/g,function(a){return d(a.length/4)})+"\x3c/p\x3e"));return l(a,b)}function f(){function a(){var b=
+this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,b,d){for(var c=b.children,g,e=[],h=[],f=0;f<c.length&&(g=c[f]);f++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[g.type].build(a,g,k))}return new CKEDITOR.ui.dialog[b.type](a,h,e,d,b)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;
+CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,d=/^\d*(?:\.\d+)?$/,c=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,g=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,e=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=arguments;return function(){var b=this&&this.getValue?this.getValue():
+a[0],d,c=CKEDITOR.VALIDATE_AND,g=[],e;for(e=0;e<a.length;e++)if("function"==typeof a[e])g.push(a[e]);else break;e<a.length&&"string"==typeof a[e]&&(d=a[e],e++);e<a.length&&"number"==typeof a[e]&&(c=a[e]);var h=c==CKEDITOR.VALIDATE_AND?!0:!1;for(e=0;e<g.length;e++)h=c==CKEDITOR.VALIDATE_AND?h&&g[e](b):h||g[e](b);return h?!0:d}},regex:function(a,b){return function(d){d=this&&this.getValue?this.getValue():d;return a.test(d)?!0:b}},notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,
+a)},number:function(a){return this.regex(d,a)},cssLength:function(a){return this.functions(function(a){return g.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return c.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",
+function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var d in D)D[d].remove();D={}}a=a.editor._.storedDialogs;for(var c in a)a[c].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var d=null,c=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&u(this);if("function"==typeof c)d=this._.storedDialogs||(this._.storedDialogs={}),d=d[a]||(d[a]=new CKEDITOR.dialog(this,a)),b&&b.call(d,
+d),d.show();else{if("failed"==c)throw v(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof c&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return d}})}(),CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(a){a.on("doubleclick",function(f){f.data.dialog&&
+a.openDialog(f.data.dialog)},null,null,999)}}),CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var f=a.addCommand("about",new CKEDITOR.dialogCommand("about"));f.modes={wysiwyg:1,source:1};f.canUndo=!1;f.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}}),function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,
+de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(a){var f=this;a.addCommand("a11yHelp",{exec:function(){var c=a.langCode,c=f.availableLangs[c]?c:f.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(f.path+
+"dialogs/lang/"+c+".js"),function(){a.lang.a11yhelp=f.langEntries[c];a.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});a.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");a.on("ariaEditorHelpLabel",function(c){c.data.label=a.lang.common.editorHelp})}})}(),CKEDITOR.plugins.add("basicstyles",{init:function(a){var f=0,c=function(c,h,b,d){if(d){d=new CKEDITOR.style(d);var g=e[b];g.unshift(d);a.attachStyleStateChange(d,
+function(d){!a.readOnly&&a.getCommand(b).setState(d)});a.addCommand(b,new CKEDITOR.styleCommand(d,{contentForms:g}));a.ui.addButton&&a.ui.addButton(c,{label:h,command:b,toolbar:"basicstyles,"+(f+=10)})}},e={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==
+a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},h=a.config,m=a.lang.basicstyles;c("Bold",m.bold,"bold",h.coreStyles_bold);c("Italic",m.italic,"italic",h.coreStyles_italic);c("Underline",m.underline,"underline",h.coreStyles_underline);c("Strike",m.strike,"strike",h.coreStyles_strike);c("Subscript",m.subscript,"subscript",h.coreStyles_subscript);c("Superscript",m.superscript,"superscript",h.coreStyles_superscript);a.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],
+[CKEDITOR.CTRL+85,"underline"]])}}),CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"},CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"},CKEDITOR.config.coreStyles_underline={element:"u"},CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"},CKEDITOR.config.coreStyles_subscript={element:"sub"},CKEDITOR.config.coreStyles_superscript={element:"sup"},function(){var a={exec:function(a){var c=a.getCommand("blockquote").state,e=a.getSelection(),h=e&&e.getRanges()[0];
+if(h){var m=e.createBookmarks();if(CKEDITOR.env.ie){var l=m[0].startNode,k=m[0].endNode,b;if(l&&"blockquote"==l.getParent().getName())for(b=l;b=b.getNext();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){l.move(b,!0);break}if(k&&"blockquote"==k.getParent().getName())for(b=k;b=b.getPrevious();)if(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()){k.move(b);break}}var d=h.createIterator();d.enlargeBr=a.config.enterMode!=CKEDITOR.ENTER_BR;if(c==CKEDITOR.TRISTATE_OFF){for(l=[];c=d.getNextParagraph();)l.push(c);
+1>l.length&&(c=a.document.createElement(a.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),k=m.shift(),h.insertNode(c),c.append(new CKEDITOR.dom.text("",a.document)),h.moveToBookmark(k),h.selectNodeContents(c),h.collapse(!0),k=h.createBookmark(),l.push(c),m.unshift(k));b=l[0].getParent();h=[];for(k=0;k<l.length;k++)c=l[k],b=b.getCommonAncestor(c.getParent());for(c={table:1,tbody:1,tr:1,ol:1,ul:1};c[b.getName()];)b=b.getParent();for(k=null;0<l.length;){for(c=l.shift();!c.getParent().equals(b);)c=c.getParent();
+c.equals(k)||h.push(c);k=c}for(;0<h.length;)if(c=h.shift(),"blockquote"==c.getName()){for(k=new CKEDITOR.dom.documentFragment(a.document);c.getFirst();)k.append(c.getFirst().remove()),l.push(k.getLast());k.replace(c)}else l.push(c);h=a.document.createElement("blockquote");for(h.insertBefore(l[0]);0<l.length;)c=l.shift(),h.append(c)}else if(c==CKEDITOR.TRISTATE_ON){k=[];for(b={};c=d.getNextParagraph();){for(l=h=null;c.getParent();){if("blockquote"==c.getParent().getName()){h=c.getParent();l=c;break}c=
+c.getParent()}h&&l&&!l.getCustomData("blockquote_moveout")&&(k.push(l),CKEDITOR.dom.element.setMarker(b,l,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(b);c=[];l=[];for(b={};0<k.length;)d=k.shift(),h=d.getParent(),d.getPrevious()?d.getNext()?(d.breakParent(d.getParent()),l.push(d.getNext())):d.remove().insertAfter(h):d.remove().insertBefore(h),h.getCustomData("blockquote_processed")||(l.push(h),CKEDITOR.dom.element.setMarker(b,h,"blockquote_processed",!0)),c.push(d);CKEDITOR.dom.element.clearAllMarkers(b);
+for(k=l.length-1;0<=k;k--){h=l[k];a:{b=h;for(var d=0,g=b.getChildCount(),p=void 0;d<g&&(p=b.getChild(d));d++)if(p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary()){b=!1;break a}b=!0}b&&h.remove()}if(a.config.enterMode==CKEDITOR.ENTER_BR)for(h=!0;c.length;)if(d=c.shift(),"div"==d.getName()){k=new CKEDITOR.dom.documentFragment(a.document);!h||!d.getPrevious()||d.getPrevious().type==CKEDITOR.NODE_ELEMENT&&d.getPrevious().isBlockBoundary()||k.append(a.document.createElement("br"));for(h=d.getNext()&&
+!(d.getNext().type==CKEDITOR.NODE_ELEMENT&&d.getNext().isBlockBoundary());d.getFirst();)d.getFirst().remove().appendTo(k);h&&k.append(a.document.createElement("br"));k.replace(d);h=!1}}e.selectBookmarks(m);a.focus()}},refresh:function(a,c){this.setState(a.elementPath(c.block||c.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(f){f.blockless||
+(f.addCommand("blockquote",a),f.ui.addButton&&f.ui.addButton("Blockquote",{label:f.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})}(),"use strict",function(){function a(a,b,d){b.type||(b.type="auto");if(d&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function f(b){function d(){var a=b.editable();
+if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||z.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(z.mainPasteEvent,function(a){"beforepaste"==z.mainPasteEvent&&C||x(a)});"beforepaste"==z.mainPasteEvent&&(a.on("paste",function(a){G||(h(),a.data.preventDefault(),x(a),k("paste")||b.openDialog("paste"))}),a.on("contextmenu",f,null,null,0),
+a.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||f()},null,null,0));a.on("beforecut",function(){!C&&l(b)});var e;a.attachListener(CKEDITOR.env.ie?a:b.document.getDocumentElement(),"mouseup",function(){e=setTimeout(function(){D()},0)});b.on("destroy",function(){clearTimeout(e)});a.on("keyup",D)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,exec:function(){"cut"==this.type&&l();var a;var d=this.type;if(CKEDITOR.env.ie)a=k(d);else try{a=b.document.$.execCommand(d,
+!1,null)}catch(c){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function e(){return{canUndo:!1,async:!0,exec:function(b,d){var c=function(d,c){d&&a(b,d,!!c);b.fire("afterCommandExec",{name:"paste",command:g,returnValue:!!d})},g=this;"string"==typeof d?c({dataValue:d,method:"paste",dataTransfer:z.initPasteDataTransfer()},1):b.getClipboardData(c)}}}function h(){G=1;setTimeout(function(){G=0},100)}function f(){C=1;setTimeout(function(){C=0},10)}function k(a){var d=b.document,
+c=d.getBody(),e=!1,h=function(){e=!0};c.on(a,h);7<CKEDITOR.env.version?d.$.execCommand(a):d.$.selection.createRange().execCommand(a);c.removeListener(a,h);return e}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),d,c,e;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(d=a.getSelectedElement())&&(c=a.getRanges()[0],e=b.document.createText(""),e.insertBefore(d),c.setStartBefore(e),c.setEndAfter(d),a.selectRanges([c]),setTimeout(function(){d.getParent()&&(e.remove(),a.selectElement(d))},
+0))}}function m(a,d){var c=b.document,e=b.editable(),h=function(a){a.cancel()},f;if(!c.getById("cke_pastebin")){var k=b.getSelection(),p=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var l=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",c);l.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var n=0,c=c.getWindow();CKEDITOR.env.webkit?(e.append(l),l.addClass("cke_editable"),e.is("body")||(n="static"!=e.getComputedStyle("position")?
+e:CKEDITOR.dom.element.get(e.$.offsetParent),n=n.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(l);l.setStyles({position:"absolute",top:c.getScrollPosition().y-n+10+"px",width:"1px",height:Math.max(1,c.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&l.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(n=l.getParent().isReadOnly())?(l.setOpacity(0),l.setAttribute("contenteditable",!0)):l.setStyle("ltr"==b.config.contentsLangDirection?
+"left":"right","-1000px");b.on("selectionChange",h,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)f=e.once("blur",h,null,null,-100);n&&l.focus();n=new CKEDITOR.dom.range(l);n.selectNodeContents(l);var q=n.select();CKEDITOR.env.ie&&(f=e.once("blur",function(){b.lockSelection(q)}));var r=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=r);f&&f.removeListener();CKEDITOR.env.ie&&e.focus();k.selectBookmarks(p);
+l.remove();var a;CKEDITOR.env.webkit&&(a=l.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&(l=a);b.removeListener("selectionChange",h);d(l.getHtml())},0)}}function B(){if("paste"==z.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();h();var a=b.focusManager;a.lock();if(b.editable().fire(z.mainPasteEvent)&&!k("paste"))return a.unlock(),!1;a.unlock();return!0}function t(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=
+b.editable();h();"paste"==z.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function x(d){var c={type:"auto",method:"paste",dataTransfer:z.initPasteDataTransfer(d)};c.dataTransfer.cacheData();var e=!1!==b.fire("beforePaste",c);e&&z.canClipboardApiBeTrusted(c.dataTransfer,b)?(d.data.preventDefault(),setTimeout(function(){a(b,c)},0)):m(d,function(d){c.dataValue=d.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,
+"");e&&a(b,c)})}function D(){if("wysiwyg"==b.mode){var a=y("paste");b.getCommand("cut").setState(y("cut"));b.getCommand("copy").setState(y("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function y(a){if(E&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var d=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==d.length&&d[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var z=CKEDITOR.plugins.clipboard,
+C=0,G=0,E=0;(function(){b.on("key",t);b.on("contentDom",d);b.on("selectionChange",function(a){E=a.data.selection.getRanges()[0].checkReadOnly();D()});b.contextMenu&&b.contextMenu.addListener(function(a,b){E=b.getRanges()[0].checkReadOnly();return{cut:y("cut"),copy:y("copy"),paste:y("paste")}})})();(function(){function a(d,c,e,h,f){var k=b.lang.clipboard[c];b.addCommand(c,e);b.ui.addButton&&b.ui.addButton(d,{label:k,command:c,toolbar:"clipboard,"+h});b.addMenuItems&&b.addMenuItem(c,{label:k,command:c,
+group:"clipboard",order:f})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste","paste",e(),30,8)})();b.getClipboardData=function(a,d){function c(a){a.removeListener();a.cancel();d(a.data)}function e(a){a.removeListener();a.cancel();l=!0;d({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function h(){this.customTitle=a&&a.title}var f=!1,k="auto",l=!1;d||(d=a,a=null);b.on("paste",c,null,null,0);b.on("beforePaste",function(a){a.removeListener();
+f=!0;k=a.data.type},null,null,1E3);!1===B()&&(b.removeListener("paste",c),f&&b.fire("pasteDialog",h)?(b.on("pasteDialogCommit",e),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",e);setTimeout(function(){l||d(null)},10)})):d(null))}}function c(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
+return"htmlifiedtext"}function e(a,b){function d(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}b=b.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");b=b.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(b.match(/^[^<]$/))return b;CKEDITOR.env.webkit&&-1<b.indexOf("\x3cdiv\x3e")&&(b=b.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
+b.match(/<div>(<br>|)<\/div>/)&&(b="\x3cp\x3e"+b.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return d(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),b=b.replace(/<\/div><div>/g,"\x3cbr\x3e"),b=b.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&a.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(b=b.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<b.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(b="\x3cp\x3e"+b.replace(/(<br>){2,}/g,function(a){return d(a.length/4)})+"\x3c/p\x3e"));return l(a,b)}function h(){function a(){var b=
 {},d;for(d in CKEDITOR.dtd)"$"!=d.charAt(0)&&"div"!=d&&"span"!=d&&(b[d]=1);return b}var b={};return{get:function(d){return"plain-text"==d?b.plainText||(b.plainText=new CKEDITOR.filter("br")):"semantic-content"==d?((d=b.semanticContent)||(d=new CKEDITOR.filter,d.allow({$1:{elements:a(),attributes:!0,styles:!1,classes:!1}}),d=b.semanticContent=d),d):d?new CKEDITOR.filter(d):null}}}function m(a,b,d){b=CKEDITOR.htmlParser.fragment.fromHtml(b);var c=new CKEDITOR.htmlParser.basicWriter;d.applyTo(b,!0,!1,
-a.activeEnterMode);b.writeHtml(c);return c.getHtml()}function l(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function k(a){a.data.preventDefault();a.data.$.dataTransfer.dropEffect="none"}function b(b){var d=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(d,f,e){f.select();a(b,{dataTransfer:e,
-method:"drop"},1);e.sourceEditor.fire("saveSnapshot");e.sourceEditor.editable().extractHtmlFromRange(d);e.sourceEditor.getSelection().selectRanges([d]);e.sourceEditor.fire("saveSnapshot")}function f(c,e){c.select();a(b,{dataTransfer:e,method:"drop"},1);d.resetDragDataTransfer()}function e(a,d,c){var f={$:a.data.$,target:a.data.getTarget()};d&&(f.dragRange=d);c&&(f.dropRange=c);!1===b.fire(a.name,f)&&a.data.preventDefault()}function g(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
-var k=b.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(b),m=b.ui.space("top"),C=b.ui.space("bottom");d.preventDefaultDropOnElement(m);d.preventDefaultDropOnElement(C);k.attachListener(l,"dragstart",e);k.attachListener(b,"dragstart",d.resetDragDataTransfer,d,null,1);k.attachListener(b,"dragstart",function(a){d.initDragDataTransfer(a,b)},null,null,2);k.attachListener(b,"dragstart",function(){var a=d.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(d.dragStartContainerChildCount=
-a?g(a.startContainer):null,d.dragEndContainerChildCount=a?g(a.endContainer):null)},null,null,100);k.attachListener(l,"dragend",e);k.attachListener(b,"dragend",d.initDragDataTransfer,d,null,1);k.attachListener(b,"dragend",d.resetDragDataTransfer,d,null,100);k.attachListener(l,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});
-k.attachListener(l,"drop",function(a){if(!a.data.$.defaultPrevented){a.data.preventDefault();var c=a.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=d.getRangeAtDropPosition(a,b),f=d.dragRange;c&&e(a,f,c)}}},null,null,9999);k.attachListener(b,"drop",d.initDragDataTransfer,d,null,1);k.attachListener(b,"drop",function(a){if(a=a.data){var e=a.dropRange,g=a.dragRange,k=a.dataTransfer;k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){d.internalDrop(g,
-e,k,b)},0):k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(g,e,k):f(e,k)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(a){var d,k=f();a.config.forcePasteAsPlainText?d="plain-text":a.config.pasteFilter?d=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in a.config||(d="semantic-content");a.pasteFilter=k.get(d);e(a);b(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));a.on("paste",function(b){b.data.dataTransfer||
+a.activeEnterMode);b.writeHtml(c);return c.getHtml()}function l(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function k(a){a.data.preventDefault();a.data.$.dataTransfer.dropEffect="none"}function b(b){var d=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(d,e,h){e.select();a(b,{dataTransfer:h,
+method:"drop"},1);h.sourceEditor.fire("saveSnapshot");h.sourceEditor.editable().extractHtmlFromRange(d);h.sourceEditor.getSelection().selectRanges([d]);h.sourceEditor.fire("saveSnapshot")}function e(c,h){c.select();a(b,{dataTransfer:h,method:"drop"},1);d.resetDragDataTransfer()}function h(a,d,c){var e={$:a.data.$,target:a.data.getTarget()};d&&(e.dragRange=d);c&&(e.dropRange=c);!1===b.fire(a.name,e)&&a.data.preventDefault()}function f(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
+var k=b.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(b),m=b.ui.space("top"),B=b.ui.space("bottom");d.preventDefaultDropOnElement(m);d.preventDefaultDropOnElement(B);k.attachListener(l,"dragstart",h);k.attachListener(b,"dragstart",d.resetDragDataTransfer,d,null,1);k.attachListener(b,"dragstart",function(a){d.initDragDataTransfer(a,b)},null,null,2);k.attachListener(b,"dragstart",function(){var a=d.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(d.dragStartContainerChildCount=
+a?f(a.startContainer):null,d.dragEndContainerChildCount=a?f(a.endContainer):null)},null,null,100);k.attachListener(l,"dragend",h);k.attachListener(b,"dragend",d.initDragDataTransfer,d,null,1);k.attachListener(b,"dragend",d.resetDragDataTransfer,d,null,100);k.attachListener(l,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});
+k.attachListener(l,"drop",function(a){if(!a.data.$.defaultPrevented){a.data.preventDefault();var c=a.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=d.getRangeAtDropPosition(a,b),e=d.dragRange;c&&h(a,e,c)}}},null,null,9999);k.attachListener(b,"drop",d.initDragDataTransfer,d,null,1);k.attachListener(b,"drop",function(a){if(a=a.data){var h=a.dropRange,f=a.dragRange,k=a.dataTransfer;k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){d.internalDrop(f,
+h,k,b)},0):k.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(f,h,k):e(h,k)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(a){var d,k=h();a.config.forcePasteAsPlainText?d="plain-text":a.config.pasteFilter?d=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in a.config||(d="semantic-content");a.pasteFilter=k.get(d);f(a);b(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));a.on("paste",function(b){b.data.dataTransfer||
 (b.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!b.data.dataValue){var d=b.data.dataTransfer,c=d.getData("text/html");if(c)b.data.dataValue=c,b.data.type="html";else if(c=d.getData("text/plain"))b.data.dataValue=a.editable().transformPlainTextToHtml(c),b.data.type="text"}},null,null,1);a.on("paste",function(a){var b=a.data.dataValue,d=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,
-function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var c,f,h=new CKEDITOR.dom.element("div");for(h.setHtml(b);1==h.getChildCount()&&(c=h.getFirst())&&c.type==CKEDITOR.NODE_ELEMENT&&(c.hasClass("cke_editable")||
-c.hasClass("cke_contents"));)h=f=c;f&&(b=f.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,c){return c.toLowerCase()in d?(a.data.preSniffing="html","\x3c"+c):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,c){return c in d?(a.data.endsWithEOL=1,"\x3c/"+c+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var d=b.type,f=b.dataValue,e,l=a.config.clipboard_defaultContentType||
-"html",p=b.dataTransfer.getTransferType(a);e="html"==d||"html"==b.preSniffing?"html":c(f);"htmlifiedtext"==e&&(f=g(a.config,f));"text"==d&&"html"==e?f=m(a,f,k.get("plain-text")):p==CKEDITOR.DATA_TRANSFER_EXTERNAL&&a.pasteFilter&&!b.dontFilter&&(f=m(a,f,a.pasteFilter));b.startsWithEOL&&(f='\x3cbr data-cke-eol\x3d"1"\x3e'+f);b.endsWithEOL&&(f+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&(d="html"==e||"html"==l?"html":"text");b.type=d;b.dataValue=f;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},
+function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var c,g,e=new CKEDITOR.dom.element("div");for(e.setHtml(b);1==e.getChildCount()&&(c=e.getFirst())&&c.type==CKEDITOR.NODE_ELEMENT&&(c.hasClass("cke_editable")||
+c.hasClass("cke_contents"));)e=g=c;g&&(b=g.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,c){return c.toLowerCase()in d?(a.data.preSniffing="html","\x3c"+c):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,c){return c in d?(a.data.endsWithEOL=1,"\x3c/"+c+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var d=b.type,h=b.dataValue,f,l=a.config.clipboard_defaultContentType||
+"html",p=b.dataTransfer.getTransferType(a);f="html"==d||"html"==b.preSniffing?"html":c(h);"htmlifiedtext"==f&&(h=e(a.config,h));"text"==d&&"html"==f?h=m(a,h,k.get("plain-text")):p==CKEDITOR.DATA_TRANSFER_EXTERNAL&&a.pasteFilter&&!b.dontFilter&&(h=m(a,h,a.pasteFilter));b.startsWithEOL&&(h='\x3cbr data-cke-eol\x3d"1"\x3e'+h);b.endsWithEOL&&(h+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&(d="html"==f||"html"==l?"html":"text");b.type=d;b.dataValue=h;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},
 null,null,6);a.on("paste",function(b){b=b.data;b.dataValue&&(a.insertHtml(b.dataValue,b.type,b.range),setTimeout(function(){a.fire("afterPaste")},0))},null,null,1E3);a.on("pasteDialog",function(b){setTimeout(function(){a.openDialog("paste",b.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?
-"beforepaste":"paste",canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&(a.getData("text/html")||a.getFilesCount())?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,b,d,c){function f(a,d,c){var h=a;h.type==CKEDITOR.NODE_TEXT&&(h=a.getParent());if(h.equals(d)&&c!=d.getChildCount())return a=
-b.startContainer.getChild(b.startOffset-1),d=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&d&&d.type==CKEDITOR.NODE_TEXT&&(c=a.getLength(),a.setText(a.getText()+d.getText()),d.remove(),b.setStart(a,c),b.collapse(!0)),!0}var e=b.startContainer;"number"==typeof c&&"number"==typeof d&&e.type==CKEDITOR.NODE_ELEMENT&&(f(a.startContainer,e,d)||f(a.endContainer,e,c))},isDropRangeAffectedByDragRange:function(a,b){var d=b.startContainer,c=b.endOffset;return a.endContainer.equals(d)&&
-a.endOffset<=c||a.startContainer.getParent().equals(d)&&a.startContainer.getIndex()<c||a.endContainer.getParent().equals(d)&&a.endContainer.getIndex()<c?!0:!1},internalDrop:function(b,d,c,f){var e=CKEDITOR.plugins.clipboard,g=f.editable(),k,l;f.fire("saveSnapshot");f.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,d,e.dragStartContainerChildCount,e.dragEndContainerChildCount);(l=this.isDropRangeAffectedByDragRange(b,d))||(k=b.createBookmark(!1));
-e=d.clone().createBookmark(!1);l&&(k=b.createBookmark(!1));b=k.startNode;d=k.endNode;l=e.startNode;d&&b.getPosition(l)&CKEDITOR.POSITION_PRECEDING&&d.getPosition(l)&CKEDITOR.POSITION_FOLLOWING&&l.insertBefore(b);b=f.createRange();b.moveToBookmark(k);g.extractHtmlFromRange(b,1);d=f.createRange();d.moveToBookmark(e);a(f,{dataTransfer:c,method:"drop",range:d},1);f.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var d=a.data.$,c=d.clientX,f=d.clientY,e=b.getSelection(!0).getRanges()[0],g=
-b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint)d=b.document.$.caretRangeFromPoint(c,f),g.setStart(CKEDITOR.dom.node(d.startContainer),d.startOffset),g.collapse(!0);else if(d.rangeParent)g.setStart(CKEDITOR.dom.node(d.rangeParent),d.rangeOffset),g.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&e&&b.editable().hasFocus)return e;if(document.body.createTextRange){b.focus();d=b.document.getBody().$.createTextRange();try{for(var k=!1,l=0;20>l&&
-!k;l++){if(!k)try{d.moveToPoint(c,f-l),k=!0}catch(m){}if(!k)try{d.moveToPoint(c,f+l),k=!0}catch(r){}}if(k){var x="cke-temp-"+(new Date).getTime();d.pasteHTML('\x3cspan id\x3d"'+x+'"\x3e​\x3c/span\x3e');var B=b.document.getById(x);g.moveToPosition(B,CKEDITOR.POSITION_BEFORE_START);B.remove()}else{var A=b.document.$.elementFromPoint(c,f),z=new CKEDITOR.dom.element(A),D;if(z.equals(b.editable())||"html"==z.getName())return e&&e.startContainer&&!e.startContainer.equals(b.editable())?e:null;D=z.getClientRect();
-c<D.left?g.setStartAt(z,CKEDITOR.POSITION_AFTER_START):g.setStartAt(z,CKEDITOR.POSITION_BEFORE_END);g.collapse(!0)}}catch(G){return null}}else return null}return g},initDragDataTransfer:function(a,b){var d=a.data.$?a.data.$.dataTransfer:null,c=new this.dataTransfer(d,b);d?this.dragData&&c.id==this.dragData.id?c=this.dragData:this.dragData=c:this.dragData?c=this.dragData:this.dragData=c;a.data.dataTransfer=c},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported&&
+"beforepaste":"paste",canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&(a.getData("text/html")||a.getFilesCount())?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,b,d,c){function e(a,d,c){var g=a;g.type==CKEDITOR.NODE_TEXT&&(g=a.getParent());if(g.equals(d)&&c!=d.getChildCount())return a=
+b.startContainer.getChild(b.startOffset-1),d=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&d&&d.type==CKEDITOR.NODE_TEXT&&(c=a.getLength(),a.setText(a.getText()+d.getText()),d.remove(),b.setStart(a,c),b.collapse(!0)),!0}var h=b.startContainer;"number"==typeof c&&"number"==typeof d&&h.type==CKEDITOR.NODE_ELEMENT&&(e(a.startContainer,h,d)||e(a.endContainer,h,c))},isDropRangeAffectedByDragRange:function(a,b){var d=b.startContainer,c=b.endOffset;return a.endContainer.equals(d)&&
+a.endOffset<=c||a.startContainer.getParent().equals(d)&&a.startContainer.getIndex()<c||a.endContainer.getParent().equals(d)&&a.endContainer.getIndex()<c?!0:!1},internalDrop:function(b,d,c,e){var h=CKEDITOR.plugins.clipboard,f=e.editable(),k,l;e.fire("saveSnapshot");e.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,d,h.dragStartContainerChildCount,h.dragEndContainerChildCount);(l=this.isDropRangeAffectedByDragRange(b,d))||(k=b.createBookmark(!1));
+h=d.clone().createBookmark(!1);l&&(k=b.createBookmark(!1));b=k.startNode;d=k.endNode;l=h.startNode;d&&b.getPosition(l)&CKEDITOR.POSITION_PRECEDING&&d.getPosition(l)&CKEDITOR.POSITION_FOLLOWING&&l.insertBefore(b);b=e.createRange();b.moveToBookmark(k);f.extractHtmlFromRange(b,1);d=e.createRange();d.moveToBookmark(h);a(e,{dataTransfer:c,method:"drop",range:d},1);e.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var d=a.data.$,c=d.clientX,e=d.clientY,h=b.getSelection(!0).getRanges()[0],f=
+b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint)d=b.document.$.caretRangeFromPoint(c,e),f.setStart(CKEDITOR.dom.node(d.startContainer),d.startOffset),f.collapse(!0);else if(d.rangeParent)f.setStart(CKEDITOR.dom.node(d.rangeParent),d.rangeOffset),f.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&h&&b.editable().hasFocus)return h;if(document.body.createTextRange){b.focus();d=b.document.getBody().$.createTextRange();try{for(var k=!1,l=0;20>l&&
+!k;l++){if(!k)try{d.moveToPoint(c,e-l),k=!0}catch(m){}if(!k)try{d.moveToPoint(c,e+l),k=!0}catch(t){}}if(k){var x="cke-temp-"+(new Date).getTime();d.pasteHTML('\x3cspan id\x3d"'+x+'"\x3e​\x3c/span\x3e');var D=b.document.getById(x);f.moveToPosition(D,CKEDITOR.POSITION_BEFORE_START);D.remove()}else{var y=b.document.$.elementFromPoint(c,e),z=new CKEDITOR.dom.element(y),C;if(z.equals(b.editable())||"html"==z.getName())return h&&h.startContainer&&!h.startContainer.equals(b.editable())?h:null;C=z.getClientRect();
+c<C.left?f.setStartAt(z,CKEDITOR.POSITION_AFTER_START):f.setStartAt(z,CKEDITOR.POSITION_BEFORE_END);f.collapse(!0)}}catch(G){return null}}else return null}return f},initDragDataTransfer:function(a,b){var d=a.data.$?a.data.$.dataTransfer:null,c=new this.dataTransfer(d,b);d?this.dragData&&c.id==this.dragData.id?c=this.dragData:this.dragData=c:this.dragData?c=this.dragData:this.dragData=c;a.data.dataTransfer=c},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported&&
 a&&a.data&&a.data.$){var d=new this.dataTransfer(a.data.$.clipboardData,b);this.copyCutData&&d.id==this.copyCutData.id?(d=this.copyCutData,d.$=a.data.$.clipboardData):this.copyCutData=d;return d}return new this.dataTransfer(null,b)},preventDefaultDropOnElement:function(a){a&&a.on("dragover",k)}};var d=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(a,b){a&&(this.$=a);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,
 fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(d);this.id||(this.id="Text"==d?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=d)try{this.$.setData(d,this.id)}catch(c){}b&&(this.sourceEditor=b,this.setData("text/html",b.getSelectedHtml(1)),"Text"==d||this.getData("text/plain")||this.setData("text/plain",b.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=
 1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(a){a=this._.normalizeType(a);var b=this._.data[a];if(void 0===b||null===b||""===b)try{b=this.$.getData(a)}catch(d){}if(void 0===b||null===b||""===b)b="";"text/html"==a?(b=b.replace(this._.metaRegExp,""),(a=this._.bodyRegExp.exec(b))&&a.length&&(b=a[1],b=b.replace(this._.fragmentRegExp,""))):"Text"==a&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==b.substring(0,
@@ -620,418 +624,424 @@ fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeT
 c)}if(this.$){var b=this,d,c;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(d=0;d<this.$.types.length;d++)a(this.$.types[d])}else a("Text"),a("URL");c=this._getImageFromClipboard();if(this.$&&this.$.files||c){this._.files=[];for(d=0;d<this.$.files.length;d++)this._.files.push(this.$.files[d]);0===this._.files.length&&c&&this._.files.push(c)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:
 this._getImageFromClipboard()?1:0},getFile:function(a){return this._.files.length?this._.files[a]:this.$&&this.$.files&&this.$.files.length?this.$.files[a]:0===a?this._getImageFromClipboard():void 0},isEmpty:function(){var a={},b;if(this.getFilesCount())return!1;for(b in this._.data)a[b]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=0;c<this.$.types.length;c++)a[this.$.types[c]]=1}else a.Text=1,a.URL=1;"Text"!=d&&(a[d]=0);for(b in a)if(a[b]&&""!==
 this.getData(b))return!1;return!0},_getImageFromClipboard:function(){var a;if(this.$&&this.$.items&&this.$.items[0])try{if((a=this.$.items[0].getAsFile())&&a.type)return a}catch(b){}}}}(),function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,c){c&&CKEDITOR.tools.extend(this,c);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=
-a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var a=CKEDITOR.addTemplate("panel",'\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),e=CKEDITOR.addTemplate("panel-frame",'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),
-c=CKEDITOR.addTemplate("panel-frame-inner",'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');CKEDITOR.ui.panel.prototype={render:function(g,f){this.getHolderElement=function(){var a=this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),b=a.getParent(),a=a.getFrameDocument();
+a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var a=CKEDITOR.addTemplate("panel",'\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),f=CKEDITOR.addTemplate("panel-frame",'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),
+c=CKEDITOR.addTemplate("panel-frame-inner",'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');CKEDITOR.ui.panel.prototype={render:function(e,h){this.getHolderElement=function(){var a=this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),b=a.getParent(),a=a.getFrameDocument();
 CKEDITOR.env.iOS&&b.setStyles({overflow:"scroll","-webkit-overflow-scrolling":"touch"});b=CKEDITOR.tools.addFunction(CKEDITOR.tools.bind(function(){this.isLoaded=!0;if(this.onLoad)this.onLoad()},this));a.write(c.output(CKEDITOR.tools.extend({css:CKEDITOR.tools.buildStyleHtml(this.css),onload:"window.parent.CKEDITOR.tools.callFunction("+b+");"},m)));a.getWindow().$.CKEDITOR=CKEDITOR;a.on("keydown",function(a){var b=a.data.getKeystroke(),c=this.document.getById(this.id).getAttribute("dir");this._.onKeyDown&&
-!1===this._.onKeyDown(b)?a.data.preventDefault():(27==b||b==("rtl"==c?39:37))&&this.onEscape&&!1===this.onEscape(b)&&a.data.preventDefault()},this);a=a.getBody();a.unselectable();CKEDITOR.env.air&&CKEDITOR.tools.callFunction(b)}else a=this.document.getById(this.id);this._.holder=a}return a};var m={editorId:g.id,id:this.id,langCode:g.langCode,dir:g.lang.dir,cls:this.className,frame:"",env:CKEDITOR.env.cssClass,"z-index":g.config.baseFloatZIndex+1};if(this.isFramed){var l=CKEDITOR.env.air?"javascript:void(0)":
-CKEDITOR.env.ie?"javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())":"";m.frame=e.output({id:this.id+"_frame",src:l})}l=a.output(m);f&&f.push(l);return l},addBlock:function(a,c){c=this._.blocks[a]=c instanceof CKEDITOR.ui.panel.block?c:new CKEDITOR.ui.panel.block(this.getHolderElement(),c);this._.currentBlock||this.showBlock(a);return c},getBlock:function(a){return this._.blocks[a]},showBlock:function(a){a=this._.blocks[a];var c=
-this._.currentBlock,e=!this.forceIFrame||CKEDITOR.env.ie?this._.holder:this.document.getById(this.id+"_frame");c&&c.hide();this._.currentBlock=a;CKEDITOR.fire("ariaWidget",e);a._.focusIndex=-1;this._.onKeyDown=a.onKeyDown&&CKEDITOR.tools.bind(a.onKeyDown,a);a.show();return a},destroy:function(){this.element&&this.element.remove()}};CKEDITOR.ui.panel.block=CKEDITOR.tools.createClass({$:function(a,c){this.element=a.append(a.getDocument().createElement("div",{attributes:{tabindex:-1,"class":"cke_panel_block"},
+!1===this._.onKeyDown(b)?a.data.preventDefault():(27==b||b==("rtl"==c?39:37))&&this.onEscape&&!1===this.onEscape(b)&&a.data.preventDefault()},this);a=a.getBody();a.unselectable();CKEDITOR.env.air&&CKEDITOR.tools.callFunction(b)}else a=this.document.getById(this.id);this._.holder=a}return a};var m={editorId:e.id,id:this.id,langCode:e.langCode,dir:e.lang.dir,cls:this.className,frame:"",env:CKEDITOR.env.cssClass,"z-index":e.config.baseFloatZIndex+1};if(this.isFramed){var l=CKEDITOR.env.air?"javascript:void(0)":
+CKEDITOR.env.ie?"javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())":"";m.frame=f.output({id:this.id+"_frame",src:l})}l=a.output(m);h&&h.push(l);return l},addBlock:function(a,c){c=this._.blocks[a]=c instanceof CKEDITOR.ui.panel.block?c:new CKEDITOR.ui.panel.block(this.getHolderElement(),c);this._.currentBlock||this.showBlock(a);return c},getBlock:function(a){return this._.blocks[a]},showBlock:function(a){a=this._.blocks[a];var c=
+this._.currentBlock,f=!this.forceIFrame||CKEDITOR.env.ie?this._.holder:this.document.getById(this.id+"_frame");c&&c.hide();this._.currentBlock=a;CKEDITOR.fire("ariaWidget",f);a._.focusIndex=-1;this._.onKeyDown=a.onKeyDown&&CKEDITOR.tools.bind(a.onKeyDown,a);a.show();return a},destroy:function(){this.element&&this.element.remove()}};CKEDITOR.ui.panel.block=CKEDITOR.tools.createClass({$:function(a,c){this.element=a.append(a.getDocument().createElement("div",{attributes:{tabindex:-1,"class":"cke_panel_block"},
 styles:{display:"none"}}));c&&CKEDITOR.tools.extend(this,c);this.element.setAttributes({role:this.attributes.role||"presentation","aria-label":this.attributes["aria-label"],title:this.attributes.title||this.attributes["aria-label"]});this.keys={};this._.focusIndex=-1;this.element.disableContextMenu()},_:{markItem:function(a){-1!=a&&(a=this.element.getElementsByTag("a").getItem(this._.focusIndex=a),CKEDITOR.env.webkit&&a.getDocument().getWindow().focus(),a.focus(),this.onMark&&this.onMark(a))}},proto:{show:function(){this.element.setStyle("display",
-"")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,c){var e=this.keys[a];switch(e){case "next":for(var l=this._.focusIndex,e=this.element.getElementsByTag("a"),k;k=e.getItem(++l);)if(k.getAttribute("_cke_focus")&&k.$.offsetWidth){this._.focusIndex=l;k.focus();break}return k||c?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":l=this._.focusIndex;for(e=this.element.getElementsByTag("a");0<l&&(k=e.getItem(--l));){if(k.getAttribute("_cke_focus")&&
-k.$.offsetWidth){this._.focusIndex=l;k.focus();break}k=null}return k||c?!1:(this._.focusIndex=e.count(),this.onKeyDown(a,1));case "click":case "mouseup":return l=this._.focusIndex,(k=0<=l&&this.element.getElementsByTag("a").getItem(l))&&(k.$[e]?k.$[e]():k.$["on"+e]()),!1}return!0}}})}(),CKEDITOR.plugins.add("floatpanel",{requires:"panel"}),function(){function a(a,g,f,m,l){l=CKEDITOR.tools.genKey(g.getUniqueId(),f.getUniqueId(),a.lang.dir,a.uiColor||"",m.css||"",l||"");var k=e[l];k||(k=e[l]=new CKEDITOR.ui.panel(g,
-m),k.element=f.append(CKEDITOR.dom.element.createFromHtml(k.render(a),g)),k.element.setStyles({display:"none",position:"absolute"}));return k}var e={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(c,e,f,m){function l(){h.hide()}f.forceIFrame=1;f.toolbarRelated&&c.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(e=CKEDITOR.document.getById("cke_"+c.name));var k=e.getDocument();m=a(c,k,e,f,m||0);var b=m.element,d=b.getFirst(),h=this;b.disableContextMenu();this.element=b;this._={editor:c,
-panel:m,parentElement:e,definition:f,document:k,iframe:d,children:[],dir:c.lang.dir,showBlockParams:null};c.on("mode",l);c.on("resize",l);k.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,e){return this._.panel.addBlock(a,e)},addListBlock:function(a,e){return this._.panel.addListBlock(a,e)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,e,f,m,l,k){var b=this._.panel,d=b.showBlock(a);this._.showBlockParams=[].slice.call(arguments);
-this.allowBlur(!1);var h=this._.editor.editable();this._.returnFocus=h.hasFocus?h:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var p=this.element,h=this._.iframe,h=CKEDITOR.env.ie&&!CKEDITOR.env.edge?h:new CKEDITOR.dom.window(h.$.contentWindow),v=p.getDocument(),u=this._.parentElement.getPositionedAncestor(),t=e.getDocumentPosition(v),v=u?u.getDocumentPosition(v):{x:0,y:0},n="rtl"==this._.dir,q=t.x+(m||0)-v.x,w=t.y+(l||0)-v.y;!n||1!=f&&4!=f?n||2!=f&&3!=f||(q+=e.$.offsetWidth-
-1):q+=e.$.offsetWidth;if(3==f||4==f)w+=e.$.offsetHeight-1;this._.panel._.offsetParentId=e.getId();p.setStyles({top:w+"px",left:0,display:""});p.setOpacity(0);p.getFirst().removeStyle("width");this._.editor.focusManager.add(h);this._.blurSet||(CKEDITOR.event.useCapture=!0,h.on("blur",function(a){function b(){delete this._.returnFocus;this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=
-CKEDITOR.tools.setTimeout(b,0,this)):b.call(this))},this),h.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(h.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),h.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);b.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=
+"")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,c){var f=this.keys[a];switch(f){case "next":for(var l=this._.focusIndex,f=this.element.getElementsByTag("a"),k;k=f.getItem(++l);)if(k.getAttribute("_cke_focus")&&k.$.offsetWidth){this._.focusIndex=l;k.focus();break}return k||c?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":l=this._.focusIndex;for(f=this.element.getElementsByTag("a");0<l&&(k=f.getItem(--l));){if(k.getAttribute("_cke_focus")&&
+k.$.offsetWidth){this._.focusIndex=l;k.focus();break}k=null}return k||c?!1:(this._.focusIndex=f.count(),this.onKeyDown(a,1));case "click":case "mouseup":return l=this._.focusIndex,(k=0<=l&&this.element.getElementsByTag("a").getItem(l))&&(k.$[f]?k.$[f]():k.$["on"+f]()),!1}return!0}}})}(),CKEDITOR.plugins.add("floatpanel",{requires:"panel"}),function(){function a(a,e,h,m,l){l=CKEDITOR.tools.genKey(e.getUniqueId(),h.getUniqueId(),a.lang.dir,a.uiColor||"",m.css||"",l||"");var k=f[l];k||(k=f[l]=new CKEDITOR.ui.panel(e,
+m),k.element=h.append(CKEDITOR.dom.element.createFromHtml(k.render(a),e)),k.element.setStyles({display:"none",position:"absolute"}));return k}var f={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(c,e,h,f){function l(){g.hide()}h.forceIFrame=1;h.toolbarRelated&&c.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(e=CKEDITOR.document.getById("cke_"+c.name));var k=e.getDocument();f=a(c,k,e,h,f||0);var b=f.element,d=b.getFirst(),g=this;b.disableContextMenu();this.element=b;this._={editor:c,
+panel:f,parentElement:e,definition:h,document:k,iframe:d,children:[],dir:c.lang.dir,showBlockParams:null};c.on("mode",l);c.on("resize",l);k.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,e){return this._.panel.addBlock(a,e)},addListBlock:function(a,e){return this._.panel.addListBlock(a,e)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,e,h,f,l,k){var b=this._.panel,d=b.showBlock(a);this._.showBlockParams=[].slice.call(arguments);
+this.allowBlur(!1);var g=this._.editor.editable();this._.returnFocus=g.hasFocus?g:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var p=this.element,g=this._.iframe,g=CKEDITOR.env.ie&&!CKEDITOR.env.edge?g:new CKEDITOR.dom.window(g.$.contentWindow),u=p.getDocument(),v=this._.parentElement.getPositionedAncestor(),r=e.getDocumentPosition(u),u=v?v.getDocumentPosition(u):{x:0,y:0},n="rtl"==this._.dir,q=r.x+(f||0)-u.x,w=r.y+(l||0)-u.y;!n||1!=h&&4!=h?n||2!=h&&3!=h||(q+=e.$.offsetWidth-
+1):q+=e.$.offsetWidth;if(3==h||4==h)w+=e.$.offsetHeight-1;this._.panel._.offsetParentId=e.getId();p.setStyles({top:w+"px",left:0,display:""});p.setOpacity(0);p.getFirst().removeStyle("width");this._.editor.focusManager.add(g);this._.blurSet||(CKEDITOR.event.useCapture=!0,g.on("blur",function(a){function b(){delete this._.returnFocus;this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=
+CKEDITOR.tools.setTimeout(b,0,this)):b.call(this))},this),g.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(g.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),g.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);b.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=
 p;a.removeStyle("width");if(d.autoSize){var c=d.element.getDocument(),c=(CKEDITOR.env.webkit?d.element:c.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",c+10+"px");c=d.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<c&&(c+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",c+"px");b._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");
-n&&(q-=p.$.offsetWidth);p.setStyle("left",q+"px");var c=b.element.getWindow(),a=p.$.getBoundingClientRect(),c=c.getViewPaneSize(),f=a.width||a.right-a.left,e=a.height||a.bottom-a.top,h=n?a.right:c.width-a.left,g=n?c.width-a.right:a.left;n?h<f&&(q=g>f?q+f:c.width>f?q-a.left:q-a.right+c.width):h<f&&(q=g>f?q-f:c.width>f?q-a.right+c.width:q-a.left);f=a.top;c.height-a.top<e&&(w=f>e?w-e:c.height>e?w-a.bottom+c.height:w-a.top);CKEDITOR.env.ie&&(c=a=new CKEDITOR.dom.element(p.$.offsetParent),"html"==c.getName()&&
+n&&(q-=p.$.offsetWidth);p.setStyle("left",q+"px");var c=b.element.getWindow(),a=p.$.getBoundingClientRect(),c=c.getViewPaneSize(),e=a.width||a.right-a.left,g=a.height||a.bottom-a.top,h=n?a.right:c.width-a.left,f=n?c.width-a.right:a.left;n?h<e&&(q=f>e?q+e:c.width>e?q-a.left:q-a.right+c.width):h<e&&(q=f>e?q-e:c.width>e?q-a.right+c.width:q-a.left);e=a.top;c.height-a.top<g&&(w=e>g?w-g:c.height>g?w-a.bottom+c.height:w-a.top);CKEDITOR.env.ie&&(c=a=new CKEDITOR.dom.element(p.$.offsetParent),"html"==c.getName()&&
 (c=c.getDocument().getBody()),"rtl"==c.getComputedStyle("direction")&&(q=CKEDITOR.env.ie8Compat?q-2*p.getDocument().getDocumentElement().$.scrollLeft:q-(a.$.scrollWidth-a.$.clientWidth)));var a=p.getFirst(),l;(l=a.getCustomData("activePanel"))&&l.onHide&&l.onHide.call(this,1);a.setCustomData("activePanel",this);p.setStyles({top:w+"px",left:q+"px"});p.setOpacity(1);k&&k()},this);b.isLoaded?a():b.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;
 this.focus();d.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||
 this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),
-a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var e=this._.panel;void 0!==a&&(e.allowBlur=a);return e.allowBlur},showAsChild:function(a,e,f,m,l,k){if(this._.activeChild!=a||a._.panel._.offsetParentId!=f.getId())this.hideChild(),a.onHide=CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(e,f,m,l,k),this.blur(),
-(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var e=this._.activeChild;e&&(delete e.onHide,delete this._.activeChild,e.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),g;for(g in e){var f=e[g];a?f.destroy():f.element.hide()}a&&(e={})})}(),CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(a){for(var e=a.config.menu_groups.split(","),
-c=a._.menuGroups={},g=a._.menuItems={},f=0;f<e.length;f++)c[e[f]]=f+1;a.addMenuGroup=function(a,f){c[a]=f||100};a.addMenuItem=function(a,f){c[f.group]&&(g[a]=new CKEDITOR.menuItem(this,a,f))};a.addMenuItems=function(a){for(var c in a)this.addMenuItem(c,a[c])};a.getMenuItem=function(a){return g[a]};a.removeMenuItem=function(a){delete g[a]}}}),function(){function a(a){a.sort(function(a,c){return a.group<c.group?-1:a.group>c.group?1:a.order<c.order?-1:a.order>c.order?1:0})}var e='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1"_cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked}';
-CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(e+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(e+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var e=e+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),c=CKEDITOR.addTemplate("menuItem",e+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e'),
-g=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,c){c=this._.definition=c||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=c.level||1;var e=CKEDITOR.tools.extend({},c.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),g=e.block.attributes=e.attributes||{};!g.role&&(g.role="menu");this._.panelDefinition=
-e},_:{onShow:function(){var a=this.editor.getSelection(),c=a&&a.getStartElement(),e=this.editor.elementPath(),g=this._.listeners;this.removeAll();for(var b=0;b<g.length;b++){var d=g[b](c,a,e);if(d)for(var h in d){var p=this.editor.getMenuItem(h);!p||p.command&&!this.editor.getCommand(p.command).state||(p.state=d[h],this.add(p))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var c=this.parent;c?c._.panel.hideChild(1):
-27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var c=this._.subMenu,e=this.items[a];if(e=e.getItems&&e.getItems()){c?c.removeAll():(c=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),c.parent=this,c._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var g in e){var b=this.editor.getMenuItem(g);b&&(b.state=e[g],c.add(b))}var d=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
-String(a));setTimeout(function(){c.show(d,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(c,e,g,k){if(!this.parent&&(this._.onShow(),!this.items.length))return;e=e||("rtl"==this.editor.lang.dir?2:1);var b=this.items,d=this.editor,h=this._.panel,p=this._.element;if(!h){h=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
-h.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);h.onShow=function(){h._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};h.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);p=h.addBlock(this.id,this._.panelDefinition.block);p.autoSize=!0;var v=p.keys;v[40]="next";v[9]="next";v[38]="prev";v[CKEDITOR.SHIFT+9]="prev";v["rtl"==d.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";v[32]=CKEDITOR.env.ie?"mouseup":
-"click";CKEDITOR.env.ie&&(v[13]="mouseup");p=this._.element=p.element;v=p.getDocument();v.getBody().setStyle("overflow","hidden");v.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,d.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
-this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}a(b);for(var v=d.elementPath(),v=['\x3cdiv class\x3d"cke_menu'+(v&&v.direction()!=d.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],u=b.length,t=u&&b[0].group,n=0;n<u;n++){var q=b[n];t!=q.group&&(v.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
-t=q.group);q.render(this,n,v)}v.push("\x3c/div\x3e");p.setHtml(v.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(h,this.id,c,e,g,k):h.showBlock(this.id,c,e,g,k);d.fire("menuShow",[h])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,c,e){CKEDITOR.tools.extend(this,e,{order:0,className:"cke_menubutton__"+c});this.group=
-a._.menuGroups[this.group];this.editor=a;this.name=c},proto:{render:function(a,e,l){var k=a.id+String(e),b="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,d="",h=b==CKEDITOR.TRISTATE_ON?"on":b==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(d=' aria-checked\x3d"'+(b==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var p=this.getItems,v="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",u=this.name;this.icon&&!/\./.test(this.icon)&&(u=
-this.icon);a={id:k,name:this.name,iconName:u,label:this.label,cls:this.className||"",state:h,hasPopup:p?"true":"false",disabled:b==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:e,iconStyle:CKEDITOR.skin.getIconStyle(u,"rtl"==this.editor.lang.dir,u==this.icon?null:this.icon,this.iconOffset),arrowHtml:p?g.output({label:v}):"",role:this.role?this.role:"menuitem",ariaChecked:d};
+a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var e=this._.panel;void 0!==a&&(e.allowBlur=a);return e.allowBlur},showAsChild:function(a,e,h,f,l,k){if(this._.activeChild!=a||a._.panel._.offsetParentId!=h.getId())this.hideChild(),a.onHide=CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(e,h,f,l,k),this.blur(),
+(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var e=this._.activeChild;e&&(delete e.onHide,delete this._.activeChild,e.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),e;for(e in f){var h=f[e];a?h.destroy():h.element.hide()}a&&(f={})})}(),CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(a){for(var f=a.config.menu_groups.split(","),
+c=a._.menuGroups={},e=a._.menuItems={},h=0;h<f.length;h++)c[f[h]]=h+1;a.addMenuGroup=function(a,e){c[a]=e||100};a.addMenuItem=function(a,h){c[h.group]&&(e[a]=new CKEDITOR.menuItem(this,a,h))};a.addMenuItems=function(a){for(var c in a)this.addMenuItem(c,a[c])};a.getMenuItem=function(a){return e[a]};a.removeMenuItem=function(a){delete e[a]}}}),function(){function a(a){a.sort(function(a,c){return a.group<c.group?-1:a.group>c.group?1:a.order<c.order?-1:a.order>c.order?1:0})}var f='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1"_cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked}';
+CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(f+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(f+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var f=f+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),c=CKEDITOR.addTemplate("menuItem",f+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e'),
+e=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,c){c=this._.definition=c||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=c.level||1;var e=CKEDITOR.tools.extend({},c.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),f=e.block.attributes=e.attributes||{};!f.role&&(f.role="menu");this._.panelDefinition=
+e},_:{onShow:function(){var a=this.editor.getSelection(),c=a&&a.getStartElement(),e=this.editor.elementPath(),f=this._.listeners;this.removeAll();for(var b=0;b<f.length;b++){var d=f[b](c,a,e);if(d)for(var g in d){var p=this.editor.getMenuItem(g);!p||p.command&&!this.editor.getCommand(p.command).state||(p.state=d[g],this.add(p))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var c=this.parent;c?c._.panel.hideChild(1):
+27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var c=this._.subMenu,e=this.items[a];if(e=e.getItems&&e.getItems()){c?c.removeAll():(c=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),c.parent=this,c._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var f in e){var b=this.editor.getMenuItem(f);b&&(b.state=e[f],c.add(b))}var d=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
+String(a));setTimeout(function(){c.show(d,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(c,e,f,k){if(!this.parent&&(this._.onShow(),!this.items.length))return;e=e||("rtl"==this.editor.lang.dir?2:1);var b=this.items,d=this.editor,g=this._.panel,p=this._.element;if(!g){g=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
+g.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);g.onShow=function(){g._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};g.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);p=g.addBlock(this.id,this._.panelDefinition.block);p.autoSize=!0;var u=p.keys;u[40]="next";u[9]="next";u[38]="prev";u[CKEDITOR.SHIFT+9]="prev";u["rtl"==d.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";u[32]=CKEDITOR.env.ie?"mouseup":
+"click";CKEDITOR.env.ie&&(u[13]="mouseup");p=this._.element=p.element;u=p.getDocument();u.getBody().setStyle("overflow","hidden");u.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,d.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
+this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}a(b);for(var u=d.elementPath(),u=['\x3cdiv class\x3d"cke_menu'+(u&&u.direction()!=d.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],v=b.length,r=v&&b[0].group,n=0;n<v;n++){var q=b[n];r!=q.group&&(u.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
+r=q.group);q.render(this,n,u)}u.push("\x3c/div\x3e");p.setHtml(u.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(g,this.id,c,e,f,k):g.showBlock(this.id,c,e,f,k);d.fire("menuShow",[g])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,c,e){CKEDITOR.tools.extend(this,e,{order:0,className:"cke_menubutton__"+c});this.group=
+a._.menuGroups[this.group];this.editor=a;this.name=c},proto:{render:function(a,f,l){var k=a.id+String(f),b="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,d="",g=b==CKEDITOR.TRISTATE_ON?"on":b==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(d=' aria-checked\x3d"'+(b==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var p=this.getItems,u="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",v=this.name;this.icon&&!/\./.test(this.icon)&&(v=
+this.icon);a={id:k,name:this.name,iconName:v,label:this.label,cls:this.className||"",state:g,hasPopup:p?"true":"false",disabled:b==CKEDITOR.TRISTATE_DISABLED,title:this.label,href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:f,iconStyle:CKEDITOR.skin.getIconStyle(v,"rtl"==this.editor.lang.dir,v==this.icon?null:this.icon,this.iconOffset),arrowHtml:p?e.output({label:u}):"",role:this.role?this.role:"menuitem",ariaChecked:d};
 c.output(a,l)}}})}(),CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div",CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,
-e){a.on("contextmenu",function(a){a=a.data;var g=CKEDITOR.env.webkit?c:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!e||!g){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var g=this.editor,l=(new CKEDITOR.dom.elementPath(a.getTarget(),g.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);l&&"false"==l.getAttribute("contenteditable")&&g.getSelection().fake(l)}var l=a.getTarget().getDocument(),k=a.getTarget().getDocument().getDocumentElement(),g=!l.equals(CKEDITOR.document),
-l=l.getWindow().getScrollPosition(),b=g?a.$.clientX:a.$.pageX||l.x+a.$.clientX,d=g?a.$.clientY:a.$.pageY||l.y+a.$.clientY;CKEDITOR.tools.setTimeout(function(){this.open(k,null,b,d)},CKEDITOR.env.ie?200:0,this)}},this);if(CKEDITOR.env.webkit){var c,g=function(){c=0};a.on("keydown",function(a){c=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",g);a.on("contextmenu",g)}},open:function(a,e,c,g){this.editor.focus();a=a||CKEDITOR.document.getDocumentElement();this.editor.selectionChange(1);
-this.show(a,e,c,g)}}})},beforeInit:function(a){var e=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){e.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}}),CKEDITOR.plugins.add("resize",{init:function(a){function e(c){var f=b.width,e=b.height,n=f+(c.data.$.screenX-
-k.x)*("rtl"==m?-1:1);c=e+(c.data.$.screenY-k.y);d&&(f=Math.max(g.resize_minWidth,Math.min(n,g.resize_maxWidth)));h&&(e=Math.max(g.resize_minHeight,Math.min(c,g.resize_maxHeight)));a.resize(d?f:null,e)}function c(){CKEDITOR.document.removeListener("mousemove",e);CKEDITOR.document.removeListener("mouseup",c);a.document&&(a.document.removeListener("mousemove",e),a.document.removeListener("mouseup",c))}var g=a.config,f=a.ui.spaceId("resizer"),m=a.element?a.element.getDirection(1):"ltr";!g.resize_dir&&
-(g.resize_dir="vertical");void 0===g.resize_maxWidth&&(g.resize_maxWidth=3E3);void 0===g.resize_maxHeight&&(g.resize_maxHeight=3E3);void 0===g.resize_minWidth&&(g.resize_minWidth=750);void 0===g.resize_minHeight&&(g.resize_minHeight=250);if(!1!==g.resize_enabled){var l=null,k,b,d=("both"==g.resize_dir||"horizontal"==g.resize_dir)&&g.resize_minWidth!=g.resize_maxWidth,h=("both"==g.resize_dir||"vertical"==g.resize_dir)&&g.resize_minHeight!=g.resize_maxHeight,p=CKEDITOR.tools.addFunction(function(d){l||
-(l=a.getResizable());b={width:l.$.offsetWidth||0,height:l.$.offsetHeight||0};k={x:d.screenX,y:d.screenY};g.resize_minWidth>b.width&&(g.resize_minWidth=b.width);g.resize_minHeight>b.height&&(g.resize_minHeight=b.height);CKEDITOR.document.on("mousemove",e);CKEDITOR.document.on("mouseup",c);a.document&&(a.document.on("mousemove",e),a.document.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("destroy",function(){CKEDITOR.tools.removeFunction(p)});a.on("uiSpace",function(b){if("bottom"==b.data.space){var c=
-"";d&&!h&&(c=" cke_resizer_horizontal");!d&&h&&(c=" cke_resizer_vertical");var e='\x3cspan id\x3d"'+f+'" class\x3d"cke_resizer'+c+" cke_resizer_"+m+'" title\x3d"'+CKEDITOR.tools.htmlEncode(a.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+p+', event)"\x3e'+("ltr"==m?"◢":"◣")+"\x3c/span\x3e";"ltr"==m&&"ltr"==c?b.data.html+=e:b.data.html=e+b.data.html}},a,null,100);a.on("maximize",function(b){a.ui.space("resizer")[b.data==CKEDITOR.TRISTATE_ON?"hide":"show"]()})}}}),function(){var a=
+f){a.on("contextmenu",function(a){a=a.data;var e=CKEDITOR.env.webkit?c:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!f||!e){a.preventDefault();if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var e=this.editor,l=(new CKEDITOR.dom.elementPath(a.getTarget(),e.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);l&&"false"==l.getAttribute("contenteditable")&&e.getSelection().fake(l)}var l=a.getTarget().getDocument(),k=a.getTarget().getDocument().getDocumentElement(),e=!l.equals(CKEDITOR.document),
+l=l.getWindow().getScrollPosition(),b=e?a.$.clientX:a.$.pageX||l.x+a.$.clientX,d=e?a.$.clientY:a.$.pageY||l.y+a.$.clientY;CKEDITOR.tools.setTimeout(function(){this.open(k,null,b,d)},CKEDITOR.env.ie?200:0,this)}},this);if(CKEDITOR.env.webkit){var c,e=function(){c=0};a.on("keydown",function(a){c=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",e);a.on("contextmenu",e)}},open:function(a,f,c,e){this.editor.focus();a=a||CKEDITOR.document.getDocumentElement();this.editor.selectionChange(1);
+this.show(a,f,c,e)}}})},beforeInit:function(a){var f=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){f.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});a.addCommand("contextMenu",{exec:function(){a.contextMenu.open(a.document.getBody())}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}}),CKEDITOR.plugins.add("resize",{init:function(a){function f(c){var h=b.width,f=b.height,l=h+(c.data.$.screenX-
+k.x)*("rtl"==m?-1:1);c=f+(c.data.$.screenY-k.y);d&&(h=Math.max(e.resize_minWidth,Math.min(l,e.resize_maxWidth)));g&&(f=Math.max(e.resize_minHeight,Math.min(c,e.resize_maxHeight)));a.resize(d?h:null,f)}function c(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",c);a.document&&(a.document.removeListener("mousemove",f),a.document.removeListener("mouseup",c))}var e=a.config,h=a.ui.spaceId("resizer"),m=a.element?a.element.getDirection(1):"ltr";!e.resize_dir&&
+(e.resize_dir="vertical");void 0===e.resize_maxWidth&&(e.resize_maxWidth=3E3);void 0===e.resize_maxHeight&&(e.resize_maxHeight=3E3);void 0===e.resize_minWidth&&(e.resize_minWidth=750);void 0===e.resize_minHeight&&(e.resize_minHeight=250);if(!1!==e.resize_enabled){var l=null,k,b,d=("both"==e.resize_dir||"horizontal"==e.resize_dir)&&e.resize_minWidth!=e.resize_maxWidth,g=("both"==e.resize_dir||"vertical"==e.resize_dir)&&e.resize_minHeight!=e.resize_maxHeight,p=CKEDITOR.tools.addFunction(function(d){l||
+(l=a.getResizable());b={width:l.$.offsetWidth||0,height:l.$.offsetHeight||0};k={x:d.screenX,y:d.screenY};e.resize_minWidth>b.width&&(e.resize_minWidth=b.width);e.resize_minHeight>b.height&&(e.resize_minHeight=b.height);CKEDITOR.document.on("mousemove",f);CKEDITOR.document.on("mouseup",c);a.document&&(a.document.on("mousemove",f),a.document.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("destroy",function(){CKEDITOR.tools.removeFunction(p)});a.on("uiSpace",function(b){if("bottom"==b.data.space){var c=
+"";d&&!g&&(c=" cke_resizer_horizontal");!d&&g&&(c=" cke_resizer_vertical");var e='\x3cspan id\x3d"'+h+'" class\x3d"cke_resizer'+c+" cke_resizer_"+m+'" title\x3d"'+CKEDITOR.tools.htmlEncode(a.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+p+', event)"\x3e'+("ltr"==m?"◢":"◣")+"\x3c/span\x3e";"ltr"==m&&"ltr"==c?b.data.html+=e:b.data.html=e+b.data.html}},a,null,100);a.on("maximize",function(b){a.ui.space("resizer")[b.data==CKEDITOR.TRISTATE_ON?"hide":"show"]()})}}}),function(){var a=
 '\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');
 var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),a=a+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
-e=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),c=CKEDITOR.addTemplate("button",a);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(c){c.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
-CKEDITOR.ui.button.prototype={render:function(a,f){function m(){var b=a.mode;b&&(b=this.modes[b]?void 0!==n[b]?n[b]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,b=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:b,this.setState(b),this.refresh&&this.refresh())}var l=CKEDITOR.env,k=this._.id=CKEDITOR.tools.getNextId(),b="",d=this.command,h;this._.editor=a;var p={id:k,button:this,editor:a,focus:function(){CKEDITOR.document.getById(k).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
-v=CKEDITOR.tools.addFunction(function(a){if(p.onkey)return a=new CKEDITOR.dom.event(a),!1!==p.onkey(p,a.getKeystroke())}),u=CKEDITOR.tools.addFunction(function(a){var b;p.onfocus&&(b=!1!==p.onfocus(p,new CKEDITOR.dom.event(a)));return b}),t=0;p.clickFn=h=CKEDITOR.tools.addFunction(function(){t&&(a.unlockSelection(1),t=0);p.execute();l.iOS&&a.focus()});if(this.modes){var n={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(n[a.mode]=this._.state)},this);a.on("activeFilterChange",
+f=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),c=CKEDITOR.addTemplate("button",a);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(c){c.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
+CKEDITOR.ui.button.prototype={render:function(a,h){function m(){var b=a.mode;b&&(b=this.modes[b]?void 0!==n[b]?n[b]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,b=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:b,this.setState(b),this.refresh&&this.refresh())}var l=CKEDITOR.env,k=this._.id=CKEDITOR.tools.getNextId(),b="",d=this.command,g;this._.editor=a;var p={id:k,button:this,editor:a,focus:function(){CKEDITOR.document.getById(k).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
+u=CKEDITOR.tools.addFunction(function(a){if(p.onkey)return a=new CKEDITOR.dom.event(a),!1!==p.onkey(p,a.getKeystroke())}),v=CKEDITOR.tools.addFunction(function(a){var b;p.onfocus&&(b=!1!==p.onfocus(p,new CKEDITOR.dom.event(a)));return b}),r=0;p.clickFn=g=CKEDITOR.tools.addFunction(function(){r&&(a.unlockSelection(1),r=0);p.execute();l.iOS&&a.focus()});if(this.modes){var n={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(n[a.mode]=this._.state)},this);a.on("activeFilterChange",
 m,this);a.on("mode",m,this);!this.readOnly&&a.on("readOnly",m,this)}else d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),b+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var d=CKEDITOR.document.getById(this._.id),c=d.getFirst();b=b.data;b!=a.lang.dir?d.addClass("cke_"+b):d.removeClass("cke_ltr").removeClass("cke_rtl");c.setAttribute("style",CKEDITOR.skin.getIconStyle(w,
-"rtl"==b,this.icon,this.iconOffset))},this);d||(b+="off");var q=this.name||this.command,w=q;this.icon&&!/\./.test(this.icon)&&(w=this.icon,this.icon=null);b={id:k,name:q,iconName:w,label:this.label,cls:this.className||"",state:b,ariaDisabled:"disabled"==b?"true":"false",title:this.title,titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:v,focusFn:u,clickFn:h,style:CKEDITOR.skin.getIconStyle(w,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?
-e.output():""};c.output(b,f);if(this.onRender)this.onRender();return p},setState:function(a){if(this._.state==a)return!1;this._.state=a;var c=CKEDITOR.document.getById(this._.id);return c?(c.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?c.setAttribute("aria-disabled",!0):c.removeAttribute("aria-disabled"),this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?
-c.setAttribute("aria-pressed",!0):c.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var c=this;this.allowedContent||this.requiredContent||!this.command||(c=a.getCommand(this.command)||c);return this._.feature=c}};CKEDITOR.ui.prototype.addButton=function(a,c){this.add(a,CKEDITOR.UI_BUTTON,c)}}(),function(){function a(a){function c(){for(var b=g(),d=CKEDITOR.tools.clone(a.config.toolbarGroups)||e(a),h=0;h<
-d.length;h++){var m=d[h];if("/"!=m){"string"==typeof m&&(m=d[h]={name:m});var n,q=m.groups;if(q)for(var w=0;w<q.length;w++)n=q[w],(n=b[n])&&k(m,n);(n=b[m.name])&&k(m,n)}}return d}function g(){var b={},d,c,e;for(d in a.ui.items)c=a.ui.items[d],e=c.toolbar||"others",e=e.split(","),c=e[0],e=parseInt(e[1]||-1,10),b[c]||(b[c]=[]),b[c].push({name:d,order:e});for(c in b)b[c]=b[c].sort(function(a,b){return a.order==b.order?0:0>b.order?-1:0>a.order?1:a.order<b.order?-1:1});return b}function k(b,c){if(c.length){b.items?
-b.items.push(a.ui.create("-")):b.items=[];for(var e;e=c.shift();)e="string"==typeof e?e:e.name,d&&-1!=CKEDITOR.tools.indexOf(d,e)||(e=a.ui.create(e))&&a.addFeature(e)&&b.items.push(e)}}function b(a){var b=[],d,c,f;for(d=0;d<a.length;++d)c=a[d],f={},"/"==c?b.push(c):CKEDITOR.tools.isArray(c)?(k(f,CKEDITOR.tools.clone(c)),b.push(f)):c.items&&(k(f,CKEDITOR.tools.clone(c.items)),f.name=c.name,b.push(f));return b}var d=a.config.removeButtons,d=d&&d.split(","),h=a.config.toolbar;"string"==typeof h&&(h=
-a.config["toolbar_"+h]);return a.toolbar=h?b(h):c()}function e(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},
-{name:"about"}])}var c=function(){this.toolbars=[];this.focusCommandExecuted=!1};c.prototype.focus=function(){for(var a=0,c;c=this.toolbars[a++];)for(var e=0,g;g=c.items[e++];)if(g.focus){g.focus();return}};var g={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(f){var e,l=function(a,
-b){var d,c="rtl"==f.lang.dir,g=f.config.toolbarGroupCycling,v=c?37:39,c=c?39:37,g=void 0===g||g;switch(b){case 9:case CKEDITOR.SHIFT+9:for(;!d||!d.items.length;)if(d=9==b?(d?d.next:a.toolbar.next)||f.toolbox.toolbars[0]:(d?d.previous:a.toolbar.previous)||f.toolbox.toolbars[f.toolbox.toolbars.length-1],d.items.length)for(a=d.items[e?d.items.length-1:0];a&&!a.focus;)(a=e?a.previous:a.next)||(d=0);a&&a.focus();return!1;case v:d=a;do d=d.next,!d&&g&&(d=a.toolbar.items[0]);while(d&&!d.focus);d?d.focus():
-l(a,9);return!1;case 40:return a.button&&a.button.hasArrow?(f.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)}),a.execute()):l(a,40==b?v:c),!1;case c:case 38:d=a;do d=d.previous,!d&&g&&(d=a.toolbar.items[a.toolbar.items.length-1]);while(d&&!d.focus);d?d.focus():(e=1,l(a,CKEDITOR.SHIFT+9),e=0);return!1;case 27:return f.focus(),!1;case 13:case 32:return a.execute(),!1}return!0};f.on("uiSpace",function(e){if(e.data.space==f.config.toolbarLocation){e.removeListener();f.toolbox=
-new c;var b=CKEDITOR.tools.getNextId(),d=['\x3cspan id\x3d"',b,'" class\x3d"cke_voice_label"\x3e',f.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+f.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',b,'" onmousedown\x3d"return false;"\x3e'],b=!1!==f.config.toolbarStartupExpanded,h,g;f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&d.push('\x3cspan class\x3d"cke_toolbox_main"'+(b?"\x3e":' style\x3d"display:none"\x3e'));for(var m=
-f.toolbox.toolbars,u=a(f),t=0;t<u.length;t++){var n,q=0,w,y=u[t],C;if(y)if(h&&(d.push("\x3c/span\x3e"),g=h=0),"/"===y)d.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{C=y.items||y;for(var r=0;r<C.length;r++){var x=C[r],B;if(x){var A=function(a){a=a.render(f,d);z=q.items.push(a)-1;0<z&&(a.previous=q.items[z-1],a.previous.next=a);a.toolbar=q;a.onkey=l;a.onfocus=function(){f.toolbox.focusCommandExecuted||f.focus()}};if(x.type==CKEDITOR.UI_SEPARATOR)g=h&&x;else{B=!1!==x.canGroup;
-if(!q){n=CKEDITOR.tools.getNextId();q={id:n,items:[]};w=y.name&&(f.lang.toolbar.toolbarGroups[y.name]||y.name);d.push('\x3cspan id\x3d"',n,'" class\x3d"cke_toolbar"',w?' aria-labelledby\x3d"'+n+'_label"':"",' role\x3d"toolbar"\x3e');w&&d.push('\x3cspan id\x3d"',n,'_label" class\x3d"cke_voice_label"\x3e',w,"\x3c/span\x3e");d.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var z=m.push(q)-1;0<z&&(q.previous=m[z-1],q.previous.next=q)}B?h||(d.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),
-h=1):h&&(d.push("\x3c/span\x3e"),h=0);g&&(A(g),g=0);A(x)}}}h&&(d.push("\x3c/span\x3e"),g=h=0);q&&d.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}f.config.toolbarCanCollapse&&d.push("\x3c/span\x3e");if(f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var D=CKEDITOR.tools.addFunction(function(){f.execCommand("toolbarCollapse")});f.on("destroy",function(){CKEDITOR.tools.removeFunction(D)});f.addCommand("toolbarCollapse",{readOnly:1,exec:function(a){var b=
-a.ui.space("toolbar_collapser"),d=b.getPrevious(),c=a.ui.space("contents"),f=d.getParent(),e=parseInt(c.$.style.height,10),h=f.$.offsetHeight,g=b.hasClass("cke_toolbox_collapser_min");g?(d.show(),b.removeClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarCollapse)):(d.hide(),b.addClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarExpand));b.getFirst().setText(g?"▲":"◀");c.setStyle("height",e-(f.$.offsetHeight-h)+"px");a.fire("resize",{outerHeight:a.container.$.offsetHeight,
-contentsHeight:c.$.offsetHeight,outerWidth:a.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});f.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");d.push('\x3ca title\x3d"'+(b?f.lang.toolbar.toolbarCollapse:f.lang.toolbar.toolbarExpand)+'" id\x3d"'+f.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');b||d.push(" cke_toolbox_collapser_min");d.push('" onclick\x3d"CKEDITOR.tools.callFunction('+D+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',
-"\x3c/a\x3e")}d.push("\x3c/span\x3e");e.data.html+=d.join("")}});f.on("destroy",function(){if(this.toolbox){var a,b=0,d,c,f;for(a=this.toolbox.toolbars;b<a.length;b++)for(c=a[b].items,d=0;d<c.length;d++)f=c[d],f.clickFn&&CKEDITOR.tools.removeFunction(f.clickFn),f.keyDownFn&&CKEDITOR.tools.removeFunction(f.keyDownFn)}});f.on("uiReady",function(){var a=f.ui.space("toolbox");a&&f.focusManager.add(a,1)});f.addCommand("toolbarFocus",g);f.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");f.ui.add("-",CKEDITOR.UI_SEPARATOR,
-{});f.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,b){b.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,c,g){var k=e(this.editor),b=0===c,d={name:a};if(g){if(g=CKEDITOR.tools.search(k,function(a){return a.name==g})){!g.groups&&(g.groups=[]);if(c&&(c=CKEDITOR.tools.indexOf(g.groups,c),0<=c)){g.groups.splice(c+1,0,a);return}b?g.groups.splice(0,0,a):g.groups.push(a);
-return}c=null}c&&(c=CKEDITOR.tools.indexOf(k,function(a){return a.name==c}));b?k.splice(0,0,a):"number"==typeof c?k.splice(c+1,0,d):k.push(a)}}(),CKEDITOR.UI_SEPARATOR="separator",CKEDITOR.config.toolbarLocation="top",function(){function a(a,c){function l(b){b=h.list[b];if(b.equals(a.editable())||"true"==b.getAttribute("contenteditable")){var d=a.createRange();d.selectNodeContents(b);d.select()}else a.getSelection().selectElement(b);a.focus()}function k(){d&&d.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');
-delete h.list}var b=a.ui.spaceId("path"),d,h=a._.elementsPath,p=h.idBase;c.html+='\x3cspan id\x3d"'+b+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+b+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+b+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var b=a.ui.space("path");b&&a.focusManager.add(b,1)});h.onClick=l;var v=CKEDITOR.tools.addFunction(l),u=CKEDITOR.tools.addFunction(function(b,
-d){var c=h.idBase,e;d=new CKEDITOR.dom.event(d);e="rtl"==a.lang.dir;switch(d.getKeystroke()){case e?39:37:case 9:return(e=CKEDITOR.document.getById(c+(b+1)))||(e=CKEDITOR.document.getById(c+"0")),e.focus(),!1;case e?37:39:case CKEDITOR.SHIFT+9:return(e=CKEDITOR.document.getById(c+(b-1)))||(e=CKEDITOR.document.getById(c+(h.list.length-1))),e.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(b),!1}return!0});a.on("selectionChange",function(){for(var c=[],e=h.list=[],k=[],l=h.filters,m=
-!0,C=a.elementPath().elements,r,x=C.length;x--;){var B=C[x],A=0;r=B.data("cke-display-name")?B.data("cke-display-name"):B.data("cke-real-element-type")?B.data("cke-real-element-type"):B.getName();(m=B.hasAttribute("contenteditable")?"true"==B.getAttribute("contenteditable"):m)||B.hasAttribute("contenteditable")||(A=1);for(var z=0;z<l.length;z++){var D=l[z](B,r);if(!1===D){A=1;break}r=D||r}A||(e.unshift(B),k.unshift(r))}e=e.length;for(l=0;l<e;l++)r=k[l],m=a.lang.elementspath.eleTitle.replace(/%1/,
-r),r=g.output({id:p+l,label:m,text:r,jsTitle:"javascript:void('"+r+"')",index:l,keyDownFn:u,clickFn:v}),c.unshift(r);d||(d=CKEDITOR.document.getById(b));k=d;k.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');a.fire("elementsPathUpdate",{space:k})});a.on("readOnly",k);a.on("contentDomUnload",k);a.addCommand("elementsPathFocus",e.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,"elementsPathFocus")}var e={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+
-"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},c="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var g=CKEDITOR.addTemplate("pathItem",'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+c+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');
-CKEDITOR.plugins.add("elementspath",{init:function(c){c._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+"_",filters:[]};c.on("uiSpace",function(e){"bottom"==e.data.space&&a(c,e.data)})}})}(),function(){function a(a,b,c){c=a.config.forceEnterMode||c;"wysiwyg"==a.mode&&(b||(b=a.activeEnterMode),a.elementPath().isContextFor("p")||(b=CKEDITOR.ENTER_BR,c=1),a.fire("saveSnapshot"),b==CKEDITOR.ENTER_BR?l(a,b,null,c):k(a,b,null,c),a.fire("saveSnapshot"))}function e(a){a=a.getSelection().getRanges(!0);
+"rtl"==b,this.icon,this.iconOffset))},this);d||(b+="off");var q=this.name||this.command,w=q;this.icon&&!/\./.test(this.icon)&&(w=this.icon,this.icon=null);b={id:k,name:q,iconName:w,label:this.label,cls:this.className||"",state:b,ariaDisabled:"disabled"==b?"true":"false",title:this.title,titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:u,focusFn:v,clickFn:g,style:CKEDITOR.skin.getIconStyle(w,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?
+f.output():""};c.output(b,h);if(this.onRender)this.onRender();return p},setState:function(a){if(this._.state==a)return!1;this._.state=a;var c=CKEDITOR.document.getById(this._.id);return c?(c.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?c.setAttribute("aria-disabled",!0):c.removeAttribute("aria-disabled"),this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?
+c.setAttribute("aria-pressed",!0):c.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var c=this;this.allowedContent||this.requiredContent||!this.command||(c=a.getCommand(this.command)||c);return this._.feature=c}};CKEDITOR.ui.prototype.addButton=function(a,c){this.add(a,CKEDITOR.UI_BUTTON,c)}}(),function(){function a(a){function c(){for(var b=e(),d=CKEDITOR.tools.clone(a.config.toolbarGroups)||f(a),g=0;g<
+d.length;g++){var m=d[g];if("/"!=m){"string"==typeof m&&(m=d[g]={name:m});var n,q=m.groups;if(q)for(var w=0;w<q.length;w++)n=q[w],(n=b[n])&&k(m,n);(n=b[m.name])&&k(m,n)}}return d}function e(){var b={},d,c,g;for(d in a.ui.items)c=a.ui.items[d],g=c.toolbar||"others",g=g.split(","),c=g[0],g=parseInt(g[1]||-1,10),b[c]||(b[c]=[]),b[c].push({name:d,order:g});for(c in b)b[c]=b[c].sort(function(a,b){return a.order==b.order?0:0>b.order?-1:0>a.order?1:a.order<b.order?-1:1});return b}function k(b,c){if(c.length){b.items?
+b.items.push(a.ui.create("-")):b.items=[];for(var e;e=c.shift();)e="string"==typeof e?e:e.name,d&&-1!=CKEDITOR.tools.indexOf(d,e)||(e=a.ui.create(e))&&a.addFeature(e)&&b.items.push(e)}}function b(a){var b=[],d,c,e;for(d=0;d<a.length;++d)c=a[d],e={},"/"==c?b.push(c):CKEDITOR.tools.isArray(c)?(k(e,CKEDITOR.tools.clone(c)),b.push(e)):c.items&&(k(e,CKEDITOR.tools.clone(c.items)),e.name=c.name,b.push(e));return b}var d=a.config.removeButtons,d=d&&d.split(","),g=a.config.toolbar;"string"==typeof g&&(g=
+a.config["toolbar_"+g]);return a.toolbar=g?b(g):c()}function f(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},
+{name:"about"}])}var c=function(){this.toolbars=[];this.focusCommandExecuted=!1};c.prototype.focus=function(){for(var a=0,c;c=this.toolbars[a++];)for(var e=0,f;f=c.items[e++];)if(f.focus){f.focus();return}};var e={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(f){var m,l=function(a,
+b){var d,c="rtl"==f.lang.dir,e=f.config.toolbarGroupCycling,u=c?37:39,c=c?39:37,e=void 0===e||e;switch(b){case 9:case CKEDITOR.SHIFT+9:for(;!d||!d.items.length;)if(d=9==b?(d?d.next:a.toolbar.next)||f.toolbox.toolbars[0]:(d?d.previous:a.toolbar.previous)||f.toolbox.toolbars[f.toolbox.toolbars.length-1],d.items.length)for(a=d.items[m?d.items.length-1:0];a&&!a.focus;)(a=m?a.previous:a.next)||(d=0);a&&a.focus();return!1;case u:d=a;do d=d.next,!d&&e&&(d=a.toolbar.items[0]);while(d&&!d.focus);d?d.focus():
+l(a,9);return!1;case 40:return a.button&&a.button.hasArrow?(f.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)}),a.execute()):l(a,40==b?u:c),!1;case c:case 38:d=a;do d=d.previous,!d&&e&&(d=a.toolbar.items[a.toolbar.items.length-1]);while(d&&!d.focus);d?d.focus():(m=1,l(a,CKEDITOR.SHIFT+9),m=0);return!1;case 27:return f.focus(),!1;case 13:case 32:return a.execute(),!1}return!0};f.on("uiSpace",function(e){if(e.data.space==f.config.toolbarLocation){e.removeListener();f.toolbox=
+new c;var b=CKEDITOR.tools.getNextId(),d=['\x3cspan id\x3d"',b,'" class\x3d"cke_voice_label"\x3e',f.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+f.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',b,'" onmousedown\x3d"return false;"\x3e'],b=!1!==f.config.toolbarStartupExpanded,g,m;f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&d.push('\x3cspan class\x3d"cke_toolbox_main"'+(b?"\x3e":' style\x3d"display:none"\x3e'));for(var u=
+f.toolbox.toolbars,v=a(f),r=0;r<v.length;r++){var n,q=0,w,A=v[r],B;if(A)if(g&&(d.push("\x3c/span\x3e"),m=g=0),"/"===A)d.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{B=A.items||A;for(var t=0;t<B.length;t++){var x=B[t],D;if(x){var y=function(a){a=a.render(f,d);z=q.items.push(a)-1;0<z&&(a.previous=q.items[z-1],a.previous.next=a);a.toolbar=q;a.onkey=l;a.onfocus=function(){f.toolbox.focusCommandExecuted||f.focus()}};if(x.type==CKEDITOR.UI_SEPARATOR)m=g&&x;else{D=!1!==x.canGroup;
+if(!q){n=CKEDITOR.tools.getNextId();q={id:n,items:[]};w=A.name&&(f.lang.toolbar.toolbarGroups[A.name]||A.name);d.push('\x3cspan id\x3d"',n,'" class\x3d"cke_toolbar"',w?' aria-labelledby\x3d"'+n+'_label"':"",' role\x3d"toolbar"\x3e');w&&d.push('\x3cspan id\x3d"',n,'_label" class\x3d"cke_voice_label"\x3e',w,"\x3c/span\x3e");d.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');var z=u.push(q)-1;0<z&&(q.previous=u[z-1],q.previous.next=q)}D?g||(d.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),
+g=1):g&&(d.push("\x3c/span\x3e"),g=0);m&&(y(m),m=0);y(x)}}}g&&(d.push("\x3c/span\x3e"),m=g=0);q&&d.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}f.config.toolbarCanCollapse&&d.push("\x3c/span\x3e");if(f.config.toolbarCanCollapse&&f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var C=CKEDITOR.tools.addFunction(function(){f.execCommand("toolbarCollapse")});f.on("destroy",function(){CKEDITOR.tools.removeFunction(C)});f.addCommand("toolbarCollapse",{readOnly:1,exec:function(a){var b=
+a.ui.space("toolbar_collapser"),d=b.getPrevious(),c=a.ui.space("contents"),e=d.getParent(),g=parseInt(c.$.style.height,10),f=e.$.offsetHeight,h=b.hasClass("cke_toolbox_collapser_min");h?(d.show(),b.removeClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarCollapse)):(d.hide(),b.addClass("cke_toolbox_collapser_min"),b.setAttribute("title",a.lang.toolbar.toolbarExpand));b.getFirst().setText(h?"▲":"◀");c.setStyle("height",g-(e.$.offsetHeight-f)+"px");a.fire("resize",{outerHeight:a.container.$.offsetHeight,
+contentsHeight:c.$.offsetHeight,outerWidth:a.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});f.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");d.push('\x3ca title\x3d"'+(b?f.lang.toolbar.toolbarCollapse:f.lang.toolbar.toolbarExpand)+'" id\x3d"'+f.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');b||d.push(" cke_toolbox_collapser_min");d.push('" onclick\x3d"CKEDITOR.tools.callFunction('+C+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',
+"\x3c/a\x3e")}d.push("\x3c/span\x3e");e.data.html+=d.join("")}});f.on("destroy",function(){if(this.toolbox){var a,b=0,d,c,e;for(a=this.toolbox.toolbars;b<a.length;b++)for(c=a[b].items,d=0;d<c.length;d++)e=c[d],e.clickFn&&CKEDITOR.tools.removeFunction(e.clickFn),e.keyDownFn&&CKEDITOR.tools.removeFunction(e.keyDownFn)}});f.on("uiReady",function(){var a=f.ui.space("toolbox");a&&f.focusManager.add(a,1)});f.addCommand("toolbarFocus",e);f.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");f.ui.add("-",CKEDITOR.UI_SEPARATOR,
+{});f.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,b){b.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,c,e){var k=f(this.editor),b=0===c,d={name:a};if(e){if(e=CKEDITOR.tools.search(k,function(a){return a.name==e})){!e.groups&&(e.groups=[]);if(c&&(c=CKEDITOR.tools.indexOf(e.groups,c),0<=c)){e.groups.splice(c+1,0,a);return}b?e.groups.splice(0,0,a):e.groups.push(a);
+return}c=null}c&&(c=CKEDITOR.tools.indexOf(k,function(a){return a.name==c}));b?k.splice(0,0,a):"number"==typeof c?k.splice(c+1,0,d):k.push(a)}}(),CKEDITOR.UI_SEPARATOR="separator",CKEDITOR.config.toolbarLocation="top",function(){function a(a,c){function l(b){b=g.list[b];if(b.equals(a.editable())||"true"==b.getAttribute("contenteditable")){var d=a.createRange();d.selectNodeContents(b);d.select()}else a.getSelection().selectElement(b);a.focus()}function k(){d&&d.setHtml('\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');
+delete g.list}var b=a.ui.spaceId("path"),d,g=a._.elementsPath,p=g.idBase;c.html+='\x3cspan id\x3d"'+b+'_label" class\x3d"cke_voice_label"\x3e'+a.lang.elementspath.eleLabel+'\x3c/span\x3e\x3cspan id\x3d"'+b+'" class\x3d"cke_path" role\x3d"group" aria-labelledby\x3d"'+b+'_label"\x3e\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e\x3c/span\x3e';a.on("uiReady",function(){var b=a.ui.space("path");b&&a.focusManager.add(b,1)});g.onClick=l;var u=CKEDITOR.tools.addFunction(l),v=CKEDITOR.tools.addFunction(function(b,
+d){var c=g.idBase,e;d=new CKEDITOR.dom.event(d);e="rtl"==a.lang.dir;switch(d.getKeystroke()){case e?39:37:case 9:return(e=CKEDITOR.document.getById(c+(b+1)))||(e=CKEDITOR.document.getById(c+"0")),e.focus(),!1;case e?37:39:case CKEDITOR.SHIFT+9:return(e=CKEDITOR.document.getById(c+(b-1)))||(e=CKEDITOR.document.getById(c+(g.list.length-1))),e.focus(),!1;case 27:return a.focus(),!1;case 13:case 32:return l(b),!1}return!0});a.on("selectionChange",function(){for(var c=[],f=g.list=[],k=[],l=g.filters,m=
+!0,B=a.elementPath().elements,t,x=B.length;x--;){var D=B[x],y=0;t=D.data("cke-display-name")?D.data("cke-display-name"):D.data("cke-real-element-type")?D.data("cke-real-element-type"):D.getName();(m=D.hasAttribute("contenteditable")?"true"==D.getAttribute("contenteditable"):m)||D.hasAttribute("contenteditable")||(y=1);for(var z=0;z<l.length;z++){var C=l[z](D,t);if(!1===C){y=1;break}t=C||t}y||(f.unshift(D),k.unshift(t))}f=f.length;for(l=0;l<f;l++)t=k[l],m=a.lang.elementspath.eleTitle.replace(/%1/,
+t),t=e.output({id:p+l,label:m,text:t,jsTitle:"javascript:void('"+t+"')",index:l,keyDownFn:v,clickFn:u}),c.unshift(t);d||(d=CKEDITOR.document.getById(b));k=d;k.setHtml(c.join("")+'\x3cspan class\x3d"cke_path_empty"\x3e\x26nbsp;\x3c/span\x3e');a.fire("elementsPathUpdate",{space:k})});a.on("readOnly",k);a.on("contentDomUnload",k);a.addCommand("elementsPathFocus",f.toolbarFocus);a.setKeystroke(CKEDITOR.ALT+122,"elementsPathFocus")}var f={toolbarFocus:{editorFocus:!1,readOnly:1,exec:function(a){(a=CKEDITOR.document.getById(a._.elementsPath.idBase+
+"0"))&&a.focus(CKEDITOR.env.ie||CKEDITOR.env.air)}}},c="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var e=CKEDITOR.addTemplate("pathItem",'\x3ca id\x3d"{id}" href\x3d"{jsTitle}" tabindex\x3d"-1" class\x3d"cke_path_item" title\x3d"{label}"'+c+' hidefocus\x3d"true"  onkeydown\x3d"return CKEDITOR.tools.callFunction({keyDownFn},{index}, event );" onclick\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;" role\x3d"button" aria-label\x3d"{label}"\x3e{text}\x3c/a\x3e');
+CKEDITOR.plugins.add("elementspath",{init:function(c){c._.elementsPath={idBase:"cke_elementspath_"+CKEDITOR.tools.getNextNumber()+"_",filters:[]};c.on("uiSpace",function(e){"bottom"==e.data.space&&a(c,e.data)})}})}(),function(){function a(a,b,c){c=a.config.forceEnterMode||c;"wysiwyg"==a.mode&&(b||(b=a.activeEnterMode),a.elementPath().isContextFor("p")||(b=CKEDITOR.ENTER_BR,c=1),a.fire("saveSnapshot"),b==CKEDITOR.ENTER_BR?l(a,b,null,c):k(a,b,null,c),a.fire("saveSnapshot"))}function f(a){a=a.getSelection().getRanges(!0);
 for(var b=a.length-1;0<b;b--)a[b].deleteContents();return a[0]}function c(a){var b=a.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},!0);if(a.root.equals(b))return a;b=new CKEDITOR.dom.range(b);b.moveToRange(a);return b}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){a(b,
-b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var g=CKEDITOR.dom.walker.whitespaces(),f=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(a,h,k,m){if(k=k||e(a)){k=c(k);var u=k.document,t=k.checkStartOfBlock(),n=k.checkEndOfBlock(),q=a.elementPath(k.startContainer),w=q.block,y=h==CKEDITOR.ENTER_DIV?"div":"p",C;if(t&&n){if(w&&(w.is("li")||w.getParent().is("li"))){w.is("li")||(w=w.getParent());k=w.getParent();C=k.getParent();
-m=!w.hasPrevious();var r=!w.hasNext(),y=a.getSelection(),x=y.createBookmarks(),t=w.getDirection(1),n=w.getAttribute("class"),B=w.getAttribute("style"),A=C.getDirection(1)!=t;a=a.enterMode!=CKEDITOR.ENTER_BR||A||B||n;if(C.is("li"))m||r?(m&&r&&k.remove(),w[r?"insertAfter":"insertBefore"](C)):w.breakParent(C);else{if(a)if(q.block.is("li")?(C=u.createElement(h==CKEDITOR.ENTER_P?"p":"div"),A&&C.setAttribute("dir",t),B&&C.setAttribute("style",B),n&&C.setAttribute("class",n),w.moveChildren(C)):C=q.block,
-m||r)C[m?"insertBefore":"insertAfter"](k);else w.breakParent(k),C.insertAfter(k);else if(w.appendBogus(!0),m||r)for(;u=w[m?"getFirst":"getLast"]();)u[m?"insertBefore":"insertAfter"](k);else for(w.breakParent(k);u=w.getLast();)u.insertAfter(k);w.remove()}y.selectBookmarks(x);return}if(w&&w.getParent().is("blockquote")){w.breakParent(w.getParent());w.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||w.getPrevious().remove();w.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||w.getNext().remove();
-k.moveToElementEditStart(w);k.select();return}}else if(w&&w.is("pre")&&!n){l(a,h,k,m);return}if(t=k.splitBlock(y)){h=t.previousBlock;w=t.nextBlock;q=t.wasStartOfBlock;a=t.wasEndOfBlock;w?(x=w.getParent(),x.is("li")&&(w.breakParent(x),w.move(w.getNext(),1))):h&&(x=h.getParent())&&x.is("li")&&(h.breakParent(x),x=h.getNext(),k.moveToElementEditStart(x),h.move(h.getPrevious()));if(q||a){if(h){if(h.is("li")||!b.test(h.getName())&&!h.is("pre"))C=h.clone()}else w&&(C=w.clone());C?m&&!C.is("li")&&C.renameNode(y):
-x&&x.is("li")?C=x:(C=u.createElement(y),h&&(r=h.getDirection())&&C.setAttribute("dir",r));if(u=t.elementPath)for(m=0,y=u.elements.length;m<y;m++){x=u.elements[m];if(x.equals(u.block)||x.equals(u.blockLimit))break;CKEDITOR.dtd.$removeEmpty[x.getName()]&&(x=x.clone(),C.moveChildren(x),C.append(x))}C.appendBogus();C.getParent()||k.insertNode(C);C.is("li")&&C.removeAttribute("value");!CKEDITOR.env.ie||!q||a&&h.getChildCount()||(k.moveToElementEditStart(a?h:C),k.select());k.moveToElementEditStart(q&&!a?
-w:C)}else w.is("li")&&(C=k.clone(),C.selectNodeContents(w),C=new CKEDITOR.dom.walker(C),C.evaluator=function(a){return!(f(a)||g(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(x=C.next())&&x.type==CKEDITOR.NODE_ELEMENT&&x.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?u.createElement("br"):u.createText(" ")).insertBefore(x)),w&&k.moveToElementEditStart(w);k.select();k.scrollIntoView()}}},enterBr:function(a,c,f,g){if(f=f||e(a)){var l=f.document,
-m=f.checkEndOfBlock(),n=new CKEDITOR.dom.elementPath(a.getSelection().getStartElement()),q=n.block,w=q&&n.block.getName();g||"li"!=w?(!g&&m&&b.test(w)?(m=q.getDirection())?(l=l.createElement("div"),l.setAttribute("dir",m),l.insertAfter(q),f.setStart(l,0)):(l.createElement("br").insertAfter(q),CKEDITOR.env.gecko&&l.createText("").insertAfter(q),f.setStartAt(q.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(a="pre"==w&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?
-l.createText("\r"):l.createElement("br"),f.deleteContents(),f.insertNode(a),CKEDITOR.env.needsBrFiller?(l.createText("").insertAfter(a),m&&(q||n.blockLimit).appendBogus(),a.getNext().$.nodeValue="",f.setStartAt(a.getNext(),CKEDITOR.POSITION_AFTER_START)):f.setStartAt(a,CKEDITOR.POSITION_AFTER_END)),f.collapse(!0),f.select(),f.scrollIntoView()):k(a,c,f,g)}}};var m=CKEDITOR.plugins.enterkey,l=m.enterBr,k=m.enterBlock,b=/^h[1-6]$/}(),function(){function a(a,c){var g={},f=[],m={nbsp:" ",shy:"­",gt:"\x3e",
-lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};a=a.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(a,b){var e=c?"\x26"+b+";":m[b];g[e]=c?m[b]:"\x26"+b+";";f.push(e);return""});if(!c&&a){a=a.split(",");var l=document.createElement("div"),k;l.innerHTML="\x26"+a.join(";\x26")+";";k=l.innerHTML;l=null;for(l=0;l<k.length;l++){var b=k.charAt(l);g[b]="\x26"+a[l]+";";f.push(b)}}g.regex=f.join(c?"|":"");return g}CKEDITOR.plugins.add("entities",{afterInit:function(e){function c(a){return b[a]}function g(a){return"force"!=
-f.entities_processNumerical&&l[a]?l[a]:"\x26#"+a.charCodeAt(0)+";"}var f=e.config;if(e=(e=e.dataProcessor)&&e.htmlFilter){var m=[];!1!==f.basicEntities&&m.push("nbsp,gt,lt,amp");f.entities&&(m.length&&m.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
-f.entities_latin&&m.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),f.entities_greek&&m.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
-f.entities_additional&&m.push(f.entities_additional));var l=a(m.join(",")),k=l.regex?"["+l.regex+"]":"a^";delete l.regex;f.entities&&f.entities_processNumerical&&(k="[^ -~]|"+k);var k=new RegExp(k,"g"),b=a("nbsp,gt,lt,amp,shy",!0),d=new RegExp(b.regex,"g");e.addRules({text:function(a){return a.replace(d,c).replace(k,g)}},{applyToAll:!0,excludeNestedEditable:!0})}}})}(),CKEDITOR.config.basicEntities=!0,CKEDITOR.config.entities=!0,CKEDITOR.config.entities_latin=!0,CKEDITOR.config.entities_greek=!0,
-CKEDITOR.config.entities_additional="#39",CKEDITOR.plugins.add("popup"),CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{popup:function(a,e,c,g){e=e||"80%";c=c||"70%";"string"==typeof e&&1<e.length&&"%"==e.substr(e.length-1,1)&&(e=parseInt(window.screen.width*parseInt(e,10)/100,10));"string"==typeof c&&1<c.length&&"%"==c.substr(c.length-1,1)&&(c=parseInt(window.screen.height*parseInt(c,10)/100,10));640>e&&(e=640);420>c&&(c=420);var f=parseInt((window.screen.height-c)/2,10),m=parseInt((window.screen.width-
-e)/2,10);g=(g||"location\x3dno,menubar\x3dno,toolbar\x3dno,dependent\x3dyes,minimizable\x3dno,modal\x3dyes,alwaysRaised\x3dyes,resizable\x3dyes,scrollbars\x3dyes")+",width\x3d"+e+",height\x3d"+c+",top\x3d"+f+",left\x3d"+m;var l=window.open("",null,g,!0);if(!l)return!1;try{-1==navigator.userAgent.toLowerCase().indexOf(" chrome/")&&(l.moveTo(m,f),l.resizeTo(e,c)),l.focus(),l.location.href=a}catch(k){window.open(a,null,g,!0)}return!0}}),function(){function a(a,c){var f=[];if(c)for(var e in c)f.push(e+
-"\x3d"+encodeURIComponent(c[e]));else return a;return a+(-1!=a.indexOf("?")?"\x26":"?")+f.join("\x26")}function e(a){a+="";return a.charAt(0).toUpperCase()+a.substr(1)}function c(){var b=this.getDialog(),c=b.getParentEditor();c._.filebrowserSe=this;var f=c.config["filebrowser"+e(b.getName())+"WindowWidth"]||c.config.filebrowserWindowWidth||"80%",b=c.config["filebrowser"+e(b.getName())+"WindowHeight"]||c.config.filebrowserWindowHeight||"70%",g=this.filebrowser.params||{};g.CKEditor=c.name;g.CKEditorFuncNum=
-c._.filebrowserFn;g.langCode||(g.langCode=c.langCode);g=a(this.filebrowser.url,g);c.popup(g,f,b,c.config.filebrowserWindowFeatures||c.config.fileBrowserWindowFeatures)}function g(){var a=this.getDialog();a.getParentEditor()._.filebrowserSe=this;return a.getContentElement(this["for"][0],this["for"][1]).getInputElement().$.value&&a.getContentElement(this["for"][0],this["for"][1]).getAction()?!0:!1}function f(b,c,f){var e=f.params||{};e.CKEditor=b.name;e.CKEditorFuncNum=b._.filebrowserFn;e.langCode||
-(e.langCode=b.langCode);c.action=a(f.url,e);c.filebrowser=f}function m(a,d,h,k){if(k&&k.length)for(var l,u=k.length;u--;)if(l=k[u],"hbox"!=l.type&&"vbox"!=l.type&&"fieldset"!=l.type||m(a,d,h,l.children),l.filebrowser)if("string"==typeof l.filebrowser&&(l.filebrowser={action:"fileButton"==l.type?"QuickUpload":"Browse",target:l.filebrowser}),"Browse"==l.filebrowser.action){var t=l.filebrowser.url;void 0===t&&(t=a.config["filebrowser"+e(d)+"BrowseUrl"],void 0===t&&(t=a.config.filebrowserBrowseUrl));
-t&&(l.onClick=c,l.filebrowser.url=t,l.hidden=!1)}else if("QuickUpload"==l.filebrowser.action&&l["for"]&&(t=l.filebrowser.url,void 0===t&&(t=a.config["filebrowser"+e(d)+"UploadUrl"],void 0===t&&(t=a.config.filebrowserUploadUrl)),t)){var n=l.onClick;l.onClick=function(a){var b=a.sender;return n&&!1===n.call(b,a)?!1:g.call(b,a)};l.filebrowser.url=t;l.hidden=!1;f(a,h.getContents(l["for"][0]).get(l["for"][1]),l.filebrowser)}}function l(a,c,f){if(-1!==f.indexOf(";")){f=f.split(";");for(var e=0;e<f.length;e++)if(l(a,
-c,f[e]))return!0;return!1}return(a=a.getContents(c).get(f).filebrowser)&&a.url}function k(a,c){var f=this._.filebrowserSe.getDialog(),e=this._.filebrowserSe["for"],g=this._.filebrowserSe.filebrowser.onSelect;e&&f.getContentElement(e[0],e[1]).reset();if("function"!=typeof c||!1!==c.call(this._.filebrowserSe))if(!g||!1!==g.call(this._.filebrowserSe,a,c))if("string"==typeof c&&c&&alert(c),a&&(e=this._.filebrowserSe,f=e.getDialog(),e=e.filebrowser.target||null))if(e=e.split(":"),g=f.getContentElement(e[0],
-e[1]))g.setValue(a),f.selectPage(e[0])}CKEDITOR.plugins.add("filebrowser",{requires:"popup",init:function(a){a._.filebrowserFn=CKEDITOR.tools.addFunction(k,a);a.on("destroy",function(){CKEDITOR.tools.removeFunction(this._.filebrowserFn)})}});CKEDITOR.on("dialogDefinition",function(a){if(a.editor.plugins.filebrowser)for(var c=a.data.definition,f,e=0;e<c.contents.length;++e)if(f=c.contents[e])m(a.editor,a.data.name,c,f.elements),f.hidden&&f.filebrowser&&(f.hidden=!l(c,f.id,f.filebrowser))})}(),function(){function a(a){var f=
-a.config,m=a.fire("uiSpace",{space:"top",html:""}).html,l=function(){function d(a,f,e){b.setStyle(f,c(e));b.setStyle("position",a)}function h(a){var b=m.getDocumentPosition();switch(a){case "top":d("absolute","top",b.y-y-x);break;case "pin":d("fixed","top",A);break;case "bottom":d("absolute","top",b.y+(q.height||q.bottom-q.top)+x)}k=a}var k,m,n,q,w,y,C,r=f.floatSpaceDockedOffsetX||0,x=f.floatSpaceDockedOffsetY||0,B=f.floatSpacePinnedOffsetX||0,A=f.floatSpacePinnedOffsetY||0;return function(d){if(m=
-a.editable()){var p=d&&"focus"==d.name;p&&b.show();a.fire("floatingSpaceLayout",{show:p});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();q=m.getClientRect();w=e.getViewPaneSize();y=n.height;C="pageXOffset"in e.$?e.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;k?(y+x<=q.top?h("top"):y+x>w.height-q.bottom?h("pin"):h("bottom"),d=w.width/2,d=f.floatSpacePreferRight?"right":0<q.left&&q.right<w.width&&q.width>n.width?"rtl"==f.contentsLangDirection?"right":"left":d-q.left>
-q.right-d?"left":"right",n.width>w.width?(d="left",p=0):(p="left"==d?0<q.left?q.left:0:q.right<w.width?w.width-q.right:0,p+n.width>w.width&&(d="left"==d?"right":"left",p=0)),b.setStyle(d,c(("pin"==k?B:r)+p+("pin"==k?0:"left"==d?C:-C)))):(k="pin",h("pin"),l(d))}}}();if(m){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+
-(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:m,id:a.id,langDir:a.lang.dir,langCode:a.langCode,name:a.name,style:"display:none;z-index:"+
-(f.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),d=CKEDITOR.tools.eventsBuffer(500,l),h=CKEDITOR.tools.eventsBuffer(100,l);b.unselectable();b.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){l(b);a.on("change",d.input);e.on("scroll",h.input);e.on("resize",h.input)});a.on("blur",function(){b.hide();a.removeListener("change",d.input);e.removeListener("scroll",h.input);e.removeListener("resize",h.input)});a.on("destroy",
-function(){e.removeListener("scroll",h.input);e.removeListener("resize",h.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,1)}}var e=CKEDITOR.document.getWindow(),c=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(c){c.on("loaded",function(){a(this)},null,null,20)}})}(),CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var a=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),
-e=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),c=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),
-g=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,c){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),c))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,c){c=c||{};var e=c.attributes||(c.attributes={});(this.multiSelect=!!c.multiSelect)&&(e["aria-multiselectable"]=!0);!e.role&&(e.role="listbox");this.base.apply(this,arguments);this.element.setAttribute("role",e.role);e=this.keys;e[40]="next";e[9]="next";e[38]="prev";e[CKEDITOR.SHIFT+
-9]="prev";e[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(e[13]="mouseup");this._.pendingHtml=[];this._.pendingList=[];this._.items={};this._.groups={}},_:{close:function(){if(this._.started){var c=a.output({items:this._.pendingList.join("")});this._.pendingList=[];this._.pendingHtml.push(c);delete this._.started}},getClick:function(){this._.click||(this._.click=CKEDITOR.tools.addFunction(function(a){var c=this.toggle(a);if(this.onClick)this.onClick(a,c)},this));return this._.click}},proto:{add:function(a,
-c,l){var k=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=k;var b;b=CKEDITOR.tools.htmlEncodeAttr(a).replace(g,"\\'");a={id:k,val:b,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(l||a),text:c||a};this._.pendingList.push(e.output(a))},startGroup:function(a){this._.close();var e=CKEDITOR.tools.getNextId();this._.groups[a]=e;this._.pendingHtml.push(c.output({id:e,
-label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var c=this.isMarked(a);c?this.unmark(a):this.mark(a);return!c},hideGroup:function(a){var c=(a=this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display","none"),c&&"ul"==c.getName()&&c.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},
-showAll:function(){var a=this._.items,c=this._.groups,e=this.element.getDocument(),g;for(g in a)e.getById(a[g]).setStyle("display","");for(var b in c)a=e.getById(c[b]),g=a.getNext(),a.setStyle("display",""),g&&"ul"==g.getName()&&g.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var c=this.element.getDocument().getById(a);c.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(c)},
-unmark:function(a){var c=this.element.getDocument();a=this._.items[a];var e=c.getById(a);e.removeClass("cke_selected");c.getById(a+"_option").removeAttribute("aria-selected");this.onUnmark&&this.onUnmark(e)},unmarkAll:function(){var a=this._.items,c=this.element.getDocument(),e;for(e in a){var g=a[e];c.getById(g).removeClass("cke_selected");c.getById(g+"_option").removeAttribute("aria-selected")}this.onUnmark&&this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},
-focus:function(a){this._.focusIndex=-1;var c=this.element.getElementsByTag("a"),e,g=-1;if(a)for(e=this.element.getDocument().getById(this._.items[a]).getFirst();a=c.getItem(++g);){if(a.equals(e)){this._.focusIndex=g;break}}else this.element.focus();e&&setTimeout(function(){e.focus()},0)}}})}}),CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_RICHCOMBO,CKEDITOR.ui.richCombo.handler)}}),function(){var a='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+
-(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"true"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?
-'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),e=CKEDITOR.addTemplate("combo",a);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=
-CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{}}},proto:{renderHtml:function(a){var e=[];this.render(a,e);return e.join("")},render:function(a,
-g){function f(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}var m=CKEDITOR.env,l="cke_"+this.id,k=CKEDITOR.tools.addFunction(function(b){v&&(a.unlockSelection(1),v=0);d.execute(b)},this),b=this,d={id:l,combo:this,focus:function(){CKEDITOR.document.getById(l).getChild(1).focus()},
-execute:function(d){var e=b._;if(e.state!=CKEDITOR.TRISTATE_DISABLED)if(b.createPanel(a),e.on)e.panel.hide();else{b.commit();var f=b.getValue();f?e.list.mark(f):e.list.unmarkAll();e.panel.showBlock(b.id,new CKEDITOR.dom.element(d),4)}},clickFn:k};a.on("activeFilterChange",f,this);a.on("mode",f,this);a.on("selectionChange",f,this);!this.readOnly&&a.on("readOnly",f,this);var h=CKEDITOR.tools.addFunction(function(b,e){b=new CKEDITOR.dom.event(b);var f=b.getKeystroke();if(40==f)a.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)});
-switch(f){case 13:case 32:case 40:CKEDITOR.tools.callFunction(k,e);break;default:d.onkey(d,f)}b.preventDefault()}),p=CKEDITOR.tools.addFunction(function(){d.onfocus&&d.onfocus()}),v=0;d.keyDownFn=h;m={id:l,name:this.name||this.command,label:this.label,title:this.title,cls:this.className||"",titleJs:m.gecko&&!m.hc?"":(this.title||"").replace("'",""),keydownFn:h,focusFn:p,clickFn:k};e.output(m,g);if(this.onRender)this.onRender();return d},createPanel:function(a){if(!this._.panel){var e=this._.panelDefinition,
-f=this._.panelDefinition.block,m=e.parent||CKEDITOR.document.getBody(),l="cke_combopanel__"+this.name,k=new CKEDITOR.ui.floatPanel(a,m,e),b=k.addListBlock(this.id,f),d=this;k.onShow=function(){this.element.addClass(l);d.setState(CKEDITOR.TRISTATE_ON);d._.on=1;d.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(d.onOpen)d.onOpen();a.once("panelShow",function(){b.focus(!b.multiSelect&&d.getValue())})};k.onHide=function(b){this.element.removeClass(l);d.setState(d.modes&&d.modes[a.mode]?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED);d._.on=0;if(!b&&d.onClose)d.onClose()};k.onEscape=function(){k.hide(1)};b.onClick=function(a,b){d.onClick&&d.onClick.call(d,a,b);k.hide()};this._.panel=k;this._.list=b;k.getBlock(this.id).onHide=function(){d._.on=0;d.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,e){this._.value=a;var f=this.document.getById("cke_"+this.id+"_text");f&&(a||e?f.removeClass("cke_combo_inlinelabel"):(e=this.label,f.addClass("cke_combo_inlinelabel")),f.setText("undefined"!=
-typeof e?e:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},showAll:function(){this._.list.showAll()},add:function(a,e,f){this._.items[a]=f||a;this._.list.add(a,e,f)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));
-this._.committed=1},setState:function(a){if(this._.state!=a){var e=this.document.getById("cke_"+this.id);e.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?e.setAttribute("aria-disabled",!0):e.removeAttribute("aria-disabled");this._.state=a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},
-statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,e){this.add(a,CKEDITOR.UI_RICHCOMBO,e)}}(),CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var e=a.config,c=a.lang.format,g=e.format_tags.split(";"),f={},m=0,l=[],k=0;k<g.length;k++){var b=g[k],d=new CKEDITOR.style(e["format_"+b]);if(!a.filter.customConfig||a.filter.check(d))m++,f[b]=d,f[b]._.enterMode=a.config.enterMode,l.push(d)}0!==
-m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:l,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(e.contentsCss),multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);for(var a in f){var b=c["tag_"+a];this.add(a,f[a].buildPreview(b),b)}},onClick:function(b){a.focus();a.fire("saveSnapshot");b=f[b];var c=a.elementPath();a[b.checkActive(c,a)?"removeStyle":"applyStyle"](b);setTimeout(function(){a.fire("saveSnapshot")},
-0)},onRender:function(){a.on("selectionChange",function(b){var c=this.getValue();b=b.data.path;this.refresh();for(var d in f)if(f[d].checkActive(b,a)){d!=c&&this.setValue(d,a.lang.format["tag_"+d]);return}this.setValue("")},this)},onOpen:function(){this.showAll();for(var b in f)a.activeFilter.check(f[b])||this.hideItem(b)},refresh:function(){var b=a.elementPath();if(b){if(b.isContextFor("p"))for(var c in f)if(a.activeFilter.check(f[c]))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}}})}}}),CKEDITOR.config.format_tags=
-"p;h1;h2;h3;h4;h5;h6;pre;address;div",CKEDITOR.config.format_p={element:"p"},CKEDITOR.config.format_div={element:"div"},CKEDITOR.config.format_pre={element:"pre"},CKEDITOR.config.format_address={element:"address"},CKEDITOR.config.format_h1={element:"h1"},CKEDITOR.config.format_h2={element:"h2"},CKEDITOR.config.format_h3={element:"h3"},CKEDITOR.config.format_h4={element:"h4"},CKEDITOR.config.format_h5={element:"h5"},CKEDITOR.config.format_h6={element:"h6"},CKEDITOR.plugins.add("htmlwriter",{init:function(a){var e=
-new CKEDITOR.htmlWriter;e.forceSimpleAmpersand=a.config.forceSimpleAmpersand;e.indentationChars=a.config.dataIndentationChars||"\t";a.dataProcessor.writer=e}}),CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWriter,$:function(){this.base();this.indentationChars="\t";this.selfClosingEnd=" /\x3e";this.lineBreakChars="\n";this.sortAttributes=1;this._.indent=0;this._.indentation="";this._.inPre=0;this._.rules={};var a=CKEDITOR.dtd,e;for(e in CKEDITOR.tools.extend({},a.$nonBodyContent,
-a.$block,a.$listItem,a.$tableContent))this.setRules(e,{indent:!a[e]["#"],breakBeforeOpen:1,breakBeforeClose:!a[e]["#"],breakAfterClose:1,needsSpace:e in a.$block&&!(e in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(a){var e=this._.rules[a];this._.afterCloser&&e&&e.needsSpace&&this._.needsSpace&&this._.output.push("\n");
-this._.indent?this.indentation():e&&e.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",a);this._.afterCloser=0},openTagClose:function(a,e){var c=this._.rules[a];e?(this._.output.push(this.selfClosingEnd),c&&c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==a&&(this._.inPre=1)},attribute:function(a,e){"string"==typeof e&&(this.forceSimpleAmpersand&&
-(e=e.replace(/&amp;/g,"\x26")),e=CKEDITOR.tools.htmlEncodeAttr(e));this._.output.push(" ",a,'\x3d"',e,'"')},closeTag:function(a){var e=this._.rules[a];e&&e.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));this._.indent?this.indentation():e&&e.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",a,"\x3e");"pre"==a&&(this._.inPre=0);e&&e.breakAfterClose&&(this.lineBreak(),this._.needsSpace=e.needsSpace);this._.afterCloser=1},text:function(a){this._.indent&&
-(this.indentation(),!this._.inPre&&(a=CKEDITOR.tools.ltrim(a)));this._.output.push(a)},comment:function(a){this._.indent&&this.indentation();this._.output.push("\x3c!--",a,"--\x3e")},lineBreak:function(){!this._.inPre&&0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=
-0;this._.inPre=0},setRules:function(a,e){var c=this._.rules[a];c?CKEDITOR.tools.extend(c,e,!0):this._.rules[a]=e}}}),function(){var a={canUndo:!1,exec:function(a){var c=a.document.createElement("hr");a.insertElement(c)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(e){e.blockless||(e.addCommand("horizontalrule",a),e.ui.addButton&&e.ui.addButton("HorizontalRule",{label:e.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})}(),
-function(){function a(a){function c(a){var b=!1;h.attachListener(h,"keydown",function(){var c=k.getBody().getElementsByTag(a);if(!b){for(var d=0;d<c.count();d++)c.getItem(d).setCustomData("retain",!0);b=!0}},null,null,1);h.attachListener(h,"keyup",function(){var c=k.getElementsByTag(a);b&&(1!=c.count()||c.getItem(0).getCustomData("retain")||c.getItem(0).remove(1),b=!1)})}var g=this.editor,k=a.document,b=k.body,d=k.getElementById("cke_actscrpt");d&&d.parentNode.removeChild(d);(d=k.getElementById("cke_shimscrpt"))&&
-d.parentNode.removeChild(d);(d=k.getElementById("cke_basetagscrpt"))&&d.parentNode.removeChild(d);b.contentEditable=!0;CKEDITOR.env.ie&&(b.hideFocus=!0,b.disabled=!0,b.removeAttribute("disabled"));delete this._.isLoadingData;this.$=b;k=new CKEDITOR.dom.document(k);this.setup();this.fixInitialSelection();var h=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&k.getDocumentElement().addClass(k.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&g.enterMode!=CKEDITOR.ENTER_P?c("p"):CKEDITOR.env.edge&&g.enterMode!=
-CKEDITOR.ENTER_DIV&&c("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)k.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){g.editable().focus()})});e(g);try{g.document.$.execCommand("2D-position",!1,!0)}catch(p){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==g.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var b=a.data.getKeystroke();if(33==b||34==b)if(CKEDITOR.env.ie)setTimeout(function(){g.getSelection().scrollIntoView()},
-0);else if(g.window.$.innerHeight>this.$.offsetHeight){var c=g.createRange();c[33==b?"moveToElementEditStart":"moveToElementEditEnd"](this);c.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(k,"blur",function(){try{k.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(k,"touchend",function(){a.focus()});b=g.document.getElementsByTag("title").getItem(0);b.data("cke-title",b.getText());CKEDITOR.env.ie&&(g.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==
-this.status&&(this.status="ready");g.fire("contentDom");this._.isPendingFocus&&(g.focus(),this._.isPendingFocus=!1);setTimeout(function(){g.fire("dataReady")},0)},0,this)}function e(a){function c(){var b;a.editable().attachListener(a,"selectionChange",function(){var c=a.getSelection().getSelectedElement();c&&(b&&(b.detachEvent("onresizestart",e),b=null),c.$.attachEvent("onresizestart",e),b=c.$)})}function e(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var g=a.document.$;g.execCommand("enableObjectResizing",
-!1,!a.config.disableObjectResizing);g.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(b){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&c(a)}function c(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var c=[],e;for(e in CKEDITOR.dtd.$removeEmpty)c.push("html.CSS1Compat "+e+"[contenteditable\x3dfalse]");a.push(c.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&
-(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(c){function e(d){d&&d.removeListener();a.editable(new g(a,
-b.$.contentWindow.document.body));a.setData(a.getData(1),c)}var k="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",k=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(k)+"}())":"",b=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+k+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');b.setStyles({width:"100%",height:"100%"});b.addClass("cke_wysiwyg_frame").addClass("cke_reset");
-k=a.ui.space("contents");k.append(b);var d=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(d)b.on("load",e);var h=a.title,p=a.fire("ariaEditorHelpLabel",{}).label;h&&(CKEDITOR.env.ie&&p&&(h+=", "+p),b.setAttribute("title",h));if(p){var h=CKEDITOR.tools.getNextId(),v=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+h+'" class\x3d"cke_voice_label"\x3e'+p+"\x3c/span\x3e");k.append(v,1);b.setAttribute("aria-describedby",h)}a.on("beforeModeUnload",function(a){a.removeListener();v&&v.remove()});
-b.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!d&&e();a.fire("ariaWidget",b)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var c=this.config,e=c.contentsCss;CKEDITOR.tools.isArray(e)||(c.contentsCss=e?[e]:[]);c.contentsCss.push(a)};var g=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(c){CKEDITOR.tools.setTimeout(a,0,this,c)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},
-base:CKEDITOR.editable,proto:{setData:function(a,e){var g=this.editor;if(e)this.setHtml(a),this.fixInitialSelection(),g.fire("dataReady");else{this._.isLoadingData=!0;g._.dataStore={id:1};var k=g.config,b=k.fullPage,d=k.docType,h=CKEDITOR.tools.buildStyleHtml(c()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');b||(h+=CKEDITOR.tools.buildStyleHtml(g.config.contentsCss));var p=k.baseHref?'\x3cbase href\x3d"'+k.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";b&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){g.docType=
-d=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){g.xmlDeclaration=a;return""}));a=g.dataProcessor.toHtml(a);b?(/<body[\s|>]/.test(a)||(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),p&&(a=a.replace(/<head[^>]*?>/,"$\x26"+p)),a=a.replace(/<\/head\s*>/,h+"$\x26"),a=
-d+a):a=k.docType+'\x3chtml dir\x3d"'+k.contentsLangDirection+'" lang\x3d"'+(k.contentsLanguage||g.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+this._.docTitle+"\x3c/title\x3e"+p+h+"\x3c/head\x3e\x3cbody"+(k.bodyId?' id\x3d"'+k.bodyId+'"':"")+(k.bodyClass?' class\x3d"'+k.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));
-k='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR.tools.callFunction("+this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');
-p&&CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');a=a.replace(/(?=\s*<\/(:?head)>)/,k);this.clearCustomData();this.clearListeners();g.fire("contentDomUnload");var v=this.getDocument();try{v.write(a)}catch(u){setTimeout(function(){v.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var c=a.config,e=c.fullPage,g=e&&a.docType,b=e&&a.xmlDeclaration,
-d=this.getDocument(),e=e?d.getDocumentElement().getOuterHtml():d.getBody().getHtml();CKEDITOR.env.gecko&&c.enterMode!=CKEDITOR.ENTER_BR&&(e=e.replace(/<br>(?=\s*(:?$|<\/body>))/,""));e=a.dataProcessor.toDataFormat(e);b&&(e=b+"\n"+e);g&&(e=g+"\n"+e);return e},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:g.baseProto.focus.call(this)},detach:function(){var a=this.editor,c=a.document,e;try{e=a.window.getFrame()}catch(k){}g.baseProto.detach.call(this);this.clearCustomData();c.getDocumentElement().clearCustomData();
-CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);e&&e.getParent()?(e.clearCustomData(),(a=e.removeCustomData("onResize"))&&a.removeListener(),e.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})}(),CKEDITOR.config.disableObjectResizing=!1,CKEDITOR.config.disableNativeTableHandles=!0,CKEDITOR.config.disableNativeSpellChecker=!0,function(){function a(a,f){var m,l;f.on("refresh",function(a){var b=[e],d;for(d in a.data.states)b.push(a.data.states[d]);this.setState(CKEDITOR.tools.search(b,c)?
-c:e)},f,null,100);f.on("exec",function(c){m=a.getSelection();l=m.createBookmarks(1);c.data||(c.data={});c.data.done=!1},f,null,0);f.on("exec",function(){a.forceNextSelectionCheck();m.selectBookmarks(l)},f,null,100)}var e=CKEDITOR.TRISTATE_DISABLED,c=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(c){var e=CKEDITOR.plugins.indent.genericDefinition;a(c,c.addCommand("indent",new e(!0)));a(c,c.addCommand("outdent",new e));c.ui.addButton&&(c.ui.addButton("Indent",{label:c.lang.indent.indent,
-command:"indent",directional:!0,toolbar:"indent,20"}),c.ui.addButton("Outdent",{label:c.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));c.on("dirChanged",function(a){var e=c.createRange(),f=a.data.node;e.setStartBefore(f);e.setEndAfter(f);for(var b=new CKEDITOR.dom.walker(e),d;d=b.next();)if(d.type==CKEDITOR.NODE_ELEMENT)if(!d.equals(f)&&d.getDirection())e.setStartAfter(d),b=new CKEDITOR.dom.walker(e);else{var h=c.config.indentClasses;if(h)for(var p="ltr"==a.data.dir?["_rtl",
-""]:["","_rtl"],v=0;v<h.length;v++)d.hasClass(h[v]+p[0])&&(d.removeClass(h[v]+p[0]),d.addClass(h[v]+p[1]));h=d.getStyle("margin-right");p=d.getStyle("margin-left");h?d.setStyle("margin-left",h):d.removeStyle("margin-left");p?d.setStyle("margin-right",p):d.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;this.startDisabled=!this.isIndent},specificDefinition:function(a,c,e){this.name=c;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==
-CKEDITOR.ENTER_BR;this.isIndent=!!e;this.relatedGlobal=e?"indent":"outdent";this.indentKey=e?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,c){a.on("pluginsLoaded",function(){for(var a in c)(function(a,c){var b=a.getCommand(c.relatedGlobal),d;for(d in c.jobs)b.on("exec",function(b){b.data.done||(a.fire("lockSnapshot"),c.execJob(a,d)&&(b.data.done=!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(c.database))},this,null,d),b.on("refresh",function(b){b.data.states||
-(b.data.states={});b.data.states[c.name+"@"+d]=c.refreshJob(a,d,b.data.path)},this,null,d);a.addFeature(c)})(this,c[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype={execJob:function(a,c){var m=this.jobs[c];if(m.state!=e)return m.exec.call(this,a)},refreshJob:function(a,c,m){c=this.jobs[c];a.activeFilter.checkFeature(this)?c.state=c.refresh.call(this,a,m):c.state=e;return c.state},getContext:function(a){return a.contains(this.context)}}}(),
-function(){function a(a){function b(b){for(var e=m.startContainer,n=m.endContainer;e&&!e.getParent().equals(b);)e=e.getParent();for(;n&&!n.getParent().equals(b);)n=n.getParent();if(!e||!n)return!1;for(var l=e,e=[],t=!1;!t;)l.equals(n)&&(t=!0),e.push(l),l=l.getNext();if(1>e.length)return!1;l=b.getParents(!0);for(n=0;n<l.length;n++)if(l[n].getName&&g[l[n].getName()]){b=l[n];break}for(var l=d.isIndent?1:-1,n=e[0],e=e[e.length-1],t=CKEDITOR.plugins.list.listToArray(b,f),x=t[e.getCustomData("listarray_index")].indent,
-n=n.getCustomData("listarray_index");n<=e.getCustomData("listarray_index");n++)if(t[n].indent+=l,0<l){var B=t[n].parent;t[n].parent=new CKEDITOR.dom.element(B.getName(),B.getDocument())}for(n=e.getCustomData("listarray_index")+1;n<t.length&&t[n].indent>x;n++)t[n].indent+=l;e=CKEDITOR.plugins.list.arrayToList(t,f,null,a.config.enterMode,b.getDirection());if(!d.isIndent){var v;if((v=b.getParent())&&v.is("li"))for(var l=e.listNode.getChildren(),z=[],D,n=l.count()-1;0<=n;n--)(D=l.getItem(n))&&D.is&&D.is("li")&&
-z.push(D)}e&&e.listNode.replace(b);if(z&&z.length)for(n=0;n<z.length;n++){for(D=b=z[n];(D=D.getNext())&&D.is&&D.getName()in g;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(c)&&b.append(m.document.createText(" ")),b.append(D);b.insertAfter(v)}e&&a.fire("contentDomInvalidated");return!0}for(var d=this,f=this.database,g=this.context,l=a.getSelection(),l=(l&&l.getRanges()).createIterator(),m;m=l.getNextRange();){for(var t=m.getCommonAncestor();t&&(t.type!=CKEDITOR.NODE_ELEMENT||!g[t.getName()]);){if(a.editable().equals(t)){t=
-!1;break}t=t.getParent()}t||(t=m.startPath().contains(g))&&m.setEndAt(t,CKEDITOR.POSITION_BEFORE_END);if(!t){var n=m.getEnclosedNode();n&&n.type==CKEDITOR.NODE_ELEMENT&&n.getName()in g&&(m.setStartAt(n,CKEDITOR.POSITION_AFTER_START),m.setEndAt(n,CKEDITOR.POSITION_BEFORE_END),t=n)}t&&m.startContainer.type==CKEDITOR.NODE_ELEMENT&&m.startContainer.getName()in g&&(n=new CKEDITOR.dom.walker(m),n.evaluator=e,m.startContainer=n.next());t&&m.endContainer.type==CKEDITOR.NODE_ELEMENT&&m.endContainer.getName()in
-g&&(n=new CKEDITOR.dom.walker(m),n.evaluator=e,m.endContainer=n.previous());if(t)return b(t)}return 0}function e(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is("li")}function c(a){return g(a)&&f(a)}var g=CKEDITOR.dom.walker.whitespaces(!0),f=CKEDITOR.dom.walker.bookmark(!1,!0),m=CKEDITOR.TRISTATE_DISABLED,l=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(c){function b(b){d.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];b.on("key",
-function(a){if("wysiwyg"==b.mode&&a.data.keyCode==this.indentKey){var c=this.getContext(b.elementPath());!c||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,b.elementPath(),c)||(b.execCommand(this.relatedGlobal),a.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(a,b){var c=this.getContext(b),d=CKEDITOR.plugins.indentList.firstItemInPath(this.context,b,c);return c&&this.isIndent&&!d?l:m}:function(a,b){return!this.getContext(b)||this.isIndent?
-m:l},exec:CKEDITOR.tools.bind(a,this)}}var d=CKEDITOR.plugins.indent;d.registerCommands(c,{indentlist:new b(c,"indentlist",!0),outdentlist:new b(c,"outdentlist")});CKEDITOR.tools.extend(b.prototype,d.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(a,b,c){var f=b.contains(e);c||(c=b.contains(a));return c&&f&&f.equals(c.getFirst(e))}}(),function(){function a(a,b,c){function d(c){if(!(!(l=k[c?"getFirst":"getLast"]())||
-l.is&&l.isBlockBoundary()||!(m=b.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||m.is&&m.isBlockBoundary({br:1})))a.document.createElement("br")[c?"insertBefore":"insertAfter"](l)}for(var e=CKEDITOR.plugins.list.listToArray(b.root,c),f=[],h=0;h<b.contents.length;h++){var g=b.contents[h];(g=g.getAscendant("li",!0))&&!g.getCustomData("list_item_processed")&&(f.push(g),CKEDITOR.dom.element.setMarker(c,g,"list_item_processed",!0))}g=null;for(h=0;h<f.length;h++)g=f[h].getCustomData("listarray_index"),
-e[g].indent=-1;for(h=g+1;h<e.length;h++)if(e[h].indent>e[h-1].indent+1){f=e[h-1].indent+1-e[h].indent;for(g=e[h].indent;e[h]&&e[h].indent>=g;)e[h].indent+=f,h++;h--}var k=CKEDITOR.plugins.list.arrayToList(e,c,null,a.config.enterMode,b.root.getAttribute("dir")).listNode,l,m;d(!0);d();k.replace(b.root);a.fire("contentDomInvalidated")}function e(a,b){this.name=a;this.context=this.type=b;this.allowedContent=b+" li";this.requiredContent=b}function c(a,b,c,d){for(var e,f;e=a[d?"getLast":"getFirst"](u);)(f=
-e.getDirection(1))!==b.getDirection(1)&&e.setAttribute("dir",f),e.remove(),c?e[d?"insertBefore":"insertAfter"](c):b.append(e,d)}function g(a){function b(d){var e=a[d?"getPrevious":"getNext"](h);e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is(a.getName())&&(c(a,e,null,!d),a.remove(),a=e)}b();b(1)}function f(a){return a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in CKEDITOR.dtd.$block||a.getName()in CKEDITOR.dtd.$listItem)&&CKEDITOR.dtd[a.getName()]["#"]}function m(a,b,d){a.fire("saveSnapshot");d.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);
-var e=d.extractContents();b.trim(!1,!0);var f=b.createBookmark(),k=new CKEDITOR.dom.elementPath(b.startContainer),m=k.block,k=k.lastElement.getAscendant("li",1)||m,x=new CKEDITOR.dom.elementPath(d.startContainer),B=x.contains(CKEDITOR.dtd.$listItem),x=x.contains(CKEDITOR.dtd.$list);m?(m=m.getBogus())&&m.remove():x&&(m=x.getPrevious(h))&&p(m)&&m.remove();(m=e.getLast())&&m.type==CKEDITOR.NODE_ELEMENT&&m.is("br")&&m.remove();(m=b.startContainer.getChild(b.startOffset))?e.insertBefore(m):b.startContainer.append(e);
-B&&(e=l(B))&&(k.contains(B)?(c(e,B.getParent(),B),e.remove()):k.append(e));for(;d.checkStartOfBlock()&&d.checkEndOfBlock();){x=d.startPath();e=x.block;if(!e)break;e.is("li")&&(k=e.getParent(),e.equals(k.getLast(h))&&e.equals(k.getFirst(h))&&(e=k));d.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START);e.remove()}d=d.clone();e=a.editable();d.setEndAt(e,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(d);d.evaluator=function(a){return h(a)&&!p(a)};(d=d.next())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in
-CKEDITOR.dtd.$list&&g(d);b.moveToBookmark(f);b.select();a.fire("saveSnapshot")}function l(a){return(a=a.getLast(h))&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in k?a:null}var k={ol:1,ul:1},b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(),h=function(a){return!(b(a)||d(a))},p=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(a,b,c,d,e){if(!k[a.getName()])return[];d||(d=0);c||(c=[]);for(var f=0,h=a.getChildCount();f<h;f++){var g=a.getChild(f);g.type==CKEDITOR.NODE_ELEMENT&&
-g.getName()in CKEDITOR.dtd.$list&&CKEDITOR.plugins.list.listToArray(g,b,c,d+1);if("li"==g.$.nodeName.toLowerCase()){var l={parent:a,indent:d,element:g,contents:[]};e?l.grandparent=e:(l.grandparent=a.getParent(),l.grandparent&&"li"==l.grandparent.$.nodeName.toLowerCase()&&(l.grandparent=l.grandparent.getParent()));b&&CKEDITOR.dom.element.setMarker(b,g,"listarray_index",c.length);c.push(l);for(var m=0,p=g.getChildCount(),u;m<p;m++)u=g.getChild(m),u.type==CKEDITOR.NODE_ELEMENT&&k[u.getName()]?CKEDITOR.plugins.list.listToArray(u,
-b,c,d+1,l.grandparent):l.contents.push(u)}}return c},arrayToList:function(a,b,c,e,f){c||(c=0);if(!a||a.length<c+1)return null;for(var g,l=a[c].parent.getDocument(),m=new CKEDITOR.dom.documentFragment(l),p=null,u=c,v=Math.max(a[c].indent,0),D=null,G,F,J=e==CKEDITOR.ENTER_P?"p":"div";;){var I=a[u];g=I.grandparent;G=I.element.getDirection(1);if(I.indent==v){p&&a[u].parent.getName()==p.getName()||(p=a[u].parent.clone(!1,1),f&&p.setAttribute("dir",f),m.append(p));D=p.append(I.element.clone(0,1));G!=p.getDirection(1)&&
-D.setAttribute("dir",G);for(g=0;g<I.contents.length;g++)D.append(I.contents[g].clone(1,1));u++}else if(I.indent==Math.max(v,0)+1)I=a[u-1].element.getDirection(1),u=CKEDITOR.plugins.list.arrayToList(a,null,u,e,I!=G?G:null),!D.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=l.$.documentMode&&D.append(l.createText(" ")),D.append(u.listNode),u=u.nextIndex;else if(-1==I.indent&&!c&&g){k[g.getName()]?(D=I.element.clone(!1,!0),G!=g.getDirection(1)&&D.setAttribute("dir",G)):D=new CKEDITOR.dom.documentFragment(l);
-var p=g.getDirection(1)!=G,N=I.element,E=N.getAttribute("class"),P=N.getAttribute("style"),T=D.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(e!=CKEDITOR.ENTER_BR||p||P||E),L,Q=I.contents.length,O;for(g=0;g<Q;g++)if(L=I.contents[g],d(L)&&1<Q)T?O=L.clone(1,1):D.append(L.clone(1,1));else if(L.type==CKEDITOR.NODE_ELEMENT&&L.isBlockBoundary()){p&&!L.getDirection()&&L.setAttribute("dir",G);F=L;var U=N.getAttribute("style");U&&F.setAttribute("style",U.replace(/([^;])$/,"$1;")+(F.getAttribute("style")||""));E&&
-L.addClass(E);F=null;O&&(D.append(O),O=null);D.append(L.clone(1,1))}else T?(F||(F=l.createElement(J),D.append(F),p&&F.setAttribute("dir",G)),P&&F.setAttribute("style",P),E&&F.setAttribute("class",E),O&&(F.append(O),O=null),F.append(L.clone(1,1))):D.append(L.clone(1,1));O&&((F||D).append(O),O=null);D.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&u!=a.length-1&&(CKEDITOR.env.needsBrFiller&&(G=D.getLast())&&G.type==CKEDITOR.NODE_ELEMENT&&G.is("br")&&G.remove(),(G=D.getLast(h))&&G.type==CKEDITOR.NODE_ELEMENT&&
-G.is(CKEDITOR.dtd.$block)||D.append(l.createElement("br")));G=D.$.nodeName.toLowerCase();"div"!=G&&"p"!=G||D.appendBogus();m.append(D);p=null;u++}else return null;F=null;if(a.length<=u||Math.max(a[u].indent,0)<v)break}if(b)for(a=m.getFirst();a;){if(a.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(b,a),a.getName()in CKEDITOR.dtd.$listItem&&(c=a,l=f=e=void 0,e=c.getDirection()))){for(f=c.getParent();f&&!(l=f.getDirection());)f=f.getParent();e==l&&c.removeAttribute("dir")}a=a.getNextSourceNode()}return{listNode:m,
-nextIndex:u}}};var v=/^h[1-6]$/,u=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);e.prototype={exec:function(b){this.refresh(b,b.elementPath());var c=b.config,d=b.getSelection(),e=d&&d.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var f=b.editable();if(f.getFirst(h)){var l=1==e.length&&e[0];(c=l&&l.getEnclosedNode())&&c.is&&this.type==c.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else c.enterMode==CKEDITOR.ENTER_BR?f.appendBogus():e[0].fixBlock(1,c.enterMode==CKEDITOR.ENTER_P?"p":"div"),
-d.selectRanges(e)}for(var c=d.createBookmarks(!0),f=[],m={},e=e.createIterator(),p=0;(l=e.getNextRange())&&++p;){var u=l.getBoundaryNodes(),A=u.startNode,z=u.endNode;A.type==CKEDITOR.NODE_ELEMENT&&"td"==A.getName()&&l.setStartAt(u.startNode,CKEDITOR.POSITION_AFTER_START);z.type==CKEDITOR.NODE_ELEMENT&&"td"==z.getName()&&l.setEndAt(u.endNode,CKEDITOR.POSITION_BEFORE_END);l=l.createIterator();for(l.forceBrBreak=this.state==CKEDITOR.TRISTATE_OFF;u=l.getNextParagraph();)if(!u.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(m,
-u,"list_block",1);for(var D=b.elementPath(u),A=D.elements,z=0,D=D.blockLimit,G,F=A.length-1;0<=F&&(G=A[F]);F--)if(k[G.getName()]&&D.contains(G)){D.removeCustomData("list_group_object_"+p);(A=G.getCustomData("list_group_object"))?A.contents.push(u):(A={root:G,contents:[u]},f.push(A),CKEDITOR.dom.element.setMarker(m,G,"list_group_object",A));z=1;break}z||(z=D,z.getCustomData("list_group_object_"+p)?z.getCustomData("list_group_object_"+p).contents.push(u):(A={root:z,contents:[u]},CKEDITOR.dom.element.setMarker(m,
-z,"list_group_object_"+p,A),f.push(A)))}}for(G=[];0<f.length;)if(A=f.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(k[A.root.getName()]){e=b;p=A;A=m;l=G;z=CKEDITOR.plugins.list.listToArray(p.root,A);D=[];for(u=0;u<p.contents.length;u++)F=p.contents[u],(F=F.getAscendant("li",!0))&&!F.getCustomData("list_item_processed")&&(D.push(F),CKEDITOR.dom.element.setMarker(A,F,"list_item_processed",!0));for(var F=p.root.getDocument(),J=void 0,I=void 0,u=0;u<D.length;u++){var N=D[u].getCustomData("listarray_index"),
-J=z[N].parent;J.is(this.type)||(I=F.createElement(this.type),J.copyAttributes(I,{start:1,type:1}),I.removeStyle("list-style-type"),z[N].parent=I)}A=CKEDITOR.plugins.list.arrayToList(z,A,null,e.config.enterMode);z=void 0;D=A.listNode.getChildCount();for(u=0;u<D&&(z=A.listNode.getChild(u));u++)z.getName()==this.type&&l.push(z);A.listNode.replace(p.root);e.fire("contentDomInvalidated")}else{z=b;l=A;u=G;D=l.contents;e=l.root.getDocument();p=[];1==D.length&&D[0].equals(l.root)&&(A=e.createElement("div"),
-D[0].moveChildren&&D[0].moveChildren(A),D[0].append(A),D[0]=A);l=l.contents[0].getParent();for(F=0;F<D.length;F++)l=l.getCommonAncestor(D[F].getParent());J=z.config.useComputedState;z=A=void 0;J=void 0===J||J;for(F=0;F<D.length;F++)for(I=D[F];N=I.getParent();){if(N.equals(l)){p.push(I);!z&&I.getDirection()&&(z=1);I=I.getDirection(J);null!==A&&(A=A&&A!=I?null:I);break}I=N}if(!(1>p.length)){D=p[p.length-1].getNext();F=e.createElement(this.type);u.push(F);for(J=u=void 0;p.length;)u=p.shift(),J=e.createElement("li"),
-I=u,I.is("pre")||v.test(I.getName())||"false"==I.getAttribute("contenteditable")?u.appendTo(J):(u.copyAttributes(J),A&&u.getDirection()&&(J.removeStyle("direction"),J.removeAttribute("dir")),u.moveChildren(J),u.remove()),J.appendTo(F);A&&z&&F.setAttribute("dir",A);D?F.insertBefore(D):F.appendTo(l)}}else this.state==CKEDITOR.TRISTATE_ON&&k[A.root.getName()]&&a.call(this,b,A,m);for(F=0;F<G.length;F++)g(G[F]);CKEDITOR.dom.element.clearAllMarkers(m);d.selectBookmarks(c);b.focus()},refresh:function(a,
-b){var c=b.contains(k,1),d=b.blockLimit||b.root;c&&d.contains(c)?this.setState(c.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(a){a.blockless||(a.addCommand("numberedlist",new e("numberedlist","ol")),a.addCommand("bulletedlist",new e("bulletedlist","ul")),a.ui.addButton&&(a.ui.addButton("NumberedList",{label:a.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),
-a.ui.addButton("BulletedList",{label:a.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),a.on("key",function(b){var c=b.data.domEvent.getKey(),d;if("wysiwyg"==a.mode&&c in{8:1,46:1}){var e=a.getSelection().getRanges()[0],g=e&&e.startPath();if(e&&e.collapsed){var r=8==c,u=a.editable(),v=new CKEDITOR.dom.walker(e.clone());v.evaluator=function(a){return h(a)&&!p(a)};v.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};c=e.clone();if(r){var A;
-(A=g.contains(k))&&e.checkBoundaryOfElement(A,CKEDITOR.START)&&(A=A.getParent())&&A.is("li")&&(A=l(A))?(d=A,A=A.getPrevious(h),c.moveToPosition(A&&p(A)?A:d,CKEDITOR.POSITION_BEFORE_START)):(v.range.setStartAt(u,CKEDITOR.POSITION_AFTER_START),v.range.setEnd(e.startContainer,e.startOffset),(A=v.previous())&&A.type==CKEDITOR.NODE_ELEMENT&&(A.getName()in k||A.is("li"))&&(A.is("li")||(v.range.selectNodeContents(A),v.reset(),v.evaluator=f,A=v.previous()),d=A,c.moveToElementEditEnd(d),c.moveToPosition(c.endPath().block,
-CKEDITOR.POSITION_BEFORE_END)));if(d)m(a,c,e),b.cancel();else{var z=g.contains(k);z&&e.checkBoundaryOfElement(z,CKEDITOR.START)&&(d=z.getFirst(h),e.checkBoundaryOfElement(d,CKEDITOR.START)&&(A=z.getPrevious(h),l(d)?A&&(e.moveToElementEditEnd(A),e.select()):a.execCommand("outdent"),b.cancel()))}}else if(d=g.contains("li")){if(v.range.setEndAt(u,CKEDITOR.POSITION_BEFORE_END),r=(u=d.getLast(h))&&f(u)?u:d,g=0,(A=v.next())&&A.type==CKEDITOR.NODE_ELEMENT&&A.getName()in k&&A.equals(u)?(g=1,A=v.next()):e.checkBoundaryOfElement(r,
-CKEDITOR.END)&&(g=2),g&&A){e=e.clone();e.moveToElementEditStart(A);if(1==g&&(c.optimize(),!c.startContainer.equals(d))){for(d=c.startContainer;d.is(CKEDITOR.dtd.$inline);)z=d,d=d.getParent();z&&c.moveToPosition(z,CKEDITOR.POSITION_AFTER_END)}2==g&&(c.moveToPosition(c.endPath().block,CKEDITOR.POSITION_BEFORE_END),e.endPath().block&&e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_AFTER_START));m(a,c,e);b.cancel()}}else v.range.setEndAt(u,CKEDITOR.POSITION_BEFORE_END),(A=v.next())&&A.type==CKEDITOR.NODE_ELEMENT&&
-A.is(k)&&(A=A.getFirst(h),g.block&&e.checkStartOfBlock()&&e.checkEndOfBlock()?(g.block.remove(),e.moveToElementEditStart(A),e.select()):l(A)?(e.moveToElementEditStart(A),e.select()):(e=e.clone(),e.moveToElementEditStart(A),m(a,c,e)),b.cancel());setTimeout(function(){a.selectionChange(1)})}}}))}})}(),"use strict",function(){function a(a,b,c){return p(b)&&p(c)&&c.equals(b.getNext(function(a){return!(ba(a)||Y(a)||v(a))}))}function e(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}
-function c(a){var b=a.element;if(b&&p(b)&&(b=b.getAscendant(a.triggers,!0))&&a.editable.contains(b)){var c=l(b);if("true"==c.getAttribute("contenteditable"))return b;if(c.is(a.triggers))return c}return null}function g(a,b,c){r(a,b);r(a,c);a=b.size.bottom;c=c.size.top;return a&&c?0|(a+c)/2:a||c}function f(a,b,c){return b=b[c?"getPrevious":"getNext"](function(b){return b&&b.type==CKEDITOR.NODE_TEXT&&!ba(b)||p(b)&&!v(b)&&!h(a,b)})}function m(a,b,c){return a>b&&a<c}function l(a,b){if(a.data("cke-editable"))return null;
-for(b||(a=a.getParent());a&&!a.data("cke-editable");){if(a.hasAttribute("contenteditable"))return a;a=a.getParent()}return null}function k(a){var c=a.doc,d=G('\x3cspan contenteditable\x3d"false" style\x3d"'+S+"position:absolute;border-top:1px dashed "+a.boxColor+'"\x3e\x3c/span\x3e',c),e=CKEDITOR.getUrl(this.path+"images/"+(F.hidpi?"hidpi/":"")+"icon"+(a.rtl?"-rtl":"")+".png");z(d,{attach:function(){this.wrap.getParent()||this.wrap.appendTo(a.editable,!0);return this},lineChildren:[z(G('\x3cspan title\x3d"'+
-a.editor.lang.magicline.title+'" contenteditable\x3d"false"\x3e\x26#8629;\x3c/span\x3e',c),{base:S+"height:17px;width:17px;"+(a.rtl?"left":"right")+":17px;background:url("+e+") center no-repeat "+a.boxColor+";cursor:pointer;"+(F.hc?"font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;":"")+(F.hidpi?"background-size: 9px 10px;":""),looks:["top:-8px; border-radius: 2px;","top:-17px; border-radius: 2px 2px 0px 0px;","top:-1px; border-radius: 0px 0px 2px 2px;"]}),z(G(X,c),{base:aa+
-"left:0px;border-left-color:"+a.boxColor+";",looks:["border-width:8px 0 8px 8px;top:-8px","border-width:8px 0 0 8px;top:-8px","border-width:0 0 8px 8px;top:0px"]}),z(G(X,c),{base:aa+"right:0px;border-right-color:"+a.boxColor+";",looks:["border-width:8px 8px 8px 0;top:-8px","border-width:8px 8px 0 0;top:-8px","border-width:0 8px 8px 0;top:0px"]})],detach:function(){this.wrap.getParent()&&this.wrap.remove();return this},mouseNear:function(){r(a,this);var b=a.holdDistance,c=this.size;return c&&m(a.mouse.y,
-c.top-b,c.bottom+b)&&m(a.mouse.x,c.left-b,c.right+b)?!0:!1},place:function(){var b=a.view,c=a.editable,d=a.trigger,e=d.upper,f=d.lower,h=e||f,g=h.getParent(),k={};this.trigger=d;e&&r(a,e,!0);f&&r(a,f,!0);r(a,g,!0);a.inInlineMode&&x(a,!0);g.equals(c)?(k.left=b.scroll.x,k.right=-b.scroll.x,k.width=""):(k.left=h.size.left-h.size.margin.left+b.scroll.x-(a.inInlineMode?b.editable.left+b.editable.border.left:0),k.width=h.size.outerWidth+h.size.margin.left+h.size.margin.right+b.scroll.x,k.right="");e&&f?
+b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var e=CKEDITOR.dom.walker.whitespaces(),h=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(a,g,k,m){if(k=k||f(a)){k=c(k);var v=k.document,r=k.checkStartOfBlock(),n=k.checkEndOfBlock(),q=a.elementPath(k.startContainer),w=q.block,A=g==CKEDITOR.ENTER_DIV?"div":"p",B;if(r&&n){if(w&&(w.is("li")||w.getParent().is("li"))){w.is("li")||(w=w.getParent());k=w.getParent();B=k.getParent();
+m=!w.hasPrevious();var t=!w.hasNext(),A=a.getSelection(),x=A.createBookmarks(),r=w.getDirection(1),n=w.getAttribute("class"),D=w.getAttribute("style"),y=B.getDirection(1)!=r;a=a.enterMode!=CKEDITOR.ENTER_BR||y||D||n;if(B.is("li"))m||t?(m&&t&&k.remove(),w[t?"insertAfter":"insertBefore"](B)):w.breakParent(B);else{if(a)if(q.block.is("li")?(B=v.createElement(g==CKEDITOR.ENTER_P?"p":"div"),y&&B.setAttribute("dir",r),D&&B.setAttribute("style",D),n&&B.setAttribute("class",n),w.moveChildren(B)):B=q.block,
+m||t)B[m?"insertBefore":"insertAfter"](k);else w.breakParent(k),B.insertAfter(k);else if(w.appendBogus(!0),m||t)for(;v=w[m?"getFirst":"getLast"]();)v[m?"insertBefore":"insertAfter"](k);else for(w.breakParent(k);v=w.getLast();)v.insertAfter(k);w.remove()}A.selectBookmarks(x);return}if(w&&w.getParent().is("blockquote")){w.breakParent(w.getParent());w.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||w.getPrevious().remove();w.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||w.getNext().remove();
+k.moveToElementEditStart(w);k.select();return}}else if(w&&w.is("pre")&&!n){l(a,g,k,m);return}if(r=k.splitBlock(A)){g=r.previousBlock;w=r.nextBlock;q=r.wasStartOfBlock;a=r.wasEndOfBlock;w?(x=w.getParent(),x.is("li")&&(w.breakParent(x),w.move(w.getNext(),1))):g&&(x=g.getParent())&&x.is("li")&&(g.breakParent(x),x=g.getNext(),k.moveToElementEditStart(x),g.move(g.getPrevious()));if(q||a){if(g){if(g.is("li")||!b.test(g.getName())&&!g.is("pre"))B=g.clone()}else w&&(B=w.clone());B?m&&!B.is("li")&&B.renameNode(A):
+x&&x.is("li")?B=x:(B=v.createElement(A),g&&(t=g.getDirection())&&B.setAttribute("dir",t));if(v=r.elementPath)for(m=0,A=v.elements.length;m<A;m++){x=v.elements[m];if(x.equals(v.block)||x.equals(v.blockLimit))break;CKEDITOR.dtd.$removeEmpty[x.getName()]&&(x=x.clone(),B.moveChildren(x),B.append(x))}B.appendBogus();B.getParent()||k.insertNode(B);B.is("li")&&B.removeAttribute("value");!CKEDITOR.env.ie||!q||a&&g.getChildCount()||(k.moveToElementEditStart(a?g:B),k.select());k.moveToElementEditStart(q&&!a?
+w:B)}else w.is("li")&&(B=k.clone(),B.selectNodeContents(w),B=new CKEDITOR.dom.walker(B),B.evaluator=function(a){return!(h(a)||e(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(x=B.next())&&x.type==CKEDITOR.NODE_ELEMENT&&x.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?v.createElement("br"):v.createText(" ")).insertBefore(x)),w&&k.moveToElementEditStart(w);k.select();k.scrollIntoView()}}},enterBr:function(a,c,e,h){if(e=e||f(a)){var l=e.document,
+m=e.checkEndOfBlock(),n=new CKEDITOR.dom.elementPath(a.getSelection().getStartElement()),q=n.block,w=q&&n.block.getName();h||"li"!=w?(!h&&m&&b.test(w)?(m=q.getDirection())?(l=l.createElement("div"),l.setAttribute("dir",m),l.insertAfter(q),e.setStart(l,0)):(l.createElement("br").insertAfter(q),CKEDITOR.env.gecko&&l.createText("").insertAfter(q),e.setStartAt(q.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(a="pre"==w&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?
+l.createText("\r"):l.createElement("br"),e.deleteContents(),e.insertNode(a),CKEDITOR.env.needsBrFiller?(l.createText("").insertAfter(a),m&&(q||n.blockLimit).appendBogus(),a.getNext().$.nodeValue="",e.setStartAt(a.getNext(),CKEDITOR.POSITION_AFTER_START)):e.setStartAt(a,CKEDITOR.POSITION_AFTER_END)),e.collapse(!0),e.select(),e.scrollIntoView()):k(a,c,e,h)}}};var m=CKEDITOR.plugins.enterkey,l=m.enterBr,k=m.enterBlock,b=/^h[1-6]$/}(),function(){function a(a,c){var e={},h=[],m={nbsp:" ",shy:"­",gt:"\x3e",
+lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};a=a.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(a,b){var f=c?"\x26"+b+";":m[b];e[f]=c?m[b]:"\x26"+b+";";h.push(f);return""});if(!c&&a){a=a.split(",");var l=document.createElement("div"),k;l.innerHTML="\x26"+a.join(";\x26")+";";k=l.innerHTML;l=null;for(l=0;l<k.length;l++){var b=k.charAt(l);e[b]="\x26"+a[l]+";";h.push(b)}}e.regex=h.join(c?"|":"");return e}CKEDITOR.plugins.add("entities",{afterInit:function(f){function c(a){return b[a]}function e(a){return"force"!=
+h.entities_processNumerical&&l[a]?l[a]:"\x26#"+a.charCodeAt(0)+";"}var h=f.config;if(f=(f=f.dataProcessor)&&f.htmlFilter){var m=[];!1!==h.basicEntities&&m.push("nbsp,gt,lt,amp");h.entities&&(m.length&&m.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
+h.entities_latin&&m.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),h.entities_greek&&m.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
+h.entities_additional&&m.push(h.entities_additional));var l=a(m.join(",")),k=l.regex?"["+l.regex+"]":"a^";delete l.regex;h.entities&&h.entities_processNumerical&&(k="[^ -~]|"+k);var k=new RegExp(k,"g"),b=a("nbsp,gt,lt,amp,shy",!0),d=new RegExp(b.regex,"g");f.addRules({text:function(a){return a.replace(d,c).replace(k,e)}},{applyToAll:!0,excludeNestedEditable:!0})}}})}(),CKEDITOR.config.basicEntities=!0,CKEDITOR.config.entities=!0,CKEDITOR.config.entities_latin=!0,CKEDITOR.config.entities_greek=!0,
+CKEDITOR.config.entities_additional="#39",CKEDITOR.plugins.add("popup"),CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{popup:function(a,f,c,e){f=f||"80%";c=c||"70%";"string"==typeof f&&1<f.length&&"%"==f.substr(f.length-1,1)&&(f=parseInt(window.screen.width*parseInt(f,10)/100,10));"string"==typeof c&&1<c.length&&"%"==c.substr(c.length-1,1)&&(c=parseInt(window.screen.height*parseInt(c,10)/100,10));640>f&&(f=640);420>c&&(c=420);var h=parseInt((window.screen.height-c)/2,10),m=parseInt((window.screen.width-
+f)/2,10);e=(e||"location\x3dno,menubar\x3dno,toolbar\x3dno,dependent\x3dyes,minimizable\x3dno,modal\x3dyes,alwaysRaised\x3dyes,resizable\x3dyes,scrollbars\x3dyes")+",width\x3d"+f+",height\x3d"+c+",top\x3d"+h+",left\x3d"+m;var l=window.open("",null,e,!0);if(!l)return!1;try{-1==navigator.userAgent.toLowerCase().indexOf(" chrome/")&&(l.moveTo(m,h),l.resizeTo(f,c)),l.focus(),l.location.href=a}catch(k){window.open(a,null,e,!0)}return!0}}),function(){function a(a,d){var c=[];if(d)for(var e in d)c.push(e+
+"\x3d"+encodeURIComponent(d[e]));else return a;return a+(-1!=a.indexOf("?")?"\x26":"?")+c.join("\x26")}function f(a){a+="";return a.charAt(0).toUpperCase()+a.substr(1)}function c(){var b=this.getDialog(),d=b.getParentEditor();d._.filebrowserSe=this;var c=d.config["filebrowser"+f(b.getName())+"WindowWidth"]||d.config.filebrowserWindowWidth||"80%",b=d.config["filebrowser"+f(b.getName())+"WindowHeight"]||d.config.filebrowserWindowHeight||"70%",e=this.filebrowser.params||{};e.CKEditor=d.name;e.CKEditorFuncNum=
+d._.filebrowserFn;e.langCode||(e.langCode=d.langCode);e=a(this.filebrowser.url,e);d.popup(e,c,b,d.config.filebrowserWindowFeatures||d.config.fileBrowserWindowFeatures)}function e(){var a=this.getDialog();a.getParentEditor()._.filebrowserSe=this;return a.getContentElement(this["for"][0],this["for"][1]).getInputElement().$.value&&a.getContentElement(this["for"][0],this["for"][1]).getAction()?!0:!1}function h(b,d,c){var e=c.params||{};e.CKEditor=b.name;e.CKEditorFuncNum=b._.filebrowserFn;e.langCode||
+(e.langCode=b.langCode);d.action=a(c.url,e);d.filebrowser=c}function m(a,d,g,k){if(k&&k.length)for(var l,v=k.length;v--;)if(l=k[v],"hbox"!=l.type&&"vbox"!=l.type&&"fieldset"!=l.type||m(a,d,g,l.children),l.filebrowser)if("string"==typeof l.filebrowser&&(l.filebrowser={action:"fileButton"==l.type?"QuickUpload":"Browse",target:l.filebrowser}),"Browse"==l.filebrowser.action){var r=l.filebrowser.url;void 0===r&&(r=a.config["filebrowser"+f(d)+"BrowseUrl"],void 0===r&&(r=a.config.filebrowserBrowseUrl));
+r&&(l.onClick=c,l.filebrowser.url=r,l.hidden=!1)}else if("QuickUpload"==l.filebrowser.action&&l["for"]&&(r=l.filebrowser.url,void 0===r&&(r=a.config["filebrowser"+f(d)+"UploadUrl"],void 0===r&&(r=a.config.filebrowserUploadUrl)),r)){var n=l.onClick;l.onClick=function(a){var b=a.sender;if(n&&!1===n.call(b,a))return!1;if(e.call(b,a)){a=b.getDialog().getContentElement(this["for"][0],this["for"][1]).getInputElement();if(b=new CKEDITOR.dom.element(a.$.form))(a=b.$.elements.ckCsrfToken)?a=new CKEDITOR.dom.element(a):
+(a=new CKEDITOR.dom.element("input"),a.setAttributes({name:"ckCsrfToken",type:"hidden"}),b.append(a)),a.setAttribute("value",CKEDITOR.tools.getCsrfToken());return!0}return!1};l.filebrowser.url=r;l.hidden=!1;h(a,g.getContents(l["for"][0]).get(l["for"][1]),l.filebrowser)}}function l(a,d,c){if(-1!==c.indexOf(";")){c=c.split(";");for(var e=0;e<c.length;e++)if(l(a,d,c[e]))return!0;return!1}return(a=a.getContents(d).get(c).filebrowser)&&a.url}function k(a,d){var c=this._.filebrowserSe.getDialog(),e=this._.filebrowserSe["for"],
+f=this._.filebrowserSe.filebrowser.onSelect;e&&c.getContentElement(e[0],e[1]).reset();if("function"!=typeof d||!1!==d.call(this._.filebrowserSe))if(!f||!1!==f.call(this._.filebrowserSe,a,d))if("string"==typeof d&&d&&alert(d),a&&(e=this._.filebrowserSe,c=e.getDialog(),e=e.filebrowser.target||null))if(e=e.split(":"),f=c.getContentElement(e[0],e[1]))f.setValue(a),c.selectPage(e[0])}CKEDITOR.plugins.add("filebrowser",{requires:"popup",init:function(a){a._.filebrowserFn=CKEDITOR.tools.addFunction(k,a);
+a.on("destroy",function(){CKEDITOR.tools.removeFunction(this._.filebrowserFn)})}});CKEDITOR.on("dialogDefinition",function(a){if(a.editor.plugins.filebrowser)for(var d=a.data.definition,c,e=0;e<d.contents.length;++e)if(c=d.contents[e])m(a.editor,a.data.name,d,c.elements),c.hidden&&c.filebrowser&&(c.hidden=!l(d,c.id,c.filebrowser))})}(),function(){function a(a){var h=a.config,m=a.fire("uiSpace",{space:"top",html:""}).html,l=function(){function d(a,e,g){b.setStyle(e,c(g));b.setStyle("position",a)}function g(a){var b=
+m.getDocumentPosition();switch(a){case "top":d("absolute","top",b.y-A-x);break;case "pin":d("fixed","top",y);break;case "bottom":d("absolute","top",b.y+(q.height||q.bottom-q.top)+x)}k=a}var k,m,n,q,w,A,B,t=h.floatSpaceDockedOffsetX||0,x=h.floatSpaceDockedOffsetY||0,D=h.floatSpacePinnedOffsetX||0,y=h.floatSpacePinnedOffsetY||0;return function(d){if(m=a.editable()){var p=d&&"focus"==d.name;p&&b.show();a.fire("floatingSpaceLayout",{show:p});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();
+q=m.getClientRect();w=f.getViewPaneSize();A=n.height;B="pageXOffset"in f.$?f.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;k?(A+x<=q.top?g("top"):A+x>w.height-q.bottom?g("pin"):g("bottom"),d=w.width/2,d=h.floatSpacePreferRight?"right":0<q.left&&q.right<w.width&&q.width>n.width?"rtl"==h.contentsLangDirection?"right":"left":d-q.left>q.right-d?"left":"right",n.width>w.width?(d="left",p=0):(p="left"==d?0<q.left?q.left:0:q.right<w.width?w.width-q.right:0,p+n.width>w.width&&(d="left"==d?
+"right":"left",p=0)),b.setStyle(d,c(("pin"==k?D:t)+p+("pin"==k?0:"left"==d?B:-B)))):(k="pin",g("pin"),l(d))}}}();if(m){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':
+" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:m,id:a.id,langDir:a.lang.dir,langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(h.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),d=CKEDITOR.tools.eventsBuffer(500,l),g=CKEDITOR.tools.eventsBuffer(100,l);b.unselectable();b.on("mousedown",
+function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){l(b);a.on("change",d.input);f.on("scroll",g.input);f.on("resize",g.input)});a.on("blur",function(){b.hide();a.removeListener("change",d.input);f.removeListener("scroll",g.input);f.removeListener("resize",g.input)});a.on("destroy",function(){f.removeListener("scroll",g.input);f.removeListener("resize",g.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,
+1)}}var f=CKEDITOR.document.getWindow(),c=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(c){c.on("loaded",function(){a(this)},null,null,20)}})}(),CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var a=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),f=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
+c=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),e=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,c){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),c))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,c){c=c||{};var e=c.attributes||(c.attributes={});(this.multiSelect=!!c.multiSelect)&&(e["aria-multiselectable"]=!0);!e.role&&
+(e.role="listbox");this.base.apply(this,arguments);this.element.setAttribute("role",e.role);e=this.keys;e[40]="next";e[9]="next";e[38]="prev";e[CKEDITOR.SHIFT+9]="prev";e[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(e[13]="mouseup");this._.pendingHtml=[];this._.pendingList=[];this._.items={};this._.groups={}},_:{close:function(){if(this._.started){var c=a.output({items:this._.pendingList.join("")});this._.pendingList=[];this._.pendingHtml.push(c);delete this._.started}},getClick:function(){this._.click||
+(this._.click=CKEDITOR.tools.addFunction(function(a){var c=this.toggle(a);if(this.onClick)this.onClick(a,c)},this));return this._.click}},proto:{add:function(a,c,l){var k=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=k;var b;b=CKEDITOR.tools.htmlEncodeAttr(a).replace(e,"\\'");a={id:k,val:b,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(l||a),text:c||a};
+this._.pendingList.push(f.output(a))},startGroup:function(a){this._.close();var e=CKEDITOR.tools.getNextId();this._.groups[a]=e;this._.pendingHtml.push(c.output({id:e,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var c=this.isMarked(a);c?this.unmark(a):this.mark(a);return!c},hideGroup:function(a){var c=(a=this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display",
+"none"),c&&"ul"==c.getName()&&c.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,c=this._.groups,e=this.element.getDocument(),f;for(f in a)e.getById(a[f]).setStyle("display","");for(var b in c)a=e.getById(c[b]),f=a.getNext(),a.setStyle("display",""),f&&"ul"==f.getName()&&f.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var c=this.element.getDocument().getById(a);
+c.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(c)},unmark:function(a){var c=this.element.getDocument();a=this._.items[a];var e=c.getById(a);e.removeClass("cke_selected");c.getById(a+"_option").removeAttribute("aria-selected");this.onUnmark&&this.onUnmark(e)},unmarkAll:function(){var a=this._.items,c=this.element.getDocument(),e;for(e in a){var f=a[e];c.getById(f).removeClass("cke_selected");c.getById(f+"_option").removeAttribute("aria-selected")}this.onUnmark&&
+this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},focus:function(a){this._.focusIndex=-1;var c=this.element.getElementsByTag("a"),e,f=-1;if(a)for(e=this.element.getDocument().getById(this._.items[a]).getFirst();a=c.getItem(++f);){if(a.equals(e)){this._.focusIndex=f;break}}else this.element.focus();e&&setTimeout(function(){e.focus()},0)}}})}}),CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_RICHCOMBO,
+CKEDITOR.ui.richCombo.handler)}}),function(){var a='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"true"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&
+(a+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(a+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var a=a+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+
+(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),f=CKEDITOR.addTemplate("combo",a);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
+a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{}}},proto:{renderHtml:function(a){var e=[];this.render(a,e);return e.join("")},render:function(a,e){function h(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}var m=
+CKEDITOR.env,l="cke_"+this.id,k=CKEDITOR.tools.addFunction(function(b){u&&(a.unlockSelection(1),u=0);d.execute(b)},this),b=this,d={id:l,combo:this,focus:function(){CKEDITOR.document.getById(l).getChild(1).focus()},execute:function(d){var e=b._;if(e.state!=CKEDITOR.TRISTATE_DISABLED)if(b.createPanel(a),e.on)e.panel.hide();else{b.commit();var g=b.getValue();g?e.list.mark(g):e.list.unmarkAll();e.panel.showBlock(b.id,new CKEDITOR.dom.element(d),4)}},clickFn:k};a.on("activeFilterChange",h,this);a.on("mode",
+h,this);a.on("selectionChange",h,this);!this.readOnly&&a.on("readOnly",h,this);var g=CKEDITOR.tools.addFunction(function(b,e){b=new CKEDITOR.dom.event(b);var g=b.getKeystroke();if(40==g)a.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)});switch(g){case 13:case 32:case 40:CKEDITOR.tools.callFunction(k,e);break;default:d.onkey(d,g)}b.preventDefault()}),p=CKEDITOR.tools.addFunction(function(){d.onfocus&&d.onfocus()}),u=0;d.keyDownFn=g;m={id:l,name:this.name||this.command,label:this.label,
+title:this.title,cls:this.className||"",titleJs:m.gecko&&!m.hc?"":(this.title||"").replace("'",""),keydownFn:g,focusFn:p,clickFn:k};f.output(m,e);if(this.onRender)this.onRender();return d},createPanel:function(a){if(!this._.panel){var e=this._.panelDefinition,f=this._.panelDefinition.block,m=e.parent||CKEDITOR.document.getBody(),l="cke_combopanel__"+this.name,k=new CKEDITOR.ui.floatPanel(a,m,e),b=k.addListBlock(this.id,f),d=this;k.onShow=function(){this.element.addClass(l);d.setState(CKEDITOR.TRISTATE_ON);
+d._.on=1;d.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(d.onOpen)d.onOpen();a.once("panelShow",function(){b.focus(!b.multiSelect&&d.getValue())})};k.onHide=function(b){this.element.removeClass(l);d.setState(d.modes&&d.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);d._.on=0;if(!b&&d.onClose)d.onClose()};k.onEscape=function(){k.hide(1)};b.onClick=function(a,b){d.onClick&&d.onClick.call(d,a,b);k.hide()};this._.panel=k;this._.list=b;k.getBlock(this.id).onHide=function(){d._.on=
+0;d.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,e){this._.value=a;var f=this.document.getById("cke_"+this.id+"_text");f&&(a||e?f.removeClass("cke_combo_inlinelabel"):(e=this.label,f.addClass("cke_combo_inlinelabel")),f.setText("undefined"!=typeof e?e:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},
+showAll:function(){this._.list.showAll()},add:function(a,e,f){this._.items[a]=f||a;this._.list.add(a,e,f)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var e=this.document.getById("cke_"+this.id);e.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?e.setAttribute("aria-disabled",!0):e.removeAttribute("aria-disabled");this._.state=
+a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,e){this.add(a,CKEDITOR.UI_RICHCOMBO,e)}}(),CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var f=
+a.config,c=a.lang.format,e=f.format_tags.split(";"),h={},m=0,l=[],k=0;k<e.length;k++){var b=e[k],d=new CKEDITOR.style(f["format_"+b]);if(!a.filter.customConfig||a.filter.check(d))m++,h[b]=d,h[b]._.enterMode=a.config.enterMode,l.push(d)}0!==m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:l,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);
+for(var a in h){var b=c["tag_"+a];this.add(a,h[a].buildPreview(b),b)}},onClick:function(b){a.focus();a.fire("saveSnapshot");b=h[b];var d=a.elementPath();a[b.checkActive(d,a)?"removeStyle":"applyStyle"](b);setTimeout(function(){a.fire("saveSnapshot")},0)},onRender:function(){a.on("selectionChange",function(b){var d=this.getValue();b=b.data.path;this.refresh();for(var c in h)if(h[c].checkActive(b,a)){c!=d&&this.setValue(c,a.lang.format["tag_"+c]);return}this.setValue("")},this)},onOpen:function(){this.showAll();
+for(var b in h)a.activeFilter.check(h[b])||this.hideItem(b)},refresh:function(){var b=a.elementPath();if(b){if(b.isContextFor("p"))for(var d in h)if(a.activeFilter.check(h[d]))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}}})}}}),CKEDITOR.config.format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div",CKEDITOR.config.format_p={element:"p"},CKEDITOR.config.format_div={element:"div"},CKEDITOR.config.format_pre={element:"pre"},CKEDITOR.config.format_address={element:"address"},CKEDITOR.config.format_h1=
+{element:"h1"},CKEDITOR.config.format_h2={element:"h2"},CKEDITOR.config.format_h3={element:"h3"},CKEDITOR.config.format_h4={element:"h4"},CKEDITOR.config.format_h5={element:"h5"},CKEDITOR.config.format_h6={element:"h6"},CKEDITOR.plugins.add("htmlwriter",{init:function(a){var f=new CKEDITOR.htmlWriter;f.forceSimpleAmpersand=a.config.forceSimpleAmpersand;f.indentationChars=a.config.dataIndentationChars||"\t";a.dataProcessor.writer=f}}),CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWriter,
+$:function(){this.base();this.indentationChars="\t";this.selfClosingEnd=" /\x3e";this.lineBreakChars="\n";this.sortAttributes=1;this._.indent=0;this._.indentation="";this._.inPre=0;this._.rules={};var a=CKEDITOR.dtd,f;for(f in CKEDITOR.tools.extend({},a.$nonBodyContent,a.$block,a.$listItem,a.$tableContent))this.setRules(f,{indent:!a[f]["#"],breakBeforeOpen:1,breakBeforeClose:!a[f]["#"],breakAfterClose:1,needsSpace:f in a.$block&&!(f in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",
+{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(a){var f=this._.rules[a];this._.afterCloser&&f&&f.needsSpace&&this._.needsSpace&&this._.output.push("\n");this._.indent?this.indentation():f&&f.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",a);this._.afterCloser=0},openTagClose:function(a,f){var c=this._.rules[a];f?(this._.output.push(this.selfClosingEnd),c&&
+c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==a&&(this._.inPre=1)},attribute:function(a,f){"string"==typeof f&&(this.forceSimpleAmpersand&&(f=f.replace(/&amp;/g,"\x26")),f=CKEDITOR.tools.htmlEncodeAttr(f));this._.output.push(" ",a,'\x3d"',f,'"')},closeTag:function(a){var f=this._.rules[a];f&&f.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));
+this._.indent?this.indentation():f&&f.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",a,"\x3e");"pre"==a&&(this._.inPre=0);f&&f.breakAfterClose&&(this.lineBreak(),this._.needsSpace=f.needsSpace);this._.afterCloser=1},text:function(a){this._.indent&&(this.indentation(),!this._.inPre&&(a=CKEDITOR.tools.ltrim(a)));this._.output.push(a)},comment:function(a){this._.indent&&this.indentation();this._.output.push("\x3c!--",a,"--\x3e")},lineBreak:function(){!this._.inPre&&
+0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0},setRules:function(a,f){var c=this._.rules[a];c?CKEDITOR.tools.extend(c,f,!0):this._.rules[a]=f}}}),function(){var a={canUndo:!1,exec:function(a){var c=a.document.createElement("hr");a.insertElement(c)},
+allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(f){f.blockless||(f.addCommand("horizontalrule",a),f.ui.addButton&&f.ui.addButton("HorizontalRule",{label:f.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})}(),function(){function a(a){function c(a){var b=!1;g.attachListener(g,"keydown",function(){var d=k.getBody().getElementsByTag(a);if(!b){for(var c=0;c<d.count();c++)d.getItem(c).setCustomData("retain",!0);b=!0}},null,null,
+1);g.attachListener(g,"keyup",function(){var d=k.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).remove(1),b=!1)})}var e=this.editor,k=a.document,b=k.body,d=k.getElementById("cke_actscrpt");d&&d.parentNode.removeChild(d);(d=k.getElementById("cke_shimscrpt"))&&d.parentNode.removeChild(d);(d=k.getElementById("cke_basetagscrpt"))&&d.parentNode.removeChild(d);b.contentEditable=!0;CKEDITOR.env.ie&&(b.hideFocus=!0,b.disabled=!0,b.removeAttribute("disabled"));delete this._.isLoadingData;
+this.$=b;k=new CKEDITOR.dom.document(k);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&k.getDocumentElement().addClass(k.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&e.enterMode!=CKEDITOR.ENTER_P?c("p"):CKEDITOR.env.edge&&e.enterMode!=CKEDITOR.ENTER_DIV&&c("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)k.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){e.editable().focus()})});
+f(e);try{e.document.$.execCommand("2D-position",!1,!0)}catch(p){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==e.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var b=a.data.getKeystroke();if(33==b||34==b)if(CKEDITOR.env.ie)setTimeout(function(){e.getSelection().scrollIntoView()},0);else if(e.window.$.innerHeight>this.$.offsetHeight){var d=e.createRange();d[33==b?"moveToElementEditStart":"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&
+this.attachListener(k,"blur",function(){try{k.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(k,"touchend",function(){a.focus()});b=e.document.getElementsByTag("title").getItem(0);b.data("cke-title",b.getText());CKEDITOR.env.ie&&(e.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==this.status&&(this.status="ready");e.fire("contentDom");this._.isPendingFocus&&(e.focus(),this._.isPendingFocus=!1);setTimeout(function(){e.fire("dataReady")},0)},
+0,this)}function f(a){function c(){var b;a.editable().attachListener(a,"selectionChange",function(){var c=a.getSelection().getSelectedElement();c&&(b&&(b.detachEvent("onresizestart",e),b=null),c.$.attachEvent("onresizestart",e),b=c.$)})}function e(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var f=a.document.$;f.execCommand("enableObjectResizing",!1,!a.config.disableObjectResizing);f.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(b){}else CKEDITOR.env.ie&&11>
+CKEDITOR.env.version&&a.config.disableObjectResizing&&c(a)}function c(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var c=[],e;for(e in CKEDITOR.dtd.$removeEmpty)c.push("html.CSS1Compat "+e+"[contenteditable\x3dfalse]");a.push(c.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));
+a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(c){function f(d){d&&d.removeListener();a.editable(new e(a,b.$.contentWindow.document.body));a.setData(a.getData(1),c)}var k="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+
+")();":"")+"document.close();",k=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(k)+"}())":"",b=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+k+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');b.setStyles({width:"100%",height:"100%"});b.addClass("cke_wysiwyg_frame").addClass("cke_reset");k=a.ui.space("contents");k.append(b);var d=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(d)b.on("load",f);var g=a.title,
+p=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&p&&(g+=", "+p),b.setAttribute("title",g));if(p){var g=CKEDITOR.tools.getNextId(),u=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+p+"\x3c/span\x3e");k.append(u,1);b.setAttribute("aria-describedby",g)}a.on("beforeModeUnload",function(a){a.removeListener();u&&u.remove()});b.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!d&&f();a.fire("ariaWidget",b)})}});CKEDITOR.editor.prototype.addContentsCss=
+function(a){var c=this.config,e=c.contentsCss;CKEDITOR.tools.isArray(e)||(c.contentsCss=e?[e]:[]);c.contentsCss.push(a)};var e=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(c){CKEDITOR.tools.setTimeout(a,0,this,c)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},base:CKEDITOR.editable,proto:{setData:function(a,e){var f=this.editor;if(e)this.setHtml(a),this.fixInitialSelection(),f.fire("dataReady");
+else{this._.isLoadingData=!0;f._.dataStore={id:1};var k=f.config,b=k.fullPage,d=k.docType,g=CKEDITOR.tools.buildStyleHtml(c()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');b||(g+=CKEDITOR.tools.buildStyleHtml(f.config.contentsCss));var p=k.baseHref?'\x3cbase href\x3d"'+k.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";b&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){f.docType=d=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){f.xmlDeclaration=a;return""}));a=f.dataProcessor.toHtml(a);b?(/<body[\s|>]/.test(a)||
+(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),p&&(a=a.replace(/<head[^>]*?>/,"$\x26"+p)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=d+a):a=k.docType+'\x3chtml dir\x3d"'+k.contentsLangDirection+'" lang\x3d"'+(k.contentsLanguage||f.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+
+this._.docTitle+"\x3c/title\x3e"+p+g+"\x3c/head\x3e\x3cbody"+(k.bodyId?' id\x3d"'+k.bodyId+'"':"")+(k.bodyClass?' class\x3d"'+k.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));k='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR.tools.callFunction("+
+this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');p&&CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(k+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');
+a=a.replace(/(?=\s*<\/(:?head)>)/,k);this.clearCustomData();this.clearListeners();f.fire("contentDomUnload");var u=this.getDocument();try{u.write(a)}catch(v){setTimeout(function(){u.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var c=a.config,e=c.fullPage,f=e&&a.docType,b=e&&a.xmlDeclaration,d=this.getDocument(),e=e?d.getDocumentElement().getOuterHtml():d.getBody().getHtml();CKEDITOR.env.gecko&&c.enterMode!=CKEDITOR.ENTER_BR&&(e=e.replace(/<br>(?=\s*(:?$|<\/body>))/,
+""));e=a.dataProcessor.toDataFormat(e);b&&(e=b+"\n"+e);f&&(e=f+"\n"+e);return e},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:e.baseProto.focus.call(this)},detach:function(){var a=this.editor,c=a.document,f;try{f=a.window.getFrame()}catch(k){}e.baseProto.detach.call(this);this.clearCustomData();c.getDocumentElement().clearCustomData();CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);f&&f.getParent()?(f.clearCustomData(),(a=f.removeCustomData("onResize"))&&a.removeListener(),
+f.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})}(),CKEDITOR.config.disableObjectResizing=!1,CKEDITOR.config.disableNativeTableHandles=!0,CKEDITOR.config.disableNativeSpellChecker=!0,function(){function a(a,h){var m,l;h.on("refresh",function(a){var b=[f],d;for(d in a.data.states)b.push(a.data.states[d]);this.setState(CKEDITOR.tools.search(b,c)?c:f)},h,null,100);h.on("exec",function(c){m=a.getSelection();l=m.createBookmarks(1);c.data||(c.data={});c.data.done=!1},h,null,0);h.on("exec",function(){a.forceNextSelectionCheck();
+m.selectBookmarks(l)},h,null,100)}var f=CKEDITOR.TRISTATE_DISABLED,c=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(c){var f=CKEDITOR.plugins.indent.genericDefinition;a(c,c.addCommand("indent",new f(!0)));a(c,c.addCommand("outdent",new f));c.ui.addButton&&(c.ui.addButton("Indent",{label:c.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),c.ui.addButton("Outdent",{label:c.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));c.on("dirChanged",
+function(a){var f=c.createRange(),h=a.data.node;f.setStartBefore(h);f.setEndAfter(h);for(var b=new CKEDITOR.dom.walker(f),d;d=b.next();)if(d.type==CKEDITOR.NODE_ELEMENT)if(!d.equals(h)&&d.getDirection())f.setStartAfter(d),b=new CKEDITOR.dom.walker(f);else{var g=c.config.indentClasses;if(g)for(var p="ltr"==a.data.dir?["_rtl",""]:["","_rtl"],u=0;u<g.length;u++)d.hasClass(g[u]+p[0])&&(d.removeClass(g[u]+p[0]),d.addClass(g[u]+p[1]));g=d.getStyle("margin-right");p=d.getStyle("margin-left");g?d.setStyle("margin-left",
+g):d.removeStyle("margin-left");p?d.setStyle("margin-right",p):d.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;this.startDisabled=!this.isIndent},specificDefinition:function(a,c,f){this.name=c;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==CKEDITOR.ENTER_BR;this.isIndent=!!f;this.relatedGlobal=f?"indent":"outdent";this.indentKey=f?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,c){a.on("pluginsLoaded",function(){for(var a in c)(function(a,
+c){var b=a.getCommand(c.relatedGlobal),d;for(d in c.jobs)b.on("exec",function(b){b.data.done||(a.fire("lockSnapshot"),c.execJob(a,d)&&(b.data.done=!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(c.database))},this,null,d),b.on("refresh",function(b){b.data.states||(b.data.states={});b.data.states[c.name+"@"+d]=c.refreshJob(a,d,b.data.path)},this,null,d);a.addFeature(c)})(this,c[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype=
+{execJob:function(a,c){var m=this.jobs[c];if(m.state!=f)return m.exec.call(this,a)},refreshJob:function(a,c,m){c=this.jobs[c];a.activeFilter.checkFeature(this)?c.state=c.refresh.call(this,a,m):c.state=f;return c.state},getContext:function(a){return a.contains(this.context)}}}(),function(){function a(a){function b(b){for(var f=m.startContainer,l=m.endContainer;f&&!f.getParent().equals(b);)f=f.getParent();for(;l&&!l.getParent().equals(b);)l=l.getParent();if(!f||!l)return!1;for(var n=f,f=[],r=!1;!r;)n.equals(l)&&
+(r=!0),f.push(n),n=n.getNext();if(1>f.length)return!1;n=b.getParents(!0);for(l=0;l<n.length;l++)if(n[l].getName&&h[n[l].getName()]){b=n[l];break}for(var n=d.isIndent?1:-1,l=f[0],f=f[f.length-1],r=CKEDITOR.plugins.list.listToArray(b,e),x=r[f.getCustomData("listarray_index")].indent,l=l.getCustomData("listarray_index");l<=f.getCustomData("listarray_index");l++)if(r[l].indent+=n,0<n){var u=r[l].parent;r[l].parent=new CKEDITOR.dom.element(u.getName(),u.getDocument())}for(l=f.getCustomData("listarray_index")+
+1;l<r.length&&r[l].indent>x;l++)r[l].indent+=n;f=CKEDITOR.plugins.list.arrayToList(r,e,null,a.config.enterMode,b.getDirection());if(!d.isIndent){var y;if((y=b.getParent())&&y.is("li"))for(var n=f.listNode.getChildren(),z=[],C,l=n.count()-1;0<=l;l--)(C=n.getItem(l))&&C.is&&C.is("li")&&z.push(C)}f&&f.listNode.replace(b);if(z&&z.length)for(l=0;l<z.length;l++){for(C=b=z[l];(C=C.getNext())&&C.is&&C.getName()in h;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(c)&&b.append(m.document.createText(" ")),b.append(C);
+b.insertAfter(y)}f&&a.fire("contentDomInvalidated");return!0}for(var d=this,e=this.database,h=this.context,l=a.getSelection(),l=(l&&l.getRanges()).createIterator(),m;m=l.getNextRange();){for(var r=m.getCommonAncestor();r&&(r.type!=CKEDITOR.NODE_ELEMENT||!h[r.getName()]);){if(a.editable().equals(r)){r=!1;break}r=r.getParent()}r||(r=m.startPath().contains(h))&&m.setEndAt(r,CKEDITOR.POSITION_BEFORE_END);if(!r){var n=m.getEnclosedNode();n&&n.type==CKEDITOR.NODE_ELEMENT&&n.getName()in h&&(m.setStartAt(n,
+CKEDITOR.POSITION_AFTER_START),m.setEndAt(n,CKEDITOR.POSITION_BEFORE_END),r=n)}r&&m.startContainer.type==CKEDITOR.NODE_ELEMENT&&m.startContainer.getName()in h&&(n=new CKEDITOR.dom.walker(m),n.evaluator=f,m.startContainer=n.next());r&&m.endContainer.type==CKEDITOR.NODE_ELEMENT&&m.endContainer.getName()in h&&(n=new CKEDITOR.dom.walker(m),n.evaluator=f,m.endContainer=n.previous());if(r)return b(r)}return 0}function f(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is("li")}function c(a){return e(a)&&h(a)}
+var e=CKEDITOR.dom.walker.whitespaces(!0),h=CKEDITOR.dom.walker.bookmark(!1,!0),m=CKEDITOR.TRISTATE_DISABLED,l=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(c){function b(b){d.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];b.on("key",function(a){if("wysiwyg"==b.mode&&a.data.keyCode==this.indentKey){var c=this.getContext(b.elementPath());!c||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,b.elementPath(),
+c)||(b.execCommand(this.relatedGlobal),a.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(a,b){var c=this.getContext(b),d=CKEDITOR.plugins.indentList.firstItemInPath(this.context,b,c);return c&&this.isIndent&&!d?l:m}:function(a,b){return!this.getContext(b)||this.isIndent?m:l},exec:CKEDITOR.tools.bind(a,this)}}var d=CKEDITOR.plugins.indent;d.registerCommands(c,{indentlist:new b(c,"indentlist",!0),outdentlist:new b(c,"outdentlist")});CKEDITOR.tools.extend(b.prototype,
+d.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(a,b,c){var e=b.contains(f);c||(c=b.contains(a));return c&&e&&e.equals(c.getFirst(f))}}(),CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var a=function(a){var c=this._,e=c.menu;c.state!==CKEDITOR.TRISTATE_DISABLED&&(c.on&&e?e.hide():(c.previousState=c.state,e||(e=c.menu=new CKEDITOR.menu(a,{panel:{className:"cke_menu_panel",attributes:{"aria-label":a.lang.common.options}}}),
+e.onHide=CKEDITOR.tools.bind(function(){var e=this.command?a.getCommand(this.command).modes:this.modes;this.setState(!e||e[a.mode]?c.previousState:CKEDITOR.TRISTATE_DISABLED);c.on=0},this),this.onMenu&&e.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),c.on=1,setTimeout(function(){e.show(CKEDITOR.document.getById(c.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(f){delete f.panel;this.base(f);this.hasArrow=!0;this.click=a},statics:{handler:{create:function(a){return new CKEDITOR.ui.menuButton(a)}}}})},
+beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}}),CKEDITOR.UI_MENUBUTTON="menubutton","use strict",function(){CKEDITOR.plugins.add("language",{requires:"menubutton",init:function(a){var f=a.config.language_list||["ar:Arabic:rtl","fr:French","es:Spanish"],c=this,e=a.lang.language,h={},m,l,k,b;a.addCommand("language",{allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",contextSensitive:!0,exec:function(a,b){var c=h["language_"+b];if(c)a[c.style.checkActive(a.elementPath(),
+a)?"removeStyle":"applyStyle"](c.style)},refresh:function(a){this.setState(c.getCurrentLangElement(a)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}});for(b=0;b<f.length;b++)m=f[b].split(":"),l=m[0],k="language_"+l,h[k]={label:m[1],langId:l,group:"language",order:b,ltr:"rtl"!=(""+m[2]).toLowerCase(),onClick:function(){a.execCommand("language",this.langId)},role:"menuitemcheckbox"},h[k].style=new CKEDITOR.style({element:"span",attributes:{lang:l,dir:h[k].ltr?"ltr":"rtl"}});h.language_remove={label:e.remove,
+group:"language_remove",state:CKEDITOR.TRISTATE_DISABLED,order:h.length,onClick:function(){var b=c.getCurrentLangElement(a);b&&a.execCommand("language",b.getAttribute("lang"))}};a.addMenuGroup("language",1);a.addMenuGroup("language_remove");a.addMenuItems(h);a.ui.add("Language",CKEDITOR.UI_MENUBUTTON,{label:e.button,allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",toolbar:"bidi,30",command:"language",onMenu:function(){var b={},e=c.getCurrentLangElement(a),f;for(f in h)b[f]=CKEDITOR.TRISTATE_OFF;
+b.language_remove=e?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;e&&(b["language_"+e.getAttribute("lang")]=CKEDITOR.TRISTATE_ON);return b}})},getCurrentLangElement:function(a){var f=a.elementPath();a=f&&f.elements;var c;if(f)for(var e=0;e<a.length;e++)f=a[e],!c&&"span"==f.getName()&&f.hasAttribute("dir")&&f.hasAttribute("lang")&&(c=f);return c}})}(),function(){function a(a,b,c){function d(c){if(!(!(l=k[c?"getFirst":"getLast"]())||l.is&&l.isBlockBoundary()||!(m=b.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||
+m.is&&m.isBlockBoundary({br:1})))a.document.createElement("br")[c?"insertBefore":"insertAfter"](l)}for(var e=CKEDITOR.plugins.list.listToArray(b.root,c),f=[],g=0;g<b.contents.length;g++){var h=b.contents[g];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(f.push(h),CKEDITOR.dom.element.setMarker(c,h,"list_item_processed",!0))}h=null;for(g=0;g<f.length;g++)h=f[g].getCustomData("listarray_index"),e[h].indent=-1;for(g=h+1;g<e.length;g++)if(e[g].indent>e[g-1].indent+1){f=e[g-1].indent+
+1-e[g].indent;for(h=e[g].indent;e[g]&&e[g].indent>=h;)e[g].indent+=f,g++;g--}var k=CKEDITOR.plugins.list.arrayToList(e,c,null,a.config.enterMode,b.root.getAttribute("dir")).listNode,l,m;d(!0);d();k.replace(b.root);a.fire("contentDomInvalidated")}function f(a,b){this.name=a;this.context=this.type=b;this.allowedContent=b+" li";this.requiredContent=b}function c(a,b,c,d){for(var e,f;e=a[d?"getLast":"getFirst"](v);)(f=e.getDirection(1))!==b.getDirection(1)&&e.setAttribute("dir",f),e.remove(),c?e[d?"insertBefore":
+"insertAfter"](c):b.append(e,d)}function e(a){function b(d){var e=a[d?"getPrevious":"getNext"](g);e&&e.type==CKEDITOR.NODE_ELEMENT&&e.is(a.getName())&&(c(a,e,null,!d),a.remove(),a=e)}b();b(1)}function h(a){return a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in CKEDITOR.dtd.$block||a.getName()in CKEDITOR.dtd.$listItem)&&CKEDITOR.dtd[a.getName()]["#"]}function m(a,b,d){a.fire("saveSnapshot");d.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var f=d.extractContents();b.trim(!1,!0);var h=b.createBookmark(),
+k=new CKEDITOR.dom.elementPath(b.startContainer),m=k.block,k=k.lastElement.getAscendant("li",1)||m,x=new CKEDITOR.dom.elementPath(d.startContainer),u=x.contains(CKEDITOR.dtd.$listItem),x=x.contains(CKEDITOR.dtd.$list);m?(m=m.getBogus())&&m.remove():x&&(m=x.getPrevious(g))&&p(m)&&m.remove();(m=f.getLast())&&m.type==CKEDITOR.NODE_ELEMENT&&m.is("br")&&m.remove();(m=b.startContainer.getChild(b.startOffset))?f.insertBefore(m):b.startContainer.append(f);u&&(f=l(u))&&(k.contains(u)?(c(f,u.getParent(),u),
+f.remove()):k.append(f));for(;d.checkStartOfBlock()&&d.checkEndOfBlock();){x=d.startPath();f=x.block;if(!f)break;f.is("li")&&(k=f.getParent(),f.equals(k.getLast(g))&&f.equals(k.getFirst(g))&&(f=k));d.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START);f.remove()}d=d.clone();f=a.editable();d.setEndAt(f,CKEDITOR.POSITION_BEFORE_END);d=new CKEDITOR.dom.walker(d);d.evaluator=function(a){return g(a)&&!p(a)};(d=d.next())&&d.type==CKEDITOR.NODE_ELEMENT&&d.getName()in CKEDITOR.dtd.$list&&e(d);b.moveToBookmark(h);
+b.select();a.fire("saveSnapshot")}function l(a){return(a=a.getLast(g))&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in k?a:null}var k={ol:1,ul:1},b=CKEDITOR.dom.walker.whitespaces(),d=CKEDITOR.dom.walker.bookmark(),g=function(a){return!(b(a)||d(a))},p=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(a,b,c,d,e){if(!k[a.getName()])return[];d||(d=0);c||(c=[]);for(var f=0,g=a.getChildCount();f<g;f++){var h=a.getChild(f);h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in CKEDITOR.dtd.$list&&
+CKEDITOR.plugins.list.listToArray(h,b,c,d+1);if("li"==h.$.nodeName.toLowerCase()){var l={parent:a,indent:d,element:h,contents:[]};e?l.grandparent=e:(l.grandparent=a.getParent(),l.grandparent&&"li"==l.grandparent.$.nodeName.toLowerCase()&&(l.grandparent=l.grandparent.getParent()));b&&CKEDITOR.dom.element.setMarker(b,h,"listarray_index",c.length);c.push(l);for(var m=0,p=h.getChildCount(),u;m<p;m++)u=h.getChild(m),u.type==CKEDITOR.NODE_ELEMENT&&k[u.getName()]?CKEDITOR.plugins.list.listToArray(u,b,c,
+d+1,l.grandparent):l.contents.push(u)}}return c},arrayToList:function(a,b,c,e,f){c||(c=0);if(!a||a.length<c+1)return null;for(var h,l=a[c].parent.getDocument(),m=new CKEDITOR.dom.documentFragment(l),p=null,u=c,v=Math.max(a[c].indent,0),C=null,G,E,J=e==CKEDITOR.ENTER_P?"p":"div";;){var I=a[u];h=I.grandparent;G=I.element.getDirection(1);if(I.indent==v){p&&a[u].parent.getName()==p.getName()||(p=a[u].parent.clone(!1,1),f&&p.setAttribute("dir",f),m.append(p));C=p.append(I.element.clone(0,1));G!=p.getDirection(1)&&
+C.setAttribute("dir",G);for(h=0;h<I.contents.length;h++)C.append(I.contents[h].clone(1,1));u++}else if(I.indent==Math.max(v,0)+1)I=a[u-1].element.getDirection(1),u=CKEDITOR.plugins.list.arrayToList(a,null,u,e,I!=G?G:null),!C.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=l.$.documentMode&&C.append(l.createText(" ")),C.append(u.listNode),u=u.nextIndex;else if(-1==I.indent&&!c&&h){k[h.getName()]?(C=I.element.clone(!1,!0),G!=h.getDirection(1)&&C.setAttribute("dir",G)):C=new CKEDITOR.dom.documentFragment(l);
+var p=h.getDirection(1)!=G,N=I.element,F=N.getAttribute("class"),P=N.getAttribute("style"),R=C.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(e!=CKEDITOR.ENTER_BR||p||P||F),L,Q=I.contents.length,O;for(h=0;h<Q;h++)if(L=I.contents[h],d(L)&&1<Q)R?O=L.clone(1,1):C.append(L.clone(1,1));else if(L.type==CKEDITOR.NODE_ELEMENT&&L.isBlockBoundary()){p&&!L.getDirection()&&L.setAttribute("dir",G);E=L;var U=N.getAttribute("style");U&&E.setAttribute("style",U.replace(/([^;])$/,"$1;")+(E.getAttribute("style")||""));F&&
+L.addClass(F);E=null;O&&(C.append(O),O=null);C.append(L.clone(1,1))}else R?(E||(E=l.createElement(J),C.append(E),p&&E.setAttribute("dir",G)),P&&E.setAttribute("style",P),F&&E.setAttribute("class",F),O&&(E.append(O),O=null),E.append(L.clone(1,1))):C.append(L.clone(1,1));O&&((E||C).append(O),O=null);C.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&u!=a.length-1&&(CKEDITOR.env.needsBrFiller&&(G=C.getLast())&&G.type==CKEDITOR.NODE_ELEMENT&&G.is("br")&&G.remove(),(G=C.getLast(g))&&G.type==CKEDITOR.NODE_ELEMENT&&
+G.is(CKEDITOR.dtd.$block)||C.append(l.createElement("br")));G=C.$.nodeName.toLowerCase();"div"!=G&&"p"!=G||C.appendBogus();m.append(C);p=null;u++}else return null;E=null;if(a.length<=u||Math.max(a[u].indent,0)<v)break}if(b)for(a=m.getFirst();a;){if(a.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(b,a),a.getName()in CKEDITOR.dtd.$listItem&&(c=a,l=f=e=void 0,e=c.getDirection()))){for(f=c.getParent();f&&!(l=f.getDirection());)f=f.getParent();e==l&&c.removeAttribute("dir")}a=a.getNextSourceNode()}return{listNode:m,
+nextIndex:u}}};var u=/^h[1-6]$/,v=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);f.prototype={exec:function(b){this.refresh(b,b.elementPath());var c=b.config,d=b.getSelection(),f=d&&d.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var h=b.editable();if(h.getFirst(g)){var l=1==f.length&&f[0];(c=l&&l.getEnclosedNode())&&c.is&&this.type==c.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else c.enterMode==CKEDITOR.ENTER_BR?h.appendBogus():f[0].fixBlock(1,c.enterMode==CKEDITOR.ENTER_P?"p":"div"),
+d.selectRanges(f)}for(var c=d.createBookmarks(!0),h=[],m={},f=f.createIterator(),p=0;(l=f.getNextRange())&&++p;){var v=l.getBoundaryNodes(),y=v.startNode,z=v.endNode;y.type==CKEDITOR.NODE_ELEMENT&&"td"==y.getName()&&l.setStartAt(v.startNode,CKEDITOR.POSITION_AFTER_START);z.type==CKEDITOR.NODE_ELEMENT&&"td"==z.getName()&&l.setEndAt(v.endNode,CKEDITOR.POSITION_BEFORE_END);l=l.createIterator();for(l.forceBrBreak=this.state==CKEDITOR.TRISTATE_OFF;v=l.getNextParagraph();)if(!v.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(m,
+v,"list_block",1);for(var C=b.elementPath(v),y=C.elements,z=0,C=C.blockLimit,G,E=y.length-1;0<=E&&(G=y[E]);E--)if(k[G.getName()]&&C.contains(G)){C.removeCustomData("list_group_object_"+p);(y=G.getCustomData("list_group_object"))?y.contents.push(v):(y={root:G,contents:[v]},h.push(y),CKEDITOR.dom.element.setMarker(m,G,"list_group_object",y));z=1;break}z||(z=C,z.getCustomData("list_group_object_"+p)?z.getCustomData("list_group_object_"+p).contents.push(v):(y={root:z,contents:[v]},CKEDITOR.dom.element.setMarker(m,
+z,"list_group_object_"+p,y),h.push(y)))}}for(G=[];0<h.length;)if(y=h.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(k[y.root.getName()]){f=b;p=y;y=m;l=G;z=CKEDITOR.plugins.list.listToArray(p.root,y);C=[];for(v=0;v<p.contents.length;v++)E=p.contents[v],(E=E.getAscendant("li",!0))&&!E.getCustomData("list_item_processed")&&(C.push(E),CKEDITOR.dom.element.setMarker(y,E,"list_item_processed",!0));for(var E=p.root.getDocument(),J=void 0,I=void 0,v=0;v<C.length;v++){var N=C[v].getCustomData("listarray_index"),
+J=z[N].parent;J.is(this.type)||(I=E.createElement(this.type),J.copyAttributes(I,{start:1,type:1}),I.removeStyle("list-style-type"),z[N].parent=I)}y=CKEDITOR.plugins.list.arrayToList(z,y,null,f.config.enterMode);z=void 0;C=y.listNode.getChildCount();for(v=0;v<C&&(z=y.listNode.getChild(v));v++)z.getName()==this.type&&l.push(z);y.listNode.replace(p.root);f.fire("contentDomInvalidated")}else{z=b;l=y;v=G;C=l.contents;f=l.root.getDocument();p=[];1==C.length&&C[0].equals(l.root)&&(y=f.createElement("div"),
+C[0].moveChildren&&C[0].moveChildren(y),C[0].append(y),C[0]=y);l=l.contents[0].getParent();for(E=0;E<C.length;E++)l=l.getCommonAncestor(C[E].getParent());J=z.config.useComputedState;z=y=void 0;J=void 0===J||J;for(E=0;E<C.length;E++)for(I=C[E];N=I.getParent();){if(N.equals(l)){p.push(I);!z&&I.getDirection()&&(z=1);I=I.getDirection(J);null!==y&&(y=y&&y!=I?null:I);break}I=N}if(!(1>p.length)){C=p[p.length-1].getNext();E=f.createElement(this.type);v.push(E);for(J=v=void 0;p.length;)v=p.shift(),J=f.createElement("li"),
+I=v,I.is("pre")||u.test(I.getName())||"false"==I.getAttribute("contenteditable")?v.appendTo(J):(v.copyAttributes(J),y&&v.getDirection()&&(J.removeStyle("direction"),J.removeAttribute("dir")),v.moveChildren(J),v.remove()),J.appendTo(E);y&&z&&E.setAttribute("dir",y);C?E.insertBefore(C):E.appendTo(l)}}else this.state==CKEDITOR.TRISTATE_ON&&k[y.root.getName()]&&a.call(this,b,y,m);for(E=0;E<G.length;E++)e(G[E]);CKEDITOR.dom.element.clearAllMarkers(m);d.selectBookmarks(c);b.focus()},refresh:function(a,
+b){var c=b.contains(k,1),d=b.blockLimit||b.root;c&&d.contains(c)?this.setState(c.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(a){a.blockless||(a.addCommand("numberedlist",new f("numberedlist","ol")),a.addCommand("bulletedlist",new f("bulletedlist","ul")),a.ui.addButton&&(a.ui.addButton("NumberedList",{label:a.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),
+a.ui.addButton("BulletedList",{label:a.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),a.on("key",function(b){var c=b.data.domEvent.getKey(),d;if("wysiwyg"==a.mode&&c in{8:1,46:1}){var e=a.getSelection().getRanges()[0],f=e&&e.startPath();if(e&&e.collapsed){var t=8==c,v=a.editable(),u=new CKEDITOR.dom.walker(e.clone());u.evaluator=function(a){return g(a)&&!p(a)};u.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};c=e.clone();if(t){var y;
+(y=f.contains(k))&&e.checkBoundaryOfElement(y,CKEDITOR.START)&&(y=y.getParent())&&y.is("li")&&(y=l(y))?(d=y,y=y.getPrevious(g),c.moveToPosition(y&&p(y)?y:d,CKEDITOR.POSITION_BEFORE_START)):(u.range.setStartAt(v,CKEDITOR.POSITION_AFTER_START),u.range.setEnd(e.startContainer,e.startOffset),(y=u.previous())&&y.type==CKEDITOR.NODE_ELEMENT&&(y.getName()in k||y.is("li"))&&(y.is("li")||(u.range.selectNodeContents(y),u.reset(),u.evaluator=h,y=u.previous()),d=y,c.moveToElementEditEnd(d),c.moveToPosition(c.endPath().block,
+CKEDITOR.POSITION_BEFORE_END)));if(d)m(a,c,e),b.cancel();else{var z=f.contains(k);z&&e.checkBoundaryOfElement(z,CKEDITOR.START)&&(d=z.getFirst(g),e.checkBoundaryOfElement(d,CKEDITOR.START)&&(y=z.getPrevious(g),l(d)?y&&(e.moveToElementEditEnd(y),e.select()):a.execCommand("outdent"),b.cancel()))}}else if(d=f.contains("li")){if(u.range.setEndAt(v,CKEDITOR.POSITION_BEFORE_END),t=(v=d.getLast(g))&&h(v)?v:d,f=0,(y=u.next())&&y.type==CKEDITOR.NODE_ELEMENT&&y.getName()in k&&y.equals(v)?(f=1,y=u.next()):e.checkBoundaryOfElement(t,
+CKEDITOR.END)&&(f=2),f&&y){e=e.clone();e.moveToElementEditStart(y);if(1==f&&(c.optimize(),!c.startContainer.equals(d))){for(d=c.startContainer;d.is(CKEDITOR.dtd.$inline);)z=d,d=d.getParent();z&&c.moveToPosition(z,CKEDITOR.POSITION_AFTER_END)}2==f&&(c.moveToPosition(c.endPath().block,CKEDITOR.POSITION_BEFORE_END),e.endPath().block&&e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_AFTER_START));m(a,c,e);b.cancel()}}else u.range.setEndAt(v,CKEDITOR.POSITION_BEFORE_END),(y=u.next())&&y.type==CKEDITOR.NODE_ELEMENT&&
+y.is(k)&&(y=y.getFirst(g),f.block&&e.checkStartOfBlock()&&e.checkEndOfBlock()?(f.block.remove(),e.moveToElementEditStart(y),e.select()):l(y)?(e.moveToElementEditStart(y),e.select()):(e=e.clone(),e.moveToElementEditStart(y),m(a,c,e)),b.cancel());setTimeout(function(){a.selectionChange(1)})}}}))}})}(),"use strict",function(){function a(a,b,c){return p(b)&&p(c)&&c.equals(b.getNext(function(a){return!(ba(a)||Y(a)||u(a))}))}function f(a){this.upper=a[0];this.lower=a[1];this.set.apply(this,a.slice(2))}
+function c(a){var b=a.element;if(b&&p(b)&&(b=b.getAscendant(a.triggers,!0))&&a.editable.contains(b)){var c=l(b);if("true"==c.getAttribute("contenteditable"))return b;if(c.is(a.triggers))return c}return null}function e(a,b,c){t(a,b);t(a,c);a=b.size.bottom;c=c.size.top;return a&&c?0|(a+c)/2:a||c}function h(a,b,c){return b=b[c?"getPrevious":"getNext"](function(b){return b&&b.type==CKEDITOR.NODE_TEXT&&!ba(b)||p(b)&&!u(b)&&!g(a,b)})}function m(a,b,c){return a>b&&a<c}function l(a,b){if(a.data("cke-editable"))return null;
+for(b||(a=a.getParent());a&&!a.data("cke-editable");){if(a.hasAttribute("contenteditable"))return a;a=a.getParent()}return null}function k(a){var c=a.doc,d=G('\x3cspan contenteditable\x3d"false" style\x3d"'+T+"position:absolute;border-top:1px dashed "+a.boxColor+'"\x3e\x3c/span\x3e',c),e=CKEDITOR.getUrl(this.path+"images/"+(E.hidpi?"hidpi/":"")+"icon"+(a.rtl?"-rtl":"")+".png");z(d,{attach:function(){this.wrap.getParent()||this.wrap.appendTo(a.editable,!0);return this},lineChildren:[z(G('\x3cspan title\x3d"'+
+a.editor.lang.magicline.title+'" contenteditable\x3d"false"\x3e\x26#8629;\x3c/span\x3e',c),{base:T+"height:17px;width:17px;"+(a.rtl?"left":"right")+":17px;background:url("+e+") center no-repeat "+a.boxColor+";cursor:pointer;"+(E.hc?"font-size: 15px;line-height:14px;border:1px solid #fff;text-align:center;":"")+(E.hidpi?"background-size: 9px 10px;":""),looks:["top:-8px; border-radius: 2px;","top:-17px; border-radius: 2px 2px 0px 0px;","top:-1px; border-radius: 0px 0px 2px 2px;"]}),z(G(X,c),{base:aa+
+"left:0px;border-left-color:"+a.boxColor+";",looks:["border-width:8px 0 8px 8px;top:-8px","border-width:8px 0 0 8px;top:-8px","border-width:0 0 8px 8px;top:0px"]}),z(G(X,c),{base:aa+"right:0px;border-right-color:"+a.boxColor+";",looks:["border-width:8px 8px 8px 0;top:-8px","border-width:8px 8px 0 0;top:-8px","border-width:0 8px 8px 0;top:0px"]})],detach:function(){this.wrap.getParent()&&this.wrap.remove();return this},mouseNear:function(){t(a,this);var b=a.holdDistance,c=this.size;return c&&m(a.mouse.y,
+c.top-b,c.bottom+b)&&m(a.mouse.x,c.left-b,c.right+b)?!0:!1},place:function(){var b=a.view,c=a.editable,d=a.trigger,e=d.upper,f=d.lower,g=e||f,h=g.getParent(),k={};this.trigger=d;e&&t(a,e,!0);f&&t(a,f,!0);t(a,h,!0);a.inInlineMode&&x(a,!0);h.equals(c)?(k.left=b.scroll.x,k.right=-b.scroll.x,k.width=""):(k.left=g.size.left-g.size.margin.left+b.scroll.x-(a.inInlineMode?b.editable.left+b.editable.border.left:0),k.width=g.size.outerWidth+g.size.margin.left+g.size.margin.right+b.scroll.x,k.right="");e&&f?
 k.top=e.size.margin.bottom===f.size.margin.top?0|e.size.bottom+e.size.margin.bottom/2:e.size.margin.bottom<f.size.margin.top?e.size.bottom+e.size.margin.bottom:e.size.bottom+e.size.margin.bottom-f.size.margin.top:e?f||(k.top=e.size.bottom+e.size.margin.bottom):k.top=f.size.top-f.size.margin.top;d.is(Q)||m(k.top,b.scroll.y-15,b.scroll.y+5)?(k.top=a.inInlineMode?0:b.scroll.y,this.look(Q)):d.is(O)||m(k.top,b.pane.bottom-5,b.pane.bottom+15)?(k.top=a.inInlineMode?b.editable.height+b.editable.padding.top+
-b.editable.padding.bottom:b.pane.bottom-1,this.look(O)):(a.inInlineMode&&(k.top-=b.editable.top+b.editable.border.top),this.look(U));a.inInlineMode&&(k.top--,k.top+=b.editable.scroll.top,k.left+=b.editable.scroll.left);for(var l in k)k[l]=CKEDITOR.tools.cssLength(k[l]);this.setStyles(k)},look:function(a){if(this.oldLook!=a){for(var b=this.lineChildren.length,c;b--;)(c=this.lineChildren[b]).setAttribute("style",c.base+c.looks[0|a/2]);this.oldLook=a}},wrap:new D("span",a.doc)});for(c=d.lineChildren.length;c--;)d.lineChildren[c].appendTo(d);
-d.look(U);d.appendTo(d.wrap);d.unselectable();d.lineChildren[0].on("mouseup",function(c){d.detach();b(a,function(b){var c=a.line.trigger;b[c.is(E)?"insertBefore":"insertAfter"](c.is(E)?c.lower:c.upper)},!0);a.editor.focus();F.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();c.data.preventDefault(!0)});d.on("mousedown",function(a){a.data.preventDefault(!0)});a.line=d}function b(a,b,c){var d=new CKEDITOR.dom.range(a.doc),e=a.editor,f;F.ie&&a.enterMode==CKEDITOR.ENTER_BR?f=a.doc.createText(K):
-(f=(f=l(a.element,!0))&&f.data("cke-enter-mode")||a.enterMode,f=new D(N[f],a.doc),f.is("br")||a.doc.createText(K).appendTo(f));c&&e.fire("saveSnapshot");b(f);d.moveToPosition(f,CKEDITOR.POSITION_AFTER_START);e.getSelection().selectRanges([d]);a.hotNode=f;c&&e.fire("saveSnapshot")}function d(a,d){return{canUndo:!0,modes:{wysiwyg:1},exec:function(){function e(c){var f=F.ie&&9>F.version?" ":K,h=a.hotNode&&a.hotNode.getText()==f&&a.element.equals(a.hotNode)&&a.lastCmdDirection===!!d;b(a,function(b){h&&
-a.hotNode&&a.hotNode.remove();b[d?"insertAfter":"insertBefore"](c);b.setAttributes({"data-cke-magicline-hot":1,"data-cke-magicline-dir":!!d});a.lastCmdDirection=!!d});F.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();a.line.detach()}return function(b){b=b.getSelection().getStartElement();var h;b=b.getAscendant(M,1);if(!n(a,b)&&b&&!b.equals(a.editable)&&!b.contains(a.editable)){(h=l(b))&&"false"==h.getAttribute("contenteditable")&&(b=h);a.element=b;h=f(a,b,!d);var g;p(h)&&h.is(a.triggers)&&
-h.is(H)&&(!f(a,h,!d)||(g=f(a,h,!d))&&p(g)&&g.is(a.triggers))?e(h):(g=c(a,b),p(g)&&(f(a,g,!d)?(b=f(a,g,!d))&&p(b)&&b.is(a.triggers)&&e(g):e(g)))}}}()}}function h(a,b){if(!b||b.type!=CKEDITOR.NODE_ELEMENT||!b.$)return!1;var c=a.line;return c.wrap.equals(b)||c.wrap.contains(b)}function p(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.$}function v(a){if(!p(a))return!1;var b;(b=u(a))||(p(a)?(b={left:1,right:1,center:1},b=!(!b[a.getComputedStyle("float")]&&!b[a.getAttribute("align")])):b=!1);return b}function u(a){return!!{absolute:1,
-fixed:1}[a.getComputedStyle("position")]}function t(a,b){return p(b)?b.is(a.triggers):null}function n(a,b){if(!b)return!1;for(var c=b.getParents(1),d=c.length;d--;)for(var e=a.tabuList.length;e--;)if(c[d].hasAttribute(a.tabuList[e]))return!0;return!1}function q(a,b,c){b=b[c?"getLast":"getFirst"](function(b){return a.isRelevant(b)&&!b.is(R)});if(!b)return!1;r(a,b);return c?b.size.top>a.mouse.y:b.size.bottom<a.mouse.y}function w(a){var b=a.editable,c=a.mouse,d=a.view,f=a.triggerOffset;x(a);var g=c.y>
-(a.inInlineMode?d.editable.top+d.editable.height/2:Math.min(d.editable.height,d.pane.height)/2),b=b[g?"getLast":"getFirst"](function(a){return!(ba(a)||Y(a))});if(!b)return null;h(a,b)&&(b=a.line.wrap[g?"getPrevious":"getNext"](function(a){return!(ba(a)||Y(a))}));if(!p(b)||v(b)||!t(a,b))return null;r(a,b);return!g&&0<=b.size.top&&m(c.y,0,b.size.top+f)?(a=a.inInlineMode||0===d.scroll.y?Q:U,new e([null,b,E,L,a])):g&&b.size.bottom<=d.pane.height&&m(c.y,b.size.bottom-f,d.pane.height)?(a=a.inInlineMode||
-m(b.size.bottom,d.pane.height-f,d.pane.height)?O:U,new e([b,null,P,L,a])):null}function y(a){var b=a.mouse,d=a.view,h=a.triggerOffset,g=c(a);if(!g)return null;r(a,g);var h=Math.min(h,0|g.size.outerHeight/2),k=[],l,n;if(m(b.y,g.size.top-1,g.size.top+h))n=!1;else if(m(b.y,g.size.bottom-h,g.size.bottom+1))n=!0;else return null;if(v(g)||q(a,g,n)||g.getParent().is(V))return null;var H=f(a,g,!n);if(H){if(H&&H.type==CKEDITOR.NODE_TEXT)return null;if(p(H)){if(v(H)||!t(a,H)||H.getParent().is(V))return null;
-k=[H,g][n?"reverse":"concat"]().concat([T,L])}}else g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?(x(a),n&&m(b.y,g.size.bottom-h,d.pane.height)&&m(g.size.bottom,d.pane.height-h,d.pane.height)?l=O:m(b.y,0,g.size.top+h)&&(l=Q)):l=U,k=[null,g][n?"reverse":"concat"]().concat([n?P:E,L,l,g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?n?O:Q:U]);return 0 in k?new e(k):null}function C(a,b,c,d){for(var e=b.getDocumentPosition(),f={},h={},g={},k={},l=ca.length;l--;)f[ca[l]]=parseInt(b.getComputedStyle.call(b,
-"border-"+ca[l]+"-width"),10)||0,g[ca[l]]=parseInt(b.getComputedStyle.call(b,"padding-"+ca[l]),10)||0,h[ca[l]]=parseInt(b.getComputedStyle.call(b,"margin-"+ca[l]),10)||0;c&&!d||B(a,d);k.top=e.y-(c?0:a.view.scroll.y);k.left=e.x-(c?0:a.view.scroll.x);k.outerWidth=b.$.offsetWidth;k.outerHeight=b.$.offsetHeight;k.height=k.outerHeight-(g.top+g.bottom+f.top+f.bottom);k.width=k.outerWidth-(g.left+g.right+f.left+f.right);k.bottom=k.top+k.outerHeight;k.right=k.left+k.outerWidth;a.inInlineMode&&(k.scroll={top:b.$.scrollTop,
-left:b.$.scrollLeft});return z({border:f,padding:g,margin:h,ignoreScroll:c},k,!0)}function r(a,b,c){if(!p(b))return b.size=null;if(!b.size)b.size={};else if(b.size.ignoreScroll==c&&b.size.date>new Date-W)return null;return z(b.size,C(a,b,c),{date:+new Date},!0)}function x(a,b){a.view.editable=C(a,a.editable,b,!0)}function B(a,b){a.view||(a.view={});var c=a.view;if(!(!b&&c&&c.date>new Date-W)){var d=a.win,c=d.getScrollPosition(),d=d.getViewPaneSize();z(a.view,{scroll:{x:c.x,y:c.y,width:a.doc.$.documentElement.scrollWidth-
-d.width,height:a.doc.$.documentElement.scrollHeight-d.height},pane:{width:d.width,height:d.height,bottom:d.height+c.y},date:+new Date},!0)}}function A(a,b,c,d){for(var f=d,h=d,g=0,k=!1,l=!1,n=a.view.pane.height,m=a.mouse;m.y+g<n&&0<m.y-g;){k||(k=b(f,d));l||(l=b(h,d));!k&&0<m.y-g&&(f=c(a,{x:m.x,y:m.y-g}));!l&&m.y+g<n&&(h=c(a,{x:m.x,y:m.y+g}));if(k&&l)break;g+=2}return new e([f,h,null,null])}CKEDITOR.plugins.add("magicline",{init:function(a){var g=a.config,l=g.magicline_triggerOffset||30,m={editor:a,
-enterMode:g.enterMode,triggerOffset:l,holdDistance:0|l*(g.magicline_holdDistance||.5),boxColor:g.magicline_color||"#ff0000",rtl:"rtl"==g.contentsLangDirection,tabuList:["data-cke-hidden-sel"].concat(g.magicline_tabuList||[]),triggers:g.magicline_everywhere?M:{table:1,hr:1,div:1,ul:1,ol:1,dl:1,form:1,blockquote:1}},H,q,t;m.isRelevant=function(a){return p(a)&&!h(m,a)&&!v(a)};a.on("contentDom",function(){var l=a.editable(),p=a.document,r=a.window;z(m,{editable:l,inInlineMode:l.isInline(),doc:p,win:r,
-hotNode:null},!0);m.boundary=m.inInlineMode?m.editable:m.doc.getDocumentElement();l.is(I.$inline)||(m.inInlineMode&&!u(l)&&l.setStyles({position:"relative",top:null,left:null}),k.call(this,m),B(m),l.attachListener(a,"beforeUndoImage",function(){m.line.detach()}),l.attachListener(a,"beforeGetData",function(){m.line.wrap.getParent()&&(m.line.detach(),a.once("getData",function(){m.line.attach()},null,null,1E3))},null,null,0),l.attachListener(m.inInlineMode?p:p.getWindow().getFrame(),"mouseout",function(b){if("wysiwyg"==
-a.mode)if(m.inInlineMode){var c=b.data.$.clientX;b=b.data.$.clientY;B(m);x(m,!0);var d=m.view.editable,e=m.view.scroll;c>d.left-e.x&&c<d.right-e.x&&b>d.top-e.y&&b<d.bottom-e.y||(clearTimeout(t),t=null,m.line.detach())}else clearTimeout(t),t=null,m.line.detach()}),l.attachListener(l,"keyup",function(){m.hiddenMode=0}),l.attachListener(l,"keydown",function(b){if("wysiwyg"==a.mode)switch(b.data.getKeystroke()){case 2228240:case 16:m.hiddenMode=1,m.line.detach()}}),l.attachListener(m.inInlineMode?l:p,
-"mousemove",function(b){q=!0;if("wysiwyg"==a.mode&&!a.readOnly&&!t){var c={x:b.data.$.clientX,y:b.data.$.clientY};t=setTimeout(function(){m.mouse=c;t=m.trigger=null;B(m);q&&!m.hiddenMode&&a.focusManager.hasFocus&&!m.line.mouseNear()&&(m.element=da(m,!0))&&((m.trigger=w(m)||y(m)||ea(m))&&!n(m,m.trigger.upper||m.trigger.lower)?m.line.attach().place():(m.trigger=null,m.line.detach()),q=!1)},30)}}),l.attachListener(r,"scroll",function(){"wysiwyg"==a.mode&&(m.line.detach(),F.webkit&&(m.hiddenMode=1,clearTimeout(H),
-H=setTimeout(function(){m.mouseDown||(m.hiddenMode=0)},50)))}),l.attachListener(J?p:r,"mousedown",function(){"wysiwyg"==a.mode&&(m.line.detach(),m.hiddenMode=1,m.mouseDown=1)}),l.attachListener(J?p:r,"mouseup",function(){m.hiddenMode=0;m.mouseDown=0}),a.addCommand("accessPreviousSpace",d(m)),a.addCommand("accessNextSpace",d(m,!0)),a.setKeystroke([[g.magicline_keystrokePrevious,"accessPreviousSpace"],[g.magicline_keystrokeNext,"accessNextSpace"]]),a.on("loadSnapshot",function(){var b,c,d,e;for(e in{p:1,
-br:1,div:1})for(b=a.document.getElementsByTag(e),d=b.count();d--;)if((c=b.getItem(d)).data("cke-magicline-hot")){m.hotNode=c;m.lastCmdDirection="true"===c.data("cke-magicline-dir")?!0:!1;return}}),this.backdoor={accessFocusSpace:b,boxTrigger:e,isLine:h,getAscendantTrigger:c,getNonEmptyNeighbour:f,getSize:C,that:m,triggerEdge:y,triggerEditable:w,triggerExpand:ea})},this)}});var z=CKEDITOR.tools.extend,D=CKEDITOR.dom.element,G=D.createFromHtml,F=CKEDITOR.env,J=CKEDITOR.env.ie&&9>CKEDITOR.env.version,
-I=CKEDITOR.dtd,N={},E=128,P=64,T=32,L=16,Q=4,O=2,U=1,K=" ",V=I.$listItem,R=I.$tableContent,H=z({},I.$nonEditable,I.$empty),M=I.$block,W=100,S="width:0px;height:0px;padding:0px;margin:0px;display:block;z-index:9999;color:#fff;position:absolute;font-size: 0px;line-height:0px;",aa=S+"border-color:transparent;display:block;border-style:solid;",X="\x3cspan\x3e"+K+"\x3c/span\x3e";N[CKEDITOR.ENTER_BR]="br";N[CKEDITOR.ENTER_P]="p";N[CKEDITOR.ENTER_DIV]="div";e.prototype={set:function(a,b,c){this.properties=
-a+b+(c||U);return this},is:function(a){return(this.properties&a)==a}};var da=function(){function a(b,c){var d=b.$.elementFromPoint(c.x,c.y);return d&&d.nodeType?new CKEDITOR.dom.element(d):null}return function(b,c,d){if(!b.mouse)return null;var e=b.doc,f=b.line.wrap;d=d||b.mouse;var g=a(e,d);c&&h(b,g)&&(f.hide(),g=a(e,d),f.show());return!g||g.type!=CKEDITOR.NODE_ELEMENT||!g.$||F.ie&&9>F.version&&!b.boundary.equals(g)&&!b.boundary.contains(g)?null:g}}(),ba=CKEDITOR.dom.walker.whitespaces(),Y=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_COMMENT),
-ea=function(){function b(d){var e=d.element,f,h,k;if(!p(e)||e.contains(d.editable)||e.isReadOnly())return null;k=A(d,function(a,b){return!b.equals(a)},function(a,b){return da(a,!0,b)},e);f=k.upper;h=k.lower;if(a(d,f,h))return k.set(T,8);if(f&&e.contains(f))for(;!f.getParent().equals(e);)f=f.getParent();else f=e.getFirst(function(a){return c(d,a)});if(h&&e.contains(h))for(;!h.getParent().equals(e);)h=h.getParent();else h=e.getLast(function(a){return c(d,a)});if(!f||!h)return null;r(d,f);r(d,h);if(!m(d.mouse.y,
-f.size.top,h.size.bottom))return null;for(var e=Number.MAX_VALUE,l,n,H,q;h&&!h.equals(f)&&(n=f.getNext(d.isRelevant));)l=Math.abs(g(d,f,n)-d.mouse.y),l<e&&(e=l,H=f,q=n),f=n,r(d,f);if(!H||!q||!m(d.mouse.y,H.size.top,q.size.bottom))return null;k.upper=H;k.lower=q;return k.set(T,8)}function c(a,b){return!(b&&b.type==CKEDITOR.NODE_TEXT||Y(b)||v(b)||h(a,b)||b.type==CKEDITOR.NODE_ELEMENT&&b.$&&b.is("br"))}return function(c){var d=b(c),e;if(e=d){e=d.upper;var f=d.lower;e=!e||!f||v(f)||v(e)||f.equals(e)||
-e.equals(f)||f.contains(e)||e.contains(f)?!1:t(c,e)&&t(c,f)&&a(c,e,f)?!0:!1}return e?d:null}}(),ca=["top","left","right","bottom"]}(),CKEDITOR.config.magicline_keystrokePrevious=CKEDITOR.CTRL+CKEDITOR.SHIFT+51,CKEDITOR.config.magicline_keystrokeNext=CKEDITOR.CTRL+CKEDITOR.SHIFT+52,function(){function a(a){if(!a||a.type!=CKEDITOR.NODE_ELEMENT||"form"!=a.getName())return[];for(var c=[],e=["style","className"],b=0;b<e.length;b++){var d=a.$.elements.namedItem(e[b]);d&&(d=new CKEDITOR.dom.element(d),c.push([d,
-d.nextSibling]),d.remove())}return c}function e(a,c){if(a&&a.type==CKEDITOR.NODE_ELEMENT&&"form"==a.getName()&&0<c.length)for(var e=c.length-1;0<=e;e--){var b=c[e][0],d=c[e][1];d?b.insertBefore(d):b.appendTo(a)}}function c(c,f){var g=a(c),b={},d=c.$;f||(b["class"]=d.className||"",d.className="");b.inline=d.style.cssText||"";f||(d.style.cssText="position: static; overflow: visible");e(g);return b}function g(c,f){var g=a(c),b=c.$;"class"in f&&(b.className=f["class"]);"inline"in f&&(b.style.cssText=
-f.inline);e(g)}function f(a){if(!a.editable().isInline()){var c=CKEDITOR.instances,e;for(e in c){var b=c[e];"wysiwyg"!=b.mode||b.readOnly||(b=b.document.getBody(),b.setAttribute("contentEditable",!1),b.setAttribute("contentEditable",!0))}a.editable().hasFocus&&(a.toolbox.focus(),a.focus())}}CKEDITOR.plugins.add("maximize",{init:function(a){function e(){var b=d.getViewPaneSize();a.resize(b.width,b.height,null,!0)}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var k=a.lang,b=CKEDITOR.document,d=b.getWindow(),
-h,p,v,u=CKEDITOR.TRISTATE_OFF;a.addCommand("maximize",{modes:{wysiwyg:!CKEDITOR.env.iOS,source:!CKEDITOR.env.iOS},readOnly:1,editorFocus:!1,exec:function(){var t=a.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}),n=a.ui.space("contents");if("wysiwyg"==a.mode){var q=a.getSelection();h=q&&q.getRanges();p=d.getScrollPosition()}else{var w=a.editable().$;h=!CKEDITOR.env.ie&&[w.selectionStart,w.selectionEnd];p=[w.scrollLeft,w.scrollTop]}if(this.state==CKEDITOR.TRISTATE_OFF){d.on("resize",
-e);v=d.getScrollPosition();for(q=a.container;q=q.getParent();)q.setCustomData("maximize_saved_styles",c(q)),q.setStyle("z-index",a.config.baseFloatZIndex-5);n.setCustomData("maximize_saved_styles",c(n,!0));t.setCustomData("maximize_saved_styles",c(t,!0));n={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};b.getDocumentElement().setStyles(n);!CKEDITOR.env.gecko&&b.getDocumentElement().setStyle("position","fixed");CKEDITOR.env.gecko&&CKEDITOR.env.quirks||b.getBody().setStyles(n);CKEDITOR.env.ie?
-setTimeout(function(){d.$.scrollTo(0,0)},0):d.$.scrollTo(0,0);t.setStyle("position",CKEDITOR.env.gecko&&CKEDITOR.env.quirks?"fixed":"absolute");t.$.offsetLeft;t.setStyles({"z-index":a.config.baseFloatZIndex-5,left:"0px",top:"0px"});t.addClass("cke_maximized");e();n=t.getDocumentPosition();t.setStyles({left:-1*n.x+"px",top:-1*n.y+"px"});CKEDITOR.env.gecko&&f(a)}else if(this.state==CKEDITOR.TRISTATE_ON){d.removeListener("resize",e);for(var q=[n,t],y=0;y<q.length;y++)g(q[y],q[y].getCustomData("maximize_saved_styles")),
-q[y].removeCustomData("maximize_saved_styles");for(q=a.container;q=q.getParent();)g(q,q.getCustomData("maximize_saved_styles")),q.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){d.$.scrollTo(v.x,v.y)},0):d.$.scrollTo(v.x,v.y);t.removeClass("cke_maximized");CKEDITOR.env.webkit&&(t.setStyle("display","inline"),setTimeout(function(){t.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:n.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();
-if(q=this.uiItems[0])n=this.state==CKEDITOR.TRISTATE_OFF?k.maximize.maximize:k.maximize.minimize,q=CKEDITOR.document.getById(q._.id),q.getChild(1).setHtml(n),q.setAttribute("title",n),q.setAttribute("href",'javascript:void("'+n+'");');"wysiwyg"==a.mode?h?(CKEDITOR.env.gecko&&f(a),a.getSelection().selectRanges(h),(w=a.getSelection().getStartElement())&&w.scrollIntoView(!0)):d.$.scrollTo(p.x,p.y):(h&&(w.selectionStart=h[0],w.selectionEnd=h[1]),w.scrollLeft=p[0],w.scrollTop=p[1]);h=p=null;u=this.state;
-a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:k.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:u)},null,null,100)}}})}(),function(){var a={canUndo:!1,async:!0,exec:function(e){e.getClipboardData({title:e.lang.pastetext.title},function(c){c&&e.fire("paste",{type:"text",dataValue:c.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});
-e.fire("afterCommandExec",{name:"pastetext",command:a,returnValue:!!c})})}};CKEDITOR.plugins.add("pastetext",{requires:"clipboard",init:function(e){e.addCommand("pastetext",a);e.ui.addButton&&e.ui.addButton("PasteText",{label:e.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(e.config.forcePasteAsPlainText)e.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});e.on("pasteState",function(a){e.getCommand("pastetext").setState(a.data)})}})}(),function(){function a(a,
-e,f){var m=CKEDITOR.cleanWord;m?f():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||e+"filter/default.js"),CKEDITOR.scriptLoader.load(a,f,null,!0));return!m}function e(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(c){var g=0,f=this.path;c.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var c=this;g=1;a.once("beforePaste",e);a.getClipboardData({title:a.lang.pastefromword.title},function(e){e&&a.fire("paste",{type:"html",dataValue:e.dataValue,
-method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:c,returnValue:!!e})})}});c.ui.addButton&&c.ui.addButton("PasteFromWord",{label:c.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});c.on("pasteState",function(a){c.getCommand("pastefromword").setState(a.data)});c.on("paste",function(e){var l=e.data,k=l.dataValue;if(k&&(g||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(k))){l.dontFilter=
-!0;var b=a(c,f,function(){if(b)c.fire("paste",l);else if(!c.config.pasteFromWordPromptCleanup||g||confirm(c.lang.pastefromword.confirmCleanup))l.dataValue=CKEDITOR.cleanWord(k,c);g=0});b&&e.cancel()}},null,null,3)}})}(),CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}),CKEDITOR.plugins.removeformat=
-{commands:{removeformat:{exec:function(a){for(var e=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),c=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),g=CKEDITOR.plugins.removeformat.filter,f=a.getSelection().getRanges(),m=f.createIterator(),l=function(a){return a.type==CKEDITOR.NODE_ELEMENT},k;k=m.getNextRange();){k.collapsed||k.enlarge(CKEDITOR.ENLARGE_ELEMENT);var b=k.createBookmark(),
-d=b.startNode,h=b.endNode,p=function(b){for(var c=a.elementPath(b),d=c.elements,f=1,h;(h=d[f])&&!h.equals(c.block)&&!h.equals(c.blockLimit);f++)e.test(h.getName())&&g(a,h)&&b.breakParent(h)};p(d);if(h)for(p(h),d=d.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);d&&!d.equals(h);)if(d.isReadOnly()){if(d.getPosition(h)&CKEDITOR.POSITION_CONTAINS)break;d=d.getNext(l)}else p=d.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==d.getName()&&d.data("cke-realelement")||!g(a,d)||(e.test(d.getName())?d.remove(1):
-(d.removeAttributes(c),a.fire("removeFormatCleanup",d))),d=p;k.moveToBookmark(b)}a.forceNextSelectionCheck();a.getSelection().selectRanges(f)}}},filter:function(a,e){for(var c=a._.removeFormatFilters||[],g=0;g<c.length;g++)if(!1===c[g](e))return!1;return!0}},CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)},CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var",
-CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign",function(){CKEDITOR.plugins.add("sourcearea",{init:function(e){function c(){var a=f&&this.equals(CKEDITOR.document.getActive());this.hide();this.setStyle("height",this.getParent().$.clientHeight+"px");this.setStyle("width",this.getParent().$.clientWidth+"px");this.show();a&&this.focus()}if(e.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var g=CKEDITOR.plugins.sourcearea;e.addMode("source",function(f){var g=e.ui.space("contents").getDocument().createElement("textarea");
-g.setStyles(CKEDITOR.tools.extend({width:CKEDITOR.env.ie7Compat?"99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",e.config.sourceAreaTabSize||4)));g.setAttribute("dir","ltr");g.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");e.ui.space("contents").append(g);g=e.editable(new a(e,g));g.setData(e.getData(1));CKEDITOR.env.ie&&(g.attachListener(e,"resize",c,g),g.attachListener(CKEDITOR.document.getWindow(),
-"resize",c,g),CKEDITOR.tools.setTimeout(c,0,g));e.fire("ariaWidget",this);f()});e.addCommand("source",g.commands.source);e.ui.addButton&&e.ui.addButton("Source",{label:e.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});e.on("mode",function(){e.getCommand("source").setState("source"==e.mode?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)});var f=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var a=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);
+b.editable.padding.bottom:b.pane.bottom-1,this.look(O)):(a.inInlineMode&&(k.top-=b.editable.top+b.editable.border.top),this.look(U));a.inInlineMode&&(k.top--,k.top+=b.editable.scroll.top,k.left+=b.editable.scroll.left);for(var l in k)k[l]=CKEDITOR.tools.cssLength(k[l]);this.setStyles(k)},look:function(a){if(this.oldLook!=a){for(var b=this.lineChildren.length,c;b--;)(c=this.lineChildren[b]).setAttribute("style",c.base+c.looks[0|a/2]);this.oldLook=a}},wrap:new C("span",a.doc)});for(c=d.lineChildren.length;c--;)d.lineChildren[c].appendTo(d);
+d.look(U);d.appendTo(d.wrap);d.unselectable();d.lineChildren[0].on("mouseup",function(c){d.detach();b(a,function(b){var c=a.line.trigger;b[c.is(F)?"insertBefore":"insertAfter"](c.is(F)?c.lower:c.upper)},!0);a.editor.focus();E.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();c.data.preventDefault(!0)});d.on("mousedown",function(a){a.data.preventDefault(!0)});a.line=d}function b(a,b,c){var d=new CKEDITOR.dom.range(a.doc),e=a.editor,f;E.ie&&a.enterMode==CKEDITOR.ENTER_BR?f=a.doc.createText(K):
+(f=(f=l(a.element,!0))&&f.data("cke-enter-mode")||a.enterMode,f=new C(N[f],a.doc),f.is("br")||a.doc.createText(K).appendTo(f));c&&e.fire("saveSnapshot");b(f);d.moveToPosition(f,CKEDITOR.POSITION_AFTER_START);e.getSelection().selectRanges([d]);a.hotNode=f;c&&e.fire("saveSnapshot")}function d(a,d){return{canUndo:!0,modes:{wysiwyg:1},exec:function(){function e(c){var f=E.ie&&9>E.version?" ":K,g=a.hotNode&&a.hotNode.getText()==f&&a.element.equals(a.hotNode)&&a.lastCmdDirection===!!d;b(a,function(b){g&&
+a.hotNode&&a.hotNode.remove();b[d?"insertAfter":"insertBefore"](c);b.setAttributes({"data-cke-magicline-hot":1,"data-cke-magicline-dir":!!d});a.lastCmdDirection=!!d});E.ie||a.enterMode==CKEDITOR.ENTER_BR||a.hotNode.scrollIntoView();a.line.detach()}return function(b){b=b.getSelection().getStartElement();var f;b=b.getAscendant(M,1);if(!n(a,b)&&b&&!b.equals(a.editable)&&!b.contains(a.editable)){(f=l(b))&&"false"==f.getAttribute("contenteditable")&&(b=f);a.element=b;f=h(a,b,!d);var g;p(f)&&f.is(a.triggers)&&
+f.is(H)&&(!h(a,f,!d)||(g=h(a,f,!d))&&p(g)&&g.is(a.triggers))?e(f):(g=c(a,b),p(g)&&(h(a,g,!d)?(b=h(a,g,!d))&&p(b)&&b.is(a.triggers)&&e(g):e(g)))}}}()}}function g(a,b){if(!b||b.type!=CKEDITOR.NODE_ELEMENT||!b.$)return!1;var c=a.line;return c.wrap.equals(b)||c.wrap.contains(b)}function p(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.$}function u(a){if(!p(a))return!1;var b;(b=v(a))||(p(a)?(b={left:1,right:1,center:1},b=!(!b[a.getComputedStyle("float")]&&!b[a.getAttribute("align")])):b=!1);return b}function v(a){return!!{absolute:1,
+fixed:1}[a.getComputedStyle("position")]}function r(a,b){return p(b)?b.is(a.triggers):null}function n(a,b){if(!b)return!1;for(var c=b.getParents(1),d=c.length;d--;)for(var e=a.tabuList.length;e--;)if(c[d].hasAttribute(a.tabuList[e]))return!0;return!1}function q(a,b,c){b=b[c?"getLast":"getFirst"](function(b){return a.isRelevant(b)&&!b.is(S)});if(!b)return!1;t(a,b);return c?b.size.top>a.mouse.y:b.size.bottom<a.mouse.y}function w(a){var b=a.editable,c=a.mouse,d=a.view,e=a.triggerOffset;x(a);var h=c.y>
+(a.inInlineMode?d.editable.top+d.editable.height/2:Math.min(d.editable.height,d.pane.height)/2),b=b[h?"getLast":"getFirst"](function(a){return!(ba(a)||Y(a))});if(!b)return null;g(a,b)&&(b=a.line.wrap[h?"getPrevious":"getNext"](function(a){return!(ba(a)||Y(a))}));if(!p(b)||u(b)||!r(a,b))return null;t(a,b);return!h&&0<=b.size.top&&m(c.y,0,b.size.top+e)?(a=a.inInlineMode||0===d.scroll.y?Q:U,new f([null,b,F,L,a])):h&&b.size.bottom<=d.pane.height&&m(c.y,b.size.bottom-e,d.pane.height)?(a=a.inInlineMode||
+m(b.size.bottom,d.pane.height-e,d.pane.height)?O:U,new f([b,null,P,L,a])):null}function A(a){var b=a.mouse,d=a.view,e=a.triggerOffset,g=c(a);if(!g)return null;t(a,g);var e=Math.min(e,0|g.size.outerHeight/2),k=[],l,n;if(m(b.y,g.size.top-1,g.size.top+e))n=!1;else if(m(b.y,g.size.bottom-e,g.size.bottom+1))n=!0;else return null;if(u(g)||q(a,g,n)||g.getParent().is(V))return null;var H=h(a,g,!n);if(H){if(H&&H.type==CKEDITOR.NODE_TEXT)return null;if(p(H)){if(u(H)||!r(a,H)||H.getParent().is(V))return null;
+k=[H,g][n?"reverse":"concat"]().concat([R,L])}}else g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?(x(a),n&&m(b.y,g.size.bottom-e,d.pane.height)&&m(g.size.bottom,d.pane.height-e,d.pane.height)?l=O:m(b.y,0,g.size.top+e)&&(l=Q)):l=U,k=[null,g][n?"reverse":"concat"]().concat([n?P:F,L,l,g.equals(a.editable[n?"getLast":"getFirst"](a.isRelevant))?n?O:Q:U]);return 0 in k?new f(k):null}function B(a,b,c,d){for(var e=b.getDocumentPosition(),f={},g={},h={},k={},l=ca.length;l--;)f[ca[l]]=parseInt(b.getComputedStyle.call(b,
+"border-"+ca[l]+"-width"),10)||0,h[ca[l]]=parseInt(b.getComputedStyle.call(b,"padding-"+ca[l]),10)||0,g[ca[l]]=parseInt(b.getComputedStyle.call(b,"margin-"+ca[l]),10)||0;c&&!d||D(a,d);k.top=e.y-(c?0:a.view.scroll.y);k.left=e.x-(c?0:a.view.scroll.x);k.outerWidth=b.$.offsetWidth;k.outerHeight=b.$.offsetHeight;k.height=k.outerHeight-(h.top+h.bottom+f.top+f.bottom);k.width=k.outerWidth-(h.left+h.right+f.left+f.right);k.bottom=k.top+k.outerHeight;k.right=k.left+k.outerWidth;a.inInlineMode&&(k.scroll={top:b.$.scrollTop,
+left:b.$.scrollLeft});return z({border:f,padding:h,margin:g,ignoreScroll:c},k,!0)}function t(a,b,c){if(!p(b))return b.size=null;if(!b.size)b.size={};else if(b.size.ignoreScroll==c&&b.size.date>new Date-W)return null;return z(b.size,B(a,b,c),{date:+new Date},!0)}function x(a,b){a.view.editable=B(a,a.editable,b,!0)}function D(a,b){a.view||(a.view={});var c=a.view;if(!(!b&&c&&c.date>new Date-W)){var d=a.win,c=d.getScrollPosition(),d=d.getViewPaneSize();z(a.view,{scroll:{x:c.x,y:c.y,width:a.doc.$.documentElement.scrollWidth-
+d.width,height:a.doc.$.documentElement.scrollHeight-d.height},pane:{width:d.width,height:d.height,bottom:d.height+c.y},date:+new Date},!0)}}function y(a,b,c,d){for(var e=d,g=d,h=0,k=!1,l=!1,n=a.view.pane.height,m=a.mouse;m.y+h<n&&0<m.y-h;){k||(k=b(e,d));l||(l=b(g,d));!k&&0<m.y-h&&(e=c(a,{x:m.x,y:m.y-h}));!l&&m.y+h<n&&(g=c(a,{x:m.x,y:m.y+h}));if(k&&l)break;h+=2}return new f([e,g,null,null])}CKEDITOR.plugins.add("magicline",{init:function(a){var e=a.config,l=e.magicline_triggerOffset||30,m={editor:a,
+enterMode:e.enterMode,triggerOffset:l,holdDistance:0|l*(e.magicline_holdDistance||.5),boxColor:e.magicline_color||"#ff0000",rtl:"rtl"==e.contentsLangDirection,tabuList:["data-cke-hidden-sel"].concat(e.magicline_tabuList||[]),triggers:e.magicline_everywhere?M:{table:1,hr:1,div:1,ul:1,ol:1,dl:1,form:1,blockquote:1}},H,q,r;m.isRelevant=function(a){return p(a)&&!g(m,a)&&!u(a)};a.on("contentDom",function(){var l=a.editable(),p=a.document,t=a.window;z(m,{editable:l,inInlineMode:l.isInline(),doc:p,win:t,
+hotNode:null},!0);m.boundary=m.inInlineMode?m.editable:m.doc.getDocumentElement();l.is(I.$inline)||(m.inInlineMode&&!v(l)&&l.setStyles({position:"relative",top:null,left:null}),k.call(this,m),D(m),l.attachListener(a,"beforeUndoImage",function(){m.line.detach()}),l.attachListener(a,"beforeGetData",function(){m.line.wrap.getParent()&&(m.line.detach(),a.once("getData",function(){m.line.attach()},null,null,1E3))},null,null,0),l.attachListener(m.inInlineMode?p:p.getWindow().getFrame(),"mouseout",function(b){if("wysiwyg"==
+a.mode)if(m.inInlineMode){var c=b.data.$.clientX;b=b.data.$.clientY;D(m);x(m,!0);var d=m.view.editable,e=m.view.scroll;c>d.left-e.x&&c<d.right-e.x&&b>d.top-e.y&&b<d.bottom-e.y||(clearTimeout(r),r=null,m.line.detach())}else clearTimeout(r),r=null,m.line.detach()}),l.attachListener(l,"keyup",function(){m.hiddenMode=0}),l.attachListener(l,"keydown",function(b){if("wysiwyg"==a.mode)switch(b.data.getKeystroke()){case 2228240:case 16:m.hiddenMode=1,m.line.detach()}}),l.attachListener(m.inInlineMode?l:p,
+"mousemove",function(b){q=!0;if("wysiwyg"==a.mode&&!a.readOnly&&!r){var c={x:b.data.$.clientX,y:b.data.$.clientY};r=setTimeout(function(){m.mouse=c;r=m.trigger=null;D(m);q&&!m.hiddenMode&&a.focusManager.hasFocus&&!m.line.mouseNear()&&(m.element=da(m,!0))&&((m.trigger=w(m)||A(m)||ea(m))&&!n(m,m.trigger.upper||m.trigger.lower)?m.line.attach().place():(m.trigger=null,m.line.detach()),q=!1)},30)}}),l.attachListener(t,"scroll",function(){"wysiwyg"==a.mode&&(m.line.detach(),E.webkit&&(m.hiddenMode=1,clearTimeout(H),
+H=setTimeout(function(){m.mouseDown||(m.hiddenMode=0)},50)))}),l.attachListener(J?p:t,"mousedown",function(){"wysiwyg"==a.mode&&(m.line.detach(),m.hiddenMode=1,m.mouseDown=1)}),l.attachListener(J?p:t,"mouseup",function(){m.hiddenMode=0;m.mouseDown=0}),a.addCommand("accessPreviousSpace",d(m)),a.addCommand("accessNextSpace",d(m,!0)),a.setKeystroke([[e.magicline_keystrokePrevious,"accessPreviousSpace"],[e.magicline_keystrokeNext,"accessNextSpace"]]),a.on("loadSnapshot",function(){var b,c,d,e;for(e in{p:1,
+br:1,div:1})for(b=a.document.getElementsByTag(e),d=b.count();d--;)if((c=b.getItem(d)).data("cke-magicline-hot")){m.hotNode=c;m.lastCmdDirection="true"===c.data("cke-magicline-dir")?!0:!1;return}}),this.backdoor={accessFocusSpace:b,boxTrigger:f,isLine:g,getAscendantTrigger:c,getNonEmptyNeighbour:h,getSize:B,that:m,triggerEdge:A,triggerEditable:w,triggerExpand:ea})},this)}});var z=CKEDITOR.tools.extend,C=CKEDITOR.dom.element,G=C.createFromHtml,E=CKEDITOR.env,J=CKEDITOR.env.ie&&9>CKEDITOR.env.version,
+I=CKEDITOR.dtd,N={},F=128,P=64,R=32,L=16,Q=4,O=2,U=1,K=" ",V=I.$listItem,S=I.$tableContent,H=z({},I.$nonEditable,I.$empty),M=I.$block,W=100,T="width:0px;height:0px;padding:0px;margin:0px;display:block;z-index:9999;color:#fff;position:absolute;font-size: 0px;line-height:0px;",aa=T+"border-color:transparent;display:block;border-style:solid;",X="\x3cspan\x3e"+K+"\x3c/span\x3e";N[CKEDITOR.ENTER_BR]="br";N[CKEDITOR.ENTER_P]="p";N[CKEDITOR.ENTER_DIV]="div";f.prototype={set:function(a,b,c){this.properties=
+a+b+(c||U);return this},is:function(a){return(this.properties&a)==a}};var da=function(){function a(b,c){var d=b.$.elementFromPoint(c.x,c.y);return d&&d.nodeType?new CKEDITOR.dom.element(d):null}return function(b,c,d){if(!b.mouse)return null;var e=b.doc,f=b.line.wrap;d=d||b.mouse;var h=a(e,d);c&&g(b,h)&&(f.hide(),h=a(e,d),f.show());return!h||h.type!=CKEDITOR.NODE_ELEMENT||!h.$||E.ie&&9>E.version&&!b.boundary.equals(h)&&!b.boundary.contains(h)?null:h}}(),ba=CKEDITOR.dom.walker.whitespaces(),Y=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_COMMENT),
+ea=function(){function b(d){var f=d.element,g,h,k;if(!p(f)||f.contains(d.editable)||f.isReadOnly())return null;k=y(d,function(a,b){return!b.equals(a)},function(a,b){return da(a,!0,b)},f);g=k.upper;h=k.lower;if(a(d,g,h))return k.set(R,8);if(g&&f.contains(g))for(;!g.getParent().equals(f);)g=g.getParent();else g=f.getFirst(function(a){return c(d,a)});if(h&&f.contains(h))for(;!h.getParent().equals(f);)h=h.getParent();else h=f.getLast(function(a){return c(d,a)});if(!g||!h)return null;t(d,g);t(d,h);if(!m(d.mouse.y,
+g.size.top,h.size.bottom))return null;for(var f=Number.MAX_VALUE,l,n,H,q;h&&!h.equals(g)&&(n=g.getNext(d.isRelevant));)l=Math.abs(e(d,g,n)-d.mouse.y),l<f&&(f=l,H=g,q=n),g=n,t(d,g);if(!H||!q||!m(d.mouse.y,H.size.top,q.size.bottom))return null;k.upper=H;k.lower=q;return k.set(R,8)}function c(a,b){return!(b&&b.type==CKEDITOR.NODE_TEXT||Y(b)||u(b)||g(a,b)||b.type==CKEDITOR.NODE_ELEMENT&&b.$&&b.is("br"))}return function(c){var d=b(c),e;if(e=d){e=d.upper;var f=d.lower;e=!e||!f||u(f)||u(e)||f.equals(e)||
+e.equals(f)||f.contains(e)||e.contains(f)?!1:r(c,e)&&r(c,f)&&a(c,e,f)?!0:!1}return e?d:null}}(),ca=["top","left","right","bottom"]}(),CKEDITOR.config.magicline_keystrokePrevious=CKEDITOR.CTRL+CKEDITOR.SHIFT+51,CKEDITOR.config.magicline_keystrokeNext=CKEDITOR.CTRL+CKEDITOR.SHIFT+52,function(){function a(a){if(!a||a.type!=CKEDITOR.NODE_ELEMENT||"form"!=a.getName())return[];for(var c=[],e=["style","className"],b=0;b<e.length;b++){var d=a.$.elements.namedItem(e[b]);d&&(d=new CKEDITOR.dom.element(d),c.push([d,
+d.nextSibling]),d.remove())}return c}function f(a,c){if(a&&a.type==CKEDITOR.NODE_ELEMENT&&"form"==a.getName()&&0<c.length)for(var e=c.length-1;0<=e;e--){var b=c[e][0],d=c[e][1];d?b.insertBefore(d):b.appendTo(a)}}function c(c,e){var h=a(c),b={},d=c.$;e||(b["class"]=d.className||"",d.className="");b.inline=d.style.cssText||"";e||(d.style.cssText="position: static; overflow: visible");f(h);return b}function e(c,e){var h=a(c),b=c.$;"class"in e&&(b.className=e["class"]);"inline"in e&&(b.style.cssText=
+e.inline);f(h)}function h(a){if(!a.editable().isInline()){var c=CKEDITOR.instances,e;for(e in c){var b=c[e];"wysiwyg"!=b.mode||b.readOnly||(b=b.document.getBody(),b.setAttribute("contentEditable",!1),b.setAttribute("contentEditable",!0))}a.editable().hasFocus&&(a.toolbox.focus(),a.focus())}}CKEDITOR.plugins.add("maximize",{init:function(a){function f(){var b=d.getViewPaneSize();a.resize(b.width,b.height,null,!0)}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var k=a.lang,b=CKEDITOR.document,d=b.getWindow(),
+g,p,u,v=CKEDITOR.TRISTATE_OFF;a.addCommand("maximize",{modes:{wysiwyg:!CKEDITOR.env.iOS,source:!CKEDITOR.env.iOS},readOnly:1,editorFocus:!1,exec:function(){var r=a.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}),n=a.ui.space("contents");if("wysiwyg"==a.mode){var q=a.getSelection();g=q&&q.getRanges();p=d.getScrollPosition()}else{var w=a.editable().$;g=!CKEDITOR.env.ie&&[w.selectionStart,w.selectionEnd];p=[w.scrollLeft,w.scrollTop]}if(this.state==CKEDITOR.TRISTATE_OFF){d.on("resize",
+f);u=d.getScrollPosition();for(q=a.container;q=q.getParent();)q.setCustomData("maximize_saved_styles",c(q)),q.setStyle("z-index",a.config.baseFloatZIndex-5);n.setCustomData("maximize_saved_styles",c(n,!0));r.setCustomData("maximize_saved_styles",c(r,!0));n={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};b.getDocumentElement().setStyles(n);!CKEDITOR.env.gecko&&b.getDocumentElement().setStyle("position","fixed");CKEDITOR.env.gecko&&CKEDITOR.env.quirks||b.getBody().setStyles(n);CKEDITOR.env.ie?
+setTimeout(function(){d.$.scrollTo(0,0)},0):d.$.scrollTo(0,0);r.setStyle("position",CKEDITOR.env.gecko&&CKEDITOR.env.quirks?"fixed":"absolute");r.$.offsetLeft;r.setStyles({"z-index":a.config.baseFloatZIndex-5,left:"0px",top:"0px"});r.addClass("cke_maximized");f();n=r.getDocumentPosition();r.setStyles({left:-1*n.x+"px",top:-1*n.y+"px"});CKEDITOR.env.gecko&&h(a)}else if(this.state==CKEDITOR.TRISTATE_ON){d.removeListener("resize",f);for(var q=[n,r],A=0;A<q.length;A++)e(q[A],q[A].getCustomData("maximize_saved_styles")),
+q[A].removeCustomData("maximize_saved_styles");for(q=a.container;q=q.getParent();)e(q,q.getCustomData("maximize_saved_styles")),q.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){d.$.scrollTo(u.x,u.y)},0):d.$.scrollTo(u.x,u.y);r.removeClass("cke_maximized");CKEDITOR.env.webkit&&(r.setStyle("display","inline"),setTimeout(function(){r.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:n.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();
+if(q=this.uiItems[0])n=this.state==CKEDITOR.TRISTATE_OFF?k.maximize.maximize:k.maximize.minimize,q=CKEDITOR.document.getById(q._.id),q.getChild(1).setHtml(n),q.setAttribute("title",n),q.setAttribute("href",'javascript:void("'+n+'");');"wysiwyg"==a.mode?g?(CKEDITOR.env.gecko&&h(a),a.getSelection().selectRanges(g),(w=a.getSelection().getStartElement())&&w.scrollIntoView(!0)):d.$.scrollTo(p.x,p.y):(g&&(w.selectionStart=g[0],w.selectionEnd=g[1]),w.scrollLeft=p[0],w.scrollTop=p[1]);g=p=null;v=this.state;
+a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:k.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:v)},null,null,100)}}})}(),function(){var a={canUndo:!1,async:!0,exec:function(f){f.getClipboardData({title:f.lang.pastetext.title},function(c){c&&f.fire("paste",{type:"text",dataValue:c.dataValue,method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});
+f.fire("afterCommandExec",{name:"pastetext",command:a,returnValue:!!c})})}};CKEDITOR.plugins.add("pastetext",{requires:"clipboard",init:function(f){f.addCommand("pastetext",a);f.ui.addButton&&f.ui.addButton("PasteText",{label:f.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(f.config.forcePasteAsPlainText)f.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});f.on("pasteState",function(a){f.getCommand("pastetext").setState(a.data)})}})}(),function(){function a(a,
+e,f){var m=CKEDITOR.cleanWord;m?f():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||e+"filter/default.js"),CKEDITOR.scriptLoader.load(a,f,null,!0));return!m}function f(a){a.data.type="html"}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(c){var e=0,h=this.path;c.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a){var c=this;e=1;a.once("beforePaste",f);a.getClipboardData({title:a.lang.pastefromword.title},function(e){e&&a.fire("paste",{type:"html",dataValue:e.dataValue,
+method:"paste",dataTransfer:CKEDITOR.plugins.clipboard.initPasteDataTransfer()});a.fire("afterCommandExec",{name:"pastefromword",command:c,returnValue:!!e})})}});c.ui.addButton&&c.ui.addButton("PasteFromWord",{label:c.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});c.on("pasteState",function(a){c.getCommand("pastefromword").setState(a.data)});c.on("paste",function(f){var l=f.data,k=l.dataValue;if(k&&(e||/(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/.test(k))){l.dontFilter=
+!0;var b=a(c,h,function(){if(b)c.fire("paste",l);else if(!c.config.pasteFromWordPromptCleanup||e||confirm(c.lang.pastefromword.confirmCleanup))l.dataValue=CKEDITOR.cleanWord(k,c);e=0});b&&f.cancel()}},null,null,3)}})}(),CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}}),CKEDITOR.plugins.removeformat=
+{commands:{removeformat:{exec:function(a){for(var f=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),c=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),e=CKEDITOR.plugins.removeformat.filter,h=a.getSelection().getRanges(),m=h.createIterator(),l=function(a){return a.type==CKEDITOR.NODE_ELEMENT},k;k=m.getNextRange();){k.collapsed||k.enlarge(CKEDITOR.ENLARGE_ELEMENT);var b=k.createBookmark(),
+d=b.startNode,g=b.endNode,p=function(b){for(var c=a.elementPath(b),d=c.elements,g=1,h;(h=d[g])&&!h.equals(c.block)&&!h.equals(c.blockLimit);g++)f.test(h.getName())&&e(a,h)&&b.breakParent(h)};p(d);if(g)for(p(g),d=d.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);d&&!d.equals(g);)if(d.isReadOnly()){if(d.getPosition(g)&CKEDITOR.POSITION_CONTAINS)break;d=d.getNext(l)}else p=d.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==d.getName()&&d.data("cke-realelement")||!e(a,d)||(f.test(d.getName())?d.remove(1):
+(d.removeAttributes(c),a.fire("removeFormatCleanup",d))),d=p;k.moveToBookmark(b)}a.forceNextSelectionCheck();a.getSelection().selectRanges(h)}}},filter:function(a,f){for(var c=a._.removeFormatFilters||[],e=0;e<c.length;e++)if(!1===c[e](f))return!1;return!0}},CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)},CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var",
+CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign",function(){CKEDITOR.plugins.add("sourcearea",{init:function(f){function c(){var a=h&&this.equals(CKEDITOR.document.getActive());this.hide();this.setStyle("height",this.getParent().$.clientHeight+"px");this.setStyle("width",this.getParent().$.clientWidth+"px");this.show();a&&this.focus()}if(f.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var e=CKEDITOR.plugins.sourcearea;f.addMode("source",function(e){var h=f.ui.space("contents").getDocument().createElement("textarea");
+h.setStyles(CKEDITOR.tools.extend({width:CKEDITOR.env.ie7Compat?"99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",f.config.sourceAreaTabSize||4)));h.setAttribute("dir","ltr");h.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");f.ui.space("contents").append(h);h=f.editable(new a(f,h));h.setData(f.getData(1));CKEDITOR.env.ie&&(h.attachListener(f,"resize",c,h),h.attachListener(CKEDITOR.document.getWindow(),
+"resize",c,h),CKEDITOR.tools.setTimeout(c,0,h));f.fire("ariaWidget",this);e()});f.addCommand("source",e.commands.source);f.ui.addButton&&f.ui.addButton("Source",{label:f.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});f.on("mode",function(){f.getCommand("source").setState("source"==f.mode?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)});var h=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var a=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);
 this.status="ready";this.editor.fire("dataReady")},getData:function(){return this.getValue()},insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){a.baseProto.detach.call(this);this.clearCustomData();this.remove()}}})}(),CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(a){"wysiwyg"==a.mode&&a.fire("saveSnapshot");
-a.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);a.setMode("source"==a.mode?"wysiwyg":"source")},canUndo:!1}}},CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var e=this;CKEDITOR.dialog.add("specialchar",
-this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var c=a.langCode,c=e.availableLangs[c]?c:e.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e.path+"dialogs/lang/"+c+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,e.langEntries[c]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,command:"specialchar",toolbar:"insert,50"})}}),
-CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ 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 { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" "),
-function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(a){var e=a.config,c=a.lang.stylescombo,g={},f=[],m=[];a.on("stylesSet",function(c){if(c=c.data.styles){for(var k,b,d,h=0,p=c.length;h<p;h++)(k=c[h],a.blockless&&k.element in CKEDITOR.dtd.$block||(b=k.name,k=new CKEDITOR.style(k),a.filter.customConfig&&!a.filter.check(k)))||(k._name=b,k._.enterMode=e.enterMode,k._.type=d=k.assignedTo||k.type,k._.weight=h+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),g[b]=
-k,f.push(k),m.push(k));f.sort(function(a,b){return a._.weight-b._.weight})}});a.ui.addRichCombo("Styles",{label:c.label,title:c.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(e.contentsCss),multiSelect:!0,attributes:{"aria-label":c.panelTitle}},init:function(){var a,e,b,d,h,g;h=0;for(g=f.length;h<g;h++)a=f[h],e=a._name,d=a._.type,d!=b&&(this.startGroup(c["panelTitle"+String(d)]),b=d),this.add(e,a.type==CKEDITOR.STYLE_OBJECT?e:a.buildPreview(),e);
-this.commit()},onClick:function(c){a.focus();a.fire("saveSnapshot");c=g[c];var e=a.elementPath();a[c.checkActive(e,a)?"removeStyle":"applyStyle"](c);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(c){var e=this.getValue();c=c.data.path.elements;for(var b=0,d=c.length,f;b<d;b++){f=c[b];for(var m in g)if(g[m].checkElementRemovable(f,!0,a)){m!=e&&this.setValue(m);return}}this.setValue("")},this)},onOpen:function(){var e=a.getSelection().getSelectedElement(),e=a.elementPath(e),
-f=[0,0,0,0];this.showAll();this.unmarkAll();for(var b in g){var d=g[b],h=d._.type;d.checkApplicable(e,a,a.activeFilter)?f[h]++:this.hideItem(b);d.checkActive(e,a)&&this.mark(b)}f[CKEDITOR.STYLE_BLOCK]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);f[CKEDITOR.STYLE_INLINE]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);f[CKEDITOR.STYLE_OBJECT]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var c=a.elementPath();if(c){for(var e in g)if(g[e].checkApplicable(c,
-a,a.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){g={};f=[]}})}})}(),function(){function a(a){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(c){if(c.editable().hasFocus){var e=c.getSelection(),g;if(g=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=c.createRange(),b=CKEDITOR.tools.tryThese(function(){var b=g.getParent().$.cells[g.$.cellIndex+(a?-1:1)];b.parentNode.parentNode;return b},function(){var b=
-g.getParent(),b=b.getAscendant("table").$.rows[b.$.rowIndex+(a?-1:1)];return b.cells[a?b.cells.length-1:0]});if(b||a)if(b)b=new CKEDITOR.dom.element(b),e.moveToElementEditStart(b),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(b);else return!0;else{for(var d=g.getAscendant("table").$,b=g.getParent().$.cells,d=new CKEDITOR.dom.element(d.insertRow(-1),c.document),h=0,p=b.length;h<p;h++)d.append((new CKEDITOR.dom.element(b[h],c.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(d)}e.select(!0);
-return!0}}return!1}}}var e={editorFocus:!1,modes:{wysiwyg:1,source:1}},c={exec:function(a){a.container.focusNext(!0,a.tabIndex)}},g={exec:function(a){a.container.focusPrevious(!0,a.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(f){for(var m=!1!==f.config.enableTabKeyTools,l=f.config.tabSpaces||0,k="";l--;)k+=" ";if(k)f.on("key",function(a){9==a.data.keyCode&&(f.insertText(k),a.cancel())});if(m)f.on("key",function(a){(9==a.data.keyCode&&f.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+
-9&&f.execCommand("selectPreviousCell"))&&a.cancel()});f.addCommand("blur",CKEDITOR.tools.extend(c,e));f.addCommand("blurBack",CKEDITOR.tools.extend(g,e));f.addCommand("selectNextCell",a());f.addCommand("selectPreviousCell",a(!0))}})}(),CKEDITOR.dom.element.prototype.focusNext=function(a,e){var c=void 0===e?this.getTabIndex():e,g,f,m,l,k,b;if(0>=c)for(k=this.getNextSourceNode(a,CKEDITOR.NODE_ELEMENT);k;){if(k.isVisible()&&0===k.getTabIndex()){m=k;break}k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT)}else for(k=
-this.getDocument().getBody().getFirst();k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!g)if(!f&&k.equals(this)){if(f=!0,a){if(!(k=k.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;g=1}}else f&&!this.contains(k)&&(g=1);if(k.isVisible()&&!(0>(b=k.getTabIndex()))){if(g&&b==c){m=k;break}b>c&&(!m||!l||b<l)?(m=k,l=b):m||0!==b||(m=k,l=b)}}m&&m.focus()},CKEDITOR.dom.element.prototype.focusPrevious=function(a,e){for(var c=void 0===e?this.getTabIndex():e,g,f,m,l=0,k,b=this.getDocument().getBody().getLast();b=
-b.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!g)if(!f&&b.equals(this)){if(f=!0,a){if(!(b=b.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;g=1}}else f&&!this.contains(b)&&(g=1);if(b.isVisible()&&!(0>(k=b.getTabIndex())))if(0>=c){if(g&&0===k){m=b;break}k>l&&(m=b,l=k)}else{if(g&&k==c){m=b;break}k<c&&(!m||k>l)&&(m=b,l=k)}}m&&m.focus()},CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function e(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,
+a.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);a.setMode("source"==a.mode?"wysiwyg":"source")},canUndo:!1}}},CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-gb":1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,pl:1,pt:1,"pt-br":1,ru:1,si:1,sk:1,sl:1,sq:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var f=
+this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");a.addCommand("specialchar",{exec:function(){var c=a.langCode,c=f.availableLangs[c]?c:f.availableLangs[c.replace(/-.*/,"")]?c.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(f.path+"dialogs/lang/"+c+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,f.langEntries[c]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,
+command:"specialchar",toolbar:"insert,50"})}}),CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ 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 { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" "),
+function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(a){var f=a.config,c=a.lang.stylescombo,e={},h=[],m=[];a.on("stylesSet",function(c){if(c=c.data.styles){for(var k,b,d,g=0,p=c.length;g<p;g++)(k=c[g],a.blockless&&k.element in CKEDITOR.dtd.$block||(b=k.name,k=new CKEDITOR.style(k),a.filter.customConfig&&!a.filter.check(k)))||(k._name=b,k._.enterMode=f.enterMode,k._.type=d=k.assignedTo||k.type,k._.weight=g+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),e[b]=
+k,h.push(k),m.push(k));h.sort(function(a,b){return a._.weight-b._.weight})}});a.ui.addRichCombo("Styles",{label:c.label,title:c.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),multiSelect:!0,attributes:{"aria-label":c.panelTitle}},init:function(){var a,e,b,d,f,m;f=0;for(m=h.length;f<m;f++)a=h[f],e=a._name,d=a._.type,d!=b&&(this.startGroup(c["panelTitle"+String(d)]),b=d),this.add(e,a.type==CKEDITOR.STYLE_OBJECT?e:a.buildPreview(),e);
+this.commit()},onClick:function(c){a.focus();a.fire("saveSnapshot");c=e[c];var f=a.elementPath();a[c.checkActive(f,a)?"removeStyle":"applyStyle"](c);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(c){var f=this.getValue();c=c.data.path.elements;for(var b=0,d=c.length,g;b<d;b++){g=c[b];for(var h in e)if(e[h].checkElementRemovable(g,!0,a)){h!=f&&this.setValue(h);return}}this.setValue("")},this)},onOpen:function(){var f=a.getSelection().getSelectedElement(),f=a.elementPath(f),
+h=[0,0,0,0];this.showAll();this.unmarkAll();for(var b in e){var d=e[b],g=d._.type;d.checkApplicable(f,a,a.activeFilter)?h[g]++:this.hideItem(b);d.checkActive(f,a)&&this.mark(b)}h[CKEDITOR.STYLE_BLOCK]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);h[CKEDITOR.STYLE_INLINE]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);h[CKEDITOR.STYLE_OBJECT]||this.hideGroup(c["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var c=a.elementPath();if(c){for(var f in e)if(e[f].checkApplicable(c,
+a,a.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){e={};h=[]}})}})}(),function(){function a(a){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(c){if(c.editable().hasFocus){var e=c.getSelection(),f;if(f=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=c.createRange(),b=CKEDITOR.tools.tryThese(function(){var b=f.getParent().$.cells[f.$.cellIndex+(a?-1:1)];b.parentNode.parentNode;return b},function(){var b=
+f.getParent(),b=b.getAscendant("table").$.rows[b.$.rowIndex+(a?-1:1)];return b.cells[a?b.cells.length-1:0]});if(b||a)if(b)b=new CKEDITOR.dom.element(b),e.moveToElementEditStart(b),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(b);else return!0;else{for(var d=f.getAscendant("table").$,b=f.getParent().$.cells,d=new CKEDITOR.dom.element(d.insertRow(-1),c.document),g=0,p=b.length;g<p;g++)d.append((new CKEDITOR.dom.element(b[g],c.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(d)}e.select(!0);
+return!0}}return!1}}}var f={editorFocus:!1,modes:{wysiwyg:1,source:1}},c={exec:function(a){a.container.focusNext(!0,a.tabIndex)}},e={exec:function(a){a.container.focusPrevious(!0,a.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(h){for(var m=!1!==h.config.enableTabKeyTools,l=h.config.tabSpaces||0,k="";l--;)k+=" ";if(k)h.on("key",function(a){9==a.data.keyCode&&(h.insertText(k),a.cancel())});if(m)h.on("key",function(a){(9==a.data.keyCode&&h.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+
+9&&h.execCommand("selectPreviousCell"))&&a.cancel()});h.addCommand("blur",CKEDITOR.tools.extend(c,f));h.addCommand("blurBack",CKEDITOR.tools.extend(e,f));h.addCommand("selectNextCell",a());h.addCommand("selectPreviousCell",a(!0))}})}(),CKEDITOR.dom.element.prototype.focusNext=function(a,f){var c=void 0===f?this.getTabIndex():f,e,h,m,l,k,b;if(0>=c)for(k=this.getNextSourceNode(a,CKEDITOR.NODE_ELEMENT);k;){if(k.isVisible()&&0===k.getTabIndex()){m=k;break}k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT)}else for(k=
+this.getDocument().getBody().getFirst();k=k.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!e)if(!h&&k.equals(this)){if(h=!0,a){if(!(k=k.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;e=1}}else h&&!this.contains(k)&&(e=1);if(k.isVisible()&&!(0>(b=k.getTabIndex()))){if(e&&b==c){m=k;break}b>c&&(!m||!l||b<l)?(m=k,l=b):m||0!==b||(m=k,l=b)}}m&&m.focus()},CKEDITOR.dom.element.prototype.focusPrevious=function(a,f){for(var c=void 0===f?this.getTabIndex():f,e,h,m,l=0,k,b=this.getDocument().getBody().getLast();b=
+b.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT);){if(!e)if(!h&&b.equals(this)){if(h=!0,a){if(!(b=b.getPreviousSourceNode(!0,CKEDITOR.NODE_ELEMENT)))break;e=1}}else h&&!this.contains(b)&&(e=1);if(b.isVisible()&&!(0>(k=b.getTabIndex())))if(0>=c){if(e&&0===k){m=b;break}k>l&&(m=b,l=k)}else{if(e&&k==c){m=b;break}k<c&&(!m||k>l)&&(m=b,l=k)}}m&&m.focus()},CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function f(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,
 c){this.setState(c.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+(a.plugins.dialogadvtab?"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"]]}));
-a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",e()));a.addCommand("tableDelete",e({exec:function(a){var c=a.elementPath().contains("table",1);if(c){var e=c.getParent(),l=a.editable();1!=e.getChildCount()||e.is("td","th")||e.equals(l)||(c=e);a=a.createRange();a.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");
+a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",f()));a.addCommand("tableDelete",f({exec:function(a){var c=a.elementPath().contains("table",1);if(c){var f=c.getParent(),l=a.editable();1!=f.getChildCount()||f.is("td","th")||f.equals(l)||(c=f);a=a.createRange();a.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");
 CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}}),function(){function a(a){function b(a){0<
-c.length||a.type!=CKEDITOR.NODE_ELEMENT||!v.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(d,a,"selected_cell",!0),c.push(a))}a=a.getRanges();for(var c=[],d={},e=0;e<a.length;e++){var f=a[e];if(f.collapsed)f=f.getCommonAncestor(),(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&c.push(f);else{var f=new CKEDITOR.dom.walker(f),h;for(f.guard=b;h=f.next();)h.type==CKEDITOR.NODE_ELEMENT&&h.is(CKEDITOR.dtd.table)||(h=h.getAscendant("td",!0)||h.getAscendant("th",
-!0))&&!h.getCustomData("selected_cell")&&(CKEDITOR.dom.element.setMarker(d,h,"selected_cell",!0),c.push(h))}}CKEDITOR.dom.element.clearAllMarkers(d);return c}function e(b,c){for(var d=a(b),e=d[0],f=e.getAscendant("table"),e=e.getDocument(),h=d[0].getParent(),g=h.$.rowIndex,d=d[d.length-1],k=d.getParent().$.rowIndex+d.$.rowSpan-1,d=new CKEDITOR.dom.element(f.$.rows[k]),g=c?g:k,h=c?h:d,d=CKEDITOR.tools.buildTableMap(f),f=d[g],g=c?d[g-1]:d[g+1],d=d[0].length,e=e.createElement("tr"),k=0;f[k]&&k<d;k++){var l;
-1<f[k].rowSpan&&g&&f[k]==g[k]?(l=f[k],l.rowSpan+=1):(l=(new CKEDITOR.dom.element(f[k])).clone(),l.removeAttribute("rowSpan"),l.appendBogus(),e.append(l),l=l.$);k+=l.colSpan-1}c?e.insertBefore(h):e.insertAfter(h)}function c(b){if(b instanceof CKEDITOR.dom.selection){var d=a(b),e=d[0].getAscendant("table"),f=CKEDITOR.tools.buildTableMap(e);b=d[0].getParent().$.rowIndex;for(var d=d[d.length-1],h=d.getParent().$.rowIndex+d.$.rowSpan-1,d=[],g=b;g<=h;g++){for(var k=f[g],l=new CKEDITOR.dom.element(e.$.rows[g]),
-m=0;m<k.length;m++){var p=new CKEDITOR.dom.element(k[m]),v=p.getParent().$.rowIndex;1==p.$.rowSpan?p.remove():(--p.$.rowSpan,v==g&&(v=f[g+1],v[m-1]?p.insertAfter(new CKEDITOR.dom.element(v[m-1])):(new CKEDITOR.dom.element(e.$.rows[g+1])).append(p,1)));m+=p.$.colSpan-1}d.push(l)}f=e.$.rows;e=new CKEDITOR.dom.element(f[h+1]||(0<b?f[b-1]:null)||e.$.parentNode);for(g=d.length;0<=g;g--)c(d[g]);return e}b instanceof CKEDITOR.dom.element&&(e=b.getAscendant("table"),1==e.$.rows.length?e.remove():b.remove());
-return null}function g(a,b){for(var c=b?Infinity:0,d=0;d<a.length;d++){var e;e=a[d];for(var f=b,h=e.getParent().$.cells,g=0,k=0;k<h.length;k++){var l=h[k],g=g+(f?1:l.colSpan);if(l==e.$)break}e=g-1;if(b?e<c:e>c)c=e}return c}function f(b,c){for(var d=a(b),e=d[0].getAscendant("table"),f=g(d,1),d=g(d),f=c?f:d,h=CKEDITOR.tools.buildTableMap(e),e=[],d=[],k=h.length,l=0;l<k;l++)e.push(h[l][f]),d.push(c?h[l][f-1]:h[l][f+1]);for(l=0;l<k;l++)e[l]&&(1<e[l].colSpan&&d[l]==e[l]?(f=e[l],f.colSpan+=1):(f=(new CKEDITOR.dom.element(e[l])).clone(),
-f.removeAttribute("colSpan"),f.appendBogus(),f[c?"insertBefore":"insertAfter"].call(f,new CKEDITOR.dom.element(e[l])),f=f.$),l+=f.rowSpan-1)}function m(a,b){var c=a.getStartElement();if(c=c.getAscendant("td",1)||c.getAscendant("th",1)){var d=c.clone();d.appendBogus();b?d.insertBefore(c):d.insertAfter(c)}}function l(b){if(b instanceof CKEDITOR.dom.selection){b=a(b);var c=b[0]&&b[0].getAscendant("table"),d;a:{var e=0;d=b.length-1;for(var f={},h,g;h=b[e++];)CKEDITOR.dom.element.setMarker(f,h,"delete_cell",
-!0);for(e=0;h=b[e++];)if((g=h.getPrevious())&&!g.getCustomData("delete_cell")||(g=h.getNext())&&!g.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(f);d=g;break a}CKEDITOR.dom.element.clearAllMarkers(f);g=b[0].getParent();(g=g.getPrevious())?d=g.getLast():(g=b[d].getParent(),d=(g=g.getNext())?g.getChild(0):null)}for(g=b.length-1;0<=g;g--)l(b[g]);d?k(d,!0):c&&c.remove()}else b instanceof CKEDITOR.dom.element&&(c=b.getParent(),1==c.getChildCount()?c.remove():b.remove())}function k(a,
-b){var c=a.getDocument(),d=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&(d.focus(),c.focus());c=new CKEDITOR.dom.range(c);c["moveToElementEdit"+(b?"End":"Start")](a)||(c.selectNodeContents(a),c.collapse(b?!1:!0));c.select(!0)}function b(a,b,c){a=a[b];if("undefined"==typeof c)return a;for(b=0;a&&b<a.length;b++){if(c.is&&a[b]==c.$)return b;if(b==c)return new CKEDITOR.dom.element(a[b])}return c.is?-1:null}function d(c,d,e){var f=a(c),h;if((d?1!=f.length:2>f.length)||(h=c.getCommonAncestor())&&
-h.type==CKEDITOR.NODE_ELEMENT&&h.is("table"))return!1;var g;c=f[0];h=c.getAscendant("table");var k=CKEDITOR.tools.buildTableMap(h),l=k.length,m=k[0].length,p=c.getParent().$.rowIndex,v=b(k,p,c);if(d){var z;try{var D=parseInt(c.getAttribute("rowspan"),10)||1;g=parseInt(c.getAttribute("colspan"),10)||1;z=k["up"==d?p-D:"down"==d?p+D:p]["left"==d?v-g:"right"==d?v+g:v]}catch(G){return!1}if(!z||c.$==z)return!1;f["up"==d||"left"==d?"unshift":"push"](new CKEDITOR.dom.element(z))}d=c.getDocument();var F=p,
-D=z=0,J=!e&&new CKEDITOR.dom.documentFragment(d),I=0;for(d=0;d<f.length;d++){g=f[d];var N=g.getParent(),E=g.getFirst(),P=g.$.colSpan,T=g.$.rowSpan,N=N.$.rowIndex,L=b(k,N,g),I=I+P*T,D=Math.max(D,L-v+P);z=Math.max(z,N-p+T);e||(P=g,(T=P.getBogus())&&T.remove(),P.trim(),g.getChildren().count()&&(N==F||!E||E.isBlockBoundary&&E.isBlockBoundary({br:1})||(F=J.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!F||F.is&&F.is("br")||J.append("br")),g.moveChildren(J)),d?g.remove():g.setHtml(""));F=N}if(e)return z*
-D==I;J.moveChildren(c);c.appendBogus();D>=m?c.removeAttribute("rowSpan"):c.$.rowSpan=z;z>=l?c.removeAttribute("colSpan"):c.$.colSpan=D;e=new CKEDITOR.dom.nodeList(h.$.rows);f=e.count();for(d=f-1;0<=d;d--)h=e.getItem(d),h.$.cells.length||(h.remove(),f++);return c}function h(c,d){var e=a(c);if(1<e.length)return!1;if(d)return!0;var e=e[0],f=e.getParent(),h=f.getAscendant("table"),g=CKEDITOR.tools.buildTableMap(h),k=f.$.rowIndex,l=b(g,k,e),m=e.$.rowSpan,p;if(1<m){p=Math.ceil(m/2);for(var m=Math.floor(m/
-2),f=k+p,h=new CKEDITOR.dom.element(h.$.rows[f]),g=b(g,f),v,f=e.clone(),k=0;k<g.length;k++)if(v=g[k],v.parentNode==h.$&&k>l){f.insertBefore(new CKEDITOR.dom.element(v));break}else v=null;v||h.append(f)}else for(m=p=1,h=f.clone(),h.insertAfter(f),h.append(f=e.clone()),v=b(g,k),l=0;l<v.length;l++)v[l].rowSpan++;f.appendBogus();e.$.rowSpan=p;f.$.rowSpan=m;1==p&&e.removeAttribute("rowSpan");1==m&&f.removeAttribute("rowSpan");return f}function p(c,d){var e=a(c);if(1<e.length)return!1;if(d)return!0;var e=
-e[0],f=e.getParent(),h=f.getAscendant("table"),h=CKEDITOR.tools.buildTableMap(h),g=b(h,f.$.rowIndex,e),k=e.$.colSpan;if(1<k)f=Math.ceil(k/2),k=Math.floor(k/2);else{for(var k=f=1,l=[],m=0;m<h.length;m++){var p=h[m];l.push(p[g]);1<p[g].rowSpan&&(m+=p[g].rowSpan-1)}for(h=0;h<l.length;h++)l[h].colSpan++}h=e.clone();h.insertAfter(e);h.appendBogus();e.$.colSpan=f;h.$.colSpan=k;1==f&&e.removeAttribute("colSpan");1==k&&h.removeAttribute("colSpan");return h}var v=/^(?:td|th)$/;CKEDITOR.plugins.tabletools=
-{requires:"table,dialog,contextmenu",init:function(b){function g(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function n(a,c){var d=b.addCommand(a,c);b.addFeature(d)}var q=b.lang.table;n("cellProperties",new CKEDITOR.dialogCommand("cellProperties",g({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",
-requiredContent:"table"})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");n("rowDelete",g({requiredContent:"table",exec:function(a){a=a.getSelection();k(c(a))}}));n("rowInsertBefore",g({requiredContent:"table",exec:function(a){a=a.getSelection();e(a,!0)}}));n("rowInsertAfter",g({requiredContent:"table",exec:function(a){a=a.getSelection();e(a)}}));n("columnDelete",g({requiredContent:"table",exec:function(b){b=b.getSelection();b=a(b);var c=b[0],d=b[b.length-1];b=c.getAscendant("table");
-for(var e=CKEDITOR.tools.buildTableMap(b),f,h,g=[],l=0,m=e.length;l<m;l++)for(var n=0,p=e[l].length;n<p;n++)e[l][n]==c.$&&(f=n),e[l][n]==d.$&&(h=n);for(l=f;l<=h;l++)for(n=0;n<e.length;n++)d=e[n],c=new CKEDITOR.dom.element(b.$.rows[n]),d=new CKEDITOR.dom.element(d[l]),d.$&&(1==d.$.colSpan?d.remove():--d.$.colSpan,n+=d.$.rowSpan-1,c.$.cells.length||g.push(c));h=b.$.rows[0]&&b.$.rows[0].cells;f=new CKEDITOR.dom.element(h[f]||(f?h[f-1]:b.$.parentNode));g.length==m&&b.remove();f&&k(f,!0)}}));n("columnInsertBefore",
-g({requiredContent:"table",exec:function(a){a=a.getSelection();f(a,!0)}}));n("columnInsertAfter",g({requiredContent:"table",exec:function(a){a=a.getSelection();f(a)}}));n("cellDelete",g({requiredContent:"table",exec:function(a){a=a.getSelection();l(a)}}));n("cellMerge",g({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){k(d(a.getSelection()),!0)}}));n("cellMergeRight",g({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(d(a.getSelection(),
-"right"),!0)}}));n("cellMergeDown",g({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(d(a.getSelection(),"down"),!0)}}));n("cellVerticalSplit",g({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(p(a.getSelection()))}}));n("cellHorizontalSplit",g({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(h(a.getSelection()))}}));n("cellInsertBefore",g({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));
-n("cellInsertAfter",g({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));b.addMenuItems&&b.addMenuItems({tablecell:{label:q.cell.menu,group:"tablecell",order:1,getItems:function(){var c=b.getSelection(),e=a(c);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:d(c,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:d(c,"right",!0)?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:d(c,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:p(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:h(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<e.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:q.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:q.cell.insertAfter,
+c.length||a.type!=CKEDITOR.NODE_ELEMENT||!u.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(d,a,"selected_cell",!0),c.push(a))}a=a.getRanges();for(var c=[],d={},e=0;e<a.length;e++){var f=a[e];if(f.collapsed)f=f.getCommonAncestor(),(f=f.getAscendant("td",!0)||f.getAscendant("th",!0))&&c.push(f);else{var f=new CKEDITOR.dom.walker(f),g;for(f.guard=b;g=f.next();)g.type==CKEDITOR.NODE_ELEMENT&&g.is(CKEDITOR.dtd.table)||(g=g.getAscendant("td",!0)||g.getAscendant("th",
+!0))&&!g.getCustomData("selected_cell")&&(CKEDITOR.dom.element.setMarker(d,g,"selected_cell",!0),c.push(g))}}CKEDITOR.dom.element.clearAllMarkers(d);return c}function f(b,c){for(var d=a(b),e=d[0],f=e.getAscendant("table"),e=e.getDocument(),g=d[0].getParent(),h=g.$.rowIndex,d=d[d.length-1],k=d.getParent().$.rowIndex+d.$.rowSpan-1,d=new CKEDITOR.dom.element(f.$.rows[k]),h=c?h:k,g=c?g:d,d=CKEDITOR.tools.buildTableMap(f),f=d[h],h=c?d[h-1]:d[h+1],d=d[0].length,e=e.createElement("tr"),k=0;f[k]&&k<d;k++){var l;
+1<f[k].rowSpan&&h&&f[k]==h[k]?(l=f[k],l.rowSpan+=1):(l=(new CKEDITOR.dom.element(f[k])).clone(),l.removeAttribute("rowSpan"),l.appendBogus(),e.append(l),l=l.$);k+=l.colSpan-1}c?e.insertBefore(g):e.insertAfter(g)}function c(b){if(b instanceof CKEDITOR.dom.selection){var d=a(b),e=d[0].getAscendant("table"),f=CKEDITOR.tools.buildTableMap(e);b=d[0].getParent().$.rowIndex;for(var d=d[d.length-1],g=d.getParent().$.rowIndex+d.$.rowSpan-1,d=[],h=b;h<=g;h++){for(var k=f[h],l=new CKEDITOR.dom.element(e.$.rows[h]),
+m=0;m<k.length;m++){var p=new CKEDITOR.dom.element(k[m]),u=p.getParent().$.rowIndex;1==p.$.rowSpan?p.remove():(--p.$.rowSpan,u==h&&(u=f[h+1],u[m-1]?p.insertAfter(new CKEDITOR.dom.element(u[m-1])):(new CKEDITOR.dom.element(e.$.rows[h+1])).append(p,1)));m+=p.$.colSpan-1}d.push(l)}f=e.$.rows;e=new CKEDITOR.dom.element(f[g+1]||(0<b?f[b-1]:null)||e.$.parentNode);for(h=d.length;0<=h;h--)c(d[h]);return e}b instanceof CKEDITOR.dom.element&&(e=b.getAscendant("table"),1==e.$.rows.length?e.remove():b.remove());
+return null}function e(a,b){for(var c=b?Infinity:0,d=0;d<a.length;d++){var e;e=a[d];for(var f=b,g=e.getParent().$.cells,h=0,k=0;k<g.length;k++){var l=g[k],h=h+(f?1:l.colSpan);if(l==e.$)break}e=h-1;if(b?e<c:e>c)c=e}return c}function h(b,c){for(var d=a(b),f=d[0].getAscendant("table"),g=e(d,1),d=e(d),g=c?g:d,h=CKEDITOR.tools.buildTableMap(f),f=[],d=[],k=h.length,l=0;l<k;l++)f.push(h[l][g]),d.push(c?h[l][g-1]:h[l][g+1]);for(l=0;l<k;l++)f[l]&&(1<f[l].colSpan&&d[l]==f[l]?(g=f[l],g.colSpan+=1):(g=(new CKEDITOR.dom.element(f[l])).clone(),
+g.removeAttribute("colSpan"),g.appendBogus(),g[c?"insertBefore":"insertAfter"].call(g,new CKEDITOR.dom.element(f[l])),g=g.$),l+=g.rowSpan-1)}function m(a,b){var c=a.getStartElement();if(c=c.getAscendant("td",1)||c.getAscendant("th",1)){var d=c.clone();d.appendBogus();b?d.insertBefore(c):d.insertAfter(c)}}function l(b){if(b instanceof CKEDITOR.dom.selection){b=a(b);var c=b[0]&&b[0].getAscendant("table"),d;a:{var e=0;d=b.length-1;for(var f={},g,h;g=b[e++];)CKEDITOR.dom.element.setMarker(f,g,"delete_cell",
+!0);for(e=0;g=b[e++];)if((h=g.getPrevious())&&!h.getCustomData("delete_cell")||(h=g.getNext())&&!h.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(f);d=h;break a}CKEDITOR.dom.element.clearAllMarkers(f);h=b[0].getParent();(h=h.getPrevious())?d=h.getLast():(h=b[d].getParent(),d=(h=h.getNext())?h.getChild(0):null)}for(h=b.length-1;0<=h;h--)l(b[h]);d?k(d,!0):c&&c.remove()}else b instanceof CKEDITOR.dom.element&&(c=b.getParent(),1==c.getChildCount()?c.remove():b.remove())}function k(a,
+b){var c=a.getDocument(),d=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&(d.focus(),c.focus());c=new CKEDITOR.dom.range(c);c["moveToElementEdit"+(b?"End":"Start")](a)||(c.selectNodeContents(a),c.collapse(b?!1:!0));c.select(!0)}function b(a,b,c){a=a[b];if("undefined"==typeof c)return a;for(b=0;a&&b<a.length;b++){if(c.is&&a[b]==c.$)return b;if(b==c)return new CKEDITOR.dom.element(a[b])}return c.is?-1:null}function d(c,d,e){var f=a(c),g;if((d?1!=f.length:2>f.length)||(g=c.getCommonAncestor())&&
+g.type==CKEDITOR.NODE_ELEMENT&&g.is("table"))return!1;var h;c=f[0];g=c.getAscendant("table");var k=CKEDITOR.tools.buildTableMap(g),l=k.length,m=k[0].length,p=c.getParent().$.rowIndex,u=b(k,p,c);if(d){var z;try{var C=parseInt(c.getAttribute("rowspan"),10)||1;h=parseInt(c.getAttribute("colspan"),10)||1;z=k["up"==d?p-C:"down"==d?p+C:p]["left"==d?u-h:"right"==d?u+h:u]}catch(G){return!1}if(!z||c.$==z)return!1;f["up"==d||"left"==d?"unshift":"push"](new CKEDITOR.dom.element(z))}d=c.getDocument();var E=p,
+C=z=0,J=!e&&new CKEDITOR.dom.documentFragment(d),I=0;for(d=0;d<f.length;d++){h=f[d];var N=h.getParent(),F=h.getFirst(),P=h.$.colSpan,R=h.$.rowSpan,N=N.$.rowIndex,L=b(k,N,h),I=I+P*R,C=Math.max(C,L-u+P);z=Math.max(z,N-p+R);e||(P=h,(R=P.getBogus())&&R.remove(),P.trim(),h.getChildren().count()&&(N==E||!F||F.isBlockBoundary&&F.isBlockBoundary({br:1})||(E=J.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!E||E.is&&E.is("br")||J.append("br")),h.moveChildren(J)),d?h.remove():h.setHtml(""));E=N}if(e)return z*
+C==I;J.moveChildren(c);c.appendBogus();C>=m?c.removeAttribute("rowSpan"):c.$.rowSpan=z;z>=l?c.removeAttribute("colSpan"):c.$.colSpan=C;e=new CKEDITOR.dom.nodeList(g.$.rows);f=e.count();for(d=f-1;0<=d;d--)g=e.getItem(d),g.$.cells.length||(g.remove(),f++);return c}function g(c,d){var e=a(c);if(1<e.length)return!1;if(d)return!0;var e=e[0],f=e.getParent(),g=f.getAscendant("table"),h=CKEDITOR.tools.buildTableMap(g),k=f.$.rowIndex,l=b(h,k,e),m=e.$.rowSpan,p;if(1<m){p=Math.ceil(m/2);for(var m=Math.floor(m/
+2),f=k+p,g=new CKEDITOR.dom.element(g.$.rows[f]),h=b(h,f),u,f=e.clone(),k=0;k<h.length;k++)if(u=h[k],u.parentNode==g.$&&k>l){f.insertBefore(new CKEDITOR.dom.element(u));break}else u=null;u||g.append(f)}else for(m=p=1,g=f.clone(),g.insertAfter(f),g.append(f=e.clone()),u=b(h,k),l=0;l<u.length;l++)u[l].rowSpan++;f.appendBogus();e.$.rowSpan=p;f.$.rowSpan=m;1==p&&e.removeAttribute("rowSpan");1==m&&f.removeAttribute("rowSpan");return f}function p(c,d){var e=a(c);if(1<e.length)return!1;if(d)return!0;var e=
+e[0],f=e.getParent(),g=f.getAscendant("table"),g=CKEDITOR.tools.buildTableMap(g),h=b(g,f.$.rowIndex,e),k=e.$.colSpan;if(1<k)f=Math.ceil(k/2),k=Math.floor(k/2);else{for(var k=f=1,l=[],m=0;m<g.length;m++){var p=g[m];l.push(p[h]);1<p[h].rowSpan&&(m+=p[h].rowSpan-1)}for(g=0;g<l.length;g++)l[g].colSpan++}g=e.clone();g.insertAfter(e);g.appendBogus();e.$.colSpan=f;g.$.colSpan=k;1==f&&e.removeAttribute("colSpan");1==k&&g.removeAttribute("colSpan");return g}var u=/^(?:td|th)$/;CKEDITOR.plugins.tabletools=
+{requires:"table,dialog,contextmenu",init:function(b){function e(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function n(a,c){var d=b.addCommand(a,c);b.addFeature(d)}var q=b.lang.table;n("cellProperties",new CKEDITOR.dialogCommand("cellProperties",e({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",
+requiredContent:"table"})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");n("rowDelete",e({requiredContent:"table",exec:function(a){a=a.getSelection();k(c(a))}}));n("rowInsertBefore",e({requiredContent:"table",exec:function(a){a=a.getSelection();f(a,!0)}}));n("rowInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();f(a)}}));n("columnDelete",e({requiredContent:"table",exec:function(b){b=b.getSelection();b=a(b);var c=b[0],d=b[b.length-1];b=c.getAscendant("table");
+for(var e=CKEDITOR.tools.buildTableMap(b),f,g,h=[],l=0,m=e.length;l<m;l++)for(var n=0,p=e[l].length;n<p;n++)e[l][n]==c.$&&(f=n),e[l][n]==d.$&&(g=n);for(l=f;l<=g;l++)for(n=0;n<e.length;n++)d=e[n],c=new CKEDITOR.dom.element(b.$.rows[n]),d=new CKEDITOR.dom.element(d[l]),d.$&&(1==d.$.colSpan?d.remove():--d.$.colSpan,n+=d.$.rowSpan-1,c.$.cells.length||h.push(c));g=b.$.rows[0]&&b.$.rows[0].cells;f=new CKEDITOR.dom.element(g[f]||(f?g[f-1]:b.$.parentNode));h.length==m&&b.remove();f&&k(f,!0)}}));n("columnInsertBefore",
+e({requiredContent:"table",exec:function(a){a=a.getSelection();h(a,!0)}}));n("columnInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();h(a)}}));n("cellDelete",e({requiredContent:"table",exec:function(a){a=a.getSelection();l(a)}}));n("cellMerge",e({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a){k(d(a.getSelection()),!0)}}));n("cellMergeRight",e({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(d(a.getSelection(),
+"right"),!0)}}));n("cellMergeDown",e({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(d(a.getSelection(),"down"),!0)}}));n("cellVerticalSplit",e({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){k(p(a.getSelection()))}}));n("cellHorizontalSplit",e({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){k(g(a.getSelection()))}}));n("cellInsertBefore",e({requiredContent:"table",exec:function(a){a=a.getSelection();m(a,!0)}}));
+n("cellInsertAfter",e({requiredContent:"table",exec:function(a){a=a.getSelection();m(a)}}));b.addMenuItems&&b.addMenuItems({tablecell:{label:q.cell.menu,group:"tablecell",order:1,getItems:function(){var c=b.getSelection(),e=a(c);return{tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:d(c,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:d(c,"right",!0)?CKEDITOR.TRISTATE_OFF:
+CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:d(c,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:p(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:g(c,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_properties:0<e.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED}}},tablecell_insertBefore:{label:q.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:q.cell.insertAfter,
 group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:q.cell.deleteCell,group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:q.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:q.cell.mergeRight,group:"tablecell",command:"cellMergeRight",order:17},tablecell_merge_down:{label:q.cell.mergeDown,group:"tablecell",command:"cellMergeDown",order:18},tablecell_split_horizontal:{label:q.cell.splitHorizontal,group:"tablecell",
 command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:q.cell.splitVertical,group:"tablecell",command:"cellVerticalSplit",order:20},tablecell_properties:{label:q.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:q.row.menu,group:"tablerow",order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:q.row.insertBefore,
 group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:q.row.insertAfter,group:"tablerow",command:"rowInsertAfter",order:10},tablerow_delete:{label:q.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:q.column.menu,group:"tablecolumn",order:1,getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:q.column.insertBefore,
 group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:q.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:q.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});b.contextMenu&&b.contextMenu.addListener(function(a,b,c){return(a=c.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getSelectedCells:a};
-CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)}(),CKEDITOR.tools.buildTableMap=function(a){a=a.$.rows;for(var e=-1,c=[],g=0;g<a.length;g++){e++;!c[e]&&(c[e]=[]);for(var f=-1,m=0;m<a[g].cells.length;m++){var l=a[g].cells[m];for(f++;c[e][f];)f++;for(var k=isNaN(l.colSpan)?1:l.colSpan,l=isNaN(l.rowSpan)?1:l.rowSpan,b=0;b<l;b++){c[e+b]||(c[e+b]=[]);for(var d=0;d<k;d++)c[e+b][f+d]=a[g].cells[m]}f+=k-1}}return c},"use strict",function(){var a=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+
-CKEDITOR.SHIFT+90],e={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(e){function b(a){f.enabled&&!1!==a.data.command.canUndo&&f.save()}function d(){f.enabled=e.readOnly?!1:"wysiwyg"==e.mode;f.onChange()}var f=e.undoManager=new c(e),g=f.editingHandler=new m(f),l=e.addCommand("undo",{exec:function(){f.undo()&&(e.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),u=e.addCommand("redo",{exec:function(){f.redo()&&(e.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,
-canUndo:!1});e.setKeystroke([[a[0],"undo"],[a[1],"redo"],[a[2],"redo"]]);f.onChange=function(){l.setState(f.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);u.setState(f.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};e.on("beforeCommandExec",b);e.on("afterCommandExec",b);e.on("saveSnapshot",function(a){f.save(a.data&&a.data.contentOnly)});e.on("contentDom",g.attachListeners,g);e.on("instanceReady",function(){e.fire("saveSnapshot")});e.on("beforeModeUnload",function(){"wysiwyg"==
+CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)}(),CKEDITOR.tools.buildTableMap=function(a){a=a.$.rows;for(var f=-1,c=[],e=0;e<a.length;e++){f++;!c[f]&&(c[f]=[]);for(var h=-1,m=0;m<a[e].cells.length;m++){var l=a[e].cells[m];for(h++;c[f][h];)h++;for(var k=isNaN(l.colSpan)?1:l.colSpan,l=isNaN(l.rowSpan)?1:l.rowSpan,b=0;b<l;b++){c[f+b]||(c[f+b]=[]);for(var d=0;d<k;d++)c[f+b][h+d]=a[e].cells[m]}h+=k-1}}return c},"use strict",function(){var a=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+
+CKEDITOR.SHIFT+90],f={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(e){function b(a){f.enabled&&!1!==a.data.command.canUndo&&f.save()}function d(){f.enabled=e.readOnly?!1:"wysiwyg"==e.mode;f.onChange()}var f=e.undoManager=new c(e),h=f.editingHandler=new m(f),l=e.addCommand("undo",{exec:function(){f.undo()&&(e.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),v=e.addCommand("redo",{exec:function(){f.redo()&&(e.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,
+canUndo:!1});e.setKeystroke([[a[0],"undo"],[a[1],"redo"],[a[2],"redo"]]);f.onChange=function(){l.setState(f.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);v.setState(f.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};e.on("beforeCommandExec",b);e.on("afterCommandExec",b);e.on("saveSnapshot",function(a){f.save(a.data&&a.data.contentOnly)});e.on("contentDom",h.attachListeners,h);e.on("instanceReady",function(){e.fire("saveSnapshot")});e.on("beforeModeUnload",function(){"wysiwyg"==
 e.mode&&f.save(!0)});e.on("mode",d);e.on("readOnly",d);e.ui.addButton&&(e.ui.addButton("Undo",{label:e.lang.undo.undo,command:"undo",toolbar:"undo,10"}),e.ui.addButton("Redo",{label:e.lang.undo.redo,command:"redo",toolbar:"undo,20"}));e.resetUndo=function(){f.reset();e.fire("saveSnapshot")};e.on("updateSnapshot",function(){f.currentImage&&f.update()});e.on("lockSnapshot",function(a){a=a.data;f.lock(a&&a.dontUpdate,a&&a.forceUpdate)});e.on("unlockSnapshot",f.unlock,f)}});CKEDITOR.plugins.undo={};var c=
 CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};c.prototype={type:function(a,b){var d=c.getKeyGroup(a),e=this.strokesRecorded[d]+1;b=b||e>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(e=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[d]=e;this.previousKeyGroup=
-d},keyGroupChanged:function(a){return c.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,c){var e=this.editor;if(this.locked||"ready"!=e.status||
-"wysiwyg"!=e.mode)return!1;var f=e.editable();if(!f||"ready"!=f.status)return!1;f=this.snapshots;b||(b=new g(e));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==c&&e.fire("change");f.splice(this.index+1,f.length-this.index-1);f.length==this.limit&&f.shift();this.index=f.push(b)-1;this.currentImage=b;!1!==c&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,c;a.bookmarks&&(b.focus(),
+d},keyGroupChanged:function(a){return c.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,c){var f=this.editor;if(this.locked||"ready"!=f.status||
+"wysiwyg"!=f.mode)return!1;var h=f.editable();if(!h||"ready"!=h.status)return!1;h=this.snapshots;b||(b=new e(f));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==c&&f.fire("change");h.splice(this.index+1,h.length-this.index-1);h.length==this.limit&&h.shift();this.index=h.push(b)-1;this.currentImage=b;!1!==c&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,c;a.bookmarks&&(b.focus(),
 c=b.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?c.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(c=this.editor.document.getBody().$.createTextRange(),c.collapse(!0),c.select());this.locked=null;this.index=a.index;this.currentImage=this.snapshots[this.index];this.update();this.refreshState();b.fire("change")},getNextImage:function(a){var b=this.snapshots,c=this.currentImage,e;if(c)if(a)for(e=this.index-1;0<=e;e--){if(a=b[e],!c.equalsContent(a))return a.index=
 e,a}else for(e=this.index+1;e<b.length;e++)if(a=b[e],!c.equalsContent(a))return a.index=e,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||
-(a=new g(this.editor));for(var b=this.index,c=this.snapshots;0<b&&this.currentImage.equalsContent(c[b-1]);)--b;c.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,c=b[b.length-1];return c.equalsContent(a)&&!c.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var c=null;if(b)c=!0;else{var e=new g(this.editor,
-!0);this.currentImage&&this.currentImage.equalsContent(e)&&(c=e)}this.locked={update:c,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new g(this.editor,!0);a.equalsContent(b)||this.update()}}}};c.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};c.keyGroups={PRINTABLE:0,FUNCTIONAL:1};c.isNavigationKey=function(a){return!!c.navigationKeyCodes[a]};c.getKeyGroup=function(a){var b=c.keyGroups;
-return e[a]?b.FUNCTIONAL:b.PRINTABLE};c.getOppositeKeyGroup=function(a){var b=c.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};c.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&c.getKeyGroup(a)==c.keyGroups.FUNCTIONAL};var g=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var c=a.getSnapshot();CKEDITOR.env.ie&&c&&(c=c.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=c;b||(this.bookmarks=(c=c&&a.getSelection())&&c.createBookmarks2(!0));a.fire("afterUndoImage")},
-f=/\b(?:href|src|name)="[^"]*?"/gi;g.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(f,""),a=a.replace(f,""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var c=0;c<b.length;c++){var e=b[c],f=a[c];if(e.startOffset!=f.startOffset||e.endOffset!=f.endOffset||!CKEDITOR.tools.arrayCompare(e.start,f.start)||!CKEDITOR.tools.arrayCompare(e.end,
-f.end))return!1}}return!0}};var m=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new l;this.lastKeydownImage=null};m.prototype={onKeydown:function(e){var b=e.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(a,e.data.getKeystroke()))e.data.preventDefault();else if(this.keyEventsStack.cleanUp(e),e=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new g(e.editor),c.isNavigationKey(b)||
-this.undoManager.keyGroupChanged(b))if(e.strokesRecorded[0]||e.strokesRecorded[1])e.save(!1,this.lastKeydownImage,!1),e.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;
-a=a.data.getKey();var d=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(c.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new g(b.editor,!0))))if(0<d)b.type(a);else if(c.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new g(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},attachListeners:function(){var a=this.undoManager.editor,
+(a=new e(this.editor));for(var b=this.index,c=this.snapshots;0<b&&this.currentImage.equalsContent(c[b-1]);)--b;c.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,c=b[b.length-1];return c.equalsContent(a)&&!c.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var c=null;if(b)c=!0;else{var f=new e(this.editor,
+!0);this.currentImage&&this.currentImage.equalsContent(f)&&(c=f)}this.locked={update:c,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new e(this.editor,!0);a.equalsContent(b)||this.update()}}}};c.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};c.keyGroups={PRINTABLE:0,FUNCTIONAL:1};c.isNavigationKey=function(a){return!!c.navigationKeyCodes[a]};c.getKeyGroup=function(a){var b=c.keyGroups;
+return f[a]?b.FUNCTIONAL:b.PRINTABLE};c.getOppositeKeyGroup=function(a){var b=c.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};c.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&c.getKeyGroup(a)==c.keyGroups.FUNCTIONAL};var e=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var c=a.getSnapshot();CKEDITOR.env.ie&&c&&(c=c.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=c;b||(this.bookmarks=(c=c&&a.getSelection())&&c.createBookmarks2(!0));a.fire("afterUndoImage")},
+h=/\b(?:href|src|name)="[^"]*?"/gi;e.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(h,""),a=a.replace(h,""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var c=0;c<b.length;c++){var e=b[c],f=a[c];if(e.startOffset!=f.startOffset||e.endOffset!=f.endOffset||!CKEDITOR.tools.arrayCompare(e.start,f.start)||!CKEDITOR.tools.arrayCompare(e.end,
+f.end))return!1}}return!0}};var m=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new l;this.lastKeydownImage=null};m.prototype={onKeydown:function(f){var b=f.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(a,f.data.getKeystroke()))f.data.preventDefault();else if(this.keyEventsStack.cleanUp(f),f=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new e(f.editor),c.isNavigationKey(b)||
+this.undoManager.keyGroupChanged(b))if(f.strokesRecorded[0]||f.strokesRecorded[1])f.save(!1,this.lastKeydownImage,!1),f.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;
+a=a.data.getKey();var d=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(c.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new e(b.editor,!0))))if(0<d)b.type(a);else if(c.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new e(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},attachListeners:function(){var a=this.undoManager.editor,
 b=a.editable(),d=this;b.attachListener(b,"keydown",function(a){d.onKeydown(a);if(c.ieFunctionalKeysBug(a.data.getKey()))d.onInput()},null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",d.onInput,d,null,999);b.attachListener(b,"keyup",d.onKeyup,d,null,999);b.attachListener(b,"paste",d.ignoreInputEventListener,d,null,999);b.attachListener(b,"drop",d.ignoreInputEventListener,d,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){d.onNavigationKey()},
 null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){d.keyEventsStack.remove(9)},null,null,999)}};var l=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};l.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:
 null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}}(),function(){function a(a,
-c){c=void 0===c||c;var e;if(c)e=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){e=a.getParent();if(!e)break;a=e}e=a.getStyle("text-align")||a.getAttribute("align")||""}e&&(e=e.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!e&&c&&(e="rtl"==a.getComputedStyle("direction")?"right":"left");return e}function e(a,c,e){this.editor=a;this.name=c;this.value=e;this.context="p";c=a.config.justifyClasses;var l=a.config.enterMode==CKEDITOR.ENTER_P?
-"p":"div";if(c){switch(e){case "left":this.cssClassName=c[0];break;case "center":this.cssClassName=c[1];break;case "right":this.cssClassName=c[2];break;case "justify":this.cssClassName=c[3]}this.cssClassRegex=new RegExp("(?:^|\\s+)(?:"+c.join("|")+")(?\x3d$|\\s)");this.requiredContent=l+"("+this.cssClassName+")"}else this.requiredContent=l+"{text-align}";this.allowedContent={"caption div h1 h2 h3 h4 h5 h6 p pre td th li":{propertiesOnly:!0,styles:this.cssClassName?null:"text-align",classes:this.cssClassName||
-null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function c(a){var c=a.editor,e=c.createRange();e.setStartBefore(a.data.node);e.setEndAfter(a.data.node);for(var l=new CKEDITOR.dom.walker(e),k;k=l.next();)if(k.type==CKEDITOR.NODE_ELEMENT)if(!k.equals(a.data.node)&&k.getDirection())e.setStartAfter(k),l=new CKEDITOR.dom.walker(e);else{var b=c.config.justifyClasses;b&&(k.hasClass(b[0])?(k.removeClass(b[0]),k.addClass(b[2])):k.hasClass(b[2])&&(k.removeClass(b[2]),k.addClass(b[0])));
-b=k.getStyle("text-align");"left"==b?k.setStyle("text-align","right"):"right"==b&&k.setStyle("text-align","left")}}e.prototype={exec:function(c){var e=c.getSelection(),m=c.config.enterMode;if(e){for(var l=e.createBookmarks(),k=e.getRanges(),b=this.cssClassName,d,h,p=c.config.useComputedState,p=void 0===p||p,v=k.length-1;0<=v;v--)for(d=k[v].createIterator(),d.enlargeBr=m!=CKEDITOR.ENTER_BR;h=d.getNextParagraph(m==CKEDITOR.ENTER_P?"p":"div");)if(!h.isReadOnly()){h.removeAttribute("align");h.removeStyle("text-align");
-var u=b&&(h.$.className=CKEDITOR.tools.ltrim(h.$.className.replace(this.cssClassRegex,""))),t=this.state==CKEDITOR.TRISTATE_OFF&&(!p||a(h,!0)!=this.value);b?t?h.addClass(b):u||h.removeAttribute("class"):t&&h.setStyle("text-align",this.value)}c.focus();c.forceNextSelectionCheck();e.selectBookmarks(l)}},refresh:function(c,e){var m=e.block||e.blockLimit;this.setState("body"!=m.getName()&&a(m,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("justify",
-{init:function(a){if(!a.blockless){var f=new e(a,"justifyleft","left"),m=new e(a,"justifycenter","center"),l=new e(a,"justifyright","right"),k=new e(a,"justifyblock","justify");a.addCommand("justifyleft",f);a.addCommand("justifycenter",m);a.addCommand("justifyright",l);a.addCommand("justifyblock",k);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.justify.left,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.justify.center,command:"justifycenter",
+c){c=void 0===c||c;var f;if(c)f=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){f=a.getParent();if(!f)break;a=f}f=a.getStyle("text-align")||a.getAttribute("align")||""}f&&(f=f.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!f&&c&&(f="rtl"==a.getComputedStyle("direction")?"right":"left");return f}function f(a,c,f){this.editor=a;this.name=c;this.value=f;this.context="p";c=a.config.justifyClasses;var l=a.config.enterMode==CKEDITOR.ENTER_P?
+"p":"div";if(c){switch(f){case "left":this.cssClassName=c[0];break;case "center":this.cssClassName=c[1];break;case "right":this.cssClassName=c[2];break;case "justify":this.cssClassName=c[3]}this.cssClassRegex=new RegExp("(?:^|\\s+)(?:"+c.join("|")+")(?\x3d$|\\s)");this.requiredContent=l+"("+this.cssClassName+")"}else this.requiredContent=l+"{text-align}";this.allowedContent={"caption div h1 h2 h3 h4 h5 h6 p pre td th li":{propertiesOnly:!0,styles:this.cssClassName?null:"text-align",classes:this.cssClassName||
+null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function c(a){var c=a.editor,f=c.createRange();f.setStartBefore(a.data.node);f.setEndAfter(a.data.node);for(var l=new CKEDITOR.dom.walker(f),k;k=l.next();)if(k.type==CKEDITOR.NODE_ELEMENT)if(!k.equals(a.data.node)&&k.getDirection())f.setStartAfter(k),l=new CKEDITOR.dom.walker(f);else{var b=c.config.justifyClasses;b&&(k.hasClass(b[0])?(k.removeClass(b[0]),k.addClass(b[2])):k.hasClass(b[2])&&(k.removeClass(b[2]),k.addClass(b[0])));
+b=k.getStyle("text-align");"left"==b?k.setStyle("text-align","right"):"right"==b&&k.setStyle("text-align","left")}}f.prototype={exec:function(c){var f=c.getSelection(),m=c.config.enterMode;if(f){for(var l=f.createBookmarks(),k=f.getRanges(),b=this.cssClassName,d,g,p=c.config.useComputedState,p=void 0===p||p,u=k.length-1;0<=u;u--)for(d=k[u].createIterator(),d.enlargeBr=m!=CKEDITOR.ENTER_BR;g=d.getNextParagraph(m==CKEDITOR.ENTER_P?"p":"div");)if(!g.isReadOnly()){g.removeAttribute("align");g.removeStyle("text-align");
+var v=b&&(g.$.className=CKEDITOR.tools.ltrim(g.$.className.replace(this.cssClassRegex,""))),r=this.state==CKEDITOR.TRISTATE_OFF&&(!p||a(g,!0)!=this.value);b?r?g.addClass(b):v||g.removeAttribute("class"):r&&g.setStyle("text-align",this.value)}c.focus();c.forceNextSelectionCheck();f.selectBookmarks(l)}},refresh:function(c,f){var m=f.block||f.blockLimit;this.setState("body"!=m.getName()&&a(m,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("justify",
+{init:function(a){if(!a.blockless){var h=new f(a,"justifyleft","left"),m=new f(a,"justifycenter","center"),l=new f(a,"justifyright","right"),k=new f(a,"justifyblock","justify");a.addCommand("justifyleft",h);a.addCommand("justifycenter",m);a.addCommand("justifyright",l);a.addCommand("justifyblock",k);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.justify.left,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.justify.center,command:"justifycenter",
 toolbar:"align,20"}),a.ui.addButton("JustifyRight",{label:a.lang.justify.right,command:"justifyright",toolbar:"align,30"}),a.ui.addButton("JustifyBlock",{label:a.lang.justify.block,command:"justifyblock",toolbar:"align,40"}));a.on("dirChanged",c)}}})}(),function(){var a={readOnly:1,preserveState:!0,editorFocus:!1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state!=CKEDITOR.TRISTATE_ON||a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&!a.focusManager.hasFocus?
-"removeClass":"attachClass";a.editable()[c]("cke_show_blocks")}}};CKEDITOR.plugins.add("showblocks",{onLoad:function(){var a="p div pre address blockquote h1 h2 h3 h4 h5 h6".split(" "),c,g,f,m,l=CKEDITOR.getUrl(this.path),k=!(CKEDITOR.env.ie&&9>CKEDITOR.env.version),b=k?":not([contenteditable\x3dfalse]):not(.cke_show_blocks_off)":"",d,h;for(c=g=f=m="";d=a.pop();)h=a.length?",":"",c+=".cke_show_blocks "+d+b+h,f+=".cke_show_blocks.cke_contents_ltr "+d+b+h,m+=".cke_show_blocks.cke_contents_rtl "+d+b+
-h,g+=".cke_show_blocks "+d+b+"{background-image:url("+CKEDITOR.getUrl(l+"images/block_"+d+".png")+")}";CKEDITOR.addCss((c+"{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px}").concat(g,f+"{background-position:top left;padding-left:8px}",m+"{background-position:top right;padding-right:8px}"));k||CKEDITOR.addCss(".cke_show_blocks [contenteditable\x3dfalse],.cke_show_blocks .cke_show_blocks_off{border:none;padding-top:0;background-image:none}.cke_show_blocks.cke_contents_rtl [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{padding-right:0}.cke_show_blocks.cke_contents_ltr [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{padding-left:0}")},
-init:function(e){function c(){g.refresh(e)}if(!e.blockless){var g=e.addCommand("showblocks",a);g.canUndo=!1;e.config.startupOutlineBlocks&&g.setState(CKEDITOR.TRISTATE_ON);e.ui.addButton&&e.ui.addButton("ShowBlocks",{label:e.lang.showblocks.toolbar,command:"showblocks",toolbar:"tools,20"});e.on("mode",function(){g.state!=CKEDITOR.TRISTATE_DISABLED&&g.refresh(e)});e.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(e.on("focus",c),e.on("blur",c));e.on("contentDom",function(){g.state!=CKEDITOR.TRISTATE_DISABLED&&
-g.refresh(e)})}}})}(),function(){var a={preserveState:!0,editorFocus:!1,readOnly:1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state==CKEDITOR.TRISTATE_ON?"attachClass":"removeClass";a.editable()[c]("cke_show_borders")}}};CKEDITOR.plugins.add("showborders",{modes:{wysiwyg:1},onLoad:function(){var a;a=(CKEDITOR.env.ie6Compat?[".%1 table.%2,",".%1 table.%2 td, .%1 table.%2 th","{","border : #d3d3d3 1px dotted","}"]:".%1 table.%2,;.%1 table.%2 \x3e tr \x3e td, .%1 table.%2 \x3e tr \x3e th,;.%1 table.%2 \x3e tbody \x3e tr \x3e td, .%1 table.%2 \x3e tbody \x3e tr \x3e th,;.%1 table.%2 \x3e thead \x3e tr \x3e td, .%1 table.%2 \x3e thead \x3e tr \x3e th,;.%1 table.%2 \x3e tfoot \x3e tr \x3e td, .%1 table.%2 \x3e tfoot \x3e tr \x3e th;{;border : #d3d3d3 1px dotted;}".split(";")).join("").replace(/%2/g,
-"cke_show_border").replace(/%1/g,"cke_show_borders ");CKEDITOR.addCss(a)},init:function(e){var c=e.addCommand("showborders",a);c.canUndo=!1;!1!==e.config.startupShowBorders&&c.setState(CKEDITOR.TRISTATE_ON);e.on("mode",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(e)},null,null,100);e.on("contentDom",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(e)});e.on("removeFormatCleanup",function(a){a=a.data;e.getCommand("showborders").state==CKEDITOR.TRISTATE_ON&&a.is("table")&&(!a.hasAttribute("border")||
-0>=parseInt(a.getAttribute("border"),10))&&a.addClass("cke_show_border")})},afterInit:function(a){var c=a.dataProcessor;a=c&&c.dataFilter;c=c&&c.htmlFilter;a&&a.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"],e=parseInt(a.border,10);e&&!(0>=e)||c&&-1!=c.indexOf("cke_show_border")||(a["class"]=(c||"")+" cke_show_border")}}});c&&c.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"];c&&(a["class"]=c.replace("cke_show_border","").replace(/\s{2}/," ").replace(/^\s+|\s+$/,
-""))}}})}});CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;if("table"==c||"tableProperties"==c)if(a=a.data.definition,c=a.getContents("info").get("txtBorder"),c.commit=CKEDITOR.tools.override(c.commit,function(a){return function(c,e){a.apply(this,arguments);var l=parseInt(this.getValue(),10);e[!l||0>=l?"addClass":"removeClass"]("cke_show_border")}}),a=(a=a.getContents("advanced"))&&a.get("advCSSClasses"))a.setup=CKEDITOR.tools.override(a.setup,function(a){return function(){a.apply(this,
-arguments);this.setValue(this.getValue().replace(/cke_show_border/,""))}}),a.commit=CKEDITOR.tools.override(a.commit,function(a){return function(c,e){a.apply(this,arguments);parseInt(e.getAttribute("border"),10)||e.addClass("cke_show_border")}})})}(),function(){function a(a){return CKEDITOR.env.ie?a.$.clientWidth:parseInt(a.getComputedStyle("width"),10)}function e(a,c){var e=a.getComputedStyle("border-"+c+"-width"),f={thin:"0px",medium:"1px",thick:"2px"};0>e.indexOf("px")&&(e=e in f&&"none"!=a.getComputedStyle("border-style")?
-f[e]:0);return parseInt(e,10)}function c(a){var c=[],f=-1,g="rtl"==a.getComputedStyle("direction"),k;k=a.$.rows;for(var l=0,m,n,q,w=0,y=k.length;w<y;w++)q=k[w],m=q.cells.length,m>l&&(l=m,n=q);k=n;l=new CKEDITOR.dom.element(a.$.tBodies[0]);m=l.getDocumentPosition();n=0;for(q=k.cells.length;n<q;n++){var w=new CKEDITOR.dom.element(k.cells[n]),y=k.cells[n+1]&&new CKEDITOR.dom.element(k.cells[n+1]),f=f+(w.$.colSpan||1),C,r,x=w.getDocumentPosition().x;g?r=x+e(w,"left"):C=x+w.$.offsetWidth-e(w,"right");
-y?(x=y.getDocumentPosition().x,g?C=x+y.$.offsetWidth-e(y,"right"):r=x+e(y,"left")):(x=a.getDocumentPosition().x,g?C=x:r=x+a.$.offsetWidth);w=Math.max(r-C,3);c.push({table:a,index:f,x:C,y:m.y,width:w,height:l.$.offsetHeight,rtl:g})}return c}function g(a){(a.data||a).preventDefault()}function f(b){function c(){w=0;q.setOpacity(0);C&&f();var a=t.table;setTimeout(function(){a.removeCustomData("_cke_table_pillars")},0);n.removeListener("dragstart",g)}function f(){for(var c=t.rtl,d=c?x.length:r.length,
-h=0,g=0;g<d;g++){var k=r[g],m=x[g],n=t.table;CKEDITOR.tools.setTimeout(function(a,e,f,g,k,m){a&&a.setStyle("width",l(Math.max(e+m,1)));f&&f.setStyle("width",l(Math.max(g-m,1)));k&&n.setStyle("width",l(k+m*(c?-1:1)));++h==d&&b.fire("saveSnapshot")},0,this,[k,k&&a(k),m,m&&a(m),(!k||!m)&&a(n)+e(n,"left")+e(n,"right"),C])}}function m(c){g(c);b.fire("saveSnapshot");c=t.index;for(var d=CKEDITOR.tools.buildTableMap(t.table),e=[],f=[],h=Number.MAX_VALUE,k=h,l=t.rtl,p=0,z=d.length;p<z;p++){var L=d[p],Q=L[c+
-(l?1:0)],L=L[c+(l?0:1)],Q=Q&&new CKEDITOR.dom.element(Q),L=L&&new CKEDITOR.dom.element(L);Q&&L&&Q.equals(L)||(Q&&(h=Math.min(h,a(Q))),L&&(k=Math.min(k,a(L))),e.push(Q),f.push(L))}r=e;x=f;B=t.x-h;A=t.x+k;q.setOpacity(.5);y=parseInt(q.getStyle("left"),10);C=0;w=1;q.on("mousemove",u);n.on("dragstart",g);n.on("mouseup",v,this)}function v(a){a.removeListener();c()}function u(a){z(a.data.getPageOffset().x)}var t,n,q,w,y,C,r,x,B,A;n=b.document;q=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-temp\x3d1 contenteditable\x3dfalse unselectable\x3don style\x3d"position:absolute;cursor:col-resize;filter:alpha(opacity\x3d0);opacity:0;padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"\x3e\x3c/div\x3e',
-n);b.on("destroy",function(){q.remove()});k||n.getDocumentElement().append(q);this.attachTo=function(a){w||(k&&(n.getBody().append(q),C=0),t=a,q.setStyles({width:l(a.width),height:l(a.height),left:l(a.x),top:l(a.y)}),k&&q.setOpacity(.25),q.on("mousedown",m,this),n.getBody().setStyle("cursor","col-resize"),q.show())};var z=this.move=function(a){if(!t)return 0;if(!w&&(a<t.x||a>t.x+t.width))return t=null,w=C=0,n.removeListener("mouseup",v),q.removeListener("mousedown",m),q.removeListener("mousemove",
-u),n.getBody().setStyle("cursor","auto"),k?q.remove():q.hide(),0;a-=Math.round(q.$.offsetWidth/2);if(w){if(a==B||a==A)return 1;a=Math.max(a,B);a=Math.min(a,A);C=a-y}q.setStyle("left",l(a));return 1}}function m(a){var c=a.data.getTarget();if("mouseout"==a.name){if(!c.is("table"))return;for(var e=new CKEDITOR.dom.element(a.data.$.relatedTarget||a.data.$.toElement);e&&e.$&&!e.equals(c)&&!e.is("body");)e=e.getParent();if(!e||e.equals(c))return}c.getAscendant("table",1).removeCustomData("_cke_table_pillars");
-a.removeListener()}var l=CKEDITOR.tools.cssLength,k=CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks);CKEDITOR.plugins.add("tableresize",{requires:"tabletools",init:function(a){a.on("contentDom",function(){var d,e=a.editable();e.attachListener(e.isInline()?e:a.document,"mousemove",function(e){e=e.data;var h=e.getTarget();if(h.type==CKEDITOR.NODE_ELEMENT){var k=e.getPageOffset().x;if(d&&d.move(k))g(e);else if(h.is("table")||h.getAscendant("tbody",1))if(h=h.getAscendant("table",1),a.editable().contains(h)){(e=
-h.getCustomData("_cke_table_pillars"))||(h.setCustomData("_cke_table_pillars",e=c(h)),h.on("mouseout",m),h.on("mousedown",m));a:{for(var h=0,l=e.length;h<l;h++){var n=e[h];if(k>=n.x&&k<=n.x+n.width){k=n;break a}}k=null}k&&(!d&&(d=new f(a)),d.attachTo(k))}}})})}})}(),function(){function a(a,g,f){var m,l;if(f="string"==typeof f?CKEDITOR.document.getById(f):new CKEDITOR.dom.element(f))if(m=a.fire("uiSpace",{space:g,html:""}).html)a.on("uiSpace",function(a){a.data.space==g&&a.cancel()},null,null,1),l=
-f.append(CKEDITOR.dom.element.createFromHtml(e.output({id:a.id,name:a.name,langDir:a.lang.dir,langCode:a.langCode,space:g,spaceId:a.ui.spaceId(g),content:m}))),f.getCustomData("cke_hasshared")?l.hide():f.setCustomData("cke_hasshared",1),l.unselectable(),l.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()}),a.focusManager.add(l,1),a.on("focus",function(){for(var a=0,b,c=f.getChildren();b=c.getItem(a);a++)b.type==CKEDITOR.NODE_ELEMENT&&!b.equals(l)&&b.hasClass("cke_shared")&&
-b.hide();l.show()}),a.on("destroy",function(){l.remove()})}var e=CKEDITOR.addTemplate("sharedcontainer",'\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_shared cke_detached cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{spaceId}" class\x3d"cke_{space}" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e');
+"removeClass":"attachClass";a.editable()[c]("cke_show_blocks")}}};CKEDITOR.plugins.add("showblocks",{onLoad:function(){var a="p div pre address blockquote h1 h2 h3 h4 h5 h6".split(" "),c,e,h,m,l=CKEDITOR.getUrl(this.path),k=!(CKEDITOR.env.ie&&9>CKEDITOR.env.version),b=k?":not([contenteditable\x3dfalse]):not(.cke_show_blocks_off)":"",d,g;for(c=e=h=m="";d=a.pop();)g=a.length?",":"",c+=".cke_show_blocks "+d+b+g,h+=".cke_show_blocks.cke_contents_ltr "+d+b+g,m+=".cke_show_blocks.cke_contents_rtl "+d+b+
+g,e+=".cke_show_blocks "+d+b+"{background-image:url("+CKEDITOR.getUrl(l+"images/block_"+d+".png")+")}";CKEDITOR.addCss((c+"{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px}").concat(e,h+"{background-position:top left;padding-left:8px}",m+"{background-position:top right;padding-right:8px}"));k||CKEDITOR.addCss(".cke_show_blocks [contenteditable\x3dfalse],.cke_show_blocks .cke_show_blocks_off{border:none;padding-top:0;background-image:none}.cke_show_blocks.cke_contents_rtl [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{padding-right:0}.cke_show_blocks.cke_contents_ltr [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{padding-left:0}")},
+init:function(f){function c(){e.refresh(f)}if(!f.blockless){var e=f.addCommand("showblocks",a);e.canUndo=!1;f.config.startupOutlineBlocks&&e.setState(CKEDITOR.TRISTATE_ON);f.ui.addButton&&f.ui.addButton("ShowBlocks",{label:f.lang.showblocks.toolbar,command:"showblocks",toolbar:"tools,20"});f.on("mode",function(){e.state!=CKEDITOR.TRISTATE_DISABLED&&e.refresh(f)});f.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&(f.on("focus",c),f.on("blur",c));f.on("contentDom",function(){e.state!=CKEDITOR.TRISTATE_DISABLED&&
+e.refresh(f)})}}})}(),function(){var a={preserveState:!0,editorFocus:!1,readOnly:1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state==CKEDITOR.TRISTATE_ON?"attachClass":"removeClass";a.editable()[c]("cke_show_borders")}}};CKEDITOR.plugins.add("showborders",{modes:{wysiwyg:1},onLoad:function(){var a;a=(CKEDITOR.env.ie6Compat?[".%1 table.%2,",".%1 table.%2 td, .%1 table.%2 th","{","border : #d3d3d3 1px dotted","}"]:".%1 table.%2,;.%1 table.%2 \x3e tr \x3e td, .%1 table.%2 \x3e tr \x3e th,;.%1 table.%2 \x3e tbody \x3e tr \x3e td, .%1 table.%2 \x3e tbody \x3e tr \x3e th,;.%1 table.%2 \x3e thead \x3e tr \x3e td, .%1 table.%2 \x3e thead \x3e tr \x3e th,;.%1 table.%2 \x3e tfoot \x3e tr \x3e td, .%1 table.%2 \x3e tfoot \x3e tr \x3e th;{;border : #d3d3d3 1px dotted;}".split(";")).join("").replace(/%2/g,
+"cke_show_border").replace(/%1/g,"cke_show_borders ");CKEDITOR.addCss(a)},init:function(f){var c=f.addCommand("showborders",a);c.canUndo=!1;!1!==f.config.startupShowBorders&&c.setState(CKEDITOR.TRISTATE_ON);f.on("mode",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(f)},null,null,100);f.on("contentDom",function(){c.state!=CKEDITOR.TRISTATE_DISABLED&&c.refresh(f)});f.on("removeFormatCleanup",function(a){a=a.data;f.getCommand("showborders").state==CKEDITOR.TRISTATE_ON&&a.is("table")&&(!a.hasAttribute("border")||
+0>=parseInt(a.getAttribute("border"),10))&&a.addClass("cke_show_border")})},afterInit:function(a){var c=a.dataProcessor;a=c&&c.dataFilter;c=c&&c.htmlFilter;a&&a.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"],f=parseInt(a.border,10);f&&!(0>=f)||c&&-1!=c.indexOf("cke_show_border")||(a["class"]=(c||"")+" cke_show_border")}}});c&&c.addRules({elements:{table:function(a){a=a.attributes;var c=a["class"];c&&(a["class"]=c.replace("cke_show_border","").replace(/\s{2}/," ").replace(/^\s+|\s+$/,
+""))}}})}});CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;if("table"==c||"tableProperties"==c)if(a=a.data.definition,c=a.getContents("info").get("txtBorder"),c.commit=CKEDITOR.tools.override(c.commit,function(a){return function(c,f){a.apply(this,arguments);var l=parseInt(this.getValue(),10);f[!l||0>=l?"addClass":"removeClass"]("cke_show_border")}}),a=(a=a.getContents("advanced"))&&a.get("advCSSClasses"))a.setup=CKEDITOR.tools.override(a.setup,function(a){return function(){a.apply(this,
+arguments);this.setValue(this.getValue().replace(/cke_show_border/,""))}}),a.commit=CKEDITOR.tools.override(a.commit,function(a){return function(c,f){a.apply(this,arguments);parseInt(f.getAttribute("border"),10)||f.addClass("cke_show_border")}})})}(),function(){function a(a){return CKEDITOR.env.ie?a.$.clientWidth:parseInt(a.getComputedStyle("width"),10)}function f(a,c){var e=a.getComputedStyle("border-"+c+"-width"),f={thin:"0px",medium:"1px",thick:"2px"};0>e.indexOf("px")&&(e=e in f&&"none"!=a.getComputedStyle("border-style")?
+f[e]:0);return parseInt(e,10)}function c(a){var c=[],e=-1,h="rtl"==a.getComputedStyle("direction"),k;k=a.$.rows;for(var l=0,m,n,q,w=0,A=k.length;w<A;w++)q=k[w],m=q.cells.length,m>l&&(l=m,n=q);k=n;l=new CKEDITOR.dom.element(a.$.tBodies[0]);m=l.getDocumentPosition();n=0;for(q=k.cells.length;n<q;n++){var w=new CKEDITOR.dom.element(k.cells[n]),A=k.cells[n+1]&&new CKEDITOR.dom.element(k.cells[n+1]),e=e+(w.$.colSpan||1),B,t,x=w.getDocumentPosition().x;h?t=x+f(w,"left"):B=x+w.$.offsetWidth-f(w,"right");
+A?(x=A.getDocumentPosition().x,h?B=x+A.$.offsetWidth-f(A,"right"):t=x+f(A,"left")):(x=a.getDocumentPosition().x,h?B=x:t=x+a.$.offsetWidth);w=Math.max(t-B,3);c.push({table:a,index:e,x:B,y:m.y,width:w,height:l.$.offsetHeight,rtl:h})}return c}function e(a){(a.data||a).preventDefault()}function h(b){function c(){w=0;q.setOpacity(0);B&&g();var a=r.table;setTimeout(function(){a.removeCustomData("_cke_table_pillars")},0);n.removeListener("dragstart",e)}function g(){for(var c=r.rtl,d=c?x.length:t.length,
+e=0,g=0;g<d;g++){var h=t[g],k=x[g],m=r.table;CKEDITOR.tools.setTimeout(function(a,f,g,h,k,n){a&&a.setStyle("width",l(Math.max(f+n,1)));g&&g.setStyle("width",l(Math.max(h-n,1)));k&&m.setStyle("width",l(k+n*(c?-1:1)));++e==d&&b.fire("saveSnapshot")},0,this,[h,h&&a(h),k,k&&a(k),(!h||!k)&&a(m)+f(m,"left")+f(m,"right"),B])}}function h(c){e(c);b.fire("saveSnapshot");c=r.index;for(var d=CKEDITOR.tools.buildTableMap(r.table),f=[],g=[],k=Number.MAX_VALUE,l=k,p=r.rtl,z=0,R=d.length;z<R;z++){var L=d[z],Q=L[c+
+(p?1:0)],L=L[c+(p?0:1)],Q=Q&&new CKEDITOR.dom.element(Q),L=L&&new CKEDITOR.dom.element(L);Q&&L&&Q.equals(L)||(Q&&(k=Math.min(k,a(Q))),L&&(l=Math.min(l,a(L))),f.push(Q),g.push(L))}t=f;x=g;D=r.x-k;y=r.x+l;q.setOpacity(.5);A=parseInt(q.getStyle("left"),10);B=0;w=1;q.on("mousemove",v);n.on("dragstart",e);n.on("mouseup",m,this)}function m(a){a.removeListener();c()}function v(a){z(a.data.getPageOffset().x)}var r,n,q,w,A,B,t,x,D,y;n=b.document;q=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-temp\x3d1 contenteditable\x3dfalse unselectable\x3don style\x3d"position:absolute;cursor:col-resize;filter:alpha(opacity\x3d0);opacity:0;padding:0;background-color:#004;background-image:none;border:0px none;z-index:10"\x3e\x3c/div\x3e',
+n);b.on("destroy",function(){q.remove()});k||n.getDocumentElement().append(q);this.attachTo=function(a){w||(k&&(n.getBody().append(q),B=0),r=a,q.setStyles({width:l(a.width),height:l(a.height),left:l(a.x),top:l(a.y)}),k&&q.setOpacity(.25),q.on("mousedown",h,this),n.getBody().setStyle("cursor","col-resize"),q.show())};var z=this.move=function(a){if(!r)return 0;if(!w&&(a<r.x||a>r.x+r.width))return r=null,w=B=0,n.removeListener("mouseup",m),q.removeListener("mousedown",h),q.removeListener("mousemove",
+v),n.getBody().setStyle("cursor","auto"),k?q.remove():q.hide(),0;a-=Math.round(q.$.offsetWidth/2);if(w){if(a==D||a==y)return 1;a=Math.max(a,D);a=Math.min(a,y);B=a-A}q.setStyle("left",l(a));return 1}}function m(a){var c=a.data.getTarget();if("mouseout"==a.name){if(!c.is("table"))return;for(var e=new CKEDITOR.dom.element(a.data.$.relatedTarget||a.data.$.toElement);e&&e.$&&!e.equals(c)&&!e.is("body");)e=e.getParent();if(!e||e.equals(c))return}c.getAscendant("table",1).removeCustomData("_cke_table_pillars");
+a.removeListener()}var l=CKEDITOR.tools.cssLength,k=CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks);CKEDITOR.plugins.add("tableresize",{requires:"tabletools",init:function(a){a.on("contentDom",function(){var d,f=a.editable();f.attachListener(f.isInline()?f:a.document,"mousemove",function(f){f=f.data;var g=f.getTarget();if(g.type==CKEDITOR.NODE_ELEMENT){var k=f.getPageOffset().x;if(d&&d.move(k))e(f);else if(g.is("table")||g.getAscendant("tbody",1))if(g=g.getAscendant("table",1),a.editable().contains(g)){(f=
+g.getCustomData("_cke_table_pillars"))||(g.setCustomData("_cke_table_pillars",f=c(g)),g.on("mouseout",m),g.on("mousedown",m));a:{for(var g=0,l=f.length;g<l;g++){var n=f[g];if(k>=n.x&&k<=n.x+n.width){k=n;break a}}k=null}k&&(!d&&(d=new h(a)),d.attachTo(k))}}})})}})}(),function(){function a(a,e,h){var m,l;if(h="string"==typeof h?CKEDITOR.document.getById(h):new CKEDITOR.dom.element(h))if(m=a.fire("uiSpace",{space:e,html:""}).html)a.on("uiSpace",function(a){a.data.space==e&&a.cancel()},null,null,1),l=
+h.append(CKEDITOR.dom.element.createFromHtml(f.output({id:a.id,name:a.name,langDir:a.lang.dir,langCode:a.langCode,space:e,spaceId:a.ui.spaceId(e),content:m}))),h.getCustomData("cke_hasshared")?l.hide():h.setCustomData("cke_hasshared",1),l.unselectable(),l.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()}),a.focusManager.add(l,1),a.on("focus",function(){for(var a=0,b,c=h.getChildren();b=c.getItem(a);a++)b.type==CKEDITOR.NODE_ELEMENT&&!b.equals(l)&&b.hasClass("cke_shared")&&
+b.hide();l.show()}),a.on("destroy",function(){l.remove()})}var f=CKEDITOR.addTemplate("sharedcontainer",'\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_shared cke_detached cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?" ":"")+'" lang\x3d"{langCode}" role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{spaceId}" class\x3d"cke_{space}" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e');
 CKEDITOR.plugins.add("sharedspace",{init:function(c){c.on("loaded",function(){var e=c.config.sharedSpaces;if(e)for(var f in e)a(c,f,e[f])},null,null,9)}})}(),CKEDITOR.plugins.add("sourcedialog",{init:function(a){a.addCommand("sourcedialog",new CKEDITOR.dialogCommand("sourcedialog"));CKEDITOR.dialog.add("sourcedialog",this.path+"dialogs/sourcedialog.js");a.ui.addButton&&a.ui.addButton("Sourcedialog",{label:a.lang.sourcedialog.toolbar,command:"sourcedialog",toolbar:"mode,10"})}}),"use strict",function(){function a(a,
-c){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},c,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function e(a,c){CKEDITOR.tools.extend(this,c,{editor:a},!0)}function c(a,c){var e=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:e,inline:e.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},c,!0);this.hidden=
-{};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var g=CKEDITOR.tools.bind(this.queryViewport,this),k=CKEDITOR.tools.bind(this.hideVisible,this),l=CKEDITOR.tools.bind(this.removeAll,this);e.attachListener(this.winTop,"resize",g);e.attachListener(this.winTop,"scroll",g);e.attachListener(this.winTop,"resize",k);e.attachListener(this.win,"scroll",k);e.attachListener(this.inline?e:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;this.queryViewport();
-(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);e.attachListener(a,"resize",g);e.attachListener(a,"mode",l);a.on("destroy",l);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
-m,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},f,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},f,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function g(a){var c;if(c=a&&a.type==CKEDITOR.NODE_ELEMENT)c=!(l[a.getComputedStyle("float")]||l[a.getAttribute("align")]);return c&&
-!k[a.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils");CKEDITOR.LINEUTILS_BEFORE=1;CKEDITOR.LINEUTILS_AFTER=2;CKEDITOR.LINEUTILS_INSIDE=4;a.prototype={start:function(a){var c=this,e=this.editor,f=this.doc,g,k,l,m,q=CKEDITOR.tools.eventsBuffer(50,function(){e.readOnly||"wysiwyg"!=e.mode||(c.relations={},(k=f.$.elementFromPoint(l,m))&&k.nodeType&&(g=new CKEDITOR.dom.element(k),c.traverseSearch(g),isNaN(l+m)||c.pixelSearch(g,l,m),a&&a(c.relations,l,m)))});this.listener=this.editable.attachListener(this.target,
+c){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},c,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function f(a,c){CKEDITOR.tools.extend(this,c,{editor:a},!0)}function c(a,c){var e=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:e,inline:e.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},c,!0);this.hidden=
+{};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var f=CKEDITOR.tools.bind(this.queryViewport,this),k=CKEDITOR.tools.bind(this.hideVisible,this),l=CKEDITOR.tools.bind(this.removeAll,this);e.attachListener(this.winTop,"resize",f);e.attachListener(this.winTop,"scroll",f);e.attachListener(this.winTop,"resize",k);e.attachListener(this.win,"scroll",k);e.attachListener(this.inline?e:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;this.queryViewport();
+(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);e.attachListener(a,"resize",f);e.attachListener(a,"mode",l);a.on("destroy",l);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
+m,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},h,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function e(a){var c;if(c=a&&a.type==CKEDITOR.NODE_ELEMENT)c=!(l[a.getComputedStyle("float")]||l[a.getAttribute("align")]);return c&&
+!k[a.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils");CKEDITOR.LINEUTILS_BEFORE=1;CKEDITOR.LINEUTILS_AFTER=2;CKEDITOR.LINEUTILS_INSIDE=4;a.prototype={start:function(a){var c=this,e=this.editor,f=this.doc,h,k,l,m,q=CKEDITOR.tools.eventsBuffer(50,function(){e.readOnly||"wysiwyg"!=e.mode||(c.relations={},(k=f.$.elementFromPoint(l,m))&&k.nodeType&&(h=new CKEDITOR.dom.element(k),c.traverseSearch(h),isNaN(l+m)||c.pixelSearch(h,l,m),a&&a(c.relations,l,m)))});this.listener=this.editable.attachListener(this.target,
 "mousemove",function(a){l=a.data.$.clientX;m=a.data.$.clientY;q.input()});this.editable.attachListener(this.inline?this.editable:this.frame,"mouseout",function(){q.reset()})},stop:function(){this.listener&&this.listener.removeListener()},getRange:function(){var a={};a[CKEDITOR.LINEUTILS_BEFORE]=CKEDITOR.POSITION_BEFORE_START;a[CKEDITOR.LINEUTILS_AFTER]=CKEDITOR.POSITION_AFTER_END;a[CKEDITOR.LINEUTILS_INSIDE]=CKEDITOR.POSITION_AFTER_START;return function(c){var e=this.editor.createRange();e.moveToPosition(this.relations[c.uid].element,
-a[c.type]);return e}}(),store:function(){function a(b,c,e){var f=b.getUniqueId();f in e?e[f].type|=c:e[f]={element:b,type:c}}return function(c,e){var f;e&CKEDITOR.LINEUTILS_AFTER&&g(f=c.getNext())&&f.isVisible()&&(a(f,CKEDITOR.LINEUTILS_BEFORE,this.relations),e^=CKEDITOR.LINEUTILS_AFTER);e&CKEDITOR.LINEUTILS_INSIDE&&g(f=c.getFirst())&&f.isVisible()&&(a(f,CKEDITOR.LINEUTILS_BEFORE,this.relations),e^=CKEDITOR.LINEUTILS_INSIDE);a(c,e,this.relations)}}(),traverseSearch:function(a){var c,e,f;do if(f=a.$["data-cke-expando"],
-!(f&&f in this.relations)){if(a.equals(this.editable))break;if(g(a))for(c in this.lookups)(e=this.lookups[c](a))&&this.store(a,e)}while((!a||a.type!=CKEDITOR.NODE_ELEMENT||"true"!=a.getAttribute("contenteditable"))&&(a=a.getParent()))},pixelSearch:function(){function a(b,e,f,k,l){for(var m=0,q;l(f);){f+=k;if(25==++m)break;if(q=this.doc.$.elementFromPoint(e,f))if(q==b)m=0;else if(c(b,q)&&(m=0,g(q=new CKEDITOR.dom.element(q))))return q}}var c=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(a,b){return a.contains(b)}:
-function(a,b){return!!(a.compareDocumentPosition(b)&16)};return function(c,d,e){var f=this.win.getViewPaneSize().height,k=a.call(this,c.$,d,e,-1,function(a){return 0<a});d=a.call(this,c.$,d,e,1,function(a){return a<f});if(k)for(this.traverseSearch(k);!k.getParent().equals(c);)k=k.getParent();if(d)for(this.traverseSearch(d);!d.getParent().equals(c);)d=d.getParent();for(;k||d;){k&&(k=k.getNext(g));if(!k||k.equals(d))break;this.traverseSearch(k);d&&(d=d.getPrevious(g));if(!d||d.equals(k))break;this.traverseSearch(d)}}}(),
-greedySearch:function(){this.relations={};for(var a=this.editable.getElementsByTag("*"),c=0,e,f,k;e=a.getItem(c++);)if(!e.equals(this.editable)&&e.type==CKEDITOR.NODE_ELEMENT&&(e.hasAttribute("contenteditable")||!e.isReadOnly())&&g(e)&&e.isVisible())for(k in this.lookups)(f=this.lookups[k](e))&&this.store(e,f);return this.relations}};e.prototype={locate:function(){function a(b,c){var e=b.element[c===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return e&&g(e)?(b.siblingRect=e.getClientRect(),
+a[c.type]);return e}}(),store:function(){function a(b,c,e){var f=b.getUniqueId();f in e?e[f].type|=c:e[f]={element:b,type:c}}return function(c,f){var h;f&CKEDITOR.LINEUTILS_AFTER&&e(h=c.getNext())&&h.isVisible()&&(a(h,CKEDITOR.LINEUTILS_BEFORE,this.relations),f^=CKEDITOR.LINEUTILS_AFTER);f&CKEDITOR.LINEUTILS_INSIDE&&e(h=c.getFirst())&&h.isVisible()&&(a(h,CKEDITOR.LINEUTILS_BEFORE,this.relations),f^=CKEDITOR.LINEUTILS_INSIDE);a(c,f,this.relations)}}(),traverseSearch:function(a){var c,f,h;do if(h=a.$["data-cke-expando"],
+!(h&&h in this.relations)){if(a.equals(this.editable))break;if(e(a))for(c in this.lookups)(f=this.lookups[c](a))&&this.store(a,f)}while((!a||a.type!=CKEDITOR.NODE_ELEMENT||"true"!=a.getAttribute("contenteditable"))&&(a=a.getParent()))},pixelSearch:function(){function a(b,f,h,k,l){for(var m=0,q;l(h);){h+=k;if(25==++m)break;if(q=this.doc.$.elementFromPoint(f,h))if(q==b)m=0;else if(c(b,q)&&(m=0,e(q=new CKEDITOR.dom.element(q))))return q}}var c=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(a,b){return a.contains(b)}:
+function(a,b){return!!(a.compareDocumentPosition(b)&16)};return function(c,d,f){var h=this.win.getViewPaneSize().height,k=a.call(this,c.$,d,f,-1,function(a){return 0<a});d=a.call(this,c.$,d,f,1,function(a){return a<h});if(k)for(this.traverseSearch(k);!k.getParent().equals(c);)k=k.getParent();if(d)for(this.traverseSearch(d);!d.getParent().equals(c);)d=d.getParent();for(;k||d;){k&&(k=k.getNext(e));if(!k||k.equals(d))break;this.traverseSearch(k);d&&(d=d.getPrevious(e));if(!d||d.equals(k))break;this.traverseSearch(d)}}}(),
+greedySearch:function(){this.relations={};for(var a=this.editable.getElementsByTag("*"),c=0,f,h,k;f=a.getItem(c++);)if(!f.equals(this.editable)&&f.type==CKEDITOR.NODE_ELEMENT&&(f.hasAttribute("contenteditable")||!f.isReadOnly())&&e(f)&&f.isVisible())for(k in this.lookups)(h=this.lookups[k](f))&&this.store(f,h);return this.relations}};f.prototype={locate:function(){function a(b,c){var f=b.element[c===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return f&&e(f)?(b.siblingRect=f.getClientRect(),
 c==CKEDITOR.LINEUTILS_BEFORE?(b.siblingRect.bottom+b.elementRect.top)/2:(b.elementRect.bottom+b.siblingRect.top)/2):c==CKEDITOR.LINEUTILS_BEFORE?b.elementRect.top:b.elementRect.bottom}return function(c){var e;this.locations={};for(var f in c)e=c[f],e.elementRect=e.element.getClientRect(),e.type&CKEDITOR.LINEUTILS_BEFORE&&this.store(f,CKEDITOR.LINEUTILS_BEFORE,a(e,CKEDITOR.LINEUTILS_BEFORE)),e.type&CKEDITOR.LINEUTILS_AFTER&&this.store(f,CKEDITOR.LINEUTILS_AFTER,a(e,CKEDITOR.LINEUTILS_AFTER)),e.type&
-CKEDITOR.LINEUTILS_INSIDE&&this.store(f,CKEDITOR.LINEUTILS_INSIDE,(e.elementRect.top+e.elementRect.bottom)/2);return this.locations}}(),sort:function(){var a,c,e,f;return function(g,k){a=this.locations;c=[];for(var l in a)for(var m in a[l])if(e=Math.abs(g-a[l][m]),c.length){for(f=0;f<c.length;f++)if(e<c[f].dist){c.splice(f,0,{uid:+l,type:m,dist:e});break}f==c.length&&c.push({uid:+l,type:m,dist:e})}else c.push({uid:+l,type:m,dist:e});return"undefined"!=typeof k?c.slice(0,k):c}}(),store:function(a,
-c,e){this.locations[a]||(this.locations[a]={});this.locations[a][c]=e}};var f={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},m={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};c.prototype={removeAll:function(){for(var a in this.hidden)this.hidden[a].remove(),delete this.hidden[a];for(a in this.visible)this.visible[a].remove(),delete this.visible[a]},hideLine:function(a){var c=a.getUniqueId();
-a.hide();this.hidden[c]=a;delete this.visible[c]},showLine:function(a){var c=a.getUniqueId();a.show();this.visible[c]=a;delete this.hidden[c]},hideVisible:function(){for(var a in this.visible)this.hideLine(this.visible[a])},placeLine:function(a,c){var e,f,g;if(e=this.getStyle(a.uid,a.type)){for(g in this.visible)if(this.visible[g].getCustomData("hash")!==this.hash){f=this.visible[g];break}if(!f)for(g in this.hidden)if(this.hidden[g].getCustomData("hash")!==this.hash){this.showLine(f=this.hidden[g]);
-break}f||this.showLine(f=this.addLine());f.setCustomData("hash",this.hash);this.visible[f.getUniqueId()]=f;f.setStyles(e);c&&c(f)}},getStyle:function(a,c){var e=this.relations[a],f=this.locations[a][c],g={};g.width=e.siblingRect?Math.max(e.siblingRect.width,e.elementRect.width):e.elementRect.width;g.top=this.inline?f+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+f;if(g.top-this.winTopScroll.y<this.rect.top||g.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?
-g.left=e.elementRect.left-this.rect.relativeX:(0<e.elementRect.left?g.left=this.rect.left+e.elementRect.left:(g.width+=e.elementRect.left,g.left=this.rect.left),0<(e=g.left+g.width-(this.rect.left+this.winPane.width))&&(g.width-=e));g.left+=this.winTopScroll.x;for(var k in g)g[k]=CKEDITOR.tools.cssLength(g[k]);return g},addLine:function(){var a=CKEDITOR.dom.element.createFromHtml(this.lineTpl);a.appendTo(this.container);return a},prepare:function(a,c){this.relations=a;this.locations=c;this.hash=Math.random()},
+CKEDITOR.LINEUTILS_INSIDE&&this.store(f,CKEDITOR.LINEUTILS_INSIDE,(e.elementRect.top+e.elementRect.bottom)/2);return this.locations}}(),sort:function(){var a,c,e,f;return function(h,k){a=this.locations;c=[];for(var l in a)for(var m in a[l])if(e=Math.abs(h-a[l][m]),c.length){for(f=0;f<c.length;f++)if(e<c[f].dist){c.splice(f,0,{uid:+l,type:m,dist:e});break}f==c.length&&c.push({uid:+l,type:m,dist:e})}else c.push({uid:+l,type:m,dist:e});return"undefined"!=typeof k?c.slice(0,k):c}}(),store:function(a,
+c,e){this.locations[a]||(this.locations[a]={});this.locations[a][c]=e}};var h={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},m={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};c.prototype={removeAll:function(){for(var a in this.hidden)this.hidden[a].remove(),delete this.hidden[a];for(a in this.visible)this.visible[a].remove(),delete this.visible[a]},hideLine:function(a){var c=a.getUniqueId();
+a.hide();this.hidden[c]=a;delete this.visible[c]},showLine:function(a){var c=a.getUniqueId();a.show();this.visible[c]=a;delete this.hidden[c]},hideVisible:function(){for(var a in this.visible)this.hideLine(this.visible[a])},placeLine:function(a,c){var e,f,h;if(e=this.getStyle(a.uid,a.type)){for(h in this.visible)if(this.visible[h].getCustomData("hash")!==this.hash){f=this.visible[h];break}if(!f)for(h in this.hidden)if(this.hidden[h].getCustomData("hash")!==this.hash){this.showLine(f=this.hidden[h]);
+break}f||this.showLine(f=this.addLine());f.setCustomData("hash",this.hash);this.visible[f.getUniqueId()]=f;f.setStyles(e);c&&c(f)}},getStyle:function(a,c){var e=this.relations[a],f=this.locations[a][c],h={};h.width=e.siblingRect?Math.max(e.siblingRect.width,e.elementRect.width):e.elementRect.width;h.top=this.inline?f+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+f;if(h.top-this.winTopScroll.y<this.rect.top||h.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?
+h.left=e.elementRect.left-this.rect.relativeX:(0<e.elementRect.left?h.left=this.rect.left+e.elementRect.left:(h.width+=e.elementRect.left,h.left=this.rect.left),0<(e=h.left+h.width-(this.rect.left+this.winPane.width))&&(h.width-=e));h.left+=this.winTopScroll.x;for(var k in h)h[k]=CKEDITOR.tools.cssLength(h[k]);return h},addLine:function(){var a=CKEDITOR.dom.element.createFromHtml(this.lineTpl);a.appendTo(this.container);return a},prepare:function(a,c){this.relations=a;this.locations=c;this.hash=Math.random()},
 cleanup:function(){var a,c;for(c in this.visible)a=this.visible[c],a.getCustomData("hash")!==this.hash&&this.hideLine(a)},queryViewport:function(){this.winPane=this.win.getViewPaneSize();this.winTopScroll=this.winTop.getScrollPosition();this.winTopPane=this.winTop.getViewPaneSize();this.rect=this.getClientRect(this.inline?this.editable:this.frame)},getClientRect:function(a){a=a.getClientRect();var c=this.container.getDocumentPosition(),e=this.container.getComputedStyle("position");a.relativeX=a.relativeY=
-0;"static"!=e&&(a.relativeY=c.y,a.relativeX=c.x,a.top-=a.relativeY,a.bottom-=a.relativeY,a.left-=a.relativeX,a.right-=a.relativeX);return a}};var l={left:1,right:1,center:1},k={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:a,locator:e,liner:c}}(),"use strict",function(){function a(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};B(this);x(this);this.on("checkWidgets",
-l);this.editor.on("contentDomInvalidated",this.checkWidgets,this);r(this);w(this);y(this);q(this);C(this)}function e(a,b,c,d,f){var g=a.editor;CKEDITOR.tools.extend(this,d,{editor:g,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:e.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?
-d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);O(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));f&&this.setData(f);this.data.classes||this.setData("classes",this.getClasses());this.dataReady=!0;K(this);this.fire("data",this.data);this.isInited()&&g.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function c(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;
-this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function g(a,b){a.addCommand(b.name,{exec:function(a,c){function d(){a.widgets.finalizeCreation(h)}var e=a.widgets.focused;if(e&&e.name==b.name)e.edit();else if(b.insert)b.insert();else if(b.template){var e="function"==typeof b.defaults?
+0;"static"!=e&&(a.relativeY=c.y,a.relativeX=c.x,a.top-=a.relativeY,a.bottom-=a.relativeY,a.left-=a.relativeX,a.right-=a.relativeX);return a}};var l={left:1,right:1,center:1},k={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:a,locator:f,liner:c}}(),"use strict",function(){function a(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};D(this);x(this);this.on("checkWidgets",
+l);this.editor.on("contentDomInvalidated",this.checkWidgets,this);t(this);w(this);A(this);q(this);B(this)}function f(a,b,c,d,e){var g=a.editor;CKEDITOR.tools.extend(this,d,{editor:g,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:f.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?
+d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);O(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));e&&this.setData(e);this.data.classes||this.setData("classes",this.getClasses());this.dataReady=!0;K(this);this.fire("data",this.data);this.isInited()&&g.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function c(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;
+this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function e(a,b){a.addCommand(b.name,{exec:function(a,c){function d(){a.widgets.finalizeCreation(h)}var e=a.widgets.focused;if(e&&e.name==b.name)e.edit();else if(b.insert)b.insert();else if(b.template){var e="function"==typeof b.defaults?
 b.defaults():b.defaults,e=CKEDITOR.dom.element.createFromHtml(b.template.output(e)),f,g=a.widgets.wrapElement(e,b.name),h=new CKEDITOR.dom.documentFragment(g.getDocument());h.append(g);(f=a.widgets.initOn(e,b,c&&c.startupData))?(e=f.once("edit",function(b){if(b.data.dialog)f.once("dialog",function(b){b=b.data;var c,e;c=b.once("ok",d,null,null,20);e=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(f,!0)});b.once("hide",function(){c.removeListener();e.removeListener()})});else d()},
-null,null,999),f.edit(),e.removeListener()):d()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function f(a,b){function c(b,d,e){var f=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>e});0>f&&(f=a._.upcasts.length);a._.upcasts.splice(f,0,[b,d,e])}var d=b.upcast,e=b.upcastPriority||10;if(d)if("string"==typeof d)for(d=d.split(",");d.length;)c(b.upcasts[d.pop()],b.name,e);else c(d,b.name,e)}
-function m(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function l(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,f,g,h;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var k=b.find(".cke_widget_wrapper"),c=[];d=0;for(f=k.count();d<f;d++){g=k.getItem(d);if(h=!this.getByElement(g,
-!0)){a:{h=v;for(var l=g;l=l.getParent();)if(h(l)){h=!0;break a}h=!1}h=!h}h&&b.contains(g)&&(g.addClass("cke_widget_new"),c.push(this.initOn(g.getFirst(e.isDomWidgetElement))))}}a&&a.focusInited&&1==c.length&&c[0].focus()}}}function k(a,b,c){if(!c.allowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});(a=d[b])||(d[b]=a=new CKEDITOR.filter(c.allowedContent));return a}function b(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var f,g,
-h,k,l;if("data-cke-widget-wrapper"in a.attributes)return(a=a.getFirst(e.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(l=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(f=d.length;k<f;++k)if(!1===d[k](a))return;for(k=0;k<l;++k)if(f=c[k],h={},g=f[0](a,h))return g instanceof CKEDITOR.htmlParser.element&&(a=g),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(h)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,
-f[1]]),!1}}}}function d(a){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")}}function h(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return h(e,b,c)}}a.add(c,b)}function p(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}
-function v(a){return a.hasAttribute("data-cke-temp")}function u(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=null,e.setActiveFilter(null),e.setActiveEnterMode(null,
-null));e.fire("unlockSnapshot")}function t(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function n(a,b){return CKEDITOR.tools.trim(b)}function q(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var d=c.data.target;e.isDomDragHandler(d)&&(d=a.getByElement(d),c.data.dataTransfer.setData("cke/widget-id",d.id),b.focus(),d.focus())});b.on("drop",function(c){var d=c.data.dataTransfer,e=d.getData("cke/widget-id"),
+null,null,999),f.edit(),e.removeListener()):d()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function h(a,b){function c(b,d,e){var f=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>e});0>f&&(f=a._.upcasts.length);a._.upcasts.splice(f,0,[b,d,e])}var d=b.upcast,e=b.upcastPriority||10;if(d)if("string"==typeof d)for(d=d.split(",");d.length;)c(b.upcasts[d.pop()],b.name,e);else c(d,b.name,e)}
+function m(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function l(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,e,g,h;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var k=b.find(".cke_widget_wrapper"),c=[];d=0;for(e=k.count();d<e;d++){g=k.getItem(d);if(h=!this.getByElement(g,
+!0)){a:{h=u;for(var l=g;l=l.getParent();)if(h(l)){h=!0;break a}h=!1}h=!h}h&&b.contains(g)&&(g.addClass("cke_widget_new"),c.push(this.initOn(g.getFirst(f.isDomWidgetElement))))}}a&&a.focusInited&&1==c.length&&c[0].focus()}}}function k(a,b,c){if(!c.allowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});(a=d[b])||(d[b]=a=new CKEDITOR.filter(c.allowedContent));return a}function b(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var e,g,
+h,k,l;if("data-cke-widget-wrapper"in a.attributes)return(a=a.getFirst(f.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(l=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(e=d.length;k<e;++k)if(!1===d[k](a))return;for(k=0;k<l;++k)if(e=c[k],h={},g=e[0](a,h))return g instanceof CKEDITOR.htmlParser.element&&(a=g),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(h)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,
+e[1]]),!1}}}}function d(a){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")}}function g(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return g(e,b,c)}}a.add(c,b)}function p(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}
+function u(a){return a.hasAttribute("data-cke-temp")}function v(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=null,e.setActiveFilter(null),e.setActiveEnterMode(null,
+null));e.fire("unlockSnapshot")}function r(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function n(a,b){return CKEDITOR.tools.trim(b)}function q(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var d=c.data.target;f.isDomDragHandler(d)&&(d=a.getByElement(d),c.data.dataTransfer.setData("cke/widget-id",d.id),b.focus(),d.focus())});b.on("drop",function(c){var d=c.data.dataTransfer,e=d.getData("cke/widget-id"),
 f=d.getTransferType(b),d=b.createRange();""!==e&&f===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c.cancel():""!==e&&f==CKEDITOR.DATA_TRANSFER_INTERNAL&&(e=a.instances[e])&&(d.setStartBefore(e.wrapper),d.setEndAfter(e.wrapper),c.data.dragRange=d,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,c.data.dataTransfer.setData("text/html",b.editable().getHtmlFromRange(d).getHtml()),b.widgets.destroy(e,!0))});b.on("contentDom",function(){var d=
-b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!e.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=e.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,
-{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function w(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,f,g;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();if(!d.type)return!1;f=a.getByElement(d);g=0;f&&(f.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(g=1,a.focused!=f&&b.getSelection().removeAllRanges()):
-e.getNestedEditable(f.wrapper,d)?f=null:(c.data.preventDefault(),CKEDITOR.env.ie||f.focus()))});c.attachListener(d,"mouseup",function(){g&&f&&f.wrapper&&(g=0,f.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){f&&f.wrapper&&c.contains(f.wrapper)&&(f.focus(),f=null)})})});b.on("doubleclick",function(b){var c=a.getByElement(b.data.element);if(c&&!e.getNestedEditable(c.wrapper,b.data.element))return c.fire("doubleclick",{element:b.data.element})},null,null,1)}
-function y(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,
-null,1)}function C(a){function b(c){a.focused&&G(a.focused,"cut"==c.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function r(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=e.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),f=a.widgetHoldingFocusedEditable;f?f===d&&
-f.focusedEditable.equals(c)||(u(a,f,null),d&&c&&u(a,d,c)):d&&c&&u(a,d,c)});b.on("dataReady",function(){A(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&m(a,b);(b=a.widgetHoldingFocusedEditable)&&u(a,b,null)})}function x(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var d=CKEDITOR.tools.getNextNumber(),f=[];b.data.downcastingSessionId=d;c[d]=f;b.data.dataValue.forEach(function(b){var c=b.attributes,d;if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])d=b.getFirst(e.isParserWidgetElement),
-f.push({wrapper:b,element:d,widget:c,editables:{}}),"1"!=d.attributes["data-cke-widget-keep-attr"]&&delete d.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return f[f.length-1].editables[c["data-cke-widget-editable"]]=b,!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,d,e,f,g,h;b=a.shift();){d=b.widget;e=b.element;f=d._.downcastFn&&d._.downcastFn.call(d,e);for(h in b.editables)g=
-b.editables[h],delete g.attributes.contenteditable,g.setHtml(d.editables[h].getData());f||(f=e);b.wrapper.replaceWith(f)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function B(a){var c=a.editor,d,f;c.on("toHtml",function(c){var f=b(a),g;for(c.data.dataValue.forEach(f.iterator,CKEDITOR.NODE_ELEMENT,!0);g=f.toBeWrapped.pop();){var h=g[0],k=h.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(h);a.wrapElement(g[0],g[1])}d=c.data.protectedWhitespaces?
-3==c.data.dataValue.children.length&&e.isParserWidgetWrapper(c.data.dataValue.children[1]):1==c.data.dataValue.children.length&&e.isParserWidgetWrapper(c.data.dataValue.children[0])},null,null,8);c.on("dataReady",function(){if(f)for(var b=c.editable().find(".cke_widget_wrapper"),d,g,h=0,k=b.count();h<k;++h)d=b.getItem(h),g=d.getFirst(e.isDomWidgetElement),g.type==CKEDITOR.NODE_ELEMENT&&g.data("widget")?(g.replace(d),a.wrapElement(g)):d.remove();f=0;a.destroyAll(!0);a.initOnAll()});c.on("loadSnapshot",
-function(b){/data-cke-widget/.test(b.data)&&(f=1);a.destroyAll(!0)},null,null,9);c.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(V,n);a.range&&(a=e.getNestedEditable(c.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&c.setActiveFilter(a)});c.on("afterInsertHtml",function(b){b.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(c.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:d}),c.fire("unlockSnapshot"))})}function A(a){var b=
+b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!f.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=f.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,
+{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function w(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,e,g;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();if(!d.type)return!1;e=a.getByElement(d);g=0;e&&(e.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(g=1,a.focused!=e&&b.getSelection().removeAllRanges()):
+f.getNestedEditable(e.wrapper,d)?e=null:(c.data.preventDefault(),CKEDITOR.env.ie||e.focus()))});c.attachListener(d,"mouseup",function(){g&&e&&e.wrapper&&(g=0,e.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){e&&e.wrapper&&c.contains(e.wrapper)&&(e.focus(),e=null)})})});b.on("doubleclick",function(b){var c=a.getByElement(b.data.element);if(c&&!f.getNestedEditable(c.wrapper,b.data.element))return c.fire("doubleclick",{element:b.data.element})},null,null,1)}
+function A(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,
+null,1)}function B(a){function b(c){a.focused&&G(a.focused,"cut"==c.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function t(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=f.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),e=a.widgetHoldingFocusedEditable;e?e===d&&
+e.focusedEditable.equals(c)||(v(a,e,null),d&&c&&v(a,d,c)):d&&c&&v(a,d,c)});b.on("dataReady",function(){y(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&m(a,b);(b=a.widgetHoldingFocusedEditable)&&v(a,b,null)})}function x(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var d=CKEDITOR.tools.getNextNumber(),e=[];b.data.downcastingSessionId=d;c[d]=e;b.data.dataValue.forEach(function(b){var c=b.attributes,d;if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])d=b.getFirst(f.isParserWidgetElement),
+e.push({wrapper:b,element:d,widget:c,editables:{}}),"1"!=d.attributes["data-cke-widget-keep-attr"]&&delete d.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return e[e.length-1].editables[c["data-cke-widget-editable"]]=b,!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,d,e,f,g,h;b=a.shift();){d=b.widget;e=b.element;f=d._.downcastFn&&d._.downcastFn.call(d,e);for(h in b.editables)g=
+b.editables[h],delete g.attributes.contenteditable,g.setHtml(d.editables[h].getData());f||(f=e);b.wrapper.replaceWith(f)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function D(a){var c=a.editor,d,e;c.on("toHtml",function(c){var e=b(a),g;for(c.data.dataValue.forEach(e.iterator,CKEDITOR.NODE_ELEMENT,!0);g=e.toBeWrapped.pop();){var h=g[0],k=h.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(h);a.wrapElement(g[0],g[1])}d=c.data.protectedWhitespaces?
+3==c.data.dataValue.children.length&&f.isParserWidgetWrapper(c.data.dataValue.children[1]):1==c.data.dataValue.children.length&&f.isParserWidgetWrapper(c.data.dataValue.children[0])},null,null,8);c.on("dataReady",function(){if(e)for(var b=c.editable().find(".cke_widget_wrapper"),d,g,h=0,k=b.count();h<k;++h)d=b.getItem(h),g=d.getFirst(f.isDomWidgetElement),g.type==CKEDITOR.NODE_ELEMENT&&g.data("widget")?(g.replace(d),a.wrapElement(g)):d.remove();e=0;a.destroyAll(!0);a.initOnAll()});c.on("loadSnapshot",
+function(b){/data-cke-widget/.test(b.data)&&(e=1);a.destroyAll(!0)},null,null,9);c.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(V,n);a.range&&(a=f.getNestedEditable(c.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&c.setActiveFilter(a)});c.on("afterInsertHtml",function(b){b.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(c.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:d}),c.fire("unlockSnapshot"))})}function y(a){var b=
 a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,g,h;a.editor.fire("lockSnapshot");for(f&&(g=a.focused)&&m(a,g);g=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,g),1),g.isInited()&&(h=g.editor.checkDirty(),g.setSelected(!1),!h&&g.editor.resetDirty());f&&e&&(h=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",
-{widget:e}),e.setFocused(!0),!h&&a.editor.resetDirty());for(;g=c.pop();)b.push(g),g.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function z(a,b,c){var d=0;b=F(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],d=1);d&&a.setData("classes",e)}}function D(a){a.cancel()}function G(a,b){var c=a.editor,d=c.document;if(!d.getById("cke_copybin")){var e=c.blockless||CKEDITOR.env.ie?"span":"div",f=d.createElement(e),g=d.createElement(e),e=
+{widget:e}),e.setFocused(!0),!h&&a.editor.resetDirty());for(;g=c.pop();)b.push(g),g.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function z(a,b,c){var d=0;b=E(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],d=1);d&&a.setData("classes",e)}}function C(a){a.cancel()}function G(a,b){var c=a.editor,d=c.document;if(!d.getById("cke_copybin")){var e=c.blockless||CKEDITOR.env.ie?"span":"div",f=d.createElement(e),g=d.createElement(e),e=
 CKEDITOR.env.ie&&9>CKEDITOR.env.version;g.setAttributes({id:"cke_copybin","data-cke-temp":"1"});f.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"});f.setStyle("ltr"==c.config.contentsLangDirection?"left":"right","-5000px");var h=c.createRange();h.setStartBefore(a.wrapper);h.setEndAfter(a.wrapper);f.setHtml('\x3cspan data-cke-copybin-start\x3d"1"\x3e​\x3c/span\x3e'+c.editable().getHtmlFromRange(h).getHtml()+'\x3cspan data-cke-copybin-end\x3d"1"\x3e​\x3c/span\x3e');c.fire("saveSnapshot");
-c.fire("lockSnapshot");g.append(f);c.editable().append(g);var k=c.on("selectionChange",D,null,null,0),l=a.repository.on("checkSelection",D,null,null,0);if(e)var m=d.getDocumentElement().$,n=m.scrollTop;h=c.createRange();h.selectNodeContents(f);h.select();e&&(m.scrollTop=n);setTimeout(function(){b||a.focus();g.remove();k.removeListener();l.removeListener();c.fire("unlockSnapshot");b&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function F(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?
-a.split(/\s+/):null}function J(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function I(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function N(a){var b=null;a.on("data",function(){var a=this.data.classes,c;if(b!=a){for(c in b)a&&a[c]||this.removeClass(c);for(c in a)this.addClass(c);b=a}})}function E(a){if(a.draggable){var b=
-a.editor,c=a.wrapper.getLast(e.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+b.plugins.widget.path+"images/handle.png)"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:b.lang.widget.move,
+c.fire("lockSnapshot");g.append(f);c.editable().append(g);var k=c.on("selectionChange",C,null,null,0),l=a.repository.on("checkSelection",C,null,null,0);if(e)var m=d.getDocumentElement().$,n=m.scrollTop;h=c.createRange();h.selectNodeContents(f);h.select();e&&(m.scrollTop=n);setTimeout(function(){b||a.focus();g.remove();k.removeListener();l.removeListener();c.fire("unlockSnapshot");b&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function E(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?
+a.split(/\s+/):null}function J(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function I(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function N(a){var b=null;a.on("data",function(){var a=this.data.classes,c;if(b!=a){for(c in b)a&&a[c]||this.removeClass(c);for(c in a)this.addClass(c);b=a}})}function F(a){if(a.draggable){var b=
+a.editor,c=a.wrapper.getLast(f.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+b.plugins.widget.path+"images/handle.png)"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:b.lang.widget.move,
 height:15}),a.inline&&d.setAttribute("draggable","true"),c.append(d),a.wrapper.append(c));a.wrapper.on("dragover",function(a){a.data.preventDefault()});a.wrapper.on("mouseenter",a.updateDragHandlerPosition,a);setTimeout(function(){a.on("data",a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",P,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});a.dragHandlerContainer=c}}function P(a){function b(){var c;for(m.reset();c=h.pop();)c.removeListener();
 var d=k;c=a.sender;var e=this.repository.finder,f=this.repository.liner,g=this.editor,l=this.editor.editable();CKEDITOR.tools.isEmpty(f.visible)||(d=e.getRange(d[0]),this.focus(),g.fire("drop",{dropRange:d,target:d.startContainer}));l.removeClass("cke_widget_dragging");f.hideVisible();g.fire("dragend",{target:c})}var c=this.repository.finder,d=this.repository.locator,e=this.repository.liner,f=this.editor,g=f.editable(),h=[],k=[];this.repository._.draggedWidget=this;var l=c.greedySearch(),m=CKEDITOR.tools.eventsBuffer(50,
-function(){n=d.locate(l);k=d.sort(p,1);k.length&&(e.prepare(l,n),e.placeLine(k[0]),e.cleanup())}),n,p;g.addClass("cke_widget_dragging");h.push(g.on("mousemove",function(a){p=a.data.$.clientY;m.input()}));f.fire("dragstart",{target:a.sender});h.push(f.document.once("mouseup",b,this));g.isInline()||h.push(CKEDITOR.document.once("mouseup",b,this))}function T(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==typeof c?{selector:c}:c)}function L(a){if(a.mask){var b=
-a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));a.mask=b}}function Q(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=b}}function O(a,b){U(a);Q(a);T(a);L(a);E(a);N(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var c=b.data.getTarget();e.getNestedEditable(a,c)||
-a.inline&&e.isDomDragHandler(c)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){G(a,b==CKEDITOR.CTRL+88);return}if(b in R||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function U(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",
+function(){n=d.locate(l);k=d.sort(p,1);k.length&&(e.prepare(l,n),e.placeLine(k[0]),e.cleanup())}),n,p;g.addClass("cke_widget_dragging");h.push(g.on("mousemove",function(a){p=a.data.$.clientY;m.input()}));f.fire("dragstart",{target:a.sender});h.push(f.document.once("mouseup",b,this));g.isInline()||h.push(CKEDITOR.document.once("mouseup",b,this))}function R(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==typeof c?{selector:c}:c)}function L(a){if(a.mask){var b=
+a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));a.mask=b}}function Q(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=b}}function O(a,b){U(a);Q(a);R(a);L(a);F(a);N(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var c=b.data.getTarget();f.getNestedEditable(a,c)||
+a.inline&&f.isDomDragHandler(c)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){G(a,b==CKEDITOR.CTRL+88);return}if(b in S||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function U(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",
 a.id)}function K(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard",onLoad:function(){CKEDITOR.addCss(".cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover\x3e.cke_widget_element{outline:2px solid yellow;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid yellow}.cke_widget_wrapper.cke_widget_focused\x3e.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #ace}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:none;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover\x3e.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}")},
-beforeInit:function(b){b.widgets=new a(b)},afterInit:function(a){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});t(a)}});a.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));g(this.editor,b);f(this,b);return this.registered[a]=
-b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=A(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=e.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===
-a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&u(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
-!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&e.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(c){return c.is(b)&&c.data("cke-widget-id")}var b={div:1,span:1};return function(b,c){if(!b)return null;var d=a(b);if(!c&&!d){var e=this.editor.editable();do b=b.getParent();while(b&&!b.equals(e)&&!(d=a(b)))}return this.instances[d]||null}}(),
-initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new e(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(e.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
+beforeInit:function(b){b.widgets=new a(b)},afterInit:function(a){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});r(a)}});a.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));e(this.editor,b);h(this,b);return this.registered[a]=
+b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=y(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=f.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===
+a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&v(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
+!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&f.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(c){return c.is(b)&&c.data("cke-widget-id")}var b={div:1,span:1};return function(b,c){if(!b)return null;var d=a(b);if(!c&&!d){var e=this.editor.editable();do b=b.getParent();while(b&&!b.equals(e)&&!(d=a(b)))}return this.instances[d]||null}}(),
+initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new f(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(f.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
 Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(c){c=c.data;c.name==a&&c.on.apply(c,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?c:null},wrapElement:function(a,b){var c=null,e,f;if(a instanceof CKEDITOR.dom.element){e=this.registered[b||a.data("widget")];if(!e)return null;
 if((c=a.getParent())&&c.type==CKEDITOR.NODE_ELEMENT&&c.data("cke-widget-wrapper"))return c;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);b&&a.data("widget",b);f=p(e,a.getName());c=new CKEDITOR.dom.element(f?"span":"div");c.setAttributes(d(f));c.data("cke-display-name",e.pathName?e.pathName:a.getName());a.getParent(!0)&&c.replace(a);a.appendTo(c)}else if(a instanceof CKEDITOR.htmlParser.element){e=this.registered[b||a.attributes["data-widget"]];if(!e)return null;
-if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);f=p(e,a.name);c=new CKEDITOR.htmlParser.element(f?"span":"div",d(f));c.attributes["data-cke-display-name"]=e.pathName?e.pathName:a.name;e=a.parent;var g;e&&(g=a.getIndex(),a.remove());c.add(a);e&&h(e,g,c)}return c},_tests_createEditableFilter:k};CKEDITOR.event.implementOn(a.prototype);
-e.prototype={addClass:function(a){this.element.addClass(a)},applyStyle:function(a){z(this,a,1)},checkStyleActive:function(a){a=F(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),
+if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);f=p(e,a.name);c=new CKEDITOR.htmlParser.element(f?"span":"div",d(f));c.attributes["data-cke-display-name"]=e.pathName?e.pathName:a.name;e=a.parent;var h;e&&(h=a.getIndex(),a.remove());c.add(a);e&&g(e,h,c)}return c},_tests_createEditableFilter:k};CKEDITOR.event.implementOn(a.prototype);
+f.prototype={addClass:function(a){this.element.addClass(a)},applyStyle:function(a){z(this,a,1)},checkStyleActive:function(a){a=E(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),
 this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a];c.removeListener("focus",I);c.removeListener("blur",J);this.editor.focusManager.remove(c);b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a=
 {dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,function(a){var c,d;!1!==b.fire("dialog",a)&&(c=a.on("show",function(){a.setupContent(b)}),d=a.on("ok",function(){var c,d=b.on("data",function(a){c=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);d.removeListener();c&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){c.removeListener();d.removeListener()}))});return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},
 hasClass:function(a){return this.element.hasClass(a)},initEditable:function(a,b){var d=this._findOneNotNested(b.selector);return d&&d.is(CKEDITOR.dtd.$editable)?(d=new c(this.editor,d,{filter:k.call(this.repository,this.name,a,b)}),this.editables[a]=d,d.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":d.enterMode}),d.filter&&d.data("cke-filter",d.filter.id),d.addClass("cke_widget_editable"),d.removeClass("cke_widget_editable_focused"),b.pathName&&d.data("cke-display-name",
-b.pathName),this.editor.focusManager.add(d),d.on("focus",I,this),CKEDITOR.env.ie&&d.on("blur",J,this),d._.initialSetData=!0,d.setData(d.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(e.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();
+b.pathName),this.editor.focusManager.add(d),d.on("focus",I,this),CKEDITOR.env.ie&&d.on("blur",J,this),d._.initialSetData=!0,d.setData(d.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(f.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();
 if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);!b&&this.editor.resetDirty()}this.editor.focus()},removeClass:function(a){this.element.removeClass(a)},removeStyle:function(a){z(this,a,0)},setData:function(a,b){var c=this.data,d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=e[a])}d&&this.dataReady&&(K(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":
 "blur");return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px",display:"block"}),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=
-b)}};CKEDITOR.event.implementOn(e.prototype);e.getNestedEditable=function(a,b){return!b||b.equals(a)?null:e.isDomNestedEditable(b)?b:e.getNestedEditable(a,b.getParent())};e.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};e.isDomDragHandlerContainer=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};e.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};
-e.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};e.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};e.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};e.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};c.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),
+b)}};CKEDITOR.event.implementOn(f.prototype);f.getNestedEditable=function(a,b){return!b||b.equals(a)?null:f.isDomNestedEditable(b)?b:f.getNestedEditable(a,b.getParent())};f.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};f.isDomDragHandlerContainer=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};f.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};
+f.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};f.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};f.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};f.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};c.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),
 {setData:function(a){this._.initialSetData||this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var V=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,
-R={37:1,38:1,39:1,40:1,8:1,46:1};(function(){function a(){}function b(a,c,d){return d&&this.checkElement(a)?(a=d.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget},apply:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.applyStyle(this)},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},
-checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return e.isDomWidgetWrapper(a)?(a=a.getFirst(e.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];var b,
-c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})})();CKEDITOR.plugins.widget=e;e.repository=a;e.nestedEditable=c}(),"use strict",
-function(){function a(a){function b(){this.deflated||(a.widgets.focused==this.widget&&(this.focused=!0),a.widgets.destroy(this.widget),this.deflated=!0)}function f(){var b=a.editable(),c=a.document;if(this.deflated)this.widget=a.widgets.initOn(this.element,"image",this.widget.data),this.widget.inline&&!(new CKEDITOR.dom.elementPath(this.widget.wrapper,b)).block&&(b=c.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div"),b.replace(this.widget.wrapper),this.widget.wrapper.move(b)),this.focused&&
-(this.widget.focus(),delete this.focused),delete this.deflated;else{var d=this.widget,b=g,c=d.wrapper,e=d.data.align,d=d.data.hasCaption;if(b){for(var h=3;h--;)c.removeClass(b[h]);"center"==e?d&&c.addClass(b[1]):"none"!=e&&c.addClass(b[u[e]])}else"center"==e?(d?c.setStyle("text-align","center"):c.removeStyle("text-align"),c.removeStyle("float")):("none"==e?c.removeStyle("float"):c.setStyle("float",e),c.removeStyle("text-align"))}}var g=a.config.image2_alignClasses,k=a.config.image2_captionedClass;
-return{allowedContent:d(a),requiredContent:"img[src,alt]",features:h(a),styleableElements:"img figure",contentTransformations:[["img[width]: sizeToAttribute"]],editables:{caption:{selector:"figcaption",allowedContent:"br em strong sub sup u s; a[!href]"}},parts:{image:"img",caption:"figcaption"},dialog:"image2",template:'\x3cimg alt\x3d"" src\x3d"" /\x3e',data:function(){var c=this.features;this.data.hasCaption&&!a.filter.checkFeature(c.caption)&&(this.data.hasCaption=!1);"none"==this.data.align||
-a.filter.checkFeature(c.align)||(this.data.align="none");this.shiftState({widget:this,element:this.element,oldData:this.oldData,newData:this.data,deflate:b,inflate:f});this.data.link?this.parts.link||(this.parts.link=this.parts.image.getParent()):this.parts.link&&delete this.parts.link;this.parts.image.setAttributes({src:this.data.src,"data-cke-saved-src":this.data.src,alt:this.data.alt});if(this.oldData&&!this.oldData.hasCaption&&this.data.hasCaption)for(var d in this.data.classes)this.parts.image.removeClass(d);
-if(a.filter.checkFeature(c.dimension)){c=this.data;c={width:c.width,height:c.height};d=this.parts.image;for(var e in c)c[e]?d.setAttribute(e,c[e]):d.removeAttribute(e)}this.oldData=CKEDITOR.tools.extend({},this.data)},init:function(){var b=CKEDITOR.plugins.image2,c=this.parts.image,d={hasCaption:!!this.parts.caption,src:c.getAttribute("src"),alt:c.getAttribute("alt")||"",width:c.getAttribute("width")||"",height:c.getAttribute("height")||"",lock:this.ready?b.checkHasNaturalRatio(c):!0},e=c.getAscendant("a");
-e&&this.wrapper.contains(e)&&(this.parts.link=e);d.align||(c=d.hasCaption?this.element:c,g?(c.hasClass(g[0])?d.align="left":c.hasClass(g[2])&&(d.align="right"),d.align?c.removeClass(g[u[d.align]]):d.align="none"):(d.align=c.getStyle("float")||"none",c.removeStyle("float")));a.plugins.link&&this.parts.link&&(d.link=b.getLinkAttributesParser()(a,this.parts.link),(c=d.link.advanced)&&c.advCSSClasses&&(c.advCSSClasses=CKEDITOR.tools.trim(c.advCSSClasses.replace(/cke_\S+/,""))));this.wrapper[(d.hasCaption?
+S={37:1,38:1,39:1,40:1,8:1,46:1};(function(){function a(){}function b(a,c,d){return d&&this.checkElement(a)?(a=d.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget},apply:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.applyStyle(this)},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},
+checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return f.isDomWidgetWrapper(a)?(a=a.getFirst(f.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];var b,
+c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})})();CKEDITOR.plugins.widget=f;f.repository=a;f.nestedEditable=c}(),"use strict",
+function(){function a(a){function b(){this.deflated||(a.widgets.focused==this.widget&&(this.focused=!0),a.widgets.destroy(this.widget),this.deflated=!0)}function e(){var b=a.editable(),c=a.document;if(this.deflated)this.widget=a.widgets.initOn(this.element,"image",this.widget.data),this.widget.inline&&!(new CKEDITOR.dom.elementPath(this.widget.wrapper,b)).block&&(b=c.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div"),b.replace(this.widget.wrapper),this.widget.wrapper.move(b)),this.focused&&
+(this.widget.focus(),delete this.focused),delete this.deflated;else{var d=this.widget,b=h,c=d.wrapper,f=d.data.align,d=d.data.hasCaption;if(b){for(var g=3;g--;)c.removeClass(b[g]);"center"==f?d&&c.addClass(b[1]):"none"!=f&&c.addClass(b[v[f]])}else"center"==f?(d?c.setStyle("text-align","center"):c.removeStyle("text-align"),c.removeStyle("float")):("none"==f?c.removeStyle("float"):c.setStyle("float",f),c.removeStyle("text-align"))}}var h=a.config.image2_alignClasses,k=a.config.image2_captionedClass;
+return{allowedContent:d(a),requiredContent:"img[src,alt]",features:g(a),styleableElements:"img figure",contentTransformations:[["img[width]: sizeToAttribute"]],editables:{caption:{selector:"figcaption",allowedContent:"br em strong sub sup u s; a[!href]"}},parts:{image:"img",caption:"figcaption"},dialog:"image2",template:'\x3cimg alt\x3d"" src\x3d"" /\x3e',data:function(){var c=this.features;this.data.hasCaption&&!a.filter.checkFeature(c.caption)&&(this.data.hasCaption=!1);"none"==this.data.align||
+a.filter.checkFeature(c.align)||(this.data.align="none");this.shiftState({widget:this,element:this.element,oldData:this.oldData,newData:this.data,deflate:b,inflate:e});this.data.link?this.parts.link||(this.parts.link=this.parts.image.getParent()):this.parts.link&&delete this.parts.link;this.parts.image.setAttributes({src:this.data.src,"data-cke-saved-src":this.data.src,alt:this.data.alt});if(this.oldData&&!this.oldData.hasCaption&&this.data.hasCaption)for(var d in this.data.classes)this.parts.image.removeClass(d);
+if(a.filter.checkFeature(c.dimension)){c=this.data;c={width:c.width,height:c.height};d=this.parts.image;for(var f in c)c[f]?d.setAttribute(f,c[f]):d.removeAttribute(f)}this.oldData=CKEDITOR.tools.extend({},this.data)},init:function(){var b=CKEDITOR.plugins.image2,c=this.parts.image,d={hasCaption:!!this.parts.caption,src:c.getAttribute("src"),alt:c.getAttribute("alt")||"",width:c.getAttribute("width")||"",height:c.getAttribute("height")||"",lock:this.ready?b.checkHasNaturalRatio(c):!0},e=c.getAscendant("a");
+e&&this.wrapper.contains(e)&&(this.parts.link=e);d.align||(c=d.hasCaption?this.element:c,h?(c.hasClass(h[0])?d.align="left":c.hasClass(h[2])&&(d.align="right"),d.align?c.removeClass(h[v[d.align]]):d.align="none"):(d.align=c.getStyle("float")||"none",c.removeStyle("float")));a.plugins.link&&this.parts.link&&(d.link=b.getLinkAttributesParser()(a,this.parts.link),(c=d.link.advanced)&&c.advCSSClasses&&(c.advCSSClasses=CKEDITOR.tools.trim(c.advCSSClasses.replace(/cke_\S+/,""))));this.wrapper[(d.hasCaption?
 "remove":"add")+"Class"]("cke_image_nocaption");this.setData(d);a.filter.checkFeature(this.features.dimension)&&!0!==a.config.image2_disableResizer&&m(this);this.shiftState=b.stateShifter(this.editor);this.on("contextMenu",function(a){a.data.image=CKEDITOR.TRISTATE_OFF;if(this.parts.link||this.wrapper.getAscendant("a"))a.data.link=a.data.unlink=CKEDITOR.TRISTATE_OFF});this.on("dialog",function(a){a.data.widget=this},this)},addClass:function(a){p(this).addClass(a)},hasClass:function(a){return p(this).hasClass(a)},
-removeClass:function(a){p(this).removeClass(a)},getClasses:function(){var a=new RegExp("^("+[].concat(k,g).join("|")+")$");return function(){var b=this.repository.parseElementClasses(p(this).getAttribute("class")),c;for(c in b)a.test(c)&&delete b[c];return b}}(),upcast:e(a),downcast:c(a)}}function e(a){var b=g(a),c=a.config.image2_captionedClass;return function(a,d){var e={width:1,height:1},g=a.name,h;if(!a.attributes["data-cke-realelement"]&&(b(a)?("div"==g&&(h=a.getFirst("figure"))&&(a.replaceWith(h),
-a=h),d.align="center",h=a.getFirst("img")||a.getFirst("a").getFirst("img")):"figure"==g&&a.hasClass(c)?h=a.getFirst("img")||a.getFirst("a").getFirst("img"):f(a)&&(h="a"==a.name?a.children[0]:a),h)){for(var k in e)(e=h.attributes[k])&&e.match(t)&&delete h.attributes[k];return a}}}function c(a){var b=a.config.image2_alignClasses;return function(a){var c="a"==a.name?a.getFirst():a,d=c.attributes,e=this.data.align;if(!this.inline){var f=a.getFirst("span");f&&f.replaceWith(f.getFirst({img:1,a:1}))}e&&
-"none"!=e&&(f=CKEDITOR.tools.parseCssText(d.style||""),"center"==e&&"figure"==a.name?a=a.wrapWith(new CKEDITOR.htmlParser.element("div",b?{"class":b[1]}:{style:"text-align:center"})):e in{left:1,right:1}&&(b?c.addClass(b[u[e]]):f["float"]=e),b||CKEDITOR.tools.isEmpty(f)||(d.style=CKEDITOR.tools.writeCssText(f)));return a}}function g(a){var b=a.config.image2_captionedClass,c=a.config.image2_alignClasses,d={figure:1,a:1,img:1};return function(e){if(!(e.name in{div:1,p:1}))return!1;var g=e.children;
-if(1!==g.length)return!1;g=g[0];if(!(g.name in d))return!1;if("p"==e.name){if(!f(g))return!1}else if("figure"==g.name){if(!g.hasClass(b))return!1}else if(a.enterMode==CKEDITOR.ENTER_P||!f(g))return!1;return(c?e.hasClass(c[1]):"center"==CKEDITOR.tools.parseCssText(e.attributes.style||"",!0)["text-align"])?!0:!1}}function f(a){return"img"==a.name?!0:"a"==a.name?1==a.children.length&&a.getFirst("img"):!1}function m(a){var b=a.editor,c=b.editable(),d=b.document,e=a.resizer=d.createElement("span");e.addClass("cke_image_resizer");
-e.setAttribute("title",b.lang.image2.resizer);e.append(new CKEDITOR.dom.text("​",d));if(a.inline)a.wrapper.append(e);else{var f=a.parts.link||a.parts.image,g=f.getParent(),h=d.createElement("span");h.addClass("cke_image_resizer_wrapper");h.append(f);h.append(e);a.element.append(h,!0);g.is("span")&&g.remove()}e.on("mousedown",function(f){function g(a,b,c){var e=CKEDITOR.document,f=[];d.equals(e)||f.push(e.on(a,b));f.push(d.on(a,b));if(c)for(a=f.length;a--;)c.push(f.pop())}function h(){U=t+m*R;K=Math.round(U/
-v)}function k(){K=u-H;U=Math.round(K*v)}var l=a.parts.image,m="right"==a.data.align?-1:1,p=f.data.$.screenX,r=f.data.$.screenY,t=l.$.clientWidth,u=l.$.clientHeight,v=t/u,x=[],B="cke_image_s"+(~m?"e":"w"),O,U,K,V,R,H,M;b.fire("saveSnapshot");g("mousemove",function(a){O=a.data.$;R=O.screenX-p;H=r-O.screenY;M=Math.abs(R/H);1==m?0>=R?0>=H?h():M>=v?h():k():0>=H?M>=v?k():h():k():0>=R?0>=H?M>=v?k():h():k():0>=H?h():M>=v?h():k();15<=U&&15<=K?(l.setAttributes({width:U,height:K}),V=!0):V=!1},x);g("mouseup",
-function(){for(var d;d=x.pop();)d.removeListener();c.removeClass(B);e.removeClass("cke_image_resizing");V&&(a.setData({width:U,height:K}),b.fire("saveSnapshot"));V=!1},x);c.addClass(B);e.addClass("cke_image_resizing")});a.on("data",function(){e["right"==a.data.align?"addClass":"removeClass"]("cke_image_resizer_left")})}function l(a){var c=[],d;return function(e){var f=a.getCommand("justify"+e);if(f){c.push(function(){f.refresh(a,a.elementPath())});if(e in{right:1,left:1,center:1})f.on("exec",function(d){var f=
+removeClass:function(a){p(this).removeClass(a)},getClasses:function(){var a=new RegExp("^("+[].concat(k,h).join("|")+")$");return function(){var b=this.repository.parseElementClasses(p(this).getAttribute("class")),c;for(c in b)a.test(c)&&delete b[c];return b}}(),upcast:f(a),downcast:c(a)}}function f(a){var b=e(a),c=a.config.image2_captionedClass;return function(a,d){var e={width:1,height:1},f=a.name,g;if(!a.attributes["data-cke-realelement"]&&(b(a)?("div"==f&&(g=a.getFirst("figure"))&&(a.replaceWith(g),
+a=g),d.align="center",g=a.getFirst("img")||a.getFirst("a").getFirst("img")):"figure"==f&&a.hasClass(c)?g=a.getFirst("img")||a.getFirst("a").getFirst("img"):h(a)&&(g="a"==a.name?a.children[0]:a),g)){for(var k in e)(e=g.attributes[k])&&e.match(r)&&delete g.attributes[k];return a}}}function c(a){var b=a.config.image2_alignClasses;return function(a){var c="a"==a.name?a.getFirst():a,d=c.attributes,e=this.data.align;if(!this.inline){var f=a.getFirst("span");f&&f.replaceWith(f.getFirst({img:1,a:1}))}e&&
+"none"!=e&&(f=CKEDITOR.tools.parseCssText(d.style||""),"center"==e&&"figure"==a.name?a=a.wrapWith(new CKEDITOR.htmlParser.element("div",b?{"class":b[1]}:{style:"text-align:center"})):e in{left:1,right:1}&&(b?c.addClass(b[v[e]]):f["float"]=e),b||CKEDITOR.tools.isEmpty(f)||(d.style=CKEDITOR.tools.writeCssText(f)));return a}}function e(a){var b=a.config.image2_captionedClass,c=a.config.image2_alignClasses,d={figure:1,a:1,img:1};return function(e){if(!(e.name in{div:1,p:1}))return!1;var f=e.children;
+if(1!==f.length)return!1;f=f[0];if(!(f.name in d))return!1;if("p"==e.name){if(!h(f))return!1}else if("figure"==f.name){if(!f.hasClass(b))return!1}else if(a.enterMode==CKEDITOR.ENTER_P||!h(f))return!1;return(c?e.hasClass(c[1]):"center"==CKEDITOR.tools.parseCssText(e.attributes.style||"",!0)["text-align"])?!0:!1}}function h(a){return"img"==a.name?!0:"a"==a.name?1==a.children.length&&a.getFirst("img"):!1}function m(a){var b=a.editor,c=b.editable(),d=b.document,e=a.resizer=d.createElement("span");e.addClass("cke_image_resizer");
+e.setAttribute("title",b.lang.image2.resizer);e.append(new CKEDITOR.dom.text("​",d));if(a.inline)a.wrapper.append(e);else{var f=a.parts.link||a.parts.image,g=f.getParent(),h=d.createElement("span");h.addClass("cke_image_resizer_wrapper");h.append(f);h.append(e);a.element.append(h,!0);g.is("span")&&g.remove()}e.on("mousedown",function(f){function g(a,b,c){var e=CKEDITOR.document,f=[];d.equals(e)||f.push(e.on(a,b));f.push(d.on(a,b));if(c)for(a=f.length;a--;)c.push(f.pop())}function h(){U=r+m*S;K=Math.round(U/
+v)}function k(){K=u-H;U=Math.round(K*v)}var l=a.parts.image,m="right"==a.data.align?-1:1,p=f.data.$.screenX,t=f.data.$.screenY,r=l.$.clientWidth,u=l.$.clientHeight,v=r/u,x=[],D="cke_image_s"+(~m?"e":"w"),O,U,K,V,S,H,M;b.fire("saveSnapshot");g("mousemove",function(a){O=a.data.$;S=O.screenX-p;H=t-O.screenY;M=Math.abs(S/H);1==m?0>=S?0>=H?h():M>=v?h():k():0>=H?M>=v?k():h():k():0>=S?0>=H?M>=v?k():h():k():0>=H?h():M>=v?h():k();15<=U&&15<=K?(l.setAttributes({width:U,height:K}),V=!0):V=!1},x);g("mouseup",
+function(){for(var d;d=x.pop();)d.removeListener();c.removeClass(D);e.removeClass("cke_image_resizing");V&&(a.setData({width:U,height:K}),b.fire("saveSnapshot"));V=!1},x);c.addClass(D);e.addClass("cke_image_resizing")});a.on("data",function(){e["right"==a.data.align?"addClass":"removeClass"]("cke_image_resizer_left")})}function l(a){var c=[],d;return function(e){var f=a.getCommand("justify"+e);if(f){c.push(function(){f.refresh(a,a.elementPath())});if(e in{right:1,left:1,center:1})f.on("exec",function(d){var f=
 b(a);if(f){f.setData("align",e);for(f=c.length;f--;)c[f]();d.cancel()}});f.on("refresh",function(c){var f=b(a),g={right:1,left:1,center:1};f&&(void 0===d&&(d=a.filter.checkFeature(a.widgets.registered.image.features.align)),d?this.setState(f.data.align==e?CKEDITOR.TRISTATE_ON:e in g?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED):this.setState(CKEDITOR.TRISTATE_DISABLED),c.cancel())})}}}function k(a){a.plugins.link&&(CKEDITOR.on("dialogDefinition",function(c){c=c.data;if("link"==c.name){c=c.definition;
 var d=c.onShow,e=c.onOk;c.onShow=function(){var c=b(a);c&&(c.inline?!c.wrapper.getAscendant("a"):1)?this.setupContent(c.data.link||{}):d.apply(this,arguments)};c.onOk=function(){var c=b(a);if(c&&(c.inline?!c.wrapper.getAscendant("a"):1)){var d={};this.commitContent(d);c.setData("link",d)}else e.apply(this,arguments)}}}),a.getCommand("unlink").on("exec",function(c){var d=b(a);d&&d.parts.link&&(d.setData("link",null),this.refresh(a,a.elementPath()),c.cancel())}),a.getCommand("unlink").on("refresh",
-function(c){var d=b(a);d&&(this.setState(d.data.link||d.wrapper.getAscendant("a")?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),c.cancel())}))}function b(a){return(a=a.widgets.focused)&&"image"==a.name?a:null}function d(a){var b=a.config.image2_alignClasses;a={div:{match:g(a)},p:{match:g(a)},img:{attributes:"!src,alt,width,height"},figure:{classes:"!"+a.config.image2_captionedClass},figcaption:!0};b?(a.div.classes=b[1],a.p.classes=a.div.classes,a.img.classes=b[0]+","+b[2],a.figure.classes+=","+
-a.img.classes):(a.div.styles="text-align",a.p.styles="text-align",a.img.styles="float",a.figure.styles="float,display");return a}function h(a){a=a.config.image2_alignClasses;return{dimension:{requiredContent:"img[width,height]"},align:{requiredContent:"img"+(a?"("+a[0]+")":"{float}")},caption:{requiredContent:"figcaption"}}}function p(a){return a.data.hasCaption?a.element:a.parts.image}var v=new CKEDITOR.template('\x3cfigure class\x3d"{captionedClass}"\x3e\x3cimg alt\x3d"" src\x3d"" /\x3e\x3cfigcaption\x3e{captionPlaceholder}\x3c/figcaption\x3e\x3c/figure\x3e'),
-u={left:0,center:1,right:2},t=/^\s*(\d+\%)\s*$/i;CKEDITOR.plugins.add("image2",{requires:"widget,dialog",icons:"image",hidpi:!0,onLoad:function(){CKEDITOR.addCss(".cke_image_nocaption{line-height:0}.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}.cke_image_resizer{display:none;position:absolute;width:10px;height:10px;bottom:-5px;right:-5px;background:#000;outline:1px solid #fff;line-height:0;cursor:se-resize;}.cke_image_resizer_wrapper{position:relative;display:inline-block;line-height:0;}.cke_image_resizer.cke_image_resizer_left{right:auto;left:-5px;cursor:sw-resize;}.cke_widget_wrapper:hover .cke_image_resizer,.cke_image_resizer.cke_image_resizing{display:block}.cke_widget_wrapper\x3ea{display:inline-block}")},
+function(c){var d=b(a);d&&(this.setState(d.data.link||d.wrapper.getAscendant("a")?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),c.cancel())}))}function b(a){return(a=a.widgets.focused)&&"image"==a.name?a:null}function d(a){var b=a.config.image2_alignClasses;a={div:{match:e(a)},p:{match:e(a)},img:{attributes:"!src,alt,width,height"},figure:{classes:"!"+a.config.image2_captionedClass},figcaption:!0};b?(a.div.classes=b[1],a.p.classes=a.div.classes,a.img.classes=b[0]+","+b[2],a.figure.classes+=","+
+a.img.classes):(a.div.styles="text-align",a.p.styles="text-align",a.img.styles="float",a.figure.styles="float,display");return a}function g(a){a=a.config.image2_alignClasses;return{dimension:{requiredContent:"img[width,height]"},align:{requiredContent:"img"+(a?"("+a[0]+")":"{float}")},caption:{requiredContent:"figcaption"}}}function p(a){return a.data.hasCaption?a.element:a.parts.image}var u=new CKEDITOR.template('\x3cfigure class\x3d"{captionedClass}"\x3e\x3cimg alt\x3d"" src\x3d"" /\x3e\x3cfigcaption\x3e{captionPlaceholder}\x3c/figcaption\x3e\x3c/figure\x3e'),
+v={left:0,center:1,right:2},r=/^\s*(\d+\%)\s*$/i;CKEDITOR.plugins.add("image2",{requires:"widget,dialog",icons:"image",hidpi:!0,onLoad:function(){CKEDITOR.addCss(".cke_image_nocaption{line-height:0}.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}.cke_image_resizer{display:none;position:absolute;width:10px;height:10px;bottom:-5px;right:-5px;background:#000;outline:1px solid #fff;line-height:0;cursor:se-resize;}.cke_image_resizer_wrapper{position:relative;display:inline-block;line-height:0;}.cke_image_resizer.cke_image_resizer_left{right:auto;left:-5px;cursor:sw-resize;}.cke_widget_wrapper:hover .cke_image_resizer,.cke_image_resizer.cke_image_resizing{display:block}.cke_widget_wrapper\x3ea{display:inline-block}")},
 init:function(b){var c=b.config,d=b.lang.image2,e=a(b);c.filebrowserImage2BrowseUrl=c.filebrowserImageBrowseUrl;c.filebrowserImage2UploadUrl=c.filebrowserImageUploadUrl;e.pathName=d.pathName;e.editables.caption.pathName=d.pathNameCaption;b.widgets.add("image",e);b.ui.addButton&&b.ui.addButton("Image",{label:b.lang.common.image,command:"image",toolbar:"insert,10"});b.contextMenu&&(b.addMenuGroup("image",10),b.addMenuItem("image",{label:d.menu,command:"image",group:"image"}));CKEDITOR.dialog.add("image2",
 this.path+"dialogs/image2.js")},afterInit:function(a){var b={left:1,right:1,center:1,block:1},c=l(a),d;for(d in b)c(d);k(a)}});CKEDITOR.plugins.image2={stateShifter:function(a){function b(a,f){var g={};e?g.attributes={"class":e[1]}:g.styles={"text-align":"center"};g=d.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div",g);c(g,f);f.move(g);return g}function c(b,d){if(d.getParent()){var e=a.createRange();e.moveToPosition(d,CKEDITOR.POSITION_BEFORE_START);d.remove();g.insertElementIntoRange(b,
 e)}else b.replace(d)}var d=a.document,e=a.config.image2_alignClasses,f=a.config.image2_captionedClass,g=a.editable(),h=["hasCaption","align","link"],k={align:function(c,d,f){var g=c.element;c.changed.align?c.newData.hasCaption||("center"==f&&(c.deflate(),c.element=b(a,g)),c.changed.hasCaption||"center"!=d||"center"==f||(c.deflate(),d=g.findOne("a,img"),d.replace(g),c.element=d)):"center"==f&&c.changed.hasCaption&&!c.newData.hasCaption&&(c.deflate(),c.element=b(a,g));!e&&g.is("figure")&&("center"==
-f?g.setStyle("display","inline-block"):g.removeStyle("display"))},hasCaption:function(b,e,g){b.changed.hasCaption&&(e=b.element.is({img:1,a:1})?b.element:b.element.findOne("a,img"),b.deflate(),g?(g=CKEDITOR.dom.element.createFromHtml(v.output({captionedClass:f,captionPlaceholder:a.lang.image2.captionPlaceholder}),d),c(g,b.element),e.replace(g.findOne("img")),b.element=g):(e.replace(b.element),b.element=e))},link:function(b,c,e){if(b.changed.link){var f=b.element.is("img")?b.element:b.element.findOne("img"),
+f?g.setStyle("display","inline-block"):g.removeStyle("display"))},hasCaption:function(b,e,g){b.changed.hasCaption&&(e=b.element.is({img:1,a:1})?b.element:b.element.findOne("a,img"),b.deflate(),g?(g=CKEDITOR.dom.element.createFromHtml(u.output({captionedClass:f,captionPlaceholder:a.lang.image2.captionPlaceholder}),d),c(g,b.element),e.replace(g.findOne("img")),b.element=g):(e.replace(b.element),b.element=e))},link:function(b,c,e){if(b.changed.link){var f=b.element.is("img")?b.element:b.element.findOne("img"),
 g=b.element.is("a")?b.element:b.element.findOne("a"),h=b.element.is("a")&&!e||b.element.is("img")&&e,k;h&&b.deflate();e?(c||(k=d.createElement("a",{attributes:{href:b.newData.link.url}}),k.replace(f),f.move(k)),e=CKEDITOR.plugins.image2.getLinkAttributesGetter()(a,e),CKEDITOR.tools.isEmpty(e.set)||(k||g).setAttributes(e.set),e.removed.length&&(k||g).removeAttributes(e.removed)):(e=g.findOne("img"),e.replace(g),k=e);h&&(b.element=k)}}};return function(a){var b,c;a.changed={};for(c=0;c<h.length;c++)b=
 h[c],a.changed[b]=a.oldData?a.oldData[b]!==a.newData[b]:!1;for(c=0;c<h.length;c++)b=h[c],k[b](a,a.oldData?a.oldData[b]:null,a.newData[b]);a.inflate()}},checkHasNaturalRatio:function(a){var b=a.$;a=this.getNatural(a);return Math.round(b.clientWidth/a.width*a.height)==b.clientHeight||Math.round(b.clientHeight/a.height*a.width)==b.clientWidth},getNatural:function(a){if(a.$.naturalWidth)a={width:a.$.naturalWidth,height:a.$.naturalHeight};else{var b=new Image;b.src=a.getAttribute("src");a={width:b.width,
-height:b.height}}return a},getLinkAttributesGetter:function(){return CKEDITOR.plugins.link.getLinkAttributes},getLinkAttributesParser:function(){return CKEDITOR.plugins.link.parseLinkAttributes}}}(),CKEDITOR.config.image2_captionedClass="image",CKEDITOR.config.plugins="dialogui,dialog,about,a11yhelp,basicstyles,blockquote,clipboard,panel,floatpanel,menu,contextmenu,resize,button,toolbar,elementspath,enterkey,entities,popup,filebrowser,floatingspace,listblock,richcombo,format,htmlwriter,horizontalrule,wysiwygarea,indent,indentlist,list,magicline,maximize,pastetext,pastefromword,removeformat,sourcearea,specialchar,stylescombo,tab,table,tabletools,undo,justify,showblocks,showborders,tableresize,sharedspace,sourcedialog,lineutils,widget,image2",
-CKEDITOR.config.skin="moono",function(){var a=function(a,c){var g=CKEDITOR.getUrl("plugins/"+c);a=a.split(",");for(var f=0;f<a.length;f++)CKEDITOR.skin.icons[a[f]]={path:g,offset:-a[++f],bgsize:a[++f]}};CKEDITOR.env.hidpi?a("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,justifyblock,480,,justifycenter,504,,justifyleft,528,,justifyright,552,,bulletedlist-rtl,576,,bulletedlist,600,,numberedlist-rtl,624,,numberedlist,648,,maximize,672,,pastefromword-rtl,696,,pastefromword,720,,pastetext-rtl,744,,pastetext,768,,removeformat,792,,showblocks-rtl,816,,showblocks,840,,source-rtl,864,,source,888,,sourcedialog-rtl,912,,sourcedialog,936,,specialchar,960,,table,984,,redo-rtl,1008,,redo,1032,,undo-rtl,1056,,undo,1080,,simplebox,2208,auto",
-"icons_hidpi.png"):a("about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,blockquote,168,auto,copy-rtl,192,auto,copy,216,auto,cut-rtl,240,auto,cut,264,auto,paste-rtl,288,auto,paste,312,auto,horizontalrule,336,auto,image,360,auto,indent-rtl,384,auto,indent,408,auto,outdent-rtl,432,auto,outdent,456,auto,justifyblock,480,auto,justifycenter,504,auto,justifyleft,528,auto,justifyright,552,auto,bulletedlist-rtl,576,auto,bulletedlist,600,auto,numberedlist-rtl,624,auto,numberedlist,648,auto,maximize,672,auto,pastefromword-rtl,696,auto,pastefromword,720,auto,pastetext-rtl,744,auto,pastetext,768,auto,removeformat,792,auto,showblocks-rtl,816,auto,showblocks,840,auto,source-rtl,864,auto,source,888,auto,sourcedialog-rtl,912,auto,sourcedialog,936,auto,specialchar,960,auto,table,984,auto,redo-rtl,1008,auto,redo,1032,auto,undo-rtl,1056,auto,undo,1080,auto,simplebox,1104,auto",
+height:b.height}}return a},getLinkAttributesGetter:function(){return CKEDITOR.plugins.link.getLinkAttributes},getLinkAttributesParser:function(){return CKEDITOR.plugins.link.parseLinkAttributes}}}(),CKEDITOR.config.image2_captionedClass="image",CKEDITOR.config.plugins="dialogui,dialog,about,a11yhelp,basicstyles,blockquote,clipboard,panel,floatpanel,menu,contextmenu,resize,button,toolbar,elementspath,enterkey,entities,popup,filebrowser,floatingspace,listblock,richcombo,format,htmlwriter,horizontalrule,wysiwygarea,indent,indentlist,menubutton,language,list,magicline,maximize,pastetext,pastefromword,removeformat,sourcearea,specialchar,stylescombo,tab,table,tabletools,undo,justify,showblocks,showborders,tableresize,sharedspace,sourcedialog,lineutils,widget,image2",
+CKEDITOR.config.skin="moono",function(){var a=function(a,c){var e=CKEDITOR.getUrl("plugins/"+c);a=a.split(",");for(var h=0;h<a.length;h++)CKEDITOR.skin.icons[a[h]]={path:e,offset:-a[++h],bgsize:a[++h]}};CKEDITOR.env.hidpi?a("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,blockquote,168,,copy-rtl,192,,copy,216,,cut-rtl,240,,cut,264,,paste-rtl,288,,paste,312,,horizontalrule,336,,image,360,,indent-rtl,384,,indent,408,,outdent-rtl,432,,outdent,456,,justifyblock,480,,justifycenter,504,,justifyleft,528,,justifyright,552,,language,576,,bulletedlist-rtl,600,,bulletedlist,624,,numberedlist-rtl,648,,numberedlist,672,,maximize,696,,pastefromword-rtl,720,,pastefromword,744,,pastetext-rtl,768,,pastetext,792,,removeformat,816,,showblocks-rtl,840,,showblocks,864,,source-rtl,888,,source,912,,sourcedialog-rtl,936,,sourcedialog,960,,specialchar,984,,table,1008,,redo-rtl,1032,,redo,1056,,undo-rtl,1080,,undo,1104,,simplebox,2256,auto",
+"icons_hidpi.png"):a("about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,blockquote,168,auto,copy-rtl,192,auto,copy,216,auto,cut-rtl,240,auto,cut,264,auto,paste-rtl,288,auto,paste,312,auto,horizontalrule,336,auto,image,360,auto,indent-rtl,384,auto,indent,408,auto,outdent-rtl,432,auto,outdent,456,auto,justifyblock,480,auto,justifycenter,504,auto,justifyleft,528,auto,justifyright,552,auto,language,576,auto,bulletedlist-rtl,600,auto,bulletedlist,624,auto,numberedlist-rtl,648,auto,numberedlist,672,auto,maximize,696,auto,pastefromword-rtl,720,auto,pastefromword,744,auto,pastetext-rtl,768,auto,pastetext,792,auto,removeformat,816,auto,showblocks-rtl,840,auto,showblocks,864,auto,source-rtl,888,auto,source,912,auto,sourcedialog-rtl,936,auto,sourcedialog,960,auto,specialchar,984,auto,table,1008,auto,redo-rtl,1032,auto,redo,1056,auto,undo-rtl,1080,auto,undo,1104,auto,simplebox,1128,auto",
 "icons.png")}())})();
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/_translationstatus.txt b/core/assets/vendor/ckeditor/lang/_translationstatus.txt
index a7b9d05..5573f80 100644
--- a/core/assets/vendor/ckeditor/lang/_translationstatus.txt
+++ b/core/assets/vendor/ckeditor/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 af.js      Found: 62 Missing: 4
diff --git a/core/assets/vendor/ckeditor/lang/af.js b/core/assets/vendor/ckeditor/lang/af.js
index ffc4bf8..e10e28a 100644
--- a/core/assets/vendor/ckeditor/lang/af.js
+++ b/core/assets/vendor/ckeditor/lang/af.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['af']={"widget":{"move":"Klik en trek on te beweeg"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"sourcedialog":{"toolbar":"Bron","title":"Bron"},"sourcearea":{"toolbar":"Bron"},"showblocks":{"toolbar":"Toon blokke"},"removeformat":{"toolbar":"Verwyder opmaak"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"magicline":{"title":"Voeg paragraaf hier in"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"image2":{"alt":"Alternatiewe teks","btnUpload":"Stuur na bediener","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Afbeelding informasie","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","pathName":"image","pathNameCaption":"caption","resetSize":"Herstel grootte","resizer":"Click and drag to resize","title":"Afbeelding eienskappe","uploadTab":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek."},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"blockquote":{"toolbar":"Sitaatblok"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>"}};
\ No newline at end of file
+CKEDITOR.lang['af']={"widget":{"move":"Klik en trek on te beweeg"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"sourcedialog":{"toolbar":"Bron","title":"Bron"},"sourcearea":{"toolbar":"Bron"},"showblocks":{"toolbar":"Toon blokke"},"removeformat":{"toolbar":"Verwyder opmaak"},"pastetext":{"button":"Plak as eenvoudige teks","title":"Plak as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil plak lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit geplak word?","error":"Die geplakte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Plak vanuit Word","toolbar":"Plak vanuit Word"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"magicline":{"title":"Voeg paragraaf hier in"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Uitvul","center":"Sentreer","left":"Links oplyn","right":"Regs oplyn"},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"image2":{"alt":"Alternatiewe teks","btnUpload":"Stuur na bediener","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Afbeelding informasie","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","pathName":"image","pathNameCaption":"caption","resetSize":"Herstel grootte","resizer":"Click and drag to resize","title":"Afbeelding eienskappe","uploadTab":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek."},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"button":{"selectedLabel":"%1 uitgekies"},"blockquote":{"toolbar":"Sitaatblok"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ar.js b/core/assets/vendor/ckeditor/lang/ar.js
index a407e02..7be2171 100644
--- a/core/assets/vendor/ckeditor/lang/ar.js
+++ b/core/assets/vendor/ckeditor/lang/ar.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ar']={"widget":{"move":"إضغط و إسحب للتحريك"},"undo":{"redo":"إعادة","undo":"تراجع"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"sourcedialog":{"toolbar":"المصدر","title":"المصدر"},"sourcearea":{"toolbar":"المصدر"},"showblocks":{"toolbar":"مخطط تفصيلي"},"removeformat":{"toolbar":"إزالة التنسيقات"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"magicline":{"title":"إدراج فقرة هنا"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"image2":{"alt":"عنوان الصورة","btnUpload":"أرسلها للخادم","captioned":"صورة ذات اسم","captionPlaceholder":"تسمية","infoTab":"معلومات الصورة","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","pathName":"صورة","pathNameCaption":"تسمية","resetSize":"إستعادة الحجم الأصلي","resizer":"انقر ثم اسحب للتحجيم","title":"خصائص الصورة","uploadTab":"رفع","urlMissing":"عنوان مصدر الصورة مفقود"},"horizontalrule":{"toolbar":"خط فاصل"},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"contextmenu":{"options":"خصائص قائمة السياق"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"blockquote":{"toolbar":"اقتباس"},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ar']={"widget":{"move":"إضغط و إسحب للتحريك"},"undo":{"redo":"إعادة","undo":"تراجع"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"sourcedialog":{"toolbar":"المصدر","title":"المصدر"},"sourcearea":{"toolbar":"المصدر"},"showblocks":{"toolbar":"مخطط تفصيلي"},"removeformat":{"toolbar":"إزالة التنسيقات"},"pastetext":{"button":"لصق كنص بسيط","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"magicline":{"title":"إدراج فقرة هنا"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"justify":{"block":"ضبط","center":"توسيط","left":"محاذاة إلى اليسار","right":"محاذاة إلى اليمين"},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"image2":{"alt":"عنوان الصورة","btnUpload":"أرسلها للخادم","captioned":"صورة ذات اسم","captionPlaceholder":"تسمية","infoTab":"معلومات الصورة","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","pathName":"صورة","pathNameCaption":"تسمية","resetSize":"إستعادة الحجم الأصلي","resizer":"انقر ثم اسحب للتحجيم","title":"خصائص الصورة","uploadTab":"رفع","urlMissing":"عنوان مصدر الصورة مفقود"},"horizontalrule":{"toolbar":"خط فاصل"},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"contextmenu":{"options":"خصائص قائمة السياق"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"منطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدام زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.","securityMsg":"نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذلك يجب عليك لصق المحتوى مرة أخرى في هذه النافذة.","title":"لصق"},"button":{"selectedLabel":"%1 (محدد)"},"blockquote":{"toolbar":"اقتباس"},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 من أجل المساعدة","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:","title":"عن CKEditor","userGuide":"دليل مستخدم CKEditor."},"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","alignLeft":"يسار","alignRight":"يمين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/bg.js b/core/assets/vendor/ckeditor/lang/bg.js
index 7cb779b..49c455c 100644
--- a/core/assets/vendor/ckeditor/lang/bg.js
+++ b/core/assets/vendor/ckeditor/lang/bg.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bg']={"widget":{"move":"Кликни и влачи, за да преместиш"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"sourcedialog":{"toolbar":"Източник","title":"Източник"},"sourcearea":{"toolbar":"Изходен код"},"showblocks":{"toolbar":"Показва блокове"},"removeformat":{"toolbar":"Премахване на форматирането"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"magicline":{"title":"Вмъкнете параграф тук"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"image2":{"alt":"Алтернативен текст","btnUpload":"Изпрати я на сървъра","captioned":"Надписано изображение","captionPlaceholder":"Надпис","infoTab":"Детайли за изображението","lockRatio":"Заключване на съотношението","menu":"Настройки на изображението","pathName":"изображение","pathNameCaption":"надпис","resetSize":"Нулиране на размер","resizer":"Кликни и влачи, за да преоразмериш","title":"Настройки на изображението","uploadTab":"Качване","urlMissing":"URL адреса на изображението липсва."},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опции на контекстното меню"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"blockquote":{"toolbar":"Блок за цитат"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bg']={"widget":{"move":"Кликни и влачи, за да преместиш"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Вътрешни стилове","panelTitle3":"Обектни стилове"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"sourcedialog":{"toolbar":"Източник","title":"Източник"},"sourcearea":{"toolbar":"Изходен код"},"showblocks":{"toolbar":"Показва блокове"},"removeformat":{"toolbar":"Премахване на форматирането"},"pastetext":{"button":"Вмъкни като чист текст","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Вмъкни от MS Word","toolbar":"Вмъкни от MS Word"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"magicline":{"title":"Вмъкнете параграф тук"},"list":{"bulletedlist":"Вмъкване/Премахване на точков списък","numberedlist":"Вмъкване/Премахване на номериран списък"},"language":{"button":"Задай език","remove":"Премахни език"},"justify":{"block":"Двустранно подравняване","center":"Център","left":"Подравни в ляво","right":"Подравни в дясно"},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"image2":{"alt":"Алтернативен текст","btnUpload":"Изпрати я на сървъра","captioned":"Надписано изображение","captionPlaceholder":"Надпис","infoTab":"Детайли за изображението","lockRatio":"Заключване на съотношението","menu":"Настройки на изображението","pathName":"изображение","pathNameCaption":"надпис","resetSize":"Нулиране на размер","resizer":"Кликни и влачи, за да преоразмериш","title":"Настройки на изображението","uploadTab":"Качване","urlMissing":"URL адреса на изображението липсва."},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Адрес","tag_div":"Параграф (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опции на контекстното меню"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"button":{"selectedLabel":"%1 (Избрано)"},"blockquote":{"toolbar":"Блок за цитат"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/bn.js b/core/assets/vendor/ckeditor/lang/bn.js
index a0c3665..96acada 100644
--- a/core/assets/vendor/ckeditor/lang/bn.js
+++ b/core/assets/vendor/ckeditor/lang/bn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"রি-ডু","undo":"আনডু"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"বর্ডার সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"stylescombo":{"label":"স্টাইল","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"sourcedialog":{"toolbar":"সোর্স","title":"সোর্স"},"sourcearea":{"toolbar":"সোর্স"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"ফরমেট সরাও"},"pastetext":{"button":"সাদা টেক্সট হিসেবে পেস্ট কর","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"বুলেট লিস্ট লেবেল","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"justify":{"block":"ব্লক জাস্টিফাই","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"indent":{"indent":"ইনডেন্ট বাড়াও","outdent":"ইনডেন্ট কমাও"},"image2":{"alt":"বিকল্প টেক্সট","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ছবির তথ্য","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","pathName":"image","pathNameCaption":"caption","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","resizer":"Click and drag to resize","title":"ছবির প্রোপার্টি","uploadTab":"আপলোড","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"রেখা যুক্ত কর"},"format":{"label":"ফন্ট ফরমেট","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কপি করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"বোল্ড","italic":"ইটালিক","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"রি-ডু","undo":"আনডু"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"বর্ডার সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"stylescombo":{"label":"স্টাইল","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"sourcedialog":{"toolbar":"সোর্স","title":"সোর্স"},"sourcearea":{"toolbar":"সোর্স"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"ফরমেট সরাও"},"pastetext":{"button":"সাদা টেক্সট হিসেবে পেস্ট কর","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"বুলেট লিস্ট লেবেল","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"ব্লক জাস্টিফাই","center":"মাঝ বরাবর ঘেষা","left":"বা দিকে ঘেঁষা","right":"ডান দিকে ঘেঁষা"},"indent":{"indent":"ইনডেন্ট বাড়াও","outdent":"ইনডেন্ট কমাও"},"image2":{"alt":"বিকল্প টেক্সট","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ছবির তথ্য","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","pathName":"image","pathNameCaption":"caption","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","resizer":"Click and drag to resize","title":"ছবির প্রোপার্টি","uploadTab":"আপলোড","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"রেখা যুক্ত কর"},"format":{"label":"ফন্ট ফরমেট","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কপি করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"অনুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"বোল্ড","italic":"ইটালিক","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/bs.js b/core/assets/vendor/ckeditor/lang/bs.js
index c9d7350..75da178 100644
--- a/core/assets/vendor/ckeditor/lang/bs.js
+++ b/core/assets/vendor/ckeditor/lang/bs.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['bs']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ponovi","undo":"Vrati"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"sourcedialog":{"toolbar":"HTML kôd","title":"HTML kôd"},"sourcearea":{"toolbar":"HTML kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Poništi format"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"image2":{"alt":"Tekst na slici","btnUpload":"Šalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj dimenzije","resizer":"Click and drag to resize","title":"Svojstva slike","uploadTab":"Šalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['bs']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ponovi","undo":"Vrati"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"sourcedialog":{"toolbar":"HTML kôd","title":"HTML kôd"},"sourcearea":{"toolbar":"HTML kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Poništi format"},"pastetext":{"button":"Zalijepi kao obièan tekst","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Puno poravnanje","center":"Centralno poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"image2":{"alt":"Tekst na slici","btnUpload":"Šalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj dimenzije","resizer":"Click and drag to resize","title":"Svojstva slike","uploadTab":"Šalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ca.js b/core/assets/vendor/ckeditor/lang/ca.js
index c222ec8..6f415d4 100644
--- a/core/assets/vendor/ckeditor/lang/ca.js
+++ b/core/assets/vendor/ckeditor/lang/ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ca']={"widget":{"move":"Clicar i arrossegar per moure"},"undo":{"redo":"Refés","undo":"Desfés"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"sourcedialog":{"toolbar":"Codi font","title":"Codi font"},"sourcearea":{"toolbar":"Codi font"},"showblocks":{"toolbar":"Mostra els blocs"},"removeformat":{"toolbar":"Elimina Format"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"magicline":{"title":"Insereix el paràgraf aquí"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"image2":{"alt":"Text alternatiu","btnUpload":"Envia-la al servidor","captioned":"Imatge amb subtítol","captionPlaceholder":"Títol","infoTab":"Informació de la imatge","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","pathName":"imatge","pathNameCaption":"subtítol","resetSize":"Restaura la mida","resizer":"Clicar i arrossegar per redimensionar","title":"Propietats de la imatge","uploadTab":"Puja","urlMissing":"Falta la URL de la imatge."},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"contextmenu":{"options":"Opcions del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"blockquote":{"toolbar":"Bloc de cita"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"None","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ca']={"widget":{"move":"Clicar i arrossegar per moure"},"undo":{"redo":"Refés","undo":"Desfés"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"sourcedialog":{"toolbar":"Codi font","title":"Codi font"},"sourcearea":{"toolbar":"Codi font"},"showblocks":{"toolbar":"Mostra els blocs"},"removeformat":{"toolbar":"Elimina Format"},"pastetext":{"button":"Enganxa com a text no formatat","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"magicline":{"title":"Insereix el paràgraf aquí"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"justify":{"block":"Justificat","center":"Centrat","left":"Alinea a l'esquerra","right":"Alinea a la dreta"},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"image2":{"alt":"Text alternatiu","btnUpload":"Envia-la al servidor","captioned":"Imatge amb subtítol","captionPlaceholder":"Títol","infoTab":"Informació de la imatge","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","pathName":"imatge","pathNameCaption":"subtítol","resetSize":"Restaura la mida","resizer":"Clicar i arrossegar per redimensionar","title":"Propietats de la imatge","uploadTab":"Puja","urlMissing":"Falta la URL de la imatge."},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"contextmenu":{"options":"Opcions del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"button":{"selectedLabel":"%1 (Seleccionat)"},"blockquote":{"toolbar":"Bloc de cita"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"None","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/cs.js b/core/assets/vendor/ckeditor/lang/cs.js
index c027691..ec3d374 100644
--- a/core/assets/vendor/ckeditor/lang/cs.js
+++ b/core/assets/vendor/ckeditor/lang/cs.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cs']={"widget":{"move":"Klepněte a táhněte pro přesunutí"},"undo":{"redo":"Znovu","undo":"Zpět"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázat bloky"},"removeformat":{"toolbar":"Odstranit formátování"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"magicline":{"title":"zde vložit odstavec"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"image2":{"alt":"Alternativní text","btnUpload":"Odeslat na server","captioned":"Obrázek s popisem","captionPlaceholder":"Popis","infoTab":"Informace o obrázku","lockRatio":"Zámek","menu":"Vlastnosti obrázku","pathName":"Obrázek","pathNameCaption":"Popis","resetSize":"Původní velikost","resizer":"Klepněte a táhněte pro změnu velikosti","title":"Vlastnosti obrázku","uploadTab":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno."},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"blockquote":{"toolbar":"Citace"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>"}};
\ No newline at end of file
+CKEDITOR.lang['cs']={"widget":{"move":"Klepněte a táhněte pro přesunutí"},"undo":{"redo":"Znovu","undo":"Zpět"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázat bloky"},"removeformat":{"toolbar":"Odstranit formátování"},"pastetext":{"button":"Vložit jako čistý text","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"magicline":{"title":"zde vložit odstavec"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"justify":{"block":"Zarovnat do bloku","center":"Zarovnat na střed","left":"Zarovnat vlevo","right":"Zarovnat vpravo"},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"image2":{"alt":"Alternativní text","btnUpload":"Odeslat na server","captioned":"Obrázek s popisem","captionPlaceholder":"Popis","infoTab":"Informace o obrázku","lockRatio":"Zámek","menu":"Vlastnosti obrázku","pathName":"Obrázek","pathNameCaption":"Popis","resetSize":"Původní velikost","resizer":"Klepněte a táhněte pro změnu velikosti","title":"Vlastnosti obrázku","uploadTab":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno."},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"button":{"selectedLabel":"%1 (Vybráno)"},"blockquote":{"toolbar":"Citace"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/cy.js b/core/assets/vendor/ckeditor/lang/cy.js
index 3d30177..d456bb4 100644
--- a/core/assets/vendor/ckeditor/lang/cy.js
+++ b/core/assets/vendor/ckeditor/lang/cy.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['cy']={"widget":{"move":"Clcio a llusgo i symud"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"sourcedialog":{"toolbar":"HTML","title":"HTML"},"sourcearea":{"toolbar":"HTML"},"showblocks":{"toolbar":"Dangos Blociau"},"removeformat":{"toolbar":"Tynnu Fformat"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"magicline":{"title":"Mewnosod paragraff yma"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"image2":{"alt":"Testun Amgen","btnUpload":"Anfon i'r Gweinydd","captioned":"Delwedd â phennawd","captionPlaceholder":"Caption","infoTab":"Gwyb Delwedd","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","pathName":"delwedd","pathNameCaption":"pennawd","resetSize":"Ailosod Maint","resizer":"Clicio a llusgo i ail-meintio","title":"Priodweddau Delwedd","uploadTab":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll."},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Dyfyniad bloc"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>"}};
\ No newline at end of file
+CKEDITOR.lang['cy']={"widget":{"move":"Clcio a llusgo i symud"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"sourcedialog":{"toolbar":"HTML","title":"HTML"},"sourcearea":{"toolbar":"HTML"},"showblocks":{"toolbar":"Dangos Blociau"},"removeformat":{"toolbar":"Tynnu Fformat"},"pastetext":{"button":"Gludo fel testun plaen","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"magicline":{"title":"Mewnosod paragraff yma"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"justify":{"block":"Unioni","center":"Alinio i'r Canol","left":"Alinio i'r Chwith","right":"Alinio i'r Dde"},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"image2":{"alt":"Testun Amgen","btnUpload":"Anfon i'r Gweinydd","captioned":"Delwedd â phennawd","captionPlaceholder":"Caption","infoTab":"Gwyb Delwedd","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","pathName":"delwedd","pathNameCaption":"pennawd","resetSize":"Ailosod Maint","resizer":"Clicio a llusgo i ail-meintio","title":"Priodweddau Delwedd","uploadTab":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll."},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Dyfyniad bloc"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/da.js b/core/assets/vendor/ckeditor/lang/da.js
index 4fc276b..10a3e7c 100644
--- a/core/assets/vendor/ckeditor/lang/da.js
+++ b/core/assets/vendor/ckeditor/lang/da.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['da']={"widget":{"move":"Klik og træk for at flytte"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"magicline":{"title":"Indsæt afsnit"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"image2":{"alt":"Alternativ tekst","btnUpload":"Upload fil til serveren","captioned":"Tekstet billede","captionPlaceholder":"Tekst","infoTab":"Generelt","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","pathName":"billede","pathNameCaption":"tekst","resetSize":"Nulstil størrelse","resizer":"Klik og træk for at ændre størrelsen","title":"Egenskaber for billede","uploadTab":"Upload","urlMissing":"Kilde på billed-URL mangler"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokcitat"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['da']={"widget":{"move":"Klik og træk for at flytte"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"stylescombo":{"label":"Typografi","panelTitle":"Formattering på stylesheet","panelTitle1":"Block typografi","panelTitle2":"Inline typografi","panelTitle3":"Object typografi"},"specialchar":{"options":"Muligheder for specialkarakterer","title":"Vælg symbol","toolbar":"Indsæt symbol"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"magicline":{"title":"Indsæt afsnit"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"justify":{"block":"Lige margener","center":"Centreret","left":"Venstrestillet","right":"Højrestillet"},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"image2":{"alt":"Alternativ tekst","btnUpload":"Upload fil til serveren","captioned":"Tekstet billede","captionPlaceholder":"Tekst","infoTab":"Generelt","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","pathName":"billede","pathNameCaption":"tekst","resetSize":"Nulstil størrelse","resizer":"Klik og træk for at ændre størrelsen","title":"Egenskaber for billede","uploadTab":"Upload","urlMissing":"Kilde på billed-URL mangler"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokcitat"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/de-ch.js b/core/assets/vendor/ckeditor/lang/de-ch.js
new file mode 100644
index 0000000..9e68381
--- /dev/null
+++ b/core/assets/vendor/ckeditor/lang/de-ch.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.lang['de-ch']={"widget":{"move":"Zum Verschieben anwählen und ziehen"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Grösse zurücksetzen","resizer":"Zum Vergrössern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/de.js b/core/assets/vendor/ckeditor/lang/de.js
index c7ff3c8..bcc2d84 100644
--- a/core/assets/vendor/ckeditor/lang/de.js
+++ b/core/assets/vendor/ckeditor/lang/de.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['de']={"widget":{"move":"Zum Verschieben anwählen und ziehen"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Größe zurücksetzen","resizer":"Zum Vergrößern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['de']={"widget":{"move":"Zum Verschieben anwählen und ziehen"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"sourcedialog":{"toolbar":"Quellcode","title":"Quellcode"},"sourcearea":{"toolbar":"Quellcode"},"showblocks":{"toolbar":"Blöcke anzeigen"},"removeformat":{"toolbar":"Formatierung entfernen"},"pastetext":{"button":"Als Klartext einfügen","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"magicline":{"title":"Absatz hier einfügen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Größe zurücksetzen","resizer":"Zum Vergrößern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt."},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"contextmenu":{"options":"Kontextmenüoptionen"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"blockquote":{"toolbar":"Zitatblock"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/el.js b/core/assets/vendor/ckeditor/lang/el.js
index 209d3f6..4531573 100644
--- a/core/assets/vendor/ckeditor/lang/el.js
+++ b/core/assets/vendor/ckeditor/lang/el.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['el']={"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"sourcedialog":{"toolbar":"Κώδικας","title":"Κώδικας"},"sourcearea":{"toolbar":"Κώδικας"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"image2":{"alt":"Εναλλακτικό Κείμενο","btnUpload":"Αποστολή στον Διακομιστή","captioned":"Εικόνα με λεζάντα","captionPlaceholder":"Λεζάντα","infoTab":"Πληροφορίες Εικόνας","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","pathName":"εικόνα","pathNameCaption":"λεζάντα","resetSize":"Επαναφορά Αρχικού Μεγέθους","resizer":"Κάνετε κλικ και σύρετε το ποντίκι για να αλλάξετε το μέγεθος","title":"Ιδιότητες Εικόνας","uploadTab":"Αποστολή","urlMissing":"Λείπει το πηγαίο URL της εικόνας."},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>"}};
\ No newline at end of file
+CKEDITOR.lang['el']={"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"sourcedialog":{"toolbar":"Κώδικας","title":"Κώδικας"},"sourcearea":{"toolbar":"Κώδικας"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"justify":{"block":"Πλήρης Στοίχιση","center":"Στο Κέντρο","left":"Στοίχιση Αριστερά","right":"Στοίχιση Δεξιά"},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"image2":{"alt":"Εναλλακτικό Κείμενο","btnUpload":"Αποστολή στον Διακομιστή","captioned":"Εικόνα με λεζάντα","captionPlaceholder":"Λεζάντα","infoTab":"Πληροφορίες Εικόνας","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","pathName":"εικόνα","pathNameCaption":"λεζάντα","resetSize":"Επαναφορά Αρχικού Μεγέθους","resizer":"Κάνετε κλικ και σύρετε το ποντίκι για να αλλάξετε το μέγεθος","title":"Ιδιότητες Εικόνας","uploadTab":"Αποστολή","urlMissing":"Λείπει το πηγαίο URL της εικόνας."},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλουθο κουτί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρυθμίσεων ασφάλειας του περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε αυτό το παράθυρο.","title":"Επικόλληση"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί του CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/en-au.js b/core/assets/vendor/ckeditor/lang/en-au.js
index 2c88035..00c9852 100644
--- a/core/assets/vendor/ckeditor/lang/en-au.js
+++ b/core/assets/vendor/ckeditor/lang/en-au.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-au']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-au']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/en-ca.js b/core/assets/vendor/ckeditor/lang/en-ca.js
index 7877f03..499a437 100644
--- a/core/assets/vendor/ckeditor/lang/en-ca.js
+++ b/core/assets/vendor/ckeditor/lang/en-ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-ca']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-ca']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/en-gb.js b/core/assets/vendor/ckeditor/lang/en-gb.js
index 447f5a5..9928975 100644
--- a/core/assets/vendor/ckeditor/lang/en-gb.js
+++ b/core/assets/vendor/ckeditor/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en-gb']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en-gb']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Centre","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/en.js b/core/assets/vendor/ckeditor/lang/en.js
index 7575003..d0514e7 100644
--- a/core/assets/vendor/ckeditor/lang/en.js
+++ b/core/assets/vendor/ckeditor/lang/en.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['en']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['en']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/eo.js b/core/assets/vendor/ckeditor/lang/eo.js
index 1f1ae2c..b08fce3 100644
--- a/core/assets/vendor/ckeditor/lang/eo.js
+++ b/core/assets/vendor/ckeditor/lang/eo.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eo']={"widget":{"move":"klaki kaj treni por movi"},"undo":{"redo":"Refari","undo":"Malfari"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"sourcedialog":{"toolbar":"Fonto","title":"Fonto"},"sourcearea":{"toolbar":"Fonto"},"showblocks":{"toolbar":"Montri la blokojn"},"removeformat":{"toolbar":"Forigi Formaton"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"image2":{"alt":"Anstataŭiga Teksto","btnUpload":"Sendu al Servilo","captioned":"Bildo kun apudskribo","captionPlaceholder":"Apudskribo","infoTab":"Informoj pri Bildo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","pathName":"bildo","pathNameCaption":"apudskribo","resetSize":"Origina Grando","resizer":"Kliki kaj treni por ŝanĝi la grandon","title":"Atributoj de Bildo","uploadTab":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas."},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"blockquote":{"toolbar":"Citaĵo"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>"}};
\ No newline at end of file
+CKEDITOR.lang['eo']={"widget":{"move":"klaki kaj treni por movi"},"undo":{"redo":"Refari","undo":"Malfari"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"sourcedialog":{"toolbar":"Fonto","title":"Fonto"},"sourcearea":{"toolbar":"Fonto"},"showblocks":{"toolbar":"Montri la blokojn"},"removeformat":{"toolbar":"Forigi Formaton"},"pastetext":{"button":"Interglui kiel platan tekston","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"justify":{"block":"Ĝisrandigi Ambaŭflanke","center":"Centrigi","left":"Ĝisrandigi maldekstren","right":"Ĝisrandigi dekstren"},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"image2":{"alt":"Anstataŭiga Teksto","btnUpload":"Sendu al Servilo","captioned":"Bildo kun apudskribo","captionPlaceholder":"Apudskribo","infoTab":"Informoj pri Bildo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","pathName":"bildo","pathNameCaption":"apudskribo","resetSize":"Origina Grando","resizer":"Kliki kaj treni por ŝanĝi la grandon","title":"Atributoj de Bildo","uploadTab":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas."},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"button":{"selectedLabel":"%1 (Selektita)"},"blockquote":{"toolbar":"Citaĵo"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/es.js b/core/assets/vendor/ckeditor/lang/es.js
index 9e03705..9d8759f 100644
--- a/core/assets/vendor/ckeditor/lang/es.js
+++ b/core/assets/vendor/ckeditor/lang/es.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['es']={"widget":{"move":"Dar clic y arrastrar para mover"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"sourcedialog":{"toolbar":"Fuente HTML","title":"Fuente HTML"},"sourcearea":{"toolbar":"Fuente HTML"},"showblocks":{"toolbar":"Mostrar bloques"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insertar párrafo aquí"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar al Servidor","captioned":"Imagen subtitulada","captionPlaceholder":"Leyenda","infoTab":"Información de Imagen","lockRatio":"Proporcional","menu":"Propiedades de Imagen","pathName":"image","pathNameCaption":"subtítulo","resetSize":"Tamaño Original","resizer":"Dar clic y arrastrar para cambiar tamaño","title":"Propiedades de Imagen","uploadTab":"Cargar","urlMissing":"Debe indicar la URL de la imagen."},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opciones del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['es']={"widget":{"move":"Dar clic y arrastrar para mover"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"sourcedialog":{"toolbar":"Fuente HTML","title":"Fuente HTML"},"sourcearea":{"toolbar":"Fuente HTML"},"showblocks":{"toolbar":"Mostrar bloques"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Pegar como Texto Plano","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insertar párrafo aquí"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar al Servidor","captioned":"Imagen subtitulada","captionPlaceholder":"Leyenda","infoTab":"Información de Imagen","lockRatio":"Proporcional","menu":"Propiedades de Imagen","pathName":"image","pathNameCaption":"subtítulo","resetSize":"Tamaño Original","resizer":"Dar clic y arrastrar para cambiar tamaño","title":"Propiedades de Imagen","uploadTab":"Cargar","urlMissing":"Debe indicar la URL de la imagen."},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opciones del menú contextual"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"button":{"selectedLabel":"%1 (Seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/et.js b/core/assets/vendor/ckeditor/lang/et.js
index 2529d32..37ae12d 100644
--- a/core/assets/vendor/ckeditor/lang/et.js
+++ b/core/assets/vendor/ckeditor/lang/et.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['et']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"sourcedialog":{"toolbar":"Lähtekood","title":"Lähtekood"},"sourcearea":{"toolbar":"Lähtekood"},"showblocks":{"toolbar":"Blokkide näitamine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"magicline":{"title":"Sisesta siia lõigu tekst"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"image2":{"alt":"Alternatiivne tekst","btnUpload":"Saada serverisse","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Pildi info","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","pathName":"image","pathNameCaption":"caption","resetSize":"Lähtesta suurus","resizer":"Click and drag to resize","title":"Pildi omadused","uploadTab":"Lae üles","urlMissing":"Pildi lähte-URL on puudu."},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"contextmenu":{"options":"Kontekstimenüü valikud"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokktsitaat"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>"}};
\ No newline at end of file
+CKEDITOR.lang['et']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"sourcedialog":{"toolbar":"Lähtekood","title":"Lähtekood"},"sourcearea":{"toolbar":"Lähtekood"},"showblocks":{"toolbar":"Blokkide näitamine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"pastetext":{"button":"Asetamine tavalise tekstina","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"magicline":{"title":"Sisesta siia lõigu tekst"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Rööpjoondus","center":"Keskjoondus","left":"Vasakjoondus","right":"Paremjoondus"},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"image2":{"alt":"Alternatiivne tekst","btnUpload":"Saada serverisse","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Pildi info","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","pathName":"image","pathNameCaption":"caption","resetSize":"Lähtesta suurus","resizer":"Click and drag to resize","title":"Pildi omadused","uploadTab":"Lae üles","urlMissing":"Pildi lähte-URL on puudu."},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"contextmenu":{"options":"Kontekstimenüü valikud"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokktsitaat"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/eu.js b/core/assets/vendor/ckeditor/lang/eu.js
index 54690d1..901ff3f 100644
--- a/core/assets/vendor/ckeditor/lang/eu.js
+++ b/core/assets/vendor/ckeditor/lang/eu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['eu']={"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko"},"undo":{"redo":"Berregin","undo":"Desegin"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"sourcedialog":{"toolbar":"Iturburua","title":"Iturburua"},"sourcearea":{"toolbar":"Iturburua"},"showblocks":{"toolbar":"Erakutsi blokeak"},"removeformat":{"toolbar":"Kendu formatua"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"magicline":{"title":"Txertatu paragrafoa hemen"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"image2":{"alt":"Ordezko testua","btnUpload":"Bidali zerbitzarira","captioned":"Argazki oina","captionPlaceholder":"Argazki oina","infoTab":"Irudiaren informazioa","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","pathName":"Irudia","pathNameCaption":"Argazki oina","resetSize":"Berrezarri tamaina","resizer":"Klikatu eta arrastatu tamainaz aldatzeko","title":"Irudiaren propietateak","uploadTab":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da."},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"blockquote":{"toolbar":"Aipamen blokea"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>"}};
\ No newline at end of file
+CKEDITOR.lang['eu']={"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko"},"undo":{"redo":"Berregin","undo":"Desegin"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"sourcedialog":{"toolbar":"Iturburua","title":"Iturburua"},"sourcearea":{"toolbar":"Iturburua"},"showblocks":{"toolbar":"Erakutsi blokeak"},"removeformat":{"toolbar":"Kendu formatua"},"pastetext":{"button":"Itsatsi testu arrunta bezala","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"magicline":{"title":"Txertatu paragrafoa hemen"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"justify":{"block":"Justifikatu","center":"Erdian","left":"Lerrokatu ezkerrean","right":"Lerrokatu eskuinean"},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"image2":{"alt":"Ordezko testua","btnUpload":"Bidali zerbitzarira","captioned":"Argazki oina","captionPlaceholder":"Argazki oina","infoTab":"Irudiaren informazioa","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","pathName":"Irudia","pathNameCaption":"Argazki oina","resetSize":"Berrezarri tamaina","resizer":"Klikatu eta arrastatu tamainaz aldatzeko","title":"Irudiaren propietateak","uploadTab":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da."},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"button":{"selectedLabel":"%1 (hautatuta)"},"blockquote":{"toolbar":"Aipamen blokea"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/fa.js b/core/assets/vendor/ckeditor/lang/fa.js
index 935d794..13c49c5 100644
--- a/core/assets/vendor/ckeditor/lang/fa.js
+++ b/core/assets/vendor/ckeditor/lang/fa.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fa']={"widget":{"move":"کلیک و کشیدن برای جابجایی"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"sourcedialog":{"toolbar":"منبع","title":"منبع"},"sourcearea":{"toolbar":"منبع"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"removeformat":{"toolbar":"برداشتن فرمت"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"magicline":{"title":"قرار دادن بند در اینجا"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"image2":{"alt":"متن جایگزین","btnUpload":"به سرور بفرست","captioned":"تصویر زیرنویس شده","captionPlaceholder":"عنوان","infoTab":"اطلاعات تصویر","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","pathName":"تصویر","pathNameCaption":"عنوان","resetSize":"بازنشانی اندازه","resizer":"کلیک و کشیدن برای تغییر اندازه","title":"ویژگی​های تصویر","uploadTab":"بالاگذاری","urlMissing":"آدرس URL اصلی تصویر یافت نشد."},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"blockquote":{"toolbar":"بلوک نقل قول"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fa']={"widget":{"move":"کلیک و کشیدن برای جابجایی"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"sourcedialog":{"toolbar":"منبع","title":"منبع"},"sourcearea":{"toolbar":"منبع"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"removeformat":{"toolbar":"برداشتن فرمت"},"pastetext":{"button":"چسباندن به عنوان متن ساده","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"magicline":{"title":"قرار دادن بند در اینجا"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"justify":{"block":"بلوک چین","center":"میان چین","left":"چپ چین","right":"راست چین"},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"image2":{"alt":"متن جایگزین","btnUpload":"به سرور بفرست","captioned":"تصویر زیرنویس شده","captionPlaceholder":"عنوان","infoTab":"اطلاعات تصویر","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","pathName":"تصویر","pathNameCaption":"عنوان","resetSize":"بازنشانی اندازه","resizer":"کلیک و کشیدن برای تغییر اندازه","title":"ویژگی​های تصویر","uploadTab":"بالاگذاری","urlMissing":"آدرس URL اصلی تصویر یافت نشد."},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"محل چسباندن","pasteMsg":"لطفا متن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ متنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظیمات امنیتی مرورگر شما، ویرایشگر نمیتواند دسترسی مستقیم به دادههای clipboard داشته باشد. شما باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"blockquote":{"toolbar":"بلوک نقل قول"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهنمایی $1 را ملاحظه کنید.","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:","title":"درباره CKEditor","userGuide":"راهنمای کاربران CKEditor"},"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/fi.js b/core/assets/vendor/ckeditor/lang/fi.js
index 112e01a..42d0ae6 100644
--- a/core/assets/vendor/ckeditor/lang/fi.js
+++ b/core/assets/vendor/ckeditor/lang/fi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fi']={"widget":{"move":"Siirrä klikkaamalla ja raahaamalla"},"undo":{"redo":"Toista","undo":"Kumoa"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"sourcedialog":{"toolbar":"Koodi","title":"Koodi"},"sourcearea":{"toolbar":"Koodi"},"showblocks":{"toolbar":"Näytä elementit"},"removeformat":{"toolbar":"Poista muotoilu"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"magicline":{"title":"Lisää kappale tähän."},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"image2":{"alt":"Vaihtoehtoinen teksti","btnUpload":"Lähetä palvelimelle","captioned":"Kuva kuvatekstillä","captionPlaceholder":"Kuvateksti","infoTab":"Kuvan tiedot","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","pathName":"kuva","pathNameCaption":"kuvateksti","resetSize":"Alkuperäinen koko","resizer":"Klikkaa ja raahaa muuttaaksesi kokoa","title":"Kuvan ominaisuudet","uploadTab":"Lisää tiedosto","urlMissing":"Kuvan lähdeosoite puuttuu."},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"blockquote":{"toolbar":"Lainaus"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fi']={"widget":{"move":"Siirrä klikkaamalla ja raahaamalla"},"undo":{"redo":"Toista","undo":"Kumoa"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"sourcedialog":{"toolbar":"Koodi","title":"Koodi"},"sourcearea":{"toolbar":"Koodi"},"showblocks":{"toolbar":"Näytä elementit"},"removeformat":{"toolbar":"Poista muotoilu"},"pastetext":{"button":"Liitä tekstinä","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"magicline":{"title":"Lisää kappale tähän."},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"justify":{"block":"Tasaa molemmat reunat","center":"Keskitä","left":"Tasaa vasemmat reunat","right":"Tasaa oikeat reunat"},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"image2":{"alt":"Vaihtoehtoinen teksti","btnUpload":"Lähetä palvelimelle","captioned":"Kuva kuvatekstillä","captionPlaceholder":"Kuvateksti","infoTab":"Kuvan tiedot","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","pathName":"kuva","pathNameCaption":"kuvateksti","resetSize":"Alkuperäinen koko","resizer":"Klikkaa ja raahaa muuttaaksesi kokoa","title":"Kuvan ominaisuudet","uploadTab":"Lisää tiedosto","urlMissing":"Kuvan lähdeosoite puuttuu."},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"button":{"selectedLabel":"%1 (Valittu)"},"blockquote":{"toolbar":"Lainaus"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/fo.js b/core/assets/vendor/ckeditor/lang/fo.js
index b26b6bc..07bcebc 100644
--- a/core/assets/vendor/ckeditor/lang/fo.js
+++ b/core/assets/vendor/ckeditor/lang/fo.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fo']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Vend aftur","undo":"Angra"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"sourcedialog":{"toolbar":"Kelda","title":"Kelda"},"sourcearea":{"toolbar":"Kelda"},"showblocks":{"toolbar":"Vís blokkar"},"removeformat":{"toolbar":"Strika sniðgeving"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"image2":{"alt":"Alternativur tekstur","btnUpload":"Send til ambætaran","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Myndaupplýsingar","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","pathName":"image","pathNameCaption":"caption","resetSize":"Upprunastødd","resizer":"Click and drag to resize","title":"Myndaeginleikar","uploadTab":"Send til ambætaran","urlMissing":"URL til mynd manglar."},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fo']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Vend aftur","undo":"Angra"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"sourcedialog":{"toolbar":"Kelda","title":"Kelda"},"sourcearea":{"toolbar":"Kelda"},"showblocks":{"toolbar":"Vís blokkar"},"removeformat":{"toolbar":"Strika sniðgeving"},"pastetext":{"button":"Innrita som reinan tekst","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"language":{"button":"Velja tungumál","remove":"Remove language"},"justify":{"block":"Javnir tekstkantar","center":"Miðsett","left":"Vinstrasett","right":"Høgrasett"},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"image2":{"alt":"Alternativur tekstur","btnUpload":"Send til ambætaran","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Myndaupplýsingar","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","pathName":"image","pathNameCaption":"caption","resetSize":"Upprunastødd","resizer":"Click and drag to resize","title":"Myndaeginleikar","uploadTab":"Send til ambætaran","urlMissing":"URL til mynd manglar."},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/fr-ca.js b/core/assets/vendor/ckeditor/lang/fr-ca.js
index 5800478..f015aef 100644
--- a/core/assets/vendor/ckeditor/lang/fr-ca.js
+++ b/core/assets/vendor/ckeditor/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr-ca']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Refaire","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer le formatage"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"magicline":{"title":"Insérer le paragraphe ici"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informations sur l'image2","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"caption","resetSize":"Taille originale","resizer":"Click and drag to resize","title":"Propriétés de l'image2","uploadTab":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant."},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fr-ca']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Refaire","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer le formatage"},"pastetext":{"button":"Coller comme texte","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"magicline":{"title":"Insérer le paragraphe ici"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justifié","center":"Centré","left":"Aligner à gauche","right":"Aligner à Droite"},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informations sur l'image2","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"caption","resetSize":"Taille originale","resizer":"Click and drag to resize","title":"Propriétés de l'image2","uploadTab":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant."},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/fr.js b/core/assets/vendor/ckeditor/lang/fr.js
index 609e244..c13f532 100644
--- a/core/assets/vendor/ckeditor/lang/fr.js
+++ b/core/assets/vendor/ckeditor/lang/fr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['fr']={"widget":{"move":"Cliquer et glisser pour déplacer"},"undo":{"redo":"Rétablir","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Editer","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Fractionner horizontalement","splitVertical":"Fractionner verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Césure","hAlign":"Alignement Horizontal","vAlign":"Alignement Vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de Bordure","data":"Données","header":"Entête","yes":"Oui","no":"Non","invalidWidth":"La Largeur de Cellule doit être un nombre.","invalidHeight":"La Hauteur de Cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Choisissez"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonnes","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-Têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucunes","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge intérieure des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"% pourcents","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en page","panelTitle1":"Styles de blocs","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionnez un caractère","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"pastetext":{"button":"Coller comme texte sans mise en forme","title":"Coller comme texte sans mise en forme"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées à la suite d'une erreur interne.","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"maximize":{"maximize":"Agrandir","minimize":"Minimiser"},"magicline":{"title":"Insérez un paragraphe ici"},"list":{"bulletedlist":"Insérer/Supprimer la liste à puces","numberedlist":"Insérer/Supprimer la liste numérotée"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"indent":{"indent":"Augmenter le retrait (tabulation)","outdent":"Diminuer le retrait (tabulation)"},"image2":{"alt":"Texte de remplacement","btnUpload":"Envoyer sur le serveur","captioned":"Image légendée","captionPlaceholder":"Légende","infoTab":"Informations sur l'image2","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"légende","resetSize":"Taille d'origine","resizer":"Cliquer et glisser pour redimensionner","title":"Propriétés de l'image2","uploadTab":"Envoyer","urlMissing":"L'adresse source de l'image est manquante."},"horizontalrule":{"toolbar":"Ligne horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 éléments"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement des opérations de copie. Veuillez utiliser le raccourci clavier (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement l'opération \"couper\". Veuillez utiliser le raccourci clavier (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur n'est pas en mesure d'accéder directement à vos données contenues dans le presse-papier. Vous devriez réessayer de coller les données dans la fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web:","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor en anglais"},"editor":"Éditeur de Texte Enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Appuyez sur ALT-0 pour l'aide","browseServer":"Explorer le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton Radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<non défini>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue (longdesc => malvoyant)","cssClass":"Classe CSS","advisoryTitle":"Description (title)","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Déplacer pour modifier la taille","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer?","options":"Options","target":"Cible (Target)","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à Droite (LTR)","langDirRTL":"Droite à Gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur incorrecte.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style inline doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, Indisponible</span>"}};
\ No newline at end of file
+CKEDITOR.lang['fr']={"widget":{"move":"Cliquer et glisser pour déplacer"},"undo":{"redo":"Rétablir","undo":"Annuler"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Editer","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Fractionner horizontalement","splitVertical":"Fractionner verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Césure","hAlign":"Alignement Horizontal","vAlign":"Alignement Vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de Bordure","data":"Données","header":"Entête","yes":"Oui","no":"Non","invalidWidth":"La Largeur de Cellule doit être un nombre.","invalidHeight":"La Hauteur de Cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Choisissez"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonnes","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-Têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucunes","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge intérieure des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"% pourcents","widthPx":"pixels","widthUnit":"unité de largeur"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en page","panelTitle1":"Styles de blocs","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionnez un caractère","toolbar":"Insérer un caractère spécial"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Afficher les blocs"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"pastetext":{"button":"Coller comme texte sans mise en forme","title":"Coller comme texte sans mise en forme"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées à la suite d'une erreur interne.","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"maximize":{"maximize":"Agrandir","minimize":"Minimiser"},"magicline":{"title":"Insérez un paragraphe ici"},"list":{"bulletedlist":"Insérer/Supprimer la liste à puces","numberedlist":"Insérer/Supprimer la liste numérotée"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"indent":{"indent":"Augmenter le retrait (tabulation)","outdent":"Diminuer le retrait (tabulation)"},"image2":{"alt":"Texte de remplacement","btnUpload":"Envoyer sur le serveur","captioned":"Image légendée","captionPlaceholder":"Légende","infoTab":"Informations sur l'image2","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"légende","resetSize":"Taille d'origine","resizer":"Cliquer et glisser pour redimensionner","title":"Propriétés de l'image2","uploadTab":"Envoyer","urlMissing":"L'adresse source de l'image est manquante."},"horizontalrule":{"toolbar":"Ligne horizontale"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Formaté"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 éléments"},"contextmenu":{"options":"Options du menu contextuel"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement des opérations de copie. Veuillez utiliser le raccourci clavier (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur ne permettent pas à l'éditeur d'exécuter automatiquement l'opération \"couper\". Veuillez utiliser le raccourci clavier (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur n'est pas en mesure d'accéder directement à vos données contenues dans le presse-papier. Vous devriez réessayer de coller les données dans la fenêtre.","title":"Coller"},"button":{"selectedLabel":"%1 (Sélectionné)"},"blockquote":{"toolbar":"Citation"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web:","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor en anglais"},"editor":"Éditeur de Texte Enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Appuyez sur ALT-0 pour l'aide","browseServer":"Explorer le serveur","url":"URL","protocol":"Protocole","upload":"Télécharger","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton Radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<non défini>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue (longdesc => malvoyant)","cssClass":"Classe CSS","advisoryTitle":"Description (title)","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Déplacer pour modifier la taille","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer?","options":"Options","target":"Cible (Target)","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à Droite (LTR)","langDirRTL":"Droite à Gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur incorrecte.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style inline doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, Indisponible</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/gl.js b/core/assets/vendor/ckeditor/lang/gl.js
index 4518cc2..3a22ebc 100644
--- a/core/assets/vendor/ckeditor/lang/gl.js
+++ b/core/assets/vendor/ckeditor/lang/gl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gl']={"widget":{"move":"Prema e arrastre para mover"},"undo":{"redo":"Refacer","undo":"Desfacer"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"sourcedialog":{"toolbar":"Orixe","title":"Orixe"},"sourcearea":{"toolbar":"Orixe"},"showblocks":{"toolbar":"Amosar os bloques"},"removeformat":{"toolbar":"Retirar o formato"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Inserir aquí o parágrafo"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar ao servidor","captioned":"Imaxe con lenda","captionPlaceholder":"Lenda","infoTab":"Información da imaxe","lockRatio":"Proporcional","menu":"Propiedades da imaxe","pathName":"Imaxe","pathNameCaption":"lenda","resetSize":"Tamaño orixinal","resizer":"Prema e arrastre para axustar o tamaño","title":"Propiedades da imaxe","uploadTab":"Cargar","urlMissing":"Non se atopa o URL da imaxe."},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opcións do menú contextual"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>"}};
\ No newline at end of file
+CKEDITOR.lang['gl']={"widget":{"move":"Prema e arrastre para mover"},"undo":{"redo":"Refacer","undo":"Desfacer"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"sourcedialog":{"toolbar":"Orixe","title":"Orixe"},"sourcearea":{"toolbar":"Orixe"},"showblocks":{"toolbar":"Amosar os bloques"},"removeformat":{"toolbar":"Retirar o formato"},"pastetext":{"button":"Pegar como texto simple","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Inserir aquí o parágrafo"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"justify":{"block":"Xustificado","center":"Centrado","left":"Aliñar á esquerda","right":"Aliñar á dereita"},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar ao servidor","captioned":"Imaxe con lenda","captionPlaceholder":"Lenda","infoTab":"Información da imaxe","lockRatio":"Proporcional","menu":"Propiedades da imaxe","pathName":"Imaxe","pathNameCaption":"lenda","resetSize":"Tamaño orixinal","resizer":"Prema e arrastre para axustar o tamaño","title":"Propiedades da imaxe","uploadTab":"Cargar","urlMissing":"Non se atopa o URL da imaxe."},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opcións do menú contextual"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"button":{"selectedLabel":"%1 (seleccionado)"},"blockquote":{"toolbar":"Cita"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/gu.js b/core/assets/vendor/ckeditor/lang/gu.js
index a6a4679..6d9fa22 100644
--- a/core/assets/vendor/ckeditor/lang/gu.js
+++ b/core/assets/vendor/ckeditor/lang/gu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['gu']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"sourcedialog":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ","title":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"image2":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","btnUpload":"આ સર્વરને મોકલવું","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ચિત્ર ની જાણકારી","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","pathName":"image","pathNameCaption":"caption","resetSize":"રીસેટ સાઇઝ","resizer":"Click and drag to resize","title":"ચિત્રના ગુણ","uploadTab":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી."},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>"}};
\ No newline at end of file
+CKEDITOR.lang['gu']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"sourcedialog":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ","title":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"બ્લૉક, અંતરાય જસ્ટિફાઇ","center":"સંકેંદ્રણ/સેંટરિંગ","left":"ડાબી બાજુએ/બાજુ તરફ","right":"જમણી બાજુએ/બાજુ તરફ"},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"image2":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","btnUpload":"આ સર્વરને મોકલવું","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ચિત્ર ની જાણકારી","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","pathName":"image","pathNameCaption":"caption","resetSize":"રીસેટ સાઇઝ","resizer":"Click and drag to resize","title":"ચિત્રના ગુણ","uploadTab":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી."},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લૅશ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/he.js b/core/assets/vendor/ckeditor/lang/he.js
index c219249..1d48807 100644
--- a/core/assets/vendor/ckeditor/lang/he.js
+++ b/core/assets/vendor/ckeditor/lang/he.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['he']={"widget":{"move":"לחץ וגרור להזזה"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"sourcedialog":{"toolbar":"מקור","title":"מקור"},"sourcearea":{"toolbar":"מקור"},"showblocks":{"toolbar":"הצגת בלוקים"},"removeformat":{"toolbar":"הסרת העיצוב"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"magicline":{"title":"הכנס פסקה כאן"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"image2":{"alt":"טקסט חלופי","btnUpload":"שליחה לשרת","captioned":"כותרת תמונה","captionPlaceholder":"כותרת","infoTab":"מידע על התמונה","lockRatio":"נעילת היחס","menu":"תכונות התמונה","pathName":"תמונה","pathNameCaption":"כותרת","resetSize":"איפוס הגודל","resizer":"לחץ וגרור לשינוי הגודל","title":"מאפייני התמונה","uploadTab":"העלאה","urlMissing":"כתובת התמונה חסרה."},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"blockquote":{"toolbar":"בלוק ציטוט"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>"}};
\ No newline at end of file
+CKEDITOR.lang['he']={"widget":{"move":"לחץ וגרור להזזה"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"sourcedialog":{"toolbar":"מקור","title":"מקור"},"sourcearea":{"toolbar":"מקור"},"showblocks":{"toolbar":"הצגת בלוקים"},"removeformat":{"toolbar":"הסרת העיצוב"},"pastetext":{"button":"הדבקה כטקסט פשוט","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"magicline":{"title":"הכנס פסקה כאן"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"language":{"button":"צור שפה","remove":"הסר שפה"},"justify":{"block":"יישור לשוליים","center":"מרכוז","left":"יישור לשמאל","right":"יישור לימין"},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"image2":{"alt":"טקסט חלופי","btnUpload":"שליחה לשרת","captioned":"כותרת תמונה","captionPlaceholder":"כותרת","infoTab":"מידע על התמונה","lockRatio":"נעילת היחס","menu":"תכונות התמונה","pathName":"תמונה","pathNameCaption":"כותרת","resetSize":"איפוס הגודל","resizer":"לחץ וגרור לשינוי הגודל","title":"מאפייני התמונה","uploadTab":"העלאה","urlMissing":"כתובת התמונה חסרה."},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"button":{"selectedLabel":"1% (סומן)"},"blockquote":{"toolbar":"בלוק ציטוט"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/hi.js b/core/assets/vendor/ckeditor/lang/hi.js
index e637460..3d4806c 100644
--- a/core/assets/vendor/ckeditor/lang/hi.js
+++ b/core/assets/vendor/ckeditor/lang/hi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hi']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"रीडू","undo":"अन्डू"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"sourcedialog":{"toolbar":"सोर्स","title":"सोर्स"},"sourcearea":{"toolbar":"सोर्स"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"image2":{"alt":"वैकल्पिक टेक्स्ट","btnUpload":"इसे सर्वर को भेजें","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"तस्वीर की जानकारी","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","pathName":"image","pathNameCaption":"caption","resetSize":"रीसॅट साइज़","resizer":"Click and drag to resize","title":"तस्वीर प्रॉपर्टीज़","uploadTab":"अपलोड","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hi']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"रीडू","undo":"अन्डू"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"sourcedialog":{"toolbar":"सोर्स","title":"सोर्स"},"sourcearea":{"toolbar":"सोर्स"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"ब्लॉक जस्टीफ़ाई","center":"बीच में","left":"बायीं तरफ","right":"दायीं तरफ"},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"image2":{"alt":"वैकल्पिक टेक्स्ट","btnUpload":"इसे सर्वर को भेजें","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"तस्वीर की जानकारी","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","pathName":"image","pathNameCaption":"caption","resetSize":"रीसॅट साइज़","resizer":"Click and drag to resize","title":"तस्वीर प्रॉपर्टीज़","uploadTab":"अपलोड","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/hr.js b/core/assets/vendor/ckeditor/lang/hr.js
index 536a784..e0dc2c5 100644
--- a/core/assets/vendor/ckeditor/lang/hr.js
+++ b/core/assets/vendor/ckeditor/lang/hr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hr']={"widget":{"move":"Klikni i povuci da pomakneš"},"undo":{"redo":"Ponovi","undo":"Poništi"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Prikaži blokove"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"magicline":{"title":"Ubaci paragraf ovdje"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","pathName":"image","pathNameCaption":"caption","resetSize":"Obriši veličinu","resizer":"Click and drag to resize","title":"Svojstva slika","uploadTab":"Pošalji","urlMissing":"Nedostaje URL slike."},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"contextmenu":{"options":"Opcije izbornika"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hr']={"widget":{"move":"Klikni i povuci da pomakneš"},"undo":{"redo":"Ponovi","undo":"Poništi"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebne znakove"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Prikaži blokove"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalijepi kao čisti tekst","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"magicline":{"title":"Ubaci paragraf ovdje"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"justify":{"block":"Blok poravnanje","center":"Središnje poravnanje","left":"Lijevo poravnanje","right":"Desno poravnanje"},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","pathName":"image","pathNameCaption":"caption","resetSize":"Obriši veličinu","resizer":"Click and drag to resize","title":"Svojstva slika","uploadTab":"Pošalji","urlMissing":"Nedostaje URL slike."},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Putanja elemenata","eleTitle":"%1 element"},"contextmenu":{"options":"Opcije izbornika"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blockquote"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/hu.js b/core/assets/vendor/ckeditor/lang/hu.js
index dc193d7..448f4a1 100644
--- a/core/assets/vendor/ckeditor/lang/hu.js
+++ b/core/assets/vendor/ckeditor/lang/hu.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['hu']={"widget":{"move":"Kattints és húzd a mozgatáshoz"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"sourcedialog":{"toolbar":"Forráskód","title":"Forráskód"},"sourcearea":{"toolbar":"Forráskód"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"removeformat":{"toolbar":"Formázás eltávolítása"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"magicline":{"title":"Szúrja be a bekezdést ide"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"image2":{"alt":"Buborék szöveg","btnUpload":"Küldés a szerverre","captioned":"Feliratozott kép","captionPlaceholder":"Képfelirat","infoTab":"Alaptulajdonságok","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","pathName":"kép","pathNameCaption":"felirat","resetSize":"Eredeti méret","resizer":"Kattints és húzz az átméretezéshez","title":"Kép tulajdonságai","uploadTab":"Feltöltés","urlMissing":"Hiányzik a kép URL-je"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"contextmenu":{"options":"Helyi menü opciók"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"blockquote":{"toolbar":"Idézet blokk"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>"}};
\ No newline at end of file
+CKEDITOR.lang['hu']={"widget":{"move":"Kattints és húzd a mozgatáshoz"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"sourcedialog":{"toolbar":"Forráskód","title":"Forráskód"},"sourcearea":{"toolbar":"Forráskód"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"removeformat":{"toolbar":"Formázás eltávolítása"},"pastetext":{"button":"Beillesztés formázatlan szövegként","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolt át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"magicline":{"title":"Szúrja be a bekezdést ide"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"justify":{"block":"Sorkizárt","center":"Középre","left":"Balra","right":"Jobbra"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"image2":{"alt":"Buborék szöveg","btnUpload":"Küldés a szerverre","captioned":"Feliratozott kép","captionPlaceholder":"Képfelirat","infoTab":"Alaptulajdonságok","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","pathName":"kép","pathNameCaption":"felirat","resetSize":"Eredeti méret","resizer":"Kattints és húzz az átméretezéshez","title":"Kép tulajdonságai","uploadTab":"Feltöltés","urlMissing":"Hiányzik a kép URL-je"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"format":{"label":"Formátum","panelTitle":"Formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"contextmenu":{"options":"Helyi menü opciók"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"blockquote":{"toolbar":"Idézet blokk"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/id.js b/core/assets/vendor/ckeditor/lang/id.js
index e363914..36226f7 100644
--- a/core/assets/vendor/ckeditor/lang/id.js
+++ b/core/assets/vendor/ckeditor/lang/id.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['id']={"widget":{"move":"Tekan dan geser untuk memindahkan"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Perlihatkan Blok"},"removeformat":{"toolbar":"Hapus Format"},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"magicline":{"title":"Masukkan paragraf disini"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"image2":{"alt":"Teks alternatif","btnUpload":"Kirim ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Gambar","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Atur Ulang Ukuran","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Unggah","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"blockquote":{"toolbar":"Kutipan Blok"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>"}};
\ No newline at end of file
+CKEDITOR.lang['id']={"widget":{"move":"Tekan dan geser untuk memindahkan"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Perlihatkan Blok"},"removeformat":{"toolbar":"Hapus Format"},"pastetext":{"button":"Tempel sebagai teks polos","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"magicline":{"title":"Masukkan paragraf disini"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"justify":{"block":"Rata kiri-kanan","center":"Pusat","left":"Align Left","right":"Align Right"},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"image2":{"alt":"Teks alternatif","btnUpload":"Kirim ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Gambar","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Atur Ulang Ukuran","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Unggah","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"button":{"selectedLabel":"%1(Dipilih)"},"blockquote":{"toolbar":"Kutipan Blok"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/is.js b/core/assets/vendor/ckeditor/lang/is.js
index b9c2f28..de5bcf7 100644
--- a/core/assets/vendor/ckeditor/lang/is.js
+++ b/core/assets/vendor/ckeditor/lang/is.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['is']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"sourcedialog":{"toolbar":"Kóði","title":"Kóði"},"sourcearea":{"toolbar":"Kóði"},"showblocks":{"toolbar":"Sýna blokkir"},"removeformat":{"toolbar":"Fjarlægja snið"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"image2":{"alt":"Baklægur texti","btnUpload":"Hlaða upp","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Almennt","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","pathName":"image","pathNameCaption":"caption","resetSize":"Reikna stærð","resizer":"Click and drag to resize","title":"Eigindi myndar","uploadTab":"Senda upp","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Lóðrétt lína"},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Inndráttur"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['is']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"sourcedialog":{"toolbar":"Kóði","title":"Kóði"},"sourcearea":{"toolbar":"Kóði"},"showblocks":{"toolbar":"Sýna blokkir"},"removeformat":{"toolbar":"Fjarlægja snið"},"pastetext":{"button":"Líma sem ósniðinn texta","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jafna báðum megin","center":"Miðja texta","left":"Vinstrijöfnun","right":"Hægrijöfnun"},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"image2":{"alt":"Baklægur texti","btnUpload":"Hlaða upp","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Almennt","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","pathName":"image","pathNameCaption":"caption","resetSize":"Reikna stærð","resizer":"Click and drag to resize","title":"Eigindi myndar","uploadTab":"Senda upp","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Lóðrétt lína"},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Inndráttur"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/it.js b/core/assets/vendor/ckeditor/lang/it.js
index d78c066..a144a90 100644
--- a/core/assets/vendor/ckeditor/lang/it.js
+++ b/core/assets/vendor/ckeditor/lang/it.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['it']={"widget":{"move":"Fare clic e trascinare per spostare"},"undo":{"redo":"Ripristina","undo":"Annulla"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"sourcedialog":{"toolbar":"Sorgente","title":"Sorgente"},"sourcearea":{"toolbar":"Sorgente"},"showblocks":{"toolbar":"Visualizza Blocchi"},"removeformat":{"toolbar":"Elimina formattazione"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"magicline":{"title":"Inserisci paragrafo qui"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"image2":{"alt":"Testo alternativo","btnUpload":"Invia al server","captioned":"Immagine con didascalia","captionPlaceholder":"Didascalia","infoTab":"Informazioni immagine","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","pathName":"immagine","pathNameCaption":"didascalia","resetSize":"Reimposta dimensione","resizer":"Fare clic e trascinare per ridimensionare","title":"Proprietà immagine","uploadTab":"Carica","urlMissing":"Manca l'URL dell'immagine."},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opzioni del menù contestuale"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"blockquote":{"toolbar":"Citazione"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>"}};
\ No newline at end of file
+CKEDITOR.lang['it']={"widget":{"move":"Fare clic e trascinare per spostare"},"undo":{"redo":"Ripristina","undo":"Annulla"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"sourcedialog":{"toolbar":"Sorgente","title":"Sorgente"},"sourcearea":{"toolbar":"Sorgente"},"showblocks":{"toolbar":"Visualizza Blocchi"},"removeformat":{"toolbar":"Elimina formattazione"},"pastetext":{"button":"Incolla come testo semplice","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"magicline":{"title":"Inserisci paragrafo qui"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"image2":{"alt":"Testo alternativo","btnUpload":"Invia al server","captioned":"Immagine con didascalia","captionPlaceholder":"Didascalia","infoTab":"Informazioni immagine","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","pathName":"immagine","pathNameCaption":"didascalia","resetSize":"Reimposta dimensione","resizer":"Fare clic e trascinare per ridimensionare","title":"Proprietà immagine","uploadTab":"Carica","urlMissing":"Manca l'URL dell'immagine."},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"contextmenu":{"options":"Opzioni del menù contestuale"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"button":{"selectedLabel":"%1 (selezionato)"},"blockquote":{"toolbar":"Citazione"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ja.js b/core/assets/vendor/ckeditor/lang/ja.js
index 20ef376..d2696b9 100644
--- a/core/assets/vendor/ckeditor/lang/ja.js
+++ b/core/assets/vendor/ckeditor/lang/ja.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ja']={"widget":{"move":"ドラッグして移動"},"undo":{"redo":"やり直す","undo":"元に戻す"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"sourcedialog":{"toolbar":"ソース","title":"ソース"},"sourcearea":{"toolbar":"ソース"},"showblocks":{"toolbar":"ブロック表示"},"removeformat":{"toolbar":"書式を解除"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"ここに段落を挿入"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"indent":{"indent":"インデント","outdent":"インデント解除"},"image2":{"alt":"代替テキスト","btnUpload":"サーバーに送信","captioned":"キャプションを付ける","captionPlaceholder":"キャプション","infoTab":"画像情報","lockRatio":"比率を固定","menu":"画像のプロパティ","pathName":"image","pathNameCaption":"caption","resetSize":"サイズをリセット","resizer":"ドラッグしてリサイズ","title":"画像のプロパティ","uploadTab":"アップロード","urlMissing":"画像のURLを入力してください。"},"horizontalrule":{"toolbar":"水平線"},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"contextmenu":{"options":"コンテキストメニューオプション"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"blockquote":{"toolbar":"ブロック引用文"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ja']={"widget":{"move":"ドラッグして移動"},"undo":{"redo":"やり直す","undo":"元に戻す"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"sourcedialog":{"toolbar":"ソース","title":"ソース"},"sourcearea":{"toolbar":"ソース"},"showblocks":{"toolbar":"ブロック表示"},"removeformat":{"toolbar":"書式を解除"},"pastetext":{"button":"プレーンテキストとして貼り付け","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"ここに段落を挿入"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"language":{"button":"言語を設定","remove":"言語を削除"},"justify":{"block":"両端揃え","center":"中央揃え","left":"左揃え","right":"右揃え"},"indent":{"indent":"インデント","outdent":"インデント解除"},"image2":{"alt":"代替テキスト","btnUpload":"サーバーに送信","captioned":"キャプションを付ける","captionPlaceholder":"キャプション","infoTab":"画像情報","lockRatio":"比率を固定","menu":"画像のプロパティ","pathName":"image","pathNameCaption":"caption","resetSize":"サイズをリセット","resizer":"ドラッグしてリサイズ","title":"画像のプロパティ","uploadTab":"アップロード","urlMissing":"画像のURLを入力してください。"},"horizontalrule":{"toolbar":"水平線"},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"contextmenu":{"options":"コンテキストメニューオプション"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の入力エリア内で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"button":{"selectedLabel":"%1 (選択中)"},"blockquote":{"toolbar":"ブロック引用文"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ka.js b/core/assets/vendor/ckeditor/lang/ka.js
index 2e1e812..510fd39 100644
--- a/core/assets/vendor/ckeditor/lang/ka.js
+++ b/core/assets/vendor/ckeditor/lang/ka.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ka']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"sourcedialog":{"toolbar":"კოდები","title":"კოდები"},"sourcearea":{"toolbar":"კოდები"},"showblocks":{"toolbar":"არეების ჩვენება"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"image2":{"alt":"სანაცვლო ტექსტი","btnUpload":"სერვერისთვის გაგზავნა","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"სურათის ინფორმცია","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","pathName":"image","pathNameCaption":"caption","resetSize":"ზომის დაბრუნება","resizer":"Click and drag to resize","title":"სურათის პარამეტრები","uploadTab":"აქაჩვა","urlMissing":"სურათის URL არაა შევსებული."},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ციტატა"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ka']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"sourcedialog":{"toolbar":"კოდები","title":"კოდები"},"sourcearea":{"toolbar":"კოდები"},"showblocks":{"toolbar":"არეების ჩვენება"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"გადასწორება","center":"შუაში სწორება","left":"მარცხნივ სწორება","right":"მარჯვნივ სწორება"},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"image2":{"alt":"სანაცვლო ტექსტი","btnUpload":"სერვერისთვის გაგზავნა","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"სურათის ინფორმცია","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","pathName":"image","pathNameCaption":"caption","resetSize":"ზომის დაბრუნება","resizer":"Click and drag to resize","title":"სურათის პარამეტრები","uploadTab":"აქაჩვა","urlMissing":"სურათის URL არაა შევსებული."},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"ციტატა"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/km.js b/core/assets/vendor/ckeditor/lang/km.js
index 287ba97..ff9246f 100644
--- a/core/assets/vendor/ckeditor/lang/km.js
+++ b/core/assets/vendor/ckeditor/lang/km.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['km']={"widget":{"move":"ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"sourcedialog":{"toolbar":"អក្សរ​កូដ","title":"អក្សរ​កូដ"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"image2":{"alt":"អត្ថបទជំនួស","btnUpload":"បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្តល់សេវា","captioned":"រូប​ដែល​មាន​ចំណង​ជើង","captionPlaceholder":"Caption","infoTab":"ពត៌មានអំពីរូបភាព","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​សម្បត្តិ​រូប​ភាព","pathName":"រូបភាព","pathNameCaption":"ចំណងជើង","resetSize":"កំណត់ទំហំឡើងវិញ","resizer":"ចុច​ហើយ​ទាញ​ដើម្បី​ប្ដូរ​ទំហំ","title":"លក្ខណៈ​សម្បត្តិ​រូប​ភាប","uploadTab":"ផ្ទុក​ឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>"}};
\ No newline at end of file
+CKEDITOR.lang['km']={"widget":{"move":"ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"sourcedialog":{"toolbar":"អក្សរ​កូដ","title":"អក្សរ​កូដ"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"justify":{"block":"តម្រឹម​ពេញ","center":"កណ្ដាល","left":"តម្រឹម​ឆ្វេង","right":"តម្រឹម​ស្ដាំ"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"image2":{"alt":"អត្ថបទជំនួស","btnUpload":"បញ្ជូនទៅកាន់ម៉ាស៊ីនផ្តល់សេវា","captioned":"រូប​ដែល​មាន​ចំណង​ជើង","captionPlaceholder":"Caption","infoTab":"ពត៌មានអំពីរូបភាព","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​សម្បត្តិ​រូប​ភាព","pathName":"រូបភាព","pathNameCaption":"ចំណងជើង","resetSize":"កំណត់ទំហំឡើងវិញ","resizer":"ចុច​ហើយ​ទាញ​ដើម្បី​ប្ដូរ​ទំហំ","title":"លក្ខណៈ​សម្បត្តិ​រូប​ភាប","uploadTab":"ផ្ទុក​ឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូមចំលងអត្ថបទទៅដាក់ក្នុងប្រអប់ដូចខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយចុច <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អាចចាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវចំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ko.js b/core/assets/vendor/ckeditor/lang/ko.js
index a4c36b2..35f13ef 100644
--- a/core/assets/vendor/ckeditor/lang/ko.js
+++ b/core/assets/vendor/ckeditor/lang/ko.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ko']={"widget":{"move":"움직이려면 클릭 후 드래그 하세요"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"sourcedialog":{"toolbar":"소스","title":"소스"},"sourcearea":{"toolbar":"소스"},"showblocks":{"toolbar":"블록 보기"},"removeformat":{"toolbar":"형식 지우기"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"maximize":{"maximize":"최대화","minimize":"최소화"},"magicline":{"title":"여기에 단락 삽입"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"image2":{"alt":"대체 문자열","btnUpload":"서버로 전송","captioned":"이미지 설명 넣기","captionPlaceholder":"설명","infoTab":"이미지 정보","lockRatio":"비율 유지","menu":"이미지 속성","pathName":"이미지","pathNameCaption":"설명","resetSize":"원래 크기로","resizer":"크기를 조절하려면 클릭 후 드래그 하세요","title":"이미지 속성","uploadTab":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다."},"horizontalrule":{"toolbar":"가로 줄 삽입"},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"blockquote":{"toolbar":"인용 단락"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ko']={"widget":{"move":"움직이려면 클릭 후 드래그 하세요"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"sourcedialog":{"toolbar":"소스","title":"소스"},"sourcearea":{"toolbar":"소스"},"showblocks":{"toolbar":"블록 보기"},"removeformat":{"toolbar":"형식 지우기"},"pastetext":{"button":"텍스트로 붙여넣기","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"maximize":{"maximize":"최대화","minimize":"최소화"},"magicline":{"title":"여기에 단락 삽입"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"justify":{"block":"양쪽 맞춤","center":"가운데 정렬","left":"왼쪽 정렬","right":"오른쪽 정렬"},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"image2":{"alt":"대체 문자열","btnUpload":"서버로 전송","captioned":"이미지 설명 넣기","captionPlaceholder":"설명","infoTab":"이미지 정보","lockRatio":"비율 유지","menu":"이미지 속성","pathName":"이미지","pathNameCaption":"설명","resetSize":"원래 크기로","resizer":"크기를 조절하려면 클릭 후 드래그 하세요","title":"이미지 속성","uploadTab":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다."},"horizontalrule":{"toolbar":"가로 줄 삽입"},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"button":{"selectedLabel":"%1 (선택됨)"},"blockquote":{"toolbar":"인용 단락"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설명서"},"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ku.js b/core/assets/vendor/ckeditor/lang/ku.js
index 3604d72..7a5905d 100644
--- a/core/assets/vendor/ckeditor/lang/ku.js
+++ b/core/assets/vendor/ckeditor/lang/ku.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ku']={"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"sourcedialog":{"toolbar":"سەرچاوە","title":"سەرچاوە"},"sourcearea":{"toolbar":"سەرچاوە"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"magicline":{"title":"بڕگە لێرە دابنێ"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"image2":{"alt":"جێگرەوەی دەق","btnUpload":"ناردنی بۆ ڕاژه","captioned":"وێنەی بەسەردێر","captionPlaceholder":"سەردێر","infoTab":"زانیاری وێنه","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","pathName":"وێنە","pathNameCaption":"سەردێر","resetSize":"ڕێکخستنەوەی قەباره","resizer":"کرتەبکە و ڕایبکێشە بۆ قەبارە گۆڕین","title":"خاسیەتی وێنه","uploadTab":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ku']={"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"sourcedialog":{"toolbar":"سەرچاوە","title":"سەرچاوە"},"sourcearea":{"toolbar":"سەرچاوە"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"magicline":{"title":"بڕگە لێرە دابنێ"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"justify":{"block":"هاوستوونی","center":"ناوەڕاست","left":"بەهێڵ کردنی چەپ","right":"بەهێڵ کردنی ڕاست"},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"image2":{"alt":"جێگرەوەی دەق","btnUpload":"ناردنی بۆ ڕاژه","captioned":"وێنەی بەسەردێر","captionPlaceholder":"سەردێر","infoTab":"زانیاری وێنه","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","pathName":"وێنە","pathNameCaption":"سەردێر","resetSize":"ڕێکخستنەوەی قەباره","resizer":"کرتەبکە و ڕایبکێشە بۆ قەبارە گۆڕین","title":"خاسیەتی وێنه","uploadTab":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئەم سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لەم پەنجەرەیه.","title":"لکاندن"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یارمەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/lt.js b/core/assets/vendor/ckeditor/lang/lt.js
index 05cc021..92deae7 100644
--- a/core/assets/vendor/ckeditor/lang/lt.js
+++ b/core/assets/vendor/ckeditor/lang/lt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lt']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"sourcedialog":{"toolbar":"Šaltinis","title":"Šaltinis"},"sourcearea":{"toolbar":"Šaltinis"},"showblocks":{"toolbar":"Rodyti blokus"},"removeformat":{"toolbar":"Panaikinti formatą"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"image2":{"alt":"Alternatyvus Tekstas","btnUpload":"Siųsti į serverį","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Vaizdo informacija","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","pathName":"image","pathNameCaption":"caption","resetSize":"Atstatyti dydį","resizer":"Click and drag to resize","title":"Vaizdo savybės","uploadTab":"Siųsti","urlMissing":"Paveiksliuko nuorodos nėra."},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"blockquote":{"toolbar":"Citata"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>"}};
\ No newline at end of file
+CKEDITOR.lang['lt']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"sourcedialog":{"toolbar":"Šaltinis","title":"Šaltinis"},"sourcearea":{"toolbar":"Šaltinis"},"showblocks":{"toolbar":"Rodyti blokus"},"removeformat":{"toolbar":"Panaikinti formatą"},"pastetext":{"button":"Įdėti kaip gryną tekstą","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Lygiuoti abi puses","center":"Centruoti","left":"Lygiuoti kairę","right":"Lygiuoti dešinę"},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"image2":{"alt":"Alternatyvus Tekstas","btnUpload":"Siųsti į serverį","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Vaizdo informacija","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","pathName":"image","pathNameCaption":"caption","resetSize":"Atstatyti dydį","resizer":"Click and drag to resize","title":"Vaizdo savybės","uploadTab":"Siųsti","urlMissing":"Paveiksliuko nuorodos nėra."},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuką <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.","title":"Įdėti"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"blockquote":{"toolbar":"Citata"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centrą","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/lv.js b/core/assets/vendor/ckeditor/lang/lv.js
index 1cea2fe..609a46d 100644
--- a/core/assets/vendor/ckeditor/lang/lv.js
+++ b/core/assets/vendor/ckeditor/lang/lv.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['lv']={"widget":{"move":"Klikšķina un velc, lai pārvietotu"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"sourcedialog":{"toolbar":"HTML kods","title":"HTML kods"},"sourcearea":{"toolbar":"HTML kods"},"showblocks":{"toolbar":"Parādīt blokus"},"removeformat":{"toolbar":"Noņemt stilus"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"magicline":{"title":"Ievietot šeit rindkopu"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"image2":{"alt":"Alternatīvais teksts","btnUpload":"Nosūtīt serverim","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informācija par attēlu","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","pathName":"image","pathNameCaption":"caption","resetSize":"Atjaunot sākotnējo izmēru","resizer":"Click and drag to resize","title":"Attēla īpašības","uploadTab":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese."},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Bloka citāts"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>"}};
\ No newline at end of file
+CKEDITOR.lang['lv']={"widget":{"move":"Klikšķina un velc, lai pārvietotu"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"sourcedialog":{"toolbar":"HTML kods","title":"HTML kods"},"sourcearea":{"toolbar":"HTML kods"},"showblocks":{"toolbar":"Parādīt blokus"},"removeformat":{"toolbar":"Noņemt stilus"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"magicline":{"title":"Ievietot šeit rindkopu"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Izlīdzināt malas","center":"Izlīdzināt pret centru","left":"Izlīdzināt pa kreisi","right":"Izlīdzināt pa labi"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"image2":{"alt":"Alternatīvais teksts","btnUpload":"Nosūtīt serverim","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informācija par attēlu","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","pathName":"image","pathNameCaption":"caption","resetSize":"Atjaunot sākotnējo izmēru","resizer":"Click and drag to resize","title":"Attēla īpašības","uploadTab":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese."},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"format":{"label":"Formāts","panelTitle":"Formāts","tag_address":"Adrese","tag_div":"Rindkopa (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Normāls teksts","tag_pre":"Formatēts teksts"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Bloka citāts"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/mk.js b/core/assets/vendor/ckeditor/lang/mk.js
index 762e1d8..cd475e9 100644
--- a/core/assets/vendor/ckeditor/lang/mk.js
+++ b/core/assets/vendor/ckeditor/lang/mk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mk']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['mk']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Redo","undo":"Undo"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"sourcedialog":{"toolbar":"Source","title":"Source"},"sourcearea":{"toolbar":"Source"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Remove Format"},"pastetext":{"button":"Paste as plain text","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"Во средина","left":"Align Left","right":"Align Right"},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"image2":{"alt":"Алтернативен текст","btnUpload":"Прикачи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Информации за сликата","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетирај големина","resizer":"Click and drag to resize","title":"Својства на сликата","uploadTab":"Прикачи","urlMissing":"Недостасува URL-то на сликата."},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Контекст-мени опции"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Одвоен цитат"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/mn.js b/core/assets/vendor/ckeditor/lang/mn.js
index 3d33dc5..6d9fd65 100644
--- a/core/assets/vendor/ckeditor/lang/mn.js
+++ b/core/assets/vendor/ckeditor/lang/mn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['mn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"sourcedialog":{"toolbar":"Код","title":"Код"},"sourcearea":{"toolbar":"Код"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"image2":{"alt":"Зургийг орлох бичвэр","btnUpload":"Үүнийг сервэррүү илгээ","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Зурагны мэдээлэл","lockRatio":"Радио түгжих","menu":"Зураг","pathName":"image","pathNameCaption":"caption","resetSize":"хэмжээ дахин оноох","resizer":"Click and drag to resize","title":"Зураг","uploadTab":"Илгээж ачаалах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна."},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['mn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"sourcedialog":{"toolbar":"Код","title":"Код"},"sourcearea":{"toolbar":"Код"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Тэгшлэх","center":"Голлуулах","left":"Зүүн талд тулгах","right":"Баруун талд тулгах"},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"image2":{"alt":"Зургийг орлох бичвэр","btnUpload":"Үүнийг сервэррүү илгээ","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Зурагны мэдээлэл","lockRatio":"Радио түгжих","menu":"Зураг","pathName":"image","pathNameCaption":"caption","resetSize":"хэмжээ дахин оноох","resizer":"Click and drag to resize","title":"Зураг","uploadTab":"Илгээж ачаалах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна."},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste хийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н хамгаалалтын тохиргооноос болоод editor clipboard өгөгдөлрүү шууд хандах боломжгүй. Энэ цонход дахин paste хийхийг оролд.","title":"Буулгах"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","flash":"Флаш хөдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэх","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ms.js b/core/assets/vendor/ckeditor/lang/ms.js
index 8395edf..f7d9a50 100644
--- a/core/assets/vendor/ckeditor/lang/ms.js
+++ b/core/assets/vendor/ckeditor/lang/ms.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ms']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Buang Format"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"image2":{"alt":"Text Alternatif","btnUpload":"Hantar ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Imej","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","pathName":"image","pathNameCaption":"caption","resetSize":"Saiz Set Semula","resizer":"Click and drag to resize","title":"Ciri-ciri Imej","uploadTab":"Muat Naik","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ms']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"sourcedialog":{"toolbar":"Sumber","title":"Sumber"},"sourcearea":{"toolbar":"Sumber"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Buang Format"},"pastetext":{"button":"Tampal sebagai text biasa","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Jajaran Blok","center":"Jajaran Tengah","left":"Jajaran Kiri","right":"Jajaran Kanan"},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"image2":{"alt":"Text Alternatif","btnUpload":"Hantar ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Imej","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","pathName":"image","pathNameCaption":"caption","resetSize":"Saiz Set Semula","resizer":"Click and drag to resize","title":"Ciri-ciri Imej","uploadTab":"Muat Naik","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/nb.js b/core/assets/vendor/ckeditor/lang/nb.js
index a6583d2..b8a70ef 100644
--- a/core/assets/vendor/ckeditor/lang/nb.js
+++ b/core/assets/vendor/ckeditor/lang/nb.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nb']={"widget":{"move":"Klikk og dra for å flytte"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til / fjern punktmerket liste","numberedlist":"Legg til / fjern nummerert liste"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Bildetekst","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['nb']={"widget":{"move":"Klikk og dra for å flytte"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til / fjern punktmerket liste","numberedlist":"Legg til / fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Bildetekst","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Valgt)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/nl.js b/core/assets/vendor/ckeditor/lang/nl.js
index 8781480..c605c2d 100644
--- a/core/assets/vendor/ckeditor/lang/nl.js
+++ b/core/assets/vendor/ckeditor/lang/nl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['nl']={"widget":{"move":"Klik en sleep om te verplaatsen"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Onderschrift","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcedialog":{"toolbar":"Broncode","title":"Broncode"},"sourcearea":{"toolbar":"Broncode"},"showblocks":{"toolbar":"Toon blokken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image2":{"alt":"Alternatieve tekst","btnUpload":"Naar server verzenden","captioned":"Afbeelding met onderschrift","captionPlaceholder":"Onderschrift","infoTab":"Afbeeldingsinformatie","lockRatio":"Verhouding vergrendelen","menu":"Eigenschappen afbeelding","pathName":"afbeelding","pathNameCaption":"onderschrift","resetSize":"Afmetingen herstellen","resizer":"Klik en sleep om te herschalen","title":"Afbeeldingseigenschappen","uploadTab":"Uploaden","urlMissing":"De URL naar de afbeelding ontbreekt."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"}};
\ No newline at end of file
+CKEDITOR.lang['nl']={"widget":{"move":"Klik en sleep om te verplaatsen"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"table":{"border":"Randdikte","caption":"Onderschrift","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"sourcedialog":{"toolbar":"Broncode","title":"Broncode"},"sourcearea":{"toolbar":"Broncode"},"showblocks":{"toolbar":"Toon blokken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"pastetext":{"button":"Plakken als platte tekst","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"magicline":{"title":"Hier paragraaf invoeren"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"justify":{"block":"Uitvullen","center":"Centreren","left":"Links uitlijnen","right":"Rechts uitlijnen"},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"image2":{"alt":"Alternatieve tekst","btnUpload":"Naar server verzenden","captioned":"Afbeelding met onderschrift","captionPlaceholder":"Onderschrift","infoTab":"Afbeeldingsinformatie","lockRatio":"Verhouding vergrendelen","menu":"Eigenschappen afbeelding","pathName":"afbeelding","pathNameCaption":"onderschrift","resetSize":"Afmetingen herstellen","resizer":"Klik en sleep om te herschalen","title":"Afbeeldingseigenschappen","uploadTab":"Uploaden","urlMissing":"De URL naar de afbeelding ontbreekt."},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"contextmenu":{"options":"Contextmenu opties"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"blockquote":{"toolbar":"Citaatblok"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/no.js b/core/assets/vendor/ckeditor/lang/no.js
index 3953eb4..015f2b3 100644
--- a/core/assets/vendor/ckeditor/lang/no.js
+++ b/core/assets/vendor/ckeditor/lang/no.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['no']={"widget":{"move":"Klikk og dra for å flytte"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Caption","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['no']={"widget":{"move":"Klikk og dra for å flytte"},"undo":{"redo":"Gjør om","undo":"Angre"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"sourcedialog":{"toolbar":"Kilde","title":"Kilde"},"sourcearea":{"toolbar":"Kilde"},"showblocks":{"toolbar":"Vis blokker"},"removeformat":{"toolbar":"Fjern formatering"},"pastetext":{"button":"Lim inn som ren tekst","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"magicline":{"title":"Sett inn nytt avsnitt her"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"language":{"button":"Sett språk","remove":"Fjern språk"},"justify":{"block":"Blokkjuster","center":"Midtstill","left":"Venstrejuster","right":"Høyrejuster"},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Caption","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler."},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Blokksitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/pl.js b/core/assets/vendor/ckeditor/lang/pl.js
index 419ae8f..69b3e21 100644
--- a/core/assets/vendor/ckeditor/lang/pl.js
+++ b/core/assets/vendor/ckeditor/lang/pl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pl']={"widget":{"move":"Kliknij i przeciągnij, by przenieść."},"undo":{"redo":"Ponów","undo":"Cofnij"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"sourcedialog":{"toolbar":"Źródło dokumentu","title":"Źródło dokumentu"},"sourcearea":{"toolbar":"Źródło dokumentu"},"showblocks":{"toolbar":"Pokaż bloki"},"removeformat":{"toolbar":"Usuń formatowanie"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"magicline":{"title":"Wstaw nowy akapit"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"image2":{"alt":"Tekst zastępczy","btnUpload":"Wyślij","captioned":"Obrazek z podpisem","captionPlaceholder":"Podpis","infoTab":"Informacje o obrazku","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","pathName":"obrazek","pathNameCaption":"podpis","resetSize":"Przywróć rozmiar","resizer":"Kliknij i przeciągnij, by zmienić rozmiar.","title":"Właściwości obrazka","uploadTab":"Wyślij","urlMissing":"Podaj adres URL obrazka."},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"contextmenu":{"options":"Opcje menu kontekstowego"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"blockquote":{"toolbar":"Cytat"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pl']={"widget":{"move":"Kliknij i przeciągnij, by przenieść."},"undo":{"redo":"Ponów","undo":"Cofnij"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"sourcedialog":{"toolbar":"Źródło dokumentu","title":"Źródło dokumentu"},"sourcearea":{"toolbar":"Źródło dokumentu"},"showblocks":{"toolbar":"Pokaż bloki"},"removeformat":{"toolbar":"Usuń formatowanie"},"pastetext":{"button":"Wklej jako czysty tekst","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"magicline":{"title":"Wstaw nowy akapit"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"language":{"button":"Ustaw język","remove":"Usuń język"},"justify":{"block":"Wyjustuj","center":"Wyśrodkuj","left":"Wyrównaj do lewej","right":"Wyrównaj do prawej"},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"image2":{"alt":"Tekst zastępczy","btnUpload":"Wyślij","captioned":"Obrazek z podpisem","captionPlaceholder":"Podpis","infoTab":"Informacje o obrazku","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","pathName":"obrazek","pathNameCaption":"podpis","resetSize":"Przywróć rozmiar","resizer":"Kliknij i przeciągnij, by zmienić rozmiar.","title":"Właściwości obrazka","uploadTab":"Wyślij","urlMissing":"Podaj adres URL obrazka."},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"contextmenu":{"options":"Opcje menu kontekstowego"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używając skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"button":{"selectedLabel":"%1 (Wybrany)"},"blockquote":{"toolbar":"Cytat"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/pt-br.js b/core/assets/vendor/ckeditor/lang/pt-br.js
index 032f84c..920b74a 100644
--- a/core/assets/vendor/ckeditor/lang/pt-br.js
+++ b/core/assets/vendor/ckeditor/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt-br']={"widget":{"move":"Click e arraste para mover"},"undo":{"redo":"Refazer","undo":"Desfazer"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"sourcedialog":{"toolbar":"Código-Fonte","title":"Código-Fonte"},"sourcearea":{"toolbar":"Código-Fonte"},"showblocks":{"toolbar":"Mostrar blocos de código"},"removeformat":{"toolbar":"Remover Formatação"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"magicline":{"title":"Insera um parágrafo aqui"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Legenda da Imagem","captionPlaceholder":"Legenda","infoTab":"Informações da Imagem","lockRatio":"Travar Proporções","menu":"Formatar Imagem","pathName":"Imagem","pathNameCaption":"Legenda","resetSize":"Redefinir para o Tamanho Original","resizer":"Click e arraste para redimensionar","title":"Formatar Imagem","uploadTab":"Enviar ao Servidor","urlMissing":"URL da imagem está faltando."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opções Menu de Contexto"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pt-br']={"widget":{"move":"Click e arraste para mover"},"undo":{"redo":"Refazer","undo":"Desfazer"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"sourcedialog":{"toolbar":"Código-Fonte","title":"Código-Fonte"},"sourcearea":{"toolbar":"Código-Fonte"},"showblocks":{"toolbar":"Mostrar blocos de código"},"removeformat":{"toolbar":"Remover Formatação"},"pastetext":{"button":"Colar como Texto sem Formatação","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"magicline":{"title":"Insera um parágrafo aqui"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Legenda da Imagem","captionPlaceholder":"Legenda","infoTab":"Informações da Imagem","lockRatio":"Travar Proporções","menu":"Formatar Imagem","pathName":"Imagem","pathNameCaption":"Legenda","resetSize":"Redefinir para o Tamanho Original","resizer":"Click e arraste para redimensionar","title":"Formatar Imagem","uploadTab":"Enviar ao Servidor","urlMissing":"URL da imagem está faltando."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Opções Menu de Contexto"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/pt.js b/core/assets/vendor/ckeditor/lang/pt.js
index 8048ae3..05c2082 100644
--- a/core/assets/vendor/ckeditor/lang/pt.js
+++ b/core/assets/vendor/ckeditor/lang/pt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['pt']={"widget":{"move":"Clique e arraste para mover"},"undo":{"redo":"Refazer","undo":"Anular"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de Barras de Ferramentas"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar Células","merge":"Unir Células","mergeRight":"Unir à Direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Filas na Célula","colSpan":"Colunas na Célula","wordWrap":"Moldar texto","hAlign":"Alinhamento Horizontal","vAlign":"Alinhamento Vertical","alignBaseline":"Base","bgColor":"Cor de Fundo","borderColor":"Cor da Margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula deve ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir Coluna Antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Sumário","title":"Propriedades da Tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pontos","widthUnit":"unidade da largura"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"sourcedialog":{"toolbar":"Fonte","title":"Fonte"},"sourcearea":{"toolbar":"Fonte"},"showblocks":{"toolbar":"Exibir blocos"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Colar como Texto Simples","title":"Colar como Texto Simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insira aqui o parágrafo"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"justify":{"block":"Justificado","center":"Alinhar ao Centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"indent":{"indent":"Aumentar Avanço","outdent":"Diminuir Avanço"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Imagem legendada","captionPlaceholder":"Legenda","infoTab":"Informação da Imagem","lockRatio":"Proporcional","menu":"Propriedades da Imagem","pathName":"imagem","pathNameCaption":"legenda","resetSize":"Tamanho Original","resizer":"Clique e arraste para redimensionar","title":"Propriedades da Imagem","uploadTab":"Enviar","urlMissing":"O URL da fonte da imagem está em falta."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Menu de opções de contexto"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prima <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Bloco de citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Inferior à Linha","underline":"Sublinhado"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do Utilizador"},"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão","textField":"Campo do Texto","textarea":"Área do Texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo da Seleção","imageButton":"Botão da Imagem","notSet":"<Não definido>","id":"Id.","name":"Nome","langDir":"Direção do Idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do Idioma","longDescr":"Descrição Completa do URL","cssClass":"Classes de Estilo das Folhas","advisoryTitle":"Título Consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela Superior (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Parente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
+CKEDITOR.lang['pt']={"widget":{"move":"Clique e arraste para mover"},"undo":{"redo":"Refazer","undo":"Anular"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de Barras de Ferramentas"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar Células","merge":"Unir Células","mergeRight":"Unir à Direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Filas na Célula","colSpan":"Colunas na Célula","wordWrap":"Moldar texto","hAlign":"Alinhamento Horizontal","vAlign":"Alinhamento Vertical","alignBaseline":"Base","bgColor":"Cor de Fundo","borderColor":"Cor da Margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula deve ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir Coluna Antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Sumário","title":"Propriedades da Tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pontos","widthUnit":"unidade da largura"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de Linha","panelTitle3":"Estilos de Objeto"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"sourcedialog":{"toolbar":"Fonte","title":"Fonte"},"sourcearea":{"toolbar":"Fonte"},"showblocks":{"toolbar":"Exibir blocos"},"removeformat":{"toolbar":"Eliminar Formato"},"pastetext":{"button":"Colar como Texto Simples","title":"Colar como Texto Simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpá-lo antes de colar?","error":"Não foi possivel limpar a informação colada decido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"magicline":{"title":"Insira aqui o parágrafo"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"justify":{"block":"Justificado","center":"Alinhar ao Centro","left":"Alinhar à esquerda","right":"Alinhar à direita"},"indent":{"indent":"Aumentar Avanço","outdent":"Diminuir Avanço"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Imagem legendada","captionPlaceholder":"Legenda","infoTab":"Informação da Imagem","lockRatio":"Proporcional","menu":"Propriedades da Imagem","pathName":"imagem","pathNameCaption":"legenda","resetSize":"Tamanho Original","resizer":"Clique e arraste para redimensionar","title":"Propriedades da Imagem","uploadTab":"Enviar","urlMissing":"O URL da fonte da imagem está em falta."},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"contextmenu":{"options":"Menu de opções de contexto"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prima <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"button":{"selectedLabel":"%1 (Selecionado)"},"blockquote":{"toolbar":"Bloco de citação"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Inferior à Linha","underline":"Sublinhado"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do Utilizador"},"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão","textField":"Campo do Texto","textarea":"Área do Texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo da Seleção","imageButton":"Botão da Imagem","notSet":"<Não definido>","id":"Id.","name":"Nome","langDir":"Direção do Idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do Idioma","longDescr":"Descrição Completa do URL","cssClass":"Classes de Estilo das Folhas","advisoryTitle":"Título Consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela Superior (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Parente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ro.js b/core/assets/vendor/ckeditor/lang/ro.js
index 3f0a705..0619bf7 100644
--- a/core/assets/vendor/ckeditor/lang/ro.js
+++ b/core/assets/vendor/ckeditor/lang/ro.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ro']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"sourcedialog":{"toolbar":"Sursa","title":"Sursa"},"sourcearea":{"toolbar":"Sursa"},"showblocks":{"toolbar":"Arată blocurile"},"removeformat":{"toolbar":"Înlătură formatarea"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"image2":{"alt":"Text alternativ","btnUpload":"Trimite la server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informaţii despre imagine","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","pathName":"image","pathNameCaption":"caption","resetSize":"Resetează mărimea","resizer":"Click and drag to resize","title":"Proprietăţile imaginii","uploadTab":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește."},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ro']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"stylescombo":{"label":"Stil","panelTitle":"Formatarea stilurilor","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"sourcedialog":{"toolbar":"Sursa","title":"Sursa"},"sourcearea":{"toolbar":"Sursa"},"showblocks":{"toolbar":"Arată blocurile"},"removeformat":{"toolbar":"Înlătură formatarea"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Aliniere în bloc (Block Justify)","center":"Aliniere centrală","left":"Aliniere la stânga","right":"Aliniere la dreapta"},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"image2":{"alt":"Text alternativ","btnUpload":"Trimite la server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informaţii despre imagine","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","pathName":"image","pathNameCaption":"caption","resetSize":"Resetează mărimea","resizer":"Click and drag to resize","title":"Proprietăţile imaginii","uploadTab":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește."},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"%1 element"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"button":{"selectedLabel":"%1 (Selectat)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ru.js b/core/assets/vendor/ckeditor/lang/ru.js
index aa5226b..21cd301 100644
--- a/core/assets/vendor/ckeditor/lang/ru.js
+++ b/core/assets/vendor/ckeditor/lang/ru.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ru']={"widget":{"move":"Нажмите и перетащите"},"undo":{"redo":"Повторить","undo":"Отменить"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по горизонтали","splitVertical":"Разделить ячейку по вертикали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"sourcedialog":{"toolbar":"Исходник","title":"Источник"},"sourcearea":{"toolbar":"Источник"},"showblocks":{"toolbar":"Отображать блоки"},"removeformat":{"toolbar":"Убрать форматирование"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"magicline":{"title":"Вставить здесь параграф"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"image2":{"alt":"Альтернативный текст","btnUpload":"Загрузить на сервер","captioned":"Отображать название","captionPlaceholder":"Название","infoTab":"Данные об изображении","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","pathName":"изображение","pathNameCaption":"название","resetSize":"Вернуть обычные размеры","resizer":"Нажмите и растяните","title":"Свойства изображения","uploadTab":"Загрузка файла","urlMissing":"Не указана ссылка на изображение."},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"contextmenu":{"options":"Параметры контекстного меню"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ru']={"widget":{"move":"Нажмите и перетащите"},"undo":{"redo":"Повторить","undo":"Отменить"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по горизонтали","splitVertical":"Разделить ячейку по вертикали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"sourcedialog":{"toolbar":"Исходник","title":"Источник"},"sourcearea":{"toolbar":"Источник"},"showblocks":{"toolbar":"Отображать блоки"},"removeformat":{"toolbar":"Убрать форматирование"},"pastetext":{"button":"Вставить только текст","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"magicline":{"title":"Вставить здесь параграф"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"language":{"button":"Установка языка","remove":"Удалить язык"},"justify":{"block":"По ширине","center":"По центру","left":"По левому краю","right":"По правому краю"},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"image2":{"alt":"Альтернативный текст","btnUpload":"Загрузить на сервер","captioned":"Отображать название","captionPlaceholder":"Название","infoTab":"Данные об изображении","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","pathName":"изображение","pathNameCaption":"название","resetSize":"Вернуть обычные размеры","resizer":"Нажмите и растяните","title":"Свойства изображения","uploadTab":"Загрузка файла","urlMissing":"Не указана ссылка на изображение."},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"contextmenu":{"options":"Параметры контекстного меню"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"button":{"selectedLabel":"%1 (Выбрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/si.js b/core/assets/vendor/ckeditor/lang/si.js
index 4003aca..8794053 100644
--- a/core/assets/vendor/ckeditor/lang/si.js
+++ b/core/assets/vendor/ckeditor/lang/si.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['si']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"sourcedialog":{"toolbar":"මුලාශ්‍රය","title":"මුලාශ්‍රය"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"image2":{"alt":"විකල්ප ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"රුපයේ තොරතුරු","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","pathName":"image","pathNameCaption":"caption","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","resizer":"Click and drag to resize","title":"රුපයේ ","uploadTab":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත."},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>"}};
\ No newline at end of file
+CKEDITOR.lang['si']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"sourcedialog":{"toolbar":"මුලාශ්‍රය","title":"මුලාශ්‍රය"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Justify","center":"මධ්‍ය","left":"Align Left","right":"Align Right"},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"image2":{"alt":"විකල්ප ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"රුපයේ තොරතුරු","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","pathName":"image","pathNameCaption":"caption","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","resizer":"Click and drag to resize","title":"රුපයේ ","uploadTab":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත."},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"අලවන්න"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පිළිබඳ "},"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sk.js b/core/assets/vendor/ckeditor/lang/sk.js
index d1b7932..9815bc2 100644
--- a/core/assets/vendor/ckeditor/lang/sk.js
+++ b/core/assets/vendor/ckeditor/lang/sk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sk']={"widget":{"move":"Kliknite a potiahnite pre presunutie"},"undo":{"redo":"Znovu","undo":"Späť"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"table":{"border":"Šírka rámu (border)","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalomovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba rámu","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Širka rámu musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázať bloky"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Vkladaný text vyzerá byť skopírovaný z Wordu. Chcete ho automaticky vyčistiť pred vkladaním?","error":"Nebolo možné vyčistiť vložené dáta kvôli internej chybe","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"magicline":{"title":"Sem vložte paragraf"},"list":{"bulletedlist":"Vložiť/Odstrániť zoznam s odrážkami","numberedlist":"Vložiť/Odstrániť číslovaný zoznam"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"image2":{"alt":"Alternatívny text","btnUpload":"Odoslať to na server","captioned":"Opísaný obrázok","captionPlaceholder":"Popis","infoTab":"Informácie o obrázku","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","pathName":"obrázok","pathNameCaption":"popis","resetSize":"Pôvodná veľkosť","resizer":"Kliknite a potiahnite pre zmenu veľkosti","title":"Vlastnosti obrázka","uploadTab":"Nahrať","urlMissing":"Chýba URL zdroja obrázka."},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"contextmenu":{"options":"Možnosti kontextového menu"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia Vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Prosím, použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia Vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Prosím, použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto pre vloženie","pasteMsg":"Prosím, vložte nasledovný rámček použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stlačte OK.","securityMsg":"Kvôli vašim bezpečnostným nastaveniam prehliadača editor nie je schopný pristupovať k vašej schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"blockquote":{"toolbar":"Citácia"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačte ALT 0 pre nápovedu","browseServer":"Prechádzať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie políčko","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nieje číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sk']={"widget":{"move":"Kliknite a potiahnite pre presunutie"},"undo":{"redo":"Znovu","undo":"Späť"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Vnútroriadkové (inline) štýly","panelTitle3":"Štýly objeku"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"sourcedialog":{"toolbar":"Zdroj","title":"Zdroj"},"sourcearea":{"toolbar":"Zdroj"},"showblocks":{"toolbar":"Ukázať bloky"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"pastetext":{"button":"Vložiť ako čistý text","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"magicline":{"title":"Odsek vložiť sem"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"justify":{"block":"Zarovnať do bloku","center":"Zarovnať na stred","left":"Zarovnať vľavo","right":"Zarovnať vpravo"},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"image2":{"alt":"Alternatívny text","btnUpload":"Odoslať to na server","captioned":"Opísaný obrázok","captionPlaceholder":"Popis","infoTab":"Informácie o obrázku","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","pathName":"obrázok","pathNameCaption":"popis","resetSize":"Pôvodná veľkosť","resizer":"Kliknite a potiahnite pre zmenu veľkosti","title":"Vlastnosti obrázka","uploadTab":"Nahrať","urlMissing":"Chýba URL zdroja obrázka."},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"contextmenu":{"options":"Možnosti kontextového menu"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"button":{"selectedLabel":"%1 (Vybrané)"},"blockquote":{"toolbar":"Citácia"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sl.js b/core/assets/vendor/ckeditor/lang/sl.js
index e2c099a..82c40e7 100644
--- a/core/assets/vendor/ckeditor/lang/sl.js
+++ b/core/assets/vendor/ckeditor/lang/sl.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sl']={"widget":{"move":"Kliknite in povlecite, da premaknete"},"undo":{"redo":"Ponovi","undo":"Razveljavi"},"toolbar":{"toolbarCollapse":"Skrči Orodno Vrstico","toolbarExpand":"Razširi Orodno Vrstico","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Urejevalnik orodne vrstice"},"table":{"border":"Velikost obrobe","caption":"Naslov","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Druži navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Polnilo med celicami","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Zamik celic mora biti število","invalidCellSpacing":"Razmik med celicami mora biti število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"procentov","widthPx":"pik","widthUnit":"enota širine"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"specialchar":{"options":"Možnosti Posebnega Znaka","title":"Izberi Posebni Znak","toolbar":"Vstavi posebni znak"},"sourcedialog":{"toolbar":"Izvorna koda","title":"Izvorna koda"},"sourcearea":{"toolbar":"Izvorna koda"},"showblocks":{"toolbar":"Prikaži ograde"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti je kopirano iz Word-a. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"magicline":{"title":"Vstavite odstavek tukaj"},"list":{"bulletedlist":"Označen seznam","numberedlist":"Oštevilčen seznam"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"image2":{"alt":"Nadomestno besedilo","btnUpload":"Pošlji na strežnik","captioned":"Podnaslovljena slika","captionPlaceholder":"Napis","infoTab":"Podatki o sliki","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","pathName":"slika","pathNameCaption":"napis","resetSize":"Ponastavi velikost","resizer":"Kliknite in povlecite, da spremeniti velikost","title":"Lastnosti slike","uploadTab":"Naloži","urlMissing":"Manjka vir (URL) slike."},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"format":{"label":"Oblika","panelTitle":"Oblika","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"%1 element"},"contextmenu":{"options":"Možnosti Kontekstnega Menija"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi Prostor","pasteMsg":"Prosim prilepite v sleči okvir s pomočjo tipkovnice (<STRONG>Ctrl/Cmd+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Preverite $1 za pomoč.","moreInfo":"Za informacijo o licenci prosim obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"CKEditor Navodila za Uporabo"},"editor":"Bogat Urejevalnik Besedila","editorPanel":"Rich Text Editor plošča","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Vnosno polje","textarea":"Vnosno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno Polje","imageButton":"Slikovni Gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda Jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razred stilne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Ta vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe te vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Nekaj možnosti je bilo spremenjenih. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo Okno (_blank)","targetTop":"Vrhovno Okno (_top)","targetSelf":"Enako Okno (_self)","targetParent":"Matično Okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razred stilne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne CSS enote za merjenje (px, %, in, cm, mm, em, ex, pt, ali pc).","invalidHtmlLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne HTML enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost določena za inline slog mora biti sestavljena iz ene ali več tork (tuples) z obliko \"ime : vrednost\", ločenih z podpičji.","cssLengthTooltip":"Vnesite številko za vrednost v slikovnih pikah (pixels) ali številko z veljavno CSS enoto (px, %, in, cm, mm, em, ex, pt, ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sl']={"widget":{"move":"Kliknite in povlecite, da premaknete"},"undo":{"redo":"Ponovi","undo":"Razveljavi"},"toolbar":{"toolbarCollapse":"Skrči Orodno Vrstico","toolbarExpand":"Razširi Orodno Vrstico","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Urejevalnik orodne vrstice"},"table":{"border":"Velikost obrobe","caption":"Naslov","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Druži navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Polnilo med celicami","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Zamik celic mora biti število","invalidCellSpacing":"Razmik med celicami mora biti število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"procentov","widthPx":"pik","widthUnit":"enota širine"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"specialchar":{"options":"Možnosti Posebnega Znaka","title":"Izberi Posebni Znak","toolbar":"Vstavi posebni znak"},"sourcedialog":{"toolbar":"Izvorna koda","title":"Izvorna koda"},"sourcearea":{"toolbar":"Izvorna koda"},"showblocks":{"toolbar":"Prikaži ograde"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"pastetext":{"button":"Prilepi kot golo besedilo","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti je kopirano iz Word-a. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"magicline":{"title":"Vstavite odstavek tukaj"},"list":{"bulletedlist":"Označen seznam","numberedlist":"Oštevilčen seznam"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"justify":{"block":"Obojestranska poravnava","center":"Sredinska poravnava","left":"Leva poravnava","right":"Desna poravnava"},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"image2":{"alt":"Nadomestno besedilo","btnUpload":"Pošlji na strežnik","captioned":"Podnaslovljena slika","captionPlaceholder":"Napis","infoTab":"Podatki o sliki","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","pathName":"slika","pathNameCaption":"napis","resetSize":"Ponastavi velikost","resizer":"Kliknite in povlecite, da spremeniti velikost","title":"Lastnosti slike","uploadTab":"Naloži","urlMissing":"Manjka vir (URL) slike."},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"format":{"label":"Oblika","panelTitle":"Oblika","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"%1 element"},"contextmenu":{"options":"Možnosti Kontekstnega Menija"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi Prostor","pasteMsg":"Prosim prilepite v sleči okvir s pomočjo tipkovnice (<STRONG>Ctrl/Cmd+V</STRONG>) in pritisnite <STRONG>V redu</STRONG>.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"button":{"selectedLabel":"%1 (Izbrano)"},"blockquote":{"toolbar":"Citat"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Preverite $1 za pomoč.","moreInfo":"Za informacijo o licenci prosim obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"CKEditor Navodila za Uporabo"},"editor":"Bogat Urejevalnik Besedila","editorPanel":"Rich Text Editor plošča","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Vnosno polje","textarea":"Vnosno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno Polje","imageButton":"Slikovni Gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda Jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razred stilne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Ta vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe te vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Nekaj možnosti je bilo spremenjenih. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo Okno (_blank)","targetTop":"Vrhovno Okno (_top)","targetSelf":"Enako Okno (_self)","targetParent":"Matično Okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razred stilne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne CSS enote za merjenje (px, %, in, cm, mm, em, ex, pt, ali pc).","invalidHtmlLength":"Vrednost določena za \"%1\" polje mora biti pozitivna številka z ali brez veljavne HTML enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost določena za inline slog mora biti sestavljena iz ene ali več tork (tuples) z obliko \"ime : vrednost\", ločenih z podpičji.","cssLengthTooltip":"Vnesite številko za vrednost v slikovnih pikah (pixels) ali številko z veljavno CSS enoto (px, %, in, cm, mm, em, ex, pt, ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sq.js b/core/assets/vendor/ckeditor/lang/sq.js
index 89e1c97..6a9af32 100644
--- a/core/assets/vendor/ckeditor/lang/sq.js
+++ b/core/assets/vendor/ckeditor/lang/sq.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sq']={"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"sourcedialog":{"toolbar":"Burimi","title":"Burimi"},"sourcearea":{"toolbar":"Burimi"},"showblocks":{"toolbar":"Shfaq Blloqet"},"removeformat":{"toolbar":"Largo Formatin"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"magicline":{"title":"Vendos paragraf këtu"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"image2":{"alt":"Tekst Alternativ","btnUpload":"Dërgo në server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informacione mbi Fotografinë","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","pathName":"foto","pathNameCaption":"caption","resetSize":"Rikthe Madhësinë","resizer":"Click and drag to resize","title":"Karakteristikat e Fotografisë","uploadTab":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë."},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"blockquote":{"toolbar":"Citatet"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sq']={"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"stylescombo":{"label":"Stil","panelTitle":"Stilet e Formatimit","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stili i Brendshëm","panelTitle3":"Stilet e Objektit"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"sourcedialog":{"toolbar":"Burimi","title":"Burimi"},"sourcearea":{"toolbar":"Burimi"},"showblocks":{"toolbar":"Shfaq Blloqet"},"removeformat":{"toolbar":"Largo Formatin"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"magicline":{"title":"Vendos paragraf këtu"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"justify":{"block":"Zgjero","center":"Qendër","left":"Rreshto majtas","right":"Rreshto Djathtas"},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"image2":{"alt":"Tekst Alternativ","btnUpload":"Dërgo në server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informacione mbi Fotografinë","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","pathName":"foto","pathNameCaption":"caption","resetSize":"Rikthe Madhësinë","resizer":"Click and drag to resize","title":"Karakteristikat e Fotografisë","uploadTab":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë."},"horizontalrule":{"toolbar":"Vendos Vijë Horizontale"},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"blockquote":{"toolbar":"Citatet"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sr-latn.js b/core/assets/vendor/ckeditor/lang/sr-latn.js
index f94958c..97321e6 100644
--- a/core/assets/vendor/ckeditor/lang/sr-latn.js
+++ b/core/assets/vendor/ckeditor/lang/sr-latn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr-latn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Osobine slika","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj veličinu","resizer":"Click and drag to resize","title":"Osobine slika","uploadTab":"Pošalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sr-latn']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"sourcedialog":{"toolbar":"Kôd","title":"Kôd"},"sourcearea":{"toolbar":"Kôd"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Ukloni formatiranje"},"pastetext":{"button":"Zalepi kao čist tekst","title":"Zalepi kao čist tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Obostrano ravnanje","center":"Centriran tekst","left":"Levo ravnanje","right":"Desno ravnanje"},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Osobine slika","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj veličinu","resizer":"Click and drag to resize","title":"Osobine slika","uploadTab":"Pošalji","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sr.js b/core/assets/vendor/ckeditor/lang/sr.js
index 55d85f6..dc0d7b9 100644
--- a/core/assets/vendor/ckeditor/lang/sr.js
+++ b/core/assets/vendor/ckeditor/lang/sr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sr']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"sourcedialog":{"toolbar":"Kôд","title":"Kôд"},"sourcearea":{"toolbar":"Kôд"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Уклони форматирање"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"image2":{"alt":"Алтернативни текст","btnUpload":"Пошаљи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Инфо слике","lockRatio":"Закључај однос","menu":"Особине слика","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетуј величину","resizer":"Click and drag to resize","title":"Особине слика","uploadTab":"Пошаљи","urlMissing":"Недостаје УРЛ слике."},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sr']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"stylescombo":{"label":"Стил","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"sourcedialog":{"toolbar":"Kôд","title":"Kôд"},"sourcearea":{"toolbar":"Kôд"},"showblocks":{"toolbar":"Show Blocks"},"removeformat":{"toolbar":"Уклони форматирање"},"pastetext":{"button":"Залепи као чист текст","title":"Залепи као чист текст"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"Обострано равнање","center":"Центриран текст","left":"Лево равнање","right":"Десно равнање"},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"image2":{"alt":"Алтернативни текст","btnUpload":"Пошаљи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Инфо слике","lockRatio":"Закључај однос","menu":"Особине слика","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетуј величину","resizer":"Click and drag to resize","title":"Особине слика","uploadTab":"Пошаљи","urlMissing":"Недостаје УРЛ слике."},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"format":{"label":"Формат","panelTitle":"Формат","tag_address":"Adresa","tag_div":"Нормално (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatirano"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносних подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/sv.js b/core/assets/vendor/ckeditor/lang/sv.js
index a757768..4ca5c1a 100644
--- a/core/assets/vendor/ckeditor/lang/sv.js
+++ b/core/assets/vendor/ckeditor/lang/sv.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['sv']={"widget":{"move":"Klicka och drag för att flytta"},"undo":{"redo":"Gör om","undo":"Ångra"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Redigera verktygsfält"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"stylescombo":{"label":"Anpassad stil","panelTitle":"Formatmallar","panelTitle1":"Blockstil","panelTitle2":"Inbäddad stil","panelTitle3":"Objektets stil"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"sourcedialog":{"toolbar":"Källa","title":"Källa"},"sourcearea":{"toolbar":"Källa"},"showblocks":{"toolbar":"Visa block"},"removeformat":{"toolbar":"Radera formatering"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"magicline":{"title":"Infoga paragraf här"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"image2":{"alt":"Alternativ text","btnUpload":"Skicka till server","captioned":"Rubricerad bild","captionPlaceholder":"Bildtext","infoTab":"Bildinformation","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","pathName":"bild","pathNameCaption":"rubrik","resetSize":"Återställ storlek","resizer":"Klicka och drag för att ändra storlek","title":"Bildegenskaper","uploadTab":"Ladda upp","urlMissing":"Bildkällans URL saknas."},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"blockquote":{"toolbar":"Blockcitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information av licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>"}};
\ No newline at end of file
+CKEDITOR.lang['sv']={"widget":{"move":"Klicka och drag för att flytta"},"undo":{"redo":"Gör om","undo":"Ångra"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Redigera verktygsfält"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"stylescombo":{"label":"Anpassad stil","panelTitle":"Formatmallar","panelTitle1":"Blockstil","panelTitle2":"Inbäddad stil","panelTitle3":"Objektets stil"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"sourcedialog":{"toolbar":"Källa","title":"Källa"},"sourcearea":{"toolbar":"Källa"},"showblocks":{"toolbar":"Visa block"},"removeformat":{"toolbar":"Radera formatering"},"pastetext":{"button":"Klistra in som vanlig text","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"magicline":{"title":"Infoga paragraf här"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"justify":{"block":"Justera till marginaler","center":"Centrera","left":"Vänsterjustera","right":"Högerjustera"},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"image2":{"alt":"Alternativ text","btnUpload":"Skicka till server","captioned":"Rubricerad bild","captionPlaceholder":"Bildtext","infoTab":"Bildinformation","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","pathName":"bild","pathNameCaption":"rubrik","resetSize":"Återställ storlek","resizer":"Klicka och drag för att ändra storlek","title":"Bildegenskaper","uploadTab":"Ladda upp","urlMissing":"Bildkällans URL saknas."},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"button":{"selectedLabel":"%1 (Vald)"},"blockquote":{"toolbar":"Blockcitat"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information av licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/th.js b/core/assets/vendor/ckeditor/lang/th.js
index ba6aafa..01c086e 100644
--- a/core/assets/vendor/ckeditor/lang/th.js
+++ b/core/assets/vendor/ckeditor/lang/th.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['th']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"sourcedialog":{"toolbar":"ดูรหัส HTML","title":"ดูรหัส HTML"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"image2":{"alt":"คำประกอบรูปภาพ","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ข้อมูลของรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","pathName":"image","pathNameCaption":"caption","resetSize":"กำหนดรูปเท่าขนาดจริง","resizer":"Click and drag to resize","title":"คุณสมบัติของ รูปภาพ","uploadTab":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['th']={"widget":{"move":"Click and drag to move"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"sourcedialog":{"toolbar":"ดูรหัส HTML","title":"ดูรหัส HTML"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"magicline":{"title":"Insert paragraph here"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"language":{"button":"Set language","remove":"Remove language"},"justify":{"block":"จัดพอดีหน้ากระดาษ","center":"จัดกึ่งกลาง","left":"จัดชิดซ้าย","right":"จัดชิดขวา"},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"image2":{"alt":"คำประกอบรูปภาพ","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ข้อมูลของรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","pathName":"image","pathNameCaption":"caption","resetSize":"กำหนดรูปเท่าขนาดจริง","resizer":"Click and drag to resize","title":"คุณสมบัติของ รูปภาพ","uploadTab":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"contextmenu":{"options":"Context Menu Options"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"button":{"selectedLabel":"%1 (Selected)"},"blockquote":{"toolbar":"Block Quote"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/tr.js b/core/assets/vendor/ckeditor/lang/tr.js
index ee03aba..9e3a0f8 100644
--- a/core/assets/vendor/ckeditor/lang/tr.js
+++ b/core/assets/vendor/ckeditor/lang/tr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tr']={"widget":{"move":"Taşımak için, tıklayın ve sürükleyin"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"sourcedialog":{"toolbar":"Kaynak","title":"Kaynak"},"sourcearea":{"toolbar":"Kaynak"},"showblocks":{"toolbar":"Blokları Göster"},"removeformat":{"toolbar":"Biçimi Kaldır"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"magicline":{"title":"Parağrafı buraya ekle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"image2":{"alt":"Alternatif Yazı","btnUpload":"Sunucuya Yolla","captioned":"Başlıklı resim","captionPlaceholder":"Başlık","infoTab":"Resim Bilgisi","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","pathName":"Resim","pathNameCaption":"başlık","resetSize":"Boyutu Başa Döndür","resizer":"Boyutlandırmak için, tıklayın ve sürükleyin","title":"Resim Özellikleri","uploadTab":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı bulunamadı."},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"blockquote":{"toolbar":"Blok Oluştur"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>"}};
\ No newline at end of file
+CKEDITOR.lang['tr']={"widget":{"move":"Taşımak için, tıklayın ve sürükleyin"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"sourcedialog":{"toolbar":"Kaynak","title":"Kaynak"},"sourcearea":{"toolbar":"Kaynak"},"showblocks":{"toolbar":"Blokları Göster"},"removeformat":{"toolbar":"Biçimi Kaldır"},"pastetext":{"button":"Düz Metin Olarak Yapıştır","title":"Düz Metin Olarak Yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"magicline":{"title":"Parağrafı buraya ekle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"justify":{"block":"İki Kenara Yaslanmış","center":"Ortalanmış","left":"Sola Dayalı","right":"Sağa Dayalı"},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"image2":{"alt":"Alternatif Yazı","btnUpload":"Sunucuya Yolla","captioned":"Başlıklı resim","captionPlaceholder":"Başlık","infoTab":"Resim Bilgisi","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","pathName":"Resim","pathNameCaption":"başlık","resetSize":"Boyutu Başa Döndür","resizer":"Boyutlandırmak için, tıklayın ve sürükleyin","title":"Resim Özellikleri","uploadTab":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı bulunamadı."},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"blockquote":{"toolbar":"Blok Oluştur"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/tt.js b/core/assets/vendor/ckeditor/lang/tt.js
index d1b27c1..4426834 100644
--- a/core/assets/vendor/ckeditor/lang/tt.js
+++ b/core/assets/vendor/ckeditor/lang/tt.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['tt']={"widget":{"move":"Күчереп куер өчен басып шудырыгыз"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"sourcedialog":{"toolbar":"Чыганак","title":"Чыганак"},"sourcearea":{"toolbar":"Чыганак"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"removeformat":{"toolbar":"Форматлауны бетерү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"magicline":{"title":"Бирегә параграф өстәү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"image2":{"alt":"Альтернатив текст","btnUpload":"Серверга җибәрү","captioned":"Исеме куелган рәсем","captionPlaceholder":"Исем","infoTab":"Рәсем тасвирламасы","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","pathName":"рәсем","pathNameCaption":"исем","resetSize":"Баштагы зурлык","resizer":"Күчереп куер өчен басып шудырыгыз","title":"Рәсем үзлекләре","uploadTab":"Йөкләү","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"contextmenu":{"options":"Контекст меню үзлекләре"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"blockquote":{"toolbar":"Өземтә блогы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
+CKEDITOR.lang['tt']={"widget":{"move":"Күчереп куер өчен басып шудырыгыз"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"sourcedialog":{"toolbar":"Чыганак","title":"Чыганак"},"sourcearea":{"toolbar":"Чыганак"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"removeformat":{"toolbar":"Форматлауны бетерү"},"pastetext":{"button":"Форматлаусыз текст өстәү","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"magicline":{"title":"Бирегә параграф өстәү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"justify":{"block":"Киңлеккә карап тигезләү","center":"Үзәккә тигезләү","left":"Сул як кырыйдан тигезләү","right":"Уң як кырыйдан тигезләү"},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"image2":{"alt":"Альтернатив текст","btnUpload":"Серверга җибәрү","captioned":"Исеме куелган рәсем","captionPlaceholder":"Исем","infoTab":"Рәсем тасвирламасы","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","pathName":"рәсем","pathNameCaption":"исем","resetSize":"Баштагы зурлык","resizer":"Күчереп куер өчен басып шудырыгыз","title":"Рәсем үзлекләре","uploadTab":"Йөкләү","urlMissing":"Image source URL is missing."},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"contextmenu":{"options":"Контекст меню үзлекләре"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"button":{"selectedLabel":"%1 (Сайланган)"},"blockquote":{"toolbar":"Өземтә блогы"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/ug.js b/core/assets/vendor/ckeditor/lang/ug.js
index 199351f..3e726d3 100644
--- a/core/assets/vendor/ckeditor/lang/ug.js
+++ b/core/assets/vendor/ckeditor/lang/ug.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['ug']={"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"sourcedialog":{"toolbar":"مەنبە","title":"مەنبە"},"sourcearea":{"toolbar":"مەنبە"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"image2":{"alt":"تېكىست ئالماشتۇر","btnUpload":"مۇلازىمېتىرغا يۈكلە","captioned":"ماۋزۇلۇق سۈرەت","captionPlaceholder":"Caption","infoTab":"سۈرەت","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","pathName":"image","pathNameCaption":"caption","resetSize":"ئەسلى چوڭلۇق","resizer":"Click and drag to resize","title":"سۈرەت خاسلىقى","uploadTab":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"clipboard":{"copy":"نەشر ھوقۇقىغا ئىگە بەلگىسى","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>"}};
\ No newline at end of file
+CKEDITOR.lang['ug']={"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"sourcedialog":{"toolbar":"مەنبە","title":"مەنبە"},"sourcearea":{"toolbar":"مەنبە"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"justify":{"block":"ئىككى تەرەپتىن توغرىلا","center":"ئوتتۇرىغا توغرىلا","left":"سولغا توغرىلا","right":"ئوڭغا توغرىلا"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"image2":{"alt":"تېكىست ئالماشتۇر","btnUpload":"مۇلازىمېتىرغا يۈكلە","captioned":"ماۋزۇلۇق سۈرەت","captionPlaceholder":"Caption","infoTab":"سۈرەت","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","pathName":"image","pathNameCaption":"caption","resetSize":"ئەسلى چوڭلۇق","resizer":"Click and drag to resize","title":"سۈرەت خاسلىقى","uploadTab":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ مەزمۇننى تۆۋەندىكى رامكىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەزملە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى مەزمۇننى بىۋاستە زىيارەت قىلالمايدۇ، بۇ كۆزنەكتە قايتا بىر قېتىم چاپلىشىڭىز كېرەك.","title":"چاپلا"},"button":{"selectedLabel":"%1 (تاللاندى)"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردەمگە ئېرىشىڭ","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللانمىسى"},"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/uk.js b/core/assets/vendor/ckeditor/lang/uk.js
index 2ba0c84..4e5811c 100644
--- a/core/assets/vendor/ckeditor/lang/uk.js
+++ b/core/assets/vendor/ckeditor/lang/uk.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['uk']={"widget":{"move":"Клікніть і потягніть для переміщення"},"undo":{"redo":"Повторити","undo":"Повернути"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"sourcedialog":{"toolbar":"Джерело","title":"Джерело"},"sourcearea":{"toolbar":"Джерело"},"showblocks":{"toolbar":"Показувати блоки"},"removeformat":{"toolbar":"Видалити форматування"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"magicline":{"title":"Вставити абзац"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"image2":{"alt":"Альтернативний текст","btnUpload":"Надіслати на сервер","captioned":"Підписане зображення","captionPlaceholder":"Заголовок","infoTab":"Інформація про зображення","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","pathName":"Зображення","pathNameCaption":"заголовок","resetSize":"Очистити поля розмірів","resizer":"Клікніть та потягніть для зміни розмірів","title":"Властивості зображення","uploadTab":"Надіслати","urlMissing":"Вкажіть URL зображення."},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опції контекстного меню"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>"}};
\ No newline at end of file
+CKEDITOR.lang['uk']={"widget":{"move":"Клікніть і потягніть для переміщення"},"undo":{"redo":"Повторити","undo":"Повернути"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"sourcedialog":{"toolbar":"Джерело","title":"Джерело"},"sourcearea":{"toolbar":"Джерело"},"showblocks":{"toolbar":"Показувати блоки"},"removeformat":{"toolbar":"Видалити форматування"},"pastetext":{"button":"Вставити тільки текст","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"magicline":{"title":"Вставити абзац"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"justify":{"block":"По ширині","center":"По центру","left":"По лівому краю","right":"По правому краю"},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"image2":{"alt":"Альтернативний текст","btnUpload":"Надіслати на сервер","captioned":"Підписане зображення","captionPlaceholder":"Заголовок","infoTab":"Інформація про зображення","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","pathName":"Зображення","pathNameCaption":"заголовок","resetSize":"Очистити поля розмірів","resizer":"Клікніть та потягніть для зміни розмірів","title":"Властивості зображення","uploadTab":"Надіслати","urlMissing":"Вкажіть URL зображення."},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"contextmenu":{"options":"Опції контекстного меню"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"button":{"selectedLabel":"%1 (Вибрано)"},"blockquote":{"toolbar":"Цитата"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/vi.js b/core/assets/vendor/ckeditor/lang/vi.js
index f781b77..12a836c 100644
--- a/core/assets/vendor/ckeditor/lang/vi.js
+++ b/core/assets/vendor/ckeditor/lang/vi.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['vi']={"widget":{"move":"Nhấp chuột và kéo để di chuyển"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"sourcedialog":{"toolbar":"Mã HTML","title":"Mã HTML"},"sourcearea":{"toolbar":"Mã HTML"},"showblocks":{"toolbar":"Hiển thị các khối"},"removeformat":{"toolbar":"Xoá định dạng"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"magicline":{"title":"Chèn đoạn vào đây"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"image2":{"alt":"Chú thích ảnh","btnUpload":"Tải lên máy chủ","captioned":"Ảnh có chú thích","captionPlaceholder":"Nhãn","infoTab":"Thông tin của ảnh","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","pathName":"ảnh","pathNameCaption":"chú thích","resetSize":"Kích thước gốc","resizer":"Kéo rê để thay đổi kích cỡ","title":"Thuộc tính của ảnh","uploadTab":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"blockquote":{"toolbar":"Khối trích dẫn"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>"}};
\ No newline at end of file
+CKEDITOR.lang['vi']={"widget":{"move":"Nhấp chuột và kéo để di chuyển"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"sourcedialog":{"toolbar":"Mã HTML","title":"Mã HTML"},"sourcearea":{"toolbar":"Mã HTML"},"showblocks":{"toolbar":"Hiển thị các khối"},"removeformat":{"toolbar":"Xoá định dạng"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"magicline":{"title":"Chèn đoạn vào đây"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"justify":{"block":"Canh đều","center":"Canh giữa","left":"Canh trái","right":"Canh phải"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"image2":{"alt":"Chú thích ảnh","btnUpload":"Tải lên máy chủ","captioned":"Ảnh có chú thích","captionPlaceholder":"Nhãn","infoTab":"Thông tin của ảnh","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","pathName":"ảnh","pathNameCaption":"chú thích","resetSize":"Kích thước gốc","resizer":"Kéo rê để thay đổi kích cỡ","title":"Thuộc tính của ảnh","uploadTab":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"button":{"selectedLabel":"%1 (Đã chọn)"},"blockquote":{"toolbar":"Khối trích dẫn"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/zh-cn.js b/core/assets/vendor/ckeditor/lang/zh-cn.js
index 5d8f47c..efb1eee 100644
--- a/core/assets/vendor/ckeditor/lang/zh-cn.js
+++ b/core/assets/vendor/ckeditor/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh-cn']={"widget":{"move":"点击并拖拽以移动"},"undo":{"redo":"重做","undo":"撤消"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"sourcedialog":{"toolbar":"源码","title":"源码"},"sourcearea":{"toolbar":"源码"},"showblocks":{"toolbar":"显示区块"},"removeformat":{"toolbar":"清除格式"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"maximize":{"maximize":"全屏","minimize":"最小化"},"magicline":{"title":"在这插入段落"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"image2":{"alt":"替换文本","btnUpload":"上传到服务器","captioned":"带标题图像","captionPlaceholder":"标题","infoTab":"图像信息","lockRatio":"锁定比例","menu":"图像属性","pathName":"图像","pathNameCaption":"标题","resetSize":"原始尺寸","resizer":"点击并拖拽以改变尺寸","title":"图像属性","uploadTab":"上传","urlMissing":"缺少图像源文件地址"},"horizontalrule":{"toolbar":"插入水平线"},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"contextmenu":{"options":"快捷菜单选项"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"blockquote":{"toolbar":"块引用"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>"}};
\ No newline at end of file
+CKEDITOR.lang['zh-cn']={"widget":{"move":"点击并拖拽以移动"},"undo":{"redo":"重做","undo":"撤消"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"sourcedialog":{"toolbar":"源码","title":"源码"},"sourcearea":{"toolbar":"源码"},"showblocks":{"toolbar":"显示区块"},"removeformat":{"toolbar":"清除格式"},"pastetext":{"button":"粘贴为无格式文本","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"maximize":{"maximize":"全屏","minimize":"最小化"},"magicline":{"title":"在这插入段落"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"language":{"button":"设置语言","remove":"移除语言"},"justify":{"block":"两端对齐","center":"居中","left":"左对齐","right":"右对齐"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"image2":{"alt":"替换文本","btnUpload":"上传到服务器","captioned":"带标题图像","captionPlaceholder":"标题","infoTab":"图像信息","lockRatio":"锁定比例","menu":"图像属性","pathName":"图像","pathNameCaption":"标题","resetSize":"原始尺寸","resizer":"点击并拖拽以改变尺寸","title":"图像属性","uploadTab":"上传","urlMissing":"缺少图像源文件地址"},"horizontalrule":{"toolbar":"插入水平线"},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"contextmenu":{"options":"快捷菜单选项"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安全设置原因，本编辑器不能直接访问您的剪贴板内容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"button":{"selectedLabel":"已选中 %1 项"},"blockquote":{"toolbar":"块引用"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相关授权许可信息请访问我们的网站：","title":"关于 CKEditor","userGuide":"CKEditor 用户向导"},"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/lang/zh.js b/core/assets/vendor/ckeditor/lang/zh.js
index dc93b94..598790a 100644
--- a/core/assets/vendor/ckeditor/lang/zh.js
+++ b/core/assets/vendor/ckeditor/lang/zh.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.lang['zh']={"widget":{"move":"拖曳以移動"},"undo":{"redo":"取消復原","undo":"復原"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"sourcedialog":{"toolbar":"原始碼","title":"原始碼"},"sourcearea":{"toolbar":"原始碼"},"showblocks":{"toolbar":"顯示區塊"},"removeformat":{"toolbar":"移除格式"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"在此插入段落"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"image2":{"alt":"替代文字","btnUpload":"傳送至伺服器","captioned":"已加標題之圖片","captionPlaceholder":"標題","infoTab":"影像資訊","lockRatio":"固定比例","menu":"影像屬性","pathName":"圖片","pathNameCaption":"標題","resetSize":"重設大小","resizer":"拖曳以改變大小","title":"影像屬性","uploadTab":"上傳","urlMissing":"遺失圖片來源之 URL "},"horizontalrule":{"toolbar":"插入水平線"},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"contextmenu":{"options":"內容功能表選項"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"blockquote":{"toolbar":"引用段落"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>"}};
\ No newline at end of file
+CKEDITOR.lang['zh']={"widget":{"move":"拖曳以移動"},"undo":{"redo":"取消復原","undo":"復原"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列全長","colSpan":"行全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"列全長必須是整數。","invalidColSpan":"行全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插入行","insertAfter":"右方插入行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插入列","insertAfter":"下方插入列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"sourcedialog":{"toolbar":"原始碼","title":"原始碼"},"sourcearea":{"toolbar":"原始碼"},"showblocks":{"toolbar":"顯示區塊"},"removeformat":{"toolbar":"移除格式"},"pastetext":{"button":"貼成純文字","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"maximize":{"maximize":"最大化","minimize":"最小化"},"magicline":{"title":"在此插入段落"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"language":{"button":"設定語言","remove":"移除語言"},"justify":{"block":"左右對齊","center":"置中","left":"靠左對齊","right":"靠右對齊"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"image2":{"alt":"替代文字","btnUpload":"傳送至伺服器","captioned":"已加標題之圖片","captionPlaceholder":"標題","infoTab":"影像資訊","lockRatio":"固定比例","menu":"影像屬性","pathName":"圖片","pathNameCaption":"標題","resetSize":"重設大小","resizer":"拖曳以改變大小","title":"影像屬性","uploadTab":"上傳","urlMissing":"遺失圖片來源之 URL "},"horizontalrule":{"toolbar":"插入水平線"},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"contextmenu":{"options":"內容功能表選項"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安全性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"button":{"selectedLabel":"%1 (已選取)"},"blockquote":{"toolbar":"引用段落"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用者手冊"},"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>"}};
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
index bb2e0ed..4585951 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("a11yHelp",function(l){var a=l.lang.a11yhelp,n=CKEDITOR.tools.getNextId(),e={8:a.backspace,9:a.tab,13:a.enter,16:a.shift,17:a.ctrl,18:a.alt,19:a.pause,20:a.capslock,27:a.escape,33:a.pageUp,34:a.pageDown,35:a.end,36:a.home,37:a.leftArrow,38:a.upArrow,39:a.rightArrow,40:a.downArrow,45:a.insert,46:a["delete"],91:a.leftWindowKey,92:a.rightWindowKey,93:a.selectKey,96:a.numpad0,97:a.numpad1,98:a.numpad2,99:a.numpad3,100:a.numpad4,101:a.numpad5,102:a.numpad6,103:a.numpad7,104:a.numpad8,
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
index 871e717..a60eb8b 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 30 Missing: 0
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
index 0d42280..f33c0bb 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","af",{title:"Toeganglikheid instruksies",contents:"Hulp inhoud. Druk ESC om toe te maak.",legend:[{name:"Algemeen",items:[{name:"Bewerker balk",legend:"Druk ${toolbarFocus} om op die werkbalk te land. Beweeg na die volgende en voorige wekrbalkgroep met TAB and SHIFT+TAB. Beweeg na die volgende en voorige werkbalkknop met die regter of linker pyl. Druk SPASIE of ENTER om die knop te bevestig."},{name:"Bewerker dialoog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
index 7bc1c66..724decb 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ar",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"عام",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
index f9e5248..d4a9f93 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","bg",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Общо",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
index f16234a..11f77ba 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ca",{title:"Instruccions d'Accessibilitat",contents:"Continguts de l'Ajuda. Per tancar aquest quadre de diàleg premi ESC.",legend:[{name:"General",items:[{name:"Editor de barra d'eines",legend:"Premi ${toolbarFocus} per desplaçar-se per la barra d'eines. Vagi en el següent i anterior grup de barra d'eines amb TAB i SHIFT+TAB. Vagi en el següent i anterior botó de la barra d'eines amb RIGHT ARROW i LEFT ARROW. Premi SPACE o ENTER per activar el botó de la barra d'eines."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
index e9bf2a1..88a393c 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cs",{title:"Instrukce pro přístupnost",contents:"Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.",legend:[{name:"Obecné",items:[{name:"Panel nástrojů editoru",legend:"Stiskněte${toolbarFocus} k procházení panelu nástrojů. Přejděte na další a předchozí skupiny pomocí TAB a SHIFT+TAB. Přechod na další a předchozí tlačítko panelu nástrojů je pomocí ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tlačítko aktivujete."},{name:"Dialogové okno editoru",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
index e658d1b..97fc711 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cy",{title:"Canllawiau Hygyrchedd",contents:"Cynnwys Cymorth. I gau y deialog hwn, pwyswch ESC.",legend:[{name:"Cyffredinol",items:[{name:"Bar Offer y Golygydd",legend:"Pwyswch $ {toolbarFocus} i fynd at y bar offer. Symudwch i'r grŵp bar offer nesaf a blaenorol gyda TAB a SHIFT+TAB. Symudwch i'r botwm bar offer nesaf a blaenorol gyda SAETH DDE neu SAETH CHWITH. Pwyswch SPACE neu ENTER i wneud botwm y bar offer yn weithredol."},{name:"Deialog y Golygydd",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
index 4675798..70bebb0 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","da",{title:"Tilgængelighedsinstrukser",contents:"Onlinehjælp. For at lukke dette vindue klik ESC",legend:[{name:"Generelt",items:[{name:"Editor værktøjslinje",legend:"Tryk ${toolbarFocus} for at navigere til værktøjslinjen. Flyt til næste eller forrige værktøjsline gruppe ved hjælp af TAB eller SHIFT+TAB. Flyt til næste eller forrige værktøjslinje knap med venstre- eller højre piltast. Tryk på SPACE eller ENTER for at aktivere værktøjslinje knappen."},{name:"Editor dialogboks",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
new file mode 100644
index 0000000..6bdca78
--- /dev/null
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("a11yhelp","de-ch",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
+{name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
+{name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
+{name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
+{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"}]}],backspace:"Rücktaste",tab:"Tab",enter:"Eingabe",shift:"Umschalt",ctrl:"Strg",alt:"Alt",pause:"Pause",capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",
+end:"Ende",home:"Pos1",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen","delete":"Entfernen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",
+numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",
+closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
index 9385174..24d782a 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
index 29af0c8..ae73cab 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","el",{title:"Οδηγίες Προσβασιμότητας",contents:"Περιεχόμενα Βοήθειας. Πατήστε ESC για κλείσιμο.",legend:[{name:"Γενικά",items:[{name:"Εργαλειοθήκη Επεξεργαστή",legend:"Πατήστε ${toolbarFocus} για να περιηγηθείτε στην γραμμή εργαλείων. Μετακινηθείτε ανάμεσα στις ομάδες της γραμμής εργαλείων με TAB και SHIFT+TAB. Μετακινηθείτε ανάμεσα στα κουμπιά εργαλείων με το ΔΕΞΙ ή ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να ενεργοποιήσετε το ενεργό κουμπί εργαλείου."},{name:"Παράθυρο Διαλόγου Επεξεργαστή",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
index a4e9010..a5da937 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en-gb",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
index 1aeafb2..3a62e4a 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","en",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
index 3773aaf..8c798a7 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",contents:"Helpilenhavo. Por fermi tiun dialogon, premu la ESKAPAN klavon.",legend:[{name:"Ĝeneralaĵoj",items:[{name:"Ilbreto de la redaktilo",legend:"Premu ${toolbarFocus} por atingi la ilbreton. Moviĝu al la sekva aŭ antaŭa grupoj de la ilbreto per la klavoj TABA kaj MAJUSKLIGA+TABA. Moviĝu al la sekva aŭ antaŭa butonoj de la ilbreto per la klavoj SAGO DEKSTREN kaj SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por aktivigi la ilbretbutonon."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
index 7a49ce4..e399793 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","es",{title:"Instrucciones de accesibilidad",contents:"Ayuda. Para cerrar presione ESC.",legend:[{name:"General",items:[{name:"Barra de herramientas del editor",legend:'Presiona ${toolbarFocus} para navegar por la barra de herramientas. Para moverse por los distintos grupos de herramientas usa las teclas TAB y MAY+TAB. Para moverse por las distintas herramientas usa FLECHA DERECHA o FECHA IZQUIERDA. Presiona "espacio" o "intro" para activar la herramienta.'},{name:"Editor de diálogo",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
index 3288460..9fded4c 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","et",{title:"Accessibility Instructions",contents:"Abi sisu. Selle dialoogi sulgemiseks vajuta ESC klahvi.",legend:[{name:"Üldine",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
index b264772..cfcd553 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak",contents:"Laguntzaren edukiak. Elkarrizketa-koadro hau ixteko sakatu ESC.",legend:[{name:"Orokorra",items:[{name:"Editorearen tresna-barra",legend:"Sakatu ${toolbarFocus} tresna-barrara nabigatzeko. Tresna-barrako aurreko eta hurrengo taldera joateko erabili TAB eta MAIUS+TAB. Tresna-barrako aurreko eta hurrengo botoira joateko erabili ESKUIN-GEZIA eta EZKER-GEZIA. Sakatu ZURIUNEA edo SARTU tresna-barrako botoia aktibatzeko."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
index 8241d1a..12eb035 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fa",{title:"دستورالعمل‌های دسترسی",contents:"راهنمای فهرست مطالب. برای بستن این کادر محاوره‌ای ESC را فشار دهید.",legend:[{name:"عمومی",items:[{name:"نوار ابزار ویرایشگر",legend:"${toolbarFocus} را برای باز کردن نوار ابزار بفشارید. با کلید Tab و Shift+Tab در مجموعه نوار ابزار بعدی و قبلی حرکت کنید. برای حرکت در کلید نوار ابزار قبلی و بعدی با کلید جهت‌نمای راست و چپ جابجا شوید. کلید Space یا Enter را برای فعال کردن کلید نوار ابزار بفشارید."},{name:"پنجره محاورهای ویرایشگر",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
index af37f42..98f8127 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fi",{title:"Saavutettavuus ohjeet",contents:"Ohjeen sisällöt. Sulkeaksesi tämän dialogin paina ESC.",legend:[{name:"Yleinen",items:[{name:"Editorin työkalupalkki",legend:"Paina ${toolbarFocus} siirtyäksesi työkalupalkkiin. Siirry seuraavaan ja edelliseen työkalupalkin ryhmään TAB ja SHIFT+TAB näppäimillä. Siirry seuraavaan ja edelliseen työkalupainikkeeseen käyttämällä NUOLI OIKEALLE tai NUOLI VASEMMALLE näppäimillä. Paina VÄLILYÖNTI tai ENTER näppäintä aktivoidaksesi työkalupainikkeen."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
index 8473295..f1b05e8 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fo",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
index 1851e8d..888804b 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr-ca",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide.  Pour fermer cette fenêtre, appuyez sur ESC.",legend:[{name:"Général",items:[{name:"Barre d'outil de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches TAB et SHIFT+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLECHE DROITE et FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour activer le bouton de barre d'outils."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
index ccd2555..8a734d5 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide. Pour fermer ce dialogue, appuyez sur la touche ÉCHAP (Echappement).",legend:[{name:"Général",items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches MAJ et MAJ+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLÈCHE DROITE et FLÈCHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRÉE pour activer le bouton de barre d'outils."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
index a1e3bf5..6a7c808 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gl",{title:"Instrucións de accesibilidade",contents:"Axuda. Para pechar este diálogo prema ESC.",legend:[{name:"Xeral",items:[{name:"Barra de ferramentas do editor",legend:"Prema ${toolbarFocus} para navegar pola barra de ferramentas. Para moverse polos distintos grupos de ferramentas use as teclas TAB e MAIÚS+TAB. Para moverse polas distintas ferramentas use FRECHA DEREITA ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para activar o botón da barra de ferramentas."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
index 1eeb6db..54e2ec2 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gu",{title:"એક્ક્ષેબિલિટી ની વિગતો",contents:"હેલ્પ. આ બંધ કરવા ESC દબાવો.",legend:[{name:"જનરલ",items:[{name:"એડિટર ટૂલબાર",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"એડિટર ડાયલોગ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
index 27739fa..bd63abe 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","he",{title:"הוראות נגישות",contents:"הוראות נגישות. לסגירה לחץ אסקייפ (ESC).",legend:[{name:"כללי",items:[{name:"סרגל הכלים",legend:"לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלים. עבור לכפתור הבא עם מקש הטאב (TAB) או חץ שמאלי. עבור לכפתור הקודם עם מקש השיפט (SHIFT) + טאב (TAB) או חץ ימני. לחץ רווח או אנטר (ENTER) כדי להפעיל את הכפתור הנבחר."},{name:"דיאלוגים (חלונות תשאול)",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
index db55c8e..9f0d6be 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hi",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"सामान्य",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
index 4be938e..92ba672 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hr",{title:"Upute dostupnosti",contents:"Sadržaj pomoći. Za zatvaranje pritisnite ESC.",legend:[{name:"Općenito",items:[{name:"Alatna traka",legend:"Pritisni ${toolbarFocus} za navigaciju do alatne trake. Pomicanje do prethodne ili sljedeće alatne grupe vrši se pomoću SHIFT+TAB i TAB. Pomicanje do prethodnog ili sljedećeg gumba u alatnoj traci vrši se pomoću lijeve i desne strelice kursora. Pritisnite SPACE ili ENTER za aktivaciju alatne trake."},{name:"Dijalog",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
index c549145..81c48da 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hu",{title:"Kisegítő utasítások",contents:"Súgó tartalmak. A párbeszédablak bezárásához nyomjon ESC-et.",legend:[{name:"Általános",items:[{name:"Szerkesztő Eszköztár",legend:"Nyomjon ${toolbarFocus} hogy kijelölje az eszköztárat. A következő és előző eszköztár csoporthoz a TAB és SHIFT+TAB-al juthat el. A következő és előző eszköztár gombhoz a BAL NYÍL vagy JOBB NYÍL gombbal juthat el. Nyomjon SPACE-t vagy ENTER-t hogy aktiválja az eszköztár gombot."},{name:"Szerkesző párbeszéd ablak",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
index 4b633bd..c8d5686 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Accessibility Instructions",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
index e82a70c..5151f60 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",contents:"Contenuti di Aiuto. Per chiudere questa finestra premi ESC.",legend:[{name:"Generale",items:[{name:"Barra degli strumenti Editor",legend:"Premere ${toolbarFocus} per passare alla barra degli strumenti. Usare TAB per spostarsi al gruppo successivo, MAIUSC+TAB per spostarsi a quello precedente. Usare FRECCIA DESTRA per spostarsi al pulsante successivo, FRECCIA SINISTRA per spostarsi a quello precedente. Premere SPAZIO o INVIO per attivare il pulsante della barra degli strumenti."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
index 2661b2c..ec5ed67 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ja",{title:"ユーザー補助の説明",contents:"ヘルプ　このダイアログを閉じるには ESCを押してください。",legend:[{name:"全般",items:[{name:"エディターツールバー",legend:"${toolbarFocus} を押すとツールバーのオン/オフ操作ができます。カーソルをツールバーのグループで移動させるにはTabかSHIFT+Tabを押します。グループ内でカーソルを移動させるには、右カーソルか左カーソルを押します。スペースキーやエンターを押すとボタンを有効/無効にすることができます。"},{name:"編集ダイアログ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
index d5909ee..6b6e7a9 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","km",{title:"Accessibility Instructions",contents:"មាតិកា​ជំនួយ។ ដើម្បី​បិទ​ផ្ទាំង​នេះ សូម​ចុច ESC ។",legend:[{name:"ទូទៅ",items:[{name:"របារ​ឧបករណ៍​កម្មវិធី​និពន្ធ",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"ផ្ទាំង​កម្មវិធីនិពន្ធ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
index d88d335..9b2b070 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ko",{title:"접근성 설명",contents:"도움말. 이 창을 닫으시려면 ESC 를 누르세요.",legend:[{name:"일반",items:[{name:"편집기 툴바",legend:"툴바를 탐색하시려면 ${toolbarFocus} 를 투르세요. 이전/다음 툴바 그룹으로 이동하시려면 TAB 키 또는 SHIFT+TAB 키를 누르세요. 이전/다음 툴바 버튼으로 이동하시려면 오른쪽 화살표 키 또는 왼쪽 화살표 키를 누르세요. 툴바 버튼을 활성화 하려면 SPACE 키 또는 ENTER 키를 누르세요."},{name:"편집기 다이얼로그",legend:"TAB 키를 누르면 다음 대화상자로 이동하고, SHIFT+TAB 키를 누르면 이전 대화상자로 이동합니다. 대화상자를 제출하려면 ENTER 키를 누르고, ESC 키를 누르면 대화상자를 취소합니다. 대화상자에 탭이 여러개 있을 때, ALT+F10 키 또는 TAB 키를 누르면 순서에 따라 탭 목록에 도달할 수 있습니다. 탭 목록에 초점이 맞을 때, 오른쪽과 왼쪽 화살표 키를 이용하면 각각 다음과 이전 탭으로 이동할 수 있습니다."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
index 588e120..e73789b 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ku",{title:"ڕێنمای لەبەردەستدابوون",contents:"پێکهاتەی یارمەتی. کلیك ESC بۆ داخستنی ئەم دیالۆگه.",legend:[{name:"گشتی",items:[{name:"تووڵامرازی دەستكاریكەر",legend:"کلیك ${toolbarFocus} بۆ ڕابەری تووڵامراز. بۆ گواستنەوەی پێشوو داهاتووی گرووپی تووڵامرازی داگرتنی کلیلی TAB لەگەڵ‌ SHIFT+TAB. بۆ گواستنەوەی پێشوو داهاتووی دووگمەی تووڵامرازی لەڕێی کلیلی تیری دەستی ڕاست یان کلیلی تیری دەستی چەپ. کلیکی کلیلی SPACE یان ENTER بۆ چالاککردنی دووگمەی تووڵامراز."},{name:"دیالۆگی دەستكاریكەر",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
index 9275225..ffabb15 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Bendros savybės",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
index 7e487b3..873f6e4 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",contents:"Palīdzības saturs. Lai aizvērtu ciet šo dialogu nospiediet ESC.",legend:[{name:"Galvenais",items:[{name:"Redaktora rīkjosla",legend:"Nospiediet ${toolbarFocus} lai pārvietotos uz rīkjoslu. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas grupu izmantojiet pogu TAB un SHIFT+TAB. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas pogu izmantojiet Kreiso vai Labo bultiņu. Nospiediet Atstarpi vai ENTER lai aktivizētu rīkjosla pogu."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
index 51c5f4f..ad67570 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалот притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за едиторот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Дијалот за едиторот",
-legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалог притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за уредувачот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Дијалот за едиторот",
+legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекст-мени на уредувачот",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
 {name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
-{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",end:"End",home:"Home",leftArrow:"Left Arrow",
-upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert","delete":"Delete",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
-f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+{name:"Наредби",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"}]}],backspace:"Backspace",tab:"Tab",enter:"Enter",shift:"Shift",ctrl:"Ctrl",alt:"Alt",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",end:"End",home:"Home",leftArrow:"Стрелка лево",
+upArrow:"Стрелка горе",rightArrow:"Стрелка десно",downArrow:"Стрелка доле",insert:"Insert","delete":"Delete",leftWindowKey:"Лево Windows копче",rightWindowKey:"Десно Windows копче",selectKey:"Select копче",numpad0:"Нум. таст. 0",numpad1:"Нум. таст. 1",numpad2:"Нум. таст. 2",numpad3:"Нум. таст. 3",numpad4:"Нум. таст. 4",numpad5:"Нум. таст. 5",numpad6:"Нум. таст. 6",numpad7:"Нум. таст. 7",numpad8:"Нум. таст. 8",numpad9:"Нум. таст. 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",
+divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
index b38794e..c889857 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","mn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Ерөнхий",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
index da02fe3..819372d 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nb",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
index e762b3f..98e4652 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nl",{title:"Toegankelijkheidsinstructies",contents:"Help-inhoud. Druk op ESC om dit dialoog te sluiten.",legend:[{name:"Algemeen",items:[{name:"Werkbalk tekstverwerker",legend:"Druk op ${toolbarFocus} om naar de werkbalk te navigeren. Om te schakelen naar de volgende en vorige werkbalkgroep, gebruik TAB en SHIFT+TAB. Om te schakelen naar de volgende en vorige werkbalkknop, gebruik de PIJL RECHTS en PIJL LINKS. Druk op SPATIE of ENTER om een werkbalkknop te activeren."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
index 86df532..4fb70dd 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","no",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
index 5cded16..33580a2 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępności",contents:"Zawartość pomocy. Wciśnij ESC, aby zamknąć to okno.",legend:[{name:"Informacje ogólne",items:[{name:"Pasek narzędzi edytora",legend:"Naciśnij ${toolbarFocus}, by przejść do paska narzędzi. Przejdź do następnej i poprzedniej grupy narzędzi używając TAB oraz SHIFT+TAB. Przejdź do następnego i poprzedniego przycisku paska narzędzi za pomocą STRZAŁKI W PRAWO lub STRZAŁKI W LEWO. Naciśnij SPACJĘ lub ENTER by aktywować przycisk paska narzędzi."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
index 308ca13..1cf81f7 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilidade",contents:"Conteúdo da Ajuda. Para fechar este diálogo pressione ESC.",legend:[{name:"Geral",items:[{name:"Barra de Ferramentas do Editor",legend:"Pressione ${toolbarFocus} para navegar para a barra de ferramentas. Mova para o anterior ou próximo grupo de ferramentas com TAB e SHIFT+TAB. Mova para o anterior ou próximo botão com SETA PARA DIREITA or SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
index b66d89c..620dcbe 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade",contents:"Conteúdo de ajuda. Use a tecla ESC para fechar esta janela.",legend:[{name:"Geral",items:[{name:"Barra de ferramentas do editor",legend:"Clique em ${toolbarFocus} para navegar para a barra de ferramentas. Vá para o grupo da barra de ferramentas anterior e seguinte com TAB e SHIFT+TAB. Vá para o botão da barra de ferramentas anterior com a SETA DIREITA ou ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
index 2fb88fc..a92f60f 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ro",{title:"Instrucțiuni de accesibilitate",contents:"Cuprins. Pentru a închide acest dialog, apăsați tasta ESC.",legend:[{name:"General",items:[{name:"Editează bara instrumente.",legend:"Apasă ${toolbarFocus} pentru a naviga prin bara de instrumente. Pentru a te mișca prin grupurile de instrumente folosește tastele TAB și SHIFT+TAB. Pentru a te mișca intre diverse instrumente folosește tastele SĂGEATĂ DREAPTA sau SĂGEATĂ STÂNGA. Apasă butonul SPAȚIU sau ENTER pentru activarea instrumentului."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
index 9275360..667c872 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ru",{title:"Горячие клавиши",contents:"Помощь. Для закрытия этого окна нажмите ESC.",legend:[{name:"Основное",items:[{name:"Панель инструментов",legend:"Нажмите ${toolbarFocus} для перехода к панели инструментов. Для перемещения между группами панели инструментов используйте TAB и SHIFT+TAB. Для перемещения между кнопками панели иструментов используйте кнопки ВПРАВО или ВЛЕВО. Нажмите ПРОБЕЛ или ENTER для запуска кнопки панели инструментов."},{name:"Диалоги",legend:'Внутри диалога, нажмите TAB чтобы перейти к следующему элементу диалога, нажмите SHIFT+TAB чтобы перейти к предыдущему элементу диалога, нажмите ENTER чтобы отправить диалог, нажмите ESC чтобы отменить диалог. Когда диалоговое окно имеет несколько вкладок, получить доступ к панели вкладок как части диалога можно нажатием или сочетания ALT+F10 или TAB, при этом активные элементы диалога будут перебираться с учетом порядка табуляции. При активной панели вкладок, переход к следующей или предыдущей вкладке осуществляется нажатием стрелки "ВПРАВО" или стрелки "ВЛЕВО" соответственно.'},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
index 26d8ca9..56b5b92 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","si",{title:"ළඟා වියහැකි ",contents:"උදව් සඳහා අන්තර්ගතය.නික්මයෙමට ESC බොත්තම ඔබන්න",legend:[{name:"පොදු කරුණු",items:[{name:"සංස්කරණ මෙවලම් ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."},{name:"සංස්කරණ ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
index d239b5a..6f16ff9 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sk",{title:"Inštrukcie prístupnosti",contents:"Pomocný obsah. Pre zatvorenie tohto okna, stlačte ESC.",legend:[{name:"Všeobecne",items:[{name:"Lišta nástrojov editora",legend:"Stlačte ${toolbarFocus} pre navigáciu na lištu nástrojov. Medzi ďalšou a predchádzajúcou lištou nástrojov sa pohybujete s TAB a SHIFT+TAB. Medzi ďalším a predchádzajúcim tlačidlom na lište nástrojov sa pohybujete s pravou šípkou a ľavou šípkou. Stlačte medzerník alebo ENTER pre aktiváciu tlačidla lišty nástrojov."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
index 5b0abc9..0671357 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sl",{title:"Navodila Dostopnosti",contents:"Vsebina Pomoči. Če želite zapreti to pogovorno okno pritisnite ESC.",legend:[{name:"Splošno",items:[{name:"Urejevalna Orodna Vrstica",legend:"Pritisnite ${toolbarFocus} za pomik v orodno vrstico. Z TAB in SHIFT+TAB se pomikate na naslednjo in prejšnjo skupino orodne vrstice. Z DESNO PUŠČICO ali LEVO PUŠČICO se pomikate na naslednji in prejšnji gumb orodne vrstice. Pritisnite SPACE ali ENTER, da aktivirate gumb orodne vrstice."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
index 8699635..8f9d5c7 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sq",{title:"Udhëzimet e Qasjes",contents:"Përmbajtja ndihmëse. Për ta mbyllur dialogun shtyp ESC.",legend:[{name:"Të përgjithshme",items:[{name:"Shiriti i Redaktuesit",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Dialogu i Redaktuesit",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
index c8ea9af..ee71b67 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr-latn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Opšte",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
index 1e28481..fd04d22 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Опште",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
index 77a42b4..751a075 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sv",{title:"Hjälpmedelsinstruktioner",contents:"Hjälpinnehåll. För att stänga denna dialogruta trycker du på ESC.",legend:[{name:"Allmänt",items:[{name:"Editor verktygsfält",legend:"Tryck på ${toolbarFocus} för att navigera till verktygsfältet. Flytta till nästa och föregående verktygsfältsgrupp med TAB och SHIFT+TAB. Flytta till nästa och föregående knapp i verktygsfältet med HÖGERPIL eller VÄNSTERPIL. Tryck SPACE eller ENTER för att aktivera knappen i verktygsfältet."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
index 8e4db7f..2499b99 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","th",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"ทั่วไป",items:[{name:"แถบเครื่องมือสำหรับเครื่องมือช่วยพิมพ์",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
index b9b9628..1eb46ce 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",contents:"Yardım içeriği. Bu pencereyi kapatmak için ESC tuşuna basın.",legend:[{name:"Genel",items:[{name:"Düzenleyici Araç Çubuğu",legend:"Araç çubuğunda gezinmek için ${toolbarFocus} basın. TAB ve SHIFT+TAB ile önceki ve sonraki araç çubuğu grubuna taşıyın. SAĞ OK veya SOL OK ile önceki ve sonraki bir araç çubuğu düğmesini hareket ettirin. SPACE tuşuna basın veya araç çubuğu düğmesini etkinleştirmek için ENTER tuşna basın."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
index 8cf79b1..40d8b28 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Гомуми",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
index 788695c..c7fe6fd 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ug",{title:"قوشۇمچە چۈشەندۈرۈش",contents:"ياردەم مەزمۇنى. بۇ سۆزلەشكۈنى ياپماقچى بولسىڭىز ESC نى بېسىڭ.",legend:[{name:"ئادەتتىكى",items:[{name:"قورال بالداق تەھرىر",legend:"${toolbarFocus} بېسىلسا قورال بالداققا يېتەكلەيدۇ، TAB ياكى SHIFT+TAB ئارقىلىق قورال بالداق گۇرۇپپىسى تاللىنىدۇ، ئوڭ سول يا ئوقتا توپچا تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تاللانغان توپچىنى قوللىنىدۇ."},{name:"تەھرىرلىگۈچ سۆزلەشكۈسى",legend:"سۆزلەشكۈدە TAB كۇنۇپكىسىدا كېيىنكى سۆز بۆلىكىگە يۆتكىلىدۇ، SHIFT+TAB بىرىكمە كۇنۇپكىسىدا ئالدىنقى سۆز بۆلىكىگە يۆتكىلىدۇ، ENTER كۇنۇپكىسىدا سۆزلەشكۈنى تاپشۇرىدۇ، ESC كۇنۇپكىسى سۆزلەشكۈدىن ۋاز كېچىدۇ. كۆپ بەتكۈچلۈك سۆزلەشكۈگە نىسبەتەن، ALT+F10 دا بەتكۈچ تىزىمىغا يۆتكەيدۇ. ئاندىن TAB كۇنۇپكىسى ياكى ئوڭ يا ئوق كۇنۇپكىسى كېيىنكى بەتكۈچكە يۆتكەيدۇ؛SHIFT+ TAB كۇنۇپكىسى ياكى سول يا ئوق كۇنۇپكىسى ئالدىنقى بەتكۈچكە يۆتكەيدۇ. بوشلۇق كۇنۇپكىسى ياكى ENTER كۇنۇپكىسى بەتكۈچنى تاللايدۇ."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
index aa582de..c7aac2b 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","uk",{title:"Спеціальні Інструкції",contents:"Довідка. Натисніть ESC і вона зникне.",legend:[{name:"Основне",items:[{name:"Панель Редактора",legend:"Натисніть ${toolbarFocus} для переходу до панелі інструментів. Для переміщення між групами панелі інструментів використовуйте TAB і SHIFT+TAB. Для переміщення між кнопками панелі іструментів використовуйте кнопки СТРІЛКА ВПРАВО або ВЛІВО. Натисніть ПРОПУСК або ENTER для запуску кнопки панелі інструментів."},{name:"Діалог Редактора",
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
index 8265545..18ba882 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","vi",{title:"Hướng dẫn trợ năng",contents:"Nội dung Hỗ trợ. Nhấn ESC để đóng hộp thoại.",legend:[{name:"Chung",items:[{name:"Thanh công cụ soạn thảo",legend:"Nhấn ${toolbarFocus} để điều hướng đến thanh công cụ. Nhấn TAB và SHIFT+TAB để chuyển đến nhóm thanh công cụ khác. Nhấn MŨI TÊN PHẢI hoặc MŨI TÊN TRÁI để chuyển sang nút khác trên thanh công cụ. Nhấn PHÍM CÁCH hoặc ENTER để kích hoạt nút trên thanh công cụ."},{name:"Hộp thoại Biên t",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
index 802cf79..b63d413 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh-cn",{title:"辅助功能说明",contents:"帮助内容。要关闭此对话框请按 ESC 键。",legend:[{name:"常规",items:[{name:"编辑器工具栏",legend:"按 ${toolbarFocus} 切换到工具栏，使用 TAB 键和 SHIFT+TAB 组合键移动到上一个和下一个工具栏组。使用左右箭头键移动到上一个或下一个工具栏按钮。按空格键或回车键以选中工具栏按钮。"},{name:"编辑器对话框",legend:"在对话框内，按 TAB 键移动到下一个字段，按 SHIFT + TAB 组合键移动到上一个字段，按 ENTER 键提交对话框，按 ESC 键取消对话框。对于有多选项卡的对话框，可以按 ALT + F10 直接切换到或者按 TAB 键逐步移到选项卡列表，当焦点移到选项卡列表时可以用左右箭头键来移动到前后的选项卡。"},{name:"编辑器上下文菜单",legend:"用 ${contextMenu} 或者“应用程序键”打开上下文菜单。然后用 TAB 键或者下箭头键来移动到下一个菜单项；SHIFT + TAB 组合键或者上箭头键移动到上一个菜单项。用 SPACE 键或者 ENTER 键选择菜单项。用 SPACE 键，ENTER 键或者右箭头键打开子菜单。返回菜单用 ESC 键或者左箭头键。用 ESC 键关闭上下文菜单。"},
diff --git a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
index 0bafec0..3305d9c 100644
--- a/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
+++ b/core/assets/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh",{title:"輔助工具指南",contents:"說明內容。若要關閉此對話框請按「ESC」。",legend:[{name:"一般",items:[{name:"編輯器工具列",legend:"請按 ${toolbarFocus} 以導覽到工具列。利用 TAB 或 SHIFT+TAB 以便移動到下一個及前一個工具列群組。利用右方向鍵或左方向鍵以便移動到下一個及上一個工具列按鈕。按下空白鍵或 ENTER 鍵啟用工具列按鈕。"},{name:"編輯器對話方塊",legend:"在對話框中，按下 TAB 鍵以導覽到下一個對話框元素，按下 SHIFT+TAB 以移動到上一個對話框元素，按下 ENTER 以遞交對話框，按下 ESC 以取消對話框。當對話框有多個分頁時，可以使用 ALT+F10 或是在對話框分頁順序中的一部份按下 TAB 以使用分頁列表。焦點在分頁列表上時，分別使用右方向鍵及左方向鍵移動到下一個及上一個分頁。"},{name:"編輯器內容功能表",legend:"請按下「${contextMenu}」或是「應用程式鍵」以開啟內容選單。以「TAB」或是「↓」鍵移動到下一個選單選項。以「SHIFT + TAB」或是「↑」鍵移動到上一個選單選項。按下「空白鍵」或是「ENTER」鍵以選取選單選項。以「空白鍵」或「ENTER」或「→」開啟目前選項之子選單。以「ESC」或「←」回到父選單。以「ESC」鍵關閉內容選單」。"},
diff --git a/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js b/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
index c9bcd7e..81d9372 100644
--- a/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
+++ b/core/assets/vendor/ckeditor/plugins/about/dialogs/about.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("about",function(a){a=a.lang.about;var b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'\x3cstyle type\x3d"text/css"\x3e.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
diff --git a/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js b/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
index 48852ef..8039751 100644
--- a/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/core/assets/vendor/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("paste",function(c){function k(a){var b=new CKEDITOR.dom.document(a.document),g=b.getBody(),d=b.getById("cke_actscrpt");d&&d.remove();g.setAttribute("contenteditable",!0);g.on(e.mainPasteEvent,function(a){a=e.initPasteDataTransfer(a);f?a!=f&&(f=e.initPasteDataTransfer()):f=a});if(CKEDITOR.env.ie&&8>CKEDITOR.env.version)b.getWindow().on("blur",function(){b.$.selection.empty()});b.on("keydown",function(a){a=a.data;var b;switch(a.getKeystroke()){case 27:this.hide();b=1;break;case 9:case CKEDITOR.SHIFT+
diff --git a/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js b/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
index 525bb7a..26c2feb 100644
--- a/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
+++ b/core/assets/vendor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -1,4 +1,4 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
diff --git a/core/assets/vendor/ckeditor/plugins/icons.png b/core/assets/vendor/ckeditor/plugins/icons.png
index 03fa64b..fd52e40 100644
--- a/core/assets/vendor/ckeditor/plugins/icons.png
+++ b/core/assets/vendor/ckeditor/plugins/icons.png
@@ -1,30 +1,30 @@
 �PNG
 
-
IHDRh�T�6IDATx��]	xŖ�	�$dc� $@������0D�M
�T\Pd�#.0* 8���>��"��
-<��*a	
-J�′�����w�/u��׀lu��|�v-�����_u���w�(��߉�!>C�K<�8�I�h��Z�n����W:t�һwo�iӦ
-�/r"�����+�.��������t��e���Õ=z(�$����t�W�^ʠA��P�3�G��ddd|{��B�Z��͚5�~����IOO_����7z��Yw�u�R�V�c��NU��c|�.�3���n����4$~3%%��J�P]�r��吐%99Y�С��%��7�P�(͛7?3u��R���Q�[SX�Gu��Q�L���2�&r��a*���6�7�?�%sz��ƍ����:7�zDDĶ��(��Ş�OBr� ��O����s%���-�:��o���>��2r�He��
*�q��J#�v��ԳP�B��t�>�sħ�ϟ�~Ȑ!���ߏ�������Hܭ[7�$�
��J��Q��	 x+��6��/�ӧ�Bj�ܪU��-�/_~�=��hS�q���8�}��*�n߾}%��������@e�����̯	��mժ�9���+W�w�����ݻ+-[�D@��'>IB�!�jժX@Lt����yN���7n&�
o��T��@#�s�L$j�m!11��&[�Ĵ�4�Ne˖UBCCʬ4i�D
J�1b9	���"�J�*U~�\���			�/_��2�`���A|��B�c�B�v�e��8��E��M=���N�^Ǹ�>_u�
|@����ݜv�#>t��w+4�P�9��}�
�
-����Ƥ�N�uW|�n��S�Aݺu�X+��E�e�����аs��*�����y0
-w��ƿ���^|�^�^����sW�V� a�ҳg����]�GC@�@h]H�۝f� .�X����*UR�˯��6�p�S:\��T@�4.#u�����#>L��
����m۬�^Yq�N��WT:v��(���
-H1u�"��	t롍���.&.^��")��iӦ�Xv�۵k��̟�yt�7'�`&�M��Z��{��"TLA�<B��q�mذ�{t�a���5,Ť��X%@w�4�n��ԋǠ�۠/�:�z&4.�1cF�zذa@�b�ά$���0�s`�����Φx�x�< RG��h$��x�Ȳ��YӦM�i�U�E*��Щ(������Z���[�N�:�h���Ÿc�6m�;)~衇�~��'<{w;�ރ�M�-����!����T�$9�`�aBZ��
���W����M�a#�P��T�!3��",,,�;[
;v�M�ӓP�Ng�@'�����'}��c����Oj
-���pL	�:������G*��H`���'N�8�i%��ζm�V!4:ѨQ��@e
-;+�
?�O��[AA��gϞ�{�A��&�C����%����ǎ�3�D��߿E�D�����Vjp&$��a�7��X�|�Z)���Rn�ϋ�\	�z��>�+��t���>p�-��
u�/���5j�8�X����P�
-,g����>p,0�qF���X��
-X(n��V�X$I��(��^a�c�em�+�o��w���-s��y琐�
����G�
k����ٺ�
$�1m-�x���`f���í���^@�ڵwC0
>��&Vs�J��[
TY��H^��
��!�8�R@RR�
gs��2�:u:�������
-������ty;��>�̨��-[�����˗�LHH(@�*U�����<�5�����b����l�g�%8�K�t�nݺ۩bWQf;l���
�R��7�m�4��d�9�} �cI72
��"nb��z�Щ%��D`�zE0v�C���t�1�љ���1f�e�ر��@��O��z����x��i�?���{��ߕ��O�p�1�z`
-]K������a,����;�~���]}
-�����3��P	���ځM�4ɣ�
-�[|��ד�}��3P���O=�T'��y<77�x�nݎ�d�����W�>�:�H�)��ƪL��P�-�	&�!zM��ׯ��7�|��.�O�x�aÆX��C�=""����"��9&��30z[Y���3�,&��edd��V�#u/,,�L�Mf/n[�z�L�%?XI�6��D&9ʍE{"�P��)GB��R�<�	

���&}&U�OoC�� Zt� �Z���^�AAA
н�ȴ>�k}��
-��T�9}V�!>�e�Ov��(��r�bKRJ�� qA�����T�飋E|�������GEE���u�5I_�^��!S
:t�Ɩ��0LH�KJ#H~���-Z,40s���={�T7ő,t��� ŽOa|���'��f�%��W��Xs`��T��}�a���
�4#��.hҤ�Qd�6,���Iܳ\bk�������E�Ν ]�v-����n�f���s�����q
-uұc�s;w���-`>if;�6mz099y?��),���U� ֈ�!szz:�n|O�3333uAq_���L\�"�Qƍ)))��g�E?@`ݧҜ��l�����dAt�S�slu����Aa|�y�e˖�_�I�c�jհ�1_��Ԅ��)Sf]��+W�+J�7-����ҡ����O�\�򩂂��e�6l���K�35k��T�d����y�x�;Ｓ԰����nBl�����\\�؈�*�>pI�$.H\�� qA��K�0�0M��X^��}����Ī 0�
�gq�YZ}O�e"�ڵkw
��X���!i�VhK"�b�>_0\�gqY��c�[o���Zd��aՋc˝h�.����~�, 5��X���_�^�פ�k_Bpa%PO�x}�8���^ig�P_A�w,�% ,������Ò�=Z���i�7k��N�:��A�ڵص�Y6��YR�I�� qA����,���W�M��L�>]�1c���4H{�K��O('NT�{�9KF���%���ƲI��g��d�A�k�-*����Z�jJ͚51�"�}�{a^@���Q�F�+�Ǐo�H��W�)���5e��2M��Β$]}����n�QÆ
/	`K��a����S~�N���_E���ڵkW�����c�p1bĈ�jԨqp�����	��s'S�Oů ���x£�?&22�NAԦ!�ɤ�$x&�{l����0�b�aԵ߆�z��G��-�
4h����!%����ᰡ��̳�c�Ol��l���Z�j�|tt�.L�`*��φ�
-��`�>��A�Q�%�5�?y��
!p����5�fh����ի+���׉��#�1|�QI��
��$]�T��K{�I:��8�'�M�$�o�H}��s]�����S,͋��^@�<7r%�e�����ՕD-
i M�t}�r���,b���~��o��v.�
-���w�7[Ձ����)���a�CT�/� W'�[;����X{����}ɽ͒nz�g�pŒ���7y��l�V�ߨ	�P�/~��7N����U���0���d�s�;�[�pa�P'2��8�݁
$0!ټysQ	�u�ߡ^�zp�9�鿳:���O���$��:�a;��O� **�t��K�U��
�	��x�&/p�}o���h�������qJ���9�����S�45k�\K�;���-�9^��I7
)-&�͓����v}Z�/N���W�_„b�œ����|F�O�����-tef㄀�#L��X8B���!gX:�v��'}���qہI	,���|;0)��v@��ܐ� I�����LZk�s�p�
-&%19)b�!
Ҋ�<oS����hT��-[�k`�!
�^���Q��-�s��G@ V�x�[1�ت�+�r�YҍE��f��v���y�;o+{����c1Kjj�y�^Y-���ԚQ���><�b��?����OII1,�Aѓ��XǬ�X�<�}�#X5>�t
�\�o
����)k�k�Q���q��X�~��8%�0�6��|؆¯92c�Z$�-p�z
e�+�,����t�`O����7o�L��^ii{�>��p�#(
�१��,{�V��C�z~N�ƕ/��/H�t�c0
��Ȏt���t���pmG�,��i�ҹ�����r`D�q
:�
-�I��?�r|��Yi�:��8,��'�6c7;rg��kMJ�?j366v+|���u	�,Y2�F�����b�݇pi҉�3N�Y_#0���5���l�����ݿ��˗�.[��v0�߀�Q��k���ec��*K�o�l,����)'��Fz�"����5�p����M�%I�~:�Z��E�oG�-]/���Vq`�/�~�s	@
.,<*�m���)ʦ���4'=U��F�g��kDR���Ny}���^_�
!*�x}���Βn"l��K'��I���)^4����8�d���=r]����ɼb:�
.���E:�m%�t���h��nK`���^�����>�󜚚�����W�^E� m@���X
-NFFN[�"h�S�4H�Js�X��lp�,:qa�C�e'Ĕ󕌭�J�.]��z
C�b?�L�|��=	��-))ɟ��t��E�x3ٷ�>��qVS�<��	kϼM�Nb�~\x?��2J�>�U��|bx�KLL�g���\�üv�g�������Q#�!qLȬO�X̋58Ĉ5��
-*�C�E��m�#j�8>i��
�B� -��#��][�ˊ(���4H�!^�<�%��uŜ���������Xw������������_���v��*�?�,�_`J���f�ɱ�a��}������W^�
8)<�YT�A�v�[�'�Zꅩx���]��N��*2c�~ٵA���-
[ȫ)�I��^]d��j����p˷�����vV�%�vny���
���3s��I..u�C%�Z�Cܝ�#��D��Xa�+��-Vt�[��1]���3�0П�c��܀%�sy���%��Mb��˃��ym�<��{�@��fB³�܌Dg���Ciݞ�f�s�v�	���w�0A� ����x��n������GV�\�V@;�����jղ�vv�/H�� ��J�x��
-��w���p�a���]���t-@?^p=js{�'�9^�t#R��~g�L��ӧO;o޼�999k{��{�ȑʐ!C�1cƬ�����Ξ={�-[^��x�� ��u��'�y�t�2�w�(m1�'K͚5ˣL�����YM�HK�v]���ћp�N�:)����X��+�m۶�ШQ������������e��]���E
-����O�FŬ8	O#�	8��۰����`�Z�v�L��/��s�)j�lB��,,�8�)?22�099��'N����s|K�(q|jj�W��4n���]����l�p	k��S�ŋ����Q���1b�p��5�jժ[�n݊b?�eg����z��%����N��H��������fBN��~�m��`na�$;���ǟ�������/�����yr^~?�v���h�x�����K��������}�R���
������^k�"m8z�ϫ�D6�(u�H[#��o�����Y@!�-;;{�H[�7n���I�bŊ��gx������e����v�G�ȹ�+1l���D�#7MK�2���oeu�����F�A�j�`�q��4��c����x,q\�Ph��6G%�7G�X�|��T�~v'`��i;�'j��+G��Ot;�~����El�0�a��KJ��xS`�c����.Xb�t�!�a�g�u�H��2����.�L��1�!l�]Y�e�ĭ��O�� ӹ�rp�a;����c��!�8����qqq�p2�ȪU�����𠠠�o߾�t�PոT����Az�s���x�W��3�333���+�0�������?Kg$
0Ie�iѢE�]ʢ�jժ�L�2#-+Q����#�g�w6S�~,���~�٤��p��t�$���+FV�v�mn�IH�[!f�����Xa)�F׫B��B��5!���@�kX0�a�*�t��������6��aE��G�	����`
S�C��
-`�&���.�Q�0a�)&h������`�a�e�	��6��	�t� 1A�$9^��9^��I��xA��xA�$I�̄e�)�X%�پ(�+�E��Y)_�<�_���+|%�]�Rs�p[ӫW�/��$>f����*(�!�AQ����|8P"��e�O\�}hX�8i�̙k�F�-J�B/�e���֭ۅ����L��'H��8t�P|�_D�m8p �g��VG
-����X�u�TJ�������% �k�/-%%�e�c4hJ��I&
��}�0r��[�[�>}Գ�Ǝ��z�-��N��ӠZ�}TOJrr2Nռ��tժUٍ5*�ڵ+L5ɟ���>|���
-J�3gΆ���b�Wxc~�v�׻wo�f�:��x�����Q�_���;5<!�)"�<7w��]��=��e��#zmܸq/���nb���h��q����n޼ys��^��$~�ҥ��������S���/��R�O]��&L���F�m:����E|!qc��$�)�{1b�mO��>(R�j�f��jw��>Ү��A'��d�5�j���Ðy��Gh�/�"�Xw�$y}�
�6���05�H�h�(L�˜C�9vaj^�����
S���5}�-�a���y��[�m����D#V��BQ����O���HÞ}9`�I��L�M@��}�5s;�}�KT��$�7_Do���vL	4�Ʌ��P�
V]%�'�O��I"���=z�PA�����|�q�W���9�0����Z۷o_��������>ܥ�?@�#>>~;�������:�Mt���'����F��3�-I/�.�F������!F'��k��7~٠A��̚5Y4�*K<u�޽[h����ƍM��=!���__CA�L�;	�י�?8q���}6��JğZ�?"?VI��d���&�
�V�'(T`��._d�am{f,x�
��Rv��=�:����	<F3���%���·����#��`�$�����QL`��lF+��L�?���|Go���D+�
����\
��苿���t�6㭺�F+��񲆚�����*�

��y���/{�%I�$qA��I�$�pv�KeG�R�v�A+�I����ԩ���}P[�-��ȫ�;�ZH�VT��	i�%@^V���}к^_��K�p���o+nyԼl�Լ����y�j�H�ˎ��T5�����x)A��R���X��K����
����%@��IEND�B`�
\ No newline at end of file
+
IHDR����1�IDATx��]xUŶ>	�$�Q��
C(���	%
�) M@ł %6�X�Y@�=5�����UT�R.�R%����P *>PP�WbH�[���Ü�g׀�Y߷�s���gϞ���5e�|��ˆ���K�3�y�c���d�&��]�vʀ
�#F(���SZ�h�P�'B�4h�2lذ�������{o]���w�5J�ݻ��JbJ�IIIg����:�SEQ>!~�xYFF�Ww�u�7�ݲe�Z��r˺���u�����q�Ǐ�}���+u��=n*��T���7�?A�n���n�H��SRR��d
+��7��		Q����Ν;+���Q�^p#`ՉҪU�33f��'e^K�5��}P�~}��_\A��zx�0��+�!^��kć��:=BI�f��x~t���]+""bGTT��RO�'!�����'I�5G�Њ9��N�q}��ժU[��C)cƌQ�b���ު�4Ro�(ICK
�*UZ�L��#:G|z�…���s�=(�X
+���\��={���H����(%yő��B�lO|'����+��ϭY�&�R@Ŋ�y着6�G���S:u��Ν;WSi�Y
+_T�:(�����P���m۞��J�
+~��
+�ի�ҦM�
��F�$d�kԨ�����w#09ϩ��I�&� �FAmMл^4"8����@�v111��I`�eKLKKS�T�|y%44T��J������ѣW��pK
�@-ϫT�^���U������a�ʕ�(�3v����9.">�*�'XP�8�� �_$]�ԇ���os*�U���U���O�>��ik�;�C���r���U��l�T@�L�6&�v��{��t[4h�Z�u-����ŷ���&ݺuSA�g��E�Xܝ���{�
�{Æ
?Ⱥ�]�f�Ä
J�>}�q�w5Z

��u]�t�9���r��*.T�RE�.��v�x‰O�p
��S
A:Lи��-��M@���g�߉odm�f���J�v튾�ҥKF���T�@J��a�HN�[m��������0�h�ҥH��̜93Ʋ�ܱcG�g���O�{7��q3�lA��R�7��"TBA�<H��q�mڴ�t�a���5,%���Y%Fw�4�n��ԋǠ�ۤ/��?�Lh\���/�G�	�.aq�J��	
c�:�80
<J�l��W��"u!�P�Fr
+���-�ϰ��hѢ�[%hP��K�J�R�jnܸq��[ؾ}{ь3��R�;�o�����￿���dz��S���_'�F|��,�>⏉;I5!I�3
+v&�%��sa��~"�_��ԡ�6�J�*aN�#2S?�,���¾��k׮9�;=	�N�tt�a�񂂂�q�GlG0�%==���@��/�)�TG�0y��I���	L��ԩS�;�DT��:(�F'�6mz�La�`�q"����-,,���ٳ[bccO� ����r����,88�����x�6���n��勺����j�΄T�[L���K\@����+�!/-U��8ĕ`����J�Z�I�.���߂_P�O�,~}P�v�C��%11�\X
ũ�Bq���	�X�'��g��6�Ŝ����:ieN�E�����F^���b��.|/��270�w			����w����Z�=��;
+@@�������`�Ǭ�^�a&8<<�ZQ0��ԫWo/���Zibu1���.�@�U����oܸ�ҏs-$%%bp6�.׵k׳��J�/K
���k`
+LNN>M�� �^�SȌ�iӦͿY
+X�reNBBB!W�^�},�Q�9t��4�p;�ޞ@e'=s��~z�#
4�I���0�a۔}X���@��`��h7} +ε�ٰ+H��	Ht;qs�4X��O�NmЭ� S��+���\҇%����n|��Ƅ	��'��).>
��V��¦��X����$f|W��n�¥q�����&--
&t�d�X:s�m�)T��vVC!�'����
�A��7o�O�����/�����g�ҡ�{챮:e�p^^�/={�<�y\\�G�*�U�����#����*)�#�[�V�L���5-lԨх�_�qJ|� >��&M�`QOo}d����bR�KLz瘼�'��0�M}d#���Xc��8B0v\����=[-dX�ԫ��h:EL6���y�ڵ97V~���n2�Ls���DT�R�S��`)�@y$�j/+=L�L��ކ�'�A���A��6�R����{+"��i}(6���
+�`W��s��jB|˾��8��^ر�Ŗ��$qA���$���Gw��4��6����)���:A�됾<Z�V�#�:w��!�-aaa�����F�>�S�[�^l* ''gz�>}�Mq$�26���c_`�y��GgZ}��6l���T��A�tg �q��)�h+
�EEE��7o~�
f�!C�`���Ç���)A�|ڭ[�B��D�=�sss�۸��wy�ܹaiii�`�B�t�����ݻ�;m�Oچَ-ZNNN>��d
++ �b�1�5�Ȝ����������E]P��ă|�WƷH}�#�qsJJʿ�aя�X��4�$[��}�+]@��[�m��ɟR�`�kӦ
�vW�fM,n��|45��ʕ�M��*T���M���g�th����S�V�z���0p�M�`����L�:u0U0���`z+�t#���[o-7l ��4��� �b#=W66⟉��e�$I$.H\�� �ƥg����I,/��>��zbU�̀���,���!�2�
+;v���X���!i�VhK"�b��@0\.`qY��c�n���Zd��aՋc˝h�.����~�" 5б�nY[�`��Ie)�>��p`��@=��E�,|�,�z
��-K@}E߱@@�@��z�/??K��i	�J ��u"ު5�����j���;d��fۘ�fK�'I���$.H����~Z�9s�2k�,��_2�i/}	y�e�ԩ�SO=e�H�������X6�<�䓖�4H{��E�#�θ�Y��R�NG����k��^��*a�ر�J�ɓ'[2� ��i�h(vMi.OS��$IW^�a�[mԤI��ؒ*h��}��)?n�����/
+��d�ѣ��d��8c�p1z��Oj׮}xذa��	���N�\%>�_A:�?�'��c"##�D=�LJJ��D�u�m0�x>�Q�:���;�]{�T���I�ƍ��4��a2"<<6�A�y6vL`��-{� B�����X�n]\T���ރ)L���0Q������$l��`�mG	x����<l�������5�fh���Z�j)���׉��#�1�ң�6�\%I��ii�rS����t����3�H�k��~F����:���ƞbi���B�繙+ASߧ?��$j	Hi���=7u��T�&`	��g<7Ϫ��l�R��\.~��U�J��P7�1��'q��@���xk�#طkϸ�l�/��Y�uA��l�XRbb�W���&�S�ҍ��/�5
����>��i�7����
+��攜���`.w��/��DFX�gQ�s�;��&d"[�j%*���;4l��E,@8�wV:����U���S��A�u l\C��DEE���x	��*6�!1A�/� ����m�-�?���#""N�Ӱq�Gu~J��N�:���CGu�u���!�r� 醡�eń�yr�_8l`ק����{��%L(q�/̉0A+���gD�D�O�N/�0��BW��l��|�	��n
 ��K>����Q0�v	���:0#�u l&%�l�������
ѯpCb�$I����2i��r��
+&%19)b�!
Ҋ�<oS���pШ�	[�����C��
+
��^�c���;��j{b�0���e#��*�� �%]_�}�aj' 
�ѱ��g���y[
����h��,�����zeum>cSkF��j�F8�Kd����F�G|JJ�a
���6�:f��`�E���'v���i�8�U��P	���MYc\�՘�Go�4�/q?3>f�Z����m(��#36�E���!7�P�a嘥ޑt���I4^�u�V��	p�+-kO��z�7pAi�/=UϏ`�K�/ 
+��[p�6.�x��xA���+�	�Gv�K�e��|�~`�k;�%�N۔�(P(O+�ڑ.F���0Aڑ$I
+�j��s0�8�5�6}����נ���
l���O����ѣ�����&~��wO���t�yǧ�C\�A@�IXGVw篁f�s��`�1�ŽNq�[(S�J4�{��k�ï���/��/;�O��'*rjjj`	�ŇՎ`���y���3�D��*���ly����r}�N���'4Y8=�ql�.[�m���MJ�w��g����u	�-[6�v��;���b��Ҥ�d�~��F����h��1$$d;���5�\�rN���w���:|��$]=d�0�(s��P�X�}[ec����La8Q6��k�}Ǖ]��}`���h��o��(Iҵ����� d;�l�zE��@n΃ կx.�j��6�8v���I�+��4'=U��F���׈������Nx}�������0k\�$]�����N������S�hj�'�p���?�u	�:�S'��|7�p��k�|��(���^�A�-�A�z�R�K���3&�0�f��$H��i:�X���
��ddd,��������8�Aڀգ�K�t(N�Ĥ$Q�@@�i��Rbg��H�{���Jy��!�}���O�|
��0	0˙���O��l�����/�}��O�g}��SX����N7'L���0ĕ�S����2�������D�G�N��<̛�(����.QS��"qL�����8�c
鯂J�+�i��Ѷ5�v�\�Vo��
�E� m��5��h{7X��i<��g��Ӽ���tcS
��0O1������6f�^�~y5j�-X�
��Y��aJӑ_3��x����v��p�G$����NA*��z:
��#�.�Oڵ���xv��]�\�h	p����J �]��h	�M�N�6|�� go�|�Y����|�\$j�>x�i����1̽K<�$.\*\�z�Jֵ!����&��S�^�[�0p�]�+��-V�����ׁV����9�0`��_��v��IJ�I��tip�����).��
+$�oN��t3^��t�
�Һ��i�s�vw�w0A� ����x��O��K}}��7�e�%ڎ���ㅺu�Zb��)��$.H��Wȿ�[�0�z�Xa��+D���Z��ٵ�x���ͭg�%r� �z�l�����ܳf͚8����������w̘1���Õ	&�Y�`��9s�߶m�3VO{�����k���a�0�|���g��FN��q�^˖-�)�k�B�0�	#i�9�k2::z�޵kW�W^��6�:��6mz��V�`�����z��~�3�Ha�����٨�'A� �ı"
����yIKӪ�`lwpp���!��?Ga���P�&d'��¢�s�
+"##����;q��}�=�g�t�ǧ��~��N�f�~޳g�p���.a��B���t��uT|<���x�SV��Y�kԨ�m���(�}Xv��o߾YR�H��$ڊ4��J[�����`&�������&���O�S����f�$X�6%��O_�_w*����4_ϮJ��wq]���7�k#W%�-����y;����U;�''8���:E�:p�Z�B�W��V�nik���M��ܻ�`#(ĂwdggOi�I�&M��;IV�Z�
���]��uиb�<��i��9�%�Mq\�p�iI���~�⭬.�}~���?(_
?�6N���z,q\�$SK�@�=�8.
�9���%�+N?���;
��N�
?Q�7\9�^�~�����<��]/�`��
3T�`XRJLǛb��?�p��a��Vx>�ti�Sf�Ѐ��D�I�!�fg˛mWV3GEEYfq�cD��:3�t.�\f�N���
��y| �`t�{\\\�x�Y��`��P[9�N�:����*W~�>H�ms�h��Jp�@?cp�\ff旾�y%��������tF��T��֭[���,jQ۶m�˕+7Ʋu�z =�y��qg3��'�®�췧M:���v��₤��t�Ȫ�N��Ͷ 		a+�L�3�#?+,���zU0�T�ݼ�&��S�z
f1�P��ΐs��6�Æ�3���0!�,`
+u0X
̰ÄA����EWJ�Ƙb�V����`
�Z�V[�0�a��a�@/��S�
$I��9^��9^�$I��xA��xA��KLXF�B�U���r��2������+B��A��W�ٔZñ5}������a�#8��^XEC_#��'�Z��H�}N��f�(N���Y�c�IѢt����^��={�QXX����)��F��/�H¿MC����}��H��r����J	��W4�ܿ��u-�KKIIy�X��R�k��I��>E���-��������'v�V�V�8D�T�b�t��IINN���KM׬Y�ݴi��=z@�����QڣF�zW_A)s��ݔ��Z��
+�a������������lX�;����_P��1W�ixBSLyn޼y{(�{<pGˬ��{eҤI����ma�����:;;{�������]l%@i����C���yg�Cl�ȟ�{�L->222 ��<g�L�����;t��qC��"�fRiI�S�	�<z�h|۞y}P�P�Ї`��jw��>Ү��A"�W��5�j^#�aH�<ȫy	��3�9	S�{�r4t�G����yED{�Daj^ͥ�Țc��e�/��Y�aj^���W��n��>�)�|�
S�Y�h�*�Y(
+S���ռTpH�E_AyҤ2�t�p�{�ܑ�$�S�g��/�7��z;�����r��*#G�,�����#�'k�$a���޽{���myȌ_��fg�s�W����"a�t�qj�
���c�<x�:F`�p���~/�����ؒ�.?���T���w�b�u��P�$��ě��V'&&^� ��~�]púy���7n��Y���U�g�߿
8�۸�i������(h���/�x7!�����N���gc?�B��E���c�$�O���a�kb�p�a�{�BF+��Y�ֶg�
��7�ށ�
+(U`����#��|`���c0�
aXXZ�|�~`�L�1�
��K�
+�:��	�`����������������7�6 #��*s��/�b�z"��ڌ�z�0X��/o�9�x�zQ���
+�l��]�$I$.H\�$I�ugGz�Lv$(UiG�Jڑ$I�&�~��JY���d�O���3.��Dl%@U����Z��aeOY�����y��o���↑G���HͫN�{,����P�Dj^�J�S	Լ;.Hͫ	�R�
e*��/�,7�t}��%:^d�IEND�B`�
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/icons_hidpi.png b/core/assets/vendor/ckeditor/plugins/icons_hidpi.png
index d34a783..7269c52 100644
--- a/core/assets/vendor/ckeditor/plugins/icons_hidpi.png
+++ b/core/assets/vendor/ckeditor/plugins/icons_hidpi.png
@@ -1,119 +1,107 @@
 �PNG
 
-
IHDR �U-�ctIDATx��}	xŕ�X�%Y�}��ct���5����$K�%�}cN��B6�MHvI6�l�O�IBB�,!�`�@8��3\��6���K���n������H$��}�U�;����������b•�_'�-���Lx#�>�R
-7�,y����������q�c�.�q�ֿb���e�qq�R�K	��#4*��uSS�s�e{��e�H�Ν;Eܽg;��3�������aѢlj&O/��y�ŧ!d'	�BW�a��v�Z699�֬Y�֭[�6n�ȶm����q[O�KBB�@�K}���9�Z������������544&<644$*�y�fQ�U�����
-��$]�OQ��������#w�u�����ʕ+�b�M�6�44�����G���Srr�޲u�x�����cǏ?'	}��z�[	��`pp��A����6R������ۺ�mԕcccb�
�Kr�"P6���	/&������իW���׳
����뼞|��
���b����b����!R錀�RYU��q�E�R/�%%b32��J�Ï?^��ɓϽ���;v칷�A�_ኆꗕUU����&�j�UUox�1��¸;����WV�`ά���)-��[�	�p���ށ
Q8z�p���>_ω�Ĵ��a�1	�GF����]��_�?
-�&�JxClR��1�j!�m��̘�{�z���!8������E%%���W�J���Ɋ��N����I�f(��������+���
-Z���Ii2�>���[�!�~���8�P\1���Uc�HIM=��G}�������%t�x
Ь�%���澺��ߑ��'WK}'@Z������ݬ���?$��Hk�1�&��o$������Kh����mK��g����'!g���}?��OJ]<oo�$,Kkn�������Lx.���tQ`����=�; ;'/gΗm�V+���_R�]==���|)���^T:::���L���ul^�x���Ԍ������ކY}}=+.-e�%%��`����LhX�G))),11�S�S�s�y>��磌�z��G��t+�OF�-�X�P,�v���8p������`�|(�#$"�EDE��P*��3|��GK��?"<[RN'�q�E�.�����/���?_������gg�y&�ڸQ4H�󬦮�-
-:A�_%�ץ�:�\v�g�ݻw�xI`����}�v��s�;O�����ч���n�}��u�V�/I__��U�7"lE0ѣ
�<���FjK������:Y8L�$�]�yW� �%��n�������`���=Os{�i���%?�%SU]}Bň-����%Eg)
�G�O
-l�1�pxM&׬a��f��O�%�)��	_ljn>�%��e�f]>)�I����=�ij:���*���:-{�0tg����{�}R�	+�,KC��ӣ�@�Mh#��hln~�z��'��}��2́ᱱ����7�St�n�[oJrn�.)**z���C��k%�4ˎ�R���WV�^ұ�q�I�%ԭ\������/YN��m8	�u)��$����PLY?�r����AX����E&$s<<ap�aс�&:`WW���0����&\���
�����$|L2�C��j���{�;���#W\q�#tw���|����TKk���E�TTUA��|R`%1Õ�/���g��B�1�޸���YT=�a*2���c�kF��+f���Ƽ<(�Q���/�����ůcH�0zn��'>^�mv�
�]�{;����U������A{(-)p��
-�3�<#x����]X�b�SR^�h�!�o���x��g�������.ڏ�74�vd��RYS�n���^+�K�0��a���
�a��	��p�����MLI��KFlolld	�����k��Yu=��c"&$%���x��YFV�����
^R <'7�]p��X�^+�I���tE@�Ub^�P�\5,�xK���EJ]p���ŧu��je�@�"i1�����gHw���`����~߾���'���cbbXtt�~�Z\\�ө���������U,Ng��  �
-�
��|~'�����@xM�MX�?(9p���8p�7`��q�x��҃��~�k�^+�.�9ؽ[Dؔe�yw�ƍ�\����m���c�>,���s>~è���a�G���}���CE�]vց�!�P
�,�0da��a������ֲ����I��z�@�d�����0���-���;|����t���yu����$t�dʅ}�k���A�r��
-K�-��sь?1
�'ߜ�[1�����|�Ca�����K����&Y�h*��q֤q����Ο`'�������K�EzTr�]�=nG�v$������66���(��E+YFVΟ�;_
-��U+d�5���7�@�|)�Ǹd�
�
]~�� �EzhL��c�
�QsE��9���R\UWw|�t����ef�Ǟ�R�#�{�luC�=�<I�g���3k��¾z���۫PPd�̓����NVRV���������\S��]=�s��l��t�?�N��w��;�+9.�%�}uMͧ�����0��i����B��O����쬯�������bXB«8E���$��D�
v��?�ׯ��|v�-�\������H��$���J�Axx8��ͅ�����5|#z/�@�4|����8p���Lp�	�&�ዄ��{�;�q��&�=260���U,
-x�������g�mڲŶk�ۖ��m릦lc�W��mյ��L��fX��c|������
-ۖ�[m8C��3�w��9�m�6�ʄ-[�[���;vL�ڵkzϞ=l�g�޶s��h}�I�PZY�11Ĺ
QІ
���Iatt����~����aժU�ڵk��SS����K/%����-۶a���q�Fa͚5����0>>>��~v͵מ~衇N��'?9}�e�A�鶶6
hmn�>t�7,˗�L]�i�&a����U^��/�,��+��[N�vtL��@̊���)�r�գ��9~~�G��p;a�f�""�A
-�$+�Ӊ��QiL׭['���WҸoߵ�	7_Ձ�c��B���y2u��r�Jqҡ&	�KKO���[>�֢@�J�l�����bo�_S�-#;�����C�/�~�XO�~�ȇ�

�䛘�{
�1555M���u�lݽ��,>99�����D�c�wtQ����~
�܎�+6o�l_��o�ޱc;�޺m���V�R�ȯ1؏~xv���@�
-Z$b@@��d�!00PBCC���p!"2R����������j����NI2�+PZQq�LXV^~�l6����fuuuB}}��������Z���I��������������f��eph�F�ҩ���SR�����1w��mw�}�ih*--�V����'��9@��ش�c��Q:'�O)���'������a�gz{{�c��n�k��� ���>���]�b��@)Si�0��L�L��A�PĦ۰q�4�X�vZ���l^_e`\�-`ٲO�'���i>Pc�L�ۡ�ohlv�s^ޅ�,��a�t�R_o�MJ• ��=�vv�v��)*6�S��iLD�#���D�귾���=�k6m�.�&��;;m
V�����VX\l�3�lUU�孭������������]��W�kh�����qz�@k��H�Xkk�x��$C7O�'.芧�I(��j[F�'$$o��oxt{��䪟������tFF����-�PMM��(5�s���bˋ�����T��/��M
-�˭6s�?���K/��aݧ�f��OC)Z�0�x8��.������l��f_�u���\Z@����$�2=�8��Hx�E�ÌE"»�"������8p������Om���6,^���nv�e��[WS[��&��]|P�����	�)B��f�Y�l����N�<	�DPٯ}P^Wwdͺu�yėA��%˖=b�Gj��$$���>��v��$���������y=�jc�26����bH	z�`�~qID�r��������z|��]XR�b�c׼�
-�#�����9�c��7(������
-|gHL&�c�bH�b�%�g
-�������c]��8�r�(,,��	�V�qEP\yee�,�ۗ�e
�Q�z�1l�Jľ���n��;(qsnn�r�!�m����8��c݅+��غ+��#��ý��Q�bƦe�`'563�[��}Ƌi��S	q�頵ݍ��"��b�X���}
OP�:���I��nJ|�E�r@�)��0޿��x}b4���ƣ
�"��av�'�e�t�	H��>��3b4vZ�%מ�����wGZZ�ce��D�"�b%\����o㒒X"��������EDj*sz�a��w��#*;	f��ُH����".�ܢ��ɏ���mq��z��.�Cm�s���R��+� �1=3���ŋ_ݶm۽�}�+��A��ꉉ{�,Y�ZN~�ç�aE���@ؠD{����c���Վo)�P�]��@>
CLF�K���—pr��"#)
��?#̕�cc�������###E��`�4t~�C7�P2g;���@Bv�+��g����n�����4��*a��4��ps��P��U�8p���o��APЁ��&�qv}dtT�QTT[������Q��&Rb���O7�Z��11����+�0PWW'�F�2��
]<&�ʦ�/�:yL,mmb�]O�
u�TX���>֞�zyL�L��L�����D�5ʈD�7{�u�xm��c�}�{L���1��c���11���xzyL��<&���zyL�V@�	8p�����@-ϱ���*�}��͂BC�Ǒ11,��ʲ\����#��E�o*�Z�ʩ)���پ}��<�\x�K�o=o�~�@9ȉ|���@���$�4F�3IW
-�ef޺Cʉ��H���CC�Va�s���R�贴[7K���L
���@�� [C
- +v�@z���1ؙ7��'|R����!�*$@�m;v�T 2%��))5����m�)���'Z�a/�@a�w�

�pCa(���I����jbB4N��tE�HN�UL+@
-@	�O
-4tu��U���DYJ��r�o@R�����^���N6*�Ej�
4��KL�ف����
���ext���RK9�]*�JJA,*Ms�'j`�_�RtN����G����o
-����j�'S��+“�5&%^F�aS�
-�(��;�P��'����ʏJM�>b85�w��2�h��Z�������ѽT\�}F^�S#�pѫBC�����^�(�XD�[��F��hX�t�����֓�-9�@Eu5�X��ul0��߄�@��wDÐ��	g�Z��ݘ�P�>��ӳ��h��G?��ʒ�2[��?��!kCpX�o�z�ĀL�

���˳ə`�GH��[����D�%f���S"'Q���S���YRJ
-�2YyE��C� /�yi����O/���N��sl\�[�ΥtR@����#&U��=�F��K��ߐv��>��������?�p��Y
�"��C�����w�}�h��5:��@ᛰ�?���8묳�	vNN�������������������X�%�ɱM�ws)�M��A�H<�t���%E�W��s��PG��}@ޢG��D�ƊI�e�����c#�>R\"2;8Ђ�G
-�q�{w��(��8p�����d\@�R��`�M�o�	�@҄�
�t2��N�7��I.��𔥾^4Nnپ]�c�|@p��mG�aɒ�kkra´����i��k��p#�bb^��
i"v#���vٻw���H��B��R��cc߂A�̳�y���'�		�ެ�
-X�wQc�!�wDv��Uev�[�h��M��l&Zu�M*��
s�r���?��*AO|J����+V n�jN����7�O@[G���xyg�	���qQ{_��
R�lxGQv�H����k�Y��Xg7�g̢�hl|Dt4H�5�Q�l���-==/ý#�
-�u0����:�b@��#v��4�첽_�(B4~쮝���j��iѤ+��y��\[_���!���gC+W
-C��Ӱv���`S=����B��L'����:�O鶝��R�J6�žh��{����Q����kں��ں:�
�"Ӳ0H���"�&�,'��-7�z�PYU�����0h��fަ���p��#�v����찆�JpUT=&Ŭ^���rn�[n���E�*������}����Ʀ�k7l����epee�����J!��k0���B�|�]��g�G��ZmzD���p�d��2"Fj�q�τ����c��;��v���-Qq���
 ��>''�
�1%Dr]���{H0,�������oh��6\50��m���%�(_����l�Oу0fggg۞z晷�~JiN^a��4y�mqqq�.m�~�M4��+*+�ޖ��|v�����߸�_�44�>h]ZV���8�$]}�F�!A���!xff��_~�	)em��p+=#���_~-}��W��qh�99�b���ū\᮰�(s�Aɺ�[���E��pv���q*C��Ԥ���&�s�I�'�z�"���|��H�9��
��_%�ԋ���<F�J��0��QO����8p��	,p�2|��e��3		a˨
��DW�+ׯMh�
gdD��vD|��P���*�92"��}?��O�nt:��P?%�
-ֶ6A�~�����F�%�h���A��
%���japhh�h�G�M��B
�1�W��әyy�)a%�VP*q�u�	=����������#�������r�˧�V��ƿA�p��OQxk;:�����5����J�!z6!�i
�"֏��mm�RWǪ-V��aU���Y��`�2���㻢��U:�!��klԴR^�
������l�JT��@g�MMBie���ʫ�`5O3�)a�Z���2���ţ��W^�<�өYY���҆�W����Drf�k%��U�P}�
-(�����+
G�}[�s�\������E���L(khp�RTWMv�g
-i�4�
5%r���p�("%E���r�����gY��,2-mF
SM��v�C�Z�+�EP˯���*�G��Kzg���0�|�7�TT���7d�,.�!��T.�!��D.�!��X��
h��k�
-�����I��Yj���:[Z����!8X����
hAЀ<�����~_xW�V8p����+���/���/���/���/���/������_���_��8p����ԀH	Wf����[�
��,(<1e�����1{��{=�.��~��eQP�xr{�aɒ[^挳�b憆�<������U�ػW�CE_���2Ѐ!b�[Z��X����<a\��Qu��HWWX,"
b� �JES��Cp�E�Q�׭_oO�k���AT�zdUi���-h�W�&'o���;���p�!��Yg�v�&>��>##bb��4h�@8�Ȳ�����G��7
-l�\��@�o�'0����(KA��B�j���� �55~r�7
-�!|Cyy��p\NJ�pW *��e�~)�v;\�(�C8A@������cǞ�*$���߼⊇��x�4'ecIp�W

����I�r�A�İ��鹓x���2F�)��X���B4�1)��<1�����†nG��A8��������}��;*�H͟��	1���r�!9j��'}��塀�2����¿A��ȡ����2�})--���W^A菟��TB��_�;R[[{\�DxޭV�ɧ�}�)j�,&���F�!'|qxd��RT�Q)]����
d
>�E 
m@O������ ��b9��w
-�������`yJF�)9?
����wu&R��n�[xvTB��qĖ"A�c_VVf�%��s�=���|
-q��<�4�y�	Ѵ�%<%8"⠜��RSS_}��g�-`����3)))� �=(<�b�m
F����? |I��2],�n]]X��x3�-e|E�����a��bzj���DFψS��'=�Jo@o�WU�
����Y3���HC�˛o�G��ӯ�Cj��Ao��Ԝ�����};�[�,Ҿ�`�~���� ������ܿ�]����һ4(�d��P��Ë�;��Ф�'˗/����?x�9��]\\�:x&��~@m���G�VV��45=��t������&�,4�)�y��Z�o@C�����'�8w����J��f�:\�=�0Nߕ�{��L�7[�Q��U�m�P��ձg�{�0�����Mz>����4����K.I).-���U�GG�>�Eoݺ�%���IT�W�NM�+*hi�g�!����RQY)�����Znk�rr�QW��>��	�%08�5�;OMO���w��o��fbJ��&⁙a�W�CC�mrZ�{�3�uW
-���,$�M,����V���b�z��ٗ.���W�M@���УH؝g2�8���� [�II�o}�;��}DK���к�@Xx��DR &&�dTT�ӏ>��U;K�"etx�z�����w@�!�~�/��cR��lw
-$KQ�d8&-4�i�.hӡ�ZF�ѓG�w�|H��^m�t8����}8p���O������������@��p��x���/���/���/��8p����?=�΢��g!��Ī��z�?o�>F_I�e
��}] Yz�~M�m���m߽{z�]�Ν;g#���`?e{���k�d�—,y��>,,��LN��W^�6o�3��e�Va˖-���P�6h+��x��V%n�������>8)��k��^51!�Y�VX�f�:Rڠ�����RO��B�Lou��
-�����-��<�<���R��^�R[��T�6h�x;�/�o�
-TX��Rĕ��ޞ/�O�v�@}g�PmW����dqv�����+h�U

x�U��Y�/��}��\���
�$������}ZQ�{����`a�v������C��칻�@Vƒ/�H�V瓥�Y�P�`c{;�b��^���#b�뻻YcW�d����A���MM�Y�2{�]���ᴁ��?����z�hK]ѻ�STWǀ�"�c��A��@g�+����\�β�&V�Ң��KUt9h�j\�2��0��C���]ܡ��j�V
��ۓ�"lONE˱���j����2ln!����1�X>u)M\UD�����ې*�\
-d��1��C���*�bs ���ez�h3]��"J�=@�Z~{��a@o�
-�l8�_�h߯�Dja!K��aYj*K/*b�tUFD��f��hS�=�>6�0��,�
AAs��^,YJn��C�ŤTS�*�8LLN���'N����$b�I(ّ=F�&��T .@go�K�����v+x��wo/ђ���7�'_|�pKk�&DEE	�a�	�4�_^�n�!,�M�(�L�oc}׃��8p�������_���_�p
���@�/���/���/���/���/���8�]�mIp�-4<���x��[�֡!������M�l�tB�O���i�]����ֳz�m`�۠N^�	�||?�s�F�������<k����<�lh��c�ֱ�M�Ĉ[�@��Ț�@au5k��#��!�P�X*梌���+Bd��^�>
-p�oD��\������`�m�w{����y�>H�����r���8p��Z��'&ؚ
�ݽ����[;�����Pj�E<�2��fC��k'�f ���	Iú�f�+�5G
l���}Lg)�F��K�Q*�	jIdͩ����E��\�I���g�>A=ɨWS������#)��(4����n���e>��ε��3��"6#���Ώ�����2_�Ω��b���׾vScS����(�U
G93PI���
-���}�+_�uZZړ@�F��
-8ʙ
��ʀ
-6��E�4ʩ#��Z���(s87@–JJ<&!~k�
�#^5�w�os'gĭخ��k������Ev�uSS,�h����
J�-�s(�jk�G.��B�eAJLLN�	W���

�����@�st����ee�W���H��l�~/
	��,�
��59.����Xi�.^���=��&;!%��@�2��Zt��\'������p��?$82�)�!#diI��b�~xB�^L088�rF�*�г�I�B����Ź
	����J�W��a�6
-��8b
-	�Q71��#o���1y�������+�m���{`C	�
bdc�j�O�`
-e��"c��؀����D�ʯ����v{%��!
-��M���ݎm�P���.O툇�h���D��?��n��"���zG�G1R�NX�<^��#"�A�Y8��
-B
Q�^
�![�Crn.��!(,,sUXi�!�ވ�!Iu{P���F�}�b�11�cDT�'p�)��s���8p�+�i�c:I�PL�[qF�K�@��8�z,��CC�����Xj���)�º�T�����vK��Y���hU�B��ɬ}},���3/> ���E��+ Š�
-w�tx��P���:�[/�*���b���]
����˒UV旻����JV��vی�~d���+�fHf��EEj
- ��~W���,)qT���\��AR�u��n���=�7(<���a6fwѺ���@Ai)+���¢"�d�&{����b2�R����$��4A�R��l��%���N�u���ܗ$���q��у)))/deg;s�L��:7O|v�R�oJI8O�$$��I7�tY�)��qL�[	��9��L��lD�R
Su5K���A�(�R�k�
�c���V�e������ �SLV���415�xY2����̒���w"�R
ZYdz��
-x������<��3
-$�L�(�-Dgd��11�V�46�pLv����4$�,��;?�_�8p����a��ȅq��;�X� �c23o<k߾T =���g��W���/�1��w<����{�
-\j����b_��d�[rJKg)���
-l߽{�
��6쾵:�5�����ܽ�>�#SRnܺs��~�{�@DRҍ[w��
-�����7nݪuhs��ذe�,�++m�UU���55,;?�'�NX<g"�nؠu���������Ͻ��f&aj�k��tU�v��k��j����{��,��-I�&�\�u�A�_PL]}=��;�;��XLRҌ�Uk��R�TXhS�1���ȷ����M��j��9r�h4���k^�?ϙ����7�MN�wR�=j-3���������'�g��CI��ի��H�V(�cbn��:@��'s,&�FGg)���m���-�wNn.��[R�]���o��:��Q�

�U
����V����@pt�,�)�Ft���T .1���c���=�����R33Yh\���������>@o�-���>`X���$L[������oť���`&�,�A����p���8p�����|
?_� �f��>��
�`�tW����9 �5x$��8_���|p�gp��`w~�U������VP�T�g�H~�1�Y�j���|
=�������b���/{��'�ϳuS������KJz��������:��j��U.P���R
����(��w��6����~���/��8p���8�S�3�GLz\NΩb�F������S�,��˩V�~B�����m��9_�����
s' �m��ş)�ߊ��NY�[�,9���Ǡ�A���
�P��������S��p�>}޻R�g�����S�T�0���2ホ9��z�p��pԅ�#	��QFq��	t��;A3�c-q�2KJNU��/�#"D����8BG�=_����/q�"�:�8�*���!L-(8吉�I�l��|��mw�-���|jj�'ؐ�+%�O6�N�(Fz�/8S��@qBx��>
OCE&]�
��%���ݲ����
-f'B�g�M��:�
-��2���pԅA��(�h<��w0��b��O)3>�C
��1YY��+����"��Oe��Cp��D����OB���"RSO�ۃ���}��yCR �dZ������S���&���`���8p�����a~3=;���5Qv�8�L]<�Q;\�1����=�^'/�T���ȾXm����Z]<U3;�|r-lR��CV����zz���I�&���٤p�8��udDWO�Lώ�h4�;苊�Xqq�.^�	��.���e

���L9_�^�Y��۞O�%���id�B��ײ�$$�Ԍ����p,C/�o~|��,Z��h�l��`:!x�g�¼�����^ uE�o�$�$��<��.���8p����y�Z�
��h�����~�̺�_�
w�SRªjj��h2J��P]����
-,����&��Om�Ȧ6l`맦���7�
�6�<��1�]CUs�g���+}3��J��fA\Z�3��;�%��O c~A
b�0w��ǟ�N���Q�R)I��:�U�y�UU��f�'��
h}^���f����Sl~����X*���<���u��ao�I�,��Y�]V�Z��Ygw7�����O�.���y��[�rr��/���/X���GF.��@�W��?�s�,�$,�'��,8p����.`a�2x���/ �'�t���<<_��_���pa7�}v�-�mH��8�6l��z�'�����_�=�Ƞ���Y~��
-|���M���^����������s�8E���4�#p��/��O���?;�����~�.z�Ȩ�_����Վ���~��8p���G��
-�W��¯���
-d1��.����6xq�@s<"�~U_��g���K~=�����sdA���ُ�K��G���#|>�(m�]>�5�8Q��/P��y<"�/���8p����?��K��^��?%|]ŸJe.�	tЗ�x�^�-hԄ/	9�78ȶ��!"~�̥R�<O�V?ݾk;�3�Ν;E�o�I=�_2��_߼u+ۼy3۴i����2��}��׿�f�:�
��2ԹT�]�k�μR�}���z{�ӘOLL�u$��(C�߇�7�KK߃IghhHD�F��C�	�hkk{�d2�
�o����		ɔ"��		��yY�$%�oJx�	�����?
�Yfn.3j�L��U�iv���Q���e��4���y%�o����029����^1{x/��+�F��>Ⳳ^���^Xz$�o��Υ�qq,.>^����MM��ﾥ�e�_��(Cݼ<
�##߃��b����(�קa}}�ӡ��o�?
�Ӑ8p�����'=-+v�����3|f���ޯ�e����uW�{��s�{�.~�YO������~(�-8,���C{�^~�Ϟ����u_�<��뮀�~}��~]���������4�j��OC8p���8p�����!���*��н���ߴuu�:�� ڠ-h\p�xhtԶv�[Za�M�g���Tw%t���ڇ�D�K	�k��lVRb!����m�.-
-X��lu����Zu�ڠ��:;muZ��� AM{�
�`
-T��ڀ����ۀ�@jA���S`�C@Hs��y\	���N����6�FD[g
-�.�d��++mVZ�rr�o!r�SP\l�5�N
�d���l����R��)��`KЈh��@Dr����ږ��gK�߱����?�����˦I�M4]H4m���
-�3o�ILF�-����7'� <)��e�����p���ͯ޾����[88p���8p����h���lS���302b����Z,s?���~������ѡ	�4X�����每X�
-X�V[�����
-�P�������9 ����VKà�@um��B�C���
-XT���6�˗ۀ�@I}����������)���﷕P��_/������ĖWQ1���?S���ϕp�ؚ����6�����WTW�r���u�+́t�ZLwv~�
Aflv�[;����̴��������9p����	��\V�d=cc��
Q�62��_����h�dT�%�lf�SSl
-Y<�~�6�z5~����4�U�oȀ�9CClU��_�	׬Y�,���Ŕ~M�K���4�ݨ��Ț�T�v��Y�f5]�?�(1��o��
h�C�2��h[����ʍ7� �
-f`ŊO��*�`h�I1m�<!��P����	�2de��\�P�Ժj͚O��F
�7��L��2 kUso/�.C����I�v�Z6�	]����ijz��g�
�*�/�oȀ�9�u�iHUUU������nRF���qbF�/P~
�����H>���
�5�:���?@�4�'YYY�uww���qQ{�h�81����(C��4��O��Ț�@aMͽ�w�m���'w ���x7�jF�i=�9ңuh���
-xH��x�����ń����ٿjnnf�4qV��hjY{Q�:�A[ЀV!<X�}���ʾ����;v�|577W(*.��f!U%W%�P�6h�pW�\-(�j������^%�+�E����z�W͍�b��"��%͙�(Cڠ-h��hYl�v�m�C�M�X+���UUs@��mAZ��*�r��g��]5B
-��A���Գ�RGb��m����
^nd��J{�ظ�jiv~��F�j��^d�X`:��XAu�P�:���-x�x�7d@�Lԅ�DLɯ����gX�	�5����U��:}�m�4��O�����)�;��`9&RF[�Vf*(8����~���m�4r,#Y d����5�Y[G둂 
�d�'ڧW^{�SX^],D��
ڂ��1Ï2 kqvI��} �e#�&''瓛o��	im�q�@ڠ-h@2?��ȚC�d���D�:%l��������x)���[��-*
Ђ�����%^Π��J�P����&�,5��>�}�
-x(yBF��B�XT��f�ȰN
-vXM�M,�?L@Z�SP�ȚK�t)��d��ѳ0**�EP�Ұ0͟fh�:����'P��=��{�xY������g~���8�~f��-�b���!��?�����v۾��m��,DY�� !��z�W����l���޳g��{��Y�2��n~����+Y����7�m�V+�H�Lۖ;l;w��o�.l۶m�uh����ax�xjU���իOoݺ�o���$1I@���Փ��ڵk]"ڠ��@x�xJ=��
+
IHDR 	�N:f(IDATx��}	xŕ�X�%Y�}���]sHI�}[�-���s���,�MHvI6�l�O�IBB�,!`Np¹$@ \���6�q�����#�F=3=3=I�}߳GU������~��=������p�𫄿&��o"<��"�‹t˖=RVY�Z�����۹{7۴u+�_���f���)���0Xk�;�cb>\?=��9�\�o�>����ڵK�={��3�<��}�9�����,��h%�������"�[�7n��֭[Ǧ���ڵk����٦M�������3�`�~YX��v���#"��_S0��իW���^V[W�bWWף


�	�


�JmٲETt5)G����>EW����ccc�h4���+̅�GGGB1���͛�N�555'�G������޺m�x哓�����cǏ?'	}������`pp�A��%������s��uw�&�+����n���I8 oH�^L���byw͚5lÆ
l#��.4�z�FtCc#3�L����}�{�{��Ը"��Kkjk?ASt��:R">+�i��?��?T}p��s���sǎ{��#G��W��������&h���
���Cqm��>)@����0�.#/���t0fF���UT�U�X�*'\�l�w`@�^�d���w,�s�99#�o����##���̮����_ ��n#�1>%��8]5�����v����z��!8����S��嬉�W�Z����JKKO���/�́P`u{W[O�+���*Z���IYTT��-��z/	����c��
+(^5֋����}�?�paY��d���
��D����W����z����j���ȸ#�������B��$�i�8F���F.JLIy��`aa!ކ�D�@xaD�'<	9��(=v��G?:$uy肽����^;অ~;N#����_�%\�P—/	�CUu�8�1r����q�B)�Vo����~�%����t���/���E���C\|���	99�D���N��:QSS��m���׳��
+�[^��B����g�#">JKKc���,���ʟ[�i�V������Gy�O�Tܿ�
+��[@�@�x��΁8p��	��Ǹ���P`gXT������TF�g�{���;	@x���F���/|�]x���}�]p�"�'<�~vƙg��M�D�$>ό[�Q~�0Q�8��s�g�����3�%�����;�:xL�=�<�k�NPh�3D�{H���;ٶm�D<�$}}}�W1߈��D�6P��f��-�_�;���a�'���GȻ�	,ao�~���Ɨ`���=Os{�)��;$?�%S[W���[`33/�SJ��
+R����F���5�Z���F�fb�O�e�i�k_ljn>�%��e�f]~)�Y����=165Wjx�C�uvu�rx�p;hf����{��R�	+�,K����GI�›��!��nGcs�c�3m~)���9���0���?���I�߄O��?�JSoZrna����>A��&L�K�u�A���
+��U�Ԉ^��	�Y�%ԍ�������%������S��P��a�Z�@H����#���a)�߫�������}�E6b��]]]b��T��G�p�k��t~�wN��q�4�V���믿��o}�[�\y問��8\SS����-���"P�S][E.�K�Qb�+�_����Ņ��z����fQQ�nS���&k>+0B�農��a�K]�/(��dx>�w�����5�(�������n��`�+B�bn�wa�
+!�����G1F�JK
+\����%�����q7ֳ�Դ�נ����DU[}V�3��������

��1Cj�Fv˝wn�Y�^b�{�0L7���5��0I	۠������ii�~Ɉ
ፍ�,)5�oxX��@1롮G��Ĥ�����Xbr2���aմ2BQ��K
+����/����g:Ip��
�J��U�񁫆�oI�r�rH�/�� ^X�Z�V��+r -FsVs�i���,��w�{
��R ��9..����*ᇑ�ѯ&$$<�����w�~��lq:ۯ
18W�
�(^��;9��� X�_��k�M�j�AɁ8p���C�
[����[4�������1X�w����="¦�@�w�o���EZ�_����>��Â_
�0��7��8��}��z�=�|�>T4�eg
0��r
+C6�J���ۙ�lfٹ���˴� �)}��`���!�>����v��ҥs����?���#�$S.�W_w�MN
+Tl*,_��>X�E3��$l�|}��bHSk�	�i�
+}~>��?�P
+4o��0��DSSW��&������t�;������X� �cRS���ǽ�t4Ѵ#���PW�����������dY998r�B)`���q���к�_����~�r�p�+��)� ������|��������M��Z����t���fdg��ޅR�#��fٺ��{y���ZE�#k��ľ|啷.ثPHt�-����������ѓ�%��h|k��
+�_a0�J�-�B'�w��;�+9.�%�}�����������k[����pl�'�����쬯�X����T�HJz�����D���aC��3��z�����WXȮ���봖_�Y��3p��g��?Ic�˚�1}�����˽>�!�f���8p��!���kC�"!��!�Nz�;�Yg�̄
�a�}����^����u����&&l��n��޻׶u����i���5���A[��l���m���?��
+�_Y]mۺm�
g��q�̮]�f�o�.P��u�Va��c�Ιݻw��ݻ��;��S�w����1	*jj>&�87 
+ڸq�055%���!�����/�?22"�^�ZX�n��azZ��z�d8�u�vl�6m�$�]�V&&&f���Ϯ��S=�Щ��G�.��r(9���&����=�>���+�n�.޼y��a��*/�җ`����z뭧Z;:f�U n����4u9�����o?��#��E����pb�(Lr(�׉��1鞮_�^XK���}߱{����	���0ʟ��T�FattTt�)²��:����;��(�5J����[�PB�
`��e��ڂ�°_����O�j���׎����A|���b/�vLOO���<�n�z[wo�͈�'/�q�H(��&J<x��w�/����Y�e���c��Ν;q��Զ��m=�Rf�2D~��~�ûy��a�d�����e˖	���Bhh�.DFF
+Q��Btt�LLl�L8�WK��r�wR��Z�����ʪ����d]]�X,B}}���-���l������NahhH�=�����L��`�
�hQ:YSWwR��v�]�?�i����{�9�M��j�����ĺA��8�=�N���sj�����x)
+{���W�3�Dw�V4�p���8��)n
���U�D�H�����8g�%�ʄ#6��M�f0.��BO��B68>n��*�lA+V|B?q^��C�
��4�n�����Q�s�9xx�2��hd�t�T_o�OI�� �ܽ�vv����1&>�S��D�#���\��7���=�o0m�.�!��;;m
V���h�����
+��lյ���������S�������]��+X0o��y��)К 4�kmm�=
2t���]�L7	E��"Bm+I�$᭿�
�n���\��������rss���2��2���@�	L=��$����
+���3/���M
+��T���O<����.cX�i��!�3P�!�w<������W_�I4���x������]!OJ4�Z>�q������#�!3�q��&����R8p���8�#�����~X�t��:�=�ݗ-�n]Cm�7z����!!�#��& ��
G���;n���;;��$Ae��W|P��rd����yėA��e+V<��Gj��,,���>��v��K��������y�jc�26�o��fH	����+.42�0⒈�q�;:XCG�k��VIy��E�]�T��xL\�a�@x �A����h��-�ΐ=��.�1!�t�.�^b��L
~#�CUU�#Rp�K�P�X�%%%�=
���?!��+���q���eZYCf��^x[��������[{�NJܒ����#֐ۺq�凚�-2��u�q����D�[z��!�;����ߎ@(�g��/-��Z���j(��*&��1���8��uh��VE͔�v�t���S4�p�+��D��?^-��G�E u���Op�0��e���{�g�h� �K�=���r̎����+�ى�"�b%\���ׯRRX2��ed���b�ETz:sy���wU�#*;	f����H����".�N�����
 
-�����C��N�����jj���z��	�m�V�<
^�	�n�ln�nln�𻰛����9���
^�	�n�����&�0;��#��	)d��P�����x��[�[[�
-�U��Z�[���oFq��^T��u��B����TK
-�( ���
-T��	@���a���De|X�
-U4��x�����18hk��5tw�zz��J��	����Ρ!�9��ۻ�E:��YVf�j���}D���tg�]�]��^��f{	�-uA_��(�2(����\� ��3�Uڢ������A:��T���0v�

6������U=�%���Щ�UU�������Y{�zЂ����t�@^e�
�T���N)Б^Ea
�T���
-[�b���W75�_��Ņ��L
-@���_�C��m�����\<!G�l+FFD̷oz�uJ@��6$��sJKm@���W�����o��N��#�#P	F�ٹ%%���PC;]eO_�����II��*��Ny�
�.�
��g��:W������YZZlu��6CD��3
�7�P�T����QK
-B����)&�
(���hK�˛�tp1����R����{�hκ�"�
-$�@���U���6yv�%�	
-�efe�.�� p� �h���Ey����!!���X[\|��k֬����s�S�FE=�����V�-x�x��;?֩O���ᶎ!,,L��M!*:Z�v�h���
퟈���3��%�v�*v��;���;/�4}�K�2n����8��6k{~�طx��w���l���/|��|��|�7���{��Ox�k��L�:�sϞ�]�w�v획T�:�=s�M
->�I�<�,Y�2��Y�L�/`[w�`;v��[�n��(C���A��Z��
;�7m�|�����{z��\����6h+)���RO������z����?�h��`�y�	���Bmm�PWW���C�U�mO�x��[`ӯ���u���&Acw�Pc���/�-�r��k�/��Z^����T;cV�o<K{��
-�
-iZ��4�!�����0��n��v��A��y-e<hp�W0�77@
-Ě�9<̬������3���F�Qd�mm��PJ��ԅY=���Y���C
Z�p���Y���7�{�-uE�ά^TWNJ퉳e���̪m�l�9���B��ڷw�640��r�m����pgV�6�|��vjˀ.�ͪ����
�>����)vǃ��+B�R�#��
�>����*6�c�|uS���%�1�o�f��m���v`RweVϢ[Hy�y����%�EEl�Ȉ����ӗ�N�h�\݆�@�)/w�@fi)�"T*�I�M!���H',P�:���T��PR"�p�d���L���<��vl���ϘĤ�\l��P���r�f����y��	U��ȢV�NW����
--����"".�iH�Q�:� MW��.Ù^(��,^��~5%RL&��LLd�yy3��
.A�8�W{l��WP �gf��� 渒%�����b�&�v��Uxq���<�Ndl,3���$�,��x�W-x�R V�����.��8�i4z�W�������^�%��3�o2�+���
-���Bdd��
�-h@��¯�ͫ�+p���8�>�('���/hhkc�������?Q�`���N��w��6��;w�Fl��:�^��چfil��/ؼ};۶}��e�Va˖-�>�C��<��gAKo��*�֮u�/�:�A[I
/�&�[ݽ������J�b���Zu�:�Q��'x�U��j��kl��_���V
l������jw�����rW�����B�`Ӈm_w::�"�|z��|�����~9_���W?�?�� l��M��k����e_|�CC��ة���h6�&��q
�F������S����(s�p���h�_��;��n�����z�Pw�55���Vf���C��o��.E��-pa5/�gЩ���5--�F%�Vz��DG�J���+$�.���r������\zL��C�������z���z׻=_��Ƒ�k=���T�7����l�I�
�x��֕W>�����πN�<Ԅ/�����]p`)��^/ŠupD�+%|�YY�D/9.�$��Lb��I�c��cq�������|�����Ƽ<���o�����/�/��p� Zq�����p���8�����������j�������/�M߲�����=��4��=����t>_���|�K��'������W�t���~M���Wpk���_��]��~���Wpk���_��]��~�C���W8����+`ӯ��P=_�g����>l���)�G���c�
��a�W;_���f������~�[�|�+$�: ��|��~gJ�=_��_��W+�W���8p���
���
[����yr�֭l���"n���v�d;w�FH�ϐ�F�fE�
�S7���IDm��F�����:::����������D��$��p	��#�T/�om=������P����y�޿TJ�7.��{�@i��D}GFFضm��u�񁸷��(�A�+GLLL|y�����苌}<x�Z{���9)���O�<�Pdl|�Y���'A_���b�Z��u��\N�\U[�{R������V!���,��/���~������4
�HyժUb�κ�zv��w����������������3��F�]���QI�ʕ+ūokog}+V�>7�]����_�$��!�1U�u7�t�|\}`yM���$|H�w�t���ŧ�ꯘ����C�Zdmmiia9��"�C���IIv!9l-۾g�=^-��BdB�z������EE����t>�>���ᴬƞ�r,-#Aп��9��\�Þ��(���i������VVQq�(w�����_$��;�I��l�Q		HԻZ���K����X=�z�[k��a_��7���1�t�1?��A��F�X�DJ`h�3���@�E�5��= �H\|<�����GD�F����#<��W_}UYY�)�X�ݚ%�C##�GY+����>Gm7i}/����5*m���7��`aQѧ�t��f3���9�9ᩩ��S��	�@�؝�E�GU�O�;� ��fR���֦LW]\\�I���6�0x�	?���kf������w���}��;�ՅHLMeɄI��,))�%: �P�6h먀��O��H-����I�?=#m��]�����孶$8�izusggg���/~�^�~f%Eҳ�]g��Q��m�����+�9xWx
��/�r_nn.�b)��P�_��j�ӳ���m�[�u�B��/�J|�K���b�{L��S^W�$#��������+�/�IugC�K/���,��q(ſ|9p���\��\��s
^�}�[!<0����M��(��DH�
e> �ֿA��[
7�Y���'�{ｧ���2��\���~�^v�yy������#G��_��e����	�HH�Z$|eճ��:C��N���5�����5R�g��%�{�h��뻺X��1��+"�;�B�1��u$��{zv9��͇5���F%
-�,���3�aS���.��U����oCP��̀���������?����?CP���JT��tv�(��g@w�~g�rE��)�l߿J�����W)�����;���ql,/gF��r��~S�پ'��wG�ve�gO3��U�ݫl���L&�_P �IMKc)2���Q�uh�����)�
-d�( &<P�+�U�kqq��O�xZ�MmASk_�nP�
�Jv
�)��y���������eЀ<�(�`4�Yi_���,(C�\��򚩰��}��-�3׃(4�
's�56>d��
���OVX�ef��y<77̷��TO`������CM�?�FD��	)"~�u�v/����������ڽ+�4�5�:b2����x��(C�C����'�#"�D��2`����4�U�S*�,9�
e��i�Y�Ԕ��!��;��
-N�q���8p�^�#�����gܲ���:;_��oC�f; �^���ի�ڸe�Q���ޟݸکM�Xii�0��eRO�W�
-�����~��_�:�
��(C�v�����<��@e��M��b�AG��P��|��
�:�;��*P���e�j
-�=����Y��
-X�::\��>� j�+P���*TB�T8)�}*4:@�����+�Z��
-hu�8G����]:@�Dd�����?�c���3��"�@Ny�&�#$Ӹ����ZZVK��`i��"&���(�-�Q���k�S��rQxem�[
V�x�6������ǡ�U�6h�*��6�=q��%n�
��(==����yG�)mAZ���ϐ��e�����JH�������1#����G��c����Zaq16�x�
h�C.���z�ھ���?�us�Ԉ~����Z�Ђ���VQ�P�-��3��FY.թ]�������L�����D��%dg�xD�2���
��CHX�ۥ44ut�@�F����T@�P�'�.]z$4,�ٲ�PUDڠ-h���!%%塠��7����P*��@��AM	��Z�8p����
��6j���s�{p��$�廭���vt�����H�8�?84�V�[Ǻ��|V�#}����o���WfRDh�) �%����o``������j��Y��,4��
-����޾�髮�F~�'�����
-\���Ǻ������*���
-��ww{��%�A�:����������*�H
���;;�c~��cX�5߱!		���w����Y��
Os��*����ۧ���t�81r�UW��@�+���+~U��P�tߚ�E�_�|�! ��8�qfe�G��G'!>�$\�b"�<�K��V��4���QH�xٲ��� �r��a6�56
-eV�#A������i���`f����
-O��^�P�((�nؽf�#^e��3/��qr`h���	zu����W�u
|��U��B�"�J��J]%\V끦��ܠ���j���a�k�C���N�M=)���<K��j�5��(�.�
AfxL̛x���Z�F�����=3.]9:*�E,#CP�+T���G(�̤m������[?)04<��<%#�9*OU!�4�L���\)�������Y\W�,�uE�H#aQ޷aa�[��l`�y�$4��T�� I���+D�m��G��^�*�#��"T87��pKg�G+�7:�������v����vL�%�����f�*+�<�L�����tQ/�(>d3�Q���w��
�\$H.(��{)_a
����F$�-����l.+s� �օ���?�D�/�9>�s�Υ��M3e��}%%�i��G�S{P�ª*��LOH5��r�m��@�O�*��
-1��B<d��>!x�xj�/�	<Q�] �����8p�޾�^��t��aۇA�~W�|
�g�
|�(
�>l��|�!?��=��۾�o����%�������{b�5|
-�����,����{hVW*
�|�1x��7v�9J�p�ǐa�����
����\	���.���
>�4�pYV>�4j��+}�,r�|���������A�\-�T�<���`�wB_|��+��w�
�G~MM��	����W3�f��j=�
��K���Y�t��������0;F}=|�!����A���+?A�g�@l���K~���	���Ç �d�-P��5>�z6}��E#dP�+����3=|
���C�/
m�(��
�>����s�M�V�
��7���;|����U>(���-�ǀ�>�'=�~�ұ8
-�?���&*H��;���
|
-�-̬�t1�RX�
��Ms���
��f�_����E�P_�=<�Bj���'��/>�,Ep�$?�;X<�n����	8�	�;��y�o.h���H�
$�A��f�F���7��π�	����	8p���8h~���/��<~���/����~���/����~���
�߀�
8p�������/����~���/����~���/����~���	����	8p���8�]���	�'D�.d���)Xe*�Z�0������P����*���)�
�`�TT�ⓒ`1;E�P�Z/��E���Ѷ����m��&''ي+Nwuu�����hkk����Q�q�&�{�n�jb�E��ۈ����3O �𧩙�l���l�]���j��v뭷>L�۟(^���;�↍���?�a��{�ѽ�(0��=����0R�!F��ʆ��X���G��ӄ�	MxT��[o�}}}���걭�c99�VO8��tu�ƍ���0k��xP�"a?a��GM>ᷠĉw�}����C�֭[E>Q		o8ؗ�BC��|j�Ν╯Z��������[	��|]
C�����C��֭['*���qqH�o�I�+�����W�S���q�==�sϽ���܃O<3�q���&')#*
"U�sE�j�4ƕC���qVSSsL���Q^:j��/�+�����255�6m�������*0��)�rh�f��@I�����LOg1ф���g�nni/d�ڵl=)182�^(W7ӕ��4I
�1��������Y�7�1�]XS[�FH(�
-\�ZR��6��z�OR�իW�Z�6<�K_��ۅ��,)+{wx��0�'��@hÕ�&ͅ_��}P �����a�
�/�����j�������+f����9@Ug�������~��OÚ]R�OM��r��f�J��z�.��A~pGO��QI8VSLʫ�/��������Ul(��r�
-4�Q��b0����2V��T[�����Ji����@O��sT���t�OG%���Mī���w����Isy����5У�(&ψ����^�O���9�R�zzt���B<Ȑ�6͙YH���u��I����
-<�=��EK������У�55lyk�����n�_�v��������,��������L�?�dÕCx--F�))�If�Fw
-��iv������9E/ wV���X(����]k��8���sz[b���,55�	�T��������q睇���ު��`��v�O+c�}��ej��������P�Dm������>��G�`��X�4$�/a��v���m۶���ݏ�А����B�:̛��FF�����?�����!<n�����)�I�~\e�ҥߗ�êH=�r]]��&l	QW����i���It?�ޞ��UM����Qx�Ĥ����	�[%�߄��Cԕ��[�P/VUum�#77�����C����|�,Yr{��$UzcUU���І��-S\RŠ�]�����!"������}>�c�c�`�������x������L��-�ُ!�/$$����cccg0&&F���ȏ�CB^�̓^��<�DO�_������7w������M¿���c)����$��́8p� [P<���B�
�w��Qy�P�'��L�6l޼&Ta˖-�	�P`�PX �6lܸQnذ�%���ajjJX�n�099)�^�ZQ�6z��l~�����/�G�P]]=Q����!�j��m����S��	q��V�ԫdB�allL�44���+4WU	@��A&dF�DžZ
��ˉ�\�q�� �E���OHk;�,�t�k�'��dB�ax���!_����I0�H�dB�a�n�Z
=P���W� �
C��B���M8sР����v�	�,}+V��E�;8(�ڣ���2G��U���S�������$�@����f-P�v�	ن��^������UT\,�j��m����ܮ\F�ԫdB���I�����B
�W;��
-4�%׺M_k;ȄlC;M�|�W�q���v�	ن6�g�4(�-�Z��km��-*`Ҡ@]U��+���$+���IJ�ѷ��	h9w��dB����Q<��n媢W�*�y!]�A&d����ㅘ�X��T'�j��
�z��V.?��3&{��@�=§ܭ`:�S��n���8p���W���Jxዅ�o�sI\r�k7l`�@�!(����&�†͛Y�}��������8_�k�.�y��f�:�>8��e�e��B�l��px[��
�t��w�-^�"�~Ȃq�
��e�v�w��I8 �&�����Z�
��(�� ��33Y4}�$�1�"��0ͫ��88�AH�C0����J��7�=�pw����*Fs�a����D
-:���8�8 �3PC����W�c��]�}�;4)PY]}��q����� v���<� ̴I��K� �'|Ƙ��6�bg-��C�WCԡ
[��=.BT�z'�8o�+�����4�+,,����Eܤ,P"�zzzڈ[}����6qO1��v�Gp� 93��Jr�v�c��������W�EWڨ�D��C���o������{�-ˡ����L&ө*����-���}����b1�%K�{%eeb?0�W,+����Ɏ����72���26l��B��܄���;�e)�ރiii��;hfCtwVn.���<i7-�,��p�5��cYY��o��]��8ܒA)�5h ��.b��E	�!b�nA:8��Ym6���Dp�t��űCA�b��$��w�C?�������Mb?O����t�k�×�^��x����]��䌫��O���-����f4͸�^�����t:��Q6KM=Ի�o��5���T*u�ps��A���u3N�
-���Grm�ʼŷB�E��@���;++wyv�]6�������?�G��X�W��ɯ!뷸Wa���s�O+��P˝?cdz4bmU��B!�B�ir�x�
-��O=��	�pD�K��U��Ng�;�!<��f�Wҏ��M�P���}۳
-�`~T��p��5�>�I���-О`?�g/N��H��x"1�J����q8\
��(�@j�k�9�Y�d����q���G����A>��0~���@ߐ����(9٠9q�	^?*\N�e��#�/��������������'1iU�}^N��b�`xq��O ��Ad2��|�M��>�>�>'�D��d���������|u����L�ئ*D�{A�X��˓������p
8
��W@���S�s	�2Y~�s�=����7p������9d�d�d�d����8N�س(��/�6�Q��L�O�O�O�O��;�������xZ81.�G�[�1x�c�v]^vu�|2}�}2~��7m�?�-g�;�!�q
-�{�zP�0�D�,�L���m�3���R,�SO��[hA�����l٥g�;�!�,�@��m���0u8���i�b�띏Pj��;P5b]��&�B!�b6�����������!�B!��E��ԏH��ԏH��ԏH��ԏH��ԏH���B!����N�?�T:�F#Ҡ6��씃��zG�q�n��R��
-P{�b�g�6�\@m����K�Z�f�kc���;�����"_
�6�6Y�Em���o�+��K�D�:�s;�ڡ�D�S��B�@�O©L@!�B!����1�D����IEND�B`�
\ No newline at end of file
+Ķ8g��Y6��T����׳��B�
+|$����>�t��W�o�~�4�!w8ȕX39y߲e�^�+,|�� <,ks���l���r�;'J�E���L	9��i�m���r����J�Nι[d$%`~��'������x�+����n���h#��X$ݺ��ϡ��V2W;��@Rn�;���ϸ�ޮ�AdJ��p^G�}�B�U	���1����w.�w.�8p���8�j�BBt��0��@���#ccb��R��-�k9"���
ۋ���M�Ģ�
��n %�0��c���`ã�b���X,b8a�1ϫ�tk��c��lji��>������&&����P3�I������ڻu@+�IFQ��E%%���\�5:�u��k�1��>����g���8)�=&�c���'��c���1�
���ZyL���ZyL|V@�	8p�����@)ϱ���
+�����B�����qq,���rܴ�
���ccE�o*�Y���4�w�������_x�En�,)������ '�^�=��l���i��$e�)���}�N)'2�#!�_
+�
1$Z�IV�e�w�[b32n�"�&F2(�m��l-)��`�˞>ص�����`gނ����K���~�D�H�%����V�贴ۦ��Ģ�۷��@s_�h	��x#1�iޭt��
+C	��h��a�''E�4JW�Z����Ĵ�����K���.6�z5s$Q�i���7 ��O�S���@}g'���"5�F����HN�
ف���~)����[-��rX�U`���XT�Ǝ_
+a��`*1t����!*A���--b�Z�	��ם�����/��0��x��
+�[,�*���B�R��@�1���#�S~'8*S��~�(3���erF�R��U�����F$�W�n�W��z}V��dz�n���n��-.�GY[[O�������ǂ�s�c����f\򔈾#�
���pf*��ڃ
e��I?3'�v�|V��G]U^Yi���:dm���5U�a���7(�k�6Gf��R~�֭�7G���G���0�8�(�i��)��,%-�������Z�!����,DizɯBt�{'N�)>!�MD�;) Б��#&U��=�z������ߐv�K~����	�>�p��Y
�"��C���b��;��<Ѽ�ot>���o�����κ���yyy����_����}cc��v��C�/N�횽�K�nVH�w�F�qR��p����n)�}R$������82�����?t :>^L���X�;�>6b�#�-"��-xy�����p�ߏ8p���8pXL@��+�>��챉��0�H�p�ΞN�:{���:�?�-Tꂂ�2�׋�ɭ;v�vb�
+
}K���h�-[�\��̐�]��O]p0v^�̅�"
H�y�%�˾}�D�GZN��W���&�g�u����<���MJB�f��W²��#9�#�\5Pf'�%K��۴x���Pgۥr��0?)gfa�۩�t�7 G��P߻j�V+�$ȫ�x��u恿���Wvv��s�=.i��;�QJ�
�3:\6�¤ ?����Y��Xo7�g͡�nl|Dt4H�%t0��Jym[zz����W����)7.?ߩ����{Ff`fw��刲��!D����y����o��M��yߙ�����w��uy��?���g`�#����z�][[��.RK/�}�Y�Ҵ�����c��|O{�����oPGA_��׮m���€C��0H���#�f����7�v�PS[���330h��fަ�惸w�X�N|�
1;���\U�K1������#7���ފ@�EWo��W���K����Aẍ�#��
������_~���U�x
+q!4��i�[�s���T~��=*���
Q8L�Tt9#����gBpVNαAɎ��_��?–���b�g�a����{yL	�\W�1��;��fee!����胂�	W
L�0B���wK1�׫~&�X�c� �ٹ�����y�-��VC�WPR�A7
t[BB¿K[�Bn��-������RXX�n��cR���K��������|^�L�է����ggg���W�#��MUC|!�cefe�s�W\GD����A�B}^�{/�#�c�RC�;"&�EDD��~H�n�ڋ+|sIp0���H�8���mjJzNo��9٤śl=g~��O>��t$�/ƌ��A��/^�C�%R�%<�0��Qo����8p��	,x�
+|����+c+�
��DS�6�&4ц32"~N;#>�a�@����jm���KV�>���GH7:�_R��+k[� m���5�^+ڒ4S
+4uw���J�φW]s�0844���#�O���~��n�1�W��3��)a%�V/�+q���=��3+}����#}�������f|V�����1�J	���;:������v
�n����u���"֏��mm�d��:����FV[W�`���
V+�
ɼ�����eQ���Q�JyÍ7
++[[g2rs�+Q��"]�W75	55�Wʫ��Z��<C�W���j���+���M&�V��_u�Τ��xV���+�^)@Jԓ����sw=PN��^( W��n�t;B��:]+`q3������TYe�P���z�,����
+8�gJ���JJ䕖
+��QTZ����'����/,d9��,:#cV�"�Q���!em�;<EP+����*P@S�-��9={�L|�
?�uy��p��u94���E�ˮ���E��*/��E��,+��`Z��Y����ȏAZ��Y�z鬰�c���<|�p
����sj4���k�������8p�������������������������-p
�p
�p
8p����?5 R�Մ�~�-��V�B|W����DL_��FGD�q���>��K��^A��qY�9ޜ�^�[��6��9㬳����=�hjj"�����
r��^�_�"DL]K˳^+������#���UG�۠�tM��$� 
��T75y���~����7l��ؽ�e��!*O��ڌ���4
��+CSS���A�-����u�%#F�ٱ�E%$���f��Ȩ���"��""��lk����G��ۧ֯G8{�[�	��	��nn���%��O#m�A[�A���O.�E��o������))�
f��/[����h��u��:��
TO9v��BHJ\��+�|q)��7HcQ6���^�
+:���ҕ�
¿ �uWO�]��v��1"N#|�������K��X���m�v�,@�㶕���Ѿ�}�K%��Ӓ���P=!ӗz�k��‹KJޓ���j�P@l�S��QII�� �u�����2�}�������_F�k�TB��_�;b6��;����w��z�g�}��>�A��q�	_yl��LJ�ȃL���!��:���J��� ��bG��o#-������`eZV�IG~�oJL7G�!����v���sc���N �	B���J-�w�{�����[$�ɦ�@σO��E+�i�QQ��	_(==����y�1��W^y&--�eĵ��P|r�Q�5���"4��{�o!�R���խ�k�#��K_>�#�{�����019��3�$�yԛI�7�7�jkŀFM�ͬ��GV�!��-��+E����:�u����n	ڷ#1��ʢ�{��Q�W��L�׃�>�����ߝ���W,��CBNt

5(=����
+MJ|�r��{���C�s�=eee��gRz��F�NxLEM�)1/ASӃrK�[o��;lb�B�=���
Z���t���>������F=C���S����W��C!�ӷ�g�^�#EEEo�أt]�@ۊ[e�X�3�=w��GF�=��SS[�p�%���UT���*"cc��~���
+х�,&��y/��Ӆ��jZ��s�v��o���iu!!�[n�9yy�*����R�M����*�gf~�����o��frZ�p��F���}�������Ԍ���g���$�ˊ��7���S);'���i��/^r	"t]�@��^a��G������%��G��JNI�}�[�:��-Œ:B����G�I����111O?~�0bV}�*A����uꅇ����mBB‡���?��ϏK��r=)�*EQs�1i�
��tC�	�]�2�M�<z�-S�CB,@�*h��Lk���8p�����p
�p
�p�\	�/�������_���_���_��8p����z�9<2�����A���U
�N���3�J��(k���k������o�tulǞ=3�v�v��5�u:�)ۛe|^�x���lٛf��0562Gb���*�e��i��۶	[�n��T�:�A[�0<�<�*q���$�ǎ��	GZ���ޙՓ���u넵k�*#ա
�:����S�	V���7�{{��?�H|�v��:�<���F��^�d6+#ա
��ގg�<�ۣ�V�q�n���������=*P��)��08��_%YD\�)~G��UN��چ
�=*`�F��+��o]��P3���D&?�����(-���SX ?,��Ξ�R����>{�),�����8���`in�n8����:������5�������n����:Y��yq�%wCS�tU���̞t�'-x�l�)�O�필�*�
+w�����Z,(+R{�]�;	�5誾�db%v�ݞK�Y���j[Zu�.m��^I�۸CEF#�z<�{�;TXWǀ�*��a{�݄�ɫ�fy��>�
�y܆���Ko<���"VH]JWQ�6��D�vR���F���J��x��J���Ȯ�`9��*�lw�fD�HS�o��>��P��g~��B%݂����+)�^R���A1EX���2KKY.]��	Q�:���'�t{dO���׋��
�񠐐yW@/�,-?��[�4٠TR�j�8LNMKHL|;N���Y�b�M(ّ�F�&��U .@Wo��bb�
+�v+���Oo/�����7�'_|�pKk�!����a�
+�4�^�n� ,���(�B�_c}ۋ��8p�������_���_�p
�踿@�/���/���/���/���/���8�]�mYh�-<2��	�x��G�֡!�Ȇ
��͛m�5B�O���W�0�S_��g���ڵ�A��������
�cLM��N$^�i�c��`�s����M�_Ϧ7o#n�2 k�%uu���S��H��Ecux���2111���dzYP��)���q�c��|U0�z����#�ݷO�{�� �O����8p����g�J�?9��n�(�(���e��݊�!G���R�.�	ސ�o?�0ZX;�4�5�NHZ���d@�<���2���r�M���p�T��Idͫ����YѦ��"1<0���IJ��$�^I
sG3�#)��$<��[�m���e~��η��3��">+��Ώ�����2�Ϋpl�v��/_��͍MMbdv ~��_���B
��*h�>��K/�eFFƓ@�F��
+8˙��ʀ26+̢�*�X��T�,g*��
����K��j�abTR�+����̂��ݾu�<<����~z�e��SY��A���{e��̀~*p9�b.Rbrjʑp%�Ѡ��A����}�	��u#������j���_�D
+X�F���0L�PqP�+�q��4C���J#w�G��q�6�Iiiǐ����ע�~(�zq%���D鄅�}�a���O!
!KKFNs������CJ�bʀ��Ytdt��=���)Q�
��ϓ���Z�S\	�F���QXT�]p�xHX����$yk�%P�[QPX�iO���v�?�6��� F6���D�P��!2v��
Hm\�XO���š��
+��A���Q����
�@(8�nrE���F	�p�(�ГM������ħzA@�M�BdsqW�]�(F���	���RdTԵH�"��PBԹ�WB�E�U:������tJJJ�\Vh� 5b6�(n�	aѱ�������Y0.Ns���A��9�Vs8p���4��t
L'���s+A�i�螘@X��S�uh6�����j�=w9�Za]�+p@BW��e��onf�2�*`!�:Ȭ}}�����K�Q���%��bP���tx�/S�����[+�젃�E_]��^���[/KNee@f�]U55��	��&�Y���5�W��-��~d��*)�t��\�jR ���Y�j]P�s�JI�ׁj���s{`_Hd�U��l��uK?G��
+V
+,/g%�������1Df �RZQ����'`?�
�����/����7�������$�&��#G�JKK{!'7ו+�/�	��p�$�������󝸤��]�#�f�&��;%9=��y+�_�5�ݕM]��(�+PTWǒ�[�D�_)��NC��B�V
xY�1�(�������1MNOG&^�J�������$ǝ�H�+W�VA�����������.�����EE�(�+�fe��qq��V�<>�p\n����tK^^L0v�ϿP9p���8,`���ы#>*�M;w�;Ѳ(�㲳o:���Q��̛��uV@��?����v��'W�2��t���%c=*�WQ1G�|��P`Ǟ=shhn�a��Յ�
���%UU������vӶ]�f����g�RRn�*��+�	"��oڴm��1��{���ƭ[�(PUSc�����_�3Yna�_
+|��l�:D
+�۸Q�-��23���~D?�.����7����T�;��_#M��6�r�^���,��r-ׁ��2B��-��v����bq))�
+��^�v�E%%6%|�A�|��X�ݴ�dj�aaa�z������%���A��x��ԔvӐ
+�Uj����χ'N|H??!<��>�[�&��D�<a��<8.������$����PR`hll�ٹ�6�]������g	vK��Qpl�M�Á_\�
+ꁾ���*��}��oժ������Q`��o�@7�r��m�>�
�|i,=;��'$��>�1�i?��8�A�V�b?��8���Ko2"a�b�7��~#!=��E�0��`Q*�G��8p�����/�����E9_0�?_�Y>_���.���AP�s �t���P䃳8s��:��c���/@t���b��;�G�;��
���`nhPV����0J�pp�'''�����x��w��?��L
�/�o�w�'!%�A��g�����(m�W�@E��[T�/((P������i�����|
?_��p���8p���g�.�􄼼�e��L���'�+X4JL������
��$T���h<	_�����c'(�-�ҥ��o�߅��'��˖mp�c�� ����
+(|f�D�wAM��F{8p�>��)�w����Iy*��O�SYyR�����~�@8eb8�ƿ��Ʉ��(���d�܄�l띤���8B���'�5V��QQ�M�u�����@�u�瘧�����q�����g	Ӌ�O:eb8Z�t�@v�@��|ڝ}���?����	6����_8ڧ�,�=��8_p�d����<��G�$<
e�4Y`˗l�w�&��,��A�u6}��=*PPp�hnƇ�n��/D	z�Iy��?_��{R��!
+�}���9	_A��<(��y2{n���%$�9__|���>��~2��,`����iEE��>��t2ޞ�d���wM:?_��8p����?4,l�gg\��!��g��)��=j�{@6�5��G6h�������
��L&f6�5E�T���ɵ�I�>Y�w4���5SS�
@�g�����@bԑM<3=;C�^/�/--eeee� x�'x�Y�ٟ�

���LG�b-���R�����K�u���
+��P�R���ҳ�Xvv6ñ-����,��ςZ��h�l��`!x�g�̼�����^ 5E�o�7 $D�I�`y��,���8p�����Z�|���x���~�̺>P�
O�W^�j�F����R>TW��-��ߥ�k#j�A���ӛ6��ن�i�|D���g���"�f{�k�P��|�_0:ꟙ��G%��	���Ⱦ#^B�,,.F��i��c�=)0��6"�_.%ɝEG�?����������
��Kq�����4���>ChLK�����+���1a����O�g��ς��J����:��Ygg�_~�w�OO���=*����Q��`��8�)_������ ��*��?�8p���8p�����8�[��f~
xs�@S���Q�������w��ga���؆���'���-[N�7~�t�@�8�W~hq�`��@���f�����taG�3�s�`��,N�������\�?�4�,�������?A=W��_����Վ^���~��8p���G��
+��W(���P��
+�d1�m8�(�6�p�@u<"����/���7(��Z�3(�~�ϐ�7��o?�?���ʏ��8_ ��w�y���xDF��@f��񈸿�8p���n
���I�F�E�_����V�A߂=}}nm�mmr���	�K��k%A8��6NJIať�̄ܘK�ܯ�Qr��Ӯ��=T^UŪkkYM]�'!b����N557?���u��K/��+��� �_���{��<���~��w�p�
w���?�����z�ꙡ�!|��@��6
(q�YH[{�вR��`#|��j�]R.�����޷c�P��ڶ��5MM�	��!�9��6��� ���Az�tŷspP�\�J�q@_�^߰AX�u@�~�ΝP�:��ن=�n�=�ЦV����TZ�{{Y7��鷞���(Cڠ-Ɲ��P����W��uZ+Ђih��ǎ�ς��~
��M�ܬ~�M��<
GF�7�XM��z&&�)0>=-m�޲E�Ckְu6���-ه�2ԡ
�:�V�]�6l��F'&X���8�;h��wt@�F��m=��cc5<u=��P��{=>����,t+��<2B���o5trzȚ?mFGU=�Ц��:��RI'�����]9�n�GFh#�^���n=ɚWѷz�0�u��i�o�6h�-�+�Y�%�&I;��٧�{�lph���Y3�z��Dz���ٮb0UVW��-�+�Y(3����r�ە�[:��c�K��t�{��_:8p���88�
,$\��&�1�k�X*s!!�	���@����aa�����;E�o��U�>,��ag֝
+�~�c�nv�g�]�v���(�z"�
+d����e�6�e��y�f�e�����m���l#��e�s���baB3��i	���kd�M�����=���d�I(�Q����D�.��xf���!�e�[n"|����颢�����2�|1!!�R��y!�Q� +��z�
	oZ0������!1���gz��mߦ��4��8nilOU�e�4��G;+!~�lA��ѩ��u���>xP�%�~�u
�99��<I7��H��(C�[bXBb�*D[%j�����a---���e�[��adt�{8�e2�D�o�-�Ӱ��������͟��iȁ8p���o�����p�����N[8���khY����~���ޯ���ޯ��a���{���[{ ��i襽_+?�駡7�~�"o���+���_�1���_?Ü��7���=
����Ӑ8p���
bd����e���Y|x��ں�l��m�4n8^<46f[�q�-��Ħ�LӏM��
+
:{zl�CC���e�3�&���X�1 �i�J[=n�L��Bh���(�A[5
+X:;m5
+hnp����n.�u��6�-.e��6�)�^\�p�X����غS�a
WB%>�Q�@v~�M��֕�+(*�jjlVZ����n!r�S\Vf�7O�"z�-/�-�������S >)ɖ��VI���T[M]������J��m���[�[�A�/��/��5Q Y��eeg;+p�-&qYY���b�ߜ4�Ȕ��V���"##E\��
+�����o����8p����R���M�4���j`d�65=m+1��V���jeg����C�-h���hq�-P�0Y��+w�p���Օ�?�c@S{��L�AI�:��f����gL
+v��5+Wڀ��@y}����������)�����P��_+�������VP]�p���?[��ȕpν5��g�m�3`篮���{��k�W��t�4���
�)�����
S !;�VTZ�����ρ8p��Ou�2:�z��Y���md�����W��Ȁ�yT���ljz�Mo��6�p�ƍ�C�xq=?
h��2 kE��[O���/�M�k׮e&�yl�WT��~mA�M2~@Ȁ��=@��[(o�0k�Jx��Lj�w�x��h@r��Ѯ�@۪Ul-UnڴiA�P0�V}BMV{qV�f��F�2 kEK?�D�Fj0�� !��^��Sj�I��Mh�s��5�����MP�!����[�n�Ä�drz���p#��A[�����
�5����.FY���}�����U�M�<"3b:Ą��
+�/D�I�<�x�'xCdͣ.��b%eeHi�>���9�������	bhU��(C��h@���
�5O���>�;�v��𓬬�;
+hllL�
��1bZOe��(Cڠ-h@��;%�d��*��p)a�C����_477�~8�h� GmK�<P�:�A[ЀV&<T�}���ʾ����;w�z%??_(-+J
!��l�(Cڠ-h����r���*}�{a[�'�{
�X)G7mW:a(�k_646�ʆVj2����y�e�C���������.�V�Q����4�kk�)�2ԡ
ڂ��V�N/�)(�z���A����V<\�31�P�6��zZ�/�t:}M
���Fl\[�<���'c�
+5Do/�X`�����n�(C�8�-x�x�7d@�<������_TVV�ϰ$kzKk+�1�]>�P�6hЂx�'xCF��-�VW�"�C�#&�}[�VVT\|�;�\�{�:�A[�8b9
Bd�#�7�t�=R$ b��H���h�^u�uOayu�}�6hЂ�,?BȀ�yĹ��b��ȑ���p5yyy��r�OHk{�z�mAZ�͙N�!����äA�dI�����h4�G�K�DŽ�*�nQ	Ѐ<��2rf�,ZH������Ę�ãĴϋ�Gh@r������!����dh����������	h@YEȀ��$˗���h;cbbX�/��P�i���
�3?Ȁ,�~9|׋[�]O�|Q�U¿���s�������ED��u�F�X"�w�}��O.����v����.�`��QM���Jx�+�o�tu������ݻWسg�D�t�]7?��yE╪^xp���F��j�~� ɐiۺs�m���Ž;��۷�A��m�Vz?�O�J�0�fͩm۶����� &I(\��7�fjJX�n�[D��H�O�'�CFq��}��~���G����j�F�R_/Ի@ԡ
��ޒg�<�ۣ5��3���~7v�y��>�<�<�ۣ֞�����}��yG
+������ʉ�`&���Q���V��j����L|뻺<��*+2KK5W���)X�(�O'3)T��xO�V���M����'���%�PKc�N����l���Ʈ.[Cw����ǎ�-GG9�����94�x<�rz��@�ҳ++mV�1���h��U��f���쪠�ڀ5�Gm����F
�A��b+��r��޺�9��-�K?��Kn8MUb?	cg��`�j�\Z�Y�����T����VXW7ˠ�h�
]�w�-x�j_l2	@�
+��؀r��]�����.ȫ����v��&��������BuE2@���_�C��4̕M#0Oȑ���R۪�훞/F�\
���t�@E�
(W�J ��~Z����2��p�w�!Ao0�V ��|�9jh����복��qii[�2��>�6�M��2��9��G�-��lÆ����٦���x�!�F��
+�6�~{��d�E����0���t���lK-(�tNp1����\�����*����/�V ��r�.O��s#.��&($Ė��s��^t���%�$�ޖi`��<f��٢��m	��o�]��o�{��.X�XN^�Z_����-��x�
+<�⋇�::����>6���X!��
ڂ�$�oV��~�0�ӫ�͂�p���lD�B��]�+���8p�psXDĜ��f��qs��7����/��}�s�c��H�Q֨�_���|�	_՝6���خ�{gv��#�޽{.R�t��m7���*���_�lٛ��g�Z��_�����v��%��m�6Q�:�ql\-x�x�U�F�޼e˱�|0�/h�陡r�>2�"ڠ��@x�xJ=��
+�������9��]�'���	f�Y�X,��:�A[���x�'x{T6�z��^S
x��4vwF�Us
x6���ìn\�RskyUc�{S��Y���L��+�QR"d��C@x P퇨��
�-P��hV����k��C:7~]Us�t��!���������zzNcw�\��7b��� klks(�4Z+ܘ�s++����z+@.x2��r���>
h+��{2��Z,�̞8�
�{�
+�ԃ�t.�<
�U}���J�ۻ���9Ճ�Das�,x2�c�ls;�e@7��ԃV�x�\�tU_PS�
+d������N.Й^I�tU�W]��e�ӱS������%�{���+��M�<����IݝY=���|�y����%���l�Ȉ����ӗ�N�hs�MCj �UU�T ������Ŧ�q�
+G�(C�\
�f���(/JܸV���Y�lw|
ug;�����gL���.
�Je�+�u9h��v��>
�ڄZ�BdR�Ϥ�ʔ�Æ�finf���Kf�o��N�0h3�6�;�̋.*�,]��~%%Ҋ���wpr2K-(�tNp	�����c����b!3;���0�,���������6Ů�K�Ƌ���Ա�������.,l� I�gY��W�h�Ý�m_�-wiT��l��g�h�FG���+Y��q~��_���U�����uHmA�'e~_^��_�8p�������yG9Q�[AC[;�������� ���M���`Ǟ=3�ƿk׮��m�T���_`nh`���9��-;v��;v[�m�n�:�3�:����������ά��`�:���C����_PT�fwo������F0�L��lVF�C%
x��G���Kc����o�
+`�>ϵ��y��'�W�ۀ�#�V�,j�M�}�����P����j��;��5~���
T�!t�`�m�]]���F���g�94����x�C�
֤3N%�V�]CCS�t�6�J?������η㫽���������Ȭ�iԝ�MM����Yi<��}�7�P�&�r�����ҳ�R
OvcK3*D�RK��|��HP��3{�ļčO�j�����[�O��|7~q��F��{<_���к����l��q���
+dyp$��T{L_���fw^�����F@Pb"��'Z�P�44�~�/8��w{����������!���9d��"z�q{� 9/�e_��M�_@D��KHL|���������-x�y��|��|���X�be����|
8p���C �������/��+���>U���M�~�@�]�KP}�@�]��O?~�@�������+xs���]?�~U��WPu� �~�v�@�<���W�|�!�~�v�@�<���W8�Q �~�C��1h��6}�}������t:��aۇ�_I��f��ö������)0{��~��u�c�"�'�_!��
	O���+�R�����
+��Zq�8p����������������mc��lq�޾k۵gBB�F��[dm7No��Ƨ��5�������x����Q�?00������޼��
�n$ATw���������$ljn~�o`ys�|y�_.%қ�_~��H��4�H����###l�������@��p_�"��3&''?��Ŏ���苌}:t�R{�oi9(#��Oy�����3Y,KbV�ZGW����;�(ךͿ%Z/>(�;�d‘H�/�җ��Zp��yy^C��W�^-f���׳#�{�Bt~g_�(x||\�䌬���0b�^��I�GGGūokog}�Va��.}YT�/GI8�<�Ӣ#�����o_���2�&�CR�[�-)+;IW�B(����S�k���������X��'%مp�5�Ll�޽����z�II��R�B8r������>�ㅸ�cC�)�����cYY��9���i<����F�
��O+���������)P�<Xu��?K��t�&)hŊ'b����w�:�˗�����544�zZ���V��Ǿ���#��si�����A�z�X�DZpx�3���@�%K���= �HBb"�����DFE�F����#<���\suee�I�X�ݚ%2ã��GY+����?Gm7�}/�����
+m-����[ny�����n��
+�������������[��#\�I�£
+�g]�~z)a6�m�t�eee��?�n��
����NJ��j0�8�=c𮞜<(���]����t�J����RRRX��uh���
+��������X1�����3����?<u��>X��O�e��Oӫ���877������Q�3+)����>��
+�Ѵ}���-�+��+��_��9���ϠXZv6���@���̜��4
1e_�8 Ĩ�����x0����cz��J'	}��_FFF�H�_&|�0C�;J\v�es��?@)��ˁ8p����
+\�8��:���2���o�ЇlB@�F�%������"����ep��
`�}���{��(���H��wj����/(x��>��9���Q���+PG�P��T� �I�QV7w���{�����h�Ya�ikBY#՝6.;�[��w@�D_����
+�tPV/�����(�[H��{zn9�YB
c{;3*$BA�iny`�@�`
+�eƹ�Q����
=��T573���)`hjb���ݕ��74�r�(�(��[����Sy�n���b�,_A�p��_�<0����+�F
W�����8�WU1�tRrN��y��)�j߿�r���Z�����Yee������EE���Xt�������nG�oԡ
ڂf�;��W [A
1�,_
��X��ʞ8��;O���-h��E�F�(RȮ�2�!qq��Ә��㏟�ְЂ�<���7j���P�	e�sD���ZTR��:z�V�����F�y
*2�ՆGG;NV��e��}<77*���O`�
���5�CI�?�GE��
-"~�u�v	��x;5-
���{W�-h@J
+�Iu���表��7���2�9�{��j}22*�Hl|<Ƹ@G=ڂ�r~rR%ǒ3�,UE;�0������%��Rc�vj�%?8p�����
��[��[��t����U ~��6�o�"j�7	Y���M[����	�e�Jh�ٍ��޼�UTT<
�?�Q&�D`��Z_���g�����ߐ��2ԩ7��h~k!A�����T���+���+�t�?�u��g>����(X�Q� w�R�z���(�WR@�[`��`@�F��5W�4���\�[��
�T��5--�Z!$L��r�oA�JH���
�[��
�T��j �o������N�n ."2i���
�DZsf��rW
��V ��J��R�ޘ���jFNK��b��"�ff���[��6h��,�������U<G�bR�,&����)C�
h�J��8@����zb�����[o������
-x8��ϐ��e����W�I��|����1+��+�G��cD���jIY6�x�
h��Q����F�}ś�@��1*1E?@�i�Z0���1;ݪ����%?����(˧:�+�Khx�ۅEE�����d��%��D'D겥��
��CXD�[tk,t�@�F��� W@�P�'�/_~$<"�ي�pEDڠ-h���CZZ�C!!!o���� W@S?�Z�����
��8p���8�8��k�n�������)�w[g'k��`�����q�ph��Y��u�����%z�!�37�x�W�̤��:8�W@�KrY������\��::���Yh��|N_?�}}3W_{�C���0�oo�>*pINA
����}.*@�����k.�J���5s��n?ۗ���@�wv���پ�C��|�KJb]��3��p����ox&w�i��>Sg�h"�ub�0���s'�2����Uw�j[[�j�i�\E�_�r�.(��~ve�G��:!>�$\�b"�<+t˖�^��4���QH�tŊ[����a.T66
+�V�3A���Ѓ����ON2��zLv�'�׬a�[r�^s��JoҙWP�W��858<���Izu������u
|��U��B�"�J��*�%\Vꁦ�G~HD���l
]���0ߵ�#
+�@u�Ц�����ž��,T5��UTQ����� ;2.�
<R'V�fc�H�KK�抎������m�H�2G���*��
i�;4�%�����O
+
30O��z���Ȳ�EE�����m���?�EFn���e���Vi$L�y����������D��2�����X�J�����.8x�QYN‹�%\v�BZ�J槒n���h�F�}
+�(��ގP��ގ
�!',"~�Z����@9�Ccck��]�y��9eeeT�7��቟2 �����U�K�2k8~�56"�n��Fse��ɴ.Dee���G�^����?��\Q!=4�ǠLӀ�i�*/�Nc=
+��{����j�xe{�@zQ�Pe��L/�T�rx���($�C����x��j�B���
��z8p���5���%�H�M�}$`�w���0|�������ö�
�w��t�\�
6}���|�`O�/
>���M�����t(P��Sȝ�X=��_�Y]�|
+�-��������)A�>�,{@��ڮ��v@��N��ڮ�F	��s��A5�V	�J��߃jB�v}�o>�%�����+3��>|
?�|"�>���kD����l�.B��O@~x>��C����̯�I?A$|��`����Z���;@|	T3��~����}
���ƨ���>ؐ�S��68��'h8�d��ۿ�'8��Y;|b��A���[��s�`Ӈm_4B����?l�0����>���r�`�ϡj�-u
���02rl�0��_�*Y��C��h�|���9��
���厅��1������4YF�	�
�?�������J�.��<�M�h�]�>������ �{����@ϱ��L��	���O G>�O�6�/�)��~|�~�p�|�7T���$߀�� �~sA�]_��Ҁ�i�~�'�~8p���*��/�������/����~���/����~���/�~�7�~8p�����+����~���/����~���/����~���/�~�'�~8p����/�n���Y���pV�¦V-L/&|+8<�e��j�0�q
+v$�+*-e�))����vH�V���ݒ%���h�w�d�w�`SSSlժU���������Xkk��1�i�f�g��zr��$&ڈ��Ζ3o ������lӖ-l��ݢ��j��z�m�=L�۟�^�g�;���M����?�q�F�g�^ѽ�$8�'��D�0R�%F��ʆ����d��L�)�Ä�$<�����n�m}}����N�m�cYyy�Vo�`��t7u�M����0k��xP�"a?a��GM!�7��;��|KKˇ�U۶m��$%��d_r	
���]�v�W�z�jf�X���
�m�1����Æ
���֯_/*��n�Ұ�_S� w�a���/Õ�
+�{z�Y�{?1���x����MNRFT6D�>���)�W�'&&��h<&e��*/��ڗ.�����^�B�����[Ybf�\S�2MW�׮]+(i�������(&��?>��=�--Ⅼ[��m %GF�U�f��ʗ��!4ƽ��wxb� 1�e�EF����P�
+\�:R��6+N����њ5kD�1
�����u!!:�++_�,O\n�΅#+��p�@(�Asї��y?�(��xj�z<�#�[�u���+��^��#w||�
���3�Y��KK_�X?���ۚ[^~��!U&ӣ���z�|���==��$�XM1(���Ͼ��zxr���V�!�@\Z��~(�8N]���@���c��XM�Sl�Χ�^_A�`ww��z�b�Qm�I���?��R�7����ߐC��M+Wl�G/�Q��A�k|�Qm4����ݬ��2���p�@R�f�䜀�}�#���O�Ao�}����B8�70�h���V���G��i����;�x������f�'03�SSߣ�J�
+|�
W�fZ�R����v������;�x4//�$��0������Pb�΅�Vg?�q9mq��m���ձ���'�S1˫$6K�{v�]wNHHx�������M?�����+z�#"ީ���E�6''oO���z
+6���%����
;�`�
�
۷o�
1����X�]h�w�cP�q���Ȩ��~����^��#����q��"%b:�ُ�Z�������R���b��oº�0eH8���
ޞ�D�#��)�^�ĭ?..@��H�ܼ<���M��MJJz���1t+*�ҥ�
+���x��習���hdd�>˖-���xc�"���6���Ć�Ĕ)+/g���_\\�hF��+��;���D_H��3�����VN�***�qa�
�
+�����-8�All�����'btt�ǡaa/�����D��r�(�'�R��T|���7O�=?�����u¿y��c)�������́8p����x��g��DL�������@8���۲eL��֭[!�����H8�۴i�ܸq�[T;�����~�zajjJX�f�"�m�n�:��_��J���n�uCCC"j�2![799)�����V
�U;Ȅl����`jh�1wh���Z��L�֍MLf�����J�q�� �E��QOHm;�L*�tT��'��dB�nxttn�`hj�
�|j�����`V�ծO^��2![74<,4�8؄3
*��m���Âзj��]����B�=��&� sD�
Z�:;;���:��Y!Lr2D��h��j���������=�\�eeP�v�	ٺ��n�����ʕ��@��A&d�
+��~�]R"�j����O����j��m���k��P���;����(���i��j4�����T�8��k�Z"d�N�J�aOm)̇�y}ރ�շ�ȨP_R�=m-�QVː��u-��]����~�jnr��ć�/l�=��{�/7��=�\u=���2}���ؾ!����H�}7e�n�#&��:]$Ц���ő�ݮ�$�%�O�:����ݎ���%�����bw�^��To�_�"��ؾƦ�������

��`0�����V��Il��fe;��\U��}�^��I���6���*`�:V���@ �W���tT�ʞu��Y��(�[������ik4��im�@ ����gf��l�~M08yr�����ykfv֚�t��j���c1;��+�+��S?2>nUw�����a��@y�1]%�Ǭj�q@��oh�����;&TR��V�-���WWǐ�c�+[P.k�����4$p�&�)�?h$A��MlO	�����^K�
+���^��^x��������0}�������١v�'�C��*���gw����v�����#9c����f���,=��\V��#}HQ+��Ԅ������������n�A�ɨ��Nvp�\������Y]��]]]{���v��	�k�.�LZlc����CCCvM1��Gi�i�Ǡ��uW�j.����ag~~��a(ڦDW*[����N�ɥⵕ��o�]���������X,�����w�Z��Sҏ/����N�K�W��f�^�����9b�IQo�P1�����:::~T��C��y=2��3g��cAN�EO�K����8���&Nw[4j�KwMW�򔥍m��*���E]:õ��S�ޗ����zG��<�l��0��H[va9�}�lM���_,,����?��g���S��W��7"��^���z;;���oXٺ-�<�S��奺ŧK�E��@���߮������ϕ��v��w�WO���8�@_�
+=(ѿ�^��7���i��@��sc��G�Y�e������@ �@PI,�b<��Ч�8����v}ٙU��&�f�v���A?Oy��h�]cc�v�?�gV�-��&k��
�
�5�>ɴg��*-Ь6��,�}z@C@S0��#����,P�4��-�
4�X�|Z�9Z���
+��
-M�#D#��i}'=�dH��� �"JY�W����9J�TN��	fZ���z�?�����d�Ru�rh|n4�b	����v"(ι�f�z�zD5D4e�c�	���p�p�&�<�?;�!���� ������A�M��*P�SN	���5������G@@@@#@+�A����h	��,��9�=h���q��˿������������A6��f@0ب(��h
��Vv��еO�������������Kk
KZ@#�B3�-��F[@c0�c�vݼ���������5׿�����T4�4�M
mA_v�;�?
������6��� ���6��Sh�9�	\>������qB3@;@Cp��
������f���Zh�е�#e����
+�h�L��@ �@ ��D/�@��D/�@��D/�@ �@ ^_�<"�G$�d��#�yD2�H��<"�G$��@ ��@}��x1���dfuu�,��s<씝�o�y�P��R�bbb��3������3^�s���#�����6}����R,��FFF2Gỏd2Y�0��𱋇�V�w��I�圁aO	.�!Ϲ���s*�����r?	+��@ �@ ����$q%X7�IEND�B`�
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js b/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
index 1d8be47..3eee024 100644
--- a/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
+++ b/core/assets/vendor/ckeditor/plugins/image2/dialogs/image2.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("image2",function(k){function D(){var a=this.getValue().match(E);(a=!(!a||0===parseInt(a[1],10)))||alert(c["invalid"+CKEDITOR.tools.capitalize(this.id)]);return a}function O(){function a(a,b){d.push(l.once(a,function(a){for(var l;l=d.pop();)l.removeListener();b(a)}))}var l=t.createElement("img"),d=[];return function(d,b,c){a("load",function(){var a=F(l);b.call(c,l,a.width,a.height)});a("error",function(){b(null)});a("abort",function(){b(null)});l.setAttribute("src",(x.baseHref||
diff --git a/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js b/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
index 780b2cb..75c116d 100644
--- a/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
+++ b/core/assets/vendor/ckeditor/plugins/pastefromword/filter/default.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function C(a){a=a.toUpperCase();for(var c=D.length,b=0,f=0;f<c;++f)for(var d=D[f],e=d[1].length;a.substr(0,e)==d[1];a=a.substr(e))b+=d[0];return b}function E(a){a=a.toUpperCase();for(var c=1,b=1;0<a.length;b*=26)c+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*b,a=a.substr(0,a.length-1);return c}var F=CKEDITOR.htmlParser.fragment.prototype,r=CKEDITOR.htmlParser.element.prototype;F.onlyChild=r.onlyChild=function(){var a=this.children;return 1==a.length&&a[0]||null};r.removeAnyChildWithName=
diff --git a/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js b/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
index 21e3292..b892503 100644
--- a/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
+++ b/core/assets/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("sourcedialog",function(a){var b=CKEDITOR.document.getWindow().getViewPaneSize(),e=Math.min(b.width-70,800),b=b.height/1.5,d;return{title:a.lang.sourcedialog.title,minWidth:100,minHeight:100,onShow:function(){this.setValueOf("main","data",d=a.getData())},onOk:function(){function b(f,c){a.focus();a.setData(c,function(){f.hide();var b=a.createRange();b.moveToElementEditStart(a.editable());b.select()})}return function(){var a=this.getValueOf("main","data").replace(/\r/g,""),c=this;
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
index 3ad20f5..1b0d421 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 
 cs.js      Found: 118 Missing: 0
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
index 27bb901..41780d2 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/af.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","af",{euro:"Euroteken",lsquo:"Linker enkelkwotasie",rsquo:"Regter enkelkwotasie",ldquo:"Linker dubbelkwotasie",rdquo:"Regter dubbelkwotasie",ndash:"Kortkoppelteken",mdash:"Langkoppelteken",iexcl:"Omgekeerdeuitroepteken",cent:"Centteken",pound:"Pondteken",curren:"Geldeenheidteken",yen:"Yenteken",brvbar:"Gebreekte balk",sect:"Afdeelingsteken",uml:"Deelteken",copy:"Kopieregteken",ordf:"Vroulikekenteken",laquo:"Linkgeoorienteerde aanhaalingsteken",not:"Verbodeteken",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
index 8c3cc20..cdd1c90 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص فردية علي اليسار",rsquo:"علامة تنصيص فردية علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash",mdash:"Em dash",iexcl:"علامة تعجب مقلوبة",cent:"رمز السنت",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين",brvbar:"شريط مقطوع",sect:"رمز القسم",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
index 74cc149..3406b35 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","bg",{euro:"Евро знак",lsquo:"Лява маркировка за цитат",rsquo:"Дясна маркировка за цитат",ldquo:"Лява двойна кавичка за цитат",rdquo:"Дясна двойна кавичка за цитат",ndash:"\\\\",mdash:"/",iexcl:"Обърната питанка",cent:"Знак за цент",pound:"Знак за паунд",curren:"Валутен знак",yen:"Знак за йена",brvbar:"Прекъсната линия",sect:"Знак за секция",uml:"Diaeresis",copy:"Знак за Copyright",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
index 46dcb0a..a872189 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ca",{euro:"Símbol d'euro",lsquo:"Signe de cometa simple esquerra",rsquo:"Signe de cometa simple dreta",ldquo:"Signe de cometa doble esquerra",rdquo:"Signe de cometa doble dreta",ndash:"Guió",mdash:"Guió baix",iexcl:"Signe d'exclamació inversa",cent:"Símbol de percentatge",pound:"Símbol de lliura",curren:"Símbol de moneda",yen:"Símbol de Yen",brvbar:"Barra trencada",sect:"Símbol de secció",uml:"Dièresi",copy:"Símbol de Copyright",ordf:"Indicador ordinal femení",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
index c8d129e..1d98c29 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cs",{euro:"Znak eura",lsquo:"Počáteční uvozovka jednoduchá",rsquo:"Koncová uvozovka jednoduchá",ldquo:"Počáteční uvozovka dvojitá",rdquo:"Koncová uvozovka dvojitá",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrácený vykřičník",cent:"Znak centu",pound:"Znak libry",curren:"Znak měny",yen:"Znak jenu",brvbar:"Přerušená svislá čára",sect:"Znak oddílu",uml:"Přehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených uvozovek vlevo",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
index b873ac9..1ceb05b 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","cy",{euro:"Arwydd yr Ewro",lsquo:"Dyfynnod chwith unigol",rsquo:"Dyfynnod dde unigol",ldquo:"Dyfynnod chwith dwbl",rdquo:"Dyfynnod dde dwbl",ndash:"Cysylltnod en",mdash:"Cysylltnod em",iexcl:"Ebychnod gwrthdro",cent:"Arwydd sent",pound:"Arwydd punt",curren:"Arwydd arian cyfred",yen:"Arwydd yen",brvbar:"Bar toriedig",sect:"Arwydd adran",uml:"Didolnod",copy:"Arwydd hawlfraint",ordf:"Dangosydd benywaidd",laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:"Arwydd Nid",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
index c1c6c3c..7b26e4c 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/da.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Kurs-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
new file mode 100644
index 0000000..60673f0
--- /dev/null
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
@@ -0,0 +1,13 @@
+/*
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang("specialchar","de-ch",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
+not:"Not-Zeichen",reg:"Registriert-Zeichen",macr:"Längezeichen",deg:"Grad-Zeichen",sup2:"Hoch 2",sup3:"Hoch 3",acute:"Akzentzeichen ",micro:"Mikro-Zeichen",para:"Pilcrow-Zeichen",middot:"Mittelpunkt",cedil:"Cedilla",sup1:"Hoch 1",ordm:"Männliche Ordnungszahl Anzeige",raquo:"Nach rechts zeigenden Doppel-Winkel Anführungszeichen",frac14:"ein Viertel",frac12:"Hälfte",frac34:"Dreiviertel",iquest:"Umgekehrtes Fragezeichen",Agrave:"Lateinischer Buchstabe A mit AkzentGrave",Aacute:"Lateinischer Buchstabe A mit Akutakzent",
+Acirc:"Lateinischer Buchstabe A mit Zirkumflex",Atilde:"Lateinischer Buchstabe A mit Tilde",Auml:"Lateinischer Buchstabe A mit Trema",Aring:"Lateinischer Buchstabe A mit Ring oben",AElig:"Lateinischer Buchstabe Æ",Ccedil:"Lateinischer Buchstabe C mit Cedille",Egrave:"Lateinischer Buchstabe E mit AkzentGrave",Eacute:"Lateinischer Buchstabe E mit Akutakzent",Ecirc:"Lateinischer Buchstabe E mit Zirkumflex",Euml:"Lateinischer Buchstabe E Trema",Igrave:"Lateinischer Buchstabe I mit AkzentGrave",Iacute:"Lateinischer Buchstabe I mit Akutakzent",
+Icirc:"Lateinischer Buchstabe I mit Zirkumflex",Iuml:"Lateinischer Buchstabe I mit Trema",ETH:"Lateinischer Buchstabe Eth",Ntilde:"Lateinischer Buchstabe N mit Tilde",Ograve:"Lateinischer Buchstabe O mit AkzentGrave",Oacute:"Lateinischer Buchstabe O mit Akutakzent",Ocirc:"Lateinischer Buchstabe O mit Zirkumflex",Otilde:"Lateinischer Buchstabe O mit Tilde",Ouml:"Lateinischer Buchstabe O mit Trema",times:"Multiplikation",Oslash:"Lateinischer Buchstabe O durchgestrichen",Ugrave:"Lateinischer Buchstabe U mit Akzentgrave",
+Uacute:"Lateinischer Buchstabe U mit Akutakzent",Ucirc:"Lateinischer Buchstabe U mit Zirkumflex",Uuml:"Lateinischer Buchstabe a mit Trema",Yacute:"Lateinischer Buchstabe a mit Akzent",THORN:"Lateinischer Buchstabe mit Dorn",szlig:"Kleiner lateinischer Buchstabe scharfe s",agrave:"Kleiner lateinischer Buchstabe a mit Accent grave",aacute:"Kleiner lateinischer Buchstabe a mit Akut",acirc:"Lateinischer Buchstabe a mit Zirkumflex",atilde:"Lateinischer Buchstabe a mit Tilde",auml:"Kleiner lateinischer Buchstabe a mit Trema",
+aring:"Kleiner lateinischer Buchstabe a mit Ring oben",aelig:"Lateinischer Buchstabe æ",ccedil:"Kleiner lateinischer Buchstabe c mit Cedille",egrave:"Kleiner lateinischer Buchstabe e mit Accent grave",eacute:"Kleiner lateinischer Buchstabe e mit Akut",ecirc:"Kleiner lateinischer Buchstabe e mit Zirkumflex",euml:"Kleiner lateinischer Buchstabe e mit Trema",igrave:"Kleiner lateinischer Buchstabe i mit AkzentGrave",iacute:"Kleiner lateinischer Buchstabe i mit Akzent",icirc:"Kleiner lateinischer Buchstabe i mit Zirkumflex",
+iuml:"Kleiner lateinischer Buchstabe i mit Trema",eth:"Kleiner lateinischer Buchstabe eth",ntilde:"Kleiner lateinischer Buchstabe n mit Tilde",ograve:"Kleiner lateinischer Buchstabe o mit Accent grave",oacute:"Kleiner lateinischer Buchstabe o mit Akzent",ocirc:"Kleiner lateinischer Buchstabe o mit Zirkumflex",otilde:"Lateinischer Buchstabe i mit Tilde",ouml:"Kleiner lateinischer Buchstabe o mit Trema",divide:"Divisionszeichen",oslash:"Kleiner lateinischer Buchstabe o durchgestrichen",ugrave:"Kleiner lateinischer Buchstabe u mit Accent grave",
+uacute:"Kleiner lateinischer Buchstabe u mit Akut",ucirc:"Kleiner lateinischer Buchstabe u mit Zirkumflex",uuml:"Kleiner lateinischer Buchstabe u mit Trema",yacute:"Kleiner lateinischer Buchstabe y mit Akut",thorn:"Kleiner lateinischer Buchstabe Dorn",yuml:"Kleiner lateinischer Buchstabe y mit Trema",OElig:"Lateinischer Buchstabe Ligatur OE",oelig:"Kleiner lateinischer Buchstabe Ligatur OE",372:"Lateinischer Buchstabe W mit Zirkumflex",374:"Lateinischer Buchstabe Y mit Zirkumflex",373:"Kleiner lateinischer Buchstabe w mit Zirkumflex",
+375:"Kleiner lateinischer Buchstabe y mit Zirkumflex",sbquo:"Tiefergestelltes Komma",8219:"Rumgedrehtes Komma",bdquo:"Doppeltes Anführungszeichen unten",hellip:"horizontale Auslassungspunkte",trade:"Handelszeichen",9658:"Dreickspfeil rechts",bull:"Bullet",rarr:"Pfeil rechts",rArr:"Doppelpfeil rechts",hArr:"Doppelpfeil links",diams:"Karo",asymp:"Ungefähr"});
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
index 84e8630..2f67f0c 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
index b31e8f4..c27777e 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας ευθύγραμμων εισαγωγικών",rdquo:"Δεξιός χαρακτήρας ευθύγραμμων εισαγωγικών",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
index 08de561..e0128d6 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en-gb",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
index 418406d..d89d46d 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/en.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","en",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
index c5803d5..4c17340 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","eo",{euro:"Eŭrosigno",lsquo:"Supra 6-citilo",rsquo:"Supra 9-citilo",ldquo:"Supra 66-citilo",rdquo:"Supra 99-citilo",ndash:"Streketo",mdash:"Substreko",iexcl:"Renversita krisigno",cent:"Cendosigno",pound:"Pundosigno",curren:"Monersigno",yen:"Enosigno",brvbar:"Rompita vertikala streko",sect:"Kurba paragrafo",uml:"Tremao",copy:"Kopirajtosigno",ordf:"Adjektiva numerfinaĵo",laquo:"Duobla malplio-citilo",not:"Negohoko",reg:"Registrita marko",macr:"Superstreko",deg:"Gradosigno",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
index e91f1a0..875b644 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","es",{euro:"Símbolo de euro",lsquo:"Comilla simple izquierda",rsquo:"Comilla simple derecha",ldquo:"Comilla doble izquierda",rdquo:"Comilla doble derecha",ndash:"Guión corto",mdash:"Guión medio largo",iexcl:"Signo de admiración invertido",cent:"Símbolo centavo",pound:"Símbolo libra",curren:"Símbolo moneda",yen:"Símbolo yen",brvbar:"Barra vertical rota",sect:"Símbolo sección",uml:"Diéresis",copy:"Signo de derechos de autor",ordf:"Indicador ordinal femenino",laquo:"Abre comillas angulares",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
index 2a20883..ca6f880 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/et.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","et",{euro:"Euromärk",lsquo:"Alustav ühekordne jutumärk",rsquo:"Lõpetav ühekordne jutumärk",ldquo:"Alustav kahekordne jutumärk",rdquo:"Lõpetav kahekordne jutumärk",ndash:"Enn-kriips",mdash:"Emm-kriips",iexcl:"Pööratud hüüumärk",cent:"Sendimärk",pound:"Naela märk",curren:"Valuutamärk",yen:"Jeeni märk",brvbar:"Katkestatud kriips",sect:"Lõigu märk",uml:"Täpid",copy:"Autoriõiguse märk",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
index a93e0ce..d1161be 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
index c3efb3c..6351d73 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fa",{euro:"نشان یورو",lsquo:"علامت نقل قول تکی چپ",rsquo:"علامت نقل قول تکی راست",ldquo:"علامت نقل قول دوتایی چپ",rdquo:"علامت نقل قول دوتایی راست",ndash:"خط تیره En",mdash:"خط تیره Em",iexcl:"علامت تعجب وارونه",cent:"نشان سنت",pound:"نشان پوند",curren:"نشان ارز",yen:"نشان ین",brvbar:"نوار شکسته",sect:"نشان بخش",uml:"نشان سواگیری",copy:"نشان کپی رایت",ordf:"شاخص ترتیبی مونث",laquo:"اشاره چپ مکرر برای زاویه علامت نقل قول",not:"نشان ثبت نشده",reg:"نشان ثبت شده",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
index 79f4a7d..7132cd1 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fi",{euro:"Euron merkki",lsquo:"Vasen yksittäinen lainausmerkki",rsquo:"Oikea yksittäinen lainausmerkki",ldquo:"Vasen kaksoislainausmerkki",rdquo:"Oikea kaksoislainausmerkki",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Sentin merkki",pound:"Punnan merkki",curren:"Valuuttamerkki",yen:"Yenin merkki",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
index 24a0d0d..326a6e5 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fr-ca",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret",iexcl:"Point d'exclamation inversé",cent:"Symbole de cent",pound:"Symbole de Livre Sterling",curren:"Symbole monétaire",yen:"Symbole du Yen",brvbar:"Barre scindée",sect:"Symbole de section",uml:"Tréma",copy:"Symbole de copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
index a7a9fa6..e84fa13 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole Cent",pound:"Symbole Livre Sterling",curren:"Symbole monétaire",yen:"Symbole Yen",brvbar:"Barre verticale scindée",sect:"Section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
index 797ecc5..6a31fdc 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","gl",{euro:"Símbolo do euro",lsquo:"Comiña simple esquerda",rsquo:"Comiña simple dereita",ldquo:"Comiñas dobres esquerda",rdquo:"Comiñas dobres dereita",ndash:"Guión",mdash:"Raia",iexcl:"Signo de admiración invertido",cent:"Símbolo do centavo",pound:"Símbolo da libra",curren:"Símbolo de moeda",yen:"Símbolo do yen",brvbar:"Barra vertical rota",sect:"Símbolo de sección",uml:"Diérese",copy:"Símbolo de dereitos de autoría",ordf:"Indicador ordinal feminino",laquo:"Comiñas latinas, apertura",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
index 7593589..5fabd82 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","he",{euro:"יורו",lsquo:"סימן ציטוט יחיד שמאלי",rsquo:"סימן ציטוט יחיד ימני",ldquo:"סימן ציטוט כפול שמאלי",rdquo:"סימן ציטוט כפול ימני",ndash:"קו מפריד קצר",mdash:"קו מפריד ארוך",iexcl:"סימן קריאה הפוך",cent:"סנט",pound:"פאונד",curren:"מטבע",yen:"ין",brvbar:"קו שבור",sect:"סימן מקטע",uml:"שתי נקודות אופקיות (Diaeresis)",copy:"סימן זכויות יוצרים (Copyright)",ordf:"סימן אורדינאלי נקבי",laquo:"סימן ציטוט זווית כפולה לשמאל",not:"סימן שלילה מתמטי",reg:"סימן רשום",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
index 6575432..41dfd8f 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hr",{euro:"Euro znak",lsquo:"Lijevi jednostruki navodnik",rsquo:"Desni jednostruki navodnik",ldquo:"Lijevi dvostruki navodnik",rdquo:"Desni dvostruki navodnik",ndash:"En crtica",mdash:"Em crtica",iexcl:"Naopaki uskličnik",cent:"Cent znak",pound:"Funta znak",curren:"Znak valute",yen:"Yen znak",brvbar:"Potrgana prečka",sect:"Znak odjeljka",uml:"Prijeglasi",copy:"Copyright znak",ordf:"Feminine ordinal indicator",laquo:"Lijevi dvostruki uglati navodnik",not:"Not znak",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
index 4455483..fd56ab1 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","hu",{euro:"Euró jel",lsquo:"Bal szimpla idézőjel",rsquo:"Jobb szimpla idézőjel",ldquo:"Bal dupla idézőjel",rdquo:"Jobb dupla idézőjel",ndash:"Rövid gondolatjel",mdash:"Hosszú gondolatjel",iexcl:"Fordított felkiáltójel",cent:"Cent jel",pound:"Font jel",curren:"Valuta jel",yen:"Yen jel",brvbar:"Hosszú kettőspont",sect:"Paragrafus jel",uml:"Kettős hangzó jel",copy:"Szerzői jog jel",ordf:"Női sorrend mutatója",laquo:"Balra mutató duplanyíl",not:"Feltételes kötőjel",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
index 1b4bd67..45803ca 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/id.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
index 6b09097..ca36dc2 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","it",{euro:"Simbolo Euro",lsquo:"Virgoletta singola sinistra",rsquo:"Virgoletta singola destra",ldquo:"Virgolette aperte",rdquo:"Virgolette chiuse",ndash:"Trattino",mdash:"Trattino lungo",iexcl:"Punto esclavamativo invertito",cent:"Simbolo Cent",pound:"Simbolo Sterlina",curren:"Simbolo Moneta",yen:"Simbolo Yen",brvbar:"Barra interrotta",sect:"Simbolo di sezione",uml:"Dieresi",copy:"Simbolo Copyright",ordf:"Indicatore ordinale femminile",laquo:"Virgolette basse aperte",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
index b32e890..ba348aa 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ja",{euro:"ユーロ記号",lsquo:"左シングル引用符",rsquo:"右シングル引用符",ldquo:"左ダブル引用符",rdquo:"右ダブル引用符",ndash:"半角ダッシュ",mdash:"全角ダッシュ",iexcl:"逆さ感嘆符",cent:"セント記号",pound:"ポンド記号",curren:"通貨記号",yen:"円記号",brvbar:"上下に分かれた縦棒",sect:"節記号",uml:"分音記号(ウムラウト)",copy:"著作権表示記号",ordf:"女性序数標識",laquo:" 始め二重山括弧引用記号",not:"論理否定記号",reg:"登録商標記号",macr:"長音符",deg:"度記号",sup2:"上つき2, 2乗",sup3:"上つき3, 3乗",acute:"揚音符",micro:"ミクロン記号",para:"段落記号",middot:"中黒",cedil:"セディラ",sup1:"上つき1",ordm:"男性序数標識",raquo:"終わり二重山括弧引用記号",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
index 8d6a3d1..8f9fd7f 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/km.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","km",{euro:"សញ្ញា​អឺរ៉ូ",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"សញ្ញា​សេន",pound:"សញ្ញា​ផោន",curren:"សញ្ញា​រូបិយបណ្ណ",yen:"សញ្ញា​យ៉េន",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"សញ្ញា​រក្សា​សិទ្ធិ",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
index 77207ed..05759fc 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ko",{euro:"유로화 기호",lsquo:"왼쪽 외 따옴표",rsquo:"오른쪽 외 따옴표",ldquo:"왼쪽 쌍 따옴표",rdquo:"오른쪽 쌍 따옴표",ndash:"반각 대시",mdash:"전각 대시",iexcl:"반전된 느낌표",cent:"센트 기호",pound:"파운드화 기호",curren:"커런시 기호",yen:"위안화 기호",brvbar:"Broken bar",sect:"섹션 기호",uml:"분음 부호",copy:"저작권 기호",ordf:"Feminine ordinal indicator",laquo:"왼쪽 쌍꺽쇠 인용 부호",not:"금지 기호",reg:"등록 기호",macr:"장음 기호",deg:"도 기호",sup2:"위첨자 2",sup3:"위첨자 3",acute:"양음 악센트 부호",micro:"마이크로 기호",para:"단락 기호",middot:"가운데 점",cedil:"세디유",sup1:"위첨자 1",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
index 5bed679..1da1110 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ku",{euro:"نیشانەی یۆرۆ",lsquo:"نیشانەی فاریزەی سەرووژێری تاکی چەپ",rsquo:"نیشانەی فاریزەی سەرووژێری تاکی ڕاست",ldquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی چه‌پ",rdquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی ڕاست",ndash:"تەقەڵی کورت",mdash:"تەقەڵی درێژ",iexcl:"نیشانەی هەڵەوگێڕی سەرسوڕهێنەر",cent:"نیشانەی سەنت",pound:"نیشانەی پاوەند",curren:"نیشانەی دراو",yen:"نیشانەی یەنی ژاپۆنی",brvbar:"شریتی ئەستوونی پچڕاو",sect:"نیشانەی دوو s لەسەریەک",uml:"خاڵ",copy:"نیشانەی مافی چاپ",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
index f575dfd..c1fdd11 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lt",{euro:"Euro ženklas",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cento ženklas",pound:"Svaro ženklas",curren:"Valiutos ženklas",yen:"Jenos ženklas",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
index 7ea58a0..b3a2aa0 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","lv",{euro:"Euro zīme",lsquo:"Kreisā  vienkārtīga pēdiņa",rsquo:"Labā  vienkārtīga pēdiņa",ldquo:"Kreisā  dubult pēdiņa",rdquo:"Labā dubult pēdiņa",ndash:"En svītra",mdash:"Em svītra",iexcl:"Apgriezta izsaukuma zīme",cent:"Centu naudas zīme",pound:"Sterliņu mārciņu naudas zīme",curren:"Valūtas zīme",yen:"Jenu naudas zīme",brvbar:"Vertikāla pārrauta līnija",sect:"Paragrāfa zīme",uml:"Diakritiska zīme",copy:"Autortiesību zīme",ordf:"Sievišķas kārtas rādītājs",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
index f9fd879..9f2684e 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nb",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
index ba75bf3..5274e6f 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","nl",{euro:"Euro-teken",lsquo:"Linker enkel aanhalingsteken",rsquo:"Rechter enkel aanhalingsteken",ldquo:"Linker dubbel aanhalingsteken",rdquo:"Rechter dubbel aanhalingsteken",ndash:"En dash",mdash:"Em dash",iexcl:"Omgekeerd uitroepteken",cent:"Cent-teken",pound:"Pond-teken",curren:"Valuta-teken",yen:"Yen-teken",brvbar:"Gebroken streep",sect:"Paragraaf-teken",uml:"Trema",copy:"Copyright-teken",ordf:"Vrouwelijk ordinaal",laquo:"Linker guillemet",not:"Ongelijk-teken",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
index 404b4fd..8769533 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","no",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
index 1af97e0..c560a31 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pl",{euro:"Znak euro",lsquo:"Cudzysłów pojedynczy otwierający",rsquo:"Cudzysłów pojedynczy zamykający",ldquo:"Cudzysłów apostrofowy otwierający",rdquo:"Cudzysłów apostrofowy zamykający",ndash:"Półpauza",mdash:"Pauza",iexcl:"Odwrócony wykrzyknik",cent:"Znak centa",pound:"Znak funta",curren:"Znak waluty",yen:"Znak jena",brvbar:"Przerwana pionowa kreska",sect:"Paragraf",uml:"Diereza",copy:"Znak praw autorskich",ordf:"Wskaźnik rodzaju żeńskiego liczebnika porządkowego",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
index 41f8c33..b8486af 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pt-br",{euro:"Euro",lsquo:"Aspas simples esquerda",rsquo:"Aspas simples direita",ldquo:"Aspas duplas esquerda",rdquo:"Aspas duplas direita",ndash:"Traço",mdash:"Travessão",iexcl:"Ponto de exclamação invertido",cent:"Cent",pound:"Cerquilha",curren:"Dinheiro",yen:"Yen",brvbar:"Bara interrompida",sect:"Símbolo de Parágrafo",uml:"Trema",copy:"Direito de Cópia",ordf:"Indicador ordinal feminino",laquo:"Aspas duplas angulares esquerda",not:"Negação",reg:"Marca Registrada",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
index 9c73f0c..3f76dd5 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo do Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão Simples",mdash:"Travessão Longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo do Cêntimo",pound:"Símbolo da Libra",curren:"Símbolo de Moeda",yen:"Símbolo do Iene",brvbar:"Barra quebrada",sect:"Símbolo de Secção",uml:"Trema",copy:"Símbolo dos Direitos de Autor",ordf:"Indicador ordinal feminino",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
index 30633fd..c021866 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ru",{euro:"Знак евро",lsquo:"Левая одинарная кавычка",rsquo:"Правая одинарная кавычка",ldquo:"Левая двойная кавычка",rdquo:"Левая двойная кавычка",ndash:"Среднее тире",mdash:"Длинное тире",iexcl:"перевёрнутый восклицательный знак",cent:"Цент",pound:"Фунт",curren:"Знак валюты",yen:"Йена",brvbar:"Вертикальная черта с разрывом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак охраны авторского права",ordf:"Указатель окончания женского рода ...ая",laquo:"Левая кавычка-«ёлочка»",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
index 12789fb..d6d445e 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/si.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","si",{euro:"යුරෝ සලකුණ",lsquo:"වමේ තනි උපුටා දක්වීම ",rsquo:"දකුණේ තනි උපුටා දක්වීම ",ldquo:"වමේ දිත්ව  උපුටා දක්වීම ",rdquo:"දකුණේ දිත්ව  උපුටා දක්වීම ",ndash:"En dash",mdash:"Em dash",iexcl:"යටිකුරු හර්ෂදී ",cent:"Cent sign",pound:"Pound sign",curren:"මුල්‍යමය ",yen:"යෙන් ",brvbar:"Broken bar",sect:"තෙරේම් ",uml:"Diaeresis",copy:"පිටපත් අයිතිය ",ordf:"දර්ශකය",laquo:"Left-pointing double angle quotation mark",not:"සලකුණක් නොවේ",reg:"සලකුණක් ලියාපදිංචි කිරීම",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
index 6e5b534..83e1e2f 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sk",{euro:"Znak eura",lsquo:"Ľavá jednoduchá úvodzovka",rsquo:"Pravá jednoduchá úvodzovka",ldquo:"Pravá dvojitá úvodzovka",rdquo:"Pravá dvojitá úvodzovka",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrátený výkričník",cent:"Znak centu",pound:"Znak libry",curren:"Znak meny",yen:"Znak jenu",brvbar:"Prerušená zvislá čiara",sect:"Znak odseku",uml:"Prehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených úvodzoviek vľavo",not:"Logistický zápor",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
index bdebbd1..653afc5 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Evro znak",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"En pomišljaj",mdash:"Em pomišljaj",iexcl:"Obrnjen klicaj",cent:"Cent znak",pound:"Funt znak",curren:"Znak valute",yen:"Jen znak",brvbar:"Zlomljena črta",sect:"Znak oddelka",uml:"Diaeresis",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi obrnjen dvojni kotni narekovaj",not:"Ne znak",reg:"Registrirani znak",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
index 967a048..f4fbecc 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sq",{euro:"Shenja e Euros",lsquo:"Thonjëza majtas me një vi",rsquo:"Thonjëza djathtas me një vi",ldquo:"Thonjëza majtas",rdquo:"Thonjëza djathtas",ndash:"En viza lidhëse",mdash:"Em viza lidhëse",iexcl:"Pikëçuditëse e përmbysur",cent:"Shenja e Centit",pound:"Shejna e Funtit",curren:"Shenja e valutës",yen:"Shenja e Jenit",brvbar:"Viza e këputur",sect:"Shenja e pjesës",uml:"Diaeresis",copy:"Shenja e të drejtave të kopjimit",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
index d177c86..ac1f4ac 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","sv",{euro:"Eurotecken",lsquo:"Enkelt vänster citattecken",rsquo:"Enkelt höger citattecken",ldquo:"Dubbelt vänster citattecken",rdquo:"Dubbelt höger citattecken",ndash:"Snedstreck",mdash:"Långt tankstreck",iexcl:"Inverterad utropstecken",cent:"Centtecken",pound:"Pundtecken",curren:"Valutatecken",yen:"Yentecken",brvbar:"Brutet lodrätt streck",sect:"Paragraftecken",uml:"Diaeresis",copy:"Upphovsrättstecken",ordf:"Feminit ordningstalsindikator",laquo:"Vänsterställt dubbelt vinkelcitationstecken",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
index 1d43ac9..9c2b307 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/th.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","th",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"สัญลักษณ์สกุลเงิน",yen:"สัญลักษณ์เงินเยน",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
index 65c1a19..f5815b9 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tr",{euro:"Euro işareti",lsquo:"Sol tek tırnak işareti",rsquo:"Sağ tek tırnak işareti",ldquo:"Sol çift tırnak işareti",rdquo:"Sağ çift tırnak işareti",ndash:"En tire",mdash:"Em tire",iexcl:"Ters ünlem işareti",cent:"Cent işareti",pound:"Pound işareti",curren:"Para birimi işareti",yen:"Yen işareti",brvbar:"Kırık bar",sect:"Bölüm işareti",uml:"İki sesli harfin ayrılması",copy:"Telif hakkı işareti",ordf:"Dişil sıralı gösterge",laquo:"Sol-işaret çift açı tırnak işareti",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
index 303d655..1fef21e 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","tt",{euro:"Евро тамгасы",lsquo:"Сул бер иңле куштырнаклар",rsquo:"Уң бер иңле куштырнаклар",ldquo:"Сул ике иңле куштырнаклар",rdquo:"Уң ике иңле куштырнаклар",ndash:"Кыска сызык",mdash:"Озын сызык",iexcl:"Әйләндерелгән өндәү билгесе",cent:"Цент тамгасы",pound:"Фунт тамгасы",curren:"Акча берәмлеге тамгасы",yen:"Иена тамгасы",brvbar:"Broken bar",sect:"Параграф билгесе",uml:"Диерезис",copy:"Хокук иясе булу билгесе",ordf:"Feminine ordinal indicator",laquo:"Ачылучы чыршысыман җәя",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
index 757e83f..68eaeb3 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","ug",{euro:"ياۋرو بەلگىسى",lsquo:"يالاڭ پەش سول",rsquo:"يالاڭ پەش ئوڭ",ldquo:"قوش پەش سول",rdquo:"قوش پەش ئوڭ",ndash:"سىزىقچە",mdash:"سىزىق",iexcl:"ئۈندەش",cent:"تىيىن بەلگىسى",pound:"فوند ستېرلىڭ",curren:"پۇل بەلگىسى",yen:"ياپونىيە يىنى",brvbar:"ئۈزۈك بالداق",sect:"پاراگراف بەلگىسى",uml:"تاۋۇش ئايرىش بەلگىسى",copy:"نەشر ھوقۇقى بەلگىسى",ordf:"Feminine ordinal indicator",laquo:"قوش تىرناق سول",not:"غەيرى بەلگە",reg:"خەتلەتكەن تاۋار ماركىسى",macr:"سوزۇش بەلگىسى",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
index 2343e56..001c626 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","uk",{euro:"Знак євро",lsquo:"Ліві одинарні лапки",rsquo:"Праві одинарні лапки",ldquo:"Ліві подвійні лапки",rdquo:"Праві подвійні лапки",ndash:"Середнє тире",mdash:"Довге тире",iexcl:"Перевернутий знак оклику",cent:"Знак цента",pound:"Знак фунта",curren:"Знак валюти",yen:"Знак єни",brvbar:"Переривчаста вертикальна лінія",sect:"Знак параграфу",uml:"Умлаут",copy:"Знак авторських прав",ordf:"Жіночий порядковий вказівник",laquo:"ліві вказівні подвійні кутові дужки",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
index a71305b..3bf84b6 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","vi",{euro:"Ký hiệu Euro",lsquo:"Dấu ngoặc đơn trái",rsquo:"Dấu ngoặc đơn phải",ldquo:"Dấu ngoặc đôi trái",rdquo:"Dấu ngoặc đôi phải",ndash:"Gạch ngang tiếng anh",mdash:"Gạch ngang Em",iexcl:"Chuyển đổi dấu chấm than",cent:"Ký tự tiền Mỹ",pound:"Ký tự tiền Anh",curren:"Ký tự tiền tệ",yen:"Ký tự tiền Yên Nhật",brvbar:"Thanh hỏng",sect:"Ký tự khu vực",uml:"Dấu tách đôi",copy:"Ký tự bản quyền",ordf:"Phần chỉ thị giống cái",laquo:"Chọn dấu ngoặc đôi trái",not:"Không có ký tự",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
index d794a3d..eb64eaa 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh-cn",{euro:"欧元符号",lsquo:"左单引号",rsquo:"右单引号",ldquo:"左双引号",rdquo:"右双引号",ndash:"短划线",mdash:"长划线",iexcl:"竖翻叹号",cent:"分币符号",pound:"英镑符号",curren:"货币符号",yen:"日元符号",brvbar:"间断条",sect:"节标记",uml:"分音符",copy:"版权所有标记",ordf:"阴性顺序指示符",laquo:"左指双尖引号",not:"非标记",reg:"注册标记",macr:"长音符",deg:"度标记",sup2:"上标二",sup3:"上标三",acute:"锐音符",micro:"微符",para:"段落标记",middot:"中间点",cedil:"下加符",sup1:"上标一",ordm:"阳性顺序指示符",raquo:"右指双尖引号",frac14:"普通分数四分之一",frac12:"普通分数二分之一",frac34:"普通分数四分之三",iquest:"竖翻问号",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
index cb135f9..7740871 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"破折號",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"微",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"二分之一符號",frac34:"四分之三符號",
diff --git a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
index 061cb45..012d34b 100644
--- a/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/core/assets/vendor/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("specialchar",function(k){var e,n=k.lang.specialchar,m=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),e.hide(),c=k.document.createElement("span"),c.setHtml(b),k.insertText(c.getText()))},p=CKEDITOR.tools.addFunction(m),l,g=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){l&&d(null,l);
diff --git a/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js b/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
index f7d190e..3045eb1 100644
--- a/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
+++ b/core/assets/vendor/ckeditor/plugins/table/dialogs/table.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 (function(){function v(a){for(var f=0,n=0,m=0,p,e=a.$.rows.length;m<e;m++){p=a.$.rows[m];for(var d=f=0,c,b=p.cells.length;d<b;d++)c=p.cells[d],f+=c.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
diff --git a/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
index c754020..25b664a 100644
--- a/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/core/assets/vendor/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
  For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.dialog.add("cellProperties",function(g){function d(a){return function(b){for(var c=a(b[0]),d=1;d<b.length;d++)if(a(b[d])!==c){c=null;break}"undefined"!=typeof c&&(this.setValue(c),CKEDITOR.env.gecko&&"select"==this.type&&!c&&(this.getInputElement().$.selectedIndex=-1))}}function l(a){if(a=n.exec(a.getStyle("width")||a.getAttribute("width")))return a[2]}var h=g.lang.table,c=h.cell,e=g.lang.common,k=CKEDITOR.dialog.validate,n=/^(\d+(?:\.\d+)?)(px|%)$/,f={type:"html",html:"\x26nbsp;"},p="rtl"==
diff --git a/core/assets/vendor/ckeditor/skins/moono/dialog.css b/core/assets/vendor/ckeditor/skins/moono/dialog.css
index 8732d52..89b78c6 100644
--- a/core/assets/vendor/ckeditor/skins/moono/dialog.css
+++ b/core/assets/vendor/ckeditor/skins/moono/dialog.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css b/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css
index e5b663f..5bccd40 100644
--- a/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css
+++ b/core/assets/vendor/ckeditor/skins/moono/dialog_ie.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css b/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css
index 5f84bd3..469981a 100644
--- a/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css
+++ b/core/assets/vendor/ckeditor/skins/moono/dialog_ie7.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_title{zoom:1}.cke_dialog_footer{border-top:1px solid #bfbfbf}.cke_dialog_footer_buttons{position:static}.cke_dialog_footer_buttons a.cke_dialog_ui_button{vertical-align:top}.cke_dialog .cke_resizer_ltr{padding-left:4px}.cke_dialog .cke_resizer_rtl{padding-right:4px}.cke_dialog_ui_input_text,.cke_dialog_ui_input_password,.cke_dialog_ui_input_textarea,.cke_dialog_ui_input_select{padding:0!important}.cke_dialog_ui_checkbox_input,.cke_dialog_ui_ratio_input,.cke_btn_reset,.cke_btn_locked,.cke_btn_unlocked{border:1px solid transparent!important}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css b/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css
index ead4df5..756811b 100644
--- a/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css
+++ b/core/assets/vendor/ckeditor/skins/moono/dialog_ie8.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{display:block}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css b/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css
index 03977db..689e7f1 100644
--- a/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css
+++ b/core/assets/vendor/ckeditor/skins/moono/dialog_iequirks.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border-top:2px solid rgba(102,102,102,0.2);border-right:2px solid rgba(102,102,102,0.2);border-bottom:2px solid rgba(102,102,102,0.2);border-left:2px solid rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:linear-gradient(to bottom,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:4px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:linear-gradient(to bottom,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button_ok.cke_disabled{border-color:#7d9f51;background:#8dad62;background-image:-webkit-gradient(linear,0 0,0 100%,from(#b3d271),to(#8dad62));background-image:-webkit-linear-gradient(top,#b3d271,#8dad62);background-image:-o-linear-gradient(top,#b3d271,#8dad62);background-image:linear-gradient(to bottom,#b3d271,#8dad62);background-image:-moz-linear-gradient(top,#b3d271,#8dad62);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#B3D271',endColorstr='#8DAD62')}a.cke_dialog_ui_button_ok.cke_disabled span{color:#e0e8d1}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok.cke_disabled:focus,a.cke_dialog_ui_button_ok.cke_disabled:active{border-color:#6f8c49}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;border-radius:3px;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor.css b/core/assets/vendor/ckeditor/skins/moono/editor.css
index 8b7dfc7..8d55378 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css b/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css
index d270461..9a7bd3c 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor_gecko.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor_ie.css b/core/assets/vendor/ckeditor/skins/moono/editor_ie.css
index f48dafb..ce453d3 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor_ie.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor_ie.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css b/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css
index a12cd39..0c4b7c8 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor_ie7.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css b/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css
index 03b5647..0a24458 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor_ie8.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css b/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css
index 46d0807..8e24021 100644
--- a/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css
+++ b/core/assets/vendor/ckeditor/skins/moono/editor_iequirks.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2208px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_ltr .cke_button:last-child,.cke_rtl .cke_button:first-child{border-radius:0 2px 2px 0}.cke_ltr .cke_button:first-child,.cke_rtl .cke_button:last-child{border-radius:2px 0 0 2px}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}a.cke_button_on{box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;border-radius:3px;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:linear-gradient(to bottom,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:linear-gradient(to bottom,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:linear-gradient(to bottom,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);border-radius:2px;box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;border-radius:3px;text-align:center;opacity:.95;filter:alpha(opacity = 95);box-shadow:2px 2px 3px 0 rgba(50,50,50,0.3);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon{background:url(icons.png) no-repeat 0 -0px!important}.cke_button__bold_icon{background:url(icons.png) no-repeat 0 -24px!important}.cke_button__italic_icon{background:url(icons.png) no-repeat 0 -48px!important}.cke_button__strike_icon{background:url(icons.png) no-repeat 0 -72px!important}.cke_button__subscript_icon{background:url(icons.png) no-repeat 0 -96px!important}.cke_button__superscript_icon{background:url(icons.png) no-repeat 0 -120px!important}.cke_button__underline_icon{background:url(icons.png) no-repeat 0 -144px!important}.cke_button__blockquote_icon{background:url(icons.png) no-repeat 0 -168px!important}.cke_rtl .cke_button__copy_icon,.cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -192px!important}.cke_ltr .cke_button__copy_icon{background:url(icons.png) no-repeat 0 -216px!important}.cke_rtl .cke_button__cut_icon,.cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -240px!important}.cke_ltr .cke_button__cut_icon{background:url(icons.png) no-repeat 0 -264px!important}.cke_rtl .cke_button__paste_icon,.cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -288px!important}.cke_ltr .cke_button__paste_icon{background:url(icons.png) no-repeat 0 -312px!important}.cke_button__horizontalrule_icon{background:url(icons.png) no-repeat 0 -336px!important}.cke_button__image_icon{background:url(icons.png) no-repeat 0 -360px!important}.cke_rtl .cke_button__indent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -384px!important}.cke_ltr .cke_button__indent_icon{background:url(icons.png) no-repeat 0 -408px!important}.cke_rtl .cke_button__outdent_icon,.cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -432px!important}.cke_ltr .cke_button__outdent_icon{background:url(icons.png) no-repeat 0 -456px!important}.cke_button__justifyblock_icon{background:url(icons.png) no-repeat 0 -480px!important}.cke_button__justifycenter_icon{background:url(icons.png) no-repeat 0 -504px!important}.cke_button__justifyleft_icon{background:url(icons.png) no-repeat 0 -528px!important}.cke_button__justifyright_icon{background:url(icons.png) no-repeat 0 -552px!important}.cke_button__language_icon{background:url(icons.png) no-repeat 0 -576px!important}.cke_rtl .cke_button__bulletedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -600px!important}.cke_ltr .cke_button__bulletedlist_icon{background:url(icons.png) no-repeat 0 -624px!important}.cke_rtl .cke_button__numberedlist_icon,.cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -648px!important}.cke_ltr .cke_button__numberedlist_icon{background:url(icons.png) no-repeat 0 -672px!important}.cke_button__maximize_icon{background:url(icons.png) no-repeat 0 -696px!important}.cke_rtl .cke_button__pastefromword_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -720px!important}.cke_ltr .cke_button__pastefromword_icon{background:url(icons.png) no-repeat 0 -744px!important}.cke_rtl .cke_button__pastetext_icon,.cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -768px!important}.cke_ltr .cke_button__pastetext_icon{background:url(icons.png) no-repeat 0 -792px!important}.cke_button__removeformat_icon{background:url(icons.png) no-repeat 0 -816px!important}.cke_rtl .cke_button__showblocks_icon,.cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -840px!important}.cke_ltr .cke_button__showblocks_icon{background:url(icons.png) no-repeat 0 -864px!important}.cke_rtl .cke_button__source_icon,.cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons.png) no-repeat 0 -888px!important}.cke_ltr .cke_button__source_icon{background:url(icons.png) no-repeat 0 -912px!important}.cke_rtl .cke_button__sourcedialog_icon,.cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -936px!important}.cke_ltr .cke_button__sourcedialog_icon{background:url(icons.png) no-repeat 0 -960px!important}.cke_button__specialchar_icon{background:url(icons.png) no-repeat 0 -984px!important}.cke_button__table_icon{background:url(icons.png) no-repeat 0 -1008px!important}.cke_rtl .cke_button__redo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1032px!important}.cke_ltr .cke_button__redo_icon{background:url(icons.png) no-repeat 0 -1056px!important}.cke_rtl .cke_button__undo_icon,.cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1080px!important}.cke_ltr .cke_button__undo_icon{background:url(icons.png) no-repeat 0 -1104px!important}.cke_button__simplebox_icon{background:url(icons.png) no-repeat 0 -1128px!important}.cke_hidpi .cke_button__about_icon{background:url(icons_hidpi.png) no-repeat 0 -0px!important;background-size:16px!important}.cke_hidpi .cke_button__bold_icon{background:url(icons_hidpi.png) no-repeat 0 -24px!important;background-size:16px!important}.cke_hidpi .cke_button__italic_icon{background:url(icons_hidpi.png) no-repeat 0 -48px!important;background-size:16px!important}.cke_hidpi .cke_button__strike_icon{background:url(icons_hidpi.png) no-repeat 0 -72px!important;background-size:16px!important}.cke_hidpi .cke_button__subscript_icon{background:url(icons_hidpi.png) no-repeat 0 -96px!important;background-size:16px!important}.cke_hidpi .cke_button__superscript_icon{background:url(icons_hidpi.png) no-repeat 0 -120px!important;background-size:16px!important}.cke_hidpi .cke_button__underline_icon{background:url(icons_hidpi.png) no-repeat 0 -144px!important;background-size:16px!important}.cke_hidpi .cke_button__blockquote_icon{background:url(icons_hidpi.png) no-repeat 0 -168px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__copy_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -192px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon{background:url(icons_hidpi.png) no-repeat 0 -216px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__cut_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -240px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon{background:url(icons_hidpi.png) no-repeat 0 -264px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__paste_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -288px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon{background:url(icons_hidpi.png) no-repeat 0 -312px!important;background-size:16px!important}.cke_hidpi .cke_button__horizontalrule_icon{background:url(icons_hidpi.png) no-repeat 0 -336px!important;background-size:16px!important}.cke_hidpi .cke_button__image_icon{background:url(icons_hidpi.png) no-repeat 0 -360px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__indent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -384px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon{background:url(icons_hidpi.png) no-repeat 0 -408px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__outdent_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -432px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon{background:url(icons_hidpi.png) no-repeat 0 -456px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyblock_icon{background:url(icons_hidpi.png) no-repeat 0 -480px!important;background-size:16px!important}.cke_hidpi .cke_button__justifycenter_icon{background:url(icons_hidpi.png) no-repeat 0 -504px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyleft_icon{background:url(icons_hidpi.png) no-repeat 0 -528px!important;background-size:16px!important}.cke_hidpi .cke_button__justifyright_icon{background:url(icons_hidpi.png) no-repeat 0 -552px!important;background-size:16px!important}.cke_hidpi .cke_button__language_icon{background:url(icons_hidpi.png) no-repeat 0 -576px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -600px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -624px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -648px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon{background:url(icons_hidpi.png) no-repeat 0 -672px!important;background-size:16px!important}.cke_hidpi .cke_button__maximize_icon{background:url(icons_hidpi.png) no-repeat 0 -696px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -720px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon{background:url(icons_hidpi.png) no-repeat 0 -744px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__pastetext_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -768px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon{background:url(icons_hidpi.png) no-repeat 0 -792px!important;background-size:16px!important}.cke_hidpi .cke_button__removeformat_icon{background:url(icons_hidpi.png) no-repeat 0 -816px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__showblocks_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -840px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon{background:url(icons_hidpi.png) no-repeat 0 -864px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__source_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -888px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon{background:url(icons_hidpi.png) no-repeat 0 -912px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -936px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon{background:url(icons_hidpi.png) no-repeat 0 -960px!important;background-size:16px!important}.cke_hidpi .cke_button__specialchar_icon{background:url(icons_hidpi.png) no-repeat 0 -984px!important;background-size:16px!important}.cke_hidpi .cke_button__table_icon{background:url(icons_hidpi.png) no-repeat 0 -1008px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__redo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1032px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon{background:url(icons_hidpi.png) no-repeat 0 -1056px!important;background-size:16px!important}.cke_rtl.cke_hidpi .cke_button__undo_icon,.cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1080px!important;background-size:16px!important}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon{background:url(icons_hidpi.png) no-repeat 0 -1104px!important;background-size:16px!important}.cke_hidpi .cke_button__simplebox_icon{background:url(icons_hidpi.png) no-repeat 0 -2256px!important}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/icons.png b/core/assets/vendor/ckeditor/skins/moono/icons.png
index 03fa64b..fd52e40 100644
--- a/core/assets/vendor/ckeditor/skins/moono/icons.png
+++ b/core/assets/vendor/ckeditor/skins/moono/icons.png
@@ -1,30 +1,30 @@
 �PNG
 
-
IHDRh�T�6IDATx��]	xŖ�	�$dc� $@������0D�M
�T\Pd�#.0* 8���>��"��
-<��*a	
-J�′�����w�/u��׀lu��|�v-�����_u���w�(��߉�!>C�K<�8�I�h��Z�n����W:t�һwo�iӦ
-�/r"�����+�.��������t��e���Õ=z(�$����t�W�^ʠA��P�3�G��ddd|{��B�Z��͚5�~����IOO_����7z��Yw�u�R�V�c��NU��c|�.�3���n����4$~3%%��J�P]�r��吐%99Y�С��%��7�P�(͛7?3u��R���Q�[SX�Gu��Q�L���2�&r��a*���6�7�?�%sz��ƍ����:7�zDDĶ��(��Ş�OBr� ��O����s%���-�:��o���>��2r�He��
*�q��J#�v��ԳP�B��t�>�sħ�ϟ�~Ȑ!���ߏ�������Hܭ[7�$�
��J��Q��	 x+��6��/�ӧ�Bj�ܪU��-�/_~�=��hS�q���8�}��*�n߾}%��������@e�����̯	��mժ�9���+W�w�����ݻ+-[�D@��'>IB�!�jժX@Lt����yN���7n&�
o��T��@#�s�L$j�m!11��&[�Ĵ�4�Ne˖UBCCʬ4i�D
J�1b9	���"�J�*U~�\���			�/_��2�`���A|��B�c�B�v�e��8��E��M=���N�^Ǹ�>_u�
|@����ݜv�#>t��w+4�P�9��}�
�
-����Ƥ�N�uW|�n��S�Aݺu�X+��E�e�����аs��*�����y0
-w��ƿ���^|�^�^����sW�V� a�ҳg����]�GC@�@h]H�۝f� .�X����*UR�˯��6�p�S:\��T@�4.#u�����#>L��
����m۬�^Yq�N��WT:v��(���
-H1u�"��	t롍���.&.^��")��iӦ�Xv�۵k��̟�yt�7'�`&�M��Z��{��"TLA�<B��q�mذ�{t�a���5,Ť��X%@w�4�n��ԋǠ�۠/�:�z&4.�1cF�zذa@�b�ά$���0�s`�����Φx�x�< RG��h$��x�Ȳ��YӦM�i�U�E*��Щ(������Z���[�N�:�h���Ÿc�6m�;)~衇�~��'<{w;�ރ�M�-����!����T�$9�`�aBZ��
���W����M�a#�P��T�!3��",,,�;[
;v�M�ӓP�Ng�@'�����'}��c����Oj
-���pL	�:������G*��H`���'N�8�i%��ζm�V!4:ѨQ��@e
-;+�
?�O��[AA��gϞ�{�A��&�C����%����ǎ�3�D��߿E�D�����Vjp&$��a�7��X�|�Z)���Rn�ϋ�\	�z��>�+��t���>p�-��
u�/���5j�8�X����P�
-,g����>p,0�qF���X��
-X(n��V�X$I��(��^a�c�em�+�o��w���-s��y琐�
����G�
k����ٺ�
$�1m-�x���`f���í���^@�ڵwC0
>��&Vs�J��[
TY��H^��
��!�8�R@RR�
gs��2�:u:�������
-������ty;��>�̨��-[�����˗�LHH(@�*U�����<�5�����b����l�g�%8�K�t�nݺ۩bWQf;l���
�R��7�m�4��d�9�} �cI72
��"nb��z�Щ%��D`�zE0v�C���t�1�љ���1f�e�ر��@��O��z����x��i�?���{��ߕ��O�p�1�z`
-]K������a,����;�~���]}
-�����3��P	���ځM�4ɣ�
-�[|��ד�}��3P���O=�T'��y<77�x�nݎ�d�����W�>�:�H�)��ƪL��P�-�	&�!zM��ׯ��7�|��.�O�x�aÆX��C�=""����"��9&��30z[Y���3�,&��edd��V�#u/,,�L�Mf/n[�z�L�%?XI�6��D&9ʍE{"�P��)GB��R�<�	

���&}&U�OoC�� Zt� �Z���^�AAA
н�ȴ>�k}��
-��T�9}V�!>�e�Ov��(��r�bKRJ�� qA�����T�飋E|�������GEE���u�5I_�^��!S
:t�Ɩ��0LH�KJ#H~���-Z,40s���={�T7ő,t��� ŽOa|���'��f�%��W��Xs`��T��}�a���
�4#��.hҤ�Qd�6,���Iܳ\bk�������E�Ν ]�v-����n�f���s�����q
-uұc�s;w���-`>if;�6mz099y?��),���U� ֈ�!szz:�n|O�3333uAq_���L\�"�Qƍ)))��g�E?@`ݧҜ��l�����dAt�S�slu����Aa|�y�e˖�_�I�c�jհ�1_��Ԅ��)Sf]��+W�+J�7-����ҡ����O�\�򩂂��e�6l���K�35k��T�d����y�x�;Ｓ԰����nBl�����\\�؈�*�>pI�$.H\�� qA��K�0�0M��X^��}����Ī 0�
�gq�YZ}O�e"�ڵkw
��X���!i�VhK"�b�>_0\�gqY��c�[o���Zd��aՋc˝h�.����~�, 5��X���_�^�פ�k_Bpa%PO�x}�8���^ig�P_A�w,�% ,������Ò�=Z���i�7k��N�:��A�ڵص�Y6��YR�I�� qA����,���W�M��L�>]�1c���4H{�K��O('NT�{�9KF���%���ƲI��g��d�A�k�-*����Z�jJ͚51�"�}�{a^@���Q�F�+�Ǐo�H��W�)���5e��2M��Β$]}����n�QÆ
/	`K��a����S~�N���_E���ڵkW�����c�p1bĈ�jԨqp�����	��s'S�Oů ���x£�?&22�NAԦ!�ɤ�$x&�{l����0�b�aԵ߆�z��G��-�
4h����!%����ᰡ��̳�c�Ol��l���Z�j�|tt�.L�`*��φ�
-��`�>��A�Q�%�5�?y��
!p����5�fh����ի+���׉��#�1|�QI��
��$]�T��K{�I:��8�'�M�$�o�H}��s]�����S,͋��^@�<7r%�e�����ՕD-
i M�t}�r���,b���~��o��v.�
-���w�7[Ձ����)���a�CT�/� W'�[;����X{����}ɽ͒nz�g�pŒ���7y��l�V�ߨ	�P�/~��7N����U���0���d�s�;�[�pa�P'2��8�݁
$0!ټysQ	�u�ߡ^�zp�9�鿳:���O���$��:�a;��O� **�t��K�U��
�	��x�&/p�}o���h�������qJ���9�����S�45k�\K�;���-�9^��I7
)-&�͓����v}Z�/N���W�_„b�œ����|F�O�����-tef㄀�#L��X8B���!gX:�v��'}���qہI	,���|;0)��v@��ܐ� I�����LZk�s�p�
-&%19)b�!
Ҋ�<oS����hT��-[�k`�!
�^���Q��-�s��G@ V�x�[1�ت�+�r�YҍE��f��v���y�;o+{����c1Kjj�y�^Y-���ԚQ���><�b��?����OII1,�Aѓ��XǬ�X�<�}�#X5>�t
�\�o
����)k�k�Q���q��X�~��8%�0�6��|؆¯92c�Z$�-p�z
e�+�,����t�`O����7o�L��^ii{�>��p�#(
�१��,{�V��C�z~N�ƕ/��/H�t�c0
��Ȏt���t���pmG�,��i�ҹ�����r`D�q
:�
-�I��?�r|��Yi�:��8,��'�6c7;rg��kMJ�?j366v+|���u	�,Y2�F�����b�݇pi҉�3N�Y_#0���5���l�����ݿ��˗�.[��v0�߀�Q��k���ec��*K�o�l,����)'��Fz�"����5�p����M�%I�~:�Z��E�oG�-]/���Vq`�/�~�s	@
.,<*�m���)ʦ���4'=U��F�g��kDR���Ny}���^_�
!*�x}���Βn"l��K'��I���)^4����8�d���=r]����ɼb:�
.���E:�m%�t���h��nK`���^�����>�󜚚�����W�^E� m@���X
-NFFN[�"h�S�4H�Js�X��lp�,:qa�C�e'Ĕ󕌭�J�.]��z
C�b?�L�|��=	��-))ɟ��t��E�x3ٷ�>��qVS�<��	kϼM�Nb�~\x?��2J�>�U��|bx�KLL�g���\�üv�g�������Q#�!qLȬO�X̋58Ĉ5��
-*�C�E��m�#j�8>i��
�B� -��#��][�ˊ(���4H�!^�<�%��uŜ���������Xw������������_���v��*�?�,�_`J���f�ɱ�a��}������W^�
8)<�YT�A�v�[�'�Zꅩx���]��N��*2c�~ٵA���-
[ȫ)�I��^]d��j����p˷�����vV�%�vny���
���3s��I..u�C%�Z�Cܝ�#��D��Xa�+��-Vt�[��1]���3�0П�c��܀%�sy���%��Mb��˃��ym�<��{�@��fB³�܌Dg���Ciݞ�f�s�v�	���w�0A� ����x��n������GV�\�V@;�����jղ�vv�/H�� ��J�x��
-��w���p�a���]���t-@?^p=js{�'�9^�t#R��~g�L��ӧO;o޼�999k{��{�ȑʐ!C�1cƬ�����Ξ={�-[^��x�� ��u��'�y�t�2�w�(m1�'K͚5ˣL�����YM�HK�v]���ћp�N�:)����X��+�m۶�ШQ������������e��]���E
-����O�FŬ8	O#�	8��۰����`�Z�v�L��/��s�)j�lB��,,�8�)?22�099��'N����s|K�(q|jj�W��4n���]����l�p	k��S�ŋ����Q���1b�p��5�jժ[�n݊b?�eg����z��%����N��H��������fBN��~�m��`na�$;���ǟ�������/�����yr^~?�v���h�x�����K��������}�R���
������^k�"m8z�ϫ�D6�(u�H[#��o�����Y@!�-;;{�H[�7n���I�bŊ��gx������e����v�G�ȹ�+1l���D�#7MK�2���oeu�����F�A�j�`�q��4��c����x,q\�Ph��6G%�7G�X�|��T�~v'`��i;�'j��+G��Ot;�~����El�0�a��KJ��xS`�c����.Xb�t�!�a�g�u�H��2����.�L��1�!l�]Y�e�ĭ��O�� ӹ�rp�a;����c��!�8����qqq�p2�ȪU�����𠠠�o߾�t�PոT����Az�s���x�W��3�333���+�0�������?Kg$
0Ie�iѢE�]ʢ�jժ�L�2#-+Q����#�g�w6S�~,���~�٤��p��t�$���+FV�v�mn�IH�[!f�����Xa)�F׫B��B��5!���@�kX0�a�*�t��������6��aE��G�	����`
S�C��
-`�&���.�Q�0a�)&h������`�a�e�	��6��	�t� 1A�$9^��9^��I��xA��xA�$I�̄e�)�X%�پ(�+�E��Y)_�<�_���+|%�]�Rs�p[ӫW�/��$>f����*(�!�AQ����|8P"��e�O\�}hX�8i�̙k�F�-J�B/�e���֭ۅ����L��'H��8t�P|�_D�m8p �g��VG
-����X�u�TJ�������% �k�/-%%�e�c4hJ��I&
��}�0r��[�[�>}Գ�Ǝ��z�-��N��ӠZ�}TOJrr2Nռ��tժUٍ5*�ڵ+L5ɟ���>|���
-J�3gΆ���b�Wxc~�v�׻wo�f�:��x�����Q�_���;5<!�)"�<7w��]��=��e��#zmܸq/���nb���h��q����n޼ys��^��$~�ҥ��������S���/��R�O]��&L���F�m:����E|!qc��$�)�{1b�mO��>(R�j�f��jw��>Ү��A'��d�5�j���Ðy��Gh�/�"�Xw�$y}�
�6���05�H�h�(L�˜C�9vaj^�����
S���5}�-�a���y��[�m����D#V��BQ����O���HÞ}9`�I��L�M@��}�5s;�}�KT��$�7_Do���vL	4�Ʌ��P�
V]%�'�O��I"���=z�PA�����|�q�W���9�0����Z۷o_��������>ܥ�?@�#>>~;�������:�Mt���'����F��3�-I/�.�F������!F'��k��7~٠A��̚5Y4�*K<u�޽[h����ƍM��=!���__CA�L�;	�י�?8q���}6��JğZ�?"?VI��d���&�
�V�'(T`��._d�am{f,x�
��Rv��=�:����	<F3���%���·����#��`�$�����QL`��lF+��L�?���|Go���D+�
����\
��苿���t�6㭺�F+��񲆚�����*�

��y���/{�%I�$qA��I�$�pv�KeG�R�v�A+�I����ԩ���}P[�-��ȫ�;�ZH�VT��	i�%@^V���}к^_��K�p���o+nyԼl�Լ����y�j�H�ˎ��T5�����x)A��R���X��K����
����%@��IEND�B`�
\ No newline at end of file
+
IHDR����1�IDATx��]xUŶ>	�$�Q��
C(���	%
�) M@ł %6�X�Y@�=5�����UT�R.�R%����P *>PP�WbH�[���Ü�g׀�Y߷�s���gϞ���5e�|��ˆ���K�3�y�c���d�&��]�vʀ
�#F(���SZ�h�P�'B�4h�2lذ�������{o]���w�5J�ݻ��JbJ�IIIg����:�SEQ>!~�xYFF�Ww�u�7�ݲe�Z��r˺���u�����q�Ǐ�}���+u��=n*��T���7�?A�n���n�H��SRR��d
+��7��		Q����Ν;+���Q�^p#`ՉҪU�33f��'e^K�5��}P�~}��_\A��zx�0��+�!^��kć��:=BI�f��x~t���]+""bGTT��RO�'!�����'I�5G�Њ9��N�q}��ժU[��C)cƌQ�b���ު�4Ro�(ICK
�*UZ�L��#:G|z�…���s�=(�X
+���\��={���H����(%yő��B�lO|'����+��ϭY�&�R@Ŋ�y着6�G���S:u��Ν;WSi�Y
+_T�:(�����P���m۞��J�
+~��
+�ի�ҦM�
��F�$d�kԨ�����w#09ϩ��I�&� �FAmMл^4"8����@�v111��I`�eKLKKS�T�|y%44T��J������ѣW��pK
�@-ϫT�^���U������a�ʕ�(�3v����9.">�*�'XP�8�� �_$]�ԇ���os*�U���U���O�>��ik�;�C���r���U��l�T@�L�6&�v��{��t[4h�Z�u-����ŷ���&ݺuSA�g��E�Xܝ���{�
�{Æ
?Ⱥ�]�f�Ä
J�>}�q�w5Z

��u]�t�9���r��*.T�RE�.��v�x‰O�p
��S
A:Lи��-��M@���g�߉odm�f���J�v튾�ҥKF���T�@J��a�HN�[m��������0�h�ҥH��̜93Ʋ�ܱcG�g���O�{7��q3�lA��R�7��"TBA�<H��q�mڴ�t�a���5,%���Y%Fw�4�n��ԋǠ�ۤ/��?�Lh\���/�G�	�.aq�J��	
c�:�80
<J�l��W��"u!�P�Fr
+���-�ϰ��hѢ�[%hP��K�J�R�jnܸq��[ؾ}{ь3��R�;�o�����￿���dz��S���_'�F|��,�>⏉;I5!I�3
+v&�%��sa��~"�_��ԡ�6�J�*aN�#2S?�,���¾��k׮9�;=	�N�tt�a�񂂂�q�GlG0�%==���@��/�)�TG�0y��I���	L��ԩS�;�DT��:(�F'�6mz�La�`�q"����-,,���ٳ[bccO� ����r����,88�����x�6���n��勺����j�΄T�[L���K\@����+�!/-U��8ĕ`����J�Z�I�.���߂_P�O�,~}P�v�C��%11�\X
ũ�Bq���	�X�'��g��6�Ŝ����:ieN�E�����F^���b��.|/��270�w			����w����Z�=��;
+@@�������`�Ǭ�^�a&8<<�ZQ0��ԫWo/���Zibu1���.�@�U����oܸ�ҏs-$%%bp6�.׵k׳��J�/K
���k`
+LNN>M�� �^�SȌ�iӦͿY
+X�reNBBB!W�^�},�Q�9t��4�p;�ޞ@e'=s��~z�#
4�I���0�a۔}X���@��`��h7} +ε�ٰ+H��	Ht;qs�4X��O�NmЭ� S��+���\҇%����n|��Ƅ	��'��).>
��V��¦��X����$f|W��n�¥q�����&--
&t�d�X:s�m�)T��vVC!�'����
�A��7o�O�����/�����g�ҡ�{챮:e�p^^�/={�<�y\\�G�*�U�����#����*)�#�[�V�L���5-lԨх�_�qJ|� >��&M�`QOo}d����bR�KLz瘼�'��0�M}d#���Xc��8B0v\����=[-dX�ԫ��h:EL6���y�ڵ97V~���n2�Ls���DT�R�S��`)�@y$�j/+=L�L��ކ�'�A���A��6�R����{+"��i}(6���
+�`W��s��jB|˾��8��^ر�Ŗ��$qA���$���Gw��4��6����)���:A�됾<Z�V�#�:w��!�-aaa�����F�>�S�[�^l* ''gz�>}�Mq$�26���c_`�y��GgZ}��6l���T��A�tg �q��)�h+
�EEE��7o~�
f�!C�`���Ç���)A�|ڭ[�B��D�=�sss�۸��wy�ܹaiii�`�B�t�����ݻ�;m�Oچَ-ZNNN>��d
++ �b�1�5�Ȝ����������E]P��ă|�WƷH}�#�qsJJʿ�aя�X��4�$[��}�+]@��[�m��ɟR�`�kӦ
�vW�fM,n��|45��ʕ�M��*T���M���g�th����S�V�z���0p�M�`����L�:u0U0���`z+�t#���[o-7l ��4��� �b#=W66⟉��e�$I$.H\�� �ƥg����I,/��>��zbU�̀���,���!�2�
+;v���X���!i�VhK"�b��@0\.`qY��c�n���Zd��aՋc˝h�.����~�" 5б�nY[�`��Ie)�>��p`��@=��E�,|�,�z
��-K@}E߱@@�@��z�/??K��i	�J ��u"ު5�����j���;d��fۘ�fK�'I���$.H����~Z�9s�2k�,��_2�i/}	y�e�ԩ�SO=e�H�������X6�<�䓖�4H{��E�#�θ�Y��R�NG����k��^��*a�ر�J�ɓ'[2� ��i�h(vMi.OS��$IW^�a�[mԤI��ؒ*h��}��)?n�����/
+��d�ѣ��d��8c�p1z��Oj׮}xذa��	���N�\%>�_A:�?�'��c"##�D=�LJJ��D�u�m0�x>�Q�:���;�]{�T���I�ƍ��4��a2"<<6�A�y6vL`��-{� B�����X�n]\T���ރ)L���0Q������$l��`�mG	x����<l�������5�fh���Z�j)���׉��#�1�ң�6�\%I��ii�rS����t����3�H�k��~F����:���ƞbi���B�繙+ASߧ?��$j	Hi���=7u��T�&`	��g<7Ϫ��l�R��\.~��U�J��P7�1��'q��@���xk�#طkϸ�l�/��Y�uA��l�XRbb�W���&�S�ҍ��/�5
����>��i�7����
+��攜���`.w��/��DFX�gQ�s�;��&d"[�j%*���;4l��E,@8�wV:����U���S��A�u l\C��DEE���x	��*6�!1A�/� ����m�-�?���#""N�Ӱq�Gu~J��N�:���CGu�u���!�r� 醡�eń�yr�_8l`ק����{��%L(q�/̉0A+���gD�D�O�N/�0��BW��l��|�	��n
 ��K>����Q0�v	���:0#�u l&%�l�������
ѯpCb�$I����2i��r��
+&%19)b�!
Ҋ�<oS���pШ�	[�����C��
+
��^�c���;��j{b�0���e#��*�� �%]_�}�aj' 
�ѱ��g���y[
����h��,�����zeum>cSkF��j�F8�Kd����F�G|JJ�a
���6�:f��`�E���'v���i�8�U��P	���MYc\�՘�Go�4�/q?3>f�Z����m(��#36�E���!7�P�a嘥ޑt���I4^�u�V��	p�+-kO��z�7pAi�/=UϏ`�K�/ 
+��[p�6.�x��xA���+�	�Gv�K�e��|�~`�k;�%�N۔�(P(O+�ڑ.F���0Aڑ$I
+�j��s0�8�5�6}����נ���
l���O����ѣ�����&~��wO���t�yǧ�C\�A@�IXGVw篁f�s��`�1�ŽNq�[(S�J4�{��k�ï���/��/;�O��'*rjjj`	�ŇՎ`���y���3�D��*���ly����r}�N���'4Y8=�ql�.[�m���MJ�w��g����u	�-[6�v��;���b��Ҥ�d�~��F����h��1$$d;���5�\�rN���w���:|��$]=d�0�(s��P�X�}[ec����La8Q6��k�}Ǖ]��}`���h��o��(Iҵ����� d;�l�zE��@n΃ կx.�j��6�8v���I�+��4'=U��F���׈������Nx}�������0k\�$]�����N������S�hj�'�p���?�u	�:�S'��|7�p��k�|��(���^�A�-�A�z�R�K���3&�0�f��$H��i:�X���
��ddd,��������8�Aڀգ�K�t(N�Ĥ$Q�@@�i��Rbg��H�{���Jy��!�}���O�|
��0	0˙���O��l�����/�}��O�g}��SX����N7'L���0ĕ�S����2�������D�G�N��<̛�(����.QS��"qL�����8�c
鯂J�+�i��Ѷ5�v�\�Vo��
�E� m��5��h{7X��i<��g��Ӽ���tcS
��0O1������6f�^�~y5j�-X�
��Y��aJӑ_3��x����v��p�G$����NA*��z:
��#�.�Oڵ���xv��]�\�h	p����J �]��h	�M�N�6|�� go�|�Y����|�\$j�>x�i����1̽K<�$.\*\�z�Jֵ!����&��S�^�[�0p�]�+��-V�����ׁV����9�0`��_��v��IJ�I��tip�����).��
+$�oN��t3^��t�
�Һ��i�s�vw�w0A� ����x��O��K}}��7�e�%ڎ���ㅺu�Zb��)��$.H��Wȿ�[�0�z�Xa��+D���Z��ٵ�x���ͭg�%r� �z�l�����ܳf͚8����������w̘1���Õ	&�Y�`��9s�߶m�3VO{�����k���a�0�|���g��FN��q�^˖-�)�k�B�0�	#i�9�k2::z�޵kW�W^��6�:��6mz��V�`�����z��~�3�Ha�����٨�'A� �ı"
����yIKӪ�`lwpp���!��?Ga���P�&d'��¢�s�
+"##����;q��}�=�g�t�ǧ��~��N�f�~޳g�p���.a��B���t��uT|<���x�SV��Y�kԨ�m���(�}Xv��o߾YR�H��$ڊ4��J[�����`&�������&���O�S����f�$X�6%��O_�_w*����4_ϮJ��wq]���7�k#W%�-����y;����U;�''8���:E�:p�Z�B�W��V�nik���M��ܻ�`#(ĂwdggOi�I�&M��;IV�Z�
���]��uиb�<��i��9�%�Mq\�p�iI���~�⭬.�}~���?(_
?�6N���z,q\�$SK�@�=�8.
�9���%�+N?���;
��N�
?Q�7\9�^�~�����<��]/�`��
3T�`XRJLǛb��?�p��a��Vx>�ti�Sf�Ѐ��D�I�!�fg˛mWV3GEEYfq�cD��:3�t.�\f�N���
��y| �`t�{\\\�x�Y��`��P[9�N�:����*W~�>H�ms�h��Jp�@?cp�\ff旾�y%��������tF��T��֭[���,jQ۶m�˕+7Ʋu�z =�y��qg3��'�®�췧M:���v��₤��t�Ȫ�N��Ͷ 		a+�L�3�#?+,���zU0�T�ݼ�&��S�z
f1�P��ΐs��6�Æ�3���0!�,`
+u0X
̰ÄA����EWJ�Ƙb�V����`
�Z�V[�0�a��a�@/��S�
$I��9^��9^�$I��xA��xA��KLXF�B�U���r��2������+B��A��W�ٔZñ5}������a�#8��^XEC_#��'�Z��H�}N��f�(N���Y�c�IѢt����^��={�QXX����)��F��/�H¿MC����}��H��r����J	��W4�ܿ��u-�KKIIy�X��R�k��I��>E���-��������'v�V�V�8D�T�b�t��IINN���KM׬Y�ݴi��=z@�����QڣF�zW_A)s��ݔ��Z��
+�a������������lX�;����_P��1W�ixBSLyn޼y{(�{<pGˬ��{eҤI����ma�����:;;{�������]l%@i����C���yg�Cl�ȟ�{�L->222 ��<g�L�����;t��qC��"�fRiI�S�	�<z�h|۞y}P�P�Ї`��jw��>Ү��A"�W��5�j^#�aH�<ȫy	��3�9	S�{�r4t�G����yED{�Daj^ͥ�Țc��e�/��Y�aj^���W��n��>�)�|�
S�Y�h�*�Y(
+S���ռTpH�E_AyҤ2�t�p�{�ܑ�$�S�g��/�7��z;�����r��*#G�,�����#�'k�$a���޽{���myȌ_��fg�s�W����"a�t�qj�
���c�<x�:F`�p���~/�����ؒ�.?���T���w�b�u��P�$��ě��V'&&^� ��~�]púy���7n��Y���U�g�߿
8�۸�i������(h���/�x7!�����N���gc?�B��E���c�$�O���a�kb�p�a�{�BF+��Y�ֶg�
��7�ށ�
+(U`����#��|`���c0�
aXXZ�|�~`�L�1�
��K�
+�:��	�`����������������7�6 #��*s��/�b�z"��ڌ�z�0X��/o�9�x�zQ���
+�l��]�$I$.H\�$I�ugGz�Lv$(UiG�Jڑ$I�&�~��JY���d�O���3.��Dl%@U����Z��aeOY�����y��o���↑G���HͫN�{,����P�Dj^�J�S	Լ;.Hͫ	�R�
e*��/�,7�t}��%:^d�IEND�B`�
\ No newline at end of file
diff --git a/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png b/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png
index d34a783..7269c52 100644
--- a/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png
+++ b/core/assets/vendor/ckeditor/skins/moono/icons_hidpi.png
@@ -1,119 +1,107 @@
 �PNG
 
-
IHDR �U-�ctIDATx��}	xŕ�X�%Y�}��ct���5����$K�%�}cN��B6�MHvI6�l�O�IBB�,!�`�@8��3\��6���K���n������H$��}�U�;����������b•�_'�-���Lx#�>�R
-7�,y����������q�c�.�q�ֿb���e�qq�R�K	��#4*��uSS�s�e{��e�H�Ν;Eܽg;��3�������aѢlj&O/��y�ŧ!d'	�BW�a��v�Z699�֬Y�֭[�6n�ȶm����q[O�KBB�@�K}���9�Z������������544&<644$*�y�fQ�U�����
-��$]�OQ��������#w�u�����ʕ+�b�M�6�44�����G���Srr�޲u�x�����cǏ?'	}��z�[	��`pp��A����6R������ۺ�mԕcccb�
�Kr�"P6���	/&������իW���׳
����뼞|��
���b����b����!R錀�RYU��q�E�R/�%%b32��J�Ï?^��ɓϽ���;v칷�A�_ኆꗕUU����&�j�UUox�1��¸;����WV�`ά���)-��[�	�p���ށ
Q8z�p���>_ω�Ĵ��a�1	�GF����]��_�?
-�&�JxClR��1�j!�m��̘�{�z���!8������E%%���W�J���Ɋ��N����I�f(��������+���
-Z���Ii2�>���[�!�~���8�P\1���Uc�HIM=��G}�������%t�x
Ь�%���澺��ߑ��'WK}'@Z������ݬ���?$��Hk�1�&��o$������Kh����mK��g����'!g���}?��OJ]<oo�$,Kkn�������Lx.���tQ`����=�; ;'/gΗm�V+���_R�]==���|)���^T:::���L���ul^�x���Ԍ������ކY}}=+.-e�%%��`����LhX�G))),11�S�S�s�y>��磌�z��G��t+�OF�-�X�P,�v���8p������`�|(�#$"�EDE��P*��3|��GK��?"<[RN'�q�E�.�����/���?_������gg�y&�ڸQ4H�󬦮�-
-:A�_%�ץ�:�\v�g�ݻw�xI`����}�v��s�;O�����ч���n�}��u�V�/I__��U�7"lE0ѣ
�<���FjK������:Y8L�$�]�yW� �%��n�������`���=Os{�i���%?�%SU]}Bň-����%Eg)
�G�O
-l�1�pxM&׬a��f��O�%�)��	_ljn>�%��e�f]>)�I����=�ij:���*���:-{�0tg����{�}R�	+�,KC��ӣ�@�Mh#��hln~�z��'��}��2́ᱱ����7�St�n�[oJrn�.)**z���C��k%�4ˎ�R���WV�^ұ�q�I�%ԭ\������/YN��m8	�u)��$����PLY?�r����AX����E&$s<<ap�aс�&:`WW���0����&\���
�����$|L2�C��j���{�;���#W\q�#tw���|����TKk���E�TTUA��|R`%1Õ�/���g��B�1�޸���YT=�a*2���c�kF��+f���Ƽ<(�Q���/�����ůcH�0zn��'>^�mv�
�]�{;����U������A{(-)p��
-�3�<#x����]X�b�SR^�h�!�o���x��g�������.ڏ�74�vd��RYS�n���^+�K�0��a���
�a��	��p�����MLI��KFlolld	�����k��Yu=��c"&$%���x��YFV�����
^R <'7�]p��X�^+�I���tE@�Ub^�P�\5,�xK���EJ]p���ŧu��je�@�"i1�����gHw���`����~߾���'���cbbXtt�~�Z\\�ө���������U,Ng��  �
-�
��|~'�����@xM�MX�?(9p���8p�7`��q�x��҃��~�k�^+�.�9ؽ[Dؔe�yw�ƍ�\����m���c�>,���s>~è���a�G���}���CE�]vց�!�P
�,�0da��a������ֲ����I��z�@�d�����0���-���;|����t���yu����$t�dʅ}�k���A�r��
-K�-��sь?1
�'ߜ�[1�����|�Ca�����K����&Y�h*��q֤q����Ο`'�������K�EzTr�]�=nG�v$������66���(��E+YFVΟ�;_
-��U+d�5���7�@�|)�Ǹd�
�
]~�� �EzhL��c�
�QsE��9���R\UWw|�t����ef�Ǟ�R�#�{�luC�=�<I�g���3k��¾z���۫PPd�̓����NVRV���������\S��]=�s��l��t�?�N��w��;�+9.�%�}uMͧ�����0��i����B��O����쬯�������bXB«8E���$��D�
v��?�ׯ��|v�-�\������H��$���J�Axx8��ͅ�����5|#z/�@�4|����8p���Lp�	�&�ዄ��{�;�q��&�=260���U,
-x�������g�mڲŶk�ۖ��m릦lc�W��mյ��L��fX��c|������
-ۖ�[m8C��3�w��9�m�6�ʄ-[�[���;vL�ڵkzϞ=l�g�޶s��h}�I�PZY�11Ĺ
QІ
���Iatt����~����aժU�ڵk��SS����K/%����-۶a���q�Fa͚5����0>>>��~v͵מ~衇N��'?9}�e�A�鶶6
hmn�>t�7,˗�L]�i�&a����U^��/�,��+��[N�vtL��@̊���)�r�գ��9~~�G��p;a�f�""�A
-�$+�Ӊ��QiL׭['���WҸoߵ�	7_Ձ�c��B���y2u��r�Jqҡ&	�KKO���[>�֢@�J�l�����bo�_S�-#;�����C�/�~�XO�~�ȇ�

�䛘�{
�1555M���u�lݽ��,>99�����D�c�wtQ����~
�܎�+6o�l_��o�ޱc;�޺m���V�R�ȯ1؏~xv���@�
-Z$b@@��d�!00PBCC���p!"2R����������j����NI2�+PZQq�LXV^~�l6����fuuuB}}��������Z���I��������������f��eph�F�ҩ���SR�����1w��mw�}�ih*--�V����'��9@��ش�c��Q:'�O)���'������a�gz{{�c��n�k��� ���>���]�b��@)Si�0��L�L��A�PĦ۰q�4�X�vZ���l^_e`\�-`ٲO�'���i>Pc�L�ۡ�ohlv�s^ޅ�,��a�t�R_o�MJ• ��=�vv�v��)*6�S��iLD�#���D�귾���=�k6m�.�&��;;m
V�����VX\l�3�lUU�孭������������]��W�kh�����qz�@k��H�Xkk�x��$C7O�'.芧�I(��j[F�'$$o��oxt{��䪟������tFF����-�PMM��(5�s���bˋ�����T��/��M
-�˭6s�?���K/��aݧ�f��OC)Z�0�x8��.������l��f_�u���\Z@����$�2=�8��Hx�E�ÌE"»�"������8p������Om���6,^���nv�e��[WS[��&��]|P�����	�)B��f�Y�l����N�<	�DPٯ}P^Wwdͺu�yėA��%˖=b�Gj��$$���>��v��$���������y=�jc�26����bH	z�`�~qID�r��������z|��]XR�b�c׼�
-�#�����9�c��7(������
-|gHL&�c�bH�b�%�g
-�������c]��8�r�(,,��	�V�qEP\yee�,�ۗ�e
�Q�z�1l�Jľ���n��;(qsnn�r�!�m����8��c݅+��غ+��#��ý��Q�bƦe�`'563�[��}Ƌi��S	q�頵ݍ��"��b�X���}
OP�:���I��nJ|�E�r@�)��0޿��x}b4���ƣ
�"��av�'�e�t�	H��>��3b4vZ�%מ�����wGZZ�ce��D�"�b%\����o㒒X"��������EDj*sz�a��w��#*;	f��ُH����".�ܢ��ɏ���mq��z��.�Cm�s���R��+� �1=3���ŋ_ݶm۽�}�+��A��ꉉ{�,Y�ZN~�ç�aE���@ؠD{����c���Վo)�P�]��@>
CLF�K���—pr��"#)
��?#̕�cc�������###E��`�4t~�C7�P2g;���@Bv�+��g����n�����4��*a��4��ps��P��U�8p���o��APЁ��&�qv}dtT�QTT[������Q��&Rb���O7�Z��11����+�0PWW'�F�2��
]<&�ʦ�/�:yL,mmb�]O�
u�TX���>֞�zyL�L��L�����D�5ʈD�7{�u�xm��c�}�{L���1��c���11���xzyL��<&���zyL�V@�	8p�����@-ϱ���*�}��͂BC�Ǒ11,��ʲ\����#��E�o*�Z�ʩ)���پ}��<�\x�K�o=o�~�@9ȉ|���@���$�4F�3IW
-�ef޺Cʉ��H���CC�Va�s���R�贴[7K���L
���@�� [C
- +v�@z���1ؙ7��'|R����!�*$@�m;v�T 2%��))5����m�)���'Z�a/�@a�w�

�pCa(���I����jbB4N��tE�HN�UL+@
-@	�O
-4tu��U���DYJ��r�o@R�����^���N6*�Ej�
4��KL�ف����
���ext���RK9�]*�JJA,*Ms�'j`�_�RtN����G����o
-����j�'S��+“�5&%^F�aS�
-�(��;�P��'����ʏJM�>b85�w��2�h��Z�������ѽT\�}F^�S#�pѫBC�����^�(�XD�[��F��hX�t�����֓�-9�@Eu5�X��ul0��߄�@��wDÐ��	g�Z��ݘ�P�>��ӳ��h��G?��ʒ�2[��?��!kCpX�o�z�ĀL�

���˳ə`�GH��[����D�%f���S"'Q���S���YRJ
-�2YyE��C� /�yi����O/���N��sl\�[�ΥtR@����#&U��=�F��K��ߐv��>��������?�p��Y
�"��C�����w�}�h��5:��@ᛰ�?���8묳�	vNN�������������������X�%�ɱM�ws)�M��A�H<�t���%E�W��s��PG��}@ޢG��D�ƊI�e�����c#�>R\"2;8Ђ�G
-�q�{w��(��8p�����d\@�R��`�M�o�	�@҄�
�t2��N�7��I.��𔥾^4Nnپ]�c�|@p��mG�aɒ�kkra´����i��k��p#�bb^��
i"v#���vٻw���H��B��R��cc߂A�̳�y���'�		�ެ�
-X�wQc�!�wDv��Uev�[�h��M��l&Zu�M*��
s�r���?��*AO|J����+V n�jN����7�O@[G���xyg�	���qQ{_��
R�lxGQv�H����k�Y��Xg7�g̢�hl|Dt4H�5�Q�l���-==/ý#�
-�u0����:�b@��#v��4�첽_�(B4~쮝���j��iѤ+��y��\[_���!���gC+W
-C��Ӱv���`S=����B��L'����:�O鶝��R�J6�žh��{����Q����kں��ں:�
�"Ӳ0H���"�&�,'��-7�z�PYU�����0h��fަ���p��#�v����찆�JpUT=&Ŭ^���rn�[n���E�*������}����Ʀ�k7l����epee�����J!��k0���B�|�]��g�G��ZmzD���p�d��2"Fj�q�τ����c��;��v���-Qq���
 ��>''�
�1%Dr]���{H0,�������oh��6\50��m���%�(_����l�Oу0fggg۞z晷�~JiN^a��4y�mqqq�.m�~�M4��+*+�ޖ��|v�����߸�_�44�>h]ZV���8�$]}�F�!A���!xff��_~�	)em��p+=#���_~-}��W��qh�99�b���ū\᮰�(s�Aɺ�[���E��pv���q*C��Ԥ���&�s�I�'�z�"���|��H�9��
��_%�ԋ���<F�J��0��QO����8p��	,p�2|��e��3		a˨
��DW�+ׯMh�
gdD��vD|��P���*�92"��}?��O�nt:��P?%�
-ֶ6A�~�����F�%�h���A��
%���japhh�h�G�M��B
�1�W��әyy�)a%�VP*q�u�	=����������#�������r�˧�V��ƿA�p��OQxk;:�����5����J�!z6!�i
�"֏��mm�RWǪ-V��aU���Y��`�2���㻢��U:�!��klԴR^�
������l�JT��@g�MMBie���ʫ�`5O3�)a�Z���2���ţ��W^�<�өYY���҆�W����Drf�k%��U�P}�
-(�����+
G�}[�s�\������E���L(khp�RTWMv�g
-i�4�
5%r���p�("%E���r�����gY��,2-mF
SM��v�C�Z�+�EP˯���*�G��Kzg���0�|�7�TT���7d�,.�!��T.�!��D.�!��X��
h��k�
-�����I��Yj���:[Z����!8X����
hAЀ<�����~_xW�V8p����+���/���/���/���/���/������_���_��8p����ԀH	Wf����[�
��,(<1e�����1{��{=�.��~��eQP�xr{�aɒ[^挳�b憆�<������U�ػW�CE_���2Ѐ!b�[Z��X����<a\��Qu��HWWX,"
b� �JES��Cp�E�Q�׭_oO�k���AT�zdUi���-h�W�&'o���;���p�!��Yg�v�&>��>##bb��4h�@8�Ȳ�����G��7
-l�\��@�o�'0����(KA��B�j���� �55~r�7
-�!|Cyy��p\NJ�pW *��e�~)�v;\�(�C8A@������cǞ�*$���߼⊇��x�4'ecIp�W

����I�r�A�İ��鹓x���2F�)��X���B4�1)��<1�����†nG��A8��������}��;*�H͟��	1���r�!9j��'}��塀�2����¿A��ȡ����2�})--���W^A菟��TB��_�;R[[{\�DxޭV�ɧ�}�)j�,&���F�!'|qxd��RT�Q)]����
d
>�E 
m@O������ ��b9��w
-�������`yJF�)9?
����wu&R��n�[xvTB��qĖ"A�c_VVf�%��s�=���|
-q��<�4�y�	Ѵ�%<%8"⠜��RSS_}��g�-`����3)))� �=(<�b�m
F����? |I��2],�n]]X��x3�-e|E�����a��bzj���DFψS��'=�Jo@o�WU�
����Y3���HC�˛o�G��ӯ�Cj��Ao��Ԝ�����};�[�,Ҿ�`�~���� ������ܿ�]����һ4(�d��P��Ë�;��Ф�'˗/����?x�9��]\\�:x&��~@m���G�VV��45=��t������&�,4�)�y��Z�o@C�����'�8w����J��f�:\�=�0Nߕ�{��L�7[�Q��U�m�P��ձg�{�0�����Mz>����4����K.I).-���U�GG�>�Eoݺ�%���IT�W�NM�+*hi�g�!����RQY)�����Znk�rr�QW��>��	�%08�5�;OMO���w��o��fbJ��&⁙a�W�CC�mrZ�{�3�uW
-���,$�M,����V���b�z��ٗ.���W�M@���УH؝g2�8���� [�II�o}�;��}DK���к�@Xx��DR &&�dTT�ӏ>��U;K�"etx�z�����w@�!�~�/��cR��lw
-$KQ�d8&-4�i�.hӡ�ZF�ѓG�w�|H��^m�t8����}8p���O������������@��p��x���/���/���/��8p����?=�΢��g!��Ī��z�?o�>F_I�e
��}] Yz�~M�m���m߽{z�]�Ν;g#���`?e{���k�d�—,y��>,,��LN��W^�6o�3��e�Va˖-���P�6h+��x��V%n�������>8)��k��^51!�Y�VX�f�:Rڠ�����RO��B�Lou��
-�����-��<�<���R��^�R[��T�6h�x;�/�o�
-TX��Rĕ��ޞ/�O�v�@}g�PmW����dqv�����+h�U

x�U��Y�/��}��\���
�$������}ZQ�{����`a�v������C��칻�@Vƒ/�H�V瓥�Y�P�`c{;�b��^���#b�뻻YcW�d����A���MM�Y�2{�]���ᴁ��?����z�hK]ѻ�STWǀ�"�c��A��@g�+����\�β�&V�Ң��KUt9h�j\�2��0��C���]ܡ��j�V
��ۓ�"lONE˱���j����2ln!����1�X>u)M\UD�����ې*�\
-d��1��C���*�bs ���ez�h3]��"J�=@�Z~{��a@o�
-�l8�_�h߯�Dja!K��aYj*K/*b�tUFD��f��hS�=�>6�0��,�
AAs��^,YJn��C�ŤTS�*�8LLN���'N����$b�I(ّ=F�&��T .@go�K�����v+x��wo/ђ���7�'_|�pKk�&DEE	�a�	�4�_^�n�!,�M�(�L�oc}׃��8p�������_���_�p
���@�/���/���/���/���/���8�]�mIp�-4<���x��[�֡!������M�l�tB�O���i�]����ֳz�m`�۠N^�	�||?�s�F�������<k����<�lh��c�ֱ�M�Ĉ[�@��Ț�@au5k��#��!�P�X*梌���+Bd��^�>
-p�oD��\������`�m�w{����y�>H�����r���8p��Z��'&ؚ
�ݽ����[;�����Pj�E<�2��fC��k'�f ���	Iú�f�+�5G
l���}Lg)�F��K�Q*�	jIdͩ����E��\�I���g�>A=ɨWS������#)��(4����n���e>��ε��3��"6#���Ώ�����2_�Ω��b���׾vScS����(�U
G93PI���
-���}�+_�uZZړ@�F��
-8ʙ
��ʀ
-6��E�4ʩ#��Z���(s87@–JJ<&!~k�
�#^5�w�os'gĭخ��k������Ev�uSS,�h����
J�-�s(�jk�G.��B�eAJLLN�	W���

�����@�st����ee�W���H��l�~/
	��,�
��59.����Xi�.^���=��&;!%��@�2��Zt��\'������p��?$82�)�!#diI��b�~xB�^L088�rF�*�г�I�B����Ź
	����J�W��a�6
-��8b
-	�Q71��#o���1y�������+�m���{`C	�
bdc�j�O�`
-e��"c��؀����D�ʯ����v{%��!
-��M���ݎm�P���.O툇�h���D��?��n��"���zG�G1R�NX�<^��#"�A�Y8��
-B
Q�^
�![�Crn.��!(,,sUXi�!�ވ�!Iu{P���F�}�b�11�cDT�'p�)��s���8p�+�i�c:I�PL�[qF�K�@��8�z,��CC�����Xj���)�º�T�����vK��Y���hU�B��ɬ}},���3/> ���E��+ Š�
-w�tx��P���:�[/�*���b���]
����˒UV旻����JV��vی�~d���+�fHf��EEj
- ��~W���,)qT���\��AR�u��n���=�7(<���a6fwѺ���@Ai)+���¢"�d�&{����b2�R����$��4A�R��l��%���N�u���ܗ$���q��у)))/deg;s�L��:7O|v�R�oJI8O�$$��I7�tY�)��qL�[	��9��L��lD�R
Su5K���A�(�R�k�
�c���V�e������ �SLV���415�xY2����̒���w"�R
ZYdz��
-x������<��3
-$�L�(�-Dgd��11�V�46�pLv����4$�,��;?�_�8p����a��ȅq��;�X� �c23o<k߾T =���g��W���/�1��w<����{�
-\j����b_��d�[rJKg)���
-l߽{�
��6쾵:�5�����ܽ�>�#SRnܺs��~�{�@DRҍ[w��
-�����7nݪuhs��ذe�,�++m�UU���55,;?�'�NX<g"�nؠu���������Ͻ��f&aj�k��tU�v��k��j����{��,��-I�&�\�u�A�_PL]}=��;�;��XLRҌ�Uk��R�TXhS�1���ȷ����M��j��9r�h4���k^�?ϙ����7�MN�wR�=j-3���������'�g��CI��ի��H�V(�cbn��:@��'s,&�FGg)���m���-�wNn.��[R�]���o��:��Q�

�U
����V����@pt�,�)�Ft���T .1���c���=�����R33Yh\���������>@o�-���>`X���$L[������oť���`&�,�A����p���8p�����|
?_� �f��>��
�`�tW����9 �5x$��8_���|p�gp��`w~�U������VP�T�g�H~�1�Y�j���|
=�������b���/{��'�ϳuS������KJz��������:��j��U.P���R
����(��w��6����~���/��8p���8�S�3�GLz\NΩb�F������S�,��˩V�~B�����m��9_�����
s' �m��ş)�ߊ��NY�[�,9���Ǡ�A���
�P��������S��p�>}޻R�g�����S�T�0���2ホ9��z�p��pԅ�#	��QFq��	t��;A3�c-q�2KJNU��/�#"D����8BG�=_����/q�"�:�8�*���!L-(8吉�I�l��|��mw�-���|jj�'ؐ�+%�O6�N�(Fz�/8S��@qBx��>
OCE&]�
��%���ݲ����
-f'B�g�M��:�
-��2���pԅA��(�h<��w0��b��O)3>�C
��1YY��+����"��Oe��Cp��D����OB���"RSO�ۃ���}��yCR �dZ������S���&���`���8p�����a~3=;���5Qv�8�L]<�Q;\�1����=�^'/�T���ȾXm����Z]<U3;�|r-lR��CV����zz���I�&���٤p�8��udDWO�Lώ�h4�;苊�Xqq�.^�	��.���e

���L9_�^�Y��۞O�%���id�B��ײ�$$�Ԍ����p,C/�o~|��,Z��h�l��`:!x�g�¼�����^ uE�o�$�$��<��.���8p����y�Z�
��h�����~�̺�_�
w�SRªjj��h2J��P]����
-,����&��Om�Ȧ6l`맦���7�
�6�<��1�]CUs�g���+}3��J��fA\Z�3��;�%��O c~A
b�0w��ǟ�N���Q�R)I��:�U�y�UU��f�'��
h}^���f����Sl~����X*���<���u��ao�I�,��Y�]V�Z��Ygw7�����O�.���y��[�rr��/���/X���GF.��@�W��?�s�,�$,�'��,8p����.`a�2x���/ �'�t���<<_��_���pa7�}v�-�mH��8�6l��z�'�����_�=�Ƞ���Y~��
-|���M���^����������s�8E���4�#p��/��O���?;�����~�.z�Ȩ�_����Վ���~��8p���G��
-�W��¯���
-d1��.����6xq�@s<"�~U_��g���K~=�����sdA���ُ�K��G���#|>�(m�]>�5�8Q��/P��y<"�/���8p����?��K��^��?%|]ŸJe.�	tЗ�x�^�-hԄ/	9�78ȶ��!"~�̥R�<O�V?ݾk;�3�Ν;E�o�I=�_2��_߼u+ۼy3۴i����2��}��׿�f�:�
��2ԹT�]�k�μR�}���z{�ӘOLL�u$��(C�߇�7�KK߃IghhHD�F��C�	�hkk{�d2�
�o����		ɔ"��		��yY�$%�oJx�	�����?
�Yfn.3j�L��U�iv���Q���e��4���y%�o����029����^1{x/��+�F��>Ⳳ^���^Xz$�o��Υ�qq,.>^����MM��ﾥ�e�_��(Cݼ<
�##߃��b����(�קa}}�ӡ��o�?
�Ӑ8p�����'=-+v�����3|f���ޯ�e����uW�{��s�{�.~�YO������~(�-8,���C{�^~�Ϟ����u_�<��뮀�~}��~]���������4�j��OC8p���8p�����!���*��н���ߴuu�:�� ڠ-h\p�xhtԶv�[Za�M�g���Tw%t���ڇ�D�K	�k��lVRb!����m�.-
-X��lu����Zu�ڠ��:;muZ��� AM{�
�`
-T��ڀ����ۀ�@jA���S`�C@Hs��y\	���N����6�FD[g
-�.�d��++mVZ�rr�o!r�SP\l�5�N
�d���l����R��)��`KЈh��@Dr����ږ��gK�߱����?�����˦I�M4]H4m���
-�3o�ILF�-����7'� <)��e�����p���ͯ޾����[88p���8p����h���lS���302b����Z,s?���~������ѡ	�4X�����每X�
-X�V[�����
-�P�������9 ����VKà�@um��B�C���
-XT���6�˗ۀ�@I}����������)���﷕P��_/������ĖWQ1���?S���ϕp�ؚ����6�����WTW�r���u�+́t�ZLwv~�
Aflv�[;����̴��������9p����	��\V�d=cc��
Q�62��_����h�dT�%�lf�SSl
-Y<�~�6�z5~����4�U�oȀ�9CClU��_�	׬Y�,���Ŕ~M�K���4�ݨ��Ț�T�v��Y�f5]�?�(1��o��
h�C�2��h[����ʍ7� �
-f`ŊO��*�`h�I1m�<!��P����	�2de��\�P�Ժj͚O��F
�7��L��2 kUso/�.C����I�v�Z6�	]����ijz��g�
�*�/�oȀ�9�u�iHUUU������nRF���qbF�/P~
�����H>���
�5�:���?@�4�'YYY�uww���qQ{�h�81����(C��4��O��Ț�@aMͽ�w�m���'w ���x7�jF�i=�9ңuh���
-xH��x�����ń����ٿjnnf�4qV��hjY{Q�:�A[ЀV!<X�}���ʾ����;v�|577W(*.��f!U%W%�P�6h�pW�\-(�j������^%�+�E����z�W͍�b��"��%͙�(Cڠ-h��hYl�v�m�C�M�X+���UUs@��mAZ��*�r��g��]5B
-��A���Գ�RGb��m����
^nd��J{�ظ�jiv~��F�j��^d�X`:��XAu�P�:���-x�x�7d@�Lԅ�DLɯ����gX�	�5����U��:}�m�4��O�����)�;��`9&RF[�Vf*(8����~���m�4r,#Y d����5�Y[G둂 
�d�'ڧW^{�SX^],D��
ڂ��1Ï2 kqvI��} �e#�&''瓛o��	im�q�@ڠ-h@2?��ȚC�d���D�:%l��������x)���[��-*
Ђ�����%^Π��J�P����&�,5��>�}�
-x(yBF��B�XT��f�ȰN
-vXM�M,�?L@Z�SP�ȚK�t)��d��ѳ0**�EP�Ұ0͟fh�:����'P��=��{�xY������g~���8�~f��-�b���!��?�����v۾��m��,DY�� !��z�W����l���޳g��{��Y�2��n~����+Y����7�m�V+�H�Lۖ;l;w��o�.l۶m�uh����ax�xjU���իOoݺ�o���$1I@���Փ��ڵk]"ڠ��@x�xJ=��
+
IHDR 	�N:f(IDATx��}	xŕ�X�%Y�}���]sHI�}[�-���s���,�MHvI6�l�O�IBB�,!`Np¹$@ \���6�q�����#�F=3=3=I�}߳GU������~��=������p�𫄿&��o"<��"�‹t˖=RVY�Z�����۹{7۴u+�_���f���)���0Xk�;�cb>\?=��9�\�o�>����ڵK�={��3�<��}�9�����,��h%�������"�[�7n��֭[Ǧ���ڵk����٦M�������3�`�~YX��v���#"��_S0��իW���^V[W�bWWף


�	�


�JmٲETt5)G����>EW����ccc�h4���+̅�GGGB1���͛�N�555'�G������޺m�x哓�����cǏ?'	}������`pp�A��%������s��uw�&�+����n���I8 oH�^L���byw͚5lÆ
l#��.4�z�FtCc#3�L����}�{�{��Ը"��Kkjk?ASt��:R">+�i��?��?T}p��s���sǎ{��#G��W��������&h���
���Cqm��>)@����0�.#/���t0fF���UT�U�X�*'\�l�w`@�^�d���w,�s�99#�o����##���̮����_ ��n#�1>%��8]5�����v����z��!8����S��嬉�W�Z����JKKO���/�́P`u{W[O�+���*Z���IYTT��-��z/	����c��
+(^5֋����}�?�paY��d���
��D����W����z����j���ȸ#�������B��$�i�8F���F.JLIy��`aa!ކ�D�@xaD�'<	9��(=v��G?:$uy肽����^;অ~;N#����_�%\�P—/	�CUu�8�1r����q�B)�Vo����~�%����t���/���E���C\|���	99�D���N��:QSS��m���׳��
+�[^��B����g�#">JKKc���,���ʟ[�i�V������Gy�O�Tܿ�
+��[@�@�x��΁8p��	��Ǹ���P`gXT������TF�g�{���;	@x���F���/|�]x���}�]p�"�'<�~vƙg��M�D�$>ό[�Q~�0Q�8��s�g�����3�%�����;�:xL�=�<�k�NPh�3D�{H���;ٶm�D<�$}}}�W1߈��D�6P��f��-�_�;���a�'���GȻ�	,ao�~���Ɨ`���=Os{�)��;$?�%S[W���[`33/�SJ��
+R����F���5�Z���F�fb�O�e�i�k_ljn>�%��e�f]~)�Y����=165Wjx�C�uvu�rx�p;hf����{��R�	+�,K����GI�›��!��nGcs�c�3m~)���9���0���?���I�߄O��?�JSoZrna����>A��&L�K�u�A���
+��U�Ԉ^��	�Y�%ԍ�������%������S��P��a�Z�@H����#���a)�߫�������}�E6b��]]]b��T��G�p�k��t~�wN��q�4�V���믿��o}�[�\y問��8\SS����-���"P�S][E.�K�Qb�+�_����Ņ��z����fQQ�nS���&k>+0B�農��a�K]�/(��dx>�w�����5�(�������n��`�+B�bn�wa�
+!�����G1F�JK
+\����%�����q7ֳ�Դ�נ����DU[}V�3��������

��1Cj�Fv˝wn�Y�^b�{�0L7���5��0I	۠������ii�~Ɉ
ፍ�,)5�oxX��@1롮G��Ĥ�����Xbr2���aմ2BQ��K
+����/����g:Ip��
�J��U�񁫆�oI�r�rH�/�� ^X�Z�V��+r -FsVs�i���,��w�{
��R ��9..����*ᇑ�ѯ&$$<�����w�~��lq:ۯ
18W�
�(^��;9��� X�_��k�M�j�AɁ8p���C�
[����[4�������1X�w����="¦�@�w�o���EZ�_����>��Â_
�0��7��8��}��z�=�|�>T4�eg
0��r
+C6�J���ۙ�lfٹ���˴� �)}��`���!�>����v��ҥs����?���#�$S.�W_w�MN
+Tl*,_��>X�E3��$l�|}��bHSk�	�i�
+}~>��?�P
+4o��0��DSSW��&������t�;������X� �cRS���ǽ�t4Ѵ#���PW�����������dY998r�B)`���q���к�_����~�r�p�+��)� ������|��������M��Z����t���fdg��ޅR�#��fٺ��{y���ZE�#k��ľ|啷.ثPHt�-����������ѓ�%��h|k��
+�_a0�J�-�B'�w��;�+9.�%�}�����������k[����pl�'�����쬯�X����T�HJz�����D���aC��3��z�����WXȮ���봖_�Y��3p��g��?Ic�˚�1}�����˽>�!�f���8p��!���kC�"!��!�Nz�;�Yg�̄
�a�}����^����u����&&l��n��޻׶u����i���5���A[��l���m���?��
+�_Y]mۺm�
g��q�̮]�f�o�.P��u�Va��c�Ιݻw��ݻ��;��S�w����1	*jj>&�87 
+ڸq�055%���!�����/�?22"�^�ZX�n��azZ��z�d8�u�vl�6m�$�]�V&&&f���Ϯ��S=�Щ��G�.��r(9���&����=�>���+�n�.޼y��a��*/�җ`����z뭧Z;:f�U n����4u9�����o?��#��E����pb�(Lr(�׉��1鞮_�^XK���}߱{����	���0ʟ��T�FattTt�)²��:����;��(�5J����[�PB�
`��e��ڂ�°_����O�j���׎����A|���b/�vLOO���<�n�z[wo�͈�'/�q�H(��&J<x��w�/����Y�e���c��Ν;q��Զ��m=�Rf�2D~��~�ûy��a�d�����e˖	���Bhh�.DFF
+Q��Btt�LLl�L8�WK��r�wR��Z�����ʪ����d]]�X,B}}���-���l������NahhH�=�����L��`�
�hQ:YSWwR��v�]�?�i����{�9�M��j�����ĺA��8�=�N���sj�����x)
+{���W�3�Dw�V4�p���8��)n
���U�D�H�����8g�%�ʄ#6��M�f0.��BO��B68>n��*�lA+V|B?q^��C�
��4�n�����Q�s�9xx�2��hd�t�T_o�OI�� �ܽ�vv����1&>�S��D�#���\��7���=�o0m�.�!��;;m
V���h�����
+��lյ���������S�������]��+X0o��y��)К 4�kmm�=
2t���]�L7	E��"Bm+I�$᭿�
�n���\��������rss���2��2���@�	L=��$����
+���3/���M
+��T���O<����.cX�i��!�3P�!�w<������W_�I4���x������]!OJ4�Z>�q������#�!3�q��&����R8p���8�#�����~X�t��:�=�ݗ-�n]Cm�7z����!!�#��& ��
G���;n���;;��$Ae��W|P��rd����yėA��e+V<��Gj��,,���>��v��K��������y�jc�26�o��fH	����+.42�0⒈�q�;:XCG�k��VIy��E�]�T��xL\�a�@x �A����h��-�ΐ=��.�1!�t�.�^b��L
~#�CUU�#Rp�K�P�X�%%%�=
���?!��+���q���eZYCf��^x[��������[{�NJܒ����#֐ۺq�凚�-2��u�q����D�[z��!�;����ߎ@(�g��/-��Z���j(��*&��1���8��uh��VE͔�v�t���S4�p�+��D��?^-��G�E u���Op�0��e���{�g�h� �K�=���r̎����+�ى�"�b%\���ׯRRX2��ed���b�ETz:sy���wU�#*;	f����H����".�N�����
 
-�����C��N�����jj���z��	�m�V�<
^�	�n�ln�nln�𻰛����9���
^�	�n�����&�0;��#��	)d��P�����x��[�[[�
-�U��Z�[���oFq��^T��u��B����TK
-�( ���
-T��	@���a���De|X�
-U4��x�����18hk��5tw�zz��J��	����Ρ!�9��ۻ�E:��YVf�j���}D���tg�]�]��^��f{	�-uA_��(�2(����\� ��3�Uڢ������A:��T���0v�

6������U=�%���Щ�UU�������Y{�zЂ����t�@^e�
�T���N)Б^Ea
�T���
-[�b���W75�_��Ņ��L
-@���_�C��m�����\<!G�l+FFD̷oz�uJ@��6$��sJKm@���W�����o��N��#�#P	F�ٹ%%���PC;]eO_�����II��*��Ny�
�.�
��g��:W������YZZlu��6CD��3
�7�P�T����QK
-B����)&�
(���hK�˛�tp1����R����{�hκ�"�
-$�@���U���6yv�%�	
-�efe�.�� p� �h���Ey����!!���X[\|��k֬����s�S�FE=�����V�-x�x��;?֩O���ᶎ!,,L��M!*:Z�v�h���
퟈���3��%�v�*v��;���;/�4}�K�2n����8��6k{~�طx��w���l���/|��|��|�7���{��Ox�k��L�:�sϞ�]�w�v획T�:�=s�M
->�I�<�,Y�2��Y�L�/`[w�`;v��[�n��(C���A��Z��
;�7m�|�����{z��\����6h+)���RO������z����?�h��`�y�	���Bmm�PWW���C�U�mO�x��[`ӯ���u���&Acw�Pc���/�-�r��k�/��Z^����T;cV�o<K{��
-�
-iZ��4�!�����0��n��v��A��y-e<hp�W0�77@
-Ě�9<̬������3���F�Qd�mm��PJ��ԅY=���Y���C
Z�p���Y���7�{�-uE�ά^TWNJ퉳e���̪m�l�9���B��ڷw�640��r�m����pgV�6�|��vjˀ.�ͪ����
�>����)vǃ��+B�R�#��
�>����*6�c�|uS���%�1�o�f��m���v`RweVϢ[Hy�y����%�EEl�Ȉ����ӗ�N�h�\݆�@�)/w�@fi)�"T*�I�M!���H',P�:���T��PR"�p�d���L���<��vl���ϘĤ�\l��P���r�f����y��	U��ȢV�NW����
--����"".�iH�Q�:� MW��.Ù^(��,^��~5%RL&��LLd�yy3��
.A�8�W{l��WP �gf��� 渒%�����b�&�v��Uxq���<�Ndl,3���$�,��x�W-x�R V�����.��8�i4z�W�������^�%��3�o2�+���
-���Bdd��
�-h@��¯�ͫ�+p���8�>�('���/hhkc�������?Q�`���N��w��6��;w�Fl��:�^��چfil��/ؼ};۶}��e�Va˖-�>�C��<��gAKo��*�֮u�/�:�A[I
/�&�[ݽ������J�b���Zu�:�Q��'x�U��j��kl��_���V
l������jw�����rW�����B�`Ӈm_w::�"�|z��|�����~9_���W?�?�� l��M��k����e_|�CC��ة���h6�&��q
�F������S����(s�p���h�_��;��n�����z�Pw�55���Vf���C��o��.E��-pa5/�gЩ���5--�F%�Vz��DG�J���+$�.���r������\zL��C�������z���z׻=_��Ƒ�k=���T�7����l�I�
�x��֕W>�����πN�<Ԅ/�����]p`)��^/ŠupD�+%|�YY�D/9.�$��Lb��I�c��cq�������|�����Ƽ<���o�����/�/��p� Zq�����p���8�����������j�������/�M߲�����=��4��=����t>_���|�K��'������W�t���~M���Wpk���_��]��~���Wpk���_��]��~�C���W8����+`ӯ��P=_�g����>l���)�G���c�
��a�W;_���f������~�[�|�+$�: ��|��~gJ�=_��_��W+�W���8p���
���
[����yr�֭l���"n���v�d;w�FH�ϐ�F�fE�
�S7���IDm��F�����:::����������D��$��p	��#�T/�om=������P����y�޿TJ�7.��{�@i��D}GFFضm��u�񁸷��(�A�+GLLL|y�����苌}<x�Z{���9)���O�<�Pdl|�Y���'A_���b�Z��u��\N�\U[�{R������V!���,��/���~������4
�HyժUb�κ�zv��w����������������3��F�]���QI�ʕ+ūokog}+V�>7�]����_�$��!�1U�u7�t�|\}`yM���$|H�w�t���ŧ�ꯘ����C�Zdmmiia9��"�C���IIv!9l-۾g�=^-��BdB�z������EE����t>�>���ᴬƞ�r,-#Aп��9��\�Þ��(���i������VVQq�(w�����_$��;�I��l�Q		HԻZ���K����X=�z�[k��a_��7���1�t�1?��A��F�X�DJ`h�3���@�E�5��= �H\|<�����GD�F����#<��W_}UYY�)�X�ݚ%�C##�GY+����>Gm7i}/����5*m���7��`aQѧ�t��f3���9�9ᩩ��S��	�@�؝�E�GU�O�;� ��fR���֦LW]\\�I���6�0x�	?���kf������w���}��;�ՅHLMeɄI��,))�%: �P�6h먀��O��H-����I�?=#m��]�����孶$8�izusggg���/~�^�~f%Eҳ�]g��Q��m�����+�9xWx
��/�r_nn.�b)��P�_��j�ӳ���m�[�u�B��/�J|�K���b�{L��S^W�$#��������+�/�IugC�K/���,��q(ſ|9p���\��\��s
^�}�[!<0����M��(��DH�
e> �ֿA��[
7�Y���'�{ｧ���2��\���~�^v�yy������#G��_��e����	�HH�Z$|eճ��:C��N���5�����5R�g��%�{�h��뻺X��1��+"�;�B�1��u$��{zv9��͇5���F%
-�,���3�aS���.��U����oCP��̀���������?����?CP���JT��tv�(��g@w�~g�rE��)�l߿J�����W)�����;���ql,/gF��r��~S�پ'��wG�ve�gO3��U�ݫl���L&�_P �IMKc)2���Q�uh�����)�
-d�( &<P�+�U�kqq��O�xZ�MmASk_�nP�
�Jv
�)��y���������eЀ<�(�`4�Yi_���,(C�\��򚩰��}��-�3׃(4�
's�56>d��
���OVX�ef��y<77̷��TO`������CM�?�FD��	)"~�u�v/����������ڽ+�4�5�:b2����x��(C�C����'�#"�D��2`����4�U�S*�,9�
e��i�Y�Ԕ��!��;��
-N�q���8p�^�#�����gܲ���:;_��oC�f; �^���ի�ڸe�Q���ޟݸکM�Xii�0��eRO�W�
-�����~��_�:�
��(C�v�����<��@e��M��b�AG��P��|��
�:�;��*P���e�j
-�=����Y��
-X�::\��>� j�+P���*TB�T8)�}*4:@�����+�Z��
-hu�8G����]:@�Dd�����?�c���3��"�@Ny�&�#$Ӹ����ZZVK��`i��"&���(�-�Q���k�S��rQxem�[
V�x�6������ǡ�U�6h�*��6�=q��%n�
��(==����yG�)mAZ���ϐ��e�����JH�������1#����G��c����Zaq16�x�
h�C.���z�ھ���?�us�Ԉ~����Z�Ђ���VQ�P�-��3��FY.թ]�������L�����D��%dg�xD�2���
��CHX�ۥ44ut�@�F����T@�P�'�.]z$4,�ٲ�PUDڠ-h���!%%塠��7����P*��@��AM	��Z�8p����
��6j���s�{p��$�廭���vt�����H�8�?84�V�[Ǻ��|V�#}����o���WfRDh�) �%����o``������j��Y��,4��
-����޾�髮�F~�'�����
-\���Ǻ������*���
-��ww{��%�A�:����������*�H
���;;�c~��cX�5߱!		���w����Y��
Os��*����ۧ���t�81r�UW��@�+���+~U��P�tߚ�E�_�|�! ��8�qfe�G��G'!>�$\�b"�<�K��V��4���QH�xٲ��� �r��a6�56
-eV�#A������i���`f����
-O��^�P�((�nؽf�#^e��3/��qr`h���	zu����W�u
|��U��B�"�J��J]%\V끦��ܠ���j���a�k�C���N�M=)���<K��j�5��(�.�
AfxL̛x���Z�F�����=3.]9:*�E,#CP�+T���G(�̤m������[?)04<��<%#�9*OU!�4�L���\)�������Y\W�,�uE�H#aQ޷aa�[��l`�y�$4��T�� I���+D�m��G��^�*�#��"T87��pKg�G+�7:�������v����vL�%�����f�*+�<�L�����tQ/�(>d3�Q���w��
�\$H.(��{)_a
����F$�-����l.+s� �օ���?�D�/�9>�s�Υ��M3e��}%%�i��G�S{P�ª*��LOH5��r�m��@�O�*��
-1��B<d��>!x�xj�/�	<Q�] �����8p�޾�^��t��aۇA�~W�|
�g�
|�(
�>l��|�!?��=��۾�o����%�������{b�5|
-�����,����{hVW*
�|�1x��7v�9J�p�ǐa�����
����\	���.���
>�4�pYV>�4j��+}�,r�|���������A�\-�T�<���`�wB_|��+��w�
�G~MM��	����W3�f��j=�
��K���Y�t��������0;F}=|�!����A���+?A�g�@l���K~���	���Ç �d�-P��5>�z6}��E#dP�+����3=|
���C�/
m�(��
�>����s�M�V�
��7���;|����U>(���-�ǀ�>�'=�~�ұ8
-�?���&*H��;���
|
-�-̬�t1�RX�
��Ms���
��f�_����E�P_�=<�Bj���'��/>�,Ep�$?�;X<�n����	8�	�;��y�o.h���H�
$�A��f�F���7��π�	����	8p���8h~���/��<~���/����~���/����~���
�߀�
8p�������/����~���/����~���/����~���	����	8p���8�]���	�'D�.d���)Xe*�Z�0������P����*���)�
�`�TT�ⓒ`1;E�P�Z/��E���Ѷ����m��&''ي+Nwuu�����hkk����Q�q�&�{�n�jb�E��ۈ����3O �𧩙�l���l�]���j��v뭷>L�۟(^���;�↍���?�a��{�ѽ�(0��=����0R�!F��ʆ��X���G��ӄ�	MxT��[o�}}}���걭�c99�VO8��tu�ƍ���0k��xP�"a?a��GM>ᷠĉw�}����C�֭[E>Q		o8ؗ�BC��|j�Ν╯Z��������[	��|]
C�����C��֭['*���qqH�o�I�+�����W�S���q�==�sϽ���܃O<3�q���&')#*
"U�sE�j�4ƕC���qVSSsL���Q^:j��/�+�����255�6m�������*0��)�rh�f��@I�����LOg1ф���g�nni/d�ڵl=)182�^(W7ӕ��4I
�1��������Y�7�1�]XS[�FH(�
-\�ZR��6��z�OR�իW�Z�6<�K_��ۅ��,)+{wx��0�'��@hÕ�&ͅ_��}P �����a�
�/�����j�������+f����9@Ug�������~��OÚ]R�OM��r��f�J��z�.��A~pGO��QI8VSLʫ�/��������Ul(��r�
-4�Q��b0����2V��T[�����Ji����@O��sT���t�OG%���Mī���w����Isy����5У�(&ψ����^�O���9�R�zzt���B<Ȑ�6͙YH���u��I����
-<�=��EK������У�55lyk�����n�_�v��������,��������L�?�dÕCx--F�))�If�Fw
-��iv������9E/ wV���X(����]k��8���sz[b���,55�	�T��������q睇���ު��`��v�O+c�}��ej��������P�Dm������>��G�`��X�4$�/a��v���m۶���ݏ�А����B�:̛��FF�����?�����!<n�����)�I�~\e�ҥߗ�êH=�r]]��&l	QW����i���It?�ޞ��UM����Qx�Ĥ����	�[%�߄��Cԕ��[�P/VUum�#77�����C����|�,Yr{��$UzcUU���І��-S\RŠ�]�����!"������}>�c�c�`�������x������L��-�ُ!�/$$����cccg0&&F���ȏ�CB^�̓^��<�DO�_������7w������M¿���c)����$��́8p� [P<���B�
�w��Qy�P�'��L�6l޼&Ta˖-�	�P`�PX �6lܸQnذ�%���ajjJX�n�099)�^�ZQ�6z��l~�����/�G�P]]=Q����!�j��m����S��	q��V�ԫdB�allL�44���+4WU	@��A&dF�DžZ
��ˉ�\�q�� �E���OHk;�,�t�k�'��dB�ax���!_����I0�H�dB�a�n�Z
=P���W� �
C��B���M8sР����v�	�,}+V��E�;8(�ڣ���2G��U���S�������$�@����f-P�v�	ن��^������UT\,�j��m����ܮ\F�ԫdB���I�����B
�W;��
-4�%׺M_k;ȄlC;M�|�W�q���v�	ن6�g�4(�-�Z��km��-*`Ҡ@]U��+���$+���IJ�ѷ��	h9w��dB����Q<��n媢W�*�y!]�A&d����ㅘ�X��T'�j��
�z��V.?��3&{��@�=§ܭ`:�S��n���8p���W���Jxዅ�o�sI\r�k7l`�@�!(����&�†͛Y�}��������8_�k�.�y��f�:�>8��e�e��B�l��px[��
�t��w�-^�"�~Ȃq�
��e�v�w��I8 �&�����Z�
��(�� ��33Y4}�$�1�"��0ͫ��88�AH�C0����J��7�=�pw����*Fs�a����D
-:���8�8 �3PC����W�c��]�}�;4)PY]}��q����� v���<� ̴I��K� �'|Ƙ��6�bg-��C�WCԡ
[��=.BT�z'�8o�+�����4�+,,����Eܤ,P"�zzzڈ[}����6qO1��v�Gp� 93��Jr�v�c��������W�EWڨ�D��C���o������{�-ˡ����L&ө*����-���}����b1�%K�{%eeb?0�W,+����Ɏ����72���26l��B��܄���;�e)�ރiii��;hfCtwVn.���<i7-�,��p�5��cYY��o��]��8ܒA)�5h ��.b��E	�!b�nA:8��Ym6���Dp�t��űCA�b��$��w�C?�������Mb?O����t�k�×�^��x����]��䌫��O���-����f4͸�^�����t:��Q6KM=Ի�o��5���T*u�ps��A���u3N�
-���Grm�ʼŷB�E��@���;++wyv�]6�������?�G��X�W��ɯ!뷸Wa���s�O+��P˝?cdz4bmU��B!�B�ir�x�
-��O=��	�pD�K��U��Ng�;�!<��f�Wҏ��M�P���}۳
-�`~T��p��5�>�I���-О`?�g/N��H��x"1�J����q8\
��(�@j�k�9�Y�d����q���G����A>��0~���@ߐ����(9٠9q�	^?*\N�e��#�/��������������'1iU�}^N��b�`xq��O ��Ad2��|�M��>�>�>'�D��d���������|u����L�ئ*D�{A�X��˓������p
8
��W@���S�s	�2Y~�s�=����7p������9d�d�d�d����8N�س(��/�6�Q��L�O�O�O�O��;�������xZ81.�G�[�1x�c�v]^vu�|2}�}2~��7m�?�-g�;�!�q
-�{�zP�0�D�,�L���m�3���R,�SO��[hA�����l٥g�;�!�,�@��m���0u8���i�b�띏Pj��;P5b]��&�B!�b6�����������!�B!��E��ԏH��ԏH��ԏH��ԏH��ԏH���B!����N�?�T:�F#Ҡ6��씃��zG�q�n��R��
-P{�b�g�6�\@m����K�Z�f�kc���;�����"_
�6�6Y�Em���o�+��K�D�:�s;�ڡ�D�S��B�@�O©L@!�B!����1�D����IEND�B`�
\ No newline at end of file
+Ķ8g��Y6��T����׳��B�
+|$����>�t��W�o�~�4�!w8ȕX39y߲e�^�+,|�� <,ks���l���r�;'J�E���L	9��i�m���r����J�Nι[d$%`~��'������x�+����n���h#��X$ݺ��ϡ��V2W;��@Rn�;���ϸ�ޮ�AdJ��p^G�}�B�U	���1����w.�w.�8p���8�j�BBt��0��@���#ccb��R��-�k9"���
ۋ���M�Ģ�
��n %�0��c���`ã�b���X,b8a�1ϫ�tk��c��lji��>������&&����P3�I������ڻu@+�IFQ��E%%���\�5:�u��k�1��>����g���8)�=&�c���'��c���1�
���ZyL���ZyL|V@�	8p�����@)ϱ���
+�����B�����qq,���rܴ�
���ccE�o*�Y���4�w�������_x�En�,)������ '�^�=��l���i��$e�)���}�N)'2�#!�_
+�
1$Z�IV�e�w�[b32n�"�&F2(�m��l-)��`�˞>ص�����`gނ����K���~�D�H�%����V�贴ۦ��Ģ�۷��@s_�h	��x#1�iޭt��
+C	��h��a�''E�4JW�Z����Ĵ�����K���.6�z5s$Q�i���7 ��O�S���@}g'���"5�F����HN�
ف���~)����[-��rX�U`���XT�Ǝ_
+a��`*1t����!*A���--b�Z�	��ם�����/��0��x��
+�[,�*���B�R��@�1���#�S~'8*S��~�(3���erF�R��U�����F$�W�n�W��z}V��dz�n���n��-.�GY[[O�������ǂ�s�c����f\򔈾#�
���pf*��ڃ
e��I?3'�v�|V��G]U^Yi���:dm���5U�a���7(�k�6Gf��R~�֭�7G���G���0�8�(�i��)��,%-�������Z�!����,DizɯBt�{'N�)>!�MD�;) Б��#&U��=�z������ߐv�K~����	�>�p��Y
�"��C���b��;��<Ѽ�ot>���o�����κ���yyy����_����}cc��v��C�/N�횽�K�nVH�w�F�qR��p����n)�}R$������82�����?t :>^L���X�;�>6b�#�-"��-xy�����p�ߏ8p���8pXL@��+�>��챉��0�H�p�ΞN�:{���:�?�-Tꂂ�2�׋�ɭ;v�vb�
+
}K���h�-[�\��̐�]��O]p0v^�̅�"
H�y�%�˾}�D�GZN��W���&�g�u����<���MJB�f��W²��#9�#�\5Pf'�%K��۴x���Pgۥr��0?)gfa�۩�t�7 G��P߻j�V+�$ȫ�x��u恿���Wvv��s�=.i��;�QJ�
�3:\6�¤ ?����Y��Xo7�g͡�nl|Dt4H�%t0��Jym[zz����W����)7.?ߩ����{Ff`fw��刲��!D����y����o��M��yߙ�����w��uy��?���g`�#����z�][[��.RK/�}�Y�Ҵ�����c��|O{�����oPGA_��׮m���€C��0H���#�f����7�v�PS[���330h��fަ�惸w�X�N|�
1;���\U�K1������#7���ފ@�EWo��W���K����Aẍ�#��
������_~���U�x
+q!4��i�[�s���T~��=*���
Q8L�Tt9#����gBpVNαAɎ��_��?–���b�g�a����{yL	�\W�1��;��fee!����胂�	W
L�0B���wK1�׫~&�X�c� �ٹ�����y�-��VC�WPR�A7
t[BB¿K[�Bn��-������RXX�n��cR���K��������|^�L�է����ggg���W�#��MUC|!�cefe�s�W\GD����A�B}^�{/�#�c�RC�;"&�EDD��~H�n�ڋ+|sIp0���H�8���mjJzNo��9٤śl=g~��O>��t$�/ƌ��A��/^�C�%R�%<�0��Qo����8p��	,x�
+|����+c+�
��DS�6�&4ц32"~N;#>�a�@����jm���KV�>���GH7:�_R��+k[� m���5�^+ڒ4S
+4uw���J�φW]s�0844���#�O���~��n�1�W��3��)a%�V/�+q���=��3+}����#}�������f|V�����1�J	���;:������v
�n����u���"֏��mm�d��:����FV[W�`���
V+�
ɼ�����eQ���Q�JyÍ7
++[[g2rs�+Q��"]�W75	55�Wʫ��Z��<C�W���j���+���M&�V��_u�Τ��xV���+�^)@Jԓ����sw=PN��^( W��n�t;B��:]+`q3������TYe�P���z�,����
+8�gJ���JJ䕖
+��QTZ����'����/,d9��,:#cV�"�Q���!em�;<EP+����*P@S�-��9={�L|�
?�uy��p��u94���E�ˮ���E��*/��E��,+��`Z��Y����ȏAZ��Y�z鬰�c���<|�p
����sj4���k�������8p�������������������������-p
�p
�p
8p����?5 R�Մ�~�-��V�B|W����DL_��FGD�q���>��K��^A��qY�9ޜ�^�[��6��9㬳����=�hjj"�����
r��^�_�"DL]K˳^+������#���UG�۠�tM��$� 
��T75y���~����7l��ؽ�e��!*O��ڌ���4
��+CSS���A�-����u�%#F�ٱ�E%$���f��Ȩ���"��""��lk����G��ۧ֯G8{�[�	��	��nn���%��O#m�A[�A���O.�E��o������))�
f��/[����h��u��:��
TO9v��BHJ\��+�|q)��7HcQ6���^�
+:���ҕ�
¿ �uWO�]��v��1"N#|�������K��X���m�v�,@�㶕���Ѿ�}�K%��Ӓ���P=!ӗz�k��‹KJޓ���j�P@l�S��QII�� �u�����2�}�������_F�k�TB��_�;b6��;����w��z�g�}��>�A��q�	_yl��LJ�ȃL���!��:���J��� ��bG��o#-������`eZV�IG~�oJL7G�!����v���sc���N �	B���J-�w�{�����[$�ɦ�@σO��E+�i�QQ��	_(==����y�1��W^y&--�eĵ��P|r�Q�5���"4��{�o!�R���խ�k�#��K_>�#�{�����019��3�$�yԛI�7�7�jkŀFM�ͬ��GV�!��-��+E����:�u����n	ڷ#1��ʢ�{��Q�W��L�׃�>�����ߝ���W,��CBNt

5(=����
+MJ|�r��{���C�s�=eee��gRz��F�NxLEM�)1/ASӃrK�[o��;lb�B�=���
Z���t���>������F=C���S����W��C!�ӷ�g�^�#EEEo�أt]�@ۊ[e�X�3�=w��GF�=��SS[�p�%���UT���*"cc��~���
+х�,&��y/��Ӆ��jZ��s�v��o���iu!!�[n�9yy�*����R�M����*�gf~�����o��frZ�p��F���}�������Ԍ���g���$�ˊ��7���S);'���i��/^r	"t]�@��^a��G������%��G��JNI�}�[�:��-Œ:B����G�I����111O?~�0bV}�*A����uꅇ����mBB‡���?��ϏK��r=)�*EQs�1i�
��tC�	�]�2�M�<z�-S�CB,@�*h��Lk���8p�����p
�p
�p�\	�/�������_���_���_��8p����z�9<2�����A���U
�N���3�J��(k���k������o�tulǞ=3�v�v��5�u:�)ۛe|^�x���lٛf��0562Gb���*�e��i��۶	[�n��T�:�A[�0<�<�*q���$�ǎ��	GZ���ޙՓ���u넵k�*#ա
�:����S�	V���7�{{��?�H|�v��:�<���F��^�d6+#ա
��ގg�<�ۣ�V�q�n���������=*P��)��08��_%YD\�)~G��UN��چ
�=*`�F��+��o]��P3���D&?�����(-���SX ?,��Ξ�R����>{�),�����8���`in�n8����:������5�������n����:Y��yq�%wCS�tU���̞t�'-x�l�)�O�필�*�
+w�����Z,(+R{�]�;	�5誾�db%v�ݞK�Y���j[Zu�.m��^I�۸CEF#�z<�{�;TXWǀ�*��a{�݄�ɫ�fy��>�
�y܆���Ko<���"VH]JWQ�6��D�vR���F���J��x��J���Ȯ�`9��*�lw�fD�HS�o��>��P��g~��B%݂����+)�^R���A1EX���2KKY.]��	Q�:���'�t{dO���׋��
�񠐐yW@/�,-?��[�4٠TR�j�8LNMKHL|;N���Y�b�M(ّ�F�&��U .@Wo��bb�
+�v+���Oo/�����7�'_|�pKk�!����a�
+�4�^�n� ,���(�B�_c}ۋ��8p�������_���_�p
�踿@�/���/���/���/���/���8�]�mYh�-<2��	�x��G�֡!�Ȇ
��͛m�5B�O���W�0�S_��g���ڵ�A��������
�cLM��N$^�i�c��`�s����M�_Ϧ7o#n�2 k�%uu���S��H��Ecux���2111���dzYP��)���q�c��|U0�z����#�ݷO�{�� �O����8p����g�J�?9��n�(�(���e��݊�!G���R�.�	ސ�o?�0ZX;�4�5�NHZ���d@�<���2���r�M���p�T��Idͫ����YѦ��"1<0���IJ��$�^I
sG3�#)��$<��[�m���e~��η��3��">+��Ώ�����2�Ϋpl�v��/_��͍MMbdv ~��_���B
��*h�>��K/�eFFƓ@�F��
+8˙��ʀ26+̢�*�X��T�,g*��
����K��j�abTR�+����̂��ݾu�<<����~z�e��SY��A���{e��̀~*p9�b.Rbrjʑp%�Ѡ��A����}�	��u#������j���_�D
+X�F���0L�PqP�+�q��4C���J#w�G��q�6�Iiiǐ����ע�~(�zq%���D鄅�}�a���O!
!KKFNs������CJ�bʀ��Ytdt��=���)Q�
��ϓ���Z�S\	�F���QXT�]p�xHX����$yk�%P�[QPX�iO���v�?�6��� F6���D�P��!2v��
Hm\�XO���š��
+��A���Q����
�@(8�nrE���F	�p�(�ГM������ħzA@�M�BdsqW�]�(F���	���RdTԵH�"��PBԹ�WB�E�U:������tJJJ�\Vh� 5b6�(n�	aѱ�������Y0.Ns���A��9�Vs8p���4��t
L'���s+A�i�螘@X��S�uh6�����j�=w9�Za]�+p@BW��e��onf�2�*`!�:Ȭ}}�����K�Q���%��bP���tx�/S�����[+�젃�E_]��^���[/KNee@f�]U55��	��&�Y���5�W��-��~d��*)�t��\�jR ���Y�j]P�s�JI�ׁj���s{`_Hd�U��l��uK?G��
+V
+,/g%�������1Df �RZQ����'`?�
�����/����7�������$�&��#G�JKK{!'7ו+�/�	��p�$�������󝸤��]�#�f�&��;%9=��y+�_�5�ݕM]��(�+PTWǒ�[�D�_)��NC��B�V
xY�1�(�������1MNOG&^�J�������$ǝ�H�+W�VA�����������.�����EE�(�+�fe��qq��V�<>�p\n����tK^^L0v�ϿP9p���8,`���ы#>*�M;w�;Ѳ(�㲳o:���Q��̛��uV@��?����v��'W�2��t���%c=*�WQ1G�|��P`Ǟ=shhn�a��Յ�
���%UU������vӶ]�f����g�RRn�*��+�	"��oڴm��1��{���ƭ[�(PUSc�����_�3Yna�_
+|��l�:D
+�۸Q�-��23���~D?�.����7����T�;��_#M��6�r�^���,��r-ׁ��2B��-��v����bq))�
+��^�v�E%%6%|�A�|��X�ݴ�dj�aaa�z������%���A��x��ԔvӐ
+�Uj����χ'N|H??!<��>�[�&��D�<a��<8.������$����PR`hll�ٹ�6�]������g	vK��Qpl�M�Á_\�
+ꁾ���*��}��oժ������Q`��o�@7�r��m�>�
�|i,=;��'$��>�1�i?��8�A�V�b?��8���Ko2"a�b�7��~#!=��E�0��`Q*�G��8p�����/�����E9_0�?_�Y>_���.���AP�s �t���P䃳8s��:��c���/@t���b��;�G�;��
���`nhPV����0J�pp�'''�����x��w��?��L
�/�o�w�'!%�A��g�����(m�W�@E��[T�/((P������i�����|
?_��p���8p���g�.�􄼼�e��L���'�+X4JL������
��$T���h<	_�����c'(�-�ҥ��o�߅��'��˖mp�c�� ����
+(|f�D�wAM��F{8p�>��)�w����Iy*��O�SYyR�����~�@8eb8�ƿ��Ʉ��(���d�܄�l띤���8B���'�5V��QQ�M�u�����@�u�瘧�����q�����g	Ӌ�O:eb8Z�t�@v�@��|ڝ}���?����	6����_8ڧ�,�=��8_p�d����<��G�$<
e�4Y`˗l�w�&��,��A�u6}��=*PPp�hnƇ�n��/D	z�Iy��?_��{R��!
+�}���9	_A��<(��y2{n���%$�9__|���>��~2��,`����iEE��>��t2ޞ�d���wM:?_��8p����?4,l�gg\��!��g��)��=j�{@6�5��G6h�������
��L&f6�5E�T���ɵ�I�>Y�w4���5SS�
@�g�����@bԑM<3=;C�^/�/--eeee� x�'x�Y�ٟ�

���LG�b-���R�����K�u���
+��P�R���ҳ�Xvv6ñ-����,��ςZ��h�l��`!x�g�̼�����^ 5E�o�7 $D�I�`y��,���8p�����Z�|���x���~�̺>P�
O�W^�j�F����R>TW��-��ߥ�k#j�A���ӛ6��ن�i�|D���g���"�f{�k�P��|�_0:ꟙ��G%��	���Ⱦ#^B�,,.F��i��c�=)0��6"�_.%ɝEG�?����������
��Kq�����4���>ChLK�����+���1a����O�g��ς��J����:��Ygg�_~�w�OO���=*����Q��`��8�)_������ ��*��?�8p���8p�����8�[��f~
xs�@S���Q�������w��ga���؆���'���-[N�7~�t�@�8�W~hq�`��@���f�����taG�3�s�`��,N�������\�?�4�,�������?A=W��_����Վ^���~��8p���G��
+��W(���P��
+�d1�m8�(�6�p�@u<"����/���7(��Z�3(�~�ϐ�7��o?�?���ʏ��8_ ��w�y���xDF��@f��񈸿�8p���n
���I�F�E�_����V�A߂=}}nm�mmr���	�K��k%A8��6NJIať�̄ܘK�ܯ�Qr��Ӯ��=T^UŪkkYM]�'!b����N557?���u��K/��+��� �_���{��<���~��w�p�
w���?�����z�ꙡ�!|��@��6
(q�YH[{�вR��`#|��j�]R.�����޷c�P��ڶ��5MM�	��!�9��6��� ���Az�tŷspP�\�J�q@_�^߰AX�u@�~�ΝP�:��ن=�n�=�ЦV����TZ�{{Y7��鷞���(Cڠ-Ɲ��P����W��uZ+Ђih��ǎ�ς��~
��M�ܬ~�M��<
GF�7�XM��z&&�)0>=-m�޲E�Ckְu6���-ه�2ԡ
�:�V�]�6l��F'&X���8�;h��wt@�F��m=��cc5<u=��P��{=>����,t+��<2B���o5trzȚ?mFGU=�Ц��:��RI'�����]9�n�GFh#�^���n=ɚWѷz�0�u��i�o�6h�-�+�Y�%�&I;��٧�{�lph���Y3�z��Dz���ٮb0UVW��-�+�Y(3����r�ە�[:��c�K��t�{��_:8p���88�
,$\��&�1�k�X*s!!�	���@����aa�����;E�o��U�>,��ag֝
+�~�c�nv�g�]�v���(�z"�
+d����e�6�e��y�f�e�����m���l#��e�s���baB3��i	���kd�M�����=���d�I(�Q����D�.��xf���!�e�[n"|����颢�����2�|1!!�R��y!�Q� +��z�
	oZ0������!1���gz��mߦ��4��8nilOU�e�4��G;+!~�lA��ѩ��u���>xP�%�~�u
�99��<I7��H��(C�[bXBb�*D[%j�����a---���e�[��adt�{8�e2�D�o�-�Ӱ��������͟��iȁ8p���o�����p�����N[8���khY����~���ޯ���ޯ��a���{���[{ ��i襽_+?�駡7�~�"o���+���_�1���_?Ü��7���=
����Ӑ8p���
bd����e���Y|x��ں�l��m�4n8^<46f[�q�-��Ħ�LӏM��
+
:{zl�CC���e�3�&���X�1 �i�J[=n�L��Bh���(�A[5
+X:;m5
+hnp����n.�u��6�-.e��6�)�^\�p�X����غS�a
WB%>�Q�@v~�M��֕�+(*�jjlVZ����n!r�S\Vf�7O�"z�-/�-�������S >)ɖ��VI���T[M]������J��m���[�[�A�/��/��5Q Y��eeg;+p�-&qYY���b�ߜ4�Ȕ��V���"##E\��
+�����o����8p����R���M�4���j`d�65=m+1��V���jeg����C�-h���hq�-P�0Y��+w�p���Օ�?�c@S{��L�AI�:��f����gL
+v��5+Wڀ��@y}����������)�����P��_+�������VP]�p���?[��ȕpν5��g�m�3`篮���{��k�W��t�4���
�)�����
S !;�VTZ�����ρ8p��Ou�2:�z��Y���md�����W��Ȁ�yT���ljz�Mo��6�p�ƍ�C�xq=?
h��2 kE��[O���/�M�k׮e&�yl�WT��~mA�M2~@Ȁ��=@��[(o�0k�Jx��Lj�w�x��h@r��Ѯ�@۪Ul-UnڴiA�P0�V}BMV{qV�f��F�2 kEK?�D�Fj0�� !��^��Sj�I��Mh�s��5�����MP�!����[�n�Ä�drz���p#��A[�����
�5����.FY���}�����U�M�<"3b:Ą��
+�/D�I�<�x�'xCdͣ.��b%eeHi�>���9�������	bhU��(C��h@���
�5O���>�;�v��𓬬�;
+hllL�
��1bZOe��(Cڠ-h@��;%�d��*��p)a�C����_477�~8�h� GmK�<P�:�A[ЀV&<T�}���ʾ����;w�z%??_(-+J
!��l�(Cڠ-h����r���*}�{a[�'�{
�X)G7mW:a(�k_646�ʆVj2����y�e�C���������.�V�Q����4�kk�)�2ԡ
ڂ��V�N/�)(�z���A����V<\�31�P�6��zZ�/�t:}M
���Fl\[�<���'c�
+5Do/�X`�����n�(C�8�-x�x�7d@�<������_TVV�ϰ$kzKk+�1�]>�P�6hЂx�'xCF��-�VW�"�C�#&�}[�VVT\|�;�\�{�:�A[�8b9
Bd�#�7�t�=R$ b��H���h�^u�uOayu�}�6hЂ�,?BȀ�yĹ��b��ȑ���p5yyy��r�OHk{�z�mAZ�͙N�!����äA�dI�����h4�G�K�DŽ�*�nQ	Ѐ<��2rf�,ZH������Ę�ãĴϋ�Gh@r������!����dh����������	h@YEȀ��$˗���h;cbbX�/��P�i���
�3?Ȁ,�~9|׋[�]O�|Q�U¿���s�������ED��u�F�X"�w�}��O.����v����.�`��QM���Jx�+�o�tu������ݻWسg�D�t�]7?��yE╪^xp���F��j�~� ɐiۺs�m���Ž;��۷�A��m�Vz?�O�J�0�fͩm۶����� &I(\��7�fjJX�n�[D��H�O�'�CFq��}��~���G����j�F�R_/Ի@ԡ
��ޒg�<�ۣ5��3���~7v�y��>�<�<�ۣ֞�����}��yG
+������ʉ�`&���Q���V��j����L|뻺<��*+2KK5W���)X�(�O'3)T��xO�V���M����'���%�PKc�N����l���Ʈ.[Cw����ǎ�-GG9�����94�x<�rz��@�ҳ++mV�1���h��U��f���쪠�ڀ5�Gm����F
�A��b+��r��޺�9��-�K?��Kn8MUb?	cg��`�j�\Z�Y�����T����VXW7ˠ�h�
]�w�-x�j_l2	@�
+��؀r��]�����.ȫ����v��&��������BuE2@���_�C��4̕M#0Oȑ���R۪�훞/F�\
���t�@E�
(W�J ��~Z����2��p�w�!Ao0�V ��|�9jh����복��qii[�2��>�6�M��2��9��G�-��lÆ����٦���x�!�F��
+�6�~{��d�E����0���t���lK-(�tNp1����\�����*����/�V ��r�.O��s#.��&($Ė��s��^t���%�$�ޖi`��<f��٢��m	��o�]��o�{��.X�XN^�Z_����-��x�
+<�⋇�::����>6���X!��
ڂ�$�oV��~�0�ӫ�͂�p���lD�B��]�+���8p�psXDĜ��f��qs��7����/��}�s�c��H�Q֨�_���|�	_՝6���خ�{gv��#�޽{.R�t��m7���*���_�lٛ��g�Z��_�����v��%��m�6Q�:�ql\-x�x�U�F�޼e˱�|0�/h�陡r�>2�"ڠ��@x�xJ=��
+�������9��]�'���	f�Y�X,��:�A[���x�'x{T6�z��^S
x��4vwF�Us
x6���ìn\�RskyUc�{S��Y���L��+�QR"d��C@x P퇨��
�-P��hV����k��C:7~]Us�t��!���������zzNcw�\��7b��� klks(�4Z+ܘ�s++����z+@.x2��r���>
h+��{2��Z,�̞8�
�{�
+�ԃ�t.�<
�U}���J�ۻ���9Ճ�Das�,x2�c�ls;�e@7��ԃV�x�\�tU_PS�
+d������N.Й^I�tU�W]��e�ӱS������%�{���+��M�<����IݝY=���|�y����%���l�Ȉ����ӗ�N�hs�MCj �UU�T ������Ŧ�q�
+G�(C�\
�f���(/JܸV���Y�lw|
ug;�����gL���.
�Je�+�u9h��v��>
�ڄZ�BdR�Ϥ�ʔ�Æ�finf���Kf�o��N�0h3�6�;�̋.*�,]��~%%Ҋ���wpr2K-(�tNp	�����c����b!3;���0�,���������6Ů�K�Ƌ���Ա�������.,l� I�gY��W�h�Ý�m_�-wiT��l��g�h�FG���+Y��q~��_���U�����uHmA�'e~_^��_�8p�������yG9Q�[AC[;�������� ���M���`Ǟ=3�ƿk׮��m�T���_`nh`���9��-;v��;v[�m�n�:�3�:����������ά��`�:���C����_PT�fwo������F0�L��lVF�C%
x��G���Kc����o�
+`�>ϵ��y��'�W�ۀ�#�V�,j�M�}�����P����j��;��5~���
T�!t�`�m�]]���F���g�94����x�C�
֤3N%�V�]CCS�t�6�J?������η㫽���������Ȭ�iԝ�MM����Yi<��}�7�P�&�r�����ҳ�R
OvcK3*D�RK��|��HP��3{�ļčO�j�����[�O��|7~q��F��{<_���к����l��q���
+dyp$��T{L_���fw^�����F@Pb"��'Z�P�44�~�/8��w{����������!���9d��"z�q{� 9/�e_��M�_@D��KHL|���������-x�y��|��|���X�be����|
8p���C �������/��+���>U���M�~�@�]�KP}�@�]��O?~�@�������+xs���]?�~U��WPu� �~�v�@�<���W�|�!�~�v�@�<���W8�Q �~�C��1h��6}�}������t:��aۇ�_I��f��ö������)0{��~��u�c�"�'�_!��
	O���+�R�����
+��Zq�8p����������������mc��lq�޾k۵gBB�F��[dm7No��Ƨ��5�������x����Q�?00������޼��
�n$ATw���������$ljn~�o`ys�|y�_.%қ�_~��H��4�H����###l�������@��p_�"��3&''?��Ŏ���苌}:t�R{�oi9(#��Oy�����3Y,KbV�ZGW����;�(ךͿ%Z/>(�;�d‘H�/�җ��Zp��yy^C��W�^-f���׳#�{�Bt~g_�(x||\�䌬���0b�^��I�GGGūokog}�Va��.}YT�/GI8�<�Ӣ#�����o_���2�&�CR�[�-)+;IW�B(����S�k���������X��'%مp�5�Ll�޽����z�II��R�B8r������>�ㅸ�cC�)�����cYY��9���i<����F�
��O+���������)P�<Xu��?K��t�&)hŊ'b����w�:�˗�����544�zZ���V��Ǿ���#��si�����A�z�X�DZpx�3���@�%K���= �HBb"�����DFE�F����#<���\suee�I�X�ݚ%2ã��GY+����?Gm7�}/�����
+m-����[ny�����n��
+�������������[��#\�I�£
+�g]�~z)a6�m�t�eee��?�n��
����NJ��j0�8�=c𮞜<(���]����t�J����RRRX��uh���
+��������X1�����3����?<u��>X��O�e��Oӫ���877������Q�3+)����>��
+�Ѵ}���-�+��+��_��9���ϠXZv6���@���̜��4
1e_�8 Ĩ�����x0����cz��J'	}��_FFF�H�_&|�0C�;J\v�es��?@)��ˁ8p����
+\�8��:���2���o�ЇlB@�F�%������"����ep��
`�}���{��(���H��wj����/(x��>��9���Q���+PG�P��T� �I�QV7w���{�����h�Ya�ikBY#՝6.;�[��w@�D_����
+�tPV/�����(�[H��{zn9�YB
c{;3*$BA�iny`�@�`
+�eƹ�Q����
=��T573���)`hjb���ݕ��74�r�(�(��[����Sy�n���b�,_A�p��_�<0����+�F
W�����8�WU1�tRrN��y��)�j߿�r���Z�����Yee������EE���Xt�������nG�oԡ
ڂf�;��W [A
1�,_
��X��ʞ8��;O���-h��E�F�(RȮ�2�!qq��Ә��㏟�ְЂ�<���7j���P�	e�sD���ZTR��:z�V�����F�y
*2�ՆGG;NV��e��}<77*���O`�
���5�CI�?�GE��
-"~�u�v	��x;5-
���{W�-h@J
+�Iu���表��7���2�9�{��j}22*�Hl|<Ƹ@G=ڂ�r~rR%ǒ3�,UE;�0������%��Rc�vj�%?8p�����
��[��[��t����U ~��6�o�"j�7	Y���M[����	�e�Jh�ٍ��޼�UTT<
�?�Q&�D`��Z_���g�����ߐ��2ԩ7��h~k!A�����T���+���+�t�?�u��g>����(X�Q� w�R�z���(�WR@�[`��`@�F��5W�4���\�[��
�T��5--�Z!$L��r�oA�JH���
�[��
�T��j �o������N�n ."2i���
�DZsf��rW
��V ��J��R�ޘ���jFNK��b��"�ff���[��6h��,�������U<G�bR�,&����)C�
h�J��8@����zb�����[o������
-x8��ϐ��e����W�I��|����1+��+�G��cD���jIY6�x�
h��Q����F�}ś�@��1*1E?@�i�Z0���1;ݪ����%?����(˧:�+�Khx�ۅEE�����d��%��D'D겥��
��CXD�[tk,t�@�F��� W@�P�'�/_~$<"�ي�pEDڠ-h���CZZ�C!!!o���� W@S?�Z�����
��8p���8�8��k�n�������)�w[g'k��`�����q�ph��Y��u�����%z�!�37�x�W�̤��:8�W@�KrY������\��::���Yh��|N_?�}}3W_{�C���0�oo�>*pINA
����}.*@�����k.�J���5s��n?ۗ���@�wv���پ�C��|�KJb]��3��p����ox&w�i��>Sg�h"�ub�0���s'�2����Uw�j[[�j�i�\E�_�r�.(��~ve�G��:!>�$\�b"�<+t˖�^��4���QH�tŊ[����a.T66
+�V�3A���Ѓ����ON2��zLv�'�׬a�[r�^s��JoҙWP�W��858<���Izu������u
|��U��B�"�J��*�%\Vꁦ�G~HD���l
]���0ߵ�#
+�@u�Ц�����ž��,T5��UTQ����� ;2.�
<R'V�fc�H�KK�抎������m�H�2G���*��
i�;4�%�����O
+
30O��z���Ȳ�EE�����m���?�EFn���e���Vi$L�y����������D��2�����X�J�����.8x�QYN‹�%\v�BZ�J槒n���h�F�}
+�(��ގP��ގ
�!',"~�Z����@9�Ccck��]�y��9eeeT�7��቟2 �����U�K�2k8~�56"�n��Fse��ɴ.Dee���G�^����?��\Q!=4�ǠLӀ�i�*/�Nc=
+��{����j�xe{�@zQ�Pe��L/�T�rx���($�C����x��j�B���
��z8p���5���%�H�M�}$`�w���0|�������ö�
�w��t�\�
6}���|�`O�/
>���M�����t(P��Sȝ�X=��_�Y]�|
+�-��������)A�>�,{@��ڮ��v@��N��ڮ�F	��s��A5�V	�J��߃jB�v}�o>�%�����+3��>|
?�|"�>���kD����l�.B��O@~x>��C����̯�I?A$|��`����Z���;@|	T3��~����}
���ƨ���>ؐ�S��68��'h8�d��ۿ�'8��Y;|b��A���[��s�`Ӈm_4B����?l�0����>���r�`�ϡj�-u
���02rl�0��_�*Y��C��h�|���9��
���厅��1������4YF�	�
�?�������J�.��<�M�h�]�>������ �{����@ϱ��L��	���O G>�O�6�/�)��~|�~�p�|�7T���$߀�� �~sA�]_��Ҁ�i�~�'�~8p���*��/�������/����~���/����~���/�~�7�~8p�����+����~���/����~���/����~���/�~�'�~8p����/�n���Y���pV�¦V-L/&|+8<�e��j�0�q
+v$�+*-e�))����vH�V���ݒ%���h�w�d�w�`SSSlժU���������Xkk��1�i�f�g��zr��$&ڈ��Ζ3o ������lӖ-l��ݢ��j��z�m�=L�۟�^�g�;���M����?�q�F�g�^ѽ�$8�'��D�0R�%F��ʆ����d��L�)�Ä�$<�����n�m}}����N�m�cYyy�Vo�`��t7u�M����0k��xP�"a?a��GM!�7��;��|KKˇ�U۶m��$%��d_r	
���]�v�W�z�jf�X���
�m�1����Æ
���֯_/*��n�Ұ�_S� w�a���/Õ�
+�{z�Y�{?1���x����MNRFT6D�>���)�W�'&&��h<&e��*/��ڗ.�����^�B�����[Ybf�\S�2MW�׮]+(i�������(&��?>��=�--Ⅼ[��m %GF�U�f��ʗ��!4ƽ��wxb� 1�e�EF����P�
+\�:R��6+N����њ5kD�1
�����u!!:�++_�,O\n�΅#+��p�@(�Asї��y?�(��xj�z<�#�[�u���+��^��#w||�
���3�Y��KK_�X?���ۚ[^~��!U&ӣ���z�|���==��$�XM1(���Ͼ��zxr���V�!�@\Z��~(�8N]���@���c��XM�Sl�Χ�^_A�`ww��z�b�Qm�I���?��R�7����ߐC��M+Wl�G/�Q��A�k|�Qm4����ݬ��2���p�@R�f�䜀�}�#���O�Ao�}����B8�70�h���V���G��i����;�x������f�'03�SSߣ�J�
+|�
W�fZ�R����v������;�x4//�$��0������Pb�΅�Vg?�q9mq��m���ձ���'�S1˫$6K�{v�]wNHHx�������M?�����+z�#"ީ���E�6''oO���z
+6���%����
;�`�
�
۷o�
1����X�]h�w�cP�q���Ȩ��~����^��#����q��"%b:�ُ�Z�������R���b��oº�0eH8���
ޞ�D�#��)�^�ĭ?..@��H�ܼ<���M��MJJz���1t+*�ҥ�
+���x��習���hdd�>˖-���xc�"���6���Ć�Ĕ)+/g���_\\�hF��+��;���D_H��3�����VN�***�qa�
�
+�����-8�All�����'btt�ǡaa/�����D��r�(�'�R��T|���7O�=?�����u¿y��c)�������́8p����x��g��DL�������@8���۲eL��֭[!�����H8�۴i�ܸq�[T;�����~�zajjJX�f�"�m�n�:��_��J���n�uCCC"j�2![799)�����V
�U;Ȅl����`jh�1wh���Z��L�֍MLf�����J�q�� �E��QOHm;�L*�tT��'��dB�nxttn�`hj�
�|j�����`V�ծO^��2![74<,4�8؄3
*��m���Âзj��]����B�=��&� sD�
Z�:;;���:��Y!Lr2D��h��j���������=�\�eeP�v�	ٺ��n�����ʕ��@��A&d�
+��~�]R"�j����O����j��m���k��P���;����(���i��j4�����T�8��k�Z"d�N�J�aOm)̇�y}ރ�շ�ȨP_R�=m-�QVː��u-��]����~�jnr��ć�/l�=��{�/7��=�\u=���2}���ؾ!����H�}7e�n�#&��:]$Ц���ő�ݮ�$�%�O�:����ݎ���%�����bw�^��To�_�"��ؾƦ�������

��`0�����V��Il��fe;��\U��}�^��I���6���*`�:V���@ �W���tT�ʞu��Y��(�[������ik4��im�@ ����gf��l�~M08yr�����ykfv֚�t��j���c1;��+�+��S?2>nUw�����a��@y�1]%�Ǭj�q@��oh�����;&TR��V�-���WWǐ�c�+[P.k�����4$p�&�)�?h$A��MlO	�����^K�
+���^��^x��������0}�������١v�'�C��*���gw����v�����#9c����f���,=��\V��#}HQ+��Ԅ������������n�A�ɨ��Nvp�\������Y]��]]]{���v��	�k�.�LZlc����CCCvM1��Gi�i�Ǡ��uW�j.����ag~~��a(ڦDW*[����N�ɥⵕ��o�]���������X,�����w�Z��Sҏ/����N�K�W��f�^�����9b�IQo�P1�����:::~T��C��y=2��3g��cAN�EO�K����8���&Nw[4j�KwMW�򔥍m��*���E]:õ��S�ޗ����zG��<�l��0��H[va9�}�lM���_,,����?��g���S��W��7"��^���z;;���oXٺ-�<�S��奺ŧK�E��@���߮������ϕ��v��w�WO���8�@_�
+=(ѿ�^��7���i��@��sc��G�Y�e������@ �@PI,�b<��Ч�8����v}ٙU��&�f�v���A?Oy��h�]cc�v�?�gV�-��&k��
�
�5�>ɴg��*-Ь6��,�}z@C@S0��#����,P�4��-�
4�X�|Z�9Z���
+��
-M�#D#��i}'=�dH��� �"JY�W����9J�TN��	fZ���z�?�����d�Ru�rh|n4�b	����v"(ι�f�z�zD5D4e�c�	���p�p�&�<�?;�!���� ������A�M��*P�SN	���5������G@@@@#@+�A����h	��,��9�=h���q��˿������������A6��f@0ب(��h
��Vv��еO�������������Kk
KZ@#�B3�-��F[@c0�c�vݼ���������5׿�����T4�4�M
mA_v�;�?
������6��� ���6��Sh�9�	\>������qB3@;@Cp��
������f���Zh�е�#e����
+�h�L��@ �@ ��D/�@��D/�@��D/�@ �@ ^_�<"�G$�d��#�yD2�H��<"�G$��@ ��@}��x1���dfuu�,��s<씝�o�y�P��R�bbb��3������3^�s���#�����6}����R,��FFF2Gỏd2Y�0��𱋇�V�w��I�圁aO	.�!Ϲ���s*�����r?	+��@ �@ ����$q%X7�IEND�B`�
\ No newline at end of file
diff --git a/core/assets/vendor/modernizr/modernizr.min.js b/core/assets/vendor/modernizr/modernizr.min.js
index 6a71a84..407556f 100644
--- a/core/assets/vendor/modernizr/modernizr.min.js
+++ b/core/assets/vendor/modernizr/modernizr.min.js
@@ -1,3 +1,3 @@
-/*! modernizr 3.1.0 (Custom Build) | MIT *
- * http://modernizr.com/download/?-details-inputtypes-touchevents-addtest-prefixes-teststyles !*/
-!function(e,t,n){function o(e,t){return typeof e===t}function i(){var e,t,n,i,s,a,r;for(var l in u){if(e=[],t=u[l],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;n<t.options.aliases.length;n++)e.push(t.options.aliases[n].toLowerCase());for(i=o(t.fn,"function")?t.fn():t.fn,s=0;s<e.length;s++)a=e[s],r=a.split("."),1===r.length?Modernizr[r[0]]=i:(!Modernizr[r[0]]||Modernizr[r[0]]instanceof Boolean||(Modernizr[r[0]]=new Boolean(Modernizr[r[0]])),Modernizr[r[0]][r[1]]=i),c.push((i?"":"no-")+r.join("-"))}}function s(e){var t=p.className,n=Modernizr._config.classPrefix||"";if(h&&(t=t.baseVal),Modernizr._config.enableJSClass){var o=new RegExp("(^|\\s)"+n+"no-js(\\s|$)");t=t.replace(o,"$1"+n+"js$2")}Modernizr._config.enableClasses&&(t+=" "+n+e.join(" "+n),h?p.className.baseVal=t:p.className=t)}function a(e,t){if("object"==typeof e)for(var n in e)v(e,n)&&a(n,e[n]);else{e=e.toLowerCase();var o=e.split("."),i=Modernizr[o[0]];if(2==o.length&&(i=i[o[1]]),"undefined"!=typeof i)return Modernizr;t="function"==typeof t?t():t,1==o.length?Modernizr[o[0]]=t:(!Modernizr[o[0]]||Modernizr[o[0]]instanceof Boolean||(Modernizr[o[0]]=new Boolean(Modernizr[o[0]])),Modernizr[o[0]][o[1]]=t),s([(t&&0!=t?"":"no-")+o.join("-")]),Modernizr._trigger(e,t)}return Modernizr}function r(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):h?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}function l(){var e=t.body;return e||(e=r(h?"svg":"body"),e.fake=!0),e}function f(e,n,o,i){var s,a,f,u,d="modernizr",c=r("div"),h=l();if(parseInt(o,10))for(;o--;)f=r("div"),f.id=i?i[o]:d+(o+1),c.appendChild(f);return s=r("style"),s.type="text/css",s.id="s"+d,(h.fake?h:c).appendChild(s),h.appendChild(c),s.styleSheet?s.styleSheet.cssText=e:s.appendChild(t.createTextNode(e)),c.id=d,h.fake&&(h.style.background="",h.style.overflow="hidden",u=p.style.overflow,p.style.overflow="hidden",p.appendChild(h)),a=n(c,e),h.fake?(h.parentNode.removeChild(h),p.style.overflow=u,p.offsetHeight):c.parentNode.removeChild(c),!!a}var u=[],d={_version:"3.1.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){u.push({name:e,fn:t,options:n})},addAsyncTest:function(e){u.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=d,Modernizr=new Modernizr;var c=[],p=t.documentElement,h="svg"===p.nodeName.toLowerCase(),m=d._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):[];d._prefixes=m;var v;!function(){var e={}.hasOwnProperty;v=o(e,"undefined")||o(e.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),d._l={},d.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),Modernizr.hasOwnProperty(e)&&setTimeout(function(){Modernizr._trigger(e,Modernizr[e])},0)},d._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,o;for(e=0;e<n.length;e++)(o=n[e])(t)},0),delete this._l[e]}},Modernizr._q.push(function(){d.addTest=a});var y=d.testStyles=f,g=r("input"),_="search tel url email datetime date month week time datetime-local number range color".split(" "),w={};Modernizr.inputtypes=function(e){for(var o,i,s,a=e.length,r=":)",l=0;a>l;l++)g.setAttribute("type",o=e[l]),s="text"!==g.type&&"style"in g,s&&(g.value=r,g.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(o)&&g.style.WebkitAppearance!==n?(p.appendChild(g),i=t.defaultView,s=i.getComputedStyle&&"textfield"!==i.getComputedStyle(g,null).WebkitAppearance&&0!==g.offsetHeight,p.removeChild(g)):/^(search|tel)$/.test(o)||(s=/^(url|email|number)$/.test(o)?g.checkValidity&&g.checkValidity()===!1:g.value!=r)),w[e[l]]=!!s;return w}(_),Modernizr.addTest("touchevents",function(){var n;if("ontouchstart"in e||e.DocumentTouch&&t instanceof DocumentTouch)n=!0;else{var o=["@media (",m.join("touch-enabled),("),"heartz",")","{#modernizr{top:9px;position:absolute}}"].join("");y(o,function(e){n=9===e.offsetTop})}return n}),Modernizr.addTest("details",function(){var e,t=r("details");return"open"in t?(y("#modernizr details{display:block}",function(n){n.appendChild(t),t.innerHTML="<summary>a</summary>b",e=t.offsetHeight,t.open=!0,e=e!=t.offsetHeight}),e):!1}),i(),s(c),delete d.addTest,delete d.addAsyncTest;for(var b=0;b<Modernizr._q.length;b++)Modernizr._q[b]();e.Modernizr=Modernizr}(window,document);
\ No newline at end of file
+/*! modernizr 3.3.1 (Custom Build) | MIT *
+ * http://modernizr.com/download/?-details-inputtypes-touchevents-addtest-prefixes-setclasses-teststyles !*/
+!function(e,t,n){function o(e,t){return typeof e===t}function i(){var e,t,n,i,s,a,r;for(var l in d)if(d.hasOwnProperty(l)){if(e=[],t=d[l],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;n<t.options.aliases.length;n++)e.push(t.options.aliases[n].toLowerCase());for(i=o(t.fn,"function")?t.fn():t.fn,s=0;s<e.length;s++)a=e[s],r=a.split("."),1===r.length?Modernizr[r[0]]=i:(!Modernizr[r[0]]||Modernizr[r[0]]instanceof Boolean||(Modernizr[r[0]]=new Boolean(Modernizr[r[0]])),Modernizr[r[0]][r[1]]=i),u.push((i?"":"no-")+r.join("-"))}}function s(e){var t=m.className,n=Modernizr._config.classPrefix||"";if(v&&(t=t.baseVal),Modernizr._config.enableJSClass){var o=new RegExp("(^|\\s)"+n+"no-js(\\s|$)");t=t.replace(o,"$1"+n+"js$2")}Modernizr._config.enableClasses&&(t+=" "+n+e.join(" "+n),v?m.className.baseVal=t:m.className=t)}function a(e,t){if("object"==typeof e)for(var n in e)h(e,n)&&a(n,e[n]);else{e=e.toLowerCase();var o=e.split("."),i=Modernizr[o[0]];if(2==o.length&&(i=i[o[1]]),"undefined"!=typeof i)return Modernizr;t="function"==typeof t?t():t,1==o.length?Modernizr[o[0]]=t:(!Modernizr[o[0]]||Modernizr[o[0]]instanceof Boolean||(Modernizr[o[0]]=new Boolean(Modernizr[o[0]])),Modernizr[o[0]][o[1]]=t),s([(t&&0!=t?"":"no-")+o.join("-")]),Modernizr._trigger(e,t)}return Modernizr}function r(){return"function"!=typeof t.createElement?t.createElement(arguments[0]):v?t.createElementNS.call(t,"http://www.w3.org/2000/svg",arguments[0]):t.createElement.apply(t,arguments)}function l(){var e=t.body;return e||(e=r(v?"svg":"body"),e.fake=!0),e}function f(e,n,o,i){var s,a,f,u,d="modernizr",c=r("div"),p=l();if(parseInt(o,10))for(;o--;)f=r("div"),f.id=i?i[o]:d+(o+1),c.appendChild(f);return s=r("style"),s.type="text/css",s.id="s"+d,(p.fake?p:c).appendChild(s),p.appendChild(c),s.styleSheet?s.styleSheet.cssText=e:s.appendChild(t.createTextNode(e)),c.id=d,p.fake&&(p.style.background="",p.style.overflow="hidden",u=m.style.overflow,m.style.overflow="hidden",m.appendChild(p)),a=n(c,e),p.fake?(p.parentNode.removeChild(p),m.style.overflow=u,m.offsetHeight):c.parentNode.removeChild(c),!!a}var u=[],d=[],c={_version:"3.3.1",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,t){var n=this;setTimeout(function(){t(n[e])},0)},addTest:function(e,t,n){d.push({name:e,fn:t,options:n})},addAsyncTest:function(e){d.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=c,Modernizr=new Modernizr;var p=c._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];c._prefixes=p;var h,m=t.documentElement,v="svg"===m.nodeName.toLowerCase();!function(){var e={}.hasOwnProperty;h=o(e,"undefined")||o(e.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(t,n){return e.call(t,n)}}(),c._l={},c.on=function(e,t){this._l[e]||(this._l[e]=[]),this._l[e].push(t),Modernizr.hasOwnProperty(e)&&setTimeout(function(){Modernizr._trigger(e,Modernizr[e])},0)},c._trigger=function(e,t){if(this._l[e]){var n=this._l[e];setTimeout(function(){var e,o;for(e=0;e<n.length;e++)(o=n[e])(t)},0),delete this._l[e]}},Modernizr._q.push(function(){c.addTest=a});var y=r("input"),g="search tel url email datetime date month week time datetime-local number range color".split(" "),_={};Modernizr.inputtypes=function(e){for(var o,i,s,a=e.length,r="1)",l=0;a>l;l++)y.setAttribute("type",o=e[l]),s="text"!==y.type&&"style"in y,s&&(y.value=r,y.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(o)&&y.style.WebkitAppearance!==n?(m.appendChild(y),i=t.defaultView,s=i.getComputedStyle&&"textfield"!==i.getComputedStyle(y,null).WebkitAppearance&&0!==y.offsetHeight,m.removeChild(y)):/^(search|tel)$/.test(o)||(s=/^(url|email)$/.test(o)?y.checkValidity&&y.checkValidity()===!1:y.value!=r)),_[e[l]]=!!s;return _}(g);var w=c.testStyles=f;Modernizr.addTest("touchevents",function(){var n;if("ontouchstart"in e||e.DocumentTouch&&t instanceof DocumentTouch)n=!0;else{var o=["@media (",p.join("touch-enabled),("),"heartz",")","{#modernizr{top:9px;position:absolute}}"].join("");w(o,function(e){n=9===e.offsetTop})}return n}),Modernizr.addTest("details",function(){var e,t=r("details");return"open"in t?(w("#modernizr details{display:block}",function(n){n.appendChild(t),t.innerHTML="<summary>a</summary>b",e=t.offsetHeight,t.open=!0,e=e!=t.offsetHeight}),e):!1}),i(),s(u),delete c.addTest,delete c.addAsyncTest;for(var b=0;b<Modernizr._q.length;b++)Modernizr._q[b]();e.Modernizr=Modernizr}(window,document);
\ No newline at end of file
diff --git a/core/composer.json b/core/composer.json
index 024a387..07c123b 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -1,159 +1,163 @@
 {
-  "name": "drupal/core",
-  "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-  "type": "drupal-core",
-  "license": "GPL-2.0+",
-  "require": {
-    "php": ">=5.5.9",
-    "symfony/class-loader": "2.7.*",
-    "symfony/console": "2.7.*",
-    "symfony/dependency-injection": "2.7.*",
-    "symfony/event-dispatcher": "2.7.*",
-    "symfony/http-foundation": "~2.7.2",
-    "symfony/http-kernel": "2.7.*",
-    "symfony/routing": "2.7.*",
-    "symfony/serializer": "2.7.*",
-    "symfony/translation": "2.7.*",
-    "symfony/validator": "2.7.*",
-    "symfony/process": "2.7.*",
-    "symfony/yaml": "2.7.*",
-    "twig/twig": "^1.23.1",
-    "doctrine/common": "2.5.*",
-    "doctrine/annotations": "1.2.*",
-    "guzzlehttp/guzzle": "~6.1",
-    "symfony-cmf/routing": "1.3.*",
-    "easyrdf/easyrdf": "0.9.*",
-    "zendframework/zend-feed": "~2.4",
-    "stack/builder": "1.0.*",
-    "egulias/email-validator": "1.2.*",
-    "masterminds/html5": "~2.1",
-    "symfony/psr-http-message-bridge": "v0.2",
-    "zendframework/zend-diactoros": "~1.1",
-    "composer/semver": "~1.0"
-  },
-  "require-dev": {
-    "behat/mink": "~1.6",
-    "behat/mink-goutte-driver": "~1.2",
-    "jcalderonzumba/gastonjs": "~1.0.2",
-    "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-    "mikey179/vfsStream": "~1.2",
-    "phpunit/phpunit": "~4.8",
-    "symfony/css-selector": "2.7.*"
-  },
-  "replace": {
-    "drupal/action": "self.version",
-    "drupal/aggregator": "self.version",
-    "drupal/automated_cron": "self.version",
-    "drupal/bartik": "self.version",
-    "drupal/ban": "self.version",
-    "drupal/basic_auth": "self.version",
-    "drupal/block": "self.version",
-    "drupal/block_content": "self.version",
-    "drupal/book": "self.version",
-    "drupal/breakpoint": "self.version",
-    "drupal/ckeditor": "self.version",
-    "drupal/classy": "self.version",
-    "drupal/color": "self.version",
-    "drupal/comment": "self.version",
-    "drupal/config": "self.version",
-    "drupal/config_translation": "self.version",
-    "drupal/contact": "self.version",
-    "drupal/content_translation": "self.version",
-    "drupal/contextual": "self.version",
-    "drupal/core-annotation": "self.version",
-    "drupal/core-bridge": "self.version",
-    "drupal/core-datetime": "self.version",
-    "drupal/core-diff": "self.version",
-    "drupal/core-discovery": "self.version",
-    "drupal/core-event-dispatcher": "self.version",
-    "drupal/core-file-cache": "self.version",
-    "drupal/core-gettext": "self.version",
-    "drupal/core-graph": "self.version",
-    "drupal/core-php-storage": "self.version",
-    "drupal/core-plugin": "self.version",
-    "drupal/core-proxy-builder": "self.version",
-    "drupal/core-serialization": "self.version",
-    "drupal/core-transliteration": "self.version",
-    "drupal/core-utility": "self.version",
-    "drupal/core-uuid": "self.version",
-    "drupal/datetime": "self.version",
-    "drupal/dblog": "self.version",
-    "drupal/dynamic_page_cache": "self.version",
-    "drupal/editor": "self.version",
-    "drupal/entity_reference": "self.version",
-    "drupal/field": "self.version",
-    "drupal/field_ui": "self.version",
-    "drupal/file": "self.version",
-    "drupal/filter": "self.version",
-    "drupal/forum": "self.version",
-    "drupal/hal": "self.version",
-    "drupal/help": "self.version",
-    "drupal/history": "self.version",
-    "drupal/image": "self.version",
-    "drupal/inline_form_errors": "self.version",
-    "drupal/language": "self.version",
-    "drupal/link": "self.version",
-    "drupal/locale": "self.version",
-    "drupal/minimal": "self.version",
-    "drupal/menu_link_content": "self.version",
-    "drupal/menu_ui": "self.version",
-    "drupal/migrate": "self.version",
-    "drupal/migrate_drupal": "self.version",
-    "drupal/node": "self.version",
-    "drupal/options": "self.version",
-    "drupal/page_cache": "self.version",
-    "drupal/path": "self.version",
-    "drupal/quickedit": "self.version",
-    "drupal/rdf": "self.version",
-    "drupal/responsive_image": "self.version",
-    "drupal/rest": "self.version",
-    "drupal/search": "self.version",
-    "drupal/serialization": "self.version",
-    "drupal/seven": "self.version",
-    "drupal/shortcut": "self.version",
-    "drupal/simpletest": "self.version",
-    "drupal/standard": "self.version",
-    "drupal/stark": "self.version",
-    "drupal/statistics": "self.version",
-    "drupal/syslog": "self.version",
-    "drupal/system": "self.version",
-    "drupal/taxonomy": "self.version",
-    "drupal/telephone": "self.version",
-    "drupal/text": "self.version",
-    "drupal/toolbar": "self.version",
-    "drupal/tour": "self.version",
-    "drupal/tracker": "self.version",
-    "drupal/update": "self.version",
-    "drupal/user": "self.version",
-    "drupal/views": "self.version",
-    "drupal/views_ui": "self.version"
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Core\\": "lib/Drupal/Core",
-      "Drupal\\Component\\": "lib/Drupal/Component",
-      "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+    "name": "drupal/core",
+    "description": "Drupal is an open source content management platform powering millions of websites and applications.",
+    "type": "drupal-core",
+    "license": "GPL-2.0+",
+    "require": {
+        "php": ">=5.5.9",
+        "symfony/class-loader": "~2.8",
+        "symfony/console": "~2.8",
+        "symfony/dependency-injection": "~2.8",
+        "symfony/event-dispatcher": "~2.8",
+        "symfony/http-foundation": "~2.8",
+        "symfony/http-kernel": "~2.8",
+        "symfony/routing": "~2.8",
+        "symfony/serializer": "~2.8",
+        "symfony/translation": "~2.8",
+        "symfony/validator": "~2.8",
+        "symfony/process": "~2.8",
+        "symfony/polyfill-iconv": "~1.0",
+        "symfony/yaml": "~2.8",
+        "twig/twig": "^1.23.1",
+        "doctrine/common": "2.5.*",
+        "doctrine/annotations": "1.2.*",
+        "guzzlehttp/guzzle": "~6.1",
+        "symfony-cmf/routing": "1.3.*",
+        "easyrdf/easyrdf": "0.9.*",
+        "zendframework/zend-feed": "~2.4",
+        "stack/builder": "1.0.*",
+        "egulias/email-validator": "1.2.*",
+        "masterminds/html5": "~2.1",
+        "symfony/psr-http-message-bridge": "v0.2",
+        "zendframework/zend-diactoros": "~1.1",
+        "composer/semver": "~1.0",
+        "paragonie/random_compat": "~1.0"
     },
-    "files": [
-      "lib/Drupal.php"
-    ],
-    "classmap": [
-      "lib/Drupal/Component/Utility/Timer.php",
-      "lib/Drupal/Component/Utility/Unicode.php",
-      "lib/Drupal/Core/Database/Database.php",
-      "lib/Drupal/Core/DrupalKernel.php",
-      "lib/Drupal/Core/DrupalKernelInterface.php",
-      "lib/Drupal/Core/Site/Settings.php"
-    ]
-  },
-  "config": {
-    "preferred-install": "dist",
-    "autoloader-suffix": "Drupal8"
-  },
-  "scripts": {
-    "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
-    "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
-  }
+    "require-dev": {
+        "behat/mink": "~1.6",
+        "behat/mink-goutte-driver": "~1.2",
+        "jcalderonzumba/gastonjs": "~1.0.2",
+        "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
+        "mikey179/vfsStream": "~1.2",
+        "phpunit/phpunit": "~4.8",
+        "symfony/css-selector": "2.7.*"
+    },
+    "replace": {
+        "drupal/action": "self.version",
+        "drupal/aggregator": "self.version",
+        "drupal/automated_cron": "self.version",
+        "drupal/bartik": "self.version",
+        "drupal/ban": "self.version",
+        "drupal/basic_auth": "self.version",
+        "drupal/big_pipe": "self.version",
+        "drupal/block": "self.version",
+        "drupal/block_content": "self.version",
+        "drupal/book": "self.version",
+        "drupal/breakpoint": "self.version",
+        "drupal/ckeditor": "self.version",
+        "drupal/classy": "self.version",
+        "drupal/color": "self.version",
+        "drupal/comment": "self.version",
+        "drupal/config": "self.version",
+        "drupal/config_translation": "self.version",
+        "drupal/contact": "self.version",
+        "drupal/content_translation": "self.version",
+        "drupal/contextual": "self.version",
+        "drupal/core-annotation": "self.version",
+        "drupal/core-bridge": "self.version",
+        "drupal/core-datetime": "self.version",
+        "drupal/core-diff": "self.version",
+        "drupal/core-discovery": "self.version",
+        "drupal/core-event-dispatcher": "self.version",
+        "drupal/core-file-cache": "self.version",
+        "drupal/core-gettext": "self.version",
+        "drupal/core-graph": "self.version",
+        "drupal/core-php-storage": "self.version",
+        "drupal/core-plugin": "self.version",
+        "drupal/core-proxy-builder": "self.version",
+        "drupal/core-serialization": "self.version",
+        "drupal/core-transliteration": "self.version",
+        "drupal/core-utility": "self.version",
+        "drupal/core-uuid": "self.version",
+        "drupal/datetime": "self.version",
+        "drupal/dblog": "self.version",
+        "drupal/dynamic_page_cache": "self.version",
+        "drupal/editor": "self.version",
+        "drupal/entity_reference": "self.version",
+        "drupal/field": "self.version",
+        "drupal/field_ui": "self.version",
+        "drupal/file": "self.version",
+        "drupal/filter": "self.version",
+        "drupal/forum": "self.version",
+        "drupal/hal": "self.version",
+        "drupal/help": "self.version",
+        "drupal/history": "self.version",
+        "drupal/image": "self.version",
+        "drupal/inline_form_errors": "self.version",
+        "drupal/language": "self.version",
+        "drupal/link": "self.version",
+        "drupal/locale": "self.version",
+        "drupal/minimal": "self.version",
+        "drupal/menu_link_content": "self.version",
+        "drupal/menu_ui": "self.version",
+        "drupal/migrate": "self.version",
+        "drupal/migrate_drupal": "self.version",
+        "drupal/migrate_drupal_ui": "self.version",
+        "drupal/node": "self.version",
+        "drupal/options": "self.version",
+        "drupal/page_cache": "self.version",
+        "drupal/path": "self.version",
+        "drupal/quickedit": "self.version",
+        "drupal/rdf": "self.version",
+        "drupal/responsive_image": "self.version",
+        "drupal/rest": "self.version",
+        "drupal/search": "self.version",
+        "drupal/serialization": "self.version",
+        "drupal/seven": "self.version",
+        "drupal/shortcut": "self.version",
+        "drupal/simpletest": "self.version",
+        "drupal/standard": "self.version",
+        "drupal/stark": "self.version",
+        "drupal/statistics": "self.version",
+        "drupal/syslog": "self.version",
+        "drupal/system": "self.version",
+        "drupal/taxonomy": "self.version",
+        "drupal/telephone": "self.version",
+        "drupal/text": "self.version",
+        "drupal/toolbar": "self.version",
+        "drupal/tour": "self.version",
+        "drupal/tracker": "self.version",
+        "drupal/update": "self.version",
+        "drupal/user": "self.version",
+        "drupal/views": "self.version",
+        "drupal/views_ui": "self.version"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Core\\": "lib/Drupal/Core",
+            "Drupal\\Component\\": "lib/Drupal/Component",
+            "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+        },
+        "files": [
+            "lib/Drupal.php"
+        ],
+        "classmap": [
+            "lib/Drupal/Component/Utility/Timer.php",
+            "lib/Drupal/Component/Utility/Unicode.php",
+            "lib/Drupal/Core/Database/Database.php",
+            "lib/Drupal/Core/DrupalKernel.php",
+            "lib/Drupal/Core/DrupalKernelInterface.php",
+            "lib/Drupal/Core/Site/Settings.php"
+        ]
+    },
+    "config": {
+        "preferred-install": "dist",
+        "autoloader-suffix": "Drupal8"
+    },
+    "scripts": {
+        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
+        "post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
+    }
 }
diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index 4ab0fd7..73db361 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -605,10 +605,10 @@ field.field_settings.boolean:
   type: mapping
   mapping:
     on_label:
-      type: string
+      type: label
       label: 'On label'
     off_label:
-      type: string
+      type: label
       label: 'Off label'
 
 field.value.boolean:
@@ -795,6 +795,9 @@ entity_reference_selection:
     auto_create:
       type: boolean
       label: 'Create referenced entities if they don''t already exist'
+    auto_create_bundle:
+      type: string
+      label: 'Bundle assigned to the auto-created entities.'
 
 entity_reference_selection.*:
   type: entity_reference_selection
diff --git a/core/core.api.php b/core/core.api.php
index 0620922..c4d78c5 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -79,9 +79,9 @@
  * Web services make it possible for applications and web sites to read and
  * update information from other web sites. There are several standard
  * techniques for providing web services, including:
- * - SOAP: http://en.wikipedia.org/wiki/SOAP SOAP
- * - XML-RPC: http://en.wikipedia.org/wiki/XML-RPC
- * - REST: http://en.wikipedia.org/wiki/Representational_state_transfer
+ * - SOAP: http://wikipedia.org/wiki/SOAP
+ * - XML-RPC: http://wikipedia.org/wiki/XML-RPC
+ * - REST: http://wikipedia.org/wiki/Representational_state_transfer
  * Drupal sites can both provide web services and integrate third-party web
  * services.
  *
@@ -254,7 +254,7 @@
  * - Exporting and importing configuration.
  *
  * The file storage format for configuration information in Drupal is
- * @link http://en.wikipedia.org/wiki/YAML YAML files. @endlink Configuration is
+ * @link http://wikipedia.org/wiki/YAML YAML files. @endlink Configuration is
  * divided into files, each containing one configuration object. The file name
  * for a configuration object is equal to the unique name of the configuration,
  * with a '.yml' extension. The default configuration files for each module are
@@ -1143,7 +1143,7 @@
  *
  * A runtime assertion is a statement that is expected to always be true at
  * the point in the code it appears at. They are tested using PHP's internal
- * @link http://www.php.net/assert assert() @endlink statement. If an
+ * @link http://php.net/assert assert() @endlink statement. If an
  * assertion is ever FALSE it indicates an error in the code or in module or
  * theme configuration files. User-provided configuration files should be
  * verified with standard control structures at all times, not just checked in
@@ -1970,9 +1970,10 @@ function hook_queue_info_alter(&$queues) {
  *     Subject of the email to be sent. This must not contain any newline
  *     characters, or the email may not be sent properly.
  *  - 'body':
- *     An array of strings containing the message text. The message body is
- *     created by concatenating the individual array strings into a single text
- *     string using "\n\n" as a separator.
+ *     An array of strings or objects that implement
+ *     \Drupal\Component\Render\MarkupInterface containing the message text. The
+ *     message body is created by concatenating the individual array strings
+ *     into a single text string using "\n\n" as a separator.
  *  - 'headers':
  *     Associative array containing mail headers, such as From, Sender,
  *     MIME-Version, Content-Type, etc.
@@ -2021,7 +2022,9 @@ function hook_mail_alter(&$message) {
  *     string when the hook is invoked.
  *   - body: An array of lines containing the message to be sent. Drupal will
  *     format the correct line endings for you. MailManagerInterface->mail()
- *     sets this to an empty array when the hook is invoked.
+ *     sets this to an empty array when the hook is invoked. The array may
+ *     contain either strings or objects implementing
+ *     \Drupal\Component\Render\MarkupInterface.
  *   - from: The address the message will be marked as being from, which is
  *     set by MailManagerInterface->mail() to either a custom address or the
  *     site-wide default email address when the hook is invoked.
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 32d4110..bd81e31 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -24,10 +24,10 @@ classList:
 
 ckeditor:
   remote: https://github.com/ckeditor/ckeditor-dev
-  version: "4.5.5"
+  version: "4.5.7"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://github.com/ckeditor/ckeditor-dev/blob/4.5.5/LICENSE.md
+    url: https://github.com/ckeditor/ckeditor-dev/blob/4.5.7/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor/ckeditor.js: { preprocess: false, minified: true }
@@ -821,7 +821,7 @@ modernizr:
     name: MIT
     url: http://modernizr.com/license/
     gpl-compatible: true
-  version: "v3.1.0"
+  version: "v3.3.1"
   js:
     assets/vendor/modernizr/modernizr.min.js: { preprocess: 0, weight: -21, minified: true }
 
diff --git a/core/core.services.yml b/core/core.services.yml
index afccb31..5e63508 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -55,6 +55,11 @@ services:
     arguments: ['@request_stack']
     tags:
       - { name: cache.context}
+  cache_context.session.exists:
+    class: Drupal\Core\Cache\Context\SessionExistsCacheContext
+    arguments: ['@session_configuration', '@request_stack']
+    tags:
+      - { name: cache.context}
   cache_context.request_format:
     class: Drupal\Core\Cache\Context\RequestFormatCacheContext
     arguments: ['@request_stack']
@@ -497,6 +502,7 @@ services:
   entity.manager:
     class: Drupal\Core\Entity\EntityManager
     parent: container.trait
+    deprecated: '%service_id%-no-warning'
     # @todo Remove this tag in https://www.drupal.org/node/2549143.
     tags:
       - { name: plugin_manager_cache_clear }
@@ -903,6 +909,11 @@ services:
     tags:
       - { name: paramconverter }
     arguments: ['@entity.manager']
+  paramconverter.entity_revision:
+    class: Drupal\Core\ParamConverter\EntityRevisionParamConverter
+    tags:
+      - { name: paramconverter }
+    arguments: ['@entity_type.manager']
   paramconverter.configentity_admin:
     class: Drupal\Core\ParamConverter\AdminPathConfigEntityConverter
     tags:
@@ -957,6 +968,10 @@ services:
     class: Drupal\Core\Entity\Enhancer\EntityRouteEnhancer
     tags:
       - { name: route_enhancer, priority: 20 }
+  route_enhancer.entity_revision:
+    class: Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
+    tags:
+      - { name: route_enhancer }
   route_special_attributes_subscriber:
     class: Drupal\Core\EventSubscriber\SpecialAttributesRouteSubscriber
     tags:
@@ -1015,7 +1030,12 @@ services:
     class: Symfony\Component\HttpKernel\EventListener\RouterListener
     tags:
       - { name: event_subscriber }
-    arguments: ['@router', '@router.request_context', NULL, '@request_stack']
+    arguments: ['@router', '@request_stack', '@router.request_context', NULL]
+  options_request_listener:
+    class: Drupal\Core\EventSubscriber\OptionsRequestSubscriber
+    arguments: ['@router.route_provider']
+    tags:
+      - { name: event_subscriber }
   bare_html_page_renderer:
     class: Drupal\Core\Render\BareHtmlPageRenderer
     arguments: ['@renderer', '@html_response.attachments_processor']
@@ -1144,7 +1164,7 @@ services:
     class: Drupal\Core\EventSubscriber\DefaultExceptionHtmlSubscriber
     tags:
       - { name: event_subscriber }
-    arguments: ['@http_kernel', '@logger.channel.php', '@redirect.destination']
+    arguments: ['@http_kernel', '@logger.channel.php', '@redirect.destination', '@router.no_access_checks']
   exception.default:
     class: Drupal\Core\EventSubscriber\DefaultExceptionSubscriber
     tags:
@@ -1164,7 +1184,7 @@ services:
     class: Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber
     tags:
       - { name: event_subscriber }
-    arguments: ['@config.factory', '@path.alias_manager', '@http_kernel', '@logger.channel.php', '@redirect.destination']
+    arguments: ['@config.factory', '@http_kernel', '@logger.channel.php', '@redirect.destination', '@router.no_access_checks', '@access_manager']
   exception.fast_404_html:
     class: Drupal\Core\EventSubscriber\Fast404ExceptionHtmlSubscriber
     tags:
@@ -1256,7 +1276,7 @@ services:
       - { name: plugin_manager_cache_clear }
   image.toolkit.operation.manager:
     class: Drupal\Core\ImageToolkit\ImageToolkitOperationManager
-    arguments: ['@logger.channel.image']
+    arguments: ['@logger.channel.image', '@image.toolkit.manager']
     parent: default_plugin_manager
     tags:
       - { name: plugin_manager_cache_clear }
@@ -1297,74 +1317,74 @@ services:
     calls:
       - [setContainer, ['@service_container']]
     arguments: ['feed.writer.']
-# Zend Feed reader plugins. Plugins should be set as prototype scope.
+# Zend Feed reader plugins. Plugin instances should not be shared.
   feed.reader.dublincoreentry:
     class: Zend\Feed\Reader\Extension\DublinCore\Entry
-    scope: prototype
+    shared: false
   feed.reader.dublincorefeed:
     class: Zend\Feed\Reader\Extension\DublinCore\Feed
-    scope: prototype
+    shared: false
   feed.reader.contententry:
     class: Zend\Feed\Reader\Extension\Content\Entry
-    scope: prototype
+    shared: false
   feed.reader.atomentry:
     class: Zend\Feed\Reader\Extension\Atom\Entry
-    scope: prototype
+    shared: false
   feed.reader.atomfeed:
     class: Zend\Feed\Reader\Extension\Atom\Feed
-    scope: prototype
+    shared: false
   feed.reader.slashentry:
     class: Zend\Feed\Reader\Extension\Slash\Entry
-    scope: prototype
+    shared: false
   feed.reader.wellformedwebentry:
     class: Zend\Feed\Reader\Extension\WellFormedWeb\Entry
-    scope: prototype
+    shared: false
   feed.reader.threadentry:
     class: Zend\Feed\Reader\Extension\Thread\Entry
-    scope: prototype
+    shared: false
   feed.reader.podcastentry:
     class: Zend\Feed\Reader\Extension\Podcast\Entry
-    scope: prototype
+    shared: false
   feed.reader.podcastfeed:
     class: Zend\Feed\Reader\Extension\Podcast\Feed
-    scope: prototype
+    shared: false
 # Zend Feed writer plugins. Plugins should be set as prototype scope.
   feed.writer.atomrendererfeed:
     class: Zend\Feed\Writer\Extension\Atom\Renderer\Feed
-    scope: prototype
+    shared: false
   feed.writer.contentrendererentry:
     class: Zend\Feed\Writer\Extension\Content\Renderer\Entry
-    scope: prototype
+    shared: false
   feed.writer.dublincorerendererentry:
     class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry
-    scope: prototype
+    shared: false
   feed.writer.dublincorerendererfeed:
     class: Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed
-    scope: prototype
+    shared: false
   feed.writer.itunesentry:
     class: Zend\Feed\Writer\Extension\ITunes\Entry
-    scope: prototype
+    shared: false
   feed.writer.itunesfeed:
     class: Zend\Feed\Writer\Extension\ITunes\Feed
-    scope: prototype
+    shared: false
   feed.writer.itunesrendererentry:
     class: Zend\Feed\Writer\Extension\ITunes\Renderer\Entry
-    scope: prototype
+    shared: false
   feed.writer.itunesrendererfeed:
     class: Zend\Feed\Writer\Extension\ITunes\Renderer\Feed
-    scope: prototype
+    shared: false
   feed.writer.slashrendererentry:
     class: Zend\Feed\Writer\Extension\Slash\Renderer\Entry
-    scope: prototype
+    shared: false
   feed.writer.threadingrendererentry:
     class: Zend\Feed\Writer\Extension\Threading\Renderer\Entry
-    scope: prototype
+    shared: false
   feed.writer.wellformedwebrendererentry:
     class: Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry
-    scope: prototype
+    shared: false
   theme.manager:
     class: Drupal\Core\Theme\ThemeManager
-    arguments: ['@app.root', '@theme.negotiator', '@theme.initialization', '@request_stack', '@module_handler']
+    arguments: ['@app.root', '@theme.negotiator', '@theme.initialization', '@module_handler']
     calls:
       - [setThemeRegistry, ['@theme.registry']]
   theme.initialization:
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 41f8f42..7204c5d 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -10,9 +10,11 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Render\Markup;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Utility\Error;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Minimum supported version of PHP.
@@ -293,18 +295,19 @@ function drupal_get_path($type, $name) {
  * @ingroup sanitization
  */
 function t($string, array $args = array(), array $options = array()) {
-  return \Drupal::translation()->translate($string, $args, $options);
+  return new TranslatableMarkup($string, $args, $options);
 }
 
 /**
  * Formats a string for HTML display by replacing variable placeholders.
  *
- * @see \Drupal\Component\Utility\SafeMarkup::format()
+ * @see \Drupal\Component\Render\FormattableMarkup::placeholderFormat()
+ * @see \Drupal\Component\Render\FormattableMarkup
  * @see t()
  * @ingroup sanitization
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal\Component\Utility\SafeMarkup::format().
+ *   Use \Drupal\Component\Render\FormattableMarkup.
  */
 function format_string($string, array $args) {
   return SafeMarkup::format($string, $args);
@@ -441,7 +444,7 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE)
     }
 
     // Convert strings which are safe to the simplest Markup objects.
-    if (!($message instanceof Markup) && SafeMarkup::isSafe($message)) {
+    if (!($message instanceof Markup) && $message instanceof MarkupInterface) {
       $message = Markup::create((string) $message);
     }
 
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 5cd3ce8..03af03b 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -15,7 +15,6 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Render\Markup;
-use Drupal\Core\Render\Renderer;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
@@ -578,7 +577,7 @@ function drupal_process_states(&$elements) {
   // element available, setting #attributes does not make sense, but a wrapper
   // is available, so setting #wrapper_attributes makes it work.
   $key = ($elements['#type'] == 'item') ? '#wrapper_attributes' : '#attributes';
-  $elements[$key]['data-drupal-states'] = JSON::encode($elements['#states']);
+  $elements[$key]['data-drupal-states'] = Json::encode($elements['#states']);
 }
 
 /**
@@ -1271,7 +1270,7 @@ function drupal_get_updaters() {
   if (!isset($updaters)) {
     $updaters = \Drupal::moduleHandler()->invokeAll('updater_info');
     \Drupal::moduleHandler()->alter('updater_info', $updaters);
-    uasort($updaters, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($updaters, array(SortArray::class, 'sortByWeightElement'));
   }
   return $updaters;
 }
@@ -1291,7 +1290,7 @@ function drupal_get_filetransfer_info() {
   if (!isset($info)) {
     $info = \Drupal::moduleHandler()->invokeAll('filetransfer_info');
     \Drupal::moduleHandler()->alter('filetransfer_info', $info);
-    uasort($info, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
+    uasort($info, array(SortArray::class, 'sortByWeightElement'));
   }
   return $info;
 }
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index e071103..d48aa4e 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -6,6 +6,8 @@
  */
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
 
 /**
  * Clears the entity render cache for all entity types.
@@ -468,7 +470,7 @@ function entity_get_display($entity_type, $bundle, $view_mode) {
   // configuration entries are only created when a display object is explicitly
   // configured and saved.
   if (!$display) {
-    $display = entity_create('entity_view_display', array(
+    $display = EntityViewDisplay::create(array(
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
       'mode' => $view_mode,
@@ -544,7 +546,7 @@ function entity_get_form_display($entity_type, $bundle, $form_mode) {
   // configuration entries are only created when an entity form display is
   // explicitly configured and saved.
   if (!$entity_form_display) {
-    $entity_form_display = entity_create('entity_form_display', array(
+    $entity_form_display = EntityFormDisplay::create(array(
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
       'mode' => $form_mode,
diff --git a/core/includes/file.inc b/core/includes/file.inc
index b9c217b..3e5eb8c 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -630,7 +630,8 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
 
   // Allow potentially insecure uploads for very savvy users and admin
   if (!\Drupal::config('system.file')->get('allow_insecure_uploads')) {
-    // Remove any null bytes. See http://php.net/manual/en/security.filesystem.nullbytes.php
+    // Remove any null bytes. See
+    // http://php.net/manual/security.filesystem.nullbytes.php
     $filename = str_replace(chr(0), '', $filename);
 
     $whitelist = array_unique(explode(' ', strtolower(trim($extensions))));
diff --git a/core/includes/form.inc b/core/includes/form.inc
index daf75cd..c110c5b 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -192,7 +192,7 @@ function template_preprocess_fieldset(&$variables) {
   $element = $variables['element'];
   Element::setAttributes($element, array('id'));
   Element\RenderElement::setAttributes($element);
-  $variables['attributes'] = $element['#attributes'];
+  $variables['attributes'] = isset($element['#attributes']) ? $element['#attributes'] : array();
   $variables['prefix'] = isset($element['#field_prefix']) ? $element['#field_prefix'] : NULL;
   $variables['suffix'] = isset($element['#field_suffix']) ? $element['#field_suffix'] : NULL;
   $variables['title_display'] = isset($element['#title_display']) ? $element['#title_display'] : NULL;
@@ -204,7 +204,13 @@ function template_preprocess_fieldset(&$variables) {
   }
 
   $variables['legend']['attributes'] = new Attribute();
-  $variables['legend_span']['attributes'] = new Attribute();
+  // Add 'visually-hidden' class to legend span.
+  if ($variables['title_display'] == 'invisible') {
+    $variables['legend_span']['attributes'] = new Attribute(array('class' => 'visually-hidden'));
+  }
+  else {
+    $variables['legend_span']['attributes'] = new Attribute();
+  }
 
   if (!empty($element['#description'])) {
     $description_id = $element['#attributes']['id'] . '--description';
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 7b66911..da9f11b 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * API functions for installing Drupal.
+ */
+
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Config\BootstrapConfigStorageFactory;
@@ -29,11 +34,6 @@
 use GuzzleHttp\Exception\RequestException;
 
 /**
- * @file
- * API functions for installing Drupal.
- */
-
-/**
  * Do not run the task during the current installation request.
  *
  * This can be used to skip running an installation task when certain
@@ -418,13 +418,6 @@ function install_begin_request($class_loader, &$install_state) {
   $container->get('string_translation')
     ->addTranslator($container->get('string_translator.file_translation'));
 
-  // Set the default language to the selected language, if any.
-  if (isset($install_state['parameters']['langcode'])) {
-    $default_language = new Language(array('id' => $install_state['parameters']['langcode']));
-    $container->get('language.default')->set($default_language);
-    \Drupal::translation()->setDefaultLangcode($install_state['parameters']['langcode']);
-  }
-
   // Add list of all available profiles to the installation state.
   $listing = new ExtensionDiscovery($container->get('app.root'));
   $listing->setProfileDirectories(array());
@@ -443,6 +436,19 @@ function install_begin_request($class_loader, &$install_state) {
     }
   }
 
+  // Use the language from the profile configuration, if available, to override
+  // the language previously set in the parameters.
+  if (isset($install_state['profile_info']['distribution']['langcode'])) {
+    $install_state['parameters']['langcode'] = $install_state['profile_info']['distribution']['langcode'];
+  }
+
+  // Set the default language to the selected language, if any.
+  if (isset($install_state['parameters']['langcode'])) {
+    $default_language = new Language(array('id' => $install_state['parameters']['langcode']));
+    $container->get('language.default')->set($default_language);
+    \Drupal::translation()->setDefaultLangcode($install_state['parameters']['langcode']);
+  }
+
   // Override the module list with a minimal set of modules.
   $module_handler = \Drupal::moduleHandler();
   if (!$module_handler->moduleExists('system')) {
@@ -987,7 +993,7 @@ function install_display_output($output, $install_state) {
   $default_headers = array(
     'Expires' => 'Sun, 19 Nov 1978 05:00:00 GMT',
     'Last-Modified' => gmdate(DATE_RFC1123, REQUEST_TIME),
-    'Cache-Control' => 'no-cache, must-revalidate, post-check=0, pre-check=0',
+    'Cache-Control' => 'no-cache, must-revalidate',
     'ETag' => '"' . REQUEST_TIME . '"',
   );
   $response->headers->add($default_headers);
@@ -1133,23 +1139,6 @@ function install_database_errors($database, $settings_file) {
     Database::addConnectionInfo('default', 'default', $database);
 
     $errors = db_installer_object($driver)->runTasks();
-    if (count($errors)) {
-      $error_message = [
-        '#type' => 'inline_template',
-        '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/getting-started/install">installation handbook</a>, or contact your hosting provider.{% endtrans%}{{ errors }}',
-        '#context' => [
-          'errors' => [
-            '#theme' => 'item_list',
-            '#items' => $errors,
-          ],
-        ],
-      ];
-
-      // These are generic errors, so we do not have any specific key of the
-      // database connection array to attach them to; therefore, we just put
-      // them in the error array with standard numeric keys.
-      $errors[$driver . '][0'] = \Drupal::service('renderer')->renderPlain($error_message);
-    }
   }
   return $errors;
 }
@@ -1955,7 +1944,7 @@ function install_check_requirements($install_state) {
   $profile = $install_state['parameters']['profile'];
 
   // Check the profile requirements.
-  $requirements = drupal_check_profile($profile, $install_state);
+  $requirements = drupal_check_profile($profile);
 
   if ($install_state['settings_verified']) {
     return $requirements;
diff --git a/core/includes/install.inc b/core/includes/install.inc
index c9fd75d..bae87d7 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -921,13 +921,11 @@ function drupal_requirements_url($severity) {
  *
  * @param string $profile
  *   Name of installation profile to check.
- * @param array $install_state
- *   The current state in the install process.
  *
  * @return array
  *   Array of the installation profile's requirements.
  */
-function drupal_check_profile($profile, array $install_state) {
+function drupal_check_profile($profile) {
   $info = install_profile_info($profile);
 
   // Collect requirement testing results.
diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index bc21ea7..6b6bbb7 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -169,6 +169,7 @@ function pager_get_query_parameters() {
  *       one page.
  *     - #parameters: An associative array of query string parameters to append
  *       to the pager links.
+ *     - #route_parameters: An associative array of the route parameters.
  *     - #quantity: The number of pages in the list.
  */
 function template_preprocess_pager(&$variables) {
@@ -176,6 +177,7 @@ function template_preprocess_pager(&$variables) {
   $parameters = $variables['pager']['#parameters'];
   $quantity = $variables['pager']['#quantity'];
   $route_name = $variables['pager']['#route_name'];
+  $route_parameters = isset($variables['pager']['#route_parameters']) ? $variables['pager']['#route_parameters'] : [];
   global $pager_page_array, $pager_total;
 
   // Nothing to do if there is only one page.
@@ -218,7 +220,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, 0),
     );
-    $items['first']['href'] = \Drupal::url($route_name, [], $options);
+    $items['first']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[0])) {
       $items['first']['text'] = $tags[0];
     }
@@ -227,7 +229,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] - 1),
     );
-    $items['previous']['href'] = \Drupal::url($route_name, [], $options);
+    $items['previous']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[1])) {
       $items['previous']['text'] = $tags[1];
     }
@@ -243,7 +245,7 @@ function template_preprocess_pager(&$variables) {
       $options = array(
         'query' => pager_query_add_page($parameters, $element, $i - 1),
       );
-      $items['pages'][$i]['href'] = \Drupal::url($route_name, [], $options);
+      $items['pages'][$i]['href'] = \Drupal::url($route_name, $route_parameters, $options);
       if ($i == $pager_current) {
         $variables['current'] = $i;
       }
@@ -260,7 +262,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_page_array[$element] + 1),
     );
-    $items['next']['href'] = \Drupal::url($route_name, [], $options);
+    $items['next']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[3])) {
       $items['next']['text'] = $tags[3];
     }
@@ -269,7 +271,7 @@ function template_preprocess_pager(&$variables) {
     $options = array(
       'query' => pager_query_add_page($parameters, $element, $pager_max - 1),
     );
-    $items['last']['href'] = \Drupal::url($route_name, [], $options);
+    $items['last']['href'] = \Drupal::url($route_name, $route_parameters, $options);
     if (isset($tags[4])) {
       $items['last']['text'] = $tags[4];
     }
diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc
index 65b791f..95642b3 100644
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -1,9 +1,5 @@
 <?php
 
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Url;
-use Drupal\Component\Utility\UrlHelper;
-
 /**
  * @file
  * Functions to aid in the creation of sortable tables.
@@ -13,6 +9,10 @@
  * column.
  */
 
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Url;
+use Drupal\Component\Utility\UrlHelper;
+
 /**
  * Initializes the table sort context.
  */
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 22d73fd..54b038b 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -11,7 +11,6 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\Config;
@@ -95,6 +94,21 @@ function theme_get_registry($complete = TRUE) {
 }
 
 /**
+ * Returns an array of default theme features.
+ *
+ * @see \Drupal\Core\Extension\ThemeHandler::$defaultFeatures
+ */
+function _system_default_theme_features() {
+  return array(
+    'favicon',
+    'logo',
+    'node_user_picture',
+    'comment_user_picture',
+    'comment_user_verification',
+  );
+}
+
+/**
  * Forces the system to rebuild the theme registry.
  *
  * This function should be called when modules are added to the system, or when
@@ -401,7 +415,7 @@ function theme_render_and_autoescape($arg) {
       $return = (string) $arg;
     }
     // You can't throw exceptions in the magic PHP __toString methods, see
-    // http://php.net/manual/en/language.oop5.magic.php#object.tostring so
+    // http://php.net/manual/language.oop5.magic.php#object.tostring so
     // we also support a toString method.
     elseif (method_exists($arg, 'toString')) {
       $return = $arg->toString();
@@ -413,7 +427,7 @@ function theme_render_and_autoescape($arg) {
 
   // We have a string or an object converted to a string: Escape it!
   if (isset($return)) {
-    return SafeMarkup::isSafe($return, 'html') ? $return : Html::escape($return);
+    return $return instanceof MarkupInterface ? $return : Html::escape($return);
   }
 
   // This is a normal render array, which is safe by definition, with special
@@ -568,9 +582,8 @@ function template_preprocess_datetime_wrapper(&$variables) {
  *
  * @param array $variables
  *   An associative array containing:
- *   - links: An associative array of links to be themed. The key for each link
- *     is used as its CSS class. Each link should be itself an array, with the
- *     following elements:
+ *   - links: An array of links to be themed. Each link should be itself an
+ *     array, with the following elements:
  *     - title: The link text.
  *     - url: (optional) The url object to link to. If omitted, no a tag is
  *       printed out.
diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc
index 216d112..f0df33e 100644
--- a/core/includes/unicode.inc
+++ b/core/includes/unicode.inc
@@ -29,26 +29,25 @@ function unicode_requirements() {
     'value' => $libraries[$library],
     'severity' => $severities[$library],
   );
-  $t_args = array(':url' => 'http://www.php.net/mbstring');
   switch ($failed_check) {
     case 'mb_strlen':
-      $requirements['unicode']['description'] = t('Operations on Unicode strings are emulated on a best-effort basis. Install the <a href=":url">PHP mbstring extension</a> for improved Unicode support.', $t_args);
+      $requirements['unicode']['description'] = t('Operations on Unicode strings are emulated on a best-effort basis. Install the <a href="http://php.net/mbstring">PHP mbstring extension</a> for improved Unicode support.');
       break;
 
     case 'mbstring.func_overload':
-      $requirements['unicode']['description'] = t('Multibyte string function overloading in PHP is active and must be disabled. Check the php.ini <em>mbstring.func_overload</em> setting. Please refer to the <a href=":url">PHP mbstring documentation</a> for more information.', $t_args);
+      $requirements['unicode']['description'] = t('Multibyte string function overloading in PHP is active and must be disabled. Check the php.ini <em>mbstring.func_overload</em> setting. Please refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.');
       break;
 
     case 'mbstring.encoding_translation':
-      $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.encoding_translation</em> setting. Please refer to the <a href=":url">PHP mbstring documentation</a> for more information.', $t_args);
+      $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.encoding_translation</em> setting. Please refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.');
       break;
 
     case 'mbstring.http_input':
-      $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_input</em> setting. Please refer to the <a href=":url">PHP mbstring documentation</a> for more information.', $t_args);
+      $requirements['unicode']['description'] = t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_input</em> setting. Please refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.');
       break;
 
     case 'mbstring.http_output':
-      $requirements['unicode']['description'] = t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_output</em> setting. Please refer to the <a href=":url">PHP mbstring documentation</a> for more information.', $t_args);
+      $requirements['unicode']['description'] = t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_output</em> setting. Please refer to the <a href="http://php.net/mbstring">PHP mbstring documentation</a> for more information.');
       break;
   }
 
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 2344229..5d1588d 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -81,7 +81,7 @@ class Drupal {
   /**
    * The current system version.
    */
-  const VERSION = '8.0.6-dev';
+  const VERSION = '8.2.0-dev';
 
   /**
    * Core API compatibility.
diff --git a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
index edfce73..11ed449 100644
--- a/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Component/Annotation/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -47,6 +47,13 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
   protected $annotationReader;
 
   /**
+   * Additional namespaces to be scanned for annotation classes.
+   *
+   * @var string[]
+   */
+  protected $annotationNamespaces = [];
+
+  /**
    * Constructs a new instance.
    *
    * @param string[] $plugin_namespaces
@@ -55,10 +62,13 @@ class AnnotatedClassDiscovery implements DiscoveryInterface {
    * @param string $plugin_definition_annotation_name
    *   (optional) The name of the annotation that contains the plugin definition.
    *   Defaults to 'Drupal\Component\Annotation\Plugin'.
+   * @param string[] $annotation_namespaces
+   *   (optional) Additional namespaces to be scanned for annotation classes.
    */
-  function __construct($plugin_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') {
+  function __construct($plugin_namespaces = array(), $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
     $this->pluginNamespaces = $plugin_namespaces;
     $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name;
+    $this->annotationNamespaces = $annotation_namespaces;
   }
 
   /**
@@ -74,6 +84,11 @@ protected function getAnnotationReader() {
       // Add the namespaces from the main plugin annotation, like @EntityType.
       $namespace = substr($this->pluginDefinitionAnnotationName, 0, strrpos($this->pluginDefinitionAnnotationName, '\\'));
       $this->annotationReader->addNamespace($namespace);
+
+      // Register additional namespaces to be scanned for annotations.
+      foreach ($this->annotationNamespaces as $namespace) {
+        $this->annotationReader->addNamespace($namespace);
+      }
     }
     return $this->annotationReader;
   }
diff --git a/core/lib/Drupal/Component/Bridge/LICENSE.txt b/core/lib/Drupal/Component/Bridge/LICENSE.txt
new file mode 100644
index 0000000..94fb846
--- /dev/null
+++ b/core/lib/Drupal/Component/Bridge/LICENSE.txt
@@ -0,0 +1,339 @@
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  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
+this service 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 make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  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.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE 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.
+
+         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
+convey 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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision 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, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This 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.
diff --git a/core/lib/Drupal/Component/Bridge/README.txt b/core/lib/Drupal/Component/Bridge/README.txt
new file mode 100644
index 0000000..eb945f7
--- /dev/null
+++ b/core/lib/Drupal/Component/Bridge/README.txt
@@ -0,0 +1,12 @@
+The Drupal Bridge Component
+
+Thanks for using this Drupal component.
+
+You can participate in its development on Drupal.org, through our issue system:
+https://www.drupal.org/project/issues/drupal
+
+You can get the full Drupal repo here:
+https://www.drupal.org/project/drupal/git-instructions
+
+You can browse the full Drupal repo here:
+http://cgit.drupalcode.org/drupal
diff --git a/core/lib/Drupal/Component/Bridge/TESTING.txt b/core/lib/Drupal/Component/Bridge/TESTING.txt
new file mode 100644
index 0000000..6613928
--- /dev/null
+++ b/core/lib/Drupal/Component/Bridge/TESTING.txt
@@ -0,0 +1,19 @@
+HOW-TO: Test this Drupal component
+
+In order to test this component, you'll need to get the entire Drupal repo and
+run the tests there.
+
+You'll find the tests under core/tests/Drupal/Tests/Component.
+
+You can get the full Drupal repo here:
+https://www.drupal.org/project/drupal/git-instructions
+
+You can find more information about running PHPUnit tests with Drupal here:
+https://www.drupal.org/node/2116263
+
+Each component in the Drupal\Component namespace has its own annotated test
+group. You can use this group to run only the tests for this component. Like
+this:
+
+$ cd ./core
+$ ./vendor/bin/phpunit -c core --group Bridge
diff --git a/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php b/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
index 1bd0a73..252b9a9 100644
--- a/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
+++ b/core/lib/Drupal/Component/Bridge/ZfExtensionManagerSfContainer.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Component\Bridge\ZfExtensionManagerSfContainer.
  */
+
 namespace Drupal\Component\Bridge;
 
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
diff --git a/core/lib/Drupal/Component/Bridge/composer.json b/core/lib/Drupal/Component/Bridge/composer.json
new file mode 100644
index 0000000..75cd7ed
--- /dev/null
+++ b/core/lib/Drupal/Component/Bridge/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "drupal/core-bridge",
+    "description": "Bridge.",
+    "keywords": ["drupal"],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0+",
+    "require": {
+        "php": ">=5.5.9"
+    },
+    "autoload": {
+        "psr-0": {
+            "Drupal\\Component\\Bridge\\": ""
+        }
+    }
+}
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 4540b3b..372fb00 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Component\Datetime\DateTimePlus.
  */
+
 namespace Drupal\Component\Datetime;
 use Drupal\Component\Utility\ToStringTrait;
 
@@ -177,7 +178,7 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
    *   to use things like negative years, which php's parser fails on, or
    *   any other specialized input with a known format. If provided the
    *   date will be created using the createFromFormat() method.
-   *   @see http://us3.php.net/manual/en/datetime.createfromformat.php
+   *   @see http://php.net/manual/datetime.createfromformat.php
    * @param mixed $time
    *   @see __construct()
    * @param mixed $timezone
@@ -389,7 +390,7 @@ protected function prepareFormat($format) {
    * PHP creates a valid date from invalid data with only a warning,
    * 2011-02-30 becomes 2011-03-03, for instance, but we don't want that.
    *
-   * @see http://us3.php.net/manual/en/time.getlasterrors.php
+   * @see http://php.net/manual/time.getlasterrors.php
    */
   public function checkErrors() {
     $errors = \DateTime::getLastErrors();
diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index df25ae8..201b3d1 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -9,6 +9,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\IntrospectableContainerInterface;
+use Symfony\Component\DependencyInjection\ResettableContainerInterface;
 use Symfony\Component\DependencyInjection\ScopeInterface;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -54,7 +55,7 @@
  *
  * @ingroup container
  */
-class Container implements IntrospectableContainerInterface {
+class Container implements IntrospectableContainerInterface, ResettableContainerInterface {
 
   /**
    * The parameters of the container.
@@ -182,11 +183,7 @@ public function get($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_IN
     }
     catch (\Exception $e) {
       unset($this->loading[$id]);
-
-      // Remove a potentially shared service that was constructed incompletely.
-      if (array_key_exists($id, $this->services)) {
-        unset($this->services[$id]);
-      }
+      unset($this->services[$id]);
 
       if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalid_behavior) {
         return;
@@ -201,6 +198,17 @@ public function get($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_IN
   }
 
   /**
+   * {@inheritdoc}
+   */
+  public function reset() {
+    if (!empty($this->scopedServices)) {
+      throw new LogicException('Resetting the container is not allowed when a scope is active.');
+    }
+
+    $this->services = [];
+  }
+
+  /**
    * Creates a service from a service definition.
    *
    * @param array $definition
@@ -359,6 +367,10 @@ protected function createService(array $definition, $id) {
    * {@inheritdoc}
    */
   public function set($id, $service, $scope = ContainerInterface::SCOPE_CONTAINER) {
+    if (!in_array($scope, array('container', 'request')) || ('request' === $scope && 'request' !== $id)) {
+      @trigger_error('The concept of container scopes is deprecated since version 2.8 and will be removed in 3.0. Omit the third parameter.', E_USER_DEPRECATED);
+    }
+
     $this->services[$id] = $service;
   }
 
@@ -585,6 +597,10 @@ protected function getParameterAlternatives($name) {
    * {@inheritdoc}
    */
   public function enterScope($name) {
+    if ('request' !== $name) {
+      @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+    }
+
     throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
   }
 
@@ -592,6 +608,10 @@ public function enterScope($name) {
    * {@inheritdoc}
    */
   public function leaveScope($name) {
+    if ('request' !== $name) {
+      @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+    }
+
     throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
   }
 
@@ -599,6 +619,11 @@ public function leaveScope($name) {
    * {@inheritdoc}
    */
   public function addScope(ScopeInterface $scope) {
+
+    $name = $scope->getName();
+    if ('request' !== $name) {
+      @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+    }
     throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
   }
 
@@ -606,6 +631,10 @@ public function addScope(ScopeInterface $scope) {
    * {@inheritdoc}
    */
   public function hasScope($name) {
+    if ('request' !== $name) {
+      @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+    }
+
     throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
   }
 
@@ -613,6 +642,8 @@ public function hasScope($name) {
    * {@inheritdoc}
    */
   public function isScopeActive($name) {
+    @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+
     throw new \BadMethodCallException(sprintf("'%s' is not supported by Drupal 8.", __FUNCTION__));
   }
 
@@ -626,4 +657,11 @@ public function getServiceIds() {
     return array_keys($this->serviceDefinitions + $this->services);
   }
 
+  /**
+   * Ensure that cloning doesn't work.
+   */
+  private function __clone()
+  {
+  }
+
 }
diff --git a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
index 23290b6..1837cf4 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
@@ -252,6 +252,11 @@ protected function getServiceDefinition(Definition $definition) {
       }
     }
 
+    // By default services are shared, so just provide the flag, when needed.
+    if ($definition->isShared() === FALSE) {
+      $service['shared'] = $definition->isShared();
+    }
+
     if (($decorated = $definition->getDecoratedService()) !== NULL) {
       throw new InvalidArgumentException("The 'decorated' definition is not supported by the Drupal 8 run-time container. The Container Builder should have resolved that during the DecoratorServicePass compiler pass.");
     }
diff --git a/core/lib/Drupal/Component/DependencyInjection/composer.json b/core/lib/Drupal/Component/DependencyInjection/composer.json
index 7e5e666..d3bcd58 100644
--- a/core/lib/Drupal/Component/DependencyInjection/composer.json
+++ b/core/lib/Drupal/Component/DependencyInjection/composer.json
@@ -1,18 +1,18 @@
 {
-  "name": "drupal/core-dependency-injection",
-  "description": "Dependency Injection container optimized for Drupal's needs.",
-  "keywords": ["drupal", "dependency injection"],
-  "type": "library",
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0+",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\DependencyInjection\\": ""
+    "name": "drupal/core-dependency-injection",
+    "description": "Dependency Injection container optimized for Drupal's needs.",
+    "keywords": ["drupal", "dependency injection"],
+    "type": "library",
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0+",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "irc": "irc://irc.freenode.net/drupal-contribute",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\DependencyInjection\\": ""
+        }
     }
-  }
 }
diff --git a/core/lib/Drupal/Component/Discovery/DiscoverableInterface.php b/core/lib/Drupal/Component/Discovery/DiscoverableInterface.php
index c04556f..b31370c 100644
--- a/core/lib/Drupal/Component/Discovery/DiscoverableInterface.php
+++ b/core/lib/Drupal/Component/Discovery/DiscoverableInterface.php
@@ -17,6 +17,9 @@
    *
    * @return array
    *   An array of discovered data keyed by provider.
+   *
+   * @throws \Drupal\Component\Discovery\DiscoveryException
+   *   Exception thrown if there is a problem during discovery.
    */
   public function findAll();
 
diff --git a/core/lib/Drupal/Component/Discovery/DiscoveryException.php b/core/lib/Drupal/Component/Discovery/DiscoveryException.php
new file mode 100644
index 0000000..c545033
--- /dev/null
+++ b/core/lib/Drupal/Component/Discovery/DiscoveryException.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Discovery\DiscoveryException.
+ */
+
+namespace Drupal\Component\Discovery;
+
+/**
+ * Exception thrown during discovery if the data is invalid.
+ */
+class DiscoveryException extends \RuntimeException {
+}
diff --git a/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php b/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php
new file mode 100644
index 0000000..4d515a3
--- /dev/null
+++ b/core/lib/Drupal/Component/Discovery/YamlDirectoryDiscovery.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Discovery\YamlDirectoryDiscovery.
+ */
+
+namespace Drupal\Component\Discovery;
+
+use Drupal\Component\FileSystem\RegexDirectoryIterator;
+use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Component\FileCache\FileCacheFactory;
+
+/**
+ * Discovers multiple YAML files in a set of directories.
+ */
+class YamlDirectoryDiscovery implements DiscoverableInterface {
+
+  /**
+   * Defines the key in the discovered data where the file path is stored.
+   */
+  const FILE_KEY = '_discovered_file_path';
+
+  /**
+   * An array of directories to scan, keyed by the provider.
+   *
+   * The value can either be a string or an array of strings. The string values
+   * should be the path of a directory to scan.
+   *
+   * @var array
+   */
+  protected $directories = [];
+
+  /**
+   * The suffix for the file cache key.
+   *
+   * @var string
+   */
+  protected $fileCacheKeySuffix;
+
+  /**
+   * The key contained in the discovered data that identifies it.
+   *
+   * @var string
+   */
+  protected $idKey;
+
+  /**
+   * Constructs a YamlDirectoryDiscovery object.
+   *
+   * @param array $directories
+   *   An array of directories to scan, keyed by the provider. The value can
+   *   either be a string or an array of strings. The string values should be
+   *   the path of a directory to scan.
+   * @param string $file_cache_key_suffix
+   *   The file cache key suffix. This should be unique for each type of
+   *   discovery.
+   * @param string $key
+   *   (optional) The key contained in the discovered data that identifies it.
+   *   Defaults to 'id'.
+   */
+  public function __construct(array $directories, $file_cache_key_suffix, $key = 'id') {
+    $this->directories = $directories;
+    $this->fileCacheKeySuffix = $file_cache_key_suffix;
+    $this->idKey = $key;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function findAll() {
+    $all = array();
+
+    $files = $this->findFiles();
+
+    $file_cache = FileCacheFactory::get('yaml_discovery:' . $this->fileCacheKeySuffix);
+
+    // Try to load from the file cache first.
+    foreach ($file_cache->getMultiple(array_keys($files)) as $file => $data) {
+      $all[$files[$file]][$this->getIdentifier($file, $data)] = $data;
+      unset($files[$file]);
+    }
+
+    // If there are files left that were not returned from the cache, load and
+    // parse them now. This list was flipped above and is keyed by filename.
+    if ($files) {
+      foreach ($files as $file => $provider) {
+        // If a file is empty or its contents are commented out, return an empty
+        // array instead of NULL for type consistency.
+        try {
+          $data = Yaml::decode(file_get_contents($file)) ?: [];
+        }
+        catch (InvalidDataTypeException $e) {
+          throw new DiscoveryException("The $file contains invalid YAML", 0, $e);
+        }
+        $data[static::FILE_KEY] = $file;
+        $all[$provider][$this->getIdentifier($file, $data)] = $data;
+        $file_cache->set($file, $data);
+      }
+    }
+
+    return $all;
+  }
+
+  /**
+   * Gets the identifier from the data.
+   *
+   * @param string $file
+   *   The filename.
+   * @param array $data
+   *   The data from the YAML file.
+   *
+   * @return string
+   *   The identifier from the data.
+   */
+  protected function getIdentifier($file, array $data) {
+    if (!isset($data[$this->idKey])) {
+      throw new DiscoveryException("The $file contains no data in the identifier key '{$this->idKey}'");
+    }
+    return $data[$this->idKey];
+  }
+
+  /**
+   * Returns an array of providers keyed by file path.
+   *
+   * @return array
+   *   An array of providers keyed by file path.
+   */
+  protected function findFiles() {
+    $file_list = [];
+    foreach ($this->directories as $provider => $directories) {
+      $directories = (array) $directories;
+      foreach ($directories as $directory) {
+        if (is_dir($directory)) {
+          /** @var \SplFileInfo $fileInfo */
+          foreach ($this->getDirectoryIterator($directory) as $fileInfo) {
+            $file_list[$fileInfo->getPathname()] = $provider;
+          }
+        }
+      }
+    }
+    return $file_list;
+  }
+
+  /**
+   * Gets an iterator to loop over the files in the provided directory.
+   *
+   * This method exists so that it is easy to replace this functionality in a
+   * class that extends this one. For example, it could be used to make the scan
+   * recursive.
+   *
+   * @param string $directory
+   *   The directory to scan.
+   *
+   * @return \Traversable
+   *   An \Traversable object or array where the values are \SplFileInfo
+   *   objects.
+   */
+  protected function getDirectoryIterator($directory) {
+    return new RegexDirectoryIterator($directory, '/\.yml$/i');
+  }
+
+}
diff --git a/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php b/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php
new file mode 100644
index 0000000..c8a7273
--- /dev/null
+++ b/core/lib/Drupal/Component/FileSystem/RegexDirectoryIterator.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\FileSystem\RegexDirectoryIterator.
+ */
+
+namespace Drupal\Component\FileSystem;
+
+/**
+ * Iterates over files whose names match a regular expression in a directory.
+ */
+class RegexDirectoryIterator extends \FilterIterator {
+
+  /**
+   * The regular expression to match.
+   *
+   * @var string
+   */
+  protected $regex;
+
+  /**
+   * RegexDirectoryIterator constructor.
+   *
+   * @param string $path
+   *   The path to scan.
+   * @param string $regex
+   *   The regular expression to match, including delimiters. For example,
+   *   /\.yml$/ would list only files ending in .yml.
+   */
+  public function __construct($path, $regex) {
+    // Use FilesystemIterator to not iterate over the the . and .. directories.
+    $iterator = new \FilesystemIterator($path);
+    parent::__construct($iterator);
+    $this->regex = $regex;
+  }
+
+  /**
+   * Implements \FilterIterator::accept().
+   */
+  public function accept() {
+    /** @var \SplFileInfo $file_info */
+    $file_info = $this->getInnerIterator()->current();
+    return $file_info->isFile() && preg_match($this->regex, $file_info->getFilename());
+  }
+
+}
diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json
index a95be56..4df12de 100644
--- a/core/lib/Drupal/Component/Gettext/composer.json
+++ b/core/lib/Drupal/Component/Gettext/composer.json
@@ -1,16 +1,16 @@
 {
-  "name": "drupal/core-gettext",
-  "description": "PHP library for reading PO files.",
-  "type": "library",
-  "license": "GPL-2.0+",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Gettext\\": ""
+    "name": "drupal/core-gettext",
+    "description": "PHP library for reading PO files.",
+    "type": "library",
+    "license": "GPL-2.0+",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "irc": "irc://irc.freenode.net/drupal-contribute",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Gettext\\": ""
+        }
     }
-  }
 }
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
index 067a8df..04ec0b9 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Component\PhpStorage\MTimeProtectedFileStorage.
  */
+
 namespace Drupal\Component\PhpStorage;
 
 /**
diff --git a/core/lib/Drupal/Component/ProxyBuilder/composer.json b/core/lib/Drupal/Component/ProxyBuilder/composer.json
index 126c1a3..aaf0816 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/composer.json
+++ b/core/lib/Drupal/Component/ProxyBuilder/composer.json
@@ -1,16 +1,16 @@
 {
-  "name": "drupal/core-proxy-builder",
-  "description": "Provides a lightweight mechanism to provide lazy loaded proxies.",
-  "keywords": ["drupal", "proxy"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0+",
-  "require": {
-    "php": ">=5.5.9",
-    "symfony/dependency-injection": "~2.6"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\ProxyBuilder\\": ""
+    "name": "drupal/core-proxy-builder",
+    "description": "Provides a lightweight mechanism to provide lazy loaded proxies.",
+    "keywords": ["drupal", "proxy"],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0+",
+    "require": {
+        "php": ">=5.5.9",
+        "symfony/dependency-injection": "~2.6"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\ProxyBuilder\\": ""
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/core/lib/Drupal/Component/Render/FormattableMarkup.php b/core/lib/Drupal/Component/Render/FormattableMarkup.php
index 2d079ac..4b4ef25 100644
--- a/core/lib/Drupal/Component/Render/FormattableMarkup.php
+++ b/core/lib/Drupal/Component/Render/FormattableMarkup.php
@@ -8,7 +8,6 @@
 namespace Drupal\Component\Render;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
 
@@ -199,22 +198,21 @@ protected static function placeholderFormat($string, array $args) {
           // Escape if the value is not an object from a class that implements
           // \Drupal\Component\Render\MarkupInterface, for example strings will
           // be escaped.
-          // \Drupal\Component\Utility\SafeMarkup\SafeMarkup::isSafe() may
-          // return TRUE for content that is safe within HTML fragments, but not
-          // within other contexts, so this placeholder type must not be used
-          // within HTML attributes, JavaScript, or CSS.
+          // Strings that are safe within HTML fragments, but not within other
+          // contexts, may still be an instance of
+          // \Drupal\Component\Render\MarkupInterface, so this placeholder type
+          // must not be used within HTML attributes, JavaScript, or CSS.
           $args[$key] = static::placeholderEscape($value);
           break;
 
         case ':':
           // Strip URL protocols that can be XSS vectors.
           $value = UrlHelper::stripDangerousProtocols($value);
-          // Escape unconditionally, without checking
-          // \Drupal\Component\Utility\SafeMarkup\SafeMarkup::isSafe(). This
-          // forces characters that are unsafe for use in an "href" HTML
-          // attribute to be encoded. If a caller wants to pass a value that is
-          // extracted from HTML and therefore is already HTML encoded, it must
-          // invoke
+          // Escape unconditionally, without checking whether the value is an
+          // instance of \Drupal\Component\Render\MarkupInterface. This forces
+          // characters that are unsafe for use in an "href" HTML attribute to
+          // be encoded. If a caller wants to pass a value that is extracted
+          // from HTML and therefore is already HTML encoded, it must invoke
           // \Drupal\Component\Render\OutputStrategyInterface::renderFromHtml()
           // on it prior to passing it in as a placeholder value of this type.
           // @todo Add some advice and stronger warnings.
@@ -226,8 +224,8 @@ protected static function placeholderFormat($string, array $args) {
           // Similarly to @, escape non-safe values. Also, add wrapping markup
           // in order to render as a placeholder. Not for use within attributes,
           // per the warning above about
-          // \Drupal\Component\Utility\SafeMarkup\SafeMarkup::isSafe() and also
-          // due to the wrapping markup.
+          // \Drupal\Component\Render\MarkupInterface and also due to the
+          // wrapping markup.
           $args[$key] = '<em class="placeholder">' . static::placeholderEscape($value) . '</em>';
           break;
 
@@ -256,7 +254,7 @@ protected static function placeholderFormat($string, array $args) {
    *   The properly escaped replacement value.
    */
   protected static function placeholderEscape($value) {
-    return SafeMarkup::isSafe($value) ? (string) $value : Html::escape($value);
+    return $value instanceof MarkupInterface ? (string) $value : Html::escape($value);
   }
 
 }
diff --git a/core/lib/Drupal/Component/Render/MarkupInterface.php b/core/lib/Drupal/Component/Render/MarkupInterface.php
index 65ab29a..1cc146e 100644
--- a/core/lib/Drupal/Component/Render/MarkupInterface.php
+++ b/core/lib/Drupal/Component/Render/MarkupInterface.php
@@ -26,7 +26,6 @@
  * implement \Countable so it can be used in if statements.
  *
  * @see \Drupal\Component\Render\MarkupTrait
- * @see \Drupal\Component\Utility\SafeMarkup::isSafe()
  * @see \Drupal\Core\Template\TwigExtension::escapeFilter()
  * @see \Drupal\Component\Render\FormattableMarkup
  * @see \Drupal\Core\StringTranslation\TranslatableMarkup
diff --git a/core/lib/Drupal/Component/Utility/Bytes.php b/core/lib/Drupal/Component/Utility/Bytes.php
index 0bcac31..4d331ea 100644
--- a/core/lib/Drupal/Component/Utility/Bytes.php
+++ b/core/lib/Drupal/Component/Utility/Bytes.php
@@ -15,7 +15,7 @@ class Bytes {
   /**
    * The number of bytes in a kilobyte.
    *
-   * @see http://en.wikipedia.org/wiki/Kilobyte
+   * @see http://wikipedia.org/wiki/Kilobyte
    */
   const KILOBYTE = 1024;
 
diff --git a/core/lib/Drupal/Component/Utility/Crypt.php b/core/lib/Drupal/Component/Utility/Crypt.php
index 7ae2e61..66cadfa 100644
--- a/core/lib/Drupal/Component/Utility/Crypt.php
+++ b/core/lib/Drupal/Component/Utility/Crypt.php
@@ -22,6 +22,10 @@ class Crypt {
    * bytes normally from mt_rand()) and uses the best available pseudo-random
    * source.
    *
+   * In PHP 7 and up, this uses the built-in PHP function random_bytes().
+   * In older PHP versions, this uses the random_bytes() function provided by
+   * the random_compat library.
+   *
    * @param int $count
    *   The number of characters (bytes) to return in the string.
    *
@@ -29,65 +33,7 @@ class Crypt {
    *   A randomly generated string.
    */
   public static function randomBytes($count) {
-    // $random_state does not use drupal_static as it stores random bytes.
-    static $random_state, $bytes;
-
-    $missing_bytes = $count - strlen($bytes);
-
-    if ($missing_bytes > 0) {
-      // openssl_random_pseudo_bytes() will find entropy in a system-dependent
-      // way.
-      if (function_exists('openssl_random_pseudo_bytes')) {
-        $bytes .= openssl_random_pseudo_bytes($missing_bytes);
-      }
-
-      // If OpenSSL is not available, we can use mcrypt. On Windows, this will
-      // transparently pull from CryptGenRandom. On Unix-based systems, it will
-      // read from /dev/urandom as expected.
-      elseif (function_exists(('mcrypt_create_iv')) && defined('MCRYPT_DEV_URANDOM')) {
-        $bytes .= mcrypt_create_iv($count, MCRYPT_DEV_URANDOM);
-      }
-
-      // Else, read directly from /dev/urandom, which is available on many *nix
-      // systems and is considered cryptographically secure.
-      elseif ($fh = @fopen('/dev/urandom', 'rb')) {
-        // PHP only performs buffered reads, so in reality it will always read
-        // at least 4096 bytes. Thus, it costs nothing extra to read and store
-        // that much so as to speed any additional invocations.
-        $bytes .= fread($fh, max(4096, $missing_bytes));
-        fclose($fh);
-      }
-
-      // If we couldn't get enough entropy, this simple hash-based PRNG will
-      // generate a good set of pseudo-random bytes on any system.
-      // Note that it may be important that our $random_state is passed
-      // through hash() prior to being rolled into $output, that the two hash()
-      // invocations are different, and that the extra input into the first one -
-      // the microtime() - is prepended rather than appended. This is to avoid
-      // directly leaking $random_state via the $output stream, which could
-      // allow for trivial prediction of further "random" numbers.
-      if (strlen($bytes) < $count) {
-        // Initialize on the first call. The contents of $_SERVER includes a mix
-        // of user-specific and system information that varies a little with
-        // each page.
-        if (!isset($random_state)) {
-          $random_state = print_r($_SERVER, TRUE);
-          if (function_exists('getmypid')) {
-            // Further initialize with the somewhat random PHP process ID.
-            $random_state .= getmypid();
-          }
-          $bytes = '';
-        }
-
-        do {
-          $random_state = hash('sha256', microtime() . mt_rand() . $random_state);
-          $bytes .= hash('sha256', mt_rand() . $random_state, TRUE);
-        } while (strlen($bytes) < $count);
-      }
-    }
-    $output = substr($bytes, 0, $count);
-    $bytes = substr($bytes, $count);
-    return $output;
+    return random_bytes($count);
   }
 
   /**
@@ -178,7 +124,7 @@ public static function hashEquals($known_string, $user_string) {
   /**
    * Returns a URL-safe, base64 encoded string of highly randomized bytes.
    *
-   * @param $byte_count
+   * @param $count
    *   The number of random bytes to fetch and base64 encode.
    *
    * @return string
diff --git a/core/lib/Drupal/Component/Utility/Html.php b/core/lib/Drupal/Component/Utility/Html.php
index 0c811f2..d13c134 100644
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -334,7 +334,7 @@ public static function escapeCdataElement(\DOMNode $node, $comment_start = '//',
         // Prevent invalid cdata escaping as this would throw a DOM error.
         // This is the same behavior as found in libxml2.
         // Related W3C standard: http://www.w3.org/TR/REC-xml/#dt-cdsection
-        // Fix explanation: http://en.wikipedia.org/wiki/CDATA#Nesting
+        // Fix explanation: http://wikipedia.org/wiki/CDATA#Nesting
         $data = str_replace(']]>', ']]]]><![CDATA[>', $child_node->data);
 
         $fragment = $node->ownerDocument->createDocumentFragment();
diff --git a/core/lib/Drupal/Component/Utility/Number.php b/core/lib/Drupal/Component/Utility/Number.php
index 99bedc8..59a199b 100644
--- a/core/lib/Drupal/Component/Utility/Number.php
+++ b/core/lib/Drupal/Component/Utility/Number.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Component\Utility\Number.
  */
+
 namespace Drupal\Component\Utility;
 
 /**
diff --git a/core/lib/Drupal/Component/Utility/Rectangle.php b/core/lib/Drupal/Component/Utility/Rectangle.php
new file mode 100644
index 0000000..d91fd4f
--- /dev/null
+++ b/core/lib/Drupal/Component/Utility/Rectangle.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Component\Utility\Rectangle.
+ */
+
+namespace Drupal\Component\Utility;
+
+/**
+ * Rectangle rotation algebra class.
+ *
+ * This class is used by the image system to abstract, from toolkit
+ * implementations, the calculation of the expected dimensions resulting from
+ * an image rotate operation.
+ *
+ * Different versions of PHP for the GD toolkit, and alternative toolkits, use
+ * different algorithms to perform the rotation of an image and result in
+ * different dimensions of the output image. This prevents predictability of
+ * the final image size for instance by the image rotate effect, or by image
+ * toolkit rotate operations.
+ *
+ * This class implements a calculation algorithm that returns, given input
+ * width, height and rotation angle, dimensions of the expected image after
+ * rotation that are consistent with those produced by the GD rotate image
+ * toolkit operation using PHP 5.5 and above.
+ *
+ * @see \Drupal\system\Plugin\ImageToolkit\Operation\gd\Rotate
+ */
+class Rectangle {
+
+  /**
+   * The width of the rectangle.
+   *
+   * @var int
+   */
+  protected $width;
+
+  /**
+   * The height of the rectangle.
+   *
+   * @var int
+   */
+  protected $height;
+
+  /**
+   * The width of the rotated rectangle.
+   *
+   * @var int
+   */
+  protected $boundingWidth;
+
+  /**
+   * The height of the rotated rectangle.
+   *
+   * @var int
+   */
+  protected $boundingHeight;
+
+  /**
+   * Constructs a new Rectangle object.
+   *
+   * @param int $width
+   *   The width of the rectangle.
+   * @param int $height
+   *   The height of the rectangle.
+   */
+  public function __construct($width, $height) {
+    if ($width > 0 && $height > 0) {
+      $this->width = $width;
+      $this->height = $height;
+      $this->boundingWidth = $width;
+      $this->boundingHeight = $height;
+    }
+    else {
+      throw new \InvalidArgumentException("Invalid dimensions ({$width}x{$height}) specified for a Rectangle object");
+    }
+  }
+
+  /**
+   * Rotates the rectangle.
+   *
+   * @param float $angle
+   *   Rotation angle.
+   *
+   * @return $this
+   */
+  public function rotate($angle) {
+    // PHP 5.5 GD bug: https://bugs.php.net/bug.php?id=65148: To prevent buggy
+    // behavior on negative multiples of 30 degrees we convert any negative
+    // angle to a positive one between 0 and 360 degrees.
+    $angle -= floor($angle / 360) * 360;
+
+    // For some rotations that are multiple of 30 degrees, we need to correct
+    // an imprecision between GD that uses C floats internally, and PHP that
+    // uses C doubles. Also, for rotations that are not multiple of 90 degrees,
+    // we need to introduce a correction factor of 0.5 to match the GD
+    // algorithm used in PHP 5.5 (and above) to calculate the width and height
+    // of the rotated image.
+    if ((int) $angle == $angle && $angle % 90 == 0) {
+      $imprecision = 0;
+      $correction = 0;
+    }
+    else {
+      $imprecision = -0.00001;
+      $correction = 0.5;
+    }
+
+    // Do the trigonometry, applying imprecision fixes where needed.
+    $rad = deg2rad($angle);
+    $cos = cos($rad);
+    $sin = sin($rad);
+    $a = $this->width * $cos;
+    $b = $this->height * $sin + $correction;
+    $c = $this->width * $sin;
+    $d = $this->height * $cos + $correction;
+    if ((int) $angle == $angle && in_array($angle, [60, 150, 300])) {
+      $a = $this->fixImprecision($a, $imprecision);
+      $b = $this->fixImprecision($b, $imprecision);
+      $c = $this->fixImprecision($c, $imprecision);
+      $d = $this->fixImprecision($d, $imprecision);
+    }
+
+    // This is how GD on PHP5.5 calculates the new dimensions.
+    $this->boundingWidth = abs((int) $a) + abs((int) $b);
+    $this->boundingHeight = abs((int) $c) + abs((int) $d);
+
+    return $this;
+  }
+
+  /**
+   * Performs an imprecision check on the input value and fixes it if needed.
+   *
+   * GD that uses C floats internally, whereas we at PHP level use C doubles.
+   * In some cases, we need to compensate imprecision.
+   *
+   * @param float $input
+   *   The input value.
+   * @param float $imprecision
+   *   The imprecision factor.
+   *
+   * @return float
+   *   A value, where imprecision is added to input if the delta part of the
+   *   input is lower than the absolute imprecision.
+   */
+  protected function fixImprecision($input, $imprecision) {
+    if ($this->delta($input) < abs($imprecision)) {
+      return $input + $imprecision;
+    }
+    return $input;
+  }
+
+  /**
+   * Returns the fractional part of a float number, unsigned.
+   *
+   * @param float $input
+   *   The input value.
+   *
+   * @return float
+   *   The fractional part of the input number, unsigned.
+   */
+  protected function fraction($input) {
+    return abs((int) $input - $input);
+  }
+
+  /**
+   * Returns the difference of a fraction from the closest between 0 and 1.
+   *
+   * @param float $input
+   *   The input value.
+   *
+   * @return float
+   *   the difference of a fraction from the closest between 0 and 1.
+   */
+  protected function delta($input) {
+    $fraction = $this->fraction($input);
+    return $fraction > 0.5 ? (1 - $fraction) : $fraction;
+  }
+
+  /**
+   * Gets the bounding width of the rectangle.
+   *
+   * @return int
+   *   The bounding width of the rotated rectangle.
+   */
+  public function getBoundingWidth() {
+    return $this->boundingWidth;
+  }
+
+  /**
+   * Gets the bounding height of the rectangle.
+   *
+   * @return int
+   *   The bounding height of the rotated rectangle.
+   */
+  public function getBoundingHeight() {
+    return $this->boundingHeight;
+  }
+
+}
diff --git a/core/lib/Drupal/Component/Utility/composer.json b/core/lib/Drupal/Component/Utility/composer.json
index a029d1e..93ae73a 100644
--- a/core/lib/Drupal/Component/Utility/composer.json
+++ b/core/lib/Drupal/Component/Utility/composer.json
@@ -1,15 +1,16 @@
 {
-  "name": "drupal/core-utility",
-  "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0+",
-  "require": {
-    "php": ">=5.5.9"
-  },
-  "autoload": {
-    "psr-0": {
-      "Drupal\\Component\\Utility\\": ""
+    "name": "drupal/core-utility",
+    "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.",
+    "keywords": ["drupal"],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0+",
+    "require": {
+        "php": ">=5.5.9",
+        "paragonie/random_compat": "~1.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "Drupal\\Component\\Utility\\": ""
+        }
     }
-  }
 }
diff --git a/core/lib/Drupal/Core/Ajax/RemoveCommand.php b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
index 5131b20..c976e44 100644
--- a/core/lib/Drupal/Core/Ajax/RemoveCommand.php
+++ b/core/lib/Drupal/Core/Ajax/RemoveCommand.php
@@ -21,7 +21,7 @@
  *
  * @ingroup ajax
  */
-class RemoveCommand Implements CommandInterface {
+class RemoveCommand implements CommandInterface {
 
   /**
    * The CSS selector for the element(s) to be removed.
diff --git a/core/lib/Drupal/Core/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
index ecd7f25..24085ce 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiveTar.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -1,4 +1,5 @@
 <?php
+// @codingStandardsIgnoreFile
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
diff --git a/core/lib/Drupal/Core/Archiver/Zip.php b/core/lib/Drupal/Core/Archiver/Zip.php
index 15500f7..49efa10 100644
--- a/core/lib/Drupal/Core/Archiver/Zip.php
+++ b/core/lib/Drupal/Core/Archiver/Zip.php
@@ -59,7 +59,7 @@ public function remove($file_path) {
   /**
    * {@inheritdoc}
    */
-  public function extract($path, Array $files = array()) {
+  public function extract($path, array $files = array()) {
     if ($files) {
       $this->zip->extractTo($path, $files);
     }
diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
index a5a0ad3..a697a0c 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryCollector.php
@@ -21,20 +21,6 @@
 class LibraryDiscoveryCollector extends CacheCollector {
 
   /**
-   * The cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cache;
-
-  /**
-   * The lock backend.
-   *
-   * @var \Drupal\Core\Lock\LockBackendInterface
-   */
-  protected $lock;
-
-  /**
    * The library discovery parser.
    *
    * @var \Drupal\Core\Asset\LibraryDiscoveryParser
diff --git a/core/lib/Drupal/Core/Batch/BatchStorage.php b/core/lib/Drupal/Core/Batch/BatchStorage.php
index 5742fd2..7c798a6 100644
--- a/core/lib/Drupal/Core/Batch/BatchStorage.php
+++ b/core/lib/Drupal/Core/Batch/BatchStorage.php
@@ -8,12 +8,18 @@
 namespace Drupal\Core\Batch;
 
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Drupal\Core\Access\CsrfTokenGenerator;
 
 class BatchStorage implements BatchStorageInterface {
 
   /**
+   * The table name.
+   */
+  const TABLE_NAME = 'batch';
+
+  /**
    * The database connection.
    *
    * @var \Drupal\Core\Database\Connection
@@ -56,10 +62,16 @@ public function __construct(Connection $connection, SessionInterface $session, C
   public function load($id) {
     // Ensure that a session is started before using the CSRF token generator.
     $this->session->start();
-    $batch = $this->connection->query("SELECT batch FROM {batch} WHERE bid = :bid AND token = :token", array(
-      ':bid' => $id,
-      ':token' => $this->csrfToken->get($id),
-    ))->fetchField();
+    try {
+      $batch = $this->connection->query("SELECT batch FROM {batch} WHERE bid = :bid AND token = :token", array(
+        ':bid' => $id,
+        ':token' => $this->csrfToken->get($id),
+      ))->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      $batch = FALSE;
+    }
     if ($batch) {
       return unserialize($batch);
     }
@@ -70,29 +82,44 @@ public function load($id) {
    * {@inheritdoc}
    */
   public function delete($id) {
-    $this->connection->delete('batch')
-      ->condition('bid', $id)
-      ->execute();
+    try {
+      $this->connection->delete('batch')
+        ->condition('bid', $id)
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function update(array $batch) {
-    $this->connection->update('batch')
-      ->fields(array('batch' => serialize($batch)))
-      ->condition('bid', $batch['id'])
-      ->execute();
+    try {
+      $this->connection->update('batch')
+        ->fields(array('batch' => serialize($batch)))
+        ->condition('bid', $batch['id'])
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function cleanup() {
-    // Cleanup the batch table and the queue for failed batches.
-    $this->connection->delete('batch')
-      ->condition('timestamp', REQUEST_TIME - 864000, '<')
-      ->execute();
+    try {
+      // Cleanup the batch table and the queue for failed batches.
+      $this->connection->delete('batch')
+        ->condition('timestamp', REQUEST_TIME - 864000, '<')
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
@@ -101,6 +128,32 @@ public function cleanup() {
   public function create(array $batch) {
     // Ensure that a session is started before using the CSRF token generator.
     $this->session->start();
+    $try_again = FALSE;
+    try {
+      // The batch table might not yet exist.
+      $this->doCreate($batch);
+    }
+    catch (\Exception $e) {
+      // If there was an exception, try to create the table.
+      if (!$try_again = $this->ensureTableExists()) {
+        // If the exception happened for other reason than the missing table,
+        // propagate the exception.
+        throw $e;
+      }
+    }
+    // Now that the table has been created, try again if necessary.
+    if ($try_again) {
+      $this->doCreate($batch);
+    }
+  }
+
+  /**
+   * Saves a batch.
+   *
+   * @param array $batch
+   *   The array representing the batch to create.
+   */
+  protected function doCreate(array $batch) {
     $this->connection->insert('batch')
       ->fields(array(
         'bid' => $batch['id'],
@@ -111,4 +164,83 @@ public function create(array $batch) {
       ->execute();
   }
 
+  /**
+   * Check if the table exists and create it if not.
+   */
+  protected function ensureTableExists() {
+    try {
+      $database_schema = $this->connection->schema();
+      if (!$database_schema->tableExists(static::TABLE_NAME)) {
+        $schema_definition = $this->schemaDefinition();
+        $database_schema->createTable(static::TABLE_NAME, $schema_definition);
+        return TRUE;
+      }
+    }
+    // If another process has already created the batch table, attempting to
+    // recreate it will throw an exception. In this case just catch the
+    // exception and do nothing.
+    catch (SchemaObjectExistsException $e) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Act on an exception when batch might be stale.
+   *
+   * If the table does not yet exist, that's fine, but if the table exists and
+   * yet the query failed, then the batch is stale and the exception needs to
+   * propagate.
+   *
+   * @param $e
+   *   The exception.
+   *
+   * @throws \Exception
+   */
+  protected function catchException(\Exception $e) {
+    if ($this->connection->schema()->tableExists(static::TABLE_NAME)) {
+      throw $e;
+    }
+  }
+
+  /**
+   * Defines the schema for the batch table.
+   */
+  public function schemaDefinition() {
+    return [
+      'description' => 'Stores details about batches (processes that run in multiple HTTP requests).',
+      'fields' => [
+        'bid' => [
+          'description' => 'Primary Key: Unique batch ID.',
+          // This is not a serial column, to allow both progressive and
+          // non-progressive batches. See batch_process().
+          'type' => 'int',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+        ],
+        'token' => [
+          'description' => "A string token generated against the current user's session id and the batch id, used to ensure that only the user who submitted the batch can effectively access it.",
+          'type' => 'varchar_ascii',
+          'length' => 64,
+          'not null' => TRUE,
+        ],
+        'timestamp' => [
+          'description' => 'A Unix timestamp indicating when this batch was submitted for processing. Stale batches are purged at cron time.',
+          'type' => 'int',
+          'not null' => TRUE,
+        ],
+        'batch' => [
+          'description' => 'A serialized array containing the processing data for the batch.',
+          'type' => 'blob',
+          'not null' => FALSE,
+          'size' => 'big',
+        ],
+      ],
+      'primary key' => ['bid'],
+      'indexes' => [
+        'token' => ['token'],
+      ],
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Block/Annotation/Block.php b/core/lib/Drupal/Core/Block/Annotation/Block.php
index e29f80d..81fc536 100644
--- a/core/lib/Drupal/Core/Block/Annotation/Block.php
+++ b/core/lib/Drupal/Core/Block/Annotation/Block.php
@@ -43,11 +43,4 @@ class Block extends Plugin {
    */
   public $category = '';
 
-  /**
-   * Class used to retrieve derivative definitions of the block.
-   *
-   * @var string
-   */
-  public $derivative = '';
-
 }
diff --git a/core/lib/Drupal/Core/Cache/Context/SessionExistsCacheContext.php b/core/lib/Drupal/Core/Cache/Context/SessionExistsCacheContext.php
new file mode 100644
index 0000000..ecb601f
--- /dev/null
+++ b/core/lib/Drupal/Core/Cache/Context/SessionExistsCacheContext.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Cache\Context\SessionExistsCacheContext.
+ */
+
+namespace Drupal\Core\Cache\Context;
+
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Session\SessionConfigurationInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Defines the SessionExistsCacheContext service, for "session or not" caching.
+ *
+ * Cache context ID: 'session.exists'.
+ */
+class SessionExistsCacheContext implements CacheContextInterface {
+
+  /**
+   * The session configuration.
+   *
+   * @var \Drupal\Core\Session\SessionConfigurationInterface
+   */
+  protected $sessionConfiguration;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * Constructs a new SessionExistsCacheContext class.
+   *
+   * @param \Drupal\Core\Session\SessionConfigurationInterface $session_configuration
+   *   The session configuration.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   */
+  public function __construct(SessionConfigurationInterface $session_configuration, RequestStack $request_stack) {
+    $this->sessionConfiguration = $session_configuration;
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getLabel() {
+    return t('Session exists');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getContext() {
+    return $this->sessionConfiguration->hasSession($this->requestStack->getCurrentRequest()) ? '1' : '0';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheableMetadata() {
+    return new CacheableMetadata();
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php
index da96b50..2f1310f 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -36,6 +36,7 @@ class Composer {
     'jcalderonzumba/mink-phantomjs-driver' => ['tests'],
     'masterminds/html5' => ['test'],
     'mikey179/vfsStream' => ['src/test'],
+    'paragonie/random_compat' => ['tests'],
     'phpdocumentor/reflection-docblock' => ['tests'],
     'phpunit/php-code-coverage' => ['tests'],
     'phpunit/php-timer' => ['tests'],
@@ -65,7 +66,7 @@ class Composer {
     'symfony/routing' => ['Tests'],
     'symfony/serializer' => ['Tests'],
     'symfony/translation' => ['Tests'],
-    'symfony/validator' => ['Tests'],
+    'symfony/validator' => ['Tests', 'Resources'],
     'symfony/yaml' => ['Tests'],
     'symfony-cmf/routing' => ['Test', 'Tests'],
     'twig/twig' => ['doc', 'ext', 'test'],
@@ -148,6 +149,7 @@ public static function ensureHtaccess(Event $event) {
    */
   public static function vendorTestCodeCleanup(PackageEvent $event) {
     $vendor_dir = $event->getComposer()->getConfig()->get('vendor-dir');
+    $io = $event->getIO();
     $op = $event->getOperation();
     if ($op->getJobType() == 'update') {
       $package = $op->getTargetPackage();
@@ -156,18 +158,40 @@ public static function vendorTestCodeCleanup(PackageEvent $event) {
       $package = $op->getPackage();
     }
     $package_key = static::findPackageKey($package->getName());
+    $message = sprintf("    Processing <comment>%s</comment>", $package->getPrettyName());
+    if ($io->isVeryVerbose()) {
+      $io->write($message);
+    }
     if ($package_key) {
       foreach (static::$packageToCleanup[$package_key] as $path) {
         $dir_to_remove = $vendor_dir . '/' . $package_key . '/' . $path;
+        $print_message = $io->isVeryVerbose();
         if (is_dir($dir_to_remove)) {
-          if (!static::deleteRecursive($dir_to_remove)) {
-            throw new \RuntimeException(sprintf("Failure removing directory '%s' in package '%s'.", $path, $package->getPrettyName()));
+          if (static::deleteRecursive($dir_to_remove)) {
+            $message = sprintf("      <info>Removing directory '%s'</info>", $path);
+          }
+          else {
+            // Always display a message if this fails as it means something has
+            // gone wrong. Therefore the message has to include the package name
+            // as the first informational message might not exist.
+            $print_message = TRUE;
+            $message = sprintf("      <error>Failure removing directory '%s'</error> in package <comment>%s</comment>.", $path, $package->getPrettyName());
           }
         }
         else {
-          throw new \RuntimeException(sprintf("The directory '%s' in package '%s' does not exist.", $path, $package->getPrettyName()));
+          // If the package has changed or the --prefer-dist version does not
+          // include the directory this is not an error.
+          $message = sprintf("      Directory '%s' does not exist", $path);
+        }
+        if ($print_message) {
+          $io->write($message);
         }
       }
+
+      if ($io->isVeryVerbose()) {
+        // Add a new line to separate this output from the next package.
+        $io->write("");
+      }
     }
   }
 
diff --git a/core/lib/Drupal/Core/Config/ConfigBase.php b/core/lib/Drupal/Core/Config/ConfigBase.php
index 8263e9a..77460f9 100644
--- a/core/lib/Drupal/Core/Config/ConfigBase.php
+++ b/core/lib/Drupal/Core/Config/ConfigBase.php
@@ -55,7 +55,7 @@
    * incompatible with this limitation are created, we enforce a maximum name
    * length of 250 characters (leaving 5 characters for the file extension).
    *
-   * @see http://en.wikipedia.org/wiki/Comparison_of_file_systems
+   * @see http://wikipedia.org/wiki/Comparison_of_file_systems
    *
    * Configuration objects not stored on the filesystem should still be
    * restricted in name length so name can be used as a cache key.
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index 837abc0..20ae266 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -544,10 +544,10 @@ public function initialize() {
   /**
    * Processes extensions as a batch operation.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function processExtensions(array &$context) {
+  protected function processExtensions(&$context) {
     $operation = $this->getNextExtensionOperation();
     if (!empty($operation)) {
       $this->processExtension($operation['type'], $operation['op'], $operation['name']);
@@ -564,10 +564,10 @@ protected function processExtensions(array &$context) {
   /**
    * Processes configuration as a batch operation.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function processConfigurations(array &$context) {
+  protected function processConfigurations(&$context) {
     // The first time this is called we need to calculate the total to process.
     // This involves recalculating the changelist which will ensure that if
     // extensions have been processed any configuration affected will be taken
@@ -607,10 +607,10 @@ protected function processConfigurations(array &$context) {
   /**
    * Handles processing of missing content.
    *
-   * @param array $context
+   * @param array|\ArrayAccess $context.
    *   Standard batch context.
    */
-  protected function processMissingContent(array &$context) {
+  protected function processMissingContent(&$context) {
     $sandbox = &$context['sandbox']['config'];
     if (!isset($sandbox['missing_content'])) {
       $missing_content = $this->configManager->findMissingContentDependencies();
@@ -639,10 +639,10 @@ protected function processMissingContent(array &$context) {
   /**
    * Finishes the batch.
    *
-   * @param array $context.
+   * @param array|\ArrayAccess $context.
    *   The batch context.
    */
-  protected function finish(array &$context) {
+  protected function finish(&$context) {
     $this->eventDispatcher->dispatch(ConfigEvents::IMPORT, new ConfigImporterEvent($this));
     // The import is now complete.
     $this->lock->release(static::LOCK_NAME);
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
index 1f2660b..a642e03 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyDeleteFormTrait.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Core\Config\Entity\ConfigDependencyDeleteFormTrait.
  */
 
-
 namespace Drupal\Core\Config\Entity;
 
 use Drupal\Core\Config\ConfigManagerInterface;
diff --git a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
index e01d164..8760e36 100644
--- a/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
+++ b/core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
@@ -24,7 +24,7 @@
  * is invalid.
  *
  * @see \Drupal\simpletest\WebTestBase::setUp()
- * @see \Drupal\simpletest\KernelTestBase::containerBuild()
+ * @see \Drupal\KernelTests\KernelTestBase::register()
  */
 class ConfigSchemaChecker implements EventSubscriberInterface {
   use SchemaCheckTrait;
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManager.php b/core/lib/Drupal/Core/Config/TypedConfigManager.php
index b2c94ed..1181953 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManager.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManager.php
@@ -103,7 +103,7 @@ public function buildDataDefinition(array $definition, $value, $name = NULL, $pa
       unset($definition['type']);
     }
     // Add default values from type definition.
-    $definition += $this->_getDefinitionWithReplacements($type, $replace);
+    $definition += $this->getDefinitionWithReplacements($type, $replace);
 
     $data_definition = $this->createDataDefinition($definition['type']);
 
@@ -127,7 +127,7 @@ public function buildDataDefinition(array $definition, $value, $name = NULL, $pa
    * @return string
    *   The typed config type for the given plugin ID.
    */
-  protected function _determineType($base_plugin_id, array $definitions) {
+  protected function determineType($base_plugin_id, array $definitions) {
     if (isset($definitions[$base_plugin_id])) {
       $type = $base_plugin_id;
     }
@@ -157,9 +157,9 @@ protected function _determineType($base_plugin_id, array $definitions) {
    * @return array
    *   A schema definition array.
    */
-  protected function _getDefinitionWithReplacements($base_plugin_id, array $replacements, $exception_on_invalid = TRUE) {
+  protected function getDefinitionWithReplacements($base_plugin_id, array $replacements, $exception_on_invalid = TRUE) {
     $definitions = $this->getDefinitions();
-    $type = $this->_determineType($base_plugin_id, $definitions);
+    $type = $this->determineType($base_plugin_id, $definitions);
     $definition = $definitions[$type];
     // Check whether this type is an extension of another one and compile it.
     if (isset($definition['type'])) {
@@ -170,12 +170,12 @@ protected function _getDefinitionWithReplacements($base_plugin_id, array $replac
 
       // Replace dynamic portions of the definition type.
       if (!empty($replacements) && strpos($definition['type'], ']')) {
-        $sub_type = $this->_determineType($this->replaceName($definition['type'], $replacements), $definitions);
+        $sub_type = $this->determineType($this->replaceName($definition['type'], $replacements), $definitions);
         // Merge the newly determined subtype definition with the original
         // definition.
         $definition = NestedArray::mergeDeepArray([$definitions[$sub_type], $definition], TRUE);
+        $type = "$type||$sub_type";
       }
-
       // Unset type so we try the merge only once per type.
       unset($definition['type']);
       $this->definitions[$type] = $definition;
@@ -192,7 +192,7 @@ protected function _getDefinitionWithReplacements($base_plugin_id, array $replac
    * {@inheritdoc}
    */
   public function getDefinition($base_plugin_id, $exception_on_invalid = TRUE) {
-    return $this->_getDefinitionWithReplacements($base_plugin_id, [], $exception_on_invalid);
+    return $this->getDefinitionWithReplacements($base_plugin_id, [], $exception_on_invalid);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
index dcd8584..032c6b0 100644
--- a/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
+++ b/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
@@ -17,7 +17,7 @@
  * @see hook_config_schema_info_alter()
  * @see https://www.drupal.org/node/1905070
  */
-Interface TypedConfigManagerInterface extends TypedDataManagerInterface {
+interface TypedConfigManagerInterface extends TypedDataManagerInterface {
 
   /**
    * Gets typed configuration data.
diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index 544e247..db24038 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -113,6 +113,13 @@
   protected $formBuilder;
 
   /**
+   * The logger factory.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $loggerFactory;
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
@@ -283,6 +290,23 @@ protected function languageManager() {
   }
 
   /**
+   * Returns a channel logger object.
+   *
+   * @param string $channel
+   *   The name of the channel. Can be any string, but the general practice is
+   *   to use the name of the subsystem calling this.
+   *
+   * @return \Psr\Log\LoggerInterface
+   *   The logger for this channel.
+   */
+  protected function getLogger($channel) {
+    if (!$this->loggerFactory) {
+      $this->loggerFactory = $this->container()->get('logger.factory');
+    }
+    return $this->loggerFactory->get($channel);
+  }
+
+  /**
    * Returns the service container.
    *
    * This method is marked private to prevent sub-classes from retrieving
diff --git a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
index fa72e11..cbc49d5 100644
--- a/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
+++ b/core/lib/Drupal/Core/Controller/TitleResolverInterface.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Core\Controller\TitleResolverInterface.
  */
+
 namespace Drupal\Core\Controller;
 
 use Symfony\Component\Routing\Route;
diff --git a/core/lib/Drupal/Core/Cron.php b/core/lib/Drupal/Core/Cron.php
index 1c17c94..44ca516 100644
--- a/core/lib/Drupal/Core/Cron.php
+++ b/core/lib/Drupal/Core/Cron.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Queue\QueueWorkerManagerInterface;
+use Drupal\Core\Queue\RequeueException;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\Core\Queue\QueueFactory;
@@ -168,6 +169,10 @@ protected function processQueues() {
             $queue_worker->processItem($item->data);
             $queue->deleteItem($item);
           }
+          catch (RequeueException $e) {
+            // The worker requested the task be immediately requeued.
+            $queue->releaseItem($item);
+          }
           catch (SuspendQueueException $e) {
             // If the worker indicates there is a problem with the whole queue,
             // release the item and skip to the next queue.
diff --git a/core/lib/Drupal/Core/Database/Log.php b/core/lib/Drupal/Core/Database/Log.php
index e45a3be..ffcf03e 100644
--- a/core/lib/Drupal/Core/Database/Log.php
+++ b/core/lib/Drupal/Core/Database/Log.php
@@ -136,7 +136,9 @@ public function log(StatementInterface $statement, $args, $time) {
    * climbing logic very simple, and handles the variable stack depth caused by
    * the query builders.
    *
-   * @link http://www.php.net/debug_backtrace
+   * See the @link http://php.net/debug_backtrace debug_backtrace() @endlink
+   * function.
+   *
    * @return
    *   This method returns a stack trace entry similar to that generated by
    *   debug_backtrace(). However, it flattens the trace entry and the trace
diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php
index 045413a..4f1d4dd 100644
--- a/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -14,7 +14,7 @@
  *
  * @ingroup database
  */
-class Insert extends Query {
+class Insert extends Query implements \Countable {
 
   use InsertTrait;
 
diff --git a/core/lib/Drupal/Core/Database/Query/InsertTrait.php b/core/lib/Drupal/Core/Database/Query/InsertTrait.php
index 551e870..a8bab75 100644
--- a/core/lib/Drupal/Core/Database/Query/InsertTrait.php
+++ b/core/lib/Drupal/Core/Database/Query/InsertTrait.php
@@ -181,4 +181,11 @@ protected function getInsertPlaceholderFragment(array $nested_insert_values, arr
     return $values;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function count() {
+    return count($this->insertValues);
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Database/Query/Upsert.php b/core/lib/Drupal/Core/Database/Query/Upsert.php
index e9b5d0e..ca58c11 100644
--- a/core/lib/Drupal/Core/Database/Query/Upsert.php
+++ b/core/lib/Drupal/Core/Database/Query/Upsert.php
@@ -18,7 +18,7 @@
  * Insert except the rows will be set to the desired values even if the key
  * existed before.
  */
-abstract class Upsert extends Query {
+abstract class Upsert extends Query implements \Countable {
 
   use InsertTrait;
 
diff --git a/core/lib/Drupal/Core/Datetime/DateFormatter.php b/core/lib/Drupal/Core/Datetime/DateFormatter.php
index f6227ee8..a027e4d 100644
--- a/core/lib/Drupal/Core/Datetime/DateFormatter.php
+++ b/core/lib/Drupal/Core/Datetime/DateFormatter.php
@@ -206,10 +206,15 @@ public function formatDiff($from, $to, $options = array()) {
       'granularity' => 2,
       'langcode' => NULL,
       'strict' => TRUE,
+      'return_as_object' => FALSE,
     );
 
     if ($options['strict'] && $from > $to) {
-      return $this->t('0 seconds');
+      $string = $this->t('0 seconds');
+      if ($options['return_as_object']) {
+        return new FormattedDateDiff($string, 0);
+      }
+      return $string;
     }
 
     $date_time_from = new \DateTime();
@@ -226,6 +231,7 @@ public function formatDiff($from, $to, $options = array()) {
     // We loop over the keys provided by \DateInterval explicitly. Since we
     // don't take the "invert" property into account, the resulting output value
     // will always be positive.
+    $max_age = 1e99;
     foreach (array('y', 'm', 'd', 'h', 'i', 's') as $value) {
       if ($interval->$value > 0) {
         // Switch over the keys to call formatPlural() explicitly with literal
@@ -233,10 +239,12 @@ public function formatDiff($from, $to, $options = array()) {
         switch ($value) {
           case 'y':
             $interval_output = $this->formatPlural($interval->y, '1 year', '@count years', array(), array('langcode' => $options['langcode']));
+            $max_age = min($max_age, 365*86400);
             break;
 
           case 'm':
             $interval_output = $this->formatPlural($interval->m, '1 month', '@count months', array(), array('langcode' => $options['langcode']));
+            $max_age = min($max_age, 30*86400);
             break;
 
           case 'd':
@@ -249,10 +257,12 @@ public function formatDiff($from, $to, $options = array()) {
               $interval_output .= $this->formatPlural($weeks, '1 week', '@count weeks', array(), array('langcode' => $options['langcode']));
               $days -= $weeks * 7;
               $granularity--;
+              $max_age = min($max_age, 7*86400);
             }
 
             if ((!$output || $weeks > 0) && $granularity > 0 && $days > 0) {
               $interval_output .= ($interval_output ? ' ' : '') . $this->formatPlural($days, '1 day', '@count days', array(), array('langcode' => $options['langcode']));
+              $max_age = min($max_age, 86400);
             }
             else {
               // If we did not output days, set the granularity to 0 so that we
@@ -263,14 +273,17 @@ public function formatDiff($from, $to, $options = array()) {
 
           case 'h':
             $interval_output = $this->formatPlural($interval->h, '1 hour', '@count hours', array(), array('langcode' => $options['langcode']));
+            $max_age = min($max_age, 3600);
             break;
 
           case 'i':
             $interval_output = $this->formatPlural($interval->i, '1 minute', '@count minutes', array(), array('langcode' => $options['langcode']));
+            $max_age = min($max_age, 60);
             break;
 
           case 's':
             $interval_output = $this->formatPlural($interval->s, '1 second', '@count seconds', array(), array('langcode' => $options['langcode']));
+            $max_age = min($max_age, 1);
             break;
 
         }
@@ -290,6 +303,11 @@ public function formatDiff($from, $to, $options = array()) {
 
     if (empty($output)) {
       $output = $this->t('0 seconds');
+      $max_age = 0;
+    }
+
+    if ($options['return_as_object']) {
+      return new FormattedDateDiff($output, $max_age);
     }
 
     return $output;
diff --git a/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php b/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
index 1863216..e936855 100644
--- a/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
+++ b/core/lib/Drupal/Core/Datetime/DateFormatterInterface.php
@@ -107,8 +107,10 @@ public function getSampleDateFormats($langcode = NULL, $timestamp = NULL, $timez
    *     before the current request time, the result string will be "0 seconds".
    *     If FALSE and $timestamp is before the current request time, the result
    *     string will be the formatted time difference.
+   *   - return_as_object: A Boolean value whether to return a FormattedDateDiff
+   *     object.
    *
-   * @return string
+   * @return string|\Drupal\Core\Datetime\FormattedDateDiff
    *   A translated string representation of the difference between the given
    *   timestamp and the current request time. This interval is always positive.
    *
@@ -135,8 +137,10 @@ public function formatTimeDiffUntil($timestamp, $options = array());
    *     after the current request time, the result string will be "0 seconds".
    *     If FALSE and $timestamp is after the current request time, the result
    *     string will be the formatted time difference.
+   *   - return_as_object: A Boolean value whether to return a FormattedDateDiff
+   *     object.
    *
-   * @return string
+   * @return string|\Drupal\Core\Datetime\FormattedDateDiff
    *   A translated string representation of the difference between the given
    *   timestamp and the current request time. This interval is always positive.
    *
@@ -164,8 +168,10 @@ public function formatTimeDiffSince($timestamp, $options = array());
    *     can be after the $to timestamp. If TRUE (default) and $from is after
    *     $to, the result string will be "0 seconds". If FALSE and $from is
    *     after $to, the result string will be the formatted time difference.
+   *   - return_as_object: A Boolean value whether to return a FormattedDateDiff
+   *     object.
    *
-   * @return string
+   * @return string|\Drupal\Core\Datetime\FormattedDateDiff
    *   A translated string representation of the interval. This interval is
    *   always positive.
    *
diff --git a/core/lib/Drupal/Core/Datetime/DateHelper.php b/core/lib/Drupal/Core/Datetime/DateHelper.php
index 4cfc746..9c5b5f4 100644
--- a/core/lib/Drupal/Core/Datetime/DateHelper.php
+++ b/core/lib/Drupal/Core/Datetime/DateHelper.php
@@ -2,6 +2,12 @@
 /**
  * @file
  * Contains \Drupal\Core\Datetime\DateHelper.
+ */
+
+namespace Drupal\Core\Datetime;
+
+/**
+ * Defines Gregorian Calendar date values.
  *
  * Lots of helpful functions for use in massaging dates, specific to the
  * Gregorian calendar system. The values include both translated and
@@ -14,11 +20,6 @@
  * translation should be hard-coded and wrapped in t() so the translation system
  * will be able to process them.
  */
-namespace Drupal\Core\Datetime;
-
-/**
- * Defines Gregorian Calendar date values.
- */
 class DateHelper {
 
   /**
diff --git a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
index a5f196d..340edf6 100644
--- a/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
+++ b/core/lib/Drupal/Core/Datetime/DrupalDateTime.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Core\Datetime\DrupalDateTime.
  */
+
 namespace Drupal\Core\Datetime;
 
 use Drupal\Component\Datetime\DateTimePlus;
diff --git a/core/lib/Drupal/Core/Datetime/FormattedDateDiff.php b/core/lib/Drupal/Core/Datetime/FormattedDateDiff.php
new file mode 100644
index 0000000..0998a95
--- /dev/null
+++ b/core/lib/Drupal/Core/Datetime/FormattedDateDiff.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Datetime\FormattedDateDiff.
+ */
+
+namespace Drupal\Core\Datetime;
+
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Cache\UnchangingCacheableDependencyTrait;
+use Drupal\Core\Render\RenderableInterface;
+
+/**
+ * Contains a formatted time difference.
+ */
+class FormattedDateDiff implements RenderableInterface, CacheableDependencyInterface {
+
+  use UnchangingCacheableDependencyTrait;
+
+  /**
+   * The actual formatted time difference.
+   *
+   * @var string
+   */
+  protected $string;
+
+  /**
+   * The maximum time in seconds that this string may be cached.
+   *
+   * Let's say the time difference is 1 day 1 hour. In this case, we can cache
+   * it until now + 1 hour, so maxAge is 3600 seconds.
+   *
+   * @var int
+   */
+  protected $maxAge;
+
+  /**
+   * Creates a new FormattedDateDiff instance.
+   *
+   * @param string $string
+   *   The formatted time difference.
+   * @param int $max_age
+   *   The maximum time in seconds that this string may be cached.
+   */
+  public function __construct($string, $max_age) {
+    $this->string = $string;
+    $this->maxAge = $max_age;
+  }
+
+  /**
+   * @return string
+   */
+  public function getString() {
+    return $this->string;
+  }
+
+  /**
+   * @return int
+   */
+  public function getMaxAge() {
+    return $this->maxAge;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function toRenderable() {
+    return [
+      '#markup' => $this->string,
+      '#cache' => [
+        'max-age' => $this->maxAge,
+      ],
+    ];
+  }
+
+}
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
index 748bf44..750fedb 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ModifyServiceDefinitionsPass.php
@@ -24,6 +24,7 @@ public function process(ContainerBuilder $container) {
     if (!$container->has('kernel')) {
       return;
     }
+
     $kernel = $container->get('kernel');
     if (!($kernel instanceof DrupalKernelInterface)) {
       return;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
index a9ec3b6..e8e88d8 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterAccessChecksPass.php
@@ -16,14 +16,13 @@
 class RegisterAccessChecksPass implements CompilerPassInterface {
 
   /**
-   * Implements CompilerPassInterface::process().
-   *
-   * Adds services tagged 'access_check' to the access_manager service.
+   * {@inheritdoc}
    */
   public function process(ContainerBuilder $container) {
     if (!$container->hasDefinition('access_manager')) {
       return;
     }
+    // Add services tagged 'access_check' to the access_manager service.
     $access_manager = $container->getDefinition('access_manager.check_provider');
     foreach ($container->findTaggedServiceIds('access_check') as $id => $attributes) {
       $applies = array();
@@ -43,4 +42,5 @@ public function process(ContainerBuilder $container) {
       $access_manager->addMethodCall('addCheckService', array($id, $method, $applies, $needs_incoming_request));
     }
   }
+
 }
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
index 1adfb9e..64071c2 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterEventSubscribersPass.php
@@ -14,6 +14,10 @@
  * Registers all event subscribers to the event dispatcher.
  */
 class RegisterEventSubscribersPass implements CompilerPassInterface {
+
+  /**
+   * {@inheritdoc}
+   */
   public function process(ContainerBuilder $container) {
     if (!$container->hasDefinition('event_dispatcher')) {
       return;
@@ -24,7 +28,8 @@ public function process(ContainerBuilder $container) {
     $event_subscriber_info = [];
     foreach ($container->findTaggedServiceIds('event_subscriber') as $id => $attributes) {
 
-      // We must assume that the class value has been correctly filled, even if the service is created by a factory
+      // We must assume that the class value has been correctly filled, even if
+      // the service is created by a factory.
       $class = $container->getDefinition($id)->getClass();
 
       $refClass = new \ReflectionClass($class);
@@ -58,4 +63,5 @@ public function process(ContainerBuilder $container) {
 
     $definition->addArgument($event_subscriber_info);
   }
+
 }
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteEnhancers.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteEnhancers.php
index 5f6c280..77be654 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteEnhancers.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteEnhancers.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteEnhancers.
  */
 
-
 namespace Drupal\Core\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteFilters.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteFilters.php
index ad41e18..7f37eb4 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteFilters.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterLazyRouteFilters.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Core\DependencyInjection\Compiler\RegisterLazyRouteFilters.
  */
 
-
 namespace Drupal\Core\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
index ca04b02..2be98e1 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterServicesForDestructionPass.php
@@ -27,10 +27,10 @@ public function process(ContainerBuilder $container) {
     }
 
     $definition = $container->getDefinition('kernel_destruct_subscriber');
-
     $services = $container->findTaggedServiceIds('needs_destruction');
     foreach ($services as $id => $attributes) {
       $definition->addMethodCall('registerService', array($id));
     }
   }
+
 }
diff --git a/core/lib/Drupal/Core/DependencyInjection/Container.php b/core/lib/Drupal/Core/DependencyInjection/Container.php
index c86aace..c5ea726 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Container.php
@@ -34,5 +34,4 @@ public function __sleep() {
     assert(FALSE, 'The container was serialized.');
     return array_keys(get_object_vars($this));
   }
-
 }
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index 1edaec3..bf2fdc7 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -9,8 +9,13 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
 
 /**
  * Drupal's dependency injection container builder.
@@ -22,6 +27,11 @@
 class ContainerBuilder extends SymfonyContainerBuilder {
 
   /**
+   * @var \Doctrine\Instantiator\InstantiatorInterface|null
+   */
+  private $proxyInstantiator;
+
+  /**
    * {@inheritdoc}
    */
   public function __construct(ParameterBagInterface $parameterBag = NULL) {
@@ -30,6 +40,161 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
   }
 
   /**
+   * Creates a service for a service definition.
+   *
+   * Overrides the parent implementation, but just changes one line about
+   * deprecations, see below.
+   *
+   * @param \Symfony\Component\DependencyInjection\Definition $definition
+   * @param string $id
+   * @param bool|true $tryProxy
+   *
+   * @return mixed|object
+   */
+  public function createService(Definition $definition, $id, $tryProxy = true)
+  {
+    if ($definition->isSynthetic()) {
+      throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
+    }
+
+    if ($definition->isDeprecated()) {
+      // Suppress deprecation warnings when a service is marked as
+      // 'deprecated: %service_id%-no-warning'
+      if ($definition->getDeprecationMessage($id) != ($id . '-no-warning')) {
+        @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED);
+      }
+    }
+
+    if ($tryProxy && $definition->isLazy()) {
+      $container = $this;
+
+      $proxy = $this
+        ->getProxyInstantiator()
+        ->instantiateProxy(
+          $container,
+          $definition,
+          $id, function () use ($definition, $id, $container) {
+          return $container->createService($definition, $id, false);
+        }
+        );
+      $this->shareService($definition, $proxy, $id);
+
+      return $proxy;
+    }
+
+    $parameterBag = $this->getParameterBag();
+
+    if (null !== $definition->getFile()) {
+      require_once $parameterBag->resolveValue($definition->getFile());
+    }
+
+    $arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments())));
+
+    if (null !== $factory = $definition->getFactory()) {
+      if (is_array($factory)) {
+        $factory = array($this->resolveServices($parameterBag->resolveValue($factory[0])), $factory[1]);
+      } elseif (!is_string($factory)) {
+        throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
+      }
+
+      $service = call_user_func_array($factory, $arguments);
+
+      if (!$definition->isDeprecated() && is_array($factory) && is_string($factory[0])) {
+        $r = new \ReflectionClass($factory[0]);
+
+        if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+          @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED);
+        }
+      }
+    } elseif (null !== $definition->getFactoryMethod(false)) {
+      if (null !== $definition->getFactoryClass(false)) {
+        $factory = $parameterBag->resolveValue($definition->getFactoryClass(false));
+      } elseif (null !== $definition->getFactoryService(false)) {
+        $factory = $this->get($parameterBag->resolveValue($definition->getFactoryService(false)));
+      } else {
+        throw new RuntimeException(sprintf('Cannot create service "%s" from factory method without a factory service or factory class.', $id));
+      }
+
+      $service = call_user_func_array(array($factory, $definition->getFactoryMethod(false)), $arguments);
+    } else {
+      $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
+
+      $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
+
+      if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+        // Skip deprecation notices for deprecations which opt out.
+        @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
+      }
+    }
+
+    if ($tryProxy || !$definition->isLazy()) {
+      // share only if proxying failed, or if not a proxy
+      $this->shareService($definition, $service, $id);
+    }
+
+    foreach ($definition->getMethodCalls() as $call) {
+      $this->callMethod($service, $call);
+    }
+
+    $properties = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getProperties())));
+    foreach ($properties as $name => $value) {
+      $service->$name = $value;
+    }
+
+    if ($callable = $definition->getConfigurator()) {
+      if (is_array($callable)) {
+        $callable[0] = $parameterBag->resolveValue($callable[0]);
+
+        if ($callable[0] instanceof Reference) {
+          $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
+        } elseif ($callable[0] instanceof Definition) {
+          $callable[0] = $this->createService($callable[0], null);
+        }
+      }
+
+      if (!is_callable($callable)) {
+        throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
+      }
+
+      call_user_func($callable, $service);
+    }
+
+    return $service;
+  }
+
+  /**
+   * Retrieves the currently set proxy instantiator or instantiates one.
+   *
+   * @return InstantiatorInterface
+   */
+  private function getProxyInstantiator()
+  {
+    if (!$this->proxyInstantiator) {
+      $this->proxyInstantiator = new RealServiceInstantiator();
+    }
+
+    return $this->proxyInstantiator;
+  }
+
+  /**
+   * Direct copy of the parent function.
+   */
+  protected function shareService(Definition $definition, $service, $id)
+  {
+    if ($definition->isShared() && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope(false)) {
+      if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {
+        throw new InactiveScopeException($id, $scope);
+      }
+
+      $this->services[$lowerId = strtolower($id)] = $service;
+
+      if (self::SCOPE_CONTAINER !== $scope) {
+        $this->scopedServices[$scope][$lowerId] = $service;
+      }
+    }
+  }
+
+  /**
    * Overrides Symfony\Component\DependencyInjection\ContainerBuilder::set().
    *
    * Drupal's container builder can be used at runtime after compilation, so we
diff --git a/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php b/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
index cb6a27d..a7ab694 100644
--- a/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
+++ b/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
@@ -49,6 +49,10 @@ public function __sleep() {
    * {@inheritdoc}
    */
   public function __wakeup() {
+    // Tests in isolation potentially unserialize in the parent process.
+    if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP']) && !\Drupal::hasContainer()) {
+      return;
+    }
     $container = \Drupal::getContainer();
     foreach ($this->_serviceIds as $key => $service_id) {
       $this->$key = $container->get($service_id);
diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index 4c7fea9..1c2bf81 100644
--- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -159,8 +159,15 @@ private function parseDefinition($id, $service, $file)
             $definition->setClass($service['class']);
         }
 
+        if (isset($service['shared'])) {
+            $definition->setShared($service['shared']);
+        }
+
         if (isset($service['scope'])) {
-            $definition->setScope($service['scope']);
+            if ('request' !== $id) {
+                @trigger_error(sprintf('The "scope" key of service "%s" in file "%s" is deprecated since version 2.8 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
+            }
+            $definition->setScope($service['scope'], false);
         }
 
         if (isset($service['synthetic'])) {
@@ -183,6 +190,10 @@ private function parseDefinition($id, $service, $file)
             $definition->setAbstract($service['abstract']);
         }
 
+        if (array_key_exists('deprecated', $service)) {
+            $definition->setDeprecated(true, $service['deprecated']);
+        }
+
         if (isset($service['factory'])) {
             if (is_string($service['factory'])) {
                 if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
@@ -275,7 +286,30 @@ private function parseDefinition($id, $service, $file)
 
         if (isset($service['decorates'])) {
             $renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null;
-            $definition->setDecoratedService($service['decorates'], $renameId);
+            $priority = isset($service['decoration_priority']) ? $service['decoration_priority'] : 0;
+            $definition->setDecoratedService($service['decorates'], $renameId, $priority);
+        }
+
+        if (isset($service['autowire'])) {
+            $definition->setAutowired($service['autowire']);
+        }
+
+        if (isset($service['autowiring_types'])) {
+            if (is_string($service['autowiring_types'])) {
+                $definition->addAutowiringType($service['autowiring_types']);
+            } else {
+                if (!is_array($service['autowiring_types'])) {
+                    throw new InvalidArgumentException(sprintf('Parameter "autowiring_types" must be a string or an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
+                }
+
+                foreach ($service['autowiring_types'] as $autowiringType) {
+                    if (!is_string($autowiringType)) {
+                        throw new InvalidArgumentException(sprintf('A "autowiring_types" attribute must be of type string for service "%s" in %s. Check your YAML syntax.', $id, $file));
+                    }
+
+                    $definition->addAutowiringType($autowiringType);
+                }
+            }
         }
 
         $this->container->setDefinition($id, $definition);
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 1fa3474..d42c550 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core;
 
 use Drupal\Component\FileCache\FileCacheFactory;
-use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Config\BootstrapConfigStorageFactory;
@@ -440,11 +439,6 @@ public function boot() {
     // Initialize the container.
     $this->initializeContainer();
 
-    // Ensure mt_rand() is reseeded to prevent random values from one page load
-    // being exploited to predict random values in subsequent page loads.
-    $seed = unpack("L", Crypt::randomBytes(4));
-    mt_srand($seed[1]);
-
     $this->booted = TRUE;
 
     return $this;
@@ -540,7 +534,7 @@ public function preHandle(Request $request) {
     // Set the allowed protocols.
     UrlHelper::setAllowedProtocols($this->container->getParameter('filter_protocols'));
 
-    // Override of Symfony's mime type guesser singleton.
+    // Override of Symfony's MIME type guesser singleton.
     MimeTypeGuesser::registerWithSymfonyGuesser($this->container);
 
     $this->prepared = TRUE;
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
index 1e198fe..9e83814 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
@@ -9,9 +9,11 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Plugin\DataType\EntityReference;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\TypedDataInterface;
 
 /**
@@ -1117,6 +1119,64 @@ protected function getEntityKey($key) {
   /**
    * {@inheritdoc}
    */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = [];
+    if ($entity_type->hasKey('id')) {
+      $fields[$entity_type->getKey('id')] = BaseFieldDefinition::create('integer')
+        ->setLabel(new TranslatableMarkup('ID'))
+        ->setReadOnly(TRUE)
+        ->setSetting('unsigned', TRUE);
+    }
+    if ($entity_type->hasKey('uuid')) {
+      $fields[$entity_type->getKey('uuid')] = BaseFieldDefinition::create('uuid')
+        ->setLabel(new TranslatableMarkup('UUID'))
+        ->setReadOnly(TRUE);
+    }
+    if ($entity_type->hasKey('revision')) {
+      $fields[$entity_type->getKey('revision')] = BaseFieldDefinition::create('integer')
+        ->setLabel(new TranslatableMarkup('Revision ID'))
+        ->setReadOnly(TRUE)
+        ->setSetting('unsigned', TRUE);
+    }
+    if ($entity_type->hasKey('langcode')) {
+      $fields[$entity_type->getKey('langcode')] = BaseFieldDefinition::create('language')
+        ->setLabel(new TranslatableMarkup('Language'))
+        ->setDisplayOptions('view', [
+          'type' => 'hidden',
+        ])
+        ->setDisplayOptions('form', [
+          'type' => 'language_select',
+          'weight' => 2,
+        ]);
+      if ($entity_type->isRevisionable()) {
+        $fields[$entity_type->getKey('langcode')]->setRevisionable(TRUE);
+      }
+      if ($entity_type->isTranslatable()) {
+        $fields[$entity_type->getKey('langcode')]->setTranslatable(TRUE);
+      }
+    }
+    if ($entity_type->hasKey('bundle')) {
+      if ($bundle_entity_type_id = $entity_type->getBundleEntityType()) {
+        $fields[$entity_type->getKey('bundle')] = BaseFieldDefinition::create('entity_reference')
+          ->setLabel($entity_type->getBundleLabel())
+          ->setSetting('target_type', $bundle_entity_type_id)
+          ->setRequired(TRUE)
+          ->setReadOnly(TRUE);
+      }
+      else {
+        $fields[$entity_type->getKey('bundle')] = BaseFieldDefinition::create('string')
+          ->setLabel($entity_type->getBundleLabel())
+          ->setRequired(TRUE)
+          ->setReadOnly(TRUE);
+      }
+    }
+
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
     return array();
   }
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index 0af9638..5ae33ef 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -7,18 +7,28 @@
 
 namespace Drupal\Core\Entity\Controller;
 
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Routing\UrlGeneratorInterface;
+use Drupal\Core\Routing\UrlGeneratorTrait;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Provides generic entity title callbacks for use in routing.
+ * Provides the add-page and title callbacks for entities.
  *
  * It provides:
+ * - The add-page callback.
+ * - An add title callback for entity types.
+ * - An add title callback for entity types with bundles.
  * - A view title callback.
  * - An edit title callback.
  * - A delete title callback.
@@ -26,25 +36,59 @@
 class EntityController implements ContainerInjectionInterface {
 
   use StringTranslationTrait;
+  use UrlGeneratorTrait;
 
   /**
    * The entity manager.
    *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity type bundle info.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $entityTypeBundleInfo;
+
+  /**
+   * The entity repository.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
    */
-  protected $entityManager;
+  protected $renderer;
 
   /**
    * Constructs a new EntityController.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle info.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation.
+   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
+   *   The url generator.
    */
-  public function __construct(EntityManagerInterface $entity_manager, TranslationInterface $string_translation) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityRepositoryInterface $entity_repository, RendererInterface $renderer, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityTypeBundleInfo = $entity_type_bundle_info;
+    $this->entityRepository = $entity_repository;
+    $this->renderer = $renderer;
     $this->stringTranslation = $string_translation;
+    $this->urlGenerator = $url_generator;
   }
 
   /**
@@ -52,12 +96,128 @@ public function __construct(EntityManagerInterface $entity_manager, TranslationI
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('entity.manager'),
-      $container->get('string_translation')
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity.repository'),
+      $container->get('renderer'),
+      $container->get('string_translation'),
+      $container->get('url_generator')
     );
   }
 
   /**
+   * Displays add links for the available bundles.
+   *
+   * Redirects to the add form if there's only one bundle available.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse|array
+   *   If there's only one available bundle, a redirect response.
+   *   Otherwise, a render array with the add links for each bundle.
+   */
+  public function addPage($entity_type_id) {
+    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+    $bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type_id);
+    $bundle_key = $entity_type->getKey('bundle');
+    $bundle_entity_type_id = $entity_type->getBundleEntityType();
+    $build = [
+      '#theme' => 'entity_add_list',
+      '#bundles' => [],
+    ];
+    if ($bundle_entity_type_id) {
+      $bundle_argument = $bundle_entity_type_id;
+      $bundle_entity_type = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
+      $bundle_entity_type_label = $bundle_entity_type->getLowercaseLabel();
+      $build['#cache']['tags'] = $bundle_entity_type->getListCacheTags();
+
+      // Build the message shown when there are no bundles.
+      $link_text = $this->t('Add a new @entity_type.', ['@entity_type' => $bundle_entity_type_label]);
+      $link_route_name = 'entity.' . $bundle_entity_type->id() . '.add_form';
+      $build['#add_bundle_message'] = $this->t('There is no @entity_type yet. @add_link', [
+        '@entity_type' => $bundle_entity_type_label,
+        '@add_link' => Link::createFromRoute($link_text, $link_route_name)->toString(),
+      ]);
+      // Filter out the bundles the user doesn't have access to.
+      $access_control_handler = $this->entityTypeManager->getAccessControlHandler($bundle_entity_type_id);
+      foreach ($bundles as $bundle_name => $bundle_info) {
+        $access = $access_control_handler->createAccess($bundle_name, NULL, [], TRUE);
+        if (!$access->isAllowed()) {
+          unset($bundles[$bundle_name]);
+        }
+        $this->renderer->addCacheableDependency($build, $access);
+      }
+      // Add descriptions from the bundle entities.
+      $bundles = $this->loadBundleDescriptions($bundles, $bundle_entity_type);
+    }
+    else {
+      $bundle_argument = $bundle_key;
+    }
+
+    $form_route_name = 'entity.' . $entity_type_id . '.add_form';
+    // Redirect if there's only one bundle available.
+    if (count($bundles) == 1) {
+      $bundle_names = array_keys($bundles);
+      $bundle_name = reset($bundle_names);
+      return $this->redirect($form_route_name, [$bundle_argument => $bundle_name]);
+    }
+    // Prepare the #bundles array for the template.
+    foreach ($bundles as $bundle_name => $bundle_info) {
+      $build['#bundles'][$bundle_name] = [
+        'label' => $bundle_info['label'],
+        'description' => isset($bundle_info['description']) ? $bundle_info['description'] : '',
+        'add_link' => Link::createFromRoute($bundle_info['label'], $form_route_name, [$bundle_argument => $bundle_name]),
+      ];
+    }
+
+    return $build;
+  }
+
+  /**
+   * Provides a generic add title callback for an entity type.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   *
+   * @return string
+   *    The title for the entity add page.
+   */
+  public function addTitle($entity_type_id) {
+    $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+    return $this->t('Add @entity-type', ['@entity-type' => $entity_type->getLowercaseLabel()]);
+  }
+
+  /**
+   * Provides a generic add title callback for entities with bundles.
+   *
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The route match.
+   * @param string $entity_type_id
+   *   The entity type ID.
+   * @param string $bundle_parameter
+   *   The name of the route parameter that holds the bundle.
+   *
+   * @return string
+   *    The title for the entity add page, if the bundle was found.
+   */
+  public function addBundleTitle(RouteMatchInterface $route_match, $entity_type_id, $bundle_parameter) {
+    $bundles = $this->entityTypeBundleInfo->getBundleInfo($entity_type_id);
+    // If the entity has bundle entities, the parameter might have been upcasted
+    // so fetch the raw parameter.
+    $bundle = $route_match->getRawParameter($bundle_parameter);
+    if ((count($bundles) > 1) && isset($bundles[$bundle])) {
+      return $this->t('Add @bundle', ['@bundle' => $bundles[$bundle]['label']]);
+    }
+    // If the entity supports bundles generally, but only has a single bundle,
+    // the bundle is probably something like 'Default' so that it preferable to
+    // use the entity type label.
+    else {
+      return $this->addTitle($entity_type_id);
+    }
+  }
+
+  /**
    * Provides a generic title callback for a single entity.
    *
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
@@ -65,8 +225,8 @@ public static function create(ContainerInterface $container) {
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) An entity, passed in directly from the request attributes.
    *
-   * @return string
-   *   The title for the entity view page.
+   * @return string|null
+   *   The title for the entity view page, if an entity was found.
    */
   public function title(RouteMatchInterface $route_match, EntityInterface $_entity = NULL) {
     if ($entity = $this->doGetEntity($route_match, $_entity)) {
@@ -82,8 +242,8 @@ public function title(RouteMatchInterface $route_match, EntityInterface $_entity
    * @param \Drupal\Core\Entity\EntityInterface $_entity
    *   (optional) An entity, passed in directly from the request attributes.
    *
-   * @return string
-   *   The title for the entity edit page.
+   * @return string|null
+   *   The title for the entity edit page, if an entity was found.
    */
   public function editTitle(RouteMatchInterface $route_match, EntityInterface $_entity = NULL) {
     if ($entity = $this->doGetEntity($route_match, $_entity)) {
@@ -101,7 +261,7 @@ public function editTitle(RouteMatchInterface $route_match, EntityInterface $_en
    *   set in \Drupal\Core\Entity\Enhancer\EntityRouteEnhancer.
    *
    * @return string
-   *   The title for the delete entity page.
+   *   The title for the entity delete page.
    */
   public function deleteTitle(RouteMatchInterface $route_match, EntityInterface $_entity = NULL) {
     if ($entity = $this->doGetEntity($route_match, $_entity)) {
@@ -135,9 +295,37 @@ protected function doGetEntity(RouteMatchInterface $route_match, EntityInterface
         }
       }
     }
-    if ($entity) {
-      return $this->entityManager->getTranslationFromContext($entity);
+    if (isset($entity)) {
+      return $this->entityRepository->getTranslationFromContext($entity);
     }
   }
 
+  /**
+   * Expands the bundle information with descriptions, if known.
+   *
+   * @param array $bundles
+   *   An array of bundle information.
+   * @param \Drupal\Core\Entity\EntityTypeInterface $bundle_entity_type
+   *   The ID of the bundle entity type.
+   *
+   * @return array
+   *   The expanded array of bundle information.
+   */
+  protected function loadBundleDescriptions(array $bundles, EntityTypeInterface $bundle_entity_type) {
+    if (!$bundle_entity_type->isSubclassOf('\Drupal\Core\Entity\EntityDescriptionInterface')) {
+      return $bundles;
+    }
+    $bundle_names = array_keys($bundles);
+    $storage = $this->entityTypeManager->getStorage($bundle_entity_type->id());
+    /** @var \Drupal\Core\Entity\EntityDescriptionInterface[] $bundle_entities */
+    $bundle_entities = $storage->loadMultiple($bundle_names);
+    foreach ($bundles as $bundle_name => &$bundle_info) {
+      if (isset($bundle_entities[$bundle_name])) {
+        $bundle_info['description'] = $bundle_entities[$bundle_name]->getDescription();
+      }
+    }
+
+    return $bundles;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
index d416e3a..435aa57 100644
--- a/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
@@ -104,8 +104,25 @@ public function view(EntityInterface $_entity, $view_mode = 'full') {
     $page['#entity_type'] = $_entity->getEntityTypeId();
     $page['#' . $page['#entity_type']] = $_entity;
 
-
     return $page;
   }
 
+  /**
+   * Provides a page to render a single entity revision.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $_entity_revision
+   *   The Entity to be rendered. Note this variable is named $_entity_revision
+   *   rather than $entity to prevent collisions with other named placeholders
+   *   in the route.
+   * @param string $view_mode
+   *   (optional) The view mode that should be used to display the entity.
+   *   Defaults to 'full'.
+   *
+   * @return array
+   *   A render array.
+   */
+  public function viewRevision(EntityInterface $_entity_revision, $view_mode = 'full') {
+    return $this->view($_entity_revision, $view_mode);
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
index d94e2b5..fc06979 100644
--- a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
+++ b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
@@ -290,7 +290,7 @@ protected static function matchEntityByTitle(SelectionInterface $handler, $input
   /**
    * Converts an array of entity objects into a string of entity labels.
    *
-   * This method is also responsible for checking the 'view' access on the
+   * This method is also responsible for checking the 'view label' access on the
    * passed-in entities.
    *
    * @param \Drupal\Core\Entity\EntityInterface[] $entities
@@ -302,7 +302,9 @@ protected static function matchEntityByTitle(SelectionInterface $handler, $input
   public static function getEntityLabels(array $entities) {
     $entity_labels = array();
     foreach ($entities as $entity) {
-      $label = ($entity->access('view')) ? $entity->label() : t('- Restricted access -');
+      // Use the special view label, since some entities allow the label to be
+      // viewed, even if the entity is not allowed to be viewed.
+      $label = ($entity->access('view label')) ? $entity->label() : t('- Restricted access -');
 
       // Take into account "autocreated" entities.
       if (!$entity->isNew()) {
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php b/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
index 27fda29..674f5a4 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
@@ -40,6 +40,16 @@ class EntityAccessControlHandler extends EntityHandlerBase implements EntityAcce
   protected $entityType;
 
   /**
+   * Allows to grant access to just the labels.
+   *
+   * By default, the "view label" operation falls back to "view". Set this to
+   * TRUE to allow returning different access when just listing entity labels.
+   *
+   * @var bool
+   */
+  protected $viewLabelOperation = FALSE;
+
+  /**
    * Constructs an access control handler instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
@@ -57,6 +67,10 @@ public function access(EntityInterface $entity, $operation, AccountInterface $ac
     $account = $this->prepareUser($account);
     $langcode = $entity->language()->getId();
 
+    if ($operation === 'view label' && $this->viewLabelOperation == FALSE) {
+      $operation = 'view';
+    }
+
     if (($return = $this->getCache($entity->uuid(), $operation, $langcode, $account)) !== NULL) {
       // Cache hit, no work necessary.
       return $return_as_object ? $return : $return->isAllowed();
@@ -124,7 +138,8 @@ protected function processAccessHookResults(array $access) {
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity for which to check access.
    * @param string $operation
-   *   The entity operation. Usually one of 'view', 'update' or 'delete'.
+   *   The entity operation. Usually one of 'view', 'view label', 'update' or
+   *   'delete'.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user for which to check access.
    *
@@ -133,7 +148,7 @@ protected function processAccessHookResults(array $access) {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     if ($operation == 'delete' && $entity->isNew()) {
-      return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+      return AccessResult::forbidden()->addCacheableDependency($entity);
     }
     if ($admin_permission = $this->entityType->getAdminPermission()) {
       return AccessResult::allowedIfHasPermission($account, $this->entityType->getAdminPermission());
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php b/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
index c1e7333..1d3c1ed 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessControlHandlerInterface.php
@@ -27,7 +27,7 @@
    *   The entity for which to check access.
    * @param string $operation
    *   The operation access should be checked for.
-   *   Usually one of "view", "update" or "delete".
+   *   Usually one of "view", "view label", "update" or "delete".
    * @param \Drupal\Core\Session\AccountInterface $account
    *   (optional) The user session for which to check access, or NULL to check
    *   access for the current user. Defaults to NULL.
diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
index c943b95..a61d385 100644
--- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManager.php
@@ -53,15 +53,14 @@ public function getChangeSummary() {
       // Process entity type definition changes.
       if (!empty($change_list['entity_type'])) {
         $entity_type = $this->entityManager->getDefinition($entity_type_id);
-        $t_args = array('%entity_type' => $entity_type->getLabel());
 
         switch ($change_list['entity_type']) {
           case static::DEFINITION_CREATED:
-            $summary[$entity_type_id][] = $this->t('Create the %entity_type entity type.', $t_args);
+            $summary[$entity_type_id][] = $this->t('The %entity_type entity type needs to be installed.', ['%entity_type' => $entity_type->getLabel()]);
             break;
 
           case static::DEFINITION_UPDATED:
-            $summary[$entity_type_id][] = $this->t('Update the %entity_type entity type.', $t_args);
+            $summary[$entity_type_id][] = $this->t('The %entity_type entity type needs to be updated.', ['%entity_type' => $entity_type->getLabel()]);
             break;
         }
       }
@@ -74,15 +73,15 @@ public function getChangeSummary() {
         foreach ($change_list['field_storage_definitions'] as $field_name => $change) {
           switch ($change) {
             case static::DEFINITION_CREATED:
-              $summary[$entity_type_id][] = $this->t('Create the %field_name field.', array('%field_name' => $storage_definitions[$field_name]->getLabel()));
+              $summary[$entity_type_id][] = $this->t('The %field_name field needs to be installed.', ['%field_name' => $storage_definitions[$field_name]->getLabel()]);
               break;
 
             case static::DEFINITION_UPDATED:
-              $summary[$entity_type_id][] = $this->t('Update the %field_name field.', array('%field_name' => $storage_definitions[$field_name]->getLabel()));
+              $summary[$entity_type_id][] = $this->t('The %field_name field needs to be updated.', ['%field_name' => $storage_definitions[$field_name]->getLabel()]);
               break;
 
             case static::DEFINITION_DELETED:
-              $summary[$entity_type_id][] = $this->t('Delete the %field_name field.', array('%field_name' => $original_storage_definitions[$field_name]->getLabel()));
+              $summary[$entity_type_id][] = $this->t('The %field_name field needs to be uninstalled.', ['%field_name' => $original_storage_definitions[$field_name]->getLabel()]);
               break;
           }
         }
diff --git a/core/lib/Drupal/Core/Entity/EntityDescriptionInterface.php b/core/lib/Drupal/Core/Entity/EntityDescriptionInterface.php
new file mode 100644
index 0000000..03eec65
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/EntityDescriptionInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\EntityDescriptionInterface.
+ */
+
+namespace Drupal\Core\Entity;
+
+/**
+ * Defines the interface for entities that have a description.
+ */
+interface EntityDescriptionInterface {
+
+  /**
+   * Gets the entity description.
+   *
+   * @return string
+   *   The entity description.
+   */
+  public function getDescription();
+
+  /**
+   * Sets the entity description.
+   *
+   * @param string $description
+   *   The entity description.
+   *
+   * @return $this
+   */
+  public function setDescription($description);
+
+}
diff --git a/core/lib/Drupal/Core/Entity/EntityForm.php b/core/lib/Drupal/Core/Entity/EntityForm.php
index 8d91948..fd20764 100644
--- a/core/lib/Drupal/Core/Entity/EntityForm.php
+++ b/core/lib/Drupal/Core/Entity/EntityForm.php
@@ -358,7 +358,19 @@ public function getEntityFromRouteMatch(RouteMatchInterface $route_match, $entit
       $entity = $route_match->getParameter($entity_type_id);
     }
     else {
-      $entity = $this->entityManager->getStorage($entity_type_id)->create([]);
+      $values = [];
+      // If the entity has bundles, fetch it from the route match.
+      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+      if ($bundle_key = $entity_type->getKey('bundle')) {
+        if (($bundle_entity_type_id = $entity_type->getBundleEntityType()) && $route_match->getRawParameter($bundle_entity_type_id)) {
+          $values[$bundle_key] = $route_match->getParameter($bundle_entity_type_id)->id();
+        }
+        elseif ($route_match->getRawParameter($bundle_key)) {
+          $values[$bundle_key] = $route_match->getParameter($bundle_key);
+        }
+      }
+
+      $entity = $this->entityTypeManager->getStorage($entity_type_id)->create($values);
     }
 
     return $entity;
diff --git a/core/lib/Drupal/Core/Entity/EntityRepository.php b/core/lib/Drupal/Core/Entity/EntityRepository.php
index 58381d1..2d83a98 100644
--- a/core/lib/Drupal/Core/Entity/EntityRepository.php
+++ b/core/lib/Drupal/Core/Entity/EntityRepository.php
@@ -56,7 +56,7 @@ public function loadEntityByUuid($entity_type_id, $uuid) {
 
     $entities = $this->entityTypeManager->getStorage($entity_type_id)->loadByProperties([$uuid_key => $uuid]);
 
-    return reset($entities);
+    return ($entities) ? reset($entities) : NULL;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
index 3cc13e0..eb4ddd8 100644
--- a/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\Entity;
 
+use Drupal\Core\Plugin\ObjectWithPluginCollectionInterface;
+
 /**
  * Provides an interface for an object using a plugin collection.
  *
@@ -14,15 +16,6 @@
  *
  * @ingroup plugin_api
  */
-interface EntityWithPluginCollectionInterface extends EntityInterface {
-
-  /**
-   * Gets the plugin collections used by this entity.
-   *
-   * @return \Drupal\Component\Plugin\LazyPluginCollection[]
-   *   An array of plugin collections, keyed by the property name they use to
-   *   store their configuration.
-   */
-  public function getPluginCollections();
+interface EntityWithPluginCollectionInterface extends EntityInterface, ObjectWithPluginCollectionInterface {
 
 }
diff --git a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
index b108bb4..be358b8 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php
@@ -122,6 +122,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
         'field' => '_none',
       ),
       'auto_create' => FALSE,
+      'auto_create_bundle' => NULL,
     );
 
     if ($entity_type->hasKey('bundle')) {
@@ -129,6 +130,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       foreach ($bundles as $bundle_name => $bundle_info) {
         $bundle_options[$bundle_name] = $bundle_info['label'];
       }
+      natsort($bundle_options);
 
       $form['target_bundles'] = array(
         '#type' => 'checkboxes',
@@ -139,7 +141,19 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
         '#size' => 6,
         '#multiple' => TRUE,
         '#element_validate' => [[get_class($this), 'elementValidateFilter']],
+        '#ajax' => TRUE,
+        '#limit_validation_errors' => [],
       );
+
+      $form['target_bundles_update'] = [
+        '#type' => 'submit',
+        '#value' => $this->t('Update form'),
+        '#limit_validation_errors' => [],
+        '#attributes' => [
+          'class' => ['js-hide'],
+        ],
+        '#submit' => [[EntityReferenceItem::class, 'settingsAjaxSubmit']],
+      ];
     }
     else {
       $form['target_bundles'] = array(
@@ -207,6 +221,30 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       }
     }
 
+    $form['auto_create'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t("Create referenced entities if they don't already exist"),
+      '#default_value' => $selection_handler_settings['auto_create'],
+      '#weight' => -2,
+    );
+
+    if ($entity_type->hasKey('bundle')) {
+      $bundles = array_intersect_key($bundle_options, array_filter((array) $selection_handler_settings['target_bundles']));
+      $form['auto_create_bundle'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Store new items in'),
+        '#options' => $bundles,
+        '#default_value' => $selection_handler_settings['auto_create_bundle'],
+        '#access' => count($bundles) > 1,
+        '#states' => [
+          'visible' => [
+            ':input[name="settings[handler_settings][auto_create]"]' => ['checked' => TRUE],
+          ],
+        ],
+        '#weight' => -1,
+      ];
+    }
+
     return $form;
   }
 
@@ -221,6 +259,10 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
     if ($form_state->getValue(['settings', 'handler_settings', 'target_bundles']) === []) {
       $form_state->setValue(['settings', 'handler_settings', 'target_bundles'], NULL);
     }
+
+    // Don't store the 'target_bundles_update' button value into the field
+    // config settings.
+    $form_state->unsetValue(['settings', 'handler_settings', 'target_bundles_update']);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php
index fb43f13..6aeba41 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/pgsql/QueryFactory.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Core\Entity\Query\Sql\pgsql\QueryFactory.
  */
 
-
 namespace Drupal\Core\Entity\Query\Sql\pgsql;
 
 use Drupal\Core\Entity\Query\Sql\QueryFactory as BaseQueryFactory;
diff --git a/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php b/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php
new file mode 100644
index 0000000..5820569
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/RevisionLogEntityTrait.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\RevisionLogEntityTrait.
+ */
+
+namespace Drupal\Core\Entity;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\user\UserInterface;
+
+/**
+ * Provides a trait for accessing revision logging and ownership information.
+ *
+ * @ingroup entity_api
+ */
+trait RevisionLogEntityTrait {
+
+  /**
+   * Provides revision-related base field definitions for an entity type.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
+   *
+   * @return \Drupal\Core\Field\FieldDefinitionInterface[]
+   *   An array of base field definitions for the entity type, keyed by field
+   *   name.
+   *
+   * @see \Drupal\Core\Entity\FieldableEntityInterface::baseFieldDefinitions()
+   */
+  public static function revisionLogBaseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields['revision_created'] = BaseFieldDefinition::create('created')
+      ->setLabel(t('Revision create time'))
+      ->setDescription(t('The time that the current revision was created.'))
+      ->setRevisionable(TRUE);
+
+    $fields['revision_user'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Revision user'))
+      ->setDescription(t('The user ID of the author of the current revision.'))
+      ->setSetting('target_type', 'user')
+      ->setRevisionable(TRUE);
+
+    $fields['revision_log_message'] = BaseFieldDefinition::create('string_long')
+      ->setLabel(t('Revision log message'))
+      ->setDescription(t('Briefly describe the changes you have made.'))
+      ->setRevisionable(TRUE)
+      ->setDefaultValue('')
+      ->setDisplayOptions('form', [
+        'type' => 'string_textarea',
+        'weight' => 25,
+        'settings' => [
+          'rows' => 4,
+        ],
+      ]);
+
+    return $fields;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::getRevisionCreationTime().
+   */
+  public function getRevisionCreationTime() {
+    return $this->revision_created->value;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::setRevisionCreationTime().
+   */
+  public function setRevisionCreationTime($timestamp) {
+    $this->revision_created->value = $timestamp;
+    return $this;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::getRevisionUser().
+   */
+  public function getRevisionUser() {
+    return $this->revision_user->entity;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::setRevisionUser().
+   */
+  public function setRevisionUser(UserInterface $account) {
+    $this->revision_user->entity = $account;
+    return $this;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::getRevisionUserId().
+   */
+  public function getRevisionUserId() {
+    return $this->revision_user->target_id;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::setRevisionUserId().
+   */
+  public function setRevisionUserId($user_id) {
+    $this->revision_user->target_id = $user_id;
+    return $this;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::getRevisionLogMessage().
+   */
+  public function getRevisionLogMessage() {
+    return $this->revision_log_message->value;
+  }
+
+  /**
+   * Implements \Drupal\Core\Entity\RevisionLogInterface::setRevisionLogMessage().
+   */
+  public function setRevisionLogMessage($revision_log_message) {
+    $this->revision_log_message->value = $revision_log_message;
+    return $this;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Entity/RevisionLogInterface.php b/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
new file mode 100644
index 0000000..6400095
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\RevisionLogInterface.
+ */
+
+namespace Drupal\Core\Entity;
+
+use Drupal\user\UserInterface;
+
+/**
+ * Defines methods for an entity that supports revision logging and ownership.
+ */
+interface RevisionLogInterface extends RevisionableInterface {
+
+  /**
+   * Gets the entity revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the entity revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return $this
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the entity revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the entity revision author.
+   *
+   * @param \Drupal\user\UserInterface $account
+   *   The user account of the revision author.
+   *
+   * @return $this
+   */
+  public function setRevisionUser(UserInterface $account);
+
+  /**
+   * Gets the entity revision author ID.
+   *
+   * @return int
+   *   The user ID.
+   */
+  public function getRevisionUserId();
+
+  /**
+   * Sets the entity revision author by ID.
+   *
+   * @param int $user_id
+   *   The user ID of the revision author.
+   *
+   * @return $this
+   */
+  public function setRevisionUserId($user_id);
+
+  /**
+   * Returns the entity revision log message.
+   *
+   * @return string
+   *   The revision log message.
+   */
+  public function getRevisionLogMessage();
+
+  /**
+   * Sets the entity revision log message.
+   *
+   * @param string $revision_log_message
+   *   The revision log message.
+   *
+   * @return $this
+   */
+  public function setRevisionLogMessage($revision_log_message);
+
+}
diff --git a/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php
new file mode 100644
index 0000000..74085c7
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\RevisionableContentEntityBase.
+ */
+
+namespace Drupal\Core\Entity;
+
+/**
+ * Provides a content entity with extended support for revisions.
+ *
+ * In addition to the parent entity class, base fields and methods for
+ * accessing the revision log message, revision owner and the revision creation
+ * time are provided.
+ *
+ * @ingroup entity_api
+ */
+abstract class RevisionableContentEntityBase extends ContentEntityBase implements RevisionLogInterface {
+
+  use RevisionLogEntityTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+
+    $fields += static::revisionLogBaseFieldDefinitions($entity_type);
+    return $fields;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php b/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
index 39c1c6e..ab7b086 100644
--- a/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
+++ b/core/lib/Drupal/Core/Entity/Routing/AdminHtmlRouteProvider.php
@@ -10,9 +10,9 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 
 /**
- * Provides HTML routes for entities with administrative edit/delete pages.
+ * Provides HTML routes for entities with administrative add/edit/delete pages.
  *
- * Use this class if the edit and delete form routes should use the
+ * Use this class if the add/edit/delete form routes should use the
  * administrative theme.
  *
  * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider.
@@ -24,6 +24,26 @@ class AdminHtmlRouteProvider extends DefaultHtmlRouteProvider {
   /**
    * {@inheritdoc}
    */
+  protected function getAddPageRoute(EntityTypeInterface $entity_type) {
+    if ($route = parent::getAddPageRoute($entity_type)) {
+      $route->setOption('_admin_route', TRUE);
+      return $route;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAddFormRoute(EntityTypeInterface $entity_type) {
+    if ($route = parent::getAddFormRoute($entity_type)) {
+      $route->setOption('_admin_route', TRUE);
+      return $route;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   protected function getEditFormRoute(EntityTypeInterface $entity_type) {
     if ($route = parent::getEditFormRoute($entity_type)) {
       $route->setOption('_admin_route', TRUE);
diff --git a/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php b/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
index 6a8ed39..26258bd 100644
--- a/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
+++ b/core/lib/Drupal/Core/Entity/Routing/DefaultHtmlRouteProvider.php
@@ -7,9 +7,12 @@
 
 namespace Drupal\Core\Entity\Routing;
 
+use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
+use Drupal\Core\Entity\Controller\EntityController;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityHandlerInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Route;
@@ -21,6 +24,8 @@
  * This class provides the following routes for entities, with title and access
  * callbacks:
  * - canonical
+ * - add-page
+ * - add-form
  * - edit-form
  * - delete-form
  *
@@ -31,20 +36,30 @@
 class DefaultHtmlRouteProvider implements EntityRouteProviderInterface, EntityHandlerInterface {
 
   /**
-   * The entity manager.
+   * The entity type manager.
    *
    * @var \Drupal\Core\Entity\EntityManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
+
+  /**
+   * The entity field manager.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
 
   /**
    * Constructs a new DefaultHtmlRouteProvider.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
    */
-  public function  __construct(EntityManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function  __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityFieldManager = $entity_field_manager;
   }
 
   /**
@@ -52,7 +67,8 @@ public function  __construct(EntityManagerInterface $entity_manager) {
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static(
-      $container->get('entity.manager')
+      $container->get('entity_type.manager'),
+      $container->get('entity_field.manager')
     );
   }
 
@@ -64,14 +80,22 @@ public function getRoutes(EntityTypeInterface $entity_type) {
 
     $entity_type_id = $entity_type->id();
 
-    if ($edit_route = $this->getEditFormRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.edit_form", $edit_route);
+    if ($add_page_route = $this->getAddPageRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.add_page", $add_page_route);
+    }
+
+    if ($add_form_route = $this->getAddFormRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.add_form", $add_form_route);
     }
 
     if ($canonical_route = $this->getCanonicalRoute($entity_type)) {
       $collection->add("entity.{$entity_type_id}.canonical", $canonical_route);
     }
 
+    if ($edit_route = $this->getEditFormRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.edit_form", $edit_route);
+    }
+
     if ($delete_route = $this->getDeleteFormRoute($entity_type)) {
       $collection->add("entity.{$entity_type_id}.delete_form", $delete_route);
     }
@@ -80,6 +104,101 @@ public function getRoutes(EntityTypeInterface $entity_type) {
   }
 
   /**
+   * Gets the add page route.
+   *
+   * Built only for entity types that have bundles.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getAddPageRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('add-page') && $entity_type->getKey('bundle')) {
+      $route = new Route($entity_type->getLinkTemplate('add-page'));
+      $route->setDefault('_controller', EntityController::class . '::addPage');
+      $route->setDefault('_title_callback', EntityController::class . '::addTitle');
+      $route->setDefault('entity_type_id', $entity_type->id());
+      $route->setRequirement('_entity_create_access', $entity_type->id());
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the add-form route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getAddFormRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('add-form')) {
+      $entity_type_id = $entity_type->id();
+      $route = new Route($entity_type->getLinkTemplate('add-form'));
+      // Use the add form handler, if available, otherwise default.
+      $operation = 'default';
+      if ($entity_type->getFormClass('add')) {
+        $operation = 'add';
+      }
+      $route->setDefaults([
+        '_entity_form' => "{$entity_type_id}.{$operation}",
+        'entity_type_id' => $entity_type_id,
+      ]);
+
+      // If the entity has bundles, we can provide a bundle-specific title
+      // and access requirements.
+      if ($bundle_key = $entity_type->getKey('bundle')) {
+        $route->setDefault('_title_callback', EntityController::class . '::addBundleTitle');
+        // If the bundles are entities themselves, we can add parameter
+        // information to the route options.
+        if ($bundle_entity_type_id = $entity_type->getBundleEntityType()) {
+          $bundle_entity_type = $this->entityTypeManager->getDefinition($bundle_entity_type_id);
+
+          $route
+            // The title callback uses the value of the bundle parameter to
+            // fetch the respective bundle at runtime.
+            ->setDefault('bundle_parameter', $bundle_entity_type_id)
+            ->setRequirement('_entity_create_access', "{$entity_type_id}:{$bundle_entity_type_id}");
+
+          // Entity types with serial IDs can specify this in their route
+          // requirements, improving the matching process.
+          if ($this->getEntityTypeIdKeyType($bundle_entity_type) === 'integer') {
+            $route->setRequirement($entity_type_id, '\d+');
+          }
+
+          $bundle_entity_parameter = ['type' => 'entity:' . $bundle_entity_type_id];
+          if ($bundle_entity_type instanceof ConfigEntityTypeInterface) {
+            // The add page might be displayed on an admin path. Even then, we
+            // need to load configuration overrides so that, for example, the
+            // bundle label gets translated correctly.
+            // @see \Drupal\Core\ParamConverter\AdminPathConfigEntityConverter
+            $bundle_entity_parameter['with_config_overrides'] = TRUE;
+          }
+          $route->setOption('parameters', [$bundle_entity_type_id => $bundle_entity_parameter]);
+        }
+        else {
+          // If the bundles are not entities, the bundle key is used as the
+          // route parameter name directly.
+          $route
+            ->setDefault('bundle_parameter', $bundle_key)
+            ->setRequirement('_entity_create_access', "{$entity_type_id}:{$bundle_key}");
+        }
+      }
+      else {
+        $route
+          ->setDefault('_title_callback', EntityController::class . '::addTitle')
+          ->setRequirement('_entity_create_access', $entity_type_id);
+      }
+
+      return $route;
+    }
+  }
+
+  /**
    * Gets the canonical route.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
@@ -195,7 +314,7 @@ protected function getEntityTypeIdKeyType(EntityTypeInterface $entity_type) {
       return NULL;
     }
 
-    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($entity_type->id());
+    $field_storage_definitions = $this->entityFieldManager->getFieldStorageDefinitions($entity_type->id());
     return $field_storage_definitions[$entity_type->getKey('id')]->getType();
   }
 
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index 064ef01..ca1835e 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -5,7 +5,6 @@
  * Hooks and documentation related to entities.
  */
 
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface;
diff --git a/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php b/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
index 468ab9f..296c874 100644
--- a/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
+++ b/core/lib/Drupal/Core/EventSubscriber/AcceptNegotiation406.php
@@ -34,7 +34,7 @@ public function onViewDetect406(GetResponseForControllerResultEvent $event) {
     // not HTML though we can also assume that the requested format is invalid
     // so we provide a 406 response.
     if (is_array($result) && $request->getRequestFormat() !== 'html') {
-      throw new NotAcceptableHttpException('Not acceptable');
+      throw new NotAcceptableHttpException('Not acceptable format: ' . $request->getRequestFormat());
     }
   }
 
diff --git a/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
index 8422db2..623ba09 100644
--- a/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/CustomPageExceptionHtmlSubscriber.php
@@ -7,13 +7,17 @@
 
 namespace Drupal\Core\EventSubscriber;
 
+use Drupal\Core\Access\AccessManagerInterface;
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Path\AliasManagerInterface;
+use Drupal\Core\Routing\AccessAwareRouterInterface;
 use Drupal\Core\Routing\RedirectDestinationInterface;
+use Drupal\Core\Url;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 
 /**
  * Exception subscriber for handling core custom HTML error pages.
@@ -28,30 +32,32 @@ class CustomPageExceptionHtmlSubscriber extends DefaultExceptionHtmlSubscriber {
   protected $configFactory;
 
   /**
-   * The page alias manager.
+   * The access manager.
    *
-   * @var \Drupal\Core\Path\AliasManagerInterface
+   * @var \Drupal\Core\Access\AccessManagerInterface
    */
-  protected $aliasManager;
+  protected $accessManager;
 
   /**
    * Constructs a new CustomPageExceptionHtmlSubscriber.
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
-   * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
-   *   The alias manager service.
    * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
    *   The HTTP Kernel service.
    * @param \Psr\Log\LoggerInterface $logger
    *   The logger service.
    * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
    *   The redirect destination service.
+   * @param \Symfony\Component\Routing\Matcher\UrlMatcherInterface $access_unaware_router
+   *   A router implementation which does not check access.
+   * @param \Drupal\Core\Access\AccessManagerInterface $access_manager
+   *   The access manager.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, AliasManagerInterface $alias_manager, HttpKernelInterface $http_kernel, LoggerInterface $logger, RedirectDestinationInterface $redirect_destination) {
-    parent::__construct($http_kernel, $logger, $redirect_destination);
+  public function __construct(ConfigFactoryInterface $config_factory, HttpKernelInterface $http_kernel, LoggerInterface $logger, RedirectDestinationInterface $redirect_destination, UrlMatcherInterface $access_unaware_router, AccessManagerInterface $access_manager) {
+    parent::__construct($http_kernel, $logger, $redirect_destination, $access_unaware_router);
     $this->configFactory = $config_factory;
-    $this->aliasManager = $alias_manager;
+    $this->accessManager = $access_manager;
   }
 
   /**
@@ -65,16 +71,57 @@ protected static function getPriority() {
    * {@inheritdoc}
    */
   public function on403(GetResponseForExceptionEvent $event) {
-    $path = $this->aliasManager->getPathByAlias($this->configFactory->get('system.site')->get('page.403'));
-    $this->makeSubrequest($event, trim($path, '/'), Response::HTTP_FORBIDDEN);
+    $custom_403_path = $this->configFactory->get('system.site')->get('page.403');
+    if (!empty($custom_403_path)) {
+      $this->makeSubrequestToCustomPath($event, $custom_403_path, Response::HTTP_FORBIDDEN);
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function on404(GetResponseForExceptionEvent $event) {
-    $path = $this->aliasManager->getPathByAlias($this->configFactory->get('system.site')->get('page.404'));
-    $this->makeSubrequest($event, trim($path, '/'), Response::HTTP_NOT_FOUND);
+    $custom_404_path = $this->configFactory->get('system.site')->get('page.404');
+    if (!empty($custom_404_path)) {
+      $this->makeSubrequestToCustomPath($event, $custom_404_path, Response::HTTP_NOT_FOUND);
+    }
+  }
+
+  /**
+   * Makes a subrequest to retrieve the custom error page.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
+   *   The event to process.
+   * @param string $custom_path
+   *   The custom path to which to make a subrequest for this error message.
+   * @param int $status_code
+   *   The status code for the error being handled.
+   */
+  protected function makeSubrequestToCustomPath(GetResponseForExceptionEvent $event, $custom_path, $status_code) {
+    $url = Url::fromUserInput($custom_path);
+    if ($url->isRouted()) {
+      $access_result = $this->accessManager->checkNamedRoute($url->getRouteName(), $url->getRouteParameters(), NULL, TRUE);
+      $request = $event->getRequest();
+
+      // Merge the custom path's route's access result's cacheability metadata
+      // with the existing one (from the master request), otherwise create it.
+      if (!$request->attributes->has(AccessAwareRouterInterface::ACCESS_RESULT)) {
+        $request->attributes->set(AccessAwareRouterInterface::ACCESS_RESULT, $access_result);
+      }
+      else {
+        $existing_access_result = $request->attributes->get(AccessAwareRouterInterface::ACCESS_RESULT);
+        if ($existing_access_result instanceof RefinableCacheableDependencyInterface) {
+          $existing_access_result->addCacheableDependency($access_result);
+        }
+      }
+
+      // Only perform the subrequest if the custom path is actually accessible.
+      if (!$access_result->isAllowed()) {
+        return;
+      }
+    }
+
+    $this->makeSubrequest($event, $custom_path, $status_code);
   }
 
 }
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
index 46336e0..153253a 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionHtmlSubscriber.php
@@ -7,16 +7,14 @@
 
 namespace Drupal\Core\EventSubscriber;
 
-use Drupal\Core\Routing\AccessAwareRouterInterface;
 use Drupal\Core\Routing\RedirectDestinationInterface;
-use Drupal\Core\Url;
 use Drupal\Core\Utility\Error;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 
 /**
  * Exception subscriber for handling core default HTML error pages.
@@ -45,6 +43,13 @@ class DefaultExceptionHtmlSubscriber extends HttpExceptionSubscriberBase {
   protected $redirectDestination;
 
   /**
+   * A router implementation which does not check access.
+   *
+   * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface
+   */
+  protected $accessUnawareRouter;
+
+  /**
    * Constructs a new DefaultExceptionHtmlSubscriber.
    *
    * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
@@ -53,11 +58,14 @@ class DefaultExceptionHtmlSubscriber extends HttpExceptionSubscriberBase {
    *   The logger service.
    * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
    *   The redirect destination service.
+   * @param \Symfony\Component\Routing\Matcher\UrlMatcherInterface $access_unaware_router
+   *   A router implementation which does not check access.
    */
-  public function __construct(HttpKernelInterface $http_kernel, LoggerInterface $logger, RedirectDestinationInterface $redirect_destination) {
+  public function __construct(HttpKernelInterface $http_kernel, LoggerInterface $logger, RedirectDestinationInterface $redirect_destination, UrlMatcherInterface $access_unaware_router) {
     $this->httpKernel = $http_kernel;
     $this->logger = $logger;
     $this->redirectDestination = $redirect_destination;
+    $this->accessUnawareRouter = $access_unaware_router;
   }
 
   /**
@@ -83,7 +91,7 @@ protected function getHandledFormats() {
    *   The event to process.
    */
   public function on401(GetResponseForExceptionEvent $event) {
-    $this->makeSubrequest($event, Url::fromRoute('system.401')->toString(), Response::HTTP_UNAUTHORIZED);
+    $this->makeSubrequest($event, '/system/401', Response::HTTP_UNAUTHORIZED);
   }
 
   /**
@@ -93,7 +101,7 @@ public function on401(GetResponseForExceptionEvent $event) {
    *   The event to process.
    */
   public function on403(GetResponseForExceptionEvent $event) {
-    $this->makeSubrequest($event, Url::fromRoute('system.403')->toString(), Response::HTTP_FORBIDDEN);
+    $this->makeSubrequest($event, '/system/403', Response::HTTP_FORBIDDEN);
   }
 
   /**
@@ -103,14 +111,14 @@ public function on403(GetResponseForExceptionEvent $event) {
    *   The event to process.
    */
   public function on404(GetResponseForExceptionEvent $event) {
-    $this->makeSubrequest($event, Url::fromRoute('system.404')->toString(), Response::HTTP_NOT_FOUND);
+    $this->makeSubrequest($event, '/system/404', Response::HTTP_NOT_FOUND);
   }
 
   /**
    * Makes a subrequest to retrieve the default error page.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
-   *   The event to process
+   *   The event to process.
    * @param string $url
    *   The path/url to which to make a subrequest for this error message.
    * @param int $status_code
@@ -120,54 +128,46 @@ protected function makeSubrequest(GetResponseForExceptionEvent $event, $url, $st
     $request = $event->getRequest();
     $exception = $event->getException();
 
-    if (!($url && $url[0] == '/')) {
-      $url = $request->getBasePath() . '/' . $url;
-    }
-
-    $current_url = $request->getBasePath() . $request->getPathInfo();
-
-    if ($url != $request->getBasePath() . '/' && $url != $current_url) {
-      if ($request->getMethod() === 'POST') {
-        $sub_request = Request::create($url, 'POST', $this->redirectDestination->getAsArray() + ['_exception_statuscode' => $status_code] + $request->request->all(), $request->cookies->all(), [], $request->server->all());
-      }
-      else {
-        $sub_request = Request::create($url, 'GET', $request->query->all() + $this->redirectDestination->getAsArray() + ['_exception_statuscode' => $status_code], $request->cookies->all(), [], $request->server->all());
+    try {
+      // Reuse the exact same request (so keep the same URL, keep the access
+      // result, the exception, et cetera) but override the routing information.
+      // This means that aside from routing, this is identical to the master
+      // request. This allows us to generate a response that is executed on
+      // behalf of the master request, i.e. for the original URL. This is what
+      // allows us to e.g. generate a 404 response for the original URL; if we
+      // would execute a subrequest with the 404 route's URL, then it'd be
+      // generated for *that* URL, not the *original* URL.
+      $sub_request = clone $request;
+      $sub_request->attributes->add($this->accessUnawareRouter->match($url));
+
+      // Add to query (GET) or request (POST) parameters:
+      // - 'destination' (to ensure e.g. the login form in a 403 response
+      //   redirects to the original URL)
+      // - '_exception_statuscode'
+      $parameters = $sub_request->isMethod('GET') ? $sub_request->query : $sub_request->request;
+      $parameters->add($this->redirectDestination->getAsArray() + ['_exception_statuscode' => $status_code]);
+
+      $response = $this->httpKernel->handle($sub_request, HttpKernelInterface::SUB_REQUEST);
+      // Only 2xx responses should have their status code overridden; any
+      // other status code should be passed on: redirects (3xx), error (5xx)…
+      // @see https://www.drupal.org/node/2603788#comment-10504916
+      if ($response->isSuccessful()) {
+        $response->setStatusCode($status_code);
       }
 
-      try {
-        // Persist the 'exception' attribute to the subrequest.
-        $sub_request->attributes->set('exception', $request->attributes->get('exception'));
-        // Persist the access result attribute to the subrequest, so that the
-        // error page inherits the access result of the master request.
-        $sub_request->attributes->set(AccessAwareRouterInterface::ACCESS_RESULT, $request->attributes->get(AccessAwareRouterInterface::ACCESS_RESULT));
-
-        // Carry over the session to the subrequest.
-        if ($session = $request->getSession()) {
-          $sub_request->setSession($session);
-        }
-
-        $response = $this->httpKernel->handle($sub_request, HttpKernelInterface::SUB_REQUEST);
-        // Only 2xx responses should have their status code overridden; any
-        // other status code should be passed on: redirects (3xx), error (5xx)…
-        // @see https://www.drupal.org/node/2603788#comment-10504916
-        if ($response->isSuccessful()) {
-          $response->setStatusCode($status_code);
-        }
-
-        // Persist any special HTTP headers that were set on the exception.
-        if ($exception instanceof HttpExceptionInterface) {
-          $response->headers->add($exception->getHeaders());
-        }
-
-        $event->setResponse($response);
-      }
-      catch (\Exception $e) {
-        // If an error happened in the subrequest we can't do much else. Instead,
-        // just log it. The DefaultExceptionSubscriber will catch the original
-        // exception and handle it normally.
-        $error = Error::decodeException($e);
-        $this->logger->log($error['severity_level'], '%type: @message in %function (line %line of %file).', $error);
+      // Persist any special HTTP headers that were set on the exception.
+      if ($exception instanceof HttpExceptionInterface) {
+        $response->headers->add($exception->getHeaders());
       }
+
+      $event->setResponse($response);
+    }
+    catch (\Exception $e) {
+      // If an error happened in the subrequest we can't do much else. Instead,
+      // just log it. The DefaultExceptionSubscriber will catch the original
+      // exception and handle it normally.
+      $error = Error::decodeException($e);
+      $this->logger->log($error['severity_level'], '%type: @message in %function (line %line of %file).', $error);
     }
   }
 
diff --git a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
index 6f7612a..f36aafc 100644
--- a/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/DefaultExceptionSubscriber.php
@@ -166,6 +166,20 @@ protected function onJson(GetResponseForExceptionEvent $event) {
   }
 
   /**
+   * Handles an HttpExceptionInterface exception for unknown formats.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
+   *   The event to process.
+   */
+  protected function onFormatUnknown(GetResponseForExceptionEvent $event) {
+    /** @var \Symfony\Component\HttpKernel\Exception\HttpExceptionInterface|\Exception $exception */
+    $exception = $event->getException();
+
+    $response = new Response($exception->getMessage(), $exception->getStatusCode(), $exception->getHeaders());
+    $event->setResponse($response);
+  }
+
+  /**
    * Handles errors for this subscriber.
    *
    * @param \Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event
@@ -173,11 +187,17 @@ protected function onJson(GetResponseForExceptionEvent $event) {
    */
   public function onException(GetResponseForExceptionEvent $event) {
     $format = $this->getFormat($event->getRequest());
+    $exception = $event->getException();
 
-    // If it's an unrecognized format, assume HTML.
     $method = 'on' . $format;
     if (!method_exists($this, $method)) {
-      $method = 'onHtml';
+      if ($exception instanceof HttpExceptionInterface) {
+        $this->onFormatUnknown($event);
+      }
+      else {
+        $this->onHtml($event);
+      }
+      return;
     }
     $this->$method($event);
   }
diff --git a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index a373688..f0cf3e1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -263,7 +263,7 @@ protected function setResponseCacheable(Response $response, Request $request) {
    *   A response object.
    */
   protected function setCacheControlNoCache(Response $response) {
-    $response->headers->set('Cache-Control', 'no-cache, must-revalidate, post-check=0, pre-check=0');
+    $response->headers->set('Cache-Control', 'no-cache, must-revalidate');
   }
 
   /**
diff --git a/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php
new file mode 100644
index 0000000..17ef946
--- /dev/null
+++ b/core/lib/Drupal/Core/EventSubscriber/OptionsRequestSubscriber.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\EventSubscriber\OptionsRequestSubscriber.
+ */
+
+namespace Drupal\Core\EventSubscriber;
+
+use Symfony\Cmf\Component\Routing\RouteProviderInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Handles options requests.
+ *
+ * Therefore it sends a options response using all methods on all possible
+ * routes.
+ */
+class OptionsRequestSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The route provider.
+   *
+   * @var \Symfony\Cmf\Component\Routing\RouteProviderInterface
+   */
+  protected $routeProvider;
+
+  /**
+   * Creates a new OptionsRequestSubscriber instance.
+   *
+   * @param \Symfony\Cmf\Component\Routing\RouteProviderInterface $route_provider
+   *   The route provider.
+   */
+  public function __construct(RouteProviderInterface $route_provider) {
+    $this->routeProvider = $route_provider;
+  }
+
+  /**
+   * Tries to handle the options request.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
+   *   The request event.
+   */
+  public function onRequest(GetResponseEvent $event) {
+    if ($event->getRequest()->isMethod('OPTIONS')) {
+      $routes = $this->routeProvider->getRouteCollectionForRequest($event->getRequest());
+      // In case we don't have any routes, a 403 should be thrown by the normal
+      // request handling.
+      if (count($routes) > 0) {
+        $methods = array_map(function (Route $route) {
+          return $route->getMethods();
+        }, $routes->all());
+        // Flatten and unique the available methods.
+        $methods = array_unique(call_user_func_array('array_merge', $methods));
+        $response = new Response('', 200, ['Allow' => implode(', ', $methods)]);
+        $event->setResponse($response);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    // Set a high priority so it is executed before routing.
+    $events[KernelEvents::REQUEST][] = ['onRequest', 1000];
+    return $events;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/EventSubscriber/RouterRebuildSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/RouterRebuildSubscriber.php
deleted file mode 100644
index 9ada39c..0000000
--- a/core/lib/Drupal/Core/EventSubscriber/RouterRebuildSubscriber.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\EventSubscriber\RouterRebuildSubscriber.
- */
-
-namespace Drupal\Core\EventSubscriber;
-
-use Drupal\Core\Routing\RouteBuilderInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Rebuilds the router if needed at the end of the request.
- */
-class RouterRebuildSubscriber implements EventSubscriberInterface {
-
-  /**
-   * @var \Drupal\Core\Routing\RouteBuilderInterface
-   */
-  protected $routeBuilder;
-
-  /**
-   * Constructs the RouterRebuildSubscriber object.
-   *
-   * @param \Drupal\Core\Routing\RouteBuilderInterface $route_builder
-   *   The route builder.
-   */
-  public function __construct(RouteBuilderInterface $route_builder) {
-    $this->routeBuilder = $route_builder;
-  }
-
-  /**
-   * Rebuilds routers if necessary.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\PostResponseEvent $event
-   *   The event object.
-   */
-  public function onKernelTerminate(PostResponseEvent $event) {
-    $this->routeBuilder->rebuildIfNeeded();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  static function getSubscribedEvents() {
-    $events[KernelEvents::TERMINATE][] = array('onKernelTerminate', 200);
-    return $events;
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index b9a9a3e..05f1e4f 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -90,6 +90,13 @@ class ModuleHandler implements ModuleHandlerInterface {
   protected $root;
 
   /**
+   * A list of module include file keys.
+   *
+   * @var array
+   */
+  protected $includeFileKeys = [];
+
+  /**
    * Constructs a ModuleHandler object.
    *
    * @param string $root
@@ -263,14 +270,21 @@ public function loadInclude($module, $type, $name = NULL) {
     }
 
     $name = $name ?: $module;
+    $key = $type . ':' . $module . ':' . $name;
+    if (isset($this->includeFileKeys[$key])) {
+      return $this->includeFileKeys[$key];
+    }
     if (isset($this->moduleList[$module])) {
       $file = $this->root . '/' . $this->moduleList[$module]->getPath() . "/$name.$type";
       if (is_file($file)) {
         require_once $file;
+        $this->includeFileKeys[$key] = $file;
         return $file;
       }
+      else {
+        $this->includeFileKeys[$key] = FALSE;
+      }
     }
-
     return FALSE;
   }
 
diff --git a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
index 1032438..37eaefc 100644
--- a/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
+++ b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
@@ -515,7 +515,7 @@ public function getOptionsProvider($property_name, FieldableEntityInterface $ent
     // If the field item class implements the interface, create an orphaned
     // runtime item object, so that it can be used as the options provider
     // without modifying the entity being worked on.
-    if (is_subclass_of($this->getFieldItemClass(), '\Drupal\Core\TypedData\OptionsProviderInterface')) {
+    if (is_subclass_of($this->getFieldItemClass(), OptionsProviderInterface::class)) {
       $items = $entity->get($this->getName());
       return \Drupal::service('plugin.manager.field.field_type')->createFieldItem($items, 0);
     }
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
index 74c7523..be7b94a 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BooleanFormatter.php
@@ -117,6 +117,30 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
+  public function settingsSummary() {
+    $summary = [];
+    $setting = $this->getSetting('format');
+
+    if ($setting == 'custom') {
+      $summary[] = $this->t('Custom text: @true_label / @false_label', [
+        '@true_label' => $this->getSetting('format_custom_true'),
+        '@false_label' => $this->getSetting('format_custom_false'),
+      ]);
+    }
+    else {
+      $formats = $this->getOutputFormats();
+      $summary[] = $this->t('Display: @true_label / @false_label', [
+        '@true_label' => $formats[$setting][0],
+        '@false_label' => $formats[$setting][1],
+      ]);
+    }
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function viewElements(FieldItemListInterface $items, $langcode) {
     $elements = [];
 
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
index a53e0b9..ffbfe35 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
@@ -52,11 +52,11 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $this->getSetting('decimal_separator'),
       '#weight' => 5,
     );
-    $range = range(0, 10);
     $elements['scale'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Scale', array(), array('context' => 'decimal places')),
-      '#options' => array_combine($range, $range),
+      '#min' => 0,
+      '#max' => 10,
       '#default_value' => $this->getSetting('scale'),
       '#description' => t('The number of digits to the right of the decimal.'),
       '#weight' => 6,
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index c2f23cf..78b62b3 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
 
+use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -36,6 +38,20 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
   protected $loggerFactory;
 
   /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface
+   */
+  protected $entityDisplayRepository;
+
+  /**
    * Constructs a StringFormatter instance.
    *
    * @param string $plugin_id
@@ -54,10 +70,16 @@ class EntityReferenceEntityFormatter extends EntityReferenceFormatterBase implem
    *   Any third party settings settings.
    * @param LoggerChannelFactoryInterface $logger_factory
    *   The logger factory.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
+   *   The entity display repository.
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, LoggerChannelFactoryInterface $logger_factory) {
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, LoggerChannelFactoryInterface $logger_factory, EntityTypeManagerInterface $entity_type_manager, EntityDisplayRepositoryInterface $entity_display_repository) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->loggerFactory = $logger_factory;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->entityDisplayRepository = $entity_display_repository;
   }
 
   /**
@@ -72,7 +94,9 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration['label'],
       $configuration['view_mode'],
       $configuration['third_party_settings'],
-      $container->get('logger.factory')
+      $container->get('logger.factory'),
+      $container->get('entity_type.manager'),
+      $container->get('entity_display.repository')
     );
   }
 
@@ -92,7 +116,7 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements['view_mode'] = array(
       '#type' => 'select',
-      '#options' => \Drupal::entityManager()->getViewModeOptions($this->getFieldSetting('target_type')),
+      '#options' => $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type')),
       '#title' => t('View mode'),
       '#default_value' => $this->getSetting('view_mode'),
       '#required' => TRUE,
@@ -107,7 +131,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = array();
 
-    $view_modes = \Drupal::entityManager()->getViewModeOptions($this->getFieldSetting('target_type'));
+    $view_modes = $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type'));
     $view_mode = $this->getSetting('view_mode');
     $summary[] = t('Rendered as @mode', array('@mode' => isset($view_modes[$view_mode]) ? $view_modes[$view_mode] : $view_mode));
 
@@ -131,7 +155,8 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       }
 
       if ($entity->id()) {
-        $elements[$delta] = entity_view($entity, $view_mode, $entity->language()->getId());
+        $view_builder = $this->entityTypeManager->getViewBuilder($entity->getEntityTypeId());
+        $elements[$delta] = $view_builder->view($entity, $view_mode, $entity->language()->getId());
 
         // Add a resource attribute to set the mapping property's value to the
         // entity's url. Since we don't know what the markup of the entity will
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
index a0f61b5..110d5ba 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampAgoFormatter.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Field\Plugin\Field\FieldFormatter;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -161,10 +162,12 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
         $updated = $this->formatTimestamp($item->value);
       }
       else {
-        $updated = $this->t('never');
+        $updated = [
+          '#markup' => $this->t('never'),
+        ];
       }
 
-      $elements[$delta] = array('#markup' => $updated);
+      $elements[$delta] = $updated;
     }
 
     return $elements;
@@ -176,19 +179,30 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
    * @param int $timestamp
    *   A UNIX timestamp to format.
    *
-   * @return string
+   * @return array
    *   The formatted timestamp string using the past or future format setting.
    */
   protected function formatTimestamp($timestamp) {
     $granularity = $this->getSetting('granularity');
-    $options = ['granularity' => $granularity];
+    $options = [
+      'granularity' => $granularity,
+      'return_as_object' => TRUE,
+    ];
 
     if ($this->request->server->get('REQUEST_TIME') > $timestamp) {
-      return SafeMarkup::format($this->getSetting('past_format'), ['@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, $options)]);
+      $result = $this->dateFormatter->formatTimeDiffSince($timestamp, $options);
+      $build = [
+        '#markup' => SafeMarkup::format($this->getSetting('past_format'), ['@interval' => $result->getString()]),
+      ];
     }
     else {
-      return SafeMarkup::format($this->getSetting('future_format'), ['@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, $options)]);
+      $result = $this->dateFormatter->formatTimeDiffUntil($timestamp, $options);
+      $build = [
+        '#markup' => SafeMarkup::format($this->getSetting('future_format'), ['@interval' => $result->getString()]),
+      ];
     }
+    CacheableMetadata::createFromObject($result)->applyTo($build);
+    return $build;
   }
 
 }
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
index b259606..623f24d 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
@@ -126,7 +126,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements['custom_date_format'] = array(
       '#type' => 'textfield',
       '#title' => $this->t('Custom date format'),
-      '#description' => $this->t('See <a href=":url" target="_blank">the documentation for PHP date formats</a>.', [':url' => 'http://php.net/manual/function.date.php']),
+      '#description' => $this->t('See <a href="http://php.net/manual/function.date.php" target="_blank">the documentation for PHP date formats</a>.'),
       '#default_value' => $this->getSetting('custom_date_format') ?: '',
     );
 
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
index 1f40b29..c8e608e 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
@@ -69,20 +69,21 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
     $element = array();
     $settings = $this->getSettings();
 
-    $range = range(10, 32);
     $element['precision'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Precision'),
-      '#options' => array_combine($range, $range),
+      '#min' => 10,
+      '#max' => 32,
       '#default_value' => $settings['precision'],
       '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
       '#disabled' => $has_data,
     );
-    $range = range(0, 10);
+
     $element['scale'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Scale', array(), array('context' => 'decimal places')),
-      '#options' => array_combine($range, $range),
+      '#min' => 0,
+      '#max' => 10,
       '#default_value' => $settings['scale'],
       '#description' => t('The number of digits to the right of the decimal.'),
       '#disabled' => $has_data,
@@ -152,7 +153,7 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
     $scale = rand($decimal_digits, $scale);
 
     // @see "Example #1 Calculate a random floating-point number" in
-    // http://php.net/manual/en/function.mt-getrandmax.php
+    // http://php.net/manual/function.mt-getrandmax.php
     $random_decimal = $min + mt_rand() / mt_getrandmax() * ($max - $min);
     $values['value'] = self::truncateDecimal($random_decimal, $scale);
     return $values;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 9ad1a9d..4c32351 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -413,7 +413,9 @@ public static function calculateDependencies(FieldDefinitionInterface $field_def
       }
     }
 
-    // Depend on target bundle configurations.
+    // Depend on target bundle configurations. Dependencies for 'target_bundles'
+    // also covers the 'auto_create_bundle' setting, if any, because its value
+    // is included in the 'target_bundles' list.
     $handler = $field_definition->getSetting('handler_settings');
     if (!empty($handler['target_bundles'])) {
       if ($bundle_entity_type_id = $target_entity_type->getBundleEntityType()) {
@@ -473,10 +475,19 @@ public static function onDependencyRemoval(FieldDefinitionInterface $field_defin
           foreach ($storage->loadMultiple($handler_settings['target_bundles']) as $bundle) {
             if (isset($dependencies[$bundle->getConfigDependencyKey()][$bundle->getConfigDependencyName()])) {
               unset($handler_settings['target_bundles'][$bundle->id()]);
+
+              // If this bundle is also used in the 'auto_create_bundle'
+              // setting, disable the auto-creation feature completely.
+              $auto_create_bundle = !empty($handler_settings['auto_create_bundle']) ? $handler_settings['auto_create_bundle'] : FALSE;
+              if ($auto_create_bundle && $auto_create_bundle == $bundle->id()) {
+                $handler_settings['auto_create'] = NULL;
+                $handler_settings['auto_create_bundle'] = NULL;
+              }
+
               $bundles_changed = TRUE;
 
               // In case we deleted the only target bundle allowed by the field
-              // we have to log a warning message because the field will not
+              // we have to log a critical message because the field will not
               // function correctly anymore.
               if ($handler_settings['target_bundles'] === []) {
                 \Drupal::logger('entity_reference')->critical('The %target_bundle bundle (entity type: %target_entity_type) was deleted. As a result, the %field_name entity reference field (entity_type: %entity_type, bundle: %bundle) no longer has any valid bundle it can reference. The field is not working correctly anymore and has to be adjusted.', [
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
index 34eebe9..9bc552d 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/FloatItem.php
@@ -72,7 +72,7 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
     $max = is_numeric($settings['max']) ?: pow(10, ($precision - $scale)) - 1;
     $min = is_numeric($settings['min']) ?: -pow(10, ($precision - $scale)) + 1;
     // @see "Example #1 Calculate a random floating-point number" in
-    // http://php.net/manual/en/function.mt-getrandmax.php
+    // http://php.net/manual/function.mt-getrandmax.php
     $random_decimal = $min + mt_rand() / mt_getrandmax() * ($max - $min);
     $values['value'] = self::truncateDecimal($random_decimal, $scale);
     return $values;
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 79eff67..667d013 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -106,9 +106,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#placeholder' => $this->getSetting('placeholder'),
     );
 
-    if ($this->getSelectionHandlerSetting('auto_create')) {
+    if ($this->getSelectionHandlerSetting('auto_create') && ($bundle = $this->getAutocreateBundle())) {
       $element['#autocreate'] = array(
-        'bundle' => $this->getAutocreateBundle(),
+        'bundle' => $bundle,
         'uid' => ($entity instanceof EntityOwnerInterface) ? $entity->getOwnerId() : \Drupal::currentUser()->id()
       );
     }
@@ -147,18 +147,20 @@ public function massageFormValues(array $values, array $form, FormStateInterface
    */
   protected function getAutocreateBundle() {
     $bundle = NULL;
-    if ($this->getSelectionHandlerSetting('auto_create')) {
-      // If the 'target_bundles' setting is restricted to a single choice, we
-      // can use that.
-      if (($target_bundles = $this->getSelectionHandlerSetting('target_bundles')) && count($target_bundles) == 1) {
+    if ($this->getSelectionHandlerSetting('auto_create') && $target_bundles = $this->getSelectionHandlerSetting('target_bundles')) {
+      // If there's only one target bundle, use it.
+      if (count($target_bundles) == 1) {
         $bundle = reset($target_bundles);
       }
-      // Otherwise use the first bundle as a fallback.
-      else {
-        // @todo Expose a proper UI for choosing the bundle for autocreated
-        // entities in https://www.drupal.org/node/2412569.
-        $bundles = entity_get_bundles($this->getFieldSetting('target_type'));
-        $bundle = key($bundles);
+      // Otherwise use the target bundle stored in selection handler settings.
+      elseif (!$bundle = $this->getSelectionHandlerSetting('auto_create_bundle')) {
+        // If no bundle has been set as auto create target means that there is
+        // an inconsistency in entity reference field settings.
+        trigger_error(sprintf(
+          "The 'Create referenced entities if they don't already exist' option is enabled but a specific destination bundle is not set. You should re-visit and fix the settings of the '%s' (%s) field.",
+          $this->fieldDefinition->getLabel(),
+          $this->fieldDefinition->getName()
+        ), E_USER_WARNING);
       }
     }
 
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
index 5c68a8f..b846988 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
@@ -37,7 +37,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element += array(
       '#type' => 'select',
       '#options' => $this->getOptions($items->getEntity()),
-      '#default_value' => $this->getSelectedOptions($items, $delta),
+      '#default_value' => $this->getSelectedOptions($items),
       // Do not display a 'multiple' select box if there is only one option.
       '#multiple' => $this->multiple && count($this->options) > 1,
     );
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
index 0235f3f..a902921 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
@@ -150,13 +150,11 @@ protected function getOptions(FieldableEntityInterface $entity) {
    *
    * @param \Drupal\Core\Field\FieldItemListInterface $items
    *   The field values.
-   * @param int $delta
-   *   (optional) The delta of the item to get options for. Defaults to 0.
    *
    * @return array
    *   The array of corresponding selected options.
    */
-  protected function getSelectedOptions(FieldItemListInterface $items, $delta = 0) {
+  protected function getSelectedOptions(FieldItemListInterface $items) {
     // We need to check against a flat list of options.
     $flat_options = OptGroup::flattenOptions($this->getOptions($items->getEntity()));
 
diff --git a/core/lib/Drupal/Core/Field/PluginSettingsBase.php b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
index c61d96f..aa66214 100644
--- a/core/lib/Drupal/Core/Field/PluginSettingsBase.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsBase.php
@@ -99,7 +99,7 @@ public function setSetting($key, $value) {
    */
   public function getThirdPartySettings($module = NULL) {
     if ($module) {
-      return isset($this->thirdPartySettings[$module]) ? $this->thirdPartySettings[$module] : NULL;
+      return isset($this->thirdPartySettings[$module]) ? $this->thirdPartySettings[$module] : [];
     }
     return $this->thirdPartySettings;
   }
diff --git a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
index 8ee2ac5..7297338 100644
--- a/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
+++ b/core/lib/Drupal/Core/Field/PluginSettingsInterface.php
@@ -12,6 +12,9 @@
 
 /**
  * Interface definition for plugin with settings.
+ *
+ * @deprecated in Drupal 8.1.0 and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\Component\Plugin\ConfigurablePluginInterface instead.
  */
 interface PluginSettingsInterface extends PluginInspectionInterface, ThirdPartySettingsInterface {
 
diff --git a/core/lib/Drupal/Core/Field/WidgetBase.php b/core/lib/Drupal/Core/Field/WidgetBase.php
index c99dee5..b50dfe8 100644
--- a/core/lib/Drupal/Core/Field/WidgetBase.php
+++ b/core/lib/Drupal/Core/Field/WidgetBase.php
@@ -567,4 +567,14 @@ protected function isDefaultValueWidget(FormStateInterface $form_state) {
     return (bool) $form_state->get('default_value_widget');
   }
 
+  /**
+   * Returns the filtered field description.
+   *
+   * @return \Drupal\Core\Field\FieldFilteredMarkup
+   *   The filtered field description, with tokens replaced.
+   */
+  protected function getFilteredDescription() {
+    return FieldFilteredMarkup::create(\Drupal::token()->replace($this->fieldDefinition->getDescription()));
+  }
+
 }
diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index ae75050..5de0e1e 100644
--- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -109,7 +109,7 @@ protected function sortGuessers() {
   }
 
   /**
-   * A helper function to register with Symfony's singleton mime type guesser.
+   * A helper function to register with Symfony's singleton MIME type guesser.
    *
    * Symfony's default mimetype guessers have dependencies on PHP's fileinfo
    * extension or being able to run the system command file. Drupal's guesser
diff --git a/core/lib/Drupal/Core/Flood/DatabaseBackend.php b/core/lib/Drupal/Core/Flood/DatabaseBackend.php
index 4fd4b2b..922ff97 100644
--- a/core/lib/Drupal/Core/Flood/DatabaseBackend.php
+++ b/core/lib/Drupal/Core/Flood/DatabaseBackend.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Flood;
 
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Drupal\Core\Database\Connection;
 
@@ -16,6 +17,11 @@
 class DatabaseBackend implements FloodInterface {
 
   /**
+   * The database table name.
+   */
+  const TABLE_NAME = 'flood';
+
+  /**
    * The database connection used to store flood event information.
    *
    * @var \Drupal\Core\Database\Connection
@@ -50,7 +56,35 @@ public function register($name, $window = 3600, $identifier = NULL) {
     if (!isset($identifier)) {
       $identifier = $this->requestStack->getCurrentRequest()->getClientIp();
     }
-    $this->connection->insert('flood')
+    $try_again = FALSE;
+    try {
+      $this->doInsert($name, $window, $identifier);
+    }
+    catch (\Exception $e) {
+      $try_again = $this->ensureTableExists();
+      if (!$try_again) {
+        throw $e;
+      }
+    }
+    if ($try_again) {
+      $this->doInsert($name, $window, $identifier);
+    }
+  }
+
+  /**
+   * Inserts an event into the flood table
+   *
+   * @param string $name
+   *   The name of an event.
+   * @param int $window
+   *   Number of seconds before this event expires.
+   * @param string $identifier
+   *   Unique identifier of the current user.
+   *
+   * @see \Drupal\Core\Flood\DatabaseBackend::register
+   */
+  protected function doInsert($name, $window, $identifier) {
+    $this->connection->insert(static::TABLE_NAME)
       ->fields(array(
         'event' => $name,
         'identifier' => $identifier,
@@ -67,10 +101,15 @@ public function clear($name, $identifier = NULL) {
     if (!isset($identifier)) {
       $identifier = $this->requestStack->getCurrentRequest()->getClientIp();
     }
-    $this->connection->delete('flood')
-      ->condition('event', $name)
-      ->condition('identifier', $identifier)
-      ->execute();
+    try {
+      $this->connection->delete(static::TABLE_NAME)
+        ->condition('event', $name)
+        ->condition('identifier', $identifier)
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
@@ -80,23 +119,120 @@ public function isAllowed($name, $threshold, $window = 3600, $identifier = NULL)
     if (!isset($identifier)) {
       $identifier = $this->requestStack->getCurrentRequest()->getClientIp();
     }
-    $number = $this->connection->select('flood', 'f')
-      ->condition('event', $name)
-      ->condition('identifier', $identifier)
-      ->condition('timestamp', REQUEST_TIME - $window, '>')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    return ($number < $threshold);
+    try {
+      $number = $this->connection->select(static::TABLE_NAME, 'f')
+        ->condition('event', $name)
+        ->condition('identifier', $identifier)
+        ->condition('timestamp', REQUEST_TIME - $window, '>')
+        ->countQuery()
+        ->execute()
+        ->fetchField();
+      return ($number < $threshold);
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return TRUE;
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function garbageCollection() {
-    return $this->connection->delete('flood')
-      ->condition('expiration', REQUEST_TIME, '<')
-      ->execute();
+    try {
+      $return = $this->connection->delete(static::TABLE_NAME)
+        ->condition('expiration', REQUEST_TIME, '<')
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
+  }
+
+  /**
+   * Check if the flood table exists and create it if not.
+   */
+  protected function ensureTableExists() {
+    try {
+      $database_schema = $this->connection->schema();
+      if (!$database_schema->tableExists(static::TABLE_NAME)) {
+        $schema_definition = $this->schemaDefinition();
+        $database_schema->createTable(static::TABLE_NAME, $schema_definition);
+        return TRUE;
+      }
+    }
+    // If another process has already created the table, attempting to create
+    // it will throw an exception. In this case just catch the exception and do
+    // nothing.
+    catch (SchemaObjectExistsException $e) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Act on an exception when flood might be stale.
+   *
+   * If the table does not yet exist, that's fine, but if the table exists and
+   * yet the query failed, then the flood is stale and the exception needs to
+   * propagate.
+   *
+   * @param $e
+   *   The exception.
+   *
+   * @throws \Exception
+   */
+  protected function catchException(\Exception $e) {
+    if ($this->connection->schema()->tableExists(static::TABLE_NAME)) {
+      throw $e;
+    }
+  }
+
+  /**
+   * Defines the schema for the flood table.
+   */
+  public function schemaDefinition() {
+    return [
+      'description' => 'Flood controls the threshold of events, such as the number of contact attempts.',
+      'fields' => [
+        'fid' => [
+          'description' => 'Unique flood event ID.',
+          'type' => 'serial',
+          'not null' => TRUE,
+        ],
+        'event' => [
+          'description' => 'Name of event (e.g. contact).',
+          'type' => 'varchar_ascii',
+          'length' => 64,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'identifier' => [
+          'description' => 'Identifier of the visitor, such as an IP address or hostname.',
+          'type' => 'varchar_ascii',
+          'length' => 128,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'timestamp' => [
+          'description' => 'Timestamp of the event.',
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+        ],
+        'expiration' => [
+          'description' => 'Expiration timestamp. Expired events are purged on cron run.',
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+        ],
+      ],
+      'primary key' => ['fid'],
+      'indexes' => [
+        'allow' => ['event', 'identifier', 'timestamp'],
+        'purge' => ['expiration'],
+      ],
+    ];
   }
 
 }
diff --git a/core/lib/Drupal/Core/Form/form.api.php b/core/lib/Drupal/Core/Form/form.api.php
index 19c2543..41d1441 100644
--- a/core/lib/Drupal/Core/Form/form.api.php
+++ b/core/lib/Drupal/Core/Form/form.api.php
@@ -18,7 +18,7 @@
  * @param $MULTIPLE_PARAMS
  *   Additional parameters specific to the batch. These are specified in the
  *   array passed to batch_set().
- * @param $context
+ * @param array|\ArrayAccess $context.
  *   The batch context array, passed by reference. This contains the following
  *   properties:
  *   - 'finished': A float number between 0 and 1 informing the processing
@@ -51,6 +51,8 @@
  *     all operations have finished, this is passed to callback_batch_finished()
  *     where results may be referenced to display information to the end-user,
  *     such as how many total items were processed.
+ *   It is discouraged to typehint this parameter as an array, to allow an
+ *   object implement \ArrayAccess to be passed.
  */
 function callback_batch_operation($MULTIPLE_PARAMS, &$context) {
   $node_storage = \Drupal::entityTypeManager()->getStorage('node');
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index 1bc0999..b6d3d7e 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -33,6 +33,13 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
   protected $logger;
 
   /**
+   * The image toolkit manager.
+   *
+   * @var \Drupal\Core\ImageToolkit\ImageToolkitManager
+   */
+  protected $toolkitManager;
+
+  /**
    * Constructs the ImageToolkitOperationManager object.
    *
    * @param \Traversable $namespaces
@@ -44,20 +51,23 @@ class ImageToolkitOperationManager extends DefaultPluginManager implements Image
    *   The module handler to invoke the alter hook with.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
+   * @param \Drupal\Core\ImageToolkit\ImageToolkitManager $toolkit_manager
+   *   The image toolkit manager.
    */
-  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LoggerInterface $logger) {
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, LoggerInterface $logger, ImageToolkitManager $toolkit_manager) {
     parent::__construct('Plugin/ImageToolkit/Operation', $namespaces, $module_handler, 'Drupal\Core\ImageToolkit\ImageToolkitOperationInterface', 'Drupal\Core\ImageToolkit\Annotation\ImageToolkitOperation');
 
     $this->alterInfo('image_toolkit_operation');
     $this->setCacheBackend($cache_backend, 'image_toolkit_operation_plugins');
     $this->logger = $logger;
+    $this->toolkitManager = $toolkit_manager;
   }
 
   /**
    * Returns the plugin ID for a given toolkit and operation.
    *
-   * @param string $toolkit_id
-   *   The toolkit plugin ID.
+   * @param \Drupal\Core\ImageToolkit\ImageToolkitInterface $toolkit
+   *   The toolkit instance.
    * @param string $operation
    *   The operation (e.g. "crop").
    *
@@ -67,7 +77,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    *   When no plugin is available.
    */
-  protected function getToolkitOperationPluginId($toolkit_id, $operation) {
+  protected function getToolkitOperationPluginId(ImageToolkitInterface $toolkit, $operation) {
+    $toolkit_id = $toolkit->getPluginId();
     $definitions = $this->getDefinitions();
 
     $definitions = array_filter($definitions,
@@ -77,6 +88,14 @@ function ($definition) use ($toolkit_id, $operation) {
     );
 
     if (!$definitions) {
+      // If this image toolkit plugin is a derivative and returns no operation,
+      // try once again with its base plugin.
+      $base_toolkit_id = $toolkit->getBaseId();
+      if (($toolkit_id != $base_toolkit_id) && !empty($base_toolkit_id)) {
+        $base_toolkit = $this->toolkitManager->createInstance($base_toolkit_id);
+        return $this->getToolkitOperationPluginId($base_toolkit, $operation);
+      }
+
       $message = SafeMarkup::format("No image operation plugin for '@toolkit' toolkit and '@operation' operation.", array('@toolkit' => $toolkit_id, '@operation' => $operation));
       throw new PluginNotFoundException($toolkit_id . '.' . $operation, $message);
     }
@@ -102,7 +121,7 @@ public function createInstance($plugin_id, array $configuration = array(), Image
    * {@inheritdoc}
    */
   public function getToolkitOperation(ImageToolkitInterface $toolkit, $operation) {
-    $plugin_id = $this->getToolkitOperationPluginId($toolkit->getPluginId(), $operation);
+    $plugin_id = $this->getToolkitOperationPluginId($toolkit, $operation);
     return $this->createInstance($plugin_id, array(), $toolkit);
   }
 
diff --git a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
index 4d0f9fe..11291eb 100644
--- a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
+++ b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\RendererInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -26,13 +27,21 @@ class SiteSettingsForm extends FormBase {
   protected $sitePath;
 
   /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
    * Constructs a new SiteSettingsForm.
    *
    * @param string $site_path
    *   The site path.
    */
-  public function __construct($site_path) {
+  public function __construct($site_path, RendererInterface $renderer) {
     $this->sitePath = $site_path;
+    $this->renderer = $renderer;
 }
 
   /**
@@ -40,7 +49,8 @@ public function __construct($site_path) {
     */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('site.path')
+      $container->get('site.path'),
+      $container->get('renderer')
     );
   }
 
@@ -153,13 +163,55 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
     $database['driver'] = $driver;
 
     $form_state->set('database', $database);
-    $errors = install_database_errors($database, $form_state->getValue('settings_file'));
-    foreach ($errors as $name => $message) {
+    foreach ($this->getDatabaseErrors($database, $form_state->getValue('settings_file')) as $name => $message) {
       $form_state->setErrorByName($name, $message);
     }
   }
 
   /**
+   * Get any database errors and links them to a form element.
+   *
+   * @param array $database
+   *   An array of database settings.
+   * @param string $settings_file
+   *   The settings file that contains the database settings.
+   *
+   * @return array
+   *   An array of form errors keyed by the element name and parents.
+   */
+  protected function getDatabaseErrors(array $database, $settings_file) {
+    $errors = install_database_errors($database, $settings_file);
+    $form_errors = array_filter($errors, function($value) {
+      // Errors keyed by something other than an integer already are linked to
+      // form elements.
+      return is_int($value);
+    });
+
+    // Find the generic errors.
+    $errors = array_diff_key($errors, $form_errors);
+
+    if (count($errors)) {
+      $error_message = [
+        '#type' => 'inline_template',
+        '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/getting-started/install">installation handbook</a>, or contact your hosting provider.{% endtrans%}{{ errors }}',
+        '#context' => [
+          'errors' => [
+            '#theme' => 'item_list',
+            '#items' => $errors,
+          ],
+        ],
+      ];
+
+      // These are generic errors, so we do not have any specific key of the
+      // database connection array to attach them to; therefore, we just put
+      // them in the error array with standard numeric keys.
+      $form_errors[$database['driver'] . '][0'] = $this->renderer->renderPlain($error_message);
+    }
+
+    return $form_errors;
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
diff --git a/core/lib/Drupal/Core/Language/LanguageManager.php b/core/lib/Drupal/Core/Language/LanguageManager.php
index d29b273..4f19f8a 100644
--- a/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -334,6 +334,28 @@ public static function getStandardLanguageList() {
   }
 
   /**
+   * The 6 official languages used at the United Nations.
+   *
+   * This list is based on
+   * http://www.un.org/en/sections/about-un/official-languages/index.html and it
+   * uses the same format as getStandardLanguageList().
+   *
+   * @return array
+   *   An array with language codes as keys, and English and native language
+   *   names as values.
+   */
+  public static function getUnitedNationsLanguageList() {
+    return [
+      'ar' => ['Arabic', /* Left-to-right marker "‭" */ 'العربية', LanguageInterface::DIRECTION_RTL],
+      'zh-hans' => ['Chinese, Simplified', '简体中文'],
+      'en' => ['English', 'English'],
+      'fr' => ['French', 'Français'],
+      'ru' => ['Russian', 'Русский'],
+      'es' => ['Spanish', 'Español'],
+    ];
+  }
+
+  /**
    * {@inheritdoc}
    *
    * This function is a noop since the configuration cannot be overridden by
diff --git a/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
index 267b6c1..e252f1d 100644
--- a/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
+++ b/core/lib/Drupal/Core/Lock/DatabaseLockBackend.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\IntegrityConstraintViolationException;
+use Drupal\Core\Database\SchemaObjectExistsException;
 
 /**
  * Defines the database lock backend. This is the default backend in Drupal.
@@ -18,6 +19,11 @@
 class DatabaseLockBackend extends LockBackendAbstract {
 
   /**
+   * The database table name.
+   */
+  const TABLE_NAME = 'semaphore';
+
+  /**
    * The database connection.
    *
    * @var \Drupal\Core\Database\Connection
@@ -84,6 +90,16 @@ public function acquire($name, $timeout = 30.0) {
           // the offending row from the database table in case it has expired.
           $retry = $retry ? FALSE : $this->lockMayBeAvailable($name);
         }
+        catch (\Exception $e) {
+          // Create the semaphore table if it does not exist and retry.
+          if ($this->ensureTableExists()) {
+            // Retry only once.
+            $retry = !$retry;
+          }
+          else {
+            throw $e;
+          }
+        }
         // We only retry in case the first attempt failed, but we then broke
         // an expired lock.
       } while ($retry);
@@ -95,7 +111,14 @@ public function acquire($name, $timeout = 30.0) {
    * {@inheritdoc}
    */
   public function lockMayBeAvailable($name) {
-    $lock = $this->database->query('SELECT expire, value FROM {semaphore} WHERE name = :name', array(':name' => $name))->fetchAssoc();
+    try {
+      $lock = $this->database->query('SELECT expire, value FROM {semaphore} WHERE name = :name', array(':name' => $name))->fetchAssoc();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      // If the table does not exist yet then the lock may be available.
+      $lock = FALSE;
+    }
     if (!$lock) {
       return TRUE;
     }
@@ -119,10 +142,15 @@ public function lockMayBeAvailable($name) {
    */
   public function release($name) {
     unset($this->locks[$name]);
-    $this->database->delete('semaphore')
-      ->condition('name', $name)
-      ->condition('value', $this->getLockId())
-      ->execute();
+    try {
+      $this->database->delete('semaphore')
+        ->condition('name', $name)
+        ->condition('value', $this->getLockId())
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
@@ -140,4 +168,80 @@ public function releaseAll($lock_id = NULL) {
         ->execute();
     }
   }
+
+  /**
+   * Check if the semaphore table exists and create it if not.
+   */
+  protected function ensureTableExists() {
+    try {
+      $database_schema = $this->database->schema();
+      if (!$database_schema->tableExists(static::TABLE_NAME)) {
+        $schema_definition = $this->schemaDefinition();
+        $database_schema->createTable(static::TABLE_NAME, $schema_definition);
+        return TRUE;
+      }
+    }
+    // If another process has already created the semaphore table, attempting to
+    // recreate it will throw an exception. In this case just catch the
+    // exception and do nothing.
+    catch (SchemaObjectExistsException $e) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Act on an exception when semaphore might be stale.
+   *
+   * If the table does not yet exist, that's fine, but if the table exists and
+   * yet the query failed, then the semaphore is stale and the exception needs
+   * to propagate.
+   *
+   * @param $e
+   *   The exception.
+   *
+   * @throws \Exception
+   */
+  protected function catchException(\Exception $e) {
+    if ($this->database->schema()->tableExists(static::TABLE_NAME)) {
+      throw $e;
+    }
+  }
+
+  /**
+   * Defines the schema for the semaphore table.
+   */
+  public function schemaDefinition() {
+    return [
+      'description' => 'Table for holding semaphores, locks, flags, etc. that cannot be stored as state since they must not be cached.',
+      'fields' => [
+        'name' => [
+          'description' => 'Primary Key: Unique name.',
+          'type' => 'varchar_ascii',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => ''
+        ],
+        'value' => [
+          'description' => 'A value for the semaphore.',
+          'type' => 'varchar_ascii',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => ''
+        ],
+        'expire' => [
+          'description' => 'A Unix timestamp with microseconds indicating when the semaphore should expire.',
+          'type' => 'float',
+          'size' => 'big',
+          'not null' => TRUE
+        ],
+      ],
+      'indexes' => [
+        'value' => ['value'],
+        'expire' => ['expire'],
+      ],
+      'primary key' => ['name'],
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Logger/LoggerChannel.php b/core/lib/Drupal/Core/Logger/LoggerChannel.php
index 8e0890c..0219cc4 100644
--- a/core/lib/Drupal/Core/Logger/LoggerChannel.php
+++ b/core/lib/Drupal/Core/Logger/LoggerChannel.php
@@ -20,6 +20,26 @@ class LoggerChannel implements LoggerChannelInterface {
   use LoggerTrait;
 
   /**
+   * Maximum call depth to self::log() for a single log message.
+   *
+   * It's very easy for logging channel code to call out to other library code
+   * that will create log messages. In that case, we will recurse back in to
+   * LoggerChannel::log() multiple times while processing a single originating
+   * message. To prevent infinite recursion, we track the call depth and bail
+   * out at LoggerChannel::MAX_CALL_DEPTH iterations.
+   *
+   * @var int
+   */
+  const MAX_CALL_DEPTH = 5;
+
+  /**
+   * Number of times LoggerChannel::log() has been called for a single message.
+   *
+   * @var int
+   */
+  protected $callDepth = 0;
+
+  /**
    * The name of the channel of this logger instance.
    *
    * @var string
@@ -77,6 +97,11 @@ public function __construct($channel) {
    * {@inheritdoc}
    */
   public function log($level, $message, array $context = array()) {
+    if ($this->callDepth == self::MAX_CALL_DEPTH) {
+      return;
+    }
+    $this->callDepth++;
+
     // Merge in defaults.
     $context += array(
       'channel' => $this->channel,
@@ -115,6 +140,8 @@ public function log($level, $message, array $context = array()) {
     foreach ($this->sortLoggers() as $logger) {
       $logger->log($level, $message, $context);
     }
+
+    $this->callDepth--;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index 9dcb582..c939565 100644
--- a/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -53,7 +53,7 @@ public function format(array $message) {
    * @return bool
    *   TRUE if the mail was successfully accepted, otherwise FALSE.
    *
-   * @see http://php.net/manual/en/function.mail.php
+   * @see http://php.net/manual/function.mail.php
    * @see \Drupal\Core\Mail\MailManagerInterface::mail()
    */
   public function mail(array $message) {
diff --git a/core/lib/Drupal/Core/Menu/LocalActionDefault.php b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
index 4b72af4..d30ec91 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionDefault.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionDefault.php
@@ -8,6 +8,8 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -18,7 +20,7 @@
 /**
  * Provides a default implementation for local action plugins.
  */
-class LocalActionDefault extends PluginBase implements LocalActionInterface, ContainerFactoryPluginInterface {
+class LocalActionDefault extends PluginBase implements LocalActionInterface, ContainerFactoryPluginInterface, CacheableDependencyInterface {
 
   use DependencySerializationTrait;
 
@@ -122,4 +124,34 @@ public function getOptions(RouteMatchInterface $route_match) {
     return (array) $this->pluginDefinition['options'];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    if (!isset($this->pluginDefinition['cache_tags'])) {
+      return [];
+    }
+    return $this->pluginDefinition['cache_tags'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    if (!isset($this->pluginDefinition['cache_contexts'])) {
+      return [];
+    }
+    return $this->pluginDefinition['cache_contexts'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    if (!isset($this->pluginDefinition['cache_max_age'])) {
+      return Cache::PERMANENT;
+    }
+    return $this->pluginDefinition['cache_max_age'];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Menu/LocalActionManager.php b/core/lib/Drupal/Core/Menu/LocalActionManager.php
index f98e60e..85c834a8 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionManager.php
@@ -8,8 +8,6 @@
 namespace Drupal\Core\Menu;
 
 use Drupal\Core\Access\AccessManagerInterface;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -199,16 +197,7 @@ public function getActionsForRoute($route_appears) {
         '#access' => $access,
         '#weight' => $plugin->getWeight(),
       );
-      $cacheability->addCacheableDependency($access);
-      // For backward compatibility in 8.0.x, plugins that do not implement
-      // the \Drupal\Core\Cache\CacheableDependencyInterface are assumed
-      // to be cacheable forever.
-      if ($plugin instanceof CacheableDependencyInterface) {
-        $cacheability->addCacheableDependency($plugin);
-      }
-      else {
-        $cacheability->setCacheMaxAge(Cache::PERMANENT);
-      }
+      $cacheability->addCacheableDependency($access)->addCacheableDependency($plugin);
       $cacheability->applyTo($links[$plugin_id]);
     }
     $links['#cache']['contexts'][] = 'route';
diff --git a/core/lib/Drupal/Core/Menu/LocalActionManagerInterface.php b/core/lib/Drupal/Core/Menu/LocalActionManagerInterface.php
index 5033485..af8aff8 100644
--- a/core/lib/Drupal/Core/Menu/LocalActionManagerInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalActionManagerInterface.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Core\Menu\LocalActionManagerInterface.
  */
+
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManagerInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskManagerInterface.php
index a9dec80..8f87f89 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManagerInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManagerInterface.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Core\Menu\LocalTaskManagerInterface.
  */
+
 namespace Drupal\Core\Menu;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
diff --git a/core/lib/Drupal/Core/ParamConverter/EntityRevisionParamConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityRevisionParamConverter.php
new file mode 100644
index 0000000..d244132
--- /dev/null
+++ b/core/lib/Drupal/Core/ParamConverter/EntityRevisionParamConverter.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\ParamConverter\EntityRevisionParamConverter.
+ */
+
+namespace Drupal\Core\ParamConverter;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Parameter converter for upcasting entity revision IDs to full objects.
+ *
+ * This is useful for pages which want to show a specific revision, like
+ * "/entity_example/{entity_example}/revision/{entity_example_revision}".
+ *
+ *
+ * In order to use it you should specify some additional options in your route:
+ * @code
+ * example.route:
+ *   path: /foo/{entity_example_revision}
+ *   options:
+ *     parameters:
+ *       entity_example_revision:
+ *         type: entity_revision:entity_example
+ * @endcode
+ */
+class EntityRevisionParamConverter implements ParamConverterInterface {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Creates a new EntityRevisionParamConverter instance.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function convert($value, $definition, $name, array $defaults) {
+    list (, $entity_type_id) = explode(':', $definition['type'], 2);
+    $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
+    return $entity_storage->loadRevision($value);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies($definition, $name, Route $route) {
+    return isset($definition['type']) && strpos($definition['type'], 'entity_revision:') !== FALSE;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Path/AliasStorage.php b/core/lib/Drupal/Core/Path/AliasStorage.php
index 8caae97..d66407e 100644
--- a/core/lib/Drupal/Core/Path/AliasStorage.php
+++ b/core/lib/Drupal/Core/Path/AliasStorage.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Database\Query\Condition;
@@ -21,6 +22,12 @@
  * the same, and will both refer to the same internal system path.
  */
 class AliasStorage implements AliasStorageInterface {
+
+  /**
+   * The table for the url_alias storage.
+   */
+  const TABLE = 'url_alias';
+
   /**
    * The database connection.
    *
@@ -70,18 +77,43 @@ public function save($source, $alias, $langcode = LanguageInterface::LANGCODE_NO
 
     // Insert or update the alias.
     if (empty($pid)) {
-      $query = $this->connection->insert('url_alias')
-        ->fields($fields);
-      $pid = $query->execute();
+      $try_again = FALSE;
+      try {
+        $query = $this->connection->insert(static::TABLE)
+          ->fields($fields);
+        $pid = $query->execute();
+      }
+      catch (\Exception $e) {
+        // If there was an exception, try to create the table.
+        if (!$try_again = $this->ensureTableExists()) {
+          // If the exception happened for other reason than the missing table,
+          // propagate the exception.
+          throw $e;
+        }
+      }
+      // Now that the table has been created, try again if necessary.
+      if ($try_again) {
+        $query = $this->connection->insert(static::TABLE)
+          ->fields($fields);
+        $pid = $query->execute();
+      }
+
       $fields['pid'] = $pid;
       $operation = 'insert';
     }
     else {
       // Fetch the current values so that an update hook can identify what
       // exactly changed.
-      $original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid))->fetchAssoc();
+      try {
+        $original = $this->connection->query('SELECT source, alias, langcode FROM {url_alias} WHERE pid = :pid', array(':pid' => $pid))
+          ->fetchAssoc();
+      }
+      catch (\Exception $e) {
+        $this->catchException($e);
+        $original = FALSE;
+      }
       $fields['pid'] = $pid;
-      $query = $this->connection->update('url_alias')
+      $query = $this->connection->update(static::TABLE)
         ->fields($fields)
         ->condition('pid', $pid);
       $pid = $query->execute();
@@ -101,7 +133,7 @@ public function save($source, $alias, $langcode = LanguageInterface::LANGCODE_NO
    * {@inheritdoc}
    */
   public function load($conditions) {
-    $select = $this->connection->select('url_alias');
+    $select = $this->connection->select(static::TABLE);
     foreach ($conditions as $field => $value) {
       if ($field == 'source' || $field == 'alias') {
         // Use LIKE for case-insensitive matching.
@@ -111,12 +143,18 @@ public function load($conditions) {
         $select->condition($field, $value);
       }
     }
-    return $select
-      ->fields('url_alias')
-      ->orderBy('pid', 'DESC')
-      ->range(0, 1)
-      ->execute()
-      ->fetchAssoc();
+    try {
+      return $select
+        ->fields(static::TABLE)
+        ->orderBy('pid', 'DESC')
+        ->range(0, 1)
+        ->execute()
+        ->fetchAssoc();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
@@ -124,7 +162,7 @@ public function load($conditions) {
    */
   public function delete($conditions) {
     $path = $this->load($conditions);
-    $query = $this->connection->delete('url_alias');
+    $query = $this->connection->delete(static::TABLE);
     foreach ($conditions as $field => $value) {
       if ($field == 'source' || $field == 'alias') {
         // Use LIKE for case-insensitive matching.
@@ -134,7 +172,13 @@ public function delete($conditions) {
         $query->condition($field, $value);
       }
     }
-    $deleted = $query->execute();
+    try {
+      $deleted = $query->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      $deleted = FALSE;
+    }
     // @todo Switch to using an event for this instead of a hook.
     $this->moduleHandler->invokeAll('path_delete', array($path));
     Cache::invalidateTags(['route_match']);
@@ -146,8 +190,8 @@ public function delete($conditions) {
    */
   public function preloadPathAlias($preloaded, $langcode) {
     $langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
-    $select = $this->connection->select('url_alias')
-      ->fields('url_alias', ['source', 'alias']);
+    $select = $this->connection->select(static::TABLE)
+      ->fields(static::TABLE, ['source', 'alias']);
 
     if (!empty($preloaded)) {
       $conditions = new Condition('OR');
@@ -175,7 +219,13 @@ public function preloadPathAlias($preloaded, $langcode) {
 
     $select->orderBy('pid', 'ASC');
     $select->condition('langcode', $langcode_list, 'IN');
-    return $select->execute()->fetchAllKeyed();
+    try {
+      return $select->execute()->fetchAllKeyed();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
@@ -186,8 +236,8 @@ public function lookupPathAlias($path, $langcode) {
     $langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
 
     // See the queries above. Use LIKE for case-insensitive matching.
-    $select = $this->connection->select('url_alias')
-      ->fields('url_alias', ['alias'])
+    $select = $this->connection->select(static::TABLE)
+      ->fields(static::TABLE, ['alias'])
       ->condition('source', $source, 'LIKE');
     if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
       array_pop($langcode_list);
@@ -201,7 +251,13 @@ public function lookupPathAlias($path, $langcode) {
 
     $select->orderBy('pid', 'DESC');
     $select->condition('langcode', $langcode_list, 'IN');
-    return $select->execute()->fetchField();
+    try {
+      return $select->execute()->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
@@ -212,8 +268,8 @@ public function lookupPathSource($path, $langcode) {
     $langcode_list = [$langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED];
 
     // See the queries above. Use LIKE for case-insensitive matching.
-    $select = $this->connection->select('url_alias')
-      ->fields('url_alias', ['source'])
+    $select = $this->connection->select(static::TABLE)
+      ->fields(static::TABLE, ['source'])
       ->condition('alias', $alias, 'LIKE');
     if ($langcode == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
       array_pop($langcode_list);
@@ -227,7 +283,13 @@ public function lookupPathSource($path, $langcode) {
 
     $select->orderBy('pid', 'DESC');
     $select->condition('langcode', $langcode_list, 'IN');
-    return $select->execute()->fetchField();
+    try {
+      return $select->execute()->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
@@ -235,7 +297,7 @@ public function lookupPathSource($path, $langcode) {
    */
   public function aliasExists($alias, $langcode, $source = NULL) {
     // Use LIKE and NOT LIKE for case-insensitive matching.
-    $query = $this->connection->select('url_alias')
+    $query = $this->connection->select(static::TABLE)
       ->condition('alias', $this->connection->escapeLike($alias), 'LIKE')
       ->condition('langcode', $langcode);
     if (!empty($source)) {
@@ -243,45 +305,152 @@ public function aliasExists($alias, $langcode, $source = NULL) {
     }
     $query->addExpression('1');
     $query->range(0, 1);
-    return (bool) $query->execute()->fetchField();
+    try {
+      return (bool) $query->execute()->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function languageAliasExists() {
-    return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))->fetchField();
+    try {
+      return (bool) $this->connection->queryRange('SELECT 1 FROM {url_alias} WHERE langcode <> :langcode', 0, 1, array(':langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED))->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function getAliasesForAdminListing($header, $keys = NULL) {
-    $query = $this->connection->select('url_alias')
+    $query = $this->connection->select(static::TABLE)
       ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
       ->extend('Drupal\Core\Database\Query\TableSortExtender');
     if ($keys) {
       // Replace wildcards with PDO wildcards.
       $query->condition('alias', '%' . preg_replace('!\*+!', '%', $keys) . '%', 'LIKE');
     }
-    return $query
-      ->fields('url_alias')
-      ->orderByHeader($header)
-      ->limit(50)
-      ->execute()
-      ->fetchAll();
+    try {
+      return $query
+        ->fields(static::TABLE)
+        ->orderByHeader($header)
+        ->limit(50)
+        ->execute()
+        ->fetchAll();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return [];
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function pathHasMatchingAlias($initial_substring) {
-    $query = $this->connection->select('url_alias', 'u');
+    $query = $this->connection->select(static::TABLE, 'u');
     $query->addExpression(1);
-    return (bool) $query
-      ->condition('u.source', $this->connection->escapeLike($initial_substring) . '%', 'LIKE')
-      ->range(0, 1)
-      ->execute()
-      ->fetchField();
+    try {
+      return (bool) $query
+        ->condition('u.source', $this->connection->escapeLike($initial_substring) . '%', 'LIKE')
+        ->range(0, 1)
+        ->execute()
+        ->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      return FALSE;
+    }
   }
+
+  /**
+   * Check if the table exists and create it if not.
+   */
+  protected function ensureTableExists() {
+    try {
+      $database_schema = $this->connection->schema();
+      if (!$database_schema->tableExists(static::TABLE)) {
+        $schema_definition = $this->schemaDefinition();
+        $database_schema->createTable(static::TABLE, $schema_definition);
+        return TRUE;
+      }
+    }
+    // If another process has already created the table, attempting to recreate
+    // it will throw an exception. In this case just catch the exception and do
+    // nothing.
+    catch (SchemaObjectExistsException $e) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Act on an exception when url_alias might be stale.
+   *
+   * If the table does not yet exist, that's fine, but if the table exists and
+   * yet the query failed, then the url_alias is stale and the exception needs
+   * to propagate.
+   *
+   * @param $e
+   *   The exception.
+   *
+   * @throws \Exception
+   */
+  protected function catchException(\Exception $e) {
+    if ($this->connection->schema()->tableExists(static::TABLE)) {
+      throw $e;
+    }
+  }
+
+  /**
+   * Defines the schema for the {url_alias} table.
+   */
+  public static function schemaDefinition() {
+    return [
+      'description' => 'A list of URL aliases for Drupal paths; a user may visit either the source or destination path.',
+      'fields' => [
+        'pid' => [
+          'description' => 'A unique path alias identifier.',
+          'type' => 'serial',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+        ],
+        'source' => [
+          'description' => 'The Drupal path this alias is for; e.g. node/12.',
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'alias' => [
+          'description' => 'The alias for this path; e.g. title-of-the-story.',
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'langcode' => [
+          'description' => "The language code this alias is for; if 'und', the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.",
+          'type' => 'varchar_ascii',
+          'length' => 12,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+      ],
+      'primary key' => ['pid'],
+      'indexes' => [
+        'alias_langcode_pid' => ['alias', 'langcode', 'pid'],
+        'source_langcode_pid' => ['source', 'langcode', 'pid'],
+      ],
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
index 5ca0971..575e660 100644
--- a/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
+++ b/core/lib/Drupal/Core/PhpStorage/PhpStorageFactory.php
@@ -34,6 +34,7 @@ class PhpStorageFactory {
    *   An instantiated storage for the specified name.
    */
   static function get($name) {
+    $configuration = array();
     $overrides = Settings::get('php_storage');
     if (isset($overrides[$name])) {
       $configuration = $overrides[$name];
@@ -41,13 +42,11 @@ static function get($name) {
     elseif (isset($overrides['default'])) {
       $configuration = $overrides['default'];
     }
-    else {
-      $configuration = array(
-        'class' => 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage',
-        'secret' => Settings::getHashSalt(),
-      );
-    }
+    // Make sure all the necessary configuration values are set.
     $class = isset($configuration['class']) ? $configuration['class'] : 'Drupal\Component\PhpStorage\MTimeProtectedFileStorage';
+    if (!isset($configuration['secret'])) {
+      $configuration['secret'] = Settings::getHashSalt();
+    }
     if (!isset($configuration['bin'])) {
       $configuration['bin'] = $name;
     }
diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index 26b7161..5e8d89f 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -42,7 +42,7 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
    *
    * @var array
    */
-  protected $cacheTags = array();
+  protected $cacheTags = [];
 
   /**
    * Name of the alter hook if one should be invoked.
@@ -73,7 +73,7 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
    *
    * @var array
    */
-  protected $defaults = array();
+  protected $defaults = [];
 
   /**
    * The name of the annotation that contains the plugin definition.
@@ -98,6 +98,14 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   protected $namespaces;
 
   /**
+   * Additional namespaces the annotation discovery mechanism should scan for
+   * annotation definitions.
+   *
+   * @var string[]
+   */
+  protected $additionalAnnotationNamespaces = [];
+
+  /**
    * Creates the discovery object.
    *
    * @param string|bool $subdir
@@ -112,13 +120,16 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
    * @param string $plugin_definition_annotation_name
    *   (optional) The name of the annotation that contains the plugin definition.
    *   Defaults to 'Drupal\Component\Annotation\Plugin'.
+   * @param string[] $additional_annotation_namespaces
+   *   (optional) Additional namespaces to scan for annotation definitions.
    */
-  public function __construct($subdir, \Traversable $namespaces, ModuleHandlerInterface $module_handler, $plugin_interface = NULL, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') {
+  public function __construct($subdir, \Traversable $namespaces, ModuleHandlerInterface $module_handler, $plugin_interface = NULL, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $additional_annotation_namespaces = []) {
     $this->subdir = $subdir;
     $this->namespaces = $namespaces;
     $this->pluginDefinitionAnnotationName = $plugin_definition_annotation_name;
     $this->pluginInterface = $plugin_interface;
     $this->moduleHandler = $module_handler;
+    $this->additionalAnnotationNamespaces = $additional_annotation_namespaces;
   }
 
   /**
@@ -242,7 +253,7 @@ public function processDefinition(&$definition, $plugin_id) {
    */
   protected function getDiscovery() {
     if (!$this->discovery) {
-      $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName);
+      $discovery = new AnnotatedClassDiscovery($this->subdir, $this->namespaces, $this->pluginDefinitionAnnotationName, $this->additionalAnnotationNamespaces);
       $this->discovery = new ContainerDerivativeDiscoveryDecorator($discovery);
     }
     return $this->discovery;
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 8cb4888..d0de724 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -52,8 +52,10 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
    * @param string $plugin_definition_annotation_name
    *   (optional) The name of the annotation that contains the plugin definition.
    *   Defaults to 'Drupal\Component\Annotation\Plugin'.
+   * @param string[] $annotation_namespaces
+   *   (optional) Additional namespaces to scan for annotation definitions.
    */
-  function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin') {
+  function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_annotation_name = 'Drupal\Component\Annotation\Plugin', array $annotation_namespaces = []) {
     if ($subdir) {
       // Prepend a directory separator to $subdir,
       // if it does not already have one.
@@ -65,7 +67,7 @@ function __construct($subdir, \Traversable $root_namespaces, $plugin_definition_
     }
     $this->rootNamespacesIterator = $root_namespaces;
     $plugin_namespaces = array();
-    parent::__construct($plugin_namespaces, $plugin_definition_annotation_name);
+    parent::__construct($plugin_namespaces, $plugin_definition_annotation_name, $annotation_namespaces);
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Plugin/Discovery/YamlDirectoryDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/YamlDirectoryDiscovery.php
new file mode 100644
index 0000000..2a5c1f6
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/Discovery/YamlDirectoryDiscovery.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\Discovery\YamlDiscovery.
+ */
+
+namespace Drupal\Core\Plugin\Discovery;
+
+use Drupal\Component\Discovery\YamlDirectoryDiscovery as ComponentYamlDirectoryDiscovery;
+
+/**
+ * Allows multiple YAML files per directory to define plugin definitions.
+ */
+class YamlDirectoryDiscovery extends YamlDiscovery {
+
+  /**
+   * Constructs a YamlDirectoryDiscovery object.
+   *
+   * @param array $directories
+   *   An array of directories to scan, keyed by the provider. The value can
+   *   either be a string or an array of strings. The string values should be
+   *   the path of a directory to scan.
+   * @param string $file_cache_key_suffix
+   *   The file cache key suffix. This should be unique for each type of
+   *   discovery.
+   * @param string $key
+   *   (optional) The key contained in the discovered data that identifies it.
+   *   Defaults to 'id'.
+   */
+  public function __construct(array $directories, $file_cache_key_suffix, $key = 'id') {
+    // Intentionally does not call parent constructor as this class uses a
+    // different YAML discovery.
+    $this->discovery = new ComponentYamlDirectoryDiscovery($directories, $file_cache_key_suffix, $key);
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Plugin/ObjectWithPluginCollectionInterface.php b/core/lib/Drupal/Core/Plugin/ObjectWithPluginCollectionInterface.php
new file mode 100644
index 0000000..9d091d1
--- /dev/null
+++ b/core/lib/Drupal/Core/Plugin/ObjectWithPluginCollectionInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Plugin\ObjectWithPluginCollectionInterface.
+ */
+
+namespace Drupal\Core\Plugin;
+
+/**
+ * Provides an interface for an object using a plugin collection.
+ *
+ * @see \Drupal\Component\Plugin\LazyPluginCollection
+ *
+ * @ingroup plugin_api
+ *
+ * Entities that need this interface should implement
+ * \Drupal\Core\Entity\EntityWithPluginCollectionInterface, which extends this.
+ */
+interface ObjectWithPluginCollectionInterface {
+
+  /**
+   * Gets the plugin collections used by this entity.
+   *
+   * @return \Drupal\Component\Plugin\LazyPluginCollection[]
+   *   An array of plugin collections, keyed by the property name they use to
+   *   store their configuration.
+   */
+  public function getPluginCollections();
+
+}
diff --git a/core/lib/Drupal/Core/Queue/Batch.php b/core/lib/Drupal/Core/Queue/Batch.php
index 2d172d9..631f984 100644
--- a/core/lib/Drupal/Core/Queue/Batch.php
+++ b/core/lib/Drupal/Core/Queue/Batch.php
@@ -30,10 +30,15 @@ class Batch extends DatabaseQueue {
    * item to be claimed repeatedly until it is deleted.
    */
   public function claimItem($lease_time = 0) {
-    $item = $this->connection->queryRange('SELECT data, item_id FROM {queue} q WHERE name = :name ORDER BY item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
-    if ($item) {
-      $item->data = unserialize($item->data);
-      return $item;
+    try {
+      $item = $this->connection->queryRange('SELECT data, item_id FROM {queue} q WHERE name = :name ORDER BY item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+      if ($item) {
+        $item->data = unserialize($item->data);
+        return $item;
+      }
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
     }
     return FALSE;
   }
@@ -49,9 +54,14 @@ public function claimItem($lease_time = 0) {
    */
   public function getAllItems() {
     $result = array();
-    $items = $this->connection->query('SELECT data FROM {queue} q WHERE name = :name ORDER BY item_id ASC', array(':name' => $this->name))->fetchAll();
-    foreach ($items as $item) {
-      $result[] = unserialize($item->data);
+    try {
+      $items = $this->connection->query('SELECT data FROM {queue} q WHERE name = :name ORDER BY item_id ASC', array(':name' => $this->name))->fetchAll();
+      foreach ($items as $item) {
+        $result[] = unserialize($item->data);
+      }
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
     }
     return $result;
   }
diff --git a/core/lib/Drupal/Core/Queue/DatabaseQueue.php b/core/lib/Drupal/Core/Queue/DatabaseQueue.php
index 9a9573b..78cabe8 100644
--- a/core/lib/Drupal/Core/Queue/DatabaseQueue.php
+++ b/core/lib/Drupal/Core/Queue/DatabaseQueue.php
@@ -8,6 +8,7 @@
 namespace Drupal\Core\Queue;
 
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 
 /**
@@ -15,11 +16,16 @@
  *
  * @ingroup queue
  */
-class DatabaseQueue implements ReliableQueueInterface {
+class DatabaseQueue implements ReliableQueueInterface, QueueGarbageCollectionInterface {
 
   use DependencySerializationTrait;
 
   /**
+   * The database table name.
+   */
+  const TABLE_NAME = 'queue';
+
+  /**
    * The name of the queue this instance is working with.
    *
    * @var string
@@ -50,7 +56,39 @@ function __construct($name, Connection $connection) {
    * {@inheritdoc}
    */
   public function createItem($data) {
-    $query = $this->connection->insert('queue')
+    $try_again = FALSE;
+    try {
+      $id = $this->doCreateItem($data);
+    }
+    catch (\Exception $e) {
+      // If there was an exception, try to create the table.
+      if (!$try_again = $this->ensureTableExists()) {
+        // If the exception happened for other reason than the missing table,
+        // propagate the exception.
+        throw $e;
+      }
+    }
+    // Now that the table has been created, try again if necessary.
+    if ($try_again) {
+      $id = $this->doCreateItem($data);
+    }
+    return $id;
+  }
+
+  /**
+   * Adds a queue item and store it directly to the queue.
+   *
+   * @param $data
+   *   Arbitrary data to be associated with the new task in the queue.
+   *
+   * @return
+   *   A unique ID if the item was successfully created and was (best effort)
+   *   added to the queue, otherwise FALSE. We don't guarantee the item was
+   *   committed to disk etc, but as far as we know, the item is now in the
+   *   queue.
+   */
+  protected function doCreateItem($data) {
+    $query = $this->connection->insert(static::TABLE_NAME)
       ->fields(array(
         'name' => $this->name,
         'data' => serialize($data),
@@ -66,7 +104,15 @@ public function createItem($data) {
    * {@inheritdoc}
    */
   public function numberOfItems() {
-    return $this->connection->query('SELECT COUNT(item_id) FROM {queue} WHERE name = :name', array(':name' => $this->name))->fetchField();
+    try {
+      return $this->connection->query('SELECT COUNT(item_id) FROM {' . static::TABLE_NAME . '} WHERE name = :name', array(':name' => $this->name))
+        ->fetchField();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      // If there is no table there cannot be any items.
+      return 0;
+    }
   }
 
   /**
@@ -78,7 +124,15 @@ public function claimItem($lease_time = 30) {
     // until an item is successfully claimed or we are reasonably sure there
     // are no unclaimed items left.
     while (TRUE) {
-      $item = $this->connection->queryRange('SELECT data, created, item_id FROM {queue} q WHERE expire = 0 AND name = :name ORDER BY created, item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+      try {
+        $item = $this->connection->queryRange('SELECT data, created, item_id FROM {' . static::TABLE_NAME . '} q WHERE expire = 0 AND name = :name ORDER BY created, item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
+      }
+      catch (\Exception $e) {
+        $this->catchException($e);
+        // If the table does not exist there are no items currently available to
+        // claim.
+        return FALSE;
+      }
       if ($item) {
         // Try to update the item. Only one thread can succeed in UPDATEing the
         // same row. We cannot rely on REQUEST_TIME because items might be
@@ -86,7 +140,7 @@ public function claimItem($lease_time = 30) {
         // continue to use REQUEST_TIME instead of the current time(), we steal
         // time from the lease, and will tend to reset items before the lease
         // should really expire.
-        $update = $this->connection->update('queue')
+        $update = $this->connection->update(static::TABLE_NAME)
           ->fields(array(
             'expire' => time() + $lease_time,
           ))
@@ -109,38 +163,169 @@ public function claimItem($lease_time = 30) {
    * {@inheritdoc}
    */
   public function releaseItem($item) {
-    $update = $this->connection->update('queue')
-      ->fields(array(
-        'expire' => 0,
-      ))
-      ->condition('item_id', $item->item_id);
+    try {
+      $update = $this->connection->update(static::TABLE_NAME)
+        ->fields(array(
+          'expire' => 0,
+        ))
+        ->condition('item_id', $item->item_id);
       return $update->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+      // If the table doesn't exist we should consider the item released.
+      return TRUE;
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function deleteItem($item) {
-    $this->connection->delete('queue')
-      ->condition('item_id', $item->item_id)
-      ->execute();
+    try {
+      $this->connection->delete(static::TABLE_NAME)
+        ->condition('item_id', $item->item_id)
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function createQueue() {
-    // All tasks are stored in a single database table (which is created when
-    // Drupal is first installed) so there is nothing we need to do to create
-    // a new queue.
+    // All tasks are stored in a single database table (which is created on
+    // demand) so there is nothing we need to do to create a new queue.
   }
 
   /**
    * {@inheritdoc}
    */
   public function deleteQueue() {
-    $this->connection->delete('queue')
-      ->condition('name', $this->name)
-      ->execute();
+    try {
+      $this->connection->delete(static::TABLE_NAME)
+        ->condition('name', $this->name)
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
   }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function garbageCollection() {
+    try {
+      // Clean up the queue for failed batches.
+      $this->connection->delete(static::TABLE_NAME)
+        ->condition('created', REQUEST_TIME - 864000, '<')
+        ->condition('name', 'drupal_batch:%', 'LIKE')
+        ->execute();
+
+      // Reset expired items in the default queue implementation table. If that's
+      // not used, this will simply be a no-op.
+      $this->connection->update(static::TABLE_NAME)
+        ->fields(array(
+          'expire' => 0,
+        ))
+        ->condition('expire', 0, '<>')
+        ->condition('expire', REQUEST_TIME, '<')
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->catchException($e);
+    }
+  }
+
+  /**
+   * Check if the table exists and create it if not.
+   */
+  protected function ensureTableExists() {
+    try {
+      $database_schema = $this->connection->schema();
+      if (!$database_schema->tableExists(static::TABLE_NAME)) {
+        $schema_definition = $this->schemaDefinition();
+        $database_schema->createTable(static::TABLE_NAME, $schema_definition);
+        return TRUE;
+      }
+    }
+    // If another process has already created the queue table, attempting to
+    // recreate it will throw an exception. In this case just catch the
+    // exception and do nothing.
+    catch (SchemaObjectExistsException $e) {
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Act on an exception when queue might be stale.
+   *
+   * If the table does not yet exist, that's fine, but if the table exists and
+   * yet the query failed, then the queue is stale and the exception needs to
+   * propagate.
+   *
+   * @param $e
+   *   The exception.
+   *
+   * @throws \Exception
+   *   If the table exists the exception passed in is rethrown.
+   */
+  protected function catchException(\Exception $e) {
+    if ($this->connection->schema()->tableExists(static::TABLE_NAME)) {
+      throw $e;
+    }
+  }
+
+  /**
+   * Defines the schema for the queue table.
+   */
+  public function schemaDefinition() {
+    return [
+      'description' => 'Stores items in queues.',
+      'fields' => [
+        'item_id' => [
+          'type' => 'serial',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+          'description' => 'Primary Key: Unique item ID.',
+        ],
+        'name' => [
+          'type' => 'varchar_ascii',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+          'description' => 'The queue name.',
+        ],
+        'data' => [
+          'type' => 'blob',
+          'not null' => FALSE,
+          'size' => 'big',
+          'serialize' => TRUE,
+          'description' => 'The arbitrary data for the item.',
+        ],
+        'expire' => [
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+          'description' => 'Timestamp when the claim lease expires on the item.',
+        ],
+        'created' => [
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+          'description' => 'Timestamp when the item was created.',
+        ],
+      ],
+      'primary key' => ['item_id'],
+      'indexes' => [
+        'name_created' => ['name', 'created'],
+        'expire' => ['expire'],
+      ],
+    ];
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Queue/QueueGarbageCollectionInterface.php b/core/lib/Drupal/Core/Queue/QueueGarbageCollectionInterface.php
new file mode 100644
index 0000000..63d440a
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/QueueGarbageCollectionInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Queue\QueueGarbageCollectionInterface.
+ */
+
+namespace Drupal\Core\Queue;
+
+/**
+ * If the Drupal 'queue' service implements this interface, the
+ * garbageCollection() method will be called during cron.
+ *
+ * @see system_cron()
+ */
+interface QueueGarbageCollectionInterface {
+
+  /**
+   * Cleans queues of garbage.
+   */
+  public function garbageCollection();
+
+}
diff --git a/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php b/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
index be6e335..5f98f67 100644
--- a/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
+++ b/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
@@ -26,6 +26,9 @@
    *   The data that was passed to
    *   \Drupal\Core\Queue\QueueInterface::createItem() when the item was queued.
    *
+   * @throws \Drupal\Core\Queue\RequeueException
+   *   Processing is not yet finished. This will allow another process to claim
+   *   the item immediately.
    * @throws \Exception
    *   A QueueWorker plugin may throw an exception to indicate there was a
    *   problem. The cron process will log the exception, and leave the item in
diff --git a/core/lib/Drupal/Core/Queue/RequeueException.php b/core/lib/Drupal/Core/Queue/RequeueException.php
new file mode 100644
index 0000000..bbe741b
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/RequeueException.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Queue\RequeueException.
+ */
+
+namespace Drupal\Core\Queue;
+
+/**
+ * Throw this exception to release the item allowing it to be processed again.
+ */
+class RequeueException extends \RuntimeException {}
diff --git a/core/lib/Drupal/Core/Render/Element/Fieldset.php b/core/lib/Drupal/Core/Render/Element/Fieldset.php
index 417fb9f..3b7b46b 100644
--- a/core/lib/Drupal/Core/Render/Element/Fieldset.php
+++ b/core/lib/Drupal/Core/Render/Element/Fieldset.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Render\Element;
 
-use Drupal\Core\Render\Element;
-
 /**
  * Provides a render element for a group of form elements.
  *
diff --git a/core/lib/Drupal/Core/Render/Element/Form.php b/core/lib/Drupal/Core/Render/Element/Form.php
index 3b38646..84df256 100644
--- a/core/lib/Drupal/Core/Render/Element/Form.php
+++ b/core/lib/Drupal/Core/Render/Element/Form.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Render\Element;
 
-use Drupal\Core\Render\Element;
-
 /**
  * Provides a render element for a form.
  *
diff --git a/core/lib/Drupal/Core/Render/Element/HtmlTag.php b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
index 7b9b614..bd7e238 100644
--- a/core/lib/Drupal/Core/Render/Element/HtmlTag.php
+++ b/core/lib/Drupal/Core/Render/Element/HtmlTag.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\Render\Element;
 
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Html as HtmlUtility;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Render\Markup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Template\Attribute;
@@ -97,7 +97,7 @@ public static function preRenderHtmlTag($element) {
     // Construct all other elements.
     else {
       $markup .= '>';
-      $markup .= SafeMarkup::isSafe($element['#value']) ? $element['#value'] : Xss::filterAdmin($element['#value']);
+      $markup .= $element['#value'] instanceof MarkupInterface ? $element['#value'] : Xss::filterAdmin($element['#value']);
       $markup .= '</' . $escaped_tag . ">\n";
     }
     if (!empty($element['#noscript'])) {
@@ -165,17 +165,17 @@ public static function preRenderConditionalComments($element) {
     // conditional comment markup. The conditional comment expression is
     // evaluated by Internet Explorer only. To control the rendering by other
     // browsers, use either the "downlevel-hidden" or "downlevel-revealed"
-    // technique. See http://en.wikipedia.org/wiki/Conditional_comment
+    // technique. See http://wikipedia.org/wiki/Conditional_comment
     // for details.
 
     // Ensure what we are dealing with is safe.
     // This would be done later anyway in drupal_render().
     $prefix = isset($element['#prefix']) ? $element['#prefix'] : '';
-    if ($prefix && !SafeMarkup::isSafe($prefix)) {
+    if ($prefix && !($prefix instanceof MarkupInterface)) {
       $prefix = Xss::filterAdmin($prefix);
     }
     $suffix = isset($element['#suffix']) ? $element['#suffix'] : '';
-    if ($suffix && !SafeMarkup::isSafe($suffix)) {
+    if ($suffix && !($suffix instanceof MarkupInterface)) {
       $suffix = Xss::filterAdmin($suffix);
     }
 
diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php
index 72c98a9..7bb1afa 100644
--- a/core/lib/Drupal/Core/Render/Element/Pager.php
+++ b/core/lib/Drupal/Core/Render/Element/Pager.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\Render\Element;
 
-use Drupal\Core\Render\Element;
-
 /**
  * Provides a render element for a pager.
  *
diff --git a/core/lib/Drupal/Core/Render/Element/Tableselect.php b/core/lib/Drupal/Core/Render/Element/Tableselect.php
index 0d1f969..9733ca9 100644
--- a/core/lib/Drupal/Core/Render/Element/Tableselect.php
+++ b/core/lib/Drupal/Core/Render/Element/Tableselect.php
@@ -259,6 +259,7 @@ public static function processTableselect(&$element, FormStateInterface $form_st
               '#return_value' => $key,
               '#default_value' => isset($value[$key]) ? $key : NULL,
               '#attributes' => $element['#attributes'],
+              '#ajax' => isset($element['#ajax']) ? $element['#ajax'] : NULL,
             );
           }
           else {
diff --git a/core/lib/Drupal/Core/Render/Element/Textarea.php b/core/lib/Drupal/Core/Render/Element/Textarea.php
index efeebcd..c6b5f3f 100644
--- a/core/lib/Drupal/Core/Render/Element/Textarea.php
+++ b/core/lib/Drupal/Core/Render/Element/Textarea.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Render\Element;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 
 /**
  * Provides a form element for input of multiple-line text.
diff --git a/core/lib/Drupal/Core/Render/Element/VerticalTabs.php b/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
index 447fc06..0852209 100644
--- a/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
+++ b/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
@@ -136,7 +136,7 @@ public static function processVerticalTabs(&$element, FormStateInterface $form_s
     $element[$name . '__active_tab'] = array(
       '#type' => 'hidden',
       '#default_value' => $element['#default_tab'],
-      '#attributes' => array('class' => array('vertical-tabs-active-tab')),
+      '#attributes' => array('class' => array('vertical-tabs__active-tab')),
     );
     // Clean up the active tab value so it's not accidentally stored in
     // settings forms.
diff --git a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
index 940c0e1..211eb95 100644
--- a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
+++ b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
@@ -96,8 +96,8 @@ protected function bubble(GeneratedUrl $generated_url, array $options = []) {
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $absolute = FALSE) {
-    $options['absolute'] = $absolute;
+  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
+    $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
     $generated_url = $this->generateFromRoute($name, $parameters, $options, TRUE);
     $this->bubble($generated_url);
     return $generated_url->getGeneratedUrl();
diff --git a/core/lib/Drupal/Core/Render/RenderCache.php b/core/lib/Drupal/Core/Render/RenderCache.php
index 934582c..5d798ad 100644
--- a/core/lib/Drupal/Core/Render/RenderCache.php
+++ b/core/lib/Drupal/Core/Render/RenderCache.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Core\Render;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\CacheContextsManager;
@@ -341,12 +340,6 @@ public function getCacheableRenderArray(array $elements) {
     // the cache entry size.
     if (!empty($elements['#cache_properties']) && is_array($elements['#cache_properties'])) {
       $data['#cache_properties'] = $elements['#cache_properties'];
-      // Ensure that any safe strings are a Markup object.
-      foreach (Element::properties(array_flip($elements['#cache_properties'])) as $cache_property) {
-        if (isset($elements[$cache_property]) && is_scalar($elements[$cache_property]) && SafeMarkup::isSafe($elements[$cache_property])) {
-          $elements[$cache_property] = Markup::create($elements[$cache_property]);
-        }
-      }
 
       // Extract all the cacheable items from the element using cache
       // properties.
diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php
index 9fc7053..6b68f1d 100644
--- a/core/lib/Drupal/Core/Render/Renderer.php
+++ b/core/lib/Drupal/Core/Render/Renderer.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Core\Render;
 
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Cache\Cache;
@@ -675,11 +675,12 @@ public function addCacheableDependency(array &$elements, $dependency) {
    *   A string.
    *
    * @return \Drupal\Core\Render\Markup
-   *   The escaped string wrapped in a Markup object. If
-   *   SafeMarkup::isSafe($string) returns TRUE, it won't be escaped again.
+   *   The escaped string wrapped in a Markup object. If the string is an
+   *   instance of \Drupal\Component\Render\MarkupInterface, it won't be escaped
+   *   again.
    */
   protected function xssFilterAdminIfUnsafe($string) {
-    if (!SafeMarkup::isSafe($string)) {
+    if (!($string instanceof MarkupInterface)) {
       $string = Xss::filterAdmin($string);
     }
     return Markup::create($string);
@@ -704,8 +705,8 @@ protected function xssFilterAdminIfUnsafe($string) {
    *   A render array with #markup set.
    *
    * @return \Drupal\Component\Render\MarkupInterface|string
-   *   The escaped markup wrapped in a Markup object. If
-   *   SafeMarkup::isSafe($elements['#markup']) returns TRUE, it won't be
+   *   The escaped markup wrapped in a Markup object. If $elements['#markup']
+   *   is an instance of \Drupal\Component\Render\MarkupInterface, it won't be
    *   escaped or filtered again.
    *
    * @see \Drupal\Component\Utility\Html::escape()
@@ -720,7 +721,7 @@ protected function ensureMarkupIsSafe(array $elements) {
     if (!empty($elements['#plain_text'])) {
       $elements['#markup'] = Markup::create(Html::escape($elements['#plain_text']));
     }
-    elseif (!SafeMarkup::isSafe($elements['#markup'])) {
+    elseif (!($elements['#markup'] instanceof MarkupInterface)) {
       // The default behaviour is to XSS filter using the admin tag list.
       $tags = isset($elements['#allowed_tags']) ? $elements['#allowed_tags'] : Xss::getAdminTagList();
       $elements['#markup'] = Markup::create(Xss::filter($elements['#markup'], $tags));
diff --git a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
index 2a6082c..9d39778 100644
--- a/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
+++ b/core/lib/Drupal/Core/Routing/CurrentRouteMatch.php
@@ -13,7 +13,7 @@
 /**
  * Default object for current_route_match service.
  */
-class CurrentRouteMatch implements RouteMatchInterface, StackedRouteMatchInterface {
+class CurrentRouteMatch implements ResettableStackedRouteMatchInterface {
 
   /**
    * The related request stack.
@@ -121,6 +121,13 @@ protected function getRouteMatch(Request $request) {
   /**
    * {@inheritdoc}
    */
+  public function resetRouteMatch() {
+    $this->routeMatches = new \SplObjectStorage();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getMasterRouteMatch() {
     return $this->getRouteMatch($this->requestStack->getMasterRequest());
   }
diff --git a/core/lib/Drupal/Core/Routing/Enhancer/EntityRevisionRouteEnhancer.php b/core/lib/Drupal/Core/Routing/Enhancer/EntityRevisionRouteEnhancer.php
new file mode 100644
index 0000000..f4b2bd0
--- /dev/null
+++ b/core/lib/Drupal/Core/Routing/Enhancer/EntityRevisionRouteEnhancer.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer.
+ */
+
+namespace Drupal\Core\Routing\Enhancer;
+
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Adds _entity_revision to the request attributes, if possible.
+ */
+class EntityRevisionRouteEnhancer implements RouteEnhancerInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(Route $route) {
+    // Check whether there is any entity revision parameter.
+    $parameters = $route->getOption('parameters') ?: [];
+    foreach ($parameters as $info) {
+      if (isset($info['type']) && strpos($info['type'], 'entity_revision:') === 0) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function enhance(array $defaults, Request $request) {
+    /** @var \Symfony\Component\Routing\Route $route */
+    $route = $defaults[RouteObjectInterface::ROUTE_OBJECT];
+    $options = $route->getOptions();
+    if (isset($options['parameters'])) {
+      foreach ($options['parameters'] as $name => $details) {
+        if (!empty($details['type']) && strpos($details['type'], 'entity_revision:') !== FALSE) {
+          $defaults['_entity_revision'] = $defaults[$name];
+          break;
+        }
+      }
+    }
+
+    return $defaults;
+  }
+
+}
diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php
index 4c1ac57..30943e4 100644
--- a/core/lib/Drupal/Core/Routing/MatcherDumper.php
+++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Core\Routing;
 
+use Drupal\Core\Database\SchemaObjectExistsException;
 use Drupal\Core\State\StateInterface;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -14,6 +15,8 @@
 
 /**
  * Dumps Route information to a database table.
+ *
+ * @see \Drupal\Core\Routing\RouteProvider
  */
 class MatcherDumper implements MatcherDumperInterface {
 
@@ -97,7 +100,13 @@ public function dump(array $options = array()) {
     try {
       // We don't use truncate, because it is not guaranteed to be transaction
       // safe.
-      $this->connection->delete($this->tableName)->execute();
+      try {
+        $this->connection->delete($this->tableName)
+          ->execute();
+      }
+      catch (\Exception $e) {
+        $this->ensureTableExists();
+      }
 
       // Split the routes into chunks to avoid big INSERT queries.
       $route_chunks = array_chunk($this->routes->all(), 50, TRUE);
@@ -162,4 +171,85 @@ public function getRoutes() {
     return $this->routes;
   }
 
+  /**
+   * Checks if the tree table exists and create it if not.
+   *
+   * @return bool
+   *   TRUE if the table was created, FALSE otherwise.
+   */
+  protected function ensureTableExists() {
+    try {
+      if (!$this->connection->schema()->tableExists($this->tableName)) {
+        $this->connection->schema()->createTable($this->tableName, $this->schemaDefinition());
+        return TRUE;
+      }
+    }
+    catch (SchemaObjectExistsException $e) {
+      // If another process has already created the config table, attempting to
+      // recreate it will throw an exception. In this case just catch the
+      // exception and do nothing.
+      return TRUE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Defines the schema for the router table.
+   *
+   * @return array
+   *   The schema API definition for the SQL storage table.
+   */
+  protected function schemaDefinition() {
+    $schema = [
+      'description' => 'Maps paths to various callbacks (access, page and title)',
+      'fields' => [
+        'name' => [
+          'description' => 'Primary Key: Machine name of this route',
+          'type' => 'varchar_ascii',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'path' => [
+          'description' => 'The path for this URI',
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'pattern_outline' => [
+          'description' => 'The pattern',
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+          'default' => '',
+        ],
+        'fit' => [
+          'description' => 'A numeric representation of how specific the path is.',
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+        ],
+        'route' => [
+          'description' => 'A serialized Route object',
+          'type' => 'blob',
+          'size' => 'big',
+        ],
+        'number_parts' => [
+          'description' => 'Number of parts in this router path.',
+          'type' => 'int',
+          'not null' => TRUE,
+          'default' => 0,
+          'size' => 'small',
+        ],
+      ],
+      'indexes' => [
+        'pattern_outline_parts' => ['pattern_outline', 'number_parts'],
+      ],
+      'primary key' => ['name'],
+    ];
+
+    return $schema;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php b/core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php
new file mode 100644
index 0000000..1d4382f
--- /dev/null
+++ b/core/lib/Drupal/Core/Routing/ResettableStackedRouteMatchInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Routing\ResettableStackedRouteMatchInterface.
+ */
+
+namespace Drupal\Core\Routing;
+
+/**
+ * Defines an interface for a resettable stack of route matches.
+ *
+ * @todo Move this method to \Drupal\Core\Routing\StackedRouteMatchInterface in
+ *   https://www.drupal.org/node/2659952.
+ */
+interface ResettableStackedRouteMatchInterface extends StackedRouteMatchInterface {
+
+  /**
+   * Resets the route match static cache.
+   *
+   * The route match should only be statically cached once routing is finished.
+   * Any code that uses a route match during routing may be incorrectly assumed
+   * to be acting after routing has completed. This method gives that code the
+   * ability to fix the static cache.
+   */
+  public function resetRouteMatch();
+
+}
diff --git a/core/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 906febc..be647e1 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -210,7 +210,12 @@ public function preLoadRoutes($names) {
         $routes = $cache->data;
       }
       else {
-        $result = $this->connection->query('SELECT name, route FROM {' . $this->connection->escapeTable($this->tableName) . '} WHERE name IN ( :names[] )', array(':names[]' => $routes_to_load));
+        try {
+          $result = $this->connection->query('SELECT name, route FROM {' . $this->connection->escapeTable($this->tableName) . '} WHERE name IN ( :names[] )', array(':names[]' => $routes_to_load));
+        }
+        catch (\Exception $e) {
+          $result = [];
+        }
         $routes = $result->fetchAllKeyed();
 
         $this->cache->set($cid, $routes, Cache::PERMANENT, ['routes']);
@@ -336,10 +341,15 @@ protected function getRoutesByPath($path) {
     // The >= check on number_parts allows us to match routes with optional
     // trailing wildcard parts as long as the pattern matches, since we
     // dump the route pattern without those optional parts.
-    $routes = $this->connection->query("SELECT name, route, fit FROM {" . $this->connection->escapeTable($this->tableName) . "} WHERE pattern_outline IN ( :patterns[] ) AND number_parts >= :count_parts", array(
-      ':patterns[]' => $ancestors, ':count_parts' => count($parts),
-    ))
-      ->fetchAll(\PDO::FETCH_ASSOC);
+    try {
+      $routes = $this->connection->query("SELECT name, route, fit FROM {" . $this->connection->escapeTable($this->tableName) . "} WHERE pattern_outline IN ( :patterns[] ) AND number_parts >= :count_parts", array(
+        ':patterns[]' => $ancestors, ':count_parts' => count($parts),
+      ))
+        ->fetchAll(\PDO::FETCH_ASSOC);
+    }
+    catch (\Exception $e) {
+      $routes = [];
+    }
 
     // We sort by fit and name in PHP to avoid a SQL filesort.
     usort($routes, array($this, 'routeProviderRouteCompare'));
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 29af788..ab08ce3 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -272,8 +272,8 @@ protected function getInternalPathFromRoute($name, SymfonyRoute $route, $paramet
   /**
    * {@inheritdoc}
    */
-  public function generate($name, $parameters = array(), $absolute = FALSE) {
-    $options['absolute'] = $absolute;
+  public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH) {
+    $options['absolute'] = is_bool($referenceType) ? $referenceType : $referenceType === self::ABSOLUTE_URL;
     return $this->generateFromRoute($name, $parameters, $options);
   }
 
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
index 31dd286..2dba9d8 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
@@ -3,9 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Core\Routing\UrlGeneratorTrait.
- *
- * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Url instead.
  */
 
 namespace Drupal\Core\Routing;
@@ -19,6 +16,9 @@
  * classes that would implement ContainerInjectionInterface. Services registered
  * in the Container should not use this trait but inject the appropriate service
  * directly for easier testing.
+ *
+ * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+ *   Use \Drupal\Core\Url instead.
  */
 trait UrlGeneratorTrait {
 
diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
index 4013d0f..ad4636c 100644
--- a/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/LocalReadOnlyStream.php
@@ -104,7 +104,7 @@ public function stream_lock($operation) {
    * @return bool
    *   FALSE as data will not be written.
    *
-   * @see http://php.net/manual/en/streamwrapper.stream-write.php
+   * @see http://php.net/manual/streamwrapper.stream-write.php
    */
   public function stream_write($data) {
     trigger_error('stream_write() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -158,7 +158,7 @@ public function stream_truncate($new_size) {
    *   TRUE so that file_delete() will remove db reference to file. File is not
    *   actually deleted.
    *
-   * @see http://php.net/manual/en/streamwrapper.unlink.php
+   * @see http://php.net/manual/streamwrapper.unlink.php
    */
   public function unlink($uri) {
     trigger_error('unlink() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -178,7 +178,7 @@ public function unlink($uri) {
    * @return bool
    *   FALSE as file will never be renamed.
    *
-   * @see http://php.net/manual/en/streamwrapper.rename.php
+   * @see http://php.net/manual/streamwrapper.rename.php
    */
   public function rename($from_uri, $to_uri) {
     trigger_error('rename() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -200,7 +200,7 @@ public function rename($from_uri, $to_uri) {
    * @return bool
    *   FALSE as directory will never be created.
    *
-   * @see http://php.net/manual/en/streamwrapper.mkdir.php
+   * @see http://php.net/manual/streamwrapper.mkdir.php
    */
   public function mkdir($uri, $mode, $options) {
     trigger_error('mkdir() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -220,7 +220,7 @@ public function mkdir($uri, $mode, $options) {
    * @return bool
    *   FALSE as directory will never be deleted.
    *
-   * @see http://php.net/manual/en/streamwrapper.rmdir.php
+   * @see http://php.net/manual/streamwrapper.rmdir.php
    */
   public function rmdir($uri, $options) {
     trigger_error('rmdir() not supported for read-only stream wrappers', E_USER_WARNING);
diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
index de6d66e..5091b8f 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php
@@ -10,7 +10,7 @@
 /**
  * Defines a generic PHP stream wrapper interface.
  *
- * @see http://www.php.net/manual/class.streamwrapper.php
+ * @see http://php.net/manual/class.streamwrapper.php
  */
 interface PhpStreamWrapperInterface {
 
@@ -116,7 +116,7 @@ public function stream_lock($operation);
    *   Returns TRUE on success or FALSE on failure. If $option is not
    *   implemented, FALSE should be returned.
    *
-   * @see http://www.php.net/manual/streamwrapper.stream-metadata.php
+   * @see http://php.net/manual/streamwrapper.stream-metadata.php
    */
   public function stream_metadata($path, $option, $value);
 
diff --git a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
index a7201d2..cc6da4b 100644
--- a/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/ReadOnlyStream.php
@@ -138,7 +138,7 @@ public function stream_lock($operation) {
    * @return bool
    *   FALSE as data will not be written.
    *
-   * @see http://php.net/manual/en/streamwrapper.stream-write.php
+   * @see http://php.net/manual/streamwrapper.stream-write.php
    */
   public function stream_write($data) {
     trigger_error('stream_write() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -192,7 +192,7 @@ public function stream_truncate($new_size) {
    *   TRUE so that file_delete() will remove db reference to file. File is not
    *   actually deleted.
    *
-   * @see http://php.net/manual/en/streamwrapper.unlink.php
+   * @see http://php.net/manual/streamwrapper.unlink.php
    */
   public function unlink($uri) {
     trigger_error('unlink() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -212,7 +212,7 @@ public function unlink($uri) {
    * @return bool
    *   FALSE as file will never be renamed.
    *
-   * @see http://php.net/manual/en/streamwrapper.rename.php
+   * @see http://php.net/manual/streamwrapper.rename.php
    */
   public function rename($from_uri, $to_uri) {
     trigger_error('rename() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -234,7 +234,7 @@ public function rename($from_uri, $to_uri) {
    * @return bool
    *   FALSE as directory will never be created.
    *
-   * @see http://php.net/manual/en/streamwrapper.mkdir.php
+   * @see http://php.net/manual/streamwrapper.mkdir.php
    */
   public function mkdir($uri, $mode, $options) {
     trigger_error('mkdir() not supported for read-only stream wrappers', E_USER_WARNING);
@@ -254,7 +254,7 @@ public function mkdir($uri, $mode, $options) {
    * @return bool
    *   FALSE as directory will never be deleted.
    *
-   * @see http://php.net/manual/en/streamwrapper.rmdir.php
+   * @see http://php.net/manual/streamwrapper.rmdir.php
    */
   public function rmdir($uri, $options) {
     trigger_error('rmdir() not supported for read-only stream wrappers', E_USER_WARNING);
diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
index f13cfb8..e23c0ee 100644
--- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
+++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -3,9 +3,16 @@
 /**
  * @file
  * Contains \Drupal\Core\StreamWrapper\StreamWrapperInterface.
+ */
+
+namespace Drupal\Core\StreamWrapper;
+
+/**
+ * Defines a Drupal stream wrapper extension.
  *
  * Provides a Drupal interface and classes to implement PHP stream wrappers for
- * public, private, and temporary files.
+ * public, private, and temporary files. Extends the StreamWrapperInterface
+ * with methods expected by Drupal stream wrapper classes.
  *
  * A stream wrapper is an abstraction of a file system that allows Drupal to
  * use the same set of methods to access both local files and remote resources.
@@ -18,15 +25,6 @@
  * @see http://www.faqs.org/rfcs/rfc3986.html
  * @see http://bugs.php.net/bug.php?id=47070
  */
-
-namespace Drupal\Core\StreamWrapper;
-
-/**
- * Defines a Drupal stream wrapper extension.
- *
- * Extends the StreamWrapperInterface with methods expected by Drupal stream
- * wrapper classes.
- */
 interface StreamWrapperInterface extends PhpStreamWrapperInterface {
 
   /**
diff --git a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
index 583ab18..9e46b27 100644
--- a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
+++ b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
@@ -36,13 +36,6 @@ class PluralTranslatableMarkup extends TranslatableMarkup {
   protected $translatedString;
 
   /**
-   * A bool that statically caches whether locale_get_plural() exists.
-   *
-   * @var bool
-   */
-  protected static $localeEnabled;
-
-  /**
    * Constructs a new PluralTranslatableMarkup object.
    *
    * Parses values passed into this class through the format_plural() function
@@ -157,10 +150,13 @@ public function render() {
    * @return int
    */
   protected function getPluralIndex() {
-    if (!isset(static::$localeEnabled)) {
-      static::$localeEnabled = function_exists('locale_get_plural');
-    }
-    if (function_exists('locale_get_plural')) {
+    // We have to test both if the function and the service exist since in
+    // certain situations it is possible that locale code might be loaded but
+    // the service does not exist. For example, where the parent test site has
+    // locale installed but the child site does not.
+    // @todo Refactor in https://www.drupal.org/node/2660338 so this code does
+    // not depend on knowing that the Locale module exists.
+    if (function_exists('locale_get_plural') && \Drupal::hasService('locale.plural.formula')) {
       return locale_get_plural($this->count, $this->getOption('langcode'));
     }
     return -1;
diff --git a/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php b/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
index 2f5ae9e..add0719 100644
--- a/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
+++ b/core/lib/Drupal/Core/StringTranslation/StringTranslationTrait.php
@@ -73,7 +73,7 @@
    * @ingroup sanitization
    */
   protected function t($string, array $args = array(), array $options = array()) {
-    return $this->getStringTranslation()->translate($string, $args, $options);
+    return new TranslatableMarkup($string, $args, $options, $this->getStringTranslation());
   }
 
   /**
@@ -82,7 +82,7 @@ protected function t($string, array $args = array(), array $options = array()) {
    * @see \Drupal\Core\StringTranslation\TranslationInterface::formatPlural()
    */
   protected function formatPlural($count, $singular, $plural, array $args = array(), array $options = array()) {
-    return $this->getStringTranslation()->formatPlural($count, $singular, $plural, $args, $options);
+    return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this->getStringTranslation());
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Template/Attribute.php b/core/lib/Drupal/Core/Template/Attribute.php
index 8aaac3b..5389155 100644
--- a/core/lib/Drupal/Core/Template/Attribute.php
+++ b/core/lib/Drupal/Core/Template/Attribute.php
@@ -8,7 +8,6 @@
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Render\PlainTextOutput;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 
 /**
@@ -139,7 +138,7 @@ protected function createAttributeValue($name, $value) {
       $value = new AttributeBoolean($name, $value);
     }
     // As a development aid, we allow the value to be a safe string object.
-    elseif (SafeMarkup::isSafe($value)) {
+    elseif ($value instanceof MarkupInterface) {
       // Attributes are not supposed to display HTML markup, so we just convert
       // the value to plain text.
       $value = PlainTextOutput::renderFromHtml($value);
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index ec963f6..01a3d1a 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -3,19 +3,13 @@
 /**
  * @file
  * Contains \Drupal\Core\Template\TwigExtension.
- *
- * This provides a Twig extension that registers various Drupal specific
- * extensions to Twig.
- *
- * @see \Drupal\Core\CoreServiceProvider
  */
 
 namespace Drupal\Core\Template;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
-use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Render\RenderableInterface;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Routing\UrlGeneratorInterface;
@@ -25,7 +19,8 @@
 /**
  * A class providing Drupal Twig extensions.
  *
- * Specifically Twig functions, filter and node visitors.
+ * This provides a Twig extension that registers various Drupal-specific
+ * extensions to Twig, specifically Twig functions, filter, and node visitors.
  *
  * @see \Drupal\Core\CoreServiceProvider
  */
@@ -55,7 +50,7 @@ class TwigExtension extends \Twig_Extension {
   /**
    * The date formatter.
    *
-   * @var \Drupal\Core\Datetime\DateFormatter
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
    */
   protected $dateFormatter;
 
@@ -118,7 +113,7 @@ public function setThemeManager(ThemeManagerInterface $theme_manager) {
    *
    * @return $this
    */
-  public function setDateFormatter(DateFormatter $date_formatter) {
+  public function setDateFormatter(DateFormatterInterface $date_formatter) {
     $this->dateFormatter = $date_formatter;
     return $this;
   }
@@ -438,7 +433,7 @@ public function escapeFilter(\Twig_Environment $env, $arg, $strategy = 'html', $
         $return = (string) $arg;
       }
       // You can't throw exceptions in the magic PHP __toString() methods, see
-      // http://php.net/manual/en/language.oop5.magic.php#object.tostring so
+      // http://php.net/manual/language.oop5.magic.php#object.tostring so
       // we also support a toString method.
       elseif (method_exists($arg, 'toString')) {
         $return = $arg->toString();
@@ -450,7 +445,7 @@ public function escapeFilter(\Twig_Environment $env, $arg, $strategy = 'html', $
 
     // We have a string or an object converted to a string: Autoescape it!
     if (isset($return)) {
-      if ($autoescape && SafeMarkup::isSafe($return, $strategy)) {
+      if ($autoescape && $return instanceof MarkupInterface) {
         return $return;
       }
       // Drupal only supports the HTML escaping strategy, so provide a
@@ -487,13 +482,13 @@ public function escapeFilter(\Twig_Environment $env, $arg, $strategy = 'html', $
    * @param mixed $arg
    *   String, Object or Render Array.
    *
-   * @return mixed
-   *   The rendered output or an Twig_Markup object.
-   *
    * @throws \Exception
    *   When $arg is passed as an object which does not implement __toString(),
    *   RenderableInterface or toString().
    *
+   * @return mixed
+   *   The rendered output or an Twig_Markup object.
+   *
    * @see render
    * @see TwigNodeVisitor
    */
@@ -521,7 +516,7 @@ public function renderVar($arg) {
         return (string) $arg;
       }
       // You can't throw exceptions in the magic PHP __toString() methods, see
-      // http://php.net/manual/en/language.oop5.magic.php#object.tostring so
+      // http://php.net/manual/language.oop5.magic.php#object.tostring so
       // we also support a toString method.
       elseif (method_exists($arg, 'toString')) {
         return $arg->toString();
diff --git a/core/lib/Drupal/Core/Template/TwigNodeTrans.php b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
index 9d747b7..b2cffa6 100644
--- a/core/lib/Drupal/Core/Template/TwigNodeTrans.php
+++ b/core/lib/Drupal/Core/Template/TwigNodeTrans.php
@@ -3,6 +3,12 @@
 /**
  * @file
  * Contains \Drupal\Core\Template\TwigNodeTrans.
+ */
+
+namespace Drupal\Core\Template;
+
+/**
+ * A class that defines the Twig 'trans' tag for Drupal.
  *
  * This Twig extension was originally based on Twig i18n extension. It has been
  * severely modified to work properly with the complexities of the Drupal
@@ -11,12 +17,6 @@
  * @see http://twig.sensiolabs.org/doc/extensions/i18n.html
  * @see https://github.com/fabpot/Twig-extensions
  */
-
-namespace Drupal\Core\Template;
-
-/**
- * A class that defines the Twig 'trans' tag for Drupal.
- */
 class TwigNodeTrans extends \Twig_Node {
 
   /**
diff --git a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
index a7bb43f..eee6dad 100644
--- a/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
+++ b/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
@@ -57,6 +57,7 @@ public function __construct() {
       'bundle',
       'get',
       '__toString',
+      'toString',
     ]);
     $this->whitelisted_methods = array_flip($whitelisted_methods);
 
diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
index d4c6a2c..0cbd529 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\StackedRouteMatchInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Template\Attribute;
 
@@ -49,9 +48,11 @@ class ThemeManager implements ThemeManagerInterface {
   protected $themeInitialization;
 
   /**
-   * @var \Symfony\Component\HttpFoundation\RequestStack
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
    */
-  protected $requestStack;
+  protected $moduleHandler;
 
   /**
    * The app root.
@@ -69,15 +70,13 @@ class ThemeManager implements ThemeManagerInterface {
    *   The theme negotiator.
    * @param \Drupal\Core\Theme\ThemeInitializationInterface $theme_initialization
    *   The theme initialization.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler.
    */
-  public function __construct($root, ThemeNegotiatorInterface $theme_negotiator, ThemeInitializationInterface $theme_initialization, RequestStack $request_stack, ModuleHandlerInterface $module_handler) {
+  public function __construct($root, ThemeNegotiatorInterface $theme_negotiator, ThemeInitializationInterface $theme_initialization, ModuleHandlerInterface $module_handler) {
     $this->root = $root;
     $this->themeNegotiator = $theme_negotiator;
     $this->themeInitialization = $theme_initialization;
-    $this->requestStack = $request_stack;
     $this->moduleHandler = $module_handler;
   }
 
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php
index e9a3abc..882bc7b 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/BinaryData.php
@@ -14,7 +14,7 @@
  * The binary data type.
  *
  * The plain value of binary data is a PHP file resource, see
- * http://php.net/manual/en/language.types.resource.php. For setting the value
+ * http://php.net/manual/language.types.resource.php. For setting the value
  * a PHP file resource or a (absolute) stream resource URI may be passed.
  *
  * @DataType(
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
index 34636ba..2243a04 100644
--- a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Core\TypedData;
 
-use Drupal\user;
-
 /**
  * Interface for typed data objects.
  *
diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 70af473..bdf2607 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -9,7 +9,6 @@
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\GeneratedLink;
@@ -166,7 +165,7 @@ public function generate($text, Url $url) {
       $attributes['href'] = $generated_url->getGeneratedUrl();
     }
 
-    if (!SafeMarkup::isSafe($variables['text'])) {
+    if (!($variables['text'] instanceof MarkupInterface)) {
       $variables['text'] = Html::escape($variables['text']);
     }
     $attributes = new Attribute($attributes);
diff --git a/core/misc/ajax.js b/core/misc/ajax.js
index b63bc03..507a40b 100644
--- a/core/misc/ajax.js
+++ b/core/misc/ajax.js
@@ -19,6 +19,14 @@
    * Attaches the Ajax behavior to each Ajax form element.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Initialize all {@link Drupal.Ajax} objects declared in
+   *   `drupalSettings.ajax` or initialize {@link Drupal.Ajax} objects from
+   *   DOM elements having the `use-ajax-submit` or `use-ajax` css class.
+   * @prop {Drupal~behaviorDetach} detach
+   *   During `unload` remove all {@link Drupal.Ajax} objects related to
+   *   the removed content.
    */
   Drupal.behaviors.AJAX = {
     attach: function (context, settings) {
@@ -50,8 +58,9 @@
 
         // For anchor tags, these will go to the target of the anchor rather
         // than the usual location.
-        if ($(this).attr('href')) {
-          element_settings.url = $(this).attr('href');
+        var href = $(this).attr('href');
+        if (href) {
+          element_settings.url = href;
           element_settings.event = 'click';
         }
         element_settings.dialogType = $(this).data('dialog-type');
@@ -81,6 +90,16 @@
 
         Drupal.ajax(element_settings);
       });
+    },
+
+    detach: function (context, settings, trigger) {
+      if (trigger === 'unload') {
+        Drupal.ajax.expired().forEach(function (instance) {
+          // Set this to null and allow garbage collection to reclaim
+          // the memory.
+          Drupal.ajax.instances[instance.instanceIndex] = null;
+        });
+      }
     }
   };
 
@@ -209,6 +228,7 @@
    *   event listeners will be bound.
    *
    * @return {Drupal.Ajax}
+   *   The created Ajax object.
    *
    * @see Drupal.AjaxCommands
    */
@@ -237,11 +257,66 @@
   /**
    * Contains all created Ajax objects.
    *
-   * @type {Array.<Drupal.Ajax>}
+   * @type {Array.<Drupal.Ajax|null>}
    */
   Drupal.ajax.instances = [];
 
   /**
+   * List all objects where the associated element is not in the DOM
+   *
+   * This method ignores {@link Drupal.Ajax} objects not bound to DOM elements
+   * when created with {@link Drupal.ajax}.
+   *
+   * @return {Array.<Drupal.Ajax>}
+   *   The list of expired {@link Drupal.Ajax} objects.
+   */
+  Drupal.ajax.expired = function () {
+    return Drupal.ajax.instances.filter(function (instance) {
+      return instance && instance.element !== false && !document.body.contains(instance.element);
+    });
+  };
+
+  /**
+   * Settings for an Ajax object.
+   *
+   * @typedef {object} Drupal.Ajax~element_settings
+   *
+   * @prop {string} url
+   *   Target of the Ajax request.
+   * @prop {?string} [event]
+   *   Event bound to settings.element which will trigger the Ajax request.
+   * @prop {bool} [keypress=true]
+   *   Triggers a request on keypress events.
+   * @prop {?string} selector
+   *   jQuery selector targeting the element to bind events to or used with
+   *   {@link Drupal.AjaxCommands}.
+   * @prop {string} [effect='none']
+   *   Name of the jQuery method to use for displaying new Ajax content.
+   * @prop {string|number} [speed='none']
+   *   Speed with which to apply the effect.
+   * @prop {string} [method]
+   *   Name of the jQuery method used to insert new content in the targeted
+   *   element.
+   * @prop {object} [progress]
+   *   Settings for the display of a user-friendly loader.
+   * @prop {string} [progress.type='throbber']
+   *   Type of progress element, core provides `'bar'`, `'throbber'` and
+   *   `'fullscreen'`.
+   * @prop {string} [progress.message=Drupal.t('Please wait...')]
+   *   Custom message to be used with the bar indicator.
+   * @prop {object} [submit]
+   *   Extra data to be sent with the Ajax request.
+   * @prop {bool} [submit.js=true]
+   *   Allows the PHP side to know this comes from an Ajax request.
+   * @prop {object} [dialog]
+   *   Options for {@link Drupal.dialog}.
+   * @prop {string} [dialogType]
+   *   One of `'modal'` or `'dialog'`.
+   * @prop {string} [prevent]
+   *   List of events on which to stop default action and stop propagation.
+   */
+
+  /**
    * Ajax constructor.
    *
    * The Ajax request returns an array of commands encoded in JSON, which is
@@ -258,14 +333,8 @@
    * @param {HTMLElement} [element]
    *   Element parameter of {@link Drupal.Ajax} constructor, element on which
    *   event listeners will be bound.
-   * @param {object} element_settings
-   * @param {string} element_settings.url
-   *   Target of the Ajax request.
-   * @param {string} [element_settings.event]
-   *   Event bound to settings.element which will trigger the Ajax request.
-   * @param {string} [element_settings.method]
-   *   Name of the jQuery method used to insert new content in the targeted
-   *   element.
+   * @param {Drupal.Ajax~element_settings} element_settings
+   *   Settings for this Ajax object.
    */
   Drupal.Ajax = function (base, element, element_settings) {
     var defaults = {
@@ -290,6 +359,10 @@
      * @type {Drupal.AjaxCommands}
      */
     this.commands = new Drupal.AjaxCommands();
+
+    /**
+     * @type {bool|number}
+     */
     this.instanceIndex = false;
 
     // @todo Remove this after refactoring the PHP code to:
@@ -310,7 +383,7 @@
     this.element = element;
 
     /**
-     * @type {object}
+     * @type {Drupal.Ajax~element_settings}
      */
     this.element_settings = element_settings;
 
@@ -343,6 +416,12 @@
     // 3. /nojs? - Followed by a query (e.g. path/nojs?destination=foobar).
     // 4. /nojs# - Followed by a fragment (e.g.: path/nojs#myfragment).
     var originalUrl = this.url;
+
+    /**
+     * Processed Ajax URL.
+     *
+     * @type {string}
+     */
     this.url = this.url.replace(/\/nojs(\/|$|\?|#)/g, '/ajax$1');
     // If the 'nojs' version of the URL is trusted, also trust the 'ajax'
     // version.
@@ -355,23 +434,35 @@
     var ajax = this;
 
     /**
-     * Options for the ajaxSubmit function.
+     * Options for the jQuery.ajax function.
      *
      * @name Drupal.Ajax#options
      *
      * @type {object}
      *
      * @prop {string} url
+     *   Ajax URL to be called.
      * @prop {object} data
+     *   Ajax payload.
      * @prop {function} beforeSerialize
+     *   Implement jQuery beforeSerialize function to call
+     *   {@link Drupal.Ajax#beforeSerialize}.
      * @prop {function} beforeSubmit
+     *   Implement jQuery beforeSubmit function to call
+     *   {@link Drupal.Ajax#beforeSubmit}.
      * @prop {function} beforeSend
+     *   Implement jQuery beforeSend function to call
+     *   {@link Drupal.Ajax#beforeSend}.
      * @prop {function} success
+     *   Implement jQuery success function to call
+     *   {@link Drupal.Ajax#success}.
      * @prop {function} complete
-     * @prop {string} dataType
-     * @prop {object} accepts
-     * @prop {string} accepts.json
-     * @prop {string} type
+     *   Implement jQuery success function to clean up ajax state and trigger an
+     *   error if needed.
+     * @prop {string} dataType='json'
+     *   Type of the response expected.
+     * @prop {string} type='POST'
+     *   HTTP method to use for the Ajax request.
      */
     ajax.options = {
       url: ajax.url,
@@ -469,13 +560,17 @@
    * modal dialog.
    *
    * @const {string}
+   *
+   * @default
    */
   Drupal.ajax.WRAPPER_FORMAT = '_wrapper_format';
 
   /**
    * Request parameter to indicate that a request is a Drupal Ajax request.
    *
-   * @const
+   * @const {string}
+   *
+   * @default
    */
   Drupal.Ajax.AJAX_REQUEST_PARAMETER = '_drupal_ajax';
 
@@ -484,6 +579,11 @@
    *
    * Allows developers to execute an Ajax request manually without specifying
    * an event to respond to.
+   *
+   * @return {object}
+   *   Returns the jQuery.Deferred object underlying the Ajax request. If
+   *   pre-serialization fails, the Deferred will be returned in the rejected
+   *   state.
    */
   Drupal.Ajax.prototype.execute = function () {
     // Do not perform another ajax command if one is already in progress.
@@ -493,13 +593,17 @@
 
     try {
       this.beforeSerialize(this.element, this.options);
-      $.ajax(this.options);
+      // Return the jqXHR so that external code can hook into the Deferred API.
+      return $.ajax(this.options);
     }
     catch (e) {
       // Unset the ajax.ajaxing flag here because it won't be unset during
       // the complete response.
       this.ajaxing = false;
       window.alert('An error occurred while attempting to process ' + this.options.url + ': ' + e.message);
+      // For consistency, return a rejected Deferred (i.e., jqXHR's superclass)
+      // so that calling code can take appropriate action.
+      return $.Deferred().reject();
     }
   };
 
@@ -514,7 +618,9 @@
    * SPACE is often used to activate an element without submitting.
    *
    * @param {HTMLElement} element
+   *   Element the event was triggered on.
    * @param {jQuery.Event} event
+   *   Triggered event.
    */
   Drupal.Ajax.prototype.keypressResponse = function (element, event) {
     // Create a synonym for this to reduce code confusion.
@@ -542,7 +648,9 @@
    * Ajax object.
    *
    * @param {HTMLElement} element
+   *   Element the event was triggered on.
    * @param {jQuery.Event} event
+   *   Triggered event.
    */
   Drupal.Ajax.prototype.eventResponse = function (element, event) {
     event.preventDefault();
@@ -589,9 +697,10 @@
    * Runs before the beforeSend() handler (see below), and unlike that one, runs
    * before field data is collected.
    *
-   * @param {HTMLElement} element
+   * @param {object} [element]
+   *   Ajax object's `element_settings`.
    * @param {object} options
-   * @param {object} options.data
+   *   jQuery.ajax options.
    */
   Drupal.Ajax.prototype.beforeSerialize = function (element, options) {
     // Allow detaching behaviors to update field values before collecting them.
@@ -621,9 +730,12 @@
   /**
    * Modify form values prior to form submission.
    *
-   * @param {object} form_values
-   * @param {HTMLElement} element
+   * @param {Array.<object>} form_values
+   *   Processed form values.
+   * @param {jQuery} element
+   *   The form node as a jQuery object.
    * @param {object} options
+   *   jQuery.ajax options.
    */
   Drupal.Ajax.prototype.beforeSubmit = function (form_values, element, options) {
     // This function is left empty to make it simple to override for modules
@@ -634,8 +746,9 @@
    * Prepare the Ajax request before it is sent.
    *
    * @param {XMLHttpRequest} xmlhttprequest
+   *   Native Ajax object.
    * @param {object} options
-   * @param {object} options.extraData
+   *   jQuery.ajax options.
    */
   Drupal.Ajax.prototype.beforeSend = function (xmlhttprequest, options) {
     // For forms without file inputs, the jQuery Form plugin serializes the
@@ -723,7 +836,9 @@
    * Handler for the form redirection completion.
    *
    * @param {Array.<Drupal.AjaxCommands~commandDefinition>} response
+   *   Drupal Ajax response.
    * @param {number} status
+   *   XMLHttpRequest status.
    */
   Drupal.Ajax.prototype.success = function (response, status) {
     // Remove the progress element.
@@ -786,10 +901,15 @@
    * Build an effect object to apply an effect when adding new HTML.
    *
    * @param {object} response
+   *   Drupal Ajax response.
    * @param {string} [response.effect]
+   *   Override the default value of {@link Drupal.Ajax#element_settings}.
    * @param {string|number} [response.speed]
+   *   Override the default value of {@link Drupal.Ajax#element_settings}.
    *
    * @return {object}
+   *   Returns an object with `showEffect`, `hideEffect` and `showSpeed`
+   *   properties.
    */
   Drupal.Ajax.prototype.getEffect = function (response) {
     var type = response.effect || this.effect;
@@ -819,8 +939,11 @@
    * Handler for the form redirection error.
    *
    * @param {object} xmlhttprequest
+   *   Native XMLHttpRequest object.
    * @param {string} uri
-   * @param {string} customMessage
+   *   Ajax Request URI.
+   * @param {string} [customMessage]
+   *   Extra message to print with the Ajax error.
    */
   Drupal.Ajax.prototype.error = function (xmlhttprequest, uri, customMessage) {
     // Remove the progress element.
@@ -877,17 +1000,24 @@
      * Command to insert new content into the DOM.
      *
      * @param {Drupal.Ajax} ajax
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.data
+     *   The data to use with the jQuery method.
      * @param {string} [response.method]
+     *   The jQuery DOM manipulation method to be used.
      * @param {string} [response.selector]
+     *   A optional jQuery selector string.
      * @param {object} [response.settings]
+     *   An optional array of settings that will be used.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     insert: function (ajax, response, status) {
       // Get information from the response. If it is not there, default to
       // our presets.
-      var wrapper = response.selector ? $(response.selector) : $(ajax.wrapper);
+      var $wrapper = response.selector ? $(response.selector) : $(ajax.wrapper);
       var method = response.method || ajax.method;
       var effect = ajax.getEffect(response);
       var settings;
@@ -897,11 +1027,11 @@
       // $(response.data) as new HTML rather than a CSS selector. Also, if
       // response.data contains top-level text nodes, they get lost with either
       // $(response.data) or $('<div></div>').replaceWith(response.data).
-      var new_content_wrapped = $('<div></div>').html(response.data);
-      var new_content = new_content_wrapped.contents();
+      var $new_content_wrapped = $('<div></div>').html(response.data);
+      var $new_content = $new_content_wrapped.contents();
 
       // For legacy reasons, the effects processing code assumes that
-      // new_content consists of a single top-level element. Also, it has not
+      // $new_content consists of a single top-level element. Also, it has not
       // been sufficiently tested whether attachBehaviors() can be successfully
       // called with a context object that includes top-level text nodes.
       // However, to give developers full control of the HTML appearing in the
@@ -911,8 +1041,8 @@
       // top-level element, and only use the container DIV created above when
       // it doesn't. For more information, please see
       // https://www.drupal.org/node/736066.
-      if (new_content.length !== 1 || new_content.get(0).nodeType !== 1) {
-        new_content = new_content_wrapped;
+      if ($new_content.length !== 1 || $new_content.get(0).nodeType !== 1) {
+        $new_content = $new_content_wrapped;
       }
 
       // If removing content from the wrapper, detach behaviors first.
@@ -923,35 +1053,35 @@
         case 'empty':
         case 'remove':
           settings = response.settings || ajax.settings || drupalSettings;
-          Drupal.detachBehaviors(wrapper.get(0), settings);
+          Drupal.detachBehaviors($wrapper.get(0), settings);
       }
 
       // Add the new content to the page.
-      wrapper[method](new_content);
+      $wrapper[method]($new_content);
 
       // Immediately hide the new content if we're using any effects.
       if (effect.showEffect !== 'show') {
-        new_content.hide();
+        $new_content.hide();
       }
 
       // Determine which effect to use and what content will receive the
       // effect, then show the new content.
-      if (new_content.find('.ajax-new-content').length > 0) {
-        new_content.find('.ajax-new-content').hide();
-        new_content.show();
-        new_content.find('.ajax-new-content')[effect.showEffect](effect.showSpeed);
+      if ($new_content.find('.ajax-new-content').length > 0) {
+        $new_content.find('.ajax-new-content').hide();
+        $new_content.show();
+        $new_content.find('.ajax-new-content')[effect.showEffect](effect.showSpeed);
       }
       else if (effect.showEffect !== 'show') {
-        new_content[effect.showEffect](effect.showSpeed);
+        $new_content[effect.showEffect](effect.showSpeed);
       }
 
       // Attach all JavaScript behaviors to the new content, if it was
       // successfully added to the page, this if statement allows
       // `#ajax['wrapper']` to be optional.
-      if (new_content.parents('html').length > 0) {
+      if ($new_content.parents('html').length > 0) {
         // Apply any settings from the returned JSON if available.
         settings = response.settings || ajax.settings || drupalSettings;
-        Drupal.attachBehaviors(new_content.get(0), settings);
+        Drupal.attachBehaviors($new_content.get(0), settings);
       }
     },
 
@@ -959,10 +1089,15 @@
      * Command to remove a chunk from the page.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {object} [response.settings]
+     *   An optional array of settings that will be used.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     remove: function (ajax, response, status) {
       var settings = response.settings || ajax.settings || drupalSettings;
@@ -976,16 +1111,23 @@
      * Command to mark a chunk changed.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The JSON response object from the Ajax request.
      * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {bool} [response.asterisk]
+     *   An optional CSS selector. If specified, an asterisk will be
+     *   appended to the HTML inside the provided selector.
      * @param {number} [status]
+     *   The request status.
      */
     changed: function (ajax, response, status) {
-      if (!$(response.selector).hasClass('ajax-changed')) {
-        $(response.selector).addClass('ajax-changed');
+      var $element = $(response.selector);
+      if (!$element.hasClass('ajax-changed')) {
+        $element.addClass('ajax-changed');
         if (response.asterisk) {
-          $(response.selector).find(response.asterisk).append(' <abbr class="ajax-changed" title="' + Drupal.t('Changed') + '">*</abbr> ');
+          $element.find(response.asterisk).append(' <abbr class="ajax-changed" title="' + Drupal.t('Changed') + '">*</abbr> ');
         }
       }
     },
@@ -994,10 +1136,13 @@
      * Command to provide an alert.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The JSON response from the Ajax request.
      * @param {string} response.text
-     * @param {string} response.title
+     *   The text that will be displayed in an alert dialog.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     alert: function (ajax, response, status) {
       window.alert(response.text, response.title);
@@ -1007,9 +1152,13 @@
      * Command to set the window.location, redirecting the browser.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.url
+     *   The URL to redirect to.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     redirect: function (ajax, response, status) {
       window.location = response.url;
@@ -1019,9 +1168,15 @@
      * Command to provide the jQuery css() function.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
+     * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {object} response.argument
+     *   An array of key/value pairs to set in the CSS for the selector.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     css: function (ajax, response, status) {
       $(response.selector).css(response.argument);
@@ -1030,13 +1185,37 @@
     /**
      * Command to set the settings used for other commands in this response.
      *
+     * This method will also remove expired `drupalSettings.ajax` settings.
+     *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {bool} response.merge
+     *   Determines whether the additional settings should be merged to the
+     *   global settings.
      * @param {object} response.settings
+     *   Contains additional settings to add to the global settings.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     settings: function (ajax, response, status) {
+      var ajaxSettings = drupalSettings.ajax;
+
+      // Clean up drupalSettings.ajax.
+      Drupal.ajax.expired().forEach(function (instance) {
+        // If the Ajax object has been created through drupalSettings.ajax
+        // it will have a selector. When there is no selector the object
+        // has been initialized with a special class name picked up by the
+        // Ajax behavior.
+        if (instance.selector) {
+          var selector = instance.selector.replace('#', '');
+          if (selector in ajaxSettings) {
+            delete ajaxSettings[selector];
+          }
+        }
+      });
+
       if (response.merge) {
         $.extend(true, drupalSettings, response.settings);
       }
@@ -1049,11 +1228,18 @@
      * Command to attach data using jQuery's data API.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.name
+     *   The name or key (in the key value pair) of the data attached to this
+     *   selector.
      * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {string|object} response.value
+     *   The value of to be attached.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     data: function (ajax, response, status) {
       $(response.selector).data(response.name, response.value);
@@ -1063,11 +1249,17 @@
      * Command to apply a jQuery method.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {Array} response.args
+     *   An array of arguments to the jQuery method, if any.
      * @param {string} response.method
+     *   The jQuery method to invoke.
      * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     invoke: function (ajax, response, status) {
       var $element = $(response.selector);
@@ -1078,9 +1270,13 @@
      * Command to restripe a table.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.selector
+     *   A jQuery selector string.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     restripe: function (ajax, response, status) {
       // :even and :odd are reversed because jQuery counts from 0 and
@@ -1096,10 +1292,15 @@
      * Command to update a form's build ID.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.old
+     *   The old form build ID.
      * @param {string} response.new
+     *   The new form build ID.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     update_build_id: function (ajax, response, status) {
       $('input[name="form_build_id"][value="' + response.old + '"]').val(response.new);
@@ -1113,9 +1314,13 @@
      * stylesheets.
      *
      * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
      * @param {object} response
+     *   The response from the Ajax request.
      * @param {string} response.data
+     *   A string that contains the styles to be added.
      * @param {number} [status]
+     *   The XMLHttpRequest status.
      */
     add_css: function (ajax, response, status) {
       // Add the styles in the normal way.
@@ -1133,4 +1338,4 @@
     }
   };
 
-})(jQuery, this, Drupal, drupalSettings);
+})(jQuery, window, Drupal, drupalSettings);
diff --git a/core/misc/announce.js b/core/misc/announce.js
index 235c597..acf850a 100644
--- a/core/misc/announce.js
+++ b/core/misc/announce.js
@@ -29,6 +29,9 @@
    * Builds a div element with the aria-live attribute and add it to the DOM.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the behavior for drupalAnnouce.
    */
   Drupal.behaviors.drupalAnnounce = {
     attach: function (context) {
@@ -98,6 +101,7 @@
    *   'polite' or 'assertive'.
    *
    * @return {function}
+   *   The return of the call to debounce.
    *
    * @see http://www.w3.org/WAI/PF/aria-practices/#liveprops
    */
diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 4bef284..032a15c 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -15,8 +15,10 @@
    * @function Drupal.autocomplete.splitValues
    *
    * @param {string} value
+   *   The value being entered by the user.
    *
    * @return {Array}
+   *   Array of values, split by comma.
    */
   function autocompleteSplitValues(value) {
     // We will match the value against comma-separated terms.
@@ -53,8 +55,10 @@
    * @function Drupal.autocomplete.extractLastTerm
    *
    * @param {string} terms
+   *   The value of the field.
    *
    * @return {string}
+   *   The last value of the input field.
    */
   function extractLastTerm(terms) {
     return autocomplete.splitValues(terms).pop();
@@ -66,8 +70,10 @@
    * @function Drupal.autocomplete.options.search
    *
    * @param {object} event
+   *   The event triggered.
    *
    * @return {bool}
+   *   Whether to perform a search or not.
    */
   function searchHandler(event) {
     var options = autocomplete.options;
@@ -84,7 +90,9 @@
    * JQuery UI autocomplete source callback.
    *
    * @param {object} request
+   *   The request object.
    * @param {function} response
+   *   The function to call with the response.
    */
   function sourceData(request, response) {
     var elementId = this.element.attr('id');
@@ -98,6 +106,7 @@
      * display the available terms to the user.
      *
      * @param {object} suggestions
+     *   Suggestions returned by the server.
      */
     function showSuggestions(suggestions) {
       var tagged = autocomplete.splitValues(request.term);
@@ -115,6 +124,7 @@
      * Transforms the data object into an array and update autocomplete results.
      *
      * @param {object} data
+     *   The data sent back from the server.
      */
     function sourceCallbackHandler(data) {
       autocomplete.cache[elementId][term] = data;
@@ -140,6 +150,7 @@
    * Handles an autocompletefocus event.
    *
    * @return {bool}
+   *   Always returns false.
    */
   function focusHandler() {
     return false;
@@ -149,9 +160,12 @@
    * Handles an autocompleteselect event.
    *
    * @param {jQuery.Event} event
+   *   The event triggered.
    * @param {object} ui
+   *   The jQuery UI settings object.
    *
    * @return {bool}
+   *   Returns false to indicate the event status.
    */
   function selectHandler(event, ui) {
     var terms = autocomplete.splitValues(event.target.value);
@@ -172,10 +186,13 @@
   /**
    * Override jQuery UI _renderItem function to output HTML by default.
    *
-   * @param {object} ul
+   * @param {jQuery} ul
+   *   jQuery collection of the ul element.
    * @param {object} item
+   *   The list item to append.
    *
-   * @return {object}
+   * @return {jQuery}
+   *   jQuery collection of the ul element.
    */
   function renderItem(ul, item) {
     return $('<li>')
@@ -187,6 +204,11 @@
    * Attaches the autocomplete behavior to all required fields.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the autocomplete behaviors.
+   * @prop {Drupal~behaviorDetach} detach
+   *   Detaches the autocomplete behaviors.
    */
   Drupal.behaviors.autocomplete = {
     attach: function (context) {
diff --git a/core/misc/collapse.js b/core/misc/collapse.js
index f635647..767325e 100644
--- a/core/misc/collapse.js
+++ b/core/misc/collapse.js
@@ -13,6 +13,7 @@
    * @constructor Drupal.CollapsibleDetails
    *
    * @param {HTMLElement} node
+   *   The details element.
    */
   function CollapsibleDetails(node) {
     this.$node = $(node);
@@ -82,6 +83,7 @@
      * Handle legend clicks.
      *
      * @param {jQuery.Event} e
+     *   The event triggered.
      */
     onLegendClick: function (e) {
       this.toggle();
@@ -120,6 +122,9 @@
    * Polyfill HTML5 details element.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches behavior for the details element.
    */
   Drupal.behaviors.collapse = {
     attach: function (context) {
diff --git a/core/misc/dialog/dialog.ajax.js b/core/misc/dialog/dialog.ajax.js
index bfe2980..16f72f0 100644
--- a/core/misc/dialog/dialog.ajax.js
+++ b/core/misc/dialog/dialog.ajax.js
@@ -11,6 +11,9 @@
    * Initialize dialogs for Ajax purposes.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the behaviors for dialog ajax functionality.
    */
   Drupal.behaviors.dialog = {
     attach: function (context, settings) {
@@ -90,10 +93,14 @@
    * Command to open a dialog.
    *
    * @param {Drupal.Ajax} ajax
+   *   The Drupal Ajax object.
    * @param {object} response
+   *   Object holding the server response.
    * @param {number} [status]
+   *   The HTTP status code.
    *
    * @return {bool|undefined}
+   *   Returns false if there was no selector property in the response object.
    */
   Drupal.AjaxCommands.prototype.openDialog = function (ajax, response, status) {
     if (!response.selector) {
@@ -146,10 +153,15 @@
    * If no selector is given, it defaults to trying to close the modal.
    *
    * @param {Drupal.Ajax} [ajax]
+   *   The ajax object.
    * @param {object} response
+   *   Object holding the server response.
    * @param {string} response.selector
+   *   The selector of the dialog.
    * @param {bool} response.persist
+   *   Whether to persist the dialog element or not.
    * @param {number} [status]
+   *   The HTTP status code.
    */
   Drupal.AjaxCommands.prototype.closeDialog = function (ajax, response, status) {
     var $dialog = $(response.selector);
@@ -170,11 +182,17 @@
    * JQuery UI specific way of setting dialog options.
    *
    * @param {Drupal.Ajax} [ajax]
+   *   The Drupal Ajax object.
    * @param {object} response
+   *   Object holding the server response.
    * @param {string} response.selector
+   *   Selector for the dialog element.
    * @param {string} response.optionsName
+   *   Name of a key to set.
    * @param {string} response.optionValue
+   *   Value to set.
    * @param {number} [status]
+   *   The HTTP status code.
    */
   Drupal.AjaxCommands.prototype.setDialogOption = function (ajax, response, status) {
     var $dialog = $(response.selector);
@@ -187,9 +205,13 @@
    * Binds a listener on dialog creation to handle the cancel link.
    *
    * @param {jQuery.Event} e
+   *   The event triggered.
    * @param {Drupal.dialog~dialogDefinition} dialog
+   *   The dialog instance.
    * @param {jQuery} $element
-   * @param {object} settings
+   *   The jQuery collection of the dialog element.
+   * @param {object} [settings]
+   *   Dialog settings.
    */
   $(window).on('dialog:aftercreate', function (e, dialog, $element, settings) {
     $element.on('click.dialog', '.dialog-cancel', function (e) {
@@ -203,8 +225,11 @@
    * Removes all 'dialog' listeners.
    *
    * @param {jQuery.Event} e
+   *   The event triggered.
    * @param {Drupal.dialog~dialogDefinition} dialog
+   *   The dialog instance.
    * @param {jQuery} $element
+   *   jQuery collection of the dialog element.
    */
   $(window).on('dialog:beforeclose', function (e, dialog, $element) {
     $element.off('.dialog');
diff --git a/core/misc/dialog/dialog.js b/core/misc/dialog/dialog.js
index 197fae2..ea1e52c 100644
--- a/core/misc/dialog/dialog.js
+++ b/core/misc/dialog/dialog.js
@@ -55,10 +55,12 @@
    * Polyfill HTML5 dialog element with jQueryUI.
    *
    * @param {HTMLElement} element
+   *   The element that holds the dialog.
    * @param {object} options
    *   jQuery UI options to be passed to the dialog.
    *
    * @return {Drupal.dialog~dialogDefinition}
+   *   The dialog instance.
    */
   Drupal.dialog = function (element, options) {
     var undef;
diff --git a/core/misc/dialog/dialog.position.js b/core/misc/dialog/dialog.position.js
index c0dd9df..7678646 100644
--- a/core/misc/dialog/dialog.position.js
+++ b/core/misc/dialog/dialog.position.js
@@ -27,6 +27,7 @@
    * @function Drupal.dialog~resetSize
    *
    * @param {jQuery.Event} event
+   *   The event triggered.
    *
    * @fires event:dialogContentResize
    */
@@ -67,8 +68,10 @@
    * @function Drupal.dialog~resetPosition
    *
    * @param {object} options
+   *   Options object.
    *
    * @return {object}
+   *   Altered options object.
    */
   function resetPosition(options) {
     var offsets = displace.offsets;
diff --git a/core/misc/dropbutton/dropbutton.js b/core/misc/dropbutton/dropbutton.js
index ef707a6..04f9491a 100644
--- a/core/misc/dropbutton/dropbutton.js
+++ b/core/misc/dropbutton/dropbutton.js
@@ -11,6 +11,9 @@
    * Process elements with the .dropbutton class on page load.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches dropButton behaviors.
    */
   Drupal.behaviors.dropButton = {
     attach: function (context, settings) {
@@ -36,6 +39,7 @@
    * @function Drupal.DropButton~dropbuttonClickHandler
    *
    * @param {jQuery.Event} e
+   *   The event triggered.
    */
   function dropbuttonClickHandler(e) {
     e.preventDefault();
@@ -190,6 +194,7 @@
 
     /**
      * @param {jQuery.Event} e
+     *   The event triggered.
      */
     focusOut: function (e) {
       this.hoverOut.call(this, e);
@@ -197,6 +202,7 @@
 
     /**
      * @param {jQuery.Event} e
+     *   The event triggered.
      */
     focusIn: function (e) {
       this.hoverIn.call(this, e);
@@ -209,6 +215,7 @@
      * A toggle is an interactive element often bound to a click handler.
      *
      * @param {object} options
+     *   Options object.
      * @param {string} [options.title]
      *   The HTML anchor title attribute and text for the inner span element.
      *
diff --git a/core/misc/drupal.js b/core/misc/drupal.js
index f19fc43..750d908 100644
--- a/core/misc/drupal.js
+++ b/core/misc/drupal.js
@@ -273,6 +273,7 @@ if (window.jQuery) {
    *      `{@link Drupal.theme}('placeholder')`).
    *
    * @return {string}
+   *   The formatted string.
    *
    * @see Drupal.t
    */
diff --git a/core/misc/form.js b/core/misc/form.js
index f2bf08a..7ca64fc 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -20,6 +20,7 @@
    * Retrieves the summary for the first element.
    *
    * @return {string}
+   *   The text of the summary.
    */
   $.fn.drupalGetSummary = function () {
     var callback = this.data('summaryCallback');
@@ -34,6 +35,7 @@
    *   retrieved or a string (which is returned each time).
    *
    * @return {jQuery}
+   *   jQuery collection of the current element.
    *
    * @fires event:summaryUpdated
    *
@@ -125,6 +127,7 @@
    * Sends a 'formUpdated' event each time a form element is modified.
    *
    * @param {HTMLElement} element
+   *   The element to trigger a form updated event on.
    *
    * @fires event:formUpdated
    */
@@ -136,8 +139,10 @@
    * Collects the IDs of all form fields in the given form.
    *
    * @param {HTMLFormElement} form
+   *   The form element to search.
    *
    * @return {Array}
+   *   Array of IDs for form fields.
    */
   function fieldsList(form) {
     var $fieldList = $(form).find('[name]').map(function (index, element) {
@@ -154,6 +159,11 @@
    *
    * @type {Drupal~behavior}
    *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches formUpdated behaviors.
+   * @prop {Drupal~behaviorDetach} detach
+   *   Detaches formUpdated behaviors.
+   *
    * @fires event:formUpdated
    */
   Drupal.behaviors.formUpdated = {
@@ -208,6 +218,9 @@
    * Prepopulate form fields with information from the visitor browser.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the behavior for filling user info from browser.
    */
   Drupal.behaviors.fillUserInfoFromBrowser = {
     attach: function (context, settings) {
diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 27016ed..bbad2e3 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -11,6 +11,9 @@
    * Attach the machine-readable name form element behavior.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches machine-name behaviors.
    */
   Drupal.behaviors.machineName = {
 
@@ -18,7 +21,9 @@
      * Attaches the behavior.
      *
      * @param {Element} context
+     *   The context for attaching the behavior.
      * @param {object} settings
+     *   Settings object.
      * @param {object} settings.machineName
      *   A list of elements to process, keyed by the HTML ID of the form
      *   element containing the human-readable value. Each element is an object
diff --git a/core/misc/menu-leaf.png b/core/misc/menu-leaf.png
deleted file mode 100644
index 6b2d63f..0000000
--- a/core/misc/menu-leaf.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR6|J�PLTE������������E��<
tRNS@��fIDAT[c`cfe �($��b �
����IEND�B`�
\ No newline at end of file
diff --git a/core/misc/progress.js b/core/misc/progress.js
index 2675751..a669489 100644
--- a/core/misc/progress.js
+++ b/core/misc/progress.js
@@ -11,6 +11,7 @@
    * Theme function for the progress bar.
    *
    * @param {string} id
+   *   The id for the progress bar.
    *
    * @return {string}
    *   The HTML for the progress bar.
@@ -38,9 +39,13 @@
    * @constructor
    *
    * @param {string} id
+   *   The id for the progressbar.
    * @param {function} updateCallback
+   *   Callback to run on update.
    * @param {string} method
+   *   HTTP method to use.
    * @param {function} errorCallback
+   *   Callback to call on error.
    */
   Drupal.ProgressBar = function (id, updateCallback, method, errorCallback) {
     this.id = id;
@@ -61,8 +66,11 @@
      * Set the percentage and status message for the progressbar.
      *
      * @param {number} percentage
+     *   The progress percentage.
      * @param {string} message
+     *   The message to show the user.
      * @param {string} label
+     *   The text for the progressbar label.
      */
     setProgress: function (percentage, message, label) {
       if (percentage >= 0 && percentage <= 100) {
@@ -80,7 +88,9 @@
      * Start monitoring progress via Ajax.
      *
      * @param {string} uri
+     *   The URI to use for monitoring.
      * @param {number} delay
+     *   The delay for calling the monitoring URI.
      */
     startMonitoring: function (uri, delay) {
       this.delay = delay;
@@ -144,6 +154,7 @@
      * Display errors on the page.
      *
      * @param {string} string
+     *   The error message to show the user.
      */
     displayError: function (string) {
       var error = $('<div class="messages messages--error"></div>').html(string);
diff --git a/core/misc/states.js b/core/misc/states.js
index 30c938f..24374b6 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -3,7 +3,7 @@
  * Drupal's states library.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -27,6 +27,9 @@
    * Attaches the states.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches states behaviors.
    */
   Drupal.behaviors.states = {
     attach: function (context, settings) {
@@ -329,6 +332,7 @@
      * @memberof Drupal.states.Dependent#
      *
      * @return {object}
+     *   An object describing the required triggers.
      */
     getDependees: function () {
       var cache = {};
@@ -359,6 +363,7 @@
    * @constructor Drupal.states.Trigger
    *
    * @param {object} args
+   *   Trigger arguments.
    */
   states.Trigger = function (args) {
     $.extend(this, args);
@@ -402,7 +407,9 @@
      * @memberof Drupal.states.Trigger#
      *
      * @param {jQuery.Event} event
+     *   The event triggered.
      * @param {function} valueFn
+     *   The function to call.
      */
     defaultTrigger: function (event, valueFn) {
       var oldValue = valueFn.call(this.element);
@@ -498,6 +505,7 @@
    * @constructor Drupal.states.State
    *
    * @param {string} state
+   *   The name of the state.
    */
   states.State = function (state) {
 
@@ -531,8 +539,10 @@
    * @name Drupal.states.State.sanitize
    *
    * @param {string|Drupal.states.State} state
+   *   A state object or the name of a state.
    *
    * @return {Drupal.states.state}
+   *   A state object.
    */
   states.State.sanitize = function (state) {
     if (state instanceof states.State) {
@@ -577,6 +587,7 @@
      * @memberof Drupal.states.State#
      *
      * @return {string}
+     *   The name of the state.
      */
     toString: function () {
       return this.name;
@@ -590,7 +601,8 @@
    * can override these state change handlers for particular parts of a page.
    */
 
-  $(document).on('state:disabled', function (e) {
+  var $document = $(document);
+  $document.on('state:disabled', function (e) {
     // Only act when this change was triggered by a dependency and not by the
     // element monitoring itself.
     if (e.trigger) {
@@ -604,7 +616,7 @@
     }
   });
 
-  $(document).on('state:required', function (e) {
+  $document.on('state:required', function (e) {
     if (e.trigger) {
       if (e.value) {
         var label = 'label' + (e.target.id ? '[for=' + e.target.id + ']' : '');
@@ -620,19 +632,19 @@
     }
   });
 
-  $(document).on('state:visible', function (e) {
+  $document.on('state:visible', function (e) {
     if (e.trigger) {
       $(e.target).closest('.js-form-item, .js-form-submit, .js-form-wrapper').toggle(e.value);
     }
   });
 
-  $(document).on('state:checked', function (e) {
+  $document.on('state:checked', function (e) {
     if (e.trigger) {
       $(e.target).prop('checked', e.value);
     }
   });
 
-  $(document).on('state:collapsed', function (e) {
+  $document.on('state:collapsed', function (e) {
     if (e.trigger) {
       if ($(e.target).is('[open]') === e.value) {
         $(e.target).find('> summary').trigger('click');
@@ -651,9 +663,12 @@
    * @function Drupal.states~ternary
    *
    * @param {*} a
+   *   Value a.
    * @param {*} b
+   *   Value b
    *
    * @return {bool}
+   *   The result.
    */
   function ternary(a, b) {
     if (typeof a === 'undefined') {
@@ -673,9 +688,12 @@
    * @function Drupal.states~invert
    *
    * @param {*} a
+   *   The value to maybe invert.
    * @param {bool} invertState
+   *   Whether to invert state or not.
    *
    * @return {bool}
+   *   The result.
    */
   function invert(a, invertState) {
     return (invertState && typeof a !== 'undefined') ? !a : a;
@@ -687,9 +705,12 @@
    * @function Drupal.states~compare
    *
    * @param {*} a
+   *   Value a.
    * @param {*} b
+   *   Value b.
    *
    * @return {bool}
+   *   The comparison result.
    */
   function compare(a, b) {
     if (a === b) {
@@ -700,4 +721,4 @@
     }
   }
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/misc/tabbingmanager.js b/core/misc/tabbingmanager.js
index ca4991b..134523f 100644
--- a/core/misc/tabbingmanager.js
+++ b/core/misc/tabbingmanager.js
@@ -66,6 +66,7 @@
      *   be a jQuery-compatible selector string.
      *
      * @return {Drupal~TabbingContext}
+     *   The TabbingContext instance.
      *
      * @fires event:drupalTabbingConstrained
      */
diff --git a/core/misc/tableheader.js b/core/misc/tableheader.js
index 7d55a04..8fc1b04 100644
--- a/core/misc/tableheader.js
+++ b/core/misc/tableheader.js
@@ -11,6 +11,9 @@
    * Attaches sticky table headers.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches the sticky table header behavior.
    */
   Drupal.behaviors.tableHeader = {
     attach: function (context) {
@@ -215,9 +218,12 @@
      * Set absolute position of sticky.
      *
      * @param {number} offsetTop
+     *   The top offset for the sticky header.
      * @param {number} offsetLeft
+     *   The left offset for the sticky header.
      *
      * @return {jQuery}
+     *   The sticky table as a jQuery collection.
      */
     stickyPosition: function (offsetTop, offsetLeft) {
       var css = {};
@@ -234,6 +240,7 @@
      * Returns true if sticky is currently visible.
      *
      * @return {bool}
+     *   The visibility status.
      */
     checkStickyVisible: function () {
       var scrollTop = scrollValue('scrollTop');
@@ -256,6 +263,7 @@
      * calls.
      *
      * @param {jQuery.Event} e
+     *   The scroll event.
      */
     onScroll: function (e) {
       this.checkStickyVisible();
diff --git a/core/misc/tableresponsive.js b/core/misc/tableresponsive.js
index 04965ef..0127ec8 100644
--- a/core/misc/tableresponsive.js
+++ b/core/misc/tableresponsive.js
@@ -11,6 +11,9 @@
    * Attach the tableResponsive function to {@link Drupal.behaviors}.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches tableResponsive functionality.
    */
   Drupal.behaviors.tableResponsive = {
     attach: function (context, settings) {
@@ -37,6 +40,7 @@
    * @constructor Drupal.TableResponsive
    *
    * @param {HTMLElement} table
+   *   The table element to initialize the responsive table on.
    */
   function TableResponsive(table) {
     this.table = table;
@@ -82,6 +86,7 @@
 
     /**
      * @param {jQuery.Event} e
+     *   The event triggered.
      */
     eventhandlerEvaluateColumnVisibility: function (e) {
       var pegged = parseInt(this.$link.data('pegged'), 10);
@@ -105,6 +110,7 @@
      * Columns are classed with either 'priority-low' or 'priority-medium'.
      *
      * @param {jQuery.Event} e
+     *   The event triggered.
      */
     eventhandlerToggleColumns: function (e) {
       e.preventDefault();
diff --git a/core/misc/tableselect.js b/core/misc/tableselect.js
index 2011374..053af05 100644
--- a/core/misc/tableselect.js
+++ b/core/misc/tableselect.js
@@ -11,6 +11,9 @@
    * Initialize tableSelects.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches tableSelect functionality.
    */
   Drupal.behaviors.tableSelect = {
     attach: function (context, settings) {
@@ -117,8 +120,11 @@
 
   /**
    * @param {HTMLElement} from
+   *   The HTML element representing the "from" part of the range.
    * @param {HTMLElement} to
+   *   The HTML element representing the "to" part of the range.
    * @param {bool} state
+   *   The state to set on the range.
    */
   Drupal.tableSelectRange = function (from, to, state) {
     // We determine the looping mode based on the order of from and to.
diff --git a/core/misc/timezone.js b/core/misc/timezone.js
index f1ba7c9..3c88d46 100644
--- a/core/misc/timezone.js
+++ b/core/misc/timezone.js
@@ -3,7 +3,7 @@
  * Timezone detection.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -73,4 +73,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/misc/vertical-tabs.js b/core/misc/vertical-tabs.js
index 2794481..c7ad2fd 100644
--- a/core/misc/vertical-tabs.js
+++ b/core/misc/vertical-tabs.js
@@ -12,7 +12,7 @@
  * @event summaryUpdated
  */
 
-(function ($) {
+(function ($, Drupal, drupalSettings) {
 
   'use strict';
 
@@ -26,6 +26,9 @@
    * element inside the tab pane.
    *
    * @type {Drupal~behavior}
+   *
+   * @prop {Drupal~behaviorAttach} attach
+   *   Attaches behaviors for vertical tabs.
    */
   Drupal.behaviors.verticalTabs = {
     attach: function (context) {
@@ -99,6 +102,7 @@
    * @constructor
    *
    * @param {object} settings
+   *   Settings object.
    * @param {string} settings.title
    *   The name of the tab.
    * @param {jQuery} settings.details
@@ -171,6 +175,7 @@
      * Shows a vertical tab pane.
      *
      * @return {Drupal.verticalTab}
+     *   The verticalTab instance.
      */
     tabShow: function () {
       // Display the tab.
@@ -193,6 +198,7 @@
      * Hides a vertical tab pane.
      *
      * @return {Drupal.verticalTab}
+     *   The verticalTab instance.
      */
     tabHide: function () {
       // Hide this tab.
@@ -243,4 +249,4 @@
     return tab;
   };
 
-})(jQuery);
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
deleted file mode 100644
index 207aa68..0000000
--- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionConfigsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to action.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['action'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_action_settings');
-  }
-
-  /**
-   * Tests migration of action variables to action.settings.yml.
-   */
-  public function testActionSettings() {
-    $config = $this->config('action.settings');
-    $this->assertIdentical(35, $config->get('recursion_limit'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php
deleted file mode 100644
index c37a9a7..0000000
--- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionsTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d6\MigrateActionsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d6;
-
-use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests migration of action items.
- *
- * @group migrate_drupal_6
- */
-class MigrateActionsTest extends MigrateDrupal6TestBase {
-
-  public static $modules = ['action', 'comment', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_action');
-  }
-
-  /**
-   * Test Drupal 6 action migration to Drupal 8.
-   */
-  public function testActions() {
-    // Test default actions.
-    $this->assertEntity('node_publish_action', 'Publish post', 'node', []);
-    $this->assertEntity('node_make_sticky_action', 'Make post sticky', 'node', []);
-    $this->assertEntity('user_block_user_action', 'Block current user', 'user', []);
-    $this->assertEntity('comment_publish_action', 'Publish comment', 'comment', []);
-
-    // Test advanced actions.
-    $this->assertEntity('unpublish_comment_containing_keyword_s_', 'Unpublish comment containing keyword(s)', 'comment', ["keywords" => [0 => "drupal"]]);
-    $this->assertEntity('change_the_author_of_a_post', 'Change the author of a post', 'node', ["owner_uid" => "2"]);
-    $this->assertEntity('unpublish_post_containing_keyword_s_', 'Unpublish post containing keyword(s)', 'node', ["keywords" => [0 => "drupal"]]);
-    $this->assertEntity('display_a_message_to_the_user', 'Display a message to the user', 'system', ["message" => "Drupal migration test"]);
-    $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
-      "recipient" => "test@example.com",
-      "subject" => "Drupal migration test",
-      "message" => "Drupal migration test"
-    ]);
-    $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
-
-  }
-
-  /**
-   * Asserts various aspects of an Action entity.
-   *
-   * @param string $id
-   *   The expected Action ID.
-   * @param string $label
-   *   The expected Action label.
-   * @param string $type
-   *   The expected Action type.
-   * @param array $configuration
-   *   The expected Action configuration.
-   */
-  protected function assertEntity($id, $label, $type, $configuration) {
-    $action = Action::load($id);
-
-    $this->assertTrue($action instanceof Action);
-    /** @var \Drupal\system\Entity\Action $action */
-    $this->assertIdentical($id, $action->id());
-    $this->assertIdentical($label, $action->label());
-    $this->assertIdentical($type, $action->getType());
-    $this->assertIdentical($configuration, $action->get('configuration'));
-  }
-
-}
diff --git a/core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php b/core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php
deleted file mode 100644
index 1d54219..0000000
--- a/core/modules/action/src/Tests/Migrate/d7/MigrateActionsTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\action\Tests\Migrate\d7\MigrateActionsTest.
- */
-
-namespace Drupal\action\Tests\Migrate\d7;
-
-use Drupal\system\Entity\Action;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of action items.
- *
- * @group action
- */
-class MigrateActionsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['action', 'comment', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_action');
-  }
-
-  /**
-   * Test Drupal 7 action migration to Drupal 8.
-   */
-  public function testActions() {
-    // Test default actions.
-    $this->assertEntity('node_publish_action', 'Publish content', 'node', []);
-    $this->assertEntity('node_make_sticky_action', 'Make content sticky', 'node', []);
-    $this->assertEntity('user_block_user_action', 'Block current user', 'user', []);
-    $this->assertEntity('comment_publish_action', 'Publish comment', 'comment', []);
-
-    // Test advanced actions.
-    $this->assertEntity('unpublish_comment_containing_keyword_s_', 'Unpublish comment containing keyword(s)', 'comment', ["keywords" => [0 => "drupal"]]);
-    $this->assertEntity('change_the_author_of_content', 'Change the author of content', 'node', ["owner_uid" => "2"]);
-    $this->assertEntity('unpublish_content_containing_keyword_s_', 'Unpublish content containing keyword(s)', 'node', ["keywords" => [0 => "drupal"]]);
-    $this->assertEntity('display_a_message_to_the_user', 'Display a message to the user', 'system', ["message" => "Drupal migration test"]);
-    $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
-      "recipient" => "test@example.com",
-      "subject" => "Drupal migration test",
-      "message" => "Drupal migration test"
-    ]);
-    $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
-
-  }
-
-  /**
-   * Asserts various aspects of an Action entity.
-   *
-   * @param string $id
-   *   The expected Action ID.
-   * @param string $label
-   *   The expected Action label.
-   * @param string $type
-   *   The expected Action type.
-   * @param array $configuration
-   *   The expected Action configuration.
-   */
-  protected function assertEntity($id, $label, $type, $configuration) {
-    $action = Action::load($id);
-
-    $this->assertTrue($action instanceof Action);
-    /** @var \Drupal\system\Entity\Action $action */
-    $this->assertIdentical($id, $action->id());
-    $this->assertIdentical($label, $action->label());
-    $this->assertIdentical($type, $action->getType());
-    $this->assertIdentical($configuration, $action->get('configuration'));
-  }
-
-}
diff --git a/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
new file mode 100644
index 0000000..1f75bb6
--- /dev/null
+++ b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d6\MigrateActionConfigsTest.
+ */
+
+namespace Drupal\Tests\action\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to action.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['action'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_action_settings');
+  }
+
+  /**
+   * Tests migration of action variables to action.settings.yml.
+   */
+  public function testActionSettings() {
+    $config = $this->config('action.settings');
+    $this->assertIdentical(35, $config->get('recursion_limit'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'action.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
new file mode 100644
index 0000000..7addb1e
--- /dev/null
+++ b/core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionsTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d6\MigrateActionsTest.
+ */
+
+namespace Drupal\Tests\action\Kernel\Migrate\d6;
+
+use Drupal\system\Entity\Action;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of action items.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateActionsTest extends MigrateDrupal6TestBase {
+
+  public static $modules = ['action', 'comment', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_action');
+  }
+
+  /**
+   * Test Drupal 6 action migration to Drupal 8.
+   */
+  public function testActions() {
+    // Test default actions.
+    $this->assertEntity('node_publish_action', 'Publish post', 'node', []);
+    $this->assertEntity('node_make_sticky_action', 'Make post sticky', 'node', []);
+    $this->assertEntity('user_block_user_action', 'Block current user', 'user', []);
+    $this->assertEntity('comment_publish_action', 'Publish comment', 'comment', []);
+
+    // Test advanced actions.
+    $this->assertEntity('unpublish_comment_containing_keyword_s_', 'Unpublish comment containing keyword(s)', 'comment', ["keywords" => [0 => "drupal"]]);
+    $this->assertEntity('change_the_author_of_a_post', 'Change the author of a post', 'node', ["owner_uid" => "2"]);
+    $this->assertEntity('unpublish_post_containing_keyword_s_', 'Unpublish post containing keyword(s)', 'node', ["keywords" => [0 => "drupal"]]);
+    $this->assertEntity('display_a_message_to_the_user', 'Display a message to the user', 'system', ["message" => "Drupal migration test"]);
+    $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
+      "recipient" => "test@example.com",
+      "subject" => "Drupal migration test",
+      "message" => "Drupal migration test"
+    ]);
+    $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
+
+  }
+
+  /**
+   * Asserts various aspects of an Action entity.
+   *
+   * @param string $id
+   *   The expected Action ID.
+   * @param string $label
+   *   The expected Action label.
+   * @param string $type
+   *   The expected Action type.
+   * @param array $configuration
+   *   The expected Action configuration.
+   */
+  protected function assertEntity($id, $label, $type, $configuration) {
+    $action = Action::load($id);
+
+    $this->assertTrue($action instanceof Action);
+    /** @var \Drupal\system\Entity\Action $action */
+    $this->assertIdentical($id, $action->id());
+    $this->assertIdentical($label, $action->label());
+    $this->assertIdentical($type, $action->getType());
+    $this->assertIdentical($configuration, $action->get('configuration'));
+  }
+
+}
diff --git a/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
new file mode 100644
index 0000000..f0ada6c
--- /dev/null
+++ b/core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionsTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\action\Kernel\Migrate\d7\MigrateActionsTest.
+ */
+
+namespace Drupal\Tests\action\Kernel\Migrate\d7;
+
+use Drupal\system\Entity\Action;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of action items.
+ *
+ * @group action
+ */
+class MigrateActionsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['action', 'comment', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_action');
+  }
+
+  /**
+   * Test Drupal 7 action migration to Drupal 8.
+   */
+  public function testActions() {
+    // Test default actions.
+    $this->assertEntity('node_publish_action', 'Publish content', 'node', []);
+    $this->assertEntity('node_make_sticky_action', 'Make content sticky', 'node', []);
+    $this->assertEntity('user_block_user_action', 'Block current user', 'user', []);
+    $this->assertEntity('comment_publish_action', 'Publish comment', 'comment', []);
+
+    // Test advanced actions.
+    $this->assertEntity('unpublish_comment_containing_keyword_s_', 'Unpublish comment containing keyword(s)', 'comment', ["keywords" => [0 => "drupal"]]);
+    $this->assertEntity('change_the_author_of_content', 'Change the author of content', 'node', ["owner_uid" => "2"]);
+    $this->assertEntity('unpublish_content_containing_keyword_s_', 'Unpublish content containing keyword(s)', 'node', ["keywords" => [0 => "drupal"]]);
+    $this->assertEntity('display_a_message_to_the_user', 'Display a message to the user', 'system', ["message" => "Drupal migration test"]);
+    $this->assertEntity('send_e_mail', 'Send e-mail', 'system', [
+      "recipient" => "test@example.com",
+      "subject" => "Drupal migration test",
+      "message" => "Drupal migration test"
+    ]);
+    $this->assertEntity('redirect_to_url', 'Redirect to URL', 'system', ["url" => "https://www.drupal.org"]);
+
+  }
+
+  /**
+   * Asserts various aspects of an Action entity.
+   *
+   * @param string $id
+   *   The expected Action ID.
+   * @param string $label
+   *   The expected Action label.
+   * @param string $type
+   *   The expected Action type.
+   * @param array $configuration
+   *   The expected Action configuration.
+   */
+  protected function assertEntity($id, $label, $type, $configuration) {
+    $action = Action::load($id);
+
+    $this->assertTrue($action instanceof Action);
+    /** @var \Drupal\system\Entity\Action $action */
+    $this->assertIdentical($id, $action->id());
+    $this->assertIdentical($label, $action->label());
+    $this->assertIdentical($type, $action->getType());
+    $this->assertIdentical($configuration, $action->get('configuration'));
+  }
+
+}
diff --git a/core/modules/aggregator/aggregator.install b/core/modules/aggregator/aggregator.install
index a763639..e236628 100644
--- a/core/modules/aggregator/aggregator.install
+++ b/core/modules/aggregator/aggregator.install
@@ -17,7 +17,7 @@ function aggregator_requirements($phase) {
   );
   if (!$has_curl) {
     $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP <a href=":curl_url">cURL</a> library is not available.', array(':curl_url' => 'http://php.net/manual/curl.setup.php'));
+    $requirements['curl']['description'] = t('The Aggregator module could not be installed because the PHP <a href="http://php.net/manual/curl.setup.php">cURL</a> library is not available.');
   }
   return $requirements;
 }
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index f612297..00bdbe4 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -109,7 +109,7 @@ function aggregator_entity_extra_field_info() {
       ),
       'feed_icon' => array(
         'label' => t('Feed icon'),
-        'description' => t('An icon that links to the feed url'),
+        'description' => t('An icon that links to the feed URL'),
         'weight' => 6,
       ),
     ),
diff --git a/core/modules/aggregator/src/FeedForm.php b/core/modules/aggregator/src/FeedForm.php
index cab27d2..7502f54 100644
--- a/core/modules/aggregator/src/FeedForm.php
+++ b/core/modules/aggregator/src/FeedForm.php
@@ -21,9 +21,7 @@ class FeedForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $feed = $this->entity;
-    $insert = (bool) $feed->id();
-    $feed->save();
-    if ($insert) {
+    if ($feed->save() == SAVED_UPDATED) {
       drupal_set_message($this->t('The feed %feed has been updated.', array('%feed' => $feed->label())));
       $form_state->setRedirectUrl($feed->urlInfo('canonical'));
     }
diff --git a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
index 95c6324..7a4a698 100644
--- a/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\aggregator\Plugin\aggregator\processor;
 
+use Drupal\aggregator\Entity\Item;
 use Drupal\aggregator\ItemStorageInterface;
 use Drupal\aggregator\Plugin\AggregatorPluginSettingsBase;
 use Drupal\aggregator\Plugin\ProcessorInterface;
@@ -215,7 +216,7 @@ public function process(FeedInterface $feed) {
         $entry = reset($entry);
       }
       else {
-        $entry = entity_create('aggregator_item', array('langcode' => $feed->language()->getId()));
+        $entry = Item::create(array('langcode' => $feed->language()->getId()));
       }
       if ($item['timestamp']) {
         $entry->setPostedTime($item['timestamp']);
diff --git a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
index 9dce5e9..4348023 100644
--- a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
+++ b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php
@@ -37,8 +37,8 @@ public function fields() {
       'url' => $this->t('URL to the feed.'),
       'refresh' => $this->t('Refresh frequency in seconds.'),
       'checked' => $this->t('Last-checked unix timestamp.'),
-      'link' => $this->t('Parent website of feed.'),
-      'description' => $this->t('Parent website\'s description fo the feed.'),
+      'link' => $this->t('Parent website of the feed.'),
+      'description' => $this->t("Parent website's description of the feed."),
       'image' => $this->t('An image representing the feed.'),
       'etag' => $this->t('Entity tag HTTP response header.'),
       'modified' => $this->t('When the feed was last modified.'),
diff --git a/core/modules/aggregator/src/Tests/AddFeedTest.php b/core/modules/aggregator/src/Tests/AddFeedTest.php
index 56f5586..0b1d6c6 100644
--- a/core/modules/aggregator/src/Tests/AddFeedTest.php
+++ b/core/modules/aggregator/src/Tests/AddFeedTest.php
@@ -28,7 +28,7 @@ public function testAddFeed() {
     $feed->refreshItems();
 
     // Check feed data.
-    $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct url.');
+    $this->assertUrl(\Drupal::url('aggregator.feed_add', [], ['absolute' => TRUE]), [], 'Directed to correct URL.');
     $this->assertTrue($this->uniqueFeed($feed->label(), $feed->getUrl()), 'The feed is unique.');
 
     // Check feed source.
diff --git a/core/modules/aggregator/src/Tests/AggregatorTestBase.php b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
index d5b09e5..13f0a77 100644
--- a/core/modules/aggregator/src/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/src/Tests/AggregatorTestBase.php
@@ -137,7 +137,7 @@ public function getFeedEditObject($feed_url = NULL, array $values = array()) {
       'url' => $feed_url,
       'refresh' => '900',
     );
-    return entity_create('aggregator_feed', $values);
+    return Feed::create($values);
   }
 
   /**
diff --git a/core/modules/aggregator/src/Tests/AggregatorTitleTest.php b/core/modules/aggregator/src/Tests/AggregatorTitleTest.php
deleted file mode 100644
index d599d9a..0000000
--- a/core/modules/aggregator/src/Tests/AggregatorTitleTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\AggregatorTitleTest.
- */
-
-namespace Drupal\aggregator\Tests;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\aggregator\Entity\Item;
-use Drupal\simpletest\KernelTestBase;
-
-
-/**
- * Tests the aggregator_title formatter.
- *
- * @group field
- */
-class AggregatorTitleTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['file', 'field', 'options', 'aggregator'];
-
-  /**
-   * The field name that is tested.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['field']);
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-
-    $this->fieldName = 'title';
-  }
-
-  /*
-   * Tests the formatter output.
-   */
-  public function testStringFormatter() {
-    // Create an aggregator feed.
-    $aggregator_feed = Feed::create([
-      'title' => 'testing title',
-      'url' => 'http://www.example.com',
-    ]);
-    $aggregator_feed->save();
-
-    // Create an aggregator feed item.
-    $aggregator_item = Item::create([
-      'title' => 'test title',
-      'fid' => $aggregator_feed->id(),
-      'link' => 'http://www.example.com',
-      ]);
-    $aggregator_item->save();
-
-    // Verify aggregator feed title with and without links.
-    $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
-    $result = $this->render($build);
-
-    $this->assertTrue(strpos($result, 'testing title'));
-    $this->assertTrue(strpos($result, 'href="' . $aggregator_feed->getUrl()) . '"');
-
-    $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
-    $result = $this->render($build);
-    $this->assertTrue(strpos($result, 'testing title') === 0);
-    $this->assertTrue(strpos($result, $aggregator_feed->getUrl()) === FALSE);
-
-    // Verify aggregator item title with and without links.
-    $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' =>TRUE]]);
-    $result = $this->render($build);
-
-    $this->assertTrue(strpos($result, 'test title'));
-    $this->assertTrue(strpos($result, 'href="' . $aggregator_item->getLink()) . '"');
-
-    $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
-    $result = $this->render($build);
-    $this->assertTrue(strpos($result, 'test title') === 0);
-    $this->assertTrue(strpos($result, $aggregator_item->getLink()) === FALSE);
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/FeedParserTest.php b/core/modules/aggregator/src/Tests/FeedParserTest.php
index f507302..8883089 100644
--- a/core/modules/aggregator/src/Tests/FeedParserTest.php
+++ b/core/modules/aggregator/src/Tests/FeedParserTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\aggregator\Tests;
 
 use Drupal\Core\Url;
+use Drupal\aggregator\Entity\Feed;
 
 /**
  * Tests the built-in feed parser with valid feed samples.
@@ -89,7 +90,7 @@ public function testHtmlEntitiesSample() {
    */
   public function testRedirectFeed() {
     $redirect_url = Url::fromRoute('aggregator_test.redirect')->setAbsolute()->toString();
-    $feed = entity_create('aggregator_feed', array('url' => $redirect_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(array('url' => $redirect_url, 'title' => $this->randomMachineName()));
     $feed->save();
     $feed->refreshItems();
 
@@ -103,7 +104,7 @@ public function testRedirectFeed() {
   public function testInvalidFeed() {
     // Simulate a typo in the URL to force a curl exception.
     $invalid_url = 'http:/www.drupal.org';
-    $feed = entity_create('aggregator_feed', array('url' => $invalid_url, 'title' => $this->randomMachineName()));
+    $feed = Feed::create(array('url' => $invalid_url, 'title' => $this->randomMachineName()));
     $feed->save();
 
     // Update the feed. Use the UI to be able to check the message easily.
diff --git a/core/modules/aggregator/src/Tests/FeedValidationTest.php b/core/modules/aggregator/src/Tests/FeedValidationTest.php
deleted file mode 100644
index 2c127d0..0000000
--- a/core/modules/aggregator/src/Tests/FeedValidationTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\FeedValidationTest.
- */
-
-namespace Drupal\aggregator\Tests;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests feed validation constraints.
- *
- * @group aggregator
- */
-class FeedValidationTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('aggregator', 'options');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-  }
-
-  /**
-   * Tests the feed validation constraints.
-   */
-  public function testValidation() {
-    // Add feed.
-    $feed = Feed::create([
-      'title' => 'Feed 1',
-      'url' => 'https://www.drupal.org/planet/rss.xml',
-      'refresh' => 900,
-    ]);
-
-    $violations = $feed->validate();
-    $this->assertEqual(count($violations), 0);
-
-    $feed->save();
-
-    // Add another feed.
-    /* @var \Drupal\aggregator\FeedInterface $feed */
-    $feed = Feed::create([
-      'title' => 'Feed 1',
-      'url' => 'https://www.drupal.org/planet/rss.xml',
-      'refresh' => 900,
-    ]);
-
-    $violations = $feed->validate();
-
-    $this->assertEqual(count($violations), 2);
-    $this->assertEqual($violations[0]->getPropertyPath(), 'title');
-    $this->assertEqual($violations[0]->getMessage(), t('A feed named %value already exists. Enter a unique title.', [
-      '%value' => $feed->label(),
-    ]));
-    $this->assertEqual($violations[1]->getPropertyPath(), 'url');
-    $this->assertEqual($violations[1]->getMessage(), t('A feed with this URL %value already exists. Enter a unique URL.', [
-      '%value' => $feed->getUrl(),
-    ]));
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/ItemWithoutFeedTest.php b/core/modules/aggregator/src/Tests/ItemWithoutFeedTest.php
deleted file mode 100644
index a6586b9..0000000
--- a/core/modules/aggregator/src/Tests/ItemWithoutFeedTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\ItemWithoutFeedTest.
- */
-
-namespace Drupal\aggregator\Tests;
-
-use Drupal\aggregator\Entity\Item;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests clean handling of an item with a missing feed ID.
- *
- * @group aggregator
- */
-class ItemWithoutFeedTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator', 'options'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-  }
-
-  /**
-   * Tests attempting to create a feed item without a feed.
-   */
-  public function testEntityCreation() {
-    $entity = Item::create([
-      'title' => t('Llama 2'),
-      'path' => 'https://groups.drupal.org/',
-    ]);
-    $violations = $entity->validate();
-    $this->assertCount(1, $violations);
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php b/core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php
deleted file mode 100644
index d620259..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/MigrateAggregatorStubTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\MigrateAggregatorStubTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate;
-
-use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for aggregator feeds and items.
- *
- * @group aggregator
- */
-class MigrateAggregatorStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-  }
-
-  /**
-   * Tests creation of aggregator feed stubs.
-   */
-  public function testFeedStub() {
-    $this->performStubTest('aggregator_feed');
-  }
-
-  /**
-   * Tests creation of aggregator feed items.
-   */
-  public function testItemStub() {
-    try {
-      // We expect an exception, because there's no feed to reference.
-      $this->performStubTest('aggregator_item');
-      $this->fail('Expected exception has not been thrown.');
-    }
-    catch (MigrateException $e) {
-      $this->assertIdentical($e->getMessage(),
-        'Stubbing failed, unable to generate value for field fid');
-    }
-
-    // The stub should pass when there's a feed to point to.
-    $this->createStub('aggregator_feed');
-    $this->performStubTest('aggregator_item');
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
deleted file mode 100644
index b9ca05a..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorConfigsTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to aggregator.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_aggregator_settings');
-  }
-
-  /**
-   * Tests migration of aggregator variables to aggregator.settings.yml.
-   */
-  public function testAggregatorSettings() {
-    $config = $this->config('aggregator.settings');
-    $this->assertIdentical('aggregator', $config->get('fetcher'));
-    $this->assertIdentical('aggregator', $config->get('parser'));
-    $this->assertIdentical(array('aggregator'), $config->get('processors'));
-    $this->assertIdentical(600, $config->get('items.teaser_length'));
-    $this->assertIdentical('<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>', $config->get('items.allowed_html'));
-    $this->assertIdentical(9676800, $config->get('items.expire'));
-    $this->assertIdentical(3, $config->get('source.list_max'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'aggregator.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
deleted file mode 100644
index df33d87..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorFeedTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests migration of aggregator feeds.
- *
- * @group migrate_drupal_6
- */
-class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->executeMigration('d6_aggregator_feed');
-  }
-
-  /**
-   * Tests migration of aggregator feeds.
-   */
-  public function testAggregatorFeedImport() {
-    /** @var \Drupal\aggregator\Entity\Feed $feed */
-    $feed = Feed::load(5);
-    $this->assertIdentical('Know Your Meme', $feed->title->value);
-    $this->assertIdentical('en', $feed->language()->getId());
-    $this->assertIdentical('http://knowyourmeme.com/newsfeed.rss', $feed->url->value);
-    $this->assertIdentical('900', $feed->refresh->value);
-    $this->assertIdentical('1387659487', $feed->checked->value);
-    $this->assertIdentical('0', $feed->queued->value);
-    $this->assertIdentical('http://knowyourmeme.com', $feed->link->value);
-    $this->assertIdentical('New items added to the News Feed', $feed->description->value);
-    $this->assertIdentical('http://b.thumbs.redditmedia.com/harEHsUUZVajabtC.png', $feed->image->value);
-    $this->assertIdentical('"213cc1365b96c310e92053c5551f0504"', $feed->etag->value);
-    $this->assertIdentical('0', $feed->modified->value);
-  }
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
deleted file mode 100644
index 90a964b..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d6\MigrateAggregatorItemTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d6;
-
-use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests migration of aggregator items.
- *
- * @group migrate_drupal_6
- */
-class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-    $this->executeMigrations(['d6_aggregator_feed', 'd6_aggregator_item']);
-  }
-
-  /**
-   * Test Drupal 6 aggregator item migration to Drupal 8.
-   */
-  public function testAggregatorItem() {
-    /** @var \Drupal\aggregator\Entity\Item $item */
-    $item = Item::load(1);
-    $this->assertIdentical('1', $item->id());
-    $this->assertIdentical('5', $item->getFeedId());
-    $this->assertIdentical('This (three) weeks in Drupal Core - January 10th 2014', $item->label());
-    $this->assertIdentical('larowlan', $item->getAuthor());
-    $this->assertIdentical("<h2 id='new'>What's new with Drupal 8?</h2>", $item->getDescription());
-    $this->assertIdentical('https://groups.drupal.org/node/395218', $item->getLink());
-    $this->assertIdentical('1389297196', $item->getPostedTime());
-    $this->assertIdentical('en', $item->language()->getId());
-    $this->assertIdentical('395218 at https://groups.drupal.org', $item->getGuid());
-
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php
deleted file mode 100644
index 065476b..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorFeedTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorFeedTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d7;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Test migration to aggregator_feed entities.
- *
- * @group migrate_drupal_7
- */
-class MigrateAggregatorFeedTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->executeMigration('d7_aggregator_feed');
-  }
-
-  /**
-   * Tests migration of aggregator feeds.
-   */
-  public function testAggregatorFeedImport() {
-    /** @var \Drupal\aggregator\FeedInterface $feed */
-    $feed = Feed::load(1);
-    $this->assertIdentical('Know Your Meme', $feed->label());
-    $this->assertIdentical('en', $feed->language()->getId());
-    $this->assertIdentical('http://knowyourmeme.com/newsfeed.rss', $feed->getUrl());
-    $this->assertIdentical('900', $feed->getRefreshRate());
-    // The feed's last checked time can change as the fixture is updated, so
-    // assert that its format is correct.
-    $checked_time = $feed->getLastCheckedTime();
-    $this->assertTrue(is_numeric($checked_time));
-    $this->assertTrue($checked_time > 1000000000);
-    $this->assertIdentical('0', $feed->getQueuedTime());
-    $this->assertIdentical('http://knowyourmeme.com', $feed->link->value);
-    $this->assertIdentical('New items added to the News Feed', $feed->getDescription());
-    $this->assertNull($feed->getImage());
-    // As with getLastCheckedTime(), the etag can change as the fixture is
-    // updated normally, so assert that its format is correct.
-    $this->assertTrue(preg_match('/^"[a-z0-9]{32}"$/', $feed->getEtag()));
-    $this->assertIdentical('0', $feed->getLastModified());
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php
deleted file mode 100644
index d0c0154..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorItemTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorItemTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d7;
-
-use Drupal\aggregator\Entity\Item;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of aggregator items.
- *
- * @group migrate_drupal_7
- */
-class MigrateAggregatorItemTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-    $this->executeMigration('d7_aggregator_feed');
-    $this->executeMigration('d7_aggregator_item');
-  }
-
-  /**
-   * Test Drupal 7 aggregator item migration to Drupal 8.
-   */
-  public function testAggregatorItem() {
-    // Since the feed items can change as the fixture is updated normally,
-    // assert all migrated feed items against the values in the fixture.
-    $items = $this->sourceDatabase
-      ->select('aggregator_item', 'ai')
-      ->fields('ai')
-      ->execute();
-
-    foreach ($items as $original) {
-      /** @var \Drupal\aggregator\ItemInterface $item */
-      $item = Item::load($original->iid);
-      $this->assertIdentical($original->fid, $item->getFeedId());
-      $this->assertIdentical($original->title, $item->label());
-      // If $original->author is an empty string, getAuthor() returns NULL so
-      // we need to use assertEqual() here.
-      $this->assertEqual($original->author, $item->getAuthor());
-      $this->assertIdentical($original->description, $item->getDescription());
-      $this->assertIdentical($original->link, $item->getLink());
-      $this->assertIdentical($original->timestamp, $item->getPostedTime());
-      $this->assertIdentical('en', $item->language()->getId());
-      $this->assertIdentical($original->guid, $item->getGuid());
-    }
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
deleted file mode 100644
index 37c77dc..0000000
--- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Migrate\d7\MigrateAggregatorSettingsTest.
- */
-
-namespace Drupal\aggregator\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Aggregator's variables to configuration.
- *
- * @group aggregator
- */
-class MigrateAggregatorSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['aggregator'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_aggregator_settings');
-  }
-
-  /**
-   * Tests migration of Aggregator variables to configuration.
-   */
-  public function testMigration() {
-    $config = \Drupal::config('aggregator.settings')->get();
-    $this->assertIdentical('aggregator', $config['fetcher']);
-    $this->assertIdentical('aggregator', $config['parser']);
-    $this->assertIdentical(['aggregator'], $config['processors']);
-    $this->assertIdentical('<p> <div> <a>', $config['items']['allowed_html']);
-    $this->assertIdentical(500, $config['items']['teaser_length']);
-    $this->assertIdentical(86400, $config['items']['expire']);
-    $this->assertIdentical(6, $config['source']['list_max']);
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Views/AggregatorFeedViewsFieldAccessTest.php b/core/modules/aggregator/src/Tests/Views/AggregatorFeedViewsFieldAccessTest.php
deleted file mode 100644
index c85087e..0000000
--- a/core/modules/aggregator/src/Tests/Views/AggregatorFeedViewsFieldAccessTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\AggregatorFeedViewsFieldAccessTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the aggregator_feed entity.
- *
- * @group aggregator
- */
-class AggregatorFeedViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator', 'entity_test', 'options'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('aggregator_feed');
-  }
-
-  /**
-   * Checks access for aggregator_feed fields.
-   */
-  public function testAggregatorFeedFields() {
-    $feed = Feed::create([
-      'title' => 'Drupal org',
-      'url' => 'https://www.drupal.org/rss.xml',
-      'link' => 'https://www.drupal.org/rss.xml',
-    ]);
-    $feed->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    // $this->assertFieldAccess('aggregator_feed', 'title', $feed->label());
-    $this->assertFieldAccess('aggregator_feed', 'langcode', $feed->language()->getName());
-    $this->assertFieldAccess('aggregator_feed', 'url', $feed->getUrl());
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Views/AggregatorItemViewsFieldAccessTest.php b/core/modules/aggregator/src/Tests/Views/AggregatorItemViewsFieldAccessTest.php
deleted file mode 100644
index b1c23c5..0000000
--- a/core/modules/aggregator/src/Tests/Views/AggregatorItemViewsFieldAccessTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\AggregatorItemViewsFieldAccessTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
-
-use Drupal\aggregator\Entity\Feed;
-use Drupal\aggregator\Entity\Item;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the aggregator_item entity.
- *
- * @group aggregator
- */
-class AggregatorItemViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator', 'entity_test', 'options'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('aggregator_feed');
-    $this->installEntitySchema('aggregator_item');
-  }
-
-  /**
-   * Checks access for aggregator_item fields.
-   */
-  public function testAggregatorItemFields() {
-    $feed = Feed::create([
-      'title' => 'Drupal org',
-      'url' => 'https://www.drupal.org/rss.xml',
-    ]);
-    $feed->save();
-    $item = Item::create([
-      'title' => 'Test title',
-      'fid' => $feed->id(),
-      'description' => 'Test description',
-    ]);
-
-    $item->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('aggregator_item', 'title', $item->getTitle());
-    $this->assertFieldAccess('aggregator_item', 'langcode', $item->language()->getName());
-    $this->assertFieldAccess('aggregator_item', 'description', $item->getDescription());
-  }
-
-}
diff --git a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
deleted file mode 100644
index 98598c4..0000000
--- a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\aggregator\Tests\Views\IntegrationTest.
- */
-
-namespace Drupal\aggregator\Tests\Views;
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Render\RenderContext;
-use Drupal\Core\Url;
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests basic integration of views data from the aggregator module.
- *
- * @group aggregator
- */
-class IntegrationTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('aggregator', 'aggregator_test_views', 'system', 'field', 'options', 'user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_aggregator_items');
-
-  /**
-   * The entity storage for aggregator items.
-   *
-   * @var \Drupal\aggregator\ItemStorage
-   */
-  protected $itemStorage;
-
-  /**
-   * The entity storage for aggregator feeds.
-   *
-   * @var \Drupal\aggregator\FeedStorage
-   */
-  protected $feedStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('aggregator_item');
-    $this->installEntitySchema('aggregator_feed');
-
-    ViewTestData::createTestViews(get_class($this), array('aggregator_test_views'));
-
-    $this->itemStorage = $this->container->get('entity.manager')->getStorage('aggregator_item');
-    $this->feedStorage = $this->container->get('entity.manager')->getStorage('aggregator_feed');
-  }
-
-  /**
-   * Tests basic aggregator_item view.
-   */
-  public function testAggregatorItemView() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $feed = $this->feedStorage->create(array(
-      'title' => $this->randomMachineName(),
-      'url' => 'https://www.drupal.org/',
-      'refresh' => 900,
-      'checked' => 123543535,
-      'description' => $this->randomMachineName(),
-    ));
-    $feed->save();
-
-    $items = array();
-    $expected = array();
-    for ($i = 0; $i < 10; $i++) {
-      $values = array();
-      $values['fid'] = $feed->id();
-      $values['timestamp'] = mt_rand(REQUEST_TIME - 10, REQUEST_TIME + 10);
-      $values['title'] = $this->randomMachineName();
-      $values['description'] = $this->randomMachineName();
-      // Add a image to ensure that the sanitizing can be tested below.
-      $values['author'] = $this->randomMachineName() . '<img src="http://example.com/example.png" \>"';
-      $values['link'] = 'https://www.drupal.org/node/' . mt_rand(1000, 10000);
-      $values['guid'] = $this->randomString();
-
-      $aggregator_item = $this->itemStorage->create($values);
-      $aggregator_item->save();
-      $items[$aggregator_item->id()] = $aggregator_item;
-
-      $values['iid'] = $aggregator_item->id();
-      $expected[] = $values;
-    }
-
-    $view = Views::getView('test_aggregator_items');
-    $this->executeView($view);
-
-    $column_map = array(
-      'iid' => 'iid',
-      'title' => 'title',
-      'aggregator_item_timestamp' => 'timestamp',
-      'description' => 'description',
-      'aggregator_item_author' => 'author',
-    );
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-
-    // Ensure that the rendering of the linked title works as expected.
-    foreach ($view->result as $row) {
-      $iid = $view->field['iid']->getValue($row);
-      $expected_link = \Drupal::l($items[$iid]->getTitle(), Url::fromUri($items[$iid]->getLink(), ['absolute' => TRUE]));
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
-        return $view->field['title']->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_link, 'Ensure the right link is generated');
-
-      $expected_author = Xss::filter($items[$iid]->getAuthor(), _aggregator_allowed_tags());
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
-        return $view->field['author']->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_author, 'Ensure the author got filtered');
-
-      $expected_description = Xss::filter($items[$iid]->getDescription(), _aggregator_allowed_tags());
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
-        return $view->field['description']->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_description, 'Ensure the author got filtered');
-    }
-  }
-
-}
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php b/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
index 079cdd5..0df2b03 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/src/Controller/AggregatorTestRssController.php
@@ -59,7 +59,7 @@ public function testFeed($use_last_modified, $use_etag, Request $request) {
     $response->headers->set('Content-Type', 'application/rss+xml; charset=utf-8');
 
     // Read actual feed from file.
-    $file_name = drupal_get_path('module', 'aggregator_test') . '/aggregator_test_rss091.xml';
+    $file_name = __DIR__ . '/../../aggregator_test_rss091.xml';
     $handle = fopen($file_name, 'r');
     $feed = fread($handle, filesize($file_name));
     fclose($handle);
diff --git a/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
new file mode 100644
index 0000000..4cb3ba4
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\AggregatorTitleTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\aggregator\Entity\Item;
+use Drupal\KernelTests\KernelTestBase;
+
+
+/**
+ * Tests the aggregator_title formatter.
+ *
+ * @group field
+ */
+class AggregatorTitleTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['file', 'field', 'options', 'aggregator', 'system'];
+
+  /**
+   * The field name that is tested.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['field']);
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+
+    \Drupal::service('router.builder')->rebuild();
+
+    $this->fieldName = 'title';
+  }
+
+  /*
+   * Tests the formatter output.
+   */
+  public function testStringFormatter() {
+    // Create an aggregator feed.
+    $aggregator_feed = Feed::create([
+      'title' => 'testing title',
+      'url' => 'http://www.example.com',
+    ]);
+    $aggregator_feed->save();
+
+    // Create an aggregator feed item.
+    $aggregator_item = Item::create([
+      'title' => 'test title',
+      'fid' => $aggregator_feed->id(),
+      'link' => 'http://www.example.com',
+      ]);
+    $aggregator_item->save();
+
+    // Verify aggregator feed title with and without links.
+    $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
+    $result = $this->render($build);
+
+    $this->assertContains('testing title', $result);
+    $this->assertContains('href="' . $aggregator_feed->getUrl() . '"', $result);
+
+    $build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
+    $result = $this->render($build);
+    $this->assertContains('testing title', $result);
+    $this->assertNotContains($aggregator_feed->getUrl(), $result);
+
+    // Verify aggregator item title with and without links.
+    $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' =>TRUE]]);
+    $result = $this->render($build);
+
+    $this->assertContains('test title', $result);
+    $this->assertContains('href="' . $aggregator_item->getLink() . '"', $result);
+
+    $build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
+    $result = $this->render($build);
+    $this->assertContains('test title', $result);
+    $this->assertNotContains($aggregator_item->getLink(), $result);
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php b/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
new file mode 100644
index 0000000..fd68d1b
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\FeedValidationTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Tests feed validation constraints.
+ *
+ * @group aggregator
+ */
+class FeedValidationTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('aggregator', 'options');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+  }
+
+  /**
+   * Tests the feed validation constraints.
+   */
+  public function testValidation() {
+    // Add feed.
+    $feed = Feed::create([
+      'title' => 'Feed 1',
+      'url' => 'https://www.drupal.org/planet/rss.xml',
+      'refresh' => 900,
+    ]);
+
+    $violations = $feed->validate();
+    $this->assertEqual(count($violations), 0);
+
+    $feed->save();
+
+    // Add another feed.
+    /* @var \Drupal\aggregator\FeedInterface $feed */
+    $feed = Feed::create([
+      'title' => 'Feed 1',
+      'url' => 'https://www.drupal.org/planet/rss.xml',
+      'refresh' => 900,
+    ]);
+
+    $violations = $feed->validate();
+
+    $this->assertEqual(count($violations), 2);
+    $this->assertEqual($violations[0]->getPropertyPath(), 'title');
+    $this->assertEqual($violations[0]->getMessage(), t('A feed named %value already exists. Enter a unique title.', [
+      '%value' => $feed->label(),
+    ]));
+    $this->assertEqual($violations[1]->getPropertyPath(), 'url');
+    $this->assertEqual($violations[1]->getMessage(), t('A feed with this URL %value already exists. Enter a unique URL.', [
+      '%value' => $feed->getUrl(),
+    ]));
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/ItemWithoutFeedTest.php b/core/modules/aggregator/tests/src/Kernel/ItemWithoutFeedTest.php
new file mode 100644
index 0000000..2e5bca4
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/ItemWithoutFeedTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Unit\ItemWithoutFeedTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel;
+
+use Drupal\aggregator\Entity\Item;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests clean handling of an item with a missing feed ID.
+ *
+ * @group aggregator
+ */
+class ItemWithoutFeedTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator', 'options'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+  }
+
+  /**
+   * Tests attempting to create a feed item without a feed.
+   */
+  public function testEntityCreation() {
+    $entity = Item::create([
+      'title' => t('Llama 2'),
+      'path' => 'https://groups.drupal.org/',
+    ]);
+    $violations = $entity->validate();
+    $this->assertCount(1, $violations);
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php
new file mode 100644
index 0000000..d448bfd
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/MigrateAggregatorStubTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tests\aggregator\Kernel\Migrate\MigrateAggregatorStubTest.
+ */
+
+namespace Drupal\tests\aggregator\Kernel\Migrate;
+
+use Drupal\migrate\MigrateException;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for aggregator feeds and items.
+ *
+ * @group aggregator
+ */
+class MigrateAggregatorStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+  }
+
+  /**
+   * Tests creation of aggregator feed stubs.
+   */
+  public function testFeedStub() {
+    $this->performStubTest('aggregator_feed');
+  }
+
+  /**
+   * Tests creation of aggregator feed items.
+   */
+  public function testItemStub() {
+    try {
+      // We expect an exception, because there's no feed to reference.
+      $this->performStubTest('aggregator_item');
+      $this->fail('Expected exception has not been thrown.');
+    }
+    catch (MigrateException $e) {
+      $this->assertIdentical($e->getMessage(),
+        'Stubbing failed, unable to generate value for field fid');
+    }
+
+    // The stub should pass when there's a feed to point to.
+    $this->createStub('aggregator_feed');
+    $this->performStubTest('aggregator_item');
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
new file mode 100644
index 0000000..9d0eadf
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorConfigsTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to aggregator.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_aggregator_settings');
+  }
+
+  /**
+   * Tests migration of aggregator variables to aggregator.settings.yml.
+   */
+  public function testAggregatorSettings() {
+    $config = $this->config('aggregator.settings');
+    $this->assertIdentical('aggregator', $config->get('fetcher'));
+    $this->assertIdentical('aggregator', $config->get('parser'));
+    $this->assertIdentical(array('aggregator'), $config->get('processors'));
+    $this->assertIdentical(600, $config->get('items.teaser_length'));
+    $this->assertIdentical('<a> <b> <br /> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>', $config->get('items.allowed_html'));
+    $this->assertIdentical(9676800, $config->get('items.expire'));
+    $this->assertIdentical(3, $config->get('source.list_max'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'aggregator.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php
new file mode 100644
index 0000000..292cc28
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorFeedTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorFeedTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of aggregator feeds.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->executeMigration('d6_aggregator_feed');
+  }
+
+  /**
+   * Tests migration of aggregator feeds.
+   */
+  public function testAggregatorFeedImport() {
+    /** @var \Drupal\aggregator\Entity\Feed $feed */
+    $feed = Feed::load(5);
+    $this->assertIdentical('Know Your Meme', $feed->title->value);
+    $this->assertIdentical('en', $feed->language()->getId());
+    $this->assertIdentical('http://knowyourmeme.com/newsfeed.rss', $feed->url->value);
+    $this->assertIdentical('900', $feed->refresh->value);
+    $this->assertIdentical('1387659487', $feed->checked->value);
+    $this->assertIdentical('0', $feed->queued->value);
+    $this->assertIdentical('http://knowyourmeme.com', $feed->link->value);
+    $this->assertIdentical('New items added to the News Feed', $feed->description->value);
+    $this->assertIdentical('http://b.thumbs.redditmedia.com/harEHsUUZVajabtC.png', $feed->image->value);
+    $this->assertIdentical('"213cc1365b96c310e92053c5551f0504"', $feed->etag->value);
+    $this->assertIdentical('0', $feed->modified->value);
+  }
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php
new file mode 100644
index 0000000..4130c4b
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorItemTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d6\MigrateAggregatorItemTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
+
+use Drupal\aggregator\Entity\Item;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of aggregator items.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+    $this->executeMigrations(['d6_aggregator_feed', 'd6_aggregator_item']);
+  }
+
+  /**
+   * Test Drupal 6 aggregator item migration to Drupal 8.
+   */
+  public function testAggregatorItem() {
+    /** @var \Drupal\aggregator\Entity\Item $item */
+    $item = Item::load(1);
+    $this->assertIdentical('1', $item->id());
+    $this->assertIdentical('5', $item->getFeedId());
+    $this->assertIdentical('This (three) weeks in Drupal Core - January 10th 2014', $item->label());
+    $this->assertIdentical('larowlan', $item->getAuthor());
+    $this->assertIdentical("<h2 id='new'>What's new with Drupal 8?</h2>", $item->getDescription());
+    $this->assertIdentical('https://groups.drupal.org/node/395218', $item->getLink());
+    $this->assertIdentical('1389297196', $item->getPostedTime());
+    $this->assertIdentical('en', $item->language()->getId());
+    $this->assertIdentical('395218 at https://groups.drupal.org', $item->getGuid());
+
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
new file mode 100644
index 0000000..9401614
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorFeedTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorFeedTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test migration to aggregator_feed entities.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateAggregatorFeedTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->executeMigration('d7_aggregator_feed');
+  }
+
+  /**
+   * Tests migration of aggregator feeds.
+   */
+  public function testAggregatorFeedImport() {
+    /** @var \Drupal\aggregator\FeedInterface $feed */
+    $feed = Feed::load(1);
+    $this->assertIdentical('Know Your Meme', $feed->label());
+    $this->assertIdentical('en', $feed->language()->getId());
+    $this->assertIdentical('http://knowyourmeme.com/newsfeed.rss', $feed->getUrl());
+    $this->assertIdentical('900', $feed->getRefreshRate());
+    // The feed's last checked time can change as the fixture is updated, so
+    // assert that its format is correct.
+    $checked_time = $feed->getLastCheckedTime();
+    $this->assertTrue(is_numeric($checked_time));
+    $this->assertTrue($checked_time > 1000000000);
+    $this->assertIdentical('0', $feed->getQueuedTime());
+    $this->assertIdentical('http://knowyourmeme.com', $feed->link->value);
+    $this->assertIdentical('New items added to the News Feed', $feed->getDescription());
+    $this->assertNull($feed->getImage());
+    // As with getLastCheckedTime(), the etag can change as the fixture is
+    // updated normally, so assert that its format is correct.
+    $this->assertTrue(preg_match('/^"[a-z0-9]{32}"$/', $feed->getEtag()));
+    $this->assertIdentical('0', $feed->getLastModified());
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php
new file mode 100644
index 0000000..9636b7a
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorItemTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorItemTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
+
+use Drupal\aggregator\Entity\Item;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of aggregator items.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateAggregatorItemTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+    $this->executeMigration('d7_aggregator_feed');
+    $this->executeMigration('d7_aggregator_item');
+  }
+
+  /**
+   * Test Drupal 7 aggregator item migration to Drupal 8.
+   */
+  public function testAggregatorItem() {
+    // Since the feed items can change as the fixture is updated normally,
+    // assert all migrated feed items against the values in the fixture.
+    $items = $this->sourceDatabase
+      ->select('aggregator_item', 'ai')
+      ->fields('ai')
+      ->execute();
+
+    foreach ($items as $original) {
+      /** @var \Drupal\aggregator\ItemInterface $item */
+      $item = Item::load($original->iid);
+      $this->assertIdentical($original->fid, $item->getFeedId());
+      $this->assertIdentical($original->title, $item->label());
+      // If $original->author is an empty string, getAuthor() returns NULL so
+      // we need to use assertEqual() here.
+      $this->assertEqual($original->author, $item->getAuthor());
+      $this->assertIdentical($original->description, $item->getDescription());
+      $this->assertIdentical($original->link, $item->getLink());
+      $this->assertIdentical($original->timestamp, $item->getPostedTime());
+      $this->assertIdentical('en', $item->language()->getId());
+      $this->assertIdentical($original->guid, $item->getGuid());
+    }
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php
new file mode 100644
index 0000000..24cc160
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Migrate/d7/MigrateAggregatorSettingsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Migrate\d7\MigrateAggregatorSettingsTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Aggregator's variables to configuration.
+ *
+ * @group aggregator
+ */
+class MigrateAggregatorSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['aggregator'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_aggregator_settings');
+  }
+
+  /**
+   * Tests migration of Aggregator variables to configuration.
+   */
+  public function testMigration() {
+    $config = \Drupal::config('aggregator.settings')->get();
+    $this->assertIdentical('aggregator', $config['fetcher']);
+    $this->assertIdentical('aggregator', $config['parser']);
+    $this->assertIdentical(['aggregator'], $config['processors']);
+    $this->assertIdentical('<p> <div> <a>', $config['items']['allowed_html']);
+    $this->assertIdentical(500, $config['items']['teaser_length']);
+    $this->assertIdentical(86400, $config['items']['expire']);
+    $this->assertIdentical(6, $config['source']['list_max']);
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Views/AggregatorFeedViewsFieldAccessTest.php b/core/modules/aggregator/tests/src/Kernel/Views/AggregatorFeedViewsFieldAccessTest.php
new file mode 100644
index 0000000..aec1fd5
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Views/AggregatorFeedViewsFieldAccessTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Views\AggregatorFeedViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Views;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the aggregator_feed entity.
+ *
+ * @group aggregator
+ */
+class AggregatorFeedViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator', 'entity_test', 'options'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('aggregator_feed');
+  }
+
+  /**
+   * Checks access for aggregator_feed fields.
+   */
+  public function testAggregatorFeedFields() {
+    $feed = Feed::create([
+      'title' => 'Drupal org',
+      'url' => 'https://www.drupal.org/rss.xml',
+      'link' => 'https://www.drupal.org/rss.xml',
+    ]);
+    $feed->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    // $this->assertFieldAccess('aggregator_feed', 'title', $feed->label());
+    $this->assertFieldAccess('aggregator_feed', 'langcode', $feed->language()->getName());
+    $this->assertFieldAccess('aggregator_feed', 'url', $feed->getUrl());
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Views/AggregatorItemViewsFieldAccessTest.php b/core/modules/aggregator/tests/src/Kernel/Views/AggregatorItemViewsFieldAccessTest.php
new file mode 100644
index 0000000..ce8b29c
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Views/AggregatorItemViewsFieldAccessTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Views\AggregatorItemViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Views;
+
+use Drupal\aggregator\Entity\Feed;
+use Drupal\aggregator\Entity\Item;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the aggregator_item entity.
+ *
+ * @group aggregator
+ */
+class AggregatorItemViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator', 'entity_test', 'options'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('aggregator_feed');
+    $this->installEntitySchema('aggregator_item');
+  }
+
+  /**
+   * Checks access for aggregator_item fields.
+   */
+  public function testAggregatorItemFields() {
+    $feed = Feed::create([
+      'title' => 'Drupal org',
+      'url' => 'https://www.drupal.org/rss.xml',
+    ]);
+    $feed->save();
+    $item = Item::create([
+      'title' => 'Test title',
+      'fid' => $feed->id(),
+      'description' => 'Test description',
+    ]);
+
+    $item->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('aggregator_item', 'title', $item->getTitle());
+    $this->assertFieldAccess('aggregator_item', 'langcode', $item->language()->getName());
+    $this->assertFieldAccess('aggregator_item', 'description', $item->getDescription());
+  }
+
+}
diff --git a/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php b/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
new file mode 100644
index 0000000..44e3067
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Kernel/Views/IntegrationTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\aggregator\Kernel\Views\IntegrationTest.
+ */
+
+namespace Drupal\Tests\aggregator\Kernel\Views;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Render\RenderContext;
+use Drupal\Core\Url;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Tests basic integration of views data from the aggregator module.
+ *
+ * @group aggregator
+ */
+class IntegrationTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('aggregator', 'aggregator_test_views', 'system', 'field', 'options', 'user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_aggregator_items');
+
+  /**
+   * The entity storage for aggregator items.
+   *
+   * @var \Drupal\aggregator\ItemStorage
+   */
+  protected $itemStorage;
+
+  /**
+   * The entity storage for aggregator feeds.
+   *
+   * @var \Drupal\aggregator\FeedStorage
+   */
+  protected $feedStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('aggregator_item');
+    $this->installEntitySchema('aggregator_feed');
+
+    ViewTestData::createTestViews(get_class($this), array('aggregator_test_views'));
+
+    $this->itemStorage = $this->container->get('entity.manager')->getStorage('aggregator_item');
+    $this->feedStorage = $this->container->get('entity.manager')->getStorage('aggregator_feed');
+  }
+
+  /**
+   * Tests basic aggregator_item view.
+   */
+  public function testAggregatorItemView() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $feed = $this->feedStorage->create(array(
+      'title' => $this->randomMachineName(),
+      'url' => 'https://www.drupal.org/',
+      'refresh' => 900,
+      'checked' => 123543535,
+      'description' => $this->randomMachineName(),
+    ));
+    $feed->save();
+
+    $items = array();
+    $expected = array();
+    for ($i = 0; $i < 10; $i++) {
+      $values = array();
+      $values['fid'] = $feed->id();
+      $values['timestamp'] = mt_rand(REQUEST_TIME - 10, REQUEST_TIME + 10);
+      $values['title'] = $this->randomMachineName();
+      $values['description'] = $this->randomMachineName();
+      // Add a image to ensure that the sanitizing can be tested below.
+      $values['author'] = $this->randomMachineName() . '<img src="http://example.com/example.png" \>"';
+      $values['link'] = 'https://www.drupal.org/node/' . mt_rand(1000, 10000);
+      $values['guid'] = $this->randomString();
+
+      $aggregator_item = $this->itemStorage->create($values);
+      $aggregator_item->save();
+      $items[$aggregator_item->id()] = $aggregator_item;
+
+      $values['iid'] = $aggregator_item->id();
+      $expected[] = $values;
+    }
+
+    $view = Views::getView('test_aggregator_items');
+    $this->executeView($view);
+
+    $column_map = array(
+      'iid' => 'iid',
+      'title' => 'title',
+      'aggregator_item_timestamp' => 'timestamp',
+      'description' => 'description',
+      'aggregator_item_author' => 'author',
+    );
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+
+    // Ensure that the rendering of the linked title works as expected.
+    foreach ($view->result as $row) {
+      $iid = $view->field['iid']->getValue($row);
+      $expected_link = \Drupal::l($items[$iid]->getTitle(), Url::fromUri($items[$iid]->getLink(), ['absolute' => TRUE]));
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['title']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_link->getGeneratedLink(), 'Ensure the right link is generated');
+
+      $expected_author = Xss::filter($items[$iid]->getAuthor(), _aggregator_allowed_tags());
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['author']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_author, 'Ensure the author got filtered');
+
+      $expected_description = Xss::filter($items[$iid]->getDescription(), _aggregator_allowed_tags());
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view, $row) {
+        return $view->field['description']->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_description, 'Ensure the author got filtered');
+    }
+  }
+
+}
diff --git a/core/modules/ban/src/Form/BanDelete.php b/core/modules/ban/src/Form/BanDelete.php
index 08ca9a3..c7ae160 100644
--- a/core/modules/ban/src/Form/BanDelete.php
+++ b/core/modules/ban/src/Form/BanDelete.php
@@ -27,6 +27,13 @@ class BanDelete extends ConfirmFormBase {
   protected $banIp;
 
   /**
+   * The IP manager.
+   *
+   * @var \Drupal\ban\BanIpManagerInterface
+   */
+  protected $ipManager;
+
+  /**
    * Constructs a new BanDelete object.
    *
    * @param \Drupal\ban\BanIpManagerInterface $ip_manager
diff --git a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 2ff4a36..48f060d 100644
--- a/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -9,7 +9,7 @@
 
 use Drupal\ban\BanIpManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -39,7 +39,7 @@ class BlockedIP extends DestinationBase implements ContainerFactoryPluginInterfa
    *  The plugin ID.
    * @param mixed $plugin_definition
    *  The plugin definiiton.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *  The current migration.
    * @param \Drupal\ban\BanIpManagerInterface $ban_manager
    *  The IP manager service.
diff --git a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php b/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php
deleted file mode 100644
index 6a635fb..0000000
--- a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\ban\Tests\Migrate\d7\MigrateBlockedIPsTest.
- */
-
-namespace Drupal\ban\Tests\Migrate\d7;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrate blocked IPs.
- *
- * @group ban
- */
-class MigrateBlockedIPsTest extends MigrateDrupal7TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['ban'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('ban', ['ban_ip']);
-    $this->executeMigration('d7_blocked_ips');
-  }
-
-  /**
-   * Tests migration of blocked IPs.
-   */
-  public function testBlockedIPs() {
-    $this->assertTrue(\Drupal::service('ban.ip_manager')->isBanned('111.111.111.111'));
-  }
-
-}
diff --git a/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
new file mode 100644
index 0000000..6b13ab2
--- /dev/null
+++ b/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\ban\Kernel\Migrate\d7\MigrateBlockedIPsTest.
+ */
+
+namespace Drupal\Tests\ban\Kernel\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrate blocked IPs.
+ *
+ * @group ban
+ */
+class MigrateBlockedIPsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['ban'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('ban', ['ban_ip']);
+    $this->executeMigration('d7_blocked_ips');
+  }
+
+  /**
+   * Tests migration of blocked IPs.
+   */
+  public function testBlockedIPs() {
+    $this->assertTrue(\Drupal::service('ban.ip_manager')->isBanned('111.111.111.111'));
+  }
+
+}
diff --git a/core/modules/big_pipe/big_pipe.info.yml b/core/modules/big_pipe/big_pipe.info.yml
new file mode 100644
index 0000000..0108e1f
--- /dev/null
+++ b/core/modules/big_pipe/big_pipe.info.yml
@@ -0,0 +1,6 @@
+name: BigPipe
+type: module
+description: 'Sends pages in a way that allows browsers to show them much faster. Uses the BigPipe technique.'
+package: Core (Experimental)
+version: VERSION
+core: 8.x
diff --git a/core/modules/big_pipe/big_pipe.libraries.yml b/core/modules/big_pipe/big_pipe.libraries.yml
new file mode 100644
index 0000000..6da49b7
--- /dev/null
+++ b/core/modules/big_pipe/big_pipe.libraries.yml
@@ -0,0 +1,11 @@
+big_pipe:
+  version: VERSION
+  js:
+    js/big_pipe.js: {}
+  drupalSettings:
+    bigPipePlaceholderIds: []
+  dependencies:
+    - core/jquery
+    - core/jquery.once
+    - core/drupal.ajax
+    - core/drupalSettings
diff --git a/core/modules/big_pipe/big_pipe.module b/core/modules/big_pipe/big_pipe.module
new file mode 100644
index 0000000..18bbbb2
--- /dev/null
+++ b/core/modules/big_pipe/big_pipe.module
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Adds BigPipe no-JS detection.
+ */
+
+use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+
+/**
+ * Implements hook_help().
+ */
+function big_pipe_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'help.page.big_pipe':
+      $output = '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The BigPipe module sends pages with dynamic content in a way that allows browsers to show them much faster. For more information, see the <a href=":big_pipe-documentation">online documentation for the BigPipe module</a>.', [':big_pipe-documentation' => 'https://www.drupal.org/documentation/modules/big_pipe']) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Speeding up your site') . '</dt>';
+      $output .= '<dd>' . t('The module requires no configuration. Every part of the page contains metadata that allows BigPipe to figure this out on its own.') . '</dd>';
+      $output .= '</dl>';
+
+      return $output;
+  }
+}
+
+/**
+ * Implements hook_page_attachments().
+ *
+ * @see \Drupal\big_pipe\Controller\BigPipeController::setNoJsCookie()
+ */
+function big_pipe_page_attachments(array &$page) {
+  // Routes that don't use BigPipe also don't need no-JS detection.
+  if (\Drupal::routeMatch()->getRouteObject()->getOption('_no_big_pipe')) {
+    return;
+  }
+
+  $request = \Drupal::request();
+  // BigPipe is only used when there is an actual session, so only add the no-JS
+  // detection when there actually is a session.
+  // @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy.
+  $session_exists = \Drupal::service('session_configuration')->hasSession($request);
+  $page['#cache']['contexts'][] = 'session.exists';
+  // Only do the no-JS detection while we don't know if there's no JS support:
+  // avoid endless redirect loops.
+  $has_big_pipe_nojs_cookie = $request->cookies->has(BigPipeStrategy::NOJS_COOKIE);
+  $page['#cache']['contexts'][] = 'cookies:' . BigPipeStrategy::NOJS_COOKIE;
+  if ($session_exists) {
+    if (!$has_big_pipe_nojs_cookie) {
+      // Let server set the BigPipe no-JS cookie.
+      $page['#attached']['html_head'][] = [
+        [
+          // Redirect through a 'Refresh' meta tag if JavaScript is disabled.
+          '#tag' => 'meta',
+          '#noscript' => TRUE,
+          '#attributes' => [
+            'http-equiv' => 'Refresh',
+            // @todo: Switch to Url::fromRoute() once https://www.drupal.org/node/2589967 is resolved.
+            'content' => '0; URL=' . Url::fromUri('internal:/big_pipe/no-js', ['query' => \Drupal::service('redirect.destination')->getAsArray()])->toString(),
+          ],
+        ],
+        'big_pipe_detect_nojs',
+      ];
+    }
+    else {
+      // Let client delete the BigPipe no-JS cookie.
+      $page['#attached']['html_head'][] = [
+        [
+          '#tag' => 'script',
+          '#value' => 'document.cookie = "' . BigPipeStrategy::NOJS_COOKIE . '=1; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT"',
+        ],
+        'big_pipe_detect_js',
+      ];
+    }
+  }
+}
diff --git a/core/modules/big_pipe/big_pipe.routing.yml b/core/modules/big_pipe/big_pipe.routing.yml
new file mode 100644
index 0000000..c7981dc
--- /dev/null
+++ b/core/modules/big_pipe/big_pipe.routing.yml
@@ -0,0 +1,9 @@
+big_pipe.nojs:
+  path: '/big_pipe/no-js'
+  defaults:
+    _controller: '\Drupal\big_pipe\Controller\BigPipeController:setNoJsCookie'
+    _title: 'BigPipe no-JS check'
+  options:
+    no_cache: TRUE
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/big_pipe/big_pipe.services.yml b/core/modules/big_pipe/big_pipe.services.yml
new file mode 100644
index 0000000..b06255a
--- /dev/null
+++ b/core/modules/big_pipe/big_pipe.services.yml
@@ -0,0 +1,25 @@
+services:
+  html_response.big_pipe_subscriber:
+    class: Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+    tags:
+      - { name: event_subscriber }
+    arguments: ['@big_pipe']
+  placeholder_strategy.big_pipe:
+    class: Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+    arguments: ['@session_configuration', '@request_stack', '@current_route_match']
+    tags:
+      - { name: placeholder_strategy, priority: 0 }
+  big_pipe:
+    class: Drupal\big_pipe\Render\BigPipe
+    arguments: ['@renderer', '@session', '@request_stack', '@http_kernel', '@event_dispatcher']
+  html_response.attachments_processor.big_pipe:
+    public: false
+    class: \Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor
+    decorates: html_response.attachments_processor
+    decoration_inner_name: html_response.attachments_processor.original
+    arguments: ['@html_response.attachments_processor.original', '@asset.resolver', '@config.factory', '@asset.css.collection_renderer', '@asset.js.collection_renderer', '@request_stack', '@renderer', '@module_handler']
+
+  route_subscriber.no_big_pipe:
+    class: Drupal\big_pipe\EventSubscriber\NoBigPipeRouteAlterSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/core/modules/big_pipe/js/big_pipe.js b/core/modules/big_pipe/js/big_pipe.js
new file mode 100644
index 0000000..986cf47
--- /dev/null
+++ b/core/modules/big_pipe/js/big_pipe.js
@@ -0,0 +1,107 @@
+/**
+ * @file
+ * Renders BigPipe placeholders using Drupal's Ajax system.
+ */
+
+(function ($, Drupal, drupalSettings) {
+
+  'use strict';
+
+  /**
+   * Executes Ajax commands in <script type="application/vnd.drupal-ajax"> tag.
+   *
+   * These Ajax commands replace placeholders with HTML and load missing CSS/JS.
+   *
+   * @param {number} index
+   *   Current index.
+   * @param {HTMLScriptElement} placeholderReplacement
+   *   Script tag created by BigPipe.
+   */
+  function bigPipeProcessPlaceholderReplacement(index, placeholderReplacement) {
+    var placeholderId = placeholderReplacement.getAttribute('data-big-pipe-replacement-for-placeholder-with-id');
+    var content = this.textContent.trim();
+    // Ignore any placeholders that are not in the known placeholder list. Used
+    // to avoid someone trying to XSS the site via the placeholdering mechanism.
+    if (typeof drupalSettings.bigPipePlaceholderIds[placeholderId] !== 'undefined') {
+      // If we try to parse the content too early (when the JSON containing Ajax
+      // commands is still arriving), textContent will be empty which will cause
+      // JSON.parse() to fail. Remove once so that it can be processed again
+      // later.
+      // @see bigPipeProcessDocument()
+      if (content === '') {
+        $(this).removeOnce('big-pipe');
+      }
+      else {
+        var response = JSON.parse(content);
+        // Create a Drupal.Ajax object without associating an element, a
+        // progress indicator or a URL.
+        var ajaxObject = Drupal.ajax({
+          url: '',
+          base: false,
+          element: false,
+          progress: false
+        });
+        // Then, simulate an AJAX response having arrived, and let the Ajax
+        // system handle it.
+        ajaxObject.success(response, 'success');
+      }
+    }
+  }
+
+  /**
+   * Processes a streamed HTML document receiving placeholder replacements.
+   *
+   * @param {HTMLDocument} context
+   *   The HTML document containing <script type="application/vnd.drupal-ajax">
+   *   tags generated by BigPipe.
+   *
+   * @return {bool}
+   *   Returns true when processing has been finished and a stop signal has been
+   *   found.
+   */
+  function bigPipeProcessDocument(context) {
+    // Make sure we have BigPipe-related scripts before processing further.
+    if (!context.querySelector('script[data-big-pipe-event="start"]')) {
+      return false;
+    }
+
+    $(context).find('script[data-big-pipe-replacement-for-placeholder-with-id]')
+      .once('big-pipe')
+      .each(bigPipeProcessPlaceholderReplacement);
+
+    // If we see the stop signal, clear the timeout: all placeholder
+    // replacements are guaranteed to be received and processed.
+    if (context.querySelector('script[data-big-pipe-event="stop"]')) {
+      if (timeoutID) {
+        clearTimeout(timeoutID);
+      }
+      return true;
+    }
+
+    return false;
+  }
+
+  function bigPipeProcess() {
+    timeoutID = setTimeout(function () {
+      if (!bigPipeProcessDocument(document)) {
+        bigPipeProcess();
+      }
+    }, interval);
+  }
+
+  var interval = 200;
+  // The internal ID to contain the watcher service.
+  var timeoutID;
+
+  bigPipeProcess();
+
+  // If something goes wrong, make sure everything is cleaned up and has had a
+  // chance to be processed with everything loaded.
+  $(window).on('load', function () {
+    if (timeoutID) {
+      clearTimeout(timeoutID);
+    }
+    bigPipeProcessDocument(document);
+  });
+
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/big_pipe/src/Controller/BigPipeController.php b/core/modules/big_pipe/src/Controller/BigPipeController.php
new file mode 100644
index 0000000..1f055e0
--- /dev/null
+++ b/core/modules/big_pipe/src/Controller/BigPipeController.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Controller\BigPipeController.
+ */
+
+namespace Drupal\big_pipe\Controller;
+
+use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Routing\LocalRedirectResponse;
+use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+/**
+ * Returns responses for BigPipe module routes.
+ */
+class BigPipeController {
+
+  /**
+   * Sets a BigPipe no-JS cookie, redirects back to the original location.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   *
+   * @return \Drupal\Core\Routing\LocalRedirectResponse
+   *   A response that sets the no-JS cookie and redirects back to the original
+   *   location.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   Thrown when the no-JS cookie is already set or when there is no session.
+   * @throws \Symfony\Component\HttpKernel\Exception\HttpException
+   *   Thrown when the original location is missing, i.e. when no 'destination'
+   *   query argument is set.
+   *
+   * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+   */
+  public function setNoJsCookie(Request $request) {
+    // This controller may only be accessed when the browser does not support
+    // JavaScript. It is accessed automatically when that's the case thanks to
+    // big_pipe_page_attachments(). When this controller is executed, deny
+    // access when either:
+    // - the no-JS cookie is already set: this indicates a redirect loop, since
+    //   the cookie was already set, yet the user is executing this controller;
+    // - there is no session, in which case BigPipe is not enabled anyway, so it
+    //   is pointless to set this cookie.
+    if ($request->cookies->has(BigPipeStrategy::NOJS_COOKIE) || $request->getSession() === NULL) {
+      throw new AccessDeniedHttpException();
+    }
+
+    if (!$request->query->has('destination')) {
+      throw new HttpException(400, 'The original location is missing.');
+    }
+
+    $response = new LocalRedirectResponse($request->query->get('destination'));
+    // Set cookie without httpOnly, so that JavaScript can delete it.
+    $response->headers->setCookie(new Cookie(BigPipeStrategy::NOJS_COOKIE, TRUE, 0, '/', NULL, FALSE, FALSE));
+    $response->addCacheableDependency((new CacheableMetadata())->addCacheContexts(['cookies:' . BigPipeStrategy::NOJS_COOKIE, 'session.exists']));
+    return $response;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php b/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php
new file mode 100644
index 0000000..3e64ef2
--- /dev/null
+++ b/core/modules/big_pipe/src/EventSubscriber/HtmlResponseBigPipeSubscriber.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber.
+ */
+
+namespace Drupal\big_pipe\EventSubscriber;
+
+use Drupal\Core\Render\HtmlResponse;
+use Drupal\big_pipe\Render\BigPipeInterface;
+use Drupal\big_pipe\Render\BigPipeResponse;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Response subscriber to replace the HtmlResponse with a BigPipeResponse.
+ *
+ * @see \Drupal\big_pipe\Render\BigPipeInterface
+ *
+ * @todo Refactor once https://www.drupal.org/node/2577631 lands.
+ */
+class HtmlResponseBigPipeSubscriber implements EventSubscriberInterface {
+
+  /**
+   * The BigPipe service.
+   *
+   * @var \Drupal\big_pipe\Render\BigPipeInterface
+   */
+  protected $bigPipe;
+
+  /**
+   * Constructs a HtmlResponseBigPipeSubscriber object.
+   *
+   * @param \Drupal\big_pipe\Render\BigPipeInterface $big_pipe
+   *   The BigPipe service.
+   */
+  public function __construct(BigPipeInterface $big_pipe) {
+    $this->bigPipe = $big_pipe;
+  }
+
+  /**
+   * Adds markers to the response necessary for the BigPipe render strategy.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   The event to process.
+   */
+  public function onRespondEarly(FilterResponseEvent $event) {
+    $response = $event->getResponse();
+    if (!$response instanceof HtmlResponse) {
+      return;
+    }
+
+    // Wrap the scripts_bottom placeholder with a marker before and after,
+    // because \Drupal\big_pipe\Render\BigPipe needs to be able to extract that
+    // markup if there are no-JS BigPipe placeholders.
+    // @see \Drupal\big_pipe\Render\BigPipe::sendPreBody()
+    $attachments = $response->getAttachments();
+    if (isset($attachments['html_response_attachment_placeholders']['scripts_bottom'])) {
+      $scripts_bottom_placeholder = $attachments['html_response_attachment_placeholders']['scripts_bottom'];
+      $content = $response->getContent();
+      $content = str_replace($scripts_bottom_placeholder, '<drupal-big-pipe-scripts-bottom-marker>' . $scripts_bottom_placeholder . '<drupal-big-pipe-scripts-bottom-marker>', $content);
+      $response->setContent($content);
+    }
+  }
+
+  /**
+   * Transforms a HtmlResponse to a BigPipeResponse.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   The event to process.
+   */
+  public function onRespond(FilterResponseEvent $event) {
+    $response = $event->getResponse();
+    if (!$response instanceof HtmlResponse) {
+      return;
+    }
+
+    $attachments = $response->getAttachments();
+
+    // If there are no no-JS BigPipe placeholders, unwrap the scripts_bottom
+    // markup.
+    // @see onRespondEarly()
+    // @see \Drupal\big_pipe\Render\BigPipe::sendPreBody()
+    if (empty($attachments['big_pipe_nojs_placeholders'])) {
+      $content = $response->getContent();
+      $content = str_replace('<drupal-big-pipe-scripts-bottom-marker>', '', $content);
+      $response->setContent($content);
+    }
+
+    // If there are neither BigPipe placeholders nor no-JS BigPipe placeholders,
+    // there isn't anything dynamic in this response, and we can return early:
+    // there is no point in sending this response using BigPipe.
+    if (empty($attachments['big_pipe_placeholders']) && empty($attachments['big_pipe_nojs_placeholders'])) {
+      return;
+    }
+
+    $big_pipe_response = new BigPipeResponse();
+    $big_pipe_response->setBigPipeService($this->bigPipe);
+
+    // Clone the HtmlResponse's data into the new BigPipeResponse.
+    $big_pipe_response->headers = clone $response->headers;
+    $big_pipe_response
+      ->setStatusCode($response->getStatusCode())
+      ->setContent($response->getContent())
+      ->setAttachments($attachments)
+      ->addCacheableDependency($response->getCacheableMetadata());
+
+    // A BigPipe response can never be cached, because it is intended for a
+    // single user.
+    // @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9.1
+    $big_pipe_response->setPrivate();
+
+    // Inform surrogates how they should handle BigPipe responses:
+    // - "no-store" specifies that the response should not be stored in cache;
+    //   it is only to be used for the original request
+    // - "content" identifies what processing surrogates should perform on the
+    //   response before forwarding it. We send, "BigPipe/1.0", which surrogates
+    //   should not process at all, and in fact, they should not even buffer it
+    //   at all.
+    // @see http://www.w3.org/TR/edge-arch/
+    $big_pipe_response->headers->set('Surrogate-Control', 'no-store, content="BigPipe/1.0"');
+
+    // Add header to support streaming on NGINX + php-fpm (nginx >= 1.5.6).
+    $big_pipe_response->headers->set('X-Accel-Buffering', 'no');
+
+    $event->setResponse($big_pipe_response);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    // Run after HtmlResponsePlaceholderStrategySubscriber (priority 5), i.e.
+    // after BigPipeStrategy has been applied, but before normal (priority 0)
+    // response subscribers have been applied, because by then it'll be too late
+    // to transform it into a BigPipeResponse.
+    $events[KernelEvents::RESPONSE][] = ['onRespondEarly', 3];
+
+    // Run as the last possible subscriber.
+    $events[KernelEvents::RESPONSE][] = ['onRespond', -10000];
+
+    return $events;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php b/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
new file mode 100644
index 0000000..973c2c5
--- /dev/null
+++ b/core/modules/big_pipe/src/EventSubscriber/NoBigPipeRouteAlterSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\EventSubscriber\NoBigPipeRouteAlterSubscriber.
+ */
+
+namespace Drupal\big_pipe\EventSubscriber;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Drupal\Core\Routing\RoutingEvents;
+use Drupal\Core\Routing\RouteBuildEvent;
+
+/**
+ * Sets the '_no_big_pipe' option on select routes.
+ */
+class NoBigPipeRouteAlterSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Alters select routes to have the '_no_big_pipe' option.
+   *
+   * @param \Drupal\Core\Routing\RouteBuildEvent $event
+   *   The event to process.
+   */
+  public function onRoutingRouteAlterSetNoBigPipe(RouteBuildEvent $event) {
+    $no_big_pipe_routes = [
+      // The batch system uses a <meta> refresh to work without JavaScript.
+      'system.batch_page.html',
+      // When a user would install the BigPipe module using a browser and with
+      // JavaScript disabled, the first response contains the status messages
+      // for installing a module, but then the BigPipe no-JS redirect occurs,
+      // which then causes the user to not see those status messages.
+      // @see https://www.drupal.org/node/2469431#comment-10901944
+      'system.modules_list',
+    ];
+
+    $route_collection = $event->getRouteCollection();
+    foreach ($no_big_pipe_routes as $excluded_route) {
+      if ($route = $route_collection->get($excluded_route)) {
+        $route->setOption('_no_big_pipe', TRUE);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  static function getSubscribedEvents() {
+    $events[RoutingEvents::ALTER][] = ['onRoutingRouteAlterSetNoBigPipe'];
+    return $events;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Render/BigPipe.php b/core/modules/big_pipe/src/Render/BigPipe.php
new file mode 100644
index 0000000..95fe785
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/BigPipe.php
@@ -0,0 +1,463 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\BigPipe.
+ */
+
+namespace Drupal\big_pipe\Render;
+
+use Drupal\Component\Utility\Crypt;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\ReplaceCommand;
+use Drupal\Core\Asset\AttachedAssets;
+use Drupal\Core\Asset\AttachedAssetsInterface;
+use Drupal\Core\Render\HtmlResponse;
+use Drupal\Core\Render\RendererInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * The default BigPipe service.
+ */
+class BigPipe implements BigPipeInterface {
+
+  /**
+   * The BigPipe placeholder replacements start signal.
+   *
+   * @var string
+   */
+  const START_SIGNAL = '<script type="application/vnd.drupal-ajax" data-big-pipe-event="start"></script>';
+
+  /**
+   * The BigPipe placeholder replacements stop signal.
+   *
+   * @var string
+   */
+  const STOP_SIGNAL = '<script type="application/vnd.drupal-ajax" data-big-pipe-event="stop"></script>';
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The session.
+   *
+   * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
+   */
+  protected $session;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The HTTP kernel.
+   *
+   * @var \Symfony\Component\HttpKernel\HttpKernelInterface
+   */
+  protected $httpKernel;
+
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
+  protected $eventDispatcher;
+
+  /**
+   * Constructs a new BigPipe class.
+   *
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session
+   *   The session.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
+   *   The HTTP kernel.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   The event dispatcher.
+   */
+  public function __construct(RendererInterface $renderer, SessionInterface $session, RequestStack $request_stack, HttpKernelInterface $http_kernel, EventDispatcherInterface $event_dispatcher) {
+    $this->renderer = $renderer;
+    $this->session = $session;
+    $this->requestStack = $request_stack;
+    $this->httpKernel = $http_kernel;
+    $this->eventDispatcher = $event_dispatcher;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function sendContent($content, array $attachments) {
+    // First, gather the BigPipe placeholders that must be replaced.
+    $placeholders = isset($attachments['big_pipe_placeholders']) ? $attachments['big_pipe_placeholders'] : [];
+    $nojs_placeholders = isset($attachments['big_pipe_nojs_placeholders']) ? $attachments['big_pipe_nojs_placeholders'] : [];
+
+    // BigPipe sends responses using "Transfer-Encoding: chunked". To avoid
+    // sending already-sent assets, it is necessary to track cumulative assets
+    // from all previously rendered/sent chunks.
+    // @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.41
+    $cumulative_assets = AttachedAssets::createFromRenderArray(['#attached' => $attachments]);
+    $cumulative_assets->setAlreadyLoadedLibraries($attachments['library']);
+
+    // The content in the placeholders may depend on the session, and by the
+    // time the response is sent (see index.php), the session is already closed.
+    // Reopen it for the duration that we are rendering placeholders.
+    $this->session->start();
+
+    list($pre_body, $post_body) = explode('</body>', $content, 2);
+    $this->sendPreBody($pre_body, $nojs_placeholders, $cumulative_assets);
+    $this->sendPlaceholders($placeholders, $this->getPlaceholderOrder($pre_body), $cumulative_assets);
+    $this->sendPostBody($post_body);
+
+    // Close the session again.
+    $this->session->save();
+
+    return $this;
+  }
+
+  /**
+   * Sends everything until just before </body>.
+   *
+   * @param string $pre_body
+   *   The HTML response's content until the closing </body> tag.
+   * @param array $no_js_placeholders
+   *   The no-JS BigPipe placeholders.
+   * @param \Drupal\Core\Asset\AttachedAssetsInterface $cumulative_assets
+   *   The cumulative assets sent so far; to be updated while rendering no-JS
+   *   BigPipe placeholders.
+   */
+  protected function sendPreBody($pre_body, array $no_js_placeholders, AttachedAssetsInterface $cumulative_assets) {
+    // If there are no no-JS BigPipe placeholders, we can send the pre-</body>
+    // part of the page immediately.
+    if (empty($no_js_placeholders)) {
+      print $pre_body;
+      flush();
+      return;
+    }
+
+    // Extract the scripts_bottom markup: the no-JS BigPipe placeholders that we
+    // will render may attach additional asset libraries, and if so, it will be
+    // necessary to re-render scripts_bottom.
+    list($pre_scripts_bottom, $scripts_bottom, $post_scripts_bottom) = explode('<drupal-big-pipe-scripts-bottom-marker>', $pre_body, 3);
+    $cumulative_assets_initial = clone $cumulative_assets;
+
+    $this->sendNoJsPlaceholders($pre_scripts_bottom . $post_scripts_bottom, $no_js_placeholders, $cumulative_assets);
+
+    // If additional asset libraries or drupalSettings were attached by any of
+    // the placeholders, then we need to re-render scripts_bottom.
+    if ($cumulative_assets_initial != $cumulative_assets) {
+      // Create a new HtmlResponse. Ensure the CSS and (non-bottom) JS is sent
+      // before the HTML they're associated with.
+      // @see \Drupal\Core\Render\HtmlResponseSubscriber
+      // @see template_preprocess_html()
+      $js_bottom_placeholder = '<nojs-bigpipe-placeholder-scripts-bottom-placeholder token="' . Crypt::randomBytesBase64(55) . '">';
+
+      $html_response = new HtmlResponse();
+      $html_response->setContent([
+        '#markup' => BigPipeMarkup::create($js_bottom_placeholder),
+        '#attached' => [
+          'drupalSettings' => $cumulative_assets->getSettings(),
+          'library' => $cumulative_assets->getAlreadyLoadedLibraries(),
+          'html_response_attachment_placeholders' => [
+            'scripts_bottom' => $js_bottom_placeholder,
+          ],
+        ],
+      ]);
+      $html_response->getCacheableMetadata()->setCacheMaxAge(0);
+
+      // Push a fake request with the asset libraries loaded so far and dispatch
+      // KernelEvents::RESPONSE event. This results in the attachments for the
+      // HTML response being processed by HtmlResponseAttachmentsProcessor and
+      // hence the HTML to load the bottom JavaScript can be rendered.
+      $fake_request = $this->requestStack->getMasterRequest()->duplicate();
+      $html_response = $this->filterEmbeddedResponse($fake_request, $html_response);
+      $scripts_bottom = $html_response->getContent();
+    }
+
+    print $scripts_bottom;
+    flush();
+  }
+
+  /**
+   * Sends no-JS BigPipe placeholders' replacements as embedded HTML responses.
+   *
+   * @param string $html
+   *   HTML markup.
+   * @param array $no_js_placeholders
+   *   Associative array; the no-JS BigPipe placeholders. Keys are the BigPipe
+   *   selectors.
+   * @param \Drupal\Core\Asset\AttachedAssetsInterface $cumulative_assets
+   *   The cumulative assets sent so far; to be updated while rendering no-JS
+   *   BigPipe placeholders.
+   */
+  protected function sendNoJsPlaceholders($html, $no_js_placeholders, AttachedAssetsInterface $cumulative_assets) {
+    // Split the HTML on every no-JS placeholder string.
+    $prepare_for_preg_split = function ($placeholder_string) {
+      return '(' . preg_quote($placeholder_string, '/') . ')';
+    };
+    $preg_placeholder_strings = array_map($prepare_for_preg_split, array_keys($no_js_placeholders));
+    $fragments = preg_split('/' . implode('|', $preg_placeholder_strings) . '/', $html, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+
+    foreach ($fragments as $fragment) {
+      // If the fragment isn't one of the no-JS placeholders, it is the HTML in
+      // between placeholders and it must be printed & flushed immediately. The
+      // rest of the logic in the loop handles the placeholders.
+      if (!isset($no_js_placeholders[$fragment])) {
+        print $fragment;
+        flush();
+        continue;
+      }
+
+      $placeholder = $fragment;
+      assert('isset($no_js_placeholders[$placeholder])');
+      $token = Crypt::randomBytesBase64(55);
+
+      // Render the placeholder, but include the cumulative settings assets, so
+      // we can calculate the overall settings for the entire page.
+      $placeholder_plus_cumulative_settings = [
+        'placeholder' => $no_js_placeholders[$placeholder],
+        'cumulative_settings_' . $token => [
+          '#attached' => [
+            'drupalSettings' => $cumulative_assets->getSettings(),
+          ],
+        ],
+      ];
+      $elements = $this->renderPlaceholder($placeholder, $placeholder_plus_cumulative_settings);
+
+      // Create a new HtmlResponse. Ensure the CSS and (non-bottom) JS is sent
+      // before the HTML they're associated with. In other words: ensure the
+      // critical assets for this placeholder's markup are loaded first.
+      // @see \Drupal\Core\Render\HtmlResponseSubscriber
+      // @see template_preprocess_html()
+      $css_placeholder = '<nojs-bigpipe-placeholder-styles-placeholder token="' . $token . '">';
+      $js_placeholder = '<nojs-bigpipe-placeholder-scripts-placeholder token="' . $token . '">';
+      $elements['#markup'] = BigPipeMarkup::create($css_placeholder . $js_placeholder . (string) $elements['#markup']);
+      $elements['#attached']['html_response_attachment_placeholders']['styles'] = $css_placeholder;
+      $elements['#attached']['html_response_attachment_placeholders']['scripts'] = $js_placeholder;
+
+      $html_response = new HtmlResponse();
+      $html_response->setContent($elements);
+      $html_response->getCacheableMetadata()->setCacheMaxAge(0);
+
+      // Push a fake request with the asset libraries loaded so far and dispatch
+      // KernelEvents::RESPONSE event. This results in the attachments for the
+      // HTML response being processed by HtmlResponseAttachmentsProcessor and
+      // hence:
+      // - the HTML to load the CSS can be rendered.
+      // - the HTML to load the JS (at the top) can be rendered.
+      $fake_request = $this->requestStack->getMasterRequest()->duplicate();
+      $fake_request->request->set('ajax_page_state', ['libraries' => implode(',', $cumulative_assets->getAlreadyLoadedLibraries())]);
+      $html_response = $this->filterEmbeddedResponse($fake_request, $html_response);
+
+      // Send this embedded HTML response.
+      print $html_response->getContent();
+      flush();
+
+      // Another placeholder was rendered and sent, track the set of asset
+      // libraries sent so far. Any new settings also need to be tracked, so
+      // they can be sent in ::sendPreBody().
+      $cumulative_assets->setAlreadyLoadedLibraries(array_merge($cumulative_assets->getAlreadyLoadedLibraries(), $html_response->getAttachments()['library']));
+      $cumulative_assets->setSettings($html_response->getAttachments()['drupalSettings']);
+    }
+  }
+
+  /**
+   * Sends BigPipe placeholders' replacements as embedded AJAX responses.
+   *
+   * @param array $placeholders
+   *   Associative array; the BigPipe placeholders. Keys are the BigPipe
+   *   placeholder IDs.
+   * @param array $placeholder_order
+   *   Indexed array; the order in which the BigPipe placeholders must be sent.
+   *   Values are the BigPipe placeholder IDs. (These values correspond to keys
+   *   in $placeholders.)
+   * @param \Drupal\Core\Asset\AttachedAssetsInterface $cumulative_assets
+   *   The cumulative assets sent so far; to be updated while rendering BigPipe
+   *   placeholders.
+   */
+  protected function sendPlaceholders(array $placeholders, array $placeholder_order, AttachedAssetsInterface $cumulative_assets) {
+    // Return early if there are no BigPipe placeholders to send.
+    if (empty($placeholders)) {
+      return;
+    }
+
+    // Send the start signal.
+    print "\n";
+    print static::START_SIGNAL;
+    print "\n";
+    flush();
+
+    // A BigPipe response consists of a HTML response plus multiple embedded
+    // AJAX responses. To process the attachments of those AJAX responses, we
+    // need a fake request that is identical to the master request, but with
+    // one change: it must have the right Accept header, otherwise the work-
+    // around for a bug in IE9 will cause not JSON, but <textarea>-wrapped JSON
+    // to be returned.
+    // @see \Drupal\Core\EventSubscriber\AjaxResponseSubscriber::onResponse()
+    $fake_request = $this->requestStack->getMasterRequest()->duplicate();
+    $fake_request->headers->set('Accept', 'application/vnd.drupal-ajax');
+
+    foreach ($placeholder_order as $placeholder_id) {
+      if (!isset($placeholders[$placeholder_id])) {
+        continue;
+      }
+
+      // Render the placeholder.
+      $placeholder_render_array = $placeholders[$placeholder_id];
+      $elements = $this->renderPlaceholder($placeholder_id, $placeholder_render_array);
+
+      // Create a new AjaxResponse.
+      $ajax_response = new AjaxResponse();
+      // JavaScript's querySelector automatically decodes HTML entities in
+      // attributes, so we must decode the entities of the current BigPipe
+      // placeholder ID (which has HTML entities encoded since we use it to find
+      // the placeholders).
+      $big_pipe_js_placeholder_id = Html::decodeEntities($placeholder_id);
+      $ajax_response->addCommand(new ReplaceCommand(sprintf('[data-big-pipe-placeholder-id="%s"]', $big_pipe_js_placeholder_id), $elements['#markup']));
+      $ajax_response->setAttachments($elements['#attached']);
+
+      // Push a fake request with the asset libraries loaded so far and dispatch
+      // KernelEvents::RESPONSE event. This results in the attachments for the
+      // AJAX response being processed by AjaxResponseAttachmentsProcessor and
+      // hence:
+      // - the necessary AJAX commands to load the necessary missing asset
+      //   libraries and updated AJAX page state are added to the AJAX response
+      // - the attachments associated with the response are finalized, which
+      //   allows us to track the total set of asset libraries sent in the
+      //   initial HTML response plus all embedded AJAX responses sent so far.
+      $fake_request->request->set('ajax_page_state', ['libraries' => implode(',', $cumulative_assets->getAlreadyLoadedLibraries())] + $cumulative_assets->getSettings()['ajaxPageState']);
+      $ajax_response = $this->filterEmbeddedResponse($fake_request, $ajax_response);
+
+      // Send this embedded AJAX response.
+      $json = $ajax_response->getContent();
+      $output = <<<EOF
+    <script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="$placeholder_id">
+    $json
+    </script>
+EOF;
+      print $output;
+      flush();
+
+      // Another placeholder was rendered and sent, track the set of asset
+      // libraries sent so far. Any new settings are already sent; we don't need
+      // to track those.
+      if (isset($ajax_response->getAttachments()['drupalSettings']['ajaxPageState']['libraries'])) {
+        $cumulative_assets->setAlreadyLoadedLibraries(explode(',', $ajax_response->getAttachments()['drupalSettings']['ajaxPageState']['libraries']));
+      }
+    }
+
+    // Send the stop signal.
+    print "\n";
+    print static::STOP_SIGNAL;
+    print "\n";
+    flush();
+  }
+
+  /**
+   * Filters the given embedded response, using the cumulative AJAX page state.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $fake_request
+   *   A fake subrequest that contains the cumulative AJAX page state of the
+   *   HTML document and all preceding Embedded HTML or AJAX responses.
+   * @param \Symfony\Component\HttpFoundation\Response|\Drupal\Core\Render\HtmlResponse|\Drupal\Core\Ajax\AjaxResponse $embedded_response
+   *   Either a HTML response or an AJAX response that will be embedded in the
+   *   overall HTML response.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The filtered response, which will load only the assets that $fake_request
+   *   did not indicate to already have been loaded, plus the updated cumulative
+   *   AJAX page state.
+   */
+  protected function filterEmbeddedResponse(Request $fake_request, Response $embedded_response) {
+    assert('$embedded_response instanceof \Drupal\Core\Render\HtmlResponse || $embedded_response instanceof \Drupal\Core\Ajax\AjaxResponse');
+    $this->requestStack->push($fake_request);
+    $event = new FilterResponseEvent($this->httpKernel, $fake_request, HttpKernelInterface::SUB_REQUEST, $embedded_response);
+    $this->eventDispatcher->dispatch(KernelEvents::RESPONSE, $event);
+    $filtered_response = $event->getResponse();
+    $this->requestStack->pop();
+    return $filtered_response;
+  }
+
+  /**
+   * Sends </body> and everything after it.
+   *
+   * @param string $post_body
+   *   The HTML response's content after the closing </body> tag.
+   */
+  protected function sendPostBody($post_body) {
+    print '</body>';
+    print $post_body;
+    flush();
+  }
+
+  /**
+   * Renders a placeholder, and just that placeholder.
+   *
+   * BigPipe renders placeholders independently of the rest of the content, so
+   * it needs to be able to render placeholders by themselves.
+   *
+   * @param string $placeholder
+   *   The placeholder to render.
+   * @param array $placeholder_render_array
+   *   The render array associated with that placeholder.
+   *
+   * @return array
+   *   The render array representing the rendered placeholder.
+   *
+   * @see \Drupal\Core\Render\RendererInterface::renderPlaceholder()
+   */
+  protected function renderPlaceholder($placeholder, array $placeholder_render_array) {
+    $elements = [
+      '#markup' => $placeholder,
+      '#attached' => [
+        'placeholders' => [
+          $placeholder => $placeholder_render_array,
+        ],
+      ],
+    ];
+    return $this->renderer->renderPlaceholder($placeholder, $elements);
+  }
+
+  /**
+   * Gets the BigPipe placeholder order.
+   *
+   * Determines the order in which BigPipe placeholders must be replaced.
+   *
+   * @param string $html
+   *   HTML markup.
+   *
+   * @return array
+   *   Indexed array; the order in which the BigPipe placeholders must be sent.
+   *   Values are the BigPipe placeholder IDs.
+   */
+  protected function getPlaceholderOrder($html) {
+    $fragments = explode('<div data-big-pipe-placeholder-id="', $html);
+    array_shift($fragments);
+    $order = [];
+
+    foreach ($fragments as $fragment) {
+      $t = explode('"></div>', $fragment, 2);
+      $placeholder = $t[0];
+      $order[] = $placeholder;
+    }
+
+    return $order;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Render/BigPipeInterface.php b/core/modules/big_pipe/src/Render/BigPipeInterface.php
new file mode 100644
index 0000000..f526f54
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/BigPipeInterface.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\BigPipeInterface.
+ */
+
+namespace Drupal\big_pipe\Render;
+
+/**
+ * Interface for sending an HTML response in chunks (to get faster page loads).
+ *
+ * At a high level, BigPipe sends a HTML response in chunks:
+ * 1. one chunk: everything until just before </body> — this contains BigPipe
+ *    placeholders for the personalized parts of the page. Hence this sends the
+ *    non-personalized parts of the page. Let's call it The Skeleton.
+ * 2. N chunks: a <script> tag per BigPipe placeholder in The Skeleton.
+ * 3. one chunk: </body> and everything after it.
+ *
+ * This is conceptually identical to Facebook's BigPipe (hence the name).
+ *
+ * @see https://www.facebook.com/notes/facebook-engineering/bigpipe-pipelining-web-pages-for-high-performance/389414033919
+ *
+ * The major way in which Drupal differs from Facebook's implementation (and
+ * others) is in its ability to automatically figure out which parts of the page
+ * can benefit from BigPipe-style delivery. Drupal's render system has the
+ * concept of "auto-placeholdering": content that is too dynamic is replaced
+ * with a placeholder that can then be rendered at a later time. On top of that,
+ * it also has the concept of "placeholder strategies": by default, placeholders
+ * are replaced on the server side and the response is blocked on all of them
+ * being replaced. But it's possible to add additional placeholder strategies.
+ * BigPipe is just another placeholder strategy. Others could be ESI, AJAX …
+ *
+ * @see https://www.drupal.org/developing/api/8/render/arrays/cacheability/auto-placeholdering
+ * @see \Drupal\Core\Render\PlaceholderGeneratorInterface::shouldAutomaticallyPlaceholder()
+ * @see \Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface
+ * @see \Drupal\Core\Render\Placeholder\SingleFlushStrategy
+ * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+ *
+ * There is also one noteworthy technical addition that Drupal makes. BigPipe as
+ * described above, and as implemented by Facebook, can only work if JavaScript
+ * is enabled. The BigPipe module also makes it possible to replace placeholders
+ * using BigPipe in-situ, without JavaScript. This is not technically BigPipe at
+ * all; it's just the use of multiple flushes. Since it is able to reuse much of
+ * the logic though, we choose to call this "no-JS BigPipe".
+ *
+ * However, there is also a tangible benefit: some dynamic/expensive content is
+ * not HTML, but for example a HTML attribute value (or part thereof). It's not
+ * possible to efficiently replace such content using JavaScript, so "classic"
+ * BigPipe is out of the question. For example: CSRF tokens in URLs.
+ *
+ * This allows us to use both no-JS BigPipe and "classic" BigPipe in the same
+ * response to maximize the amount of content we can send as early as possible.
+ *
+ * Finally, a closer look at the implementation, and how it supports and reuses
+ * existing Drupal concepts:
+ * 1. BigPipe placeholders: 1 HtmlResponse + N embedded AjaxResponses.
+ *   - Before a BigPipe response is sent, it is just a HTML response that
+ *     contains BigPipe placeholders. Those placeholders look like
+ *     <div data-big-pipe-placeholder-id="…"></div>. JavaScript is used to
+ *     replace those placeholders.
+ *     Therefore these placeholders are actually sent to the client.
+ *   - The Skeleton of course has attachments, including most notably asset
+ *     libraries. And those we track in drupalSettings.ajaxPageState.libraries —
+ *     so that when we load new content through AJAX, we don't load the same
+ *     asset libraries again. A HTML page can have multiple AJAX responses, each
+ *     of which should take into account the combined AJAX page state of the
+ *     HTML document and all preceding AJAX responses.
+ *   - BigPipe does not make use of multiple AJAX requests/responses. It uses a
+ *     single HTML response. But it is a more long-lived one: The Skeleton is
+ *     sent first, the closing </body> tag is not yet sent, and the connection
+ *     is kept open. Whenever another BigPipe Placeholder is rendered, Drupal
+ *     sends (and so actually appends to the already-sent HTML) something like
+ *     <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}.
+ *   - So, for every BigPipe placeholder, we send such a <script
+ *     type="application/vnd.drupal-ajax"> tag. And the contents of that tag is
+ *     exactly like an AJAX response. The BigPipe module has JavaScript that
+ *     listens for these and applies them. Let's call it an Embedded AJAX
+ *     Response (since it is embedded in the HTML response). Now for the
+ *     interesting bit: each of those Embedded AJAX Responses must also take
+ *     into account the cumulative AJAX page state of the HTML document and all
+ *     preceding Embedded AJAX responses.
+ * 2. No-JS BigPipe placeholders: 1 HtmlResponse + N embedded HtmlResponses.
+ *   - Before a BigPipe response is sent, it is just a HTML response that
+ *     contains no-JS BigPipe placeholders. Those placeholders can take two
+ *     different forms:
+ *     1. <div data-big-pipe-nojs-placeholder-id="…"></div> if it's a
+ *        placeholder that will be replaced by HTML
+ *     2. big_pipe_nojs_placeholder_attribute_safe:… if it's a placeholder
+ *        inside a HTML attribute, in which 1. would be invalid (angle brackets
+ *        are not allowed inside HTML attributes)
+ *     No-JS BigPipe placeholders are not replaced using JavaScript, they must
+ *     be replaced upon sending the BigPipe response. So, while the response is
+ *     being sent, upon encountering these placeholders, their corresponding
+ *     placeholder replacements are sent instead.
+ *     Therefore these placeholders are never actually sent to the client.
+ *   - See second bullet of point 1.
+ *   - No-JS BigPipe does not use multiple AJAX requests/responses. It uses a
+ *     single HTML response. But it is a more long-lived one: The Skeleton is
+ *     split into multiple parts, the separators are where the no-JS BigPipe
+ *     placeholders used to be. Whenever another no-JS BigPipe placeholder is
+ *     rendered, Drupal sends (and so actually appends to the already-sent HTML)
+ *     something like
+ *     <link rel="stylesheet" …><script …><content>.
+ *   - So, for every no-JS BigPipe placeholder, we send its associated CSS and
+ *     header JS that has not already been sent (the bottom JS is not yet sent,
+ *     so we can accumulate all of it and send it together at the end). This
+ *     ensures that the markup is rendered as it was originally intended: its
+ *     CSS and JS used to be blocking, and it still is. Let's call it an
+ *     Embedded HTML response. Each of those Embedded HTML Responses must also
+ *     take into account the cumulative AJAX page state of the HTML document and
+ *     all preceding Embedded HTML responses.
+ *   - Finally: any non-critical JavaScript associated with all Embedded HTML
+ *     Responses, i.e. any footer/bottom/non-header JavaScript, is loaded after
+ *     The Skeleton.
+ *
+ * Combining all of the above, when using both BigPipe placeholders and no-JS
+ * BigPipe placeholders, we therefore send: 1 HtmlResponse + M Embedded HTML
+ * Responses + N Embedded AJAX Responses. Schematically, we send these chunks:
+ *  1. Byte zero until 1st no-JS placeholder: headers + <html><head /><div>…</div>
+ *  2. 1st no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
+ *  3. Content until 2nd no-JS placeholder: <div>…</div>
+ *  4. 2nd no-JS placeholder replacement: <link rel="stylesheet" …><script …><content>
+ *  5. Content until 3rd no-JS placeholder: <div>…</div>
+ *  6. [… repeat until all no-JS placeholder replacements are sent …]
+ *  7. Send content after last no-JS placeholder.
+ *  8. Send script_bottom (markup to load bottom i.e. non-critical JS).
+ *  9. 1st placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
+ * 10. 2nd placeholder replacement: <script type="application/vnd.drupal-ajax">[{"command":"settings","settings":{…}}, {"command":…}
+ * 11. [… repeat until all placeholder replacements are sent …]
+ * 12. Send </body> and everything after it.
+ * 13. Terminate request/response cycle.
+ *
+ * @see \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+ * @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+ */
+interface BigPipeInterface {
+
+  /**
+   * Sends an HTML response in chunks using the BigPipe technique.
+   *
+   * @param string $content
+   *   The HTML response content to send.
+   * @param array $attachments
+   *   The HTML response's attachments.
+   */
+  public function sendContent($content, array $attachments);
+
+}
diff --git a/core/modules/big_pipe/src/Render/BigPipeMarkup.php b/core/modules/big_pipe/src/Render/BigPipeMarkup.php
new file mode 100644
index 0000000..d16d909
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/BigPipeMarkup.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\BigPipeMarkup.
+ */
+
+namespace Drupal\big_pipe\Render;
+
+use Drupal\Component\Render\MarkupInterface;
+use Drupal\Component\Render\MarkupTrait;
+
+/**
+ * Defines an object that passes safe strings through BigPipe's render pipeline.
+ *
+ * This object should only be constructed with a known safe string. If there is
+ * any risk that the string contains user-entered data that has not been
+ * filtered first, it must not be used.
+ *
+ * @internal
+ *   This object is marked as internal because it should only be used in the
+ *   BigPipe render pipeline.
+ *
+ * @see \Drupal\Core\Render\Markup
+ */
+final class BigPipeMarkup implements MarkupInterface, \Countable {
+  use MarkupTrait;
+}
diff --git a/core/modules/big_pipe/src/Render/BigPipeResponse.php b/core/modules/big_pipe/src/Render/BigPipeResponse.php
new file mode 100644
index 0000000..235a154
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/BigPipeResponse.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\BigPipeResponse.
+ */
+
+namespace Drupal\big_pipe\Render;
+
+use Drupal\Core\Render\HtmlResponse;
+
+/**
+ * A response that is sent in chunks by the BigPipe service.
+ *
+ * Note we cannot use \Symfony\Component\HttpFoundation\StreamedResponse because
+ * it makes the content inaccessible (hidden behind a callback), which means no
+ * middlewares are able to modify the content anymore.
+ *
+ * @see \Drupal\big_pipe\Render\BigPipeInterface
+ *
+ * @todo Will become obsolete with https://www.drupal.org/node/2577631
+ */
+class BigPipeResponse extends HtmlResponse {
+
+  /**
+   * The BigPipe service.
+   *
+   * @var \Drupal\big_pipe\Render\BigPipeInterface
+   */
+  protected $bigPipe;
+
+  /**
+   * Sets the BigPipe service to use.
+   *
+   * @param \Drupal\big_pipe\Render\BigPipeInterface $big_pipe
+   *   The BigPipe service.
+   */
+  public function setBigPipeService(BigPipeInterface $big_pipe) {
+    $this->bigPipe = $big_pipe;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function sendContent() {
+    $this->bigPipe->sendContent($this->content, $this->getAttachments());
+
+    return $this;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php b/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php
new file mode 100644
index 0000000..37cde3d
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/BigPipeResponseAttachmentsProcessor.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor.
+ */
+
+namespace Drupal\big_pipe\Render;
+
+use Drupal\Core\Asset\AssetCollectionRendererInterface;
+use Drupal\Core\Asset\AssetResolverInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Form\EnforcedResponseException;
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\AttachmentsResponseProcessorInterface;
+use Drupal\Core\Render\HtmlResponseAttachmentsProcessor;
+use Drupal\Core\Render\RendererInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Processes attachments of HTML responses with BigPipe enabled.
+ *
+ * @see \Drupal\Core\Render\HtmlResponseAttachmentsProcessor
+ * @see \Drupal\big_pipe\Render\BigPipeInterface
+ */
+class BigPipeResponseAttachmentsProcessor extends HtmlResponseAttachmentsProcessor {
+
+  /**
+   * The HTML response attachments processor service.
+   *
+   * @var \Drupal\Core\Render\AttachmentsResponseProcessorInterface
+   */
+  protected $htmlResponseAttachmentsProcessor;
+
+  /**
+   * Constructs a BigPipeResponseAttachmentsProcessor object.
+   *
+   * @param \Drupal\Core\Render\AttachmentsResponseProcessorInterface $html_response_attachments_processor
+   *   The HTML response attachments processor service.
+   * @param \Drupal\Core\Asset\AssetResolverInterface $asset_resolver
+   *   An asset resolver.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   A config factory for retrieving required config objects.
+   * @param \Drupal\Core\Asset\AssetCollectionRendererInterface $css_collection_renderer
+   *   The CSS asset collection renderer.
+   * @param \Drupal\Core\Asset\AssetCollectionRendererInterface $js_collection_renderer
+   *   The JS asset collection renderer.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   */
+  public function __construct(AttachmentsResponseProcessorInterface $html_response_attachments_processor, AssetResolverInterface $asset_resolver, ConfigFactoryInterface $config_factory, AssetCollectionRendererInterface $css_collection_renderer, AssetCollectionRendererInterface $js_collection_renderer, RequestStack $request_stack, RendererInterface $renderer, ModuleHandlerInterface $module_handler) {
+    $this->htmlResponseAttachmentsProcessor = $html_response_attachments_processor;
+    parent::__construct($asset_resolver, $config_factory, $css_collection_renderer, $js_collection_renderer, $request_stack, $renderer, $module_handler);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processAttachments(AttachmentsInterface $response) {
+    assert('$response instanceof \Drupal\Core\Render\HtmlResponse');
+
+    // First, render the actual placeholders; this will cause the BigPipe
+    // placeholder strategy to generate BigPipe placeholders. We need those to
+    // exist already so that we can extract BigPipe placeholders. This is hence
+    // a bit of unfortunate but necessary duplication.
+    // @see \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+    // (Note this is copied verbatim from
+    // \Drupal\Core\Render\HtmlResponseAttachmentsProcessor::processAttachments)
+    try {
+      $response = $this->renderPlaceholders($response);
+    }
+    catch (EnforcedResponseException $e) {
+      return $e->getResponse();
+    }
+
+    // Extract BigPipe placeholders; HtmlResponseAttachmentsProcessor does not
+    // know (nor need to know) how to process those.
+    $attachments = $response->getAttachments();
+    $big_pipe_placeholders = [];
+    $big_pipe_nojs_placeholders = [];
+    if (isset($attachments['big_pipe_placeholders'])) {
+      $big_pipe_placeholders = $attachments['big_pipe_placeholders'];
+      unset($attachments['big_pipe_placeholders']);
+    }
+    if (isset($attachments['big_pipe_nojs_placeholders'])) {
+      $big_pipe_nojs_placeholders = $attachments['big_pipe_nojs_placeholders'];
+      unset($attachments['big_pipe_nojs_placeholders']);
+    }
+    $html_response = clone $response;
+    $html_response->setAttachments($attachments);
+
+    // Call HtmlResponseAttachmentsProcessor to process all other attachments.
+    $processed_html_response = $this->htmlResponseAttachmentsProcessor->processAttachments($html_response);
+
+    // Restore BigPipe placeholders.
+    $attachments = $processed_html_response->getAttachments();
+    $big_pipe_response = clone $processed_html_response;
+    if (count($big_pipe_placeholders)) {
+      $attachments['big_pipe_placeholders'] = $big_pipe_placeholders;
+    }
+    if (count($big_pipe_nojs_placeholders)) {
+      $attachments['big_pipe_nojs_placeholders'] = $big_pipe_nojs_placeholders;
+    }
+    $big_pipe_response->setAttachments($attachments);
+
+    return $big_pipe_response;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
new file mode 100644
index 0000000..e24c9ad
--- /dev/null
+++ b/core/modules/big_pipe/src/Render/Placeholder/BigPipeStrategy.php
@@ -0,0 +1,273 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+ */
+
+namespace Drupal\big_pipe\Render\Placeholder;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\SessionConfigurationInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Defines the BigPipe placeholder strategy, to send HTML in chunks.
+ *
+ * First: the BigPipe placeholder strategy only activates if the current request
+ * is associated with a session. Without a session, it is assumed this response
+ * is not actually dynamic: if none of the placeholders show session-dependent
+ * information, then none of the placeholders are uncacheable or poorly
+ * cacheable, which means the Page Cache (for anonymous users) can deal with it.
+ * In other words: BigPipe works for all authenticated users and for anonymous
+ * users that have a session (typical example: a shopping cart).
+ *
+ * (This is the default, and other modules can subclass this placeholder
+ * strategy to have different rules for enabling BigPipe.)
+ *
+ * The BigPipe placeholder strategy actually consists of two substrategies,
+ * depending on whether the current session is in a browser with JavaScript
+ * enabled or not:
+ * 1. with JavaScript enabled: #attached[big_pipe_js_placeholders]. Their
+ *    replacements are streamed at the end of the page: chunk 1 is the entire
+ *    page until the closing </body> tag, chunks 2 to (N-1) are replacement
+ *    values for the placeholders, chunk N is </body> and everything after it.
+ * 2. with JavaScript disabled: #attached[big_pipe_nojs_placeholders]. Their
+ *    replacements are streamed in situ: chunk 1 is the entire page until the
+ *    first no-JS BigPipe placeholder, chunk 2 is the replacement for that
+ *    placeholder, chunk 3 is the chunk from after that placeholder until the
+ *    next no-JS BigPipe placeholder, et cetera.
+ *
+ * JS BigPipe placeholders are preferred because they result in better perceived
+ * performance: the entire page can be sent, minus the placeholders. But it
+ * requires JavaScript.
+ *
+ * No-JS BigPipe placeholders result in more visible blocking: only the part of
+ * the page can be sent until the first placeholder, after it is rendered until
+ * the second, et cetera. (In essence: multiple flushes.)
+ *
+ * Finally, both of those substrategies can also be combined: some placeholders
+ * live in places that cannot be efficiently replaced by JavaScript, for example
+ * CSRF tokens in URLs. Using no-JS BigPipe placeholders in those cases allows
+ * the first part of the page (until the first no-JS BigPipe placeholder) to be
+ * sent sooner than when they would be replaced using SingleFlushStrategy, which
+ * would prevent anything from being sent until all those non-HTML placeholders
+ * would have been replaced.
+ *
+ * See \Drupal\big_pipe\Render\BigPipe for detailed documentation on how those
+ * different placeholders are actually replaced.
+ *
+ * @see \Drupal\big_pipe\Render\BigPipeInterface
+ */
+class BigPipeStrategy implements PlaceholderStrategyInterface {
+
+  /**
+   * BigPipe no-JS cookie name.
+   */
+  const NOJS_COOKIE = 'big_pipe_nojs';
+
+  /**
+   * The session configuration.
+   *
+   * @var \Drupal\Core\Session\SessionConfigurationInterface
+   */
+  protected $sessionConfiguration;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The current route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * Constructs a new BigPipeStrategy class.
+   *
+   * @param \Drupal\Core\Session\SessionConfigurationInterface $session_configuration
+   *   The session configuration.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The current route match.
+   */
+  public function __construct(SessionConfigurationInterface $session_configuration, RequestStack $request_stack, RouteMatchInterface $route_match) {
+    $this->sessionConfiguration = $session_configuration;
+    $this->requestStack = $request_stack;
+    $this->routeMatch = $route_match;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processPlaceholders(array $placeholders) {
+    // Routes can opt out from using the BigPipe HTML delivery technique.
+    if ($this->routeMatch->getRouteObject()->getOption('_no_big_pipe')) {
+      return [];
+    }
+
+    if (!$this->sessionConfiguration->hasSession($this->requestStack->getCurrentRequest())) {
+      return [];
+    }
+
+    return $this->doProcessPlaceholders($placeholders);
+  }
+
+  /**
+   * Transforms placeholders to BigPipe placeholders, either no-JS or JS.
+   *
+   * @param array $placeholders
+   *   The placeholders to process.
+   *
+   * @return array
+   *   The BigPipe placeholders.
+   */
+  protected function doProcessPlaceholders(array $placeholders) {
+    $overridden_placeholders = [];
+    foreach ($placeholders as $placeholder => $placeholder_elements) {
+      // BigPipe uses JavaScript and the DOM to find the placeholder to replace.
+      // This means finding the placeholder to replace must be efficient. Most
+      // placeholders are HTML, which we can find efficiently thanks to the
+      // querySelector API. But some placeholders are HTML attribute values or
+      // parts thereof, and potentially even plain text in DOM text nodes. For
+      // BigPipe's JavaScript to find those placeholders, it would need to
+      // iterate over all DOM text nodes. This is highly inefficient. Therefore,
+      // the BigPipe placeholder strategy only converts HTML placeholders into
+      // BigPipe placeholders. The other placeholders need to be replaced on the
+      // server, not via BigPipe.
+      // @see \Drupal\Core\Access\RouteProcessorCsrf::renderPlaceholderCsrfToken()
+      // @see \Drupal\Core\Form\FormBuilder::renderFormTokenPlaceholder()
+      // @see \Drupal\Core\Form\FormBuilder::renderPlaceholderFormAction()
+      if ($placeholder[0] !== '<' || $placeholder !== Html::normalize($placeholder)) {
+        $overridden_placeholders[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements, TRUE);
+      }
+      else {
+        // If the current request/session doesn't have JavaScript, fall back to
+        // no-JS BigPipe.
+        if ($this->requestStack->getCurrentRequest()->cookies->has(static::NOJS_COOKIE)) {
+          $overridden_placeholders[$placeholder] = static::createBigPipeNoJsPlaceholder($placeholder, $placeholder_elements, FALSE);
+        }
+        else {
+          $overridden_placeholders[$placeholder] = static::createBigPipeJsPlaceholder($placeholder, $placeholder_elements);
+        }
+        $overridden_placeholders[$placeholder]['#cache']['contexts'][] = 'cookies:' . static::NOJS_COOKIE;
+      }
+    }
+
+    return $overridden_placeholders;
+  }
+
+  /**
+   * Creates a BigPipe JS placeholder.
+   *
+   * @param string $original_placeholder
+   *   The original placeholder.
+   * @param array $placeholder_render_array
+   *   The render array for a placeholder.
+   *
+   * @return array
+   *   The resulting BigPipe JS placeholder render array.
+   */
+  protected static function createBigPipeJsPlaceholder($original_placeholder, array $placeholder_render_array) {
+    $big_pipe_placeholder_id = static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array);
+
+    return [
+      '#markup' => '<div data-big-pipe-placeholder-id="' . Html::escape($big_pipe_placeholder_id) . '"></div>',
+      '#cache' => [
+        'max-age' => 0,
+        'contexts' => [
+          'session.exists',
+        ],
+      ],
+      '#attached' => [
+        'library' => [
+          'big_pipe/big_pipe',
+        ],
+        // Inform BigPipe' JavaScript known BigPipe placeholder IDs (a whitelist).
+        'drupalSettings' => [
+          'bigPipePlaceholderIds' => [$big_pipe_placeholder_id => TRUE],
+        ],
+        'big_pipe_placeholders' => [
+          Html::escape($big_pipe_placeholder_id) => $placeholder_render_array,
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Creates a BigPipe no-JS placeholder.
+   *
+   * @param string $original_placeholder
+   *   The original placeholder.
+   * @param array $placeholder_render_array
+   *   The render array for a placeholder.
+   * @param bool $placeholder_must_be_attribute_safe
+   *   Whether the placeholder must be safe for use in a HTML attribute (in case
+   *   it's a placeholder for a HTML attribute value or a subset of it).
+   *
+   * @return array
+   *   The resulting BigPipe no-JS placeholder render array.
+   */
+  protected static function createBigPipeNoJsPlaceholder($original_placeholder, array $placeholder_render_array, $placeholder_must_be_attribute_safe = FALSE) {
+    if (!$placeholder_must_be_attribute_safe) {
+      $big_pipe_placeholder = '<div data-big-pipe-nojs-placeholder-id="' . Html::escape(static::generateBigPipePlaceholderId($original_placeholder, $placeholder_render_array))  . '"></div>';
+    }
+    else {
+      $big_pipe_placeholder = 'big_pipe_nojs_placeholder_attribute_safe:' . Html::escape($original_placeholder);
+    }
+
+    return [
+      '#markup' => $big_pipe_placeholder,
+      '#cache' => [
+        'max-age' => 0,
+        'contexts' => [
+          'session.exists',
+        ],
+      ],
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          $big_pipe_placeholder => $placeholder_render_array,
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Generates a BigPipe placeholder ID.
+   *
+   * @param string $original_placeholder
+   *   The original placeholder.
+   * @param array $placeholder_render_array
+   *   The render array for a placeholder.
+   *
+   * @return string
+   *   The generated BigPipe placeholder ID.
+   */
+  protected static function generateBigPipePlaceholderId($original_placeholder, array $placeholder_render_array) {
+    // Generate a BigPipe placeholder ID (to be used by BigPipe's JavaScript).
+    // @see \Drupal\Core\Render\PlaceholderGenerator::createPlaceholder()
+    if (isset($placeholder_render_array['#lazy_builder'])) {
+      $callback = $placeholder_render_array['#lazy_builder'][0];
+      $arguments = $placeholder_render_array['#lazy_builder'][1];
+      $token = hash('crc32b', serialize($placeholder_render_array));
+      return UrlHelper::buildQuery(['callback' => $callback, 'args' => $arguments, 'token' => $token]);
+    }
+    // When the placeholder's render array is not using a #lazy_builder,
+    // anything could be in there: only #lazy_builder has a strict contract that
+    // allows us to create a more sane selector. Therefore, simply the original
+    // placeholder into a usable placeholder ID, at the cost of it being obtuse.
+    else {
+      return Html::getId($original_placeholder);
+    }
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
new file mode 100644
index 0000000..5514eb7
--- /dev/null
+++ b/core/modules/big_pipe/src/Tests/BigPipePlaceholderTestCases.php
@@ -0,0 +1,350 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipePlaceholderTestCases.
+ */
+
+namespace Drupal\big_pipe\Tests;
+
+use Drupal\big_pipe\Render\BigPipeMarkup;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * BigPipe placeholder test cases for use in both unit and integration tests.
+ *
+ * - Unit test:
+ *   \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipeStrategyTest
+ * - Integration test for BigPipe with JS on:
+ *   \Drupal\big_pipe\Tests\BigPipeTest::testBigPipe()
+ * - Integration test for BigPipe with JS off:
+ *   \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeNoJs()
+ */
+class BigPipePlaceholderTestCases {
+
+  /**
+   * Gets all BigPipe placeholder test cases.
+   *
+   * @param \Symfony\Component\DependencyInjection\ContainerInterface|null $container
+   *   Optional. Necessary to get the embedded AJAX/HTML responses.
+   * @param \Drupal\Core\Session\AccountInterface|null $user
+   *   Optional. Necessary to get the embedded AJAX/HTML responses.
+   *
+   * @return \Drupal\big_pipe\Tests\BigPipePlaceholderTestCase[]
+   */
+  public static function cases(ContainerInterface $container = NULL, AccountInterface $user = NULL) {
+    // Define the two types of cacheability that we expect to see. These will be
+    // used in the expectations.
+    $cacheability_depends_on_session_only = [
+      'max-age' => 0,
+      'contexts' => ['session.exists'],
+    ];
+    $cacheability_depends_on_session_and_nojs_cookie = [
+      'max-age' => 0,
+      'contexts' => ['session.exists', 'cookies:big_pipe_nojs'],
+    ];
+
+
+    // 1. Real-world example of HTML placeholder.
+    $status_messages = new BigPipePlaceholderTestCase(
+      [], //['#type' => 'status_messages'],
+      '<drupal-render-placeholder callback="Drupal\Core\Render\Element\StatusMessages::renderMessages" arguments="0" token="a8c34b5e"></drupal-render-placeholder>',
+      [
+        '#lazy_builder' => [
+          'Drupal\Core\Render\Element\StatusMessages::renderMessages',
+          [NULL]
+        ],
+      ]
+    );
+    $status_messages->bigPipePlaceholderId = 'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e';
+    $status_messages->bigPipePlaceholderRenderArray = [
+      '#markup' => '<div data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>',
+      '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
+      '#attached' => [
+        'library' => ['big_pipe/big_pipe'],
+        'drupalSettings' => [
+          'bigPipePlaceholderIds' => [
+            'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=a8c34b5e' => TRUE,
+          ],
+        ],
+        'big_pipe_placeholders' => [
+          'callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e' => $status_messages->placeholderRenderArray,
+        ],
+      ],
+    ];
+    $status_messages->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>';
+    $status_messages->bigPipeNoJsPlaceholderRenderArray = [
+      '#markup' => '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>',
+      '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          '<div data-big-pipe-nojs-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&amp;args[0]&amp;token=a8c34b5e"></div>' => $status_messages->placeholderRenderArray,
+        ],
+      ],
+    ];
+    if ($container && $user) {
+      $status_messages->embeddedAjaxResponseCommands = [
+        [
+          'command' => 'settings',
+          'settings' => [
+            'ajaxPageState' => [
+              'theme' => 'classy',
+              'libraries' => 'big_pipe/big_pipe,classy/base,classy/messages,core/drupal.active-link,core/html5shiv,core/normalize,system/base',
+            ],
+            'pluralDelimiter' => \Drupal\Core\StringTranslation\PluralTranslatableMarkup::DELIMITER,
+            'user' => [
+              'uid' => '1',
+              'permissionsHash' => $container->get('user_permissions_hash_generator')->generate($user),
+            ],
+          ],
+          'merge' => TRUE,
+        ],
+        [
+          'command' => 'add_css',
+          'data' => '<link rel="stylesheet" href="' . base_path() . 'core/themes/classy/css/components/messages.css?' . $container->get('state')->get('system.css_js_query_string') . '" media="all" />' . "\n"
+        ],
+        [
+          'command' => 'insert',
+          'method' => 'replaceWith',
+          'selector' => '[data-big-pipe-placeholder-id="callback=Drupal%5CCore%5CRender%5CElement%5CStatusMessages%3A%3ArenderMessages&args[0]&token=a8c34b5e"]',
+          'data' => "\n" . '    <div role="contentinfo" aria-label="Status message" class="messages messages--status">' . "\n" . '                  <h2 class="visually-hidden">Status message</h2>' . "\n" . '                    Hello from BigPipe!' . "\n" . '            </div>' . "\n    \n",
+          'settings' => NULL,
+        ],
+      ];
+      $status_messages->embeddedHtmlResponse = '<link rel="stylesheet" href="' . base_path() . 'core/themes/classy/css/components/messages.css?' . $container->get('state')->get('system.css_js_query_string') . '" media="all" />' . "\n" . "\n" . '    <div role="contentinfo" aria-label="Status message" class="messages messages--status">' . "\n" . '                  <h2 class="visually-hidden">Status message</h2>' . "\n" . '                    Hello from BigPipe!' . "\n" . '            </div>' . "\n    \n";
+    }
+
+
+    // 2. Real-world example of HTML attribute value placeholder: form action.
+    $form_action = new BigPipePlaceholderTestCase(
+      $container ? $container->get('form_builder')->getForm('Drupal\big_pipe_test\Form\BigPipeTestForm') : [],
+      'form_action_cc611e1d',
+      [
+        '#lazy_builder' => ['form_builder:renderPlaceholderFormAction', []],
+      ]
+    );
+    $form_action->bigPipeNoJsPlaceholder = 'big_pipe_nojs_placeholder_attribute_safe:form_action_cc611e1d';
+    $form_action->bigPipeNoJsPlaceholderRenderArray = [
+      '#markup' => 'big_pipe_nojs_placeholder_attribute_safe:form_action_cc611e1d',
+      '#cache' => $cacheability_depends_on_session_only,
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          'big_pipe_nojs_placeholder_attribute_safe:form_action_cc611e1d' => $form_action->placeholderRenderArray,
+        ],
+      ],
+    ];
+    if ($container) {
+      $form_action->embeddedHtmlResponse = '<form class="big-pipe-test-form" data-drupal-selector="big-pipe-test-form" action="' . base_path() . 'big_pipe_test"';
+    }
+
+
+    // 3. Real-world example of HTML attribute value subset placeholder: CSRF
+    // token in link.
+    $csrf_token = new BigPipePlaceholderTestCase(
+      [
+        '#title' => 'Link with CSRF token',
+        '#type' => 'link',
+        '#url' => Url::fromRoute('system.theme_set_default'),
+      ],
+      'e88b559cce72c80b687d56b0e2a3a5ae4b66bc0e',
+      [
+        '#lazy_builder' => [
+          'route_processor_csrf:renderPlaceholderCsrfToken',
+          ['admin/config/user-interface/shortcut/manage/default/add-link-inline']
+        ],
+      ]
+    );
+    $csrf_token->bigPipeNoJsPlaceholder = 'big_pipe_nojs_placeholder_attribute_safe:e88b559cce72c80b687d56b0e2a3a5ae4b66bc0e';
+    $csrf_token->bigPipeNoJsPlaceholderRenderArray = [
+      '#markup' => 'big_pipe_nojs_placeholder_attribute_safe:e88b559cce72c80b687d56b0e2a3a5ae4b66bc0e',
+      '#cache' => $cacheability_depends_on_session_only,
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          'big_pipe_nojs_placeholder_attribute_safe:e88b559cce72c80b687d56b0e2a3a5ae4b66bc0e' => $csrf_token->placeholderRenderArray,
+        ],
+      ],
+    ];
+    if ($container) {
+      $csrf_token->embeddedHtmlResponse = $container->get('csrf_token')->get('admin/appearance/default');
+    }
+
+
+    // 4. Edge case: custom string to be considered as a placeholder that
+    // happens to not be valid HTML.
+    $hello = new BigPipePlaceholderTestCase(
+      [
+        '#markup' => BigPipeMarkup::create('<hello'),
+        '#attached' => [
+          'placeholders' => [
+            '<hello' => ['#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::helloOrYarhar', []]],
+          ]
+        ],
+      ],
+      '<hello',
+      [
+        '#lazy_builder' => [
+          'hello_or_yarhar',
+          []
+        ],
+      ]
+    );
+    $hello->bigPipeNoJsPlaceholder = 'big_pipe_nojs_placeholder_attribute_safe:&lt;hello';
+    $hello->bigPipeNoJsPlaceholderRenderArray = [
+      '#markup' => 'big_pipe_nojs_placeholder_attribute_safe:&lt;hello',
+      '#cache' => $cacheability_depends_on_session_only,
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          'big_pipe_nojs_placeholder_attribute_safe:&lt;hello' => $hello->placeholderRenderArray,
+        ],
+      ],
+    ];
+    $hello->embeddedHtmlResponse = '<marquee>Yarhar llamas forever!</marquee>';
+
+
+    // 5. Edge case: non-#lazy_builder placeholder.
+    $current_time = new BigPipePlaceholderTestCase(
+      [
+        '#markup' => BigPipeMarkup::create('<time>CURRENT TIME</time>'),
+        '#attached' => [
+          'placeholders' => [
+            '<time>CURRENT TIME</time>' => [
+              '#pre_render' => [
+                '\Drupal\big_pipe_test\BigPipeTestController::currentTime',
+              ],
+            ]
+          ]
+        ]
+      ],
+      '<time>CURRENT TIME</time>',
+      [
+        '#pre_render' => ['current_time'],
+      ]
+    );
+    $current_time->bigPipePlaceholderId = 'timecurrent-timetime';
+    $current_time->bigPipePlaceholderRenderArray = [
+      '#markup' => '<div data-big-pipe-placeholder-id="timecurrent-timetime"></div>',
+      '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
+      '#attached' => [
+        'library' => ['big_pipe/big_pipe'],
+        'drupalSettings' => [
+          'bigPipePlaceholderIds' => [
+            'timecurrent-timetime' => TRUE,
+          ],
+        ],
+        'big_pipe_placeholders' => [
+          'timecurrent-timetime' => $current_time->placeholderRenderArray,
+        ],
+      ],
+    ];
+    $current_time->embeddedAjaxResponseCommands = [
+      [
+        'command' => 'insert',
+        'method' => 'replaceWith',
+        'selector' => '[data-big-pipe-placeholder-id="timecurrent-timetime"]',
+        'data' => '<time datetime=1991-03-14"></time>',
+        'settings' => NULL,
+      ],
+    ];
+    $current_time->bigPipeNoJsPlaceholder = '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>';
+    $current_time->bigPipeNoJsPlaceholderRenderArray = [
+      '#markup' => '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>',
+      '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
+      '#attached' => [
+        'big_pipe_nojs_placeholders' => [
+          '<div data-big-pipe-nojs-placeholder-id="timecurrent-timetime"></div>' => $current_time->placeholderRenderArray,
+        ],
+      ],
+    ];
+    $current_time->embeddedHtmlResponse = '<time datetime=1991-03-14"></time>';
+
+
+    return [
+      'html' => $status_messages,
+      'html_attribute_value' => $form_action,
+      'html_attribute_value_subset' => $csrf_token,
+      'edge_case__invalid_html' => $hello,
+      'edge_case__html_non_lazy_builder' => $current_time,
+    ];
+  }
+
+}
+
+class BigPipePlaceholderTestCase {
+
+  /**
+   * The original render array.
+   *
+   * @var array
+   */
+  public $renderArray;
+
+  /**
+   * The expected corresponding placeholder string.
+   *
+   * @var string
+   */
+  public $placeholder;
+
+  /**
+   * The expected corresponding placeholder render array.
+   *
+   * @var array
+   */
+  public $placeholderRenderArray;
+
+  /**
+   * The expected BigPipe placeholder ID.
+   *
+   * (Only possible for HTML placeholders.)
+   *
+   * @var null|string
+   */
+  public $bigPipePlaceholderId = NULL;
+
+  /**
+   * The corresponding expected BigPipe placeholder render array.
+   *
+   * @var null|array
+   */
+  public $bigPipePlaceholderRenderArray = NULL;
+
+  /**
+   * The corresponding expected embedded AJAX response.
+   *
+   * @var null|array
+   */
+  public $embeddedAjaxResponseCommands = NULL;
+
+
+  /**
+   * The expected BigPipe no-JS placeholder.
+   *
+   * (Possible for all placeholders, HTML or non-HTML.)
+   *
+   * @var string
+   */
+  public $bigPipeNoJsPlaceholder;
+
+  /**
+   * The corresponding expected BigPipe no-JS placeholder render array.
+   *
+   * @var array
+   */
+  public $bigPipeNoJsPlaceholderRenderArray;
+
+  /**
+   * The corresponding expected embedded HTML response.
+   *
+   * @var string
+   */
+  public $embeddedHtmlResponse;
+
+  public function __construct(array $render_array, $placeholder, array $placeholder_render_array) {
+    $this->renderArray = $render_array;
+    $this->placeholder = $placeholder;
+    $this->placeholderRenderArray = $placeholder_render_array;
+  }
+
+}
diff --git a/core/modules/big_pipe/src/Tests/BigPipeTest.php b/core/modules/big_pipe/src/Tests/BigPipeTest.php
new file mode 100644
index 0000000..b3f4912
--- /dev/null
+++ b/core/modules/big_pipe/src/Tests/BigPipeTest.php
@@ -0,0 +1,372 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe\Tests\BigPipeTest.
+ */
+
+namespace Drupal\big_pipe\Tests;
+
+use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
+use Drupal\big_pipe\Render\BigPipe;
+use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests BigPipe's no-JS detection & response delivery (with and without JS).
+ *
+ * Covers:
+ * - big_pipe_page_attachments()
+ * - \Drupal\big_pipe\Controller\BigPipeController
+ * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+ * - \Drupal\big_pipe\Render\BigPipe
+ *
+ * @group big_pipe
+ */
+class BigPipeTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['big_pipe', 'big_pipe_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $dumpHeaders = TRUE;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Ignore the <meta> refresh that big_pipe.module sets. It causes a redirect
+    // to a page that sets another cookie, which causes WebTestBase to lose the
+    // session cookie. To avoid this problem, tests should first call
+    // drupalGet() and then call checkForMetaRefresh() manually, and then reset
+    // $this->maximumMetaRefreshCount and $this->metaRefreshCount.
+    // @see doMetaRefresh()
+    $this->maximumMetaRefreshCount = 0;
+  }
+
+  /**
+   * Performs a single <meta> refresh explicitly.
+   *
+   * This test disables the automatic <meta> refresh checking, each time it is
+   * desired that this runs, a test case must explicitly call this.
+   *
+   * @see setUp()
+   */
+  protected function performMetaRefresh() {
+    $this->maximumMetaRefreshCount = 1;
+    $this->checkForMetaRefresh();
+    $this->maximumMetaRefreshCount = 0;
+    $this->metaRefreshCount = 0;
+  }
+
+  /**
+   * Tests BigPipe's no-JS detection.
+   *
+   * Covers:
+   * - big_pipe_page_attachments()
+   * - \Drupal\big_pipe\Controller\BigPipeController
+   */
+  public function testNoJsDetection() {
+    $no_js_to_js_markup = '<script>document.cookie = "' . BigPipeStrategy::NOJS_COOKIE . '=1; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT"</script>';
+
+    // 1. No session (anonymous).
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $this->assertSessionCookieExists(FALSE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->assertNoRaw($no_js_to_js_markup);
+
+    // 2. Session (authenticated).
+    $this->drupalLogin($this->rootUser);
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertRaw('<noscript><meta http-equiv="Refresh" content="0; URL=' . base_path() . 'big_pipe/no-js?destination=' . base_path() . 'user/1" />' . "\n" . '</noscript>');
+    $this->assertNoRaw($no_js_to_js_markup);
+    $this->assertBigPipeNoJsMetaRefreshRedirect();
+    $this->assertBigPipeNoJsCookieExists(TRUE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->assertRaw($no_js_to_js_markup);
+    $this->drupalLogout();
+
+    // Close the prior connection and remove the collected state.
+    $this->curlClose();
+    $this->curlCookies = [];
+    $this->cookies = [];
+
+    // 3. Session (anonymous).
+    $this->drupalGet(Url::fromRoute('user.login', [], ['query' => ['trigger_session' => 1]]));
+    $this->drupalGet(Url::fromRoute('user.login'));
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertRaw('<noscript><meta http-equiv="Refresh" content="0; URL=' . base_path() . 'big_pipe/no-js?destination=' . base_path() . 'user/login" />' . "\n" . '</noscript>');
+    $this->assertNoRaw($no_js_to_js_markup);
+    $this->assertBigPipeNoJsMetaRefreshRedirect();
+    $this->assertBigPipeNoJsCookieExists(TRUE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->assertRaw($no_js_to_js_markup);
+
+    // Close the prior connection and remove the collected state.
+    $this->curlClose();
+    $this->curlCookies = [];
+    $this->cookies = [];
+
+    // Edge case: route with '_no_big_pipe' option.
+    $this->drupalGet(Url::fromRoute('big_pipe_test.no_big_pipe'));
+    $this->assertSessionCookieExists(FALSE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->assertNoRaw($no_js_to_js_markup);
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet(Url::fromRoute('big_pipe_test.no_big_pipe'));
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=');
+    $this->assertNoRaw($no_js_to_js_markup);
+  }
+
+  /**
+   * Tests BigPipe-delivered HTML responses when JavaScript is enabled.
+   *
+   * Covers:
+   * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+   * - \Drupal\big_pipe\Render\BigPipe
+   * - \Drupal\big_pipe\Render\BigPipe::sendPlaceholders()
+   *
+   * @see \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases
+   */
+  public function testBigPipe() {
+    $this->drupalLogin($this->rootUser);
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+
+    // By not calling performMetaRefresh() here, we simulate JavaScript being
+    // enabled, because as far as the BigPipe module is concerned, JavaScript is
+    // enabled in the browser as long as the BigPipe no-JS cookie is *not* set.
+    // @see setUp()
+    // @see performMetaRefresh()
+
+    $this->drupalGet(Url::fromRoute('big_pipe_test'));
+    $this->assertBigPipeResponseHeadersPresent();
+
+    $cases = $this->getTestCases();
+    $this->assertBigPipeNoJsPlaceholders([
+      $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholder     => $cases['edge_case__invalid_html']->embeddedHtmlResponse,
+      $cases['html_attribute_value']->bigPipeNoJsPlaceholder        => $cases['html_attribute_value']->embeddedHtmlResponse,
+      $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholder => $cases['html_attribute_value_subset']->embeddedHtmlResponse,
+    ]);
+    $this->assertBigPipePlaceholders([
+      $cases['html']->bigPipePlaceholderId                             => Json::encode($cases['html']->embeddedAjaxResponseCommands),
+      $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderId => Json::encode($cases['edge_case__html_non_lazy_builder']->embeddedAjaxResponseCommands),
+    ]);
+
+    $this->pass('Verifying BigPipe assets are present…', 'Debug');
+    $this->assertFalse(empty($this->getDrupalSettings()), 'drupalSettings present.');
+    $this->assertTrue(in_array('big_pipe/big_pipe', explode(',', $this->getDrupalSettings()['ajaxPageState']['libraries'])), 'BigPipe asset library is present.');
+
+    // Verify that 4xx responses work fine. (4xx responses are handled by
+    // subrequests to a route pointing to a controller with the desired output.)
+    $this->drupalGet(Url::fromUri('base:non-existing-path'));
+  }
+
+  /**
+   * Tests BigPipe-delivered HTML responses when JavaScript is disabled.
+   *
+   * Covers:
+   * - \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber
+   * - \Drupal\big_pipe\Render\BigPipe
+   * - \Drupal\big_pipe\Render\BigPipe::sendNoJsPlaceholders()
+   *
+   * @see \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases
+   */
+  public function testBigPipeNoJs() {
+    $this->drupalLogin($this->rootUser);
+    $this->assertSessionCookieExists(TRUE);
+    $this->assertBigPipeNoJsCookieExists(FALSE);
+
+    // By calling performMetaRefresh() here, we simulate JavaScript being
+    // disabled, because as far as the BigPipe module is concerned, it is
+    // enabled in the browser when the BigPipe no-JS cookie is set.
+    // @see setUp()
+    // @see performMetaRefresh()
+    $this->performMetaRefresh();
+    $this->assertBigPipeNoJsCookieExists(TRUE);
+
+    $this->drupalGet(Url::fromRoute('big_pipe_test'));
+    $this->assertBigPipeResponseHeadersPresent();
+
+    $cases = $this->getTestCases();
+    $this->assertBigPipeNoJsPlaceholders([
+      $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholder           => $cases['edge_case__invalid_html']->embeddedHtmlResponse,
+      $cases['html_attribute_value']->bigPipeNoJsPlaceholder              => $cases['html_attribute_value']->embeddedHtmlResponse,
+      $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholder       => $cases['html_attribute_value_subset']->embeddedHtmlResponse,
+      $cases['html']->bigPipeNoJsPlaceholder                              => $cases['html']->embeddedHtmlResponse,
+      $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholder  => $cases['edge_case__html_non_lazy_builder']->embeddedHtmlResponse,
+    ]);
+
+    $this->pass('Verifying there are no BigPipe placeholders & replacements…', 'Debug');
+    $this->assertEqual('<none>', $this->drupalGetHeader('BigPipe-Test-Placeholders'));
+    $this->pass('Verifying BigPipe start/stop signals are absent…', 'Debug');
+    $this->assertNoRaw(BigPipe::START_SIGNAL, 'BigPipe start signal absent.');
+    $this->assertNoRaw(BigPipe::STOP_SIGNAL, 'BigPipe stop signal absent.');
+
+    $this->pass('Verifying BigPipe assets are absent…', 'Debug');
+    $this->assertFalse(empty($this->getDrupalSettings()), 'drupalSettings and BigPipe asset library absent.');
+
+    // Verify that 4xx responses work fine. (4xx responses are handled by
+    // subrequests to a route pointing to a controller with the desired output.)
+    $this->drupalGet(Url::fromUri('base:non-existing-path'));
+  }
+
+  protected function assertBigPipeResponseHeadersPresent() {
+    $this->pass('Verifying BigPipe response headers…', 'Debug');
+    $this->assertTrue(FALSE !== strpos($this->drupalGetHeader('Cache-Control'), 'private'), 'Cache-Control header set to "private".');
+    $this->assertEqual('no-store, content="BigPipe/1.0"', $this->drupalGetHeader('Surrogate-Control'));
+    $this->assertEqual('no', $this->drupalGetHeader('X-Accel-Buffering'));
+  }
+
+  /**
+   * Asserts expected BigPipe no-JS placeholders are present and replaced.
+   *
+   * @param array $expected_big_pipe_nojs_placeholders
+   *   Keys: BigPipe no-JS placeholder markup. Values: expected replacement
+   *   markup.
+   */
+  protected function assertBigPipeNoJsPlaceholders(array $expected_big_pipe_nojs_placeholders) {
+    $this->pass('Verifying BigPipe no-JS placeholders & replacements…', 'Debug');
+    $this->assertSetsEqual(array_keys($expected_big_pipe_nojs_placeholders), array_map('rawurldecode', explode(' ', $this->drupalGetHeader('BigPipe-Test-No-Js-Placeholders'))));
+    foreach ($expected_big_pipe_nojs_placeholders as $big_pipe_nojs_placeholder => $expected_replacement) {
+      $this->pass('Checking whether the replacement for the BigPipe no-JS placeholder "' . $big_pipe_nojs_placeholder . '" is present:');
+      $this->assertRaw($expected_replacement);
+    }
+  }
+
+  /**
+   * Asserts expected BigPipe placeholders are present and replaced.
+   *
+   * @param array $expected_big_pipe_placeholders
+   *   Keys: BigPipe placeholder IDs. Values: expected AJAX response.
+   */
+  protected function assertBigPipePlaceholders(array $expected_big_pipe_placeholders) {
+    $this->pass('Verifying BigPipe placeholders & replacements…', 'Debug');
+    $this->assertSetsEqual(array_keys($expected_big_pipe_placeholders), explode(' ', $this->drupalGetHeader('BigPipe-Test-Placeholders')));
+    $placeholder_positions = [];
+    $placeholder_replacement_positions = [];
+    foreach ($expected_big_pipe_placeholders as $big_pipe_placeholder_id => $expected_ajax_response) {
+      $this->pass('BigPipe placeholder: ' . $big_pipe_placeholder_id, 'Debug');
+      // Verify expected placeholder.
+      $expected_placeholder_html = '<div data-big-pipe-placeholder-id="' . $big_pipe_placeholder_id . '"></div>';
+      $this->assertRaw($expected_placeholder_html, 'BigPipe placeholder for placeholder ID "' . $big_pipe_placeholder_id . '" found.');
+      $pos = strpos($this->getRawContent(), $expected_placeholder_html);
+      $placeholder_positions[$pos] = $big_pipe_placeholder_id;
+      // Verify expected placeholder replacement.
+      $result = $this->xpath('//script[@data-big-pipe-replacement-for-placeholder-with-id=:id]', [':id' => Html::decodeEntities($big_pipe_placeholder_id)]);
+      $this->assertEqual($expected_ajax_response, trim((string) $result[0]));
+      $expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
+      $this->assertRaw($expected_placeholder_replacement);
+      $pos = strpos($this->getRawContent(), $expected_placeholder_replacement);
+      $placeholder_replacement_positions[$pos] = $big_pipe_placeholder_id;
+    }
+    ksort($placeholder_positions, SORT_NUMERIC);
+    $this->assertEqual(array_keys($expected_big_pipe_placeholders), array_values($placeholder_positions));
+    $this->assertEqual(count($expected_big_pipe_placeholders), preg_match_all('/' . preg_quote('<div data-big-pipe-placeholder-id="', '/') . '/', $this->getRawContent()));
+    $this->assertEqual(array_keys($expected_big_pipe_placeholders), array_values($placeholder_replacement_positions));
+    $this->assertEqual(count($expected_big_pipe_placeholders), preg_match_all('/' . preg_quote('<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="', '/') . '/', $this->getRawContent()));
+
+    $this->pass('Verifying BigPipe start/stop signals…', 'Debug');
+    $this->assertRaw(BigPipe::START_SIGNAL, 'BigPipe start signal present.');
+    $this->assertRaw(BigPipe::STOP_SIGNAL, 'BigPipe stop signal present.');
+    $start_signal_position = strpos($this->getRawContent(), BigPipe::START_SIGNAL);
+    $stop_signal_position = strpos($this->getRawContent(), BigPipe::STOP_SIGNAL);
+    $this->assertTrue($start_signal_position < $stop_signal_position, 'BigPipe start signal appears before stop signal.');
+
+    $this->pass('Verifying BigPipe placeholder replacements and start/stop signals were streamed in the correct order…', 'Debug');
+    $expected_stream_order = array_keys($expected_big_pipe_placeholders);
+    array_unshift($expected_stream_order, BigPipe::START_SIGNAL);
+    array_push($expected_stream_order, BigPipe::STOP_SIGNAL);
+    $actual_stream_order = $placeholder_replacement_positions + [
+        $start_signal_position => BigPipe::START_SIGNAL,
+        $stop_signal_position => BigPipe::STOP_SIGNAL,
+      ];
+    ksort($actual_stream_order, SORT_NUMERIC);
+    $this->assertEqual($expected_stream_order, array_values($actual_stream_order));
+  }
+
+  /**
+   * @return \Drupal\big_pipe\Tests\BigPipePlaceholderTestCase[]
+   */
+  protected function getTestCases() {
+    // Ensure we can generate CSRF tokens for the current user's session.
+    $session_data = $this->container->get('session_handler.write_safe')->read($this->cookies[$this->getSessionName()]['value']);
+    $csrf_token_seed = unserialize(explode('_sf2_meta|', $session_data)[1])['s'];
+    $this->container->get('session_manager.metadata_bag')->setCsrfTokenSeed($csrf_token_seed);
+
+    return \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases::cases($this->container, $this->rootUser);
+  }
+
+  /**
+   * Asserts whether arrays A and B are equal, when treated as sets.
+   */
+  protected function assertSetsEqual(array $a, array $b) {
+    return count($a) == count($b) && !array_diff_assoc($a, $b);
+  }
+
+  /**
+   * Asserts whether a BigPipe no-JS cookie exists or not.
+   */
+  protected function assertBigPipeNoJsCookieExists($expected) {
+    $this->assertCookieExists('big_pipe_nojs', $expected, 'BigPipe no-JS');
+  }
+
+  /**
+   * Asserts whether a session cookie exists or not.
+   */
+  protected function assertSessionCookieExists($expected) {
+    $this->assertCookieExists($this->getSessionName(), $expected, 'Session');
+  }
+
+  /**
+   * Asserts whether a cookie exists on the client or not.
+   */
+  protected function assertCookieExists($cookie_name, $expected, $cookie_label) {
+    $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; });
+    $this->assertEqual($expected, isset($non_deleted_cookies[$cookie_name]), $expected ? "$cookie_label cookie exists." : "$cookie_label cookie does not exist.");
+  }
+
+  /**
+   * Calls ::performMetaRefresh() and asserts the responses.
+   */
+  protected function assertBigPipeNoJsMetaRefreshRedirect() {
+    $original_url = $this->url;
+    $this->performMetaRefresh();
+
+    $this->assertEqual($original_url, $this->url, 'Redirected back to the original location.');
+
+    $headers = $this->drupalGetHeaders(TRUE);
+    $this->assertEqual(2, count($headers), 'Two requests were made upon following the <meta> refresh, there are headers for two responses.');
+
+    // First response: redirect.
+    $this->assertEqual('HTTP/1.1 302 Found', $headers[0][':status'], 'The first response was a 302 (redirect).');
+    $this->assertIdentical(0, strpos($headers[0]['set-cookie'], 'big_pipe_nojs=1'), 'The first response sets the big_pipe_nojs cookie.');
+    $this->assertEqual($original_url, $headers[0]['location'], 'The first response redirected back to the original page.');
+    $this->assertTrue(empty(array_diff(['cookies:big_pipe_nojs', 'session.exists'], explode(' ', $headers[0]['x-drupal-cache-contexts']))), 'The first response varies by the "cookies:big_pipe_nojs" and "session.exists" cache contexts.');
+    $this->assertFalse(isset($headers[0]['surrogate-control']), 'The first response has no "Surrogate-Control" header.');
+
+    // Second response: redirect followed.
+    $this->assertEqual('HTTP/1.1 200 OK', $headers[1][':status'], 'The second response was a 200.');
+    $this->assertTrue(empty(array_diff(['cookies:big_pipe_nojs', 'session.exists'], explode(' ', $headers[0]['x-drupal-cache-contexts']))), 'The first response varies by the "cookies:big_pipe_nojs" and "session.exists" cache contexts.');
+    $this->assertEqual('no-store, content="BigPipe/1.0"', $headers[1]['surrogate-control'], 'The second response has a "Surrogate-Control" header.');
+
+    $this->assertNoRaw('<noscript><meta http-equiv="Refresh" content="0; URL=', 'Once the BigPipe no-JS cookie is set, the <meta> refresh is absent: only one redirect ever happens.');
+  }
+
+}
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.info.yml b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.info.yml
new file mode 100644
index 0000000..46ed28d
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.info.yml
@@ -0,0 +1,6 @@
+name: 'BigPipe test'
+type: module
+description: 'Support module for BigPipe testing.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.module b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.module
new file mode 100644
index 0000000..c808ce9
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.module
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * Implements hook_page_top().
+ */
+function big_pipe_test_page_top(array &$page_top) {
+  // Ensure this hook is invoked on every page load.
+  $page_top['#cache']['max-age'] = 0;
+
+  if (\Drupal::request()->query->get('trigger_session')) {
+    $_SESSION['big_pipe_test'] = TRUE;
+  }
+}
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
new file mode 100644
index 0000000..e573913
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.routing.yml
@@ -0,0 +1,17 @@
+big_pipe_test:
+  path: '/big_pipe_test'
+  defaults:
+    _controller: '\Drupal\big_pipe_test\BigPipeTestController::test'
+    _title: 'BigPipe test'
+  requirements:
+    _access: 'TRUE'
+
+big_pipe_test.no_big_pipe:
+  path: '/no_big_pipe'
+  defaults:
+    _controller: '\Drupal\big_pipe_test\BigPipeTestController::test'
+    _title: 'BigPipe test'
+  options:
+    _no_big_pipe: TRUE
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.services.yml b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.services.yml
new file mode 100644
index 0000000..5ec4895
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/big_pipe_test.services.yml
@@ -0,0 +1,5 @@
+services:
+  big_pipe_test_subscriber:
+    class: Drupal\big_pipe_test\EventSubscriber\BigPipeTestSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
new file mode 100644
index 0000000..3a663fc
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Drupal\big_pipe_test;
+
+use Drupal\big_pipe\Render\BigPipeMarkup;
+
+class BigPipeTestController {
+
+  /**
+   * Returns a all BigPipe placeholder test case render arrays.
+   *
+   * @return array
+   */
+  public function test() {
+    $build = [];
+
+    $cases = \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases::cases(\Drupal::getContainer());
+
+    // 1. HTML placeholder: status messages. Drupal renders those automatically,
+    // so all that we need to do in this controller is set a message.
+    drupal_set_message('Hello from BigPipe!');
+    $build['html'] = $cases['html']->renderArray;
+
+    // 2. HTML attribute value placeholder: form action.
+    $build['html_attribute_value'] = $cases['html_attribute_value']->renderArray;
+
+    // 3. HTML attribute value subset placeholder: CSRF token in link.
+    $build['html_attribute_value_subset'] = $cases['html_attribute_value_subset']->renderArray;
+
+    // 4. Edge case: custom string to be considered as a placeholder that
+    // happens to not be valid HTML.
+    $build['edge_case__invalid_html'] = $cases['edge_case__invalid_html']->renderArray;
+
+    // 5. Edge case: non-#lazy_builder placeholder.
+    $build['edge_case__html_non_lazy_builder'] = $cases['edge_case__html_non_lazy_builder']->renderArray;
+
+    return $build;
+  }
+
+  /**
+   * #lazy_builder callback; builds <time> markup with current time.
+   *
+   * Note: does not actually use current time, that would complicate testing.
+   *
+   * @return array
+   */
+  public static function currentTime() {
+    return [
+      '#markup' => '<time datetime=' . date('Y-m-d', 668948400) . '"></time>',
+      '#cache' => ['max-age' => 0]
+    ];
+  }
+
+  /**
+   * #lazy_builder callback; says "hello" or "yarhar".
+   *
+   * @return array
+   */
+  public static function helloOrYarhar() {
+    return [
+      '#markup' => BigPipeMarkup::create('<marquee>Yarhar llamas forever!</marquee>'),
+      '#cache' => ['max-age' => 0],
+    ];
+  }
+
+}
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/EventSubscriber/BigPipeTestSubscriber.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/EventSubscriber/BigPipeTestSubscriber.php
new file mode 100644
index 0000000..6af1028
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/EventSubscriber/BigPipeTestSubscriber.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe_test\EventSubscriber\BigPipeTestSubscriber.
+ */
+
+namespace Drupal\big_pipe_test\EventSubscriber;
+
+use Drupal\Core\Render\HtmlResponse;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class BigPipeTestSubscriber implements EventSubscriberInterface {
+
+  /**
+   * Exposes all BigPipe placeholders (JS and no-JS) via headers for testing.
+   *
+   * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+   *   The event to process.
+   */
+  public function onRespond(FilterResponseEvent $event) {
+    $response = $event->getResponse();
+    if (!$response instanceof HtmlResponse) {
+      return;
+    }
+
+    $attachments = $response->getAttachments();
+
+    $response->headers->set('BigPipe-Test-Placeholders', '<none>');
+    $response->headers->set('BigPipe-Test-No-Js-Placeholders', '<none>');
+
+    if (!empty($attachments['big_pipe_placeholders'])) {
+      $response->headers->set('BigPipe-Test-Placeholders', implode(' ', array_keys($attachments['big_pipe_placeholders'])));
+    }
+
+    if (!empty($attachments['big_pipe_nojs_placeholders'])) {
+      $response->headers->set('BigPipe-Test-No-Js-Placeholders', implode(' ', array_map('rawurlencode', array_keys($attachments['big_pipe_nojs_placeholders']))));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents() {
+    // Run *just* before \Drupal\big_pipe\EventSubscriber\HtmlResponseBigPipeSubscriber::onRespond().
+    $events[KernelEvents::RESPONSE][] = ['onRespond', -99999];
+
+    return $events;
+  }
+
+}
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php
new file mode 100644
index 0000000..21b6462
--- /dev/null
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/Form/BigPipeTestForm.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\big_pipe_test\Form\BigPipeTestForm.
+ */
+
+namespace Drupal\big_pipe_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+class BigPipeTestForm extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'big_pipe_test_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['#token'] = FALSE;
+
+    $form['big_pipe'] = array(
+      '#type' => 'checkboxes',
+      '#title' => $this->t('BigPipe works…'),
+      '#options' => [
+        'js' => $this->t('… with JavaScript'),
+        'nojs' => $this->t('… without JavaScript'),
+      ],
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) { }
+
+}
diff --git a/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php b/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php
new file mode 100644
index 0000000..b45129c
--- /dev/null
+++ b/core/modules/big_pipe/tests/src/Unit/Render/BigPipeResponseAttachmentsProcessorTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\big_pipe\Unit\Render\BigPipeResponseAttachmentsProcessorTest.
+ */
+
+namespace Drupal\Tests\big_pipe\Unit\Render;
+
+use Drupal\big_pipe\Render\BigPipeResponse;
+use Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Asset\AssetCollectionRendererInterface;
+use Drupal\Core\Asset\AssetResolverInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Render\AttachmentsInterface;
+use Drupal\Core\Render\AttachmentsResponseProcessorInterface;
+use Drupal\Core\Render\HtmlResponse;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * @coversDefaultClass \Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor
+ * @group big_pipe
+ */
+class BigPipeResponseAttachmentsProcessorTest extends UnitTestCase {
+
+  /**
+   * @covers ::processAttachments
+   *
+   * @dataProvider nonHtmlResponseProvider
+   *
+   * @expectedException \AssertionError
+   */
+  public function testNonHtmlResponse($response_class) {
+    $big_pipe_response_attachments_processor = $this->createBigPipeResponseAttachmentsProcessor($this->prophesize(AttachmentsResponseProcessorInterface::class));
+
+    $non_html_response = new $response_class();
+    $big_pipe_response_attachments_processor->processAttachments($non_html_response);
+  }
+
+  function nonHtmlResponseProvider() {
+    return [
+      'AjaxResponse, which implements AttachmentsInterface' => [AjaxResponse::class],
+      'A dummy that implements AttachmentsInterface' => [get_class($this->prophesize(AttachmentsInterface::class)->reveal())],
+    ];
+  }
+
+  /**
+   * @covers ::processAttachments
+   *
+   * @dataProvider attachmentsProvider
+   */
+  public function testHtmlResponse(array $attachments) {
+    $big_pipe_response = new BigPipeResponse('original');
+    $big_pipe_response->setAttachments($attachments);
+
+    // This mock is the main expectation of this test: verify that the decorated
+    // service (that is this mock) never receives BigPipe placeholder
+    // attachments, because it doesn't know (nor should it) how to handle them.
+    $html_response_attachments_processor = $this->prophesize(AttachmentsResponseProcessorInterface::class);
+    $html_response_attachments_processor->processAttachments(Argument::that(function ($response) {
+      return $response instanceof HtmlResponse && empty(array_intersect(['big_pipe_placeholders', 'big_pipe_nojs_placeholders'], array_keys($response->getAttachments())));
+    }))
+      ->will(function ($args) {
+        /** @var \Symfony\Component\HttpFoundation\Response|\Drupal\Core\Render\AttachmentsInterface $response */
+        $response = $args[0];
+        // Simulate its actual behavior.
+        $attachments = array_diff_key($response->getAttachments(), ['html_response_attachment_placeholders' => TRUE]);
+        $response->setContent('processed');
+        $response->setAttachments($attachments);
+        return $response;
+      })
+      ->shouldBeCalled();
+
+    $big_pipe_response_attachments_processor = $this->createBigPipeResponseAttachmentsProcessor($html_response_attachments_processor);
+    $processed_big_pipe_response = $big_pipe_response_attachments_processor->processAttachments($big_pipe_response);
+
+    // The secondary expectation of this test: the original (passed in) response
+    // object remains unchanged, the processed (returned) response object has
+    // the expected values.
+    $this->assertSame($attachments, $big_pipe_response->getAttachments(), 'Attachments of original response object MUST NOT be changed.');
+    $this->assertEquals('original', $big_pipe_response->getContent(), 'Content of original response object MUST NOT be changed.');
+    $this->assertEquals(array_diff_key($attachments, ['html_response_attachment_placeholders' => TRUE]), $processed_big_pipe_response->getAttachments(), 'Attachments of returned (processed) response object MUST be changed.');
+    $this->assertEquals('processed', $processed_big_pipe_response->getContent(), 'Content of returned (processed) response object MUST be changed.');
+  }
+
+  public function attachmentsProvider() {
+    $typical_cases = [
+      'no attachments' => [[]],
+      'libraries' => [['library' => ['core/drupal']]],
+      'libraries + drupalSettings' => [['library' => ['core/drupal'], 'drupalSettings' => ['foo' => 'bar']]],
+    ];
+
+    $official_attachment_types = ['html_head', 'feed', 'html_head_link', 'http_header', 'library', 'placeholders', 'drupalSettings', 'html_response_attachment_placeholders'];
+    $official_attachments_with_random_values = [];
+    foreach ($official_attachment_types as $type) {
+      $official_attachments_with_random_values[$type] = $this->randomMachineName();
+    }
+    $random_attachments = ['random' . $this->randomMachineName() => $this->randomMachineName()];
+    $edge_cases = [
+      'all official attachment types, with random assigned values, even if technically not valid, to prove BigPipeResponseAttachmentsProcessor is a perfect decorator' => [$official_attachments_with_random_values],
+      'random attachment type (unofficial), with random assigned value, to prove BigPipeResponseAttachmentsProcessor is a perfect decorator' => [$random_attachments],
+    ];
+
+    $big_pipe_placeholder_attachments = ['big_pipe_placeholders' => $this->randomMachineName()];
+    $big_pipe_nojs_placeholder_attachments = ['big_pipe_nojs_placeholders' => $this->randomMachineName()];
+    $big_pipe_cases = [
+      'only big_pipe_placeholders' => [$big_pipe_placeholder_attachments],
+      'only big_pipe_nojs_placeholders' => [$big_pipe_nojs_placeholder_attachments],
+      'big_pipe_placeholders + big_pipe_nojs_placeholders' => [$big_pipe_placeholder_attachments + $big_pipe_nojs_placeholder_attachments],
+    ];
+
+    $combined_cases = [
+      'all official attachment types + big_pipe_placeholders + big_pipe_nojs_placeholders' => [$official_attachments_with_random_values + $big_pipe_placeholder_attachments + $big_pipe_nojs_placeholder_attachments],
+      'random attachment types + big_pipe_placeholders + big_pipe_nojs_placeholders' => [$random_attachments + $big_pipe_placeholder_attachments + $big_pipe_nojs_placeholder_attachments],
+    ];
+
+    return $typical_cases + $edge_cases + $big_pipe_cases + $combined_cases;
+  }
+
+  /**
+   * Creates a BigPipeResponseAttachmentsProcessor with mostly dummies.
+   *
+   * @param \Prophecy\Prophecy\ObjectProphecy $decorated_html_response_attachments_processor
+   *   An object prophecy implementing AttachmentsResponseProcessorInterface.
+   *
+   * @return \Drupal\big_pipe\Render\BigPipeResponseAttachmentsProcessor
+   *   The BigPipeResponseAttachmentsProcessor to test.
+   */
+  protected function createBigPipeResponseAttachmentsProcessor(ObjectProphecy $decorated_html_response_attachments_processor) {
+    return new BigPipeResponseAttachmentsProcessor(
+      $decorated_html_response_attachments_processor->reveal(),
+      $this->prophesize(AssetResolverInterface::class)->reveal(),
+      $this->prophesize(ConfigFactoryInterface::class)->reveal(),
+      $this->prophesize(AssetCollectionRendererInterface::class)->reveal(),
+      $this->prophesize(AssetCollectionRendererInterface::class)->reveal(),
+      $this->prophesize(RequestStack::class)->reveal(),
+      $this->prophesize(RendererInterface::class)->reveal(),
+      $this->prophesize(ModuleHandlerInterface::class)->reveal()
+    );
+  }
+
+}
diff --git a/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
new file mode 100644
index 0000000..d726a83
--- /dev/null
+++ b/core/modules/big_pipe/tests/src/Unit/Render/Placeholder/BigPipeStrategyTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\big_pipe\Unit\Render\Placeholder\BigPipeStrategyTest.
+ */
+
+namespace Drupal\Tests\big_pipe\Unit\Render\Placeholder;
+
+use Drupal\big_pipe\Render\Placeholder\BigPipeStrategy;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\SessionConfigurationInterface;
+use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Routing\Route;
+
+/**
+ * @coversDefaultClass \Drupal\big_pipe\Render\Placeholder\BigPipeStrategy
+ * @group big_pipe
+ */
+class BigPipeStrategyTest extends UnitTestCase {
+
+  /**
+   * @covers ::processPlaceholders
+   *
+   * @dataProvider placeholdersProvider
+   */
+  public function testProcessPlaceholders(array $placeholders, $route_match_has_no_big_pipe_option, $request_has_session, $request_has_big_pipe_nojs_cookie, array $expected_big_pipe_placeholders) {
+    $request = new Request();
+    if ($request_has_big_pipe_nojs_cookie) {
+      $request->cookies->set(BigPipeStrategy::NOJS_COOKIE, 1);
+    }
+    $request_stack = $this->prophesize(RequestStack::class);
+    $request_stack->getCurrentRequest()
+      ->willReturn($request);
+
+    $session_configuration = $this->prophesize(SessionConfigurationInterface::class);
+    $session_configuration->hasSession(Argument::type(Request::class))
+      ->willReturn($request_has_session);
+
+    $route = $this->prophesize(Route::class);
+    $route->getOption('_no_big_pipe')
+      ->willReturn($route_match_has_no_big_pipe_option);
+    $route_match = $this->prophesize(RouteMatchInterface::class);
+    $route_match->getRouteObject()
+      ->willReturn($route);
+
+    $big_pipe_strategy = new BigPipeStrategy($session_configuration->reveal(), $request_stack->reveal(), $route_match->reveal());
+    $processed_placeholders = $big_pipe_strategy->processPlaceholders($placeholders);
+
+    if (!$route_match_has_no_big_pipe_option && $request_has_session) {
+      $this->assertSameSize($expected_big_pipe_placeholders, $processed_placeholders, 'BigPipe is able to deliver all placeholders.');
+      foreach (array_keys($placeholders) as $placeholder) {
+        $this->assertSame($expected_big_pipe_placeholders[$placeholder], $processed_placeholders[$placeholder], "Verifying how BigPipeStrategy handles the placeholder '$placeholder'");
+      }
+    }
+    else {
+      $this->assertSame(0, count($processed_placeholders));
+    }
+  }
+
+  /**
+   * @see \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases
+   */
+  public function placeholdersProvider() {
+    $cases = \Drupal\big_pipe\Tests\BigPipePlaceholderTestCases::cases();
+
+    // Generate $placeholders variable as expected by
+    // \Drupal\Core\Render\Placeholder\PlaceholderStrategyInterface::processPlaceholders().
+    $placeholders = [
+      $cases['html']->placeholder                             => $cases['html']->placeholderRenderArray,
+      $cases['html_attribute_value']->placeholder             => $cases['html_attribute_value']->placeholderRenderArray,
+      $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->placeholderRenderArray,
+      $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->placeholderRenderArray,
+      $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->placeholderRenderArray,
+    ];
+
+    return [
+      '_no_big_pipe absent, no session, no-JS cookie absent' => [$placeholders, FALSE, FALSE, FALSE, []],
+      '_no_big_pipe absent, no session, no-JS cookie present' => [$placeholders, FALSE, FALSE, TRUE, []],
+      '_no_big_pipe present, no session, no-JS cookie absent' => [$placeholders, TRUE, FALSE, FALSE, []],
+      '_no_big_pipe present, no session, no-JS cookie present' => [$placeholders, TRUE, FALSE, TRUE, []],
+      '_no_big_pipe present, session, no-JS cookie absent' => [$placeholders, TRUE, TRUE, FALSE, []],
+      '_no_big_pipe present, session, no-JS cookie present' => [$placeholders, TRUE, TRUE, TRUE, []],
+      '_no_big_pipe absent, session, no-JS cookie absent: (JS-powered) BigPipe placeholder used for HTML placeholders' => [$placeholders, FALSE, TRUE, FALSE, [
+        $cases['html']->placeholder                             => $cases['html']->bigPipePlaceholderRenderArray,
+        $cases['html_attribute_value']->placeholder             => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipePlaceholderRenderArray,
+      ]],
+      '_no_big_pipe absent, session, no-JS cookie present: no-JS BigPipe placeholder used for HTML placeholders' => [$placeholders, FALSE, TRUE, TRUE, [
+        $cases['html']->placeholder                             => $cases['html']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['html_attribute_value']->placeholder             => $cases['html_attribute_value']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['html_attribute_value_subset']->placeholder      => $cases['html_attribute_value_subset']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['edge_case__invalid_html']->placeholder          => $cases['edge_case__invalid_html']->bigPipeNoJsPlaceholderRenderArray,
+        $cases['edge_case__html_non_lazy_builder']->placeholder => $cases['edge_case__html_non_lazy_builder']->bigPipeNoJsPlaceholderRenderArray,
+      ]],
+    ];
+  }
+
+}
diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php
index 5a28bad..2d61bb0 100644
--- a/core/modules/block/block.api.php
+++ b/core/modules/block/block.api.php
@@ -209,7 +209,7 @@ function hook_block_access(\Drupal\block\Entity\Block $block, $operation, \Drupa
   // Example code that would prevent displaying the 'Powered by Drupal' block in
   // a region different than the footer.
   if ($operation == 'view' && $block->getPluginId() == 'system_powered_by_block') {
-    return AccessResult::forbiddenIf($block->getRegion() != 'footer')->cacheUntilEntityChanges($block);
+    return AccessResult::forbiddenIf($block->getRegion() != 'footer')->addCacheableDependency($block);
   }
 
   // No opinion.
diff --git a/core/modules/block/block.libraries.yml b/core/modules/block/block.libraries.yml
index a8c7044..967a682 100644
--- a/core/modules/block/block.libraries.yml
+++ b/core/modules/block/block.libraries.yml
@@ -16,4 +16,4 @@ drupal.block.admin:
   dependencies:
     - core/jquery
     - core/drupal
-    - core/drupal.ajax
+    - core/drupal.dialog.ajax
diff --git a/core/modules/block/js/block.js b/core/modules/block/js/block.js
index 5eb231b..f276527 100644
--- a/core/modules/block/js/block.js
+++ b/core/modules/block/js/block.js
@@ -3,7 +3,7 @@
  * Block behaviors.
  */
 
-(function ($, window) {
+(function ($, window, Drupal) {
 
   'use strict';
 
@@ -20,7 +20,7 @@
       // The drupalSetSummary method required for this behavior is not available
       // on the Blocks administration page, so we need to make sure this
       // behavior is processed only if drupalSetSummary is defined.
-      if (typeof jQuery.fn.drupalSetSummary === 'undefined') {
+      if (typeof $.fn.drupalSetSummary === 'undefined') {
         return;
       }
 
@@ -78,6 +78,78 @@
         return;
       }
 
+      /**
+       * Function to check empty regions and toggle classes based on this.
+       *
+       * @param {jQuery} table
+       *   The jQuery object representing the table to inspect.
+       * @param {jQuery} rowObject
+       *   The jQuery object representing the table row.
+       */
+      function checkEmptyRegions(table, rowObject) {
+        table.find('tr.region-message').each(function () {
+          var $this = $(this);
+          // If the dragged row is in this region, but above the message row,
+          // swap it down one space.
+          if ($this.prev('tr').get(0) === rowObject.element) {
+            // Prevent a recursion problem when using the keyboard to move rows
+            // up.
+            if ((rowObject.method !== 'keyboard' || rowObject.direction === 'down')) {
+              rowObject.swap('after', this);
+            }
+          }
+          // This region has become empty.
+          if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
+            $this.removeClass('region-populated').addClass('region-empty');
+          }
+          // This region has become populated.
+          else if ($this.is('.region-empty')) {
+            $this.removeClass('region-empty').addClass('region-populated');
+          }
+        });
+      }
+
+      /**
+       * Function to update the last placed row with the correct classes.
+       *
+       * @param {jQuery} table
+       *   The jQuery object representing the table to inspect.
+       * @param {jQuery} rowObject
+       *   The jQuery object representing the table row.
+       */
+      function updateLastPlaced(table, rowObject) {
+        // Remove the color-success class from new block if applicable.
+        table.find('.color-success').removeClass('color-success');
+
+        var $rowObject = $(rowObject);
+        if (!$rowObject.is('.drag-previous')) {
+          table.find('.drag-previous').removeClass('drag-previous');
+          $rowObject.addClass('drag-previous');
+        }
+      }
+
+      /**
+       * Update block weights in the given region.
+       *
+       * @param {jQuery} table
+       *   Table with draggable items.
+       * @param {string} region
+       *   Machine name of region containing blocks to update.
+       */
+      function updateBlockWeights(table, region) {
+        // Calculate minimum weight.
+        var weight = -Math.round(table.find('.draggable').length / 2);
+        // Update the block weights.
+        table.find('.region-' + region + '-message').nextUntil('.region-title')
+          .find('select.block-weight').val(function () {
+            // Increment the weight before assigning it to prevent using the
+            // absolute minimum available weight. This way we always have an
+            // unused upper and lower bound, which makes manually setting the
+            // weights easier for users who prefer to do it that way.
+            return ++weight;
+          });
+      }
+
       var table = $('#blocks');
       // Get the blocks tableDrag object.
       var tableDrag = Drupal.tableDrag.blocks;
@@ -150,71 +222,7 @@
           // Remove focus from selectbox.
           select.trigger('blur');
         });
-
-      var updateLastPlaced = function ($table, rowObject) {
-        // Remove the color-success class from new block if applicable.
-        $table.find('.color-success').removeClass('color-success');
-
-        var $rowObject = $(rowObject);
-        if (!$rowObject.is('.drag-previous')) {
-          $table.find('.drag-previous').removeClass('drag-previous');
-          $rowObject.addClass('drag-previous');
-        }
-      };
-
-      /**
-       * Update block weights in the given region.
-       *
-       * @param {jQuery} $table
-       *   Table with draggable items.
-       * @param {string} region
-       *   Machine name of region containing blocks to update.
-       */
-      var updateBlockWeights = function ($table, region) {
-        // Calculate minimum weight.
-        var weight = -Math.round($table.find('.draggable').length / 2);
-        // Update the block weights.
-        $table.find('.region-' + region + '-message').nextUntil('.region-title')
-          .find('select.block-weight').val(function () {
-            // Increment the weight before assigning it to prevent using the
-            // absolute minimum available weight. This way we always have an
-            // unused upper and lower bound, which makes manually setting the
-            // weights easier for users who prefer to do it that way.
-            return ++weight;
-          });
-      };
-
-      /**
-       * Checks empty regions and toggles classes based on this.
-       *
-       * @param {jQuery} table
-       *   The jQuery object representing the table to inspect.
-       * @param {jQuery} rowObject
-       *   The jQuery object representing the table row.
-       */
-      var checkEmptyRegions = function (table, rowObject) {
-        table.find('tr.region-message').each(function () {
-          var $this = $(this);
-          // If the dragged row is in this region, but above the message row,
-          // swap it down one space.
-          if ($this.prev('tr').get(0) === rowObject.element) {
-            // Prevent a recursion problem when using the keyboard to move rows
-            // up.
-            if ((rowObject.method !== 'keyboard' || rowObject.direction === 'down')) {
-              rowObject.swap('after', this);
-            }
-          }
-          // This region has become empty.
-          if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
-            $this.removeClass('region-populated').addClass('region-empty');
-          }
-          // This region has become populated.
-          else if ($this.is('.region-empty')) {
-            $this.removeClass('region-empty').addClass('region-populated');
-          }
-        });
-      };
     }
   };
 
-})(jQuery, window);
+})(jQuery, window, Drupal);
diff --git a/core/modules/block/src/BlockAccessControlHandler.php b/core/modules/block/src/BlockAccessControlHandler.php
index 4529647..4c02eed 100644
--- a/core/modules/block/src/BlockAccessControlHandler.php
+++ b/core/modules/block/src/BlockAccessControlHandler.php
@@ -96,7 +96,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
 
     // Don't grant access to disabled blocks.
     if (!$entity->status()) {
-      return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+      return AccessResult::forbidden()->addCacheableDependency($entity);
     }
     else {
       $conditions = [];
@@ -151,7 +151,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
       $this->mergeCacheabilityFromConditions($access, $conditions);
 
       // Ensure that access is evaluated again when the block changes.
-      return $access->cacheUntilEntityChanges($entity);
+      return $access->addCacheableDependency($entity);
     }
   }
 
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index e7279ce..32c7bfe 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -250,6 +250,6 @@ public static function preRender($build) {
       }
     }
     return $build;
-   }
+  }
 
 }
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php b/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
index dd7980a..ee3305e 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
+++ b/core/modules/block/src/Plugin/migrate/process/BlockPluginId.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockTheme.php b/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
index c072b42..726623e 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
+++ b/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\block\Plugin\migrate\process;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
@@ -45,7 +45,7 @@ class BlockTheme extends ProcessPluginBase implements ContainerFactoryPluginInte
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param \Drupal\Core\Config\Config $theme_config
    *   The system.theme configuration factory object.
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php b/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
index be20097..8f9b898 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
+++ b/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
diff --git a/core/modules/block/src/Tests/BlockConfigSchemaTest.php b/core/modules/block/src/Tests/BlockConfigSchemaTest.php
deleted file mode 100644
index 9d7bcfe..0000000
--- a/core/modules/block/src/Tests/BlockConfigSchemaTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockConfigSchemaTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\block\Entity\Block;
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the block config schema.
- *
- * @group block
- */
-class BlockConfigSchemaTest extends KernelTestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array(
-    'block',
-    'aggregator',
-    'book',
-    'block_content',
-    'comment',
-    'forum',
-    'node',
-    'statistics',
-    // BlockManager->getModuleName() calls system_get_info().
-    'system',
-    'taxonomy',
-    'user',
-    'text',
-  );
-
-  /**
-   * The typed config manager.
-   *
-   * @var \Drupal\Core\Config\TypedConfigManagerInterface
-   */
-  protected $typedConfig;
-
-  /**
-   * The block manager.
-   *
-   * @var \Drupal\Core\Block\BlockManagerInterface
-   */
-  protected $blockManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->typedConfig = \Drupal::service('config.typed');
-    $this->blockManager = \Drupal::service('plugin.manager.block');
-    $this->installEntitySchema('block_content');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
-  }
-
-  /**
-   * Tests the block config schema for block plugins.
-   */
-  public function testBlockConfigSchema() {
-    foreach ($this->blockManager->getDefinitions() as $block_id => $definition) {
-      $id = strtolower($this->randomMachineName());
-      $block = Block::create(array(
-        'id' => $id,
-        'theme' => 'classy',
-        'weight' => 00,
-        'status' => TRUE,
-        'region' => 'content',
-        'plugin' => $block_id,
-        'settings' => array(
-          'label' => $this->randomMachineName(),
-          'provider' => 'system',
-          'label_display' => FALSE,
-        ),
-        'visibility' => array(),
-      ));
-      $block->save();
-
-      $config = $this->config("block.block.$id");
-      $this->assertEqual($config->get('id'), $id);
-      $this->assertConfigSchema($this->typedConfig, $config->getName(), $config->get());
-    }
-  }
-
-}
diff --git a/core/modules/block/src/Tests/BlockHookOperationTest.php b/core/modules/block/src/Tests/BlockHookOperationTest.php
index c83882c..727aa87 100644
--- a/core/modules/block/src/Tests/BlockHookOperationTest.php
+++ b/core/modules/block/src/Tests/BlockHookOperationTest.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\block\Tests\BlockHookOperationTest.
- *
- * Tests for Block module regarding hook_entity_operations_alter().
  */
 
 namespace Drupal\block\Tests;
@@ -13,7 +11,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Implement hook entity operations alter.
+ * Tests for Block module regarding hook_entity_operations_alter().
  *
  * @group block
  */
diff --git a/core/modules/block/src/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php
deleted file mode 100644
index 5af8ec0..0000000
--- a/core/modules/block/src/Tests/BlockInterfaceTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockInterfaceTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\Core\Form\FormState;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\block\BlockInterface;
-
-/**
- * Tests that the block plugin can work properly without a supporting entity.
- *
- * @group block
- */
-class BlockInterfaceTest extends KernelTestBase {
-  public static $modules = array('system', 'block', 'block_test', 'user');
-
-  /**
-   * Test configuration and subsequent form() and build() method calls.
-   *
-   * This test is attempting to test the existing block plugin api and all
-   * functionality that is expected to remain consistent. The arrays that are
-   * used for comparison can change, but only to include elements that are
-   * contained within BlockBase or the plugin being tested. Likely these
-   * comparison arrays should get smaller, not larger, as more form/build
-   * elements are moved into a more suitably responsible class.
-   *
-   * Instantiation of the plugin is the primary element being tested here. The
-   * subsequent method calls are just attempting to cause a failure if a
-   * dependency outside of the plugin configuration is required.
-   */
-  public function testBlockInterface() {
-    $manager = $this->container->get('plugin.manager.block');
-    $configuration = array(
-      'label' => 'Custom Display Message',
-    );
-    $expected_configuration = array(
-      'id' => 'test_block_instantiation',
-      'label' => 'Custom Display Message',
-      'provider' => 'block_test',
-      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
-      'display_message' => 'no message set',
-    );
-    // Initial configuration of the block at construction time.
-    /** @var $display_block \Drupal\Core\Block\BlockPluginInterface */
-    $display_block = $manager->createInstance('test_block_instantiation', $configuration);
-    $this->assertIdentical($display_block->getConfiguration(), $expected_configuration, 'The block was configured correctly.');
-
-    // Updating an element of the configuration.
-    $display_block->setConfigurationValue('display_message', 'My custom display message.');
-    $expected_configuration['display_message'] = 'My custom display message.';
-    $this->assertIdentical($display_block->getConfiguration(), $expected_configuration, 'The block configuration was updated correctly.');
-    $definition = $display_block->getPluginDefinition();
-
-    $expected_form = array(
-      'provider' => array(
-        '#type' => 'value',
-        '#value' => 'block_test',
-      ),
-      'admin_label' => array(
-        '#type' => 'item',
-        '#title' => t('Block description'),
-        '#plain_text' => $definition['admin_label'],
-      ),
-      'label' => array(
-        '#type' => 'textfield',
-        '#title' => 'Title',
-        '#maxlength' => 255,
-        '#default_value' => 'Custom Display Message',
-        '#required' => TRUE,
-      ),
-      'label_display' => array(
-        '#type' => 'checkbox',
-        '#title' => 'Display title',
-        '#default_value' => TRUE,
-        '#return_value' => 'visible',
-      ),
-      'context_mapping' => array(),
-      'display_message' => array(
-        '#type' => 'textfield',
-        '#title' => t('Display message'),
-        '#default_value' => 'My custom display message.',
-      ),
-    );
-    $form_state = new FormState();
-    // Ensure there are no form elements that do not belong to the plugin.
-    $actual_form = $display_block->buildConfigurationForm(array(), $form_state);
-    // Remove the visibility sections, as that just tests condition plugins.
-    unset($actual_form['visibility'], $actual_form['visibility_tabs']);
-    $this->assertIdentical($this->castSafeStrings($actual_form), $this->castSafeStrings($expected_form), 'Only the expected form elements were present.');
-
-    $expected_build = array(
-      '#children' => 'My custom display message.',
-    );
-    // Ensure the build array is proper.
-    $this->assertIdentical($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.');
-
-    // Ensure the machine name suggestion is correct. In truth, this is actually
-    // testing BlockBase's implementation, not the interface itself.
-    $this->assertIdentical($display_block->getMachineNameSuggestion(), 'displaymessage', 'The plugin returned the expected machine name suggestion.');
-  }
-}
diff --git a/core/modules/block/src/Tests/BlockRenderOrderTest.php b/core/modules/block/src/Tests/BlockRenderOrderTest.php
index fa2913c..07e6945 100644
--- a/core/modules/block/src/Tests/BlockRenderOrderTest.php
+++ b/core/modules/block/src/Tests/BlockRenderOrderTest.php
@@ -70,7 +70,7 @@ function testBlockRenderOrder() {
     $this->drupalGet('');
     $test_content = $this->getRawContent('');
 
-    $controller = $this->container->get('entity.manager')->getStorage('block');
+    $controller = $this->container->get('entity_type.manager')->getStorage('block');
     foreach ($controller->loadMultiple() as $return_block) {
       $id = $return_block->id();
       if ($return_block_weight = $return_block->getWeight()) {
diff --git a/core/modules/block/src/Tests/BlockStorageUnitTest.php b/core/modules/block/src/Tests/BlockStorageUnitTest.php
deleted file mode 100644
index 140f746..0000000
--- a/core/modules/block/src/Tests/BlockStorageUnitTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockStorageUnitTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\Core\Config\Entity\ConfigEntityStorage;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\block_test\Plugin\Block\TestHtmlBlock;
-use Drupal\Component\Plugin\Exception\PluginException;
-use Drupal\block\Entity\Block;
-use Drupal\block\BlockInterface;
-
-/**
- * Tests the storage of blocks.
- *
- * @group block
- */
-class BlockStorageUnitTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'block_test');
-
-  /**
-   * The block storage.
-   *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface.
-   */
-  protected $controller;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->controller = $this->container->get('entity.manager')->getStorage('block');
-  }
-
-  /**
-   * Tests CRUD operations.
-   */
-  public function testBlockCRUD() {
-    $this->assertTrue($this->controller instanceof ConfigEntityStorage, 'The block storage is loaded.');
-
-    // Run each test method in the same installation.
-    $this->createTests();
-    $this->loadTests();
-    $this->deleteTests();
-  }
-
-  /**
-   * Tests the creation of blocks.
-   */
-  protected function createTests() {
-    // Attempt to create a block without a plugin.
-    try {
-      $entity = $this->controller->create(array());
-      $entity->getPlugin();
-      $this->fail('A block without a plugin was created with no exception thrown.');
-    }
-    catch (PluginException $e) {
-      $this->assertEqual('The block \'\' did not specify a plugin.', $e->getMessage(), 'An exception was thrown when a block was created without a plugin.');
-    }
-
-    // Create a block with only required values.
-    $entity = $this->controller->create(array(
-      'id' => 'test_block',
-      'theme' => 'stark',
-      'plugin' => 'test_html',
-    ));
-    $entity->save();
-
-    $this->assertTrue($entity instanceof Block, 'The newly created entity is a Block.');
-
-    // Verify all of the block properties.
-    $actual_properties = $this->config('block.block.test_block')->get();
-    $this->assertTrue(!empty($actual_properties['uuid']), 'The block UUID is set.');
-    unset($actual_properties['uuid']);
-
-    // Ensure that default values are filled in.
-    $expected_properties = array(
-      'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
-      'status' => TRUE,
-      'dependencies' => array('module' => array('block_test'), 'theme' => array('stark')),
-      'id' => 'test_block',
-      'theme' => 'stark',
-      'region' => '-1',
-      'weight' => NULL,
-      'provider' => NULL,
-      'plugin' => 'test_html',
-      'settings' => array(
-        'id' => 'test_html',
-        'label' => '',
-        'provider' => 'block_test',
-        'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
-      ),
-      'visibility' => array(),
-    );
-
-    $this->assertIdentical($actual_properties, $expected_properties);
-
-    $this->assertTrue($entity->getPlugin() instanceof TestHtmlBlock, 'The entity has an instance of the correct block plugin.');
-  }
-
-  /**
-   * Tests the loading of blocks.
-   */
-  protected function loadTests() {
-    $entity = $this->controller->load('test_block');
-
-    $this->assertTrue($entity instanceof Block, 'The loaded entity is a Block.');
-
-    // Verify several properties of the block.
-    $this->assertEqual($entity->getRegion(), '-1');
-    $this->assertTrue($entity->status());
-    $this->assertEqual($entity->getTheme(), 'stark');
-    $this->assertTrue($entity->uuid());
-  }
-
-  /**
-   * Tests the deleting of blocks.
-   */
-  protected function deleteTests() {
-    $entity = $this->controller->load('test_block');
-
-    // Ensure that the storage isn't currently empty.
-    $config_storage = $this->container->get('config.storage');
-    $config = $config_storage->listAll('block.block.');
-    $this->assertFalse(empty($config), 'There are blocks in config storage.');
-
-    // Delete the block.
-    $entity->delete();
-
-    // Ensure that the storage is now empty.
-    $config = $config_storage->listAll('block.block.');
-    $this->assertTrue(empty($config), 'There are no blocks in config storage.');
-  }
-
-  /**
-   * Tests the installation of default blocks.
-   */
-  public function testDefaultBlocks() {
-    \Drupal::service('theme_handler')->install(['classy']);
-    $entities = $this->controller->loadMultiple();
-    $this->assertTrue(empty($entities), 'There are no blocks initially.');
-
-    // Install the block_test.module, so that its default config is installed.
-    $this->installConfig(array('block_test'));
-
-    $entities = $this->controller->loadMultiple();
-    $entity = reset($entities);
-    $this->assertEqual($entity->id(), 'test_block', 'The default test block was loaded.');
-  }
-
-}
diff --git a/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php b/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
index 4b2ed69..3c61d84 100644
--- a/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
+++ b/core/modules/block/src/Tests/BlockTemplateSuggestionsTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block\Tests;
 
+use Drupal\block\Entity\Block;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -31,8 +32,7 @@ function testBlockThemeHookSuggestions() {
     // an underscore (not transformed) and a hyphen (transformed to underscore),
     // and generates possibilities for each level of derivative.
     // @todo Clarify this comment.
-    /** @var \Drupal\block\BlockInterface $block */
-    $block = entity_create('block', array(
+    $block = Block::create(array(
       'plugin' => 'system_menu_block:admin',
       'region' => 'footer',
       'id' => 'machinename',
diff --git a/core/modules/block/src/Tests/BlockTest.php b/core/modules/block/src/Tests/BlockTest.php
index 261c3ae..cc8e974 100644
--- a/core/modules/block/src/Tests/BlockTest.php
+++ b/core/modules/block/src/Tests/BlockTest.php
@@ -32,6 +32,7 @@ function testBlockVisibility() {
       'id' => strtolower($this->randomMachineName(8)),
       'region' => 'sidebar_first',
       'settings[label]' => $title,
+      'settings[label_display]' => TRUE,
     );
     // Set the block to be hidden on any user path, and to be shown only to
     // authenticated users.
@@ -142,11 +143,12 @@ function testBlock() {
     $block = array();
     $block['id'] = 'system_powered_by_block';
     $block['settings[label]'] = $this->randomMachineName(8);
+    $block['settings[label_display]'] = TRUE;
     $block['theme'] = $this->config('system.theme')->get('default');
     $block['region'] = 'header';
 
     // Set block title to confirm that interface works and override any custom titles.
-    $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block'));
+    $this->drupalPostForm('admin/structure/block/add/' . $block['id'] . '/' . $block['theme'], array('settings[label]' => $block['settings[label]'], 'settings[label_display]' => $block['settings[label_display]'], 'id' => $block['id'], 'region' => $block['region']), t('Save block'));
     $this->assertText(t('The block configuration has been saved.'), 'Block title set.');
     // Check to see if the block was created by checking its configuration.
     $instance = Block::load($block['id']);
@@ -255,19 +257,19 @@ function testHideBlockTitle() {
     $this->assertText('The block configuration has been saved.', 'Block was saved');
 
     $this->drupalGet('user');
-    $this->assertText($title, 'Block title was displayed by default.');
+    $this->assertNoText($title, 'Block title was not displayed by default.');
 
     $edit = array(
-      'settings[label_display]' => FALSE,
+      'settings[label_display]' => TRUE,
     );
     $this->drupalPostForm('admin/structure/block/manage/' . $id, $edit, t('Save block'));
     $this->assertText('The block configuration has been saved.', 'Block was saved');
 
     $this->drupalGet('admin/structure/block/manage/' . $id);
-    $this->assertNoFieldChecked('edit-settings-label-display', 'The display_block option has the correct default value on the configuration form.');
+    $this->assertFieldChecked('edit-settings-label-display', 'The display_block option has the correct default value on the configuration form.');
 
     $this->drupalGet('user');
-    $this->assertNoText($title, 'Block title was not displayed when hidden.');
+    $this->assertText($title, 'Block title was displayed when enabled.');
   }
 
   /**
diff --git a/core/modules/block/src/Tests/BlockTestBase.php b/core/modules/block/src/Tests/BlockTestBase.php
index c0d96ad..e87b633 100644
--- a/core/modules/block/src/Tests/BlockTestBase.php
+++ b/core/modules/block/src/Tests/BlockTestBase.php
@@ -8,6 +8,7 @@
 namespace Drupal\block\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Provides setup and helper methods for block module tests.
@@ -42,7 +43,7 @@ protected function setUp() {
     $this->config('system.site')->set('page.front', '/test-page')->save();
 
     // Create Full HTML text format.
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
     ));
@@ -65,7 +66,7 @@ protected function setUp() {
       'sidebar_second',
       'footer',
     );
-    $block_storage = $this->container->get('entity.manager')->getStorage('block');
+    $block_storage = $this->container->get('entity_type.manager')->getStorage('block');
     $blocks = $block_storage->loadByProperties(array('theme' => $this->config('system.theme')->get('default')));
     foreach ($blocks as $block) {
       $block->delete();
diff --git a/core/modules/block/src/Tests/BlockViewBuilderTest.php b/core/modules/block/src/Tests/BlockViewBuilderTest.php
deleted file mode 100644
index 331db82..0000000
--- a/core/modules/block/src/Tests/BlockViewBuilderTest.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\BlockViewBuilderTest.
- */
-
-namespace Drupal\block\Tests;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\block\Entity\Block;
-
-/**
- * Tests the block view builder.
- *
- * @group block
- */
-class BlockViewBuilderTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'block_test', 'system', 'user');
-
-  /**
-   * The block being tested.
-   *
-   * @var \Drupal\block\Entity\BlockInterface
-   */
-  protected $block;
-
-  /**
-   * The block storage.
-   *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
-   */
-  protected $controller;
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->controller = $this->container
-      ->get('entity.manager')
-      ->getStorage('block');
-
-    \Drupal::state()->set('block_test.content', 'Llamas &gt; unicorns!');
-
-    // Create a block with only required values.
-    $this->block = $this->controller->create(array(
-      'id' => 'test_block',
-      'theme' => 'stark',
-      'plugin' => 'test_cache',
-    ));
-    $this->block->save();
-
-    $this->container->get('cache.render')->deleteAll();
-
-    $this->renderer = $this->container->get('renderer');
-  }
-
-  /**
-   * Tests the rendering of blocks.
-   */
-  public function testBasicRendering() {
-    \Drupal::state()->set('block_test.content', '');
-
-    $entity = $this->controller->create(array(
-      'id' => 'test_block1',
-      'theme' => 'stark',
-      'plugin' => 'test_html',
-    ));
-    $entity->save();
-
-    // Test the rendering of a block.
-    $entity = Block::load('test_block1');
-    $output = entity_view($entity, 'block');
-    $expected = array();
-    $expected[] = '<div id="block-test-block1">';
-    $expected[] = '  ';
-    $expected[] = '    ';
-    $expected[] = '      ';
-    $expected[] = '  </div>';
-    $expected[] = '';
-    $expected_output = implode("\n", $expected);
-    $this->assertEqual($this->renderer->renderRoot($output), $expected_output);
-
-    // Reset the HTML IDs so that the next render is not affected.
-    Html::resetSeenIds();
-
-    // Test the rendering of a block with a given title.
-    $entity = $this->controller->create(array(
-      'id' => 'test_block2',
-      'theme' => 'stark',
-      'plugin' => 'test_html',
-      'settings' => array(
-        'label' => 'Powered by Bananas',
-      ),
-    ));
-    $entity->save();
-    $output = entity_view($entity, 'block');
-    $expected = array();
-    $expected[] = '<div id="block-test-block2">';
-    $expected[] = '  ';
-    $expected[] = '      <h2>Powered by Bananas</h2>';
-    $expected[] = '    ';
-    $expected[] = '      ';
-    $expected[] = '  </div>';
-    $expected[] = '';
-    $expected_output = implode("\n", $expected);
-    $this->assertEqual($this->renderer->renderRoot($output), $expected_output);
-  }
-
-  /**
-   * Tests block render cache handling.
-   */
-  public function testBlockViewBuilderCache() {
-    // Verify cache handling for a non-empty block.
-    $this->verifyRenderCacheHandling();
-
-    // Create an empty block.
-    $this->block = $this->controller->create(array(
-      'id' => 'test_block',
-      'theme' => 'stark',
-      'plugin' => 'test_cache',
-    ));
-    $this->block->save();
-    \Drupal::state()->set('block_test.content', NULL);
-
-    // Verify cache handling for an empty block.
-    $this->verifyRenderCacheHandling();
-  }
-
-  /**
-   * Verifies render cache handling of the block being tested.
-   *
-   * @see ::testBlockViewBuilderCache()
-   */
-  protected function verifyRenderCacheHandling() {
-    // Force a request via GET so we can test the render cache.
-    $request = \Drupal::request();
-    $request_method = $request->server->get('REQUEST_METHOD');
-    $request->setMethod('GET');
-
-    // Test that a cache entry is created.
-    $build = $this->getBlockRenderArray();
-    $cid = 'entity_view:block:test_block:' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
-    $this->renderer->renderRoot($build);
-    $this->assertTrue($this->container->get('cache.render')->get($cid), 'The block render element has been cached.');
-
-    // Re-save the block and check that the cache entry has been deleted.
-    $this->block->save();
-    $this->assertFalse($this->container->get('cache.render')->get($cid), 'The block render cache entry has been cleared when the block was saved.');
-
-    // Rebuild the render array (creating a new cache entry in the process) and
-    // delete the block to check the cache entry is deleted.
-    unset($build['#printed']);
-    // Re-add the block because \Drupal\block\BlockViewBuilder::buildBlock()
-    // removes it.
-    $build['#block'] = $this->block;
-
-    $this->renderer->renderRoot($build);
-    $this->assertTrue($this->container->get('cache.render')->get($cid), 'The block render element has been cached.');
-    $this->block->delete();
-    $this->assertFalse($this->container->get('cache.render')->get($cid), 'The block render cache entry has been cleared when the block was deleted.');
-
-    // Restore the previous request method.
-    $request->setMethod($request_method);
-  }
-
-  /**
-   * Tests block view altering.
-   *
-   * @see hook_block_view_alter()
-   * @see hook_block_view_BASE_BLOCK_ID_alter()
-   */
-  public function testBlockViewBuilderViewAlter() {
-    // Establish baseline.
-    $build = $this->getBlockRenderArray();
-    $this->setRawContent((string) $this->renderer->renderRoot($build));
-    $this->assertIdentical(trim((string) $this->cssSelect('div')[0]), 'Llamas > unicorns!');
-
-    // Enable the block view alter hook that adds a foo=bar attribute.
-    \Drupal::state()->set('block_test_view_alter_suffix', TRUE);
-    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
-    $build = $this->getBlockRenderArray();
-    $this->setRawContent((string) $this->renderer->renderRoot($build));
-    $this->assertIdentical(trim((string) $this->cssSelect('[foo=bar]')[0]), 'Llamas > unicorns!');
-    \Drupal::state()->set('block_test_view_alter_suffix', FALSE);
-
-    \Drupal::state()->set('block_test.content', NULL);
-    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
-
-    // Advanced: cached block, but an alter hook adds a #pre_render callback to
-    // alter the eventual content.
-    \Drupal::state()->set('block_test_view_alter_append_pre_render_prefix', TRUE);
-    $build = $this->getBlockRenderArray();
-    $this->assertFalse(isset($build['#prefix']), 'The appended #pre_render callback has not yet run before rendering.');
-    $this->assertIdentical((string) $this->renderer->renderRoot($build), 'Hiya!<br>');
-    $this->assertTrue(isset($build['#prefix']) && $build['#prefix'] === 'Hiya!<br>', 'A cached block without content is altered.');
-  }
-
-  /**
-   * Tests block build altering.
-   *
-   * @see hook_block_build_alter()
-   * @see hook_block_build_BASE_BLOCK_ID_alter()
-   */
-  public function testBlockViewBuilderBuildAlter() {
-    // Force a request via GET so we can test the render cache.
-    $request = \Drupal::request();
-    $request_method = $request->server->get('REQUEST_METHOD');
-    $request->setMethod('GET');
-
-    $default_keys = ['entity_view', 'block', 'test_block'];
-    $default_contexts = [];
-    $default_tags = ['block_view', 'config:block.block.test_block'];
-    $default_max_age = Cache::PERMANENT;
-
-    // hook_block_build_alter() adds an additional cache key.
-    $alter_add_key = $this->randomMachineName();
-    \Drupal::state()->set('block_test_block_alter_cache_key', $alter_add_key);
-    $this->assertBlockRenderedWithExpectedCacheability(array_merge($default_keys, [$alter_add_key]), $default_contexts, $default_tags, $default_max_age);
-    \Drupal::state()->set('block_test_block_alter_cache_key', NULL);
-
-    // hook_block_build_alter() adds an additional cache context.
-    $alter_add_context = 'url.query_args:' . $this->randomMachineName();
-    \Drupal::state()->set('block_test_block_alter_cache_context', $alter_add_context);
-    $this->assertBlockRenderedWithExpectedCacheability($default_keys, Cache::mergeContexts($default_contexts, [$alter_add_context]), $default_tags, $default_max_age);
-    \Drupal::state()->set('block_test_block_alter_cache_context', NULL);
-
-    // hook_block_build_alter() adds an additional cache tag.
-    $alter_add_tag = $this->randomMachineName();
-    \Drupal::state()->set('block_test_block_alter_cache_tag', $alter_add_tag);
-    $this->assertBlockRenderedWithExpectedCacheability($default_keys, $default_contexts, Cache::mergeTags($default_tags, [$alter_add_tag]), $default_max_age);
-    \Drupal::state()->set('block_test_block_alter_cache_tag', NULL);
-
-    // hook_block_build_alter() alters the max-age.
-    $alter_max_age = 300;
-    \Drupal::state()->set('block_test_block_alter_cache_max_age', $alter_max_age);
-    $this->assertBlockRenderedWithExpectedCacheability($default_keys, $default_contexts, $default_tags, $alter_max_age);
-    \Drupal::state()->set('block_test_block_alter_cache_max_age', NULL);
-
-    // hook_block_build_alter() alters cache keys, contexts, tags and max-age.
-    \Drupal::state()->set('block_test_block_alter_cache_key', $alter_add_key);
-    \Drupal::state()->set('block_test_block_alter_cache_context', $alter_add_context);
-    \Drupal::state()->set('block_test_block_alter_cache_tag', $alter_add_tag);
-    \Drupal::state()->set('block_test_block_alter_cache_max_age', $alter_max_age);
-    $this->assertBlockRenderedWithExpectedCacheability(array_merge($default_keys, [$alter_add_key]), Cache::mergeContexts($default_contexts, [$alter_add_context]), Cache::mergeTags($default_tags, [$alter_add_tag]), $alter_max_age);
-    \Drupal::state()->set('block_test_block_alter_cache_key', NULL);
-    \Drupal::state()->set('block_test_block_alter_cache_context', NULL);
-    \Drupal::state()->set('block_test_block_alter_cache_tag', NULL);
-    \Drupal::state()->set('block_test_block_alter_cache_max_age', NULL);
-
-    // hook_block_build_alter() sets #create_placeholder.
-    foreach ([TRUE, FALSE] as $value) {
-      \Drupal::state()->set('block_test_block_alter_create_placeholder', $value);
-      $build = $this->getBlockRenderArray();
-      $this->assertTrue(isset($build['#create_placeholder']));
-      $this->assertIdentical($value, $build['#create_placeholder']);
-    }
-    \Drupal::state()->set('block_test_block_alter_create_placeholder', NULL);
-
-    // Restore the previous request method.
-    $request->setMethod($request_method);
-  }
-
-  /**
-   * Asserts that a block is built/rendered/cached with expected cacheability.
-   *
-   * @param string[] $expected_keys
-   *   The expected cache keys.
-   * @param string[] $expected_contexts
-   *   The expected cache contexts.
-   * @param string[] $expected_tags
-   *   The expected cache tags.
-   * @param int $expected_max_age
-   *   The expected max-age.
-   */
-  protected function assertBlockRenderedWithExpectedCacheability(array $expected_keys, array $expected_contexts, array $expected_tags, $expected_max_age) {
-    $required_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
-
-    // Check that the expected cacheability metadata is present in:
-    // - the built render array;
-    $this->pass('Built render array');
-    $build = $this->getBlockRenderArray();
-    $this->assertIdentical($expected_keys, $build['#cache']['keys']);
-    $this->assertIdentical($expected_contexts, $build['#cache']['contexts']);
-    $this->assertIdentical($expected_tags, $build['#cache']['tags']);
-    $this->assertIdentical($expected_max_age, $build['#cache']['max-age']);
-    $this->assertFalse(isset($build['#create_placeholder']));
-    // - the rendered render array;
-    $this->pass('Rendered render array');
-    $this->renderer->renderRoot($build);
-    // - the render cache item.
-    $this->pass('Render cache item');
-    $final_cache_contexts = Cache::mergeContexts($expected_contexts, $required_cache_contexts);
-    $cid = implode(':', $expected_keys) . ':' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys($final_cache_contexts)->getKeys());
-    $cache_item = $this->container->get('cache.render')->get($cid);
-    $this->assertTrue($cache_item, 'The block render element has been cached with the expected cache ID.');
-    $this->assertIdentical(Cache::mergeTags($expected_tags, ['rendered']), $cache_item->tags);
-    $this->assertIdentical($final_cache_contexts, $cache_item->data['#cache']['contexts']);
-    $this->assertIdentical($expected_tags, $cache_item->data['#cache']['tags']);
-    $this->assertIdentical($expected_max_age, $cache_item->data['#cache']['max-age']);
-
-    $this->container->get('cache.render')->delete($cid);
-  }
-
-  /**
-   * Get a fully built render array for a block.
-   *
-   * @return array
-   *   The render array.
-   */
-  protected function getBlockRenderArray() {
-    return $this->container->get('entity.manager')->getViewBuilder('block')->view($this->block, 'block');
-  }
-
-}
diff --git a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
deleted file mode 100644
index 874723f..0000000
--- a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\Migrate\d6\MigrateBlockTest.
- */
-
-namespace Drupal\block\Tests\Migrate\d6;
-
-use Drupal\block\Entity\Block;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests migration of blocks to configuration entities.
- *
- * @group migrate_drupal_6
- */
-class MigrateBlockTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'block',
-    'views',
-    'comment',
-    'menu_ui',
-    'block_content',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['block_content']);
-    $this->installEntitySchema('block_content');
-
-    // Set Bartik and Seven as the default public and admin theme.
-    $config = $this->config('system.theme');
-    $config->set('default', 'bartik');
-    $config->set('admin', 'seven');
-    $config->save();
-
-    // Install one of D8's test themes.
-    \Drupal::service('theme_handler')->install(['test_theme']);
-
-    $this->executeMigrations([
-      'd6_filter_format',
-      'block_content_type',
-      'block_content_body_field',
-      'd6_custom_block',
-      'menu',
-      'd6_user_role',
-      'd6_block',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a block.
-   *
-   * @param string $id
-   *   The block ID.
-   * @param array $visibility
-   *   The block visibility settings.
-   * @param string $region
-   *   The display region.
-   * @param string $theme
-   *   The theme.
-   * @param string $weight
-   *   The block weight.
-   * @param string $label
-   *   The block label.
-   * @param string $label_display
-   *   The block label display setting.
-   */
-  public function assertEntity($id, $visibility, $region, $theme, $weight, $label, $label_display) {
-    $block = Block::load($id);
-    $this->assertTrue($block instanceof Block);
-    $this->assertIdentical($visibility, $block->getVisibility());
-    $this->assertIdentical($region, $block->getRegion());
-    $this->assertIdentical($theme, $block->getTheme());
-    $this->assertIdentical($weight, $block->getWeight());
-
-    $config = $this->config('block.block.' . $id);
-    $this->assertIdentical($label, $config->get('settings.label'));
-    $this->assertIdentical($label_display, $config->get('settings.label_display'));
-  }
-
-  /**
-   * Tests the block migration.
-   */
-  public function testBlockMigration() {
-    $blocks = Block::loadMultiple();
-    $this->assertIdentical(9, count($blocks));
-
-    // User blocks
-    $visibility = [];
-    $visibility['request_path']['id'] = 'request_path';
-    $visibility['request_path']['negate'] = TRUE;
-    $visibility['request_path']['pages'] = "<front>\n/node/1\n/blog/*";
-    $this->assertEntity('user', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
-
-    $visibility = [];
-    $this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
-
-    $visibility['user_role']['id'] = 'user_role';
-    $roles['authenticated'] = 'authenticated';
-    $visibility['user_role']['roles'] = $roles;
-    $context_mapping['user'] = '@user.current_user_context:current_user';
-    $visibility['user_role']['context_mapping'] = $context_mapping;
-    $visibility['user_role']['negate'] = FALSE;
-    $this->assertEntity('user_2', $visibility, 'sidebar_second', 'bartik', -9, '', '0');
-
-    $visibility = [];
-    $visibility['user_role']['id'] = 'user_role';
-    $visibility['user_role']['roles'] = [
-      'migrate_test_role_1' => 'migrate_test_role_1'
-    ];
-    $context_mapping['user'] = '@user.current_user_context:current_user';
-    $visibility['user_role']['context_mapping'] = $context_mapping;
-    $visibility['user_role']['negate'] = FALSE;
-    $this->assertEntity('user_3', $visibility, 'sidebar_second', 'bartik', -6, '', '0');
-
-    // Check system block
-    $visibility = [];
-    $visibility['request_path']['id'] = 'request_path';
-    $visibility['request_path']['negate'] = TRUE;
-    $visibility['request_path']['pages'] = '/node/1';
-    $this->assertEntity('system', $visibility, 'footer', 'bartik', -5, '', '0');
-
-    // Check menu blocks
-    $visibility = [];
-    $this->assertEntity('menu', $visibility, 'header', 'bartik', -5, '', '0');
-
-    // Check custom blocks
-    $visibility['request_path']['id'] = 'request_path';
-    $visibility['request_path']['negate'] = FALSE;
-    $visibility['request_path']['pages'] = '<front>';
-    $this->assertEntity('block', $visibility, 'content', 'bartik', 0, 'Static Block', 'visible');
-
-    $visibility['request_path']['id'] = 'request_path';
-    $visibility['request_path']['negate'] = FALSE;
-    $visibility['request_path']['pages'] = '/node';
-    $this->assertEntity('block_1', $visibility, 'sidebar_second', 'bluemarine', -4, 'Another Static Block', 'visible');
-
-    $visibility = [];
-    $this->assertEntity('block_2', $visibility, 'right', 'test_theme', -7, '', '0');
-
-    // Custom block with php code is not migrated.
-    $block = Block::load('block_3');
-    $this->assertFalse($block instanceof Block);
-  }
-
-}
diff --git a/core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php
deleted file mode 100644
index f14f3fc..0000000
--- a/core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block\Tests\Migrate\d7\MigrateBlockTest.
- */
-
-namespace Drupal\block\Tests\Migrate\d7;
-
-use Drupal\block\Entity\Block;
-use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of blocks to configuration entities.
- *
- * @group block
- */
-class MigrateBlockTest extends MigrateDrupal7TestBase {
-
- /**
-   * {@inheritdoc}
-   */
-  static $modules = [
-    'block',
-    'views',
-    'comment',
-    'menu_ui',
-    'block_content',
-    'node',
-    'text',
-    'filter',
-    'user',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->installEntitySchema('block_content');
-
-    // Set Bartik and Seven as the default public and admin theme.
-    $config = $this->config('system.theme');
-    $config->set('default', 'bartik');
-    $config->set('admin', 'seven');
-    $config->save();
-
-    // Install one of D8's test themes.
-    \Drupal::service('theme_handler')->install(['bartik']);
-
-    $this->executeMigrations([
-      'd7_filter_format',
-      'd7_user_role',
-      'block_content_type',
-      'block_content_body_field',
-      'd7_custom_block',
-      'd7_block',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a block.
-   *
-   * @param string $id
-   *   The block ID.
-   * @param string $plugin_id
-   *   The block's plugin ID.
-   * @param array $roles
-   *   Role IDs the block is expected to have.
-   * @param string $pages
-   *   The list of pages on which the block should appear.
-   * @param string $region
-   *   The display region.
-   * @param string $theme
-   *   The theme.
-   * @param string $weight
-   *   The block weight.
-   * @param string $label
-   *   The block label.
-   * @param string $label_display
-   *   The block label display setting.
-
-   */
-  public function assertEntity($id, $plugin_id, array $roles, $pages, $region, $theme, $weight, $label, $label_display) {
-    $block = Block::load($id);
-    $this->assertTrue($block instanceof Block);
-    /** @var \Drupal\block\BlockInterface $block */
-    $this->assertIdentical($plugin_id, $block->getPluginId());
-
-    $visibility = $block->getVisibility();
-    if ($roles) {
-      $this->assertIdentical($roles, array_values($visibility['user_role']['roles']));
-      $this->assertIdentical('@user.current_user_context:current_user', $visibility['user_role']['context_mapping']['user']);
-    }
-    if ($pages) {
-      $this->assertIdentical($pages, $visibility['request_path']['pages']);
-    }
-
-    $this->assertIdentical($region, $block->getRegion());
-    $this->assertIdentical($theme, $block->getTheme());
-    $this->assertIdentical($weight, $block->getWeight());
-
-    $config = $this->config('block.block.' . $id);
-    $this->assertIdentical($label, $config->get('settings.label'));
-    $this->assertIdentical($label_display, $config->get('settings.label_display'));
-  }
-
-  /**
-   * Tests the block migration.
-   */
-  public function testBlockMigration() {
-    $this->assertEntity('bartik_system_main', 'system_main_block', [], '', 'content', 'bartik', 0, '', '0');
-    $this->assertEntity('bartik_search_form', 'search_form_block', [], '', 'sidebar_first', 'bartik', -1, '', '0');
-    $this->assertEntity('bartik_user_login', 'user_login_block', [], '', 'sidebar_first', 'bartik', 0, '', '0');
-    $this->assertEntity('bartik_system_powered-by', 'system_powered_by_block', [], '', 'footer', 'bartik', 10, '', '0');
-    $this->assertEntity('seven_system_main', 'system_main_block', [], '', 'content', 'seven', 0, '', '0');
-    $this->assertEntity('seven_user_login', 'user_login_block', [], '', 'content', 'seven', 10, '', '0');
-
-    // The d7_custom_block migration should have migrated a block containing a
-    // mildly amusing limerick. We'll need its UUID to determine
-    // bartik_block_1's plugin ID.
-    $uuid = BlockContent::load(1)->uuid();
-    $this->assertEntity('bartik_block_1', 'block_content:' . $uuid, ['authenticated'], '', 'highlighted', 'bartik', 0, 'Mildly amusing limerick of the day', 'visible');
-
-    // Assert that disabled blocks (or enabled blocks whose plugin IDs could
-    // be resolved) did not migrate.
-    $non_existent_blocks = [
-      'bartik_system_navigation',
-      'bartik_system_help',
-      'seven_user_new',
-      'seven_search_form',
-      'bartik_comment_recent',
-      'bartik_node_syndicate',
-      'bartik_node_recent',
-      'bartik_shortcut_shortcuts',
-      'bartik_system_management',
-      'bartik_system_user-menu',
-      'bartik_system_main-menu',
-      'bartik_user_new',
-      'bartik_user_online',
-      'seven_comment_recent',
-      'seven_node_syndicate',
-      'seven_shortcut_shortcuts',
-      'seven_system_powered-by',
-      'seven_system_navigation',
-      'seven_system_management',
-      'seven_system_user-menu',
-      'seven_system_main-menu',
-      'seven_user_online',
-      'bartik_blog_recent',
-      'bartik_book_navigation',
-      'bartik_locale_language',
-      'bartik_forum_active',
-      'bartik_forum_new',
-      'seven_blog_recent',
-      'seven_book_navigation',
-      'seven_locale_language',
-      'seven_forum_active',
-      'seven_forum_new',
-      'bartik_menu_menu-test-menu',
-      'bartik_statistics_popular',
-      'seven_menu_menu-test-menu',
-      'seven_statistics_popular',
-      'seven_block_1',
-    ];
-    $this->assertTrue(empty(Block::loadMultiple($non_existent_blocks)));
-  }
-
-}
diff --git a/core/modules/block/src/Tests/Views/DisplayBlockTest.php b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
index 3adefe0..9fbd519 100644
--- a/core/modules/block/src/Tests/Views/DisplayBlockTest.php
+++ b/core/modules/block/src/Tests/Views/DisplayBlockTest.php
@@ -145,7 +145,7 @@ public function testDeleteBlockDisplay() {
     $this->assertBlockAppears($block_3);
     $this->assertBlockAppears($block_4);
 
-    $block_storage = $this->container->get('entity.manager')->getStorage('block');
+    $block_storage = $this->container->get('entity_type.manager')->getStorage('block');
 
     // Remove the block display, so both block entities from the first view
     // should both disappear.
@@ -192,7 +192,7 @@ public function testViewsBlockForm() {
     $this->assertNoFieldById('edit-machine-name', 'views_block__test_view_block_1', 'The machine name is hidden on the views block form.');
     // Save the block.
     $this->drupalPostForm(NULL, array(), t('Save block'));
-    $storage = $this->container->get('entity.manager')->getStorage('block');
+    $storage = $this->container->get('entity_type.manager')->getStorage('block');
     $block = $storage->load('views_block__test_view_block_block_1');
     // This will only return a result if our new block has been created with the
     // expected machine name.
diff --git a/core/modules/block/templates/block-list.html.twig b/core/modules/block/templates/block-list.html.twig
deleted file mode 100644
index 854d3ce..0000000
--- a/core/modules/block/templates/block-list.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Two column template for the block add/edit form.
- *
- * This template will be used when a block edit form specifies 'block_edit_form'
- * as its #theme callback.  Otherwise, by default, block add/edit forms will be
- * themed by form.html.twig.
- *
- * Available variables:
- * - form: The block add/edit form.
- *
- * @ingroup themeable
- */
-#}
-<div class="layout-block-list clearfix">
-  <div class="layout-region block-list-primary">
-    {{ form|without('place_blocks') }}
-  </div>
-  <div class="layout-region block-list-secondary">
-    {{ form.place_blocks }}
-  </div>
-</div>
diff --git a/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php b/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
new file mode 100644
index 0000000..88b8e81
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\BlockConfigSchemaTest.
+ */
+
+namespace Drupal\Tests\block\Kernel;
+
+use Drupal\block\Entity\Block;
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the block config schema.
+ *
+ * @group block
+ */
+class BlockConfigSchemaTest extends KernelTestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array(
+    'block',
+    'aggregator',
+    'book',
+    'block_content',
+    'comment',
+    'forum',
+    'node',
+    'statistics',
+    // BlockManager->getModuleName() calls system_get_info().
+    'system',
+    'taxonomy',
+    'user',
+    'text',
+  );
+
+  /**
+   * The typed config manager.
+   *
+   * @var \Drupal\Core\Config\TypedConfigManagerInterface
+   */
+  protected $typedConfig;
+
+  /**
+   * The block manager.
+   *
+   * @var \Drupal\Core\Block\BlockManagerInterface
+   */
+  protected $blockManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->typedConfig = \Drupal::service('config.typed');
+    $this->blockManager = \Drupal::service('plugin.manager.block');
+    $this->installEntitySchema('block_content');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('node');
+    $this->installSchema('book', array('book'));
+  }
+
+  /**
+   * Tests the block config schema for block plugins.
+   */
+  public function testBlockConfigSchema() {
+    foreach ($this->blockManager->getDefinitions() as $block_id => $definition) {
+      $id = strtolower($this->randomMachineName());
+      $block = Block::create(array(
+        'id' => $id,
+        'theme' => 'classy',
+        'weight' => 00,
+        'status' => TRUE,
+        'region' => 'content',
+        'plugin' => $block_id,
+        'settings' => array(
+          'label' => $this->randomMachineName(),
+          'provider' => 'system',
+          'label_display' => FALSE,
+        ),
+        'visibility' => array(),
+      ));
+      $block->save();
+
+      $config = $this->config("block.block.$id");
+      $this->assertEqual($config->get('id'), $id);
+      $this->assertConfigSchema($this->typedConfig, $config->getName(), $config->get());
+    }
+  }
+
+}
diff --git a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
new file mode 100644
index 0000000..36dedcf
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
@@ -0,0 +1,107 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\BlockInterfaceTest.
+ */
+
+namespace Drupal\Tests\block\Kernel;
+
+use Drupal\Core\Form\FormState;
+use Drupal\block\BlockInterface;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that the block plugin can work properly without a supporting entity.
+ *
+ * @group block
+ */
+class BlockInterfaceTest extends KernelTestBase {
+
+  public static $modules = array('system', 'block', 'block_test', 'user');
+
+  /**
+   * Test configuration and subsequent form() and build() method calls.
+   *
+   * This test is attempting to test the existing block plugin api and all
+   * functionality that is expected to remain consistent. The arrays that are
+   * used for comparison can change, but only to include elements that are
+   * contained within BlockBase or the plugin being tested. Likely these
+   * comparison arrays should get smaller, not larger, as more form/build
+   * elements are moved into a more suitably responsible class.
+   *
+   * Instantiation of the plugin is the primary element being tested here. The
+   * subsequent method calls are just attempting to cause a failure if a
+   * dependency outside of the plugin configuration is required.
+   */
+  public function testBlockInterface() {
+    $manager = $this->container->get('plugin.manager.block');
+    $configuration = array(
+      'label' => 'Custom Display Message',
+    );
+    $expected_configuration = array(
+      'id' => 'test_block_instantiation',
+      'label' => 'Custom Display Message',
+      'provider' => 'block_test',
+      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      'display_message' => 'no message set',
+    );
+    // Initial configuration of the block at construction time.
+    /** @var $display_block \Drupal\Core\Block\BlockPluginInterface */
+    $display_block = $manager->createInstance('test_block_instantiation', $configuration);
+    $this->assertIdentical($display_block->getConfiguration(), $expected_configuration, 'The block was configured correctly.');
+
+    // Updating an element of the configuration.
+    $display_block->setConfigurationValue('display_message', 'My custom display message.');
+    $expected_configuration['display_message'] = 'My custom display message.';
+    $this->assertIdentical($display_block->getConfiguration(), $expected_configuration, 'The block configuration was updated correctly.');
+    $definition = $display_block->getPluginDefinition();
+
+    $expected_form = array(
+      'provider' => array(
+        '#type' => 'value',
+        '#value' => 'block_test',
+      ),
+      'admin_label' => array(
+        '#type' => 'item',
+        '#title' => t('Block description'),
+        '#plain_text' => $definition['admin_label'],
+      ),
+      'label' => array(
+        '#type' => 'textfield',
+        '#title' => 'Title',
+        '#maxlength' => 255,
+        '#default_value' => 'Custom Display Message',
+        '#required' => TRUE,
+      ),
+      'label_display' => array(
+        '#type' => 'checkbox',
+        '#title' => 'Display title',
+        '#default_value' => TRUE,
+        '#return_value' => 'visible',
+      ),
+      'context_mapping' => array(),
+      'display_message' => array(
+        '#type' => 'textfield',
+        '#title' => t('Display message'),
+        '#default_value' => 'My custom display message.',
+      ),
+    );
+    $form_state = new FormState();
+    // Ensure there are no form elements that do not belong to the plugin.
+    $actual_form = $display_block->buildConfigurationForm(array(), $form_state);
+    // Remove the visibility sections, as that just tests condition plugins.
+    unset($actual_form['visibility'], $actual_form['visibility_tabs']);
+    $this->assertIdentical($this->castSafeStrings($actual_form), $this->castSafeStrings($expected_form), 'Only the expected form elements were present.');
+
+    $expected_build = array(
+      '#children' => 'My custom display message.',
+    );
+    // Ensure the build array is proper.
+    $this->assertIdentical($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.');
+
+    // Ensure the machine name suggestion is correct. In truth, this is actually
+    // testing BlockBase's implementation, not the interface itself.
+    $this->assertIdentical($display_block->getMachineNameSuggestion(), 'displaymessage', 'The plugin returned the expected machine name suggestion.');
+  }
+}
diff --git a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
new file mode 100644
index 0000000..3361665
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\BlockStorageUnitTest.
+ */
+
+namespace Drupal\Tests\block\Kernel;
+
+use Drupal\Core\Config\Entity\ConfigEntityStorage;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\block_test\Plugin\Block\TestHtmlBlock;
+use Drupal\Component\Plugin\Exception\PluginException;
+use Drupal\block\Entity\Block;
+use Drupal\block\BlockInterface;
+
+/**
+ * Tests the storage of blocks.
+ *
+ * @group block
+ */
+class BlockStorageUnitTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('block', 'block_test', 'system');
+
+  /**
+   * The block storage.
+   *
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface.
+   */
+  protected $controller;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->controller = $this->container->get('entity_type.manager')->getStorage('block');
+  }
+
+  /**
+   * Tests CRUD operations.
+   */
+  public function testBlockCRUD() {
+    $this->assertTrue($this->controller instanceof ConfigEntityStorage, 'The block storage is loaded.');
+
+    // Run each test method in the same installation.
+    $this->createTests();
+    $this->loadTests();
+    $this->deleteTests();
+  }
+
+  /**
+   * Tests the creation of blocks.
+   */
+  protected function createTests() {
+    // Attempt to create a block without a plugin.
+    try {
+      $entity = $this->controller->create(array());
+      $entity->getPlugin();
+      $this->fail('A block without a plugin was created with no exception thrown.');
+    }
+    catch (PluginException $e) {
+      $this->assertEqual('The block \'\' did not specify a plugin.', $e->getMessage(), 'An exception was thrown when a block was created without a plugin.');
+    }
+
+    // Create a block with only required values.
+    $entity = $this->controller->create(array(
+      'id' => 'test_block',
+      'theme' => 'stark',
+      'plugin' => 'test_html',
+    ));
+    $entity->save();
+
+    $this->assertTrue($entity instanceof Block, 'The newly created entity is a Block.');
+
+    // Verify all of the block properties.
+    $actual_properties = $this->config('block.block.test_block')->get();
+    $this->assertTrue(!empty($actual_properties['uuid']), 'The block UUID is set.');
+    unset($actual_properties['uuid']);
+
+    // Ensure that default values are filled in.
+    $expected_properties = array(
+      'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
+      'status' => TRUE,
+      'dependencies' => array('module' => array('block_test'), 'theme' => array('stark')),
+      'id' => 'test_block',
+      'theme' => 'stark',
+      'region' => '-1',
+      'weight' => NULL,
+      'provider' => NULL,
+      'plugin' => 'test_html',
+      'settings' => array(
+        'id' => 'test_html',
+        'label' => '',
+        'provider' => 'block_test',
+        'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      ),
+      'visibility' => array(),
+    );
+
+    $this->assertIdentical($actual_properties, $expected_properties);
+
+    $this->assertTrue($entity->getPlugin() instanceof TestHtmlBlock, 'The entity has an instance of the correct block plugin.');
+  }
+
+  /**
+   * Tests the loading of blocks.
+   */
+  protected function loadTests() {
+    $entity = $this->controller->load('test_block');
+
+    $this->assertTrue($entity instanceof Block, 'The loaded entity is a Block.');
+
+    // Verify several properties of the block.
+    $this->assertEqual($entity->getRegion(), '-1');
+    $this->assertTrue($entity->status());
+    $this->assertEqual($entity->getTheme(), 'stark');
+    $this->assertTrue($entity->uuid());
+  }
+
+  /**
+   * Tests the deleting of blocks.
+   */
+  protected function deleteTests() {
+    $entity = $this->controller->load('test_block');
+
+    // Ensure that the storage isn't currently empty.
+    $config_storage = $this->container->get('config.storage');
+    $config = $config_storage->listAll('block.block.');
+    $this->assertFalse(empty($config), 'There are blocks in config storage.');
+
+    // Delete the block.
+    $entity->delete();
+
+    // Ensure that the storage is now empty.
+    $config = $config_storage->listAll('block.block.');
+    $this->assertTrue(empty($config), 'There are no blocks in config storage.');
+  }
+
+  /**
+   * Tests the installation of default blocks.
+   */
+  public function testDefaultBlocks() {
+    \Drupal::service('theme_handler')->install(['classy']);
+    $entities = $this->controller->loadMultiple();
+    $this->assertTrue(empty($entities), 'There are no blocks initially.');
+
+    // Install the block_test.module, so that its default config is installed.
+    $this->installConfig(array('block_test'));
+
+    $entities = $this->controller->loadMultiple();
+    $entity = reset($entities);
+    $this->assertEqual($entity->id(), 'test_block', 'The default test block was loaded.');
+  }
+
+}
diff --git a/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php b/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
new file mode 100644
index 0000000..be70015
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
@@ -0,0 +1,333 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\BlockViewBuilderTest.
+ */
+
+namespace Drupal\Tests\block\Kernel;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\block\Entity\Block;
+
+/**
+ * Tests the block view builder.
+ *
+ * @group block
+ */
+class BlockViewBuilderTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('block', 'block_test', 'system', 'user');
+
+  /**
+   * The block being tested.
+   *
+   * @var \Drupal\block\Entity\BlockInterface
+   */
+  protected $block;
+
+  /**
+   * The block storage.
+   *
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
+   */
+  protected $controller;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->controller = $this->container
+      ->get('entity_type.manager')
+      ->getStorage('block');
+
+    \Drupal::state()->set('block_test.content', 'Llamas &gt; unicorns!');
+
+    // Create a block with only required values.
+    $this->block = $this->controller->create(array(
+      'id' => 'test_block',
+      'theme' => 'stark',
+      'plugin' => 'test_cache',
+    ));
+    $this->block->save();
+
+    $this->container->get('cache.render')->deleteAll();
+
+    $this->renderer = $this->container->get('renderer');
+  }
+
+  /**
+   * Tests the rendering of blocks.
+   */
+  public function testBasicRendering() {
+    \Drupal::state()->set('block_test.content', '');
+
+    $entity = $this->controller->create(array(
+      'id' => 'test_block1',
+      'theme' => 'stark',
+      'plugin' => 'test_html',
+    ));
+    $entity->save();
+
+    // Test the rendering of a block.
+    $entity = Block::load('test_block1');
+    $output = entity_view($entity, 'block');
+    $expected = array();
+    $expected[] = '<div id="block-test-block1">';
+    $expected[] = '  ';
+    $expected[] = '    ';
+    $expected[] = '      ';
+    $expected[] = '  </div>';
+    $expected[] = '';
+    $expected_output = implode("\n", $expected);
+    $this->assertEqual($this->renderer->renderRoot($output), $expected_output);
+
+    // Reset the HTML IDs so that the next render is not affected.
+    Html::resetSeenIds();
+
+    // Test the rendering of a block with a given title.
+    $entity = $this->controller->create(array(
+      'id' => 'test_block2',
+      'theme' => 'stark',
+      'plugin' => 'test_html',
+      'settings' => array(
+        'label' => 'Powered by Bananas',
+      ),
+    ));
+    $entity->save();
+    $output = entity_view($entity, 'block');
+    $expected = array();
+    $expected[] = '<div id="block-test-block2">';
+    $expected[] = '  ';
+    $expected[] = '      <h2>Powered by Bananas</h2>';
+    $expected[] = '    ';
+    $expected[] = '      ';
+    $expected[] = '  </div>';
+    $expected[] = '';
+    $expected_output = implode("\n", $expected);
+    $this->assertEqual($this->renderer->renderRoot($output), $expected_output);
+  }
+
+  /**
+   * Tests block render cache handling.
+   */
+  public function testBlockViewBuilderCache() {
+    // Verify cache handling for a non-empty block.
+    $this->verifyRenderCacheHandling();
+
+    // Create an empty block.
+    $this->block = $this->controller->create(array(
+      'id' => 'test_block',
+      'theme' => 'stark',
+      'plugin' => 'test_cache',
+    ));
+    $this->block->save();
+    \Drupal::state()->set('block_test.content', NULL);
+
+    // Verify cache handling for an empty block.
+    $this->verifyRenderCacheHandling();
+  }
+
+  /**
+   * Verifies render cache handling of the block being tested.
+   *
+   * @see ::testBlockViewBuilderCache()
+   */
+  protected function verifyRenderCacheHandling() {
+    // Force a request via GET so we can test the render cache.
+    $request = \Drupal::request();
+    $request_method = $request->server->get('REQUEST_METHOD');
+    $request->setMethod('GET');
+
+    // Test that a cache entry is created.
+    $build = $this->getBlockRenderArray();
+    $cid = 'entity_view:block:test_block:' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
+    $this->renderer->renderRoot($build);
+    $this->assertTrue($this->container->get('cache.render')->get($cid), 'The block render element has been cached.');
+
+    // Re-save the block and check that the cache entry has been deleted.
+    $this->block->save();
+    $this->assertFalse($this->container->get('cache.render')->get($cid), 'The block render cache entry has been cleared when the block was saved.');
+
+    // Rebuild the render array (creating a new cache entry in the process) and
+    // delete the block to check the cache entry is deleted.
+    unset($build['#printed']);
+    // Re-add the block because \Drupal\block\BlockViewBuilder::buildBlock()
+    // removes it.
+    $build['#block'] = $this->block;
+
+    $this->renderer->renderRoot($build);
+    $this->assertTrue($this->container->get('cache.render')->get($cid), 'The block render element has been cached.');
+    $this->block->delete();
+    $this->assertFalse($this->container->get('cache.render')->get($cid), 'The block render cache entry has been cleared when the block was deleted.');
+
+    // Restore the previous request method.
+    $request->setMethod($request_method);
+  }
+
+  /**
+   * Tests block view altering.
+   *
+   * @see hook_block_view_alter()
+   * @see hook_block_view_BASE_BLOCK_ID_alter()
+   */
+  public function testBlockViewBuilderViewAlter() {
+    // Establish baseline.
+    $build = $this->getBlockRenderArray();
+    $this->setRawContent((string) $this->renderer->renderRoot($build));
+    $this->assertIdentical(trim((string) $this->cssSelect('div')[0]), 'Llamas > unicorns!');
+
+    // Enable the block view alter hook that adds a foo=bar attribute.
+    \Drupal::state()->set('block_test_view_alter_suffix', TRUE);
+    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
+    $build = $this->getBlockRenderArray();
+    $this->setRawContent((string) $this->renderer->renderRoot($build));
+    $this->assertIdentical(trim((string) $this->cssSelect('[foo=bar]')[0]), 'Llamas > unicorns!');
+    \Drupal::state()->set('block_test_view_alter_suffix', FALSE);
+
+    \Drupal::state()->set('block_test.content', NULL);
+    Cache::invalidateTags($this->block->getCacheTagsToInvalidate());
+
+    // Advanced: cached block, but an alter hook adds a #pre_render callback to
+    // alter the eventual content.
+    \Drupal::state()->set('block_test_view_alter_append_pre_render_prefix', TRUE);
+    $build = $this->getBlockRenderArray();
+    $this->assertFalse(isset($build['#prefix']), 'The appended #pre_render callback has not yet run before rendering.');
+    $this->assertIdentical((string) $this->renderer->renderRoot($build), 'Hiya!<br>');
+    $this->assertTrue(isset($build['#prefix']) && $build['#prefix'] === 'Hiya!<br>', 'A cached block without content is altered.');
+  }
+
+  /**
+   * Tests block build altering.
+   *
+   * @see hook_block_build_alter()
+   * @see hook_block_build_BASE_BLOCK_ID_alter()
+   */
+  public function testBlockViewBuilderBuildAlter() {
+    // Force a request via GET so we can test the render cache.
+    $request = \Drupal::request();
+    $request_method = $request->server->get('REQUEST_METHOD');
+    $request->setMethod('GET');
+
+    $default_keys = ['entity_view', 'block', 'test_block'];
+    $default_contexts = [];
+    $default_tags = ['block_view', 'config:block.block.test_block'];
+    $default_max_age = Cache::PERMANENT;
+
+    // hook_block_build_alter() adds an additional cache key.
+    $alter_add_key = $this->randomMachineName();
+    \Drupal::state()->set('block_test_block_alter_cache_key', $alter_add_key);
+    $this->assertBlockRenderedWithExpectedCacheability(array_merge($default_keys, [$alter_add_key]), $default_contexts, $default_tags, $default_max_age);
+    \Drupal::state()->set('block_test_block_alter_cache_key', NULL);
+
+    // hook_block_build_alter() adds an additional cache context.
+    $alter_add_context = 'url.query_args:' . $this->randomMachineName();
+    \Drupal::state()->set('block_test_block_alter_cache_context', $alter_add_context);
+    $this->assertBlockRenderedWithExpectedCacheability($default_keys, Cache::mergeContexts($default_contexts, [$alter_add_context]), $default_tags, $default_max_age);
+    \Drupal::state()->set('block_test_block_alter_cache_context', NULL);
+
+    // hook_block_build_alter() adds an additional cache tag.
+    $alter_add_tag = $this->randomMachineName();
+    \Drupal::state()->set('block_test_block_alter_cache_tag', $alter_add_tag);
+    $this->assertBlockRenderedWithExpectedCacheability($default_keys, $default_contexts, Cache::mergeTags($default_tags, [$alter_add_tag]), $default_max_age);
+    \Drupal::state()->set('block_test_block_alter_cache_tag', NULL);
+
+    // hook_block_build_alter() alters the max-age.
+    $alter_max_age = 300;
+    \Drupal::state()->set('block_test_block_alter_cache_max_age', $alter_max_age);
+    $this->assertBlockRenderedWithExpectedCacheability($default_keys, $default_contexts, $default_tags, $alter_max_age);
+    \Drupal::state()->set('block_test_block_alter_cache_max_age', NULL);
+
+    // hook_block_build_alter() alters cache keys, contexts, tags and max-age.
+    \Drupal::state()->set('block_test_block_alter_cache_key', $alter_add_key);
+    \Drupal::state()->set('block_test_block_alter_cache_context', $alter_add_context);
+    \Drupal::state()->set('block_test_block_alter_cache_tag', $alter_add_tag);
+    \Drupal::state()->set('block_test_block_alter_cache_max_age', $alter_max_age);
+    $this->assertBlockRenderedWithExpectedCacheability(array_merge($default_keys, [$alter_add_key]), Cache::mergeContexts($default_contexts, [$alter_add_context]), Cache::mergeTags($default_tags, [$alter_add_tag]), $alter_max_age);
+    \Drupal::state()->set('block_test_block_alter_cache_key', NULL);
+    \Drupal::state()->set('block_test_block_alter_cache_context', NULL);
+    \Drupal::state()->set('block_test_block_alter_cache_tag', NULL);
+    \Drupal::state()->set('block_test_block_alter_cache_max_age', NULL);
+
+    // hook_block_build_alter() sets #create_placeholder.
+    foreach ([TRUE, FALSE] as $value) {
+      \Drupal::state()->set('block_test_block_alter_create_placeholder', $value);
+      $build = $this->getBlockRenderArray();
+      $this->assertTrue(isset($build['#create_placeholder']));
+      $this->assertIdentical($value, $build['#create_placeholder']);
+    }
+    \Drupal::state()->set('block_test_block_alter_create_placeholder', NULL);
+
+    // Restore the previous request method.
+    $request->setMethod($request_method);
+  }
+
+  /**
+   * Asserts that a block is built/rendered/cached with expected cacheability.
+   *
+   * @param string[] $expected_keys
+   *   The expected cache keys.
+   * @param string[] $expected_contexts
+   *   The expected cache contexts.
+   * @param string[] $expected_tags
+   *   The expected cache tags.
+   * @param int $expected_max_age
+   *   The expected max-age.
+   */
+  protected function assertBlockRenderedWithExpectedCacheability(array $expected_keys, array $expected_contexts, array $expected_tags, $expected_max_age) {
+    $required_cache_contexts = ['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'];
+
+    // Check that the expected cacheability metadata is present in:
+    // - the built render array;
+    $this->pass('Built render array');
+    $build = $this->getBlockRenderArray();
+    $this->assertIdentical($expected_keys, $build['#cache']['keys']);
+    $this->assertIdentical($expected_contexts, $build['#cache']['contexts']);
+    $this->assertIdentical($expected_tags, $build['#cache']['tags']);
+    $this->assertIdentical($expected_max_age, $build['#cache']['max-age']);
+    $this->assertFalse(isset($build['#create_placeholder']));
+    // - the rendered render array;
+    $this->pass('Rendered render array');
+    $this->renderer->renderRoot($build);
+    // - the render cache item.
+    $this->pass('Render cache item');
+    $final_cache_contexts = Cache::mergeContexts($expected_contexts, $required_cache_contexts);
+    $cid = implode(':', $expected_keys) . ':' . implode(':', \Drupal::service('cache_contexts_manager')->convertTokensToKeys($final_cache_contexts)->getKeys());
+    $cache_item = $this->container->get('cache.render')->get($cid);
+    $this->assertTrue($cache_item, 'The block render element has been cached with the expected cache ID.');
+    $this->assertIdentical(Cache::mergeTags($expected_tags, ['rendered']), $cache_item->tags);
+    $this->assertIdentical($final_cache_contexts, $cache_item->data['#cache']['contexts']);
+    $this->assertIdentical($expected_tags, $cache_item->data['#cache']['tags']);
+    $this->assertIdentical($expected_max_age, $cache_item->data['#cache']['max-age']);
+
+    $this->container->get('cache.render')->delete($cid);
+  }
+
+  /**
+   * Get a fully built render array for a block.
+   *
+   * @return array
+   *   The render array.
+   */
+  protected function getBlockRenderArray() {
+    return $this->container->get('entity_type.manager')->getViewBuilder('block')->view($this->block, 'block');
+  }
+
+}
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
new file mode 100644
index 0000000..b8ea3b9
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\Migrate\d6\MigrateBlockTest.
+ */
+
+namespace Drupal\Tests\block\Kernel\Migrate\d6;
+
+use Drupal\block\Entity\Block;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of blocks to configuration entities.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateBlockTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'block',
+    'views',
+    'comment',
+    'menu_ui',
+    'block_content',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['block_content']);
+    $this->installEntitySchema('block_content');
+
+    // Set Bartik and Seven as the default public and admin theme.
+    $config = $this->config('system.theme');
+    $config->set('default', 'bartik');
+    $config->set('admin', 'seven');
+    $config->save();
+
+    // Install one of D8's test themes.
+    \Drupal::service('theme_handler')->install(['test_theme']);
+
+    $this->executeMigrations([
+      'd6_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd6_custom_block',
+      'menu',
+      'd6_user_role',
+      'd6_block',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a block.
+   *
+   * @param string $id
+   *   The block ID.
+   * @param array $visibility
+   *   The block visibility settings.
+   * @param string $region
+   *   The display region.
+   * @param string $theme
+   *   The theme.
+   * @param string $weight
+   *   The block weight.
+   * @param string $label
+   *   The block label.
+   * @param string $label_display
+   *   The block label display setting.
+   */
+  public function assertEntity($id, $visibility, $region, $theme, $weight, $label, $label_display) {
+    $block = Block::load($id);
+    $this->assertTrue($block instanceof Block);
+    $this->assertIdentical($visibility, $block->getVisibility());
+    $this->assertIdentical($region, $block->getRegion());
+    $this->assertIdentical($theme, $block->getTheme());
+    $this->assertIdentical($weight, $block->getWeight());
+
+    $config = $this->config('block.block.' . $id);
+    $this->assertIdentical($label, $config->get('settings.label'));
+    $this->assertIdentical($label_display, $config->get('settings.label_display'));
+  }
+
+  /**
+   * Tests the block migration.
+   */
+  public function testBlockMigration() {
+    $blocks = Block::loadMultiple();
+    $this->assertIdentical(9, count($blocks));
+
+    // User blocks
+    $visibility = [];
+    $visibility['request_path']['id'] = 'request_path';
+    $visibility['request_path']['negate'] = TRUE;
+    $visibility['request_path']['pages'] = "<front>\n/node/1\n/blog/*";
+    $this->assertEntity('user', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
+
+    $visibility = [];
+    $this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
+
+    $visibility['user_role']['id'] = 'user_role';
+    $roles['authenticated'] = 'authenticated';
+    $visibility['user_role']['roles'] = $roles;
+    $context_mapping['user'] = '@user.current_user_context:current_user';
+    $visibility['user_role']['context_mapping'] = $context_mapping;
+    $visibility['user_role']['negate'] = FALSE;
+    $this->assertEntity('user_2', $visibility, 'sidebar_second', 'bartik', -9, '', '0');
+
+    $visibility = [];
+    $visibility['user_role']['id'] = 'user_role';
+    $visibility['user_role']['roles'] = [
+      'migrate_test_role_1' => 'migrate_test_role_1'
+    ];
+    $context_mapping['user'] = '@user.current_user_context:current_user';
+    $visibility['user_role']['context_mapping'] = $context_mapping;
+    $visibility['user_role']['negate'] = FALSE;
+    $this->assertEntity('user_3', $visibility, 'sidebar_second', 'bartik', -6, '', '0');
+
+    // Check system block
+    $visibility = [];
+    $visibility['request_path']['id'] = 'request_path';
+    $visibility['request_path']['negate'] = TRUE;
+    $visibility['request_path']['pages'] = '/node/1';
+    $this->assertEntity('system', $visibility, 'footer', 'bartik', -5, '', '0');
+
+    // Check menu blocks
+    $visibility = [];
+    $this->assertEntity('menu', $visibility, 'header', 'bartik', -5, '', '0');
+
+    // Check custom blocks
+    $visibility['request_path']['id'] = 'request_path';
+    $visibility['request_path']['negate'] = FALSE;
+    $visibility['request_path']['pages'] = '<front>';
+    $this->assertEntity('block', $visibility, 'content', 'bartik', 0, 'Static Block', 'visible');
+
+    $visibility['request_path']['id'] = 'request_path';
+    $visibility['request_path']['negate'] = FALSE;
+    $visibility['request_path']['pages'] = '/node';
+    $this->assertEntity('block_1', $visibility, 'sidebar_second', 'bluemarine', -4, 'Another Static Block', 'visible');
+
+    $visibility = [];
+    $this->assertEntity('block_2', $visibility, 'right', 'test_theme', -7, '', '0');
+
+    // Custom block with php code is not migrated.
+    $block = Block::load('block_3');
+    $this->assertFalse($block instanceof Block);
+  }
+
+}
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
new file mode 100644
index 0000000..3d177c4
--- /dev/null
+++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block\Kernel\Migrate\d7\MigrateBlockTest.
+ */
+
+namespace Drupal\Tests\block\Kernel\Migrate\d7;
+
+use Drupal\block\Entity\Block;
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of blocks to configuration entities.
+ *
+ * @group block
+ */
+class MigrateBlockTest extends MigrateDrupal7TestBase {
+
+ /**
+   * {@inheritdoc}
+   */
+  static $modules = [
+    'block',
+    'views',
+    'comment',
+    'menu_ui',
+    'block_content',
+    'node',
+    'text',
+    'filter',
+    'user',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->installEntitySchema('block_content');
+
+    // Set Bartik and Seven as the default public and admin theme.
+    $config = $this->config('system.theme');
+    $config->set('default', 'bartik');
+    $config->set('admin', 'seven');
+    $config->save();
+
+    // Install one of D8's test themes.
+    \Drupal::service('theme_handler')->install(['bartik']);
+
+    $this->executeMigrations([
+      'd7_filter_format',
+      'd7_user_role',
+      'block_content_type',
+      'block_content_body_field',
+      'd7_custom_block',
+      'd7_block',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a block.
+   *
+   * @param string $id
+   *   The block ID.
+   * @param string $plugin_id
+   *   The block's plugin ID.
+   * @param array $roles
+   *   Role IDs the block is expected to have.
+   * @param string $pages
+   *   The list of pages on which the block should appear.
+   * @param string $region
+   *   The display region.
+   * @param string $theme
+   *   The theme.
+   * @param string $weight
+   *   The block weight.
+   * @param string $label
+   *   The block label.
+   * @param string $label_display
+   *   The block label display setting.
+   */
+  public function assertEntity($id, $plugin_id, array $roles, $pages, $region, $theme, $weight, $label, $label_display) {
+    $block = Block::load($id);
+    $this->assertTrue($block instanceof Block);
+    /** @var \Drupal\block\BlockInterface $block */
+    $this->assertIdentical($plugin_id, $block->getPluginId());
+
+    $visibility = $block->getVisibility();
+    if ($roles) {
+      $this->assertIdentical($roles, array_values($visibility['user_role']['roles']));
+      $this->assertIdentical('@user.current_user_context:current_user', $visibility['user_role']['context_mapping']['user']);
+    }
+    if ($pages) {
+      $this->assertIdentical($pages, $visibility['request_path']['pages']);
+    }
+
+    $this->assertIdentical($region, $block->getRegion());
+    $this->assertIdentical($theme, $block->getTheme());
+    $this->assertIdentical($weight, $block->getWeight());
+
+    $config = $this->config('block.block.' . $id);
+    $this->assertIdentical($label, $config->get('settings.label'));
+    $this->assertIdentical($label_display, $config->get('settings.label_display'));
+  }
+
+  /**
+   * Tests the block migration.
+   */
+  public function testBlockMigration() {
+    $this->assertEntity('bartik_system_main', 'system_main_block', [], '', 'content', 'bartik', 0, '', '0');
+    $this->assertEntity('bartik_search_form', 'search_form_block', [], '', 'sidebar_first', 'bartik', -1, '', '0');
+    $this->assertEntity('bartik_user_login', 'user_login_block', [], '', 'sidebar_first', 'bartik', 0, '', '0');
+    $this->assertEntity('bartik_system_powered-by', 'system_powered_by_block', [], '', 'footer', 'bartik', 10, '', '0');
+    $this->assertEntity('seven_system_main', 'system_main_block', [], '', 'content', 'seven', 0, '', '0');
+    $this->assertEntity('seven_user_login', 'user_login_block', [], '', 'content', 'seven', 10, '', '0');
+
+    // The d7_custom_block migration should have migrated a block containing a
+    // mildly amusing limerick. We'll need its UUID to determine
+    // bartik_block_1's plugin ID.
+    $uuid = BlockContent::load(1)->uuid();
+    $this->assertEntity('bartik_block_1', 'block_content:' . $uuid, ['authenticated'], '', 'highlighted', 'bartik', 0, 'Mildly amusing limerick of the day', 'visible');
+
+    // Assert that disabled blocks (or enabled blocks whose plugin IDs could
+    // be resolved) did not migrate.
+    $non_existent_blocks = [
+      'bartik_system_navigation',
+      'bartik_system_help',
+      'seven_user_new',
+      'seven_search_form',
+      'bartik_comment_recent',
+      'bartik_node_syndicate',
+      'bartik_node_recent',
+      'bartik_shortcut_shortcuts',
+      'bartik_system_management',
+      'bartik_system_user-menu',
+      'bartik_system_main-menu',
+      'bartik_user_new',
+      'bartik_user_online',
+      'seven_comment_recent',
+      'seven_node_syndicate',
+      'seven_shortcut_shortcuts',
+      'seven_system_powered-by',
+      'seven_system_navigation',
+      'seven_system_management',
+      'seven_system_user-menu',
+      'seven_system_main-menu',
+      'seven_user_online',
+      'bartik_blog_recent',
+      'bartik_book_navigation',
+      'bartik_locale_language',
+      'bartik_forum_active',
+      'bartik_forum_new',
+      'seven_blog_recent',
+      'seven_book_navigation',
+      'seven_locale_language',
+      'seven_forum_active',
+      'seven_forum_new',
+      'bartik_menu_menu-test-menu',
+      'bartik_statistics_popular',
+      'seven_menu_menu-test-menu',
+      'seven_statistics_popular',
+      'seven_block_1',
+    ];
+    $this->assertTrue(empty(Block::loadMultiple($non_existent_blocks)));
+  }
+
+}
diff --git a/core/modules/block_content/block_content.links.task.yml b/core/modules/block_content/block_content.links.task.yml
index 2b88171..0b4256b 100644
--- a/core/modules/block_content/block_content.links.task.yml
+++ b/core/modules/block_content/block_content.links.task.yml
@@ -7,7 +7,7 @@ block_content.list_sub:
   route_name: entity.block_content.collection
   parent_id: entity.block_content.collection
 entity.block_content_type.collection:
-  title: Types
+  title: Block types
   route_name: entity.block_content_type.collection
   parent_id: entity.block_content.collection
   weight: 1
diff --git a/core/modules/block_content/block_content.module b/core/modules/block_content/block_content.module
index 74fe9f1..3b4ae2e 100644
--- a/core/modules/block_content/block_content.module
+++ b/core/modules/block_content/block_content.module
@@ -18,22 +18,22 @@ function block_content_help($route_name, RouteMatchInterface $route_match) {
       $field_ui = \Drupal::moduleHandler()->moduleExists('field_ui') ? \Drupal::url('help.page', array('name' => 'field_ui')) : '#';
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Custom Block module allows you to create custom <em>block types</em> and <em>content-containing blocks</em>, and provides a <a href=":block-library">Custom block library</a> listing all of them. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help page</a> for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', array(':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', array('name' => 'field')), ':blocks' => \Drupal::url('help.page', array('name' => 'block')), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content')) . '</p>';
+      $output .= '<p>' . t('The Custom Block module allows you to create and manage custom <em>block types</em> and <em>content-containing blocks</em> from the <a href = ":block-library" >Custom block library<a/> page. Custom block types have fields; see the <a href=":field-help">Field module help</a> for more information. Once created, custom blocks can be placed in regions just like blocks provided by other modules; see the <a href=":blocks">Block module help</a> page for details. For more information, see the <a href=":online-help">online documentation for the Custom Block module</a>.', array(':block-library' => \Drupal::url('entity.block_content.collection'), ':block-content' => \Drupal::url('entity.block_content.collection'), ':field-help' => \Drupal::url('help.page', array('name' => 'field')), ':blocks' => \Drupal::url('help.page', array('name' => 'block')), ':online-help' => 'https://www.drupal.org/documentation/modules/block_content')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Creating and managing custom block types') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create and edit custom block types with fields and display settings, from the <a href=":types">Custom block types</a> page in the Custom block library. For more information about managing fields and display settings, see the <a href=":field-ui">Field UI module help</a>.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':field-ui' => $field_ui)) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create and edit custom block types with fields and display settings, from the <a href=":types">Block types</a> page in the Custom block library. For more information about managing fields and display settings, see the <a href=":field-ui">Field UI module help</a>.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':field-ui' => $field_ui)) . '</dd>';
       $output .= '<dt>' . t('Creating custom blocks') . '</dt>';
-      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create, edit, and delete custom blocks of each custom block type you have defined, from the <a href=":block-library">Custom block library</a> page. Custom blocks are shown in the <em>Place blocks</em> list on the <a href=":blocks">Block layout page</a>; see the <a href=":block_help">Block module help</a> for more information about placing blocks.', array(':blocks' => \Drupal::url('block.admin_display'), ':block-library' => \Drupal::url('entity.block_content.collection'), ':block_help' => \Drupal::url('help.page', array('name' => 'block')))) . '</dd>';
+      $output .= '<dd>' . t('Users with the <em>Administer blocks</em> permission can create, edit, and delete custom blocks of each defined custom block type, from the <a href=":block-library">Blocks</a> page in the Custom block library. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page; see the <a href=":block_help">Block module help</a> for more information about placing blocks.', array(':blocks' => \Drupal::url('block.admin_display'), ':block-library' => \Drupal::url('entity.block_content.collection'), ':block_help' => \Drupal::url('help.page', array('name' => 'block')))) . '</dd>';
       $output .= '</dl>';
       return $output;
 
     case 'entity.block_content.collection':
-      $output = '<p>' . t('Blocks in the block library belong to <a href=":types">block types</a>, each with its own fields and display settings. After creating a block, place it in a region from the <a href=":blocks">Block layout page</a>.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+      $output = '<p>' . t('Blocks in the block library belong to <a href=":types">Custom block types</a>, each with its own fields and display settings. After creating a block, place it in a region from the <a href=":blocks">Block layout</a> page.', array(':types' => \Drupal::url('entity.block_content_type.collection'), ':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
       return $output;
 
     case 'entity.block_content_type.collection':
-      $output = '<p>' . t('Each block type has its own fields and display settings. Create blocks of each type on the <a href=":block-library">Block library page</a>.', array(':block-library' => \Drupal::url('entity.block_content.collection'))) . '</p>';
+      $output = '<p>' . t('Each block type has its own fields and display settings. Create blocks of each type on the <a href=":block-library">Blocks</a> page in the custom block library.', array(':block-library' => \Drupal::url('entity.block_content.collection'))) . '</p>';
       return $output;
 
   }
@@ -79,12 +79,12 @@ function block_content_add_body_field($block_type_id, $label = 'Body') {
   // Add or remove the body field, as needed.
   $field = FieldConfig::loadByName('block_content', $block_type_id, 'body');
   if (empty($field)) {
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' =>  FieldStorageConfig::loadByName('block_content', 'body'),
       'bundle' => $block_type_id,
       'label' => $label,
       'settings' => array('display_summary' => FALSE),
-    ));
+    ]);
     $field->save();
 
     // Assign widget settings for the 'default' form mode.
diff --git a/core/modules/block_content/config/schema/block_content.schema.yml b/core/modules/block_content/config/schema/block_content.schema.yml
index 756f020..2e7c338 100644
--- a/core/modules/block_content/config/schema/block_content.schema.yml
+++ b/core/modules/block_content/config/schema/block_content.schema.yml
@@ -16,15 +16,3 @@ block_content.type.*:
     description:
       type: text
       label: 'Description'
-
-migrate.source.d6_box:
-  type: migrate_source_sql
-  label: 'Drupal 6 box'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        type:
-          type: string
-          label: 'Type'
diff --git a/core/modules/block_content/js/block_content.js b/core/modules/block_content/js/block_content.js
index dbc89f9..bbc0533 100644
--- a/core/modules/block_content/js/block_content.js
+++ b/core/modules/block_content/js/block_content.js
@@ -3,7 +3,7 @@
  * Defines Javascript behaviors for the block_content module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -54,4 +54,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/block_content/src/BlockContentViewsData.php b/core/modules/block_content/src/BlockContentViewsData.php
index 40963ce..69132b5 100644
--- a/core/modules/block_content/src/BlockContentViewsData.php
+++ b/core/modules/block_content/src/BlockContentViewsData.php
@@ -29,8 +29,8 @@ public function getViewsData() {
     $data['block_content_field_data']['type']['field']['id'] = 'field';
 
     $data['block_content']['block_content_listing_empty'] = array(
-      'title' => t('Empty block library behavior'),
-      'help' => t('Provides a link to add a new block.'),
+      'title' => $this->t('Empty block library behavior'),
+      'help' => $this->t('Provides a link to add a new block.'),
       'area' => array(
         'id' => 'block_content_listing_empty',
       ),
diff --git a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
index 8f543c3..567d5e1 100644
--- a/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\block_content\Tests;
 
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
@@ -29,7 +31,7 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase {
    * {@inheritdoc}
    */
   protected function createEntity() {
-    $block_content_type = entity_create('block_content_type', array(
+    $block_content_type = BlockContentType::create(array(
       'id' => 'basic',
       'label' => 'basic',
       'revision' => FALSE
@@ -38,7 +40,7 @@ protected function createEntity() {
     block_content_add_body_field($block_content_type->id());
 
     // Create a "Llama" custom block.
-    $block_content = entity_create('block_content', array(
+    $block_content = BlockContent::create(array(
       'info' => 'Llama',
       'type' => 'basic',
       'body' => array(
diff --git a/core/modules/block_content/src/Tests/BlockContentSaveTest.php b/core/modules/block_content/src/Tests/BlockContentSaveTest.php
index 75c2801..894099f 100644
--- a/core/modules/block_content/src/Tests/BlockContentSaveTest.php
+++ b/core/modules/block_content/src/Tests/BlockContentSaveTest.php
@@ -46,7 +46,7 @@ public function testImport() {
       'type' => 'basic',
       'id' => $test_id
     );
-    $block = entity_create('block_content', $block_array);
+    $block = BlockContent::create($block_array);
     $block->enforceIsNew(TRUE);
     $block->save();
 
diff --git a/core/modules/block_content/src/Tests/BlockContentTestBase.php b/core/modules/block_content/src/Tests/BlockContentTestBase.php
index ceb5846..cc6e3ad 100644
--- a/core/modules/block_content/src/Tests/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/BlockContentTestBase.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\block_content\Tests;
 
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\block_content\Entity\BlockContentType;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -78,7 +80,7 @@ protected function setUp() {
    */
   protected function createBlockContent($title = FALSE, $bundle = 'basic', $save = TRUE) {
     $title = ($title ? : $this->randomMachineName());
-    $block_content = entity_create('block_content', array(
+    $block_content = BlockContent::create(array(
       'info' => $title,
       'type' => $bundle,
       'langcode' => 'en'
@@ -101,7 +103,7 @@ protected function createBlockContent($title = FALSE, $bundle = 'basic', $save =
    *   Created custom block type.
    */
   protected function createBlockContentType($label, $create_body = FALSE) {
-    $bundle = entity_create('block_content_type', array(
+    $bundle = BlockContentType::create(array(
       'id' => $label,
       'label' => $label,
       'revision' => FALSE,
diff --git a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php b/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
index 4e4fd6b..c32fb45 100644
--- a/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
+++ b/core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\block_content\Tests;
 
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Unicode;
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 
@@ -60,7 +62,7 @@ protected function setUp() {
    */
   protected function setupBundle() {
     // Create the basic bundle since it is provided by standard.
-    $bundle = entity_create('block_content_type', array(
+    $bundle = BlockContentType::create(array(
       'id' => $this->bundle,
       'label' => $this->bundle,
       'revision' => FALSE
@@ -96,7 +98,7 @@ public function getTranslatorPermissions() {
   protected function createBlockContent($title = FALSE, $bundle = FALSE) {
     $title = ($title ? : $this->randomMachineName());
     $bundle = ($bundle ? : $this->bundle);
-    $block_content = entity_create('block_content', array(
+    $block_content = BlockContent::create(array(
       'info' => $title,
       'type' => $bundle,
       'langcode' => 'en'
@@ -162,7 +164,7 @@ protected function doTestBasicTranslation() {
   public function testDisabledBundle() {
     // Create a bundle that does not have translation enabled.
     $disabled_bundle = $this->randomMachineName();
-    $bundle = entity_create('block_content_type', array(
+    $bundle = BlockContentType::create(array(
       'id' => $disabled_bundle,
       'label' => $disabled_bundle,
       'revision' => FALSE
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php b/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php
deleted file mode 100644
index 159f988..0000000
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentBodyFieldTest.
- */
-
-namespace Drupal\block_content\Tests\Migrate;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldConfigInterface;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Attaches a body field to the custom block type.
- *
- * @group block_content
- */
-class MigrateBlockContentBodyFieldTest extends MigrateDrupal7TestBase {
-
-  static $modules = array('block', 'block_content', 'filter', 'text');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['block_content']);
-    $this->installEntitySchema('block_content');
-    $this->executeMigrations([
-      'block_content_type',
-      'block_content_body_field',
-    ]);
-  }
-
-  /**
-   * Tests the block content body field migration.
-   */
-  public function testBlockContentBodyFieldMigration() {
-    /** @var \Drupal\field\FieldStorageConfigInterface $storage */
-    $storage = FieldStorageConfig::load('block_content.body');
-    $this->assertTrue($storage instanceof FieldStorageConfigInterface);
-    $this->assertIdentical('block_content', $storage->getTargetEntityTypeId());
-    $this->assertIdentical(['basic'], array_values($storage->getBundles()));
-    $this->assertIdentical('body', $storage->getName());
-
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = FieldConfig::load('block_content.basic.body');
-    $this->assertTrue($field instanceof FieldConfigInterface);
-    $this->assertIdentical('block_content', $field->getTargetEntityTypeId());
-    $this->assertIdentical('basic', $field->getTargetBundle());
-    $this->assertIdentical('body', $field->getName());
-    $this->assertIdentical('Body', $field->getLabel());
-  }
-
-}
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php b/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php
deleted file mode 100644
index 5b28c37..0000000
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentStubTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentStubTest.
- */
-
-namespace Drupal\block_content\Tests\Migrate;
-
-use Drupal\block_content\Entity\BlockContentType;
-use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for block_content entities.
- *
- * @group block_content
- */
-class MigrateBlockContentStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block_content'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('block_content');
-  }
-
-  /**
-   * Tests creation of block content stubs with no block_content_type available.
-   */
-  public function testStubFailure() {
-    $message = 'Expected MigrateException thrown when no bundles exist.';
-    try {
-      $this->createStub('block_content');
-      $this->fail($message);
-    }
-    catch (MigrateException $e) {
-      $this->pass($message);
-      $this->assertEqual('Stubbing failed, no bundles available for entity type: block_content', $e->getMessage());
-    }
-  }
-
-  /**
-   * Tests creation of block content stubs when there is a block_content_type.
-   */
-  public function testStubSuccess() {
-    BlockContentType::create([
-      'id' => 'test_block_content_type',
-      'label' => 'Test block content type',
-    ])->save();
-    $this->performStubTest('block_content');
-  }
-
-}
diff --git a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php b/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php
deleted file mode 100644
index 19c4039..0000000
--- a/core/modules/block_content/src/Tests/Migrate/MigrateBlockContentTypeTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block_content\Tests\Migrate\MigrateBlockContentTypeTest.
- */
-
-namespace Drupal\block_content\Tests\Migrate;
-
-use Drupal\block_content\BlockContentTypeInterface;
-use Drupal\block_content\Entity\BlockContentType;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of the basic block content type.
- *
- * @group block_content
- */
-class MigrateBlockContentTypeTest extends MigrateDrupal7TestBase {
-
-  static $modules = array('block', 'block_content', 'filter', 'text');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['block_content']);
-    $this->installEntitySchema('block_content');
-    $this->executeMigration('block_content_type');
-  }
-
-  /**
-   * Tests the block content type migration.
-   */
-  public function testBlockContentTypeMigration() {
-    /** @var \Drupal\block_content\BlockContentTypeInterface $entity */
-    $entity = BlockContentType::load('basic');
-    $this->assertTrue($entity instanceof BlockContentTypeInterface);
-    $this->assertIdentical('Basic', $entity->label());
-  }
-
-}
diff --git a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
deleted file mode 100644
index 3b3098b..0000000
--- a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block_content\Tests\Migrate\d6\MigrateBlockContentTest.
- */
-
-namespace Drupal\block_content\Tests\Migrate\d6;
-
-use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade custom blocks.
- *
- * @group migrate_drupal_6
- */
-class MigrateBlockContentTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block', 'block_content'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['block_content']);
-    $this->installEntitySchema('block_content');
-
-    $this->executeMigrations([
-      'd6_filter_format',
-      'block_content_type',
-      'block_content_body_field',
-      'd6_custom_block',
-    ]);
-  }
-
-  /**
-   * Tests the Drupal 6 custom block to Drupal 8 migration.
-   */
-  public function testBlockMigration() {
-    /** @var BlockContent $block */
-    $block = BlockContent::load(1);
-    $this->assertIdentical('My block 1', $block->label());
-    $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
-    $this->assertIdentical('en', $block->language()->getId());
-    $this->assertIdentical('<h3>My first custom block body</h3>', $block->body->value);
-    $this->assertIdentical('full_html', $block->body->format);
-
-    $block = BlockContent::load(2);
-    $this->assertIdentical('My block 2', $block->label());
-    $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
-    $this->assertIdentical('en', $block->language()->getId());
-    $this->assertIdentical('<h3>My second custom block body</h3>', $block->body->value);
-    $this->assertIdentical('full_html', $block->body->format);
-  }
-
-}
diff --git a/core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php b/core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php
deleted file mode 100644
index b19d2a4..0000000
--- a/core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\block_content\Tests\Migrate\d7\MigrateCustomBlockTest.
- */
-
-namespace Drupal\block_content\Tests\Migrate\d7;
-
-use Drupal\block_content\BlockContentInterface;
-use Drupal\block_content\Entity\BlockContent;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of custom blocks.
- *
- * @group block_content
- */
-class MigrateCustomBlockTest extends MigrateDrupal7TestBase {
-
-  public static $modules = array(
-    'block_content',
-    'filter',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->installEntitySchema('block_content');
-
-    $this->executeMigrations([
-      'd7_filter_format',
-      'block_content_type',
-      'block_content_body_field',
-      'd7_custom_block',
-    ]);
-  }
-
-  /**
-   * Tests migration of custom blocks from Drupal 7 to Drupal 8.
-   */
-  public function testCustomBlockMigration() {
-    $block = BlockContent::load(1);
-    $this->assertTrue($block instanceof BlockContentInterface);
-    /** @var \Drupal\block_content\BlockContentInterface $block */
-    $this->assertIdentical('Limerick', $block->label());
-
-    $expected_body = "A fellow jumped off a high wall\r\nAnd had a most terrible fall\r\nHe went back to bed\r\nWith a bump on his head\r\nThat's why you don't jump off a wall";
-    $this->assertIdentical($expected_body, $block->body->value);
-    $this->assertIdentical('filtered_html', $block->body->format);
-  }
-
-}
diff --git a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
index 4d65dcf..fdbec95 100644
--- a/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/src/Tests/Views/BlockContentTestBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\block_content\Tests\Views;
 
+use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\views\Tests\ViewTestBase;
@@ -69,7 +70,7 @@ protected function createBlockContent(array $settings = array()) {
       'type' => 'basic',
       'langcode' => 'en',
     );
-    if ($block_content = entity_create('block_content', $settings)) {
+    if ($block_content = BlockContent::create($settings)) {
       $status = $block_content->save();
     }
     $this->assertEqual($status, SAVED_NEW, SafeMarkup::format('Created block content %info.', array('%info' => $block_content->label())));
@@ -100,7 +101,7 @@ protected function createBlockContentType(array $values = array()) {
       'label' => $id,
       'revision' => FALSE
     );
-    $bundle = entity_create('block_content_type', $values);
+    $bundle = BlockContentType::create($values);
     $status = $bundle->save();
     block_content_add_body_field($bundle->id());
 
diff --git a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
index 44f7c75..f3a7e25 100644
--- a/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
+++ b/core/modules/block_content/src/Tests/Views/RevisionRelationshipsTest.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\block_content\Tests\Views\RevisionRelationshipsTest.
  */
+
 namespace Drupal\block_content\Tests\Views;
 
 use Drupal\block_content\Entity\BlockContentType;
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
new file mode 100644
index 0000000..ebd0fa1
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentBodyFieldTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel\Migrate;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\FieldConfigInterface;
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Attaches a body field to the custom block type.
+ *
+ * @group block_content
+ */
+class MigrateBlockContentBodyFieldTest extends MigrateDrupal7TestBase {
+
+  static $modules = array('block', 'block_content', 'filter', 'text');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['block_content']);
+    $this->installEntitySchema('block_content');
+    $this->executeMigrations([
+      'block_content_type',
+      'block_content_body_field',
+    ]);
+  }
+
+  /**
+   * Tests the block content body field migration.
+   */
+  public function testBlockContentBodyFieldMigration() {
+    /** @var \Drupal\field\FieldStorageConfigInterface $storage */
+    $storage = FieldStorageConfig::load('block_content.body');
+    $this->assertTrue($storage instanceof FieldStorageConfigInterface);
+    $this->assertIdentical('block_content', $storage->getTargetEntityTypeId());
+    $this->assertIdentical(['basic'], array_values($storage->getBundles()));
+    $this->assertIdentical('body', $storage->getName());
+
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    $field = FieldConfig::load('block_content.basic.body');
+    $this->assertTrue($field instanceof FieldConfigInterface);
+    $this->assertIdentical('block_content', $field->getTargetEntityTypeId());
+    $this->assertIdentical('basic', $field->getTargetBundle());
+    $this->assertIdentical('body', $field->getName());
+    $this->assertIdentical('Body', $field->getLabel());
+  }
+
+}
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
new file mode 100644
index 0000000..2f566e1
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentStubTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentStubTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel\Migrate;
+
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\migrate\MigrateException;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for block_content entities.
+ *
+ * @group block_content
+ */
+class MigrateBlockContentStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('block_content');
+  }
+
+  /**
+   * Tests creation of block content stubs with no block_content_type available.
+   */
+  public function testStubFailure() {
+    $message = 'Expected MigrateException thrown when no bundles exist.';
+    try {
+      $this->createStub('block_content');
+      $this->fail($message);
+    }
+    catch (MigrateException $e) {
+      $this->pass($message);
+      $this->assertEqual('Stubbing failed, no bundles available for entity type: block_content', $e->getMessage());
+    }
+  }
+
+  /**
+   * Tests creation of block content stubs when there is a block_content_type.
+   */
+  public function testStubSuccess() {
+    BlockContentType::create([
+      'id' => 'test_block_content_type',
+      'label' => 'Test block content type',
+    ])->save();
+    $this->performStubTest('block_content');
+  }
+
+}
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
new file mode 100644
index 0000000..b2a99e3
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\MigrateBlockContentTypeTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel\Migrate;
+
+use Drupal\block_content\BlockContentTypeInterface;
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of the basic block content type.
+ *
+ * @group block_content
+ */
+class MigrateBlockContentTypeTest extends MigrateDrupal7TestBase {
+
+  static $modules = array('block', 'block_content', 'filter', 'text');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['block_content']);
+    $this->installEntitySchema('block_content');
+    $this->executeMigration('block_content_type');
+  }
+
+  /**
+   * Tests the block content type migration.
+   */
+  public function testBlockContentTypeMigration() {
+    /** @var \Drupal\block_content\BlockContentTypeInterface $entity */
+    $entity = BlockContentType::load('basic');
+    $this->assertTrue($entity instanceof BlockContentTypeInterface);
+    $this->assertIdentical('Basic', $entity->label());
+  }
+
+}
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
new file mode 100644
index 0000000..258fd82
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateBlockContentTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\d6\MigrateBlockContentTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel\Migrate\d6;
+
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade custom blocks.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateBlockContentTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'block_content'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['block_content']);
+    $this->installEntitySchema('block_content');
+
+    $this->executeMigrations([
+      'd6_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd6_custom_block',
+    ]);
+  }
+
+  /**
+   * Tests the Drupal 6 custom block to Drupal 8 migration.
+   */
+  public function testBlockMigration() {
+    /** @var BlockContent $block */
+    $block = BlockContent::load(1);
+    $this->assertIdentical('My block 1', $block->label());
+    $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
+    $this->assertIdentical('en', $block->language()->getId());
+    $this->assertIdentical('<h3>My first custom block body</h3>', $block->body->value);
+    $this->assertIdentical('full_html', $block->body->format);
+
+    $block = BlockContent::load(2);
+    $this->assertIdentical('My block 2', $block->label());
+    $this->assertTrue(REQUEST_TIME <= $block->getChangedTime() && $block->getChangedTime() <= time());
+    $this->assertIdentical('en', $block->language()->getId());
+    $this->assertIdentical('<h3>My second custom block body</h3>', $block->body->value);
+    $this->assertIdentical('full_html', $block->body->format);
+  }
+
+}
diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
new file mode 100644
index 0000000..824bad1
--- /dev/null
+++ b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\block_content\Kernel\Migrate\d7\MigrateCustomBlockTest.
+ */
+
+namespace Drupal\Tests\block_content\Kernel\Migrate\d7;
+
+use Drupal\block_content\BlockContentInterface;
+use Drupal\block_content\Entity\BlockContent;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of custom blocks.
+ *
+ * @group block_content
+ */
+class MigrateCustomBlockTest extends MigrateDrupal7TestBase {
+
+  public static $modules = array(
+    'block_content',
+    'filter',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->installEntitySchema('block_content');
+
+    $this->executeMigrations([
+      'd7_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd7_custom_block',
+    ]);
+  }
+
+  /**
+   * Tests migration of custom blocks from Drupal 7 to Drupal 8.
+   */
+  public function testCustomBlockMigration() {
+    $block = BlockContent::load(1);
+    $this->assertTrue($block instanceof BlockContentInterface);
+    /** @var \Drupal\block_content\BlockContentInterface $block */
+    $this->assertIdentical('Limerick', $block->label());
+
+    $expected_body = "A fellow jumped off a high wall\r\nAnd had a most terrible fall\r\nHe went back to bed\r\nWith a bump on his head\r\nThat's why you don't jump off a wall";
+    $this->assertIdentical($expected_body, $block->body->value);
+    $this->assertIdentical('filtered_html', $block->body->format);
+  }
+
+}
diff --git a/core/modules/book/book.js b/core/modules/book/book.js
index fa40818..2cc7881 100644
--- a/core/modules/book/book.js
+++ b/core/modules/book/book.js
@@ -3,7 +3,7 @@
  * Javascript behaviors for the Book module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -34,4 +34,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index f55f5d6..f9a6ad2 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -88,7 +88,7 @@ function book_entity_type_build(array &$entity_types) {
 /**
  * Implements hook_node_links_alter().
  */
-function book_node_links_alter(array &$node_links, NodeInterface $node, array &$context) {
+function book_node_links_alter(array &$links, NodeInterface $node, array &$context) {
   if ($context['view_mode'] != 'rss') {
     $account = \Drupal::currentUser();
 
@@ -97,14 +97,14 @@ function book_node_links_alter(array &$node_links, NodeInterface $node, array &$
         $child_type = \Drupal::config('book.settings')->get('child_type');
         $access_control_handler = \Drupal::entityManager()->getAccessControlHandler('node');
         if (($account->hasPermission('add content to books') || $account->hasPermission('administer book outlines')) && $access_control_handler->createAccess($child_type) && $node->isPublished() && $node->book['depth'] < BookManager::BOOK_MAX_DEPTH) {
-          $links['book_add_child'] = array(
+          $book_links['book_add_child'] = array(
             'title' => t('Add child page'),
             'url' => Url::fromRoute('node.add', ['node_type' => $child_type], ['query' => ['parent' => $node->id()]]),
           );
         }
 
         if ($account->hasPermission('access printer-friendly version')) {
-          $links['book_printer'] = array(
+          $book_links['book_printer'] = array(
             'title' => t('Printer-friendly version'),
             'url' => Url::fromRoute('book.export', [
               'type' => 'html',
@@ -116,10 +116,10 @@ function book_node_links_alter(array &$node_links, NodeInterface $node, array &$
       }
     }
 
-    if (!empty($links)) {
-      $node_links['book'] = array(
+    if (!empty($book_links)) {
+      $links['book'] = array(
         '#theme' => 'links__node__book',
-        '#links' => $links,
+        '#links' => $book_links,
         '#attributes' => array('class' => array('links', 'inline')),
       );
     }
diff --git a/core/modules/book/book.services.yml b/core/modules/book/book.services.yml
index 06affbb..73c9484 100644
--- a/core/modules/book/book.services.yml
+++ b/core/modules/book/book.services.yml
@@ -1,7 +1,7 @@
 services:
   book.breadcrumb:
     class: Drupal\book\BookBreadcrumbBuilder
-    arguments: ['@entity.manager', '@access_manager', '@current_user']
+    arguments: ['@entity.manager', '@current_user']
     tags:
       - { name: breadcrumb_builder, priority: 701 }
   book.manager:
diff --git a/core/modules/book/migration_templates/d6_book.yml b/core/modules/book/migration_templates/d6_book.yml
index dca43b1..f5020c3 100644
--- a/core/modules/book/migration_templates/d6_book.yml
+++ b/core/modules/book/migration_templates/d6_book.yml
@@ -20,4 +20,4 @@ destination:
   plugin: book
 migration_dependencies:
   required:
-    - d6_node:*
+    - d6_node
diff --git a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
index 53207b7..a22c615 100644
--- a/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
+++ b/core/modules/book/src/Access/BookNodeIsRemovableAccessCheck.php
@@ -44,7 +44,7 @@ public function __construct(BookManagerInterface $book_manager) {
    *   The access result.
    */
   public function access(NodeInterface $node) {
-    return AccessResult::allowedIf($this->bookManager->checkNodeIsRemovable($node))->cacheUntilEntityChanges($node);
+    return AccessResult::allowedIf($this->bookManager->checkNodeIsRemovable($node))->addCacheableDependency($node);
   }
 
 }
diff --git a/core/modules/book/src/BookBreadcrumbBuilder.php b/core/modules/book/src/BookBreadcrumbBuilder.php
index 2fc237c..5ca1c0d 100644
--- a/core/modules/book/src/BookBreadcrumbBuilder.php
+++ b/core/modules/book/src/BookBreadcrumbBuilder.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\book;
 
-use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -31,13 +30,6 @@ class BookBreadcrumbBuilder implements BreadcrumbBuilderInterface {
   protected $nodeStorage;
 
   /**
-   * The access manager.
-   *
-   * @var \Drupal\Core\Access\AccessManagerInterface
-   */
-  protected $accessManager;
-
-  /**
    * The current user account.
    *
    * @var \Drupal\Core\Session\AccountInterface
@@ -49,14 +41,11 @@ class BookBreadcrumbBuilder implements BreadcrumbBuilderInterface {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
-   * @param \Drupal\Core\Access\AccessManagerInterface $access_manager
-   *   The access manager.
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The current user account.
    */
-  public function __construct(EntityManagerInterface $entity_manager, AccessManagerInterface $access_manager, AccountInterface $account) {
+  public function __construct(EntityManagerInterface $entity_manager, AccountInterface $account) {
     $this->nodeStorage = $entity_manager->getStorage('node');
-    $this->accessManager = $access_manager;
     $this->account = $account;
   }
 
diff --git a/core/modules/book/src/Tests/BookUninstallTest.php b/core/modules/book/src/Tests/BookUninstallTest.php
deleted file mode 100644
index 0a18fb1..0000000
--- a/core/modules/book/src/Tests/BookUninstallTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\book\Tests\BookUninstallTest.
- */
-
-namespace Drupal\book\Tests;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests that the Book module cannot be uninstalled if books exist.
- *
- * @group book
- */
-class BookUninstallTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['system', 'user', 'field', 'filter', 'text', 'node', 'book'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
-    $this->installSchema('node', array('node_access'));
-    $this->installConfig(array('node', 'book', 'field'));
-    // For uninstall to work.
-    $this->installSchema('user', array('users_data'));
-  }
-
-  /**
-   * Tests the book_system_info_alter() method.
-   */
-  public function testBookUninstall() {
-    // No nodes exist.
-    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
-    $this->assertEqual([], $validation_reasons, 'The book module is not required.');
-
-    $content_type = NodeType::create(array(
-      'type' => $this->randomMachineName(),
-      'name' => $this->randomString(),
-    ));
-    $content_type->save();
-    $book_config = $this->config('book.settings');
-    $allowed_types = $book_config->get('allowed_types');
-    $allowed_types[] = $content_type->id();
-    $book_config->set('allowed_types', $allowed_types)->save();
-
-    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
-    $node->book['bid'] = 'new';
-    $node->save();
-
-    // One node in a book but not of type book.
-    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
-    $this->assertEqual(['To uninstall Book, delete all content that is part of a book'], $validation_reasons['book']);
-
-    $book_node = Node::create(array('title' => $this->randomString(), 'type' => 'book'));
-    $book_node->book['bid'] = FALSE;
-    $book_node->save();
-
-    // Two nodes, one in a book but not of type book and one book node (which is
-    // not in a book).
-    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
-    $this->assertEqual(['To uninstall Book, delete all content that is part of a book'], $validation_reasons['book']);
-
-    $node->delete();
-    // One node of type book but not actually part of a book.
-    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
-    $this->assertEqual(['To uninstall Book, delete all content that has the Book content type'], $validation_reasons['book']);
-
-    $book_node->delete();
-    // No nodes exist therefore the book module is not required.
-    $module_data = _system_rebuild_module_data();
-    $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
-
-    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
-    $node->save();
-    // One node exists but is not part of a book therefore the book module is
-    // not required.
-    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
-    $this->assertEqual([], $validation_reasons, 'The book module is not required.');
-
-    // Uninstall the Book module and check the node type is deleted.
-    \Drupal::service('module_installer')->uninstall(array('book'));
-    $this->assertNull(NodeType::load('book'), "The book node type does not exist.");
-  }
-
-}
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
deleted file mode 100644
index 76a8b88..0000000
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookConfigsTest.
- */
-
-namespace Drupal\book\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to book.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['book'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_book_settings');
-  }
-
-  /**
-   * Tests migration of book variables to book.settings.yml.
-   */
-  public function testBookSettings() {
-    $config = $this->config('book.settings');
-    $this->assertIdentical('book', $config->get('child_type'));
-    $this->assertIdentical('all pages', $config->get('block.navigation.mode'));
-    $this->assertIdentical(array('book'), $config->get('allowed_types'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
deleted file mode 100644
index 4169baf..0000000
--- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\book\Tests\Migrate\d6\MigrateBookTest.
- */
-
-namespace Drupal\book\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Upgrade book structure.
- *
- * @group migrate_drupal_6
- */
-class MigrateBookTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['book'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('book', ['book']);
-    $this->installSchema('node', ['node_access']);
-    $this->migrateContent();
-    $this->executeMigration('d6_book');
-  }
-
-  /**
-   * Tests the Drupal 6 book structure to Drupal 8 migration.
-   */
-  public function testBook() {
-    $nodes = Node::loadMultiple(array(4, 5, 6, 7, 8));
-    $this->assertIdentical('4', $nodes[4]->book['bid']);
-    $this->assertIdentical('0', $nodes[4]->book['pid']);
-
-    $this->assertIdentical('4', $nodes[5]->book['bid']);
-    $this->assertIdentical('4', $nodes[5]->book['pid']);
-
-    $this->assertIdentical('4', $nodes[6]->book['bid']);
-    $this->assertIdentical('5', $nodes[6]->book['pid']);
-
-    $this->assertIdentical('4', $nodes[7]->book['bid']);
-    $this->assertIdentical('5', $nodes[7]->book['pid']);
-
-    $this->assertIdentical('8', $nodes[8]->book['bid']);
-    $this->assertIdentical('0', $nodes[8]->book['pid']);
-
-    $tree = \Drupal::service('book.manager')->bookTreeAllData(4);
-    $this->assertIdentical('4', $tree['49990 Node 4 4']['link']['nid']);
-    $this->assertIdentical('5', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['link']['nid']);
-    $this->assertIdentical('6', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['link']['nid']);
-    $this->assertIdentical('7', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['link']['nid']);
-    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['below']);
-    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['below']);
-  }
-
-}
diff --git a/core/modules/book/tests/src/Kernel/BookUninstallTest.php b/core/modules/book/tests/src/Kernel/BookUninstallTest.php
new file mode 100644
index 0000000..5cb7327
--- /dev/null
+++ b/core/modules/book/tests/src/Kernel/BookUninstallTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\book\Kernel\BookUninstallTest.
+ */
+
+namespace Drupal\Tests\book\Kernel;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that the Book module cannot be uninstalled if books exist.
+ *
+ * @group book
+ */
+class BookUninstallTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'user', 'field', 'filter', 'text', 'node', 'book'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installSchema('book', array('book'));
+    $this->installSchema('node', array('node_access'));
+    $this->installConfig(array('node', 'book', 'field'));
+    // For uninstall to work.
+    $this->installSchema('user', array('users_data'));
+  }
+
+  /**
+   * Tests the book_system_info_alter() method.
+   */
+  public function testBookUninstall() {
+    // No nodes exist.
+    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
+    $this->assertEqual([], $validation_reasons, 'The book module is not required.');
+
+    $content_type = NodeType::create(array(
+      'type' => $this->randomMachineName(),
+      'name' => $this->randomString(),
+    ));
+    $content_type->save();
+    $book_config = $this->config('book.settings');
+    $allowed_types = $book_config->get('allowed_types');
+    $allowed_types[] = $content_type->id();
+    $book_config->set('allowed_types', $allowed_types)->save();
+
+    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
+    $node->book['bid'] = 'new';
+    $node->save();
+
+    // One node in a book but not of type book.
+    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
+    $this->assertEqual(['To uninstall Book, delete all content that is part of a book'], $validation_reasons['book']);
+
+    $book_node = Node::create(array('title' => $this->randomString(), 'type' => 'book'));
+    $book_node->book['bid'] = FALSE;
+    $book_node->save();
+
+    // Two nodes, one in a book but not of type book and one book node (which is
+    // not in a book).
+    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
+    $this->assertEqual(['To uninstall Book, delete all content that is part of a book'], $validation_reasons['book']);
+
+    $node->delete();
+    // One node of type book but not actually part of a book.
+    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
+    $this->assertEqual(['To uninstall Book, delete all content that has the Book content type'], $validation_reasons['book']);
+
+    $book_node->delete();
+    // No nodes exist therefore the book module is not required.
+    $module_data = _system_rebuild_module_data();
+    $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
+
+    $node = Node::create(array('title' => $this->randomString(), 'type' => $content_type->id()));
+    $node->save();
+    // One node exists but is not part of a book therefore the book module is
+    // not required.
+    $validation_reasons = \Drupal::service('module_installer')->validateUninstall(['book']);
+    $this->assertEqual([], $validation_reasons, 'The book module is not required.');
+
+    // Uninstall the Book module and check the node type is deleted.
+    \Drupal::service('module_installer')->uninstall(array('book'));
+    $this->assertNull(NodeType::load('book'), "The book node type does not exist.");
+  }
+
+}
diff --git a/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
new file mode 100644
index 0000000..30c4c59
--- /dev/null
+++ b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\book\Kernel\Migrate\d6\MigrateBookConfigsTest.
+ */
+
+namespace Drupal\Tests\book\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to book.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['book'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_book_settings');
+  }
+
+  /**
+   * Tests migration of book variables to book.settings.yml.
+   */
+  public function testBookSettings() {
+    $config = $this->config('book.settings');
+    $this->assertIdentical('book', $config->get('child_type'));
+    $this->assertIdentical('all pages', $config->get('block.navigation.mode'));
+    $this->assertIdentical(array('book'), $config->get('allowed_types'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
new file mode 100644
index 0000000..ffd0336
--- /dev/null
+++ b/core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\book\Kernel\Migrate\d6\MigrateBookTest.
+ */
+
+namespace Drupal\Tests\book\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Upgrade book structure.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateBookTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['book'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('book', ['book']);
+    $this->installSchema('node', ['node_access']);
+    $this->migrateContent();
+    $this->executeMigrations(['d6_node', 'd6_book']);
+  }
+
+  /**
+   * Tests the Drupal 6 book structure to Drupal 8 migration.
+   */
+  public function testBook() {
+    $nodes = Node::loadMultiple(array(4, 5, 6, 7, 8));
+    $this->assertIdentical('4', $nodes[4]->book['bid']);
+    $this->assertIdentical('0', $nodes[4]->book['pid']);
+
+    $this->assertIdentical('4', $nodes[5]->book['bid']);
+    $this->assertIdentical('4', $nodes[5]->book['pid']);
+
+    $this->assertIdentical('4', $nodes[6]->book['bid']);
+    $this->assertIdentical('5', $nodes[6]->book['pid']);
+
+    $this->assertIdentical('4', $nodes[7]->book['bid']);
+    $this->assertIdentical('5', $nodes[7]->book['pid']);
+
+    $this->assertIdentical('8', $nodes[8]->book['bid']);
+    $this->assertIdentical('0', $nodes[8]->book['pid']);
+
+    $tree = \Drupal::service('book.manager')->bookTreeAllData(4);
+    $this->assertIdentical('4', $tree['49990 Node 4 4']['link']['nid']);
+    $this->assertIdentical('5', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['link']['nid']);
+    $this->assertIdentical('6', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['link']['nid']);
+    $this->assertIdentical('7', $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['link']['nid']);
+    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 6 6']['below']);
+    $this->assertIdentical(array(), $tree['49990 Node 4 4']['below']['50000 Node 5 5']['below']['50000 Node 7 7']['below']);
+  }
+
+}
diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
deleted file mode 100644
index 942239b..0000000
--- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\breakpoint\Tests\BreakpointDiscoveryTest.
- */
-
-namespace Drupal\breakpoint\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests discovery of breakpoints provided by themes and modules.
- *
- * @group breakpoint
- */
-class BreakpointDiscoveryTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'breakpoint', 'breakpoint_module_test');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-    \Drupal::service('theme_handler')->install(array('breakpoint_theme_test'));
-  }
-
-  /**
-   * Test the breakpoint group created for a theme.
-   */
-  public function testThemeBreakpoints() {
-    // Verify the breakpoint group for breakpoint_theme_test was created.
-    $expected_breakpoints = array(
-      'breakpoint_theme_test.mobile' => array(
-        'label' => 'mobile',
-        'mediaQuery' => '(min-width: 0px)',
-        'weight' => 0,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.mobile',
-        'group' => 'breakpoint_theme_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.narrow' => array(
-        'label' => 'narrow',
-        'mediaQuery' => '(min-width: 560px)',
-        'weight' => 1,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.narrow',
-        'group' => 'breakpoint_theme_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.wide' => array(
-        'label' => 'wide',
-        'mediaQuery' => '(min-width: 851px)',
-        'weight' => 2,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.wide',
-        'group' => 'breakpoint_theme_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.tv' => array(
-        'label' => 'tv',
-        'mediaQuery' => 'only screen and (min-width: 1220px)',
-        'weight' => 3,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.tv',
-        'group' => 'breakpoint_theme_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
-
-    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test');
-    foreach ($expected_breakpoints as $id => $expected_breakpoint) {
-      $this->assertEqual($expected_breakpoint, $breakpoints[$id]->getPluginDefinition());
-    }
-
-    // Test that the order is as expected.
-    $this->assertIdentical(array_keys($expected_breakpoints), array_keys($breakpoints));
-  }
-
-  /**
-   * Test the custom breakpoint group provided by a theme and a module.
-   */
-  public function testCustomBreakpointGroups () {
-    // Verify the breakpoint group for breakpoint_theme_test.group2 was created.
-    $expected_breakpoints = array(
-      'breakpoint_theme_test.group2.narrow' => array(
-        'label' => 'narrow',
-        'mediaQuery' => '(min-width: 560px)',
-        'weight' => 0,
-        'multipliers' => array(
-          '1x',
-          '2x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.group2.narrow',
-        'group' => 'breakpoint_theme_test.group2',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_theme_test.group2.wide' => array(
-        'label' => 'wide',
-        'mediaQuery' => '(min-width: 851px)',
-        'weight' => 1,
-        'multipliers' => array(
-          '1x',
-          '2x',
-        ),
-        'provider' => 'breakpoint_theme_test',
-        'id' => 'breakpoint_theme_test.group2.wide',
-        'group' => 'breakpoint_theme_test.group2',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
-        'label' => 'tv',
-        'mediaQuery' => '(min-width: 6000px)',
-        'weight' => 2,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_module_test',
-        'id' => 'breakpoint_module_test.breakpoint_theme_test.group2.tv',
-        'group' => 'breakpoint_theme_test.group2',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
-
-    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test.group2');
-    foreach ($expected_breakpoints as $id => $expected_breakpoint) {
-      $this->assertEqual($expected_breakpoint, $breakpoints[$id]->getPluginDefinition());
-    }
-  }
-
-  /**
-   * Test the breakpoint group created for a module.
-   */
-  public function testModuleBreakpoints() {
-    $expected_breakpoints = array(
-      'breakpoint_module_test.mobile' => array(
-        'label' => 'mobile',
-        'mediaQuery' => '(min-width: 0px)',
-        'weight' => 0,
-        'multipliers' => array(
-          '1x',
-        ),
-        'provider' => 'breakpoint_module_test',
-        'id' => 'breakpoint_module_test.mobile',
-        'group' => 'breakpoint_module_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-      'breakpoint_module_test.standard' => array(
-        'label' => 'standard',
-        'mediaQuery' => '(min-width: 560px)',
-        'weight' => 1,
-        'multipliers' => array(
-          '1x',
-          '2x',
-        ),
-        'provider' => 'breakpoint_module_test',
-        'id' => 'breakpoint_module_test.standard',
-        'group' => 'breakpoint_module_test',
-        'class' => 'Drupal\\breakpoint\\Breakpoint',
-      ),
-    );
-
-    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_module_test');
-    $this->assertEqual(array_keys($expected_breakpoints), array_keys($breakpoints));
-  }
-
-  /**
-   * Test the collection of breakpoint groups.
-   */
-  public function testBreakpointGroups() {
-    $expected = array(
-      'bartik' => 'Bartik',
-      'breakpoint_module_test' => 'Breakpoint test module',
-      'breakpoint_theme_test' => 'Breakpoint test theme',
-      'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
-    );
-    $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups();
-    // Ensure the order is as expected. Should be sorted by label.
-    $this->assertIdentical($expected, $this->castSafeStrings($breakpoint_groups));
-
-    $expected = array(
-      'breakpoint_theme_test' => 'theme',
-      'breakpoint_module_test' => 'module',
-    );
-    $breakpoint_group_providers = \Drupal::service('breakpoint.manager')->getGroupProviders('breakpoint_theme_test.group2');
-    $this->assertEqual($expected, $breakpoint_group_providers);
-  }
-
-}
diff --git a/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php b/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
new file mode 100644
index 0000000..0328c14
--- /dev/null
+++ b/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\breakpoint\Kernel\BreakpointDiscoveryTest.
+ */
+
+namespace Drupal\Tests\breakpoint\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests discovery of breakpoints provided by themes and modules.
+ *
+ * @group breakpoint
+ */
+class BreakpointDiscoveryTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'breakpoint', 'breakpoint_module_test');
+
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::service('theme_handler')->install(array('breakpoint_theme_test'));
+  }
+
+  /**
+   * Test the breakpoint group created for a theme.
+   */
+  public function testThemeBreakpoints() {
+    // Verify the breakpoint group for breakpoint_theme_test was created.
+    $expected_breakpoints = array(
+      'breakpoint_theme_test.mobile' => array(
+        'label' => 'mobile',
+        'mediaQuery' => '(min-width: 0px)',
+        'weight' => 0,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.mobile',
+        'group' => 'breakpoint_theme_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_theme_test.narrow' => array(
+        'label' => 'narrow',
+        'mediaQuery' => '(min-width: 560px)',
+        'weight' => 1,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.narrow',
+        'group' => 'breakpoint_theme_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_theme_test.wide' => array(
+        'label' => 'wide',
+        'mediaQuery' => '(min-width: 851px)',
+        'weight' => 2,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.wide',
+        'group' => 'breakpoint_theme_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_theme_test.tv' => array(
+        'label' => 'tv',
+        'mediaQuery' => 'only screen and (min-width: 1220px)',
+        'weight' => 3,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.tv',
+        'group' => 'breakpoint_theme_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+    );
+
+    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test');
+    foreach ($expected_breakpoints as $id => $expected_breakpoint) {
+      $this->assertEqual($expected_breakpoint, $breakpoints[$id]->getPluginDefinition());
+    }
+
+    // Test that the order is as expected.
+    $this->assertIdentical(array_keys($expected_breakpoints), array_keys($breakpoints));
+  }
+
+  /**
+   * Test the custom breakpoint group provided by a theme and a module.
+   */
+  public function testCustomBreakpointGroups () {
+    // Verify the breakpoint group for breakpoint_theme_test.group2 was created.
+    $expected_breakpoints = array(
+      'breakpoint_theme_test.group2.narrow' => array(
+        'label' => 'narrow',
+        'mediaQuery' => '(min-width: 560px)',
+        'weight' => 0,
+        'multipliers' => array(
+          '1x',
+          '2x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.group2.narrow',
+        'group' => 'breakpoint_theme_test.group2',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_theme_test.group2.wide' => array(
+        'label' => 'wide',
+        'mediaQuery' => '(min-width: 851px)',
+        'weight' => 1,
+        'multipliers' => array(
+          '1x',
+          '2x',
+        ),
+        'provider' => 'breakpoint_theme_test',
+        'id' => 'breakpoint_theme_test.group2.wide',
+        'group' => 'breakpoint_theme_test.group2',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
+        'label' => 'tv',
+        'mediaQuery' => '(min-width: 6000px)',
+        'weight' => 2,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_module_test',
+        'id' => 'breakpoint_module_test.breakpoint_theme_test.group2.tv',
+        'group' => 'breakpoint_theme_test.group2',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+    );
+
+    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test.group2');
+    foreach ($expected_breakpoints as $id => $expected_breakpoint) {
+      $this->assertEqual($expected_breakpoint, $breakpoints[$id]->getPluginDefinition());
+    }
+  }
+
+  /**
+   * Test the breakpoint group created for a module.
+   */
+  public function testModuleBreakpoints() {
+    $expected_breakpoints = array(
+      'breakpoint_module_test.mobile' => array(
+        'label' => 'mobile',
+        'mediaQuery' => '(min-width: 0px)',
+        'weight' => 0,
+        'multipliers' => array(
+          '1x',
+        ),
+        'provider' => 'breakpoint_module_test',
+        'id' => 'breakpoint_module_test.mobile',
+        'group' => 'breakpoint_module_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+      'breakpoint_module_test.standard' => array(
+        'label' => 'standard',
+        'mediaQuery' => '(min-width: 560px)',
+        'weight' => 1,
+        'multipliers' => array(
+          '1x',
+          '2x',
+        ),
+        'provider' => 'breakpoint_module_test',
+        'id' => 'breakpoint_module_test.standard',
+        'group' => 'breakpoint_module_test',
+        'class' => 'Drupal\\breakpoint\\Breakpoint',
+      ),
+    );
+
+    $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_module_test');
+    $this->assertEqual(array_keys($expected_breakpoints), array_keys($breakpoints));
+  }
+
+  /**
+   * Test the collection of breakpoint groups.
+   */
+  public function testBreakpointGroups() {
+    $expected = array(
+      'bartik' => 'Bartik',
+      'breakpoint_module_test' => 'Breakpoint test module',
+      'breakpoint_theme_test' => 'Breakpoint test theme',
+      'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
+    );
+    $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups();
+    // Ensure the order is as expected. Should be sorted by label.
+    $this->assertIdentical($expected, $this->castSafeStrings($breakpoint_groups));
+
+    $expected = array(
+      'breakpoint_theme_test' => 'theme',
+      'breakpoint_module_test' => 'module',
+    );
+    $breakpoint_group_providers = \Drupal::service('breakpoint.manager')->getGroupProviders('breakpoint_theme_test.group2');
+    $this->assertEqual($expected, $breakpoint_group_providers);
+  }
+
+}
diff --git a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
index fea2d8f..1ea712c 100644
--- a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
+++ b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\breakpoint\Breakpoint;
 use Drupal\Tests\UnitTestCase;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * @coversDefaultClass \Drupal\breakpoint\Breakpoint
@@ -65,12 +66,8 @@ protected function setupBreakpoint() {
    */
   public function testGetLabel() {
     $this->pluginDefinition['label'] = 'Test label';
-    $this->stringTranslation->expects($this->once())
-      ->method('translate')
-      ->with($this->pluginDefinition['label'], array(), array('context' => 'breakpoint'))
-      ->will($this->returnValue('Test label translated'));
     $this->setupBreakpoint();
-    $this->assertEquals('Test label translated', $this->breakpoint->getLabel());
+    $this->assertEquals(new TranslatableMarkup('Test label', array(), array('context' => 'breakpoint'), $this->stringTranslation), $this->breakpoint->getLabel());
   }
 
   /**
diff --git a/core/modules/ckeditor/ckeditor.libraries.yml b/core/modules/ckeditor/ckeditor.libraries.yml
index 86fdcf6..902cb99 100644
--- a/core/modules/ckeditor/ckeditor.libraries.yml
+++ b/core/modules/ckeditor/ckeditor.libraries.yml
@@ -8,6 +8,7 @@ drupal.ckeditor:
   dependencies:
     - core/jquery
     - core/drupal
+    - core/drupalSettings
     - core/drupal.debounce
     - core/ckeditor
     - editor/drupal.editor
@@ -22,6 +23,12 @@ drupal.ckeditor.plugins.drupalimagecaption:
   dependencies:
     - filter/caption
 
+drupal.ckeditor.plugins.language:
+  version: VERSION
+  css:
+    component:
+      css/plugins/language/ckeditor.language.css: {}
+
 drupal.ckeditor.admin:
   version: VERSION
   js:
@@ -72,8 +79,16 @@ drupal.ckeditor.stylescombo.admin:
   dependencies:
     - core/jquery
     - core/drupal
-    - core/jquery.once
     - core/drupal.vertical-tabs
     - core/drupalSettings
     # Ensure to run after ckeditor/drupal.ckeditor.admin.
     - ckeditor/drupal.ckeditor.admin
+
+drupal.ckeditor.language.admin:
+  version: VERSION
+  js:
+    js/ckeditor.language.admin.js: {}
+  dependencies:
+    - core/jquery
+    - core/drupal
+    - core/drupal.vertical-tabs
diff --git a/core/modules/ckeditor/ckeditor.module b/core/modules/ckeditor/ckeditor.module
index 3d5e9f2..3da6113 100644
--- a/core/modules/ckeditor/ckeditor.module
+++ b/core/modules/ckeditor/ckeditor.module
@@ -27,6 +27,8 @@ function ckeditor_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dd>' . t('CKEditor only allow users to format content in accordance with the filter configuration of the specific text format. If a text format excludes certain HTML tags, the corresponding toolbar buttons are not displayed to users when they edit a text field in this format. For more information see the <a href=":filter">Filter help page</a>.', array(':filter' => \Drupal::url('help.page', array('name' => 'filter')))) . '</dd>';
       $output .= '<dt>' . t('Toggling between formatted text and HTML source') . '</dt>';
       $output .= '<dd>' . t('If the <em>Source</em> button is available in the toolbar, users can click this button to disable the visual editor and edit the HTML source directly. After toggling back, the visual editor uses the allowed HTML tags to format the text — independent of whether buttons for these tags are available in the toolbar. If the text format is set to <em>limit the use of HTML tags</em>, then all excluded tags will be stripped out of the HTML source when the user toggles back to the text editor.') . '</dd>';
+      $output .= '<dt>' . t('Check my spelling as I type') . '</dt>';
+      $output .= '<dd>' . t('By default, CKEditor is configured to leverage your browser\'s spell check capability. Make sure your browser\'s spell checker is enabled in your browser\'s settings. To access suggested corrections for misspelled words, it may be necessary to hold the <em>Control</em> or <em>command</em> (Mac) key while right-clicking the misspelling.') . '</dd>';
       $output .= '<dt>' . t('Accessibility features') . '</dt>';
       $output .= '<dd>' . t('The built in WYSIWYG editor (CKEditor) comes with a number of <a href=":features">accessibility features</a>. CKEditor comes with built in <a href=":shortcuts">keyboard shortcuts</a>, which can be beneficial for both power users and keyboard only users.', array(':features' => 'http://docs.ckeditor.com/#!/guide/dev_a11y', ':shortcuts' => 'http://docs.ckeditor.com/#!/guide/dev_shortcuts')) . '</dd>';
       $output .= '<dt>' . t('Generating accessible content') . '</dt>';
@@ -62,13 +64,6 @@ function ckeditor_ckeditor_css_alter(array &$css, Editor $editor) {
   if ($editor->getFilterFormat()->filters('filter_caption')->status) {
     $css[] = drupal_get_path('module', 'filter') . '/css/filter.caption.css';
   }
-
-  // Add the filter caption CSS if the text format associated with this text
-  // editor uses the filter_align filter. This is used by the included
-  // CKEditor DrupalImageCaption plugin.
-  if ($editor->getFilterFormat()->filters('filter_align')->status) {
-    $css[] = drupal_get_path('module', 'ckeditor') . '/css/plugins/drupalimagecaption/ckeditor.drupalimagecaption.css';
-  }
 }
 
 /**
@@ -100,3 +95,15 @@ function _ckeditor_theme_css($theme = NULL) {
   }
   return $css;
 }
+
+/**
+ * Implements hook_library_info_alter().
+ */
+function ckeditor_library_info_alter(&$libraries, $extension) {
+  // Pass Drupal's JS cache-busting string via settings along to CKEditor.
+  // @see http://docs.ckeditor.com/#!/api/CKEDITOR-property-timestamp
+  if ($extension === 'ckeditor' && isset($libraries['drupal.ckeditor'])) {
+    $query_string = \Drupal::state()->get('system.css_js_query_string') ?: '0';
+    $libraries['drupal.ckeditor']['drupalSettings']['ckeditor']['timestamp'] = $query_string;
+  }
+}
diff --git a/core/modules/ckeditor/config/schema/ckeditor.schema.yml b/core/modules/ckeditor/config/schema/ckeditor.schema.yml
index f38d2f6..6bafb0d 100644
--- a/core/modules/ckeditor/config/schema/ckeditor.schema.yml
+++ b/core/modules/ckeditor/config/schema/ckeditor.schema.yml
@@ -33,6 +33,15 @@ editor.settings.ckeditor:
       sequence:
         type: ckeditor.plugin.[%key]
 
+# Plugin \Drupal\ckeditor\Plugin\CKEditorPlugin\Language
+ckeditor.plugin.language:
+  type: mapping
+  label: 'Language'
+  mapping:
+    language_list:
+      type: string
+      label: 'Language list ID'
+
 # Plugin \Drupal\ckeditor\Plugin\ckeditor\plugin\StylesCombo
 ckeditor.plugin.stylescombo:
   type: mapping
diff --git a/core/modules/ckeditor/css/plugins/language/ckeditor.language.css b/core/modules/ckeditor/css/plugins/language/ckeditor.language.css
new file mode 100644
index 0000000..feea125
--- /dev/null
+++ b/core/modules/ckeditor/css/plugins/language/ckeditor.language.css
@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Language: add styling for elements that have a language attribute.
+ */
+
+/**
+ * Show the user that a 'lang' tag has been applied by adding a thin dotted
+ * border. We also append the value of the tag between brackets, for example:
+ * '(en)'. Since the html element has a 'lang' attribute too we only target
+ * elements within the html scope.
+ */
+html [lang] {
+  outline: 1px dotted gray;
+}
+html [lang]:after {
+  content: " ("attr(lang)")";
+  font-size: 10px;
+  color: #666;
+}
diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js
index 7adc9b1..27f80b9 100644
--- a/core/modules/ckeditor/js/ckeditor.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.admin.js
@@ -3,7 +3,7 @@
  * CKEditor button and group configuration user interface.
  */
 
-(function ($, Drupal, _, CKEDITOR) {
+(function ($, Drupal, drupalSettings, _) {
 
   'use strict';
 
@@ -496,4 +496,4 @@
     return '<li class="ckeditor-add-new-group"><button role="button" aria-label="' + Drupal.t('Add a CKEditor button group to the end of this row.') + '">' + Drupal.t('Add group') + '</button></li>';
   };
 
-})(jQuery, Drupal, _, CKEDITOR);
+})(jQuery, Drupal, drupalSettings, _);
diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js
index 313621f..497393f 100644
--- a/core/modules/ckeditor/js/ckeditor.js
+++ b/core/modules/ckeditor/js/ckeditor.js
@@ -273,4 +273,7 @@
     }
   });
 
+  // Set the CKEditor cache-busting string to the same value as Drupal.
+  CKEDITOR.timestamp = drupalSettings.ckeditor.timestamp;
+
 })(Drupal, Drupal.debounce, CKEDITOR, jQuery);
diff --git a/core/modules/ckeditor/js/ckeditor.language.admin.js b/core/modules/ckeditor/js/ckeditor.language.admin.js
new file mode 100644
index 0000000..1b9b5a6
--- /dev/null
+++ b/core/modules/ckeditor/js/ckeditor.language.admin.js
@@ -0,0 +1,16 @@
+(function ($, Drupal) {
+
+  'use strict';
+
+  /**
+   * Provides the summary for the "language" plugin settings vertical tab.
+   */
+  Drupal.behaviors.ckeditorLanguageSettingsSummary = {
+    attach: function () {
+      $('#edit-editor-settings-plugins-language').drupalSetSummary(function (context) {
+        return $('#edit-editor-settings-plugins-language-language-list-type option:selected').text();
+      });
+    }
+  };
+
+})(jQuery, Drupal);
diff --git a/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js b/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
index 5b8ad4a..c425dbb 100644
--- a/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
@@ -3,7 +3,7 @@
  * CKEditor StylesCombo admin behavior.
  */
 
-(function ($, Drupal, drupalSettings) {
+(function ($, Drupal, drupalSettings, _) {
 
   'use strict';
 
@@ -125,4 +125,4 @@
     }
   };
 
-})(jQuery, Drupal, drupalSettings);
+})(jQuery, Drupal, drupalSettings, _);
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/icons/drupalimage.png b/core/modules/ckeditor/js/plugins/drupalimage/icons/drupalimage.png
new file mode 100644
index 0000000..83cd553
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupalimage/icons/drupalimage.png
@@ -0,0 +1,7 @@
+�PNG
+
+
IHDR(-S�PLTE������ZZZ```
+
+
+			������&&&"""###%%%)))***---666888999;;;<<<>>>@@@AAABBBDDDGGGIIIJJJKKKLLLNNNOOOPPPQQQRRRUUUYYYw�� tRNS
+!*LPU`tv~�������������������=K�IDAT��W�`��W���*�2KV���G��]y�O���H�jZ�e��3�b��O��
��xt@�+��&0
R����Պ�
�X{]Of���b
�pٻy���t<og��۸��u۶WC@C׾=
t)�7O�Sw:zIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/icons/hidpi/drupalimage.png b/core/modules/ckeditor/js/plugins/drupalimage/icons/hidpi/drupalimage.png
new file mode 100644
index 0000000..63e115d
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupalimage/icons/hidpi/drupalimage.png
@@ -0,0 +1,8 @@
+�PNG
+
+
IHDR  szz�NIDATx^�WQL[e>��m��--k��딍V�N愕	[ η�a�fK|�ك��,1���f��ی:��a�.[fⓏ�A1��Y��F��m{=�ퟛ�4�HV������o�w�w����u|��Oب��#���u�+��(��*)L^cz���N�E*�Jd�����fÙZ���Mz�������"��P�vO��W�f�^��3g��ȱg�t	���OȚ2�v:��Jgʑ��m؁,kk���~�w��98>2R*9'��ѩ�E���S�
p��<����l6�ܾ-J�BөSv"z�G�����W��kY)�P ����۩5 �f+�KX���1�pz���Z��\���"�癙����SS8|=+��vۮ���C��5���@��t��QR�T*E,,���\��;����mw�� f������V�Dؙ��X��Ɏ��*x,
+�L$�X__�t:��w�jdـ;���lV�[
(<T�̐k�Y+�	�M!#���L�>�?q�����Y<cm����*rK�mh@�a�k2ZOU
+L���q#b\~�…�y���4)�ݎ�RE�s�)
+���}���蓓����HYV�T�T���6��Rn�+��X��U�#�P8L��;�
'��hD$�����g�����5P�6�/�4l��-s����iט��C�G��"�Foj���boh�ztx8��n�xy�cV�7}z���G��.O�.(��
�%ƙus�#za�~��b�Q���G
+`F��LeB�׶����a�7�%������.�EQ�	�3�@��9M&��<γ�K�KK���`� �q���<8�gG�,7���1�J5w��kP����hŢY�Je� y�<l�����Ⱦ}O�N�/,��@{;=Ϥm�P���DOO��/^��M���B�^O�ѧ���Ð_���Ox������X:��Wx��o��'��'D<�����’hm���xn�����@^q�p���$��������(� ՖV,X`rHo�\3.
9g+�U(��%��\$r��A�w�y.ʑ����"�+!��o(���j����*�e�幗��N�lK�P���cG�{���c����	����4)�v�^GG���G-�HH�l�PP�p����b�s]��ʁ��9�ىg���T+a��F$��=N'�]�@`"���*��Pf��<%��İ6��Q|��Roww\��_#���#'J�g� �W����7^���,�k�ן56p��׆\�<��l��ܻu�ʳF����8�M�7o�܍��2�	n���o�6�	nn6����'���k
+�z�����.+�B^c'�y�H}����IEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/image.png b/core/modules/ckeditor/js/plugins/drupalimage/image.png
deleted file mode 100644
index 83cd553..0000000
--- a/core/modules/ckeditor/js/plugins/drupalimage/image.png
+++ /dev/null
@@ -1,7 +0,0 @@
-�PNG
-
-
IHDR(-S�PLTE������ZZZ```
-
-
-			������&&&"""###%%%)))***---666888999;;;<<<>>>@@@AAABBBDDDGGGIIIJJJKKKLLLNNNOOOPPPQQQRRRUUUYYYw�� tRNS
-!*LPU`tv~�������������������=K�IDAT��W�`��W���*�2KV���G��]y�O���H�jZ�e��3�b��O��
��xt@�+��&0
R����Պ�
�X{]Of���b
�pٻy���t<og��۸��u۶WC@C׾=
t)�7O�Sw:zIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
index 50aad67..0025664 100644
--- a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
@@ -19,6 +19,8 @@
 
   CKEDITOR.plugins.add('drupalimage', {
     requires: 'image2',
+    icons: 'drupalimage',
+    hidpi: true,
 
     beforeInit: function (editor) {
       // Override the image2 widget definition to require and handle the
@@ -216,7 +218,7 @@
           // discovered.
           // @see plugins/image2/plugin.js/init() in CKEditor; this is similar.
           if (this.parts.link) {
-            this.setData('link', CKEDITOR.plugins.link.parseLinkAttributes(editor, this.parts.link));
+            this.setData('link', CKEDITOR.plugins.image2.getLinkAttributesParser()(editor, this.parts.link));
           }
         };
       });
@@ -270,8 +272,7 @@
         editor.ui.addButton('DrupalImage', {
           label: Drupal.t('Image'),
           // Note that we use the original image2 command!
-          command: 'image',
-          icon: this.path + '/image.png'
+          command: 'image'
         });
       }
     },
@@ -282,6 +283,15 @@
 
   });
 
+  // Override image2's integration with the official CKEditor link plugin:
+  // integrate with the drupallink plugin instead.
+  CKEDITOR.plugins.image2.getLinkAttributesParser = function () {
+    return CKEDITOR.plugins.drupallink.parseLinkAttributes;
+  };
+  CKEDITOR.plugins.image2.getLinkAttributesGetter = function () {
+    return CKEDITOR.plugins.drupallink.getLinkAttributes;
+  };
+
   /**
    * Integrates the drupalimage widget with the drupallink plugin.
    *
diff --git a/core/modules/ckeditor/js/plugins/drupallink/icons/drupallink.png b/core/modules/ckeditor/js/plugins/drupallink/icons/drupallink.png
new file mode 100644
index 0000000..54e506a
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupallink/icons/drupallink.png
@@ -0,0 +1,3 @@
+�PNG
+
+
IHDR(-SlPLTE���������������������XXX]]]���PPPPPP������������������������������#tRNS68abcd������������������������g���hIDATxڭ�G�0� ��{Z��dD��k���WiILi�2�u��Ա*]�x�����y2lބ����{m�6Ǫ��:`�ᘦ���R���	2$�:WYzIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupallink/icons/drupalunlink.png b/core/modules/ckeditor/js/plugins/drupallink/icons/drupalunlink.png
new file mode 100644
index 0000000..64056ad
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupallink/icons/drupalunlink.png
@@ -0,0 +1,7 @@
+�PNG
+
+
IHDR��7��IDAT(�c`��!��4�0l`���NEY!
+�/������ ����/���韫�N@��!�贈����������ïg��w!
+�0�I������������w/���c`��9�����s���{`�����2<f�	�!����	��M͏��chfx,��B#D
����硶g�g�����������E
+�� m����a6e���/�_�;
+�0��,C�3���7��F�W-�%��
t˺���A�SL�2�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupallink.png b/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupallink.png
new file mode 100644
index 0000000..e9f60c5
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupallink.png
@@ -0,0 +1,6 @@
+�PNG
+
+
IHDR  D���
�PLTEԨ�222ۭ�ӥ�ܮ�緷ڬ�!!!թ����ӧ�...ȏ����������ʓ����׫����̗�HJJ������鸸Ӥ�///���EGG'**������ҥ����ը�<??���ث�BBB122���깹JJJ���___SVVڭ�@@@NNN�����Ɣ��TTT8;;PQQ999���۬�������333DGG111MPP���&++���.11LMM		 &&BCCRRR������-99/88����<>>@DD���'229;;ש�殮BFFԦ�נ�-99   ������166$$$AAALLL255Η�͘����EHHDDD'//���.//٫�NJ����&&&ɒ����666GJJ���Р�������pppϞ����П����"""			Ӧ�677WWWϝ����FFF(44ݯ����ʒ�!!������Ҥ�ݮ��������������tRNS���b���
�a
������������������������������������������������Z���������������������������������������[�����R
�IDATx^��U[Q����ݨw!����������Jeh��P��{�͙�9��r�>M,�
+}����		8]�R	�=�����R�-��&�E�`�/���2�!J�dxL&[�(�NM]�����-��:��2��,^�p�j�����P

+�UU���HFmdd-[����*]8<ϰ�Krb��b��e��
=.9���9I��Il���OK�Cq@C/9�M��م<^�M"��x�ُ�M�9/CP�S��CuM�A]M��[�S9�\eè;��������1�=ڠ�����\:����s���֡��Rs�`��Ȁ@ ��OL��ƨn��o^���ɬ��%���p��59���}+����
�������F�~qu���S��]'���� л�{�)+`�F�����W���I�ݜ�}uyq�6Nc ޑ����
+zo�[�#�N�F����//s�g�Qz�
;�(ֿ1��{���u���8�G@���_��4���k0TIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupalunlink.png b/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupalunlink.png
new file mode 100644
index 0000000..a000713
--- /dev/null
+++ b/core/modules/ckeditor/js/plugins/drupallink/icons/hidpi/drupalunlink.png
@@ -0,0 +1,9 @@
+�PNG
+
+
IHDR  szz�?IDATX��VYOUW޴�`��{��\�A.�D�0�� 2�5��&$틏M��>�ZTT�Ί3�h�ZP@�2�pi4&)Q�X-����܋X
�<؇��w�s�Z�w�Z{�#�����
�M
�ĉc�@���2ZN�wϜm�������w`��	�[G=W#c��\���;�O��K�ij7�VU5��7ŋ��� +*D_i����e�yo,[ư�clr��*b����Hh

��
+8�rdjf� 8�����1m�A.��$Te!7�)S��||d���2f�b�� c��e,汖�+�q�\i!�����Ŏ>�f�bL�&��In��A,
�}8mZqbr����y���_�iZ�6�HMK�
��
+��g���X���� 9ɭ��y�-IJ�.�ӝ	��ی���dϘ�Mr����g��\��S�'/_.���`ܑ����5��v�ҥ2==]��	j�������-��"��ex�*�����7�p�ceHH��G.���ePP�P����~~~���W�s޳>�-}���Ř�������T)�O��k�N���/����h�ѱ�������;�/r/gyx�^c��C�(ȿ���Nw��������A��`�JJ�?�.���---�,���H��`�{�6��\�wvzt�����*� �30�3
+o����$<��� j��Z�֮\Z1\�
��y ȣ��.^��x �ŏ;v��/(f6"���
+P�d	�VkMM�����ٹ���M�������0�aaa܂=�ǫ��H�<P"NN&YFR������|
�[Mǎ��u �Yyy��P0vz=;�j����t���߯Ŵ���9	>�3g ǫq��_�?��z{��\g��
+J����Y��&?T3�gZz��1�����k���a_0��b�J����u��"H����S�@����b�5��	��h<rD���I
\�^'g�:.�[�~ +77���!�KII�oos\\�LMM����
��r���˾~6vAJJ��BQ���u��~4R�G���]�(�(
$G��ٳ�mmm��z��K�t�c;;9��n[��ݳ\\̋-Rd�q�\
+�t]Ճ�}s;?_q�F(�G
+nn٢��E�یA�xk�6��-K����a��
�*R�STLL��|�A����x&sR�o�U��%?��VN�`��a?������O�q�p%xNDFF֍&�ںU�t�*B˗	E���/L�����E�W�<7a�U�P�����񩇧g�p����D�������k�擼�g��MHE
Ҁ�o7��}�MF���v7���hu�\��۫�N���Wю��k��Wq�ɓ�!�kxh�l7l5��pB�3�
�)�1�zG�g�������������c|�7��<t�а0k��{����m:]��}�S���h2����(�Hw7��U�ht�;Xw�����m��յ�s���hF
��@�ig~~9�������W����1=��o�<�.�y�.x4�����!�*`Ȳ=y�M�V^��ܼy��.��~���61l���I�
�!y��
�v�^q��a��k��+�_EV���?����+�XIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupallink/link.png b/core/modules/ckeditor/js/plugins/drupallink/link.png
deleted file mode 100644
index 54e506a..0000000
--- a/core/modules/ckeditor/js/plugins/drupallink/link.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR(-SlPLTE���������������������XXX]]]���PPPPPP������������������������������#tRNS68abcd������������������������g���hIDATxڭ�G�0� ��{Z��dD��k���WiILi�2�u��Ա*]�x�����y2lބ����{m�6Ǫ��:`�ᘦ���R���	2$�:WYzIEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/plugins/drupallink/plugin.js b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
index edef908..ff64f88 100644
--- a/core/modules/ckeditor/js/plugins/drupallink/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupallink/plugin.js
@@ -9,7 +9,7 @@
 
   'use strict';
 
-  function parseAttributes(element) {
+  function parseAttributes(editor, element) {
     var parsedAttributes = {};
 
     var domElement = element.$;
@@ -35,7 +35,36 @@
     return parsedAttributes;
   }
 
+  function getAttributes(editor, data) {
+    var set = {};
+    for (var attributeName in data) {
+      if (data.hasOwnProperty(attributeName)) {
+        set[attributeName] = data[attributeName];
+      }
+    }
+
+    // CKEditor tracks the *actual* saved href in a data-cke-saved-* attribute
+    // to work around browser quirks. We need to update it.
+    set['data-cke-saved-href'] = set.href;
+
+    // Remove all attributes which are not currently set.
+    var removed = {};
+    for (var s in set) {
+      if (set.hasOwnProperty(s)) {
+        delete removed[s];
+      }
+    }
+
+    return {
+      set: set,
+      removed: CKEDITOR.tools.objectKeys(removed)
+    };
+  }
+
   CKEDITOR.plugins.add('drupallink', {
+    icons: 'drupallink,drupalunlink',
+    hidpi: true,
+
     init: function (editor) {
       // Add the commands for link and unlink.
       editor.addCommand('drupallink', {
@@ -63,7 +92,7 @@
           // Set existing values based on selected element.
           var existingValues = {};
           if (linkElement && linkElement.$) {
-            existingValues = parseAttributes(linkElement);
+            existingValues = parseAttributes(editor, linkElement);
           }
           // Or, if an image widget is focused, we're editing a link wrapping
           // an image widget.
@@ -169,13 +198,11 @@
       if (editor.ui.addButton) {
         editor.ui.addButton('DrupalLink', {
           label: Drupal.t('Link'),
-          command: 'drupallink',
-          icon: this.path + '/link.png'
+          command: 'drupallink'
         });
         editor.ui.addButton('DrupalUnlink', {
           label: Drupal.t('Unlink'),
-          command: 'drupalunlink',
-          icon: this.path + '/unlink.png'
+          command: 'drupalunlink'
         });
       }
 
@@ -266,47 +293,12 @@
     return null;
   }
 
-  /**
-   * The image2 plugin is currently tightly coupled to the link plugin: it
-   * calls CKEDITOR.plugins.link.parseLinkAttributes().
-   *
-   * Drupal 8's CKEditor build doesn't include the 'link' plugin. Because it
-   * includes its own link plugin that integrates with Drupal's dialog system.
-   * So, to allow images to be linked, we need to duplicate the necessary subset
-   * of the logic.
-   *
-   * @todo Remove once we update to CKEditor 4.5.5.
-   * @see https://dev.ckeditor.com/ticket/13885
-   */
-  CKEDITOR.plugins.link = CKEDITOR.plugins.link || {
-    parseLinkAttributes: function (editor, element) {
-      return parseAttributes(element);
-    },
-    getLinkAttributes: function (editor, data) {
-      var set = {};
-      for (var attributeName in data) {
-        if (data.hasOwnProperty(attributeName)) {
-          set[attributeName] = data[attributeName];
-        }
-      }
-
-      // CKEditor tracks the *actual* saved href in a data-cke-saved-* attribute
-      // to work around browser quirks. We need to update it.
-      set['data-cke-saved-href'] = set.href;
-
-      // Remove all attributes which are not currently set.
-      var removed = {};
-      for (var s in set) {
-        if (set.hasOwnProperty(s)) {
-          delete removed[s];
-        }
-      }
-
-      return {
-        set: set,
-        removed: CKEDITOR.tools.objectKeys(removed)
-      };
-    }
+  // Expose an API for other plugins to interact with drupallink widgets.
+  // (Compatible with the official CKEditor link plugin's API:
+  // http://dev.ckeditor.com/ticket/13885.)
+  CKEDITOR.plugins.drupallink = {
+    parseLinkAttributes: parseAttributes,
+    getLinkAttributes: getAttributes
   };
 
 })(jQuery, Drupal, drupalSettings, CKEDITOR);
diff --git a/core/modules/ckeditor/js/plugins/drupallink/unlink.png b/core/modules/ckeditor/js/plugins/drupallink/unlink.png
deleted file mode 100644
index 64056ad..0000000
--- a/core/modules/ckeditor/js/plugins/drupallink/unlink.png
+++ /dev/null
@@ -1,7 +0,0 @@
-�PNG
-
-
IHDR��7��IDAT(�c`��!��4�0l`���NEY!
-�/������ ����/���韫�N@��!�贈����������ïg��w!
-�0�I������������w/���c`��9�����s���{`�����2<f�	�!����	��M͏��chfx,��B#D
����硶g�g�����������E
-�� m����a6e���/�_�;
-�0��,C�3���7��F�W-�%��
t˺���A�SL�2�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/ckeditor/js/views/ControllerView.js b/core/modules/ckeditor/js/views/ControllerView.js
index 8d215a1..e6cbe24 100644
--- a/core/modules/ckeditor/js/views/ControllerView.js
+++ b/core/modules/ckeditor/js/views/ControllerView.js
@@ -3,7 +3,7 @@
  * A Backbone View acting as a controller for CKEditor toolbar configuration.
  */
 
-(function (Drupal, Backbone, $) {
+(function ($, Drupal, Backbone, CKEDITOR, _) {
 
   'use strict';
 
@@ -380,4 +380,4 @@
     }
   });
 
-})(Drupal, Backbone, jQuery);
+})(jQuery, Drupal, Backbone, CKEDITOR, _);
diff --git a/core/modules/ckeditor/js/views/KeyboardView.js b/core/modules/ckeditor/js/views/KeyboardView.js
index 27d6c88..9f2ab5b 100644
--- a/core/modules/ckeditor/js/views/KeyboardView.js
+++ b/core/modules/ckeditor/js/views/KeyboardView.js
@@ -3,7 +3,7 @@
  * Backbone View providing the aural view of CKEditor keyboard UX configuration.
  */
 
-(function (Drupal, Backbone, $) {
+(function ($, Drupal, Backbone, _) {
 
   'use strict';
 
@@ -263,4 +263,4 @@
     }
   });
 
-})(Drupal, Backbone, jQuery);
+})(jQuery, Drupal, Backbone, _);
diff --git a/core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php b/core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php
index 494e345..85586f3 100644
--- a/core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php
+++ b/core/modules/ckeditor/src/CKEditorPluginButtonsInterface.php
@@ -23,6 +23,7 @@
  * @see \Drupal\ckeditor\CKEditorPluginInterface
  * @see \Drupal\ckeditor\CKEditorPluginContextualInterface
  * @see \Drupal\ckeditor\CKEditorPluginConfigurableInterface
+ * @see \Drupal\ckeditor\CKEditorPluginCssInterface
  * @see \Drupal\ckeditor\CKEditorPluginBase
  * @see \Drupal\ckeditor\CKEditorPluginManager
  * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
diff --git a/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php b/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php
index 0ced0c1..c0f7b46 100644
--- a/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php
+++ b/core/modules/ckeditor/src/CKEditorPluginConfigurableInterface.php
@@ -20,6 +20,7 @@
  * @see \Drupal\ckeditor\CKEditorPluginInterface
  * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface
  * @see \Drupal\ckeditor\CKEditorPluginContextualInterface
+ * @see \Drupal\ckeditor\CKEditorPluginCssInterface
  * @see \Drupal\ckeditor\CKEditorPluginBase
  * @see \Drupal\ckeditor\CKEditorPluginManager
  * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
diff --git a/core/modules/ckeditor/src/CKEditorPluginContextualInterface.php b/core/modules/ckeditor/src/CKEditorPluginContextualInterface.php
index 5bd397f..82354e4 100644
--- a/core/modules/ckeditor/src/CKEditorPluginContextualInterface.php
+++ b/core/modules/ckeditor/src/CKEditorPluginContextualInterface.php
@@ -24,6 +24,7 @@
  * @see \Drupal\ckeditor\CKEditorPluginInterface
  * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface
  * @see \Drupal\ckeditor\CKEditorPluginConfigurableInterface
+ * @see \Drupal\ckeditor\CKEditorPluginCssInterface
  * @see \Drupal\ckeditor\CKEditorPluginBase
  * @see \Drupal\ckeditor\CKEditorPluginManager
  * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
diff --git a/core/modules/ckeditor/src/CKEditorPluginCssInterface.php b/core/modules/ckeditor/src/CKEditorPluginCssInterface.php
new file mode 100644
index 0000000..0ee181f
--- /dev/null
+++ b/core/modules/ckeditor/src/CKEditorPluginCssInterface.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ckeditor\CKEditorPluginCssInterface.
+ */
+
+namespace Drupal\ckeditor;
+
+use Drupal\editor\Entity\Editor;
+
+/**
+ * Defines an interface for CKEditor plugins with associated CSS.
+ *
+ * This allows a CKEditor plugin to add additional CSS in iframe CKEditor
+ * instances without needing to implement hook_ckeditor_css_alter().
+ *
+ * @see \Drupal\ckeditor\CKEditorPluginInterface
+ * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface
+ * @see \Drupal\ckeditor\CKEditorPluginContextualInterface
+ * @see \Drupal\ckeditor\CKEditorPluginConfigurableInterface
+ * @see \Drupal\ckeditor\CKEditorPluginBase
+ * @see \Drupal\ckeditor\CKEditorPluginManager
+ * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
+ * @see plugin_api
+ */
+interface CKEditorPluginCssInterface extends CKEditorPluginInterface {
+
+  /**
+   * Retrieves enabled plugins' iframe instance CSS files.
+   *
+   * Note: this does not use a Drupal asset library because this CSS will be
+   * loaded by CKEditor, not by Drupal.
+   *
+   * @param \Drupal\editor\Entity\Editor $editor
+   *   A configured text editor object.
+   *
+   * @return string[]
+   *   An array of CSS files. This is a flat list of file paths relative to
+   *   the Drupal root.
+   */
+  public function getCssFiles(Editor $editor);
+
+}
diff --git a/core/modules/ckeditor/src/CKEditorPluginInterface.php b/core/modules/ckeditor/src/CKEditorPluginInterface.php
index ef0acd4..3a0a6d8 100644
--- a/core/modules/ckeditor/src/CKEditorPluginInterface.php
+++ b/core/modules/ckeditor/src/CKEditorPluginInterface.php
@@ -28,6 +28,7 @@
  * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface
  * @see \Drupal\ckeditor\CKEditorPluginContextualInterface
  * @see \Drupal\ckeditor\CKEditorPluginConfigurableInterface
+ * @see \Drupal\ckeditor\CKEditorPluginCssInterface
  * @see \Drupal\ckeditor\CKEditorPluginBase
  * @see \Drupal\ckeditor\CKEditorPluginManager
  * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
diff --git a/core/modules/ckeditor/src/CKEditorPluginManager.php b/core/modules/ckeditor/src/CKEditorPluginManager.php
index 07d811f..514ae84 100644
--- a/core/modules/ckeditor/src/CKEditorPluginManager.php
+++ b/core/modules/ckeditor/src/CKEditorPluginManager.php
@@ -21,6 +21,7 @@
  * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface
  * @see \Drupal\ckeditor\CKEditorPluginContextualInterface
  * @see \Drupal\ckeditor\CKEditorPluginConfigurableInterface
+ * @see \Drupal\ckeditor\CKEditorPluginCssInterface
  * @see \Drupal\ckeditor\CKEditorPluginBase
  * @see \Drupal\ckeditor\Annotation\CKEditorPlugin
  * @see plugin_api
@@ -71,15 +72,7 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
    */
   public function getEnabledPluginFiles(Editor $editor, $include_internal_plugins = FALSE) {
     $plugins = array_keys($this->getDefinitions());
-    // Flatten each row.
-    $toolbar_rows = array();
-    $settings = $editor->getSettings();
-    foreach ($settings['toolbar']['rows'] as $row_number => $row) {
-      $toolbar_rows[] = array_reduce($settings['toolbar']['rows'][$row_number], function (&$result, $button_group) {
-        return array_merge($result, $button_group['items']);
-      }, array());
-    }
-    $toolbar_buttons = array_unique(NestedArray::mergeDeepArray($toolbar_rows));
+    $toolbar_buttons = $this->getEnabledButtons($editor);
     $enabled_plugins = array();
     $additional_plugins = array();
 
@@ -121,13 +114,33 @@ public function getEnabledPluginFiles(Editor $editor, $include_internal_plugins
   }
 
   /**
+   * Gets the enabled toolbar buttons in the given text editor instance.
+   *
+   * @param \Drupal\editor\Entity\Editor $editor
+   *   A configured text editor object.
+   *
+   * @return string[]
+   *   A list of the toolbar buttons enabled in the given text editor instance.
+   */
+  public static function getEnabledButtons(Editor $editor) {
+    $toolbar_rows = [];
+    $settings = $editor->getSettings();
+    foreach ($settings['toolbar']['rows'] as $row_number => $row) {
+      $toolbar_rows[] = array_reduce($settings['toolbar']['rows'][$row_number], function (&$result, $button_group) {
+        return array_merge($result, $button_group['items']);
+      }, []);
+    }
+    return array_unique(NestedArray::mergeDeepArray($toolbar_rows));
+  }
+
+  /**
    * Retrieves all available CKEditor buttons, keyed by plugin ID.
    *
    * @return array
    *   All available CKEditor buttons, with plugin IDs as keys and button
    *   metadata (as implemented by getButtons()) as values.
    *
-   * @see CKEditorPluginButtonsInterface::getButtons()
+   * @see \Drupal\ckeditor\CKEditorPluginButtonsInterface::getButtons()
    */
   public function getButtons() {
     $plugins = array_keys($this->getDefinitions());
@@ -182,4 +195,32 @@ public function injectPluginSettingsForm(array &$form, FormStateInterface $form_
       }
     }
   }
+
+  /**
+   * Retrieves enabled plugins' iframe instance CSS files, keyed by plugin ID.
+   *
+   * @param \Drupal\editor\Entity\Editor $editor
+   *   A configured text editor object.
+   *
+   * @return string[]
+   *   Enabled plugins CKEditor CSS files, with plugin IDs as keys and CSS file
+   *   paths relative to the Drupal root (as implemented by getCssFiles()) as
+   *   values.
+   *
+   * @see \Drupal\ckeditor\CKEditorPluginCssInterface::getCssFiles()
+   */
+  public function getCssFiles(Editor $editor) {
+    $enabled_plugins = array_keys($this->getEnabledPluginFiles($editor, TRUE));
+    $css_files = array();
+
+    foreach ($enabled_plugins as $plugin_id) {
+      $plugin = $this->createInstance($plugin_id);
+      if ($plugin instanceof CKEditorPluginCssInterface) {
+        $css_files[$plugin_id] = $plugin->getCssFiles($editor);
+      }
+    }
+
+    return $css_files;
+  }
+
 }
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
index 080c017..d3c4140 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
@@ -56,7 +56,7 @@ public function getButtons() {
     return array(
       'DrupalImage' => array(
         'label' => t('Image'),
-        'image' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/image.png',
+        'image' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/icons/drupalimage.png',
       ),
     );
   }
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
index f78869b..1cb885a 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImageCaption.php
@@ -11,6 +11,7 @@
 use Drupal\editor\Entity\Editor;
 use Drupal\ckeditor\CKEditorPluginInterface;
 use Drupal\ckeditor\CKEditorPluginContextualInterface;
+use Drupal\ckeditor\CKEditorPluginCssInterface;
 
 /**
  * Defines the "drupalimagecaption" plugin.
@@ -21,7 +22,7 @@
  *   module = "ckeditor"
  * )
  */
-class DrupalImageCaption extends PluginBase implements CKEditorPluginInterface, CKEditorPluginContextualInterface {
+class DrupalImageCaption extends PluginBase implements CKEditorPluginInterface, CKEditorPluginContextualInterface, CKEditorPluginCssInterface {
 
   /**
    * {@inheritdoc}
@@ -72,6 +73,15 @@ public function getConfig(Editor $editor) {
   /**
    * {@inheritdoc}
    */
+  public function getCssFiles(Editor $editor) {
+    return array(
+      drupal_get_path('module', 'ckeditor') . '/css/plugins/drupalimagecaption/ckeditor.drupalimagecaption.css'
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   function isEnabled(Editor $editor) {
     if (!$editor->hasAssociatedFilterFormat()) {
       return FALSE;
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
index dbfc07f..64cf4a3 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalLink.php
@@ -55,11 +55,11 @@ public function getButtons() {
     return array(
       'DrupalLink' => array(
         'label' => t('Link'),
-        'image' => $path . '/link.png',
+        'image' => $path . '/icons/drupallink.png',
       ),
       'DrupalUnlink' => array(
         'label' => t('Unlink'),
-        'image' => $path . '/unlink.png',
+        'image' => $path . '/icons/drupalunlink.png',
       ),
     );
   }
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
index 2dbb4b1..ecaff54 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php
@@ -100,6 +100,7 @@ public function getConfig(Editor $editor) {
       'resize_dir' => 'vertical',
       'justifyClasses' => array('text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'),
       'entities' => FALSE,
+      'disableNativeSpellChecker' => FALSE,
     );
 
     // Add the allowedContent setting, which ensures CKEditor only allows tags
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
new file mode 100644
index 0000000..090a954
--- /dev/null
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Language.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ckeditor\Plugin\CKEditorPlugin\Language.
+ */
+
+namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
+
+use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
+use Drupal\ckeditor\CKEditorPluginCssInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Language\LanguageManager;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\editor\Entity\Editor;
+
+/**
+ * Defines the "language" plugin.
+ *
+ * @CKEditorPlugin(
+ *   id = "language",
+ *   label = @Translation("Language")
+ * )
+ */
+class Language extends CKEditorPluginBase implements CKEditorPluginConfigurableInterface, CKEditorPluginCssInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isInternal() {
+    return TRUE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFile() {
+    // This plugin is already part of Drupal core's CKEditor build.
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getLibraries(Editor $editor) {
+    return ['ckeditor/drupal.ckeditor.plugins.language'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfig(Editor $editor) {
+    $language_list = [];
+    $config = ['language_list' => 'un'];
+    $settings = $editor->getSettings();
+    if (isset($settings['plugins']['language'])) {
+      $config = $settings['plugins']['language'];
+    }
+
+    $predefined_languages = ($config['language_list'] === 'all') ?
+      LanguageManager::getStandardLanguageList() :
+      LanguageManager::getUnitedNationsLanguageList();
+
+    // Generate the language_list setting as expected by the CKEditor Language
+    // plugin, but key the values by the full language name so that we can sort
+    // them later on.
+    foreach ($predefined_languages as $langcode => $language) {
+      $english_name = $language[0];
+      $direction = empty($language[2]) ? NULL : $language[2];
+      if ($direction === LanguageInterface::DIRECTION_RTL) {
+        $language_list[$english_name] = $langcode . ':' . $english_name . ':rtl';
+      }
+      else {
+        $language_list[$english_name] = $langcode . ':' . $english_name;
+      }
+    }
+
+    // Sort on full language name.
+    ksort($language_list);
+    $config = ['language_list' => array_values($language_list)];
+    return $config;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getButtons() {
+    return [
+      'Language' => [
+        'label' => $this->t('Language'),
+        'image_alternative' => [
+          '#type' => 'inline_template',
+          '#template' => '<a href="#" class="cke-icon-only" role="button" title="' . $this->t('Language') . '" aria-label="' . $this->t('Language') . '"><span class="cke_button_icon cke_button__language_icon">' . $this->t('Language') . '</span></a>',
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
+    // Defaults.
+    $config = ['language_list' => 'un'];
+    $settings = $editor->getSettings();
+    if (isset($settings['plugins']['language'])) {
+      $config = $settings['plugins']['language'];
+    }
+
+    $predefined_languages = LanguageManager::getStandardLanguageList();
+    $form['language_list'] = array(
+      '#title' => $this->t('Language list'),
+      '#title_display' => 'invisible',
+      '#type' => 'select',
+      '#options' => [
+        'un' => $this->t("United Nations' official languages"),
+        'all' => $this->t('All @count languages', ['@count' => count($predefined_languages)]),
+      ],
+      '#default_value' => $config['language_list'],
+      '#description' => $this->t('The list of languages to show in the language dropdown. The basic list will only show the <a href=":url">six official languages of the UN</a>. The extended list will show all @count languages that are available in Drupal.', [
+        ':url' => Url::fromUri('http://www.un.org/en/aboutun/languages.shtml/')->toString(),
+        '@count' => count($predefined_languages),
+      ]),
+      '#attached' => ['library' => ['ckeditor/drupal.ckeditor.language.admin']],
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  function getCssFiles(Editor $editor) {
+    return array(
+        drupal_get_path('module', 'ckeditor') . '/css/plugins/language/ckeditor.language.css'
+    );
+  }
+
+}
diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index f84054c..c19dd46 100644
--- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -15,7 +15,7 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\editor\Plugin\EditorBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\editor\Entity\Editor as EditorEntity;
+use Drupal\editor\Entity\Editor;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -135,14 +135,14 @@ public function getDefaultSettings() {
           ),
         ),
       ),
-      'plugins' => array(),
+      'plugins' => ['language' => ['language_list' => 'un']],
     );
   }
 
   /**
    * {@inheritdoc}
    */
-  public function settingsForm(array $form, FormStateInterface $form_state, EditorEntity $editor) {
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     $settings = $editor->getSettings();
 
     $ckeditor_settings_toolbar = array(
@@ -204,7 +204,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
     }, array());
     // Build a fake Editor object, which we'll use to generate JavaScript
     // settings for this fake Editor instance.
-    $fake_editor = entity_create('editor', array(
+    $fake_editor = Editor::create(array(
       'format' => $editor->id(),
       'editor' => 'ckeditor',
       'settings' => array(
@@ -259,7 +259,7 @@ public function settingsFormSubmit(array $form, FormStateInterface $form_state)
   /**
    * {@inheritdoc}
    */
-  public function getJSSettings(EditorEntity $editor) {
+  public function getJSSettings(Editor $editor) {
     $settings = array();
 
     // Get the settings for all enabled plugins, even the internal ones.
@@ -367,7 +367,7 @@ public function getLangcodes() {
   /**
    * {@inheritdoc}
    */
-  public function getLibraries(EditorEntity $editor) {
+  public function getLibraries(Editor $editor) {
     $libraries = array(
       'ckeditor/drupal.ckeditor',
     );
@@ -393,7 +393,7 @@ public function getLibraries(EditorEntity $editor) {
    * @return array
    *   An array containing the "toolbar" configuration.
    */
-  public function buildToolbarJSSetting(EditorEntity $editor) {
+  public function buildToolbarJSSetting(Editor $editor) {
     $toolbar = array();
 
     $settings = $editor->getSettings();
@@ -416,12 +416,17 @@ public function buildToolbarJSSetting(EditorEntity $editor) {
    * @return array
    *   An array containing the "contentsCss" configuration.
    */
-  public function buildContentsCssJSSetting(EditorEntity $editor) {
+  public function buildContentsCssJSSetting(Editor $editor) {
     $css = array(
       drupal_get_path('module', 'ckeditor') . '/css/ckeditor-iframe.css',
       drupal_get_path('module', 'system') . '/css/components/align.module.css',
     );
     $this->moduleHandler->alter('ckeditor_css', $css, $editor);
+    // Get a list of all enabled plugins' iframe instance CSS files.
+    $plugins_css = array_reduce($this->ckeditorPluginManager->getCssFiles($editor), function($result, $item) {
+      return array_merge($result, array_values($item));
+    }, array());
+    $css = array_merge($css, $plugins_css);
     $css = array_merge($css, _ckeditor_theme_css());
     $css = array_map('file_create_url', $css);
     $css = array_map('file_url_transform_relative', $css);
diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index da06bd4..549dbed 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -11,6 +11,7 @@
 use Drupal\editor\Entity\Editor;
 use Drupal\filter\FilterFormatInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests administration of CKEditor.
@@ -37,7 +38,7 @@ protected function setUp() {
     parent::setUp();
 
     // Create text format.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
@@ -109,7 +110,7 @@ function testExistingFormat() {
           ),
         ),
       ),
-      'plugins' => array(),
+      'plugins' => ['language' => ['language_list' => 'un']],
     );
     $this->assertIdentical($this->castSafeStrings($ckeditor->getDefaultSettings()), $expected_default_settings);
 
@@ -148,7 +149,7 @@ function testExistingFormat() {
     $expected_settings['plugins']['stylescombo']['styles'] = '';
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.');
-    $this->assertIdentical($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
+    $this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
 
     // Configure the Styles plugin, and ensure the updated settings are saved.
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
@@ -159,7 +160,7 @@ function testExistingFormat() {
     $expected_settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.callout|Callout\n\n";
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
-    $this->assertIdentical($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
+    $this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
 
     // Change the buttons that appear on the toolbar (in JavaScript, this is
     // done via drag and drop, but here we can only emulate the end result of
@@ -175,7 +176,7 @@ function testExistingFormat() {
     $this->drupalPostForm(NULL, $edit, t('Save configuration'));
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
-    $this->assertIdentical($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
+    $this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
 
     // Check that the markup we're setting for the toolbar buttons (actually in
     // JavaScript's drupalSettings, and Unicode-escaped) is correctly rendered.
@@ -203,7 +204,7 @@ function testExistingFormat() {
     $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is not checked.');
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
-    $this->assertIdentical($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
+    $this->assertEqual($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.');
 
     // Finally, check the "Ultra llama mode" checkbox.
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
@@ -217,7 +218,7 @@ function testExistingFormat() {
     $expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = TRUE;
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
-    $this->assertIdentical($expected_settings, $editor->getSettings());
+    $this->assertEqual($expected_settings, $editor->getSettings());
   }
 
   /**
@@ -282,7 +283,7 @@ function testNewFormat() {
     $expected_settings['plugins']['stylescombo']['styles'] = '';
     $editor = entity_load('editor', 'amazing_format');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.');
-    $this->assertIdentical($this->castSafeStrings($expected_settings), $this->castSafeStrings($editor->getSettings()), 'The Editor config entity has the correct settings.');
+    $this->assertEqual($this->castSafeStrings($expected_settings), $this->castSafeStrings($editor->getSettings()), 'The Editor config entity has the correct settings.');
   }
 
 }
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index 1081eb9..9aa2ce2 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\ckeditor\Tests;
 
+use Drupal\editor\Entity\Editor;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests loading of CKEditor.
@@ -41,22 +43,22 @@ protected function setUp() {
     parent::setUp();
 
     // Create text format, associate CKEditor.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
       'filters' => array(),
     ));
     $filtered_html_format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'filtered_html',
       'editor' => 'ckeditor',
-    ));
+    ]);
     $editor->save();
 
     // Create a second format without an associated editor so a drop down select
     // list is created when selecting formats.
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -146,6 +148,16 @@ function testLoading() {
     $this->assertIdentical($expected, $this->castSafeStrings($settings['editor']), "Text Editor module's JavaScript settings on the page are correct.");
     $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
     $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.');
+
+    // Assert that CKEditor uses Drupal's cache-busting query string by
+    // comparing the setting sent with the page with the current query string.
+    $settings = $this->getDrupalSettings();
+    $expected = $settings['ckeditor']['timestamp'];
+    $this->assertIdentical($expected, \Drupal::state()->get('system.css_js_query_string'), "CKEditor scripts cache-busting string is correct before flushing all caches.");
+    // Flush all caches then make sure that $settings['ckeditor']['timestamp']
+    // still matches.
+    drupal_flush_all_caches();
+    $this->assertIdentical($expected, \Drupal::state()->get('system.css_js_query_string'), "CKEditor scripts cache-busting string is correct after flushing all caches.");
   }
 
   protected function getThingsToCheck() {
diff --git a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
deleted file mode 100644
index aec8dbb..0000000
--- a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\ckeditor\Tests\CKEditorPluginManagerTest.
- */
-
-namespace Drupal\ckeditor\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests different ways of enabling CKEditor plugins.
- *
- * @group ckeditor
- */
-class CKEditorPluginManagerTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor');
-
-  /**
-   * The manager for "CKEditor plugin" plugins.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $manager;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Install the Filter module.
-    $this->installSchema('system', 'url_alias');
-
-    // Create text format, associate CKEditor.
-    $filtered_html_format = entity_create('filter_format', array(
-      'format' => 'filtered_html',
-      'name' => 'Filtered HTML',
-      'weight' => 0,
-      'filters' => array(),
-    ));
-    $filtered_html_format->save();
-    $editor = entity_create('editor', array(
-      'format' => 'filtered_html',
-      'editor' => 'ckeditor',
-    ));
-    $editor->save();
-  }
-
-  /**
-   * Tests the enabling of plugins.
-   */
-  function testEnabledPlugins() {
-    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
-    $editor = entity_load('editor', 'filtered_html');
-
-    // Case 1: no CKEditor plugins.
-    $definitions = array_keys($this->manager->getDefinitions());
-    sort($definitions);
-    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'stylescombo'), $definitions, 'No CKEditor plugins found besides the built-in ones.');
-    $enabled_plugins = array(
-      'drupalimage' => 'core/modules/ckeditor/js/plugins/drupalimage/plugin.js',
-      'drupallink' => 'core/modules/ckeditor/js/plugins/drupallink/plugin.js',
-    );
-    $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only built-in plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
-
-    // Enable the CKEditor Test module, which has the Llama plugin (plus three
-    // variations of it, to cover all possible ways a plugin can be enabled) and
-    // clear the editor manager's cache so it is picked up.
-    $this->enableModules(array('ckeditor_test'));
-    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
-    $this->manager->clearCachedDefinitions();
-
-    // Case 2: CKEditor plugins are available.
-    $plugin_ids = array_keys($this->manager->getDefinitions());
-    sort($plugin_ids);
-    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'stylescombo'), $plugin_ids, 'Additional CKEditor plugins found.');
-    $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only the internal plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
-
-    // Case 3: enable each of the newly available plugins, if possible:
-    // a. Llama: cannot be enabled, since it does not implement
-    //    CKEditorPluginContextualInterface nor CKEditorPluginButtonsInterface.
-    // b. LlamaContextual: enabled by adding the 'Strike' button, which is
-    //    part of another plugin!
-    // c. LlamaButton: automatically enabled by adding its 'Llama' button.
-    // d. LlamaContextualAndButton: enabled by either b or c.
-    // Below, we will first enable the "Llama" button, which will cause the
-    // LlamaButton and LlamaContextualAndButton plugins to be enabled. Then we
-    // will remove the "Llama" button and add the "Strike" button, which will
-    // cause the LlamaContextual and LlamaContextualAndButton plugins to be
-    // enabled. Finally, we will add the "Strike" button back again, which would
-    // cause all three plugins to be enabled.
-    $settings = $editor->getSettings();
-    $original_toolbar = $settings['toolbar'];
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
-    $editor->setSettings($settings);
-    $editor->save();
-    $file = array();
-    $file['b'] = 'core/modules/ckeditor/tests/modules/js/llama_button.js';
-    $file['c'] = 'core/modules/ckeditor/tests/modules/js/llama_contextual.js';
-    $file['cb'] = 'core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js';
-    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']);
-    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
-    $settings['toolbar'] = $original_toolbar;
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected = $enabled_plugins + array('llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
-    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The  LLamaContextual and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaContextual and LlamaContextualAndButton plugins are enabled.');
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
-    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
-    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
-  }
-
-}
diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php
deleted file mode 100644
index fb0e55a..0000000
--- a/core/modules/ckeditor/src/Tests/CKEditorTest.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\ckeditor\Tests\CKEditorTest.
- */
-
-namespace Drupal\ckeditor\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\editor\Entity\Editor;
-
-/**
- * Tests for the 'CKEditor' text editor plugin.
- *
- * @group ckeditor
- */
-class CKEditorTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test');
-
-  /**
-   * An instance of the "CKEditor" text editor plugin.
-   *
-   * @var \Drupal\ckeditor\Plugin\Editor\CKEditor;
-   */
-  protected $ckeditor;
-
-  /**
-   * The Editor Plugin Manager.
-   *
-   * @var \Drupal\editor\Plugin\EditorManager;
-   */
-  protected $manager;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Install the Filter module.
-    $this->installSchema('system', 'url_alias');
-
-    // Create text format, associate CKEditor.
-    $filtered_html_format = entity_create('filter_format', array(
-      'format' => 'filtered_html',
-      'name' => 'Filtered HTML',
-      'weight' => 0,
-      'filters' => array(
-        'filter_html' => array(
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '<h2 id> <h3> <h4> <h5> <h6> <p> <br> <strong> <a href hreflang>',
-          )
-        ),
-      ),
-    ));
-    $filtered_html_format->save();
-    $editor = entity_create('editor', array(
-      'format' => 'filtered_html',
-      'editor' => 'ckeditor',
-    ));
-    $editor->save();
-
-    // Create "CKEditor" text editor plugin instance.
-    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
-  }
-
-  /**
-   * Tests CKEditor::getJSSettings().
-   */
-  function testGetJSSettings() {
-    $editor = entity_load('editor', 'filtered_html');
-
-    // Default toolbar.
-    $expected_config = $this->getDefaultInternalConfig() + array(
-      'drupalImage_dialogTitleAdd' => 'Insert Image',
-      'drupalImage_dialogTitleEdit' => 'Edit Image',
-      'drupalLink_dialogTitleAdd' => 'Add Link',
-      'drupalLink_dialogTitleEdit' => 'Edit Link',
-      'allowedContent' => $this->getDefaultAllowedContentConfig(),
-      'disallowedContent' => $this->getDefaultDisallowedContentConfig(),
-      'toolbar' => $this->getDefaultToolbarConfig(),
-      'contentsCss' => $this->getDefaultContentsCssConfig(),
-      'extraPlugins' => 'drupalimage,drupallink',
-      'language' => 'en',
-      'stylesSet' => FALSE,
-      'drupalExternalPlugins' => array(
-        'drupalimage' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupalimage/plugin.js')),
-        'drupallink' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupallink/plugin.js')),
-      ),
-    );
-    $expected_config = $this->castSafeStrings($expected_config);
-    ksort($expected_config);
-    ksort($expected_config['allowedContent']);
-    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for default configuration.');
-
-    // Customize the configuration: add button, have two contextually enabled
-    // buttons, and configure a CKEditor plugin setting.
-    $this->enableModules(array('ckeditor_test'));
-    $this->container->get('plugin.manager.editor')->clearCachedDefinitions();
-    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
-    $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
-    $settings = $editor->getSettings();
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Format';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected_config['toolbar'][0]['items'][] = 'Strike';
-    $expected_config['toolbar'][0]['items'][] = 'Format';
-    $expected_config['format_tags'] = 'p;h2;h3;h4;h5;h6';
-    $expected_config['extraPlugins'] .= ',llama_contextual,llama_contextual_and_button';
-    $expected_config['drupalExternalPlugins']['llama_contextual'] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual.js'));
-    $expected_config['drupalExternalPlugins']['llama_contextual_and_button'] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js'));
-    $expected_config['contentsCss'][] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css'));
-    ksort($expected_config);
-    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
-
-    // Change the allowed HTML tags; the "allowedContent" and "format_tags"
-    // settings for CKEditor should automatically be updated as well.
-    $format = $editor->getFilterFormat();
-    $format->filters('filter_html')->settings['allowed_html'] .= '<pre class> <h1> <blockquote class="*"> <address class="foo bar-* *">';
-    $format->save();
-
-    $expected_config['allowedContent']['pre'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
-    $expected_config['allowedContent']['h1'] = array('attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE);
-    $expected_config['allowedContent']['blockquote'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
-    $expected_config['allowedContent']['address'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => 'foo,bar-*');
-    $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre';
-    ksort($expected_config['allowedContent']);
-    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
-
-    // Disable the filter_html filter: allow *all *tags.
-    $format->setFilterConfig('filter_html', array('status' => 0));
-    $format->save();
-
-    $expected_config['allowedContent'] = TRUE;
-    $expected_config['disallowedContent'] = FALSE;
-    $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre';
-    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
-
-    // Enable the filter_test_restrict_tags_and_attributes filter.
-    $format->setFilterConfig('filter_test_restrict_tags_and_attributes', array(
-      'status' => 1,
-      'settings' => array(
-        'restrictions' => array(
-          'allowed' => array(
-            'p' => TRUE,
-            'a' => array(
-              'href' => TRUE,
-              'rel' => array('nofollow' => TRUE),
-              'class' => array('external' => TRUE),
-              'target' => array('_blank' => FALSE),
-            ),
-            'span' => array(
-              'class' => array('dodo' => FALSE),
-              'property' => array('dc:*' => TRUE),
-              'rel' => array('foaf:*' => FALSE),
-              'style' => array('underline' => FALSE, 'color' => FALSE, 'font-size' => TRUE),
-            ),
-            '*' => array(
-              'style' => FALSE,
-              'on*' => FALSE,
-              'class' => array('is-a-hipster-llama' => TRUE, 'and-more' => TRUE),
-              'data-*' => TRUE,
-            ),
-            'del' => FALSE,
-          ),
-        ),
-      ),
-    ));
-    $format->save();
-
-    $expected_config['allowedContent'] = array(
-      'p' => array(
-        'attributes' => TRUE,
-        'styles' => FALSE,
-        'classes' => 'is-a-hipster-llama,and-more',
-      ),
-      'a' => array(
-        'attributes' => 'href,rel,class,target',
-        'styles' => FALSE,
-        'classes' => 'external',
-      ),
-      'span' => array(
-        'attributes' => 'class,property,rel,style',
-        'styles' => 'font-size',
-        'classes' => FALSE,
-      ),
-      '*' => array(
-        'attributes' => 'class,data-*',
-        'styles' => FALSE,
-        'classes' => 'is-a-hipster-llama,and-more',
-      ),
-      'del' => array(
-        'attributes' => FALSE,
-        'styles' => FALSE,
-        'classes' => FALSE,
-      ),
-    );
-    $expected_config['disallowedContent'] = array(
-      'span' => array(
-        'styles' => 'underline,color',
-        'classes' => 'dodo',
-      ),
-      '*' => array(
-        'attributes' => 'on*',
-      ),
-    );
-    $expected_config['format_tags'] = 'p';
-    ksort($expected_config);
-    ksort($expected_config['allowedContent']);
-    ksort($expected_config['disallowedContent']);
-    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
-  }
-
-  /**
-   * Tests CKEditor::buildToolbarJSSetting().
-   */
-  function testBuildToolbarJSSetting() {
-    $editor = entity_load('editor', 'filtered_html');
-
-    // Default toolbar.
-    $expected = $this->getDefaultToolbarConfig();
-    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for default toolbar.');
-
-    // Customize the configuration.
-    $settings = $editor->getSettings();
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected[0]['items'][] = 'Strike';
-    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar.');
-
-    // Enable the editor_test module, customize further.
-    $this->enableModules(array('ckeditor_test'));
-    $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
-    // Override the label of a toolbar component.
-    $settings['toolbar']['rows'][0][0]['name'] = 'JunkScience';
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected[0]['name'] = 'JunkScience';
-    $expected[0]['items'][] = 'Llama';
-    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.');
-  }
-
-  /**
-   * Tests CKEditor::buildContentsCssJSSetting().
-   */
-  function testBuildContentsCssJSSetting() {
-    $editor = entity_load('editor', 'filtered_html');
-
-    // Default toolbar.
-    $expected = $this->getDefaultContentsCssConfig();
-    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly for default toolbar.');
-
-    // Enable the editor_test module, which implements hook_ckeditor_css_alter().
-    $this->enableModules(array('ckeditor_test'));
-    $expected[] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css'));
-    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a hook_ckeditor_css_alter() implementation exists.');
-
-    // Enable the Bartik theme, which specifies a CKEditor stylesheet.
-    \Drupal::service('theme_handler')->install(['bartik']);
-    $this->config('system.theme')->set('default', 'bartik')->save();
-    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/base/elements.css'));
-    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/captions.css'));
-    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/table.css'));
-    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/text-formatted.css'));
-    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
-  }
-
-  /**
-   * Tests Internal::getConfig().
-   */
-  function testInternalGetConfig() {
-    $editor = entity_load('editor', 'filtered_html');
-    $internal_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('internal');
-
-    // Default toolbar.
-    $expected = $this->getDefaultInternalConfig();
-    $expected['disallowedContent'] = $this->getDefaultDisallowedContentConfig();
-    $expected['allowedContent'] = $this->getDefaultAllowedContentConfig();
-    $this->assertEqual($expected, $internal_plugin->getConfig($editor), '"Internal" plugin configuration built correctly for default toolbar.');
-
-    // Format dropdown/button enabled: new setting should be present.
-    $settings = $editor->getSettings();
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Format';
-    $editor->setSettings($settings);
-    $expected['format_tags'] = 'p;h2;h3;h4;h5;h6';
-    $this->assertEqual($expected, $internal_plugin->getConfig($editor), '"Internal" plugin configuration built correctly for customized toolbar.');
-  }
-
-  /**
-   * Tests StylesCombo::getConfig().
-   */
-  function testStylesComboGetConfig() {
-    $editor = entity_load('editor', 'filtered_html');
-    $stylescombo_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('stylescombo');
-
-    // Styles dropdown/button enabled: new setting should be present.
-    $settings = $editor->getSettings();
-    $settings['toolbar']['rows'][0][0]['items'][] = 'Styles';
-    $settings['plugins']['stylescombo']['styles'] = '';
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected['stylesSet'] = array();
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-
-    // Configure the optional "styles" setting in odd ways that shouldn't affect
-    // the end result.
-    $settings['plugins']['stylescombo']['styles'] = "   \n";
-    $editor->setSettings($settings);
-    $editor->save();
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor));
-    $settings['plugins']['stylescombo']['styles'] = "\r\n  \n  \r  \n ";
-    $editor->setSettings($settings);
-    $editor->save();
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-
-    // Now configure it properly, the end result should change.
-    $settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.mAgical.Callout|Callout";
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected['stylesSet'] = array(
-      array('name' => 'Title', 'element' => 'h1', 'attributes' => array('class' => 'title')),
-      array('name' => 'Callout', 'element' => 'p', 'attributes' => array('class' => 'mAgical Callout')),
-    );
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-
-    // Same configuration, but now interspersed with nonsense. Should yield the
-    // same result.
-    $settings['plugins']['stylescombo']['styles'] = "  h1 .title   |  Title \r \n\r  \np.mAgical  .Callout|Callout\r";
-    $editor->setSettings($settings);
-    $editor->save();
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-
-    // Slightly different configuration: class names are optional.
-    $settings['plugins']['stylescombo']['styles'] = "      h1 |  Title ";
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected['stylesSet'] = array(array('name' => 'Title', 'element' => 'h1'));
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-
-    // Invalid syntax should cause stylesSet to be set to FALSE.
-    $settings['plugins']['stylescombo']['styles'] = "h1";
-    $editor->setSettings($settings);
-    $editor->save();
-    $expected['stylesSet'] = FALSE;
-    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
-  }
-
-  /**
-   * Tests language list availability in CKEditor.
-   */
-  function testLanguages() {
-    // Get CKEditor supported language codes and spot-check.
-    $this->enableModules(array('language'));
-    $this->installConfig(array('language'));
-    $langcodes = $this->ckeditor->getLangcodes();
-
-    // Language codes transformed with browser mappings.
-    $this->assertTrue($langcodes['pt-pt'] == 'pt', '"pt" properly resolved');
-    $this->assertTrue($langcodes['zh-hans'] == 'zh-cn', '"zh-hans" properly resolved');
-
-    // Language code both in Drupal and CKEditor.
-    $this->assertTrue($langcodes['gl'] == 'gl', '"gl" properly resolved');
-
-    // Language codes only in CKEditor.
-    $this->assertTrue($langcodes['en-au'] == 'en-au', '"en-au" properly resolved');
-    $this->assertTrue($langcodes['sr-latn'] == 'sr-latn', '"sr-latn" properly resolved');
-
-    // No locale module, so even though languages are enabled, CKEditor should
-    // still be in English.
-    $this->assertCKEditorLanguage('en');
-  }
-
-  /**
-   * Tests that CKEditor plugins participate in JS translation.
-   */
-  function testJSTranslation() {
-    $this->enableModules(array('language', 'locale'));
-    $this->installSchema('locale', 'locales_source');
-    $this->installSchema('locale', 'locales_location');
-    $this->installSchema('locale', 'locales_target');
-    $editor = Editor::load('filtered_html');
-    $this->ckeditor->getJSSettings($editor);
-    $localeStorage = $this->container->get('locale.storage');
-    $string = $localeStorage->findString(array('source' => 'Edit Link', 'context' => ''));
-    $this->assertTrue(!empty($string), 'String from JavaScript file saved.');
-
-    // With locale module, CKEditor should not adhere to the language selected.
-    $this->assertCKEditorLanguage();
-  }
-
-  /**
-   * Assert that CKEditor picks the expected language when French is default.
-   *
-   * @param string $langcode
-   *   Language code to assert for. Defaults to French. That is the default
-   *   language set in this assertion.
-   */
-  protected function assertCKEditorLanguage($langcode = 'fr') {
-    // Set French as the site default language.
-    ConfigurableLanguage::createFromLangcode('fr')->save();
-    $this->config('system.site')->set('default_langcode', 'fr')->save();
-
-    // Reset the language manager so new negotiations attempts will fall back on
-    // French. Reinject the language manager CKEditor to use the current one.
-    $this->container->get('language_manager')->reset();
-    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
-
-    // Test that we now get the expected language.
-    $editor = Editor::load('filtered_html');
-    $settings = $this->ckeditor->getJSSettings($editor);
-    $this->assertEqual($settings['language'], $langcode);
-  }
-
-  protected function getDefaultInternalConfig() {
-    return array(
-      'customConfig' => '',
-      'pasteFromWordPromptCleanup' => TRUE,
-      'resize_dir' => 'vertical',
-      'justifyClasses' => array('text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'),
-      'entities' => FALSE,
-    );
-  }
-
-  protected function getDefaultAllowedContentConfig() {
-    return [
-      'h2' => ['attributes' => 'id', 'styles' => FALSE, 'classes' => FALSE],
-      'h3' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'h4' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'h5' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'h6' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'p' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'br' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'strong' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
-      'a' => ['attributes' => 'href,hreflang', 'styles' => FALSE, 'classes' => FALSE],
-      '*' => ['attributes' => 'lang,dir', 'styles' => FALSE, 'classes' => FALSE],
-    ];
-  }
-
-  protected function getDefaultDisallowedContentConfig() {
-    return array(
-      '*' => array('attributes' => 'on*'),
-    );
-  }
-
-  protected function getDefaultToolbarConfig() {
-    return array(
-      array(
-        'name' => 'Formatting',
-        'items' => array('Bold', 'Italic',),
-      ),
-      array(
-        'name' => 'Links',
-        'items' => array('DrupalLink', 'DrupalUnlink',),
-      ),
-      array(
-        'name' => 'Lists',
-        'items' => array('BulletedList', 'NumberedList',),
-      ),
-      array(
-        'name' => 'Media',
-        'items' => array('Blockquote', 'DrupalImage',),
-      ),
-      array(
-        'name' => 'Tools',
-        'items' => array('Source',),
-      ),
-      '/',
-    );
-  }
-
-  protected function getDefaultContentsCssConfig() {
-    return array(
-      file_url_transform_relative(file_create_url('core/modules/ckeditor/css/ckeditor-iframe.css')),
-      file_url_transform_relative(file_create_url('core/modules/system/css/components/align.module.css')),
-    );
-  }
-
-}
diff --git a/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php b/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
index 4b241d7..f03fcdd 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorToolbarButtonTest.php
@@ -74,7 +74,7 @@ public function testImageButtonDisplay() {
     $json_encode = function($html) {
       return trim(Json::encode($html), '"');
     };
-    $markup = $json_encode(file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupalimage/image.png')));
+    $markup = $json_encode(file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupalimage/icons/drupalimage.png')));
     $this->assertRaw($markup);
   }
 
diff --git a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
new file mode 100644
index 0000000..ab11491
--- /dev/null
+++ b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\ckeditor\Kernel\CKEditorPluginManagerTest.
+ */
+
+namespace Drupal\Tests\ckeditor\Kernel;
+
+use Drupal\editor\Entity\Editor;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\filter\Entity\FilterFormat;
+
+/**
+ * Tests different ways of enabling CKEditor plugins.
+ *
+ * @group ckeditor
+ */
+class CKEditorPluginManagerTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor');
+
+  /**
+   * The manager for "CKEditor plugin" plugins.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $manager;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Install the Filter module.
+
+    // Create text format, associate CKEditor.
+    $filtered_html_format = FilterFormat::create(array(
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => array(),
+    ));
+    $filtered_html_format->save();
+    $editor = Editor::create([
+      'format' => 'filtered_html',
+      'editor' => 'ckeditor',
+    ]);
+    $editor->save();
+  }
+
+  /**
+   * Tests the enabling of plugins.
+   */
+  function testEnabledPlugins() {
+    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
+    $editor = Editor::load('filtered_html');
+
+    // Case 1: no CKEditor plugins.
+    $definitions = array_keys($this->manager->getDefinitions());
+    sort($definitions);
+    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'stylescombo'), $definitions, 'No CKEditor plugins found besides the built-in ones.');
+    $enabled_plugins = array(
+      'drupalimage' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupalimage/plugin.js',
+      'drupallink' => drupal_get_path('module', 'ckeditor') . '/js/plugins/drupallink/plugin.js',
+    );
+    $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only built-in plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
+
+    // Enable the CKEditor Test module, which has the Llama plugin (plus four
+    // variations of it, to cover all possible ways a plugin can be enabled) and
+    // clear the editor manager's cache so it is picked up.
+    $this->enableModules(array('ckeditor_test'));
+    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
+    $this->manager->clearCachedDefinitions();
+
+    // Case 2: CKEditor plugins are available.
+    $plugin_ids = array_keys($this->manager->getDefinitions());
+    sort($plugin_ids);
+    $this->assertIdentical(array('drupalimage', 'drupalimagecaption', 'drupallink', 'internal', 'language', 'llama', 'llama_button', 'llama_contextual', 'llama_contextual_and_button', 'llama_css', 'stylescombo'), $plugin_ids, 'Additional CKEditor plugins found.');
+    $this->assertIdentical($enabled_plugins, $this->manager->getEnabledPluginFiles($editor), 'Only the internal plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $enabled_plugins, $this->manager->getEnabledPluginFiles($editor, TRUE), 'Only the "internal" plugin is enabled.');
+
+    // Case 3: enable each of the newly available plugins, if possible:
+    // a. Llama: cannot be enabled, since it does not implement
+    //    CKEditorPluginContextualInterface nor CKEditorPluginButtonsInterface.
+    // b. LlamaContextual: enabled by adding the 'Strike' button, which is
+    //    part of another plugin!
+    // c. LlamaButton: automatically enabled by adding its 'Llama' button.
+    // d. LlamaContextualAndButton: enabled by either b or c.
+    // e. LlamaCSS: automatically enabled by add its 'LlamaCSS' button.
+    // Below, we will first enable the "Llama" button, which will cause the
+    // LlamaButton and LlamaContextualAndButton plugins to be enabled. Then we
+    // will remove the "Llama" button and add the "Strike" button, which will
+    // cause the LlamaContextual and LlamaContextualAndButton plugins to be
+    // enabled. Then we will add the "Strike" button back again, which would
+    // cause LlamaButton, LlamaContextual and LlamaContextualAndButton to be
+    // enabled. Finally, we will add the "LlamaCSS" button which would cause
+    // all four plugins to be enabled.
+    $settings = $editor->getSettings();
+    $original_toolbar = $settings['toolbar'];
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
+    $editor->setSettings($settings);
+    $editor->save();
+    $file = array();
+    $file['b'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_button.js';
+    $file['c'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual.js';
+    $file['cb'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_contextual_and_button.js';
+    $file['css'] = drupal_get_path('module', 'ckeditor_test') . '/js/llama_css.js';
+    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual_and_button' => $file['cb']);
+    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaButton and LlamaContextualAndButton plugins are enabled.');
+    $settings['toolbar'] = $original_toolbar;
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected = $enabled_plugins + array('llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The  LLamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LlamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb']);
+    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual and LlamaContextualAndButton plugins are enabled.');
+    $settings['toolbar']['rows'][0][0]['items'][] = 'LlamaCSS';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected = $enabled_plugins + array('llama_button' => $file['b'], 'llama_contextual' => $file['c'], 'llama_contextual_and_button' => $file['cb'], 'llama_css' => $file['css']);
+    $this->assertIdentical($expected, $this->manager->getEnabledPluginFiles($editor), 'The LlamaButton, LlamaContextual, LlamaContextualAndButton and LlamaCSS plugins are enabled.');
+    $this->assertIdentical(array('internal' => NULL) + $expected, $this->manager->getEnabledPluginFiles($editor, TRUE), 'The LLamaButton, LlamaContextual, LlamaContextualAndButton and LlamaCSS plugins are enabled.');
+  }
+
+  /**
+   * Tests the iframe instance CSS files of plugins.
+   */
+  function testCssFiles() {
+    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
+    $editor = Editor::load('filtered_html');
+
+    // Case 1: no CKEditor iframe instance CSS file.
+    $this->assertIdentical(array(), $this->manager->getCssFiles($editor), 'No iframe instance CSS file found.');
+
+    // Enable the CKEditor Test module, which has the LlamaCss plugin and
+    // clear the editor manager's cache so it is picked up.
+    $this->enableModules(array('ckeditor_test'));
+    $this->manager = $this->container->get('plugin.manager.ckeditor.plugin');
+    $settings = $editor->getSettings();
+    // LlamaCss: automatically enabled by adding its 'LlamaCSS' button.
+    $settings['toolbar']['rows'][0][0]['items'][] = 'LlamaCSS';
+    $editor->setSettings($settings);
+    $editor->save();
+
+    // Case 2: CKEditor iframe instance CSS file.
+    $expected = array(
+      'llama_css' => array(drupal_get_path('module', 'ckeditor_test') . '/css/llama.css')
+    );
+    $this->assertIdentical($expected, $this->manager->getCssFiles($editor), 'Iframe instance CSS file found.');
+  }
+
+}
diff --git a/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
new file mode 100644
index 0000000..b421525
--- /dev/null
+++ b/core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
@@ -0,0 +1,500 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\ckeditor\Kernel\CKEditorTest.
+ */
+
+namespace Drupal\Tests\ckeditor\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\editor\Entity\Editor;
+use Drupal\filter\Entity\FilterFormat;
+
+/**
+ * Tests for the 'CKEditor' text editor plugin.
+ *
+ * @group ckeditor
+ */
+class CKEditorTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test');
+
+  /**
+   * An instance of the "CKEditor" text editor plugin.
+   *
+   * @var \Drupal\ckeditor\Plugin\Editor\CKEditor;
+   */
+  protected $ckeditor;
+
+  /**
+   * The Editor Plugin Manager.
+   *
+   * @var \Drupal\editor\Plugin\EditorManager;
+   */
+  protected $manager;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Install the Filter module.
+
+    // Create text format, associate CKEditor.
+    $filtered_html_format = FilterFormat::create(array(
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => array(
+        'filter_html' => array(
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '<h2 id> <h3> <h4> <h5> <h6> <p> <br> <strong> <a href hreflang>',
+          )
+        ),
+      ),
+    ));
+    $filtered_html_format->save();
+    $editor = Editor::create([
+      'format' => 'filtered_html',
+      'editor' => 'ckeditor',
+    ]);
+    $editor->save();
+
+    // Create "CKEditor" text editor plugin instance.
+    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
+  }
+
+  /**
+   * Tests CKEditor::getJSSettings().
+   */
+  function testGetJSSettings() {
+    $editor = entity_load('editor', 'filtered_html');
+
+    // Default toolbar.
+    $expected_config = $this->getDefaultInternalConfig() + array(
+      'drupalImage_dialogTitleAdd' => 'Insert Image',
+      'drupalImage_dialogTitleEdit' => 'Edit Image',
+      'drupalLink_dialogTitleAdd' => 'Add Link',
+      'drupalLink_dialogTitleEdit' => 'Edit Link',
+      'allowedContent' => $this->getDefaultAllowedContentConfig(),
+      'disallowedContent' => $this->getDefaultDisallowedContentConfig(),
+      'toolbar' => $this->getDefaultToolbarConfig(),
+      'contentsCss' => $this->getDefaultContentsCssConfig(),
+      'extraPlugins' => 'drupalimage,drupallink',
+      'language' => 'en',
+      'stylesSet' => FALSE,
+      'drupalExternalPlugins' => array(
+        'drupalimage' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupalimage/plugin.js')),
+        'drupallink' => file_url_transform_relative(file_create_url('core/modules/ckeditor/js/plugins/drupallink/plugin.js')),
+      ),
+    );
+    $expected_config = $this->castSafeStrings($expected_config);
+    ksort($expected_config);
+    ksort($expected_config['allowedContent']);
+    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for default configuration.');
+
+    // Customize the configuration: add button, have two contextually enabled
+    // buttons, and configure a CKEditor plugin setting.
+    $this->enableModules(array('ckeditor_test'));
+    $this->container->get('plugin.manager.editor')->clearCachedDefinitions();
+    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
+    $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    $settings = $editor->getSettings();
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Format';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected_config['toolbar'][0]['items'][] = 'Strike';
+    $expected_config['toolbar'][0]['items'][] = 'Format';
+    $expected_config['format_tags'] = 'p;h2;h3;h4;h5;h6';
+    $expected_config['extraPlugins'] .= ',llama_contextual,llama_contextual_and_button';
+    $expected_config['drupalExternalPlugins']['llama_contextual'] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual.js'));
+    $expected_config['drupalExternalPlugins']['llama_contextual_and_button'] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js'));
+    $expected_config['contentsCss'][] = file_url_transform_relative(file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css'));
+    ksort($expected_config);
+    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
+
+    // Change the allowed HTML tags; the "allowedContent" and "format_tags"
+    // settings for CKEditor should automatically be updated as well.
+    $format = $editor->getFilterFormat();
+    $format->filters('filter_html')->settings['allowed_html'] .= '<pre class> <h1> <blockquote class="*"> <address class="foo bar-* *">';
+    $format->save();
+
+    $expected_config['allowedContent']['pre'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
+    $expected_config['allowedContent']['h1'] = array('attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE);
+    $expected_config['allowedContent']['blockquote'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => TRUE);
+    $expected_config['allowedContent']['address'] = array('attributes' => 'class', 'styles' => FALSE, 'classes' => 'foo,bar-*');
+    $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre';
+    ksort($expected_config['allowedContent']);
+    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
+
+    // Disable the filter_html filter: allow *all *tags.
+    $format->setFilterConfig('filter_html', array('status' => 0));
+    $format->save();
+
+    $expected_config['allowedContent'] = TRUE;
+    $expected_config['disallowedContent'] = FALSE;
+    $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre';
+    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
+
+    // Enable the filter_test_restrict_tags_and_attributes filter.
+    $format->setFilterConfig('filter_test_restrict_tags_and_attributes', array(
+      'status' => 1,
+      'settings' => array(
+        'restrictions' => array(
+          'allowed' => array(
+            'p' => TRUE,
+            'a' => array(
+              'href' => TRUE,
+              'rel' => array('nofollow' => TRUE),
+              'class' => array('external' => TRUE),
+              'target' => array('_blank' => FALSE),
+            ),
+            'span' => array(
+              'class' => array('dodo' => FALSE),
+              'property' => array('dc:*' => TRUE),
+              'rel' => array('foaf:*' => FALSE),
+              'style' => array('underline' => FALSE, 'color' => FALSE, 'font-size' => TRUE),
+            ),
+            '*' => array(
+              'style' => FALSE,
+              'on*' => FALSE,
+              'class' => array('is-a-hipster-llama' => TRUE, 'and-more' => TRUE),
+              'data-*' => TRUE,
+            ),
+            'del' => FALSE,
+          ),
+        ),
+      ),
+    ));
+    $format->save();
+
+    $expected_config['allowedContent'] = array(
+      'p' => array(
+        'attributes' => TRUE,
+        'styles' => FALSE,
+        'classes' => 'is-a-hipster-llama,and-more',
+      ),
+      'a' => array(
+        'attributes' => 'href,rel,class,target',
+        'styles' => FALSE,
+        'classes' => 'external',
+      ),
+      'span' => array(
+        'attributes' => 'class,property,rel,style',
+        'styles' => 'font-size',
+        'classes' => FALSE,
+      ),
+      '*' => array(
+        'attributes' => 'class,data-*',
+        'styles' => FALSE,
+        'classes' => 'is-a-hipster-llama,and-more',
+      ),
+      'del' => array(
+        'attributes' => FALSE,
+        'styles' => FALSE,
+        'classes' => FALSE,
+      ),
+    );
+    $expected_config['disallowedContent'] = array(
+      'span' => array(
+        'styles' => 'underline,color',
+        'classes' => 'dodo',
+      ),
+      '*' => array(
+        'attributes' => 'on*',
+      ),
+    );
+    $expected_config['format_tags'] = 'p';
+    ksort($expected_config);
+    ksort($expected_config['allowedContent']);
+    ksort($expected_config['disallowedContent']);
+    $this->assertIdentical($expected_config, $this->castSafeStrings($this->ckeditor->getJSSettings($editor)), 'Generated JS settings are correct for customized configuration.');
+  }
+
+  /**
+   * Tests CKEditor::buildToolbarJSSetting().
+   */
+  function testBuildToolbarJSSetting() {
+    $editor = entity_load('editor', 'filtered_html');
+
+    // Default toolbar.
+    $expected = $this->getDefaultToolbarConfig();
+    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for default toolbar.');
+
+    // Customize the configuration.
+    $settings = $editor->getSettings();
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Strike';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected[0]['items'][] = 'Strike';
+    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar.');
+
+    // Enable the editor_test module, customize further.
+    $this->enableModules(array('ckeditor_test'));
+    $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    // Override the label of a toolbar component.
+    $settings['toolbar']['rows'][0][0]['name'] = 'JunkScience';
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected[0]['name'] = 'JunkScience';
+    $expected[0]['items'][] = 'Llama';
+    $this->assertIdentical($expected, $this->castSafeStrings($this->ckeditor->buildToolbarJSSetting($editor)), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.');
+  }
+
+  /**
+   * Tests CKEditor::buildContentsCssJSSetting().
+   */
+  function testBuildContentsCssJSSetting() {
+    $editor = entity_load('editor', 'filtered_html');
+
+    // Default toolbar.
+    $expected = $this->getDefaultContentsCssConfig();
+    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly for default toolbar.');
+
+    // Enable the editor_test module, which implements hook_ckeditor_css_alter().
+    $this->enableModules(array('ckeditor_test'));
+    $expected[] = file_url_transform_relative(file_create_url(drupal_get_path('module', 'ckeditor_test') . '/ckeditor_test.css'));
+    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a hook_ckeditor_css_alter() implementation exists.');
+
+    // Enable LlamaCss plugin, which adds an additional CKEditor stylesheet.
+    $this->container->get('plugin.manager.editor')->clearCachedDefinitions();
+    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
+    $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
+    $settings = $editor->getSettings();
+    // LlamaCss: automatically enabled by adding its 'LlamaCSS' button.
+    $settings['toolbar']['rows'][0][0]['items'][] = 'LlamaCSS';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected[] = file_url_transform_relative(file_create_url(drupal_get_path('module', 'ckeditor_test') . '/css/llama.css'));
+    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a CKEditorPluginInterface implementation exists.');
+
+    // Enable the Bartik theme, which specifies a CKEditor stylesheet.
+    \Drupal::service('theme_handler')->install(['bartik']);
+    \Drupal::service('theme_handler')->setDefault('bartik');
+    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/base/elements.css'));
+    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/captions.css'));
+    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/table.css'));
+    $expected[] = file_url_transform_relative(file_create_url('core/themes/bartik/css/components/text-formatted.css'));
+    $this->assertIdentical($expected, $this->ckeditor->buildContentsCssJSSetting($editor), '"contentsCss" configuration part of JS settings built correctly while a theme providing a CKEditor stylesheet exists.');
+  }
+
+  /**
+   * Tests Internal::getConfig().
+   */
+  function testInternalGetConfig() {
+    $editor = entity_load('editor', 'filtered_html');
+    $internal_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('internal');
+
+    // Default toolbar.
+    $expected = $this->getDefaultInternalConfig();
+    $expected['disallowedContent'] = $this->getDefaultDisallowedContentConfig();
+    $expected['allowedContent'] = $this->getDefaultAllowedContentConfig();
+    $this->assertEqual($expected, $internal_plugin->getConfig($editor), '"Internal" plugin configuration built correctly for default toolbar.');
+
+    // Format dropdown/button enabled: new setting should be present.
+    $settings = $editor->getSettings();
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Format';
+    $editor->setSettings($settings);
+    $expected['format_tags'] = 'p;h2;h3;h4;h5;h6';
+    $this->assertEqual($expected, $internal_plugin->getConfig($editor), '"Internal" plugin configuration built correctly for customized toolbar.');
+  }
+
+  /**
+   * Tests StylesCombo::getConfig().
+   */
+  function testStylesComboGetConfig() {
+    $editor = entity_load('editor', 'filtered_html');
+    $stylescombo_plugin = $this->container->get('plugin.manager.ckeditor.plugin')->createInstance('stylescombo');
+
+    // Styles dropdown/button enabled: new setting should be present.
+    $settings = $editor->getSettings();
+    $settings['toolbar']['rows'][0][0]['items'][] = 'Styles';
+    $settings['plugins']['stylescombo']['styles'] = '';
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected['stylesSet'] = array();
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+
+    // Configure the optional "styles" setting in odd ways that shouldn't affect
+    // the end result.
+    $settings['plugins']['stylescombo']['styles'] = "   \n";
+    $editor->setSettings($settings);
+    $editor->save();
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor));
+    $settings['plugins']['stylescombo']['styles'] = "\r\n  \n  \r  \n ";
+    $editor->setSettings($settings);
+    $editor->save();
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+
+    // Now configure it properly, the end result should change.
+    $settings['plugins']['stylescombo']['styles'] = "h1.title|Title\np.mAgical.Callout|Callout";
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected['stylesSet'] = array(
+      array('name' => 'Title', 'element' => 'h1', 'attributes' => array('class' => 'title')),
+      array('name' => 'Callout', 'element' => 'p', 'attributes' => array('class' => 'mAgical Callout')),
+    );
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+
+    // Same configuration, but now interspersed with nonsense. Should yield the
+    // same result.
+    $settings['plugins']['stylescombo']['styles'] = "  h1 .title   |  Title \r \n\r  \np.mAgical  .Callout|Callout\r";
+    $editor->setSettings($settings);
+    $editor->save();
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+
+    // Slightly different configuration: class names are optional.
+    $settings['plugins']['stylescombo']['styles'] = "      h1 |  Title ";
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected['stylesSet'] = array(array('name' => 'Title', 'element' => 'h1'));
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+
+    // Invalid syntax should cause stylesSet to be set to FALSE.
+    $settings['plugins']['stylescombo']['styles'] = "h1";
+    $editor->setSettings($settings);
+    $editor->save();
+    $expected['stylesSet'] = FALSE;
+    $this->assertIdentical($expected, $stylescombo_plugin->getConfig($editor), '"StylesCombo" plugin configuration built correctly for customized toolbar.');
+  }
+
+  /**
+   * Tests language list availability in CKEditor.
+   */
+  function testLanguages() {
+    // Get CKEditor supported language codes and spot-check.
+    $this->enableModules(array('language'));
+    $this->installConfig(array('language'));
+    $langcodes = $this->ckeditor->getLangcodes();
+
+    // Language codes transformed with browser mappings.
+    $this->assertTrue($langcodes['pt-pt'] == 'pt', '"pt" properly resolved');
+    $this->assertTrue($langcodes['zh-hans'] == 'zh-cn', '"zh-hans" properly resolved');
+
+    // Language code both in Drupal and CKEditor.
+    $this->assertTrue($langcodes['gl'] == 'gl', '"gl" properly resolved');
+
+    // Language codes only in CKEditor.
+    $this->assertTrue($langcodes['en-au'] == 'en-au', '"en-au" properly resolved');
+    $this->assertTrue($langcodes['sr-latn'] == 'sr-latn', '"sr-latn" properly resolved');
+
+    // No locale module, so even though languages are enabled, CKEditor should
+    // still be in English.
+    $this->assertCKEditorLanguage('en');
+  }
+
+  /**
+   * Tests that CKEditor plugins participate in JS translation.
+   */
+  function testJSTranslation() {
+    $this->enableModules(array('language', 'locale'));
+    $this->installSchema('locale', 'locales_source');
+    $this->installSchema('locale', 'locales_location');
+    $this->installSchema('locale', 'locales_target');
+    $editor = Editor::load('filtered_html');
+    $this->ckeditor->getJSSettings($editor);
+    $localeStorage = $this->container->get('locale.storage');
+    $string = $localeStorage->findString(array('source' => 'Edit Link', 'context' => ''));
+    $this->assertTrue(!empty($string), 'String from JavaScript file saved.');
+
+    // With locale module, CKEditor should not adhere to the language selected.
+    $this->assertCKEditorLanguage();
+  }
+
+  /**
+   * Assert that CKEditor picks the expected language when French is default.
+   *
+   * @param string $langcode
+   *   Language code to assert for. Defaults to French. That is the default
+   *   language set in this assertion.
+   */
+  protected function assertCKEditorLanguage($langcode = 'fr') {
+    // Set French as the site default language.
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $this->config('system.site')->set('default_langcode', 'fr')->save();
+
+    // Reset the language manager so new negotiations attempts will fall back on
+    // French. Reinject the language manager CKEditor to use the current one.
+    $this->container->get('language_manager')->reset();
+    $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor');
+
+    // Test that we now get the expected language.
+    $editor = Editor::load('filtered_html');
+    $settings = $this->ckeditor->getJSSettings($editor);
+    $this->assertEqual($settings['language'], $langcode);
+  }
+
+  protected function getDefaultInternalConfig() {
+    return array(
+      'customConfig' => '',
+      'pasteFromWordPromptCleanup' => TRUE,
+      'resize_dir' => 'vertical',
+      'justifyClasses' => array('text-align-left', 'text-align-center', 'text-align-right', 'text-align-justify'),
+      'entities' => FALSE,
+      'disableNativeSpellChecker' => FALSE,
+    );
+  }
+
+  protected function getDefaultAllowedContentConfig() {
+    return [
+      'h2' => ['attributes' => 'id', 'styles' => FALSE, 'classes' => FALSE],
+      'h3' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'h4' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'h5' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'h6' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'p' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'br' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'strong' => ['attributes' => FALSE, 'styles' => FALSE, 'classes' => FALSE],
+      'a' => ['attributes' => 'href,hreflang', 'styles' => FALSE, 'classes' => FALSE],
+      '*' => ['attributes' => 'lang,dir', 'styles' => FALSE, 'classes' => FALSE],
+    ];
+  }
+
+  protected function getDefaultDisallowedContentConfig() {
+    return array(
+      '*' => array('attributes' => 'on*'),
+    );
+  }
+
+  protected function getDefaultToolbarConfig() {
+    return array(
+      array(
+        'name' => 'Formatting',
+        'items' => array('Bold', 'Italic',),
+      ),
+      array(
+        'name' => 'Links',
+        'items' => array('DrupalLink', 'DrupalUnlink',),
+      ),
+      array(
+        'name' => 'Lists',
+        'items' => array('BulletedList', 'NumberedList',),
+      ),
+      array(
+        'name' => 'Media',
+        'items' => array('Blockquote', 'DrupalImage',),
+      ),
+      array(
+        'name' => 'Tools',
+        'items' => array('Source',),
+      ),
+      '/',
+    );
+  }
+
+  protected function getDefaultContentsCssConfig() {
+    return array(
+      file_url_transform_relative(file_create_url('core/modules/ckeditor/css/ckeditor-iframe.css')),
+      file_url_transform_relative(file_create_url('core/modules/system/css/components/align.module.css')),
+    );
+  }
+
+}
diff --git a/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
index d55f93a..73a4dc6 100644
--- a/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
+++ b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
@@ -19,9 +19,10 @@
  * CKEditorPluginButtonsInterface interface, there is no way of actually loading
  * this plugin.
  *
- * @see MetaContextual
- * @see MetaButton
- * @see MetaContextualAndButton
+ * @see \Drupal\ckeditor_test\Plugin\CKEditorPlugin\LlamaContextual
+ * @see \Drupal\ckeditor_test\Plugin\CKEditorPlugin\LlamaButton
+ * @see \Drupal\ckeditor_test\Plugin\CKEditorPlugin\LlamaContextualAndButton
+ * @see \Drupal\ckeditor_test\Plugin\CKEditorPlugin\LlamaCss
  *
  * @CKEditorPlugin(
  *   id = "llama",
diff --git a/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
new file mode 100644
index 0000000..c9becb4
--- /dev/null
+++ b/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\ckeditor_test\Plugin\CKEditorPlugin\LlamaCss.
+ */
+
+namespace Drupal\ckeditor_test\Plugin\CKEditorPlugin;
+
+use Drupal\ckeditor\CKEditorPluginButtonsInterface;
+use Drupal\ckeditor\CKEditorPluginCssInterface;
+use Drupal\editor\Entity\Editor;
+
+/**
+ * Defines a "LlamaCss" plugin, with an associated "llama" CSS.
+ *
+ * @CKEditorPlugin(
+ *   id = "llama_css",
+ *   label = @Translation("Llama CSS")
+ * )
+ */
+class LlamaCss extends Llama implements CKEditorPluginButtonsInterface, CKEditorPluginCssInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  function getButtons() {
+    return array(
+      'LlamaCSS' => array(
+        'label' => t('Insert Llama CSS'),
+      ),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  function getCssFiles(Editor $editor) {
+    return array(
+      drupal_get_path('module', 'ckeditor_test') . '/css/llama.css'
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  function getFile() {
+    return drupal_get_path('module', 'ckeditor_test') . '/js/llama_css.js';
+  }
+
+}
diff --git a/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php b/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php
new file mode 100644
index 0000000..6840c2a
--- /dev/null
+++ b/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\ckeditor\Unit\CKEditorPluginManagerTest.
+ */
+
+namespace Drupal\Tests\ckeditor\Unit;
+
+use Drupal\ckeditor\CKEditorPluginManager;
+use Drupal\editor\Entity\Editor;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\ckeditor\CKEditorPluginManager
+ *
+ * @group ckeditor
+ */
+class CKEditorPluginManagerTest extends UnitTestCase {
+
+  /**
+   * Provides a list of configs to test.
+   */
+  public function providerGetEnabledButtons() {
+    return [
+      'empty' => [
+        [],
+        []
+      ],
+      '1 row, 1 group' => [
+        [
+          // Row 1.
+          [
+            // Group 1.
+            ['name' => 'Formatting', 'items' => ['Bold', 'Italic']],
+          ]
+        ],
+        ['Bold', 'Italic']
+      ],
+      '1 row, >1 groups' => [
+        [
+          // Row 1.
+          [
+            // Group 1.
+            ['name' => 'Formatting', 'items' => ['Bold', 'Italic']],
+            // Group 2.
+            ['name' => 'Linking', 'items' => ['Link']],
+          ],
+        ],
+        ['Bold', 'Italic', 'Link']
+      ],
+      '2 rows, 1 group each' => [
+        [
+          // Row 1.
+          [
+            // Group 1.
+            ['name' => 'Formatting', 'items' => ['Bold', 'Italic']],
+          ],
+          // Row 2.
+          [
+            // Group 1.
+            ['name' => 'Tools', 'items' => ['Source']],
+          ],
+        ],
+        ['Bold', 'Italic', 'Source'],
+      ],
+      '2 rows, >1 groups each' => [
+        [
+          // Row 1.
+          [
+            // Group 1.
+            ['name' => 'Formatting', 'items' => ['Bold', 'Italic']],
+            // Group 2.
+            ['name' => 'Linking', 'items' => ['Link']],
+        ],
+          // Row 2.
+          [
+            // Group 1.
+            ['name' => 'Tools', 'items' => ['Source']],
+            // Group 2.
+            ['name' => 'Advanced', 'items' => ['Llama']],
+          ],
+        ],
+        ['Bold', 'Italic', 'Link', 'Source', 'Llama']
+      ],
+    ];
+  }
+
+  /**
+   * @covers ::getEnabledButtons
+   * @dataProvider providerGetEnabledButtons
+   */
+  public function testGetEnabledButtons(array $toolbar_rows, array $expected_buttons) {
+    $editor= $this->prophesize(Editor::class);
+    $editor->getSettings()
+      ->willReturn(['toolbar' => ['rows' => $toolbar_rows]]);
+
+    $enabled_buttons = CKEditorPluginManager::getEnabledButtons($editor->reveal());
+    $this->assertEquals($expected_buttons, $enabled_buttons);
+  }
+
+}
diff --git a/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php b/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
new file mode 100644
index 0000000..3cd70eb
--- /dev/null
+++ b/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\ckeditor\Unit\Plugin\CKEditorPlugin\LanguageTest.
+ */
+
+namespace Drupal\Tests\ckeditor\Unit\Plugin\CKEditorPlugin;
+
+use Drupal\ckeditor\Plugin\CKEditorPlugin\Language;
+use Drupal\Core\Language\LanguageManager;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\ckeditor\Plugin\CKEditorPlugin\Language
+ *
+ * @group ckeditor
+ */
+class LanguageTest extends UnitTestCase {
+
+  /**
+   * The plugin under test.
+   *
+   * @var \Drupal\ckeditor\Plugin\CKEditorPlugin\Language
+   */
+  protected $plugin;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    $this->plugin = new Language([], $this->randomMachineName(), []);
+  }
+
+  /**
+   * Provides a list of configs to test.
+   */
+  public function providerGetConfig() {
+    return [
+      ['un', count(LanguageManager::getUnitedNationsLanguageList())],
+      ['all', count(LanguageManager::getStandardLanguageList())],
+    ];
+  }
+
+  /**
+   * @covers ::getConfig
+   *
+   * @dataProvider providerGetConfig
+   */
+  public function testGetConfig($language_list, $expected_number) {
+    $editor = $this->getMockBuilder('Drupal\editor\Entity\Editor')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $editor->expects($this->once())
+      ->method('getSettings')
+      ->willReturn(['plugins' => ['language' => ['language_list' => $language_list]]]);
+
+    $config = $this->plugin->getConfig($editor);
+
+    $this->assertInternalType('array', $config);
+    $this->assertTrue(in_array('ar:Arabic:rtl', $config['language_list']));
+    $this->assertTrue(in_array('zh-hans:Chinese, Simplified', $config['language_list']));
+    $this->assertTrue(in_array('en:English', $config['language_list']));
+    $this->assertTrue(in_array('fr:French', $config['language_list']));
+    $this->assertTrue(in_array('ru:Russian', $config['language_list']));
+    $this->assertTrue(in_array('ar:Arabic:rtl', $config['language_list']));
+    $this->assertEquals($expected_number, count($config['language_list']));
+  }
+
+}
diff --git a/core/modules/color/color.install b/core/modules/color/color.install
index aa2dd47..7f61338 100644
--- a/core/modules/color/color.install
+++ b/core/modules/color/color.install
@@ -22,14 +22,14 @@ function color_requirements($phase) {
       // Check for PNG support.
       if (!function_exists('imagecreatefrompng')) {
         $requirements['color_gd']['severity'] = REQUIREMENT_WARNING;
-        $requirements['color_gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Check the <a href=":url">PHP image documentation</a> for information on how to correct this.', array(':url' => 'http://www.php.net/manual/ref.image.php'));
+        $requirements['color_gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Check the <a href="http://php.net/manual/ref.image.php">PHP image documentation</a> for information on how to correct this.');
       }
     }
     else {
       $requirements['color_gd'] = array(
         'value' => t('Not installed'),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('The GD library for PHP is missing or outdated. Check the <a href=":url">PHP image documentation</a> for information on how to correct this.', array(':url' => 'http://www.php.net/manual/book.image.php')),
+        'description' => t('The GD library for PHP is missing or outdated. Check the <a href="http://php.net/manual/book.image.php">PHP image documentation</a> for information on how to correct this.'),
       );
     }
     $requirements['color_gd']['title'] = t('GD library PNG support');
diff --git a/core/modules/color/color.js b/core/modules/color/color.js
index ed68732..984f740 100644
--- a/core/modules/color/color.js
+++ b/core/modules/color/color.js
@@ -3,7 +3,7 @@
  * Attaches the behaviors for the Color module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -294,4 +294,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index d266b2e..055d750 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -413,7 +413,7 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
     $memory_limit = ini_get('memory_limit');
     $size = Bytes::toInt($memory_limit);
     if (!Environment::checkMemoryLimit($usage + $required, $memory_limit)) {
-      drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the <a href=":url">PHP documentation</a> for more information.', array('%size' => format_size($usage + $required - $size), ':url' => 'http://www.php.net/manual/ini.core.php#ini.sect.resource-limits')), 'error');
+      drupal_set_message(t('There is not enough memory available to PHP to change this theme\'s color scheme. You need at least %size more. Check the <a href="http://php.net/manual/ini.core.php#ini.sect.resource-limits">PHP documentation</a> for more information.', array('%size' => format_size($usage + $required - $size))), 'error');
       return;
     }
   }
diff --git a/core/modules/color/preview.js b/core/modules/color/preview.js
index 0796ee9..38c62ae 100644
--- a/core/modules/color/preview.js
+++ b/core/modules/color/preview.js
@@ -3,7 +3,7 @@
  * Attaches preview-related behavior for the Color module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -71,4 +71,4 @@
       }
     }
   };
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/comment/comment-entity-form.js b/core/modules/comment/comment-entity-form.js
index 3ad1a3d..fd16d8b 100644
--- a/core/modules/comment/comment-entity-form.js
+++ b/core/modules/comment/comment-entity-form.js
@@ -3,7 +3,7 @@
  * Attaches comment behaviors to the entity form.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -20,4 +20,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php
index 4b79b36..7b922cb 100644
--- a/core/modules/comment/comment.api.php
+++ b/core/modules/comment/comment.api.php
@@ -1,13 +1,13 @@
 <?php
 
-use Drupal\comment\CommentInterface;
-use Drupal\Core\Url;
-
 /**
  * @file
  * Hooks provided by the Comment module.
  */
 
+use Drupal\comment\CommentInterface;
+use Drupal\Core\Url;
+
 /**
  * @addtogroup hooks
  * @{
diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index b67825e..3c6fa86 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -127,3 +127,10 @@ function comment_update_8001() {
 /**
  * @} End of "addtogroup updates-8.0.0-rc".
  */
+
+/**
+ * Clear caches to fix Comment Views context filter.
+ */
+function comment_update_8002() {
+  // Empty update to cause a cache flush.
+}
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index e1d74b6..40b4e40 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -194,15 +194,15 @@ function comment_field_config_delete(FieldConfigInterface $field) {
 /**
  * Implements hook_node_links_alter().
  */
-function comment_node_links_alter(array &$node_links, NodeInterface $node, array &$context) {
+function comment_node_links_alter(array &$links, NodeInterface $node, array &$context) {
   // Comment links are only added to node entity type for backwards
   // compatibility. Should you require comment links for other entity types you
   // can do so by implementing a new field formatter.
   // @todo Make this configurable from the formatter. See
   //   https://www.drupal.org/node/1901110.
 
-  $links = \Drupal::service('comment.link_builder')->buildCommentedEntityLinks($node, $context);
-  $node_links += $links;
+  $comment_links = \Drupal::service('comment.link_builder')->buildCommentedEntityLinks($node, $context);
+  $links += $comment_links;
 }
 
 /**
@@ -244,10 +244,10 @@ function comment_node_view_alter(array &$build, EntityInterface $node, EntityVie
  *
  * @param \Drupal\comment\CommentInterface $comment
  *   The comment object.
- * @param $view_mode
+ * @param string $view_mode
  *   (optional) View mode; for instance, 'full', 'teaser', etc. Defaults to
  *   'full'.
- * @param $langcode
+ * @param string $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
  *
@@ -264,12 +264,12 @@ function comment_view(CommentInterface $comment, $view_mode = 'full', $langcode
 /**
  * Constructs render array from an array of loaded comments.
  *
- * @param $comments
+ * @param \Drupal\comment\CommentInterface[] $comments
  *   An array of comments as returned by entity_load_multiple().
- * @param $view_mode
+ * @param string $view_mode
  *   (optional) View mode; for instance, 'full', 'teaser', etc. Defaults to
  *   'full'.
- * @param $langcode
+ * @param string $langcode
  *   (optional) A string indicating the language field values are to be shown
  *   in. If no language is provided the current content language is used.
  *   Defaults to NULL.
diff --git a/core/modules/comment/config/schema/comment.source.schema.yml b/core/modules/comment/config/schema/comment.source.schema.yml
deleted file mode 100644
index 2d0d51b..0000000
--- a/core/modules/comment/config/schema/comment.source.schema.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-migrate.source.d6_comment:
-  type: migrate_source_sql
-  label: 'Drupal 6 comment'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        entity_type:
-          type: string
-          label: 'Entity type'
-
-migrate.source.d6_comment_variable_per_comment_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 comment variable'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_comment_entity_form_display_subject:
-  type: migrate_source_sql
-  label: 'Drupal 6 comment subject entity form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_comment_variable:
-  type: migrate_source_sql
-  label: 'Drupal 6 comment variable'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
diff --git a/core/modules/comment/js/node-new-comments-link.js b/core/modules/comment/js/node-new-comments-link.js
index 54506d9..291bcbd 100644
--- a/core/modules/comment/js/node-new-comments-link.js
+++ b/core/modules/comment/js/node-new-comments-link.js
@@ -6,7 +6,7 @@
  * installed.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, drupalSettings) {
 
   'use strict';
 
@@ -174,4 +174,4 @@
     }
   }
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/comment/migration_templates/d6_comment.yml b/core/modules/comment/migration_templates/d6_comment.yml
index 62f3f64..a7ffc9d 100644
--- a/core/modules/comment/migration_templates/d6_comment.yml
+++ b/core/modules/comment/migration_templates/d6_comment.yml
@@ -37,7 +37,7 @@ destination:
   plugin: entity:comment
 migration_dependencies:
   required:
-    - d6_node:*
+    - d6_node
     - d6_comment_type
     - d6_comment_entity_display
     - d6_comment_entity_form_display
diff --git a/core/modules/comment/migration_templates/d7_comment.yml b/core/modules/comment/migration_templates/d7_comment.yml
old mode 100755
new mode 100644
index b1b35bf..5845999
--- a/core/modules/comment/migration_templates/d7_comment.yml
+++ b/core/modules/comment/migration_templates/d7_comment.yml
@@ -31,5 +31,5 @@ destination:
   plugin: entity:comment
 migration_dependencies:
   required:
-    - d7_node:*
+    - d7_node
     - d7_comment_type
diff --git a/core/modules/comment/src/CommentAccessControlHandler.php b/core/modules/comment/src/CommentAccessControlHandler.php
index 6e4072d..b67b585 100644
--- a/core/modules/comment/src/CommentAccessControlHandler.php
+++ b/core/modules/comment/src/CommentAccessControlHandler.php
@@ -31,7 +31,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     if ($operation == 'approve') {
       return AccessResult::allowedIf($comment_admin && !$entity->isPublished())
         ->cachePerPermissions()
-        ->cacheUntilEntityChanges($entity);
+        ->addCacheableDependency($entity);
     }
 
     if ($comment_admin) {
@@ -41,11 +41,11 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
 
     switch ($operation) {
       case 'view':
-        return AccessResult::allowedIf($account->hasPermission('access comments') && $entity->isPublished())->cachePerPermissions()->cacheUntilEntityChanges($entity)
+        return AccessResult::allowedIf($account->hasPermission('access comments') && $entity->isPublished())->cachePerPermissions()->addCacheableDependency($entity)
           ->andIf($entity->getCommentedEntity()->access($operation, $account, TRUE));
 
       case 'update':
-        return AccessResult::allowedIf($account->id() && $account->id() == $entity->getOwnerId() && $entity->isPublished() && $account->hasPermission('edit own comments'))->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($entity);
+        return AccessResult::allowedIf($account->id() && $account->id() == $entity->getOwnerId() && $entity->isPublished() && $account->hasPermission('edit own comments'))->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
 
       default:
         // No opinion.
@@ -122,9 +122,9 @@ protected function checkFieldAccess($operation, FieldDefinitionInterface $field_
         $admin_access = AccessResult::allowedIfHasPermission($account, 'administer comments');
         $anonymous_access = AccessResult::allowedIf($entity->isNew() && $account->isAnonymous() && $anonymous_contact != COMMENT_ANONYMOUS_MAYNOT_CONTACT && $account->hasPermission('post comments'))
           ->cachePerPermissions()
-          ->cacheUntilEntityChanges($entity)
-          ->cacheUntilEntityChanges($field_definition->getConfig($commented_entity->bundle()))
-          ->cacheUntilEntityChanges($commented_entity);
+          ->addCacheableDependency($entity)
+          ->addCacheableDependency($field_definition->getConfig($commented_entity->bundle()))
+          ->addCacheableDependency($commented_entity);
         return $admin_access->orIf($anonymous_access);
       }
     }
diff --git a/core/modules/comment/src/CommentForm.php b/core/modules/comment/src/CommentForm.php
index 1a26441..d5b7f0c 100644
--- a/core/modules/comment/src/CommentForm.php
+++ b/core/modules/comment/src/CommentForm.php
@@ -335,9 +335,9 @@ protected function flagViolations(EntityConstraintViolationListInterface $violat
   /**
    * Form submission handler for the 'preview' action.
    *
-   * @param $form
+   * @param array $form
    *   An associative array containing the structure of the form.
-   * @param $form_state
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    */
   public function preview(array &$form, FormStateInterface $form_state) {
diff --git a/core/modules/comment/src/CommentTypeForm.php b/core/modules/comment/src/CommentTypeForm.php
index 79e513e..20c2820 100644
--- a/core/modules/comment/src/CommentTypeForm.php
+++ b/core/modules/comment/src/CommentTypeForm.php
@@ -96,7 +96,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['description'] = array(
       '#type' => 'textarea',
       '#default_value' => $comment_type->getDescription(),
-      '#description' => t('Describe this comment type. The text will be displayed on the <em>Comment types</em> administration overview page'),
+      '#description' => t('Describe this comment type. The text will be displayed on the <em>Comment types</em> administration overview page.'),
       '#title' => t('Description'),
     );
 
diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php
index 9b47b7c..ed8a4b2 100644
--- a/core/modules/comment/src/CommentViewBuilder.php
+++ b/core/modules/comment/src/CommentViewBuilder.php
@@ -13,7 +13,6 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityViewBuilder;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/core/modules/comment/src/CommentViewsData.php b/core/modules/comment/src/CommentViewsData.php
index c70f77f..34f6c41 100644
--- a/core/modules/comment/src/CommentViewsData.php
+++ b/core/modules/comment/src/CommentViewsData.php
@@ -20,32 +20,86 @@ class CommentViewsData extends EntityViewsData {
   public function getViewsData() {
     $data = parent::getViewsData();
 
-    $data['comment_field_data']['table']['base']['help'] = t('Comments are responses to content.');
+    $data['comment_field_data']['table']['base']['help'] = $this->t('Comments are responses to content.');
     $data['comment_field_data']['table']['base']['access query tag'] = 'comment_access';
 
     $data['comment_field_data']['table']['wizard_id'] = 'comment';
 
-    $data['comment_field_data']['subject']['title'] = t('Title');
-    $data['comment_field_data']['subject']['help'] = t('The title of the comment.');
+    $data['comment_field_data']['subject']['title'] = $this->t('Title');
+    $data['comment_field_data']['subject']['help'] = $this->t('The title of the comment.');
 
-    $data['comment_field_data']['name']['title'] = t('Author');
-    $data['comment_field_data']['name']['help'] = t("The name of the comment's author. Can be rendered as a link to the author's homepage.");
+    $data['comment_field_data']['name']['title'] = $this->t('Author');
+    $data['comment_field_data']['name']['help'] = $this->t("The name of the comment's author. Can be rendered as a link to the author's homepage.");
     $data['comment_field_data']['name']['field']['default_formatter'] = 'comment_username';
 
-    $data['comment_field_data']['homepage']['title'] = t("Author's website");
-    $data['comment_field_data']['homepage']['help'] = t("The website address of the comment's author. Can be rendered as a link. Will be empty if the author is a registered user.");
+    $data['comment_field_data']['homepage']['title'] = $this->t("Author's website");
+    $data['comment_field_data']['homepage']['help'] = $this->t("The website address of the comment's author. Can be rendered as a link. Will be empty if the author is a registered user.");
 
-    $data['comment_field_data']['mail']['help'] = t('Email of user that posted the comment. Will be empty if the author is a registered user.');
+    $data['comment_field_data']['mail']['help'] = $this->t('Email of user that posted the comment. Will be empty if the author is a registered user.');
 
-    $data['comment_field_data']['created']['title'] = t('Post date');
-    $data['comment_field_data']['created']['help'] = t('Date and time of when the comment was created.');
+    $data['comment_field_data']['created']['title'] = $this->t('Post date');
+    $data['comment_field_data']['created']['help'] = $this->t('Date and time of when the comment was created.');
 
-    $data['comment_field_data']['changed']['title'] = t('Updated date');
-    $data['comment_field_data']['changed']['help'] = t('Date and time of when the comment was last updated.');
+    $data['comment_field_data']['created_fulldata'] = array(
+      'title' => $this->t('Created date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_fulldate',
+      ),
+    );
+
+    $data['comment_field_data']['created_year_month'] = array(
+      'title' => $this->t('Created year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_year_month',
+      ),
+    );
+
+    $data['comment_field_data']['created_year'] = array(
+      'title' => $this->t('Created year'),
+      'help' => $this->t('Date in the form of YYYY.'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_year',
+      ),
+    );
+
+    $data['comment_field_data']['created_month'] = array(
+      'title' => $this->t('Created month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_month',
+      ),
+    );
+
+    $data['comment_field_data']['created_day'] = array(
+      'title' => $this->t('Created day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_day',
+      ),
+    );
+
+    $data['comment_field_data']['created_week'] = array(
+      'title' => $this->t('Created week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
+      'argument' => array(
+        'field' => 'created',
+        'id' => 'date_week',
+      ),
+    );
+
+    $data['comment_field_data']['changed']['title'] = $this->t('Updated date');
+    $data['comment_field_data']['changed']['help'] = $this->t('Date and time of when the comment was last updated.');
 
     $data['comment_field_data']['changed_fulldata'] = array(
-      'title' => t('Created date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Changed date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_fulldate',
@@ -53,8 +107,8 @@ public function getViewsData() {
     );
 
     $data['comment_field_data']['changed_year_month'] = array(
-      'title' => t('Created year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Changed year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year_month',
@@ -62,8 +116,8 @@ public function getViewsData() {
     );
 
     $data['comment_field_data']['changed_year'] = array(
-      'title' => t('Created year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Changed year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year',
@@ -71,8 +125,8 @@ public function getViewsData() {
     );
 
     $data['comment_field_data']['changed_month'] = array(
-      'title' => t('Created month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Changed month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_month',
@@ -80,8 +134,8 @@ public function getViewsData() {
     );
 
     $data['comment_field_data']['changed_day'] = array(
-      'title' => t('Created day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Changed day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_day',
@@ -89,43 +143,43 @@ public function getViewsData() {
     );
 
     $data['comment_field_data']['changed_week'] = array(
-      'title' => t('Created week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Changed week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_week',
       ),
     );
 
-    $data['comment_field_data']['status']['title'] = t('Approved status');
-    $data['comment_field_data']['status']['help'] = t('Whether the comment is approved (or still in the moderation queue).');
-    $data['comment_field_data']['status']['filter']['label'] = t('Approved comment status');
+    $data['comment_field_data']['status']['title'] = $this->t('Approved status');
+    $data['comment_field_data']['status']['help'] = $this->t('Whether the comment is approved (or still in the moderation queue).');
+    $data['comment_field_data']['status']['filter']['label'] = $this->t('Approved comment status');
     $data['comment_field_data']['status']['filter']['type'] = 'yes-no';
 
     $data['comment']['approve_comment'] = array(
       'field' => array(
-        'title' => t('Link to approve comment'),
-        'help' => t('Provide a simple link to approve the comment.'),
+        'title' => $this->t('Link to approve comment'),
+        'help' => $this->t('Provide a simple link to approve the comment.'),
         'id' => 'comment_link_approve',
       ),
     );
 
     $data['comment']['replyto_comment'] = array(
       'field' => array(
-        'title' => t('Link to reply-to comment'),
-        'help' => t('Provide a simple link to reply to the comment.'),
+        'title' => $this->t('Link to reply-to comment'),
+        'help' => $this->t('Provide a simple link to reply to the comment.'),
         'id' => 'comment_link_reply',
       ),
     );
 
     $data['comment_field_data']['thread']['field'] = array(
-      'title' => t('Depth'),
-      'help' => t('Display the depth of the comment if it is threaded.'),
+      'title' => $this->t('Depth'),
+      'help' => $this->t('Display the depth of the comment if it is threaded.'),
       'id' => 'comment_depth',
     );
     $data['comment_field_data']['thread']['sort'] = array(
-      'title' => t('Thread'),
-      'help' => t('Sort by the threaded order. This will keep child comments together with their parents.'),
+      'title' => $this->t('Thread'),
+      'help' => $this->t('Sort by the threaded order. This will keep child comments together with their parents.'),
       'id' => 'comment_thread',
     );
     unset($data['comment_field_data']['thread']['filter']);
@@ -142,7 +196,7 @@ public function getViewsData() {
         $data['comment_field_data'][$type] = array(
           'relationship' => array(
             'title' => $entity_type->getLabel(),
-            'help' => t('The @entity_type to which the comment is a reply to.', array('@entity_type' => $entity_type->getLabel())),
+            'help' => $this->t('The @entity_type to which the comment is a reply to.', array('@entity_type' => $entity_type->getLabel())),
             'base' => $entity_type->getDataTable() ?: $entity_type->getBaseTable(),
             'base field' => $entity_type->getKey('id'),
             'relationship field' => 'entity_id',
@@ -160,20 +214,20 @@ public function getViewsData() {
       }
     }
 
-    $data['comment_field_data']['uid']['title'] = t('Author uid');
-    $data['comment_field_data']['uid']['help'] = t('If you need more fields than the uid add the comment: author relationship');
-    $data['comment_field_data']['uid']['relationship']['title'] = t('Author');
-    $data['comment_field_data']['uid']['relationship']['help'] = t("The User ID of the comment's author.");
-    $data['comment_field_data']['uid']['relationship']['label'] = t('author');
+    $data['comment_field_data']['uid']['title'] = $this->t('Author uid');
+    $data['comment_field_data']['uid']['help'] = $this->t('If you need more fields than the uid add the comment: author relationship');
+    $data['comment_field_data']['uid']['relationship']['title'] = $this->t('Author');
+    $data['comment_field_data']['uid']['relationship']['help'] = $this->t("The User ID of the comment's author.");
+    $data['comment_field_data']['uid']['relationship']['label'] = $this->t('author');
 
-    $data['comment_field_data']['pid']['title'] = t('Parent CID');
-    $data['comment_field_data']['pid']['relationship']['title'] = t('Parent comment');
-    $data['comment_field_data']['pid']['relationship']['help'] = t('The parent comment');
-    $data['comment_field_data']['pid']['relationship']['label'] = t('parent');
+    $data['comment_field_data']['pid']['title'] = $this->t('Parent CID');
+    $data['comment_field_data']['pid']['relationship']['title'] = $this->t('Parent comment');
+    $data['comment_field_data']['pid']['relationship']['help'] = $this->t('The parent comment');
+    $data['comment_field_data']['pid']['relationship']['label'] = $this->t('parent');
 
     // Define the base group of this table. Fields that don't have a group defined
     // will go into this field by default.
-    $data['comment_entity_statistics']['table']['group']  = t('Comment Statistics');
+    $data['comment_entity_statistics']['table']['group']  = $this->t('Comment Statistics');
 
     // Provide a relationship for each entity type except comment.
     foreach ($entities_types as $type => $entity_type) {
@@ -202,8 +256,8 @@ public function getViewsData() {
     }
 
     $data['comment_entity_statistics']['last_comment_timestamp'] = array(
-      'title' => t('Last comment time'),
-      'help' => t('Date and time of when the last comment was posted.'),
+      'title' => $this->t('Last comment time'),
+      'help' => $this->t('Date and time of when the last comment was posted.'),
       'field' => array(
         'id' => 'comment_last_timestamp',
       ),
@@ -216,8 +270,8 @@ public function getViewsData() {
     );
 
     $data['comment_entity_statistics']['last_comment_name'] = array(
-      'title' => t("Last comment author"),
-      'help' => t('The name of the author of the last posted comment.'),
+      'title' => $this->t("Last comment author"),
+      'help' => $this->t('The name of the author of the last posted comment.'),
       'field' => array(
         'id' => 'comment_ces_last_comment_name',
         'no group by' => TRUE,
@@ -229,8 +283,8 @@ public function getViewsData() {
     );
 
     $data['comment_entity_statistics']['comment_count'] = array(
-      'title' => t('Comment count'),
-      'help' => t('The number of comments an entity has.'),
+      'title' => $this->t('Comment count'),
+      'help' => $this->t('The number of comments an entity has.'),
       'field' => array(
         'id' => 'numeric',
       ),
@@ -246,8 +300,8 @@ public function getViewsData() {
     );
 
     $data['comment_entity_statistics']['last_updated'] = array(
-      'title' => t('Updated/commented date'),
-      'help' => t('The most recent of last comment posted or entity updated time.'),
+      'title' => $this->t('Updated/commented date'),
+      'help' => $this->t('The most recent of last comment posted or entity updated time.'),
       'field' => array(
         'id' => 'comment_ces_last_updated',
         'no group by' => TRUE,
@@ -262,28 +316,28 @@ public function getViewsData() {
     );
 
     $data['comment_entity_statistics']['cid'] = array(
-      'title' => t('Last comment CID'),
-      'help' => t('Display the last comment of an entity'),
+      'title' => $this->t('Last comment CID'),
+      'help' => $this->t('Display the last comment of an entity'),
       'relationship' => array(
-        'title' => t('Last comment'),
-        'help' => t('The last comment of an entity.'),
-        'group' => t('Comment'),
+        'title' => $this->t('Last comment'),
+        'help' => $this->t('The last comment of an entity.'),
+        'group' => $this->t('Comment'),
         'base' => 'comment',
         'base field' => 'cid',
         'id' => 'standard',
-        'label' => t('Last Comment'),
+        'label' => $this->t('Last Comment'),
       ),
     );
 
     $data['comment_entity_statistics']['last_comment_uid'] = array(
-      'title' => t('Last comment uid'),
-      'help' => t('The User ID of the author of the last comment of an entity.'),
+      'title' => $this->t('Last comment uid'),
+      'help' => $this->t('The User ID of the author of the last comment of an entity.'),
       'relationship' => array(
-        'title' => t('Last comment author'),
+        'title' => $this->t('Last comment author'),
         'base' => 'users',
         'base field' => 'uid',
         'id' => 'standard',
-        'label' => t('Last comment author'),
+        'label' => $this->t('Last comment author'),
       ),
       'filter' => array(
         'id' => 'numeric',
@@ -297,8 +351,8 @@ public function getViewsData() {
     );
 
     $data['comment_entity_statistics']['entity_type'] = array(
-      'title' => t('Entity type'),
-      'help' => t('The entity type to which the comment is a reply to.'),
+      'title' => $this->t('Entity type'),
+      'help' => $this->t('The entity type to which the comment is a reply to.'),
       'field' => array(
         'id' => 'standard',
       ),
@@ -313,8 +367,8 @@ public function getViewsData() {
       ),
     );
     $data['comment_entity_statistics']['field_name'] = array(
-      'title' => t('Comment field name'),
-      'help' => t('The field name from which the comment originated.'),
+      'title' => $this->t('Comment field name'),
+      'help' => $this->t('The field name from which the comment originated.'),
       'field' => array(
         'id' => 'standard',
       ),
diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php
index 2466231..81a6f67 100644
--- a/core/modules/comment/src/Controller/CommentController.php
+++ b/core/modules/comment/src/Controller/CommentController.php
@@ -137,7 +137,6 @@ public function commentPermalink(Request $request, CommentInterface $comment) {
       if ($session = $request->getSession()) {
         $redirect_request->setSession($session);
       }
-      // @todo: Convert the pager to use the request object.
       $request->query->set('page', $page);
       $response = $this->httpKernel->handle($redirect_request, HttpKernelInterface::SUB_REQUEST);
       if ($response instanceof CacheableResponseInterface) {
@@ -289,7 +288,7 @@ public function replyFormAccess(EntityInterface $entity, $field_name, $pid = NUL
 
     $status = $entity->{$field_name}->status;
     $access = $access->andIf(AccessResult::allowedIf($status == CommentItemInterface::OPEN)
-      ->cacheUntilEntityChanges($entity));
+      ->addCacheableDependency($entity));
 
     // $pid indicates that this is a reply to a comment.
     if ($pid) {
@@ -301,7 +300,7 @@ public function replyFormAccess(EntityInterface $entity, $field_name, $pid = NUL
       // Check if the parent comment is published and belongs to the entity.
       $access = $access->andIf(AccessResult::allowedIf($comment && $comment->isPublished() && $comment->getCommentedEntityId() == $entity->id()));
       if ($comment) {
-        $access->cacheUntilEntityChanges($comment);
+        $access->addCacheableDependency($comment);
       }
     }
     return $access;
diff --git a/core/modules/comment/src/Entity/Comment.php b/core/modules/comment/src/Entity/Comment.php
index e2ab3d8..08dc5ed 100644
--- a/core/modules/comment/src/Entity/Comment.php
+++ b/core/modules/comment/src/Entity/Comment.php
@@ -204,8 +204,7 @@ public function referencedEntities() {
    * {@inheritdoc}
    */
   public function permalink() {
-    $entity = $this->getCommentedEntity();
-    $uri = $entity->urlInfo();
+    $uri = $this->urlInfo();
     $uri->setOption('fragment', 'comment-' . $this->id());
     return $uri;
   }
diff --git a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
index 64ff301..1e84084 100644
--- a/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
+++ b/core/modules/comment/src/Plugin/Field/FieldFormatter/CommentDefaultFormatter.php
@@ -16,6 +16,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -80,6 +81,11 @@ public static function defaultSettings() {
   protected $entityFormBuilder;
 
   /**
+   * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
+   */
+  protected $routeMatch;
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
@@ -93,7 +99,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration['third_party_settings'],
       $container->get('current_user'),
       $container->get('entity.manager'),
-      $container->get('entity.form_builder')
+      $container->get('entity.form_builder'),
+      $container->get('current_route_match')
     );
   }
 
@@ -120,14 +127,17 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The entity manager
    * @param \Drupal\Core\Entity\EntityFormBuilderInterface $entity_form_builder
    *   The entity form builder.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The route match object.
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder) {
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityManagerInterface $entity_manager, EntityFormBuilderInterface $entity_form_builder, RouteMatchInterface $route_match) {
     parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
     $this->viewBuilder = $entity_manager->getViewBuilder('comment');
     $this->storage = $entity_manager->getStorage('comment');
     $this->currentUser = $current_user;
     $this->entityManager = $entity_manager;
     $this->entityFormBuilder = $entity_form_builder;
+    $this->routeMatch = $route_match;
   }
 
   /**
@@ -164,6 +174,12 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
           if ($comments) {
             $build = $this->viewBuilder->viewMultiple($comments);
             $build['pager']['#type'] = 'pager';
+            // CommentController::commentPermalink() calculates the page number
+            // where a specific comment appears and does a subrequest pointing to
+            // that page, we need to pass that subrequest route to our pager to
+            // keep the pager working.
+            $build['pager']['#route_name'] = $this->routeMatch->getRouteObject();
+            $build['pager']['#route_parameters'] =  $this->routeMatch->getRawParameters()->all();
             if ($this->getSetting('pager_id')) {
               $build['pager']['#element'] = $this->getSetting('pager_id');
             }
diff --git a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
index 220b645..de1d346 100644
--- a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
+++ b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\UrlGeneratorTrait;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Field\FieldItemBase;
diff --git a/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
index 7ebbc83..57cd843 100644
--- a/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
+++ b/core/modules/comment/src/Plugin/migrate/destination/EntityComment.php
@@ -12,8 +12,7 @@
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\MigrateException;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index 6b223b1..ece5eef 100644
--- a/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Database\Connection;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\node\Entity\Node;
 use Drupal\views\Plugin\views\field\NumericField;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\ResultRow;
@@ -162,10 +163,10 @@ public function preRender(&$values) {
   protected function renderLink($data, ResultRow $values) {
     if (!empty($this->options['link_to_comment']) && $data !== NULL && $data !== '') {
       $node_type = $this->getValue($values, 'type');
-      $node = entity_create('node', array(
+      $node = Node::create([
         'nid' => $this->getValue($values, 'nid'),
         'type' => $node_type,
-      ));
+      ]);
       // Because there is no support for selecting a specific comment field to
       // reference, we arbitrarily use the first such field name we find.
       // @todo Provide a means for selecting the comment field.
diff --git a/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php b/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
index 1c8c41a..7264ccc 100644
--- a/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
+++ b/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\comment\Plugin\views\field;
 
+use Drupal\user\Entity\User;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\views\ResultRow;
 
@@ -67,7 +68,7 @@ protected function defineOptions() {
    */
   public function render(ResultRow $values) {
     if (!empty($this->options['link_to_user'])) {
-      $account = entity_create('user');
+      $account = User::create();
       $account->name = $this->getValue($values);
       $account->uid = $values->{$this->uid};
       $username = array(
diff --git a/core/modules/comment/src/Tests/CommentActionsTest.php b/core/modules/comment/src/Tests/CommentActionsTest.php
index 5cf7ead..51fbd36 100644
--- a/core/modules/comment/src/Tests/CommentActionsTest.php
+++ b/core/modules/comment/src/Tests/CommentActionsTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\comment\Entity\Comment;
+use Drupal\system\Entity\Action;
 
 /**
  * Tests actions provided by the Comment module.
@@ -50,7 +51,7 @@ function testCommentUnpublishByKeyword() {
     $this->drupalLogin($this->adminUser);
     $keyword_1 = $this->randomMachineName();
     $keyword_2 = $this->randomMachineName();
-    $action = entity_create('action', array(
+    $action = Action::create(array(
       'id' => 'comment_unpublish_by_keyword_action',
       'label' => $this->randomMachineName(),
       'type' => 'comment',
diff --git a/core/modules/comment/src/Tests/CommentAdminTest.php b/core/modules/comment/src/Tests/CommentAdminTest.php
index ee434f7..37ed92c 100644
--- a/core/modules/comment/src/Tests/CommentAdminTest.php
+++ b/core/modules/comment/src/Tests/CommentAdminTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\user\RoleInterface;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests comment approval functionality.
@@ -50,7 +51,7 @@ function testApprovalAdminInterface() {
     // Get unapproved comment id.
     $this->drupalLogin($this->adminUser);
     $anonymous_comment4 = $this->getUnapprovedComment($subject);
-    $anonymous_comment4 = entity_create('comment', array(
+    $anonymous_comment4 = Comment::create(array(
       'cid' => $anonymous_comment4,
       'subject' => $subject,
       'comment_body' => $body,
@@ -127,7 +128,7 @@ function testApprovalNodeInterface() {
     // Get unapproved comment id.
     $this->drupalLogin($this->adminUser);
     $anonymous_comment4 = $this->getUnapprovedComment($subject);
-    $anonymous_comment4 = entity_create('comment', array(
+    $anonymous_comment4 = Comment::create(array(
       'cid' => $anonymous_comment4,
       'subject' => $subject,
       'comment_body' => $body,
diff --git a/core/modules/comment/src/Tests/CommentBookTest.php b/core/modules/comment/src/Tests/CommentBookTest.php
index ecc2624..8f2e744 100644
--- a/core/modules/comment/src/Tests/CommentBookTest.php
+++ b/core/modules/comment/src/Tests/CommentBookTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\comment\CommentInterface;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests visibility of comments on book pages.
@@ -37,17 +39,17 @@ protected function setUp() {
    * Tests comments in book export.
    */
   public function testBookCommentPrint() {
-    $book_node = entity_create('node', array(
+    $book_node = Node::create([
       'type' => 'book',
       'title' => 'Book title',
       'body' => 'Book body',
-    ));
+    ]);
     $book_node->book['bid'] = 'new';
     $book_node->save();
 
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $book_node->id(),
diff --git a/core/modules/comment/src/Tests/CommentCSSTest.php b/core/modules/comment/src/Tests/CommentCSSTest.php
index 47a31cc..793762b 100644
--- a/core/modules/comment/src/Tests/CommentCSSTest.php
+++ b/core/modules/comment/src/Tests/CommentCSSTest.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
 use Drupal\user\RoleInterface;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests CSS classes on comments.
@@ -47,7 +48,7 @@ function testCommentClasses() {
 
       // Add a comment.
       /** @var \Drupal\comment\CommentInterface $comment */
-      $comment = entity_create('comment', array(
+      $comment = Comment::create(array(
         'entity_id' => $node->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
diff --git a/core/modules/comment/src/Tests/CommentCacheTagsTest.php b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
index 15142d8..b7f6f92 100644
--- a/core/modules/comment/src/Tests/CommentCacheTagsTest.php
+++ b/core/modules/comment/src/Tests/CommentCacheTagsTest.php
@@ -11,6 +11,7 @@
 use Drupal\comment\CommentManagerInterface;
 use Drupal\comment\Entity\Comment;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\user\Entity\Role;
@@ -70,14 +71,14 @@ protected function createEntity() {
     $field->save();
 
     // Create a "Camelids" test entity that the comment will be assigned to.
-    $this->entityTestCamelid = entity_create('entity_test', array(
+    $this->entityTestCamelid = EntityTest::create(array(
       'name' => 'Camelids',
       'type' => 'bar',
     ));
     $this->entityTestCamelid->save();
 
     // Create a "Llama" comment.
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'subject' => 'Llama',
       'comment_body' => array(
         'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
@@ -101,7 +102,7 @@ public function testCommentEntity() {
     $this->verifyPageCache($this->entityTestCamelid->urlInfo(), 'HIT');
 
     // Create a "Hippopotamus" comment.
-    $this->entityTestHippopotamidae = entity_create('entity_test', array(
+    $this->entityTestHippopotamidae = EntityTest::create(array(
       'name' => 'Hippopotamus',
       'type' => 'bar',
     ));
diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
deleted file mode 100644
index 1164ba0..0000000
--- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\CommentDefaultFormatterCacheTagsTest.
- */
-
-namespace Drupal\comment\Tests;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\comment\CommentInterface;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\Session;
-
-/**
- * Tests the bubbling up of comment cache tags when using the Comment list
- * formatter on an entity.
- *
- * @group comment
- */
-class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('entity_test', 'comment');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $session = new Session();
-
-    $request = Request::create('/');
-    $request->setSession($session);
-
-    /** @var RequestStack $stack */
-    $stack = $this->container->get('request_stack');
-    $stack->pop();
-    $stack->push($request);
-
-    // Set the current user to one that can access comments. Specifically, this
-    // user does not have access to the 'administer comments' permission, to
-    // ensure only published comments are visible to the end user.
-    $current_user = $this->container->get('current_user');
-    $current_user->setAccount($this->createUser(array(), array('access comments')));
-
-    // Install tables and config needed to render comments.
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installConfig(array('system', 'filter', 'comment'));
-
-    // Comment rendering generates links, so build the router.
-    $this->installSchema('system', array('router'));
-    $this->container->get('router.builder')->rebuild();
-
-    // Set up a field, so that the entity that'll be referenced bubbles up a
-    // cache tag when rendering it entirely.
-    $this->addDefaultCommentField('entity_test', 'entity_test');
-  }
-
-  /**
-   * Tests the bubbling of cache tags.
-   */
-  public function testCacheTags() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-
-    // Create the entity that will be commented upon.
-    $commented_entity = entity_create('entity_test', array('name' => $this->randomMachineName()));
-    $commented_entity->save();
-
-    // Verify cache tags on the rendered entity before it has comments.
-    $build = \Drupal::entityManager()
-      ->getViewBuilder('entity_test')
-      ->view($commented_entity);
-    $renderer->renderRoot($build);
-    $expected_cache_tags = [
-      'entity_test_view',
-      'entity_test:'  . $commented_entity->id(),
-      'config:core.entity_form_display.comment.comment.default',
-      'config:field.field.comment.comment.comment_body',
-      'config:field.field.entity_test.entity_test.comment',
-      'config:field.storage.comment.comment_body',
-      'config:user.settings',
-    ];
-    sort($expected_cache_tags);
-    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
-
-    // Create a comment on that entity. Comment loading requires that the uid
-    // also exists in the {users} table.
-    $user = $this->createUser();
-    $user->save();
-    $comment = entity_create('comment', array(
-      'subject' => 'Llama',
-      'comment_body' => array(
-        'value' => 'Llamas are cool!',
-        'format' => 'plain_text',
-      ),
-      'entity_id' => $commented_entity->id(),
-      'entity_type' => 'entity_test',
-      'field_name' => 'comment',
-      'comment_type' => 'comment',
-      'status' => CommentInterface::PUBLISHED,
-      'uid' => $user->id(),
-    ));
-    $comment->save();
-
-    // Load commented entity so comment_count gets computed.
-    // @todo Remove the $reset = TRUE parameter after
-    //   https://www.drupal.org/node/597236 lands. It's a temporary work-around.
-    $commented_entity = entity_load('entity_test', $commented_entity->id(), TRUE);
-
-    // Verify cache tags on the rendered entity when it has comments.
-    $build = \Drupal::entityManager()
-      ->getViewBuilder('entity_test')
-      ->view($commented_entity);
-    $renderer->renderRoot($build);
-    $expected_cache_tags = [
-      'entity_test_view',
-      'entity_test:' . $commented_entity->id(),
-      'comment_view',
-      'comment:' . $comment->id(),
-      'config:filter.format.plain_text',
-      'user_view',
-      'user:2',
-      'config:core.entity_form_display.comment.comment.default',
-      'config:field.field.comment.comment.comment_body',
-      'config:field.field.entity_test.entity_test.comment',
-      'config:field.storage.comment.comment_body',
-      'config:user.settings',
-    ];
-    sort($expected_cache_tags);
-    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
-
-    // Build a render array with the entity in a sub-element so that lazy
-    // builder elements bubble up outside of the entity and we can check that
-    // it got the correct cache max age.
-    $build = ['#type' => 'container'];
-    $build['entity'] = \Drupal::entityManager()
-      ->getViewBuilder('entity_test')
-      ->view($commented_entity);
-    $renderer->renderRoot($build);
-
-    // The entity itself was cached but the top-level element is max-age 0 due
-    // to the bubbled up max age due to the lazy-built comment form.
-    $this->assertIdentical(Cache::PERMANENT, $build['entity']['#cache']['max-age']);
-    $this->assertIdentical(0, $build['#cache']['max-age'], 'Top level render array has max-age 0');
-
-    // The children (fields) of the entity render array are only built in case
-    // of a cache miss.
-    $this->assertFalse(isset($build['entity']['comment']), 'Cache hit');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/CommentFieldAccessTest.php b/core/modules/comment/src/Tests/CommentFieldAccessTest.php
deleted file mode 100644
index e55dbfb..0000000
--- a/core/modules/comment/src/Tests/CommentFieldAccessTest.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\comment\Tests\CommentFieldAccessTest.
- */
-
-namespace Drupal\comment\Tests;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\comment\Entity\CommentType;
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\simpletest\TestBase;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Tests comment field level access.
- *
- * @group comment
- * @group Access
- */
-class CommentFieldAccessTest extends EntityUnitTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('comment', 'entity_test', 'user');
-
-  /**
-   * Fields that only users with administer comments permissions can change.
-   *
-   * @var array
-   */
-  protected $administrativeFields = array(
-    'uid',
-    'status',
-    'created',
-  );
-
-  /**
-   * These fields are automatically managed and can not be changed by any user.
-   *
-   * @var array
-   */
-  protected $readOnlyFields = array(
-    'changed',
-    'hostname',
-    'cid',
-    'thread',
-  );
-
-  /**
-   * These fields can be edited on create only.
-   *
-   * @var array
-   */
-  protected $createOnlyFields = [
-    'uuid',
-    'pid',
-    'comment_type',
-    'entity_id',
-    'entity_type',
-    'field_name',
-  ];
-
-  /**
-   * These fields can only be edited by the admin or anonymous users if allowed.
-   *
-   * @var array
-   */
-  protected $contactFields = array(
-    'name',
-    'mail',
-    'homepage',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('user', 'comment'));
-    $this->installSchema('comment', array('comment_entity_statistics'));
-  }
-
-  /**
-   * Test permissions on comment fields.
-   */
-  public function testAccessToAdministrativeFields() {
-    // Create a comment type.
-    $comment_type = CommentType::create([
-      'id' => 'comment',
-      'label' => 'Default comments',
-      'description' => 'Default comment field',
-      'target_entity_type_id' => 'entity_test',
-    ]);
-    $comment_type->save();
-
-    // Create a comment against a test entity.
-    $host = EntityTest::create();
-    $host->save();
-
-    // An administrator user. No user exists yet, ensure that the first user
-    // does not have UID 1.
-    $comment_admin_user = $this->createUser(['uid' => 2, 'name' => 'admin'], [
-      'administer comments',
-      'access comments',
-    ]);
-
-    // Two comment enabled users, one with edit access.
-    $comment_enabled_user = $this->createUser(['name' => 'enabled'], [
-      'post comments',
-      'skip comment approval',
-      'edit own comments',
-      'access comments',
-    ]);
-    $comment_no_edit_user = $this->createUser(['name' => 'no edit'], [
-      'post comments',
-      'skip comment approval',
-      'access comments',
-    ]);
-
-    // An unprivileged user.
-    $comment_disabled_user = $this->createUser(['name' => 'disabled'], ['access content']);
-
-    $role = Role::load(RoleInterface::ANONYMOUS_ID);
-    $role->grantPermission('post comments')
-      ->save();
-
-    $anonymous_user = new AnonymousUserSession();
-
-    // Add two fields.
-    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment');
-    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment_other');
-
-    // Change the second field's anonymous contact setting.
-    $instance = FieldConfig::loadByName('entity_test', 'entity_test', 'comment_other');
-    // Default is 'May not contact', for this field - they may contact.
-    $instance->setSetting('anonymous', COMMENT_ANONYMOUS_MAY_CONTACT);
-    $instance->save();
-
-    // Create three "Comments". One is owned by our edit-enabled user.
-    $comment1 = Comment::create([
-      'entity_type' => 'entity_test',
-      'name' => 'Tony',
-      'hostname' => 'magic.example.com',
-      'mail' => 'tonythemagicalpony@example.com',
-      'subject' => 'Bruce the Mesopotamian moose',
-      'entity_id' => $host->id(),
-      'comment_type' => 'comment',
-      'field_name' => 'comment',
-      'pid' => 0,
-      'uid' => 0,
-      'status' => 1,
-    ]);
-    $comment1->save();
-    $comment2 = Comment::create([
-      'entity_type' => 'entity_test',
-      'hostname' => 'magic.example.com',
-      'subject' => 'Brian the messed up lion',
-      'entity_id' => $host->id(),
-      'comment_type' => 'comment',
-      'field_name' => 'comment',
-      'status' => 1,
-      'pid' => 0,
-      'uid' => $comment_enabled_user->id(),
-    ]);
-    $comment2->save();
-    $comment3 = Comment::create([
-      'entity_type' => 'entity_test',
-      'hostname' => 'magic.example.com',
-      // Unpublished.
-      'status' => 0,
-      'subject' => 'Gail the minky whale',
-      'entity_id' => $host->id(),
-      'comment_type' => 'comment',
-      'field_name' => 'comment_other',
-      'pid' => $comment2->id(),
-      'uid' => $comment_no_edit_user->id(),
-    ]);
-    $comment3->save();
-    // Note we intentionally don't save this comment so it remains 'new'.
-    $comment4 = Comment::create([
-      'entity_type' => 'entity_test',
-      'hostname' => 'magic.example.com',
-      // Unpublished.
-      'status' => 0,
-      'subject' => 'Daniel the Cocker-Spaniel',
-      'entity_id' => $host->id(),
-      'comment_type' => 'comment',
-      'field_name' => 'comment_other',
-      'pid' => 0,
-      'uid' => $anonymous_user->id(),
-    ]);
-
-    // Generate permutations.
-    $combinations = [
-      'comment' => [$comment1, $comment2, $comment3, $comment4],
-      'user' => [$comment_admin_user, $comment_enabled_user, $comment_no_edit_user, $comment_disabled_user, $anonymous_user]
-    ];
-    $permutations = TestBase::generatePermutations($combinations);
-
-    // Check access to administrative fields.
-    foreach ($this->administrativeFields as $field) {
-      foreach ($permutations as $set) {
-        $may_view = $set['comment']->{$field}->access('view', $set['user']);
-        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
-        $this->assertTrue($may_view, SafeMarkup::format('User @user can view field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-        $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), SafeMarkup::format('User @user @state update field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@state' => $may_update ? 'can' : 'cannot',
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-      }
-    }
-
-    // Check access to normal field.
-    foreach ($permutations as $set) {
-      $may_update = $set['comment']->access('update', $set['user']) && $set['comment']->subject->access('edit', $set['user']);
-      $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), SafeMarkup::format('User @user @state update field subject on comment @comment', [
-        '@user' => $set['user']->getUsername(),
-        '@state' => $may_update ? 'can' : 'cannot',
-        '@comment' => $set['comment']->getSubject(),
-      ]));
-    }
-
-    // Check read-only fields.
-    foreach ($this->readOnlyFields as $field) {
-      // Check view operation.
-      foreach ($permutations as $set) {
-        $may_view = $set['comment']->{$field}->access('view', $set['user']);
-        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
-        // Nobody has access to view the hostname field.
-        if ($field === 'hostname') {
-          $view_access = FALSE;
-          $state = 'cannot';
-        }
-        else {
-          $view_access = TRUE;
-          $state = 'can';
-        }
-        $this->assertEqual($may_view, $view_access, SafeMarkup::format('User @user @state view field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-          '@state' => $state,
-        ]));
-        $this->assertFalse($may_update, SafeMarkup::format('User @user @state update field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@state' => $may_update ? 'can' : 'cannot',
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-      }
-    }
-
-    // Check create-only fields.
-    foreach ($this->createOnlyFields as $field) {
-      // Check view operation.
-      foreach ($permutations as $set) {
-        $may_view = $set['comment']->{$field}->access('view', $set['user']);
-        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
-        $this->assertEqual($may_view, TRUE, SafeMarkup::format('User @user can view field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-        $this->assertEqual($may_update, $set['user']->hasPermission('post comments') && $set['comment']->isNew(), SafeMarkup::format('User @user @state update field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@state' => $may_update ? 'can' : 'cannot',
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-      }
-    }
-
-    // Check contact fields.
-    foreach ($this->contactFields as $field) {
-      // Check view operation.
-      foreach ($permutations as $set) {
-        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
-        // To edit the 'mail' or 'name' field, either the user has the
-        // "administer comments" permissions or the user is anonymous and
-        // adding a new comment using a field that allows contact details.
-        $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || (
-            $set['user']->isAnonymous() &&
-            $set['comment']->isNew() &&
-            $set['user']->hasPermission('post comments') &&
-            $set['comment']->getFieldName() == 'comment_other'
-          ), SafeMarkup::format('User @user @state update field @field on comment @comment', [
-          '@user' => $set['user']->getUsername(),
-          '@state' => $may_update ? 'can' : 'cannot',
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
-      }
-    }
-    foreach ($permutations as $set) {
-      // Check no view-access to mail field for other than admin.
-      $may_view = $set['comment']->mail->access('view', $set['user']);
-      $this->assertEqual($may_view, $set['user']->hasPermission('administer comments'));
-    }
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/CommentInterfaceTest.php b/core/modules/comment/src/Tests/CommentInterfaceTest.php
index 4b0e968..47f5b09 100644
--- a/core/modules/comment/src/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/src/Tests/CommentInterfaceTest.php
@@ -80,6 +80,12 @@ public function testCommentInterface() {
     $this->drupalGet('node/' . $this->node->id());
     $this->assertText($subject_text, 'Individual comment subject found.');
     $this->assertText($comment_text, 'Individual comment body found.');
+    $arguments = [
+      ':link' => base_path() . 'comment/' . $comment->id() . '#comment-' . $comment->id(),
+    ];
+    $pattern_permalink = '//footer[contains(@class,"comment__meta")]/a[contains(@href,:link) and text()="Permalink"]';
+    $permalink = $this->xpath($pattern_permalink, $arguments);
+    $this->assertTrue(!empty($permalink), 'Permalink link found.');
 
     // Set comments to have subject and preview to optional.
     $this->drupalLogout();
diff --git a/core/modules/comment/src/Tests/CommentItemTest.php b/core/modules/comment/src/Tests/CommentItemTest.php
deleted file mode 100644
index e81c6fb..0000000
--- a/core/modules/comment/src/Tests/CommentItemTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\CommentItemTest.
- */
-
-namespace Drupal\comment\Tests;
-
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the comment field type.
- *
- * @group comment
- */
-class CommentItemTest extends FieldUnitTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['comment', 'entity_test', 'user'];
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('comment', ['comment_entity_statistics']);
-    $this->installConfig(['comment']);
-  }
-
-  /**
-   * Tests using entity fields of the comment field type.
-   */
-  public function testCommentItem() {
-    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment');
-
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id, TRUE);
-    $this->assertTrue($entity->comment instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->comment[0] instanceof CommentItemInterface, 'Field item implements interface.');
-
-    // Test sample item generation.
-    /** @var \Drupal\entity_test\Entity\EntityTest $entity */
-    $entity = entity_create('entity_test');
-    $entity->comment->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-    $this->assertTrue(in_array($entity->get('comment')->status, [
-      CommentItemInterface::HIDDEN,
-      CommentItemInterface::CLOSED,
-      CommentItemInterface::OPEN,
-    ]), 'Comment status value in defined range');
-
-    $mainProperty = $entity->comment[0]->mainPropertyName();
-    $this->assertEqual('status', $mainProperty);
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/CommentLinksTest.php b/core/modules/comment/src/Tests/CommentLinksTest.php
index 68f9f0e..c21601d 100644
--- a/core/modules/comment/src/Tests/CommentLinksTest.php
+++ b/core/modules/comment/src/Tests/CommentLinksTest.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
 use Drupal\user\RoleInterface;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Basic comment links tests to ensure markup present.
@@ -59,7 +60,7 @@ public function testCommentLinks() {
 
     // Create a comment via CRUD API functionality, since
     // $this->postComment() relies on actual user permissions.
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'cid' => NULL,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
diff --git a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
index 46e2795..49c9e9e 100644
--- a/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
+++ b/core/modules/comment/src/Tests/CommentNewIndicatorTest.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Url;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests the 'new' indicator posted on comments.
@@ -85,7 +86,7 @@ public function testCommentNewCommentsIndicator() {
     // Create a new comment. This helper function may be run with different
     // comment settings so use $comment->save() to avoid complex setup.
     /** @var \Drupal\comment\CommentInterface $comment */
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'cid' => NULL,
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index aa06942..54c6630 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -11,6 +11,7 @@
 use Drupal\comment\Entity\Comment;
 use Drupal\comment\Entity\CommentType;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
@@ -54,7 +55,7 @@ protected function setUp() {
 
     // Create a bundle for entity_test.
     entity_test_create_bundle('entity_test', 'Entity Test', 'entity_test');
-    entity_create('comment_type', array(
+    CommentType::create(array(
       'id' => 'comment',
       'label' => 'Comment settings',
       'description' => 'Comment settings',
@@ -92,7 +93,7 @@ protected function setUp() {
     // Create a test entity.
     $random_label = $this->randomMachineName();
     $data = array('type' => 'entity_test', 'name' => $random_label);
-    $this->entity = entity_create('entity_test', $data);
+    $this->entity = EntityTest::create($data);
     $this->entity->save();
   }
 
@@ -433,7 +434,7 @@ function testCommentFunctionality() {
     // Test the new entity commenting inherits default.
     $random_label = $this->randomMachineName();
     $data = array('bundle' => 'entity_test', 'name' => $random_label);
-    $new_entity = entity_create('entity_test', $data);
+    $new_entity = EntityTest::create($data);
     $new_entity->save();
     $this->drupalGet('entity_test/manage/' . $new_entity->id() . '/edit');
     $this->assertNoFieldChecked('edit-field-foobar-0-status-1');
diff --git a/core/modules/comment/src/Tests/CommentPagerTest.php b/core/modules/comment/src/Tests/CommentPagerTest.php
index 9061f64..bfda400 100644
--- a/core/modules/comment/src/Tests/CommentPagerTest.php
+++ b/core/modules/comment/src/Tests/CommentPagerTest.php
@@ -173,9 +173,9 @@ function testCommentOrderingThreading() {
   /**
    * Asserts that the comments are displayed in the correct order.
    *
-   * @param $comments
-   *   And array of comments.
-   * @param $expected_order
+   * @param \Drupal\comment\CommentInterface[] $comments
+   *   An array of comments, must be of the type CommentInterface.
+   * @param array $expected_order
    *   An array of keys from $comments describing the expected order.
    */
   function assertCommentOrder(array $comments, array $expected_order) {
diff --git a/core/modules/comment/src/Tests/CommentPreviewTest.php b/core/modules/comment/src/Tests/CommentPreviewTest.php
index 8d4985a..eadb837 100644
--- a/core/modules/comment/src/Tests/CommentPreviewTest.php
+++ b/core/modules/comment/src/Tests/CommentPreviewTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\comment\Tests;
 
 use Drupal\comment\CommentManagerInterface;
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\comment\Entity\Comment;
 
@@ -54,7 +54,7 @@ function testCommentPreview() {
 
     \Drupal::state()->set('user_hooks_test_user_format_name_alter_safe', TRUE);
     $this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
-    $this->assertTrue(SafeMarkup::isSafe($this->webUser->getDisplayName()), 'Username is marked safe');
+    $this->assertTrue($this->webUser->getDisplayName() instanceof MarkupInterface, 'Username is marked safe');
     $this->assertNoEscaped('<em>' . $this->webUser->id() . '</em>');
     $this->assertRaw('<em>' . $this->webUser->id() . '</em>');
 
diff --git a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
deleted file mode 100644
index 0285432..0000000
--- a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\CommentStringIdEntitiesTest.
- */
-
-namespace Drupal\comment\Tests;
-
-use Drupal\comment\Entity\CommentType;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests that comment fields cannot be added to entities with non-integer IDs.
- *
- * @group comment
- */
-class CommentStringIdEntitiesTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array(
-    'comment',
-    'user',
-    'field',
-    'field_ui',
-    'entity_test',
-    'text',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('comment');
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    // Create the comment body field storage.
-    $this->installConfig(array('field'));
-  }
-
-  /**
-   * Tests that comment fields cannot be added entities with non-integer IDs.
-   */
-  public function testCommentFieldNonStringId() {
-    try {
-      $bundle = CommentType::create(array(
-        'id' => 'foo',
-        'label' => 'foo',
-        'description' => '',
-        'target_entity_type_id' => 'entity_test_string_id',
-      ));
-      $bundle->save();
-      $field_storage = entity_create('field_storage_config', array(
-        'field_name' => 'foo',
-        'entity_type' => 'entity_test_string_id',
-        'settings' => array(
-          'comment_type' => 'entity_test_string_id',
-        ),
-        'type' => 'comment',
-      ));
-      $field_storage->save();
-      $this->fail('Did not throw an exception as expected.');
-    }
-    catch (\UnexpectedValueException $e) {
-      $this->pass('Exception thrown when trying to create comment field on Entity Type with string ID.');
-    }
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/CommentValidationTest.php b/core/modules/comment/src/Tests/CommentValidationTest.php
deleted file mode 100644
index 5c30d89..0000000
--- a/core/modules/comment/src/Tests/CommentValidationTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\CommentValidationTest.
- */
-
-namespace Drupal\comment\Tests;
-
-use Drupal\comment\CommentInterface;
-use Drupal\node\Entity\Node;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * Tests comment validation constraints.
- *
- * @group comment
- */
-class CommentValidationTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('comment', 'node');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('comment', array('comment_entity_statistics'));
-  }
-
-  /**
-   * Tests the comment validation constraints.
-   */
-  public function testValidation() {
-    // Add a user.
-    $user = User::create(array('name' => 'test', 'status' => TRUE));
-    $user->save();
-
-    // Add comment type.
-    $this->entityManager->getStorage('comment_type')->create(array(
-      'id' => 'comment',
-      'label' => 'comment',
-      'target_entity_type_id' => 'node',
-    ))->save();
-
-    // Add comment field to content.
-    $this->entityManager->getStorage('field_storage_config')->create(array(
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'type' => 'comment',
-      'settings' => array(
-        'comment_type' => 'comment',
-      )
-    ))->save();
-
-    // Create a page node type.
-    $this->entityManager->getStorage('node_type')->create(array(
-      'type' => 'page',
-      'name' => 'page',
-    ))->save();
-
-    // Add comment field to page content.
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = $this->entityManager->getStorage('field_config')->create(array(
-      'field_name' => 'comment',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-      'label' => 'Comment settings',
-    ));
-    $field->save();
-
-    $node = $this->entityManager->getStorage('node')->create(array(
-      'type' => 'page',
-      'title' => 'test',
-    ));
-    $node->save();
-
-    $comment = $this->entityManager->getStorage('comment')->create(array(
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'comment_body' => $this->randomMachineName(),
-    ));
-
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 0, 'No violations when validating a default comment.');
-
-    $comment->set('subject', $this->randomString(65));
-    $this->assertLengthViolation($comment, 'subject', 64);
-
-    // Make the subject valid.
-    $comment->set('subject', $this->randomString());
-    $comment->set('name', $this->randomString(61));
-    $this->assertLengthViolation($comment, 'name', 60);
-
-    // Validate a name collision between an anonymous comment author name and an
-    // existing user account name.
-    $comment->set('name', 'test');
-    $comment->set('uid', 0);
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, "Violation found on author name collision");
-    $this->assertEqual($violations[0]->getPropertyPath(), "name");
-    $this->assertEqual($violations[0]->getMessage(), t('The name you used (%name) belongs to a registered user.', array('%name' => 'test')));
-
-    // Make the name valid.
-    $comment->set('name', 'valid unused name');
-    $comment->set('mail', 'invalid');
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, 'Violation found when email is invalid');
-    $this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
-    $this->assertEqual($violations[0]->getMessage(), t('This value is not a valid email address.'));
-
-    $comment->set('mail', NULL);
-    $comment->set('homepage', 'http://example.com/' . $this->randomMachineName(237));
-    $this->assertLengthViolation($comment, 'homepage', 255);
-
-    $comment->set('homepage', 'invalid');
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, 'Violation found when homepage is invalid');
-    $this->assertEqual($violations[0]->getPropertyPath(), 'homepage.0.value');
-
-    // @todo This message should be improved in
-    //   https://www.drupal.org/node/2012690.
-    $this->assertEqual($violations[0]->getMessage(), t('This value should be of the correct primitive type.'));
-
-    $comment->set('homepage', NULL);
-    $comment->set('hostname', $this->randomString(129));
-    $this->assertLengthViolation($comment, 'hostname', 128);
-
-    $comment->set('hostname', NULL);
-    $comment->set('thread', $this->randomString(256));
-    $this->assertLengthViolation($comment, 'thread', 255);
-
-    $comment->set('thread', NULL);
-
-    // Force anonymous users to enter contact details.
-    $field->setSetting('anonymous', COMMENT_ANONYMOUS_MUST_CONTACT);
-    $field->save();
-    // Reset the node entity.
-    \Drupal::entityManager()->getStorage('node')->resetCache([$node->id()]);
-    $node = Node::load($node->id());
-    // Create a new comment with the new field.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'comment_body' => $this->randomMachineName(),
-      'uid' => 0,
-      'name' => '',
-    ));
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, 'Violation found when name is required, but empty and UID is anonymous.');
-    $this->assertEqual($violations[0]->getPropertyPath(), 'name');
-    $this->assertEqual($violations[0]->getMessage(), t('You have to specify a valid author.'));
-
-    // Test creating a default comment with a given user id works.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'comment_body' => $this->randomMachineName(),
-      'uid' => $user->id(),
-    ));
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 0, 'No violations when validating a default comment with an author.');
-
-    // Test specifying a wrong author name does not work.
-    $comment = $this->entityManager->getStorage('comment')->create(array(
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'comment_body' => $this->randomMachineName(),
-      'uid' => $user->id(),
-      'name' => 'not-test',
-    ));
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, 'Violation found when author name and comment author do not match.');
-    $this->assertEqual($violations[0]->getPropertyPath(), 'name');
-    $this->assertEqual($violations[0]->getMessage(), t('The specified author name does not match the comment author.'));
-  }
-
-  /**
-   * Verifies that a length violation exists for the given field.
-   *
-   * @param \Drupal\comment\CommentInterface $comment
-   *   The comment object to validate.
-   * @param string $field_name
-   *   The field that violates the maximum length.
-   * @param int $length
-   *   Number of characters that was exceeded.
-   */
-  protected function assertLengthViolation(CommentInterface $comment, $field_name, $length) {
-    $violations = $comment->validate();
-    $this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
-    $this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
-    $field_label = $comment->get($field_name)->getFieldDefinition()->getLabel();
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php b/core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php
deleted file mode 100644
index 22818f5..0000000
--- a/core/modules/comment/src/Tests/Migrate/MigrateCommentStubTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\MigrateCommentStubTest.
- */
-
-namespace Drupal\comment\Tests\Migrate;
-
-use Drupal\comment\Entity\CommentType;
-use Drupal\migrate\MigrateException;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Test stub creation for comment entities.
- *
- * @group comment
- */
-class MigrateCommentStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('node');
-    // Make sure uid 0 is created (default uid for comments is 0).
-    $storage = \Drupal::entityManager()->getStorage('user');
-    // Insert a row for the anonymous user.
-    $storage
-      ->create(array(
-        'uid' => 0,
-        'status' => 0,
-        'name' => '',
-      ))
-      ->save();
-    // Need at least one node type and comment type present.
-    NodeType::create([
-      'type' => 'testnodetype',
-      'name' => 'Test node type',
-    ])->save();
-    CommentType::create([
-      'id' => 'testcommenttype',
-      'label' => 'Test comment type',
-      'target_entity_type_id' => 'node',
-    ])->save();
-  }
-
-  /**
-   * Tests creation of comment stubs.
-   */
-  public function testStub() {
-    try {
-      // We expect an exception, because there's no node to reference.
-      $this->performStubTest('comment');
-      $this->fail('Expected exception has not been thrown.');
-    }
-    catch (MigrateException $e) {
-      $this->assertIdentical($e->getMessage(),
-        'Stubbing failed, unable to generate value for field entity_id');
-    }
-
-    // The stub should pass when there's a node to point to.
-    $this->createStub('node');
-    $this->performStubTest('comment');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
deleted file mode 100644
index 7219d95..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade comments.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentTest extends MigrateDrupal6TestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installSchema('comment', ['comment_entity_statistics']);
-    $this->installSchema('system', ['router']);
-    $this->installConfig(['comment']);
-
-    // The entity.node.canonical route must exist when the RDF hook is called.
-    $this->container->get('router.builder')->rebuild();
-
-    $this->migrateContent();
-    $this->executeMigrations([
-      'd6_comment_type',
-      'd6_comment_field',
-      'd6_comment_field_instance',
-      'd6_comment_entity_display',
-      'd6_comment_entity_form_display',
-      'd6_comment',
-    ]);
-  }
-
-  /**
-   * Tests the Drupal 6 to Drupal 8 comment migration.
-   */
-  public function testComments() {
-    /** @var \Drupal\Core\Entity\EntityStorageInterface $comment_storage */
-    $comment_storage = $this->container->get('entity.manager')->getStorage('comment');
-    /** @var \Drupal\comment\CommentInterface $comment */
-    $comment = $comment_storage->load(1);
-    $this->assertIdentical('The first comment.', $comment->getSubject());
-    $this->assertIdentical('The first comment body.', $comment->comment_body->value);
-    $this->assertIdentical('filtered_html', $comment->comment_body->format);
-    $this->assertIdentical('0', $comment->pid->target_id);
-    $this->assertIdentical('1', $comment->getCommentedEntityId());
-    $this->assertIdentical('node', $comment->getCommentedEntityTypeId());
-    $this->assertIdentical('en', $comment->language()->getId());
-    $this->assertIdentical('comment_no_subject', $comment->getTypeId());
-
-    $comment = $comment_storage->load(2);
-    $this->assertIdentical('The response to the second comment.', $comment->subject->value);
-    $this->assertIdentical('3', $comment->pid->target_id);
-
-    $comment = $comment_storage->load(3);
-    $this->assertIdentical('The second comment.', $comment->subject->value);
-    $this->assertIdentical('0', $comment->pid->target_id);
-  }
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
deleted file mode 100644
index bedf132..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentTypeTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\comment\Entity\CommentType;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade comment type.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installConfig(['node', 'comment']);
-    $this->executeMigration('d6_comment_type');
-  }
-
-  /**
-   * Tests the Drupal 6 to Drupal 8 comment type migration.
-   */
-  public function testCommentType() {
-    $comment_type = CommentType::load('comment');
-    $this->assertIdentical('node', $comment_type->getTargetEntityTypeId());
-    $comment_type = CommentType::load('comment_no_subject');
-    $this->assertIdentical('node', $comment_type->getTargetEntityTypeId());
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php
deleted file mode 100644
index 9997733..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableDisplayBase.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Base class for Drupal 6 comment variables to Drupal 8 entity display tests.
- */
-abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['comment']);
-    $this->migrateContentTypes();
-    $this->executeMigrations([
-      'd6_comment_type',
-      'd6_comment_field',
-      'd6_comment_field_instance',
-    ]);
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
deleted file mode 100644
index 232654f..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityDisplayTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-
-/**
- * Upgrade comment variables to entity.display.node.*.default.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentVariableEntityDisplayTest extends MigrateCommentVariableDisplayBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_comment_entity_display');
-  }
-
-  /**
-   * Tests comment variables migrated into an entity display.
-   */
-  public function testCommentEntityDisplay() {
-    foreach (['page', 'story', 'article'] as $type) {
-      $component = EntityViewDisplay::load('node.' . $type . '.default')->getComponent('comment');
-      $this->assertIdentical('hidden', $component['label']);
-      $this->assertIdentical('comment_default', $component['type']);
-      $this->assertIdentical(20, $component['weight']);
-    }
-  }
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
deleted file mode 100644
index 4875e6a..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityFormDisplaySubjectTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['comment']);
-    $this->executeMigrations([
-      'd6_comment_type',
-      'd6_comment_entity_form_display_subject',
-    ]);
-  }
-
-  /**
-   * Tests comment subject variable migrated into an entity display.
-   */
-  public function testCommentEntityFormDisplay() {
-    $component = EntityFormDisplay::load('comment.comment.default')
-      ->getComponent('subject');
-    $this->assertIdentical('string_textfield', $component['type']);
-    $this->assertIdentical(10, $component['weight']);
-    $component = EntityFormDisplay::load('comment.comment_no_subject.default')
-      ->getComponent('subject');
-    $this->assertNull($component);
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
deleted file mode 100644
index e1496d2..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableEntityFormDisplayTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-
-/**
- * Upgrade comment variables to core.entity_form_display.node.*.default.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentVariableEntityFormDisplayTest extends MigrateCommentVariableDisplayBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_comment_entity_form_display');
-  }
-
-  /**
-   * Tests comment variables migrated into an entity display.
-   */
-  public function testCommentEntityFormDisplay() {
-    foreach (['page', 'article', 'story'] as $type) {
-      $component = EntityFormDisplay::load('node.' . $type . '.default')
-        ->getComponent('comment');
-      $this->assertIdentical('comment_default', $component['type']);
-      $this->assertIdentical(20, $component['weight']);
-    }
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
deleted file mode 100644
index e70c9a3..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableFieldTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade comment variables to field.storage.node.comment.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['comment']);
-    $this->migrateContentTypes();
-    $this->executeMigrations(['d6_comment_type', 'd6_comment_field']);
-  }
-
-  /**
-   * Tests comment variables migrated into a field entity.
-   */
-  public function testCommentField() {
-    $this->assertTrue(is_object(FieldStorageConfig::load('node.comment')));
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
deleted file mode 100644
index 7b50125..0000000
--- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d6\MigrateCommentVariableInstanceTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d6;
-
-use Drupal\comment\CommentManagerInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Upgrade comment variables to field.instance.node.*.comment.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['comment']);
-    $this->migrateContentTypes();
-    $this->executeMigrations([
-      'd6_comment_type',
-      'd6_comment_field',
-      'd6_comment_field_instance',
-    ]);
-  }
-
-  /**
-   * Test the migrated field instance values.
-   */
-  public function testCommentFieldInstance() {
-    $node = Node::create(['type' => 'page']);
-    $this->assertIdentical(0, $node->comment->status);
-    $this->assertIdentical('comment', $node->comment->getFieldDefinition()->getName());
-    $settings = $node->comment->getFieldDefinition()->getSettings();
-    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_THREADED, $settings['default_mode']);
-    $this->assertIdentical(50, $settings['per_page']);
-    $this->assertFalse($settings['anonymous']);
-    $this->assertFalse($settings['form_location']);
-    $this->assertTrue($settings['preview']);
-
-    $node = Node::create(['type' => 'story']);
-    $this->assertIdentical(2, $node->comment_no_subject->status);
-    $this->assertIdentical('comment_no_subject', $node->comment_no_subject->getFieldDefinition()->getName());
-    $settings = $node->comment_no_subject->getFieldDefinition()->getSettings();
-    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_FLAT, $settings['default_mode']);
-    $this->assertIdentical(70, $settings['per_page']);
-    $this->assertTrue($settings['anonymous']);
-    $this->assertFalse($settings['form_location']);
-    $this->assertFalse($settings['preview']);
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php
deleted file mode 100644
index 14b3536..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityDisplayTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityDisplayTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of comment display configuration.
- *
- * @group comment
- */
-class MigrateCommentEntityDisplayTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_comment_field',
-      'd7_comment_field_instance',
-      'd7_comment_entity_display',
-    ]);
-  }
-
-  /**
-   * Asserts a display entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $component_id
-   *   The ID of the display component.
-   */
-  protected function assertDisplay($id, $component_id) {
-    $component = EntityViewDisplay::load($id)->getComponent($component_id);
-    $this->assertTrue(is_array($component));
-    $this->assertIdentical('hidden', $component['label']);
-    $this->assertIdentical('comment_default', $component['type']);
-    $this->assertIdentical(20, $component['weight']);
-  }
-
-  /**
-   * Tests the migrated display configuration.
-   */
-  public function testMigration() {
-    $this->assertDisplay('node.page.default', 'comment_node_page');
-    $this->assertDisplay('node.article.default', 'comment_node_article');
-    $this->assertDisplay('node.book.default', 'comment_node_book');
-    $this->assertDisplay('node.blog.default', 'comment_node_blog');
-    $this->assertDisplay('node.forum.default', 'comment_node_forum');
-    $this->assertDisplay('node.test_content_type.default', 'comment_node_test_content_type');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
deleted file mode 100644
index c261ffb..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityFormDisplaySubjectTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of comment form's subject display configuration.
- *
- * @group comment
- */
-class MigrateCommentEntityFormDisplaySubjectTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_comment_entity_form_display_subject',
-    ]);
-  }
-
-  /**
-   * Asserts a display entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   */
-  protected function assertDisplay($id) {
-    $component = EntityFormDisplay::load($id)->getComponent('subject');
-    $this->assertTrue(is_array($component));
-    $this->assertIdentical('string_textfield', $component['type']);
-    $this->assertIdentical(10, $component['weight']);
-  }
-
-  /**
-   * Tests the migrated display configuration.
-   */
-  public function testMigration() {
-    $this->assertDisplay('comment.comment_node_page.default');
-    $this->assertDisplay('comment.comment_node_article.default');
-    $this->assertDisplay('comment.comment_node_book.default');
-    $this->assertDisplay('comment.comment_node_blog.default');
-    $this->assertDisplay('comment.comment_node_forum.default');
-    $this->assertDisplay('comment.comment_node_test_content_type.default');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
deleted file mode 100644
index 2700a4c..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentEntityFormDisplayTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of comment form display configuration.
- *
- * @group comment
- */
-class MigrateCommentEntityFormDisplayTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_comment_field',
-      'd7_comment_field_instance',
-      'd7_comment_entity_form_display',
-    ]);
-  }
-
-  /**
-   * Asserts a display entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $component
-   *   The ID of the form component.
-   */
-  protected function assertDisplay($id, $component_id) {
-    $component = EntityFormDisplay::load($id)->getComponent($component_id);
-    $this->assertTrue(is_array($component));
-    $this->assertIdentical('comment_default', $component['type']);
-    $this->assertIdentical(20, $component['weight']);
-  }
-
-  /**
-   * Tests the migrated display configuration.
-   */
-  public function testMigration() {
-    $this->assertDisplay('node.page.default', 'comment');
-    $this->assertDisplay('node.article.default', 'comment');
-    $this->assertDisplay('node.book.default', 'comment');
-    $this->assertDisplay('node.blog.default', 'comment');
-    $this->assertDisplay('node.forum.default', 'comment');
-    $this->assertDisplay('node.test_content_type.default', 'comment');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php
deleted file mode 100644
index c84621b..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldInstanceTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentFieldInstanceTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\Core\Field\FieldConfigInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests creation of comment reference fields for each comment type defined
- * in Drupal 7.
- *
- * @group comment
- */
-class MigrateCommentFieldInstanceTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_comment_field',
-      'd7_comment_field_instance',
-    ]);
-  }
-
-  /**
-   * Asserts a comment field entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $field_name
-   *   The field name.
-   * @param string $bundle
-   *   The bundle ID.
-   * @param int $default_mode
-   *   The field's default_mode setting.
-   * @param int $per_page
-   *   The field's per_page setting.
-   * @param bool $anonymous
-   *   The field's anonymous setting.
-   * @param int $form_location
-   *   The field's form_location setting.
-   * @param bool $preview
-   *   The field's preview setting.
-   */
-  protected function assertEntity($id, $field_name, $bundle, $default_mode, $per_page, $anonymous, $form_location, $preview) {
-    $entity = FieldConfig::load($id);
-    $this->assertTrue($entity instanceof FieldConfigInterface);
-    /** @var \Drupal\field\FieldConfigInterface $entity */
-    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
-    $this->assertIdentical('Comments', $entity->label());
-    $this->assertTrue($entity->isRequired());
-    $this->assertIdentical($field_name, $entity->getFieldStorageDefinition()->getName());
-    $this->assertIdentical($bundle, $entity->getTargetBundle());
-    $this->assertTrue($entity->get('default_value')[0]['status']);
-    $this->assertEqual($default_mode, $entity->getSetting('default_mode'));
-    $this->assertIdentical($per_page, $entity->getSetting('per_page'));
-    $this->assertEqual($anonymous, $entity->getSetting('anonymous'));
-    // This assertion fails because 1 !== TRUE. It's extremely strange that
-    // the form_location setting is returning a boolean, but this appears to
-    // be a problem with the entity, not with the migration.
-    // $this->asserIdentical($form_location, $entity->getSetting('form_location'));
-    $this->assertEqual($preview, $entity->getSetting('preview'));
-  }
-
-  /**
-   * Tests the migrated fields.
-   */
-  public function testMigration() {
-    $this->assertEntity('node.page.comment_node_page', 'comment_node_page', 'page', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-    $this->assertEntity('node.article.comment_node_article', 'comment_node_article', 'article', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-    $this->assertEntity('node.blog.comment_node_blog', 'comment_node_blog', 'blog', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-    $this->assertEntity('node.book.comment_node_book', 'comment_node_book', 'book', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-    $this->assertEntity('node.forum.comment_node_forum', 'comment_node_forum', 'forum', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-    $this->assertEntity('node.test_content_type.comment_node_test_content_type', 'comment_node_test_content_type', 'test_content_type', TRUE, 30, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php
deleted file mode 100644
index bf93f71..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentFieldTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentFieldTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests creation of comment reference fields for each comment type defined
- * in Drupal 7.
- *
- * @group comment
- */
-class MigrateCommentFieldTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_comment_field',
-    ]);
-  }
-
-  /**
-   * Asserts a comment field entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $comment_type
-   *   The comment type (bundle ID) the field references.
-   */
-  protected function assertEntity($id, $comment_type) {
-    $entity = FieldStorageConfig::load($id);
-    $this->assertTrue($entity instanceof FieldStorageConfigInterface);
-    /** @var \Drupal\field\FieldStorageConfigInterface $entity */
-    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
-    $this->assertIdentical('comment', $entity->getType());
-    $this->assertIdentical($comment_type, $entity->getSetting('comment_type'));
-  }
-
-  /**
-   * Tests the migrated fields.
-   */
-  public function testMigration() {
-    $this->assertEntity('node.comment_node_page', 'comment_node_page');
-    $this->assertEntity('node.comment_node_article', 'comment_node_article');
-    $this->assertEntity('node.comment_node_blog', 'comment_node_blog');
-    $this->assertEntity('node.comment_node_book', 'comment_node_book');
-    $this->assertEntity('node.comment_node_forum', 'comment_node_forum');
-    $this->assertEntity('node.comment_node_test_content_type', 'comment_node_test_content_type');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php
deleted file mode 100644
index 8d6e668..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\comment\CommentInterface;
-use Drupal\comment\Entity\Comment;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\NodeInterface;
-
-/**
- * Tests migration of comments from Drupal 7.
- *
- * @group comment
- */
-class MigrateCommentTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['filter', 'node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(static::$modules);
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-
-    $this->executeMigrations([
-      'd7_filter_format',
-      'd7_user_role',
-      'd7_user',
-    ]);
-    $this->executeMigration('d7_node_type');
-    // We only need the test_content_type node migration to run for real, so
-    // mock all the others.
-    $this->prepareMigrations(array(
-      'd7_node:*' => array(
-        array(array(0), array(0)),
-      ),
-    ));
-    $this->executeMigrations([
-      'd7_node__test_content_type',
-      'd7_comment_type',
-      'd7_comment',
-    ]);
-  }
-
-  /**
-   * Tests migration of comments from Drupal 7.
-   */
-  public function testCommentMigration() {
-    $comment = Comment::load(1);
-    $this->assertTrue($comment instanceof CommentInterface);
-    /** @var \Drupal\comment\CommentInterface $comment */
-    $this->assertIdentical('A comment', $comment->getSubject());
-    $this->assertIdentical('1421727536', $comment->getCreatedTime());
-    $this->assertIdentical('1421727536', $comment->getChangedTime());
-    $this->assertTrue($comment->getStatus());
-    $this->assertIdentical('admin', $comment->getAuthorName());
-    $this->assertIdentical('admin@local.host', $comment->getAuthorEmail());
-    $this->assertIdentical('This is a comment', $comment->comment_body->value);
-    $this->assertIdentical('filtered_html', $comment->comment_body->format);
-
-    $node = $comment->getCommentedEntity();
-    $this->assertTrue($node instanceof NodeInterface);
-    $this->assertIdentical('1', $node->id());
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php b/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php
deleted file mode 100644
index 409631d..0000000
--- a/core/modules/comment/src/Tests/Migrate/d7/MigrateCommentTypeTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Migrate\d7\MigrateCommentTypeTest.
- */
-
-namespace Drupal\comment\Tests\Migrate\d7;
-
-use Drupal\comment\CommentTypeInterface;
-use Drupal\comment\Entity\CommentType;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of comment types from Drupal 7.
- *
- * @group comment
- */
-class MigrateCommentTypeTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'comment', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-    ]);
-  }
-
-  /**
-   * Asserts a comment type entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $label
-   *   The entity label.
-   */
-  protected function assertEntity($id, $label) {
-    $entity = CommentType::load($id);
-    $this->assertTrue($entity instanceof CommentTypeInterface);
-    /** @var \Drupal\comment\CommentTypeInterface $entity */
-    $this->assertIdentical($label, $entity->label());
-    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
-  }
-
-  /**
-   * Tests the migrated comment types.
-   */
-  public function testMigration() {
-    $this->assertEntity('comment_node_page', 'Basic page comment');
-    $this->assertEntity('comment_node_article', 'Article comment');
-    $this->assertEntity('comment_node_blog', 'Blog entry comment');
-    $this->assertEntity('comment_node_book', 'Book page comment');
-    $this->assertEntity('comment_node_forum', 'Forum topic comment');
-    $this->assertEntity('comment_node_test_content_type', 'Test content type comment');
-
-    // Validate that the source count and processed count match up.
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = Migration::load('d7_comment_type');
-    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php b/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
index 4fd7d58..03b31ff 100644
--- a/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
+++ b/core/modules/comment/src/Tests/Views/CommentFieldFilterTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests\Views;
 
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests comment field filters with translations.
@@ -61,7 +62,7 @@ function setUp() {
       'pid' => '',
       'node_type' => '',
     );
-    $this->comment = entity_create('comment', $comment);
+    $this->comment = Comment::create($comment);
 
     // Add field values and translate the comment.
     $this->comment->subject->value = $this->commentTitles['en'];
diff --git a/core/modules/comment/src/Tests/Views/CommentLinksTest.php b/core/modules/comment/src/Tests/Views/CommentLinksTest.php
deleted file mode 100644
index 90269a1..0000000
--- a/core/modules/comment/src/Tests/Views/CommentLinksTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Views\CommentLinksTest.
- */
-
-namespace Drupal\comment\Tests\Views;
-
-use Drupal\comment\CommentInterface;
-use Drupal\comment\CommentManagerInterface;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\Core\Url;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\views\Views;
-
-/**
- * Tests the comment link field handlers.
- *
- * @group comment
- */
-class CommentLinksTest extends CommentViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_comment'];
-
-  /**
-   * Test the comment approve link.
-   */
-  public function testLinkApprove() {
-
-    // Create an unapproved comment.
-    $comment = $this->commentStorage->create([
-      'uid' => $this->adminUser->id(),
-      'entity_type' => 'entity_test',
-      'comment_type' => 'entity_test',
-      'status' => 0,
-    ]);
-    $comment->save();
-
-    $view = Views::getView('test_comment');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', [
-      'approve_comment' => [
-        'table' => 'comment',
-        'field' => 'approve_comment',
-        'id' => 'approve_comment',
-        'plugin_id' => 'comment_link_approve',
-      ],
-    ]);
-    $view->save();
-
-    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
-    $account_switcher = \Drupal::service('account_switcher');
-    $account_switcher->switchTo($this->adminUser);
-
-    $view->preview();
-
-    // Check if I can see the comment approve link on an unapproved comment.
-    $approve_comment = $view->style_plugin->getField(0, 'approve_comment');
-    $options = ['query' => ['destination' => '/']];
-    $url = Url::fromRoute('comment.approve', ['comment' => $comment->id()], $options);
-    $this->assertEqual(\Drupal::l('Approve', $url), (string) $approve_comment, 'Found a comment approve link for an unapproved comment.');
-
-    // Approve the comment.
-    $comment->setPublished(CommentInterface::PUBLISHED);
-    $comment->save();
-    $view = Views::getView('test_comment');
-    $view->preview();
-
-    // Check if I can see the comment approve link on an approved comment.
-    $approve_comment = $view->style_plugin->getField(1, 'approve_comment');
-    $this->assertFalse((string) $approve_comment, "Didn't find a comment approve link for an already approved comment.");
-
-    // Check if I can see the comment approve link on an approved comment as an
-    // anonymous user.
-    $account_switcher->switchTo(new AnonymousUserSession());
-    // Set the comment as unpublished again.
-    $comment->setPublished(CommentInterface::NOT_PUBLISHED);
-    $comment->save();
-
-    $view = Views::getView('test_comment');
-    $view->preview();
-    $replyto_comment = $view->style_plugin->getField(0, 'approve_comment');
-    $this->assertFalse((string) $replyto_comment, "I can't approve the comment as an anonymous user.");
-  }
-
-  /**
-   * Test the comment reply link.
-   */
-  public function testLinkReply() {
-    $this->enableModules(['field', 'entity_test']);
-    $this->installEntitySchema('entity_test');
-    $this->installSchema('comment', ['comment_entity_statistics']);
-    $this->installConfig(['field']);
-
-    $field_storage_comment = FieldStorageConfig::create([
-      'field_name' => 'comment',
-      'type' => 'comment',
-      'entity_type' => 'entity_test',
-    ]);
-    $field_storage_comment->save();
-    // Create a comment field which allows threading.
-    $field_comment = FieldConfig::create([
-      'field_name' => 'comment',
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'settings' => [
-        'default_mode' => CommentManagerInterface::COMMENT_MODE_THREADED,
-      ],
-    ]);
-    $field_comment->save();
-
-    $host = EntityTest::create(['name' => $this->randomString()]);
-    $host->save();
-    // Attach an unapproved comment to the test entity.
-    $comment = $this->commentStorage->create([
-      'uid' => $this->adminUser->id(),
-      'entity_type' => 'entity_test',
-      'entity_id' => $host->id(),
-      'comment_type' => 'entity_test',
-      'field_name' => $field_storage_comment->getName(),
-      'status' => 0,
-    ]);
-    $comment->save();
-
-    $view = Views::getView('test_comment');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', [
-      'replyto_comment' => [
-        'table' => 'comment',
-        'field' => 'replyto_comment',
-        'id' => 'replyto_comment',
-        'plugin_id' => 'comment_link_reply',
-        'entity_type' => 'comment',
-      ],
-    ]);
-    $view->save();
-
-    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
-    $account_switcher = \Drupal::service('account_switcher');
-    $account_switcher->switchTo($this->adminUser);
-    $view->preview();
-
-    // Check if I can see the reply link on an unapproved comment.
-    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
-    $this->assertFalse((string) $replyto_comment, "I can't reply to an unapproved comment.");
-
-    // Approve the comment.
-    $comment->setPublished(CommentInterface::PUBLISHED);
-    $comment->save();
-    $view = Views::getView('test_comment');
-    $view->preview();
-
-    // Check if I can see the reply link on an approved comment.
-    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
-    $url = Url::fromRoute('comment.reply', [
-      'entity_type' => 'entity_test',
-      'entity' => $host->id(),
-      'field_name' => 'comment',
-      'pid' => $comment->id(),
-    ]);
-    $this->assertEqual(\Drupal::l('Reply', $url), (string) $replyto_comment, 'Found the comment reply link as an admin user.');
-
-    // Check if I can see the reply link as an anonymous user.
-    $account_switcher->switchTo(new AnonymousUserSession());
-    $view = Views::getView('test_comment');
-    $view->preview();
-    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
-    $this->assertFalse((string) $replyto_comment, "Didn't find the comment reply link as an anonymous user.");
-  }
-}
diff --git a/core/modules/comment/src/Tests/Views/CommentRestExportTest.php b/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
index 9737b4f..b2f334c 100644
--- a/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
+++ b/core/modules/comment/src/Tests/Views/CommentRestExportTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\comment\Tests\Views;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests a comment rest export view.
@@ -43,7 +44,7 @@ protected function setUp() {
       'name' => 'bobby tables',
       'hostname' => 'public.example.com',
     );
-    $this->comment = entity_create('comment', $comment);
+    $this->comment = Comment::create($comment);
     $this->comment->save();
 
     $user = $this->drupalCreateUser(['access comments']);
diff --git a/core/modules/comment/src/Tests/Views/CommentTestBase.php b/core/modules/comment/src/Tests/Views/CommentTestBase.php
index 202bf47..2067e2d 100644
--- a/core/modules/comment/src/Tests/Views/CommentTestBase.php
+++ b/core/modules/comment/src/Tests/Views/CommentTestBase.php
@@ -10,6 +10,7 @@
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests the argument_comment_user_uid handler.
@@ -87,7 +88,7 @@ protected function setUp() {
       'pid' => '',
       'mail' => 'someone@example.com',
     );
-    $this->comment = entity_create('comment', $comment);
+    $this->comment = Comment::create($comment);
     $this->comment->save();
   }
 
diff --git a/core/modules/comment/src/Tests/Views/CommentUserNameTest.php b/core/modules/comment/src/Tests/Views/CommentUserNameTest.php
deleted file mode 100644
index e26d7dc..0000000
--- a/core/modules/comment/src/Tests/Views/CommentUserNameTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Views\CommentUserNameTest.
- */
-
-namespace Drupal\comment\Tests\Views;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests comment user name field
- *
- * @group comment
- */
-class CommentUserNameTest extends ViewKernelTestBase {
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user', 'comment', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('comment');
-    // Create the anonymous role.
-    $this->installConfig(['user']);
-
-    // Create an anonymous user.
-    $storage = \Drupal::entityManager()->getStorage('user');
-    // Insert a row for the anonymous user.
-    $storage
-      ->create(array(
-        'uid' => 0,
-        'name' => '',
-        'status' => 0,
-      ))
-      ->save();
-
-    $admin_role = Role::create([
-      'id' => 'admin',
-      'permissions' => ['administer comments', 'access user profiles'],
-    ]);
-    $admin_role->save();
-
-    /* @var \Drupal\user\RoleInterface $anonymous_role */
-    $anonymous_role = Role::load(Role::ANONYMOUS_ID);
-    $anonymous_role->grantPermission('access comments');
-    $anonymous_role->save();
-
-    $this->adminUser = User::create([
-      'name' => $this->randomMachineName(),
-      'roles' => [$admin_role->id()],
-    ]);
-    $this->adminUser->save();
-
-    // Create some comments.
-    $comment = Comment::create([
-      'subject' => 'My comment title',
-      'uid' => $this->adminUser->id(),
-      'name' => $this->adminUser->label(),
-      'entity_type' => 'entity_test',
-      'comment_type' => 'entity_test',
-      'status' => 1,
-    ]);
-    $comment->save();
-
-    $comment_anonymous = Comment::create([
-      'subject' => 'Anonymous comment title',
-      'uid' => 0,
-      'name' => 'barry',
-      'mail' => 'test@example.com',
-      'homepage' => 'https://example.com',
-      'entity_type' => 'entity_test',
-      'comment_type' => 'entity_test',
-      'created' => 123456,
-      'status' => 1,
-    ]);
-    $comment_anonymous->save();
-  }
-
-  /**
-   * Test the username formatter.
-   */
-  public function testUsername() {
-    $view_id = $this->randomMachineName();
-    $view = View::create([
-      'id' => $view_id,
-      'base_table' => 'comment_field_data',
-      'display' => [
-        'default' => [
-          'display_plugin' => 'default',
-          'id' => 'default',
-          'display_options' => [
-            'fields' => [
-              'name' => [
-                'table' => 'comment_field_data',
-                'field' => 'name',
-                'id' => 'name',
-                'plugin_id' => 'field',
-                'type' => 'comment_username'
-              ],
-              'subject' => [
-                'table' => 'comment_field_data',
-                'field' => 'subject',
-                'id' => 'subject',
-                'plugin_id' => 'field',
-                'type' => 'string',
-                'settings' => [
-                  'link_to_entity' => TRUE,
-                ],
-              ],
-            ],
-          ],
-        ],
-      ],
-    ]);
-    $view->save();
-
-    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
-    $account_switcher = \Drupal::service('account_switcher');
-
-    /* @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $account_switcher->switchTo($this->adminUser);
-    $executable = Views::getView($view_id);
-    $build = $executable->preview();
-    $this->setRawContent($renderer->renderRoot($build));
-    $this->verbose($this->getRawContent());
-
-    $this->assertLink('My comment title');
-    $this->assertLink('Anonymous comment title');
-    $this->assertLink($this->adminUser->label());
-    $this->assertLink('barry (not verified)');
-
-    $account_switcher->switchTo(new AnonymousUserSession());
-    $executable = Views::getView($view_id);
-    $executable->storage->invalidateCaches();
-
-    $build = $executable->preview();
-    $this->setRawContent($renderer->renderRoot($build));
-
-    // No access to user-profiles, so shouldn't be able to see links.
-    $this->assertNoLink($this->adminUser->label());
-    // Note: External users aren't pointing to drupal user profiles.
-    $this->assertLink('barry (not verified)');
-    $this->verbose($this->getRawContent());
-    $this->assertLink('My comment title');
-    $this->assertLink('Anonymous comment title');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Views/CommentViewKernelTestBase.php b/core/modules/comment/src/Tests/Views/CommentViewKernelTestBase.php
deleted file mode 100644
index 1a8d7d8..0000000
--- a/core/modules/comment/src/Tests/Views/CommentViewKernelTestBase.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Views\CommentViewKernelTestBase.
- */
-
-namespace Drupal\comment\Tests\Views;
-
-use Drupal\user\Entity\Role;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Tests\ViewTestData;
-
-/**
- * Provides a common test base for comment views tests.
- */
-abstract class CommentViewKernelTestBase extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['comment_test_views', 'user', 'comment'];
-
-  /**
-   * Admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * The entity storage for comments.
-   *
-   * @var \Drupal\comment\CommentStorageInterface
-   */
-  protected $commentStorage;
-
-  /**
-   * The entity storage for users.
-   *
-   * @var \Drupal\user\UserStorageInterface
-   */
-  protected $userStorage;
-
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    ViewTestData::createTestViews(get_class($this), ['comment_test_views']);
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('comment');
-    $this->installConfig(['user']);
-
-    $entity_manager = $this->container->get('entity.manager');
-    $this->commentStorage = $entity_manager->getStorage('comment');
-    $this->userStorage = $entity_manager->getStorage('user');
-
-    // Insert a row for the anonymous user.
-    $this->userStorage
-      ->create([
-        'uid' => 0,
-        'name' => '',
-        'status' => 0,
-      ])
-      ->save();
-
-    $admin_role = Role::create(['id' => 'admin']);
-    $admin_role->grantPermission('administer comments');
-    $admin_role->save();
-
-    /* @var \Drupal\user\RoleInterface $anonymous_role */
-    $anonymous_role = Role::load(Role::ANONYMOUS_ID);
-    $anonymous_role->grantPermission('access comments');
-    $anonymous_role->save();
-
-    $this->adminUser = $this->userStorage->create(['name' => $this->randomMachineName()]);
-    $this->adminUser->addRole('admin');
-    $this->adminUser->save();
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Views/CommentViewsFieldAccessTest.php b/core/modules/comment/src/Tests/Views/CommentViewsFieldAccessTest.php
deleted file mode 100644
index 2400dd0..0000000
--- a/core/modules/comment/src/Tests/Views/CommentViewsFieldAccessTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\comment\Tests\Views\CommentViewsFieldAccessTest.
- */
-
-namespace Drupal\comment\Tests\Views;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\user\Entity\User;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the comment entity.
- *
- * @group comment
- */
-class CommentViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('comment');
-  }
-
-  /**
-   * Check access for comment fields.
-   */
-  public function testCommentFields() {
-    $user = User::create([
-      'name' => 'test user',
-    ]);
-    $user->save();
-
-    $comment = Comment::create([
-      'subject' => 'My comment title',
-      'uid' => $user->id(),
-      'entity_type' => 'entity_test',
-      'comment_type' => 'entity_test',
-    ]);
-    $comment->save();
-
-    $comment_anonymous = Comment::create([
-      'subject' => 'Anonymous comment title',
-      'uid' => 0,
-      'name' => 'anonymous',
-      'mail' => 'test@example.com',
-      'homepage' => 'https://example.com',
-      'entity_type' => 'entity_test',
-      'comment_type' => 'entity_test',
-      'created' => 123456,
-      'status' => 1,
-    ]);
-    $comment_anonymous->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('comment', 'cid', $comment->id());
-    $this->assertFieldAccess('comment', 'cid', $comment_anonymous->id());
-    $this->assertFieldAccess('comment', 'uuid', $comment->uuid());
-    $this->assertFieldAccess('comment', 'subject', 'My comment title');
-    $this->assertFieldAccess('comment', 'subject', 'Anonymous comment title');
-    $this->assertFieldAccess('comment', 'name', 'anonymous');
-    $this->assertFieldAccess('comment', 'mail', 'test@example.com');
-    $this->assertFieldAccess('comment', 'homepage', 'https://example.com');
-    $this->assertFieldAccess('comment', 'uid', $user->getUsername());
-    // $this->assertFieldAccess('comment', 'created', \Drupal::service('date.formatter')->format(123456));
-    // $this->assertFieldAccess('comment', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
-    $this->assertFieldAccess('comment', 'status', 'On');
-  }
-
-}
diff --git a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
index 89b03b3..bd52ef3 100644
--- a/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/src/Tests/Views/DefaultViewRecentCommentsTest.php
@@ -84,7 +84,7 @@ protected function setUp() {
     // Create some comments and attach them to the created node.
     for ($i = 0; $i < $this->masterDisplayResults; $i++) {
       /** @var \Drupal\comment\CommentInterface $comment */
-      $comment = entity_create('comment', array(
+      $comment = Comment::create(array(
         'status' => CommentInterface::PUBLISHED,
         'field_name' => 'comment',
         'entity_type' => 'node',
diff --git a/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
new file mode 100644
index 0000000..81e4979
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\CommentDefaultFormatterCacheTagsTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel;
+
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Core\Cache\Cache;
+use Drupal\comment\CommentInterface;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Drupal\comment\Entity\Comment;
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests the bubbling up of comment cache tags when using the Comment list
+ * formatter on an entity.
+ *
+ * @group comment
+ */
+class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('entity_test', 'comment');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $session = new Session();
+
+    $request = Request::create('/');
+    $request->setSession($session);
+
+    /** @var \Symfony\Component\HttpFoundation\RequestStack $stack */
+    $stack = $this->container->get('request_stack');
+    $stack->pop();
+    $stack->push($request);
+
+    // Set the current user to one that can access comments. Specifically, this
+    // user does not have access to the 'administer comments' permission, to
+    // ensure only published comments are visible to the end user.
+    $current_user = $this->container->get('current_user');
+    $current_user->setAccount($this->createUser(array(), array('access comments')));
+
+    // Install tables and config needed to render comments.
+    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installConfig(array('system', 'filter', 'comment'));
+
+    // Comment rendering generates links, so build the router.
+    $this->container->get('router.builder')->rebuild();
+
+    // Set up a field, so that the entity that'll be referenced bubbles up a
+    // cache tag when rendering it entirely.
+    $this->addDefaultCommentField('entity_test', 'entity_test');
+  }
+
+  /**
+   * Tests the bubbling of cache tags.
+   */
+  public function testCacheTags() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+
+    // Create the entity that will be commented upon.
+    $commented_entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $commented_entity->save();
+
+    // Verify cache tags on the rendered entity before it has comments.
+    $build = \Drupal::entityManager()
+      ->getViewBuilder('entity_test')
+      ->view($commented_entity);
+    $renderer->renderRoot($build);
+    $expected_cache_tags = [
+      'entity_test_view',
+      'entity_test:'  . $commented_entity->id(),
+      'config:core.entity_form_display.comment.comment.default',
+      'config:field.field.comment.comment.comment_body',
+      'config:field.field.entity_test.entity_test.comment',
+      'config:field.storage.comment.comment_body',
+      'config:user.settings',
+    ];
+    sort($expected_cache_tags);
+    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
+
+    // Create a comment on that entity. Comment loading requires that the uid
+    // also exists in the {users} table.
+    $user = $this->createUser();
+    $user->save();
+    $comment = Comment::create(array(
+      'subject' => 'Llama',
+      'comment_body' => array(
+        'value' => 'Llamas are cool!',
+        'format' => 'plain_text',
+      ),
+      'entity_id' => $commented_entity->id(),
+      'entity_type' => 'entity_test',
+      'field_name' => 'comment',
+      'comment_type' => 'comment',
+      'status' => CommentInterface::PUBLISHED,
+      'uid' => $user->id(),
+    ));
+    $comment->save();
+
+    // Load commented entity so comment_count gets computed.
+    // @todo Remove the $reset = TRUE parameter after
+    //   https://www.drupal.org/node/597236 lands. It's a temporary work-around.
+    $commented_entity = entity_load('entity_test', $commented_entity->id(), TRUE);
+
+    // Verify cache tags on the rendered entity when it has comments.
+    $build = \Drupal::entityManager()
+      ->getViewBuilder('entity_test')
+      ->view($commented_entity);
+    $renderer->renderRoot($build);
+    $expected_cache_tags = [
+      'entity_test_view',
+      'entity_test:' . $commented_entity->id(),
+      'comment_view',
+      'comment:' . $comment->id(),
+      'config:filter.format.plain_text',
+      'user_view',
+      'user:2',
+      'config:core.entity_form_display.comment.comment.default',
+      'config:field.field.comment.comment.comment_body',
+      'config:field.field.entity_test.entity_test.comment',
+      'config:field.storage.comment.comment_body',
+      'config:user.settings',
+    ];
+    sort($expected_cache_tags);
+    $this->assertEqual($build['#cache']['tags'], $expected_cache_tags);
+
+    // Build a render array with the entity in a sub-element so that lazy
+    // builder elements bubble up outside of the entity and we can check that
+    // it got the correct cache max age.
+    $build = ['#type' => 'container'];
+    $build['entity'] = \Drupal::entityManager()
+      ->getViewBuilder('entity_test')
+      ->view($commented_entity);
+    $renderer->renderRoot($build);
+
+    // The entity itself was cached but the top-level element is max-age 0 due
+    // to the bubbled up max age due to the lazy-built comment form.
+    $this->assertIdentical(Cache::PERMANENT, $build['entity']['#cache']['max-age']);
+    $this->assertIdentical(0, $build['#cache']['max-age'], 'Top level render array has max-age 0');
+
+    // The children (fields) of the entity render array are only built in case
+    // of a cache miss.
+    $this->assertFalse(isset($build['entity']['comment']), 'Cache hit');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php b/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
new file mode 100644
index 0000000..fd607d2
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\CommentFieldAccessTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\comment\Entity\CommentType;
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\simpletest\TestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests comment field level access.
+ *
+ * @group comment
+ * @group Access
+ */
+class CommentFieldAccessTest extends EntityKernelTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('comment', 'entity_test', 'user');
+
+  /**
+   * Fields that only users with administer comments permissions can change.
+   *
+   * @var array
+   */
+  protected $administrativeFields = array(
+    'uid',
+    'status',
+    'created',
+  );
+
+  /**
+   * These fields are automatically managed and can not be changed by any user.
+   *
+   * @var array
+   */
+  protected $readOnlyFields = array(
+    'changed',
+    'hostname',
+    'cid',
+    'thread',
+  );
+
+  /**
+   * These fields can be edited on create only.
+   *
+   * @var array
+   */
+  protected $createOnlyFields = [
+    'uuid',
+    'pid',
+    'comment_type',
+    'entity_id',
+    'entity_type',
+    'field_name',
+  ];
+
+  /**
+   * These fields can only be edited by the admin or anonymous users if allowed.
+   *
+   * @var array
+   */
+  protected $contactFields = array(
+    'name',
+    'mail',
+    'homepage',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('user', 'comment'));
+    $this->installSchema('comment', array('comment_entity_statistics'));
+  }
+
+  /**
+   * Test permissions on comment fields.
+   */
+  public function testAccessToAdministrativeFields() {
+    // Create a comment type.
+    $comment_type = CommentType::create([
+      'id' => 'comment',
+      'label' => 'Default comments',
+      'description' => 'Default comment field',
+      'target_entity_type_id' => 'entity_test',
+    ]);
+    $comment_type->save();
+
+    // Create a comment against a test entity.
+    $host = EntityTest::create();
+    $host->save();
+
+    // An administrator user. No user exists yet, ensure that the first user
+    // does not have UID 1.
+    $comment_admin_user = $this->createUser(['uid' => 2, 'name' => 'admin'], [
+      'administer comments',
+      'access comments',
+    ]);
+
+    // Two comment enabled users, one with edit access.
+    $comment_enabled_user = $this->createUser(['name' => 'enabled'], [
+      'post comments',
+      'skip comment approval',
+      'edit own comments',
+      'access comments',
+    ]);
+    $comment_no_edit_user = $this->createUser(['name' => 'no edit'], [
+      'post comments',
+      'skip comment approval',
+      'access comments',
+    ]);
+
+    // An unprivileged user.
+    $comment_disabled_user = $this->createUser(['name' => 'disabled'], ['access content']);
+
+    $role = Role::load(RoleInterface::ANONYMOUS_ID);
+    $role->grantPermission('post comments')
+      ->save();
+
+    $anonymous_user = new AnonymousUserSession();
+
+    // Add two fields.
+    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment');
+    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment_other');
+
+    // Change the second field's anonymous contact setting.
+    $instance = FieldConfig::loadByName('entity_test', 'entity_test', 'comment_other');
+    // Default is 'May not contact', for this field - they may contact.
+    $instance->setSetting('anonymous', COMMENT_ANONYMOUS_MAY_CONTACT);
+    $instance->save();
+
+    // Create three "Comments". One is owned by our edit-enabled user.
+    $comment1 = Comment::create([
+      'entity_type' => 'entity_test',
+      'name' => 'Tony',
+      'hostname' => 'magic.example.com',
+      'mail' => 'tonythemagicalpony@example.com',
+      'subject' => 'Bruce the Mesopotamian moose',
+      'entity_id' => $host->id(),
+      'comment_type' => 'comment',
+      'field_name' => 'comment',
+      'pid' => 0,
+      'uid' => 0,
+      'status' => 1,
+    ]);
+    $comment1->save();
+    $comment2 = Comment::create([
+      'entity_type' => 'entity_test',
+      'hostname' => 'magic.example.com',
+      'subject' => 'Brian the messed up lion',
+      'entity_id' => $host->id(),
+      'comment_type' => 'comment',
+      'field_name' => 'comment',
+      'status' => 1,
+      'pid' => 0,
+      'uid' => $comment_enabled_user->id(),
+    ]);
+    $comment2->save();
+    $comment3 = Comment::create([
+      'entity_type' => 'entity_test',
+      'hostname' => 'magic.example.com',
+      // Unpublished.
+      'status' => 0,
+      'subject' => 'Gail the minky whale',
+      'entity_id' => $host->id(),
+      'comment_type' => 'comment',
+      'field_name' => 'comment_other',
+      'pid' => $comment2->id(),
+      'uid' => $comment_no_edit_user->id(),
+    ]);
+    $comment3->save();
+    // Note we intentionally don't save this comment so it remains 'new'.
+    $comment4 = Comment::create([
+      'entity_type' => 'entity_test',
+      'hostname' => 'magic.example.com',
+      // Unpublished.
+      'status' => 0,
+      'subject' => 'Daniel the Cocker-Spaniel',
+      'entity_id' => $host->id(),
+      'comment_type' => 'comment',
+      'field_name' => 'comment_other',
+      'pid' => 0,
+      'uid' => $anonymous_user->id(),
+    ]);
+
+    // Generate permutations.
+    $combinations = [
+      'comment' => [$comment1, $comment2, $comment3, $comment4],
+      'user' => [$comment_admin_user, $comment_enabled_user, $comment_no_edit_user, $comment_disabled_user, $anonymous_user]
+    ];
+    $permutations = TestBase::generatePermutations($combinations);
+
+    // Check access to administrative fields.
+    foreach ($this->administrativeFields as $field) {
+      foreach ($permutations as $set) {
+        $may_view = $set['comment']->{$field}->access('view', $set['user']);
+        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
+        $this->assertTrue($may_view, SafeMarkup::format('User @user can view field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+        $this->assertEqual($may_update, $set['user']->hasPermission('administer comments'), SafeMarkup::format('User @user @state update field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@state' => $may_update ? 'can' : 'cannot',
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+      }
+    }
+
+    // Check access to normal field.
+    foreach ($permutations as $set) {
+      $may_update = $set['comment']->access('update', $set['user']) && $set['comment']->subject->access('edit', $set['user']);
+      $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || ($set['user']->hasPermission('edit own comments') && $set['user']->id() == $set['comment']->getOwnerId()), SafeMarkup::format('User @user @state update field subject on comment @comment', [
+        '@user' => $set['user']->getUsername(),
+        '@state' => $may_update ? 'can' : 'cannot',
+        '@comment' => $set['comment']->getSubject(),
+      ]));
+    }
+
+    // Check read-only fields.
+    foreach ($this->readOnlyFields as $field) {
+      // Check view operation.
+      foreach ($permutations as $set) {
+        $may_view = $set['comment']->{$field}->access('view', $set['user']);
+        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
+        // Nobody has access to view the hostname field.
+        if ($field === 'hostname') {
+          $view_access = FALSE;
+          $state = 'cannot';
+        }
+        else {
+          $view_access = TRUE;
+          $state = 'can';
+        }
+        $this->assertEqual($may_view, $view_access, SafeMarkup::format('User @user @state view field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+          '@state' => $state,
+        ]));
+        $this->assertFalse($may_update, SafeMarkup::format('User @user @state update field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@state' => $may_update ? 'can' : 'cannot',
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+      }
+    }
+
+    // Check create-only fields.
+    foreach ($this->createOnlyFields as $field) {
+      // Check view operation.
+      foreach ($permutations as $set) {
+        $may_view = $set['comment']->{$field}->access('view', $set['user']);
+        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
+        $this->assertEqual($may_view, TRUE, SafeMarkup::format('User @user can view field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+        $this->assertEqual($may_update, $set['user']->hasPermission('post comments') && $set['comment']->isNew(), SafeMarkup::format('User @user @state update field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@state' => $may_update ? 'can' : 'cannot',
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+      }
+    }
+
+    // Check contact fields.
+    foreach ($this->contactFields as $field) {
+      // Check view operation.
+      foreach ($permutations as $set) {
+        $may_update = $set['comment']->{$field}->access('edit', $set['user']);
+        // To edit the 'mail' or 'name' field, either the user has the
+        // "administer comments" permissions or the user is anonymous and
+        // adding a new comment using a field that allows contact details.
+        $this->assertEqual($may_update, $set['user']->hasPermission('administer comments') || (
+            $set['user']->isAnonymous() &&
+            $set['comment']->isNew() &&
+            $set['user']->hasPermission('post comments') &&
+            $set['comment']->getFieldName() == 'comment_other'
+          ), SafeMarkup::format('User @user @state update field @field on comment @comment', [
+          '@user' => $set['user']->getUsername(),
+          '@state' => $may_update ? 'can' : 'cannot',
+          '@comment' => $set['comment']->getSubject(),
+          '@field' => $field,
+        ]));
+      }
+    }
+    foreach ($permutations as $set) {
+      // Check no view-access to mail field for other than admin.
+      $may_view = $set['comment']->mail->access('view', $set['user']);
+      $this->assertEqual($may_view, $set['user']->hasPermission('administer comments'));
+    }
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/CommentItemTest.php b/core/modules/comment/tests/src/Kernel/CommentItemTest.php
new file mode 100644
index 0000000..4c8ed65
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/CommentItemTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\CommentItemTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel;
+
+use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+
+/**
+ * Tests the new entity API for the comment field type.
+ *
+ * @group comment
+ */
+class CommentItemTest extends FieldKernelTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['comment', 'entity_test', 'user'];
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installConfig(['comment']);
+  }
+
+  /**
+   * Tests using entity fields of the comment field type.
+   */
+  public function testCommentItem() {
+    $this->addDefaultCommentField('entity_test', 'entity_test', 'comment');
+
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id, TRUE);
+    $this->assertTrue($entity->comment instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->comment[0] instanceof CommentItemInterface, 'Field item implements interface.');
+
+    // Test sample item generation.
+    /** @var \Drupal\entity_test\Entity\EntityTest $entity */
+    $entity = EntityTest::create();
+    $entity->comment->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+    $this->assertTrue(in_array($entity->get('comment')->status, [
+      CommentItemInterface::HIDDEN,
+      CommentItemInterface::CLOSED,
+      CommentItemInterface::OPEN,
+    ]), 'Comment status value in defined range');
+
+    $mainProperty = $entity->comment[0]->mainPropertyName();
+    $this->assertEqual('status', $mainProperty);
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php b/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
new file mode 100644
index 0000000..ae4627f
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\CommentStringIdEntitiesTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests that comment fields cannot be added to entities with non-integer IDs.
+ *
+ * @group comment
+ */
+class CommentStringIdEntitiesTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'comment',
+    'user',
+    'field',
+    'field_ui',
+    'entity_test',
+    'text',
+  );
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('comment');
+    $this->installSchema('comment', array('comment_entity_statistics'));
+    // Create the comment body field storage.
+    $this->installConfig(array('field'));
+  }
+
+  /**
+   * Tests that comment fields cannot be added entities with non-integer IDs.
+   */
+  public function testCommentFieldNonStringId() {
+    try {
+      $bundle = CommentType::create(array(
+        'id' => 'foo',
+        'label' => 'foo',
+        'description' => '',
+        'target_entity_type_id' => 'entity_test_string_id',
+      ));
+      $bundle->save();
+      $field_storage = FieldStorageConfig::create(array(
+        'field_name' => 'foo',
+        'entity_type' => 'entity_test_string_id',
+        'settings' => array(
+          'comment_type' => 'entity_test_string_id',
+        ),
+        'type' => 'comment',
+      ));
+      $field_storage->save();
+      $this->fail('Did not throw an exception as expected.');
+    }
+    catch (\UnexpectedValueException $e) {
+      $this->pass('Exception thrown when trying to create comment field on Entity Type with string ID.');
+    }
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/CommentValidationTest.php b/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
new file mode 100644
index 0000000..e4fc33e
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/CommentValidationTest.php
@@ -0,0 +1,206 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\CommentValidationTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel;
+
+use Drupal\comment\CommentInterface;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\node\Entity\Node;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests comment validation constraints.
+ *
+ * @group comment
+ */
+class CommentValidationTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('comment', 'node');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('comment', array('comment_entity_statistics'));
+  }
+
+  /**
+   * Tests the comment validation constraints.
+   */
+  public function testValidation() {
+    // Add a user.
+    $user = User::create(array('name' => 'test', 'status' => TRUE));
+    $user->save();
+
+    // Add comment type.
+    $this->entityManager->getStorage('comment_type')->create(array(
+      'id' => 'comment',
+      'label' => 'comment',
+      'target_entity_type_id' => 'node',
+    ))->save();
+
+    // Add comment field to content.
+    $this->entityManager->getStorage('field_storage_config')->create(array(
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'type' => 'comment',
+      'settings' => array(
+        'comment_type' => 'comment',
+      )
+    ))->save();
+
+    // Create a page node type.
+    $this->entityManager->getStorage('node_type')->create(array(
+      'type' => 'page',
+      'name' => 'page',
+    ))->save();
+
+    // Add comment field to page content.
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    $field = $this->entityManager->getStorage('field_config')->create(array(
+      'field_name' => 'comment',
+      'entity_type' => 'node',
+      'bundle' => 'page',
+      'label' => 'Comment settings',
+    ));
+    $field->save();
+
+    $node = $this->entityManager->getStorage('node')->create(array(
+      'type' => 'page',
+      'title' => 'test',
+    ));
+    $node->save();
+
+    $comment = $this->entityManager->getStorage('comment')->create(array(
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'comment_body' => $this->randomMachineName(),
+    ));
+
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 0, 'No violations when validating a default comment.');
+
+    $comment->set('subject', $this->randomString(65));
+    $this->assertLengthViolation($comment, 'subject', 64);
+
+    // Make the subject valid.
+    $comment->set('subject', $this->randomString());
+    $comment->set('name', $this->randomString(61));
+    $this->assertLengthViolation($comment, 'name', 60);
+
+    // Validate a name collision between an anonymous comment author name and an
+    // existing user account name.
+    $comment->set('name', 'test');
+    $comment->set('uid', 0);
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, "Violation found on author name collision");
+    $this->assertEqual($violations[0]->getPropertyPath(), "name");
+    $this->assertEqual($violations[0]->getMessage(), t('The name you used (%name) belongs to a registered user.', array('%name' => 'test')));
+
+    // Make the name valid.
+    $comment->set('name', 'valid unused name');
+    $comment->set('mail', 'invalid');
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, 'Violation found when email is invalid');
+    $this->assertEqual($violations[0]->getPropertyPath(), 'mail.0.value');
+    $this->assertEqual($violations[0]->getMessage(), t('This value is not a valid email address.'));
+
+    $comment->set('mail', NULL);
+    $comment->set('homepage', 'http://example.com/' . $this->randomMachineName(237));
+    $this->assertLengthViolation($comment, 'homepage', 255);
+
+    $comment->set('homepage', 'invalid');
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, 'Violation found when homepage is invalid');
+    $this->assertEqual($violations[0]->getPropertyPath(), 'homepage.0.value');
+
+    // @todo This message should be improved in
+    //   https://www.drupal.org/node/2012690.
+    $this->assertEqual($violations[0]->getMessage(), t('This value should be of the correct primitive type.'));
+
+    $comment->set('homepage', NULL);
+    $comment->set('hostname', $this->randomString(129));
+    $this->assertLengthViolation($comment, 'hostname', 128);
+
+    $comment->set('hostname', NULL);
+    $comment->set('thread', $this->randomString(256));
+    $this->assertLengthViolation($comment, 'thread', 255);
+
+    $comment->set('thread', NULL);
+
+    // Force anonymous users to enter contact details.
+    $field->setSetting('anonymous', COMMENT_ANONYMOUS_MUST_CONTACT);
+    $field->save();
+    // Reset the node entity.
+    \Drupal::entityManager()->getStorage('node')->resetCache([$node->id()]);
+    $node = Node::load($node->id());
+    // Create a new comment with the new field.
+    $comment = $this->entityManager->getStorage('comment')->create(array(
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'comment_body' => $this->randomMachineName(),
+      'uid' => 0,
+      'name' => '',
+    ));
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, 'Violation found when name is required, but empty and UID is anonymous.');
+    $this->assertEqual($violations[0]->getPropertyPath(), 'name');
+    $this->assertEqual($violations[0]->getMessage(), t('You have to specify a valid author.'));
+
+    // Test creating a default comment with a given user id works.
+    $comment = $this->entityManager->getStorage('comment')->create(array(
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'comment_body' => $this->randomMachineName(),
+      'uid' => $user->id(),
+    ));
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 0, 'No violations when validating a default comment with an author.');
+
+    // Test specifying a wrong author name does not work.
+    $comment = $this->entityManager->getStorage('comment')->create(array(
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'comment_body' => $this->randomMachineName(),
+      'uid' => $user->id(),
+      'name' => 'not-test',
+    ));
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, 'Violation found when author name and comment author do not match.');
+    $this->assertEqual($violations[0]->getPropertyPath(), 'name');
+    $this->assertEqual($violations[0]->getMessage(), t('The specified author name does not match the comment author.'));
+  }
+
+  /**
+   * Verifies that a length violation exists for the given field.
+   *
+   * @param \Drupal\comment\CommentInterface $comment
+   *   The comment object to validate.
+   * @param string $field_name
+   *   The field that violates the maximum length.
+   * @param int $length
+   *   Number of characters that was exceeded.
+   */
+  protected function assertLengthViolation(CommentInterface $comment, $field_name, $length) {
+    $violations = $comment->validate();
+    $this->assertEqual(count($violations), 1, "Violation found when $field_name is too long.");
+    $this->assertEqual($violations[0]->getPropertyPath(), "$field_name.0.value");
+    $field_label = $comment->get($field_name)->getFieldDefinition()->getLabel();
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => $field_label, '@max' => $length)));
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php b/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
new file mode 100644
index 0000000..33e0b3e
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/MigrateCommentStubTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\MigrateCommentStubTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\migrate\MigrateException;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Test stub creation for comment entities.
+ *
+ * @group comment
+ */
+class MigrateCommentStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('node');
+    // Make sure uid 0 is created (default uid for comments is 0).
+    $storage = \Drupal::entityManager()->getStorage('user');
+    // Insert a row for the anonymous user.
+    $storage
+      ->create(array(
+        'uid' => 0,
+        'status' => 0,
+        'name' => '',
+      ))
+      ->save();
+    // Need at least one node type and comment type present.
+    NodeType::create([
+      'type' => 'testnodetype',
+      'name' => 'Test node type',
+    ])->save();
+    CommentType::create([
+      'id' => 'testcommenttype',
+      'label' => 'Test comment type',
+      'target_entity_type_id' => 'node',
+    ])->save();
+  }
+
+  /**
+   * Tests creation of comment stubs.
+   */
+  public function testStub() {
+    try {
+      // We expect an exception, because there's no node to reference.
+      $this->performStubTest('comment');
+      $this->fail('Expected exception has not been thrown.');
+    }
+    catch (MigrateException $e) {
+      $this->assertIdentical($e->getMessage(),
+        'Stubbing failed, unable to generate value for field entity_id');
+    }
+
+    // The stub should pass when there's a node to point to.
+    $this->createStub('node');
+    $this->performStubTest('comment');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
new file mode 100644
index 0000000..69f8de8
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade comments.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentTest extends MigrateDrupal6TestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installConfig(['comment']);
+
+    // The entity.node.canonical route must exist when the RDF hook is called.
+    $this->container->get('router.builder')->rebuild();
+
+    $this->migrateContent();
+    $this->executeMigrations([
+      'd6_node',
+      'd6_comment_type',
+      'd6_comment_field',
+      'd6_comment_field_instance',
+      'd6_comment_entity_display',
+      'd6_comment_entity_form_display',
+      'd6_comment',
+    ]);
+  }
+
+  /**
+   * Tests the Drupal 6 to Drupal 8 comment migration.
+   */
+  public function testComments() {
+    /** @var \Drupal\Core\Entity\EntityStorageInterface $comment_storage */
+    $comment_storage = $this->container->get('entity.manager')->getStorage('comment');
+    /** @var \Drupal\comment\CommentInterface $comment */
+    $comment = $comment_storage->load(1);
+    $this->assertIdentical('The first comment.', $comment->getSubject());
+    $this->assertIdentical('The first comment body.', $comment->comment_body->value);
+    $this->assertIdentical('filtered_html', $comment->comment_body->format);
+    $this->assertIdentical('0', $comment->pid->target_id);
+    $this->assertIdentical('1', $comment->getCommentedEntityId());
+    $this->assertIdentical('node', $comment->getCommentedEntityTypeId());
+    $this->assertIdentical('en', $comment->language()->getId());
+    $this->assertIdentical('comment_no_subject', $comment->getTypeId());
+
+    $comment = $comment_storage->load(2);
+    $this->assertIdentical('The response to the second comment.', $comment->subject->value);
+    $this->assertIdentical('3', $comment->pid->target_id);
+
+    $comment = $comment_storage->load(3);
+    $this->assertIdentical('The second comment.', $comment->subject->value);
+    $this->assertIdentical('0', $comment->pid->target_id);
+  }
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php
new file mode 100644
index 0000000..324618a
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentTypeTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentTypeTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade comment type.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installConfig(['node', 'comment']);
+    $this->executeMigration('d6_comment_type');
+  }
+
+  /**
+   * Tests the Drupal 6 to Drupal 8 comment type migration.
+   */
+  public function testCommentType() {
+    $comment_type = CommentType::load('comment');
+    $this->assertIdentical('node', $comment_type->getTargetEntityTypeId());
+    $comment_type = CommentType::load('comment_no_subject');
+    $this->assertIdentical('node', $comment_type->getTargetEntityTypeId());
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php
new file mode 100644
index 0000000..b399acf
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableDisplayBase.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Base class for Drupal 6 comment variables to Drupal 8 entity display tests.
+ */
+abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['comment']);
+    $this->migrateContentTypes();
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_field',
+      'd6_comment_field_instance',
+    ]);
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
new file mode 100644
index 0000000..61d346c
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase;
+
+/**
+ * Upgrade comment variables to entity.display.node.*.default.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentVariableEntityDisplayTest extends MigrateCommentVariableDisplayBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_comment_entity_display');
+  }
+
+  /**
+   * Tests comment variables migrated into an entity display.
+   */
+  public function testCommentEntityDisplay() {
+    foreach (['page', 'story', 'article'] as $type) {
+      $component = EntityViewDisplay::load('node.' . $type . '.default')->getComponent('comment');
+      $this->assertIdentical('hidden', $component['label']);
+      $this->assertIdentical('comment_default', $component['type']);
+      $this->assertIdentical(20, $component['weight']);
+    }
+  }
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
new file mode 100644
index 0000000..614be72
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityFormDisplaySubjectTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['comment']);
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_entity_form_display_subject',
+    ]);
+  }
+
+  /**
+   * Tests comment subject variable migrated into an entity display.
+   */
+  public function testCommentEntityFormDisplay() {
+    $component = EntityFormDisplay::load('comment.comment.default')
+      ->getComponent('subject');
+    $this->assertIdentical('string_textfield', $component['type']);
+    $this->assertIdentical(10, $component['weight']);
+    $component = EntityFormDisplay::load('comment.comment_no_subject.default')
+      ->getComponent('subject');
+    $this->assertNull($component);
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
new file mode 100644
index 0000000..355c32b
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableEntityFormDisplayTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableDisplayBase;
+
+/**
+ * Upgrade comment variables to core.entity_form_display.node.*.default.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentVariableEntityFormDisplayTest extends MigrateCommentVariableDisplayBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_comment_entity_form_display');
+  }
+
+  /**
+   * Tests comment variables migrated into an entity display.
+   */
+  public function testCommentEntityFormDisplay() {
+    foreach (['page', 'article', 'story'] as $type) {
+      $component = EntityFormDisplay::load('node.' . $type . '.default')
+        ->getComponent('comment');
+      $this->assertIdentical('comment_default', $component['type']);
+      $this->assertIdentical(20, $component['weight']);
+    }
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php
new file mode 100644
index 0000000..ab6913e
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableFieldTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableFieldTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade comment variables to field.storage.node.comment.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['comment']);
+    $this->migrateContentTypes();
+    $this->executeMigrations(['d6_comment_type', 'd6_comment_field']);
+  }
+
+  /**
+   * Tests comment variables migrated into a field entity.
+   */
+  public function testCommentField() {
+    $this->assertTrue(is_object(FieldStorageConfig::load('node.comment')));
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php
new file mode 100644
index 0000000..4ed90e1
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d6/MigrateCommentVariableInstanceTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d6\MigrateCommentVariableInstanceTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d6;
+
+use Drupal\comment\CommentManagerInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Upgrade comment variables to field.instance.node.*.comment.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['comment']);
+    $this->migrateContentTypes();
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_field',
+      'd6_comment_field_instance',
+    ]);
+  }
+
+  /**
+   * Test the migrated field instance values.
+   */
+  public function testCommentFieldInstance() {
+    $node = Node::create(['type' => 'page']);
+    $this->assertIdentical(0, $node->comment->status);
+    $this->assertIdentical('comment', $node->comment->getFieldDefinition()->getName());
+    $settings = $node->comment->getFieldDefinition()->getSettings();
+    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_THREADED, $settings['default_mode']);
+    $this->assertIdentical(50, $settings['per_page']);
+    $this->assertFalse($settings['anonymous']);
+    $this->assertFalse($settings['form_location']);
+    $this->assertTrue($settings['preview']);
+
+    $node = Node::create(['type' => 'story']);
+    $this->assertIdentical(2, $node->comment_no_subject->status);
+    $this->assertIdentical('comment_no_subject', $node->comment_no_subject->getFieldDefinition()->getName());
+    $settings = $node->comment_no_subject->getFieldDefinition()->getSettings();
+    $this->assertIdentical(CommentManagerInterface::COMMENT_MODE_FLAT, $settings['default_mode']);
+    $this->assertIdentical(70, $settings['per_page']);
+    $this->assertTrue($settings['anonymous']);
+    $this->assertFalse($settings['form_location']);
+    $this->assertFalse($settings['preview']);
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
new file mode 100644
index 0000000..30d6473
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityDisplayTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of comment display configuration.
+ *
+ * @group comment
+ */
+class MigrateCommentEntityDisplayTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_comment_field',
+      'd7_comment_field_instance',
+      'd7_comment_entity_display',
+    ]);
+  }
+
+  /**
+   * Asserts a display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $component_id
+   *   The ID of the display component.
+   */
+  protected function assertDisplay($id, $component_id) {
+    $component = EntityViewDisplay::load($id)->getComponent($component_id);
+    $this->assertTrue(is_array($component));
+    $this->assertIdentical('hidden', $component['label']);
+    $this->assertIdentical('comment_default', $component['type']);
+    $this->assertIdentical(20, $component['weight']);
+  }
+
+  /**
+   * Tests the migrated display configuration.
+   */
+  public function testMigration() {
+    $this->assertDisplay('node.page.default', 'comment_node_page');
+    $this->assertDisplay('node.article.default', 'comment_node_article');
+    $this->assertDisplay('node.book.default', 'comment_node_book');
+    $this->assertDisplay('node.blog.default', 'comment_node_blog');
+    $this->assertDisplay('node.forum.default', 'comment_node_forum');
+    $this->assertDisplay('node.test_content_type.default', 'comment_node_test_content_type');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
new file mode 100644
index 0000000..0960580
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplaySubjectTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityFormDisplaySubjectTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of comment form's subject display configuration.
+ *
+ * @group comment
+ */
+class MigrateCommentEntityFormDisplaySubjectTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_comment_entity_form_display_subject',
+    ]);
+  }
+
+  /**
+   * Asserts a display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   */
+  protected function assertDisplay($id) {
+    $component = EntityFormDisplay::load($id)->getComponent('subject');
+    $this->assertTrue(is_array($component));
+    $this->assertIdentical('string_textfield', $component['type']);
+    $this->assertIdentical(10, $component['weight']);
+  }
+
+  /**
+   * Tests the migrated display configuration.
+   */
+  public function testMigration() {
+    $this->assertDisplay('comment.comment_node_page.default');
+    $this->assertDisplay('comment.comment_node_article.default');
+    $this->assertDisplay('comment.comment_node_book.default');
+    $this->assertDisplay('comment.comment_node_blog.default');
+    $this->assertDisplay('comment.comment_node_forum.default');
+    $this->assertDisplay('comment.comment_node_test_content_type.default');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
new file mode 100644
index 0000000..1353704
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentEntityFormDisplayTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of comment form display configuration.
+ *
+ * @group comment
+ */
+class MigrateCommentEntityFormDisplayTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_comment_field',
+      'd7_comment_field_instance',
+      'd7_comment_entity_form_display',
+    ]);
+  }
+
+  /**
+   * Asserts a display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $component
+   *   The ID of the form component.
+   */
+  protected function assertDisplay($id, $component_id) {
+    $component = EntityFormDisplay::load($id)->getComponent($component_id);
+    $this->assertTrue(is_array($component));
+    $this->assertIdentical('comment_default', $component['type']);
+    $this->assertIdentical(20, $component['weight']);
+  }
+
+  /**
+   * Tests the migrated display configuration.
+   */
+  public function testMigration() {
+    $this->assertDisplay('node.page.default', 'comment');
+    $this->assertDisplay('node.article.default', 'comment');
+    $this->assertDisplay('node.book.default', 'comment');
+    $this->assertDisplay('node.blog.default', 'comment');
+    $this->assertDisplay('node.forum.default', 'comment');
+    $this->assertDisplay('node.test_content_type.default', 'comment');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
new file mode 100644
index 0000000..3fdebbd
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldInstanceTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Core\Field\FieldConfigInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests creation of comment reference fields for each comment type defined
+ * in Drupal 7.
+ *
+ * @group comment
+ */
+class MigrateCommentFieldInstanceTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_comment_field',
+      'd7_comment_field_instance',
+    ]);
+  }
+
+  /**
+   * Asserts a comment field entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $field_name
+   *   The field name.
+   * @param string $bundle
+   *   The bundle ID.
+   * @param int $default_mode
+   *   The field's default_mode setting.
+   * @param int $per_page
+   *   The field's per_page setting.
+   * @param bool $anonymous
+   *   The field's anonymous setting.
+   * @param int $form_location
+   *   The field's form_location setting.
+   * @param bool $preview
+   *   The field's preview setting.
+   */
+  protected function assertEntity($id, $field_name, $bundle, $default_mode, $per_page, $anonymous, $form_location, $preview) {
+    $entity = FieldConfig::load($id);
+    $this->assertTrue($entity instanceof FieldConfigInterface);
+    /** @var \Drupal\field\FieldConfigInterface $entity */
+    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
+    $this->assertIdentical('Comments', $entity->label());
+    $this->assertTrue($entity->isRequired());
+    $this->assertIdentical($field_name, $entity->getFieldStorageDefinition()->getName());
+    $this->assertIdentical($bundle, $entity->getTargetBundle());
+    $this->assertTrue($entity->get('default_value')[0]['status']);
+    $this->assertEqual($default_mode, $entity->getSetting('default_mode'));
+    $this->assertIdentical($per_page, $entity->getSetting('per_page'));
+    $this->assertEqual($anonymous, $entity->getSetting('anonymous'));
+    // This assertion fails because 1 !== TRUE. It's extremely strange that
+    // the form_location setting is returning a boolean, but this appears to
+    // be a problem with the entity, not with the migration.
+    // $this->asserIdentical($form_location, $entity->getSetting('form_location'));
+    $this->assertEqual($preview, $entity->getSetting('preview'));
+  }
+
+  /**
+   * Tests the migrated fields.
+   */
+  public function testMigration() {
+    $this->assertEntity('node.page.comment_node_page', 'comment_node_page', 'page', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+    $this->assertEntity('node.article.comment_node_article', 'comment_node_article', 'article', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+    $this->assertEntity('node.blog.comment_node_blog', 'comment_node_blog', 'blog', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+    $this->assertEntity('node.book.comment_node_book', 'comment_node_book', 'book', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+    $this->assertEntity('node.forum.comment_node_forum', 'comment_node_forum', 'forum', TRUE, 50, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+    $this->assertEntity('node.test_content_type.comment_node_test_content_type', 'comment_node_test_content_type', 'test_content_type', TRUE, 30, FALSE, CommentItemInterface::FORM_BELOW, TRUE);
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php
new file mode 100644
index 0000000..40b8d99
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentFieldTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentFieldTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests creation of comment reference fields for each comment type defined
+ * in Drupal 7.
+ *
+ * @group comment
+ */
+class MigrateCommentFieldTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_comment_field',
+    ]);
+  }
+
+  /**
+   * Asserts a comment field entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $comment_type
+   *   The comment type (bundle ID) the field references.
+   */
+  protected function assertEntity($id, $comment_type) {
+    $entity = FieldStorageConfig::load($id);
+    $this->assertTrue($entity instanceof FieldStorageConfigInterface);
+    /** @var \Drupal\field\FieldStorageConfigInterface $entity */
+    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
+    $this->assertIdentical('comment', $entity->getType());
+    $this->assertIdentical($comment_type, $entity->getSetting('comment_type'));
+  }
+
+  /**
+   * Tests the migrated fields.
+   */
+  public function testMigration() {
+    $this->assertEntity('node.comment_node_page', 'comment_node_page');
+    $this->assertEntity('node.comment_node_article', 'comment_node_article');
+    $this->assertEntity('node.comment_node_blog', 'comment_node_blog');
+    $this->assertEntity('node.comment_node_book', 'comment_node_book');
+    $this->assertEntity('node.comment_node_forum', 'comment_node_forum');
+    $this->assertEntity('node.comment_node_test_content_type', 'comment_node_test_content_type');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
new file mode 100644
index 0000000..6af6e89
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\comment\CommentInterface;
+use Drupal\comment\Entity\Comment;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\NodeInterface;
+
+/**
+ * Tests migration of comments from Drupal 7.
+ *
+ * @group comment
+ */
+class MigrateCommentTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['filter', 'node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(static::$modules);
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+
+    $this->executeMigrations([
+      'd7_filter_format',
+      'd7_user_role',
+      'd7_user',
+    ]);
+    $this->executeMigration('d7_node_type');
+    // We only need the test_content_type node migration to run for real, so
+    // mock all the others.
+    $this->prepareMigrations(array(
+      'd7_node' => array(
+        array(array(0), array(0)),
+      ),
+    ));
+    $this->executeMigrations([
+      'd7_node:test_content_type',
+      'd7_comment_type',
+      'd7_comment',
+    ]);
+  }
+
+  /**
+   * Tests migration of comments from Drupal 7.
+   */
+  public function testCommentMigration() {
+    $comment = Comment::load(1);
+    $this->assertTrue($comment instanceof CommentInterface);
+    /** @var \Drupal\comment\CommentInterface $comment */
+    $this->assertIdentical('A comment', $comment->getSubject());
+    $this->assertIdentical('1421727536', $comment->getCreatedTime());
+    $this->assertIdentical('1421727536', $comment->getChangedTime());
+    $this->assertTrue($comment->getStatus());
+    $this->assertIdentical('admin', $comment->getAuthorName());
+    $this->assertIdentical('admin@local.host', $comment->getAuthorEmail());
+    $this->assertIdentical('This is a comment', $comment->comment_body->value);
+    $this->assertIdentical('filtered_html', $comment->comment_body->format);
+
+    $node = $comment->getCommentedEntity();
+    $this->assertTrue($node instanceof NodeInterface);
+    $this->assertIdentical('1', $node->id());
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php
new file mode 100644
index 0000000..a1087fe
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTypeTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Migrate\d7\MigrateCommentTypeTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Migrate\d7;
+
+use Drupal\comment\CommentTypeInterface;
+use Drupal\comment\Entity\CommentType;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of comment types from Drupal 7.
+ *
+ * @group comment
+ */
+class MigrateCommentTypeTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'comment', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+    ]);
+  }
+
+  /**
+   * Asserts a comment type entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $label
+   *   The entity label.
+   */
+  protected function assertEntity($id, $label) {
+    $entity = CommentType::load($id);
+    $this->assertTrue($entity instanceof CommentTypeInterface);
+    /** @var \Drupal\comment\CommentTypeInterface $entity */
+    $this->assertIdentical($label, $entity->label());
+    $this->assertIdentical('node', $entity->getTargetEntityTypeId());
+  }
+
+  /**
+   * Tests the migrated comment types.
+   */
+  public function testMigration() {
+    $this->assertEntity('comment_node_page', 'Basic page comment');
+    $this->assertEntity('comment_node_article', 'Article comment');
+    $this->assertEntity('comment_node_blog', 'Blog entry comment');
+    $this->assertEntity('comment_node_book', 'Book page comment');
+    $this->assertEntity('comment_node_forum', 'Forum topic comment');
+    $this->assertEntity('comment_node_test_content_type', 'Test content type comment');
+
+    $migration = $this->getMigration('d7_comment_type');
+    // Validate that the source count and processed count match up.
+    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php
new file mode 100644
index 0000000..4511631
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Views/CommentLinksTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Views\CommentLinksTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Views;
+
+use Drupal\comment\CommentInterface;
+use Drupal\comment\CommentManagerInterface;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\views\Views;
+
+/**
+ * Tests the comment link field handlers.
+ *
+ * @group comment
+ */
+class CommentLinksTest extends CommentViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_comment'];
+
+  /**
+   * Test the comment approve link.
+   */
+  public function testLinkApprove() {
+
+    // Create an unapproved comment.
+    $comment = $this->commentStorage->create([
+      'uid' => $this->adminUser->id(),
+      'entity_type' => 'entity_test',
+      'comment_type' => 'entity_test',
+      'status' => 0,
+    ]);
+    $comment->save();
+
+    $view = Views::getView('test_comment');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'approve_comment' => [
+        'table' => 'comment',
+        'field' => 'approve_comment',
+        'id' => 'approve_comment',
+        'plugin_id' => 'comment_link_approve',
+      ],
+    ]);
+    $view->save();
+
+    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
+    $account_switcher = \Drupal::service('account_switcher');
+    $account_switcher->switchTo($this->adminUser);
+
+    $view->preview();
+
+    // Check if I can see the comment approve link on an unapproved comment.
+    $approve_comment = $view->style_plugin->getField(0, 'approve_comment');
+    $options = ['query' => ['destination' => '/']];
+    $url = Url::fromRoute('comment.approve', ['comment' => $comment->id()], $options);
+    $this->assertEqual(\Drupal::l('Approve', $url), (string) $approve_comment, 'Found a comment approve link for an unapproved comment.');
+
+    // Approve the comment.
+    $comment->setPublished(CommentInterface::PUBLISHED);
+    $comment->save();
+    $view = Views::getView('test_comment');
+    $view->preview();
+
+    // Check if I can see the comment approve link on an approved comment.
+    $approve_comment = $view->style_plugin->getField(1, 'approve_comment');
+    $this->assertFalse((string) $approve_comment, "Didn't find a comment approve link for an already approved comment.");
+
+    // Check if I can see the comment approve link on an approved comment as an
+    // anonymous user.
+    $account_switcher->switchTo(new AnonymousUserSession());
+    // Set the comment as unpublished again.
+    $comment->setPublished(CommentInterface::NOT_PUBLISHED);
+    $comment->save();
+
+    $view = Views::getView('test_comment');
+    $view->preview();
+    $replyto_comment = $view->style_plugin->getField(0, 'approve_comment');
+    $this->assertFalse((string) $replyto_comment, "I can't approve the comment as an anonymous user.");
+  }
+
+  /**
+   * Test the comment reply link.
+   */
+  public function testLinkReply() {
+    $this->enableModules(['field', 'entity_test']);
+    $this->installEntitySchema('entity_test');
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installConfig(['field']);
+
+    $field_storage_comment = FieldStorageConfig::create([
+      'field_name' => 'comment',
+      'type' => 'comment',
+      'entity_type' => 'entity_test',
+    ]);
+    $field_storage_comment->save();
+    // Create a comment field which allows threading.
+    $field_comment = FieldConfig::create([
+      'field_name' => 'comment',
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'settings' => [
+        'default_mode' => CommentManagerInterface::COMMENT_MODE_THREADED,
+      ],
+    ]);
+    $field_comment->save();
+
+    $host = EntityTest::create(['name' => $this->randomString()]);
+    $host->save();
+    // Attach an unapproved comment to the test entity.
+    $comment = $this->commentStorage->create([
+      'uid' => $this->adminUser->id(),
+      'entity_type' => 'entity_test',
+      'entity_id' => $host->id(),
+      'comment_type' => 'entity_test',
+      'field_name' => $field_storage_comment->getName(),
+      'status' => 0,
+    ]);
+    $comment->save();
+
+    $view = Views::getView('test_comment');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'replyto_comment' => [
+        'table' => 'comment',
+        'field' => 'replyto_comment',
+        'id' => 'replyto_comment',
+        'plugin_id' => 'comment_link_reply',
+        'entity_type' => 'comment',
+      ],
+    ]);
+    $view->save();
+
+    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
+    $account_switcher = \Drupal::service('account_switcher');
+    $account_switcher->switchTo($this->adminUser);
+    $view->preview();
+
+    // Check if I can see the reply link on an unapproved comment.
+    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
+    $this->assertFalse((string) $replyto_comment, "I can't reply to an unapproved comment.");
+
+    // Approve the comment.
+    $comment->setPublished(CommentInterface::PUBLISHED);
+    $comment->save();
+    $view = Views::getView('test_comment');
+    $view->preview();
+
+    // Check if I can see the reply link on an approved comment.
+    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
+    $url = Url::fromRoute('comment.reply', [
+      'entity_type' => 'entity_test',
+      'entity' => $host->id(),
+      'field_name' => 'comment',
+      'pid' => $comment->id(),
+    ]);
+    $this->assertEqual(\Drupal::l('Reply', $url), (string) $replyto_comment, 'Found the comment reply link as an admin user.');
+
+    // Check if I can see the reply link as an anonymous user.
+    $account_switcher->switchTo(new AnonymousUserSession());
+    $view = Views::getView('test_comment');
+    $view->preview();
+    $replyto_comment = $view->style_plugin->getField(0, 'replyto_comment');
+    $this->assertFalse((string) $replyto_comment, "Didn't find the comment reply link as an anonymous user.");
+  }
+}
diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
new file mode 100644
index 0000000..7f517ab
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Views/CommentUserNameTest.php
@@ -0,0 +1,171 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Views\CommentUserNameTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Views;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
+use Drupal\views\Entity\View;
+use Drupal\views\Views;
+
+/**
+ * Tests comment user name field
+ *
+ * @group comment
+ */
+class CommentUserNameTest extends ViewsKernelTestBase {
+
+  /**
+   * Admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user', 'comment', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('comment');
+    // Create the anonymous role.
+    $this->installConfig(['user']);
+
+    // Create an anonymous user.
+    $storage = \Drupal::entityManager()->getStorage('user');
+    // Insert a row for the anonymous user.
+    $storage
+      ->create(array(
+        'uid' => 0,
+        'name' => '',
+        'status' => 0,
+      ))
+      ->save();
+
+    $admin_role = Role::create([
+      'id' => 'admin',
+      'permissions' => ['administer comments', 'access user profiles'],
+    ]);
+    $admin_role->save();
+
+    /* @var \Drupal\user\RoleInterface $anonymous_role */
+    $anonymous_role = Role::load(Role::ANONYMOUS_ID);
+    $anonymous_role->grantPermission('access comments');
+    $anonymous_role->save();
+
+    $this->adminUser = User::create([
+      'name' => $this->randomMachineName(),
+      'roles' => [$admin_role->id()],
+    ]);
+    $this->adminUser->save();
+
+    // Create some comments.
+    $comment = Comment::create([
+      'subject' => 'My comment title',
+      'uid' => $this->adminUser->id(),
+      'name' => $this->adminUser->label(),
+      'entity_type' => 'entity_test',
+      'comment_type' => 'entity_test',
+      'status' => 1,
+    ]);
+    $comment->save();
+
+    $comment_anonymous = Comment::create([
+      'subject' => 'Anonymous comment title',
+      'uid' => 0,
+      'name' => 'barry',
+      'mail' => 'test@example.com',
+      'homepage' => 'https://example.com',
+      'entity_type' => 'entity_test',
+      'comment_type' => 'entity_test',
+      'created' => 123456,
+      'status' => 1,
+    ]);
+    $comment_anonymous->save();
+  }
+
+  /**
+   * Test the username formatter.
+   */
+  public function testUsername() {
+    $view_id = $this->randomMachineName();
+    $view = View::create([
+      'id' => $view_id,
+      'base_table' => 'comment_field_data',
+      'display' => [
+        'default' => [
+          'display_plugin' => 'default',
+          'id' => 'default',
+          'display_options' => [
+            'fields' => [
+              'name' => [
+                'table' => 'comment_field_data',
+                'field' => 'name',
+                'id' => 'name',
+                'plugin_id' => 'field',
+                'type' => 'comment_username'
+              ],
+              'subject' => [
+                'table' => 'comment_field_data',
+                'field' => 'subject',
+                'id' => 'subject',
+                'plugin_id' => 'field',
+                'type' => 'string',
+                'settings' => [
+                  'link_to_entity' => TRUE,
+                ],
+              ],
+            ],
+          ],
+        ],
+      ],
+    ]);
+    $view->save();
+
+    /* @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
+    $account_switcher = \Drupal::service('account_switcher');
+
+    /* @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $account_switcher->switchTo($this->adminUser);
+    $executable = Views::getView($view_id);
+    $build = $executable->preview();
+    $this->setRawContent($renderer->renderRoot($build));
+    $this->verbose($this->getRawContent());
+
+    $this->assertLink('My comment title');
+    $this->assertLink('Anonymous comment title');
+    $this->assertLink($this->adminUser->label());
+    $this->assertLink('barry (not verified)');
+
+    $account_switcher->switchTo(new AnonymousUserSession());
+    $executable = Views::getView($view_id);
+    $executable->storage->invalidateCaches();
+
+    $build = $executable->preview();
+    $this->setRawContent($renderer->renderRoot($build));
+
+    // No access to user-profiles, so shouldn't be able to see links.
+    $this->assertNoLink($this->adminUser->label());
+    // Note: External users aren't pointing to drupal user profiles.
+    $this->assertLink('barry (not verified)');
+    $this->verbose($this->getRawContent());
+    $this->assertLink('My comment title');
+    $this->assertLink('Anonymous comment title');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentViewsFieldAccessTest.php b/core/modules/comment/tests/src/Kernel/Views/CommentViewsFieldAccessTest.php
new file mode 100644
index 0000000..4fc62f3
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Views/CommentViewsFieldAccessTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Views\CommentViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Views;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\user\Entity\User;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the comment entity.
+ *
+ * @group comment
+ */
+class CommentViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('comment');
+  }
+
+  /**
+   * Check access for comment fields.
+   */
+  public function testCommentFields() {
+    $user = User::create([
+      'name' => 'test user',
+    ]);
+    $user->save();
+
+    $comment = Comment::create([
+      'subject' => 'My comment title',
+      'uid' => $user->id(),
+      'entity_type' => 'entity_test',
+      'comment_type' => 'entity_test',
+    ]);
+    $comment->save();
+
+    $comment_anonymous = Comment::create([
+      'subject' => 'Anonymous comment title',
+      'uid' => 0,
+      'name' => 'anonymous',
+      'mail' => 'test@example.com',
+      'homepage' => 'https://example.com',
+      'entity_type' => 'entity_test',
+      'comment_type' => 'entity_test',
+      'created' => 123456,
+      'status' => 1,
+    ]);
+    $comment_anonymous->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('comment', 'cid', $comment->id());
+    $this->assertFieldAccess('comment', 'cid', $comment_anonymous->id());
+    $this->assertFieldAccess('comment', 'uuid', $comment->uuid());
+    $this->assertFieldAccess('comment', 'subject', 'My comment title');
+    $this->assertFieldAccess('comment', 'subject', 'Anonymous comment title');
+    $this->assertFieldAccess('comment', 'name', 'anonymous');
+    $this->assertFieldAccess('comment', 'mail', 'test@example.com');
+    $this->assertFieldAccess('comment', 'homepage', 'https://example.com');
+    $this->assertFieldAccess('comment', 'uid', $user->getUsername());
+    // $this->assertFieldAccess('comment', 'created', \Drupal::service('date.formatter')->format(123456));
+    // $this->assertFieldAccess('comment', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
+    $this->assertFieldAccess('comment', 'status', 'On');
+  }
+
+}
diff --git a/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php b/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php
new file mode 100644
index 0000000..d57d49e
--- /dev/null
+++ b/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\comment\Kernel\Views\CommentViewsKernelTestBase.
+ */
+
+namespace Drupal\Tests\comment\Kernel\Views;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Provides a common test base for comment views tests.
+ */
+abstract class CommentViewsKernelTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['comment_test_views', 'user', 'comment'];
+
+  /**
+   * Admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * The entity storage for comments.
+   *
+   * @var \Drupal\comment\CommentStorageInterface
+   */
+  protected $commentStorage;
+
+  /**
+   * The entity storage for users.
+   *
+   * @var \Drupal\user\UserStorageInterface
+   */
+  protected $userStorage;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    ViewTestData::createTestViews(get_class($this), ['comment_test_views']);
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('comment');
+    $this->installConfig(['user']);
+
+    $entity_manager = $this->container->get('entity.manager');
+    $this->commentStorage = $entity_manager->getStorage('comment');
+    $this->userStorage = $entity_manager->getStorage('user');
+
+    // Insert a row for the anonymous user.
+    $this->userStorage
+      ->create([
+        'uid' => 0,
+        'name' => '',
+        'status' => 0,
+      ])
+      ->save();
+
+    $admin_role = Role::create(['id' => 'admin']);
+    $admin_role->grantPermission('administer comments');
+    $admin_role->save();
+
+    /* @var \Drupal\user\RoleInterface $anonymous_role */
+    $anonymous_role = Role::load(Role::ANONYMOUS_ID);
+    $anonymous_role->grantPermission('access comments');
+    $anonymous_role->save();
+
+    $this->adminUser = $this->userStorage->create(['name' => $this->randomMachineName()]);
+    $this->adminUser->addRole('admin');
+    $this->adminUser->save();
+  }
+
+}
diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php
index 03de002..c17dcad 100644
--- a/core/modules/config/src/Form/ConfigSync.php
+++ b/core/modules/config/src/Form/ConfigSync.php
@@ -186,7 +186,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     if (empty($source_list) || !$storage_comparer->createChangelist()->hasChanges()) {
       $form['no_changes'] = array(
         '#type' => 'table',
-        '#header' => array('Name', 'Operations'),
+        '#header' => array($this->t('Name'), $this->t('Operations')),
         '#rows' => array(),
         '#empty' => $this->t('There are no configuration changes to import.'),
       );
@@ -232,7 +232,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form_state->set('storage_comparer', $storage_comparer);
 
     // Add the AJAX library to the form for dialog support.
-    $form['#attached']['library'][] = 'core/drupal.ajax';
+    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
 
     foreach ($storage_comparer->getAllCollectionNames() as $collection) {
       if ($collection != StorageInterface::DEFAULT_COLLECTION) {
@@ -272,7 +272,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         }
         $form[$collection][$config_change_type]['list'] = array(
           '#type' => 'table',
-          '#header' => array('Name', 'Operations'),
+          '#header' => array($this->t('Name'), $this->t('Operations')),
         );
 
         foreach ($config_names as $config_name) {
@@ -343,9 +343,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
           'finished' => array(get_class($this), 'finishBatch'),
           'title' => t('Synchronizing configuration'),
           'init_message' => t('Starting configuration synchronization.'),
-          'progress_message' => t('Completed @current step of @total.'),
+          'progress_message' => t('Completed step @current of @total.'),
           'error_message' => t('Configuration synchronization has encountered an error.'),
-          'file' => drupal_get_path('module', 'config') . '/config.admin.inc',
+          'file' => __DIR__ . '/../../config.admin.inc',
         );
         foreach ($sync_steps as $sync_step) {
           $batch['operations'][] = array(array(get_class($this), 'processBatch'), array($config_importer, $sync_step));
diff --git a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php b/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
index 05f5385..b3bb97c 100644
--- a/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
+++ b/core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
@@ -13,7 +13,7 @@
  * Provides test assertions for testing config entity synchronization.
  *
  * Can be used by test classes that extend \Drupal\simpletest\WebTestBase or
- * \Drupal\simpletest\KernelTestBase.
+ * \Drupal\KernelTests\KernelTestBase.
  */
 trait AssertConfigEntityImportTrait {
 
diff --git a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php b/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
deleted file mode 100644
index e559d80..0000000
--- a/core/modules/config/src/Tests/CacheabilityMetadataConfigOverrideTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\CacheabilityMetadataConfigOverrideTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\config_override_test\Cache\PirateDayCacheContext;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests if configuration overrides correctly affect cacheability metadata.
- *
- * @group config
- */
-class CacheabilityMetadataConfigOverrideTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'block',
-    'block_content',
-    'config',
-    'config_override_test',
-    'system',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('block_content');
-    $this->installConfig(['config_override_test']);
-  }
-
-  /**
-   * Tests if config overrides correctly set cacheability metadata.
-   */
-  public function testConfigOverride() {
-    // It's pirate day today!
-    $GLOBALS['it_is_pirate_day'] = TRUE;
-
-    $config_factory = $this->container->get('config.factory');
-    $config = $config_factory->get('system.theme');
-
-    // Check that we are using the Pirate theme.
-    $theme = $config->get('default');
-    $this->assertEqual('pirate', $theme);
-
-    // Check that the cacheability metadata is correct.
-    $this->assertEqual(['pirate_day'], $config->getCacheContexts());
-    $this->assertEqual(['config:system.theme', 'pirate-day-tag'], $config->getCacheTags());
-    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $config->getCacheMaxAge());
-  }
-
-  /**
-   * Tests if config overrides set cacheability metadata on config entities.
-   */
-  public function testConfigEntityOverride() {
-    // It's pirate day today!
-    $GLOBALS['it_is_pirate_day'] = TRUE;
-
-    // Load the User login block and check that its cacheability metadata is
-    // overridden correctly. This verifies that the metadata is correctly
-    // applied to config entities.
-    /** @var EntityManagerInterface $entity_manager */
-    $entity_manager = $this->container->get('entity.manager');
-    $block = $entity_manager->getStorage('block')->load('call_to_action');
-
-    // Check that our call to action message is appealing to filibusters.
-    $this->assertEqual($block->label(), 'Draw yer cutlasses!');
-
-    // Check that the cacheability metadata is correct.
-    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
-    $this->assertEqual(['config:block.block.call_to_action', 'pirate-day-tag'], $block->getCacheTags());
-    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
-
-    // Check that duplicating a config entity does not have the original config
-    // entity's cache tag.
-    $this->assertEqual(['config:block.block.', 'pirate-day-tag'], $block->createDuplicate()->getCacheTags());
-
-    // Check that renaming a config entity does not have the original config
-    // entity's cache tag.
-    $block->set('id', 'call_to_looting')->save();
-    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
-    $this->assertEqual(['config:block.block.call_to_looting', 'pirate-day-tag'], $block->getCacheTags());
-    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigCRUDTest.php b/core/modules/config/src/Tests/ConfigCRUDTest.php
deleted file mode 100644
index 3d61c9e..0000000
--- a/core/modules/config/src/Tests/ConfigCRUDTest.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigCRUDTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ConfigNameException;
-use Drupal\Core\Config\ConfigValueException;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\Core\Config\DatabaseStorage;
-use Drupal\Core\Config\UnsupportedDataTypeConfigException;
-
-/**
- * Tests CRUD operations on configuration objects.
- *
- * @group config
- */
-class ConfigCRUDTest extends KernelTestBase {
-
-  /**
-   * Exempt from strict schema checking.
-   *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system');
-
-  /**
-   * Tests CRUD operations.
-   */
-  function testCRUD() {
-    $storage = $this->container->get('config.storage');
-    $config_factory = $this->container->get('config.factory');
-    $name = 'config_test.crud';
-
-    $config = $this->config($name);
-    $this->assertIdentical($config->isNew(), TRUE);
-
-    // Create a new configuration object.
-    $config->set('value', 'initial');
-    $config->save();
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Verify the active configuration contains the saved value.
-    $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 'initial'));
-
-    // Update the configuration object instance.
-    $config->set('value', 'instance-update');
-    $config->save();
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Verify the active configuration contains the updated value.
-    $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 'instance-update'));
-
-    // Verify a call to $this->config() immediately returns the updated value.
-    $new_config = $this->config($name);
-    $this->assertIdentical($new_config->get(), $config->get());
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Pollute the config factory static cache.
-    $config_factory->getEditable($name);
-
-    // Delete the configuration object.
-    $config->delete();
-
-    // Verify the configuration object is empty.
-    $this->assertIdentical($config->get(), array());
-    $this->assertIdentical($config->isNew(), TRUE);
-
-    // Verify that all copies of the configuration has been removed from the
-    // static cache.
-    $this->assertIdentical($config_factory->getEditable($name)->isNew(), TRUE);
-
-    // Verify the active configuration contains no value.
-    $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, FALSE);
-
-    // Verify $this->config() returns no data.
-    $new_config = $this->config($name);
-    $this->assertIdentical($new_config->get(), $config->get());
-    $this->assertIdentical($config->isNew(), TRUE);
-
-    // Re-create the configuration object.
-    $config->set('value', 're-created');
-    $config->save();
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Verify the active configuration contains the updated value.
-    $actual_data = $storage->read($name);
-    $this->assertIdentical($actual_data, array('value' => 're-created'));
-
-    // Verify a call to $this->config() immediately returns the updated value.
-    $new_config = $this->config($name);
-    $this->assertIdentical($new_config->get(), $config->get());
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Rename the configuration object.
-    $new_name = 'config_test.crud_rename';
-    $this->container->get('config.factory')->rename($name, $new_name);
-    $renamed_config = $this->config($new_name);
-    $this->assertIdentical($renamed_config->get(), $config->get());
-    $this->assertIdentical($renamed_config->isNew(), FALSE);
-
-    // Ensure that the old configuration object is removed from both the cache
-    // and the configuration storage.
-    $config = $this->config($name);
-    $this->assertIdentical($config->get(), array());
-    $this->assertIdentical($config->isNew(), TRUE);
-
-    // Test renaming when config.factory does not have the object in its static
-    // cache.
-    $name = 'config_test.crud_rename';
-    // Pollute the non-overrides static cache.
-    $config_factory->getEditable($name);
-    // Pollute the overrides static cache.
-    $config = $config_factory->get($name);
-    // Rename and ensure that happened properly.
-    $new_name = 'config_test.crud_rename_no_cache';
-    $config_factory->rename($name, $new_name);
-    $renamed_config = $config_factory->get($new_name);
-    $this->assertIdentical($renamed_config->get(), $config->get());
-    $this->assertIdentical($renamed_config->isNew(), FALSE);
-    // Ensure the overrides static cache has been cleared.
-    $this->assertIdentical($config_factory->get($name)->isNew(), TRUE);
-    // Ensure the non-overrides static cache has been cleared.
-    $this->assertIdentical($config_factory->getEditable($name)->isNew(), TRUE);
-
-    // Merge data into the configuration object.
-    $new_config = $this->config($new_name);
-    $expected_values = array(
-      'value' => 'herp',
-      '404' => 'derp',
-    );
-    $new_config->merge($expected_values);
-    $new_config->save();
-    $this->assertIdentical($new_config->get('value'), $expected_values['value']);
-    $this->assertIdentical($new_config->get('404'), $expected_values['404']);
-
-    // Test that getMultiple() does not return new config objects that were
-    // previously accessed with get()
-    $new_config = $config_factory->get('non_existing_key');
-    $this->assertTrue($new_config->isNew());
-    $this->assertEqual(0, count($config_factory->loadMultiple(['non_existing_key'])), 'loadMultiple() does not return new objects');
-  }
-
-  /**
-   * Tests the validation of configuration object names.
-   */
-  function testNameValidation() {
-    // Verify that an object name without namespace causes an exception.
-    $name = 'nonamespace';
-    $message = 'Expected ConfigNameException was thrown for a name without a namespace.';
-    try {
-      $this->config($name)->save();
-      $this->fail($message);
-    }
-    catch (ConfigNameException $e) {
-      $this->pass($message);
-    }
-
-    // Verify that a name longer than the maximum length causes an exception.
-    $name = 'config_test.herman_melville.moby_dick_or_the_whale.harper_1851.now_small_fowls_flew_screaming_over_the_yet_yawning_gulf_a_sullen_white_surf_beat_against_its_steep_sides_then_all_collapsed_and_the_great_shroud_of_the_sea_rolled_on_as_it_rolled_five_thousand_years_ago';
-    $message = 'Expected ConfigNameException was thrown for a name longer than Config::MAX_NAME_LENGTH.';
-    try {
-      $this->config($name)->save();
-      $this->fail($message);
-    }
-    catch (ConfigNameException $e) {
-      $this->pass($message);
-    }
-
-    // Verify that disallowed characters in the name cause an exception.
-    $characters = $test_characters = array(':', '?', '*', '<', '>', '"', '\'', '/', '\\');
-    foreach ($test_characters as $i => $c) {
-      try {
-        $name = 'namespace.object' . $c;
-        $config = $this->config($name);
-        $config->save();
-      }
-      catch (ConfigNameException $e) {
-        unset($test_characters[$i]);
-      }
-    }
-    $this->assertTrue(empty($test_characters), format_string('Expected ConfigNameException was thrown for all invalid name characters: @characters', array(
-      '@characters' => implode(' ', $characters),
-    )));
-
-    // Verify that a valid config object name can be saved.
-    $name = 'namespace.object';
-    $message = 'ConfigNameException was not thrown for a valid object name.';
-    try {
-      $config = $this->config($name);
-      $config->save();
-      $this->pass($message);
-    }
-    catch (ConfigNameException $e) {
-      $this->fail($message);
-    }
-
-  }
-
-  /**
-   * Tests the validation of configuration object values.
-   */
-  function testValueValidation() {
-    // Verify that setData() will catch dotted keys.
-    $message = 'Expected ConfigValueException was thrown from setData() for value with dotted keys.';
-    try {
-      $this->config('namespace.object')->setData(array('key.value' => 12))->save();
-      $this->fail($message);
-    }
-    catch (ConfigValueException $e) {
-      $this->pass($message);
-    }
-
-    // Verify that set() will catch dotted keys.
-    $message = 'Expected ConfigValueException was thrown from set() for value with dotted keys.';
-    try {
-      $this->config('namespace.object')->set('foo', array('key.value' => 12))->save();
-      $this->fail($message);
-    }
-    catch (ConfigValueException $e) {
-      $this->pass($message);
-    }
-  }
-
-  /**
-   * Tests data type handling.
-   */
-  public function testDataTypes() {
-    \Drupal::service('module_installer')->install(array('config_test'));
-    $storage = new DatabaseStorage($this->container->get('database'), 'config');
-    $name = 'config_test.types';
-    $config = $this->config($name);
-    $original_content = file_get_contents(drupal_get_path('module', 'config_test') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.yml");
-    $this->verbose('<pre>' . $original_content . "\n" . var_export($storage->read($name), TRUE));
-
-    // Verify variable data types are intact.
-    $data = array(
-      'array' => array(),
-      'boolean' => TRUE,
-      'exp' => 1.2e+34,
-      'float' => 3.14159,
-      'float_as_integer' => (float) 1,
-      'hex' => 0xC,
-      'int' => 99,
-      'octal' => 0775,
-      'string' => 'string',
-      'string_int' => '1',
-    );
-    $data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data));
-    $this->assertIdentical($config->get(), $data);
-
-    // Re-set each key using Config::set().
-    foreach($data as $key => $value) {
-      $config->set($key, $value);
-    }
-    $config->save();
-    $this->assertIdentical($config->get(), $data);
-    // Assert the data against the file storage.
-    $this->assertIdentical($storage->read($name), $data);
-    $this->verbose('<pre>' . $name . var_export($storage->read($name), TRUE));
-
-    // Set data using config::setData().
-    $config->setData($data)->save();
-    $this->assertIdentical($config->get(), $data);
-    $this->assertIdentical($storage->read($name), $data);
-
-    // Test that schema type enforcement can be overridden by trusting the data.
-    $this->assertIdentical(99, $config->get('int'));
-    $config->set('int', '99')->save(TRUE);
-    $this->assertIdentical('99', $config->get('int'));
-    // Test that re-saving without testing the data enforces the schema type.
-    $config->save();
-    $this->assertIdentical($data, $config->get());
-
-    // Test that setting an unsupported type for a config object with a schema
-    // fails.
-    try {
-      $config->set('stream', fopen(__FILE__, 'r'))->save();
-      $this->fail('No Exception thrown upon saving invalid data type.');
-    }
-    catch (UnsupportedDataTypeConfigException $e) {
-      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
-        '%class' => get_class($e),
-      )));
-    }
-
-    // Test that setting an unsupported type for a config object with no schema
-    // also fails.
-    $typed_config_manager = $this->container->get('config.typed');
-    $config_name = 'config_test.no_schema';
-    $config = $this->config($config_name);
-    $this->assertFalse($typed_config_manager->hasConfigSchema($config_name));
-
-    try {
-      $config->set('stream', fopen(__FILE__, 'r'))->save();
-      $this->fail('No Exception thrown upon saving invalid data type.');
-    }
-    catch (UnsupportedDataTypeConfigException $e) {
-      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
-        '%class' => get_class($e),
-      )));
-    }
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigDependencyTest.php b/core/modules/config/src/Tests/ConfigDependencyTest.php
deleted file mode 100644
index 40c7b44..0000000
--- a/core/modules/config/src/Tests/ConfigDependencyTest.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigDependencyTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests for configuration dependencies.
- *
- * @group config
- */
-class ConfigDependencyTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * The entity_test module is enabled to provide content entity types.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'entity_test', 'user');
-
-  /**
-   * Tests that calculating dependencies for system module.
-   */
-  public function testNonEntity() {
-    $this->installConfig(array('system'));
-    $config_manager = \Drupal::service('config.manager');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('system'));
-    $this->assertTrue(isset($dependents['system.site']), 'Simple configuration system.site has a UUID key even though it is not a configuration entity and therefore is found when looking for dependencies of the System module.');
-    // Ensure that calling
-    // \Drupal\Core\Config\ConfigManager::findConfigEntityDependentsAsEntities()
-    // does not try to load system.site as an entity.
-    $config_manager->findConfigEntityDependentsAsEntities('module', array('system'));
-  }
-
-  /**
-   * Tests creating dependencies on configuration entities.
-   */
-  public function testDependencyManagement() {
-    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
-    $config_manager = \Drupal::service('config.manager');
-    $storage = $this->container->get('entity.manager')->getStorage('config_test');
-    // Test dependencies between modules.
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node')
-          )
-        )
-      )
-    );
-    $entity1->save();
-
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('config_test'));
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the config_test module.');
-    $dependents = $config_manager->findConfigEntityDependents('module', array('views'));
-    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Views module.');
-    // Ensure that the provider of the config entity is not actually written to
-    // the dependencies array.
-    $raw_config = $this->config('config_test.dynamic.entity1');
-    $root_module_dependencies = $raw_config->get('dependencies.module');
-    $this->assertTrue(empty($root_module_dependencies), 'Node module is not written to the root dependencies array as it is enforced.');
-
-    // Create additional entities to test dependencies on config entities.
-    $entity2 = $storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))));
-    $entity2->save();
-    $entity3 = $storage->create(array('id' => 'entity3', 'dependencies' => array('enforced' => array('config' => array($entity2->getConfigDependencyName())))));
-    $entity3->save();
-    $entity4 = $storage->create(array('id' => 'entity4', 'dependencies' => array('enforced' => array('config' => array($entity3->getConfigDependencyName())))));
-    $entity4->save();
-
-    // Test getting $entity1's dependencies as configuration dependency objects.
-    $dependents = $config_manager->findConfigEntityDependents('config', array($entity1->getConfigDependencyName()));
-    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on itself.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
-
-    // Test getting $entity2's dependencies as entities.
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity2->getConfigDependencyName()));
-    $dependent_ids = $this->getDependentIds($dependents);
-    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
-    $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on itself.');
-    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity2.');
-    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity2.');
-
-    // Test getting node module's dependencies as configuration dependency
-    // objects.
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the Node module.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
-
-    // Test getting node module's dependencies as configuration dependency
-    // objects after making $entity3 also dependent on node module but $entity1
-    // no longer depend on node module.
-    $entity1->setEnforcedDependencies([])->save();
-    $entity3->setEnforcedDependencies(['module' => ['node'], 'config' => [$entity2->getConfigDependencyName()]])->save();
-    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
-    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Node module.');
-    $this->assertFalse(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 does not have a dependency on the Node module.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
-
-    // Test dependency on a content entity.
-    $entity_test = entity_create('entity_test', array(
-      'name' => $this->randomString(),
-      'type' => 'entity_test',
-    ));
-    $entity_test->save();
-    $entity2->setEnforcedDependencies(['config' => [$entity1->getConfigDependencyName()], 'content' => [$entity_test->getConfigDependencyName()]])->save();;
-    $dependents = $config_manager->findConfigEntityDependents('content', array($entity_test->getConfigDependencyName()));
-    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the content entity.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the content entity.');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the content entity (via entity2).');
-    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the content entity (via entity3).');
-
-    // Create a configuration entity of a different type with the same ID as one
-    // of the entities already created.
-    $alt_storage = $this->container->get('entity.manager')->getStorage('config_query_test');
-    $alt_storage->create(array('id' => 'entity1', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))))->save();
-    $alt_storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('module' => array('views')))))->save();
-
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity1->getConfigDependencyName()));
-    $dependent_ids = $this->getDependentIds($dependents);
-    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on itself.');
-    $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
-    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
-    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
-    $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_query_test.dynamic.entity1 has a dependency on config_test.dynamic.entity1.');
-    $this->assertFalse(in_array('config_query_test:entity2', $dependent_ids), 'config_query_test.dynamic.entity2 does not have a dependency on config_test.dynamic.entity1.');
-
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('node', 'views'));
-    $dependent_ids = $this->getDependentIds($dependents);
-    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on Views or Node.');
-    $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on Views or Node.');
-    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on Views or Node.');
-    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on Views or Node.');
-    $this->assertFalse(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 does not have a dependency on Views or Node.');
-    $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on Views or Node.');
-
-    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('config_test'));
-    $dependent_ids = $this->getDependentIds($dependents);
-    $this->assertTrue(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 has a dependency on config_test module.');
-    $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test module.');
-    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test module.');
-    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test module.');
-    $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 has a dependency on config_test module.');
-    $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on config_test module.');
-
-    // Test the ability to find missing content dependencies.
-    $missing_dependencies = $config_manager->findMissingContentDependencies();
-    $this->assertEqual([], $missing_dependencies);
-
-    $expected = [$entity_test->uuid() => [
-      'entity_type' => 'entity_test',
-      'bundle' => $entity_test->bundle(),
-      'uuid' => $entity_test->uuid(),
-    ]];
-    // Delete the content entity so that is it now missing.
-    $entity_test->delete();
-    $missing_dependencies = $config_manager->findMissingContentDependencies();
-    $this->assertEqual($expected, $missing_dependencies);
-
-    // Add a fake missing dependency to ensure multiple missing dependencies
-    // work.
-    $entity1->setEnforcedDependencies(['content' => [$entity_test->getConfigDependencyName(), 'entity_test:bundle:uuid']])->save();;
-    $expected['uuid'] = [
-      'entity_type' => 'entity_test',
-      'bundle' => 'bundle',
-      'uuid' => 'uuid',
-    ];
-    $missing_dependencies = $config_manager->findMissingContentDependencies();
-    $this->assertEqual($expected, $missing_dependencies);
-  }
-
-  /**
-   * Tests ConfigManager::uninstall() and config entity dependency management.
-   */
-  public function testConfigEntityUninstall() {
-    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
-    $config_manager = \Drupal::service('config.manager');
-    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
-    $storage = $this->container->get('entity.manager')->getStorage('config_test');
-    // Test dependencies between modules.
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
-    );
-    $entity1->save();
-    $entity2 = $storage->create(
-      array(
-        'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity2->save();
-    // Perform a module rebuild so we can know where the node module is located
-    // and uninstall it.
-    // @todo Remove as part of https://www.drupal.org/node/2186491
-    system_rebuild_module_data();
-    // Test that doing a config uninstall of the node module deletes entity2
-    // since it is dependent on entity1 which is dependent on the node module.
-    $config_manager->uninstall('module', 'node');
-    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
-    $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
-
-    // Set a more complicated test where dependencies will be fixed.
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
-    \Drupal::state()->set('config_test.on_dependency_removal_called', []);
-    // Entity1 will be deleted because it depends on node.
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
-    );
-    $entity1->save();
-
-    // Entity2 has a dependency on Entity1 but it can be fixed because
-    // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
-    // dependency before config entities are deleted.
-    $entity2 = $storage->create(
-      array(
-        'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity2->save();
-
-    // Entity3 will be unchanged because it is dependent on Entity2 which can
-    // be fixed. The ConfigEntityInterface::onDependencyRemoval() method will
-    // not be called for this entity.
-    $entity3 = $storage->create(
-      array(
-        'id' => 'entity3',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity2->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity3->save();
-
-    // Entity4's config dependency will be fixed but it will still be deleted
-    // because it also depends on the node module.
-    $entity4 = $storage->create(
-      array(
-        'id' => 'entity4',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-            'module' => array('node', 'config_test')
-          ),
-        ),
-      )
-    );
-    $entity4->save();
-
-    // Do a dry run using
-    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
-    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('module', ['node']);
-    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
-    $this->assertEqual($entity2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
-    $this->assertEqual($entity3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
-    $this->assertEqual($entity4->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 4 will be deleted.');
-
-    $called = \Drupal::state()->get('config_test.on_dependency_removal_called', []);
-    $this->assertFalse(in_array($entity3->id(), $called), 'ConfigEntityInterface::onDependencyRemoval() is not called for entity 3.');
-    $this->assertIdentical(['entity1', 'entity2', 'entity4'], $called, 'The most dependent entites have ConfigEntityInterface::onDependencyRemoval() called first.');
-
-    // Perform the uninstall.
-    $config_manager->uninstall('module', 'node');
-
-    // Test that expected actions have been performed.
-    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
-    $entity2 = $storage->load('entity2');
-    $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
-    $entity3 = $storage->load('entity3');
-    $this->assertTrue($entity3, 'Entity 3 not deleted');
-    $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
-    $this->assertFalse($storage->load('entity4'), 'Entity 4 deleted');
-  }
-
-  /**
-   * Tests deleting a configuration entity and dependency management.
-   */
-  public function testConfigEntityDelete() {
-    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
-    $config_manager = \Drupal::service('config.manager');
-    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
-    $storage = $this->container->get('entity.manager')->getStorage('config_test');
-    // Test dependencies between configuration entities.
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1'
-      )
-    );
-    $entity1->save();
-    $entity2 = $storage->create(
-      array(
-        'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity2->save();
-
-    // Do a dry run using
-    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
-    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('config', [$entity1->getConfigDependencyName()]);
-    $this->assertEqual($entity2->uuid(), reset($config_entities['delete'])->uuid(), 'Entity 2 will be deleted.');
-    $this->assertTrue(empty($config_entities['update']), 'No dependent configuration entities will be updated.');
-    $this->assertTrue(empty($config_entities['unchanged']), 'No dependent configuration entities will be unchanged.');
-
-    // Test that doing a delete of entity1 deletes entity2 since it is dependent
-    // on entity1.
-    $entity1->delete();
-    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
-    $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
-
-    // Set a more complicated test where dependencies will be fixed.
-    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
-
-    // Entity1 will be deleted by the test.
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1',
-      )
-    );
-    $entity1->save();
-
-    // Entity2 has a dependency on Entity1 but it can be fixed because
-    // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
-    // dependency before config entities are deleted.
-    $entity2 = $storage->create(
-      array(
-        'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity2->save();
-
-    // Entity3 will be unchanged because it is dependent on Entity2 which can
-    // be fixed.
-    $entity3 = $storage->create(
-      array(
-        'id' => 'entity3',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity2->getConfigDependencyName()),
-          ),
-        ),
-      )
-    );
-    $entity3->save();
-
-    // Do a dry run using
-    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
-    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('config', [$entity1->getConfigDependencyName()]);
-    $this->assertTrue(empty($config_entities['delete']), 'No dependent configuration entities will be deleted.');
-    $this->assertEqual($entity2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
-    $this->assertEqual($entity3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
-
-    // Perform the uninstall.
-    $entity1->delete();
-
-    // Test that expected actions have been performed.
-    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
-    $entity2 = $storage->load('entity2');
-    $this->assertTrue($entity2, 'Entity 2 not deleted');
-    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
-    $entity3 = $storage->load('entity3');
-    $this->assertTrue($entity3, 'Entity 3 not deleted');
-    $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
-  }
-
-  /**
-   * Tests getConfigEntitiesToChangeOnDependencyRemoval() with content entities.
-   *
-   * At the moment there is no runtime code that calculates configuration
-   * dependencies on content entity delete because this calculation is expensive
-   * and all content dependencies are soft. This test ensures that the code
-   * works for content entities.
-   *
-   * @see \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval()
-   */
-  public function testContentEntityDelete() {
-    $this->installEntitySchema('entity_test');
-    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
-    $config_manager = \Drupal::service('config.manager');
-
-    $content_entity = EntityTest::create();
-    $content_entity->save();
-    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
-    $storage = $this->container->get('entity.manager')->getStorage('config_test');
-    $entity1 = $storage->create(
-      array(
-        'id' => 'entity1',
-        'dependencies' => array(
-          'enforced' => array(
-            'content' => array($content_entity->getConfigDependencyName())
-          ),
-        ),
-      )
-    );
-    $entity1->save();
-    $entity2 = $storage->create(
-      array(
-        'id' => 'entity2',
-        'dependencies' => array(
-          'enforced' => array(
-            'config' => array($entity1->getConfigDependencyName())
-          ),
-        ),
-      )
-    );
-    $entity2->save();
-
-    // Create a configuration entity that is not in the dependency chain.
-    $entity3 = $storage->create(array('id' => 'entity3'));
-    $entity3->save();
-
-    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('content', [$content_entity->getConfigDependencyName()]);
-    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
-    $this->assertEqual($entity2->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 2 will be deleted.');
-    $this->assertTrue(empty($config_entities['update']), 'No dependencies of the content entity will be updated.');
-    $this->assertTrue(empty($config_entities['unchanged']), 'No dependencies of the content entity will be unchanged.');
-  }
-
-  /**
-   * Gets a list of identifiers from an array of configuration entities.
-   *
-   * @param \Drupal\Core\Config\Entity\ConfigEntityInterface[] $dependents
-   *   An array of configuration entities.
-   *
-   * @return array
-   *   An array with values of entity_type_id:ID
-   */
-  protected function getDependentIds(array $dependents) {
-    $dependent_ids = array();
-    foreach($dependents as $dependent) {
-      $dependent_ids[] = $dependent->getEntityTypeId() . ':' . $dependent->id();
-    }
-    return $dependent_ids;
-  }
-}
diff --git a/core/modules/config/src/Tests/ConfigDiffTest.php b/core/modules/config/src/Tests/ConfigDiffTest.php
deleted file mode 100644
index 1f32b27..0000000
--- a/core/modules/config/src/Tests/ConfigDiffTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigDiffTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Calculating the difference between two sets of configuration.
- *
- * @group config
- */
-class ConfigDiffTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'system');
-
-  /**
-   * Tests calculating the difference between two sets of configuration.
-   */
-  function testDiff() {
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $config_name = 'config_test.system';
-    $change_key = 'foo';
-    $remove_key = '404';
-    $add_key = 'biff';
-    $add_data = 'bangpow';
-    $change_data = 'foobar';
-
-    // Install the default config.
-    $this->installConfig(array('config_test'));
-    $original_data = \Drupal::config($config_name)->get();
-
-    // Change a configuration value in sync.
-    $sync_data = $original_data;
-    $sync_data[$change_key] = $change_data;
-    $sync_data[$add_key] = $add_data;
-    $sync->write($config_name, $sync_data);
-
-    // Verify that the diff reflects a change.
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'change', 'The first item in the diff is a change.');
-    $this->assertEqual($edits[0]->orig[0], $change_key . ': ' . $original_data[$change_key], format_string("The active value for key '%change_key' is '%original_data'.", array('%change_key' => $change_key, '%original_data' => $original_data[$change_key])));
-    $this->assertEqual($edits[0]->closing[0], $change_key . ': ' . $change_data, format_string("The sync value for key '%change_key' is '%change_data'.", array('%change_key' => $change_key, '%change_data' => $change_data)));
-
-    // Reset data back to original, and remove a key
-    $sync_data = $original_data;
-    unset($sync_data[$remove_key]);
-    $sync->write($config_name, $sync_data);
-
-    // Verify that the diff reflects a removed key.
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
-    $this->assertEqual($edits[1]->type, 'delete', 'The second item in the diff is a delete.');
-    $this->assertEqual($edits[1]->orig[0], $remove_key . ': ' . $original_data[$remove_key], format_string("The active value for key '%remove_key' is '%original_data'.", array('%remove_key' => $remove_key, '%original_data' => $original_data[$remove_key])));
-    $this->assertFalse($edits[1]->closing, format_string("The key '%remove_key' does not exist in sync.", array('%remove_key' => $remove_key)));
-
-    // Reset data back to original and add a key
-    $sync_data = $original_data;
-    $sync_data[$add_key] = $add_data;
-    $sync->write($config_name, $sync_data);
-
-    // Verify that the diff reflects an added key.
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
-    $this->assertEqual($edits[1]->type, 'add', 'The second item in the diff is an add.');
-    $this->assertFalse($edits[1]->orig, format_string("The key '%add_key' does not exist in active.", array('%add_key' => $add_key)));
-    $this->assertEqual($edits[1]->closing[0], $add_key . ': ' . $add_data, format_string("The sync value for key '%add_key' is '%add_data'.", array('%add_key' => $add_key, '%add_data' => $add_data)));
-
-    // Test diffing a renamed config entity.
-    $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', array(
-      'id' => $test_entity_id,
-      'label' => $this->randomMachineName(),
-    ));
-    $test_entity->save();
-    $data = $active->read('config_test.dynamic.' . $test_entity_id);
-    $sync->write('config_test.dynamic.' . $test_entity_id, $data);
-    $config_name = 'config_test.dynamic.' . $test_entity_id;
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, $config_name);
-    // Prove the fields match.
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
-    $this->assertEqual(count($edits), 1, 'There is one item in the diff');
-
-    // Rename the entity.
-    $new_test_entity_id = $this->randomMachineName();
-    $test_entity->set('id', $new_test_entity_id);
-    $test_entity->save();
-
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, 'config_test.dynamic.' . $new_test_entity_id, $config_name);
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
-    $this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.');
-    $this->assertEqual($edits[1]->orig, array('id: ' . $new_test_entity_id));
-    $this->assertEqual($edits[1]->closing, array('id: ' . $test_entity_id));
-    $this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.');
-    $this->assertEqual(count($edits), 3, 'There are three items in the diff.');
-  }
-
-  /**
-   * Tests calculating the difference between two sets of config collections.
-   */
-  function testCollectionDiff() {
-    /** @var \Drupal\Core\Config\StorageInterface $active */
-    $active = $this->container->get('config.storage');
-    /** @var \Drupal\Core\Config\StorageInterface $sync */
-    $sync = $this->container->get('config.storage.sync');
-    $active_test_collection = $active->createCollection('test');
-    $sync_test_collection = $sync->createCollection('test');
-
-    $config_name = 'config_test.test';
-    $data = array('foo' => 'bar');
-
-    $active->write($config_name, $data);
-    $sync->write($config_name, $data);
-    $active_test_collection->write($config_name, $data);
-    $sync_test_collection->write($config_name, array('foo' => 'baz'));
-
-    // Test the fields match in the default collection diff.
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
-    $this->assertEqual(count($edits), 1, 'There is one item in the diff');
-
-    // Test that the differences are detected when diffing the collection.
-    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, NULL, 'test');
-    $edits = $diff->getEdits();
-    $this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.');
-    $this->assertEqual($edits[0]->orig, array('foo: bar'));
-    $this->assertEqual($edits[0]->closing, array('foo: baz'));
-    $this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.');
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php b/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
deleted file mode 100644
index 7e0acef..0000000
--- a/core/modules/config/src/Tests/ConfigEntityNormalizeTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEntityNormalizeTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the listing of configuration entities.
- *
- * @group config
- */
-class ConfigEntityNormalizeTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-  }
-
-  public function testNormalize() {
-    $config_entity = entity_create('config_test', array('id' => 'system', 'label' => 'foobar', 'weight' => 1));
-    $config_entity->save();
-
-    // Modify stored config entity, this is comparable with a schema change.
-    $config = $this->config('config_test.dynamic.system');
-    $data = array(
-      'label' => 'foobar',
-      'additional_key' => TRUE
-    ) + $config->getRawData();
-    $config->setData($data)->save();
-    $this->assertNotIdentical($config_entity->toArray(), $config->getRawData(), 'Stored config entity is not is equivalent to config schema.');
-
-    $config_entity = entity_load('config_test', 'system', TRUE);
-    $config_entity->save();
-
-    $config = $this->config('config_test.dynamic.system');
-    $this->assertIdentical($config_entity->toArray(), $config->getRawData(), 'Stored config entity is equivalent to config schema.');
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEntityStaticCacheTest.php b/core/modules/config/src/Tests/ConfigEntityStaticCacheTest.php
deleted file mode 100644
index 6b30269..0000000
--- a/core/modules/config/src/Tests/ConfigEntityStaticCacheTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEntityStaticCacheTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\config_entity_static_cache_test\ConfigOverrider;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the entity static cache when used by config entities.
- *
- * @group config
- */
-class ConfigEntityStaticCacheTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'config_entity_static_cache_test');
-
-  /**
-   * The type ID of the entity under test.
-   *
-   * @var string
-   */
-  protected $entityTypeId;
-
-  /**
-   * The entity ID of the entity under test.
-   *
-   * @var string
-   */
-  protected $entityId;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->entityTypeId = 'config_test';
-    $this->entityId = 'test_1';
-    entity_create($this->entityTypeId, array('id' => $this->entityId, 'label' => 'Original label'))->save();
-  }
-
-  /**
-   * Tests that the static cache is working.
-   */
-  public function testCacheHit() {
-    $entity_1 = entity_load($this->entityTypeId, $this->entityId);
-    $entity_2 = entity_load($this->entityTypeId, $this->entityId);
-    // config_entity_static_cache_test_config_test_load() sets _loadStamp to a
-    // random string. If they match, it means $entity_2 was retrieved from the
-    // static cache rather than going through a separate load sequence.
-    $this->assertIdentical($entity_1->_loadStamp, $entity_2->_loadStamp);
-  }
-
-  /**
-   * Tests that the static cache is reset on entity save and delete.
-   */
-  public function testReset() {
-    $entity = entity_load($this->entityTypeId, $this->entityId);
-
-    // Ensure loading after a save retrieves the updated entity rather than an
-    // obsolete cached one.
-    $entity->label = 'New label';
-    $entity->save();
-    $entity = entity_load($this->entityTypeId, $this->entityId);
-    $this->assertIdentical($entity->label, 'New label');
-
-    // Ensure loading after a delete retrieves NULL rather than an obsolete
-    // cached one.
-    $entity->delete();
-    $this->assertNull(entity_load($this->entityTypeId, $this->entityId));
-  }
-
-  /**
-   * Tests that the static cache is sensitive to config overrides.
-   */
-  public function testConfigOverride() {
-    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
-    $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
-    // Prime the cache prior to adding a config override.
-    $storage->load($this->entityId);
-
-    // Add the config override, and ensure that what is loaded is correct
-    // despite the prior cache priming.
-    \Drupal::configFactory()->addOverride(new ConfigOverrider());
-    $entity_override = $storage->load($this->entityId);
-    $this->assertIdentical($entity_override->label, 'Overridden label');
-
-    // Load override free to ensure that loading the config entity again does
-    // not return the overridden value.
-    $entity_no_override = $storage->loadOverrideFree($this->entityId);
-    $this->assertNotIdentical($entity_no_override->label, 'Overridden label');
-    $this->assertNotIdentical($entity_override->_loadStamp, $entity_no_override->_loadStamp);
-
-    // Reload the entity and ensure the cache is used.
-    $this->assertIdentical($storage->loadOverrideFree($this->entityId)->_loadStamp, $entity_no_override->_loadStamp);
-
-    // Enable overrides and reload the entity and ensure the cache is used.
-    $this->assertIdentical($storage->load($this->entityId)->_loadStamp, $entity_override->_loadStamp);
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEntityStatusTest.php b/core/modules/config/src/Tests/ConfigEntityStatusTest.php
deleted file mode 100644
index caad767..0000000
--- a/core/modules/config/src/Tests/ConfigEntityStatusTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEntityStatusTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests configuration entity status functionality.
- *
- * @group config
- */
-class ConfigEntityStatusTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test');
-
-  /**
-   * Tests the enabling/disabling of entities.
-   */
-  function testCRUD() {
-    $entity = entity_create('config_test', array(
-      'id' => strtolower($this->randomMachineName()),
-    ));
-    $this->assertTrue($entity->status(), 'Default status is enabled.');
-    $entity->save();
-    $this->assertTrue($entity->status(), 'Status is enabled after saving.');
-
-    $entity->disable()->save();
-    $this->assertFalse($entity->status(), 'Entity is disabled after disabling.');
-
-    $entity->enable()->save();
-    $this->assertTrue($entity->status(), 'Entity is enabled after enabling.');
-
-    $entity = entity_load('config_test', $entity->id());
-    $this->assertTrue($entity->status(), 'Status is enabled after reload.');
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEntityStorageTest.php b/core/modules/config/src/Tests/ConfigEntityStorageTest.php
deleted file mode 100644
index dea998b..0000000
--- a/core/modules/config/src/Tests/ConfigEntityStorageTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEntityStorageTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-use Drupal\Core\Config\ConfigDuplicateUUIDException;
-
-/**
- * Tests sync and importing config entities with IDs and UUIDs that match
- * existing config.
- *
- * @group config
- */
-class ConfigEntityStorageTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test');
-
-  /**
-   * Tests creating configuration entities with changed UUIDs.
-   */
-  public function testUUIDConflict() {
-    $entity_type = 'config_test';
-    $id = 'test_1';
-    // Load the original configuration entity.
-    entity_create($entity_type, array('id' => $id))->save();
-    $entity = entity_load($entity_type, $id);
-
-    $original_properties = $entity->toArray();
-
-    // Override with a new UUID and try to save.
-    $new_uuid = $this->container->get('uuid')->generate();
-    $entity->set('uuid', $new_uuid);
-
-    try {
-      $entity->save();
-      $this->fail('Exception thrown when attempting to save a configuration entity with a UUID that does not match the existing UUID.');
-    }
-    catch (ConfigDuplicateUUIDException $e) {
-      $this->pass(format_string('Exception thrown when attempting to save a configuration entity with a UUID that does not match existing data: %e.', array('%e' => $e)));
-    }
-
-    // Ensure that the config entity was not corrupted.
-    $entity = entity_load('config_test', $entity->id(), TRUE);
-    $this->assertIdentical($entity->toArray(), $original_properties);
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEntityUnitTest.php b/core/modules/config/src/Tests/ConfigEntityUnitTest.php
deleted file mode 100644
index dd6a586..0000000
--- a/core/modules/config/src/Tests/ConfigEntityUnitTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEntityUnitTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Unit tests for configuration entity base methods.
- *
- * @group config
- */
-class ConfigEntityUnitTest extends KernelTestBase {
-
-  /**
-   * Exempt from strict schema checking.
-   *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test');
-
-  /**
-   * The config_test entity storage.
-   *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->storage = $this->container->get('entity.manager')->getStorage('config_test');
-  }
-
-  /**
-   * Tests storage methods.
-   */
-  public function testStorageMethods() {
-    $entity_type = \Drupal::entityManager()->getDefinition('config_test');
-
-    // Test the static extractID() method.
-    $expected_id = 'test_id';
-    $config_name = $entity_type->getConfigPrefix() . '.' . $expected_id;
-    $storage = $this->storage;
-    $this->assertIdentical($storage::getIDFromConfigName($config_name, $entity_type->getConfigPrefix()), $expected_id);
-
-    // Create three entities, two with the same style.
-    $style = $this->randomMachineName(8);
-    for ($i = 0; $i < 2; $i++) {
-      $entity = $this->storage->create(array(
-        'id' => $this->randomMachineName(),
-        'label' => $this->randomString(),
-        'style' => $style,
-      ));
-      $entity->save();
-    }
-    $entity = $this->storage->create(array(
-      'id' => $this->randomMachineName(),
-      'label' => $this->randomString(),
-      // Use a different length for the entity to ensure uniqueness.
-      'style' => $this->randomMachineName(9),
-    ));
-    $entity->save();
-
-    // Ensure that the configuration entity can be loaded by UUID.
-    $entity_loaded_by_uuid = \Drupal::entityManager()->loadEntityByUuid($entity_type->id(), $entity->uuid());
-    if (!$entity_loaded_by_uuid) {
-      $this->fail(sprintf("Failed to load '%s' entity ID '%s' by UUID '%s'.", $entity_type->id(), $entity->id(), $entity->uuid()));
-    }
-    // Compare UUIDs as the objects are not identical since
-    // $entity->enforceIsNew is FALSE and $entity_loaded_by_uuid->enforceIsNew
-    // is NULL.
-    $this->assertIdentical($entity->uuid(), $entity_loaded_by_uuid->uuid());
-
-    $entities = $this->storage->loadByProperties();
-    $this->assertEqual(count($entities), 3, 'Three entities are loaded when no properties are specified.');
-
-    $entities = $this->storage->loadByProperties(array('style' => $style));
-    $this->assertEqual(count($entities), 2, 'Two entities are loaded when the style property is specified.');
-
-    // Assert that both returned entities have a matching style property.
-    foreach ($entities as $entity) {
-      $this->assertIdentical($entity->get('style'), $style, 'The loaded entity has the correct style value specified.');
-    }
-
-    // Test that schema type enforcement can be overridden by trusting the data.
-    $entity = $this->storage->create(array(
-      'id' => $this->randomMachineName(),
-      'label' => $this->randomString(),
-      'style' => 999
-    ));
-    $entity->save();
-    $this->assertIdentical('999', $entity->style);
-    $entity->style = 999;
-    $entity->trustData()->save();
-    $this->assertIdentical(999, $entity->style);
-    $entity->save();
-    $this->assertIdentical('999', $entity->style);
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigEventsTest.php b/core/modules/config/src/Tests/ConfigEventsTest.php
deleted file mode 100644
index 431552e..0000000
--- a/core/modules/config/src/Tests/ConfigEventsTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigEventsTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\Config;
-use Drupal\Core\Config\ConfigEvents;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests events fired on configuration objects.
- *
- * @group config
- */
-class ConfigEventsTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_events_test');
-
-  /**
-   * Tests configuration events.
-   */
-  function testConfigEvents() {
-    $name = 'config_events_test.test';
-
-    $config = new Config($name, \Drupal::service('config.storage'), \Drupal::service('event_dispatcher'), \Drupal::service('config.typed'));
-    $config->set('key', 'initial');
-    $this->assertIdentical(\Drupal::state()->get('config_events_test.event', array()), array(), 'No events fired by creating a new configuration object');
-    $config->save();
-
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array());
-
-    $config->set('key', 'updated')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'updated'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'initial'));
-
-    $config->delete();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::DELETE);
-    $this->assertIdentical($event['current_config_data'], array());
-    $this->assertIdentical($event['raw_config_data'], array());
-    $this->assertIdentical($event['original_config_data'], array('key' => 'updated'));
-  }
-
-  /**
-   * Tests configuration rename event that is fired from the ConfigFactory.
-   */
-  function testConfigRenameEvent() {
-    $name = 'config_events_test.test';
-    $new_name = 'config_events_test.test_rename';
-    $GLOBALS['config'][$name] = array('key' => 'overridden');
-    $GLOBALS['config'][$new_name] = array('key' => 'new overridden');
-
-    $config = $this->config($name);
-    $config->set('key', 'initial')->save();
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
-
-    // Override applies when getting runtime config.
-    $this->assertEqual($GLOBALS['config'][$name], \Drupal::config($name)->get());
-
-    \Drupal::configFactory()->rename($name, $new_name);
-    $event = \Drupal::state()->get('config_events_test.event', array());
-    $this->assertIdentical($event['event_name'], ConfigEvents::RENAME);
-    $this->assertIdentical($event['current_config_data'], array('key' => 'new overridden'));
-    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
-    $this->assertIdentical($event['original_config_data'], array('key' => 'new overridden'));
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php
index d72c718..d1a9cab 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -108,16 +108,16 @@ public function testExportImport() {
 
     // Create a field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text',
     ));
     $this->fieldStorage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => $this->contentType->id(),
-    ))->save();
+    ])->save();
     // Update the displays so that configuration does not change unexpectedly on
     // import.
     entity_get_form_display('node', $this->contentType->id(), 'default')
diff --git a/core/modules/config/src/Tests/ConfigFileContentTest.php b/core/modules/config/src/Tests/ConfigFileContentTest.php
deleted file mode 100644
index 186458f..0000000
--- a/core/modules/config/src/Tests/ConfigFileContentTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigFileContentTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\FileStorage;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests reading and writing of configuration files.
- *
- * @group config
- */
-class ConfigFileContentTest extends KernelTestBase {
-
-  /**
-   * Exempt from strict schema checking.
-   *
-   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
-   *
-   * @var bool
-   */
-  protected $strictConfigSchema = FALSE;
-
-  /**
-   * Tests setting, writing, and reading of a configuration setting.
-   */
-  function testReadWriteConfig() {
-    $storage = $this->container->get('config.storage');
-
-    $name = 'foo.bar';
-    $key = 'foo';
-    $value = 'bar';
-    $nested_key = 'biff.bang';
-    $nested_value = 'pow';
-    $array_key = 'array';
-    $array_value = array(
-      'foo' => 'bar',
-      'biff' => array(
-        'bang' => 'pow',
-      ),
-    );
-    $casting_array_key = 'casting_array';
-    $casting_array_false_value_key = 'casting_array.cast.false';
-    $casting_array_value = array(
-      'cast' => array(
-        'false' => FALSE,
-      ),
-    );
-    $nested_array_key = 'nested.array';
-    $true_key = 'true';
-    $false_key = 'false';
-
-    // Attempt to read non-existing configuration.
-    $config = $this->config($name);
-
-    // Verify a configuration object is returned.
-    $this->assertEqual($config->getName(), $name);
-    $this->assertTrue($config, 'Config object created.');
-
-    // Verify the configuration object is empty.
-    $this->assertEqual($config->get(), array(), 'New config object is empty.');
-
-    // Verify nothing was saved.
-    $data = $storage->read($name);
-    $this->assertIdentical($data, FALSE);
-
-    // Add a top level value.
-    $config = $this->config($name);
-    $config->set($key, $value);
-
-    // Add a nested value.
-    $config->set($nested_key, $nested_value);
-
-    // Add an array.
-    $config->set($array_key, $array_value);
-
-    // Add a nested array.
-    $config->set($nested_array_key, $array_value);
-
-    // Add a boolean false value. Should get cast to 0.
-    $config->set($false_key, FALSE);
-
-    // Add a boolean true value. Should get cast to 1.
-    $config->set($true_key, TRUE);
-
-    // Add a null value. Should get cast to an empty string.
-    $config->set('null', NULL);
-
-    // Add an array with a nested boolean false that should get cast to 0.
-    $config->set($casting_array_key, $casting_array_value);
-    $config->save();
-
-    // Verify the database entry exists.
-    $data = $storage->read($name);
-    $this->assertTrue($data);
-
-    // Read top level value.
-    $config = $this->config($name);
-    $this->assertEqual($config->getName(), $name);
-    $this->assertTrue($config, 'Config object created.');
-    $this->assertEqual($config->get($key), 'bar', 'Top level configuration value found.');
-
-    // Read nested value.
-    $this->assertEqual($config->get($nested_key), $nested_value, 'Nested configuration value found.');
-
-    // Read array.
-    $this->assertEqual($config->get($array_key), $array_value, 'Top level array configuration value found.');
-
-    // Read nested array.
-    $this->assertEqual($config->get($nested_array_key), $array_value, 'Nested array configuration value found.');
-
-    // Read a top level value that doesn't exist.
-    $this->assertNull($config->get('i_dont_exist'), 'Non-existent top level value returned NULL.');
-
-    // Read a nested value that doesn't exist.
-    $this->assertNull($config->get('i.dont.exist'), 'Non-existent nested value returned NULL.');
-
-    // Read false value.
-    $this->assertEqual($config->get($false_key), '0', "Boolean FALSE value returned the string '0'.");
-
-    // Read true value.
-    $this->assertEqual($config->get($true_key), '1', "Boolean TRUE value returned the string '1'.");
-
-    // Read null value.
-    $this->assertIdentical($config->get('null'), NULL);
-
-    // Read false that had been nested in an array value.
-    $this->assertEqual($config->get($casting_array_false_value_key), '0', "Nested boolean FALSE value returned the string '0'.");
-
-    // Unset a top level value.
-    $config->clear($key);
-
-    // Unset a nested value.
-    $config->clear($nested_key);
-    $config->save();
-    $config = $this->config($name);
-
-    // Read unset top level value.
-    $this->assertNull($config->get($key), 'Top level value unset.');
-
-    // Read unset nested value.
-    $this->assertNull($config->get($nested_key), 'Nested value unset.');
-
-    // Create two new configuration files to test listing.
-    $config = $this->config('foo.baz');
-    $config->set($key, $value);
-    $config->save();
-
-    // Test chained set()->save().
-    $chained_name = 'biff.bang';
-    $config = $this->config($chained_name);
-    $config->set($key, $value)->save();
-
-    // Verify the database entry exists from a chained save.
-    $data = $storage->read($chained_name);
-    $this->assertEqual($data, $config->get());
-
-    // Get file listing for all files starting with 'foo'. Should return
-    // two elements.
-    $files = $storage->listAll('foo');
-    $this->assertEqual(count($files), 2, 'Two files listed with the prefix \'foo\'.');
-
-    // Get file listing for all files starting with 'biff'. Should return
-    // one element.
-    $files = $storage->listAll('biff');
-    $this->assertEqual(count($files), 1, 'One file listed with the prefix \'biff\'.');
-
-    // Get file listing for all files starting with 'foo.bar'. Should return
-    // one element.
-    $files = $storage->listAll('foo.bar');
-    $this->assertEqual(count($files), 1, 'One file listed with the prefix \'foo.bar\'.');
-
-    // Get file listing for all files starting with 'bar'. Should return
-    // an empty array.
-    $files = $storage->listAll('bar');
-    $this->assertEqual($files, array(), 'No files listed with the prefix \'bar\'.');
-
-    // Delete the configuration.
-    $config = $this->config($name);
-    $config->delete();
-
-    // Verify the database entry no longer exists.
-    $data = $storage->read($name);
-    $this->assertIdentical($data, FALSE);
-  }
-
-  /**
-   * Tests serialization of configuration to file.
-   */
-  function testSerialization() {
-    $name = $this->randomMachineName(10) . '.' . $this->randomMachineName(10);
-    $config_data = array(
-      // Indexed arrays; the order of elements is essential.
-      'numeric keys' => array('i', 'n', 'd', 'e', 'x', 'e', 'd'),
-      // Infinitely nested keys using arbitrary element names.
-      'nested keys' => array(
-        // HTML/XML in values.
-        'HTML' => '<strong> <bold> <em> <blockquote>',
-        // UTF-8 in values.
-        'UTF-8' => 'FrançAIS is ÜBER-åwesome',
-        // Unicode in keys and values.
-        'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ' => 'αβγδεζηθικλμνξοσὠ',
-      ),
-      'invalid xml' => '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ',
-    );
-
-    // Encode and write, and reload and decode the configuration data.
-    $filestorage = new FileStorage($this->configDirectories[CONFIG_SYNC_DIRECTORY]);
-    $filestorage->write($name, $config_data);
-    $config_parsed = $filestorage->read($name);
-
-    $key = 'numeric keys';
-    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
-
-    $key = 'nested keys';
-    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
-
-    $key = 'HTML';
-    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
-
-    $key = 'UTF-8';
-    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
-
-    $key = 'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ';
-    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
-
-    $key = 'invalid xml';
-    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
-  }
-}
diff --git a/core/modules/config/src/Tests/ConfigFormOverrideTest.php b/core/modules/config/src/Tests/ConfigFormOverrideTest.php
index 14726c5..be1e9df 100644
--- a/core/modules/config/src/Tests/ConfigFormOverrideTest.php
+++ b/core/modules/config/src/Tests/ConfigFormOverrideTest.php
@@ -35,7 +35,7 @@ public function testFormsWithOverrides() {
     // Test that everything on the form is the same, but that the override
     // worked for the actual site name.
     $this->drupalGet('admin/config/system/site-information');
-    $this->assertTitle('Site information | ' . $overridden_name);
+    $this->assertTitle('Basic site settings | ' . $overridden_name);
     $elements = $this->xpath('//input[@name="site_name"]');
     $this->assertIdentical((string) $elements[0]['value'], 'Drupal');
 
@@ -44,7 +44,7 @@ public function testFormsWithOverrides() {
       'site_name' => 'Custom site name',
     );
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
-    $this->assertTitle('Site information | ' . $overridden_name);
+    $this->assertTitle('Basic site settings | ' . $overridden_name);
     $elements = $this->xpath('//input[@name="site_name"]');
     $this->assertIdentical((string) $elements[0]['value'], $edit['site_name']);
   }
diff --git a/core/modules/config/src/Tests/ConfigImportRecreateTest.php b/core/modules/config/src/Tests/ConfigImportRecreateTest.php
deleted file mode 100644
index 34aa441..0000000
--- a/core/modules/config/src/Tests/ConfigImportRecreateTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigImportRecreateTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests importing recreated configuration entities.
- *
- * @group config
- */
-class ConfigImportRecreateTest extends KernelTestBase {
-
-  /**
-   * Config Importer object used for testing.
-   *
-   * @var \Drupal\Core\Config\ConfigImporter
-   */
-  protected $configImporter;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['system', 'field', 'text', 'user', 'node'];
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installConfig(array('field', 'node'));
-
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $this->configImporter = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-  }
-
-  public function testRecreateEntity() {
-    $type_name = Unicode::strtolower($this->randomMachineName(16));
-    $content_type = entity_create('node_type', array(
-      'type' => $type_name,
-      'name' => 'Node type one',
-    ));
-    $content_type->save();
-    node_add_body_field($content_type);
-    /** @var \Drupal\Core\Config\StorageInterface $active */
-    $active = $this->container->get('config.storage');
-    /** @var \Drupal\Core\Config\StorageInterface $sync */
-    $sync = $this->container->get('config.storage.sync');
-
-    $config_name = $content_type->getEntityType()->getConfigPrefix() . '.' . $content_type->id();
-    $this->copyConfig($active, $sync);
-
-    // Delete the content type. This will also delete a field storage, a field,
-    // an entity view display and an entity form display.
-    $content_type->delete();
-    $this->assertFalse($active->exists($config_name), 'Content type\'s old name does not exist active store.');
-    // Recreate with the same type - this will have a different UUID.
-    $content_type = entity_create('node_type', array(
-      'type' => $type_name,
-      'name' => 'Node type two',
-    ));
-    $content_type->save();
-    node_add_body_field($content_type);
-
-    $this->configImporter->reset();
-    // A node type, a field, an entity view display and an entity form display
-    // will be recreated.
-    $creates = $this->configImporter->getUnprocessedConfiguration('create');
-    $deletes = $this->configImporter->getUnprocessedConfiguration('delete');
-    $this->assertEqual(5, count($creates), 'There are 5 configuration items to create.');
-    $this->assertEqual(5, count($deletes), 'There are 5 configuration items to delete.');
-    $this->assertEqual(0, count($this->configImporter->getUnprocessedConfiguration('update')), 'There are no configuration items to update.');
-    $this->assertIdentical($creates, array_reverse($deletes), 'Deletes and creates contain the same configuration names in opposite orders due to dependencies.');
-
-    $this->configImporter->import();
-
-    // Verify that there is nothing more to import.
-    $this->assertFalse($this->configImporter->reset()->hasUnprocessedConfigurationChanges());
-    $content_type = NodeType::load($type_name);
-    $this->assertEqual('Node type one', $content_type->label());
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php
deleted file mode 100644
index c461f30..0000000
--- a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigImportRenameValidationTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Component\Uuid\Php;
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\ConfigImporterException;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests validating renamed configuration in a configuration import.
- *
- * @group config
- */
-class ConfigImportRenameValidationTest extends KernelTestBase {
-
-  /**
-   * Config Importer object used for testing.
-   *
-   * @var \Drupal\Core\Config\ConfigImporter
-   */
-  protected $configImporter;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['system', 'user', 'node', 'field', 'text', 'config_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installConfig(array('field'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $this->configImporter = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock.persistent'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-  }
-
-  /**
-   * Tests configuration renaming validation.
-   */
-  public function testRenameValidation() {
-    // Create a test entity.
-    $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', array(
-      'id' => $test_entity_id,
-      'label' => $this->randomMachineName(),
-    ));
-    $test_entity->save();
-    $uuid = $test_entity->uuid();
-
-    // Stage the test entity and then delete it from the active storage.
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-    $test_entity->delete();
-
-    // Create a content type with a matching UUID in the active storage.
-    $content_type = entity_create('node_type', array(
-      'type' => Unicode::strtolower($this->randomMachineName(16)),
-      'name' => $this->randomMachineName(),
-      'uuid' => $uuid,
-    ));
-    $content_type->save();
-
-    // Confirm that the staged configuration is detected as a rename since the
-    // UUIDs match.
-    $this->configImporter->reset();
-    $expected = array(
-      'node.type.' . $content_type->id() . '::config_test.dynamic.' . $test_entity_id,
-    );
-    $renames = $this->configImporter->getUnprocessedConfiguration('rename');
-    $this->assertIdentical($expected, $renames);
-
-    // Try to import the configuration. We expect an exception to be thrown
-    // because the staged entity is of a different type.
-    try {
-      $this->configImporter->import();
-      $this->fail('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->pass('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
-      $expected = array(
-        SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id))
-      );
-      $this->assertEqual($expected, $this->configImporter->getErrors());
-    }
-  }
-
-  /**
-   * Tests configuration renaming validation for simple configuration.
-   */
-  public function testRenameSimpleConfigValidation() {
-    $uuid = new Php();
-    // Create a simple configuration with a UUID.
-    $config = $this->config('config_test.new');
-    $uuid_value = $uuid->generate();
-    $config->set('uuid', $uuid_value)->save();
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-    $config->delete();
-
-    // Create another simple configuration with the same UUID.
-    $config = $this->config('config_test.old');
-    $config->set('uuid', $uuid_value)->save();
-
-    // Confirm that the staged configuration is detected as a rename since the
-    // UUIDs match.
-    $this->configImporter->reset();
-    $expected = array(
-      'config_test.old::config_test.new'
-    );
-    $renames = $this->configImporter->getUnprocessedConfiguration('rename');
-    $this->assertIdentical($expected, $renames);
-
-    // Try to import the configuration. We expect an exception to be thrown
-    // because the rename is for simple configuration.
-    try {
-      $this->configImporter->import();
-      $this->fail('Expected ConfigImporterException thrown when simple configuration is renamed.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->pass('Expected ConfigImporterException thrown when simple configuration is renamed.');
-      $expected = array(
-        SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => 'config_test.old', '@new_name' => 'config_test.new'))
-      );
-      $this->assertEqual($expected, $this->configImporter->getErrors());
-    }
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php b/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php
deleted file mode 100644
index cb5522d..0000000
--- a/core/modules/config/src/Tests/ConfigImporterMissingContentTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigImporterMissingContentTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests importing configuration which has missing content dependencies.
- *
- * @group config
- */
-class ConfigImporterMissingContentTest extends KernelTestBase {
-
-  /**
-   * Config Importer object used for testing.
-   *
-   * @var \Drupal\Core\Config\ConfigImporter
-   */
-  protected $configImporter;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'entity_test', 'config_test', 'config_import_test');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'sequences');
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('user');
-    $this->installConfig(array('config_test'));
-    // Installing config_test's default configuration pollutes the global
-    // variable being used for recording hook invocations by this test already,
-    // so it has to be cleared out manually.
-    unset($GLOBALS['hook_config_test']);
-
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $this->configImporter = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-  }
-
-  /**
-   * Tests the missing content event is fired.
-   *
-   * @see \Drupal\Core\Config\ConfigImporter::processMissingContent()
-   * @see \Drupal\config_import_test\EventSubscriber
-   */
-  function testMissingContent() {
-    \Drupal::state()->set('config_import_test.config_import_missing_content', TRUE);
-
-    // Update a configuration entity in the sync directory to have a dependency
-    // on two content entities that do not exist.
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $entity_one = entity_create('entity_test', array('name' => 'one'));
-    $entity_two = entity_create('entity_test', array('name' => 'two'));
-    $entity_three = entity_create('entity_test', array('name' => 'three'));
-    $dynamic_name = 'config_test.dynamic.dotted.default';
-    $original_dynamic_data = $storage->read($dynamic_name);
-    // Entity one will be resolved by
-    // \Drupal\config_import_test\EventSubscriber::onConfigImporterMissingContentOne().
-    $original_dynamic_data['dependencies']['content'][] = $entity_one->getConfigDependencyName();
-    // Entity two will be resolved by
-    // \Drupal\config_import_test\EventSubscriber::onConfigImporterMissingContentTwo().
-    $original_dynamic_data['dependencies']['content'][] = $entity_two->getConfigDependencyName();
-    // Entity three will be resolved by
-    // \Drupal\Core\Config\Importer\FinalMissingContentSubscriber.
-    $original_dynamic_data['dependencies']['content'][] = $entity_three->getConfigDependencyName();
-    $sync->write($dynamic_name, $original_dynamic_data);
-
-    // Import.
-    $this->configImporter->reset()->import();
-    $this->assertEqual([], $this->configImporter->getErrors(), 'There were no errors during the import.');
-    $this->assertEqual($entity_one->uuid(), \Drupal::state()->get('config_import_test.config_import_missing_content_one'), 'The missing content event is fired during configuration import.');
-    $this->assertEqual($entity_two->uuid(), \Drupal::state()->get('config_import_test.config_import_missing_content_two'), 'The missing content event is fired during configuration import.');
-    $original_dynamic_data = $storage->read($dynamic_name);
-    $this->assertEqual([$entity_one->getConfigDependencyName(), $entity_two->getConfigDependencyName(), $entity_three->getConfigDependencyName()], $original_dynamic_data['dependencies']['content'], 'The imported configuration entity has the missing content entity dependency.');
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigImporterTest.php b/core/modules/config/src/Tests/ConfigImporterTest.php
deleted file mode 100644
index 3fca8c0..0000000
--- a/core/modules/config/src/Tests/ConfigImporterTest.php
+++ /dev/null
@@ -1,693 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigImporterTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\ConfigImporterException;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests importing configuration from files into active configuration.
- *
- * @group config
- */
-class ConfigImporterTest extends KernelTestBase {
-
-  /**
-   * Config Importer object used for testing.
-   *
-   * @var \Drupal\Core\Config\ConfigImporter
-   */
-  protected $configImporter;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'system', 'config_import_test');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('config_test'));
-    // Installing config_test's default configuration pollutes the global
-    // variable being used for recording hook invocations by this test already,
-    // so it has to be cleared out manually.
-    unset($GLOBALS['hook_config_test']);
-
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $this->configImporter = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-  }
-
-  /**
-   * Tests omission of module APIs for bare configuration operations.
-   */
-  function testNoImport() {
-    $dynamic_name = 'config_test.dynamic.dotted.default';
-
-    // Verify the default configuration values exist.
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('id'), 'dotted.default');
-
-    // Verify that a bare $this->config() does not involve module APIs.
-    $this->assertFalse(isset($GLOBALS['hook_config_test']));
-  }
-
-  /**
-   * Tests that trying to import from an empty sync configuration directory
-   * fails.
-   */
-  function testEmptyImportFails() {
-    try {
-      $this->container->get('config.storage.sync')->deleteAll();
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException thrown, successfully stopping an empty import.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->pass('ConfigImporterException thrown, successfully stopping an empty import.');
-    }
-  }
-
-  /**
-   * Tests verification of site UUID before importing configuration.
-   */
-  function testSiteUuidValidate() {
-    $sync = \Drupal::service('config.storage.sync');
-    // Create updated configuration object.
-    $config_data = $this->config('system.site')->get();
-    // Generate a new site UUID.
-    $config_data['uuid'] = \Drupal::service('uuid')->generate();
-    $sync->write('system.site', $config_data);
-    try {
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to mis-matching site UUID.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
-      $error_log = $this->configImporter->getErrors();
-      $expected = array('Site UUID in source storage does not match the target storage.');
-      $this->assertEqual($expected, $error_log);
-    }
-  }
-
-  /**
-   * Tests deletion of configuration during import.
-   */
-  function testDeleted() {
-    $dynamic_name = 'config_test.dynamic.dotted.default';
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-
-    // Verify the default configuration values exist.
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('id'), 'dotted.default');
-
-    // Delete the file from the sync directory.
-    $sync->delete($dynamic_name);
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    // Verify the file has been removed.
-    $this->assertIdentical($storage->read($dynamic_name), FALSE);
-
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('id'), NULL);
-
-    // Verify that appropriate module API hooks have been invoked.
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['load']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['presave']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['insert']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['predelete']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['delete']));
-
-    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 0);
-  }
-
-  /**
-   * Tests creation of configuration during import.
-   */
-  function testNew() {
-    $dynamic_name = 'config_test.dynamic.new';
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-
-    // Verify the configuration to create does not exist yet.
-    $this->assertIdentical($storage->exists($dynamic_name), FALSE, $dynamic_name . ' not found.');
-
-    // Create new config entity.
-    $original_dynamic_data = array(
-      'uuid' => '30df59bd-7b03-4cf7-bb35-d42fc49f0651',
-      'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
-      'status' => TRUE,
-      'dependencies' => array(),
-      'id' => 'new',
-      'label' => 'New',
-      'weight' => 0,
-      'style' => '',
-      'size' => '',
-      'size_value' => '',
-      'protected_property' => '',
-    );
-    $sync->write($dynamic_name, $original_dynamic_data);
-
-    $this->assertIdentical($sync->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    // Verify the values appeared.
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('label'), $original_dynamic_data['label']);
-
-    // Verify that appropriate module API hooks have been invoked.
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['load']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['insert']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
-
-    // Verify that hook_config_import_steps_alter() can add steps to
-    // configuration synchronization.
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['config_import_steps_alter']));
-
-    // Verify that there is nothing more to import.
-    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 0);
-  }
-
-  /**
-   * Tests that secondary writes are overwritten.
-   */
-  function testSecondaryWritePrimaryFirst() {
-    $name_primary = 'config_test.dynamic.primary';
-    $name_secondary = 'config_test.dynamic.secondary';
-    $sync = $this->container->get('config.storage.sync');
-    $uuid = $this->container->get('uuid');
-
-    $values_primary = array(
-      'id' => 'primary',
-      'label' => 'Primary',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-    );
-    $sync->write($name_primary, $values_primary);
-    $values_secondary = array(
-      'id' => 'secondary',
-      'label' => 'Secondary Sync',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on primary, to ensure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_primary),
-      )
-    );
-    $sync->write($name_secondary, $values_secondary);
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
-    $primary = $entity_storage->load('primary');
-    $this->assertEqual($primary->id(), 'primary');
-    $this->assertEqual($primary->uuid(), $values_primary['uuid']);
-    $this->assertEqual($primary->label(), $values_primary['label']);
-    $secondary = $entity_storage->load('secondary');
-    $this->assertEqual($secondary->id(), 'secondary');
-    $this->assertEqual($secondary->uuid(), $values_secondary['uuid']);
-    $this->assertEqual($secondary->label(), $values_secondary['label']);
-
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 1);
-    $this->assertEqual($logs[0], SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
-  }
-
-  /**
-   * Tests that secondary writes are overwritten.
-   */
-  function testSecondaryWriteSecondaryFirst() {
-    $name_primary = 'config_test.dynamic.primary';
-    $name_secondary = 'config_test.dynamic.secondary';
-    $sync = $this->container->get('config.storage.sync');
-    $uuid = $this->container->get('uuid');
-
-    $values_primary = array(
-      'id' => 'primary',
-      'label' => 'Primary',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on secondary, so that is synced first.
-      'dependencies' => array(
-        'config' => array($name_secondary),
-      )
-    );
-    $sync->write($name_primary, $values_primary);
-    $values_secondary = array(
-      'id' => 'secondary',
-      'label' => 'Secondary Sync',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-    );
-    $sync->write($name_secondary, $values_secondary);
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
-    $primary = $entity_storage->load('primary');
-    $this->assertEqual($primary->id(), 'primary');
-    $this->assertEqual($primary->uuid(), $values_primary['uuid']);
-    $this->assertEqual($primary->label(), $values_primary['label']);
-    $secondary = $entity_storage->load('secondary');
-    $this->assertEqual($secondary->id(), 'secondary');
-    $this->assertEqual($secondary->uuid(), $values_secondary['uuid']);
-    $this->assertEqual($secondary->label(), $values_secondary['label']);
-
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 1);
-    $this->assertEqual($logs[0], Html::escape("Unexpected error during import with operation create for $name_primary: 'config_test' entity with ID 'secondary' already exists."));
-  }
-
-  /**
-   * Tests that secondary updates for deleted files work as expected.
-   */
-  function testSecondaryUpdateDeletedDeleterFirst() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
-    $name_other = 'config_test.dynamic.other';
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $uuid = $this->container->get('uuid');
-
-    $values_deleter = array(
-      'id' => 'deleter',
-      'label' => 'Deleter',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-    );
-    $storage->write($name_deleter, $values_deleter);
-    $values_deleter['label'] = 'Updated Deleter';
-    $sync->write($name_deleter, $values_deleter);
-    $values_deletee = array(
-      'id' => 'deletee',
-      'label' => 'Deletee',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on deleter, to make sure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_deleter),
-      )
-    );
-    $storage->write($name_deletee, $values_deletee);
-    $values_deletee['label'] = 'Updated Deletee';
-    $sync->write($name_deletee, $values_deletee);
-
-    // Ensure that import will continue after the error.
-    $values_other = array(
-      'id' => 'other',
-      'label' => 'Other',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on deleter, to make sure that is synced first. This
-      // will also be synced after the deletee due to alphabetical ordering.
-      'dependencies' => array(
-        'config' => array($name_deleter),
-      )
-    );
-    $storage->write($name_other, $values_other);
-    $values_other['label'] = 'Updated other';
-    $sync->write($name_other, $values_other);
-
-    // Check update changelist order.
-    $updates = $this->configImporter->reset()->getStorageComparer()->getChangelist('update');
-    $expected = array(
-      $name_deleter,
-      $name_deletee,
-      $name_other,
-    );
-    $this->assertIdentical($expected, $updates);
-
-    // Import.
-    $this->configImporter->import();
-
-    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
-    $deleter = $entity_storage->load('deleter');
-    $this->assertEqual($deleter->id(), 'deleter');
-    $this->assertEqual($deleter->uuid(), $values_deleter['uuid']);
-    $this->assertEqual($deleter->label(), $values_deleter['label']);
-
-    // The deletee was deleted in
-    // \Drupal\config_test\Entity\ConfigTest::postSave().
-    $this->assertFalse($entity_storage->load('deletee'));
-
-    $other = $entity_storage->load('other');
-    $this->assertEqual($other->id(), 'other');
-    $this->assertEqual($other->uuid(), $values_other['uuid']);
-    $this->assertEqual($other->label(), $values_other['label']);
-
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 1);
-    $this->assertEqual($logs[0], SafeMarkup::format('Update target "@name" is missing.', array('@name' => $name_deletee)));
-  }
-
-  /**
-   * Tests that secondary updates for deleted files work as expected.
-   *
-   * This test is completely hypothetical since we only support full
-   * configuration tree imports. Therefore, any configuration updates that cause
-   * secondary deletes should be reflected already in the staged configuration.
-   */
-  function testSecondaryUpdateDeletedDeleteeFirst() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $uuid = $this->container->get('uuid');
-
-    $values_deleter = array(
-      'id' => 'deleter',
-      'label' => 'Deleter',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on deletee, to make sure that is synced first.
-      'dependencies' => array(
-        'config' => array($name_deletee),
-      ),
-    );
-    $storage->write($name_deleter, $values_deleter);
-    $values_deleter['label'] = 'Updated Deleter';
-    $sync->write($name_deleter, $values_deleter);
-    $values_deletee = array(
-      'id' => 'deletee',
-      'label' => 'Deletee',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-    );
-    $storage->write($name_deletee, $values_deletee);
-    $values_deletee['label'] = 'Updated Deletee';
-    $sync->write($name_deletee, $values_deletee);
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
-    // Both entities are deleted. ConfigTest::postSave() causes updates of the
-    // deleter entity to delete the deletee entity. Since the deleter depends on
-    // the deletee, removing the deletee causes the deleter to be removed.
-    $this->assertFalse($entity_storage->load('deleter'));
-    $this->assertFalse($entity_storage->load('deletee'));
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 0);
-  }
-
-  /**
-   * Tests that secondary deletes for deleted files work as expected.
-   */
-  function testSecondaryDeletedDeleteeSecond() {
-    $name_deleter = 'config_test.dynamic.deleter';
-    $name_deletee = 'config_test.dynamic.deletee';
-    $storage = $this->container->get('config.storage');
-
-    $uuid = $this->container->get('uuid');
-
-    $values_deleter = array(
-      'id' => 'deleter',
-      'label' => 'Deleter',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-      // Add a dependency on deletee, to make sure this delete is synced first.
-      'dependencies' => array(
-        'config' => array($name_deletee),
-      ),
-    );
-    $storage->write($name_deleter, $values_deleter);
-    $values_deletee = array(
-      'id' => 'deletee',
-      'label' => 'Deletee',
-      'weight' => 0,
-      'uuid' => $uuid->generate(),
-    );
-    $storage->write($name_deletee, $values_deletee);
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
-    $this->assertFalse($entity_storage->load('deleter'));
-    $this->assertFalse($entity_storage->load('deletee'));
-    // The deletee entity does not exist as the delete worked and although the
-    // delete occurred in \Drupal\config_test\Entity\ConfigTest::postDelete()
-    // this does not matter.
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 0);
-  }
-
-  /**
-   * Tests updating of configuration during import.
-   */
-  function testUpdated() {
-    $name = 'config_test.system';
-    $dynamic_name = 'config_test.dynamic.dotted.default';
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-
-    // Verify that the configuration objects to import exist.
-    $this->assertIdentical($storage->exists($name), TRUE, $name . ' found.');
-    $this->assertIdentical($storage->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
-
-    // Replace the file content of the existing configuration objects in the
-    // sync directory.
-    $original_name_data = array(
-      'foo' => 'beer',
-    );
-    $sync->write($name, $original_name_data);
-    $original_dynamic_data = $storage->read($dynamic_name);
-    $original_dynamic_data['label'] = 'Updated';
-    $sync->write($dynamic_name, $original_dynamic_data);
-
-    // Verify the active configuration still returns the default values.
-    $config = $this->config($name);
-    $this->assertIdentical($config->get('foo'), 'bar');
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('label'), 'Default');
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    // Verify the values were updated.
-    \Drupal::configFactory()->reset($name);
-    $config = $this->config($name);
-    $this->assertIdentical($config->get('foo'), 'beer');
-    $config = $this->config($dynamic_name);
-    $this->assertIdentical($config->get('label'), 'Updated');
-
-    // Verify that the original file content is still the same.
-    $this->assertIdentical($sync->read($name), $original_name_data);
-    $this->assertIdentical($sync->read($dynamic_name), $original_dynamic_data);
-
-    // Verify that appropriate module API hooks have been invoked.
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['load']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['insert']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['update']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
-
-    // Verify that there is nothing more to import.
-    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
-    $logs = $this->configImporter->getErrors();
-    $this->assertEqual(count($logs), 0);
-  }
-
-  /**
-   * Tests the isInstallable method()
-   */
-  function testIsInstallable() {
-    $config_name = 'config_test.dynamic.isinstallable';
-    $this->assertFalse($this->container->get('config.storage')->exists($config_name));
-    \Drupal::state()->set('config_test.isinstallable', TRUE);
-    $this->installConfig(array('config_test'));
-    $this->assertTrue($this->container->get('config.storage')->exists($config_name));
-  }
-
-  /**
-   * Tests dependency validation during configuration import.
-   *
-   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
-   * @see \Drupal\Core\Config\ConfigImporter::createExtensionChangelist()
-   */
-  public function testUnmetDependency() {
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-
-    // Test an unknown configuration owner.
-    $sync->write('unknown.config', ['test' => 'test']);
-
-    // Make a config entity have unmet dependencies.
-    $config_entity_data = $sync->read('config_test.dynamic.dotted.default');
-    $config_entity_data['dependencies'] = ['module' => ['unknown']];
-    $sync->write('config_test.dynamic.dotted.module', $config_entity_data);
-    $config_entity_data['dependencies'] = ['theme' => ['unknown']];
-    $sync->write('config_test.dynamic.dotted.theme', $config_entity_data);
-    $config_entity_data['dependencies'] = ['config' => ['unknown']];
-    $sync->write('config_test.dynamic.dotted.config', $config_entity_data);
-
-    // Make an active config depend on something that is missing in sync.
-    // The whole configuration needs to be consistent, not only the updated one.
-    $config_entity_data['dependencies'] = [];
-    $storage->write('config_test.dynamic.dotted.deleted', $config_entity_data);
-    $config_entity_data['dependencies'] = ['config' => ['config_test.dynamic.dotted.deleted']];
-    $storage->write('config_test.dynamic.dotted.existing', $config_entity_data);
-    $sync->write('config_test.dynamic.dotted.existing', $config_entity_data);
-
-    $extensions = $sync->read('core.extension');
-    // Add a module and a theme that do not exist.
-    $extensions['module']['unknown_module'] = 0;
-    $extensions['theme']['unknown_theme'] = 0;
-    // Add a module and a theme that depend on uninstalled extensions.
-    $extensions['module']['book'] = 0;
-    $extensions['theme']['bartik'] = 0;
-
-    $sync->write('core.extension', $extensions);
-    try {
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException not thrown; an invalid import was not stopped due to missing dependencies.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
-      $error_log = $this->configImporter->getErrors();
-      $expected = [
-        'Unable to install the <em class="placeholder">unknown_module</em> module since it does not exist.',
-        'Unable to install the <em class="placeholder">Book</em> module since it requires the <em class="placeholder">Node, Text, Field, Filter, User</em> modules.',
-        'Unable to install the <em class="placeholder">unknown_theme</em> theme since it does not exist.',
-        'Unable to install the <em class="placeholder">Bartik</em> theme since it requires the <em class="placeholder">Classy</em> theme.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on the <em class="placeholder">unknown</em> configuration that will not exist after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.existing</em> depends on the <em class="placeholder">config_test.dynamic.dotted.deleted</em> configuration that will not exist after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on the <em class="placeholder">unknown</em> module that will not be installed after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on the <em class="placeholder">unknown</em> theme that will not be installed after import.',
-        'Configuration <em class="placeholder">unknown.config</em> depends on the <em class="placeholder">unknown</em> extension that will not be installed after import.',
-      ];
-      foreach ($expected as $expected_message) {
-        $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
-      }
-    }
-
-    // Make a config entity have mulitple unmet dependencies.
-    $config_entity_data = $sync->read('config_test.dynamic.dotted.default');
-    $config_entity_data['dependencies'] = ['module' => ['unknown', 'dblog']];
-    $sync->write('config_test.dynamic.dotted.module', $config_entity_data);
-    $config_entity_data['dependencies'] = ['theme' => ['unknown', 'seven']];
-    $sync->write('config_test.dynamic.dotted.theme', $config_entity_data);
-    $config_entity_data['dependencies'] = ['config' => ['unknown', 'unknown2']];
-    $sync->write('config_test.dynamic.dotted.config', $config_entity_data);
-    try {
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to missing dependencies.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
-      $error_log = $this->configImporter->getErrors();
-      $expected = [
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on configuration (<em class="placeholder">unknown, unknown2</em>) that will not exist after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on modules (<em class="placeholder">unknown, Database Logging</em>) that will not be installed after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Seven</em>) that will not be installed after import.',
-      ];
-      foreach ($expected as $expected_message) {
-        $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
-      }
-    }
-  }
-
-  /**
-   * Tests missing core.extension during configuration import.
-   *
-   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
-   */
-  public function testMissingCoreExtension() {
-    $sync = $this->container->get('config.storage.sync');
-    $sync->delete('core.extension');
-    try {
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to missing dependencies.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
-      $error_log = $this->configImporter->getErrors();
-      $this->assertEqual(['The core.extension configuration does not exist.'], $error_log);
-    }
-  }
-
-  /**
-   * Tests install profile validation during configuration import.
-   *
-   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
-   */
-  public function testInstallProfile() {
-    $sync = $this->container->get('config.storage.sync');
-
-    $extensions = $sync->read('core.extension');
-    // Add an install profile.
-    $extensions['module']['standard'] = 0;
-
-    $sync->write('core.extension', $extensions);
-    try {
-      $this->configImporter->reset()->import();
-      $this->fail('ConfigImporterException not thrown; an invalid import was not stopped due to missing dependencies.');
-    }
-    catch (ConfigImporterException $e) {
-      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
-      $error_log = $this->configImporter->getErrors();
-      // Install profiles should not even be scanned at this point.
-      $this->assertEqual(['Unable to install the <em class="placeholder">standard</em> module since it does not exist.'], $error_log);
-    }
-  }
-
-  /**
-   * Tests config_get_config_directory().
-   */
-  public function testConfigGetConfigDirectory() {
-    $directory = config_get_config_directory(CONFIG_SYNC_DIRECTORY);
-    $this->assertEqual($this->configDirectories[CONFIG_SYNC_DIRECTORY], $directory);
-
-    $message = 'Calling config_get_config_directory() with CONFIG_ACTIVE_DIRECTORY results in an exception.';
-    try {
-      config_get_config_directory(CONFIG_ACTIVE_DIRECTORY);
-      $this->fail($message);
-    }
-    catch (\Exception $e) {
-      $this->pass($message);
-    }
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigInstallTest.php b/core/modules/config/src/Tests/ConfigInstallTest.php
deleted file mode 100644
index e5ac68d..0000000
--- a/core/modules/config/src/Tests/ConfigInstallTest.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigInstallTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\PreExistingConfigException;
-use Drupal\Core\Config\UnmetDependenciesException;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests installation of configuration objects in installation functionality.
- *
- * @group config
- * @see \Drupal\Core\Config\ConfigInstaller
- */
-class ConfigInstallTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['router']);
-
-    // Ensure the global variable being asserted by this test does not exist;
-    // a previous test executed in this request/process might have set it.
-    unset($GLOBALS['hook_config_test']);
-  }
-
-  /**
-   * Tests module installation.
-   */
-  function testModuleInstallation() {
-    $default_config = 'config_test.system';
-    $default_configuration_entity = 'config_test.dynamic.dotted.default';
-
-    // Verify that default module config does not exist before installation yet.
-    $config = $this->config($default_config);
-    $this->assertIdentical($config->isNew(), TRUE);
-    $config = $this->config($default_configuration_entity);
-    $this->assertIdentical($config->isNew(), TRUE);
-
-    // Ensure that schema provided by modules that are not installed is not
-    // available.
-    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
-
-    // Install the test module.
-    $this->installModules(array('config_test'));
-
-    // Verify that default module config exists.
-    \Drupal::configFactory()->reset($default_config);
-    \Drupal::configFactory()->reset($default_configuration_entity);
-    $config = $this->config($default_config);
-    $this->assertIdentical($config->isNew(), FALSE);
-    $config = $this->config($default_configuration_entity);
-    $this->assertIdentical($config->isNew(), FALSE);
-
-    // Verify that config_test API hooks were invoked for the dynamic default
-    // configuration entity.
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['load']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
-    $this->assertTrue(isset($GLOBALS['hook_config_test']['insert']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
-    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
-
-    // Install the schema test module.
-    $this->enableModules(array('config_schema_test'));
-    $this->installConfig(array('config_schema_test'));
-
-    // After module installation the new schema should exist.
-    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema exists.');
-
-    // Test that uninstalling configuration removes configuration schema.
-    $this->config('core.extension')->set('module', array())->save();
-    \Drupal::service('config.manager')->uninstall('module', 'config_test');
-    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
-  }
-
-  /**
-   * Tests that collections are ignored if the event does not return anything.
-   */
-  public function testCollectionInstallationNoCollections() {
-    // Install the test module.
-    $this->enableModules(array('config_collection_install_test'));
-    $this->installConfig(array('config_collection_install_test'));
-    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
-    $active_storage = \Drupal::service('config.storage');
-    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
-  }
-
-  /**
-   * Tests config objects in collections are installed as expected.
-   */
-  public function testCollectionInstallationCollections() {
-    $collections = array(
-      'another_collection',
-      'collection.test1',
-      'collection.test2',
-    );
-    // Set the event listener to return three possible collections.
-    // @see \Drupal\config_collection_install_test\EventSubscriber
-    \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
-    // Install the test module.
-    $this->enableModules(array('config_collection_install_test'));
-    $this->installConfig(array('config_collection_install_test'));
-    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
-    $active_storage = \Drupal::service('config.storage');
-    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
-    foreach ($collections as $collection) {
-      $collection_storage = $active_storage->createCollection($collection);
-      $data = $collection_storage->read('config_collection_install_test.test');
-      $this->assertEqual($collection, $data['collection']);
-    }
-
-    // Tests that clashing configuration in collections is detected.
-    try {
-      \Drupal::service('module_installer')->install(['config_collection_clash_install_test']);
-      $this->fail('Expected PreExistingConfigException not thrown.');
-    }
-    catch (PreExistingConfigException $e) {
-      $this->assertEqual($e->getExtension(), 'config_collection_clash_install_test');
-      $this->assertEqual($e->getConfigObjects(), [
-        'another_collection' => ['config_collection_install_test.test'],
-        'collection.test1' => ['config_collection_install_test.test'],
-        'collection.test2' => ['config_collection_install_test.test'],
-      ]);
-      $this->assertEqual($e->getMessage(), 'Configuration objects (another_collection/config_collection_install_test.test, collection/test1/config_collection_install_test.test, collection/test2/config_collection_install_test.test) provided by config_collection_clash_install_test already exist in active configuration');
-    }
-
-    // Test that the we can use the config installer to install all the
-    // available default configuration in a particular collection for enabled
-    // extensions.
-    \Drupal::service('config.installer')->installCollectionDefaultConfig('entity');
-    // The 'entity' collection will not exist because the 'config_test' module
-    // is not enabled.
-    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
-    // Enable the 'config_test' module and try again.
-    $this->enableModules(array('config_test'));
-    \Drupal::service('config.installer')->installCollectionDefaultConfig('entity');
-    $collections[] = 'entity';
-    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
-    $collection_storage = $active_storage->createCollection('entity');
-    $data = $collection_storage->read('config_test.dynamic.dotted.default');
-    $this->assertIdentical(array('label' => 'entity'), $data);
-
-    // Test that the config manager uninstalls configuration from collections
-    // as expected.
-    \Drupal::service('config.manager')->uninstall('module', 'config_collection_install_test');
-    $this->assertEqual(array('entity'), $active_storage->getAllCollectionNames());
-    \Drupal::service('config.manager')->uninstall('module', 'config_test');
-    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
-  }
-
-  /**
-   * Tests collections which do not support config entities install correctly.
-   *
-   * Config entity detection during config installation is done by matching
-   * config name prefixes. If a collection provides a configuration with a
-   * matching name but does not support config entities it should be created
-   * using simple configuration.
-   */
-  public function testCollectionInstallationCollectionConfigEntity() {
-    $collections = array(
-      'entity',
-    );
-    \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
-    // Install the test module.
-    $this->installModules(array('config_test', 'config_collection_install_test'));
-    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
-    $active_storage = \Drupal::service('config.storage');
-    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
-    $collection_storage = $active_storage->createCollection('entity');
-
-    // The config_test.dynamic.dotted.default configuration object saved in the
-    // active store should be a configuration entity complete with UUID. Because
-    // the entity collection does not support configuration entities the
-    // configuration object stored there with the same name should only contain
-    // a label.
-    $name = 'config_test.dynamic.dotted.default';
-    $data = $active_storage->read($name);
-    $this->assertTrue(isset($data['uuid']));
-    $data = $collection_storage->read($name);
-    $this->assertIdentical(array('label' => 'entity'), $data);
-  }
-
-  /**
-   * Tests the configuration with unmet dependencies is not installed.
-   */
-  public function testDependencyChecking() {
-    $this->installModules(['config_test']);
-    try {
-      $this->installModules(['config_install_dependency_test']);
-      $this->fail('Expected UnmetDependenciesException not thrown.');
-    }
-    catch (UnmetDependenciesException $e) {
-      $this->assertEqual($e->getExtension(), 'config_install_dependency_test');
-      $this->assertEqual($e->getConfigObjects(), ['config_test.dynamic.other_module_test_with_dependency']);
-      $this->assertEqual($e->getMessage(), 'Configuration objects (config_test.dynamic.other_module_test_with_dependency) provided by config_install_dependency_test have unmet dependencies');
-    }
-    $this->installModules(['config_other_module_config_test']);
-    $this->installModules(['config_install_dependency_test']);
-    $entity = \Drupal::entityManager()->getStorage('config_test')->load('other_module_test_with_dependency');
-    $this->assertTrue($entity, 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
-    // Ensure that dependencies can be added during module installation by
-    // hooks.
-    $this->assertIdentical('config_install_dependency_test', $entity->getDependencies()['module'][0]);
-  }
-
-  /**
-   * Tests imported configuration entities with and without language information.
-   */
-  function testLanguage() {
-    $this->installModules(['config_test_language']);
-    // Test imported configuration with implicit language code.
-    $storage = new InstallStorage();
-    $data = $storage->read('config_test.dynamic.dotted.english');
-    $this->assertTrue(!isset($data['langcode']));
-    $this->assertEqual(
-      $this->config('config_test.dynamic.dotted.english')->get('langcode'),
-      'en'
-    );
-
-    // Test imported configuration with explicit language code.
-    $data = $storage->read('config_test.dynamic.dotted.french');
-    $this->assertEqual($data['langcode'], 'fr');
-    $this->assertEqual(
-      $this->config('config_test.dynamic.dotted.french')->get('langcode'),
-      'fr'
-    );
-  }
-
-  /**
-   * Installs a module.
-   *
-   * @param array $modules
-   *   The module names.
-   */
-  protected function installModules(array $modules) {
-    $this->container->get('module_installer')->install($modules);
-    $this->container = \Drupal::getContainer();
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php b/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
deleted file mode 100644
index 8cbb695..0000000
--- a/core/modules/config/src/Tests/ConfigLanguageOverrideTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigLanguageOverrideTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Confirm that language overrides work.
- *
- * @group config
- */
-class ConfigLanguageOverrideTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user', 'language', 'config_test', 'system', 'field');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('config_test'));
-  }
-
-  /**
-   * Tests locale override based on language.
-   */
-  function testConfigLanguageOverride() {
-    // The language module implements a config factory override object that
-    // overrides configuration when the Language module is enabled. This test ensures that
-    // English overrides work.
-    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('en'));
-    $config = \Drupal::config('config_test.system');
-    $this->assertIdentical($config->get('foo'), 'en bar');
-
-    // Ensure that the raw data is not translated.
-    $raw = $config->getRawData();
-    $this->assertIdentical($raw['foo'], 'bar');
-
-    ConfigurableLanguage::createFromLangcode('fr')->save();
-    ConfigurableLanguage::createFromLangcode('de')->save();
-
-    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('fr'));
-    $config = \Drupal::config('config_test.system');
-    $this->assertIdentical($config->get('foo'), 'fr bar');
-
-    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('de'));
-    $config = \Drupal::config('config_test.system');
-    $this->assertIdentical($config->get('foo'), 'de bar');
-
-    // Test overrides of completely new configuration objects. In normal runtime
-    // this should only happen for configuration entities as we should not be
-    // creating simple configuration objects on the fly.
-    \Drupal::languageManager()
-      ->getLanguageConfigOverride('de', 'config_test.new')
-      ->set('language', 'override')
-      ->save();
-    $config = \Drupal::config('config_test.new');
-    $this->assertTrue($config->isNew(), 'The configuration object config_test.new is new');
-    $this->assertIdentical($config->get('language'), 'override');
-    $this->assertIdentical($config->getOriginal('language', FALSE), NULL);
-
-    // Test how overrides react to base configuration changes. Set up some base
-    // values.
-    \Drupal::configFactory()->getEditable('config_test.foo')
-      ->set('value', array('key' => 'original'))
-      ->set('label', 'Original')
-      ->save();
-    \Drupal::languageManager()
-      ->getLanguageConfigOverride('de', 'config_test.foo')
-      ->set('value', array('key' => 'override'))
-      ->set('label', 'Override')
-      ->save();
-    \Drupal::languageManager()
-      ->getLanguageConfigOverride('fr', 'config_test.foo')
-      ->set('value', array('key' => 'override'))
-      ->save();
-    \Drupal::configFactory()->clearStaticCache();
-    $config = \Drupal::config('config_test.foo');
-    $this->assertIdentical($config->get('value'), array('key' => 'override'));
-
-    // Ensure renaming the config will rename the override.
-    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('en'));
-    \Drupal::configFactory()->rename('config_test.foo', 'config_test.bar');
-    $config = \Drupal::config('config_test.bar');
-    $this->assertEqual($config->get('value'), array('key' => 'original'));
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.foo');
-    $this->assertTrue($override->isNew());
-    $this->assertEqual($override->get('value'), NULL);
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
-    $this->assertFalse($override->isNew());
-    $this->assertEqual($override->get('value'), array('key' => 'override'));
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
-    $this->assertFalse($override->isNew());
-    $this->assertEqual($override->get('value'), array('key' => 'override'));
-
-    // Ensure changing data in the config will update the overrides.
-    $config = \Drupal::configFactory()->getEditable('config_test.bar')->clear('value.key')->save();
-    $this->assertEqual($config->get('value'), array());
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
-    $this->assertFalse($override->isNew());
-    $this->assertEqual($override->get('value'), NULL);
-    // The French override will become empty and therefore removed.
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
-    $this->assertTrue($override->isNew());
-    $this->assertEqual($override->get('value'), NULL);
-
-    // Ensure deleting the config will delete the override.
-    \Drupal::configFactory()->getEditable('config_test.bar')->delete();
-    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
-    $this->assertTrue($override->isNew());
-    $this->assertEqual($override->get('value'), NULL);
-  }
-}
-
diff --git a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php b/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
deleted file mode 100644
index 169a7ba..0000000
--- a/core/modules/config/src/Tests/ConfigModuleOverridesTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigModuleOverridesTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests module overrides of configuration using event subscribers.
- *
- * @group config
- */
-class ConfigModuleOverridesTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'config', 'config_override_test');
-
-  public function testSimpleModuleOverrides() {
-    $GLOBALS['config_test_run_module_overrides'] = TRUE;
-    $name = 'system.site';
-    $overridden_name = 'ZOMG overridden site name';
-    $non_overridden_name = 'ZOMG this name is on disk mkay';
-    $overridden_slogan = 'Yay for overrides!';
-    $non_overridden_slogan = 'Yay for defaults!';
-    $config_factory = $this->container->get('config.factory');
-    $config_factory
-      ->getEditable($name)
-      ->set('name', $non_overridden_name)
-      ->set('slogan', $non_overridden_slogan)
-      ->save();
-
-    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->getOriginal('name', FALSE));
-    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->getOriginal('slogan', FALSE));
-    $this->assertEqual($overridden_name, $config_factory->get('system.site')->get('name'));
-    $this->assertEqual($overridden_slogan, $config_factory->get('system.site')->get('slogan'));
-
-    // Test overrides of completely new configuration objects. In normal runtime
-    // this should only happen for configuration entities as we should not be
-    // creating simple configuration objects on the fly.
-    $config = $config_factory->get('config_override_test.new');
-    $this->assertTrue($config->isNew(), 'The configuration object config_override_test.new is new');
-    $this->assertIdentical($config->get('module'), 'override');
-    $this->assertIdentical($config->getOriginal('module', FALSE), NULL);
-
-    unset($GLOBALS['config_test_run_module_overrides']);
-  }
-}
diff --git a/core/modules/config/src/Tests/ConfigOverrideTest.php b/core/modules/config/src/Tests/ConfigOverrideTest.php
deleted file mode 100644
index b9a262d..0000000
--- a/core/modules/config/src/Tests/ConfigOverrideTest.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigOverrideTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests configuration overrides via $config in settings.php.
- *
- * @group config
- */
-class ConfigOverrideTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'config_test');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-  }
-
-  /**
-   * Tests configuration override.
-   */
-  function testConfOverride() {
-    $expected_original_data = array(
-      'foo' => 'bar',
-      'baz' => NULL,
-      '404' => 'herp',
-    );
-
-    // Set globals before installing to prove that the installed file does not
-    // contain these values.
-    $overrides['config_test.system']['foo'] = 'overridden';
-    $overrides['config_test.system']['baz'] = 'injected';
-    $overrides['config_test.system']['404'] = 'derp';
-    $GLOBALS['config'] = $overrides;
-
-    $this->installConfig(array('config_test'));
-
-    // Verify that the original configuration data exists. Have to read storage
-    // directly otherwise overrides will apply.
-    $active = $this->container->get('config.storage');
-    $data = $active->read('config_test.system');
-    $this->assertIdentical($data['foo'], $expected_original_data['foo']);
-    $this->assertFalse(isset($data['baz']));
-    $this->assertIdentical($data['404'], $expected_original_data['404']);
-
-    // Get the configuration object with overrides.
-    $config = \Drupal::configFactory()->get('config_test.system');
-
-    // Verify that it contains the overridden data from $config.
-    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
-    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
-    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
-
-    // Get the configuration object which does not have overrides.
-    $config = \Drupal::configFactory()->getEditable('config_test.system');
-
-    // Verify that it does not contains the overridden data from $config.
-    $this->assertIdentical($config->get('foo'), $expected_original_data['foo']);
-    $this->assertIdentical($config->get('baz'), NULL);
-    $this->assertIdentical($config->get('404'), $expected_original_data['404']);
-
-    // Set the value for 'baz' (on the original data).
-    $expected_original_data['baz'] = 'original baz';
-    $config->set('baz', $expected_original_data['baz']);
-
-    // Set the value for '404' (on the original data).
-    $expected_original_data['404'] = 'original 404';
-    $config->set('404', $expected_original_data['404']);
-
-    // Save the configuration object (having overrides applied).
-    $config->save();
-
-    // Reload it and verify that it still contains overridden data from $config.
-    $config = \Drupal::config('config_test.system');
-    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
-    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
-    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
-
-    // Verify that raw config data has changed.
-    $this->assertIdentical($config->getOriginal('foo', FALSE), $expected_original_data['foo']);
-    $this->assertIdentical($config->getOriginal('baz', FALSE), $expected_original_data['baz']);
-    $this->assertIdentical($config->getOriginal('404', FALSE), $expected_original_data['404']);
-
-    // Write file to sync.
-    $sync = $this->container->get('config.storage.sync');
-    $expected_new_data = array(
-      'foo' => 'barbar',
-      '404' => 'herpderp',
-    );
-    $sync->write('config_test.system', $expected_new_data);
-
-    // Import changed data from sync to active.
-    $this->configImporter()->import();
-    $data = $active->read('config_test.system');
-
-    // Verify that the new configuration data exists. Have to read storage
-    // directly otherwise overrides will apply.
-    $this->assertIdentical($data['foo'], $expected_new_data['foo']);
-    $this->assertFalse(isset($data['baz']));
-    $this->assertIdentical($data['404'], $expected_new_data['404']);
-
-    // Verify that the overrides are still working.
-    $config = \Drupal::config('config_test.system');
-    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
-    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
-    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
-
-    // Test overrides of completely new configuration objects. In normal runtime
-    // this should only happen for configuration entities as we should not be
-    // creating simple configuration objects on the fly.
-    $GLOBALS['config']['config_test.new']['key'] = 'override';
-    $config = \Drupal::config('config_test.new');
-    $this->assertTrue($config->isNew(), 'The configuration object config_test.new is new');
-    $this->assertIdentical($config->get('key'), 'override');
-    $config_raw = \Drupal::configFactory()->getEditable('config_test.new');
-    $this->assertIdentical($config_raw->get('key'), NULL);
-    $config_raw
-      ->set('key', 'raw')
-      ->set('new_key', 'new_value')
-      ->save();
-    // Ensure override is preserved but all other data has been updated
-    // accordingly.
-    $config = \Drupal::config('config_test.new');
-    $this->assertFalse($config->isNew(), 'The configuration object config_test.new is not new');
-    $this->assertIdentical($config->get('key'), 'override');
-    $this->assertIdentical($config->get('new_key'), 'new_value');
-    $raw_data = $config->getRawData();
-    $this->assertIdentical($raw_data['key'], 'raw');
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php b/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
deleted file mode 100644
index e42545d..0000000
--- a/core/modules/config/src/Tests/ConfigOverridesPriorityTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigOverridesPriorityTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Language\Language;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests that language, module and settings.php are applied in the correct
- * order.
- *
- * @group config
- */
-class ConfigOverridesPriorityTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'config', 'config_override_test', 'language');
-
-  public function testOverridePriorities() {
-    $GLOBALS['config_test_run_module_overrides'] = FALSE;
-
-    $non_overridden_mail =  'site@example.com';
-    $language_overridden_mail = 'french@example.com';
-
-    $language_overridden_name = 'French site name';
-    $module_overridden_name = 'ZOMG overridden site name';
-    $non_overridden_name = 'ZOMG this name is on disk mkay';
-
-    $module_overridden_slogan = 'Yay for overrides!';
-    $non_overridden_slogan = 'Yay for defaults!';
-
-    /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
-    $config_factory = $this->container->get('config.factory');
-    $config_factory
-      ->getEditable('system.site')
-      ->set('name', $non_overridden_name)
-      ->set('slogan', $non_overridden_slogan)
-      ->set('mail', $non_overridden_mail)
-      ->set('weight_select_max', 50)
-      ->save();
-
-    // Ensure that no overrides are applying.
-    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->get('name'));
-    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
-    $this->assertEqual($non_overridden_mail, $config_factory->get('system.site')->get('mail'));
-    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
-
-    // Override using language.
-    $language = new Language(array(
-      'name' => 'French',
-      'id' => 'fr',
-    ));
-    \Drupal::languageManager()->setConfigOverrideLanguage($language);
-    \Drupal::languageManager()
-      ->getLanguageConfigOverride($language->getId(), 'system.site')
-      ->set('name', $language_overridden_name)
-      ->set('mail', $language_overridden_mail)
-      ->save();
-
-    $this->assertEqual($language_overridden_name, $config_factory->get('system.site')->get('name'));
-    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
-    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
-    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
-
-    // Enable module overrides. Do not override system.site:mail to prove that
-    // the language override still applies.
-    $GLOBALS['config_test_run_module_overrides'] = TRUE;
-    $config_factory->reset('system.site');
-    $this->assertEqual($module_overridden_name, $config_factory->get('system.site')->get('name'));
-    $this->assertEqual($module_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
-    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
-    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
-
-    // Configure a global override to simulate overriding using settings.php. Do
-    // not override system.site:mail or system.site:slogan to prove that the
-    // language and module overrides still apply.
-    $GLOBALS['config']['system.site']['name'] = 'Site name global conf override';
-    $config_factory->reset('system.site');
-    $this->assertEqual('Site name global conf override', $config_factory->get('system.site')->get('name'));
-    $this->assertEqual($module_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
-    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
-    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
-
-    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->getOriginal('name', FALSE));
-    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->getOriginal('slogan', FALSE));
-    $this->assertEqual($non_overridden_mail, $config_factory->get('system.site')->getOriginal('mail', FALSE));
-    $this->assertEqual(50, $config_factory->get('system.site')->getOriginal('weight_select_max', FALSE));
-
-    unset($GLOBALS['config_test_run_module_overrides']);
-  }
-}
diff --git a/core/modules/config/src/Tests/ConfigSchemaTest.php b/core/modules/config/src/Tests/ConfigSchemaTest.php
deleted file mode 100644
index a34e6a6..0000000
--- a/core/modules/config/src/Tests/ConfigSchemaTest.php
+++ /dev/null
@@ -1,575 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigSchemaTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\FileStorage;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
-use Drupal\Core\TypedData\Type\IntegerInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests schema for configuration objects.
- *
- * @group config
- */
-class ConfigSchemaTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'language', 'field', 'image', 'config_test', 'config_schema_test');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('system', 'image', 'config_schema_test'));
-  }
-
-  /**
-   * Tests the basic metadata retrieval layer.
-   */
-  function testSchemaMapping() {
-    // Nonexistent configuration key will have Undefined as metadata.
-    $this->assertIdentical(FALSE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.no_such_key'));
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.no_such_key');
-    $expected = array();
-    $expected['label'] = 'Undefined';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
-    $expected['type'] = 'undefined';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for nonexistent configuration.');
-
-    // Configuration file without schema will return Undefined as well.
-    $this->assertIdentical(FALSE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.noschema'));
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.noschema');
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for configuration with no schema.');
-
-    // Configuration file with only some schema.
-    $this->assertIdentical(TRUE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'));
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema');
-    $expected = array();
-    $expected['label'] = 'Schema test data';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['mapping']['langcode']['type'] = 'string';
-    $expected['mapping']['langcode']['label'] = 'Language code';
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['testitem'] = array('label' => 'Test item');
-    $expected['mapping']['testlist'] = array('label' => 'Test list');
-    $expected['type'] = 'config_schema_test.someschema';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for configuration with only some schema.');
-
-    // Check type detection on elements with undefined types.
-    $config = \Drupal::service('config.typed')->get('config_schema_test.someschema');
-    $definition = $config->get('testitem')->getDataDefinition()->toArray();
-    $expected = array();
-    $expected['label'] = 'Test item';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
-    $expected['type'] = 'undefined';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
-    $this->assertEqual($definition, $expected, 'Automatic type detected for a scalar is undefined.');
-    $definition = $config->get('testlist')->getDataDefinition()->toArray();
-    $expected = array();
-    $expected['label'] = 'Test list';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
-    $expected['type'] = 'undefined';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
-    $this->assertEqual($definition, $expected, 'Automatic type detected for a list is undefined.');
-    $definition = $config->get('testnoschema')->getDataDefinition()->toArray();
-    $expected = array();
-    $expected['label'] = 'Undefined';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
-    $expected['type'] = 'undefined';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
-    $this->assertEqual($definition, $expected, 'Automatic type detected for an undefined integer is undefined.');
-
-    // Simple case, straight metadata.
-    $definition = \Drupal::service('config.typed')->getDefinition('system.maintenance');
-    $expected = array();
-    $expected['label'] = 'Maintenance mode';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['mapping']['message'] = array(
-      'label' =>  'Message to display when in maintenance mode',
-      'type' => 'text',
-    );
-    $expected['mapping']['langcode'] = array(
-      'label' => 'Language code',
-      'type' => 'string',
-    );
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['type'] = 'system.maintenance';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for system.maintenance');
-
-    // Mixed schema with ignore elements.
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.ignore');
-    $expected = array();
-    $expected['label'] = 'Ignore test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping']['langcode'] = array(
-      'type' => 'string',
-      'label' => 'Language code',
-    );
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['label'] = array(
-      'label' =>  'Label',
-      'type' => 'label',
-    );
-    $expected['mapping']['irrelevant'] = array(
-      'label' => 'Irrelevant',
-      'type' => 'ignore',
-    );
-    $expected['mapping']['indescribable'] = array(
-      'label' => 'Indescribable',
-      'type' => 'ignore',
-    );
-    $expected['mapping']['weight'] = array(
-      'label' => 'Weight',
-      'type' => 'integer',
-    );
-    $expected['type'] = 'config_schema_test.ignore';
-
-    $this->assertEqual($definition, $expected);
-
-    // The ignore elements themselves.
-    $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('irrelevant')->getDataDefinition()->toArray();
-    $expected = array();
-    $expected['type'] = 'ignore';
-    $expected['label'] = 'Irrelevant';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Ignore';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
-    $this->assertEqual($definition, $expected);
-    $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('indescribable')->getDataDefinition()->toArray();
-    $expected['label'] = 'Indescribable';
-    $this->assertEqual($definition, $expected);
-
-    // More complex case, generic type. Metadata for image style.
-    $definition = \Drupal::service('config.typed')->getDefinition('image.style.large');
-    $expected = array();
-    $expected['label'] = 'Image style';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping']['name']['type'] = 'string';
-    $expected['mapping']['uuid']['type'] = 'string';
-    $expected['mapping']['uuid']['label'] = 'UUID';
-    $expected['mapping']['langcode']['type'] = 'string';
-    $expected['mapping']['langcode']['label'] = 'Language code';
-    $expected['mapping']['status']['type'] = 'boolean';
-    $expected['mapping']['status']['label'] = 'Status';
-    $expected['mapping']['dependencies']['type'] = 'config_dependencies';
-    $expected['mapping']['dependencies']['label'] = 'Dependencies';
-    $expected['mapping']['name']['type'] = 'string';
-    $expected['mapping']['label']['type'] = 'label';
-    $expected['mapping']['label']['label'] = 'Label';
-    $expected['mapping']['effects']['type'] = 'sequence';
-    $expected['mapping']['effects']['sequence']['type'] = 'mapping';
-    $expected['mapping']['effects']['sequence']['mapping']['id']['type'] = 'string';
-    $expected['mapping']['effects']['sequence']['mapping']['data']['type'] = 'image.effect.[%parent.id]';
-    $expected['mapping']['effects']['sequence']['mapping']['weight']['type'] = 'integer';
-    $expected['mapping']['effects']['sequence']['mapping']['uuid']['type'] = 'string';
-    $expected['mapping']['third_party_settings']['type'] = 'sequence';
-    $expected['mapping']['third_party_settings']['label'] = 'Third party settings';
-    $expected['mapping']['third_party_settings']['sequence']['type'] = '[%parent.%parent.%type].third_party.[%key]';
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['type'] = 'image.style.*';
-
-    $this->assertEqual($definition, $expected);
-
-    // More complex, type based on a complex one.
-    $definition = \Drupal::service('config.typed')->getDefinition('image.effect.image_scale');
-    // This should be the schema for image.effect.image_scale.
-    $expected = array();
-    $expected['label'] = 'Image scale';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping']['width']['type'] = 'integer';
-    $expected['mapping']['width']['label'] = 'Width';
-    $expected['mapping']['height']['type'] = 'integer';
-    $expected['mapping']['height']['label'] = 'Height';
-    $expected['mapping']['upscale']['type'] = 'boolean';
-    $expected['mapping']['upscale']['label'] = 'Upscale';
-    $expected['type'] = 'image.effect.image_scale';
-
-
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for image.effect.image_scale');
-
-    // Most complex case, get metadata for actual configuration element.
-    $effects = \Drupal::service('config.typed')->get('image.style.medium')->get('effects');
-    $definition = $effects->get('bddf0d06-42f9-4c75-a700-a33cafa25ea0')->get('data')->getDataDefinition()->toArray();
-    // This should be the schema for image.effect.image_scale, reuse previous one.
-    $expected['type'] =  'image.effect.image_scale';
-
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for the first effect of image.style.medium');
-
-    $a = \Drupal::config('config_test.dynamic.third_party');
-    $test = \Drupal::service('config.typed')->get('config_test.dynamic.third_party')->get('third_party_settings.config_schema_test');
-    $definition = $test->getDataDefinition()->toArray();
-    $expected = array();
-    $expected['type'] = 'config_test.dynamic.*.third_party.config_schema_test';
-    $expected['label'] = 'Mapping';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping'] = [
-      'integer' => ['type' => 'integer'],
-      'string' => ['type' => 'string'],
-    ];
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_test.dynamic.third_party:third_party_settings.config_schema_test');
-
-    // More complex, several level deep test.
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_one.subsection');
-    // This should be the schema of config_schema_test.someschema.somemodule.*.*.
-    $expected = array();
-    $expected['label'] = 'Schema multiple filesystem marker test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['mapping']['langcode']['type'] = 'string';
-    $expected['mapping']['langcode']['label'] = 'Language code';
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['testid']['type'] = 'string';
-    $expected['mapping']['testid']['label'] = 'ID';
-    $expected['mapping']['testdescription']['type'] = 'text';
-    $expected['mapping']['testdescription']['label'] = 'Description';
-    $expected['type'] = 'config_schema_test.someschema.somemodule.*.*';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_one.subsection');
-
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_two.subsection');
-    // The other file should have the same schema.
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_two.subsection');
-  }
-
-  /**
-   * Tests metadata retrieval with several levels of %parent indirection.
-   */
-  function testSchemaMappingWithParents() {
-    $config_data = \Drupal::service('config.typed')->get('config_schema_test.someschema.with_parents');
-
-    // Test fetching parent one level up.
-    $entry = $config_data->get('one_level');
-    $definition = $entry->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
-      'type' => 'config_schema_test.someschema.with_parents.key_1',
-      'label' => 'Test item nested one level',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
-      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
-    $this->assertEqual($definition, $expected);
-
-    // Test fetching parent two levels up.
-    $entry = $config_data->get('two_levels');
-    $definition = $entry->get('wrapper')->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
-      'type' => 'config_schema_test.someschema.with_parents.key_2',
-      'label' => 'Test item nested two levels',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
-      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
-    $this->assertEqual($definition, $expected);
-
-    // Test fetching parent three levels up.
-    $entry = $config_data->get('three_levels');
-    $definition = $entry->get('wrapper_1')->get('wrapper_2')->get('testitem')->getDataDefinition()->toArray();
-    $expected = array(
-      'type' => 'config_schema_test.someschema.with_parents.key_3',
-      'label' => 'Test item nested three levels',
-      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
-      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
-    );
-    $this->assertEqual($definition, $expected);
-  }
-
-  /**
-   * Tests metadata applied to configuration objects.
-   */
-  function testSchemaData() {
-    // Try a simple property.
-    $meta = \Drupal::service('config.typed')->get('system.site');
-    $property = $meta->get('page')->get('front');
-    $this->assertTrue($property instanceof StringInterface, 'Got the right wrapper fo the page.front property.');
-    $this->assertEqual($property->getValue(), '/user/login', 'Got the right value for page.front data.');
-    $definition = $property->getDataDefinition();
-    $this->assertTrue(empty($definition['translatable']), 'Got the right translatability setting for page.front data.');
-
-    // Check nested array of properties.
-    $list = $meta->get('page')->getElements();
-    $this->assertEqual(count($list), 3, 'Got a list with the right number of properties for site page data');
-    $this->assertTrue(isset($list['front']) && isset($list['403']) && isset($list['404']), 'Got a list with the right properties for site page data.');
-    $this->assertEqual($list['front']->getValue(), '/user/login', 'Got the right value for page.front data from the list.');
-
-    // And test some TypedConfigInterface methods.
-    $properties = $list;
-    $this->assertTrue(count($properties) == 3 && $properties['front'] == $list['front'], 'Got the right properties for site page.');
-    $values = $meta->get('page')->toArray();
-    $this->assertTrue(count($values) == 3 && $values['front'] == '/user/login', 'Got the right property values for site page.');
-
-    // Now let's try something more complex, with nested objects.
-    $wrapper = \Drupal::service('config.typed')->get('image.style.large');
-    $effects = $wrapper->get('effects');
-    $this->assertTrue(count($effects->toArray()) == 1, 'Got an array with effects for image.style.large data');
-    $uuid = key($effects->getValue());
-    $effect = $effects->get($uuid)->getElements();
-    $this->assertTrue(!$effect['data']->isEmpty() && $effect['id']->getValue() == 'image_scale', 'Got data for the image scale effect from metadata.');
-    $this->assertTrue($effect['data']->get('width') instanceof IntegerInterface, 'Got the right type for the scale effect width.');
-    $this->assertEqual($effect['data']->get('width')->getValue(), 480, 'Got the right value for the scale effect width.' );
-  }
-
-  /**
-   * Test configuration value data type enforcement using schemas.
-   */
-  public function testConfigSaveWithSchema() {
-    $untyped_values = array(
-      'string' => 1,
-      'empty_string' => '',
-      'null_string' => NULL,
-      'integer' => '100',
-      'null_integer' => '',
-      'boolean' => 1,
-      // If the config schema doesn't have a type it shouldn't be casted.
-      'no_type' => 1,
-      'mapping' => array(
-        'string' => 1
-      ),
-      'float' => '3.14',
-      'null_float' => '',
-      'sequence' => array (1, 0, 1),
-      'sequence_bc' => array(1, 0, 1),
-      // Not in schema and therefore should be left untouched.
-      'not_present_in_schema' => TRUE,
-      // Test a custom type.
-      'config_schema_test_integer' => '1',
-      'config_schema_test_integer_empty_string' => '',
-    );
-    $untyped_to_typed = $untyped_values;
-
-    $typed_values = array(
-      'string' => '1',
-      'empty_string' => '',
-      'null_string' => NULL,
-      'integer' => 100,
-      'null_integer' => NULL,
-      'boolean' => TRUE,
-      'no_type' => 1,
-      'mapping' => array(
-        'string' => '1'
-      ),
-      'float' => 3.14,
-      'null_float' => NULL,
-      'sequence' => array (TRUE, FALSE, TRUE),
-      'sequence_bc' => array(TRUE, FALSE, TRUE),
-      'not_present_in_schema' => TRUE,
-      'config_schema_test_integer' => 1,
-      'config_schema_test_integer_empty_string' => NULL,
-    );
-
-    // Save config which has a schema that enforces types.
-    $this->config('config_schema_test.schema_data_types')
-      ->setData($untyped_to_typed)
-      ->save();
-    $this->assertIdentical($this->config('config_schema_test.schema_data_types')->get(), $typed_values);
-
-    // Save config which does not have a schema that enforces types.
-    $this->config('config_schema_test.no_schema_data_types')
-      ->setData($untyped_values)
-      ->save();
-    $this->assertIdentical($this->config('config_schema_test.no_schema_data_types')->get(), $untyped_values);
-
-    // Ensure that configuration objects with keys marked as ignored are not
-    // changed when saved. The 'config_schema_test.ignore' will have been saved
-    // during the installation of configuration in the setUp method.
-    $extension_path = drupal_get_path('module', 'config_schema_test');
-    $install_storage = new FileStorage($extension_path . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY);
-    $original_data = $install_storage->read('config_schema_test.ignore');
-    $installed_data = $this->config('config_schema_test.ignore')->get();
-    unset($installed_data['_core']);
-    $this->assertIdentical($installed_data, $original_data);
-  }
-
-  /**
-   * Tests fallback to a greedy wildcard.
-   */
-  function testSchemaFallback() {
-    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something');
-    // This should be the schema of config_schema_test.wildcard_fallback.*.
-    $expected = array();
-    $expected['label'] = 'Schema wildcard fallback test';
-    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
-    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
-    $expected['mapping']['langcode']['type'] = 'string';
-    $expected['mapping']['langcode']['label'] = 'Language code';
-    $expected['mapping']['_core']['type'] = '_core_config_info';
-    $expected['mapping']['testid']['type'] = 'string';
-    $expected['mapping']['testid']['label'] = 'ID';
-    $expected['mapping']['testdescription']['type'] = 'text';
-    $expected['mapping']['testdescription']['label'] = 'Description';
-    $expected['type'] = 'config_schema_test.wildcard_fallback.*';
-
-    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.wildcard_fallback.something');
-
-    $definition2 = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something.something');
-    // This should be the schema of config_schema_test.wildcard_fallback.* as
-    //well.
-    $this->assertIdentical($definition, $definition2);
-  }
-
-  /**
-   * Tests use of colons in schema type determination.
-   *
-   * @see \Drupal\Core\Config\TypedConfigManager::getFallbackName()
-   */
-  function testColonsInSchemaTypeDetermination() {
-    $tests = \Drupal::service('config.typed')->get('config_schema_test.plugin_types')->get('tests')->getElements();
-    $definition = $tests[0]->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test.plugin_types.boolean');
-
-    $definition = $tests[1]->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test.plugin_types.boolean:*');
-
-    $definition = $tests[2]->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test.plugin_types.*');
-
-    $definition = $tests[3]->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test.plugin_types.*');
-
-    $tests = \Drupal::service('config.typed')->get('config_schema_test.plugin_types')->get('test_with_parents')->getElements();
-    $definition = $tests[0]->get('settings')->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.boolean');
-
-    $definition = $tests[1]->get('settings')->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.boolean:*');
-
-    $definition = $tests[2]->get('settings')->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.*');
-
-    $definition = $tests[3]->get('settings')->getDataDefinition()->toArray();
-    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.*');
-  }
-
-  /**
-   * Tests hook_config_schema_info_alter().
-   */
-  public function testConfigSchemaInfoAlter() {
-    /** @var \Drupal\Core\Config\TypedConfigManagerInterface $typed_config */
-    $typed_config = \Drupal::service('config.typed');
-    $typed_config->clearCachedDefinitions();
-
-    // Ensure that keys can not be added or removed by
-    // hook_config_schema_info_alter().
-    \Drupal::state()->set('config_schema_test_exception_remove', TRUE);
-    $message = 'Expected ConfigSchemaAlterException thrown.';
-    try {
-      $typed_config->getDefinitions();
-      $this->fail($message);
-    }
-    catch (ConfigSchemaAlterException $e) {
-      $this->pass($message);
-      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has removed (config_schema_test.hook) schema definitions');
-    }
-
-    \Drupal::state()->set('config_schema_test_exception_add', TRUE);
-    $message = 'Expected ConfigSchemaAlterException thrown.';
-    try {
-      $typed_config->getDefinitions();
-      $this->fail($message);
-    }
-    catch (ConfigSchemaAlterException $e) {
-      $this->pass($message);
-      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has added (config_schema_test.hook_added_defintion) and removed (config_schema_test.hook) schema definitions');
-    }
-
-    \Drupal::state()->set('config_schema_test_exception_remove', FALSE);
-    $message = 'Expected ConfigSchemaAlterException thrown.';
-    try {
-      $typed_config->getDefinitions();
-      $this->fail($message);
-    }
-    catch (ConfigSchemaAlterException $e) {
-      $this->pass($message);
-      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has added (config_schema_test.hook_added_defintion) schema definitions');
-    }
-
-    // Tests that hook_config_schema_info_alter() can add additional metadata to
-    // existing configuration schema.
-    \Drupal::state()->set('config_schema_test_exception_add', FALSE);
-    $definitions = $typed_config->getDefinitions();
-    $this->assertEqual($definitions['config_schema_test.hook']['additional_metadata'], 'new schema info');
-  }
-
-  /**
-   * Tests saving config when the type is wrapped by a dynamic type.
-   */
-  public function testConfigSaveWithWrappingSchema() {
-    $untyped_values = [
-      'tests' => [
-        [
-          'wrapper_value' => 'foo',
-          'plugin_id' => 'wrapper:foo',
-          'internal_value' => 100,
-        ],
-      ],
-    ];
-
-    $typed_values = [
-      'tests' => [
-        [
-          'wrapper_value' => 'foo',
-          'plugin_id' => 'wrapper:foo',
-          'internal_value' => '100',
-        ],
-      ],
-    ];
-
-    // Save config which has a schema that enforces types.
-    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.plugin_types')
-      ->setData($untyped_values)
-      ->save();
-    $this->assertIdentical(\Drupal::config('wrapping.config_schema_test.plugin_types')
-      ->get(), $typed_values);
-  }
-
-  /**
-   * Tests dynamic config schema type with multiple sub-key references.
-   */
-  public function testConfigSaveWithWrappingSchemaDoubleBrackets() {
-    $untyped_values = [
-      'tests' => [
-        [
-          'wrapper_value' => 'foo',
-          'foo' => 'cat',
-          'bar' => 'dog',
-          'another_key' => 100,
-        ],
-      ],
-    ];
-
-    $typed_values = [
-      'tests' => [
-        [
-          'wrapper_value' => 'foo',
-          'foo' => 'cat',
-          'bar' => 'dog',
-          'another_key' => '100',
-        ],
-      ],
-    ];
-
-    // Save config which has a schema that enforces types.
-    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.double_brackets')
-      ->setData($untyped_values)
-      ->save();
-    $this->assertIdentical(\Drupal::config('wrapping.config_schema_test.double_brackets')
-      ->get(), $typed_values);
-  }
-
-}
diff --git a/core/modules/config/src/Tests/ConfigSnapshotTest.php b/core/modules/config/src/Tests/ConfigSnapshotTest.php
deleted file mode 100644
index cbb67b7..0000000
--- a/core/modules/config/src/Tests/ConfigSnapshotTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\ConfigSnapshotTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests config snapshot creation and updating.
- *
- * @group config
- */
-class ConfigSnapshotTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'system');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    // Update the config snapshot. This allows the parent::setUp() to write
-    // configuration files.
-    \Drupal::service('config.manager')->createSnapshot(\Drupal::service('config.storage'), \Drupal::service('config.storage.snapshot'));
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-  }
-
-  /**
-   * Tests config snapshot creation and updating.
-   */
-  function testSnapshot() {
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $snapshot = $this->container->get('config.storage.snapshot');
-    $config_manager = $this->container->get('config.manager');
-    $config_name = 'config_test.system';
-    $config_key = 'foo';
-    $new_data = 'foobar';
-
-    $active_snapshot_comparer = new StorageComparer($active, $snapshot, $config_manager);
-    $sync_snapshot_comparer = new StorageComparer($sync, $snapshot, $config_manager);
-
-    // Verify that we have an initial snapshot that matches the active
-    // configuration. This has to be true as no config should be installed.
-    $this->assertFalse($active_snapshot_comparer->createChangelist()->hasChanges());
-
-    // Install the default config.
-    $this->installConfig(array('config_test'));
-    // Although we have imported config this has not affected the snapshot.
-    $this->assertTrue($active_snapshot_comparer->reset()->hasChanges());
-
-    // Update the config snapshot.
-    \Drupal::service('config.manager')->createSnapshot($active, $snapshot);
-
-    // The snapshot and active config should now contain the same config
-    // objects.
-    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
-
-    // Change a configuration value in sync.
-    $sync_data = $this->config($config_name)->get();
-    $sync_data[$config_key] = $new_data;
-    $sync->write($config_name, $sync_data);
-
-    // Verify that active and snapshot match, and that sync doesn't match
-    // active.
-    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
-    $this->assertTrue($sync_snapshot_comparer->createChangelist()->hasChanges());
-
-    // Import changed data from sync to active.
-    $this->configImporter()->import();
-
-    // Verify changed config was properly imported.
-    \Drupal::configFactory()->reset($config_name);
-    $this->assertIdentical($this->config($config_name)->get($config_key), $new_data);
-
-    // Verify that a new snapshot was created which and that it matches
-    // the active config.
-    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
-  }
-
-}
diff --git a/core/modules/config/src/Tests/DefaultConfigTest.php b/core/modules/config/src/Tests/DefaultConfigTest.php
deleted file mode 100644
index 2610c3d..0000000
--- a/core/modules/config/src/Tests/DefaultConfigTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\DefaultConfigTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\config_test\TestInstallStorage;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\simpletest\KernelTestBase;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Tests that default configuration provided by all modules matches schema.
- *
- * @group config
- */
-class DefaultConfigTest extends KernelTestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * Enable the system module so that system_config_schema_info_alter() fires.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'config_test');
-
-  /**
-   * Themes which provide default configuration and need enabling.
-   *
-   * If a theme provides default configuration but does not have a schema
-   * because it can rely on schemas added by system_config_schema_info_alter()
-   * then this test needs to enable it.
-   *
-   * @var array
-   */
-  protected $themes = ['seven'];
-
-  protected function setUp() {
-    parent::setUp();
-    \Drupal::service('theme_handler')->install($this->themes);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function containerBuild(ContainerBuilder $container) {
-    parent::containerBuild($container);
-    $container->register('default_config_test.schema_storage')
-      ->setClass('\Drupal\config_test\TestInstallStorage')
-      ->addArgument(InstallStorage::CONFIG_SCHEMA_DIRECTORY);
-
-    $definition = $container->getDefinition('config.typed');
-    $definition->replaceArgument(1, new Reference('default_config_test.schema_storage'));
-  }
-
-  /**
-   * Tests default configuration data type.
-   */
-  public function testDefaultConfig() {
-    $typed_config = \Drupal::service('config.typed');
-    // Create a configuration storage with access to default configuration in
-    // every module, profile and theme.
-    $default_config_storage = new TestInstallStorage();
-
-    foreach ($default_config_storage->listAll() as $config_name) {
-      // Skip files provided by the config_schema_test module since that module
-      // is explicitly for testing schema.
-      if (strpos($config_name, 'config_schema_test') === 0) {
-        continue;
-      }
-
-      $data = $default_config_storage->read($config_name);
-      $this->assertConfigSchema($typed_config, $config_name, $data);
-    }
-  }
-
-}
diff --git a/core/modules/config/src/Tests/SchemaCheckTraitTest.php b/core/modules/config/src/Tests/SchemaCheckTraitTest.php
deleted file mode 100644
index 25d150d..0000000
--- a/core/modules/config/src/Tests/SchemaCheckTraitTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\SchemaCheckTraitTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\simpletest\KernelTestBase;
-
-
-/**
- * Tests the functionality of SchemaCheckTrait.
- *
- * @group config
- */
-class SchemaCheckTraitTest extends KernelTestBase {
-
-  use SchemaCheckTrait;
-
-  /**
-   * The typed config manager.
-   *
-   * @var \Drupal\Core\Config\TypedConfigManagerInterface
-   */
-  protected $typedConfig;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('config_test', 'config_schema_test');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('config_test', 'config_schema_test'));
-    $this->typedConfig = \Drupal::service('config.typed');
-  }
-
-  /**
-   * Tests \Drupal\Core\Config\Schema\SchemaCheckTrait.
-   */
-  public function testTrait() {
-    // Test a non existing schema.
-    $ret = $this->checkConfigSchema($this->typedConfig, 'config_schema_test.noschema', $this->config('config_schema_test.noschema')->get());
-    $this->assertIdentical($ret, FALSE);
-
-    // Test an existing schema with valid data.
-    $config_data = $this->config('config_test.types')->get();
-    $ret = $this->checkConfigSchema($this->typedConfig, 'config_test.types', $config_data);
-    $this->assertIdentical($ret, TRUE);
-
-    // Add a new key, a new array and overwrite boolean with array to test the
-    // error messages.
-    $config_data = array('new_key' => 'new_value', 'new_array' => array()) + $config_data;
-    $config_data['boolean'] = array();
-    $ret = $this->checkConfigSchema($this->typedConfig, 'config_test.types', $config_data);
-    $expected = array(
-      'config_test.types:new_key' => 'missing schema',
-      'config_test.types:new_array' => 'missing schema',
-      'config_test.types:boolean' => 'non-scalar value but not defined as an array (such as mapping or sequence)',
-    );
-    $this->assertEqual($ret, $expected);
-  }
-
-}
diff --git a/core/modules/config/src/Tests/SchemaConfigListenerTest.php b/core/modules/config/src/Tests/SchemaConfigListenerTest.php
deleted file mode 100644
index 58939b6..0000000
--- a/core/modules/config/src/Tests/SchemaConfigListenerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\SchemaConfigListenerTest.
- */
-
-namespace Drupal\config\Tests;
-
-use Drupal\Core\Config\Schema\SchemaIncompleteException;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the functionality of ConfigSchemaChecker in KernelTestBase tests.
- *
- * @group config
- */
-class SchemaConfigListenerTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('config_test');
-
-  /**
-   * Tests \Drupal\Core\Config\Testing\ConfigSchemaChecker.
-   */
-  public function testConfigSchemaChecker() {
-    // Test a non-existing schema.
-    $message = 'Expected SchemaIncompleteException thrown';
-    try {
-      $this->config('config_schema_test.schemaless')->set('foo', 'bar')->save();
-      $this->fail($message);
-    }
-    catch (SchemaIncompleteException $e) {
-      $this->pass($message);
-      $this->assertEqual('No schema for config_schema_test.schemaless', $e->getMessage());
-    }
-
-    // Test a valid schema.
-    $message = 'Unexpected SchemaIncompleteException thrown';
-    $config = $this->config('config_test.types')->set('int', 10);
-    try {
-      $config->save();
-      $this->pass($message);
-    }
-    catch (SchemaIncompleteException $e) {
-      $this->fail($message);
-    }
-
-    // Test an invalid schema.
-    $message = 'Expected SchemaIncompleteException thrown';
-    $config = $this->config('config_test.types')
-      ->set('foo', 'bar')
-      ->set('array', 1);
-    try {
-      $config->save();
-      $this->fail($message);
-    }
-    catch (SchemaIncompleteException $e) {
-      $this->pass($message);
-      $this->assertEqual('Schema errors for config_test.types with the following errors: config_test.types:foo missing schema, config_test.types:array variable type is integer but applied schema class is Drupal\Core\Config\Schema\Sequence', $e->getMessage());
-    }
-  }
-
-}
diff --git a/core/modules/config/src/Tests/Storage/CachedStorageTest.php b/core/modules/config/src/Tests/Storage/CachedStorageTest.php
deleted file mode 100644
index 402d87a..0000000
--- a/core/modules/config/src/Tests/Storage/CachedStorageTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\Storage\CachedStorageTest.
- */
-
-namespace Drupal\config\Tests\Storage;
-
-use Drupal\Core\Config\FileStorage;
-use Drupal\Core\Config\CachedStorage;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Tests CachedStorage operations.
- *
- * @group config
- */
-class CachedStorageTest extends ConfigStorageTestBase {
-
-  /**
-   * The cache backend the cached storage is using.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected $cache;
-
-  /**
-   * The file storage the cached storage is using.
-   *
-   * @var \Drupal\Core\Config\FileStorage
-   */
-  protected $fileStorage;
-
-  protected function setUp() {
-    parent::setUp();
-    // Create a directory.
-    $dir = $this->publicFilesDirectory . '/config';
-    mkdir($dir);
-    $this->fileStorage = new FileStorage($dir);
-    $this->storage = new CachedStorage($this->fileStorage, \Drupal::service('cache.config'));
-    $this->cache = \Drupal::service('cache_factory')->get('config');
-    // ::listAll() verifications require other configuration data to exist.
-    $this->storage->write('system.performance', array());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testInvalidStorage() {
-    // No-op as this test does not make sense.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function read($name) {
-    $data = $this->cache->get($name);
-    // Cache misses fall through to the underlying storage.
-    return $data ? $data->data : $this->fileStorage->read($name);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function insert($name, $data) {
-    $this->fileStorage->write($name, $data);
-    $this->cache->set($name, $data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function update($name, $data) {
-    $this->fileStorage->write($name, $data);
-    $this->cache->set($name, $data);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function delete($name) {
-    $this->cache->delete($name);
-    unlink($this->fileStorage->getFilePath($name));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function containerBuild(ContainerBuilder $container) {
-    parent::containerBuild($container);
-    // Use the regular database cache backend to aid testing.
-    $container->register('cache_factory', 'Drupal\Core\Cache\DatabaseBackendFactory')
-      ->addArgument(new Reference('database'))
-      ->addArgument(new Reference('cache_tags.invalidator.checksum'));
-  }
-
-}
diff --git a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
deleted file mode 100644
index 412c772..0000000
--- a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\Storage\ConfigStorageTestBase.
- */
-
-namespace Drupal\config\Tests\Storage;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Base class for testing storage operations.
- *
- * All configuration storages are expected to behave identically in
- * terms of reading, writing, listing, deleting, as well as error handling.
- *
- * Therefore, storage tests use an uncommon test case class structure;
- * the base class defines the test method(s) to execute, which are identical
- * for all storages. The storage specific test case classes supply the
- * necessary helper methods to interact with the raw/native storage
- * directly.
- */
-abstract class ConfigStorageTestBase extends KernelTestBase {
-
-  /**
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $storage;
-
-  /**
-   * @var \Drupal\Core\Config\StorageInterface
-   */
-  protected $invalidStorage;
-
-  /**
-   * Tests storage CRUD operations.
-   *
-   * @todo Coverage: Trigger PDOExceptions / Database exceptions.
-   */
-  function testCRUD() {
-    $name = 'config_test.storage';
-
-    // Checking whether a non-existing name exists returns FALSE.
-    $this->assertIdentical($this->storage->exists($name), FALSE);
-
-    // Reading a non-existing name returns FALSE.
-    $data = $this->storage->read($name);
-    $this->assertIdentical($data, FALSE);
-
-    // Writing data returns TRUE and the data has been written.
-    $data = array('foo' => 'bar');
-    $result = $this->storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-
-    $raw_data = $this->read($name);
-    $this->assertIdentical($raw_data, $data);
-
-    // Checking whether an existing name exists returns TRUE.
-    $this->assertIdentical($this->storage->exists($name), TRUE);
-
-    // Writing the identical data again still returns TRUE.
-    $result = $this->storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-
-    // Listing all names returns all.
-    $names = $this->storage->listAll();
-    $this->assertTrue(in_array('system.performance', $names));
-    $this->assertTrue(in_array($name, $names));
-
-    // Listing all names with prefix returns names with that prefix only.
-    $names = $this->storage->listAll('config_test.');
-    $this->assertFalse(in_array('system.performance', $names));
-    $this->assertTrue(in_array($name, $names));
-
-    // Rename the configuration storage object.
-    $new_name = 'config_test.storage_rename';
-    $this->storage->rename($name, $new_name);
-    $raw_data = $this->read($new_name);
-    $this->assertIdentical($raw_data, $data);
-    // Rename it back so further tests work.
-    $this->storage->rename($new_name, $name);
-
-    // Deleting an existing name returns TRUE.
-    $result = $this->storage->delete($name);
-    $this->assertIdentical($result, TRUE);
-
-    // Deleting a non-existing name returns FALSE.
-    $result = $this->storage->delete($name);
-    $this->assertIdentical($result, FALSE);
-
-    // Deleting all names with prefix deletes the appropriate data and returns
-    // TRUE.
-    $files = array(
-      'config_test.test.biff',
-      'config_test.test.bang',
-      'config_test.test.pow',
-    );
-    foreach ($files as $name) {
-      $this->storage->write($name, $data);
-    }
-
-    $result = $this->storage->deleteAll('config_test.');
-    $names = $this->storage->listAll('config_test.');
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($names, array());
-
-    // Test renaming an object that does not exist throws an exception.
-    try {
-      $this->storage->rename('config_test.storage_does_not_exist', 'config_test.storage_does_not_exist_rename');
-    }
-    catch (\Exception $e) {
-      $class = get_class($e);
-      $this->pass($class . ' thrown upon renaming a nonexistent storage bin.');
-    }
-
-    // Test renaming to an object that already exists throws an exception.
-    try {
-      $this->storage->rename('system.cron', 'system.performance');
-    }
-    catch (\Exception $e) {
-      $class = get_class($e);
-      $this->pass($class . ' thrown upon renaming a nonexistent storage bin.');
-    }
-  }
-
-  /**
-   * Tests an invalid storage.
-   */
-  public function testInvalidStorage() {
-    $name = 'config_test.storage';
-
-    // Write something to the valid storage to prove that the storages do not
-    // pollute one another.
-    $data = array('foo' => 'bar');
-    $result = $this->storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-
-    $raw_data = $this->read($name);
-    $this->assertIdentical($raw_data, $data);
-
-    // Reading from a non-existing storage bin returns FALSE.
-    $result = $this->invalidStorage->read($name);
-    $this->assertIdentical($result, FALSE);
-
-    // Deleting from a non-existing storage bin throws an exception.
-    try {
-      $this->invalidStorage->delete($name);
-      $this->fail('Exception not thrown upon deleting from a non-existing storage bin.');
-    }
-    catch (\Exception $e) {
-      $class = get_class($e);
-      $this->pass($class . ' thrown upon deleting from a non-existing storage bin.');
-    }
-
-    // Listing on a non-existing storage bin returns an empty array.
-    $result = $this->invalidStorage->listAll();
-    $this->assertIdentical($result, array());
-    // Writing to a non-existing storage bin creates the bin.
-    $this->invalidStorage->write($name, array('foo' => 'bar'));
-    $result = $this->invalidStorage->read($name);
-    $this->assertIdentical($result, array('foo' => 'bar'));
-  }
-
-  /**
-   * Tests storage writing and reading data preserving data type.
-   */
-  function testDataTypes() {
-    $name = 'config_test.types';
-    $data = array(
-      'array' => array(),
-      'boolean' => TRUE,
-      'exp' => 1.2e+34,
-      'float' => 3.14159,
-      'hex' => 0xC,
-      'int' => 99,
-      'octal' => 0775,
-      'string' => 'string',
-      'string_int' => '1',
-    );
-
-    $result = $this->storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-
-    $read_data = $this->storage->read($name);
-    $this->assertIdentical($read_data, $data);
-  }
-
-  /**
-   * Tests that the storage supports collections.
-   */
-  public function testCollection() {
-    $name = 'config_test.storage';
-    $data = array('foo' => 'bar');
-    $result = $this->storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($data, $this->storage->read($name));
-
-    // Create configuration in a new collection.
-    $new_storage = $this->storage->createCollection('collection.sub.new');
-    $this->assertFalse($new_storage->exists($name));
-    $this->assertEqual(array(), $new_storage->listAll());
-    $new_storage->write($name, $data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($data, $new_storage->read($name));
-    $this->assertEqual(array($name), $new_storage->listAll());
-    $this->assertTrue($new_storage->exists($name));
-    $new_data = array('foo' => 'baz');
-    $new_storage->write($name, $new_data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($new_data, $new_storage->read($name));
-
-    // Create configuration in another collection.
-    $another_storage = $this->storage->createCollection('collection.sub.another');
-    $this->assertFalse($another_storage->exists($name));
-    $this->assertEqual(array(), $another_storage->listAll());
-    $another_storage->write($name, $new_data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($new_data, $another_storage->read($name));
-    $this->assertEqual(array($name), $another_storage->listAll());
-    $this->assertTrue($another_storage->exists($name));
-
-    // Create configuration in yet another collection.
-    $alt_storage = $this->storage->createCollection('alternate');
-    $alt_storage->write($name, $new_data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($new_data, $alt_storage->read($name));
-
-    // Switch back to the collection-less mode and check the data still exists
-    // add has not been touched.
-    $this->assertIdentical($data, $this->storage->read($name));
-
-    // Check that the getAllCollectionNames() method works.
-    $this->assertIdentical(array('alternate', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
-
-    // Check that the collections are removed when they are empty.
-    $alt_storage->delete($name);
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
-
-    // Create configuration in collection called 'collection'. This ensures that
-    // FileStorage's collection storage works regardless of its use of
-    // subdirectories.
-    $parent_storage = $this->storage->createCollection('collection');
-    $this->assertFalse($parent_storage->exists($name));
-    $this->assertEqual(array(), $parent_storage->listAll());
-    $parent_storage->write($name, $new_data);
-    $this->assertIdentical($result, TRUE);
-    $this->assertIdentical($new_data, $parent_storage->read($name));
-    $this->assertEqual(array($name), $parent_storage->listAll());
-    $this->assertTrue($parent_storage->exists($name));
-    $this->assertIdentical(array('collection', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
-    $parent_storage->deleteAll();
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
-
-    // Check that the having an empty collection-less storage does not break
-    // anything. Before deleting check that the previous delete did not affect
-    // data in another collection.
-    $this->assertIdentical($data, $this->storage->read($name));
-    $this->storage->delete($name);
-    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
-  }
-
-  abstract protected function read($name);
-
-  abstract protected function insert($name, $data);
-
-  abstract protected function update($name, $data);
-
-  abstract protected function delete($name);
-
-}
diff --git a/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php b/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php
deleted file mode 100644
index 882b072..0000000
--- a/core/modules/config/src/Tests/Storage/DatabaseStorageTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\Storage\DatabaseStorageTest.
- */
-
-namespace Drupal\config\Tests\Storage;
-
-use Drupal\Core\Config\DatabaseStorage;
-
-/**
- * Tests DatabaseStorage operations.
- *
- * @group config
- */
-class DatabaseStorageTest extends ConfigStorageTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->storage = new DatabaseStorage($this->container->get('database'), 'config');
-    $this->invalidStorage = new DatabaseStorage($this->container->get('database'), 'invalid');
-
-    // ::listAll() verifications require other configuration data to exist.
-    $this->storage->write('system.performance', array());
-  }
-
-  protected function read($name) {
-    $data = db_query('SELECT data FROM {config} WHERE name = :name', array(':name' => $name))->fetchField();
-    return unserialize($data);
-  }
-
-  protected function insert($name, $data) {
-    db_insert('config')->fields(array('name' => $name, 'data' => $data))->execute();
-  }
-
-  protected function update($name, $data) {
-    db_update('config')->fields(array('data' => $data))->condition('name', $name)->execute();
-  }
-
-  protected function delete($name) {
-    db_delete('config')->condition('name', $name)->execute();
-  }
-}
diff --git a/core/modules/config/src/Tests/Storage/FileStorageTest.php b/core/modules/config/src/Tests/Storage/FileStorageTest.php
deleted file mode 100644
index a37f084..0000000
--- a/core/modules/config/src/Tests/Storage/FileStorageTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\config\Tests\Storage\FileStorageTest.
- */
-
-namespace Drupal\config\Tests\Storage;
-
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Config\FileStorage;
-use Drupal\Core\Config\UnsupportedDataTypeConfigException;
-
-/**
- * Tests FileStorage operations.
- *
- * @group config
- */
-class FileStorageTest extends ConfigStorageTestBase {
-
-  /**
-   * A directory to store configuration in.
-   *
-   * @var string
-   */
-  protected $directory;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    // Create a directory.
-    $this->directory = $this->publicFilesDirectory . '/config';
-    mkdir($this->directory);
-    $this->storage = new FileStorage($this->directory);
-    $this->invalidStorage = new FileStorage($this->directory . '/nonexisting');
-
-    // FileStorage::listAll() requires other configuration data to exist.
-    $this->storage->write('system.performance', $this->config('system.performance')->get());
-    $this->storage->write('core.extension', array('module' => array()));
-  }
-
-  protected function read($name) {
-    $data = file_get_contents($this->storage->getFilePath($name));
-    return Yaml::decode($data);
-  }
-
-  protected function insert($name, $data) {
-    file_put_contents($this->storage->getFilePath($name), $data);
-  }
-
-  protected function update($name, $data) {
-    file_put_contents($this->storage->getFilePath($name), $data);
-  }
-
-  protected function delete($name) {
-    unlink($this->storage->getFilePath($name));
-  }
-
-  /**
-   * Tests the FileStorage::listAll method with a relative and absolute path.
-   */
-  public function testlistAll() {
-    $expected_files = array(
-      'core.extension',
-      'system.performance',
-    );
-
-    $config_files = $this->storage->listAll();
-    $this->assertIdentical($config_files, $expected_files, 'Relative path, two config files found.');
-
-    // @todo https://www.drupal.org/node/2666954 FileStorage::listAll() is
-    //   case-sensitive. However, \Drupal\Core\Config\DatabaseStorage::listAll()
-    //   is case-insensitive.
-    $this->assertIdentical(['system.performance'], $this->storage->listAll('system'), 'The FileStorage::listAll() with prefix works.');
-    $this->assertIdentical([], $this->storage->listAll('System'), 'The FileStorage::listAll() is case sensitive.');
-
-    // Initialize FileStorage with absolute file path.
-    $absolute_path = realpath($this->directory);
-    $storage_absolute_path = new FileStorage($absolute_path);
-    $config_files = $storage_absolute_path->listAll();
-    $this->assertIdentical($config_files, $expected_files, 'Absolute path, two config files found.');
-  }
-
-  /**
-   * Test UnsupportedDataTypeConfigException displays path of
-   * erroneous file during read.
-   */
-  public function testReadUnsupportedDataTypeConfigException() {
-    file_put_contents($this->storage->getFilePath('core.extension'), PHP_EOL . 'foo : [bar}', FILE_APPEND);
-    try {
-      $config_parsed = $this->storage->read('core.extension');
-    }
-    catch (UnsupportedDataTypeConfigException $e) {
-      $this->pass('Exception thrown when trying to read a field containing invalid data type.');
-      $this->assertTrue((strpos($e->getMessage(), $this->storage->getFilePath('core.extension')) !== FALSE), 'Erroneous file path is displayed.');
-    }
-  }
-
-}
diff --git a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
index d7ec9a5..f96bb8b 100644
--- a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
+++ b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
@@ -258,5 +258,15 @@ test.double_brackets.cat.dog:
     bar:
       type: string
 
+test.double_brackets.turtle.horse:
+  type: test.double_brackets
+  mapping:
+    another_key:
+      type: integer
+    foo:
+      type: string
+    bar:
+      type: string
+
 test.double_brackets.*:
   type: mapping
diff --git a/core/modules/config_translation/src/FormElement/DateFormat.php b/core/modules/config_translation/src/FormElement/DateFormat.php
index 6395a92..a39da17 100644
--- a/core/modules/config_translation/src/FormElement/DateFormat.php
+++ b/core/modules/config_translation/src/FormElement/DateFormat.php
@@ -20,7 +20,7 @@ class DateFormat extends FormElementBase {
   public function getTranslationElement(LanguageInterface $translation_language, $source_config, $translation_config) {
     /** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
     $date_formatter = \Drupal::service('date.formatter');
-    $description = $this->t('A user-defined date format. See the <a href=":url">PHP manual</a> for available options.', array(':url' => 'http://php.net/manual/function.date.php'));
+    $description = $this->t('A user-defined date format. See the <a href="http://php.net/manual/function.date.php">PHP manual</a> for available options.');
     $format = $this->t('Displayed as %date_format', array('%date_format' => $date_formatter->format(REQUEST_TIME, 'custom', $translation_config)));
 
     return [
diff --git a/core/modules/config_translation/src/FormElement/FormElementBase.php b/core/modules/config_translation/src/FormElement/FormElementBase.php
index 746ae1d..4418361 100644
--- a/core/modules/config_translation/src/FormElement/FormElementBase.php
+++ b/core/modules/config_translation/src/FormElement/FormElementBase.php
@@ -101,7 +101,8 @@ protected function getSourceElement(LanguageInterface $source_language, $source_
     return array(
       '#type' => 'item',
       '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', array(
-        '@label' => $this->definition->getLabel(),
+        // Labels originate from configuration schema and are translatable.
+        '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $source_language->getName(),
       )),
       '#markup' => $value,
@@ -163,7 +164,8 @@ protected function getTranslationElement(LanguageInterface $translation_language
     // Add basic properties that apply to all form elements.
     return array(
       '#title' => $this->t('@label <span class="visually-hidden">(@source_language)</span>', array(
-        '@label' => $this->definition['label'],
+        // Labels originate from configuration schema and are translatable.
+        '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $translation_language->getName(),
       )),
       '#default_value' => $translation_config,
diff --git a/core/modules/config_translation/src/FormElement/PluralVariants.php b/core/modules/config_translation/src/FormElement/PluralVariants.php
index ec6b977..2b3ec3b 100644
--- a/core/modules/config_translation/src/FormElement/PluralVariants.php
+++ b/core/modules/config_translation/src/FormElement/PluralVariants.php
@@ -26,6 +26,7 @@ protected function getSourceElement(LanguageInterface $source_language, $source_
     $element = array(
       '#type' => 'fieldset',
       '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@source_language)</span>', array(
+        // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@source_language' => $source_language->getName(),
       )),
@@ -54,6 +55,7 @@ protected function getTranslationElement(LanguageInterface $translation_language
     $element = array(
       '#type' => 'fieldset',
       '#title' => SafeMarkup::format('@label <span class="visually-hidden">(@translation_language)</span>', array(
+        // Labels originate from configuration schema and are translatable.
         '@label' => $this->t($this->definition->getLabel()),
         '@translation_language' => $translation_language->getName(),
       )),
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index fceb41d..e611478 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -7,10 +7,16 @@
 
 namespace Drupal\config_translation\Tests;
 
+use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
+use Drupal\shortcut\Entity\ShortcutSet;
+use Drupal\contact\Entity\ContactForm;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Visit all lists.
@@ -160,11 +166,11 @@ protected function doMenuListTest() {
   protected function doVocabularyListTest() {
     // Create a test vocabulary to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
-    ));
+    ]);
     $vocabulary->save();
 
     // Get the Taxonomy listing.
@@ -185,7 +191,7 @@ protected function doVocabularyListTest() {
   public function doCustomContentTypeListTest() {
     // Create a test custom block type to decouple looking for translate
     // operations link so this does not test more than necessary.
-    $block_content_type = entity_create('block_content_type', array(
+    $block_content_type = BlockContentType::create(array(
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomMachineName(),
       'revision' => FALSE
@@ -210,10 +216,10 @@ public function doCustomContentTypeListTest() {
   public function doContactFormsListTest() {
     // Create a test contact form to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $contact_form = entity_create('contact_form', array(
+    $contact_form = ContactForm::create([
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomMachineName(),
-    ));
+    ]);
     $contact_form->save();
 
     // Get the contact form listing.
@@ -257,7 +263,7 @@ public function doContentTypeListTest() {
   public function doFormatsListTest() {
     // Create a test format to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $filter_format = entity_create('filter_format', array(
+    $filter_format = FilterFormat::create(array(
       'format' => Unicode::strtolower($this->randomMachineName(16)),
       'name' => $this->randomMachineName(),
     ));
@@ -281,7 +287,7 @@ public function doFormatsListTest() {
   public function doShortcutListTest() {
     // Create a test shortcut to decouple looking for translate operations
     // link so this does not test more than necessary.
-    $shortcut = entity_create('shortcut_set', array(
+    $shortcut = ShortcutSet::create(array(
       'id' => Unicode::strtolower($this->randomMachineName(16)),
       'label' => $this->randomString(),
     ));
@@ -391,20 +397,20 @@ public function doFieldListTest() {
     ));
 
     // Create a block content type.
-    $block_content_type = entity_create('block_content_type', array(
+    $block_content_type = BlockContentType::create(array(
       'id' => 'basic',
       'label' => 'Basic',
       'revision' => FALSE
     ));
     $block_content_type->save();
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       // The field storage is guaranteed to exist because it is supplied by the
       // block_content module.
       'field_storage' => FieldStorageConfig::loadByName('block_content', 'body'),
       'bundle' => $block_content_type->id(),
       'label' => 'Body',
       'settings' => array('display_summary' => FALSE),
-    ));
+    ]);
     $field->save();
 
     // Look at a few fields on a few entity types.
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index a718808..f2c3c7c 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\config_translation\Tests;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Language\Language;
@@ -127,10 +128,12 @@ protected function setUp() {
   public function testSiteInformationTranslationUi() {
     $this->drupalLogin($this->adminUser);
 
-    $site_name = 'Site name for testing configuration translation';
+    $site_name = 'Name of the site for testing configuration translation';
     $site_slogan = 'Site slogan for testing configuration translation';
+    $site_name_label = 'Site name';
     $fr_site_name = 'Nom du site pour tester la configuration traduction';
     $fr_site_slogan = 'Slogan du site pour tester la traduction de configuration';
+    $fr_site_name_label = 'Libellé du champ "Nom du site"';
     $translation_base_url = 'admin/config/system/site-information/translate';
 
     // Set site name and slogan for default language.
@@ -188,6 +191,37 @@ public function testSiteInformationTranslationUi() {
     $this->drupalGet("fr/$translation_base_url/fr/edit");
     $this->assertText($site_name);
     $this->assertText($site_slogan);
+
+    // Translate 'Site name' label in French.
+    $search = array(
+      'string' => $site_name_label,
+      'langcode' => 'fr',
+      'translation' => 'untranslated',
+    );
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+
+    $textarea = current($this->xpath('//textarea'));
+    $lid = (string) $textarea[0]['name'];
+    $edit = array(
+      $lid => $fr_site_name_label,
+    );
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Ensure that the label is in French (and not in English).
+    $this->drupalGet("fr/$translation_base_url/fr/edit");
+    $this->assertText($fr_site_name_label);
+    $this->assertNoText($site_name_label);
+
+    // Ensure that the label is also in French (and not in English)
+    // when editing another language with the interface in French.
+    $this->drupalGet("fr/$translation_base_url/ta/edit");
+    $this->assertText($fr_site_name_label);
+    $this->assertNoText($site_name_label);
+
+    // Ensure that the label is not translated when the interface is in English.
+    $this->drupalGet("$translation_base_url/fr/edit");
+    $this->assertText($site_name_label);
+    $this->assertNoText($fr_site_name_label);
   }
 
   /**
@@ -734,6 +768,46 @@ public function testFieldConfigTranslation() {
   }
 
   /**
+   * Tests the translation of a boolean field settings.
+   */
+  public function testBooleanFieldConfigTranslation() {
+    // Add a test boolean field.
+    $field_name = strtolower($this->randomMachineName());
+    FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'boolean',
+    ])->save();
+
+    $bundle = strtolower($this->randomMachineName());
+    entity_test_create_bundle($bundle);
+    $field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => $bundle,
+    ]);
+
+    $on_label = 'On label (with <em>HTML</em> & things)';
+    $field->setSetting('on_label', $on_label);
+    $off_label = 'Off label (with <em>HTML</em> & things)';
+    $field->setSetting('off_label', $off_label);
+    $field->save();
+
+    $this->drupalLogin($this->translatorUser);
+
+    $this->drupalGet("/entity_test/structure/$bundle/fields/entity_test.$bundle.$field_name/translate");
+    $this->clickLink('Add');
+
+    // Checks the text of details summary element that surrounds the translation
+    // options.
+    $this->assertText(Html::escape(strip_tags($on_label)) . ' Boolean settings');
+
+    // Checks that the correct on and off labels appear on the form.
+    $this->assertEscaped($on_label);
+    $this->assertEscaped($off_label);
+  }
+
+  /**
    * Test translation storage in locale storage.
    */
   public function testLocaleDBStorage() {
diff --git a/core/modules/contact/config/schema/contact.source.schema.yml b/core/modules/contact/config/schema/contact.source.schema.yml
deleted file mode 100644
index 92ba36f..0000000
--- a/core/modules/contact/config/schema/contact.source.schema.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Schema for the migration source plugins.
-
-migrate.source.contact_settings:
-  type: migrate_source_sql
-  label: 'Drupal contact settings'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 46b131d..7cba6b1 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -35,14 +35,6 @@ function contact_help($route_name, RouteMatchInterface $route_match) {
       $output .= '</dl>';
       return $output;
 
-    case 'entity.contact_form.collection':
-      $menu_page = \Drupal::moduleHandler()->moduleExists('menu_ui') ? \Drupal::url('entity.menu.collection') : '#';
-      $block_page = \Drupal::moduleHandler()->moduleExists('block') ? \Drupal::url('block.admin_display') : '#';
-      $output = '';
-      $output .= '<p>' . t('The <em>Personal contact form</em> is the form for site visitors to contact registered users; the name and recipients of this form cannot be edited. Other forms listed here are your configured site-wide contact forms, which site visitors can use to send mail to a centralized email address or addresses. You can edit the name and recipients of site-wide forms by choosing the <em>Edit</em> operation. You can also configure the fields and display of both personal and site-wide forms.') . '</p>';
-      $output .= '<p>' . t('If you have configured a default site-wide contact form, a <em>Contact</em> menu link in the <em>Footer</em> menu will link to it. You can modify this link from the <a href=":menu-settings">Menus page</a> if you have the Menu UI module installed. You can also create links to other contact forms; the URL has format contact/machine_name_of_form.', array(':menu-settings' => $menu_page)) . '</p>';
-      $output .= '<p>' . t('If you would like additional text to appear on a site-wide contact page, beyond field labels, use a block. You can create and edit blocks on the <a href=":blocks">Block layout page</a>, if you have the Block module installed.', array(':blocks' => $block_page)) . '</p>';
-      return $output;
   }
 }
 
@@ -143,7 +135,7 @@ function contact_mail($key, &$message, $params) {
       $message['subject'] .= t('[@form] @subject', $variables, $options);
       $message['body'][] = t("@sender-name (@sender-url) sent a message using the contact form at @form-url.", $variables, $options);
       $build = entity_view($contact_message, 'mail');
-      $message['body'][] = (string) \Drupal::service('renderer')->renderPlain($build);
+      $message['body'][] = \Drupal::service('renderer')->renderPlain($build);
       break;
 
     case 'page_autoreply':
@@ -162,7 +154,7 @@ function contact_mail($key, &$message, $params) {
       $message['body'][] = t("@sender-name (@sender-url) has sent you a message via your contact form at @site-name.", $variables, $options);
       $message['body'][] = t("If you don't want to receive such emails, you can change your settings at @recipient-edit-url.", $variables, $options);
       $build = entity_view($contact_message, 'mail');
-      $message['body'][] = (string) \Drupal::service('renderer')->renderPlain($build);
+      $message['body'][] = \Drupal::service('renderer')->renderPlain($build);
       break;
   }
 }
diff --git a/core/modules/contact/src/Access/ContactPageAccess.php b/core/modules/contact/src/Access/ContactPageAccess.php
index 6b78784..0e968c5 100644
--- a/core/modules/contact/src/Access/ContactPageAccess.php
+++ b/core/modules/contact/src/Access/ContactPageAccess.php
@@ -79,7 +79,7 @@ public function access(UserInterface $user, AccountInterface $account) {
     }
 
     // If requested user has been blocked, do not allow users to contact them.
-    $access->cacheUntilEntityChanges($contact_account);
+    $access->addCacheableDependency($contact_account);
     if ($contact_account->isBlocked()) {
       return $access;
     }
diff --git a/core/modules/contact/src/Tests/ContactPersonalTest.php b/core/modules/contact/src/Tests/ContactPersonalTest.php
index d133240..8b1a7a1 100644
--- a/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/src/Tests/ContactPersonalTest.php
@@ -232,11 +232,6 @@ function testPersonalContactFlood() {
     $flood_limit = 3;
     $this->config('contact.settings')->set('flood.limit', $flood_limit)->save();
 
-    // Clear flood table in preparation for flood test and allow other checks to complete.
-    db_delete('flood')->execute();
-    $num_records_flood = db_query("SELECT COUNT(*) FROM {flood}")->fetchField();
-    $this->assertIdentical($num_records_flood, '0', 'Flood table emptied.');
-
     $this->drupalLogin($this->webUser);
 
     // Submit contact form with correct values and check flood interval.
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index 39cd34a..a29a45b 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -185,10 +185,6 @@ function testSiteWideContact() {
     $this->assertNoRaw(t('Contact form %label has been added.', array('%label' => $label)));
     $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
 
-    // Clear flood table in preparation for flood test and allow other checks to complete.
-    db_delete('flood')->execute();
-    $num_records_after = db_query("SELECT COUNT(*) FROM {flood}")->fetchField();
-    $this->assertIdentical($num_records_after, '0', 'Flood table emptied.');
     $this->drupalLogout();
 
     // Check to see that anonymous user cannot see contact page without permission.
diff --git a/core/modules/contact/src/Tests/MessageEntityTest.php b/core/modules/contact/src/Tests/MessageEntityTest.php
deleted file mode 100644
index 4e61e21..0000000
--- a/core/modules/contact/src/Tests/MessageEntityTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\contact\Tests\MessageEntityTest.
- */
-
-namespace Drupal\contact\Tests;
-
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests the message entity class.
- *
- * @group contact
- * @see \Drupal\contact\Entity\Message
- */
-class MessageEntityTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array(
-    'system',
-    'contact',
-    'field',
-    'user',
-    'contact_test',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('contact', 'contact_test'));
-  }
-
-  /**
-   * Test some of the methods.
-   */
-  public function testMessageMethods() {
-    $message_storage = $this->container->get('entity.manager')->getStorage('contact_message');
-    $message = $message_storage->create(array('contact_form' => 'feedback'));
-
-    // Check for empty values first.
-    $this->assertEqual($message->getMessage(), '');
-    $this->assertEqual($message->getSenderName(), '');
-    $this->assertEqual($message->getSenderMail(), '');
-    $this->assertFalse($message->copySender());
-
-    // Check for default values.
-    $this->assertEqual('feedback', $message->getContactForm()->id());
-    $this->assertFalse($message->isPersonal());
-
-    // Set some values and check for them afterwards.
-    $message->setMessage('welcome_message');
-    $message->setSenderName('sender_name');
-    $message->setSenderMail('sender_mail');
-    $message->setCopySender(TRUE);
-
-    $this->assertEqual($message->getMessage(), 'welcome_message');
-    $this->assertEqual($message->getSenderName(), 'sender_name');
-    $this->assertEqual($message->getSenderMail(), 'sender_mail');
-    $this->assertTrue($message->copySender());
-
-    $no_access_user = $this->createUser(['uid' => 2]);
-    $access_user = $this->createUser(['uid' => 3], ['access site-wide contact form']);
-    $admin = $this->createUser(['uid' => 4], ['administer contact forms']);
-
-    $this->assertFalse(\Drupal::entityManager()->getAccessControlHandler('contact_message')->createAccess(NULL, $no_access_user));
-    $this->assertTrue(\Drupal::entityManager()->getAccessControlHandler('contact_message')->createAccess(NULL, $access_user));
-    $this->assertTrue($message->access('edit', $admin));
-    $this->assertFalse($message->access('edit', $access_user));
-  }
-
-}
diff --git a/core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php
deleted file mode 100644
index aa9df2d..0000000
--- a/core/modules/contact/src/Tests/Migrate/MigrateContactCategoryTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contact\Tests\Migrate\MigrateContactCategoryTest.
- */
-
-namespace Drupal\contact\Tests\Migrate;
-
-use Drupal\contact\Entity\ContactForm;
-use Drupal\contact\ContactFormInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate contact categories to contact.form.*.yml.
- *
- * @group contact_category
- */
-class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('contact');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('contact_category');
-  }
-
-  /**
-   * Performs various assertions on a single contact form entity.
-   *
-   * @param string $id
-   *   The contact form ID.
-   * @param string $expected_label
-   *   The expected label.
-   * @param string[] $expected_recipients
-   *   The recipient e-mail addresses the form should have.
-   * @param string $expected_reply
-   *   The expected reply message.
-   * @param int $expected_weight
-   *   The contact form's expected weight.
-   */
-  protected function assertEntity($id, $expected_label, array $expected_recipients, $expected_reply, $expected_weight) {
-    /** @var \Drupal\contact\ContactFormInterface $entity */
-    $entity = ContactForm::load($id);
-    $this->assertTrue($entity instanceof ContactFormInterface);
-    $this->assertIdentical($expected_label, $entity->label());
-    $this->assertIdentical($expected_recipients, $entity->getRecipients());
-    $this->assertIdentical($expected_reply, $entity->getReply());
-    $this->assertIdentical($expected_weight, $entity->getWeight());
-  }
-
-  /**
-   * The Drupal 6 and 7 contact categories to Drupal 8 migration.
-   */
-  public function testContactCategory() {
-    $this->assertEntity('website_feedback', 'Website feedback', ['admin@example.com'], '', 0);
-    $this->assertEntity('some_other_category', 'Some other category', ['test@example.com'], 'Thanks for contacting us, we will reply ASAP!', 1);
-    $this->assertEntity('a_category_much_longer_than_thir', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
-  }
-
-}
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
deleted file mode 100644
index 6ea9c66..0000000
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactCategoryTest.
- */
-
-namespace Drupal\contact\Tests\Migrate\d6;
-
-use Drupal\contact\Entity\ContactForm;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate contact categories to contact.form.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('contact_category');
-  }
-
-  /**
-   * The Drupal 6 contact categories to Drupal 8 migration.
-   */
-  public function testContactCategory() {
-    /** @var \Drupal\contact\Entity\ContactForm $contact_form */
-    $contact_form = ContactForm::load('website_feedback');
-    $this->assertIdentical('Website feedback', $contact_form->label());
-    $this->assertIdentical(array('admin@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('', $contact_form->getReply());
-    $this->assertIdentical(0, $contact_form->getWeight());
-
-    $contact_form = ContactForm::load('some_other_category');
-    $this->assertIdentical('Some other category', $contact_form->label());
-    $this->assertIdentical(array('test@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('Thanks for contacting us, we will reply ASAP!', $contact_form->getReply());
-    $this->assertIdentical(1, $contact_form->getWeight());
-
-    $contact_form = ContactForm::load('a_category_much_longer_than_thir');
-    $this->assertIdentical('A category much longer than thirty two characters', $contact_form->label());
-    $this->assertIdentical(array('fortyninechars@example.com'), $contact_form->getRecipients());
-    $this->assertIdentical('', $contact_form->getReply());
-    $this->assertIdentical(2, $contact_form->getWeight());
-  }
-
-}
diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php
deleted file mode 100644
index ef39423..0000000
--- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactSettingsTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contact\Tests\Migrate\d6\MigrateContactSettingsTest.
- */
-
-namespace Drupal\contact\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to contact.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateContactSettingsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations(['contact_category', 'd6_contact_settings']);
-  }
-
-  /**
-   * Tests migration of contact variables to contact.settings.yml.
-   */
-  public function testContactSettings() {
-    $config = $this->config('contact.settings');
-    $this->assertIdentical(true, $config->get('user_default_enabled'));
-    $this->assertIdentical(3, $config->get('flood.limit'));
-    $this->assertIdentical('some_other_category', $config->get('default_form'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php b/core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php
deleted file mode 100644
index bc530bb..0000000
--- a/core/modules/contact/src/Tests/Migrate/d7/MigrateContactSettingsTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contact\Tests\Migrate\d7\MigrateContactSettingsTest.
- */
-
-namespace Drupal\contact\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Contact settings to configuration.
- *
- * @group migrate_drupal_7
- */
-class MigrateContactSettingsTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('contact_category');
-    $this->executeMigration('d7_contact_settings');
-  }
-
-  /**
-   * Tests migration of Contact's variables to configuration.
-   */
-  public function testContactSettings() {
-    $config = $this->config('contact.settings');
-    $this->assertTrue($config->get('user_default_enabled'));
-    $this->assertIdentical(33, $config->get('flood.limit'));
-    $this->assertEqual('website_testing', $config->get('default_form'));
-  }
-
-}
diff --git a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php b/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
index 014e968..197a69f 100644
--- a/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
+++ b/core/modules/contact/src/Tests/Views/ContactFieldsTest.php
@@ -7,7 +7,10 @@
 
 namespace Drupal\contact\Tests\Views;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\views\Tests\ViewTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\contact\Entity\ContactForm;
 
 /**
  * Tests which checks that no fieldapi fields are added on contact.
@@ -33,22 +36,22 @@ class ContactFieldsTest extends ViewTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => strtolower($this->randomMachineName()),
       'entity_type' => 'contact_message',
       'type' => 'text'
     ));
     $this->fieldStorage->save();
 
-    entity_create('contact_form', array(
+    ContactForm::create([
       'id' => 'contact_message',
       'label' => 'Test contact form',
-    ))->save();
+    ])->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'contact_message',
-    ))->save();
+    ])->save();
 
     $this->container->get('views.views_data')->clear();
   }
diff --git a/core/modules/contact/tests/src/Kernel/MessageEntityTest.php b/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
new file mode 100644
index 0000000..8de5c4c
--- /dev/null
+++ b/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\contact\Kernel\MessageEntityTest.
+ */
+
+namespace Drupal\Tests\contact\Kernel;
+
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Tests the message entity class.
+ *
+ * @group contact
+ * @see \Drupal\contact\Entity\Message
+ */
+class MessageEntityTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'system',
+    'contact',
+    'field',
+    'user',
+    'contact_test',
+  );
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('contact', 'contact_test'));
+  }
+
+  /**
+   * Test some of the methods.
+   */
+  public function testMessageMethods() {
+    $message_storage = $this->container->get('entity.manager')->getStorage('contact_message');
+    $message = $message_storage->create(array('contact_form' => 'feedback'));
+
+    // Check for empty values first.
+    $this->assertEqual($message->getMessage(), '');
+    $this->assertEqual($message->getSenderName(), '');
+    $this->assertEqual($message->getSenderMail(), '');
+    $this->assertFalse($message->copySender());
+
+    // Check for default values.
+    $this->assertEqual('feedback', $message->getContactForm()->id());
+    $this->assertFalse($message->isPersonal());
+
+    // Set some values and check for them afterwards.
+    $message->setMessage('welcome_message');
+    $message->setSenderName('sender_name');
+    $message->setSenderMail('sender_mail');
+    $message->setCopySender(TRUE);
+
+    $this->assertEqual($message->getMessage(), 'welcome_message');
+    $this->assertEqual($message->getSenderName(), 'sender_name');
+    $this->assertEqual($message->getSenderMail(), 'sender_mail');
+    $this->assertTrue($message->copySender());
+
+    $no_access_user = $this->createUser(['uid' => 2]);
+    $access_user = $this->createUser(['uid' => 3], ['access site-wide contact form']);
+    $admin = $this->createUser(['uid' => 4], ['administer contact forms']);
+
+    $this->assertFalse(\Drupal::entityManager()->getAccessControlHandler('contact_message')->createAccess(NULL, $no_access_user));
+    $this->assertTrue(\Drupal::entityManager()->getAccessControlHandler('contact_message')->createAccess(NULL, $access_user));
+    $this->assertTrue($message->access('edit', $admin));
+    $this->assertFalse($message->access('edit', $access_user));
+  }
+
+}
diff --git a/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php b/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
new file mode 100644
index 0000000..0533d57
--- /dev/null
+++ b/core/modules/contact/tests/src/Kernel/Migrate/MigrateContactCategoryTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\MigrateContactCategoryTest.
+ */
+
+namespace Drupal\Tests\contact\Kernel\Migrate;
+
+use Drupal\contact\Entity\ContactForm;
+use Drupal\contact\ContactFormInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate contact categories to contact.form.*.yml.
+ *
+ * @group contact_category
+ */
+class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('contact');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('contact_category');
+  }
+
+  /**
+   * Performs various assertions on a single contact form entity.
+   *
+   * @param string $id
+   *   The contact form ID.
+   * @param string $expected_label
+   *   The expected label.
+   * @param string[] $expected_recipients
+   *   The recipient e-mail addresses the form should have.
+   * @param string $expected_reply
+   *   The expected reply message.
+   * @param int $expected_weight
+   *   The contact form's expected weight.
+   */
+  protected function assertEntity($id, $expected_label, array $expected_recipients, $expected_reply, $expected_weight) {
+    /** @var \Drupal\contact\ContactFormInterface $entity */
+    $entity = ContactForm::load($id);
+    $this->assertTrue($entity instanceof ContactFormInterface);
+    $this->assertIdentical($expected_label, $entity->label());
+    $this->assertIdentical($expected_recipients, $entity->getRecipients());
+    $this->assertIdentical($expected_reply, $entity->getReply());
+    $this->assertIdentical($expected_weight, $entity->getWeight());
+  }
+
+  /**
+   * The Drupal 6 and 7 contact categories to Drupal 8 migration.
+   */
+  public function testContactCategory() {
+    $this->assertEntity('website_feedback', 'Website feedback', ['admin@example.com'], '', 0);
+    $this->assertEntity('some_other_category', 'Some other category', ['test@example.com'], 'Thanks for contacting us, we will reply ASAP!', 1);
+    $this->assertEntity('a_category_much_longer_than_thir', 'A category much longer than thirty two characters', ['fortyninechars@example.com'], '', 2);
+  }
+
+}
diff --git a/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
new file mode 100644
index 0000000..84377a2
--- /dev/null
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactCategoryTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d6\MigrateContactCategoryTest.
+ */
+
+namespace Drupal\Tests\contact\Kernel\Migrate\d6;
+
+use Drupal\contact\Entity\ContactForm;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate contact categories to contact.form.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('contact_category');
+  }
+
+  /**
+   * The Drupal 6 contact categories to Drupal 8 migration.
+   */
+  public function testContactCategory() {
+    /** @var \Drupal\contact\Entity\ContactForm $contact_form */
+    $contact_form = ContactForm::load('website_feedback');
+    $this->assertIdentical('Website feedback', $contact_form->label());
+    $this->assertIdentical(array('admin@example.com'), $contact_form->getRecipients());
+    $this->assertIdentical('', $contact_form->getReply());
+    $this->assertIdentical(0, $contact_form->getWeight());
+
+    $contact_form = ContactForm::load('some_other_category');
+    $this->assertIdentical('Some other category', $contact_form->label());
+    $this->assertIdentical(array('test@example.com'), $contact_form->getRecipients());
+    $this->assertIdentical('Thanks for contacting us, we will reply ASAP!', $contact_form->getReply());
+    $this->assertIdentical(1, $contact_form->getWeight());
+
+    $contact_form = ContactForm::load('a_category_much_longer_than_thir');
+    $this->assertIdentical('A category much longer than thirty two characters', $contact_form->label());
+    $this->assertIdentical(array('fortyninechars@example.com'), $contact_form->getRecipients());
+    $this->assertIdentical('', $contact_form->getReply());
+    $this->assertIdentical(2, $contact_form->getWeight());
+  }
+
+}
diff --git a/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
new file mode 100644
index 0000000..65d9826
--- /dev/null
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d6\MigrateContactSettingsTest.
+ */
+
+namespace Drupal\Tests\contact\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to contact.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateContactSettingsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations(['contact_category', 'd6_contact_settings']);
+  }
+
+  /**
+   * Tests migration of contact variables to contact.settings.yml.
+   */
+  public function testContactSettings() {
+    $config = $this->config('contact.settings');
+    $this->assertIdentical(true, $config->get('user_default_enabled'));
+    $this->assertIdentical(3, $config->get('flood.limit'));
+    $this->assertIdentical('some_other_category', $config->get('default_form'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php b/core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php
new file mode 100644
index 0000000..7f8ddd2
--- /dev/null
+++ b/core/modules/contact/tests/src/Kernel/Migrate/d7/MigrateContactSettingsTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\contact\Kernel\Migrate\d7\MigrateContactSettingsTest.
+ */
+
+namespace Drupal\Tests\contact\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Contact settings to configuration.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateContactSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('contact_category');
+    $this->executeMigration('d7_contact_settings');
+  }
+
+  /**
+   * Tests migration of Contact's variables to configuration.
+   */
+  public function testContactSettings() {
+    $config = $this->config('contact.settings');
+    $this->assertTrue($config->get('user_default_enabled'));
+    $this->assertIdentical(33, $config->get('flood.limit'));
+    $this->assertEqual('website_testing', $config->get('default_form'));
+  }
+
+}
diff --git a/core/modules/content_translation/content_translation.install b/core/modules/content_translation/content_translation.install
index f9027e1..690ad2b 100644
--- a/core/modules/content_translation/content_translation.install
+++ b/core/modules/content_translation/content_translation.install
@@ -5,6 +5,8 @@
  * Installation functions for Content Translation module.
  */
 
+use \Drupal\Core\Url;
+
 /**
  * Implements hook_install().
  */
@@ -12,20 +14,15 @@ function content_translation_install() {
   // Assign a fairly low weight to ensure our implementation of
   // hook_module_implements_alter() is run among the last ones.
   module_set_weight('content_translation', 10);
-}
-
-/**
- * Implements hook_enable().
- */
-function content_translation_enable() {
   // Translation works when at least two languages are added.
   if (count(\Drupal::languageManager()->getLanguages()) < 2) {
-    $t_args = array(':language_url' => \Drupal::url('entity.configurable_language.collection'));
-    $message = t('Be sure to <a href=":language_url">add at least two languages</a> to translate content.', $t_args);
+    // @todo: Switch to Url::fromRoute() once https://www.drupal.org/node/2589967 is resolved.
+    $t_args = [':language_url' => Url::fromUri('internal:/admin/config/regional/language')->toString()];
+    $message = t('This site has only a single language enabled. <a href=":language_url">Add at least one more language</a> in order to translate content.', $t_args);
     drupal_set_message($message, 'warning');
   }
   // Point the user to the content translation settings.
-  $t_args = array(':settings_url' => \Drupal::url('language.content_settings_page'));
+  $t_args = [':settings_url' => Url::fromUri('internal:/admin/config/regional/content-language')->toString()];
   $message = t('<a href=":settings_url">Enable translation</a> for <em>content types</em>, <em>taxonomy vocabularies</em>, <em>accounts</em>, or any other element you wish to translate.', $t_args);
   drupal_set_message($message, 'warning');
 }
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index f139178..083fc4c 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -14,7 +14,6 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\field\FieldConfigInterface;
 
 /**
  * Implements hook_help().
@@ -283,7 +282,7 @@ function content_translation_translate_access(EntityInterface $entity) {
   $condition = $entity instanceof ContentEntityInterface && $entity->access('view') &&
     !$entity->getUntranslated()->language()->isLocked() && \Drupal::languageManager()->isMultilingual() && $entity->isTranslatable() &&
     ($account->hasPermission('create content translations') || $account->hasPermission('update content translations') || $account->hasPermission('delete content translations'));
-  return AccessResult::allowedIf($condition)->cachePerPermissions()->cacheUntilEntityChanges($entity);
+  return AccessResult::allowedIf($condition)->cachePerPermissions()->addCacheableDependency($entity);
 }
 
 /**
diff --git a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
index 54c61fc..9d7ae13 100644
--- a/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
+++ b/core/modules/content_translation/src/Access/ContentTranslationManageAccessCheck.php
@@ -81,7 +81,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
         // Translation operations cannot be performed on the default
         // translation.
         if ($language->getId() == $entity->getUntranslated()->language()->getId()) {
-          return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+          return AccessResult::forbidden()->addCacheableDependency($entity);
         }
         // Editors have no access to the translation operations, as entity
         // access already grants them an equal or greater access level.
@@ -110,7 +110,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
             && isset($languages[$source_language->getId()])
             && isset($languages[$target_language->getId()])
             && !isset($translations[$target_language->getId()]));
-          return AccessResult::allowedIf($is_new_translation)->cachePerPermissions()->cacheUntilEntityChanges($entity)
+          return AccessResult::allowedIf($is_new_translation)->cachePerPermissions()->addCacheableDependency($entity)
             ->andIf($handler->getTranslationAccess($entity, $operation));
 
         case 'delete':
@@ -118,7 +118,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
           $has_translation = isset($languages[$language->getId()])
             && $language->getId() != $entity->getUntranslated()->language()->getId()
             && isset($translations[$language->getId()]);
-          return AccessResult::allowedIf($has_translation)->cachePerPermissions()->cacheUntilEntityChanges($entity)
+          return AccessResult::allowedIf($has_translation)->cachePerPermissions()->addCacheableDependency($entity)
             ->andIf($handler->getTranslationAccess($entity, $operation));
       }
     }
diff --git a/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php b/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
index 995de59..00cdfe2 100644
--- a/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
+++ b/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationLocalTasks.php
@@ -11,11 +11,14 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
 
 /**
  * Provides dynamic local tasks for content translation.
  */
 class ContentTranslationLocalTasks extends DeriverBase implements ContainerDeriverInterface {
+  use StringTranslationTrait;
 
   /**
    * The base plugin ID
@@ -38,10 +41,13 @@ class ContentTranslationLocalTasks extends DeriverBase implements ContainerDeriv
    *   The base plugin ID.
    * @param \Drupal\content_translation\ContentTranslationManagerInterface $content_translation_manager
    *   The content translation manager.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+   *   The translation manager.
    */
-  public function __construct($base_plugin_id, ContentTranslationManagerInterface $content_translation_manager) {
+  public function __construct($base_plugin_id, ContentTranslationManagerInterface $content_translation_manager, TranslationInterface $string_translation) {
     $this->basePluginId = $base_plugin_id;
     $this->contentTranslationManager = $content_translation_manager;
+    $this->stringTranslation = $string_translation;
   }
 
   /**
@@ -50,7 +56,8 @@ public function __construct($base_plugin_id, ContentTranslationManagerInterface
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
       $base_plugin_id,
-      $container->get('content_translation.manager')
+      $container->get('content_translation.manager'),
+      $container->get('string_translation')
     );
   }
 
@@ -66,7 +73,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
       $base_route_name = "entity.$entity_type_id.canonical";
       $this->derivatives[$translation_route_name] = array(
         'entity_type' => $entity_type_id,
-        'title' => 'Translate',
+        'title' => $this->t('Translate'),
         'route_name' => $translation_route_name,
         'base_route' => $base_route_name,
       ) + $base_plugin_definition;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationConfigImportTest.php b/core/modules/content_translation/src/Tests/ContentTranslationConfigImportTest.php
deleted file mode 100644
index 9d3450c..0000000
--- a/core/modules/content_translation/src/Tests/ContentTranslationConfigImportTest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\content_translation\Tests\ContentTranslationConfigImportTest.
- */
-
-namespace Drupal\content_translation\Tests;
-
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests content translation updates performed during config import.
- *
- * @group content_translation
- */
-class ContentTranslationConfigImportTest extends KernelTestBase {
-
-  /**
-   * Config Importer object used for testing.
-   *
-   * @var \Drupal\Core\Config\ConfigImporter
-   */
-  protected $configImporter;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'entity_test', 'language', 'content_translation');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_mul');
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $this->configImporter = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-  }
-
-  /**
-   * Tests config import updates.
-   */
-  function testConfigImportUpdates() {
-    $entity_type_id = 'entity_test_mul';
-    $config_id = $entity_type_id . '.' . $entity_type_id;
-    $config_name = 'language.content_settings.' . $config_id;
-    $storage = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-
-    // Verify the configuration to create does not exist yet.
-    $this->assertIdentical($storage->exists($config_name), FALSE, $config_name . ' not found.');
-
-    // Create new config entity.
-    $data = array(
-      'uuid' => 'a019d89b-c4d9-4ed4-b859-894e4e2e93cf',
-      'langcode' => 'en',
-      'status' => TRUE,
-      'dependencies' => array(
-        'module' => array('content_translation')
-      ),
-      'id' => $config_id,
-      'target_entity_type_id' => 'entity_test_mul',
-      'target_bundle' => 'entity_test_mul',
-      'default_langcode' => 'site_default',
-      'language_alterable' => FALSE,
-      'third_party_settings' => array(
-        'content_translation' => array('enabled' => TRUE),
-      ),
-    );
-    $sync->write($config_name, $data);
-    $this->assertIdentical($sync->exists($config_name), TRUE, $config_name . ' found.');
-
-    // Import.
-    $this->configImporter->reset()->import();
-
-    // Verify the values appeared.
-    $config = $this->config($config_name);
-    $this->assertIdentical($config->get('id'), $config_id);
-
-    // Verify that updates were performed.
-    $entity_type = $this->container->get('entity.manager')->getDefinition($entity_type_id);
-    $table = $entity_type->getDataTable();
-    $db_schema = $this->container->get('database')->schema();
-    $result = $db_schema->fieldExists($table, 'content_translation_source') && $db_schema->fieldExists($table, 'content_translation_outdated');
-    $this->assertTrue($result, 'Content translation updates were successfully performed during config import.');
-  }
-
-}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
index edccaf0..02b4ced 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationContextualLinksTest.php
@@ -8,9 +8,10 @@
 namespace Drupal\content_translation\Tests;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests that contextual links are available for content translation.
@@ -29,7 +30,7 @@ class ContentTranslationContextualLinksTest extends WebTestBase {
   /**
    * The content type being tested.
    *
-   * @var NodeType
+   * @var \Drupal\node\Entity\NodeType
    */
   protected $contentType;
 
@@ -72,18 +73,18 @@ protected function setUp() {
     $this->contentType = $this->drupalCreateContentType(array('type' => $this->bundle));
 
     // Add a field to the content type. The field is not yet translatable.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'field_test_text',
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => 1,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => 'node',
       'field_name' => 'field_test_text',
       'bundle' => $this->bundle,
       'label' => 'Test text-field',
-    ))->save();
+    ])->save();
     entity_get_form_display('node', $this->bundle, 'default')
       ->setComponent('field_test_text', array(
         'type' => 'text_textfield',
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
index 926a60e..906ccd1 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
@@ -10,7 +10,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Test enabling content translation after other modules.
+ * Test enabling content translation module.
  *
  * @group content_translation
  */
@@ -34,6 +34,10 @@ public function testEnable() {
     ];
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
+    // Status messages are shown.
+    $this->assertText(t('This site has only a single language enabled. Add at least one more language in order to translate content.'));
+    $this->assertText(t('Enable translation for content types, taxonomy vocabularies, accounts, or any other element you wish to translate.'));
+
     // No pending updates should be available.
     $this->drupalGet('admin/reports/status');
     $requirement_value = $this->cssSelect("tr.system-status-report__entry th:contains('Entity/field definitions') + td");
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php
deleted file mode 100644
index 397288a..0000000
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\content_translation\Tests\ContentTranslationSettingsApiTest.
- */
-
-namespace Drupal\content_translation\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the content translation settings API.
- *
- * @group content_translation
- */
-class ContentTranslationSettingsApiTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('language', 'content_translation', 'user', 'entity_test');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('entity_test_mul');
-  }
-
-  /**
-   * Tests that enabling translation via the API triggers schema updates.
-   */
-  function testSettingsApi() {
-    $this->container->get('content_translation.manager')->setEnabled('entity_test_mul', 'entity_test_mul', TRUE);
-    $result =
-      db_field_exists('entity_test_mul_property_data', 'content_translation_source') &&
-      db_field_exists('entity_test_mul_property_data', 'content_translation_outdated');
-    $this->assertTrue($result, 'Schema updates correctly performed.');
-  }
-
-}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
index 56b1ed5..281d7b8 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
@@ -8,6 +8,9 @@
 namespace Drupal\content_translation\Tests;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\file\Entity\File;
 
 /**
  * Tests the field synchronization behavior for the image field.
@@ -49,14 +52,14 @@ protected function setupTestFields() {
     $this->fieldName = 'field_test_et_ui_image';
     $this->cardinality = 3;
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'entity_type' => $this->entityTypeId,
       'type' => 'image',
       'cardinality' => $this->cardinality,
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => $this->entityTypeId,
       'field_name' => $this->fieldName,
       'bundle' => $this->entityTypeId,
@@ -70,7 +73,7 @@ protected function setupTestFields() {
           ),
         ),
       ),
-    ))->save();
+    ])->save();
   }
 
   /**
@@ -137,7 +140,7 @@ function testImageFieldSync() {
         'uid' => \Drupal::currentUser()->id(),
         'status' => FILE_STATUS_PERMANENT,
       );
-      $file = entity_create('file', $field_values);
+      $file = File::create($field_values);
       $file->save();
       $fid = $file->id();
       $this->files[$index]->fid = $fid;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php
deleted file mode 100644
index ab1e1cb..0000000
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\content_translation\Tests\ContentTranslationSyncUnitTest.
- */
-
-namespace Drupal\content_translation\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-use Drupal\content_translation\FieldTranslationSynchronizer;
-
-/**
- * Tests the field synchronization logic.
- *
- * @group content_translation
- */
-class ContentTranslationSyncUnitTest extends KernelTestBase {
-
-  /**
-   * The synchronizer class to be tested.
-   *
-   * @var \Drupal\content_translation\FieldTranslationSynchronizer
-   */
-  protected $synchronizer;
-
-  /**
-   * The columns to be synchronized.
-   *
-   * @var array
-   */
-  protected $synchronized;
-
-  /**
-   * All the field columns.
-   *
-   * @var array
-   */
-  protected $columns;
-
-  /**
-   * The available language codes.
-   *
-   * @var array
-   */
-  protected $langcodes;
-
-  /**
-   * The field cardinality.
-   *
-   * @var int
-   */
-  protected $cardinality;
-
-  /**
-   * The unchanged field values.
-   *
-   * @var array
-   */
-  protected $unchangedFieldValues;
-
-  public static $modules = array('language', 'content_translation');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->synchronizer = new FieldTranslationSynchronizer($this->container->get('entity.manager'));
-    $this->synchronized = array('sync1', 'sync2');
-    $this->columns = array_merge($this->synchronized, array('var1', 'var2'));
-    $this->langcodes = array('en', 'it', 'fr', 'de', 'es');
-    $this->cardinality = 4;
-    $this->unchangedFieldValues = array();
-
-    // Set up an initial set of values in the correct state, that is with
-    // "synchronized" values being equal.
-    foreach ($this->langcodes as $langcode) {
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        foreach ($this->columns as $column) {
-          $sync = in_array($column, $this->synchronized) && $langcode != $this->langcodes[0];
-          $value = $sync ? $this->unchangedFieldValues[$this->langcodes[0]][$delta][$column] : $langcode . '-' . $delta . '-' . $column;
-          $this->unchangedFieldValues[$langcode][$delta][$column] = $value;
-        }
-      }
-    }
-  }
-
-  /**
-   * Tests the field synchronization algorithm.
-   */
-  public function testFieldSync() {
-    // Add a new item to the source items and check that its added to all the
-    // translations.
-    $sync_langcode = $this->langcodes[2];
-    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
-    $field_values = $this->unchangedFieldValues;
-    $item = array();
-    foreach ($this->columns as $column) {
-      $item[$column] = $this->randomMachineName();
-    }
-    $field_values[$sync_langcode][] = $item;
-    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
-    $result = TRUE;
-    foreach ($this->unchangedFieldValues as $langcode => $items) {
-      // Check that the old values are still in place.
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        foreach ($this->columns as $column) {
-          $result = $result && ($this->unchangedFieldValues[$langcode][$delta][$column] == $field_values[$langcode][$delta][$column]);
-        }
-      }
-      // Check that the new item is available in all languages.
-      foreach ($this->columns as $column) {
-        $result = $result && ($field_values[$langcode][$delta][$column] == $field_values[$sync_langcode][$delta][$column]);
-      }
-    }
-    $this->assertTrue($result, 'A new item has been correctly synchronized.');
-
-    // Remove an item from the source items and check that its removed from all
-    // the translations.
-    $sync_langcode = $this->langcodes[1];
-    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
-    $field_values = $this->unchangedFieldValues;
-    $sync_delta = mt_rand(0, count($field_values[$sync_langcode]) - 1);
-    unset($field_values[$sync_langcode][$sync_delta]);
-    // Renumber deltas to start from 0.
-    $field_values[$sync_langcode] = array_values($field_values[$sync_langcode]);
-    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
-    $result = TRUE;
-    foreach ($this->unchangedFieldValues as $langcode => $items) {
-      $new_delta = 0;
-      // Check that the old values are still in place.
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        // Skip the removed item.
-        if ($delta != $sync_delta) {
-          foreach ($this->columns as $column) {
-            $result = $result && ($this->unchangedFieldValues[$langcode][$delta][$column] == $field_values[$langcode][$new_delta][$column]);
-          }
-          $new_delta++;
-        }
-      }
-    }
-    $this->assertTrue($result, 'A removed item has been correctly synchronized.');
-
-    // Move the items around in the source items and check that they are moved
-    // in all the translations.
-    $sync_langcode = $this->langcodes[3];
-    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
-    $field_values = $this->unchangedFieldValues;
-    $field_values[$sync_langcode] = array();
-    // Scramble the items.
-    foreach ($unchanged_items as $delta => $item) {
-      $new_delta = ($delta + 1) % $this->cardinality;
-      $field_values[$sync_langcode][$new_delta] = $item;
-    }
-    // Renumber deltas to start from 0.
-    ksort($field_values[$sync_langcode]);
-    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
-    $result = TRUE;
-    foreach ($field_values as $langcode => $items) {
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        foreach ($this->columns as $column) {
-          $value = $field_values[$langcode][$delta][$column];
-          if (in_array($column, $this->synchronized)) {
-            // If we are dealing with a synchronize column the current value is
-            // supposed to be the same of the source items.
-            $result = $result && $field_values[$sync_langcode][$delta][$column] == $value;
-          }
-          else {
-            // Otherwise the values should be unchanged.
-            $old_delta = ($delta > 0 ? $delta : $this->cardinality) - 1;
-            $result = $result && $this->unchangedFieldValues[$langcode][$old_delta][$column] == $value;
-          }
-        }
-      }
-    }
-    $this->assertTrue($result, 'Scrambled items have been correctly synchronized.');
-  }
-
-  /**
-   * Tests that items holding the same values are correctly synchronized.
-   */
-  public function testMultipleSyncedValues() {
-    $sync_langcode = $this->langcodes[1];
-    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
-
-    // Determine whether the unchanged values should be altered depending on
-    // their delta.
-    $delta_callbacks = array(
-      // Continuous field values: all values are equal.
-      function($delta) { return TRUE; },
-      // Alternated field values: only the even ones are equal.
-      function($delta) { return $delta % 2 !== 0; },
-      // Sparse field values: only the "middle" ones are equal.
-      function($delta) { return $delta === 1 || $delta === 2; },
-      // Sparse field values: only the "extreme" ones are equal.
-      function($delta) { return $delta === 0 || $delta === 3; },
-    );
-
-    foreach ($delta_callbacks as $delta_callback) {
-      $field_values = $this->unchangedFieldValues;
-
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        if ($delta_callback($delta)) {
-          foreach ($this->columns as $column) {
-            if (in_array($column, $this->synchronized)) {
-              $field_values[$sync_langcode][$delta][$column] = $field_values[$sync_langcode][0][$column];
-            }
-          }
-        }
-      }
-
-      $changed_items = $field_values[$sync_langcode];
-      $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
-
-      foreach ($this->unchangedFieldValues as $langcode => $unchanged_items) {
-        for ($delta = 0; $delta < $this->cardinality; $delta++) {
-          foreach ($this->columns as $column) {
-            // The first item is always unchanged hence it is retained by the
-            // synchronization process. The other ones are retained or synced
-            // depending on the logic implemented by the delta callback and
-            // whether it is a sync column or not.
-            $value = $delta > 0 && $delta_callback($delta) && in_array($column, $this->synchronized) ? $changed_items[0][$column] : $unchanged_items[$delta][$column];
-            $this->assertEqual($field_values[$langcode][$delta][$column], $value, "Item $delta column $column for langcode $langcode synced correctly");
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Tests that one change in a synchronized column triggers a change in all columns.
-   */
-  public function testDifferingSyncedColumns() {
-    $sync_langcode = $this->langcodes[2];
-    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
-    $field_values = $this->unchangedFieldValues;
-
-    for ($delta = 0; $delta < $this->cardinality; $delta++) {
-      $index = ($delta % 2) + 1;
-      $field_values[$sync_langcode][$delta]['sync' . $index] .= '-updated';
-    }
-
-    $changed_items = $field_values[$sync_langcode];
-    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
-
-    foreach ($this->unchangedFieldValues as $langcode => $unchanged_items) {
-      for ($delta = 0; $delta < $this->cardinality; $delta++) {
-        foreach ($this->columns as $column) {
-          // If the column is synchronized, the value should have been synced,
-          // for unsychronized columns, the value must not change.
-          $expected_value = in_array($column, $this->synchronized) ? $changed_items[$delta][$column] : $this->unchangedFieldValues[$langcode][$delta][$column];
-          $this->assertEqual($field_values[$langcode][$delta][$column], $expected_value, "Differing Item $delta column $column for langcode $langcode synced correctly");
-        }
-      }
-    }
-  }
-
-}
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php b/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
index d00b378..09c13cc 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationTestBase.php
@@ -8,8 +8,10 @@
 namespace Drupal\content_translation\Tests;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for content translation tests.
@@ -183,18 +185,18 @@ protected function setupTestFields() {
     if (empty($this->fieldName)) {
       $this->fieldName = 'field_test_et_ui_test';
     }
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'type' => 'string',
       'entity_type' => $this->entityTypeId,
       'cardinality' => 1,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => $this->entityTypeId,
       'field_name' => $this->fieldName,
       'bundle' => $this->bundle,
       'label' => 'Test translatable text-field',
-    ))->save();
+    ])->save();
     entity_get_form_display($this->entityTypeId, $this->bundle, 'default')
       ->setComponent($this->fieldName, array(
         'type' => 'string_textfield',
@@ -232,7 +234,9 @@ protected function createEntity($values, $langcode, $bundle_name = NULL) {
         }
       }
     }
-    $entity = entity_create($this->entityTypeId, $entity_values);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId)
+      ->create($entity_values);
     $entity->save();
     return $entity->id();
   }
diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
new file mode 100644
index 0000000..62fcb92
--- /dev/null
+++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationConfigImportTest.
+ */
+
+namespace Drupal\Tests\content_translation\Kernel;
+
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests content translation updates performed during config import.
+ *
+ * @group content_translation
+ */
+class ContentTranslationConfigImportTest extends KernelTestBase {
+
+  /**
+   * Config Importer object used for testing.
+   *
+   * @var \Drupal\Core\Config\ConfigImporter
+   */
+  protected $configImporter;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'entity_test', 'language', 'content_translation');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_mul');
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $this->configImporter = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+  }
+
+  /**
+   * Tests config import updates.
+   */
+  function testConfigImportUpdates() {
+    $entity_type_id = 'entity_test_mul';
+    $config_id = $entity_type_id . '.' . $entity_type_id;
+    $config_name = 'language.content_settings.' . $config_id;
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+
+    // Verify the configuration to create does not exist yet.
+    $this->assertIdentical($storage->exists($config_name), FALSE, $config_name . ' not found.');
+
+    // Create new config entity.
+    $data = array(
+      'uuid' => 'a019d89b-c4d9-4ed4-b859-894e4e2e93cf',
+      'langcode' => 'en',
+      'status' => TRUE,
+      'dependencies' => array(
+        'module' => array('content_translation')
+      ),
+      'id' => $config_id,
+      'target_entity_type_id' => 'entity_test_mul',
+      'target_bundle' => 'entity_test_mul',
+      'default_langcode' => 'site_default',
+      'language_alterable' => FALSE,
+      'third_party_settings' => array(
+        'content_translation' => array('enabled' => TRUE),
+      ),
+    );
+    $sync->write($config_name, $data);
+    $this->assertIdentical($sync->exists($config_name), TRUE, $config_name . ' found.');
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    // Verify the values appeared.
+    $config = $this->config($config_name);
+    $this->assertIdentical($config->get('id'), $config_id);
+
+    // Verify that updates were performed.
+    $entity_type = $this->container->get('entity.manager')->getDefinition($entity_type_id);
+    $table = $entity_type->getDataTable();
+    $db_schema = $this->container->get('database')->schema();
+    $result = $db_schema->fieldExists($table, 'content_translation_source') && $db_schema->fieldExists($table, 'content_translation_outdated');
+    $this->assertTrue($result, 'Content translation updates were successfully performed during config import.');
+  }
+
+}
diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
new file mode 100644
index 0000000..a9f3628
--- /dev/null
+++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationSettingsApiTest.
+ */
+
+namespace Drupal\Tests\content_translation\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the content translation settings API.
+ *
+ * @group content_translation
+ */
+class ContentTranslationSettingsApiTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('language', 'content_translation', 'user', 'entity_test');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_mul');
+  }
+
+  /**
+   * Tests that enabling translation via the API triggers schema updates.
+   */
+  function testSettingsApi() {
+    $this->container->get('content_translation.manager')->setEnabled('entity_test_mul', 'entity_test_mul', TRUE);
+    $result =
+      db_field_exists('entity_test_mul_property_data', 'content_translation_source') &&
+      db_field_exists('entity_test_mul_property_data', 'content_translation_outdated');
+    $this->assertTrue($result, 'Schema updates correctly performed.');
+  }
+
+}
diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
new file mode 100644
index 0000000..6c50554
--- /dev/null
+++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
@@ -0,0 +1,257 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationSyncUnitTest.
+ */
+
+namespace Drupal\Tests\content_translation\Kernel;
+
+use Drupal\content_translation\FieldTranslationSynchronizer;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the field synchronization logic.
+ *
+ * @group content_translation
+ */
+class ContentTranslationSyncUnitTest extends KernelTestBase {
+
+  /**
+   * The synchronizer class to be tested.
+   *
+   * @var \Drupal\content_translation\FieldTranslationSynchronizer
+   */
+  protected $synchronizer;
+
+  /**
+   * The columns to be synchronized.
+   *
+   * @var array
+   */
+  protected $synchronized;
+
+  /**
+   * All the field columns.
+   *
+   * @var array
+   */
+  protected $columns;
+
+  /**
+   * The available language codes.
+   *
+   * @var array
+   */
+  protected $langcodes;
+
+  /**
+   * The field cardinality.
+   *
+   * @var int
+   */
+  protected $cardinality;
+
+  /**
+   * The unchanged field values.
+   *
+   * @var array
+   */
+  protected $unchangedFieldValues;
+
+  public static $modules = array('language', 'content_translation');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->synchronizer = new FieldTranslationSynchronizer($this->container->get('entity.manager'));
+    $this->synchronized = array('sync1', 'sync2');
+    $this->columns = array_merge($this->synchronized, array('var1', 'var2'));
+    $this->langcodes = array('en', 'it', 'fr', 'de', 'es');
+    $this->cardinality = 4;
+    $this->unchangedFieldValues = array();
+
+    // Set up an initial set of values in the correct state, that is with
+    // "synchronized" values being equal.
+    foreach ($this->langcodes as $langcode) {
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        foreach ($this->columns as $column) {
+          $sync = in_array($column, $this->synchronized) && $langcode != $this->langcodes[0];
+          $value = $sync ? $this->unchangedFieldValues[$this->langcodes[0]][$delta][$column] : $langcode . '-' . $delta . '-' . $column;
+          $this->unchangedFieldValues[$langcode][$delta][$column] = $value;
+        }
+      }
+    }
+  }
+
+  /**
+   * Tests the field synchronization algorithm.
+   */
+  public function testFieldSync() {
+    // Add a new item to the source items and check that its added to all the
+    // translations.
+    $sync_langcode = $this->langcodes[2];
+    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
+    $field_values = $this->unchangedFieldValues;
+    $item = array();
+    foreach ($this->columns as $column) {
+      $item[$column] = $this->randomMachineName();
+    }
+    $field_values[$sync_langcode][] = $item;
+    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
+    $result = TRUE;
+    foreach ($this->unchangedFieldValues as $langcode => $items) {
+      // Check that the old values are still in place.
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        foreach ($this->columns as $column) {
+          $result = $result && ($this->unchangedFieldValues[$langcode][$delta][$column] == $field_values[$langcode][$delta][$column]);
+        }
+      }
+      // Check that the new item is available in all languages.
+      foreach ($this->columns as $column) {
+        $result = $result && ($field_values[$langcode][$delta][$column] == $field_values[$sync_langcode][$delta][$column]);
+      }
+    }
+    $this->assertTrue($result, 'A new item has been correctly synchronized.');
+
+    // Remove an item from the source items and check that its removed from all
+    // the translations.
+    $sync_langcode = $this->langcodes[1];
+    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
+    $field_values = $this->unchangedFieldValues;
+    $sync_delta = mt_rand(0, count($field_values[$sync_langcode]) - 1);
+    unset($field_values[$sync_langcode][$sync_delta]);
+    // Renumber deltas to start from 0.
+    $field_values[$sync_langcode] = array_values($field_values[$sync_langcode]);
+    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
+    $result = TRUE;
+    foreach ($this->unchangedFieldValues as $langcode => $items) {
+      $new_delta = 0;
+      // Check that the old values are still in place.
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        // Skip the removed item.
+        if ($delta != $sync_delta) {
+          foreach ($this->columns as $column) {
+            $result = $result && ($this->unchangedFieldValues[$langcode][$delta][$column] == $field_values[$langcode][$new_delta][$column]);
+          }
+          $new_delta++;
+        }
+      }
+    }
+    $this->assertTrue($result, 'A removed item has been correctly synchronized.');
+
+    // Move the items around in the source items and check that they are moved
+    // in all the translations.
+    $sync_langcode = $this->langcodes[3];
+    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
+    $field_values = $this->unchangedFieldValues;
+    $field_values[$sync_langcode] = array();
+    // Scramble the items.
+    foreach ($unchanged_items as $delta => $item) {
+      $new_delta = ($delta + 1) % $this->cardinality;
+      $field_values[$sync_langcode][$new_delta] = $item;
+    }
+    // Renumber deltas to start from 0.
+    ksort($field_values[$sync_langcode]);
+    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
+    $result = TRUE;
+    foreach ($field_values as $langcode => $items) {
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        foreach ($this->columns as $column) {
+          $value = $field_values[$langcode][$delta][$column];
+          if (in_array($column, $this->synchronized)) {
+            // If we are dealing with a synchronize column the current value is
+            // supposed to be the same of the source items.
+            $result = $result && $field_values[$sync_langcode][$delta][$column] == $value;
+          }
+          else {
+            // Otherwise the values should be unchanged.
+            $old_delta = ($delta > 0 ? $delta : $this->cardinality) - 1;
+            $result = $result && $this->unchangedFieldValues[$langcode][$old_delta][$column] == $value;
+          }
+        }
+      }
+    }
+    $this->assertTrue($result, 'Scrambled items have been correctly synchronized.');
+  }
+
+  /**
+   * Tests that items holding the same values are correctly synchronized.
+   */
+  public function testMultipleSyncedValues() {
+    $sync_langcode = $this->langcodes[1];
+    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
+
+    // Determine whether the unchanged values should be altered depending on
+    // their delta.
+    $delta_callbacks = array(
+      // Continuous field values: all values are equal.
+      function($delta) { return TRUE; },
+      // Alternated field values: only the even ones are equal.
+      function($delta) { return $delta % 2 !== 0; },
+      // Sparse field values: only the "middle" ones are equal.
+      function($delta) { return $delta === 1 || $delta === 2; },
+      // Sparse field values: only the "extreme" ones are equal.
+      function($delta) { return $delta === 0 || $delta === 3; },
+    );
+
+    foreach ($delta_callbacks as $delta_callback) {
+      $field_values = $this->unchangedFieldValues;
+
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        if ($delta_callback($delta)) {
+          foreach ($this->columns as $column) {
+            if (in_array($column, $this->synchronized)) {
+              $field_values[$sync_langcode][$delta][$column] = $field_values[$sync_langcode][0][$column];
+            }
+          }
+        }
+      }
+
+      $changed_items = $field_values[$sync_langcode];
+      $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
+
+      foreach ($this->unchangedFieldValues as $langcode => $unchanged_items) {
+        for ($delta = 0; $delta < $this->cardinality; $delta++) {
+          foreach ($this->columns as $column) {
+            // The first item is always unchanged hence it is retained by the
+            // synchronization process. The other ones are retained or synced
+            // depending on the logic implemented by the delta callback and
+            // whether it is a sync column or not.
+            $value = $delta > 0 && $delta_callback($delta) && in_array($column, $this->synchronized) ? $changed_items[0][$column] : $unchanged_items[$delta][$column];
+            $this->assertEqual($field_values[$langcode][$delta][$column], $value, "Item $delta column $column for langcode $langcode synced correctly");
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Tests that one change in a synchronized column triggers a change in all columns.
+   */
+  public function testDifferingSyncedColumns() {
+    $sync_langcode = $this->langcodes[2];
+    $unchanged_items = $this->unchangedFieldValues[$sync_langcode];
+    $field_values = $this->unchangedFieldValues;
+
+    for ($delta = 0; $delta < $this->cardinality; $delta++) {
+      $index = ($delta % 2) + 1;
+      $field_values[$sync_langcode][$delta]['sync' . $index] .= '-updated';
+    }
+
+    $changed_items = $field_values[$sync_langcode];
+    $this->synchronizer->synchronizeItems($field_values, $unchanged_items, $sync_langcode, $this->langcodes, $this->synchronized);
+
+    foreach ($this->unchangedFieldValues as $langcode => $unchanged_items) {
+      for ($delta = 0; $delta < $this->cardinality; $delta++) {
+        foreach ($this->columns as $column) {
+          // If the column is synchronized, the value should have been synced,
+          // for unsychronized columns, the value must not change.
+          $expected_value = in_array($column, $this->synchronized) ? $changed_items[$delta][$column] : $this->unchangedFieldValues[$langcode][$delta][$column];
+          $this->assertEqual($field_values[$langcode][$delta][$column], $expected_value, "Differing Item $delta column $column for langcode $langcode synced correctly");
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
index f11f783..0b7fe85 100644
--- a/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
+++ b/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
@@ -37,6 +37,7 @@ protected function setUp() {
         'node' => $entity_type,
       )));
     \Drupal::getContainer()->set('content_translation.manager', $content_translation_manager);
+    \Drupal::getContainer()->set('string_translation', $this->getStringTranslationStub());
   }
 
   /**
diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module
index f2d5376..8d734f1 100644
--- a/core/modules/contextual/contextual.module
+++ b/core/modules/contextual/contextual.module
@@ -107,6 +107,11 @@ function contextual_help($route_name, RouteMatchInterface $route_match) {
  * @see \Drupal\contextual\ContextualController::render()
  */
 function contextual_preprocess(&$variables, $hook, $info) {
+  $variables['#cache']['contexts'][] = 'user.permissions';
+  if (!\Drupal::currentUser()->hasPermission('access contextual links')) {
+    return;
+  }
+
   // Determine the primary theme function argument.
   if (!empty($info['variables'])) {
     $keys = array_keys($info['variables']);
diff --git a/core/modules/contextual/images/gear-select.png b/core/modules/contextual/images/gear-select.png
deleted file mode 100644
index adf6582..0000000
--- a/core/modules/contextual/images/gear-select.png
+++ /dev/null
@@ -1,8 +0,0 @@
-�PNG
-
-
IHDR$�$ZT
�IDATx��A��0���@P��I��B![W��7�`��m��
��Pn��o��H��g.>H__�G^�t�u�K�_���KP�Ib@Bc:"�XF���{!*�AZ&lEl9�0����S�����U�ZJ"
-�Yᒽ/�
--�c�N��	��9�"
-����+pW�K6!����@�P�c��~�4UĦ�Y�)��<zN��4)�Xd\H,�����
-
+X���
!o��oӄn�9�&����؂���+���;sC��+x�H�^j��jr!IHhlAG��h<^x/D�=�@˄��-�f\"�t��֢���q|)P�
-��})Vh�#tbM`����c�~��Q|N�Jq�&$��>��(�9�=�ãMSEl�:0/�Gω�I��"H���̣shX�Z�eL�6����s��9�&�����C.o�@���1|��{ޤIEND�B`�
\ No newline at end of file
diff --git a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
index 38955ab..1f24f54 100644
--- a/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/src/Tests/ContextualDynamicContextTest.php
@@ -105,6 +105,12 @@ function testDifferentPermissions() {
     $this->assertIdentical($json[$ids[2]], '<ul class="contextual-links"><li class="entitynodeedit-form"><a href="' . base_path() . 'node/3/edit">Edit</a></li></ul>');
     $this->assertIdentical($json[$ids[3]], '');
 
+    // Verify that link language is properly handled.
+    $node3->addTranslation('it')->set('title', $this->randomString())->save();
+    $id = 'node:node=' . $node3->id() . ':changed=' . $node3->getChangedTime() . '&langcode=it';
+    $this->drupalGet('node', ['language' => ConfigurableLanguage::createFromLangcode('it')]);
+    $this->assertContextualLinkPlaceHolder($id);
+
     // Authenticated user: can access contextual links, cannot edit articles.
     $this->drupalLogin($this->authenticatedUser);
     $this->drupalGet('node');
@@ -126,19 +132,13 @@ function testDifferentPermissions() {
     $this->drupalLogin($this->anonymousUser);
     $this->drupalGet('node');
     for ($i = 0; $i < count($ids); $i++) {
-      $this->assertContextualLinkPlaceHolder($ids[$i]);
+      $this->assertNoContextualLinkPlaceHolder($ids[$i]);
     }
     $this->renderContextualLinks(array(), 'node');
     $this->assertResponse(403);
     $this->renderContextualLinks($ids, 'node');
     $this->assertResponse(403);
 
-    // Verify that link language is properly handled.
-    $node3->addTranslation('it')->set('title', $this->randomString())->save();
-    $id = 'node:node=' . $node3->id() . ':changed=' . $node3->getChangedTime() . '&langcode=it';
-    $this->drupalGet('node', ['language' => ConfigurableLanguage::createFromLangcode('it')]);
-    $this->assertContextualLinkPlaceHolder($id);
-
     // Get a page where contextual links are directly rendered.
     $this->drupalGet(Url::fromRoute('menu_test.contextual_test'));
     $this->assertEscaped("<script>alert('Welcome to the jungle!')</script>");
diff --git a/core/modules/contextual/src/Tests/ContextualUnitTest.php b/core/modules/contextual/src/Tests/ContextualUnitTest.php
deleted file mode 100644
index f164051..0000000
--- a/core/modules/contextual/src/Tests/ContextualUnitTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\contextual\Tests\ContextualUnitTest.
- */
-
-namespace Drupal\contextual\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests all edge cases of converting from #contextual_links to ids and vice
- * versa.
- *
- * @group contextual
- */
-class ContextualUnitTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('contextual');
-
-  /**
-   * Provides testcases for testContextualLinksToId() and
-   */
-  function _contextual_links_id_testcases() {
-    // Test branch conditions:
-    // - one group.
-    // - one dynamic path argument.
-    // - no metadata.
-    $tests[] = array(
-      'links' => array(
-        'node' => array(
-          'route_parameters' => array(
-            'node' => '14031991',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
-      'id' => 'node:node=14031991:langcode=en',
-    );
-
-    // Test branch conditions:
-    // - one group.
-    // - multiple dynamic path arguments.
-    // - no metadata.
-    $tests[] = array(
-      'links' => array(
-        'foo' => array(
-          'route_parameters'=> array(
-            'bar',
-            'key' => 'baz',
-            'qux',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
-      'id' => 'foo:0=bar&key=baz&1=qux:langcode=en',
-    );
-
-    // Test branch conditions:
-    // - one group.
-    // - one dynamic path argument.
-    // - metadata.
-    $tests[] = array(
-      'links' => array(
-        'views_ui_edit' => array(
-          'route_parameters' => array(
-            'view' => 'frontpage'
-          ),
-          'metadata' => array(
-            'location' => 'page',
-            'display' => 'page_1',
-            'langcode' => 'en',
-          ),
-        ),
-      ),
-      'id' => 'views_ui_edit:view=frontpage:location=page&display=page_1&langcode=en',
-    );
-
-    // Test branch conditions:
-    // - multiple groups.
-    // - multiple dynamic path arguments.
-    $tests[] = array(
-      'links' => array(
-        'node' => array(
-          'route_parameters' => array(
-            'node' => '14031991',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-        'foo' => array(
-          'route_parameters' => array(
-            'bar',
-            'key' => 'baz',
-            'qux',
-          ),
-          'metadata' => array('langcode' => 'en'),
-        ),
-        'edge' => array(
-          'route_parameters' => array('20011988'),
-          'metadata' => array('langcode' => 'en'),
-        ),
-      ),
-      'id' => 'node:node=14031991:langcode=en|foo:0=bar&key=baz&1=qux:langcode=en|edge:0=20011988:langcode=en',
-    );
-
-    return $tests;
-  }
-
-  /**
-   * Tests _contextual_links_to_id().
-   */
-  function testContextualLinksToId() {
-    $tests = $this->_contextual_links_id_testcases();
-    foreach ($tests as $test) {
-      $this->assertIdentical(_contextual_links_to_id($test['links']), $test['id']);
-    }
-  }
-
-  /**
-   * Tests _contextual_id_to_links().
-   */
-  function testContextualIdToLinks() {
-    $tests = $this->_contextual_links_id_testcases();
-    foreach ($tests as $test) {
-      $this->assertIdentical(_contextual_id_to_links($test['id']), $test['links']);
-    }
-  }
-
-}
diff --git a/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php b/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
new file mode 100644
index 0000000..84f7e95
--- /dev/null
+++ b/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\contextual\Kernel\ContextualUnitTest.
+ */
+
+namespace Drupal\Tests\contextual\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests all edge cases of converting from #contextual_links to ids and vice
+ * versa.
+ *
+ * @group contextual
+ */
+class ContextualUnitTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('contextual');
+
+  /**
+   * Provides testcases for testContextualLinksToId() and
+   */
+  function _contextual_links_id_testcases() {
+    // Test branch conditions:
+    // - one group.
+    // - one dynamic path argument.
+    // - no metadata.
+    $tests[] = array(
+      'links' => array(
+        'node' => array(
+          'route_parameters' => array(
+            'node' => '14031991',
+          ),
+          'metadata' => array('langcode' => 'en'),
+        ),
+      ),
+      'id' => 'node:node=14031991:langcode=en',
+    );
+
+    // Test branch conditions:
+    // - one group.
+    // - multiple dynamic path arguments.
+    // - no metadata.
+    $tests[] = array(
+      'links' => array(
+        'foo' => array(
+          'route_parameters'=> array(
+            'bar',
+            'key' => 'baz',
+            'qux',
+          ),
+          'metadata' => array('langcode' => 'en'),
+        ),
+      ),
+      'id' => 'foo:0=bar&key=baz&1=qux:langcode=en',
+    );
+
+    // Test branch conditions:
+    // - one group.
+    // - one dynamic path argument.
+    // - metadata.
+    $tests[] = array(
+      'links' => array(
+        'views_ui_edit' => array(
+          'route_parameters' => array(
+            'view' => 'frontpage'
+          ),
+          'metadata' => array(
+            'location' => 'page',
+            'display' => 'page_1',
+            'langcode' => 'en',
+          ),
+        ),
+      ),
+      'id' => 'views_ui_edit:view=frontpage:location=page&display=page_1&langcode=en',
+    );
+
+    // Test branch conditions:
+    // - multiple groups.
+    // - multiple dynamic path arguments.
+    $tests[] = array(
+      'links' => array(
+        'node' => array(
+          'route_parameters' => array(
+            'node' => '14031991',
+          ),
+          'metadata' => array('langcode' => 'en'),
+        ),
+        'foo' => array(
+          'route_parameters' => array(
+            'bar',
+            'key' => 'baz',
+            'qux',
+          ),
+          'metadata' => array('langcode' => 'en'),
+        ),
+        'edge' => array(
+          'route_parameters' => array('20011988'),
+          'metadata' => array('langcode' => 'en'),
+        ),
+      ),
+      'id' => 'node:node=14031991:langcode=en|foo:0=bar&key=baz&1=qux:langcode=en|edge:0=20011988:langcode=en',
+    );
+
+    return $tests;
+  }
+
+  /**
+   * Tests _contextual_links_to_id().
+   */
+  function testContextualLinksToId() {
+    $tests = $this->_contextual_links_id_testcases();
+    foreach ($tests as $test) {
+      $this->assertIdentical(_contextual_links_to_id($test['links']), $test['id']);
+    }
+  }
+
+  /**
+   * Tests _contextual_id_to_links().
+   */
+  function testContextualIdToLinks() {
+    $tests = $this->_contextual_links_id_testcases();
+    foreach ($tests as $test) {
+      $this->assertIdentical(_contextual_id_to_links($test['id']), $test['links']);
+    }
+  }
+
+}
diff --git a/core/modules/datetime/datetime.views.inc b/core/modules/datetime/datetime.views.inc
index c12a3ac..d3b0d18 100644
--- a/core/modules/datetime/datetime.views.inc
+++ b/core/modules/datetime/datetime.views.inc
@@ -26,8 +26,11 @@ function datetime_field_views_data(FieldStorageConfigInterface $field_storage) {
     $arguments = [
       // Argument type => help text.
       'year' => t('Date in the form of YYYY.'),
-      'month' => t('Date in the form of MM.'),
-      'day' => t('Date in the form of DD.'),
+      'month' => t('Date in the form of MM (01 - 12).'),
+      'day' => t('Date in the form of DD (01 - 31).'),
+      'week' => t('Date in the form of WW (01 - 53).'),
+      'year_month' => t('Date in the form of YYYYMM.'),
+      'full_date' => t('Date in the form of CCYYMMDD.'),
     ];
     foreach ($arguments as $argument_type => $help_text) {
       $data[$table_name][$field_storage->getName() . '_value_' . $argument_type] = [
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
index af6fd37..5b53a8f 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
@@ -84,7 +84,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     $form['date_format'] = array(
       '#type' => 'textfield',
       '#title' => $this->t('Date/time format'),
-      '#description' => $this->t('See <a href=":url" target="_blank">the documentation for PHP date formats</a>.', [':url' => 'http://php.net/manual/function.date.php']),
+      '#description' => $this->t('See <a href="http://php.net/manual/function.date.php" target="_blank">the documentation for PHP date formats</a>.'),
       '#default_value' => $this->getSetting('date_format'),
     );
 
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
index b902c31..786c49b 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeTimeAgoFormatter.php
@@ -8,6 +8,7 @@
 namespace Drupal\datetime\Plugin\Field\FieldFormatter;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Field\FieldDefinitionInterface;
@@ -112,7 +113,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
 
     foreach ($items as $delta => $item) {
       $date = $item->date;
-      $output = '';
+      $output = [];
       if (!empty($item->date)) {
         if ($this->getFieldSetting('datetime_type') == 'date') {
           // A date without time will pick up the current time, use the default.
@@ -120,7 +121,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
         }
         $output = $this->formatDate($date);
       }
-      $elements[$delta] = array('#markup' => $output);
+      $elements[$delta] = $output;
     }
 
     return $elements;
@@ -176,20 +177,31 @@ public function settingsSummary() {
    * @param \Drupal\Core\Datetime\DrupalDateTime|object $date
    *   A date/time object.
    *
-   * @return string
+   * @return array
    *   The formatted date/time string using the past or future format setting.
    */
   protected function formatDate(DrupalDateTime $date) {
     $granularity = $this->getSetting('granularity');
     $timestamp = $date->getTimestamp();
-    $options = ['granularity' => $granularity];
+    $options = [
+      'granularity' => $granularity,
+      'return_as_object' => TRUE,
+    ];
 
     if ($this->request->server->get('REQUEST_TIME') > $timestamp) {
-      return SafeMarkup::format($this->getSetting('past_format'), ['@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, $options)]);
+      $result = $this->dateFormatter->formatTimeDiffSince($timestamp, $options);
+      $build = [
+        '#markup' => SafeMarkup::format($this->getSetting('past_format'), ['@interval' => $result->getString()]),
+      ];
     }
     else {
-      return SafeMarkup::format($this->getSetting('future_format'), ['@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, $options)]);
+      $result = $this->dateFormatter->formatTimeDiffUntil($timestamp, $options);
+      $build = [
+        '#markup' => SafeMarkup::format($this->getSetting('future_format'), ['@interval' => $result->getString()]),
+      ];
     }
+    CacheableMetadata::createFromObject($result)->applyTo($build);
+    return $build;
   }
 
 }
diff --git a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
index e277c14..3998900 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
@@ -51,7 +51,7 @@ public function defaultValuesForm(array &$form, FormStateInterface $form_state)
         'default_date' => array(
           '#type' => 'textfield',
           '#title' => t('Relative default value'),
-          '#description' => t("Describe a time by reference to the current day, like '+90 days' (90 days from the day the field is created) or '+1 Saturday' (the next Saturday). See <a href=\"@url\">@strtotime</a> for more details.", array('@strtotime' => 'strtotime', '@url' => 'http://www.php.net/manual/en/function.strtotime.php')),
+          '#description' => t("Describe a time by reference to the current day, like '+90 days' (90 days from the day the field is created) or '+1 Saturday' (the next Saturday). See <a href=\"http://php.net/manual/function.strtotime.php\">strtotime</a> for more details."),
           '#default_value' => (isset($default_value[0]['default_date_type']) && $default_value[0]['default_date_type'] == static::DEFAULT_VALUE_CUSTOM) ? $default_value[0]['default_date'] : '',
           '#states' => array(
             'visible' => array(
diff --git a/core/modules/datetime/src/Plugin/views/argument/FullDate.php b/core/modules/datetime/src/Plugin/views/argument/FullDate.php
new file mode 100644
index 0000000..16644a9
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/FullDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\FullDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a full date (CCYYMMDD).
+ *
+ * @ViewsArgument("datetime_full_date")
+ */
+class FullDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'Ymd';
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/WeekDate.php b/core/modules/datetime/src/Plugin/views/argument/WeekDate.php
new file mode 100644
index 0000000..6b0d817
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/WeekDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\WeekDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a week.
+ *
+ * @ViewsArgument("datetime_week")
+ */
+class WeekDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'W';
+
+}
diff --git a/core/modules/datetime/src/Plugin/views/argument/YearMonthDate.php b/core/modules/datetime/src/Plugin/views/argument/YearMonthDate.php
new file mode 100644
index 0000000..1a533bf
--- /dev/null
+++ b/core/modules/datetime/src/Plugin/views/argument/YearMonthDate.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\datetime\Plugin\views\argument\YearMonthDate.
+ */
+
+namespace Drupal\datetime\Plugin\views\argument;
+
+/**
+ * Argument handler for a year plus month (CCYYMM).
+ *
+ * @ViewsArgument("datetime_year_month")
+ */
+class YearMonthDate extends Date {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $argFormat = 'Ym';
+
+}
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 14ad190..a406717 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -11,7 +11,10 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests Datetime field functionality.
@@ -77,18 +80,18 @@ protected function setUp() {
 
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'datetime',
       'settings' => array('datetime_type' => 'date'),
     ));
     $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
+    $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
       'required' => TRUE,
-    ));
+    ]);
     $this->field->save();
 
     entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
@@ -624,7 +627,7 @@ function testDefaultValue() {
 
     // Create a field storage with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'datetime',
@@ -632,10 +635,10 @@ function testDefaultValue() {
     ));
     $field_storage->save();
 
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'date_content',
-    ));
+    ]);
     $field->save();
 
     // Set now as default_value.
@@ -657,7 +660,7 @@ function testDefaultValue() {
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is today.
-    $new_node = entity_create('node', array('type' => 'date_content'));
+    $new_node = Node::create(['type' => 'date_content']);
     $expected_date = new DrupalDateTime('now', DATETIME_STORAGE_TIMEZONE);
     $this->assertEqual($new_node->get($field_name)->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
 
@@ -690,7 +693,7 @@ function testDefaultValue() {
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is +90 days.
-    $new_node = entity_create('node', array('type' => 'date_content'));
+    $new_node = Node::create(['type' => 'date_content']);
     $expected_date = new DrupalDateTime('+90 days', DATETIME_STORAGE_TIMEZONE);
     $this->assertEqual($new_node->get($field_name)->offsetGet(0)->value, $expected_date->format(DATETIME_DATE_STORAGE_FORMAT));
 
@@ -713,7 +716,7 @@ function testDefaultValue() {
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that datetime field default value is not set.
-    $new_node = entity_create('node', array('type' => 'date_content'));
+    $new_node = Node::create(['type' => 'date_content']);
     $this->assertNull($new_node->get($field_name)->value, 'Default value is not set');
   }
 
diff --git a/core/modules/datetime/src/Tests/DateTimeItemTest.php b/core/modules/datetime/src/Tests/DateTimeItemTest.php
deleted file mode 100644
index d83d2a2..0000000
--- a/core/modules/datetime/src/Tests/DateTimeItemTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\datetime\Tests\DateTimeItemTest.
- */
-
-namespace Drupal\datetime\Tests;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the date field type.
- *
- * @group datetime
- */
-class DateTimeItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('datetime');
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a field with settings to validate.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_datetime',
-      'type' => 'datetime',
-      'entity_type' => 'entity_test',
-      'settings' => array('datetime_type' => 'date'),
-    ));
-    $field_storage->save();
-    $field = entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-      'settings' => array(
-        'default_value' => 'blank',
-      ),
-    ));
-    $field->save();
-  }
-
-  /**
-   * Tests using entity fields of the date field type.
-   */
-  public function testDateTimeItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $value = '2014-01-01T20:00:00Z';
-    $entity->field_datetime = $value;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_datetime->value, $value);
-    $this->assertEqual($entity->field_datetime[0]->value, $value);
-
-    // Verify changing the date value.
-    $new_value = $this->randomMachineName();
-    $entity->field_datetime->value = $new_value;
-    $this->assertEqual($entity->field_datetime->value, $new_value);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_datetime->value, $new_value);
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->field_datetime->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-  /**
-   * Tests DateTimeItem::setValue().
-   */
-  public function testSetValue() {
-    // Test DateTimeItem::setValue() using string.
-    $entity = entity_create('entity_test');
-    $value = '2014-01-01T20:00:00Z';
-    $entity->get('field_datetime')->set(0, $value);
-    $entity->save();
-    // Load the entity and ensure the field was saved correctly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
-
-    // Test DateTimeItem::setValue() using property array.
-    $entity = entity_create('entity_test');
-    $value = '2014-01-01T20:00:00Z';
-    $entity->set('field_datetime', $value);
-    $entity->save();
-    // Load the entity and ensure the field was saved correctly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
-  }
-
-  /**
-   * Tests setting the value of the DateTimeItem directly.
-   */
-  public function testSetValueProperty() {
-    // Test Date::setValue().
-    $entity = entity_create('entity_test');
-    $value = '2014-01-01T20:00:00Z';
-
-    $entity->set('field_datetime', $value);
-    $entity->save();
-    // Load the entity and ensure the field was saved correctly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
-  }
-
-}
diff --git a/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php b/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php
index e40868e..ba90110 100644
--- a/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php
+++ b/core/modules/datetime/src/Tests/Views/ArgumentDateTimeTest.php
@@ -138,4 +138,71 @@ public function testDatetimeArgumentAll() {
     $view->destroy();
   }
 
+  /**
+   * Test week WW argument.
+   */
+  public function testDatetimeArgumentWeek() {
+    $view = Views::getView('test_argument_datetime');
+    // The 'embed_4' display has WW argument.
+    $view->setDisplay('embed_4');
+
+    $this->executeView($view, ['41']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $expected[] = ['nid' => $this->nodes[1]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_4');
+    $this->executeView($view, ['01']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+  /**
+   * Test full_date CCYYMMDD argument.
+   */
+  public function testDatetimeArgumentFullDate() {
+    $view = Views::getView('test_argument_datetime');
+    // The 'embed_5' display has CCYYMMDD argument.
+    $view->setDisplay('embed_5');
+
+    $this->executeView($view, ['20001010']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_5');
+    $this->executeView($view, ['20020101']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
+  /**
+   * Test year_month CCYYMM argument.
+   */
+  public function testDatetimeArgumentYearMonth() {
+    $view = Views::getView('test_argument_datetime');
+    // The 'embed_6' display has CCYYMM argument.
+    $view->setDisplay('embed_6');
+
+    $this->executeView($view, ['200010']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[0]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+
+    $view->setDisplay('embed_6');
+    $this->executeView($view, ['200201']);
+    $expected = [];
+    $expected[] = ['nid' => $this->nodes[2]->id()];
+    $this->assertIdenticalResultset($view, $expected, $this->map);
+    $view->destroy();
+  }
+
 }
diff --git a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
index 068f718..208f66e 100644
--- a/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
+++ b/core/modules/datetime/src/Tests/Views/DateTimeHandlerTestBase.php
@@ -8,8 +8,11 @@
 namespace Drupal\datetime\Tests\Views;
 
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\NodeType;
 use Drupal\views\Tests\Handler\HandlerTestBase;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for testing datetime handlers.
@@ -44,19 +47,19 @@ protected function setUp() {
     parent::setUp();
 
     // Add a date field to page nodes.
-    $node_type = entity_create('node_type', [
+    $node_type = NodeType::create([
       'type' => 'page',
       'name' => 'page'
     ]);
     $node_type->save();
-    $fieldStorage = entity_create('field_storage_config', [
+    $fieldStorage = FieldStorageConfig::create([
       'field_name' => static::$field_name,
       'entity_type' => 'node',
       'type' => 'datetime',
       'settings' => ['datetime_type' => DateTimeItem::DATETIME_TYPE_DATETIME],
     ]);
     $fieldStorage->save();
-    $field = entity_create('field_config', [
+    $field = FieldConfig::create([
       'field_storage' => $fieldStorage,
       'bundle' => 'page',
       'required' => TRUE,
diff --git a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml
index 7f3abec..24900e6 100644
--- a/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml
+++ b/core/modules/datetime/tests/modules/datetime_test/test_views/views.view.test_argument_datetime.yml
@@ -97,3 +97,45 @@ display:
     id: embed_2
     display_title: ''
     position: null
+  embed_4:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_day:
+          field: field_date_value_week
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_week
+    display_plugin: embed
+    id: embed_4
+    display_title: ''
+    position: null
+  embed_5:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_day:
+          field: field_date_value_full_date
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_full_date
+    display_plugin: embed
+    id: embed_5
+    display_title: ''
+    position: null
+  embed_6:
+    display_options:
+      defaults:
+        arguments: false
+      arguments:
+        field_date_value_day:
+          field: field_date_value_year_month
+          id: field_date_value
+          table: node__field_date
+          plugin_id: datetime_year_month
+    display_plugin: embed
+    id: embed_6
+    display_title: ''
+    position: null
diff --git a/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php b/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
new file mode 100644
index 0000000..0bf8d68
--- /dev/null
+++ b/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\datetime\Kernel\DateTimeItemTest.
+ */
+
+namespace Drupal\Tests\datetime\Kernel;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the date field type.
+ *
+ * @group datetime
+ */
+class DateTimeItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('datetime');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a field with settings to validate.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_datetime',
+      'type' => 'datetime',
+      'entity_type' => 'entity_test',
+      'settings' => array('datetime_type' => 'date'),
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+      'settings' => array(
+        'default_value' => 'blank',
+      ),
+    ]);
+    $field->save();
+  }
+
+  /**
+   * Tests using entity fields of the date field type.
+   */
+  public function testDateTimeItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = '2014-01-01T20:00:00Z';
+    $entity->field_datetime = $value;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_datetime->value, $value);
+    $this->assertEqual($entity->field_datetime[0]->value, $value);
+
+    // Verify changing the date value.
+    $new_value = $this->randomMachineName();
+    $entity->field_datetime->value = $new_value;
+    $this->assertEqual($entity->field_datetime->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_datetime->value, $new_value);
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->field_datetime->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+  /**
+   * Tests DateTimeItem::setValue().
+   */
+  public function testSetValue() {
+    // Test DateTimeItem::setValue() using string.
+    $entity = EntityTest::create();
+    $value = '2014-01-01T20:00:00Z';
+    $entity->get('field_datetime')->set(0, $value);
+    $entity->save();
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
+
+    // Test DateTimeItem::setValue() using property array.
+    $entity = EntityTest::create();
+    $value = '2014-01-01T20:00:00Z';
+    $entity->set('field_datetime', $value);
+    $entity->save();
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
+  }
+
+  /**
+   * Tests setting the value of the DateTimeItem directly.
+   */
+  public function testSetValueProperty() {
+    // Test Date::setValue().
+    $entity = EntityTest::create();
+    $value = '2014-01-01T20:00:00Z';
+
+    $entity->set('field_datetime', $value);
+    $entity->save();
+    // Load the entity and ensure the field was saved correctly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
+  }
+
+}
diff --git a/core/modules/dblog/dblog.views.inc b/core/modules/dblog/dblog.views.inc
index 1012d6f..dfc1fde 100644
--- a/core/modules/dblog/dblog.views.inc
+++ b/core/modules/dblog/dblog.views.inc
@@ -60,7 +60,7 @@ function dblog_views_data() {
 
   $data['watchdog']['type'] = array(
     'title' => t('Type'),
-    'help' => t('The of the log entry, for example "user" or "page not found.".'),
+    'help' => t('The type of the log entry, for example "user" or "page not found".'),
     'field' => array(
       'id' => 'standard',
     ),
diff --git a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php b/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
deleted file mode 100644
index 62fa234..0000000
--- a/core/modules/dblog/src/Tests/DbLogFormInjectionTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\dblog\Tests\DbLogFormInjectionTest.
- */
-
-namespace Drupal\dblog\Tests;
-
-
-use Drupal\Core\DependencyInjection\DependencySerializationTrait;
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * Tests serializing a form with an injected dblog logger instance.
- *
- * @group dblog
- */
-class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
-
-  use DependencySerializationTrait;
-
-  /**
-   * A Dblog logger instance.
-   *
-   * @var \Psr\Log\LoggerInterface
-   */
-  protected $logger;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'dblog', 'user');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'dblog_test_injection_form';
-  }
-
-  /**
-   * Process callback.
-   *
-   * @param array $element
-   *   Form element
-   *
-   * @return array
-   *   Processed element.
-   */
-  public function process($element) {
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['#process'][] = [$this, 'process'];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setRebuild();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('dblog', ['watchdog']);
-    $this->installSchema('system', ['key_value_expire', 'sequences']);
-    $this->installEntitySchema('user');
-    $this->logger = \Drupal::logger('test_logger');
-    $test_user = User::create(array(
-      'name' => 'foobar',
-      'mail' => 'foobar@example.com',
-    ));
-    $test_user->save();
-    \Drupal::service('current_user')->setAccount($test_user);
-  }
-
-  /**
-   * Tests db log injection serialization.
-   */
-  public function testLoggerSerialization() {
-    $form_state = new FormState();
-
-    // Forms are only serialized during POST requests.
-    $form_state->setRequestMethod('POST');
-    $form_state->setCached();
-    $form_builder = $this->container->get('form_builder');
-    $form_id = $form_builder->getFormId($this, $form_state);
-    $form = $form_builder->retrieveForm($form_id, $form_state);
-    $form_builder->prepareForm($form_id, $form, $form_state);
-    $form_builder->processForm($form_id, $form, $form_state);
-  }
-
-}
diff --git a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
deleted file mode 100644
index fc99859..0000000
--- a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\dblog\Tests\Migrate\d6\MigrateDblogConfigsTest.
- */
-
-namespace Drupal\dblog\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to dblog.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['dblog'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_dblog_settings');
-  }
-
-  /**
-   * Tests migration of dblog variables to dblog.settings.yml.
-   */
-  public function testBookSettings() {
-    $config = $this->config('dblog.settings');
-    $this->assertIdentical(10000, $config->get('row_limit'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
deleted file mode 100644
index b29832b..0000000
--- a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\dblog\Tests\Migrate\d7\MigrateDblogConfigsTest.
- */
-
-namespace Drupal\dblog\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Upgrade variables to dblog.settings.yml.
- *
- * @group migrate_drupal_7
- */
-class MigrateDblogConfigsTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['dblog'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_dblog_settings');
-  }
-
-  /**
-   * Tests migration of dblog variables to dblog.settings.yml.
-   */
-  public function testDblogSettings() {
-    $config = $this->config('dblog.settings');
-    $this->assertIdentical(10000, $config->get('row_limit'));
-  }
-
-}
diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
deleted file mode 100644
index 50659ae..0000000
--- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\dblog\Tests\Views\ViewsIntegrationTest.
- */
-
-namespace Drupal\dblog\Tests\Views;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Logger\RfcLogLevel;
-use Drupal\Core\Url;
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests the views integration of dblog module.
- *
- * @group dblog
- */
-class ViewsIntegrationTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_dblog');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('dblog', 'dblog_test_views', 'user');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Rebuild the router, otherwise we can't generate links.
-    $this->container->get('router.builder')->rebuild();
-
-    $this->installSchema('dblog', array('watchdog'));
-
-    ViewTestData::createTestViews(get_class($this), array('dblog_test_views'));
-  }
-
-  /**
-   * Tests the integration.
-   */
-  public function testIntegration() {
-
-    // Remove the watchdog entries added by the potential batch process.
-    $this->container->get('database')->truncate('watchdog')->execute();
-
-    $entries = array();
-    // Setup a watchdog entry without tokens.
-    $entries[] = array(
-      'message' => $this->randomMachineName(),
-      'variables' => array('link' => \Drupal::l('Link', new Url('<front>'))),
-    );
-    // Setup a watchdog entry with one token.
-    $entries[] = array(
-      'message' => '@token1',
-      'variables' => array('@token1' => $this->randomMachineName(), 'link' => \Drupal::l('Link', new Url('<front>'))),
-    );
-    // Setup a watchdog entry with two tokens.
-    $entries[] = array(
-      'message' => '@token1 @token2',
-      // Setup a link with a tag which is filtered by
-      // \Drupal\Component\Utility\Xss::filterAdmin() in order to make sure
-      // that strings which are not marked as safe get filtered.
-      'variables' => array(
-        '@token1' => $this->randomMachineName(),
-        '@token2' => $this->randomMachineName(),
-        'link' => '<a href="' . \Drupal::url('<front>') . '"><object>Link</object></a>',
-      ),
-    );
-    $logger_factory = $this->container->get('logger.factory');
-    foreach ($entries as $entry) {
-      $entry += array(
-        'type' => 'test-views',
-        'severity' => RfcLogLevel::NOTICE,
-      );
-      $logger_factory->get($entry['type'])->log($entry['severity'], $entry['message'], $entry['variables']);
-    }
-
-    $view = Views::getView('test_dblog');
-    $this->executeView($view);
-    $view->initStyle();
-
-    foreach ($entries as $index => $entry) {
-      $this->assertEqual($view->style_plugin->getField($index, 'message'), SafeMarkup::format($entry['message'], $entry['variables']));
-      $link_field = $view->style_plugin->getField($index, 'link');
-      // The 3rd entry contains some unsafe markup that needs to get filtered.
-      if ($index == 2) {
-        // Make sure that unsafe link differs from the rendered link, so we know
-        // that some filtering actually happened.
-        $this->assertNotEqual($link_field, $entry['variables']['link']);
-      }
-      $this->assertEqual($link_field, Xss::filterAdmin($entry['variables']['link']));
-    }
-
-    // Disable replacing variables and check that the tokens aren't replaced.
-    $view->destroy();
-    $view->storage->invalidateCaches();
-    $view->initHandlers();
-    $this->executeView($view);
-    $view->initStyle();
-    $view->field['message']->options['replace_variables'] = FALSE;
-    foreach ($entries as $index => $entry) {
-      $this->assertEqual($view->style_plugin->getField($index, 'message'), $entry['message']);
-    }
-  }
-
-}
diff --git a/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php b/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
new file mode 100644
index 0000000..ffded0b
--- /dev/null
+++ b/core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\dblog\Kernel\DbLogFormInjectionTest.
+ */
+
+namespace Drupal\Tests\dblog\Kernel;
+
+
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests serializing a form with an injected dblog logger instance.
+ *
+ * @group dblog
+ */
+class DbLogFormInjectionTest extends KernelTestBase implements FormInterface {
+
+  use DependencySerializationTrait;
+
+  /**
+   * A Dblog logger instance.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $logger;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'dblog', 'user');
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'dblog_test_injection_form';
+  }
+
+  /**
+   * Process callback.
+   *
+   * @param array $element
+   *   Form element
+   *
+   * @return array
+   *   Processed element.
+   */
+  public function process($element) {
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['#process'][] = [$this, 'process'];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $form_state->setRebuild();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('dblog', ['watchdog']);
+    $this->installSchema('system', ['key_value_expire', 'sequences']);
+    $this->installEntitySchema('user');
+    $this->logger = \Drupal::logger('test_logger');
+    $test_user = User::create(array(
+      'name' => 'foobar',
+      'mail' => 'foobar@example.com',
+    ));
+    $test_user->save();
+    \Drupal::service('current_user')->setAccount($test_user);
+  }
+
+  /**
+   * Tests db log injection serialization.
+   */
+  public function testLoggerSerialization() {
+    $form_state = new FormState();
+
+    // Forms are only serialized during POST requests.
+    $form_state->setRequestMethod('POST');
+    $form_state->setCached();
+    $form_builder = $this->container->get('form_builder');
+    $form_id = $form_builder->getFormId($this, $form_state);
+    $form = $form_builder->retrieveForm($form_id, $form_state);
+    $form_builder->prepareForm($form_id, $form, $form_state);
+    $form_builder->processForm($form_id, $form, $form_state);
+  }
+
+}
diff --git a/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
new file mode 100644
index 0000000..f391cff
--- /dev/null
+++ b/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\dblog\Kernel\Migrate\d6\MigrateDblogConfigsTest.
+ */
+
+namespace Drupal\Tests\dblog\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to dblog.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_dblog_settings');
+  }
+
+  /**
+   * Tests migration of dblog variables to dblog.settings.yml.
+   */
+  public function testBookSettings() {
+    $config = $this->config('dblog.settings');
+    $this->assertIdentical(10000, $config->get('row_limit'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php b/core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php
new file mode 100644
index 0000000..dc6223f
--- /dev/null
+++ b/core/modules/dblog/tests/src/Kernel/Migrate/d7/MigrateDblogConfigsTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\dblog\Kernel\Migrate\d7\MigrateDblogConfigsTest.
+ */
+
+namespace Drupal\Tests\dblog\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to dblog.settings.yml.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateDblogConfigsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['dblog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_dblog_settings');
+  }
+
+  /**
+   * Tests migration of dblog variables to dblog.settings.yml.
+   */
+  public function testDblogSettings() {
+    $config = $this->config('dblog.settings');
+    $this->assertIdentical(10000, $config->get('row_limit'));
+  }
+
+}
diff --git a/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
new file mode 100644
index 0000000..483df9c
--- /dev/null
+++ b/core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\dblog\Kernel\Views\ViewsIntegrationTest.
+ */
+
+namespace Drupal\Tests\dblog\Kernel\Views;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Logger\RfcLogLevel;
+use Drupal\Core\Url;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Tests the views integration of dblog module.
+ *
+ * @group dblog
+ */
+class ViewsIntegrationTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_dblog');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('dblog', 'dblog_test_views', 'user');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    // Rebuild the router, otherwise we can't generate links.
+    $this->container->get('router.builder')->rebuild();
+
+    $this->installSchema('dblog', array('watchdog'));
+
+    ViewTestData::createTestViews(get_class($this), array('dblog_test_views'));
+  }
+
+  /**
+   * Tests the integration.
+   */
+  public function testIntegration() {
+
+    // Remove the watchdog entries added by the potential batch process.
+    $this->container->get('database')->truncate('watchdog')->execute();
+
+    $entries = array();
+    // Setup a watchdog entry without tokens.
+    $entries[] = array(
+      'message' => $this->randomMachineName(),
+      'variables' => array('link' => \Drupal::l('Link', new Url('<front>'))),
+    );
+    // Setup a watchdog entry with one token.
+    $entries[] = array(
+      'message' => '@token1',
+      'variables' => array('@token1' => $this->randomMachineName(), 'link' => \Drupal::l('Link', new Url('<front>'))),
+    );
+    // Setup a watchdog entry with two tokens.
+    $entries[] = array(
+      'message' => '@token1 @token2',
+      // Setup a link with a tag which is filtered by
+      // \Drupal\Component\Utility\Xss::filterAdmin() in order to make sure
+      // that strings which are not marked as safe get filtered.
+      'variables' => array(
+        '@token1' => $this->randomMachineName(),
+        '@token2' => $this->randomMachineName(),
+        'link' => '<a href="' . \Drupal::url('<front>') . '"><object>Link</object></a>',
+      ),
+    );
+    $logger_factory = $this->container->get('logger.factory');
+    foreach ($entries as $entry) {
+      $entry += array(
+        'type' => 'test-views',
+        'severity' => RfcLogLevel::NOTICE,
+      );
+      $logger_factory->get($entry['type'])->log($entry['severity'], $entry['message'], $entry['variables']);
+    }
+
+    $view = Views::getView('test_dblog');
+    $this->executeView($view);
+    $view->initStyle();
+
+    foreach ($entries as $index => $entry) {
+      $this->assertEqual($view->style_plugin->getField($index, 'message'), SafeMarkup::format($entry['message'], $entry['variables']));
+      $link_field = $view->style_plugin->getField($index, 'link');
+      // The 3rd entry contains some unsafe markup that needs to get filtered.
+      if ($index == 2) {
+        // Make sure that unsafe link differs from the rendered link, so we know
+        // that some filtering actually happened.
+        $this->assertNotEqual($link_field, $entry['variables']['link']);
+      }
+      $this->assertEqual($link_field, Xss::filterAdmin($entry['variables']['link']));
+    }
+
+    // Disable replacing variables and check that the tokens aren't replaced.
+    $view->destroy();
+    $view->storage->invalidateCaches();
+    $view->initHandlers();
+    $this->executeView($view);
+    $view->initStyle();
+    $view->field['message']->options['replace_variables'] = FALSE;
+    foreach ($entries as $index => $entry) {
+      $this->assertEqual($view->style_plugin->getField($index, 'message'), $entry['message']);
+    }
+  }
+
+}
diff --git a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
index 7602b4d..4b1b291 100644
--- a/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
+++ b/core/modules/dynamic_page_cache/src/EventSubscriber/DynamicPageCacheSubscriber.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Cache\CacheableResponseInterface;
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Render\RenderCacheInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
@@ -41,14 +40,6 @@
 class DynamicPageCacheSubscriber implements EventSubscriberInterface {
 
   /**
-   * Attribute name of the Dynamic Page Cache request policy result.
-   *
-   * @see onRouteMatch()
-   * @see onRespond()
-   */
-  const ATTRIBUTE_REQUEST_POLICY_RESULT = '_dynamic_page_cache_request_policy_result';
-
-  /**
    * Name of Dynamic Page Cache's response header.
    */
   const HEADER = 'X-Drupal-Dynamic-Cache';
@@ -104,6 +95,13 @@ class DynamicPageCacheSubscriber implements EventSubscriberInterface {
   ];
 
   /**
+   * Internal cache of request policy results.
+   *
+   * @var \SplObjectStorage
+   */
+  protected $requestPolicyResults;
+
+  /**
    * Constructs a new DynamicPageCacheSubscriber object.
    *
    * @param \Drupal\Core\PageCache\RequestPolicyInterface $request_policy
@@ -120,6 +118,7 @@ public function __construct(RequestPolicyInterface $request_policy, ResponsePoli
     $this->responsePolicy = $response_policy;
     $this->renderCache = $render_cache;
     $this->rendererConfig = $renderer_config;
+    $this->requestPolicyResults = new \SplObjectStorage();
   }
 
   /**
@@ -134,7 +133,7 @@ public function onRouteMatch(GetResponseEvent $event) {
     // does not have to redo the request policy check.
     $request = $event->getRequest();
     $request_policy_result = $this->requestPolicy->check($request);
-    $request->attributes->set(self::ATTRIBUTE_REQUEST_POLICY_RESULT, $request_policy_result);
+    $this->requestPolicyResults[$request] = $request_policy_result;
     if ($request_policy_result === RequestPolicyInterface::DENY) {
       return;
     }
@@ -189,14 +188,14 @@ public function onResponse(FilterResponseEvent $event) {
     // @see \Drupal\Core\Routing\AccessAwareRouter::checkAccess()
     // @see \Drupal\Core\EventSubscriber\DefaultExceptionHtmlSubscriber::on403()
     $request = $event->getRequest();
-    if (!$request->attributes->has(self::ATTRIBUTE_REQUEST_POLICY_RESULT)) {
+    if (!isset($this->requestPolicyResults[$request])) {
       return;
     }
 
     // Don't cache the response if the Dynamic Page Cache request & response
     // policies are not met.
     // @see onRouteMatch()
-    if ($request->attributes->get(self::ATTRIBUTE_REQUEST_POLICY_RESULT) === RequestPolicyInterface::DENY || $this->responsePolicy->check($response, $request) === ResponsePolicyInterface::DENY) {
+    if ($this->requestPolicyResults[$request] === RequestPolicyInterface::DENY || $this->responsePolicy->check($response, $request) === ResponsePolicyInterface::DENY) {
       return;
     }
 
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 8468caa..01d5c5e 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -178,10 +178,10 @@ function editor_form_filter_admin_format_editor_configure($form, FormStateInterf
     }
     elseif (empty($editor) || $editor_value !== $editor->getEditor()) {
       $format = $form_state->getFormObject()->getEntity();
-      $editor = entity_create('editor', array(
+      $editor = Editor::create([
         'format' => $format->isNew() ? NULL : $format->id(),
         'editor' => $editor_value,
-      ));
+      ]);
       $form_state->set('editor', $editor);
     }
   }
diff --git a/core/modules/editor/js/editor.formattedTextEditor.js b/core/modules/editor/js/editor.formattedTextEditor.js
index 3efbaa2..fec73e0 100644
--- a/core/modules/editor/js/editor.formattedTextEditor.js
+++ b/core/modules/editor/js/editor.formattedTextEditor.js
@@ -11,7 +11,7 @@
  *  - Drupal.editors.magical.attachInlineEditor()
  */
 
-(function ($, Drupal, drupalSettings) {
+(function ($, Drupal, drupalSettings, _) {
 
   'use strict';
 
@@ -228,4 +228,4 @@
 
   });
 
-})(jQuery, Drupal, drupalSettings);
+})(jQuery, Drupal, drupalSettings, _);
diff --git a/core/modules/editor/src/Tests/EditorAdminTest.php b/core/modules/editor/src/Tests/EditorAdminTest.php
index bc25912..8172f30 100644
--- a/core/modules/editor/src/Tests/EditorAdminTest.php
+++ b/core/modules/editor/src/Tests/EditorAdminTest.php
@@ -38,7 +38,7 @@ protected function setUp() {
     parent::setUp();
 
     // Add text format.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
diff --git a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php b/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php
deleted file mode 100644
index 87809ef..0000000
--- a/core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\editor\Tests\EditorFileReferenceFilterTest.
- */
-
-namespace Drupal\editor\Tests;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\filter\FilterPluginCollection;
-
-/**
- * Tests Editor module's file reference filter.
- *
- * @group editor
- */
-class EditorFileReferenceFilterTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'filter', 'editor', 'field', 'file', 'user');
-
-  /**
-   * @var \Drupal\filter\Plugin\FilterInterface[]
-   */
-  protected $filters;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('system'));
-    $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
-
-    $manager = $this->container->get('plugin.manager.filter');
-    $bag = new FilterPluginCollection($manager, array());
-    $this->filters = $bag->getAll();
-  }
-
-  /**
-   * Tests the editor file reference filter.
-   */
-  function testEditorFileReferenceFilter() {
-    $filter = $this->filters['editor_file_reference'];
-
-    $test = function($input) use ($filter) {
-      return $filter->process($input, 'und');
-    };
-
-    file_put_contents('public://llama.jpg', $this->randomMachineName());
-    $image = entity_create('file', array('uri' => 'public://llama.jpg'));
-    $image->save();
-    $id = $image->id();
-    $uuid = $image->uuid();
-    $cache_tag = ['file:' . $id];
-
-    file_put_contents('public://alpaca.jpg', $this->randomMachineName());
-    $image_2 = entity_create('file', array('uri' => 'public://alpaca.jpg'));
-    $image_2->save();
-    $id_2 = $image_2->id();
-    $uuid_2 = $image_2->uuid();
-    $cache_tag_2 = ['file:' . $id_2];
-
-    $this->pass('No data-entity-type and no data-entity-uuid attribute.');
-    $input = '<img src="llama.jpg" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-
-    $this->pass('A non-file data-entity-type attribute value.');
-    $input = '<img src="llama.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-
-    $this->pass('One data-entity-uuid attribute.');
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual($cache_tag, $output->getCacheTags());
-
-    $this->pass('One data-entity-uuid attribute with odd capitalization.');
-    $input = '<img src="llama.jpg" data-entity-type="file" DATA-entity-UUID =   "' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual($cache_tag, $output->getCacheTags());
-
-    $this->pass('One data-entity-uuid attribute on a non-image tag.');
-    $input = '<video src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual($cache_tag, $output->getCacheTags());
-
-    $this->pass('One data-entity-uuid attribute with an invalid value.');
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="invalid-' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual(array(), $output->getCacheTags());
-
-    $this->pass('Two different data-entity-uuid attributes.');
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $input .= '<img src="alpaca.jpg" data-entity-type="file" data-entity-uuid="' . $uuid_2 . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual(Cache::mergeTags($cache_tag, $cache_tag_2), $output->getCacheTags());
-
-    $this->pass('Two identical  data-entity-uuid attributes.');
-    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $input .= '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
-    $output = $test($input);
-    $this->assertIdentical($input, $output->getProcessedText());
-    $this->assertEqual($cache_tag, $output->getCacheTags());
-  }
-
-}
diff --git a/core/modules/editor/src/Tests/EditorFileUsageTest.php b/core/modules/editor/src/Tests/EditorFileUsageTest.php
deleted file mode 100644
index 6e291d4..0000000
--- a/core/modules/editor/src/Tests/EditorFileUsageTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\editor\Tests\EditorFileUsageTest.
- */
-
-namespace Drupal\editor\Tests;
-
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-
-/**
- * Tests tracking of file usage by the Text Editor module.
- *
- * @group editor
- */
-class EditorFileUsageTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('editor', 'editor_test', 'node', 'file');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('file', array('file_usage'));
-    $this->installConfig(['node']);
-
-    // Add text formats.
-    $filtered_html_format = entity_create('filter_format', array(
-      'format' => 'filtered_html',
-      'name' => 'Filtered HTML',
-      'weight' => 0,
-      'filters' => array(),
-    ));
-    $filtered_html_format->save();
-
-    // Set cardinality for body field.
-    FieldStorageConfig::loadByName('node', 'body')
-      ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
-      ->save();
-
-    // Set up text editor.
-    $editor = entity_create('editor', array(
-      'format' => 'filtered_html',
-      'editor' => 'unicorn',
-    ));
-    $editor->save();
-
-    // Create a node type for testing.
-    $type = entity_create('node_type', array('type' => 'page', 'name' => 'page'));
-    $type->save();
-    node_add_body_field($type);
-  }
-
-  /**
-   * Tests the configurable text editor manager.
-   */
-  public function testEditorEntityHooks() {
-    $image_paths = array(
-      0 => 'core/misc/druplicon.png',
-      1 => 'core/misc/tree.png',
-      2 => 'core/misc/help.png',
-    );
-
-    $image_entities = array();
-    foreach ($image_paths as $key => $image_path) {
-      $image = entity_create('file');
-      $image->setFileUri($image_path);
-      $image->setFilename(drupal_basename($image->getFileUri()));
-      $image->save();
-
-      $file_usage = $this->container->get('file.usage');
-      $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image ' . $image_paths[$key] . ' has zero usages.');
-
-      $image_entities[] = $image;
-    }
-
-    $body = array();
-    foreach ($image_entities as $key => $image_entity) {
-      // Don't be rude, say hello.
-      $body_value = '<p>Hello, world!</p>';
-      // Test handling of a valid image entry.
-      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="' . $image_entity->uuid() . '" />';
-      // Test handling of an invalid data-entity-uuid attribute.
-      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="invalid-entity-uuid-value" />';
-      // Test handling of an invalid data-entity-type attribute.
-      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $image_entity->uuid() . '" />';
-      // Test handling of a non-existing UUID.
-      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="30aac704-ba2c-40fc-b609-9ed121aa90f4" />';
-
-      $body[] = array(
-        'value' => $body_value,
-        'format' => 'filtered_html',
-      );
-    }
-
-    // Test editor_entity_insert(): increment.
-    $this->createUser();
-    $node = entity_create('node', array(
-      'type' => 'page',
-      'title' => 'test',
-      'body' => $body,
-      'uid' => 1,
-    ));
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '1'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 1 usage.');
-    }
-
-    // Test editor_entity_update(): increment, twice, by creating new revisions.
-    $node->setNewRevision(TRUE);
-    $node->save();
-    $second_revision_id = $node->getRevisionId();
-    $node->setNewRevision(TRUE);
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
-    }
-
-    // Test hook_entity_update(): decrement, by modifying the last revision:
-    // remove the data-entity-type attribute from the body field.
-    $original_values = array();
-    for ($i = 0; $i < count($image_entities); $i++) {
-      $original_value = $node->body[$i]->value;
-      $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
-      $node->body[$i]->value = $new_value;
-      $original_values[$i] = $original_value;
-    }
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
-    }
-
-    // Test editor_entity_update(): increment again by creating a new revision:
-    // read the data- attributes to the body field.
-    $node->setNewRevision(TRUE);
-    foreach ($original_values as $key => $original_value) {
-      $node->body[$key]->value = $original_value;
-    }
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
-    }
-
-    // Test hook_entity_update(): decrement, by modifying the last revision:
-    // remove the data-entity-uuid attribute from the body field.
-    foreach ($original_values as $key => $original_value) {
-      $original_value = $node->body[$key]->value;
-      $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
-      $node->body[$key]->value = $new_value;
-    }
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
-    }
-
-    // Test hook_entity_update(): increment, by modifying the last revision:
-    // read the data- attributes to the body field.
-    foreach ($original_values as $key => $original_value) {
-      $node->body[$key]->value = $original_value;
-    }
-    $node->save();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
-    }
-
-    // Test editor_entity_revision_delete(): decrement, by deleting a revision.
-    entity_revision_delete('node', $second_revision_id);
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
-    }
-
-    // Test editor_entity_delete().
-    $node->delete();
-    foreach ($image_entities as $key => $image_entity) {
-      $this->assertIdentical(array(), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has zero usages again.');
-    }
-  }
-
-}
diff --git a/core/modules/editor/src/Tests/EditorImageDialogTest.php b/core/modules/editor/src/Tests/EditorImageDialogTest.php
deleted file mode 100644
index b1745b0..0000000
--- a/core/modules/editor/src/Tests/EditorImageDialogTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\editor\Tests\EditorImageDialogTest.
- */
-
-namespace Drupal\editor\Tests;
-
-use Drupal\Core\Form\FormState;
-use Drupal\editor\Entity\Editor;
-use Drupal\editor\Form\EditorImageDialog;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\node\Entity\NodeType;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests EditorImageDialog validation and conversion functionality.
- *
- * @group editor
- */
-class EditorImageDialogTest extends EntityUnitTestBase {
-
-  /**
-   * Filter format for testing.
-   *
-   * @var \Drupal\filter\FilterFormatInterface
-   */
-  protected $format;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'file', 'editor', 'editor_test', 'user', 'system'];
-
-  /**
-   * Sets up the test.
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-    $this->installSchema('system', ['router', 'key_value_expire']);
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('file', array('file_usage'));
-    $this->installConfig(['node']);
-
-    // Add text formats.
-    $this->format = FilterFormat::create([
-      'format' => 'filtered_html',
-      'name' => 'Filtered HTML',
-      'weight' => 0,
-      'filters' => [
-        'filter_align' => ['status' => TRUE],
-        'filter_caption' => ['status' => TRUE],
-      ],
-    ]);
-    $this->format->save();
-
-    // Set up text editor.
-    $editor = Editor::create([
-      'format' => 'filtered_html',
-      'editor' => 'unicorn',
-      'image_upload' => [
-        'max_size' => 100,
-        'scheme' => 'public',
-        'directory' => '',
-        'status' => TRUE,
-      ],
-    ]);
-    $editor->save();
-
-    // Create a node type for testing.
-    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
-    $type->save();
-    node_add_body_field($type);
-    $this->installEntitySchema('user');
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests that editor image dialog works as expected.
-   */
-  public function testEditorImageDialog() {
-    $input = [
-      'editor_object' => [
-        'src' => '/sites/default/files/inline-images/somefile.png',
-        'alt' => 'fda',
-        'width' => '',
-        'height' => '',
-        'data-entity-type' => 'file',
-        'data-entity-uuid' => 'some-uuid',
-        'data-align' => 'none',
-        'hasCaption' => 'false',
-      ],
-      'dialogOptions' => [
-        'title' => 'Edit Image',
-        'dialogClass' => 'editor-image-dialog',
-        'autoResize' => 'true',
-      ],
-      '_drupal_ajax' => '1',
-      'ajax_page_state' => [
-        'theme' => 'bartik',
-        'theme_token' => 'some-token',
-        'libraries' => '',
-      ],
-    ];
-    $form_state = (new FormState())
-      ->setRequestMethod('POST')
-      ->setUserInput($input)
-      ->addBuildInfo('args', [$this->format]);
-
-    $form_builder = $this->container->get('form_builder');
-    $form_object = new EditorImageDialog(\Drupal::entityManager()->getStorage('file'));
-    $form_id = $form_builder->getFormId($form_object, $form_state);
-    $form = $form_builder->retrieveForm($form_id, $form_state);
-    $form_builder->prepareForm($form_id, $form, $form_state);
-    $form_builder->processForm($form_id, $form, $form_state);
-
-    // Assert these two values are present and we don't get the 'not-this'
-    // default back.
-    $this->assertEqual(FALSE, $form_state->getValue(['attributes', 'hasCaption'], 'not-this'));
-  }
-
-}
diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php
index 002ccd3..e6f3f55 100644
--- a/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/src/Tests/EditorLoadingTest.php
@@ -7,10 +7,11 @@
 
 namespace Drupal\editor\Tests;
 
-use Drupal\Core\Entity\Entity;
+use Drupal\editor\Entity\Editor;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests loading of text editors.
@@ -55,14 +56,14 @@ protected function setUp() {
     \Drupal::service('plugin.manager.editor')->clearCachedDefinitions();
 
     // Add text formats.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
       'filters' => array(),
     ));
     $filtered_html_format->save();
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -113,7 +114,7 @@ protected function setUp() {
    */
   public function testLoading() {
     // Only associate a text editor with the "Full HTML" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'full_html',
       'editor' => 'unicorn',
       'image_upload' => array(
@@ -123,7 +124,7 @@ public function testLoading() {
         'max_size' => '',
         'max_dimensions' => array('width' => '', 'height' => ''),
       )
-    ));
+    ]);
     $editor->save();
 
     // The normal user:
@@ -166,10 +167,10 @@ public function testLoading() {
     $this->drupalLogout($this->privilegedUser);
 
     // Also associate a text editor with the "Plain Text" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'plain_text',
       'editor' => 'unicorn',
-    ));
+    ]);
     $editor->save();
 
     // The untrusted user:
@@ -221,7 +222,7 @@ public function testLoading() {
    */
   public function testSupportedElementTypes() {
     // Associate the unicorn text editor with the "Full HTML" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'full_html',
       'editor' => 'unicorn',
       'image_upload' => array(
@@ -231,7 +232,7 @@ public function testSupportedElementTypes() {
         'max_size' => '',
         'max_dimensions' => array('width' => '', 'height' => ''),
       )
-    ));
+    ]);
     $editor->save();
 
     // Create an "page" node that uses the full_html text format.
@@ -255,10 +256,10 @@ public function testSupportedElementTypes() {
 
     // Associate the trex text editor with the "Full HTML" text format.
     $editor->delete();
-    entity_create('editor', array(
+    Editor::create([
       'format' => 'full_html',
       'editor' => 'trex',
-    ))->save();
+    ])->save();
 
     $this->drupalGet('node/1/edit');
     list( , $editor_settings_present, $editor_js_present, $field, $format_selector) = $this->getThingsToCheck('field-text', 'input');
diff --git a/core/modules/editor/src/Tests/EditorManagerTest.php b/core/modules/editor/src/Tests/EditorManagerTest.php
deleted file mode 100644
index 9bb7a67..0000000
--- a/core/modules/editor/src/Tests/EditorManagerTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\editor\Tests\EditorManagerTest.
- */
-
-namespace Drupal\editor\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests detection of text editors and correct generation of attachments.
- *
- * @group editor
- */
-class EditorManagerTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'filter', 'editor');
-
-  /**
-   * The manager for text editor plugins.
-   *
-   * @var \Drupal\Component\Plugin\PluginManagerInterface
-   */
-  protected $editorManager;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Install the Filter module.
-    $this->installSchema('system', 'url_alias');
-
-    // Add text formats.
-    $filtered_html_format = entity_create('filter_format', array(
-      'format' => 'filtered_html',
-      'name' => 'Filtered HTML',
-      'weight' => 0,
-      'filters' => array(),
-    ));
-    $filtered_html_format->save();
-    $full_html_format = entity_create('filter_format', array(
-      'format' => 'full_html',
-      'name' => 'Full HTML',
-      'weight' => 1,
-      'filters' => array(),
-    ));
-    $full_html_format->save();
-  }
-
-  /**
-   * Tests the configurable text editor manager.
-   */
-  public function testManager() {
-    $this->editorManager = $this->container->get('plugin.manager.editor');
-
-    // Case 1: no text editor available:
-    // - listOptions() should return an empty list of options
-    // - getAttachments() should return an empty #attachments array (and not
-    //   a JS settings structure that is empty)
-    $this->assertIdentical(array(), $this->editorManager->listOptions(), 'When no text editor is enabled, the manager works correctly.');
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when no text editor is enabled and retrieving attachments for zero text formats.');
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'No attachments when no text editor is enabled and retrieving attachments for multiple text formats.');
-
-    // Enable the Text Editor Test module, which has the Unicorn Editor and
-    // clear the editor manager's cache so it is picked up.
-    $this->enableModules(array('editor_test'));
-    $this->editorManager = $this->container->get('plugin.manager.editor');
-    $this->editorManager->clearCachedDefinitions();
-
-    // Case 2: a text editor available.
-    $this->assertIdentical('Unicorn Editor', (string) $this->editorManager->listOptions()['unicorn'], 'When some text editor is enabled, the manager works correctly.');
-
-    // Case 3: a text editor available & associated (but associated only with
-    // the 'Full HTML' text format).
-    $unicorn_plugin = $this->editorManager->createInstance('unicorn');
-    $editor = entity_create('editor', array(
-      'format' => 'full_html',
-      'editor' => 'unicorn',
-    ));
-    $editor->save();
-    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when one text editor is enabled and retrieving attachments for zero text formats.');
-    $expected = array(
-      'library' => array(
-        0 => 'editor_test/unicorn',
-      ),
-      'drupalSettings' => [
-        'editor' => [
-          'formats' => [
-            'full_html' => [
-              'format'  => 'full_html',
-              'editor' => 'unicorn',
-              'editorSettings' => $unicorn_plugin->getJSSettings($editor),
-              'editorSupportsContentFiltering' => TRUE,
-              'isXssSafe' => FALSE,
-            ],
-          ],
-        ],
-      ],
-    );
-    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'Correct attachments when one text editor is enabled and retrieving attachments for multiple text formats.');
-
-    // Case 4: a text editor available associated, but now with its JS settings
-    // being altered via hook_editor_js_settings_alter().
-    \Drupal::state()->set('editor_test_js_settings_alter_enabled', TRUE);
-    $expected['drupalSettings']['editor']['formats']['full_html']['editorSettings']['ponyModeEnabled'] = FALSE;
-    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'hook_editor_js_settings_alter() works correctly.');
-  }
-
-}
diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php
index bb39450..16f2bb6 100644
--- a/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/src/Tests/EditorSecurityTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\editor\Tests;
 
 use Drupal\Component\Serialization\Json;
+use Drupal\editor\Entity\Editor;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests XSS protection for content creators when using text editors.
@@ -86,7 +88,7 @@ protected function setUp() {
     // With text formats 2, 3 and 5, we also associate a text editor that does
     // not guarantee XSS safety. "restricted" means the text format has XSS
     // filters on output, "unrestricted" means the opposite.
-    $format = entity_create('filter_format', array(
+    $format = FilterFormat::create(array(
       'format' => 'restricted_without_editor',
       'name' => 'Restricted HTML, without text editor',
       'weight' => 0,
@@ -101,7 +103,7 @@ protected function setUp() {
       ),
     ));
     $format->save();
-    $format = entity_create('filter_format', array(
+    $format = FilterFormat::create(array(
       'format' => 'restricted_with_editor',
       'name' => 'Restricted HTML, with text editor',
       'weight' => 1,
@@ -116,12 +118,12 @@ protected function setUp() {
       ),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'restricted_with_editor',
       'editor' => 'unicorn',
-    ));
+    ]);
     $editor->save();
-    $format = entity_create('filter_format', array(
+    $format = FilterFormat::create(array(
       'format' => 'restricted_plus_dangerous_tag_with_editor',
       'name' => 'Restricted HTML, dangerous tag allowed, with text editor',
       'weight' => 1,
@@ -136,29 +138,29 @@ protected function setUp() {
       ),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'restricted_plus_dangerous_tag_with_editor',
       'editor' => 'unicorn',
-    ));
+    ]);
     $editor->save();
-    $format = entity_create('filter_format', array(
+    $format = FilterFormat::create(array(
       'format' => 'unrestricted_without_editor',
       'name' => 'Unrestricted HTML, without text editor',
       'weight' => 0,
       'filters' => array(),
     ));
     $format->save();
-    $format = entity_create('filter_format', array(
+    $format = FilterFormat::create(array(
       'format' => 'unrestricted_with_editor',
       'name' => 'Unrestricted HTML, with text editor',
       'weight' => 1,
       'filters' => array(),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => 'unrestricted_with_editor',
       'editor' => 'unicorn',
-    ));
+    ]);
     $editor->save();
 
 
diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php b/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
index 8f4ec18..af5623f 100644
--- a/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
+++ b/core/modules/editor/src/Tests/QuickEditIntegrationLoadingTest.php
@@ -10,6 +10,7 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests Quick Edit module integration endpoints.
@@ -36,7 +37,7 @@ protected function setUp() {
     parent::setUp();
 
     // Create a text format.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
index 188a38b..1b4798b 100644
--- a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
+++ b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
@@ -10,6 +10,8 @@
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\editor\Entity\Editor;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\quickedit\MetadataGenerator;
 use Drupal\quickedit\Tests\QuickEditTestBase;
 use Drupal\quickedit_test\MockEditEntityFieldAccessCheck;
@@ -17,6 +19,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests Edit module integration (Editor module's inline editing support).
@@ -69,7 +72,6 @@ protected function setUp() {
     parent::setUp();
 
     // Install the Filter module.
-    $this->installSchema('system', 'url_alias');
 
     // Create a field.
     $this->fieldName = 'field_textarea';
@@ -86,7 +88,7 @@ protected function setUp() {
     );
 
     // Create text format.
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -95,14 +97,14 @@ protected function setUp() {
     $full_html_format->save();
 
     // Associate text editor with text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create([
       'format' => $full_html_format->id(),
       'editor' => 'unicorn',
-    ));
+    ]);
     $editor->save();
 
     // Also create a text format without an associated text editor.
-    entity_create('filter_format', array(
+    FilterFormat::create(array(
       'format' => 'no_editor',
       'name' => 'No Text Editor',
       'weight' => 2,
@@ -142,7 +144,7 @@ public function testEditorSelection() {
     $this->editorSelector = $this->container->get('quickedit.editor.selector');
 
     // Create an entity with values for this text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$this->fieldName}->value = 'Hello, world!';
     $entity->{$this->fieldName}->format = 'filtered_html';
     $entity->save();
@@ -171,7 +173,7 @@ public function testMetadata() {
     $this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager);
 
     // Create an entity with values for the field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$this->fieldName}->value = 'Test';
     $entity->{$this->fieldName}->format = 'full_html';
     $entity->save();
@@ -208,7 +210,7 @@ public function testAttachments() {
    */
   public function testGetUntransformedTextCommand() {
     // Create an entity with values for the field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$this->fieldName}->value = 'Test';
     $entity->{$this->fieldName}->format = 'full_html';
     $entity->save();
diff --git a/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php b/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
index 5539c16..540ff8c 100644
--- a/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
+++ b/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
@@ -8,8 +8,8 @@
 namespace Drupal\editor_test\Plugin\Editor;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\editor\Entity\Editor;
 use Drupal\editor\Plugin\EditorBase;
-use Drupal\editor\Entity\Editor as EditorEntity;
 
 /**
  * Defines a Tyrannosaurus-Rex powered text editor for testing purposes.
@@ -37,7 +37,7 @@ public function getDefaultSettings() {
   /**
    * {@inheritdoc}
    */
-  public function settingsForm(array $form, FormStateInterface $form_state, EditorEntity $editor) {
+  public function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     $form['stumpy_arms'] = array(
       '#title' => t('Stumpy arms'),
       '#type' => 'checkbox',
@@ -49,7 +49,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
   /**
    * {@inheritdoc}
    */
-  public function getJSSettings(EditorEntity $editor) {
+  public function getJSSettings(Editor $editor) {
     $js_settings = array();
     $settings = $editor->getSettings();
     if ($settings['stumpy_arms']) {
@@ -61,7 +61,7 @@ public function getJSSettings(EditorEntity $editor) {
   /**
    * {@inheritdoc}
    */
-  public function getLibraries(EditorEntity $editor) {
+  public function getLibraries(Editor $editor) {
     return array(
       'editor_test/trex',
     );
diff --git a/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
index e859732..33f1c5a 100644
--- a/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
+++ b/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
@@ -8,8 +8,8 @@
 namespace Drupal\editor_test\Plugin\Editor;
 
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\editor\Entity\Editor;
 use Drupal\editor\Plugin\EditorBase;
-use Drupal\editor\Entity\Editor as EditorEntity;
 
 /**
  * Defines a Unicorn-powered text editor for Drupal (for testing purposes).
@@ -38,7 +38,7 @@ function getDefaultSettings() {
   /**
    * {@inheritdoc}
    */
-  function settingsForm(array $form, FormStateInterface $form_state, EditorEntity $editor) {
+  function settingsForm(array $form, FormStateInterface $form_state, Editor $editor) {
     $form['ponies_too'] = array(
       '#title' => t('Pony mode'),
       '#type' => 'checkbox',
@@ -50,7 +50,7 @@ function settingsForm(array $form, FormStateInterface $form_state, EditorEntity
   /**
    * {@inheritdoc}
    */
-  function getJSSettings(EditorEntity $editor) {
+  function getJSSettings(Editor $editor) {
     $js_settings = array();
     $settings = $editor->getSettings();
     if ($settings['ponies_too']) {
@@ -62,7 +62,7 @@ function getJSSettings(EditorEntity $editor) {
   /**
    * {@inheritdoc}
    */
-  public function getLibraries(EditorEntity $editor) {
+  public function getLibraries(Editor $editor) {
     return array(
       'editor_test/unicorn',
     );
diff --git a/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php b/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
new file mode 100644
index 0000000..ee36393
--- /dev/null
+++ b/core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\editor\Kernel\EditorFileReferenceFilterTest.
+ */
+
+namespace Drupal\Tests\editor\Kernel;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\file\Entity\File;
+use Drupal\filter\FilterPluginCollection;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests Editor module's file reference filter.
+ *
+ * @group editor
+ */
+class EditorFileReferenceFilterTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'filter', 'editor', 'field', 'file', 'user');
+
+  /**
+   * @var \Drupal\filter\Plugin\FilterInterface[]
+   */
+  protected $filters;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('system'));
+    $this->installEntitySchema('file');
+    $this->installSchema('file', array('file_usage'));
+
+    $manager = $this->container->get('plugin.manager.filter');
+    $bag = new FilterPluginCollection($manager, array());
+    $this->filters = $bag->getAll();
+  }
+
+  /**
+   * Tests the editor file reference filter.
+   */
+  function testEditorFileReferenceFilter() {
+    $filter = $this->filters['editor_file_reference'];
+
+    $test = function($input) use ($filter) {
+      return $filter->process($input, 'und');
+    };
+
+    file_put_contents('public://llama.jpg', $this->randomMachineName());
+    $image = File::create(['uri' => 'public://llama.jpg']);
+    $image->save();
+    $id = $image->id();
+    $uuid = $image->uuid();
+    $cache_tag = ['file:' . $id];
+
+    file_put_contents('public://alpaca.jpg', $this->randomMachineName());
+    $image_2 = File::create(['uri' => 'public://alpaca.jpg']);
+    $image_2->save();
+    $id_2 = $image_2->id();
+    $uuid_2 = $image_2->uuid();
+    $cache_tag_2 = ['file:' . $id_2];
+
+    $this->pass('No data-entity-type and no data-entity-uuid attribute.');
+    $input = '<img src="llama.jpg" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+
+    $this->pass('A non-file data-entity-type attribute value.');
+    $input = '<img src="llama.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+
+    $this->pass('One data-entity-uuid attribute.');
+    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual($cache_tag, $output->getCacheTags());
+
+    $this->pass('One data-entity-uuid attribute with odd capitalization.');
+    $input = '<img src="llama.jpg" data-entity-type="file" DATA-entity-UUID =   "' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual($cache_tag, $output->getCacheTags());
+
+    $this->pass('One data-entity-uuid attribute on a non-image tag.');
+    $input = '<video src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual($cache_tag, $output->getCacheTags());
+
+    $this->pass('One data-entity-uuid attribute with an invalid value.');
+    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="invalid-' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual(array(), $output->getCacheTags());
+
+    $this->pass('Two different data-entity-uuid attributes.');
+    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
+    $input .= '<img src="alpaca.jpg" data-entity-type="file" data-entity-uuid="' . $uuid_2 . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual(Cache::mergeTags($cache_tag, $cache_tag_2), $output->getCacheTags());
+
+    $this->pass('Two identical  data-entity-uuid attributes.');
+    $input = '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
+    $input .= '<img src="llama.jpg" data-entity-type="file" data-entity-uuid="' . $uuid . '" />';
+    $output = $test($input);
+    $this->assertIdentical($input, $output->getProcessedText());
+    $this->assertEqual($cache_tag, $output->getCacheTags());
+  }
+
+}
diff --git a/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php b/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
new file mode 100644
index 0000000..c083440
--- /dev/null
+++ b/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
@@ -0,0 +1,192 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\editor\Kernel\EditorFileUsageTest.
+ */
+
+namespace Drupal\Tests\editor\Kernel;
+
+use Drupal\editor\Entity\Editor;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\file\Entity\File;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\filter\Entity\FilterFormat;
+
+/**
+ * Tests tracking of file usage by the Text Editor module.
+ *
+ * @group editor
+ */
+class EditorFileUsageTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('editor', 'editor_test', 'node', 'file');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+    $this->installSchema('node', array('node_access'));
+    $this->installSchema('file', array('file_usage'));
+    $this->installConfig(['node']);
+
+    // Add text formats.
+    $filtered_html_format = FilterFormat::create(array(
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => array(),
+    ));
+    $filtered_html_format->save();
+
+    // Set cardinality for body field.
+    FieldStorageConfig::loadByName('node', 'body')
+      ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
+      ->save();
+
+    // Set up text editor.
+    $editor = Editor::create([
+      'format' => 'filtered_html',
+      'editor' => 'unicorn',
+    ]);
+    $editor->save();
+
+    // Create a node type for testing.
+    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
+    $type->save();
+    node_add_body_field($type);
+  }
+
+  /**
+   * Tests the configurable text editor manager.
+   */
+  public function testEditorEntityHooks() {
+    $image_paths = array(
+      0 => 'core/misc/druplicon.png',
+      1 => 'core/misc/tree.png',
+      2 => 'core/misc/help.png',
+    );
+
+    $image_entities = array();
+    foreach ($image_paths as $key => $image_path) {
+      $image = File::create();
+      $image->setFileUri($image_path);
+      $image->setFilename(drupal_basename($image->getFileUri()));
+      $image->save();
+
+      $file_usage = $this->container->get('file.usage');
+      $this->assertIdentical(array(), $file_usage->listUsage($image), 'The image ' . $image_paths[$key] . ' has zero usages.');
+
+      $image_entities[] = $image;
+    }
+
+    $body = array();
+    foreach ($image_entities as $key => $image_entity) {
+      // Don't be rude, say hello.
+      $body_value = '<p>Hello, world!</p>';
+      // Test handling of a valid image entry.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="' . $image_entity->uuid() . '" />';
+      // Test handling of an invalid data-entity-uuid attribute.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="invalid-entity-uuid-value" />';
+      // Test handling of an invalid data-entity-type attribute.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="invalid-entity-type-value" data-entity-uuid="' . $image_entity->uuid() . '" />';
+      // Test handling of a non-existing UUID.
+      $body_value .= '<img src="awesome-llama-' . $key . '.jpg" data-entity-type="file" data-entity-uuid="30aac704-ba2c-40fc-b609-9ed121aa90f4" />';
+
+      $body[] = array(
+        'value' => $body_value,
+        'format' => 'filtered_html',
+      );
+    }
+
+    // Test editor_entity_insert(): increment.
+    $this->createUser();
+    $node = $node = Node::create([
+      'type' => 'page',
+      'title' => 'test',
+      'body' => $body,
+      'uid' => 1,
+    ]);
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '1'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 1 usage.');
+    }
+
+    // Test editor_entity_update(): increment, twice, by creating new revisions.
+    $node->setNewRevision(TRUE);
+    $node->save();
+    $second_revision_id = $node->getRevisionId();
+    $node->setNewRevision(TRUE);
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+    }
+
+    // Test hook_entity_update(): decrement, by modifying the last revision:
+    // remove the data-entity-type attribute from the body field.
+    $original_values = array();
+    for ($i = 0; $i < count($image_entities); $i++) {
+      $original_value = $node->body[$i]->value;
+      $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
+      $node->body[$i]->value = $new_value;
+      $original_values[$i] = $original_value;
+    }
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+    }
+
+    // Test editor_entity_update(): increment again by creating a new revision:
+    // read the data- attributes to the body field.
+    $node->setNewRevision(TRUE);
+    foreach ($original_values as $key => $original_value) {
+      $node->body[$key]->value = $original_value;
+    }
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+    }
+
+    // Test hook_entity_update(): decrement, by modifying the last revision:
+    // remove the data-entity-uuid attribute from the body field.
+    foreach ($original_values as $key => $original_value) {
+      $original_value = $node->body[$key]->value;
+      $new_value = str_replace('data-entity-type', 'data-entity-type-modified', $original_value);
+      $node->body[$key]->value = $new_value;
+    }
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+    }
+
+    // Test hook_entity_update(): increment, by modifying the last revision:
+    // read the data- attributes to the body field.
+    foreach ($original_values as $key => $original_value) {
+      $node->body[$key]->value = $original_value;
+    }
+    $node->save();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '3'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 3 usages.');
+    }
+
+    // Test editor_entity_revision_delete(): decrement, by deleting a revision.
+    entity_revision_delete('node', $second_revision_id);
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array('editor' => array('node' => array(1 => '2'))), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has 2 usages.');
+    }
+
+    // Test editor_entity_delete().
+    $node->delete();
+    foreach ($image_entities as $key => $image_entity) {
+      $this->assertIdentical(array(), $file_usage->listUsage($image_entity), 'The image ' . $image_paths[$key] . ' has zero usages again.');
+    }
+  }
+
+}
diff --git a/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php b/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
new file mode 100644
index 0000000..3e034b8
--- /dev/null
+++ b/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\editor\Kernel\EditorImageDialogTest.
+ */
+
+namespace Drupal\Tests\editor\Kernel;
+
+use Drupal\Core\Form\FormState;
+use Drupal\editor\Entity\Editor;
+use Drupal\editor\Form\EditorImageDialog;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Tests EditorImageDialog validation and conversion functionality.
+ *
+ * @group editor
+ */
+class EditorImageDialogTest extends EntityKernelTestBase {
+
+  /**
+   * Filter format for testing.
+   *
+   * @var \Drupal\filter\FilterFormatInterface
+   */
+  protected $format;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'file', 'editor', 'editor_test', 'user', 'system'];
+
+  /**
+   * Sets up the test.
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+    $this->installSchema('system', ['key_value_expire']);
+    $this->installSchema('node', array('node_access'));
+    $this->installSchema('file', array('file_usage'));
+    $this->installConfig(['node']);
+
+    // Add text formats.
+    $this->format = FilterFormat::create([
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => [
+        'filter_align' => ['status' => TRUE],
+        'filter_caption' => ['status' => TRUE],
+      ],
+    ]);
+    $this->format->save();
+
+    // Set up text editor.
+    $editor = Editor::create([
+      'format' => 'filtered_html',
+      'editor' => 'unicorn',
+      'image_upload' => [
+        'max_size' => 100,
+        'scheme' => 'public',
+        'directory' => '',
+        'status' => TRUE,
+      ],
+    ]);
+    $editor->save();
+
+    // Create a node type for testing.
+    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
+    $type->save();
+    node_add_body_field($type);
+    $this->installEntitySchema('user');
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Tests that editor image dialog works as expected.
+   */
+  public function testEditorImageDialog() {
+    $input = [
+      'editor_object' => [
+        'src' => '/sites/default/files/inline-images/somefile.png',
+        'alt' => 'fda',
+        'width' => '',
+        'height' => '',
+        'data-entity-type' => 'file',
+        'data-entity-uuid' => 'some-uuid',
+        'data-align' => 'none',
+        'hasCaption' => 'false',
+      ],
+      'dialogOptions' => [
+        'title' => 'Edit Image',
+        'dialogClass' => 'editor-image-dialog',
+        'autoResize' => 'true',
+      ],
+      '_drupal_ajax' => '1',
+      'ajax_page_state' => [
+        'theme' => 'bartik',
+        'theme_token' => 'some-token',
+        'libraries' => '',
+      ],
+    ];
+    $form_state = (new FormState())
+      ->setRequestMethod('POST')
+      ->setUserInput($input)
+      ->addBuildInfo('args', [$this->format]);
+
+    $form_builder = $this->container->get('form_builder');
+    $form_object = new EditorImageDialog(\Drupal::entityManager()->getStorage('file'));
+    $form_id = $form_builder->getFormId($form_object, $form_state);
+    $form = $form_builder->retrieveForm($form_id, $form_state);
+    $form_builder->prepareForm($form_id, $form, $form_state);
+    $form_builder->processForm($form_id, $form, $form_state);
+
+    // Assert these two values are present and we don't get the 'not-this'
+    // default back.
+    $this->assertEqual(FALSE, $form_state->getValue(['attributes', 'hasCaption'], 'not-this'));
+  }
+
+}
diff --git a/core/modules/editor/tests/src/Kernel/EditorManagerTest.php b/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
new file mode 100644
index 0000000..a76d55e
--- /dev/null
+++ b/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\editor\Kernel\EditorManagerTest.
+ */
+
+namespace Drupal\Tests\editor\Kernel;
+
+use Drupal\editor\Entity\Editor;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests detection of text editors and correct generation of attachments.
+ *
+ * @group editor
+ */
+class EditorManagerTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'filter', 'editor');
+
+  /**
+   * The manager for text editor plugins.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $editorManager;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Install the Filter module.
+
+    // Add text formats.
+    $filtered_html_format = FilterFormat::create(array(
+      'format' => 'filtered_html',
+      'name' => 'Filtered HTML',
+      'weight' => 0,
+      'filters' => array(),
+    ));
+    $filtered_html_format->save();
+    $full_html_format = FilterFormat::create(array(
+      'format' => 'full_html',
+      'name' => 'Full HTML',
+      'weight' => 1,
+      'filters' => array(),
+    ));
+    $full_html_format->save();
+  }
+
+  /**
+   * Tests the configurable text editor manager.
+   */
+  public function testManager() {
+    $this->editorManager = $this->container->get('plugin.manager.editor');
+
+    // Case 1: no text editor available:
+    // - listOptions() should return an empty list of options
+    // - getAttachments() should return an empty #attachments array (and not
+    //   a JS settings structure that is empty)
+    $this->assertIdentical(array(), $this->editorManager->listOptions(), 'When no text editor is enabled, the manager works correctly.');
+    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when no text editor is enabled and retrieving attachments for zero text formats.');
+    $this->assertIdentical(array(), $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'No attachments when no text editor is enabled and retrieving attachments for multiple text formats.');
+
+    // Enable the Text Editor Test module, which has the Unicorn Editor and
+    // clear the editor manager's cache so it is picked up.
+    $this->enableModules(array('editor_test'));
+    $this->editorManager = $this->container->get('plugin.manager.editor');
+    $this->editorManager->clearCachedDefinitions();
+
+    // Case 2: a text editor available.
+    $this->assertIdentical('Unicorn Editor', (string) $this->editorManager->listOptions()['unicorn'], 'When some text editor is enabled, the manager works correctly.');
+
+    // Case 3: a text editor available & associated (but associated only with
+    // the 'Full HTML' text format).
+    $unicorn_plugin = $this->editorManager->createInstance('unicorn');
+    $editor = Editor::create([
+      'format' => 'full_html',
+      'editor' => 'unicorn',
+    ]);
+    $editor->save();
+    $this->assertIdentical(array(), $this->editorManager->getAttachments(array()), 'No attachments when one text editor is enabled and retrieving attachments for zero text formats.');
+    $expected = array(
+      'library' => array(
+        0 => 'editor_test/unicorn',
+      ),
+      'drupalSettings' => [
+        'editor' => [
+          'formats' => [
+            'full_html' => [
+              'format'  => 'full_html',
+              'editor' => 'unicorn',
+              'editorSettings' => $unicorn_plugin->getJSSettings($editor),
+              'editorSupportsContentFiltering' => TRUE,
+              'isXssSafe' => FALSE,
+            ],
+          ],
+        ],
+      ],
+    );
+    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'Correct attachments when one text editor is enabled and retrieving attachments for multiple text formats.');
+
+    // Case 4: a text editor available associated, but now with its JS settings
+    // being altered via hook_editor_js_settings_alter().
+    \Drupal::state()->set('editor_test_js_settings_alter_enabled', TRUE);
+    $expected['drupalSettings']['editor']['formats']['full_html']['editorSettings']['ponyModeEnabled'] = FALSE;
+    $this->assertIdentical($expected, $this->editorManager->getAttachments(array('filtered_html', 'full_html')), 'hook_editor_js_settings_alter() works correctly.');
+  }
+
+}
diff --git a/core/modules/field/config/schema/field.source.schema.yml b/core/modules/field/config/schema/field.source.schema.yml
deleted file mode 100644
index 8976ce1..0000000
--- a/core/modules/field/config/schema/field.source.schema.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-migrate.source.d6_field_instance_per_form_display:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_field:
-  type: migrate_source_sql
-  label: 'Drupal 6 field'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_field_formatter_settings:
-  type: migrate_source_sql
-  label: 'Drupal 6 field formatter settings'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_field_instance:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_field_instance_per_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 6 field formatter'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d7_field:
-  type: migrate_source_sql
-  label: 'Drupal 7 field'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d7_field_instance:
-  type: migrate_source_sql
-  label: 'Drupal 7 field instance'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d7_field_instance_per_form_display:
-  type: migrate_source_sql
-  label: 'Drupal 7 field instance per form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d7_field_instance_per_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 7 field instance per view mode'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index a71d69d..8e11650 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Field API documentation.
+ */
+
+/**
  * @addtogroup hooks
  * @{
  */
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 1860ad8..ecd2b31 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -68,3 +68,39 @@ function field_update_8002() {
     }
   }
 }
+
+/**
+ * Populate the new 'auto_create_bundle' setting for entity reference fields.
+ */
+function field_update_8003() {
+  $config = \Drupal::configFactory();
+  /** @var \Drupal\Core\Field\FieldTypePluginManager $field_type_manager */
+  $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+
+  // Iterate over all fields.
+  foreach ($config->listAll('field.field.') as $field_id) {
+    $field = $config->getEditable($field_id);
+    $class = $field_type_manager->getPluginClass($field->get('field_type'));
+
+    // Deal only with entity reference fields and descendants.
+    if ($class == EntityReferenceItem::class || is_subclass_of($class, EntityReferenceItem::class)) {
+      $handler_settings = $field->get('settings.handler_settings');
+
+      if (is_array($handler_settings) && !empty($handler_settings['auto_create'])) {
+        // If the field can reference multiple bundles, pick the first one
+        // available in order to replicate the previous behavior.
+        if (is_array($handler_settings['target_bundles']) && count($handler_settings['target_bundles']) > 1) {
+          $handler_settings['auto_create_bundle'] = reset($handler_settings['target_bundles']);
+        }
+        // Otherwise, we don't know which bundle to use for auto-creation so we
+        // have to disable the functionality completely.
+        elseif (!$handler_settings['target_bundles']) {
+          $handler_settings['auto_create'] = FALSE;
+          $handler_settings['auto_create_bundle'] = NULL;
+        }
+      }
+
+      $field->set('settings.handler_settings', $handler_settings)->save(TRUE);
+    }
+  }
+}
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index ce65c79..51b82e9 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -250,7 +250,7 @@ function field_entity_bundle_delete($entity_type_id, $bundle) {
         $field_config->save();
 
         // In case we deleted the only target bundle allowed by the field we
-        // have to log a warning message because the field will not function
+        // have to log a critical message because the field will not function
         // correctly anymore.
         if ($handler_settings['target_bundles'] === []) {
           \Drupal::logger('entity_reference')->critical('The %target_bundle bundle (entity type: %target_entity_type) was deleted. As a result, the %field_name entity reference field (entity_type: %entity_type, bundle: %bundle) no longer has any valid bundle it can reference. The field is not working correctly anymore and has to be adjusted.', [
@@ -292,7 +292,9 @@ function _field_create_entity_from_ids($ids) {
   if (isset($ids->bundle) && $bundle_key = $entity_type->getKey('bundle')) {
     $id_properties[$bundle_key] = $ids->bundle;
   }
-  return entity_create($ids->entity_type, $id_properties);
+  return \Drupal::entityTypeManager()
+    ->getStorage($ids->entity_type)
+    ->create($id_properties);
 }
 
 /**
diff --git a/core/modules/field/field.services.yml b/core/modules/field/field.services.yml
index 6c2187a..321cf91 100644
--- a/core/modules/field/field.services.yml
+++ b/core/modules/field/field.services.yml
@@ -3,5 +3,5 @@ services:
     class: Drupal\field\FieldUninstallValidator
     tags:
       - { name: module_install.uninstall_validator }
-    arguments: ['@entity.manager', '@string_translation']
+    arguments: ['@entity_type.manager', '@string_translation', '@plugin.manager.field.field_type']
     lazy: true
diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml
index ec29aad..531bc13 100644
--- a/core/modules/field/migration_templates/d6_field.yml
+++ b/core/modules/field/migration_templates/d6_field.yml
@@ -2,9 +2,8 @@ id: d6_field
 label: Field configuration
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_cck_migration
-  cck_plugin_method: processField
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processField
 source:
   plugin: d6_field
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
index 1e91fa2..7496db3 100644
--- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml
@@ -2,9 +2,8 @@ id: d6_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_cck_migration
-  cck_plugin_method: processFieldFormatter
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldFormatter
 source:
   plugin: d6_field_instance_per_view_mode
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml
index aa7861a..b5035c2 100644
--- a/core/modules/field/migration_templates/d6_field_instance.yml
+++ b/core/modules/field/migration_templates/d6_field_instance.yml
@@ -2,9 +2,8 @@ id: d6_field_instance
 label: Field instance configuration
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_cck_migration
-  cck_plugin_method: processFieldInstance
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldInstance
 source:
   plugin: d6_field_instance
   constants:
diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
index d34648d..46b7d75 100644
--- a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml
@@ -2,9 +2,8 @@ id: d6_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_cck_migration
-  cck_plugin_method: processFieldWidget
+class: Drupal\migrate_drupal\Plugin\migrate\CckMigration
+cck_plugin_method: processFieldWidget
 source:
   plugin: d6_field_instance_per_form_display
   constants:
diff --git a/core/modules/field/src/Entity/FieldConfig.php b/core/modules/field/src/Entity/FieldConfig.php
index 8e0e0b4..1597994 100644
--- a/core/modules/field/src/Entity/FieldConfig.php
+++ b/core/modules/field/src/Entity/FieldConfig.php
@@ -72,7 +72,7 @@ class FieldConfig extends FieldConfigBase implements FieldConfigInterface {
    * Constructs a FieldConfig object.
    *
    * In most cases, Field entities are created via
-   * entity_create('field_config', $values), where $values is the same
+   * FieldConfig::create($values), where $values is the same
    * parameter as in this constructor.
    *
    * @param array $values
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index d4c2922..a2117f8 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -238,7 +238,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
    *   - type: required.
    *
    * In most cases, Field entities are created via
-   * entity_create('field_storage_config', $values)), where $values is the same
+   * FieldStorageConfig::create($values)), where $values is the same
    * parameter as in this constructor.
    *
    * @see entity_create()
@@ -649,7 +649,7 @@ public function getOptionsProvider($property_name, FieldableEntityInterface $ent
     // If the field item class implements the interface, create an orphaned
     // runtime item object, so that it can be used as the options provider
     // without modifying the entity being worked on.
-    if (is_subclass_of($this->getFieldItemClass(), '\Drupal\Core\TypedData\OptionsProviderInterface')) {
+    if (is_subclass_of($this->getFieldItemClass(), OptionsProviderInterface::class)) {
       $items = $entity->get($this->getName());
       return \Drupal::service('plugin.manager.field.field_type')->createFieldItem($items, 0);
     }
diff --git a/core/modules/field/src/FieldConfigAccessControlHandler.php b/core/modules/field/src/FieldConfigAccessControlHandler.php
index 84afc84..52be0b8 100644
--- a/core/modules/field/src/FieldConfigAccessControlHandler.php
+++ b/core/modules/field/src/FieldConfigAccessControlHandler.php
@@ -26,10 +26,10 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     if ($operation == 'delete') {
       $field_storage_entity = $entity->getFieldStorageDefinition();
       if ($field_storage_entity->isLocked()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($field_storage_entity);
+        return AccessResult::forbidden()->addCacheableDependency($field_storage_entity);
       }
       else {
-        return AccessResult::allowedIfHasPermission($account, 'administer ' . $entity->getTargetEntityTypeId() . ' fields')->cacheUntilEntityChanges($field_storage_entity);
+        return AccessResult::allowedIfHasPermission($account, 'administer ' . $entity->getTargetEntityTypeId() . ' fields')->addCacheableDependency($field_storage_entity);
       }
     }
     return AccessResult::allowedIfHasPermission($account, 'administer ' . $entity->getTargetEntityTypeId() . ' fields');
diff --git a/core/modules/field/src/FieldUninstallValidator.php b/core/modules/field/src/FieldUninstallValidator.php
index 3302b04..34ddcee 100644
--- a/core/modules/field/src/FieldUninstallValidator.php
+++ b/core/modules/field/src/FieldUninstallValidator.php
@@ -7,8 +7,9 @@
 
 namespace Drupal\field;
 
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 
@@ -27,16 +28,26 @@ class FieldUninstallValidator implements ModuleUninstallValidatorInterface {
   protected $fieldStorageConfigStorage;
 
   /**
+   * The field type plugin manager.
+   *
+   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface
+   */
+  protected $fieldTypeManager;
+
+  /**
    * Constructs a new FieldUninstallValidator.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity manager.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation service.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type plugin manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager, TranslationInterface $string_translation) {
-    $this->fieldStorageConfigStorage = $entity_manager->getStorage('field_storage_config');
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, TranslationInterface $string_translation, FieldTypePluginManagerInterface $field_type_manager) {
+    $this->fieldStorageConfigStorage = $entity_type_manager->getStorage('field_storage_config');
     $this->stringTranslation = $string_translation;
+    $this->fieldTypeManager = $field_type_manager;
   }
 
   /**
@@ -47,15 +58,17 @@ public function validate($module) {
     if ($field_storages = $this->getFieldStoragesByModule($module)) {
       // Provide an explanation message (only mention pending deletions if there
       // remain no actual, non-deleted fields.)
-      $non_deleted = FALSE;
+      $fields_in_use = [];
       foreach ($field_storages as $field_storage) {
         if (!$field_storage->isDeleted()) {
-          $non_deleted = TRUE;
-          break;
+          $fields_in_use[$field_storage->getType()][] = $field_storage->getLabel();
         }
       }
-      if ($non_deleted) {
-        $reasons[] = $this->t('Fields type(s) in use');
+      if (!empty($fields_in_use)) {
+        foreach ($fields_in_use as $field_type => $field_storages) {
+          $field_type_label = $this->getFieldTypeLabel($field_type);
+          $reasons[] = $this->formatPlural(count($fields_in_use[$field_type]), 'The %field_type_label field type is used in the following field: @fields', 'The %field_type_label field type is used in the following fields: @fields', ['%field_type_label' => $field_type_label, '@fields' => implode(', ', $field_storages)]);
+        }
       }
       else {
         $reasons[] = $this->t('Fields pending deletion');
@@ -77,4 +90,18 @@ protected function getFieldStoragesByModule($module) {
     return $this->fieldStorageConfigStorage->loadByProperties(['module' => $module, 'include_deleted' => TRUE]);
   }
 
+
+  /**
+   * Returns the label for a specified field type.
+   *
+   * @param string $field_type
+   *   The field type.
+   *
+   * @return string
+   *   The field type label.
+   */
+  protected function getFieldTypeLabel($field_type) {
+    return $this->fieldTypeManager->getDefinitions()[$field_type]['label'];
+  }
+
 }
diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
old mode 100755
new mode 100644
index feb5788..8b98599
--- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
@@ -15,6 +15,7 @@
  *
  * @MigrateSource(
  *   id = "d7_field_instance",
+ *   source_provider = "field"
  * )
  */
 class FieldInstance extends DrupalSqlBase {
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
index 8c5146b..ce2ba07 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
@@ -125,6 +125,12 @@ function testBooleanFormatterSettings() {
       }
       $this->assertText(SafeMarkup::format($default, array('@on' => $values[0], '@off' => $values[1])));
     }
+
+    foreach ($settings as $values) {
+      $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/display');
+      $result = $this->xpath('//div[contains(@class, :class) and contains(text(), :text)]', [':class' => 'field-plugin-summary', ':text' => 'Display: TRUE / FALSE']);
+      $this->assertEqual(count($result), 1, "Boolean formatter settings summary exist.");
+    }
   }
 
 }
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php b/core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php
deleted file mode 100644
index 214590d..0000000
--- a/core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Boolean\BooleanFormatterTest.
- */
-
-namespace Drupal\field\Tests\Boolean;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the boolean formatter.
- *
- * @group field
- */
-class BooleanFormatterTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'text', 'entity_test', 'user'];
-
-  /**
-   * @var string
-   */
-  protected $entityType;
-
-  /**
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
-   */
-  protected $display;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['field']);
-    $this->installEntitySchema('entity_test');
-
-    $this->entityType = 'entity_test';
-    $this->bundle = $this->entityType;
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'type' => 'boolean',
-    ]);
-    $field_storage->save();
-
-    $instance = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => $this->bundle,
-      'label' => $this->randomMachineName(),
-    ]);
-    $instance->save();
-
-    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, [
-        'type' => 'boolean',
-        'settings' => [],
-      ]);
-    $this->display->save();
-  }
-
-  /**
-   * Renders fields of a given entity with a given display.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity object with attached fields to render.
-   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
-   *   The display to render the fields in.
-   *
-   * @return string
-   *   The rendered entity fields.
-   */
-  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
-    $content = $display->build($entity);
-    $content = $this->render($content);
-    return $content;
-  }
-
-  /**
-   * Tests boolean formatter output.
-   */
-  public function testBooleanFormatter() {
-    $data = [];
-    $data[] = [0, [], 'Off'];
-    $data[] = [1, [], 'On'];
-
-    $format = ['format' => 'enabled-disabled'];
-    $data[] = [0, $format, 'Disabled'];
-    $data[] = [1, $format, 'Enabled'];
-
-    $format = ['format' => 'unicode-yes-no'];
-    $data[] = [1, $format, '✔'];
-    $data[] = [0, $format, '✖'];
-
-    $format = [
-      'format' => 'custom',
-      'format_custom_false' => 'FALSE',
-      'format_custom_true' => 'TRUE'
-    ];
-    $data[] = [0, $format, 'FALSE'];
-    $data[] = [1, $format, 'TRUE'];
-
-    foreach ($data as $test_data) {
-      list($value, $settings, $expected) = $test_data;
-
-      $component = $this->display->getComponent($this->fieldName);
-      $component['settings'] = $settings;
-      $this->display->setComponent($this->fieldName, $component);
-
-      $entity = EntityTest::create([]);
-      $entity->{$this->fieldName}->value = $value;
-
-      // Verify that all HTML is escaped and newlines are retained.
-      $this->renderEntityFields($entity, $this->display);
-      $this->assertRaw($expected);
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php b/core/modules/field/src/Tests/Boolean/BooleanItemTest.php
deleted file mode 100644
index e9d7605..0000000
--- a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Boolean\BooleanItemTest.
- */
-
-namespace Drupal\field\Tests\Boolean;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the boolean field type.
- *
- * @group field
- */
-class BooleanItemTest extends FieldUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a boolean field and storage for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_boolean',
-      'entity_type' => 'entity_test',
-      'type' => 'boolean',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_boolean',
-      'bundle' => 'entity_test',
-    ))->save();
-
-    // Create a form display for the default form mode.
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent('field_boolean', array(
-        'type' => 'boolean_checkbox',
-      ))
-      ->save();
-  }
-
-  /**
-   * Tests using entity fields of the boolean field type.
-   */
-  public function testBooleanItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $value = '1';
-    $entity->field_boolean = $value;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_boolean instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_boolean[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_boolean->value, $value);
-    $this->assertEqual($entity->field_boolean[0]->value, $value);
-
-    // Verify changing the boolean value.
-    $new_value = 0;
-    $entity->field_boolean->value = $new_value;
-    $this->assertEqual($entity->field_boolean->value, $new_value);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_boolean->value, $new_value);
-
-    // Test sample item generation.
-    $entity = entity_create('entity_test');
-    $entity->field_boolean->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/BulkDeleteTest.php b/core/modules/field/src/Tests/BulkDeleteTest.php
deleted file mode 100644
index d7e1aca..0000000
--- a/core/modules/field/src/Tests/BulkDeleteTest.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\BulkDeleteTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Bulk delete storages and fields, and clean up afterwards.
- *
- * @group field
- */
-class BulkDeleteTest extends FieldUnitTestBase {
-
-  /**
-   * The fields to use in this test.
-   *
-   * @var array
-   */
-  protected $fieldStorages;
-
-  /**
-   * The entities to use in this test.
-   *
-   * @var array
-   */
-  protected $entities;
-
-  /**
-   * The entities to use in this test, keyed by bundle.
-   *
-   * @var array
-   */
-  protected $entitiesByBundles;
-
-  /**
-   * The bundles for the entities used in this test.
-   *
-   * @var array
-   */
-  protected $bundles;
-
-  /**
-   * The entity type to be used in the test classes.
-   *
-   * @var string
-   */
-  protected $entityTypeId = 'entity_test';
-
-  /**
-   * Tests that the expected hooks have been invoked on the expected entities.
-   *
-   * @param $expected_hooks
-   *   An array keyed by hook name, with one entry per expected invocation.
-   *   Each entry is the value of the "$entity" parameter the hook is expected
-   *   to have been passed.
-   * @param $actual_hooks
-   *   The array of actual hook invocations recorded by field_test_memorize().
-   */
-  function checkHooksInvocations($expected_hooks, $actual_hooks) {
-    foreach ($expected_hooks as $hook => $invocations) {
-      $actual_invocations = $actual_hooks[$hook];
-
-      // Check that the number of invocations is correct.
-      $this->assertEqual(count($actual_invocations), count($invocations), "$hook() was called the expected number of times.");
-
-      // Check that the hook was called for each expected argument.
-      foreach ($invocations as $argument) {
-        $found = FALSE;
-        foreach ($actual_invocations as $actual_arguments) {
-          // The argument we are looking for is either an array of entities as
-          // the second argument or a single entity object as the first.
-          if ($argument instanceof EntityInterface && $actual_arguments[0]->id() == $argument->id()) {
-            $found = TRUE;
-            break;
-          }
-          // In case of an array, compare the array size and make sure it
-          // contains the same elements.
-          elseif (is_array($argument) && count($actual_arguments[1]) == count($argument) && count(array_diff_key($actual_arguments[1], $argument)) == 0) {
-            $found = TRUE;
-            break;
-          }
-        }
-        $this->assertTrue($found, "$hook() was called on expected argument");
-      }
-    }
-  }
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->fieldStorages = array();
-    $this->entities = array();
-    $this->entitiesByBundles = array();
-
-    // Create two bundles.
-    $this->bundles = array('bb_1' => 'bb_1', 'bb_2' => 'bb_2');
-    foreach ($this->bundles as $name => $desc) {
-      entity_test_create_bundle($name, $desc);
-    }
-
-    // Create two field storages.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'bf_1',
-      'entity_type' => $this->entityTypeId,
-      'type' => 'test_field',
-      'cardinality' => 1
-    ));
-    $field_storage->save();
-    $this->fieldStorages[] = $field_storage;
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'bf_2',
-      'entity_type' => $this->entityTypeId,
-      'type' => 'test_field',
-      'cardinality' => 4
-    ));
-    $field_storage->save();
-    $this->fieldStorages[] = $field_storage;
-
-    // For each bundle, create each field, and 10 entities with values for the
-    // fields.
-    foreach ($this->bundles as $bundle) {
-      foreach ($this->fieldStorages as $field_storage) {
-        entity_create('field_config', array(
-          'field_storage' => $field_storage,
-          'bundle' => $bundle,
-        ))->save();
-      }
-      for ($i = 0; $i < 10; $i++) {
-        $entity = entity_create($this->entityTypeId, array('type' => $bundle));
-        foreach ($this->fieldStorages as $field_storage) {
-          $entity->{$field_storage->getName()}->setValue($this->_generateTestFieldValues($field_storage->getCardinality()));
-        }
-        $entity->save();
-      }
-    }
-    $this->entities = entity_load_multiple($this->entityTypeId);
-    foreach ($this->entities as $entity) {
-      // This test relies on the entities having stale field definitions
-      // so that the deleted field can be accessed on them. Access the field
-      // now, so that they are always loaded.
-      $entity->bf_1->value;
-
-      // Also keep track of the entities per bundle.
-      $this->entitiesByBundles[$entity->bundle()][$entity->id()] = $entity;
-    }
-  }
-
-  /**
-   * Verify that deleting a field leaves the field data items in the database
-   * and that the appropriate Field API functions can operate on the deleted
-   * data and field definition.
-   *
-   * This tests how EntityFieldQuery interacts with field deletion and could be
-   * moved to FieldCrudTestCase, but depends on this class's setUp().
-   */
-  function testDeleteField() {
-    $bundle = reset($this->bundles);
-    $field_storage = reset($this->fieldStorages);
-    $field_name = $field_storage->getName();
-    $factory = \Drupal::service('entity.query');
-
-    // There are 10 entities of this bundle.
-    $found = $factory->get('entity_test')
-      ->condition('type', $bundle)
-      ->execute();
-    $this->assertEqual(count($found), 10, 'Correct number of entities found before deleting');
-
-    // Delete the field.
-    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
-    $field->delete();
-
-    // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
-    $this->assertEqual(count($fields), 1, 'There is one deleted field');
-    $field = $fields[$field->uuid()];
-    $this->assertEqual($field->getTargetBundle(), $bundle, 'The deleted field is for the correct bundle');
-
-    // Check that the actual stored content did not change during delete.
-    $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
-    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-    $table_mapping = $storage->getTableMapping();
-    $table = $table_mapping->getDedicatedDataTableName($field_storage);
-    $column = $table_mapping->getFieldColumnName($field_storage, 'value');
-    $result = db_select($table, 't')
-      ->fields('t')
-      ->execute();
-    foreach ($result as $row) {
-      $this->assertEqual($this->entities[$row->entity_id]->{$field_name}->value, $row->$column);
-    }
-
-    // There are 0 entities of this bundle with non-deleted data.
-    $found = $factory->get('entity_test')
-      ->condition('type', $bundle)
-      ->condition("$field_name.deleted", 0)
-      ->execute();
-    $this->assertFalse($found, 'No entities found after deleting');
-
-    // There are 10 entities of this bundle when deleted fields are allowed, and
-    // their values are correct.
-    $found = $factory->get('entity_test')
-      ->condition('type', $bundle)
-      ->condition("$field_name.deleted", 1)
-      ->sort('id')
-      ->execute();
-    $this->assertEqual(count($found), 10, 'Correct number of entities found after deleting');
-    $this->assertFalse(array_diff($found, array_keys($this->entities)));
-  }
-
-  /**
-   * Verify that field data items and fields are purged when a field storage is
-   * deleted.
-   */
-  function testPurgeField() {
-    // Start recording hook invocations.
-    field_test_memorize();
-
-    $bundle = reset($this->bundles);
-    $field_storage = reset($this->fieldStorages);
-    $field_name = $field_storage->getName();
-
-    // Delete the field.
-    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
-    $field->delete();
-
-    // No field hooks were called.
-    $mem = field_test_memorize();
-    $this->assertEqual(count($mem), 0, 'No field hooks were called');
-
-    $batch_size = 2;
-    for ($count = 8; $count >= 0; $count -= $batch_size) {
-      // Purge two entities.
-      field_purge_batch($batch_size);
-
-      // There are $count deleted entities left.
-      $found = \Drupal::entityQuery('entity_test')
-        ->condition('type', $bundle)
-        ->condition($field_name . '.deleted', 1)
-        ->execute();
-      $this->assertEqual(count($found), $count, 'Correct number of entities found after purging 2');
-    }
-
-    // Check hooks invocations.
-    // FieldItemInterface::delete() should have been called once for each entity in the
-    // bundle.
-    $actual_hooks = field_test_memorize();
-    $hooks = array();
-    $entities = $this->entitiesByBundles[$bundle];
-    foreach ($entities as $id => $entity) {
-      $hooks['field_test_field_delete'][] = $entity;
-    }
-    $this->checkHooksInvocations($hooks, $actual_hooks);
-
-    // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
-    $this->assertEqual(count($fields), 1, 'There is one deleted field');
-
-    // Purge the field.
-    field_purge_batch($batch_size);
-
-    // The field is gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
-    $this->assertEqual(count($fields), 0, 'The field is gone');
-
-    // The field storage still exists, not deleted, because it has a second
-    // field.
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
-    $this->assertTrue(isset($storages[$field_storage->uuid()]), 'The field storage exists and is not deleted');
-  }
-
-  /**
-   * Verify that field storages are preserved and purged correctly as multiple
-   * fields are deleted and purged.
-   */
-  function testPurgeFieldStorage() {
-    // Start recording hook invocations.
-    field_test_memorize();
-
-    $field_storage = reset($this->fieldStorages);
-    $field_name = $field_storage->getName();
-
-    // Delete the first field.
-    $bundle = reset($this->bundles);
-    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
-    $field->delete();
-
-    // Assert that FieldItemInterface::delete() was not called yet.
-    $mem = field_test_memorize();
-    $this->assertEqual(count($mem), 0, 'No field hooks were called.');
-
-    // Purge the data.
-    field_purge_batch(10);
-
-    // Check hooks invocations.
-    // FieldItemInterface::delete() should have been called once for each entity in the
-    // bundle.
-    $actual_hooks = field_test_memorize();
-    $hooks = array();
-    $entities = $this->entitiesByBundles[$bundle];
-    foreach ($entities as $id => $entity) {
-      $hooks['field_test_field_delete'][] = $entity;
-    }
-    $this->checkHooksInvocations($hooks, $actual_hooks);
-
-    // The field still exists, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
-    $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
-
-    // Purge again to purge the field.
-    field_purge_batch(0);
-
-    // The field is gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
-    $this->assertEqual(count($fields), 0, 'The field is purged.');
-    // The field storage still exists, not deleted.
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
-    $this->assertTrue(isset($storages[$field_storage->uuid()]) && !$storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is not deleted');
-
-    // Delete the second field.
-    $bundle = next($this->bundles);
-    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
-    $field->delete();
-
-    // Assert that FieldItemInterface::delete() was not called yet.
-    $mem = field_test_memorize();
-    $this->assertEqual(count($mem), 0, 'No field hooks were called.');
-
-    // Purge the data.
-    field_purge_batch(10);
-
-    // Check hooks invocations (same as above, for the 2nd bundle).
-    $actual_hooks = field_test_memorize();
-    $hooks = array();
-    $entities = $this->entitiesByBundles[$bundle];
-    foreach ($entities as $id => $entity) {
-      $hooks['field_test_field_delete'][] = $entity;
-    }
-    $this->checkHooksInvocations($hooks, $actual_hooks);
-
-    // The field and the storage still exist, deleted.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
-    $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
-    $this->assertTrue(isset($storages[$field_storage->uuid()]) && $storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is deleted');
-
-    // Purge again to purge the field and the storage.
-    field_purge_batch(0);
-
-    // The field and the storage are gone.
-    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
-    $this->assertEqual(count($fields), 0, 'The field is purged.');
-    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
-    $this->assertEqual(count($storages), 0, 'The field storage is purged.');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/ConfigFieldDefinitionTest.php b/core/modules/field/src/Tests/ConfigFieldDefinitionTest.php
deleted file mode 100644
index 44e8c89..0000000
--- a/core/modules/field/src/Tests/ConfigFieldDefinitionTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\ConfigFieldDefinitionTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-
-/**
- * Tests exposing field definitions for configurable fields.
- *
- * @group field
- */
-class ConfigFieldDefinitionTest extends FieldUnitTestBase {
-
-  /**
-   * The entity manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface;
-   */
-  protected $entityManager;
-
-  /**
-   * @var string
-   */
-  private $entityType;
-
-  /**
-   * @var string
-   */
-  private $bundle;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a field and a storage of type 'test_field', on the 'entity_test'
-    // entity type.
-    $this->entityType = 'entity_test';
-    $this->bundle = 'entity_test';
-    $this->createFieldWithStorage('', $this->entityType, $this->bundle);
-    $this->entityManager = $this->container->get('entity.manager');
-
-    // Create a second field on 'entity_test_rev'.
-    $this->createFieldWithStorage('_rev', 'entity_test_rev', 'entity_test_rev');
-  }
-
-  /**
-   * Makes sure a field definition is exposed for a configurable field.
-   */
-  public function testBundleFieldDefinition() {
-    $definitions = $this->entityManager->getFieldDefinitions($this->entityType, $this->bundle);
-    $this->assertTrue(isset($definitions[$this->fieldTestData->field->getName()]));
-    $this->assertTrue($definitions[$this->fieldTestData->field->getName()] instanceof FieldDefinitionInterface);
-    // Make sure fields on other entity types are not exposed.
-    $this->assertFalse(isset($definitions[$this->fieldTestData->field_rev->getName()]));
-  }
-
-  /**
-   * Makes sure a field storage definition is exposed for a configurable field.
-   */
-  public function testFieldStorageDefinition() {
-    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($this->entityType);
-    $this->assertTrue(isset($field_storage_definitions[$this->fieldTestData->field->getName()]));
-    $this->assertTrue($field_storage_definitions[$this->fieldTestData->field->getName()] instanceof FieldStorageDefinitionInterface);
-    // Make sure storages on other entity types are not exposed.
-    $this->assertFalse(isset($field_storage_definitions[$this->fieldTestData->field_rev->getName()]));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php
deleted file mode 100644
index eff812b..0000000
--- a/core/modules/field/src/Tests/DisplayApiTest.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\DisplayApiTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Entity\Entity\EntityViewMode;
-
-/**
- * Tests the field display API.
- *
- * @group field
- */
-class DisplayApiTest extends FieldUnitTestBase {
-
-  /**
-   * The field name to use in this test.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * The field label to use in this test.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The field cardinality to use in this test.
-   *
-   * @var number
-   */
-  protected $cardinality;
-
-  /**
-   * The field display options to use in this test.
-   *
-   * @var array
-   */
-  protected $displayOptions;
-
-  /**
-   * The test entity.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  protected $entity;
-
-  /**
-   * An array of random values, in the format expected for field values.
-   *
-   * @var array
-   */
-  protected $values;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a field and its storage.
-    $this->fieldName = 'test_field';
-    $this->label = $this->randomMachineName();
-    $this->cardinality = 4;
-
-    $field_storage = array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'cardinality' => $this->cardinality,
-    );
-    $field = array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'label' => $this->label,
-    );
-
-    $this->displayOptions = array(
-      'default' => array(
-        'type' => 'field_test_default',
-        'settings' => array(
-          'test_formatter_setting' => $this->randomMachineName(),
-        ),
-      ),
-      'teaser' => array(
-        'type' => 'field_test_default',
-        'settings' => array(
-          'test_formatter_setting' => $this->randomMachineName(),
-        ),
-      ),
-    );
-
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $field)->save();
-    // Create a display for the default view mode.
-    entity_get_display($field['entity_type'], $field['bundle'], 'default')
-      ->setComponent($this->fieldName, $this->displayOptions['default'])
-      ->save();
-    // Create a display for the teaser view mode.
-    EntityViewMode::create(array('id' =>  'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
-    entity_get_display($field['entity_type'], $field['bundle'], 'teaser')
-      ->setComponent($this->fieldName, $this->displayOptions['teaser'])
-      ->save();
-
-    // Create an entity with values.
-    $this->values = $this->_generateTestFieldValues($this->cardinality);
-    $this->entity = entity_create('entity_test');
-    $this->entity->{$this->fieldName}->setValue($this->values);
-    $this->entity->save();
-  }
-
-  /**
-   * Tests the FieldItemListInterface::view() method.
-   */
-  function testFieldItemListView() {
-    $items = $this->entity->get($this->fieldName);
-
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-
-    // No display settings: check that default display settings are used.
-    $build = $items->view();
-    $this->render($build);
-    $settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('field_test_default');
-    $setting = $settings['test_formatter_setting'];
-    $this->assertText($this->label, 'Label was displayed.');
-    foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // Display settings: Check hidden field.
-    $display = array(
-      'label' => 'hidden',
-      'type' => 'field_test_multiple',
-      'settings' => array(
-        'test_formatter_setting_multiple' => $this->randomMachineName(),
-        'alter' => TRUE,
-      ),
-    );
-    $build = $items->view($display);
-    $this->render($build);
-    $setting = $display['settings']['test_formatter_setting_multiple'];
-    $this->assertNoText($this->label, 'Label was not displayed.');
-    $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
-    $this->assertText('entity language is en', 'Language is placed onto the context.');
-    $array = array();
-    foreach ($this->values as $delta => $value) {
-      $array[] = $delta . ':' . $value['value'];
-    }
-    $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
-
-    // Display settings: Check visually_hidden field.
-    $display = array(
-      'label' => 'visually_hidden',
-      'type' => 'field_test_multiple',
-      'settings' => array(
-        'test_formatter_setting_multiple' => $this->randomMachineName(),
-        'alter' => TRUE,
-      ),
-    );
-    $build = $items->view($display);
-    $this->render($build);
-    $setting = $display['settings']['test_formatter_setting_multiple'];
-    $this->assertRaw('visually-hidden', 'Label was visually hidden.');
-    $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
-    $this->assertText('entity language is en', 'Language is placed onto the context.');
-    $array = array();
-    foreach ($this->values as $delta => $value) {
-      $array[] = $delta . ':' . $value['value'];
-    }
-    $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
-
-    // Check the prepare_view steps are invoked.
-    $display = array(
-      'label' => 'hidden',
-      'type' => 'field_test_with_prepare_view',
-      'settings' => array(
-        'test_formatter_setting_additional' => $this->randomMachineName(),
-      ),
-    );
-    $build = $items->view($display);
-    $this->render($build);
-    $setting = $display['settings']['test_formatter_setting_additional'];
-    $this->assertNoText($this->label, 'Label was not displayed.');
-    $this->assertNoText('field_test_entity_display_build_alter', 'Alter not fired.');
-    foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // View mode: check that display settings specified in the display object
-    // are used.
-    $build = $items->view('teaser');
-    $this->render($build);
-    $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];
-    $this->assertText($this->label, 'Label was displayed.');
-    foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // Unknown view mode: check that display settings for 'default' view mode
-    // are used.
-    $build = $items->view('unknown_view_mode');
-    $this->render($build);
-    $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];
-    $this->assertText($this->label, 'Label was displayed.');
-    foreach ($this->values as $delta => $value) {
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-  }
-
-  /**
-   * Tests the FieldItemInterface::view() method.
-   */
-  function testFieldItemView() {
-    // No display settings: check that default display settings are used.
-    $settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('field_test_default');
-    $setting = $settings['test_formatter_setting'];
-    foreach ($this->values as $delta => $value) {
-      $item = $this->entity->{$this->fieldName}[$delta];
-      $build = $item->view();
-      $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // Check that explicit display settings are used.
-    $display = array(
-      'type' => 'field_test_multiple',
-      'settings' => array(
-        'test_formatter_setting_multiple' => $this->randomMachineName(),
-      ),
-    );
-    $setting = $display['settings']['test_formatter_setting_multiple'];
-    foreach ($this->values as $delta => $value) {
-      $item = $this->entity->{$this->fieldName}[$delta];
-      $build = $item->view($display);
-      $this->render($build);
-      $this->assertText($setting . '|0:' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // Check that prepare_view steps are invoked.
-    $display = array(
-      'type' => 'field_test_with_prepare_view',
-      'settings' => array(
-        'test_formatter_setting_additional' => $this->randomMachineName(),
-      ),
-    );
-    $setting = $display['settings']['test_formatter_setting_additional'];
-    foreach ($this->values as $delta => $value) {
-      $item = $this->entity->{$this->fieldName}[$delta];
-      $build = $item->view($display);
-      $this->render($build);
-      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // View mode: check that display settings specified in the field are used.
-    $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];
-    foreach ($this->values as $delta => $value) {
-      $item = $this->entity->{$this->fieldName}[$delta];
-      $build = $item->view('teaser');
-      $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-
-    // Unknown view mode: check that display settings for 'default' view mode
-    // are used.
-    $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];
-    foreach ($this->values as $delta => $value) {
-      $item = $this->entity->{$this->fieldName}[$delta];
-      $build = $item->view('unknown_view_mode');
-      $this->render($build);
-      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
-    }
-  }
-
-  /**
-   * Tests that the prepareView() formatter method still fires for empty values.
-   */
-  function testFieldEmpty() {
-    // Uses \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptyFormatter.
-    $display = array(
-      'label' => 'hidden',
-      'type' => 'field_empty_test',
-      'settings' => array(
-        'test_empty_string' => '**EMPTY FIELD**' . $this->randomMachineName(),
-      ),
-    );
-    // $this->entity is set by the setUp() method and by default contains 4
-    // numeric values.  We only want to test the display of this one field.
-    $build = $this->entity->get($this->fieldName)->view($display);
-    $this->render($build);
-    // The test field by default contains values, so should not display the
-    // default "empty" text.
-    $this->assertNoText($display['settings']['test_empty_string']);
-
-    // Now remove the values from the test field and retest.
-    $this->entity->{$this->fieldName} = array();
-    $this->entity->save();
-    $build = $this->entity->get($this->fieldName)->view($display);
-    $this->render($build);
-    // This time, as the field values have been removed, we *should* show the
-    // default "empty" text.
-    $this->assertText($display['settings']['test_empty_string']);
-  }
-}
diff --git a/core/modules/field/src/Tests/Email/EmailFieldTest.php b/core/modules/field/src/Tests/Email/EmailFieldTest.php
index b916ed0..d730585 100644
--- a/core/modules/field/src/Tests/Email/EmailFieldTest.php
+++ b/core/modules/field/src/Tests/Email/EmailFieldTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\field\Tests\Email;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests email field functionality.
@@ -54,16 +56,16 @@ protected function setUp() {
   function testEmailField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'email',
     ));
     $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
+    $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $this->field->save();
 
     // Create a form display for the default form mode.
diff --git a/core/modules/field/src/Tests/Email/EmailItemTest.php b/core/modules/field/src/Tests/Email/EmailItemTest.php
deleted file mode 100644
index b6a148f..0000000
--- a/core/modules/field/src/Tests/Email/EmailItemTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Email\EmailItemTest.
- */
-
-namespace Drupal\field\Tests\Email;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the email field type.
- *
- * @group field
- */
-class EmailItemTest extends FieldUnitTestBase {
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create an email field storage and field for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_email',
-      'entity_type' => 'entity_test',
-      'type' => 'email',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_email',
-      'bundle' => 'entity_test',
-    ))->save();
-
-    // Create a form display for the default form mode.
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent('field_email', array(
-        'type' => 'email_default',
-      ))
-      ->save();
-  }
-
-  /**
-   * Tests using entity fields of the email field type.
-   */
-  public function testEmailItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $value = 'test@example.com';
-    $entity->field_email = $value;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_email instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_email[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_email->value, $value);
-    $this->assertEqual($entity->field_email[0]->value, $value);
-
-    // Verify changing the email value.
-    $new_value = $this->randomMachineName();
-    $entity->field_email->value = $new_value;
-    $this->assertEqual($entity->field_email->value, $new_value);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_email->value, $new_value);
-
-    // Test sample item generation.
-    $entity = entity_create('entity_test');
-    $entity->field_email->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php b/core/modules/field/src/Tests/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
deleted file mode 100644
index 22f81c0..0000000
--- a/core/modules/field/src/Tests/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Entity\Update\SqlContentEntityStorageSchemaColumnTest.
- */
-
-namespace Drupal\field\Tests\Entity\Update;
-
-use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
-use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests that schema changes in fields with data are detected during updates.
- *
- * @group Entity
- */
-class SqlContentEntityStorageSchemaColumnTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['entity_test', 'field', 'text', 'user'];
-
-  /**
-   * The created entity.
-   *
-   * @var \Drupal\Core\Entity\Entity
-   */
-  protected $entity;
-
-  /**
-   * The field.
-   *
-   * @var \Drupal\field\FieldConfigInterface
-   */
-  protected $field;
-
-  /**
-   * The field storage.
-   *
-   * @var \Drupal\field\FieldStorageConfigInterface
-   */
-  protected $fieldStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-    $this->installEntitySchema('user');
-
-    $field_name = 'test';
-    $this->fieldStorage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test_rev',
-      'type' => 'string',
-      'cardinality' => 1,
-    ]);
-    $this->fieldStorage->save();
-
-    $this->field = FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test_rev',
-      'bundle' => 'entity_test_rev',
-      'required' => TRUE,
-    ]);
-    $this->field->save();
-
-    // Create an entity with field data.
-    $this->entity = EntityTestRev::create([
-      'user_id' => mt_rand(1, 10),
-      'name' => $this->randomMachineName(),
-      $field_name => $this->randomString(),
-    ]);
-    $this->entity->save();
-  }
-
-  /**
-   * Tests that column-level schema changes are detected for fields with data.
-   */
-  public function testColumnUpdate() {
-    // Change the field type in the stored schema.
-    $schema = \Drupal::keyValue('entity.storage_schema.sql')->get('entity_test_rev.field_schema_data.test');
-    $schema['entity_test_rev__test']['fields']['test_value']['type'] = 'varchar_ascii';
-    \Drupal::keyValue('entity.storage_schema.sql')->set('entity_test_rev.field_schema_data.test', $schema);
-
-    // Now attempt to run automatic updates. An exception should be thrown
-    // since there is data in the table.
-    try {
-      \Drupal::service('entity.definition_update_manager')->applyUpdates();
-      $this->fail('Failed to detect a schema change in a field with data.');
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass('Detected a schema change in a field with data.');
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
index 9ee63b0..3376046 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceAdminTest.php
@@ -7,7 +7,8 @@
 
 namespace Drupal\field\Tests\EntityReference;
 
-use Drupal\Core\Entity\Entity;
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\node\Entity\Node;
@@ -315,7 +316,7 @@ public function testFieldAdminHandler() {
 
     // Tests adding default values to autocomplete widgets.
     Vocabulary::create(array('vid' => 'tags', 'name' => 'tags'))->save();
-    $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', 'tags');
+    $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', ['tags']);
     $field_path = 'node.' . $this->type . '.field_' . $taxonomy_term_field_name;
     $this->drupalGet($bundle_path . '/fields/' . $field_path . '/storage');
     $edit = [
@@ -348,13 +349,13 @@ public function testAvailableFormatters() {
     Vocabulary::create(array('vid' => 'tags', 'name' => 'tags'))->save();
 
     // Create entity reference field with taxonomy term as a target.
-    $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', 'tags');
+    $taxonomy_term_field_name = $this->createEntityReferenceField('taxonomy_term', ['tags']);
 
     // Create entity reference field with user as a target.
     $user_field_name = $this->createEntityReferenceField('user');
 
     // Create entity reference field with node as a target.
-    $node_field_name = $this->createEntityReferenceField('node', $this->type);
+    $node_field_name = $this->createEntityReferenceField('node', [$this->type]);
 
     // Create entity reference field with date format as a target.
     $date_format_field_name = $this->createEntityReferenceField('date_format');
@@ -403,17 +404,78 @@ public function testAvailableFormatters() {
   }
 
   /**
+   * Tests field settings for an entity reference field when the field has
+   * multiple target bundles and is set to auto-create the target entity.
+   */
+  public function testMultipleTargetBundles() {
+    /** @var \Drupal\taxonomy\Entity\Vocabulary[] $vocabularies */
+    $vocabularies = [];
+    for ($i = 0; $i < 2; $i++) {
+      $vid = Unicode::strtolower($this->randomMachineName());
+      $vocabularies[$i] = Vocabulary::create([
+        'name' => $this->randomString(),
+        'vid' => $vid,
+      ]);
+      $vocabularies[$i]->save();
+    }
+
+    // Create a new field pointing to the first vocabulary.
+    $field_name = $this->createEntityReferenceField('taxonomy_term', [$vocabularies[0]->id()]);
+    $field_name = "field_$field_name";
+    $field_id = 'node.' . $this->type . '.' . $field_name;
+    $path = 'admin/structure/types/manage/' . $this->type . '/fields/' . $field_id;
+
+    $this->drupalGet($path);
+
+    // Expect that there's no 'auto_create_bundle' selected.
+    $this->assertNoFieldByName('settings[handler_settings][auto_create_bundle]');
+
+    $edit = [
+      'settings[handler_settings][target_bundles][' . $vocabularies[1]->id() . ']' => TRUE,
+    ];
+    // Enable the second vocabulary as a target bundle.
+    $this->drupalPostAjaxForm($path, $edit, key($edit));
+    // Expect a select element with the two vocabularies as options.
+    $this->assertFieldByXPath("//select[@name='settings[handler_settings][auto_create_bundle]']/option[@value='" . $vocabularies[0]->id() . "']");
+    $this->assertFieldByXPath("//select[@name='settings[handler_settings][auto_create_bundle]']/option[@value='" . $vocabularies[1]->id() . "']");
+
+    $edit = [
+      'settings[handler_settings][auto_create]' => TRUE,
+      'settings[handler_settings][auto_create_bundle]' => $vocabularies[1]->id(),
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+
+    /** @var \Drupal\field\Entity\FieldConfig $field_config */
+    $field_config = FieldConfig::load($field_id);
+    // Expect that the target bundle has been saved in the backend.
+    $this->assertEqual($field_config->getSetting('handler_settings')['auto_create_bundle'], $vocabularies[1]->id());
+
+    // Delete the other bundle. Field config should not be affected.
+    $vocabularies[0]->delete();
+    $field_config = FieldConfig::load($field_id);
+    $this->assertTrue($field_config->getSetting('handler_settings')['auto_create']);
+    $this->assertIdentical($field_config->getSetting('handler_settings')['auto_create_bundle'], $vocabularies[1]->id());
+
+    // Delete the bundle set for entity auto-creation. Auto-created settings
+    // should be reset (no auto-creation).
+    $vocabularies[1]->delete();
+    $field_config = FieldConfig::load($field_id);
+    $this->assertFalse($field_config->getSetting('handler_settings')['auto_create']);
+    $this->assertFalse(isset($field_config->getSetting('handler_settings')['auto_create_bundle']));
+  }
+
+  /**
    * Creates a new Entity Reference fields with a given target type.
    *
-   * @param $target_type
+   * @param string $target_type
    *   The name of the target type
-   * @param $bundle
-   *   Name of the bundle
-   *   Default = NULL
+   * @param string[] $bundles
+   *   A list of bundle IDs. Defaults to [].
+   *
    * @return string
    *   Returns the generated field name
    */
-  public function createEntityReferenceField($target_type, $bundle = NULL) {
+  protected function createEntityReferenceField($target_type, $bundles = []) {
     // Generates a bundle path for the newly created content type.
     $bundle_path = 'admin/structure/types/manage/' . $this->type;
 
@@ -422,7 +484,7 @@ public function createEntityReferenceField($target_type, $bundle = NULL) {
 
     $storage_edit = $field_edit = array();
     $storage_edit['settings[target_type]'] = $target_type;
-    if ($bundle) {
+    foreach ($bundles as $bundle) {
       $field_edit['settings[handler_settings][target_bundles][' . $bundle . ']'] = TRUE;
     }
 
@@ -432,7 +494,6 @@ public function createEntityReferenceField($target_type, $bundle = NULL) {
     return $field_name;
   }
 
-
   /**
    * Checks if a select element contains the specified options.
    *
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php
index 77bede9..acaabdb 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceAutoCreateTest.php
@@ -7,9 +7,13 @@
 
 namespace Drupal\field\Tests\EntityReference;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\node\Entity\Node;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests creating new entity (e.g. taxonomy-term) from an autocomplete widget.
@@ -18,7 +22,9 @@
  */
 class EntityReferenceAutoCreateTest extends WebTestBase {
 
-  public static $modules = ['node'];
+  use EntityReferenceTestTrait;
+
+  public static $modules = ['node', 'taxonomy'];
 
   /**
    * The name of a content type that will reference $referencedType.
@@ -44,7 +50,7 @@ protected function setUp() {
     $referenced = $this->drupalCreateContentType();
     $this->referencedType = $referenced->id();
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'test_field',
       'entity_type' => 'node',
       'translatable' => FALSE,
@@ -56,7 +62,7 @@ protected function setUp() {
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'label' => 'Entity reference field',
       'field_name' => 'test_field',
       'entity_type' => 'node',
@@ -72,7 +78,7 @@ protected function setUp() {
           'auto_create' => TRUE,
         ),
       ),
-    ))->save();
+    ])->save();
 
     entity_get_display('node', $referencing->id(), 'default')
       ->setComponent('test_field')
@@ -82,6 +88,9 @@ protected function setUp() {
         'type' => 'entity_reference_autocomplete',
       ))
       ->save();
+
+    $account = $this->drupalCreateUser(['access content', "create $this->referencingType content"]);
+    $this->drupalLogin($account);
   }
 
   /**
@@ -89,9 +98,6 @@ protected function setUp() {
    * entity.
    */
   public function testAutoCreate() {
-    $user1 = $this->drupalCreateUser(array('access content', "create $this->referencingType content"));
-    $this->drupalLogin($user1);
-
     $this->drupalGet('node/add/' . $this->referencingType);
     $this->assertFieldByXPath('//input[@id="edit-test-field-0-target-id" and contains(@class, "form-autocomplete")]', NULL, 'The autocomplete input element appears.');
 
@@ -134,4 +140,94 @@ public function testAutoCreate() {
     $this->assertText($referencing_node->label(), 'Referencing node label found.');
     $this->assertText($referenced_node->label(), 'Referenced node label found.');
   }
+
+  /**
+   * Tests if an entity reference field having multiple target bundles is
+   * storing the auto-created entity in the right destination.
+   */
+  public function testMultipleTargetBundles() {
+    /** @var \Drupal\taxonomy\Entity\Vocabulary[] $vocabularies */
+    $vocabularies = [];
+    for ($i = 0; $i < 2; $i++) {
+      $vid = Unicode::strtolower($this->randomMachineName());
+      $vocabularies[$i] = Vocabulary::create([
+        'name' => $this->randomMachineName(),
+        'vid' => $vid,
+      ]);
+      $vocabularies[$i]->save();
+    }
+
+    // Create a taxonomy term entity reference field that saves the auto-created
+    // taxonomy terms in the second vocabulary from the two that were configured
+    // as targets.
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $handler_settings = [
+      'target_bundles' => [
+        $vocabularies[0]->id() => $vocabularies[0]->id(),
+        $vocabularies[1]->id() => $vocabularies[1]->id(),
+      ],
+      'auto_create' => TRUE,
+      'auto_create_bundle' => $vocabularies[1]->id(),
+    ];
+    $this->createEntityReferenceField('node', $this->referencingType, $field_name, $this->randomString(), 'taxonomy_term', 'default', $handler_settings);
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $fd */
+    entity_get_form_display('node', $this->referencingType, 'default')
+      ->setComponent($field_name, ['type' => 'entity_reference_autocomplete'])
+      ->save();
+
+    $term_name = $this->randomString();
+    $edit = [
+      $field_name . '[0][target_id]' => $term_name,
+      'title[0][value]' => $this->randomString(),
+    ];
+
+    $this->drupalPostForm('node/add/' . $this->referencingType, $edit, 'Save');
+    /** @var \Drupal\taxonomy\Entity\Term $term */
+    $term = taxonomy_term_load_multiple_by_name($term_name);
+    $term = reset($term);
+
+    // The new term is expected to be stored in the second vocabulary.
+    $this->assertEqual($vocabularies[1]->id(), $term->bundle());
+
+    /** @var \Drupal\field\Entity\FieldConfig $field_config */
+    $field_config = FieldConfig::loadByName('node', $this->referencingType, $field_name);
+    $handler_settings = $field_config->getSetting('handler_settings');
+
+    // Change the field setting to store the auto-created terms in the first
+    // vocabulary and test again.
+    $handler_settings['auto_create_bundle'] = $vocabularies[0]->id();
+    $field_config->setSetting('handler_settings', $handler_settings);
+    $field_config->save();
+
+    $term_name = $this->randomString();
+    $edit = [
+      $field_name . '[0][target_id]' => $term_name,
+      'title[0][value]' => $this->randomString(),
+    ];
+
+    $this->drupalPostForm('node/add/' . $this->referencingType, $edit, 'Save');
+    /** @var \Drupal\taxonomy\Entity\Term $term */
+    $term = taxonomy_term_load_multiple_by_name($term_name);
+    $term = reset($term);
+
+    // The second term is expected to be stored in the first vocabulary.
+    $this->assertEqual($vocabularies[0]->id(), $term->bundle());
+
+    // @todo Re-enable this test when WebTestBase::curlHeaderCallback() provides
+    //   a way to catch and assert user-triggered errors.
+
+    // Test the case when the field config settings are inconsistent.
+    //unset($handler_settings['auto_create_bundle']);
+    //$field_config->setSetting('handler_settings', $handler_settings);
+    //$field_config->save();
+    //
+    //$this->drupalGet('node/add/' . $this->referencingType);
+    //$error_message = sprintf(
+    //  "Create referenced entities if they don't already exist option is enabled but a specific destination bundle is not set. You should re-visit and fix the settings of the '%s' (%s) field.",
+    //  $field_config->getLabel(),
+    //  $field_config->getName()
+    //);
+    //$this->assertErrorLogged($error_message);
+  }
+
 }
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php
index ae6fec7..158b454 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -9,7 +9,9 @@
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -55,14 +57,14 @@ function testEntityReferenceDefaultValue() {
     $referenced_node = $this->drupalCreateNode(array('type' => 'referenced_content'));
 
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'entity_reference',
       'settings' => array('target_type' => 'node'),
     ));
     $field_storage->save();
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'reference_content',
       'settings' => array(
@@ -72,7 +74,7 @@ function testEntityReferenceDefaultValue() {
           'sort' => array('field' => '_none'),
         ),
       ),
-    ));
+    ]);
     $field->save();
 
     // Set created node as default_value.
@@ -97,7 +99,7 @@ function testEntityReferenceDefaultValue() {
     \Drupal::entityManager()->clearCachedFieldDefinitions();
 
     // Create a new node to check that UUID has been converted to numeric ID.
-    $new_node = entity_create('node', array('type' => 'reference_content'));
+    $new_node = Node::create(['type' => 'reference_content']);
     $this->assertEqual($new_node->get($field_name)->offsetGet(0)->target_id, $referenced_node->id());
 
     // Ensure that the entity reference config schemas are correct.
@@ -118,7 +120,7 @@ function testEntityReferenceDefaultConfigValue() {
     $referenced_node_type2 = $this->drupalCreateContentType(array('type' => 'referenced_config_to_preserve'));
 
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'entity_reference',
@@ -126,7 +128,7 @@ function testEntityReferenceDefaultConfigValue() {
       'cardinality' => FieldStorageConfig::CARDINALITY_UNLIMITED,
     ));
     $field_storage->save();
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'reference_content',
       'settings' => array(
@@ -135,7 +137,7 @@ function testEntityReferenceDefaultConfigValue() {
           'sort' => array('field' => '_none'),
         ),
       ),
-    ));
+    ]);
     $field->save();
 
     // Set created node as default_value.
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
index 7b3568c..6d2ffc2 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
@@ -7,9 +7,11 @@
 
 namespace Drupal\field\Tests\EntityReference;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the translation of entity reference field display on nodes.
@@ -206,7 +208,7 @@ protected function enableTranslation() {
    * Adds term reference field for the article content type.
    */
   protected function setUpEntityReferenceField() {
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->referenceFieldName,
       'entity_type' => $this->testEntityTypeName,
       'type' => 'entity_reference',
@@ -221,11 +223,11 @@ protected function setUpEntityReferenceField() {
       ),
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $this->referenceFieldName,
       'bundle' => $this->referrerType->id(),
       'entity_type' => $this->testEntityTypeName,
-    ))
+    ])
     ->save();
     entity_get_form_display($this->testEntityTypeName, $this->referrerType->id(), 'default')
       ->setComponent($this->referenceFieldName, array(
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
index eb9f640..a487f6a 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceFileUploadTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\field\Tests\EntityReference;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests an autocomplete widget with file upload.
@@ -51,7 +53,7 @@ protected function setUp() {
     $this->referencedType = $referenced->id();
     $this->nodeId = $this->drupalCreateNode(array('type' => $referenced->id()))->id();
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'test_field',
       'entity_type' => 'node',
       'translatable' => FALSE,
@@ -63,7 +65,7 @@ protected function setUp() {
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'label' => 'Entity reference field',
       'field_name' => 'test_field',
       'entity_type' => 'node',
@@ -78,23 +80,23 @@ protected function setUp() {
           ),
         ),
       ),
-    ))->save();
+    ])->save();
 
 
     // Create a file field.
     $file_field_name = 'file_field';
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $file_field_name,
       'entity_type' => 'node',
       'type' => 'file'
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => 'node',
       'field_storage' => $field_storage,
       'bundle' => $referencing->id(),
       'label' => $this->randomMachineName() . '_label',
-    ))->save();
+    ])->save();
 
     entity_get_display('node', $referencing->id(), 'default')
       ->setComponent('test_field')
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
deleted file mode 100644
index cc41f7d..0000000
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceFormatterTest.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\EntityReference\EntityReferenceFormatterTest.
- */
-
-namespace Drupal\field\Tests\EntityReference;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableMetadata;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Tests the formatters functionality.
- *
- * @group entity_reference
- */
-class EntityReferenceFormatterTest extends EntityUnitTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * The entity type used in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'entity_test';
-
-  /**
-   * The bundle used in this test.
-   *
-   * @var string
-   */
-  protected $bundle = 'entity_test';
-
-  /**
-   * The name of the field used in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  /**
-   * The entity to be referenced in this test.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  protected $referencedEntity;
-
-  /**
-   * The entity that is not yet saved to its persistent storage to be referenced
-   * in this test.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  protected $unsavedReferencedEntity;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Use Classy theme for testing markup output.
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-
-    // Grant the 'view test entity' permission.
-    $this->installConfig(array('user'));
-    Role::load(RoleInterface::ANONYMOUS_ID)
-      ->grantPermission('view test entity')
-      ->save();
-
-    // The label formatter rendering generates links, so build the router.
-    $this->installSchema('system', 'router');
-    $this->container->get('router.builder')->rebuild();
-
-    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType, 'default', array(), FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
-
-    // Set up a field, so that the entity that'll be referenced bubbles up a
-    // cache tag when rendering it entirely.
-    entity_create('field_storage_config', array(
-      'field_name' => 'body',
-      'entity_type' => $this->entityType,
-      'type' => 'text',
-      'settings' => array(),
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => $this->entityType,
-      'bundle' => $this->bundle,
-      'field_name' => 'body',
-      'label' => 'Body',
-    ))->save();
-    entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent('body', array(
-        'type' => 'text_default',
-        'settings' => array(),
-      ))
-      ->save();
-
-    entity_create('filter_format', array(
-      'format' => 'full_html',
-      'name' => 'Full HTML',
-    ))->save();
-
-    // Create the entity to be referenced.
-    $this->referencedEntity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-    $this->referencedEntity->body = array(
-      'value' => '<p>Hello, world!</p>',
-      'format' => 'full_html',
-    );
-    $this->referencedEntity->save();
-
-    // Create another entity to be referenced but do not save it.
-    $this->unsavedReferencedEntity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-    $this->unsavedReferencedEntity->body = array(
-      'value' => '<p>Hello, unsaved world!</p>',
-      'format' => 'full_html',
-    );
-  }
-
-  /**
-   * Assert inaccessible items don't change the data of the fields.
-   */
-  public function testAccess() {
-    // Revoke the 'view test entity' permission for this test.
-    Role::load(RoleInterface::ANONYMOUS_ID)
-      ->revokePermission('view test entity')
-      ->save();
-
-    $field_name = $this->fieldName;
-
-    $referencing_entity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-    $referencing_entity->save();
-    $referencing_entity->{$field_name}->entity = $this->referencedEntity;
-
-    // Assert user doesn't have access to the entity.
-    $this->assertFalse($this->referencedEntity->access('view'), 'Current user does not have access to view the referenced entity.');
-
-    $formatter_manager = $this->container->get('plugin.manager.field.formatter');
-
-    // Get all the existing formatters.
-    foreach ($formatter_manager->getOptions('entity_reference') as $formatter => $name) {
-      // Set formatter type for the 'full' view mode.
-      entity_get_display($this->entityType, $this->bundle, 'default')
-        ->setComponent($field_name, array(
-          'type' => $formatter,
-        ))
-        ->save();
-
-      // Invoke entity view.
-      entity_view($referencing_entity, 'default');
-
-      // Verify the un-accessible item still exists.
-      $this->assertEqual($referencing_entity->{$field_name}->target_id, $this->referencedEntity->id(), format_string('The un-accessible item still exists after @name formatter was executed.', array('@name' => $name)));
-    }
-  }
-
-  /**
-   * Tests the ID formatter.
-   */
-  public function testIdFormatter() {
-    $formatter = 'entity_reference_entity_id';
-    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
-
-    $this->assertEqual($build[0]['#plain_text'], $this->referencedEntity->id(), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
-    $this->assertEqual($build[0]['#cache']['tags'], $this->referencedEntity->getCacheTags(), sprintf('The %s formatter has the expected cache tags.', $formatter));
-    $this->assertTrue(!isset($build[1]), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
-  }
-
-  /**
-   * Tests the entity formatter.
-   */
-  public function testEntityFormatter() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $formatter = 'entity_reference_entity_view';
-    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
-
-    // Test the first field item.
-    $expected_rendered_name_field_1 = '
-            <div class="field field--name-name field--type-string field--label-hidden field__item">' . $this->referencedEntity->label() . '</div>
-      ';
-    $expected_rendered_body_field_1 = '
-  <div class="clearfix text-formatted field field--name-body field--type-text field--label-above">
-    <div class="field__label">Body</div>
-              <div class="field__item"><p>Hello, world!</p></div>
-          </div>
-';
-    $renderer->renderRoot($build[0]);
-    $this->assertEqual($build[0]['#markup'], 'default | ' . $this->referencedEntity->label() .  $expected_rendered_name_field_1 . $expected_rendered_body_field_1, sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
-    $expected_cache_tags = Cache::mergeTags(\Drupal::entityManager()->getViewBuilder($this->entityType)->getCacheTags(), $this->referencedEntity->getCacheTags());
-    $expected_cache_tags = Cache::mergeTags($expected_cache_tags, FilterFormat::load('full_html')->getCacheTags());
-    $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags.', array('@formatter' => $formatter)));
-
-    // Test the second field item.
-    $renderer->renderRoot($build[1]);
-    $this->assertEqual($build[1]['#markup'], $this->unsavedReferencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
-  }
-
-  /**
-   * Tests the label formatter.
-   */
-  public function testLabelFormatter() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $formatter = 'entity_reference_label';
-
-    // The 'link' settings is TRUE by default.
-    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
-
-    $expected_field_cacheability = [
-      'contexts' => [],
-      'tags' => [],
-      'max-age' => Cache::PERMANENT,
-    ];
-    $this->assertEqual($build['#cache'], $expected_field_cacheability, 'The field render array contains the entity access cacheability metadata');
-    $expected_item_1 = array(
-      '#type' => 'link',
-      '#title' => $this->referencedEntity->label(),
-      '#url' => $this->referencedEntity->urlInfo(),
-      '#options' => $this->referencedEntity->urlInfo()->getOptions(),
-      '#cache' => array(
-        'contexts' => [
-          'user.permissions',
-        ],
-        'tags' => $this->referencedEntity->getCacheTags(),
-      ),
-    );
-    $this->assertEqual($renderer->renderRoot($build[0]), $renderer->renderRoot($expected_item_1), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
-    $this->assertEqual(CacheableMetadata::createFromRenderArray($build[0]), CacheableMetadata::createFromRenderArray($expected_item_1));
-
-    // The second referenced entity is "autocreated", therefore not saved and
-    // lacking any URL info.
-    $expected_item_2 = array(
-      '#plain_text' => $this->unsavedReferencedEntity->label(),
-      '#cache' => array(
-        'contexts' => [
-          'user.permissions',
-        ],
-        'tags' => $this->unsavedReferencedEntity->getCacheTags(),
-        'max-age' => Cache::PERMANENT,
-      ),
-    );
-    $this->assertEqual($build[1], $expected_item_2, sprintf('The render array returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
-
-    // Test with the 'link' setting set to FALSE.
-    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter, array('link' => FALSE));
-    $this->assertEqual($build[0]['#plain_text'], $this->referencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
-    $this->assertEqual($build[1]['#plain_text'], $this->unsavedReferencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
-
-    // Test an entity type that doesn't have any link templates, which means
-    // \Drupal\Core\Entity\EntityInterface::urlInfo() will throw an exception
-    // and the label formatter will output only the label instead of a link.
-    $field_storage_config = FieldStorageConfig::loadByName($this->entityType, $this->fieldName);
-    $field_storage_config->setSetting('target_type', 'entity_test_label');
-    $field_storage_config->save();
-
-    $referenced_entity_with_no_link_template = entity_create('entity_test_label', array(
-      'name' => $this->randomMachineName(),
-    ));
-    $referenced_entity_with_no_link_template->save();
-
-    $build = $this->buildRenderArray([$referenced_entity_with_no_link_template], $formatter, array('link' => TRUE));
-    $this->assertEqual($build[0]['#plain_text'], $referenced_entity_with_no_link_template->label(), sprintf('The markup returned by the %s formatter is correct for an entity type with no valid link template.', $formatter));
-  }
-
-  /**
-   * Sets field values and returns a render array as built by
-   * \Drupal\Core\Field\FieldItemListInterface::view().
-   *
-   * @param \Drupal\Core\Entity\EntityInterface[] $referenced_entities
-   *   An array of entity objects that will be referenced.
-   * @param string $formatter
-   *   The formatted plugin that will be used for building the render array.
-   * @param array $formatter_options
-   *   Settings specific to the formatter. Defaults to the formatter's default
-   *   settings.
-   *
-   * @return array
-   *   A render array.
-   */
-  protected function buildRenderArray(array $referenced_entities, $formatter, $formatter_options = array()) {
-    // Create the entity that will have the entity reference field.
-    $referencing_entity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-
-    $items = $referencing_entity->get($this->fieldName);
-
-    // Assign the referenced entities.
-    foreach ($referenced_entities as $referenced_entity) {
-      $items[] = ['entity' => $referenced_entity];
-    }
-
-    // Build the renderable array for the field.
-    return $items->view(array('type' => $formatter, 'settings' => $formatter_options));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php
index 4d678f8..ef536f4 100644
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php
+++ b/core/modules/field/src/Tests/EntityReference/EntityReferenceIntegrationTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\config\Tests\AssertConfigEntityImportTrait;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
 
@@ -202,9 +203,9 @@ protected function getTestEntities() {
     $config_entity_2 = entity_create('config_test', array('id' => $this->randomMachineName(), 'label' => $this->randomMachineName()));
     $config_entity_2->save();
 
-    $content_entity_1 = entity_create('entity_test', array('name' => $this->randomMachineName()));
+    $content_entity_1 = EntityTest::create(array('name' => $this->randomMachineName()));
     $content_entity_1->save();
-    $content_entity_2 = entity_create('entity_test', array('name' => $this->randomMachineName()));
+    $content_entity_2 = EntityTest::create(array('name' => $this->randomMachineName()));
     $content_entity_2->save();
 
     return array(
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php
deleted file mode 100644
index 0245638..0000000
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\EntityReference\EntityReferenceItemTest.
- */
-
-namespace Drupal\field\Tests\EntityReference;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestStringId;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Tests\FieldUnitTestBase;
-use Drupal\file\Entity\File;
-use Drupal\node\Entity\Node;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\user\Entity\User;
-
-
-/**
- * Tests the new entity API for the entity reference field type.
- *
- * @group entity_reference
- */
-class EntityReferenceItemTest extends FieldUnitTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'comment', 'file', 'taxonomy', 'text', 'filter', 'views', 'field'];
-
-  /**
-   * The taxonomy vocabulary to test with.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * The taxonomy term to test with.
-   *
-   * @var \Drupal\taxonomy\TermInterface
-   */
-  protected $term;
-
-  /**
-   * The test entity with a string ID.
-   *
-   * @var \Drupal\entity_test\Entity\EntityTestStringId
-   */
-  protected $entityStringId;
-
-  /**
-   * Sets up the test.
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_string_id');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('file');
-
-    $this->installSchema('comment', ['comment_entity_statistics']);
-    $this->installSchema('node', ['node_access']);
-
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
-      'name' => $this->randomMachineName(),
-      'vid' => Unicode::strtolower($this->randomMachineName()),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->vocabulary->save();
-
-    $this->term = entity_create('taxonomy_term', array(
-      'name' => $this->randomMachineName(),
-      'vid' => $this->vocabulary->id(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->term->save();
-
-    $this->entityStringId = EntityTestStringId::create([
-      'id' => $this->randomMachineName(),
-    ]);
-    $this->entityStringId->save();
-
-    // Use the util to create an instance.
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_taxonomy_term', 'Test content entity reference', 'taxonomy_term');
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_entity_test_string_id', 'Test content entity reference with string ID', 'entity_test_string_id');
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_taxonomy_vocabulary', 'Test config entity reference', 'taxonomy_vocabulary');
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_node', 'Test node entity reference', 'node', 'default', [], FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_user', 'Test user entity reference', 'user');
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_comment', 'Test comment entity reference', 'comment');
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_file', 'Test file entity reference', 'file');
-  }
-
-  /**
-   * Tests the entity reference field type for referencing content entities.
-   */
-  public function testContentEntityReferenceItem() {
-    $tid = $this->term->id();
-
-    // Just being able to create the entity like this verifies a lot of code.
-    $entity = entity_create('entity_test');
-    $entity->field_test_taxonomy_term->target_id = $tid;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $entity = entity_load('entity_test', $entity->id());
-    $this->assertTrue($entity->field_test_taxonomy_term instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_test_taxonomy_term[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $tid);
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $this->term->getName());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $tid);
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->uuid(), $this->term->uuid());
-    // Verify that the label for the target ID property definition is correct.
-    $label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
-    $this->assertTrue($label instanceof TranslatableMarkup);
-    $this->assertEqual($label->render(), 'Taxonomy term ID');
-
-    // Change the name of the term via the reference.
-    $new_name = $this->randomMachineName();
-    $entity->field_test_taxonomy_term->entity->setName($new_name);
-    $entity->field_test_taxonomy_term->entity->save();
-    // Verify it is the correct name.
-    $term = Term::load($tid);
-    $this->assertEqual($term->getName(), $new_name);
-
-    // Make sure the computed term reflects updates to the term id.
-    $term2 = entity_create('taxonomy_term', array(
-      'name' => $this->randomMachineName(),
-      'vid' => $this->term->bundle(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $term2->save();
-
-    // Test all the possible ways of assigning a value.
-    $entity->field_test_taxonomy_term->target_id = $term->id();
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term->getName());
-
-    $entity->field_test_taxonomy_term = [['target_id' => $term2->id()]];
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term2->id());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term2->getName());
-
-    // Test value assignment via the computed 'entity' property.
-    $entity->field_test_taxonomy_term->entity = $term;
-    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $term->id());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term->getName());
-
-    $entity->field_test_taxonomy_term = [['entity' => $term2]];
-    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $term2->id());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term2->getName());
-
-    // Test assigning an invalid item throws an exception.
-    try {
-      $entity->field_test_taxonomy_term = ['target_id' => 'invalid', 'entity' => $term2];
-      $this->fail('Assigning an invalid item throws an exception.');
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass('Assigning an invalid item throws an exception.');
-    }
-
-    // Delete terms so we have nothing to reference and try again
-    $term->delete();
-    $term2->delete();
-    $entity = entity_create('entity_test', array('name' => $this->randomMachineName()));
-    $entity->save();
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->field_test_taxonomy_term->generateSampleItems();
-    $entity->field_test_taxonomy_vocabulary->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-  /**
-   * Tests referencing content entities with string IDs.
-   */
-  public function testContentEntityReferenceItemWithStringId() {
-    $entity = EntityTest::create();
-    $entity->field_test_entity_test_string_id->target_id = $this->entityStringId->id();
-    $entity->save();
-    $storage = \Drupal::entityManager()->getStorage('entity_test');
-    $storage->resetCache();
-    $this->assertEqual($this->entityStringId->id(), $storage->load($entity->id())->field_test_entity_test_string_id->target_id);
-    // Verify that the label for the target ID property definition is correct.
-    $label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
-    $this->assertTrue($label instanceof TranslatableMarkup);
-    $this->assertEqual($label->render(), 'Taxonomy term ID');
-  }
-
-  /**
-   * Tests the entity reference field type for referencing config entities.
-   */
-  public function testConfigEntityReferenceItem() {
-    $referenced_entity_id = $this->vocabulary->id();
-
-    // Just being able to create the entity like this verifies a lot of code.
-    $entity = entity_create('entity_test');
-    $entity->field_test_taxonomy_vocabulary->target_id = $referenced_entity_id;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $entity = entity_load('entity_test', $entity->id());
-    $this->assertTrue($entity->field_test_taxonomy_vocabulary instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_test_taxonomy_vocabulary[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->target_id, $referenced_entity_id);
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->label(), $this->vocabulary->label());
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->id(), $referenced_entity_id);
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->uuid(), $this->vocabulary->uuid());
-
-    // Change the name of the term via the reference.
-    $new_name = $this->randomMachineName();
-    $entity->field_test_taxonomy_vocabulary->entity->set('name', $new_name);
-    $entity->field_test_taxonomy_vocabulary->entity->save();
-    // Verify it is the correct name.
-    $vocabulary = Vocabulary::load($referenced_entity_id);
-    $this->assertEqual($vocabulary->label(), $new_name);
-
-    // Make sure the computed term reflects updates to the term id.
-    $vocabulary2 = entity_create('taxonomy_vocabulary', array(
-      'name' => $this->randomMachineName(),
-      'vid' => Unicode::strtolower($this->randomMachineName()),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $vocabulary2->save();
-
-    $entity->field_test_taxonomy_vocabulary->target_id = $vocabulary2->id();
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->id(), $vocabulary2->id());
-    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->label(), $vocabulary2->label());
-
-    // Delete terms so we have nothing to reference and try again
-    $this->vocabulary->delete();
-    $vocabulary2->delete();
-    $entity = entity_create('entity_test', array('name' => $this->randomMachineName()));
-    $entity->save();
-  }
-
-  /**
-   * Tests entity auto create.
-   */
-  public function testEntityAutoCreate() {
-    // The term entity is unsaved here.
-    $term = Term::create(array(
-      'name' => $this->randomMachineName(),
-      'vid' => $this->term->bundle(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $entity = EntityTest::create();
-    // Now assign the unsaved term to the field.
-    $entity->field_test_taxonomy_term->entity = $term;
-    $entity->name->value = $this->randomMachineName();
-    // This is equal to storing an entity to tempstore or cache and retrieving
-    // it back. An example for this is node preview.
-    $entity = serialize($entity);
-    $entity = unserialize($entity);
-    // And then the entity.
-    $entity->save();
-    $term = \Drupal::entityManager()->loadEntityByUuid($term->getEntityTypeId(), $term->uuid());
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
-  }
-
-  /**
-   * Test saving order sequence doesn't matter.
-   */
-  public function testEntitySaveOrder() {
-    // The term entity is unsaved here.
-    $term = entity_create('taxonomy_term', array(
-      'name' => $this->randomMachineName(),
-      'vid' => $this->term->bundle(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $entity = entity_create('entity_test');
-    // Now assign the unsaved term to the field.
-    $entity->field_test_taxonomy_term->entity = $term;
-    $entity->name->value = $this->randomMachineName();
-    // Now get the field value.
-    $value = $entity->get('field_test_taxonomy_term');
-    $this->assertTrue(empty($value['target_id']));
-    $this->assertNull($entity->field_test_taxonomy_term->target_id);
-    // And then set it.
-    $entity->field_test_taxonomy_term = $value;
-    // Now save the term.
-    $term->save();
-    // And then the entity.
-    $entity->save();
-    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
-  }
-
-  /**
-   * Tests that the 'handler' field setting stores the proper plugin ID.
-   */
-  public function testSelectionHandlerSettings() {
-    $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'entity_reference',
-      'settings' => array(
-        'target_type' => 'entity_test'
-      ),
-    ));
-    $field_storage->save();
-
-    // Do not specify any value for the 'handler' setting in order to verify
-    // that the default handler with the correct derivative is used.
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-    $field = FieldConfig::load($field->id());
-    $this->assertEqual($field->getSetting('handler'), 'default:entity_test');
-
-    // Change the target_type in the field storage, and check that the handler
-    // was correctly reassigned in the field.
-    $field_storage->setSetting('target_type', 'entity_test_rev');
-    $field_storage->save();
-    $field = FieldConfig::load($field->id());
-    $this->assertEqual($field->getSetting('handler'), 'default:entity_test_rev');
-
-    // Change the handler to another, non-derivative plugin.
-    $field->setSetting('handler', 'views');
-    $field->save();
-    $field = FieldConfig::load($field->id());
-    $this->assertEqual($field->getSetting('handler'), 'views');
-
-    // Change the target_type in the field storage again, and check that the
-    // non-derivative handler was unchanged.
-    $field_storage->setSetting('target_type', 'entity_test_rev');
-    $field_storage->save();
-    $field = FieldConfig::load($field->id());
-    $this->assertEqual($field->getSetting('handler'), 'views');
-  }
-
-  /**
-   * Tests ValidReferenceConstraint with newly created and unsaved entities.
-   */
-  public function testAutocreateValidation() {
-    // The term entity is unsaved here.
-    $term = Term::create(array(
-      'name' => $this->randomMachineName(),
-      'vid' => $this->term->bundle(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $entity = EntityTest::create([
-      'field_test_taxonomy_term' => [
-        'entity' => $term,
-        'target_id' => NULL,
-      ],
-    ]);
-    $errors = $entity->validate();
-    // Using target_id of NULL is valid with an unsaved entity.
-    $this->assertEqual(0, count($errors));
-    // Using target_id of NULL is not valid with a saved entity.
-    $term->save();
-    $entity = EntityTest::create([
-      'field_test_taxonomy_term' => [
-        'entity' => $term,
-        'target_id' => NULL,
-      ],
-    ]);
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), 'This value should not be null.');
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_taxonomy_term.0');
-    // This should rectify the issue, favoring the entity over the target_id.
-    $entity->save();
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-
-    // Test with an unpublished and unsaved node.
-    $title = $this->randomString();
-    $node = Node::create([
-      'title' => $title,
-      'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
-    ]);
-
-    $entity = EntityTest::create([
-      'field_test_node' => [
-        'entity' => $node,
-      ],
-    ]);
-
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $title]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
-
-    // Publish the node and try again.
-    $node->setPublished(TRUE);
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-
-    // Test with a mix of valid and invalid nodes.
-    $unsaved_unpublished_node_title = $this->randomString();
-    $unsaved_unpublished_node = Node::create([
-      'title' => $unsaved_unpublished_node_title,
-      'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
-    ]);
-
-    $saved_unpublished_node_title = $this->randomString();
-    $saved_unpublished_node = Node::create([
-      'title' => $saved_unpublished_node_title,
-      'type' => 'node',
-      'status' => NODE_NOT_PUBLISHED,
-    ]);
-    $saved_unpublished_node->save();
-
-    $saved_published_node_title = $this->randomString();
-    $saved_published_node = Node::create([
-      'title' => $saved_published_node_title,
-      'type' => 'node',
-      'status' => NODE_PUBLISHED,
-    ]);
-    $saved_published_node->save();
-
-    $entity = EntityTest::create([
-      'field_test_node' => [
-        [
-          'entity' => $unsaved_unpublished_node,
-        ],
-        [
-          'target_id' => $saved_unpublished_node->id(),
-        ],
-        [
-          'target_id' => $saved_published_node->id(),
-        ],
-      ],
-    ]);
-
-    $errors = $entity->validate();
-    $this->assertEqual(2, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
-    $this->assertEqual($errors[1]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $saved_unpublished_node->id()]));
-    $this->assertEqual($errors[1]->getPropertyPath(), 'field_test_node.1.target_id');
-
-    // Publish one of the nodes and try again.
-    $saved_unpublished_node->setPublished(TRUE);
-    $saved_unpublished_node->save();
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
-
-    // Publish the last invalid node and try again.
-    $unsaved_unpublished_node->setPublished(TRUE);
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-
-    // Test with an unpublished and unsaved comment.
-    $title = $this->randomString();
-    $comment = Comment::create([
-      'subject' => $title,
-      'comment_type' => 'comment',
-      'status' => 0,
-    ]);
-
-    $entity = EntityTest::create([
-      'field_test_comment' => [
-        'entity' => $comment,
-      ],
-    ]);
-
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'comment', '%label' => $title]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_comment.0.entity');
-
-    // Publish the comment and try again.
-    $comment->setPublished(TRUE);
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-
-    // Test with an inactive and unsaved user.
-    $name = $this->randomString();
-    $user = User::create([
-      'name' => $name,
-      'status' => 0,
-    ]);
-
-    $entity = EntityTest::create([
-      'field_test_user' => [
-        'entity' => $user,
-      ],
-    ]);
-
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'user', '%label' => $name]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_user.0.entity');
-
-    // Activate the user and try again.
-    $user->activate();
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-
-    // Test with a temporary and unsaved file.
-    $filename = $this->randomMachineName() . '.txt';
-    $file = File::create([
-      'filename' => $filename,
-      'status' => 0,
-    ]);
-
-    $entity = EntityTest::create([
-      'field_test_file' => [
-        'entity' => $file,
-      ],
-    ]);
-
-    $errors = $entity->validate();
-    $this->assertEqual(1, count($errors));
-    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'file', '%label' => $filename]));
-    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_file.0.entity');
-
-    // Set the file as permanent and try again.
-    $file->setPermanent();
-    $errors = $entity->validate();
-    $this->assertEqual(0, count($errors));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceSettingsTest.php b/core/modules/field/src/Tests/EntityReference/EntityReferenceSettingsTest.php
deleted file mode 100644
index dbbbe44..0000000
--- a/core/modules/field/src/Tests/EntityReference/EntityReferenceSettingsTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\EntityReference\EntityReferenceSettingsTest.
- */
-
-namespace Drupal\field\Tests\EntityReference;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\taxonomy\Entity\Vocabulary;
-
-/**
- * Tests entity reference field settings.
- *
- * @group field
- */
-class EntityReferenceSettingsTest extends KernelTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node', 'taxonomy', 'field', 'user', 'text', 'entity_reference', 'entity_test'];
-
-  /**
-   * Testing node type.
-   *
-   * @var \Drupal\node\Entity\NodeType
-   */
-  protected $nodeType;
-
-  /**
-   * Testing vocabulary.
-   *
-   * @var \Drupal\taxonomy\Entity\Vocabulary
-   */
-  protected $vocabulary;
-
-  /**
-   * An entity bundle that is not stored as a configuration entity.
-   *
-   * @var string
-   */
-  protected $customBundle;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setup();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('entity_test');
-
-    $this->nodeType = NodeType::create([
-      'type' => Unicode::strtolower($this->randomMachineName()),
-      'name' => $this->randomString(),
-    ]);
-    $this->nodeType->save();
-
-    $this->vocabulary = Vocabulary::create([
-      'vid' => Unicode::strtolower($this->randomMachineName()),
-      'name' => $this->randomString(),
-    ]);
-    $this->vocabulary->save();
-
-    // Create a custom bundle.
-    $this->customBundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
-    entity_test_create_bundle($this->customBundle, NULL, 'entity_test');
-  }
-
-  /**
-   * Tests that config bundle deletions are mirrored in field config settings.
-   */
-  public function testConfigTargetBundleDeletion() {
-    // Attach an entity reference field to $this->nodeType.
-    $name = Unicode::strtolower($this->randomMachineName());
-    $label = $this->randomString();
-    $vid = $this->vocabulary->id();
-    $handler_settings = ['target_bundles' => [$vid => $vid]];
-    $this->createEntityReferenceField('node', $this->nodeType->id(), $name, $label, 'taxonomy_term', 'default', $handler_settings);
-
-    // Check that the 'target_bundle' setting contains the vocabulary.
-    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
-    $actual_handler_settings = $field_config->getSetting('handler_settings');
-    $this->assertEqual($handler_settings, $actual_handler_settings);
-
-    // Delete the vocabulary.
-    $this->vocabulary->delete();
-
-    // Check that the deleted vocabulary is no longer present in the
-    // 'target_bundles' field setting.
-    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
-    $handler_settings = $field_config->getSetting('handler_settings');
-    $this->assertTrue(empty($handler_settings['target_bundles']));
-  }
-
-  /**
-   * Tests that deletions of custom bundles are mirrored in field settings.
-   */
-  public function testCustomTargetBundleDeletion() {
-    // Attach an entity reference field to $this->nodeType.
-    $name = Unicode::strtolower($this->randomMachineName());
-    $label = $this->randomString();
-    $handler_settings = ['target_bundles' => [$this->customBundle => $this->customBundle]];
-    $this->createEntityReferenceField('node', $this->nodeType->id(), $name, $label, 'entity_test', 'default', $handler_settings);
-
-    // Check that the 'target_bundle' setting contains the custom bundle.
-    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
-    $actual_handler_settings = $field_config->getSetting('handler_settings');
-    $this->assertEqual($handler_settings, $actual_handler_settings);
-
-    // Delete the custom bundle.
-    entity_test_delete_bundle($this->customBundle, 'entity_test');
-
-    // Check that the deleted bundle is no longer present in the
-    // 'target_bundles' field setting.
-    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
-    $handler_settings = $field_config->getSetting('handler_settings');
-    $this->assertTrue(empty($handler_settings['target_bundles']));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php
deleted file mode 100644
index 6ecb328..0000000
--- a/core/modules/field/src/Tests/EntityReference/Views/EntityReferenceRelationshipTest.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\EntityReference\Views\EntityReferenceRelationshipTest.
- */
-
-namespace Drupal\field\Tests\EntityReference\Views;
-
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestMul;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests entity reference relationship data.
- *
- * @group entity_reference
- *
- * @see core_field_views_data()
- */
-class EntityReferenceRelationshipTest extends ViewKernelTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array(
-    'test_entity_reference_entity_test_view',
-    'test_entity_reference_reverse_entity_test_view',
-    'test_entity_reference_entity_test_mul_view',
-    'test_entity_reference_reverse_entity_test_mul_view',
-    );
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = ['user', 'field', 'entity_test', 'views', 'entity_reference_test_views'];
-
-  /**
-   * The entity_test entities used by the test.
-   *
-   * @var array
-   */
-  protected $entities = array();
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('entity_test_mul');
-
-    // Create reference from entity_test to entity_test_mul.
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_data', 'field_test_data', 'entity_test_mul');
-
-    // Create reference from entity_test_mul to entity_test.
-    $this->createEntityReferenceField('entity_test_mul', 'entity_test_mul', 'field_data_test', 'field_data_test', 'entity_test');
-
-    ViewTestData::createTestViews(get_class($this), array('entity_reference_test_views'));
-  }
-
-  /**
-   * Tests using the views relationship.
-   */
-  public function testNoDataTableRelationship() {
-
-    // Create some test entities which link each other.
-    $referenced_entity = EntityTestMul::create();
-    $referenced_entity->save();
-
-    $entity = EntityTest::create();
-    $entity->field_test_data->target_id = $referenced_entity->id();
-    $entity->save();
-    $this->assertEqual($entity->field_test_data[0]->entity->id(), $referenced_entity->id());
-    $this->entities[] = $entity;
-
-    $entity = EntityTest::create();
-    $entity->field_test_data->target_id = $referenced_entity->id();
-    $entity->save();
-    $this->assertEqual($entity->field_test_data[0]->entity->id(), $referenced_entity->id());
-    $this->entities[] = $entity;
-
-    Views::viewsData()->clear();
-
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test__field_test_data');
-    $this->assertEqual($views_data['field_test_data']['relationship']['id'], 'standard');
-    $this->assertEqual($views_data['field_test_data']['relationship']['base'], 'entity_test_mul_property_data');
-    $this->assertEqual($views_data['field_test_data']['relationship']['base field'], 'id');
-    $this->assertEqual($views_data['field_test_data']['relationship']['relationship field'], 'field_test_data_target_id');
-    $this->assertEqual($views_data['field_test_data']['relationship']['entity type'], 'entity_test_mul');
-
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('entity_test_mul_property_data');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['id'], 'entity_reverse');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['base'], 'entity_test');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['base field'], 'id');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field table'], 'entity_test__field_test_data');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field field'], 'field_test_data_target_id');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field_name'], 'field_test_data');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['entity_type'], 'entity_test');
-    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-
-    // Check an actual test view.
-    $view = Views::getView('test_entity_reference_entity_test_view');
-    $this->executeView($view);
-    /** @var \Drupal\views\ResultRow $row */
-    foreach ($view->result as $index => $row) {
-      // Check that the actual ID of the entity is the expected one.
-      $this->assertEqual($row->id, $this->entities[$index]->id());
-
-      // Also check that we have the correct result entity.
-      $this->assertEqual($row->_entity->id(), $this->entities[$index]->id());
-
-      // Test the forward relationship.
-      $this->assertEqual($row->entity_test_mul_property_data_entity_test__field_test_data_i, 1);
-
-      // Test that the correct relationship entity is on the row.
-      $this->assertEqual($row->_relationship_entities['field_test_data']->id(), 1);
-      $this->assertEqual($row->_relationship_entities['field_test_data']->bundle(), 'entity_test_mul');
-
-    }
-
-    // Check the backwards reference view.
-    $view = Views::getView('test_entity_reference_reverse_entity_test_view');
-    $this->executeView($view);
-    /** @var \Drupal\views\ResultRow $row */
-    foreach ($view->result as $index => $row) {
-      $this->assertEqual($row->id, 1);
-      $this->assertEqual($row->_entity->id(), 1);
-
-      // Test the backwards relationship.
-      $this->assertEqual($row->field_test_data_entity_test_mul_property_data_id, $this->entities[$index]->id());
-
-      // Test that the correct relationship entity is on the row.
-      $this->assertEqual($row->_relationship_entities['reverse__entity_test__field_test_data']->id(), $this->entities[$index]->id());
-      $this->assertEqual($row->_relationship_entities['reverse__entity_test__field_test_data']->bundle(), 'entity_test');
-    }
-  }
-
-  /**
-   * Tests views data generated for relationship.
-   *
-   * @see entity_reference_field_views_data()
-   */
-  public function testDataTableRelationship() {
-
-    // Create some test entities which link each other.
-    $referenced_entity = EntityTest::create();
-    $referenced_entity->save();
-
-    $entity = EntityTestMul::create();
-    $entity->field_data_test->target_id = $referenced_entity->id();
-    $entity->save();
-    $this->assertEqual($entity->field_data_test[0]->entity->id(), $referenced_entity->id());
-    $this->entities[] = $entity;
-
-    $entity = EntityTestMul::create();
-    $entity->field_data_test->target_id = $referenced_entity->id();
-    $entity->save();
-    $this->assertEqual($entity->field_data_test[0]->entity->id(), $referenced_entity->id());
-    $this->entities[] = $entity;
-
-    Views::viewsData()->clear();
-
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test_mul__field_data_test');
-    $this->assertEqual($views_data['field_data_test']['relationship']['id'], 'standard');
-    $this->assertEqual($views_data['field_data_test']['relationship']['base'], 'entity_test');
-    $this->assertEqual($views_data['field_data_test']['relationship']['base field'], 'id');
-    $this->assertEqual($views_data['field_data_test']['relationship']['relationship field'], 'field_data_test_target_id');
-    $this->assertEqual($views_data['field_data_test']['relationship']['entity type'], 'entity_test');
-
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('entity_test');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['id'], 'entity_reverse');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['base'], 'entity_test_mul_property_data');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['base field'], 'id');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field table'], 'entity_test_mul__field_data_test');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field field'], 'field_data_test_target_id');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field_name'], 'field_data_test');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['entity_type'], 'entity_test_mul');
-    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-
-    // Check an actual test view.
-    $view = Views::getView('test_entity_reference_entity_test_mul_view');
-    $this->executeView($view);
-    /** @var \Drupal\views\ResultRow $row */
-    foreach ($view->result as $index => $row) {
-      // Check that the actual ID of the entity is the expected one.
-      $this->assertEqual($row->id, $this->entities[$index]->id());
-
-      // Also check that we have the correct result entity.
-      $this->assertEqual($row->_entity->id(), $this->entities[$index]->id());
-
-      // Test the forward relationship.
-      $this->assertEqual($row->entity_test_entity_test_mul__field_data_test_id, 1);
-
-      // Test that the correct relationship entity is on the row.
-      $this->assertEqual($row->_relationship_entities['field_data_test']->id(), 1);
-      $this->assertEqual($row->_relationship_entities['field_data_test']->bundle(), 'entity_test');
-
-    }
-
-    // Check the backwards reference view.
-    $view = Views::getView('test_entity_reference_reverse_entity_test_mul_view');
-    $this->executeView($view);
-    /** @var \Drupal\views\ResultRow $row */
-    foreach ($view->result as $index => $row) {
-      $this->assertEqual($row->id, 1);
-      $this->assertEqual($row->_entity->id(), 1);
-
-      // Test the backwards relationship.
-      $this->assertEqual($row->field_data_test_entity_test_id, $this->entities[$index]->id());
-
-      // Test that the correct relationship entity is on the row.
-      $this->assertEqual($row->_relationship_entities['reverse__entity_test_mul__field_data_test']->id(), $this->entities[$index]->id());
-      $this->assertEqual($row->_relationship_entities['reverse__entity_test_mul__field_data_test']->bundle(), 'entity_test_mul');
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php
index c5db78b..6bcba87 100644
--- a/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php
+++ b/core/modules/field/src/Tests/EntityReference/Views/SelectionTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\field\Tests\EntityReference\Views;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
 use Drupal\views\Views;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests entity reference selection handler.
@@ -50,7 +52,7 @@ protected function setUp() {
     }
 
     // Create a field.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'test_field',
       'entity_type' => 'entity_test',
       'translatable' => FALSE,
@@ -61,7 +63,7 @@ protected function setUp() {
       'cardinality' => '1',
     ));
     $field_storage->save();
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'test_bundle',
       'settings' => array(
@@ -74,7 +76,7 @@ protected function setUp() {
           ),
         ),
       ),
-    ));
+    ]);
     $field->save();
     $this->field = $field;
   }
diff --git a/core/modules/field/src/Tests/FieldAccessTest.php b/core/modules/field/src/Tests/FieldAccessTest.php
index 3617364..b837e85 100644
--- a/core/modules/field/src/Tests/FieldAccessTest.php
+++ b/core/modules/field/src/Tests/FieldAccessTest.php
@@ -7,6 +7,9 @@
 
 namespace Drupal\field\Tests;
 
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
 /**
  * Tests Field access.
  *
@@ -50,13 +53,13 @@ protected function setUp() {
       'entity_type' => 'node',
       'type' => 'text',
     );
-    entity_create('field_storage_config', $field_storage)->save();
+    FieldStorageConfig::create($field_storage)->save();
     $field = array(
       'field_name' => $field_storage['field_name'],
       'entity_type' => 'node',
       'bundle' => $content_type,
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
 
     // Assign display properties for the 'default' and 'teaser' view modes.
     foreach (array('default', 'teaser') as $view_mode) {
diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/src/Tests/FieldAttachOtherTest.php
deleted file mode 100644
index e76145e..0000000
--- a/core/modules/field/src/Tests/FieldAttachOtherTest.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldAttachOtherTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Form\FormState;
-
-/**
- * Tests other Field API functions.
- *
- * @group field
- * @todo move this to the Entity module
- */
-class FieldAttachOtherTest extends FieldUnitTestBase {
-
-  protected function setUp() {
-    parent::setUp();
-    $this->container->get('router.builder')->rebuild();
-    $this->installEntitySchema('entity_test_rev');
-    $this->createFieldWithStorage();
-  }
-
-  /**
-   * Test rendering fields with EntityDisplay build().
-   */
-  function testEntityDisplayBuild() {
-    $this->createFieldWithStorage('_2');
-
-    $entity_type = 'entity_test';
-    $entity_init = entity_create($entity_type);
-
-    // Populate values to be displayed.
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
-    $entity_init->{$this->fieldTestData->field_name}->setValue($values);
-    $values_2 = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
-    $entity_init->{$this->fieldTestData->field_name_2}->setValue($values_2);
-
-    // Simple formatter, label displayed.
-    $entity = clone($entity_init);
-    $display = entity_get_display($entity_type, $entity->bundle(), 'full');
-
-    $formatter_setting = $this->randomMachineName();
-    $display_options = array(
-      'label' => 'above',
-      'type' => 'field_test_default',
-      'settings' => array(
-        'test_formatter_setting' => $formatter_setting,
-      ),
-    );
-    $display->setComponent($this->fieldTestData->field_name, $display_options);
-
-    $formatter_setting_2 = $this->randomMachineName();
-    $display_options_2 = array(
-      'label' => 'above',
-      'type' => 'field_test_default',
-      'settings' => array(
-        'test_formatter_setting' => $formatter_setting_2,
-      ),
-    );
-    $display->setComponent($this->fieldTestData->field_name_2, $display_options_2);
-
-    // View all fields.
-    $content = $display->build($entity);
-    $this->render($content);
-    $this->assertRaw($this->fieldTestData->field->getLabel(), "First field's label is displayed.");
-    foreach ($values as $delta => $value) {
-      $this->assertRaw("$formatter_setting|{$value['value']}", "Value $delta is displayed, formatter settings are applied.");
-    }
-    $this->assertRaw($this->fieldTestData->field_2->getLabel(), "Second field's label is displayed.");
-    foreach ($values_2 as $delta => $value) {
-      $this->assertRaw("$formatter_setting_2|{$value['value']}", "Value $delta is displayed, formatter settings are applied.");
-    }
-
-    // Label hidden.
-    $entity = clone($entity_init);
-    $display_options['label'] = 'hidden';
-    $display->setComponent($this->fieldTestData->field_name, $display_options);
-    $content = $display->build($entity);
-    $this->render($content);
-    $this->assertNoRaw($this->fieldTestData->field->getLabel(), "Hidden label: label is not displayed.");
-
-    // Field hidden.
-    $entity = clone($entity_init);
-    $display->removeComponent($this->fieldTestData->field_name);
-    $content = $display->build($entity);
-    $this->render($content);
-    $this->assertNoRaw($this->fieldTestData->field->getLabel(), "Hidden field: label is not displayed.");
-    foreach ($values as $delta => $value) {
-      $this->assertNoRaw("$formatter_setting|{$value['value']}", "Hidden field: value $delta is not displayed.");
-    }
-
-    // Multiple formatter.
-    $entity = clone($entity_init);
-    $formatter_setting = $this->randomMachineName();
-    $display->setComponent($this->fieldTestData->field_name, array(
-      'label' => 'above',
-      'type' => 'field_test_multiple',
-      'settings' => array(
-        'test_formatter_setting_multiple' => $formatter_setting,
-      ),
-    ));
-    $content = $display->build($entity);
-    $this->render($content);
-    $expected_output = $formatter_setting;
-    foreach ($values as $delta => $value) {
-      $expected_output .= "|$delta:{$value['value']}";
-    }
-    $this->assertRaw($expected_output, "Multiple formatter: all values are displayed, formatter settings are applied.");
-
-    // Test a formatter that uses hook_field_formatter_prepare_view().
-    $entity = clone($entity_init);
-    $formatter_setting = $this->randomMachineName();
-    $display->setComponent($this->fieldTestData->field_name, array(
-      'label' => 'above',
-      'type' => 'field_test_with_prepare_view',
-      'settings' => array(
-        'test_formatter_setting_additional' => $formatter_setting,
-      ),
-    ));
-    $content = $display->build($entity);
-    $this->render($content);
-    foreach ($values as $delta => $value) {
-      $expected = $formatter_setting . '|' . $value['value'] . '|' . ($value['value'] + 1);
-      $this->assertRaw($expected, "Value $delta is displayed, formatter settings are applied.");
-    }
-
-    // TODO:
-    // - check display order with several fields
-  }
-
-  /**
-   * Tests rendering fields with EntityDisplay::buildMultiple().
-   */
-  function testEntityDisplayViewMultiple() {
-    // Use a formatter that has a prepareView() step.
-    $display = entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent($this->fieldTestData->field_name, array(
-        'type' => 'field_test_with_prepare_view',
-      ));
-
-    // Create two entities.
-    $entity1 = entity_create('entity_test', array('id' => 1, 'type' => 'entity_test'));
-    $entity1->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
-    $entity2 = entity_create('entity_test', array('id' => 2, 'type' => 'entity_test'));
-    $entity2->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
-
-    // Run buildMultiple(), and check that the entities come out as expected.
-    $display->buildMultiple(array($entity1, $entity2));
-    $item1 = $entity1->{$this->fieldTestData->field_name}[0];
-    $this->assertEqual($item1->additional_formatter_value, $item1->value + 1, 'Entity 1 ran through the prepareView() formatter method.');
-    $item2 = $entity2->{$this->fieldTestData->field_name}[0];
-    $this->assertEqual($item2->additional_formatter_value, $item2->value + 1, 'Entity 2 ran through the prepareView() formatter method.');
-  }
-
-  /**
-   * Test entity cache.
-   *
-   * Complements unit test coverage in
-   * \Drupal\Tests\Core\Entity\Sql\SqlContentEntityStorageTest.
-   */
-  function testEntityCache() {
-    // Initialize random values and a test entity.
-    $entity_init = entity_create('entity_test', array('type' => $this->fieldTestData->field->getTargetBundle()));
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
-
-    // Non-cacheable entity type.
-    $entity_type = 'entity_test';
-    $cid = "values:$entity_type:" . $entity_init->id();
-
-    // Check that no initial cache entry is present.
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Non-cached: no initial cache entry');
-
-    // Save, and check that no cache entry is present.
-    $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name}->setValue($values);
-    $entity = $this->entitySaveReload($entity);
-    $cid = "values:$entity_type:" . $entity->id();
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Non-cached: no cache entry on insert and load');
-
-    // Cacheable entity type.
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('_2', $entity_type);
-
-    $entity_init = entity_create($entity_type, array(
-      'type' => $entity_type,
-    ));
-
-    // Check that no initial cache entry is present.
-    $cid = "values:$entity_type:" . $entity->id();
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no initial cache entry');
-
-    // Save, and check that no cache entry is present.
-    $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name_2} = $values;
-    $entity->save();
-    $cid = "values:$entity_type:" . $entity->id();
-
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on insert');
-    // Load, and check that a cache entry is present with the expected values.
-    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
-    $controller->resetCache();
-    $cached_entity = $controller->load($entity->id());
-    $cache = \Drupal::cache('entity')->get($cid);
-    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
-
-    // Update with different values, and check that the cache entry is wiped.
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
-    $entity->{$this->fieldTestData->field_name_2} = $values;
-    $entity->save();
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on update');
-
-    // Load, and check that a cache entry is present with the expected values.
-    $controller->resetCache();
-    $cached_entity = $controller->load($entity->id());
-    $cache = \Drupal::cache('entity')->get($cid);
-    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
-
-    // Create a new revision, and check that the cache entry is wiped.
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
-    $entity->{$this->fieldTestData->field_name_2} = $values;
-    $entity->setNewRevision();
-    $entity->save();
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on new revision creation');
-
-    // Load, and check that a cache entry is present with the expected values.
-    $controller->resetCache();
-    $cached_entity = $controller->load($entity->id());
-    $cache = \Drupal::cache('entity')->get($cid);
-    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
-
-    // Delete, and check that the cache entry is wiped.
-    $entity->delete();
-    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry after delete');
-  }
-
-  /**
-   * Tests \Drupal\Core\Entity\Display\EntityFormDisplayInterface::buildForm().
-   *
-   * This could be much more thorough, but it does verify that the correct
-   * widgets show up.
-   */
-  function testEntityFormDisplayBuildForm() {
-    $this->createFieldWithStorage('_2');
-
-    $entity_type = 'entity_test';
-    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
-
-    // Test generating widgets for all fields.
-    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
-    $form = array();
-    $form_state = new FormState();
-    $display->buildForm($entity, $form, $form_state);
-
-    $this->assertEqual($form[$this->fieldTestData->field_name]['widget']['#title'], $this->fieldTestData->field->getLabel(), "First field's form title is {$this->fieldTestData->field->getLabel()}");
-    $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget']['#title'], $this->fieldTestData->field_2->getLabel(), "Second field's form title is {$this->fieldTestData->field_2->getLabel()}");
-    for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
-      // field_test_widget uses 'textfield'
-      $this->assertEqual($form[$this->fieldTestData->field_name]['widget'][$delta]['value']['#type'], 'textfield', "First field's form delta $delta widget is textfield");
-    }
-    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
-      // field_test_widget uses 'textfield'
-      $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget'][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield");
-    }
-
-    // Test generating widgets for all fields.
-    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
-    foreach ($display->getComponents() as $name => $options) {
-      if ($name != $this->fieldTestData->field_name_2) {
-        $display->removeComponent($name);
-      }
-    }
-    $form = array();
-    $form_state = new FormState();
-    $display->buildForm($entity, $form, $form_state);
-
-    $this->assertFalse(isset($form[$this->fieldTestData->field_name]), 'The first field does not exist in the form');
-    $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget']['#title'], $this->fieldTestData->field_2->getLabel(), "Second field's form title is {$this->fieldTestData->field_2->getLabel()}");
-    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
-      // field_test_widget uses 'textfield'
-      $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget'][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield");
-    }
-  }
-
-  /**
-   * Tests \Drupal\Core\Entity\Display\EntityFormDisplayInterface::extractFormValues().
-   */
-  function testEntityFormDisplayExtractFormValues() {
-    $this->createFieldWithStorage('_2');
-
-    $entity_type = 'entity_test';
-    $entity_init = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
-
-    // Build the form for all fields.
-    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
-    $form = array();
-    $form_state = new FormState();
-    $display->buildForm($entity_init, $form, $form_state);
-
-    // Simulate incoming values.
-    // First field.
-    $values = array();
-    $weights = array();
-    for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
-      $values[$delta]['value'] = mt_rand(1, 127);
-      // Assign random weight.
-      do {
-        $weight = mt_rand(0, $this->fieldTestData->field_storage->getCardinality());
-      } while (in_array($weight, $weights));
-      $weights[$delta] = $weight;
-      $values[$delta]['_weight'] = $weight;
-    }
-    // Leave an empty value. 'field_test' fields are empty if empty().
-    $values[1]['value'] = 0;
-    // Second field.
-    $values_2 = array();
-    $weights_2 = array();
-    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
-      $values_2[$delta]['value'] = mt_rand(1, 127);
-      // Assign random weight.
-      do {
-        $weight = mt_rand(0, $this->fieldTestData->field_storage_2->getCardinality());
-      } while (in_array($weight, $weights_2));
-      $weights_2[$delta] = $weight;
-      $values_2[$delta]['_weight'] = $weight;
-    }
-    // Leave an empty value. 'field_test' fields are empty if empty().
-    $values_2[1]['value'] = 0;
-
-    // Pretend the form has been built.
-    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type, 'default'));
-    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
-    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
-    $form_state->setValue($this->fieldTestData->field_name, $values);
-    $form_state->setValue($this->fieldTestData->field_name_2, $values_2);
-
-    // Extract values for all fields.
-    $entity = clone($entity_init);
-    $display->extractFormValues($entity, $form, $form_state);
-
-    asort($weights);
-    asort($weights_2);
-    $expected_values = array();
-    $expected_values_2 = array();
-    foreach ($weights as $key => $value) {
-      if ($key != 1) {
-        $expected_values[] = array('value' => $values[$key]['value']);
-      }
-    }
-    $this->assertIdentical($entity->{$this->fieldTestData->field_name}->getValue(), $expected_values, 'Submit filters empty values');
-    foreach ($weights_2 as $key => $value) {
-      if ($key != 1) {
-        $expected_values_2[] = array('value' => $values_2[$key]['value']);
-      }
-    }
-    $this->assertIdentical($entity->{$this->fieldTestData->field_name_2}->getValue(), $expected_values_2, 'Submit filters empty values');
-
-    // Call EntityFormDisplayInterface::extractFormValues() for a single field (the second field).
-    foreach ($display->getComponents() as $name => $options) {
-      if ($name != $this->fieldTestData->field_name_2) {
-        $display->removeComponent($name);
-      }
-    }
-    $entity = clone($entity_init);
-    $display->extractFormValues($entity, $form, $form_state);
-    $expected_values_2 = array();
-    foreach ($weights_2 as $key => $value) {
-      if ($key != 1) {
-        $expected_values_2[] = array('value' => $values_2[$key]['value']);
-      }
-    }
-    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'The first field is empty in the entity object');
-    $this->assertIdentical($entity->{$this->fieldTestData->field_name_2}->getValue(), $expected_values_2, 'Submit filters empty values');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldAttachStorageTest.php b/core/modules/field/src/Tests/FieldAttachStorageTest.php
deleted file mode 100644
index a7c7217..0000000
--- a/core/modules/field/src/Tests/FieldAttachStorageTest.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldAttachStorageTest.
- */
-
-namespace Drupal\field\Tests;
-use Drupal\Component\Utility\Unicode;
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Tests storage-related Field Attach API functions.
- *
- * @group field
- * @todo move this to the Entity module
- */
-class FieldAttachStorageTest extends FieldUnitTestBase {
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('entity_test_rev');
-  }
-
-  /**
-   * Check field values insert, update and load.
-   *
-   * Works independently of the underlying field storage backend. Inserts or
-   * updates random field data and then loads and verifies the data.
-   */
-  function testFieldAttachSaveLoad() {
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('', $entity_type);
-    $cardinality = $this->fieldTestData->field_storage->getCardinality();
-
-    // TODO : test empty values filtering and "compression" (store consecutive deltas).
-    // Preparation: create three revisions and store them in $revision array.
-    $values = array();
-    $entity = entity_create($entity_type);
-    for ($revision_id = 0; $revision_id < 3; $revision_id++) {
-      // Note: we try to insert one extra value.
-      $current_values = $this->_generateTestFieldValues($cardinality + 1);
-      $entity->{$this->fieldTestData->field_name}->setValue($current_values);
-      $entity->setNewRevision();
-      $entity->save();
-      $entity_id = $entity->id();
-      $current_revision = $entity->getRevisionId();
-      $values[$current_revision] = $current_values;
-    }
-
-    $storage =  $this->container->get('entity.manager')->getStorage($entity_type);
-    $storage->resetCache();
-    $entity = $storage->load($entity_id);
-    // Confirm current revision loads the correct data.
-    // Number of values per field loaded equals the field cardinality.
-    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, 'Current revision: expected number of values');
-    for ($delta = 0; $delta < $cardinality; $delta++) {
-      // The field value loaded matches the one inserted or updated.
-      $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value , $values[$current_revision][$delta]['value'], format_string('Current revision: expected value %delta was found.', array('%delta' => $delta)));
-    }
-
-    // Confirm each revision loads the correct data.
-    foreach (array_keys($values) as $revision_id) {
-      $entity = $storage->loadRevision($revision_id);
-      // Number of values per field loaded equals the field cardinality.
-      $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $revision_id)));
-      for ($delta = 0; $delta < $cardinality; $delta++) {
-        // The field value loaded matches the one inserted or updated.
-        $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$revision_id][$delta]['value'], format_string('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta)));
-      }
-    }
-  }
-
-  /**
-   * Test the 'multiple' load feature.
-   */
-  function testFieldAttachLoadMultiple() {
-    $entity_type = 'entity_test_rev';
-
-    // Define 2 bundles.
-    $bundles = array(
-      1 => 'test_bundle_1',
-      2 => 'test_bundle_2',
-    );
-    entity_test_create_bundle($bundles[1]);
-    entity_test_create_bundle($bundles[2]);
-    // Define 3 fields:
-    // - field_1 is in bundle_1 and bundle_2,
-    // - field_2 is in bundle_1,
-    // - field_3 is in bundle_2.
-    $field_bundles_map = array(
-      1 => array(1, 2),
-      2 => array(1),
-      3 => array(2),
-    );
-    for ($i = 1; $i <= 3; $i++) {
-      $field_names[$i] = 'field_' . $i;
-      $field_storage = entity_create('field_storage_config', array(
-        'field_name' => $field_names[$i],
-        'entity_type' => $entity_type,
-        'type' => 'test_field',
-      ));
-      $field_storage->save();
-      $field_ids[$i] = $field_storage->uuid();
-      foreach ($field_bundles_map[$i] as $bundle) {
-        entity_create('field_config', array(
-          'field_name' => $field_names[$i],
-          'entity_type' => $entity_type,
-          'bundle' => $bundles[$bundle],
-        ))->save();
-      }
-    }
-
-    // Create one test entity per bundle, with random values.
-    foreach ($bundles as $index => $bundle) {
-      $entities[$index] = entity_create($entity_type, array('id' => $index, 'revision_id' => $index, 'type' => $bundle));
-      $entity = clone($entities[$index]);
-      foreach ($field_names as $field_name) {
-        if (!$entity->hasField($field_name)) {
-          continue;
-        }
-        $values[$index][$field_name] = mt_rand(1, 127);
-        $entity->$field_name->setValue(array('value' => $values[$index][$field_name]));
-      }
-      $entity->enforceIsnew();
-      $entity->save();
-    }
-
-    // Check that a single load correctly loads field values for both entities.
-    $controller = \Drupal::entityManager()->getStorage($entity->getEntityTypeId());
-    $controller->resetCache();
-    $entities = $controller->loadMultiple();
-    foreach ($entities as $index => $entity) {
-      foreach ($field_names as $field_name) {
-        if (!$entity->hasField($field_name)) {
-          continue;
-        }
-        // The field value loaded matches the one inserted.
-        $this->assertEqual($entity->{$field_name}->value, $values[$index][$field_name], format_string('Entity %index: expected value was found.', array('%index' => $index)));
-      }
-    }
-  }
-
-  /**
-   * Tests insert and update with empty or NULL fields.
-   */
-  function testFieldAttachSaveEmptyData() {
-    $entity_type = 'entity_test';
-    $this->createFieldWithStorage('', $entity_type);
-
-    $entity_init = entity_create($entity_type, array('id' => 1));
-
-    // Insert: Field is NULL.
-    $entity = clone $entity_init;
-    $entity->{$this->fieldTestData->field_name} = NULL;
-    $entity->enforceIsNew();
-    $entity = $this->entitySaveReload($entity);
-    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Insert: NULL field results in no value saved');
-
-    // All saves after this point should be updates, not inserts.
-    $entity_init->enforceIsNew(FALSE);
-
-    // Add some real data.
-    $entity = clone($entity_init);
-    $values = $this->_generateTestFieldValues(1);
-    $entity->{$this->fieldTestData->field_name} = $values;
-    $entity = $this->entitySaveReload($entity);
-    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $values, 'Field data saved');
-
-    // Update: Field is NULL. Data should be wiped.
-    $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name} = NULL;
-    $entity = $this->entitySaveReload($entity);
-    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Update: NULL field removes existing values');
-
-    // Re-add some data.
-    $entity = clone($entity_init);
-    $values = $this->_generateTestFieldValues(1);
-    $entity->{$this->fieldTestData->field_name} = $values;
-    $entity = $this->entitySaveReload($entity);
-    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $values, 'Field data saved');
-
-    // Update: Field is empty array. Data should be wiped.
-    $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name} = array();
-    $entity = $this->entitySaveReload($entity);
-    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Update: empty array removes existing values');
-  }
-
-  /**
-   * Test insert with empty or NULL fields, with default value.
-   */
-  function testFieldAttachSaveEmptyDataDefaultValue() {
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('', $entity_type);
-
-    // Add a default value function.
-    $this->fieldTestData->field->set('default_value_callback', 'field_test_default_value');
-    $this->fieldTestData->field->save();
-
-    // Verify that fields are populated with default values.
-    $entity_init = entity_create($entity_type, array('id' => 1, 'revision_id' => 1));
-    $default = field_test_default_value($entity_init, $this->fieldTestData->field);
-    $this->assertEqual($entity_init->{$this->fieldTestData->field_name}->getValue(), $default, 'Default field value correctly populated.');
-
-    // Insert: Field is NULL.
-    $entity = clone($entity_init);
-    $entity->{$this->fieldTestData->field_name} = NULL;
-    $entity->enforceIsNew();
-    $entity = $this->entitySaveReload($entity);
-    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Insert: NULL field results in no value saved');
-
-    // Verify that prepopulated field values are not overwritten by defaults.
-    $value = array(array('value' => $default[0]['value'] - mt_rand(1, 127)));
-    $entity = entity_create($entity_type, array('type' => $entity_init->bundle(), $this->fieldTestData->field_name => $value));
-    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $value, 'Prepopulated field value correctly maintained.');
-  }
-
-  /**
-   * Test entity deletion.
-   */
-  function testFieldAttachDelete() {
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('', $entity_type);
-    $cardinality = $this->fieldTestData->field_storage->getCardinality();
-    $entity = entity_create($entity_type, array('type' => $this->fieldTestData->field->getTargetBundle()));
-    $vids = array();
-
-    // Create revision 0
-    $values = $this->_generateTestFieldValues($cardinality);
-    $entity->{$this->fieldTestData->field_name} = $values;
-    $entity->save();
-    $vids[] = $entity->getRevisionId();
-
-    // Create revision 1
-    $entity->setNewRevision();
-    $entity->save();
-    $vids[] = $entity->getRevisionId();
-
-    // Create revision 2
-    $entity->setNewRevision();
-    $entity->save();
-    $vids[] = $entity->getRevisionId();
-    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
-    $controller->resetCache();
-
-    // Confirm each revision loads
-    foreach ($vids as $vid) {
-      $revision = $controller->loadRevision($vid);
-      $this->assertEqual(count($revision->{$this->fieldTestData->field_name}), $cardinality, "The test entity revision $vid has $cardinality values.");
-    }
-
-    // Delete revision 1, confirm the other two still load.
-    $controller->deleteRevision($vids[1]);
-    $controller->resetCache();
-    foreach (array(0, 2) as $key) {
-      $vid = $vids[$key];
-      $revision = $controller->loadRevision($vid);
-      $this->assertEqual(count($revision->{$this->fieldTestData->field_name}), $cardinality, "The test entity revision $vid has $cardinality values.");
-    }
-
-    // Confirm the current revision still loads
-    $controller->resetCache();
-    $current = $controller->load($entity->id());
-    $this->assertEqual(count($current->{$this->fieldTestData->field_name}), $cardinality, "The test entity current revision has $cardinality values.");
-
-    // Delete all field data, confirm nothing loads
-    $entity->delete();
-    $controller->resetCache();
-    foreach (array(0, 1, 2) as $vid) {
-      $revision = $controller->loadRevision($vid);
-      $this->assertFalse($revision);
-    }
-    $this->assertFalse($controller->load($entity->id()));
-  }
-
-  /**
-   * Test entity_bundle_create().
-   */
-  function testEntityCreateBundle() {
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('', $entity_type);
-    $cardinality = $this->fieldTestData->field_storage->getCardinality();
-
-    // Create a new bundle.
-    $new_bundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
-    entity_test_create_bundle($new_bundle, NULL, $entity_type);
-
-    // Add a field to that bundle.
-    $this->fieldTestData->field_definition['bundle'] = $new_bundle;
-    entity_create('field_config', $this->fieldTestData->field_definition)->save();
-
-    // Save an entity with data in the field.
-    $entity = entity_create($entity_type, array('type' => $this->fieldTestData->field->getTargetBundle()));
-    $values = $this->_generateTestFieldValues($cardinality);
-    $entity->{$this->fieldTestData->field_name} = $values;
-
-    // Verify the field data is present on load.
-    $entity = $this->entitySaveReload($entity);
-    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, "Data is retrieved for the new bundle");
-  }
-
-  /**
-   * Test entity_bundle_delete().
-   */
-  function testEntityDeleteBundle() {
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('', $entity_type);
-
-    // Create a new bundle.
-    $new_bundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
-    entity_test_create_bundle($new_bundle, NULL, $entity_type);
-
-    // Add a field to that bundle.
-    $this->fieldTestData->field_definition['bundle'] = $new_bundle;
-    entity_create('field_config', $this->fieldTestData->field_definition)->save();
-
-    // Create a second field for the test bundle
-    $field_name = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    $field_storage = array(
-      'field_name' => $field_name,
-      'entity_type' => $entity_type,
-      'type' => 'test_field',
-      'cardinality' => 1,
-    );
-    entity_create('field_storage_config', $field_storage)->save();
-    $field = array(
-      'field_name' => $field_name,
-      'entity_type' => $entity_type,
-      'bundle' => $this->fieldTestData->field->getTargetBundle(),
-      'label' => $this->randomMachineName() . '_label',
-      'description' => $this->randomMachineName() . '_description',
-      'weight' => mt_rand(0, 127),
-    );
-    entity_create('field_config', $field)->save();
-
-    // Save an entity with data for both fields
-    $entity = entity_create($entity_type, array('type' => $this->fieldTestData->field->getTargetBundle()));
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
-    $entity->{$this->fieldTestData->field_name} = $values;
-    $entity->{$field_name} = $this->_generateTestFieldValues(1);
-    $entity = $this->entitySaveReload($entity);
-
-    // Verify the fields are present on load
-    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), 4, 'First field got loaded');
-    $this->assertEqual(count($entity->{$field_name}), 1, 'Second field got loaded');
-
-    // Delete the bundle.
-    entity_test_delete_bundle($this->fieldTestData->field->getTargetBundle(), $entity_type);
-
-    // Verify no data gets loaded
-    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
-    $controller->resetCache();
-    $entity= $controller->load($entity->id());
-
-    $this->assertTrue(empty($entity->{$this->fieldTestData->field_name}), 'No data for first field');
-    $this->assertTrue(empty($entity->{$field_name}), 'No data for second field');
-
-    // Verify that the fields are gone.
-    $this->assertFalse(FieldConfig::load('entity_test.' . $this->fieldTestData->field->getTargetBundle() . '.' . $this->fieldTestData->field_name), "First field is deleted");
-    $this->assertFalse(FieldConfig::load('entity_test.' . $field['bundle']. '.' . $field_name), "Second field is deleted");
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldCrudTest.php b/core/modules/field/src/Tests/FieldCrudTest.php
deleted file mode 100644
index d6e9994..0000000
--- a/core/modules/field/src/Tests/FieldCrudTest.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldCrudTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\Core\Field\FieldException;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Create field entities by attaching fields to entities.
- *
- * @group field
- */
-class FieldCrudTest extends FieldUnitTestBase {
-
-  /**
-   * The field storage entity.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * The field entity definition.
-   *
-   * @var array
-   */
-  protected $fieldStorageDefinition;
-
-  /**
-   * The field entity definition.
-   *
-   * @var array
-   */
-  protected $fieldDefinition;
-
-  function setUp() {
-    parent::setUp();
-
-    $this->fieldStorageDefinition = array(
-      'field_name' => Unicode::strtolower($this->randomMachineName()),
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    );
-    $this->fieldStorage = entity_create('field_storage_config', $this->fieldStorageDefinition);
-    $this->fieldStorage->save();
-    $this->fieldDefinition = array(
-      'field_name' => $this->fieldStorage->getName(),
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    );
-  }
-
-  // TODO : test creation with
-  // - a full fledged $field structure, check that all the values are there
-  // - a minimal $field structure, check all default values are set
-  // defer actual $field comparison to a helper function, used for the two cases above,
-  // and for testUpdateField
-
-  /**
-   * Test the creation of a field.
-   */
-  function testCreateField() {
-    // Set a state flag so that field_test.module knows to add an in-memory
-    // constraint for this field.
-    \Drupal::state()->set('field_test_add_constraint', $this->fieldStorage->getName());
-    /** @var \Drupal\Core\Field\FieldConfigInterface $field */
-    $field = entity_create('field_config', $this->fieldDefinition);
-    $field->save();
-
-    $field = FieldConfig::load($field->id());
-    $this->assertTrue($field->getSetting('field_setting_from_config_data'));
-    $this->assertNull($field->getSetting('config_data_from_field_setting'));
-
-    // Read the configuration. Check against raw configuration data rather than
-    // the loaded ConfigEntity, to be sure we check that the defaults are
-    // applied on write.
-    $config = $this->config('field.field.' . $field->id())->get();
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-
-    $this->assertTrue($config['settings']['config_data_from_field_setting']);
-    $this->assertTrue(!isset($config['settings']['field_setting_from_config_data']));
-
-    // Since we are working with raw configuration, this needs to be unset
-    // manually.
-    // @see Drupal\field_test\Plugin\Field\FieldType\TestItem::fieldSettingsFromConfigData()
-    unset($config['settings']['config_data_from_field_setting']);
-
-    // Check that default values are set.
-    $this->assertEqual($config['required'], FALSE, 'Required defaults to false.');
-    $this->assertIdentical($config['label'], $this->fieldDefinition['field_name'], 'Label defaults to field name.');
-    $this->assertIdentical($config['description'], '', 'Description defaults to empty string.');
-
-    // Check that default settings are set.
-    $this->assertEqual($config['settings'], $field_type_manager->getDefaultFieldSettings($this->fieldStorageDefinition['type']) , 'Default field settings have been written.');
-
-    // Check that the denormalized 'field_type' was properly written.
-    $this->assertEqual($config['field_type'], $this->fieldStorageDefinition['type']);
-
-    // Test constraints are applied. A Range constraint is added dynamically to
-    // limit the field to values between 0 and 32.
-    // @see field_test_entity_bundle_field_info_alter()
-    $this->doFieldValidationTests();
-
-    // Test FieldConfigBase::setPropertyConstraints().
-    \Drupal::state()->set('field_test_set_constraint', $this->fieldStorage->getName());
-    \Drupal::state()->set('field_test_add_constraint', FALSE);
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
-    $this->doFieldValidationTests();
-
-    // Guarantee that the field/bundle combination is unique.
-    try {
-      entity_create('field_config', $this->fieldDefinition)->save();
-      $this->fail(t('Cannot create two fields with the same field / bundle combination.'));
-    }
-    catch (EntityStorageException $e) {
-      $this->pass(t('Cannot create two fields with the same field / bundle combination.'));
-    }
-
-    // Check that the specified field exists.
-    try {
-      $this->fieldDefinition['field_name'] = $this->randomMachineName();
-      entity_create('field_config', $this->fieldDefinition)->save();
-      $this->fail(t('Cannot create a field with a non-existing storage.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field with a non-existing storage.'));
-    }
-
-    // TODO: test other failures.
-  }
-
-  /**
-   * Test creating a field with custom storage set.
-   */
-  public function testCreateFieldCustomStorage() {
-    $field_name = Unicode::strtolower($this->randomMachineName());
-    \Drupal::state()->set('field_test_custom_storage', $field_name);
-
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'custom_storage' => TRUE,
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_name' => $field_storage->getName(),
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    ]);
-    $field->save();
-
-    \Drupal::entityManager()->clearCachedFieldDefinitions();
-
-    // Check that no table has been created for the field.
-    $this->assertFalse(\Drupal::database()->schema()->tableExists('entity_test__' . $field_storage->getName()));
-
-    // Save an entity with a value in the custom storage field and verify no
-    // data is retrieved on load.
-    $entity = EntityTest::create(['name' => $this->randomString(), $field_name => 'Test value']);
-    $this->assertIdentical('Test value', $entity->{$field_name}->value, 'The test value is set on the field.');
-
-    $entity->save();
-    $entity = EntityTest::load($entity->id());
-
-    $this->assertNull($entity->{$field_name}->value, 'The loaded entity field value is NULL.');
-  }
-
-  /**
-   * Test reading back a field definition.
-   */
-  function testReadField() {
-    entity_create('field_config', $this->fieldDefinition)->save();
-
-    // Read the field back.
-    $field = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
-    $this->assertTrue($this->fieldDefinition['field_name'] == $field->getName(), 'The field was properly read.');
-    $this->assertTrue($this->fieldDefinition['entity_type'] == $field->getTargetEntityTypeId(), 'The field was properly read.');
-    $this->assertTrue($this->fieldDefinition['bundle'] == $field->getTargetBundle(), 'The field was properly read.');
-  }
-
-  /**
-   * Test the update of a field.
-   */
-  function testUpdateField() {
-    entity_create('field_config', $this->fieldDefinition)->save();
-
-    // Check that basic changes are saved.
-    $field = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
-    $field->setRequired(!$field->isRequired());
-    $field->setLabel($this->randomMachineName());
-    $field->set('description', $this->randomMachineName());
-    $field->setSetting('test_field_setting', $this->randomMachineName());
-    $field->save();
-
-    $field_new = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
-    $this->assertEqual($field->isRequired(), $field_new->isRequired(), '"required" change is saved');
-    $this->assertEqual($field->getLabel(), $field_new->getLabel(), '"label" change is saved');
-    $this->assertEqual($field->getDescription(), $field_new->getDescription(), '"description" change is saved');
-
-    // TODO: test failures.
-  }
-
-  /**
-   * Test the deletion of a field.
-   */
-  function testDeleteField() {
-    // TODO: Test deletion of the data stored in the field also.
-    // Need to check that data for a 'deleted' field / storage doesn't get loaded
-    // Need to check data marked deleted is cleaned on cron (not implemented yet...)
-
-    // Create two fields for the same field storage so we can test that only one
-    // is deleted.
-    entity_create('field_config', $this->fieldDefinition)->save();
-    $another_field_definition = $this->fieldDefinition;
-    $another_field_definition['bundle'] .= '_another_bundle';
-    entity_test_create_bundle($another_field_definition['bundle']);
-    entity_create('field_config', $another_field_definition)->save();
-
-    // Test that the first field is not deleted, and then delete it.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
-    $this->assertTrue(!empty($field) && empty($field->deleted), 'A new field is not marked for deletion.');
-    $field->delete();
-
-    // Make sure the field is marked as deleted when it is specifically loaded.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
-    $this->assertTrue($field->isDeleted(), 'A deleted field is marked for deletion.');
-
-    // Try to load the field normally and make sure it does not show up.
-    $field = FieldConfig::load('entity_test.' . '.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
-    $this->assertTrue(empty($field), 'A deleted field is not loaded by default.');
-
-    // Make sure the other field is not deleted.
-    $another_field = FieldConfig::load('entity_test.' . $another_field_definition['bundle'] . '.' . $another_field_definition['field_name']);
-    $this->assertTrue(!empty($another_field) && empty($another_field->deleted), 'A non-deleted field is not marked for deletion.');
-  }
-
-  /**
-   * Tests the cross deletion behavior between field storages and fields.
-   */
-  function testDeleteFieldCrossDeletion() {
-    $field_definition_2 = $this->fieldDefinition;
-    $field_definition_2['bundle'] .= '_another_bundle';
-    entity_test_create_bundle($field_definition_2['bundle']);
-
-    // Check that deletion of a field storage deletes its fields.
-    $field_storage = $this->fieldStorage;
-    entity_create('field_config', $this->fieldDefinition)->save();
-    entity_create('field_config', $field_definition_2)->save();
-    $field_storage->delete();
-    $this->assertFalse(FieldConfig::loadByName('entity_test', $this->fieldDefinition['bundle'], $field_storage->getName()));
-    $this->assertFalse(FieldConfig::loadByName('entity_test', $field_definition_2['bundle'], $field_storage->getName()));
-
-    // Check that deletion of the last field deletes the storage.
-    $field_storage = entity_create('field_storage_config', $this->fieldStorageDefinition);
-    $field_storage->save();
-    $field = entity_create('field_config', $this->fieldDefinition);
-    $field->save();
-    $field_2 = entity_create('field_config', $field_definition_2);
-    $field_2->save();
-    $field->delete();
-    $this->assertTrue(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
-    $field_2->delete();
-    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
-
-    // Check that deletion of all fields using a storage simultaneously deletes
-    // the storage.
-    $field_storage = entity_create('field_storage_config', $this->fieldStorageDefinition);
-    $field_storage->save();
-    $field = entity_create('field_config', $this->fieldDefinition);
-    $field->save();
-    $field_2 = entity_create('field_config', $field_definition_2);
-    $field_2->save();
-    $this->container->get('entity.manager')->getStorage('field_config')->delete(array($field, $field_2));
-    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
-  }
-
-  /**
-   * Tests configurable field validation.
-   *
-   * @see field_test_entity_bundle_field_info_alter()
-   */
-  protected function doFieldValidationTests() {
-    $entity = entity_create('entity_test');
-    $entity->set($this->fieldStorage->getName(), 1);
-    $violations = $entity->validate();
-    $this->assertEqual(count($violations), 0, 'No violations found when in-range value passed.');
-
-    $entity->set($this->fieldStorage->getName(), 33);
-    $violations = $entity->validate();
-    $this->assertEqual(count($violations), 1, 'Violations found when using value outside the range.');
-    $this->assertEqual($violations[0]->getPropertyPath(), $this->fieldStorage->getName() . '.0.value');
-    $this->assertEqual($violations[0]->getMessage(), t('This value should be %limit or less.', [
-      '%limit' => 32,
-    ]));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldDataCountTest.php b/core/modules/field/src/Tests/FieldDataCountTest.php
deleted file mode 100644
index bbb0cd9..0000000
--- a/core/modules/field/src/Tests/FieldDataCountTest.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldDataCountTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests counting field data records and the hasData() method on
- * FieldStorageConfig entity.
- *
- * @group field
- * @see \Drupal\Core\Entity\FieldableEntityStorageInterface::countFieldData()
- * @see \Drupal\field\Entity\FieldStorageConfig::hasData()
- */
-class FieldDataCountTest extends FieldUnitTestBase {
-
-  /**
-   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
-   */
-  protected $storage;
-
-  /**
-   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
-   */
-  protected $storageRev;
-
-  /**
-   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
-   */
-  protected $storageUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('entity_test_rev');
-    $this->storage = \Drupal::entityManager()->getStorage('entity_test');
-    $this->storageRev = \Drupal::entityManager()->getStorage('entity_test_rev');
-    $this->storageUser = \Drupal::entityManager()->getStorage('user');
-  }
-
-  /**
-   * Tests entityCount() and hadData() methods.
-   */
-  public function testEntityCountAndHasData() {
-    // Create a field with a cardinality of 2 to show that we are counting
-    // entities and not rows in a table.
-    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_int',
-      'entity_type' => 'entity_test',
-      'type' => 'integer',
-      'cardinality' => 2,
-    ));
-    $field_storage->save();
-    entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ))->save();
-
-    $this->assertIdentical($field_storage->hasdata(), FALSE, 'There are no entities with field data.');
-    $this->assertIdentical($this->storage->countFieldData($field_storage), 0, 'There are 0 entities with field data.');
-
-    // Create 1 entity without the field.
-    $entity = entity_create('entity_test');
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $this->assertIdentical($field_storage->hasdata(), FALSE, 'There are no entities with field data.');
-    $this->assertIdentical($this->storage->countFieldData($field_storage), 0, 'There are 0 entities with field data.');
-
-    // Create 12 entities to ensure that the purging works as expected.
-    for ($i=0; $i < 12; $i++) {
-      $entity = entity_create('entity_test');
-      $entity->field_int[] = mt_rand(1, 99);
-      $entity->field_int[] = mt_rand(1, 99);
-      $entity->name[] = $this->randomMachineName();
-      $entity->save();
-    }
-
-    $storage = \Drupal::entityManager()->getStorage('entity_test');
-    if ($storage instanceof SqlContentEntityStorage) {
-      // Count the actual number of rows in the field table.
-      $table_mapping = $storage->getTableMapping();
-      $field_table_name = $table_mapping->getDedicatedDataTableName($field_storage);
-      $result = db_select($field_table_name, 't')
-        ->fields('t')
-        ->countQuery()
-        ->execute()
-        ->fetchField();
-      $this->assertEqual($result, 24, 'The field table has 24 rows.');
-    }
-
-    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with field data.');
-    $this->assertEqual($this->storage->countFieldData($field_storage), 12, 'There are 12 entities with field data.');
-
-    // Ensure the methods work on deleted fields.
-    $field_storage->delete();
-    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with deleted field data.');
-    $this->assertEqual($this->storage->countFieldData($field_storage), 12, 'There are 12 entities with deleted field data.');
-
-    field_purge_batch(6);
-    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with deleted field data.');
-    $this->assertEqual($this->storage->countFieldData($field_storage), 6, 'There are 6 entities with deleted field data.');
-
-    $entity_type = 'entity_test_rev';
-    $this->createFieldWithStorage('_2', $entity_type);
-
-    $entity_init = entity_create($entity_type, array(
-      'type' => $entity_type,
-    ));
-    $cardinality = $this->fieldTestData->field_storage_2->getCardinality();
-
-    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), FALSE, 'There are no entities with field data.');
-    $this->assertIdentical($this->storageRev->countFieldData($this->fieldTestData->field_storage_2), 0, 'There are 0 entities with field data.');
-
-    // Create 1 entity with the field.
-    $entity = clone($entity_init);
-    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
-    $entity->{$this->fieldTestData->field_name_2} = $values;
-    $entity->setNewRevision();
-    $entity->save();
-    $first_revision = $entity->getRevisionId();
-
-    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), TRUE, 'There are entities with field data.');
-    $this->assertIdentical($this->storageRev->countFieldData($this->fieldTestData->field_storage_2), 1, 'There is 1 entity with field data.');
-
-    $entity->{$this->fieldTestData->field_name_2} = array();
-    $entity->setNewRevision();
-    $entity->save();
-
-    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), TRUE, 'There are entities with field data.');
-
-    $storage =  $this->container->get('entity.manager')->getStorage($entity_type);
-    $entity = $storage->loadRevision($first_revision);
-    $this->assertEqual(count($entity->{$this->fieldTestData->field_name_2}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $first_revision)));
-  }
-
-  /**
-   * Verify that we can count a table that contains an entry with index 0.
-   */
-  public function testCountWithIndex0() {
-    // Create a field that will require dedicated storage.
-    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => 'field_int',
-      'entity_type' => 'user',
-      'type' => 'integer',
-      'cardinality' => 2,
-    ));
-    $field_storage->save();
-    FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'user',
-    ))->save();
-
-    // Create an entry for the anonymous user, who has user ID 0.
-    $user = $this->storageUser
-      ->create(array(
-        'uid' => 0,
-        'name' => 'anonymous',
-        'mail' => NULL,
-        'status' => FALSE,
-        'field_int' => 42,
-      ));
-    $user->save();
-
-    // Test shared table storage.
-    $storage = $user->getFieldDefinition('name')->getFieldStorageDefinition();
-    $this->assertIdentical(TRUE, $this->storageUser->countFieldData($storage, TRUE));
-
-    // Test dedicated table storage.
-    $storage = $user->getFieldDefinition('field_int')->getFieldStorageDefinition();
-    $this->assertIdentical(TRUE, $this->storageUser->countFieldData($storage, TRUE));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldDefinitionIntegrityTest.php b/core/modules/field/src/Tests/FieldDefinitionIntegrityTest.php
deleted file mode 100644
index abef067..0000000
--- a/core/modules/field/src/Tests/FieldDefinitionIntegrityTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldDefinitionIntegrityTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Extension\Extension;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the integrity of field API plugin definitions.
- *
- * @group field
- */
-class FieldDefinitionIntegrityTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Enable all core modules that provide field plugins.
-    $modules = system_rebuild_module_data();
-    $modules = array_filter($modules, function (Extension $module) {
-      // Filter contrib, hidden, already enabled modules and modules in the
-      // Testing package.
-      if ($module->origin === 'core'
-        && empty($module->info['hidden'])
-        && $module->status == FALSE
-        && $module->info['package'] !== 'Testing'
-        && is_readable($module->getPath() . '/src/Plugin/Field')) {
-        return TRUE;
-      }
-      return FALSE;
-    });
-    $this->enableModules(array_keys($modules));
-  }
-
-  /**
-   * Tests the integrity of field plugin definitions.
-   */
-  public function testFieldPluginDefinitionIntegrity() {
-    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-
-    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
-    $field_formatter_manager = \Drupal::service('plugin.manager.field.formatter');
-
-    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
-    $field_widget_manager = \Drupal::service('plugin.manager.field.widget');
-
-    // Load the IDs of all available field type plugins.
-    $available_field_type_ids = [];
-    foreach ($field_type_manager->getDefinitions() as $definition) {
-      $available_field_type_ids[] = $definition['id'];
-    }
-
-    // Load the IDs of all available field widget plugins.
-    $available_field_widget_ids = [];
-    foreach ($field_widget_manager->getDefinitions() as $definition) {
-      $available_field_widget_ids[] = $definition['id'];
-    }
-
-    // Load the IDs of all available field formatter plugins.
-    $available_field_formatter_ids = [];
-    foreach ($field_formatter_manager->getDefinitions() as $definition) {
-      $available_field_formatter_ids[] = $definition['id'];
-    }
-
-    // Test the field type plugins.
-    foreach ($field_type_manager->getDefinitions() as $definition) {
-      // Test default field widgets.
-      if (isset($definition['default_widget'])) {
-        if (in_array($definition['default_widget'], $available_field_widget_ids)) {
-          $this->pass(sprintf('Field type %s uses an existing field widget by default.', $definition['id']));
-        }
-        else {
-          $this->fail(sprintf('Field type %s uses a non-existent field widget by default: %s', $definition['id'], $definition['default_widget']));
-        }
-      }
-
-      // Test default field formatters.
-      if (isset($definition['default_formatter'])) {
-        if (in_array($definition['default_formatter'], $available_field_formatter_ids)) {
-          $this->pass(sprintf('Field type %s uses an existing field formatter by default.', $definition['id']));
-        }
-        else {
-          $this->fail(sprintf('Field type %s uses a non-existent field formatter by default: %s', $definition['id'], $definition['default_formatter']));
-        }
-      }
-    }
-
-    // Test the field widget plugins.
-    foreach ($field_widget_manager->getDefinitions() as $definition) {
-      $missing_field_type_ids = array_diff($definition['field_types'], $available_field_type_ids);
-      if ($missing_field_type_ids) {
-        $this->fail(sprintf('Field widget %s integrates with non-existent field types: %s', $definition['id'], implode(', ', $missing_field_type_ids)));
-      }
-      else {
-        $this->pass(sprintf('Field widget %s integrates with existing field types.', $definition['id']));
-      }
-    }
-
-    // Test the field formatter plugins.
-    foreach ($field_formatter_manager->getDefinitions() as $definition) {
-      $missing_field_type_ids = array_diff($definition['field_types'], $available_field_type_ids);
-      if ($missing_field_type_ids) {
-        $this->fail(sprintf('Field formatter %s integrates with non-existent field types: %s', $definition['id'], implode(', ', $missing_field_type_ids)));
-      }
-      else {
-        $this->pass(sprintf('Field formatter %s integrates with existing field types.', $definition['id']));
-      }
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldImportChangeTest.php b/core/modules/field/src/Tests/FieldImportChangeTest.php
deleted file mode 100644
index 8cf3f9c..0000000
--- a/core/modules/field/src/Tests/FieldImportChangeTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldImportChangeTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Update field storage and fields during config change method invocation.
- *
- * @group field
- */
-class FieldImportChangeTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * The default configuration provided by field_test_config is imported by
-   * \Drupal\field\Tests\FieldUnitTestBase::setUp() when it installs field
-   * configuration.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test_config');
-
-  /**
-   * Tests importing an updated field.
-   */
-  function testImportChange() {
-    $this->installConfig(['field_test_config']);
-    $field_storage_id = 'field_test_import';
-    $field_id = "entity_test.entity_test.$field_storage_id";
-    $field_config_name = "field.field.$field_id";
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-
-    // Save as files in the sync directory.
-    $field = $active->read($field_config_name);
-    $new_label = 'Test update import field';
-    $field['label'] = $new_label;
-    $sync->write($field_config_name, $field);
-
-    // Import the content of the sync directory.
-    $this->configImporter()->import();
-
-    // Check that the updated config was correctly imported.
-    $field = FieldConfig::load($field_id);
-    $this->assertEqual($field->getLabel(), $new_label, 'field label updated');
-  }
-}
-
diff --git a/core/modules/field/src/Tests/FieldImportCreateTest.php b/core/modules/field/src/Tests/FieldImportCreateTest.php
deleted file mode 100644
index 82cb962..0000000
--- a/core/modules/field/src/Tests/FieldImportCreateTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldImportCreateTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\field\Entity\FieldConfig;
-
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Create field storages and fields during config create method invocation.
- *
- * @group field
- */
-class FieldImportCreateTest extends FieldUnitTestBase {
-
-  /**
-   * Tests creating field storages and fields during default config import.
-   */
-  function testImportCreateDefault() {
-    $field_name = 'field_test_import';
-    $field_storage_id = "entity_test.$field_name";
-    $field_id = "entity_test.entity_test.$field_name";
-    $field_name_2 = 'field_test_import_2';
-    $field_storage_id_2 = "entity_test.$field_name_2";
-    $field_id_2a = "entity_test.entity_test.$field_name_2";
-    $field_id_2b = "entity_test.test_bundle.$field_name_2";
-
-    // Check that the field storages and fields do not exist yet.
-    $this->assertFalse(FieldStorageConfig::load($field_storage_id));
-    $this->assertFalse(FieldConfig::load($field_id));
-    $this->assertFalse(FieldStorageConfig::load($field_storage_id_2));
-    $this->assertFalse(FieldConfig::load($field_id_2a));
-    $this->assertFalse(FieldConfig::load($field_id_2b));
-
-    // Create a second bundle for the 'Entity test' entity type.
-    entity_test_create_bundle('test_bundle');
-
-    // Enable field_test_config module and check that the field and storage
-    // shipped in the module's default config were created.
-    \Drupal::service('module_installer')->install(array('field_test_config'));
-
-    // A field storage with one single field.
-    $field_storage = FieldStorageConfig::load($field_storage_id);
-    $this->assertTrue($field_storage, 'The field was created.');
-    $field = FieldConfig::load($field_id);
-    $this->assertTrue($field, 'The field was deleted.');
-
-    // A field storage with two fields.
-    $field_storage_2 = FieldStorageConfig::load($field_storage_id_2);
-    $this->assertTrue($field_storage_2, 'The second field was created.');
-    $this->assertTrue($field->getTargetBundle(), 'test_bundle', 'The second field was created on bundle test_bundle.');
-    $this->assertTrue($field->getTargetBundle(), 'test_bundle_2', 'The second field was created on bundle test_bundle_2.');
-
-    // Tests fields.
-    $ids = \Drupal::entityQuery('field_config')
-      ->condition('entity_type', 'entity_test')
-      ->condition('bundle', 'entity_test')
-      ->execute();
-    $this->assertEqual(count($ids), 2);
-    $this->assertTrue(isset($ids['entity_test.entity_test.field_test_import']));
-    $this->assertTrue(isset($ids['entity_test.entity_test.field_test_import_2']));
-    $ids = \Drupal::entityQuery('field_config')
-      ->condition('entity_type', 'entity_test')
-      ->condition('bundle', 'test_bundle')
-      ->execute();
-    $this->assertEqual(count($ids), 1);
-    $this->assertTrue(isset($ids['entity_test.test_bundle.field_test_import_2']));
-  }
-
-  /**
-   * Tests creating field storages and fields during config import.
-   */
-  function testImportCreate() {
-    // A field storage with one single field.
-    $field_name = 'field_test_import_sync';
-    $field_storage_id = "entity_test.$field_name";
-    $field_id = "entity_test.entity_test.$field_name";
-    $field_storage_config_name = "field.storage.$field_storage_id";
-    $field_config_name = "field.field.$field_id";
-
-    // A field storage with two fields.
-    $field_name_2 = 'field_test_import_sync_2';
-    $field_storage_id_2 = "entity_test.$field_name_2";
-    $field_id_2a = "entity_test.test_bundle.$field_name_2";
-    $field_id_2b = "entity_test.test_bundle_2.$field_name_2";
-    $field_storage_config_name_2 = "field.storage.$field_storage_id_2";
-    $field_config_name_2a = "field.field.$field_id_2a";
-    $field_config_name_2b = "field.field.$field_id_2b";
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-
-    // Add the new files to the sync directory.
-    $src_dir = drupal_get_path('module', 'field_test_config') . '/sync';
-    $target_dir = $this->configDirectories[CONFIG_SYNC_DIRECTORY];
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name.yml", "$target_dir/$field_storage_config_name.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name.yml", "$target_dir/$field_config_name.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name_2.yml", "$target_dir/$field_storage_config_name_2.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name_2a.yml", "$target_dir/$field_config_name_2a.yml"));
-    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name_2b.yml", "$target_dir/$field_config_name_2b.yml"));
-
-    // Import the content of the sync directory.
-    $this->configImporter()->import();
-
-    // Check that the field and storage were created.
-    $field_storage = FieldStorageConfig::load($field_storage_id);
-    $this->assertTrue($field_storage, 'Test import storage field from sync exists');
-    $field = FieldConfig::load($field_id);
-    $this->assertTrue($field, 'Test import field  from sync exists');
-    $field_storage = FieldStorageConfig::load($field_storage_id_2);
-    $this->assertTrue($field_storage, 'Test import storage field 2 from sync exists');
-    $field = FieldConfig::load($field_id_2a);
-    $this->assertTrue($field, 'Test import field 2a from sync exists');
-    $field = FieldConfig::load($field_id_2b);
-    $this->assertTrue($field, 'Test import field 2b from sync exists');
-  }
-}
-
diff --git a/core/modules/field/src/Tests/FieldImportDeleteTest.php b/core/modules/field/src/Tests/FieldImportDeleteTest.php
deleted file mode 100644
index 279be69..0000000
--- a/core/modules/field/src/Tests/FieldImportDeleteTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldImportDeleteTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Delete field storages and fields during config delete method invocation.
- *
- * @group field
- */
-class FieldImportDeleteTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * The default configuration provided by field_test_config is imported by
-   * \Drupal\field\Tests\FieldUnitTestBase::setUp() when it installs field
-   * configuration.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test_config');
-
-  /**
-   * Tests deleting field storages and fields as part of config import.
-   */
-  public function testImportDelete() {
-    $this->installConfig(['field_test_config']);
-    // At this point there are 5 field configuration objects in the active
-    // storage.
-    // - field.storage.entity_test.field_test_import
-    // - field.storage.entity_test.field_test_import_2
-    // - field.field.entity_test.entity_test.field_test_import
-    // - field.field.entity_test.entity_test.field_test_import_2
-    // - field.field.entity_test.test_bundle.field_test_import_2
-
-    $field_name = 'field_test_import';
-    $field_storage_id = "entity_test.$field_name";
-    $field_name_2 = 'field_test_import_2';
-    $field_storage_id_2 = "entity_test.$field_name_2";
-    $field_id = "entity_test.entity_test.$field_name";
-    $field_id_2a = "entity_test.entity_test.$field_name_2";
-    $field_id_2b = "entity_test.test_bundle.$field_name_2";
-    $field_storage_config_name = "field.storage.$field_storage_id";
-    $field_storage_config_name_2 = "field.storage.$field_storage_id_2";
-    $field_config_name = "field.field.$field_id";
-    $field_config_name_2a = "field.field.$field_id_2a";
-    $field_config_name_2b = "field.field.$field_id_2b";
-
-    // Create a second bundle for the 'Entity test' entity type.
-    entity_test_create_bundle('test_bundle');
-
-    // Get the uuid's for the field storages.
-    $field_storage_uuid = FieldStorageConfig::load($field_storage_id)->uuid();
-    $field_storage_uuid_2 = FieldStorageConfig::load($field_storage_id_2)->uuid();
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-    $this->assertTrue($sync->delete($field_storage_config_name), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name)));
-    $this->assertTrue($sync->delete($field_storage_config_name_2), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name_2)));
-    $this->assertTrue($sync->delete($field_config_name), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name)));
-    $this->assertTrue($sync->delete($field_config_name_2a), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2a)));
-    $this->assertTrue($sync->delete($field_config_name_2b), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2b)));
-
-    $deletes = $this->configImporter()->getUnprocessedConfiguration('delete');
-    $this->assertEqual(count($deletes), 5, 'Importing configuration will delete 3 fields and 2 field storages.');
-
-    // Import the content of the sync directory.
-    $this->configImporter()->import();
-
-    // Check that the field storages and fields are gone.
-    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id));
-    $field_storage = FieldStorageConfig::load($field_storage_id);
-    $this->assertFalse($field_storage, 'The field storage was deleted.');
-    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id_2));
-    $field_storage_2 = FieldStorageConfig::load($field_storage_id_2);
-    $this->assertFalse($field_storage_2, 'The second field storage was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id));
-    $field = FieldConfig::load($field_id);
-    $this->assertFalse($field, 'The field was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2a));
-    $field_2a = FieldConfig::load($field_id_2a);
-    $this->assertFalse($field_2a, 'The second field on test bundle was deleted.');
-    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2b));
-    $field_2b = FieldConfig::load($field_id_2b);
-    $this->assertFalse($field_2b, 'The second field on test bundle 2 was deleted.');
-
-    // Check that all config files are gone.
-    $active = $this->container->get('config.storage');
-    $this->assertIdentical($active->listAll($field_storage_config_name), array());
-    $this->assertIdentical($active->listAll($field_storage_config_name_2), array());
-    $this->assertIdentical($active->listAll($field_config_name), array());
-    $this->assertIdentical($active->listAll($field_config_name_2a), array());
-    $this->assertIdentical($active->listAll($field_config_name_2b), array());
-
-    // Check that the storage definition is preserved in state.
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
-    $this->assertTrue(isset($deleted_storages[$field_storage_uuid]));
-    $this->assertTrue(isset($deleted_storages[$field_storage_uuid_2]));
-
-    // Purge field data, and check that the storage definition has been
-    // completely removed once the data is purged.
-    field_purge_batch(10);
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
-    $this->assertTrue(empty($deleted_storages), 'Fields are deleted');
-  }
-}
-
diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
deleted file mode 100644
index b5b2d157..0000000
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldImportDeleteUninstallTest.
- */
-
-namespace Drupal\field\Tests;
-
-/**
- * Delete field storages and fields during config synchronization and uninstall
- * module that provides the field type.
- *
- * @group field
- * @see \Drupal\field\ConfigImporterFieldPurger
- * @see field_config_import_steps_alter()
- */
-class FieldImportDeleteUninstallTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('telephone');
-
-  protected function setUp() {
-    parent::setUp();
-    // Module uninstall requires the router and users_data tables.
-    // @see drupal_flush_all_caches()
-    // @see user_modules_uninstalled()
-    $this->installSchema('user', array('users_data'));
-  }
-
-  /**
-   * Tests deleting field storages and fields as part of config import.
-   */
-  public function testImportDeleteUninstall() {
-    // Create a field to delete to prove that
-    // \Drupal\field\ConfigImporterFieldPurger does not purge fields that are
-    // not related to the configuration synchronization.
-    $unrelated_field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_int',
-      'entity_type' => 'entity_test',
-      'type' => 'integer',
-    ));
-    $unrelated_field_storage->save();
-    entity_create('field_config', array(
-      'field_storage' => $unrelated_field_storage,
-      'bundle' => 'entity_test',
-    ))->save();
-
-    // Create a telephone field for validation.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test',
-      'type' => 'telephone',
-    ));
-    $field_storage->save();
-    entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ))->save();
-
-    $entity = entity_create('entity_test');
-    $value = '+0123456789';
-    $entity->field_test = $value;
-    $entity->field_int = '99';
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_test->value, $value);
-    $this->assertEqual($entity->field_test[0]->value, $value);
-    $this->assertEqual($entity->field_int->value, '99');
-
-    // Delete unrelated field before copying configuration and running the
-    // synchronization.
-    $unrelated_field_storage->delete();
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-
-    // Stage uninstall of the Telephone module.
-    $core_extension = $this->config('core.extension')->get();
-    unset($core_extension['module']['telephone']);
-    $sync->write('core.extension', $core_extension);
-
-    // Stage the field deletion
-    $sync->delete('field.storage.entity_test.field_test');
-    $sync->delete('field.field.entity_test.entity_test.field_test');
-
-    $steps = $this->configImporter()->initialize();
-    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
-
-    // This will purge all the data, delete the field and uninstall the
-    // Telephone module.
-    $this->configImporter()->import();
-
-    $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
-    $this->assertFalse(\Drupal::entityManager()->loadEntityByUuid('field_storage_config', $field_storage->uuid()), 'The test field has been deleted by the configuration synchronization');
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
-    $this->assertFalse(isset($deleted_storages[$field_storage->uuid()]), 'Telephone field has been completed removed from the system.');
-    $this->assertTrue(isset($deleted_storages[$unrelated_field_storage->uuid()]), 'Unrelated field not purged by configuration synchronization.');
-  }
-
-  /**
-   * Tests purging already deleted field storages and fields during a config
-   * import.
-   */
-  public function testImportAlreadyDeletedUninstall() {
-    // Create a telephone field for validation.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test',
-      'type' => 'telephone',
-    ));
-    $field_storage->save();
-    $field_storage_uuid = $field_storage->uuid();
-    entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ))->save();
-
-    // Create 12 entities to ensure that the purging works as expected.
-    for ($i=0; $i < 12; $i++) {
-      $entity = entity_create('entity_test');
-      $value = '+0123456789';
-      $entity->field_test = $value;
-      $entity->name->value = $this->randomMachineName();
-      $entity->save();
-
-      // Verify entity has been created properly.
-      $id = $entity->id();
-      $entity = entity_load('entity_test', $id);
-      $this->assertEqual($entity->field_test->value, $value);
-    }
-
-    // Delete the field.
-    $field_storage->delete();
-
-    $active = $this->container->get('config.storage');
-    $sync = $this->container->get('config.storage.sync');
-    $this->copyConfig($active, $sync);
-
-    // Stage uninstall of the Telephone module.
-    $core_extension = $this->config('core.extension')->get();
-    unset($core_extension['module']['telephone']);
-    $sync->write('core.extension', $core_extension);
-
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
-    $this->assertTrue(isset($deleted_storages[$field_storage_uuid]), 'Field has been deleted and needs purging before configuration synchronization.');
-
-    $steps = $this->configImporter()->initialize();
-    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
-
-    // This will purge all the data, delete the field and uninstall the
-    // Telephone module.
-    $this->configImporter()->import();
-
-    $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
-    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
-    $this->assertFalse(isset($deleted_storages[$field_storage_uuid]), 'Field has been completed removed from the system.');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
index 58766e8..71fbf91 100644
--- a/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
+++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallUiTest.php
@@ -7,6 +7,10 @@
 
 namespace Drupal\field\Tests;
 
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
 /**
  * Delete field storages and fields during config synchronization and uninstall
  * module that provides the field type through the UI.
@@ -36,31 +40,31 @@ protected function setUp() {
    */
   public function testImportDeleteUninstall() {
     // Create a telephone field.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'field_tel',
       'entity_type' => 'entity_test',
       'type' => 'telephone',
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
 
     // Create a text field.
-    $date_field_storage = entity_create('field_storage_config', array(
+    $date_field_storage = FieldStorageConfig::create(array(
       'field_name' => 'field_date',
       'entity_type' => 'entity_test',
       'type' => 'datetime',
     ));
     $date_field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $date_field_storage,
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
 
     // Create an entity which has values for the telephone and text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $value = '+0123456789';
     $entity->field_tel = $value;
     $entity->field_date = time();
diff --git a/core/modules/field/src/Tests/FieldStorageCrudTest.php b/core/modules/field/src/Tests/FieldStorageCrudTest.php
deleted file mode 100644
index 8912783..0000000
--- a/core/modules/field/src/Tests/FieldStorageCrudTest.php
+++ /dev/null
@@ -1,461 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldStorageCrudTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
-use Drupal\Core\Field\FieldException;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests field storage create, read, update, and delete.
- *
- * @group field
- */
-class FieldStorageCrudTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array();
-
-  // TODO : test creation with
-  // - a full fledged $field structure, check that all the values are there
-  // - a minimal $field structure, check all default values are set
-  // defer actual $field comparison to a helper function, used for the two cases above
-
-  /**
-   * Test the creation of a field storage.
-   */
-  function testCreate() {
-    $field_storage_definition = array(
-      'field_name' => 'field_2',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    );
-    field_test_memorize();
-    $field_storage = entity_create('field_storage_config', $field_storage_definition);
-    $field_storage->save();
-
-    $field_storage = FieldStorageConfig::load($field_storage->id());
-    $this->assertTrue($field_storage->getSetting('storage_setting_from_config_data'));
-    $this->assertNull($field_storage->getSetting('config_data_from_storage_setting'));
-
-    $mem = field_test_memorize();
-    $this->assertIdentical($mem['field_test_field_storage_config_create'][0][0]->getName(), $field_storage_definition['field_name'], 'hook_entity_create() called with correct arguments.');
-    $this->assertIdentical($mem['field_test_field_storage_config_create'][0][0]->getType(), $field_storage_definition['type'], 'hook_entity_create() called with correct arguments.');
-
-    // Read the configuration. Check against raw configuration data rather than
-    // the loaded ConfigEntity, to be sure we check that the defaults are
-    // applied on write.
-    $field_storage_config = $this->config('field.storage.' . $field_storage->id())->get();
-
-    $this->assertTrue($field_storage_config['settings']['config_data_from_storage_setting']);
-    $this->assertTrue(!isset($field_storage_config['settings']['storage_setting_from_config_data']));
-
-    // Since we are working with raw configuration, this needs to be unset
-    // manually.
-    // @see Drupal\field_test\Plugin\Field\FieldType\TestItem::storageSettingsFromConfigData()
-    unset($field_storage_config['settings']['config_data_from_storage_setting']);
-
-    // Ensure that basic properties are preserved.
-    $this->assertEqual($field_storage_config['field_name'], $field_storage_definition['field_name'], 'The field name is properly saved.');
-    $this->assertEqual($field_storage_config['entity_type'], $field_storage_definition['entity_type'], 'The field entity type is properly saved.');
-    $this->assertEqual($field_storage_config['id'], $field_storage_definition['entity_type'] . '.' . $field_storage_definition['field_name'], 'The field id is properly saved.');
-    $this->assertEqual($field_storage_config['type'], $field_storage_definition['type'], 'The field type is properly saved.');
-
-    // Ensure that cardinality defaults to 1.
-    $this->assertEqual($field_storage_config['cardinality'], 1, 'Cardinality defaults to 1.');
-
-    // Ensure that default settings are present.
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    $this->assertEqual($field_storage_config['settings'], $field_type_manager->getDefaultStorageSettings($field_storage_definition['type']), 'Default storage settings have been written.');
-
-    // Guarantee that the name is unique.
-    try {
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create two fields with the same name.'));
-    }
-    catch (EntityStorageException $e) {
-      $this->pass(t('Cannot create two fields with the same name.'));
-    }
-
-    // Check that field type is required.
-    try {
-      $field_storage_definition = array(
-        'field_name' => 'field_1',
-        'entity_type' => 'entity_type',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create a field with no type.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field with no type.'));
-    }
-
-    // Check that field name is required.
-    try {
-      $field_storage_definition = array(
-        'type' => 'test_field',
-        'entity_type' => 'entity_test',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create an unnamed field.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create an unnamed field.'));
-    }
-    // Check that entity type is required.
-    try {
-      $field_storage_definition = array(
-        'field_name' => 'test_field',
-        'type' => 'test_field'
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail('Cannot create a field without an entity type.');
-    }
-    catch (FieldException $e) {
-      $this->pass('Cannot create a field without an entity type.');
-    }
-
-    // Check that field name must start with a letter or _.
-    try {
-      $field_storage_definition = array(
-        'field_name' => '2field_2',
-        'entity_type' => 'entity_test',
-        'type' => 'test_field',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create a field with a name starting with a digit.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field with a name starting with a digit.'));
-    }
-
-    // Check that field name must only contain lowercase alphanumeric or _.
-    try {
-      $field_storage_definition = array(
-        'field_name' => 'field#_3',
-        'entity_type' => 'entity_test',
-        'type' => 'test_field',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create a field with a name containing an illegal character.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field with a name containing an illegal character.'));
-    }
-
-    // Check that field name cannot be longer than 32 characters long.
-    try {
-      $field_storage_definition = array(
-        'field_name' => '_12345678901234567890123456789012',
-        'entity_type' => 'entity_test',
-        'type' => 'test_field',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create a field with a name longer than 32 characters.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field with a name longer than 32 characters.'));
-    }
-
-    // Check that field name can not be an entity key.
-    // "id" is known as an entity key from the "entity_test" type.
-    try {
-      $field_storage_definition = array(
-        'type' => 'test_field',
-        'field_name' => 'id',
-        'entity_type' => 'entity_test',
-      );
-      entity_create('field_storage_config', $field_storage_definition)->save();
-      $this->fail(t('Cannot create a field bearing the name of an entity key.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot create a field bearing the name of an entity key.'));
-    }
-  }
-
-  /**
-   * Tests that an explicit schema can be provided on creation.
-   *
-   * This behavior is needed to allow field storage creation within updates,
-   * since plugin classes (and thus the field type schema) cannot be accessed.
-   */
-  function testCreateWithExplicitSchema() {
-    $schema = array(
-      'dummy' => 'foobar'
-    );
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_2',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'schema' => $schema,
-    ));
-    $this->assertEqual($field_storage->getSchema(), $schema);
-  }
-
-  /**
-   * Tests reading field storage definitions.
-   */
-  function testRead() {
-    $field_storage_definition = array(
-      'field_name' => 'field_1',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    );
-    $field_storage = entity_create('field_storage_config', $field_storage_definition);
-    $field_storage->save();
-    $id = $field_storage->id();
-
-    // Check that 'single column' criteria works.
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name']));
-    $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
-
-    // Check that 'multi column' criteria works.
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => $field_storage_definition['type']));
-    $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
-    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => 'foo'));
-    $this->assertTrue(empty($fields), 'No field was found.');
-
-    // Create a field from the field storage.
-    $field_definition = array(
-      'field_name' => $field_storage_definition['field_name'],
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    );
-    entity_create('field_config', $field_definition)->save();
-  }
-
-  /**
-   * Test creation of indexes on data column.
-   */
-  function testIndexes() {
-    // Check that indexes specified by the field type are used by default.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_1',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    ));
-    $field_storage->save();
-    $field_storage = FieldStorageConfig::load($field_storage->id());
-    $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array('value'));
-    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field type indexes saved by default');
-
-    // Check that indexes specified by the field definition override the field
-    // type indexes.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_2',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'indexes' => array(
-        'value' => array(),
-      ),
-    ));
-    $field_storage->save();
-    $field_storage = FieldStorageConfig::load($field_storage->id());
-    $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array());
-    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes override field type indexes');
-
-    // Check that indexes specified by the field definition add to the field
-    // type indexes.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_3',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'indexes' => array(
-        'value_2' => array('value'),
-      ),
-    ));
-    $field_storage->save();
-    $id = $field_storage->id();
-    $field_storage = FieldStorageConfig::load($id);
-    $schema = $field_storage->getSchema();
-    $expected_indexes = array('value' => array('value'), 'value_2' => array('value'));
-    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes are merged with field type indexes');
-  }
-
-  /**
-   * Test the deletion of a field storage.
-   */
-  function testDelete() {
-    // TODO: Also test deletion of the data stored in the field ?
-
-    // Create two fields (so we can test that only one is deleted).
-    $field_storage_definition = array(
-      'field_name' => 'field_1',
-      'type' => 'test_field',
-      'entity_type' => 'entity_test',
-    );
-    entity_create('field_storage_config', $field_storage_definition)->save();
-    $another_field_storage_definition = array(
-      'field_name' => 'field_2',
-      'type' => 'test_field',
-      'entity_type' => 'entity_test',
-    );
-    entity_create('field_storage_config', $another_field_storage_definition)->save();
-
-    // Create fields for each.
-    $field_definition = array(
-      'field_name' => $field_storage_definition['field_name'],
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    );
-    entity_create('field_config', $field_definition)->save();
-    $another_field_definition = $field_definition;
-    $another_field_definition['field_name'] = $another_field_storage_definition['field_name'];
-    entity_create('field_config', $another_field_definition)->save();
-
-    // Test that the first field is not deleted, and then delete it.
-    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
-    $this->assertTrue(!empty($field_storage) && !$field_storage->isDeleted(), 'A new storage is not marked for deletion.');
-    FieldStorageConfig::loadByName('entity_test', $field_storage_definition['field_name'])->delete();
-
-    // Make sure that the field is marked as deleted when it is specifically
-    // loaded.
-    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
-    $this->assertTrue($field_storage->isDeleted(), 'A deleted storage is marked for deletion.');
-
-    // Make sure that this field is marked as deleted when it is
-    // specifically loaded.
-    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $field_definition['field_name'], 'bundle' => $field_definition['bundle'], 'include_deleted' => TRUE)));
-    $this->assertTrue($field->isDeleted(), 'A field whose storage was deleted is marked for deletion.');
-
-    // Try to load the storage normally and make sure it does not show up.
-    $field_storage = FieldStorageConfig::load('entity_test.' . $field_storage_definition['field_name']);
-    $this->assertTrue(empty($field_storage), 'A deleted storage is not loaded by default.');
-
-    // Try to load the field normally and make sure it does not show up.
-    $field = FieldConfig::load('entity_test.' . '.' . $field_definition['bundle'] . '.' . $field_definition['field_name']);
-    $this->assertTrue(empty($field), 'A field whose storage was deleted is not loaded by default.');
-
-    // Make sure the other field and its storage are not deleted.
-    $another_field_storage = FieldStorageConfig::load('entity_test.' . $another_field_storage_definition['field_name']);
-    $this->assertTrue(!empty($another_field_storage) && !$another_field_storage->isDeleted(), 'A non-deleted storage is not marked for deletion.');
-    $another_field = FieldConfig::load('entity_test.' . $another_field_definition['bundle'] . '.' . $another_field_definition['field_name']);
-    $this->assertTrue(!empty($another_field) && !$another_field->isDeleted(), 'A field whose storage was not deleted is not marked for deletion.');
-
-    // Try to create a new field the same name as a deleted field and
-    // write data into it.
-    entity_create('field_storage_config', $field_storage_definition)->save();
-    entity_create('field_config', $field_definition)->save();
-    $field_storage = FieldStorageConfig::load('entity_test.' . $field_storage_definition['field_name']);
-    $this->assertTrue(!empty($field_storage) && !$field_storage->isDeleted(), 'A new storage with a previously used name is created.');
-    $field = FieldConfig::load('entity_test.' . $field_definition['bundle'] . '.' . $field_definition['field_name'] );
-    $this->assertTrue(!empty($field) && !$field->isDeleted(), 'A new field for a previously used field name is created.');
-
-    // Save an entity with data for the field
-    $entity = entity_create('entity_test');
-    $values[0]['value'] = mt_rand(1, 127);
-    $entity->{$field_storage->getName()}->value = $values[0]['value'];
-    $entity = $this->entitySaveReload($entity);
-
-    // Verify the field is present on load
-    $this->assertIdentical(count($entity->{$field_storage->getName()}), count($values), "Data in previously deleted field saves and loads correctly");
-    foreach ($values as $delta => $value) {
-      $this->assertEqual($entity->{$field_storage->getName()}[$delta]->value, $values[$delta]['value'], "Data in previously deleted field saves and loads correctly");
-    }
-  }
-
-  function testUpdateFieldType() {
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_type',
-      'entity_type' => 'entity_test',
-      'type' => 'decimal',
-    ));
-    $field_storage->save();
-
-    try {
-      $field_storage->set('type', 'integer');
-      $field_storage->save();
-      $this->fail(t('Cannot update a field to a different type.'));
-    }
-    catch (FieldException $e) {
-      $this->pass(t('Cannot update a field to a different type.'));
-    }
-  }
-
-  /**
-   * Test updating a field storage.
-   */
-  function testUpdate() {
-    // Create a field with a defined cardinality, so that we can ensure it's
-    // respected. Since cardinality enforcement is consistent across database
-    // systems, it makes a good test case.
-    $cardinality = 4;
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'field_update',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'cardinality' => $cardinality,
-    ));
-    $field_storage->save();
-    $field = entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    do {
-      $entity = entity_create('entity_test');
-      // Fill in the entity with more values than $cardinality.
-      for ($i = 0; $i < 20; $i++) {
-        // We can not use $i here because 0 values are filtered out.
-        $entity->field_update[] = $i + 1;
-      }
-      // Load back and assert there are $cardinality number of values.
-      $entity = $this->entitySaveReload($entity);
-      $this->assertEqual(count($entity->field_update), $field_storage->getCardinality());
-      // Now check the values themselves.
-      for ($delta = 0; $delta < $cardinality; $delta++) {
-        $this->assertEqual($entity->field_update[$delta]->value, $delta + 1);
-      }
-      // Increase $cardinality and set the field cardinality to the new value.
-      $field_storage->setCardinality(++$cardinality);
-      $field_storage->save();
-    } while ($cardinality < 6);
-  }
-
-  /**
-   * Test field type modules forbidding an update.
-   */
-  function testUpdateForbid() {
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'forbidden',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-      'settings' => array(
-        'changeable' => 0,
-        'unchangeable' => 0
-    )));
-    $field_storage->save();
-    $field_storage->setSetting('changeable', $field_storage->getSetting('changeable') + 1);
-    try {
-      $field_storage->save();
-      $this->pass(t("A changeable setting can be updated."));
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->fail(t("An unchangeable setting cannot be updated."));
-    }
-    $field_storage->setSetting('unchangeable', $field_storage->getSetting('unchangeable') + 1);
-    try {
-      $field_storage->save();
-      $this->fail(t("An unchangeable setting can be updated."));
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass(t("An unchangeable setting cannot be updated."));
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php b/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
deleted file mode 100644
index 68e09d8..0000000
--- a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldTypePluginManagerTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Tests the field type manager.
- *
- * @group field
- */
-class FieldTypePluginManagerTest extends FieldUnitTestBase {
-
-  /**
-   * Tests the default settings convenience methods.
-   */
-  function testDefaultSettings() {
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
-      $definition = $field_type_manager->getDefinition($type);
-      $this->assertIdentical($field_type_manager->getDefaultStorageSettings($type), $definition['class']::defaultStorageSettings(), format_string("%type storage settings were returned", array('%type' => $type)));
-      $this->assertIdentical($field_type_manager->getDefaultFieldSettings($type), $definition['class']::defaultFieldSettings(), format_string(" %type field settings were returned", array('%type' => $type)));
-    }
-  }
-
-  /**
-   * Tests creation of field item instances.
-   */
-  public function testCreateInstance() {
-    /** @var \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager */
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
-      $definition = $field_type_manager->getDefinition($type);
-
-      $class = $definition['class'];
-      $field_name = 'field_' . $type;
-
-      $field_definition = BaseFieldDefinition::create($type);
-
-      $configuration = array(
-        'field_definition' => $field_definition,
-        'name' => $field_name,
-        'parent' => NULL,
-      );
-
-      $instance = $field_type_manager->createInstance($type, $configuration);
-
-      $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
-      $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
-    }
-  }
-
-  /**
-   * Tests creation of field item instances.
-   */
-  public function testCreateInstanceWithConfig() {
-    /** @var \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager */
-    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
-    $type = 'test_field';
-    $definition = $field_type_manager->getDefinition($type);
-
-    $class = $definition['class'];
-    $field_name = 'field_' . $type;
-
-    $field_definition = BaseFieldDefinition::create($type)
-      ->setLabel('Jenny')
-      ->setDefaultValue(8675309);
-
-    $configuration = array(
-      'field_definition' => $field_definition,
-      'name' => $field_name,
-      'parent' => NULL,
-    );
-
-    $entity = EntityTest::create();
-
-    $instance = $field_type_manager->createInstance($type, $configuration);
-
-    $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
-    $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
-    $this->assertEqual($instance->getFieldDefinition()->getLabel(), 'Jenny', 'Instance label is Jenny');
-    $this->assertEqual($instance->getFieldDefinition()->getDefaultValue($entity), [['value' => 8675309]], 'Instance default_value is 8675309');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php
deleted file mode 100644
index ddcf3f9..0000000
--- a/core/modules/field/src/Tests/FieldUnitTestBase.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldUnitTestBase.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Parent class for Field API unit tests.
- */
-abstract class FieldUnitTestBase extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['user', 'system', 'field', 'text', 'entity_test', 'field_test'];
-
-  /**
-   * Bag of created field storages and fields.
-   *
-   * Allows easy access to test field storage/field names/IDs/objects via:
-   * - $this->fieldTestData->field_name[suffix]
-   * - $this->fieldTestData->field_storage[suffix]
-   * - $this->fieldTestData->field_storage_uuid[suffix]
-   * - $this->fieldTestData->field[suffix]
-   * - $this->fieldTestData->field_definition[suffix]
-   *
-   * @see \Drupal\field\Tests\FieldUnitTestBase::createFieldWithStorage()
-   *
-   * @var \ArrayObject
-   */
-  protected $fieldTestData;
-
-  /**
-   * Set the default field storage backend for fields created during tests.
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->fieldTestData = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
-
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('user');
-    $this->installSchema('system', ['router', 'sequences', 'key_value']);
-
-    // Set default storage backend and configure the theme system.
-    $this->installConfig(array('field', 'system'));
-
-    // Create user 1.
-    $storage = \Drupal::entityManager()->getStorage('user');
-    $storage
-      ->create(array(
-        'uid' => 1,
-        'name' => 'entity-test',
-        'mail' => 'entity@localhost',
-        'status' => TRUE,
-      ))
-      ->save();
-  }
-
-  /**
-   * Create a field and an associated field storage.
-   *
-   * @param string $suffix
-   *   (optional) A string that should only contain characters that are valid in
-   *   PHP variable names as well.
-   * @param string $entity_type
-   *   (optional) The entity type on which the field should be created.
-   *   Defaults to "entity_test".
-   * @param string $bundle
-   *   (optional) The entity type on which the field should be created.
-   *   Defaults to the default bundle of the entity type.
-   */
-  protected function createFieldWithStorage($suffix = '', $entity_type = 'entity_test', $bundle = NULL) {
-    if (empty($bundle)) {
-      $bundle = $entity_type;
-    }
-    $field_name = 'field_name' . $suffix;
-    $field_storage = 'field_storage' . $suffix;
-    $field_storage_uuid = 'field_storage_uuid' . $suffix;
-    $field = 'field' . $suffix;
-    $field_definition = 'field_definition' . $suffix;
-
-    $this->fieldTestData->$field_name = Unicode::strtolower($this->randomMachineName() . '_field_name' . $suffix);
-    $this->fieldTestData->$field_storage = entity_create('field_storage_config', array(
-      'field_name' => $this->fieldTestData->$field_name,
-      'entity_type' => $entity_type,
-      'type' => 'test_field',
-      'cardinality' => 4,
-    ));
-    $this->fieldTestData->$field_storage->save();
-    $this->fieldTestData->$field_storage_uuid = $this->fieldTestData->$field_storage->uuid();
-    $this->fieldTestData->$field_definition = array(
-      'field_storage' => $this->fieldTestData->$field_storage,
-      'bundle' => $bundle,
-      'label' => $this->randomMachineName() . '_label',
-      'description' => $this->randomMachineName() . '_description',
-      'settings' => array(
-        'test_field_setting' => $this->randomMachineName(),
-      ),
-    );
-    $this->fieldTestData->$field = entity_create('field_config', $this->fieldTestData->$field_definition);
-    $this->fieldTestData->$field->save();
-
-    entity_get_form_display($entity_type, $bundle, 'default')
-      ->setComponent($this->fieldTestData->$field_name, array(
-        'type' => 'test_field_widget',
-        'settings' => array(
-          'test_widget_setting' => $this->randomMachineName(),
-        )
-      ))
-      ->save();
-  }
-
-  /**
-   * Saves and reloads an entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to save.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The entity, freshly reloaded from storage.
-   */
-  protected function entitySaveReload(EntityInterface $entity) {
-    $entity->save();
-    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
-    $controller->resetCache();
-    return $controller->load($entity->id());
-  }
-
-  /**
-   * Validate and save entity. Fail if violations are found.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity to save.
-   *
-   * @return void
-   */
-  protected function entityValidateAndSave(EntityInterface $entity) {
-    $violations = $entity->validate();
-    if ($violations->count()) {
-      $this->fail($violations);
-    }
-    else {
-      $entity->save();
-    }
-  }
-
-  /**
-   * Generate random values for a field_test field.
-   *
-   * @param $cardinality
-   *   Number of values to generate.
-   * @return
-   *  An array of random values, in the format expected for field values.
-   */
-  protected function _generateTestFieldValues($cardinality) {
-    $values = array();
-    for ($i = 0; $i < $cardinality; $i++) {
-      // field_test fields treat 0 as 'empty value'.
-      $values[$i]['value'] = mt_rand(1, 127);
-    }
-    return $values;
-  }
-
-  /**
-   * Assert that a field has the expected values in an entity.
-   *
-   * This function only checks a single column in the field values.
-   *
-   * @param EntityInterface $entity
-   *   The entity to test.
-   * @param $field_name
-   *   The name of the field to test
-   * @param $expected_values
-   *   The array of expected values.
-   * @param $langcode
-   *   (Optional) The language code for the values. Defaults to
-   *   \Drupal\Core\Language\LanguageInterface::LANGCODE_NOT_SPECIFIED.
-   * @param $column
-   *   (Optional) The name of the column to check. Defaults to 'value'.
-   */
-  protected function assertFieldValues(EntityInterface $entity, $field_name, $expected_values, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED, $column = 'value') {
-    // Re-load the entity to make sure we have the latest changes.
-    \Drupal::entityManager()->getStorage($entity->getEntityTypeId())->resetCache(array($entity->id()));
-    $e = entity_load($entity->getEntityTypeId(), $entity->id());
-    $field = $values = $e->getTranslation($langcode)->$field_name;
-    // Filter out empty values so that they don't mess with the assertions.
-    $field->filterEmptyItems();
-    $values = $field->getValue();
-    $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.');
-    foreach ($expected_values as $key => $value) {
-      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value)));
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FieldValidationTest.php b/core/modules/field/src/Tests/FieldValidationTest.php
deleted file mode 100644
index 8f51b7a..0000000
--- a/core/modules/field/src/Tests/FieldValidationTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FieldValidationTest.
- */
-
-namespace Drupal\field\Tests;
-
-/**
- * Tests field validation.
- *
- * @group field
- */
-class FieldValidationTest extends FieldUnitTestBase {
-
-  /**
-   * @var string
-   */
-  private $entityType;
-
-  /**
-   * @var string
-   */
-  private $bundle;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityInterface
-   */
-  private $entity;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a field and storage of type 'test_field', on the 'entity_test'
-    // entity type.
-    $this->entityType = 'entity_test';
-    $this->bundle = 'entity_test';
-    $this->createFieldWithStorage('', $this->entityType, $this->bundle);
-
-    // Create an 'entity_test' entity.
-    $this->entity = entity_create($this->entityType, array(
-      'type' => $this->bundle,
-    ));
-  }
-
-  /**
-   * Tests that the number of values is validated against the field cardinality.
-   */
-  function testCardinalityConstraint() {
-    $cardinality = $this->fieldTestData->field_storage->getCardinality();
-    $entity = $this->entity;
-
-    for ($delta = 0; $delta < $cardinality + 1; $delta++) {
-      $entity->{$this->fieldTestData->field_name}[] = array('value' => 1);
-    }
-
-    // Validate the field.
-    $violations = $entity->{$this->fieldTestData->field_name}->validate();
-
-    // Check that the expected constraint violations are reported.
-    $this->assertEqual(count($violations), 1);
-    $this->assertEqual($violations[0]->getPropertyPath(), '');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: this field cannot hold more than @count values.', array('%name' => $this->fieldTestData->field->getLabel(), '@count' => $cardinality)));
-  }
-
-  /**
-   * Tests that constraints defined by the field type are validated.
-   */
-  function testFieldConstraints() {
-    $cardinality = $this->fieldTestData->field_storage->getCardinality();
-    $entity = $this->entity;
-
-    // The test is only valid if the field cardinality is greater than 2.
-    $this->assertTrue($cardinality >= 2);
-
-    // Set up values for the field.
-    $expected_violations = array();
-    for ($delta = 0; $delta < $cardinality; $delta++) {
-      // All deltas except '1' have incorrect values.
-      if ($delta == 1) {
-        $value = 1;
-      }
-      else {
-        $value = -1;
-        $expected_violations[$delta . '.value'][] = t('%name does not accept the value -1.', array('%name' => $this->fieldTestData->field->getLabel()));
-      }
-      $entity->{$this->fieldTestData->field_name}[] = $value;
-    }
-
-    // Validate the field.
-    $violations = $entity->{$this->fieldTestData->field_name}->validate();
-
-    // Check that the expected constraint violations are reported.
-    $violations_by_path = array();
-    foreach ($violations as $violation) {
-      $violations_by_path[$violation->getPropertyPath()][] = $violation->getMessage();
-    }
-    $this->assertEqual($violations_by_path, $expected_violations);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/FormTest.php b/core/modules/field/src/Tests/FormTest.php
index dbdc71a..79ba7d1 100644
--- a/core/modules/field/src/Tests/FormTest.php
+++ b/core/modules/field/src/Tests/FormTest.php
@@ -99,8 +99,8 @@ function testFieldFormSingle() {
     $field_storage = $this->fieldStorageSingle;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
@@ -175,8 +175,8 @@ function testFieldFormDefaultValue() {
     $this->field['field_name'] = $field_name;
     $default = rand(1, 127);
     $this->field['default_value'] = array(array('value' => $default));
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
@@ -203,8 +203,8 @@ function testFieldFormSingleRequired() {
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
     $this->field['required'] = TRUE;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
@@ -239,16 +239,16 @@ function testFieldFormSingleRequired() {
 //    $this->field = $this->field_multiple;
 //    $field_name = $this->field['field_name'];
 //    $this->instance['field_name'] = $field_name;
-//    entity_create('field_storage_config', $this->field)->save();
-//    entity_create('field_config', $this->instance)->save();
+//    FieldStorageConfig::create($this->field)->save();
+//    FieldConfig::create($this->instance)->save();
 //  }
 
   function testFieldFormUnlimited() {
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
@@ -358,14 +358,14 @@ function testFieldFormMultivalueWithRequiredRadio() {
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
 
     // Add a required radio field.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'required_radio_test',
       'entity_type' => 'entity_test',
       'type' => 'list_string',
@@ -379,7 +379,7 @@ function testFieldFormMultivalueWithRequiredRadio() {
       'bundle' => 'entity_test',
       'required' => TRUE,
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
     entity_get_form_display($field['entity_type'], $field['bundle'], 'default')
       ->setComponent($field['field_name'], array(
         'type' => 'options_buttons',
@@ -405,8 +405,8 @@ function testFieldFormJSAddMore() {
     $field_storage = $this->fieldStorageUnlimited;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name)
       ->save();
@@ -466,8 +466,8 @@ function testFieldFormMultipleWidget() {
     $field_storage = $this->fieldStorageMultiple;
     $field_name = $field_storage['field_name'];
     $this->field['field_name'] = $field_name;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $this->field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($field_name, array(
         'type' => 'test_field_widget_multiple',
@@ -515,8 +515,8 @@ function testFieldFormAccess() {
     $field['field_name'] = $field_name;
     $field['entity_type'] = $entity_type;
     $field['bundle'] = $entity_type;
-    entity_create('field_storage_config', $field_storage)->save();
-    entity_create('field_config', $field)->save();
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($field)->save();
     entity_get_form_display($entity_type, $entity_type, 'default')
       ->setComponent($field_name)
       ->save();
@@ -535,15 +535,17 @@ function testFieldFormAccess() {
       'bundle' => $entity_type,
       'default_value' => array(0 => array('value' => 99)),
     );
-    entity_create('field_storage_config', $field_storage_no_access)->save();
-    entity_create('field_config', $field_no_access)->save();
+    FieldStorageConfig::create($field_storage_no_access)->save();
+    FieldConfig::create($field_no_access)->save();
     entity_get_form_display($field_no_access['entity_type'], $field_no_access['bundle'], 'default')
       ->setComponent($field_name_no_access)
       ->save();
 
     // Test that the form structure includes full information for each delta
     // apart from #access.
-    $entity = entity_create($entity_type, array('id' => 0, 'revision_id' => 0));
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 0, 'revision_id' => 0));
 
     $display = entity_get_form_display($entity_type, $entity_type, 'default');
     $form = array();
@@ -600,8 +602,8 @@ function testHiddenField() {
     $this->field['default_value'] = array(0 => array('value' => 99));
     $this->field['entity_type'] = $entity_type;
     $this->field['bundle'] = $entity_type;
-    entity_create('field_storage_config', $field_storage)->save();
-    $this->field = entity_create('field_config', $this->field);
+    FieldStorageConfig::create($field_storage)->save();
+    $this->field = FieldConfig::create($this->field);
     $this->field->save();
     // We explicitly do not assign a widget in a form display, so the field
     // stays hidden in forms.
diff --git a/core/modules/field/src/Tests/FormatterPluginManagerTest.php b/core/modules/field/src/Tests/FormatterPluginManagerTest.php
deleted file mode 100644
index bc1c635..0000000
--- a/core/modules/field/src/Tests/FormatterPluginManagerTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\FormatterPluginManagerTest.
- */
-
-namespace Drupal\field\Tests;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FormatterPluginManager;
-
-/**
- * Tests the field formatter plugin manager.
- *
- * @group field
- */
-class FormatterPluginManagerTest extends FieldUnitTestBase {
-
-  /**
-   * Tests that getInstance falls back on default if current is not applicable.
-   *
-   * @see \Drupal\field\Tests\WidgetPluginManagerTest::testNotApplicableFallback()
-   */
-  public function testNotApplicableFallback() {
-    /** @var FormatterPluginManager $formatter_plugin_manager */
-    $formatter_plugin_manager = \Drupal::service('plugin.manager.field.formatter');
-
-    $base_field_definition = BaseFieldDefinition::create('test_field')
-      // Set a name that will make isApplicable() return TRUE.
-      ->setName('field_test_field');
-
-    $formatter_options = array(
-      'field_definition' => $base_field_definition,
-      'view_mode' => 'default',
-      'configuration' => array(
-        'type' => 'field_test_applicable',
-      ),
-    );
-
-    $instance = $formatter_plugin_manager->getInstance($formatter_options);
-    $this->assertEqual($instance->getPluginId(), 'field_test_applicable');
-
-    // Now set name to something that makes isApplicable() return FALSE.
-    $base_field_definition->setName('deny_applicable');
-    $instance = $formatter_plugin_manager->getInstance($formatter_options);
-
-    // Instance should be default widget.
-    $this->assertNotEqual($instance->getPluginId(), 'field_test_applicable');
-    $this->assertEqual($instance->getPluginId(), 'field_test_default');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
deleted file mode 100644
index 1ad3d36..0000000
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldFormatterSettingsTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade field formatter settings to entity.display.*.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-  }
-
-  /**
-   * Test that migrated entity display settings can be loaded using D8 API's.
-   */
-  public function testEntityDisplaySettings() {
-    // Run tests.
-    $field_name = "field_test";
-    $expected = array(
-      'label' => 'above',
-      'weight' => 1,
-      'type' => 'text_trimmed',
-      'settings' => array('trim_length' => 600),
-      'third_party_settings' => array(),
-    );
-
-    // Can we load any entity display.
-    $display = EntityViewDisplay::load('node.story.teaser');
-    $this->assertIdentical($expected, $display->getComponent($field_name));
-
-    // Test migrate worked with multiple bundles.
-    $display = EntityViewDisplay::load('node.test_page.teaser');
-    $expected['weight'] = 35;
-    $this->assertIdentical($expected, $display->getComponent($field_name));
-
-    // Test RSS because that has been converted from 4 to rss.
-    $display = EntityViewDisplay::load('node.story.rss');
-    $expected['weight'] = 1;
-    $this->assertIdentical($expected, $display->getComponent($field_name));
-
-    // Test the default format with text_default which comes from a static map.
-    $expected['type'] = 'text_default';
-    $expected['settings'] = array();
-    $display = EntityViewDisplay::load('node.story.default');
-    $this->assertIdentical($expected, $display->getComponent($field_name));
-
-    // Check that we can migrate multiple fields.
-    $content = $display->get('content');
-    $this->assertTrue(isset($content['field_test']), 'Settings for field_test exist.');
-    $this->assertTrue(isset($content['field_test_two']), "Settings for field_test_two exist.");
-
-    // Check that we can migrate a field where exclude is not set.
-    $this->assertTrue(isset($content['field_test_exclude_unset']), "Settings for field_test_exclude_unset exist.");
-
-    // Test the number field formatter settings are correct.
-    $expected['weight'] = 1;
-    $expected['type'] = 'number_integer';
-    $expected['settings'] = array(
-      'thousand_separator' => ',',
-      'prefix_suffix' => TRUE,
-    );
-    $component = $display->getComponent('field_test_two');
-    $this->assertIdentical($expected, $component);
-    $expected['weight'] = 2;
-    $expected['type'] = 'number_decimal';
-    $expected['settings'] = array(
-       'scale' => 2,
-       'decimal_separator' => '.',
-       'thousand_separator' => ',',
-       'prefix_suffix' => TRUE,
-    );
-    $component = $display->getComponent('field_test_three');
-    $this->assertIdentical($expected, $component);
-
-    // Test the email field formatter settings are correct.
-    $expected['weight'] = 6;
-    $expected['type'] = 'email_mailto';
-    $expected['settings'] = array();
-    $component = $display->getComponent('field_test_email');
-    $this->assertIdentical($expected, $component);
-
-    // Test the link field formatter settings.
-    $expected['weight'] = 7;
-    $expected['type'] = 'link';
-    $expected['settings'] = array(
-      'trim_length' => 80,
-      'url_only' => TRUE,
-      'url_plain' => TRUE,
-      'rel' => '0',
-      'target' => '0',
-    );
-    $component = $display->getComponent('field_test_link');
-    $this->assertIdentical($expected, $component);
-    $expected['settings']['url_only'] = FALSE;
-    $expected['settings']['url_plain'] = FALSE;
-    $display = EntityViewDisplay::load('node.story.teaser');
-    $component = $display->getComponent('field_test_link');
-    $this->assertIdentical($expected, $component);
-
-    // Test the file field formatter settings.
-    $expected['weight'] = 8;
-    $expected['type'] = 'file_default';
-    $expected['settings'] = array();
-    $component = $display->getComponent('field_test_filefield');
-    $this->assertIdentical($expected, $component);
-    $display = EntityViewDisplay::load('node.story.default');
-    $expected['type'] = 'file_url_plain';
-    $component = $display->getComponent('field_test_filefield');
-    $this->assertIdentical($expected, $component);
-
-    // Test the image field formatter settings.
-    $expected['weight'] = 9;
-    $expected['type'] = 'image';
-    $expected['settings'] = array('image_style' => '', 'image_link' => '');
-    $component = $display->getComponent('field_test_imagefield');
-    $this->assertIdentical($expected, $component);
-    $display = EntityViewDisplay::load('node.story.teaser');
-    $expected['settings']['image_link'] = 'file';
-    $component = $display->getComponent('field_test_imagefield');
-    $this->assertIdentical($expected, $component);
-
-    // Test phone field.
-    $expected['weight'] = 13;
-    $expected['type'] = 'basic_string';
-    $expected['settings'] = array();
-    $component = $display->getComponent('field_test_phone');
-    $this->assertIdentical($expected, $component);
-
-    // Test date field.
-    $defaults = array('format_type' => 'fallback', 'timezone_override' => '',);
-    $expected['weight'] = 10;
-    $expected['type'] = 'datetime_default';
-    $expected['settings'] = array('format_type' => 'fallback') + $defaults;
-    $component = $display->getComponent('field_test_date');
-    $this->assertIdentical($expected, $component);
-    $display = EntityViewDisplay::load('node.story.default');
-    $expected['settings']['format_type'] = 'long';
-    $component = $display->getComponent('field_test_date');
-    $this->assertIdentical($expected, $component);
-
-    // Test date stamp field.
-    $expected['weight'] = 11;
-    $expected['settings']['format_type'] = 'fallback';
-    $component = $display->getComponent('field_test_datestamp');
-    $this->assertIdentical($expected, $component);
-    $display = EntityViewDisplay::load('node.story.teaser');
-    $expected['settings'] = array('format_type' => 'medium') + $defaults;
-    $component = $display->getComponent('field_test_datestamp');
-    $this->assertIdentical($expected, $component);
-
-    // Test datetime field.
-    $expected['weight'] = 12;
-    $expected['settings'] = array('format_type' => 'short') + $defaults;
-    $component = $display->getComponent('field_test_datetime');
-    $this->assertIdentical($expected, $component);
-    $display = EntityViewDisplay::load('node.story.default');
-    $expected['settings']['format_type'] = 'fallback';
-    $component = $display->getComponent('field_test_datetime');
-    $this->assertIdentical($expected, $component);
-
-    // Test a date field with a random format which should be mapped
-    // to datetime_default.
-    $display = EntityViewDisplay::load('node.story.rss');
-    $expected['settings']['format_type'] = 'fallback';
-    $component = $display->getComponent('field_test_datetime');
-    $this->assertIdentical($expected, $component);
-    // Test that our Id map has the correct data.
-    $this->assertIdentical(array('node', 'story', 'teaser', 'field_test'), Migration::load('d6_field_formatter_settings')->getIdMap()->lookupDestinationID(array('story', 'teaser', 'node', 'field_test')));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
deleted file mode 100644
index 2abd940..0000000
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldInstanceTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\link\LinkItemInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Migrate field instances.
- *
- * @group migrate_drupal_6
- */
-class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * Tests migration of file variables to file.settings.yml.
-   */
-  public function testFieldInstanceMigration() {
-    $this->migrateFields();
-
-    $entity = Node::create(['type' => 'story']);
-    // Test a text field.
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = FieldConfig::load('node.story.field_test');
-    $this->assertIdentical('Text Field', $field->label());
-    // field_test is a text_long field, which have no settings.
-    $this->assertIdentical([], $field->getSettings());
-    $this->assertIdentical('text for default value', $entity->field_test->value);
-
-    // Test a number field.
-    $field = FieldConfig::load('node.story.field_test_two');
-    $this->assertIdentical('Integer Field', $field->label());
-    $expected = array(
-      'min' => 10,
-      'max' => 100,
-      'prefix' => 'pref',
-      'suffix' => 'suf',
-      'unsigned' => FALSE,
-      'size' => 'normal',
-    );
-    $this->assertIdentical($expected, $field->getSettings());
-
-    $field = FieldConfig::load('node.story.field_test_four');
-    $this->assertIdentical('Float Field', $field->label());
-    $expected = array(
-      'min' => 100.0,
-      'max' => 200.0,
-      'prefix' => 'id-',
-      'suffix' => '',
-    );
-    $this->assertIdentical($expected, $field->getSettings());
-
-    // Test email field.
-    $field = FieldConfig::load('node.story.field_test_email');
-    $this->assertIdentical('Email Field', $field->label());
-    $this->assertIdentical('benjy@example.com', $entity->field_test_email->value);
-
-    // Test image field.
-    $field = FieldConfig::load('node.story.field_test_imagefield');
-    $this->assertIdentical('Image Field', $field->label());
-    $field_settings = $field->getSettings();
-    $this->assertIdentical('', $field_settings['max_resolution']);
-    $this->assertIdentical('', $field_settings['min_resolution']);
-    $this->assertIdentical('', $field_settings['file_directory']);
-    $this->assertIdentical('png gif jpg jpeg', $field_settings['file_extensions']);
-    $this->assertIdentical('public', $field_settings['uri_scheme']);
-
-    // Test a filefield.
-    $field = FieldConfig::load('node.story.field_test_filefield');
-    $this->assertIdentical('File Field', $field->label());
-    $expected = array(
-      'file_extensions' => 'txt pdf doc',
-      'file_directory' => 'images',
-      'description_field' => TRUE,
-      'max_filesize' => '200KB',
-      'target_type' => 'file',
-      'display_field' => FALSE,
-      'display_default' => FALSE,
-      'uri_scheme' => 'public',
-      'handler' => 'default:file',
-      'handler_settings' => array(),
-    );
-    $field_settings = $field->getSettings();
-    ksort($expected);
-    ksort($field_settings);
-    // This is the only way to compare arrays.
-    $this->assertIdentical($expected, $field_settings);
-
-    // Test a link field.
-    $field = FieldConfig::load('node.story.field_test_link');
-    $this->assertIdentical('Link Field', $field->label());
-    $expected = array('title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC);
-    $this->assertIdentical($expected, $field->getSettings());
-    $this->assertIdentical('default link title', $entity->field_test_link->title, 'Field field_test_link default title is correct.');
-    $this->assertIdentical('https://www.drupal.org', $entity->field_test_link->url, 'Field field_test_link default title is correct.');
-    $this->assertIdentical([], $entity->field_test_link->options['attributes']);
-  }
-
-  /**
-   * Tests migrating fields into non-existent content types.
-   */
-  public function testMigrateFieldIntoUnknownNodeType() {
-    $this->sourceDatabase->delete('node_type')
-      ->condition('type', 'test_planet')
-      ->execute();
-    // The field migrations use the migration plugin to ensure that the node
-    // types exist, so this should produce no failures...
-    $this->migrateFields();
-
-    // ...and the field instances should not have been migrated.
-    $this->assertNull(FieldConfig::load('node.test_planet.field_multivalue'));
-    $this->assertNull(FieldConfig::load('node.test_planet.field_test_text_single_checkbox'));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
deleted file mode 100644
index 47b8bbd..0000000
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate fields.
- *
- * @group migrate_drupal_6
- */
-class MigrateFieldTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_field');
-  }
-
-  /**
-   * Tests the Drupal 6 field to Drupal 8 migration.
-   */
-  public function testFields() {
-    // Text field.
-    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    $field_storage = FieldStorageConfig::load('node.field_test');
-    $this->assertIdentical('text_long', $field_storage->getType());
-    // text_long fields do not have settings.
-    $this->assertIdentical([], $field_storage->getSettings());
-
-    // Integer field.
-    $field_storage = FieldStorageConfig::load('node.field_test_two');
-    $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', array('@fieldtype' => $field_storage->getType())));
-
-    // Float field.
-    $field_storage = FieldStorageConfig::load('node.field_test_three');
-    $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', array('@fieldtype' => $field_storage->getType())));
-
-    // Link field.
-    $field_storage = FieldStorageConfig::load('node.field_test_link');
-    $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', array('@fieldtype' => $field_storage->getType())));
-
-    // File field.
-    $field_storage = FieldStorageConfig::load('node.field_test_filefield');
-    $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', array('@fieldtype' => $field_storage->getType())));
-
-    $field_storage = FieldStorageConfig::load('node.field_test_imagefield');
-    $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', array('@fieldtype' => $field_storage->getType())));
-    $settings = $field_storage->getSettings();
-    $this->assertIdentical('file', $settings['target_type']);
-    $this->assertIdentical('public', $settings['uri_scheme']);
-    $this->assertIdentical(array(), array_filter($settings['default_image']));
-
-    // Phone field.
-    $field_storage = FieldStorageConfig::load('node.field_test_phone');
-    $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', array('@fieldtype' => $field_storage->getType())));
-
-    // Date field.
-    $field_storage = FieldStorageConfig::load('node.field_test_datetime');
-    $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', array('@fieldtype' => $field_storage->getType())));
-
-    // Decimal field with radio buttons.
-    $field_storage = FieldStorageConfig::load('node.field_test_decimal_radio_buttons');
-    $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', array('@fieldtype' => $field_storage->getType())));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['1.2'], t('First allowed value key is set to 1.2'));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value key is set to 2.1'));
-    $this->assertIdentical('1.2', $field_storage->getSetting('allowed_values')['1.2'], t('First allowed value is set to 1.2'));
-    $this->assertIdentical('2.1', $field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value is set to 1.2'));
-
-    // Float field with a single checkbox.
-    $field_storage = FieldStorageConfig::load('node.field_test_float_single_checkbox');
-    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
-
-    // Integer field with a select list.
-    $field_storage = FieldStorageConfig::load('node.field_test_integer_selectlist');
-    $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', array('@fieldtype' => $field_storage->getType())));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['1234'], t('First allowed value key is set to 1234'));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['2341'], t('Second allowed value key is set to 2341'));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['3412'], t('Third allowed value key is set to 3412'));
-    $this->assertNotNull($field_storage->getSetting('allowed_values')['4123'], t('Fourth allowed value key is set to 4123'));
-    $this->assertIdentical('1234', $field_storage->getSetting('allowed_values')['1234'], t('First allowed value is set to 1234'));
-    $this->assertIdentical('2341', $field_storage->getSetting('allowed_values')['2341'], t('Second allowed value is set to 2341'));
-    $this->assertIdentical('3412', $field_storage->getSetting('allowed_values')['3412'], t('Third allowed value is set to 3412'));
-    $this->assertIdentical('4123', $field_storage->getSetting('allowed_values')['4123'], t('Fourth allowed value is set to 4123'));
-
-    // Text field with a single checkbox.
-    $field_storage = FieldStorageConfig::load('node.field_test_text_single_checkbox');
-    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
-
-    // Validate that the source count and processed count match up.
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = Migration::load('d6_field');
-    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
-
-    // Check that we've reported on a conflict in widget_types.
-    $messages = [];
-    foreach ($migration->getIdMap()->getMessageIterator() as $message_row) {
-      $messages[] = $message_row->message;
-    }
-    $this->assertIdentical(count($messages), 1);
-    $this->assertIdentical($messages[0], 'Widget types optionwidgets_onoff, text_textfield are used in Drupal 6 field instances: widget type optionwidgets_onoff applied to the Drupal 8 base field');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
deleted file mode 100644
index 8a4140e..0000000
--- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d6\MigrateFieldWidgetSettingsTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate field widget settings.
- *
- * @group migrate_drupal_6
- */
-class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-  }
-
-  /**
-   * Test that migrated view modes can be loaded using D8 API's.
-   */
-  public function testWidgetSettings() {
-    // Test the config can be loaded.
-    $form_display = EntityFormDisplay::load('node.story.default');
-    $this->assertIdentical(FALSE, is_null($form_display), "Form display node.story.default loaded with config.");
-
-    // Text field.
-    $component = $form_display->getComponent('field_test');
-    $expected = array('weight' => 1, 'type' => 'text_textfield');
-    $expected['settings'] = array('size' => 60, 'placeholder' => '');
-    $expected['third_party_settings'] = array();
-    $this->assertIdentical($expected, $component, 'Text field settings are correct.');
-
-    // Integer field.
-    $component = $form_display->getComponent('field_test_two');
-    $expected['type'] = 'number';
-    $expected['weight'] = 1;
-    $expected['settings'] = array('placeholder' => '');
-    $this->assertIdentical($expected, $component);
-
-    // Float field.
-    $component = $form_display->getComponent('field_test_three');
-    $expected['weight'] = 2;
-    $this->assertIdentical($expected, $component);
-
-    // Email field.
-    $component = $form_display->getComponent('field_test_email');
-    $expected['type'] = 'email_default';
-    $expected['weight'] = 6;
-    $expected['settings'] = array('placeholder' => '', 'size' => 60);
-    $this->assertIdentical($expected, $component);
-
-    // Link field.
-    $component = $form_display->getComponent('field_test_link');
-    $this->assertIdentical('link_default', $component['type']);
-    $this->assertIdentical(7, $component['weight']);
-    $this->assertFalse(array_filter($component['settings']));
-
-    // File field.
-    $component = $form_display->getComponent('field_test_filefield');
-    $expected['type'] = 'file_generic';
-    $expected['weight'] = 8;
-    $expected['settings'] = array('progress_indicator' => 'bar');
-    $this->assertIdentical($expected, $component);
-
-    // Image field.
-    $component = $form_display->getComponent('field_test_imagefield');
-    $expected['type'] = 'image_image';
-    $expected['weight'] = 9;
-    $expected['settings'] = array('progress_indicator' => 'bar', 'preview_image_style' => 'thumbnail');
-    $this->assertIdentical($expected, $component);
-
-    // Phone field.
-    $component = $form_display->getComponent('field_test_phone');
-    $expected['type'] = 'telephone_default';
-    $expected['weight'] = 13;
-    $expected['settings'] = array('placeholder' => '');
-    $this->assertIdentical($expected, $component);
-
-    // Date fields.
-    $component = $form_display->getComponent('field_test_date');
-    $expected['type'] = 'datetime_default';
-    $expected['weight'] = 10;
-    $expected['settings'] = array();
-    $this->assertIdentical($expected, $component);
-
-    $component = $form_display->getComponent('field_test_datestamp');
-    $expected['weight'] = 11;
-    $this->assertIdentical($expected, $component);
-
-    $component = $form_display->getComponent('field_test_datetime');
-    $expected['weight'] = 12;
-    $this->assertIdentical($expected, $component);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php
deleted file mode 100644
index 246b1e5..0000000
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldFormatterSettingsTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d7;
-
-use Drupal\comment\Entity\CommentType;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Tests migration of D7 field formatter settings.
- *
- * @group field
- */
-class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = [
-    'comment',
-    'datetime',
-    'file',
-    'image',
-    'link',
-    'node',
-    'taxonomy',
-    'telephone',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('taxonomy_term');
-
-    CommentType::create([
-      'id' => 'comment_node_page',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    CommentType::create([
-      'id' => 'comment_node_article',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    CommentType::create([
-      'id' => 'comment_node_blog',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    CommentType::create([
-      'id' => 'comment_node_book',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    CommentType::create([
-      'id' => 'comment_node_forum',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    CommentType::create([
-      'id' => 'comment_node_test_content_type',
-      'label' => $this->randomMachineName(),
-    ])->save();
-
-    NodeType::create([
-      'type' => 'page',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    NodeType::create([
-      'type' => 'article',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    NodeType::create([
-      'type' => 'blog',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    NodeType::create([
-      'type' => 'book',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    NodeType::create([
-      'type' => 'forum',
-      'label' => $this->randomMachineName(),
-    ])->save();
-    NodeType::create([
-      'type' => 'test_content_type',
-      'label' => $this->randomMachineName(),
-    ])->save();
-
-    // Give one unfortunate field instance invalid display settings to ensure
-    // that the migration provides an empty array as a default (thus avoiding
-    // an "unsupported operand types" fatal).
-    Database::getConnection('default', 'migrate')
-      ->update('field_config_instance')
-      ->fields(array(
-        'data' => serialize(array (
-          'label' => 'Body',
-          'widget' =>
-            array (
-              'type' => 'text_textarea_with_summary',
-              'settings' =>
-                array (
-                  'rows' => 20,
-                  'summary_rows' => 5,
-                ),
-              'weight' => -4,
-              'module' => 'text',
-            ),
-          'settings' =>
-            array (
-              'display_summary' => true,
-              'text_processing' => 1,
-              'user_register_form' => false,
-            ),
-          'display' =>
-            array (
-              'default' =>
-                array (
-                  'label' => 'hidden',
-                  'type' => 'text_default',
-                  'settings' =>
-                    array (
-                    ),
-                  'module' => 'text',
-                  'weight' => 0,
-                ),
-              'teaser' =>
-                array (
-                  'label' => 'hidden',
-                  'type' => 'text_summary_or_trimmed',
-                  // settings is always expected to be an array. Making it NULL
-                  // causes a fatal.
-                  'settings' => NULL,
-                  'module' => 'text',
-                  'weight' => 0,
-                ),
-            ),
-          'required' => false,
-          'description' => '',
-        )),
-      ))
-      ->condition('entity_type', 'node')
-      ->condition('bundle', 'article')
-      ->condition('field_name', 'body')
-      ->execute();
-
-    $this->executeMigrations([
-      'd7_field',
-      'd7_field_instance',
-      'd7_view_modes',
-      'd7_field_formatter_settings',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a view display.
-   *
-   * @param string $id
-   *   The view display ID.
-   */
-  protected function assertEntity($id) {
-    $display = EntityViewDisplay::load($id);
-    $this->assertTrue($display instanceof EntityViewDisplayInterface);
-  }
-
-  /**
-   * Asserts various aspects of a particular component of a view display.
-   *
-   * @param string $display_id
-   *   The view display ID.
-   * @param string $component_id
-   *   The component ID.
-   * @param string $type
-   *   The expected component type (formatter plugin ID).
-   * @param string $label
-   *   The expected label of the component.
-   * @param int $weight
-   *   The expected weight of the component.
-   */
-  protected function assertComponent($display_id, $component_id, $type, $label, $weight) {
-    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
-    $this->assertTrue(is_array($component));
-    $this->assertIdentical($type, $component['type']);
-    $this->assertIdentical($label, $component['label']);
-    $this->assertIdentical($weight, $component['weight']);
-  }
-
-  /**
-   * Asserts that a particular component is NOT included in a display.
-   *
-   * @param string $display_id
-   *   The display ID.
-   * @param string $component_id
-   *   The component ID.
-   */
-  protected function assertComponentNotExists($display_id, $component_id) {
-    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
-    $this->assertTrue(is_null($component));
-  }
-
-  /**
-   * Tests migration of D7 field formatter settings.
-   */
-  public function testMigration() {
-    $this->assertEntity('comment.comment_node_article.default');
-    $this->assertComponent('comment.comment_node_article.default', 'comment_body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('comment.comment_node_blog.default');
-    $this->assertComponent('comment.comment_node_blog.default', 'comment_body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('comment.comment_node_book.default');
-    $this->assertComponent('comment.comment_node_book.default', 'comment_body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('comment.comment_node_forum.default');
-    $this->assertComponent('comment.comment_node_forum.default', 'comment_body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('comment.comment_node_page.default');
-    $this->assertComponent('comment.comment_node_page.default', 'comment_body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('comment.comment_node_test_content_type.default');
-    $this->assertComponent('comment.comment_node_test_content_type.default', 'comment_body', 'text_default', 'hidden', 0);
-    $this->assertComponent('comment.comment_node_test_content_type.default', 'field_integer', 'number_integer', 'above', 1);
-
-    $this->assertEntity('node.article.default');
-    $this->assertComponent('node.article.default', 'body', 'text_default', 'hidden', 0);
-    $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_label', 'above', 10);
-    $this->assertComponent('node.article.default', 'field_image', 'image', 'hidden', -1);
-
-    $this->assertEntity('node.article.teaser');
-    $this->assertComponent('node.article.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
-    $this->assertComponent('node.article.teaser', 'field_tags', 'entity_reference_label', 'above', 10);
-    $this->assertComponent('node.article.teaser', 'field_image', 'image', 'hidden', -1);
-
-    $this->assertEntity('node.blog.default');
-    $this->assertComponent('node.blog.default', 'body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('node.blog.teaser');
-    $this->assertComponent('node.blog.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
-
-    $this->assertEntity('node.book.default');
-    $this->assertComponent('node.book.default', 'body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('node.book.teaser');
-    $this->assertComponent('node.book.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
-
-    $this->assertEntity('node.forum.default');
-    $this->assertComponent('node.forum.default', 'body', 'text_default', 'hidden', 11);
-    $this->assertComponent('node.forum.default', 'taxonomy_forums', 'entity_reference_label', 'above', 10);
-
-    $this->assertEntity('node.forum.teaser');
-    $this->assertComponent('node.forum.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 11);
-    $this->assertComponent('node.forum.teaser', 'taxonomy_forums', 'entity_reference_label', 'above', 10);
-
-    $this->assertEntity('node.page.default');
-    $this->assertComponent('node.page.default', 'body', 'text_default', 'hidden', 0);
-
-    $this->assertEntity('node.page.teaser');
-    $this->assertComponent('node.page.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
-
-    $this->assertEntity('node.test_content_type.default');
-    $this->assertComponent('node.test_content_type.default', 'field_boolean', 'list_default', 'above', 0);
-    $this->assertComponent('node.test_content_type.default', 'field_email', 'email_mailto', 'above', 1);
-    // Phone formatters are not mapped and should default to basic_string.
-    $this->assertComponent('node.test_content_type.default', 'field_phone', 'basic_string', 'above', 2);
-    $this->assertComponent('node.test_content_type.default', 'field_date', 'datetime_default', 'above', 3);
-    $this->assertComponent('node.test_content_type.default', 'field_date_with_end_time', 'datetime_default', 'above', 4);
-    $this->assertComponent('node.test_content_type.default', 'field_file', 'file_default', 'above', 5);
-    $this->assertComponent('node.test_content_type.default', 'field_float', 'number_decimal', 'above', 6);
-    $this->assertComponent('node.test_content_type.default', 'field_images', 'image', 'above', 7);
-    $this->assertComponent('node.test_content_type.default', 'field_integer', 'number_integer', 'above', 8);
-    $this->assertComponent('node.test_content_type.default', 'field_link', 'link', 'above', 9);
-    $this->assertComponent('node.test_content_type.default', 'field_text_list', 'list_default', 'above', 10);
-    $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'list_default', 'above', 11);
-    $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_default', 'above', 12);
-    $this->assertComponentNotExists('node.test_content_type.default', 'field_term_reference');
-    $this->assertComponentNotExists('node.test_content_type.default', 'field_text');
-
-    $this->assertEntity('user.user.default');
-    $this->assertComponent('user.user.default', 'field_file', 'file_default', 'above', 0);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php
deleted file mode 100644
index 3bf5d89..0000000
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldInstanceTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d7;
-
-use Drupal\comment\Entity\CommentType;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\FieldConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Migrates Drupal 7 field instances.
- *
- * @group field
- */
-class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
-
-  /**
-   * The modules to be enabled during the test.
-   *
-   * @var array
-   */
-  static $modules = array(
-    'comment',
-    'datetime',
-    'file',
-    'image',
-    'link',
-    'node',
-    'system',
-    'taxonomy',
-    'telephone',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->createType('page');
-    $this->createType('article');
-    $this->createType('blog');
-    $this->createType('book');
-    $this->createType('forum');
-    $this->createType('test_content_type');
-    $this->executeMigrations(['d7_field', 'd7_field_instance']);
-  }
-
-  /**
-   * Creates a node type with a corresponding comment type.
-   *
-   * @param string $id
-   *   The node type ID.
-   */
-  protected function createType($id) {
-    NodeType::create(array(
-      'type' => $id,
-      'label' => $this->randomString(),
-    ))->save();
-
-    CommentType::create(array(
-      'id' => 'comment_node_' . $id,
-      'label' => $this->randomString(),
-      'target_entity_type_id' => 'node',
-    ))->save();
-  }
-
-  /**
-   * Asserts various aspects of a field config entity.
-   *
-   * @param string $id
-   *   The entity ID in the form ENTITY_TYPE.BUNDLE.FIELD_NAME.
-   * @param string $expected_label
-   *   The expected field label.
-   * @param string $expected_field_type
-   *   The expected field type.
-   * @param boolean $is_required
-   *   Whether or not the field is required.
-   */
-  protected function assertEntity($id, $expected_label, $expected_field_type, $is_required) {
-    list ($expected_entity_type, $expected_bundle, $expected_name) = explode('.', $id);
-
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = FieldConfig::load($id);
-    $this->assertTrue($field instanceof FieldConfigInterface);
-    $this->assertIdentical($expected_label, $field->label());
-    $this->assertIdentical($expected_field_type, $field->getType());
-    $this->assertIdentical($expected_entity_type, $field->getTargetEntityTypeId());
-    $this->assertIdentical($expected_bundle, $field->getTargetBundle());
-    $this->assertIdentical($expected_name, $field->getName());
-    $this->assertEqual($is_required, $field->isRequired());
-    $this->assertIdentical($expected_entity_type . '.' . $expected_name, $field->getFieldStorageDefinition()->id());
-  }
-
-  /**
-   * Tests migrating D7 field instances to field_config entities.
-   */
-  public function testFieldInstances() {
-    $this->assertEntity('comment.comment_node_page.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.page.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_article.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.article.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('node.article.field_tags', 'Tags', 'entity_reference', FALSE);
-    $this->assertEntity('node.article.field_image', 'Image', 'image', FALSE);
-    $this->assertEntity('comment.comment_node_blog.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.blog.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_book.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.book.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('node.forum.taxonomy_forums', 'Forums', 'entity_reference', TRUE);
-    $this->assertEntity('comment.comment_node_forum.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.forum.body', 'Body', 'text_with_summary', FALSE);
-    $this->assertEntity('comment.comment_node_test_content_type.comment_body', 'Comment', 'text_long', TRUE);
-    $this->assertEntity('node.test_content_type.field_boolean', 'Boolean', 'boolean', FALSE);
-    $this->assertEntity('node.test_content_type.field_email', 'Email', 'email', FALSE);
-    $this->assertEntity('node.test_content_type.field_phone', 'Phone', 'telephone', TRUE);
-    $this->assertEntity('node.test_content_type.field_date', 'Date', 'datetime', FALSE);
-    $this->assertEntity('node.test_content_type.field_date_with_end_time', 'Date With End Time', 'datetime', FALSE);
-    $this->assertEntity('node.test_content_type.field_file', 'File', 'file', FALSE);
-    $this->assertEntity('node.test_content_type.field_float', 'Float', 'float', FALSE);
-    $this->assertEntity('node.test_content_type.field_images', 'Images', 'image', TRUE);
-    $this->assertEntity('node.test_content_type.field_integer', 'Integer', 'integer', TRUE);
-    $this->assertEntity('node.test_content_type.field_link', 'Link', 'link', FALSE);
-    $this->assertEntity('node.test_content_type.field_text_list', 'Text List', 'list_string', FALSE);
-    $this->assertEntity('node.test_content_type.field_integer_list', 'Integer List', 'list_integer', FALSE);
-    $this->assertEntity('node.test_content_type.field_long_text', 'Long text', 'text_with_summary', FALSE);
-    $this->assertEntity('node.test_content_type.field_term_reference', 'Term Reference', 'entity_reference', FALSE);
-    $this->assertEntity('node.test_content_type.field_text', 'Text', 'text', FALSE);
-    $this->assertEntity('comment.comment_node_test_content_type.field_integer', 'Integer', 'integer', FALSE);
-    $this->assertEntity('user.user.field_file', 'File', 'file', FALSE);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
deleted file mode 100644
index f6dbd46..0000000
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldInstanceWidgetSettingsTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d7;
-
-use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrate field widget settings.
- *
- * @group field
- */
-class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array(
-    'comment',
-    'datetime',
-    'field',
-    'file',
-    'image',
-    'link',
-    'node',
-    'taxonomy',
-    'telephone',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(static::$modules);
-
-    $this->executeMigrations([
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_field',
-      'd7_field_instance',
-      'd7_field_instance_widget_settings',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a form display entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $expected_entity_type
-   *   The expected entity type to which the display settings are attached.
-   * @param string $expected_bundle
-   *   The expected bundle to which the display settings are attached.
-   */
-  protected function assertEntity($id, $expected_entity_type, $expected_bundle) {
-    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $entity */
-    $entity = EntityFormDisplay::load($id);
-    $this->assertTrue($entity instanceof EntityFormDisplayInterface);
-    $this->assertIdentical($expected_entity_type, $entity->getTargetEntityTypeId());
-    $this->assertIdentical($expected_bundle, $entity->getTargetBundle());
-  }
-
-  /**
-   * Asserts various aspects of a particular component of a form display.
-   *
-   * @param string $display_id
-   *   The form display ID.
-   * @param string $component_id
-   *   The component ID.
-   * @param string $widget_type
-   *   The expected widget type.
-   * @param string $weight
-   *   The expected weight of the component.
-   */
-  protected function assertComponent($display_id, $component_id, $widget_type, $weight) {
-    $component = EntityFormDisplay::load($display_id)->getComponent($component_id);
-    $this->assertTrue(is_array($component));
-    $this->assertIdentical($widget_type, $component['type']);
-    $this->assertIdentical($weight, $component['weight']);
-  }
-
-  /**
-   * Test that migrated view modes can be loaded using D8 APIs.
-   */
-  public function testWidgetSettings() {
-    $this->assertEntity('node.page.default', 'node', 'page');
-    $this->assertComponent('node.page.default', 'body', 'text_textarea_with_summary', -4);
-
-    $this->assertEntity('node.article.default', 'node', 'article');
-    $this->assertComponent('node.article.default', 'body', 'text_textarea_with_summary', -4);
-    $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_autocomplete', -4);
-    $this->assertComponent('node.article.default', 'field_image', 'image_image', -1);
-
-    $this->assertEntity('node.blog.default', 'node', 'blog');
-    $this->assertComponent('node.blog.default', 'body', 'text_textarea_with_summary', -4);
-
-    $this->assertEntity('node.book.default', 'node', 'book');
-    $this->assertComponent('node.book.default', 'body', 'text_textarea_with_summary', -4);
-
-    $this->assertEntity('node.forum.default', 'node', 'forum');
-    $this->assertComponent('node.forum.default', 'body', 'text_textarea_with_summary', 1);
-    $this->assertComponent('node.forum.default', 'taxonomy_forums', 'options_select', 0);
-
-    $this->assertEntity('node.test_content_type.default', 'node', 'test_content_type');
-    $this->assertComponent('node.test_content_type.default', 'field_boolean', 'boolean_checkbox', 1);
-    $this->assertComponent('node.test_content_type.default', 'field_date', 'datetime_default', 2);
-    $this->assertComponent('node.test_content_type.default', 'field_date_with_end_time', 'datetime_default', 3);
-    $this->assertComponent('node.test_content_type.default', 'field_email', 'email_default', 4);
-    $this->assertComponent('node.test_content_type.default', 'field_file', 'file_generic', 5);
-    $this->assertComponent('node.test_content_type.default', 'field_float', 'number', 7);
-    $this->assertComponent('node.test_content_type.default', 'field_images', 'image_image', 8);
-    $this->assertComponent('node.test_content_type.default', 'field_integer', 'number', 9);
-    $this->assertComponent('node.test_content_type.default', 'field_link', 'link_default', 10);
-    $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'options_buttons', 12);
-    $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_textarea_with_summary', 13);
-    $this->assertComponent('node.test_content_type.default', 'field_phone', 'telephone_default', 6);
-    $this->assertComponent('node.test_content_type.default', 'field_term_reference', 'entity_reference_autocomplete', 14);
-    $this->assertComponent('node.test_content_type.default', 'field_text', 'text_textfield', 15);
-    $this->assertComponent('node.test_content_type.default', 'field_text_list', 'options_select', 11);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
deleted file mode 100644
index 7daf734..0000000
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateFieldTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateFieldTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d7;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrates Drupal 7 fields.
- *
- * @group field
- */
-class MigrateFieldTest extends MigrateDrupal7TestBase {
-
-  /**
-   * The modules to be enabled during the test.
-   *
-   * @var array
-   */
-  static $modules = array(
-    'comment',
-    'datetime',
-    'file',
-    'image',
-    'link',
-    'node',
-    'system',
-    'taxonomy',
-    'telephone',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_field');
-  }
-
-  /**
-   * Asserts various aspects of a field_storage_config entity.
-   *
-   * @param string $id
-   *   The entity ID in the form ENTITY_TYPE.FIELD_NAME.
-   * @param string $expected_type
-   *   The expected field type.
-   * @param bool $expected_translatable
-   *   Whether or not the field is expected to be translatable.
-   * @param int $expected_cardinality
-   *   The expected cardinality of the field.
-   */
-  protected function assertEntity($id, $expected_type, $expected_translatable, $expected_cardinality) {
-    list ($expected_entity_type, $expected_name) = explode('.', $id);
-
-    /** @var \Drupal\field\FieldStorageConfigInterface $field */
-    $field = FieldStorageConfig::load($id);
-    $this->assertTrue($field instanceof FieldStorageConfigInterface);
-    $this->assertIdentical($expected_name, $field->getName());
-    $this->assertIdentical($expected_type, $field->getType());
-    // FieldStorageConfig::$translatable is TRUE by default, so it is useful
-    // to test for FALSE here.
-    $this->assertEqual($expected_translatable, $field->isTranslatable());
-    $this->assertIdentical($expected_entity_type, $field->getTargetEntityTypeId());
-
-    if ($expected_cardinality === 1) {
-      $this->assertFalse($field->isMultiple());
-    }
-    else {
-      $this->assertTrue($field->isMultiple());
-    }
-    $this->assertIdentical($expected_cardinality, $field->getCardinality());
-  }
-
-  /**
-   * Tests migrating D7 fields to field_storage_config entities.
-   */
-  public function testFields() {
-    $this->assertEntity('node.body', 'text_with_summary', FALSE, 1);
-    $this->assertEntity('node.field_long_text', 'text_with_summary', FALSE, 1);
-    $this->assertEntity('comment.comment_body', 'text_long', FALSE, 1);
-    $this->assertEntity('node.field_file', 'file', FALSE, 1);
-    $this->assertEntity('user.field_file', 'file', FALSE, 1);
-    $this->assertEntity('node.field_float', 'float', FALSE, 1);
-    $this->assertEntity('node.field_image', 'image', FALSE, 1);
-    $this->assertEntity('node.field_images', 'image', FALSE, 1);
-    $this->assertEntity('node.field_integer', 'integer', FALSE, 1);
-    $this->assertEntity('comment.field_integer', 'integer', FALSE, 1);
-    $this->assertEntity('node.field_integer_list', 'list_integer', FALSE, 1);
-    $this->assertEntity('node.field_link', 'link', FALSE, 1);
-    $this->assertEntity('node.field_tags', 'entity_reference', FALSE, -1);
-    $this->assertEntity('node.field_term_reference', 'entity_reference', FALSE, 1);
-    $this->assertEntity('node.taxonomy_forums', 'entity_reference', FALSE, 1);
-    $this->assertEntity('node.field_text', 'text', FALSE, 1);
-    $this->assertEntity('node.field_text_list', 'list_string', FALSE, 3);
-    $this->assertEntity('node.field_boolean', 'boolean', FALSE, 1);
-    $this->assertEntity('node.field_email', 'email', FALSE, -1);
-    $this->assertEntity('node.field_phone', 'telephone', FALSE, 1);
-    $this->assertEntity('node.field_date', 'datetime', FALSE, 1);
-    $this->assertEntity('node.field_date_with_end_time', 'datetime', FALSE, 1);
-
-    // Assert that the taxonomy term reference fields are referencing the
-    // correct entity type.
-    $field = FieldStorageConfig::load('node.field_term_reference');
-    $this->assertIdentical('taxonomy_term', $field->getSetting('target_type'));
-    $field = FieldStorageConfig::load('node.taxonomy_forums');
-    $this->assertIdentical('taxonomy_term', $field->getSetting('target_type'));
-
-    // Validate that the source count and processed count match up.
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = Migration::load('d7_field');
-    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php b/core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php
deleted file mode 100644
index 04062a7..0000000
--- a/core/modules/field/src/Tests/Migrate/d7/MigrateViewModesTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Migrate\d7\MigrateViewModesTest.
- */
-
-namespace Drupal\field\Tests\Migrate\d7;
-
-use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\Core\Entity\EntityViewModeInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of D7 view modes.
- *
- * @group field
- */
-class MigrateViewModesTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['comment', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('node');
-    $this->executeMigration('d7_view_modes');
-  }
-
-  /**
-   * Asserts various aspects of a view mode entity.
-   *
-   * @param string $id
-   *   The entity ID.
-   * @param string $label
-   *   The expected label of the view mode.
-   * @param string $entity_type
-   *   The expected entity type ID which owns the view mode.
-   * @param bool $status
-   *   The expected status of the view mode.
-   */
-  protected function assertEntity($id, $label, $entity_type) {
-    /** @var \Drupal\Core\Entity\EntityViewModeInterface $view_mode */
-    $view_mode = EntityViewMode::load($id);
-    $this->assertTrue($view_mode instanceof EntityViewModeInterface);
-    $this->assertIdentical($label, $view_mode->label());
-    $this->assertIdentical($entity_type, $view_mode->getTargetType());
-  }
-
-  /**
-   * Tests migration of D7 view mode variables to D8 config entities.
-   */
-  public function testMigration() {
-    $this->assertEntity('comment.full', 'Full', 'comment');
-    $this->assertEntity('node.teaser', 'Teaser', 'node');
-    $this->assertEntity('node.full', 'Full', 'node');
-    $this->assertEntity('user.full', 'Full', 'user');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/NestedFormTest.php b/core/modules/field/src/Tests/NestedFormTest.php
index 5067b97..5d6b410 100644
--- a/core/modules/field/src/Tests/NestedFormTest.php
+++ b/core/modules/field/src/Tests/NestedFormTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\field\Tests;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests field elements in nested forms.
@@ -57,30 +59,34 @@ protected function setUp() {
    */
   function testNestedFieldForm() {
     // Add two fields on the 'entity_test'
-    entity_create('field_storage_config', $this->fieldStorageSingle)->save();
-    entity_create('field_storage_config', $this->fieldStorageUnlimited)->save();
+    FieldStorageConfig::create($this->fieldStorageSingle)->save();
+    FieldStorageConfig::create($this->fieldStorageUnlimited)->save();
     $this->field['field_name'] = 'field_single';
     $this->field['label'] = 'Single field';
-    entity_create('field_config', $this->field)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($this->field['field_name'])
       ->save();
     $this->field['field_name'] = 'field_unlimited';
     $this->field['label'] = 'Unlimited field';
-    entity_create('field_config', $this->field)->save();
+    FieldConfig::create($this->field)->save();
     entity_get_form_display($this->field['entity_type'], $this->field['bundle'], 'default')
       ->setComponent($this->field['field_name'])
       ->save();
 
     // Create two entities.
     $entity_type = 'entity_test';
-    $entity_1 = entity_create($entity_type, array('id' => 1));
+    $entity_1 = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 1));
     $entity_1->enforceIsNew();
     $entity_1->field_single->value = 0;
     $entity_1->field_unlimited->value = 1;
     $entity_1->save();
 
-    $entity_2 = entity_create($entity_type, array('id' => 2));
+    $entity_2 = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 2));
     $entity_2->enforceIsNew();
     $entity_2->field_single->value = 10;
     $entity_2->field_unlimited->value = 11;
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index 9537170..549c6f5 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -8,7 +8,10 @@
 namespace Drupal\field\Tests\Number;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the creation of numeric fields.
@@ -43,7 +46,7 @@ protected function setUp() {
   function testNumberDecimalField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'decimal',
@@ -51,11 +54,11 @@ function testNumberDecimalField() {
         'precision' => 8, 'scale' => 4,
       )
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -133,21 +136,21 @@ function testNumberIntegerField() {
 
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $storage = entity_create('field_storage_config', array(
+    $storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'integer',
     ));
     $storage->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
       'settings' => array(
         'min' => $minimum, 'max' => $maximum, 'prefix' => 'ThePrefix',
       )
-    ))->save();
+    ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -276,17 +279,17 @@ function testNumberIntegerField() {
   function testNumberFloatField() {
     // Create a field with settings to validate.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'float',
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -377,19 +380,19 @@ function testNumberFormatter() {
     // Create a content type containing float and integer fields.
     $this->drupalCreateContentType(array('type' => $type));
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $float_field,
       'entity_type' => 'node',
       'type' => 'float',
     ))->save();
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $integer_field,
       'entity_type' => 'node',
       'type' => 'integer',
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $float_field,
       'entity_type' => 'node',
       'bundle' => $type,
@@ -397,9 +400,9 @@ function testNumberFormatter() {
         'prefix' => $prefix,
         'suffix' => $suffix
       ),
-    ))->save();
+    ])->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $integer_field,
       'entity_type' => 'node',
       'bundle' => $type,
@@ -407,7 +410,7 @@ function testNumberFormatter() {
         'prefix' => $prefix,
         'suffix' => $suffix
       ),
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', $type, 'default')
       ->setComponent($float_field, array(
@@ -434,16 +437,12 @@ function testNumberFormatter() {
       ->save();
 
     // Create a node to test formatters.
-    $node = entity_create('node', array(
+    $node = Node::create([
       'type' => $type,
       'title' => $this->randomMachineName(),
-      $float_field => array(
-        'value' => $random_float,
-      ),
-      $integer_field => array(
-        'value' => $random_integer,
-      ),
-    ));
+      $float_field => ['value' => $random_float],
+      $integer_field => ['value' => $random_integer],
+    ]);
     $node->save();
 
     // Go to manage display page.
@@ -501,17 +500,17 @@ function testNumberFormatter() {
   function testCreateNumberFloatField() {
     // Create a float field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'float',
     ))->save();
 
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
     // Set the minimum value to a float value.
@@ -526,17 +525,17 @@ function testCreateNumberFloatField() {
   function testCreateNumberDecimalField() {
     // Create a decimal field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'decimal',
     ))->save();
 
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
 
     // Set the minimum value to a decimal value.
diff --git a/core/modules/field/src/Tests/Number/NumberItemTest.php b/core/modules/field/src/Tests/Number/NumberItemTest.php
deleted file mode 100644
index e7eac30..0000000
--- a/core/modules/field/src/Tests/Number/NumberItemTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Number\NumberItemTest.
- */
-
-namespace Drupal\field\Tests\Number;
-
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the number field type.
- *
- * @group field
- */
-class NumberItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array();
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create number field storages and fields for validation.
-    foreach (array('integer', 'float', 'decimal') as $type) {
-      entity_create('field_storage_config', array(
-        'entity_type' => 'entity_test',
-        'field_name' => 'field_' . $type,
-        'type' => $type,
-      ))->save();
-      entity_create('field_config', array(
-        'entity_type' => 'entity_test',
-        'field_name' => 'field_' . $type,
-        'bundle' => 'entity_test',
-      ))->save();
-    }
-  }
-
-  /**
-   * Tests using entity fields of the number field type.
-   */
-  public function testNumberItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $integer = rand(0, 10);
-    $entity->field_integer = $integer;
-    $float = 3.14;
-    $entity->field_float = $float;
-    $entity->field_decimal = '20-40';
-    $violations = $entity->validate();
-    $this->assertIdentical(1, count($violations), 'Wrong decimal value causes validation error');
-    $decimal = '31.3';
-    $entity->field_decimal = $decimal;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_integer instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_integer[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_integer->value, $integer);
-    $this->assertEqual($entity->field_integer[0]->value, $integer);
-    $this->assertTrue($entity->field_float instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_float[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_float->value, $float);
-    $this->assertEqual($entity->field_float[0]->value, $float);
-    $this->assertTrue($entity->field_decimal instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_decimal[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_decimal->value, $decimal);
-    $this->assertEqual($entity->field_decimal[0]->value, $decimal);
-
-    // Verify changing the number value.
-    $new_integer = rand(11, 20);
-    $new_float = rand(1001, 2000) / 100;
-    $new_decimal = '18.2';
-    $entity->field_integer->value = $new_integer;
-    $this->assertEqual($entity->field_integer->value, $new_integer);
-    $entity->field_float->value = $new_float;
-    $this->assertEqual($entity->field_float->value, $new_float);
-    $entity->field_decimal->value = $new_decimal;
-    $this->assertEqual($entity->field_decimal->value, $new_decimal);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_integer->value, $new_integer);
-    $this->assertEqual($entity->field_float->value, $new_float);
-    $this->assertEqual($entity->field_decimal->value, $new_decimal);
-
-    /// Test sample item generation.
-    $entity = entity_create('entity_test');
-    $entity->field_integer->generateSampleItems();
-    $entity->field_float->generateSampleItems();
-    $entity->field_decimal->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/ShapeItemTest.php b/core/modules/field/src/Tests/ShapeItemTest.php
deleted file mode 100644
index 9f7df3b..0000000
--- a/core/modules/field/src/Tests/ShapeItemTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\ShapeItemTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Tests the new entity API for the shape field type.
- *
- * @group field
- */
-class ShapeItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test');
-
-  /**
-   * The name of the field to use in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_shape';
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a 'shape' field and storage for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => 'shape',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => $this->fieldName,
-      'bundle' => 'entity_test',
-    ))->save();
-  }
-
-  /**
-   * Tests using entity fields of the field field type.
-   */
-  public function testShapeItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $shape = 'cube';
-    $color = 'blue';
-    $entity->{$this->fieldName}->shape = $shape;
-    $entity->{$this->fieldName}->color = $color;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->{$this->fieldName}->shape, $shape);
-    $this->assertEqual($entity->{$this->fieldName}->color, $color);
-    $this->assertEqual($entity->{$this->fieldName}[0]->shape, $shape);
-    $this->assertEqual($entity->{$this->fieldName}[0]->color, $color);
-
-    // Verify changing the field value.
-    $new_shape = 'circle';
-    $new_color = 'red';
-    $entity->{$this->fieldName}->shape = $new_shape;
-    $entity->{$this->fieldName}->color = $new_color;
-    $this->assertEqual($entity->{$this->fieldName}->shape, $new_shape);
-    $this->assertEqual($entity->{$this->fieldName}->color, $new_color);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->{$this->fieldName}->shape, $new_shape);
-    $this->assertEqual($entity->{$this->fieldName}->color, $new_color);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/String/RawStringFormatterTest.php b/core/modules/field/src/Tests/String/RawStringFormatterTest.php
deleted file mode 100644
index 60ea420..0000000
--- a/core/modules/field/src/Tests/String/RawStringFormatterTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\String\RawStringFormatterTest.
- */
-
-namespace Drupal\field\Tests\String;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the raw string formatter
- *
- * @group field
- */
-class RawStringFormatterTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
-
-  /**
-   * @var string
-   */
-  protected $entityType;
-
-  /**
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
-   */
-  protected $display;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Configure the theme system.
-    $this->installConfig(array('system', 'field'));
-    $this->installSchema('system', 'router');
-    \Drupal::service('router.builder')->rebuild();
-    $this->installEntitySchema('entity_test');
-
-    $this->entityType = 'entity_test';
-    $this->bundle = $this->entityType;
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'type' => 'string_long',
-    ));
-    $field_storage->save();
-
-    $instance = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => $this->bundle,
-      'label' => $this->randomMachineName(),
-    ));
-    $instance->save();
-
-    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, array(
-        'type' => 'string',
-        'settings' => array(),
-      ));
-    $this->display->save();
-  }
-
-  /**
-   * Renders fields of a given entity with a given display.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity object with attached fields to render.
-   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
-   *   The display to render the fields in.
-   *
-   * @return string
-   *   The rendered entity fields.
-   */
-  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
-    $content = $display->build($entity);
-    $content = $this->render($content);
-    return $content;
-  }
-
-  /**
-   * Tests string formatter output.
-   */
-  public function testStringFormatter() {
-    $value = $this->randomString();
-    $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
-    $value .= "\n\n" . $this->randomString();
-
-    $entity = EntityTest::create(array());
-    $entity->{$this->fieldName}->value = $value;
-
-    // Verify that all HTML is escaped and newlines are retained.
-    $this->renderEntityFields($entity, $this->display);
-    $this->assertNoRaw($value);
-    $this->assertRaw(nl2br(Html::escape($value)));
-
-    // Verify the cache tags.
-    $build = $entity->{$this->fieldName}->view();
-    $this->assertTrue(!isset($build[0]['#cache']), 'The string formatter has no cache tags.');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php
index 3114490..80cb1fe 100644
--- a/core/modules/field/src/Tests/String/StringFieldTest.php
+++ b/core/modules/field/src/Tests/String/StringFieldTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\field\Tests\String;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the creation of string fields.
@@ -54,17 +56,17 @@ function testTextfieldWidgets() {
   function _testTextfieldWidgets($field_type, $widget_type) {
     // Create a field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $field_type
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
-    ))->save();
+    ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
         'type' => $widget_type,
diff --git a/core/modules/field/src/Tests/String/StringFormatterTest.php b/core/modules/field/src/Tests/String/StringFormatterTest.php
deleted file mode 100644
index 1703c3e..0000000
--- a/core/modules/field/src/Tests/String/StringFormatterTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\String\StringFormatterTest.
- */
-
-namespace Drupal\field\Tests\String;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the creation of text fields.
- *
- * @group field
- */
-class StringFormatterTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
-
-  /**
-   * @var string
-   */
-  protected $entityType;
-
-  /**
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
-   */
-  protected $display;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Configure the theme system.
-    $this->installConfig(array('system', 'field'));
-    $this->installSchema('system', 'router');
-    \Drupal::service('router.builder')->rebuild();
-    $this->installEntitySchema('entity_test_rev');
-
-    $this->entityType = 'entity_test_rev';
-    $this->bundle = $this->entityType;
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'type' => 'string',
-    ));
-    $field_storage->save();
-
-    $instance = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => $this->bundle,
-      'label' => $this->randomMachineName(),
-    ));
-    $instance->save();
-
-    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, array(
-        'type' => 'string',
-        'settings' => array(),
-      ));
-    $this->display->save();
-  }
-
-  /**
-   * Renders fields of a given entity with a given display.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity object with attached fields to render.
-   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
-   *   The display to render the fields in.
-   *
-   * @return string
-   *   The rendered entity fields.
-   */
-  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
-    $content = $display->build($entity);
-    $content = $this->render($content);
-    return $content;
-  }
-
-  /**
-   * Tests string formatter output.
-   */
-  public function testStringFormatter() {
-    $value = $this->randomString();
-    $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
-    $value .= "\n\n" . $this->randomString();
-
-    $entity = EntityTestRev::create(array());
-    $entity->{$this->fieldName}->value = $value;
-
-    // Verify that all HTML is escaped and newlines are retained.
-    $this->renderEntityFields($entity, $this->display);
-    $this->assertNoRaw($value);
-    $this->assertRaw(nl2br(Html::escape($value)));
-
-    // Verify the cache tags.
-    $build = $entity->{$this->fieldName}->view();
-    $this->assertTrue(!isset($build[0]['#cache']), 'The string formatter has no cache tags.');
-
-    $value = $this->randomMachineName();
-    $entity->{$this->fieldName}->value = $value;
-    $entity->save();
-
-    // Set the formatter to link to the entity.
-    $this->display->setComponent($this->fieldName, [
-      'type' => 'string',
-      'settings' => [
-        'link_to_entity' => TRUE,
-      ],
-    ]);
-    $this->display->save();
-
-    $this->renderEntityFields($entity, $this->display);
-    $this->assertLink($value, 0);
-    $this->assertLinkByHref($entity->url());
-
-    // $entity->url('revision') falls back to the canonical URL if this is no
-    // revision.
-    $this->assertLinkByHref($entity->url('revision'));
-
-    // Make the entity a new revision.
-    $old_revision_id = $entity->getRevisionId();
-    $entity->setNewRevision(TRUE);
-    $value2 = $this->randomMachineName();
-    $entity->{$this->fieldName}->value = $value2;
-    $entity->save();
-    $entity_new_revision = \Drupal::entityManager()->getStorage('entity_test_rev')->loadRevision($old_revision_id);
-
-    $this->renderEntityFields($entity, $this->display);
-    $this->assertLink($value2, 0);
-    $this->assertLinkByHref($entity->url('revision'));
-
-    $this->renderEntityFields($entity_new_revision, $this->display);
-    $this->assertLink($value, 0);
-    $this->assertLinkByHref('/entity_test_rev/' . $entity_new_revision->id() . '/revision/' . $entity_new_revision->getRevisionId() . '/view');
-  }
-}
diff --git a/core/modules/field/src/Tests/String/UuidFormatterTest.php b/core/modules/field/src/Tests/String/UuidFormatterTest.php
deleted file mode 100644
index 92554bf..0000000
--- a/core/modules/field/src/Tests/String/UuidFormatterTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\String\UuidFormatterTest.
- */
-
-namespace Drupal\field\Tests\String;
-
-use Drupal\simpletest\KernelTestBase;
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Tests the output of a UUID field.
- *
- * @group field
- */
-class UuidFormatterTest extends KernelTestBase {
-
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'entity_test', 'system', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['system', 'field']);
-    $this->installSchema('system', 'router');
-    \Drupal::service('router.builder')->rebuild();
-    $this->installEntitySchema('entity_test');
-  }
-
-  /**
-   * Tests string formatter output.
-   */
-  public function testUuidStringFormatter() {
-    $entity = EntityTest::create([]);
-    $entity->save();
-
-    $uuid_field = $entity->get('uuid');
-
-    // Verify default render.
-    $render_array = $uuid_field->view([]);
-    $this->assertIdentical($render_array[0]['#context']['value'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
-    $this->assertTrue(strpos($this->render($render_array), $entity->uuid()), 'The rendered UUID found.');
-
-    // Verify customized render.
-    $render_array = $uuid_field->view(['settings' => ['link_to_entity' => TRUE]]);
-    $this->assertIdentical($render_array[0]['#type'], 'link');
-    $this->assertIdentical($render_array[0]['#title']['#context']['value'], $entity->uuid());
-    $this->assertIdentical($render_array[0]['#url']->toString(), $entity->url());
-    $rendered = $this->render($render_array);
-    $this->assertTrue(strpos($rendered, $entity->uuid()), 'The rendered UUID found.');
-    $this->assertTrue(strpos($rendered, $entity->url()), 'The rendered entity URL found.');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/TestItemTest.php b/core/modules/field/src/Tests/TestItemTest.php
deleted file mode 100644
index 7aa4679..0000000
--- a/core/modules/field/src/Tests/TestItemTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\TestItemTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Tests the new entity API for the test field type.
- *
- * @group field
- */
-class TestItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test');
-
-  /**
-   * The name of the field to use in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a 'test_field' field and storage for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => $this->fieldName,
-      'bundle' => 'entity_test',
-    ))->save();
-  }
-
-  /**
-   * Tests using entity fields of the field field type.
-   */
-  public function testTestItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $value = rand(1, 10);
-    $entity->field_test = $value;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->{$this->fieldName}->value, $value);
-    $this->assertEqual($entity->{$this->fieldName}[0]->value, $value);
-
-    // Verify changing the field value.
-    $new_value = rand(1, 10);
-    $entity->field_test->value = $new_value;
-    $this->assertEqual($entity->{$this->fieldName}->value, $new_value);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->{$this->fieldName}->value, $new_value);
-
-    // Test the schema for this field type.
-    $expected_schema = array(
-      'columns' => array(
-        'value' => array(
-          'type' => 'int',
-          'size' => 'medium',
-        ),
-      ),
-      'unique keys' => array(),
-      'indexes' => array(
-        'value' => array('value'),
-      ),
-      'foreign keys' => array(),
-    );
-    $field_schema = BaseFieldDefinition::create('test_field')->getSchema();
-    $this->assertEqual($field_schema, $expected_schema);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/TestItemWithDependenciesTest.php b/core/modules/field/src/Tests/TestItemWithDependenciesTest.php
deleted file mode 100644
index a3be92b..0000000
--- a/core/modules/field/src/Tests/TestItemWithDependenciesTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\TestItemWithDependenciesTest.
- */
-
-namespace Drupal\field\Tests;
-
-/**
- * Tests the new entity API for the test field with dependencies type.
- *
- * @group field
- */
-class TestItemWithDependenciesTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test');
-
-  /**
-   * The name of the field to use in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  /**
-   * Tests that field types can add dependencies to field config entities.
-   */
-  public function testTestItemWithDepenencies() {
-    // Create a 'test_field_with_dependencies' field and storage for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field_with_dependencies',
-    ))->save();
-    $field = entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => $this->fieldName,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    // Validate that the field configuration entity has the expected
-    // dependencies.
-    $this->assertEqual([
-      'content' => ['node:article:uuid'],
-      'config' => ['field.storage.entity_test.field_test'],
-      'module' => ['entity_test', 'field_test', 'test_module']
-    ], $field->getDependencies());
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php b/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php
deleted file mode 100644
index 2323b15..0000000
--- a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Timestamp\TimestampFormatterTest.
- */
-
-namespace Drupal\field\Tests\Timestamp;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the timestamp formatters.
- *
- * @group field
- */
-class TimestampFormatterTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'field', 'text', 'entity_test', 'user'];
-
-  /**
-   * @var string
-   */
-  protected $entityType;
-
-  /**
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
-   */
-  protected $display;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['system']);
-    $this->installConfig(['field']);
-    $this->installEntitySchema('entity_test');
-
-    $this->entityType = 'entity_test';
-    $this->bundle = $this->entityType;
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'type' => 'timestamp',
-    ]);
-    $field_storage->save();
-
-    $instance = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => $this->bundle,
-      'label' => $this->randomMachineName(),
-    ]);
-    $instance->save();
-
-    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
-      ->setComponent($this->fieldName, [
-        'type' => 'boolean',
-        'settings' => [],
-      ]);
-    $this->display->save();
-  }
-
-  /**
-   * Renders fields of a given entity with a given display.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity object with attached fields to render.
-   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
-   *   The display to render the fields in.
-   *
-   * @return string
-   *   The rendered entity fields.
-   */
-  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
-    $content = $display->build($entity);
-    $content = $this->render($content);
-    return $content;
-  }
-
-  /**
-   * Tests TimestampFormatter.
-   */
-  protected function testTimestampFormatter() {
-    $data = [];
-
-    // Test standard formats.
-    $date_formats = array_keys(\Drupal::entityManager()->getStorage('date_format')->loadMultiple());
-
-    foreach ($date_formats as $date_format) {
-      $data[] = ['date_format' => $date_format, 'custom_date_format' => '', 'timezone' => ''];
-    }
-
-    $data[] = ['date_format' => 'custom', 'custom_date_format' => 'r', 'timezone' => ''];
-    $data[] = ['date_format' => 'custom', 'custom_date_format' => 'e', 'timezone' => 'Asia/Tokyo'];
-
-    foreach ($data as $settings) {
-      list($date_format, $custom_date_format, $timezone) = array_values($settings);
-      if (empty($timezone)) {
-        $timezone = NULL;
-      }
-
-      $value = REQUEST_TIME - 87654321;
-      $expected = \Drupal::service('date.formatter')->format($value, $date_format, $custom_date_format, $timezone);
-
-      $component = $this->display->getComponent($this->fieldName);
-      $component['type'] = 'timestamp';
-      $component['settings'] = $settings;
-      $this->display->setComponent($this->fieldName, $component);
-
-      $entity = EntityTest::create([]);
-      $entity->{$this->fieldName}->value = $value;
-
-      $this->renderEntityFields($entity, $this->display);
-      $this->assertRaw($expected);
-    }
-  }
-
-  /**
-   * Tests TimestampAgoFormatter.
-   */
-  protected function testTimestampAgoFormatter() {
-    $data = [];
-
-    foreach (array(1, 2, 3, 4, 5, 6) as $granularity) {
-      $data[] = [
-        'future_format' => '@interval hence',
-        'past_format' => '@interval ago',
-        'granularity' => $granularity,
-      ];
-    }
-
-    foreach ($data as $settings) {
-      $future_format = $settings['future_format'];
-      $past_format = $settings['past_format'];
-      $granularity = $settings['granularity'];
-      $request_time = \Drupal::requestStack()->getCurrentRequest()->server->get('REQUEST_TIME');
-
-      // Test a timestamp in the past
-      $value = $request_time - 87654321;
-      $expected = SafeMarkup::format($past_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($value, ['granularity' => $granularity])]);
-
-      $component = $this->display->getComponent($this->fieldName);
-      $component['type'] = 'timestamp_ago';
-      $component['settings'] = $settings;
-      $this->display->setComponent($this->fieldName, $component);
-
-      $entity = EntityTest::create([]);
-      $entity->{$this->fieldName}->value = $value;
-
-      $this->renderEntityFields($entity, $this->display);
-      $this->assertRaw($expected);
-
-      // Test a timestamp in the future
-      $value = $request_time + 87654321;
-      $expected = SafeMarkup::format($future_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($value, ['granularity' => $granularity])]);
-
-      $component = $this->display->getComponent($this->fieldName);
-      $component['type'] = 'timestamp_ago';
-      $component['settings'] = $settings;
-      $this->display->setComponent($this->fieldName, $component);
-
-      $entity = EntityTest::create([]);
-      $entity->{$this->fieldName}->value = $value;
-
-      $this->renderEntityFields($entity, $this->display);
-      $this->assertRaw($expected);
-    }
-  }
-
-}
diff --git a/core/modules/field/src/Tests/TranslationTest.php b/core/modules/field/src/Tests/TranslationTest.php
deleted file mode 100644
index 8328951..0000000
--- a/core/modules/field/src/Tests/TranslationTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\TranslationTest.
- */
-
-namespace Drupal\field\Tests;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests multilanguage fields logic.
- *
- * The following tests will check the multilanguage logic in field handling.
- *
- * @group field
- */
-class TranslationTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * node is required because the tests alter the node entity type.
-   *
-   * @var array
-   */
-  public static $modules = array('language', 'node');
-
-  /**
-   * The name of the field to use in this test.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * The name of the entity type to use in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'test_entity';
-
-  /**
-   * An array defining the field storage to use in this test.
-   *
-   * @var array
-   */
-  protected $fieldStorageDefinition;
-
-  /**
-   * An array defining the field to use in this test.
-   *
-   * @var array
-   */
-  protected $fieldDefinition;
-
-  /**
-   * The field storage to use in this test.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * The field to use in this test.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('language'));
-
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    $this->entityType = 'entity_test';
-
-    $this->fieldStorageDefinition = array(
-      'field_name' => $this->fieldName,
-      'entity_type' => $this->entityType,
-      'type' => 'test_field',
-      'cardinality' => 4,
-    );
-    $this->fieldStorage = entity_create('field_storage_config', $this->fieldStorageDefinition);
-    $this->fieldStorage->save();
-
-    $this->fieldDefinition = array(
-      'field_storage' => $this->fieldStorage,
-      'bundle' => 'entity_test',
-    );
-    $this->field = entity_create('field_config', $this->fieldDefinition);
-    $this->field->save();
-
-    for ($i = 0; $i < 3; ++$i) {
-      ConfigurableLanguage::create(array(
-        'id' => 'l' . $i,
-        'label' => $this->randomString(),
-      ))->save();
-    }
-  }
-
-  /**
-   * Test translatable fields storage/retrieval.
-   */
-  function testTranslatableFieldSaveLoad() {
-    // Enable field translations for nodes.
-    field_test_entity_info_translatable('node', TRUE);
-    $entity_type = \Drupal::entityManager()->getDefinition('node');
-    $this->assertTrue($entity_type->isTranslatable(), 'Nodes are translatable.');
-
-    // Prepare the field translations.
-    $entity_type_id = 'entity_test';
-    field_test_entity_info_translatable($entity_type_id, TRUE);
-    $entity = entity_create($entity_type_id, array('type' => $this->field->getTargetBundle()));
-    $field_translations = array();
-    $available_langcodes = array_keys($this->container->get('language_manager')->getLanguages());
-    $entity->langcode->value = reset($available_langcodes);
-    foreach ($available_langcodes as $langcode) {
-      $field_translations[$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
-      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
-      $translation->{$this->fieldName}->setValue($field_translations[$langcode]);
-    }
-
-    // Save and reload the field translations.
-    $entity = $this->entitySaveReload($entity);
-
-    // Check if the correct values were saved/loaded.
-    foreach ($field_translations as $langcode => $items) {
-      $result = TRUE;
-      foreach ($items as $delta => $item) {
-        $result = $result && $item['value'] == $entity->getTranslation($langcode)->{$this->fieldName}[$delta]->value;
-      }
-      $this->assertTrue($result, format_string('%language translation correctly handled.', array('%language' => $langcode)));
-    }
-
-    // Test default values.
-    $field_name_default = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    $field_storage_definition = $this->fieldStorageDefinition;
-    $field_storage_definition['field_name'] = $field_name_default;
-    $field_storage = entity_create('field_storage_config', $field_storage_definition);
-    $field_storage->save();
-
-    $field_definition = $this->fieldDefinition;
-    $field_definition['field_storage'] = $field_storage;
-    $field_definition['default_value'] = array(array('value' => rand(1, 127)));
-    $field = entity_create('field_config', $field_definition);
-    $field->save();
-
-    $translation_langcodes = array_slice($available_langcodes, 0, 2);
-    asort($translation_langcodes);
-    $translation_langcodes = array_values($translation_langcodes);
-
-    $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
-    $entity = entity_create($entity_type_id, $values);
-    foreach ($translation_langcodes as $langcode) {
-      $values[$this->fieldName][$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
-      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
-      $translation->{$this->fieldName}->setValue($values[$this->fieldName][$langcode]);
-    }
-
-    $field_langcodes = array_keys($entity->getTranslationLanguages());
-    sort($field_langcodes);
-    $this->assertEqual($translation_langcodes, $field_langcodes, 'Missing translations did not get a default value.');
-
-    // @todo Test every translation once the Entity Translation API allows for
-    //   multilingual defaults.
-    $langcode = $entity->language()->getId();
-    $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $field->getDefaultValueLiteral(), format_string('Default value correctly populated for language %language.', array('%language' => $langcode)));
-
-    // Check that explicit empty values are not overridden with default values.
-    foreach (array(NULL, array()) as $empty_items) {
-      $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
-      $entity = entity_create($entity_type_id, $values);
-      foreach ($translation_langcodes as $langcode) {
-        $values[$this->fieldName][$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
-        $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
-        $translation->{$this->fieldName}->setValue($values[$this->fieldName][$langcode]);
-        $translation->{$field_name_default}->setValue($empty_items);
-        $values[$field_name_default][$langcode] = $empty_items;
-      }
-
-      foreach ($entity->getTranslationLanguages() as $langcode => $language) {
-        $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $empty_items, format_string('Empty value correctly populated for language %language.', array('%language' => $langcode)));
-      }
-    }
-  }
-
-  /**
-   * Tests field access.
-   *
-   * Regression test to verify that fieldAccess() can be called while only
-   * passing the required parameters.
-   *
-   * @see https://www.drupal.org/node/2404739
-   */
-  public function testFieldAccess() {
-    $access_control_handler = \Drupal::entityManager()->getAccessControlHandler($this->entityType);
-    $this->assertTrue($access_control_handler->fieldAccess('view', $this->field));
-  }
-
-}
diff --git a/core/modules/field/src/Tests/TranslationWebTest.php b/core/modules/field/src/Tests/TranslationWebTest.php
index 8350285..1606ea0 100644
--- a/core/modules/field/src/Tests/TranslationWebTest.php
+++ b/core/modules/field/src/Tests/TranslationWebTest.php
@@ -65,14 +65,14 @@ protected function setUp() {
       'type' => 'test_field',
       'cardinality' => 4,
     );
-    entity_create('field_storage_config', $field_storage)->save();
+    FieldStorageConfig::create($field_storage)->save();
     $this->fieldStorage = FieldStorageConfig::load($this->entityTypeId . '.' . $this->fieldName);
 
     $field = array(
       'field_storage' => $this->fieldStorage,
       'bundle' => $this->entityTypeId,
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
     $this->field = FieldConfig::load($this->entityTypeId . '.' . $field['bundle'] . '.' . $this->fieldName);
 
     entity_get_form_display($this->entityTypeId, $this->entityTypeId, 'default')
@@ -96,7 +96,9 @@ function testFieldFormTranslationRevisions() {
 
     // Prepare the field translations.
     field_test_entity_info_translatable($this->entityTypeId, TRUE);
-    $entity = entity_create($this->entityTypeId);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId)
+      ->create();
     $available_langcodes = array_flip(array_keys($this->container->get('language_manager')->getLanguages()));
     $field_name = $this->fieldStorage->getName();
 
diff --git a/core/modules/field/src/Tests/Update/FieldUpdateTest.php b/core/modules/field/src/Tests/Update/FieldUpdateTest.php
index 65ca720..d555f47 100644
--- a/core/modules/field/src/Tests/Update/FieldUpdateTest.php
+++ b/core/modules/field/src/Tests/Update/FieldUpdateTest.php
@@ -112,6 +112,26 @@ public function testFieldUpdate8002() {
   }
 
   /**
+   * Tests field_update_8003().
+   *
+   * @see field_update_8003()
+   */
+  public function testFieldUpdate8003() {
+    // Run updates.
+    $this->runUpdates();
+
+    // Check that the new 'auto_create_bundle' setting is populated correctly.
+    $field = $this->configFactory->get('field.field.node.article.field_ref_autocreate_2412569');
+    $handler_settings = $field->get('settings.handler_settings');
+
+    $expected_target_bundles = ['tags' => 'tags', 'test' => 'test'];
+    $this->assertEqual($handler_settings['target_bundles'], $expected_target_bundles);
+
+    $this->assertTrue($handler_settings['auto_create']);
+    $this->assertEqual($handler_settings['auto_create_bundle'], 'tags');
+  }
+
+  /**
    * Asserts that a config depends on 'entity_reference' or not
    *
    * @param \Drupal\Core\Config\Config $config
diff --git a/core/modules/field/src/Tests/Uri/UriItemTest.php b/core/modules/field/src/Tests/Uri/UriItemTest.php
deleted file mode 100644
index 9dc50a2..0000000
--- a/core/modules/field/src/Tests/Uri/UriItemTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\Uri\UriItemTest.
- */
-
-namespace Drupal\field\Tests\Uri;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests URI field functionality.
- *
- * @see \Drupal\Core\Field\Plugin\Field\FieldType\UriItem
- *
- * @group field
- */
-class UriItemTest extends FieldUnitTestBase {
-
-  /**
-   * A field to use in this test class.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * The field used in this test class.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
-
-  /**
-   * Tests URI field.
-   */
-  public function testUriField() {
-    $label = $this->randomMachineName();
-
-    // Create a field with settings to validate.
-    $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'uri',
-    ]);
-    $this->fieldStorage->save();
-    $this->field = FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'label' => $label,
-      'required' => TRUE,
-      'settings' => [
-        'size' => 123,
-        'placeholder' => '',
-      ],
-    ]);
-    $this->field->save();
-
-    // Create a form display for the default form mode.
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($field_name, [
-        'type' => 'uri',
-      ])
-      ->save();
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->$field_name->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/field/src/Tests/Views/FieldTestBase.php b/core/modules/field/src/Tests/Views/FieldTestBase.php
index 0425c29..06158cd 100644
--- a/core/modules/field/src/Tests/Views/FieldTestBase.php
+++ b/core/modules/field/src/Tests/Views/FieldTestBase.php
@@ -5,25 +5,23 @@
  * Contains \Drupal\field\Tests\Views\FieldTestBase.
  */
 
-/**
- * @TODO
- *   - Test on a generic entity not on a node.
- *
- * What has to be tested:
- *   - Make sure that every wanted field is added to the according entity type.
- *   - Make sure the joins are done correctly.
- *   - Use basic fields and make sure that the full wanted object is built.
- *   - Use relationships between different entity types, for example node and
- *     the node author(user).
- */
-
 namespace Drupal\field\Tests\Views;
 
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\NodeType;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Provides some helper methods for testing fieldapi integration into views.
+ *
+ * @todo Test on a generic entity not on a node. What has to be tested:
+ *   - Make sure that every wanted field is added to the according entity type.
+ *   - Make sure the joins are done correctly.
+ *   - Use basic fields and make sure that the full wanted object is built.
+ *   - Use relationships between different entity types, for example node and
+ *     the node author(user).
  */
 abstract class FieldTestBase extends ViewTestBase {
 
@@ -53,10 +51,10 @@ protected function setUp() {
     parent::setUp();
 
     // Ensure the page node type exists.
-    entity_create('node_type', array(
+    NodeType::create([
       'type' => 'page',
       'name' => 'page',
-    ))->save();
+    ])->save();
 
     ViewTestData::createTestViews(get_class($this), array('field_test_views'));
   }
@@ -66,7 +64,7 @@ function setUpFieldStorages($amount = 3, $type = 'string') {
     $field_names = array();
     for ($i = 0; $i < $amount; $i++) {
       $field_names[$i] = 'field_name_' . $i;
-      $this->fieldStorages[$i] = entity_create('field_storage_config', array(
+      $this->fieldStorages[$i] = FieldStorageConfig::create(array(
         'field_name' => $field_names[$i],
         'entity_type' => 'node',
         'type' => $type,
@@ -78,10 +76,10 @@ function setUpFieldStorages($amount = 3, $type = 'string') {
 
   function setUpFields($bundle = 'page') {
     foreach ($this->fieldStorages as $key => $field_storage) {
-      $this->fields[$key] = entity_create('field_config', array(
+      $this->fields[$key] = FieldConfig::create([
         'field_storage' => $field_storage,
         'bundle' => $bundle,
-      ));
+      ]);
       $this->fields[$key]->save();
     }
   }
diff --git a/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php b/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
index f3be429..5524843 100644
--- a/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
+++ b/core/modules/field/src/Tests/Views/HandlerFieldFieldTest.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the field itself of the Field integration.
@@ -52,7 +53,7 @@ protected function setUp() {
     $this->setUpFieldStorages(3);
 
     // Setup a field with cardinality > 1.
-    $this->fieldStorages[3] = entity_create('field_storage_config', array(
+    $this->fieldStorages[3] = FieldStorageConfig::create(array(
       'field_name' => 'field_name_3',
       'entity_type' => 'node',
       'type' => 'string',
@@ -60,7 +61,7 @@ protected function setUp() {
     ));
     $this->fieldStorages[3]->save();
     // Setup a field that will have no value.
-    $this->fieldStorages[4] = entity_create('field_storage_config', array(
+    $this->fieldStorages[4] = FieldStorageConfig::create(array(
       'field_name' => 'field_name_4',
       'entity_type' => 'node',
       'type' => 'string',
@@ -69,7 +70,7 @@ protected function setUp() {
     $this->fieldStorages[4]->save();
 
     // Setup a text field.
-    $this->fieldStorages[5] = entity_create('field_storage_config', array(
+    $this->fieldStorages[5] = FieldStorageConfig::create(array(
       'field_name' => 'field_name_5',
       'entity_type' => 'node',
       'type' => 'text',
@@ -78,7 +79,7 @@ protected function setUp() {
 
     // Setup a text field with access control.
     // @see field_test_entity_field_access()
-    $this->fieldStorages[6] = entity_create('field_storage_config', array(
+    $this->fieldStorages[6] = FieldStorageConfig::create(array(
       'field_name' => 'field_no_view_access',
       'entity_type' => 'node',
       'type' => 'text',
diff --git a/core/modules/field/src/Tests/WidgetPluginManagerTest.php b/core/modules/field/src/Tests/WidgetPluginManagerTest.php
deleted file mode 100644
index d475541..0000000
--- a/core/modules/field/src/Tests/WidgetPluginManagerTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field\Tests\WidgetPluginManagerTest.
- */
-
-namespace Drupal\field\Tests;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\WidgetPluginManager;
-
-/**
- * Tests the field widget manager.
- *
- * @group field
- */
-class WidgetPluginManagerTest extends FieldUnitTestBase {
-
-  /**
-   * Tests that the widget definitions alter hook works.
-   */
-  function testWidgetDefinitionAlter() {
-    $widget_definition = \Drupal::service('plugin.manager.field.widget')->getDefinition('test_field_widget_multiple');
-
-    // Test if hook_field_widget_info_alter is being called.
-    $this->assertTrue(in_array('test_field', $widget_definition['field_types']), "The 'test_field_widget_multiple' widget is enabled for the 'test_field' field type in field_test_field_widget_info_alter().");
-  }
-
-  /**
-   * Tests that getInstance falls back on default if current is not applicable.
-   *
-   * @see \Drupal\field\Tests\FormatterPluginManagerTest::testNotApplicableFallback()
-   */
-  public function testNotApplicableFallback() {
-    /** @var WidgetPluginManager $widget_plugin_manager */
-    $widget_plugin_manager = \Drupal::service('plugin.manager.field.widget');
-
-    $base_field_definition = BaseFieldDefinition::create('test_field')
-      // Set a name that will make isApplicable() return TRUE.
-      ->setName('field_multiwidgetfield');
-
-    $widget_options = array(
-      'field_definition' => $base_field_definition,
-      'form_mode' => 'default',
-      'configuration' => array(
-        'type' => 'test_field_widget_multiple',
-      ),
-    );
-
-    $instance = $widget_plugin_manager->getInstance($widget_options);
-    $this->assertEqual($instance->getPluginId(), 'test_field_widget_multiple');
-
-    // Now do the same but with machine name field_onewidgetfield, because that
-    // makes isApplicable() return FALSE.
-    $base_field_definition->setName('field_onewidgetfield');
-    $instance = $widget_plugin_manager->getInstance($widget_options);
-
-    // Instance should be default widget.
-    $this->assertNotEqual($instance->getPluginId(), 'test_field_widget_multiple');
-    $this->assertEqual($instance->getPluginId(), 'test_field_widget');
-  }
-
-}
diff --git a/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
index 3a72c67..c8040ff 100644
--- a/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\field\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the behavior of a field module after being disabled and re-enabled.
@@ -47,17 +49,17 @@ protected function setUp() {
   function testReEnabledField() {
 
     // Add a telephone field to the article content type.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'field_telephone',
       'entity_type' => 'node',
       'type' => 'telephone',
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'article',
       'label' => 'Telephone Number',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', 'article', 'default')
       ->setComponent('field_telephone', array(
@@ -93,14 +95,35 @@ function testReEnabledField() {
     $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
     $this->drupalLogin($admin_user);
     $this->drupalGet('admin/modules/uninstall');
-    $this->assertText('Fields type(s) in use');
+    $this->assertText("The Telephone number field type is used in the following field: node.field_telephone");
+
+    // Add another telephone field to a different entity type in order to test
+    // the message for the case when multiple fields are blocking the
+    // uninstallation of a module.
+    $field_storage2 = entity_create('field_storage_config', array(
+      'field_name' => 'field_telephone_2',
+      'entity_type' => 'user',
+      'type' => 'telephone',
+    ));
+    $field_storage2->save();
+    FieldConfig::create([
+      'field_storage' => $field_storage2,
+      'bundle' => 'user',
+      'label' => 'User Telephone Number',
+    ])->save();
+
+    $this->drupalGet('admin/modules/uninstall');
+    $this->assertText("The Telephone number field type is used in the following fields: node.field_telephone, user.field_telephone_2");
+
+    // Delete both fields.
     $field_storage->delete();
+    $field_storage2->delete();
+
     $this->drupalGet('admin/modules/uninstall');
     $this->assertText('Fields pending deletion');
     $this->cronRun();
-    $this->assertNoText('Fields type(s) in use');
+    $this->assertNoText("The Telephone number field type is used in the following field: node.field_telephone");
     $this->assertNoText('Fields pending deletion');
-
   }
 
 }
diff --git a/core/modules/field/tests/fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php b/core/modules/field/tests/fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php
index 90f395b..ca7c51a 100644
--- a/core/modules/field/tests/fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php
+++ b/core/modules/field/tests/fixtures/update/drupal-8.views_entity_reference_plugins-2429191.php
@@ -26,8 +26,14 @@
   ])
   ->execute();
 
-// Configuration for an entity_reference field storage.
-$config = Yaml::decode(file_get_contents(__DIR__ . '/field.storage.node.field_ref_views_select_2429191.yml'));
+// Configuration for an entity_reference field storage using the View for
+// selection.
+$field_ref_views_select_2429191 = Yaml::decode(file_get_contents(__DIR__ . '/field.storage.node.field_ref_views_select_2429191.yml'));
+
+// Configuration for an entity_reference field storage using the auto-create
+// feature.
+$field_ref_autocreate_2412569 = Yaml::decode(file_get_contents(__DIR__ . '/field.storage.node.field_ref_autocreate_2412569.yml'));
+
 $connection->insert('config')
   ->fields([
     'collection',
@@ -36,8 +42,13 @@
   ])
   ->values([
     'collection' => '',
-    'name' => 'field.storage.' . $config['id'],
-    'data' => serialize($config),
+    'name' => 'field.storage.' . $field_ref_views_select_2429191['id'],
+    'data' => serialize($field_ref_views_select_2429191),
+  ])
+  ->values([
+    'collection' => '',
+    'name' => 'field.storage.' . $field_ref_autocreate_2412569['id'],
+    'data' => serialize($field_ref_autocreate_2412569),
   ])
   ->execute();
 // We need to Update the registry of "last installed" field definitions.
@@ -48,7 +59,8 @@
   ->execute()
   ->fetchField();
 $installed = unserialize($installed);
-$installed['field_ref_views_select_2429191'] = new \Drupal\field\Entity\FieldStorageConfig($config);
+$installed['field_ref_views_select_2429191'] = new \Drupal\field\Entity\FieldStorageConfig($field_ref_views_select_2429191);
+$installed['field_ref_autocreate_2412569'] = new \Drupal\field\Entity\FieldStorageConfig($field_ref_autocreate_2412569);
 $connection->update('key_value')
   ->condition('collection', 'entity.definitions.installed')
   ->condition('name', 'node.field_storage_definitions')
@@ -58,7 +70,11 @@
   ->execute();
 
 // Configuration for an entity_reference field using the View for selection.
-$config = Yaml::decode(file_get_contents(__DIR__ . '/field.field.node.article.field_ref_views_select_2429191.yml'));
+$field_ref_views_select_2429191 = Yaml::decode(file_get_contents(__DIR__ . '/field.field.node.article.field_ref_views_select_2429191.yml'));
+
+// Configuration for an entity_reference field using the auto-create feature.
+$field_ref_autocreate_2412569 = Yaml::decode(file_get_contents(__DIR__ . '/field.field.node.article.field_ref_autocreate_2412569.yml'));
+
 $connection->insert('config')
   ->fields([
     'collection',
@@ -67,7 +83,12 @@
   ])
   ->values([
     'collection' => '',
-    'name' => 'field.field.' . $config['id'],
-    'data' => serialize($config),
+    'name' => 'field.field.' . $field_ref_views_select_2429191['id'],
+    'data' => serialize($field_ref_views_select_2429191),
+  ])
+  ->values([
+    'collection' => '',
+    'name' => 'field.field.' . $field_ref_autocreate_2412569['id'],
+    'data' => serialize($field_ref_autocreate_2412569),
   ])
   ->execute();
diff --git a/core/modules/field/tests/fixtures/update/field.field.node.article.field_ref_autocreate_2412569.yml b/core/modules/field/tests/fixtures/update/field.field.node.article.field_ref_autocreate_2412569.yml
new file mode 100644
index 0000000..2606bf6
--- /dev/null
+++ b/core/modules/field/tests/fixtures/update/field.field.node.article.field_ref_autocreate_2412569.yml
@@ -0,0 +1,29 @@
+uuid: d6deba8d-073a-4572-a000-ee2a2de94de2
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_ref_autocreate_2412569
+    - node.type.article
+    - taxonomy.vocabulary.tags
+    - taxonomy.vocabulary.test
+id: node.article.field_ref_autocreate_2412569
+field_name: field_ref_autocreate_2412569
+entity_type: node
+bundle: article
+label: 'Ref Autocreate 2412569'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      tags: tags
+      test: test
+    sort:
+      field: _none
+    auto_create: true
+field_type: entity_reference
diff --git a/core/modules/field/tests/fixtures/update/field.storage.node.field_ref_autocreate_2412569.yml b/core/modules/field/tests/fixtures/update/field.storage.node.field_ref_autocreate_2412569.yml
new file mode 100644
index 0000000..19e4a6a
--- /dev/null
+++ b/core/modules/field/tests/fixtures/update/field.storage.node.field_ref_autocreate_2412569.yml
@@ -0,0 +1,20 @@
+uuid: 5e4095a3-8f89-4d7a-b222-34bf5240b646
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+id: node.field_ref_autocreate_2412569
+field_name: field_ref_autocreate_2412569
+entity_type: node
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
index c86a7b9..9c994d6 100644
--- a/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -1,8 +1,5 @@
 <?php
 
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\Core\Form\FormStateInterface;
-
 /**
  * @file
  * Helper module for the Field API tests.
@@ -16,6 +13,9 @@
  * test helper functions
  */
 
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Core\Form\FormStateInterface;
+
 require_once __DIR__ . '/field_test.entity.inc';
 require_once __DIR__ . '/field_test.field.inc';
 
@@ -42,7 +42,7 @@
  *   field_test_memorize();
  *
  *   // call some Field API functions that invoke field_test hooks
- *   entity_create('field_storage_config', $field_definition)->save();
+ *   FieldStorageConfig::create($field_definition)->save();
  *
  *   // retrieve and reset the memorized hook call data
  *   $mem = field_test_memorize();
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
index cab0c17..59a9487 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptyFormatter.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptyFormatter.
  */
+
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
index d01ef8b..22b0d6f 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldNoSettingsFormatter.php
@@ -5,6 +5,7 @@
  *
  * Contains \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldNoSettingsFormatter.
  */
+
 namespace Drupal\field_test\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
diff --git a/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module b/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
index 8726b18..fa0e418 100644
--- a/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
+++ b/core/modules/field/tests/modules/field_third_party_test/field_third_party_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php b/core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php
new file mode 100644
index 0000000..fb04f97
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Boolean\BooleanFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Boolean;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the boolean formatter.
+ *
+ * @group field
+ */
+class BooleanFormatterTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'text', 'entity_test', 'user', 'system'];
+
+  /**
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['field']);
+    $this->installEntitySchema('entity_test');
+
+    $this->entityType = 'entity_test';
+    $this->bundle = $this->entityType;
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $this->fieldName,
+      'entity_type' => $this->entityType,
+      'type' => 'boolean',
+    ]);
+    $field_storage->save();
+
+    $instance = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $this->bundle,
+      'label' => $this->randomMachineName(),
+    ]);
+    $instance->save();
+
+    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent($this->fieldName, [
+        'type' => 'boolean',
+        'settings' => [],
+      ]);
+    $this->display->save();
+  }
+
+  /**
+   * Renders fields of a given entity with a given display.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The entity object with attached fields to render.
+   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
+   *   The display to render the fields in.
+   *
+   * @return string
+   *   The rendered entity fields.
+   */
+  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
+    $content = $display->build($entity);
+    $content = $this->render($content);
+    return $content;
+  }
+
+  /**
+   * Tests boolean formatter output.
+   */
+  public function testBooleanFormatter() {
+    $data = [];
+    $data[] = [0, [], 'Off'];
+    $data[] = [1, [], 'On'];
+
+    $format = ['format' => 'enabled-disabled'];
+    $data[] = [0, $format, 'Disabled'];
+    $data[] = [1, $format, 'Enabled'];
+
+    $format = ['format' => 'unicode-yes-no'];
+    $data[] = [1, $format, '✔'];
+    $data[] = [0, $format, '✖'];
+
+    $format = [
+      'format' => 'custom',
+      'format_custom_false' => 'FALSE',
+      'format_custom_true' => 'TRUE'
+    ];
+    $data[] = [0, $format, 'FALSE'];
+    $data[] = [1, $format, 'TRUE'];
+
+    foreach ($data as $test_data) {
+      list($value, $settings, $expected) = $test_data;
+
+      $component = $this->display->getComponent($this->fieldName);
+      $component['settings'] = $settings;
+      $this->display->setComponent($this->fieldName, $component);
+
+      $entity = EntityTest::create([]);
+      $entity->{$this->fieldName}->value = $value;
+
+      // Verify that all HTML is escaped and newlines are retained.
+      $this->renderEntityFields($entity, $this->display);
+      $this->assertRaw($expected);
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php b/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
new file mode 100644
index 0000000..68d6670
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Boolean\BooleanItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Boolean;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the boolean field type.
+ *
+ * @group field
+ */
+class BooleanItemTest extends FieldKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a boolean field and storage for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_boolean',
+      'entity_type' => 'entity_test',
+      'type' => 'boolean',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_boolean',
+      'bundle' => 'entity_test',
+    ])->save();
+
+    // Create a form display for the default form mode.
+    entity_get_form_display('entity_test', 'entity_test', 'default')
+      ->setComponent('field_boolean', array(
+        'type' => 'boolean_checkbox',
+      ))
+      ->save();
+  }
+
+  /**
+   * Tests using entity fields of the boolean field type.
+   */
+  public function testBooleanItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = '1';
+    $entity->field_boolean = $value;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_boolean instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_boolean[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_boolean->value, $value);
+    $this->assertEqual($entity->field_boolean[0]->value, $value);
+
+    // Verify changing the boolean value.
+    $new_value = 0;
+    $entity->field_boolean->value = $new_value;
+    $this->assertEqual($entity->field_boolean->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_boolean->value, $new_value);
+
+    // Test sample item generation.
+    $entity = EntityTest::create();
+    $entity->field_boolean->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/BulkDeleteTest.php b/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
new file mode 100644
index 0000000..0f7610f
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
@@ -0,0 +1,364 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\BulkDeleteTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Bulk delete storages and fields, and clean up afterwards.
+ *
+ * @group field
+ */
+class BulkDeleteTest extends FieldKernelTestBase {
+
+  /**
+   * The fields to use in this test.
+   *
+   * @var array
+   */
+  protected $fieldStorages;
+
+  /**
+   * The entities to use in this test.
+   *
+   * @var array
+   */
+  protected $entities;
+
+  /**
+   * The entities to use in this test, keyed by bundle.
+   *
+   * @var array
+   */
+  protected $entitiesByBundles;
+
+  /**
+   * The bundles for the entities used in this test.
+   *
+   * @var array
+   */
+  protected $bundles;
+
+  /**
+   * The entity type to be used in the test classes.
+   *
+   * @var string
+   */
+  protected $entityTypeId = 'entity_test';
+
+  /**
+   * Tests that the expected hooks have been invoked on the expected entities.
+   *
+   * @param $expected_hooks
+   *   An array keyed by hook name, with one entry per expected invocation.
+   *   Each entry is the value of the "$entity" parameter the hook is expected
+   *   to have been passed.
+   * @param $actual_hooks
+   *   The array of actual hook invocations recorded by field_test_memorize().
+   */
+  function checkHooksInvocations($expected_hooks, $actual_hooks) {
+    foreach ($expected_hooks as $hook => $invocations) {
+      $actual_invocations = $actual_hooks[$hook];
+
+      // Check that the number of invocations is correct.
+      $this->assertEqual(count($actual_invocations), count($invocations), "$hook() was called the expected number of times.");
+
+      // Check that the hook was called for each expected argument.
+      foreach ($invocations as $argument) {
+        $found = FALSE;
+        foreach ($actual_invocations as $actual_arguments) {
+          // The argument we are looking for is either an array of entities as
+          // the second argument or a single entity object as the first.
+          if ($argument instanceof EntityInterface && $actual_arguments[0]->id() == $argument->id()) {
+            $found = TRUE;
+            break;
+          }
+          // In case of an array, compare the array size and make sure it
+          // contains the same elements.
+          elseif (is_array($argument) && count($actual_arguments[1]) == count($argument) && count(array_diff_key($actual_arguments[1], $argument)) == 0) {
+            $found = TRUE;
+            break;
+          }
+        }
+        $this->assertTrue($found, "$hook() was called on expected argument");
+      }
+    }
+  }
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->fieldStorages = array();
+    $this->entities = array();
+    $this->entitiesByBundles = array();
+
+    // Create two bundles.
+    $this->bundles = array('bb_1' => 'bb_1', 'bb_2' => 'bb_2');
+    foreach ($this->bundles as $name => $desc) {
+      entity_test_create_bundle($name, $desc);
+    }
+
+    // Create two field storages.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'bf_1',
+      'entity_type' => $this->entityTypeId,
+      'type' => 'test_field',
+      'cardinality' => 1
+    ));
+    $field_storage->save();
+    $this->fieldStorages[] = $field_storage;
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'bf_2',
+      'entity_type' => $this->entityTypeId,
+      'type' => 'test_field',
+      'cardinality' => 4
+    ));
+    $field_storage->save();
+    $this->fieldStorages[] = $field_storage;
+
+    // For each bundle, create each field, and 10 entities with values for the
+    // fields.
+    foreach ($this->bundles as $bundle) {
+      foreach ($this->fieldStorages as $field_storage) {
+        FieldConfig::create([
+          'field_storage' => $field_storage,
+          'bundle' => $bundle,
+        ])->save();
+      }
+      for ($i = 0; $i < 10; $i++) {
+        $entity = $this->container->get('entity_type.manager')
+          ->getStorage($this->entityTypeId)
+          ->create(array('type' => $bundle));
+        foreach ($this->fieldStorages as $field_storage) {
+          $entity->{$field_storage->getName()}->setValue($this->_generateTestFieldValues($field_storage->getCardinality()));
+        }
+        $entity->save();
+      }
+    }
+    $this->entities = entity_load_multiple($this->entityTypeId);
+    foreach ($this->entities as $entity) {
+      // This test relies on the entities having stale field definitions
+      // so that the deleted field can be accessed on them. Access the field
+      // now, so that they are always loaded.
+      $entity->bf_1->value;
+
+      // Also keep track of the entities per bundle.
+      $this->entitiesByBundles[$entity->bundle()][$entity->id()] = $entity;
+    }
+  }
+
+  /**
+   * Verify that deleting a field leaves the field data items in the database
+   * and that the appropriate Field API functions can operate on the deleted
+   * data and field definition.
+   *
+   * This tests how EntityFieldQuery interacts with field deletion and could be
+   * moved to FieldCrudTestCase, but depends on this class's setUp().
+   */
+  function testDeleteField() {
+    $bundle = reset($this->bundles);
+    $field_storage = reset($this->fieldStorages);
+    $field_name = $field_storage->getName();
+    $factory = \Drupal::service('entity.query');
+
+    // There are 10 entities of this bundle.
+    $found = $factory->get('entity_test')
+      ->condition('type', $bundle)
+      ->execute();
+    $this->assertEqual(count($found), 10, 'Correct number of entities found before deleting');
+
+    // Delete the field.
+    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
+    $field->delete();
+
+    // The field still exists, deleted.
+    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $this->assertEqual(count($fields), 1, 'There is one deleted field');
+    $field = $fields[$field->uuid()];
+    $this->assertEqual($field->getTargetBundle(), $bundle, 'The deleted field is for the correct bundle');
+
+    // Check that the actual stored content did not change during delete.
+    $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = $storage->getTableMapping();
+    $table = $table_mapping->getDedicatedDataTableName($field_storage);
+    $column = $table_mapping->getFieldColumnName($field_storage, 'value');
+    $result = db_select($table, 't')
+      ->fields('t')
+      ->execute();
+    foreach ($result as $row) {
+      $this->assertEqual($this->entities[$row->entity_id]->{$field_name}->value, $row->$column);
+    }
+
+    // There are 0 entities of this bundle with non-deleted data.
+    $found = $factory->get('entity_test')
+      ->condition('type', $bundle)
+      ->condition("$field_name.deleted", 0)
+      ->execute();
+    $this->assertFalse($found, 'No entities found after deleting');
+
+    // There are 10 entities of this bundle when deleted fields are allowed, and
+    // their values are correct.
+    $found = $factory->get('entity_test')
+      ->condition('type', $bundle)
+      ->condition("$field_name.deleted", 1)
+      ->sort('id')
+      ->execute();
+    $this->assertEqual(count($found), 10, 'Correct number of entities found after deleting');
+    $this->assertFalse(array_diff($found, array_keys($this->entities)));
+  }
+
+  /**
+   * Verify that field data items and fields are purged when a field storage is
+   * deleted.
+   */
+  function testPurgeField() {
+    // Start recording hook invocations.
+    field_test_memorize();
+
+    $bundle = reset($this->bundles);
+    $field_storage = reset($this->fieldStorages);
+    $field_name = $field_storage->getName();
+
+    // Delete the field.
+    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
+    $field->delete();
+
+    // No field hooks were called.
+    $mem = field_test_memorize();
+    $this->assertEqual(count($mem), 0, 'No field hooks were called');
+
+    $batch_size = 2;
+    for ($count = 8; $count >= 0; $count -= $batch_size) {
+      // Purge two entities.
+      field_purge_batch($batch_size);
+
+      // There are $count deleted entities left.
+      $found = \Drupal::entityQuery('entity_test')
+        ->condition('type', $bundle)
+        ->condition($field_name . '.deleted', 1)
+        ->execute();
+      $this->assertEqual(count($found), $count, 'Correct number of entities found after purging 2');
+    }
+
+    // Check hooks invocations.
+    // FieldItemInterface::delete() should have been called once for each entity in the
+    // bundle.
+    $actual_hooks = field_test_memorize();
+    $hooks = array();
+    $entities = $this->entitiesByBundles[$bundle];
+    foreach ($entities as $id => $entity) {
+      $hooks['field_test_field_delete'][] = $entity;
+    }
+    $this->checkHooksInvocations($hooks, $actual_hooks);
+
+    // The field still exists, deleted.
+    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $this->assertEqual(count($fields), 1, 'There is one deleted field');
+
+    // Purge the field.
+    field_purge_batch($batch_size);
+
+    // The field is gone.
+    $fields = entity_load_multiple_by_properties('field_config', array('field_storage_uuid' => $field_storage->uuid(), 'deleted' => TRUE, 'include_deleted' => TRUE));
+    $this->assertEqual(count($fields), 0, 'The field is gone');
+
+    // The field storage still exists, not deleted, because it has a second
+    // field.
+    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $this->assertTrue(isset($storages[$field_storage->uuid()]), 'The field storage exists and is not deleted');
+  }
+
+  /**
+   * Verify that field storages are preserved and purged correctly as multiple
+   * fields are deleted and purged.
+   */
+  function testPurgeFieldStorage() {
+    // Start recording hook invocations.
+    field_test_memorize();
+
+    $field_storage = reset($this->fieldStorages);
+    $field_name = $field_storage->getName();
+
+    // Delete the first field.
+    $bundle = reset($this->bundles);
+    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
+    $field->delete();
+
+    // Assert that FieldItemInterface::delete() was not called yet.
+    $mem = field_test_memorize();
+    $this->assertEqual(count($mem), 0, 'No field hooks were called.');
+
+    // Purge the data.
+    field_purge_batch(10);
+
+    // Check hooks invocations.
+    // FieldItemInterface::delete() should have been called once for each entity in the
+    // bundle.
+    $actual_hooks = field_test_memorize();
+    $hooks = array();
+    $entities = $this->entitiesByBundles[$bundle];
+    foreach ($entities as $id => $entity) {
+      $hooks['field_test_field_delete'][] = $entity;
+    }
+    $this->checkHooksInvocations($hooks, $actual_hooks);
+
+    // The field still exists, deleted.
+    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
+
+    // Purge again to purge the field.
+    field_purge_batch(0);
+
+    // The field is gone.
+    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $this->assertEqual(count($fields), 0, 'The field is purged.');
+    // The field storage still exists, not deleted.
+    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $this->assertTrue(isset($storages[$field_storage->uuid()]) && !$storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is not deleted');
+
+    // Delete the second field.
+    $bundle = next($this->bundles);
+    $field = FieldConfig::loadByName($this->entityTypeId, $bundle, $field_name);
+    $field->delete();
+
+    // Assert that FieldItemInterface::delete() was not called yet.
+    $mem = field_test_memorize();
+    $this->assertEqual(count($mem), 0, 'No field hooks were called.');
+
+    // Purge the data.
+    field_purge_batch(10);
+
+    // Check hooks invocations (same as above, for the 2nd bundle).
+    $actual_hooks = field_test_memorize();
+    $hooks = array();
+    $entities = $this->entitiesByBundles[$bundle];
+    foreach ($entities as $id => $entity) {
+      $hooks['field_test_field_delete'][] = $entity;
+    }
+    $this->checkHooksInvocations($hooks, $actual_hooks);
+
+    // The field and the storage still exist, deleted.
+    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $this->assertTrue(isset($fields[$field->uuid()]) && $fields[$field->uuid()]->isDeleted(), 'The field exists and is deleted');
+    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $this->assertTrue(isset($storages[$field_storage->uuid()]) && $storages[$field_storage->uuid()]->isDeleted(), 'The field storage exists and is deleted');
+
+    // Purge again to purge the field and the storage.
+    field_purge_batch(0);
+
+    // The field and the storage are gone.
+    $fields = entity_load_multiple_by_properties('field_config', array('uuid' => $field->uuid(), 'include_deleted' => TRUE));
+    $this->assertEqual(count($fields), 0, 'The field is purged.');
+    $storages = entity_load_multiple_by_properties('field_storage_config', array('uuid' => $field_storage->uuid(), 'include_deleted' => TRUE));
+    $this->assertEqual(count($storages), 0, 'The field storage is purged.');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
new file mode 100644
index 0000000..ce95093
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\ConfigFieldDefinitionTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+
+/**
+ * Tests exposing field definitions for configurable fields.
+ *
+ * @group field
+ */
+class ConfigFieldDefinitionTest extends FieldKernelTestBase {
+
+  /**
+   * The entity manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface;
+   */
+  protected $entityManager;
+
+  /**
+   * @var string
+   */
+  private $entityType;
+
+  /**
+   * @var string
+   */
+  private $bundle;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a field and a storage of type 'test_field', on the 'entity_test'
+    // entity type.
+    $this->entityType = 'entity_test';
+    $this->bundle = 'entity_test';
+    $this->createFieldWithStorage('', $this->entityType, $this->bundle);
+    $this->entityManager = $this->container->get('entity.manager');
+
+    // Create a second field on 'entity_test_rev'.
+    $this->createFieldWithStorage('_rev', 'entity_test_rev', 'entity_test_rev');
+  }
+
+  /**
+   * Makes sure a field definition is exposed for a configurable field.
+   */
+  public function testBundleFieldDefinition() {
+    $definitions = $this->entityManager->getFieldDefinitions($this->entityType, $this->bundle);
+    $this->assertTrue(isset($definitions[$this->fieldTestData->field->getName()]));
+    $this->assertTrue($definitions[$this->fieldTestData->field->getName()] instanceof FieldDefinitionInterface);
+    // Make sure fields on other entity types are not exposed.
+    $this->assertFalse(isset($definitions[$this->fieldTestData->field_rev->getName()]));
+  }
+
+  /**
+   * Makes sure a field storage definition is exposed for a configurable field.
+   */
+  public function testFieldStorageDefinition() {
+    $field_storage_definitions = $this->entityManager->getFieldStorageDefinitions($this->entityType);
+    $this->assertTrue(isset($field_storage_definitions[$this->fieldTestData->field->getName()]));
+    $this->assertTrue($field_storage_definitions[$this->fieldTestData->field->getName()] instanceof FieldStorageDefinitionInterface);
+    // Make sure storages on other entity types are not exposed.
+    $this->assertFalse(isset($field_storage_definitions[$this->fieldTestData->field_rev->getName()]));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/DisplayApiTest.php b/core/modules/field/tests/src/Kernel/DisplayApiTest.php
new file mode 100644
index 0000000..66bf1e9
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/DisplayApiTest.php
@@ -0,0 +1,316 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\DisplayApiTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the field display API.
+ *
+ * @group field
+ */
+class DisplayApiTest extends FieldKernelTestBase {
+
+  /**
+   * The field name to use in this test.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The field label to use in this test.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The field cardinality to use in this test.
+   *
+   * @var number
+   */
+  protected $cardinality;
+
+  /**
+   * The field display options to use in this test.
+   *
+   * @var array
+   */
+  protected $displayOptions;
+
+  /**
+   * The test entity.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $entity;
+
+  /**
+   * An array of random values, in the format expected for field values.
+   *
+   * @var array
+   */
+  protected $values;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a field and its storage.
+    $this->fieldName = 'test_field';
+    $this->label = $this->randomMachineName();
+    $this->cardinality = 4;
+
+    $field_storage = array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'cardinality' => $this->cardinality,
+    );
+    $field = array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'label' => $this->label,
+    );
+
+    $this->displayOptions = array(
+      'default' => array(
+        'type' => 'field_test_default',
+        'settings' => array(
+          'test_formatter_setting' => $this->randomMachineName(),
+        ),
+      ),
+      'teaser' => array(
+        'type' => 'field_test_default',
+        'settings' => array(
+          'test_formatter_setting' => $this->randomMachineName(),
+        ),
+      ),
+    );
+
+    FieldStorageConfig::create($field_storage)->save();
+    FieldConfig::create($field)->save();
+    // Create a display for the default view mode.
+    entity_get_display($field['entity_type'], $field['bundle'], 'default')
+      ->setComponent($this->fieldName, $this->displayOptions['default'])
+      ->save();
+    // Create a display for the teaser view mode.
+    EntityViewMode::create(array('id' =>  'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
+    entity_get_display($field['entity_type'], $field['bundle'], 'teaser')
+      ->setComponent($this->fieldName, $this->displayOptions['teaser'])
+      ->save();
+
+    // Create an entity with values.
+    $this->values = $this->_generateTestFieldValues($this->cardinality);
+    $this->entity = EntityTest::create();
+    $this->entity->{$this->fieldName}->setValue($this->values);
+    $this->entity->save();
+  }
+
+  /**
+   * Tests the FieldItemListInterface::view() method.
+   */
+  function testFieldItemListView() {
+    $items = $this->entity->get($this->fieldName);
+
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+
+    // No display settings: check that default display settings are used.
+    $build = $items->view();
+    $this->render($build);
+    $settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('field_test_default');
+    $setting = $settings['test_formatter_setting'];
+    $this->assertText($this->label, 'Label was displayed.');
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // Display settings: Check hidden field.
+    $display = array(
+      'label' => 'hidden',
+      'type' => 'field_test_multiple',
+      'settings' => array(
+        'test_formatter_setting_multiple' => $this->randomMachineName(),
+        'alter' => TRUE,
+      ),
+    );
+    $build = $items->view($display);
+    $this->render($build);
+    $setting = $display['settings']['test_formatter_setting_multiple'];
+    $this->assertNoText($this->label, 'Label was not displayed.');
+    $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
+    $this->assertText('entity language is en', 'Language is placed onto the context.');
+    $array = array();
+    foreach ($this->values as $delta => $value) {
+      $array[] = $delta . ':' . $value['value'];
+    }
+    $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
+
+    // Display settings: Check visually_hidden field.
+    $display = array(
+      'label' => 'visually_hidden',
+      'type' => 'field_test_multiple',
+      'settings' => array(
+        'test_formatter_setting_multiple' => $this->randomMachineName(),
+        'alter' => TRUE,
+      ),
+    );
+    $build = $items->view($display);
+    $this->render($build);
+    $setting = $display['settings']['test_formatter_setting_multiple'];
+    $this->assertRaw('visually-hidden', 'Label was visually hidden.');
+    $this->assertText('field_test_entity_display_build_alter', 'Alter fired, display passed.');
+    $this->assertText('entity language is en', 'Language is placed onto the context.');
+    $array = array();
+    foreach ($this->values as $delta => $value) {
+      $array[] = $delta . ':' . $value['value'];
+    }
+    $this->assertText($setting . '|' . implode('|', $array), 'Values were displayed with expected setting.');
+
+    // Check the prepare_view steps are invoked.
+    $display = array(
+      'label' => 'hidden',
+      'type' => 'field_test_with_prepare_view',
+      'settings' => array(
+        'test_formatter_setting_additional' => $this->randomMachineName(),
+      ),
+    );
+    $build = $items->view($display);
+    $this->render($build);
+    $setting = $display['settings']['test_formatter_setting_additional'];
+    $this->assertNoText($this->label, 'Label was not displayed.');
+    $this->assertNoText('field_test_entity_display_build_alter', 'Alter not fired.');
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // View mode: check that display settings specified in the display object
+    // are used.
+    $build = $items->view('teaser');
+    $this->render($build);
+    $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];
+    $this->assertText($this->label, 'Label was displayed.');
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // Unknown view mode: check that display settings for 'default' view mode
+    // are used.
+    $build = $items->view('unknown_view_mode');
+    $this->render($build);
+    $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];
+    $this->assertText($this->label, 'Label was displayed.');
+    foreach ($this->values as $delta => $value) {
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+  }
+
+  /**
+   * Tests the FieldItemInterface::view() method.
+   */
+  function testFieldItemView() {
+    // No display settings: check that default display settings are used.
+    $settings = \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('field_test_default');
+    $setting = $settings['test_formatter_setting'];
+    foreach ($this->values as $delta => $value) {
+      $item = $this->entity->{$this->fieldName}[$delta];
+      $build = $item->view();
+      $this->render($build);
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // Check that explicit display settings are used.
+    $display = array(
+      'type' => 'field_test_multiple',
+      'settings' => array(
+        'test_formatter_setting_multiple' => $this->randomMachineName(),
+      ),
+    );
+    $setting = $display['settings']['test_formatter_setting_multiple'];
+    foreach ($this->values as $delta => $value) {
+      $item = $this->entity->{$this->fieldName}[$delta];
+      $build = $item->view($display);
+      $this->render($build);
+      $this->assertText($setting . '|0:' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // Check that prepare_view steps are invoked.
+    $display = array(
+      'type' => 'field_test_with_prepare_view',
+      'settings' => array(
+        'test_formatter_setting_additional' => $this->randomMachineName(),
+      ),
+    );
+    $setting = $display['settings']['test_formatter_setting_additional'];
+    foreach ($this->values as $delta => $value) {
+      $item = $this->entity->{$this->fieldName}[$delta];
+      $build = $item->view($display);
+      $this->render($build);
+      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // View mode: check that display settings specified in the field are used.
+    $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];
+    foreach ($this->values as $delta => $value) {
+      $item = $this->entity->{$this->fieldName}[$delta];
+      $build = $item->view('teaser');
+      $this->render($build);
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+
+    // Unknown view mode: check that display settings for 'default' view mode
+    // are used.
+    $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];
+    foreach ($this->values as $delta => $value) {
+      $item = $this->entity->{$this->fieldName}[$delta];
+      $build = $item->view('unknown_view_mode');
+      $this->render($build);
+      $this->assertText($setting . '|' . $value['value'], format_string('Value @delta was displayed with expected setting.', array('@delta' => $delta)));
+    }
+  }
+
+  /**
+   * Tests that the prepareView() formatter method still fires for empty values.
+   */
+  function testFieldEmpty() {
+    // Uses \Drupal\field_test\Plugin\Field\FieldFormatter\TestFieldEmptyFormatter.
+    $display = array(
+      'label' => 'hidden',
+      'type' => 'field_empty_test',
+      'settings' => array(
+        'test_empty_string' => '**EMPTY FIELD**' . $this->randomMachineName(),
+      ),
+    );
+    // $this->entity is set by the setUp() method and by default contains 4
+    // numeric values.  We only want to test the display of this one field.
+    $build = $this->entity->get($this->fieldName)->view($display);
+    $this->render($build);
+    // The test field by default contains values, so should not display the
+    // default "empty" text.
+    $this->assertNoText($display['settings']['test_empty_string']);
+
+    // Now remove the values from the test field and retest.
+    $this->entity->{$this->fieldName} = array();
+    $this->entity->save();
+    $build = $this->entity->get($this->fieldName)->view($display);
+    $this->render($build);
+    // This time, as the field values have been removed, we *should* show the
+    // default "empty" text.
+    $this->assertText($display['settings']['test_empty_string']);
+  }
+}
diff --git a/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php b/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
new file mode 100644
index 0000000..76ed172
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Email\EmailItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Email;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the email field type.
+ *
+ * @group field
+ */
+class EmailItemTest extends FieldKernelTestBase {
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an email field storage and field for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_email',
+      'entity_type' => 'entity_test',
+      'type' => 'email',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_email',
+      'bundle' => 'entity_test',
+    ])->save();
+
+    // Create a form display for the default form mode.
+    entity_get_form_display('entity_test', 'entity_test', 'default')
+      ->setComponent('field_email', array(
+        'type' => 'email_default',
+      ))
+      ->save();
+  }
+
+  /**
+   * Tests using entity fields of the email field type.
+   */
+  public function testEmailItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = 'test@example.com';
+    $entity->field_email = $value;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_email instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_email[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_email->value, $value);
+    $this->assertEqual($entity->field_email[0]->value, $value);
+
+    // Verify changing the email value.
+    $new_value = $this->randomMachineName();
+    $entity->field_email->value = $new_value;
+    $this->assertEqual($entity->field_email->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_email->value, $new_value);
+
+    // Test sample item generation.
+    $entity = EntityTest::create();
+    $entity->field_email->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php b/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
new file mode 100644
index 0000000..c9ee63e
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Entity\Update\SqlContentEntityStorageSchemaColumnTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Entity\Update;
+
+use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
+use Drupal\entity_test\Entity\EntityTestRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that schema changes in fields with data are detected during updates.
+ *
+ * @group Entity
+ */
+class SqlContentEntityStorageSchemaColumnTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'field', 'text', 'user'];
+
+  /**
+   * The created entity.
+   *
+   * @var \Drupal\Core\Entity\Entity
+   */
+  protected $entity;
+
+  /**
+   * The field.
+   *
+   * @var \Drupal\field\FieldConfigInterface
+   */
+  protected $field;
+
+  /**
+   * The field storage.
+   *
+   * @var \Drupal\field\FieldStorageConfigInterface
+   */
+  protected $fieldStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+    $this->installEntitySchema('user');
+
+    $field_name = 'test';
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test_rev',
+      'type' => 'string',
+      'cardinality' => 1,
+    ]);
+    $this->fieldStorage->save();
+
+    $this->field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test_rev',
+      'bundle' => 'entity_test_rev',
+      'required' => TRUE,
+    ]);
+    $this->field->save();
+
+    // Create an entity with field data.
+    $this->entity = EntityTestRev::create([
+      'user_id' => mt_rand(1, 10),
+      'name' => $this->randomMachineName(),
+      $field_name => $this->randomString(),
+    ]);
+    $this->entity->save();
+  }
+
+  /**
+   * Tests that column-level schema changes are detected for fields with data.
+   */
+  public function testColumnUpdate() {
+    // Change the field type in the stored schema.
+    $schema = \Drupal::keyValue('entity.storage_schema.sql')->get('entity_test_rev.field_schema_data.test');
+    $schema['entity_test_rev__test']['fields']['test_value']['type'] = 'varchar_ascii';
+    \Drupal::keyValue('entity.storage_schema.sql')->set('entity_test_rev.field_schema_data.test', $schema);
+
+    // Now attempt to run automatic updates. An exception should be thrown
+    // since there is data in the table.
+    try {
+      \Drupal::service('entity.definition_update_manager')->applyUpdates();
+      $this->fail('Failed to detect a schema change in a field with data.');
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass('Detected a schema change in a field with data.');
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
new file mode 100644
index 0000000..693181f
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
@@ -0,0 +1,311 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\EntityReference\EntityReferenceFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\EntityReference;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+use Drupal\entity_test\Entity\EntityTestLabel;
+
+/**
+ * Tests the formatters functionality.
+ *
+ * @group entity_reference
+ */
+class EntityReferenceFormatterTest extends EntityKernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * The entity type used in this test.
+   *
+   * @var string
+   */
+  protected $entityType = 'entity_test';
+
+  /**
+   * The bundle used in this test.
+   *
+   * @var string
+   */
+  protected $bundle = 'entity_test';
+
+  /**
+   * The name of the field used in this test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_test';
+
+  /**
+   * The entity to be referenced in this test.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $referencedEntity;
+
+  /**
+   * The entity that is not yet saved to its persistent storage to be referenced
+   * in this test.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  protected $unsavedReferencedEntity;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Use Classy theme for testing markup output.
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+
+    // Grant the 'view test entity' permission.
+    $this->installConfig(array('user'));
+    Role::load(RoleInterface::ANONYMOUS_ID)
+      ->grantPermission('view test entity')
+      ->save();
+
+    // The label formatter rendering generates links, so build the router.
+    $this->container->get('router.builder')->rebuild();
+
+    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType, 'default', array(), FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+
+    // Set up a field, so that the entity that'll be referenced bubbles up a
+    // cache tag when rendering it entirely.
+    FieldStorageConfig::create(array(
+      'field_name' => 'body',
+      'entity_type' => $this->entityType,
+      'type' => 'text',
+      'settings' => array(),
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => $this->entityType,
+      'bundle' => $this->bundle,
+      'field_name' => 'body',
+      'label' => 'Body',
+    ])->save();
+    entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent('body', array(
+        'type' => 'text_default',
+        'settings' => array(),
+      ))
+      ->save();
+
+    FilterFormat::create(array(
+      'format' => 'full_html',
+      'name' => 'Full HTML',
+    ))->save();
+
+    // Create the entity to be referenced.
+    $this->referencedEntity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+    $this->referencedEntity->body = array(
+      'value' => '<p>Hello, world!</p>',
+      'format' => 'full_html',
+    );
+    $this->referencedEntity->save();
+
+    // Create another entity to be referenced but do not save it.
+    $this->unsavedReferencedEntity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+    $this->unsavedReferencedEntity->body = array(
+      'value' => '<p>Hello, unsaved world!</p>',
+      'format' => 'full_html',
+    );
+  }
+
+  /**
+   * Assert inaccessible items don't change the data of the fields.
+   */
+  public function testAccess() {
+    // Revoke the 'view test entity' permission for this test.
+    Role::load(RoleInterface::ANONYMOUS_ID)
+      ->revokePermission('view test entity')
+      ->save();
+
+    $field_name = $this->fieldName;
+
+    $referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+    $referencing_entity->save();
+    $referencing_entity->{$field_name}->entity = $this->referencedEntity;
+
+    // Assert user doesn't have access to the entity.
+    $this->assertFalse($this->referencedEntity->access('view'), 'Current user does not have access to view the referenced entity.');
+
+    $formatter_manager = $this->container->get('plugin.manager.field.formatter');
+
+    // Get all the existing formatters.
+    foreach ($formatter_manager->getOptions('entity_reference') as $formatter => $name) {
+      // Set formatter type for the 'full' view mode.
+      entity_get_display($this->entityType, $this->bundle, 'default')
+        ->setComponent($field_name, array(
+          'type' => $formatter,
+        ))
+        ->save();
+
+      // Invoke entity view.
+      entity_view($referencing_entity, 'default');
+
+      // Verify the un-accessible item still exists.
+      $this->assertEqual($referencing_entity->{$field_name}->target_id, $this->referencedEntity->id(), format_string('The un-accessible item still exists after @name formatter was executed.', array('@name' => $name)));
+    }
+  }
+
+  /**
+   * Tests the ID formatter.
+   */
+  public function testIdFormatter() {
+    $formatter = 'entity_reference_entity_id';
+    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
+
+    $this->assertEqual($build[0]['#plain_text'], $this->referencedEntity->id(), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
+    $this->assertEqual($build[0]['#cache']['tags'], $this->referencedEntity->getCacheTags(), sprintf('The %s formatter has the expected cache tags.', $formatter));
+    $this->assertTrue(!isset($build[1]), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
+  }
+
+  /**
+   * Tests the entity formatter.
+   */
+  public function testEntityFormatter() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $formatter = 'entity_reference_entity_view';
+    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
+
+    // Test the first field item.
+    $expected_rendered_name_field_1 = '
+            <div class="field field--name-name field--type-string field--label-hidden field__item">' . $this->referencedEntity->label() . '</div>
+      ';
+    $expected_rendered_body_field_1 = '
+  <div class="clearfix text-formatted field field--name-body field--type-text field--label-above">
+    <div class="field__label">Body</div>
+              <div class="field__item"><p>Hello, world!</p></div>
+          </div>
+';
+    $renderer->renderRoot($build[0]);
+    $this->assertEqual($build[0]['#markup'], 'default | ' . $this->referencedEntity->label() .  $expected_rendered_name_field_1 . $expected_rendered_body_field_1, sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
+    $expected_cache_tags = Cache::mergeTags(\Drupal::entityManager()->getViewBuilder($this->entityType)->getCacheTags(), $this->referencedEntity->getCacheTags());
+    $expected_cache_tags = Cache::mergeTags($expected_cache_tags, FilterFormat::load('full_html')->getCacheTags());
+    $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags.', array('@formatter' => $formatter)));
+
+    // Test the second field item.
+    $renderer->renderRoot($build[1]);
+    $this->assertEqual($build[1]['#markup'], $this->unsavedReferencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
+  }
+
+  /**
+   * Tests the label formatter.
+   */
+  public function testLabelFormatter() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $formatter = 'entity_reference_label';
+
+    // The 'link' settings is TRUE by default.
+    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter);
+
+    $expected_field_cacheability = [
+      'contexts' => [],
+      'tags' => [],
+      'max-age' => Cache::PERMANENT,
+    ];
+    $this->assertEqual($build['#cache'], $expected_field_cacheability, 'The field render array contains the entity access cacheability metadata');
+    $expected_item_1 = array(
+      '#type' => 'link',
+      '#title' => $this->referencedEntity->label(),
+      '#url' => $this->referencedEntity->urlInfo(),
+      '#options' => $this->referencedEntity->urlInfo()->getOptions(),
+      '#cache' => array(
+        'contexts' => [
+          'user.permissions',
+        ],
+        'tags' => $this->referencedEntity->getCacheTags(),
+      ),
+    );
+    $this->assertEqual($renderer->renderRoot($build[0]), $renderer->renderRoot($expected_item_1), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
+    $this->assertEqual(CacheableMetadata::createFromRenderArray($build[0]), CacheableMetadata::createFromRenderArray($expected_item_1));
+
+    // The second referenced entity is "autocreated", therefore not saved and
+    // lacking any URL info.
+    $expected_item_2 = array(
+      '#plain_text' => $this->unsavedReferencedEntity->label(),
+      '#cache' => array(
+        'contexts' => [
+          'user.permissions',
+        ],
+        'tags' => $this->unsavedReferencedEntity->getCacheTags(),
+        'max-age' => Cache::PERMANENT,
+      ),
+    );
+    $this->assertEqual($build[1], $expected_item_2, sprintf('The render array returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
+
+    // Test with the 'link' setting set to FALSE.
+    $build = $this->buildRenderArray([$this->referencedEntity, $this->unsavedReferencedEntity], $formatter, array('link' => FALSE));
+    $this->assertEqual($build[0]['#plain_text'], $this->referencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a saved entity.', $formatter));
+    $this->assertEqual($build[1]['#plain_text'], $this->unsavedReferencedEntity->label(), sprintf('The markup returned by the %s formatter is correct for an item with a unsaved entity.', $formatter));
+
+    // Test an entity type that doesn't have any link templates, which means
+    // \Drupal\Core\Entity\EntityInterface::urlInfo() will throw an exception
+    // and the label formatter will output only the label instead of a link.
+    $field_storage_config = FieldStorageConfig::loadByName($this->entityType, $this->fieldName);
+    $field_storage_config->setSetting('target_type', 'entity_test_label');
+    $field_storage_config->save();
+
+    $referenced_entity_with_no_link_template = EntityTestLabel::create(array(
+      'name' => $this->randomMachineName(),
+    ));
+    $referenced_entity_with_no_link_template->save();
+
+    $build = $this->buildRenderArray([$referenced_entity_with_no_link_template], $formatter, array('link' => TRUE));
+    $this->assertEqual($build[0]['#plain_text'], $referenced_entity_with_no_link_template->label(), sprintf('The markup returned by the %s formatter is correct for an entity type with no valid link template.', $formatter));
+  }
+
+  /**
+   * Sets field values and returns a render array as built by
+   * \Drupal\Core\Field\FieldItemListInterface::view().
+   *
+   * @param \Drupal\Core\Entity\EntityInterface[] $referenced_entities
+   *   An array of entity objects that will be referenced.
+   * @param string $formatter
+   *   The formatted plugin that will be used for building the render array.
+   * @param array $formatter_options
+   *   Settings specific to the formatter. Defaults to the formatter's default
+   *   settings.
+   *
+   * @return array
+   *   A render array.
+   */
+  protected function buildRenderArray(array $referenced_entities, $formatter, $formatter_options = array()) {
+    // Create the entity that will have the entity reference field.
+    $referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+
+    $items = $referencing_entity->get($this->fieldName);
+
+    // Assign the referenced entities.
+    foreach ($referenced_entities as $referenced_entity) {
+      $items[] = ['entity' => $referenced_entity];
+    }
+
+    // Build the renderable array for the field.
+    return $items->view(array('type' => $formatter, 'settings' => $formatter_options));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
new file mode 100644
index 0000000..d949a9e
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php
@@ -0,0 +1,541 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\EntityReference\EntityReferenceItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\EntityReference;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestStringId;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\file\Entity\File;
+use Drupal\node\Entity\Node;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\user\Entity\User;
+
+
+/**
+ * Tests the new entity API for the entity reference field type.
+ *
+ * @group entity_reference
+ */
+class EntityReferenceItemTest extends FieldKernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'comment', 'file', 'taxonomy', 'text', 'filter', 'views', 'field'];
+
+  /**
+   * The taxonomy vocabulary to test with.
+   *
+   * @var \Drupal\taxonomy\VocabularyInterface
+   */
+  protected $vocabulary;
+
+  /**
+   * The taxonomy term to test with.
+   *
+   * @var \Drupal\taxonomy\TermInterface
+   */
+  protected $term;
+
+  /**
+   * The test entity with a string ID.
+   *
+   * @var \Drupal\entity_test\Entity\EntityTestStringId
+   */
+  protected $entityStringId;
+
+  /**
+   * Sets up the test.
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_string_id');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('file');
+
+    $this->installSchema('comment', ['comment_entity_statistics']);
+    $this->installSchema('node', ['node_access']);
+
+    $this->vocabulary = Vocabulary::create([
+      'name' => $this->randomMachineName(),
+      'vid' => Unicode::strtolower($this->randomMachineName()),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $this->vocabulary->save();
+
+    $this->term = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => $this->vocabulary->id(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $this->term->save();
+
+    $this->entityStringId = EntityTestStringId::create([
+      'id' => $this->randomMachineName(),
+    ]);
+    $this->entityStringId->save();
+
+    // Use the util to create an instance.
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_taxonomy_term', 'Test content entity reference', 'taxonomy_term');
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_entity_test_string_id', 'Test content entity reference with string ID', 'entity_test_string_id');
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_taxonomy_vocabulary', 'Test config entity reference', 'taxonomy_vocabulary');
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_node', 'Test node entity reference', 'node', 'default', [], FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_user', 'Test user entity reference', 'user');
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_comment', 'Test comment entity reference', 'comment');
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_file', 'Test file entity reference', 'file');
+  }
+
+  /**
+   * Tests the entity reference field type for referencing content entities.
+   */
+  public function testContentEntityReferenceItem() {
+    $tid = $this->term->id();
+
+    // Just being able to create the entity like this verifies a lot of code.
+    $entity = EntityTest::create();
+    $entity->field_test_taxonomy_term->target_id = $tid;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $entity = entity_load('entity_test', $entity->id());
+    $this->assertTrue($entity->field_test_taxonomy_term instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_test_taxonomy_term[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $tid);
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $this->term->getName());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $tid);
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->uuid(), $this->term->uuid());
+    // Verify that the label for the target ID property definition is correct.
+    $label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
+    $this->assertTrue($label instanceof TranslatableMarkup);
+    $this->assertEqual($label->render(), 'Taxonomy term ID');
+
+    // Change the name of the term via the reference.
+    $new_name = $this->randomMachineName();
+    $entity->field_test_taxonomy_term->entity->setName($new_name);
+    $entity->field_test_taxonomy_term->entity->save();
+    // Verify it is the correct name.
+    $term = Term::load($tid);
+    $this->assertEqual($term->getName(), $new_name);
+
+    // Make sure the computed term reflects updates to the term id.
+    $term2 = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => $this->term->bundle(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $term2->save();
+
+    // Test all the possible ways of assigning a value.
+    $entity->field_test_taxonomy_term->target_id = $term->id();
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term->getName());
+
+    $entity->field_test_taxonomy_term = [['target_id' => $term2->id()]];
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term2->id());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term2->getName());
+
+    // Test value assignment via the computed 'entity' property.
+    $entity->field_test_taxonomy_term->entity = $term;
+    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $term->id());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term->getName());
+
+    $entity->field_test_taxonomy_term = [['entity' => $term2]];
+    $this->assertEqual($entity->field_test_taxonomy_term->target_id, $term2->id());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->getName(), $term2->getName());
+
+    // Test assigning an invalid item throws an exception.
+    try {
+      $entity->field_test_taxonomy_term = ['target_id' => 'invalid', 'entity' => $term2];
+      $this->fail('Assigning an invalid item throws an exception.');
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass('Assigning an invalid item throws an exception.');
+    }
+
+    // Delete terms so we have nothing to reference and try again
+    $term->delete();
+    $term2->delete();
+    $entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $entity->save();
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->field_test_taxonomy_term->generateSampleItems();
+    $entity->field_test_taxonomy_vocabulary->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+  /**
+   * Tests referencing content entities with string IDs.
+   */
+  public function testContentEntityReferenceItemWithStringId() {
+    $entity = EntityTest::create();
+    $entity->field_test_entity_test_string_id->target_id = $this->entityStringId->id();
+    $entity->save();
+    $storage = \Drupal::entityManager()->getStorage('entity_test');
+    $storage->resetCache();
+    $this->assertEqual($this->entityStringId->id(), $storage->load($entity->id())->field_test_entity_test_string_id->target_id);
+    // Verify that the label for the target ID property definition is correct.
+    $label = $entity->field_test_taxonomy_term->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinition('target_id')->getLabel();
+    $this->assertTrue($label instanceof TranslatableMarkup);
+    $this->assertEqual($label->render(), 'Taxonomy term ID');
+  }
+
+  /**
+   * Tests the entity reference field type for referencing config entities.
+   */
+  public function testConfigEntityReferenceItem() {
+    $referenced_entity_id = $this->vocabulary->id();
+
+    // Just being able to create the entity like this verifies a lot of code.
+    $entity = EntityTest::create();
+    $entity->field_test_taxonomy_vocabulary->target_id = $referenced_entity_id;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $entity = entity_load('entity_test', $entity->id());
+    $this->assertTrue($entity->field_test_taxonomy_vocabulary instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_test_taxonomy_vocabulary[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->target_id, $referenced_entity_id);
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->label(), $this->vocabulary->label());
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->id(), $referenced_entity_id);
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->uuid(), $this->vocabulary->uuid());
+
+    // Change the name of the term via the reference.
+    $new_name = $this->randomMachineName();
+    $entity->field_test_taxonomy_vocabulary->entity->set('name', $new_name);
+    $entity->field_test_taxonomy_vocabulary->entity->save();
+    // Verify it is the correct name.
+    $vocabulary = Vocabulary::load($referenced_entity_id);
+    $this->assertEqual($vocabulary->label(), $new_name);
+
+    // Make sure the computed term reflects updates to the term id.
+    $vocabulary2 =  $vocabulary = Vocabulary::create([
+      'name' => $this->randomMachineName(),
+      'vid' => Unicode::strtolower($this->randomMachineName()),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $vocabulary2->save();
+
+    $entity->field_test_taxonomy_vocabulary->target_id = $vocabulary2->id();
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->id(), $vocabulary2->id());
+    $this->assertEqual($entity->field_test_taxonomy_vocabulary->entity->label(), $vocabulary2->label());
+
+    // Delete terms so we have nothing to reference and try again
+    $this->vocabulary->delete();
+    $vocabulary2->delete();
+    $entity = EntityTest::create(array('name' => $this->randomMachineName()));
+    $entity->save();
+  }
+
+  /**
+   * Tests entity auto create.
+   */
+  public function testEntityAutoCreate() {
+    // The term entity is unsaved here.
+    $term = Term::create(array(
+      'name' => $this->randomMachineName(),
+      'vid' => $this->term->bundle(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ));
+    $entity = EntityTest::create();
+    // Now assign the unsaved term to the field.
+    $entity->field_test_taxonomy_term->entity = $term;
+    $entity->name->value = $this->randomMachineName();
+    // This is equal to storing an entity to tempstore or cache and retrieving
+    // it back. An example for this is node preview.
+    $entity = serialize($entity);
+    $entity = unserialize($entity);
+    // And then the entity.
+    $entity->save();
+    $term = \Drupal::entityManager()->loadEntityByUuid($term->getEntityTypeId(), $term->uuid());
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
+  }
+
+  /**
+   * Test saving order sequence doesn't matter.
+   */
+  public function testEntitySaveOrder() {
+    // The term entity is unsaved here.
+    $term = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => $this->term->bundle(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $entity = EntityTest::create();
+    // Now assign the unsaved term to the field.
+    $entity->field_test_taxonomy_term->entity = $term;
+    $entity->name->value = $this->randomMachineName();
+    // Now get the field value.
+    $value = $entity->get('field_test_taxonomy_term');
+    $this->assertTrue(empty($value['target_id']));
+    $this->assertNull($entity->field_test_taxonomy_term->target_id);
+    // And then set it.
+    $entity->field_test_taxonomy_term = $value;
+    // Now save the term.
+    $term->save();
+    // And then the entity.
+    $entity->save();
+    $this->assertEqual($entity->field_test_taxonomy_term->entity->id(), $term->id());
+  }
+
+  /**
+   * Tests that the 'handler' field setting stores the proper plugin ID.
+   */
+  public function testSelectionHandlerSettings() {
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'entity_reference',
+      'settings' => array(
+        'target_type' => 'entity_test'
+      ),
+    ));
+    $field_storage->save();
+
+    // Do not specify any value for the 'handler' setting in order to verify
+    // that the default handler with the correct derivative is used.
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+    $field = FieldConfig::load($field->id());
+    $this->assertEqual($field->getSetting('handler'), 'default:entity_test');
+
+    // Change the target_type in the field storage, and check that the handler
+    // was correctly reassigned in the field.
+    $field_storage->setSetting('target_type', 'entity_test_rev');
+    $field_storage->save();
+    $field = FieldConfig::load($field->id());
+    $this->assertEqual($field->getSetting('handler'), 'default:entity_test_rev');
+
+    // Change the handler to another, non-derivative plugin.
+    $field->setSetting('handler', 'views');
+    $field->save();
+    $field = FieldConfig::load($field->id());
+    $this->assertEqual($field->getSetting('handler'), 'views');
+
+    // Change the target_type in the field storage again, and check that the
+    // non-derivative handler was unchanged.
+    $field_storage->setSetting('target_type', 'entity_test_rev');
+    $field_storage->save();
+    $field = FieldConfig::load($field->id());
+    $this->assertEqual($field->getSetting('handler'), 'views');
+  }
+
+  /**
+   * Tests ValidReferenceConstraint with newly created and unsaved entities.
+   */
+  public function testAutocreateValidation() {
+    // The term entity is unsaved here.
+    $term = Term::create(array(
+      'name' => $this->randomMachineName(),
+      'vid' => $this->term->bundle(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ));
+    $entity = EntityTest::create([
+      'field_test_taxonomy_term' => [
+        'entity' => $term,
+        'target_id' => NULL,
+      ],
+    ]);
+    $errors = $entity->validate();
+    // Using target_id of NULL is valid with an unsaved entity.
+    $this->assertEqual(0, count($errors));
+    // Using target_id of NULL is not valid with a saved entity.
+    $term->save();
+    $entity = EntityTest::create([
+      'field_test_taxonomy_term' => [
+        'entity' => $term,
+        'target_id' => NULL,
+      ],
+    ]);
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), 'This value should not be null.');
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_taxonomy_term.0');
+    // This should rectify the issue, favoring the entity over the target_id.
+    $entity->save();
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+
+    // Test with an unpublished and unsaved node.
+    $title = $this->randomString();
+    $node = Node::create([
+      'title' => $title,
+      'type' => 'node',
+      'status' => NODE_NOT_PUBLISHED,
+    ]);
+
+    $entity = EntityTest::create([
+      'field_test_node' => [
+        'entity' => $node,
+      ],
+    ]);
+
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $title]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
+
+    // Publish the node and try again.
+    $node->setPublished(TRUE);
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+
+    // Test with a mix of valid and invalid nodes.
+    $unsaved_unpublished_node_title = $this->randomString();
+    $unsaved_unpublished_node = Node::create([
+      'title' => $unsaved_unpublished_node_title,
+      'type' => 'node',
+      'status' => NODE_NOT_PUBLISHED,
+    ]);
+
+    $saved_unpublished_node_title = $this->randomString();
+    $saved_unpublished_node = Node::create([
+      'title' => $saved_unpublished_node_title,
+      'type' => 'node',
+      'status' => NODE_NOT_PUBLISHED,
+    ]);
+    $saved_unpublished_node->save();
+
+    $saved_published_node_title = $this->randomString();
+    $saved_published_node = Node::create([
+      'title' => $saved_published_node_title,
+      'type' => 'node',
+      'status' => NODE_PUBLISHED,
+    ]);
+    $saved_published_node->save();
+
+    $entity = EntityTest::create([
+      'field_test_node' => [
+        [
+          'entity' => $unsaved_unpublished_node,
+        ],
+        [
+          'target_id' => $saved_unpublished_node->id(),
+        ],
+        [
+          'target_id' => $saved_published_node->id(),
+        ],
+      ],
+    ]);
+
+    $errors = $entity->validate();
+    $this->assertEqual(2, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
+    $this->assertEqual($errors[1]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $saved_unpublished_node->id()]));
+    $this->assertEqual($errors[1]->getPropertyPath(), 'field_test_node.1.target_id');
+
+    // Publish one of the nodes and try again.
+    $saved_unpublished_node->setPublished(TRUE);
+    $saved_unpublished_node->save();
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'node', '%label' => $unsaved_unpublished_node_title]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_node.0.entity');
+
+    // Publish the last invalid node and try again.
+    $unsaved_unpublished_node->setPublished(TRUE);
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+
+    // Test with an unpublished and unsaved comment.
+    $title = $this->randomString();
+    $comment = Comment::create([
+      'subject' => $title,
+      'comment_type' => 'comment',
+      'status' => 0,
+    ]);
+
+    $entity = EntityTest::create([
+      'field_test_comment' => [
+        'entity' => $comment,
+      ],
+    ]);
+
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'comment', '%label' => $title]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_comment.0.entity');
+
+    // Publish the comment and try again.
+    $comment->setPublished(TRUE);
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+
+    // Test with an inactive and unsaved user.
+    $name = $this->randomString();
+    $user = User::create([
+      'name' => $name,
+      'status' => 0,
+    ]);
+
+    $entity = EntityTest::create([
+      'field_test_user' => [
+        'entity' => $user,
+      ],
+    ]);
+
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'user', '%label' => $name]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_user.0.entity');
+
+    // Activate the user and try again.
+    $user->activate();
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+
+    // Test with a temporary and unsaved file.
+    $filename = $this->randomMachineName() . '.txt';
+    $file = File::create([
+      'filename' => $filename,
+      'status' => 0,
+    ]);
+
+    $entity = EntityTest::create([
+      'field_test_file' => [
+        'entity' => $file,
+      ],
+    ]);
+
+    $errors = $entity->validate();
+    $this->assertEqual(1, count($errors));
+    $this->assertEqual($errors[0]->getMessage(), new FormattableMarkup('This entity (%type: %label) cannot be referenced.', ['%type' => 'file', '%label' => $filename]));
+    $this->assertEqual($errors[0]->getPropertyPath(), 'field_test_file.0.entity');
+
+    // Set the file as permanent and try again.
+    $file->setPermanent();
+    $errors = $entity->validate();
+    $this->assertEqual(0, count($errors));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php
new file mode 100644
index 0000000..534c89e
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceSettingsTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\EntityReference\EntityReferenceSettingsTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\EntityReference;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\node\Entity\NodeType;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests entity reference field settings.
+ *
+ * @group field
+ */
+class EntityReferenceSettingsTest extends KernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'taxonomy', 'field', 'user', 'text', 'entity_reference', 'entity_test', 'system'];
+
+  /**
+   * Testing node type.
+   *
+   * @var \Drupal\node\Entity\NodeType
+   */
+  protected $nodeType;
+
+  /**
+   * Testing vocabulary.
+   *
+   * @var \Drupal\taxonomy\Entity\Vocabulary
+   */
+  protected $vocabulary;
+
+  /**
+   * An entity bundle that is not stored as a configuration entity.
+   *
+   * @var string
+   */
+  protected $customBundle;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setup();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('entity_test');
+
+    $this->nodeType = NodeType::create([
+      'type' => Unicode::strtolower($this->randomMachineName()),
+      'name' => $this->randomString(),
+    ]);
+    $this->nodeType->save();
+
+    $this->vocabulary = Vocabulary::create([
+      'vid' => Unicode::strtolower($this->randomMachineName()),
+      'name' => $this->randomString(),
+    ]);
+    $this->vocabulary->save();
+
+    // Create a custom bundle.
+    $this->customBundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
+    entity_test_create_bundle($this->customBundle, NULL, 'entity_test');
+  }
+
+  /**
+   * Tests that config bundle deletions are mirrored in field config settings.
+   */
+  public function testConfigTargetBundleDeletion() {
+    // Attach an entity reference field to $this->nodeType.
+    $name = Unicode::strtolower($this->randomMachineName());
+    $label = $this->randomString();
+    $vid = $this->vocabulary->id();
+    $handler_settings = ['target_bundles' => [$vid => $vid]];
+    $this->createEntityReferenceField('node', $this->nodeType->id(), $name, $label, 'taxonomy_term', 'default', $handler_settings);
+
+    // Check that the 'target_bundle' setting contains the vocabulary.
+    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
+    $actual_handler_settings = $field_config->getSetting('handler_settings');
+    $this->assertEqual($handler_settings, $actual_handler_settings);
+
+    // Delete the vocabulary.
+    $this->vocabulary->delete();
+
+    // Check that the deleted vocabulary is no longer present in the
+    // 'target_bundles' field setting.
+    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
+    $handler_settings = $field_config->getSetting('handler_settings');
+    $this->assertTrue(empty($handler_settings['target_bundles']));
+  }
+
+  /**
+   * Tests that deletions of custom bundles are mirrored in field settings.
+   */
+  public function testCustomTargetBundleDeletion() {
+    // Attach an entity reference field to $this->nodeType.
+    $name = Unicode::strtolower($this->randomMachineName());
+    $label = $this->randomString();
+    $handler_settings = ['target_bundles' => [$this->customBundle => $this->customBundle]];
+    $this->createEntityReferenceField('node', $this->nodeType->id(), $name, $label, 'entity_test', 'default', $handler_settings);
+
+    // Check that the 'target_bundle' setting contains the custom bundle.
+    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
+    $actual_handler_settings = $field_config->getSetting('handler_settings');
+    $this->assertEqual($handler_settings, $actual_handler_settings);
+
+    // Delete the custom bundle.
+    entity_test_delete_bundle($this->customBundle, 'entity_test');
+
+    // Check that the deleted bundle is no longer present in the
+    // 'target_bundles' field setting.
+    $field_config = FieldConfig::loadByName('node', $this->nodeType->id(), $name);
+    $handler_settings = $field_config->getSetting('handler_settings');
+    $this->assertTrue(empty($handler_settings['target_bundles']));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
new file mode 100644
index 0000000..1f90f99
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
@@ -0,0 +1,233 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\EntityReference\Views\EntityReferenceRelationshipTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\EntityReference\Views;
+
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\views\Views;
+
+/**
+ * Tests entity reference relationship data.
+ *
+ * @group entity_reference
+ *
+ * @see core_field_views_data()
+ */
+class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array(
+    'test_entity_reference_entity_test_view',
+    'test_entity_reference_reverse_entity_test_view',
+    'test_entity_reference_entity_test_mul_view',
+    'test_entity_reference_reverse_entity_test_mul_view',
+    );
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = ['user', 'field', 'entity_test', 'views', 'entity_reference_test_views'];
+
+  /**
+   * The entity_test entities used by the test.
+   *
+   * @var array
+   */
+  protected $entities = array();
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mul');
+
+    // Create reference from entity_test to entity_test_mul.
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'field_test_data', 'field_test_data', 'entity_test_mul');
+
+    // Create reference from entity_test_mul to entity_test.
+    $this->createEntityReferenceField('entity_test_mul', 'entity_test_mul', 'field_data_test', 'field_data_test', 'entity_test');
+
+    ViewTestData::createTestViews(get_class($this), array('entity_reference_test_views'));
+  }
+
+  /**
+   * Tests using the views relationship.
+   */
+  public function testNoDataTableRelationship() {
+
+    // Create some test entities which link each other.
+    $referenced_entity = EntityTestMul::create();
+    $referenced_entity->save();
+
+    $entity = EntityTest::create();
+    $entity->field_test_data->target_id = $referenced_entity->id();
+    $entity->save();
+    $this->assertEqual($entity->field_test_data[0]->entity->id(), $referenced_entity->id());
+    $this->entities[] = $entity;
+
+    $entity = EntityTest::create();
+    $entity->field_test_data->target_id = $referenced_entity->id();
+    $entity->save();
+    $this->assertEqual($entity->field_test_data[0]->entity->id(), $referenced_entity->id());
+    $this->entities[] = $entity;
+
+    Views::viewsData()->clear();
+
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test__field_test_data');
+    $this->assertEqual($views_data['field_test_data']['relationship']['id'], 'standard');
+    $this->assertEqual($views_data['field_test_data']['relationship']['base'], 'entity_test_mul_property_data');
+    $this->assertEqual($views_data['field_test_data']['relationship']['base field'], 'id');
+    $this->assertEqual($views_data['field_test_data']['relationship']['relationship field'], 'field_test_data_target_id');
+    $this->assertEqual($views_data['field_test_data']['relationship']['entity type'], 'entity_test_mul');
+
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('entity_test_mul_property_data');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['id'], 'entity_reverse');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['base'], 'entity_test');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['base field'], 'id');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field table'], 'entity_test__field_test_data');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field field'], 'field_test_data_target_id');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['field_name'], 'field_test_data');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['entity_type'], 'entity_test');
+    $this->assertEqual($views_data['reverse__entity_test__field_test_data']['relationship']['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+
+    // Check an actual test view.
+    $view = Views::getView('test_entity_reference_entity_test_view');
+    $this->executeView($view);
+    /** @var \Drupal\views\ResultRow $row */
+    foreach ($view->result as $index => $row) {
+      // Check that the actual ID of the entity is the expected one.
+      $this->assertEqual($row->id, $this->entities[$index]->id());
+
+      // Also check that we have the correct result entity.
+      $this->assertEqual($row->_entity->id(), $this->entities[$index]->id());
+
+      // Test the forward relationship.
+      $this->assertEqual($row->entity_test_mul_property_data_entity_test__field_test_data_i, 1);
+
+      // Test that the correct relationship entity is on the row.
+      $this->assertEqual($row->_relationship_entities['field_test_data']->id(), 1);
+      $this->assertEqual($row->_relationship_entities['field_test_data']->bundle(), 'entity_test_mul');
+
+    }
+
+    // Check the backwards reference view.
+    $view = Views::getView('test_entity_reference_reverse_entity_test_view');
+    $this->executeView($view);
+    /** @var \Drupal\views\ResultRow $row */
+    foreach ($view->result as $index => $row) {
+      $this->assertEqual($row->id, 1);
+      $this->assertEqual($row->_entity->id(), 1);
+
+      // Test the backwards relationship.
+      $this->assertEqual($row->field_test_data_entity_test_mul_property_data_id, $this->entities[$index]->id());
+
+      // Test that the correct relationship entity is on the row.
+      $this->assertEqual($row->_relationship_entities['reverse__entity_test__field_test_data']->id(), $this->entities[$index]->id());
+      $this->assertEqual($row->_relationship_entities['reverse__entity_test__field_test_data']->bundle(), 'entity_test');
+    }
+  }
+
+  /**
+   * Tests views data generated for relationship.
+   *
+   * @see entity_reference_field_views_data()
+   */
+  public function testDataTableRelationship() {
+
+    // Create some test entities which link each other.
+    $referenced_entity = EntityTest::create();
+    $referenced_entity->save();
+
+    $entity = EntityTestMul::create();
+    $entity->field_data_test->target_id = $referenced_entity->id();
+    $entity->save();
+    $this->assertEqual($entity->field_data_test[0]->entity->id(), $referenced_entity->id());
+    $this->entities[] = $entity;
+
+    $entity = EntityTestMul::create();
+    $entity->field_data_test->target_id = $referenced_entity->id();
+    $entity->save();
+    $this->assertEqual($entity->field_data_test[0]->entity->id(), $referenced_entity->id());
+    $this->entities[] = $entity;
+
+    Views::viewsData()->clear();
+
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test_mul__field_data_test');
+    $this->assertEqual($views_data['field_data_test']['relationship']['id'], 'standard');
+    $this->assertEqual($views_data['field_data_test']['relationship']['base'], 'entity_test');
+    $this->assertEqual($views_data['field_data_test']['relationship']['base field'], 'id');
+    $this->assertEqual($views_data['field_data_test']['relationship']['relationship field'], 'field_data_test_target_id');
+    $this->assertEqual($views_data['field_data_test']['relationship']['entity type'], 'entity_test');
+
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('entity_test');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['id'], 'entity_reverse');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['base'], 'entity_test_mul_property_data');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['base field'], 'id');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field table'], 'entity_test_mul__field_data_test');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field field'], 'field_data_test_target_id');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['field_name'], 'field_data_test');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['entity_type'], 'entity_test_mul');
+    $this->assertEqual($views_data['reverse__entity_test_mul__field_data_test']['relationship']['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+
+    // Check an actual test view.
+    $view = Views::getView('test_entity_reference_entity_test_mul_view');
+    $this->executeView($view);
+    /** @var \Drupal\views\ResultRow $row */
+    foreach ($view->result as $index => $row) {
+      // Check that the actual ID of the entity is the expected one.
+      $this->assertEqual($row->id, $this->entities[$index]->id());
+
+      // Also check that we have the correct result entity.
+      $this->assertEqual($row->_entity->id(), $this->entities[$index]->id());
+
+      // Test the forward relationship.
+      $this->assertEqual($row->entity_test_entity_test_mul__field_data_test_id, 1);
+
+      // Test that the correct relationship entity is on the row.
+      $this->assertEqual($row->_relationship_entities['field_data_test']->id(), 1);
+      $this->assertEqual($row->_relationship_entities['field_data_test']->bundle(), 'entity_test');
+
+    }
+
+    // Check the backwards reference view.
+    $view = Views::getView('test_entity_reference_reverse_entity_test_mul_view');
+    $this->executeView($view);
+    /** @var \Drupal\views\ResultRow $row */
+    foreach ($view->result as $index => $row) {
+      $this->assertEqual($row->id, 1);
+      $this->assertEqual($row->_entity->id(), 1);
+
+      // Test the backwards relationship.
+      $this->assertEqual($row->field_data_test_entity_test_id, $this->entities[$index]->id());
+
+      // Test that the correct relationship entity is on the row.
+      $this->assertEqual($row->_relationship_entities['reverse__entity_test_mul__field_data_test']->id(), $this->entities[$index]->id());
+      $this->assertEqual($row->_relationship_entities['reverse__entity_test_mul__field_data_test']->bundle(), 'entity_test_mul');
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
new file mode 100644
index 0000000..53fbd65
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
@@ -0,0 +1,386 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldAttachOtherTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Form\FormState;
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests other Field API functions.
+ *
+ * @group field
+ * @todo move this to the Entity module
+ */
+class FieldAttachOtherTest extends FieldKernelTestBase {
+
+  protected function setUp() {
+    parent::setUp();
+    $this->container->get('router.builder')->rebuild();
+    $this->installEntitySchema('entity_test_rev');
+    $this->createFieldWithStorage();
+  }
+
+  /**
+   * Test rendering fields with EntityDisplay build().
+   */
+  function testEntityDisplayBuild() {
+    $this->createFieldWithStorage('_2');
+
+    $entity_type = 'entity_test';
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+
+    // Populate values to be displayed.
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
+    $entity_init->{$this->fieldTestData->field_name}->setValue($values);
+    $values_2 = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
+    $entity_init->{$this->fieldTestData->field_name_2}->setValue($values_2);
+
+    // Simple formatter, label displayed.
+    $entity = clone($entity_init);
+    $display = entity_get_display($entity_type, $entity->bundle(), 'full');
+
+    $formatter_setting = $this->randomMachineName();
+    $display_options = array(
+      'label' => 'above',
+      'type' => 'field_test_default',
+      'settings' => array(
+        'test_formatter_setting' => $formatter_setting,
+      ),
+    );
+    $display->setComponent($this->fieldTestData->field_name, $display_options);
+
+    $formatter_setting_2 = $this->randomMachineName();
+    $display_options_2 = array(
+      'label' => 'above',
+      'type' => 'field_test_default',
+      'settings' => array(
+        'test_formatter_setting' => $formatter_setting_2,
+      ),
+    );
+    $display->setComponent($this->fieldTestData->field_name_2, $display_options_2);
+
+    // View all fields.
+    $content = $display->build($entity);
+    $this->render($content);
+    $this->assertRaw($this->fieldTestData->field->getLabel(), "First field's label is displayed.");
+    foreach ($values as $delta => $value) {
+      $this->assertRaw("$formatter_setting|{$value['value']}", "Value $delta is displayed, formatter settings are applied.");
+    }
+    $this->assertRaw($this->fieldTestData->field_2->getLabel(), "Second field's label is displayed.");
+    foreach ($values_2 as $delta => $value) {
+      $this->assertRaw("$formatter_setting_2|{$value['value']}", "Value $delta is displayed, formatter settings are applied.");
+    }
+
+    // Label hidden.
+    $entity = clone($entity_init);
+    $display_options['label'] = 'hidden';
+    $display->setComponent($this->fieldTestData->field_name, $display_options);
+    $content = $display->build($entity);
+    $this->render($content);
+    $this->assertNoRaw($this->fieldTestData->field->getLabel(), "Hidden label: label is not displayed.");
+
+    // Field hidden.
+    $entity = clone($entity_init);
+    $display->removeComponent($this->fieldTestData->field_name);
+    $content = $display->build($entity);
+    $this->render($content);
+    $this->assertNoRaw($this->fieldTestData->field->getLabel(), "Hidden field: label is not displayed.");
+    foreach ($values as $delta => $value) {
+      $this->assertNoRaw("$formatter_setting|{$value['value']}", "Hidden field: value $delta is not displayed.");
+    }
+
+    // Multiple formatter.
+    $entity = clone($entity_init);
+    $formatter_setting = $this->randomMachineName();
+    $display->setComponent($this->fieldTestData->field_name, array(
+      'label' => 'above',
+      'type' => 'field_test_multiple',
+      'settings' => array(
+        'test_formatter_setting_multiple' => $formatter_setting,
+      ),
+    ));
+    $content = $display->build($entity);
+    $this->render($content);
+    $expected_output = $formatter_setting;
+    foreach ($values as $delta => $value) {
+      $expected_output .= "|$delta:{$value['value']}";
+    }
+    $this->assertRaw($expected_output, "Multiple formatter: all values are displayed, formatter settings are applied.");
+
+    // Test a formatter that uses hook_field_formatter_prepare_view().
+    $entity = clone($entity_init);
+    $formatter_setting = $this->randomMachineName();
+    $display->setComponent($this->fieldTestData->field_name, array(
+      'label' => 'above',
+      'type' => 'field_test_with_prepare_view',
+      'settings' => array(
+        'test_formatter_setting_additional' => $formatter_setting,
+      ),
+    ));
+    $content = $display->build($entity);
+    $this->render($content);
+    foreach ($values as $delta => $value) {
+      $expected = $formatter_setting . '|' . $value['value'] . '|' . ($value['value'] + 1);
+      $this->assertRaw($expected, "Value $delta is displayed, formatter settings are applied.");
+    }
+
+    // TODO:
+    // - check display order with several fields
+  }
+
+  /**
+   * Tests rendering fields with EntityDisplay::buildMultiple().
+   */
+  function testEntityDisplayViewMultiple() {
+    // Use a formatter that has a prepareView() step.
+    $display = entity_get_display('entity_test', 'entity_test', 'full')
+      ->setComponent($this->fieldTestData->field_name, array(
+        'type' => 'field_test_with_prepare_view',
+      ));
+
+    // Create two entities.
+    $entity1 = EntityTest::create(array('id' => 1, 'type' => 'entity_test'));
+    $entity1->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
+    $entity2 = EntityTest::create(array('id' => 2, 'type' => 'entity_test'));
+    $entity2->{$this->fieldTestData->field_name}->setValue($this->_generateTestFieldValues(1));
+
+    // Run buildMultiple(), and check that the entities come out as expected.
+    $display->buildMultiple(array($entity1, $entity2));
+    $item1 = $entity1->{$this->fieldTestData->field_name}[0];
+    $this->assertEqual($item1->additional_formatter_value, $item1->value + 1, 'Entity 1 ran through the prepareView() formatter method.');
+    $item2 = $entity2->{$this->fieldTestData->field_name}[0];
+    $this->assertEqual($item2->additional_formatter_value, $item2->value + 1, 'Entity 2 ran through the prepareView() formatter method.');
+  }
+
+  /**
+   * Test entity cache.
+   *
+   * Complements unit test coverage in
+   * \Drupal\Tests\Core\Entity\Sql\SqlContentEntityStorageTest.
+   */
+  function testEntityCache() {
+    // Initialize random values and a test entity.
+    $entity_init = EntityTest::create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
+
+    // Non-cacheable entity type.
+    $entity_type = 'entity_test';
+    $cid = "values:$entity_type:" . $entity_init->id();
+
+    // Check that no initial cache entry is present.
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Non-cached: no initial cache entry');
+
+    // Save, and check that no cache entry is present.
+    $entity = clone($entity_init);
+    $entity->{$this->fieldTestData->field_name}->setValue($values);
+    $entity = $this->entitySaveReload($entity);
+    $cid = "values:$entity_type:" . $entity->id();
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Non-cached: no cache entry on insert and load');
+
+    // Cacheable entity type.
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('_2', $entity_type);
+
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'type' => $entity_type,
+      ));
+
+    // Check that no initial cache entry is present.
+    $cid = "values:$entity_type:" . $entity->id();
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no initial cache entry');
+
+    // Save, and check that no cache entry is present.
+    $entity = clone($entity_init);
+    $entity->{$this->fieldTestData->field_name_2} = $values;
+    $entity->save();
+    $cid = "values:$entity_type:" . $entity->id();
+
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on insert');
+    // Load, and check that a cache entry is present with the expected values.
+    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
+    $controller->resetCache();
+    $cached_entity = $controller->load($entity->id());
+    $cache = \Drupal::cache('entity')->get($cid);
+    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
+
+    // Update with different values, and check that the cache entry is wiped.
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
+    $entity->{$this->fieldTestData->field_name_2} = $values;
+    $entity->save();
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on update');
+
+    // Load, and check that a cache entry is present with the expected values.
+    $controller->resetCache();
+    $cached_entity = $controller->load($entity->id());
+    $cache = \Drupal::cache('entity')->get($cid);
+    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
+
+    // Create a new revision, and check that the cache entry is wiped.
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
+    $entity->{$this->fieldTestData->field_name_2} = $values;
+    $entity->setNewRevision();
+    $entity->save();
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry on new revision creation');
+
+    // Load, and check that a cache entry is present with the expected values.
+    $controller->resetCache();
+    $cached_entity = $controller->load($entity->id());
+    $cache = \Drupal::cache('entity')->get($cid);
+    $this->assertEqual($cache->data, $cached_entity, 'Cached: correct cache entry on load');
+
+    // Delete, and check that the cache entry is wiped.
+    $entity->delete();
+    $this->assertFalse(\Drupal::cache('entity')->get($cid), 'Cached: no cache entry after delete');
+  }
+
+  /**
+   * Tests \Drupal\Core\Entity\Display\EntityFormDisplayInterface::buildForm().
+   *
+   * This could be much more thorough, but it does verify that the correct
+   * widgets show up.
+   */
+  function testEntityFormDisplayBuildForm() {
+    $this->createFieldWithStorage('_2');
+
+    $entity_type = 'entity_test';
+    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
+
+    // Test generating widgets for all fields.
+    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
+    $form = array();
+    $form_state = new FormState();
+    $display->buildForm($entity, $form, $form_state);
+
+    $this->assertEqual($form[$this->fieldTestData->field_name]['widget']['#title'], $this->fieldTestData->field->getLabel(), "First field's form title is {$this->fieldTestData->field->getLabel()}");
+    $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget']['#title'], $this->fieldTestData->field_2->getLabel(), "Second field's form title is {$this->fieldTestData->field_2->getLabel()}");
+    for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
+      // field_test_widget uses 'textfield'
+      $this->assertEqual($form[$this->fieldTestData->field_name]['widget'][$delta]['value']['#type'], 'textfield', "First field's form delta $delta widget is textfield");
+    }
+    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
+      // field_test_widget uses 'textfield'
+      $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget'][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield");
+    }
+
+    // Test generating widgets for all fields.
+    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
+    foreach ($display->getComponents() as $name => $options) {
+      if ($name != $this->fieldTestData->field_name_2) {
+        $display->removeComponent($name);
+      }
+    }
+    $form = array();
+    $form_state = new FormState();
+    $display->buildForm($entity, $form, $form_state);
+
+    $this->assertFalse(isset($form[$this->fieldTestData->field_name]), 'The first field does not exist in the form');
+    $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget']['#title'], $this->fieldTestData->field_2->getLabel(), "Second field's form title is {$this->fieldTestData->field_2->getLabel()}");
+    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
+      // field_test_widget uses 'textfield'
+      $this->assertEqual($form[$this->fieldTestData->field_name_2]['widget'][$delta]['value']['#type'], 'textfield', "Second field's form delta $delta widget is textfield");
+    }
+  }
+
+  /**
+   * Tests \Drupal\Core\Entity\Display\EntityFormDisplayInterface::extractFormValues().
+   */
+  function testEntityFormDisplayExtractFormValues() {
+    $this->createFieldWithStorage('_2');
+
+    $entity_type = 'entity_test';
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 1, 'revision_id' => 1, 'type' => $this->fieldTestData->field->getTargetBundle()));
+
+    // Build the form for all fields.
+    $display = entity_get_form_display($entity_type, $this->fieldTestData->field->getTargetBundle(), 'default');
+    $form = array();
+    $form_state = new FormState();
+    $display->buildForm($entity_init, $form, $form_state);
+
+    // Simulate incoming values.
+    // First field.
+    $values = array();
+    $weights = array();
+    for ($delta = 0; $delta < $this->fieldTestData->field_storage->getCardinality(); $delta++) {
+      $values[$delta]['value'] = mt_rand(1, 127);
+      // Assign random weight.
+      do {
+        $weight = mt_rand(0, $this->fieldTestData->field_storage->getCardinality());
+      } while (in_array($weight, $weights));
+      $weights[$delta] = $weight;
+      $values[$delta]['_weight'] = $weight;
+    }
+    // Leave an empty value. 'field_test' fields are empty if empty().
+    $values[1]['value'] = 0;
+    // Second field.
+    $values_2 = array();
+    $weights_2 = array();
+    for ($delta = 0; $delta < $this->fieldTestData->field_storage_2->getCardinality(); $delta++) {
+      $values_2[$delta]['value'] = mt_rand(1, 127);
+      // Assign random weight.
+      do {
+        $weight = mt_rand(0, $this->fieldTestData->field_storage_2->getCardinality());
+      } while (in_array($weight, $weights_2));
+      $weights_2[$delta] = $weight;
+      $values_2[$delta]['_weight'] = $weight;
+    }
+    // Leave an empty value. 'field_test' fields are empty if empty().
+    $values_2[1]['value'] = 0;
+
+    // Pretend the form has been built.
+    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type, 'default'));
+    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
+    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
+    $form_state->setValue($this->fieldTestData->field_name, $values);
+    $form_state->setValue($this->fieldTestData->field_name_2, $values_2);
+
+    // Extract values for all fields.
+    $entity = clone($entity_init);
+    $display->extractFormValues($entity, $form, $form_state);
+
+    asort($weights);
+    asort($weights_2);
+    $expected_values = array();
+    $expected_values_2 = array();
+    foreach ($weights as $key => $value) {
+      if ($key != 1) {
+        $expected_values[] = array('value' => $values[$key]['value']);
+      }
+    }
+    $this->assertIdentical($entity->{$this->fieldTestData->field_name}->getValue(), $expected_values, 'Submit filters empty values');
+    foreach ($weights_2 as $key => $value) {
+      if ($key != 1) {
+        $expected_values_2[] = array('value' => $values_2[$key]['value']);
+      }
+    }
+    $this->assertIdentical($entity->{$this->fieldTestData->field_name_2}->getValue(), $expected_values_2, 'Submit filters empty values');
+
+    // Call EntityFormDisplayInterface::extractFormValues() for a single field (the second field).
+    foreach ($display->getComponents() as $name => $options) {
+      if ($name != $this->fieldTestData->field_name_2) {
+        $display->removeComponent($name);
+      }
+    }
+    $entity = clone($entity_init);
+    $display->extractFormValues($entity, $form, $form_state);
+    $expected_values_2 = array();
+    foreach ($weights_2 as $key => $value) {
+      if ($key != 1) {
+        $expected_values_2[] = array('value' => $values_2[$key]['value']);
+      }
+    }
+    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'The first field is empty in the entity object');
+    $this->assertIdentical($entity->{$this->fieldTestData->field_name_2}->getValue(), $expected_values_2, 'Submit filters empty values');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
new file mode 100644
index 0000000..2270edb
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
@@ -0,0 +1,381 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldAttachStorageTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests storage-related Field Attach API functions.
+ *
+ * @group field
+ * @todo move this to the Entity module
+ */
+class FieldAttachStorageTest extends FieldKernelTestBase {
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_rev');
+  }
+
+  /**
+   * Check field values insert, update and load.
+   *
+   * Works independently of the underlying field storage backend. Inserts or
+   * updates random field data and then loads and verifies the data.
+   */
+  function testFieldAttachSaveLoad() {
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('', $entity_type);
+    $cardinality = $this->fieldTestData->field_storage->getCardinality();
+
+    // TODO : test empty values filtering and "compression" (store consecutive deltas).
+    // Preparation: create three revisions and store them in $revision array.
+    $values = array();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    for ($revision_id = 0; $revision_id < 3; $revision_id++) {
+      // Note: we try to insert one extra value.
+      $current_values = $this->_generateTestFieldValues($cardinality + 1);
+      $entity->{$this->fieldTestData->field_name}->setValue($current_values);
+      $entity->setNewRevision();
+      $entity->save();
+      $entity_id = $entity->id();
+      $current_revision = $entity->getRevisionId();
+      $values[$current_revision] = $current_values;
+    }
+
+    $storage =  $this->container->get('entity.manager')->getStorage($entity_type);
+    $storage->resetCache();
+    $entity = $storage->load($entity_id);
+    // Confirm current revision loads the correct data.
+    // Number of values per field loaded equals the field cardinality.
+    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, 'Current revision: expected number of values');
+    for ($delta = 0; $delta < $cardinality; $delta++) {
+      // The field value loaded matches the one inserted or updated.
+      $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value , $values[$current_revision][$delta]['value'], format_string('Current revision: expected value %delta was found.', array('%delta' => $delta)));
+    }
+
+    // Confirm each revision loads the correct data.
+    foreach (array_keys($values) as $revision_id) {
+      $entity = $storage->loadRevision($revision_id);
+      // Number of values per field loaded equals the field cardinality.
+      $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $revision_id)));
+      for ($delta = 0; $delta < $cardinality; $delta++) {
+        // The field value loaded matches the one inserted or updated.
+        $this->assertEqual($entity->{$this->fieldTestData->field_name}[$delta]->value, $values[$revision_id][$delta]['value'], format_string('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta)));
+      }
+    }
+  }
+
+  /**
+   * Test the 'multiple' load feature.
+   */
+  function testFieldAttachLoadMultiple() {
+    $entity_type = 'entity_test_rev';
+
+    // Define 2 bundles.
+    $bundles = array(
+      1 => 'test_bundle_1',
+      2 => 'test_bundle_2',
+    );
+    entity_test_create_bundle($bundles[1]);
+    entity_test_create_bundle($bundles[2]);
+    // Define 3 fields:
+    // - field_1 is in bundle_1 and bundle_2,
+    // - field_2 is in bundle_1,
+    // - field_3 is in bundle_2.
+    $field_bundles_map = array(
+      1 => array(1, 2),
+      2 => array(1),
+      3 => array(2),
+    );
+    for ($i = 1; $i <= 3; $i++) {
+      $field_names[$i] = 'field_' . $i;
+      $field_storage = FieldStorageConfig::create(array(
+        'field_name' => $field_names[$i],
+        'entity_type' => $entity_type,
+        'type' => 'test_field',
+      ));
+      $field_storage->save();
+      $field_ids[$i] = $field_storage->uuid();
+      foreach ($field_bundles_map[$i] as $bundle) {
+        FieldConfig::create([
+          'field_name' => $field_names[$i],
+          'entity_type' => $entity_type,
+          'bundle' => $bundles[$bundle],
+        ])->save();
+      }
+    }
+
+    // Create one test entity per bundle, with random values.
+    foreach ($bundles as $index => $bundle) {
+      $entities[$index] = $this->container->get('entity_type.manager')
+        ->getStorage($entity_type)
+        ->create(array('id' => $index, 'revision_id' => $index, 'type' => $bundle));
+      $entity = clone($entities[$index]);
+      foreach ($field_names as $field_name) {
+        if (!$entity->hasField($field_name)) {
+          continue;
+        }
+        $values[$index][$field_name] = mt_rand(1, 127);
+        $entity->$field_name->setValue(array('value' => $values[$index][$field_name]));
+      }
+      $entity->enforceIsnew();
+      $entity->save();
+    }
+
+    // Check that a single load correctly loads field values for both entities.
+    $controller = \Drupal::entityManager()->getStorage($entity->getEntityTypeId());
+    $controller->resetCache();
+    $entities = $controller->loadMultiple();
+    foreach ($entities as $index => $entity) {
+      foreach ($field_names as $field_name) {
+        if (!$entity->hasField($field_name)) {
+          continue;
+        }
+        // The field value loaded matches the one inserted.
+        $this->assertEqual($entity->{$field_name}->value, $values[$index][$field_name], format_string('Entity %index: expected value was found.', array('%index' => $index)));
+      }
+    }
+  }
+
+  /**
+   * Tests insert and update with empty or NULL fields.
+   */
+  function testFieldAttachSaveEmptyData() {
+    $entity_type = 'entity_test';
+    $this->createFieldWithStorage('', $entity_type);
+
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 1));
+
+    // Insert: Field is NULL.
+    $entity = clone $entity_init;
+    $entity->{$this->fieldTestData->field_name} = NULL;
+    $entity->enforceIsNew();
+    $entity = $this->entitySaveReload($entity);
+    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Insert: NULL field results in no value saved');
+
+    // All saves after this point should be updates, not inserts.
+    $entity_init->enforceIsNew(FALSE);
+
+    // Add some real data.
+    $entity = clone($entity_init);
+    $values = $this->_generateTestFieldValues(1);
+    $entity->{$this->fieldTestData->field_name} = $values;
+    $entity = $this->entitySaveReload($entity);
+    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $values, 'Field data saved');
+
+    // Update: Field is NULL. Data should be wiped.
+    $entity = clone($entity_init);
+    $entity->{$this->fieldTestData->field_name} = NULL;
+    $entity = $this->entitySaveReload($entity);
+    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Update: NULL field removes existing values');
+
+    // Re-add some data.
+    $entity = clone($entity_init);
+    $values = $this->_generateTestFieldValues(1);
+    $entity->{$this->fieldTestData->field_name} = $values;
+    $entity = $this->entitySaveReload($entity);
+    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $values, 'Field data saved');
+
+    // Update: Field is empty array. Data should be wiped.
+    $entity = clone($entity_init);
+    $entity->{$this->fieldTestData->field_name} = array();
+    $entity = $this->entitySaveReload($entity);
+    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Update: empty array removes existing values');
+  }
+
+  /**
+   * Test insert with empty or NULL fields, with default value.
+   */
+  function testFieldAttachSaveEmptyDataDefaultValue() {
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('', $entity_type);
+
+    // Add a default value function.
+    $this->fieldTestData->field->set('default_value_callback', 'field_test_default_value');
+    $this->fieldTestData->field->save();
+
+    // Verify that fields are populated with default values.
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 1, 'revision_id' => 1));
+    $default = field_test_default_value($entity_init, $this->fieldTestData->field);
+    $this->assertEqual($entity_init->{$this->fieldTestData->field_name}->getValue(), $default, 'Default field value correctly populated.');
+
+    // Insert: Field is NULL.
+    $entity = clone($entity_init);
+    $entity->{$this->fieldTestData->field_name} = NULL;
+    $entity->enforceIsNew();
+    $entity = $this->entitySaveReload($entity);
+    $this->assertTrue($entity->{$this->fieldTestData->field_name}->isEmpty(), 'Insert: NULL field results in no value saved');
+
+    // Verify that prepopulated field values are not overwritten by defaults.
+    $value = array(array('value' => $default[0]['value'] - mt_rand(1, 127)));
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('type' => $entity_init->bundle(), $this->fieldTestData->field_name => $value));
+    $this->assertEqual($entity->{$this->fieldTestData->field_name}->getValue(), $value, 'Prepopulated field value correctly maintained.');
+  }
+
+  /**
+   * Test entity deletion.
+   */
+  function testFieldAttachDelete() {
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('', $entity_type);
+    $cardinality = $this->fieldTestData->field_storage->getCardinality();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+    $vids = array();
+
+    // Create revision 0
+    $values = $this->_generateTestFieldValues($cardinality);
+    $entity->{$this->fieldTestData->field_name} = $values;
+    $entity->save();
+    $vids[] = $entity->getRevisionId();
+
+    // Create revision 1
+    $entity->setNewRevision();
+    $entity->save();
+    $vids[] = $entity->getRevisionId();
+
+    // Create revision 2
+    $entity->setNewRevision();
+    $entity->save();
+    $vids[] = $entity->getRevisionId();
+    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
+    $controller->resetCache();
+
+    // Confirm each revision loads
+    foreach ($vids as $vid) {
+      $revision = $controller->loadRevision($vid);
+      $this->assertEqual(count($revision->{$this->fieldTestData->field_name}), $cardinality, "The test entity revision $vid has $cardinality values.");
+    }
+
+    // Delete revision 1, confirm the other two still load.
+    $controller->deleteRevision($vids[1]);
+    $controller->resetCache();
+    foreach (array(0, 2) as $key) {
+      $vid = $vids[$key];
+      $revision = $controller->loadRevision($vid);
+      $this->assertEqual(count($revision->{$this->fieldTestData->field_name}), $cardinality, "The test entity revision $vid has $cardinality values.");
+    }
+
+    // Confirm the current revision still loads
+    $controller->resetCache();
+    $current = $controller->load($entity->id());
+    $this->assertEqual(count($current->{$this->fieldTestData->field_name}), $cardinality, "The test entity current revision has $cardinality values.");
+
+    // Delete all field data, confirm nothing loads
+    $entity->delete();
+    $controller->resetCache();
+    foreach (array(0, 1, 2) as $vid) {
+      $revision = $controller->loadRevision($vid);
+      $this->assertFalse($revision);
+    }
+    $this->assertFalse($controller->load($entity->id()));
+  }
+
+  /**
+   * Test entity_bundle_create().
+   */
+  function testEntityCreateBundle() {
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('', $entity_type);
+    $cardinality = $this->fieldTestData->field_storage->getCardinality();
+
+    // Create a new bundle.
+    $new_bundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
+    entity_test_create_bundle($new_bundle, NULL, $entity_type);
+
+    // Add a field to that bundle.
+    $this->fieldTestData->field_definition['bundle'] = $new_bundle;
+    FieldConfig::create($this->fieldTestData->field_definition)->save();
+
+    // Save an entity with data in the field.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+    $values = $this->_generateTestFieldValues($cardinality);
+    $entity->{$this->fieldTestData->field_name} = $values;
+
+    // Verify the field data is present on load.
+    $entity = $this->entitySaveReload($entity);
+    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), $cardinality, "Data is retrieved for the new bundle");
+  }
+
+  /**
+   * Test entity_bundle_delete().
+   */
+  function testEntityDeleteBundle() {
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('', $entity_type);
+
+    // Create a new bundle.
+    $new_bundle = 'test_bundle_' . Unicode::strtolower($this->randomMachineName());
+    entity_test_create_bundle($new_bundle, NULL, $entity_type);
+
+    // Add a field to that bundle.
+    $this->fieldTestData->field_definition['bundle'] = $new_bundle;
+    FieldConfig::create($this->fieldTestData->field_definition)->save();
+
+    // Create a second field for the test bundle
+    $field_name = Unicode::strtolower($this->randomMachineName() . '_field_name');
+    $field_storage = array(
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'type' => 'test_field',
+      'cardinality' => 1,
+    );
+    FieldStorageConfig::create($field_storage)->save();
+    $field = array(
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'bundle' => $this->fieldTestData->field->getTargetBundle(),
+      'label' => $this->randomMachineName() . '_label',
+      'description' => $this->randomMachineName() . '_description',
+      'weight' => mt_rand(0, 127),
+    );
+    FieldConfig::create($field)->save();
+
+    // Save an entity with data for both fields
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('type' => $this->fieldTestData->field->getTargetBundle()));
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage->getCardinality());
+    $entity->{$this->fieldTestData->field_name} = $values;
+    $entity->{$field_name} = $this->_generateTestFieldValues(1);
+    $entity = $this->entitySaveReload($entity);
+
+    // Verify the fields are present on load
+    $this->assertEqual(count($entity->{$this->fieldTestData->field_name}), 4, 'First field got loaded');
+    $this->assertEqual(count($entity->{$field_name}), 1, 'Second field got loaded');
+
+    // Delete the bundle.
+    entity_test_delete_bundle($this->fieldTestData->field->getTargetBundle(), $entity_type);
+
+    // Verify no data gets loaded
+    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
+    $controller->resetCache();
+    $entity= $controller->load($entity->id());
+
+    $this->assertTrue(empty($entity->{$this->fieldTestData->field_name}), 'No data for first field');
+    $this->assertTrue(empty($entity->{$field_name}), 'No data for second field');
+
+    // Verify that the fields are gone.
+    $this->assertFalse(FieldConfig::load('entity_test.' . $this->fieldTestData->field->getTargetBundle() . '.' . $this->fieldTestData->field_name), "First field is deleted");
+    $this->assertFalse(FieldConfig::load('entity_test.' . $field['bundle']. '.' . $field_name), "Second field is deleted");
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldCrudTest.php b/core/modules/field/tests/src/Kernel/FieldCrudTest.php
new file mode 100644
index 0000000..6dc35f4
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldCrudTest.php
@@ -0,0 +1,308 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldCrudTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Field\FieldException;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Create field entities by attaching fields to entities.
+ *
+ * @group field
+ */
+class FieldCrudTest extends FieldKernelTestBase {
+
+  /**
+   * The field storage entity.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field entity definition.
+   *
+   * @var array
+   */
+  protected $fieldStorageDefinition;
+
+  /**
+   * The field entity definition.
+   *
+   * @var array
+   */
+  protected $fieldDefinition;
+
+  function setUp() {
+    parent::setUp();
+
+    $this->fieldStorageDefinition = array(
+      'field_name' => Unicode::strtolower($this->randomMachineName()),
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    );
+    $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
+    $this->fieldStorage->save();
+    $this->fieldDefinition = array(
+      'field_name' => $this->fieldStorage->getName(),
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    );
+  }
+
+  // TODO : test creation with
+  // - a full fledged $field structure, check that all the values are there
+  // - a minimal $field structure, check all default values are set
+  // defer actual $field comparison to a helper function, used for the two cases above,
+  // and for testUpdateField
+
+  /**
+   * Test the creation of a field.
+   */
+  function testCreateField() {
+    // Set a state flag so that field_test.module knows to add an in-memory
+    // constraint for this field.
+    \Drupal::state()->set('field_test_add_constraint', $this->fieldStorage->getName());
+    /** @var \Drupal\Core\Field\FieldConfigInterface $field */
+    $field = FieldConfig::create($this->fieldDefinition);
+    $field->save();
+
+    $field = FieldConfig::load($field->id());
+    $this->assertTrue($field->getSetting('field_setting_from_config_data'));
+    $this->assertNull($field->getSetting('config_data_from_field_setting'));
+
+    // Read the configuration. Check against raw configuration data rather than
+    // the loaded ConfigEntity, to be sure we check that the defaults are
+    // applied on write.
+    $config = $this->config('field.field.' . $field->id())->get();
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+
+    $this->assertTrue($config['settings']['config_data_from_field_setting']);
+    $this->assertTrue(!isset($config['settings']['field_setting_from_config_data']));
+
+    // Since we are working with raw configuration, this needs to be unset
+    // manually.
+    // @see Drupal\field_test\Plugin\Field\FieldType\TestItem::fieldSettingsFromConfigData()
+    unset($config['settings']['config_data_from_field_setting']);
+
+    // Check that default values are set.
+    $this->assertEqual($config['required'], FALSE, 'Required defaults to false.');
+    $this->assertIdentical($config['label'], $this->fieldDefinition['field_name'], 'Label defaults to field name.');
+    $this->assertIdentical($config['description'], '', 'Description defaults to empty string.');
+
+    // Check that default settings are set.
+    $this->assertEqual($config['settings'], $field_type_manager->getDefaultFieldSettings($this->fieldStorageDefinition['type']) , 'Default field settings have been written.');
+
+    // Check that the denormalized 'field_type' was properly written.
+    $this->assertEqual($config['field_type'], $this->fieldStorageDefinition['type']);
+
+    // Test constraints are applied. A Range constraint is added dynamically to
+    // limit the field to values between 0 and 32.
+    // @see field_test_entity_bundle_field_info_alter()
+    $this->doFieldValidationTests();
+
+    // Test FieldConfigBase::setPropertyConstraints().
+    \Drupal::state()->set('field_test_set_constraint', $this->fieldStorage->getName());
+    \Drupal::state()->set('field_test_add_constraint', FALSE);
+    \Drupal::entityManager()->clearCachedFieldDefinitions();
+    $this->doFieldValidationTests();
+
+    // Guarantee that the field/bundle combination is unique.
+    try {
+      FieldConfig::create($this->fieldDefinition)->save();
+      $this->fail(t('Cannot create two fields with the same field / bundle combination.'));
+    }
+    catch (EntityStorageException $e) {
+      $this->pass(t('Cannot create two fields with the same field / bundle combination.'));
+    }
+
+    // Check that the specified field exists.
+    try {
+      $this->fieldDefinition['field_name'] = $this->randomMachineName();
+      FieldConfig::create($this->fieldDefinition)->save();
+      $this->fail(t('Cannot create a field with a non-existing storage.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field with a non-existing storage.'));
+    }
+
+    // TODO: test other failures.
+  }
+
+  /**
+   * Test creating a field with custom storage set.
+   */
+  public function testCreateFieldCustomStorage() {
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    \Drupal::state()->set('field_test_custom_storage', $field_name);
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'custom_storage' => TRUE,
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_name' => $field_storage->getName(),
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ]);
+    $field->save();
+
+    \Drupal::entityManager()->clearCachedFieldDefinitions();
+
+    // Check that no table has been created for the field.
+    $this->assertFalse(\Drupal::database()->schema()->tableExists('entity_test__' . $field_storage->getName()));
+
+    // Save an entity with a value in the custom storage field and verify no
+    // data is retrieved on load.
+    $entity = EntityTest::create(['name' => $this->randomString(), $field_name => 'Test value']);
+    $this->assertIdentical('Test value', $entity->{$field_name}->value, 'The test value is set on the field.');
+
+    $entity->save();
+    $entity = EntityTest::load($entity->id());
+
+    $this->assertNull($entity->{$field_name}->value, 'The loaded entity field value is NULL.');
+  }
+
+  /**
+   * Test reading back a field definition.
+   */
+  function testReadField() {
+    FieldConfig::create($this->fieldDefinition)->save();
+
+    // Read the field back.
+    $field = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
+    $this->assertTrue($this->fieldDefinition['field_name'] == $field->getName(), 'The field was properly read.');
+    $this->assertTrue($this->fieldDefinition['entity_type'] == $field->getTargetEntityTypeId(), 'The field was properly read.');
+    $this->assertTrue($this->fieldDefinition['bundle'] == $field->getTargetBundle(), 'The field was properly read.');
+  }
+
+  /**
+   * Test the update of a field.
+   */
+  function testUpdateField() {
+    FieldConfig::create($this->fieldDefinition)->save();
+
+    // Check that basic changes are saved.
+    $field = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
+    $field->setRequired(!$field->isRequired());
+    $field->setLabel($this->randomMachineName());
+    $field->set('description', $this->randomMachineName());
+    $field->setSetting('test_field_setting', $this->randomMachineName());
+    $field->save();
+
+    $field_new = FieldConfig::load('entity_test.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
+    $this->assertEqual($field->isRequired(), $field_new->isRequired(), '"required" change is saved');
+    $this->assertEqual($field->getLabel(), $field_new->getLabel(), '"label" change is saved');
+    $this->assertEqual($field->getDescription(), $field_new->getDescription(), '"description" change is saved');
+
+    // TODO: test failures.
+  }
+
+  /**
+   * Test the deletion of a field.
+   */
+  function testDeleteField() {
+    // TODO: Test deletion of the data stored in the field also.
+    // Need to check that data for a 'deleted' field / storage doesn't get loaded
+    // Need to check data marked deleted is cleaned on cron (not implemented yet...)
+
+    // Create two fields for the same field storage so we can test that only one
+    // is deleted.
+    FieldConfig::create($this->fieldDefinition)->save();
+    $another_field_definition = $this->fieldDefinition;
+    $another_field_definition['bundle'] .= '_another_bundle';
+    entity_test_create_bundle($another_field_definition['bundle']);
+    FieldConfig::create($another_field_definition)->save();
+
+    // Test that the first field is not deleted, and then delete it.
+    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
+    $this->assertTrue(!empty($field) && empty($field->deleted), 'A new field is not marked for deletion.');
+    $field->delete();
+
+    // Make sure the field is marked as deleted when it is specifically loaded.
+    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $this->fieldDefinition['field_name'], 'bundle' => $this->fieldDefinition['bundle'], 'include_deleted' => TRUE)));
+    $this->assertTrue($field->isDeleted(), 'A deleted field is marked for deletion.');
+
+    // Try to load the field normally and make sure it does not show up.
+    $field = FieldConfig::load('entity_test.' . '.' . $this->fieldDefinition['bundle'] . '.' . $this->fieldDefinition['field_name']);
+    $this->assertTrue(empty($field), 'A deleted field is not loaded by default.');
+
+    // Make sure the other field is not deleted.
+    $another_field = FieldConfig::load('entity_test.' . $another_field_definition['bundle'] . '.' . $another_field_definition['field_name']);
+    $this->assertTrue(!empty($another_field) && empty($another_field->deleted), 'A non-deleted field is not marked for deletion.');
+  }
+
+  /**
+   * Tests the cross deletion behavior between field storages and fields.
+   */
+  function testDeleteFieldCrossDeletion() {
+    $field_definition_2 = $this->fieldDefinition;
+    $field_definition_2['bundle'] .= '_another_bundle';
+    entity_test_create_bundle($field_definition_2['bundle']);
+
+    // Check that deletion of a field storage deletes its fields.
+    $field_storage = $this->fieldStorage;
+    FieldConfig::create($this->fieldDefinition)->save();
+    FieldConfig::create($field_definition_2)->save();
+    $field_storage->delete();
+    $this->assertFalse(FieldConfig::loadByName('entity_test', $this->fieldDefinition['bundle'], $field_storage->getName()));
+    $this->assertFalse(FieldConfig::loadByName('entity_test', $field_definition_2['bundle'], $field_storage->getName()));
+
+    // Check that deletion of the last field deletes the storage.
+    $field_storage = FieldStorageConfig::create($this->fieldStorageDefinition);
+    $field_storage->save();
+    $field = FieldConfig::create($this->fieldDefinition);
+    $field->save();
+    $field_2 = FieldConfig::create($field_definition_2);
+    $field_2->save();
+    $field->delete();
+    $this->assertTrue(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
+    $field_2->delete();
+    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
+
+    // Check that deletion of all fields using a storage simultaneously deletes
+    // the storage.
+    $field_storage = FieldStorageConfig::create($this->fieldStorageDefinition);
+    $field_storage->save();
+    $field = FieldConfig::create($this->fieldDefinition);
+    $field->save();
+    $field_2 = FieldConfig::create($field_definition_2);
+    $field_2->save();
+    $this->container->get('entity.manager')->getStorage('field_config')->delete(array($field, $field_2));
+    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
+  }
+
+  /**
+   * Tests configurable field validation.
+   *
+   * @see field_test_entity_bundle_field_info_alter()
+   */
+  protected function doFieldValidationTests() {
+    $entity = EntityTest::create();
+    $entity->set($this->fieldStorage->getName(), 1);
+    $violations = $entity->validate();
+    $this->assertEqual(count($violations), 0, 'No violations found when in-range value passed.');
+
+    $entity->set($this->fieldStorage->getName(), 33);
+    $violations = $entity->validate();
+    $this->assertEqual(count($violations), 1, 'Violations found when using value outside the range.');
+    $this->assertEqual($violations[0]->getPropertyPath(), $this->fieldStorage->getName() . '.0.value');
+    $this->assertEqual($violations[0]->getMessage(), t('This value should be %limit or less.', [
+      '%limit' => 32,
+    ]));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldDataCountTest.php b/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
new file mode 100644
index 0000000..5098bce
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldDataCountTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests counting field data records and the hasData() method on
+ * FieldStorageConfig entity.
+ *
+ * @group field
+ * @see \Drupal\Core\Entity\FieldableEntityStorageInterface::countFieldData()
+ * @see \Drupal\field\Entity\FieldStorageConfig::hasData()
+ */
+class FieldDataCountTest extends FieldKernelTestBase {
+
+  /**
+   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
+   */
+  protected $storageRev;
+
+  /**
+   * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface
+   */
+  protected $storageUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_rev');
+    $this->storage = \Drupal::entityManager()->getStorage('entity_test');
+    $this->storageRev = \Drupal::entityManager()->getStorage('entity_test_rev');
+    $this->storageUser = \Drupal::entityManager()->getStorage('user');
+  }
+
+  /**
+   * Tests entityCount() and hadData() methods.
+   */
+  public function testEntityCountAndHasData() {
+    // Create a field with a cardinality of 2 to show that we are counting
+    // entities and not rows in a table.
+    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_int',
+      'entity_type' => 'entity_test',
+      'type' => 'integer',
+      'cardinality' => 2,
+    ));
+    $field_storage->save();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ])->save();
+
+    $this->assertIdentical($field_storage->hasdata(), FALSE, 'There are no entities with field data.');
+    $this->assertIdentical($this->storage->countFieldData($field_storage), 0, 'There are 0 entities with field data.');
+
+    // Create 1 entity without the field.
+    $entity = EntityTest::create();
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $this->assertIdentical($field_storage->hasdata(), FALSE, 'There are no entities with field data.');
+    $this->assertIdentical($this->storage->countFieldData($field_storage), 0, 'There are 0 entities with field data.');
+
+    // Create 12 entities to ensure that the purging works as expected.
+    for ($i=0; $i < 12; $i++) {
+      $entity = EntityTest::create();
+      $entity->field_int[] = mt_rand(1, 99);
+      $entity->field_int[] = mt_rand(1, 99);
+      $entity->name[] = $this->randomMachineName();
+      $entity->save();
+    }
+
+    $storage = \Drupal::entityManager()->getStorage('entity_test');
+    if ($storage instanceof SqlContentEntityStorage) {
+      // Count the actual number of rows in the field table.
+      $table_mapping = $storage->getTableMapping();
+      $field_table_name = $table_mapping->getDedicatedDataTableName($field_storage);
+      $result = db_select($field_table_name, 't')
+        ->fields('t')
+        ->countQuery()
+        ->execute()
+        ->fetchField();
+      $this->assertEqual($result, 24, 'The field table has 24 rows.');
+    }
+
+    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with field data.');
+    $this->assertEqual($this->storage->countFieldData($field_storage), 12, 'There are 12 entities with field data.');
+
+    // Ensure the methods work on deleted fields.
+    $field_storage->delete();
+    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with deleted field data.');
+    $this->assertEqual($this->storage->countFieldData($field_storage), 12, 'There are 12 entities with deleted field data.');
+
+    field_purge_batch(6);
+    $this->assertIdentical($field_storage->hasdata(), TRUE, 'There are entities with deleted field data.');
+    $this->assertEqual($this->storage->countFieldData($field_storage), 6, 'There are 6 entities with deleted field data.');
+
+    $entity_type = 'entity_test_rev';
+    $this->createFieldWithStorage('_2', $entity_type);
+
+    $entity_init = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('type' => $entity_type,));
+    $cardinality = $this->fieldTestData->field_storage_2->getCardinality();
+
+    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), FALSE, 'There are no entities with field data.');
+    $this->assertIdentical($this->storageRev->countFieldData($this->fieldTestData->field_storage_2), 0, 'There are 0 entities with field data.');
+
+    // Create 1 entity with the field.
+    $entity = clone($entity_init);
+    $values = $this->_generateTestFieldValues($this->fieldTestData->field_storage_2->getCardinality());
+    $entity->{$this->fieldTestData->field_name_2} = $values;
+    $entity->setNewRevision();
+    $entity->save();
+    $first_revision = $entity->getRevisionId();
+
+    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), TRUE, 'There are entities with field data.');
+    $this->assertIdentical($this->storageRev->countFieldData($this->fieldTestData->field_storage_2), 1, 'There is 1 entity with field data.');
+
+    $entity->{$this->fieldTestData->field_name_2} = array();
+    $entity->setNewRevision();
+    $entity->save();
+
+    $this->assertIdentical($this->fieldTestData->field_storage_2->hasData(), TRUE, 'There are entities with field data.');
+
+    $storage =  $this->container->get('entity.manager')->getStorage($entity_type);
+    $entity = $storage->loadRevision($first_revision);
+    $this->assertEqual(count($entity->{$this->fieldTestData->field_name_2}), $cardinality, format_string('Revision %revision_id: expected number of values.', array('%revision_id' => $first_revision)));
+  }
+
+  /**
+   * Verify that we can count a table that contains an entry with index 0.
+   */
+  public function testCountWithIndex0() {
+    // Create a field that will require dedicated storage.
+    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_int',
+      'entity_type' => 'user',
+      'type' => 'integer',
+      'cardinality' => 2,
+    ));
+    $field_storage->save();
+    FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'user',
+    ))->save();
+
+    // Create an entry for the anonymous user, who has user ID 0.
+    $user = $this->storageUser
+      ->create(array(
+        'uid' => 0,
+        'name' => 'anonymous',
+        'mail' => NULL,
+        'status' => FALSE,
+        'field_int' => 42,
+      ));
+    $user->save();
+
+    // Test shared table storage.
+    $storage = $user->getFieldDefinition('name')->getFieldStorageDefinition();
+    $this->assertIdentical(TRUE, $this->storageUser->countFieldData($storage, TRUE));
+
+    // Test dedicated table storage.
+    $storage = $user->getFieldDefinition('field_int')->getFieldStorageDefinition();
+    $this->assertIdentical(TRUE, $this->storageUser->countFieldData($storage, TRUE));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php
new file mode 100644
index 0000000..ed889bd
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldDefinitionIntegrityTest.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldDefinitionIntegrityTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Extension\Extension;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the integrity of field API plugin definitions.
+ *
+ * @group field
+ */
+class FieldDefinitionIntegrityTest extends KernelTestBase {
+
+  /**
+   * @var array
+   */
+  public static $modules = ['system'];
+
+  /**
+   * Tests the integrity of field plugin definitions.
+   */
+  public function testFieldPluginDefinitionIntegrity() {
+
+    // Enable all core modules that provide field plugins.
+    $modules = system_rebuild_module_data();
+    $modules = array_filter($modules, function (Extension $module) {
+      // Filter contrib, hidden, already enabled modules and modules in the
+      // Testing package.
+      if ($module->origin === 'core'
+        && empty($module->info['hidden'])
+        && $module->status == FALSE
+        && $module->info['package'] !== 'Testing'
+        && is_readable($module->getPath() . '/src/Plugin/Field')) {
+        return TRUE;
+      }
+      return FALSE;
+    });
+    $this->enableModules(array_keys($modules));
+
+    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+
+    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
+    $field_formatter_manager = \Drupal::service('plugin.manager.field.formatter');
+
+    /** @var \Drupal\Component\Plugin\Discovery\DiscoveryInterface $field_type_manager */
+    $field_widget_manager = \Drupal::service('plugin.manager.field.widget');
+
+    // Load the IDs of all available field type plugins.
+    $available_field_type_ids = [];
+    foreach ($field_type_manager->getDefinitions() as $definition) {
+      $available_field_type_ids[] = $definition['id'];
+    }
+
+    // Load the IDs of all available field widget plugins.
+    $available_field_widget_ids = [];
+    foreach ($field_widget_manager->getDefinitions() as $definition) {
+      $available_field_widget_ids[] = $definition['id'];
+    }
+
+    // Load the IDs of all available field formatter plugins.
+    $available_field_formatter_ids = [];
+    foreach ($field_formatter_manager->getDefinitions() as $definition) {
+      $available_field_formatter_ids[] = $definition['id'];
+    }
+
+    // Test the field type plugins.
+    foreach ($field_type_manager->getDefinitions() as $definition) {
+      // Test default field widgets.
+      if (isset($definition['default_widget'])) {
+        if (in_array($definition['default_widget'], $available_field_widget_ids)) {
+          $this->pass(sprintf('Field type %s uses an existing field widget by default.', $definition['id']));
+        }
+        else {
+          $this->fail(sprintf('Field type %s uses a non-existent field widget by default: %s', $definition['id'], $definition['default_widget']));
+        }
+      }
+
+      // Test default field formatters.
+      if (isset($definition['default_formatter'])) {
+        if (in_array($definition['default_formatter'], $available_field_formatter_ids)) {
+          $this->pass(sprintf('Field type %s uses an existing field formatter by default.', $definition['id']));
+        }
+        else {
+          $this->fail(sprintf('Field type %s uses a non-existent field formatter by default: %s', $definition['id'], $definition['default_formatter']));
+        }
+      }
+    }
+
+    // Test the field widget plugins.
+    foreach ($field_widget_manager->getDefinitions() as $definition) {
+      $missing_field_type_ids = array_diff($definition['field_types'], $available_field_type_ids);
+      if ($missing_field_type_ids) {
+        $this->fail(sprintf('Field widget %s integrates with non-existent field types: %s', $definition['id'], implode(', ', $missing_field_type_ids)));
+      }
+      else {
+        $this->pass(sprintf('Field widget %s integrates with existing field types.', $definition['id']));
+      }
+    }
+
+    // Test the field formatter plugins.
+    foreach ($field_formatter_manager->getDefinitions() as $definition) {
+      $missing_field_type_ids = array_diff($definition['field_types'], $available_field_type_ids);
+      if ($missing_field_type_ids) {
+        $this->fail(sprintf('Field formatter %s integrates with non-existent field types: %s', $definition['id'], implode(', ', $missing_field_type_ids)));
+      }
+      else {
+        $this->pass(sprintf('Field formatter %s integrates with existing field types.', $definition['id']));
+      }
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php
new file mode 100644
index 0000000..e47b67d
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldImportChangeTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Update field storage and fields during config change method invocation.
+ *
+ * @group field
+ */
+class FieldImportChangeTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * The default configuration provided by field_test_config is imported by
+   * \Drupal\Tests\field\Kernel\FieldKernelTestBase::setUp() when it installs
+   * field configuration.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test_config');
+
+  /**
+   * Tests importing an updated field.
+   */
+  function testImportChange() {
+    $this->installConfig(['field_test_config']);
+    $field_storage_id = 'field_test_import';
+    $field_id = "entity_test.entity_test.$field_storage_id";
+    $field_config_name = "field.field.$field_id";
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+
+    // Save as files in the sync directory.
+    $field = $active->read($field_config_name);
+    $new_label = 'Test update import field';
+    $field['label'] = $new_label;
+    $sync->write($field_config_name, $field);
+
+    // Import the content of the sync directory.
+    $this->configImporter()->import();
+
+    // Check that the updated config was correctly imported.
+    $field = FieldConfig::load($field_id);
+    $this->assertEqual($field->getLabel(), $new_label, 'field label updated');
+  }
+}
+
diff --git a/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
new file mode 100644
index 0000000..98b1e25
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldImportCreateTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Create field storages and fields during config create method invocation.
+ *
+ * @group field
+ */
+class FieldImportCreateTest extends FieldKernelTestBase {
+
+  /**
+   * Tests creating field storages and fields during default config import.
+   */
+  function testImportCreateDefault() {
+    $field_name = 'field_test_import';
+    $field_storage_id = "entity_test.$field_name";
+    $field_id = "entity_test.entity_test.$field_name";
+    $field_name_2 = 'field_test_import_2';
+    $field_storage_id_2 = "entity_test.$field_name_2";
+    $field_id_2a = "entity_test.entity_test.$field_name_2";
+    $field_id_2b = "entity_test.test_bundle.$field_name_2";
+
+    // Check that the field storages and fields do not exist yet.
+    $this->assertFalse(FieldStorageConfig::load($field_storage_id));
+    $this->assertFalse(FieldConfig::load($field_id));
+    $this->assertFalse(FieldStorageConfig::load($field_storage_id_2));
+    $this->assertFalse(FieldConfig::load($field_id_2a));
+    $this->assertFalse(FieldConfig::load($field_id_2b));
+
+    // Create a second bundle for the 'Entity test' entity type.
+    entity_test_create_bundle('test_bundle');
+
+    // Enable field_test_config module and check that the field and storage
+    // shipped in the module's default config were created.
+    \Drupal::service('module_installer')->install(array('field_test_config'));
+
+    // A field storage with one single field.
+    $field_storage = FieldStorageConfig::load($field_storage_id);
+    $this->assertTrue($field_storage, 'The field was created.');
+    $field = FieldConfig::load($field_id);
+    $this->assertTrue($field, 'The field was deleted.');
+
+    // A field storage with two fields.
+    $field_storage_2 = FieldStorageConfig::load($field_storage_id_2);
+    $this->assertTrue($field_storage_2, 'The second field was created.');
+    $this->assertTrue($field->getTargetBundle(), 'test_bundle', 'The second field was created on bundle test_bundle.');
+    $this->assertTrue($field->getTargetBundle(), 'test_bundle_2', 'The second field was created on bundle test_bundle_2.');
+
+    // Tests fields.
+    $ids = \Drupal::entityQuery('field_config')
+      ->condition('entity_type', 'entity_test')
+      ->condition('bundle', 'entity_test')
+      ->execute();
+    $this->assertEqual(count($ids), 2);
+    $this->assertTrue(isset($ids['entity_test.entity_test.field_test_import']));
+    $this->assertTrue(isset($ids['entity_test.entity_test.field_test_import_2']));
+    $ids = \Drupal::entityQuery('field_config')
+      ->condition('entity_type', 'entity_test')
+      ->condition('bundle', 'test_bundle')
+      ->execute();
+    $this->assertEqual(count($ids), 1);
+    $this->assertTrue(isset($ids['entity_test.test_bundle.field_test_import_2']));
+  }
+
+  /**
+   * Tests creating field storages and fields during config import.
+   */
+  function testImportCreate() {
+    // A field storage with one single field.
+    $field_name = 'field_test_import_sync';
+    $field_storage_id = "entity_test.$field_name";
+    $field_id = "entity_test.entity_test.$field_name";
+    $field_storage_config_name = "field.storage.$field_storage_id";
+    $field_config_name = "field.field.$field_id";
+
+    // A field storage with two fields.
+    $field_name_2 = 'field_test_import_sync_2';
+    $field_storage_id_2 = "entity_test.$field_name_2";
+    $field_id_2a = "entity_test.test_bundle.$field_name_2";
+    $field_id_2b = "entity_test.test_bundle_2.$field_name_2";
+    $field_storage_config_name_2 = "field.storage.$field_storage_id_2";
+    $field_config_name_2a = "field.field.$field_id_2a";
+    $field_config_name_2b = "field.field.$field_id_2b";
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+
+    // Add the new files to the sync directory.
+    $src_dir = __DIR__ . '/../../modules/field_test_config/sync';
+    $target_dir = config_get_config_directory(CONFIG_SYNC_DIRECTORY);
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name.yml", "$target_dir/$field_storage_config_name.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name.yml", "$target_dir/$field_config_name.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name_2.yml", "$target_dir/$field_storage_config_name_2.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name_2a.yml", "$target_dir/$field_config_name_2a.yml"));
+    $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name_2b.yml", "$target_dir/$field_config_name_2b.yml"));
+
+    // Import the content of the sync directory.
+    $this->configImporter()->import();
+
+    // Check that the field and storage were created.
+    $field_storage = FieldStorageConfig::load($field_storage_id);
+    $this->assertTrue($field_storage, 'Test import storage field from sync exists');
+    $field = FieldConfig::load($field_id);
+    $this->assertTrue($field, 'Test import field  from sync exists');
+    $field_storage = FieldStorageConfig::load($field_storage_id_2);
+    $this->assertTrue($field_storage, 'Test import storage field 2 from sync exists');
+    $field = FieldConfig::load($field_id_2a);
+    $this->assertTrue($field, 'Test import field 2a from sync exists');
+    $field = FieldConfig::load($field_id_2b);
+    $this->assertTrue($field, 'Test import field 2b from sync exists');
+  }
+}
+
diff --git a/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
new file mode 100644
index 0000000..6b13207
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldImportDeleteTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Delete field storages and fields during config delete method invocation.
+ *
+ * @group field
+ */
+class FieldImportDeleteTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * The default configuration provided by field_test_config is imported by
+   * \Drupal\Tests\field\Kernel\FieldKernelTestBase::setUp() when it installs
+   * field configuration.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test_config');
+
+  /**
+   * Tests deleting field storages and fields as part of config import.
+   */
+  public function testImportDelete() {
+    $this->installConfig(['field_test_config']);
+    // At this point there are 5 field configuration objects in the active
+    // storage.
+    // - field.storage.entity_test.field_test_import
+    // - field.storage.entity_test.field_test_import_2
+    // - field.field.entity_test.entity_test.field_test_import
+    // - field.field.entity_test.entity_test.field_test_import_2
+    // - field.field.entity_test.test_bundle.field_test_import_2
+
+    $field_name = 'field_test_import';
+    $field_storage_id = "entity_test.$field_name";
+    $field_name_2 = 'field_test_import_2';
+    $field_storage_id_2 = "entity_test.$field_name_2";
+    $field_id = "entity_test.entity_test.$field_name";
+    $field_id_2a = "entity_test.entity_test.$field_name_2";
+    $field_id_2b = "entity_test.test_bundle.$field_name_2";
+    $field_storage_config_name = "field.storage.$field_storage_id";
+    $field_storage_config_name_2 = "field.storage.$field_storage_id_2";
+    $field_config_name = "field.field.$field_id";
+    $field_config_name_2a = "field.field.$field_id_2a";
+    $field_config_name_2b = "field.field.$field_id_2b";
+
+    // Create a second bundle for the 'Entity test' entity type.
+    entity_test_create_bundle('test_bundle');
+
+    // Get the uuid's for the field storages.
+    $field_storage_uuid = FieldStorageConfig::load($field_storage_id)->uuid();
+    $field_storage_uuid_2 = FieldStorageConfig::load($field_storage_id_2)->uuid();
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+    $this->assertTrue($sync->delete($field_storage_config_name), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name)));
+    $this->assertTrue($sync->delete($field_storage_config_name_2), SafeMarkup::format('Deleted field storage: @field_storage', array('@field_storage' => $field_storage_config_name_2)));
+    $this->assertTrue($sync->delete($field_config_name), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name)));
+    $this->assertTrue($sync->delete($field_config_name_2a), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2a)));
+    $this->assertTrue($sync->delete($field_config_name_2b), SafeMarkup::format('Deleted field: @field', array('@field' => $field_config_name_2b)));
+
+    $deletes = $this->configImporter()->getUnprocessedConfiguration('delete');
+    $this->assertEqual(count($deletes), 5, 'Importing configuration will delete 3 fields and 2 field storages.');
+
+    // Import the content of the sync directory.
+    $this->configImporter()->import();
+
+    // Check that the field storages and fields are gone.
+    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id));
+    $field_storage = FieldStorageConfig::load($field_storage_id);
+    $this->assertFalse($field_storage, 'The field storage was deleted.');
+    \Drupal::entityManager()->getStorage('field_storage_config')->resetCache(array($field_storage_id_2));
+    $field_storage_2 = FieldStorageConfig::load($field_storage_id_2);
+    $this->assertFalse($field_storage_2, 'The second field storage was deleted.');
+    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id));
+    $field = FieldConfig::load($field_id);
+    $this->assertFalse($field, 'The field was deleted.');
+    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2a));
+    $field_2a = FieldConfig::load($field_id_2a);
+    $this->assertFalse($field_2a, 'The second field on test bundle was deleted.');
+    \Drupal::entityManager()->getStorage('field_config')->resetCache(array($field_id_2b));
+    $field_2b = FieldConfig::load($field_id_2b);
+    $this->assertFalse($field_2b, 'The second field on test bundle 2 was deleted.');
+
+    // Check that all config files are gone.
+    $active = $this->container->get('config.storage');
+    $this->assertIdentical($active->listAll($field_storage_config_name), array());
+    $this->assertIdentical($active->listAll($field_storage_config_name_2), array());
+    $this->assertIdentical($active->listAll($field_config_name), array());
+    $this->assertIdentical($active->listAll($field_config_name_2a), array());
+    $this->assertIdentical($active->listAll($field_config_name_2b), array());
+
+    // Check that the storage definition is preserved in state.
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $this->assertTrue(isset($deleted_storages[$field_storage_uuid]));
+    $this->assertTrue(isset($deleted_storages[$field_storage_uuid_2]));
+
+    // Purge field data, and check that the storage definition has been
+    // completely removed once the data is purged.
+    field_purge_batch(10);
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $this->assertTrue(empty($deleted_storages), 'Fields are deleted');
+  }
+}
+
diff --git a/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
new file mode 100644
index 0000000..b1ba7a4
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldImportDeleteUninstallTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Delete field storages and fields during config synchronization and uninstall
+ * module that provides the field type.
+ *
+ * @group field
+ * @see \Drupal\field\ConfigImporterFieldPurger
+ * @see field_config_import_steps_alter()
+ */
+class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('telephone');
+
+  protected function setUp() {
+    parent::setUp();
+    // Module uninstall requires users_data tables.
+    // @see drupal_flush_all_caches()
+    // @see user_modules_uninstalled()
+    $this->installSchema('user', array('users_data'));
+  }
+
+  /**
+   * Tests deleting field storages and fields as part of config import.
+   */
+  public function testImportDeleteUninstall() {
+    // Create a field to delete to prove that
+    // \Drupal\field\ConfigImporterFieldPurger does not purge fields that are
+    // not related to the configuration synchronization.
+    $unrelated_field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_int',
+      'entity_type' => 'entity_test',
+      'type' => 'integer',
+    ));
+    $unrelated_field_storage->save();
+    FieldConfig::create([
+      'field_storage' => $unrelated_field_storage,
+      'bundle' => 'entity_test',
+    ])->save();
+
+    // Create a telephone field for validation.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test',
+      'type' => 'telephone',
+    ));
+    $field_storage->save();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ])->save();
+
+    $entity = EntityTest::create();
+    $value = '+0123456789';
+    $entity->field_test = $value;
+    $entity->field_int = '99';
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_test->value, $value);
+    $this->assertEqual($entity->field_test[0]->value, $value);
+    $this->assertEqual($entity->field_int->value, '99');
+
+    // Delete unrelated field before copying configuration and running the
+    // synchronization.
+    $unrelated_field_storage->delete();
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+
+    // Stage uninstall of the Telephone module.
+    $core_extension = $this->config('core.extension')->get();
+    unset($core_extension['module']['telephone']);
+    $sync->write('core.extension', $core_extension);
+
+    // Stage the field deletion
+    $sync->delete('field.storage.entity_test.field_test');
+    $sync->delete('field.field.entity_test.entity_test.field_test');
+
+    $steps = $this->configImporter()->initialize();
+    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
+
+    // This will purge all the data, delete the field and uninstall the
+    // Telephone module.
+    $this->configImporter()->import();
+
+    $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
+    $this->assertFalse(\Drupal::entityManager()->loadEntityByUuid('field_storage_config', $field_storage->uuid()), 'The test field has been deleted by the configuration synchronization');
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $this->assertFalse(isset($deleted_storages[$field_storage->uuid()]), 'Telephone field has been completed removed from the system.');
+    $this->assertTrue(isset($deleted_storages[$unrelated_field_storage->uuid()]), 'Unrelated field not purged by configuration synchronization.');
+  }
+
+  /**
+   * Tests purging already deleted field storages and fields during a config
+   * import.
+   */
+  public function testImportAlreadyDeletedUninstall() {
+    // Create a telephone field for validation.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test',
+      'type' => 'telephone',
+    ));
+    $field_storage->save();
+    $field_storage_uuid = $field_storage->uuid();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ])->save();
+
+    // Create 12 entities to ensure that the purging works as expected.
+    for ($i=0; $i < 12; $i++) {
+      $entity = EntityTest::create();
+      $value = '+0123456789';
+      $entity->field_test = $value;
+      $entity->name->value = $this->randomMachineName();
+      $entity->save();
+
+      // Verify entity has been created properly.
+      $id = $entity->id();
+      $entity = entity_load('entity_test', $id);
+      $this->assertEqual($entity->field_test->value, $value);
+    }
+
+    // Delete the field.
+    $field_storage->delete();
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+
+    // Stage uninstall of the Telephone module.
+    $core_extension = $this->config('core.extension')->get();
+    unset($core_extension['module']['telephone']);
+    $sync->write('core.extension', $core_extension);
+
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $this->assertTrue(isset($deleted_storages[$field_storage_uuid]), 'Field has been deleted and needs purging before configuration synchronization.');
+
+    $steps = $this->configImporter()->initialize();
+    $this->assertIdentical($steps[0], array('\Drupal\field\ConfigImporterFieldPurger', 'process'), 'The additional process configuration synchronization step has been added.');
+
+    // This will purge all the data, delete the field and uninstall the
+    // Telephone module.
+    $this->configImporter()->import();
+
+    $this->assertFalse(\Drupal::moduleHandler()->moduleExists('telephone'));
+    $deleted_storages = \Drupal::state()->get('field.storage.deleted') ?: array();
+    $this->assertFalse(isset($deleted_storages[$field_storage_uuid]), 'Field has been completed removed from the system.');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
new file mode 100644
index 0000000..0fc8cff
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldKernelTestBase.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Parent class for Field API unit tests.
+ */
+abstract class FieldKernelTestBase extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['user', 'system', 'field', 'text', 'entity_test', 'field_test'];
+
+  /**
+   * Bag of created field storages and fields.
+   *
+   * Allows easy access to test field storage/field names/IDs/objects via:
+   * - $this->fieldTestData->field_name[suffix]
+   * - $this->fieldTestData->field_storage[suffix]
+   * - $this->fieldTestData->field_storage_uuid[suffix]
+   * - $this->fieldTestData->field[suffix]
+   * - $this->fieldTestData->field_definition[suffix]
+   *
+   * @see \Drupal\field\Tests\FieldUnitTestBase::createFieldWithStorage()
+   *
+   * @var \ArrayObject
+   */
+  protected $fieldTestData;
+
+  /**
+   * Set the default field storage backend for fields created during tests.
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->fieldTestData = new \ArrayObject(array(), \ArrayObject::ARRAY_AS_PROPS);
+
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
+    $this->installSchema('system', ['sequences', 'key_value']);
+
+    // Set default storage backend and configure the theme system.
+    $this->installConfig(array('field', 'system'));
+
+    // Create user 1.
+    $storage = \Drupal::entityManager()->getStorage('user');
+    $storage
+      ->create(array(
+        'uid' => 1,
+        'name' => 'entity-test',
+        'mail' => 'entity@localhost',
+        'status' => TRUE,
+      ))
+      ->save();
+  }
+
+  /**
+   * Create a field and an associated field storage.
+   *
+   * @param string $suffix
+   *   (optional) A string that should only contain characters that are valid in
+   *   PHP variable names as well.
+   * @param string $entity_type
+   *   (optional) The entity type on which the field should be created.
+   *   Defaults to "entity_test".
+   * @param string $bundle
+   *   (optional) The entity type on which the field should be created.
+   *   Defaults to the default bundle of the entity type.
+   */
+  protected function createFieldWithStorage($suffix = '', $entity_type = 'entity_test', $bundle = NULL) {
+    if (empty($bundle)) {
+      $bundle = $entity_type;
+    }
+    $field_name = 'field_name' . $suffix;
+    $field_storage = 'field_storage' . $suffix;
+    $field_storage_uuid = 'field_storage_uuid' . $suffix;
+    $field = 'field' . $suffix;
+    $field_definition = 'field_definition' . $suffix;
+
+    $this->fieldTestData->$field_name = Unicode::strtolower($this->randomMachineName() . '_field_name' . $suffix);
+    $this->fieldTestData->$field_storage = FieldStorageConfig::create(array(
+      'field_name' => $this->fieldTestData->$field_name,
+      'entity_type' => $entity_type,
+      'type' => 'test_field',
+      'cardinality' => 4,
+    ));
+    $this->fieldTestData->$field_storage->save();
+    $this->fieldTestData->$field_storage_uuid = $this->fieldTestData->$field_storage->uuid();
+    $this->fieldTestData->$field_definition = array(
+      'field_storage' => $this->fieldTestData->$field_storage,
+      'bundle' => $bundle,
+      'label' => $this->randomMachineName() . '_label',
+      'description' => $this->randomMachineName() . '_description',
+      'settings' => array(
+        'test_field_setting' => $this->randomMachineName(),
+      ),
+    );
+    $this->fieldTestData->$field = FieldConfig::create($this->fieldTestData->$field_definition);
+    $this->fieldTestData->$field->save();
+
+    entity_get_form_display($entity_type, $bundle, 'default')
+      ->setComponent($this->fieldTestData->$field_name, array(
+        'type' => 'test_field_widget',
+        'settings' => array(
+          'test_widget_setting' => $this->randomMachineName(),
+        )
+      ))
+      ->save();
+  }
+
+  /**
+   * Saves and reloads an entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to save.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The entity, freshly reloaded from storage.
+   */
+  protected function entitySaveReload(EntityInterface $entity) {
+    $entity->save();
+    $controller = $this->container->get('entity.manager')->getStorage($entity->getEntityTypeId());
+    $controller->resetCache();
+    return $controller->load($entity->id());
+  }
+
+  /**
+   * Validate and save entity. Fail if violations are found.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity to save.
+   *
+   * @return void
+   */
+  protected function entityValidateAndSave(EntityInterface $entity) {
+    $violations = $entity->validate();
+    if ($violations->count()) {
+      $this->fail($violations);
+    }
+    else {
+      $entity->save();
+    }
+  }
+
+  /**
+   * Generate random values for a field_test field.
+   *
+   * @param $cardinality
+   *   Number of values to generate.
+   * @return
+   *  An array of random values, in the format expected for field values.
+   */
+  protected function _generateTestFieldValues($cardinality) {
+    $values = array();
+    for ($i = 0; $i < $cardinality; $i++) {
+      // field_test fields treat 0 as 'empty value'.
+      $values[$i]['value'] = mt_rand(1, 127);
+    }
+    return $values;
+  }
+
+  /**
+   * Assert that a field has the expected values in an entity.
+   *
+   * This function only checks a single column in the field values.
+   *
+   * @param EntityInterface $entity
+   *   The entity to test.
+   * @param $field_name
+   *   The name of the field to test
+   * @param $expected_values
+   *   The array of expected values.
+   * @param $langcode
+   *   (Optional) The language code for the values. Defaults to
+   *   \Drupal\Core\Language\LanguageInterface::LANGCODE_NOT_SPECIFIED.
+   * @param $column
+   *   (Optional) The name of the column to check. Defaults to 'value'.
+   */
+  protected function assertFieldValues(EntityInterface $entity, $field_name, $expected_values, $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED, $column = 'value') {
+    // Re-load the entity to make sure we have the latest changes.
+    \Drupal::entityManager()->getStorage($entity->getEntityTypeId())->resetCache(array($entity->id()));
+    $e = entity_load($entity->getEntityTypeId(), $entity->id());
+    $field = $values = $e->getTranslation($langcode)->$field_name;
+    // Filter out empty values so that they don't mess with the assertions.
+    $field->filterEmptyItems();
+    $values = $field->getValue();
+    $this->assertEqual(count($values), count($expected_values), 'Expected number of values were saved.');
+    foreach ($expected_values as $key => $value) {
+      $this->assertEqual($values[$key][$column], $value, format_string('Value @value was saved correctly.', array('@value' => $value)));
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
new file mode 100644
index 0000000..7558eb0
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php
@@ -0,0 +1,462 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldStorageCrudTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
+use Drupal\Core\Field\FieldException;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests field storage create, read, update, and delete.
+ *
+ * @group field
+ */
+class FieldStorageCrudTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array();
+
+  // TODO : test creation with
+  // - a full fledged $field structure, check that all the values are there
+  // - a minimal $field structure, check all default values are set
+  // defer actual $field comparison to a helper function, used for the two cases above
+
+  /**
+   * Test the creation of a field storage.
+   */
+  function testCreate() {
+    $field_storage_definition = array(
+      'field_name' => 'field_2',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    );
+    field_test_memorize();
+    $field_storage = FieldStorageConfig::create($field_storage_definition);
+    $field_storage->save();
+
+    $field_storage = FieldStorageConfig::load($field_storage->id());
+    $this->assertTrue($field_storage->getSetting('storage_setting_from_config_data'));
+    $this->assertNull($field_storage->getSetting('config_data_from_storage_setting'));
+
+    $mem = field_test_memorize();
+    $this->assertIdentical($mem['field_test_field_storage_config_create'][0][0]->getName(), $field_storage_definition['field_name'], 'hook_entity_create() called with correct arguments.');
+    $this->assertIdentical($mem['field_test_field_storage_config_create'][0][0]->getType(), $field_storage_definition['type'], 'hook_entity_create() called with correct arguments.');
+
+    // Read the configuration. Check against raw configuration data rather than
+    // the loaded ConfigEntity, to be sure we check that the defaults are
+    // applied on write.
+    $field_storage_config = $this->config('field.storage.' . $field_storage->id())->get();
+
+    $this->assertTrue($field_storage_config['settings']['config_data_from_storage_setting']);
+    $this->assertTrue(!isset($field_storage_config['settings']['storage_setting_from_config_data']));
+
+    // Since we are working with raw configuration, this needs to be unset
+    // manually.
+    // @see Drupal\field_test\Plugin\Field\FieldType\TestItem::storageSettingsFromConfigData()
+    unset($field_storage_config['settings']['config_data_from_storage_setting']);
+
+    // Ensure that basic properties are preserved.
+    $this->assertEqual($field_storage_config['field_name'], $field_storage_definition['field_name'], 'The field name is properly saved.');
+    $this->assertEqual($field_storage_config['entity_type'], $field_storage_definition['entity_type'], 'The field entity type is properly saved.');
+    $this->assertEqual($field_storage_config['id'], $field_storage_definition['entity_type'] . '.' . $field_storage_definition['field_name'], 'The field id is properly saved.');
+    $this->assertEqual($field_storage_config['type'], $field_storage_definition['type'], 'The field type is properly saved.');
+
+    // Ensure that cardinality defaults to 1.
+    $this->assertEqual($field_storage_config['cardinality'], 1, 'Cardinality defaults to 1.');
+
+    // Ensure that default settings are present.
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+    $this->assertEqual($field_storage_config['settings'], $field_type_manager->getDefaultStorageSettings($field_storage_definition['type']), 'Default storage settings have been written.');
+
+    // Guarantee that the name is unique.
+    try {
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create two fields with the same name.'));
+    }
+    catch (EntityStorageException $e) {
+      $this->pass(t('Cannot create two fields with the same name.'));
+    }
+
+    // Check that field type is required.
+    try {
+      $field_storage_definition = array(
+        'field_name' => 'field_1',
+        'entity_type' => 'entity_type',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create a field with no type.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field with no type.'));
+    }
+
+    // Check that field name is required.
+    try {
+      $field_storage_definition = array(
+        'type' => 'test_field',
+        'entity_type' => 'entity_test',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create an unnamed field.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create an unnamed field.'));
+    }
+    // Check that entity type is required.
+    try {
+      $field_storage_definition = array(
+        'field_name' => 'test_field',
+        'type' => 'test_field'
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail('Cannot create a field without an entity type.');
+    }
+    catch (FieldException $e) {
+      $this->pass('Cannot create a field without an entity type.');
+    }
+
+    // Check that field name must start with a letter or _.
+    try {
+      $field_storage_definition = array(
+        'field_name' => '2field_2',
+        'entity_type' => 'entity_test',
+        'type' => 'test_field',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create a field with a name starting with a digit.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field with a name starting with a digit.'));
+    }
+
+    // Check that field name must only contain lowercase alphanumeric or _.
+    try {
+      $field_storage_definition = array(
+        'field_name' => 'field#_3',
+        'entity_type' => 'entity_test',
+        'type' => 'test_field',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create a field with a name containing an illegal character.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field with a name containing an illegal character.'));
+    }
+
+    // Check that field name cannot be longer than 32 characters long.
+    try {
+      $field_storage_definition = array(
+        'field_name' => '_12345678901234567890123456789012',
+        'entity_type' => 'entity_test',
+        'type' => 'test_field',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create a field with a name longer than 32 characters.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field with a name longer than 32 characters.'));
+    }
+
+    // Check that field name can not be an entity key.
+    // "id" is known as an entity key from the "entity_test" type.
+    try {
+      $field_storage_definition = array(
+        'type' => 'test_field',
+        'field_name' => 'id',
+        'entity_type' => 'entity_test',
+      );
+      FieldStorageConfig::create($field_storage_definition)->save();
+      $this->fail(t('Cannot create a field bearing the name of an entity key.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot create a field bearing the name of an entity key.'));
+    }
+  }
+
+  /**
+   * Tests that an explicit schema can be provided on creation.
+   *
+   * This behavior is needed to allow field storage creation within updates,
+   * since plugin classes (and thus the field type schema) cannot be accessed.
+   */
+  function testCreateWithExplicitSchema() {
+    $schema = array(
+      'dummy' => 'foobar'
+    );
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_2',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'schema' => $schema,
+    ));
+    $this->assertEqual($field_storage->getSchema(), $schema);
+  }
+
+  /**
+   * Tests reading field storage definitions.
+   */
+  function testRead() {
+    $field_storage_definition = array(
+      'field_name' => 'field_1',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    );
+    $field_storage = FieldStorageConfig::create($field_storage_definition);
+    $field_storage->save();
+    $id = $field_storage->id();
+
+    // Check that 'single column' criteria works.
+    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name']));
+    $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
+
+    // Check that 'multi column' criteria works.
+    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => $field_storage_definition['type']));
+    $this->assertTrue(count($fields) == 1 && isset($fields[$id]), 'The field was properly read.');
+    $fields = entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'type' => 'foo'));
+    $this->assertTrue(empty($fields), 'No field was found.');
+
+    // Create a field from the field storage.
+    $field_definition = array(
+      'field_name' => $field_storage_definition['field_name'],
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    );
+    FieldConfig::create($field_definition)->save();
+  }
+
+  /**
+   * Test creation of indexes on data column.
+   */
+  function testIndexes() {
+    // Check that indexes specified by the field type are used by default.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_1',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    ));
+    $field_storage->save();
+    $field_storage = FieldStorageConfig::load($field_storage->id());
+    $schema = $field_storage->getSchema();
+    $expected_indexes = array('value' => array('value'));
+    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field type indexes saved by default');
+
+    // Check that indexes specified by the field definition override the field
+    // type indexes.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_2',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'indexes' => array(
+        'value' => array(),
+      ),
+    ));
+    $field_storage->save();
+    $field_storage = FieldStorageConfig::load($field_storage->id());
+    $schema = $field_storage->getSchema();
+    $expected_indexes = array('value' => array());
+    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes override field type indexes');
+
+    // Check that indexes specified by the field definition add to the field
+    // type indexes.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_3',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'indexes' => array(
+        'value_2' => array('value'),
+      ),
+    ));
+    $field_storage->save();
+    $id = $field_storage->id();
+    $field_storage = FieldStorageConfig::load($id);
+    $schema = $field_storage->getSchema();
+    $expected_indexes = array('value' => array('value'), 'value_2' => array('value'));
+    $this->assertEqual($schema['indexes'], $expected_indexes, 'Field definition indexes are merged with field type indexes');
+  }
+
+  /**
+   * Test the deletion of a field storage.
+   */
+  function testDelete() {
+    // TODO: Also test deletion of the data stored in the field ?
+
+    // Create two fields (so we can test that only one is deleted).
+    $field_storage_definition = array(
+      'field_name' => 'field_1',
+      'type' => 'test_field',
+      'entity_type' => 'entity_test',
+    );
+    FieldStorageConfig::create($field_storage_definition)->save();
+    $another_field_storage_definition = array(
+      'field_name' => 'field_2',
+      'type' => 'test_field',
+      'entity_type' => 'entity_test',
+    );
+    FieldStorageConfig::create($another_field_storage_definition)->save();
+
+    // Create fields for each.
+    $field_definition = array(
+      'field_name' => $field_storage_definition['field_name'],
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    );
+    FieldConfig::create($field_definition)->save();
+    $another_field_definition = $field_definition;
+    $another_field_definition['field_name'] = $another_field_storage_definition['field_name'];
+    FieldConfig::create($another_field_definition)->save();
+
+    // Test that the first field is not deleted, and then delete it.
+    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
+    $this->assertTrue(!empty($field_storage) && !$field_storage->isDeleted(), 'A new storage is not marked for deletion.');
+    FieldStorageConfig::loadByName('entity_test', $field_storage_definition['field_name'])->delete();
+
+    // Make sure that the field is marked as deleted when it is specifically
+    // loaded.
+    $field_storage = current(entity_load_multiple_by_properties('field_storage_config', array('field_name' => $field_storage_definition['field_name'], 'include_deleted' => TRUE)));
+    $this->assertTrue($field_storage->isDeleted(), 'A deleted storage is marked for deletion.');
+
+    // Make sure that this field is marked as deleted when it is
+    // specifically loaded.
+    $field = current(entity_load_multiple_by_properties('field_config', array('entity_type' => 'entity_test', 'field_name' => $field_definition['field_name'], 'bundle' => $field_definition['bundle'], 'include_deleted' => TRUE)));
+    $this->assertTrue($field->isDeleted(), 'A field whose storage was deleted is marked for deletion.');
+
+    // Try to load the storage normally and make sure it does not show up.
+    $field_storage = FieldStorageConfig::load('entity_test.' . $field_storage_definition['field_name']);
+    $this->assertTrue(empty($field_storage), 'A deleted storage is not loaded by default.');
+
+    // Try to load the field normally and make sure it does not show up.
+    $field = FieldConfig::load('entity_test.' . '.' . $field_definition['bundle'] . '.' . $field_definition['field_name']);
+    $this->assertTrue(empty($field), 'A field whose storage was deleted is not loaded by default.');
+
+    // Make sure the other field and its storage are not deleted.
+    $another_field_storage = FieldStorageConfig::load('entity_test.' . $another_field_storage_definition['field_name']);
+    $this->assertTrue(!empty($another_field_storage) && !$another_field_storage->isDeleted(), 'A non-deleted storage is not marked for deletion.');
+    $another_field = FieldConfig::load('entity_test.' . $another_field_definition['bundle'] . '.' . $another_field_definition['field_name']);
+    $this->assertTrue(!empty($another_field) && !$another_field->isDeleted(), 'A field whose storage was not deleted is not marked for deletion.');
+
+    // Try to create a new field the same name as a deleted field and
+    // write data into it.
+    FieldStorageConfig::create($field_storage_definition)->save();
+    FieldConfig::create($field_definition)->save();
+    $field_storage = FieldStorageConfig::load('entity_test.' . $field_storage_definition['field_name']);
+    $this->assertTrue(!empty($field_storage) && !$field_storage->isDeleted(), 'A new storage with a previously used name is created.');
+    $field = FieldConfig::load('entity_test.' . $field_definition['bundle'] . '.' . $field_definition['field_name'] );
+    $this->assertTrue(!empty($field) && !$field->isDeleted(), 'A new field for a previously used field name is created.');
+
+    // Save an entity with data for the field
+    $entity = EntityTest::create();
+    $values[0]['value'] = mt_rand(1, 127);
+    $entity->{$field_storage->getName()}->value = $values[0]['value'];
+    $entity = $this->entitySaveReload($entity);
+
+    // Verify the field is present on load
+    $this->assertIdentical(count($entity->{$field_storage->getName()}), count($values), "Data in previously deleted field saves and loads correctly");
+    foreach ($values as $delta => $value) {
+      $this->assertEqual($entity->{$field_storage->getName()}[$delta]->value, $values[$delta]['value'], "Data in previously deleted field saves and loads correctly");
+    }
+  }
+
+  function testUpdateFieldType() {
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_type',
+      'entity_type' => 'entity_test',
+      'type' => 'decimal',
+    ));
+    $field_storage->save();
+
+    try {
+      $field_storage->set('type', 'integer');
+      $field_storage->save();
+      $this->fail(t('Cannot update a field to a different type.'));
+    }
+    catch (FieldException $e) {
+      $this->pass(t('Cannot update a field to a different type.'));
+    }
+  }
+
+  /**
+   * Test updating a field storage.
+   */
+  function testUpdate() {
+    // Create a field with a defined cardinality, so that we can ensure it's
+    // respected. Since cardinality enforcement is consistent across database
+    // systems, it makes a good test case.
+    $cardinality = 4;
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_update',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'cardinality' => $cardinality,
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ]);
+    $field->save();
+
+    do {
+      $entity = EntityTest::create();
+      // Fill in the entity with more values than $cardinality.
+      for ($i = 0; $i < 20; $i++) {
+        // We can not use $i here because 0 values are filtered out.
+        $entity->field_update[] = $i + 1;
+      }
+      // Load back and assert there are $cardinality number of values.
+      $entity = $this->entitySaveReload($entity);
+      $this->assertEqual(count($entity->field_update), $field_storage->getCardinality());
+      // Now check the values themselves.
+      for ($delta = 0; $delta < $cardinality; $delta++) {
+        $this->assertEqual($entity->field_update[$delta]->value, $delta + 1);
+      }
+      // Increase $cardinality and set the field cardinality to the new value.
+      $field_storage->setCardinality(++$cardinality);
+      $field_storage->save();
+    } while ($cardinality < 6);
+  }
+
+  /**
+   * Test field type modules forbidding an update.
+   */
+  function testUpdateForbid() {
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'forbidden',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+      'settings' => array(
+        'changeable' => 0,
+        'unchangeable' => 0
+    )));
+    $field_storage->save();
+    $field_storage->setSetting('changeable', $field_storage->getSetting('changeable') + 1);
+    try {
+      $field_storage->save();
+      $this->pass(t("A changeable setting can be updated."));
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->fail(t("An unchangeable setting cannot be updated."));
+    }
+    $field_storage->setSetting('unchangeable', $field_storage->getSetting('unchangeable') + 1);
+    try {
+      $field_storage->save();
+      $this->fail(t("An unchangeable setting can be updated."));
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass(t("An unchangeable setting cannot be updated."));
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php b/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
new file mode 100644
index 0000000..4961f19
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldTypePluginManagerTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests the field type manager.
+ *
+ * @group field
+ */
+class FieldTypePluginManagerTest extends FieldKernelTestBase {
+
+  /**
+   * Tests the default settings convenience methods.
+   */
+  function testDefaultSettings() {
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
+      $definition = $field_type_manager->getDefinition($type);
+      $this->assertIdentical($field_type_manager->getDefaultStorageSettings($type), $definition['class']::defaultStorageSettings(), format_string("%type storage settings were returned", array('%type' => $type)));
+      $this->assertIdentical($field_type_manager->getDefaultFieldSettings($type), $definition['class']::defaultFieldSettings(), format_string(" %type field settings were returned", array('%type' => $type)));
+    }
+  }
+
+  /**
+   * Tests creation of field item instances.
+   */
+  public function testCreateInstance() {
+    /** @var \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager */
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+    foreach (array('test_field', 'shape', 'hidden_test_field') as $type) {
+      $definition = $field_type_manager->getDefinition($type);
+
+      $class = $definition['class'];
+      $field_name = 'field_' . $type;
+
+      $field_definition = BaseFieldDefinition::create($type);
+
+      $configuration = array(
+        'field_definition' => $field_definition,
+        'name' => $field_name,
+        'parent' => NULL,
+      );
+
+      $instance = $field_type_manager->createInstance($type, $configuration);
+
+      $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
+      $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
+    }
+  }
+
+  /**
+   * Tests creation of field item instances.
+   */
+  public function testCreateInstanceWithConfig() {
+    /** @var \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager */
+    $field_type_manager = \Drupal::service('plugin.manager.field.field_type');
+    $type = 'test_field';
+    $definition = $field_type_manager->getDefinition($type);
+
+    $class = $definition['class'];
+    $field_name = 'field_' . $type;
+
+    $field_definition = BaseFieldDefinition::create($type)
+      ->setLabel('Jenny')
+      ->setDefaultValue(8675309);
+
+    $configuration = array(
+      'field_definition' => $field_definition,
+      'name' => $field_name,
+      'parent' => NULL,
+    );
+
+    $entity = EntityTest::create();
+
+    $instance = $field_type_manager->createInstance($type, $configuration);
+
+    $this->assertTrue($instance instanceof $class, SafeMarkup::format('Created a @class instance', array('@class' => $class)));
+    $this->assertEqual($field_name, $instance->getName(), SafeMarkup::format('Instance name is @name', array('@name' => $field_name)));
+    $this->assertEqual($instance->getFieldDefinition()->getLabel(), 'Jenny', 'Instance label is Jenny');
+    $this->assertEqual($instance->getFieldDefinition()->getDefaultValue($entity), [['value' => 8675309]], 'Instance default_value is 8675309');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FieldValidationTest.php b/core/modules/field/tests/src/Kernel/FieldValidationTest.php
new file mode 100644
index 0000000..d3a5059
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FieldValidationTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FieldValidationTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+/**
+ * Tests field validation.
+ *
+ * @group field
+ */
+class FieldValidationTest extends FieldKernelTestBase {
+
+  /**
+   * @var string
+   */
+  private $entityType;
+
+  /**
+   * @var string
+   */
+  private $bundle;
+
+  /**
+   * @var \Drupal\Core\Entity\EntityInterface
+   */
+  private $entity;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a field and storage of type 'test_field', on the 'entity_test'
+    // entity type.
+    $this->entityType = 'entity_test';
+    $this->bundle = 'entity_test';
+    $this->createFieldWithStorage('', $this->entityType, $this->bundle);
+
+    // Create an 'entity_test' entity.
+    $this->entity = entity_create($this->entityType, array(
+      'type' => $this->bundle,
+    ));
+  }
+
+  /**
+   * Tests that the number of values is validated against the field cardinality.
+   */
+  function testCardinalityConstraint() {
+    $cardinality = $this->fieldTestData->field_storage->getCardinality();
+    $entity = $this->entity;
+
+    for ($delta = 0; $delta < $cardinality + 1; $delta++) {
+      $entity->{$this->fieldTestData->field_name}[] = array('value' => 1);
+    }
+
+    // Validate the field.
+    $violations = $entity->{$this->fieldTestData->field_name}->validate();
+
+    // Check that the expected constraint violations are reported.
+    $this->assertEqual(count($violations), 1);
+    $this->assertEqual($violations[0]->getPropertyPath(), '');
+    $this->assertEqual($violations[0]->getMessage(), t('%name: this field cannot hold more than @count values.', array('%name' => $this->fieldTestData->field->getLabel(), '@count' => $cardinality)));
+  }
+
+  /**
+   * Tests that constraints defined by the field type are validated.
+   */
+  function testFieldConstraints() {
+    $cardinality = $this->fieldTestData->field_storage->getCardinality();
+    $entity = $this->entity;
+
+    // The test is only valid if the field cardinality is greater than 2.
+    $this->assertTrue($cardinality >= 2);
+
+    // Set up values for the field.
+    $expected_violations = array();
+    for ($delta = 0; $delta < $cardinality; $delta++) {
+      // All deltas except '1' have incorrect values.
+      if ($delta == 1) {
+        $value = 1;
+      }
+      else {
+        $value = -1;
+        $expected_violations[$delta . '.value'][] = t('%name does not accept the value -1.', array('%name' => $this->fieldTestData->field->getLabel()));
+      }
+      $entity->{$this->fieldTestData->field_name}[] = $value;
+    }
+
+    // Validate the field.
+    $violations = $entity->{$this->fieldTestData->field_name}->validate();
+
+    // Check that the expected constraint violations are reported.
+    $violations_by_path = array();
+    foreach ($violations as $violation) {
+      $violations_by_path[$violation->getPropertyPath()][] = $violation->getMessage();
+    }
+    $this->assertEqual($violations_by_path, $expected_violations);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php b/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php
new file mode 100644
index 0000000..791689d
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\FormatterPluginManagerTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Tests the field formatter plugin manager.
+ *
+ * @group field
+ */
+class FormatterPluginManagerTest extends FieldKernelTestBase {
+
+  /**
+   * Tests that getInstance falls back on default if current is not applicable.
+   *
+   * @see \Drupal\field\Tests\WidgetPluginManagerTest::testNotApplicableFallback()
+   */
+  public function testNotApplicableFallback() {
+    /** @var \Drupal\Core\Field\FormatterPluginManager $formatter_plugin_manager */
+    $formatter_plugin_manager = \Drupal::service('plugin.manager.field.formatter');
+
+    $base_field_definition = BaseFieldDefinition::create('test_field')
+      // Set a name that will make isApplicable() return TRUE.
+      ->setName('field_test_field');
+
+    $formatter_options = array(
+      'field_definition' => $base_field_definition,
+      'view_mode' => 'default',
+      'configuration' => array(
+        'type' => 'field_test_applicable',
+      ),
+    );
+
+    $instance = $formatter_plugin_manager->getInstance($formatter_options);
+    $this->assertEqual($instance->getPluginId(), 'field_test_applicable');
+
+    // Now set name to something that makes isApplicable() return FALSE.
+    $base_field_definition->setName('deny_applicable');
+    $instance = $formatter_plugin_manager->getInstance($formatter_options);
+
+    // Instance should be default widget.
+    $this->assertNotEqual($instance->getPluginId(), 'field_test_applicable');
+    $this->assertEqual($instance->getPluginId(), 'field_test_default');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
new file mode 100644
index 0000000..9957da4
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldFormatterSettingsTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade field formatter settings to entity.display.*.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+  }
+
+  /**
+   * Test that migrated entity display settings can be loaded using D8 API's.
+   */
+  public function testEntityDisplaySettings() {
+    // Run tests.
+    $field_name = "field_test";
+    $expected = array(
+      'label' => 'above',
+      'weight' => 1,
+      'type' => 'text_trimmed',
+      'settings' => array('trim_length' => 600),
+      'third_party_settings' => array(),
+    );
+
+    // Can we load any entity display.
+    $display = EntityViewDisplay::load('node.story.teaser');
+    $this->assertIdentical($expected, $display->getComponent($field_name));
+
+    // Test migrate worked with multiple bundles.
+    $display = EntityViewDisplay::load('node.test_page.teaser');
+    $expected['weight'] = 35;
+    $this->assertIdentical($expected, $display->getComponent($field_name));
+
+    // Test RSS because that has been converted from 4 to rss.
+    $display = EntityViewDisplay::load('node.story.rss');
+    $expected['weight'] = 1;
+    $this->assertIdentical($expected, $display->getComponent($field_name));
+
+    // Test the default format with text_default which comes from a static map.
+    $expected['type'] = 'text_default';
+    $expected['settings'] = array();
+    $display = EntityViewDisplay::load('node.story.default');
+    $this->assertIdentical($expected, $display->getComponent($field_name));
+
+    // Check that we can migrate multiple fields.
+    $content = $display->get('content');
+    $this->assertTrue(isset($content['field_test']), 'Settings for field_test exist.');
+    $this->assertTrue(isset($content['field_test_two']), "Settings for field_test_two exist.");
+
+    // Check that we can migrate a field where exclude is not set.
+    $this->assertTrue(isset($content['field_test_exclude_unset']), "Settings for field_test_exclude_unset exist.");
+
+    // Test the number field formatter settings are correct.
+    $expected['weight'] = 1;
+    $expected['type'] = 'number_integer';
+    $expected['settings'] = array(
+      'thousand_separator' => ',',
+      'prefix_suffix' => TRUE,
+    );
+    $component = $display->getComponent('field_test_two');
+    $this->assertIdentical($expected, $component);
+    $expected['weight'] = 2;
+    $expected['type'] = 'number_decimal';
+    $expected['settings'] = array(
+       'scale' => 2,
+       'decimal_separator' => '.',
+       'thousand_separator' => ',',
+       'prefix_suffix' => TRUE,
+    );
+    $component = $display->getComponent('field_test_three');
+    $this->assertIdentical($expected, $component);
+
+    // Test the email field formatter settings are correct.
+    $expected['weight'] = 6;
+    $expected['type'] = 'email_mailto';
+    $expected['settings'] = array();
+    $component = $display->getComponent('field_test_email');
+    $this->assertIdentical($expected, $component);
+
+    // Test the link field formatter settings.
+    $expected['weight'] = 7;
+    $expected['type'] = 'link';
+    $expected['settings'] = array(
+      'trim_length' => 80,
+      'url_only' => TRUE,
+      'url_plain' => TRUE,
+      'rel' => '0',
+      'target' => '0',
+    );
+    $component = $display->getComponent('field_test_link');
+    $this->assertIdentical($expected, $component);
+    $expected['settings']['url_only'] = FALSE;
+    $expected['settings']['url_plain'] = FALSE;
+    $display = EntityViewDisplay::load('node.story.teaser');
+    $component = $display->getComponent('field_test_link');
+    $this->assertIdentical($expected, $component);
+
+    // Test the file field formatter settings.
+    $expected['weight'] = 8;
+    $expected['type'] = 'file_default';
+    $expected['settings'] = array();
+    $component = $display->getComponent('field_test_filefield');
+    $this->assertIdentical($expected, $component);
+    $display = EntityViewDisplay::load('node.story.default');
+    $expected['type'] = 'file_url_plain';
+    $component = $display->getComponent('field_test_filefield');
+    $this->assertIdentical($expected, $component);
+
+    // Test the image field formatter settings.
+    $expected['weight'] = 9;
+    $expected['type'] = 'image';
+    $expected['settings'] = array('image_style' => '', 'image_link' => '');
+    $component = $display->getComponent('field_test_imagefield');
+    $this->assertIdentical($expected, $component);
+    $display = EntityViewDisplay::load('node.story.teaser');
+    $expected['settings']['image_link'] = 'file';
+    $component = $display->getComponent('field_test_imagefield');
+    $this->assertIdentical($expected, $component);
+
+    // Test phone field.
+    $expected['weight'] = 13;
+    $expected['type'] = 'basic_string';
+    $expected['settings'] = array();
+    $component = $display->getComponent('field_test_phone');
+    $this->assertIdentical($expected, $component);
+
+    // Test date field.
+    $defaults = array('format_type' => 'fallback', 'timezone_override' => '',);
+    $expected['weight'] = 10;
+    $expected['type'] = 'datetime_default';
+    $expected['settings'] = array('format_type' => 'fallback') + $defaults;
+    $component = $display->getComponent('field_test_date');
+    $this->assertIdentical($expected, $component);
+    $display = EntityViewDisplay::load('node.story.default');
+    $expected['settings']['format_type'] = 'long';
+    $component = $display->getComponent('field_test_date');
+    $this->assertIdentical($expected, $component);
+
+    // Test date stamp field.
+    $expected['weight'] = 11;
+    $expected['settings']['format_type'] = 'fallback';
+    $component = $display->getComponent('field_test_datestamp');
+    $this->assertIdentical($expected, $component);
+    $display = EntityViewDisplay::load('node.story.teaser');
+    $expected['settings'] = array('format_type' => 'medium') + $defaults;
+    $component = $display->getComponent('field_test_datestamp');
+    $this->assertIdentical($expected, $component);
+
+    // Test datetime field.
+    $expected['weight'] = 12;
+    $expected['settings'] = array('format_type' => 'short') + $defaults;
+    $component = $display->getComponent('field_test_datetime');
+    $this->assertIdentical($expected, $component);
+    $display = EntityViewDisplay::load('node.story.default');
+    $expected['settings']['format_type'] = 'fallback';
+    $component = $display->getComponent('field_test_datetime');
+    $this->assertIdentical($expected, $component);
+
+    // Test a date field with a random format which should be mapped
+    // to datetime_default.
+    $display = EntityViewDisplay::load('node.story.rss');
+    $expected['settings']['format_type'] = 'fallback';
+    $component = $display->getComponent('field_test_datetime');
+    $this->assertIdentical($expected, $component);
+    // Test that our Id map has the correct data.
+    $this->assertIdentical(array('node', 'story', 'teaser', 'field_test'), $this->getMigration('d6_field_formatter_settings')->getIdMap()->lookupDestinationID(array('story', 'teaser', 'node', 'field_test')));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
new file mode 100644
index 0000000..dc910e1
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceTest.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\link\LinkItemInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Migrate field instances.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFieldInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * Tests migration of file variables to file.settings.yml.
+   */
+  public function testFieldInstanceMigration() {
+    $this->migrateFields();
+
+    $entity = Node::create(['type' => 'story']);
+    // Test a text field.
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    $field = FieldConfig::load('node.story.field_test');
+    $this->assertIdentical('Text Field', $field->label());
+    // field_test is a text_long field, which have no settings.
+    $this->assertIdentical([], $field->getSettings());
+    $this->assertIdentical('text for default value', $entity->field_test->value);
+
+    // Test a number field.
+    $field = FieldConfig::load('node.story.field_test_two');
+    $this->assertIdentical('Integer Field', $field->label());
+    $expected = array(
+      'min' => 10,
+      'max' => 100,
+      'prefix' => 'pref',
+      'suffix' => 'suf',
+      'unsigned' => FALSE,
+      'size' => 'normal',
+    );
+    $this->assertIdentical($expected, $field->getSettings());
+
+    $field = FieldConfig::load('node.story.field_test_four');
+    $this->assertIdentical('Float Field', $field->label());
+    $expected = array(
+      'min' => 100.0,
+      'max' => 200.0,
+      'prefix' => 'id-',
+      'suffix' => '',
+    );
+    $this->assertIdentical($expected, $field->getSettings());
+
+    // Test email field.
+    $field = FieldConfig::load('node.story.field_test_email');
+    $this->assertIdentical('Email Field', $field->label());
+    $this->assertIdentical('benjy@example.com', $entity->field_test_email->value);
+
+    // Test image field.
+    $field = FieldConfig::load('node.story.field_test_imagefield');
+    $this->assertIdentical('Image Field', $field->label());
+    $field_settings = $field->getSettings();
+    $this->assertIdentical('', $field_settings['max_resolution']);
+    $this->assertIdentical('', $field_settings['min_resolution']);
+    $this->assertIdentical('', $field_settings['file_directory']);
+    $this->assertIdentical('png gif jpg jpeg', $field_settings['file_extensions']);
+    $this->assertIdentical('public', $field_settings['uri_scheme']);
+
+    // Test a filefield.
+    $field = FieldConfig::load('node.story.field_test_filefield');
+    $this->assertIdentical('File Field', $field->label());
+    $expected = array(
+      'file_extensions' => 'txt pdf doc',
+      'file_directory' => 'images',
+      'description_field' => TRUE,
+      'max_filesize' => '200KB',
+      'target_type' => 'file',
+      'display_field' => FALSE,
+      'display_default' => FALSE,
+      'uri_scheme' => 'public',
+      'handler' => 'default:file',
+      'handler_settings' => array(),
+    );
+    $field_settings = $field->getSettings();
+    ksort($expected);
+    ksort($field_settings);
+    // This is the only way to compare arrays.
+    $this->assertIdentical($expected, $field_settings);
+
+    // Test a link field.
+    $field = FieldConfig::load('node.story.field_test_link');
+    $this->assertIdentical('Link Field', $field->label());
+    $expected = array('title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC);
+    $this->assertIdentical($expected, $field->getSettings());
+    $this->assertIdentical('default link title', $entity->field_test_link->title, 'Field field_test_link default title is correct.');
+    $this->assertIdentical('https://www.drupal.org', $entity->field_test_link->url, 'Field field_test_link default title is correct.');
+    $this->assertIdentical([], $entity->field_test_link->options['attributes']);
+  }
+
+  /**
+   * Tests migrating fields into non-existent content types.
+   */
+  public function testMigrateFieldIntoUnknownNodeType() {
+    $this->sourceDatabase->delete('node_type')
+      ->condition('type', 'test_planet')
+      ->execute();
+    // The field migrations use the migration plugin to ensure that the node
+    // types exist, so this should produce no failures...
+    $this->migrateFields();
+
+    // ...and the field instances should not have been migrated.
+    $this->assertNull(FieldConfig::load('node.test_planet.field_multivalue'));
+    $this->assertNull(FieldConfig::load('node.test_planet.field_test_text_single_checkbox'));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
new file mode 100644
index 0000000..49c3ea8
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate fields.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFieldTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_field');
+  }
+
+  /**
+   * Tests the Drupal 6 field to Drupal 8 migration.
+   */
+  public function testFields() {
+    // Text field.
+    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
+    $field_storage = FieldStorageConfig::load('node.field_test');
+    $this->assertIdentical('text_long', $field_storage->getType());
+    // text_long fields do not have settings.
+    $this->assertIdentical([], $field_storage->getSettings());
+
+    // Integer field.
+    $field_storage = FieldStorageConfig::load('node.field_test_two');
+    $this->assertIdentical("integer", $field_storage->getType(), t('Field type is @fieldtype. It should be integer.', array('@fieldtype' => $field_storage->getType())));
+
+    // Float field.
+    $field_storage = FieldStorageConfig::load('node.field_test_three');
+    $this->assertIdentical("decimal", $field_storage->getType(), t('Field type is @fieldtype. It should be decimal.', array('@fieldtype' => $field_storage->getType())));
+
+    // Link field.
+    $field_storage = FieldStorageConfig::load('node.field_test_link');
+    $this->assertIdentical("link", $field_storage->getType(), t('Field type is @fieldtype. It should be link.', array('@fieldtype' => $field_storage->getType())));
+
+    // File field.
+    $field_storage = FieldStorageConfig::load('node.field_test_filefield');
+    $this->assertIdentical("file", $field_storage->getType(), t('Field type is @fieldtype. It should be file.', array('@fieldtype' => $field_storage->getType())));
+
+    $field_storage = FieldStorageConfig::load('node.field_test_imagefield');
+    $this->assertIdentical("image", $field_storage->getType(), t('Field type is @fieldtype. It should be image.', array('@fieldtype' => $field_storage->getType())));
+    $settings = $field_storage->getSettings();
+    $this->assertIdentical('file', $settings['target_type']);
+    $this->assertIdentical('public', $settings['uri_scheme']);
+    $this->assertIdentical(array(), array_filter($settings['default_image']));
+
+    // Phone field.
+    $field_storage = FieldStorageConfig::load('node.field_test_phone');
+    $this->assertIdentical("telephone", $field_storage->getType(), t('Field type is @fieldtype. It should be telephone.', array('@fieldtype' => $field_storage->getType())));
+
+    // Date field.
+    $field_storage = FieldStorageConfig::load('node.field_test_datetime');
+    $this->assertIdentical("datetime", $field_storage->getType(), t('Field type is @fieldtype. It should be datetime.', array('@fieldtype' => $field_storage->getType())));
+
+    // Decimal field with radio buttons.
+    $field_storage = FieldStorageConfig::load('node.field_test_decimal_radio_buttons');
+    $this->assertIdentical("list_float", $field_storage->getType(), t('Field type is @fieldtype. It should be list_float.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['1.2'], t('First allowed value key is set to 1.2'));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value key is set to 2.1'));
+    $this->assertIdentical('1.2', $field_storage->getSetting('allowed_values')['1.2'], t('First allowed value is set to 1.2'));
+    $this->assertIdentical('2.1', $field_storage->getSetting('allowed_values')['2.1'], t('Second allowed value is set to 1.2'));
+
+    // Float field with a single checkbox.
+    $field_storage = FieldStorageConfig::load('node.field_test_float_single_checkbox');
+    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
+
+    // Integer field with a select list.
+    $field_storage = FieldStorageConfig::load('node.field_test_integer_selectlist');
+    $this->assertIdentical("list_integer", $field_storage->getType(), t('Field type is @fieldtype. It should be list_integer.', array('@fieldtype' => $field_storage->getType())));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['1234'], t('First allowed value key is set to 1234'));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['2341'], t('Second allowed value key is set to 2341'));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['3412'], t('Third allowed value key is set to 3412'));
+    $this->assertNotNull($field_storage->getSetting('allowed_values')['4123'], t('Fourth allowed value key is set to 4123'));
+    $this->assertIdentical('1234', $field_storage->getSetting('allowed_values')['1234'], t('First allowed value is set to 1234'));
+    $this->assertIdentical('2341', $field_storage->getSetting('allowed_values')['2341'], t('Second allowed value is set to 2341'));
+    $this->assertIdentical('3412', $field_storage->getSetting('allowed_values')['3412'], t('Third allowed value is set to 3412'));
+    $this->assertIdentical('4123', $field_storage->getSetting('allowed_values')['4123'], t('Fourth allowed value is set to 4123'));
+
+    // Text field with a single checkbox.
+    $field_storage = FieldStorageConfig::load('node.field_test_text_single_checkbox');
+    $this->assertIdentical("boolean", $field_storage->getType(), t('Field type is @fieldtype. It should be boolean.', array('@fieldtype' => $field_storage->getType())));
+
+    // Validate that the source count and processed count match up.
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('d6_field');
+    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
+
+    // Check that we've reported on a conflict in widget_types.
+    $messages = [];
+    foreach ($migration->getIdMap()->getMessageIterator() as $message_row) {
+      $messages[] = $message_row->message;
+    }
+    $this->assertIdentical(count($messages), 1);
+    $this->assertIdentical($messages[0], 'Widget types optionwidgets_onoff, text_textfield are used in Drupal 6 field instances: widget type optionwidgets_onoff applied to the Drupal 8 base field');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
new file mode 100644
index 0000000..5c37d64
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d6\MigrateFieldWidgetSettingsTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate field widget settings.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFieldWidgetSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+  }
+
+  /**
+   * Test that migrated view modes can be loaded using D8 API's.
+   */
+  public function testWidgetSettings() {
+    // Test the config can be loaded.
+    $form_display = EntityFormDisplay::load('node.story.default');
+    $this->assertIdentical(FALSE, is_null($form_display), "Form display node.story.default loaded with config.");
+
+    // Text field.
+    $component = $form_display->getComponent('field_test');
+    $expected = array('weight' => 1, 'type' => 'text_textfield');
+    $expected['settings'] = array('size' => 60, 'placeholder' => '');
+    $expected['third_party_settings'] = array();
+    $this->assertIdentical($expected, $component, 'Text field settings are correct.');
+
+    // Integer field.
+    $component = $form_display->getComponent('field_test_two');
+    $expected['type'] = 'number';
+    $expected['weight'] = 1;
+    $expected['settings'] = array('placeholder' => '');
+    $this->assertIdentical($expected, $component);
+
+    // Float field.
+    $component = $form_display->getComponent('field_test_three');
+    $expected['weight'] = 2;
+    $this->assertIdentical($expected, $component);
+
+    // Email field.
+    $component = $form_display->getComponent('field_test_email');
+    $expected['type'] = 'email_default';
+    $expected['weight'] = 6;
+    $expected['settings'] = array('placeholder' => '', 'size' => 60);
+    $this->assertIdentical($expected, $component);
+
+    // Link field.
+    $component = $form_display->getComponent('field_test_link');
+    $this->assertIdentical('link_default', $component['type']);
+    $this->assertIdentical(7, $component['weight']);
+    $this->assertFalse(array_filter($component['settings']));
+
+    // File field.
+    $component = $form_display->getComponent('field_test_filefield');
+    $expected['type'] = 'file_generic';
+    $expected['weight'] = 8;
+    $expected['settings'] = array('progress_indicator' => 'bar');
+    $this->assertIdentical($expected, $component);
+
+    // Image field.
+    $component = $form_display->getComponent('field_test_imagefield');
+    $expected['type'] = 'image_image';
+    $expected['weight'] = 9;
+    $expected['settings'] = array('progress_indicator' => 'bar', 'preview_image_style' => 'thumbnail');
+    $this->assertIdentical($expected, $component);
+
+    // Phone field.
+    $component = $form_display->getComponent('field_test_phone');
+    $expected['type'] = 'telephone_default';
+    $expected['weight'] = 13;
+    $expected['settings'] = array('placeholder' => '');
+    $this->assertIdentical($expected, $component);
+
+    // Date fields.
+    $component = $form_display->getComponent('field_test_date');
+    $expected['type'] = 'datetime_default';
+    $expected['weight'] = 10;
+    $expected['settings'] = array();
+    $this->assertIdentical($expected, $component);
+
+    $component = $form_display->getComponent('field_test_datestamp');
+    $expected['weight'] = 11;
+    $this->assertIdentical($expected, $component);
+
+    $component = $form_display->getComponent('field_test_datetime');
+    $expected['weight'] = 12;
+    $this->assertIdentical($expected, $component);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
new file mode 100644
index 0000000..4f3147c
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -0,0 +1,288 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldFormatterSettingsTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Tests migration of D7 field formatter settings.
+ *
+ * @group field
+ */
+class MigrateFieldFormatterSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = [
+    'comment',
+    'datetime',
+    'file',
+    'image',
+    'link',
+    'node',
+    'taxonomy',
+    'telephone',
+    'text',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('taxonomy_term');
+
+    CommentType::create([
+      'id' => 'comment_node_page',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    CommentType::create([
+      'id' => 'comment_node_article',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    CommentType::create([
+      'id' => 'comment_node_blog',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    CommentType::create([
+      'id' => 'comment_node_book',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    CommentType::create([
+      'id' => 'comment_node_forum',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    CommentType::create([
+      'id' => 'comment_node_test_content_type',
+      'label' => $this->randomMachineName(),
+    ])->save();
+
+    NodeType::create([
+      'type' => 'page',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    NodeType::create([
+      'type' => 'article',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    NodeType::create([
+      'type' => 'blog',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    NodeType::create([
+      'type' => 'book',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    NodeType::create([
+      'type' => 'forum',
+      'label' => $this->randomMachineName(),
+    ])->save();
+    NodeType::create([
+      'type' => 'test_content_type',
+      'label' => $this->randomMachineName(),
+    ])->save();
+
+    // Give one unfortunate field instance invalid display settings to ensure
+    // that the migration provides an empty array as a default (thus avoiding
+    // an "unsupported operand types" fatal).
+    Database::getConnection('default', 'migrate')
+      ->update('field_config_instance')
+      ->fields(array(
+        'data' => serialize(array (
+          'label' => 'Body',
+          'widget' =>
+            array (
+              'type' => 'text_textarea_with_summary',
+              'settings' =>
+                array (
+                  'rows' => 20,
+                  'summary_rows' => 5,
+                ),
+              'weight' => -4,
+              'module' => 'text',
+            ),
+          'settings' =>
+            array (
+              'display_summary' => true,
+              'text_processing' => 1,
+              'user_register_form' => false,
+            ),
+          'display' =>
+            array (
+              'default' =>
+                array (
+                  'label' => 'hidden',
+                  'type' => 'text_default',
+                  'settings' =>
+                    array (
+                    ),
+                  'module' => 'text',
+                  'weight' => 0,
+                ),
+              'teaser' =>
+                array (
+                  'label' => 'hidden',
+                  'type' => 'text_summary_or_trimmed',
+                  // settings is always expected to be an array. Making it NULL
+                  // causes a fatal.
+                  'settings' => NULL,
+                  'module' => 'text',
+                  'weight' => 0,
+                ),
+            ),
+          'required' => false,
+          'description' => '',
+        )),
+      ))
+      ->condition('entity_type', 'node')
+      ->condition('bundle', 'article')
+      ->condition('field_name', 'body')
+      ->execute();
+
+    $this->executeMigrations([
+      'd7_field',
+      'd7_field_instance',
+      'd7_view_modes',
+      'd7_field_formatter_settings',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a view display.
+   *
+   * @param string $id
+   *   The view display ID.
+   */
+  protected function assertEntity($id) {
+    $display = EntityViewDisplay::load($id);
+    $this->assertTrue($display instanceof EntityViewDisplayInterface);
+  }
+
+  /**
+   * Asserts various aspects of a particular component of a view display.
+   *
+   * @param string $display_id
+   *   The view display ID.
+   * @param string $component_id
+   *   The component ID.
+   * @param string $type
+   *   The expected component type (formatter plugin ID).
+   * @param string $label
+   *   The expected label of the component.
+   * @param int $weight
+   *   The expected weight of the component.
+   */
+  protected function assertComponent($display_id, $component_id, $type, $label, $weight) {
+    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
+    $this->assertTrue(is_array($component));
+    $this->assertIdentical($type, $component['type']);
+    $this->assertIdentical($label, $component['label']);
+    $this->assertIdentical($weight, $component['weight']);
+  }
+
+  /**
+   * Asserts that a particular component is NOT included in a display.
+   *
+   * @param string $display_id
+   *   The display ID.
+   * @param string $component_id
+   *   The component ID.
+   */
+  protected function assertComponentNotExists($display_id, $component_id) {
+    $component = EntityViewDisplay::load($display_id)->getComponent($component_id);
+    $this->assertTrue(is_null($component));
+  }
+
+  /**
+   * Tests migration of D7 field formatter settings.
+   */
+  public function testMigration() {
+    $this->assertEntity('comment.comment_node_article.default');
+    $this->assertComponent('comment.comment_node_article.default', 'comment_body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('comment.comment_node_blog.default');
+    $this->assertComponent('comment.comment_node_blog.default', 'comment_body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('comment.comment_node_book.default');
+    $this->assertComponent('comment.comment_node_book.default', 'comment_body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('comment.comment_node_forum.default');
+    $this->assertComponent('comment.comment_node_forum.default', 'comment_body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('comment.comment_node_page.default');
+    $this->assertComponent('comment.comment_node_page.default', 'comment_body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('comment.comment_node_test_content_type.default');
+    $this->assertComponent('comment.comment_node_test_content_type.default', 'comment_body', 'text_default', 'hidden', 0);
+    $this->assertComponent('comment.comment_node_test_content_type.default', 'field_integer', 'number_integer', 'above', 1);
+
+    $this->assertEntity('node.article.default');
+    $this->assertComponent('node.article.default', 'body', 'text_default', 'hidden', 0);
+    $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_label', 'above', 10);
+    $this->assertComponent('node.article.default', 'field_image', 'image', 'hidden', -1);
+
+    $this->assertEntity('node.article.teaser');
+    $this->assertComponent('node.article.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
+    $this->assertComponent('node.article.teaser', 'field_tags', 'entity_reference_label', 'above', 10);
+    $this->assertComponent('node.article.teaser', 'field_image', 'image', 'hidden', -1);
+
+    $this->assertEntity('node.blog.default');
+    $this->assertComponent('node.blog.default', 'body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('node.blog.teaser');
+    $this->assertComponent('node.blog.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
+
+    $this->assertEntity('node.book.default');
+    $this->assertComponent('node.book.default', 'body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('node.book.teaser');
+    $this->assertComponent('node.book.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
+
+    $this->assertEntity('node.forum.default');
+    $this->assertComponent('node.forum.default', 'body', 'text_default', 'hidden', 11);
+    $this->assertComponent('node.forum.default', 'taxonomy_forums', 'entity_reference_label', 'above', 10);
+
+    $this->assertEntity('node.forum.teaser');
+    $this->assertComponent('node.forum.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 11);
+    $this->assertComponent('node.forum.teaser', 'taxonomy_forums', 'entity_reference_label', 'above', 10);
+
+    $this->assertEntity('node.page.default');
+    $this->assertComponent('node.page.default', 'body', 'text_default', 'hidden', 0);
+
+    $this->assertEntity('node.page.teaser');
+    $this->assertComponent('node.page.teaser', 'body', 'text_summary_or_trimmed', 'hidden', 0);
+
+    $this->assertEntity('node.test_content_type.default');
+    $this->assertComponent('node.test_content_type.default', 'field_boolean', 'list_default', 'above', 0);
+    $this->assertComponent('node.test_content_type.default', 'field_email', 'email_mailto', 'above', 1);
+    // Phone formatters are not mapped and should default to basic_string.
+    $this->assertComponent('node.test_content_type.default', 'field_phone', 'basic_string', 'above', 2);
+    $this->assertComponent('node.test_content_type.default', 'field_date', 'datetime_default', 'above', 3);
+    $this->assertComponent('node.test_content_type.default', 'field_date_with_end_time', 'datetime_default', 'above', 4);
+    $this->assertComponent('node.test_content_type.default', 'field_file', 'file_default', 'above', 5);
+    $this->assertComponent('node.test_content_type.default', 'field_float', 'number_decimal', 'above', 6);
+    $this->assertComponent('node.test_content_type.default', 'field_images', 'image', 'above', 7);
+    $this->assertComponent('node.test_content_type.default', 'field_integer', 'number_integer', 'above', 8);
+    $this->assertComponent('node.test_content_type.default', 'field_link', 'link', 'above', 9);
+    $this->assertComponent('node.test_content_type.default', 'field_text_list', 'list_default', 'above', 10);
+    $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'list_default', 'above', 11);
+    $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_default', 'above', 12);
+    $this->assertComponentNotExists('node.test_content_type.default', 'field_term_reference');
+    $this->assertComponentNotExists('node.test_content_type.default', 'field_text');
+
+    $this->assertEntity('user.user.default');
+    $this->assertComponent('user.user.default', 'field_file', 'file_default', 'above', 0);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
new file mode 100644
index 0000000..e8377d8
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
+
+use Drupal\comment\Entity\CommentType;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\FieldConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Migrates Drupal 7 field instances.
+ *
+ * @group field
+ */
+class MigrateFieldInstanceTest extends MigrateDrupal7TestBase {
+
+  /**
+   * The modules to be enabled during the test.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'comment',
+    'datetime',
+    'file',
+    'image',
+    'link',
+    'node',
+    'system',
+    'taxonomy',
+    'telephone',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->createType('page');
+    $this->createType('article');
+    $this->createType('blog');
+    $this->createType('book');
+    $this->createType('forum');
+    $this->createType('test_content_type');
+    $this->executeMigrations(['d7_field', 'd7_field_instance']);
+  }
+
+  /**
+   * Creates a node type with a corresponding comment type.
+   *
+   * @param string $id
+   *   The node type ID.
+   */
+  protected function createType($id) {
+    NodeType::create(array(
+      'type' => $id,
+      'label' => $this->randomString(),
+    ))->save();
+
+    CommentType::create(array(
+      'id' => 'comment_node_' . $id,
+      'label' => $this->randomString(),
+      'target_entity_type_id' => 'node',
+    ))->save();
+  }
+
+  /**
+   * Asserts various aspects of a field config entity.
+   *
+   * @param string $id
+   *   The entity ID in the form ENTITY_TYPE.BUNDLE.FIELD_NAME.
+   * @param string $expected_label
+   *   The expected field label.
+   * @param string $expected_field_type
+   *   The expected field type.
+   * @param boolean $is_required
+   *   Whether or not the field is required.
+   */
+  protected function assertEntity($id, $expected_label, $expected_field_type, $is_required) {
+    list ($expected_entity_type, $expected_bundle, $expected_name) = explode('.', $id);
+
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    $field = FieldConfig::load($id);
+    $this->assertTrue($field instanceof FieldConfigInterface);
+    $this->assertIdentical($expected_label, $field->label());
+    $this->assertIdentical($expected_field_type, $field->getType());
+    $this->assertIdentical($expected_entity_type, $field->getTargetEntityTypeId());
+    $this->assertIdentical($expected_bundle, $field->getTargetBundle());
+    $this->assertIdentical($expected_name, $field->getName());
+    $this->assertEqual($is_required, $field->isRequired());
+    $this->assertIdentical($expected_entity_type . '.' . $expected_name, $field->getFieldStorageDefinition()->id());
+  }
+
+  /**
+   * Tests migrating D7 field instances to field_config entities.
+   */
+  public function testFieldInstances() {
+    $this->assertEntity('comment.comment_node_page.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.page.body', 'Body', 'text_with_summary', FALSE);
+    $this->assertEntity('comment.comment_node_article.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.article.body', 'Body', 'text_with_summary', FALSE);
+    $this->assertEntity('node.article.field_tags', 'Tags', 'entity_reference', FALSE);
+    $this->assertEntity('node.article.field_image', 'Image', 'image', FALSE);
+    $this->assertEntity('comment.comment_node_blog.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.blog.body', 'Body', 'text_with_summary', FALSE);
+    $this->assertEntity('comment.comment_node_book.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.book.body', 'Body', 'text_with_summary', FALSE);
+    $this->assertEntity('node.forum.taxonomy_forums', 'Forums', 'entity_reference', TRUE);
+    $this->assertEntity('comment.comment_node_forum.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.forum.body', 'Body', 'text_with_summary', FALSE);
+    $this->assertEntity('comment.comment_node_test_content_type.comment_body', 'Comment', 'text_long', TRUE);
+    $this->assertEntity('node.test_content_type.field_boolean', 'Boolean', 'boolean', FALSE);
+    $this->assertEntity('node.test_content_type.field_email', 'Email', 'email', FALSE);
+    $this->assertEntity('node.test_content_type.field_phone', 'Phone', 'telephone', TRUE);
+    $this->assertEntity('node.test_content_type.field_date', 'Date', 'datetime', FALSE);
+    $this->assertEntity('node.test_content_type.field_date_with_end_time', 'Date With End Time', 'datetime', FALSE);
+    $this->assertEntity('node.test_content_type.field_file', 'File', 'file', FALSE);
+    $this->assertEntity('node.test_content_type.field_float', 'Float', 'float', FALSE);
+    $this->assertEntity('node.test_content_type.field_images', 'Images', 'image', TRUE);
+    $this->assertEntity('node.test_content_type.field_integer', 'Integer', 'integer', TRUE);
+    $this->assertEntity('node.test_content_type.field_link', 'Link', 'link', FALSE);
+    $this->assertEntity('node.test_content_type.field_text_list', 'Text List', 'list_string', FALSE);
+    $this->assertEntity('node.test_content_type.field_integer_list', 'Integer List', 'list_integer', FALSE);
+    $this->assertEntity('node.test_content_type.field_long_text', 'Long text', 'text_with_summary', FALSE);
+    $this->assertEntity('node.test_content_type.field_term_reference', 'Term Reference', 'entity_reference', FALSE);
+    $this->assertEntity('node.test_content_type.field_text', 'Text', 'text', FALSE);
+    $this->assertEntity('comment.comment_node_test_content_type.field_integer', 'Integer', 'integer', FALSE);
+    $this->assertEntity('user.user.field_file', 'File', 'file', FALSE);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
new file mode 100644
index 0000000..061fb60
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceWidgetSettingsTest.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldInstanceWidgetSettingsTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
+
+use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrate field widget settings.
+ *
+ * @group field
+ */
+class MigrateFieldInstanceWidgetSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'comment',
+    'datetime',
+    'field',
+    'file',
+    'image',
+    'link',
+    'node',
+    'taxonomy',
+    'telephone',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(static::$modules);
+
+    $this->executeMigrations([
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_field',
+      'd7_field_instance',
+      'd7_field_instance_widget_settings',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a form display entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $expected_entity_type
+   *   The expected entity type to which the display settings are attached.
+   * @param string $expected_bundle
+   *   The expected bundle to which the display settings are attached.
+   */
+  protected function assertEntity($id, $expected_entity_type, $expected_bundle) {
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $entity */
+    $entity = EntityFormDisplay::load($id);
+    $this->assertTrue($entity instanceof EntityFormDisplayInterface);
+    $this->assertIdentical($expected_entity_type, $entity->getTargetEntityTypeId());
+    $this->assertIdentical($expected_bundle, $entity->getTargetBundle());
+  }
+
+  /**
+   * Asserts various aspects of a particular component of a form display.
+   *
+   * @param string $display_id
+   *   The form display ID.
+   * @param string $component_id
+   *   The component ID.
+   * @param string $widget_type
+   *   The expected widget type.
+   * @param string $weight
+   *   The expected weight of the component.
+   */
+  protected function assertComponent($display_id, $component_id, $widget_type, $weight) {
+    $component = EntityFormDisplay::load($display_id)->getComponent($component_id);
+    $this->assertTrue(is_array($component));
+    $this->assertIdentical($widget_type, $component['type']);
+    $this->assertIdentical($weight, $component['weight']);
+  }
+
+  /**
+   * Test that migrated view modes can be loaded using D8 APIs.
+   */
+  public function testWidgetSettings() {
+    $this->assertEntity('node.page.default', 'node', 'page');
+    $this->assertComponent('node.page.default', 'body', 'text_textarea_with_summary', -4);
+
+    $this->assertEntity('node.article.default', 'node', 'article');
+    $this->assertComponent('node.article.default', 'body', 'text_textarea_with_summary', -4);
+    $this->assertComponent('node.article.default', 'field_tags', 'entity_reference_autocomplete', -4);
+    $this->assertComponent('node.article.default', 'field_image', 'image_image', -1);
+
+    $this->assertEntity('node.blog.default', 'node', 'blog');
+    $this->assertComponent('node.blog.default', 'body', 'text_textarea_with_summary', -4);
+
+    $this->assertEntity('node.book.default', 'node', 'book');
+    $this->assertComponent('node.book.default', 'body', 'text_textarea_with_summary', -4);
+
+    $this->assertEntity('node.forum.default', 'node', 'forum');
+    $this->assertComponent('node.forum.default', 'body', 'text_textarea_with_summary', 1);
+    $this->assertComponent('node.forum.default', 'taxonomy_forums', 'options_select', 0);
+
+    $this->assertEntity('node.test_content_type.default', 'node', 'test_content_type');
+    $this->assertComponent('node.test_content_type.default', 'field_boolean', 'boolean_checkbox', 1);
+    $this->assertComponent('node.test_content_type.default', 'field_date', 'datetime_default', 2);
+    $this->assertComponent('node.test_content_type.default', 'field_date_with_end_time', 'datetime_default', 3);
+    $this->assertComponent('node.test_content_type.default', 'field_email', 'email_default', 4);
+    $this->assertComponent('node.test_content_type.default', 'field_file', 'file_generic', 5);
+    $this->assertComponent('node.test_content_type.default', 'field_float', 'number', 7);
+    $this->assertComponent('node.test_content_type.default', 'field_images', 'image_image', 8);
+    $this->assertComponent('node.test_content_type.default', 'field_integer', 'number', 9);
+    $this->assertComponent('node.test_content_type.default', 'field_link', 'link_default', 10);
+    $this->assertComponent('node.test_content_type.default', 'field_integer_list', 'options_buttons', 12);
+    $this->assertComponent('node.test_content_type.default', 'field_long_text', 'text_textarea_with_summary', 13);
+    $this->assertComponent('node.test_content_type.default', 'field_phone', 'telephone_default', 6);
+    $this->assertComponent('node.test_content_type.default', 'field_term_reference', 'entity_reference_autocomplete', 14);
+    $this->assertComponent('node.test_content_type.default', 'field_text', 'text_textfield', 15);
+    $this->assertComponent('node.test_content_type.default', 'field_text_list', 'options_select', 11);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
new file mode 100644
index 0000000..4b0d1f9
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldTest.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateFieldTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrates Drupal 7 fields.
+ *
+ * @group field
+ */
+class MigrateFieldTest extends MigrateDrupal7TestBase {
+
+  /**
+   * The modules to be enabled during the test.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'comment',
+    'datetime',
+    'file',
+    'image',
+    'link',
+    'node',
+    'system',
+    'taxonomy',
+    'telephone',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_field');
+  }
+
+  /**
+   * Asserts various aspects of a field_storage_config entity.
+   *
+   * @param string $id
+   *   The entity ID in the form ENTITY_TYPE.FIELD_NAME.
+   * @param string $expected_type
+   *   The expected field type.
+   * @param bool $expected_translatable
+   *   Whether or not the field is expected to be translatable.
+   * @param int $expected_cardinality
+   *   The expected cardinality of the field.
+   */
+  protected function assertEntity($id, $expected_type, $expected_translatable, $expected_cardinality) {
+    list ($expected_entity_type, $expected_name) = explode('.', $id);
+
+    /** @var \Drupal\field\FieldStorageConfigInterface $field */
+    $field = FieldStorageConfig::load($id);
+    $this->assertTrue($field instanceof FieldStorageConfigInterface);
+    $this->assertIdentical($expected_name, $field->getName());
+    $this->assertIdentical($expected_type, $field->getType());
+    // FieldStorageConfig::$translatable is TRUE by default, so it is useful
+    // to test for FALSE here.
+    $this->assertEqual($expected_translatable, $field->isTranslatable());
+    $this->assertIdentical($expected_entity_type, $field->getTargetEntityTypeId());
+
+    if ($expected_cardinality === 1) {
+      $this->assertFalse($field->isMultiple());
+    }
+    else {
+      $this->assertTrue($field->isMultiple());
+    }
+    $this->assertIdentical($expected_cardinality, $field->getCardinality());
+  }
+
+  /**
+   * Tests migrating D7 fields to field_storage_config entities.
+   */
+  public function testFields() {
+    $this->assertEntity('node.body', 'text_with_summary', FALSE, 1);
+    $this->assertEntity('node.field_long_text', 'text_with_summary', FALSE, 1);
+    $this->assertEntity('comment.comment_body', 'text_long', FALSE, 1);
+    $this->assertEntity('node.field_file', 'file', FALSE, 1);
+    $this->assertEntity('user.field_file', 'file', FALSE, 1);
+    $this->assertEntity('node.field_float', 'float', FALSE, 1);
+    $this->assertEntity('node.field_image', 'image', FALSE, 1);
+    $this->assertEntity('node.field_images', 'image', FALSE, 1);
+    $this->assertEntity('node.field_integer', 'integer', FALSE, 1);
+    $this->assertEntity('comment.field_integer', 'integer', FALSE, 1);
+    $this->assertEntity('node.field_integer_list', 'list_integer', FALSE, 1);
+    $this->assertEntity('node.field_link', 'link', FALSE, 1);
+    $this->assertEntity('node.field_tags', 'entity_reference', FALSE, -1);
+    $this->assertEntity('node.field_term_reference', 'entity_reference', FALSE, 1);
+    $this->assertEntity('node.taxonomy_forums', 'entity_reference', FALSE, 1);
+    $this->assertEntity('node.field_text', 'text', FALSE, 1);
+    $this->assertEntity('node.field_text_list', 'list_string', FALSE, 3);
+    $this->assertEntity('node.field_boolean', 'boolean', FALSE, 1);
+    $this->assertEntity('node.field_email', 'email', FALSE, -1);
+    $this->assertEntity('node.field_phone', 'telephone', FALSE, 1);
+    $this->assertEntity('node.field_date', 'datetime', FALSE, 1);
+    $this->assertEntity('node.field_date_with_end_time', 'datetime', FALSE, 1);
+
+    // Assert that the taxonomy term reference fields are referencing the
+    // correct entity type.
+    $field = FieldStorageConfig::load('node.field_term_reference');
+    $this->assertIdentical('taxonomy_term', $field->getSetting('target_type'));
+    $field = FieldStorageConfig::load('node.taxonomy_forums');
+    $this->assertIdentical('taxonomy_term', $field->getSetting('target_type'));
+
+    // Validate that the source count and processed count match up.
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('d7_field');
+    $this->assertIdentical($migration->getSourcePlugin()->count(), $migration->getIdMap()->processedCount());
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
new file mode 100644
index 0000000..303d859
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateViewModesTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Migrate\d7\MigrateViewModesTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Migrate\d7;
+
+use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\Core\Entity\EntityViewModeInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of D7 view modes.
+ *
+ * @group field
+ */
+class MigrateViewModesTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['comment', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('node');
+    $this->executeMigration('d7_view_modes');
+  }
+
+  /**
+   * Asserts various aspects of a view mode entity.
+   *
+   * @param string $id
+   *   The entity ID.
+   * @param string $label
+   *   The expected label of the view mode.
+   * @param string $entity_type
+   *   The expected entity type ID which owns the view mode.
+   * @param bool $status
+   *   The expected status of the view mode.
+   */
+  protected function assertEntity($id, $label, $entity_type) {
+    /** @var \Drupal\Core\Entity\EntityViewModeInterface $view_mode */
+    $view_mode = EntityViewMode::load($id);
+    $this->assertTrue($view_mode instanceof EntityViewModeInterface);
+    $this->assertIdentical($label, $view_mode->label());
+    $this->assertIdentical($entity_type, $view_mode->getTargetType());
+  }
+
+  /**
+   * Tests migration of D7 view mode variables to D8 config entities.
+   */
+  public function testMigration() {
+    $this->assertEntity('comment.full', 'Full', 'comment');
+    $this->assertEntity('node.teaser', 'Teaser', 'node');
+    $this->assertEntity('node.full', 'Full', 'node');
+    $this->assertEntity('user.full', 'Full', 'user');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
new file mode 100644
index 0000000..1cdf05b
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Number\NumberItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Number;
+
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the number field type.
+ *
+ * @group field
+ */
+class NumberItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array();
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create number field storages and fields for validation.
+    foreach (array('integer', 'float', 'decimal') as $type) {
+      FieldStorageConfig::create(array(
+        'entity_type' => 'entity_test',
+        'field_name' => 'field_' . $type,
+        'type' => $type,
+      ))->save();
+      FieldConfig::create([
+        'entity_type' => 'entity_test',
+        'field_name' => 'field_' . $type,
+        'bundle' => 'entity_test',
+      ])->save();
+    }
+  }
+
+  /**
+   * Tests using entity fields of the number field type.
+   */
+  public function testNumberItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $integer = rand(0, 10);
+    $entity->field_integer = $integer;
+    $float = 3.14;
+    $entity->field_float = $float;
+    $entity->field_decimal = '20-40';
+    $violations = $entity->validate();
+    $this->assertIdentical(1, count($violations), 'Wrong decimal value causes validation error');
+    $decimal = '31.3';
+    $entity->field_decimal = $decimal;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_integer instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_integer[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_integer->value, $integer);
+    $this->assertEqual($entity->field_integer[0]->value, $integer);
+    $this->assertTrue($entity->field_float instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_float[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_float->value, $float);
+    $this->assertEqual($entity->field_float[0]->value, $float);
+    $this->assertTrue($entity->field_decimal instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_decimal[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_decimal->value, $decimal);
+    $this->assertEqual($entity->field_decimal[0]->value, $decimal);
+
+    // Verify changing the number value.
+    $new_integer = rand(11, 20);
+    $new_float = rand(1001, 2000) / 100;
+    $new_decimal = '18.2';
+    $entity->field_integer->value = $new_integer;
+    $this->assertEqual($entity->field_integer->value, $new_integer);
+    $entity->field_float->value = $new_float;
+    $this->assertEqual($entity->field_float->value, $new_float);
+    $entity->field_decimal->value = $new_decimal;
+    $this->assertEqual($entity->field_decimal->value, $new_decimal);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_integer->value, $new_integer);
+    $this->assertEqual($entity->field_float->value, $new_float);
+    $this->assertEqual($entity->field_decimal->value, $new_decimal);
+
+    /// Test sample item generation.
+    $entity = EntityTest::create();
+    $entity->field_integer->generateSampleItems();
+    $entity->field_float->generateSampleItems();
+    $entity->field_decimal->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/ShapeItemTest.php b/core/modules/field/tests/src/Kernel/ShapeItemTest.php
new file mode 100644
index 0000000..38d3571
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/ShapeItemTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\ShapeItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the shape field type.
+ *
+ * @group field
+ */
+class ShapeItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test');
+
+  /**
+   * The name of the field to use in this test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_shape';
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a 'shape' field and storage for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => 'shape',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => $this->fieldName,
+      'bundle' => 'entity_test',
+    ])->save();
+  }
+
+  /**
+   * Tests using entity fields of the field field type.
+   */
+  public function testShapeItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $shape = 'cube';
+    $color = 'blue';
+    $entity->{$this->fieldName}->shape = $shape;
+    $entity->{$this->fieldName}->color = $color;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->{$this->fieldName}->shape, $shape);
+    $this->assertEqual($entity->{$this->fieldName}->color, $color);
+    $this->assertEqual($entity->{$this->fieldName}[0]->shape, $shape);
+    $this->assertEqual($entity->{$this->fieldName}[0]->color, $color);
+
+    // Verify changing the field value.
+    $new_shape = 'circle';
+    $new_color = 'red';
+    $entity->{$this->fieldName}->shape = $new_shape;
+    $entity->{$this->fieldName}->color = $new_color;
+    $this->assertEqual($entity->{$this->fieldName}->shape, $new_shape);
+    $this->assertEqual($entity->{$this->fieldName}->color, $new_color);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->{$this->fieldName}->shape, $new_shape);
+    $this->assertEqual($entity->{$this->fieldName}->color, $new_color);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php b/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
new file mode 100644
index 0000000..d47dbca
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php
@@ -0,0 +1,128 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\String\RawStringFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\String;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the raw string formatter
+ *
+ * @group field
+ */
+class RawStringFormatterTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
+
+  /**
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Configure the theme system.
+    $this->installConfig(array('system', 'field'));
+    \Drupal::service('router.builder')->rebuild();
+    $this->installEntitySchema('entity_test');
+
+    $this->entityType = 'entity_test';
+    $this->bundle = $this->entityType;
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => $this->entityType,
+      'type' => 'string_long',
+    ));
+    $field_storage->save();
+
+    $instance = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => $this->bundle,
+      'label' => $this->randomMachineName(),
+    ));
+    $instance->save();
+
+    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent($this->fieldName, array(
+        'type' => 'string',
+        'settings' => array(),
+      ));
+    $this->display->save();
+  }
+
+  /**
+   * Renders fields of a given entity with a given display.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The entity object with attached fields to render.
+   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
+   *   The display to render the fields in.
+   *
+   * @return string
+   *   The rendered entity fields.
+   */
+  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
+    $content = $display->build($entity);
+    $content = $this->render($content);
+    return $content;
+  }
+
+  /**
+   * Tests string formatter output.
+   */
+  public function testStringFormatter() {
+    $value = $this->randomString();
+    $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
+    $value .= "\n\n" . $this->randomString();
+
+    $entity = EntityTest::create(array());
+    $entity->{$this->fieldName}->value = $value;
+
+    // Verify that all HTML is escaped and newlines are retained.
+    $this->renderEntityFields($entity, $this->display);
+    $this->assertNoRaw($value);
+    $this->assertRaw(nl2br(Html::escape($value)));
+
+    // Verify the cache tags.
+    $build = $entity->{$this->fieldName}->view();
+    $this->assertTrue(!isset($build[0]['#cache']), 'The string formatter has no cache tags.');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
new file mode 100644
index 0000000..af2c679
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\String\StringFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\String;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\entity_test\Entity\EntityTestRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the creation of text fields.
+ *
+ * @group field
+ */
+class StringFormatterTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field', 'text', 'entity_test', 'system', 'filter', 'user');
+
+  /**
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Configure the theme system.
+    $this->installConfig(array('system', 'field'));
+    \Drupal::service('router.builder')->rebuild();
+    $this->installEntitySchema('entity_test_rev');
+
+    $this->entityType = 'entity_test_rev';
+    $this->bundle = $this->entityType;
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => $this->entityType,
+      'type' => 'string',
+    ));
+    $field_storage->save();
+
+    $instance = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => $this->bundle,
+      'label' => $this->randomMachineName(),
+    ));
+    $instance->save();
+
+    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent($this->fieldName, array(
+        'type' => 'string',
+        'settings' => array(),
+      ));
+    $this->display->save();
+  }
+
+  /**
+   * Renders fields of a given entity with a given display.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The entity object with attached fields to render.
+   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
+   *   The display to render the fields in.
+   *
+   * @return string
+   *   The rendered entity fields.
+   */
+  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
+    $content = $display->build($entity);
+    $content = $this->render($content);
+    return $content;
+  }
+
+  /**
+   * Tests string formatter output.
+   */
+  public function testStringFormatter() {
+    $value = $this->randomString();
+    $value .= "\n\n<strong>" . $this->randomString() . '</strong>';
+    $value .= "\n\n" . $this->randomString();
+
+    $entity = EntityTestRev::create(array());
+    $entity->{$this->fieldName}->value = $value;
+
+    // Verify that all HTML is escaped and newlines are retained.
+    $this->renderEntityFields($entity, $this->display);
+    $this->assertNoRaw($value);
+    $this->assertRaw(nl2br(Html::escape($value)));
+
+    // Verify the cache tags.
+    $build = $entity->{$this->fieldName}->view();
+    $this->assertTrue(!isset($build[0]['#cache']), 'The string formatter has no cache tags.');
+
+    $value = $this->randomMachineName();
+    $entity->{$this->fieldName}->value = $value;
+    $entity->save();
+
+    // Set the formatter to link to the entity.
+    $this->display->setComponent($this->fieldName, [
+      'type' => 'string',
+      'settings' => [
+        'link_to_entity' => TRUE,
+      ],
+    ]);
+    $this->display->save();
+
+    $this->renderEntityFields($entity, $this->display);
+    $this->assertLink($value, 0);
+    $this->assertLinkByHref($entity->url());
+
+    // $entity->url('revision') falls back to the canonical URL if this is no
+    // revision.
+    $this->assertLinkByHref($entity->url('revision'));
+
+    // Make the entity a new revision.
+    $old_revision_id = $entity->getRevisionId();
+    $entity->setNewRevision(TRUE);
+    $value2 = $this->randomMachineName();
+    $entity->{$this->fieldName}->value = $value2;
+    $entity->save();
+    $entity_new_revision = \Drupal::entityManager()->getStorage('entity_test_rev')->loadRevision($old_revision_id);
+
+    $this->renderEntityFields($entity, $this->display);
+    $this->assertLink($value2, 0);
+    $this->assertLinkByHref($entity->url('revision'));
+
+    $this->renderEntityFields($entity_new_revision, $this->display);
+    $this->assertLink($value, 0);
+    $this->assertLinkByHref('/entity_test_rev/' . $entity_new_revision->id() . '/revision/' . $entity_new_revision->getRevisionId() . '/view');
+  }
+}
diff --git a/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
new file mode 100644
index 0000000..f25b49d
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\String\UuidFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\String;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the output of a UUID field.
+ *
+ * @group field
+ */
+class UuidFormatterTest extends KernelTestBase {
+
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'entity_test', 'system', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['system', 'field']);
+    \Drupal::service('router.builder')->rebuild();
+    $this->installEntitySchema('entity_test');
+  }
+
+  /**
+   * Tests string formatter output.
+   */
+  public function testUuidStringFormatter() {
+    $entity = EntityTest::create([]);
+    $entity->save();
+
+    $uuid_field = $entity->get('uuid');
+
+    // Verify default render.
+    $render_array = $uuid_field->view([]);
+    $this->assertIdentical($render_array[0]['#context']['value'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
+    $this->assertTrue(strpos($this->render($render_array), $entity->uuid()), 'The rendered UUID found.');
+
+    // Verify customized render.
+    $render_array = $uuid_field->view(['settings' => ['link_to_entity' => TRUE]]);
+    $this->assertIdentical($render_array[0]['#type'], 'link');
+    $this->assertIdentical($render_array[0]['#title']['#context']['value'], $entity->uuid());
+    $this->assertIdentical($render_array[0]['#url']->toString(), $entity->url());
+    $rendered = $this->render($render_array);
+    $this->assertTrue(strpos($rendered, $entity->uuid()), 'The rendered UUID found.');
+    $this->assertTrue(strpos($rendered, $entity->url()), 'The rendered entity URL found.');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/TestItemTest.php b/core/modules/field/tests/src/Kernel/TestItemTest.php
new file mode 100644
index 0000000..4a4fc0d
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/TestItemTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\TestItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the test field type.
+ *
+ * @group field
+ */
+class TestItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test');
+
+  /**
+   * The name of the field to use in this test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_test';
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a 'test_field' field and storage for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => $this->fieldName,
+      'bundle' => 'entity_test',
+    ])->save();
+  }
+
+  /**
+   * Tests using entity fields of the field field type.
+   */
+  public function testTestItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = rand(1, 10);
+    $entity->field_test = $value;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->{$this->fieldName} instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->{$this->fieldName}[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->{$this->fieldName}->value, $value);
+    $this->assertEqual($entity->{$this->fieldName}[0]->value, $value);
+
+    // Verify changing the field value.
+    $new_value = rand(1, 10);
+    $entity->field_test->value = $new_value;
+    $this->assertEqual($entity->{$this->fieldName}->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->{$this->fieldName}->value, $new_value);
+
+    // Test the schema for this field type.
+    $expected_schema = array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'int',
+          'size' => 'medium',
+        ),
+      ),
+      'unique keys' => array(),
+      'indexes' => array(
+        'value' => array('value'),
+      ),
+      'foreign keys' => array(),
+    );
+    $field_schema = BaseFieldDefinition::create('test_field')->getSchema();
+    $this->assertEqual($field_schema, $expected_schema);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php b/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php
new file mode 100644
index 0000000..6c36f05
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\TestItemWithDependenciesTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the test field with dependencies type.
+ *
+ * @group field
+ */
+class TestItemWithDependenciesTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test');
+
+  /**
+   * The name of the field to use in this test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_test';
+
+  /**
+   * Tests that field types can add dependencies to field config entities.
+   */
+  public function testTestItemWithDepenencies() {
+    // Create a 'test_field_with_dependencies' field and storage for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field_with_dependencies',
+    ))->save();
+    $field = FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => $this->fieldName,
+      'bundle' => 'entity_test',
+    ]);
+    $field->save();
+
+    // Validate that the field configuration entity has the expected
+    // dependencies.
+    $this->assertEqual([
+      'content' => ['node:article:uuid'],
+      'config' => ['field.storage.entity_test.field_test'],
+      'module' => ['entity_test', 'field_test', 'test_module']
+    ], $field->getDependencies());
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
new file mode 100644
index 0000000..12f4653
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Timestamp\TimestampFormatterTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Timestamp;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the timestamp formatters.
+ *
+ * @group field
+ */
+class TimestampFormatterTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'field', 'text', 'entity_test', 'user'];
+
+  /**
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface
+   */
+  protected $display;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['system']);
+    $this->installConfig(['field']);
+    $this->installEntitySchema('entity_test');
+
+    $this->entityType = 'entity_test';
+    $this->bundle = $this->entityType;
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $this->fieldName,
+      'entity_type' => $this->entityType,
+      'type' => 'timestamp',
+    ]);
+    $field_storage->save();
+
+    $instance = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $this->bundle,
+      'label' => $this->randomMachineName(),
+    ]);
+    $instance->save();
+
+    $this->display = entity_get_display($this->entityType, $this->bundle, 'default')
+      ->setComponent($this->fieldName, [
+        'type' => 'boolean',
+        'settings' => [],
+      ]);
+    $this->display->save();
+  }
+
+  /**
+   * Renders fields of a given entity with a given display.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The entity object with attached fields to render.
+   * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
+   *   The display to render the fields in.
+   *
+   * @return string
+   *   The rendered entity fields.
+   */
+  protected function renderEntityFields(FieldableEntityInterface $entity, EntityViewDisplayInterface $display) {
+    $content = $display->build($entity);
+    $content = $this->render($content);
+    return $content;
+  }
+
+  /**
+   * Tests TimestampFormatter.
+   */
+  public function testTimestampFormatter() {
+    $data = [];
+
+    // Test standard formats.
+    $date_formats = array_keys(\Drupal::entityManager()->getStorage('date_format')->loadMultiple());
+
+    foreach ($date_formats as $date_format) {
+      $data[] = ['date_format' => $date_format, 'custom_date_format' => '', 'timezone' => ''];
+    }
+
+    $data[] = ['date_format' => 'custom', 'custom_date_format' => 'r', 'timezone' => ''];
+    $data[] = ['date_format' => 'custom', 'custom_date_format' => 'e', 'timezone' => 'Asia/Tokyo'];
+
+    foreach ($data as $settings) {
+      list($date_format, $custom_date_format, $timezone) = array_values($settings);
+      if (empty($timezone)) {
+        $timezone = NULL;
+      }
+
+      $value = REQUEST_TIME - 87654321;
+      $expected = \Drupal::service('date.formatter')->format($value, $date_format, $custom_date_format, $timezone);
+
+      $component = $this->display->getComponent($this->fieldName);
+      $component['type'] = 'timestamp';
+      $component['settings'] = $settings;
+      $this->display->setComponent($this->fieldName, $component);
+
+      $entity = EntityTest::create([]);
+      $entity->{$this->fieldName}->value = $value;
+
+      $this->renderEntityFields($entity, $this->display);
+      $this->assertRaw($expected);
+    }
+  }
+
+  /**
+   * Tests TimestampAgoFormatter.
+   */
+  public function testTimestampAgoFormatter() {
+    $data = [];
+
+    foreach (array(1, 2, 3, 4, 5, 6) as $granularity) {
+      $data[] = [
+        'future_format' => '@interval hence',
+        'past_format' => '@interval ago',
+        'granularity' => $granularity,
+      ];
+    }
+
+    foreach ($data as $settings) {
+      $future_format = $settings['future_format'];
+      $past_format = $settings['past_format'];
+      $granularity = $settings['granularity'];
+      $request_time = \Drupal::requestStack()->getCurrentRequest()->server->get('REQUEST_TIME');
+
+      // Test a timestamp in the past
+      $value = $request_time - 87654321;
+      $expected = SafeMarkup::format($past_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($value, ['granularity' => $granularity])]);
+
+      $component = $this->display->getComponent($this->fieldName);
+      $component['type'] = 'timestamp_ago';
+      $component['settings'] = $settings;
+      $this->display->setComponent($this->fieldName, $component);
+
+      $entity = EntityTest::create([]);
+      $entity->{$this->fieldName}->value = $value;
+
+      $this->renderEntityFields($entity, $this->display);
+      $this->assertRaw($expected);
+
+      // Test a timestamp in the future
+      $value = $request_time + 87654321;
+      $expected = SafeMarkup::format($future_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($value, ['granularity' => $granularity])]);
+
+      $component = $this->display->getComponent($this->fieldName);
+      $component['type'] = 'timestamp_ago';
+      $component['settings'] = $settings;
+      $this->display->setComponent($this->fieldName, $component);
+
+      $entity = EntityTest::create([]);
+      $entity->{$this->fieldName}->value = $value;
+
+      $this->renderEntityFields($entity, $this->display);
+      $this->assertRaw($expected);
+    }
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/TranslationTest.php b/core/modules/field/tests/src/Kernel/TranslationTest.php
new file mode 100644
index 0000000..3d31a12
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/TranslationTest.php
@@ -0,0 +1,214 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\TranslationTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests multilanguage fields logic.
+ *
+ * The following tests will check the multilanguage logic in field handling.
+ *
+ * @group field
+ */
+class TranslationTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * node is required because the tests alter the node entity type.
+   *
+   * @var array
+   */
+  public static $modules = array('language', 'node');
+
+  /**
+   * The name of the field to use in this test.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The name of the entity type to use in this test.
+   *
+   * @var string
+   */
+  protected $entityType = 'test_entity';
+
+  /**
+   * An array defining the field storage to use in this test.
+   *
+   * @var array
+   */
+  protected $fieldStorageDefinition;
+
+  /**
+   * An array defining the field to use in this test.
+   *
+   * @var array
+   */
+  protected $fieldDefinition;
+
+  /**
+   * The field storage to use in this test.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field to use in this test.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(array('language'));
+
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    $this->entityType = 'entity_test';
+
+    $this->fieldStorageDefinition = array(
+      'field_name' => $this->fieldName,
+      'entity_type' => $this->entityType,
+      'type' => 'test_field',
+      'cardinality' => 4,
+    );
+    $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
+    $this->fieldStorage->save();
+
+    $this->fieldDefinition = array(
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'entity_test',
+    );
+    $this->field = FieldConfig::create($this->fieldDefinition);
+    $this->field->save();
+
+    for ($i = 0; $i < 3; ++$i) {
+      ConfigurableLanguage::create(array(
+        'id' => 'l' . $i,
+        'label' => $this->randomString(),
+      ))->save();
+    }
+  }
+
+  /**
+   * Test translatable fields storage/retrieval.
+   */
+  function testTranslatableFieldSaveLoad() {
+    // Enable field translations for nodes.
+    field_test_entity_info_translatable('node', TRUE);
+    $entity_type = \Drupal::entityManager()->getDefinition('node');
+    $this->assertTrue($entity_type->isTranslatable(), 'Nodes are translatable.');
+
+    // Prepare the field translations.
+    $entity_type_id = 'entity_test';
+    field_test_entity_info_translatable($entity_type_id, TRUE);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type_id)
+      ->create(array('type' => $this->field->getTargetBundle()));
+    $field_translations = array();
+    $available_langcodes = array_keys($this->container->get('language_manager')->getLanguages());
+    $entity->langcode->value = reset($available_langcodes);
+    foreach ($available_langcodes as $langcode) {
+      $field_translations[$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
+      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
+      $translation->{$this->fieldName}->setValue($field_translations[$langcode]);
+    }
+
+    // Save and reload the field translations.
+    $entity = $this->entitySaveReload($entity);
+
+    // Check if the correct values were saved/loaded.
+    foreach ($field_translations as $langcode => $items) {
+      $result = TRUE;
+      foreach ($items as $delta => $item) {
+        $result = $result && $item['value'] == $entity->getTranslation($langcode)->{$this->fieldName}[$delta]->value;
+      }
+      $this->assertTrue($result, format_string('%language translation correctly handled.', array('%language' => $langcode)));
+    }
+
+    // Test default values.
+    $field_name_default = Unicode::strtolower($this->randomMachineName() . '_field_name');
+    $field_storage_definition = $this->fieldStorageDefinition;
+    $field_storage_definition['field_name'] = $field_name_default;
+    $field_storage = FieldStorageConfig::create($field_storage_definition);
+    $field_storage->save();
+
+    $field_definition = $this->fieldDefinition;
+    $field_definition['field_storage'] = $field_storage;
+    $field_definition['default_value'] = array(array('value' => rand(1, 127)));
+    $field = FieldConfig::create($field_definition);
+    $field->save();
+
+    $translation_langcodes = array_slice($available_langcodes, 0, 2);
+    asort($translation_langcodes);
+    $translation_langcodes = array_values($translation_langcodes);
+
+    $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type_id)
+      ->create($values);
+    foreach ($translation_langcodes as $langcode) {
+      $values[$this->fieldName][$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
+      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
+      $translation->{$this->fieldName}->setValue($values[$this->fieldName][$langcode]);
+    }
+
+    $field_langcodes = array_keys($entity->getTranslationLanguages());
+    sort($field_langcodes);
+    $this->assertEqual($translation_langcodes, $field_langcodes, 'Missing translations did not get a default value.');
+
+    // @todo Test every translation once the Entity Translation API allows for
+    //   multilingual defaults.
+    $langcode = $entity->language()->getId();
+    $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $field->getDefaultValueLiteral(), format_string('Default value correctly populated for language %language.', array('%language' => $langcode)));
+
+    // Check that explicit empty values are not overridden with default values.
+    foreach (array(NULL, array()) as $empty_items) {
+      $values = array('type' => $field->getTargetBundle(), 'langcode' => $translation_langcodes[0]);
+      $entity = entity_create($entity_type_id, $values);
+      foreach ($translation_langcodes as $langcode) {
+        $values[$this->fieldName][$langcode] = $this->_generateTestFieldValues($this->fieldStorage->getCardinality());
+        $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
+        $translation->{$this->fieldName}->setValue($values[$this->fieldName][$langcode]);
+        $translation->{$field_name_default}->setValue($empty_items);
+        $values[$field_name_default][$langcode] = $empty_items;
+      }
+
+      foreach ($entity->getTranslationLanguages() as $langcode => $language) {
+        $this->assertEquals([], $entity->getTranslation($langcode)->{$field_name_default}->getValue(), format_string('Empty value correctly populated for language %language.', array('%language' => $langcode)));
+      }
+    }
+  }
+
+  /**
+   * Tests field access.
+   *
+   * Regression test to verify that fieldAccess() can be called while only
+   * passing the required parameters.
+   *
+   * @see https://www.drupal.org/node/2404739
+   */
+  public function testFieldAccess() {
+    $access_control_handler = \Drupal::entityManager()->getAccessControlHandler($this->entityType);
+    $this->assertTrue($access_control_handler->fieldAccess('view', $this->field));
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/Uri/UriItemTest.php b/core/modules/field/tests/src/Kernel/Uri/UriItemTest.php
new file mode 100644
index 0000000..9d11ccd
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/Uri/UriItemTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\Uri\UriItemTest.
+ */
+
+namespace Drupal\Tests\field\Kernel\Uri;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+
+/**
+ * Tests URI field functionality.
+ *
+ * @see \Drupal\Core\Field\Plugin\Field\FieldType\UriItem
+ *
+ * @group field
+ */
+class UriItemTest extends FieldKernelTestBase {
+
+  /**
+   * A field to use in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field used in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * Tests URI field.
+   */
+  public function testUriField() {
+    $label = $this->randomMachineName();
+
+    // Create a field with settings to validate.
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'uri',
+    ]);
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'label' => $label,
+      'required' => TRUE,
+      'settings' => [
+        'size' => 123,
+        'placeholder' => '',
+      ],
+    ]);
+    $this->field->save();
+
+    // Create a form display for the default form mode.
+    entity_get_form_display('entity_test', 'entity_test', 'default')
+      ->setComponent($field_name, [
+        'type' => 'uri',
+      ])
+      ->save();
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->$field_name->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
new file mode 100644
index 0000000..2cd9404
--- /dev/null
+++ b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field\Kernel\WidgetPluginManagerTest.
+ */
+
+namespace Drupal\Tests\field\Kernel;
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Tests the field widget manager.
+ *
+ * @group field
+ */
+class WidgetPluginManagerTest extends FieldKernelTestBase {
+
+  /**
+   * Tests that the widget definitions alter hook works.
+   */
+  function testWidgetDefinitionAlter() {
+    $widget_definition = \Drupal::service('plugin.manager.field.widget')->getDefinition('test_field_widget_multiple');
+
+    // Test if hook_field_widget_info_alter is being called.
+    $this->assertTrue(in_array('test_field', $widget_definition['field_types']), "The 'test_field_widget_multiple' widget is enabled for the 'test_field' field type in field_test_field_widget_info_alter().");
+  }
+
+  /**
+   * Tests that getInstance falls back on default if current is not applicable.
+   *
+   * @see \Drupal\field\Tests\FormatterPluginManagerTest::testNotApplicableFallback()
+   */
+  public function testNotApplicableFallback() {
+    /** @var \Drupal\Core\Field\WidgetPluginManager $widget_plugin_manager */
+    $widget_plugin_manager = \Drupal::service('plugin.manager.field.widget');
+
+    $base_field_definition = BaseFieldDefinition::create('test_field')
+      // Set a name that will make isApplicable() return TRUE.
+      ->setName('field_multiwidgetfield');
+
+    $widget_options = array(
+      'field_definition' => $base_field_definition,
+      'form_mode' => 'default',
+      'configuration' => array(
+        'type' => 'test_field_widget_multiple',
+      ),
+    );
+
+    $instance = $widget_plugin_manager->getInstance($widget_options);
+    $this->assertEqual($instance->getPluginId(), 'test_field_widget_multiple');
+
+    // Now do the same but with machine name field_onewidgetfield, because that
+    // makes isApplicable() return FALSE.
+    $base_field_definition->setName('field_onewidgetfield');
+    $instance = $widget_plugin_manager->getInstance($widget_options);
+
+    // Instance should be default widget.
+    $this->assertNotEqual($instance->getPluginId(), 'test_field_widget_multiple');
+    $this->assertEqual($instance->getPluginId(), 'test_field_widget');
+  }
+
+}
diff --git a/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php
index 5f7a16d..9632bb8 100644
--- a/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php
+++ b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php
@@ -24,13 +24,20 @@ class FieldUninstallValidatorTest extends UnitTestCase {
   protected $fieldUninstallValidator;
 
   /**
+   * The mock field type plugin manager;
+   *
+   * @var \Drupal\Core\Field\FieldTypePluginManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $fieldTypePluginManager;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
     $this->fieldUninstallValidator = $this->getMockBuilder('Drupal\field\FieldUninstallValidator')
       ->disableOriginalConstructor()
-      ->setMethods(['getFieldStoragesByModule'])
+      ->setMethods(['getFieldStoragesByModule', 'getFieldTypeLabel'])
       ->getMock();
     $this->fieldUninstallValidator->setStringTranslation($this->getStringTranslationStub());
   }
@@ -79,12 +86,24 @@ public function testValidateNoDeleted() {
     $field_storage->expects($this->once())
       ->method('isDeleted')
       ->willReturn(FALSE);
+    $field_type = $this->randomMachineName();
+    $field_storage->expects($this->once())
+      ->method('getType')
+      ->willReturn($field_type);
+    $field_name = $this->randomMachineName();
+    $field_storage->expects($this->once())
+      ->method('getLabel')
+      ->willReturn($field_name);
     $this->fieldUninstallValidator->expects($this->once())
       ->method('getFieldStoragesByModule')
       ->willReturn([$field_storage]);
+    $field_type_label = $this->randomMachineName();
+    $this->fieldUninstallValidator->expects($this->once())
+      ->method('getFieldTypeLabel')
+      ->willReturn($field_type_label);
 
     $module = $this->randomMachineName();
-    $expected = ['Fields type(s) in use'];
+    $expected = ["The <em class=\"placeholder\">$field_type_label</em> field type is used in the following field: $field_name"];
     $reasons = $this->fieldUninstallValidator->validate($module);
     $this->assertSame($expected, $this->castSafeStrings($reasons));
   }
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
index c0a12dd..87a23d9 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d6/FieldSettingsTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d6;
 
 use Drupal\field\Plugin\migrate\process\d6\FieldSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
index 5bec59e..f313fe9 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldInstanceSettingsTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d7;
 
 use Drupal\field\Plugin\migrate\process\d7\FieldInstanceSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\migrate\Unit\MigrateTestCase;
diff --git a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
index ce1fec1..7c7607e 100644
--- a/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
+++ b/core/modules/field/tests/src/Unit/Plugin/migrate/process/d7/FieldSettingsTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\field\Unit\Plugin\migrate\process\d7;
 
 use Drupal\field\Plugin\migrate\process\d7\FieldSettings;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\migrate\Unit\MigrateTestCase;
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 597be4f..1517e5f 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -5,10 +5,8 @@
  * Allows administrators to attach custom fields to fieldable types.
  */
 
-use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Entity\EntityViewModeInterface;
 use Drupal\Core\Entity\EntityFormModeInterface;
diff --git a/core/modules/field_ui/src/Access/FormModeAccessCheck.php b/core/modules/field_ui/src/Access/FormModeAccessCheck.php
index 35c83f9..4d4f73c 100644
--- a/core/modules/field_ui/src/Access/FormModeAccessCheck.php
+++ b/core/modules/field_ui/src/Access/FormModeAccessCheck.php
@@ -78,7 +78,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
       }
 
       if ($form_mode_name != 'default' && $entity_display) {
-        $access->cacheUntilEntityChanges($entity_display);
+        $access->addCacheableDependency($entity_display);
       }
 
       if ($visibility) {
diff --git a/core/modules/field_ui/src/Access/ViewModeAccessCheck.php b/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
index 6e764a3..697883e 100644
--- a/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
+++ b/core/modules/field_ui/src/Access/ViewModeAccessCheck.php
@@ -78,7 +78,7 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
       }
 
       if ($view_mode_name != 'default' && $entity_display) {
-        $access->cacheUntilEntityChanges($entity_display);
+        $access->addCacheableDependency($entity_display);
       }
 
       if ($visibility) {
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index e0b622a..f949190 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -9,7 +9,6 @@
 
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\Component\Plugin\PluginManagerBase;
-use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
@@ -17,7 +16,6 @@
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\PluginSettingsInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\field_ui\Element\FieldUiTable;
 use Drupal\field_ui\FieldUI;
diff --git a/core/modules/field_ui/src/Tests/EntityDisplayTest.php b/core/modules/field_ui/src/Tests/EntityDisplayTest.php
deleted file mode 100644
index 1c9332b..0000000
--- a/core/modules/field_ui/src/Tests/EntityDisplayTest.php
+++ /dev/null
@@ -1,655 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field_ui\Tests\EntityDisplayTest.
- */
-
-namespace Drupal\field_ui\Tests;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Entity\Display\EntityDisplayInterface;
-use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\node\Entity\NodeType;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\user\Entity\Role;
-
-/**
- * Tests the entity display configuration entities.
- *
- * @group field_ui
- */
-class EntityDisplayTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var string[]
-   */
-  public static $modules = array('field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-    $this->installConfig(array('field', 'node', 'user'));
-  }
-
-  /**
-   * Tests basic CRUD operations on entity display objects.
-   */
-  public function testEntityDisplayCRUD() {
-    $display = EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ));
-
-    $expected = array();
-
-    // Check that providing no 'weight' results in the highest current weight
-    // being assigned. The 'name' field's formatter has weight -5, therefore
-    // these follow.
-    $expected['component_1'] = array('weight' => -4, 'settings' => array(), 'third_party_settings' => array());
-    $expected['component_2'] = array('weight' => -3, 'settings' => array(), 'third_party_settings' => array());
-    $display->setComponent('component_1');
-    $display->setComponent('component_2');
-    $this->assertEqual($display->getComponent('component_1'), $expected['component_1']);
-    $this->assertEqual($display->getComponent('component_2'), $expected['component_2']);
-
-    // Check that arbitrary options are correctly stored.
-    $expected['component_3'] = array('weight' => 10, 'third_party_settings' => array('field_test' => array('foo' => 'bar')), 'settings' => array());
-    $display->setComponent('component_3', $expected['component_3']);
-    $this->assertEqual($display->getComponent('component_3'), $expected['component_3']);
-
-    // Check that the display can be properly saved and read back.
-    $display->save();
-    $display = entity_load('entity_view_display', $display->id());
-    foreach (array('component_1', 'component_2', 'component_3') as $name) {
-      $this->assertEqual($display->getComponent($name), $expected[$name]);
-    }
-
-    // Ensure that third party settings were added to the config entity.
-    // These are added by entity_test_entity_presave() implemented in
-    // entity_test module.
-    $this->assertEqual('bar', $display->getThirdPartySetting('entity_test', 'foo'), 'Third party settings were added to the entity view display.');
-
-    // Check that getComponents() returns options for all components.
-    $expected['name'] = array(
-      'label' => 'hidden',
-      'type' => 'string',
-      'weight' => -5,
-      'settings' => array(
-        'link_to_entity' => FALSE,
-      ),
-      'third_party_settings' => array(),
-    );
-    $this->assertEqual($display->getComponents(), $expected);
-
-    // Check that a component can be removed.
-    $display->removeComponent('component_3');
-    $this->assertNULL($display->getComponent('component_3'));
-
-    // Check that the removal is correctly persisted.
-    $display->save();
-    $display = entity_load('entity_view_display', $display->id());
-    $this->assertNULL($display->getComponent('component_3'));
-
-    // Check that createCopy() creates a new component that can be correctly
-    // saved.
-    EntityViewMode::create(array('id' => $display->getTargetEntityTypeId() . '.other_view_mode', 'targetEntityType' => $display->getTargetEntityTypeId()))->save();
-    $new_display = $display->createCopy('other_view_mode');
-    $new_display->save();
-    $new_display = entity_load('entity_view_display', $new_display->id());
-    $dependencies = $new_display->calculateDependencies()->getDependencies();
-    $this->assertEqual(array('config' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies);
-    $this->assertEqual($new_display->getTargetEntityTypeId(), $display->getTargetEntityTypeId());
-    $this->assertEqual($new_display->getTargetBundle(), $display->getTargetBundle());
-    $this->assertEqual($new_display->getMode(), 'other_view_mode');
-    $this->assertEqual($new_display->getComponents(), $display->getComponents());
-  }
-
-  /**
-   *  Test sorting of components by name on basic CRUD operations
-   */
-  public function testEntityDisplayCRUDSort() {
-    $display = EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ));
-    $display->setComponent('component_3');
-    $display->setComponent('component_1');
-    $display->setComponent('component_2');
-    $display->save();
-    $components = array_keys($display->getComponents());
-    // The name field is not configurable so will be added automatically.
-    $expected = array ( 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name');
-    $this->assertIdentical($components, $expected);
-  }
-
-  /**
-   * Tests entity_get_display().
-   */
-  public function testEntityGetDisplay() {
-    // Check that entity_get_display() returns a fresh object when no
-    // configuration entry exists.
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertTrue($display->isNew());
-
-    // Add some components and save the display.
-    $display->setComponent('component_1', array('weight' => 10, 'settings' => array()))
-      ->save();
-
-    // Check that entity_get_display() returns the correct object.
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($display->isNew());
-    $this->assertEqual($display->id(), 'entity_test.entity_test.default');
-    $this->assertEqual($display->getComponent('component_1'), array( 'weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
-  }
-
-  /**
-   * Tests the behavior of a field component within an entity display object.
-   */
-  public function testExtraFieldComponent() {
-    entity_test_create_bundle('bundle_with_extra_fields');
-    $display = EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'bundle_with_extra_fields',
-      'mode' => 'default',
-    ));
-
-    // Check that the default visibility taken into account for extra fields
-    // unknown in the display.
-    $this->assertEqual($display->getComponent('display_extra_field'), array('weight' => 5));
-    $this->assertNull($display->getComponent('display_extra_field_hidden'));
-
-    // Check that setting explicit options overrides the defaults.
-    $display->removeComponent('display_extra_field');
-    $display->setComponent('display_extra_field_hidden', array('weight' => 10));
-    $this->assertNull($display->getComponent('display_extra_field'));
-    $this->assertEqual($display->getComponent('display_extra_field_hidden'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
-  }
-
-  /**
-   * Tests the behavior of a field component within an entity display object.
-   */
-  public function testFieldComponent() {
-    $field_name = 'test_field';
-    // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    $display = EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ));
-
-    // Check that providing no options results in default values being used.
-    $display->setComponent($field_name);
-    $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
-    $default_formatter = $field_type_info['default_formatter'];
-    $formatter_settings =  \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings($default_formatter);
-    $expected = array(
-      'weight' => -4,
-      'label' => 'above',
-      'type' => $default_formatter,
-      'settings' => $formatter_settings,
-      'third_party_settings' => array(),
-    );
-    $this->assertEqual($display->getComponent($field_name), $expected);
-
-    // Check that the getFormatter() method returns the correct formatter plugin.
-    $formatter = $display->getRenderer($field_name);
-    $this->assertEqual($formatter->getPluginId(), $default_formatter);
-    $this->assertEqual($formatter->getSettings(), $formatter_settings);
-
-    // Check that the formatter is statically persisted, by assigning an
-    // arbitrary property and reading it back.
-    $random_value = $this->randomString();
-    $formatter->randomValue = $random_value;
-    $formatter = $display->getRenderer($field_name);
-    $this->assertEqual($formatter->randomValue, $random_value);
-
-    // Check that changing the definition creates a new formatter.
-    $display->setComponent($field_name, array(
-      'type' => 'field_test_multiple',
-    ));
-    $formatter = $display->getRenderer($field_name);
-    $this->assertEqual($formatter->getPluginId(), 'field_test_multiple');
-    $this->assertFalse(isset($formatter->randomValue));
-
-    // Check that the display has dependencies on the field and the module that
-    // provides the formatter.
-    $dependencies = $display->calculateDependencies()->getDependencies();
-    $this->assertEqual(array('config' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
-  }
-
-  /**
-   * Tests the behavior of a field component for a base field.
-   */
-  public function testBaseFieldComponent() {
-    $display = EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test_base_field_display',
-      'bundle' => 'entity_test_base_field_display',
-      'mode' => 'default',
-    ));
-
-    // Check that default options are correctly filled in.
-    $formatter_settings =  \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('text_default');
-    $expected = array(
-      'test_no_display' => NULL,
-      'test_display_configurable' => array(
-        'label' => 'above',
-        'type' => 'text_default',
-        'settings' => $formatter_settings,
-        'third_party_settings' => array(),
-        'weight' => 10,
-      ),
-      'test_display_non_configurable' => array(
-        'label' => 'above',
-        'type' => 'text_default',
-        'settings' => $formatter_settings,
-        'third_party_settings' => array(),
-        'weight' => 11,
-      ),
-    );
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-
-    // Check that saving the display only writes data for fields whose display
-    // is configurable.
-    $display->save();
-    $config = $this->config('core.entity_view_display.' . $display->id());
-    $data = $config->get();
-    $this->assertFalse(isset($data['content']['test_no_display']));
-    $this->assertFalse(isset($data['hidden']['test_no_display']));
-    $this->assertEqual($data['content']['test_display_configurable'], $expected['test_display_configurable']);
-    $this->assertFalse(isset($data['content']['test_display_non_configurable']));
-    $this->assertFalse(isset($data['hidden']['test_display_non_configurable']));
-
-    // Check that defaults are correctly filled when loading the display.
-    $display = entity_load('entity_view_display', $display->id());
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-
-    // Check that data manually written for fields whose display is not
-    // configurable is discarded when loading the display.
-    $data['content']['test_display_non_configurable'] = $expected['test_display_non_configurable'];
-    $data['content']['test_display_non_configurable']['weight']++;
-    $config->setData($data)->save();
-    $display = entity_load('entity_view_display', $display->id());
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-  }
-
-  /**
-   * Tests deleting a bundle.
-   */
-  public function testDeleteBundle() {
-    // Create a node bundle, display and form display object.
-    $type = NodeType::create(array('type' => 'article'));
-    $type->save();
-    node_add_body_field($type);
-    entity_get_display('node', 'article', 'default')->save();
-    entity_get_form_display('node', 'article', 'default')->save();
-
-    // Delete the bundle.
-    $type->delete();
-    $display = entity_load('entity_view_display', 'node.article.default');
-    $this->assertFalse((bool) $display);
-    $form_display = entity_load('entity_form_display', 'node.article.default');
-    $this->assertFalse((bool) $form_display);
-  }
-
-  /**
-   * Tests deleting field.
-   */
-  public function testDeleteField() {
-    $field_name = 'test_field';
-    // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    // Create default and teaser entity display.
-    EntityViewMode::create(array('id' =>  'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
-    EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ))->setComponent($field_name)->save();
-    EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'teaser',
-    ))->setComponent($field_name)->save();
-
-    // Check the component exists.
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertTrue($display->getComponent($field_name));
-    $display = entity_get_display('entity_test', 'entity_test', 'teaser');
-    $this->assertTrue($display->getComponent($field_name));
-
-    // Delete the field.
-    $field->delete();
-
-    // Check that the component has been removed from the entity displays.
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($display->getComponent($field_name));
-    $display = entity_get_display('entity_test', 'entity_test', 'teaser');
-    $this->assertFalse($display->getComponent($field_name));
-  }
-
-  /**
-   * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
-   */
-  public function testOnDependencyRemoval() {
-    $this->enableModules(array('field_plugins_test'));
-
-    $field_name = 'test_field';
-    // Create a field.
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'text'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    EntityViewDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_formatter'))->save();
-
-    // Check the component exists and is of the correct type.
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertEqual($display->getComponent($field_name)['type'], 'field_plugins_test_text_formatter');
-
-    // Removing the field_plugins_test module should change the component to use
-    // the default formatter for test fields.
-    \Drupal::service('config.manager')->uninstall('module', 'field_plugins_test');
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertEqual($display->getComponent($field_name)['type'], 'text_default');
-
-    // Removing the text module should remove the field from the view display.
-    \Drupal::service('config.manager')->uninstall('module', 'text');
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($display->getComponent($field_name));
-  }
-
-  /**
-   * Ensure that entity view display changes invalidates cache tags.
-   */
-  public function testEntityDisplayInvalidateCacheTags() {
-    $cache = \Drupal::cache();
-    $cache->set('cid', 'kittens', Cache::PERMANENT, ['config:entity_view_display_list']);
-    $display = EntityViewDisplay::create([
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ]);
-    $display->setComponent('kitten');
-    $display->save();
-    $this->assertFalse($cache->get('cid'));
-  }
-
-  /**
-   * Test getDisplayModeOptions().
-   */
-  public function testGetDisplayModeOptions() {
-    NodeType::create(array('type' => 'article'))->save();
-
-    EntityViewDisplay::create(array(
-      'targetEntityType' => 'node',
-      'bundle' => 'article',
-      'mode' => 'default',
-    ))->setStatus(TRUE)->save();
-
-    $display_teaser = EntityViewDisplay::create(array(
-      'targetEntityType' => 'node',
-      'bundle' => 'article',
-      'mode' => 'teaser',
-    ));
-    $display_teaser->save();
-
-    EntityFormDisplay::create(array(
-      'targetEntityType' => 'user',
-      'bundle' => 'user',
-      'mode' => 'default',
-    ))->setStatus(TRUE)->save();
-
-    $form_display_teaser = EntityFormDisplay::create(array(
-      'targetEntityType' => 'user',
-      'bundle' => 'user',
-      'mode' => 'register',
-    ));
-    $form_display_teaser->save();
-
-    // Test getViewModeOptionsByBundle().
-    $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
-    $this->assertEqual($view_modes, array('default' => 'Default'));
-    $display_teaser->setStatus(TRUE)->save();
-    $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
-    $this->assertEqual($view_modes, array('default' => 'Default', 'teaser' => 'Teaser'));
-
-    // Test getFormModeOptionsByBundle().
-    $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
-    $this->assertEqual($form_modes, array('default' => 'Default'));
-    $form_display_teaser->setStatus(TRUE)->save();
-    $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
-    $this->assertEqual($form_modes, array('default' => 'Default', 'register' => 'Register'));
-  }
-
-  /**
-   * Tests components dependencies additions.
-   */
-  public function testComponentDependencies() {
-    $this->enableModules(['dblog', 'color']);
-    $this->installSchema('dblog', ['watchdog']);
-    $this->installEntitySchema('user');
-    /** @var \Drupal\user\RoleInterface[] $roles */
-    $roles = [];
-    // Create two arbitrary user roles.
-    for ($i = 0; $i < 2; $i++) {
-      $roles[$i] = Role::create([
-        'id' => Unicode::strtolower($this->randomMachineName()),
-        'label' => $this->randomString(),
-      ]);
-      $roles[$i]->save();
-    }
-
-    // Create a field of type 'test_field' attached to 'entity_test'.
-    $field_name = Unicode::strtolower($this->randomMachineName());
-    FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field',
-    ])->save();
-    FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    ])->save();
-
-    // Create a new form display without components.
-    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
-    $form_display = EntityFormDisplay::create([
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ]);
-    $form_display->save();
-
-    $dependencies = ['user.role.' . $roles[0]->id(), 'user.role.' . $roles[1]->id()];
-
-    // The config object should not depend on none of the two $roles.
-    $this->assertNoDependency('config', $dependencies[0], $form_display);
-    $this->assertNoDependency('config', $dependencies[1], $form_display);
-
-    // Add a widget of type 'test_field_widget'.
-    $component = [
-      'type' => 'test_field_widget',
-      'settings' => [
-        'test_widget_setting' => $this->randomString(),
-        'role' => $roles[0]->id(),
-        'role2' => $roles[1]->id(),
-      ],
-      'third_party_settings' => [
-        'color' => ['foo' => 'bar'],
-      ],
-    ];
-    $form_display->setComponent($field_name, $component);
-    $form_display->save();
-
-    // Now, the form display should depend on both user roles $roles.
-    $this->assertDependency('config', $dependencies[0], $form_display);
-    $this->assertDependency('config', $dependencies[1], $form_display);
-    // The form display should depend on 'color' module.
-    $this->assertDependency('module', 'color', $form_display);
-
-    // Delete the first user role entity.
-    $roles[0]->delete();
-
-    // Reload the form display.
-    $form_display = EntityFormDisplay::load($form_display->id());
-    // The display exists.
-    $this->assertFalse(empty($form_display));
-    // The form display should not depend on $role[0] anymore.
-    $this->assertNoDependency('config', $dependencies[0], $form_display);
-    // The form display should depend on 'anonymous' user role.
-    $this->assertDependency('config', 'user.role.anonymous', $form_display);
-    // The form display should depend on 'color' module.
-    $this->assertDependency('module', 'color', $form_display);
-
-    // Manually trigger the removal of configuration belonging to the module
-    // because KernelTestBase::disableModules() is not aware of this.
-    $this->container->get('config.manager')->uninstall('module', 'color');
-    // Uninstall 'color' module.
-    $this->disableModules(['color']);
-
-    // Reload the form display.
-    $form_display = EntityFormDisplay::load($form_display->id());
-    // The display exists.
-    $this->assertFalse(empty($form_display));
-    // The component is still enabled.
-    $this->assertNotNull($form_display->getComponent($field_name));
-    // The form display should not depend on 'color' module anymore.
-    $this->assertNoDependency('module', 'color', $form_display);
-
-    // Delete the 2nd user role entity.
-    $roles[1]->delete();
-
-    // Reload the form display.
-    $form_display = EntityFormDisplay::load($form_display->id());
-    // The display exists.
-    $this->assertFalse(empty($form_display));
-    // The component has been disabled.
-    $this->assertNull($form_display->getComponent($field_name));
-    $this->assertTrue($form_display->get('hidden')[$field_name]);
-    // The correct warning message has been logged.
-    $arguments = ['@display' => (string) t('Entity form display'), '@id' => $form_display->id(), '@name' => $field_name];
-    $logged = (bool) Database::getConnection()->select('watchdog', 'w')
-      ->fields('w', ['wid'])
-      ->condition('type', 'system')
-      ->condition('message', "@display '@id': Component '@name' was disabled because its settings depend on removed dependencies.")
-      ->condition('variables', serialize($arguments))
-      ->execute()
-      ->fetchAll();
-    $this->assertTrue($logged);
-  }
-
-  /**
-   * Asserts that $key is a $type type dependency of $display config entity.
-   *
-   * @param string $type
-   *   The dependency type: 'config', 'content', 'module' or 'theme'.
-   * @param string $key
-   *   The string to be checked.
-   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
-   *   The entity display object to get dependencies from.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertDependency($type, $key, EntityDisplayInterface $display) {
-    return $this->assertDependencyHelper(TRUE, $type, $key, $display);
-  }
-
-  /**
-   * Asserts that $key is not a $type type dependency of $display config entity.
-   *
-   * @param string $type
-   *   The dependency type: 'config', 'content', 'module' or 'theme'.
-   * @param string $key
-   *   The string to be checked.
-   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
-   *   The entity display object to get dependencies from.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNoDependency($type, $key, EntityDisplayInterface $display) {
-    return $this->assertDependencyHelper(FALSE, $type, $key, $display);
-  }
-
-  /**
-   * Provides a helper for dependency assertions.
-   *
-   * @param bool $assertion
-   *   Assertion: positive or negative.
-   * @param string $type
-   *   The dependency type: 'config', 'content', 'module' or 'theme'.
-   * @param string $key
-   *   The string to be checked.
-   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
-   *   The entity display object to get dependencies from.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertDependencyHelper($assertion, $type, $key, EntityDisplayInterface $display) {
-    $all_dependencies = $display->getDependencies();
-    $dependencies = !empty($all_dependencies[$type]) ? $all_dependencies[$type] : [];
-    $context = $display instanceof EntityViewDisplayInterface ? 'View' : 'Form';
-    $value = $assertion ? in_array($key, $dependencies) : !in_array($key, $dependencies);
-    $args = ['@context' => $context, '@id' => $display->id(), '@type' => $type, '@key' => $key];
-    $message = $assertion ? new FormattableMarkup("@context display '@id' depends on @type '@key'.", $args) : new FormattableMarkup("@context display '@id' do not depend on @type '@key'.", $args);
-    return $this->assert($value, $message);
-  }
-
-}
diff --git a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php b/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php
deleted file mode 100644
index b002106..0000000
--- a/core/modules/field_ui/src/Tests/EntityFormDisplayTest.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\field_ui\Tests\EntityFormDisplayTest.
- */
-
-namespace Drupal\field_ui\Tests;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\Core\Entity\Entity\EntityFormMode;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the entity display configuration entities.
- *
- * @group field_ui
- */
-class EntityFormDisplayTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var string[]
-   */
-  public static $modules = ['field_ui', 'field', 'entity_test', 'field_test', 'user', 'text'];
-
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tests entity_get_form_display().
-   */
-  public function testEntityGetFromDisplay() {
-    // Check that entity_get_form_display() returns a fresh object when no
-    // configuration entry exists.
-    $form_display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertTrue($form_display->isNew());
-
-    // Add some components and save the display.
-    $form_display->setComponent('component_1', array('weight' => 10))
-      ->save();
-
-    // Check that entity_get_form_display() returns the correct object.
-    $form_display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($form_display->isNew());
-    $this->assertEqual($form_display->id(), 'entity_test.entity_test.default');
-    $this->assertEqual($form_display->getComponent('component_1'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
-  }
-
-  /**
-   * Tests the behavior of a field component within an EntityFormDisplay object.
-   */
-  public function testFieldComponent() {
-    // Create a field storage and a field.
-    $field_name = 'test_field';
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    $form_display = EntityFormDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ));
-
-    // Check that providing no options results in default values being used.
-    $form_display->setComponent($field_name);
-    $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
-    $default_widget = $field_type_info['default_widget'];
-    $widget_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings($default_widget);
-    $expected = array(
-      'weight' => 0,
-      'type' => $default_widget,
-      'settings' => $widget_settings,
-      'third_party_settings' => array(),
-    );
-    $this->assertEqual($form_display->getComponent($field_name), $expected);
-
-    // Check that the getWidget() method returns the correct widget plugin.
-    $widget = $form_display->getRenderer($field_name);
-    $this->assertEqual($widget->getPluginId(), $default_widget);
-    $this->assertEqual($widget->getSettings(), $widget_settings);
-
-    // Check that the widget is statically persisted, by assigning an
-    // arbitrary property and reading it back.
-    $random_value = $this->randomString();
-    $widget->randomValue = $random_value;
-    $widget = $form_display->getRenderer($field_name);
-    $this->assertEqual($widget->randomValue, $random_value);
-
-    // Check that changing the definition creates a new widget.
-    $form_display->setComponent($field_name, array(
-      'type' => 'field_test_multiple',
-    ));
-    $widget = $form_display->getRenderer($field_name);
-    $this->assertEqual($widget->getPluginId(), 'test_field_widget');
-    $this->assertFalse(isset($widget->randomValue));
-
-    // Check that specifying an unknown widget (e.g. case of a disabled module)
-    // gets stored as is in the display, but results in the default widget being
-    // used.
-    $form_display->setComponent($field_name, array(
-      'type' => 'unknown_widget',
-    ));
-    $options = $form_display->getComponent($field_name);
-    $this->assertEqual($options['type'], 'unknown_widget');
-    $widget = $form_display->getRenderer($field_name);
-    $this->assertEqual($widget->getPluginId(), $default_widget);
-  }
-
-  /**
-   * Tests the behavior of a field component for a base field.
-   */
-  public function testBaseFieldComponent() {
-    $display = EntityFormDisplay::create(array(
-      'targetEntityType' => 'entity_test_base_field_display',
-      'bundle' => 'entity_test_base_field_display',
-      'mode' => 'default',
-    ));
-
-    // Check that default options are correctly filled in.
-    $formatter_settings =  \Drupal::service('plugin.manager.field.widget')->getDefaultSettings('text_textfield');
-    $expected = array(
-      'test_no_display' => NULL,
-      'test_display_configurable' => array(
-        'type' => 'text_textfield',
-        'settings' => $formatter_settings,
-        'third_party_settings' => array(),
-        'weight' => 10,
-      ),
-      'test_display_non_configurable' => array(
-        'type' => 'text_textfield',
-        'settings' => $formatter_settings,
-        'third_party_settings' => array(),
-        'weight' => 11,
-      ),
-    );
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-
-    // Check that saving the display only writes data for fields whose display
-    // is configurable.
-    $display->save();
-    $config = $this->config('core.entity_form_display.' . $display->id());
-    $data = $config->get();
-    $this->assertFalse(isset($data['content']['test_no_display']));
-    $this->assertFalse(isset($data['hidden']['test_no_display']));
-    $this->assertEqual($data['content']['test_display_configurable'], $expected['test_display_configurable']);
-    $this->assertFalse(isset($data['content']['test_display_non_configurable']));
-    $this->assertFalse(isset($data['hidden']['test_display_non_configurable']));
-
-    // Check that defaults are correctly filled when loading the display.
-    $display = entity_load('entity_form_display', $display->id());
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-
-    // Check that data manually written for fields whose display is not
-    // configurable is discarded when loading the display.
-    $data['content']['test_display_non_configurable'] = $expected['test_display_non_configurable'];
-    $data['content']['test_display_non_configurable']['weight']++;
-    $config->setData($data)->save();
-    $display = entity_load('entity_form_display', $display->id());
-    foreach ($expected as $field_name => $options) {
-      $this->assertEqual($display->getComponent($field_name), $options);
-    }
-  }
-
-  /**
-   * Tests deleting field.
-   */
-  public function testDeleteField() {
-    $field_name = 'test_field';
-    // Create a field storage and a field.
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    // Create default and compact entity display.
-    EntityFormMode::create(array('id' =>  'entity_test.compact', 'targetEntityType' => 'entity_test'))->save();
-    EntityFormDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ))->setComponent($field_name)->save();
-    EntityFormDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'compact',
-    ))->setComponent($field_name)->save();
-
-    // Check the component exists.
-    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertTrue($display->getComponent($field_name));
-    $display = entity_get_form_display('entity_test', 'entity_test', 'compact');
-    $this->assertTrue($display->getComponent($field_name));
-
-    // Delete the field.
-    $field->delete();
-
-    // Check that the component has been removed from the entity displays.
-    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($display->getComponent($field_name));
-    $display = entity_get_form_display('entity_test', 'entity_test', 'compact');
-    $this->assertFalse($display->getComponent($field_name));
-  }
-
-  /**
-   * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
-   */
-  public function testOnDependencyRemoval() {
-    $this->enableModules(array('field_plugins_test'));
-
-    $field_name = 'test_field';
-    // Create a field.
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'text'
-    ));
-    $field_storage->save();
-    $field = FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test',
-    ));
-    $field->save();
-
-    EntityFormDisplay::create(array(
-      'targetEntityType' => 'entity_test',
-      'bundle' => 'entity_test',
-      'mode' => 'default',
-    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_widget'))->save();
-
-    // Check the component exists and is of the correct type.
-    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertEqual($display->getComponent($field_name)['type'], 'field_plugins_test_text_widget');
-
-    // Removing the field_plugins_test module should change the component to use
-    // the default widget for test fields.
-    \Drupal::service('config.manager')->uninstall('module', 'field_plugins_test');
-    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertEqual($display->getComponent($field_name)['type'], 'text_textfield');
-
-    // Removing the text module should remove the field from the form display.
-    \Drupal::service('config.manager')->uninstall('module', 'text');
-    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
-    $this->assertFalse($display->getComponent($field_name));
-  }
-
-}
diff --git a/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php b/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
new file mode 100644
index 0000000..2be4747
--- /dev/null
+++ b/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
@@ -0,0 +1,655 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field_ui\Kernel\EntityDisplayTest.
+ */
+
+namespace Drupal\Tests\field_ui\Kernel;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\Display\EntityDisplayInterface;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\NodeType;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\Role;
+
+/**
+ * Tests the entity display configuration entities.
+ *
+ * @group field_ui
+ */
+class EntityDisplayTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var string[]
+   */
+  public static $modules = array('field_ui', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+    $this->installConfig(array('field', 'node', 'user'));
+  }
+
+  /**
+   * Tests basic CRUD operations on entity display objects.
+   */
+  public function testEntityDisplayCRUD() {
+    $display = EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ));
+
+    $expected = array();
+
+    // Check that providing no 'weight' results in the highest current weight
+    // being assigned. The 'name' field's formatter has weight -5, therefore
+    // these follow.
+    $expected['component_1'] = array('weight' => -4, 'settings' => array(), 'third_party_settings' => array());
+    $expected['component_2'] = array('weight' => -3, 'settings' => array(), 'third_party_settings' => array());
+    $display->setComponent('component_1');
+    $display->setComponent('component_2');
+    $this->assertEqual($display->getComponent('component_1'), $expected['component_1']);
+    $this->assertEqual($display->getComponent('component_2'), $expected['component_2']);
+
+    // Check that arbitrary options are correctly stored.
+    $expected['component_3'] = array('weight' => 10, 'third_party_settings' => array('field_test' => array('foo' => 'bar')), 'settings' => array());
+    $display->setComponent('component_3', $expected['component_3']);
+    $this->assertEqual($display->getComponent('component_3'), $expected['component_3']);
+
+    // Check that the display can be properly saved and read back.
+    $display->save();
+    $display = entity_load('entity_view_display', $display->id());
+    foreach (array('component_1', 'component_2', 'component_3') as $name) {
+      $this->assertEqual($display->getComponent($name), $expected[$name]);
+    }
+
+    // Ensure that third party settings were added to the config entity.
+    // These are added by entity_test_entity_presave() implemented in
+    // entity_test module.
+    $this->assertEqual('bar', $display->getThirdPartySetting('entity_test', 'foo'), 'Third party settings were added to the entity view display.');
+
+    // Check that getComponents() returns options for all components.
+    $expected['name'] = array(
+      'label' => 'hidden',
+      'type' => 'string',
+      'weight' => -5,
+      'settings' => array(
+        'link_to_entity' => FALSE,
+      ),
+      'third_party_settings' => array(),
+    );
+    $this->assertEqual($display->getComponents(), $expected);
+
+    // Check that a component can be removed.
+    $display->removeComponent('component_3');
+    $this->assertNULL($display->getComponent('component_3'));
+
+    // Check that the removal is correctly persisted.
+    $display->save();
+    $display = entity_load('entity_view_display', $display->id());
+    $this->assertNULL($display->getComponent('component_3'));
+
+    // Check that createCopy() creates a new component that can be correctly
+    // saved.
+    EntityViewMode::create(array('id' => $display->getTargetEntityTypeId() . '.other_view_mode', 'targetEntityType' => $display->getTargetEntityTypeId()))->save();
+    $new_display = $display->createCopy('other_view_mode');
+    $new_display->save();
+    $new_display = entity_load('entity_view_display', $new_display->id());
+    $dependencies = $new_display->calculateDependencies()->getDependencies();
+    $this->assertEqual(array('config' => array('core.entity_view_mode.entity_test.other_view_mode'), 'module' => array('entity_test')), $dependencies);
+    $this->assertEqual($new_display->getTargetEntityTypeId(), $display->getTargetEntityTypeId());
+    $this->assertEqual($new_display->getTargetBundle(), $display->getTargetBundle());
+    $this->assertEqual($new_display->getMode(), 'other_view_mode');
+    $this->assertEqual($new_display->getComponents(), $display->getComponents());
+  }
+
+  /**
+   *  Test sorting of components by name on basic CRUD operations
+   */
+  public function testEntityDisplayCRUDSort() {
+    $display = EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ));
+    $display->setComponent('component_3');
+    $display->setComponent('component_1');
+    $display->setComponent('component_2');
+    $display->save();
+    $components = array_keys($display->getComponents());
+    // The name field is not configurable so will be added automatically.
+    $expected = array ( 0 => 'component_1', 1 => 'component_2', 2 => 'component_3', 'name');
+    $this->assertIdentical($components, $expected);
+  }
+
+  /**
+   * Tests entity_get_display().
+   */
+  public function testEntityGetDisplay() {
+    // Check that entity_get_display() returns a fresh object when no
+    // configuration entry exists.
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertTrue($display->isNew());
+
+    // Add some components and save the display.
+    $display->setComponent('component_1', array('weight' => 10, 'settings' => array()))
+      ->save();
+
+    // Check that entity_get_display() returns the correct object.
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($display->isNew());
+    $this->assertEqual($display->id(), 'entity_test.entity_test.default');
+    $this->assertEqual($display->getComponent('component_1'), array( 'weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+  }
+
+  /**
+   * Tests the behavior of a field component within an entity display object.
+   */
+  public function testExtraFieldComponent() {
+    entity_test_create_bundle('bundle_with_extra_fields');
+    $display = EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'bundle_with_extra_fields',
+      'mode' => 'default',
+    ));
+
+    // Check that the default visibility taken into account for extra fields
+    // unknown in the display.
+    $this->assertEqual($display->getComponent('display_extra_field'), array('weight' => 5));
+    $this->assertNull($display->getComponent('display_extra_field_hidden'));
+
+    // Check that setting explicit options overrides the defaults.
+    $display->removeComponent('display_extra_field');
+    $display->setComponent('display_extra_field_hidden', array('weight' => 10));
+    $this->assertNull($display->getComponent('display_extra_field'));
+    $this->assertEqual($display->getComponent('display_extra_field_hidden'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+  }
+
+  /**
+   * Tests the behavior of a field component within an entity display object.
+   */
+  public function testFieldComponent() {
+    $field_name = 'test_field';
+    // Create a field storage and a field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    $display = EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ));
+
+    // Check that providing no options results in default values being used.
+    $display->setComponent($field_name);
+    $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
+    $default_formatter = $field_type_info['default_formatter'];
+    $formatter_settings =  \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings($default_formatter);
+    $expected = array(
+      'weight' => -4,
+      'label' => 'above',
+      'type' => $default_formatter,
+      'settings' => $formatter_settings,
+      'third_party_settings' => array(),
+    );
+    $this->assertEqual($display->getComponent($field_name), $expected);
+
+    // Check that the getFormatter() method returns the correct formatter plugin.
+    $formatter = $display->getRenderer($field_name);
+    $this->assertEqual($formatter->getPluginId(), $default_formatter);
+    $this->assertEqual($formatter->getSettings(), $formatter_settings);
+
+    // Check that the formatter is statically persisted, by assigning an
+    // arbitrary property and reading it back.
+    $random_value = $this->randomString();
+    $formatter->randomValue = $random_value;
+    $formatter = $display->getRenderer($field_name);
+    $this->assertEqual($formatter->randomValue, $random_value);
+
+    // Check that changing the definition creates a new formatter.
+    $display->setComponent($field_name, array(
+      'type' => 'field_test_multiple',
+    ));
+    $formatter = $display->getRenderer($field_name);
+    $this->assertEqual($formatter->getPluginId(), 'field_test_multiple');
+    $this->assertFalse(isset($formatter->randomValue));
+
+    // Check that the display has dependencies on the field and the module that
+    // provides the formatter.
+    $dependencies = $display->calculateDependencies()->getDependencies();
+    $this->assertEqual(array('config' => array('field.field.entity_test.entity_test.test_field'), 'module' => array('entity_test', 'field_test')), $dependencies);
+  }
+
+  /**
+   * Tests the behavior of a field component for a base field.
+   */
+  public function testBaseFieldComponent() {
+    $display = EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test_base_field_display',
+      'bundle' => 'entity_test_base_field_display',
+      'mode' => 'default',
+    ));
+
+    // Check that default options are correctly filled in.
+    $formatter_settings =  \Drupal::service('plugin.manager.field.formatter')->getDefaultSettings('text_default');
+    $expected = array(
+      'test_no_display' => NULL,
+      'test_display_configurable' => array(
+        'label' => 'above',
+        'type' => 'text_default',
+        'settings' => $formatter_settings,
+        'third_party_settings' => array(),
+        'weight' => 10,
+      ),
+      'test_display_non_configurable' => array(
+        'label' => 'above',
+        'type' => 'text_default',
+        'settings' => $formatter_settings,
+        'third_party_settings' => array(),
+        'weight' => 11,
+      ),
+    );
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+
+    // Check that saving the display only writes data for fields whose display
+    // is configurable.
+    $display->save();
+    $config = $this->config('core.entity_view_display.' . $display->id());
+    $data = $config->get();
+    $this->assertFalse(isset($data['content']['test_no_display']));
+    $this->assertFalse(isset($data['hidden']['test_no_display']));
+    $this->assertEqual($data['content']['test_display_configurable'], $expected['test_display_configurable']);
+    $this->assertFalse(isset($data['content']['test_display_non_configurable']));
+    $this->assertFalse(isset($data['hidden']['test_display_non_configurable']));
+
+    // Check that defaults are correctly filled when loading the display.
+    $display = entity_load('entity_view_display', $display->id());
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+
+    // Check that data manually written for fields whose display is not
+    // configurable is discarded when loading the display.
+    $data['content']['test_display_non_configurable'] = $expected['test_display_non_configurable'];
+    $data['content']['test_display_non_configurable']['weight']++;
+    $config->setData($data)->save();
+    $display = entity_load('entity_view_display', $display->id());
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+  }
+
+  /**
+   * Tests deleting a bundle.
+   */
+  public function testDeleteBundle() {
+    // Create a node bundle, display and form display object.
+    $type = NodeType::create(array('type' => 'article'));
+    $type->save();
+    node_add_body_field($type);
+    entity_get_display('node', 'article', 'default')->save();
+    entity_get_form_display('node', 'article', 'default')->save();
+
+    // Delete the bundle.
+    $type->delete();
+    $display = entity_load('entity_view_display', 'node.article.default');
+    $this->assertFalse((bool) $display);
+    $form_display = entity_load('entity_form_display', 'node.article.default');
+    $this->assertFalse((bool) $form_display);
+  }
+
+  /**
+   * Tests deleting field.
+   */
+  public function testDeleteField() {
+    $field_name = 'test_field';
+    // Create a field storage and a field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    // Create default and teaser entity display.
+    EntityViewMode::create(array('id' =>  'entity_test.teaser', 'targetEntityType' => 'entity_test'))->save();
+    EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ))->setComponent($field_name)->save();
+    EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'teaser',
+    ))->setComponent($field_name)->save();
+
+    // Check the component exists.
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertTrue($display->getComponent($field_name));
+    $display = entity_get_display('entity_test', 'entity_test', 'teaser');
+    $this->assertTrue($display->getComponent($field_name));
+
+    // Delete the field.
+    $field->delete();
+
+    // Check that the component has been removed from the entity displays.
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($display->getComponent($field_name));
+    $display = entity_get_display('entity_test', 'entity_test', 'teaser');
+    $this->assertFalse($display->getComponent($field_name));
+  }
+
+  /**
+   * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
+   */
+  public function testOnDependencyRemoval() {
+    $this->enableModules(array('field_plugins_test'));
+
+    $field_name = 'test_field';
+    // Create a field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'text'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    EntityViewDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_formatter'))->save();
+
+    // Check the component exists and is of the correct type.
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertEqual($display->getComponent($field_name)['type'], 'field_plugins_test_text_formatter');
+
+    // Removing the field_plugins_test module should change the component to use
+    // the default formatter for test fields.
+    \Drupal::service('config.manager')->uninstall('module', 'field_plugins_test');
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertEqual($display->getComponent($field_name)['type'], 'text_default');
+
+    // Removing the text module should remove the field from the view display.
+    \Drupal::service('config.manager')->uninstall('module', 'text');
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($display->getComponent($field_name));
+  }
+
+  /**
+   * Ensure that entity view display changes invalidates cache tags.
+   */
+  public function testEntityDisplayInvalidateCacheTags() {
+    $cache = \Drupal::cache();
+    $cache->set('cid', 'kittens', Cache::PERMANENT, ['config:entity_view_display_list']);
+    $display = EntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ]);
+    $display->setComponent('kitten');
+    $display->save();
+    $this->assertFalse($cache->get('cid'));
+  }
+
+  /**
+   * Test getDisplayModeOptions().
+   */
+  public function testGetDisplayModeOptions() {
+    NodeType::create(array('type' => 'article'))->save();
+
+    EntityViewDisplay::create(array(
+      'targetEntityType' => 'node',
+      'bundle' => 'article',
+      'mode' => 'default',
+    ))->setStatus(TRUE)->save();
+
+    $display_teaser = EntityViewDisplay::create(array(
+      'targetEntityType' => 'node',
+      'bundle' => 'article',
+      'mode' => 'teaser',
+    ));
+    $display_teaser->save();
+
+    EntityFormDisplay::create(array(
+      'targetEntityType' => 'user',
+      'bundle' => 'user',
+      'mode' => 'default',
+    ))->setStatus(TRUE)->save();
+
+    $form_display_teaser = EntityFormDisplay::create(array(
+      'targetEntityType' => 'user',
+      'bundle' => 'user',
+      'mode' => 'register',
+    ));
+    $form_display_teaser->save();
+
+    // Test getViewModeOptionsByBundle().
+    $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
+    $this->assertEqual($view_modes, array('default' => 'Default'));
+    $display_teaser->setStatus(TRUE)->save();
+    $view_modes = \Drupal::entityManager()->getViewModeOptionsByBundle('node', 'article');
+    $this->assertEqual($view_modes, array('default' => 'Default', 'teaser' => 'Teaser'));
+
+    // Test getFormModeOptionsByBundle().
+    $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
+    $this->assertEqual($form_modes, array('default' => 'Default'));
+    $form_display_teaser->setStatus(TRUE)->save();
+    $form_modes = \Drupal::entityManager()->getFormModeOptionsByBundle('user', 'user');
+    $this->assertEqual($form_modes, array('default' => 'Default', 'register' => 'Register'));
+  }
+
+  /**
+   * Tests components dependencies additions.
+   */
+  public function testComponentDependencies() {
+    $this->enableModules(['dblog', 'color']);
+    $this->installSchema('dblog', ['watchdog']);
+    $this->installEntitySchema('user');
+    /** @var \Drupal\user\RoleInterface[] $roles */
+    $roles = [];
+    // Create two arbitrary user roles.
+    for ($i = 0; $i < 2; $i++) {
+      $roles[$i] = Role::create([
+        'id' => Unicode::strtolower($this->randomMachineName()),
+        'label' => $this->randomString(),
+      ]);
+      $roles[$i]->save();
+    }
+
+    // Create a field of type 'test_field' attached to 'entity_test'.
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field',
+    ])->save();
+    FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ])->save();
+
+    // Create a new form display without components.
+    /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */
+    $form_display = EntityFormDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ]);
+    $form_display->save();
+
+    $dependencies = ['user.role.' . $roles[0]->id(), 'user.role.' . $roles[1]->id()];
+
+    // The config object should not depend on none of the two $roles.
+    $this->assertNoDependency('config', $dependencies[0], $form_display);
+    $this->assertNoDependency('config', $dependencies[1], $form_display);
+
+    // Add a widget of type 'test_field_widget'.
+    $component = [
+      'type' => 'test_field_widget',
+      'settings' => [
+        'test_widget_setting' => $this->randomString(),
+        'role' => $roles[0]->id(),
+        'role2' => $roles[1]->id(),
+      ],
+      'third_party_settings' => [
+        'color' => ['foo' => 'bar'],
+      ],
+    ];
+    $form_display->setComponent($field_name, $component);
+    $form_display->save();
+
+    // Now, the form display should depend on both user roles $roles.
+    $this->assertDependency('config', $dependencies[0], $form_display);
+    $this->assertDependency('config', $dependencies[1], $form_display);
+    // The form display should depend on 'color' module.
+    $this->assertDependency('module', 'color', $form_display);
+
+    // Delete the first user role entity.
+    $roles[0]->delete();
+
+    // Reload the form display.
+    $form_display = EntityFormDisplay::load($form_display->id());
+    // The display exists.
+    $this->assertFalse(empty($form_display));
+    // The form display should not depend on $role[0] anymore.
+    $this->assertNoDependency('config', $dependencies[0], $form_display);
+    // The form display should depend on 'anonymous' user role.
+    $this->assertDependency('config', 'user.role.anonymous', $form_display);
+    // The form display should depend on 'color' module.
+    $this->assertDependency('module', 'color', $form_display);
+
+    // Manually trigger the removal of configuration belonging to the module
+    // because KernelTestBase::disableModules() is not aware of this.
+    $this->container->get('config.manager')->uninstall('module', 'color');
+    // Uninstall 'color' module.
+    $this->disableModules(['color']);
+
+    // Reload the form display.
+    $form_display = EntityFormDisplay::load($form_display->id());
+    // The display exists.
+    $this->assertFalse(empty($form_display));
+    // The component is still enabled.
+    $this->assertNotNull($form_display->getComponent($field_name));
+    // The form display should not depend on 'color' module anymore.
+    $this->assertNoDependency('module', 'color', $form_display);
+
+    // Delete the 2nd user role entity.
+    $roles[1]->delete();
+
+    // Reload the form display.
+    $form_display = EntityFormDisplay::load($form_display->id());
+    // The display exists.
+    $this->assertFalse(empty($form_display));
+    // The component has been disabled.
+    $this->assertNull($form_display->getComponent($field_name));
+    $this->assertTrue($form_display->get('hidden')[$field_name]);
+    // The correct warning message has been logged.
+    $arguments = ['@display' => (string) t('Entity form display'), '@id' => $form_display->id(), '@name' => $field_name];
+    $logged = (bool) Database::getConnection()->select('watchdog', 'w')
+      ->fields('w', ['wid'])
+      ->condition('type', 'system')
+      ->condition('message', "@display '@id': Component '@name' was disabled because its settings depend on removed dependencies.")
+      ->condition('variables', serialize($arguments))
+      ->execute()
+      ->fetchAll();
+    $this->assertTrue($logged);
+  }
+
+  /**
+   * Asserts that $key is a $type type dependency of $display config entity.
+   *
+   * @param string $type
+   *   The dependency type: 'config', 'content', 'module' or 'theme'.
+   * @param string $key
+   *   The string to be checked.
+   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
+   *   The entity display object to get dependencies from.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertDependency($type, $key, EntityDisplayInterface $display) {
+    return $this->assertDependencyHelper(TRUE, $type, $key, $display);
+  }
+
+  /**
+   * Asserts that $key is not a $type type dependency of $display config entity.
+   *
+   * @param string $type
+   *   The dependency type: 'config', 'content', 'module' or 'theme'.
+   * @param string $key
+   *   The string to be checked.
+   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
+   *   The entity display object to get dependencies from.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertNoDependency($type, $key, EntityDisplayInterface $display) {
+    return $this->assertDependencyHelper(FALSE, $type, $key, $display);
+  }
+
+  /**
+   * Provides a helper for dependency assertions.
+   *
+   * @param bool $assertion
+   *   Assertion: positive or negative.
+   * @param string $type
+   *   The dependency type: 'config', 'content', 'module' or 'theme'.
+   * @param string $key
+   *   The string to be checked.
+   * @param \Drupal\Core\Entity\Display\EntityDisplayInterface $display
+   *   The entity display object to get dependencies from.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertDependencyHelper($assertion, $type, $key, EntityDisplayInterface $display) {
+    $all_dependencies = $display->getDependencies();
+    $dependencies = !empty($all_dependencies[$type]) ? $all_dependencies[$type] : [];
+    $context = $display instanceof EntityViewDisplayInterface ? 'View' : 'Form';
+    $value = $assertion ? in_array($key, $dependencies) : !in_array($key, $dependencies);
+    $args = ['@context' => $context, '@id' => $display->id(), '@type' => $type, '@key' => $key];
+    $message = $assertion ? new FormattableMarkup("@context display '@id' depends on @type '@key'.", $args) : new FormattableMarkup("@context display '@id' do not depend on @type '@key'.", $args);
+    return $this->assert($value, $message);
+  }
+
+}
diff --git a/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php b/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
new file mode 100644
index 0000000..c8bced0
--- /dev/null
+++ b/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
@@ -0,0 +1,271 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\field_ui\Kernel\EntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\field_ui\Kernel;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityFormMode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the entity display configuration entities.
+ *
+ * @group field_ui
+ */
+class EntityFormDisplayTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var string[]
+   */
+  public static $modules = ['field_ui', 'field', 'entity_test', 'field_test', 'user', 'text'];
+
+  protected function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * Tests entity_get_form_display().
+   */
+  public function testEntityGetFromDisplay() {
+    // Check that entity_get_form_display() returns a fresh object when no
+    // configuration entry exists.
+    $form_display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertTrue($form_display->isNew());
+
+    // Add some components and save the display.
+    $form_display->setComponent('component_1', array('weight' => 10))
+      ->save();
+
+    // Check that entity_get_form_display() returns the correct object.
+    $form_display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($form_display->isNew());
+    $this->assertEqual($form_display->id(), 'entity_test.entity_test.default');
+    $this->assertEqual($form_display->getComponent('component_1'), array('weight' => 10, 'settings' => array(), 'third_party_settings' => array()));
+  }
+
+  /**
+   * Tests the behavior of a field component within an EntityFormDisplay object.
+   */
+  public function testFieldComponent() {
+    // Create a field storage and a field.
+    $field_name = 'test_field';
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    $form_display = EntityFormDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ));
+
+    // Check that providing no options results in default values being used.
+    $form_display->setComponent($field_name);
+    $field_type_info = \Drupal::service('plugin.manager.field.field_type')->getDefinition($field_storage->getType());
+    $default_widget = $field_type_info['default_widget'];
+    $widget_settings = \Drupal::service('plugin.manager.field.widget')->getDefaultSettings($default_widget);
+    $expected = array(
+      'weight' => 3,
+      'type' => $default_widget,
+      'settings' => $widget_settings,
+      'third_party_settings' => array(),
+    );
+    $this->assertEqual($form_display->getComponent($field_name), $expected);
+
+    // Check that the getWidget() method returns the correct widget plugin.
+    $widget = $form_display->getRenderer($field_name);
+    $this->assertEqual($widget->getPluginId(), $default_widget);
+    $this->assertEqual($widget->getSettings(), $widget_settings);
+
+    // Check that the widget is statically persisted, by assigning an
+    // arbitrary property and reading it back.
+    $random_value = $this->randomString();
+    $widget->randomValue = $random_value;
+    $widget = $form_display->getRenderer($field_name);
+    $this->assertEqual($widget->randomValue, $random_value);
+
+    // Check that changing the definition creates a new widget.
+    $form_display->setComponent($field_name, array(
+      'type' => 'field_test_multiple',
+    ));
+    $widget = $form_display->getRenderer($field_name);
+    $this->assertEqual($widget->getPluginId(), 'test_field_widget');
+    $this->assertFalse(isset($widget->randomValue));
+
+    // Check that specifying an unknown widget (e.g. case of a disabled module)
+    // gets stored as is in the display, but results in the default widget being
+    // used.
+    $form_display->setComponent($field_name, array(
+      'type' => 'unknown_widget',
+    ));
+    $options = $form_display->getComponent($field_name);
+    $this->assertEqual($options['type'], 'unknown_widget');
+    $widget = $form_display->getRenderer($field_name);
+    $this->assertEqual($widget->getPluginId(), $default_widget);
+  }
+
+  /**
+   * Tests the behavior of a field component for a base field.
+   */
+  public function testBaseFieldComponent() {
+    $display = EntityFormDisplay::create(array(
+      'targetEntityType' => 'entity_test_base_field_display',
+      'bundle' => 'entity_test_base_field_display',
+      'mode' => 'default',
+    ));
+
+    // Check that default options are correctly filled in.
+    $formatter_settings =  \Drupal::service('plugin.manager.field.widget')->getDefaultSettings('text_textfield');
+    $expected = array(
+      'test_no_display' => NULL,
+      'test_display_configurable' => array(
+        'type' => 'text_textfield',
+        'settings' => $formatter_settings,
+        'third_party_settings' => array(),
+        'weight' => 10,
+      ),
+      'test_display_non_configurable' => array(
+        'type' => 'text_textfield',
+        'settings' => $formatter_settings,
+        'third_party_settings' => array(),
+        'weight' => 11,
+      ),
+    );
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+
+    // Check that saving the display only writes data for fields whose display
+    // is configurable.
+    $display->save();
+    $config = $this->config('core.entity_form_display.' . $display->id());
+    $data = $config->get();
+    $this->assertFalse(isset($data['content']['test_no_display']));
+    $this->assertFalse(isset($data['hidden']['test_no_display']));
+    $this->assertEqual($data['content']['test_display_configurable'], $expected['test_display_configurable']);
+    $this->assertFalse(isset($data['content']['test_display_non_configurable']));
+    $this->assertFalse(isset($data['hidden']['test_display_non_configurable']));
+
+    // Check that defaults are correctly filled when loading the display.
+    $display = entity_load('entity_form_display', $display->id());
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+
+    // Check that data manually written for fields whose display is not
+    // configurable is discarded when loading the display.
+    $data['content']['test_display_non_configurable'] = $expected['test_display_non_configurable'];
+    $data['content']['test_display_non_configurable']['weight']++;
+    $config->setData($data)->save();
+    $display = entity_load('entity_form_display', $display->id());
+    foreach ($expected as $field_name => $options) {
+      $this->assertEqual($display->getComponent($field_name), $options);
+    }
+  }
+
+  /**
+   * Tests deleting field.
+   */
+  public function testDeleteField() {
+    $field_name = 'test_field';
+    // Create a field storage and a field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    // Create default and compact entity display.
+    EntityFormMode::create(array('id' =>  'entity_test.compact', 'targetEntityType' => 'entity_test'))->save();
+    EntityFormDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ))->setComponent($field_name)->save();
+    EntityFormDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'compact',
+    ))->setComponent($field_name)->save();
+
+    // Check the component exists.
+    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertTrue($display->getComponent($field_name));
+    $display = entity_get_form_display('entity_test', 'entity_test', 'compact');
+    $this->assertTrue($display->getComponent($field_name));
+
+    // Delete the field.
+    $field->delete();
+
+    // Check that the component has been removed from the entity displays.
+    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($display->getComponent($field_name));
+    $display = entity_get_form_display('entity_test', 'entity_test', 'compact');
+    $this->assertFalse($display->getComponent($field_name));
+  }
+
+  /**
+   * Tests \Drupal\Core\Entity\EntityDisplayBase::onDependencyRemoval().
+   */
+  public function testOnDependencyRemoval() {
+    $this->enableModules(array('field_plugins_test'));
+
+    $field_name = 'test_field';
+    // Create a field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'text'
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test',
+    ));
+    $field->save();
+
+    EntityFormDisplay::create(array(
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+    ))->setComponent($field_name, array('type' => 'field_plugins_test_text_widget'))->save();
+
+    // Check the component exists and is of the correct type.
+    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertEqual($display->getComponent($field_name)['type'], 'field_plugins_test_text_widget');
+
+    // Removing the field_plugins_test module should change the component to use
+    // the default widget for test fields.
+    \Drupal::service('config.manager')->uninstall('module', 'field_plugins_test');
+    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertEqual($display->getComponent($field_name)['type'], 'text_textfield');
+
+    // Removing the text module should remove the field from the form display.
+    \Drupal::service('config.manager')->uninstall('module', 'text');
+    $display = entity_get_form_display('entity_test', 'entity_test', 'default');
+    $this->assertFalse($display->getComponent($field_name));
+  }
+
+}
diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml
index e5e30bd..e5edee2 100644
--- a/core/modules/file/config/optional/views.view.files.yml
+++ b/core/modules/file/config/optional/views.view.files.yml
@@ -247,7 +247,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Mime type'
+          label: 'MIME type'
           exclude: false
           alter:
             alter_text: false
@@ -623,7 +623,7 @@ display:
           exposed: true
           expose:
             operator_id: filemime_op
-            label: 'Mime type'
+            label: 'MIME type'
             description: ''
             use_operator: false
             operator: filemime_op
diff --git a/core/modules/file/config/schema/file.destination.schema.yml b/core/modules/file/config/schema/file.destination.schema.yml
deleted file mode 100644
index c6b197f..0000000
--- a/core/modules/file/config/schema/file.destination.schema.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-migrate.destination.entity:file:
-  type: migrate_destination
-  label: 'File'
-  mapping:
-    source_path_property:
-      type: string
-      label: 'Source path'
-    urlencode:
-      type: boolean
-      label: 'Whether to urlencode incoming file paths'
diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml
index 0d41b90..b9f8918 100644
--- a/core/modules/file/config/schema/file.schema.yml
+++ b/core/modules/file/config/schema/file.schema.yml
@@ -121,11 +121,3 @@ field.formatter.settings.file_extension:
     extension_detect_tar:
       type: boolean
       label: 'Detect tar'
-
-migrate.source.d6_upload_instance:
-  type: migrate_source_sql
-  label: 'Drupal 6 upload form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
diff --git a/core/modules/file/file.install b/core/modules/file/file.install
index 35a5737..05eedf0 100644
--- a/core/modules/file/file.install
+++ b/core/modules/file/file.install
@@ -98,18 +98,18 @@ function file_requirements($phase) {
     }
     elseif (!$implementation && extension_loaded('apcu')) {
       $value = t('Not enabled');
-      $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add <code>apc.rfc1867 = 1</code> to your php.ini configuration. Alternatively, it is recommended to use <a href=":url">PECL uploadprogress</a>, which supports more than one simultaneous upload.', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
+      $description = t('Your server is capable of displaying file upload progress through APC, but it is not enabled. Add <code>apc.rfc1867 = 1</code> to your php.ini configuration. Alternatively, it is recommended to use <a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress</a>, which supports more than one simultaneous upload.');
     }
     elseif (!$implementation) {
       $value = t('Not enabled');
-      $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the <a href=":uploadprogress_url">PECL uploadprogress library</a> (preferred) or to install <a href=":apc_url">APC</a>.', array(':uploadprogress_url' => 'http://pecl.php.net/package/uploadprogress', ':apc_url' => 'http://php.net/apcu'));
+      $description = t('Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the <a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress library</a> (preferred) or to install <a href="http://php.net/apcu">APC</a>.');
     }
     elseif ($implementation == 'apc') {
-      $value = t('Enabled (<a href=":url">APC RFC1867</a>)', array(':url' => 'http://php.net/manual/en/apcu.configuration.php#ini.apcu.rfc1867'));
-      $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the <a href=":url">PECL uploadprogress library</a> if possible.', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
+      $value = t('Enabled (<a href="http://php.net/manual/apcu.configuration.php#ini.apcu.rfc1867">APC RFC1867</a>)');
+      $description = t('Your server is capable of displaying file upload progress using APC RFC1867. Note that only one upload at a time is supported. It is recommended to use the <a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress library</a> if possible.');
     }
     elseif ($implementation == 'uploadprogress') {
-      $value = t('Enabled (<a href=":url">PECL uploadprogress</a>)', array(':url' => 'http://pecl.php.net/package/uploadprogress'));
+      $value = t('Enabled (<a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress</a>)');
     }
     $requirements['file_progress'] = array(
       'title' => t('Upload progress'),
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index fd17021..310eb26 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -504,11 +504,11 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM
 
   if ($uri = file_unmanaged_save_data($data, $destination, $replace)) {
     // Create a file entity.
-    $file = entity_create('file', array(
+    $file = File::create([
       'uri' => $uri,
       'uid' => $user->id(),
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     // If we are replacing an existing file re-use its database record.
     // @todo Do not create a new entity in order to update it. See
     //   https://www.drupal.org/node/2241865.
@@ -772,7 +772,7 @@ function file_save_upload($form_field_name, $validators = array(), $destination
       'filesize' => $file_info->getSize(),
     );
     $values['filemime'] = \Drupal::service('file.mime_type.guesser')->guess($values['filename']);
-    $file = entity_create('file', $values);
+    $file = File::create($values);
 
     $extensions = '';
     if (isset($validators['file_validate_extensions'])) {
@@ -1266,7 +1266,7 @@ function template_preprocess_file_link(&$variables) {
     'file',
     // Add a specific class for each and every mime type.
     'file--mime-' . strtr($mime_type, array('/' => '-', '.' => '-')),
-    // Add a more general class for groups of well known mime types.
+    // Add a more general class for groups of well known MIME types.
     'file--' . file_icon_class($mime_type),
   );
 
diff --git a/core/modules/file/migration_templates/d6_upload.yml b/core/modules/file/migration_templates/d6_upload.yml
index 4935a41..75164a8 100644
--- a/core/modules/file/migration_templates/d6_upload.yml
+++ b/core/modules/file/migration_templates/d6_upload.yml
@@ -23,5 +23,5 @@ destination:
 migration_dependencies:
   required:
     - d6_file
-    - d6_node:*
+    - d6_node
     - d6_upload_field_instance
diff --git a/core/modules/file/src/FileViewsData.php b/core/modules/file/src/FileViewsData.php
index 7acbabc..4065e2d 100644
--- a/core/modules/file/src/FileViewsData.php
+++ b/core/modules/file/src/FileViewsData.php
@@ -21,7 +21,7 @@ public function getViewsData() {
     $data = parent::getViewsData();
 
     // @TODO There is no corresponding information in entity metadata.
-    $data['file_managed']['table']['base']['help'] = t('Files maintained by Drupal and various modules.');
+    $data['file_managed']['table']['base']['help'] = $this->t('Files maintained by Drupal and various modules.');
     $data['file_managed']['table']['base']['defaults']['field'] = 'filename';
     $data['file_managed']['table']['wizard_id'] = 'file_managed';
 
@@ -32,13 +32,13 @@ public function getViewsData() {
       'numeric' => TRUE,
     );
     $data['file_managed']['fid']['relationship'] = array(
-      'title' => t('File usage'),
-      'help' => t('Relate file entities to their usage.'),
+      'title' => $this->t('File usage'),
+      'help' => $this->t('Relate file entities to their usage.'),
       'id' => 'standard',
       'base' => 'file_usage',
       'base field' => 'fid',
       'field' => 'fid',
-      'label' => t('File usage'),
+      'label' => $this->t('File usage'),
     );
 
     $data['file_managed']['uri']['field']['default_formatter'] = 'file_uri';
@@ -46,8 +46,8 @@ public function getViewsData() {
     $data['file_managed']['filemime']['field']['default_formatter'] = 'file_filemime';
 
     $data['file_managed']['extension'] = array(
-      'title' => t('Extension'),
-      'help' => t('The extension of the file.'),
+      'title' => $this->t('Extension'),
+      'help' => $this->t('The extension of the file.'),
       'real field' => 'filename',
       'field' => array(
         'entity_type' => 'file',
@@ -63,14 +63,14 @@ public function getViewsData() {
     $data['file_managed']['status']['field']['default_formatter_settings'] = [
       'format' => 'custom',
       'format_custom_false' => $this->t('Temporary'),
-      'format_custom_true' => t('Permanent'),
+      'format_custom_true' => $this->t('Permanent'),
     ];
     $data['file_managed']['status']['filter']['id'] = 'file_status';
 
-    $data['file_managed']['uid']['relationship']['title'] = t('User who uploaded');
-    $data['file_managed']['uid']['relationship']['label'] = t('User who uploaded');
+    $data['file_managed']['uid']['relationship']['title'] = $this->t('User who uploaded');
+    $data['file_managed']['uid']['relationship']['label'] = $this->t('User who uploaded');
 
-    $data['file_usage']['table']['group']  = t('File Usage');
+    $data['file_usage']['table']['group']  = $this->t('File Usage');
 
     // Provide field-type-things to several base tables; on the core files table
     // ("file_managed") so that we can create relationships from files to
@@ -119,15 +119,15 @@ public function getViewsData() {
 
     // Describes relationships between files and nodes.
     $data['file_usage']['file_to_node'] = array(
-      'title' => t('Content'),
-      'help' => t('Content that is associated with this file, usually because this file is in a field on the content.'),
+      'title' => $this->t('Content'),
+      'help' => $this->t('Content that is associated with this file, usually because this file is in a field on the content.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
       'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'id',
       'relationship' => array(
-        'title' => t('Content'),
-        'label' => t('Content'),
+        'title' => $this->t('Content'),
+        'label' => $this->t('Content'),
         'base' => 'node_field_data',
         'base field' => 'nid',
         'relationship field' => 'id',
@@ -135,15 +135,15 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['node_to_file'] = array(
-      'title' => t('File'),
-      'help' => t('A file that is associated with this node, usually because it is in a field on the node.'),
+      'title' => $this->t('File'),
+      'help' => $this->t('A file that is associated with this node, usually because it is in a field on the node.'),
       // Only provide this field/relationship/etc.,
       // when the 'node' base table is present.
       'skip base' => array('file_managed', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'fid',
       'relationship' => array(
-        'title' => t('File'),
-        'label' => t('File'),
+        'title' => $this->t('File'),
+        'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
@@ -152,15 +152,15 @@ public function getViewsData() {
 
     // Describes relationships between files and users.
     $data['file_usage']['file_to_user'] = array(
-      'title' => t('User'),
-      'help' => t('A user that is associated with this file, usually because this file is in a field on the user.'),
+      'title' => $this->t('User'),
+      'help' => $this->t('A user that is associated with this file, usually because this file is in a field on the user.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
       'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'id',
       'relationship' => array(
-        'title' => t('User'),
-        'label' => t('User'),
+        'title' => $this->t('User'),
+        'label' => $this->t('User'),
         'base' => 'users',
         'base field' => 'uid',
         'relationship field' => 'id',
@@ -168,15 +168,15 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['user_to_file'] = array(
-      'title' => t('File'),
-      'help' => t('A file that is associated with this user, usually because it is in a field on the user.'),
+      'title' => $this->t('File'),
+      'help' => $this->t('A file that is associated with this user, usually because it is in a field on the user.'),
       // Only provide this field/relationship/etc.,
       // when the 'users' base table is present.
       'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'fid',
       'relationship' => array(
-        'title' => t('File'),
-        'label' => t('File'),
+        'title' => $this->t('File'),
+        'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
@@ -185,15 +185,15 @@ public function getViewsData() {
 
     // Describes relationships between files and comments.
     $data['file_usage']['file_to_comment'] = array(
-      'title' => t('Comment'),
-      'help' => t('A comment that is associated with this file, usually because this file is in a field on the comment.'),
+      'title' => $this->t('Comment'),
+      'help' => $this->t('A comment that is associated with this file, usually because this file is in a field on the comment.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
       'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'id',
       'relationship' => array(
-        'title' => t('Comment'),
-        'label' => t('Comment'),
+        'title' => $this->t('Comment'),
+        'label' => $this->t('Comment'),
         'base' => 'comment_field_data',
         'base field' => 'cid',
         'relationship field' => 'id',
@@ -201,15 +201,15 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['comment_to_file'] = array(
-      'title' => t('File'),
-      'help' => t('A file that is associated with this comment, usually because it is in a field on the comment.'),
+      'title' => $this->t('File'),
+      'help' => $this->t('A file that is associated with this comment, usually because it is in a field on the comment.'),
       // Only provide this field/relationship/etc.,
       // when the 'comment' base table is present.
       'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'taxonomy_term_field_data'),
       'real field' => 'fid',
       'relationship' => array(
-        'title' => t('File'),
-        'label' => t('File'),
+        'title' => $this->t('File'),
+        'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
@@ -218,15 +218,15 @@ public function getViewsData() {
 
     // Describes relationships between files and taxonomy_terms.
     $data['file_usage']['file_to_taxonomy_term'] = array(
-      'title' => t('Taxonomy Term'),
-      'help' => t('A taxonomy term that is associated with this file, usually because this file is in a field on the taxonomy term.'),
+      'title' => $this->t('Taxonomy Term'),
+      'help' => $this->t('A taxonomy term that is associated with this file, usually because this file is in a field on the taxonomy term.'),
       // Only provide this field/relationship/etc.,
       // when the 'file_managed' base table is present.
       'skip base' => array('node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data', 'taxonomy_term_field_data'),
       'real field' => 'id',
       'relationship' => array(
-        'title' => t('Taxonomy Term'),
-        'label' => t('Taxonomy Term'),
+        'title' => $this->t('Taxonomy Term'),
+        'label' => $this->t('Taxonomy Term'),
         'base' => 'taxonomy_term_data',
         'base field' => 'tid',
         'relationship field' => 'id',
@@ -234,15 +234,15 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['taxonomy_term_to_file'] = array(
-      'title' => t('File'),
-      'help' => t('A file that is associated with this taxonomy term, usually because it is in a field on the taxonomy term.'),
+      'title' => $this->t('File'),
+      'help' => $this->t('A file that is associated with this taxonomy term, usually because it is in a field on the taxonomy term.'),
       // Only provide this field/relationship/etc.,
       // when the 'taxonomy_term_data' base table is present.
       'skip base' => array('file_managed', 'node_field_data', 'node_field_revision', 'users_field_data', 'comment_field_data'),
       'real field' => 'fid',
       'relationship' => array(
-        'title' => t('File'),
-        'label' => t('File'),
+        'title' => $this->t('File'),
+        'label' => $this->t('File'),
         'base' => 'file_managed',
         'base field' => 'fid',
         'relationship field' => 'fid',
@@ -253,8 +253,8 @@ public function getViewsData() {
     // we've declared joins to, because there is no 'skip base' property on these
     // fields.
     $data['file_usage']['module'] = array(
-      'title' => t('Module'),
-      'help' => t('The module managing this file relationship.'),
+      'title' => $this->t('Module'),
+      'help' => $this->t('The module managing this file relationship.'),
       'field' => array(
         'id' => 'standard',
        ),
@@ -269,8 +269,8 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['type'] = array(
-      'title' => t('Entity type'),
-      'help' => t('The type of entity that is related to the file.'),
+      'title' => $this->t('Entity type'),
+      'help' => $this->t('The type of entity that is related to the file.'),
       'field' => array(
         'id' => 'standard',
        ),
@@ -285,8 +285,8 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['id'] = array(
-      'title' => t('Entity ID'),
-      'help' => t('The ID of the entity that is related to the file.'),
+      'title' => $this->t('Entity ID'),
+      'help' => $this->t('The ID of the entity that is related to the file.'),
       'field' => array(
         'id' => 'numeric',
       ),
@@ -301,8 +301,8 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['count'] = array(
-      'title' => t('Use count'),
-      'help' => t('The number of times the file is used by this entity.'),
+      'title' => $this->t('Use count'),
+      'help' => $this->t('The number of times the file is used by this entity.'),
       'field' => array(
         'id' => 'numeric',
        ),
@@ -314,8 +314,8 @@ public function getViewsData() {
       ),
     );
     $data['file_usage']['entity_label'] = array(
-      'title' => t('Entity label'),
-      'help' => t('The label of the entity that is related to the file.'),
+      'title' => $this->t('Entity label'),
+      'help' => $this->t('The label of the entity that is related to the file.'),
       'real field' => 'id',
       'field' => array(
         'id' => 'entity_label',
diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
index 5e29251..3c1ce17 100644
--- a/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/FilemimeFormatter.php
@@ -12,11 +12,11 @@
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Formatter to render the file mime type, with an optional icon.
+ * Formatter to render the file MIME type, with an optional icon.
  *
  * @FieldFormatter(
  *   id = "file_filemime",
- *   label = @Translation("File mime"),
+ *   label = @Translation("File MIME"),
  *   field_types = {
  *     "string"
  *   }
diff --git a/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php b/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
index cce0dc5..2f0a65f 100644
--- a/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
+++ b/core/modules/file/src/Plugin/Field/FieldFormatter/RSSEnclosureFormatter.php
@@ -28,7 +28,7 @@ class RSSEnclosureFormatter extends FileFormatterBase {
   public function viewElements(FieldItemListInterface $items, $langcode) {
     $entity = $items->getEntity();
     // Add the first file as an enclosure to the RSS item. RSS allows only one
-    // enclosure per item. See: http://en.wikipedia.org/wiki/RSS_enclosure
+    // enclosure per item. See: http://wikipedia.org/wiki/RSS_enclosure
     foreach ($this->getEntitiesToView($items, $langcode) as $delta => $file) {
       $entity->rss_elements[] = array(
         'key' => 'enclosure',
diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index 887e377..20b957b 100644
--- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -9,7 +9,6 @@
 
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldFilteredMarkup;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Field\WidgetBase;
@@ -119,7 +118,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     }
 
     $title = $this->fieldDefinition->getLabel();
-    $description = FieldFilteredMarkup::create($this->fieldDefinition->getDescription());
+    $description = $this->getFilteredDescription();
 
     $elements = array();
 
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
index 4e4e456..39c5af4 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d6;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
index d9426fd..fe60a5e 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d7;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
index e818d70..7516804 100644
--- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
+++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\file\Plugin\migrate\cckfield\d7;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 89667f1..32f8fe2 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
@@ -15,7 +15,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\StreamWrapper\LocalStream;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
diff --git a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
index 4270b79..4c8cf11 100644
--- a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+++ b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
@@ -8,7 +8,7 @@
 namespace Drupal\file\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
@@ -39,7 +39,7 @@ class CckFile extends ProcessPluginBase implements ContainerFactoryPluginInterfa
    *   The plugin ID.
    * @param mixed $plugin_definition
    *   The plugin definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The current migration.
    * @param \Drupal\migrate\Plugin\MigrateProcessInterface $migration_plugin
    *   An instance of the 'migration' process plugin.
diff --git a/core/modules/file/src/Plugin/migrate/source/d6/File.php b/core/modules/file/src/Plugin/migrate/source/d6/File.php
index 3bb7708..0ec75dd 100644
--- a/core/modules/file/src/Plugin/migrate/source/d6/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d6/File.php
@@ -85,7 +85,7 @@ public function fields() {
       'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
       'filename' => $this->t('File name'),
       'filepath' => $this->t('File path'),
-      'filemime' => $this->t('File Mime Type'),
+      'filemime' => $this->t('File MIME Type'),
       'status' => $this->t('The published status of a file.'),
       'timestamp' => $this->t('The time that the file was added.'),
       'file_directory_path' => $this->t('The Drupal files path.'),
diff --git a/core/modules/file/src/Plugin/migrate/source/d7/File.php b/core/modules/file/src/Plugin/migrate/source/d7/File.php
index 129fa62..87a48fe 100644
--- a/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -89,9 +89,9 @@ public function prepareRow(Row $row) {
     // At this point, $path could be an absolute path or a relative path,
     // depending on how the scheme's variable was set. So we need to shear out
     // the source_base_path in order to make them all relative.
-    // @todo Don't depend on destination configuration.
-    // @see https://www.drupal.org/node/2577871
-    $path = str_replace($this->migration->get('destination')['source_base_path'], NULL, $path);
+    // @todo https://www.drupal.org/node/2577871 Don't depend on destination
+    //   configuration and figure out if this is even needed at all?
+    $path = str_replace($this->migration->getDestinationConfiguration()['source_base_path'], NULL, $path);
     $row->setSourceProperty('filepath', $path);
     return parent::prepareRow($row);
   }
@@ -105,7 +105,7 @@ public function fields() {
       'uid' => $this->t('The {users}.uid who added the file. If set to 0, this file was added by an anonymous user.'),
       'filename' => $this->t('File name'),
       'filepath' => $this->t('File path'),
-      'filemime' => $this->t('File Mime Type'),
+      'filemime' => $this->t('File MIME Type'),
       'status' => $this->t('The published status of a file.'),
       'timestamp' => $this->t('The time that the file was added.'),
     );
diff --git a/core/modules/file/src/Tests/CopyTest.php b/core/modules/file/src/Tests/CopyTest.php
deleted file mode 100644
index 68c589b..0000000
--- a/core/modules/file/src/Tests/CopyTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\CopyTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * Tests the file copy function.
- *
- * @group file
- */
-class CopyTest extends FileManagedUnitTestBase {
-  /**
-   * Test file copying in the normal, base case.
-   */
-  function testNormal() {
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $desired_uri = 'public://' . $this->randomMachineName();
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_copy(clone $source, $desired_uri, FILE_EXISTS_ERROR);
-
-    // Check the return status and that the contents changed.
-    $this->assertTrue($result, 'File copied successfully.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were copied correctly.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('copy', 'insert'));
-
-    $this->assertDifferentFile($source, $result);
-    $this->assertEqual($result->getFileUri(), $desired_uri, 'The copied file entity has the desired filepath.');
-    $this->assertTrue(file_exists($source->getFileUri()), 'The original file still exists.');
-    $this->assertTrue(file_exists($result->getFileUri()), 'The copied file exists.');
-
-    // Reload the file from the database and check that the changes were
-    // actually saved.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-  }
-
-  /**
-   * Test renaming when copying over a file that already exists.
-   */
-  function testExistingRename() {
-    // Setup a file to overwrite.
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $target = $this->createFile();
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_RENAME);
-
-    // Check the return status and that the contents changed.
-    $this->assertTrue($result, 'File copied successfully.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were copied correctly.');
-    $this->assertNotEqual($result->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('copy', 'insert'));
-
-    // Load all the affected files to check the changes that actually made it
-    // to the database.
-    $loaded_source = File::load($source->id());
-    $loaded_target = File::load($target->id());
-    $loaded_result = File::load($result->id());
-
-    // Verify that the source file wasn't changed.
-    $this->assertFileUnchanged($source, $loaded_source);
-
-    // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, $loaded_result);
-
-    // Make sure we end up with three distinct files afterwards.
-    $this->assertDifferentFile($loaded_source, $loaded_target);
-    $this->assertDifferentFile($loaded_target, $loaded_result);
-    $this->assertDifferentFile($loaded_source, $loaded_result);
-  }
-
-  /**
-   * Test replacement when copying over a file that already exists.
-   */
-  function testExistingReplace() {
-    // Setup a file to overwrite.
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $target = $this->createFile();
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_REPLACE);
-
-    // Check the return status and that the contents changed.
-    $this->assertTrue($result, 'File copied successfully.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were overwritten.');
-    $this->assertDifferentFile($source, $result);
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'copy', 'update'));
-
-    // Load all the affected files to check the changes that actually made it
-    // to the database.
-    $loaded_source = File::load($source->id());
-    $loaded_target = File::load($target->id());
-    $loaded_result = File::load($result->id());
-
-    // Verify that the source file wasn't changed.
-    $this->assertFileUnchanged($source, $loaded_source);
-
-    // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, $loaded_result);
-
-    // Target file was reused for the result.
-    $this->assertFileUnchanged($loaded_target, $loaded_result);
-  }
-
-  /**
-   * Test that copying over an existing file fails when FILE_EXISTS_ERROR is
-   * specified.
-   */
-  function testExistingError() {
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile();
-    $target = $this->createFile(NULL, $contents);
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_ERROR);
-
-    // Check the return status and that the contents were not changed.
-    $this->assertFalse($result, 'File copy failed.');
-    $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array());
-
-    $this->assertFileUnchanged($source, File::load($source->id()));
-    $this->assertFileUnchanged($target, File::load($target->id()));
-  }
-}
diff --git a/core/modules/file/src/Tests/DeleteTest.php b/core/modules/file/src/Tests/DeleteTest.php
deleted file mode 100644
index 1ec0376..0000000
--- a/core/modules/file/src/Tests/DeleteTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\DeleteTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * Tests the file delete function.
- *
- * @group file
- */
-class DeleteTest extends FileManagedUnitTestBase {
-  /**
-   * Tries deleting a normal file (as opposed to a directory, symlink, etc).
-   */
-  function testUnused() {
-    $file = $this->createFile();
-
-    // Check that deletion removes the file and database record.
-    $this->assertTrue(is_file($file->getFileUri()), 'File exists.');
-    $file->delete();
-    $this->assertFileHooksCalled(array('delete'));
-    $this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
-    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
-  }
-
-  /**
-   * Tries deleting a file that is in use.
-   */
-  function testInUse() {
-    $file = $this->createFile();
-    $file_usage = $this->container->get('file.usage');
-    $file_usage->add($file, 'testing', 'test', 1);
-    $file_usage->add($file, 'testing', 'test', 1);
-
-    $file_usage->delete($file, 'testing', 'test', 1);
-    $usage = $file_usage->listUsage($file);
-    $this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
-    $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
-    $this->assertTrue(File::load($file->id()), 'File still exists in the database.');
-
-    // Clear out the call to hook_file_load().
-    file_test_reset();
-
-    $file_usage->delete($file, 'testing', 'test', 1);
-    $usage = $file_usage->listUsage($file);
-    $this->assertFileHooksCalled(array('load', 'update'));
-    $this->assertTrue(empty($usage), 'File usage data was removed.');
-    $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
-    $file = File::load($file->id());
-    $this->assertTrue($file, 'File still exists in the database.');
-    $this->assertTrue($file->isTemporary(), 'File is temporary.');
-    file_test_reset();
-
-    // Call file_cron() to clean up the file. Make sure the changed timestamp
-    // of the file is older than the system.file.temporary_maximum_age
-    // configuration value.
-    db_update('file_managed')
-      ->fields(array(
-        'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
-      ))
-      ->condition('fid', $file->id())
-      ->execute();
-    \Drupal::service('cron')->run();
-
-    // file_cron() loads
-    $this->assertFileHooksCalled(array('delete'));
-    $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
-    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
-  }
-}
diff --git a/core/modules/file/src/Tests/DownloadTest.php b/core/modules/file/src/Tests/DownloadTest.php
index b5d4243..b137e54 100644
--- a/core/modules/file/src/Tests/DownloadTest.php
+++ b/core/modules/file/src/Tests/DownloadTest.php
@@ -95,7 +95,7 @@ function testFileCreateUrl() {
 
     // Tilde (~) is excluded from this test because it is encoded by
     // rawurlencode() in PHP 5.2 but not in PHP 5.3, as per RFC 3986.
-    // @see http://www.php.net/manual/function.rawurlencode.php#86506
+    // @see http://php.net/manual/function.rawurlencode.php#86506
     $basename = " -._!$'\"()*@[]?&+%#,;=:\n\x00" . // "Special" ASCII characters.
       "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string.
       "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets.
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php
index 5874cf5..e9cdc24 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -50,7 +50,7 @@ function getTestFile($type_name, $size = NULL) {
     // \Drupal\file\Entity\File::load().
     $file->filesize = filesize($file->uri);
 
-    return entity_create('file', (array) $file);
+    return File::create((array) $file);
   }
 
   /**
@@ -77,7 +77,7 @@ function getLastFileId() {
    *   A list of widget settings that will be added to the widget defaults.
    */
   function createFileField($name, $entity_type, $bundle, $storage_settings = array(), $field_settings = array(), $widget_settings = array()) {
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'entity_type' => $entity_type,
       'field_name' => $name,
       'type' => 'file',
@@ -113,7 +113,7 @@ function attachFileField($name, $entity_type, $bundle, $field_settings = array()
       'required' => !empty($field_settings['required']),
       'settings' => $field_settings,
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
 
     entity_get_form_display($entity_type, $bundle, 'default')
       ->setComponent($name, array(
diff --git a/core/modules/file/src/Tests/FileItemTest.php b/core/modules/file/src/Tests/FileItemTest.php
deleted file mode 100644
index 9337ca0..0000000
--- a/core/modules/file/src/Tests/FileItemTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\FileItemTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests using entity fields of the file field type.
- *
- * @group file
- */
-class FileItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('file');
-
-  /**
-   * Created file entity.
-   *
-   * @var \Drupal\file\Entity\File
-   */
-  protected $file;
-
-  /**
-   * Directory where the sample files are stored.
-   *
-   * @var string
-   */
-  protected $directory;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
-
-    entity_create('field_storage_config', array(
-      'field_name' => 'file_test',
-      'entity_type' => 'entity_test',
-      'type' => 'file',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
-    $this->directory = $this->getRandomGenerator()->name(8);
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'file_test',
-      'bundle' => 'entity_test',
-      'settings' => array('file_directory' => $this->directory),
-    ))->save();
-    file_put_contents('public://example.txt', $this->randomMachineName());
-    $this->file = entity_create('file', array(
-      'uri' => 'public://example.txt',
-    ));
-    $this->file->save();
-  }
-
-  /**
-   * Tests using entity fields of the file field type.
-   */
-  public function testFileItem() {
-    // Check that the selection handler was automatically assigned to
-    // 'default:file'.
-    $field_definition = FieldConfig::load('entity_test.entity_test.file_test');
-    $handler_id = $field_definition->getSetting('handler');
-    $this->assertEqual($handler_id, 'default:file');
-
-    // Create a test entity with the
-    $entity = entity_create('entity_test');
-    $entity->file_test->target_id = $this->file->id();
-    $entity->file_test->display = 1;
-    $entity->file_test->description = $description = $this->randomMachineName();
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $entity = entity_load('entity_test', $entity->id());
-    $this->assertTrue($entity->file_test instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->file_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->file_test->target_id, $this->file->id());
-    $this->assertEqual($entity->file_test->display, 1);
-    $this->assertEqual($entity->file_test->description, $description);
-    $this->assertEqual($entity->file_test->entity->getFileUri(), $this->file->getFileUri());
-    $this->assertEqual($entity->file_test->entity->url(), $url = file_create_url($this->file->getFileUri()));
-    $this->assertEqual($entity->file_test->entity->id(), $this->file->id());
-    $this->assertEqual($entity->file_test->entity->uuid(), $this->file->uuid());
-
-    // Make sure the computed files reflects updates to the file.
-    file_put_contents('public://example-2.txt', $this->randomMachineName());
-    $file2 = entity_create('file', array(
-      'uri' => 'public://example-2.txt',
-    ));
-    $file2->save();
-
-    $entity->file_test->target_id = $file2->id();
-    $this->assertEqual($entity->file_test->entity->id(), $file2->id());
-    $this->assertEqual($entity->file_test->entity->getFileUri(), $file2->getFileUri());
-
-    // Test the deletion of an entity having an entity reference field targeting
-    // a non-existing entity.
-    $file2->delete();
-    $entity->delete();
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->file_test->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-    // Verify that the sample file was stored in the correct directory.
-    $uri = $entity->file_test->entity->getFileUri();
-    $this->assertEqual($this->directory, dirname(file_uri_target($uri)));
-
-    // Make sure the computed files reflects updates to the file.
-    file_put_contents('public://example-3.txt', $this->randomMachineName());
-    // Test unsaved file entity.
-    $file3 = entity_create('file', array(
-      'uri' => 'public://example-3.txt',
-    ));
-    $display = entity_get_display('entity_test', 'entity_test', 'default');
-    $display->setComponent('file_test', [
-      'label' => 'above',
-      'type' => 'file_default',
-      'weight' => 1,
-    ])->save();
-    $entity = entity_create('entity_test');
-    $entity->file_test = array('entity' => $file3);
-    $uri = $file3->getFileUri();
-    $output = entity_view($entity, 'default');
-    \Drupal::service('renderer')->renderRoot($output);
-    $this->assertTrue(!empty($entity->file_test->entity));
-    $this->assertEqual($entity->file_test->entity->getFileUri(), $uri);
-  }
-
-}
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index 72b2378..47612ca 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -157,7 +157,7 @@ function testFileListingPages() {
    */
   protected function createFile() {
     // Create a new file entity.
-    $file = entity_create('file', array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'druplicon.txt',
       'uri' => 'public://druplicon.txt',
@@ -165,7 +165,7 @@ protected function createFile() {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
 
     // Save it, inserting a new record.
diff --git a/core/modules/file/src/Tests/FileManagedTestBase.php b/core/modules/file/src/Tests/FileManagedTestBase.php
index ebaaaea..04b33aa 100644
--- a/core/modules/file/src/Tests/FileManagedTestBase.php
+++ b/core/modules/file/src/Tests/FileManagedTestBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\file\Tests;
 
+use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
 use Drupal\simpletest\WebTestBase;
 
@@ -152,10 +153,10 @@ function assertSameFile(FileInterface $file1, FileInterface $file2) {
   function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
     // Don't count hook invocations caused by creating the file.
     \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
-    $file = entity_create('file', array(
+    $file = File::create([
       'uri' => $this->createUri($filepath, $contents, $scheme),
       'uid' => 1,
-    ));
+    ]);
     $file->save();
     // Write the record directly rather than using the API so we don't invoke
     // the hooks.
diff --git a/core/modules/file/src/Tests/FileManagedUnitTestBase.php b/core/modules/file/src/Tests/FileManagedUnitTestBase.php
deleted file mode 100644
index c9f0c6b..0000000
--- a/core/modules/file/src/Tests/FileManagedUnitTestBase.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\FileManagedUnitTestBase.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\FileInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Base class for file unit tests that use the file_test module to test uploads and
- * hooks.
- */
-abstract class FileManagedUnitTestBase extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('file_test', 'file', 'system', 'field', 'user');
-
-  protected function setUp() {
-    parent::setUp();
-    // Clear out any hook calls.
-    file_test_reset();
-
-    $this->installConfig(array('system'));
-    $this->installEntitySchema('file');
-    $this->installEntitySchema('user');
-    $this->installSchema('file', array('file_usage'));
-
-    // Make sure that a user with uid 1 exists, self::createFile() relies on
-    // it.
-    $user = entity_create('user', array('uid' => 1, 'name' => $this->randomMachineName()));
-    $user->enforceIsNew();
-    $user->save();
-    \Drupal::currentUser()->setAccount($user);
-  }
-
-  /**
-   * Assert that all of the specified hook_file_* hooks were called once, other
-   * values result in failure.
-   *
-   * @param array $expected
-   *   Array with string containing with the hook name, e.g. 'load', 'save',
-   *   'insert', etc.
-   */
-  function assertFileHooksCalled($expected) {
-    \Drupal::state()->resetCache();
-
-    // Determine which hooks were called.
-    $actual = array_keys(array_filter(file_test_get_all_calls()));
-
-    // Determine if there were any expected that were not called.
-    $uncalled = array_diff($expected, $actual);
-    if (count($uncalled)) {
-      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
-    }
-    else {
-      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', array('%expected' => empty($expected) ? '(none)' : implode(', ', $expected))));
-    }
-
-    // Determine if there were any unexpected calls.
-    $unexpected = array_diff($actual, $expected);
-    if (count($unexpected)) {
-      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', array('%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected))));
-    }
-    else {
-      $this->assertTrue(TRUE, 'No unexpected hooks were called.');
-    }
-  }
-
-  /**
-   * Assert that a hook_file_* hook was called a certain number of times.
-   *
-   * @param string $hook
-   *   String with the hook name, e.g. 'load', 'save', 'insert', etc.
-   * @param int $expected_count
-   *   Optional integer count.
-   * @param string $message
-   *   Optional translated string message.
-   */
-  function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
-    $actual_count = count(file_test_get_calls($hook));
-
-    if (!isset($message)) {
-      if ($actual_count == $expected_count) {
-        $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook));
-      }
-      elseif ($expected_count == 0) {
-        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count));
-      }
-      else {
-        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count));
-      }
-    }
-    $this->assertEqual($actual_count, $expected_count, $message);
-  }
-
-  /**
-   * Asserts that two files have the same values (except timestamp).
-   *
-   * @param \Drupal\file\FileInterface $before
-   *   File object to compare.
-   * @param \Drupal\file\FileInterface $after
-   *   File object to compare.
-   */
-  function assertFileUnchanged(FileInterface $before, FileInterface $after) {
-    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', array('%file1' => $before->id(), '%file2' => $after->id())), 'File unchanged');
-    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', array('%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id())), 'File unchanged');
-    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', array('%file1' => $before->getFilename(), '%file2' => $after->getFilename())), 'File unchanged');
-    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', array('%file1' => $before->getFileUri(), '%file2' => $after->getFileUri())), 'File unchanged');
-    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', array('%file1' => $before->getMimeType(), '%file2' => $after->getMimeType())), 'File unchanged');
-    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', array('%file1' => $before->getSize(), '%file2' => $after->getSize())), 'File unchanged');
-    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', array('%file1' => $before->isPermanent(), '%file2' => $after->isPermanent())), 'File unchanged');
-  }
-
-  /**
-   * Asserts that two files are not the same by comparing the fid and filepath.
-   *
-   * @param \Drupal\file\FileInterface $file1
-   *   File object to compare.
-   * @param \Drupal\file\FileInterface $file2
-   *   File object to compare.
-   */
-  function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', array('%file1' => $file1->id(), '%file2' => $file2->id())), 'Different file');
-    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Different file');
-  }
-
-  /**
-   * Asserts that two files are the same by comparing the fid and filepath.
-   *
-   * @param \Drupal\file\FileInterface $file1
-   *   File object to compare.
-   * @param \Drupal\file\FileInterface $file2
-   *   File object to compare.
-   */
-  function assertSameFile(FileInterface $file1, FileInterface $file2) {
-    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', array('%file1' => $file1->id(), '%file2-fid' => $file2->id())), 'Same file');
-    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Same file');
-  }
-
-  /**
-   * Create a file and save it to the files table and assert that it occurs
-   * correctly.
-   *
-   * @param string $filepath
-   *   Optional string specifying the file path. If none is provided then a
-   *   randomly named file will be created in the site's files directory.
-   * @param string $contents
-   *   Optional contents to save into the file. If a NULL value is provided an
-   *   arbitrary string will be used.
-   * @param string $scheme
-   *   Optional string indicating the stream scheme to use. Drupal core includes
-   *   public, private, and temporary. The public wrapper is the default.
-   * @return \Drupal\file\FileInterface
-   *   File entity.
-   */
-  function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
-    // Don't count hook invocations caused by creating the file.
-    \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
-    $file = entity_create('file', array(
-      'uri' => $this->createUri($filepath, $contents, $scheme),
-      'uid' => 1,
-    ));
-    $file->save();
-    // Write the record directly rather than using the API so we don't invoke
-    // the hooks.
-    $this->assertTrue($file->id() > 0, 'The file was added to the database.', 'Create test file');
-
-    \Drupal::state()->set('file_test.count_hook_invocations', TRUE);
-    return $file;
-  }
-
-  /**
-   * Creates a file and returns its URI.
-   *
-   * @param string $filepath
-   *   Optional string specifying the file path. If none is provided then a
-   *   randomly named file will be created in the site's files directory.
-   * @param string $contents
-   *   Optional contents to save into the file. If a NULL value is provided an
-   *   arbitrary string will be used.
-   * @param string $scheme
-   *   Optional string indicating the stream scheme to use. Drupal core includes
-   *   public, private, and temporary. The public wrapper is the default.
-   *
-   * @return string
-   *   File URI.
-   */
-  function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
-    if (!isset($filepath)) {
-      // Prefix with non-latin characters to ensure that all file-related
-      // tests work with international filenames.
-      $filepath = 'Файл для тестирования ' . $this->randomMachineName();
-    }
-    if (!isset($scheme)) {
-      $scheme = file_default_scheme();
-    }
-    $filepath = $scheme . '://' . $filepath;
-
-    if (!isset($contents)) {
-      $contents = "file_put_contents() doesn't seem to appreciate empty strings so let's put in some data.";
-    }
-
-    file_put_contents($filepath, $contents);
-    $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
-    return $filepath;
-  }
-
-}
diff --git a/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php b/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
index c9a3fb1..8afbb06 100644
--- a/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
+++ b/core/modules/file/src/Tests/FileOnTranslatedEntityTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\file\Tests;
 
 use Drupal\file\Entity\File;
-use Drupal\node\Entity\Node;
 
 /**
  * Uploads files to translated nodes.
diff --git a/core/modules/file/src/Tests/Formatter/FileEntityFormatterTest.php b/core/modules/file/src/Tests/Formatter/FileEntityFormatterTest.php
deleted file mode 100644
index 1c9a275..0000000
--- a/core/modules/file/src/Tests/Formatter/FileEntityFormatterTest.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Formatter\FileEntityFormatterTest.
- */
-
-namespace Drupal\file\Tests\Formatter;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\Core\Url;
-use Drupal\file\Entity\File;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the default file formatter.
- *
- * @group field
- */
-class FileEntityFormatterTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['file', 'user'];
-
-  /**
-   * The files.
-   *
-   * @var array
-   */
-  protected $files;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-
-    $this->files = [];
-    file_put_contents('public://file.png', str_repeat('t', 10));
-    $file = File::create([
-      'uri' => 'public://file.png',
-      'filename' => 'file.png',
-    ]);
-    $file->save();
-    $this->files[] = $file;
-
-    file_put_contents('public://file.tar', str_repeat('t', 200));
-    $file = File::create([
-      'uri' => 'public://file.tar',
-      'filename' => 'file.tar',
-    ]);
-    $file->save();
-    $this->files[] = $file;
-
-    file_put_contents('public://file.tar.gz', str_repeat('t', 40000));
-    $file = File::create([
-      'uri' => 'public://file.tar.gz',
-      'filename' => 'file.tar.gz',
-    ]);
-    $file->save();
-    $this->files[] = $file;
-
-    file_put_contents('public://file', str_repeat('t', 8000000));
-    $file = File::create([
-      'uri' => 'public://file',
-      'filename' => 'file',
-    ]);
-    $file->save();
-    $this->files[] = $file;
-  }
-
-  /**
-   * Tests the file_link field formatter.
-   */
-  public function testFormatterFileLink() {
-    $entity_display = EntityViewDisplay::create([
-      'targetEntityType' => 'file',
-      'bundle' => 'file',
-    ]);
-    $entity_display->setComponent('filename', ['type' => 'file_link']);
-
-    $build = $entity_display->buildMultiple($this->files)[0]['filename'][0];
-    $this->assertEqual('file.png', $build['#title']);
-    $this->assertEqual(Url::fromUri(file_create_url('public://file.png')), $build['#url']);
-  }
-
-  /**
-   * Tests the file_link field formatter.
-   */
-  public function testFormatterFileUri() {
-    $entity_display = EntityViewDisplay::create([
-      'targetEntityType' => 'file',
-      'bundle' => 'file',
-    ]);
-    $entity_display->setComponent('uri', ['type' => 'file_uri']);
-
-    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
-    $this->assertEqual('public://file.png', $build['#markup']);
-
-    $entity_display->setComponent('uri', ['type' => 'file_uri', 'settings' => ['file_download_path' => TRUE]]);
-    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
-    $this->assertEqual(file_create_url('public://file.png'), $build['#markup']);
-
-    $entity_display->setComponent('uri', ['type' => 'file_uri', 'settings' => ['file_download_path' => TRUE, 'link_to_file' => TRUE]]);
-    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
-    $this->assertEqual(file_create_url('public://file.png'), $build['#title']);
-    $this->assertEqual(Url::fromUri(file_create_url('public://file.png')), $build['#url']);
-  }
-
-  /**
-   * Tests the file_extension field formatter.
-   */
-  public function testFormatterFileExtension() {
-    $entity_display = EntityViewDisplay::create([
-      'targetEntityType' => 'file',
-      'bundle' => 'file',
-    ]);
-    $entity_display->setComponent('filename', ['type' => 'file_extension']);
-
-    $expected = ['png', 'tar', 'gz', ''];
-    foreach (array_values($this->files) as $i => $file) {
-      $build = $entity_display->build($file);
-      $this->assertEqual($expected[$i], $build['filename'][0]['#markup']);
-    }
-
-    $entity_display->setComponent('filename', ['type' => 'file_extension', 'settings' => ['extension_detect_tar' => TRUE]]);
-
-    $expected = ['png', 'tar', 'tar.gz', ''];
-    foreach (array_values($this->files) as $i => $file) {
-      $build = $entity_display->build($file);
-      $this->assertEqual($expected[$i], $build['filename'][0]['#markup']);
-    }
-  }
-
-  /**
-   * Tests the file_extension field formatter.
-   */
-  public function testFormatterFileMime() {
-    $entity_display = EntityViewDisplay::create([
-      'targetEntityType' => 'file',
-      'bundle' => 'file',
-    ]);
-    $entity_display->setComponent('filemime', ['type' => 'file_filemime', 'settings' => ['filemime_image' => TRUE]]);
-
-    foreach (array_values($this->files) as $i => $file) {
-      $build = $entity_display->build($file);
-      $this->assertEqual('image__file_icon', $build['filemime'][0]['#theme']);
-      $this->assertEqual(spl_object_hash($file), spl_object_hash($build['filemime'][0]['#file']));
-    }
-  }
-
-  /**
-   * Tests the file_size field formatter.
-   */
-  public function testFormatterFileSize() {
-    $entity_display = EntityViewDisplay::create([
-      'targetEntityType' => 'file',
-      'bundle' => 'file',
-    ]);
-    $entity_display->setComponent('filesize', ['type' => 'file_size']);
-
-    $expected = ['10 bytes', '200 bytes', '39.06 KB', '7.63 MB'];
-    foreach (array_values($this->files) as $i => $file) {
-      $build = $entity_display->build($file);
-      $this->assertEqual($expected[$i], $build['filesize'][0]['#markup']);
-    }
-  }
-
-}
diff --git a/core/modules/file/src/Tests/LoadTest.php b/core/modules/file/src/Tests/LoadTest.php
deleted file mode 100644
index 7a0fde9..0000000
--- a/core/modules/file/src/Tests/LoadTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\LoadTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * Tests \Drupal\file\Entity\File::load().
- *
- * @group file
- */
-class LoadTest extends FileManagedUnitTestBase {
-  /**
-   * Try to load a non-existent file by fid.
-   */
-  function testLoadMissingFid() {
-    $this->assertFalse(File::load(-1), 'Try to load an invalid fid fails.');
-    $this->assertFileHooksCalled(array());
-  }
-
-  /**
-   * Try to load a non-existent file by URI.
-   */
-  function testLoadMissingFilepath() {
-    $files = entity_load_multiple_by_properties('file', array('uri' => 'foobar://misc/druplicon.png'));
-    $this->assertFalse(reset($files), "Try to load a file that doesn't exist in the database fails.");
-    $this->assertFileHooksCalled(array());
-  }
-
-  /**
-   * Try to load a non-existent file by status.
-   */
-  function testLoadInvalidStatus() {
-    $files = entity_load_multiple_by_properties('file', array('status' => -99));
-    $this->assertFalse(reset($files), 'Trying to load a file with an invalid status fails.');
-    $this->assertFileHooksCalled(array());
-  }
-
-  /**
-   * Load a single file and ensure that the correct values are returned.
-   */
-  function testSingleValues() {
-    // Create a new file entity from scratch so we know the values.
-    $file = $this->createFile('druplicon.txt', NULL, 'public');
-    $by_fid_file = File::load($file->id());
-    $this->assertFileHookCalled('load');
-    $this->assertTrue(is_object($by_fid_file), '\Drupal\file\Entity\File::load() returned an object.');
-    $this->assertEqual($by_fid_file->id(), $file->id(), 'Loading by fid got the same fid.', 'File');
-    $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
-    $this->assertEqual($by_fid_file->getFilename(), $file->getFilename(), 'Loading by fid got the correct filename.', 'File');
-    $this->assertEqual($by_fid_file->getMimeType(), $file->getMimeType(), 'Loading by fid got the correct MIME type.', 'File');
-    $this->assertEqual($by_fid_file->isPermanent(), $file->isPermanent(), 'Loading by fid got the correct status.', 'File');
-    $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
-  }
-
-  /**
-   * This will test loading file data from the database.
-   */
-  function testMultiple() {
-    // Create a new file entity.
-    $file = $this->createFile('druplicon.txt', NULL, 'public');
-
-    // Load by path.
-    file_test_reset();
-    $by_path_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
-    $this->assertFileHookCalled('load');
-    $this->assertEqual(1, count($by_path_files), 'entity_load_multiple_by_properties() returned an array of the correct size.');
-    $by_path_file = reset($by_path_files);
-    $this->assertTrue($by_path_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
-    $this->assertEqual($by_path_file->id(), $file->id(), 'Loading by filepath got the correct fid.', 'File');
-
-    // Load by fid.
-    file_test_reset();
-    $by_fid_files = File::loadMultiple(array($file->id()));
-    $this->assertFileHooksCalled(array());
-    $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
-    $by_fid_file = reset($by_fid_files);
-    $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
-    $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
-  }
-
-  /**
-   * Loads a single file and ensure that the correct values are returned.
-   */
-  public function testUuidValues() {
-    // Create a new file entity from scratch so we know the values.
-    $file = $this->createFile('druplicon.txt', NULL, 'public');
-    $file->save();
-    file_test_reset();
-
-    $by_uuid_file = \Drupal::entityManager()->loadEntityByUuid('file', $file->uuid());
-    $this->assertFileHookCalled('load');
-    $this->assertTrue(is_object($by_uuid_file), '\Drupal::entityManager()->loadEntityByUuid() returned a file object.');
-    if (is_object($by_uuid_file)) {
-      $this->assertEqual($by_uuid_file->id(), $file->id(), 'Loading by UUID got the same fid.', 'File');
-      $this->assertTrue($by_uuid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
-    }
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/EntityFileTest.php b/core/modules/file/src/Tests/Migrate/EntityFileTest.php
deleted file mode 100644
index 3c5b8ad..0000000
--- a/core/modules/file/src/Tests/Migrate/EntityFileTest.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\EntityFileTest.
- */
-
-namespace Drupal\file\Tests\Migrate;
-
-use Drupal\Core\Site\Settings;
-use Drupal\migrate\Row;
-use Drupal\file\Plugin\migrate\destination\EntityFile;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\migrate\MigrateException;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the entity file destination plugin.
- *
- * @group file
- */
-class EntityFileTest extends KernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'entity_test', 'user', 'file');
-
-  /**
-   * @var \Drupal\file\Tests\Migrate\TestEntityFile $destination
-   */
-  protected $destination;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->destination = new TestEntityFile([]);
-    $this->destination->streamWrapperManager = \Drupal::getContainer()->get('stream_wrapper_manager');
-    $this->destination->fileSystem = \Drupal::getContainer()->get('file_system');
-    $this->installEntitySchema('file');
-
-    file_put_contents('/tmp/test-file.jpg', '');
-  }
-
-  /**
-   * Test successful imports/copies.
-   */
-  public function testSuccessfulCopies() {
-    foreach ($this->localFileDataProvider() as $data) {
-      list($row_values, $destination_path, $expected, $source_base_path) = $data;
-
-      $this->doImport($row_values, $destination_path, $source_base_path);
-      $message = $expected ? sprintf('File %s exists', $destination_path) : sprintf('File %s does not exist', $destination_path);
-      $this->assertIdentical($expected, is_file($destination_path), $message);
-    }
-  }
-
-  /**
-   * The data provider for testing the file destination.
-   *
-   * @return array
-   *   An array of file permutations to test.
-   */
-  protected function localFileDataProvider() {
-    global $base_url;
-    return [
-      // Test a local to local copy.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://file1.jpg', TRUE, DRUPAL_ROOT . '/'],
-      // Test a temporary file using an absolute path.
-      [['filepath' => '/tmp/test-file.jpg'], 'temporary://test.jpg', TRUE, ''],
-      // Test a temporary file using a relative path.
-      [['filepath' => 'test-file.jpg'], 'temporary://core/modules/simpletest/files/test.jpg', TRUE, '/tmp/'],
-      // Test a remote path to local.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://remote-file.jpg', TRUE, $base_url . '/'],
-      // Test a remote path to local inside a folder that doesn't exist.
-      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://folder/remote-file.jpg', TRUE, DRUPAL_ROOT . '/'],
-    ];
-  }
-
-  /**
-   * Test that non-existent files throw an exception.
-   */
-  public function testNonExistentSourceFile() {
-    $destination = '/non/existent/file';
-    try {
-      // If this test passes, doImport() will raise a MigrateException and
-      // we'll never reach fail().
-      $this->doImport(['filepath' => $destination], 'public://wontmatter.jpg');
-      $this->fail('Expected Drupal\migrate\MigrateException when importing ' . $destination);
-    }
-    catch (MigrateException $e) {
-      $this->assertIdentical($e->getMessage(), "File '$destination' does not exist.");
-    }
-  }
-
-  /**
-   * Tests various invocations of the writeFile() method.
-   */
-  public function testWriteFile() {
-    $plugin = $this->destination;
-    $method = new \ReflectionMethod($plugin, 'writeFile');
-    $method->setAccessible(TRUE);
-
-    touch('temporary://baz.txt');
-
-    // Moving an actual file should return TRUE.
-    $plugin->configuration['move'] = TRUE;
-    $this->assertTrue($method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt'));
-
-    // Trying to move a non-existent file should return FALSE.
-    $this->assertFalse($method->invoke($plugin, 'temporary://invalid.txt', 'public://invalid.txt'));
-
-    // Copying over a file that already exists should replace the existing file.
-    $plugin->configuration['move'] = FALSE;
-    touch('temporary://baz.txt');
-    $this->assertTrue($method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt'));
-    // Copying over a file that already exists should rename the resulting file
-    // if FILE_EXISTS_RENAME is specified.
-    $method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt', FILE_EXISTS_RENAME);
-    $this->assertTrue(file_exists('public://foo_0.txt'));
-
-    // Trying to copy a non-existent file should return FALSE.
-    $this->assertFalse($method->invoke($plugin, 'temporary://invalid.txt', 'public://invalid.txt'));
-  }
-
-  /**
-   * Tests various invocations of the getOverwriteMode() method.
-   */
-  public function testGetOverwriteMode() {
-    $plugin = $this->destination;
-    $method = new \ReflectionMethod($plugin, 'getOverwriteMode');
-    $method->setAccessible(TRUE);
-
-    $row = new Row([], []);
-    // If the plugin is not configured to rename the destination file, we should
-    // always get FILE_EXISTS_REPLACE.
-    $this->assertIdentical(FILE_EXISTS_REPLACE, $method->invoke($plugin, $row));
-
-    // When the plugin IS configured to rename the destination file, it should
-    // return FILE_EXISTS_RENAME if the destination entity already exists,
-    // and FILE_EXISTS_REPLACE otherwise.
-    $plugin->configuration['rename'] = TRUE;
-    $plugin->storage = \Drupal::entityManager()->getStorage('file');
-    /** @var \Drupal\file\FileInterface $file */
-    $file = $plugin->storage->create();
-    touch('public://foo.txt');
-    $file->setFileUri('public://foo.txt');
-    $file->save();
-    $row->setDestinationProperty($plugin->storage->getEntityType()->getKey('id'), $file->id());
-    $this->assertIdentical(FILE_EXISTS_RENAME, $method->invoke($plugin, $row));
-    unlink('public://foo.txt');
-  }
-
-  /**
-   * Tests various invocations of the getDirectory() method.
-   */
-  public function testGetDirectory() {
-    $plugin = $this->destination;
-    $method = new \ReflectionMethod($plugin, 'getDirectory');
-    $method->setAccessible(TRUE);
-
-    $this->assertEqual('public://foo', $method->invoke($plugin, 'public://foo/baz.txt'));
-    $this->assertEqual('/path/to', $method->invoke($plugin, '/path/to/foo.txt'));
-    // A directory like public:// (no path) needs to resolve to a physical path.
-    $fs = \Drupal::getContainer()->get('file_system');
-    $this->assertEqual($fs->realpath(Settings::get('file_public_path')), $method->invoke($plugin, 'public://foo.txt'));
-  }
-
-  /**
-   * Tests various invocations of the isLocationUnchanged() method.
-   */
-  public function testIsLocationUnchanged() {
-    $plugin = $this->destination;
-    $method = new \ReflectionMethod($plugin, 'isLocationUnchanged');
-    $method->setAccessible(TRUE);
-
-    $public_dir = Settings::get('file_public_path');
-
-    // Due to the limitations of realpath(), the source file must exist.
-    touch('public://foo.txt');
-    $this->assertTrue($method->invoke($plugin, $public_dir . '/foo.txt', 'public://foo.txt'));
-    unlink('public://foo.txt');
-
-    $temporary_file = '/tmp/foo.txt';
-    touch($temporary_file);
-    $this->assertTrue($method->invoke($plugin, $temporary_file, 'temporary://foo.txt'));
-    unlink($temporary_file);
-  }
-
-  /**
-   * Tests various invocations of the isLocalUri() method.
-   */
-  public function testIsLocalUri() {
-    $plugin = $this->destination;
-    $method = new \ReflectionMethod($plugin, 'isLocalUri');
-    $method->setAccessible(TRUE);
-
-    $this->assertTrue($method->invoke($plugin, 'public://foo.txt'));
-    $this->assertTrue($method->invoke($plugin, 'public://path/to/foo.txt'));
-    $this->assertTrue($method->invoke($plugin, 'temporary://foo.txt'));
-    $this->assertTrue($method->invoke($plugin, 'temporary://path/to/foo.txt'));
-    $this->assertTrue($method->invoke($plugin, 'foo.txt'));
-    $this->assertTrue($method->invoke($plugin, '/path/to/files/foo.txt'));
-    $this->assertTrue($method->invoke($plugin, 'relative/path/to/foo.txt'));
-    $this->assertFalse($method->invoke($plugin, 'http://www.example.com/foo.txt'));
-  }
-
-  /**
-   * Do an import using the destination.
-   *
-   * @param array $row_values
-   *   An array of row values.
-   * @param string $destination_path
-   *   The destination path to copy to.
-   * @param string $source_base_path
-   *   The source base path.
-   * @return array
-   *   An array of saved entities ids.
-   *
-   * @throws \Drupal\migrate\MigrateException
-   */
-  protected function doImport($row_values, $destination_path, $source_base_path = '') {
-    $row = new Row($row_values, []);
-    $row->setDestinationProperty('uri', $destination_path);
-    $this->destination->configuration['source_base_path'] = $source_base_path;
-
-    // Importing asserts there are no errors, then we just check the file has
-    // been copied into place.
-    return $this->destination->import($row, array());
-  }
-
-}
-
-class TestEntityFile extends EntityFile {
-
-  /**
-   * This is needed to be passed to $this->save().
-   *
-   * @var \Drupal\Core\Entity\ContentEntityInterface
-   */
-  public $mockEntity;
-
-  /**
-   * Make this public for easy writing during tests.
-   *
-   * @var array
-   */
-  public $configuration;
-
-  /**
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  public $storage;
-
-  /**
-   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
-   */
-  public $streamWrapperManager;
-
-  /**
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  public $fileSystem;
-
-  public function __construct($configuration) {
-    $configuration +=  array(
-      'source_base_path' => '',
-      'source_path_property' => 'filepath',
-      'destination_path_property' => 'uri',
-      'move' => FALSE,
-      'urlencode' => FALSE,
-    );
-    $this->configuration = $configuration;
-    // We need a mock entity to be passed to save to prevent strict exceptions.
-    $this->mockEntity = EntityTest::create();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEntity(Row $row, array $old_destination_id_values) {
-    return $this->mockEntity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {}
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php b/core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php
deleted file mode 100644
index ae7446c..0000000
--- a/core/modules/file/src/Tests/Migrate/MigrateFileStubTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\MigrateFileStubTest.
- */
-
-namespace Drupal\file\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for file entities.
- *
- * @group file
- */
-class MigrateFileStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['file'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-  }
-
-  /**
-   * Tests creation of file stubs.
-   */
-  public function testStub() {
-    $this->performStubTest('file');
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
deleted file mode 100644
index e7fef74..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileConfigsTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to file.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_file_settings');
-  }
-
-  /**
-   * Tests migration of file variables to file.settings.yml.
-   */
-  public function testFileSettings() {
-    $config = $this->config('file.settings');
-    $this->assertIdentical('textfield', $config->get('description.type'));
-    $this->assertIdentical(128, $config->get('description.length'));
-    $this->assertIdentical('sites/default/files/icons', $config->get('icon.directory'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
deleted file mode 100644
index 2bda4c0..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateFileTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\Component\Utility\Random;
-use Drupal\file\Entity\File;
-use Drupal\file\FileInterface;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Tests\MigrateDumpAlterInterface;
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\simpletest\TestBase;
-
-/**
- * file migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlterInterface {
-
-  /**
-   * The filename of a file used to test temporary file migration.
-   *
-   * @var string
-   */
-  protected static $tempFilename;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-    $this->installConfig(['file']);
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = Migration::load('d6_file');
-    $source = $migration->get('source');
-    $source['site_path'] = 'core/modules/simpletest';
-    $migration->set('source', $source);
-    $this->executeMigration($migration);
-  }
-
-  /**
-   * Asserts a file entity.
-   *
-   * @param int $fid
-   *   The file ID.
-   * @param string $name
-   *   The expected file name.
-   * @param int $size
-   *   The expected file size.
-   * @param string $uri
-   *   The expected file URI.
-   * @param string $type
-   *   The expected MIME type.
-   * @param int $uid
-   *   The expected file owner ID.
-   */
-  protected function assertEntity($fid, $name, $size, $uri, $type, $uid) {
-    /** @var \Drupal\file\FileInterface $file */
-    $file = File::load($fid);
-    $this->assertTrue($file instanceof FileInterface);
-    $this->assertIdentical($name, $file->getFilename());
-    $this->assertIdentical($size, $file->getSize());
-    $this->assertIdentical($uri, $file->getFileUri());
-    $this->assertIdentical($type, $file->getMimeType());
-    $this->assertIdentical($uid, $file->getOwnerId());
-  }
-
-  /**
-   * Tests the Drupal 6 files to Drupal 8 migration.
-   */
-  public function testFiles() {
-    $this->assertEntity(1, 'Image1.png', '39325', 'public://image-1.png', 'image/png', '1');
-    $this->assertEntity(2, 'Image2.jpg', '1831', 'public://image-2.jpg', 'image/jpeg', '1');
-    $this->assertEntity(3, 'Image-test.gif', '183', 'public://image-test.gif', 'image/jpeg', '1');
-    $this->assertEntity(5, 'html-1.txt', '24', 'public://html-1.txt', 'text/plain', '1');
-
-    // Test that we can re-import and also test with file_directory_path set.
-    \Drupal::database()
-      ->truncate(Migration::load('d6_file')->getIdMap()->mapTableName())
-      ->execute();
-
-    // Update the file_directory_path.
-    Database::getConnection('default', 'migrate')
-      ->update('variable')
-      ->fields(array('value' => serialize('files/test')))
-      ->condition('name', 'file_directory_path')
-      ->execute();
-    Database::getConnection('default', 'migrate')
-      ->update('variable')
-      ->fields(array('value' => serialize($this->getTempFilesDirectory())))
-      ->condition('name', 'file_directory_temp')
-      ->execute();
-
-    $migration = \Drupal::entityManager()->getStorage('migration')->loadUnchanged('d6_file');
-    $this->executeMigration($migration);
-
-    $file = File::load(2);
-    $this->assertIdentical('public://core/modules/simpletest/files/image-2.jpg', $file->getFileUri());
-
-    // Ensure that a temporary file has been migrated.
-    $file = File::load(6);
-    $this->assertIdentical('temporary://' . static::getUniqueFilename(), $file->getFileUri());
-
-    // File 7, created in static::migrateDumpAlter(), shares a path with
-    // file 5, which means it should be skipped entirely.
-    $this->assertNull(File::load(7));
-  }
-
-  /**
-   * @return string
-   *   A filename based upon the test.
-   */
-  public static function getUniqueFilename() {
-    return static::$tempFilename;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function migrateDumpAlter(TestBase $test) {
-    // Creates a random filename and updates the source database.
-    $random = new Random();
-    $temp_directory = $test->getTempFilesDirectory();
-    file_prepare_directory($temp_directory, FILE_CREATE_DIRECTORY);
-    static::$tempFilename = $test->getDatabasePrefix() . $random->name() . '.jpg';
-    $file_path = $temp_directory . '/' . static::$tempFilename;
-    file_put_contents($file_path, '');
-
-    $db = Database::getConnection('default', 'migrate');
-
-    $db->update('files')
-      ->condition('fid', 6)
-      ->fields(array(
-        'filename' => static::$tempFilename,
-        'filepath' => $file_path,
-      ))
-      ->execute();
-
-    $file = (array) $db->select('files')
-      ->fields('files')
-      ->condition('fid', 5)
-      ->execute()
-      ->fetchObject();
-    unset($file['fid']);
-    $db->insert('files')->fields($file)->execute();
-
-    return static::$tempFilename;
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
deleted file mode 100644
index 14a8bd9..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityDisplayTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upload entity display.
- *
- * @group migrate_drupal_6
- */
-class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-    $this->executeMigration('d6_upload_entity_display');
-  }
-
-  /**
-   * Tests the Drupal 6 upload settings to Drupal 8 entity display migration.
-   */
-  public function testUploadEntityDisplay() {
-    $display = EntityViewDisplay::load('node.page.default');
-    $component = $display->getComponent('upload');
-    $this->assertIdentical('file_default', $component['type']);
-
-    $display = EntityViewDisplay::load('node.story.default');
-    $component = $display->getComponent('upload');
-    $this->assertIdentical('file_default', $component['type']);
-
-    // Assure this doesn't exist.
-    $display = EntityViewDisplay::load('node.article.default');
-    $component = $display->getComponent('upload');
-    $this->assertTrue(is_null($component));
-
-    $this->assertIdentical(array('node', 'page', 'default', 'upload'), Migration::load('d6_upload_entity_display')->getIdMap()->lookupDestinationID(array('page')));
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
deleted file mode 100644
index beb5835..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadEntityFormDisplayTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upload form entity display.
- *
- * @group migrate_drupal_6
- */
-class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-    $this->executeMigration('d6_upload_entity_form_display');
-  }
-
-  /**
-   * Tests the Drupal 6 upload settings to Drupal 8 entity form display migration.
-   */
-  public function testUploadEntityFormDisplay() {
-    $display = EntityFormDisplay::load('node.page.default');
-    $component = $display->getComponent('upload');
-    $this->assertIdentical('file_generic', $component['type']);
-
-    $display = EntityFormDisplay::load('node.story.default');
-    $component = $display->getComponent('upload');
-    $this->assertIdentical('file_generic', $component['type']);
-
-    // Assure this doesn't exist.
-    $display = EntityFormDisplay::load('node.article.default');
-    $component = $display->getComponent('upload');
-    $this->assertTrue(is_null($component));
-
-    $this->assertIdentical(array('node', 'page', 'default', 'upload'), Migration::load('d6_upload_entity_form_display')->getIdMap()->lookupDestinationID(array('page')));
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
deleted file mode 100644
index decf476..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadFieldTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadFieldTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Uploads migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUploadFieldTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-  }
-
-  /**
-   * Tests the Drupal 6 upload settings to Drupal 8 field migration.
-   */
-  public function testUpload() {
-    $field_storage = FieldStorageConfig::load('node.upload');
-    $this->assertIdentical('node.upload', $field_storage->id());
-    $this->assertIdentical(array('node', 'upload'), Migration::load('d6_upload_field')->getIdMap()->lookupDestinationID(array('')));
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
deleted file mode 100644
index fe18042..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadInstanceTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upload field instance migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUploadInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateFields();
-  }
-
-  /**
-   * Tests the Drupal 6 upload settings to Drupal 8 field instance migration.
-   */
-  public function testUploadFieldInstance() {
-    $field = FieldConfig::load('node.page.upload');
-    $settings = $field->getSettings();
-    $this->assertIdentical('node.page.upload', $field->id());
-    $this->assertIdentical('jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp', $settings['file_extensions']);
-    $this->assertIdentical('1MB', $settings['max_filesize']);
-    $this->assertIdentical(TRUE, $settings['description_field']);
-
-    $field = FieldConfig::load('node.story.upload');
-    $this->assertIdentical('node.story.upload', $field->id());
-
-    // Shouldn't exist.
-    $field = FieldConfig::load('node.article.upload');
-    $this->assertTrue(is_null($field));
-
-    $this->assertIdentical(array('node', 'page', 'upload'), Migration::load('d6_upload_field_instance')->getIdMap()->lookupDestinationID(array('page')));
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
deleted file mode 100644
index acfb383..0000000
--- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d6\MigrateUploadTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d6;
-
-use Drupal\file\Entity\File;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Migrate association data between nodes and files.
- *
- * @group migrate_drupal_6
- */
-class MigrateUploadTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-    $this->installEntitySchema('node');
-    $this->installSchema('file', ['file_usage']);
-    $this->installSchema('node', ['node_access']);
-
-    $id_mappings = array('d6_file' => array());
-    // Create new file entities.
-    for ($i = 1; $i <= 3; $i++) {
-      $file = File::create(array(
-        'fid' => $i,
-        'uid' => 1,
-        'filename' => 'druplicon.txt',
-        'uri' => "public://druplicon-$i.txt",
-        'filemime' => 'text/plain',
-        'created' => 1,
-        'changed' => 1,
-        'status' => FILE_STATUS_PERMANENT,
-      ));
-      $file->enforceIsNew();
-      file_put_contents($file->getFileUri(), 'hello world');
-
-      // Save it, inserting a new record.
-      $file->save();
-      $id_mappings['d6_file'][] = array(array($i), array($i));
-    }
-    $this->prepareMigrations($id_mappings);
-
-    $this->migrateContent();
-    // Since we are only testing a subset of the file migration, do not check
-    // that the full file migration has been run.
-    $migration = Migration::load('d6_upload');
-    $migration->set('requirements', []);
-    $this->executeMigration($migration);
-  }
-
-  /**
-   * Test upload migration from Drupal 6 to Drupal 8.
-   */
-  function testUpload() {
-    $this->container->get('entity.manager')
-      ->getStorage('node')
-      ->resetCache([1, 2]);
-
-    $nodes = Node::loadMultiple([1, 2]);
-    $node = $nodes[1];
-    $this->assertIdentical(1, count($node->upload));
-    $this->assertIdentical('1', $node->upload[0]->target_id);
-    $this->assertIdentical('file 1-1-1', $node->upload[0]->description);
-    $this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
-
-    $node = $nodes[2];
-    $this->assertIdentical(2, count($node->upload));
-    $this->assertIdentical('3', $node->upload[0]->target_id);
-    $this->assertIdentical('file 2-3-3', $node->upload[0]->description);
-    $this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
-    $this->assertIdentical('2', $node->upload[1]->target_id);
-    $this->assertIdentical(TRUE, $node->upload[1]->isDisplayed());
-    $this->assertIdentical('file 2-3-2', $node->upload[1]->description);
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php
deleted file mode 100644
index 2d54d78..0000000
--- a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Migrate\d7\MigrateFileTest.
- */
-
-namespace Drupal\file\Tests\Migrate\d7;
-
-use Drupal\file\Entity\File;
-use Drupal\file\FileInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrates all files in the file_managed table.
- *
- * @group file
- */
-class MigrateFileTest extends MigrateDrupal7TestBase {
-
-  static $modules = ['file'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-
-    $fs = \Drupal::service('file_system');
-    // The public file directory active during the test will serve as the
-    // root of the fictional Drupal 7 site we're migrating.
-    $fs->mkdir('public://sites/default/files', NULL, TRUE);
-    file_put_contents('public://sites/default/files/cube.jpeg', str_repeat('*', 3620));
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = entity_load('migration', 'd7_file');
-    // Set the destination plugin's source_base_path configuration value, which
-    // would normally be set by the user running the migration.
-    $migration->set('destination', [
-      'plugin' => 'entity:file',
-      // Note that source_base_path must include a trailing slash because it's
-      // prepended directly to the value of the source path property.
-      'source_base_path' => $fs->realpath($this->publicFilesDirectory) . '/',
-      // This is set in the migration's YAML file, but we need to repeat it
-      // here because all the destination configuration must be set at once.
-      'source_path_property' => 'filepath',
-    ]);
-    $this->executeMigration($migration);
-  }
-
-  /**
-   * Tests a single file entity.
-   *
-   * @param int $id
-   *   The file ID.
-   * @param string $name
-   *   The expected file name.
-   * @param string $uri
-   *   The expected URI.
-   * @param string $mime
-   *   The expected MIME type.
-   * @param int $size
-   *   The expected file size.
-   * @param int $created
-   *   The expected creation time.
-   * @param int $changed
-   *   The expected modification time.
-   * @param int $uid
-   *   The expected owner ID.
-   */
-  protected function assertEntity($id, $name, $uri, $mime, $size, $created, $changed, $uid) {
-    /** @var \Drupal\file\FileInterface $file */
-    $file = File::load($id);
-    $this->assertTrue($file instanceof FileInterface);
-    $this->assertIdentical($name, $file->getFilename());
-    $this->assertIdentical($uri, $file->getFileUri());
-    $this->assertTrue(file_exists($uri));
-    $this->assertIdentical($mime, $file->getMimeType());
-    $this->assertIdentical($size, $file->getSize());
-    // isPermanent(), isTemporary(), etc. are determined by the status column.
-    $this->assertTrue($file->isPermanent());
-    $this->assertIdentical($created, $file->getCreatedTime());
-    $this->assertIdentical($changed, $file->getChangedTime());
-    $this->assertIdentical($uid, $file->getOwnerId());
-  }
-
-  /**
-   * Tests that all expected files are migrated.
-   */
-  public function testFileMigration() {
-    $this->assertEntity(1, 'cube.jpeg', 'public://cube.jpeg', 'image/jpeg', '3620', '1421727515', '1421727515', '1');
-  }
-
-}
diff --git a/core/modules/file/src/Tests/MoveTest.php b/core/modules/file/src/Tests/MoveTest.php
deleted file mode 100644
index 8177992..0000000
--- a/core/modules/file/src/Tests/MoveTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\MoveTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * Tests the file move function.
- *
- * @group file
- */
-class MoveTest extends FileManagedUnitTestBase {
-  /**
-   * Move a normal file.
-   */
-  function testNormal() {
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $desired_filepath = 'public://' . $this->randomMachineName();
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
-
-    // Check the return status and that the contents changed.
-    $this->assertTrue($result, 'File moved successfully.');
-    $this->assertFalse(file_exists($source->getFileUri()));
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'load', 'update'));
-
-    // Make sure we got the same file back.
-    $this->assertEqual($source->id(), $result->id(), format_string("Source file id's' %fid is unchanged after move.", array('%fid' => $source->id())));
-
-    // Reload the file from the database and check that the changes were
-    // actually saved.
-    $loaded_file = File::load($result->id());
-    $this->assertTrue($loaded_file, 'File can be loaded from the database.');
-    $this->assertFileUnchanged($result, $loaded_file);
-  }
-
-  /**
-   * Test renaming when moving onto a file that already exists.
-   */
-  function testExistingRename() {
-    // Setup a file to overwrite.
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $target = $this->createFile();
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_RENAME);
-
-    // Check the return status and that the contents changed.
-    $this->assertTrue($result, 'File moved successfully.');
-    $this->assertFalse(file_exists($source->getFileUri()));
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'load', 'update'));
-
-    // Compare the returned value to what made it into the database.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-    // The target file should not have been altered.
-    $this->assertFileUnchanged($target, File::load($target->id()));
-    // Make sure we end up with two distinct files afterwards.
-    $this->assertDifferentFile($target, $result);
-
-    // Compare the source and results.
-    $loaded_source = File::load($source->id());
-    $this->assertEqual($loaded_source->id(), $result->id(), "Returned file's id matches the source.");
-    $this->assertNotEqual($loaded_source->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
-  }
-
-  /**
-   * Test replacement when moving onto a file that already exists.
-   */
-  function testExistingReplace() {
-    // Setup a file to overwrite.
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-    $target = $this->createFile();
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_REPLACE);
-
-    // Look at the results.
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were overwritten.');
-    $this->assertFalse(file_exists($source->getFileUri()));
-    $this->assertTrue($result, 'File moved successfully.');
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('move', 'update', 'delete', 'load'));
-
-    // Reload the file from the database and check that the changes were
-    // actually saved.
-    $loaded_result = File::load($result->id());
-    $this->assertFileUnchanged($result, $loaded_result);
-    // Check that target was re-used.
-    $this->assertSameFile($target, $loaded_result);
-    // Source and result should be totally different.
-    $this->assertDifferentFile($source, $loaded_result);
-  }
-
-  /**
-   * Test replacement when moving onto itself.
-   */
-  function testExistingReplaceSelf() {
-    // Setup a file to overwrite.
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile(NULL, $contents);
-
-    // Copy the file over itself. Clone the object so we don't have to worry
-    // about the function changing our reference copy.
-    $result = file_move(clone $source, $source->getFileUri(), FILE_EXISTS_REPLACE);
-    $this->assertFalse($result, 'File move failed.');
-    $this->assertEqual($contents, file_get_contents($source->getFileUri()), 'Contents of file were not altered.');
-
-    // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
-
-    // Load the file from the database and make sure it is identical to what
-    // was returned.
-    $this->assertFileUnchanged($source, File::load($source->id()));
-  }
-
-  /**
-   * Test that moving onto an existing file fails when FILE_EXISTS_ERROR is
-   * specified.
-   */
-  function testExistingError() {
-    $contents = $this->randomMachineName(10);
-    $source = $this->createFile();
-    $target = $this->createFile(NULL, $contents);
-    $this->assertDifferentFile($source, $target);
-
-    // Clone the object so we don't have to worry about the function changing
-    // our reference copy.
-    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_ERROR);
-
-    // Check the return status and that the contents did not change.
-    $this->assertFalse($result, 'File move failed.');
-    $this->assertTrue(file_exists($source->getFileUri()));
-    $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
-
-    // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
-
-    // Load the file from the database and make sure it is identical to what
-    // was returned.
-    $this->assertFileUnchanged($source, File::load($source->id()));
-    $this->assertFileUnchanged($target, File::load($target->id()));
-  }
-}
diff --git a/core/modules/file/src/Tests/SaveDataTest.php b/core/modules/file/src/Tests/SaveDataTest.php
deleted file mode 100644
index 4ca49ad..0000000
--- a/core/modules/file/src/Tests/SaveDataTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\SaveDataTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * Tests the file_save_data() function.
- *
- * @group file
- */
-class SaveDataTest extends FileManagedUnitTestBase {
-  /**
-   * Test the file_save_data() function when no filename is provided.
-   */
-  function testWithoutFilename() {
-    $contents = $this->randomMachineName(8);
-
-    $result = file_save_data($contents);
-    $this->assertTrue($result, 'Unnamed file saved correctly.');
-
-    $this->assertEqual(file_default_scheme(), file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
-    $this->assertEqual($result->getFilename(), drupal_basename($result->getFileUri()), "Filename was set to the file's basename.");
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
-    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
-    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
-
-    // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-  }
-
-  /**
-   * Test the file_save_data() function when a filename is provided.
-   */
-  function testWithFilename() {
-    $contents = $this->randomMachineName(8);
-
-    // Using filename with non-latin characters.
-    $filename = 'Текстовый файл.txt';
-
-    $result = file_save_data($contents, 'public://' . $filename);
-    $this->assertTrue($result, 'Unnamed file saved correctly.');
-
-    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
-    $this->assertEqual($filename, drupal_basename($result->getFileUri()), 'File was named correctly.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
-    $this->assertEqual($result->getMimeType(), 'text/plain', 'A MIME type was set.');
-    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
-
-    // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-  }
-
-  /**
-   * Test file_save_data() when renaming around an existing file.
-   */
-  function testExistingRename() {
-    // Setup a file to overwrite.
-    $existing = $this->createFile();
-    $contents = $this->randomMachineName(8);
-
-    $result = file_save_data($contents, $existing->getFileUri(), FILE_EXISTS_RENAME);
-    $this->assertTrue($result, 'File saved successfully.');
-
-    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
-    $this->assertEqual($result->getFilename(), $existing->getFilename(), 'Filename was set to the basename of the source, rather than that of the renamed file.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
-    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
-    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
-
-    // Ensure that the existing file wasn't overwritten.
-    $this->assertDifferentFile($existing, $result);
-    $this->assertFileUnchanged($existing, File::load($existing->id()));
-
-    // Verify that was returned is what's in the database.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-  }
-
-  /**
-   * Test file_save_data() when replacing an existing file.
-   */
-  function testExistingReplace() {
-    // Setup a file to overwrite.
-    $existing = $this->createFile();
-    $contents = $this->randomMachineName(8);
-
-    $result = file_save_data($contents, $existing->getFileUri(), FILE_EXISTS_REPLACE);
-    $this->assertTrue($result, 'File saved successfully.');
-
-    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
-    $this->assertEqual($result->getFilename(), $existing->getFilename(), 'Filename was set to the basename of the existing file, rather than preserving the original name.');
-    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
-    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
-    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'update'));
-
-    // Verify that the existing file was re-used.
-    $this->assertSameFile($existing, $result);
-
-    // Verify that what was returned is what's in the database.
-    $this->assertFileUnchanged($result, File::load($result->id()));
-  }
-
-  /**
-   * Test that file_save_data() fails overwriting an existing file.
-   */
-  function testExistingError() {
-    $contents = $this->randomMachineName(8);
-    $existing = $this->createFile(NULL, $contents);
-
-    // Check the overwrite error.
-    $result = file_save_data('asdf', $existing->getFileUri(), FILE_EXISTS_ERROR);
-    $this->assertFalse($result, 'Overwriting a file fails when FILE_EXISTS_ERROR is specified.');
-    $this->assertEqual($contents, file_get_contents($existing->getFileUri()), 'Contents of existing file were unchanged.');
-
-    // Check that no hooks were called while failing.
-    $this->assertFileHooksCalled(array());
-
-    // Ensure that the existing file wasn't overwritten.
-    $this->assertFileUnchanged($existing, File::load($existing->id()));
-  }
-}
diff --git a/core/modules/file/src/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php
deleted file mode 100644
index ecd7d60..0000000
--- a/core/modules/file/src/Tests/SaveTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\SaveTest.
- */
-
-namespace Drupal\file\Tests;
-
-use Drupal\file\Entity\File;
-
-/**
- * File saving tests.
- *
- * @group file
- */
-class SaveTest extends FileManagedUnitTestBase {
-  function testFileSave() {
-    // Create a new file entity.
-    $file = File::create(array(
-      'uid' => 1,
-      'filename' => 'druplicon.txt',
-      'uri' => 'public://druplicon.txt',
-      'filemime' => 'text/plain',
-      'status' => FILE_STATUS_PERMANENT,
-    ));
-    file_put_contents($file->getFileUri(), 'hello world');
-
-    // Save it, inserting a new record.
-    $file->save();
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('insert'));
-
-    $this->assertTrue($file->id() > 0, 'A new file ID is set when saving a new file to the database.', 'File');
-    $loaded_file = File::load($file->id());
-    $this->assertNotNull($loaded_file, 'Record exists in the database.');
-    $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
-    $this->assertEqual($file->getSize(), filesize($file->getFileUri()), 'File size was set correctly.', 'File');
-    $this->assertTrue($file->getChangedTime() > 1, 'File size was set correctly.', 'File');
-    $this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was defaulted correctly.');
-
-    // Resave the file, updating the existing record.
-    file_test_reset();
-    $file->status->value = 7;
-    $file->save();
-
-    // Check that the correct hooks were called.
-    $this->assertFileHooksCalled(array('load', 'update'));
-
-    $this->assertEqual($file->id(), $file->id(), 'The file ID of an existing file is not changed when updating the database.', 'File');
-    $this->assertTrue($file->getChangedTime() >= $file->getChangedTime(), "Timestamp didn't go backwards.", 'File');
-    $loaded_file = File::load($file->id());
-    $this->assertNotNull($loaded_file, 'Record still exists in the database.', 'File');
-    $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
-    $this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was saved correctly.');
-
-    // Try to insert a second file with the same name apart from case insensitivity
-    // to ensure the 'uri' index allows for filenames with different cases.
-    $uppercase_values = array(
-      'uid' => 1,
-      'filename' => 'DRUPLICON.txt',
-      'uri' => 'public://DRUPLICON.txt',
-      'filemime' => 'text/plain',
-      'status' => FILE_STATUS_PERMANENT,
-    );
-    $uppercase_file = File::create($uppercase_values);
-    file_put_contents($uppercase_file->getFileUri(), 'hello world');
-    $violations = $uppercase_file->validate();
-    $this->assertEqual(count($violations), 0, 'No violations when adding an URI with an existing filename in upper case.');
-    $uppercase_file->save();
-
-    // Ensure the database URI uniqueness constraint is triggered.
-    $uppercase_file_duplicate = File::create($uppercase_values);
-    file_put_contents($uppercase_file_duplicate->getFileUri(), 'hello world');
-    $violations = $uppercase_file_duplicate->validate();
-    $this->assertEqual(count($violations), 1);
-    $this->assertEqual($violations[0]->getMessage(), t('The file %value already exists. Enter a unique file URI.', [
-      '%value' => $uppercase_file_duplicate->getFileUri(),
-    ]));
-    // Ensure that file URI entity queries are case sensitive.
-    $fids = \Drupal::entityQuery('file')
-      ->condition('uri', $uppercase_file->getFileUri())
-      ->execute();
-
-    $this->assertEqual(1, count($fids));
-    $this->assertEqual(array($uppercase_file->id() => $uppercase_file->id()), $fids);
-
-  }
-}
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index 7c3bd4c..9b6a090 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -52,7 +52,7 @@ protected function setUp() {
     $this->drupalLogin($account);
 
     $image_files = $this->drupalGetTestFiles('image');
-    $this->image = entity_create('file', (array) current($image_files));
+    $this->image = File::create((array) current($image_files));
 
     list(, $this->imageExtension) = explode('.', $this->image->getFilename());
     $this->assertTrue(is_file($this->image->getFileUri()), "The image file we're going to upload exists.");
diff --git a/core/modules/file/src/Tests/SpaceUsedTest.php b/core/modules/file/src/Tests/SpaceUsedTest.php
deleted file mode 100644
index 56ed974..0000000
--- a/core/modules/file/src/Tests/SpaceUsedTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\SpaceUsedTest.
- */
-
-namespace Drupal\file\Tests;
-
-/**
- * Tests the spaceUsed() function.
- *
- * @group file
- */
-class SpaceUsedTest extends FileManagedUnitTestBase {
-  protected function setUp() {
-    parent::setUp();
-
-    // Create records for a couple of users with different sizes.
-    $this->createFileWithSize('public://example1.txt', 50, 2);
-    $this->createFileWithSize('public://example2.txt', 20, 2);
-    $this->createFileWithSize('public://example3.txt', 100, 3);
-    $this->createFileWithSize('public://example4.txt', 200, 3);
-
-    // Now create some non-permanent files.
-    $this->createFileWithSize('public://example5.txt', 1, 2, 0);
-    $this->createFileWithSize('public://example6.txt', 3, 3, 0);
-  }
-
-  /**
-   * Creates a file with a given size.
-   *
-   * @param string $uri
-   *   URI of the file to create.
-   * @param int $size
-   *   Size of the file.
-   * @param int $uid
-   *   File owner ID.
-   * @param int $status
-   *   Whether the file should be permanent or temporary.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The file entity.
-   */
-  protected function createFileWithSize($uri, $size, $uid, $status = FILE_STATUS_PERMANENT) {
-    file_put_contents($uri, $this->randomMachineName($size));
-    $file = entity_create('file', array(
-      'uri' => $uri,
-      'uid' => $uid,
-      'status' => $status,
-    ));
-    $file->save();
-    return $file;
-  }
-
-  /**
-   * Test different users with the default status.
-   */
-  function testFileSpaceUsed() {
-    $file = $this->container->get('entity.manager')->getStorage('file');
-    // Test different users with default status.
-    $this->assertEqual($file->spaceUsed(2), 70);
-    $this->assertEqual($file->spaceUsed(3), 300);
-    $this->assertEqual($file->spaceUsed(), 370);
-
-    // Test the status fields
-    $this->assertEqual($file->spaceUsed(NULL, 0), 4);
-    $this->assertEqual($file->spaceUsed(NULL, FILE_STATUS_PERMANENT), 370);
-
-    // Test both the user and status.
-    $this->assertEqual($file->spaceUsed(1, 0), 0);
-    $this->assertEqual($file->spaceUsed(1, FILE_STATUS_PERMANENT), 0);
-    $this->assertEqual($file->spaceUsed(2, 0), 1);
-    $this->assertEqual($file->spaceUsed(2, FILE_STATUS_PERMANENT), 70);
-    $this->assertEqual($file->spaceUsed(3, 0), 3);
-    $this->assertEqual($file->spaceUsed(3, FILE_STATUS_PERMANENT), 300);
-  }
-}
diff --git a/core/modules/file/src/Tests/UsageTest.php b/core/modules/file/src/Tests/UsageTest.php
deleted file mode 100644
index 0ed0037..0000000
--- a/core/modules/file/src/Tests/UsageTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\UsageTest.
- */
-
-namespace Drupal\file\Tests;
-
-/**
- * Tests file usage functions.
- *
- * @group file
- */
-class UsageTest extends FileManagedUnitTestBase {
-  /**
-   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::listUsage().
-   */
-  function testGetUsage() {
-    $file = $this->createFile();
-    db_insert('file_usage')
-      ->fields(array(
-        'fid' => $file->id(),
-        'module' => 'testing',
-        'type' => 'foo',
-        'id' => 1,
-        'count' => 1
-      ))
-      ->execute();
-    db_insert('file_usage')
-      ->fields(array(
-        'fid' => $file->id(),
-        'module' => 'testing',
-        'type' => 'bar',
-        'id' => 2,
-        'count' => 2
-      ))
-      ->execute();
-
-    $usage = $this->container->get('file.usage')->listUsage($file);
-
-    $this->assertEqual(count($usage['testing']), 2, 'Returned the correct number of items.');
-    $this->assertTrue(isset($usage['testing']['foo'][1]), 'Returned the correct id.');
-    $this->assertTrue(isset($usage['testing']['bar'][2]), 'Returned the correct id.');
-    $this->assertEqual($usage['testing']['foo'][1], 1, 'Returned the correct count.');
-    $this->assertEqual($usage['testing']['bar'][2], 2, 'Returned the correct count.');
-  }
-
-  /**
-   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::add().
-   */
-  function testAddUsage() {
-    $file = $this->createFile();
-    $file_usage = $this->container->get('file.usage');
-    $file_usage->add($file, 'testing', 'foo', 1);
-    // Add the file twice to ensure that the count is incremented rather than
-    // creating additional records.
-    $file_usage->add($file, 'testing', 'bar', 2);
-    $file_usage->add($file, 'testing', 'bar', 2);
-
-    $usage = db_select('file_usage', 'f')
-      ->fields('f')
-      ->condition('f.fid', $file->id())
-      ->execute()
-      ->fetchAllAssoc('id');
-    $this->assertEqual(count($usage), 2, 'Created two records');
-    $this->assertEqual($usage[1]->module, 'testing', 'Correct module');
-    $this->assertEqual($usage[2]->module, 'testing', 'Correct module');
-    $this->assertEqual($usage[1]->type, 'foo', 'Correct type');
-    $this->assertEqual($usage[2]->type, 'bar', 'Correct type');
-    $this->assertEqual($usage[1]->count, 1, 'Correct count');
-    $this->assertEqual($usage[2]->count, 2, 'Correct count');
-  }
-
-  /**
-   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::delete().
-   */
-  function testRemoveUsage() {
-    $file = $this->createFile();
-    $file_usage = $this->container->get('file.usage');
-    db_insert('file_usage')
-      ->fields(array(
-        'fid' => $file->id(),
-        'module' => 'testing',
-        'type' => 'bar',
-        'id' => 2,
-        'count' => 3,
-      ))
-      ->execute();
-
-    // Normal decrement.
-    $file_usage->delete($file, 'testing', 'bar', 2);
-    $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
-      ->condition('f.fid', $file->id())
-      ->execute()
-      ->fetchField();
-    $this->assertEqual(2, $count, 'The count was decremented correctly.');
-
-    // Multiple decrement and removal.
-    $file_usage->delete($file, 'testing', 'bar', 2, 2);
-    $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
-      ->condition('f.fid', $file->id())
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical(FALSE, $count, 'The count was removed entirely when empty.');
-
-    // Non-existent decrement.
-    $file_usage->delete($file, 'testing', 'bar', 2);
-    $count = db_select('file_usage', 'f')
-      ->fields('f', array('count'))
-      ->condition('f.fid', $file->id())
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical(FALSE, $count, 'Decrementing non-exist record complete.');
-  }
-
-  /**
-   * Create files for all the possible combinations of age and status.
-   *
-   * We are using UPDATE statements because using the API would set the
-   * timestamp.
-   */
-  function createTempFiles() {
-    // Temporary file that is old.
-    $temp_old = file_save_data('');
-    db_update('file_managed')
-      ->fields(array(
-        'status' => 0,
-        'changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1,
-      ))
-      ->condition('fid', $temp_old->id())
-      ->execute();
-    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was created correctly.');
-
-    // Temporary file that is new.
-    $temp_new = file_save_data('');
-    db_update('file_managed')
-      ->fields(array('status' => 0))
-      ->condition('fid', $temp_new->id())
-      ->execute();
-    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was created correctly.');
-
-    // Permanent file that is old.
-    $perm_old = file_save_data('');
-    db_update('file_managed')
-      ->fields(array('changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1))
-      ->condition('fid', $temp_old->id())
-      ->execute();
-    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was created correctly.');
-
-    // Permanent file that is new.
-    $perm_new = file_save_data('');
-    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was created correctly.');
-    return array($temp_old, $temp_new, $perm_old, $perm_new);
-  }
-
-  /**
-   * Ensure that temporary files are removed by default.
-   */
-  function testTempFileCleanupDefault() {
-    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
-
-    // Run cron and then ensure that only the old, temp file was deleted.
-    $this->container->get('cron')->run();
-    $this->assertFalse(file_exists($temp_old->getFileUri()), 'Old temp file was correctly removed.');
-    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
-  }
-
-  /**
-   * Ensure that temporary files are kept as configured.
-   */
-  function testTempFileNoCleanup() {
-    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
-
-    // Set the max age to 0, meaning no temporary files will be deleted.
-    $this->config('system.file')
-      ->set('temporary_maximum_age', 0)
-      ->save();
-
-    // Run cron and then ensure that no file was deleted.
-    $this->container->get('cron')->run();
-    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
-    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
-  }
-
-  /**
-   * Ensure that temporary files are kept as configured.
-   */
-  function testTempFileCustomCleanup() {
-    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
-
-    // Set the max age to older than default.
-    $this->config('system.file')
-      ->set('temporary_maximum_age', 21600 + 2)
-      ->save();
-
-    // Run cron and then ensure that more files were deleted.
-    $this->container->get('cron')->run();
-    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
-    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
-    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
-  }
-}
diff --git a/core/modules/file/src/Tests/ValidateTest.php b/core/modules/file/src/Tests/ValidateTest.php
deleted file mode 100644
index 25076b0..0000000
--- a/core/modules/file/src/Tests/ValidateTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\ValidateTest.
- */
-
-namespace Drupal\file\Tests;
-
-/**
- * Tests the file_validate() function.
- *
- * @group file
- */
-class ValidateTest extends FileManagedUnitTestBase {
-  /**
-   * Test that the validators passed into are checked.
-   */
-  function testCallerValidation() {
-    $file = $this->createFile();
-
-    // Empty validators.
-    $this->assertEqual(file_validate($file, array()), array(), 'Validating an empty array works successfully.');
-    $this->assertFileHooksCalled(array('validate'));
-
-    // Use the file_test.module's test validator to ensure that passing tests
-    // return correctly.
-    file_test_reset();
-    file_test_set_return('validate', array());
-    $passing = array('file_test_validator' => array(array()));
-    $this->assertEqual(file_validate($file, $passing), array(), 'Validating passes.');
-    $this->assertFileHooksCalled(array('validate'));
-
-    // Now test for failures in validators passed in and by hook_validate.
-    file_test_reset();
-    file_test_set_return('validate', array('Epic fail'));
-    $failing = array('file_test_validator' => array(array('Failed', 'Badly')));
-    $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), 'Validating returns errors.');
-    $this->assertFileHooksCalled(array('validate'));
-  }
-}
diff --git a/core/modules/file/src/Tests/ValidatorTest.php b/core/modules/file/src/Tests/ValidatorTest.php
deleted file mode 100644
index 8ad5939..0000000
--- a/core/modules/file/src/Tests/ValidatorTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\ValidatorTest.
- */
-
-namespace Drupal\file\Tests;
-
-/**
- * Tests the functions used to validate uploaded files.
- *
- * @group file
- */
-class ValidatorTest extends FileManagedUnitTestBase {
-
-  /**
-   * An image file.
-   *
-   * @var \Drupal\file\FileInterface
-   */
-  protected $image;
-
-  /**
-   * A file which is not an image.
-   *
-   * @var \Drupal\file\Entity\File
-   */
-  protected $nonImage;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->image = entity_create('file');
-    $this->image->setFileUri('core/misc/druplicon.png');
-    $this->image->setFilename(drupal_basename($this->image->getFileUri()));
-
-    $this->nonImage = entity_create('file');
-    $this->nonImage->setFileUri('core/assets/vendor/jquery/jquery.min.js');
-    $this->nonImage->setFilename(drupal_basename($this->nonImage->getFileUri()));
-  }
-
-  /**
-   * Test the file_validate_extensions() function.
-   */
-  function testFileValidateExtensions() {
-    $file = entity_create('file', array('filename' => 'asdf.txt'));
-    $errors = file_validate_extensions($file, 'asdf txt pork');
-    $this->assertEqual(count($errors), 0, 'Valid extension accepted.', 'File');
-
-    $file->setFilename('asdf.txt');
-    $errors = file_validate_extensions($file, 'exe png');
-    $this->assertEqual(count($errors), 1, 'Invalid extension blocked.', 'File');
-  }
-
-  /**
-   *  This ensures a specific file is actually an image.
-   */
-  function testFileValidateIsImage() {
-    $this->assertTrue(file_exists($this->image->getFileUri()), 'The image being tested exists.', 'File');
-    $errors = file_validate_is_image($this->image);
-    $this->assertEqual(count($errors), 0, 'No error reported for our image file.', 'File');
-
-    $this->assertTrue(file_exists($this->nonImage->getFileUri()), 'The non-image being tested exists.', 'File');
-    $errors = file_validate_is_image($this->nonImage);
-    $this->assertEqual(count($errors), 1, 'An error reported for our non-image file.', 'File');
-  }
-
-  /**
-   *  This ensures the resolution of a specific file is within bounds.
-   *  The image will be resized if it's too large.
-   */
-  function testFileValidateImageResolution() {
-    // Non-images.
-    $errors = file_validate_image_resolution($this->nonImage);
-    $this->assertEqual(count($errors), 0, 'Should not get any errors for a non-image file.', 'File');
-    $errors = file_validate_image_resolution($this->nonImage, '50x50', '100x100');
-    $this->assertEqual(count($errors), 0, 'Do not check the resolution on non files.', 'File');
-
-    // Minimum size.
-    $errors = file_validate_image_resolution($this->image);
-    $this->assertEqual(count($errors), 0, 'No errors for an image when there is no minimum or maximum resolution.', 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '200x1');
-    $this->assertEqual(count($errors), 1, 'Got an error for an image that was not wide enough.', 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '1x200');
-    $this->assertEqual(count($errors), 1, 'Got an error for an image that was not tall enough.', 'File');
-    $errors = file_validate_image_resolution($this->image, 0, '200x200');
-    $this->assertEqual(count($errors), 1, 'Small images report an error.', 'File');
-
-    // Maximum size.
-    if ($this->container->get('image.factory')->getToolkitId()) {
-      // Copy the image so that the original doesn't get resized.
-      copy('core/misc/druplicon.png', 'temporary://druplicon.png');
-      $this->image->setFileUri('temporary://druplicon.png');
-
-      $errors = file_validate_image_resolution($this->image, '10x5');
-      $this->assertEqual(count($errors), 0, 'No errors should be reported when an oversized image can be scaled down.', 'File');
-
-      $image = $this->container->get('image.factory')->get($this->image->getFileUri());
-      $this->assertTrue($image->getWidth() <= 10, 'Image scaled to correct width.', 'File');
-      $this->assertTrue($image->getHeight() <= 5, 'Image scaled to correct height.', 'File');
-
-      // Once again, now with negative width and height to force an error.
-      copy('core/misc/druplicon.png', 'temporary://druplicon.png');
-      $this->image->setFileUri('temporary://druplicon.png');
-      $errors = file_validate_image_resolution($this->image, '-10x-5');
-      $this->assertEqual(count($errors), 1, 'An error reported for an oversized image that can not be scaled down.', 'File');
-
-      drupal_unlink('temporary://druplicon.png');
-    }
-    else {
-      // TODO: should check that the error is returned if no toolkit is available.
-      $errors = file_validate_image_resolution($this->image, '5x10');
-      $this->assertEqual(count($errors), 1, 'Oversize images that cannot be scaled get an error.', 'File');
-    }
-  }
-
-  /**
-   *  This will ensure the filename length is valid.
-   */
-  function testFileValidateNameLength() {
-    // Create a new file entity.
-    $file = entity_create('file');
-
-    // Add a filename with an allowed length and test it.
-    $file->setFilename(str_repeat('x', 240));
-    $this->assertEqual(strlen($file->getFilename()), 240);
-    $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 0, 'No errors reported for 240 length filename.', 'File');
-
-    // Add a filename with a length too long and test it.
-    $file->setFilename(str_repeat('x', 241));
-    $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 1, 'An error reported for 241 length filename.', 'File');
-
-    // Add a filename with an empty string and test it.
-    $file->setFilename('');
-    $errors = file_validate_name_length($file);
-    $this->assertEqual(count($errors), 1, 'An error reported for 0 length filename.', 'File');
-  }
-
-
-  /**
-   * Test file_validate_size().
-   */
-  function testFileValidateSize() {
-    // Create a file with a size of 1000 bytes, and quotas of only 1 byte.
-    $file = entity_create('file', array('filesize' => 1000));
-    $errors = file_validate_size($file, 0, 0);
-    $this->assertEqual(count($errors), 0, 'No limits means no errors.', 'File');
-    $errors = file_validate_size($file, 1, 0);
-    $this->assertEqual(count($errors), 1, 'Error for the file being over the limit.', 'File');
-    $errors = file_validate_size($file, 0, 1);
-    $this->assertEqual(count($errors), 1, 'Error for the user being over their limit.', 'File');
-    $errors = file_validate_size($file, 1, 1);
-    $this->assertEqual(count($errors), 2, 'Errors for both the file and their limit.', 'File');
-  }
-}
diff --git a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
deleted file mode 100644
index aa4f634..0000000
--- a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Views\ExtensionViewsFieldTest.
- */
-
-namespace Drupal\file\Tests\Views;
-
-use Drupal\Core\Render\RenderContext;
-use Drupal\file\Entity\File;
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Tests\ViewTestData;
-
-/**
- * Tests the core Drupal\file\Plugin\views\field\Extension handler.
- *
- * @group file
- */
-class ExtensionViewsFieldTest extends ViewKernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('file', 'file_test_views', 'user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('file_extension_view');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    ViewTestData::createTestViews(get_class($this), array('file_test_views'));
-
-    $this->installEntitySchema('file');
-
-    file_put_contents('public://file.png', '');
-    File::create([
-      'uri' => 'public://file.png',
-      'filename' => 'file.png',
-    ])->save();
-
-    file_put_contents('public://file.tar', '');
-    File::create([
-      'uri' => 'public://file.tar',
-      'filename' => 'file.tar',
-    ])->save();
-
-    file_put_contents('public://file.tar.gz', '');
-    File::create([
-      'uri' => 'public://file.tar.gz',
-      'filename' => 'file.tar.gz',
-    ])->save();
-
-    file_put_contents('public://file', '');
-    File::create([
-      'uri' => 'public://file',
-      'filename' => 'file',
-    ])->save();
-  }
-
-  /**
-   * Tests file extension views field handler extension_detect_tar option.
-   */
-  public function testFileExtensionTarOption() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('file_extension_view');
-    $view->setDisplay();
-    $this->executeView($view);
-
-    // Test without the tar option.
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'gz');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
-    });
-
-    // Test with the tar option.
-    $view = Views::getView('file_extension_view');
-    $view->setDisplay();
-    $view->initHandlers();
-
-    $view->field['extension']->options['settings']['extension_detect_tar'] = TRUE;
-    $this->executeView($view);
-
-    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'tar.gz');
-      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
-    });
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Views/FileViewsDataTest.php b/core/modules/file/src/Tests/Views/FileViewsDataTest.php
deleted file mode 100644
index 89ff5ec..0000000
--- a/core/modules/file/src/Tests/Views/FileViewsDataTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Views\FileViewsDataTest.
- */
-
-namespace Drupal\file\Tests\Views;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests file views data.
- *
- * @group file
- */
-class FileViewsDataTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('file', 'views', 'entity_test', 'user', 'field');
-
-  /**
-   * Tests views data generated for file field relationship.
-   *
-   * @see file_field_views_data()
-   * @see file_field_views_data_views_data_alter()
-   */
-  public function testRelationshipViewsData() {
-    // Create file field to entity_test.
-    FieldStorageConfig::create(array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_base_file',
-      'type' => 'file',
-    ))->save();
-    FieldConfig::create(array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_base_file',
-      'bundle' => 'entity_test',
-    ))->save();
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test__field_base_file');
-    $relationship = $views_data['field_base_file_target_id']['relationship'];
-    $this->assertEqual($relationship['id'], 'standard');
-    $this->assertEqual($relationship['base'], 'file_managed');
-    $this->assertEqual($relationship['base field'], 'fid');
-    $this->assertEqual($relationship['entity type'], 'file');
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('file_managed');
-    $relationship = $views_data['reverse_field_base_file_entity_test']['relationship'];
-    $this->assertEqual($relationship['id'], 'entity_reverse');
-    $this->assertEqual($relationship['base'], 'entity_test');
-    $this->assertEqual($relationship['base field'], 'id');
-    $this->assertEqual($relationship['field table'], 'entity_test__field_base_file');
-    $this->assertEqual($relationship['field field'], 'field_base_file_target_id');
-    $this->assertEqual($relationship['field_name'], 'field_base_file');
-    $this->assertEqual($relationship['entity_type'], 'entity_test');
-    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-
-    // Create file field to entity_test_mul.
-    FieldStorageConfig::create(array(
-      'entity_type' => 'entity_test_mul',
-      'field_name' => 'field_data_file',
-      'type' => 'file',
-    ))->save();
-    FieldConfig::create(array(
-      'entity_type' => 'entity_test_mul',
-      'field_name' => 'field_data_file',
-      'bundle' => 'entity_test_mul',
-    ))->save();
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test_mul__field_data_file');
-    $relationship = $views_data['field_data_file_target_id']['relationship'];
-    $this->assertEqual($relationship['id'], 'standard');
-    $this->assertEqual($relationship['base'], 'file_managed');
-    $this->assertEqual($relationship['base field'], 'fid');
-    $this->assertEqual($relationship['entity type'], 'file');
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('file_managed');
-    $relationship = $views_data['reverse_field_data_file_entity_test_mul']['relationship'];
-    $this->assertEqual($relationship['id'], 'entity_reverse');
-    $this->assertEqual($relationship['base'], 'entity_test_mul_property_data');
-    $this->assertEqual($relationship['base field'], 'id');
-    $this->assertEqual($relationship['field table'], 'entity_test_mul__field_data_file');
-    $this->assertEqual($relationship['field field'], 'field_data_file_target_id');
-    $this->assertEqual($relationship['field_name'], 'field_data_file');
-    $this->assertEqual($relationship['entity_type'], 'entity_test_mul');
-    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Views/FileViewsFieldAccessTest.php b/core/modules/file/src/Tests/Views/FileViewsFieldAccessTest.php
deleted file mode 100644
index 94adad3..0000000
--- a/core/modules/file/src/Tests/Views/FileViewsFieldAccessTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Tests\Views\FileViewsFieldAccessTest.
- */
-
-namespace Drupal\file\Tests\Views;
-
-use Drupal\file\Entity\File;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\user\Entity\User;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the file entity.
- *
- * @group File
- */
-class FileViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['file', 'entity_test', 'language', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('file');
-  }
-
-  /**
-   * Check access for file fields.
-   */
-  public function testFileFields() {
-    ConfigurableLanguage::create([
-      'id' => 'fr',
-      'name' => 'French',
-    ])->save();
-
-    $user = User::create([
-      'name' => 'test user',
-    ]);
-    $user->save();
-
-    file_put_contents('public://test.txt', 'test');
-    $file = File::create([
-      'filename' => 'test.txt',
-      'uri' => 'public://test.txt',
-      'status' => TRUE,
-      'langcode' => 'fr',
-      'uid' => $user->id()
-    ]);
-    $file->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('file', 'fid', $file->id());
-    $this->assertFieldAccess('file', 'uuid', $file->uuid());
-    $this->assertFieldAccess('file', 'langcode', $file->language()->getName());
-    $this->assertFieldAccess('file', 'uid', 'test user');
-    $this->assertFieldAccess('file', 'filename', $file->getFilename());
-    $this->assertFieldAccess('file', 'uri', $file->getFileUri());
-    $this->assertFieldAccess('file', 'filemime', $file->filemime->value);
-    $this->assertFieldAccess('file', 'filesize', '4 bytes');
-    $this->assertFieldAccess('file', 'status', t('Permanent'));
-    // $this->assertFieldAccess('file', 'created', \Drupal::service('date.formatter')->format(123456));
-    // $this->assertFieldAccess('file', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
-  }
-
-}
diff --git a/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php b/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
index 8cdc903..c1f1e2c 100644
--- a/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
+++ b/core/modules/file/src/Tests/Views/RelationshipUserFileDataTest.php
@@ -7,9 +7,12 @@
 
 namespace Drupal\file\Tests\Views;
 
+use Drupal\field\Entity\FieldConfig;
+use Drupal\file\Entity\File;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests file on user relationship handler.
@@ -36,20 +39,20 @@ protected function setUp() {
     parent::setUp();
 
     // Create the user profile field and instance.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'user',
       'field_name' => 'user_file',
       'type' => 'file',
       'translatable' => '0',
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'label' => 'User File',
       'description' => '',
       'field_name' => 'user_file',
       'entity_type' => 'user',
       'bundle' => 'user',
       'required' => 0,
-    ))->save();
+    ])->save();
 
     ViewTestData::createTestViews(get_class($this), array('file_test_views'));
   }
@@ -58,7 +61,7 @@ protected function setUp() {
    * Tests using the views file relationship.
    */
   public function testViewsHandlerRelationshipUserFileData() {
-    $file = entity_create('file', array(
+    $file = File::create([
       'fid' => 2,
       'uid' => 2,
       'filename' => 'image-test.jpg',
@@ -67,7 +70,7 @@ public function testViewsHandlerRelationshipUserFileData() {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     $file->enforceIsNew();
     file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png'));
     $file->save();
diff --git a/core/modules/file/tests/src/Kernel/CopyTest.php b/core/modules/file/tests/src/Kernel/CopyTest.php
new file mode 100644
index 0000000..e86f39a
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/CopyTest.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\CopyTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the file copy function.
+ *
+ * @group file
+ */
+class CopyTest extends FileManagedUnitTestBase {
+  /**
+   * Test file copying in the normal, base case.
+   */
+  function testNormal() {
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $desired_uri = 'public://' . $this->randomMachineName();
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_copy(clone $source, $desired_uri, FILE_EXISTS_ERROR);
+
+    // Check the return status and that the contents changed.
+    $this->assertTrue($result, 'File copied successfully.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were copied correctly.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('copy', 'insert'));
+
+    $this->assertDifferentFile($source, $result);
+    $this->assertEqual($result->getFileUri(), $desired_uri, 'The copied file entity has the desired filepath.');
+    $this->assertTrue(file_exists($source->getFileUri()), 'The original file still exists.');
+    $this->assertTrue(file_exists($result->getFileUri()), 'The copied file exists.');
+
+    // Reload the file from the database and check that the changes were
+    // actually saved.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+  }
+
+  /**
+   * Test renaming when copying over a file that already exists.
+   */
+  function testExistingRename() {
+    // Setup a file to overwrite.
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $target = $this->createFile();
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_RENAME);
+
+    // Check the return status and that the contents changed.
+    $this->assertTrue($result, 'File copied successfully.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were copied correctly.');
+    $this->assertNotEqual($result->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('copy', 'insert'));
+
+    // Load all the affected files to check the changes that actually made it
+    // to the database.
+    $loaded_source = File::load($source->id());
+    $loaded_target = File::load($target->id());
+    $loaded_result = File::load($result->id());
+
+    // Verify that the source file wasn't changed.
+    $this->assertFileUnchanged($source, $loaded_source);
+
+    // Verify that what was returned is what's in the database.
+    $this->assertFileUnchanged($result, $loaded_result);
+
+    // Make sure we end up with three distinct files afterwards.
+    $this->assertDifferentFile($loaded_source, $loaded_target);
+    $this->assertDifferentFile($loaded_target, $loaded_result);
+    $this->assertDifferentFile($loaded_source, $loaded_result);
+  }
+
+  /**
+   * Test replacement when copying over a file that already exists.
+   */
+  function testExistingReplace() {
+    // Setup a file to overwrite.
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $target = $this->createFile();
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_REPLACE);
+
+    // Check the return status and that the contents changed.
+    $this->assertTrue($result, 'File copied successfully.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were overwritten.');
+    $this->assertDifferentFile($source, $result);
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('load', 'copy', 'update'));
+
+    // Load all the affected files to check the changes that actually made it
+    // to the database.
+    $loaded_source = File::load($source->id());
+    $loaded_target = File::load($target->id());
+    $loaded_result = File::load($result->id());
+
+    // Verify that the source file wasn't changed.
+    $this->assertFileUnchanged($source, $loaded_source);
+
+    // Verify that what was returned is what's in the database.
+    $this->assertFileUnchanged($result, $loaded_result);
+
+    // Target file was reused for the result.
+    $this->assertFileUnchanged($loaded_target, $loaded_result);
+  }
+
+  /**
+   * Test that copying over an existing file fails when FILE_EXISTS_ERROR is
+   * specified.
+   */
+  function testExistingError() {
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile();
+    $target = $this->createFile(NULL, $contents);
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_copy(clone $source, $target->getFileUri(), FILE_EXISTS_ERROR);
+
+    // Check the return status and that the contents were not changed.
+    $this->assertFalse($result, 'File copy failed.');
+    $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array());
+
+    $this->assertFileUnchanged($source, File::load($source->id()));
+    $this->assertFileUnchanged($target, File::load($target->id()));
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/DeleteTest.php b/core/modules/file/tests/src/Kernel/DeleteTest.php
new file mode 100644
index 0000000..743528a
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/DeleteTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\DeleteTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the file delete function.
+ *
+ * @group file
+ */
+class DeleteTest extends FileManagedUnitTestBase {
+  /**
+   * Tries deleting a normal file (as opposed to a directory, symlink, etc).
+   */
+  function testUnused() {
+    $file = $this->createFile();
+
+    // Check that deletion removes the file and database record.
+    $this->assertTrue(is_file($file->getFileUri()), 'File exists.');
+    $file->delete();
+    $this->assertFileHooksCalled(array('delete'));
+    $this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
+    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
+  }
+
+  /**
+   * Tries deleting a file that is in use.
+   */
+  function testInUse() {
+    $file = $this->createFile();
+    $file_usage = $this->container->get('file.usage');
+    $file_usage->add($file, 'testing', 'test', 1);
+    $file_usage->add($file, 'testing', 'test', 1);
+
+    $file_usage->delete($file, 'testing', 'test', 1);
+    $usage = $file_usage->listUsage($file);
+    $this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
+    $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
+    $this->assertTrue(File::load($file->id()), 'File still exists in the database.');
+
+    // Clear out the call to hook_file_load().
+    file_test_reset();
+
+    $file_usage->delete($file, 'testing', 'test', 1);
+    $usage = $file_usage->listUsage($file);
+    $this->assertFileHooksCalled(array('load', 'update'));
+    $this->assertTrue(empty($usage), 'File usage data was removed.');
+    $this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
+    $file = File::load($file->id());
+    $this->assertTrue($file, 'File still exists in the database.');
+    $this->assertTrue($file->isTemporary(), 'File is temporary.');
+    file_test_reset();
+
+    // Call file_cron() to clean up the file. Make sure the changed timestamp
+    // of the file is older than the system.file.temporary_maximum_age
+    // configuration value.
+    db_update('file_managed')
+      ->fields(array(
+        'changed' => REQUEST_TIME - ($this->config('system.file')->get('temporary_maximum_age') + 1),
+      ))
+      ->condition('fid', $file->id())
+      ->execute();
+    \Drupal::service('cron')->run();
+
+    // file_cron() loads
+    $this->assertFileHooksCalled(array('delete'));
+    $this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
+    $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/FileItemTest.php b/core/modules/file/tests/src/Kernel/FileItemTest.php
new file mode 100644
index 0000000..b74e227
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/FileItemTest.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\FileItemTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\file\Entity\File;
+
+/**
+ * Tests using entity fields of the file field type.
+ *
+ * @group file
+ */
+class FileItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('file');
+
+  /**
+   * Created file entity.
+   *
+   * @var \Drupal\file\Entity\File
+   */
+  protected $file;
+
+  /**
+   * Directory where the sample files are stored.
+   *
+   * @var string
+   */
+  protected $directory;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->installSchema('file', array('file_usage'));
+
+    FieldStorageConfig::create(array(
+      'field_name' => 'file_test',
+      'entity_type' => 'entity_test',
+      'type' => 'file',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+    ))->save();
+    $this->directory = $this->getRandomGenerator()->name(8);
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'file_test',
+      'bundle' => 'entity_test',
+      'settings' => array('file_directory' => $this->directory),
+    ])->save();
+    file_put_contents('public://example.txt', $this->randomMachineName());
+    $this->file = File::create([
+      'uri' => 'public://example.txt',
+    ]);
+    $this->file->save();
+  }
+
+  /**
+   * Tests using entity fields of the file field type.
+   */
+  public function testFileItem() {
+    // Check that the selection handler was automatically assigned to
+    // 'default:file'.
+    $field_definition = FieldConfig::load('entity_test.entity_test.file_test');
+    $handler_id = $field_definition->getSetting('handler');
+    $this->assertEqual($handler_id, 'default:file');
+
+    // Create a test entity with the
+    $entity = EntityTest::create();
+    $entity->file_test->target_id = $this->file->id();
+    $entity->file_test->display = 1;
+    $entity->file_test->description = $description = $this->randomMachineName();
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $entity = entity_load('entity_test', $entity->id());
+    $this->assertTrue($entity->file_test instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->file_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->file_test->target_id, $this->file->id());
+    $this->assertEqual($entity->file_test->display, 1);
+    $this->assertEqual($entity->file_test->description, $description);
+    $this->assertEqual($entity->file_test->entity->getFileUri(), $this->file->getFileUri());
+    $this->assertEqual($entity->file_test->entity->url(), $url = file_create_url($this->file->getFileUri()));
+    $this->assertEqual($entity->file_test->entity->id(), $this->file->id());
+    $this->assertEqual($entity->file_test->entity->uuid(), $this->file->uuid());
+
+    // Make sure the computed files reflects updates to the file.
+    file_put_contents('public://example-2.txt', $this->randomMachineName());
+    $file2 = File::create([
+      'uri' => 'public://example-2.txt',
+    ]);
+    $file2->save();
+
+    $entity->file_test->target_id = $file2->id();
+    $this->assertEqual($entity->file_test->entity->id(), $file2->id());
+    $this->assertEqual($entity->file_test->entity->getFileUri(), $file2->getFileUri());
+
+    // Test the deletion of an entity having an entity reference field targeting
+    // a non-existing entity.
+    $file2->delete();
+    $entity->delete();
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->file_test->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+    // Verify that the sample file was stored in the correct directory.
+    $uri = $entity->file_test->entity->getFileUri();
+    $this->assertEqual($this->directory, dirname(file_uri_target($uri)));
+
+    // Make sure the computed files reflects updates to the file.
+    file_put_contents('public://example-3.txt', $this->randomMachineName());
+    // Test unsaved file entity.
+    $file3 = File::create([
+      'uri' => 'public://example-3.txt',
+    ]);
+    $display = entity_get_display('entity_test', 'entity_test', 'default');
+    $display->setComponent('file_test', [
+      'label' => 'above',
+      'type' => 'file_default',
+      'weight' => 1,
+    ])->save();
+    $entity = EntityTest::create();
+    $entity->file_test = array('entity' => $file3);
+    $uri = $file3->getFileUri();
+    $output = entity_view($entity, 'default');
+    \Drupal::service('renderer')->renderRoot($output);
+    $this->assertTrue(!empty($entity->file_test->entity));
+    $this->assertEqual($entity->file_test->entity->getFileUri(), $uri);
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
new file mode 100644
index 0000000..e01717f
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -0,0 +1,218 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\FileManagedUnitTestBase.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Base class for file unit tests that use the file_test module to test uploads and
+ * hooks.
+ */
+abstract class FileManagedUnitTestBase extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('file_test', 'file', 'system', 'field', 'user');
+
+  protected function setUp() {
+    parent::setUp();
+    // Clear out any hook calls.
+    file_test_reset();
+
+    $this->installConfig(array('system'));
+    $this->installEntitySchema('file');
+    $this->installEntitySchema('user');
+    $this->installSchema('file', array('file_usage'));
+
+    // Make sure that a user with uid 1 exists, self::createFile() relies on
+    // it.
+    $user = User::create(['uid' => 1, 'name' => $this->randomMachineName()]);
+    $user->enforceIsNew();
+    $user->save();
+    \Drupal::currentUser()->setAccount($user);
+  }
+
+  /**
+   * Assert that all of the specified hook_file_* hooks were called once, other
+   * values result in failure.
+   *
+   * @param array $expected
+   *   Array with string containing with the hook name, e.g. 'load', 'save',
+   *   'insert', etc.
+   */
+  function assertFileHooksCalled($expected) {
+    \Drupal::state()->resetCache();
+
+    // Determine which hooks were called.
+    $actual = array_keys(array_filter(file_test_get_all_calls()));
+
+    // Determine if there were any expected that were not called.
+    $uncalled = array_diff($expected, $actual);
+    if (count($uncalled)) {
+      $this->assertTrue(FALSE, format_string('Expected hooks %expected to be called but %uncalled was not called.', array('%expected' => implode(', ', $expected), '%uncalled' => implode(', ', $uncalled))));
+    }
+    else {
+      $this->assertTrue(TRUE, format_string('All the expected hooks were called: %expected', array('%expected' => empty($expected) ? '(none)' : implode(', ', $expected))));
+    }
+
+    // Determine if there were any unexpected calls.
+    $unexpected = array_diff($actual, $expected);
+    if (count($unexpected)) {
+      $this->assertTrue(FALSE, format_string('Unexpected hooks were called: %unexpected.', array('%unexpected' => empty($unexpected) ? '(none)' : implode(', ', $unexpected))));
+    }
+    else {
+      $this->assertTrue(TRUE, 'No unexpected hooks were called.');
+    }
+  }
+
+  /**
+   * Assert that a hook_file_* hook was called a certain number of times.
+   *
+   * @param string $hook
+   *   String with the hook name, e.g. 'load', 'save', 'insert', etc.
+   * @param int $expected_count
+   *   Optional integer count.
+   * @param string $message
+   *   Optional translated string message.
+   */
+  function assertFileHookCalled($hook, $expected_count = 1, $message = NULL) {
+    $actual_count = count(file_test_get_calls($hook));
+
+    if (!isset($message)) {
+      if ($actual_count == $expected_count) {
+        $message = format_string('hook_file_@name was called correctly.', array('@name' => $hook));
+      }
+      elseif ($expected_count == 0) {
+        $message = \Drupal::translation()->formatPlural($actual_count, 'hook_file_@name was not expected to be called but was actually called once.', 'hook_file_@name was not expected to be called but was actually called @count times.', array('@name' => $hook, '@count' => $actual_count));
+      }
+      else {
+        $message = format_string('hook_file_@name was expected to be called %expected times but was called %actual times.', array('@name' => $hook, '%expected' => $expected_count, '%actual' => $actual_count));
+      }
+    }
+    $this->assertEqual($actual_count, $expected_count, $message);
+  }
+
+  /**
+   * Asserts that two files have the same values (except timestamp).
+   *
+   * @param \Drupal\file\FileInterface $before
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $after
+   *   File object to compare.
+   */
+  function assertFileUnchanged(FileInterface $before, FileInterface $after) {
+    $this->assertEqual($before->id(), $after->id(), t('File id is the same: %file1 == %file2.', array('%file1' => $before->id(), '%file2' => $after->id())), 'File unchanged');
+    $this->assertEqual($before->getOwner()->id(), $after->getOwner()->id(), t('File owner is the same: %file1 == %file2.', array('%file1' => $before->getOwner()->id(), '%file2' => $after->getOwner()->id())), 'File unchanged');
+    $this->assertEqual($before->getFilename(), $after->getFilename(), t('File name is the same: %file1 == %file2.', array('%file1' => $before->getFilename(), '%file2' => $after->getFilename())), 'File unchanged');
+    $this->assertEqual($before->getFileUri(), $after->getFileUri(), t('File path is the same: %file1 == %file2.', array('%file1' => $before->getFileUri(), '%file2' => $after->getFileUri())), 'File unchanged');
+    $this->assertEqual($before->getMimeType(), $after->getMimeType(), t('File MIME type is the same: %file1 == %file2.', array('%file1' => $before->getMimeType(), '%file2' => $after->getMimeType())), 'File unchanged');
+    $this->assertEqual($before->getSize(), $after->getSize(), t('File size is the same: %file1 == %file2.', array('%file1' => $before->getSize(), '%file2' => $after->getSize())), 'File unchanged');
+    $this->assertEqual($before->isPermanent(), $after->isPermanent(), t('File status is the same: %file1 == %file2.', array('%file1' => $before->isPermanent(), '%file2' => $after->isPermanent())), 'File unchanged');
+  }
+
+  /**
+   * Asserts that two files are not the same by comparing the fid and filepath.
+   *
+   * @param \Drupal\file\FileInterface $file1
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $file2
+   *   File object to compare.
+   */
+  function assertDifferentFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertNotEqual($file1->id(), $file2->id(), t('Files have different ids: %file1 != %file2.', array('%file1' => $file1->id(), '%file2' => $file2->id())), 'Different file');
+    $this->assertNotEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have different paths: %file1 != %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Different file');
+  }
+
+  /**
+   * Asserts that two files are the same by comparing the fid and filepath.
+   *
+   * @param \Drupal\file\FileInterface $file1
+   *   File object to compare.
+   * @param \Drupal\file\FileInterface $file2
+   *   File object to compare.
+   */
+  function assertSameFile(FileInterface $file1, FileInterface $file2) {
+    $this->assertEqual($file1->id(), $file2->id(), t('Files have the same ids: %file1 == %file2.', array('%file1' => $file1->id(), '%file2-fid' => $file2->id())), 'Same file');
+    $this->assertEqual($file1->getFileUri(), $file2->getFileUri(), t('Files have the same path: %file1 == %file2.', array('%file1' => $file1->getFileUri(), '%file2' => $file2->getFileUri())), 'Same file');
+  }
+
+  /**
+   * Create a file and save it to the files table and assert that it occurs
+   * correctly.
+   *
+   * @param string $filepath
+   *   Optional string specifying the file path. If none is provided then a
+   *   randomly named file will be created in the site's files directory.
+   * @param string $contents
+   *   Optional contents to save into the file. If a NULL value is provided an
+   *   arbitrary string will be used.
+   * @param string $scheme
+   *   Optional string indicating the stream scheme to use. Drupal core includes
+   *   public, private, and temporary. The public wrapper is the default.
+   * @return \Drupal\file\FileInterface
+   *   File entity.
+   */
+  function createFile($filepath = NULL, $contents = NULL, $scheme = NULL) {
+    // Don't count hook invocations caused by creating the file.
+    \Drupal::state()->set('file_test.count_hook_invocations', FALSE);
+    $file = File::create([
+      'uri' => $this->createUri($filepath, $contents, $scheme),
+      'uid' => 1,
+    ]);
+    $file->save();
+    // Write the record directly rather than using the API so we don't invoke
+    // the hooks.
+    $this->assertTrue($file->id() > 0, 'The file was added to the database.', 'Create test file');
+
+    \Drupal::state()->set('file_test.count_hook_invocations', TRUE);
+    return $file;
+  }
+
+  /**
+   * Creates a file and returns its URI.
+   *
+   * @param string $filepath
+   *   Optional string specifying the file path. If none is provided then a
+   *   randomly named file will be created in the site's files directory.
+   * @param string $contents
+   *   Optional contents to save into the file. If a NULL value is provided an
+   *   arbitrary string will be used.
+   * @param string $scheme
+   *   Optional string indicating the stream scheme to use. Drupal core includes
+   *   public, private, and temporary. The public wrapper is the default.
+   *
+   * @return string
+   *   File URI.
+   */
+  function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
+    if (!isset($filepath)) {
+      // Prefix with non-latin characters to ensure that all file-related
+      // tests work with international filenames.
+      $filepath = 'Файл для тестирования ' . $this->randomMachineName();
+    }
+    if (!isset($scheme)) {
+      $scheme = file_default_scheme();
+    }
+    $filepath = $scheme . '://' . $filepath;
+
+    if (!isset($contents)) {
+      $contents = "file_put_contents() doesn't seem to appreciate empty strings so let's put in some data.";
+    }
+
+    file_put_contents($filepath, $contents);
+    $this->assertTrue(is_file($filepath), t('The test file exists on the disk.'), 'Create test file');
+    return $filepath;
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Formatter/FileEntityFormatterTest.php b/core/modules/file/tests/src/Kernel/Formatter/FileEntityFormatterTest.php
new file mode 100644
index 0000000..61f6891
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Formatter/FileEntityFormatterTest.php
@@ -0,0 +1,173 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Formatter\FileEntityFormatterTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Formatter;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Core\Url;
+use Drupal\file\Entity\File;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the default file formatter.
+ *
+ * @group field
+ */
+class FileEntityFormatterTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['file', 'user'];
+
+  /**
+   * The files.
+   *
+   * @var array
+   */
+  protected $files;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+
+    $this->files = [];
+    file_put_contents('public://file.png', str_repeat('t', 10));
+    $file = File::create([
+      'uri' => 'public://file.png',
+      'filename' => 'file.png',
+    ]);
+    $file->save();
+    $this->files[] = $file;
+
+    file_put_contents('public://file.tar', str_repeat('t', 200));
+    $file = File::create([
+      'uri' => 'public://file.tar',
+      'filename' => 'file.tar',
+    ]);
+    $file->save();
+    $this->files[] = $file;
+
+    file_put_contents('public://file.tar.gz', str_repeat('t', 40000));
+    $file = File::create([
+      'uri' => 'public://file.tar.gz',
+      'filename' => 'file.tar.gz',
+    ]);
+    $file->save();
+    $this->files[] = $file;
+
+    file_put_contents('public://file', str_repeat('t', 8000000));
+    $file = File::create([
+      'uri' => 'public://file',
+      'filename' => 'file',
+    ]);
+    $file->save();
+    $this->files[] = $file;
+  }
+
+  /**
+   * Tests the file_link field formatter.
+   */
+  public function testFormatterFileLink() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'file',
+      'bundle' => 'file',
+    ]);
+    $entity_display->setComponent('filename', ['type' => 'file_link']);
+
+    $build = $entity_display->buildMultiple($this->files)[0]['filename'][0];
+    $this->assertEqual('file.png', $build['#title']);
+    $this->assertEqual(Url::fromUri(file_create_url('public://file.png')), $build['#url']);
+  }
+
+  /**
+   * Tests the file_link field formatter.
+   */
+  public function testFormatterFileUri() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'file',
+      'bundle' => 'file',
+    ]);
+    $entity_display->setComponent('uri', ['type' => 'file_uri']);
+
+    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
+    $this->assertEqual('public://file.png', $build['#markup']);
+
+    $entity_display->setComponent('uri', ['type' => 'file_uri', 'settings' => ['file_download_path' => TRUE]]);
+    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
+    $this->assertEqual(file_create_url('public://file.png'), $build['#markup']);
+
+    $entity_display->setComponent('uri', ['type' => 'file_uri', 'settings' => ['file_download_path' => TRUE, 'link_to_file' => TRUE]]);
+    $build = $entity_display->buildMultiple($this->files)[0]['uri'][0];
+    $this->assertEqual(file_create_url('public://file.png'), $build['#title']);
+    $this->assertEqual(Url::fromUri(file_create_url('public://file.png')), $build['#url']);
+  }
+
+  /**
+   * Tests the file_extension field formatter.
+   */
+  public function testFormatterFileExtension() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'file',
+      'bundle' => 'file',
+    ]);
+    $entity_display->setComponent('filename', ['type' => 'file_extension']);
+
+    $expected = ['png', 'tar', 'gz', ''];
+    foreach (array_values($this->files) as $i => $file) {
+      $build = $entity_display->build($file);
+      $this->assertEqual($expected[$i], $build['filename'][0]['#markup']);
+    }
+
+    $entity_display->setComponent('filename', ['type' => 'file_extension', 'settings' => ['extension_detect_tar' => TRUE]]);
+
+    $expected = ['png', 'tar', 'tar.gz', ''];
+    foreach (array_values($this->files) as $i => $file) {
+      $build = $entity_display->build($file);
+      $this->assertEqual($expected[$i], $build['filename'][0]['#markup']);
+    }
+  }
+
+  /**
+   * Tests the file_extension field formatter.
+   */
+  public function testFormatterFileMime() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'file',
+      'bundle' => 'file',
+    ]);
+    $entity_display->setComponent('filemime', ['type' => 'file_filemime', 'settings' => ['filemime_image' => TRUE]]);
+
+    foreach (array_values($this->files) as $i => $file) {
+      $build = $entity_display->build($file);
+      $this->assertEqual('image__file_icon', $build['filemime'][0]['#theme']);
+      $this->assertEqual(spl_object_hash($file), spl_object_hash($build['filemime'][0]['#file']));
+    }
+  }
+
+  /**
+   * Tests the file_size field formatter.
+   */
+  public function testFormatterFileSize() {
+    $entity_display = EntityViewDisplay::create([
+      'targetEntityType' => 'file',
+      'bundle' => 'file',
+    ]);
+    $entity_display->setComponent('filesize', ['type' => 'file_size']);
+
+    $expected = ['10 bytes', '200 bytes', '39.06 KB', '7.63 MB'];
+    foreach (array_values($this->files) as $i => $file) {
+      $build = $entity_display->build($file);
+      $this->assertEqual($expected[$i], $build['filesize'][0]['#markup']);
+    }
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/LoadTest.php b/core/modules/file/tests/src/Kernel/LoadTest.php
new file mode 100644
index 0000000..19c1675
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/LoadTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\LoadTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests \Drupal\file\Entity\File::load().
+ *
+ * @group file
+ */
+class LoadTest extends FileManagedUnitTestBase {
+  /**
+   * Try to load a non-existent file by fid.
+   */
+  function testLoadMissingFid() {
+    $this->assertFalse(File::load(-1), 'Try to load an invalid fid fails.');
+    $this->assertFileHooksCalled(array());
+  }
+
+  /**
+   * Try to load a non-existent file by URI.
+   */
+  function testLoadMissingFilepath() {
+    $files = entity_load_multiple_by_properties('file', array('uri' => 'foobar://misc/druplicon.png'));
+    $this->assertFalse(reset($files), "Try to load a file that doesn't exist in the database fails.");
+    $this->assertFileHooksCalled(array());
+  }
+
+  /**
+   * Try to load a non-existent file by status.
+   */
+  function testLoadInvalidStatus() {
+    $files = entity_load_multiple_by_properties('file', array('status' => -99));
+    $this->assertFalse(reset($files), 'Trying to load a file with an invalid status fails.');
+    $this->assertFileHooksCalled(array());
+  }
+
+  /**
+   * Load a single file and ensure that the correct values are returned.
+   */
+  function testSingleValues() {
+    // Create a new file entity from scratch so we know the values.
+    $file = $this->createFile('druplicon.txt', NULL, 'public');
+    $by_fid_file = File::load($file->id());
+    $this->assertFileHookCalled('load');
+    $this->assertTrue(is_object($by_fid_file), '\Drupal\file\Entity\File::load() returned an object.');
+    $this->assertEqual($by_fid_file->id(), $file->id(), 'Loading by fid got the same fid.', 'File');
+    $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
+    $this->assertEqual($by_fid_file->getFilename(), $file->getFilename(), 'Loading by fid got the correct filename.', 'File');
+    $this->assertEqual($by_fid_file->getMimeType(), $file->getMimeType(), 'Loading by fid got the correct MIME type.', 'File');
+    $this->assertEqual($by_fid_file->isPermanent(), $file->isPermanent(), 'Loading by fid got the correct status.', 'File');
+    $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
+  }
+
+  /**
+   * This will test loading file data from the database.
+   */
+  function testMultiple() {
+    // Create a new file entity.
+    $file = $this->createFile('druplicon.txt', NULL, 'public');
+
+    // Load by path.
+    file_test_reset();
+    $by_path_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
+    $this->assertFileHookCalled('load');
+    $this->assertEqual(1, count($by_path_files), 'entity_load_multiple_by_properties() returned an array of the correct size.');
+    $by_path_file = reset($by_path_files);
+    $this->assertTrue($by_path_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
+    $this->assertEqual($by_path_file->id(), $file->id(), 'Loading by filepath got the correct fid.', 'File');
+
+    // Load by fid.
+    file_test_reset();
+    $by_fid_files = File::loadMultiple(array($file->id()));
+    $this->assertFileHooksCalled(array());
+    $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
+    $by_fid_file = reset($by_fid_files);
+    $this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
+    $this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
+  }
+
+  /**
+   * Loads a single file and ensure that the correct values are returned.
+   */
+  public function testUuidValues() {
+    // Create a new file entity from scratch so we know the values.
+    $file = $this->createFile('druplicon.txt', NULL, 'public');
+    $file->save();
+    file_test_reset();
+
+    $by_uuid_file = \Drupal::entityManager()->loadEntityByUuid('file', $file->uuid());
+    $this->assertFileHookCalled('load');
+    $this->assertTrue(is_object($by_uuid_file), '\Drupal::entityManager()->loadEntityByUuid() returned a file object.');
+    if (is_object($by_uuid_file)) {
+      $this->assertEqual($by_uuid_file->id(), $file->id(), 'Loading by UUID got the same fid.', 'File');
+      $this->assertTrue($by_uuid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
+    }
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php
new file mode 100644
index 0000000..08e9fcb
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/EntityFileTest.php
@@ -0,0 +1,278 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\EntityFileTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate;
+
+use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\migrate\Row;
+use Drupal\file\Plugin\migrate\destination\EntityFile;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\migrate\MigrateException;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the entity file destination plugin.
+ *
+ * @group file
+ */
+class EntityFileTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'entity_test', 'user', 'file');
+
+  /**
+   * @var \Drupal\Tests\file\Kernel\Migrate\TestEntityFile $destination
+   */
+  protected $destination;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::getContainer()->get('stream_wrapper_manager')->registerWrapper('public', 'Drupal\Core\StreamWrapper\PublicStream', StreamWrapperInterface::NORMAL);
+    $this->destination = new TestEntityFile([]);
+    $this->installEntitySchema('file');
+
+    file_put_contents('/tmp/test-file.jpg', '');
+  }
+
+  /**
+   * Test successful imports/copies.
+   */
+  public function testSuccessfulCopies() {
+    foreach ($this->localFileDataProvider() as $data) {
+      list($row_values, $destination_path, $expected, $source_base_path) = $data;
+
+      $this->doImport($row_values, $destination_path, $source_base_path);
+      $message = $expected ? sprintf('File %s exists', $destination_path) : sprintf('File %s does not exist', $destination_path);
+      $this->assertIdentical($expected, is_file($destination_path), $message);
+    }
+  }
+
+  /**
+   * The data provider for testing the file destination.
+   *
+   * @return array
+   *   An array of file permutations to test.
+   */
+  protected function localFileDataProvider() {
+    return [
+      // Test a local to local copy.
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://file1.jpg', TRUE, $this->root . '/'],
+      // Test a temporary file using an absolute path.
+      [['filepath' => '/tmp/test-file.jpg'], 'temporary://test.jpg', TRUE, ''],
+      // Test a temporary file using a relative path.
+      [['filepath' => 'test-file.jpg'], 'temporary://core/modules/simpletest/files/test.jpg', TRUE, '/tmp/'],
+      // Test a remote path to local.
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://remote-file.jpg', TRUE, $this->root . '/'],
+      // Test a remote path to local inside a folder that doesn't exist.
+      [['filepath' => 'core/modules/simpletest/files/image-test.jpg'], 'public://folder/remote-file.jpg', TRUE, $this->root . '/'],
+    ];
+  }
+
+  /**
+   * Test that non-existent files throw an exception.
+   */
+  public function testNonExistentSourceFile() {
+    $destination = '/non/existent/file';
+    try {
+      // If this test passes, doImport() will raise a MigrateException and
+      // we'll never reach fail().
+      $this->doImport(['filepath' => $destination], 'public://wontmatter.jpg');
+      $this->fail('Expected Drupal\migrate\MigrateException when importing ' . $destination);
+    }
+    catch (MigrateException $e) {
+      $this->assertIdentical($e->getMessage(), "File '$destination' does not exist.");
+    }
+  }
+
+  /**
+   * Tests various invocations of the writeFile() method.
+   */
+  public function testWriteFile() {
+    $plugin = $this->destination;
+    $method = new \ReflectionMethod($plugin, 'writeFile');
+    $method->setAccessible(TRUE);
+
+    touch('temporary://baz.txt');
+
+    // Moving an actual file should return TRUE.
+    $plugin->configuration['move'] = TRUE;
+    $this->assertTrue($method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt'));
+
+    // Trying to move a non-existent file should return FALSE.
+    $this->assertFalse($method->invoke($plugin, 'temporary://invalid.txt', 'public://invalid.txt'));
+
+    // Copying over a file that already exists should replace the existing file.
+    $plugin->configuration['move'] = FALSE;
+    touch('temporary://baz.txt');
+    $this->assertTrue($method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt'));
+    // Copying over a file that already exists should rename the resulting file
+    // if FILE_EXISTS_RENAME is specified.
+    $method->invoke($plugin, 'temporary://baz.txt', 'public://foo.txt', FILE_EXISTS_RENAME);
+    $this->assertTrue(file_exists('public://foo_0.txt'));
+
+    // Trying to copy a non-existent file should return FALSE.
+    $this->assertFalse($method->invoke($plugin, 'temporary://invalid.txt', 'public://invalid.txt'));
+  }
+
+  /**
+   * Tests various invocations of the getOverwriteMode() method.
+   */
+  public function testGetOverwriteMode() {
+    $plugin = $this->destination;
+    $method = new \ReflectionMethod($plugin, 'getOverwriteMode');
+    $method->setAccessible(TRUE);
+
+    $row = new Row([], []);
+    // If the plugin is not configured to rename the destination file, we should
+    // always get FILE_EXISTS_REPLACE.
+    $this->assertIdentical(FILE_EXISTS_REPLACE, $method->invoke($plugin, $row));
+
+    // When the plugin IS configured to rename the destination file, it should
+    // return FILE_EXISTS_RENAME if the destination entity already exists,
+    // and FILE_EXISTS_REPLACE otherwise.
+    $plugin->configuration['rename'] = TRUE;
+    $plugin->storage = \Drupal::entityManager()->getStorage('file');
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $plugin->storage->create();
+    touch('public://foo.txt');
+    $file->setFileUri('public://foo.txt');
+    $file->save();
+    $row->setDestinationProperty($plugin->storage->getEntityType()->getKey('id'), $file->id());
+    $this->assertIdentical(FILE_EXISTS_RENAME, $method->invoke($plugin, $row));
+    unlink('public://foo.txt');
+  }
+
+  /**
+   * Tests various invocations of the getDirectory() method.
+   */
+  public function testGetDirectory() {
+    $plugin = $this->destination;
+    $method = new \ReflectionMethod($plugin, 'getDirectory');
+    $method->setAccessible(TRUE);
+
+    $this->assertSame('public://foo', $method->invoke($plugin, 'public://foo/baz.txt'));
+    $this->assertSame('/path/to', $method->invoke($plugin, '/path/to/foo.txt'));
+    // A directory like public:// (no path) needs to resolve to a physical path.
+    $fs = \Drupal::getContainer()->get('file_system');
+    $this->assertSame($fs->realpath('public://'), $method->invoke($plugin, 'public://foo.txt'));
+  }
+
+  /**
+   * Tests various invocations of the isLocationUnchanged() method.
+   */
+  public function testIsLocationUnchanged() {
+    $plugin = $this->destination;
+    $method = new \ReflectionMethod($plugin, 'isLocationUnchanged');
+    $method->setAccessible(TRUE);
+
+    $temporary_file = '/tmp/foo.txt';
+    touch($temporary_file);
+    $this->assertTrue($method->invoke($plugin, $temporary_file, 'temporary://foo.txt'));
+    unlink($temporary_file);
+  }
+
+  /**
+   * Tests various invocations of the isLocalUri() method.
+   */
+  public function testIsLocalUri() {
+    $plugin = $this->destination;
+    $method = new \ReflectionMethod($plugin, 'isLocalUri');
+    $method->setAccessible(TRUE);
+
+    $this->assertTrue($method->invoke($plugin, 'public://foo.txt'));
+    $this->assertTrue($method->invoke($plugin, 'public://path/to/foo.txt'));
+    $this->assertTrue($method->invoke($plugin, 'temporary://foo.txt'));
+    $this->assertTrue($method->invoke($plugin, 'temporary://path/to/foo.txt'));
+    $this->assertTrue($method->invoke($plugin, 'foo.txt'));
+    $this->assertTrue($method->invoke($plugin, '/path/to/files/foo.txt'));
+    $this->assertTrue($method->invoke($plugin, 'relative/path/to/foo.txt'));
+    $this->assertFalse($method->invoke($plugin, 'http://www.example.com/foo.txt'));
+  }
+
+  /**
+   * Do an import using the destination.
+   *
+   * @param array $row_values
+   *   An array of row values.
+   * @param string $destination_path
+   *   The destination path to copy to.
+   * @param string $source_base_path
+   *   The source base path.
+   * @return array
+   *   An array of saved entities ids.
+   *
+   * @throws \Drupal\migrate\MigrateException
+   */
+  protected function doImport($row_values, $destination_path, $source_base_path = '') {
+    $row = new Row($row_values, []);
+    $row->setDestinationProperty('uri', $destination_path);
+    $this->destination->configuration['source_base_path'] = $source_base_path;
+
+    // Importing asserts there are no errors, then we just check the file has
+    // been copied into place.
+    return $this->destination->import($row, array());
+  }
+
+}
+
+class TestEntityFile extends EntityFile {
+
+  /**
+   * This is needed to be passed to $this->save().
+   *
+   * @var \Drupal\Core\Entity\ContentEntityInterface
+   */
+  public $mockEntity;
+
+  /**
+   * Make this public for easy writing during tests.
+   *
+   * @var array
+   */
+  public $configuration;
+
+  /**
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  public $storage;
+
+  public function __construct($configuration = []) {
+    $configuration +=  array(
+      'source_base_path' => '',
+      'source_path_property' => 'filepath',
+      'destination_path_property' => 'uri',
+      'move' => FALSE,
+      'urlencode' => FALSE,
+    );
+    $this->configuration = $configuration;
+    // We need a mock entity to be passed to save to prevent strict exceptions.
+    $this->mockEntity = EntityTest::create();
+    $this->streamWrapperManager = \Drupal::getContainer()->get('stream_wrapper_manager');
+    $this->fileSystem = \Drupal::getContainer()->get('file_system');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    return $this->mockEntity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = array()) {}
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php b/core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php
new file mode 100644
index 0000000..71a6875
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/MigrateFileStubTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\MigrateFileStubTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for file entities.
+ *
+ * @group file
+ */
+class MigrateFileStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['file'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+  }
+
+  /**
+   * Tests creation of file stubs.
+   */
+  public function testStub() {
+    $this->performStubTest('file');
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
new file mode 100644
index 0000000..f36471e
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/FileMigrationTestTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+/**
+ * Helper for setting up a file migration test.
+ */
+trait FileMigrationTestTrait {
+
+  /**
+   * Setup and execute d6_file migration.
+   */
+  protected function setUpMigratedFiles() {
+    $this->installEntitySchema('file');
+    $this->installConfig(['file']);
+
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration_plugin_manager = $this->container->get('plugin.manager.migration');
+
+    /** @var \Drupal\migrate\Plugin\migration $migration */
+    $migration = $migration_plugin_manager->createInstance('d6_file');
+    $source = $migration->getSourceConfiguration();
+    $source['site_path'] = 'core/modules/simpletest';
+    $migration->set('source', $source);
+    $this->executeMigration($migration);
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
new file mode 100644
index 0000000..dced9e2
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateFileConfigsTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to file.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFileConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_file_settings');
+  }
+
+  /**
+   * Tests migration of file variables to file.settings.yml.
+   */
+  public function testFileSettings() {
+    $config = $this->config('file.settings');
+    $this->assertIdentical('textfield', $config->get('description.type'));
+    $this->assertIdentical(128, $config->get('description.length'));
+    $this->assertIdentical('sites/default/files/icons', $config->get('icon.directory'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
new file mode 100644
index 0000000..6b7c687
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateFileTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\Component\Utility\Random;
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate\Kernel\MigrateDumpAlterInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * file migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlterInterface {
+
+  use FileMigrationTestTrait;
+
+  /**
+   * The filename of a file used to test temporary file migration.
+   *
+   * @var string
+   */
+  protected static $tempFilename;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->setUpMigratedFiles();
+  }
+
+  /**
+   * Asserts a file entity.
+   *
+   * @param int $fid
+   *   The file ID.
+   * @param string $name
+   *   The expected file name.
+   * @param int $size
+   *   The expected file size.
+   * @param string $uri
+   *   The expected file URI.
+   * @param string $type
+   *   The expected MIME type.
+   * @param int $uid
+   *   The expected file owner ID.
+   */
+  protected function assertEntity($fid, $name, $size, $uri, $type, $uid) {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = File::load($fid);
+    $this->assertTrue($file instanceof FileInterface);
+    $this->assertIdentical($name, $file->getFilename());
+    $this->assertIdentical($size, $file->getSize());
+    $this->assertIdentical($uri, $file->getFileUri());
+    $this->assertIdentical($type, $file->getMimeType());
+    $this->assertIdentical($uid, $file->getOwnerId());
+  }
+
+  /**
+   * Tests the Drupal 6 files to Drupal 8 migration.
+   */
+  public function testFiles() {
+    $this->assertEntity(1, 'Image1.png', '39325', 'public://image-1.png', 'image/png', '1');
+    $this->assertEntity(2, 'Image2.jpg', '1831', 'public://image-2.jpg', 'image/jpeg', '1');
+    $this->assertEntity(3, 'Image-test.gif', '183', 'public://image-test.gif', 'image/jpeg', '1');
+    $this->assertEntity(5, 'html-1.txt', '24', 'public://html-1.txt', 'text/plain', '1');
+
+    // Test that we can re-import and also test with file_directory_path set.
+    $migration_plugin_manager = $this->container->get('plugin.manager.migration');
+    \Drupal::database()
+      ->truncate($migration_plugin_manager->createInstance('d6_file')->getIdMap()->mapTableName())
+      ->execute();
+
+    // Update the file_directory_path.
+    Database::getConnection('default', 'migrate')
+      ->update('variable')
+      ->fields(array('value' => serialize('files/test')))
+      ->condition('name', 'file_directory_path')
+      ->execute();
+    Database::getConnection('default', 'migrate')
+      ->update('variable')
+      ->fields(array('value' => serialize(file_directory_temp())))
+      ->condition('name', 'file_directory_temp')
+      ->execute();
+
+    $migration = $migration_plugin_manager->createInstance('d6_file');
+    $this->executeMigration($migration);
+
+    $file = File::load(2);
+    $this->assertIdentical('public://core/modules/simpletest/files/image-2.jpg', $file->getFileUri());
+
+    // Ensure that a temporary file has been migrated.
+    $file = File::load(6);
+    $this->assertIdentical('temporary://' . static::getUniqueFilename(), $file->getFileUri());
+
+    // File 7, created in static::migrateDumpAlter(), shares a path with
+    // file 5, which means it should be skipped entirely.
+    $this->assertNull(File::load(7));
+  }
+
+  /**
+   * @return string
+   *   A filename based upon the test.
+   */
+  public static function getUniqueFilename() {
+    return static::$tempFilename;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function migrateDumpAlter(KernelTestBase $test) {
+    // Creates a random filename and updates the source database.
+    $random = new Random();
+    $temp_directory = file_directory_temp();
+    file_prepare_directory($temp_directory, FILE_CREATE_DIRECTORY);
+    static::$tempFilename = $test->getDatabasePrefix() . $random->name() . '.jpg';
+    $file_path = $temp_directory . '/' . static::$tempFilename;
+    file_put_contents($file_path, '');
+
+    $db = Database::getConnection('default', 'migrate');
+
+    $db->update('files')
+      ->condition('fid', 6)
+      ->fields(array(
+        'filename' => static::$tempFilename,
+        'filepath' => $file_path,
+      ))
+      ->execute();
+
+    $file = (array) $db->select('files')
+      ->fields('files')
+      ->condition('fid', 5)
+      ->execute()
+      ->fetchObject();
+    unset($file['fid']);
+    $db->insert('files')->fields($file)->execute();
+
+    return static::$tempFilename;
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
new file mode 100644
index 0000000..a50b2d9
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upload entity display.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUploadEntityDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+    $this->executeMigration('d6_upload_entity_display');
+  }
+
+  /**
+   * Tests the Drupal 6 upload settings to Drupal 8 entity display migration.
+   */
+  public function testUploadEntityDisplay() {
+    $display = EntityViewDisplay::load('node.page.default');
+    $component = $display->getComponent('upload');
+    $this->assertIdentical('file_default', $component['type']);
+
+    $display = EntityViewDisplay::load('node.story.default');
+    $component = $display->getComponent('upload');
+    $this->assertIdentical('file_default', $component['type']);
+
+    // Assure this doesn't exist.
+    $display = EntityViewDisplay::load('node.article.default');
+    $component = $display->getComponent('upload');
+    $this->assertTrue(is_null($component));
+
+    $this->assertIdentical(array('node', 'page', 'default', 'upload'), $this->getMigration('d6_upload_entity_display')->getIdMap()->lookupDestinationID(array('page')));
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
new file mode 100644
index 0000000..688e6ca
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upload form entity display.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUploadEntityFormDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+    $this->executeMigration('d6_upload_entity_form_display');
+  }
+
+  /**
+   * Tests the Drupal 6 upload settings to Drupal 8 entity form display migration.
+   */
+  public function testUploadEntityFormDisplay() {
+    $display = EntityFormDisplay::load('node.page.default');
+    $component = $display->getComponent('upload');
+    $this->assertIdentical('file_generic', $component['type']);
+
+    $display = EntityFormDisplay::load('node.story.default');
+    $component = $display->getComponent('upload');
+    $this->assertIdentical('file_generic', $component['type']);
+
+    // Assure this doesn't exist.
+    $display = EntityFormDisplay::load('node.article.default');
+    $component = $display->getComponent('upload');
+    $this->assertTrue(is_null($component));
+
+    $this->assertIdentical(array('node', 'page', 'default', 'upload'), $this->getMigration('d6_upload_entity_form_display')->getIdMap()->lookupDestinationID(array('page')));
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
new file mode 100644
index 0000000..f7531dc
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadFieldTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadFieldTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Uploads migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUploadFieldTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+  }
+
+  /**
+   * Tests the Drupal 6 upload settings to Drupal 8 field migration.
+   */
+  public function testUpload() {
+    $field_storage = FieldStorageConfig::load('node.upload');
+    $this->assertIdentical('node.upload', $field_storage->id());
+    $this->assertIdentical(array('node', 'upload'), $this->getMigration('d6_upload_field')->getIdMap()->lookupDestinationID(array('')));
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
new file mode 100644
index 0000000..9b1238c
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadInstanceTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upload field instance migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUploadInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateFields();
+  }
+
+  /**
+   * Tests the Drupal 6 upload settings to Drupal 8 field instance migration.
+   */
+  public function testUploadFieldInstance() {
+    $field = FieldConfig::load('node.page.upload');
+    $settings = $field->getSettings();
+    $this->assertIdentical('node.page.upload', $field->id());
+    $this->assertIdentical('jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp', $settings['file_extensions']);
+    $this->assertIdentical('1MB', $settings['max_filesize']);
+    $this->assertIdentical(TRUE, $settings['description_field']);
+
+    $field = FieldConfig::load('node.story.upload');
+    $this->assertIdentical('node.story.upload', $field->id());
+
+    // Shouldn't exist.
+    $field = FieldConfig::load('node.article.upload');
+    $this->assertTrue(is_null($field));
+
+    $this->assertIdentical(array('node', 'page', 'upload'), $this->getMigration('d6_upload_field_instance')->getIdMap()->lookupDestinationID(array('page')));
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
new file mode 100644
index 0000000..b676f61
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d6\MigrateUploadTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d6;
+
+use Drupal\file\Entity\File;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Migrate association data between nodes and files.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUploadTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->installEntitySchema('node');
+    $this->installSchema('file', ['file_usage']);
+    $this->installSchema('node', ['node_access']);
+
+    $id_mappings = array('d6_file' => array());
+    // Create new file entities.
+    for ($i = 1; $i <= 3; $i++) {
+      $file = File::create(array(
+        'fid' => $i,
+        'uid' => 1,
+        'filename' => 'druplicon.txt',
+        'uri' => "public://druplicon-$i.txt",
+        'filemime' => 'text/plain',
+        'created' => 1,
+        'changed' => 1,
+        'status' => FILE_STATUS_PERMANENT,
+      ));
+      $file->enforceIsNew();
+      file_put_contents($file->getFileUri(), 'hello world');
+
+      // Save it, inserting a new record.
+      $file->save();
+      $id_mappings['d6_file'][] = array(array($i), array($i));
+    }
+    $this->prepareMigrations($id_mappings);
+
+    $this->migrateContent();
+    // Since we are only testing a subset of the file migration, do not check
+    // that the full file migration has been run.
+    $migration = $this->getMigration('d6_upload');
+    $migration->set('requirements', []);
+    $this->executeMigration($migration);
+  }
+
+  /**
+   * Test upload migration from Drupal 6 to Drupal 8.
+   */
+  function testUpload() {
+    $this->container->get('entity.manager')
+      ->getStorage('node')
+      ->resetCache([1, 2]);
+
+    $nodes = Node::loadMultiple([1, 2]);
+    $node = $nodes[1];
+    $this->assertIdentical(1, count($node->upload));
+    $this->assertIdentical('1', $node->upload[0]->target_id);
+    $this->assertIdentical('file 1-1-1', $node->upload[0]->description);
+    $this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
+
+    $node = $nodes[2];
+    $this->assertIdentical(2, count($node->upload));
+    $this->assertIdentical('3', $node->upload[0]->target_id);
+    $this->assertIdentical('file 2-3-3', $node->upload[0]->description);
+    $this->assertIdentical(FALSE, $node->upload[0]->isDisplayed());
+    $this->assertIdentical('2', $node->upload[1]->target_id);
+    $this->assertIdentical(TRUE, $node->upload[1]->isDisplayed());
+    $this->assertIdentical('file 2-3-2', $node->upload[1]->description);
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
new file mode 100644
index 0000000..4860dab
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Migrate\d7\MigrateFileTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Migrate\d7;
+
+use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\file\Entity\File;
+use Drupal\file\FileInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrates all files in the file_managed table.
+ *
+ * @group file
+ */
+class MigrateFileTest extends MigrateDrupal7TestBase {
+
+  static $modules = ['file'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->container->get('stream_wrapper_manager')->registerWrapper('public', 'Drupal\Core\StreamWrapper\PublicStream', StreamWrapperInterface::NORMAL);
+
+    $fs = \Drupal::service('file_system');
+    // The public file directory active during the test will serve as the
+    // root of the fictional Drupal 7 site we're migrating.
+    $fs->mkdir('public://sites/default/files', NULL, TRUE);
+    file_put_contents('public://sites/default/files/cube.jpeg', str_repeat('*', 3620));
+
+    /** @var \Drupal\migrate\Plugin\Migration $migration */
+    $migration = $this->getMigration('d7_file');
+    // Set the destination plugin's source_base_path configuration value, which
+    // would normally be set by the user running the migration.
+    $migration->set('destination', [
+      'plugin' => 'entity:file',
+      // Note that source_base_path must include a trailing slash because it's
+      // prepended directly to the value of the source path property.
+      'source_base_path' => $fs->realpath('public://') . '/',
+      // This is set in the migration's YAML file, but we need to repeat it
+      // here because all the destination configuration must be set at once.
+      'source_path_property' => 'filepath',
+    ]);
+    $this->executeMigration($migration);
+  }
+
+  /**
+   * Tests a single file entity.
+   *
+   * @param int $id
+   *   The file ID.
+   * @param string $name
+   *   The expected file name.
+   * @param string $uri
+   *   The expected URI.
+   * @param string $mime
+   *   The expected MIME type.
+   * @param int $size
+   *   The expected file size.
+   * @param int $created
+   *   The expected creation time.
+   * @param int $changed
+   *   The expected modification time.
+   * @param int $uid
+   *   The expected owner ID.
+   */
+  protected function assertEntity($id, $name, $uri, $mime, $size, $created, $changed, $uid) {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = File::load($id);
+    $this->assertTrue($file instanceof FileInterface);
+    $this->assertIdentical($name, $file->getFilename());
+    $this->assertIdentical($uri, $file->getFileUri());
+    $this->assertTrue(file_exists($uri));
+    $this->assertIdentical($mime, $file->getMimeType());
+    $this->assertIdentical($size, $file->getSize());
+    // isPermanent(), isTemporary(), etc. are determined by the status column.
+    $this->assertTrue($file->isPermanent());
+    $this->assertIdentical($created, $file->getCreatedTime());
+    $this->assertIdentical($changed, $file->getChangedTime());
+    $this->assertIdentical($uid, $file->getOwnerId());
+  }
+
+  /**
+   * Tests that all expected files are migrated.
+   */
+  public function testFileMigration() {
+    $this->assertEntity(1, 'cube.jpeg', 'public://cube.jpeg', 'image/jpeg', '3620', '1421727515', '1421727515', '1');
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/MoveTest.php b/core/modules/file/tests/src/Kernel/MoveTest.php
new file mode 100644
index 0000000..34a1254
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/MoveTest.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\MoveTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the file move function.
+ *
+ * @group file
+ */
+class MoveTest extends FileManagedUnitTestBase {
+  /**
+   * Move a normal file.
+   */
+  function testNormal() {
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $desired_filepath = 'public://' . $this->randomMachineName();
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_move(clone $source, $desired_filepath, FILE_EXISTS_ERROR);
+
+    // Check the return status and that the contents changed.
+    $this->assertTrue($result, 'File moved successfully.');
+    $this->assertFalse(file_exists($source->getFileUri()));
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('move', 'load', 'update'));
+
+    // Make sure we got the same file back.
+    $this->assertEqual($source->id(), $result->id(), format_string("Source file id's' %fid is unchanged after move.", array('%fid' => $source->id())));
+
+    // Reload the file from the database and check that the changes were
+    // actually saved.
+    $loaded_file = File::load($result->id());
+    $this->assertTrue($loaded_file, 'File can be loaded from the database.');
+    $this->assertFileUnchanged($result, $loaded_file);
+  }
+
+  /**
+   * Test renaming when moving onto a file that already exists.
+   */
+  function testExistingRename() {
+    // Setup a file to overwrite.
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $target = $this->createFile();
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_RENAME);
+
+    // Check the return status and that the contents changed.
+    $this->assertTrue($result, 'File moved successfully.');
+    $this->assertFalse(file_exists($source->getFileUri()));
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file correctly written.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('move', 'load', 'update'));
+
+    // Compare the returned value to what made it into the database.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+    // The target file should not have been altered.
+    $this->assertFileUnchanged($target, File::load($target->id()));
+    // Make sure we end up with two distinct files afterwards.
+    $this->assertDifferentFile($target, $result);
+
+    // Compare the source and results.
+    $loaded_source = File::load($source->id());
+    $this->assertEqual($loaded_source->id(), $result->id(), "Returned file's id matches the source.");
+    $this->assertNotEqual($loaded_source->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
+  }
+
+  /**
+   * Test replacement when moving onto a file that already exists.
+   */
+  function testExistingReplace() {
+    // Setup a file to overwrite.
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+    $target = $this->createFile();
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_REPLACE);
+
+    // Look at the results.
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of file were overwritten.');
+    $this->assertFalse(file_exists($source->getFileUri()));
+    $this->assertTrue($result, 'File moved successfully.');
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('move', 'update', 'delete', 'load'));
+
+    // Reload the file from the database and check that the changes were
+    // actually saved.
+    $loaded_result = File::load($result->id());
+    $this->assertFileUnchanged($result, $loaded_result);
+    // Check that target was re-used.
+    $this->assertSameFile($target, $loaded_result);
+    // Source and result should be totally different.
+    $this->assertDifferentFile($source, $loaded_result);
+  }
+
+  /**
+   * Test replacement when moving onto itself.
+   */
+  function testExistingReplaceSelf() {
+    // Setup a file to overwrite.
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile(NULL, $contents);
+
+    // Copy the file over itself. Clone the object so we don't have to worry
+    // about the function changing our reference copy.
+    $result = file_move(clone $source, $source->getFileUri(), FILE_EXISTS_REPLACE);
+    $this->assertFalse($result, 'File move failed.');
+    $this->assertEqual($contents, file_get_contents($source->getFileUri()), 'Contents of file were not altered.');
+
+    // Check that no hooks were called while failing.
+    $this->assertFileHooksCalled(array());
+
+    // Load the file from the database and make sure it is identical to what
+    // was returned.
+    $this->assertFileUnchanged($source, File::load($source->id()));
+  }
+
+  /**
+   * Test that moving onto an existing file fails when FILE_EXISTS_ERROR is
+   * specified.
+   */
+  function testExistingError() {
+    $contents = $this->randomMachineName(10);
+    $source = $this->createFile();
+    $target = $this->createFile(NULL, $contents);
+    $this->assertDifferentFile($source, $target);
+
+    // Clone the object so we don't have to worry about the function changing
+    // our reference copy.
+    $result = file_move(clone $source, $target->getFileUri(), FILE_EXISTS_ERROR);
+
+    // Check the return status and that the contents did not change.
+    $this->assertFalse($result, 'File move failed.');
+    $this->assertTrue(file_exists($source->getFileUri()));
+    $this->assertEqual($contents, file_get_contents($target->getFileUri()), 'Contents of file were not altered.');
+
+    // Check that no hooks were called while failing.
+    $this->assertFileHooksCalled(array());
+
+    // Load the file from the database and make sure it is identical to what
+    // was returned.
+    $this->assertFileUnchanged($source, File::load($source->id()));
+    $this->assertFileUnchanged($target, File::load($target->id()));
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/SaveDataTest.php b/core/modules/file/tests/src/Kernel/SaveDataTest.php
new file mode 100644
index 0000000..0bcaaf7
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/SaveDataTest.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\SaveDataTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the file_save_data() function.
+ *
+ * @group file
+ */
+class SaveDataTest extends FileManagedUnitTestBase {
+  /**
+   * Test the file_save_data() function when no filename is provided.
+   */
+  function testWithoutFilename() {
+    $contents = $this->randomMachineName(8);
+
+    $result = file_save_data($contents);
+    $this->assertTrue($result, 'Unnamed file saved correctly.');
+
+    $this->assertEqual(file_default_scheme(), file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
+    $this->assertEqual($result->getFilename(), drupal_basename($result->getFileUri()), "Filename was set to the file's basename.");
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
+    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
+    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('insert'));
+
+    // Verify that what was returned is what's in the database.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+  }
+
+  /**
+   * Test the file_save_data() function when a filename is provided.
+   */
+  function testWithFilename() {
+    $contents = $this->randomMachineName(8);
+
+    // Using filename with non-latin characters.
+    $filename = 'Текстовый файл.txt';
+
+    $result = file_save_data($contents, 'public://' . $filename);
+    $this->assertTrue($result, 'Unnamed file saved correctly.');
+
+    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
+    $this->assertEqual($filename, drupal_basename($result->getFileUri()), 'File was named correctly.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
+    $this->assertEqual($result->getMimeType(), 'text/plain', 'A MIME type was set.');
+    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('insert'));
+
+    // Verify that what was returned is what's in the database.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+  }
+
+  /**
+   * Test file_save_data() when renaming around an existing file.
+   */
+  function testExistingRename() {
+    // Setup a file to overwrite.
+    $existing = $this->createFile();
+    $contents = $this->randomMachineName(8);
+
+    $result = file_save_data($contents, $existing->getFileUri(), FILE_EXISTS_RENAME);
+    $this->assertTrue($result, 'File saved successfully.');
+
+    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
+    $this->assertEqual($result->getFilename(), $existing->getFilename(), 'Filename was set to the basename of the source, rather than that of the renamed file.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
+    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
+    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('insert'));
+
+    // Ensure that the existing file wasn't overwritten.
+    $this->assertDifferentFile($existing, $result);
+    $this->assertFileUnchanged($existing, File::load($existing->id()));
+
+    // Verify that was returned is what's in the database.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+  }
+
+  /**
+   * Test file_save_data() when replacing an existing file.
+   */
+  function testExistingReplace() {
+    // Setup a file to overwrite.
+    $existing = $this->createFile();
+    $contents = $this->randomMachineName(8);
+
+    $result = file_save_data($contents, $existing->getFileUri(), FILE_EXISTS_REPLACE);
+    $this->assertTrue($result, 'File saved successfully.');
+
+    $this->assertEqual('public', file_uri_scheme($result->getFileUri()), "File was placed in Drupal's files directory.");
+    $this->assertEqual($result->getFilename(), $existing->getFilename(), 'Filename was set to the basename of the existing file, rather than preserving the original name.');
+    $this->assertEqual($contents, file_get_contents($result->getFileUri()), 'Contents of the file are correct.');
+    $this->assertEqual($result->getMimeType(), 'application/octet-stream', 'A MIME type was set.');
+    $this->assertTrue($result->isPermanent(), "The file's status was set to permanent.");
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('load', 'update'));
+
+    // Verify that the existing file was re-used.
+    $this->assertSameFile($existing, $result);
+
+    // Verify that what was returned is what's in the database.
+    $this->assertFileUnchanged($result, File::load($result->id()));
+  }
+
+  /**
+   * Test that file_save_data() fails overwriting an existing file.
+   */
+  function testExistingError() {
+    $contents = $this->randomMachineName(8);
+    $existing = $this->createFile(NULL, $contents);
+
+    // Check the overwrite error.
+    $result = file_save_data('asdf', $existing->getFileUri(), FILE_EXISTS_ERROR);
+    $this->assertFalse($result, 'Overwriting a file fails when FILE_EXISTS_ERROR is specified.');
+    $this->assertEqual($contents, file_get_contents($existing->getFileUri()), 'Contents of existing file were unchanged.');
+
+    // Check that no hooks were called while failing.
+    $this->assertFileHooksCalled(array());
+
+    // Ensure that the existing file wasn't overwritten.
+    $this->assertFileUnchanged($existing, File::load($existing->id()));
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/SaveTest.php b/core/modules/file/tests/src/Kernel/SaveTest.php
new file mode 100644
index 0000000..c3dfd94
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/SaveTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\SaveTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * File saving tests.
+ *
+ * @group file
+ */
+class SaveTest extends FileManagedUnitTestBase {
+  function testFileSave() {
+    // Create a new file entity.
+    $file = File::create(array(
+      'uid' => 1,
+      'filename' => 'druplicon.txt',
+      'uri' => 'public://druplicon.txt',
+      'filemime' => 'text/plain',
+      'status' => FILE_STATUS_PERMANENT,
+    ));
+    file_put_contents($file->getFileUri(), 'hello world');
+
+    // Save it, inserting a new record.
+    $file->save();
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('insert'));
+
+    $this->assertTrue($file->id() > 0, 'A new file ID is set when saving a new file to the database.', 'File');
+    $loaded_file = File::load($file->id());
+    $this->assertNotNull($loaded_file, 'Record exists in the database.');
+    $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
+    $this->assertEqual($file->getSize(), filesize($file->getFileUri()), 'File size was set correctly.', 'File');
+    $this->assertTrue($file->getChangedTime() > 1, 'File size was set correctly.', 'File');
+    $this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was defaulted correctly.');
+
+    // Resave the file, updating the existing record.
+    file_test_reset();
+    $file->status->value = 7;
+    $file->save();
+
+    // Check that the correct hooks were called.
+    $this->assertFileHooksCalled(array('load', 'update'));
+
+    $this->assertEqual($file->id(), $file->id(), 'The file ID of an existing file is not changed when updating the database.', 'File');
+    $this->assertTrue($file->getChangedTime() >= $file->getChangedTime(), "Timestamp didn't go backwards.", 'File');
+    $loaded_file = File::load($file->id());
+    $this->assertNotNull($loaded_file, 'Record still exists in the database.', 'File');
+    $this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
+    $this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was saved correctly.');
+
+    // Try to insert a second file with the same name apart from case insensitivity
+    // to ensure the 'uri' index allows for filenames with different cases.
+    $uppercase_values = array(
+      'uid' => 1,
+      'filename' => 'DRUPLICON.txt',
+      'uri' => 'public://DRUPLICON.txt',
+      'filemime' => 'text/plain',
+      'status' => FILE_STATUS_PERMANENT,
+    );
+    $uppercase_file = File::create($uppercase_values);
+    file_put_contents($uppercase_file->getFileUri(), 'hello world');
+    $violations = $uppercase_file->validate();
+    $this->assertEqual(count($violations), 0, 'No violations when adding an URI with an existing filename in upper case.');
+    $uppercase_file->save();
+
+    // Ensure the database URI uniqueness constraint is triggered.
+    $uppercase_file_duplicate = File::create($uppercase_values);
+    file_put_contents($uppercase_file_duplicate->getFileUri(), 'hello world');
+    $violations = $uppercase_file_duplicate->validate();
+    $this->assertEqual(count($violations), 1);
+    $this->assertEqual($violations[0]->getMessage(), t('The file %value already exists. Enter a unique file URI.', [
+      '%value' => $uppercase_file_duplicate->getFileUri(),
+    ]));
+    // Ensure that file URI entity queries are case sensitive.
+    $fids = \Drupal::entityQuery('file')
+      ->condition('uri', $uppercase_file->getFileUri())
+      ->execute();
+
+    $this->assertEqual(1, count($fids));
+    $this->assertEqual(array($uppercase_file->id() => $uppercase_file->id()), $fids);
+
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/SpaceUsedTest.php b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
new file mode 100644
index 0000000..1a9dd28
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\SpaceUsedTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the spaceUsed() function.
+ *
+ * @group file
+ */
+class SpaceUsedTest extends FileManagedUnitTestBase {
+  protected function setUp() {
+    parent::setUp();
+
+    // Create records for a couple of users with different sizes.
+    $this->createFileWithSize('public://example1.txt', 50, 2);
+    $this->createFileWithSize('public://example2.txt', 20, 2);
+    $this->createFileWithSize('public://example3.txt', 100, 3);
+    $this->createFileWithSize('public://example4.txt', 200, 3);
+
+    // Now create some non-permanent files.
+    $this->createFileWithSize('public://example5.txt', 1, 2, 0);
+    $this->createFileWithSize('public://example6.txt', 3, 3, 0);
+  }
+
+  /**
+   * Creates a file with a given size.
+   *
+   * @param string $uri
+   *   URI of the file to create.
+   * @param int $size
+   *   Size of the file.
+   * @param int $uid
+   *   File owner ID.
+   * @param int $status
+   *   Whether the file should be permanent or temporary.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The file entity.
+   */
+  protected function createFileWithSize($uri, $size, $uid, $status = FILE_STATUS_PERMANENT) {
+    file_put_contents($uri, $this->randomMachineName($size));
+    $file = File::create([
+      'uri' => $uri,
+      'uid' => $uid,
+      'status' => $status,
+    ]);
+    $file->save();
+    return $file;
+  }
+
+  /**
+   * Test different users with the default status.
+   */
+  function testFileSpaceUsed() {
+    $file = $this->container->get('entity.manager')->getStorage('file');
+    // Test different users with default status.
+    $this->assertEqual($file->spaceUsed(2), 70);
+    $this->assertEqual($file->spaceUsed(3), 300);
+    $this->assertEqual($file->spaceUsed(), 370);
+
+    // Test the status fields
+    $this->assertEqual($file->spaceUsed(NULL, 0), 4);
+    $this->assertEqual($file->spaceUsed(NULL, FILE_STATUS_PERMANENT), 370);
+
+    // Test both the user and status.
+    $this->assertEqual($file->spaceUsed(1, 0), 0);
+    $this->assertEqual($file->spaceUsed(1, FILE_STATUS_PERMANENT), 0);
+    $this->assertEqual($file->spaceUsed(2, 0), 1);
+    $this->assertEqual($file->spaceUsed(2, FILE_STATUS_PERMANENT), 70);
+    $this->assertEqual($file->spaceUsed(3, 0), 3);
+    $this->assertEqual($file->spaceUsed(3, FILE_STATUS_PERMANENT), 300);
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/UsageTest.php b/core/modules/file/tests/src/Kernel/UsageTest.php
new file mode 100644
index 0000000..b28c4f5
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/UsageTest.php
@@ -0,0 +1,210 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\UsageTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+/**
+ * Tests file usage functions.
+ *
+ * @group file
+ */
+class UsageTest extends FileManagedUnitTestBase {
+  /**
+   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::listUsage().
+   */
+  function testGetUsage() {
+    $file = $this->createFile();
+    db_insert('file_usage')
+      ->fields(array(
+        'fid' => $file->id(),
+        'module' => 'testing',
+        'type' => 'foo',
+        'id' => 1,
+        'count' => 1
+      ))
+      ->execute();
+    db_insert('file_usage')
+      ->fields(array(
+        'fid' => $file->id(),
+        'module' => 'testing',
+        'type' => 'bar',
+        'id' => 2,
+        'count' => 2
+      ))
+      ->execute();
+
+    $usage = $this->container->get('file.usage')->listUsage($file);
+
+    $this->assertEqual(count($usage['testing']), 2, 'Returned the correct number of items.');
+    $this->assertTrue(isset($usage['testing']['foo'][1]), 'Returned the correct id.');
+    $this->assertTrue(isset($usage['testing']['bar'][2]), 'Returned the correct id.');
+    $this->assertEqual($usage['testing']['foo'][1], 1, 'Returned the correct count.');
+    $this->assertEqual($usage['testing']['bar'][2], 2, 'Returned the correct count.');
+  }
+
+  /**
+   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::add().
+   */
+  function testAddUsage() {
+    $file = $this->createFile();
+    $file_usage = $this->container->get('file.usage');
+    $file_usage->add($file, 'testing', 'foo', 1);
+    // Add the file twice to ensure that the count is incremented rather than
+    // creating additional records.
+    $file_usage->add($file, 'testing', 'bar', 2);
+    $file_usage->add($file, 'testing', 'bar', 2);
+
+    $usage = db_select('file_usage', 'f')
+      ->fields('f')
+      ->condition('f.fid', $file->id())
+      ->execute()
+      ->fetchAllAssoc('id');
+    $this->assertEqual(count($usage), 2, 'Created two records');
+    $this->assertEqual($usage[1]->module, 'testing', 'Correct module');
+    $this->assertEqual($usage[2]->module, 'testing', 'Correct module');
+    $this->assertEqual($usage[1]->type, 'foo', 'Correct type');
+    $this->assertEqual($usage[2]->type, 'bar', 'Correct type');
+    $this->assertEqual($usage[1]->count, 1, 'Correct count');
+    $this->assertEqual($usage[2]->count, 2, 'Correct count');
+  }
+
+  /**
+   * Tests \Drupal\file\FileUsage\DatabaseFileUsageBackend::delete().
+   */
+  function testRemoveUsage() {
+    $file = $this->createFile();
+    $file_usage = $this->container->get('file.usage');
+    db_insert('file_usage')
+      ->fields(array(
+        'fid' => $file->id(),
+        'module' => 'testing',
+        'type' => 'bar',
+        'id' => 2,
+        'count' => 3,
+      ))
+      ->execute();
+
+    // Normal decrement.
+    $file_usage->delete($file, 'testing', 'bar', 2);
+    $count = db_select('file_usage', 'f')
+      ->fields('f', array('count'))
+      ->condition('f.fid', $file->id())
+      ->execute()
+      ->fetchField();
+    $this->assertEqual(2, $count, 'The count was decremented correctly.');
+
+    // Multiple decrement and removal.
+    $file_usage->delete($file, 'testing', 'bar', 2, 2);
+    $count = db_select('file_usage', 'f')
+      ->fields('f', array('count'))
+      ->condition('f.fid', $file->id())
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical(FALSE, $count, 'The count was removed entirely when empty.');
+
+    // Non-existent decrement.
+    $file_usage->delete($file, 'testing', 'bar', 2);
+    $count = db_select('file_usage', 'f')
+      ->fields('f', array('count'))
+      ->condition('f.fid', $file->id())
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical(FALSE, $count, 'Decrementing non-exist record complete.');
+  }
+
+  /**
+   * Create files for all the possible combinations of age and status.
+   *
+   * We are using UPDATE statements because using the API would set the
+   * timestamp.
+   */
+  function createTempFiles() {
+    // Temporary file that is old.
+    $temp_old = file_save_data('');
+    db_update('file_managed')
+      ->fields(array(
+        'status' => 0,
+        'changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1,
+      ))
+      ->condition('fid', $temp_old->id())
+      ->execute();
+    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was created correctly.');
+
+    // Temporary file that is new.
+    $temp_new = file_save_data('');
+    db_update('file_managed')
+      ->fields(array('status' => 0))
+      ->condition('fid', $temp_new->id())
+      ->execute();
+    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was created correctly.');
+
+    // Permanent file that is old.
+    $perm_old = file_save_data('');
+    db_update('file_managed')
+      ->fields(array('changed' => REQUEST_TIME - $this->config('system.file')->get('temporary_maximum_age') - 1))
+      ->condition('fid', $temp_old->id())
+      ->execute();
+    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was created correctly.');
+
+    // Permanent file that is new.
+    $perm_new = file_save_data('');
+    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was created correctly.');
+    return array($temp_old, $temp_new, $perm_old, $perm_new);
+  }
+
+  /**
+   * Ensure that temporary files are removed by default.
+   */
+  function testTempFileCleanupDefault() {
+    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
+
+    // Run cron and then ensure that only the old, temp file was deleted.
+    $this->container->get('cron')->run();
+    $this->assertFalse(file_exists($temp_old->getFileUri()), 'Old temp file was correctly removed.');
+    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+  }
+
+  /**
+   * Ensure that temporary files are kept as configured.
+   */
+  function testTempFileNoCleanup() {
+    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
+
+    // Set the max age to 0, meaning no temporary files will be deleted.
+    $this->config('system.file')
+      ->set('temporary_maximum_age', 0)
+      ->save();
+
+    // Run cron and then ensure that no file was deleted.
+    $this->container->get('cron')->run();
+    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
+    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+  }
+
+  /**
+   * Ensure that temporary files are kept as configured.
+   */
+  function testTempFileCustomCleanup() {
+    list($temp_old, $temp_new, $perm_old, $perm_new) = $this->createTempFiles();
+
+    // Set the max age to older than default.
+    $this->config('system.file')
+      ->set('temporary_maximum_age', 21600 + 2)
+      ->save();
+
+    // Run cron and then ensure that more files were deleted.
+    $this->container->get('cron')->run();
+    $this->assertTrue(file_exists($temp_old->getFileUri()), 'Old temp file was correctly ignored.');
+    $this->assertTrue(file_exists($temp_new->getFileUri()), 'New temp file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_old->getFileUri()), 'Old permanent file was correctly ignored.');
+    $this->assertTrue(file_exists($perm_new->getFileUri()), 'New permanent file was correctly ignored.');
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/ValidateTest.php b/core/modules/file/tests/src/Kernel/ValidateTest.php
new file mode 100644
index 0000000..148a694
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/ValidateTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\ValidateTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\Tests\file\Kernel\FileManagedUnitTestBase;
+
+/**
+ * Tests the file_validate() function.
+ *
+ * @group file
+ */
+class ValidateTest extends FileManagedUnitTestBase {
+  /**
+   * Test that the validators passed into are checked.
+   */
+  function testCallerValidation() {
+    $file = $this->createFile();
+
+    // Empty validators.
+    $this->assertEqual(file_validate($file, array()), array(), 'Validating an empty array works successfully.');
+    $this->assertFileHooksCalled(array('validate'));
+
+    // Use the file_test.module's test validator to ensure that passing tests
+    // return correctly.
+    file_test_reset();
+    file_test_set_return('validate', array());
+    $passing = array('file_test_validator' => array(array()));
+    $this->assertEqual(file_validate($file, $passing), array(), 'Validating passes.');
+    $this->assertFileHooksCalled(array('validate'));
+
+    // Now test for failures in validators passed in and by hook_validate.
+    file_test_reset();
+    file_test_set_return('validate', array('Epic fail'));
+    $failing = array('file_test_validator' => array(array('Failed', 'Badly')));
+    $this->assertEqual(file_validate($file, $failing), array('Failed', 'Badly', 'Epic fail'), 'Validating returns errors.');
+    $this->assertFileHooksCalled(array('validate'));
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/ValidatorTest.php b/core/modules/file/tests/src/Kernel/ValidatorTest.php
new file mode 100644
index 0000000..55b170b
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/ValidatorTest.php
@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\ValidatorTest.
+ */
+
+namespace Drupal\Tests\file\Kernel;
+
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the functions used to validate uploaded files.
+ *
+ * @group file
+ */
+class ValidatorTest extends FileManagedUnitTestBase {
+
+  /**
+   * An image file.
+   *
+   * @var \Drupal\file\FileInterface
+   */
+  protected $image;
+
+  /**
+   * A file which is not an image.
+   *
+   * @var \Drupal\file\Entity\File
+   */
+  protected $nonImage;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->image = File::create();
+    $this->image->setFileUri('core/misc/druplicon.png');
+    $this->image->setFilename(drupal_basename($this->image->getFileUri()));
+
+    $this->nonImage = File::create();
+    $this->nonImage->setFileUri('core/assets/vendor/jquery/jquery.min.js');
+    $this->nonImage->setFilename(drupal_basename($this->nonImage->getFileUri()));
+  }
+
+  /**
+   * Test the file_validate_extensions() function.
+   */
+  function testFileValidateExtensions() {
+    $file = File::create(['filename' => 'asdf.txt']);
+    $errors = file_validate_extensions($file, 'asdf txt pork');
+    $this->assertEqual(count($errors), 0, 'Valid extension accepted.', 'File');
+
+    $file->setFilename('asdf.txt');
+    $errors = file_validate_extensions($file, 'exe png');
+    $this->assertEqual(count($errors), 1, 'Invalid extension blocked.', 'File');
+  }
+
+  /**
+   *  This ensures a specific file is actually an image.
+   */
+  function testFileValidateIsImage() {
+    $this->assertTrue(file_exists($this->image->getFileUri()), 'The image being tested exists.', 'File');
+    $errors = file_validate_is_image($this->image);
+    $this->assertEqual(count($errors), 0, 'No error reported for our image file.', 'File');
+
+    $this->assertTrue(file_exists($this->nonImage->getFileUri()), 'The non-image being tested exists.', 'File');
+    $errors = file_validate_is_image($this->nonImage);
+    $this->assertEqual(count($errors), 1, 'An error reported for our non-image file.', 'File');
+  }
+
+  /**
+   *  This ensures the resolution of a specific file is within bounds.
+   *  The image will be resized if it's too large.
+   */
+  function testFileValidateImageResolution() {
+    // Non-images.
+    $errors = file_validate_image_resolution($this->nonImage);
+    $this->assertEqual(count($errors), 0, 'Should not get any errors for a non-image file.', 'File');
+    $errors = file_validate_image_resolution($this->nonImage, '50x50', '100x100');
+    $this->assertEqual(count($errors), 0, 'Do not check the resolution on non files.', 'File');
+
+    // Minimum size.
+    $errors = file_validate_image_resolution($this->image);
+    $this->assertEqual(count($errors), 0, 'No errors for an image when there is no minimum or maximum resolution.', 'File');
+    $errors = file_validate_image_resolution($this->image, 0, '200x1');
+    $this->assertEqual(count($errors), 1, 'Got an error for an image that was not wide enough.', 'File');
+    $errors = file_validate_image_resolution($this->image, 0, '1x200');
+    $this->assertEqual(count($errors), 1, 'Got an error for an image that was not tall enough.', 'File');
+    $errors = file_validate_image_resolution($this->image, 0, '200x200');
+    $this->assertEqual(count($errors), 1, 'Small images report an error.', 'File');
+
+    // Maximum size.
+    if ($this->container->get('image.factory')->getToolkitId()) {
+      // Copy the image so that the original doesn't get resized.
+      copy('core/misc/druplicon.png', 'temporary://druplicon.png');
+      $this->image->setFileUri('temporary://druplicon.png');
+
+      $errors = file_validate_image_resolution($this->image, '10x5');
+      $this->assertEqual(count($errors), 0, 'No errors should be reported when an oversized image can be scaled down.', 'File');
+
+      $image = $this->container->get('image.factory')->get($this->image->getFileUri());
+      $this->assertTrue($image->getWidth() <= 10, 'Image scaled to correct width.', 'File');
+      $this->assertTrue($image->getHeight() <= 5, 'Image scaled to correct height.', 'File');
+
+      // Once again, now with negative width and height to force an error.
+      copy('core/misc/druplicon.png', 'temporary://druplicon.png');
+      $this->image->setFileUri('temporary://druplicon.png');
+      $errors = file_validate_image_resolution($this->image, '-10x-5');
+      $this->assertEqual(count($errors), 1, 'An error reported for an oversized image that can not be scaled down.', 'File');
+
+      drupal_unlink('temporary://druplicon.png');
+    }
+    else {
+      // TODO: should check that the error is returned if no toolkit is available.
+      $errors = file_validate_image_resolution($this->image, '5x10');
+      $this->assertEqual(count($errors), 1, 'Oversize images that cannot be scaled get an error.', 'File');
+    }
+  }
+
+  /**
+   *  This will ensure the filename length is valid.
+   */
+  function testFileValidateNameLength() {
+    // Create a new file entity.
+    $file = File::create();
+
+    // Add a filename with an allowed length and test it.
+    $file->setFilename(str_repeat('x', 240));
+    $this->assertEqual(strlen($file->getFilename()), 240);
+    $errors = file_validate_name_length($file);
+    $this->assertEqual(count($errors), 0, 'No errors reported for 240 length filename.', 'File');
+
+    // Add a filename with a length too long and test it.
+    $file->setFilename(str_repeat('x', 241));
+    $errors = file_validate_name_length($file);
+    $this->assertEqual(count($errors), 1, 'An error reported for 241 length filename.', 'File');
+
+    // Add a filename with an empty string and test it.
+    $file->setFilename('');
+    $errors = file_validate_name_length($file);
+    $this->assertEqual(count($errors), 1, 'An error reported for 0 length filename.', 'File');
+  }
+
+
+  /**
+   * Test file_validate_size().
+   */
+  function testFileValidateSize() {
+    // Create a file with a size of 1000 bytes, and quotas of only 1 byte.
+    $file = File::create(['filesize' => 1000]);
+    $errors = file_validate_size($file, 0, 0);
+    $this->assertEqual(count($errors), 0, 'No limits means no errors.', 'File');
+    $errors = file_validate_size($file, 1, 0);
+    $this->assertEqual(count($errors), 1, 'Error for the file being over the limit.', 'File');
+    $errors = file_validate_size($file, 0, 1);
+    $this->assertEqual(count($errors), 1, 'Error for the user being over their limit.', 'File');
+    $errors = file_validate_size($file, 1, 1);
+    $this->assertEqual(count($errors), 2, 'Errors for both the file and their limit.', 'File');
+  }
+}
diff --git a/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php b/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php
new file mode 100644
index 0000000..d15128e
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Views/ExtensionViewsFieldTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Views\ExtensionViewsFieldTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Views;
+
+use Drupal\Core\Render\RenderContext;
+use Drupal\file\Entity\File;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Tests the core Drupal\file\Plugin\views\field\Extension handler.
+ *
+ * @group file
+ */
+class ExtensionViewsFieldTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('file', 'file_test_views', 'user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('file_extension_view');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+    ViewTestData::createTestViews(get_class($this), array('file_test_views'));
+
+    $this->installEntitySchema('file');
+
+    file_put_contents('public://file.png', '');
+    File::create([
+      'uri' => 'public://file.png',
+      'filename' => 'file.png',
+    ])->save();
+
+    file_put_contents('public://file.tar', '');
+    File::create([
+      'uri' => 'public://file.tar',
+      'filename' => 'file.tar',
+    ])->save();
+
+    file_put_contents('public://file.tar.gz', '');
+    File::create([
+      'uri' => 'public://file.tar.gz',
+      'filename' => 'file.tar.gz',
+    ])->save();
+
+    file_put_contents('public://file', '');
+    File::create([
+      'uri' => 'public://file',
+      'filename' => 'file',
+    ])->save();
+  }
+
+  /**
+   * Tests file extension views field handler extension_detect_tar option.
+   */
+  public function testFileExtensionTarOption() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('file_extension_view');
+    $view->setDisplay();
+    $this->executeView($view);
+
+    // Test without the tar option.
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'gz');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
+    });
+
+    // Test with the tar option.
+    $view = Views::getView('file_extension_view');
+    $view->setDisplay();
+    $view->initHandlers();
+
+    $view->field['extension']->options['settings']['extension_detect_tar'] = TRUE;
+    $this->executeView($view);
+
+    $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[0]), 'png');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[1]), 'tar');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[2]), 'tar.gz');
+      $this->assertEqual($view->field['extension']->advancedRender($view->result[3]), '');
+    });
+  }
+
+}
diff --git a/core/modules/file/tests/src/Kernel/Views/FileViewsFieldAccessTest.php b/core/modules/file/tests/src/Kernel/Views/FileViewsFieldAccessTest.php
new file mode 100644
index 0000000..f00eed9
--- /dev/null
+++ b/core/modules/file/tests/src/Kernel/Views/FileViewsFieldAccessTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\file\Kernel\Views\FileViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\file\Kernel\Views;
+
+use Drupal\file\Entity\File;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\user\Entity\User;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the file entity.
+ *
+ * @group File
+ */
+class FileViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['file', 'entity_test', 'language', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('file');
+  }
+
+  /**
+   * Check access for file fields.
+   */
+  public function testFileFields() {
+    ConfigurableLanguage::create([
+      'id' => 'fr',
+      'name' => 'French',
+    ])->save();
+
+    $user = User::create([
+      'name' => 'test user',
+    ]);
+    $user->save();
+
+    file_put_contents('public://test.txt', 'test');
+    $file = File::create([
+      'filename' => 'test.txt',
+      'uri' => 'public://test.txt',
+      'status' => TRUE,
+      'langcode' => 'fr',
+      'uid' => $user->id()
+    ]);
+    $file->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('file', 'fid', $file->id());
+    $this->assertFieldAccess('file', 'uuid', $file->uuid());
+    $this->assertFieldAccess('file', 'langcode', $file->language()->getName());
+    $this->assertFieldAccess('file', 'uid', 'test user');
+    $this->assertFieldAccess('file', 'filename', $file->getFilename());
+    $this->assertFieldAccess('file', 'uri', $file->getFileUri());
+    $this->assertFieldAccess('file', 'filemime', $file->filemime->value);
+    $this->assertFieldAccess('file', 'filesize', '4 bytes');
+    $this->assertFieldAccess('file', 'status', t('Permanent'));
+    // $this->assertFieldAccess('file', 'created', \Drupal::service('date.formatter')->format(123456));
+    // $this->assertFieldAccess('file', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
+  }
+
+}
diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
index b98d3a9..07a3b2b 100644
--- a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
+++ b/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\file\Unit\Plugin\migrate\process\d6;
 
 use Drupal\file\Plugin\migrate\process\d6\CckFile;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/filter/filter.admin.js b/core/modules/filter/filter.admin.js
index 8010671..31e0582 100644
--- a/core/modules/filter/filter.admin.js
+++ b/core/modules/filter/filter.admin.js
@@ -3,7 +3,7 @@
  * Attaches administration-specific behavior for the Filter module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -66,4 +66,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/filter/filter.filter_html.admin.js b/core/modules/filter/filter.filter_html.admin.js
index 8c9cef6..7ddca90 100644
--- a/core/modules/filter/filter.filter_html.admin.js
+++ b/core/modules/filter/filter.filter_html.admin.js
@@ -3,7 +3,7 @@
  * Attaches behavior for updating filter_html's settings automatically.
  */
 
-(function ($, _, document, window) {
+(function ($, Drupal, _, document) {
 
   'use strict';
 
@@ -325,4 +325,4 @@
     return html;
   };
 
-})(jQuery, _, document, window);
+})(jQuery, Drupal, _, document);
diff --git a/core/modules/filter/filter.js b/core/modules/filter/filter.js
index 2455b7f..b791047 100644
--- a/core/modules/filter/filter.js
+++ b/core/modules/filter/filter.js
@@ -3,7 +3,7 @@
  * Attaches behavior for the Filter module.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -36,4 +36,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 71068b6..d42c81a 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -8,7 +8,6 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
diff --git a/core/modules/filter/src/FilterProcessResult.php b/core/modules/filter/src/FilterProcessResult.php
index 8fa963f..3d60c32 100644
--- a/core/modules/filter/src/FilterProcessResult.php
+++ b/core/modules/filter/src/FilterProcessResult.php
@@ -10,7 +10,6 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\Core\Template\Attribute;
 
 /**
  * Used to return values from a text filter plugin's processing method.
diff --git a/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index 9ae5a71..edf029d 100644
--- a/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
@@ -5,11 +5,10 @@
  * Contains \Drupal\filter\Plugin\migrate\process\d6\FilterFormatPermission.
  */
 
-
 namespace Drupal\filter\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/filter/src/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php
deleted file mode 100644
index 5fd9999..0000000
--- a/core/modules/filter/src/Tests/FilterAPITest.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\FilterAPITest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\Core\TypedData\OptionsProviderInterface;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\filter\Plugin\DataType\FilterFormat;
-use Drupal\filter\Plugin\FilterInterface;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * Tests the behavior of the API of the Filter module.
- *
- * @group filter
- */
-class FilterAPITest extends EntityUnitTestBase {
-
-  public static $modules = array('system', 'filter', 'filter_test', 'user');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('system', 'filter', 'filter_test'));
-  }
-
-  /**
-   * Tests that the filter order is respected.
-   */
-  function testCheckMarkupFilterOrder() {
-    // Create crazy HTML format.
-    $crazy_format = entity_create('filter_format', array(
-      'format' => 'crazy',
-      'name' => 'Crazy',
-      'weight' => 1,
-      'filters' => array(
-        'filter_html_escape' => array(
-          'weight' => 10,
-          'status' => 1,
-        ),
-        'filter_html' => array(
-          'weight' => -10,
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '<p>',
-          ),
-        ),
-      )
-    ));
-    $crazy_format->save();
-
-    $text = "<p>Llamas are <not> awesome!</p>";
-    $expected_filtered_text = "&lt;p&gt;Llamas are  awesome!&lt;/p&gt;";
-
-    $this->assertEqual(check_markup($text, 'crazy'), $expected_filtered_text, 'Filters applied in correct order.');
-  }
-
-  /**
-   * Tests the ability to apply only a subset of filters.
-   */
-  function testCheckMarkupFilterSubset() {
-    $text = "Text with <marquee>evil content and</marquee> a URL: https://www.drupal.org!";
-    $expected_filtered_text = "Text with evil content and a URL: <a href=\"https://www.drupal.org\">https://www.drupal.org</a>!";
-    $expected_filter_text_without_html_generators = "Text with evil content and a URL: https://www.drupal.org!";
-
-    $actual_filtered_text = check_markup($text, 'filtered_html', '', array());
-    $this->verbose("Actual:<pre>$actual_filtered_text</pre>Expected:<pre>$expected_filtered_text</pre>");
-    $this->assertEqual(
-      $actual_filtered_text,
-      $expected_filtered_text,
-      'Expected filter result.'
-    );
-    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_MARKUP_LANGUAGE));
-    $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
-    $this->assertEqual(
-      $actual_filtered_text_without_html_generators,
-      $expected_filter_text_without_html_generators,
-      'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters.'
-    );
-    // Related to @see FilterSecurityTest.php/testSkipSecurityFilters(), but
-    // this check focuses on the ability to filter multiple filter types at once.
-    // Drupal core only ships with these two types of filters, so this is the
-    // most extensive test possible.
-    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE));
-    $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
-    $this->assertEqual(
-      $actual_filtered_text_without_html_generators,
-      $expected_filter_text_without_html_generators,
-      'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.'
-    );
-  }
-
-  /**
-   * Tests the following functions for a variety of formats:
-   *   - \Drupal\filter\Entity\FilterFormatInterface::getHtmlRestrictions()
-   *   - \Drupal\filter\Entity\FilterFormatInterface::getFilterTypes()
-   */
-  function testFilterFormatAPI() {
-    // Test on filtered_html.
-    $filtered_html_format = entity_load('filter_format', 'filtered_html');
-    $this->assertIdentical(
-      $filtered_html_format->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
-          'p' => FALSE,
-          'br' => FALSE,
-          'strong' => FALSE,
-          'a' => array('href' => TRUE, 'hreflang' => TRUE),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
-      'FilterFormatInterface::getHtmlRestrictions() works as expected for the filtered_html format.'
-    );
-    $this->assertIdentical(
-      $filtered_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE),
-      'FilterFormatInterface::getFilterTypes() works as expected for the filtered_html format.'
-    );
-
-    // Test on full_html.
-    $full_html_format = entity_load('filter_format', 'full_html');
-    $this->assertIdentical(
-      $full_html_format->getHtmlRestrictions(),
-      FALSE, // Every tag is allowed.
-      'FilterFormatInterface::getHtmlRestrictions() works as expected for the full_html format.'
-    );
-    $this->assertIdentical(
-      $full_html_format->getFilterTypes(),
-      array(),
-      'FilterFormatInterface::getFilterTypes() works as expected for the full_html format.'
-    );
-
-    // Test on stupid_filtered_html, where nothing is allowed.
-    $stupid_filtered_html_format = entity_create('filter_format', array(
-      'format' => 'stupid_filtered_html',
-      'name' => 'Stupid Filtered HTML',
-      'filters' => array(
-        'filter_html' => array(
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '', // Nothing is allowed.
-          ),
-        ),
-      ),
-    ));
-    $stupid_filtered_html_format->save();
-    $this->assertIdentical(
-      $stupid_filtered_html_format->getHtmlRestrictions(),
-      array('allowed' => array()), // No tag is allowed.
-      'FilterFormatInterface::getHtmlRestrictions() works as expected for the stupid_filtered_html format.'
-    );
-    $this->assertIdentical(
-      $stupid_filtered_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
-      'FilterFormatInterface::getFilterTypes() works as expected for the stupid_filtered_html format.'
-    );
-
-    // Test on very_restricted_html, where there's two different filters of the
-    // FilterInterface::TYPE_HTML_RESTRICTOR type, each restricting in different ways.
-    $very_restricted_html_format = entity_create('filter_format', array(
-      'format' => 'very_restricted_html',
-      'name' => 'Very Restricted HTML',
-      'filters' => array(
-        'filter_html' => array(
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '<p> <br> <a href> <strong>',
-          ),
-        ),
-        'filter_test_restrict_tags_and_attributes' => array(
-          'status' => 1,
-          'settings' => array(
-            'restrictions' => array(
-              'allowed' => array(
-                'p' => TRUE,
-                'br' => FALSE,
-                'a' => array('href' => TRUE),
-                'em' => TRUE,
-              ),
-            )
-          ),
-        ),
-      )
-    ));
-    $very_restricted_html_format->save();
-    $this->assertIdentical(
-      $very_restricted_html_format->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
-          'p' => FALSE,
-          'br' => FALSE,
-          'a' => array('href' => TRUE),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
-      'FilterFormatInterface::getHtmlRestrictions() works as expected for the very_restricted_html format.'
-    );
-    $this->assertIdentical(
-      $very_restricted_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
-      'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
-    );
-
-    // Test on nonsensical_restricted_html, where the allowed attribute values
-    // contain asterisks, which do not have any meaning, but which we also
-    // cannot prevent because configuration can be modified outside of forms.
-    $nonsensical_restricted_html = \Drupal\filter\Entity\FilterFormat::create(array(
-      'format' => 'nonsensical_restricted_html',
-      'name' => 'Nonsensical Restricted HTML',
-      'filters' => array(
-        'filter_html' => array(
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '<a> <b class> <c class="*"> <d class="foo bar-* *">',
-          ),
-        ),
-      )
-    ));
-    $nonsensical_restricted_html->save();
-    $this->assertIdentical(
-      $nonsensical_restricted_html->getHtmlRestrictions(),
-      array(
-        'allowed' => array(
-          'a' => FALSE,
-          'b' => array('class' => TRUE),
-          'c' => array('class' => TRUE),
-          'd' => array('class' => array('foo' => TRUE, 'bar-*' => TRUE)),
-          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
-        ),
-      ),
-      'FilterFormatInterface::getHtmlRestrictions() works as expected for the nonsensical_restricted_html format.'
-    );
-    $this->assertIdentical(
-      $very_restricted_html_format->getFilterTypes(),
-      array(FilterInterface::TYPE_HTML_RESTRICTOR),
-      'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
-    );
-  }
-
-  /**
-   * Tests the 'processed_text' element.
-   *
-   * check_markup() is a wrapper for the 'processed_text' element, for use in
-   * simple scenarios; the 'processed_text' element has more advanced features:
-   * it lets filters attach assets, associate cache tags and define
-   * #lazy_builder callbacks.
-   * This test focuses solely on those advanced features.
-   */
-  function testProcessedTextElement() {
-    entity_create('filter_format', array(
-      'format' => 'element_test',
-      'name' => 'processed_text element test format',
-      'filters' => array(
-        'filter_test_assets' => array(
-          'weight' => -1,
-          'status' => TRUE,
-        ),
-        'filter_test_cache_tags' => array(
-          'weight' => 0,
-          'status' => TRUE,
-        ),
-        'filter_test_cache_contexts' => array(
-          'weight' => 0,
-          'status' => TRUE,
-        ),
-        'filter_test_cache_merge' => array(
-          'weight' => 0,
-          'status' => TRUE,
-        ),
-        'filter_test_placeholders' => array(
-          'weight' => 1,
-          'status' => TRUE,
-        ),
-        // Run the HTML corrector filter last, because it has the potential to
-        // break the placeholders added by the filter_test_placeholders filter.
-        'filter_htmlcorrector' => array(
-          'weight' => 10,
-          'status' => TRUE,
-        ),
-      ),
-    ))->save();
-
-    $build = array(
-      '#type' => 'processed_text',
-      '#text' => '<p>Hello, world!</p>',
-      '#format' => 'element_test',
-    );
-    drupal_render_root($build);
-
-    // Verify the attachments and cacheability metadata.
-    $expected_attachments = array(
-      // The assets attached by the filter_test_assets filter.
-      'library' => array(
-        'filter/caption',
-      ),
-      // The placeholders attached that still need to be processed.
-      'placeholders' => [],
-    );
-    $this->assertEqual($expected_attachments, $build['#attached'], 'Expected attachments present');
-    $expected_cache_tags = array(
-      // The cache tag set by the processed_text element itself.
-      'config:filter.format.element_test',
-      // The cache tags set by the filter_test_cache_tags filter.
-      'foo:bar',
-      'foo:baz',
-      // The cache tags set by the filter_test_cache_merge filter.
-      'merge:tag',
-    );
-    $this->assertEqual($expected_cache_tags, $build['#cache']['tags'], 'Expected cache tags present.');
-    $expected_cache_contexts = [
-      // The cache context set by the filter_test_cache_contexts filter.
-      'languages:' . LanguageInterface::TYPE_CONTENT,
-      // The default cache contexts for Renderer.
-      'languages:' . LanguageInterface::TYPE_INTERFACE,
-      'theme',
-      // The cache tags set by the filter_test_cache_merge filter.
-      'user.permissions',
-    ];
-    $this->assertEqual($expected_cache_contexts, $build['#cache']['contexts'], 'Expected cache contexts present.');
-    $expected_markup = '<p>Hello, world!</p><p>This is a dynamic llama.</p>';
-    $this->assertEqual($expected_markup, $build['#markup'], 'Expected #lazy_builder callback has been applied.');
-  }
-
-  /**
-   * Tests the function of the typed data type.
-   */
-  function testTypedDataAPI() {
-    $definition = DataDefinition::create('filter_format');
-    $data = \Drupal::typedDataManager()->create($definition);
-
-    $this->assertTrue($data instanceof OptionsProviderInterface, 'Typed data object implements \Drupal\Core\TypedData\OptionsProviderInterface');
-
-    $filtered_html_user = $this->createUser(array('uid' => 2), array(
-      entity_load('filter_format', 'filtered_html')->getPermissionName(),
-    ));
-
-    // Test with anonymous user.
-    $user = new AnonymousUserSession();
-    \Drupal::currentUser()->setAccount($user);
-
-    $expected_available_options = array(
-      'filtered_html' => 'Filtered HTML',
-      'full_html' => 'Full HTML',
-      'filter_test' => 'Test format',
-      'plain_text' => 'Plain text',
-    );
-
-    $available_values = $data->getPossibleValues();
-    $this->assertEqual($available_values, array_keys($expected_available_options));
-    $available_options = $data->getPossibleOptions();
-    $this->assertEqual($available_options, $expected_available_options);
-
-    $allowed_values = $data->getSettableValues($user);
-    $this->assertEqual($allowed_values, array('plain_text'));
-    $allowed_options = $data->getSettableOptions($user);
-    $this->assertEqual($allowed_options, array('plain_text' => 'Plain text'));
-
-    $data->setValue('foo');
-    $violations = $data->validate();
-    $this->assertFilterFormatViolation($violations, 'foo');
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getRoot(), $data, 'Violation root is filter format.');
-    $this->assertEqual($violation->getPropertyPath(), '', 'Violation property path is correct.');
-    $this->assertEqual($violation->getInvalidValue(), 'foo', 'Violation contains invalid value.');
-
-    $data->setValue('plain_text');
-    $violations = $data->validate();
-    $this->assertEqual(count($violations), 0, "No validation violation for format 'plain_text' found");
-
-    // Anonymous doesn't have access to the 'filtered_html' format.
-    $data->setValue('filtered_html');
-    $violations = $data->validate();
-    $this->assertFilterFormatViolation($violations, 'filtered_html');
-
-    // Set user with access to 'filtered_html' format.
-    \Drupal::currentUser()->setAccount($filtered_html_user);
-    $violations = $data->validate();
-    $this->assertEqual(count($violations), 0, "No validation violation for accessible format 'filtered_html' found.");
-
-    $allowed_values = $data->getSettableValues($filtered_html_user);
-    $this->assertEqual($allowed_values, array('filtered_html', 'plain_text'));
-    $allowed_options = $data->getSettableOptions($filtered_html_user);
-    $expected_allowed_options = array(
-      'filtered_html' => 'Filtered HTML',
-      'plain_text' => 'Plain text',
-    );
-    $this->assertEqual($allowed_options, $expected_allowed_options);
-  }
-
-  /**
-   * Tests that FilterFormat::preSave() only saves customized plugins.
-   */
-  public function testFilterFormatPreSave() {
-    /** @var \Drupal\filter\FilterFormatInterface $crazy_format */
-    $crazy_format = entity_create('filter_format', array(
-      'format' => 'crazy',
-      'name' => 'Crazy',
-      'weight' => 1,
-      'filters' => array(
-        'filter_html_escape' => array(
-          'weight' => 10,
-          'status' => 1,
-        ),
-        'filter_html' => array(
-          'weight' => -10,
-          'status' => 1,
-          'settings' => array(
-            'allowed_html' => '<p>',
-          ),
-        ),
-      )
-    ));
-    $crazy_format->save();
-    // Use config to directly load the configuration and check that only enabled
-    // or customized plugins are saved to configuration.
-    $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
-
-    // Disable a plugin to ensure that disabled plugins with custom settings are
-    // stored in configuration.
-    $crazy_format->setFilterConfig('filter_html_escape', array('status' => FALSE));
-    $crazy_format->save();
-    $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
-
-    // Set the settings as per default to ensure that disable plugins in this
-    // state are not stored in configuration.
-    $crazy_format->setFilterConfig('filter_html_escape', array('weight' => -10));
-    $crazy_format->save();
-    $filters = $this->config('filter.format.crazy')->get('filters');
-    $this->assertEqual(array('filter_html'), array_keys($filters));
-  }
-
-  /**
-   * Checks if an expected violation exists in the given violations.
-   *
-   * @param \Symfony\Component\Validator\ConstraintViolationListInterface $violations
-   *   The violations to assert.
-   * @param mixed $invalid_value
-   *   The expected invalid value.
-   */
-  public function assertFilterFormatViolation(ConstraintViolationListInterface $violations, $invalid_value) {
-    $filter_format_violation_found = FALSE;
-    foreach ($violations as $violation) {
-      if ($violation->getRoot() instanceof FilterFormat && $violation->getInvalidValue() === $invalid_value) {
-        $filter_format_violation_found = TRUE;
-        break;
-      }
-    }
-    $this->assertTrue($filter_format_violation_found, format_string('Validation violation for invalid value "%invalid_value" found', array('%invalid_value' => $invalid_value)));
-  }
-
-  /**
-   * Tests that filter format dependency removal works.
-   *
-   * Ensure that modules providing filter plugins are required when the plugin
-   * is in use, and that only disabled plugins are removed from format
-   * configuration entities rather than the configuration entities being
-   * deleted.
-   *
-   * @see \Drupal\filter\Entity\FilterFormat::onDependencyRemoval()
-   * @see filter_system_info_alter()
-   */
-  public function testDependencyRemoval() {
-    $this->installSchema('user', array('users_data'));
-    $filter_format = \Drupal\filter\Entity\FilterFormat::load('filtered_html');
-
-    // Disable the filter_test_restrict_tags_and_attributes filter plugin but
-    // have custom configuration so that the filter plugin is still configured
-    // in filtered_html the filter format.
-    $filter_config = [
-      'weight' => 20,
-      'status' => 0,
-    ];
-    $filter_format->setFilterConfig('filter_test_restrict_tags_and_attributes', $filter_config)->save();
-    // Use the get method to match the assert after the module has been
-    // uninstalled.
-    $filters = $filter_format->get('filters');
-    $this->assertTrue(isset($filters['filter_test_restrict_tags_and_attributes']), 'The filter plugin filter_test_restrict_tags_and_attributes is configured by the filtered_html filter format.');
-
-    drupal_static_reset('filter_formats');
-    \Drupal::entityManager()->getStorage('filter_format')->resetCache();
-    $module_data = _system_rebuild_module_data();
-    $this->assertFalse(isset($module_data['filter_test']->info['required']), 'The filter_test module is required.');
-
-    // Verify that a dependency exists on the module that provides the filter
-    // plugin since it has configuration for the disabled plugin.
-    $this->assertEqual(['module' => ['filter_test']], $filter_format->getDependencies());
-
-    // Uninstall the module.
-    \Drupal::service('module_installer')->uninstall(array('filter_test'));
-
-    // Verify the filter format still exists but the dependency and filter is
-    // gone.
-    \Drupal::entityManager()->getStorage('filter_format')->resetCache();
-    $filter_format = \Drupal\filter\Entity\FilterFormat::load('filtered_html');
-    $this->assertEqual([], $filter_format->getDependencies());
-    // Use the get method since the FilterFormat::filters() method only returns
-    // existing plugins.
-    $filters = $filter_format->get('filters');
-    $this->assertFalse(isset($filters['filter_test_restrict_tags_and_attributes']), 'The filter plugin filter_test_restrict_tags_and_attributes is not configured by the filtered_html filter format.');
-  }
-
-}
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index 0c61a9e..bcc8c57 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -50,7 +50,7 @@ protected function setUp() {
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
     // Set up the filter formats used by this test.
-    $basic_html_format = entity_create('filter_format', array(
+    $basic_html_format = FilterFormat::create(array(
       'format' => 'basic_html',
       'name' => 'Basic HTML',
       'filters' => array(
@@ -63,7 +63,7 @@ protected function setUp() {
       ),
     ));
     $basic_html_format->save();
-    $restricted_html_format = entity_create('filter_format', array(
+    $restricted_html_format = FilterFormat::create(array(
       'format' => 'restricted_html',
       'name' => 'Restricted HTML',
       'filters' => array(
@@ -89,7 +89,7 @@ protected function setUp() {
       ),
     ));
     $restricted_html_format->save();
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -267,7 +267,7 @@ function testFilterAdmin() {
     $this->drupalGet('admin/config/content/formats/manage/' . $format->id());
     $this->assertFieldByName('roles[' . RoleInterface::AUTHENTICATED_ID . ']', '', 'Role found.');
     $this->assertFieldByName('filters[' . $second_filter . '][status]', '', 'Line break filter found.');
-    $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'Url filter found.');
+    $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'URL filter found.');
 
     // Disable new filter.
     $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', array(), t('Disable'));
diff --git a/core/modules/filter/src/Tests/FilterCrudTest.php b/core/modules/filter/src/Tests/FilterCrudTest.php
deleted file mode 100644
index 00a25fc..0000000
--- a/core/modules/filter/src/Tests/FilterCrudTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\FilterCrudTest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests creation, loading, updating, deleting of text formats and filters.
- *
- * @group filter
- */
-class FilterCrudTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['filter', 'filter_test', 'system', 'user'];
-
-  /**
-   * Tests CRUD operations for text formats and filters.
-   */
-  function testTextFormatCrud() {
-    // Add a text format with minimum data only.
-    $format = entity_create('filter_format');
-    $format->set('format', 'empty_format');
-    $format->set('name', 'Empty format');
-    $format->save();
-    $this->verifyTextFormat($format);
-
-    // Add another text format specifying all possible properties.
-    $format = entity_create('filter_format', array(
-      'format' => 'custom_format',
-      'name' => 'Custom format',
-    ));
-    $format->setFilterConfig('filter_url', array(
-      'status' => 1,
-      'settings' => array(
-        'filter_url_length' => 30,
-      ),
-    ));
-    $format->save();
-    $this->verifyTextFormat($format);
-
-    // Alter some text format properties and save again.
-    $format->set('name', 'Altered format');
-    $format->setFilterConfig('filter_url', array(
-      'status' => 0,
-    ));
-    $format->setFilterConfig('filter_autop', array(
-      'status' => 1,
-    ));
-    $format->save();
-    $this->verifyTextFormat($format);
-
-    // Add a filter_test_replace  filter and save again.
-    $format->setFilterConfig('filter_test_replace', array(
-      'status' => 1,
-    ));
-    $format->save();
-    $this->verifyTextFormat($format);
-
-    // Disable the text format.
-    $format->disable()->save();
-
-    $formats = filter_formats();
-    $this->assertTrue(!isset($formats[$format->id()]), 'filter_formats: Disabled text format no longer exists.');
-  }
-
-  /**
-   * Tests disabling the fallback text format.
-   */
-  public function testDisableFallbackFormat() {
-    $this->installConfig(['filter']);
-    $message = '\LogicException with message "The fallback text format \'plain_text\' cannot be disabled." was thrown.';
-    try {
-      FilterFormat::load('plain_text')->disable();
-      $this->fail($message);
-    }
-    catch (\LogicException $e) {
-      $this->assertIdentical($e->getMessage(), "The fallback text format 'plain_text' cannot be disabled.", $message);
-    }
-  }
-
-  /**
-   * Verifies that a text format is properly stored.
-   */
-  function verifyTextFormat($format) {
-    $t_args = array('%format' => $format->label());
-    $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
-
-    // Verify the loaded filter has all properties.
-    $filter_format = entity_load('filter_format', $format->id());
-    $this->assertEqual($filter_format->id(), $format->id(), format_string('filter_format_load: Proper format id for text format %format.', $t_args));
-    $this->assertEqual($filter_format->label(), $format->label(), format_string('filter_format_load: Proper title for text format %format.', $t_args));
-    $this->assertEqual($filter_format->get('weight'), $format->get('weight'), format_string('filter_format_load: Proper weight for text format %format.', $t_args));
-    // Check that the filter was created in site default language.
-    $this->assertEqual($format->language()->getId(), $default_langcode, format_string('filter_format_load: Proper language code for text format %format.', $t_args));
-  }
-
-}
diff --git a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php b/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
deleted file mode 100644
index ced0fb3..0000000
--- a/core/modules/filter/src/Tests/FilterDefaultConfigTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\FilterDefaultConfigTest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-use Drupal\user\RoleInterface;
-
-/**
- * Tests text format default configuration.
- *
- * @group filter
- */
-class FilterDefaultConfigTest extends KernelTestBase {
-
-  public static $modules = array('system', 'user', 'filter', 'filter_test');
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Drupal\filter\FilterPermissions::permissions() builds a URL to output
-    // a link in the description.
-    $this->installSchema('system', 'url_alias');
-
-    $this->installEntitySchema('user');
-
-    // Install filter_test module, which ships with custom default format.
-    $this->installConfig(array('user', 'filter_test'));
-  }
-
-  /**
-   * Tests installation of default formats.
-   */
-  function testInstallation() {
-    // Verify that the format was installed correctly.
-    $format = entity_load('filter_format', 'filter_test');
-    $this->assertTrue((bool) $format);
-    $this->assertEqual($format->id(), 'filter_test');
-    $this->assertEqual($format->label(), 'Test format');
-    $this->assertEqual($format->get('weight'), 2);
-
-    // Verify that format default property values have been added/injected.
-    $this->assertTrue($format->uuid());
-
-    // Verify that the loaded format does not contain any roles.
-    $this->assertEqual($format->get('roles'), NULL);
-    // Verify that the defined roles in the default config have been processed.
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
-      RoleInterface::ANONYMOUS_ID,
-      RoleInterface::AUTHENTICATED_ID,
-    ));
-
-    // Verify enabled filters.
-    $filters = $format->get('filters');
-    $this->assertEqual($filters['filter_html_escape']['status'], 1);
-    $this->assertEqual($filters['filter_html_escape']['weight'], -10);
-    $this->assertEqual($filters['filter_html_escape']['provider'], 'filter');
-    $this->assertEqual($filters['filter_html_escape']['settings'], array());
-    $this->assertEqual($filters['filter_autop']['status'], 1);
-    $this->assertEqual($filters['filter_autop']['weight'], 0);
-    $this->assertEqual($filters['filter_autop']['provider'], 'filter');
-    $this->assertEqual($filters['filter_autop']['settings'], array());
-    $this->assertEqual($filters['filter_url']['status'], 1);
-    $this->assertEqual($filters['filter_url']['weight'], 0);
-    $this->assertEqual($filters['filter_url']['provider'], 'filter');
-    $this->assertEqual($filters['filter_url']['settings'], array(
-      'filter_url_length' => 72,
-    ));
-  }
-
-  /**
-   * Tests that changes to FilterFormat::$roles do not have an effect.
-   */
-  function testUpdateRoles() {
-    // Verify role permissions declared in default config.
-    $format = entity_load('filter_format', 'filter_test');
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
-      RoleInterface::ANONYMOUS_ID,
-      RoleInterface::AUTHENTICATED_ID,
-    ));
-
-    // Attempt to change roles.
-    $format->set('roles', array(
-      RoleInterface::AUTHENTICATED_ID,
-    ));
-    $format->save();
-
-    // Verify that roles have not been updated.
-    $format = entity_load('filter_format', 'filter_test');
-    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
-      RoleInterface::ANONYMOUS_ID,
-      RoleInterface::AUTHENTICATED_ID,
-    ));
-  }
-
-}
diff --git a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
index 9d96c5f..aaa8c8b 100644
--- a/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/src/Tests/FilterHtmlImageSecureTest.php
@@ -10,6 +10,7 @@
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests restriction of IMG tags in HTML input.
@@ -38,7 +39,7 @@ protected function setUp() {
     parent::setUp();
 
     // Setup Filtered HTML text format.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'filters' => array(
diff --git a/core/modules/filter/src/Tests/FilterSettingsTest.php b/core/modules/filter/src/Tests/FilterSettingsTest.php
deleted file mode 100644
index 9b95336..0000000
--- a/core/modules/filter/src/Tests/FilterSettingsTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\FilterSettingsTest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests filter settings.
- *
- * @group filter
- */
-class FilterSettingsTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('filter');
-
-  /**
-   * Tests explicit and implicit default settings for filters.
-   */
-  function testFilterDefaults() {
-    $filter_info = $this->container->get('plugin.manager.filter')->getDefinitions();
-
-    // Create text format using filter default settings.
-    $filter_defaults_format = entity_create('filter_format', array(
-      'format' => 'filter_defaults',
-      'name' => 'Filter defaults',
-    ));
-    $filter_defaults_format->save();
-
-    // Verify that default weights defined in hook_filter_info() were applied.
-    $saved_settings = array();
-    foreach ($filter_defaults_format->filters() as $name => $filter) {
-      $expected_weight = $filter_info[$name]['weight'];
-      $this->assertEqual($filter->weight, $expected_weight, format_string('@name filter weight %saved equals %default', array(
-        '@name' => $name,
-        '%saved' => $filter->weight,
-        '%default' => $expected_weight,
-      )));
-      $saved_settings[$name]['weight'] = $expected_weight;
-    }
-
-    // Re-save the text format.
-    $filter_defaults_format->save();
-    // Reload it from scratch.
-    filter_formats_reset();
-
-    // Verify that saved filter settings have not been changed.
-    foreach ($filter_defaults_format->filters() as $name => $filter) {
-      $this->assertEqual($filter->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', array(
-        '@name' => $name,
-        '%saved' => $filter->weight,
-        '%previous' => $saved_settings[$name]['weight'],
-      )));
-    }
-  }
-}
diff --git a/core/modules/filter/src/Tests/FilterUnitTest.php b/core/modules/filter/src/Tests/FilterUnitTest.php
deleted file mode 100644
index d64c349..0000000
--- a/core/modules/filter/src/Tests/FilterUnitTest.php
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\FilterUnitTest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Render\RenderContext;
-use Drupal\editor\EditorXssFilter\Standard;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\filter\FilterPluginCollection;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests Filter module filters individually.
- *
- * @group filter
- */
-class FilterUnitTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'filter');
-
-  /**
-   * @var \Drupal\filter\Plugin\FilterInterface[]
-   */
-  protected $filters;
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('system'));
-
-    $manager = $this->container->get('plugin.manager.filter');
-    $bag = new FilterPluginCollection($manager, array());
-    $this->filters = $bag->getAll();
-  }
-
-  /**
-   * Tests the align filter.
-   */
-  function testAlignFilter() {
-    $filter = $this->filters['filter_align'];
-
-    $test = function($input) use ($filter) {
-      return $filter->process($input, 'und');
-    };
-
-    // No data-align attribute.
-    $input = '<img src="llama.jpg" />';
-    $expected = $input;
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // Data-align attribute: all 3 allowed values.
-    $input = '<img src="llama.jpg" data-align="left" />';
-    $expected = '<img src="llama.jpg" class="align-left" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-    $input = '<img src="llama.jpg" data-align="center" />';
-    $expected = '<img src="llama.jpg" class="align-center" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-    $input = '<img src="llama.jpg" data-align="right" />';
-    $expected = '<img src="llama.jpg" class="align-right" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // Data-align attribute: a disallowed value.
-    $input = '<img src="llama.jpg" data-align="left foobar" />';
-    $expected = '<img src="llama.jpg" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // Empty data-align attribute.
-    $input = '<img src="llama.jpg" data-align="" />';
-    $expected = '<img src="llama.jpg" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // Ensure the filter also works with uncommon yet valid attribute quoting.
-    $input = '<img src=llama.jpg data-align=right />';
-    $expected = '<img src="llama.jpg" class="align-right" />';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-
-    // Security test: attempt to inject an additional class.
-    $input = '<img src="llama.jpg" data-align="center another-class-here" />';
-    $expected = '<img src="llama.jpg" />';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-
-    // Security test: attempt an XSS.
-    $input = '<img src="llama.jpg" data-align="center \'onclick=\'alert(foo);" />';
-    $expected = '<img src="llama.jpg" />';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-  }
-
-  /**
-   * Tests the caption filter.
-   */
-  function testCaptionFilter() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    $filter = $this->filters['filter_caption'];
-
-    $test = function($input) use ($filter, $renderer) {
-      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter) {
-        return $filter->process($input, 'und');
-      });
-    };
-
-    $attached_library = array(
-      'library' => array(
-        'filter/caption',
-      ),
-    );
-
-    // No data-caption attribute.
-    $input = '<img src="llama.jpg" />';
-    $expected = $input;
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // Data-caption attribute.
-    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Empty data-caption attribute.
-    $input = '<img src="llama.jpg" data-caption="" />';
-    $expected = '<img src="llama.jpg" />';
-    $this->assertIdentical($expected, $test($input)->getProcessedText());
-
-    // HTML entities in the caption.
-    $input = '<img src="llama.jpg" data-caption="&ldquo;Loquacious llama!&rdquo;" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>“Loquacious llama!”</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // HTML encoded as HTML entities in data-caption attribute.
-    $input = '<img src="llama.jpg" data-caption="&lt;em&gt;Loquacious llama!&lt;/em&gt;" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption><em>Loquacious llama!</em></figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // HTML (not encoded as HTML entities) in data-caption attribute, which is
-    // not allowed by the HTML spec, but may happen when people manually write
-    // HTML, so we explicitly support it.
-    $input = '<img src="llama.jpg" data-caption="<em>Loquacious llama!</em>" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption><em>Loquacious llama!</em></figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Security test: attempt an XSS.
-    $input = '<img src="llama.jpg" data-caption="<script>alert(\'Loquacious llama!\')</script>" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>alert(\'Loquacious llama!\')</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Ensure the filter also works with uncommon yet valid attribute quoting.
-    $input = '<img src=llama.jpg data-caption=\'Loquacious llama!\' />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Finally, ensure that this also works on any other tag.
-    $input = '<video src="llama.jpg" data-caption="Loquacious llama!" />';
-    $expected = '<figure role="group"><video src="llama.jpg"></video><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-    $input = '<foobar data-caption="Loquacious llama!">baz</foobar>';
-    $expected = '<figure role="group"><foobar>baz</foobar><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Ensure the caption filter works for linked images.
-    $input = '<a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" data-caption="Loquacious llama!" /></a>';
-    $expected = '<figure role="group"><a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" /></a>' . "\n" . '<figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // So far we've tested that the caption filter works correctly. But we also
-    // want to make sure that it works well in tandem with the "Limit allowed
-    // HTML tags" filter, which it is typically used with.
-    $html_filter = $this->filters['filter_html'];
-    $html_filter->setConfiguration(array(
-      'settings' => array(
-        'allowed_html' => '<img src data-align data-caption>',
-        'filter_html_help' => 1,
-        'filter_html_nofollow' => 0,
-      )
-    ));
-    $test_with_html_filter = function ($input) use ($filter, $html_filter, $renderer) {
-      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter, $html_filter) {
-        // 1. Apply HTML filter's processing step.
-        $output = $html_filter->process($input, 'und');
-        // 2. Apply caption filter's processing step.
-        $output = $filter->process($output, 'und');
-        return $output->getProcessedText();
-      });
-    };
-    // Editor XSS filter.
-    $test_editor_xss_filter = function ($input) {
-      $dummy_filter_format = FilterFormat::create();
-      return Standard::filterXss($input, $dummy_filter_format);
-    };
-
-    // All the tricky cases encountered at https://www.drupal.org/node/2105841.
-    // A plain URL preceded by text.
-    $input = '<img data-caption="See https://www.drupal.org" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>See https://www.drupal.org</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // An anchor.
-    $input = '<img data-caption="This is a &lt;a href=&quot;https://www.drupal.org&quot;&gt;quick&lt;/a&gt; test…" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>This is a <a href="https://www.drupal.org">quick</a> test…</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // A plain URL surrounded by parentheses.
-    $input = '<img data-caption="(https://www.drupal.org)" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>(https://www.drupal.org)</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // A source being credited.
-    $input = '<img data-caption="Source: Wikipedia" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Source: Wikipedia</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // A source being credited, without a space after the colon.
-    $input = '<img data-caption="Source:Wikipedia" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Source:Wikipedia</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // A pretty crazy edge case where we have two colons.
-    $input = '<img data-caption="Interesting (Scope resolution operator ::)" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Interesting (Scope resolution operator ::)</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $this->assertIdentical($input, $test_editor_xss_filter($input));
-
-    // An evil anchor (to ensure XSS filtering is applied to the caption also).
-    $input = '<img data-caption="This is an &lt;a href=&quot;javascript:alert();&quot;&gt;evil&lt;/a&gt; test…" src="llama.jpg" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>This is an <a href="alert();">evil</a> test…</figcaption></figure>';
-    $this->assertIdentical($expected, $test_with_html_filter($input));
-    $expected_xss_filtered = '<img data-caption="This is an &lt;a href=&quot;alert();&quot;&gt;evil&lt;/a&gt; test…" src="llama.jpg" />';
-    $this->assertIdentical($expected_xss_filtered, $test_editor_xss_filter($input));
-  }
-
-  /**
-   * Tests the combination of the align and caption filters.
-   */
-  function testAlignAndCaptionFilters() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    $align_filter = $this->filters['filter_align'];
-    $caption_filter = $this->filters['filter_caption'];
-
-    $test = function($input) use ($align_filter, $caption_filter, $renderer) {
-      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $align_filter, $caption_filter) {
-        return $caption_filter->process($align_filter->process($input, 'und'), 'und');
-      });
-    };
-
-    $attached_library = array(
-      'library' => array(
-        'filter/caption',
-      ),
-    );
-
-    // Both data-caption and data-align attributes: all 3 allowed values for the
-    // data-align attribute.
-    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="left" />';
-    $expected = '<figure role="group" class="align-left"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="center" />';
-    $expected = '<figure role="group" class="align-center"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="right" />';
-    $expected = '<figure role="group" class="align-right"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Both data-caption and data-align attributes, but a disallowed data-align
-    // attribute value.
-    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="left foobar" />';
-    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-
-    // Ensure both filters together work for linked images.
-    $input = '<a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" data-caption="Loquacious llama!" data-align="center" /></a>';
-    $expected = '<figure role="group" class="align-center"><a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" /></a>' . "\n" . '<figcaption>Loquacious llama!</figcaption></figure>';
-    $output = $test($input);
-    $this->assertIdentical($expected, $output->getProcessedText());
-    $this->assertIdentical($attached_library, $output->getAttachments());
-  }
-
-  /**
-   * Tests the line break filter.
-   */
-  function testLineBreakFilter() {
-    // Get FilterAutoP object.
-    $filter = $this->filters['filter_autop'];
-
-    // Since the line break filter naturally needs plenty of newlines in test
-    // strings and expectations, we're using "\n" instead of regular newlines
-    // here.
-    $tests = array(
-      // Single line breaks should be changed to <br /> tags, while paragraphs
-      // separated with double line breaks should be enclosed with <p></p> tags.
-      "aaa\nbbb\n\nccc" => array(
-        "<p>aaa<br />\nbbb</p>\n<p>ccc</p>" => TRUE,
-      ),
-      // Skip contents of certain block tags entirely.
-      "<script>aaa\nbbb\n\nccc</script>
-<style>aaa\nbbb\n\nccc</style>
-<pre>aaa\nbbb\n\nccc</pre>
-<object>aaa\nbbb\n\nccc</object>
-<iframe>aaa\nbbb\n\nccc</iframe>
-" => array(
-        "<script>aaa\nbbb\n\nccc</script>" => TRUE,
-        "<style>aaa\nbbb\n\nccc</style>" => TRUE,
-        "<pre>aaa\nbbb\n\nccc</pre>" => TRUE,
-        "<object>aaa\nbbb\n\nccc</object>" => TRUE,
-        "<iframe>aaa\nbbb\n\nccc</iframe>" => TRUE,
-      ),
-      // Skip comments entirely.
-      "One. <!-- comment --> Two.\n<!--\nThree.\n-->\n" => array(
-        '<!-- comment -->' => TRUE,
-        "<!--\nThree.\n-->" => TRUE,
-      ),
-      // Resulting HTML should produce matching paragraph tags.
-      '<p><div>  </div></p>' => array(
-        "<p>\n<div>  </div>\n</p>" => TRUE,
-      ),
-      '<div><p>  </p></div>' => array(
-        "<div>\n</div>" => TRUE,
-      ),
-      '<blockquote><pre>aaa</pre></blockquote>' => array(
-        "<blockquote><pre>aaa</pre></blockquote>" => TRUE,
-      ),
-      "<pre>aaa\nbbb\nccc</pre>\nddd\neee" => array(
-        "<pre>aaa\nbbb\nccc</pre>" => TRUE,
-        "<p>ddd<br />\neee</p>" => TRUE,
-      ),
-      // Comments remain unchanged and subsequent lines/paragraphs are
-      // transformed normally.
-      "aaa<!--comment-->\n\nbbb\n\nccc\n\nddd<!--comment\nwith linebreak-->\n\neee\n\nfff" => array(
-        "<p>aaa</p>\n<!--comment--><p>\nbbb</p>\n<p>ccc</p>\n<p>ddd</p>" => TRUE,
-        "<!--comment\nwith linebreak--><p>\neee</p>\n<p>fff</p>" => TRUE,
-      ),
-      // Check that a comment in a PRE will result that the text after
-      // the comment, but still in PRE, is not transformed.
-      "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>\nddd" => array(
-        "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>" => TRUE,
-      ),
-      // Bug 810824, paragraphs were appearing around iframe tags.
-      "<iframe>aaa</iframe>\n\n" => array(
-        "<p><iframe>aaa</iframe></p>" => FALSE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-
-    // Very long string hitting PCRE limits.
-    $limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit'));
-    $source = $this->randomMachineName($limit);
-    $result = _filter_autop($source);
-    $success = $this->assertEqual($result, '<p>' . $source . "</p>\n", 'Line break filter can process very long strings.');
-    if (!$success) {
-      $this->verbose("\n" . $source . "\n<hr />\n" . $result);
-    }
-  }
-
-
-  /**
-   * Tests filter settings, defaults, access restrictions and similar.
-   *
-   * @todo This is for functions like filter_filter and check_markup, whose
-   *   functionality is not completely focused on filtering. Some ideas:
-   *   restricting formats according to user permissions, proper cache
-   *   handling, defaults -- allowed tags/attributes/protocols.
-   *
-   * @todo It is possible to add script, iframe etc. to allowed tags, but this
-   *   makes HTML filter completely ineffective.
-   *
-   * @todo Class, id, name and xmlns should be added to disallowed attributes,
-   *   or better a whitelist approach should be used for that too.
-   */
-  function testHtmlFilter() {
-    // Get FilterHtml object.
-    $filter = $this->filters['filter_html'];
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'allowed_html' => '<a> <p> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
-        'filter_html_help' => 1,
-        'filter_html_nofollow' => 0,
-      )
-    ));
-
-    // HTML filter is not able to secure some tags, these should never be
-    // allowed.
-    $f = (string) $filter->process('<script />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove script tags.');
-
-    $f = (string) $filter->process('<iframe />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove iframe tags.');
-
-    $f = (string) $filter->process('<object />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove object tags.');
-
-    $f = (string) $filter->process('<style />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove style tags.');
-
-    // Some tags make CSRF attacks easier, let the user take the risk herself.
-    $f = (string) $filter->process('<img />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove img tags by default.');
-
-    $f = (string) $filter->process('<input />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '', 'HTML filter should remove input tags by default.');
-
-    // Filtering content of some attributes is infeasible, these shouldn't be
-    // allowed too.
-    $f = (string) $filter->process('<p style="display: none;" />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNoNormalized($f, 'style', 'HTML filter should remove style attributes.');
-    $this->assertIdentical($f, '<p></p>');
-
-    $f = (string) $filter->process('<p onerror="alert(0);"></p>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove on* attributes.');
-    $this->assertIdentical($f, '<p></p>');
-
-    $f = (string) $filter->process('<code onerror>&nbsp;</code>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove empty on* attributes.');
-    // Note - this string has a decoded &nbsp; character.
-    $this->assertIdentical($f, '<code> </code>');
-
-    $f = (string) $filter->process('<br>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, '<br />', 'HTML filter should allow line breaks.');
-
-    $f = (string) $filter->process('<br />', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, '<br />', 'HTML filter should allow self-closing line breaks.');
-
-    // All attributes of whitelisted tags are stripped by default.
-    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, '<a>link</a>', 'HTML filter should remove attributes that are not explicitly allowed.');
-
-    // Now whitelist the "llama" attribute on <a>.
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'allowed_html' => '<a href llama> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
-        'filter_html_help' => 1,
-        'filter_html_nofollow' => 0,
-      )
-    ));
-    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, '<a llama="awesome">link</a>', 'HTML filter keeps explicitly allowed attributes, and removes attributes that are not explicitly allowed.');
-
-    // Restrict the whitelisted "llama" attribute on <a> to only allow the value
-    // "majestical", or "epic".
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'allowed_html' => '<a href llama="majestical epic"> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
-        'filter_html_help' => 1,
-        'filter_html_nofollow' => 0,
-      )
-    ));
-    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '<a>link</a>', 'HTML filter removes allowed attributes that do not have an explicitly allowed value.');
-    $f = (string) $filter->process('<a kitten="cute" llama="majestical">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '<a llama="majestical">link</a>', 'HTML filter keeps explicitly allowed attributes with an attribute value that is also explicitly allowed.');
-    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, '<a>link</a>', 'HTML filter removes allowed attributes that have a not explicitly allowed value.');
-    $f = (string) $filter->process('<a href="/beautiful-animals" kitten="cute" llama="epic majestical">link</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertIdentical($f, '<a href="/beautiful-animals" llama="epic majestical">link</a>', 'HTML filter keeps explicitly allowed attributes with an attribute value that is also explicitly allowed.');
-  }
-
-  /**
-   * Tests the spam deterrent.
-   */
-  function testNoFollowFilter() {
-    // Get FilterHtml object.
-    $filter = $this->filters['filter_html'];
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'allowed_html' => '<a href>',
-        'filter_html_help' => 1,
-        'filter_html_nofollow' => 1,
-      )
-    ));
-
-    // Test if the rel="nofollow" attribute is added, even if we try to prevent
-    // it.
-    $f = (string) $filter->process('<a href="http://www.example.com/">text</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent -- no evasion.');
-
-    $f = (string) $filter->process('<A href="http://www.example.com/">text</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- capital A.');
-
-    $f = (string) $filter->process("<a/href=\"http://www.example.com/\">text</a>", Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- non whitespace character after tag name.');
-
-    $f = (string) $filter->process("<\0a\0 href=\"http://www.example.com/\">text</a>", Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- some nulls.');
-
-    $f = (string) $filter->process('<a href="http://www.example.com/" rel="follow">text</a>', Language::LANGCODE_NOT_SPECIFIED);
-    $this->assertNoNormalized($f, 'rel="follow"', 'Spam deterrent evasion -- with rel set - rel="follow" removed.');
-    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- with rel set - rel="nofollow" added.');
-  }
-
-  /**
-   * Tests the HTML escaping filter.
-   */
-  function testHtmlEscapeFilter() {
-    // Get FilterHtmlEscape object.
-    $filter = $this->filters['filter_html_escape'];
-
-    $tests = array(
-      "   One. <!-- \"comment\" --> Two'.\n<p>Three.</p>\n    " => array(
-        "One. &lt;!-- &quot;comment&quot; --&gt; Two&#039;.\n&lt;p&gt;Three.&lt;/p&gt;" => TRUE,
-        '   One.' => FALSE,
-        "</p>\n    " => FALSE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-  }
-
-  /**
-   * Tests the URL filter.
-   */
-  function testUrlFilter() {
-    // Get FilterUrl object.
-    $filter = $this->filters['filter_url'];
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'filter_url_length' => 496,
-      )
-    ));
-
-    // @todo Possible categories:
-    // - absolute, mail, partial
-    // - characters/encoding, surrounding markup, security
-
-    // Create a email that is too long.
-    $long_email = str_repeat('a', 254) . '@example.com';
-    $too_long_email = str_repeat('b', 255) . '@example.com';
-    $email_with_plus_sign = 'one+two@example.com';
-
-    // Filter selection/pattern matching.
-    $tests = array(
-      // HTTP URLs.
-      '
-http://example.com or www.example.com
-' => array(
-        '<a href="http://example.com">http://example.com</a>' => TRUE,
-        '<a href="http://www.example.com">www.example.com</a>' => TRUE,
-      ),
-      // MAILTO URLs.
-      '
-person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
-' => array(
-        '<a href="mailto:person@example.com">person@example.com</a>' => TRUE,
-        '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE,
-        '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE,
-        '<a href="mailto:' . $too_long_email . '">' . $too_long_email . '</a>' => FALSE,
-        '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE,
-      ),
-      // URI parts and special characters.
-      '
-http://trailingslash.com/ or www.trailingslash.com/
-http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment
-http://twitter.com/#!/example/status/22376963142324226
-http://example.com/@user/
-ftp://user:pass@ftp.example.com/~home/dir1
-sftp://user@nonstandardport:222/dir
-ssh://192.168.0.100/srv/git/drupal.git
-' => array(
-        '<a href="http://trailingslash.com/">http://trailingslash.com/</a>' => TRUE,
-        '<a href="http://www.trailingslash.com/">www.trailingslash.com/</a>' => TRUE,
-        '<a href="http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
-        '<a href="http://www.host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">www.host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
-        '<a href="http://twitter.com/#!/example/status/22376963142324226">http://twitter.com/#!/example/status/22376963142324226</a>' => TRUE,
-        '<a href="http://example.com/@user/">http://example.com/@user/</a>' => TRUE,
-        '<a href="ftp://user:pass@ftp.example.com/~home/dir1">ftp://user:pass@ftp.example.com/~home/dir1</a>' => TRUE,
-        '<a href="sftp://user@nonstandardport:222/dir">sftp://user@nonstandardport:222/dir</a>' => TRUE,
-        '<a href="ssh://192.168.0.100/srv/git/drupal.git">ssh://192.168.0.100/srv/git/drupal.git</a>' => TRUE,
-      ),
-      // International Unicode characters.
-      '
-http://пример.испытание/
-http://مثال.إختبار/
-http://例子.測試/
-http://12345.中国/
-http://例え.テスト/
-http://dréißig-bücher.de/
-http://méxico-mañana.es/
-' => array(
-        '<a href="http://пример.испытание/">http://пример.испытание/</a>' => TRUE,
-        '<a href="http://مثال.إختبار/">http://مثال.إختبار/</a>' => TRUE,
-        '<a href="http://例子.測試/">http://例子.測試/</a>' => TRUE,
-        '<a href="http://12345.中国/">http://12345.中国/</a>' => TRUE,
-        '<a href="http://例え.テスト/">http://例え.テスト/</a>' => TRUE,
-        '<a href="http://dréißig-bücher.de/">http://dréißig-bücher.de/</a>' => TRUE,
-        '<a href="http://méxico-mañana.es/">http://méxico-mañana.es/</a>' => TRUE,
-      ),
-      // Encoding.
-      '
-http://ampersand.com/?a=1&b=2
-http://encoded.com/?a=1&amp;b=2
-' => array(
-        '<a href="http://ampersand.com/?a=1&amp;b=2">http://ampersand.com/?a=1&amp;b=2</a>' => TRUE,
-        '<a href="http://encoded.com/?a=1&amp;b=2">http://encoded.com/?a=1&amp;b=2</a>' => TRUE,
-      ),
-      // Domain name length.
-      '
-www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or
-me@me.tv
-' => array(
-        '<a href="http://www.ex.ex">www.ex.ex</a>' => TRUE,
-        '<a href="http://www.example.example">www.example.example</a>' => TRUE,
-        'http://www.toolong' => FALSE,
-        '<a href="mailto:me@me.tv">me@me.tv</a>' => TRUE,
-      ),
-      // Absolute URL protocols.
-      // The list to test is found in the beginning of _filter_url() at
-      // $protocols = \Drupal::getContainer()->getParameter('filter_protocols').
-      '
-https://example.com,
-ftp://ftp.example.com,
-news://example.net,
-telnet://example,
-irc://example.host,
-ssh://odd.geek,
-sftp://secure.host?,
-webcal://calendar,
-rtsp://127.0.0.1,
-not foo://disallowed.com.
-' => array(
-        'href="https://example.com"' => TRUE,
-        'href="ftp://ftp.example.com"' => TRUE,
-        'href="news://example.net"' => TRUE,
-        'href="telnet://example"' => TRUE,
-        'href="irc://example.host"' => TRUE,
-        'href="ssh://odd.geek"' => TRUE,
-        'href="sftp://secure.host"' => TRUE,
-        'href="webcal://calendar"' => TRUE,
-        'href="rtsp://127.0.0.1"' => TRUE,
-        'href="foo://disallowed.com"' => FALSE,
-        'not foo://disallowed.com.' => TRUE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-
-    // Surrounding text/punctuation.
-    $tests = array(
-      '
-Partial URL with trailing period www.partial.com.
-Email with trailing comma person@example.com,
-Absolute URL with trailing question http://www.absolute.com?
-Query string with trailing exclamation www.query.com/index.php?a=!
-Partial URL with 3 trailing www.partial.periods...
-Email with 3 trailing exclamations@example.com!!!
-Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc).
-Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)).
-Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1]
-Absolute URL with quotes "https://www.drupal.org/sample"
-
-' => array(
-        'period <a href="http://www.partial.com">www.partial.com</a>.' => TRUE,
-        'comma <a href="mailto:person@example.com">person@example.com</a>,' => TRUE,
-        'question <a href="http://www.absolute.com">http://www.absolute.com</a>?' => TRUE,
-        'exclamation <a href="http://www.query.com/index.php?a=">www.query.com/index.php?a=</a>!' => TRUE,
-        'trailing <a href="http://www.partial.periods">www.partial.periods</a>...' => TRUE,
-        'trailing <a href="mailto:exclamations@example.com">exclamations@example.com</a>!!!' => TRUE,
-        'characters (<a href="http://www.example.com/q=abc">http://www.example.com/q=abc</a>).' => TRUE,
-        'brackets (<a href="http://www.foo.com/more_(than)_one_(parens)">www.foo.com/more_(than)_one_(parens)</a>).' => TRUE,
-        'brackets [<a href="https://www.drupal.org/?class[]=1">https://www.drupal.org/?class[]=1</a>]' => TRUE,
-        'quotes "<a href="https://www.drupal.org/sample">https://www.drupal.org/sample</a>"' => TRUE,
-      ),
-      '
-(www.parenthesis.com/dir?a=1&b=2#a)
-' => array(
-        '(<a href="http://www.parenthesis.com/dir?a=1&amp;b=2#a">www.parenthesis.com/dir?a=1&amp;b=2#a</a>)' => TRUE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-
-    // Surrounding markup.
-    $tests = array(
-      '
-<p xmlns="www.namespace.com" />
-<p xmlns="http://namespace.com">
-An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.
-</p>
-' => array(
-        '<p xmlns="www.namespace.com" />' => TRUE,
-        '<p xmlns="http://namespace.com">' => TRUE,
-        'href="http://www.namespace.com"' => FALSE,
-        'href="http://namespace.com"' => FALSE,
-        'An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.' => TRUE,
-      ),
-      '
-Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a>
-but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>
-' => array(
-        '<a href="foo">www.relative.com</a>' => TRUE,
-        'href="http://www.relative.com"' => FALSE,
-        '<a href="http://absolute.com">www.absolute.com</a>' => TRUE,
-        '<strong><a href="http://www.strong.net">http://www.strong.net</a></strong>' => TRUE,
-        '<em><a href="http://www.emphasis.info">www.emphasis.info</a></em>' => TRUE,
-      ),
-      '
-Test <code>using www.example.com the code tag</code>.
-' => array(
-        'href' => FALSE,
-        'http' => FALSE,
-      ),
-      '
-Intro.
-<blockquote>
-Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>.
-</blockquote>
-
-Outro.
-' => array(
-        'href="http://www.example.com"' => TRUE,
-        'href="mailto:person@example.com"' => TRUE,
-        'href="http://origin.example.com"' => TRUE,
-        'http://www.usage.example.com' => FALSE,
-        'http://www.example.info' => FALSE,
-        'Intro.' => TRUE,
-        'Outro.' => TRUE,
-      ),
-      '
-Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh>
-' => array(
-        'href="http://www.example.com"' => TRUE,
-        'href="http://www.example.pooh"' => TRUE,
-      ),
-      '
-<p>Test &lt;br/&gt;: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/>
- It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br>
-HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
-' => array(
-        'href="http://www.example17.com"' => TRUE,
-        'href="http://www.example18.com"' => TRUE,
-        'href="http://www.example19.com"' => TRUE,
-        'href="http://www.example20.com"' => TRUE,
-        'href="http://www.example21.com"' => TRUE,
-        'href="mailto:person@example22.com"' => TRUE,
-        'href="http://www.example23.com"' => TRUE,
-        'href="http://www.example24.com"' => TRUE,
-        'href="http://www.example25.com"' => TRUE,
-        'href="http://www.example26.com"' => TRUE,
-        'href="mailto:person@example27.com"' => TRUE,
-        'href="http://www.example28.com"' => TRUE,
-      ),
-      '
-<script>
-<!--
-  // @see www.example.com
-  var exampleurl = "http://example.net";
--->
-<!--//--><![CDATA[//><!--
-  // @see www.example.com
-  var exampleurl = "http://example.net";
-//--><!]]>
-</script>
-' => array(
-        'href="http://www.example.com"' => FALSE,
-        'href="http://example.net"' => FALSE,
-      ),
-      '
-<style>body {
-  background: url(http://example.com/pixel.gif);
-}</style>
-' => array(
-        'href' => FALSE,
-      ),
-      '
-<!-- Skip any URLs like www.example.com in comments -->
-' => array(
-        'href' => FALSE,
-      ),
-      '
-<!-- Skip any URLs like
-www.example.com with a newline in comments -->
-' => array(
-        'href' => FALSE,
-      ),
-      '
-<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->
-' => array(
-        'href' => FALSE,
-      ),
-      '
-<dl>
-<dt>www.example.com</dt>
-<dd>http://example.com</dd>
-<dd>person@example.com</dd>
-<dt>Check www.example.net</dt>
-<dd>Some text around http://www.example.info by person@example.info?</dd>
-</dl>
-' => array(
-        'href="http://www.example.com"' => TRUE,
-        'href="http://example.com"' => TRUE,
-        'href="mailto:person@example.com"' => TRUE,
-        'href="http://www.example.net"' => TRUE,
-        'href="http://www.example.info"' => TRUE,
-        'href="mailto:person@example.info"' => TRUE,
-      ),
-      '
-<div>www.div.com</div>
-<ul>
-<li>http://listitem.com</li>
-<li class="odd">www.class.listitem.com</li>
-</ul>
-' => array(
-        '<div><a href="http://www.div.com">www.div.com</a></div>' => TRUE,
-        '<li><a href="http://listitem.com">http://listitem.com</a></li>' => TRUE,
-        '<li class="odd"><a href="http://www.class.listitem.com">www.class.listitem.com</a></li>' => TRUE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-
-    // URL trimming.
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'filter_url_length' => 20,
-      )
-    ));
-    $tests = array(
-      'www.trimmed.com/d/ff.ext?a=1&b=2#a1' => array(
-        '<a href="http://www.trimmed.com/d/ff.ext?a=1&amp;b=2#a1">www.trimmed.com/d/f…</a>' => TRUE,
-      ),
-    );
-    $this->assertFilteredString($filter, $tests);
-  }
-
-  /**
-   * Asserts multiple filter output expectations for multiple input strings.
-   *
-   * @param FilterInterface $filter
-   *   A input filter object.
-   * @param array $tests
-   *   An associative array, whereas each key is an arbitrary input string and
-   *   each value is again an associative array whose keys are filter output
-   *   strings and whose values are Booleans indicating whether the output is
-   *   expected or not.
-   *
-   * For example:
-   * @code
-   * $tests = array(
-   *   'Input string' => array(
-   *     '<p>Input string</p>' => TRUE,
-   *     'Input string<br' => FALSE,
-   *   ),
-   * );
-   * @endcode
-   */
-  function assertFilteredString($filter, $tests) {
-    foreach ($tests as $source => $tasks) {
-      $result = $filter->process($source, $filter)->getProcessedText();
-      foreach ($tasks as $value => $is_expected) {
-        // Not using assertIdentical, since combination with strpos() is hard to grok.
-        if ($is_expected) {
-          $success = $this->assertTrue(strpos($result, $value) !== FALSE, format_string('@source: @value found. Filtered result: @result.', array(
-            '@source' => var_export($source, TRUE),
-            '@value' => var_export($value, TRUE),
-            '@result' => var_export($result, TRUE),
-          )));
-        }
-        else {
-          $success = $this->assertTrue(strpos($result, $value) === FALSE, format_string('@source: @value not found. Filtered result: @result.', array(
-            '@source' => var_export($source, TRUE),
-            '@value' => var_export($value, TRUE),
-            '@result' => var_export($result, TRUE),
-          )));
-        }
-        if (!$success) {
-          $this->verbose('Source:<pre>' . Html::escape(var_export($source, TRUE)) . '</pre>'
-            . '<hr />' . 'Result:<pre>' . Html::escape(var_export($result, TRUE)) . '</pre>'
-            . '<hr />' . ($is_expected ? 'Expected:' : 'Not expected:')
-            . '<pre>' . Html::escape(var_export($value, TRUE)) . '</pre>'
-          );
-        }
-      }
-    }
-  }
-
-  /**
-   * Tests URL filter on longer content.
-   *
-   * Filters based on regular expressions should also be tested with a more
-   * complex content than just isolated test lines.
-   * The most common errors are:
-   * - accidental '*' (greedy) match instead of '*?' (minimal) match.
-   * - only matching first occurrence instead of all.
-   * - newlines not matching '.*'.
-   *
-   * This test covers:
-   * - Document with multiple newlines and paragraphs (two newlines).
-   * - Mix of several HTML tags, invalid non-HTML tags, tags to ignore and HTML
-   *   comments.
-   * - Empty HTML tags (BR, IMG).
-   * - Mix of absolute and partial URLs, and email addresses in one content.
-   */
-  function testUrlFilterContent() {
-    // Get FilterUrl object.
-    $filter = $this->filters['filter_url'];
-    $filter->setConfiguration(array(
-      'settings' => array(
-        'filter_url_length' => 496,
-      )
-    ));
-    $path = drupal_get_path('module', 'filter') . '/tests';
-
-    $input = file_get_contents($path . '/filter.url-input.txt');
-    $expected = file_get_contents($path . '/filter.url-output.txt');
-    $result = _filter_url($input, $filter);
-    $this->assertIdentical($result, $expected, 'Complex HTML document was correctly processed.');
-  }
-
-  /**
-   * Tests the HTML corrector filter.
-   *
-   * @todo This test could really use some validity checking function.
-   */
-  function testHtmlCorrectorFilter() {
-    // Tag closing.
-    $f = Html::normalize('<p>text');
-    $this->assertEqual($f, '<p>text</p>', 'HTML corrector -- tag closing at the end of input.');
-
-    $f = Html::normalize('<p>text<p><p>text');
-    $this->assertEqual($f, '<p>text</p><p></p><p>text</p>', 'HTML corrector -- tag closing.');
-
-    $f = Html::normalize("<ul><li>e1<li>e2");
-    $this->assertEqual($f, "<ul><li>e1</li><li>e2</li></ul>", 'HTML corrector -- unclosed list tags.');
-
-    $f = Html::normalize('<div id="d">content');
-    $this->assertEqual($f, '<div id="d">content</div>', 'HTML corrector -- unclosed tag with attribute.');
-
-    // XHTML slash for empty elements.
-    $f = Html::normalize('<hr><br>');
-    $this->assertEqual($f, '<hr /><br />', 'HTML corrector -- XHTML closing slash.');
-
-    $f = Html::normalize('<P>test</P>');
-    $this->assertEqual($f, '<p>test</p>', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
-
-    $f = Html::normalize('<P>test</p>');
-    $this->assertEqual($f, '<p>test</p>', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
-
-    $f = Html::normalize('test<hr />');
-    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through.');
-
-    $f = Html::normalize('test<hr/>');
-    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through, but ensure there is a single space before the closing slash.');
-
-    $f = Html::normalize('test<hr    />');
-    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through, but ensure there are not too many spaces before the closing slash.');
-
-    $f = Html::normalize('<span class="test" />');
-    $this->assertEqual($f, '<span class="test"></span>', 'HTML corrector -- Convert XHTML that is properly formed but that would not be compatible with typical HTML user agents.');
-
-    $f = Html::normalize('test1<br class="test">test2');
-    $this->assertEqual($f, 'test1<br class="test" />test2', 'HTML corrector -- Automatically close single tags.');
-
-    $f = Html::normalize('line1<hr>line2');
-    $this->assertEqual($f, 'line1<hr />line2', 'HTML corrector -- Automatically close single tags.');
-
-    $f = Html::normalize('line1<HR>line2');
-    $this->assertEqual($f, 'line1<hr />line2', 'HTML corrector -- Automatically close single tags.');
-
-    $f = Html::normalize('<img src="http://example.com/test.jpg">test</img>');
-    $this->assertEqual($f, '<img src="http://example.com/test.jpg" />test', 'HTML corrector -- Automatically close single tags.');
-
-    $f = Html::normalize('<br></br>');
-    $this->assertEqual($f, '<br />', "HTML corrector -- Transform empty tags to a single closed tag if the tag's content model is EMPTY.");
-
-    $f = Html::normalize('<div></div>');
-    $this->assertEqual($f, '<div></div>', "HTML corrector -- Do not transform empty tags to a single closed tag if the tag's content model is not EMPTY.");
-
-    $f = Html::normalize('<p>line1<br/><hr/>line2</p>');
-    $this->assertEqual($f, '<p>line1<br /></p><hr />line2', 'HTML corrector -- Move non-inline elements outside of inline containers.');
-
-    $f = Html::normalize('<p>line1<div>line2</div></p>');
-    $this->assertEqual($f, '<p>line1</p><div>line2</div>', 'HTML corrector -- Move non-inline elements outside of inline containers.');
-
-    $f = Html::normalize('<p>test<p>test</p>\n');
-    $this->assertEqual($f, '<p>test</p><p>test</p>\n', 'HTML corrector -- Auto-close improperly nested tags.');
-
-    $f = Html::normalize('<p>Line1<br><STRONG>bold stuff</b>');
-    $this->assertEqual($f, '<p>Line1<br /><strong>bold stuff</strong></p>', 'HTML corrector -- Properly close unclosed tags, and remove useless closing tags.');
-
-    $f = Html::normalize('test <!-- this is a comment -->');
-    $this->assertEqual($f, 'test <!-- this is a comment -->', 'HTML corrector -- Do not touch HTML comments.');
-
-    $f = Html::normalize('test <!--this is a comment-->');
-    $this->assertEqual($f, 'test <!--this is a comment-->', 'HTML corrector -- Do not touch HTML comments.');
-
-    $f = Html::normalize('test <!-- comment <p>another
-    <strong>multiple</strong> line
-    comment</p> -->');
-    $this->assertEqual($f, 'test <!-- comment <p>another
-    <strong>multiple</strong> line
-    comment</p> -->', 'HTML corrector -- Do not touch HTML comments.');
-
-    $f = Html::normalize('test <!-- comment <p>another comment</p> -->');
-    $this->assertEqual($f, 'test <!-- comment <p>another comment</p> -->', 'HTML corrector -- Do not touch HTML comments.');
-
-    $f = Html::normalize('test <!--break-->');
-    $this->assertEqual($f, 'test <!--break-->', 'HTML corrector -- Do not touch HTML comments.');
-
-    $f = Html::normalize('<p>test\n</p>\n');
-    $this->assertEqual($f, '<p>test\n</p>\n', 'HTML corrector -- New-lines are accepted and kept as-is.');
-
-    $f = Html::normalize('<p>دروبال');
-    $this->assertEqual($f, '<p>دروبال</p>', 'HTML corrector -- Encoding is correctly kept.');
-
-    $f = Html::normalize('<script>alert("test")</script>');
-    $this->assertEqual($f, '<script>
-<!--//--><![CDATA[// ><!--
-alert("test")
-//--><!]]>
-</script>', 'HTML corrector -- CDATA added to script element');
-
-    $f = Html::normalize('<p><script>alert("test")</script></p>');
-    $this->assertEqual($f, '<p><script>
-<!--//--><![CDATA[// ><!--
-alert("test")
-//--><!]]>
-</script></p>', 'HTML corrector -- CDATA added to a nested script element');
-
-    $f = Html::normalize('<p><style> /* Styling */ body {color:red}</style></p>');
-    $this->assertEqual($f, '<p><style>
-<!--/*--><![CDATA[/* ><!--*/
- /* Styling */ body {color:red}
-/*--><!]]>*/
-</style></p>', 'HTML corrector -- CDATA added to a style element.');
-
-    $filtered_data = Html::normalize('<p><style>
-/*<![CDATA[*/
-/* Styling */
-body {color:red}
-/*]]>*/
-</style></p>');
-    $this->assertEqual($filtered_data, '<p><style>
-<!--/*--><![CDATA[/* ><!--*/
-
-/*<![CDATA[*/
-/* Styling */
-body {color:red}
-/*]]]]><![CDATA[>*/
-
-/*--><!]]>*/
-</style></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '/*<![CDATA[*/'))
-    );
-
-    $filtered_data = Html::normalize('<p><style>
-  <!--/*--><![CDATA[/* ><!--*/
-  /* Styling */
-  body {color:red}
-  /*--><!]]>*/
-</style></p>');
-    $this->assertEqual($filtered_data, '<p><style>
-<!--/*--><![CDATA[/* ><!--*/
-
-  <!--/*--><![CDATA[/* ><!--*/
-  /* Styling */
-  body {color:red}
-  /*--><!]]]]><![CDATA[>*/
-
-/*--><!]]>*/
-</style></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--/*--><![CDATA[/* ><!--*/'))
-    );
-
-    $filtered_data = Html::normalize('<p><script>
-<!--//--><![CDATA[// ><!--
-  alert("test");
-//--><!]]>
-</script></p>');
-    $this->assertEqual($filtered_data, '<p><script>
-<!--//--><![CDATA[// ><!--
-
-<!--//--><![CDATA[// ><!--
-  alert("test");
-//--><!]]]]><![CDATA[>
-
-//--><!]]>
-</script></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--//--><![CDATA[// ><!--'))
-    );
-
-    $filtered_data = Html::normalize('<p><script>
-// <![CDATA[
-  alert("test");
-// ]]>
-</script></p>');
-    $this->assertEqual($filtered_data, '<p><script>
-<!--//--><![CDATA[// ><!--
-
-// <![CDATA[
-  alert("test");
-// ]]]]><![CDATA[>
-
-//--><!]]>
-</script></p>',
-      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '// <![CDATA['))
-    );
-
-  }
-
-  /**
-   * Asserts that a text transformed to lowercase with HTML entities decoded does contains a given string.
-   *
-   * Otherwise fails the test with a given message, similar to all the
-   * SimpleTest assert* functions.
-   *
-   * Note that this does not remove nulls, new lines and other characters that
-   * could be used to obscure a tag or an attribute name.
-   *
-   * @param string $haystack
-   *   Text to look in.
-   * @param string $needle
-   *   Lowercase, plain text to look for.
-   * @param string $message
-   *   (optional) Message to display if failed. Defaults to an empty string.
-   * @param string $group
-   *   (optional) The group this message belongs to. Defaults to 'Other'.
-   *
-   * @return bool
-   *   TRUE on pass, FALSE on fail.
-   */
-  function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
-    return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) !== FALSE, $message, $group);
-  }
-
-  /**
-   * Asserts that text transformed to lowercase with HTML entities decoded does not contain a given string.
-   *
-   * Otherwise fails the test with a given message, similar to all the
-   * SimpleTest assert* functions.
-   *
-   * Note that this does not remove nulls, new lines, and other character that
-   * could be used to obscure a tag or an attribute name.
-   *
-   * @param string $haystack
-   *   Text to look in.
-   * @param string $needle
-   *   Lowercase, plain text to look for.
-   * @param string $message
-   *   (optional) Message to display if failed. Defaults to an empty string.
-   * @param string $group
-   *   (optional) The group this message belongs to. Defaults to 'Other'.
-   *
-   * @return bool
-   *   TRUE on pass, FALSE on fail.
-   */
-  function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') {
-    return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) === FALSE, $message, $group);
-  }
-}
diff --git a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
deleted file mode 100644
index 2a3de4e..0000000
--- a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\Migrate\d6\MigrateFilterFormatTest.
- */
-
-namespace Drupal\filter\Tests\Migrate\d6;
-
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to filter.formats.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_filter_format');
-  }
-
-  /**
-   * Tests the Drupal 6 filter format to Drupal 8 migration.
-   */
-  public function testFilterFormat() {
-    $filter_format = FilterFormat::load('filtered_html');
-
-    // Check filter status.
-    $filters = $filter_format->get('filters');
-    $this->assertTrue($filters['filter_autop']['status']);
-    $this->assertTrue($filters['filter_url']['status']);
-    $this->assertTrue($filters['filter_htmlcorrector']['status']);
-    $this->assertTrue($filters['filter_html']['status']);
-
-    // These should be false by default.
-    $this->assertFalse(isset($filters['filter_html_escape']));
-    $this->assertFalse(isset($filters['filter_caption']));
-    $this->assertFalse(isset($filters['filter_html_image_secure']));
-
-    // Check variables migrated into filter.
-    $this->assertIdentical('<a href hreflang> <em> <strong> <cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd>', $filters['filter_html']['settings']['allowed_html']);
-    $this->assertIdentical(TRUE, $filters['filter_html']['settings']['filter_html_help']);
-    $this->assertIdentical(FALSE, $filters['filter_html']['settings']['filter_html_nofollow']);
-    $this->assertIdentical(72, $filters['filter_url']['settings']['filter_url_length']);
-
-    // Check that the PHP code filter is converted to filter_null.
-    $filters = FilterFormat::load('php_code')->get('filters');
-    $this->assertTrue(isset($filters['filter_null']));
-  }
-
-}
diff --git a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php
deleted file mode 100644
index b96b99a..0000000
--- a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\Migrate\d7\MigrateFilterFormatTest.
- */
-
-namespace Drupal\filter\Tests\Migrate\d7;
-
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\filter\FilterFormatInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Upgrade variables to filter.formats.*.yml.
- *
- * @group filter
- */
-class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  static $modules = array('filter');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_filter_format');
-  }
-
-  /**
-   * Asserts various aspects of a filter format entity.
-   *
-   * @param string $id
-   *   The format ID.
-   * @param string $label
-   *   The expected label of the format.
-   * @param array $enabled_filters
-   *   The expected filters in the format, keyed by ID.
-   */
-  protected function assertEntity($id, $label, array $enabled_filters) {
-    /** @var \Drupal\filter\FilterFormatInterface $entity */
-    $entity = FilterFormat::load($id);
-    $this->assertTrue($entity instanceof FilterFormatInterface);
-    $this->assertIdentical($label, $entity->label());
-    // get('filters') will return enabled filters only, not all of them.
-    $this->assertIdentical($enabled_filters, array_keys($entity->get('filters')));
-  }
-
-  /**
-   * Tests the Drupal 7 filter format to Drupal 8 migration.
-   */
-  public function testFilterFormat() {
-    $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop', 'filter_html']);
-    $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop', 'filter_html', 'filter_htmlcorrector', 'filter_url']);
-    $this->assertEntity('full_html', 'Full HTML', ['filter_autop', 'filter_htmlcorrector', 'filter_url']);
-    $this->assertEntity('plain_text', 'Plain text', ['filter_html_escape', 'filter_url', 'filter_autop']);
-    // This assertion covers issue #2555089. Drupal 7 formats are identified
-    // by machine names, so migrated formats should be merged into existing
-    // ones.
-    $this->assertNull(FilterFormat::load('plain_text1'));
-
-    // Ensure that filter-specific settings were migrated.
-    /** @var \Drupal\filter\FilterFormatInterface $format */
-    $format = FilterFormat::load('filtered_html');
-    $config = $format->filters('filter_html')->getConfiguration();
-    $this->assertIdentical('<div> <span> <ul type> <li> <ol start type> <a href hreflang> <img src alt height width>', $config['settings']['allowed_html']);
-    $config = $format->filters('filter_url')->getConfiguration();
-    $this->assertIdentical(128, $config['settings']['filter_url_length']);
-
-    // The php_code format gets migrated, but the php_code filter is changed to
-    // filter_null.
-    $filters = FilterFormat::load('php_code')->get('filters');
-    $this->assertTrue(isset($filters['filter_null']));
-  }
-
-}
diff --git a/core/modules/filter/src/Tests/TextFormatElementFormTest.php b/core/modules/filter/src/Tests/TextFormatElementFormTest.php
deleted file mode 100644
index b889c4a..0000000
--- a/core/modules/filter/src/Tests/TextFormatElementFormTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\filter\Tests\TextFormatElementFormTest.
- */
-
-namespace Drupal\filter\Tests;
-
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-
-/**
- * Tests PathElement validation and conversion functionality.
- *
- * @group Form
- */
-class TextFormatElementFormTest extends KernelTestBase implements FormInterface {
-
-  /**
-   * User for testing.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $testUser;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['system', 'user', 'filter', 'filter_test', 'editor'];
-
-  /**
-   * Sets up the test.
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-    $this->installSchema('system', ['sequences', 'router']);
-    $this->installConfig(['filter', 'filter_test']);
-    // Filter tips link to the full-page.
-    \Drupal::service('router.builder')->rebuild();
-    /* @var \Drupal\Core\Render\ElementInfoManager $manager */
-    $manager = \Drupal::service('plugin.manager.element_info');
-    $manager->clearCachedDefinitions();
-    $manager->getDefinitions();
-    /* @var \Drupal\filter\FilterFormatInterface $filter_test_format */
-    $filter_test_format = FilterFormat::load('filter_test');
-
-    /* @var \Drupal\user\RoleInterface $role */
-    $role = Role::create([
-      'id' => 'admin',
-      'label' => 'admin',
-    ]);
-    $role->grantPermission($filter_test_format->getPermissionName());
-    $role->save();
-    $this->testUser = User::create([
-      'name' => 'foobar',
-      'mail' => 'foobar@example.com',
-    ]);
-    $this->testUser->addRole($role->id());
-    $this->testUser->save();
-    \Drupal::service('current_user')->setAccount($this->testUser);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'test_text_area_element';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    // A textformat field.
-    $form['textformat'] = [
-      '#type' => 'text_format',
-      '#required' => TRUE,
-      '#title' => 'Text',
-      '#base_type' => 'textfield',
-      '#format' => NULL,
-      '#default_value' => 'test value',
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {}
-
-  /**
-   * Form validation handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {}
-
-  /**
-   * Tests that values are returned.
-   */
-  public function testTextFormatElement() {
-    /* @var \Drupal\Core\Form\FormBuilder $form_builder */
-    $form_builder = $this->container->get('form_builder');
-    $form = $form_builder->getForm($this);
-    $output = $this->render($form);
-    $this->setRawContent($output);
-    $this->assertFieldByName('textformat[value]');
-    $this->assertRaw('<h4>Full HTML</h4>');
-    $this->assertRaw('<h4>Filtered HTML</h4>');
-    $this->assertRaw('<h4>Test format</h4>');
-    $this->assertNoPattern('|<h4[^>]*></h4>|', 'No empty H4 element found.');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getUrl() {
-    // \Drupal\simpletest\AssertContentTrait needs this for ::assertFieldByName
-    // to work.
-    return 'Internal rendering';
-  }
-
-}
diff --git a/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php b/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
index 5edd607..338a531 100644
--- a/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
+++ b/core/modules/filter/tests/filter_test_plugin/src/Plugin/Filter/FilterSparkles.php
@@ -3,11 +3,6 @@
 /**
  * @file
  * Contains \Drupal\filter_test_plugin\Plugin\Filter\FilterSparkles.
- *
- * This filter does not do anything, but enabling of its module is done in a
- * test.
- *
- * @see \Drupal\filter\Tests\FilterFormTest::testFilterForm()
  */
 
 namespace Drupal\filter_test_plugin\Plugin\Filter;
@@ -18,6 +13,11 @@
 /**
  * Provides a filter to limit allowed HTML tags.
  *
+ * This filter does not do anything, but enabling of its module is done in a
+ * test.
+ *
+ * @see \Drupal\filter\Tests\FilterFormTest::testFilterForm()
+ *
  * @Filter(
  *   id = "filter_sparkles",
  *   title = @Translation("Sparkles filter"),
diff --git a/core/modules/filter/tests/src/Kernel/FilterAPITest.php b/core/modules/filter/tests/src/Kernel/FilterAPITest.php
new file mode 100644
index 0000000..1a8f709
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/FilterAPITest.php
@@ -0,0 +1,514 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\FilterAPITest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\Core\TypedData\OptionsProviderInterface;
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\filter\Plugin\DataType\FilterFormat as FilterFormatDataType;
+use Drupal\filter\Plugin\FilterInterface;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
+
+/**
+ * Tests the behavior of the API of the Filter module.
+ *
+ * @group filter
+ */
+class FilterAPITest extends EntityKernelTestBase {
+
+  public static $modules = array('system', 'filter', 'filter_test', 'user');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(array('system', 'filter', 'filter_test'));
+  }
+
+  /**
+   * Tests that the filter order is respected.
+   */
+  function testCheckMarkupFilterOrder() {
+    // Create crazy HTML format.
+    $crazy_format = FilterFormat::create(array(
+      'format' => 'crazy',
+      'name' => 'Crazy',
+      'weight' => 1,
+      'filters' => array(
+        'filter_html_escape' => array(
+          'weight' => 10,
+          'status' => 1,
+        ),
+        'filter_html' => array(
+          'weight' => -10,
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '<p>',
+          ),
+        ),
+      )
+    ));
+    $crazy_format->save();
+
+    $text = "<p>Llamas are <not> awesome!</p>";
+    $expected_filtered_text = "&lt;p&gt;Llamas are  awesome!&lt;/p&gt;";
+
+    $this->assertEqual(check_markup($text, 'crazy'), $expected_filtered_text, 'Filters applied in correct order.');
+  }
+
+  /**
+   * Tests the ability to apply only a subset of filters.
+   */
+  function testCheckMarkupFilterSubset() {
+    $text = "Text with <marquee>evil content and</marquee> a URL: https://www.drupal.org!";
+    $expected_filtered_text = "Text with evil content and a URL: <a href=\"https://www.drupal.org\">https://www.drupal.org</a>!";
+    $expected_filter_text_without_html_generators = "Text with evil content and a URL: https://www.drupal.org!";
+
+    $actual_filtered_text = check_markup($text, 'filtered_html', '', array());
+    $this->verbose("Actual:<pre>$actual_filtered_text</pre>Expected:<pre>$expected_filtered_text</pre>");
+    $this->assertEqual(
+      $actual_filtered_text,
+      $expected_filtered_text,
+      'Expected filter result.'
+    );
+    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_MARKUP_LANGUAGE));
+    $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
+    $this->assertEqual(
+      $actual_filtered_text_without_html_generators,
+      $expected_filter_text_without_html_generators,
+      'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters.'
+    );
+    // Related to @see FilterSecurityTest.php/testSkipSecurityFilters(), but
+    // this check focuses on the ability to filter multiple filter types at once.
+    // Drupal core only ships with these two types of filters, so this is the
+    // most extensive test possible.
+    $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE));
+    $this->verbose("Actual:<pre>$actual_filtered_text_without_html_generators</pre>Expected:<pre>$expected_filter_text_without_html_generators</pre>");
+    $this->assertEqual(
+      $actual_filtered_text_without_html_generators,
+      $expected_filter_text_without_html_generators,
+      'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.'
+    );
+  }
+
+  /**
+   * Tests the following functions for a variety of formats:
+   *   - \Drupal\filter\Entity\FilterFormatInterface::getHtmlRestrictions()
+   *   - \Drupal\filter\Entity\FilterFormatInterface::getFilterTypes()
+   */
+  function testFilterFormatAPI() {
+    // Test on filtered_html.
+    $filtered_html_format = entity_load('filter_format', 'filtered_html');
+    $this->assertIdentical(
+      $filtered_html_format->getHtmlRestrictions(),
+      array(
+        'allowed' => array(
+          'p' => FALSE,
+          'br' => FALSE,
+          'strong' => FALSE,
+          'a' => array('href' => TRUE, 'hreflang' => TRUE),
+          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
+        ),
+      ),
+      'FilterFormatInterface::getHtmlRestrictions() works as expected for the filtered_html format.'
+    );
+    $this->assertIdentical(
+      $filtered_html_format->getFilterTypes(),
+      array(FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE),
+      'FilterFormatInterface::getFilterTypes() works as expected for the filtered_html format.'
+    );
+
+    // Test on full_html.
+    $full_html_format = entity_load('filter_format', 'full_html');
+    $this->assertIdentical(
+      $full_html_format->getHtmlRestrictions(),
+      FALSE, // Every tag is allowed.
+      'FilterFormatInterface::getHtmlRestrictions() works as expected for the full_html format.'
+    );
+    $this->assertIdentical(
+      $full_html_format->getFilterTypes(),
+      array(),
+      'FilterFormatInterface::getFilterTypes() works as expected for the full_html format.'
+    );
+
+    // Test on stupid_filtered_html, where nothing is allowed.
+    $stupid_filtered_html_format = FilterFormat::create(array(
+      'format' => 'stupid_filtered_html',
+      'name' => 'Stupid Filtered HTML',
+      'filters' => array(
+        'filter_html' => array(
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '', // Nothing is allowed.
+          ),
+        ),
+      ),
+    ));
+    $stupid_filtered_html_format->save();
+    $this->assertIdentical(
+      $stupid_filtered_html_format->getHtmlRestrictions(),
+      array('allowed' => array()), // No tag is allowed.
+      'FilterFormatInterface::getHtmlRestrictions() works as expected for the stupid_filtered_html format.'
+    );
+    $this->assertIdentical(
+      $stupid_filtered_html_format->getFilterTypes(),
+      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      'FilterFormatInterface::getFilterTypes() works as expected for the stupid_filtered_html format.'
+    );
+
+    // Test on very_restricted_html, where there's two different filters of the
+    // FilterInterface::TYPE_HTML_RESTRICTOR type, each restricting in different ways.
+    $very_restricted_html_format = FilterFormat::create(array(
+      'format' => 'very_restricted_html',
+      'name' => 'Very Restricted HTML',
+      'filters' => array(
+        'filter_html' => array(
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '<p> <br> <a href> <strong>',
+          ),
+        ),
+        'filter_test_restrict_tags_and_attributes' => array(
+          'status' => 1,
+          'settings' => array(
+            'restrictions' => array(
+              'allowed' => array(
+                'p' => TRUE,
+                'br' => FALSE,
+                'a' => array('href' => TRUE),
+                'em' => TRUE,
+              ),
+            )
+          ),
+        ),
+      )
+    ));
+    $very_restricted_html_format->save();
+    $this->assertIdentical(
+      $very_restricted_html_format->getHtmlRestrictions(),
+      array(
+        'allowed' => array(
+          'p' => FALSE,
+          'br' => FALSE,
+          'a' => array('href' => TRUE),
+          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
+        ),
+      ),
+      'FilterFormatInterface::getHtmlRestrictions() works as expected for the very_restricted_html format.'
+    );
+    $this->assertIdentical(
+      $very_restricted_html_format->getFilterTypes(),
+      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
+    );
+
+    // Test on nonsensical_restricted_html, where the allowed attribute values
+    // contain asterisks, which do not have any meaning, but which we also
+    // cannot prevent because configuration can be modified outside of forms.
+    $nonsensical_restricted_html = \Drupal\filter\Entity\FilterFormat::create(array(
+      'format' => 'nonsensical_restricted_html',
+      'name' => 'Nonsensical Restricted HTML',
+      'filters' => array(
+        'filter_html' => array(
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '<a> <b class> <c class="*"> <d class="foo bar-* *">',
+          ),
+        ),
+      )
+    ));
+    $nonsensical_restricted_html->save();
+    $this->assertIdentical(
+      $nonsensical_restricted_html->getHtmlRestrictions(),
+      array(
+        'allowed' => array(
+          'a' => FALSE,
+          'b' => array('class' => TRUE),
+          'c' => array('class' => TRUE),
+          'd' => array('class' => array('foo' => TRUE, 'bar-*' => TRUE)),
+          '*' => array('style' => FALSE, 'on*' => FALSE, 'lang' => TRUE, 'dir' => array('ltr' => TRUE, 'rtl' => TRUE)),
+        ),
+      ),
+      'FilterFormatInterface::getHtmlRestrictions() works as expected for the nonsensical_restricted_html format.'
+    );
+    $this->assertIdentical(
+      $very_restricted_html_format->getFilterTypes(),
+      array(FilterInterface::TYPE_HTML_RESTRICTOR),
+      'FilterFormatInterface::getFilterTypes() works as expected for the very_restricted_html format.'
+    );
+  }
+
+  /**
+   * Tests the 'processed_text' element.
+   *
+   * check_markup() is a wrapper for the 'processed_text' element, for use in
+   * simple scenarios; the 'processed_text' element has more advanced features:
+   * it lets filters attach assets, associate cache tags and define
+   * #lazy_builder callbacks.
+   * This test focuses solely on those advanced features.
+   */
+  function testProcessedTextElement() {
+    FilterFormat::create(array(
+      'format' => 'element_test',
+      'name' => 'processed_text element test format',
+      'filters' => array(
+        'filter_test_assets' => array(
+          'weight' => -1,
+          'status' => TRUE,
+        ),
+        'filter_test_cache_tags' => array(
+          'weight' => 0,
+          'status' => TRUE,
+        ),
+        'filter_test_cache_contexts' => array(
+          'weight' => 0,
+          'status' => TRUE,
+        ),
+        'filter_test_cache_merge' => array(
+          'weight' => 0,
+          'status' => TRUE,
+        ),
+        'filter_test_placeholders' => array(
+          'weight' => 1,
+          'status' => TRUE,
+        ),
+        // Run the HTML corrector filter last, because it has the potential to
+        // break the placeholders added by the filter_test_placeholders filter.
+        'filter_htmlcorrector' => array(
+          'weight' => 10,
+          'status' => TRUE,
+        ),
+      ),
+    ))->save();
+
+    $build = array(
+      '#type' => 'processed_text',
+      '#text' => '<p>Hello, world!</p>',
+      '#format' => 'element_test',
+    );
+    drupal_render_root($build);
+
+    // Verify the attachments and cacheability metadata.
+    $expected_attachments = array(
+      // The assets attached by the filter_test_assets filter.
+      'library' => array(
+        'filter/caption',
+      ),
+      // The placeholders attached that still need to be processed.
+      'placeholders' => [],
+    );
+    $this->assertEqual($expected_attachments, $build['#attached'], 'Expected attachments present');
+    $expected_cache_tags = array(
+      // The cache tag set by the processed_text element itself.
+      'config:filter.format.element_test',
+      // The cache tags set by the filter_test_cache_tags filter.
+      'foo:bar',
+      'foo:baz',
+      // The cache tags set by the filter_test_cache_merge filter.
+      'merge:tag',
+    );
+    $this->assertEqual($expected_cache_tags, $build['#cache']['tags'], 'Expected cache tags present.');
+    $expected_cache_contexts = [
+      // The cache context set by the filter_test_cache_contexts filter.
+      'languages:' . LanguageInterface::TYPE_CONTENT,
+      // The default cache contexts for Renderer.
+      'languages:' . LanguageInterface::TYPE_INTERFACE,
+      'theme',
+      // The cache tags set by the filter_test_cache_merge filter.
+      'user.permissions',
+    ];
+    $this->assertEqual($expected_cache_contexts, $build['#cache']['contexts'], 'Expected cache contexts present.');
+    $expected_markup = '<p>Hello, world!</p><p>This is a dynamic llama.</p>';
+    $this->assertEqual($expected_markup, $build['#markup'], 'Expected #lazy_builder callback has been applied.');
+  }
+
+  /**
+   * Tests the function of the typed data type.
+   */
+  function testTypedDataAPI() {
+    $definition = DataDefinition::create('filter_format');
+    $data = \Drupal::typedDataManager()->create($definition);
+
+    $this->assertTrue($data instanceof OptionsProviderInterface, 'Typed data object implements \Drupal\Core\TypedData\OptionsProviderInterface');
+
+    $filtered_html_user = $this->createUser(array('uid' => 2), array(
+      entity_load('filter_format', 'filtered_html')->getPermissionName(),
+    ));
+
+    // Test with anonymous user.
+    $user = new AnonymousUserSession();
+    \Drupal::currentUser()->setAccount($user);
+
+    $expected_available_options = array(
+      'filtered_html' => 'Filtered HTML',
+      'full_html' => 'Full HTML',
+      'filter_test' => 'Test format',
+      'plain_text' => 'Plain text',
+    );
+
+    $available_values = $data->getPossibleValues();
+    $this->assertEqual($available_values, array_keys($expected_available_options));
+    $available_options = $data->getPossibleOptions();
+    $this->assertEqual($available_options, $expected_available_options);
+
+    $allowed_values = $data->getSettableValues($user);
+    $this->assertEqual($allowed_values, array('plain_text'));
+    $allowed_options = $data->getSettableOptions($user);
+    $this->assertEqual($allowed_options, array('plain_text' => 'Plain text'));
+
+    $data->setValue('foo');
+    $violations = $data->validate();
+    $this->assertFilterFormatViolation($violations, 'foo');
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getRoot(), $data, 'Violation root is filter format.');
+    $this->assertEqual($violation->getPropertyPath(), '', 'Violation property path is correct.');
+    $this->assertEqual($violation->getInvalidValue(), 'foo', 'Violation contains invalid value.');
+
+    $data->setValue('plain_text');
+    $violations = $data->validate();
+    $this->assertEqual(count($violations), 0, "No validation violation for format 'plain_text' found");
+
+    // Anonymous doesn't have access to the 'filtered_html' format.
+    $data->setValue('filtered_html');
+    $violations = $data->validate();
+    $this->assertFilterFormatViolation($violations, 'filtered_html');
+
+    // Set user with access to 'filtered_html' format.
+    \Drupal::currentUser()->setAccount($filtered_html_user);
+    $violations = $data->validate();
+    $this->assertEqual(count($violations), 0, "No validation violation for accessible format 'filtered_html' found.");
+
+    $allowed_values = $data->getSettableValues($filtered_html_user);
+    $this->assertEqual($allowed_values, array('filtered_html', 'plain_text'));
+    $allowed_options = $data->getSettableOptions($filtered_html_user);
+    $expected_allowed_options = array(
+      'filtered_html' => 'Filtered HTML',
+      'plain_text' => 'Plain text',
+    );
+    $this->assertEqual($allowed_options, $expected_allowed_options);
+  }
+
+  /**
+   * Tests that FilterFormat::preSave() only saves customized plugins.
+   */
+  public function testFilterFormatPreSave() {
+    /** @var \Drupal\filter\FilterFormatInterface $crazy_format */
+    $crazy_format = FilterFormat::create(array(
+      'format' => 'crazy',
+      'name' => 'Crazy',
+      'weight' => 1,
+      'filters' => array(
+        'filter_html_escape' => array(
+          'weight' => 10,
+          'status' => 1,
+        ),
+        'filter_html' => array(
+          'weight' => -10,
+          'status' => 1,
+          'settings' => array(
+            'allowed_html' => '<p>',
+          ),
+        ),
+      )
+    ));
+    $crazy_format->save();
+    // Use config to directly load the configuration and check that only enabled
+    // or customized plugins are saved to configuration.
+    $filters = $this->config('filter.format.crazy')->get('filters');
+    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
+
+    // Disable a plugin to ensure that disabled plugins with custom settings are
+    // stored in configuration.
+    $crazy_format->setFilterConfig('filter_html_escape', array('status' => FALSE));
+    $crazy_format->save();
+    $filters = $this->config('filter.format.crazy')->get('filters');
+    $this->assertEqual(array('filter_html_escape', 'filter_html'), array_keys($filters));
+
+    // Set the settings as per default to ensure that disable plugins in this
+    // state are not stored in configuration.
+    $crazy_format->setFilterConfig('filter_html_escape', array('weight' => -10));
+    $crazy_format->save();
+    $filters = $this->config('filter.format.crazy')->get('filters');
+    $this->assertEqual(array('filter_html'), array_keys($filters));
+  }
+
+  /**
+   * Checks if an expected violation exists in the given violations.
+   *
+   * @param \Symfony\Component\Validator\ConstraintViolationListInterface $violations
+   *   The violations to assert.
+   * @param mixed $invalid_value
+   *   The expected invalid value.
+   */
+  public function assertFilterFormatViolation(ConstraintViolationListInterface $violations, $invalid_value) {
+    $filter_format_violation_found = FALSE;
+    foreach ($violations as $violation) {
+      if ($violation->getRoot() instanceof FilterFormatDataType && $violation->getInvalidValue() === $invalid_value) {
+        $filter_format_violation_found = TRUE;
+        break;
+      }
+    }
+    $this->assertTrue($filter_format_violation_found, format_string('Validation violation for invalid value "%invalid_value" found', array('%invalid_value' => $invalid_value)));
+  }
+
+  /**
+   * Tests that filter format dependency removal works.
+   *
+   * Ensure that modules providing filter plugins are required when the plugin
+   * is in use, and that only disabled plugins are removed from format
+   * configuration entities rather than the configuration entities being
+   * deleted.
+   *
+   * @see \Drupal\filter\Entity\FilterFormat::onDependencyRemoval()
+   * @see filter_system_info_alter()
+   */
+  public function testDependencyRemoval() {
+    $this->installSchema('user', array('users_data'));
+    $filter_format = \Drupal\filter\Entity\FilterFormat::load('filtered_html');
+
+    // Disable the filter_test_restrict_tags_and_attributes filter plugin but
+    // have custom configuration so that the filter plugin is still configured
+    // in filtered_html the filter format.
+    $filter_config = [
+      'weight' => 20,
+      'status' => 0,
+    ];
+    $filter_format->setFilterConfig('filter_test_restrict_tags_and_attributes', $filter_config)->save();
+    // Use the get method to match the assert after the module has been
+    // uninstalled.
+    $filters = $filter_format->get('filters');
+    $this->assertTrue(isset($filters['filter_test_restrict_tags_and_attributes']), 'The filter plugin filter_test_restrict_tags_and_attributes is configured by the filtered_html filter format.');
+
+    drupal_static_reset('filter_formats');
+    \Drupal::entityManager()->getStorage('filter_format')->resetCache();
+    $module_data = _system_rebuild_module_data();
+    $this->assertFalse(isset($module_data['filter_test']->info['required']), 'The filter_test module is required.');
+
+    // Verify that a dependency exists on the module that provides the filter
+    // plugin since it has configuration for the disabled plugin.
+    $this->assertEqual(['module' => ['filter_test']], $filter_format->getDependencies());
+
+    // Uninstall the module.
+    \Drupal::service('module_installer')->uninstall(array('filter_test'));
+
+    // Verify the filter format still exists but the dependency and filter is
+    // gone.
+    \Drupal::entityManager()->getStorage('filter_format')->resetCache();
+    $filter_format = \Drupal\filter\Entity\FilterFormat::load('filtered_html');
+    $this->assertEqual([], $filter_format->getDependencies());
+    // Use the get method since the FilterFormat::filters() method only returns
+    // existing plugins.
+    $filters = $filter_format->get('filters');
+    $this->assertFalse(isset($filters['filter_test_restrict_tags_and_attributes']), 'The filter plugin filter_test_restrict_tags_and_attributes is not configured by the filtered_html filter format.');
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Kernel/FilterCrudTest.php b/core/modules/filter/tests/src/Kernel/FilterCrudTest.php
new file mode 100644
index 0000000..1f54f65
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/FilterCrudTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\FilterCrudTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests creation, loading, updating, deleting of text formats and filters.
+ *
+ * @group filter
+ */
+class FilterCrudTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['filter', 'filter_test', 'system', 'user'];
+
+  /**
+   * Tests CRUD operations for text formats and filters.
+   */
+  function testTextFormatCrud() {
+    // Add a text format with minimum data only.
+    $format = FilterFormat::create(array(
+      'format' => 'empty_format',
+      'name' => 'Empty format',
+    ));
+    $format->save();
+    $this->verifyTextFormat($format);
+
+    // Add another text format specifying all possible properties.
+    $format = FilterFormat::create(array(
+      'format' => 'custom_format',
+      'name' => 'Custom format',
+    ));
+    $format->setFilterConfig('filter_url', array(
+      'status' => 1,
+      'settings' => array(
+        'filter_url_length' => 30,
+      ),
+    ));
+    $format->save();
+    $this->verifyTextFormat($format);
+
+    // Alter some text format properties and save again.
+    $format->set('name', 'Altered format');
+    $format->setFilterConfig('filter_url', array(
+      'status' => 0,
+    ));
+    $format->setFilterConfig('filter_autop', array(
+      'status' => 1,
+    ));
+    $format->save();
+    $this->verifyTextFormat($format);
+
+    // Add a filter_test_replace  filter and save again.
+    $format->setFilterConfig('filter_test_replace', array(
+      'status' => 1,
+    ));
+    $format->save();
+    $this->verifyTextFormat($format);
+
+    // Disable the text format.
+    $format->disable()->save();
+
+    $formats = filter_formats();
+    $this->assertTrue(!isset($formats[$format->id()]), 'filter_formats: Disabled text format no longer exists.');
+  }
+
+  /**
+   * Tests disabling the fallback text format.
+   */
+  public function testDisableFallbackFormat() {
+    $this->installConfig(['filter']);
+    $message = '\LogicException with message "The fallback text format \'plain_text\' cannot be disabled." was thrown.';
+    try {
+      FilterFormat::load('plain_text')->disable();
+      $this->fail($message);
+    }
+    catch (\LogicException $e) {
+      $this->assertIdentical($e->getMessage(), "The fallback text format 'plain_text' cannot be disabled.", $message);
+    }
+  }
+
+  /**
+   * Verifies that a text format is properly stored.
+   */
+  function verifyTextFormat($format) {
+    $t_args = array('%format' => $format->label());
+    $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
+
+    // Verify the loaded filter has all properties.
+    $filter_format = entity_load('filter_format', $format->id());
+    $this->assertEqual($filter_format->id(), $format->id(), format_string('filter_format_load: Proper format id for text format %format.', $t_args));
+    $this->assertEqual($filter_format->label(), $format->label(), format_string('filter_format_load: Proper title for text format %format.', $t_args));
+    $this->assertEqual($filter_format->get('weight'), $format->get('weight'), format_string('filter_format_load: Proper weight for text format %format.', $t_args));
+    // Check that the filter was created in site default language.
+    $this->assertEqual($format->language()->getId(), $default_langcode, format_string('filter_format_load: Proper language code for text format %format.', $t_args));
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php b/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
new file mode 100644
index 0000000..c41a2b1
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\FilterDefaultConfigTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests text format default configuration.
+ *
+ * @group filter
+ */
+class FilterDefaultConfigTest extends KernelTestBase {
+
+  public static $modules = array('system', 'user', 'filter', 'filter_test');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Drupal\filter\FilterPermissions::permissions() builds a URL to output
+    // a link in the description.
+
+    $this->installEntitySchema('user');
+
+    // Install filter_test module, which ships with custom default format.
+    $this->installConfig(array('user', 'filter_test'));
+  }
+
+  /**
+   * Tests installation of default formats.
+   */
+  function testInstallation() {
+    // Verify that the format was installed correctly.
+    $format = entity_load('filter_format', 'filter_test');
+    $this->assertTrue((bool) $format);
+    $this->assertEqual($format->id(), 'filter_test');
+    $this->assertEqual($format->label(), 'Test format');
+    $this->assertEqual($format->get('weight'), 2);
+
+    // Verify that format default property values have been added/injected.
+    $this->assertTrue($format->uuid());
+
+    // Verify that the loaded format does not contain any roles.
+    $this->assertEqual($format->get('roles'), NULL);
+    // Verify that the defined roles in the default config have been processed.
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+      RoleInterface::ANONYMOUS_ID,
+      RoleInterface::AUTHENTICATED_ID,
+    ));
+
+    // Verify enabled filters.
+    $filters = $format->get('filters');
+    $this->assertEqual($filters['filter_html_escape']['status'], 1);
+    $this->assertEqual($filters['filter_html_escape']['weight'], -10);
+    $this->assertEqual($filters['filter_html_escape']['provider'], 'filter');
+    $this->assertEqual($filters['filter_html_escape']['settings'], array());
+    $this->assertEqual($filters['filter_autop']['status'], 1);
+    $this->assertEqual($filters['filter_autop']['weight'], 0);
+    $this->assertEqual($filters['filter_autop']['provider'], 'filter');
+    $this->assertEqual($filters['filter_autop']['settings'], array());
+    $this->assertEqual($filters['filter_url']['status'], 1);
+    $this->assertEqual($filters['filter_url']['weight'], 0);
+    $this->assertEqual($filters['filter_url']['provider'], 'filter');
+    $this->assertEqual($filters['filter_url']['settings'], array(
+      'filter_url_length' => 72,
+    ));
+  }
+
+  /**
+   * Tests that changes to FilterFormat::$roles do not have an effect.
+   */
+  function testUpdateRoles() {
+    // Verify role permissions declared in default config.
+    $format = entity_load('filter_format', 'filter_test');
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+      RoleInterface::ANONYMOUS_ID,
+      RoleInterface::AUTHENTICATED_ID,
+    ));
+
+    // Attempt to change roles.
+    $format->set('roles', array(
+      RoleInterface::AUTHENTICATED_ID,
+    ));
+    $format->save();
+
+    // Verify that roles have not been updated.
+    $format = entity_load('filter_format', 'filter_test');
+    $this->assertEqual(array_keys(filter_get_roles_by_format($format)), array(
+      RoleInterface::ANONYMOUS_ID,
+      RoleInterface::AUTHENTICATED_ID,
+    ));
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php
new file mode 100644
index 0000000..2db4130
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/FilterSettingsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\FilterSettingsTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\filter\Entity\FilterFormat;
+
+/**
+ * Tests filter settings.
+ *
+ * @group filter
+ */
+class FilterSettingsTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter');
+
+  /**
+   * Tests explicit and implicit default settings for filters.
+   */
+  function testFilterDefaults() {
+    $filter_info = $this->container->get('plugin.manager.filter')->getDefinitions();
+
+    // Create text format using filter default settings.
+    $filter_defaults_format = FilterFormat::create(array(
+      'format' => 'filter_defaults',
+      'name' => 'Filter defaults',
+    ));
+    $filter_defaults_format->save();
+
+    // Verify that default weights defined in hook_filter_info() were applied.
+    $saved_settings = array();
+    foreach ($filter_defaults_format->filters() as $name => $filter) {
+      $expected_weight = $filter_info[$name]['weight'];
+      $this->assertEqual($filter->weight, $expected_weight, format_string('@name filter weight %saved equals %default', array(
+        '@name' => $name,
+        '%saved' => $filter->weight,
+        '%default' => $expected_weight,
+      )));
+      $saved_settings[$name]['weight'] = $expected_weight;
+    }
+
+    // Re-save the text format.
+    $filter_defaults_format->save();
+    // Reload it from scratch.
+    filter_formats_reset();
+
+    // Verify that saved filter settings have not been changed.
+    foreach ($filter_defaults_format->filters() as $name => $filter) {
+      $this->assertEqual($filter->weight, $saved_settings[$name]['weight'], format_string('@name filter weight %saved equals %previous', array(
+        '@name' => $name,
+        '%saved' => $filter->weight,
+        '%previous' => $saved_settings[$name]['weight'],
+      )));
+    }
+  }
+}
diff --git a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
new file mode 100644
index 0000000..87988bd
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
@@ -0,0 +1,1184 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\FilterUnitTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Render\RenderContext;
+use Drupal\editor\EditorXssFilter\Standard;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\filter\FilterPluginCollection;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests Filter module filters individually.
+ *
+ * @group filter
+ */
+class FilterUnitTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'filter');
+
+  /**
+   * @var \Drupal\filter\Plugin\FilterInterface[]
+   */
+  protected $filters;
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('system'));
+
+    $manager = $this->container->get('plugin.manager.filter');
+    $bag = new FilterPluginCollection($manager, array());
+    $this->filters = $bag->getAll();
+  }
+
+  /**
+   * Tests the align filter.
+   */
+  function testAlignFilter() {
+    $filter = $this->filters['filter_align'];
+
+    $test = function($input) use ($filter) {
+      return $filter->process($input, 'und');
+    };
+
+    // No data-align attribute.
+    $input = '<img src="llama.jpg" />';
+    $expected = $input;
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // Data-align attribute: all 3 allowed values.
+    $input = '<img src="llama.jpg" data-align="left" />';
+    $expected = '<img src="llama.jpg" class="align-left" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+    $input = '<img src="llama.jpg" data-align="center" />';
+    $expected = '<img src="llama.jpg" class="align-center" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+    $input = '<img src="llama.jpg" data-align="right" />';
+    $expected = '<img src="llama.jpg" class="align-right" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // Data-align attribute: a disallowed value.
+    $input = '<img src="llama.jpg" data-align="left foobar" />';
+    $expected = '<img src="llama.jpg" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // Empty data-align attribute.
+    $input = '<img src="llama.jpg" data-align="" />';
+    $expected = '<img src="llama.jpg" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // Ensure the filter also works with uncommon yet valid attribute quoting.
+    $input = '<img src=llama.jpg data-align=right />';
+    $expected = '<img src="llama.jpg" class="align-right" />';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+
+    // Security test: attempt to inject an additional class.
+    $input = '<img src="llama.jpg" data-align="center another-class-here" />';
+    $expected = '<img src="llama.jpg" />';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+
+    // Security test: attempt an XSS.
+    $input = '<img src="llama.jpg" data-align="center \'onclick=\'alert(foo);" />';
+    $expected = '<img src="llama.jpg" />';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+  }
+
+  /**
+   * Tests the caption filter.
+   */
+  function testCaptionFilter() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+    $filter = $this->filters['filter_caption'];
+
+    $test = function($input) use ($filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter) {
+        return $filter->process($input, 'und');
+      });
+    };
+
+    $attached_library = array(
+      'library' => array(
+        'filter/caption',
+      ),
+    );
+
+    // No data-caption attribute.
+    $input = '<img src="llama.jpg" />';
+    $expected = $input;
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // Data-caption attribute.
+    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Empty data-caption attribute.
+    $input = '<img src="llama.jpg" data-caption="" />';
+    $expected = '<img src="llama.jpg" />';
+    $this->assertIdentical($expected, $test($input)->getProcessedText());
+
+    // HTML entities in the caption.
+    $input = '<img src="llama.jpg" data-caption="&ldquo;Loquacious llama!&rdquo;" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>“Loquacious llama!”</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // HTML encoded as HTML entities in data-caption attribute.
+    $input = '<img src="llama.jpg" data-caption="&lt;em&gt;Loquacious llama!&lt;/em&gt;" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption><em>Loquacious llama!</em></figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // HTML (not encoded as HTML entities) in data-caption attribute, which is
+    // not allowed by the HTML spec, but may happen when people manually write
+    // HTML, so we explicitly support it.
+    $input = '<img src="llama.jpg" data-caption="<em>Loquacious llama!</em>" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption><em>Loquacious llama!</em></figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Security test: attempt an XSS.
+    $input = '<img src="llama.jpg" data-caption="<script>alert(\'Loquacious llama!\')</script>" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>alert(\'Loquacious llama!\')</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Ensure the filter also works with uncommon yet valid attribute quoting.
+    $input = '<img src=llama.jpg data-caption=\'Loquacious llama!\' />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Finally, ensure that this also works on any other tag.
+    $input = '<video src="llama.jpg" data-caption="Loquacious llama!" />';
+    $expected = '<figure role="group"><video src="llama.jpg"></video><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+    $input = '<foobar data-caption="Loquacious llama!">baz</foobar>';
+    $expected = '<figure role="group"><foobar>baz</foobar><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Ensure the caption filter works for linked images.
+    $input = '<a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" data-caption="Loquacious llama!" /></a>';
+    $expected = '<figure role="group"><a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" /></a>' . "\n" . '<figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // So far we've tested that the caption filter works correctly. But we also
+    // want to make sure that it works well in tandem with the "Limit allowed
+    // HTML tags" filter, which it is typically used with.
+    $html_filter = $this->filters['filter_html'];
+    $html_filter->setConfiguration(array(
+      'settings' => array(
+        'allowed_html' => '<img src data-align data-caption>',
+        'filter_html_help' => 1,
+        'filter_html_nofollow' => 0,
+      )
+    ));
+    $test_with_html_filter = function ($input) use ($filter, $html_filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $filter, $html_filter) {
+        // 1. Apply HTML filter's processing step.
+        $output = $html_filter->process($input, 'und');
+        // 2. Apply caption filter's processing step.
+        $output = $filter->process($output, 'und');
+        return $output->getProcessedText();
+      });
+    };
+    // Editor XSS filter.
+    $test_editor_xss_filter = function ($input) {
+      $dummy_filter_format = FilterFormat::create();
+      return Standard::filterXss($input, $dummy_filter_format);
+    };
+
+    // All the tricky cases encountered at https://www.drupal.org/node/2105841.
+    // A plain URL preceded by text.
+    $input = '<img data-caption="See https://www.drupal.org" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>See https://www.drupal.org</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // An anchor.
+    $input = '<img data-caption="This is a &lt;a href=&quot;https://www.drupal.org&quot;&gt;quick&lt;/a&gt; test…" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>This is a <a href="https://www.drupal.org">quick</a> test…</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // A plain URL surrounded by parentheses.
+    $input = '<img data-caption="(https://www.drupal.org)" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>(https://www.drupal.org)</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // A source being credited.
+    $input = '<img data-caption="Source: Wikipedia" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Source: Wikipedia</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // A source being credited, without a space after the colon.
+    $input = '<img data-caption="Source:Wikipedia" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Source:Wikipedia</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // A pretty crazy edge case where we have two colons.
+    $input = '<img data-caption="Interesting (Scope resolution operator ::)" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Interesting (Scope resolution operator ::)</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $this->assertIdentical($input, $test_editor_xss_filter($input));
+
+    // An evil anchor (to ensure XSS filtering is applied to the caption also).
+    $input = '<img data-caption="This is an &lt;a href=&quot;javascript:alert();&quot;&gt;evil&lt;/a&gt; test…" src="llama.jpg" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>This is an <a href="alert();">evil</a> test…</figcaption></figure>';
+    $this->assertIdentical($expected, $test_with_html_filter($input));
+    $expected_xss_filtered = '<img data-caption="This is an &lt;a href=&quot;alert();&quot;&gt;evil&lt;/a&gt; test…" src="llama.jpg" />';
+    $this->assertIdentical($expected_xss_filtered, $test_editor_xss_filter($input));
+  }
+
+  /**
+   * Tests the combination of the align and caption filters.
+   */
+  function testAlignAndCaptionFilters() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+    $align_filter = $this->filters['filter_align'];
+    $caption_filter = $this->filters['filter_caption'];
+
+    $test = function($input) use ($align_filter, $caption_filter, $renderer) {
+      return $renderer->executeInRenderContext(new RenderContext(), function () use ($input, $align_filter, $caption_filter) {
+        return $caption_filter->process($align_filter->process($input, 'und'), 'und');
+      });
+    };
+
+    $attached_library = array(
+      'library' => array(
+        'filter/caption',
+      ),
+    );
+
+    // Both data-caption and data-align attributes: all 3 allowed values for the
+    // data-align attribute.
+    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="left" />';
+    $expected = '<figure role="group" class="align-left"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="center" />';
+    $expected = '<figure role="group" class="align-center"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="right" />';
+    $expected = '<figure role="group" class="align-right"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Both data-caption and data-align attributes, but a disallowed data-align
+    // attribute value.
+    $input = '<img src="llama.jpg" data-caption="Loquacious llama!" data-align="left foobar" />';
+    $expected = '<figure role="group"><img src="llama.jpg" /><figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+
+    // Ensure both filters together work for linked images.
+    $input = '<a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" data-caption="Loquacious llama!" data-align="center" /></a>';
+    $expected = '<figure role="group" class="align-center"><a href="http://example.com/llamas/are/awesome/but/kittens/are/cool/too"><img src="llama.jpg" /></a>' . "\n" . '<figcaption>Loquacious llama!</figcaption></figure>';
+    $output = $test($input);
+    $this->assertIdentical($expected, $output->getProcessedText());
+    $this->assertIdentical($attached_library, $output->getAttachments());
+  }
+
+  /**
+   * Tests the line break filter.
+   */
+  function testLineBreakFilter() {
+    // Get FilterAutoP object.
+    $filter = $this->filters['filter_autop'];
+
+    // Since the line break filter naturally needs plenty of newlines in test
+    // strings and expectations, we're using "\n" instead of regular newlines
+    // here.
+    $tests = array(
+      // Single line breaks should be changed to <br /> tags, while paragraphs
+      // separated with double line breaks should be enclosed with <p></p> tags.
+      "aaa\nbbb\n\nccc" => array(
+        "<p>aaa<br />\nbbb</p>\n<p>ccc</p>" => TRUE,
+      ),
+      // Skip contents of certain block tags entirely.
+      "<script>aaa\nbbb\n\nccc</script>
+<style>aaa\nbbb\n\nccc</style>
+<pre>aaa\nbbb\n\nccc</pre>
+<object>aaa\nbbb\n\nccc</object>
+<iframe>aaa\nbbb\n\nccc</iframe>
+" => array(
+        "<script>aaa\nbbb\n\nccc</script>" => TRUE,
+        "<style>aaa\nbbb\n\nccc</style>" => TRUE,
+        "<pre>aaa\nbbb\n\nccc</pre>" => TRUE,
+        "<object>aaa\nbbb\n\nccc</object>" => TRUE,
+        "<iframe>aaa\nbbb\n\nccc</iframe>" => TRUE,
+      ),
+      // Skip comments entirely.
+      "One. <!-- comment --> Two.\n<!--\nThree.\n-->\n" => array(
+        '<!-- comment -->' => TRUE,
+        "<!--\nThree.\n-->" => TRUE,
+      ),
+      // Resulting HTML should produce matching paragraph tags.
+      '<p><div>  </div></p>' => array(
+        "<p>\n<div>  </div>\n</p>" => TRUE,
+      ),
+      '<div><p>  </p></div>' => array(
+        "<div>\n</div>" => TRUE,
+      ),
+      '<blockquote><pre>aaa</pre></blockquote>' => array(
+        "<blockquote><pre>aaa</pre></blockquote>" => TRUE,
+      ),
+      "<pre>aaa\nbbb\nccc</pre>\nddd\neee" => array(
+        "<pre>aaa\nbbb\nccc</pre>" => TRUE,
+        "<p>ddd<br />\neee</p>" => TRUE,
+      ),
+      // Comments remain unchanged and subsequent lines/paragraphs are
+      // transformed normally.
+      "aaa<!--comment-->\n\nbbb\n\nccc\n\nddd<!--comment\nwith linebreak-->\n\neee\n\nfff" => array(
+        "<p>aaa</p>\n<!--comment--><p>\nbbb</p>\n<p>ccc</p>\n<p>ddd</p>" => TRUE,
+        "<!--comment\nwith linebreak--><p>\neee</p>\n<p>fff</p>" => TRUE,
+      ),
+      // Check that a comment in a PRE will result that the text after
+      // the comment, but still in PRE, is not transformed.
+      "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>\nddd" => array(
+        "<pre>aaa\nbbb<!-- comment -->\n\nccc</pre>" => TRUE,
+      ),
+      // Bug 810824, paragraphs were appearing around iframe tags.
+      "<iframe>aaa</iframe>\n\n" => array(
+        "<p><iframe>aaa</iframe></p>" => FALSE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+
+    // Very long string hitting PCRE limits.
+    $limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit'));
+    $source = $this->randomMachineName($limit);
+    $result = _filter_autop($source);
+    $success = $this->assertEqual($result, '<p>' . $source . "</p>\n", 'Line break filter can process very long strings.');
+    if (!$success) {
+      $this->verbose("\n" . $source . "\n<hr />\n" . $result);
+    }
+  }
+
+
+  /**
+   * Tests filter settings, defaults, access restrictions and similar.
+   *
+   * @todo This is for functions like filter_filter and check_markup, whose
+   *   functionality is not completely focused on filtering. Some ideas:
+   *   restricting formats according to user permissions, proper cache
+   *   handling, defaults -- allowed tags/attributes/protocols.
+   *
+   * @todo It is possible to add script, iframe etc. to allowed tags, but this
+   *   makes HTML filter completely ineffective.
+   *
+   * @todo Class, id, name and xmlns should be added to disallowed attributes,
+   *   or better a whitelist approach should be used for that too.
+   */
+  function testHtmlFilter() {
+    // Get FilterHtml object.
+    $filter = $this->filters['filter_html'];
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'allowed_html' => '<a> <p> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
+        'filter_html_help' => 1,
+        'filter_html_nofollow' => 0,
+      )
+    ));
+
+    // HTML filter is not able to secure some tags, these should never be
+    // allowed.
+    $f = (string) $filter->process('<script />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove script tags.');
+
+    $f = (string) $filter->process('<iframe />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove iframe tags.');
+
+    $f = (string) $filter->process('<object />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove object tags.');
+
+    $f = (string) $filter->process('<style />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove style tags.');
+
+    // Some tags make CSRF attacks easier, let the user take the risk herself.
+    $f = (string) $filter->process('<img />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove img tags by default.');
+
+    $f = (string) $filter->process('<input />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '', 'HTML filter should remove input tags by default.');
+
+    // Filtering content of some attributes is infeasible, these shouldn't be
+    // allowed too.
+    $f = (string) $filter->process('<p style="display: none;" />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNoNormalized($f, 'style', 'HTML filter should remove style attributes.');
+    $this->assertIdentical($f, '<p></p>');
+
+    $f = (string) $filter->process('<p onerror="alert(0);"></p>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove on* attributes.');
+    $this->assertIdentical($f, '<p></p>');
+
+    $f = (string) $filter->process('<code onerror>&nbsp;</code>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNoNormalized($f, 'onerror', 'HTML filter should remove empty on* attributes.');
+    // Note - this string has a decoded &nbsp; character.
+    $this->assertIdentical($f, '<code> </code>');
+
+    $f = (string) $filter->process('<br>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, '<br />', 'HTML filter should allow line breaks.');
+
+    $f = (string) $filter->process('<br />', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, '<br />', 'HTML filter should allow self-closing line breaks.');
+
+    // All attributes of whitelisted tags are stripped by default.
+    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, '<a>link</a>', 'HTML filter should remove attributes that are not explicitly allowed.');
+
+    // Now whitelist the "llama" attribute on <a>.
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'allowed_html' => '<a href llama> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
+        'filter_html_help' => 1,
+        'filter_html_nofollow' => 0,
+      )
+    ));
+    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, '<a llama="awesome">link</a>', 'HTML filter keeps explicitly allowed attributes, and removes attributes that are not explicitly allowed.');
+
+    // Restrict the whitelisted "llama" attribute on <a> to only allow the value
+    // "majestical", or "epic".
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'allowed_html' => '<a href llama="majestical epic"> <em> <strong> <cite> <blockquote> <code> <ul> <ol> <li> <dl> <dt> <dd> <br>',
+        'filter_html_help' => 1,
+        'filter_html_nofollow' => 0,
+      )
+    ));
+    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '<a>link</a>', 'HTML filter removes allowed attributes that do not have an explicitly allowed value.');
+    $f = (string) $filter->process('<a kitten="cute" llama="majestical">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '<a llama="majestical">link</a>', 'HTML filter keeps explicitly allowed attributes with an attribute value that is also explicitly allowed.');
+    $f = (string) $filter->process('<a kitten="cute" llama="awesome">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, '<a>link</a>', 'HTML filter removes allowed attributes that have a not explicitly allowed value.');
+    $f = (string) $filter->process('<a href="/beautiful-animals" kitten="cute" llama="epic majestical">link</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertIdentical($f, '<a href="/beautiful-animals" llama="epic majestical">link</a>', 'HTML filter keeps explicitly allowed attributes with an attribute value that is also explicitly allowed.');
+  }
+
+  /**
+   * Tests the spam deterrent.
+   */
+  function testNoFollowFilter() {
+    // Get FilterHtml object.
+    $filter = $this->filters['filter_html'];
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'allowed_html' => '<a href>',
+        'filter_html_help' => 1,
+        'filter_html_nofollow' => 1,
+      )
+    ));
+
+    // Test if the rel="nofollow" attribute is added, even if we try to prevent
+    // it.
+    $f = (string) $filter->process('<a href="http://www.example.com/">text</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent -- no evasion.');
+
+    $f = (string) $filter->process('<A href="http://www.example.com/">text</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- capital A.');
+
+    $f = (string) $filter->process("<a/href=\"http://www.example.com/\">text</a>", Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- non whitespace character after tag name.');
+
+    $f = (string) $filter->process("<\0a\0 href=\"http://www.example.com/\">text</a>", Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- some nulls.');
+
+    $f = (string) $filter->process('<a href="http://www.example.com/" rel="follow">text</a>', Language::LANGCODE_NOT_SPECIFIED);
+    $this->assertNoNormalized($f, 'rel="follow"', 'Spam deterrent evasion -- with rel set - rel="follow" removed.');
+    $this->assertNormalized($f, 'rel="nofollow"', 'Spam deterrent evasion -- with rel set - rel="nofollow" added.');
+  }
+
+  /**
+   * Tests the HTML escaping filter.
+   */
+  function testHtmlEscapeFilter() {
+    // Get FilterHtmlEscape object.
+    $filter = $this->filters['filter_html_escape'];
+
+    $tests = array(
+      "   One. <!-- \"comment\" --> Two'.\n<p>Three.</p>\n    " => array(
+        "One. &lt;!-- &quot;comment&quot; --&gt; Two&#039;.\n&lt;p&gt;Three.&lt;/p&gt;" => TRUE,
+        '   One.' => FALSE,
+        "</p>\n    " => FALSE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+  }
+
+  /**
+   * Tests the URL filter.
+   */
+  function testUrlFilter() {
+    // Get FilterUrl object.
+    $filter = $this->filters['filter_url'];
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'filter_url_length' => 496,
+      )
+    ));
+
+    // @todo Possible categories:
+    // - absolute, mail, partial
+    // - characters/encoding, surrounding markup, security
+
+    // Create a email that is too long.
+    $long_email = str_repeat('a', 254) . '@example.com';
+    $too_long_email = str_repeat('b', 255) . '@example.com';
+    $email_with_plus_sign = 'one+two@example.com';
+
+    // Filter selection/pattern matching.
+    $tests = array(
+      // HTTP URLs.
+      '
+http://example.com or www.example.com
+' => array(
+        '<a href="http://example.com">http://example.com</a>' => TRUE,
+        '<a href="http://www.example.com">www.example.com</a>' => TRUE,
+      ),
+      // MAILTO URLs.
+      '
+person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
+' => array(
+        '<a href="mailto:person@example.com">person@example.com</a>' => TRUE,
+        '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE,
+        '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE,
+        '<a href="mailto:' . $too_long_email . '">' . $too_long_email . '</a>' => FALSE,
+        '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE,
+      ),
+      // URI parts and special characters.
+      '
+http://trailingslash.com/ or www.trailingslash.com/
+http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment
+http://twitter.com/#!/example/status/22376963142324226
+http://example.com/@user/
+ftp://user:pass@ftp.example.com/~home/dir1
+sftp://user@nonstandardport:222/dir
+ssh://192.168.0.100/srv/git/drupal.git
+' => array(
+        '<a href="http://trailingslash.com/">http://trailingslash.com/</a>' => TRUE,
+        '<a href="http://www.trailingslash.com/">www.trailingslash.com/</a>' => TRUE,
+        '<a href="http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
+        '<a href="http://www.host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">www.host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
+        '<a href="http://twitter.com/#!/example/status/22376963142324226">http://twitter.com/#!/example/status/22376963142324226</a>' => TRUE,
+        '<a href="http://example.com/@user/">http://example.com/@user/</a>' => TRUE,
+        '<a href="ftp://user:pass@ftp.example.com/~home/dir1">ftp://user:pass@ftp.example.com/~home/dir1</a>' => TRUE,
+        '<a href="sftp://user@nonstandardport:222/dir">sftp://user@nonstandardport:222/dir</a>' => TRUE,
+        '<a href="ssh://192.168.0.100/srv/git/drupal.git">ssh://192.168.0.100/srv/git/drupal.git</a>' => TRUE,
+      ),
+      // International Unicode characters.
+      '
+http://пример.испытание/
+http://مثال.إختبار/
+http://例子.測試/
+http://12345.中国/
+http://例え.テスト/
+http://dréißig-bücher.de/
+http://méxico-mañana.es/
+' => array(
+        '<a href="http://пример.испытание/">http://пример.испытание/</a>' => TRUE,
+        '<a href="http://مثال.إختبار/">http://مثال.إختبار/</a>' => TRUE,
+        '<a href="http://例子.測試/">http://例子.測試/</a>' => TRUE,
+        '<a href="http://12345.中国/">http://12345.中国/</a>' => TRUE,
+        '<a href="http://例え.テスト/">http://例え.テスト/</a>' => TRUE,
+        '<a href="http://dréißig-bücher.de/">http://dréißig-bücher.de/</a>' => TRUE,
+        '<a href="http://méxico-mañana.es/">http://méxico-mañana.es/</a>' => TRUE,
+      ),
+      // Encoding.
+      '
+http://ampersand.com/?a=1&b=2
+http://encoded.com/?a=1&amp;b=2
+' => array(
+        '<a href="http://ampersand.com/?a=1&amp;b=2">http://ampersand.com/?a=1&amp;b=2</a>' => TRUE,
+        '<a href="http://encoded.com/?a=1&amp;b=2">http://encoded.com/?a=1&amp;b=2</a>' => TRUE,
+      ),
+      // Domain name length.
+      '
+www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or
+me@me.tv
+' => array(
+        '<a href="http://www.ex.ex">www.ex.ex</a>' => TRUE,
+        '<a href="http://www.example.example">www.example.example</a>' => TRUE,
+        'http://www.toolong' => FALSE,
+        '<a href="mailto:me@me.tv">me@me.tv</a>' => TRUE,
+      ),
+      // Absolute URL protocols.
+      // The list to test is found in the beginning of _filter_url() at
+      // $protocols = \Drupal::getContainer()->getParameter('filter_protocols').
+      '
+https://example.com,
+ftp://ftp.example.com,
+news://example.net,
+telnet://example,
+irc://example.host,
+ssh://odd.geek,
+sftp://secure.host?,
+webcal://calendar,
+rtsp://127.0.0.1,
+not foo://disallowed.com.
+' => array(
+        'href="https://example.com"' => TRUE,
+        'href="ftp://ftp.example.com"' => TRUE,
+        'href="news://example.net"' => TRUE,
+        'href="telnet://example"' => TRUE,
+        'href="irc://example.host"' => TRUE,
+        'href="ssh://odd.geek"' => TRUE,
+        'href="sftp://secure.host"' => TRUE,
+        'href="webcal://calendar"' => TRUE,
+        'href="rtsp://127.0.0.1"' => TRUE,
+        'href="foo://disallowed.com"' => FALSE,
+        'not foo://disallowed.com.' => TRUE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+
+    // Surrounding text/punctuation.
+    $tests = array(
+      '
+Partial URL with trailing period www.partial.com.
+Email with trailing comma person@example.com,
+Absolute URL with trailing question http://www.absolute.com?
+Query string with trailing exclamation www.query.com/index.php?a=!
+Partial URL with 3 trailing www.partial.periods...
+Email with 3 trailing exclamations@example.com!!!
+Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc).
+Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)).
+Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1]
+Absolute URL with quotes "https://www.drupal.org/sample"
+
+' => array(
+        'period <a href="http://www.partial.com">www.partial.com</a>.' => TRUE,
+        'comma <a href="mailto:person@example.com">person@example.com</a>,' => TRUE,
+        'question <a href="http://www.absolute.com">http://www.absolute.com</a>?' => TRUE,
+        'exclamation <a href="http://www.query.com/index.php?a=">www.query.com/index.php?a=</a>!' => TRUE,
+        'trailing <a href="http://www.partial.periods">www.partial.periods</a>...' => TRUE,
+        'trailing <a href="mailto:exclamations@example.com">exclamations@example.com</a>!!!' => TRUE,
+        'characters (<a href="http://www.example.com/q=abc">http://www.example.com/q=abc</a>).' => TRUE,
+        'brackets (<a href="http://www.foo.com/more_(than)_one_(parens)">www.foo.com/more_(than)_one_(parens)</a>).' => TRUE,
+        'brackets [<a href="https://www.drupal.org/?class[]=1">https://www.drupal.org/?class[]=1</a>]' => TRUE,
+        'quotes "<a href="https://www.drupal.org/sample">https://www.drupal.org/sample</a>"' => TRUE,
+      ),
+      '
+(www.parenthesis.com/dir?a=1&b=2#a)
+' => array(
+        '(<a href="http://www.parenthesis.com/dir?a=1&amp;b=2#a">www.parenthesis.com/dir?a=1&amp;b=2#a</a>)' => TRUE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+
+    // Surrounding markup.
+    $tests = array(
+      '
+<p xmlns="www.namespace.com" />
+<p xmlns="http://namespace.com">
+An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.
+</p>
+' => array(
+        '<p xmlns="www.namespace.com" />' => TRUE,
+        '<p xmlns="http://namespace.com">' => TRUE,
+        'href="http://www.namespace.com"' => FALSE,
+        'href="http://namespace.com"' => FALSE,
+        'An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.' => TRUE,
+      ),
+      '
+Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a>
+but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>
+' => array(
+        '<a href="foo">www.relative.com</a>' => TRUE,
+        'href="http://www.relative.com"' => FALSE,
+        '<a href="http://absolute.com">www.absolute.com</a>' => TRUE,
+        '<strong><a href="http://www.strong.net">http://www.strong.net</a></strong>' => TRUE,
+        '<em><a href="http://www.emphasis.info">www.emphasis.info</a></em>' => TRUE,
+      ),
+      '
+Test <code>using www.example.com the code tag</code>.
+' => array(
+        'href' => FALSE,
+        'http' => FALSE,
+      ),
+      '
+Intro.
+<blockquote>
+Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>.
+</blockquote>
+
+Outro.
+' => array(
+        'href="http://www.example.com"' => TRUE,
+        'href="mailto:person@example.com"' => TRUE,
+        'href="http://origin.example.com"' => TRUE,
+        'http://www.usage.example.com' => FALSE,
+        'http://www.example.info' => FALSE,
+        'Intro.' => TRUE,
+        'Outro.' => TRUE,
+      ),
+      '
+Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh>
+' => array(
+        'href="http://www.example.com"' => TRUE,
+        'href="http://www.example.pooh"' => TRUE,
+      ),
+      '
+<p>Test &lt;br/&gt;: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/>
+ It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br>
+HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
+' => array(
+        'href="http://www.example17.com"' => TRUE,
+        'href="http://www.example18.com"' => TRUE,
+        'href="http://www.example19.com"' => TRUE,
+        'href="http://www.example20.com"' => TRUE,
+        'href="http://www.example21.com"' => TRUE,
+        'href="mailto:person@example22.com"' => TRUE,
+        'href="http://www.example23.com"' => TRUE,
+        'href="http://www.example24.com"' => TRUE,
+        'href="http://www.example25.com"' => TRUE,
+        'href="http://www.example26.com"' => TRUE,
+        'href="mailto:person@example27.com"' => TRUE,
+        'href="http://www.example28.com"' => TRUE,
+      ),
+      '
+<script>
+<!--
+  // @see www.example.com
+  var exampleurl = "http://example.net";
+-->
+<!--//--><![CDATA[//><!--
+  // @see www.example.com
+  var exampleurl = "http://example.net";
+//--><!]]>
+</script>
+' => array(
+        'href="http://www.example.com"' => FALSE,
+        'href="http://example.net"' => FALSE,
+      ),
+      '
+<style>body {
+  background: url(http://example.com/pixel.gif);
+}</style>
+' => array(
+        'href' => FALSE,
+      ),
+      '
+<!-- Skip any URLs like www.example.com in comments -->
+' => array(
+        'href' => FALSE,
+      ),
+      '
+<!-- Skip any URLs like
+www.example.com with a newline in comments -->
+' => array(
+        'href' => FALSE,
+      ),
+      '
+<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->
+' => array(
+        'href' => FALSE,
+      ),
+      '
+<dl>
+<dt>www.example.com</dt>
+<dd>http://example.com</dd>
+<dd>person@example.com</dd>
+<dt>Check www.example.net</dt>
+<dd>Some text around http://www.example.info by person@example.info?</dd>
+</dl>
+' => array(
+        'href="http://www.example.com"' => TRUE,
+        'href="http://example.com"' => TRUE,
+        'href="mailto:person@example.com"' => TRUE,
+        'href="http://www.example.net"' => TRUE,
+        'href="http://www.example.info"' => TRUE,
+        'href="mailto:person@example.info"' => TRUE,
+      ),
+      '
+<div>www.div.com</div>
+<ul>
+<li>http://listitem.com</li>
+<li class="odd">www.class.listitem.com</li>
+</ul>
+' => array(
+        '<div><a href="http://www.div.com">www.div.com</a></div>' => TRUE,
+        '<li><a href="http://listitem.com">http://listitem.com</a></li>' => TRUE,
+        '<li class="odd"><a href="http://www.class.listitem.com">www.class.listitem.com</a></li>' => TRUE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+
+    // URL trimming.
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'filter_url_length' => 20,
+      )
+    ));
+    $tests = array(
+      'www.trimmed.com/d/ff.ext?a=1&b=2#a1' => array(
+        '<a href="http://www.trimmed.com/d/ff.ext?a=1&amp;b=2#a1">www.trimmed.com/d/f…</a>' => TRUE,
+      ),
+    );
+    $this->assertFilteredString($filter, $tests);
+  }
+
+  /**
+   * Asserts multiple filter output expectations for multiple input strings.
+   *
+   * @param FilterInterface $filter
+   *   A input filter object.
+   * @param array $tests
+   *   An associative array, whereas each key is an arbitrary input string and
+   *   each value is again an associative array whose keys are filter output
+   *   strings and whose values are Booleans indicating whether the output is
+   *   expected or not.
+   *
+   * For example:
+   * @code
+   * $tests = array(
+   *   'Input string' => array(
+   *     '<p>Input string</p>' => TRUE,
+   *     'Input string<br' => FALSE,
+   *   ),
+   * );
+   * @endcode
+   */
+  function assertFilteredString($filter, $tests) {
+    foreach ($tests as $source => $tasks) {
+      $result = $filter->process($source, $filter)->getProcessedText();
+      foreach ($tasks as $value => $is_expected) {
+        // Not using assertIdentical, since combination with strpos() is hard to grok.
+        if ($is_expected) {
+          $success = $this->assertTrue(strpos($result, $value) !== FALSE, format_string('@source: @value found. Filtered result: @result.', array(
+            '@source' => var_export($source, TRUE),
+            '@value' => var_export($value, TRUE),
+            '@result' => var_export($result, TRUE),
+          )));
+        }
+        else {
+          $success = $this->assertTrue(strpos($result, $value) === FALSE, format_string('@source: @value not found. Filtered result: @result.', array(
+            '@source' => var_export($source, TRUE),
+            '@value' => var_export($value, TRUE),
+            '@result' => var_export($result, TRUE),
+          )));
+        }
+        if (!$success) {
+          $this->verbose('Source:<pre>' . Html::escape(var_export($source, TRUE)) . '</pre>'
+            . '<hr />' . 'Result:<pre>' . Html::escape(var_export($result, TRUE)) . '</pre>'
+            . '<hr />' . ($is_expected ? 'Expected:' : 'Not expected:')
+            . '<pre>' . Html::escape(var_export($value, TRUE)) . '</pre>'
+          );
+        }
+      }
+    }
+  }
+
+  /**
+   * Tests URL filter on longer content.
+   *
+   * Filters based on regular expressions should also be tested with a more
+   * complex content than just isolated test lines.
+   * The most common errors are:
+   * - accidental '*' (greedy) match instead of '*?' (minimal) match.
+   * - only matching first occurrence instead of all.
+   * - newlines not matching '.*'.
+   *
+   * This test covers:
+   * - Document with multiple newlines and paragraphs (two newlines).
+   * - Mix of several HTML tags, invalid non-HTML tags, tags to ignore and HTML
+   *   comments.
+   * - Empty HTML tags (BR, IMG).
+   * - Mix of absolute and partial URLs, and email addresses in one content.
+   */
+  function testUrlFilterContent() {
+    // Get FilterUrl object.
+    $filter = $this->filters['filter_url'];
+    $filter->setConfiguration(array(
+      'settings' => array(
+        'filter_url_length' => 496,
+      )
+    ));
+    $path = __DIR__ . '/../..';
+
+    $input = file_get_contents($path . '/filter.url-input.txt');
+    $expected = file_get_contents($path . '/filter.url-output.txt');
+    $result = _filter_url($input, $filter);
+    $this->assertIdentical($result, $expected, 'Complex HTML document was correctly processed.');
+  }
+
+  /**
+   * Tests the HTML corrector filter.
+   *
+   * @todo This test could really use some validity checking function.
+   */
+  function testHtmlCorrectorFilter() {
+    // Tag closing.
+    $f = Html::normalize('<p>text');
+    $this->assertEqual($f, '<p>text</p>', 'HTML corrector -- tag closing at the end of input.');
+
+    $f = Html::normalize('<p>text<p><p>text');
+    $this->assertEqual($f, '<p>text</p><p></p><p>text</p>', 'HTML corrector -- tag closing.');
+
+    $f = Html::normalize("<ul><li>e1<li>e2");
+    $this->assertEqual($f, "<ul><li>e1</li><li>e2</li></ul>", 'HTML corrector -- unclosed list tags.');
+
+    $f = Html::normalize('<div id="d">content');
+    $this->assertEqual($f, '<div id="d">content</div>', 'HTML corrector -- unclosed tag with attribute.');
+
+    // XHTML slash for empty elements.
+    $f = Html::normalize('<hr><br>');
+    $this->assertEqual($f, '<hr /><br />', 'HTML corrector -- XHTML closing slash.');
+
+    $f = Html::normalize('<P>test</P>');
+    $this->assertEqual($f, '<p>test</p>', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
+
+    $f = Html::normalize('<P>test</p>');
+    $this->assertEqual($f, '<p>test</p>', 'HTML corrector -- Convert uppercased tags to proper lowercased ones.');
+
+    $f = Html::normalize('test<hr />');
+    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through.');
+
+    $f = Html::normalize('test<hr/>');
+    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through, but ensure there is a single space before the closing slash.');
+
+    $f = Html::normalize('test<hr    />');
+    $this->assertEqual($f, 'test<hr />', 'HTML corrector -- Let proper XHTML pass through, but ensure there are not too many spaces before the closing slash.');
+
+    $f = Html::normalize('<span class="test" />');
+    $this->assertEqual($f, '<span class="test"></span>', 'HTML corrector -- Convert XHTML that is properly formed but that would not be compatible with typical HTML user agents.');
+
+    $f = Html::normalize('test1<br class="test">test2');
+    $this->assertEqual($f, 'test1<br class="test" />test2', 'HTML corrector -- Automatically close single tags.');
+
+    $f = Html::normalize('line1<hr>line2');
+    $this->assertEqual($f, 'line1<hr />line2', 'HTML corrector -- Automatically close single tags.');
+
+    $f = Html::normalize('line1<HR>line2');
+    $this->assertEqual($f, 'line1<hr />line2', 'HTML corrector -- Automatically close single tags.');
+
+    $f = Html::normalize('<img src="http://example.com/test.jpg">test</img>');
+    $this->assertEqual($f, '<img src="http://example.com/test.jpg" />test', 'HTML corrector -- Automatically close single tags.');
+
+    $f = Html::normalize('<br></br>');
+    $this->assertEqual($f, '<br />', "HTML corrector -- Transform empty tags to a single closed tag if the tag's content model is EMPTY.");
+
+    $f = Html::normalize('<div></div>');
+    $this->assertEqual($f, '<div></div>', "HTML corrector -- Do not transform empty tags to a single closed tag if the tag's content model is not EMPTY.");
+
+    $f = Html::normalize('<p>line1<br/><hr/>line2</p>');
+    $this->assertEqual($f, '<p>line1<br /></p><hr />line2', 'HTML corrector -- Move non-inline elements outside of inline containers.');
+
+    $f = Html::normalize('<p>line1<div>line2</div></p>');
+    $this->assertEqual($f, '<p>line1</p><div>line2</div>', 'HTML corrector -- Move non-inline elements outside of inline containers.');
+
+    $f = Html::normalize('<p>test<p>test</p>\n');
+    $this->assertEqual($f, '<p>test</p><p>test</p>\n', 'HTML corrector -- Auto-close improperly nested tags.');
+
+    $f = Html::normalize('<p>Line1<br><STRONG>bold stuff</b>');
+    $this->assertEqual($f, '<p>Line1<br /><strong>bold stuff</strong></p>', 'HTML corrector -- Properly close unclosed tags, and remove useless closing tags.');
+
+    $f = Html::normalize('test <!-- this is a comment -->');
+    $this->assertEqual($f, 'test <!-- this is a comment -->', 'HTML corrector -- Do not touch HTML comments.');
+
+    $f = Html::normalize('test <!--this is a comment-->');
+    $this->assertEqual($f, 'test <!--this is a comment-->', 'HTML corrector -- Do not touch HTML comments.');
+
+    $f = Html::normalize('test <!-- comment <p>another
+    <strong>multiple</strong> line
+    comment</p> -->');
+    $this->assertEqual($f, 'test <!-- comment <p>another
+    <strong>multiple</strong> line
+    comment</p> -->', 'HTML corrector -- Do not touch HTML comments.');
+
+    $f = Html::normalize('test <!-- comment <p>another comment</p> -->');
+    $this->assertEqual($f, 'test <!-- comment <p>another comment</p> -->', 'HTML corrector -- Do not touch HTML comments.');
+
+    $f = Html::normalize('test <!--break-->');
+    $this->assertEqual($f, 'test <!--break-->', 'HTML corrector -- Do not touch HTML comments.');
+
+    $f = Html::normalize('<p>test\n</p>\n');
+    $this->assertEqual($f, '<p>test\n</p>\n', 'HTML corrector -- New-lines are accepted and kept as-is.');
+
+    $f = Html::normalize('<p>دروبال');
+    $this->assertEqual($f, '<p>دروبال</p>', 'HTML corrector -- Encoding is correctly kept.');
+
+    $f = Html::normalize('<script>alert("test")</script>');
+    $this->assertEqual($f, '<script>
+<!--//--><![CDATA[// ><!--
+alert("test")
+//--><!]]>
+</script>', 'HTML corrector -- CDATA added to script element');
+
+    $f = Html::normalize('<p><script>alert("test")</script></p>');
+    $this->assertEqual($f, '<p><script>
+<!--//--><![CDATA[// ><!--
+alert("test")
+//--><!]]>
+</script></p>', 'HTML corrector -- CDATA added to a nested script element');
+
+    $f = Html::normalize('<p><style> /* Styling */ body {color:red}</style></p>');
+    $this->assertEqual($f, '<p><style>
+<!--/*--><![CDATA[/* ><!--*/
+ /* Styling */ body {color:red}
+/*--><!]]>*/
+</style></p>', 'HTML corrector -- CDATA added to a style element.');
+
+    $filtered_data = Html::normalize('<p><style>
+/*<![CDATA[*/
+/* Styling */
+body {color:red}
+/*]]>*/
+</style></p>');
+    $this->assertEqual($filtered_data, '<p><style>
+<!--/*--><![CDATA[/* ><!--*/
+
+/*<![CDATA[*/
+/* Styling */
+body {color:red}
+/*]]]]><![CDATA[>*/
+
+/*--><!]]>*/
+</style></p>',
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '/*<![CDATA[*/'))
+    );
+
+    $filtered_data = Html::normalize('<p><style>
+  <!--/*--><![CDATA[/* ><!--*/
+  /* Styling */
+  body {color:red}
+  /*--><!]]>*/
+</style></p>');
+    $this->assertEqual($filtered_data, '<p><style>
+<!--/*--><![CDATA[/* ><!--*/
+
+  <!--/*--><![CDATA[/* ><!--*/
+  /* Styling */
+  body {color:red}
+  /*--><!]]]]><![CDATA[>*/
+
+/*--><!]]>*/
+</style></p>',
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--/*--><![CDATA[/* ><!--*/'))
+    );
+
+    $filtered_data = Html::normalize('<p><script>
+<!--//--><![CDATA[// ><!--
+  alert("test");
+//--><!]]>
+</script></p>');
+    $this->assertEqual($filtered_data, '<p><script>
+<!--//--><![CDATA[// ><!--
+
+<!--//--><![CDATA[// ><!--
+  alert("test");
+//--><!]]]]><![CDATA[>
+
+//--><!]]>
+</script></p>',
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '<!--//--><![CDATA[// ><!--'))
+    );
+
+    $filtered_data = Html::normalize('<p><script>
+// <![CDATA[
+  alert("test");
+// ]]>
+</script></p>');
+    $this->assertEqual($filtered_data, '<p><script>
+<!--//--><![CDATA[// ><!--
+
+// <![CDATA[
+  alert("test");
+// ]]]]><![CDATA[>
+
+//--><!]]>
+</script></p>',
+      format_string('HTML corrector -- Existing cdata section @pattern_name properly escaped', array('@pattern_name' => '// <![CDATA['))
+    );
+
+  }
+
+  /**
+   * Asserts that a text transformed to lowercase with HTML entities decoded does contains a given string.
+   *
+   * Otherwise fails the test with a given message, similar to all the
+   * SimpleTest assert* functions.
+   *
+   * Note that this does not remove nulls, new lines and other characters that
+   * could be used to obscure a tag or an attribute name.
+   *
+   * @param string $haystack
+   *   Text to look in.
+   * @param string $needle
+   *   Lowercase, plain text to look for.
+   * @param string $message
+   *   (optional) Message to display if failed. Defaults to an empty string.
+   * @param string $group
+   *   (optional) The group this message belongs to. Defaults to 'Other'.
+   *
+   * @return bool
+   *   TRUE on pass, FALSE on fail.
+   */
+  function assertNormalized($haystack, $needle, $message = '', $group = 'Other') {
+    return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) !== FALSE, $message, $group);
+  }
+
+  /**
+   * Asserts that text transformed to lowercase with HTML entities decoded does not contain a given string.
+   *
+   * Otherwise fails the test with a given message, similar to all the
+   * SimpleTest assert* functions.
+   *
+   * Note that this does not remove nulls, new lines, and other character that
+   * could be used to obscure a tag or an attribute name.
+   *
+   * @param string $haystack
+   *   Text to look in.
+   * @param string $needle
+   *   Lowercase, plain text to look for.
+   * @param string $message
+   *   (optional) Message to display if failed. Defaults to an empty string.
+   * @param string $group
+   *   (optional) The group this message belongs to. Defaults to 'Other'.
+   *
+   * @return bool
+   *   TRUE on pass, FALSE on fail.
+   */
+  function assertNoNormalized($haystack, $needle, $message = '', $group = 'Other') {
+    return $this->assertTrue(strpos(strtolower(Html::decodeEntities($haystack)), $needle) === FALSE, $message, $group);
+  }
+}
diff --git a/core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php b/core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php
new file mode 100644
index 0000000..d4e5cd3
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/Migrate/d6/MigrateFilterFormatTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\Migrate\d6\MigrateFilterFormatTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel\Migrate\d6;
+
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to filter.formats.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_filter_format');
+  }
+
+  /**
+   * Tests the Drupal 6 filter format to Drupal 8 migration.
+   */
+  public function testFilterFormat() {
+    $filter_format = FilterFormat::load('filtered_html');
+
+    // Check filter status.
+    $filters = $filter_format->get('filters');
+    $this->assertTrue($filters['filter_autop']['status']);
+    $this->assertTrue($filters['filter_url']['status']);
+    $this->assertTrue($filters['filter_htmlcorrector']['status']);
+    $this->assertTrue($filters['filter_html']['status']);
+
+    // These should be false by default.
+    $this->assertFalse(isset($filters['filter_html_escape']));
+    $this->assertFalse(isset($filters['filter_caption']));
+    $this->assertFalse(isset($filters['filter_html_image_secure']));
+
+    // Check variables migrated into filter.
+    $this->assertIdentical('<a href hreflang> <em> <strong> <cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd>', $filters['filter_html']['settings']['allowed_html']);
+    $this->assertIdentical(TRUE, $filters['filter_html']['settings']['filter_html_help']);
+    $this->assertIdentical(FALSE, $filters['filter_html']['settings']['filter_html_nofollow']);
+    $this->assertIdentical(72, $filters['filter_url']['settings']['filter_url_length']);
+
+    // Check that the PHP code filter is converted to filter_null.
+    $filters = FilterFormat::load('php_code')->get('filters');
+    $this->assertTrue(isset($filters['filter_null']));
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
new file mode 100644
index 0000000..4bbacdb
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/Migrate/d7/MigrateFilterFormatTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\Migrate\d7\MigrateFilterFormatTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel\Migrate\d7;
+
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\filter\FilterFormatInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to filter.formats.*.yml.
+ *
+ * @group filter
+ */
+class MigrateFilterFormatTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  static $modules = array('filter');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_filter_format');
+  }
+
+  /**
+   * Asserts various aspects of a filter format entity.
+   *
+   * @param string $id
+   *   The format ID.
+   * @param string $label
+   *   The expected label of the format.
+   * @param array $enabled_filters
+   *   The expected filters in the format, keyed by ID.
+   */
+  protected function assertEntity($id, $label, array $enabled_filters) {
+    /** @var \Drupal\filter\FilterFormatInterface $entity */
+    $entity = FilterFormat::load($id);
+    $this->assertTrue($entity instanceof FilterFormatInterface);
+    $this->assertIdentical($label, $entity->label());
+    // get('filters') will return enabled filters only, not all of them.
+    $this->assertIdentical($enabled_filters, array_keys($entity->get('filters')));
+  }
+
+  /**
+   * Tests the Drupal 7 filter format to Drupal 8 migration.
+   */
+  public function testFilterFormat() {
+    $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop', 'filter_html']);
+    $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop', 'filter_html', 'filter_htmlcorrector', 'filter_url']);
+    $this->assertEntity('full_html', 'Full HTML', ['filter_autop', 'filter_htmlcorrector', 'filter_url']);
+    $this->assertEntity('plain_text', 'Plain text', ['filter_html_escape', 'filter_url', 'filter_autop']);
+    // This assertion covers issue #2555089. Drupal 7 formats are identified
+    // by machine names, so migrated formats should be merged into existing
+    // ones.
+    $this->assertNull(FilterFormat::load('plain_text1'));
+
+    // Ensure that filter-specific settings were migrated.
+    /** @var \Drupal\filter\FilterFormatInterface $format */
+    $format = FilterFormat::load('filtered_html');
+    $config = $format->filters('filter_html')->getConfiguration();
+    $this->assertIdentical('<div> <span> <ul type> <li> <ol start type> <a href hreflang> <img src alt height width>', $config['settings']['allowed_html']);
+    $config = $format->filters('filter_url')->getConfiguration();
+    $this->assertIdentical(128, $config['settings']['filter_url_length']);
+
+    // The php_code format gets migrated, but the php_code filter is changed to
+    // filter_null.
+    $filters = FilterFormat::load('php_code')->get('filters');
+    $this->assertTrue(isset($filters['filter_null']));
+  }
+
+}
diff --git a/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php b/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php
new file mode 100644
index 0000000..1481d53
--- /dev/null
+++ b/core/modules/filter/tests/src/Kernel/TextFormatElementFormTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\filter\Kernel\TextFormatElementFormTest.
+ */
+
+namespace Drupal\Tests\filter\Kernel;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\filter\Entity\FilterFormat;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests PathElement validation and conversion functionality.
+ *
+ * @group Form
+ */
+class TextFormatElementFormTest extends KernelTestBase implements FormInterface {
+
+  /**
+   * User for testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $testUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'user', 'filter', 'filter_test', 'editor'];
+
+  /**
+   * Sets up the test.
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installSchema('system', ['sequences']);
+    $this->installConfig(['filter', 'filter_test']);
+    // Filter tips link to the full-page.
+    \Drupal::service('router.builder')->rebuild();
+    /* @var \Drupal\Core\Render\ElementInfoManager $manager */
+    $manager = \Drupal::service('plugin.manager.element_info');
+    $manager->clearCachedDefinitions();
+    $manager->getDefinitions();
+    /* @var \Drupal\filter\FilterFormatInterface $filter_test_format */
+    $filter_test_format = FilterFormat::load('filter_test');
+
+    /* @var \Drupal\user\RoleInterface $role */
+    $role = Role::create([
+      'id' => 'admin',
+      'label' => 'admin',
+    ]);
+    $role->grantPermission($filter_test_format->getPermissionName());
+    $role->save();
+    $this->testUser = User::create([
+      'name' => 'foobar',
+      'mail' => 'foobar@example.com',
+    ]);
+    $this->testUser->addRole($role->id());
+    $this->testUser->save();
+    \Drupal::service('current_user')->setAccount($this->testUser);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'test_text_area_element';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    // A textformat field.
+    $form['textformat'] = [
+      '#type' => 'text_format',
+      '#required' => TRUE,
+      '#title' => 'Text',
+      '#base_type' => 'textfield',
+      '#format' => NULL,
+      '#default_value' => 'test value',
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {}
+
+  /**
+   * Form validation handler.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {}
+
+  /**
+   * Tests that values are returned.
+   */
+  public function testTextFormatElement() {
+    /* @var \Drupal\Core\Form\FormBuilder $form_builder */
+    $form_builder = $this->container->get('form_builder');
+    $form = $form_builder->getForm($this);
+    $output = $this->render($form);
+    $this->setRawContent($output);
+    $this->assertFieldByName('textformat[value]');
+    $this->assertRaw('<h4>Full HTML</h4>');
+    $this->assertRaw('<h4>Filtered HTML</h4>');
+    $this->assertRaw('<h4>Test format</h4>');
+    $this->assertNoPattern('|<h4[^>]*></h4>|', 'No empty H4 element found.');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getUrl() {
+    // \Drupal\simpletest\AssertContentTrait needs this for ::assertFieldByName
+    // to work.
+    return 'Internal rendering';
+  }
+
+}
diff --git a/core/modules/forum/src/ForumIndexStorageInterface.php b/core/modules/forum/src/ForumIndexStorageInterface.php
index 4d59fb3..1a4ce18 100644
--- a/core/modules/forum/src/ForumIndexStorageInterface.php
+++ b/core/modules/forum/src/ForumIndexStorageInterface.php
@@ -3,6 +3,7 @@
  * @file
  * Contains \Drupal\forum\ForumIndexStorageInterface.
  */
+
 namespace Drupal\forum;
 
 use Drupal\node\NodeInterface;
diff --git a/core/modules/forum/src/Tests/ForumBlockTest.php b/core/modules/forum/src/Tests/ForumBlockTest.php
index f505bdf..c0003d9 100644
--- a/core/modules/forum/src/Tests/ForumBlockTest.php
+++ b/core/modules/forum/src/Tests/ForumBlockTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\simpletest\WebTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests the forum blocks.
@@ -97,7 +98,7 @@ public function testActiveForumTopicsBlock() {
       // Get the node from the topic title.
       $node = $this->drupalGetNodeByTitle($topics[$index]);
       $date->modify('+1 minute');
-      $comment = entity_create('comment', array(
+      $comment = Comment::create(array(
         'entity_id' => $node->id(),
         'field_name' => 'comment_forum',
         'entity_type' => 'node',
diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index c81828e..dba9134 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -339,13 +339,13 @@ private function doAdminTests($user) {
     // Create a default vocabulary named "Tags".
     $description = 'Use tags to group articles on similar topics into categories.';
     $help = 'Enter a comma-separated list of words to describe your content.';
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Tags',
       'description' => $description,
       'vid' => 'tags',
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'help' => $help,
-    ));
+    ]);
     $vocabulary->save();
     // Test tags vocabulary form is not affected.
     $this->drupalGet('admin/structure/taxonomy/manage/tags');
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php
index 1a252d1..fb8e114 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/src/Tests/ForumUninstallTest.php
@@ -11,6 +11,8 @@
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Entity\Comment;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests forum module uninstallation.
@@ -36,14 +38,14 @@ public function testForumUninstallWithField() {
     $this->assertNotNull($field_storage, 'The taxonomy_forums field storage exists.');
 
     // Create a taxonomy term.
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => t('A term'),
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
       'description' => '',
       'parent' => array(0),
       'vid' => 'forums',
       'forum_container' => 0,
-    ));
+    ]);
     $term->save();
 
     // Create a forum node.
@@ -54,7 +56,7 @@ public function testForumUninstallWithField() {
     ));
 
     // Create at least one comment against the forum node.
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'entity_id' => $node->nid->value,
       'entity_type' => 'node',
       'field_name' => 'comment_forum',
diff --git a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
deleted file mode 100644
index 42e797d..0000000
--- a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\forum\Tests\Migrate\d6\MigrateForumConfigsTest.
- */
-
-namespace Drupal\forum\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to forum.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('comment', 'forum', 'taxonomy');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_taxonomy_vocabulary');
-    $this->executeMigration('d6_forum_settings');
-  }
-
-  /**
-   * Tests migration of forum variables to forum.settings.yml.
-   */
-  public function testForumSettings() {
-    $config = $this->config('forum.settings');
-    $this->assertIdentical(15, $config->get('topics.hot_threshold'));
-    $this->assertIdentical(25, $config->get('topics.page_limit'));
-    $this->assertIdentical(1, $config->get('topics.order'));
-    $this->assertIdentical('vocabulary_1_i_0_', $config->get('vocabulary'));
-    // This is 'forum_block_num_0' in D6, but block:active:limit' in D8.
-    $this->assertIdentical(5, $config->get('block.active.limit'));
-    // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8.
-    $this->assertIdentical(5, $config->get('block.new.limit'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'forum.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
deleted file mode 100644
index f702b9a..0000000
--- a/core/modules/forum/src/Tests/Migrate/d7/MigrateForumSettingsTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\forum\Tests\Migrate\d7\MigrateForumSettingsTest.
- */
-
-namespace Drupal\forum\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Forum's variables to configuration.
- *
- * @group forum
- */
-class MigrateForumSettingsTest extends MigrateDrupal7TestBase {
-
-  // Don't alphabetize these. They're in dependency order.
-  public static $modules = [
-    'comment',
-    'field',
-    'filter',
-    'text',
-    'node',
-    'taxonomy',
-    'forum',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_taxonomy_vocabulary');
-    $this->executeMigration('d7_forum_settings');
-  }
-
-  /**
-   * Tests the migration of Forum's settings to configuration.
-   */
-  public function testForumSettingsMigration() {
-    $config = $this->config('forum.settings');
-    $this->assertIdentical(9, $config->get('block.active.limit'));
-    $this->assertIdentical(4, $config->get('block.new.limit'));
-    $this->assertIdentical(10, $config->get('topics.hot_threshold'));
-    $this->assertIdentical(25, $config->get('topics.page_limit'));
-    $this->assertIdentical(1, $config->get('topics.order'));
-    $this->assertIdentical('forums', $config->get('vocabulary'));
-  }
-
-}
diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
new file mode 100644
index 0000000..dcbd5f7
--- /dev/null
+++ b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\forum\Kernel\Migrate\d6\MigrateForumConfigsTest.
+ */
+
+namespace Drupal\Tests\forum\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to forum.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateForumConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('comment', 'forum', 'taxonomy');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_taxonomy_vocabulary');
+    $this->executeMigration('d6_forum_settings');
+  }
+
+  /**
+   * Tests migration of forum variables to forum.settings.yml.
+   */
+  public function testForumSettings() {
+    $config = $this->config('forum.settings');
+    $this->assertIdentical(15, $config->get('topics.hot_threshold'));
+    $this->assertIdentical(25, $config->get('topics.page_limit'));
+    $this->assertIdentical(1, $config->get('topics.order'));
+    $this->assertIdentical('vocabulary_1_i_0_', $config->get('vocabulary'));
+    // This is 'forum_block_num_0' in D6, but block:active:limit' in D8.
+    $this->assertIdentical(5, $config->get('block.active.limit'));
+    // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8.
+    $this->assertIdentical(5, $config->get('block.new.limit'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'forum.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php
new file mode 100644
index 0000000..6305da3
--- /dev/null
+++ b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\forum\Kernel\Migrate\d7\MigrateForumSettingsTest.
+ */
+
+namespace Drupal\Tests\forum\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Forum's variables to configuration.
+ *
+ * @group forum
+ */
+class MigrateForumSettingsTest extends MigrateDrupal7TestBase {
+
+  // Don't alphabetize these. They're in dependency order.
+  public static $modules = [
+    'comment',
+    'field',
+    'filter',
+    'text',
+    'node',
+    'taxonomy',
+    'forum',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_taxonomy_vocabulary');
+    $this->executeMigration('d7_forum_settings');
+  }
+
+  /**
+   * Tests the migration of Forum's settings to configuration.
+   */
+  public function testForumSettingsMigration() {
+    $config = $this->config('forum.settings');
+    $this->assertIdentical(9, $config->get('block.active.limit'));
+    $this->assertIdentical(4, $config->get('block.new.limit'));
+    $this->assertIdentical(10, $config->get('topics.hot_threshold'));
+    $this->assertIdentical(25, $config->get('topics.page_limit'));
+    $this->assertIdentical(1, $config->get('topics.order'));
+    $this->assertIdentical('forums', $config->get('vocabulary'));
+  }
+
+}
diff --git a/core/modules/hal/hal.module b/core/modules/hal/hal.module
index 90696d4..eaf06c1 100644
--- a/core/modules/hal/hal.module
+++ b/core/modules/hal/hal.module
@@ -16,7 +16,7 @@ function hal_help($route_name, RouteMatchInterface $route_match) {
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('<a href=":hal_spec">Hypertext Application Language (HAL)</a> is a format that supports the linking required for hypermedia APIs.', array(':hal_spec' => 'http://stateless.co/hal_specification.html')) . '</p>';
-      $output .= '<p>' . t('Hypermedia APIs are a style of Web API that uses URIs to identify resources and the <a href=":link_rel">link relations</a> between them, enabling API consumers to follow links to discover API functionality.', array(':link_rel' => 'http://en.wikipedia.org/wiki/Link_relation')) . '</p>';
+      $output .= '<p>' . t('Hypermedia APIs are a style of Web API that uses URIs to identify resources and the <a href="http://wikipedia.org/wiki/Link_relation">link relations</a> between them, enabling API consumers to follow links to discover API functionality.') . '</p>';
       $output .= '<p>' . t('This module adds support for serializing entities (such as content items, taxonomy terms, etc.) to the JSON version of HAL. For more information, see the <a href=":hal_do">online documentation for the HAL module</a>.', array(':hal_do' => 'https://www.drupal.org/documentation/modules/hal')) . '</p>';
       return $output;
   }
diff --git a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
index e7a0388..5f9affc 100644
--- a/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
+++ b/core/modules/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -83,7 +83,6 @@ public function normalize($entity, $format = NULL, array $context = array()) {
     );
 
     // If the fields to use were specified, only output those field values.
-    // Otherwise, output all field values except internal ID.
     if (isset($context['included_fields'])) {
       $fields = array();
       foreach ($context['included_fields'] as $field_name) {
@@ -93,12 +92,9 @@ public function normalize($entity, $format = NULL, array $context = array()) {
     else {
       $fields = $entity->getFields();
     }
-    // Ignore the entity ID and revision ID.
-    $exclude = array($entity->getEntityType()->getKey('id'), $entity->getEntityType()->getKey('revision'));
     foreach ($fields as $field) {
-      // Continue if this is an excluded field or the current user does not have
-      // access to view it.
-      if (in_array($field->getFieldDefinition()->getName(), $exclude) || !$field->access('view', $context['account'])) {
+      // Continue if the current user does not have access to view this field.
+      if (!$field->access('view', $context['account'])) {
         continue;
       }
 
diff --git a/core/modules/hal/src/Tests/DenormalizeTest.php b/core/modules/hal/src/Tests/DenormalizeTest.php
deleted file mode 100644
index d376ae5..0000000
--- a/core/modules/hal/src/Tests/DenormalizeTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Tests\DenormalizeTest.
- */
-
-namespace Drupal\hal\Tests;
-
-use Drupal\Core\Url;
-use Drupal\field\Entity\FieldConfig;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Tests that entities can be denormalized from HAL.
- *
- * @group hal
- */
-class DenormalizeTest extends NormalizerTestBase {
-
-  /**
-   * Tests that the type link relation in incoming data is handled correctly.
-   */
-  public function testTypeHandling() {
-    // Valid type.
-    $data_with_valid_type = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
-    $denormalized = $this->serializer->denormalize($data_with_valid_type, $this->entityClass, $this->format);
-    $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with valid type results in creation of correct bundle.');
-
-    // Multiple types.
-    $data_with_multiple_types = array(
-      '_links' => array(
-        'type' => array(
-          array(
-            'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
-          ),
-          array(
-            'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-          ),
-        ),
-      ),
-    );
-    $denormalized = $this->serializer->denormalize($data_with_multiple_types, $this->entityClass, $this->format);
-    $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with multiple types results in creation of correct bundle.');
-
-    // Invalid type.
-    $data_with_invalid_type = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
-    try {
-      $this->serializer->denormalize($data_with_invalid_type, $this->entityClass, $this->format);
-      $this->fail('Exception should be thrown when type is invalid.');
-    }
-    catch (UnexpectedValueException $e) {
-      $this->pass('Exception thrown when type is invalid.');
-    }
-
-    // No type.
-    $data_with_no_type = array(
-      '_links' => array(
-      ),
-    );
-    try {
-      $this->serializer->denormalize($data_with_no_type, $this->entityClass, $this->format);
-      $this->fail('Exception should be thrown when no type is provided.');
-    }
-    catch (UnexpectedValueException $e) {
-      $this->pass('Exception thrown when no type is provided.');
-    }
-  }
-
-  /**
-   * Test that a field set to an empty array is different than an absent field.
-   */
-  public function testMarkFieldForDeletion() {
-    // Add a default value for a field.
-    $field = FieldConfig::loadByName('entity_test', 'entity_test', 'field_test_text');
-    $field->setDefaultValue(array(array('value' => 'Llama')));
-    $field->save();
-
-    // Denormalize data that contains no entry for the field, and check that
-    // the default value is present in the resulting entity.
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-    );
-    $entity = $this->serializer->denormalize($data, $this->entityClass, $this->format);
-    $this->assertEqual($entity->field_test_text->count(), 1);
-    $this->assertEqual($entity->field_test_text->value, 'Llama');
-
-    // Denormalize data that contains an empty entry for the field, and check
-    // that the field is empty in the resulting entity.
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-      'field_test_text' => array(),
-    );
-    $entity = $this->serializer->denormalize($data, get_class($entity), $this->format, [ 'target_instance' => $entity ]);
-    $this->assertEqual($entity->field_test_text->count(), 0);
-  }
-
-  /**
-   * Test that non-reference fields can be denormalized.
-   */
-  public function testBasicFieldDenormalization() {
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-      'uuid' => array(
-        array(
-          'value' => 'e5c9fb96-3acf-4a8d-9417-23de1b6c3311',
-        ),
-      ),
-      'field_test_text' => array(
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'full_html',
-        ),
-      ),
-      'field_test_translatable_text' => array(
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'full_html',
-        ),
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'filtered_html',
-        ),
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'filtered_html',
-          'lang' => 'de',
-        ),
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'full_html',
-          'lang' => 'de',
-        ),
-      ),
-    );
-
-    $expected_value_default = array(
-      array (
-        'value' => $data['field_test_translatable_text'][0]['value'],
-        'format' => 'full_html',
-      ),
-      array (
-        'value' => $data['field_test_translatable_text'][1]['value'],
-        'format' => 'filtered_html',
-      ),
-    );
-    $expected_value_de = array(
-      array (
-        'value' => $data['field_test_translatable_text'][2]['value'],
-        'format' => 'filtered_html',
-      ),
-      array (
-        'value' => $data['field_test_translatable_text'][3]['value'],
-        'format' => 'full_html',
-      ),
-    );
-    $denormalized = $this->serializer->denormalize($data, $this->entityClass, $this->format);
-    $this->assertEqual($data['uuid'], $denormalized->get('uuid')->getValue(), 'A preset value (e.g. UUID) is overridden by incoming data.');
-    $this->assertEqual($data['field_test_text'], $denormalized->get('field_test_text')->getValue(), 'A basic text field is denormalized.');
-    $this->assertEqual($expected_value_default, $denormalized->get('field_test_translatable_text')->getValue(), 'Values in the default language are properly handled for a translatable field.');
-    $this->assertEqual($expected_value_de, $denormalized->getTranslation('de')->get('field_test_translatable_text')->getValue(), 'Values in a translation language are properly handled for a translatable field.');
-  }
-
-  /**
-   * Verifies that the denormalized entity is correct in the PATCH context.
-   */
-  public function testPatchDenormalization() {
-    $data = array(
-      '_links' => array(
-        'type' => array(
-          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
-        ),
-      ),
-      'field_test_text' => array(
-        array(
-          'value' => $this->randomMachineName(),
-          'format' => 'full_html',
-        ),
-      ),
-    );
-    $denormalized = $this->serializer->denormalize($data, $this->entityClass, $this->format, array('request_method' => 'patch'));
-    // Check that the one field got populated as expected.
-    $this->assertEqual($data['field_test_text'], $denormalized->get('field_test_text')->getValue());
-    // Check the custom property that contains the list of fields to merge.
-    $this->assertEqual($denormalized->_restSubmittedFields, ['field_test_text']);
-  }
-}
diff --git a/core/modules/hal/src/Tests/EntityTest.php b/core/modules/hal/src/Tests/EntityTest.php
deleted file mode 100644
index 6301fb0..0000000
--- a/core/modules/hal/src/Tests/EntityTest.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Tests\EntityTest.
- */
-
-namespace Drupal\hal\Tests;
-
-use Drupal\comment\Tests\CommentTestTrait;
-
-/**
- * Tests that nodes and terms are correctly normalized and denormalized.
- *
- * @group hal
- */
-class EntityTest extends NormalizerTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'taxonomy', 'comment');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    \Drupal::service('router.builder')->rebuild();
-    $this->installSchema('system', array('sequences'));
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(['node', 'comment']);
-  }
-
-  /**
-   * Tests the normalization of nodes.
-   */
-  public function testNode() {
-    $node_type = entity_create('node_type', array('type' => 'example_type'));
-    $node_type->save();
-
-    $user = entity_create('user', array('name' => $this->randomMachineName()));
-    $user->save();
-
-    // Add comment type.
-    $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
-      'id' => 'comment',
-      'label' => 'comment',
-      'target_entity_type_id' => 'node',
-    ))->save();
-
-    $this->addDefaultCommentField('node', 'example_type');
-
-    $node = entity_create('node', array(
-      'title' => $this->randomMachineName(),
-      'uid' => $user->id(),
-      'type' => $node_type->id(),
-      'status' => NODE_PUBLISHED,
-      'promote' => 1,
-      'sticky' => 0,
-      'body' => array(
-        'value' => $this->randomMachineName(),
-        'format' => $this->randomMachineName(),
-      ),
-      'revision_log' => $this->randomString(),
-    ));
-    $node->save();
-
-    $original_values = $node->toArray();
-    unset($original_values['nid']);
-    unset($original_values['vid']);
-
-    $normalized = $this->serializer->normalize($node, $this->format);
-
-    $denormalized_node = $this->serializer->denormalize($normalized, 'Drupal\node\Entity\Node', $this->format);
-
-    // Verify that the ID and revision ID were skipped by the normalizer.
-    $this->assertEqual(NULL, $denormalized_node->id());
-    $this->assertEqual(NULL, $denormalized_node->getRevisionId());
-
-    // Loop over the remaining fields and verify that they are identical.
-    foreach ($original_values as $field_name => $field_values) {
-      $this->assertEqual($field_values, $denormalized_node->get($field_name)->getValue());
-    }
-  }
-
-  /**
-   * Tests the normalization of terms.
-   */
-  public function testTerm() {
-    $vocabulary = entity_create('taxonomy_vocabulary', array('vid' => 'example_vocabulary'));
-    $vocabulary->save();
-
-    $account = entity_create('user', array('name' => $this->randomMachineName()));
-    $account->save();
-
-    // @todo Until https://www.drupal.org/node/2327935 is fixed, if no parent is
-    // set, the test fails because target_id => 0 is reserialized to NULL.
-    $term_parent = entity_create('taxonomy_term', array(
-      'name' => $this->randomMachineName(),
-      'vid' => $vocabulary->id(),
-    ));
-    $term_parent->save();
-    $term = entity_create('taxonomy_term', array(
-      'name' => $this->randomMachineName(),
-      'vid' => $vocabulary->id(),
-      'description' => array(
-        'value' => $this->randomMachineName(),
-        'format' => $this->randomMachineName(),
-      ),
-      'parent' => $term_parent->id(),
-    ));
-    $term->save();
-
-    $original_values = $term->toArray();
-    unset($original_values['tid']);
-
-    $normalized = $this->serializer->normalize($term, $this->format, ['account' => $account]);
-
-    $denormalized_term = $this->serializer->denormalize($normalized, 'Drupal\taxonomy\Entity\Term', $this->format, ['account' => $account]);
-
-    // Verify that the ID and revision ID were skipped by the normalizer.
-    $this->assertEqual(NULL, $denormalized_term->id());
-
-    // Loop over the remaining fields and verify that they are identical.
-    foreach ($original_values as $field_name => $field_values) {
-      $this->assertEqual($field_values, $denormalized_term->get($field_name)->getValue());
-    }
-  }
-
-  /**
-   * Tests the normalization of comments.
-   */
-  public function testComment() {
-    $node_type = entity_create('node_type', array('type' => 'example_type'));
-    $node_type->save();
-
-    $account = entity_create('user', array('name' => $this->randomMachineName()));
-    $account->save();
-
-    // Add comment type.
-    $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
-      'id' => 'comment',
-      'label' => 'comment',
-      'target_entity_type_id' => 'node',
-    ))->save();
-
-    $this->addDefaultCommentField('node', 'example_type');
-
-    $node = entity_create('node', array(
-      'title' => $this->randomMachineName(),
-      'uid' => $account->id(),
-      'type' => $node_type->id(),
-      'status' => NODE_PUBLISHED,
-      'promote' => 1,
-      'sticky' => 0,
-      'body' => array(
-        'value' => $this->randomMachineName(),
-        'format' => $this->randomMachineName(),
-      )
-    ));
-    $node->save();
-
-    $parent_comment = entity_create('comment', array(
-      'uid' => $account->id(),
-      'subject' => $this->randomMachineName(),
-      'comment_body' => [
-        'value' => $this->randomMachineName(),
-        'format' => NULL,
-      ],
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-    ));
-    $parent_comment->save();
-
-    $comment = entity_create('comment', array(
-      'uid' => $account->id(),
-      'subject' => $this->randomMachineName(),
-      'comment_body' => [
-        'value' => $this->randomMachineName(),
-        'format' => NULL,
-      ],
-      'entity_id' => $node->id(),
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'pid' => $parent_comment->id(),
-      'mail' => 'dries@drupal.org',
-      'homepage' => 'http://buytaert.net',
-    ));
-    $comment->save();
-
-    $original_values = $comment->toArray();
-    // cid will not exist and hostname will always be denied view access.
-    // No value will exist for name as this is only for anonymous users.
-    unset($original_values['cid'], $original_values['hostname'], $original_values['name']);
-
-    $normalized = $this->serializer->normalize($comment, $this->format, ['account' => $account]);
-
-    // Assert that the hostname field does not appear at all in the normalized
-    // data.
-    $this->assertFalse(array_key_exists('hostname', $normalized), 'Hostname was not found in normalized comment data.');
-
-    $denormalized_comment = $this->serializer->denormalize($normalized, 'Drupal\comment\Entity\Comment', $this->format, ['account' => $account]);
-
-    // Verify that the ID and revision ID were skipped by the normalizer.
-    $this->assertEqual(NULL, $denormalized_comment->id());
-
-    // Loop over the remaining fields and verify that they are identical.
-    foreach ($original_values as $field_name => $field_values) {
-      // The target field comes with revision id which is not set.
-      if (array_key_exists('revision_id', $field_values[0])) {
-        unset($field_values[0]['revision_id']);
-      }
-      $this->assertEqual($field_values, $denormalized_comment->get($field_name)->getValue());
-    }
-  }
-
-}
diff --git a/core/modules/hal/src/Tests/FileDenormalizeTest.php b/core/modules/hal/src/Tests/FileDenormalizeTest.php
index 853b06d..74e11bb 100644
--- a/core/modules/hal/src/Tests/FileDenormalizeTest.php
+++ b/core/modules/hal/src/Tests/FileDenormalizeTest.php
@@ -36,7 +36,7 @@ public function testFileDenormalize() {
       'status' => FILE_STATUS_PERMANENT,
     );
     // Create a new file entity.
-    $file = entity_create('file', $file_params);
+    $file = File::create($file_params);
     file_put_contents($file->getFileUri(), 'hello world');
     $file->save();
 
@@ -50,7 +50,7 @@ public function testFileDenormalize() {
     $this->assertTrue(file_exists($denormalized->getFileUri()), 'The temporary file was found.');
 
     $this->assertIdentical($file->uuid(), $denormalized->uuid(), 'The expected UUID was found');
-    $this->assertIdentical($file->getMimeType(), $denormalized->getMimeType(), 'The expected mime type was found.');
+    $this->assertIdentical($file->getMimeType(), $denormalized->getMimeType(), 'The expected MIME type was found.');
     $this->assertIdentical($file->getFilename(), $denormalized->getFilename(), 'The expected filename was found.');
     $this->assertTrue($denormalized->isPermanent(), 'The file has a permanent status.');
 
@@ -72,7 +72,7 @@ public function testFileDenormalize() {
     $this->assertIdentical('temporary://' . $file_name, $denormalized->getFileUri(), 'The expected file URI was found.');
     $this->assertTrue(file_exists($denormalized->getFileUri()), 'The temporary file was found.');
 
-    $this->assertIdentical('text/plain', $denormalized->getMimeType(), 'The expected mime type was found.');
+    $this->assertIdentical('text/plain', $denormalized->getMimeType(), 'The expected MIME type was found.');
     $this->assertIdentical($file_name, $denormalized->getFilename(), 'The expected filename was found.');
     $this->assertFalse($denormalized->isPermanent(), 'The file has a permanent status.');
   }
diff --git a/core/modules/hal/src/Tests/FileNormalizeTest.php b/core/modules/hal/src/Tests/FileNormalizeTest.php
deleted file mode 100644
index 64ffd07..0000000
--- a/core/modules/hal/src/Tests/FileNormalizeTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Tests\FileNormalizeTest.
- */
-
-namespace Drupal\hal\Tests;
-
-use Drupal\Core\Cache\MemoryBackend;
-use Drupal\hal\Encoder\JsonEncoder;
-use Drupal\hal\Normalizer\FieldItemNormalizer;
-use Drupal\hal\Normalizer\FileEntityNormalizer;
-use Drupal\rest\LinkManager\LinkManager;
-use Drupal\rest\LinkManager\RelationLinkManager;
-use Drupal\rest\LinkManager\TypeLinkManager;
-use Symfony\Component\Serializer\Serializer;
-
-
-/**
- * Tests that file entities can be normalized in HAL.
- *
- * @group hal
- */
-class FileNormalizeTest extends NormalizerTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('file');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-
-    $entity_manager = \Drupal::entityManager();
-    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
-
-    // Set up the mock serializer.
-    $normalizers = array(
-      new FieldItemNormalizer(),
-      new FileEntityNormalizer($entity_manager, \Drupal::httpClient(), $link_manager, \Drupal::moduleHandler()),
-    );
-
-    $encoders = array(
-      new JsonEncoder(),
-    );
-    $this->serializer = new Serializer($normalizers, $encoders);
-  }
-
-
-  /**
-   * Tests the normalize function.
-   */
-  public function testNormalize() {
-    $file_params = array(
-      'filename' => 'test_1.txt',
-      'uri' => 'public://test_1.txt',
-      'filemime' => 'text/plain',
-      'status' => FILE_STATUS_PERMANENT,
-    );
-    // Create a new file entity.
-    $file = entity_create('file', $file_params);
-    file_put_contents($file->getFileUri(), 'hello world');
-    $file->save();
-
-    $expected_array = array(
-      'uri' => array(
-        array(
-          'value' => file_create_url($file->getFileUri())),
-      ),
-    );
-
-    $normalized = $this->serializer->normalize($file, $this->format);
-    $this->assertEqual($normalized['uri'], $expected_array['uri'], 'URI is normalized.');
-
-  }
-
-}
diff --git a/core/modules/hal/src/Tests/NormalizeTest.php b/core/modules/hal/src/Tests/NormalizeTest.php
deleted file mode 100644
index 0f24d73..0000000
--- a/core/modules/hal/src/Tests/NormalizeTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Tests\NormalizeTest.
- */
-
-namespace Drupal\hal\Tests;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Url;
-
-/**
- * Tests that entities can be normalized in HAL.
- *
- * @group hal
- */
-class NormalizeTest extends NormalizerTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests the normalize function.
-   */
-  public function testNormalize() {
-    $target_entity_de = entity_create('entity_test', (array('langcode' => 'de', 'field_test_entity_reference' => NULL)));
-    $target_entity_de->save();
-    $target_entity_en = entity_create('entity_test', (array('langcode' => 'en', 'field_test_entity_reference' => NULL)));
-    $target_entity_en->save();
-
-    // Create a German entity.
-    $values = array(
-      'langcode' => 'de',
-      'name' => $this->randomMachineName(),
-      'field_test_text' => array(
-        'value' => $this->randomMachineName(),
-        'format' => 'full_html',
-      ),
-      'field_test_entity_reference' => array(
-        'target_id' => $target_entity_de->id(),
-      ),
-    );
-    // Array of translated values.
-    $translation_values = array(
-      'name' => $this->randomMachineName(),
-      'field_test_entity_reference' => array(
-        'target_id' => $target_entity_en->id(),
-      )
-    );
-
-    $entity = entity_create('entity_test', $values);
-    $entity->save();
-    // Add an English value for name and entity reference properties.
-    $entity->addTranslation('en')->set('name', array(0 => array('value' => $translation_values['name'])));
-    $entity->getTranslation('en')->set('field_test_entity_reference', array(0 => $translation_values['field_test_entity_reference']));
-    $entity->save();
-
-    $type_uri = Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString();
-    $relation_uri = Url::fromUri('base:rest/relation/entity_test/entity_test/field_test_entity_reference', array('absolute' => TRUE))->toString();
-
-    $expected_array = array(
-      '_links' => array(
-        'curies' => array(
-          array(
-            'href' => '/relations',
-            'name' => 'site',
-            'templated' => true,
-          ),
-        ),
-        'self' => array(
-          'href' => $this->getEntityUri($entity),
-        ),
-        'type' => array(
-          'href' => $type_uri,
-        ),
-        $relation_uri => array(
-          array(
-            'href' => $this->getEntityUri($target_entity_de),
-            'lang' => 'de',
-          ),
-          array(
-            'href' => $this->getEntityUri($target_entity_en),
-            'lang' => 'en',
-          ),
-        ),
-      ),
-      '_embedded' => array(
-        $relation_uri => array(
-          array(
-            '_links' => array(
-              'self' => array(
-                'href' => $this->getEntityUri($target_entity_de),
-              ),
-              'type' => array(
-                'href' => $type_uri,
-              ),
-            ),
-            'uuid' => array(
-              array(
-                'value' => $target_entity_de->uuid(),
-              ),
-            ),
-            'lang' => 'de',
-          ),
-          array(
-            '_links' => array(
-              'self' => array(
-                'href' => $this->getEntityUri($target_entity_en),
-              ),
-              'type' => array(
-                'href' => $type_uri,
-              ),
-            ),
-            'uuid' => array(
-              array(
-                'value' => $target_entity_en->uuid(),
-              ),
-            ),
-            'lang' => 'en',
-          ),
-        ),
-      ),
-      'uuid' => array(
-        array(
-          'value' => $entity->uuid(),
-        ),
-      ),
-      'langcode' => array(
-        array(
-          'value' => 'de',
-        ),
-      ),
-      'name' => array(
-        array(
-          'value' => $values['name'],
-          'lang' => 'de',
-        ),
-        array(
-          'value' => $translation_values['name'],
-          'lang' => 'en',
-        ),
-      ),
-      'field_test_text' => array(
-        array(
-          'value' => $values['field_test_text']['value'],
-          'format' => $values['field_test_text']['format'],
-        ),
-      ),
-    );
-
-    $normalized = $this->serializer->normalize($entity, $this->format);
-    $this->assertEqual($normalized['_links']['self'], $expected_array['_links']['self'], 'self link placed correctly.');
-    // @todo Test curies.
-    // @todo Test type.
-    $this->assertFalse(isset($normalized['id']), 'Internal id is not exposed.');
-    $this->assertEqual($normalized['uuid'], $expected_array['uuid'], 'Non-translatable fields is normalized.');
-    $this->assertEqual($normalized['name'], $expected_array['name'], 'Translatable field with multiple language values is normalized.');
-    $this->assertEqual($normalized['field_test_text'], $expected_array['field_test_text'], 'Field with properties is normalized.');
-    $this->assertEqual($normalized['_embedded'][$relation_uri], $expected_array['_embedded'][$relation_uri], 'Entity reference field is normalized.');
-    $this->assertEqual($normalized['_links'][$relation_uri], $expected_array['_links'][$relation_uri], 'Links are added for entity reference field.');
-  }
-
-  /**
-   * Constructs the entity URI.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
-   *
-   * @return string
-   *   The entity URI.
-   */
-  protected function getEntityUri(EntityInterface $entity) {
-    $url = $entity->urlInfo('canonical', ['absolute' => TRUE]);
-    return $url->setRouteParameter('_format', 'hal_json')->toString();
-  }
-
-}
diff --git a/core/modules/hal/src/Tests/NormalizerTestBase.php b/core/modules/hal/src/Tests/NormalizerTestBase.php
deleted file mode 100644
index 104a5e2..0000000
--- a/core/modules/hal/src/Tests/NormalizerTestBase.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\hal\Tests\NormalizerTestBase.
- */
-
-namespace Drupal\hal\Tests;
-
-use Drupal\Core\Cache\MemoryBackend;
-use Drupal\hal\Encoder\JsonEncoder;
-use Drupal\hal\Normalizer\ContentEntityNormalizer;
-use Drupal\hal\Normalizer\EntityReferenceItemNormalizer;
-use Drupal\hal\Normalizer\FieldItemNormalizer;
-use Drupal\hal\Normalizer\FieldNormalizer;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\rest\LinkManager\LinkManager;
-use Drupal\rest\LinkManager\RelationLinkManager;
-use Drupal\rest\LinkManager\TypeLinkManager;
-use Drupal\serialization\EntityResolver\ChainEntityResolver;
-use Drupal\serialization\EntityResolver\TargetIdResolver;
-use Drupal\serialization\EntityResolver\UuidResolver;
-use Drupal\simpletest\KernelTestBase;
-use Symfony\Component\Serializer\Serializer;
-
-/**
- * Test the HAL normalizer.
- */
-abstract class NormalizerTestBase extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['entity_test', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter'];
-
-  /**
-   * The mock serializer.
-   *
-   * @var \Symfony\Component\Serializer\Serializer
-   */
-  protected $serializer;
-
-  /**
-   * The format being tested.
-   *
-   * @var string
-   */
-  protected $format = 'hal_json';
-
-  /**
-   * The class name of the test class.
-   *
-   * @var string
-   */
-  protected $entityClass = 'Drupal\entity_test\Entity\EntityTest';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('url_alias', 'router'));
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test');
-    // If the concrete test sub-class installs the Node or Comment modules,
-    // ensure that the node and comment entity schema are created before the
-    // field configurations are installed. This is because the entity tables
-    // need to be created before the body field storage tables. This prevents
-    // trying to create the body field tables twice.
-    $class = get_class($this);
-    while ($class) {
-      if (property_exists($class, 'modules')) {
-        // Only check the modules, if the $modules property was not inherited.
-        $rp = new \ReflectionProperty($class, 'modules');
-        if ($rp->class == $class) {
-          foreach (array_intersect(array('node', 'comment'), $class::$modules) as $module) {
-            $this->installEntitySchema($module);
-          }
-        }
-      }
-      $class = get_parent_class($class);
-    }
-    $this->installConfig(array('field', 'language'));
-    \Drupal::service('router.builder')->rebuild();
-
-    // Add German as a language.
-    ConfigurableLanguage::create(array(
-      'id' => 'de',
-      'label' => 'Deutsch',
-      'weight' => -1,
-    ))->save();
-
-    // Create the test text field.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_test_text',
-      'entity_type' => 'entity_test',
-      'type' => 'text',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test_text',
-      'bundle' => 'entity_test',
-      'translatable' => FALSE,
-    ))->save();
-
-    // Create the test translatable field.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_test_translatable_text',
-      'entity_type' => 'entity_test',
-      'type' => 'text',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test_translatable_text',
-      'bundle' => 'entity_test',
-      'translatable' => TRUE,
-    ))->save();
-
-    // Create the test entity reference field.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_test_entity_reference',
-      'entity_type' => 'entity_test',
-      'type' => 'entity_reference',
-      'settings' => array(
-        'target_type' => 'entity_test',
-      ),
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test_entity_reference',
-      'bundle' => 'entity_test',
-      'translatable' => TRUE,
-    ))->save();
-
-    $entity_manager = \Drupal::entityManager();
-    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
-
-    $chain_resolver = new ChainEntityResolver(array(new UuidResolver($entity_manager), new TargetIdResolver()));
-
-    // Set up the mock serializer.
-    $normalizers = array(
-      new ContentEntityNormalizer($link_manager, $entity_manager, \Drupal::moduleHandler()),
-      new EntityReferenceItemNormalizer($link_manager, $chain_resolver),
-      new FieldItemNormalizer(),
-      new FieldNormalizer(),
-    );
-
-    $encoders = array(
-      new JsonEncoder(),
-    );
-    $this->serializer = new Serializer($normalizers, $encoders);
-  }
-
-}
diff --git a/core/modules/hal/tests/src/Kernel/DenormalizeTest.php b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php
new file mode 100644
index 0000000..724e348
--- /dev/null
+++ b/core/modules/hal/tests/src/Kernel/DenormalizeTest.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\hal\Kernel\DenormalizeTest.
+ */
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\Core\Url;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\hal\Kernel\NormalizerTestBase;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * Tests that entities can be denormalized from HAL.
+ *
+ * @group hal
+ */
+class DenormalizeTest extends NormalizerTestBase {
+
+  /**
+   * Tests that the type link relation in incoming data is handled correctly.
+   */
+  public function testTypeHandling() {
+    // Valid type.
+    $data_with_valid_type = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+    );
+    $denormalized = $this->serializer->denormalize($data_with_valid_type, $this->entityClass, $this->format);
+    $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with valid type results in creation of correct bundle.');
+
+    // Multiple types.
+    $data_with_multiple_types = array(
+      '_links' => array(
+        'type' => array(
+          array(
+            'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
+          ),
+          array(
+            'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+          ),
+        ),
+      ),
+    );
+    $denormalized = $this->serializer->denormalize($data_with_multiple_types, $this->entityClass, $this->format);
+    $this->assertEqual(get_class($denormalized), $this->entityClass, 'Request with multiple types results in creation of correct bundle.');
+
+    // Invalid type.
+    $data_with_invalid_type = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/types/foo', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+    );
+    try {
+      $this->serializer->denormalize($data_with_invalid_type, $this->entityClass, $this->format);
+      $this->fail('Exception should be thrown when type is invalid.');
+    }
+    catch (UnexpectedValueException $e) {
+      $this->pass('Exception thrown when type is invalid.');
+    }
+
+    // No type.
+    $data_with_no_type = array(
+      '_links' => array(
+      ),
+    );
+    try {
+      $this->serializer->denormalize($data_with_no_type, $this->entityClass, $this->format);
+      $this->fail('Exception should be thrown when no type is provided.');
+    }
+    catch (UnexpectedValueException $e) {
+      $this->pass('Exception thrown when no type is provided.');
+    }
+  }
+
+  /**
+   * Test that a field set to an empty array is different than an absent field.
+   */
+  public function testMarkFieldForDeletion() {
+    // Add a default value for a field.
+    $field = FieldConfig::loadByName('entity_test', 'entity_test', 'field_test_text');
+    $field->setDefaultValue(array(array('value' => 'Llama')));
+    $field->save();
+
+    // Denormalize data that contains no entry for the field, and check that
+    // the default value is present in the resulting entity.
+    $data = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+    );
+    $entity = $this->serializer->denormalize($data, $this->entityClass, $this->format);
+    $this->assertEqual($entity->field_test_text->count(), 1);
+    $this->assertEqual($entity->field_test_text->value, 'Llama');
+
+    // Denormalize data that contains an empty entry for the field, and check
+    // that the field is empty in the resulting entity.
+    $data = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+      'field_test_text' => array(),
+    );
+    $entity = $this->serializer->denormalize($data, get_class($entity), $this->format, [ 'target_instance' => $entity ]);
+    $this->assertEqual($entity->field_test_text->count(), 0);
+  }
+
+  /**
+   * Test that non-reference fields can be denormalized.
+   */
+  public function testBasicFieldDenormalization() {
+    $data = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+      'uuid' => array(
+        array(
+          'value' => 'e5c9fb96-3acf-4a8d-9417-23de1b6c3311',
+        ),
+      ),
+      'field_test_text' => array(
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'full_html',
+        ),
+      ),
+      'field_test_translatable_text' => array(
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'full_html',
+        ),
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'filtered_html',
+        ),
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'filtered_html',
+          'lang' => 'de',
+        ),
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'full_html',
+          'lang' => 'de',
+        ),
+      ),
+    );
+
+    $expected_value_default = array(
+      array (
+        'value' => $data['field_test_translatable_text'][0]['value'],
+        'format' => 'full_html',
+      ),
+      array (
+        'value' => $data['field_test_translatable_text'][1]['value'],
+        'format' => 'filtered_html',
+      ),
+    );
+    $expected_value_de = array(
+      array (
+        'value' => $data['field_test_translatable_text'][2]['value'],
+        'format' => 'filtered_html',
+      ),
+      array (
+        'value' => $data['field_test_translatable_text'][3]['value'],
+        'format' => 'full_html',
+      ),
+    );
+    $denormalized = $this->serializer->denormalize($data, $this->entityClass, $this->format);
+    $this->assertEqual($data['uuid'], $denormalized->get('uuid')->getValue(), 'A preset value (e.g. UUID) is overridden by incoming data.');
+    $this->assertEqual($data['field_test_text'], $denormalized->get('field_test_text')->getValue(), 'A basic text field is denormalized.');
+    $this->assertEqual($expected_value_default, $denormalized->get('field_test_translatable_text')->getValue(), 'Values in the default language are properly handled for a translatable field.');
+    $this->assertEqual($expected_value_de, $denormalized->getTranslation('de')->get('field_test_translatable_text')->getValue(), 'Values in a translation language are properly handled for a translatable field.');
+  }
+
+  /**
+   * Verifies that the denormalized entity is correct in the PATCH context.
+   */
+  public function testPatchDenormalization() {
+    $data = array(
+      '_links' => array(
+        'type' => array(
+          'href' => Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString(),
+        ),
+      ),
+      'field_test_text' => array(
+        array(
+          'value' => $this->randomMachineName(),
+          'format' => 'full_html',
+        ),
+      ),
+    );
+    $denormalized = $this->serializer->denormalize($data, $this->entityClass, $this->format, array('request_method' => 'patch'));
+    // Check that the one field got populated as expected.
+    $this->assertEqual($data['field_test_text'], $denormalized->get('field_test_text')->getValue());
+    // Check the custom property that contains the list of fields to merge.
+    $this->assertEqual($denormalized->_restSubmittedFields, ['field_test_text']);
+  }
+}
diff --git a/core/modules/hal/tests/src/Kernel/EntityNormalizeTest.php b/core/modules/hal/tests/src/Kernel/EntityNormalizeTest.php
new file mode 100644
index 0000000..aeeb3c7
--- /dev/null
+++ b/core/modules/hal/tests/src/Kernel/EntityNormalizeTest.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\hal\Kernel\EntityNormalizeTest.
+ */
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\comment\Entity\Comment;
+use Drupal\node\Entity\Node;
+use Drupal\Tests\hal\Kernel\NormalizerTestBase;
+use Drupal\user\Entity\User;
+use Drupal\node\Entity\NodeType;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests that nodes and terms are correctly normalized and denormalized.
+ *
+ * @group hal
+ */
+class EntityNormalizeTest extends NormalizerTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'taxonomy', 'comment');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    \Drupal::service('router.builder')->rebuild();
+    $this->installSchema('system', array('sequences'));
+    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(['node', 'comment']);
+  }
+
+  /**
+   * Tests the normalization of nodes.
+   */
+  public function testNode() {
+    $node_type = NodeType::create(['type' => 'example_type']);
+    $node_type->save();
+
+    $user = User::create(['name' => $this->randomMachineName()]);
+    $user->save();
+
+    // Add comment type.
+    $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
+      'id' => 'comment',
+      'label' => 'comment',
+      'target_entity_type_id' => 'node',
+    ))->save();
+
+    $this->addDefaultCommentField('node', 'example_type');
+
+    $node = Node::create([
+      'title' => $this->randomMachineName(),
+      'uid' => $user->id(),
+      'type' => $node_type->id(),
+      'status' => NODE_PUBLISHED,
+      'promote' => 1,
+      'sticky' => 0,
+      'body' => [
+        'value' => $this->randomMachineName(),
+        'format' => $this->randomMachineName()
+      ],
+      'revision_log' => $this->randomString(),
+    ]);
+    $node->save();
+
+    $original_values = $node->toArray();
+
+    $normalized = $this->serializer->normalize($node, $this->format);
+
+    /** @var \Drupal\node\NodeInterface $denormalized_node */
+    $denormalized_node = $this->serializer->denormalize($normalized, 'Drupal\node\Entity\Node', $this->format);
+
+    $this->assertEqual($original_values, $denormalized_node->toArray(), 'Node values are restored after normalizing and denormalizing.');
+  }
+
+  /**
+   * Tests the normalization of terms.
+   */
+  public function testTerm() {
+    $vocabulary = Vocabulary::create(['vid' => 'example_vocabulary']);
+    $vocabulary->save();
+
+    $account = User::create(['name' => $this->randomMachineName()]);
+    $account->save();
+
+    // @todo Until https://www.drupal.org/node/2327935 is fixed, if no parent is
+    // set, the test fails because target_id => 0 is reserialized to NULL.
+    $term_parent = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => $vocabulary->id(),
+    ]);
+    $term_parent->save();
+    $term = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => $vocabulary->id(),
+      'description' => array(
+        'value' => $this->randomMachineName(),
+        'format' => $this->randomMachineName(),
+      ),
+      'parent' => $term_parent->id(),
+    ]);
+    $term->save();
+
+    $original_values = $term->toArray();
+
+    $normalized = $this->serializer->normalize($term, $this->format, ['account' => $account]);
+
+    /** @var \Drupal\taxonomy\TermInterface $denormalized_term */
+    $denormalized_term = $this->serializer->denormalize($normalized, 'Drupal\taxonomy\Entity\Term', $this->format, ['account' => $account]);
+
+    $this->assertEqual($original_values, $denormalized_term->toArray(), 'Term values are restored after normalizing and denormalizing.');
+  }
+
+  /**
+   * Tests the normalization of comments.
+   */
+  public function testComment() {
+    $node_type = NodeType::create(['type' => 'example_type']);
+    $node_type->save();
+
+    $account = User::create(['name' => $this->randomMachineName()]);
+    $account->save();
+
+    // Add comment type.
+    $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
+      'id' => 'comment',
+      'label' => 'comment',
+      'target_entity_type_id' => 'node',
+    ))->save();
+
+    $this->addDefaultCommentField('node', 'example_type');
+
+    $node = Node::create([
+      'title' => $this->randomMachineName(),
+      'uid' => $account->id(),
+      'type' => $node_type->id(),
+      'status' => NODE_PUBLISHED,
+      'promote' => 1,
+      'sticky' => 0,
+      'body' => [[
+        'value' => $this->randomMachineName(),
+        'format' => $this->randomMachineName()
+      ]],
+    ]);
+    $node->save();
+
+    $parent_comment = Comment::create(array(
+      'uid' => $account->id(),
+      'subject' => $this->randomMachineName(),
+      'comment_body' => [
+        'value' => $this->randomMachineName(),
+        'format' => NULL,
+      ],
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+    ));
+    $parent_comment->save();
+
+    $comment = Comment::create(array(
+      'uid' => $account->id(),
+      'subject' => $this->randomMachineName(),
+      'comment_body' => [
+        'value' => $this->randomMachineName(),
+        'format' => NULL,
+      ],
+      'entity_id' => $node->id(),
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'pid' => $parent_comment->id(),
+      'mail' => 'dries@drupal.org',
+      'homepage' => 'http://buytaert.net',
+    ));
+    $comment->save();
+
+    $original_values = $comment->toArray();
+    // Hostname will always be denied view access.
+    // No value will exist for name as this is only for anonymous users.
+    unset($original_values['hostname'], $original_values['name']);
+
+    $normalized = $this->serializer->normalize($comment, $this->format, ['account' => $account]);
+
+    // Assert that the hostname field does not appear at all in the normalized
+    // data.
+    $this->assertFalse(array_key_exists('hostname', $normalized), 'Hostname was not found in normalized comment data.');
+
+    /** @var \Drupal\comment\CommentInterface $denormalized_comment */
+    $denormalized_comment = $this->serializer->denormalize($normalized, 'Drupal\comment\Entity\Comment', $this->format, ['account' => $account]);
+
+    // Before comparing, unset values that are expected to differ.
+    $denormalized_comment_values = $denormalized_comment->toArray();
+    unset($denormalized_comment_values['hostname'], $denormalized_comment_values['name']);
+    $this->assertEqual($original_values, $denormalized_comment_values, 'The expected comment values are restored after normalizing and denormalizing.');
+  }
+
+}
diff --git a/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php
new file mode 100644
index 0000000..2cdd92b
--- /dev/null
+++ b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\hal\Kernel\FileNormalizeTest.
+ */
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\Core\Cache\MemoryBackend;
+use Drupal\file\Entity\File;
+use Drupal\hal\Encoder\JsonEncoder;
+use Drupal\hal\Normalizer\FieldItemNormalizer;
+use Drupal\hal\Normalizer\FileEntityNormalizer;
+use Drupal\rest\LinkManager\LinkManager;
+use Drupal\rest\LinkManager\RelationLinkManager;
+use Drupal\rest\LinkManager\TypeLinkManager;
+use Drupal\Tests\hal\Kernel\NormalizerTestBase;
+use Symfony\Component\Serializer\Serializer;
+
+
+/**
+ * Tests that file entities can be normalized in HAL.
+ *
+ * @group hal
+ */
+class FileNormalizeTest extends NormalizerTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('file');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+
+    $entity_manager = \Drupal::entityManager();
+    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
+
+    // Set up the mock serializer.
+    $normalizers = array(
+      new FieldItemNormalizer(),
+      new FileEntityNormalizer($entity_manager, \Drupal::httpClient(), $link_manager, \Drupal::moduleHandler()),
+    );
+
+    $encoders = array(
+      new JsonEncoder(),
+    );
+    $this->serializer = new Serializer($normalizers, $encoders);
+  }
+
+
+  /**
+   * Tests the normalize function.
+   */
+  public function testNormalize() {
+    $file_params = array(
+      'filename' => 'test_1.txt',
+      'uri' => 'public://test_1.txt',
+      'filemime' => 'text/plain',
+      'status' => FILE_STATUS_PERMANENT,
+    );
+    // Create a new file entity.
+    $file = File::create($file_params);
+    file_put_contents($file->getFileUri(), 'hello world');
+    $file->save();
+
+    $expected_array = array(
+      'uri' => array(
+        array(
+          'value' => file_create_url($file->getFileUri())),
+      ),
+    );
+
+    $normalized = $this->serializer->normalize($file, $this->format);
+    $this->assertEqual($normalized['uri'], $expected_array['uri'], 'URI is normalized.');
+
+  }
+
+}
diff --git a/core/modules/hal/tests/src/Kernel/NormalizeTest.php b/core/modules/hal/tests/src/Kernel/NormalizeTest.php
new file mode 100644
index 0000000..52e461c
--- /dev/null
+++ b/core/modules/hal/tests/src/Kernel/NormalizeTest.php
@@ -0,0 +1,191 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\hal\Kernel\NormalizeTest.
+ */
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\Tests\hal\Kernel\NormalizerTestBase;
+
+/**
+ * Tests that entities can be normalized in HAL.
+ *
+ * @group hal
+ */
+class NormalizeTest extends NormalizerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Tests the normalize function.
+   */
+  public function testNormalize() {
+    $target_entity_de = EntityTest::create((array('langcode' => 'de', 'field_test_entity_reference' => NULL)));
+    $target_entity_de->save();
+    $target_entity_en = EntityTest::create((array('langcode' => 'en', 'field_test_entity_reference' => NULL)));
+    $target_entity_en->save();
+
+    // Create a German entity.
+    $values = array(
+      'langcode' => 'de',
+      'name' => $this->randomMachineName(),
+      'field_test_text' => array(
+        'value' => $this->randomMachineName(),
+        'format' => 'full_html',
+      ),
+      'field_test_entity_reference' => array(
+        'target_id' => $target_entity_de->id(),
+      ),
+    );
+    // Array of translated values.
+    $translation_values = array(
+      'name' => $this->randomMachineName(),
+      'field_test_entity_reference' => array(
+        'target_id' => $target_entity_en->id(),
+      )
+    );
+
+    $entity = EntityTest::create($values);
+    $entity->save();
+    // Add an English value for name and entity reference properties.
+    $entity->addTranslation('en')->set('name', array(0 => array('value' => $translation_values['name'])));
+    $entity->getTranslation('en')->set('field_test_entity_reference', array(0 => $translation_values['field_test_entity_reference']));
+    $entity->save();
+
+    $type_uri = Url::fromUri('base:rest/type/entity_test/entity_test', array('absolute' => TRUE))->toString();
+    $relation_uri = Url::fromUri('base:rest/relation/entity_test/entity_test/field_test_entity_reference', array('absolute' => TRUE))->toString();
+
+    $expected_array = array(
+      '_links' => array(
+        'curies' => array(
+          array(
+            'href' => '/relations',
+            'name' => 'site',
+            'templated' => true,
+          ),
+        ),
+        'self' => array(
+          'href' => $this->getEntityUri($entity),
+        ),
+        'type' => array(
+          'href' => $type_uri,
+        ),
+        $relation_uri => array(
+          array(
+            'href' => $this->getEntityUri($target_entity_de),
+            'lang' => 'de',
+          ),
+          array(
+            'href' => $this->getEntityUri($target_entity_en),
+            'lang' => 'en',
+          ),
+        ),
+      ),
+      '_embedded' => array(
+        $relation_uri => array(
+          array(
+            '_links' => array(
+              'self' => array(
+                'href' => $this->getEntityUri($target_entity_de),
+              ),
+              'type' => array(
+                'href' => $type_uri,
+              ),
+            ),
+            'uuid' => array(
+              array(
+                'value' => $target_entity_de->uuid(),
+              ),
+            ),
+            'lang' => 'de',
+          ),
+          array(
+            '_links' => array(
+              'self' => array(
+                'href' => $this->getEntityUri($target_entity_en),
+              ),
+              'type' => array(
+                'href' => $type_uri,
+              ),
+            ),
+            'uuid' => array(
+              array(
+                'value' => $target_entity_en->uuid(),
+              ),
+            ),
+            'lang' => 'en',
+          ),
+        ),
+      ),
+      'id' => array(
+        array(
+          'value' => $entity->id(),
+        ),
+      ),
+      'uuid' => array(
+        array(
+          'value' => $entity->uuid(),
+        ),
+      ),
+      'langcode' => array(
+        array(
+          'value' => 'de',
+        ),
+      ),
+      'name' => array(
+        array(
+          'value' => $values['name'],
+          'lang' => 'de',
+        ),
+        array(
+          'value' => $translation_values['name'],
+          'lang' => 'en',
+        ),
+      ),
+      'field_test_text' => array(
+        array(
+          'value' => $values['field_test_text']['value'],
+          'format' => $values['field_test_text']['format'],
+        ),
+      ),
+    );
+
+    $normalized = $this->serializer->normalize($entity, $this->format);
+    $this->assertEqual($normalized['_links']['self'], $expected_array['_links']['self'], 'self link placed correctly.');
+    // @todo Test curies.
+    // @todo Test type.
+    $this->assertEqual($normalized['id'], $expected_array['id'], 'Internal id is exposed.');
+    $this->assertEqual($normalized['uuid'], $expected_array['uuid'], 'Non-translatable fields is normalized.');
+    $this->assertEqual($normalized['name'], $expected_array['name'], 'Translatable field with multiple language values is normalized.');
+    $this->assertEqual($normalized['field_test_text'], $expected_array['field_test_text'], 'Field with properties is normalized.');
+    $this->assertEqual($normalized['_embedded'][$relation_uri], $expected_array['_embedded'][$relation_uri], 'Entity reference field is normalized.');
+    $this->assertEqual($normalized['_links'][$relation_uri], $expected_array['_links'][$relation_uri], 'Links are added for entity reference field.');
+  }
+
+  /**
+   * Constructs the entity URI.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity.
+   *
+   * @return string
+   *   The entity URI.
+   */
+  protected function getEntityUri(EntityInterface $entity) {
+    $url = $entity->urlInfo('canonical', ['absolute' => TRUE]);
+    return $url->setRouteParameter('_format', 'hal_json')->toString();
+  }
+
+}
diff --git a/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php b/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
new file mode 100644
index 0000000..3ee7b43
--- /dev/null
+++ b/core/modules/hal/tests/src/Kernel/NormalizerTestBase.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\hal\Kernel\NormalizerTestBase.
+ */
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\Core\Cache\MemoryBackend;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\hal\Encoder\JsonEncoder;
+use Drupal\hal\Normalizer\ContentEntityNormalizer;
+use Drupal\hal\Normalizer\EntityReferenceItemNormalizer;
+use Drupal\hal\Normalizer\FieldItemNormalizer;
+use Drupal\hal\Normalizer\FieldNormalizer;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\rest\LinkManager\LinkManager;
+use Drupal\rest\LinkManager\RelationLinkManager;
+use Drupal\rest\LinkManager\TypeLinkManager;
+use Drupal\serialization\EntityResolver\ChainEntityResolver;
+use Drupal\serialization\EntityResolver\TargetIdResolver;
+use Drupal\serialization\EntityResolver\UuidResolver;
+use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\Serializer\Serializer;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Test the HAL normalizer.
+ */
+abstract class NormalizerTestBase extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter'];
+
+  /**
+   * The mock serializer.
+   *
+   * @var \Symfony\Component\Serializer\Serializer
+   */
+  protected $serializer;
+
+  /**
+   * The format being tested.
+   *
+   * @var string
+   */
+  protected $format = 'hal_json';
+
+  /**
+   * The class name of the test class.
+   *
+   * @var string
+   */
+  protected $entityClass = 'Drupal\entity_test\Entity\EntityTest';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    // If the concrete test sub-class installs the Node or Comment modules,
+    // ensure that the node and comment entity schema are created before the
+    // field configurations are installed. This is because the entity tables
+    // need to be created before the body field storage tables. This prevents
+    // trying to create the body field tables twice.
+    $class = get_class($this);
+    while ($class) {
+      if (property_exists($class, 'modules')) {
+        // Only check the modules, if the $modules property was not inherited.
+        $rp = new \ReflectionProperty($class, 'modules');
+        if ($rp->class == $class) {
+          foreach (array_intersect(array('node', 'comment'), $class::$modules) as $module) {
+            $this->installEntitySchema($module);
+          }
+        }
+      }
+      $class = get_parent_class($class);
+    }
+    $this->installConfig(array('field', 'language'));
+    \Drupal::service('router.builder')->rebuild();
+
+    // Add German as a language.
+    ConfigurableLanguage::create(array(
+      'id' => 'de',
+      'label' => 'Deutsch',
+      'weight' => -1,
+    ))->save();
+
+    // Create the test text field.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_test_text',
+      'entity_type' => 'entity_test',
+      'type' => 'text',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test_text',
+      'bundle' => 'entity_test',
+      'translatable' => FALSE,
+    ])->save();
+
+    // Create the test translatable field.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_test_translatable_text',
+      'entity_type' => 'entity_test',
+      'type' => 'text',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test_translatable_text',
+      'bundle' => 'entity_test',
+      'translatable' => TRUE,
+    ])->save();
+
+    // Create the test entity reference field.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_test_entity_reference',
+      'entity_type' => 'entity_test',
+      'type' => 'entity_reference',
+      'settings' => array(
+        'target_type' => 'entity_test',
+      ),
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test_entity_reference',
+      'bundle' => 'entity_test',
+      'translatable' => TRUE,
+    ])->save();
+
+    $entity_manager = \Drupal::entityManager();
+    $link_manager = new LinkManager(new TypeLinkManager(new MemoryBackend('default'), \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')), new RelationLinkManager(new MemoryBackend('default'), $entity_manager, \Drupal::moduleHandler(), \Drupal::service('config.factory'), \Drupal::service('request_stack')));
+
+    $chain_resolver = new ChainEntityResolver(array(new UuidResolver($entity_manager), new TargetIdResolver()));
+
+    // Set up the mock serializer.
+    $normalizers = array(
+      new ContentEntityNormalizer($link_manager, $entity_manager, \Drupal::moduleHandler()),
+      new EntityReferenceItemNormalizer($link_manager, $chain_resolver),
+      new FieldItemNormalizer(),
+      new FieldNormalizer(),
+    );
+
+    $encoders = array(
+      new JsonEncoder(),
+    );
+    $this->serializer = new Serializer($normalizers, $encoders);
+  }
+
+}
diff --git a/core/modules/help/help.api.php b/core/modules/help/help.api.php
index 60c6867..aff491c 100644
--- a/core/modules/help/help.api.php
+++ b/core/modules/help/help.api.php
@@ -21,9 +21,9 @@
  * The page-specific help information provided by this hook appears in the
  * Help block (provided by the core Help module), if the block is displayed on
  * that page. The module overview help information is displayed by the Help
- * module. It can be accessed from the page at admin/help or from the Extend
- * Extend page. If a module implements hook_help() the help system expects
- * module overview help to be provided.
+ * module. It can be accessed from the page at /admin/help or from the Extend
+ * page. If a module implements hook_help() the help system expects module
+ * overview help to be provided.
  *
  * For detailed usage examples of:
  * - Module overview help, see content_translation_help(). Module overview
@@ -40,8 +40,9 @@
  *   The current route match. This can be used to generate different help
  *   output for different pages that share the same route.
  *
- * @return string
- *   A localized string containing the help text.
+ * @return string|array
+ *   A render array, localized string, or object that can be rendered into
+ *   a string, containing the help text.
  */
 function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_match) {
   switch ($route_name) {
@@ -56,5 +57,24 @@ function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_
 }
 
 /**
+ * Perform alterations on help page section plugin definitions.
+ *
+ * Sections for the page at /admin/help are provided by plugins. This hook
+ * allows modules to alter the plugin definitions.
+ *
+ * @param array $info
+ *   Array of plugin information exposed by hook page section plugins, altered
+ *   by reference.
+ *
+ * @see \Drupal\help\HelpSectionPluginInterface
+ * @see \Drupal\help\Annotation\HelpSection
+ * @see \Drupal\help\HelpSectionManager
+ */
+function hook_help_section_info_alter(&$info) {
+  // Alter the header for the module overviews section.
+  $info['hook_help']['header'] = t('Overviews of modules');
+}
+
+/**
  * @} End of "addtogroup hooks".
  */
diff --git a/core/modules/help/help.module b/core/modules/help/help.module
index 0aadd5b..c41cd98 100644
--- a/core/modules/help/help.module
+++ b/core/modules/help/help.module
@@ -5,8 +5,8 @@
  * Manages displaying online help.
  */
 
-use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Block\BlockPluginInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
 
 /**
  * Implements hook_help().
@@ -25,8 +25,8 @@ function help_help($route_name, RouteMatchInterface $route_match) {
         $output .= '<li>' . t('<strong>Start posting content</strong> Finally, you may <a href=":content">add new content</a> to your website.', array(':content' => \Drupal::url('node.add_page'))) . '</li>';
       }
       $output .= '</ol>';
-      $output .= '<p>' . t('For more information, refer to the subjects listed in the Help Topics section or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')) . '</p>';
-      return $output;
+      $output .= '<p>' . t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')) . '</p>';
+      return ['#markup' => $output];
 
     case 'help.page.help':
       $output = '';
@@ -39,11 +39,27 @@ function help_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Providing page-specific help') . '</dt>';
       $output .= '<dd>' . t('Page-specific help text provided by modules is displayed in the Help block. This block can be placed and configured on the <a href=":blocks">Block layout page</a>.', array(':blocks' => (\Drupal::moduleHandler()->moduleExists('block')) ? \Drupal::url('block.admin_display') : '#')) . '</dd>';
       $output .= '</dl>';
-      return $output;
+      return ['#markup' => $output];
   }
 }
 
 /**
+ * Implements hook_theme().
+ */
+function help_theme($existing, $type, $theme, $path) {
+  return [
+    'help_section' => [
+      'variables' => [
+        'title' => NULL,
+        'description' => NULL,
+        'links' => NULL,
+        'empty' => NULL,
+      ],
+    ],
+  ];
+}
+
+/**
  * Implements hook_preprocess_HOOK() for block templates.
  */
 function help_preprocess_block(&$variables) {
diff --git a/core/modules/help/help.services.yml b/core/modules/help/help.services.yml
new file mode 100644
index 0000000..26a2c33
--- /dev/null
+++ b/core/modules/help/help.services.yml
@@ -0,0 +1,4 @@
+services:
+  plugin.manager.help_section:
+    class: Drupal\help\HelpSectionManager
+    parent: default_plugin_manager
diff --git a/core/modules/help/src/Annotation/HelpSection.php b/core/modules/help/src/Annotation/HelpSection.php
new file mode 100644
index 0000000..d43156d
--- /dev/null
+++ b/core/modules/help/src/Annotation/HelpSection.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\Annotation\HelpSection.
+ */
+
+namespace Drupal\help\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines a Plugin annotation object for help page section plugins.
+ *
+ * Plugin Namespace: Plugin\HelpSection
+ *
+ * For a working example, see \Drupal\help\Plugin\HelpSection\HookHelpSection.
+ *
+ * @see \Drupal\help\HelpSectionPluginInterface
+ * @see \Drupal\help\Plugin\HelpSection\HelpSectionPluginBase
+ * @see \Drupal\help\HelpSectionManager
+ * @see hook_help_section_info_alter()
+ * @see plugin_api
+ *
+ * @Annotation
+ */
+class HelpSection extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The text to use as the title of the help page section.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
+   */
+  public $title;
+
+  /**
+   * The description of the help page section.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
+   */
+  public $description;
+
+  /**
+   * The (optional) permission needed to view the help section.
+   *
+   * Only set if this section needs its own permission, beyond the generic
+   * 'access administration pages' permission needed to see the /admin/help
+   * page itself.
+   *
+   * @var string
+   */
+  public $permission = '';
+
+}
diff --git a/core/modules/help/src/Controller/HelpController.php b/core/modules/help/src/Controller/HelpController.php
index dcb50bd..61793d5 100644
--- a/core/modules/help/src/Controller/HelpController.php
+++ b/core/modules/help/src/Controller/HelpController.php
@@ -7,9 +7,10 @@
 
 namespace Drupal\help\Controller;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
+use Drupal\help\HelpSectionManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -26,13 +27,23 @@ class HelpController extends ControllerBase {
   protected $routeMatch;
 
   /**
+   * The help section plugin manager.
+   *
+   * @var \Drupal\help\HelpSectionManager
+   */
+  protected $helpManager;
+
+  /**
    * Creates a new HelpController.
    *
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The current route match.
+   * @param \Drupal\help\HelpSectionManager $help_manager
+   *   The help section manager.
    */
-  public function __construct(RouteMatchInterface $route_match) {
+  public function __construct(RouteMatchInterface $route_match, HelpSectionManager $help_manager) {
     $this->routeMatch = $route_match;
+    $this->helpManager = $help_manager;
   }
 
   /**
@@ -40,62 +51,57 @@ public function __construct(RouteMatchInterface $route_match) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('current_route_match')
+      $container->get('current_route_match'),
+      $container->get('plugin.manager.help_section')
     );
   }
 
   /**
-   * Prints a page listing a glossary of Drupal terminology.
+   * Prints a page listing various types of help.
+   *
+   * The page has sections defined by \Drupal\help\HelpSectionPluginInterface
+   * plugins.
    *
-   * @return string
-   *   An HTML string representing the contents of help page.
+   * @return array
+   *   A render array for the help page.
    */
   public function helpMain() {
-    $output = array(
-      '#markup' => '<h2>' . $this->t('Help topics') . '</h2><p>' . $this->t('Help is available on the following items:') . '</p>',
-      'links' => $this->helpLinksAsList(),
-    );
-    return $output;
-  }
+    $output = [];
 
-  /**
-   * Provides a formatted list of available help topics.
-   *
-   * @return string
-   *   A string containing the formatted list.
-   */
-  protected function helpLinksAsList() {
-    $modules = array();
-    foreach ($this->moduleHandler()->getImplementations('help') as $module) {
-      $modules[$module] = $this->moduleHandler->getName($module);
-    }
-    asort($modules);
-
-    // Output pretty four-column list.
-    $count = count($modules);
-    $break = ceil($count / 4);
-    $column = array(
-      '#type' => 'container',
-      'links' => array('#theme' => 'item_list'),
-      '#attributes' => array('class' => array('layout-column', 'layout-column--quarter')),
-    );
-    $output = array(
-      '#prefix' => '<div class="clearfix">',
-      '#suffix' => '</div>',
-      0 => $column,
-    );
+    // We are checking permissions, so add the user.permissions cache context.
+    $cacheability = new CacheableMetadata();
+    $cacheability->addCacheContexts(['user.permissions']);
+
+    $plugins = $this->helpManager->getDefinitions();
+    $cacheability->addCacheableDependency($this->helpManager);
 
-    $i = 0;
-    $current_column = 0;
-    foreach ($modules as $module => $name) {
-      $output[$current_column]['links']['#items'][] = $this->l($name, new Url('help.page', array('name' => $module)));
-      if (($i + 1) % $break == 0 && ($i + 1) != $count) {
-        $current_column++;
-        $output[$current_column] = $column;
+    foreach ($plugins as $plugin_id => $plugin_definition) {
+      // Check the provided permission.
+      if (!empty($plugin_definition['permission']) && !$this->currentuser()->hasPermission($plugin_definition['permission'])) {
+        continue;
       }
-      $i++;
+
+      // Add the section to the page.
+      /** @var \Drupal\help\HelpSectionPluginInterface $plugin */
+      $plugin = $this->helpManager->createInstance($plugin_id);
+      $this_output = [
+        '#theme' => 'help_section',
+        '#title' => $plugin->getTitle(),
+        '#description' => $plugin->getDescription(),
+        '#empty' => $this->t('There is currently nothing in this section.'),
+        '#links' => [],
+      ];
+
+      $links = $plugin->listTopics();
+      if (is_array($links) && count($links)) {
+        $this_output['#links'] = $links;
+      }
+
+      $cacheability->addCacheableDependency($plugin);
+      $output[$plugin_id] = $this_output;
     }
 
+    $cacheability->applyTo($output);
     return $output;
   }
 
@@ -116,12 +122,20 @@ public function helpPage($name) {
       $module_name =  $this->moduleHandler()->getName($name);
       $build['#title'] = $module_name;
 
+      $info = system_get_info('module', $name);
+      if ($info['package'] === 'Core (Experimental)') {
+        drupal_set_message($this->t('This module is experimental. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', [':url' => 'https://www.drupal.org/core/experimental']), 'warning');
+      }
+
       $temp = $this->moduleHandler()->invoke($name, 'help', array("help.page.$name", $this->routeMatch));
       if (empty($temp)) {
-        $build['top']['#markup'] = $this->t('No help is available for module %module.', array('%module' => $module_name));
+        $build['top'] = ['#markup' => $this->t('No help is available for module %module.', array('%module' => $module_name))];
       }
       else {
-        $build['top']['#markup'] = $temp;
+        if (!is_array($temp)) {
+          $temp = ['#markup' => $temp];
+        }
+        $build['top'] = $temp;
       }
 
       // Only print list of administration pages if the module in question has
diff --git a/core/modules/help/src/HelpSectionManager.php b/core/modules/help/src/HelpSectionManager.php
new file mode 100644
index 0000000..45dfa3c
--- /dev/null
+++ b/core/modules/help/src/HelpSectionManager.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\HelpSectionManager.
+ */
+
+namespace Drupal\help;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+
+/**
+ * Manages help page section plugins.
+ *
+ * @see \Drupal\help\HelpSectionPluginInterface
+ * @see \Drupal\help\Plugin\HelpSection\HelpSectionPluginBase
+ * @see \Drupal\help\Annotation\HelpSection
+ * @see hook_help_section_info_alter()
+ */
+class HelpSectionManager extends DefaultPluginManager {
+
+  /**
+   * Constructs a new HelpSectionManager.
+   *
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler for the alter hook.
+   */
+  public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
+    parent::__construct('Plugin/HelpSection', $namespaces, $module_handler, 'Drupal\help\HelpSectionPluginInterface', 'Drupal\help\Annotation\HelpSection');
+
+    $this->alterInfo('help_section_info');
+    $this->setCacheBackend($cache_backend, 'help_section_plugins');
+  }
+
+}
diff --git a/core/modules/help/src/HelpSectionPluginInterface.php b/core/modules/help/src/HelpSectionPluginInterface.php
new file mode 100644
index 0000000..49bc463
--- /dev/null
+++ b/core/modules/help/src/HelpSectionPluginInterface.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\HelpSectionPluginInterface.
+ */
+
+namespace Drupal\help;
+
+use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Cache\CacheableDependencyInterface;
+
+/**
+ * Provides an interface for a plugin for a section of the /admin/help page.
+ *
+ * Plugins of this type need to be annotated with
+ * \Drupal\help\Annotation\HelpSection annotation, and placed in the
+ * Plugin\HelpSection namespace directory. They are managed by the
+ * \Drupal\help\HelpSectionManager plugin manager class. There is a base
+ * class that may be helpful:
+ * \Drupal\help\Plugin\HelpSection\HelpSectionPluginBase.
+ */
+interface HelpSectionPluginInterface extends PluginInspectionInterface, CacheableDependencyInterface {
+
+
+  /**
+   * Returns the title of the help section.
+   *
+   * @return string
+   *   The title text, which could be a plain string or an object that can be
+   *   cast to a string.
+   */
+  public function getTitle();
+
+  /**
+   * Returns the description text for the help section.
+   *
+   * @return string
+   *   The description text, which could be a plain string or an object that
+   *   can be cast to a string.
+   */
+  public function getDescription();
+
+  /**
+   * Returns a list of topics to show in the help section.
+   *
+   * @return array
+   *   A sorted list of topic links or render arrays for topic links. The links
+   *   will be shown in the help section; if the returned array of links is
+   *   empty, the section will be shown with some generic empty text.
+   */
+  public function listTopics();
+
+}
diff --git a/core/modules/help/src/Plugin/Block/HelpBlock.php b/core/modules/help/src/Plugin/Block/HelpBlock.php
index af71928..829407a 100644
--- a/core/modules/help/src/Plugin/Block/HelpBlock.php
+++ b/core/modules/help/src/Plugin/Block/HelpBlock.php
@@ -90,8 +90,8 @@ public static function create(ContainerInterface $container, array $configuratio
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The current request.
    *
-   * @return string
-   *   Help text of the matched route item as HTML.
+   * @return array|string
+   *   Render array or string containing the help of the matched route item.
    */
   protected function getActiveHelp(Request $request) {
     // Do not show on a 403 or 404 page.
@@ -100,7 +100,15 @@ protected function getActiveHelp(Request $request) {
     }
 
     $help = $this->moduleHandler->invokeAll('help', array($this->routeMatch->getRouteName(), $this->routeMatch));
-    return $help ? implode("\n", $help) : '';
+    $build = [];
+    foreach ($help as $item) {
+      if (!is_array($item)) {
+        $item = ['#markup' => $item];
+      }
+      $build[] = $item;
+    }
+
+    return $build;
   }
 
   /**
@@ -111,10 +119,11 @@ public function build() {
     if (!$help) {
       return [];
     }
+    elseif (!is_array($help)) {
+      return ['#markup' => $help];
+    }
     else {
-      return [
-        '#children' => $help,
-      ];
+      return $help;
     }
   }
 
@@ -122,9 +131,7 @@ public function build() {
    * {@inheritdoc}
    */
   public function getCacheContexts() {
-    // The "Help" block must be cached per URL: help is defined for a
-    // given path, and does not come with any access restrictions.
-    return Cache::mergeContexts(parent::getCacheContexts(), ['url']);
+    return Cache::mergeContexts(parent::getCacheContexts(), ['route']);
   }
 
 }
diff --git a/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php b/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php
new file mode 100644
index 0000000..c593473
--- /dev/null
+++ b/core/modules/help/src/Plugin/HelpSection/HelpSectionPluginBase.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\Plugin\HelpSection\HelpSectionPluginBase.
+ */
+
+namespace Drupal\help\Plugin\HelpSection;
+
+use Drupal\Core\Cache\UnchangingCacheableDependencyTrait;
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\help\HelpSectionPluginInterface;
+
+/**
+ * Provides a base class for help section plugins.
+ *
+ * @see \Drupal\help\HelpSectionPluginInterface
+ * @see \Drupal\help\Annotation\HelpSection
+ * @see \Drupal\help\HelpSectionManager
+ */
+abstract class HelpSectionPluginBase extends PluginBase implements HelpSectionPluginInterface {
+
+  use UnchangingCacheableDependencyTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return $this->getPluginDefinition()['title'];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return $this->getPluginDefinition()['description'];
+  }
+
+}
diff --git a/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php b/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php
new file mode 100644
index 0000000..e4cf4eb
--- /dev/null
+++ b/core/modules/help/src/Plugin/HelpSection/HookHelpSection.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\Plugin\HelpSection\HookHelpSection.
+ */
+
+namespace Drupal\help\Plugin\HelpSection;
+
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides the module topics list section for the help page.
+ *
+ * @HelpSection(
+ *   id = "hook_help",
+ *   title = @Translation("Module overviews"),
+ *   description = @Translation("Module overviews are provided by modules. Overviews available for your installed modules:"),
+ * )
+ */
+class HookHelpSection extends HelpSectionPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * Constructs a HookHelpSection object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('module_handler')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function listTopics() {
+    $topics = [];
+    foreach ($this->moduleHandler->getImplementations('help') as $module) {
+      $title = $this->moduleHandler->getName($module);
+      $topics[$title] = Link::createFromRoute($title, 'help.page', ['name' => $module]);
+    }
+
+    // Sort topics by title, which is the array key above.
+    ksort($topics);
+    return $topics;
+  }
+
+}
diff --git a/core/modules/help/src/Tests/ExperimentalHelpTest.php b/core/modules/help/src/Tests/ExperimentalHelpTest.php
new file mode 100644
index 0000000..169469f
--- /dev/null
+++ b/core/modules/help/src/Tests/ExperimentalHelpTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\Tests\ExperimentalHelpTest.
+ */
+
+namespace Drupal\help\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Verifies help for experimental modules.
+ *
+ * @group help
+ */
+class ExperimentalHelpTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * The experimental_module_test module implements hook_help() and is in the
+   * Core (Experimental) package.
+   *
+   * @var array
+   */
+  public static $modules = array('help', 'experimental_module_test', 'help_page_test');
+
+  /**
+   * The admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['access administration pages']);
+  }
+
+  /**
+   * Verifies that a warning message is displayed for experimental modules.
+   */
+  public function testExperimentalHelp() {
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('admin/help/experimental_module_test');
+    $this->assertText('This module is experimental.');
+
+    // Regular modules should not display the message.
+    $this->drupalGet('admin/help/help_page_test');
+    $this->assertNoText('This module is experimental.');
+
+    // Ensure the actual help page is displayed to avoid a false positive.
+    $this->assertResponse(200);
+    $this->assertText('online documentation for the Help Page Test module');
+  }
+
+}
diff --git a/core/modules/help/src/Tests/HelpEmptyPageTest.php b/core/modules/help/src/Tests/HelpEmptyPageTest.php
deleted file mode 100644
index 5fd1339..0000000
--- a/core/modules/help/src/Tests/HelpEmptyPageTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\help\Tests\HelpEmptyPageTest.
- */
-
-namespace Drupal\help\Tests;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Routing\RouteMatch;
-use Drupal\help_test\SupernovaGenerator;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the empty HTML page.
- *
- * @group help
- */
-class HelpEmptyPageTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'help_test', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', 'router');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function containerBuild(ContainerBuilder $container) {
-    parent::containerBuild($container);
-
-    $container->set('url_generator', new SupernovaGenerator());
-  }
-
-  /**
-   * Ensures that no URL generator is called on a page without hook_help().
-   */
-  public function testEmptyHookHelp() {
-    $all_modules = system_rebuild_module_data();
-    $all_modules = array_filter($all_modules, function ($module) {
-      // Filter contrib, hidden, already enabled modules and modules in the
-      // Testing package.
-      if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing') {
-        return FALSE;
-      }
-      return TRUE;
-    });
-
-    \Drupal::service('module_installer')->install(array_keys($all_modules));
-
-    $route = \Drupal::service('router.route_provider')->getRouteByName('<front>');
-    \Drupal::service('module_handler')->invokeAll('help', ['<front>', new RouteMatch('<front>', $route)]);
-  }
-
-}
diff --git a/core/modules/help/src/Tests/HelpTest.php b/core/modules/help/src/Tests/HelpTest.php
index 64ad4a7..4f90cb7 100644
--- a/core/modules/help/src/Tests/HelpTest.php
+++ b/core/modules/help/src/Tests/HelpTest.php
@@ -20,11 +20,12 @@ class HelpTest extends WebTestBase {
    * Modules to enable.
    *
    * The help_test module implements hook_help() but does not provide a module
-   * overview page.
+   * overview page. The help_page_test module has a page section plugin that
+   * returns no links.
    *
    * @var array.
    */
-  public static $modules = array('help_test');
+  public static $modules = array('help_test', 'help_page_test');
 
   /**
    * Use the Standard profile to test help implementations of many core modules.
@@ -52,7 +53,7 @@ protected function setUp() {
   }
 
   /**
-   * Logs in users, creates dblog events, and tests dblog functionality.
+   * Logs in users, tests help pages.
    */
   public function testHelp() {
     // Login the root user to ensure as many admin links appear as possible on
@@ -67,10 +68,16 @@ public function testHelp() {
     // Verify that introductory help text exists, goes for 100% module coverage.
     $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/help');
-    $this->assertRaw(t('For more information, refer to the subjects listed in the Help Topics section or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')), 'Help intro text correctly appears.');
+    $this->assertRaw(t('For more information, refer to the help listed on this page or to the <a href=":docs">online documentation</a> and <a href=":support">support</a> pages at <a href=":drupal">drupal.org</a>.', array(':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org')));
 
-    // Verify that help topics text appears.
-    $this->assertRaw('<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>', 'Help topics text correctly appears.');
+    // Verify that hook_help() section title and description appear.
+    $this->assertRaw('<h2>' . t('Module overviews') . '</h2>');
+    $this->assertRaw('<p>' . t('Module overviews are provided by modules. Overviews available for your installed modules:'), '</p>');
+
+    // Verify that an empty section is handled correctly.
+    $this->assertRaw('<h2>' . t('Empty section') . '</h2>');
+    $this->assertRaw('<p>' . t('This description should appear.'), '</p>');
+    $this->assertText(t('There is currently nothing in this section.'));
 
     // Make sure links are properly added for modules implementing hook_help().
     foreach ($this->getModuleList() as $module => $name) {
@@ -81,10 +88,25 @@ public function testHelp() {
     // handled correctly.
     $this->clickLink(\Drupal::moduleHandler()->getName('help_test'));
     $this->assertRaw(t('No help is available for module %module.', array('%module' => \Drupal::moduleHandler()->getName('help_test'))));
+
+    // Verify that the order of topics is alphabetical by displayed module
+    // name, by checking the order of some modules, including some that would
+    // have a different order if it was done by machine name instead.
+    $this->drupalGet('admin/help');
+    $page_text = $this->getTextContent();
+    $start = strpos($page_text, 'Module overviews');
+    $pos = $start;
+    $list = ['Block', 'Color', 'Custom Block', 'History', 'Text Editor'];
+    foreach ($list as $name) {
+      $this->assertLink($name);
+      $new_pos = strpos($page_text, $name, $start);
+      $this->assertTrue($new_pos > $pos, 'Order of ' . $name . ' is correct on page');
+      $pos = $new_pos;
+    }
   }
 
   /**
-   * Verifies the logged in user has access to the various help nodes.
+   * Verifies the logged in user has access to the various help pages.
    *
    * @param int $response
    *   (optional) An HTTP response code. Defaults to 200.
@@ -100,7 +122,7 @@ protected function verifyHelp($response = 200) {
     }
 
     foreach ($this->getModuleList() as $module => $name) {
-      // View module help node.
+      // View module help page.
       $this->drupalGet('admin/help/' . $module);
       $this->assertResponse($response);
       if ($response == 200) {
diff --git a/core/modules/help/src/Tests/NoHelpTest.php b/core/modules/help/src/Tests/NoHelpTest.php
index f0213a9..cce40b2 100644
--- a/core/modules/help/src/Tests/NoHelpTest.php
+++ b/core/modules/help/src/Tests/NoHelpTest.php
@@ -43,7 +43,7 @@ public function testMainPageNoHelp() {
 
     $this->drupalGet('admin/help');
     $this->assertResponse(200);
-    $this->assertText('Help is available on the following items', 'Help page is found.');
+    $this->assertText('Module overviews are provided by modules');
     $this->assertFalse(\Drupal::moduleHandler()->implementsHook('menu_test', 'help'), 'The menu_test module does not implement hook_help');
     $this->assertNoText(\Drupal::moduleHandler()->getName('menu_test'), 'Making sure the test module menu_test does not display a help link on admin/help.');
 
diff --git a/core/modules/help/templates/help-section.html.twig b/core/modules/help/templates/help-section.html.twig
new file mode 100644
index 0000000..9d63b4b
--- /dev/null
+++ b/core/modules/help/templates/help-section.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a section of the help page.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ *
+ * @ingroup themeable
+ */
+#}
+<h2>{{ title }}</h2>
+<p>{{ description }}</p>
+{% if links %}
+  <ul>
+  {% for link in links %}
+    <li>{{ link }}</li>
+  {% endfor %}
+  </ul>
+{% else %}
+  <p>{{ empty }}</p>
+{% endif %}
diff --git a/core/modules/help/tests/modules/help_page_test/help_page_test.info.yml b/core/modules/help/tests/modules/help_page_test/help_page_test.info.yml
new file mode 100644
index 0000000..7de2a0d
--- /dev/null
+++ b/core/modules/help/tests/modules/help_page_test/help_page_test.info.yml
@@ -0,0 +1,7 @@
+name: 'Help Page Test'
+type: module
+description: 'Module to test the help page.'
+package: Testing
+version: VERSION
+core: 8.x
+hidden: true
diff --git a/core/modules/help/tests/modules/help_page_test/help_page_test.module b/core/modules/help/tests/modules/help_page_test/help_page_test.module
new file mode 100644
index 0000000..68639a8
--- /dev/null
+++ b/core/modules/help/tests/modules/help_page_test/help_page_test.module
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Help Page Test module to test the help page.
+ */
+
+use \Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function help_page_test_help($route_name, RouteMatchInterface $route_match) {
+
+  switch ($route_name) {
+    case 'help.page.help_page_test':
+      // Make the help text conform to core standards. See
+      // \Drupal\system\Tests\Module\InstallUninstallTest::assertHelp().
+      return t('Read the <a href=":url">online documentation for the Help Page Test module</a>.', [':url' => 'http://www.example.com']);
+  }
+
+}
diff --git a/core/modules/help/tests/modules/help_page_test/src/Plugin/HelpSection/EmptyHelpSection.php b/core/modules/help/tests/modules/help_page_test/src/Plugin/HelpSection/EmptyHelpSection.php
new file mode 100644
index 0000000..f7adac7
--- /dev/null
+++ b/core/modules/help/tests/modules/help_page_test/src/Plugin/HelpSection/EmptyHelpSection.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help_page_test\Plugin\HelpSection\EmptyHelpSection.
+ */
+
+namespace Drupal\help_page_test\Plugin\HelpSection;
+
+use Drupal\help\Plugin\HelpSection\HelpSectionPluginBase;
+
+/**
+ * Provides an empty section for the help page, for testing.
+ *
+ * @HelpSection(
+ *   id = "empty_section",
+ *   title = @Translation("Empty section"),
+ *   description = @Translation("This description should appear."),
+ * )
+ */
+class EmptyHelpSection extends HelpSectionPluginBase {
+  /**
+   * {@inheritdoc}
+   */
+  public function listTopics() {
+    return [];
+  }
+
+}
diff --git a/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php b/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php
new file mode 100644
index 0000000..7e48957
--- /dev/null
+++ b/core/modules/help/tests/src/Kernel/HelpEmptyPageTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\help\Kernel\HelpEmptyPageTest.
+ */
+
+namespace Drupal\Tests\help\Kernel;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Routing\RouteMatch;
+use Drupal\help_test\SupernovaGenerator;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the empty HTML page.
+ *
+ * @group help
+ */
+class HelpEmptyPageTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'help_test', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+
+    $container->set('url_generator', new SupernovaGenerator());
+  }
+
+  /**
+   * Ensures that no URL generator is called on a page without hook_help().
+   */
+  public function testEmptyHookHelp() {
+    $all_modules = system_rebuild_module_data();
+    $all_modules = array_filter($all_modules, function ($module) {
+      // Filter contrib, hidden, already enabled modules and modules in the
+      // Testing package.
+      if ($module->origin !== 'core' || !empty($module->info['hidden']) || $module->status == TRUE || $module->info['package'] == 'Testing') {
+        return FALSE;
+      }
+      return TRUE;
+    });
+
+    $this->enableModules(array_keys($all_modules));
+    $this->installEntitySchema('menu_link_content');
+
+    $route = \Drupal::service('router.route_provider')->getRouteByName('<front>');
+    \Drupal::service('module_handler')->invokeAll('help', ['<front>', new RouteMatch('<front>', $route)]);
+  }
+
+}
diff --git a/core/modules/history/history.install b/core/modules/history/history.install
index dcfd871..ede5255 100644
--- a/core/modules/history/history.install
+++ b/core/modules/history/history.install
@@ -5,6 +5,8 @@
  * Installation functions for History module.
  */
 
+use Drupal\Core\Database\Database;
+
 /**
  * Implements hook_schema().
  */
@@ -21,6 +23,7 @@ function history_schema() {
       'nid' => array(
         'description' => 'The {node}.nid that was read.',
         'type' => 'int',
+        'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
       ),
@@ -39,3 +42,59 @@ function history_schema() {
 
   return $schema;
 }
+
+/**
+ * @defgroup updates-8.0.x-to-8.1.x Updates from 8.0.x to 8.1.x
+ * @{
+ * Update functions from 8.0.x to 8.1.x.
+ */
+
+/**
+ * Change {history}.nid to an unsigned int in order to match {node}.nid.
+ */
+function history_update_8101() {
+  $schema = Database::getConnection()->schema();
+  $schema->dropPrimaryKey('history');
+  $schema->dropIndex('history', 'nid');
+  $schema->changeField('history', 'nid', 'nid', array(
+    'description' => 'The {node}.nid that was read.',
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 0,
+  ));
+  $schema->addPrimaryKey('history', array('uid', 'nid'));
+  $spec = array(
+    'description' => 'A record of which {users} have read which {node}s.',
+    'fields' => array(
+      'uid' => array(
+        'description' => 'The {users}.uid that read the {node} nid.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'nid' => array(
+        'description' => 'The {node}.nid that was read.',
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'timestamp' => array(
+        'description' => 'The Unix timestamp at which the read occurred.',
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+    ),
+    'primary key' => array('uid', 'nid'),
+    'indexes' => array(
+      'nid' => array('nid'),
+    ),
+  );
+  $schema->addIndex('history', 'nid', array('nid'), $spec);
+}
+
+/**
+ * @} End of "defgroup updates-8.0.x-to-8.1.x".
+ */
diff --git a/core/modules/image/config/schema/image.source.schema.yml b/core/modules/image/config/schema/image.source.schema.yml
deleted file mode 100644
index 1230023..0000000
--- a/core/modules/image/config/schema/image.source.schema.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-migrate.source.d6_imagecache_presets:
-  type: migrate_source_sql
-  label: 'Drupal 6 ImageCache Presets'
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 97b3dd2..7f8314a 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -14,26 +14,36 @@
 
 /**
  * Image style constant for user presets in the database.
+ *
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
  */
 const IMAGE_STORAGE_NORMAL = 1;
 
 /**
  * Image style constant for user presets that override module-defined presets.
+ *
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
  */
 const IMAGE_STORAGE_OVERRIDE = 2;
 
 /**
  * Image style constant for module-defined presets in code.
+ *
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
  */
 const IMAGE_STORAGE_DEFAULT = 4;
 
 /**
  * Image style constant to represent an editable preset.
+ *
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
  */
 define('IMAGE_STORAGE_EDITABLE', IMAGE_STORAGE_NORMAL | IMAGE_STORAGE_OVERRIDE);
 
 /**
  * Image style constant to represent any module-based preset.
+ *
+ * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.0.
  */
 define('IMAGE_STORAGE_MODULE', IMAGE_STORAGE_OVERRIDE | IMAGE_STORAGE_DEFAULT);
 
@@ -66,7 +76,7 @@ function image_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dd>' . t('For accessibility and search engine optimization, all images that convey meaning on web sites should have alternate text. Drupal also allows entry of title text for images, but it can lead to confusion for screen reader users and its use is not recommended. Image fields can be configured so that alternate and title text fields are enabled or disabled; if enabled, the fields can be set to be required. The recommended setting is to enable and require alternate text and disable title text.') . '</dd>';
       $output .= '<dd>' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the <a href=":file-system">File system page</a>. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the <a href=":system-help">System module help page</a>.', array(':file-system' => \Drupal::url('system.file_system_settings'), ':system-help' => \Drupal::url('help.page', array('name' => 'system')))) . '</dd>';
       $output .= '<dd>' . t('The maximum file size that can be uploaded is limited by PHP settings of the server, but you can restrict it further by configuring a <em>Maximum upload size</em> in the field settings (this setting can be changed later). The maximum file size, either from PHP server settings or field configuration, is automatically displayed to users in the help text of the image field.') . '</dd>';
-      $output .= '<dd>' . t('You can also configure a minimum and/or maximum resolution for uploaded images. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the <a href=":exif">EXIF data</a> in the image will be lost.', array(':exif' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')) . '</dd>';
+      $output .= '<dd>' . t('You can also configure a minimum and/or maximum resolution for uploaded images. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image will be lost.') . '</dd>';
       $output .= '<dd>' . t('You can also configure a default image that will be used if no image is uploaded in an image field. This default can be defined for all instances of the field in the field storage settings when you create a field, and the setting can be overridden for each entity sub-type that uses the field.') . '</dd>';
       $output .= '<dt>' . t('Configuring displays and form displays') . '</dt>';
       $output .= '<dd>' . t('On the <em>Manage display</em> page, you can choose the image formatter, which determines the image style used to display the image in each display mode and whether or not to display the image as a link. On the <em>Manage form display</em> page, you can configure the image upload widget, including setting the preview image style shown on the entity edit form.') . '</dd>';
diff --git a/core/modules/image/src/Controller/ImageStyleDownloadController.php b/core/modules/image/src/Controller/ImageStyleDownloadController.php
index 200a425..eda399a 100644
--- a/core/modules/image/src/Controller/ImageStyleDownloadController.php
+++ b/core/modules/image/src/Controller/ImageStyleDownloadController.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\image\ImageStyleInterface;
 use Drupal\system\FileDownloadController;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -53,13 +52,11 @@ class ImageStyleDownloadController extends FileDownloadController {
    *   The lock backend.
    * @param \Drupal\Core\Image\ImageFactory $image_factory
    *   The image factory.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
    */
-  public function __construct(LockBackendInterface $lock, ImageFactory $image_factory, LoggerInterface $logger) {
+  public function __construct(LockBackendInterface $lock, ImageFactory $image_factory) {
     $this->lock = $lock;
     $this->imageFactory = $image_factory;
-    $this->logger = $logger;
+    $this->logger = $this->getLogger('image');
   }
 
   /**
@@ -68,8 +65,7 @@ public function __construct(LockBackendInterface $lock, ImageFactory $image_fact
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('lock'),
-      $container->get('image.factory'),
-      $container->get('logger.factory')->get('image')
+      $container->get('image.factory')
     );
   }
 
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index b616b17..a867b9e 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -213,7 +213,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#weight' => 4.1,
       '#field_prefix' => '<div class="container-inline">',
       '#field_suffix' => '</div>',
-      '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href=":url">EXIF data</a> in the image.', array(':url' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')),
+      '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
     );
     $element['max_resolution']['x'] = array(
       '#type' => 'number',
diff --git a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
index 10ebfb5..cf2b34e 100644
--- a/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
+++ b/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
@@ -98,7 +98,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     if ($cardinality == 1) {
       // If there's only one field, return it as delta 0.
       if (empty($elements[0]['#default_value']['fids'])) {
-        $file_upload_help['#description'] = $this->fieldDefinition->getDescription();
+        $file_upload_help['#description'] = $this->getFilteredDescription();
         $elements[0]['#description'] = \Drupal::service('renderer')->renderPlain($file_upload_help);
       }
     }
diff --git a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
index 2507a8c..3b79e43 100644
--- a/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
+++ b/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
@@ -8,6 +8,7 @@
 namespace Drupal\image\Plugin\ImageEffect;
 
 use Drupal\Component\Utility\Color;
+use Drupal\Component\Utility\Rectangle;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Image\ImageInterface;
 use Drupal\image\ConfigurableImageEffectBase;
@@ -43,14 +44,13 @@ public function applyEffect(ImageInterface $image) {
    * {@inheritdoc}
    */
   public function transformDimensions(array &$dimensions, $uri) {
-    // If the rotate is not random and the angle is a multiple of 90 degrees,
+    // If the rotate is not random and current dimensions are set,
     // then the new dimensions can be determined.
-    if (!$this->configuration['random'] && ((int) ($this->configuration['degrees']) == $this->configuration['degrees']) && ($this->configuration['degrees'] % 90 == 0)) {
-      if ($this->configuration['degrees'] % 180 != 0) {
-        $temp = $dimensions['width'];
-        $dimensions['width'] = $dimensions['height'];
-        $dimensions['height'] = $temp;
-      }
+    if (!$this->configuration['random'] && $dimensions['width'] && $dimensions['height']) {
+      $rect = new Rectangle($dimensions['width'], $dimensions['height']);
+      $rect = $rect->rotate($this->configuration['degrees']);
+      $dimensions['width'] = $rect->getBoundingWidth();
+      $dimensions['height'] = $rect->getBoundingHeight();
     }
     else {
       $dimensions['width'] = $dimensions['height'] = NULL;
diff --git a/core/modules/image/src/Tests/FileMoveTest.php b/core/modules/image/src/Tests/FileMoveTest.php
index 34c54a7..4c11725 100644
--- a/core/modules/image/src/Tests/FileMoveTest.php
+++ b/core/modules/image/src/Tests/FileMoveTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\image\Tests;
 
+use Drupal\file\Entity\File;
 use Drupal\simpletest\WebTestBase;
 use Drupal\image\Entity\ImageStyle;
 
@@ -29,7 +30,7 @@ class FileMoveTest extends WebTestBase {
    */
   function testNormal() {
     // Pick a file for testing.
-    $file = entity_create('file', (array) current($this->drupalGetTestFiles('image')));
+    $file = File::create((array) current($this->drupalGetTestFiles('image')));
 
     // Create derivative image.
     $styles = ImageStyle::loadMultiple();
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 56d80fe..1538769 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -339,7 +339,7 @@ function testStyleReplacement() {
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
-    $style = entity_create('image_style', array('name' => $style_name, 'label' => $style_label));
+    $style = ImageStyle::create(array('name' => $style_name, 'label' => $style_label));
     $style->save();
     $style_path = 'admin/config/media/image-styles/manage/';
 
@@ -444,7 +444,7 @@ public function testFlushUserInterface() {
 
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
-    $style = entity_create('image_style', array('name' => $style_name, 'label' => $this->randomString()));
+    $style = ImageStyle::create(array('name' => $style_name, 'label' => $this->randomString()));
     $style->save();
 
     // Create an image to make sure it gets flushed.
@@ -474,7 +474,7 @@ function testConfigImport() {
     // Create a new style.
     $style_name = strtolower($this->randomMachineName(10));
     $style_label = $this->randomString();
-    $style = entity_create('image_style', array('name' => $style_name, 'label' => $style_label));
+    $style = ImageStyle::create(array('name' => $style_name, 'label' => $style_label));
     $style->save();
 
     // Create an image field that uses the new style.
@@ -520,7 +520,7 @@ function testConfigImport() {
    * Tests access for the image style listing.
    */
   public function testImageStyleAccess() {
-    $style = entity_create('image_style', array('name' => 'style_foo', 'label' => $this->randomString()));
+    $style = ImageStyle::create(array('name' => 'style_foo', 'label' => $this->randomString()));
     $style->save();
 
     $this->drupalGet('admin/config/media/image-styles');
diff --git a/core/modules/image/src/Tests/ImageDimensionsTest.php b/core/modules/image/src/Tests/ImageDimensionsTest.php
index 984e060..f232d71 100644
--- a/core/modules/image/src/Tests/ImageDimensionsTest.php
+++ b/core/modules/image/src/Tests/ImageDimensionsTest.php
@@ -38,7 +38,7 @@ function testImageDimensions() {
 
     // Create a style.
     /** @var $style \Drupal\image\ImageStyleInterface */
-    $style = entity_create('image_style', array('name' => 'test', 'label' => 'Test'));
+    $style = ImageStyle::create(array('name' => 'test', 'label' => 'Test'));
     $style->save();
     $generated_uri = 'public://styles/test/public/'. \Drupal::service('file_system')->basename($original_uri);
     $url = file_url_transform_relative($style->buildUrl($original_uri));
@@ -213,11 +213,14 @@ function testImageDimensions() {
 
     $effect_id = $style->addImageEffect($effect);
     $style->save();
-    $this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" alt="" class="image-style-test" />');
+    $this->assertEqual($this->getImageTag($variables), '<img src="' . $url . '" width="41" height="41" alt="" class="image-style-test" />');
     $this->assertFalse(file_exists($generated_uri), 'Generated file does not exist.');
     $this->drupalGet($this->getAbsoluteUrl($url));
     $this->assertResponse(200, 'Image was generated at the URL.');
     $this->assertTrue(file_exists($generated_uri), 'Generated file does exist after we accessed it.');
+    $image_file = $image_factory->get($generated_uri);
+    $this->assertEqual($image_file->getWidth(), 41);
+    $this->assertEqual($image_file->getHeight(), 41);
 
     $effect_plugin = $style->getEffect($effect_id);
     $style->deleteImageEffect($effect_plugin);
diff --git a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
index ee47e30..627bd74 100644
--- a/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDefaultImagesTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\image\Tests;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\file\Entity\File;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests setting up default images both to the field and field field.
@@ -36,12 +38,12 @@ public function testDefaultImages() {
       $filename = $this->randomMachineName() . "$i";
       $desired_filepath = 'public://' . $filename;
       file_unmanaged_copy($files[0]->uri, $desired_filepath, FILE_EXISTS_ERROR);
-      $file = entity_create('file', array('uri' => $desired_filepath, 'filename' => $filename, 'name' => $filename));
+      $file = File::create(['uri' => $desired_filepath, 'filename' => $filename, 'name' => $filename]);
       $file->save();
     }
     $default_images = array();
     foreach (array('field', 'field', 'field2', 'field_new', 'field_new') as $image_target) {
-      $file = entity_create('file', (array) array_pop($files));
+      $file = File::create((array) array_pop($files));
       $file->save();
       $default_images[$image_target] = $file;
     }
@@ -82,7 +84,7 @@ public function testDefaultImages() {
     $this->assertEqual($field_storage->getSettings()['default_image']['uuid'], $default_images['field']->uuid());
 
     // Add another field with another default image to the page content type.
-    $field2 = entity_create('field_config', array(
+    $field2 = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
       'label' => $field->label(),
@@ -96,7 +98,7 @@ public function testDefaultImages() {
           'height' => 0,
         ),
       ),
-    ));
+    ]);
     $field2->save();
 
     $widget_settings = entity_get_form_display('node', $field->getTargetBundle(), 'default')->getComponent($field_name);
@@ -319,7 +321,7 @@ public function testDefaultImages() {
    * Tests image field and field having an invalid default image.
    */
   public function testInvalidDefaultImage() {
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => Unicode::strtolower($this->randomMachineName()),
       'entity_type' => 'node',
       'type' => 'image',
@@ -334,7 +336,7 @@ public function testInvalidDefaultImage() {
     // The non-existent default image should not be saved.
     $this->assertNull($settings['default_image']['uuid']);
 
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
       'label' => $this->randomMachineName(),
@@ -343,7 +345,7 @@ public function testInvalidDefaultImage() {
           'uuid' => 100000,
         )
       ),
-    ));
+    ]);
     $field->save();
     $settings = $field->getSettings();
     // The non-existent default image should not be saved.
diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php
index bb59f83..79148a3 100644
--- a/core/modules/image/src/Tests/ImageFieldTestBase.php
+++ b/core/modules/image/src/Tests/ImageFieldTestBase.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\image\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * TODO: Test the following functions.
@@ -69,9 +71,11 @@ protected function setUp() {
    *   Widget settings to be added to the widget defaults.
    * @param array $formatter_settings
    *   Formatter settings to be added to the formatter defaults.
+   * @param string $description
+   *   A description for the field.
    */
-  function createImageField($name, $type_name, $storage_settings = array(), $field_settings = array(), $widget_settings = array(), $formatter_settings = array()) {
-    entity_create('field_storage_config', array(
+  function createImageField($name, $type_name, $storage_settings = array(), $field_settings = array(), $widget_settings = array(), $formatter_settings = array(), $description = '') {
+    FieldStorageConfig::create(array(
       'field_name' => $name,
       'entity_type' => 'node',
       'type' => 'image',
@@ -79,14 +83,15 @@ function createImageField($name, $type_name, $storage_settings = array(), $field
       'cardinality' => !empty($storage_settings['cardinality']) ? $storage_settings['cardinality'] : 1,
     ))->save();
 
-    $field_config = entity_create('field_config', array(
+    $field_config = FieldConfig::create([
       'field_name' => $name,
       'label' => $name,
       'entity_type' => 'node',
       'bundle' => $type_name,
       'required' => !empty($field_settings['required']),
       'settings' => $field_settings,
-    ));
+      'description' => $description,
+    ]);
     $field_config->save();
 
     entity_get_form_display('node', $type_name, 'default')
diff --git a/core/modules/image/src/Tests/ImageFieldWidgetTest.php b/core/modules/image/src/Tests/ImageFieldWidgetTest.php
index 8bc70bc..4a80c9a 100644
--- a/core/modules/image/src/Tests/ImageFieldWidgetTest.php
+++ b/core/modules/image/src/Tests/ImageFieldWidgetTest.php
@@ -27,9 +27,10 @@ public function testWidgetElement() {
       'min_resolution' => $min_resolution . 'x' . $min_resolution,
       'alt_field' => 0,
     );
-    $this->createImageField($field_name, 'article', array(), $field_settings);
+    $this->createImageField($field_name, 'article', array(), $field_settings, array(), array(), 'Image test on [site:name]');
     $this->drupalGet('node/add/article');
     $this->assertNotEqual(0, count($this->xpath('//div[contains(@class, "field--widget-image-image")]')), 'Image field widget found on add/node page', 'Browser');
+    $this->assertNoText('Image test on [site:name]');
   }
 
 }
diff --git a/core/modules/image/src/Tests/ImageImportTest.php b/core/modules/image/src/Tests/ImageImportTest.php
deleted file mode 100644
index aa73086..0000000
--- a/core/modules/image/src/Tests/ImageImportTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\ImageImportTest.
- */
-
-namespace Drupal\image\Tests;
-
-use Drupal\image\Entity\ImageStyle;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests config import for Image styles.
- *
- * @group image
- */
-class ImageImportTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['system', 'image', 'image_module_test'];
-
-  /**
-   * Tests importing image styles.
-   */
-  public function testImport() {
-    $style = ImageStyle::create([
-      'name' => 'test'
-    ]);
-
-    $style->addImageEffect(['id' => 'image_module_test_null']);
-    $style->addImageEffect(['id' => 'image_module_test_null']);
-    $style->save();
-
-    $this->assertEqual(count($style->getEffects()), 2);
-
-    $uuid = \Drupal::service('uuid')->generate();
-    $style->set('effects', [
-      $uuid => [
-        'id' => 'image_module_test_null',
-      ],
-    ]);
-    $style->save();
-
-    $style = ImageStyle::load('test');
-    $this->assertEqual(count($style->getEffects()), 1);
-  }
-
-}
diff --git a/core/modules/image/src/Tests/ImageItemTest.php b/core/modules/image/src/Tests/ImageItemTest.php
deleted file mode 100644
index fddbd3f..0000000
--- a/core/modules/image/src/Tests/ImageItemTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\ImageItemTest.
- */
-
-namespace Drupal\image\Tests;
-
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests using entity fields of the image field type.
- *
- * @group image
- */
-class ImageItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('file', 'image');
-
-  /**
-   * Created file entity.
-   *
-   * @var \Drupal\file\Entity\File
-   */
-  protected $image;
-
-  /**
-   * @var \Drupal\Core\Image\ImageFactory
-   */
-  protected $imageFactory;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-    $this->installSchema('file', array('file_usage'));
-
-    entity_create('field_storage_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'image_test',
-      'type' => 'image',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'image_test',
-      'bundle' => 'entity_test',
-    ))->save();
-    file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
-    $this->image = entity_create('file', array(
-      'uri' => 'public://example.jpg',
-    ));
-    $this->image->save();
-    $this->imageFactory = $this->container->get('image.factory');
-  }
-
-  /**
-   * Tests using entity fields of the image field type.
-   */
-  public function testImageItem() {
-    // Create a test entity with the image field set.
-    $entity = entity_create('entity_test');
-    $entity->image_test->target_id = $this->image->id();
-    $entity->image_test->alt = $alt = $this->randomMachineName();
-    $entity->image_test->title = $title = $this->randomMachineName();
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $entity = entity_load('entity_test', $entity->id());
-    $this->assertTrue($entity->image_test instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->image_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->image_test->target_id, $this->image->id());
-    $this->assertEqual($entity->image_test->alt, $alt);
-    $this->assertEqual($entity->image_test->title, $title);
-    $image = $this->imageFactory->get('public://example.jpg');
-    $this->assertEqual($entity->image_test->width, $image->getWidth());
-    $this->assertEqual($entity->image_test->height, $image->getHeight());
-    $this->assertEqual($entity->image_test->entity->id(), $this->image->id());
-    $this->assertEqual($entity->image_test->entity->uuid(), $this->image->uuid());
-
-    // Make sure the computed entity reflects updates to the referenced file.
-    file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example-2.jpg');
-    $image2 = entity_create('file', array(
-      'uri' => 'public://example-2.jpg',
-    ));
-    $image2->save();
-
-    $entity->image_test->target_id = $image2->id();
-    $entity->image_test->alt = $new_alt = $this->randomMachineName();
-    // The width and height is only updated when width is not set.
-    $entity->image_test->width = NULL;
-    $entity->save();
-    $this->assertEqual($entity->image_test->entity->id(), $image2->id());
-    $this->assertEqual($entity->image_test->entity->getFileUri(), $image2->getFileUri());
-    $image = $this->imageFactory->get('public://example-2.jpg');
-    $this->assertEqual($entity->image_test->width, $image->getWidth());
-    $this->assertEqual($entity->image_test->height, $image->getHeight());
-    $this->assertEqual($entity->image_test->alt, $new_alt);
-
-    // Check that the image item can be set to the referenced file directly.
-    $entity->image_test = $this->image;
-    $this->assertEqual($entity->image_test->target_id, $this->image->id());
-
-    // Delete the image and try to save the entity again.
-    $this->image->delete();
-    $entity = entity_create('entity_test', array('mame' => $this->randomMachineName()));
-    $entity->save();
-
-    // Test image item properties.
-    $expected = array('target_id', 'entity', 'alt', 'title', 'width', 'height');
-    $properties = $entity->getFieldDefinition('image_test')->getFieldStorageDefinition()->getPropertyDefinitions();
-    $this->assertEqual(array_keys($properties), $expected);
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->image_test->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
index 81c1628..8987691 100644
--- a/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
+++ b/core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\image\Tests;
 
+use Drupal\image\Entity\ImageStyle;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -31,7 +32,7 @@ class ImageStylesPathAndUrlTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->style = entity_create('image_style', array('name' => 'style_foo', 'label' => $this->randomString()));
+    $this->style = ImageStyle::create(array('name' => 'style_foo', 'label' => $this->randomString()));
     $this->style->save();
   }
 
@@ -237,7 +238,7 @@ function doImageStyleUrlAndPathTests($scheme, $clean_url = TRUE, $extra_slash =
     // image derivative using the first one as a source.
     $nested_url = $this->style->buildUrl($generated_uri, $clean_url);
     $matches_expected_url_format = (boolean) preg_match('/styles\/' . $this->style->id() . '\/' . $scheme . '\/styles\/' . $this->style->id() . '\/' . $scheme . '/', $nested_url);
-    $this->assertTrue($matches_expected_url_format, "Url for a derivative of an image style matches expected format.");
+    $this->assertTrue($matches_expected_url_format, "URL for a derivative of an image style matches expected format.");
     $nested_url_with_wrong_token = str_replace(IMAGE_DERIVATIVE_TOKEN . '=', 'wrongparam=', $nested_url);
     $this->drupalGet($nested_url_with_wrong_token);
     $this->assertResponse(403, 'Image generated from an earlier derivative was inaccessible at the URL with a missing token.');
diff --git a/core/modules/image/src/Tests/ImageThemeFunctionTest.php b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
index 4d4dd98..e2f7e9e 100644
--- a/core/modules/image/src/Tests/ImageThemeFunctionTest.php
+++ b/core/modules/image/src/Tests/ImageThemeFunctionTest.php
@@ -9,7 +9,12 @@
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\file\Entity\File;
+use Drupal\image\Entity\ImageStyle;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests image theme functions.
@@ -40,21 +45,21 @@ class ImageThemeFunctionTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
       'type' => 'image',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => 'entity_test',
       'field_name' => 'image_test',
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
     file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
-    $this->image = entity_create('file', array(
+    $this->image = File::create([
       'uri' => 'public://example.jpg',
-    ));
+    ]);
     $this->image->save();
     $this->imageFactory = $this->container->get('image.factory');
   }
@@ -72,12 +77,12 @@ function testImageFormatterTheme() {
     $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
 
     // Create a style.
-    $style = entity_create('image_style', array('name' => 'test', 'label' => 'Test'));
+    $style = ImageStyle::create(array('name' => 'test', 'label' => 'Test'));
     $style->save();
     $url = file_url_transform_relative($style->buildUrl($original_uri));
 
     // Create a test entity with the image field set.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->image_test->target_id = $this->image->id();
     $entity->image_test->alt = NULL;
     $entity->image_test->uri = $original_uri;
@@ -134,7 +139,7 @@ function testImageStyleTheme() {
     $original_uri = file_unmanaged_copy($file->uri, 'public://', FILE_EXISTS_RENAME);
 
     // Create a style.
-    $style = entity_create('image_style', array('name' => 'image_test', 'label' => 'Test'));
+    $style = ImageStyle::create(array('name' => 'image_test', 'label' => 'Test'));
     $style->save();
     $url = file_url_transform_relative($style->buildUrl($original_uri));
 
diff --git a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
deleted file mode 100644
index 11e5c73..0000000
--- a/core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\Migrate\d6\MigrateImageCacheTest.
- */
-
-namespace Drupal\image\Tests\Migrate\d6;
-
-use Drupal\Core\Database\Database;
-use Drupal\image\Entity\ImageStyle;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests migration of ImageCache presets to image styles.
- *
- * @group image
- */
-class MigrateImageCacheTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['image']);
-  }
-
-  /**
-   * Tests that an exception is thrown when ImageCache is not installed.
-   */
-  public function testMissingTable() {
-    $this->sourceDatabase->update('system')
-      ->fields(array(
-        'status' => 0,
-      ))
-      ->condition('name', 'imagecache')
-      ->condition('type', 'module')
-      ->execute();
-
-    try {
-      Migration::load('d6_imagecache_presets')
-        ->getSourcePlugin()
-        ->checkRequirements();
-      $this->fail('Did not catch expected RequirementsException.');
-    }
-    catch (RequirementsException $e) {
-      $this->pass('Caught expected RequirementsException: ' . $e->getMessage());
-    }
-  }
-
-  /**
-   * Test basic passing migrations.
-   */
-  public function testPassingMigration() {
-    $this->executeMigration('d6_imagecache_presets');
-
-    /** @var \Drupal\image\Entity\ImageStyle $style */
-    $style = ImageStyle::load('big_blue_cheese');
-
-    // Check basic Style info.
-    $this->assertIdentical('big_blue_cheese', $style->get('name'), 'ImageStyle name set correctly');
-    $this->assertIdentical('big_blue_cheese', $style->get('label'), 'ImageStyle label set correctly');
-
-    // Test effects.
-    $effects = $style->getEffects();
-
-    // Check crop effect.
-    $this->assertImageEffect($effects, 'image_crop', [
-      'width' => 555,
-      'height' => 5555,
-      'anchor' => 'center-center',
-    ]);
-
-    // Check resize effect.
-    $this->assertImageEffect($effects, 'image_resize', [
-      'width' => 55,
-      'height' => 55,
-    ]);
-
-    // Check rotate effect.
-    $this->assertImageEffect($effects, 'image_rotate', [
-      'degrees' => 55,
-      'random' => FALSE,
-      'bgcolor' => '',
-    ]);
-  }
-
-  /**
-   * Test that missing actions causes failures.
-   */
-   public function testMissingEffectPlugin() {
-     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
-         'presetid',
-         'weight',
-         'module',
-         'action',
-         'data',
-       ])
-       ->values([
-         'presetid' => '1',
-         'weight' => '0',
-         'module' => 'imagecache',
-         'action' => 'imagecache_deprecated_scale',
-         'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}',
-       ])->execute();
-
-     $this->startCollectingMessages();
-     $this->executeMigration('d6_imagecache_presets');
-     $messages = $this->migration->getIdMap()->getMessageIterator();
-     $count = 0;
-     foreach ($messages as $message) {
-       $count++;
-       $this->assertEqual($message->message, 'The "image_deprecated_scale" plugin does not exist.');
-       $this->assertEqual($message->level, MigrationInterface::MESSAGE_ERROR);
-     }
-     // There should be only the one message.
-     $this->assertEqual($count, 1);
-  }
-
-  /**
-   * Test that missing action's causes failures.
-   */
-   public function testInvalidCropValues() {
-     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
-         'presetid',
-         'weight',
-         'module',
-         'action',
-         'data',
-       ])
-       ->values([
-         'presetid' => '1',
-         'weight' => '0',
-         'module' => 'imagecache',
-         'action' => 'imagecache_crop',
-         'data' => serialize([
-           'xoffset' => '10',
-           'yoffset' => '10',
-         ]),
-       ])->execute();
-
-     $this->startCollectingMessages();
-     $this->executeMigration('d6_imagecache_presets');
-     $this->assertEqual(['error' => [
-       'The Drupal 8 image crop effect does not support numeric values for x and y offsets. Use keywords to set crop effect offsets instead.'
-     ]], $this->migrateMessages);
-  }
-
-  /**
-   * Assert that a given image effect is migrated.
-   *
-   * @param array $collection
-   *   Collection of effects
-   * @param $id
-   *   Id that should exist in the collection.
-   * @param $config
-   *   Expected configuration for the collection.
-   *
-   * @return bool
-   */
-  protected function assertImageEffect($collection, $id, $config) {
-    /** @var \Drupal\image\ConfigurableImageEffectBase $effect */
-    foreach ($collection as $key => $effect) {
-      $effect_config = $effect->getConfiguration();
-
-      if ($effect_config['id'] == $id && $effect_config['data'] == $config) {
-        // We found this effect so succeed and return.
-        return $this->pass('Effect ' . $id . ' imported correctly');
-      }
-    }
-    // The loop did not find the effect so we it was not imported correctly.
-    return $this->fail('Effect ' . $id . ' did not import correctly');
-  }
-
-}
diff --git a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php b/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php
deleted file mode 100644
index f1933da..0000000
--- a/core/modules/image/src/Tests/Migrate/d7/MigrateImageSettingsTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\Migrate\d7\MigrateImageSettingsTest.
- */
-
-namespace Drupal\image\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Image variables to configuration.
- *
- * @group image
- */
-class MigrateImageSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['image'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_image_settings');
-  }
-
-  /**
-   * Tests the migration.
-   */
-  public function testMigration() {
-    $config = $this->config('image.settings');
-    // These settings are not recommended...
-    $this->assertTrue($config->get('allow_insecure_derivatives'));
-    $this->assertTrue($config->get('suppress_itok_output'));
-    $this->assertIdentical("core/modules/image/testsample.png", $config->get('preview_image'));
-  }
-
-}
diff --git a/core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php b/core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php
deleted file mode 100644
index a4d11ce..0000000
--- a/core/modules/image/src/Tests/Migrate/d7/MigrateImageStylesTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\Migrate\d7\MigrateImageStylesTest.
- */
-
-namespace Drupal\image\Tests\Migrate\d7;
-
-use Drupal\image\Entity\ImageStyle;
-use Drupal\image\ImageStyleInterface;
-use Drupal\image\ImageEffectBase;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Test image styles migration to config entities.
- *
- * @group image
- */
-class MigrateImageStylesTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('image');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_image_styles');
-  }
-
-  /**
-   * Test the image styles migration.
-   */
-  public function testImageStylesMigration() {
-    $this->assertEntity('custom_image_style_1', "Custom image style 1", ['image_scale_and_crop', 'image_desaturate'], [['width' => 55, 'height' => 55], []]);
-    $this->assertEntity('custom_image_style_2', "Custom image style 2", ['image_resize', 'image_rotate'], [['width' => 55, 'height' => 100], ['degrees' => 45, 'bgcolor' => '#FFFFFF', 'random' => false]]);
-    $this->assertEntity('custom_image_style_3', "Custom image style 3", ['image_scale', 'image_crop'], [['width' => 150, 'height' => NULL, 'upscale' => false], ['width' => 50, 'height' => 50, 'anchor' => 'left-top']]);
-  }
-
-  /**
-   * Asserts various aspects of an ImageStyle entity.
-   *
-   * @param string $id
-   *   The expected image style ID.
-   * @param string $label
-   *   The expected image style label.
-   * @param array $expected_effect_plugins
-   *   An array of expected plugins attached to the image style entity
-   * @param array $expected_effect_config
-   *   An array of expected configuration for each effect in the image style
-   */
-  protected function assertEntity($id, $label, array $expected_effect_plugins, array $expected_effect_config) {
-    $style = ImageStyle::load($id);
-    $this->assertTrue($style instanceof ImageStyleInterface);
-    /** @var \Drupal\image\ImageStyleInterface $style */
-    $this->assertIdentical($id, $style->id());
-    $this->assertIdentical($label, $style->label());
-
-    // Check the number of effects associated with the style.
-    $effects = $style->getEffects();
-    $this->assertIdentical(count($effects), count($expected_effect_plugins));
-
-    $index = 0;
-    foreach ($effects as $effect) {
-      $this->assertTrue($effect instanceof ImageEffectBase);
-      $this->assertIdentical($expected_effect_plugins[$index], $effect->getPluginId());
-      $config = $effect->getConfiguration();
-      $this->assertIdentical($expected_effect_config[$index], $config['data']);
-      $index++;
-    }
-  }
-
-}
diff --git a/core/modules/image/src/Tests/Views/ImageViewsDataTest.php b/core/modules/image/src/Tests/Views/ImageViewsDataTest.php
deleted file mode 100644
index c9d1215..0000000
--- a/core/modules/image/src/Tests/Views/ImageViewsDataTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Tests\Views\ImageViewsDataTest.
- */
-
-namespace Drupal\image\Tests\Views;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests image views data.
- *
- * @group image
- */
-class ImageViewsDataTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('image', 'file', 'views', 'entity_test', 'user', 'field');
-
-  /**
-   * Tests views data generated for image field relationship.
-   *
-   * @see image_field_views_data()
-   * @see image_field_views_data_views_data_alter()
-   */
-  public function testRelationshipViewsData() {
-    // Create image field to entity_test.
-    FieldStorageConfig::create(array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_base_image',
-      'type' => 'image',
-    ))->save();
-    FieldConfig::create(array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_base_image',
-      'bundle' => 'entity_test',
-    ))->save();
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test__field_base_image');
-    $relationship = $views_data['field_base_image_target_id']['relationship'];
-    $this->assertEqual($relationship['id'], 'standard');
-    $this->assertEqual($relationship['base'], 'file_managed');
-    $this->assertEqual($relationship['base field'], 'fid');
-    $this->assertEqual($relationship['entity type'], 'file');
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('file_managed');
-    $relationship = $views_data['reverse_field_base_image_entity_test']['relationship'];
-    $this->assertEqual($relationship['id'], 'entity_reverse');
-    $this->assertEqual($relationship['base'], 'entity_test');
-    $this->assertEqual($relationship['base field'], 'id');
-    $this->assertEqual($relationship['field table'], 'entity_test__field_base_image');
-    $this->assertEqual($relationship['field field'], 'field_base_image_target_id');
-    $this->assertEqual($relationship['field_name'], 'field_base_image');
-    $this->assertEqual($relationship['entity_type'], 'entity_test');
-    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-
-    // Create image field to entity_test_mul.
-    FieldStorageConfig::create(array(
-      'entity_type' => 'entity_test_mul',
-      'field_name' => 'field_data_image',
-      'type' => 'image',
-    ))->save();
-    FieldConfig::create(array(
-      'entity_type' => 'entity_test_mul',
-      'field_name' => 'field_data_image',
-      'bundle' => 'entity_test_mul',
-    ))->save();
-    // Check the generated views data.
-    $views_data = Views::viewsData()->get('entity_test_mul__field_data_image');
-    $relationship = $views_data['field_data_image_target_id']['relationship'];
-    $this->assertEqual($relationship['id'], 'standard');
-    $this->assertEqual($relationship['base'], 'file_managed');
-    $this->assertEqual($relationship['base field'], 'fid');
-    $this->assertEqual($relationship['entity type'], 'file');
-    // Check the backwards reference.
-    $views_data = Views::viewsData()->get('file_managed');
-    $relationship = $views_data['reverse_field_data_image_entity_test_mul']['relationship'];
-    $this->assertEqual($relationship['id'], 'entity_reverse');
-    $this->assertEqual($relationship['base'], 'entity_test_mul_property_data');
-    $this->assertEqual($relationship['base field'], 'id');
-    $this->assertEqual($relationship['field table'], 'entity_test_mul__field_data_image');
-    $this->assertEqual($relationship['field field'], 'field_data_image_target_id');
-    $this->assertEqual($relationship['field_name'], 'field_data_image');
-    $this->assertEqual($relationship['entity_type'], 'entity_test_mul');
-    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
-  }
-
-}
diff --git a/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php b/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
index 4ef0626..0ef0dd1 100644
--- a/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
+++ b/core/modules/image/src/Tests/Views/RelationshipUserImageDataTest.php
@@ -7,9 +7,12 @@
 
 namespace Drupal\image\Tests\Views;
 
+use Drupal\field\Entity\FieldConfig;
+use Drupal\file\Entity\File;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests image on user relationship handler.
@@ -36,20 +39,20 @@ protected function setUp() {
     parent::setUp();
 
     // Create the user profile field and instance.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'user',
       'field_name' => 'user_picture',
       'type' => 'image',
       'translatable' => '0',
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'label' => 'User Picture',
       'description' => '',
       'field_name' => 'user_picture',
       'entity_type' => 'user',
       'bundle' => 'user',
       'required' => 0,
-    ))->save();
+    ])->save();
 
     ViewTestData::createTestViews(get_class($this), array('image_test_views'));
   }
@@ -58,7 +61,7 @@ protected function setUp() {
    * Tests using the views image relationship.
    */
   public function testViewsHandlerRelationshipUserImageData() {
-    $file = entity_create('file', array(
+    $file = File::create([
       'fid' => 2,
       'uid' => 2,
       'filename' => 'image-test.jpg',
@@ -67,7 +70,7 @@ public function testViewsHandlerRelationshipUserImageData() {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     $file->enforceIsNew();
     file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png'));
     $file->save();
diff --git a/core/modules/image/tests/src/Kernel/ImageImportTest.php b/core/modules/image/tests/src/Kernel/ImageImportTest.php
new file mode 100644
index 0000000..6771ecc
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/ImageImportTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\ImageImportTest.
+ */
+
+namespace Drupal\Tests\image\Kernel;
+
+use Drupal\image\Entity\ImageStyle;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests config import for Image styles.
+ *
+ * @group image
+ */
+class ImageImportTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'image', 'image_module_test'];
+
+  /**
+   * Tests importing image styles.
+   */
+  public function testImport() {
+    $style = ImageStyle::create([
+      'name' => 'test'
+    ]);
+
+    $style->addImageEffect(['id' => 'image_module_test_null']);
+    $style->addImageEffect(['id' => 'image_module_test_null']);
+    $style->save();
+
+    $this->assertEqual(count($style->getEffects()), 2);
+
+    $uuid = \Drupal::service('uuid')->generate();
+    $style->set('effects', [
+      $uuid => [
+        'id' => 'image_module_test_null',
+      ],
+    ]);
+    $style->save();
+
+    $style = ImageStyle::load('test');
+    $this->assertEqual(count($style->getEffects()), 1);
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/ImageItemTest.php b/core/modules/image/tests/src/Kernel/ImageItemTest.php
new file mode 100644
index 0000000..8eb7946
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\ImageItemTest.
+ */
+
+namespace Drupal\Tests\image\Kernel;
+
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\file\Entity\File;
+
+/**
+ * Tests using entity fields of the image field type.
+ *
+ * @group image
+ */
+class ImageItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('file', 'image');
+
+  /**
+   * Created file entity.
+   *
+   * @var \Drupal\file\Entity\File
+   */
+  protected $image;
+
+  /**
+   * @var \Drupal\Core\Image\ImageFactory
+   */
+  protected $imageFactory;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->installSchema('file', array('file_usage'));
+
+    FieldStorageConfig::create(array(
+      'entity_type' => 'entity_test',
+      'field_name' => 'image_test',
+      'type' => 'image',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'image_test',
+      'bundle' => 'entity_test',
+    ])->save();
+    file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
+    $this->image = File::create([
+      'uri' => 'public://example.jpg',
+    ]);
+    $this->image->save();
+    $this->imageFactory = $this->container->get('image.factory');
+  }
+
+  /**
+   * Tests using entity fields of the image field type.
+   */
+  public function testImageItem() {
+    // Create a test entity with the image field set.
+    $entity = EntityTest::create();
+    $entity->image_test->target_id = $this->image->id();
+    $entity->image_test->alt = $alt = $this->randomMachineName();
+    $entity->image_test->title = $title = $this->randomMachineName();
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $entity = entity_load('entity_test', $entity->id());
+    $this->assertTrue($entity->image_test instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->image_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->image_test->target_id, $this->image->id());
+    $this->assertEqual($entity->image_test->alt, $alt);
+    $this->assertEqual($entity->image_test->title, $title);
+    $image = $this->imageFactory->get('public://example.jpg');
+    $this->assertEqual($entity->image_test->width, $image->getWidth());
+    $this->assertEqual($entity->image_test->height, $image->getHeight());
+    $this->assertEqual($entity->image_test->entity->id(), $this->image->id());
+    $this->assertEqual($entity->image_test->entity->uuid(), $this->image->uuid());
+
+    // Make sure the computed entity reflects updates to the referenced file.
+    file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example-2.jpg');
+    $image2 = File::create([
+      'uri' => 'public://example-2.jpg',
+    ]);
+    $image2->save();
+
+    $entity->image_test->target_id = $image2->id();
+    $entity->image_test->alt = $new_alt = $this->randomMachineName();
+    // The width and height is only updated when width is not set.
+    $entity->image_test->width = NULL;
+    $entity->save();
+    $this->assertEqual($entity->image_test->entity->id(), $image2->id());
+    $this->assertEqual($entity->image_test->entity->getFileUri(), $image2->getFileUri());
+    $image = $this->imageFactory->get('public://example-2.jpg');
+    $this->assertEqual($entity->image_test->width, $image->getWidth());
+    $this->assertEqual($entity->image_test->height, $image->getHeight());
+    $this->assertEqual($entity->image_test->alt, $new_alt);
+
+    // Check that the image item can be set to the referenced file directly.
+    $entity->image_test = $this->image;
+    $this->assertEqual($entity->image_test->target_id, $this->image->id());
+
+    // Delete the image and try to save the entity again.
+    $this->image->delete();
+    $entity = EntityTest::create(array('mame' => $this->randomMachineName()));
+    $entity->save();
+
+    // Test image item properties.
+    $expected = array('target_id', 'entity', 'alt', 'title', 'width', 'height');
+    $properties = $entity->getFieldDefinition('image_test')->getFieldStorageDefinition()->getPropertyDefinitions();
+    $this->assertEqual(array_keys($properties), $expected);
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->image_test->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
new file mode 100644
index 0000000..b8b40f8
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d6\MigrateImageCacheTest.
+ */
+
+namespace Drupal\Tests\image\Kernel\Migrate\d6;
+
+use Drupal\Core\Database\Database;
+use Drupal\image\Entity\ImageStyle;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of ImageCache presets to image styles.
+ *
+ * @group image
+ */
+class MigrateImageCacheTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['image']);
+  }
+
+  /**
+   * Tests that an exception is thrown when ImageCache is not installed.
+   */
+  public function testMissingTable() {
+    $this->sourceDatabase->update('system')
+      ->fields(array(
+        'status' => 0,
+      ))
+      ->condition('name', 'imagecache')
+      ->condition('type', 'module')
+      ->execute();
+
+    try {
+      $this->getMigration('d6_imagecache_presets')
+        ->getSourcePlugin()
+        ->checkRequirements();
+      $this->fail('Did not catch expected RequirementsException.');
+    }
+    catch (RequirementsException $e) {
+      $this->pass('Caught expected RequirementsException: ' . $e->getMessage());
+    }
+  }
+
+  /**
+   * Test basic passing migrations.
+   */
+  public function testPassingMigration() {
+    $this->executeMigration('d6_imagecache_presets');
+
+    /** @var \Drupal\image\Entity\ImageStyle $style */
+    $style = ImageStyle::load('big_blue_cheese');
+
+    // Check basic Style info.
+    $this->assertIdentical('big_blue_cheese', $style->get('name'), 'ImageStyle name set correctly');
+    $this->assertIdentical('big_blue_cheese', $style->get('label'), 'ImageStyle label set correctly');
+
+    // Test effects.
+    $effects = $style->getEffects();
+
+    // Check crop effect.
+    $this->assertImageEffect($effects, 'image_crop', [
+      'width' => 555,
+      'height' => 5555,
+      'anchor' => 'center-center',
+    ]);
+
+    // Check resize effect.
+    $this->assertImageEffect($effects, 'image_resize', [
+      'width' => 55,
+      'height' => 55,
+    ]);
+
+    // Check rotate effect.
+    $this->assertImageEffect($effects, 'image_rotate', [
+      'degrees' => 55,
+      'random' => FALSE,
+      'bgcolor' => '',
+    ]);
+  }
+
+  /**
+   * Test that missing actions causes failures.
+   */
+   public function testMissingEffectPlugin() {
+     Database::getConnection('default', 'migrate')->insert("imagecache_action")
+       ->fields([
+         'presetid',
+         'weight',
+         'module',
+         'action',
+         'data',
+       ])
+       ->values([
+         'presetid' => '1',
+         'weight' => '0',
+         'module' => 'imagecache',
+         'action' => 'imagecache_deprecated_scale',
+         'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}',
+       ])->execute();
+
+     $this->startCollectingMessages();
+     $this->executeMigration('d6_imagecache_presets');
+     $messages = $this->migration->getIdMap()->getMessageIterator();
+     $count = 0;
+     foreach ($messages as $message) {
+       $count++;
+       $this->assertEqual($message->message, 'The "image_deprecated_scale" plugin does not exist.');
+       $this->assertEqual($message->level, MigrationInterface::MESSAGE_ERROR);
+     }
+     // There should be only the one message.
+     $this->assertEqual($count, 1);
+  }
+
+  /**
+   * Test that missing action's causes failures.
+   */
+   public function testInvalidCropValues() {
+     Database::getConnection('default', 'migrate')->insert("imagecache_action")
+       ->fields([
+         'presetid',
+         'weight',
+         'module',
+         'action',
+         'data',
+       ])
+       ->values([
+         'presetid' => '1',
+         'weight' => '0',
+         'module' => 'imagecache',
+         'action' => 'imagecache_crop',
+         'data' => serialize([
+           'xoffset' => '10',
+           'yoffset' => '10',
+         ]),
+       ])->execute();
+
+     $this->startCollectingMessages();
+     $this->executeMigration('d6_imagecache_presets');
+     $this->assertEqual(['error' => [
+       'The Drupal 8 image crop effect does not support numeric values for x and y offsets. Use keywords to set crop effect offsets instead.'
+     ]], $this->migrateMessages);
+  }
+
+  /**
+   * Assert that a given image effect is migrated.
+   *
+   * @param array $collection
+   *   Collection of effects
+   * @param $id
+   *   Id that should exist in the collection.
+   * @param $config
+   *   Expected configuration for the collection.
+   *
+   * @return bool
+   */
+  protected function assertImageEffect($collection, $id, $config) {
+    /** @var \Drupal\image\ConfigurableImageEffectBase $effect */
+    foreach ($collection as $key => $effect) {
+      $effect_config = $effect->getConfiguration();
+
+      if ($effect_config['id'] == $id && $effect_config['data'] == $config) {
+        // We found this effect so succeed and return.
+        return $this->pass('Effect ' . $id . ' imported correctly');
+      }
+    }
+    // The loop did not find the effect so we it was not imported correctly.
+    return $this->fail('Effect ' . $id . ' did not import correctly');
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php
new file mode 100644
index 0000000..1a30b6a
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageSettingsTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d7\MigrateImageSettingsTest.
+ */
+
+namespace Drupal\Tests\image\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Image variables to configuration.
+ *
+ * @group image
+ */
+class MigrateImageSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['image'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_image_settings');
+  }
+
+  /**
+   * Tests the migration.
+   */
+  public function testMigration() {
+    $config = $this->config('image.settings');
+    // These settings are not recommended...
+    $this->assertTrue($config->get('allow_insecure_derivatives'));
+    $this->assertTrue($config->get('suppress_itok_output'));
+    $this->assertIdentical("core/modules/image/testsample.png", $config->get('preview_image'));
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
new file mode 100644
index 0000000..1ded5dd
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\Migrate\d7\MigrateImageStylesTest.
+ */
+
+namespace Drupal\Tests\image\Kernel\Migrate\d7;
+
+use Drupal\image\Entity\ImageStyle;
+use Drupal\image\ImageStyleInterface;
+use Drupal\image\ImageEffectBase;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test image styles migration to config entities.
+ *
+ * @group image
+ */
+class MigrateImageStylesTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('image');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_image_styles');
+  }
+
+  /**
+   * Test the image styles migration.
+   */
+  public function testImageStylesMigration() {
+    $this->assertEntity('custom_image_style_1', "Custom image style 1", ['image_scale_and_crop', 'image_desaturate'], [['width' => 55, 'height' => 55], []]);
+    $this->assertEntity('custom_image_style_2', "Custom image style 2", ['image_resize', 'image_rotate'], [['width' => 55, 'height' => 100], ['degrees' => 45, 'bgcolor' => '#FFFFFF', 'random' => false]]);
+    $this->assertEntity('custom_image_style_3', "Custom image style 3", ['image_scale', 'image_crop'], [['width' => 150, 'height' => NULL, 'upscale' => false], ['width' => 50, 'height' => 50, 'anchor' => 'left-top']]);
+  }
+
+  /**
+   * Asserts various aspects of an ImageStyle entity.
+   *
+   * @param string $id
+   *   The expected image style ID.
+   * @param string $label
+   *   The expected image style label.
+   * @param array $expected_effect_plugins
+   *   An array of expected plugins attached to the image style entity
+   * @param array $expected_effect_config
+   *   An array of expected configuration for each effect in the image style
+   */
+  protected function assertEntity($id, $label, array $expected_effect_plugins, array $expected_effect_config) {
+    $style = ImageStyle::load($id);
+    $this->assertTrue($style instanceof ImageStyleInterface);
+    /** @var \Drupal\image\ImageStyleInterface $style */
+    $this->assertIdentical($id, $style->id());
+    $this->assertIdentical($label, $style->label());
+
+    // Check the number of effects associated with the style.
+    $effects = $style->getEffects();
+    $this->assertIdentical(count($effects), count($expected_effect_plugins));
+
+    $index = 0;
+    foreach ($effects as $effect) {
+      $this->assertTrue($effect instanceof ImageEffectBase);
+      $this->assertIdentical($expected_effect_plugins[$index], $effect->getPluginId());
+      $config = $effect->getConfiguration();
+      $this->assertIdentical($expected_effect_config[$index], $config['data']);
+      $index++;
+    }
+  }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php b/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
new file mode 100644
index 0000000..0300fa5
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/Views/ImageViewsDataTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\image\Kernel\Views\ImageViewsDataTest.
+ */
+
+namespace Drupal\Tests\image\Kernel\Views;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests image views data.
+ *
+ * @group image
+ */
+class ImageViewsDataTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('image', 'file', 'views', 'entity_test', 'user', 'field');
+
+  /**
+   * Tests views data generated for image field relationship.
+   *
+   * @see image_field_views_data()
+   * @see image_field_views_data_views_data_alter()
+   */
+  public function testRelationshipViewsData() {
+    // Create image field to entity_test.
+    FieldStorageConfig::create(array(
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_base_image',
+      'type' => 'image',
+    ))->save();
+    FieldConfig::create(array(
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_base_image',
+      'bundle' => 'entity_test',
+    ))->save();
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test__field_base_image');
+    $relationship = $views_data['field_base_image_target_id']['relationship'];
+    $this->assertEqual($relationship['id'], 'standard');
+    $this->assertEqual($relationship['base'], 'file_managed');
+    $this->assertEqual($relationship['base field'], 'fid');
+    $this->assertEqual($relationship['entity type'], 'file');
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('file_managed');
+    $relationship = $views_data['reverse_field_base_image_entity_test']['relationship'];
+    $this->assertEqual($relationship['id'], 'entity_reverse');
+    $this->assertEqual($relationship['base'], 'entity_test');
+    $this->assertEqual($relationship['base field'], 'id');
+    $this->assertEqual($relationship['field table'], 'entity_test__field_base_image');
+    $this->assertEqual($relationship['field field'], 'field_base_image_target_id');
+    $this->assertEqual($relationship['field_name'], 'field_base_image');
+    $this->assertEqual($relationship['entity_type'], 'entity_test');
+    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+
+    // Create image field to entity_test_mul.
+    FieldStorageConfig::create(array(
+      'entity_type' => 'entity_test_mul',
+      'field_name' => 'field_data_image',
+      'type' => 'image',
+    ))->save();
+    FieldConfig::create(array(
+      'entity_type' => 'entity_test_mul',
+      'field_name' => 'field_data_image',
+      'bundle' => 'entity_test_mul',
+    ))->save();
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test_mul__field_data_image');
+    $relationship = $views_data['field_data_image_target_id']['relationship'];
+    $this->assertEqual($relationship['id'], 'standard');
+    $this->assertEqual($relationship['base'], 'file_managed');
+    $this->assertEqual($relationship['base field'], 'fid');
+    $this->assertEqual($relationship['entity type'], 'file');
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('file_managed');
+    $relationship = $views_data['reverse_field_data_image_entity_test_mul']['relationship'];
+    $this->assertEqual($relationship['id'], 'entity_reverse');
+    $this->assertEqual($relationship['base'], 'entity_test_mul_property_data');
+    $this->assertEqual($relationship['base field'], 'id');
+    $this->assertEqual($relationship['field table'], 'entity_test_mul__field_data_image');
+    $this->assertEqual($relationship['field field'], 'field_data_image_target_id');
+    $this->assertEqual($relationship['field_name'], 'field_data_image');
+    $this->assertEqual($relationship['entity_type'], 'entity_test_mul');
+    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+  }
+
+}
diff --git a/core/modules/inline_form_errors/inline_form_errors.info.yml b/core/modules/inline_form_errors/inline_form_errors.info.yml
index a5949fa..04c05b9 100644
--- a/core/modules/inline_form_errors/inline_form_errors.info.yml
+++ b/core/modules/inline_form_errors/inline_form_errors.info.yml
@@ -1,6 +1,6 @@
 type: module
 name: Inline Form Errors
-description: 'Enables inline form errors.'
+description: 'Adds WCAG 2.0 accessibility compliance for web form errors. Some form functionality may not work with this experimental module.'
 version: VERSION
 core: 8.x
 package: Core (Experimental)
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 5904685..99ebc3b 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -29,7 +29,7 @@ function language_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.language':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the for <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '</p>';
+      $output .= '<p>' . t('The Language module allows you to configure the languages used on your site, and provides information for the <a href=":content">Content Translation</a>, <a href=":interface">Interface Translation</a>, and <a href=":configuration">Configuration Translation</a> modules, if they are enabled. For more information, see the <a href=":doc_url">online documentation for the Language module</a>.', array(':doc_url' => 'https://www.drupal.org/documentation/modules/language', ':content' => (\Drupal::moduleHandler()->moduleExists('content_translation')) ? \Drupal::url('help.page', array('name' => 'content_translation')) : '#', ':interface' => (\Drupal::moduleHandler()->moduleExists('locale')) ? \Drupal::url('help.page', array('name' => 'locale')) : '#', ':configuration' => (\Drupal::moduleHandler()->moduleExists('config_translation')) ? \Drupal::url('help.page', array('name' => 'config_translation')) : '#')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Adding languages') . '</dt>';
diff --git a/core/modules/language/src/Element/LanguageConfiguration.php b/core/modules/language/src/Element/LanguageConfiguration.php
index 2fad091..74d36aa 100644
--- a/core/modules/language/src/Element/LanguageConfiguration.php
+++ b/core/modules/language/src/Element/LanguageConfiguration.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Render\Element\FormElement;
-use Drupal\language\Entity\ContentLanguageSettings;
 
 /**
  * Provides language element configuration.
@@ -41,7 +40,7 @@ public static function processLanguageConfiguration(&$element, FormStateInterfac
     // Avoid validation failure since we are moving the '#options' key in the
     // nested 'language' select element.
     unset($element['#options']);
-    /** @var ContentLanguageSettings $default_config */
+    /** @var \Drupal\language\Entity\ContentLanguageSettings $default_config */
     $default_config = $element['#default_value'];
     $element['langcode'] = array(
       '#type' => 'select',
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 49ebc63..209c3b5 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -68,7 +68,7 @@ class ContentLanguageSettings extends ConfigEntityBase implements ContentLanguag
    * Constructs a ContentLanguageSettings object.
    *
    * In most cases, Field entities are created via
-   * entity_create('field_config', $values), where $values is the same
+   * FieldConfig::create($values), where $values is the same
    * parameter as in this constructor.
    *
    * @param array $values
diff --git a/core/modules/language/src/Form/NegotiationUrlForm.php b/core/modules/language/src/Form/NegotiationUrlForm.php
index f90022f..1dcfe05 100644
--- a/core/modules/language/src/Form/NegotiationUrlForm.php
+++ b/core/modules/language/src/Form/NegotiationUrlForm.php
@@ -100,7 +100,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#tree' => TRUE,
       '#title' => $this->t('Domain configuration'),
       '#open' => TRUE,
-      '#description' => $this->t('The domain names to use for these languages. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in an URL like "http://de.example.com/contact".'),
+      '#description' => $this->t('The domain names to use for these languages. <strong>Modifying this value may break existing URLs. Use with caution in a production environment.</strong> Example: Specifying "de.example.com" as language domain for German will result in a URL like "http://de.example.com/contact".'),
       '#states' => array(
         'visible' => array(
           ':input[name="language_negotiation_url_part"]' => array(
diff --git a/core/modules/language/src/LanguageAccessControlHandler.php b/core/modules/language/src/LanguageAccessControlHandler.php
index 6d14471..fd7b669 100644
--- a/core/modules/language/src/LanguageAccessControlHandler.php
+++ b/core/modules/language/src/LanguageAccessControlHandler.php
@@ -26,13 +26,13 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     switch ($operation) {
       case 'update':
         /* @var \Drupal\Core\Language\LanguageInterface $entity */
-        return AccessResult::allowedIf(!$entity->isLocked())->cacheUntilEntityChanges($entity)
+        return AccessResult::allowedIf(!$entity->isLocked())->addCacheableDependency($entity)
           ->andIf(parent::checkAccess($entity, $operation, $account));
 
       case 'delete':
         /* @var \Drupal\Core\Language\LanguageInterface $entity */
-        return AccessResult::allowedIf(!$entity->isLocked())->cacheUntilEntityChanges($entity)
-          ->andIf(AccessResult::allowedIf(!$entity->isDefault())->cacheUntilEntityChanges($entity))
+        return AccessResult::allowedIf(!$entity->isLocked())->addCacheableDependency($entity)
+          ->andIf(AccessResult::allowedIf(!$entity->isDefault())->addCacheableDependency($entity))
           ->andIf(parent::checkAccess($entity, $operation, $account));
 
       default:
diff --git a/core/modules/language/src/LanguageListBuilder.php b/core/modules/language/src/LanguageListBuilder.php
index e6b279d..ecbf347 100644
--- a/core/modules/language/src/LanguageListBuilder.php
+++ b/core/modules/language/src/LanguageListBuilder.php
@@ -14,7 +14,6 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Render\Element;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index fd9da35..4ce022d 100644
--- a/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -181,8 +181,8 @@ public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
    * \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::processOutbound().
    *
    * @return bool
-   *   TRUE if the content entity language negotiator has higher priority than
-   *   the url language negotiator, FALSE otherwise.
+   *   TRUE if the the content entity language negotiator has higher priority
+   *   than the url language negotiator, FALSE otherwise.
    */
   protected function hasLowerLanguageNegotiationWeight() {
     if (!isset($this->hasLowerLanguageNegotiationWeightResult)) {
diff --git a/core/modules/language/src/Tests/EntityUrlLanguageTest.php b/core/modules/language/src/Tests/EntityUrlLanguageTest.php
index f172b38..5d0872e 100644
--- a/core/modules/language/src/Tests/EntityUrlLanguageTest.php
+++ b/core/modules/language/src/Tests/EntityUrlLanguageTest.php
@@ -41,7 +41,6 @@ protected function setUp() {
 
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('configurable_language');
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
 
     // In order to reflect the changes for a multilingual site in the container
diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php b/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
index 28d6330..b3cdd09 100644
--- a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\language\Tests\LanguageConfigOverrideInstallTest.
  */
+
 namespace Drupal\language\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index 6e2e70a..04cb8da 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -11,6 +11,7 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\language\Entity\ContentLanguageSettings;
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Tests the features of the language configuration element field.
@@ -223,10 +224,10 @@ public function testNodeTypeDelete() {
    * Tests that the configuration is retained when a vocabulary is updated.
    */
   public function testTaxonomyVocabularyUpdate() {
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Country',
       'vid' => 'country',
-    ));
+    ]);
     $vocabulary->save();
 
     $admin_user = $this->drupalCreateUser(array('administer taxonomy'));
diff --git a/core/modules/language/src/Tests/LanguageLocaleListTest.php b/core/modules/language/src/Tests/LanguageLocaleListTest.php
index ca13172..b3946b1 100644
--- a/core/modules/language/src/Tests/LanguageLocaleListTest.php
+++ b/core/modules/language/src/Tests/LanguageLocaleListTest.php
@@ -8,8 +8,6 @@
 namespace Drupal\language\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Language\LanguageInterface;
 
 /**
  * Adds a new language with translations and tests language list order.
diff --git a/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php b/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
index 7b225ae..9706d71 100644
--- a/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
+++ b/core/modules/language/src/Tests/Migrate/MigrateLanguageTest.php
@@ -9,7 +9,7 @@
 
 use Drupal\language\ConfigurableLanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
  * @group migrate_drupal_6
diff --git a/core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php b/core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
deleted file mode 100644
index 242d818..0000000
--- a/core/modules/language/src/Tests/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Tests\Migrate\d7\MigrateLanguageNegotiationSettingsTest.
- */
-
-namespace Drupal\language\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of language negotiation variables.
- *
- * @group language
- */
-class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['language'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_language_negotiation_settings');
-  }
-
-  /**
-   * Tests migration of language negotiation variables to language.negotiation.yml.
-   */
-  public function testLanguageNegotiation() {
-    $config = $this->config('language.negotiation');
-    $this->assertIdentical($config->get('session.parameter'), 'language');
-    $this->assertIdentical($config->get('url.source'), 'domain');
-  }
-
-}
diff --git a/core/modules/language/src/Tests/Views/ArgumentLanguageTest.php b/core/modules/language/src/Tests/Views/ArgumentLanguageTest.php
deleted file mode 100644
index 2403b68..0000000
--- a/core/modules/language/src/Tests/Views/ArgumentLanguageTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\ArgumentLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests the argument language handler.
- *
- * @group language
- * @see \Drupal\language\Plugin\views\argument\Language.php
- */
-class ArgumentLanguageTest extends LanguageTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Tests the language argument.
-   */
-  public function testArgument() {
-    $view = Views::getView('test_view');
-    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
-      $view->setDisplay();
-      $view->displayHandlers->get('default')->overrideOption('arguments', array(
-        'langcode' => array(
-          'id' => 'langcode',
-          'table' => 'views_test_data',
-          'field' => 'langcode',
-        ),
-      ));
-      $this->executeView($view, array($langcode));
-
-      $expected = array(array(
-        'name' => $name,
-      ));
-      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
-      $view->destroy();
-    }
-  }
-
-}
diff --git a/core/modules/language/src/Tests/Views/FieldLanguageTest.php b/core/modules/language/src/Tests/Views/FieldLanguageTest.php
deleted file mode 100644
index 78845ee..0000000
--- a/core/modules/language/src/Tests/Views/FieldLanguageTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\FieldLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests the field language handler.
- *
- * @group language
- * @see \Drupal\language\Plugin\views\field\Language
- */
-class FieldLanguageTest extends LanguageTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Tests the language field.
-   */
-  public function testField() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'langcode' => array(
-        'id' => 'langcode',
-        'table' => 'views_test_data',
-        'field' => 'langcode',
-      ),
-    ));
-    $this->executeView($view);
-
-    $this->assertEqual($view->field['langcode']->advancedRender($view->result[0]), 'English');
-    $this->assertEqual($view->field['langcode']->advancedRender($view->result[1]), 'Lolspeak');
-  }
-
-}
diff --git a/core/modules/language/src/Tests/Views/FilterLanguageTest.php b/core/modules/language/src/Tests/Views/FilterLanguageTest.php
deleted file mode 100644
index b3cc5d8..0000000
--- a/core/modules/language/src/Tests/Views/FilterLanguageTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\FilterLanguageTest.
- */
-
-namespace Drupal\language\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests the filter language handler.
- *
- * @group language
- * @see \Drupal\language\Plugin\views\filter\Language
- */
-class FilterLanguageTest extends LanguageTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Tests the language filter.
-   */
-  public function testFilter() {
-    $view = Views::getView('test_view');
-    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
-      $view->setDisplay();
-      $view->displayHandlers->get('default')->overrideOption('filters', array(
-        'langcode' => array(
-          'id' => 'langcode',
-          'table' => 'views_test_data',
-          'field' => 'langcode',
-          'value' => array($langcode),
-        ),
-      ));
-      $this->executeView($view);
-
-      $expected = array(array(
-        'name' => $name,
-      ));
-      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
-
-      $expected = [
-        '***LANGUAGE_site_default***',
-        '***LANGUAGE_language_interface***',
-        '***LANGUAGE_language_content***',
-        'en',
-        'xx-lolspeak',
-        'und',
-        'zxx'
-      ];
-      $this->assertIdentical(array_keys($view->filter['langcode']->getValueOptions()), $expected);
-
-      $view->destroy();
-    }
-  }
-
-}
diff --git a/core/modules/language/src/Tests/Views/LanguageTestBase.php b/core/modules/language/src/Tests/Views/LanguageTestBase.php
deleted file mode 100644
index 822b651..0000000
--- a/core/modules/language/src/Tests/Views/LanguageTestBase.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\language\Tests\Views\LanguageTestBase.
- */
-
-namespace Drupal\language\Tests\Views;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Defines the base class for all Language handler tests.
- */
-abstract class LanguageTestBase extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'language');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('language'));
-
-    // Create another language beside English.
-    ConfigurableLanguage::create(array('id' => 'xx-lolspeak', 'label' => 'Lolspeak'))->save();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['langcode'] = array(
-      'description' => 'The {language}.langcode of this beatle.',
-      'type' => 'varchar',
-      'length' => 12,
-      'default' => '',
-    );
-
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['langcode'] = array(
-      'title' => t('Langcode'),
-      'help' => t('Langcode'),
-      'field' => array(
-        'id' => 'language',
-      ),
-      'argument' => array(
-        'id' => 'language',
-      ),
-      'filter' => array(
-        'id' => 'language',
-      ),
-    );
-
-    return $data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function dataSet() {
-    $data = parent::dataSet();
-    $data[0]['langcode'] = 'en';
-    $data[1]['langcode'] = 'xx-lolspeak';
-    $data[2]['langcode'] = '';
-    $data[3]['langcode'] = '';
-    $data[4]['langcode'] = '';
-
-    return $data;
-  }
-
-}
diff --git a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
new file mode 100644
index 0000000..38d545f
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\language\Kernel\Migrate\d7\MigrateLanguageNegotiationSettingsTest.
+ */
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of language negotiation variables.
+ *
+ * @group language
+ */
+class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_language_negotiation_settings');
+  }
+
+  /**
+   * Tests migration of language negotiation variables to language.negotiation.yml.
+   */
+  public function testLanguageNegotiation() {
+    $config = $this->config('language.negotiation');
+    $this->assertIdentical($config->get('session.parameter'), 'language');
+    $this->assertIdentical($config->get('url.source'), 'domain');
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php b/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php
new file mode 100644
index 0000000..70f2da5
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\language\Kernel\Views\ArgumentLanguageTest.
+ */
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the argument language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\argument\Language.php
+ */
+class ArgumentLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Tests the language argument.
+   */
+  public function testArgument() {
+    $view = Views::getView('test_view');
+    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
+      $view->setDisplay();
+      $view->displayHandlers->get('default')->overrideOption('arguments', array(
+        'langcode' => array(
+          'id' => 'langcode',
+          'table' => 'views_test_data',
+          'field' => 'langcode',
+        ),
+      ));
+      $this->executeView($view, array($langcode));
+
+      $expected = array(array(
+        'name' => $name,
+      ));
+      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
+      $view->destroy();
+    }
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php b/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php
new file mode 100644
index 0000000..f6e8612
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\language\Kernel\Views\FieldLanguageTest.
+ */
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the field language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\field\Language
+ */
+class FieldLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Tests the language field.
+   */
+  public function testField() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'langcode' => array(
+        'id' => 'langcode',
+        'table' => 'views_test_data',
+        'field' => 'langcode',
+      ),
+    ));
+    $this->executeView($view);
+
+    $this->assertEqual($view->field['langcode']->advancedRender($view->result[0]), 'English');
+    $this->assertEqual($view->field['langcode']->advancedRender($view->result[1]), 'Lolspeak');
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php b/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php
new file mode 100644
index 0000000..1f67dcd
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\language\Kernel\Views\FilterLanguageTest.
+ */
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the filter language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\filter\Language
+ */
+class FilterLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Tests the language filter.
+   */
+  public function testFilter() {
+    $view = Views::getView('test_view');
+    foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
+      $view->setDisplay();
+      $view->displayHandlers->get('default')->overrideOption('filters', array(
+        'langcode' => array(
+          'id' => 'langcode',
+          'table' => 'views_test_data',
+          'field' => 'langcode',
+          'value' => array($langcode),
+        ),
+      ));
+      $this->executeView($view);
+
+      $expected = array(array(
+        'name' => $name,
+      ));
+      $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
+
+      $expected = [
+        '***LANGUAGE_site_default***',
+        '***LANGUAGE_language_interface***',
+        '***LANGUAGE_language_content***',
+        'en',
+        'xx-lolspeak',
+        'und',
+        'zxx'
+      ];
+      $this->assertIdentical(array_keys($view->filter['langcode']->getValueOptions()), $expected);
+
+      $view->destroy();
+    }
+  }
+
+}
diff --git a/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php b/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
new file mode 100644
index 0000000..1b46513
--- /dev/null
+++ b/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\language\Kernel\Views\LanguageTestBase.
+ */
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Defines the base class for all Language handler tests.
+ */
+abstract class LanguageTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'language');
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+    $this->installConfig(array('language'));
+
+    // Create another language beside English.
+    ConfigurableLanguage::create(array('id' => 'xx-lolspeak', 'label' => 'Lolspeak'))->save();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+    $schema['views_test_data']['fields']['langcode'] = array(
+      'description' => 'The {language}.langcode of this beatle.',
+      'type' => 'varchar',
+      'length' => 12,
+      'default' => '',
+    );
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['langcode'] = array(
+      'title' => t('Langcode'),
+      'help' => t('Langcode'),
+      'field' => array(
+        'id' => 'language',
+      ),
+      'argument' => array(
+        'id' => 'language',
+      ),
+      'filter' => array(
+        'id' => 'language',
+      ),
+    );
+
+    return $data;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function dataSet() {
+    $data = parent::dataSet();
+    $data[0]['langcode'] = 'en';
+    $data[1]['langcode'] = 'xx-lolspeak';
+    $data[2]['langcode'] = '';
+    $data[3]['langcode'] = '';
+    $data[4]['langcode'] = '';
+
+    return $data;
+  }
+
+}
diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml
index 4c25a8f..fd2edb1 100644
--- a/core/modules/link/config/schema/link.schema.yml
+++ b/core/modules/link/config/schema/link.schema.yml
@@ -66,18 +66,18 @@ field.value.link:
       mapping:
         query:
           type: sequence
-          label: 'Url query key value pairs'
+          label: 'URL query key value pairs'
           sequence:
             type: string
         fragment:
           type: string
-          label: 'Url fragment'
+          label: 'URL fragment'
         absolute:
           type: boolean
-          label: 'Is this Url absolute'
+          label: 'Is this URL absolute'
         https:
           type: boolean
-          label: 'If the Url should use a secure protocol'
+          label: 'If the URL should use a secure protocol'
         attributes:
           type: sequence
           label: 'Link attributes'
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 96064a1..9245ba3 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -207,7 +207,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
           // field template wrapper, and set the URL value in a content
           // attribute.
           // @todo Does RDF need a URL rather than an internal URI here?
-          // @see \Drupal\rdf\Tests\Field\LinkFieldRdfaTest.
+          // @see \Drupal\Tests\rdf\Kernel\Field\LinkFieldRdfaTest.
           $content = str_replace('internal:/', '', $item->uri);
           $item->_attributes += array('content' => $content);
         }
diff --git a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
index 327cbda..6f65254 100644
--- a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
+++ b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\link\Plugin\migrate\cckfield;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
diff --git a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
index bdd9822..e0d107a 100644
--- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php
@@ -8,7 +8,7 @@
 namespace Drupal\link\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
diff --git a/core/modules/link/src/Tests/LinkFieldTest.php b/core/modules/link/src/Tests/LinkFieldTest.php
index 79c2cbb..2d00cfa 100644
--- a/core/modules/link/src/Tests/LinkFieldTest.php
+++ b/core/modules/link/src/Tests/LinkFieldTest.php
@@ -10,8 +10,11 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Url;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\link\LinkItemInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests link field widgets and formatters.
@@ -57,20 +60,20 @@ protected function setUp() {
   function testURLValidation() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
     ));
     $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
+    $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
       'settings' => array(
         'title' => DRUPAL_DISABLED,
         'link_type' => LinkItemInterface::LINK_GENERIC,
       ),
-    ));
+    ]);
     $this->field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -97,6 +100,12 @@ function testURLValidation() {
     // Create a node to test the link widget.
     $node = $this->drupalCreateNode();
 
+    // Create an entity with restricted view access.
+    $entity_test_no_label_access = EntityTest::create([
+      'name' => 'forbid_access',
+    ]);
+    $entity_test_no_label_access->save();
+
     // Define some valid URLs (keys are the entered values, values are the
     // strings displayed to the user).
     $valid_external_entries = array(
@@ -130,7 +139,7 @@ function testURLValidation() {
       // Entity URI displayed as ER autocomplete value when displayed in a form.
       'entity:node/1' => $node->label() . ' (1)',
       // URI for an entity that exists, but is not accessible by the user.
-      'entity:user/1' => '- Restricted access - (1)',
+      'entity:entity_test/' . $entity_test_no_label_access->id() => '- Restricted access - (' . $entity_test_no_label_access->id() . ')',
       // URI for an entity that doesn't exist, but with a valid ID.
       'entity:user/999999' => 'entity:user/999999',
     );
@@ -222,13 +231,13 @@ protected function assertInvalidEntries($field_name, array $invalid_entries) {
   function testLinkTitle() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
     ));
     $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
+    $this->field = FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
       'label' => 'Read more about this entity',
@@ -236,7 +245,7 @@ function testLinkTitle() {
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
       ),
-    ));
+    ]);
     $this->field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -336,14 +345,14 @@ function testLinkTitle() {
   function testLinkFormatter() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
       'cardinality' => 2,
     ));
     $this->fieldStorage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'label' => 'Read more about this entity',
       'bundle' => 'entity_test',
@@ -351,7 +360,7 @@ function testLinkFormatter() {
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
       ),
-    ))->save();
+    ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
         'type' => 'link_default',
@@ -476,21 +485,21 @@ function testLinkFormatter() {
   function testLinkSeparateFormatter() {
     $field_name = Unicode::strtolower($this->randomMachineName());
     // Create a field with settings to validate.
-    $this->fieldStorage = entity_create('field_storage_config', array(
+    $this->fieldStorage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'link',
       'cardinality' => 2,
     ));
     $this->fieldStorage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $this->fieldStorage,
       'bundle' => 'entity_test',
       'settings' => array(
         'title' => DRUPAL_OPTIONAL,
         'link_type' => LinkItemInterface::LINK_GENERIC,
       ),
-    ))->save();
+    ])->save();
     $display_options = array(
       'type' => 'link_separate',
       'label' => 'hidden',
diff --git a/core/modules/link/src/Tests/LinkItemTest.php b/core/modules/link/src/Tests/LinkItemTest.php
deleted file mode 100644
index 1115983..0000000
--- a/core/modules/link/src/Tests/LinkItemTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\link\Tests\LinkItemTest.
- */
-
-namespace Drupal\link\Tests;
-
-use Drupal\Component\Utility\UrlHelper;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\Tests\FieldUnitTestBase;
-use Drupal\link\LinkItemInterface;
-
-/**
- * Tests the new entity API for the link field type.
- *
- * @group link
- */
-class LinkItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('link');
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a generic, external, and internal link fields for validation.
-    FieldStorageConfig::create([
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test',
-      'type' => 'link',
-    ])->save();
-    FieldConfig::create([
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test',
-      'bundle' => 'entity_test',
-      'settings' => ['link_type' => LinkItemInterface::LINK_GENERIC],
-    ])->save();
-    FieldStorageConfig::create([
-      'field_name' => 'field_test_external',
-      'entity_type' => 'entity_test',
-      'type' => 'link',
-    ])->save();
-    FieldConfig::create([
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test_external',
-      'bundle' => 'entity_test',
-      'settings' => ['link_type' => LinkItemInterface::LINK_EXTERNAL],
-    ])->save();
-    FieldStorageConfig::create([
-      'field_name' => 'field_test_internal',
-      'entity_type' => 'entity_test',
-      'type' => 'link',
-    ])->save();
-    FieldConfig::create([
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test_internal',
-      'bundle' => 'entity_test',
-      'settings' => ['link_type' => LinkItemInterface::LINK_INTERNAL],
-    ])->save();
-  }
-
-  /**
-   * Tests using entity fields of the link field type.
-   */
-  public function testLinkItem() {
-    // Create entity.
-    $entity = entity_create('entity_test');
-    $url = 'https://www.drupal.org?test_param=test_value';
-    $parsed_url = UrlHelper::parse($url);
-    $title = $this->randomMachineName();
-    $class = $this->randomMachineName();
-    $entity->field_test->uri = $parsed_url['path'];
-    $entity->field_test->title = $title;
-    $entity->field_test->first()->get('options')->set('query', $parsed_url['query']);
-    $entity->field_test->first()->get('options')->set('attributes', array('class' => $class));
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify that the field value is changed.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_test->uri, $parsed_url['path']);
-    $this->assertEqual($entity->field_test[0]->uri, $parsed_url['path']);
-    $this->assertEqual($entity->field_test->title, $title);
-    $this->assertEqual($entity->field_test[0]->title, $title);
-    $this->assertEqual($entity->field_test->options['attributes']['class'], $class);
-    $this->assertEqual($entity->field_test->options['query'], $parsed_url['query']);
-
-    // Update only the entity name property to check if the link field data will
-    // remain intact.
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_test->uri, $parsed_url['path']);
-    $this->assertEqual($entity->field_test->options['attributes']['class'], $class);
-    $this->assertEqual($entity->field_test->options['query'], $parsed_url['query']);
-
-    // Verify changing the field value.
-    $new_url = 'https://www.drupal.org';
-    $new_title = $this->randomMachineName();
-    $new_class = $this->randomMachineName();
-    $entity->field_test->uri = $new_url;
-    $entity->field_test->title = $new_title;
-    $entity->field_test->first()->get('options')->set('query', NULL);
-    $entity->field_test->first()->get('options')->set('attributes', array('class' => $new_class));
-    $this->assertEqual($entity->field_test->uri, $new_url);
-    $this->assertEqual($entity->field_test->title, $new_title);
-    $this->assertEqual($entity->field_test->options['attributes']['class'], $new_class);
-    $this->assertNull($entity->field_test->options['query']);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_test->uri, $new_url);
-    $this->assertEqual($entity->field_test->title, $new_title);
-    $this->assertEqual($entity->field_test->options['attributes']['class'], $new_class);
-
-    // Check that if we only set uri the default values for title and options
-    // are also initialized.
-    $entity->field_test = ['uri' => 'internal:/node/add'];
-    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
-    $this->assertNull($entity->field_test->title);
-    $this->assertIdentical($entity->field_test->options, []);
-
-    // Check that if set uri and serialize options then the default values are
-    // properly initialized.
-    $entity->field_test = [
-      'uri' => 'internal:/node/add',
-      'options' => serialize(['query' => NULL]),
-    ];
-    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
-    $this->assertNull($entity->field_test->title);
-    $this->assertNull($entity->field_test->options['query']);
-
-    // Check that if we set the direct value of link field it correctly set the
-    // uri and the default values of the field.
-    $entity->field_test = 'internal:/node/add';
-    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
-    $this->assertNull($entity->field_test->title);
-    $this->assertIdentical($entity->field_test->options, []);
-
-    // Check that setting LinkItem value NULL doesn't generate any error or
-    // warning.
-    $entity->field_test[0] = NULL;
-    $this->assertNull($entity->field_test[0]->getValue());
-
-    // Test the generateSampleValue() method for generic, external, and internal
-    // link types.
-    $entity = entity_create('entity_test');
-    $entity->field_test->generateSampleItems();
-    $entity->field_test_external->generateSampleItems();
-    $entity->field_test_internal->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/link/tests/src/Kernel/LinkItemTest.php b/core/modules/link/tests/src/Kernel/LinkItemTest.php
new file mode 100644
index 0000000..342d8ed
--- /dev/null
+++ b/core/modules/link/tests/src/Kernel/LinkItemTest.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\link\Kernel\LinkItemTest.
+ */
+
+namespace Drupal\Tests\link\Kernel;
+
+use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\link\LinkItemInterface;
+
+/**
+ * Tests the new entity API for the link field type.
+ *
+ * @group link
+ */
+class LinkItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('link');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a generic, external, and internal link fields for validation.
+    FieldStorageConfig::create([
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test',
+      'type' => 'link',
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test',
+      'bundle' => 'entity_test',
+      'settings' => ['link_type' => LinkItemInterface::LINK_GENERIC],
+    ])->save();
+    FieldStorageConfig::create([
+      'field_name' => 'field_test_external',
+      'entity_type' => 'entity_test',
+      'type' => 'link',
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test_external',
+      'bundle' => 'entity_test',
+      'settings' => ['link_type' => LinkItemInterface::LINK_EXTERNAL],
+    ])->save();
+    FieldStorageConfig::create([
+      'field_name' => 'field_test_internal',
+      'entity_type' => 'entity_test',
+      'type' => 'link',
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test_internal',
+      'bundle' => 'entity_test',
+      'settings' => ['link_type' => LinkItemInterface::LINK_INTERNAL],
+    ])->save();
+  }
+
+  /**
+   * Tests using entity fields of the link field type.
+   */
+  public function testLinkItem() {
+    // Create entity.
+    $entity = EntityTest::create();
+    $url = 'https://www.drupal.org?test_param=test_value';
+    $parsed_url = UrlHelper::parse($url);
+    $title = $this->randomMachineName();
+    $class = $this->randomMachineName();
+    $entity->field_test->uri = $parsed_url['path'];
+    $entity->field_test->title = $title;
+    $entity->field_test->first()->get('options')->set('query', $parsed_url['query']);
+    $entity->field_test->first()->get('options')->set('attributes', array('class' => $class));
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify that the field value is changed.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_test->uri, $parsed_url['path']);
+    $this->assertEqual($entity->field_test[0]->uri, $parsed_url['path']);
+    $this->assertEqual($entity->field_test->title, $title);
+    $this->assertEqual($entity->field_test[0]->title, $title);
+    $this->assertEqual($entity->field_test->options['attributes']['class'], $class);
+    $this->assertEqual($entity->field_test->options['query'], $parsed_url['query']);
+
+    // Update only the entity name property to check if the link field data will
+    // remain intact.
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_test->uri, $parsed_url['path']);
+    $this->assertEqual($entity->field_test->options['attributes']['class'], $class);
+    $this->assertEqual($entity->field_test->options['query'], $parsed_url['query']);
+
+    // Verify changing the field value.
+    $new_url = 'https://www.drupal.org';
+    $new_title = $this->randomMachineName();
+    $new_class = $this->randomMachineName();
+    $entity->field_test->uri = $new_url;
+    $entity->field_test->title = $new_title;
+    $entity->field_test->first()->get('options')->set('query', NULL);
+    $entity->field_test->first()->get('options')->set('attributes', array('class' => $new_class));
+    $this->assertEqual($entity->field_test->uri, $new_url);
+    $this->assertEqual($entity->field_test->title, $new_title);
+    $this->assertEqual($entity->field_test->options['attributes']['class'], $new_class);
+    $this->assertNull($entity->field_test->options['query']);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_test->uri, $new_url);
+    $this->assertEqual($entity->field_test->title, $new_title);
+    $this->assertEqual($entity->field_test->options['attributes']['class'], $new_class);
+
+    // Check that if we only set uri the default values for title and options
+    // are also initialized.
+    $entity->field_test = ['uri' => 'internal:/node/add'];
+    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
+    $this->assertNull($entity->field_test->title);
+    $this->assertIdentical($entity->field_test->options, []);
+
+    // Check that if set uri and serialize options then the default values are
+    // properly initialized.
+    $entity->field_test = [
+      'uri' => 'internal:/node/add',
+      'options' => serialize(['query' => NULL]),
+    ];
+    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
+    $this->assertNull($entity->field_test->title);
+    $this->assertNull($entity->field_test->options['query']);
+
+    // Check that if we set the direct value of link field it correctly set the
+    // uri and the default values of the field.
+    $entity->field_test = 'internal:/node/add';
+    $this->assertEqual($entity->field_test->uri, 'internal:/node/add');
+    $this->assertNull($entity->field_test->title);
+    $this->assertIdentical($entity->field_test->options, []);
+
+    // Check that setting LinkItem value NULL doesn't generate any error or
+    // warning.
+    $entity->field_test[0] = NULL;
+    $this->assertNull($entity->field_test[0]->getValue());
+
+    // Test the generateSampleValue() method for generic, external, and internal
+    // link types.
+    $entity = EntityTest::create();
+    $entity->field_test->generateSampleItems();
+    $entity->field_test_external->generateSampleItems();
+    $entity->field_test_internal->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc
index a5ef423..81ca966 100644
--- a/core/modules/locale/locale.batch.inc
+++ b/core/modules/locale/locale.batch.inc
@@ -33,10 +33,10 @@
  *     batch is finished. Optional, defaults to TRUE.
  *   - 'use_remote': Whether or not to check the remote translation file.
  *     Optional, defaults to TRUE.
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   The batch context.
  */
-function locale_translation_batch_status_check($project, $langcode, array $options, array &$context) {
+function locale_translation_batch_status_check($project, $langcode, array $options, &$context) {
   $failure = $checked = FALSE;
   $options += array(
     'finish_feedback' => TRUE,
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index de43c85..72e8cfe 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -185,10 +185,10 @@ function locale_translate_batch_build(array $files, array $options) {
  *     LOCALE_NOT_CUSTOMIZED.
  *   - 'message': Alternative message to display during import. Note, this must
  *     be sanitized text.
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   Contains a list of files imported.
  */
-function locale_translate_batch_import($file, array $options, array &$context) {
+function locale_translate_batch_import($file, array $options, &$context) {
   // Merge the default values in the $options array.
   $options += array(
     'overwrite_options' => array(),
@@ -208,7 +208,7 @@ function locale_translate_batch_import($file, array $options, array &$context) {
       // Update the seek and the number of items in the $options array().
       $options['seek'] = $context['sandbox']['parse_state']['seek'];
       $options['items'] = $context['sandbox']['parse_state']['chunk_size'];
-      $report = GetText::fileToDatabase($file, $options);
+      $report = Gettext::fileToDatabase($file, $options);
       // If not yet finished with reading, mark progress based on size and
       // position.
       if ($report['seek'] < filesize($file->uri)) {
@@ -268,10 +268,10 @@ function locale_translate_batch_import($file, array $options, array &$context) {
  *
  * Save data of imported files.
  *
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   Contains a list of imported files.
  */
-function locale_translate_batch_import_save(array $context) {
+function locale_translate_batch_import_save($context) {
   if (isset($context['results']['files'])) {
     foreach ($context['results']['files'] as $file) {
       // Update the file history if both project and version are known. This
@@ -293,10 +293,10 @@ function locale_translate_batch_import_save(array $context) {
  *
  * Refreshes translations after importing strings.
  *
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   Contains a list of strings updated and information about the progress.
  */
-function locale_translate_batch_refresh(array &$context) {
+function locale_translate_batch_refresh(&$context) {
   if (!isset($context['sandbox']['refresh'])) {
     $strings = $langcodes = array();
     if (isset($context['results']['stats'])) {
@@ -597,12 +597,12 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
  *   An array of names of configuration objects to update.
  * @param array $langcodes
  *   (optional) Array of language codes to update. Defaults to all languages.
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   Contains a list of files imported.
  *
  * @see locale_config_batch_build()
  */
-function locale_config_batch_refresh_name(array $names, array $langcodes, array &$context) {
+function locale_config_batch_refresh_name(array $names, array $langcodes, &$context) {
   if (!isset($context['result']['stats']['config'])) {
     $context['result']['stats']['config'] = 0;
   }
diff --git a/core/modules/locale/locale.compare.inc b/core/modules/locale/locale.compare.inc
index 2aa6526..e24490c 100644
--- a/core/modules/locale/locale.compare.inc
+++ b/core/modules/locale/locale.compare.inc
@@ -5,7 +5,6 @@
  * The API for comparing project translation status with available translation.
  */
 
-use Drupal\Core\Cache;
 use Drupal\Core\Utility\ProjectInfo;
 
 /**
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index d4776d5..9b2be23 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -6,7 +6,6 @@
  */
 
 use Drupal\Core\Url;
-use Drupal\Core\Render\Element;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
diff --git a/core/modules/locale/locale.services.yml b/core/modules/locale/locale.services.yml
index 1d55460..e37cb48 100644
--- a/core/modules/locale/locale.services.yml
+++ b/core/modules/locale/locale.services.yml
@@ -5,9 +5,7 @@ services:
     public: false
   locale.config_manager:
     class: Drupal\locale\LocaleConfigManager
-    arguments: ['@config.storage', '@locale.storage', '@config.factory', '@config.typed', '@language_manager', '@locale.default.config.storage']
-    calls:
-      - [_setConfigManager, ['@config.manager']]
+    arguments: ['@config.storage', '@locale.storage', '@config.factory', '@config.typed', '@language_manager', '@locale.default.config.storage', '@config.manager']
   locale.storage:
     class: Drupal\locale\StringDatabaseStorage
     arguments: ['@database']
diff --git a/core/modules/locale/src/LocaleConfigManager.php b/core/modules/locale/src/LocaleConfigManager.php
index db6c181..028e75a 100644
--- a/core/modules/locale/src/LocaleConfigManager.php
+++ b/core/modules/locale/src/LocaleConfigManager.php
@@ -100,12 +100,8 @@ class LocaleConfigManager {
    * The configuration manager.
    *
    * @var \Drupal\Core\Config\ConfigManagerInterface
-   *
-   * @internal
-   *   Will be made protected and renamed to $configManager in 8.1.0.
-   *   https://www.drupal.org/node/2628132
    */
-  private $_configManager;
+  protected $configManager;
 
   /**
    * Creates a new typed configuration manager.
@@ -122,44 +118,17 @@ class LocaleConfigManager {
    *   The language manager.
    * @param \Drupal\locale\LocaleDefaultConfigStorage $default_config_storage
    *   The locale default configuration storage.
+   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
+   *   The configuration manager.
    */
-  public function __construct(StorageInterface $config_storage, StringStorageInterface $locale_storage, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config, ConfigurableLanguageManagerInterface $language_manager, LocaleDefaultConfigStorage $default_config_storage) {
+  public function __construct(StorageInterface $config_storage, StringStorageInterface $locale_storage, ConfigFactoryInterface $config_factory, TypedConfigManagerInterface $typed_config, ConfigurableLanguageManagerInterface $language_manager, LocaleDefaultConfigStorage $default_config_storage, ConfigManagerInterface $config_manager) {
     $this->configStorage = $config_storage;
     $this->localeStorage = $locale_storage;
     $this->configFactory = $config_factory;
     $this->typedConfigManager = $typed_config;
     $this->languageManager = $language_manager;
     $this->defaultConfigStorage = $default_config_storage;
-  }
-
-  /**
-   * Sets the configuration manager service.
-   *
-   * @param \Drupal\Core\Config\ConfigManagerInterface $config_manager
-   *
-   * @internal
-   *   Will be replaced by constructor injection in 8.1.0.
-   *   https://www.drupal.org/node/2628132
-   */
-  public function _setConfigManager(ConfigManagerInterface $config_manager) {
-    $this->_configManager = $config_manager;
-  }
-
-  /**
-   * Gets the configuration manager service.
-   *
-   * @return \Drupal\Core\Config\ConfigManagerInterface
-   *   The config manager
-   *
-   * @internal
-   *   Will be replaced by constructor injection in 8.1.0.
-   *   https://www.drupal.org/node/2628132
-   */
-  private final function _getConfigManager() {
-    if (!isset($this->_configManager)) {
-      $this->_configManager = \Drupal::service('config.manager');
-    }
-    return $this->_configManager;
+    $this->configManager = $config_manager;
   }
 
   /**
@@ -524,7 +493,7 @@ public function getDefaultConfigLangcode($name) {
     // configurable_language entities are a special case since they can be
     // translated regardless of whether they are shipped if they in the standard
     // language list.
-    $config_entity_type = $this->_getConfigManager()->getEntityTypeIdByName($name);
+    $config_entity_type = $this->configManager->getEntityTypeIdByName($name);
     if (!$config_entity_type || $config_entity_type === 'configurable_language'
       || !empty($this->configFactory->get($name)->get('_core.default_config_hash'))
     ) {
diff --git a/core/modules/locale/src/SourceString.php b/core/modules/locale/src/SourceString.php
index 48266d2..04f37c6 100644
--- a/core/modules/locale/src/SourceString.php
+++ b/core/modules/locale/src/SourceString.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\locale;
 
-use Drupal\locale\LocaleString;
-
 /**
  * Defines the locale source string object.
  *
diff --git a/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
index aa2f985..1333250 100644
--- a/core/modules/locale/src/StreamWrapper/TranslationsStream.php
+++ b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\locale\StreamWrapper;
 
-use Drupal\Core\Annotation\StreamWrapper;
 use Drupal\Core\StreamWrapper\LocalStream;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 
diff --git a/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php b/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php
index 376ec44..38e8ad0 100644
--- a/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php
@@ -62,7 +62,6 @@ protected function setUp() {
     $this->setUpDefaultLanguage();
 
     $this->installSchema('locale', ['locales_source', 'locales_target', 'locales_location']);
-    $this->installSchema('system', ['queue']);
 
     $this->setupLanguages();
 
diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
index e03f061..271d804 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\locale\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\core\language\languageInterface;
+use Drupal\Core\Language\LanguageInterface;
 
 /**
  * Tests translation of configuration strings.
diff --git a/core/modules/locale/src/Tests/LocaleExportTest.php b/core/modules/locale/src/Tests/LocaleExportTest.php
index 061c161..6d309d0 100644
--- a/core/modules/locale/src/Tests/LocaleExportTest.php
+++ b/core/modules/locale/src/Tests/LocaleExportTest.php
@@ -38,8 +38,8 @@ protected function setUp() {
     $this->drupalLogin($this->adminUser);
 
     // Copy test po files to the translations directory.
-    file_unmanaged_copy(drupal_get_path('module', 'locale') . '/tests/test.de.po', 'translations://', FILE_EXISTS_REPLACE);
-    file_unmanaged_copy(drupal_get_path('module', 'locale') . '/tests/test.xx.po', 'translations://', FILE_EXISTS_REPLACE);
+    file_unmanaged_copy(__DIR__ . '/../../tests/test.de.po', 'translations://', FILE_EXISTS_REPLACE);
+    file_unmanaged_copy(__DIR__ . '/../../tests/test.xx.po', 'translations://', FILE_EXISTS_REPLACE);
   }
 
   /**
diff --git a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
index 74ef0ae..a78f286 100644
--- a/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/src/Tests/LocaleImportFunctionalTest.php
@@ -46,8 +46,8 @@ protected function setUp() {
     parent::setUp();
 
     // Copy test po files to the translations directory.
-    file_unmanaged_copy(drupal_get_path('module', 'locale') . '/tests/test.de.po', 'translations://', FILE_EXISTS_REPLACE);
-    file_unmanaged_copy(drupal_get_path('module', 'locale') . '/tests/test.xx.po', 'translations://', FILE_EXISTS_REPLACE);
+    file_unmanaged_copy(__DIR__ . '/../../tests/test.de.po', 'translations://', FILE_EXISTS_REPLACE);
+    file_unmanaged_copy(__DIR__ . '/../../tests/test.xx.po', 'translations://', FILE_EXISTS_REPLACE);
 
     $this->adminUser = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages'));
     $this->adminUserAccessSiteReports = $this->drupalCreateUser(array('administer languages', 'translate interface', 'access administration pages', 'access site reports'));
diff --git a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
index a87f866..0e62805 100644
--- a/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleJavascriptTranslationTest.php
@@ -26,7 +26,7 @@ class LocaleJavascriptTranslationTest extends WebTestBase {
   public static $modules = array('locale', 'locale_test');
 
   public function testFileParsing() {
-    $filename = drupal_get_path('module', 'locale') . '/tests/locale_test.js';
+    $filename = __DIR__ . '/../../tests/locale_test.js';
 
     // Parse the file to look for source strings.
     _locale_parse_js_file($filename);
diff --git a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
index 5422a10..326cccd 100644
--- a/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
+++ b/core/modules/locale/src/Tests/LocaleTranslatedSchemaDefinitionTest.php
@@ -46,17 +46,17 @@ function testTranslatedSchemaDefinition() {
     $stringStorage = \Drupal::service('locale.storage');
 
     $source = $stringStorage->createString(array(
-      'source' => 'The node ID.',
+      'source' => 'Revision ID',
     ))->save();
 
     $stringStorage->createTranslation(array(
       'lid' => $source->lid,
       'language' => 'fr',
-      'translation' => 'Translated node ID',
+      'translation' => 'Translated Revision ID',
     ))->save();
 
     // Ensure that the field is translated when access through the API.
-    $this->assertEqual('Translated node ID', \Drupal::entityManager()->getBaseFieldDefinitions('node')['nid']->getDescription());
+    $this->assertEqual('Translated Revision ID', \Drupal::entityManager()->getBaseFieldDefinitions('node')['vid']->getLabel());
 
     // Assert there are no updates.
     $this->assertFalse(\Drupal::service('entity.definition_update_manager')->needsUpdates());
diff --git a/core/modules/locale/src/Tests/LocaleUpdateBase.php b/core/modules/locale/src/Tests/LocaleUpdateBase.php
index cc2aed3..78c2b39 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateBase.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateBase.php
@@ -8,6 +8,7 @@
 namespace Drupal\locale\Tests;
 
 use Drupal\Core\StreamWrapper\PublicStream;
+use Drupal\file\Entity\File;
 use Drupal\simpletest\WebTestBase;
 use Drupal\Component\Utility\SafeMarkup;
 
@@ -133,14 +134,14 @@ protected function makePoFile($path, $filename, $timestamp = NULL, array $transl
     }
 
     file_prepare_directory($path, FILE_CREATE_DIRECTORY);
-    $file = entity_create('file', array(
+    $file = File::create([
       'uid' => 1,
       'filename' => $filename,
       'uri' => $path . '/' . $filename,
       'filemime' => 'text/x-gettext-translation',
       'timestamp' => $timestamp,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), $po_header . $text);
     touch(drupal_realpath($file->getFileUri()), $timestamp);
     $file->save();
diff --git a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
deleted file mode 100644
index bdf144a..0000000
--- a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\locale\Tests\Migrate\MigrateLocaleConfigsTest.
- */
-
-namespace Drupal\locale\Tests\Migrate;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to locale.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('locale', 'language');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('locale_settings');
-  }
-
-  /**
-   * Tests migration of locale variables to locale.settings.yml.
-   */
-  public function testLocaleSettings() {
-    $config = $this->config('locale.settings');
-    $this->assertIdentical(TRUE, $config->get('cache_strings'));
-    $this->assertIdentical('languages', $config->get('javascript.directory'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php b/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
new file mode 100644
index 0000000..df3513a
--- /dev/null
+++ b/core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\locale\Kernel\Migrate\MigrateLocaleConfigsTest.
+ */
+
+namespace Drupal\Tests\locale\Kernel\Migrate;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to locale.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('locale', 'language');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('locale_settings');
+  }
+
+  /**
+   * Tests migration of locale variables to locale.settings.yml.
+   */
+  public function testLocaleSettings() {
+    $config = $this->config('locale.settings');
+    $this->assertIdentical(TRUE, $config->get('cache_strings'));
+    $this->assertIdentical('languages', $config->get('javascript.directory'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml b/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml
deleted file mode 100644
index bfc93f6..0000000
--- a/core/modules/menu_link_content/config/schema/menu_link_content.schema.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-migrate.source.menu_link:
-  type: migrate_source_sql
-  label: 'Menu link'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
diff --git a/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php b/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
index d3c0998..276dda0 100644
--- a/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
+++ b/core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
@@ -64,7 +64,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
         }
         else {
           // If there is a URL, this is an external link so always accessible.
-          $access = AccessResult::allowed()->cachePerPermissions()->cacheUntilEntityChanges($entity);
+          $access = AccessResult::allowed()->cachePerPermissions()->addCacheableDependency($entity);
           /** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
           // We allow access, but only if the link is accessible as well.
           if (($url_object = $entity->getUrlObject()) && $url_object->isRouted()) {
@@ -75,7 +75,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
         }
 
       case 'delete':
-        return AccessResult::allowedIf(!$entity->isNew() && $account->hasPermission('administer menu'))->cachePerPermissions()->cacheUntilEntityChanges($entity);
+        return AccessResult::allowedIf(!$entity->isNew() && $account->hasPermission('administer menu'))->cachePerPermissions()->addCacheableDependency($entity);
     }
   }
 
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/src/Tests/LinksTest.php
index 29a8d97..46e3d60 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/src/Tests/LinksTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\menu_link_content\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\simpletest\WebTestBase;
+use Drupal\system\Entity\Menu;
 
 /**
  * Tests handling of menu links hierarchies.
@@ -39,7 +41,7 @@ protected function setUp() {
 
     $this->menuLinkManager = \Drupal::service('plugin.manager.menu.link');
 
-    entity_create('menu', array(
+    Menu::create(array(
       'id' => 'menu_test',
       'label' => 'Test menu',
       'description' => 'Description text',
@@ -68,7 +70,7 @@ function createLinkHierarchy($module = 'menu_test') {
     $parent = $base_options + array(
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
     );
-    $link = entity_create('menu_link_content', $parent);
+    $link = MenuLinkContent::create($parent);
     $link->save();
     $links['parent'] = $link->getPluginId();
 
@@ -76,7 +78,7 @@ function createLinkHierarchy($module = 'menu_test') {
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
       'parent' => $links['parent'],
     );
-    $link = entity_create('menu_link_content', $child_1);
+    $link = MenuLinkContent::create($child_1);
     $link->save();
     $links['child-1'] = $link->getPluginId();
 
@@ -84,7 +86,7 @@ function createLinkHierarchy($module = 'menu_test') {
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
       'parent' => $links['child-1'],
     );
-    $link = entity_create('menu_link_content', $child_1_1);
+    $link = MenuLinkContent::create($child_1_1);
     $link->save();
     $links['child-1-1'] = $link->getPluginId();
 
@@ -92,7 +94,7 @@ function createLinkHierarchy($module = 'menu_test') {
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
       'parent' => $links['child-1'],
     );
-    $link = entity_create('menu_link_content', $child_1_2);
+    $link = MenuLinkContent::create($child_1_2);
     $link->save();
     $links['child-1-2'] = $link->getPluginId();
 
@@ -100,7 +102,7 @@ function createLinkHierarchy($module = 'menu_test') {
       'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
       'parent' => $links['parent'],
     );
-    $link = entity_create('menu_link_content', $child_2);
+    $link = MenuLinkContent::create($child_2);
     $link->save();
     $links['child-2'] = $link->getPluginId();
 
@@ -129,7 +131,7 @@ public function testCreateLink() {
       'bundle' => 'menu_link_content',
       'link' => [['uri' => 'internal:/']],
     );
-    $link = entity_create('menu_link_content', $options);
+    $link = MenuLinkContent::create($options);
     $link->save();
     // Make sure the changed timestamp is set.
     $this->assertEqual($link->getChangedTime(), REQUEST_TIME, 'Creating a menu link sets the "changed" timestamp.');
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
index 825f493..9e1dbf1 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
@@ -39,7 +39,6 @@ protected function setUp() {
 
     $this->installEntitySchema('menu_link_content');
     $this->installEntitySchema('user');
-    $this->installSchema('system', ['url_alias', 'router']);
 
     // Ensure that the weight of module_link_content is higher than system.
     // @see menu_link_content_install()
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
index c411f83..362c691 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
@@ -56,6 +56,8 @@ public function testMenuLinkContentDeleteForm() {
     $this->assertLinkByHref($menu_link->url('edit-form'));
 
     \Drupal::service('module_installer')->install(['menu_ui']);
+    \Drupal::service('router.builder')->rebuild();
+
     // Make sure cancel URL points to menu_ui route now.
     $this->drupalGet($menu_link->urlInfo('delete-form'));
     $menu = Menu::load($menu_link->getMenuName());
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
index b5ae7ae..defbaad 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\menu_link_content\Tests;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
@@ -33,7 +32,6 @@ protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('menu_link_content');
-    $this->installSchema('system', 'router');
   }
 
   /**
@@ -73,7 +71,6 @@ public function testRediscover() {
     $title = $tree_element->link->getTitle();
     $this->assertFalse($title instanceof TranslatableMarkup);
     $this->assertIdentical('<script>alert("Welcome to the discovered jungle!")</script>', $title);
-    $this->assertFalse(SafeMarkup::isSafe($title));
 
     // Create a hierarchy.
     \Drupal::state()->set('menu_link_content_dynamic_route.routes', [
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php b/core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php
deleted file mode 100644
index 47e94d1..0000000
--- a/core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\MigrateMenuLinkContentStubTest.
- */
-
-namespace Drupal\menu_link_content\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for menu link content entities.
- *
- * @group menu_link_content
- */
-class MigrateMenuLinkContentStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['menu_link_content', 'link'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('menu_link_content');
-  }
-
-  /**
-   * Tests creation of menu link content stubs.
-   */
-  public function testStub() {
-    $this->performStubTest('menu_link_content');
-  }
-
-}
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
deleted file mode 100644
index 8fc22ef..0000000
--- a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\d6\MigrateMenuLinkTest.
- */
-
-namespace Drupal\menu_link_content\Tests\Migrate\d6;
-
-use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Menu link migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('menu_ui', 'menu_link_content');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['router']);
-    $this->installEntitySchema('menu_link_content');
-    $this->executeMigrations(['menu', 'menu_links']);
-  }
-
-  /**
-   * Tests migration of menu links.
-   */
-  public function testMenuLinks() {
-    $menu_link = MenuLinkContent::load(138);
-    $this->assertIdentical('Test 1', $menu_link->getTitle());
-    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
-    $this->assertIdentical('Test menu link 1', $menu_link->getDescription());
-    $this->assertIdentical(TRUE, $menu_link->isEnabled());
-    $this->assertIdentical(FALSE, $menu_link->isExpanded());
-    $this->assertIdentical(['attributes' => ['title' => 'Test menu link 1']], $menu_link->link->options);
-    $this->assertIdentical('internal:/user/login', $menu_link->link->uri);
-    $this->assertIdentical(-50, $menu_link->getWeight());
-
-    $menu_link = MenuLinkContent::load(139);
-    $this->assertIdentical('Test 2', $menu_link->getTitle());
-    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
-    $this->assertIdentical('Test menu link 2', $menu_link->getDescription());
-    $this->assertIdentical(TRUE, $menu_link->isEnabled());
-    $this->assertIdentical(TRUE, $menu_link->isExpanded());
-    $this->assertIdentical(['query' => 'foo=bar', 'attributes' => ['title' => 'Test menu link 2']], $menu_link->link->options);
-    $this->assertIdentical('internal:/admin', $menu_link->link->uri);
-    $this->assertIdentical(-49, $menu_link->getWeight());
-
-    $menu_link = MenuLinkContent::load(140);
-    $this->assertIdentical('Drupal.org', $menu_link->getTitle());
-    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
-    $this->assertIdentical(NULL, $menu_link->getDescription());
-    $this->assertIdentical(TRUE, $menu_link->isEnabled());
-    $this->assertIdentical(FALSE, $menu_link->isExpanded());
-    $this->assertIdentical(['attributes' => ['title' => '']], $menu_link->link->options);
-    $this->assertIdentical('https://www.drupal.org', $menu_link->link->uri);
-    $this->assertIdentical(-50, $menu_link->getWeight());
-
-    // assert that missing title attributes don't stop or break migration.
-    $menu_link = MenuLinkContent::load(393);
-    $this->assertIdentical('Test 3', $menu_link->getTitle());
-    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
-    $this->assertIdentical(NULL, $menu_link->getDescription());
-    $this->assertIdentical(TRUE, $menu_link->isEnabled());
-    $this->assertIdentical(FALSE, $menu_link->isExpanded());
-    $this->assertIdentical([], $menu_link->link->options);
-    $this->assertIdentical('internal:/user/login', $menu_link->link->uri);
-    $this->assertIdentical(-47, $menu_link->getWeight());
-  }
-
-}
diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php
deleted file mode 100644
index 68c6d7a..0000000
--- a/core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\menu_link_content\Tests\Migrate\d7\MigrateMenuLinkTest.
- */
-
-namespace Drupal\menu_link_content\Tests\Migrate\d7;
-
-use Drupal\Core\Database\Database;
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Core\Url;
-use Drupal\menu_link_content\Entity\MenuLinkContent;
-use Drupal\menu_link_content\MenuLinkContentInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Menu link migration.
- *
- * @group menu_link_content
- */
-class MigrateMenuLinkTest extends MigrateDrupal7TestBase {
-  const MENU_NAME = 'menu-test-menu';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('link', 'menu_ui', 'menu_link_content');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['router']);
-    $this->installEntitySchema('menu_link_content');
-    $this->executeMigration('menu');
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Asserts various aspects of a menu link entity.
-   *
-   * @param string $id
-   *   The link ID.
-   * @param string $title
-   *   The expected title of the link.
-   * @param string $menu
-   *   The expected ID of the menu to which the link will belong.
-   * @param string $description
-   *   The link's expected description.
-   * @param bool $enabled
-   *   Whether the link is enabled.
-   * @param bool $expanded
-   *   Whether the link is expanded
-   * @param array $attributes
-   *   Additional attributes the link is expected to have.
-   * @param string $uri
-   *   The expected URI of the link.
-   * @param int $weight
-   *   The expected weight of the link.
-   */
-  protected function assertEntity($id, $title, $menu, $description, $enabled, $expanded, array $attributes, $uri, $weight) {
-    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
-    $menu_link = MenuLinkContent::load($id);
-    $this->assertTrue($menu_link instanceof MenuLinkContentInterface);
-    $this->assertIdentical($title, $menu_link->getTitle());
-    $this->assertIdentical($menu, $menu_link->getMenuName());
-    // The migration sets the description of the link to the value of the
-    // 'title' attribute. Bit strange, but there you go.
-    $this->assertIdentical($description, $menu_link->getDescription());
-    $this->assertIdentical($enabled, $menu_link->isEnabled());
-    $this->assertIdentical($expanded, $menu_link->isExpanded());
-    $this->assertIdentical($attributes, $menu_link->link->options);
-    $this->assertIdentical($uri, $menu_link->link->uri);
-    $this->assertIdentical($weight, $menu_link->getWeight());
-    return $menu_link;
-  }
-
-  /**
-   * Tests migration of menu links.
-   */
-  public function testMenuLinks() {
-    $this->executeMigration('menu_links');
-    $this->assertEntity(469, 'Bing', static::MENU_NAME, 'Bing', TRUE, FALSE, ['attributes' => ['title' => 'Bing']], 'http://bing.com', 0);
-    $this->assertEntity(467, 'Google', static::MENU_NAME, 'Google', TRUE, FALSE, ['attributes' => ['title' => 'Google']], 'http://google.com', 0);
-    $this->assertEntity(468, 'Yahoo', static::MENU_NAME, 'Yahoo', TRUE, FALSE, ['attributes' => ['title' => 'Yahoo']], 'http://yahoo.com', 0);
-    $menu_link_tree_service = \Drupal::service('menu.link_tree');
-    $parameters = new MenuTreeParameters();
-    $tree = $menu_link_tree_service->load(static::MENU_NAME, $parameters);
-    $this->assertEqual(2, count($tree));
-    $children = 0;
-    $google_found = FALSE;
-    foreach ($tree as $menu_link_tree_element) {
-      $children += $menu_link_tree_element->hasChildren;
-      if ($menu_link_tree_element->link->getUrlObject()->toString() == 'http://bing.com') {
-        $this->assertEqual(reset($menu_link_tree_element->subtree)->link->getUrlObject()->toString(), 'http://google.com');
-        $google_found = TRUE;
-      }
-    }
-    $this->assertEqual(1, $children);
-    $this->assertTrue($google_found);
-    // Now find the custom link under a system link.
-    $parameters->root = 'system.admin_structure';
-    $tree = $menu_link_tree_service->load(static::MENU_NAME, $parameters);
-    $found = FALSE;
-    foreach ($tree as $menu_link_tree_element) {
-      $this->pass($menu_link_tree_element->link->getUrlObject()->toString());
-      if ($menu_link_tree_element->link->getTitle() == 'custom link test') {
-        $found = TRUE;
-        break;
-      }
-    }
-    $this->assertTrue($found);
-  }
-
-  /**
-   * Tests migrating a link with an undefined title attribute.
-   */
-  public function testUndefinedLinkTitle() {
-    Database::getConnection('default', 'migrate')
-      ->update('menu_links')
-      ->fields(array(
-        'options' => 'a:0:{}',
-      ))
-      ->condition('mlid', 467)
-      ->execute();
-
-    $this->executeMigration('menu_links');
-    $this->assertEntity(467, 'Google', static::MENU_NAME, NULL, TRUE, FALSE, [], 'http://google.com', 0);
-  }
-
-}
diff --git a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php b/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
index 3cdec3f..7be92e1 100644
--- a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
+++ b/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
@@ -32,7 +32,6 @@ protected function setUp() {
     parent::setUp();
 
     $this->installEntitySchema('menu_link_content');
-    $this->installSchema('system', ['url_alias', 'router']);
 
     // Ensure that the weight of module_link_content is higher than system.
     // @see menu_link_content_install()
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
new file mode 100644
index 0000000..5736bd9
--- /dev/null
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\MigrateMenuLinkContentStubTest.
+ */
+
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for menu link content entities.
+ *
+ * @group menu_link_content
+ */
+class MigrateMenuLinkContentStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['menu_link_content', 'link'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('menu_link_content');
+  }
+
+  /**
+   * Tests creation of menu link content stubs.
+   */
+  public function testStub() {
+    $this->performStubTest('menu_link_content');
+  }
+
+}
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
new file mode 100644
index 0000000..f043850
--- /dev/null
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\d6\MigrateMenuLinkTest.
+ */
+
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d6;
+
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Menu link migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('menu_ui', 'menu_link_content');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('menu_link_content');
+    $this->executeMigrations(['menu', 'menu_links']);
+  }
+
+  /**
+   * Tests migration of menu links.
+   */
+  public function testMenuLinks() {
+    $menu_link = MenuLinkContent::load(138);
+    $this->assertIdentical('Test 1', $menu_link->getTitle());
+    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
+    $this->assertIdentical('Test menu link 1', $menu_link->getDescription());
+    $this->assertIdentical(TRUE, $menu_link->isEnabled());
+    $this->assertIdentical(FALSE, $menu_link->isExpanded());
+    $this->assertIdentical(['attributes' => ['title' => 'Test menu link 1']], $menu_link->link->options);
+    $this->assertIdentical('internal:/user/login', $menu_link->link->uri);
+    $this->assertIdentical(-50, $menu_link->getWeight());
+
+    $menu_link = MenuLinkContent::load(139);
+    $this->assertIdentical('Test 2', $menu_link->getTitle());
+    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
+    $this->assertIdentical('Test menu link 2', $menu_link->getDescription());
+    $this->assertIdentical(TRUE, $menu_link->isEnabled());
+    $this->assertIdentical(TRUE, $menu_link->isExpanded());
+    $this->assertIdentical(['query' => 'foo=bar', 'attributes' => ['title' => 'Test menu link 2']], $menu_link->link->options);
+    $this->assertIdentical('internal:/admin', $menu_link->link->uri);
+    $this->assertIdentical(-49, $menu_link->getWeight());
+
+    $menu_link = MenuLinkContent::load(140);
+    $this->assertIdentical('Drupal.org', $menu_link->getTitle());
+    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
+    $this->assertIdentical(NULL, $menu_link->getDescription());
+    $this->assertIdentical(TRUE, $menu_link->isEnabled());
+    $this->assertIdentical(FALSE, $menu_link->isExpanded());
+    $this->assertIdentical(['attributes' => ['title' => '']], $menu_link->link->options);
+    $this->assertIdentical('https://www.drupal.org', $menu_link->link->uri);
+    $this->assertIdentical(-50, $menu_link->getWeight());
+
+    // assert that missing title attributes don't stop or break migration.
+    $menu_link = MenuLinkContent::load(393);
+    $this->assertIdentical('Test 3', $menu_link->getTitle());
+    $this->assertIdentical('secondary-links', $menu_link->getMenuName());
+    $this->assertIdentical(NULL, $menu_link->getDescription());
+    $this->assertIdentical(TRUE, $menu_link->isEnabled());
+    $this->assertIdentical(FALSE, $menu_link->isExpanded());
+    $this->assertIdentical([], $menu_link->link->options);
+    $this->assertIdentical('internal:/user/login', $menu_link->link->uri);
+    $this->assertIdentical(-47, $menu_link->getWeight());
+  }
+
+}
diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
new file mode 100644
index 0000000..2c3aef8
--- /dev/null
+++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\menu_link_content\Kernel\Migrate\d7\MigrateMenuLinkTest.
+ */
+
+namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d7;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\menu_link_content\MenuLinkContentInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Menu link migration.
+ *
+ * @group menu_link_content
+ */
+class MigrateMenuLinkTest extends MigrateDrupal7TestBase {
+  const MENU_NAME = 'menu-test-menu';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('link', 'menu_ui', 'menu_link_content');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('menu_link_content');
+    $this->executeMigration('menu');
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Asserts various aspects of a menu link entity.
+   *
+   * @param string $id
+   *   The link ID.
+   * @param string $title
+   *   The expected title of the link.
+   * @param string $menu
+   *   The expected ID of the menu to which the link will belong.
+   * @param string $description
+   *   The link's expected description.
+   * @param bool $enabled
+   *   Whether the link is enabled.
+   * @param bool $expanded
+   *   Whether the link is expanded
+   * @param array $attributes
+   *   Additional attributes the link is expected to have.
+   * @param string $uri
+   *   The expected URI of the link.
+   * @param int $weight
+   *   The expected weight of the link.
+   */
+  protected function assertEntity($id, $title, $menu, $description, $enabled, $expanded, array $attributes, $uri, $weight) {
+    /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */
+    $menu_link = MenuLinkContent::load($id);
+    $this->assertTrue($menu_link instanceof MenuLinkContentInterface);
+    $this->assertIdentical($title, $menu_link->getTitle());
+    $this->assertIdentical($menu, $menu_link->getMenuName());
+    // The migration sets the description of the link to the value of the
+    // 'title' attribute. Bit strange, but there you go.
+    $this->assertIdentical($description, $menu_link->getDescription());
+    $this->assertIdentical($enabled, $menu_link->isEnabled());
+    $this->assertIdentical($expanded, $menu_link->isExpanded());
+    $this->assertIdentical($attributes, $menu_link->link->options);
+    $this->assertIdentical($uri, $menu_link->link->uri);
+    $this->assertIdentical($weight, $menu_link->getWeight());
+    return $menu_link;
+  }
+
+  /**
+   * Tests migration of menu links.
+   */
+  public function testMenuLinks() {
+    $this->executeMigration('menu_links');
+    $this->assertEntity(469, 'Bing', static::MENU_NAME, 'Bing', TRUE, FALSE, ['attributes' => ['title' => 'Bing']], 'http://bing.com', 0);
+    $this->assertEntity(467, 'Google', static::MENU_NAME, 'Google', TRUE, FALSE, ['attributes' => ['title' => 'Google']], 'http://google.com', 0);
+    $this->assertEntity(468, 'Yahoo', static::MENU_NAME, 'Yahoo', TRUE, FALSE, ['attributes' => ['title' => 'Yahoo']], 'http://yahoo.com', 0);
+    $menu_link_tree_service = \Drupal::service('menu.link_tree');
+    $parameters = new MenuTreeParameters();
+    $tree = $menu_link_tree_service->load(static::MENU_NAME, $parameters);
+    $this->assertEqual(2, count($tree));
+    $children = 0;
+    $google_found = FALSE;
+    foreach ($tree as $menu_link_tree_element) {
+      $children += $menu_link_tree_element->hasChildren;
+      if ($menu_link_tree_element->link->getUrlObject()->toString() == 'http://bing.com') {
+        $this->assertEqual(reset($menu_link_tree_element->subtree)->link->getUrlObject()->toString(), 'http://google.com');
+        $google_found = TRUE;
+      }
+    }
+    $this->assertEqual(1, $children);
+    $this->assertTrue($google_found);
+    // Now find the custom link under a system link.
+    $parameters->root = 'system.admin_structure';
+    $tree = $menu_link_tree_service->load(static::MENU_NAME, $parameters);
+    $found = FALSE;
+    foreach ($tree as $menu_link_tree_element) {
+      $this->pass($menu_link_tree_element->link->getUrlObject()->toString());
+      if ($menu_link_tree_element->link->getTitle() == 'custom link test') {
+        $found = TRUE;
+        break;
+      }
+    }
+    $this->assertTrue($found);
+  }
+
+  /**
+   * Tests migrating a link with an undefined title attribute.
+   */
+  public function testUndefinedLinkTitle() {
+    Database::getConnection('default', 'migrate')
+      ->update('menu_links')
+      ->fields(array(
+        'options' => 'a:0:{}',
+      ))
+      ->condition('mlid', 467)
+      ->execute();
+
+    $this->executeMigration('menu_links');
+    $this->assertEntity(467, 'Google', static::MENU_NAME, NULL, TRUE, FALSE, [], 'http://google.com', 0);
+  }
+
+}
diff --git a/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/MenuLinkSourceTest.php b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/MenuLinkSourceTest.php
index 9484ca4..72955cb 100644
--- a/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/MenuLinkSourceTest.php
+++ b/core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/MenuLinkSourceTest.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\MenuLinkSourceTest.
  */
+
 namespace Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source;
 
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/menu_ui/menu_ui.admin.js b/core/modules/menu_ui/menu_ui.admin.js
index 2bc80dd..345138f 100644
--- a/core/modules/menu_ui/menu_ui.admin.js
+++ b/core/modules/menu_ui/menu_ui.admin.js
@@ -3,7 +3,7 @@
  * Menu UI admin behaviors.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -65,4 +65,4 @@
     });
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/menu_ui/menu_ui.install b/core/modules/menu_ui/menu_ui.install
deleted file mode 100644
index a79e503..0000000
--- a/core/modules/menu_ui/menu_ui.install
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the menu_ui module.
- */
-
-/**
- * Implements hook_install().
- */
-function menu_ui_install() {
-  // Rebuild all the menu data.
-  // @todo - remove this when we understand why removing it breaks the
-  // standard install profile, possibly need to be handled in
-  // \Drupal\Core\Extension\ModuleHandler::install().
-  // @see https://www.drupal.org/node/2181151
-  \Drupal::service('router.builder')->rebuild();
-}
-
-/**
- * Implements hook_uninstall().
- */
-function menu_ui_uninstall() {
-  \Drupal::service('router.builder')->setRebuildNeeded();
-}
diff --git a/core/modules/menu_ui/menu_ui.js b/core/modules/menu_ui/menu_ui.js
index 113b90a..5eb10e0 100644
--- a/core/modules/menu_ui/menu_ui.js
+++ b/core/modules/menu_ui/menu_ui.js
@@ -3,7 +3,7 @@
  * Menu UI behaviors.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -88,4 +88,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 8a5cb9e..463f8ca 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -15,7 +15,6 @@
 use Drupal\Core\Link;
 use Drupal\Core\Menu\MenuLinkInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\node\NodeTypeInterface;
@@ -150,7 +149,7 @@ function _menu_ui_node_save(NodeInterface $node, array $values) {
   }
   else {
     // Create a new menu_link_content entity.
-    $entity = entity_create('menu_link_content', array(
+    $entity = MenuLinkContent::create(array(
       'link' => ['uri' => 'entity:node/' . $node->id()],
       'langcode' => $node->language()->getId(),
     ));
diff --git a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
index 520627e..5e8e691 100644
--- a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\menu_ui\Tests;
 
 use Drupal\Core\Url;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\system\Tests\Cache\PageCacheTagsTestBase;
+use Drupal\system\Entity\Menu;
 
 /**
  * Tests the Menu and Menu Link entities' cache tags.
@@ -32,7 +34,7 @@ public function testMenuBlock() {
     $url = Url::fromRoute('test_page_test.test_page');
 
     // Create a Llama menu, add a link to it and place the corresponding block.
-    $menu = entity_create('menu', array(
+    $menu = Menu::create(array(
       'id' => 'llama',
       'label' => 'Llama',
       'description' => 'Description text',
@@ -79,7 +81,7 @@ public function testMenuBlock() {
 
     // Verify that after adding a menu link, there is a cache miss.
     $this->pass('Test addition of menu link.', 'Debug');
-    $menu_link_2 = entity_create('menu_link_content', array(
+    $menu_link_2 = MenuLinkContent::create(array(
       'id' => '',
       'parent' => '',
       'title' => 'Alpaca',
diff --git a/core/modules/menu_ui/src/Tests/MenuNodeTest.php b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
index 9521836..0022d58 100644
--- a/core/modules/menu_ui/src/Tests/MenuNodeTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuNodeTest.php
@@ -204,7 +204,7 @@ function testMenuNodeFormWidget() {
     $this->assertNoLink($node_title);
 
     // Add a menu link to the Administration menu.
-    $item = entity_create('menu_link_content', array(
+    $item = MenuLinkContent::create(array(
       'link' => [['uri' => 'entity:node/' . $node->id()]],
       'title' => $this->randomMachineName(16),
       'menu_name' => 'admin',
@@ -226,7 +226,7 @@ function testMenuNodeFormWidget() {
     // Create a second node.
     $child_node = $this->drupalCreateNode(array('type' => 'article'));
     // Assign a menu link to the second node, being a child of the first one.
-    $child_item = entity_create('menu_link_content', array(
+    $child_item = MenuLinkContent::create(array(
       'link' => [['uri' => 'entity:node/' . $child_node->id()]],
       'title' => $this->randomMachineName(16),
       'parent' => $item->getPluginId(),
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index d88911a..7e3e62d 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -157,7 +157,7 @@ function addCustomMenuCRUD() {
     $menu_name = substr(hash('sha256', $this->randomMachineName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
     $label = $this->randomMachineName(16);
 
-    $menu = entity_create('menu', array(
+    $menu = Menu::create(array(
       'id' => $menu_name,
       'label' => $label,
       'description' => 'Description text',
@@ -298,7 +298,7 @@ function doMenuTests() {
 
     // Verify add link button.
     $this->drupalGet('admin/structure/menu');
-    $this->assertLinkByHref('admin/structure/menu/manage/' . $menu_name . '/add', 0, "The add menu link button url is correct");
+    $this->assertLinkByHref('admin/structure/menu/manage/' . $menu_name . '/add', 0, "The add menu link button URL is correct");
 
     // Verify form defaults.
     $this->doMenuLinkFormDefaultsTest();
diff --git a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php b/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
deleted file mode 100644
index c1655c6..0000000
--- a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\menu_ui\Tests\Migrate\MigrateMenuSettingsTest.
- */
-
-namespace Drupal\menu_ui\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of menu_ui settings.
- *
- * @group menu_ui
- */
-class MigrateMenuSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['menu_ui'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['menu_ui']);
-    $this->executeMigration('menu_settings');
-  }
-
-  public function testMigration() {
-    $this->assertTrue(\Drupal::config('menu_ui.settings')->get('override_parent_selector'));
-  }
-
-}
diff --git a/core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php b/core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php
new file mode 100644
index 0000000..297384c
--- /dev/null
+++ b/core/modules/menu_ui/tests/tests/src/Kernel/Migrate/MigrateMenuSettingsTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\menu_ui\Kernel\Migrate\MigrateMenuSettingsTest.
+ */
+
+namespace Drupal\Tests\menu_ui\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of menu_ui settings.
+ *
+ * @group menu_ui
+ */
+class MigrateMenuSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['menu_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['menu_ui']);
+    $this->executeMigration('menu_settings');
+  }
+
+  public function testMigration() {
+    $this->assertTrue(\Drupal::config('menu_ui.settings')->get('override_parent_selector'));
+  }
+
+}
diff --git a/core/modules/migrate/config/schema/migrate.data_types.schema.yml b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
deleted file mode 100644
index 27c8006..0000000
--- a/core/modules/migrate/config/schema/migrate.data_types.schema.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Basic data types for Migrate.
-
-migrate_plugin:
-  type: mapping
-  mapping:
-    plugin:
-      type: string
-      label: 'Plugin'
-
-migrate_destination:
-  type: migrate_plugin
-  label: 'Destination'
-  mapping:
-    overwrite_properties:
-      type: sequence
-      label: 'Properties to overwrite'
-      sequence:
-        type: string
-        label: 'Property'
-
-migrate_source:
-  type: migrate_plugin
-  label: 'Source'
-  mapping:
-    constants:
-      type: ignore
-      label: 'Constants'
-
-migrate_process:
-  type: migrate_plugin
-  label: 'Process'
-
-# Base schema for migrate source plugins that extend
-# \Drupal\migrate\Plugin\migrate\source\SqlBase.
-migrate_source_sql:
-  type: migrate_source
-  mapping:
-    target:
-      type: string
-      label: 'The migration database target'
diff --git a/core/modules/migrate/config/schema/migrate.destination.schema.yml b/core/modules/migrate/config/schema/migrate.destination.schema.yml
deleted file mode 100644
index b295741..0000000
--- a/core/modules/migrate/config/schema/migrate.destination.schema.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Schema for the migrate destination plugins.
-
-migrate.destination.*:
-  type: migrate_destination
-  label: 'Default destination'
-  mapping:
-    no_stub:
-      type: boolean
-      label: 'Whether stubbing is allowed.'
-      default: false
-
-migrate.destination.config:
-  type: migrate_destination
-  label: 'Config'
-  mapping:
-    config_name:
-      type: string
-      label: 'Configuration name'
diff --git a/core/modules/migrate/config/schema/migrate.process.schema.yml b/core/modules/migrate/config/schema/migrate.process.schema.yml
deleted file mode 100644
index a82ff63..0000000
--- a/core/modules/migrate/config/schema/migrate.process.schema.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-# Schema for the migrate process plugins.
-
-migrate.process.*:
-  type: migrate_process
-  label: 'Default process'
-
-migrate.process.callback:
-  type: migrate_process
-  label: 'Callback process'
-  mapping:
-    callback:
-      type: string
-      label: 'Callback'
-
-migrate.process.concat:
-  type: migrate_process
-  label: 'Concat process'
-  mapping:
-    delimiter:
-      type: string
-      label: 'Delimiter'
-
-migrate.process.dedupe_entity:
-  type: migrate_process
-  label: 'Dedupe Entity process'
-  mapping:
-    entity_type:
-      type: string
-      label: 'Entity type'
-    field:
-      type: string
-      label: 'Field name'
-    postfix:
-      type: string
-      label: 'Postfix'
-    start:
-      type: integer
-      label: 'Start'
-    length:
-      type: integer
-      label: 'Length'
-
-migrate.process.explode:
-  type: migrate_process
-  label: 'Explode process'
-  mapping:
-    delimiter:
-      type: string
-      label: 'Delimiter'
-    limit:
-      type: integer
-      label: 'Limit'
-
-migrate.process.extract:
-  type: migrate_process
-  label: 'Extract process'
-  mapping:
-    default:
-      type: string
-      label: 'Default value'
-
-migrate.process.flatten:
-  type: migrate_process
-  label: 'Flatten process'
-
-migrate.process.get:
-  type: migrate_process
-  label: 'Get process'
-  mapping:
-    source:
-      type: string
-      label: 'Source key'
-
-migrate.process.iterator:
-  type: migrate_process
-  label: 'Iterator process'
-  mapping:
-    process:
-      type: ignore
-      label: 'Process'
-    key:
-      type: string
-      label: 'Key'
-
-migrate.process.machine_name:
-  type: migrate_process
-  label: 'Machine name process'
-
-migrate.process.migration:
-  type: migrate_process
-  label: 'Migration process'
-  mapping:
-    migration:
-      type: sequence
-      label: 'Migration'
-    source:
-      type: sequence
-      label: 'Source keys'
-    source_ids:
-      type: string
-      label: 'Source IDs'
-    stub_id:
-      type: string
-      label: 'Stub ID'
-
-migrate.process.route:
-  type: migrate_process
-  label: 'Route process'
-
-migrate.process.skip_on_empty:
-  type: migrate_process
-  label: 'Skip on Empty'
-
-migrate.process.skip_row_if_not_set:
-  type: migrate_process
-  label: 'Skip Row process if not set'
-  mapping:
-    index:
-      type: integer
-      label: 'Index'
-
-migrate.process.static_map:
-  type: migrate_process
-  label: 'Static Map'
-  mapping:
-    map:
-      type: sequence
-      label: 'Map'
-    default_value:
-      type: string
-      label: 'Default value'
-    bypass:
-      type: boolean
-      label: 'Bypass lookup'
-
-migrate.process.default_value:
-  type: migrate_process
-  label: 'Default value'
-  mapping:
-    strict:
-      type: boolean
-      label: 'Strict type check'
-    default_value:
-      type: string
-      label: 'Default value'
diff --git a/core/modules/migrate/config/schema/migrate.schema.yml b/core/modules/migrate/config/schema/migrate.schema.yml
deleted file mode 100644
index fcadda9..0000000
--- a/core/modules/migrate/config/schema/migrate.schema.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Schema for the configuration files of the Migrate module.
-
-migrate.migration.*:
-  type: config_entity
-  label: 'Migration'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    migration_tags:
-      type: sequence
-      label: 'Migration Tags'
-      sequence:
-        type: string
-        label: 'Tag'
-    label:
-      type: label
-      label: 'Label'
-    source:
-      type: migrate.source.[plugin]
-      label: 'Source'
-    process:
-      type: ignore
-      label: 'Process'
-    destination:
-      type: migrate.destination.[plugin]
-      label: 'Destination'
-    template:
-      type: string
-      label: 'Template'
-    migration_dependencies:
-      type: mapping
-      label: 'Dependencies'
-      mapping:
-        required:
-          type: sequence
-          label: 'Required dependencies'
-          sequence:
-            type: string
-            label: 'Dependency'
-        optional:
-          type: sequence
-          label: 'Optional dependencies'
-          sequence:
-            type: string
-            label: 'Dependency'
diff --git a/core/modules/migrate/config/schema/migrate.source.schema.yml b/core/modules/migrate/config/schema/migrate.source.schema.yml
deleted file mode 100644
index bb6ae96..0000000
--- a/core/modules/migrate/config/schema/migrate.source.schema.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Schema for the migrate source plugins.
-
-migrate.source.*:
-  type: migrate_source
-  label: 'Default source'
-
-migrate.source.empty:
-  type: migrate_source_sql
-  label: 'Empty source'
-  mapping:
-    provider:
-      type: string
-      label: 'Provider'
-
-migrate.source.embedded_data:
-  type: migrate_source
-  label: 'Embedded data source'
-  mapping:
-    data_rows:
-      type: sequence
-      label: 'Data rows'
-      sequence:
-        type: ignore
-        label: 'Data row'
-    ids:
-      type: sequence
-      label: 'Unique key'
-      sequence:
-        type: mapping
-        label: 'Key column'
-        mapping:
-          type:
-            type: string
-            label: 'Column type'
diff --git a/core/modules/migrate/migrate.api.php b/core/modules/migrate/migrate.api.php
index df5c66d..fa55b7d 100644
--- a/core/modules/migrate/migrate.api.php
+++ b/core/modules/migrate/migrate.api.php
@@ -5,7 +5,7 @@
  * Hooks provided by the Migrate module.
  */
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateSourceInterface;
 use Drupal\migrate\Row;
 
diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 40270f6..da43b38 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -5,12 +5,6 @@ services:
       - { name: cache.bin }
     factory: cache_factory:get
     arguments: [migrate]
-  migrate.template_storage:
-    class: Drupal\migrate\MigrateTemplateStorage
-    arguments: ['@module_handler']
-  migrate.migration_builder:
-    class: Drupal\migrate\MigrationBuilder
-    arguments: ['@plugin.manager.migrate.builder']
   plugin.manager.migrate.source:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [source, '@container.namespaces', '@cache.discovery', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource']
@@ -23,6 +17,6 @@ services:
   plugin.manager.migrate.id_map:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [id_map, '@container.namespaces', '@cache.discovery', '@module_handler']
-  plugin.manager.migrate.builder:
-    class: Drupal\migrate\Plugin\MigratePluginManager
-    arguments: [builder, '@container.namespaces', '@cache.discovery', '@module_handler']
+  plugin.manager.migration:
+    class: Drupal\migrate\Plugin\MigrationPluginManager
+    arguments: ['@module_handler', '@cache.discovery', '@language_manager']
diff --git a/core/modules/migrate/src/Annotation/MigrateDestination.php b/core/modules/migrate/src/Annotation/MigrateDestination.php
index 3837370..d06e161 100644
--- a/core/modules/migrate/src/Annotation/MigrateDestination.php
+++ b/core/modules/migrate/src/Annotation/MigrateDestination.php
@@ -48,13 +48,4 @@ class MigrateDestination extends Plugin {
    */
   public $requirements_met = TRUE;
 
-  /**
-   * A class to make the plugin derivative aware.
-   *
-   * @var string
-   *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator
-   */
-  public $derivative;
-
 }
diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php
deleted file mode 100644
index 9e509f4..0000000
--- a/core/modules/migrate/src/Entity/Migration.php
+++ /dev/null
@@ -1,598 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Entity\Migration.
- */
-
-namespace Drupal\migrate\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\MigrateException;
-use Drupal\migrate\MigrateSkipRowException;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Plugin\RequirementsInterface;
-use Drupal\Component\Utility\NestedArray;
-
-/**
- * Defines the Migration entity.
- *
- * The migration entity stores the information about a single migration, like
- * the source, process and destination plugins.
- *
- * @ConfigEntityType(
- *   id = "migration",
- *   label = @Translation("Migration"),
- *   handlers = {
- *     "storage" = "Drupal\migrate\MigrationStorage"
- *   },
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "weight" = "weight"
- *   }
- * )
- */
-class Migration extends ConfigEntityBase implements MigrationInterface, RequirementsInterface {
-
-  /**
-   * The migration ID (machine name).
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The human-readable label for the migration.
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The plugin ID for the row.
-   *
-   * @var string
-   */
-  protected $row;
-
-  /**
-   * The source configuration, with at least a 'plugin' key.
-   *
-   * Used to initialize the $sourcePlugin.
-   *
-   * @var array
-   */
-  protected $source;
-
-  /**
-   * The source plugin.
-   *
-   * @var \Drupal\migrate\Plugin\MigrateSourceInterface
-   */
-  protected $sourcePlugin;
-
-  /**
-   * The configuration describing the process plugins.
-   *
-   * This is a strictly internal property and should not returned to calling
-   * code, use getProcess() instead.
-   *
-   * @var array
-   */
-  protected $process = [];
-
-  /**
-   * The cached process plugins.
-   *
-   * @var array
-   */
-  protected $processPlugins = [];
-
-  /**
-   * The destination configuration, with at least a 'plugin' key.
-   *
-   * Used to initialize $destinationPlugin.
-   *
-   * @var array
-   */
-  protected $destination;
-
-  /**
-   * The destination plugin.
-   *
-   * @var \Drupal\migrate\Plugin\MigrateDestinationInterface
-   */
-  protected $destinationPlugin;
-
-  /**
-   * The identifier map data.
-   *
-   * Used to initialize $idMapPlugin.
-   *
-   * @var string
-   */
-  protected $idMap = [];
-
-  /**
-   * The identifier map.
-   *
-   * @var \Drupal\migrate\Plugin\MigrateIdMapInterface
-   */
-  protected $idMapPlugin;
-
-  /**
-   * The source identifiers.
-   *
-   * An array of source identifiers: the keys are the name of the properties,
-   * the values are dependent on the ID map plugin.
-   *
-   * @var array
-   */
-  protected $sourceIds = [];
-
-  /**
-   * The destination identifiers.
-   *
-   * An array of destination identifiers: the keys are the name of the
-   * properties, the values are dependent on the ID map plugin.
-   *
-   * @var array
-   */
-  protected $destinationIds = [];
-
-  /**
-   * Information on the high water mark.
-   *
-   * @var array
-   */
-  protected $highWaterProperty;
-
-  /**
-   * Indicate whether the primary system of record for this migration is the
-   * source, or the destination (Drupal). In the source case, migration of
-   * an existing object will completely replace the Drupal object with data from
-   * the source side. In the destination case, the existing Drupal object will
-   * be loaded, then changes from the source applied; also, rollback will not be
-   * supported.
-   *
-   * @var string
-   */
-  protected $systemOfRecord = self::SOURCE;
-
-  /**
-   * Specify value of source_row_status for current map row. Usually set by
-   * MigrateFieldHandler implementations.
-   *
-   * @var int
-   */
-  protected $sourceRowStatus = MigrateIdMapInterface::STATUS_IMPORTED;
-
-  /**
-   * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface
-   */
-  protected $highWaterStorage;
-
-  /**
-   * Track time of last import if TRUE.
-   *
-   * @var bool
-   */
-  protected $trackLastImported = FALSE;
-
-  /**
-   * These migrations must be already executed before this migration can run.
-   *
-   * @var array
-   */
-  protected $requirements = [];
-
-  /**
-   * These migrations, if run, must be executed before this migration.
-   *
-   * These are different from the configuration dependencies. Migration
-   * dependencies are only used to store relationships between migrations.
-   *
-   * The migration_dependencies value is structured like this:
-   * @code
-   * array(
-   *   'required' => array(
-   *     // An array of migration IDs that must be run before this migration.
-   *   ),
-   *   'optional' => array(
-   *     // An array of migration IDs that, if they exist, must be run before
-   *     // this migration.
-   *   ),
-   * );
-   * @endcode
-   *
-   * @var array
-   */
-  protected $migration_dependencies = [];
-
-  /**
-   * The migration's configuration dependencies.
-   *
-   * These store any dependencies on modules or other configuration (including
-   * other migrations) that must be available before the migration can be
-   * created.
-   *
-   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
-   *
-   * @var array
-   */
-  protected $dependencies = [];
-
-  /**
-   * The ID of the template from which this migration was derived, if any.
-   *
-   * @var string|NULL
-   */
-  protected $template;
-
-  /**
-   * The entity manager.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * Labels corresponding to each defined status.
-   *
-   * @var array
-   */
-  protected $statusLabels = [
-    self::STATUS_IDLE => 'Idle',
-    self::STATUS_IMPORTING => 'Importing',
-    self::STATUS_ROLLING_BACK => 'Rolling back',
-    self::STATUS_STOPPING => 'Stopping',
-    self::STATUS_DISABLED => 'Disabled',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSourcePlugin() {
-    if (!isset($this->sourcePlugin)) {
-      $this->sourcePlugin = \Drupal::service('plugin.manager.migrate.source')->createInstance($this->source['plugin'], $this->source, $this);
-    }
-    return $this->sourcePlugin;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProcessPlugins(array $process = NULL) {
-    if (!isset($process)) {
-      $process = $this->process;
-    }
-    $index = serialize($process);
-    if (!isset($this->processPlugins[$index])) {
-      $this->processPlugins[$index] = array();
-      foreach ($this->getProcessNormalized($process) as $property => $configurations) {
-        $this->processPlugins[$index][$property] = array();
-        foreach ($configurations as $configuration) {
-          if (isset($configuration['source'])) {
-            $this->processPlugins[$index][$property][] = \Drupal::service('plugin.manager.migrate.process')->createInstance('get', $configuration, $this);
-          }
-          // Get is already handled.
-          if ($configuration['plugin'] != 'get') {
-            $this->processPlugins[$index][$property][] = \Drupal::service('plugin.manager.migrate.process')->createInstance($configuration['plugin'], $configuration, $this);
-          }
-          if (!$this->processPlugins[$index][$property]) {
-            throw new MigrateException("Invalid process configuration for $property");
-          }
-        }
-      }
-    }
-    return $this->processPlugins[$index];
-  }
-
-  /**
-   * Resolve shorthands into a list of plugin configurations.
-   *
-   * @param array $process
-   *   A process configuration array.
-   *
-   * @return array
-   *   The normalized process configuration.
-   */
-  protected function getProcessNormalized(array $process) {
-    $normalized_configurations = array();
-    foreach ($process as $destination => $configuration) {
-      if (is_string($configuration)) {
-        $configuration = array(
-          'plugin' => 'get',
-          'source' => $configuration,
-        );
-      }
-      if (isset($configuration['plugin'])) {
-        $configuration = array($configuration);
-      }
-      $normalized_configurations[$destination] = $configuration;
-    }
-    return $normalized_configurations;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDestinationPlugin($stub_being_requested = FALSE) {
-    if ($stub_being_requested && !empty($this->destination['no_stub'])) {
-      throw new MigrateSkipRowException;
-    }
-    if (!isset($this->destinationPlugin)) {
-      $this->destinationPlugin = \Drupal::service('plugin.manager.migrate.destination')->createInstance($this->destination['plugin'], $this->destination, $this);
-    }
-    return $this->destinationPlugin;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIdMap() {
-    if (!isset($this->idMapPlugin)) {
-      $configuration = $this->idMap;
-      $plugin = isset($configuration['plugin']) ? $configuration['plugin'] : 'sql';
-      $this->idMapPlugin = \Drupal::service('plugin.manager.migrate.id_map')->createInstance($plugin, $configuration, $this);
-    }
-    return $this->idMapPlugin;
-  }
-
-  /**
-   * Get the high water storage object.
-   *
-   * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface
-   *   The storage object.
-   */
-  protected function getHighWaterStorage() {
-    if (!isset($this->highWaterStorage)) {
-      $this->highWaterStorage = \Drupal::keyValue('migrate:high_water');
-    }
-    return $this->highWaterStorage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getHighWater() {
-    return $this->getHighWaterStorage()->get($this->id());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function saveHighWater($high_water) {
-    $this->getHighWaterStorage()->set($this->id(), $high_water);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkRequirements() {
-    // Check whether the current migration source and destination plugin
-    // requirements are met or not.
-    if ($this->getSourcePlugin() instanceof RequirementsInterface) {
-      $this->getSourcePlugin()->checkRequirements();
-    }
-    if ($this->getDestinationPlugin() instanceof RequirementsInterface) {
-      $this->getDestinationPlugin()->checkRequirements();
-    }
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $required_migrations */
-    $required_migrations = $this->getEntityManager()->getStorage('migration')->loadMultiple($this->requirements);
-
-    $missing_migrations = array_diff($this->requirements, array_keys($required_migrations));
-    // Check if the dependencies are in good shape.
-    foreach ($required_migrations as $migration_id => $required_migration) {
-      if (!$required_migration->allRowsProcessed()) {
-        $missing_migrations[] = $migration_id;
-      }
-    }
-    if ($missing_migrations) {
-      throw new RequirementsException('Missing migrations ' . implode(', ', $missing_migrations) . '.', ['requirements' => $missing_migrations]);
-    }
-  }
-
-  /**
-   * Get the entity manager.
-   *
-   * @return \Drupal\Core\Entity\EntityManagerInterface
-   *   The entity manager.
-   */
-  protected function getEntityManager() {
-    if (!isset($this->entityManager)) {
-      $this->entityManager = \Drupal::entityManager();
-    }
-    return $this->entityManager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setStatus($status) {
-    \Drupal::keyValue('migrate_status')->set($this->id(), $status);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStatus() {
-    return \Drupal::keyValue('migrate_status')->get($this->id(), static::STATUS_IDLE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getStatusLabel() {
-    $status = $this->getStatus();
-    if (isset($this->statusLabels[$status])) {
-      return $this->statusLabels[$status];
-    }
-    else {
-      return '';
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getInterruptionResult() {
-    return \Drupal::keyValue('migrate_interruption_result')->get($this->id(), static::RESULT_INCOMPLETE);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function clearInterruptionResult() {
-    \Drupal::keyValue('migrate_interruption_result')->delete($this->id());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function interruptMigration($result) {
-    $this->setStatus(MigrationInterface::STATUS_STOPPING);
-    \Drupal::keyValue('migrate_interruption_result')->set($this->id(), $result);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function allRowsProcessed() {
-    $source_count = $this->getSourcePlugin()->count();
-    // If the source is uncountable, we have no way of knowing if it's
-    // complete, so stipulate that it is.
-    if ($source_count < 0) {
-      return TRUE;
-    }
-    $processed_count = $this->getIdMap()->processedCount();
-    // We don't use == because in some circumstances (like unresolved stubs
-    // being created), the processed count may be higher than the available
-    // source rows.
-    return $source_count <= $processed_count;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function set($property_name, $value) {
-    if ($property_name == 'source') {
-      // Invalidate the source plugin.
-      unset($this->sourcePlugin);
-    }
-    elseif ($property_name === 'destination') {
-      // Invalidate the destination plugin.
-      unset($this->destinationPlugin);
-    }
-    return parent::set($property_name, $value);
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getProcess() {
-    return $this->getProcessNormalized($this->process);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setProcess(array $process) {
-    $this->process = $process;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setProcessOfProperty($property, $process_of_property) {
-    $this->process[$property] = $process_of_property;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function mergeProcessOfProperty($property, array $process_of_property) {
-    // If we already have a process value then merge the incoming process array
-    //otherwise simply set it.
-    $current_process = $this->getProcess();
-    if (isset($current_process[$property])) {
-      $this->process = NestedArray::mergeDeepArray([$current_process, $this->getProcessNormalized([$property => $process_of_property])], TRUE);
-    }
-    else {
-      $this->setProcessOfProperty($property, $process_of_property);
-    }
-
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getSystemOfRecord() {
-    return $this->systemOfRecord;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setSystemOfRecord($system_of_record) {
-    $this->systemOfRecord = $system_of_record;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isTrackLastImported() {
-    return $this->trackLastImported;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setTrackLastImported($track_last_imported) {
-    $this->trackLastImported = (bool) $track_last_imported;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMigrationDependencies() {
-    return $this->migration_dependencies + ['required' => [], 'optional' => []];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function trustData() {
-    // Migrations cannot be trusted since they are often written by hand and not
-    // through a UI.
-    $this->trustedData = FALSE;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function calculateDependencies() {
-    parent::calculateDependencies();
-    $this->calculatePluginDependencies($this->getSourcePlugin());
-    $this->calculatePluginDependencies($this->getDestinationPlugin());
-
-    // Add hard dependencies on required migrations.
-    $dependencies = $this->getEntityManager()->getStorage($this->entityTypeId)
-      ->getVariantIds($this->getMigrationDependencies()['required']);
-    foreach ($dependencies as $dependency) {
-      $this->addDependency('config', $this->getEntityType()->getConfigPrefix() . '.' . $dependency);
-    }
-
-    return $this;
-  }
-}
diff --git a/core/modules/migrate/src/Entity/MigrationInterface.php b/core/modules/migrate/src/Entity/MigrationInterface.php
deleted file mode 100644
index a07c0ea..0000000
--- a/core/modules/migrate/src/Entity/MigrationInterface.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Entity\MigrationInterface.
- */
-
-namespace Drupal\migrate\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Interface for migrations.
- */
-interface MigrationInterface extends ConfigEntityInterface {
-
-  /**
-   * A constant used for systemOfRecord.
-   */
-  const SOURCE = 'source';
-
-  /**
-   * A constant used for systemOfRecord.
-   */
-  const DESTINATION = 'destination';
-
-  /**
-   * The migration is currently not running.
-   */
-  const STATUS_IDLE = 0;
-
-  /**
-   * The migration is currently importing.
-   */
-  const STATUS_IMPORTING = 1;
-
-  /**
-   * The migration is currently being rolled back.
-   */
-  const STATUS_ROLLING_BACK = 2;
-
-  /**
-   * The migration is being stopped.
-   */
-  const STATUS_STOPPING = 3;
-
-  /**
-   * The migration has been disabled.
-   */
-  const STATUS_DISABLED = 4;
-
-  /**
-   * Migration error.
-   */
-  const MESSAGE_ERROR = 1;
-
-  /**
-   * Migration warning.
-   */
-  const MESSAGE_WARNING = 2;
-
-  /**
-   * Migration notice.
-   */
-  const MESSAGE_NOTICE = 3;
-
-  /**
-   * Migration info.
-   */
-  const MESSAGE_INFORMATIONAL = 4;
-
-  /**
-   * All records have been processed.
-   */
-  const RESULT_COMPLETED = 1;
-
-  /**
-   * The process has stopped itself (e.g., the memory limit is approaching).
-   */
-  const RESULT_INCOMPLETE = 2;
-
-  /**
-   * The process was stopped externally (e.g., via drush migrate-stop).
-   */
-  const RESULT_STOPPED = 3;
-
-  /**
-   * The process had a fatal error.
-   */
-  const RESULT_FAILED = 4;
-
-  /**
-   * Dependencies are unfulfilled - skip the process.
-   */
-  const RESULT_SKIPPED = 5;
-
-  /**
-   * This migration is disabled, skipping.
-   */
-  const RESULT_DISABLED = 6;
-
-  /**
-   * Returns the initialized source plugin.
-   *
-   * @return \Drupal\migrate\Plugin\MigrateSourceInterface
-   *   The source plugin.
-   */
-  public function getSourcePlugin();
-
-  /**
-   * Returns the process plugins.
-   *
-   * @param array $process
-   *   A process configuration array.
-   *
-   * @return \Drupal\migrate\Plugin\MigrateProcessInterface[][]
-   *   An associative array. The keys are the destination property names. Values
-   *   are process pipelines. Each pipeline contains an array of plugins.
-   */
-  public function getProcessPlugins(array $process = NULL);
-
-  /**
-   * Returns the initialized destination plugin.
-   *
-   * @param bool $stub_being_requested
-   *  TRUE to indicate that this destination will be asked to construct a stub.
-   *
-   * @return \Drupal\migrate\Plugin\MigrateDestinationInterface
-   *   The destination plugin.
-   */
-  public function getDestinationPlugin($stub_being_requested = FALSE);
-
-  /**
-   * Returns the initialized id_map plugin.
-   *
-   * @return \Drupal\migrate\Plugin\MigrateIdMapInterface
-   *   The ID map.
-   */
-  public function getIdMap();
-
-  /**
-   * The current value of the high water mark.
-   *
-   * The high water mark defines a timestamp stating the time the import was last
-   * run. If the mark is set, only content with a higher timestamp will be
-   * imported.
-   *
-   * @return int
-   *   A Unix timestamp representing the high water mark.
-   */
-  public function getHighWater();
-
-  /**
-   * Save the new high water mark.
-   *
-   * @param int $high_water
-   *   The high water timestamp.
-   */
-  public function saveHighWater($high_water);
-
-  /**
-   * Check if all source rows from this migration have been processed.
-   *
-   * @return bool
-   *   TRUE if this migration is complete otherwise FALSE.
-   */
-  public function allRowsProcessed();
-
-  /**
-   * Set the current migration status.
-   *
-   * @param int $result
-   *   One of the STATUS_* constants.
-   */
-  public function setStatus($status);
-
-  /**
-   * Get the current migration status.
-   *
-   * @return int
-   *   The current migration status. Defaults to STATUS_IDLE.
-   */
-  public function getStatus();
-
-  /**
-   * Retrieve a label for the current status.
-   *
-   * @return string
-   *   User-friendly string corresponding to a STATUS_ constant.
-   */
-  public function getStatusLabel();
-
-  /**
-   * Get the result to return upon interruption.
-   *
-   * @return int
-   *   The current interruption result. Defaults to RESULT_INCOMPLETE.
-   */
-  public function getInterruptionResult();
-
-  /**
-   * Clears the result to return upon interruption.
-   */
-  public function clearInterruptionResult();
-
-  /**
-   * Signal that the migration should be interrupted with the specified result
-   * code.
-   *
-   * @param int $result
-   *   One of the MigrationInterface::RESULT_* constants.
-   */
-  public function interruptMigration($result);
-
-  /**
-   * Get the normalized process pipeline configuration describing the process
-   * plugins.
-   *
-   * The process configuration is always normalized. All shorthand processing
-   * will be expanded into their full representations.
-   *
-   * @see https://www.drupal.org/node/2129651#get-shorthand
-   *
-   * @return array
-   *   The normalized configuration describing the process plugins.
-   */
-  public function getProcess();
-
-  /**
-   * Allows you to override the entire process configuration.
-   *
-   * @param array $process
-   *   The entire process pipeline configuration describing the process plugins.
-   *
-   * @return $this
-   */
-  public function setProcess(array $process);
-
-  /**
-   * Set the process pipeline configuration for an individual destination field.
-   *
-   * This method allows you to set the process pipeline configuration for a
-   * single property within the full process pipeline configuration.
-   *
-   * @param string $property
-   *   The property of which to set the process pipeline configuration.
-   * @param mixed $process_of_property
-   *   The process pipeline configuration to be set for this property.
-   *
-   * @return $this
-   *   The migration entity.
-   */
-  public function setProcessOfProperty($property, $process_of_property);
-
-  /**
-   * Merge the process pipeline configuration for a single property.
-   *
-   * @param string $property
-   *   The property of which to merge the passed in process pipeline
-   * configuration.
-   * @param array $process_of_property
-   *   The process pipeline configuration to be merged with the existing process
-   * pipeline configuration.
-   *
-   * @return $this
-   *   The migration entity.
-   *
-   * @see Drupal\migrate_drupal\Plugin\migrate\load\LoadEntity::processLinkField().
-   */
-  public function mergeProcessOfProperty($property, array $process_of_property);
-
-  /**
-   * Get the current system of record of the migration.
-   *
-   * @return string
-   *   The current system of record of the migration.
-   */
-  public function getSystemOfRecord();
-
-  /**
-   * Set the system of record for the migration.
-   *
-   * @param string $system_of_record
-   *   The system of record of the migration.
-   *
-   * @return $this
-   */
-  public function setSystemOfRecord($system_of_record);
-
-  /**
-   * Checks if the migration should track time of last import.
-   *
-   * @return bool
-   *   TRUE if the migration is tracking last import time.
-   */
-  public function isTrackLastImported();
-
-  /**
-   * Set if the migration should track time of last import.
-   *
-   * @param bool $track_last_imported
-   *   Boolean value to indicate if the migration should track last import time.
-   *
-   * @return $this
-   */
-  public function setTrackLastImported($track_last_imported);
-
-  /**
-   * Get the dependencies for this migration.
-   *
-   * @return array
-   *   The dependencies for this migrations.
-   */
-  public function getMigrationDependencies();
-
-}
diff --git a/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php b/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
index e6fe02e..b348a1e 100644
--- a/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
+++ b/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,7 +18,7 @@ class MigrateIdMapMessageEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -46,7 +46,7 @@ class MigrateIdMapMessageEvent extends Event {
   /**
    * Constructs a post-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param array $source_id_values
    *   Values represent the source ID.
@@ -65,7 +65,7 @@ public function __construct(MigrationInterface $migration, array $source_id_valu
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {
diff --git a/core/modules/migrate/src/Event/MigrateImportEvent.php b/core/modules/migrate/src/Event/MigrateImportEvent.php
index 5dae9bf..4a2a1a9 100644
--- a/core/modules/migrate/src/Event/MigrateImportEvent.php
+++ b/core/modules/migrate/src/Event/MigrateImportEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,14 +18,14 @@ class MigrateImportEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs an import event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration) {
@@ -35,7 +35,7 @@ public function __construct(MigrationInterface $migration) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {
diff --git a/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php b/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php
index 2da91a5..46fdbc9 100644
--- a/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php
+++ b/core/modules/migrate/src/Event/MigratePostRowSaveEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
@@ -18,7 +18,7 @@ class MigratePostRowSaveEvent extends MigratePreRowSaveEvent {
   /**
    * Constructs a post-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param \Drupal\migrate\Row $row
    *   Row object.
diff --git a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php b/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
index 9df2363..4342f86 100644
--- a/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
+++ b/core/modules/migrate/src/Event/MigratePreRowSaveEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\EventDispatcher\Event;
 
@@ -26,14 +26,14 @@ class MigratePreRowSaveEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs a pre-save event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration, Row $row) {
@@ -44,7 +44,7 @@ public function __construct(MigrationInterface $migration, Row $row) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity being imported.
    */
   public function getMigration() {
diff --git a/core/modules/migrate/src/Event/MigrateRollbackEvent.php b/core/modules/migrate/src/Event/MigrateRollbackEvent.php
index 1a6ac31..671e5a8 100644
--- a/core/modules/migrate/src/Event/MigrateRollbackEvent.php
+++ b/core/modules/migrate/src/Event/MigrateRollbackEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,14 +18,14 @@ class MigrateRollbackEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
   /**
    * Constructs an rollback event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    */
   public function __construct(MigrationInterface $migration) {
@@ -35,7 +35,7 @@ public function __construct(MigrationInterface $migration) {
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration entity involved.
    */
   public function getMigration() {
diff --git a/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php b/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php
index 7d3766a..224356b 100644
--- a/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php
+++ b/core/modules/migrate/src/Event/MigrateRowDeleteEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Event;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,7 +18,7 @@ class MigrateRowDeleteEvent extends Event {
   /**
    * Migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -32,7 +32,7 @@ class MigrateRowDeleteEvent extends Event {
   /**
    * Constructs a row deletion event object.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
    * @param array $destination_id_values
    *   Values represent the destination ID.
@@ -45,7 +45,7 @@ public function __construct(MigrationInterface $migration, $destination_id_value
   /**
    * Gets the migration entity.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface
+   * @return \Drupal\migrate\Plugin\MigrationInterface
    *   The migration being rolled back.
    */
   public function getMigration() {
diff --git a/core/modules/migrate/src/MigrateBuildDependencyInterface.php b/core/modules/migrate/src/MigrateBuildDependencyInterface.php
index dbf8694..c313f99 100644
--- a/core/modules/migrate/src/MigrateBuildDependencyInterface.php
+++ b/core/modules/migrate/src/MigrateBuildDependencyInterface.php
@@ -12,7 +12,7 @@
   /**
    * Builds a dependency tree for the migrations and set their order.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface[] $migrations
+   * @param \Drupal\migrate\Plugin\MigrationInterface[] $migrations
    *   Array of loaded migrations with their declared dependencies.
    * @param array $dynamic_ids
    *   Keys are dynamic ids (for example node:*) values are a list of loaded
diff --git a/core/modules/migrate/src/MigrateException.php b/core/modules/migrate/src/MigrateException.php
index 48334bf..e2761cf 100644
--- a/core/modules/migrate/src/MigrateException.php
+++ b/core/modules/migrate/src/MigrateException.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\migrate;
 
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * Defines the migrate exception class.
diff --git a/core/modules/migrate/src/MigrateExecutable.php b/core/modules/migrate/src/MigrateExecutable.php
index a370623..98f8fe4 100644
--- a/core/modules/migrate/src/MigrateExecutable.php
+++ b/core/modules/migrate/src/MigrateExecutable.php
@@ -9,7 +9,6 @@
 
 use Drupal\Core\Utility\Error;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigratePostRowSaveEvent;
@@ -18,6 +17,7 @@
 use Drupal\migrate\Event\MigrateRowDeleteEvent;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -29,7 +29,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
   /**
    * The configuration of the migration to do.
    *
-   * @var \Drupal\migrate\Entity\Migration
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -102,7 +102,7 @@ class MigrateExecutable implements MigrateExecutableInterface {
   /**
    * Constructs a MigrateExecutable and verifies and sets the memory limit.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration to run.
    * @param \Drupal\migrate\MigrateMessageInterface $message
    *   The message to record.
@@ -261,7 +261,7 @@ public function import() {
           $this->handleException($e);
         }
       }
-      if ($high_water_property = $this->migration->get('highWaterProperty')) {
+      if ($high_water_property = $this->migration->getHighWaterProperty()) {
         $this->migration->saveHighWater($row->getSourceProperty($high_water_property['name']));
       }
 
diff --git a/core/modules/migrate/src/MigrateExecutableInterface.php b/core/modules/migrate/src/MigrateExecutableInterface.php
index 71fa017..9a150f3 100644
--- a/core/modules/migrate/src/MigrateExecutableInterface.php
+++ b/core/modules/migrate/src/MigrateExecutableInterface.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 interface MigrateExecutableInterface {
 
diff --git a/core/modules/migrate/src/MigrateTemplateStorage.php b/core/modules/migrate/src/MigrateTemplateStorage.php
deleted file mode 100644
index 8467ad6..0000000
--- a/core/modules/migrate/src/MigrateTemplateStorage.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\MigrateTemplateStorage.
- */
-
-namespace Drupal\migrate;
-
-use Drupal\Component\Serialization\Yaml;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-
-/**
- * Storage to access migration template configuration in enabled extensions.
- */
-class MigrateTemplateStorage implements MigrateTemplateStorageInterface {
-  /**
-   * Extension sub-directory containing default configuration for migrations.
-   */
-
-  const MIGRATION_TEMPLATE_DIRECTORY = 'migration_templates';
-
-  /**
-   * Template subdirectory.
-   *
-   * @var string
-   */
-  protected $directory;
-
-  /**
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(ModuleHandlerInterface $module_handler, $directory = self::MIGRATION_TEMPLATE_DIRECTORY) {
-    $this->moduleHandler = $module_handler;
-    $this->directory = $directory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function findTemplatesByTag($tag) {
-    $templates = $this->getAllTemplates();
-    $matched_templates = [];
-    foreach ($templates as $template_name => $template) {
-      if (!empty($template['migration_tags'])) {
-        if (in_array($tag, $template['migration_tags'])) {
-          $matched_templates[$template_name] = $template;
-        }
-      }
-    }
-    return $matched_templates;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTemplateByName($name) {
-    $templates = $this->getAllTemplates();
-    return isset($templates[$name]) ? $templates[$name] : NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAllTemplates() {
-    $templates = [];
-    foreach ($this->moduleHandler->getModuleDirectories() as $directory) {
-      $full_directory = $directory . '/' . $this->directory;
-      if (file_exists($full_directory)) {
-        $files = scandir($full_directory);
-        foreach ($files as $file) {
-          if ($file[0] !== '.' && preg_match('/\.yml$/', $file)) {
-            $templates[basename($file, '.yml')] = Yaml::decode(file_get_contents("$full_directory/$file"));
-          }
-        }
-      }
-    }
-
-    return $templates;
-  }
-
-}
diff --git a/core/modules/migrate/src/MigrateTemplateStorageInterface.php b/core/modules/migrate/src/MigrateTemplateStorageInterface.php
deleted file mode 100644
index dc9372e..0000000
--- a/core/modules/migrate/src/MigrateTemplateStorageInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\MigrateTemplateStorageInterface.
- */
-
-namespace Drupal\migrate;
-
-/**
- * The MigrateTemplateStorageInterface interface.
- */
-interface MigrateTemplateStorageInterface {
-
-  /**
-   * Find all migration templates with the specified tag.
-   *
-   * @param $tag
-   *   The tag to match.
-   *
-   * @return array
-   *   Any templates (parsed YAML config) that matched, keyed by the ID.
-   */
-  public function findTemplatesByTag($tag);
-
-  /**
-   * Retrieve a template given a specific name.
-   *
-   * @param string $name
-   *   A migration template name.
-   *
-   * @return NULL|array
-   *   A parsed migration template, or NULL if it doesn't exist.
-   */
-  public function getTemplateByName($name);
-
-  /**
-   * Retrieves all migration templates belonging to enabled extensions.
-   *
-   * @return array
-   *   Array of parsed templates, keyed by the fully-qualified id.
-   */
-  public function getAllTemplates();
-
-}
diff --git a/core/modules/migrate/src/MigrationBuilder.php b/core/modules/migrate/src/MigrationBuilder.php
deleted file mode 100644
index bdf3e4e..0000000
--- a/core/modules/migrate/src/MigrationBuilder.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\MigrationBuilder.
- */
-
-namespace Drupal\migrate;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Plugin\MigratePluginManager;
-
-/**
- * Builds migration entities from migration templates.
- */
-class MigrationBuilder implements MigrationBuilderInterface {
-
-  /**
-   * The builder plugin manager.
-   *
-   * @var \Drupal\migrate\Plugin\MigratePluginManager
-   */
-  protected $builderManager;
-
-  /**
-   * Constructs a MigrationBuilder.
-   *
-   * @param \Drupal\migrate\Plugin\MigratePluginManager $builder_manager
-   *   The builder plugin manager.
-   */
-  public function __construct(MigratePluginManager $builder_manager) {
-    $this->builderManager = $builder_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function createMigrations(array $templates) {
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
-    $migrations = [];
-
-    foreach ($templates as $template_id => $template) {
-      if (isset($template['builder'])) {
-        $variants = $this->builderManager
-          ->createInstance($template['builder']['plugin'], $template['builder'])
-          ->buildMigrations($template);
-      }
-      else {
-        $variants = array(Migration::create($template));
-      }
-
-      /** @var \Drupal\migrate\Entity\MigrationInterface[] $variants */
-      foreach ($variants as $variant) {
-        $variant->set('template', $template_id);
-      }
-      $migrations = array_merge($migrations, $variants);
-    }
-
-    return $migrations;
-  }
-
-}
diff --git a/core/modules/migrate/src/MigrationBuilderInterface.php b/core/modules/migrate/src/MigrationBuilderInterface.php
deleted file mode 100644
index 66f3078..0000000
--- a/core/modules/migrate/src/MigrationBuilderInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\MigrationBuilderInterface.
- */
-
-namespace Drupal\migrate;
-
-/**
- * The migration builder interface.
- */
-interface MigrationBuilderInterface {
-
-  /**
-   * Builds migration entities from templates.
-   *
-   * @param array $templates
-   *   The parsed templates (each of which is an array parsed from YAML), keyed
-   *   by ID.
-   *
-   * @return \Drupal\migrate\Entity\MigrationInterface[]
-   *   The migration entities derived from the templates.
-   */
-  public function createMigrations(array $templates);
-
-}
diff --git a/core/modules/migrate/src/MigrationStorage.php b/core/modules/migrate/src/MigrationStorage.php
index 36390e0..b22be29 100644
--- a/core/modules/migrate/src/MigrationStorage.php
+++ b/core/modules/migrate/src/MigrationStorage.php
@@ -67,7 +67,7 @@ public function loadMultiple(array $ids = NULL) {
     if ($ids) {
       $ids = $this->getVariantIds($ids);
     }
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
     $migrations = parent::loadMultiple($ids);
 
     foreach ($migrations as $migration) {
@@ -126,7 +126,7 @@ public function buildDependencyMigration(array $migrations, array $dynamic_ids)
     $requirement_graph = array();
     $different = FALSE;
     foreach ($migrations as $migration) {
-      /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
+      /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
       $id = $migration->id();
       $requirements[$id] = array();
       $dependency_graph[$id]['edges'] = array();
diff --git a/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php b/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php
deleted file mode 100644
index 511af1b..0000000
--- a/core/modules/migrate/src/Plugin/MigrateBuilderInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Plugin\MigrateBuilderInterface.
- */
-
-namespace Drupal\migrate\Plugin;
-
-/**
- * Defines the builder plugin type.
- *
- * Builder plugins implement custom logic to generate migration entities from
- * migration templates. For example, a migration may need to be customized based
- * on data that's present in the source database; such customization is
- * implemented by builders.
- */
-interface MigrateBuilderInterface {
-
-  /**
-   * Builds migration entities based on a template.
-   *
-   * @param array $template
-   *   The parsed template.
-   *
-   * @return \Drupal\migrate\Entity\MigrationInterface[]
-   *   The unsaved migrations generated from the template.
-   */
-  public function buildMigrations(array $template);
-
-}
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
index 97c684d..8322678 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php
@@ -8,7 +8,6 @@
 namespace Drupal\migrate\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
@@ -48,7 +47,7 @@ public function getIds();
    * @todo Review the cases where we need the Migration parameter, can we avoid
    *   that? To be resolved with https://www.drupal.org/node/2543568.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   (optional) The migration containing this destination. Defaults to NULL.
    *
    * @return array
diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php b/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
index 383a7de..a7c807c 100644
--- a/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigrateDestinationPluginManager.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 
 /**
  * Plugin manager for migrate destination plugins.
diff --git a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
index 6a7a9d0..50abca3 100644
--- a/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
+++ b/core/modules/migrate/src/Plugin/MigrateIdMapInterface.php
@@ -8,7 +8,6 @@
 namespace Drupal\migrate\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Row;
 
diff --git a/core/modules/migrate/src/Plugin/MigratePluginManager.php b/core/modules/migrate/src/Plugin/MigratePluginManager.php
index 6ca1a24..53ab405 100644
--- a/core/modules/migrate/src/Plugin/MigratePluginManager.php
+++ b/core/modules/migrate/src/Plugin/MigratePluginManager.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
-use Drupal\migrate\Entity\MigrationInterface;
 
 /**
  * Manages migrate plugins.
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
new file mode 100644
index 0000000..0b19fe4
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -0,0 +1,720 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\Migration.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\MigrateException;
+use Drupal\migrate\MigrateSkipRowException;
+use Drupal\Component\Utility\NestedArray;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines the Migration plugin.
+ *
+ * The migration process plugin represents one single migration and acts like a
+ * container for the information about a single migration such as the source,
+ * process and destination plugins.
+ */
+class Migration extends PluginBase implements MigrationInterface, RequirementsInterface, ContainerFactoryPluginInterface {
+
+  /**
+   * The migration ID (machine name).
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The human-readable label for the migration.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The plugin ID for the row.
+   *
+   * @var string
+   */
+  protected $row;
+
+  /**
+   * The source configuration, with at least a 'plugin' key.
+   *
+   * Used to initialize the $sourcePlugin.
+   *
+   * @var array
+   */
+  protected $source;
+
+  /**
+   * The source plugin.
+   *
+   * @var \Drupal\migrate\Plugin\MigrateSourceInterface
+   */
+  protected $sourcePlugin;
+
+  /**
+   * The configuration describing the process plugins.
+   *
+   * This is a strictly internal property and should not returned to calling
+   * code, use getProcess() instead.
+   *
+   * @var array
+   */
+  protected $process = [];
+
+  /**
+   * The cached process plugins.
+   *
+   * @var array
+   */
+  protected $processPlugins = [];
+
+  /**
+   * The destination configuration, with at least a 'plugin' key.
+   *
+   * Used to initialize $destinationPlugin.
+   *
+   * @var array
+   */
+  protected $destination;
+
+  /**
+   * The destination plugin.
+   *
+   * @var \Drupal\migrate\Plugin\MigrateDestinationInterface
+   */
+  protected $destinationPlugin;
+
+  /**
+   * The identifier map data.
+   *
+   * Used to initialize $idMapPlugin.
+   *
+   * @var string
+   */
+  protected $idMap = [];
+
+  /**
+   * The identifier map.
+   *
+   * @var \Drupal\migrate\Plugin\MigrateIdMapInterface
+   */
+  protected $idMapPlugin;
+
+  /**
+   * The source identifiers.
+   *
+   * An array of source identifiers: the keys are the name of the properties,
+   * the values are dependent on the ID map plugin.
+   *
+   * @var array
+   */
+  protected $sourceIds = [];
+
+  /**
+   * The destination identifiers.
+   *
+   * An array of destination identifiers: the keys are the name of the
+   * properties, the values are dependent on the ID map plugin.
+   *
+   * @var array
+   */
+  protected $destinationIds = [];
+
+  /**
+   * Information on the property used as the high watermark.
+   *
+   * Array of 'name' & (optional) db 'alias' properties used for high watermark.
+   *
+   * @var array
+   */
+  protected $highWaterProperty;
+
+  /**
+   * Indicate whether the primary system of record for this migration is the
+   * source, or the destination (Drupal). In the source case, migration of
+   * an existing object will completely replace the Drupal object with data from
+   * the source side. In the destination case, the existing Drupal object will
+   * be loaded, then changes from the source applied; also, rollback will not be
+   * supported.
+   *
+   * @var string
+   */
+  protected $systemOfRecord = self::SOURCE;
+
+  /**
+   * Specify value of source_row_status for current map row. Usually set by
+   * MigrateFieldHandler implementations.
+   *
+   * @var int
+   */
+  protected $sourceRowStatus = MigrateIdMapInterface::STATUS_IMPORTED;
+
+  /**
+   * @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface
+   */
+  protected $highWaterStorage;
+
+  /**
+   * Track time of last import if TRUE.
+   *
+   * @var bool
+   */
+  protected $trackLastImported = FALSE;
+
+  /**
+   * These migrations must be already executed before this migration can run.
+   *
+   * @var array
+   */
+  protected $requirements = [];
+
+  /**
+   * These migrations, if run, must be executed before this migration.
+   *
+   * These are different from the configuration dependencies. Migration
+   * dependencies are only used to store relationships between migrations.
+   *
+   * The migration_dependencies value is structured like this:
+   * @code
+   * array(
+   *   'required' => array(
+   *     // An array of migration IDs that must be run before this migration.
+   *   ),
+   *   'optional' => array(
+   *     // An array of migration IDs that, if they exist, must be run before
+   *     // this migration.
+   *   ),
+   * );
+   * @endcode
+   *
+   * @var array
+   */
+  protected $migration_dependencies = [];
+
+  /**
+   * The migration's configuration dependencies.
+   *
+   * These store any dependencies on modules or other configuration (including
+   * other migrations) that must be available before the migration can be
+   * created.
+   *
+   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
+   *
+   * @var array
+   */
+  protected $dependencies = [];
+
+  /**
+   * The migration plugin manager for loading other migration plugins.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface
+   */
+  protected $migrationPluginManager;
+
+  /**
+   *  The source plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigratePluginManager
+   */
+  protected $sourcePluginManager;
+
+  /**
+   * Thep process plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigratePluginManager
+   */
+  protected $processPluginManager;
+
+  /**
+   * The destination plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrateDestinationPluginManager
+   */
+  protected $destinationPluginManager;
+
+  /**
+   * The ID map plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigratePluginManager
+   */
+  protected $idMapPluginManager;
+
+  /**
+   * Labels corresponding to each defined status.
+   *
+   * @var array
+   */
+  protected $statusLabels = [
+    self::STATUS_IDLE => 'Idle',
+    self::STATUS_IMPORTING => 'Importing',
+    self::STATUS_ROLLING_BACK => 'Rolling back',
+    self::STATUS_STOPPING => 'Stopping',
+    self::STATUS_DISABLED => 'Disabled',
+  ];
+
+  /**
+   * Constructs a Migration.
+   *
+   * @param array $configuration
+   *   Plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $migration_plugin_manager
+   *   The migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $source_plugin_manager
+   *   The source migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $process_plugin_manager
+   *   The process migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigrateDestinationPluginManager $destination_plugin_manager
+   *   The destination migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $idmap_plugin_manager
+   *   The ID map migration plugin manager.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationPluginManagerInterface $migration_plugin_manager, MigratePluginManager $source_plugin_manager, MigratePluginManager $process_plugin_manager, MigrateDestinationPluginManager $destination_plugin_manager, MigratePluginManager $idmap_plugin_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->migrationPluginManager = $migration_plugin_manager;
+    $this->sourcePluginManager = $source_plugin_manager;
+    $this->processPluginManager = $process_plugin_manager;
+    $this->destinationPluginManager = $destination_plugin_manager;
+    $this->idMapPluginManager = $idmap_plugin_manager;
+
+    foreach ($plugin_definition as $key => $value) {
+      $this->$key = $value;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.migration'),
+      $container->get('plugin.manager.migrate.source'),
+      $container->get('plugin.manager.migrate.process'),
+      $container->get('plugin.manager.migrate.destination'),
+      $container->get('plugin.manager.migrate.id_map')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function id() {
+    return $this->pluginId;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->label;
+  }
+
+  /**
+   * Gets any arbitrary property's value.
+   *
+   * @param string $property
+   *   The property to retrieve.
+   *
+   * @return mixed
+   *   The value for that property, or NULL if the property does not exist.
+   *
+   * @deprecated in Drupal 8.1.x, will be removed before Drupal 9.0.x. Use
+   *   more specific getters instead.
+   */
+  public function get($property) {
+    return isset($this->$property) ? $this->$property : NULL;
+  }
+
+  /**
+   * Retrieves the ID map plugin.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateIdMapInterface
+   *   The ID map plugin.
+   */
+  public function getIdMapPlugin() {
+    return $this->idMapPlugin;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSourcePlugin() {
+    if (!isset($this->sourcePlugin)) {
+      $this->sourcePlugin = $this->sourcePluginManager->createInstance($this->source['plugin'], $this->source, $this);
+    }
+    return $this->sourcePlugin;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcessPlugins(array $process = NULL) {
+    if (!isset($process)) {
+      $process = $this->getProcess();
+    }
+    $index = serialize($process);
+    if (!isset($this->processPlugins[$index])) {
+      $this->processPlugins[$index] = array();
+      foreach ($this->getProcessNormalized($process) as $property => $configurations) {
+        $this->processPlugins[$index][$property] = array();
+        foreach ($configurations as $configuration) {
+          if (isset($configuration['source'])) {
+            $this->processPlugins[$index][$property][] = $this->processPluginManager->createInstance('get', $configuration, $this);
+          }
+          // Get is already handled.
+          if ($configuration['plugin'] != 'get') {
+            $this->processPlugins[$index][$property][] = $this->processPluginManager->createInstance($configuration['plugin'], $configuration, $this);
+          }
+          if (!$this->processPlugins[$index][$property]) {
+            throw new MigrateException("Invalid process configuration for $property");
+          }
+        }
+      }
+    }
+    return $this->processPlugins[$index];
+  }
+
+  /**
+   * Resolve shorthands into a list of plugin configurations.
+   *
+   * @param array $process
+   *   A process configuration array.
+   *
+   * @return array
+   *   The normalized process configuration.
+   */
+  protected function getProcessNormalized(array $process) {
+    $normalized_configurations = array();
+    foreach ($process as $destination => $configuration) {
+      if (is_string($configuration)) {
+        $configuration = array(
+          'plugin' => 'get',
+          'source' => $configuration,
+        );
+      }
+      if (isset($configuration['plugin'])) {
+        $configuration = array($configuration);
+      }
+      $normalized_configurations[$destination] = $configuration;
+    }
+    return $normalized_configurations;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDestinationPlugin($stub_being_requested = FALSE) {
+    if ($stub_being_requested && !empty($this->destination['no_stub'])) {
+      throw new MigrateSkipRowException;
+    }
+    if (!isset($this->destinationPlugin)) {
+      $this->destinationPlugin = $this->destinationPluginManager->createInstance($this->destination['plugin'], $this->destination, $this);
+    }
+    return $this->destinationPlugin;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIdMap() {
+    if (!isset($this->idMapPlugin)) {
+      $configuration = $this->idMap;
+      $plugin = isset($configuration['plugin']) ? $configuration['plugin'] : 'sql';
+      $this->idMapPlugin = $this->idMapPluginManager->createInstance($plugin, $configuration, $this);
+    }
+    return $this->idMapPlugin;
+  }
+
+  /**
+   * Get the high water storage object.
+   *
+   * @return \Drupal\Core\KeyValueStore\KeyValueStoreInterface
+   *   The storage object.
+   */
+  protected function getHighWaterStorage() {
+    if (!isset($this->highWaterStorage)) {
+      $this->highWaterStorage = \Drupal::keyValue('migrate:high_water');
+    }
+    return $this->highWaterStorage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getHighWater() {
+    return $this->getHighWaterStorage()->get($this->id());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function saveHighWater($high_water) {
+    $this->getHighWaterStorage()->set($this->id(), $high_water);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkRequirements() {
+    // Check whether the current migration source and destination plugin
+    // requirements are met or not.
+    if ($this->getSourcePlugin() instanceof RequirementsInterface) {
+      $this->getSourcePlugin()->checkRequirements();
+    }
+    if ($this->getDestinationPlugin() instanceof RequirementsInterface) {
+      $this->getDestinationPlugin()->checkRequirements();
+    }
+
+    if (empty($this->requirements)) {
+      // There are no requirements to check.
+      return;
+    }
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $required_migrations */
+    $required_migrations = $this->getMigrationPluginManager()->createInstances($this->requirements);
+
+    $missing_migrations = array_diff($this->requirements, array_keys($required_migrations));
+    // Check if the dependencies are in good shape.
+    foreach ($required_migrations as $migration_id => $required_migration) {
+      if (!$required_migration->allRowsProcessed()) {
+        $missing_migrations[] = $migration_id;
+      }
+    }
+    if ($missing_migrations) {
+      throw new RequirementsException('Missing migrations ' . implode(', ', $missing_migrations) . '.', ['requirements' => $missing_migrations]);
+    }
+  }
+
+  /**
+   * Gets the migration plugin manager.
+   *
+   * @return \Drupal\migrate\Plugin\MigratePluginManager
+   *   The plugin manager.
+   */
+  protected function getMigrationPluginManager() {
+    return $this->migrationPluginManager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setStatus($status) {
+    \Drupal::keyValue('migrate_status')->set($this->id(), $status);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStatus() {
+    return \Drupal::keyValue('migrate_status')->get($this->id(), static::STATUS_IDLE);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStatusLabel() {
+    $status = $this->getStatus();
+    if (isset($this->statusLabels[$status])) {
+      return $this->statusLabels[$status];
+    }
+    else {
+      return '';
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getInterruptionResult() {
+    return \Drupal::keyValue('migrate_interruption_result')->get($this->id(), static::RESULT_INCOMPLETE);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearInterruptionResult() {
+    \Drupal::keyValue('migrate_interruption_result')->delete($this->id());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function interruptMigration($result) {
+    $this->setStatus(MigrationInterface::STATUS_STOPPING);
+    \Drupal::keyValue('migrate_interruption_result')->set($this->id(), $result);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function allRowsProcessed() {
+    $source_count = $this->getSourcePlugin()->count();
+    // If the source is uncountable, we have no way of knowing if it's
+    // complete, so stipulate that it is.
+    if ($source_count < 0) {
+      return TRUE;
+    }
+    $processed_count = $this->getIdMap()->processedCount();
+    // We don't use == because in some circumstances (like unresolved stubs
+    // being created), the processed count may be higher than the available
+    // source rows.
+    return $source_count <= $processed_count;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function set($property_name, $value) {
+    if ($property_name == 'source') {
+      // Invalidate the source plugin.
+      unset($this->sourcePlugin);
+    }
+    elseif ($property_name === 'destination') {
+      // Invalidate the destination plugin.
+      unset($this->destinationPlugin);
+    }
+    $this->{$property_name} = $value;
+    return $this;
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    return $this->getProcessNormalized($this->process);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setProcess(array $process) {
+    $this->process = $process;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setProcessOfProperty($property, $process_of_property) {
+    $this->process[$property] = $process_of_property;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function mergeProcessOfProperty($property, array $process_of_property) {
+    // If we already have a process value then merge the incoming process array
+    //otherwise simply set it.
+    $current_process = $this->getProcess();
+    if (isset($current_process[$property])) {
+      $this->process = NestedArray::mergeDeepArray([$current_process, $this->getProcessNormalized([$property => $process_of_property])], TRUE);
+    }
+    else {
+      $this->setProcessOfProperty($property, $process_of_property);
+    }
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSystemOfRecord() {
+    return $this->systemOfRecord;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setSystemOfRecord($system_of_record) {
+    $this->systemOfRecord = $system_of_record;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isTrackLastImported() {
+    return $this->trackLastImported;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setTrackLastImported($track_last_imported) {
+    $this->trackLastImported = (bool) $track_last_imported;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationDependencies() {
+    return $this->migration_dependencies + ['required' => [], 'optional' => []];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPluginDefinition() {
+    $definition = [];
+    // While normal plugins do not change their definitions on the fly, this
+    // one does so accommodate for that.
+    foreach (parent::getPluginDefinition() as $key => $value) {
+      $definition[$key] = isset($this->$key) ? $this->$key : $value;
+    }
+    return $definition;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDestinationConfiguration() {
+    return $this->destination;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSourceConfiguration() {
+    return $this->source;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getHighWaterProperty() {
+    return $this->highWaterProperty;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTrackLastImported() {
+    $this->trackLastImported;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDestinationIds() {
+    $this->destinationIds;
+  }
+}
diff --git a/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php b/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php
new file mode 100644
index 0000000..b10f19c
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/MigrationDeriverTrait.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\MigrationDeriverTrait.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+/**
+ * Provides functionality for migration derivers.
+ */
+trait MigrationDeriverTrait {
+
+  /**
+   * Returns a fully initialized instance of a source plugin.
+   *
+   * @param string $source_plugin_id
+   *   The source plugin ID.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateSourceInterface|\Drupal\migrate\Plugin\RequirementsInterface
+   *   The fully initialized source plugin.
+   */
+  public static function getSourcePlugin($source_plugin_id) {
+    $definition = [
+      'source' => [
+        'ignore_map' => TRUE,
+        'plugin' => $source_plugin_id,
+      ],
+      'destination' => [
+        'plugin' => 'null',
+      ],
+    ];
+    return \Drupal::service('plugin.manager.migration')->createStubMigration($definition)->getSourcePlugin();
+  }
+
+}
diff --git a/core/modules/migrate/src/Plugin/MigrationInterface.php b/core/modules/migrate/src/Plugin/MigrationInterface.php
new file mode 100644
index 0000000..d870f74
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/MigrationInterface.php
@@ -0,0 +1,382 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\MigrationInterface.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+use Drupal\Component\Plugin\DerivativeInspectionInterface;
+use Drupal\Component\Plugin\PluginInspectionInterface;
+
+/**
+ * Interface for migrations.
+ */
+interface MigrationInterface extends PluginInspectionInterface, DerivativeInspectionInterface {
+
+  /**
+   * A constant used for systemOfRecord.
+   */
+  const SOURCE = 'source';
+
+  /**
+   * A constant used for systemOfRecord.
+   */
+  const DESTINATION = 'destination';
+
+  /**
+   * The migration is currently not running.
+   */
+  const STATUS_IDLE = 0;
+
+  /**
+   * The migration is currently importing.
+   */
+  const STATUS_IMPORTING = 1;
+
+  /**
+   * The migration is currently being rolled back.
+   */
+  const STATUS_ROLLING_BACK = 2;
+
+  /**
+   * The migration is being stopped.
+   */
+  const STATUS_STOPPING = 3;
+
+  /**
+   * The migration has been disabled.
+   */
+  const STATUS_DISABLED = 4;
+
+  /**
+   * Migration error.
+   */
+  const MESSAGE_ERROR = 1;
+
+  /**
+   * Migration warning.
+   */
+  const MESSAGE_WARNING = 2;
+
+  /**
+   * Migration notice.
+   */
+  const MESSAGE_NOTICE = 3;
+
+  /**
+   * Migration info.
+   */
+  const MESSAGE_INFORMATIONAL = 4;
+
+  /**
+   * All records have been processed.
+   */
+  const RESULT_COMPLETED = 1;
+
+  /**
+   * The process has stopped itself (e.g., the memory limit is approaching).
+   */
+  const RESULT_INCOMPLETE = 2;
+
+  /**
+   * The process was stopped externally (e.g., via drush migrate-stop).
+   */
+  const RESULT_STOPPED = 3;
+
+  /**
+   * The process had a fatal error.
+   */
+  const RESULT_FAILED = 4;
+
+  /**
+   * Dependencies are unfulfilled - skip the process.
+   */
+  const RESULT_SKIPPED = 5;
+
+  /**
+   * This migration is disabled, skipping.
+   */
+  const RESULT_DISABLED = 6;
+
+  /**
+   * An alias for getPluginId() for backwards compatibility reasons.
+   *
+   * @return string
+   *   The plugin_id of the plugin instance.
+   *
+   * @see \Drupal\migrate\Plugin\MigrationInterface::getPluginId()
+   */
+  public function id();
+
+  /**
+   * Get the plugin label.
+   *
+   * @return string
+   *   The label for this migration.
+   */
+  public function label();
+
+  /**
+   * Returns the initialized source plugin.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateSourceInterface
+   *   The source plugin.
+   */
+  public function getSourcePlugin();
+
+  /**
+   * Returns the process plugins.
+   *
+   * @param array $process
+   *   A process configuration array.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateProcessInterface[][]
+   *   An associative array. The keys are the destination property names. Values
+   *   are process pipelines. Each pipeline contains an array of plugins.
+   */
+  public function getProcessPlugins(array $process = NULL);
+
+  /**
+   * Returns the initialized destination plugin.
+   *
+   * @param bool $stub_being_requested
+   *  TRUE to indicate that this destination will be asked to construct a stub.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateDestinationInterface
+   *   The destination plugin.
+   */
+  public function getDestinationPlugin($stub_being_requested = FALSE);
+
+  /**
+   * Returns the initialized id_map plugin.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateIdMapInterface
+   *   The ID map.
+   */
+  public function getIdMap();
+
+  /**
+   * The current value of the high water mark.
+   *
+   * The high water mark defines a timestamp stating the time the import was last
+   * run. If the mark is set, only content with a higher timestamp will be
+   * imported.
+   *
+   * @return int
+   *   A Unix timestamp representing the high water mark.
+   */
+  public function getHighWater();
+
+  /**
+   * Save the new high water mark.
+   *
+   * @param int $high_water
+   *   The high water timestamp.
+   */
+  public function saveHighWater($high_water);
+
+  /**
+   * Check if all source rows from this migration have been processed.
+   *
+   * @return bool
+   *   TRUE if this migration is complete otherwise FALSE.
+   */
+  public function allRowsProcessed();
+
+  /**
+   * Set the current migration status.
+   *
+   * @param int $result
+   *   One of the STATUS_* constants.
+   */
+  public function setStatus($status);
+
+  /**
+   * Get the current migration status.
+   *
+   * @return int
+   *   The current migration status. Defaults to STATUS_IDLE.
+   */
+  public function getStatus();
+
+  /**
+   * Retrieve a label for the current status.
+   *
+   * @return string
+   *   User-friendly string corresponding to a STATUS_ constant.
+   */
+  public function getStatusLabel();
+
+  /**
+   * Get the result to return upon interruption.
+   *
+   * @return int
+   *   The current interruption result. Defaults to RESULT_INCOMPLETE.
+   */
+  public function getInterruptionResult();
+
+  /**
+   * Clears the result to return upon interruption.
+   */
+  public function clearInterruptionResult();
+
+  /**
+   * Signal that the migration should be interrupted with the specified result
+   * code.
+   *
+   * @param int $result
+   *   One of the MigrationInterface::RESULT_* constants.
+   */
+  public function interruptMigration($result);
+
+  /**
+   * Get the normalized process pipeline configuration describing the process
+   * plugins.
+   *
+   * The process configuration is always normalized. All shorthand processing
+   * will be expanded into their full representations.
+   *
+   * @see https://www.drupal.org/node/2129651#get-shorthand
+   *
+   * @return array
+   *   The normalized configuration describing the process plugins.
+   */
+  public function getProcess();
+
+  /**
+   * Allows you to override the entire process configuration.
+   *
+   * @param array $process
+   *   The entire process pipeline configuration describing the process plugins.
+   *
+   * @return $this
+   */
+  public function setProcess(array $process);
+
+  /**
+   * Set the process pipeline configuration for an individual destination field.
+   *
+   * This method allows you to set the process pipeline configuration for a
+   * single property within the full process pipeline configuration.
+   *
+   * @param string $property
+   *   The property of which to set the process pipeline configuration.
+   * @param mixed $process_of_property
+   *   The process pipeline configuration to be set for this property.
+   *
+   * @return $this
+   *   The migration entity.
+   */
+  public function setProcessOfProperty($property, $process_of_property);
+
+  /**
+   * Merge the process pipeline configuration for a single property.
+   *
+   * @param string $property
+   *   The property of which to merge the passed in process pipeline
+   * configuration.
+   * @param array $process_of_property
+   *   The process pipeline configuration to be merged with the existing process
+   * pipeline configuration.
+   *
+   * @return $this
+   *   The migration entity.
+   *
+   * @see Drupal\migrate_drupal\Plugin\migrate\load\LoadEntity::processLinkField().
+   */
+  public function mergeProcessOfProperty($property, array $process_of_property);
+
+  /**
+   * Get the current system of record of the migration.
+   *
+   * @return string
+   *   The current system of record of the migration.
+   */
+  public function getSystemOfRecord();
+
+  /**
+   * Set the system of record for the migration.
+   *
+   * @param string $system_of_record
+   *   The system of record of the migration.
+   *
+   * @return $this
+   */
+  public function setSystemOfRecord($system_of_record);
+
+  /**
+   * Checks if the migration should track time of last import.
+   *
+   * @return bool
+   *   TRUE if the migration is tracking last import time.
+   */
+  public function isTrackLastImported();
+
+  /**
+   * Set if the migration should track time of last import.
+   *
+   * @param bool $track_last_imported
+   *   Boolean value to indicate if the migration should track last import time.
+   *
+   * @return $this
+   */
+  public function setTrackLastImported($track_last_imported);
+
+  /**
+   * Get the dependencies for this migration.
+   *
+   * @return array
+   *   The dependencies for this migrations.
+   */
+  public function getMigrationDependencies();
+
+  /**
+   * Get the destination configuration, with at least a 'plugin' key.
+   *
+   * @return array
+   *   The destination configuration.
+   */
+  public function getDestinationConfiguration();
+
+  /**
+   * Get the source configuration, with at least a 'plugin' key.
+   *
+   * @return array
+   *   The source configuration.
+   */
+  public function getSourceConfiguration();
+
+  /**
+   * Get information on the property used as the high watermark.
+   *
+   * Array of 'name' & (optional) db 'alias' properties used for high watermark.
+   *
+   * @see Drupal\migrate\Plugin\migrate\source\SqlBase::initializeIterator()
+   *
+   * @return array
+   *   The property used as the high watermark.
+   */
+  public function getHighWaterProperty();
+
+  /**
+   * If true, track time of last import.
+   *
+   * @return bool
+   *   Flag to determine desire of tracking time of last import.
+   */
+  public function getTrackLastImported();
+
+  /**
+   * The destination identifiers.
+   *
+   * An array of destination identifiers: the keys are the name of the
+   * properties, the values are dependent on the ID map plugin.
+   *
+   * @return array
+   *   Destination identifiers.
+   */
+  public function getDestinationIds();
+
+}
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManager.php b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
new file mode 100644
index 0000000..ceac596
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManager.php
@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\MigrationPluginManager.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+use Drupal\Component\Graph\Graph;
+use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+use Drupal\Core\Plugin\Discovery\ContainerDerivativeDiscoveryDecorator;
+use Drupal\Core\Plugin\Discovery\YamlDirectoryDiscovery;
+use Drupal\Core\Plugin\Factory\ContainerFactory;
+use Drupal\migrate\MigrateBuildDependencyInterface;
+
+/**
+ * Plugin manager for migration plugins.
+ */
+class MigrationPluginManager extends DefaultPluginManager implements MigrationPluginManagerInterface, MigrateBuildDependencyInterface {
+
+  /**
+   * Provides default values for migrations.
+   *
+   * @var array
+   */
+  protected $defaults = array(
+    'class' => '\Drupal\migrate\Plugin\Migration',
+  );
+
+  /**
+   * The interface the plugins should implement.
+   *
+   * @var string
+   */
+  protected $pluginInterface = 'Drupal\migrate\Plugin\MigrationInterface';
+
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * Construct a migration plugin manager.
+   *
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   The cache backend for the definitions.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   */
+  public function __construct(ModuleHandlerInterface $module_handler, CacheBackendInterface $cache_backend, LanguageManagerInterface $language_manager) {
+    $this->factory = new ContainerFactory($this, $this->pluginInterface);
+    $this->alterInfo('migration_plugins');
+    $this->setCacheBackend($cache_backend, 'migration_plugins', array('migration_plugins'));
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDiscovery() {
+    if (!isset($this->discovery)) {
+      $directories = array_map(function($directory) {
+        return [$directory . '/migration_templates', $directory . '/migrations'];
+      }, $this->moduleHandler->getModuleDirectories());
+
+      $yaml_discovery = new YamlDirectoryDiscovery($directories, 'migrate');
+      $this->discovery = new ContainerDerivativeDiscoveryDecorator($yaml_discovery);
+    }
+    return $this->discovery;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createInstance($plugin_id, array $configuration = array()) {
+    $instances = $this->createInstances([$plugin_id], $configuration);
+    return reset($instances);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createInstances($migration_id, array $configuration = array()) {
+    if (empty($migration_id)) {
+      $migration_id = array_keys($this->getDefinitions());
+    }
+
+    $factory = $this->getFactory();
+    $migration_ids = (array) $migration_id;
+    $plugin_ids = $this->expandPluginIds($migration_ids);
+
+    $instances = [];
+    foreach ($plugin_ids as $plugin_id) {
+      $instances[$plugin_id] = $factory->createInstance($plugin_id, isset($configuration[$plugin_id]) ? $configuration[$plugin_id] : []);
+    }
+
+    foreach ($instances as $migration) {
+      $migration->set('migration_dependencies', array_map([$this, 'expandPluginIds'], $migration->getMigrationDependencies()));
+    }
+
+    // Sort the migrations based on their dependencies.
+    return $this->buildDependencyMigration($instances, []);
+  }
+
+  /**
+   * Create migrations given a tag.
+   *
+   * @param string $tag
+   *   A migration tag we want to filter by.
+   *
+   * @return array|\Drupal\migrate\Plugin\MigrationInterface[]
+   *   An array of migration objects with the given tag.
+   */
+  public function createInstancesByTag($tag) {
+    $migrations = array_filter($this->getDefinitions(), function($migration) use ($tag) {
+      return !empty($migration['migration_tags']) && in_array($tag, $migration['migration_tags']);
+    });
+    return $this->createInstances(array_keys($migrations));
+  }
+
+  /**
+   * Expand derivative migration dependencies.
+   *
+   * We need to expand any derivative migrations. Derivative migrations are
+   * calculated by migration derivers such as D6NodeDeriver. This allows
+   * migrations to depend on the base id and then have a dependency on all
+   * derivative migrations. For example, d6_comment depends on d6_node but after
+   * we've expanded the dependencies it will depend on d6_node:page,
+   * d6_node:story and so on, for other derivative migrations.
+   *
+   * @return array
+   *   An array of expanded plugin ids.
+   */
+  protected function expandPluginIds(array $migration_ids) {
+    $plugin_ids = [];
+    foreach ($migration_ids as $id) {
+      $plugin_ids += preg_grep('/^' . preg_quote($id, '/') . PluginBase::DERIVATIVE_SEPARATOR . '/', array_keys($this->getDefinitions()));
+      if ($this->hasDefinition($id)) {
+        $plugin_ids[] = $id;
+      }
+    }
+    return $plugin_ids;
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildDependencyMigration(array $migrations, array $dynamic_ids) {
+    // Migration dependencies can be optional or required. If an optional
+    // dependency does not run, the current migration is still OK to go. Both
+    // optional and required dependencies (if run at all) must run before the
+    // current migration.
+    $dependency_graph = [];
+    $required_dependency_graph = [];
+    foreach ($migrations as $migration) {
+      /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+      $id = $migration->id();
+      $requirements[$id] = [];
+      $dependency_graph[$id]['edges'] = [];
+      $migration_dependencies = $migration->getMigrationDependencies();
+
+      if (isset($migration_dependencies['required'])) {
+        foreach ($migration_dependencies['required'] as $dependency) {
+          if (!isset($dynamic_ids[$dependency])) {
+            $this->addDependency($required_dependency_graph, $id, $dependency, $dynamic_ids);
+          }
+          $this->addDependency($dependency_graph, $id, $dependency, $dynamic_ids);
+        }
+      }
+      if (isset($migration_dependencies['optional'])) {
+        foreach ($migration_dependencies['optional'] as $dependency) {
+          $this->addDependency($dependency_graph, $id, $dependency, $dynamic_ids);
+        }
+      }
+    }
+    $dependency_graph = (new Graph($dependency_graph))->searchAndSort();
+    if (!empty($migration_dependencies['optional'])) {
+      $required_dependency_graph = (new Graph($required_dependency_graph))->searchAndSort();
+    }
+    else {
+      $required_dependency_graph = $dependency_graph;
+    }
+    $weights = [];
+    foreach ($migrations as $migration_id => $migration) {
+      // Populate a weights array to use with array_multisort() later.
+      $weights[] = $dependency_graph[$migration_id]['weight'];
+      if (!empty($required_dependency_graph[$migration_id]['paths'])) {
+        $migration->set('requirements', $required_dependency_graph[$migration_id]['paths']);
+      }
+    }
+    array_multisort($weights, SORT_DESC, SORT_NUMERIC, $migrations);
+
+    return $migrations;
+  }
+
+  /**
+   * Add one or more dependencies to a graph.
+   *
+   * @param array $graph
+   *   The graph so far, passed by reference.
+   * @param int $id
+   *   The migration ID.
+   * @param string $dependency
+   *   The dependency string.
+   * @param array $dynamic_ids
+   *   The dynamic ID mapping.
+   */
+  protected function addDependency(array &$graph, $id, $dependency, $dynamic_ids) {
+    $dependencies = isset($dynamic_ids[$dependency]) ? $dynamic_ids[$dependency] : array($dependency);
+    if (!isset($graph[$id]['edges'])) {
+      $graph[$id]['edges'] = array();
+    }
+    $graph[$id]['edges'] += array_combine($dependencies, $dependencies);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createStubMigration(array $definition) {
+    $id = isset($definition['id']) ? $definition['id'] : uniqid();
+    return Migration::create(\Drupal::getContainer(), [], $id, $definition);
+  }
+
+}
diff --git a/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
new file mode 100644
index 0000000..5a78233
--- /dev/null
+++ b/core/modules/migrate/src/Plugin/MigrationPluginManagerInterface.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\MigrationPluginManagerInterface.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+
+/**
+ * Migration plugin manager interface.
+ */
+interface MigrationPluginManagerInterface extends PluginManagerInterface {
+
+  /**
+   * Create pre-configured instance of plugin derivatives.
+   *
+   * @param array $id
+   *   Either the plugin ID or the base plugin ID of the plugins being
+   *   instantiated. Also accepts an array of plugin IDs and an empty array to
+   *   load all plugins.
+   * @param array $configuration
+   *   An array of configuration relevant to the plugin instances. Keyed by the
+   *   plugin ID.
+   *
+   * @return \Drupal\migrate\Plugin\MigrationInterface[]
+   *   Fully configured plugin instances.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\PluginException
+   *   If an instance cannot be created, such as if the ID is invalid.
+   */
+  public function createInstances($id, array $configuration = array());
+
+  /**
+   * Creates a stub migration plugin from a definition array.
+   *
+   * @param array $definition
+   *   The migration definition. If an 'id' key is set then this will be used as
+   *   the migration ID, if not a random ID will be assigned.
+   *
+   * @return \Drupal\migrate\Plugin\Migration
+   *   The stub migration.
+   */
+  public function createStubMigration(array $definition);
+
+}
diff --git a/core/modules/migrate/src/Plugin/migrate/builder/BuilderBase.php b/core/modules/migrate/src/Plugin/migrate/builder/BuilderBase.php
deleted file mode 100644
index 447ebf4..0000000
--- a/core/modules/migrate/src/Plugin/migrate/builder/BuilderBase.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Plugin\migrate\builder\BuilderBase.
- */
-
-namespace Drupal\migrate\Plugin\migrate\builder;
-
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Plugin\MigrateBuilderInterface;
-
-/**
- * Provides abstract base class for builder plugins.
- */
-abstract class BuilderBase extends PluginBase implements MigrateBuilderInterface {
-
-  /**
-   * Returns a fully initialized instance of a source plugin.
-   *
-   * @param string $plugin_id
-   *   The plugin ID.
-   * @param array $configuration
-   *   (optional) Additional configuration for the plugin. Defaults to an empty
-   *   array.
-   *
-   * @return \Drupal\migrate\Plugin\MigrateSourceInterface|\Drupal\migrate\Plugin\RequirementsInterface
-   *   The fully initialized source plugin.
-   */
-  protected function getSourcePlugin($plugin_id, array $configuration = []) {
-    $configuration['plugin'] = $plugin_id;
-    // By default, SqlBase subclasses will try to join on a map table. But in
-    // this case we're trying to use the source plugin as a detached iterator
-    // over the source data, so we don't want to join on (or create) the map
-    // table.
-    // @see SqlBase::initializeIterator()
-    $configuration['ignore_map'] = TRUE;
-    // Source plugins are tightly coupled to migration entities, so we need
-    // to create a fake migration in order to properly initialize the plugin.
-    $values = [
-      'id' => uniqid(),
-      'source' => $configuration,
-      // Since this isn't a real migration, we don't want a real destination --
-      // the 'null' destination is perfect for this.
-      'destination' => [
-        'plugin' => 'null',
-      ],
-    ];
-    return Migration::create($values)->getSourcePlugin();
-  }
-
-}
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php b/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
index dfd1739..00b731f 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/ComponentEntityDisplayBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
index b3c07c9..2af93b2 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -55,7 +55,7 @@ class Config extends DestinationBase implements ContainerFactoryPluginInterface,
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
index 0a38ba8..7bc05b0 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\migrate\Plugin\migrate\destination;
 
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrateDestinationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -43,7 +43,7 @@
   /**
    * The migration.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -56,7 +56,7 @@
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration) {
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index f1df40a..c0528b6 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index f23b54f..84e324d 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
@@ -47,7 +47,7 @@ class EntityContentBase extends Entity {
    *   The plugin ID for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The storage for this entity type.
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
index f35c5d4..3d4166d 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/NullDestination.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 4a706bf..04de53b 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Event\MigrateIdMapMessageEvent;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateMessageInterface;
@@ -83,7 +83,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   /**
    * The migration being done.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -154,7 +154,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    *   The plugin ID for the migration process to do.
    * @param mixed $plugin_definition
    *   The configuration for the plugin.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration to do.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) {
@@ -570,7 +570,7 @@ public function saveIdMapping(Row $row, array $destination_id_values, $source_ro
       $this->message->display(t('Could not save to map table due to missing destination id values'), 'error');
       return;
     }
-    if ($this->migration->get('trackLastImported')) {
+    if ($this->migration->getTrackLastImported()) {
       $fields['last_imported'] = time();
     }
     $keys = [static::SOURCE_IDS_HASH => $this->getSourceIDsHash($source_id_values)];
diff --git a/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php b/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
index 175e9c9..f79f0bd 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/DedupeEntity.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php b/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
index 78fbd14..e7befec 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/MenuLinkParent.php
@@ -5,14 +5,13 @@
  * Contains \Drupal\migrate\Plugin\migrate\process\MenuLinkContent.
  */
 
-
 namespace Drupal\migrate\Plugin\migrate\process;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Menu\MenuLinkManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Url;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateProcessInterface;
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Migration.php b/core/modules/migrate/src/Plugin/migrate/process/Migration.php
index 67f5a6a..7ae0fa5 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Migration.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Migration.php
@@ -7,12 +7,13 @@
 
 namespace Drupal\migrate\Plugin\migrate\process;
 
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\MigrateSkipProcessException;
 use Drupal\migrate\Plugin\MigratePluginManager;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\Row;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -34,18 +35,18 @@ class Migration extends ProcessPluginBase implements ContainerFactoryPluginInter
   protected $processPluginManager;
 
   /**
-   * The entity storage manager.
+   * The migration plugin manager.
    *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
+   * @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface
    */
-  protected $migrationStorage;
+  protected $migrationPluginManager;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, MigratePluginManager $process_plugin_manager) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, MigrationPluginManagerInterface $migration_plugin_manager, MigratePluginManager $process_plugin_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->migrationStorage = $storage;
+    $this->migrationPluginManager = $migration_plugin_manager;
     $this->migration = $migration;
     $this->processPluginManager = $process_plugin_manager;
   }
@@ -59,7 +60,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $migration,
-      $container->get('entity.manager')->getStorage('migration'),
+      $container->get('plugin.manager.migration'),
       $container->get('plugin.manager.migrate.process')
     );
   }
@@ -79,10 +80,10 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
     }
     $this->skipOnEmpty($value);
     $self = FALSE;
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
-    $migrations = $this->migrationStorage->loadMultiple($migration_ids);
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
     $destination_ids = NULL;
     $source_id_values = array();
+    $migrations = $this->migrationPluginManager->createInstances($migration_ids);
     foreach ($migrations as $migration_id => $migration) {
       if ($migration_id == $this->migration->id()) {
         $self = TRUE;
@@ -120,7 +121,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
       }
       $destination_plugin = $migration->getDestinationPlugin(TRUE);
       // Only keep the process necessary to produce the destination ID.
-      $process = $migration->get('process');
+      $process = $migration->getProcess();
 
       // We already have the source ID values but need to key them for the Row
       // constructor.
@@ -130,7 +131,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
         $values[$source_id] = $source_id_values[$migration->id()][$index];
       }
 
-      $stub_row = new Row($values + $migration->get('source'), $source_ids, TRUE);
+      $stub_row = new Row($values + $migration->getSourceConfiguration(), $source_ids, TRUE);
 
       // Do a normal migration with the stub row.
       $migrate_executable->processRow($stub_row, $process);
@@ -139,7 +140,11 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
         $destination_ids = $destination_plugin->import($stub_row);
       }
       catch (\Exception $e) {
-        $migrate_executable->saveMessage($e->getMessage());
+        $migration->getIdMap()->saveMessage($stub_row->getSourceIdValues(), $e->getMessage());
+      }
+
+      if ($destination_ids) {
+        $migration->getIdMap()->saveIdMapping($stub_row, $destination_ids, MigrateIdMapInterface::STATUS_NEEDS_UPDATE);
       }
     }
     if ($destination_ids) {
diff --git a/core/modules/migrate/src/Plugin/migrate/process/Route.php b/core/modules/migrate/src/Plugin/migrate/process/Route.php
index 6fd6722..3f8fa46 100644
--- a/core/modules/migrate/src/Plugin/migrate/process/Route.php
+++ b/core/modules/migrate/src/Plugin/migrate/process/Route.php
@@ -9,7 +9,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\Core\Path\PathValidatorInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
diff --git a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
index 4b429eb..2b6e910 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/EmbeddedDataSource.php
@@ -6,7 +6,7 @@
  */
 
 namespace Drupal\migrate\Plugin\migrate\source;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * Source which takes its data directly from the plugin config.
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index d644dc3..8f545ad 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\migrate\Plugin\migrate\source;
 
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -37,7 +37,7 @@
   /**
    * The entity migration object.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -153,7 +153,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
     $this->idMap = $this->migration->getIdMap();
 
     // Pull out the current highwater mark if we have a highwater property.
-    if ($this->highWaterProperty = $this->migration->get('highWaterProperty')) {
+    if ($this->highWaterProperty = $this->migration->getHighWaterProperty()) {
       $this->originalHighWater = $this->migration->getHighWater();
     }
 
@@ -300,7 +300,7 @@ public function next() {
 
       $row_data = $this->getIterator()->current() + $this->configuration;
       $this->getIterator()->next();
-      $row = new Row($row_data, $this->migration->getSourcePlugin()->getIds(), $this->migration->get('destinationIds'));
+      $row = new Row($row_data, $this->migration->getSourcePlugin()->getIds(), $this->migration->getDestinationIds());
 
       // Populate the source key for this row.
       $this->currentSourceIds = $row->getSourceIdValues();
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index 93569f4..1c464a62 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\id_map\Sql;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -91,6 +91,9 @@ public function getDatabase() {
       if (isset($this->configuration['database_state_key'])) {
         $this->database = $this->setUpDatabase($this->state->get($this->configuration['database_state_key']));
       }
+      elseif (($fallback_state_key = $this->state->get('migrate.fallback_state_key'))) {
+        $this->database = $this->setUpDatabase($this->state->get($fallback_state_key));
+      }
       else {
         $this->database = $this->setUpDatabase($this->configuration);
       }
@@ -163,7 +166,7 @@ protected function prepareQuery() {
    */
   protected function initializeIterator() {
     $this->prepareQuery();
-    $high_water_property = $this->migration->get('highWaterProperty');
+    $high_water_property = $this->migration->getHighWaterProperty();
 
     // Get the key values, for potential use in joining to the map table.
     $keys = array();
@@ -205,7 +208,7 @@ protected function initializeIterator() {
         $map_key = 'sourceid' . $count;
         $this->query->addField($alias, $map_key, "migrate_map_$map_key");
       }
-      if ($n = count($this->migration->get('destinationIds'))) {
+      if ($n = count($this->migration->getDestinationIds())) {
         for ($count = 1; $count <= $n; $count++) {
           $map_key = 'destid' . $count++;
           $this->query->addField($alias, $map_key, "migrate_map_$map_key");
diff --git a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php b/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php
deleted file mode 100644
index 3f22657..0000000
--- a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateDumpAlterInterface.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\simpletest\TestBase;
-
-/**
- * Allows tests to alter dumps after they have loaded.
- *
- * @see \Drupal\migrate_drupal\Tests\d6\MigrateFileTest
- */
-interface MigrateDumpAlterInterface {
-
-  /**
-   * Allows tests to alter dumps after they have loaded.
-   *
-   * @param \Drupal\simpletest\TestBase $test
-   *   The test that is being run.
-   */
-  public static function migrateDumpAlter(TestBase $test);
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php b/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
deleted file mode 100644
index 17d0499..0000000
--- a/core/modules/migrate/src/Tests/MigrateEmbeddedDataTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateEmbeddedDataTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Row;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the EmbeddedDataSource plugin.
- *
- * @group migrate
- */
-class MigrateEmbeddedDataTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate'];
-
-  /**
-   * Tests the embedded_data source plugin.
-   */
-  public function testEmbeddedData() {
-    $data_rows = [
-      ['key' => '1', 'field1' => 'f1value1', 'field2' => 'f2value1'],
-      ['key' => '2', 'field1' => 'f1value2', 'field2' => 'f2value2'],
-    ];
-    $ids = ['key' => ['type' => 'integer']];
-    $config = [
-      'id' => 'sample_data',
-      'migration_tags' => ['Embedded data test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [],
-      'destination' => ['plugin' => 'null'],
-    ];
-
-    $migration = Migration::create($config);
-    $source = $migration->getSourcePlugin();
-
-    // Validate the plugin returns the source data that was provided.
-    $results = [];
-    /** @var Row $row */
-    foreach ($source as $row) {
-      $data_row = $row->getSource();
-      // The "data" row returned by getSource() also includes all source
-      // configuration - we remove it so we see only the data itself.
-      unset($data_row['plugin']);
-      unset($data_row['data_rows']);
-      unset($data_row['ids']);
-      $results[] = $data_row;
-    }
-    $this->assertIdentical($results, $data_rows);
-
-    // Validate the public APIs.
-    $this->assertIdentical($source->count(), count($data_rows));
-    $this->assertIdentical($source->getIds(), $ids);
-    $expected_fields = [
-      'key' => 'key',
-      'field1' => 'field1',
-      'field2' => 'field2',
-    ];
-    $this->assertIdentical($source->fields(), $expected_fields);
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateEventsTest.php b/core/modules/migrate/src/Tests/MigrateEventsTest.php
deleted file mode 100644
index 6bafdaf..0000000
--- a/core/modules/migrate/src/Tests/MigrateEventsTest.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateEventsTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Event\MigrateImportEvent;
-use Drupal\migrate\Event\MigrateMapDeleteEvent;
-use Drupal\migrate\Event\MigrateMapSaveEvent;
-use Drupal\migrate\Event\MigratePostRowSaveEvent;
-use Drupal\migrate\Event\MigratePreRowSaveEvent;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Event\MigrateEvents;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests events fired on migrations.
- *
- * @group migrate
- */
-class MigrateEventsTest extends KernelTestBase {
-
-  /**
-   * State service for recording information received by event listeners.
-   *
-   * @var \Drupal\Core\State\State
-   */
-  protected $state;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate', 'migrate_events_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->state = \Drupal::state();
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_SAVE,
-      array($this, 'mapSaveEventRecorder'));
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_DELETE,
-      array($this, 'mapDeleteEventRecorder'));
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_IMPORT,
-      array($this, 'preImportEventRecorder'));
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_IMPORT,
-      array($this, 'postImportEventRecorder'));
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_ROW_SAVE,
-      array($this, 'preRowSaveEventRecorder'));
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
-      array($this, 'postRowSaveEventRecorder'));
-  }
-
-  /**
-   * Tests migration events.
-   */
-  public function testMigrateEvents() {
-    // Run a simple little migration, which should trigger one of each event
-    // other than map_delete.
-    $config = [
-      'id' => 'sample_data',
-      'migration_tags' => ['Event test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => [
-          ['data' => 'dummy value'],
-        ],
-        'ids' => [
-          'data' => ['type' => 'string'],
-        ],
-      ],
-      'process' => ['value' => 'data'],
-      'destination' => ['plugin' => 'dummy'],
-    ];
-
-    $migration = Migration::create($config);
-
-    /** @var MigrationInterface $migration */
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    // As the import runs, events will be dispatched, recording the received
-    // information in state.
-    $executable->import();
-
-    // Validate from the recorded state that the events were received.
-    $event = $this->state->get('migrate_events_test.pre_import_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::PRE_IMPORT);
-    $this->assertIdentical($event['migration']->id(), $migration->id());
-
-    $event = $this->state->get('migrate_events_test.post_import_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::POST_IMPORT);
-    $this->assertIdentical($event['migration']->id(), $migration->id());
-
-    $event = $this->state->get('migrate_events_test.map_save_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::MAP_SAVE);
-    // Validating the last row processed.
-    $this->assertIdentical($event['fields']['sourceid1'], 'dummy value');
-    $this->assertIdentical($event['fields']['destid1'], 'dummy value');
-    $this->assertIdentical($event['fields']['source_row_status'], 0);
-
-    $event = $this->state->get('migrate_events_test.map_delete_event', []);
-    $this->assertIdentical($event, []);
-
-    $event = $this->state->get('migrate_events_test.pre_row_save_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::PRE_ROW_SAVE);
-    $this->assertIdentical($event['migration']->id(), $migration->id());
-    // Validating the last row processed.
-    $this->assertIdentical($event['row']->getSourceProperty('data'), 'dummy value');
-
-    $event = $this->state->get('migrate_events_test.post_row_save_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::POST_ROW_SAVE);
-    $this->assertIdentical($event['migration']->id(), $migration->id());
-    // Validating the last row processed.
-    $this->assertIdentical($event['row']->getSourceProperty('data'), 'dummy value');
-    $this->assertIdentical($event['destination_id_values']['value'], 'dummy value');
-
-    // Generate a map delete event.
-    $migration->getIdMap()->delete(['data' => 'dummy value']);
-    $event = $this->state->get('migrate_events_test.map_delete_event', []);
-    $this->assertIdentical($event['event_name'], MigrateEvents::MAP_DELETE);
-    $this->assertIdentical($event['source_id'], ['data' => 'dummy value']);
-  }
-
-  /**
-   * Reacts to map save event.
-   *
-   * @param \Drupal\Migrate\Event\MigrateMapSaveEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function mapSaveEventRecorder(MigrateMapSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.map_save_event', array(
-      'event_name' => $name,
-      'map' => $event->getMap(),
-      'fields' => $event->getFields(),
-    ));
-  }
-
-  /**
-   * Reacts to map delete event.
-   *
-   * @param \Drupal\Migrate\Event\MigrateMapDeleteEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function mapDeleteEventRecorder(MigrateMapDeleteEvent $event, $name) {
-    $this->state->set('migrate_events_test.map_delete_event', array(
-      'event_name' => $name,
-      'map' => $event->getMap(),
-      'source_id' => $event->getSourceId(),
-    ));
-  }
-
-  /**
-   * Reacts to pre-import event.
-   *
-   * @param \Drupal\Migrate\Event\MigrateImportEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function preImportEventRecorder(MigrateImportEvent $event, $name) {
-    $this->state->set('migrate_events_test.pre_import_event', array(
-      'event_name' => $name,
-      'migration' => $event->getMigration(),
-    ));
-  }
-
-  /**
-   * Reacts to post-import event.
-   *
-   * @param \Drupal\Migrate\Event\MigrateImportEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function postImportEventRecorder(MigrateImportEvent $event, $name) {
-    $this->state->set('migrate_events_test.post_import_event', array(
-      'event_name' => $name,
-      'migration' => $event->getMigration(),
-    ));
-  }
-
-  /**
-   * Reacts to pre-row-save event.
-   *
-   * @param \Drupal\Migrate\Event\MigratePreRowSaveEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function preRowSaveEventRecorder(MigratePreRowSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.pre_row_save_event', array(
-      'event_name' => $name,
-      'migration' => $event->getMigration(),
-      'row' => $event->getRow(),
-    ));
-  }
-
-  /**
-   * Reacts to post-row-save event.
-   *
-   * @param \Drupal\Migrate\Event\MigratePostRowSaveEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function postRowSaveEventRecorder(MigratePostRowSaveEvent $event, $name) {
-    $this->state->set('migrate_events_test.post_row_save_event', array(
-      'event_name' => $name,
-      'migration' => $event->getMigration(),
-      'row' => $event->getRow(),
-      'destination_id_values' => $event->getDestinationIdValues(),
-    ));
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
deleted file mode 100644
index 70eae49..0000000
--- a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateInterruptionTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Event\MigratePostRowSaveEvent;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Event\MigrateEvents;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests interruptions triggered during migrations.
- *
- * @group migrate
- */
-class MigrateInterruptionTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate', 'migrate_events_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
-      array($this, 'postRowSaveEventRecorder'));
-  }
-
-  /**
-   * Tests migration interruptions.
-   */
-  public function testMigrateEvents() {
-    // Run a simple little migration, which should trigger one of each event
-    // other than map_delete.
-    $config = [
-      'id' => 'sample_data',
-      'migration_tags' => ['Interruption test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => [
-          ['data' => 'dummy value'],
-          ['data' => 'dummy value2'],
-        ],
-        'ids' => [
-          'data' => ['type' => 'string'],
-        ],
-      ],
-      'process' => ['value' => 'data'],
-      'destination' => ['plugin' => 'dummy'],
-    ];
-
-    $migration = Migration::create($config);
-
-    /** @var MigrationInterface $migration */
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    // When the import runs, the first row imported will trigger an
-    // interruption.
-    $result = $executable->import();
-
-    $this->assertEqual($result, MigrationInterface::RESULT_INCOMPLETE);
-
-    // The status should have been reset to IDLE.
-    $this->assertEqual($migration->getStatus(), MigrationInterface::STATUS_IDLE);
-  }
-
-  /**
-   * Reacts to post-row-save event.
-   *
-   * @param \Drupal\Migrate\Event\MigratePostRowSaveEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function postRowSaveEventRecorder(MigratePostRowSaveEvent $event, $name) {
-    $event->getMigration()->interruptMigration(MigrationInterface::RESULT_INCOMPLETE);
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateMessageTest.php b/core/modules/migrate/src/Tests/MigrateMessageTest.php
deleted file mode 100644
index e3a0aeb..0000000
--- a/core/modules/migrate/src/Tests/MigrateMessageTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateMessageTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Event\MigrateEvents;
-use Drupal\migrate\Event\MigrateIdMapMessageEvent;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessageInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests whether idmap messages are sent to message interface when requested.
- *
- * @group migrate
- */
-class MigrateMessageTest extends KernelTestBase implements MigrateMessageInterface {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate', 'system'];
-
-  /**
-   * Migration to run.
-   *
-   * @var \Drupal\migrate\Entity\MigrationInterface
-   */
-  protected $migration;
-
-  /**
-   * Messages accumulated during the migration run.
-   *
-   * @var array
-   */
-  protected $messages = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(['system']);
-
-    // A simple migration, which will generate a message to the ID map because
-    // the concat plugin throws an exception if its source is not an array.
-    $config = [
-      'id' => 'sample_data',
-      'migration_tags' => ['Message test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => [
-          ['name' => 'source_message', 'value' => 'a message'],
-        ],
-        'ids' => [
-          'name' => ['type' => 'string'],
-        ],
-      ],
-      'process' => [
-        'message' => [
-          'plugin' => 'concat',
-          'source' => 'value',
-        ],
-      ],
-      'destination' => [
-        'plugin' => 'config',
-        'config_name' => 'system.maintenance',
-      ],
-    ];
-
-    $this->migration = Migration::create($config);
-  }
-
-  /**
-   * Tests migration interruptions.
-   */
-  public function testMessagesNotTeed() {
-    // We don't ask for messages to be teed, so don't expect any.
-    $executable = new MigrateExecutable($this->migration, $this);
-    $executable->import();
-    $this->assertIdentical(count($this->messages), 0);
-  }
-
-  /**
-   * Tests migration interruptions.
-   */
-  public function testMessagesTeed() {
-    // Ask to receive any messages sent to the idmap.
-    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::IDMAP_MESSAGE,
-      array($this, 'mapMessageRecorder'));
-    $executable = new MigrateExecutable($this->migration, $this);
-    $executable->import();
-    $this->assertIdentical(count($this->messages), 1);
-    $this->assertIdentical(reset($this->messages), "source_message: 'a message' is not an array");
-  }
-
-  /**
-   * Reacts to map message event.
-   *
-   * @param \Drupal\Migrate\Event\MigrateIdMapMessageEvent $event
-   *   The migration event.
-   * @param string $name
-   *   The event name.
-   */
-  public function mapMessageRecorder(MigrateIdMapMessageEvent $event, $name) {
-    if ($event->getLevel() == MigrationInterface::MESSAGE_NOTICE ||
-        $event->getLevel() == MigrationInterface::MESSAGE_INFORMATIONAL) {
-      $type = 'status';
-    }
-    else {
-      $type = 'error';
-    }
-    $source_id_string = implode(',', $event->getSourceIdValues());
-    $this->display($source_id_string . ': ' . $event->getMessage(), $type);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function display($message, $type = 'status') {
-    $this->messages[] = $message;
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateRollbackTest.php b/core/modules/migrate/src/Tests/MigrateRollbackTest.php
deleted file mode 100644
index 9d6055c..0000000
--- a/core/modules/migrate/src/Tests/MigrateRollbackTest.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateRollbackTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Row;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-
-/**
- * Tests rolling back of imports.
- *
- * @group migrate
- */
-class MigrateRollbackTest extends MigrateTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'taxonomy', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('taxonomy_vocabulary');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(['taxonomy']);
-  }
-
-  /**
-   * Tests rolling back configuration and content entities.
-   */
-  public function testRollback() {
-    // We use vocabularies to demonstrate importing and rolling back
-    // configuration entities.
-    $vocabulary_data_rows = [
-      ['id' => '1', 'name' => 'categories', 'weight' => '2'],
-      ['id' => '2', 'name' => 'tags', 'weight' => '1'],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'vocabularies',
-      'migration_tags' => ['Import and rollback test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $vocabulary_data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'vid' => 'id',
-        'name' => 'name',
-        'weight' => 'weight',
-      ],
-      'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
-    ];
-
-    $vocabulary_migration = Migration::create($config);
-    $vocabulary_id_map = $vocabulary_migration->getIdMap();
-
-    $this->assertTrue($vocabulary_migration->getDestinationPlugin()->supportsRollback());
-
-    // Import and validate vocabulary config entities were created.
-    $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
-    $vocabulary_executable->import();
-    foreach ($vocabulary_data_rows as $row) {
-      /** @var Vocabulary $vocabulary */
-      $vocabulary = Vocabulary::load($row['id']);
-      $this->assertTrue($vocabulary);
-      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
-      $this->assertNotNull($map_row['destid1']);
-    }
-
-    // We use taxonomy terms to demonstrate importing and rolling back content
-    // entities.
-    $term_data_rows = [
-      ['id' => '1', 'vocab' => '1', 'name' => 'music'],
-      ['id' => '2', 'vocab' => '2', 'name' => 'Bach'],
-      ['id' => '3', 'vocab' => '2', 'name' => 'Beethoven'],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'terms',
-      'migration_tags' => ['Import and rollback test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $term_data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'tid' => 'id',
-        'vid' => 'vocab',
-        'name' => 'name',
-      ],
-      'destination' => ['plugin' => 'entity:taxonomy_term'],
-      'migration_dependencies' => ['required' => ['vocabularies']],
-    ];
-
-    $term_migration = Migration::create($config);
-    $term_id_map = $term_migration->getIdMap();
-
-    $this->assertTrue($term_migration->getDestinationPlugin()->supportsRollback());
-
-    // Pre-create a term, to make sure it isn't deleted on rollback.
-    $preserved_term_ids[] = 1;
-    $new_term = Term::create(['tid' => 1, 'vid' => 1, 'name' => 'music']);
-    $new_term->save();
-
-    // Import and validate term entities were created.
-    $term_executable = new MigrateExecutable($term_migration, $this);
-    $term_executable->import();
-    // Also explicitly mark one row to be preserved on rollback.
-    $preserved_term_ids[] = 2;
-    $map_row = $term_id_map->getRowBySource(['id' => 2]);
-    $dummy_row = new Row(['id' => 2], $ids);
-    $term_id_map->saveIdMapping($dummy_row, [$map_row['destid1']],
-      $map_row['source_row_status'], MigrateIdMapInterface::ROLLBACK_PRESERVE);
-
-    foreach ($term_data_rows as $row) {
-      /** @var Term $term */
-      $term = Term::load($row['id']);
-      $this->assertTrue($term);
-      $map_row = $term_id_map->getRowBySource(['id' => $row['id']]);
-      $this->assertNotNull($map_row['destid1']);
-    }
-
-    // Rollback and verify the entities are gone.
-    $term_executable->rollback();
-    foreach ($term_data_rows as $row) {
-      $term = Term::load($row['id']);
-      if (in_array($row['id'], $preserved_term_ids)) {
-        $this->assertNotNull($term);
-      }
-      else {
-        $this->assertNull($term);
-      }
-      $map_row = $term_id_map->getRowBySource(['id' => $row['id']]);
-      $this->assertFalse($map_row);
-    }
-    $vocabulary_executable->rollback();
-    foreach ($vocabulary_data_rows as $row) {
-      $term = Vocabulary::load($row['id']);
-      $this->assertNull($term);
-      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
-      $this->assertFalse($map_row);
-    }
-
-    // Test that simple configuration is not rollbackable.
-    $term_setting_rows = [
-      ['id' => 1, 'override_selector' => '0', 'terms_per_page_admin' => '10'],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'taxonomy_settings',
-      'migration_tags' => ['Import and rollback test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $term_setting_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'override_selector' => 'override_selector',
-        'terms_per_page_admin' => 'terms_per_page_admin',
-      ],
-      'destination' => [
-        'plugin' => 'config',
-        'config_name' => 'taxonomy.settings',
-      ],
-      'migration_dependencies' => ['required' => ['vocabularies']],
-    ];
-
-    $settings_migration = Migration::create($config);
-    $this->assertFalse($settings_migration->getDestinationPlugin()->supportsRollback());
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
deleted file mode 100644
index 93c1a7c..0000000
--- a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateSkipRowTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests row skips triggered during hook_migrate_prepare_row().
- *
- * @group migrate
- */
-class MigrateSkipRowTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate', 'migrate_prepare_row_test'];
-
-  /**
-   * Tests migration interruptions.
-   */
-  public function testPrepareRowSkip() {
-    // Run a simple little migration with two data rows which should be skipped
-    // in different ways.
-    $config = [
-      'id' => 'sample_data',
-      'migration_tags' => ['prepare_row test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => [
-          ['id' => '1', 'data' => 'skip_and_record'],
-          ['id' => '2', 'data' => 'skip_and_dont_record'],
-        ],
-        'ids' => [
-          'id' => ['type' => 'string'],
-        ],
-      ],
-      'process' => ['value' => 'data'],
-      'destination' => [
-        'plugin' => 'config',
-        'config_name' => 'migrate_test.settings',
-      ],
-      'load' => ['plugin' => 'null'],
-    ];
-
-    $migration = Migration::create($config);
-
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    $result = $executable->import();
-    $this->assertEqual($result, MigrationInterface::RESULT_COMPLETED);
-
-    $id_map_plugin = $migration->getIdMap();
-    // The first row is recorded in the map as ignored.
-    $map_row = $id_map_plugin->getRowBySource(['id' => 1]);
-    $this->assertEqual(MigrateIdMapInterface::STATUS_IGNORED, $map_row['source_row_status']);
-    // The second row is not recorded in the map.
-    $map_row = $id_map_plugin->getRowBySource(['id' => 2]);
-    $this->assertFalse($map_row);
-
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateStatusTest.php b/core/modules/migrate/src/Tests/MigrateStatusTest.php
deleted file mode 100644
index bdfcf74..0000000
--- a/core/modules/migrate/src/Tests/MigrateStatusTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateStatusTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Entity\MigrationInterface;
-
-/**
- * Tests migration status tracking.
- *
- * @group migrate
- */
-class MigrateStatusTest extends MigrateTestBase {
-
-  /**
-   * Tests different connection types.
-   */
-  public function testStatus() {
-    // Create a minimally valid migration.
-    $configuration = [
-      'id' => 'migration_status_test',
-      'migration_tags' => ['Testing'],
-      'source' => ['plugin' => 'empty'],
-      'destination' => [
-        'plugin' => 'config',
-        'config_name' => 'migrate_test.settings',
-      ],
-      'process' => ['foo' => 'bar'],
-    ];
-    $migration = Migration::create($configuration);
-    $migration->save();
-
-    // Default status is idle.
-    $status = $migration->getStatus();
-    $this->assertIdentical($status, MigrationInterface::STATUS_IDLE);
-
-    // Test setting and retrieving all known status values.
-    $status_list = array(
-      MigrationInterface::STATUS_IDLE,
-      MigrationInterface::STATUS_IMPORTING,
-      MigrationInterface::STATUS_ROLLING_BACK,
-      MigrationInterface::STATUS_STOPPING,
-      MigrationInterface::STATUS_DISABLED,
-    );
-    foreach ($status_list as $status) {
-      $migration->setStatus($status);
-      $this->assertIdentical($migration->getStatus(), $status);
-    }
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php
deleted file mode 100644
index e9012e3..0000000
--- a/core/modules/migrate/src/Tests/MigrateTestBase.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrateTestBase.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\Core\Database\Database;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessageInterface;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Row;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Creates abstract base class for migration tests.
- */
-abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageInterface {
-
-  /**
-   * TRUE to collect messages instead of displaying them.
-   *
-   * @var bool
-   */
-  protected $collectMessages = FALSE;
-
-  /**
-   * A two dimensional array of messages.
-   *
-   * The first key is the type of message, the second is just numeric. Values
-   * are the messages.
-   *
-   * @var array
-   */
-  protected $migrateMessages;
-
-  /**
-   * The primary migration being tested.
-   *
-   * @var \Drupal\migrate\Entity\MigrationInterface
-   */
-  protected $migration;
-
-  /**
-   * The source database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $sourceDatabase;
-
-  public static $modules = array('migrate');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->createMigrationConnection();
-    $this->sourceDatabase = Database::getConnection('default', 'migrate');
-  }
-
-  /**
-   * Changes the database connection to the prefixed one.
-   *
-   * @todo Remove when we don't use global. https://www.drupal.org/node/2552791
-   */
-  private function createMigrationConnection() {
-    // If the backup already exists, something went terribly wrong.
-    // This case is possible, because database connection info is a static
-    // global state construct on the Database class, which at least persists
-    // for all test methods executed in one PHP process.
-    if (Database::getConnectionInfo('simpletest_original_migrate')) {
-      throw new \RuntimeException("Bad Database connection state: 'simpletest_original_migrate' connection key already exists. Broken test?");
-    }
-
-    // Clone the current connection and replace the current prefix.
-    $connection_info = Database::getConnectionInfo('migrate');
-    if ($connection_info) {
-      Database::renameConnection('migrate', 'simpletest_original_migrate');
-    }
-    $connection_info = Database::getConnectionInfo('default');
-    foreach ($connection_info as $target => $value) {
-      $prefix = is_array($value['prefix']) ? $value['prefix']['default'] : $value['prefix'];
-      // Simpletest uses 7 character prefixes at most so this can't cause
-      // collisions.
-      $connection_info[$target]['prefix']['default'] = $prefix . '0';
-
-      // Add the original simpletest prefix so SQLite can attach its database.
-      // @see \Drupal\Core\Database\Driver\sqlite\Connection::init()
-      $connection_info[$target]['prefix'][$value['prefix']['default']] = $value['prefix']['default'];
-    }
-    Database::addConnectionInfo('migrate', 'default', $connection_info['default']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function tearDown() {
-    $this->cleanupMigrateConnection();
-    parent::tearDown();
-    $this->databaseDumpFiles = [];
-    $this->collectMessages = FALSE;
-    unset($this->migration, $this->migrateMessages);
-  }
-
-  /**
-   * Cleans up the test migrate connection.
-   *
-   * @todo Remove when we don't use global. https://www.drupal.org/node/2552791
-   */
-  private function cleanupMigrateConnection() {
-    Database::removeConnection('migrate');
-    $original_connection_info = Database::getConnectionInfo('simpletest_original_migrate');
-    if ($original_connection_info) {
-      Database::renameConnection('simpletest_original_migrate', 'migrate');
-    }
-  }
-
-  /**
-   * Prepare any dependent migrations.
-   *
-   * @param array $id_mappings
-   *   A list of ID mappings keyed by migration IDs. Each ID mapping is a list
-   *   of two arrays, the first are source IDs and the second are destination
-   *   IDs.
-   */
-  protected function prepareMigrations(array $id_mappings) {
-    foreach ($id_mappings as $migration_id => $data) {
-      // Use loadMultiple() here in order to load all variants.
-      foreach (Migration::loadMultiple([$migration_id]) as $migration) {
-        $id_map = $migration->getIdMap();
-        $id_map->setMessage($this);
-        $source_ids = $migration->getSourcePlugin()->getIds();
-        foreach ($data as $id_mapping) {
-          $row = new Row(array_combine(array_keys($source_ids), $id_mapping[0]), $source_ids);
-          $id_map->saveIdMapping($row, $id_mapping[1]);
-        }
-      }
-    }
-  }
-
-  /**
-   * Executes a single migration.
-   *
-   * @param string|\Drupal\migrate\Entity\MigrationInterface $migration
-   *   The migration to execute, or its ID.
-   */
-  protected function executeMigration($migration) {
-    if (is_string($migration)) {
-      $this->migration = Migration::load($migration);
-    }
-    else {
-      $this->migration = $migration;
-    }
-    if ($this instanceof MigrateDumpAlterInterface) {
-      static::migrateDumpAlter($this);
-    }
-    (new MigrateExecutable($this->migration, $this))->import();
-  }
-
-  /**
-   * Executes a set of migrations in dependency order.
-   *
-   * @param string[] $ids
-   *   Array of migration IDs, in any order.
-   */
-  protected function executeMigrations(array $ids) {
-    $migrations = Migration::loadMultiple($ids);
-    array_walk($migrations, [$this, 'executeMigration']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function display($message, $type = 'status') {
-    if ($this->collectMessages) {
-      $this->migrateMessages[$type][] = $message;
-    }
-    else {
-      $this->assert($type == 'status', $message, 'migrate');
-    }
-  }
-
-  /**
-   * Start collecting messages and erase previous messages.
-   */
-  public function startCollectingMessages() {
-    $this->collectMessages = TRUE;
-    $this->migrateMessages = array();
-  }
-
-  /**
-   * Stop collecting messages.
-   */
-  public function stopCollectingMessages() {
-    $this->collectMessages = FALSE;
-  }
-
-  /**
-   * Records a failure in the map table of a specific migration.
-   *
-   * This is done in order to test scenarios which require a failed row.
-   *
-   * @param string|\Drupal\migrate\Entity\MigrationInterface $migration
-   *   The migration entity, or its ID.
-   * @param array $row
-   *   The raw source row which "failed".
-   * @param int $status
-   *   (optional) The failure status. Should be one of the
-   *   MigrateIdMapInterface::STATUS_* constants. Defaults to
-   *   MigrateIdMapInterface::STATUS_FAILED.
-   */
-  protected function mockFailure($migration, array $row, $status = MigrateIdMapInterface::STATUS_FAILED) {
-    if (is_string($migration)) {
-      $migration = Migration::load($migration);
-    }
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $destination = array_map(function() { return NULL; }, $migration->getDestinationPlugin()->getIds());
-    $row = new Row($row, $migration->getSourcePlugin()->getIds());
-    $migration->getIdMap()->saveIdMapping($row, $destination, $status);
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/MigrationTest.php b/core/modules/migrate/src/Tests/MigrationTest.php
deleted file mode 100644
index 6511903..0000000
--- a/core/modules/migrate/src/Tests/MigrationTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\MigrationTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the migration entity.
- *
- * @group migrate
- * @coversDefaultClass \Drupal\migrate\Entity\Migration
- */
-class MigrationTest extends KernelTestBase {
-
-  /**
-   * Enable field because we are using one of its source plugins.
-   *
-   * @var array
-   */
-  public static $modules = ['migrate', 'field'];
-
-  /**
-   * Tests Migration::set().
-   *
-   * @covers ::set()
-   */
-  public function testSetInvalidation() {
-    $migration = Migration::create([
-      'source' => ['plugin' => 'empty'],
-      'destination' => ['plugin' => 'entity:entity_view_mode'],
-    ]);
-    $this->assertEqual('empty', $migration->getSourcePlugin()->getPluginId());
-    $this->assertEqual('entity:entity_view_mode', $migration->getDestinationPlugin()->getPluginId());
-
-    // Test the source plugin is invalidated.
-    $migration->set('source', ['plugin' => 'd6_field']);
-    $this->assertEqual('d6_field', $migration->getSourcePlugin()->getPluginId());
-
-    // Test the destination plugin is invalidated.
-    $migration->set('destination', ['plugin' => 'null']);
-    $this->assertEqual('null', $migration->getDestinationPlugin()->getPluginId());
-  }
-
-}
diff --git a/core/modules/migrate/src/Tests/SqlBaseTest.php b/core/modules/migrate/src/Tests/SqlBaseTest.php
deleted file mode 100644
index 0fd15a6..0000000
--- a/core/modules/migrate/src/Tests/SqlBaseTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\SqlBaseTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-use Drupal\migrate\Plugin\migrate\source\TestSqlBase;
-use Drupal\Core\Database\Database;
-
-/**
- * Tests the functionality of SqlBase.
- *
- * @group migrate
- */
-class SqlBaseTest extends MigrateTestBase {
-
-  /**
-   * Tests different connection types.
-   */
-  public function testConnectionTypes() {
-    $sql_base = new TestSqlBase();
-
-    // Check the default values.
-    $sql_base->setConfiguration([]);
-    $this->assertIdentical($sql_base->getDatabase()->getTarget(), 'default');
-    $this->assertIdentical($sql_base->getDatabase()->getKey(), 'migrate');
-
-    $target = 'test_db_target';
-    $key = 'test_migrate_connection';
-    $config = array('target' => $target, 'key' => $key);
-    $sql_base->setConfiguration($config);
-    Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']);
-
-    // Validate we have injected our custom key and target.
-    $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target);
-    $this->assertIdentical($sql_base->getDatabase()->getKey(), $key);
-
-    // Now test we can have SqlBase create the connection from an info array.
-    $sql_base = new TestSqlBase();
-
-    $target = 'test_db_target2';
-    $key = 'test_migrate_connection2';
-    $database = Database::getConnectionInfo('default')['default'];
-    $config = array('target' => $target, 'key' => $key, 'database' => $database);
-    $sql_base->setConfiguration($config);
-
-    // Call getDatabase() to get the connection defined.
-    $sql_base->getDatabase();
-
-    // Validate the connection has been created with the right values.
-    $this->assertIdentical(Database::getConnectionInfo($key)[$target], $database);
-
-    // Now, test this all works when using state to store db info.
-    $target = 'test_state_db_target';
-    $key = 'test_state_migrate_connection';
-    $config = ['target' => $target, 'key' => $key];
-    $database_state_key = 'migrate_sql_base_test';
-    \Drupal::state()->set($database_state_key, $config);
-    $sql_base->setConfiguration(['database_state_key' => $database_state_key]);
-    Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']);
-
-    // Validate we have injected our custom key and target.
-    $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target);
-    $this->assertIdentical($sql_base->getDatabase()->getKey(), $key);
-
-    // Now test we can have SqlBase create the connection from an info array.
-    $sql_base = new TestSqlBase();
-
-    $target = 'test_state_db_target2';
-    $key = 'test_state_migrate_connection2';
-    $database = Database::getConnectionInfo('default')['default'];
-    $config = ['target' => $target, 'key' => $key, 'database' => $database];
-    $database_state_key = 'migrate_sql_base_test2';
-    \Drupal::state()->set($database_state_key, $config);
-    $sql_base->setConfiguration(['database_state_key' => $database_state_key]);
-
-    // Call getDatabase() to get the connection defined.
-    $sql_base->getDatabase();
-
-    // Validate the connection has been created with the right values.
-    $this->assertIdentical(Database::getConnectionInfo($key)[$target], $database);
-  }
-
-}
-
-namespace Drupal\migrate\Plugin\migrate\source;
-
-/**
- * A dummy source to help with testing SqlBase.
- *
- * @package Drupal\migrate\Plugin\migrate\source
- */
-class TestSqlBase extends SqlBase {
-
-  /**
-   * Overrides the constructor so we can create one easily.
-   */
-  public function __construct() {
-    $this->state = \Drupal::state();
-  }
-
-  /**
-   * Gets the database without caching it.
-   */
-  public function getDatabase() {
-    $this->database = NULL;
-    return parent::getDatabase();
-  }
-
-  /**
-   * Allows us to set the configuration from a test.
-   *
-   * @param array $config
-   *   The config array.
-   */
-  public function setConfiguration($config) {
-    $this->configuration = $config;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getIds() {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public function fields() {}
-
-  /**
-   * {@inheritdoc}
-   */
-  public function query() {}
-
-}
diff --git a/core/modules/migrate/src/Tests/TemplateTest.php b/core/modules/migrate/src/Tests/TemplateTest.php
deleted file mode 100644
index 44400e9..0000000
--- a/core/modules/migrate/src/Tests/TemplateTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate\Tests\TemplateTest.
- */
-
-namespace Drupal\migrate\Tests;
-
-/**
- * Tests the migration template functionality.
- *
- * @group migrate
- */
-class TemplateTest extends MigrateTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('template_test');
-
-  /**
-   * Tests different connection types.
-   */
-  public function testTemplates() {
-    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test");
-    $expected_url = [
-      'id' => 'url_template',
-      'label' => 'Template test - url',
-      'migration_tags' => ['Template Test'],
-      'source' => ['plugin' => 'empty'],
-      'process' => ['src' => 'foobar'],
-      'destination' => ['plugin' => 'url_alias'],
-    ];
-    $expected_node = [
-      'id' => 'node_template',
-      'label' => 'Template test - node',
-      'migration_tags' => ['Template Test'],
-      'source' => ['plugin' => 'empty'],
-      'process' => ['src' => 'barfoo'],
-      'destination' => ['plugin' => 'entity:node'],
-    ];
-    $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url);
-    $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node);
-    $this->assertFalse(isset($migration_templates['migrate.migration.other_template']));
-  }
-
-  /**
-   * Tests retrieving a template by name.
-   */
-  public function testGetTemplateByName() {
-    /** @var \Drupal\migrate\MigrateTemplateStorageInterface $template_storage */
-    $template_storage = \Drupal::service('migrate.template_storage');
-
-    $expected_url = [
-      'id' => 'url_template',
-      'label' => 'Template test - url',
-      'migration_tags' => ['Template Test'],
-      'source' => ['plugin' => 'empty'],
-      'process' => ['src' => 'foobar'],
-      'destination' => ['plugin' => 'url_alias'],
-    ];
-    $expected_node = [
-      'id' => 'node_template',
-      'label' => 'Template test - node',
-      'migration_tags' => ['Template Test'],
-      'source' => ['plugin' => 'empty'],
-      'process' => ['src' => 'barfoo'],
-      'destination' => ['plugin' => 'entity:node'],
-    ];
-    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.url_template'), $expected_url);
-    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.node_template'), $expected_node);
-    $this->assertNull($template_storage->getTemplateByName('migrate.migration.dne'));
-  }
-
-}
diff --git a/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php b/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
index 984560b..8d20eb5 100644
--- a/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
+++ b/core/modules/migrate/tests/modules/migrate_events_test/src/Plugin/migrate/destination/DummyDestination.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\migrate_events_test\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Row;
 
diff --git a/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module b/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
index 9d9bd02..66f1bd9 100644
--- a/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
+++ b/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
@@ -6,7 +6,7 @@
  * handling.
  */
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\Plugin\MigrateSourceInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
index fd82119..0204046 100644
--- a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
@@ -1,5 +1,5 @@
 id: url_template
-label: Template test - url
+label: Template test - URL
 migration_tags:
   - Template Test
 source:
diff --git a/core/modules/migrate/tests/src/Kernel/Entity/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/Entity/MigrationTest.php
deleted file mode 100644
index fd37ac4..0000000
--- a/core/modules/migrate/tests/src/Kernel/Entity/MigrationTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate\Kernel\Entity\MigrationTest.
- */
-
-namespace Drupal\Tests\migrate\Kernel\Entity;
-
-use Drupal\KernelTests\KernelTestBase;
-use Drupal\migrate\Entity\Migration;
-
-/**
- * Tests the Migration entity.
- *
- * @coversDefaultClass \Drupal\migrate\Entity\Migration
- * @group migrate
- */
-class MigrationTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['migrate'];
-
-  /**
-   * @covers ::calculateDependencies
-   */
-  public function testCalculateDependencies() {
-    $fixture_migrations = [
-      'd6_node__article' => 'd6_node',
-      'd6_node__page' => 'd6_node',
-      'd6_variables' => 'd6_variables',
-    ];
-
-    foreach ($fixture_migrations as $id => $template) {
-      $values = [
-        'id' => $id,
-        'template' => $template,
-        'source' => [
-          'plugin' => 'empty',
-        ],
-        'destination' => [
-          'plugin' => 'null',
-        ],
-        'migration_tags' => []
-      ];
-      Migration::create($values)->save();
-    }
-
-    $values = [
-      'migration_dependencies' => [
-        'required' => [
-          'd6_node:*',
-          'd6_variables'
-        ]
-      ],
-      'source' => [
-        'plugin' => 'empty',
-      ],
-      'destination' => [
-        'plugin' => 'null',
-      ],
-    ];
-
-    $migration = new Migration($values, 'migration');
-    $expected = [
-      'migrate.migration.d6_node__article',
-      'migrate.migration.d6_node__page',
-      'migrate.migration.d6_variables'
-    ];
-    $migration->calculateDependencies();
-    $this->assertEquals($expected, $migration->getDependencies()['config']);
-  }
-
-}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php b/core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php
new file mode 100644
index 0000000..4d006c9
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateDumpAlterInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateDumpAlterInterface.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Allows tests to alter dumps after they have loaded.
+ *
+ * @see \Drupal\migrate_drupal\Tests\d6\MigrateFileTest
+ */
+interface MigrateDumpAlterInterface {
+
+  /**
+   * Allows tests to alter dumps after they have loaded.
+   *
+   * @param \Drupal\KernelTests\KernelTestBase $test
+   *   The test that is being run.
+   */
+  public static function migrateDumpAlter(KernelTestBase $test);
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php b/core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php
new file mode 100644
index 0000000..8dc8b3b
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateEmbeddedDataTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateEmbeddedDataTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the EmbeddedDataSource plugin.
+ *
+ * @group migrate
+ */
+class MigrateEmbeddedDataTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate'];
+
+  /**
+   * Tests the embedded_data source plugin.
+   */
+  public function testEmbeddedData() {
+    $data_rows = [
+      ['key' => '1', 'field1' => 'f1value1', 'field2' => 'f2value1'],
+      ['key' => '2', 'field1' => 'f1value2', 'field2' => 'f2value2'],
+    ];
+    $ids = ['key' => ['type' => 'integer']];
+    $definition = [
+      'migration_tags' => ['Embedded data test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [],
+      'destination' => ['plugin' => 'null'],
+    ];
+
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $source = $migration->getSourcePlugin();
+
+    // Validate the plugin returns the source data that was provided.
+    $results = [];
+    /** @var \Drupal\migrate\Row $row */
+    foreach ($source as $row) {
+      $data_row = $row->getSource();
+      // The "data" row returned by getSource() also includes all source
+      // configuration - we remove it so we see only the data itself.
+      unset($data_row['plugin']);
+      unset($data_row['data_rows']);
+      unset($data_row['ids']);
+      $results[] = $data_row;
+    }
+    $this->assertIdentical($results, $data_rows);
+
+    // Validate the public APIs.
+    $this->assertIdentical($source->count(), count($data_rows));
+    $this->assertIdentical($source->getIds(), $ids);
+    $expected_fields = [
+      'key' => 'key',
+      'field1' => 'field1',
+      'field2' => 'field2',
+    ];
+    $this->assertIdentical($source->fields(), $expected_fields);
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php b/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
new file mode 100644
index 0000000..de8ed0a
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateEventsTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateEventsTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\MigrateMapDeleteEvent;
+use Drupal\migrate\Event\MigrateMapSaveEvent;
+use Drupal\migrate\Event\MigratePostRowSaveEvent;
+use Drupal\migrate\Event\MigratePreRowSaveEvent;
+use Drupal\migrate\MigrateMessage;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests events fired on migrations.
+ *
+ * @group migrate
+ */
+class MigrateEventsTest extends KernelTestBase {
+
+  /**
+   * State service for recording information received by event listeners.
+   *
+   * @var \Drupal\Core\State\State
+   */
+  protected $state;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate', 'migrate_events_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->state = \Drupal::state();
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_SAVE,
+      array($this, 'mapSaveEventRecorder'));
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::MAP_DELETE,
+      array($this, 'mapDeleteEventRecorder'));
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_IMPORT,
+      array($this, 'preImportEventRecorder'));
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_IMPORT,
+      array($this, 'postImportEventRecorder'));
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::PRE_ROW_SAVE,
+      array($this, 'preRowSaveEventRecorder'));
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
+      array($this, 'postRowSaveEventRecorder'));
+  }
+
+  /**
+   * Tests migration events.
+   */
+  public function testMigrateEvents() {
+    // Run a simple little migration, which should trigger one of each event
+    // other than map_delete.
+    $definition = [
+      'migration_tags' => ['Event test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => [
+          ['data' => 'dummy value'],
+        ],
+        'ids' => [
+          'data' => ['type' => 'string'],
+        ],
+      ],
+      'process' => ['value' => 'data'],
+      'destination' => ['plugin' => 'dummy'],
+    ];
+
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
+    // As the import runs, events will be dispatched, recording the received
+    // information in state.
+    $executable->import();
+
+    // Validate from the recorded state that the events were received.
+    $event = $this->state->get('migrate_events_test.pre_import_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::PRE_IMPORT);
+    $this->assertIdentical($event['migration']->id(), $migration->id());
+
+    $event = $this->state->get('migrate_events_test.post_import_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::POST_IMPORT);
+    $this->assertIdentical($event['migration']->id(), $migration->id());
+
+    $event = $this->state->get('migrate_events_test.map_save_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::MAP_SAVE);
+    // Validating the last row processed.
+    $this->assertIdentical($event['fields']['sourceid1'], 'dummy value');
+    $this->assertIdentical($event['fields']['destid1'], 'dummy value');
+    $this->assertIdentical($event['fields']['source_row_status'], 0);
+
+    $event = $this->state->get('migrate_events_test.map_delete_event', []);
+    $this->assertIdentical($event, []);
+
+    $event = $this->state->get('migrate_events_test.pre_row_save_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::PRE_ROW_SAVE);
+    $this->assertIdentical($event['migration']->id(), $migration->id());
+    // Validating the last row processed.
+    $this->assertIdentical($event['row']->getSourceProperty('data'), 'dummy value');
+
+    $event = $this->state->get('migrate_events_test.post_row_save_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::POST_ROW_SAVE);
+    $this->assertIdentical($event['migration']->id(), $migration->id());
+    // Validating the last row processed.
+    $this->assertIdentical($event['row']->getSourceProperty('data'), 'dummy value');
+    $this->assertIdentical($event['destination_id_values']['value'], 'dummy value');
+
+    // Generate a map delete event.
+    $migration->getIdMap()->delete(['data' => 'dummy value']);
+    $event = $this->state->get('migrate_events_test.map_delete_event', []);
+    $this->assertIdentical($event['event_name'], MigrateEvents::MAP_DELETE);
+    $this->assertIdentical($event['source_id'], ['data' => 'dummy value']);
+  }
+
+  /**
+   * Reacts to map save event.
+   *
+   * @param \Drupal\Migrate\Event\MigrateMapSaveEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function mapSaveEventRecorder(MigrateMapSaveEvent $event, $name) {
+    $this->state->set('migrate_events_test.map_save_event', array(
+      'event_name' => $name,
+      'map' => $event->getMap(),
+      'fields' => $event->getFields(),
+    ));
+  }
+
+  /**
+   * Reacts to map delete event.
+   *
+   * @param \Drupal\Migrate\Event\MigrateMapDeleteEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function mapDeleteEventRecorder(MigrateMapDeleteEvent $event, $name) {
+    $this->state->set('migrate_events_test.map_delete_event', array(
+      'event_name' => $name,
+      'map' => $event->getMap(),
+      'source_id' => $event->getSourceId(),
+    ));
+  }
+
+  /**
+   * Reacts to pre-import event.
+   *
+   * @param \Drupal\Migrate\Event\MigrateImportEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function preImportEventRecorder(MigrateImportEvent $event, $name) {
+    $this->state->set('migrate_events_test.pre_import_event', array(
+      'event_name' => $name,
+      'migration' => $event->getMigration(),
+    ));
+  }
+
+  /**
+   * Reacts to post-import event.
+   *
+   * @param \Drupal\Migrate\Event\MigrateImportEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function postImportEventRecorder(MigrateImportEvent $event, $name) {
+    $this->state->set('migrate_events_test.post_import_event', array(
+      'event_name' => $name,
+      'migration' => $event->getMigration(),
+    ));
+  }
+
+  /**
+   * Reacts to pre-row-save event.
+   *
+   * @param \Drupal\Migrate\Event\MigratePreRowSaveEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function preRowSaveEventRecorder(MigratePreRowSaveEvent $event, $name) {
+    $this->state->set('migrate_events_test.pre_row_save_event', array(
+      'event_name' => $name,
+      'migration' => $event->getMigration(),
+      'row' => $event->getRow(),
+    ));
+  }
+
+  /**
+   * Reacts to post-row-save event.
+   *
+   * @param \Drupal\Migrate\Event\MigratePostRowSaveEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function postRowSaveEventRecorder(MigratePostRowSaveEvent $event, $name) {
+    $this->state->set('migrate_events_test.post_row_save_event', array(
+      'event_name' => $name,
+      'migration' => $event->getMigration(),
+      'row' => $event->getRow(),
+      'destination_id_values' => $event->getDestinationIdValues(),
+    ));
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php b/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
new file mode 100644
index 0000000..d62bccd
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateInterruptionTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateInterruptionTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\Event\MigratePostRowSaveEvent;
+use Drupal\migrate\MigrateMessage;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests interruptions triggered during migrations.
+ *
+ * @group migrate
+ */
+class MigrateInterruptionTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate', 'migrate_events_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::POST_ROW_SAVE,
+      array($this, 'postRowSaveEventRecorder'));
+  }
+
+  /**
+   * Tests migration interruptions.
+   */
+  public function testMigrateEvents() {
+    // Run a simple little migration, which should trigger one of each event
+    // other than map_delete.
+    $definition = [
+      'migration_tags' => ['Interruption test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => [
+          ['data' => 'dummy value'],
+          ['data' => 'dummy value2'],
+        ],
+        'ids' => [
+          'data' => ['type' => 'string'],
+        ],
+      ],
+      'process' => ['value' => 'data'],
+      'destination' => ['plugin' => 'dummy'],
+    ];
+
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
+    // When the import runs, the first row imported will trigger an
+    // interruption.
+    $result = $executable->import();
+
+    $this->assertEqual($result, MigrationInterface::RESULT_INCOMPLETE);
+
+    // The status should have been reset to IDLE.
+    $this->assertEqual($migration->getStatus(), MigrationInterface::STATUS_IDLE);
+  }
+
+  /**
+   * Reacts to post-row-save event.
+   *
+   * @param \Drupal\Migrate\Event\MigratePostRowSaveEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function postRowSaveEventRecorder(MigratePostRowSaveEvent $event, $name) {
+    $event->getMigration()->interruptMigration(MigrationInterface::RESULT_INCOMPLETE);
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php b/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
new file mode 100644
index 0000000..fbe777b
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateMessageTest.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateMessageTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\Event\MigrateIdMapMessageEvent;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateMessageInterface;
+
+/**
+ * Tests whether idmap messages are sent to message interface when requested.
+ *
+ * @group migrate
+ */
+class MigrateMessageTest extends KernelTestBase implements MigrateMessageInterface {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate', 'system'];
+
+  /**
+   * Migration to run.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationInterface
+   */
+  protected $migration;
+
+  /**
+   * Messages accumulated during the migration run.
+   *
+   * @var array
+   */
+  protected $messages = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['system']);
+
+    // A simple migration, which will generate a message to the ID map because
+    // the concat plugin throws an exception if its source is not an array.
+    $definition = [
+      'migration_tags' => ['Message test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => [
+          ['name' => 'source_message', 'value' => 'a message'],
+        ],
+        'ids' => [
+          'name' => ['type' => 'string'],
+        ],
+      ],
+      'process' => [
+        'message' => [
+          'plugin' => 'concat',
+          'source' => 'value',
+        ],
+      ],
+      'destination' => [
+        'plugin' => 'config',
+        'config_name' => 'system.maintenance',
+      ],
+    ];
+
+    $this->migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+  }
+
+  /**
+   * Tests migration interruptions.
+   */
+  public function testMessagesNotTeed() {
+    // We don't ask for messages to be teed, so don't expect any.
+    $executable = new MigrateExecutable($this->migration, $this);
+    $executable->import();
+    $this->assertIdentical(count($this->messages), 0);
+  }
+
+  /**
+   * Tests migration interruptions.
+   */
+  public function testMessagesTeed() {
+    // Ask to receive any messages sent to the idmap.
+    \Drupal::service('event_dispatcher')->addListener(MigrateEvents::IDMAP_MESSAGE,
+      array($this, 'mapMessageRecorder'));
+    $executable = new MigrateExecutable($this->migration, $this);
+    $executable->import();
+    $this->assertIdentical(count($this->messages), 1);
+    $this->assertIdentical(reset($this->messages), "source_message: 'a message' is not an array");
+  }
+
+  /**
+   * Reacts to map message event.
+   *
+   * @param \Drupal\Migrate\Event\MigrateIdMapMessageEvent $event
+   *   The migration event.
+   * @param string $name
+   *   The event name.
+   */
+  public function mapMessageRecorder(MigrateIdMapMessageEvent $event, $name) {
+    if ($event->getLevel() == MigrationInterface::MESSAGE_NOTICE ||
+        $event->getLevel() == MigrationInterface::MESSAGE_INFORMATIONAL) {
+      $type = 'status';
+    }
+    else {
+      $type = 'error';
+    }
+    $source_id_string = implode(',', $event->getSourceIdValues());
+    $this->display($source_id_string . ': ' . $event->getMessage(), $type);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function display($message, $type = 'status') {
+    $this->messages[] = $message;
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php
new file mode 100644
index 0000000..955f2af
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateRollbackTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Row;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+
+/**
+ * Tests rolling back of imports.
+ *
+ * @group migrate
+ */
+class MigrateRollbackTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'taxonomy', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_vocabulary');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(['taxonomy']);
+  }
+
+  /**
+   * Tests rolling back configuration and content entities.
+   */
+  public function testRollback() {
+    // We use vocabularies to demonstrate importing and rolling back
+    // configuration entities.
+    $vocabulary_data_rows = [
+      ['id' => '1', 'name' => 'categories', 'weight' => '2'],
+      ['id' => '2', 'name' => 'tags', 'weight' => '1'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'vocabularies',
+      'migration_tags' => ['Import and rollback test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $vocabulary_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'vid' => 'id',
+        'name' => 'name',
+        'weight' => 'weight',
+      ],
+      'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
+    ];
+
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $vocabulary_id_map = $vocabulary_migration->getIdMap();
+
+    $this->assertTrue($vocabulary_migration->getDestinationPlugin()->supportsRollback());
+
+    // Import and validate vocabulary config entities were created.
+    $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
+    $vocabulary_executable->import();
+    foreach ($vocabulary_data_rows as $row) {
+      /** @var Vocabulary $vocabulary */
+      $vocabulary = Vocabulary::load($row['id']);
+      $this->assertTrue($vocabulary);
+      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertNotNull($map_row['destid1']);
+    }
+
+    // We use taxonomy terms to demonstrate importing and rolling back content
+    // entities.
+    $term_data_rows = [
+      ['id' => '1', 'vocab' => '1', 'name' => 'music'],
+      ['id' => '2', 'vocab' => '2', 'name' => 'Bach'],
+      ['id' => '3', 'vocab' => '2', 'name' => 'Beethoven'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'terms',
+      'migration_tags' => ['Import and rollback test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'tid' => 'id',
+        'vid' => 'vocab',
+        'name' => 'name',
+      ],
+      'destination' => ['plugin' => 'entity:taxonomy_term'],
+      'migration_dependencies' => ['required' => ['vocabularies']],
+    ];
+
+    $term_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $term_id_map = $term_migration->getIdMap();
+
+    $this->assertTrue($term_migration->getDestinationPlugin()->supportsRollback());
+
+    // Pre-create a term, to make sure it isn't deleted on rollback.
+    $preserved_term_ids[] = 1;
+    $new_term = Term::create(['tid' => 1, 'vid' => 1, 'name' => 'music']);
+    $new_term->save();
+
+    // Import and validate term entities were created.
+    $term_executable = new MigrateExecutable($term_migration, $this);
+    $term_executable->import();
+    // Also explicitly mark one row to be preserved on rollback.
+    $preserved_term_ids[] = 2;
+    $map_row = $term_id_map->getRowBySource(['id' => 2]);
+    $dummy_row = new Row(['id' => 2], $ids);
+    $term_id_map->saveIdMapping($dummy_row, [$map_row['destid1']],
+      $map_row['source_row_status'], MigrateIdMapInterface::ROLLBACK_PRESERVE);
+
+    foreach ($term_data_rows as $row) {
+      /** @var Term $term */
+      $term = Term::load($row['id']);
+      $this->assertTrue($term);
+      $map_row = $term_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertNotNull($map_row['destid1']);
+    }
+
+    // Rollback and verify the entities are gone.
+    $term_executable->rollback();
+    foreach ($term_data_rows as $row) {
+      $term = Term::load($row['id']);
+      if (in_array($row['id'], $preserved_term_ids)) {
+        $this->assertNotNull($term);
+      }
+      else {
+        $this->assertNull($term);
+      }
+      $map_row = $term_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertFalse($map_row);
+    }
+    $vocabulary_executable->rollback();
+    foreach ($vocabulary_data_rows as $row) {
+      $term = Vocabulary::load($row['id']);
+      $this->assertNull($term);
+      $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]);
+      $this->assertFalse($map_row);
+    }
+
+    // Test that simple configuration is not rollbackable.
+    $term_setting_rows = [
+      ['id' => 1, 'override_selector' => '0', 'terms_per_page_admin' => '10'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'taxonomy_settings',
+      'migration_tags' => ['Import and rollback test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $term_setting_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'override_selector' => 'override_selector',
+        'terms_per_page_admin' => 'terms_per_page_admin',
+      ],
+      'destination' => [
+        'plugin' => 'config',
+        'config_name' => 'taxonomy.settings',
+      ],
+      'migration_dependencies' => ['required' => ['vocabularies']],
+    ];
+
+    $settings_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $this->assertFalse($settings_migration->getDestinationPlugin()->supportsRollback());
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php b/core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
new file mode 100644
index 0000000..16c0bdc
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateSkipRowTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateSkipRowTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\migrate\MigrateMessage;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+
+/**
+ * Tests row skips triggered during hook_migrate_prepare_row().
+ *
+ * @group migrate
+ */
+class MigrateSkipRowTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate', 'migrate_prepare_row_test'];
+
+  /**
+   * Tests migration interruptions.
+   */
+  public function testPrepareRowSkip() {
+    // Run a simple little migration with two data rows which should be skipped
+    // in different ways.
+    $definition = [
+      'migration_tags' => ['prepare_row test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => [
+          ['id' => '1', 'data' => 'skip_and_record'],
+          ['id' => '2', 'data' => 'skip_and_dont_record'],
+        ],
+        'ids' => [
+          'id' => ['type' => 'string'],
+        ],
+      ],
+      'process' => ['value' => 'data'],
+      'destination' => [
+        'plugin' => 'config',
+        'config_name' => 'migrate_test.settings',
+      ],
+      'load' => ['plugin' => 'null'],
+    ];
+
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
+    $result = $executable->import();
+    $this->assertEqual($result, MigrationInterface::RESULT_COMPLETED);
+
+    $id_map_plugin = $migration->getIdMap();
+    // The first row is recorded in the map as ignored.
+    $map_row = $id_map_plugin->getRowBySource(['id' => 1]);
+    $this->assertEqual(MigrateIdMapInterface::STATUS_IGNORED, $map_row['source_row_status']);
+    // The second row is not recorded in the map.
+    $map_row = $id_map_plugin->getRowBySource(['id' => 2]);
+    $this->assertFalse($map_row);
+
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php b/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
new file mode 100644
index 0000000..23eddf0
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateStatusTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateStatusTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * Tests migration status tracking.
+ *
+ * @group migrate
+ */
+class MigrateStatusTest extends MigrateTestBase {
+
+  /**
+   * Tests different connection types.
+   */
+  public function testStatus() {
+    // Create a minimally valid migration.
+    $definition = [
+      'id' => 'migration_status_test',
+      'migration_tags' => ['Testing'],
+      'source' => ['plugin' => 'empty'],
+      'destination' => [
+        'plugin' => 'config',
+        'config_name' => 'migrate_test.settings',
+      ],
+      'process' => ['foo' => 'bar'],
+    ];
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+
+    // Default status is idle.
+    $status = $migration->getStatus();
+    $this->assertIdentical($status, MigrationInterface::STATUS_IDLE);
+
+    // Test setting and retrieving all known status values.
+    $status_list = array(
+      MigrationInterface::STATUS_IDLE,
+      MigrationInterface::STATUS_IMPORTING,
+      MigrationInterface::STATUS_ROLLING_BACK,
+      MigrationInterface::STATUS_STOPPING,
+      MigrationInterface::STATUS_DISABLED,
+    );
+    foreach ($status_list as $status) {
+      $migration->setStatus($status);
+      $this->assertIdentical($migration->getStatus(), $status);
+    }
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
new file mode 100644
index 0000000..a599a45
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrateTestBase.php
@@ -0,0 +1,242 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrateTestBase.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\Core\Database\Database;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateMessageInterface;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Row;
+
+/**
+ * Creates abstract base class for migration tests.
+ */
+abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageInterface {
+
+  /**
+   * TRUE to collect messages instead of displaying them.
+   *
+   * @var bool
+   */
+  protected $collectMessages = FALSE;
+
+  /**
+   * A two dimensional array of messages.
+   *
+   * The first key is the type of message, the second is just numeric. Values
+   * are the messages.
+   *
+   * @var array
+   */
+  protected $migrateMessages;
+
+  /**
+   * The primary migration being tested.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationInterface
+   */
+  protected $migration;
+
+  /**
+   * The source database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $sourceDatabase;
+
+  public static $modules = array('migrate');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->createMigrationConnection();
+    $this->sourceDatabase = Database::getConnection('default', 'migrate');
+  }
+
+  /**
+   * Changes the database connection to the prefixed one.
+   *
+   * @todo Remove when we don't use global. https://www.drupal.org/node/2552791
+   */
+  private function createMigrationConnection() {
+    // If the backup already exists, something went terribly wrong.
+    // This case is possible, because database connection info is a static
+    // global state construct on the Database class, which at least persists
+    // for all test methods executed in one PHP process.
+    if (Database::getConnectionInfo('simpletest_original_migrate')) {
+      throw new \RuntimeException("Bad Database connection state: 'simpletest_original_migrate' connection key already exists. Broken test?");
+    }
+
+    // Clone the current connection and replace the current prefix.
+    $connection_info = Database::getConnectionInfo('migrate');
+    if ($connection_info) {
+      Database::renameConnection('migrate', 'simpletest_original_migrate');
+    }
+    $connection_info = Database::getConnectionInfo('default');
+    foreach ($connection_info as $target => $value) {
+      $prefix = is_array($value['prefix']) ? $value['prefix']['default'] : $value['prefix'];
+      // Simpletest uses 7 character prefixes at most so this can't cause
+      // collisions.
+      $connection_info[$target]['prefix']['default'] = $prefix . '0';
+
+      // Add the original simpletest prefix so SQLite can attach its database.
+      // @see \Drupal\Core\Database\Driver\sqlite\Connection::init()
+      $connection_info[$target]['prefix'][$value['prefix']['default']] = $value['prefix']['default'];
+    }
+    Database::addConnectionInfo('migrate', 'default', $connection_info['default']);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function tearDown() {
+    $this->cleanupMigrateConnection();
+    parent::tearDown();
+    $this->databaseDumpFiles = [];
+    $this->collectMessages = FALSE;
+    unset($this->migration, $this->migrateMessages);
+  }
+
+  /**
+   * Cleans up the test migrate connection.
+   *
+   * @todo Remove when we don't use global. https://www.drupal.org/node/2552791
+   */
+  private function cleanupMigrateConnection() {
+    Database::removeConnection('migrate');
+    $original_connection_info = Database::getConnectionInfo('simpletest_original_migrate');
+    if ($original_connection_info) {
+      Database::renameConnection('simpletest_original_migrate', 'migrate');
+    }
+  }
+
+  /**
+   * Prepare any dependent migrations.
+   *
+   * @param array $id_mappings
+   *   A list of ID mappings keyed by migration IDs. Each ID mapping is a list
+   *   of two arrays, the first are source IDs and the second are destination
+   *   IDs.
+   */
+  protected function prepareMigrations(array $id_mappings) {
+    $manager = $this->container->get('plugin.manager.migration');
+    foreach ($id_mappings as $migration_id => $data) {
+      foreach ($manager->createInstances($migration_id) as $migration) {
+        $id_map = $migration->getIdMap();
+        $id_map->setMessage($this);
+        $source_ids = $migration->getSourcePlugin()->getIds();
+        foreach ($data as $id_mapping) {
+          $row = new Row(array_combine(array_keys($source_ids), $id_mapping[0]), $source_ids);
+          $id_map->saveIdMapping($row, $id_mapping[1]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Executes a single migration.
+   *
+   * @param string|\Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration to execute, or its ID.
+   */
+  protected function executeMigration($migration) {
+    if (is_string($migration)) {
+      $this->migration = $this->getMigration($migration);
+    }
+    else {
+      $this->migration = $migration;
+    }
+    if ($this instanceof MigrateDumpAlterInterface) {
+      static::migrateDumpAlter($this);
+    }
+    (new MigrateExecutable($this->migration, $this))->import();
+  }
+
+  /**
+   * Executes a set of migrations in dependency order.
+   *
+   * @param string[] $ids
+   *   Array of migration IDs, in any order.
+   */
+  protected function executeMigrations(array $ids) {
+    $manager = $this->container->get('plugin.manager.migration');
+    array_walk($ids, function ($id) use ($manager) {
+      // This is possibly a base plugin ID and we want to run all derivatives.
+      $instances = $manager->createInstances($id);
+      array_walk($instances, [$this, 'executeMigration']);
+    });
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function display($message, $type = 'status') {
+    if ($this->collectMessages) {
+      $this->migrateMessages[$type][] = $message;
+    }
+    else {
+      $this->assert($type == 'status', $message, 'migrate');
+    }
+  }
+
+  /**
+   * Start collecting messages and erase previous messages.
+   */
+  public function startCollectingMessages() {
+    $this->collectMessages = TRUE;
+    $this->migrateMessages = array();
+  }
+
+  /**
+   * Stop collecting messages.
+   */
+  public function stopCollectingMessages() {
+    $this->collectMessages = FALSE;
+  }
+
+  /**
+   * Records a failure in the map table of a specific migration.
+   *
+   * This is done in order to test scenarios which require a failed row.
+   *
+   * @param string|\Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration entity, or its ID.
+   * @param array $row
+   *   The raw source row which "failed".
+   * @param int $status
+   *   (optional) The failure status. Should be one of the
+   *   MigrateIdMapInterface::STATUS_* constants. Defaults to
+   *   MigrateIdMapInterface::STATUS_FAILED.
+   */
+  protected function mockFailure($migration, array $row, $status = MigrateIdMapInterface::STATUS_FAILED) {
+    if (is_string($migration)) {
+      $migration = $this->getMigration($migration);
+    }
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $destination = array_map(function() { return NULL; }, $migration->getDestinationPlugin()->getIds());
+    $row = new Row($row, $migration->getSourcePlugin()->getIds());
+    $migration->getIdMap()->saveIdMapping($row, $destination, $status);
+  }
+
+  /**
+   * Gets the migration plugin.
+   *
+   * @param $plugin_id
+   *   The plugin ID of the migration to get.
+   *
+   * @return \Drupal\migrate\Plugin\Migration
+   *   The migration plugin.
+   */
+  protected function getMigration($plugin_id) {
+    return $this->container->get('plugin.manager.migration')->createInstance($plugin_id);
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/MigrationTest.php
new file mode 100644
index 0000000..26cea66
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/MigrationTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\MigrationTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the migration plugin.
+ *
+ * @group migrate
+ *
+ * @coversDefaultClass \Drupal\migrate\Plugin\Migration
+ */
+class MigrationTest extends KernelTestBase {
+
+  /**
+   * Enable field because we are using one of its source plugins.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate', 'field'];
+
+  /**
+   * Tests Migration::set().
+   *
+   * @covers ::set
+   */
+  public function testSetInvalidation() {
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([
+      'source' => ['plugin' => 'empty'],
+      'destination' => ['plugin' => 'entity:entity_view_mode'],
+    ]);
+    $this->assertEqual('empty', $migration->getSourcePlugin()->getPluginId());
+    $this->assertEqual('entity:entity_view_mode', $migration->getDestinationPlugin()->getPluginId());
+
+    // Test the source plugin is invalidated.
+    $migration->set('source', ['plugin' => 'd6_field']);
+    $this->assertEqual('d6_field', $migration->getSourcePlugin()->getPluginId());
+
+    // Test the destination plugin is invalidated.
+    $migration->set('destination', ['plugin' => 'null']);
+    $this->assertEqual('null', $migration->getDestinationPlugin()->getPluginId());
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
new file mode 100644
index 0000000..9975700
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\Plugin\MigrationTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel\Plugin;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the migration plugin.
+ *
+ * @coversDefaultClass \Drupal\migrate\Plugin\Migration
+ * @group migrate
+ */
+class MigrationTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['migrate'];
+
+  /**
+   * Tests Migration::getProcessPlugins()
+   *
+   * @covers ::getProcessPlugins
+   */
+  public function testGetProcessPlugins() {
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration([]);
+    $this->assertEquals([], $migration->getProcessPlugins([]));
+  }
+
+}
diff --git a/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
new file mode 100644
index 0000000..dc4b32c
--- /dev/null
+++ b/core/modules/migrate/tests/src/Kernel/SqlBaseTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate\Kernel\SqlBaseTest.
+ */
+
+namespace Drupal\Tests\migrate\Kernel;
+
+use Drupal\migrate\Plugin\migrate\source\TestSqlBase;
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+
+/**
+ * Tests the functionality of SqlBase.
+ *
+ * @group migrate
+ */
+class SqlBaseTest extends MigrateTestBase {
+
+  /**
+   * Tests different connection types.
+   */
+  public function testConnectionTypes() {
+    $sql_base = new TestSqlBase();
+
+    // Check the default values.
+    $sql_base->setConfiguration([]);
+    $this->assertIdentical($sql_base->getDatabase()->getTarget(), 'default');
+    $this->assertIdentical($sql_base->getDatabase()->getKey(), 'migrate');
+
+    $target = 'test_db_target';
+    $key = 'test_migrate_connection';
+    $config = array('target' => $target, 'key' => $key);
+    $sql_base->setConfiguration($config);
+    Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']);
+
+    // Validate we have injected our custom key and target.
+    $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target);
+    $this->assertIdentical($sql_base->getDatabase()->getKey(), $key);
+
+    // Now test we can have SqlBase create the connection from an info array.
+    $sql_base = new TestSqlBase();
+
+    $target = 'test_db_target2';
+    $key = 'test_migrate_connection2';
+    $database = Database::getConnectionInfo('default')['default'];
+    $config = array('target' => $target, 'key' => $key, 'database' => $database);
+    $sql_base->setConfiguration($config);
+
+    // Call getDatabase() to get the connection defined.
+    $sql_base->getDatabase();
+
+    // Validate the connection has been created with the right values.
+    $this->assertIdentical(Database::getConnectionInfo($key)[$target], $database);
+
+    // Now, test this all works when using state to store db info.
+    $target = 'test_state_db_target';
+    $key = 'test_state_migrate_connection';
+    $config = ['target' => $target, 'key' => $key];
+    $database_state_key = 'migrate_sql_base_test';
+    \Drupal::state()->set($database_state_key, $config);
+    $sql_base->setConfiguration(['database_state_key' => $database_state_key]);
+    Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']);
+
+    // Validate we have injected our custom key and target.
+    $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target);
+    $this->assertIdentical($sql_base->getDatabase()->getKey(), $key);
+
+    // Now test we can have SqlBase create the connection from an info array.
+    $sql_base = new TestSqlBase();
+
+    $target = 'test_state_db_target2';
+    $key = 'test_state_migrate_connection2';
+    $database = Database::getConnectionInfo('default')['default'];
+    $config = ['target' => $target, 'key' => $key, 'database' => $database];
+    $database_state_key = 'migrate_sql_base_test2';
+    \Drupal::state()->set($database_state_key, $config);
+    $sql_base->setConfiguration(['database_state_key' => $database_state_key]);
+
+    // Call getDatabase() to get the connection defined.
+    $sql_base->getDatabase();
+
+    // Validate the connection has been created with the right values.
+    $this->assertIdentical(Database::getConnectionInfo($key)[$target], $database);
+  }
+
+}
+
+namespace Drupal\migrate\Plugin\migrate\source;
+
+/**
+ * A dummy source to help with testing SqlBase.
+ *
+ * @package Drupal\migrate\Plugin\migrate\source
+ */
+class TestSqlBase extends SqlBase {
+
+  /**
+   * Overrides the constructor so we can create one easily.
+   */
+  public function __construct() {
+    $this->state = \Drupal::state();
+  }
+
+  /**
+   * Gets the database without caching it.
+   */
+  public function getDatabase() {
+    $this->database = NULL;
+    return parent::getDatabase();
+  }
+
+  /**
+   * Allows us to set the configuration from a test.
+   *
+   * @param array $config
+   *   The config array.
+   */
+  public function setConfiguration($config) {
+    $this->configuration = $config;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {}
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {}
+
+}
diff --git a/core/modules/migrate/tests/src/Unit/Entity/MigrationTest.php b/core/modules/migrate/tests/src/Unit/Entity/MigrationTest.php
deleted file mode 100644
index 73ab716..0000000
--- a/core/modules/migrate/tests/src/Unit/Entity/MigrationTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\migrate\Unit\Entity\MigrationTest.
- */
-
-namespace Drupal\Tests\migrate\Unit\Entity;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the migrate entity.
- *
- * @coversDefaultClass \Drupal\migrate\Entity\Migration
- * @group migrate
- */
-class MigrationTest extends UnitTestCase {
-
-  /**
-   * Tests Migration::getProcessPlugins()
-   *
-   * @covers ::getProcessPlugins
-   */
-  public function testGetProcessPlugins() {
-    $migration = new Migration([], 'migration');
-    $this->assertEquals([], $migration->getProcessPlugins([]));
-  }
-
-}
diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
index d0c1604..cbe62b7 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableMemoryExceededTest.php
@@ -17,7 +17,7 @@ class MigrateExecutableMemoryExceededTest extends MigrateTestCase {
   /**
    * The mocked migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $migration;
 
diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
index 8335e1f..bfc0fd0 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\migrate\Unit;
 
 use Drupal\Component\Utility\Html;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Row;
@@ -22,7 +22,7 @@ class MigrateExecutableTest extends MigrateTestCase {
   /**
    * The mocked migration entity.
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
    */
   protected $migration;
 
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index c071b15..65edd55 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -49,7 +49,7 @@ class MigrateSourceTest extends MigrateTestCase {
   /**
    * The migration entity.
    *
-   * @var \Drupal\migrate\Entity\Migration
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -371,7 +371,7 @@ public function testPrepareRowPrepareException() {
   /**
    * Gets a mock executable for the test.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    *
    * @return \Drupal\migrate\MigrateExecutable
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 48be830..5f57607 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\migrate\Unit;
 
 use Drupal\Core\Database\Driver\sqlite\Connection;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
diff --git a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
index c9e4a97..f5b6de3 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Database\Driver\sqlite\Connection;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -34,18 +34,18 @@
   /**
    * Local store for mocking setStatus()/getStatus().
    *
-   * @var \Drupal\migrate\Entity\MigrationInterface::STATUS_*
+   * @var \Drupal\migrate\Plugin\MigrationInterface::STATUS_*
    */
   protected $migrationStatus = MigrationInterface::STATUS_IDLE;
 
   /**
    * Retrieves a mocked migration.
    *
-   * @return \Drupal\migrate\Entity\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @return \Drupal\migrate\Plugin\MigrationInterface|\PHPUnit_Framework_MockObject_MockObject
    *   The mocked migration.
    */
   protected function getMigration() {
-    $this->migrationConfiguration += ['migrationClass' => 'Drupal\migrate\Entity\Migration'];
+    $this->migrationConfiguration += ['migrationClass' => 'Drupal\migrate\Plugin\Migration'];
     $this->idMap = $this->getMock('Drupal\migrate\Plugin\MigrateIdMapInterface');
 
     $this->idMap
@@ -83,9 +83,9 @@ protected function getMigration() {
 
     $configuration = &$this->migrationConfiguration;
 
-    $migration->method('get')
-      ->willReturnCallback(function ($argument) use (&$configuration) {
-        return isset($configuration[$argument]) ? $configuration[$argument] : '';
+    $migration->method('getHighWaterProperty')
+      ->willReturnCallback(function () use ($configuration) {
+        return isset($configuration['highWaterProperty']) ? $configuration['highWaterProperty'] : '';
       });
 
     $migration->method('set')
diff --git a/core/modules/migrate/tests/src/Unit/MigrationTest.php b/core/modules/migrate/tests/src/Unit/MigrationTest.php
index 2693dec..57ff64c 100644
--- a/core/modules/migrate/tests/src/Unit/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrationTest.php
@@ -7,16 +7,18 @@
 
 namespace Drupal\Tests\migrate\Unit;
 
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\migrate\Entity\Migration;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrateDestinationInterface;
 use Drupal\migrate\Plugin\MigrateSourceInterface;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Drupal\migrate\Plugin\RequirementsInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
- * @coversDefaultClass \Drupal\migrate\Entity\Migration
+ * @coversDefaultClass \Drupal\migrate\Plugin\Migration
+ *
  * @group Migration
  */
 class MigrationTest extends UnitTestCase {
@@ -84,16 +86,16 @@ public function testRequirementsForMigrations() {
     $migration->setSourcePlugin($source_plugin);
     $migration->setDestinationPlugin($destination_plugin);
 
-    $entity_manager = $this->getMock('Drupal\Core\Entity\EntityManagerInterface');
-    $migration->setEntityManager($entity_manager);
+    $plugin_manager = $this->getMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface');
+    $migration->setMigrationPluginManager($plugin_manager);
 
     // We setup the requirements that test_a doesn't exist and test_c is not
     // completed yet.
     $migration->setRequirements(['test_a', 'test_b', 'test_c', 'test_d']);
 
-    $migration_b = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
-    $migration_c = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
-    $migration_d = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
+    $migration_b = $this->getMock(MigrationInterface::class);
+    $migration_c = $this->getMock(MigrationInterface::class);
+    $migration_d = $this->getMock(MigrationInterface::class);
 
     $migration_b->expects($this->once())
       ->method('allRowsProcessed')
@@ -105,15 +107,10 @@ public function testRequirementsForMigrations() {
       ->method('allRowsProcessed')
       ->willReturn(TRUE);
 
-    $migration_storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
-    $migration_storage->expects($this->once())
-      ->method('loadMultiple')
+    $plugin_manager->expects($this->once())
+      ->method('createInstances')
       ->with(['test_a', 'test_b', 'test_c', 'test_d'])
       ->willReturn(['test_b' => $migration_b, 'test_c' => $migration_c, 'test_d' => $migration_d]);
-    $entity_manager->expects($this->once())
-      ->method('getStorage')
-      ->with('migration')
-      ->willReturn($migration_storage);
 
     $migration->checkRequirements();
   }
@@ -162,13 +159,13 @@ public function setDestinationPlugin(MigrateDestinationInterface $destination_pl
   }
 
   /**
-   * Sets the entity manager service.
+   * Sets the plugin manager service.
    *
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager service.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $plugin_manager
+   *   The plugin manager service.
    */
-  public function setEntityManager(EntityManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function setMigrationPluginManager(MigrationPluginManagerInterface $plugin_manager) {
+    $this->migrationPluginManager = $plugin_manager;
   }
 
 }
diff --git a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
index 6d511fa..d08e035 100644
--- a/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/Plugin/migrate/destination/EntityContentBaseTest.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Row;
@@ -26,7 +26,7 @@
 class EntityContentBaseTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
diff --git a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
index 936d00f..b7dc5ed 100644
--- a/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
+++ b/core/modules/migrate/tests/src/Unit/SqlBaseTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\migrate\Unit;
 
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\Tests\UnitTestCase;
 
@@ -61,7 +62,7 @@ public function testMapJoinable($expected_result, $id_map_is_sql, $with_id_map,
       ->willReturn($idmap_connection);
 
     // Setup a migration entity.
-    $migration = $this->getMock('Drupal\migrate\Entity\MigrationInterface');
+    $migration = $this->getMock(MigrationInterface::class);
     $migration->expects($with_id_map ? $this->once() : $this->never())
       ->method('getIdMap')
       ->willReturn($id_map_is_sql ? $sql : NULL);
diff --git a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index de730f4..309865b 100644
--- a/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -8,7 +8,7 @@
 namespace Drupal\Tests\migrate\Unit;
 
 use Drupal\Core\Database\Connection;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\id_map\Sql;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -29,7 +29,7 @@ class TestSqlIdMap extends Sql implements \Iterator {
    *   The plugin ID for the migration process to do.
    * @param mixed $plugin_definition
    *   The configuration for the plugin.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration to do.
    * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher service.
diff --git a/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php b/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
index f5e1c33..f990ccb 100644
--- a/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\Tests\migrate\Unit\destination;
 
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\Config;
 use Drupal\Tests\UnitTestCase;
 
@@ -23,7 +24,7 @@ public function testImport() {
     $source = array(
       'test' => 'x',
     );
-    $migration = $this->getMockBuilder('Drupal\migrate\Entity\Migration')
+    $migration = $this->getMockBuilder('Drupal\migrate\Plugin\Migration')
       ->disableOriginalConstructor()
       ->getMock();
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
@@ -73,7 +74,7 @@ public function testLanguageImport() {
     $source = array(
       'langcode' => 'mi',
     );
-    $migration = $this->getMockBuilder('Drupal\migrate\Entity\Migration')
+    $migration = $this->getMockBuilder(MigrationInterface::class)
       ->disableOriginalConstructor()
       ->getMock();
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
diff --git a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
index ec3d0f2..f1e288e 100644
--- a/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
+++ b/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityRevision as RealEntityRevision;
 use Drupal\migrate\Row;
 use Drupal\Tests\UnitTestCase;
@@ -22,7 +23,7 @@
 class EntityRevisionTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
@@ -45,7 +46,7 @@ protected function setUp() {
     parent::setUp();
 
     // Setup mocks to be used when creating a revision destination.
-    $this->migration = $this->prophesize('\Drupal\migrate\Entity\MigrationInterface');
+    $this->migration = $this->prophesize(MigrationInterface::class);
     $this->storage = $this->prophesize('\Drupal\Core\Entity\EntityStorageInterface');
     $this->entityManager = $this->prophesize('\Drupal\Core\Entity\EntityManagerInterface');
     $this->fieldTypeManager = $this->prophesize('\Drupal\Core\Field\FieldTypePluginManagerInterface');
diff --git a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
index 03d7bd9..65f62da 100644
--- a/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/MigrationTest.php
@@ -7,14 +7,13 @@
 
 namespace Drupal\Tests\migrate\Unit\process;
 
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\process\Migration;
-use Drupal\migrate\Plugin\migrate\source\SourcePluginBase;
 use Drupal\migrate\Plugin\MigrateDestinationInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Plugin\MigratePluginManager;
 use Drupal\migrate\Plugin\MigrateSourceInterface;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Prophecy\Argument;
 
 /**
@@ -27,26 +26,28 @@ class MigrationTest extends MigrateProcessTestCase {
    * @covers ::transform
    */
   public function testTransformWithStubSkipping() {
-    $migration_entity = $this->prophesize(MigrationInterface::class);
-    $migration_storage = $this->prophesize(EntityStorageInterface::class);
+    $migration_plugin = $this->prophesize(MigrationInterface::class);
+    $migration_plugin_manager = $this->prophesize(MigrationPluginManagerInterface::class);
     $process_plugin_manager = $this->prophesize(MigratePluginManager::class);
 
     $destination_id_map = $this->prophesize(MigrateIdMapInterface::class);
     $destination_migration = $this->prophesize(MigrationInterface::class);
     $destination_migration->getIdMap()->willReturn($destination_id_map->reveal());
-    $migration_storage->loadMultiple(['destination_migration'])
-      ->willReturn(['destination_migration' => $destination_migration->reveal()]);
     $destination_id_map->lookupDestinationId([1])->willReturn(NULL);
 
+    // Ensure the migration plugin manager returns our migration.
+    $migration_plugin_manager->createInstances(Argument::exact(['destination_migration']))
+      ->willReturn(['destination_migration' => $destination_migration->reveal()]);
+
     $configuration = [
       'no_stub' => TRUE,
       'migration' => 'destination_migration',
     ];
 
-    $migration_entity->id()->willReturn('actual_migration');
+    $migration_plugin->id()->willReturn('actual_migration');
     $destination_migration->getDestinationPlugin(TRUE)->shouldNotBeCalled();
 
-    $migration = new Migration($configuration, '', [], $migration_entity->reveal(), $migration_storage->reveal(), $process_plugin_manager->reveal());
+    $migration = new Migration($configuration, '', [], $migration_plugin->reveal(), $migration_plugin_manager->reveal(), $process_plugin_manager->reveal());
     $result = $migration->transform(1, $this->migrateExecutable, $this->row, '');
     $this->assertNull($result);
   }
@@ -55,27 +56,28 @@ public function testTransformWithStubSkipping() {
    * @covers ::transform
    */
   public function testTransformWithStubbing() {
-    $migration_entity = $this->prophesize(MigrationInterface::class);
-    $migration_storage = $this->prophesize(EntityStorageInterface::class);
+    $migration_plugin = $this->prophesize(MigrationInterface::class);
+    $migration_plugin_manager = $this->prophesize(MigrationPluginManagerInterface::class);
     $process_plugin_manager = $this->prophesize(MigratePluginManager::class);
 
     $destination_id_map = $this->prophesize(MigrateIdMapInterface::class);
-    $destination_migration = $this->prophesize(MigrationInterface::class);
+    $destination_migration = $this->prophesize('Drupal\migrate\Plugin\Migration');
     $destination_migration->getIdMap()->willReturn($destination_id_map->reveal());
-    $migration_storage->loadMultiple(['destination_migration'])
+    $migration_plugin_manager->createInstances(['destination_migration'])
       ->willReturn(['destination_migration' => $destination_migration->reveal()]);
     $destination_id_map->lookupDestinationId([1])->willReturn(NULL);
+    $destination_id_map->saveIdMapping(Argument::any(), Argument::any(), MigrateIdMapInterface::STATUS_NEEDS_UPDATE)->willReturn(NULL);
 
     $configuration = [
       'no_stub' => FALSE,
       'migration' => 'destination_migration',
     ];
 
-    $migration_entity->id()->willReturn('actual_migration');
+    $migration_plugin->id()->willReturn('actual_migration');
     $destination_migration->id()->willReturn('destination_migration');
     $destination_migration->getDestinationPlugin(TRUE)->shouldBeCalled();
-    $destination_migration->get('process')->willReturn([]);
-    $destination_migration->get('source')->willReturn([]);
+    $destination_migration->getProcess()->willReturn([]);
+    $destination_migration->getSourceConfiguration()->willReturn([]);
 
     $source_plugin = $this->prophesize(MigrateSourceInterface::class);
     $source_plugin->getIds()->willReturn(['nid']);
@@ -84,7 +86,7 @@ public function testTransformWithStubbing() {
     $destination_plugin->import(Argument::any())->willReturn([2]);
     $destination_migration->getDestinationPlugin(TRUE)->willReturn($destination_plugin->reveal());
 
-    $migration = new Migration($configuration, '', [], $migration_entity->reveal(), $migration_storage->reveal(), $process_plugin_manager->reveal());
+    $migration = new Migration($configuration, '', [], $migration_plugin->reveal(), $migration_plugin_manager->reveal(), $process_plugin_manager->reveal());
     $result = $migration->transform(1, $this->migrateExecutable, $this->row, '');
     $this->assertEquals(2, $result);
   }
diff --git a/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php b/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
index 3a0d08c..beea773 100644
--- a/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
+++ b/core/modules/migrate/tests/src/Unit/process/SkipOnEmptyTest.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Tests\migrate\Unit\process\SkipOnEmptyTest.
  */
 
-
 namespace Drupal\Tests\migrate\Unit\process;
 use Drupal\migrate\Plugin\migrate\process\SkipOnEmpty;
 
diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
deleted file mode 100644
index 96f5e65..0000000
--- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-# Schema for the migrate_drupal source plugins.
-
-migrate.source.variable:
-  type: migrate_source_sql
-  label: 'Variable'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        entity_type:
-          type: string
-          label: 'Entity type'
-        id:
-          type: string
-          label: 'ID'
-        label:
-          type: label
-          label: 'Label'
-        description:
-          type: text
-          label: 'Description'
-        path:
-          type: string
-          label: 'Path'
-        plugin:
-          type: string
-          label: 'Plugin'
-        status:
-          type: boolean
-          label: 'Status'
-        slash:
-          type: string
-          label: 'Slash'
-
-migrate.source.variable_multirow:
-  type: migrate_source_sql
-  label: 'Drupal variable multirow'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-
-migrate_entity_constant:
-  type: mapping
-  mapping:
-    entity_type:
-      type: string
-      label: 'Entity type'
-    bundle:
-      type: string
-      label: 'Bundle'
-    label:
-      type: label
-      label: 'Label'
-    id:
-      type: string
-      label: 'ID'
-    target_entity_type:
-      type: string
-      label: 'Target entity type'
-    view_mode:
-      type: string
-      label: 'View mode'
-    form_mode:
-      type: string
-      label: 'Form mode'
-    field_name:
-      type: string
-      label: 'Field name'
-    empty:
-      type: sequence
-      label: 'Empty'
-      sequence:
-        type: string
-        label: 'Empty'
-    name:
-      type: string
-      label: 'Name'
-    preview:
-      type: integer
-      label: 'Preview'
-    create_body:
-      type: boolean
-      label: 'create body'
-    required:
-      type: boolean
-      label: 'Required'
-    type:
-      type: string
-      label: 'Type'
-    cardinality:
-      type: integer
-      label: 'Cardinality'
-    parent:
-      type: integer
-      label: 'Parent'
-    langcode:
-      type: string
-      label: 'Language code'
-    third_party_settings:
-      type: sequence
-      label: 'Settings'
-      sequence:
-        type: ignore
-        label: 'Settings'
-    settings:
-      type: sequence
-      label: 'Settings'
-      sequence:
-        type: ignore
-        label: 'Settings'
-    options:
-      type: mapping
-      label: 'Options'
-      mapping:
-        label:
-          type: string
-          label: 'label'
-        type:
-          type: string
-          label: 'Type'
-        weight:
-          type: integer
-          label: 'Weight'
-        settings:
-          type: sequence
-          label: 'Settings'
-          sequence:
-            type: string
-            label: 'Settings'
-    selection_handler:
-      type: string
-      label: 'Entity reference selection handler'
-    auto_create:
-      type: boolean
-      label: 'Entity reference selection setting: Auto-create new entities'
-    status:
-      type: boolean
-      label: 'Status'
-
-migrate.source.md_empty:
-  type: migrate.source.empty
-  label: 'Empty source for migrate_drupal migrations'
-
-migrate.source.i18n_variable:
-  type: migrate_source_sql
-  label: 'i18n Variable'
-  mapping:
-    variables:
-      type: sequence
-      label: 'Variables'
-      sequence:
-        type: string
-        label: 'Variable'
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        entity_type:
-          type: string
-          label: 'Entity type'
-        id:
-          type: string
-          label: 'ID'
-        label:
-          type: label
-          label: 'Label'
-        description:
-          type: text
-          label: 'Description'
-        path:
-          type: string
-          label: 'Path'
-        plugin:
-          type: string
-          label: 'Plugin'
-        status:
-          type: boolean
-          label: 'Status'
-        slash:
-          type: string
-          label: 'Slash'
diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module
index f118954..dc3ab4e 100644
--- a/core/modules/migrate_drupal/migrate_drupal.module
+++ b/core/modules/migrate_drupal/migrate_drupal.module
@@ -5,7 +5,12 @@
  * Provides migration from other Drupal sites.
  */
 
+use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateMessage;
+use Drupal\migrate\Plugin\RequirementsInterface;
 
 /**
  * Implements hook_help().
@@ -19,3 +24,53 @@ function migrate_drupal_help($route_name, RouteMatchInterface $route_match) {
       return $output;
   }
 }
+
+/**
+ * Implements hook_migration_plugins_alter().
+ */
+function migrate_drupal_migration_plugins_alter(&$definitions) {
+  // This is why the deriver can't do this: the 'd6_taxonomy_vocabulary'
+  // definition is not available to the deriver as it is running inside
+  // getDefinitions().
+  if (isset($definitions['d6_taxonomy_vocabulary'])) {
+    $vocabulary_migration_definition = [
+      'source' => [
+        'ignore_map' => TRUE,
+        'plugin' => 'd6_taxonomy_vocabulary',
+      ],
+      'destination' => [
+        'plugin' => 'null',
+      ],
+    ];
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($vocabulary_migration_definition);
+
+    try {
+      $source_plugin = $vocabulary_migration->getSourcePlugin();
+      if ($source_plugin instanceof RequirementsInterface) {
+        $source_plugin->checkRequirements();
+      }
+      $executable = new MigrateExecutable($vocabulary_migration, new MigrateMessage());
+      $process = ['vid' => $definitions['d6_taxonomy_vocabulary']['process']['vid']];
+      foreach ($source_plugin as $row) {
+        $executable->processRow($row, $process);
+        $source_vid = $row->getSourceProperty('vid');
+        $plugin_ids = ['d6_term_node:' . $source_vid, 'd6_term_node_revision:' . $source_vid];
+        foreach ($plugin_ids as $plugin_id) {
+          if (isset($definitions[$plugin_id])) {
+            $definitions[$plugin_id]['process'][$row->getDestinationProperty('vid')] = 'tid';
+          }
+        }
+      }
+    }
+    catch (RequirementsException $e) {
+      // This code currently runs whenever the definitions are being loaded and
+      // if you have a Drupal 7 source site then the requirements will not be
+      // met for the d6_taxonomy_vocabulary migration.
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      // When the definitions are loaded it is possible the tables will not
+      // exist.
+    }
+
+  }
+}
diff --git a/core/modules/migrate_drupal/src/MigrationCreationTrait.php b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
new file mode 100644
index 0000000..8528ae7
--- /dev/null
+++ b/core/modules/migrate_drupal/src/MigrationCreationTrait.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\MigrationCreationTrait.
+ */
+
+namespace Drupal\migrate_drupal;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\RequirementsInterface;
+
+/**
+ * Creates the appropriate migrations for a given source Drupal database.
+ *
+ * @todo https://www.drupal.org/node/2682585 The trait no longer creates
+ *   migrations.
+ */
+trait MigrationCreationTrait {
+
+  /**
+   * Gets the database connection for the source Drupal database.
+   *
+   * @param array $database
+   *   Database array representing the source Drupal database.
+   *
+   * @return \Drupal\Core\Database\Connection
+   *   The database connection for the source Drupal database.
+   */
+  protected function getConnection(array $database) {
+    // Set up the connection.
+    Database::addConnectionInfo('upgrade', 'default', $database);
+    $connection = Database::getConnection('default', 'upgrade');
+    return $connection;
+  }
+
+  /**
+   * Gets the system data from the system table of the source Drupal database.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   Database connection to the source Drupal database.
+   *
+   * @return array
+   *   The system data from the system table of the source Drupal database.
+   */
+  protected function getSystemData(Connection $connection) {
+    $system_data = [];
+    try {
+      $results = $connection->select('system', 's', [
+        'fetch' => \PDO::FETCH_ASSOC,
+      ])
+        ->fields('s')
+        ->execute();
+      foreach ($results as $result) {
+        $system_data[$result['type']][$result['name']] = $result;
+      }
+    }
+    catch (\Exception $e) {
+      // The table might not exist for example in tests.
+    }
+    return $system_data;
+  }
+
+  /**
+   * Creates the necessary state entries for SqlBase::getDatabase() to work.
+   *
+   * The state entities created here have to exist before migration plugin
+   * instances are created so that derivers such as
+   * \Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver can access the source
+   * database.
+   *
+   * @param array $database
+   *   The source database settings.
+   * @param string $drupal_version
+   *   The Drupal version.
+   *
+   * @see \Drupal\migrate\Plugin\migrate\source\SqlBase::getDatabase()
+   */
+  protected function createDatabaseStateSettings(array $database, $drupal_version) {
+    $database_state['key'] = 'upgrade';
+    $database_state['database'] = $database;
+    $database_state_key = 'migrate_drupal_' . $drupal_version;
+    \Drupal::state()->set($database_state_key, $database_state);
+    \Drupal::state()->set('migrate.fallback_state_key', $database_state_key);
+  }
+
+  /**
+   * Gets the migrations for import.
+   *
+   * @param string $database_state_key
+   *   The state key.
+   * @param int $drupal_version
+   *   The version of Drupal we're getting the migrations for.
+   *
+   * @return \Drupal\migrate\Plugin\MigrationInterface[]
+   *   The migrations for import.
+   */
+  protected function getMigrations($database_state_key, $drupal_version) {
+    $version_tag = 'Drupal ' . $drupal_version;
+    $plugin_manager = \Drupal::service('plugin.manager.migration');
+    /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
+    $all_migrations = $plugin_manager->createInstancesByTag($version_tag);
+    $migrations = [];
+    foreach ($all_migrations as $migration) {
+      try {
+        // @todo https://drupal.org/node/2681867 We should be able to validate
+        //   the entire migration at this point.
+        $source_plugin = $migration->getSourcePlugin();
+        if ($source_plugin instanceof RequirementsInterface) {
+          $source_plugin->checkRequirements();
+        }
+        $destination_plugin = $migration->getDestinationPlugin();
+        if ($destination_plugin instanceof RequirementsInterface) {
+          $destination_plugin->checkRequirements();
+        }
+        $migrations[] = $migration;
+      }
+      catch (RequirementsException $e) {
+        // Migrations which are not applicable given the source and destination
+        // site configurations (e.g., what modules are enabled) will be silently
+        // ignored.
+      }
+    }
+
+    return $migrations;
+  }
+
+  /**
+   * Determines what version of Drupal the source database contains.
+   *
+   * @param \Drupal\Core\Database\Connection $connection
+   *   The database connection object.
+   *
+   * @return int|FALSE
+   *   An integer representing the major branch of Drupal core (e.g. '6' for
+   *   Drupal 6.x), or FALSE if no valid version is matched.
+   */
+  protected function getLegacyDrupalVersion(Connection $connection) {
+    // Don't assume because a table of that name exists, that it has the columns
+    // we're querying. Catch exceptions and report that the source database is
+    // not Drupal.
+    // Drupal 5/6/7 can be detected by the schema_version in the system table.
+    if ($connection->schema()->tableExists('system')) {
+      try {
+        $version_string = $connection
+          ->query('SELECT schema_version FROM {system} WHERE name = :module', [':module' => 'system'])
+          ->fetchField();
+        if ($version_string && $version_string[0] == '1') {
+          if ((int) $version_string >= 1000) {
+            $version_string = '5';
+          }
+          else {
+            $version_string = FALSE;
+          }
+        }
+      }
+      catch (\PDOException $e) {
+        $version_string = FALSE;
+      }
+    }
+    // For Drupal 8 (and we're predicting beyond) the schema version is in the
+    // key_value store.
+    elseif ($connection->schema()->tableExists('key_value')) {
+      $result = $connection
+        ->query("SELECT value FROM {key_value} WHERE collection = :system_schema  and name = :module", [':system_schema' => 'system.schema', ':module' => 'system'])
+        ->fetchField();
+      $version_string = unserialize($result);
+    }
+    else {
+      $version_string = FALSE;
+    }
+
+    return $version_string ? substr($version_string, 0, 1) : FALSE;
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
index dbe499d..b69c422 100644
--- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php
@@ -8,7 +8,7 @@
 namespace Drupal\migrate_drupal\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
@@ -19,7 +19,7 @@
   /**
    * Apply any custom processing to the field migration.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    */
   public function processField(MigrationInterface $migration);
@@ -27,7 +27,7 @@ public function processField(MigrationInterface $migration);
   /**
    * Apply any custom processing to the field instance migration.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    */
   public function processFieldInstance(MigrationInterface $migration);
@@ -35,7 +35,7 @@ public function processFieldInstance(MigrationInterface $migration);
   /**
    * Apply any custom processing to the field widget migration.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    */
   public function processFieldWidget(MigrationInterface $migration);
@@ -43,7 +43,7 @@ public function processFieldWidget(MigrationInterface $migration);
   /**
    * Apply any custom processing to the field formatter migration.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    */
   public function processFieldFormatter(MigrationInterface $migration);
@@ -69,7 +69,7 @@ public function getFieldWidgetMap();
   /**
    * Apply any custom processing to the cck bundle migrations.
    *
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration entity.
    * @param string $field_name
    *   The field name we're processing the value for.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
new file mode 100644
index 0000000..6f3ba30
--- /dev/null
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\CckMigration.
+ */
+
+namespace Drupal\migrate_drupal\Plugin\migrate;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\MigrateDestinationPluginManager;
+use Drupal\migrate\Plugin\MigratePluginManager;
+use Drupal\migrate\Plugin\Migration;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
+use Drupal\migrate\Plugin\RequirementsInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Migration plugin class for migrations dealing with CCK field values.
+ */
+class CckMigration extends Migration implements ContainerFactoryPluginInterface {
+
+  /**
+   * Flag indicating whether the CCK data has been filled already.
+   *
+   * @var bool
+   */
+  protected $init = FALSE;
+
+  /**
+   * List of cckfield plugin IDs which have already run.
+   *
+   * @var string[]
+   */
+  protected $processedFieldTypes = [];
+
+  /**
+   * Already-instantiated cckfield plugins, keyed by ID.
+   *
+   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface[]
+   */
+  protected $cckPluginCache;
+
+  /**
+   * Constructs a CckMigration.
+   *
+   * @param array $configuration
+   *   Plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $cck_manager
+   *   The cckfield plugin manager.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $migration_plugin_manager
+   *   The migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $source_plugin_manager
+   *   The source migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $process_plugin_manager
+   *   The process migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigrateDestinationPluginManager $destination_plugin_manager
+   *   The destination migration plugin manager.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $idmap_plugin_manager
+   *   The ID map migration plugin manager.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigratePluginManager $cck_manager, MigrationPluginManagerInterface $migration_plugin_manager, MigratePluginManager $source_plugin_manager, MigratePluginManager $process_plugin_manager, MigrateDestinationPluginManager $destination_plugin_manager, MigratePluginManager $idmap_plugin_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration_plugin_manager, $source_plugin_manager, $process_plugin_manager, $destination_plugin_manager, $idmap_plugin_manager);
+    $this->cckPluginManager = $cck_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.migrate.cckfield'),
+      $container->get('plugin.manager.migration'),
+      $container->get('plugin.manager.migrate.source'),
+      $container->get('plugin.manager.migrate.process'),
+      $container->get('plugin.manager.migrate.destination'),
+      $container->get('plugin.manager.migrate.id_map')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    if (!$this->init) {
+      $this->init = TRUE;
+      $source_plugin = $this->migrationPluginManager->createInstance($this->pluginId)->getSourcePlugin();
+      if ($source_plugin instanceof RequirementsInterface) {
+        try {
+          $source_plugin->checkRequirements();
+        }
+        catch (RequirementsException $e) {
+          // Kill the rest of the method.
+          $source_plugin = [];
+        }
+      }
+      foreach ($source_plugin as $row) {
+        $field_type = $row->getSourceProperty('type');
+        if (!isset($this->processedFieldTypes[$field_type]) && $this->cckPluginManager->hasDefinition($field_type)) {
+          $this->processedFieldTypes[$field_type] = TRUE;
+          // Allow the cckfield plugin to alter the migration as necessary so
+          // that it knows how to handle fields of this type.
+          if (!isset($this->cckPluginCache[$field_type])) {
+            $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $this);
+          }
+          call_user_func([$this->cckPluginCache[$field_type], $this->pluginDefinition['cck_plugin_method']], $this);
+        }
+      }
+    }
+    return parent::getProcess();
+  }
+
+}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php
deleted file mode 100644
index 50b1fcd..0000000
--- a/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder.
- */
-
-namespace Drupal\migrate_drupal\Plugin\migrate\builder;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-use Drupal\migrate\Plugin\MigratePluginManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Base class for builders which leverage cckfield plugins.
- */
-abstract class CckBuilder extends BuilderBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The cckfield plugin manager.
-   *
-   * @var \Drupal\migrate\Plugin\MigratePluginManager
-   */
-  protected $cckPluginManager;
-
-  /**
-   * Already-instantiated cckfield plugins, keyed by ID.
-   *
-   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface[]
-   */
-  protected $cckPluginCache = [];
-
-  /**
-   * Constructs a CckBuilder.
-   *
-   * @param array $configuration
-   *   Plugin configuration.
-   * @param string $plugin_id
-   *   The plugin ID.
-   * @param mixed $plugin_definition
-   *   The plugin definition.
-   * @param \Drupal\migrate\Plugin\MigratePluginManager $cck_manager
-   *   The cckfield plugin manager.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigratePluginManager $cck_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->cckPluginManager = $cck_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('plugin.manager.migrate.cckfield')
-    );
-  }
-
-  /**
-   * Gets a cckfield plugin instance.
-   *
-   * @param string $field_type
-   *   The field type (plugin ID).
-   * @param \Drupal\migrate\Entity\MigrationInterface|NULL $migration
-   *   The migration, if any.
-   *
-   * @return \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
-   *   The cckfield plugin instance.
-   */
-  protected function getCckPlugin($field_type, MigrationInterface $migration = NULL) {
-    if (empty($this->cckPluginCache[$field_type])) {
-      $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
-    }
-    return $this->cckPluginCache[$field_type];
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/builder/d6/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/builder/d6/CckMigration.php
deleted file mode 100644
index 30b739e..0000000
--- a/core/modules/migrate_drupal/src/Plugin/migrate/builder/d6/CckMigration.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\builder\d6\CckMigration.
- */
-
-namespace Drupal\migrate_drupal\Plugin\migrate\builder\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\RequirementsInterface;
-use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
-
-/**
- * @PluginID("d6_cck_migration")
- */
-class CckMigration extends CckBuilder {
-
-  /**
-   * List of cckfield plugin IDs which have already run.
-   *
-   * @var string[]
-   */
-  protected $processedFieldTypes = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migration = Migration::create($template);
-
-    $source_plugin = $migration->getSourcePlugin();
-    // The source plugin will throw RequirementsException if CCK is not enabled,
-    // in which case there is nothing else for us to do.
-    if ($source_plugin instanceof RequirementsInterface) {
-      try {
-        $source_plugin->checkRequirements();
-      }
-      catch (RequirementsException $e) {
-        return [$migration];
-      }
-    }
-
-    // Loop through every field that will be migrated.
-    foreach ($source_plugin as $field) {
-      $field_type = $field->getSourceProperty('type');
-
-      // Each field type should only be processed once.
-      if (in_array($field_type, $this->processedFieldTypes)) {
-        continue;
-      }
-      // Only process the current field type if a relevant cckfield plugin
-      // exists.
-      elseif ($this->cckPluginManager->hasDefinition($field_type)) {
-        $this->processedFieldTypes[] = $field_type;
-        // Allow the cckfield plugin to alter the migration as necessary so that
-        // it knows how to handle fields of this type.
-        $this->cckPluginManager
-          ->createInstance($field_type, [], $migration)
-          ->{$this->configuration['cck_plugin_method']}($migration);
-      }
-    }
-
-    return [$migration];
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
index 7667c7f..587f789 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\migrate_drupal\Plugin\migrate\cckfield;
 
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface;
 
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
index 50b004c..8756dd1 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/destination/EntityFieldStorageConfig.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\destination\EntityFieldStorageConfig as BaseEntityFieldStorageConfig;
 
 /**
@@ -38,7 +38,7 @@ class EntityFieldStorageConfig extends BaseEntityFieldStorageConfig {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param EntityStorageInterface $storage
    *   The storage for this entity type.
@@ -75,7 +75,7 @@ public function calculateDependencies() {
     $this->dependencies = parent::calculateDependencies();
     // Add a dependency on the module that provides the field type using the
     // source plugin configuration.
-    $source_configuration = $this->migration->get('source');
+    $source_configuration = $this->migration->getSourceConfiguration();
     if (isset($source_configuration['constants']['type'])) {
       $field_type = $this->fieldTypePluginManager->getDefinition($source_configuration['constants']['type']);
       $this->addDependency('module', $field_type['provider']);
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index bb7f452..75dd5d4 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Plugin\RequirementsInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
index 60a8843..33f73ed 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
@@ -10,7 +10,7 @@
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Core\Entity\DependencyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\source\EmptySource as BaseEmptySource;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
index 4273846..1c2ee2b 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/Variable.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 
 /**
  * Drupal variable source from database.
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
index ca51840..ec6cc28 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/i18nVariable.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
deleted file mode 100644
index bb24447..0000000
--- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\MigrateDrupalTestBase.
- */
-
-namespace Drupal\migrate_drupal\Tests;
-
-use Drupal\Core\Database\Database;
-use Drupal\migrate\Tests\MigrateTestBase;
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-
-/**
- * Base class for Drupal migration tests.
- */
-abstract class MigrateDrupalTestBase extends MigrateTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'field', 'migrate_drupal', 'options', 'file');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-    $this->installConfig(['migrate_drupal', 'system']);
-  }
-
-  /**
-   * Loads a database fixture into the source database connection.
-   *
-   * @param string $path
-   *   Path to the dump file.
-   */
-  protected function loadFixture($path) {
-    $default_db = Database::getConnection()->getKey();
-    Database::setActiveConnection($this->sourceDatabase->getKey());
-
-    if (substr($path, -3) == '.gz') {
-      $path = 'compress.zlib://' . $path;
-    }
-    require $path;
-
-    Database::setActiveConnection($default_db);
-  }
-
-  /**
-   * Turn all the migration templates for the specified drupal version into
-   * real migration entities so we can test them.
-   *
-   * @param string $version
-   *  Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
-   */
-  protected function installMigrations($version) {
-    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
-    $migrations = \Drupal::service('migrate.migration_builder')->createMigrations($migration_templates);
-    foreach ($migrations as $migration) {
-      try {
-        $migration->save();
-      }
-      catch (PluginNotFoundException $e) {
-        // Migrations requiring modules not enabled will throw an exception.
-        // Ignoring this exception is equivalent to placing config in the
-        // optional subdirectory - the migrations we require for the test will
-        // be successfully saved.
-      }
-    }
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
index 1e028bf..ef240ff 100644
--- a/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
+++ b/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
@@ -6,7 +6,7 @@
  */
 
 namespace Drupal\migrate_drupal\Tests;
-use Drupal\migrate\Entity\Migration;
+
 use Drupal\migrate\Row;
 
 /**
@@ -45,14 +45,13 @@ protected function performStubTest($entity_type_id) {
    */
   protected function createStub($entity_type_id) {
     // Create a dummy migration to pass to the destination plugin.
-    $config = [
-      'id' => 'dummy',
+    $definition = [
       'migration_tags' => ['Stub test'],
       'source' => ['plugin' => 'empty'],
       'process' => [],
       'destination' => ['plugin' => 'entity:' . $entity_type_id],
     ];
-    $migration = Migration::create($config);
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
     $destination_plugin = $migration->getDestinationPlugin(TRUE);
     $stub_row = new Row([], [], TRUE);
     $destination_ids = $destination_plugin->import($stub_row);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/CckMigrationBuilderTest.php b/core/modules/migrate_drupal/src/Tests/d6/CckMigrationBuilderTest.php
deleted file mode 100644
index fd51c17..0000000
--- a/core/modules/migrate_drupal/src/Tests/d6/CckMigrationBuilderTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\CckMigrationBuilderTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d6;
-
-use Drupal\Core\Database\Database;
-
-/**
- * @group migrate_drupal
- */
-class CckMigrationBuilderTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $database = Database::getConnection('default', 'migrate');
-    $database
-      ->update('system')
-      ->fields(array('status' => 0))
-      ->condition('name', 'content')
-      ->condition('type', 'module')
-      ->execute();
-    $database->schema()->dropTable('content_node_field');
-    $database->schema()->dropTable('content_node_field_instance');
-  }
-
-  /**
-   * Tests that the CckMigration builder performs a requirements check on the
-   * source plugin.
-   */
-  public function testRequirementCheck() {
-    $template = \Drupal::service('migrate.template_storage')
-      ->getTemplateByName('d6_field');
-    // Without the requirements check, this will throw a \PDOException because
-    // the CCK tables do not exist.
-    \Drupal::service('migrate.migration_builder')->createMigrations([$template]);
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php b/core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php
deleted file mode 100644
index 5420fec..0000000
--- a/core/modules/migrate_drupal/src/Tests/d6/EntityContentBaseTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\EntityContentBaseTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\user\Entity\User;
-
-/**
- * @group migrate_drupal
- */
-class EntityContentBaseTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['migrate_overwrite_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a field on the user entity so that we can test nested property
-    // overwrites.
-    // @see static::testOverwriteSelectedNestedProperty()
-    FieldStorageConfig::create([
-      'field_name' => 'signature',
-      'entity_type' => 'user',
-      'type' => 'text_long',
-    ])->save();
-
-    FieldConfig::create([
-      'field_name' => 'signature',
-      'entity_type' => 'user',
-      'bundle' => 'user',
-    ])->save();
-
-    User::create([
-      'uid' => 2,
-      'name' => 'Ford Prefect',
-      'mail' => 'ford.prefect@localhost',
-      'signature' => array(
-        array(
-          'value' => 'Bring a towel.',
-          'format' => 'filtered_html',
-        ),
-      ),
-      'init' => 'proto@zo.an',
-    ])->save();
-
-    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
-  }
-
-  /**
-   * Tests overwriting all mapped properties in the destination entity (default
-   * behavior).
-   */
-  public function testOverwriteAllMappedProperties() {
-    $this->executeMigration('d6_user');
-    /** @var \Drupal\user\UserInterface $account */
-    $account = User::load(2);
-    $this->assertIdentical('john.doe', $account->label());
-    $this->assertIdentical('john.doe@example.com', $account->getEmail());
-    $this->assertIdentical('doe@example.com', $account->getInitialEmail());
-  }
-
-  /**
-   * Tests overwriting selected properties in the destination entity, specified
-   * in the destination configuration.
-   */
-  public function testOverwriteProperties() {
-    // Execute the migration in migrate_overwrite_test, which documents how
-    // property overwrites work.
-    $this->executeMigration('users');
-
-    /** @var \Drupal\user\UserInterface $account */
-    $account = User::load(2);
-    $this->assertIdentical('john.doe', $account->label());
-    $this->assertIdentical('john.doe@example.com', $account->getEmail());
-    $this->assertIdentical('The answer is 42.', $account->signature->value);
-    // This value is not overwritten because it's not listed in
-    // overwrite_properties.
-    $this->assertIdentical('proto@zo.an', $account->getInitialEmail());
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
deleted file mode 100644
index 1d8f5f4..0000000
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase.
- */
-
-namespace Drupal\migrate_drupal\Tests\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-
-/**
- * Base class for Drupal 6 migration tests.
- */
-abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'datetime',
-    'filter',
-    'image',
-    'link',
-    'node',
-    'options',
-    'telephone',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->loadFixture( __DIR__ . '/../../../tests/fixtures/drupal6.php');
-    $this->installMigrations('Drupal 6');
-  }
-
-  /**
-   * Executes all user migrations.
-   *
-   * @param bool $include_pictures
-   *   If TRUE, migrates user pictures.
-   */
-  protected function migrateUsers($include_pictures = TRUE) {
-    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
-
-    if ($include_pictures) {
-      $this->installEntitySchema('file');
-      $this->executeMigrations([
-        'd6_file',
-        'd6_user_picture_file',
-        'user_picture_field',
-        'user_picture_field_instance',
-        'user_picture_entity_display',
-        'user_picture_entity_form_display',
-      ]);
-    }
-    else {
-      // These are optional dependencies of d6_user, but we don't need them if
-      // we're not migrating user pictures.
-      Migration::load('d6_user_picture_file')->delete();
-      Migration::load('user_picture_entity_display')->delete();
-      Migration::load('user_picture_entity_form_display')->delete();
-    }
-
-    $this->executeMigration('d6_user');
-  }
-
-  /**
-   * Migrates node types.
-   */
-  protected function migrateContentTypes() {
-    $this->installConfig(['node']);
-    $this->executeMigration('d6_node_type');
-  }
-
-  /**
-   * Executes all field migrations.
-   */
-  protected function migrateFields() {
-    $this->migrateContentTypes();
-    $this->executeMigrations([
-      'd6_field',
-      'd6_field_instance',
-      'd6_field_instance_widget_settings',
-      'd6_view_modes',
-      'd6_field_formatter_settings',
-      'd6_upload_field',
-      'd6_upload_field_instance',
-    ]);
-  }
-
-  /**
-   * Executes all content migrations.
-   *
-   * @param bool $include_revisions
-   *   If TRUE, migrates node revisions.
-   */
-  protected function migrateContent($include_revisions = FALSE) {
-    $this->migrateUsers(FALSE);
-    $this->migrateFields();
-
-    $this->installEntitySchema('node');
-    $this->executeMigrations(['d6_node_settings', 'd6_node:*']);
-
-    if ($include_revisions) {
-      $this->executeMigrations(['d6_node_revision:*']);
-    }
-  }
-
-  /**
-   * Executes all taxonomy migrations.
-   */
-  protected function migrateTaxonomy() {
-    $this->migrateContentTypes();
-    $this->installEntitySchema('taxonomy_term');
-    $this->executeMigrations([
-      'd6_taxonomy_vocabulary',
-      'd6_vocabulary_field',
-      'd6_vocabulary_field_instance',
-      'd6_vocabulary_entity_display',
-      'd6_vocabulary_entity_form_display',
-      'd6_taxonomy_term',
-    ]);
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
deleted file mode 100644
index 63e8e67..0000000
--- a/core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase.
- */
-
-namespace Drupal\migrate_drupal\Tests\d7;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-
-/**
- * Base class for Drupal 7 migration tests.
- */
-abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->loadFixture(__DIR__ . '/../../../tests/fixtures/drupal7.php');
-    $this->installMigrations('Drupal 7');
-  }
-
-}
diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
deleted file mode 100644
index 028fb90..0000000
--- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\migrate_drupal\Tests\dependencies\MigrateDependenciesTest.
- */
-
-namespace Drupal\migrate_drupal\Tests\dependencies;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Ensure the consistency among the dependencies for migrate.
- *
- * @group migrate_drupal
- */
-class MigrateDependenciesTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['aggregator', 'comment'];
-
-  /**
-   * Tests that the order is correct when loading several migrations.
-   */
-  public function testMigrateDependenciesOrder() {
-    $migration_items = array('d6_comment', 'd6_filter_format', 'd6_node__page');
-    $migrations = Migration::loadMultiple($migration_items);
-    $expected_order = array('d6_filter_format', 'd6_node__page', 'd6_comment');
-    $this->assertIdentical(array_keys($migrations), $expected_order);
-    $expected_requirements = array(
-      // d6_comment depends on d6_node:*, which the storage controller expands
-      // into every variant of d6_node created by the MigrationBuilder.
-      'd6_node__article',
-      'd6_node__company',
-      'd6_node__employee',
-      'd6_node__event',
-      'd6_node__page',
-      'd6_node__sponsor',
-      'd6_node__story',
-      'd6_node__test_event',
-      'd6_node__test_page',
-      'd6_node__test_planet',
-      'd6_node__test_story',
-      'd6_node_type',
-      'd6_node_settings',
-      'd6_filter_format',
-      'd6_user',
-      'd6_comment_type',
-      'd6_comment_entity_display',
-      'd6_comment_entity_form_display',
-    );
-    // Migration dependencies for comment include dependencies for node
-    // migration as well.
-    $actual_requirements = $migrations['d6_comment']->get('requirements');
-    $this->assertIdentical(count($actual_requirements), count($expected_requirements));
-    foreach ($expected_requirements as $requirement) {
-      $this->assertIdentical($actual_requirements[$requirement], $requirement);
-    }
-  }
-
-  /**
-   * Tests dependencies on the migration of aggregator feeds & items.
-   */
-  public function testAggregatorMigrateDependencies() {
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $migration = Migration::load('d6_aggregator_item');
-    $executable = new MigrateExecutable($migration, $this);
-    $this->startCollectingMessages();
-    $executable->import();
-    $this->assertEqual($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
-    $this->collectMessages = FALSE;
-  }
-
-}
diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 8f88300..1ca67a5 100644
--- a/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -8038,7363 +8038,18620 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->schema()->createTable('imagecache_action', array(
-  'fields' => array(
-    'actionid' => array(
-      'type' => 'serial',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'presetid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'weight' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'module' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-    ),
-    'action' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-    ),
-    'data' => array(
-      'type' => 'text',
-      'not null' => TRUE,
-      'size' => 'normal',
-    ),
-  ),
-  'primary key' => array(
-    'actionid',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('imagecache_action')
+$connection->insert('history')
 ->fields(array(
-  'actionid',
-  'presetid',
-  'weight',
-  'module',
-  'action',
-  'data',
-))
-->values(array(
-  'actionid' => '3',
-  'presetid' => '1',
-  'weight' => '0',
-  'module' => 'imagecache',
-  'action' => 'imagecache_scale_and_crop',
-  'data' => 'a:2:{s:5:"width";s:4:"100%";s:6:"height";s:4:"100%";}',
-))
-->values(array(
-  'actionid' => '4',
-  'presetid' => '2',
-  'weight' => '0',
-  'module' => 'imagecache',
-  'action' => 'imagecache_crop',
-  'data' => 'a:4:{s:5:"width";s:3:"555";s:6:"height";s:4:"5555";s:7:"xoffset";s:6:"center";s:7:"yoffset";s:6:"center";}',
+  'uid',
+  'nid',
+  'timestamp',
 ))
 ->values(array(
-  'actionid' => '5',
-  'presetid' => '2',
-  'weight' => '0',
-  'module' => 'imagecache',
-  'action' => 'imagecache_resize',
-  'data' => 'a:2:{s:5:"width";s:3:"55%";s:6:"height";s:3:"55%";}',
+  'uid' => '1',
+  'nid' => '3',
+  'timestamp' => '1457654737',
 ))
 ->values(array(
-  'actionid' => '6',
-  'presetid' => '2',
-  'weight' => '0',
-  'module' => 'imagecache',
-  'action' => 'imagecache_rotate',
-  'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}',
+  'uid' => '1',
+  'nid' => '9',
+  'timestamp' => '1457655127',
 ))
 ->execute();
 
-$connection->schema()->createTable('imagecache_preset', array(
+$connection->schema()->createTable('i18n_blocks', array(
   'fields' => array(
-    'presetid' => array(
+    'ibid' => array(
       'type' => 'serial',
       'not null' => TRUE,
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'presetname' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-    ),
-  ),
-  'primary key' => array(
-    'presetid',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('imagecache_preset')
-->fields(array(
-  'presetid',
-  'presetname',
-))
-->values(array(
-  'presetid' => '1',
-  'presetname' => 'slackjaw_boys',
-))
-->values(array(
-  'presetid' => '2',
-  'presetname' => 'big_blue_cheese',
-))
-->execute();
-
-$connection->schema()->createTable('languages', array(
-  'fields' => array(
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => '',
-    ),
-    'name' => array(
+    'module' => array(
       'type' => 'varchar',
       'not null' => TRUE,
       'length' => '64',
-      'default' => '',
     ),
-    'native' => array(
+    'delta' => array(
       'type' => 'varchar',
       'not null' => TRUE,
-      'length' => '64',
-      'default' => '',
-    ),
-    'direction' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'enabled' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'plurals' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
+      'length' => '32',
       'default' => '0',
     ),
-    'formula' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'domain' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'prefix' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'weight' => array(
+    'type' => array(
       'type' => 'int',
       'not null' => TRUE,
       'size' => 'normal',
       'default' => '0',
     ),
-    'javascript' => array(
+    'language' => array(
       'type' => 'varchar',
       'not null' => TRUE,
-      'length' => '32',
+      'length' => '12',
       'default' => '',
     ),
   ),
   'primary key' => array(
-    'language',
-  ),
-  'indexes' => array(
-    'list' => array(
-      'weight',
-      'name',
-    ),
+    'ibid',
   ),
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('languages')
-->fields(array(
-  'language',
-  'name',
-  'native',
-  'direction',
-  'enabled',
-  'plurals',
-  'formula',
-  'domain',
-  'prefix',
-  'weight',
-  'javascript',
-))
-->values(array(
-  'language' => 'en',
-  'name' => 'English',
-  'native' => 'English',
-  'direction' => '0',
-  'enabled' => '1',
-  'plurals' => '0',
-  'formula' => '',
-  'domain' => '',
-  'prefix' => '',
-  'weight' => '0',
-  'javascript' => '',
-))
-->values(array(
-  'language' => 'fr',
-  'name' => 'French',
-  'native' => 'Français',
-  'direction' => '0',
-  'enabled' => '1',
-  'plurals' => '2',
-  'formula' => '($n>1)',
-  'domain' => '',
-  'prefix' => 'fr',
-  'weight' => '0',
-  'javascript' => '',
-))
-->execute();
-
-$connection->schema()->createTable('locales_source', array(
+$connection->schema()->createTable('i18n_strings', array(
   'fields' => array(
     'lid' => array(
-      'type' => 'serial',
+      'type' => 'int',
       'not null' => TRUE,
       'size' => 'normal',
+      'default' => '0',
     ),
-    'location' => array(
+    'objectid' => array(
       'type' => 'varchar',
       'not null' => TRUE,
       'length' => '255',
       'default' => '',
     ),
-    'textgroup' => array(
+    'type' => array(
       'type' => 'varchar',
       'not null' => TRUE,
       'length' => '255',
-      'default' => 'default',
+      'default' => '',
     ),
-    'source' => array(
-      'type' => 'blob',
+    'property' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'objectindex' => array(
+      'type' => 'int',
       'not null' => TRUE,
       'size' => 'normal',
+      'default' => '0',
     ),
-    'version' => array(
-      'type' => 'varchar',
+    'format' => array(
+      'type' => 'int',
       'not null' => TRUE,
-      'length' => '20',
-      'default' => 'none',
+      'size' => 'normal',
+      'default' => '0',
     ),
   ),
   'primary key' => array(
     'lid',
   ),
-  'indexes' => array(
-    'source' => array(
-      array(
-        'source',
-        '30',
-      ),
-    ),
-  ),
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('locales_source')
+$connection->insert('i18n_strings')
 ->fields(array(
   'lid',
-  'location',
-  'textgroup',
-  'source',
-  'version',
+  'objectid',
+  'type',
+  'property',
+  'objectindex',
+  'format',
 ))
 ->values(array(
-  'lid' => '1',
-  'location' => 'misc/drupal.js',
-  'textgroup' => 'default',
-  'source' => 'Unspecified error',
-  'version' => 'none',
+  'lid' => '504',
+  'objectid' => 'profile_color',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '2',
-  'location' => 'misc/drupal.js',
-  'textgroup' => 'default',
-  'source' => 'An error occurred. \n@uri\n@text',
-  'version' => 'none',
+  'lid' => '505',
+  'objectid' => 'profile_color',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '3',
-  'location' => 'misc/drupal.js',
-  'textgroup' => 'default',
-  'source' => 'An error occurred. \n@uri\n(no information available).',
-  'version' => 'none',
+  'lid' => '506',
+  'objectid' => '',
+  'type' => 'category',
+  'property' => '',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '4',
-  'location' => 'misc/drupal.js',
-  'textgroup' => 'default',
-  'source' => 'An HTTP error @status occurred. \n@uri',
-  'version' => 'none',
+  'lid' => '507',
+  'objectid' => 'profile_biography',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '5',
-  'location' => 'content.module:21',
-  'textgroup' => 'default',
-  'source' => 'The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)',
-  'version' => 'none',
+  'lid' => '508',
+  'objectid' => 'profile_biography',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '6',
-  'location' => 'content.module:22',
-  'textgroup' => 'default',
-  'source' => 'When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.',
-  'version' => 'none',
+  'lid' => '509',
+  'objectid' => 'profile_sell_address',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '7',
-  'location' => 'content.module:23',
-  'textgroup' => 'default',
-  'source' => 'Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:',
-  'version' => 'none',
+  'lid' => '510',
+  'objectid' => 'profile_sell_address',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '8',
-  'location' => 'content.module:25',
-  'textgroup' => 'default',
-  'source' => '<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.',
-  'version' => 'none',
+  'lid' => '511',
+  'objectid' => '',
+  'type' => 'category',
+  'property' => '',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '9',
-  'location' => 'content.module:26',
-  'textgroup' => 'default',
-  'source' => "<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.",
-  'version' => 'none',
+  'lid' => '512',
+  'objectid' => 'profile_sold_to',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '10',
-  'location' => 'content.module:27',
-  'textgroup' => 'default',
-  'source' => '<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).',
-  'version' => 'none',
+  'lid' => '513',
+  'objectid' => 'profile_sold_to',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '11',
-  'location' => 'content.module:28',
-  'textgroup' => 'default',
-  'source' => "<em>userreference</em>, which creates custom references to your sites' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site's users and posts. To track user involvement in a post beyond Drupal's standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named \"Edited by\" to a content type to store a link to an editor's user account page.",
-  'version' => 'none',
+  'lid' => '514',
+  'objectid' => 'profile_sold_to',
+  'type' => 'field',
+  'property' => 'options',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '12',
-  'location' => 'content.module:29',
-  'textgroup' => 'default',
-  'source' => '<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.',
-  'version' => 'none',
+  'lid' => '515',
+  'objectid' => '',
+  'type' => 'category',
+  'property' => '',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '13',
-  'location' => 'content.module:31',
-  'textgroup' => 'default',
-  'source' => 'For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.',
-  'version' => 'none',
+  'lid' => '516',
+  'objectid' => 'profile_bands',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '14',
-  'location' => 'theme/theme.inc:111',
-  'textgroup' => 'default',
-  'source' => "Configure how this content type's fields and field labels should be displayed when it's viewed in teaser and full-page mode.",
-  'version' => 'none',
+  'lid' => '517',
+  'objectid' => 'profile_bands',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '15',
-  'location' => 'theme/theme.inc:114',
-  'textgroup' => 'default',
-  'source' => "Configure how this content type's fields should be displayed when it's rendered in the following contexts.",
-  'version' => 'none',
+  'lid' => '518',
+  'objectid' => 'profile_birthdate',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '16',
-  'location' => 'content.module:48',
-  'textgroup' => 'default',
-  'source' => 'Control the order of fields in the input form.',
-  'version' => 'none',
+  'lid' => '519',
+  'objectid' => 'profile_birthdate',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '17',
-  'location' => 'content.module:486,  modules/content_multigroup/content_multigroup.module:1422',
-  'textgroup' => 'default',
-  'source' => 'This field is required.',
-  'version' => 'none',
+  'lid' => '520',
+  'objectid' => 'profile_love_migrations',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '18',
-  'location' => 'content.module:490',
-  'textgroup' => 'default',
-  'source' => '!title: !required',
-  'version' => 'none',
+  'lid' => '521',
+  'objectid' => 'profile_love_migrations',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '19',
-  'location' => 'content.module:493,  modules/content_multigroup/content_multigroup.module:1434',
-  'textgroup' => 'default',
-  'source' => 'Order',
-  'version' => 'none',
+  'lid' => '522',
+  'objectid' => 'profile_blog',
+  'type' => 'field',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '20',
-  'location' => 'content.module:1640',
-  'textgroup' => 'default',
-  'source' => 'RSS Item',
-  'version' => 'none',
+  'lid' => '523',
+  'objectid' => 'profile_blog',
+  'type' => 'field',
+  'property' => 'explanation',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '21',
-  'location' => 'content.module:1897',
-  'textgroup' => 'default',
-  'source' => 'Search Index',
-  'version' => 'none',
+  'lid' => '524',
+  'objectid' => '1',
+  'type' => 'block',
+  'property' => 'title',
+  'objectindex' => '1',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '22',
-  'location' => 'content.module:1901',
-  'textgroup' => 'default',
-  'source' => 'Search Result',
-  'version' => 'none',
+  'lid' => '525',
+  'objectid' => '1',
+  'type' => 'block',
+  'property' => 'body',
+  'objectindex' => '1',
+  'format' => '2',
 ))
 ->values(array(
-  'lid' => '23',
-  'location' => 'content.module:2363',
-  'textgroup' => 'default',
-  'source' => 'Language',
-  'version' => 'none',
+  'lid' => '526',
+  'objectid' => '2',
+  'type' => 'block',
+  'property' => 'title',
+  'objectindex' => '2',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '24',
-  'location' => 'content.module:2377',
-  'textgroup' => 'default',
-  'source' => 'Taxonomy',
-  'version' => 'none',
+  'lid' => '527',
+  'objectid' => '2',
+  'type' => 'block',
+  'property' => 'body',
+  'objectindex' => '2',
+  'format' => '2',
 ))
 ->values(array(
-  'lid' => '25',
-  'location' => 'content.module:2408',
-  'textgroup' => 'default',
-  'source' => 'File attachments',
-  'version' => 'none',
+  'lid' => '528',
+  'objectid' => '4',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '4',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '26',
-  'location' => 'content.module:600',
-  'textgroup' => 'default',
-  'source' => 'Updating field type %type with module %module.',
-  'version' => 'none',
+  'lid' => '529',
+  'objectid' => '1',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '1',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '27',
-  'location' => 'content.module:607',
-  'textgroup' => 'default',
-  'source' => 'Updating widget type %type with module %module.',
-  'version' => 'none',
+  'lid' => '530',
+  'objectid' => '2',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '2',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '28',
-  'location' => 'content.module:63',
-  'textgroup' => 'default',
-  'source' => 'Use PHP input for field settings (dangerous - grant with care)',
-  'version' => 'none',
+  'lid' => '531',
+  'objectid' => '3',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '3',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '29',
-  'location' => 'content.module:104',
-  'textgroup' => 'default',
-  'source' => 'Manage fields',
-  'version' => 'none',
+  'lid' => '532',
+  'objectid' => '5',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '5',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '30',
-  'location' => 'content.module:113',
-  'textgroup' => 'default',
-  'source' => 'Display fields',
-  'version' => 'none',
+  'lid' => '533',
+  'objectid' => 'article',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '31',
-  'location' => 'content.module:143',
-  'textgroup' => 'default',
-  'source' => 'General',
-  'version' => 'none',
+  'lid' => '534',
+  'objectid' => 'article',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '32',
-  'location' => 'content.module:149',
-  'textgroup' => 'default',
-  'source' => 'Advanced',
-  'version' => 'none',
+  'lid' => '535',
+  'objectid' => 'article',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '33',
-  'location' => 'content.module:144',
-  'textgroup' => 'default',
-  'source' => 'Remove field',
-  'version' => 'none',
+  'lid' => '536',
+  'objectid' => 'article',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '34',
-  'location' => 'content.info:0,  includes/content.rules.inc:19;200,  includes/views/content.views.inc:178;254',
-  'textgroup' => 'default',
-  'source' => 'Content',
-  'version' => 'none',
+  'lid' => '537',
+  'objectid' => 'company',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '35',
-  'location' => 'content.info:0',
-  'textgroup' => 'default',
-  'source' => 'Allows administrators to define new content types.',
-  'version' => 'none',
+  'lid' => '538',
+  'objectid' => 'company',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '36',
-  'location' => 'content.info:0,  modules/content_copy/content_copy.info:0,  modules/content_multigroup/content_multigroup.info:0,  modules/content_permissions/content_permissions.info:0',
-  'textgroup' => 'default',
-  'source' => 'CCK',
-  'version' => 'none',
+  'lid' => '539',
+  'objectid' => 'company',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '37',
-  'location' => 'modules/text/text.module:41,  modules/text/text.info:0',
-  'textgroup' => 'default',
-  'source' => 'Text',
-  'version' => 'none',
+  'lid' => '540',
+  'objectid' => 'company',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '38',
-  'location' => 'examples/example_field.php:178',
-  'textgroup' => 'default',
-  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database and it must match the field storage type, %type. The label is optional and the key will be used as the label if no label is specified.',
-  'version' => 'none',
+  'lid' => '541',
+  'objectid' => 'employee',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '39',
-  'location' => 'examples/example_field.php:484',
-  'textgroup' => 'default',
-  'source' => 'Text area',
-  'version' => 'none',
+  'lid' => '542',
+  'objectid' => 'employee',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '40',
-  'location' => 'includes/content.admin.inc:148;164;790,  modules/fieldgroup/fieldgroup.module:236',
-  'textgroup' => 'default',
-  'source' => 'Remove',
-  'version' => 'none',
+  'lid' => '543',
+  'objectid' => 'employee',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '41',
-  'location' => 'content.module:1868',
-  'textgroup' => 'default',
-  'source' => 'Basic',
-  'version' => 'none',
+  'lid' => '544',
+  'objectid' => 'employee',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '42',
-  'location' => 'content.module:1635 modules/nodereference/nodereference.module:215',
-  'textgroup' => 'default',
-  'source' => 'Teaser',
-  'version' => 'none',
+  'lid' => '545',
+  'objectid' => 'sponsor',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '43',
-  'location' => 'content.module:1636 modules/nodereference/nodereference.module:210',
-  'textgroup' => 'default',
-  'source' => 'Full node',
-  'version' => 'none',
+  'lid' => '546',
+  'objectid' => 'sponsor',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '44',
-  'location' => 'content.module:1881;1884',
-  'textgroup' => 'default',
-  'source' => 'RSS',
-  'version' => 'none',
+  'lid' => '547',
+  'objectid' => 'sponsor',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '45',
-  'location' => 'content.module:1894',
-  'textgroup' => 'default',
-  'source' => 'Search',
-  'version' => 'none',
+  'lid' => '548',
+  'objectid' => 'sponsor',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '46',
-  'location' => 'content.module:2349;2356',
-  'textgroup' => 'default',
-  'source' => 'Node module form.',
-  'version' => 'none',
+  'lid' => '549',
+  'objectid' => 'story',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '47',
-  'location' => 'content.module:2364',
-  'textgroup' => 'default',
-  'source' => 'Locale module form.',
-  'version' => 'none',
+  'lid' => '550',
+  'objectid' => 'story',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '48',
-  'location' => 'content.module:2370',
-  'textgroup' => 'default',
-  'source' => 'Menu settings',
-  'version' => 'none',
+  'lid' => '551',
+  'objectid' => 'story',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '49',
-  'location' => 'content.module:2371',
-  'textgroup' => 'default',
-  'source' => 'Menu module form.',
-  'version' => 'none',
+  'lid' => '552',
+  'objectid' => 'story',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '50',
-  'location' => 'content.module:2378',
-  'textgroup' => 'default',
-  'source' => 'Taxonomy module form.',
-  'version' => 'none',
+  'lid' => '553',
+  'objectid' => 'test_event',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '51',
-  'location' => 'content.module:2384',
-  'textgroup' => 'default',
-  'source' => 'Book',
-  'version' => 'none',
+  'lid' => '554',
+  'objectid' => 'test_event',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '52',
-  'location' => 'content.module:2385',
-  'textgroup' => 'default',
-  'source' => 'Book module form.',
-  'version' => 'none',
+  'lid' => '555',
+  'objectid' => 'test_event',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '53',
-  'location' => 'content.module:2391',
-  'textgroup' => 'default',
-  'source' => 'Poll title',
-  'version' => 'none',
+  'lid' => '556',
+  'objectid' => 'test_event',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '54',
-  'location' => 'content.module:2392',
-  'textgroup' => 'default',
-  'source' => 'Poll module title.',
-  'version' => 'none',
+  'lid' => '558',
+  'objectid' => 'test_page',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '55',
-  'location' => 'content.module:2396',
-  'textgroup' => 'default',
-  'source' => 'Poll choices',
-  'version' => 'none',
+  'lid' => '559',
+  'objectid' => 'test_page',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '56',
-  'location' => 'content.module:2397',
-  'textgroup' => 'default',
-  'source' => 'Poll module choices.',
-  'version' => 'none',
+  'lid' => '560',
+  'objectid' => 'test_page',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '57',
-  'location' => 'content.module:2401',
-  'textgroup' => 'default',
-  'source' => 'Poll settings',
-  'version' => 'none',
+  'lid' => '561',
+  'objectid' => 'test_page',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '58',
-  'location' => 'content.module:2402',
-  'textgroup' => 'default',
-  'source' => 'Poll module settings.',
-  'version' => 'none',
+  'lid' => '562',
+  'objectid' => 'test_planet',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '59',
-  'location' => 'content.module:2409',
-  'textgroup' => 'default',
-  'source' => 'Upload module form.',
-  'version' => 'none',
+  'lid' => '563',
+  'objectid' => 'test_planet',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '60',
-  'location' => 'content.module:557;564;0 includes/content.crud.inc:591;629',
-  'textgroup' => 'default',
-  'source' => 'content',
-  'version' => 'none',
+  'lid' => '564',
+  'objectid' => 'test_planet',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '61',
-  'location' => 'content.module:103 modules/content_copy/content_copy.module:125',
-  'textgroup' => 'default',
-  'source' => 'Fields',
-  'version' => 'none',
+  'lid' => '565',
+  'objectid' => 'test_planet',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '62',
-  'location' => 'content.install:236',
-  'textgroup' => 'default',
-  'source' => "Updates for CCK-related modules are not run until the modules are enabled on the <a href=\"@admin-modules-path\">administer modules page</a>. When you enable them, you'll need to return to <a href=\"@update-php\">update.php</a> and run the remaining updates.",
-  'version' => 'none',
+  'lid' => '566',
+  'objectid' => 'test_story',
+  'type' => 'type',
+  'property' => 'name',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '63',
-  'location' => 'content.install:239',
-  'textgroup' => 'default',
-  'source' => '!module.module has updates but cannot be updated because content.module is not enabled.<br />If and when content.module is enabled, you will need to re-run the update script. You will continue to see this message until the module is enabled and updates are run.',
-  'version' => 'none',
+  'lid' => '567',
+  'objectid' => 'test_story',
+  'type' => 'type',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '64',
-  'location' => 'content.install:244',
-  'textgroup' => 'default',
-  'source' => '!module.module has updates and is available in the modules folder but is not enabled.<br />If and when it is enabled, you will need to re-run the update script. You will continue to see this message until the module is enabled and updates are run.',
-  'version' => 'none',
+  'lid' => '568',
+  'objectid' => 'test_story',
+  'type' => 'type',
+  'property' => 'body',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '65',
-  'location' => 'content.install:251',
-  'textgroup' => 'default',
-  'source' => 'Some updates are still pending. Please return to <a href="@update-php">update.php</a> and run the remaining updates.',
-  'version' => 'none',
+  'lid' => '569',
+  'objectid' => 'test_story',
+  'type' => 'type',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '66',
-  'location' => '(duplicate) content.install:10',
-  'textgroup' => 'default',
-  'source' => 'CCK - No Views integration',
-  'version' => 'none',
+  'lid' => '570',
+  'objectid' => 'story-field_test_exclude_unset',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '67',
-  'location' => '(duplicate) content.install:11',
-  'textgroup' => 'default',
-  'source' => 'CCK integration with Views module requires Views 6.x-2.0-rc2 or greater.',
-  'version' => 'none',
+  'lid' => '571',
+  'objectid' => 'story-field_test_exclude_unset',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '68',
-  'location' => 'includes/content.admin.inc:16;212',
-  'textgroup' => 'default',
-  'source' => 'Name',
-  'version' => 'none',
+  'lid' => '572',
+  'objectid' => 'story-field_test_two',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '69',
-  'location' => 'includes/content.admin.inc:16;212',
-  'textgroup' => 'default',
-  'source' => 'Type',
-  'version' => 'none',
+  'lid' => '573',
+  'objectid' => 'story-field_test_two',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '70',
-  'location' => 'includes/content.admin.inc:16 modules/fieldgroup/fieldgroup.module:156',
-  'textgroup' => 'default',
-  'source' => 'Description',
-  'version' => 'none',
+  'lid' => '574',
+  'objectid' => 'story-field_test',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '71',
-  'location' => 'includes/content.admin.inc:16;212',
-  'textgroup' => 'default',
-  'source' => 'Operations',
-  'version' => 'none',
+  'lid' => '575',
+  'objectid' => 'story-field_test',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '72',
-  'location' => 'includes/content.admin.inc:30',
-  'textgroup' => 'default',
-  'source' => 'edit',
-  'version' => 'none',
+  'lid' => '576',
+  'objectid' => 'story-field_test_three',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '73',
-  'location' => 'includes/content.admin.inc:34',
-  'textgroup' => 'default',
-  'source' => 'manage fields',
-  'version' => 'none',
+  'lid' => '577',
+  'objectid' => 'story-field_test_three',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '74',
-  'location' => 'includes/content.admin.inc:37',
-  'textgroup' => 'default',
-  'source' => 'delete',
-  'version' => 'none',
+  'lid' => '578',
+  'objectid' => 'story-field_test_four',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '75',
-  'location' => 'includes/content.admin.inc:48',
-  'textgroup' => 'default',
-  'source' => 'No content types available.',
-  'version' => 'none',
+  'lid' => '579',
+  'objectid' => 'story-field_test_four',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '76',
-  'location' => 'includes/content.admin.inc:55',
-  'textgroup' => 'default',
-  'source' => '» Add a new content type',
-  'version' => 'none',
+  'lid' => '580',
+  'objectid' => 'story-field_test_identical1',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '77',
-  'location' => 'includes/content.admin.inc:64;602;856',
-  'textgroup' => 'default',
-  'source' => 'Field name',
-  'version' => 'none',
+  'lid' => '581',
+  'objectid' => 'story-field_test_identical1',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '78',
-  'location' => 'includes/content.admin.inc:64;632;643;862',
-  'textgroup' => 'default',
-  'source' => 'Field type',
-  'version' => 'none',
+  'lid' => '582',
+  'objectid' => 'story-field_test_identical2',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '79',
-  'location' => 'includes/content.admin.inc:64',
-  'textgroup' => 'default',
-  'source' => 'Used in',
-  'version' => 'none',
+  'lid' => '583',
+  'objectid' => 'story-field_test_identical2',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '80',
-  'location' => 'includes/content.admin.inc:71',
-  'textgroup' => 'default',
-  'source' => '@field_name (Locked)',
-  'version' => 'none',
+  'lid' => '584',
+  'objectid' => 'story-field_test_email',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '81',
-  'location' => 'includes/content.admin.inc:87',
-  'textgroup' => 'default',
-  'source' => 'No fields have been defined for any content type yet.',
-  'version' => 'none',
+  'lid' => '585',
+  'objectid' => 'story-field_test_email',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '82',
-  'location' => 'includes/content.admin.inc:106',
-  'textgroup' => 'default',
-  'source' => 'This content type has inactive fields. Inactive fields are not included in lists of available fields until their modules are enabled.',
-  'version' => 'none',
+  'lid' => '586',
+  'objectid' => 'story-field_test_link',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '83',
-  'location' => 'includes/content.admin.inc:108',
-  'textgroup' => 'default',
-  'source' => '!field (!field_name) is an inactive !field_type field that uses a !widget_type widget.',
-  'version' => 'none',
+  'lid' => '587',
+  'objectid' => 'story-field_test_link',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '84',
-  'location' => 'includes/content.admin.inc:147;163',
-  'textgroup' => 'default',
-  'source' => 'Configure',
-  'version' => 'none',
+  'lid' => '588',
+  'objectid' => 'story-field_test_filefield',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '85',
-  'location' => 'includes/content.admin.inc:181',
-  'textgroup' => 'default',
-  'source' => 'Locked',
-  'version' => 'none',
+  'lid' => '589',
+  'objectid' => 'story-field_test_filefield',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '86',
-  'location' => 'includes/content.admin.inc:237',
-  'textgroup' => 'default',
-  'source' => '- Select a field type -',
-  'version' => 'none',
+  'lid' => '590',
+  'objectid' => 'story-field_test_imagefield',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '87',
-  'location' => 'includes/content.admin.inc:238',
-  'textgroup' => 'default',
-  'source' => '- Select a widget -',
-  'version' => 'none',
+  'lid' => '591',
+  'objectid' => 'story-field_test_imagefield',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '88',
-  'location' => 'includes/content.admin.inc:212;413;623;850,  modules/fieldgroup/fieldgroup.module:121',
-  'textgroup' => 'default',
-  'source' => 'Label',
-  'version' => 'none',
+  'lid' => '592',
+  'objectid' => 'story-field_test_date',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '89',
-  'location' => 'includes/content.admin.inc:253',
-  'textgroup' => 'default',
-  'source' => 'Field name (a-z, 0-9, _)',
-  'version' => 'none',
+  'lid' => '593',
+  'objectid' => 'story-field_test_date',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '90',
-  'location' => 'includes/content.admin.inc:258',
-  'textgroup' => 'default',
-  'source' => 'Type of data to store.',
-  'version' => 'none',
+  'lid' => '594',
+  'objectid' => 'story-field_test_datestamp',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '91',
-  'location' => 'includes/content.admin.inc:263;295',
-  'textgroup' => 'default',
-  'source' => 'Form element to edit the data.',
-  'version' => 'none',
+  'lid' => '595',
+  'objectid' => 'story-field_test_datestamp',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '92',
-  'location' => 'includes/content.admin.inc:279',
-  'textgroup' => 'default',
-  'source' => '- Select an existing field -',
-  'version' => 'none',
+  'lid' => '596',
+  'objectid' => 'story-field_test_datetime',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '93',
-  'location' => 'includes/content.admin.inc:290',
-  'textgroup' => 'default',
-  'source' => 'Field to share',
-  'version' => 'none',
+  'lid' => '597',
+  'objectid' => 'story-field_test_datetime',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '94',
-  'location' => 'includes/content.admin.inc:324',
-  'textgroup' => 'default',
-  'source' => 'Group name (a-z, 0-9, _)',
-  'version' => 'none',
+  'lid' => '598',
+  'objectid' => 'story-field_test_phone',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '95',
-  'location' => 'includes/content.admin.inc:201;402,  modules/fieldgroup/fieldgroup.module:110;363',
-  'textgroup' => 'default',
-  'source' => 'Save',
-  'version' => 'none',
+  'lid' => '599',
+  'objectid' => 'story-field_test_phone',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '96',
-  'location' => 'includes/content.admin.inc:365',
-  'textgroup' => 'default',
-  'source' => 'Add new field: you need to provide a label.',
-  'version' => 'none',
+  'lid' => '600',
+  'objectid' => 'story-field_test_decimal_radio_buttons',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '97',
-  'location' => 'includes/content.admin.inc:370',
-  'textgroup' => 'default',
-  'source' => 'Add new field: you need to provide a field name.',
-  'version' => 'none',
+  'lid' => '601',
+  'objectid' => 'story-field_test_decimal_radio_buttons',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '98',
-  'location' => 'includes/content.admin.inc:384',
-  'textgroup' => 'default',
-  'source' => 'Add new field: the field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
-  'version' => 'none',
+  'lid' => '602',
+  'objectid' => 'field_test_decimal_radio_buttons',
+  'type' => 'field',
+  'property' => 'option_1.2',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '99',
-  'location' => 'includes/content.admin.inc:387',
-  'textgroup' => 'default',
-  'source' => "Add new field: the field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.",
-  'version' => 'none',
+  'lid' => '603',
+  'objectid' => 'field_test_decimal_radio_buttons',
+  'type' => 'field',
+  'property' => 'option_2.1',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '100',
-  'location' => 'includes/content.admin.inc:391',
-  'textgroup' => 'default',
-  'source' => "Add new field: the name 'field_instance' is a reserved name.",
-  'version' => 'none',
+  'lid' => '604',
+  'objectid' => 'story-field_test_float_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '101',
-  'location' => 'includes/content.admin.inc:403',
-  'textgroup' => 'default',
-  'source' => 'Add new field: the field name %field_name already exists.',
-  'version' => 'none',
+  'lid' => '605',
+  'objectid' => 'story-field_test_float_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '102',
-  'location' => 'includes/content.admin.inc:409',
-  'textgroup' => 'default',
-  'source' => 'Add new field: you need to select a field type.',
-  'version' => 'none',
+  'lid' => '606',
+  'objectid' => 'field_test_float_single_checkbox',
+  'type' => 'field',
+  'property' => 'option_3.142',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '103',
-  'location' => 'includes/content.admin.inc:414',
-  'textgroup' => 'default',
-  'source' => 'Add new field: you need to select a widget.',
-  'version' => 'none',
+  'lid' => '607',
+  'objectid' => 'field_test_float_single_checkbox',
+  'type' => 'field',
+  'property' => 'option_1.234',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '104',
-  'location' => 'includes/content.admin.inc:420',
-  'textgroup' => 'default',
-  'source' => 'Add new field: invalid widget.',
-  'version' => 'none',
+  'lid' => '608',
+  'objectid' => 'story-field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '105',
-  'location' => 'includes/content.admin.inc:441',
-  'textgroup' => 'default',
-  'source' => 'Add existing field: you need to provide a label.',
-  'version' => 'none',
+  'lid' => '609',
+  'objectid' => 'story-field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '106',
-  'location' => 'includes/content.admin.inc:446',
-  'textgroup' => 'default',
-  'source' => 'Add existing field: you need to select a field.',
-  'version' => 'none',
+  'lid' => '610',
+  'objectid' => 'field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'option_1234',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '107',
-  'location' => 'includes/content.admin.inc:451',
-  'textgroup' => 'default',
-  'source' => 'Add existing field: you need to select a widget.',
-  'version' => 'none',
+  'lid' => '611',
+  'objectid' => 'field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'option_2341',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '108',
-  'location' => 'includes/content.admin.inc:457',
-  'textgroup' => 'default',
-  'source' => 'Add existing field: invalid widget.',
-  'version' => 'none',
+  'lid' => '612',
+  'objectid' => 'field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'option_3412',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '109',
-  'location' => 'includes/content.admin.inc:745',
-  'textgroup' => 'default',
-  'source' => 'There was a problem creating field %label.',
-  'version' => 'none',
+  'lid' => '613',
+  'objectid' => 'field_test_integer_selectlist',
+  'type' => 'field',
+  'property' => 'option_4123',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '110',
-  'location' => 'includes/content.admin.inc:518',
-  'textgroup' => 'default',
-  'source' => 'The field %label cannot be added to a content type because it is locked.',
-  'version' => 'none',
+  'lid' => '614',
+  'objectid' => 'story-field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '111',
-  'location' => 'includes/content.admin.inc:550',
-  'textgroup' => 'default',
-  'source' => 'There was a problem adding field %label.',
-  'version' => 'none',
+  'lid' => '615',
+  'objectid' => 'story-field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '112',
-  'location' => 'includes/content.admin.inc:571',
-  'textgroup' => 'default',
-  'source' => 'There are no fields configured for this content type. You can add new fields on the <a href="@link">Manage fields</a> page.',
-  'version' => 'none',
+  'lid' => '616',
+  'objectid' => 'field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'option_0',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '113',
-  'location' => 'includes/content.admin.inc:319;360',
-  'textgroup' => 'default',
-  'source' => 'Above',
-  'version' => 'none',
+  'lid' => '617',
+  'objectid' => 'field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'option_1',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '114',
-  'location' => 'includes/content.admin.inc:320',
-  'textgroup' => 'default',
-  'source' => 'Inline',
-  'version' => 'none',
+  'lid' => '618',
+  'objectid' => 'story-field_test_text_single_checkbox2',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '115',
-  'location' => 'includes/content.admin.inc:618;661',
-  'textgroup' => 'default',
-  'source' => 'Include',
-  'version' => 'none',
+  'lid' => '619',
+  'objectid' => 'story-field_test_text_single_checkbox2',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '116',
-  'location' => 'includes/content.admin.inc:618;661,  theme/content-admin-display-overview-form.tpl.php:17',
-  'textgroup' => 'default',
-  'source' => 'Exclude',
-  'version' => 'none',
+  'lid' => '620',
+  'objectid' => 'field_test_text_single_checkbox2',
+  'type' => 'field',
+  'property' => 'option_Off',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '117',
-  'location' => 'includes/content.admin.inc:364',
-  'textgroup' => 'default',
-  'source' => 'no styling',
-  'version' => 'none',
+  'lid' => '621',
+  'objectid' => 'field_test_text_single_checkbox2',
+  'type' => 'field',
+  'property' => 'option_Hello',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '118',
-  'location' => 'includes/content.admin.inc:365',
-  'textgroup' => 'default',
-  'source' => 'simple',
-  'version' => 'none',
+  'lid' => '622',
+  'objectid' => 'test_page-field_test',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '119',
-  'location' => 'includes/content.admin.inc:366',
-  'textgroup' => 'default',
-  'source' => 'fieldset',
-  'version' => 'none',
+  'lid' => '623',
+  'objectid' => 'test_page-field_test',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '120',
-  'location' => 'includes/content.admin.inc:367',
-  'textgroup' => 'default',
-  'source' => 'fieldset - collapsible',
-  'version' => 'none',
+  'lid' => '624',
+  'objectid' => 'test_planet-field_multivalue',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '121',
-  'location' => 'includes/content.admin.inc:368',
-  'textgroup' => 'default',
-  'source' => 'fieldset - collapsed',
-  'version' => 'none',
+  'lid' => '625',
+  'objectid' => 'test_planet-field_multivalue',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '122',
-  'location' => 'includes/content.admin.inc:460',
-  'textgroup' => 'default',
-  'source' => 'Your settings have been saved.',
-  'version' => 'none',
+  'lid' => '626',
+  'objectid' => 'test_planet-field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_label',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '123',
-  'location' => 'includes/content.admin.inc:760',
-  'textgroup' => 'default',
-  'source' => '@type: @field (@label)',
-  'version' => 'none',
+  'lid' => '627',
+  'objectid' => 'test_planet-field_test_text_single_checkbox',
+  'type' => 'field',
+  'property' => 'widget_description',
+  'objectindex' => '0',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '124',
-  'location' => 'includes/content.admin.inc:597',
-  'textgroup' => 'default',
-  'source' => 'Edit basic information',
-  'version' => 'none',
+  'lid' => '633',
+  'objectid' => '140',
+  'type' => 'item',
+  'property' => 'title',
+  'objectindex' => '140',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '125',
-  'location' => 'includes/content.admin.inc:792',
-  'textgroup' => 'default',
-  'source' => 'The machine-readable name of the field. This name cannot be changed.',
-  'version' => 'none',
+  'lid' => '634',
+  'objectid' => '139',
+  'type' => 'item',
+  'property' => 'title',
+  'objectindex' => '139',
+  'format' => '0',
 ))
 ->values(array(
-  'lid' => '126',
-  'location' => 'includes/content.admin.inc:626',
-  'textgroup' => 'default',
-  'source' => 'A human-readable name to be used as the label for this field in the %type content type.',
-  'version' => 'none',
+  'lid' => '635',
+  'objectid' => '139',
+  'type' => 'item',
+  'property' => 'description',
+  'objectindex' => '139',
+  'format' => '0',
+))
+->execute();
+
+$connection->schema()->createTable('i18n_variable', array(
+  'fields' => array(
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
+    'value' => array(
+      'type' => 'text',
+      'not null' => TRUE,
+      'size' => 'big',
+    ),
+  ),
+  'primary key' => array(
+    'name',
+    'language',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('i18n_variable')
+->fields(array(
+  'name',
+  'language',
+  'value',
 ))
 ->values(array(
-  'lid' => '127',
-  'location' => 'includes/content.admin.inc:646',
-  'textgroup' => 'default',
-  'source' => 'The type of data you would like to store in the database with this field. This option cannot be changed.',
-  'version' => 'none',
+  'name' => 'array_filter',
+  'language' => 'en',
+  'value' => 'b:1;',
 ))
 ->values(array(
-  'lid' => '128',
-  'location' => 'includes/content.admin.inc:651;869',
-  'textgroup' => 'default',
-  'source' => 'Widget type',
-  'version' => 'none',
+  'name' => 'i18nstrings_allowed_formats',
+  'language' => 'en',
+  'value' => 'a:2:{i:0;i:1;i:1;i:2;}',
 ))
 ->values(array(
-  'lid' => '129',
-  'location' => 'includes/content.admin.inc:655',
-  'textgroup' => 'default',
-  'source' => 'The type of form element you would like to present to the user when creating this field in the %type content type.',
-  'version' => 'none',
+  'name' => 'anonymous',
+  'language' => 'fr',
+  'value' => 's:8:"fr Guest";',
 ))
 ->values(array(
-  'lid' => '130',
-  'location' => 'includes/content.admin.inc:669',
-  'textgroup' => 'default',
-  'source' => 'Continue',
-  'version' => 'none',
+  'name' => 'error_level',
+  'language' => 'fr',
+  'value' => 's:1:"1";',
 ))
 ->values(array(
-  'lid' => '131',
-  'location' => 'includes/content.admin.inc:854',
-  'textgroup' => 'default',
-  'source' => 'Updated basic settings for field %label.',
-  'version' => 'none',
+  'name' => 'site_403',
+  'language' => 'fr',
+  'value' => 's:7:"fr-user";',
 ))
 ->values(array(
-  'lid' => '132',
-  'location' => 'includes/content.admin.inc:858',
-  'textgroup' => 'default',
-  'source' => 'There was a problem updating the basic settings for field %label.',
-  'version' => 'none',
+  'name' => 'site_404',
+  'language' => 'fr',
+  'value' => 's:17:"fr-page-not-found";',
 ))
 ->values(array(
-  'lid' => '133',
-  'location' => 'includes/content.admin.inc:786',
-  'textgroup' => 'default',
-  'source' => 'Are you sure you want to remove the field %field?',
-  'version' => 'none',
+  'name' => 'site_footer',
+  'language' => 'fr',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '134',
-  'location' => 'includes/content.admin.inc:789',
-  'textgroup' => 'default',
-  'source' => 'If you have any content left in this field, it will be lost. This action cannot be undone.',
-  'version' => 'none',
+  'name' => 'site_frontpage',
+  'language' => 'fr',
+  'value' => 's:4:"node";',
 ))
 ->values(array(
-  'lid' => '135',
-  'location' => 'includes/content.admin.inc:790 modules/fieldgroup/fieldgroup.module:236',
-  'textgroup' => 'default',
-  'source' => 'Cancel',
-  'version' => 'none',
+  'name' => 'site_mail',
+  'language' => 'fr',
+  'value' => 's:24:"fr_site_mail@example.com";',
 ))
 ->values(array(
-  'lid' => '136',
-  'location' => 'includes/content.admin.inc:894',
-  'textgroup' => 'default',
-  'source' => 'This field is <strong>locked</strong> and cannot be removed.',
-  'version' => 'none',
+  'name' => 'site_mission',
+  'language' => 'fr',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '137',
-  'location' => 'includes/content.admin.inc:808',
-  'textgroup' => 'default',
-  'source' => 'Removed field %field from %type.',
-  'version' => 'none',
+  'name' => 'site_name',
+  'language' => 'fr',
+  'value' => 's:12:"fr site name";',
 ))
 ->values(array(
-  'lid' => '138',
-  'location' => 'includes/content.admin.inc:813',
-  'textgroup' => 'default',
-  'source' => 'There was a problem deleting %field from %type.',
-  'version' => 'none',
+  'name' => 'site_offline',
+  'language' => 'fr',
+  'value' => 's:1:"0";',
 ))
 ->values(array(
-  'lid' => '139',
-  'location' => 'includes/content.admin.inc:939',
-  'textgroup' => 'default',
-  'source' => 'The field %field is locked and cannot be edited.',
-  'version' => 'none',
+  'name' => 'site_offline_message',
+  'language' => 'fr',
+  'value' => 's:99:"fr - Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.";',
 ))
 ->values(array(
-  'lid' => '140',
-  'location' => 'includes/content.admin.inc:846',
-  'textgroup' => 'default',
-  'source' => '%type basic information',
-  'version' => 'none',
+  'name' => 'site_slogan',
+  'language' => 'fr',
+  'value' => 's:16:"fr Migrate rocks";',
 ))
 ->values(array(
-  'lid' => '141',
-  'location' => 'includes/content.admin.inc:876',
-  'textgroup' => 'default',
-  'source' => 'Change basic information',
-  'version' => 'none',
+  'name' => 'user_email_verification',
+  'language' => 'fr',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '142',
-  'location' => 'includes/content.admin.inc:882',
-  'textgroup' => 'default',
-  'source' => '%type settings',
-  'version' => 'none',
+  'name' => 'user_mail_password_reset_body',
+  'language' => 'fr',
+  'value' => "s:424:\"fr - !username,\r\n\r\nA request to reset the password for your account has been made at !site.\r\n\r\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\";",
 ))
 ->values(array(
-  'lid' => '143',
-  'location' => 'includes/content.admin.inc:883',
-  'textgroup' => 'default',
-  'source' => 'These settings apply only to the %field field as it appears in the %type content type.',
-  'version' => 'none',
+  'name' => 'user_mail_password_reset_subject',
+  'language' => 'fr',
+  'value' => 's:57:"fr - Replacement login information for !username at !site";',
 ))
 ->values(array(
-  'lid' => '144',
-  'location' => 'includes/content.admin.inc:897 modules/fieldgroup/fieldgroup.module:143',
-  'textgroup' => 'default',
-  'source' => 'Help text',
-  'version' => 'none',
+  'name' => 'user_mail_register_admin_created_body',
+  'language' => 'fr',
+  'value' => "s:473:\"fr - !username,\r\n\r\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\r\n\r\nusername: !username\r\npassword: !password\r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '145',
-  'location' => 'includes/content.admin.inc:900',
-  'textgroup' => 'default',
-  'source' => 'Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags',
-  'version' => 'none',
+  'name' => 'user_mail_register_admin_created_subject',
+  'language' => 'fr',
+  'value' => 's:57:"fr - An administrator created an account for you at !site";',
 ))
 ->values(array(
-  'lid' => '146',
-  'location' => 'includes/content.admin.inc:908',
-  'textgroup' => 'default',
-  'source' => 'Default value',
-  'version' => 'none',
+  'name' => 'user_mail_register_no_approval_required_body',
+  'language' => 'fr',
+  'value' => "s:447:\"fr - !username,\r\n\r\nThank you for registering at !site. You may now log in to !login_uri using the following username and password:\r\n\r\nusername: !username\r\npassword: !password\r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '147',
-  'location' => 'examples/example_field.php:182 includes/content.admin.inc:930,  modules/number/number.module:137 modules/text/text.module:96',
-  'textgroup' => 'default',
-  'source' => 'PHP code',
-  'version' => 'none',
+  'name' => 'user_mail_register_no_approval_required_subject',
+  'language' => 'fr',
+  'value' => 's:43:"fr - Account details for !username at !site";',
 ))
 ->values(array(
-  'lid' => '148',
-  'location' => 'includes/content.admin.inc:1083;1238,  includes/content.rules.inc:93',
-  'textgroup' => 'default',
-  'source' => "'@column' => value for @column",
-  'version' => 'none',
+  'name' => 'user_mail_register_pending_approval_body',
+  'language' => 'fr',
+  'value' => "s:277:\"fr - !username,\r\n\r\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '149',
-  'location' => 'includes/content.admin.inc:1085;1240,  includes/content.rules.inc:95',
-  'textgroup' => 'default',
-  'source' => "return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);",
-  'version' => 'none',
+  'name' => 'user_mail_register_pending_approval_subject',
+  'language' => 'fr',
+  'value' => 's:68:"fr - Account details for !username at !site (pending admin approval)";',
 ))
 ->values(array(
-  'lid' => '150',
-  'location' => 'examples/example_field.php:188 includes/content.admin.inc:951;964,  modules/number/number.module:144;153 modules/text/text.module:103;112',
-  'textgroup' => 'default',
-  'source' => 'Code',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_body',
+  'language' => 'fr',
+  'value' => "s:439:\"fr - !username,\r\n\r\nYour account at !site has been activated.\r\n\r\nYou may now log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\nOnce you have set your own password, you will be able to log in to !login_uri in the future using:\r\n\r\nusername: !username\r\n\";",
 ))
 ->values(array(
-  'lid' => '151',
-  'location' => 'includes/content.admin.inc:1093',
-  'textgroup' => 'default',
-  'source' => 'Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_notify',
+  'language' => 'fr',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '152',
-  'location' => 'includes/content.admin.inc:965 modules/number/number.module:154,  modules/text/text.module:113',
-  'textgroup' => 'default',
-  'source' => '&lt;none&gt;',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_subject',
+  'language' => 'fr',
+  'value' => 's:54:"fr - Account details for !username at !site (approved)";',
 ))
 ->values(array(
-  'lid' => '153',
-  'location' => 'includes/content.admin.inc:966 modules/number/number.module:155,  modules/text/text.module:114',
-  'textgroup' => 'default',
-  'source' => "You're not allowed to input PHP code.",
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_body',
+  'language' => 'fr',
+  'value' => "s:58:\"fr - !username,\r\n\r\nYour account on !site has been blocked.\";",
 ))
 ->values(array(
-  'lid' => '154',
-  'location' => 'includes/content.admin.inc:966',
-  'textgroup' => 'default',
-  'source' => 'This PHP code was set by an administrator and will override any value specified above.',
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_notify',
+  'language' => 'fr',
+  'value' => 'i:1;',
 ))
 ->values(array(
-  'lid' => '155',
-  'location' => 'includes/content.admin.inc:973',
-  'textgroup' => 'default',
-  'source' => 'Global settings',
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_subject',
+  'language' => 'fr',
+  'value' => 's:53:"fr - Account details for !username at !site (blocked)";',
 ))
 ->values(array(
-  'lid' => '156',
-  'location' => 'includes/content.admin.inc:974',
-  'textgroup' => 'default',
-  'source' => 'These settings apply to the %field field in every content type in which it appears.',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_body',
+  'language' => 'fr',
+  'value' => "s:58:\"fr - !username,\r\n\r\nYour account on !site has been deleted.\";",
 ))
 ->values(array(
-  'lid' => '157',
-  'location' => 'includes/content.admin.inc:978',
-  'textgroup' => 'default',
-  'source' => 'Required',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_notify',
+  'language' => 'fr',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '158',
-  'location' => 'includes/content.admin.inc:1119',
-  'textgroup' => 'default',
-  'source' => 'Maximum number of values users can enter for this field.',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_subject',
+  'language' => 'fr',
+  'value' => 's:53:"fr - Account details for !username at !site (deleted)";',
 ))
 ->values(array(
-  'lid' => '159',
-  'location' => 'includes/content.admin.inc:1121',
-  'textgroup' => 'default',
-  'source' => "'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.",
-  'version' => 'none',
+  'name' => 'user_pictures',
+  'language' => 'fr',
+  'value' => 's:1:"0";',
 ))
 ->values(array(
-  'lid' => '160',
-  'location' => 'includes/content.admin.inc:986',
-  'textgroup' => 'default',
-  'source' => 'Warning! Changing this setting after data has been created could result in the loss of data!',
-  'version' => 'none',
+  'name' => 'user_picture_default',
+  'language' => 'fr',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '161',
-  'location' => 'includes/content.admin.inc:983',
-  'textgroup' => 'default',
-  'source' => 'Number of values',
-  'version' => 'none',
+  'name' => 'user_picture_dimensions',
+  'language' => 'fr',
+  'value' => 's:5:"85x85";',
 ))
 ->values(array(
-  'lid' => '162',
-  'location' => 'includes/content.admin.inc:984',
-  'textgroup' => 'default',
-  'source' => 'Unlimited',
-  'version' => 'none',
+  'name' => 'user_picture_file_size',
+  'language' => 'fr',
+  'value' => 's:2:"30";',
 ))
 ->values(array(
-  'lid' => '163',
-  'location' => 'includes/content.admin.inc:1001',
-  'textgroup' => 'default',
-  'source' => 'Save field settings',
-  'version' => 'none',
+  'name' => 'user_picture_guidelines',
+  'language' => 'fr',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '164',
-  'location' => 'includes/content.admin.inc:1281',
-  'textgroup' => 'default',
-  'source' => "The PHP code for 'default value' returned @value, which is invalid.",
-  'version' => 'none',
+  'name' => 'user_picture_path',
+  'language' => 'fr',
+  'value' => 's:8:"pictures";',
 ))
 ->values(array(
-  'lid' => '165',
-  'location' => 'includes/content.admin.inc:1135',
-  'textgroup' => 'default',
-  'source' => 'The default value is invalid.',
-  'version' => 'none',
+  'name' => 'user_register',
+  'language' => 'fr',
+  'value' => 's:1:"0";',
 ))
 ->values(array(
-  'lid' => '166',
-  'location' => 'includes/content.admin.inc:547',
-  'textgroup' => 'default',
-  'source' => 'Added field %label.',
-  'version' => 'none',
+  'name' => 'user_registration_help',
+  'language' => 'fr',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '167',
-  'location' => 'includes/content.admin.inc:1158',
-  'textgroup' => 'default',
-  'source' => 'Saved field %label.',
-  'version' => 'none',
+  'name' => 'user_signatures',
+  'language' => 'fr',
+  'value' => 's:1:"1";',
 ))
 ->values(array(
-  'lid' => '168',
-  'location' => 'includes/content.admin.inc:1463',
-  'textgroup' => 'default',
-  'source' => 'Processing',
-  'version' => 'none',
+  'name' => 'anonymous',
+  'language' => 'zu',
+  'value' => 's:5:"Guest";',
 ))
 ->values(array(
-  'lid' => '169',
-  'location' => 'includes/content.admin.inc:1464',
-  'textgroup' => 'default',
-  'source' => 'The update has encountered an error.',
-  'version' => 'none',
+  'name' => 'error_level',
+  'language' => 'zu',
+  'value' => 's:1:"1";',
 ))
 ->values(array(
-  'lid' => '170',
-  'location' => 'includes/content.admin.inc:1478',
-  'textgroup' => 'default',
-  'source' => 'The database has been altered and data has been migrated or deleted.',
-  'version' => 'none',
+  'name' => 'site_403',
+  'language' => 'zu',
+  'value' => 's:7:"zu-user";',
 ))
 ->values(array(
-  'lid' => '171',
-  'location' => 'includes/content.admin.inc:1481',
-  'textgroup' => 'default',
-  'source' => 'An error occurred and database alteration did not complete.',
-  'version' => 'none',
+  'name' => 'site_404',
+  'language' => 'zu',
+  'value' => 's:17:"zu-page-not-found";',
 ))
 ->values(array(
-  'lid' => '172',
-  'location' => 'includes/content.admin.inc:1584',
-  'textgroup' => 'default',
-  'source' => 'Processing %title',
-  'version' => 'none',
+  'name' => 'site_footer',
+  'language' => 'zu',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '173',
-  'location' => 'includes/content.admin.inc:1849',
-  'textgroup' => 'default',
-  'source' => '%name must be an integer.',
-  'version' => 'none',
+  'name' => 'site_frontpage',
+  'language' => 'zu',
+  'value' => 's:4:"node";',
 ))
 ->values(array(
-  'lid' => '174',
-  'location' => 'includes/content.admin.inc:1859',
-  'textgroup' => 'default',
-  'source' => '%name must be a positive integer.',
-  'version' => 'none',
+  'name' => 'site_mail',
+  'language' => 'zu',
+  'value' => 's:21:"site_mail@example.com";',
 ))
 ->values(array(
-  'lid' => '175',
-  'location' => 'includes/content.admin.inc:1869',
-  'textgroup' => 'default',
-  'source' => '%name must be a number.',
-  'version' => 'none',
+  'name' => 'site_mission',
+  'language' => 'zu',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '176',
-  'location' => 'includes/content.admin.inc:1482',
-  'textgroup' => 'default',
-  'source' => '1 item successfully processed:',
-  'version' => 'none',
+  'name' => 'site_name',
+  'language' => 'zu',
+  'value' => 's:14:"zu - site_name";',
 ))
 ->values(array(
-  'lid' => '177',
-  'location' => 'includes/content.admin.inc:1482',
-  'textgroup' => 'default',
-  'source' => '@count items successfully processed:',
-  'version' => 'none',
+  'name' => 'site_slogan',
+  'language' => 'zu',
+  'value' => 's:13:"Migrate rocks";',
 ))
 ->values(array(
-  'lid' => '178',
-  'location' => 'includes/content.crud.inc:591',
-  'textgroup' => 'default',
-  'source' => 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.',
-  'version' => 'none',
+  'name' => 'user_email_verification',
+  'language' => 'zu',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '179',
-  'location' => 'includes/content.crud.inc:629',
-  'textgroup' => 'default',
-  'source' => 'The content fields table %name has been deleted.',
-  'version' => 'none',
+  'name' => 'user_mail_password_reset_body',
+  'language' => 'zu',
+  'value' => "s:419:\"!username,\r\n\r\nA request to reset the password for your account has been made at !site.\r\n\r\nYou may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\";",
 ))
 ->values(array(
-  'lid' => '180',
-  'location' => 'includes/content.node_form.inc:206',
-  'textgroup' => 'default',
-  'source' => 'Add another item',
-  'version' => 'none',
+  'name' => 'user_mail_password_reset_subject',
+  'language' => 'zu',
+  'value' => 's:52:"Replacement login information for !username at !site";',
 ))
 ->values(array(
-  'lid' => '181',
-  'location' => 'includes/content.panels.inc:21;35',
-  'textgroup' => 'default',
-  'source' => 'Content field',
-  'version' => 'none',
+  'name' => 'user_mail_register_admin_created_body',
+  'language' => 'zu',
+  'value' => "s:473:\"zu - !username,\r\n\r\nA site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:\r\n\r\nusername: !username\r\npassword: !password\r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '182',
-  'location' => 'includes/content.panels.inc:38',
-  'textgroup' => 'default',
-  'source' => 'A content field from the referenced node.',
-  'version' => 'none',
+  'name' => 'user_mail_register_admin_created_subject',
+  'language' => 'zu',
+  'value' => 's:57:"zu - An administrator created an account for you at !site";',
 ))
 ->values(array(
-  'lid' => '183',
-  'location' => 'includes/content.panels.inc:39,  modules/fieldgroup/fieldgroup.panels.inc:31',
-  'textgroup' => 'default',
-  'source' => 'Node',
-  'version' => 'none',
+  'name' => 'user_mail_register_no_approval_required_body',
+  'language' => 'zu',
+  'value' => "s:442:\"!username,\r\n\r\nThank you for registering at !site. You may now log in to !login_uri using the following username and password:\r\n\r\nusername: !username\r\npassword: !password\r\n\r\nYou may also log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '184',
-  'location' => 'includes/content.panels.inc:40,  modules/fieldgroup/fieldgroup.panels.inc:32',
-  'textgroup' => 'default',
-  'source' => 'Node context',
-  'version' => 'none',
+  'name' => 'user_mail_register_no_approval_required_subject',
+  'language' => 'zu',
+  'value' => 's:38:"Account details for !username at !site";',
 ))
 ->values(array(
-  'lid' => '185',
-  'location' => 'includes/content.panels.inc:52',
-  'textgroup' => 'default',
-  'source' => 'Block title',
-  'version' => 'none',
+  'name' => 'user_mail_register_pending_approval_body',
+  'language' => 'zu',
+  'value' => "s:272:\"!username,\r\n\r\nThank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n\r\n--  !site team\";",
 ))
 ->values(array(
-  'lid' => '186',
-  'location' => 'includes/content.panels.inc:55',
-  'textgroup' => 'default',
-  'source' => 'Hidden',
-  'version' => 'none',
+  'name' => 'user_mail_register_pending_approval_subject',
+  'language' => 'zu',
+  'value' => 's:63:"Account details for !username at !site (pending admin approval)";',
 ))
 ->values(array(
-  'lid' => '187',
-  'location' => 'includes/content.panels.inc:57',
-  'textgroup' => 'default',
-  'source' => 'Configure how the label is going to be displayed.',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_body',
+  'language' => 'zu',
+  'value' => "s:434:\"!username,\r\n\r\nYour account at !site has been activated.\r\n\r\nYou may now log in by clicking on this link or copying and pasting it in your browser:\r\n\r\n!login_url\r\n\r\nThis is a one-time login, so it can be used only once.\r\n\r\nAfter logging in, you will be redirected to !edit_uri so you can change your password.\r\n\r\nOnce you have set your own password, you will be able to log in to !login_uri in the future using:\r\n\r\nusername: !username\r\n\";",
 ))
 ->values(array(
-  'lid' => '188',
-  'location' => 'includes/content.panels.inc:73',
-  'textgroup' => 'default',
-  'source' => 'Field / Formatter',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_notify',
+  'language' => 'zu',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '189',
-  'location' => 'includes/content.panels.inc:76',
-  'textgroup' => 'default',
-  'source' => 'Select a field and formatter.',
-  'version' => 'none',
+  'name' => 'user_mail_status_activated_subject',
+  'language' => 'zu',
+  'value' => 's:49:"Account details for !username at !site (approved)";',
 ))
 ->values(array(
-  'lid' => '190',
-  'location' => 'includes/content.panels.inc:92',
-  'textgroup' => 'default',
-  'source' => '"@s" field @name',
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_body',
+  'language' => 'zu',
+  'value' => "s:53:\"!username,\r\n\r\nYour account on !site has been blocked.\";",
 ))
 ->values(array(
-  'lid' => '191',
-  'location' => 'includes/content.rules.inc:15',
-  'textgroup' => 'default',
-  'source' => 'Populate a field',
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_notify',
+  'language' => 'zu',
+  'value' => 'i:1;',
 ))
 ->values(array(
-  'lid' => '192',
-  'location' => 'includes/content.rules.inc:23;212',
-  'textgroup' => 'default',
-  'source' => 'You should make sure that the used field exists in the given content type.',
-  'version' => 'none',
+  'name' => 'user_mail_status_blocked_subject',
+  'language' => 'zu',
+  'value' => 's:48:"Account details for !username at !site (blocked)";',
 ))
 ->values(array(
-  'lid' => '193',
-  'location' => 'includes/content.admin.inc:413',
-  'textgroup' => 'default',
-  'source' => 'Field',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_body',
+  'language' => 'zu',
+  'value' => "s:53:\"!username,\r\n\r\nYour account on !site has been deleted.\";",
 ))
 ->values(array(
-  'lid' => '194',
-  'location' => 'includes/content.rules.inc:56',
-  'textgroup' => 'default',
-  'source' => 'Select the machine-name of the field.',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_notify',
+  'language' => 'zu',
+  'value' => 'i:0;',
 ))
 ->values(array(
-  'lid' => '195',
-  'location' => 'includes/content.rules.inc:84',
-  'textgroup' => 'default',
-  'source' => 'Advanced: Specify the fields value with PHP code',
-  'version' => 'none',
+  'name' => 'user_mail_status_deleted_subject',
+  'language' => 'zu',
+  'value' => 's:48:"Account details for !username at !site (deleted)";',
 ))
 ->values(array(
-  'lid' => '196',
-  'location' => 'includes/content.rules.inc:102',
-  'textgroup' => 'default',
-  'source' => "Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href=\"@link_devel\">devel.module's</a> 'devel load' tab on a content page might help you figure out the expected format.",
-  'version' => 'none',
+  'name' => 'user_pictures',
+  'language' => 'zu',
+  'value' => 's:1:"0";',
 ))
 ->values(array(
-  'lid' => '197',
-  'location' => 'includes/content.rules.inc:130',
-  'textgroup' => 'default',
-  'source' => 'You have to return the default value in the expected format.',
-  'version' => 'none',
+  'name' => 'user_picture_default',
+  'language' => 'zu',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '198',
-  'location' => 'includes/content.rules.inc:181',
-  'textgroup' => 'default',
-  'source' => "Populate @node's field '@field'",
-  'version' => 'none',
+  'name' => 'user_picture_dimensions',
+  'language' => 'zu',
+  'value' => 's:5:"85x85";',
 ))
 ->values(array(
-  'lid' => '199',
-  'location' => 'includes/content.rules.inc:198',
-  'textgroup' => 'default',
-  'source' => 'Field has value',
-  'version' => 'none',
+  'name' => 'user_picture_file_size',
+  'language' => 'zu',
+  'value' => 's:2:"30";',
 ))
 ->values(array(
-  'lid' => '200',
-  'location' => 'includes/content.rules.inc:203',
-  'textgroup' => 'default',
-  'source' => 'You should make sure that the used field exists in the given content type. The condition returns TRUE, if the selected field has the given value.',
-  'version' => 'none',
+  'name' => 'user_picture_guidelines',
+  'language' => 'zu',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '201',
-  'location' => 'includes/content.rules.inc:207',
-  'textgroup' => 'default',
-  'source' => 'Field has changed',
-  'version' => 'none',
+  'name' => 'user_picture_path',
+  'language' => 'zu',
+  'value' => 's:8:"pictures";',
 ))
 ->values(array(
-  'lid' => '202',
-  'location' => 'includes/content.rules.inc:209',
-  'textgroup' => 'default',
-  'source' => 'Content containing changes',
-  'version' => 'none',
+  'name' => 'user_register',
+  'language' => 'zu',
+  'value' => 's:1:"0";',
 ))
 ->values(array(
-  'lid' => '203',
-  'location' => 'includes/content.rules.inc:210',
-  'textgroup' => 'default',
-  'source' => 'Content not containing changes',
-  'version' => 'none',
+  'name' => 'user_registration_help',
+  'language' => 'zu',
+  'value' => 's:0:"";',
 ))
 ->values(array(
-  'lid' => '204',
-  'location' => 'includes/content.rules.inc:249',
-  'textgroup' => 'default',
-  'source' => "@node's field '@field' has value",
-  'version' => 'none',
+  'name' => 'user_signatures',
+  'language' => 'zu',
+  'value' => 's:1:"1";',
 ))
-->values(array(
-  'lid' => '205',
-  'location' => 'includes/content.rules.inc:269',
-  'textgroup' => 'default',
-  'source' => 'Select the machine-name of the field to look at.',
-  'version' => 'none',
+->execute();
+
+$connection->schema()->createTable('imagecache_action', array(
+  'fields' => array(
+    'actionid' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'presetid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'weight' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'module' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+    ),
+    'action' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+    ),
+    'data' => array(
+      'type' => 'text',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+  ),
+  'primary key' => array(
+    'actionid',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('imagecache_action')
+->fields(array(
+  'actionid',
+  'presetid',
+  'weight',
+  'module',
+  'action',
+  'data',
 ))
 ->values(array(
-  'lid' => '206',
-  'location' => 'includes/content.rules.inc:275',
-  'textgroup' => 'default',
-  'source' => "@node's field '@field' has been changed",
-  'version' => 'none',
+  'actionid' => '3',
+  'presetid' => '1',
+  'weight' => '0',
+  'module' => 'imagecache',
+  'action' => 'imagecache_scale_and_crop',
+  'data' => 'a:2:{s:5:"width";s:4:"100%";s:6:"height";s:4:"100%";}',
 ))
 ->values(array(
-  'lid' => '207',
-  'location' => 'includes/content.token.inc:12;15',
-  'textgroup' => 'default',
-  'source' => 'Token',
-  'version' => 'none',
+  'actionid' => '4',
+  'presetid' => '2',
+  'weight' => '0',
+  'module' => 'imagecache',
+  'action' => 'imagecache_crop',
+  'data' => 'a:4:{s:5:"width";s:3:"555";s:6:"height";s:4:"5555";s:7:"xoffset";s:6:"center";s:7:"yoffset";s:6:"center";}',
 ))
 ->values(array(
-  'lid' => '208',
-  'location' => 'includes/content.token.inc:60',
-  'textgroup' => 'default',
-  'source' => 'Referenced node ID',
-  'version' => 'none',
+  'actionid' => '5',
+  'presetid' => '2',
+  'weight' => '0',
+  'module' => 'imagecache',
+  'action' => 'imagecache_resize',
+  'data' => 'a:2:{s:5:"width";s:3:"55%";s:6:"height";s:3:"55%";}',
 ))
 ->values(array(
-  'lid' => '209',
-  'location' => 'includes/content.token.inc:61',
-  'textgroup' => 'default',
-  'source' => 'Referenced node title',
-  'version' => 'none',
+  'actionid' => '6',
+  'presetid' => '2',
+  'weight' => '0',
+  'module' => 'imagecache',
+  'action' => 'imagecache_rotate',
+  'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}',
 ))
-->values(array(
-  'lid' => '210',
+->execute();
+
+$connection->schema()->createTable('imagecache_preset', array(
+  'fields' => array(
+    'presetid' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'presetname' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+    ),
+  ),
+  'primary key' => array(
+    'presetid',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('imagecache_preset')
+->fields(array(
+  'presetid',
+  'presetname',
+))
+->values(array(
+  'presetid' => '1',
+  'presetname' => 'slackjaw_boys',
+))
+->values(array(
+  'presetid' => '2',
+  'presetname' => 'big_blue_cheese',
+))
+->execute();
+
+$connection->schema()->createTable('languages', array(
+  'fields' => array(
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
+    'name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '64',
+      'default' => '',
+    ),
+    'native' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '64',
+      'default' => '',
+    ),
+    'direction' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'enabled' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'plurals' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'formula' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'domain' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'prefix' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'weight' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'javascript' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+  ),
+  'primary key' => array(
+    'language',
+  ),
+  'indexes' => array(
+    'list' => array(
+      'weight',
+      'name',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('languages')
+->fields(array(
+  'language',
+  'name',
+  'native',
+  'direction',
+  'enabled',
+  'plurals',
+  'formula',
+  'domain',
+  'prefix',
+  'weight',
+  'javascript',
+))
+->values(array(
+  'language' => 'en',
+  'name' => 'English',
+  'native' => 'English',
+  'direction' => '0',
+  'enabled' => '1',
+  'plurals' => '0',
+  'formula' => '',
+  'domain' => '',
+  'prefix' => '',
+  'weight' => '0',
+  'javascript' => '',
+))
+->values(array(
+  'language' => 'fr',
+  'name' => 'French',
+  'native' => 'Français',
+  'direction' => '0',
+  'enabled' => '1',
+  'plurals' => '2',
+  'formula' => '($n>1)',
+  'domain' => '',
+  'prefix' => 'fr',
+  'weight' => '0',
+  'javascript' => '047746d30d76aa44a54db9923c7c5fb0',
+))
+->values(array(
+  'language' => 'zu',
+  'name' => 'Zulu',
+  'native' => 'isiZulu',
+  'direction' => '0',
+  'enabled' => '1',
+  'plurals' => '0',
+  'formula' => '',
+  'domain' => '',
+  'prefix' => 'zu',
+  'weight' => '0',
+  'javascript' => '',
+))
+->execute();
+
+$connection->schema()->createTable('locales_source', array(
+  'fields' => array(
+    'lid' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+    'location' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'textgroup' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => 'default',
+    ),
+    'source' => array(
+      'type' => 'blob',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+    'version' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '20',
+      'default' => 'none',
+    ),
+  ),
+  'primary key' => array(
+    'lid',
+  ),
+  'indexes' => array(
+    'source' => array(
+      array(
+        'source',
+        '30',
+      ),
+    ),
+    'textgroup_location' => array(
+      array(
+        'textgroup',
+        '30',
+      ),
+      array(
+        'location',
+        '191',
+      ),
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('locales_source')
+->fields(array(
+  'lid',
+  'location',
+  'textgroup',
+  'source',
+  'version',
+))
+->values(array(
+  'lid' => '1',
+  'location' => 'misc/drupal.js',
+  'textgroup' => 'default',
+  'source' => 'Unspecified error',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '2',
+  'location' => 'misc/drupal.js',
+  'textgroup' => 'default',
+  'source' => 'An error occurred. \n@uri\n@text',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '3',
+  'location' => 'misc/drupal.js',
+  'textgroup' => 'default',
+  'source' => 'An error occurred. \n@uri\n(no information available).',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '4',
+  'location' => 'misc/drupal.js',
+  'textgroup' => 'default',
+  'source' => 'An HTTP error @status occurred. \n@uri',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '5',
+  'location' => 'content.module:21',
+  'textgroup' => 'default',
+  'source' => 'The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '6',
+  'location' => 'content.module:22',
+  'textgroup' => 'default',
+  'source' => 'When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '7',
+  'location' => 'content.module:23',
+  'textgroup' => 'default',
+  'source' => 'Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '8',
+  'location' => 'content.module:25',
+  'textgroup' => 'default',
+  'source' => '<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '9',
+  'location' => 'content.module:26',
+  'textgroup' => 'default',
+  'source' => "<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '10',
+  'location' => 'content.module:27',
+  'textgroup' => 'default',
+  'source' => '<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '11',
+  'location' => 'content.module:28',
+  'textgroup' => 'default',
+  'source' => "<em>userreference</em>, which creates custom references to your sites' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site's users and posts. To track user involvement in a post beyond Drupal's standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named \"Edited by\" to a content type to store a link to an editor's user account page.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '12',
+  'location' => 'content.module:29',
+  'textgroup' => 'default',
+  'source' => '<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '13',
+  'location' => 'content.module:31',
+  'textgroup' => 'default',
+  'source' => 'For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '14',
+  'location' => 'theme/theme.inc:111',
+  'textgroup' => 'default',
+  'source' => "Configure how this content type's fields and field labels should be displayed when it's viewed in teaser and full-page mode.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '15',
+  'location' => 'theme/theme.inc:114',
+  'textgroup' => 'default',
+  'source' => "Configure how this content type's fields should be displayed when it's rendered in the following contexts.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '16',
+  'location' => 'content.module:48',
+  'textgroup' => 'default',
+  'source' => 'Control the order of fields in the input form.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '17',
+  'location' => 'content.module:492',
+  'textgroup' => 'default',
+  'source' => 'This field is required.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '18',
+  'location' => 'content.module:496',
+  'textgroup' => 'default',
+  'source' => '!title: !required',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '19',
+  'location' => 'content.module:499,  modules/content_multigroup/content_multigroup.module:903',
+  'textgroup' => 'default',
+  'source' => 'Order',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '20',
+  'location' => 'content.module:1640',
+  'textgroup' => 'default',
+  'source' => 'RSS Item',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '21',
+  'location' => 'content.module:1883',
+  'textgroup' => 'default',
+  'source' => 'Search Index',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '22',
+  'location' => 'content.module:1887',
+  'textgroup' => 'default',
+  'source' => 'Search Result',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '23',
+  'location' => 'content.module:2362',
+  'textgroup' => 'default',
+  'source' => 'Language',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '24',
+  'location' => 'content.module:2376',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '25',
+  'location' => 'content.module:2407',
+  'textgroup' => 'default',
+  'source' => 'File attachments',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '26',
+  'location' => 'content.module:595',
+  'textgroup' => 'default',
+  'source' => 'Updating field type %type with module %module.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '27',
+  'location' => 'content.module:602',
+  'textgroup' => 'default',
+  'source' => 'Updating widget type %type with module %module.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '28',
+  'location' => 'content.module:60',
+  'textgroup' => 'default',
+  'source' => 'Use PHP input for field settings (dangerous - grant with care)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '29',
+  'location' => 'content.module:101',
+  'textgroup' => 'default',
+  'source' => 'Manage fields',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '30',
+  'location' => 'content.module:110',
+  'textgroup' => 'default',
+  'source' => 'Display fields',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '31',
+  'location' => 'content.module:143',
+  'textgroup' => 'default',
+  'source' => 'General',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '32',
+  'location' => 'content.module:149',
+  'textgroup' => 'default',
+  'source' => 'Advanced',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '33',
+  'location' => 'content.module:141',
+  'textgroup' => 'default',
+  'source' => 'Remove field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '34',
+  'location' => 'content.info:0,  includes/content.rules.inc:19;212,  includes/views/content.views.inc:180;261',
+  'textgroup' => 'default',
+  'source' => 'Content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '35',
+  'location' => 'content.info:0',
+  'textgroup' => 'default',
+  'source' => 'Allows administrators to define new content types.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '36',
+  'location' => 'content.info:0,  modules/content_copy/content_copy.info:0,  modules/content_permissions/content_permissions.info:0,  modules/fieldgroup/fieldgroup.info:0',
+  'textgroup' => 'default',
+  'source' => 'CCK',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '37',
+  'location' => 'modules/text/text.module:41,  modules/text/text.info:0',
+  'textgroup' => 'default',
+  'source' => 'Text',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '38',
+  'location' => 'examples/example_field.php:178',
+  'textgroup' => 'default',
+  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database and it must match the field storage type, %type. The label is optional and the key will be used as the label if no label is specified.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '39',
+  'location' => 'examples/example_field.php:484',
+  'textgroup' => 'default',
+  'source' => 'Text area',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '40',
+  'location' => 'includes/content.admin.inc:171;197;895,  modules/fieldgroup/fieldgroup.module:209',
+  'textgroup' => 'default',
+  'source' => 'Remove',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '41',
+  'location' => 'content.module:1854',
+  'textgroup' => 'default',
+  'source' => 'Basic',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '42',
+  'location' => 'content.module:1857,  modules/nodereference/nodereference.module:268',
+  'textgroup' => 'default',
+  'source' => 'Teaser',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '43',
+  'location' => 'content.module:1861,  modules/nodereference/nodereference.module:263',
+  'textgroup' => 'default',
+  'source' => 'Full node',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '44',
+  'location' => 'content.module:1867;1870',
+  'textgroup' => 'default',
+  'source' => 'RSS',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '45',
+  'location' => 'content.module:1880',
+  'textgroup' => 'default',
+  'source' => 'Search',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '46',
+  'location' => 'content.module:2348;2355',
+  'textgroup' => 'default',
+  'source' => 'Node module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '47',
+  'location' => 'content.module:2363',
+  'textgroup' => 'default',
+  'source' => 'Locale module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '48',
+  'location' => 'content.module:2369',
+  'textgroup' => 'default',
+  'source' => 'Menu settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '49',
+  'location' => 'content.module:2370',
+  'textgroup' => 'default',
+  'source' => 'Menu module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '50',
+  'location' => 'content.module:2377',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '51',
+  'location' => 'content.module:2383',
+  'textgroup' => 'default',
+  'source' => 'Book',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '52',
+  'location' => 'content.module:2384',
+  'textgroup' => 'default',
+  'source' => 'Book module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '53',
+  'location' => 'content.module:2390',
+  'textgroup' => 'default',
+  'source' => 'Poll title',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '54',
+  'location' => 'content.module:2391',
+  'textgroup' => 'default',
+  'source' => 'Poll module title.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '55',
+  'location' => 'content.module:2396',
+  'textgroup' => 'default',
+  'source' => 'Poll choices',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '56',
+  'location' => 'content.module:2397',
+  'textgroup' => 'default',
+  'source' => 'Poll module choices.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '57',
+  'location' => 'content.module:2400',
+  'textgroup' => 'default',
+  'source' => 'Poll settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '58',
+  'location' => 'content.module:2401',
+  'textgroup' => 'default',
+  'source' => 'Poll module settings.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '59',
+  'location' => 'content.module:2408',
+  'textgroup' => 'default',
+  'source' => 'Upload module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '60',
+  'location' => 'content.module:595;602;0,  includes/content.crud.inc:589;633',
+  'textgroup' => 'default',
+  'source' => 'content',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '61',
+  'location' => 'content.module:79',
+  'textgroup' => 'default',
+  'source' => 'Fields',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '62',
+  'location' => 'content.install:236',
+  'textgroup' => 'default',
+  'source' => "Updates for CCK-related modules are not run until the modules are enabled on the <a href=\"@admin-modules-path\">administer modules page</a>. When you enable them, you'll need to return to <a href=\"@update-php\">update.php</a> and run the remaining updates.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '63',
+  'location' => 'content.install:239',
+  'textgroup' => 'default',
+  'source' => '!module.module has updates but cannot be updated because content.module is not enabled.<br />If and when content.module is enabled, you will need to re-run the update script. You will continue to see this message until the module is enabled and updates are run.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '64',
+  'location' => 'content.install:244',
+  'textgroup' => 'default',
+  'source' => '!module.module has updates and is available in the modules folder but is not enabled.<br />If and when it is enabled, you will need to re-run the update script. You will continue to see this message until the module is enabled and updates are run.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '65',
+  'location' => 'content.install:251',
+  'textgroup' => 'default',
+  'source' => 'Some updates are still pending. Please return to <a href="@update-php">update.php</a> and run the remaining updates.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '66',
+  'location' => '(duplicate) content.install:10',
+  'textgroup' => 'default',
+  'source' => 'CCK - No Views integration',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '67',
+  'location' => '(duplicate) content.install:11',
+  'textgroup' => 'default',
+  'source' => 'CCK integration with Views module requires Views 6.x-2.0-rc2 or greater.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '68',
+  'location' => 'includes/content.admin.inc:16,  modules/content_copy/content_copy_export_form.tpl.php:11,  theme/content-admin-field-overview-form.tpl.php:12',
+  'textgroup' => 'default',
+  'source' => 'Name',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '69',
+  'location' => 'includes/content.admin.inc:16,  modules/content_copy/content_copy_export_form.tpl.php:12,  theme/content-admin-field-overview-form.tpl.php:13',
+  'textgroup' => 'default',
+  'source' => 'Type',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '70',
+  'location' => 'includes/content.admin.inc:16,  modules/fieldgroup/fieldgroup.module:158',
+  'textgroup' => 'default',
+  'source' => 'Description',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '71',
+  'location' => 'includes/content.admin.inc:16,  theme/content-admin-field-overview-form.tpl.php:14',
+  'textgroup' => 'default',
+  'source' => 'Operations',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '72',
+  'location' => 'includes/content.admin.inc:30',
+  'textgroup' => 'default',
+  'source' => 'edit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '73',
+  'location' => 'includes/content.admin.inc:33',
+  'textgroup' => 'default',
+  'source' => 'manage fields',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '74',
+  'location' => 'includes/content.admin.inc:36',
+  'textgroup' => 'default',
+  'source' => 'delete',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '75',
+  'location' => 'includes/content.admin.inc:47',
+  'textgroup' => 'default',
+  'source' => 'No content types available.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '76',
+  'location' => 'includes/content.admin.inc:54',
+  'textgroup' => 'default',
+  'source' => '» Add a new content type',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '77',
+  'location' => 'includes/content.admin.inc:67;796;991',
+  'textgroup' => 'default',
+  'source' => 'Field name',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '78',
+  'location' => 'includes/content.admin.inc:67;811;997',
+  'textgroup' => 'default',
+  'source' => 'Field type',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '79',
+  'location' => 'includes/content.admin.inc:67',
+  'textgroup' => 'default',
+  'source' => 'Used in',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '80',
+  'location' => 'includes/content.admin.inc:71',
+  'textgroup' => 'default',
+  'source' => '@field_name (Locked)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '81',
+  'location' => 'includes/content.admin.inc:90',
+  'textgroup' => 'default',
+  'source' => 'No fields have been defined for any content type yet.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '82',
+  'location' => 'not literally, English needs work,  includes/content.admin.inc:106,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'This content type has inactive fields. Inactive fields are not included in lists of available fields until their modules are enabled.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '83',
+  'location' => 'includes/content.admin.inc:108',
+  'textgroup' => 'default',
+  'source' => '!field (!field_name) is an inactive !field_type field that uses a !widget_type widget.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '84',
+  'location' => 'includes/content.admin.inc:170;196',
+  'textgroup' => 'default',
+  'source' => 'Configure',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '85',
+  'location' => 'Schreibgeschützt,  includes/content.admin.inc:181',
+  'textgroup' => 'default',
+  'source' => 'Locked',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '86',
+  'location' => 'includes/content.admin.inc:237',
+  'textgroup' => 'default',
+  'source' => '- Select a field type -',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '87',
+  'location' => 'includes/content.admin.inc:238',
+  'textgroup' => 'default',
+  'source' => '- Select a widget -',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '88',
+  'location' => 'includes/content.admin.inc:244;285;315;804;985,  includes/panels/content_types/content_field.inc:97,  includes/views/handlers/content_handler_field.inc:56',
+  'textgroup' => 'default',
+  'source' => 'Label',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '89',
+  'location' => 'includes/content.admin.inc:253',
+  'textgroup' => 'default',
+  'source' => 'Field name (a-z, 0-9, _)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '90',
+  'location' => 'includes/content.admin.inc:258',
+  'textgroup' => 'default',
+  'source' => 'Type of data to store.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '91',
+  'location' => 'includes/content.admin.inc:263;295',
+  'textgroup' => 'default',
+  'source' => 'Form element to edit the data.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '92',
+  'location' => 'includes/content.admin.inc:279',
+  'textgroup' => 'default',
+  'source' => '- Select an existing field -',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '93',
+  'location' => 'includes/content.admin.inc:290',
+  'textgroup' => 'default',
+  'source' => 'Field to share',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '94',
+  'location' => 'includes/content.admin.inc:324',
+  'textgroup' => 'default',
+  'source' => 'Group name (a-z, 0-9, _)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '95',
+  'location' => 'includes/content.admin.inc:352;677,  modules/fieldgroup/fieldgroup.module:177;341',
+  'textgroup' => 'default',
+  'source' => 'Save',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '96',
+  'location' => 'includes/content.admin.inc:373',
+  'textgroup' => 'default',
+  'source' => 'Add new field: you need to provide a label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '97',
+  'location' => 'includes/content.admin.inc:378',
+  'textgroup' => 'default',
+  'source' => 'Add new field: you need to provide a field name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '98',
+  'location' => 'includes/content.admin.inc:392',
+  'textgroup' => 'default',
+  'source' => 'Add new field: the field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '99',
+  'location' => 'includes/content.admin.inc:395',
+  'textgroup' => 'default',
+  'source' => "Add new field: the field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '100',
+  'location' => 'includes/content.admin.inc:399',
+  'textgroup' => 'default',
+  'source' => "Add new field: the name 'field_instance' is a reserved name.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '101',
+  'location' => 'includes/content.admin.inc:411',
+  'textgroup' => 'default',
+  'source' => 'Add new field: the field name %field_name already exists.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '102',
+  'location' => 'includes/content.admin.inc:417',
+  'textgroup' => 'default',
+  'source' => 'Add new field: you need to select a field type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '103',
+  'location' => 'includes/content.admin.inc:422',
+  'textgroup' => 'default',
+  'source' => 'Add new field: you need to select a widget.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '104',
+  'location' => 'includes/content.admin.inc:428',
+  'textgroup' => 'default',
+  'source' => 'Add new field: invalid widget.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '105',
+  'location' => 'includes/content.admin.inc:449',
+  'textgroup' => 'default',
+  'source' => 'Add existing field: you need to provide a label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '106',
+  'location' => 'includes/content.admin.inc:454',
+  'textgroup' => 'default',
+  'source' => 'Add existing field: you need to select a field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '107',
+  'location' => 'includes/content.admin.inc:459',
+  'textgroup' => 'default',
+  'source' => 'Add existing field: you need to select a widget.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '108',
+  'location' => 'includes/content.admin.inc:465',
+  'textgroup' => 'default',
+  'source' => 'Add existing field: invalid widget.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '109',
+  'location' => 'includes/content.admin.inc:514',
+  'textgroup' => 'default',
+  'source' => 'There was a problem creating field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '110',
+  'location' => 'includes/content.admin.inc:526',
+  'textgroup' => 'default',
+  'source' => 'The field %label cannot be added to a content type because it is locked.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '111',
+  'location' => 'includes/content.admin.inc:536',
+  'textgroup' => 'default',
+  'source' => 'There was a problem adding field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '112',
+  'location' => 'includes/content.admin.inc:578',
+  'textgroup' => 'default',
+  'source' => 'There are no fields configured for this content type. You can add new fields on the <a href="@link">Manage fields</a> page.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '113',
+  'location' => 'includes/content.admin.inc:585;633,  includes/panels/content_types/content_field.inc:101,  modules/content_multigroup/content_multigroup.module:352',
+  'textgroup' => 'default',
+  'source' => 'Above',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '114',
+  'location' => 'includes/content.admin.inc:586,  includes/panels/content_types/content_field.inc:102',
+  'textgroup' => 'default',
+  'source' => 'Inline',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '115',
+  'location' => 'includes/content.admin.inc:625;668',
+  'textgroup' => 'default',
+  'source' => 'Include',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '116',
+  'location' => 'includes/content.admin.inc:625;668,  theme/content-admin-display-overview-form.tpl.php:17',
+  'textgroup' => 'default',
+  'source' => 'Exclude',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '117',
+  'location' => 'includes/content.admin.inc:637',
+  'textgroup' => 'default',
+  'source' => 'no styling',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '118',
+  'location' => 'includes/content.admin.inc:638',
+  'textgroup' => 'default',
+  'source' => 'simple',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '119',
+  'location' => 'includes/content.admin.inc:639',
+  'textgroup' => 'default',
+  'source' => 'fieldset',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '120',
+  'location' => 'includes/content.admin.inc:640',
+  'textgroup' => 'default',
+  'source' => 'fieldset - collapsible',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '121',
+  'location' => 'includes/content.admin.inc:641',
+  'textgroup' => 'default',
+  'source' => 'fieldset - collapsed',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '122',
+  'location' => 'includes/content.admin.inc:697',
+  'textgroup' => 'default',
+  'source' => 'Your settings have been saved.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '123',
+  'location' => 'includes/content.admin.inc:767',
+  'textgroup' => 'default',
+  'source' => '@type: @field (@label)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '124',
+  'location' => 'includes/content.admin.inc:793',
+  'textgroup' => 'default',
+  'source' => 'Edit basic information',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '125',
+  'location' => 'includes/content.admin.inc:799',
+  'textgroup' => 'default',
+  'source' => 'The machine-readable name of the field. This name cannot be changed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '126',
+  'location' => 'includes/content.admin.inc:807',
+  'textgroup' => 'default',
+  'source' => 'A human-readable name to be used as the label for this field in the %type content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '127',
+  'location' => 'includes/content.admin.inc:814',
+  'textgroup' => 'default',
+  'source' => 'The type of data you would like to store in the database with this field. This option cannot be changed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '128',
+  'location' => 'includes/content.admin.inc:819;1003',
+  'textgroup' => 'default',
+  'source' => 'Widget type',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '129',
+  'location' => 'includes/content.admin.inc:823',
+  'textgroup' => 'default',
+  'source' => 'The type of form element you would like to present to the user when creating this field in the %type content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '130',
+  'location' => 'includes/content.admin.inc:833,  includes/content.rules.inc:66',
+  'textgroup' => 'default',
+  'source' => 'Continue',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '131',
+  'location' => 'includes/content.admin.inc:861',
+  'textgroup' => 'default',
+  'source' => 'Updated basic settings for field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '132',
+  'location' => 'includes/content.admin.inc:865',
+  'textgroup' => 'default',
+  'source' => 'There was a problem updating the basic settings for field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '133',
+  'location' => 'includes/content.admin.inc:892',
+  'textgroup' => 'default',
+  'source' => 'Are you sure you want to remove the field %field?',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '134',
+  'location' => 'includes/content.admin.inc:894',
+  'textgroup' => 'default',
+  'source' => 'If you have any content left in this field, it will be lost. This action cannot be undone.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '135',
+  'location' => 'includes/content.admin.inc:895,  modules/fieldgroup/fieldgroup.module:209',
+  'textgroup' => 'default',
+  'source' => 'Cancel',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '136',
+  'location' => 'includes/content.admin.inc:901',
+  'textgroup' => 'default',
+  'source' => 'This field is <strong>locked</strong> and cannot be removed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '137',
+  'location' => 'includes/content.admin.inc:922',
+  'textgroup' => 'default',
+  'source' => 'Removed field %field from %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '138',
+  'location' => 'includes/content.admin.inc:927',
+  'textgroup' => 'default',
+  'source' => 'There was a problem deleting %field from %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '139',
+  'location' => 'includes/content.admin.inc:946',
+  'textgroup' => 'default',
+  'source' => 'The field %field is locked and cannot be edited.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '140',
+  'location' => 'includes/content.admin.inc:980',
+  'textgroup' => 'default',
+  'source' => '%type basic information',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '141',
+  'location' => 'includes/content.admin.inc:1010;1189',
+  'textgroup' => 'default',
+  'source' => 'Change basic information',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '142',
+  'location' => 'includes/content.admin.inc:1016',
+  'textgroup' => 'default',
+  'source' => '%type settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '143',
+  'location' => 'includes/content.admin.inc:1017',
+  'textgroup' => 'default',
+  'source' => 'These settings apply only to the %field field as it appears in the %type content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '144',
+  'location' => 'includes/content.admin.inc:1031,  modules/fieldgroup/fieldgroup.module:145',
+  'textgroup' => 'default',
+  'source' => 'Help text',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '145',
+  'location' => 'includes/content.admin.inc:1034',
+  'textgroup' => 'default',
+  'source' => 'Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '146',
+  'location' => 'includes/content.admin.inc:1060',
+  'textgroup' => 'default',
+  'source' => 'Default value',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '147',
+  'location' => 'includes/content.admin.inc:1081,  modules/number/number.module:123,  modules/text/text.module:86',
+  'textgroup' => 'default',
+  'source' => 'PHP code',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '148',
+  'location' => 'includes/content.admin.inc:1090;1245,  includes/content.rules.inc:93',
+  'textgroup' => 'default',
+  'source' => "'@column' => value for @column",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '149',
+  'location' => 'includes/content.admin.inc:1092;1247,  includes/content.rules.inc:95',
+  'textgroup' => 'default',
+  'source' => "return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '150',
+  'location' => 'includes/content.admin.inc:1096;1109,  includes/content.rules.inc:99,  modules/number/number.module:130;139,  modules/text/text.module:93;102',
+  'textgroup' => 'default',
+  'source' => 'Code',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '151',
+  'location' => 'includes/content.admin.inc:1100',
+  'textgroup' => 'default',
+  'source' => 'Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '152',
+  'location' => 'includes/content.admin.inc:1110,  modules/number/number.module:140,  modules/text/text.module:103',
+  'textgroup' => 'default',
+  'source' => '&lt;none&gt;',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '153',
+  'location' => 'includes/content.admin.inc:1111,  modules/number/number.module:141,  modules/text/text.module:104',
+  'textgroup' => 'default',
+  'source' => "You're not allowed to input PHP code.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '154',
+  'location' => 'includes/content.admin.inc:1111',
+  'textgroup' => 'default',
+  'source' => 'This PHP code was set by an administrator and will override any value specified above.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '155',
+  'location' => 'includes/content.admin.inc:1118',
+  'textgroup' => 'default',
+  'source' => 'Global settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '156',
+  'location' => 'includes/content.admin.inc:1119',
+  'textgroup' => 'default',
+  'source' => 'These settings apply to the %field field in every content type in which it appears.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '157',
+  'location' => 'includes/content.admin.inc:1123',
+  'textgroup' => 'default',
+  'source' => 'Required',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '158',
+  'location' => 'includes/content.admin.inc:1126',
+  'textgroup' => 'default',
+  'source' => 'Maximum number of values users can enter for this field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '159',
+  'location' => 'includes/content.admin.inc:1128',
+  'textgroup' => 'default',
+  'source' => "'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '160',
+  'location' => 'includes/content.admin.inc:1130',
+  'textgroup' => 'default',
+  'source' => 'Warning! Changing this setting after data has been created could result in the loss of data!',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '161',
+  'location' => 'includes/content.admin.inc:1133',
+  'textgroup' => 'default',
+  'source' => 'Number of values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '162',
+  'location' => 'includes/content.admin.inc:1134,  modules/content_multigroup/content_multigroup.module:73',
+  'textgroup' => 'default',
+  'source' => 'Unlimited',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '163',
+  'location' => 'includes/content.admin.inc:1151,  modules/content_copy/content_copy.module:251',
+  'textgroup' => 'default',
+  'source' => 'Save field settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '164',
+  'location' => 'includes/content.admin.inc:1288',
+  'textgroup' => 'default',
+  'source' => "The PHP code for 'default value' returned @value, which is invalid.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '165',
+  'location' => 'includes/content.admin.inc:1292',
+  'textgroup' => 'default',
+  'source' => 'The default value is invalid.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '166',
+  'location' => 'includes/content.admin.inc:1316',
+  'textgroup' => 'default',
+  'source' => 'Added field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '167',
+  'location' => 'includes/content.admin.inc:1320',
+  'textgroup' => 'default',
+  'source' => 'Saved field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '168',
+  'location' => 'includes/content.admin.inc:1678',
+  'textgroup' => 'default',
+  'source' => 'Processing',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '169',
+  'location' => 'includes/content.admin.inc:1679',
+  'textgroup' => 'default',
+  'source' => 'The update has encountered an error.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '170',
+  'location' => 'includes/content.admin.inc:1693',
+  'textgroup' => 'default',
+  'source' => 'The database has been altered and data has been migrated or deleted.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '171',
+  'location' => 'includes/content.admin.inc:1696',
+  'textgroup' => 'default',
+  'source' => 'An error occurred and database alteration did not complete.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '172',
+  'location' => 'includes/content.admin.inc:1799',
+  'textgroup' => 'default',
+  'source' => 'Processing %title',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '173',
+  'location' => 'includes/content.admin.inc:1865',
+  'textgroup' => 'default',
+  'source' => '%name must be an integer.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '174',
+  'location' => 'includes/content.admin.inc:1875',
+  'textgroup' => 'default',
+  'source' => '%name must be a positive integer.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '175',
+  'location' => 'includes/content.admin.inc:1885',
+  'textgroup' => 'default',
+  'source' => '%name must be a number.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '176',
+  'location' => 'includes/content.admin.inc:1697',
+  'textgroup' => 'default',
+  'source' => '1 item successfully processed:',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '177',
+  'location' => 'includes/content.admin.inc:1697',
+  'textgroup' => 'default',
+  'source' => '@count items successfully processed:',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '178',
+  'location' => 'includes/content.crud.inc:589',
+  'textgroup' => 'default',
+  'source' => 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '179',
+  'location' => 'includes/content.crud.inc:633',
+  'textgroup' => 'default',
+  'source' => 'The content fields table %name has been deleted.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '180',
+  'location' => 'includes/content.node_form.inc:223',
+  'textgroup' => 'default',
+  'source' => 'Add another item',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '181',
+  'location' => 'includes/panels/content_types/content_field.inc:14',
+  'textgroup' => 'default',
+  'source' => 'Content field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '182',
+  'location' => 'includes/content.panels.inc:38',
+  'textgroup' => 'default',
+  'source' => 'A content field from the referenced node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '183',
+  'location' => 'includes/panels/content_types/content_field.inc:45,  modules/fieldgroup/fieldgroup.panels.inc:31,  modules/fieldgroup/panels/content_types/content_fieldgroup.inc:43',
+  'textgroup' => 'default',
+  'source' => 'Node',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '184',
+  'location' => 'includes/content.panels.inc:40,  modules/fieldgroup/fieldgroup.panels.inc:32',
+  'textgroup' => 'default',
+  'source' => 'Node context',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '185',
+  'location' => 'includes/panels/content_types/content_field.inc:100',
+  'textgroup' => 'default',
+  'source' => 'Block title',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '186',
+  'location' => 'includes/panels/content_types/content_field.inc:103',
+  'textgroup' => 'default',
+  'source' => 'Hidden',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '187',
+  'location' => 'includes/panels/content_types/content_field.inc:105',
+  'textgroup' => 'default',
+  'source' => 'Configure how the label is going to be displayed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '188',
+  'location' => 'includes/content.panels.inc:73',
+  'textgroup' => 'default',
+  'source' => 'Field / Formatter',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '189',
+  'location' => 'includes/content.panels.inc:76',
+  'textgroup' => 'default',
+  'source' => 'Select a field and formatter.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '190',
+  'location' => 'includes/content.panels.inc:92',
+  'textgroup' => 'default',
+  'source' => '"@s" field @name',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '191',
+  'location' => 'includes/content.rules.inc:15',
+  'textgroup' => 'default',
+  'source' => 'Populate a field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '192',
+  'location' => 'includes/content.rules.inc:23;224',
+  'textgroup' => 'default',
+  'source' => 'You should make sure that the used field exists in the given content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '193',
+  'location' => 'includes/content.rules.inc:53;276,  modules/nodereference/nodereference.rules.inc:45,  modules/userreference/userreference.rules.inc:47',
+  'textgroup' => 'default',
+  'source' => 'Field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '194',
+  'location' => 'includes/content.rules.inc:56',
+  'textgroup' => 'default',
+  'source' => 'Select the machine-name of the field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '195',
+  'location' => 'includes/content.rules.inc:84',
+  'textgroup' => 'default',
+  'source' => 'Advanced: Specify the fields value with PHP code',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '196',
+  'location' => 'not literally,  includes/content.rules.inc:102',
+  'textgroup' => 'default',
+  'source' => "Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href=\"@link_devel\">devel.module's</a> 'devel load' tab on a content page might help you figure out the expected format.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '197',
+  'location' => 'includes/content.rules.inc:130',
+  'textgroup' => 'default',
+  'source' => 'You have to return the default value in the expected format.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '198',
+  'location' => 'includes/content.rules.inc:193',
+  'textgroup' => 'default',
+  'source' => "Populate @node's field '@field'",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '199',
+  'location' => 'includes/content.rules.inc:210',
+  'textgroup' => 'default',
+  'source' => 'Field has value',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '200',
+  'location' => 'includes/content.rules.inc:215',
+  'textgroup' => 'default',
+  'source' => 'You should make sure that the used field exists in the given content type. The condition returns TRUE, if the selected field has the given value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '201',
+  'location' => 'includes/content.rules.inc:219',
+  'textgroup' => 'default',
+  'source' => 'Field has changed',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '202',
+  'location' => 'includes/content.rules.inc:221',
+  'textgroup' => 'default',
+  'source' => 'Content containing changes',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '203',
+  'location' => 'includes/content.rules.inc:222',
+  'textgroup' => 'default',
+  'source' => 'Content not containing changes',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '204',
+  'location' => 'includes/content.rules.inc:259',
+  'textgroup' => 'default',
+  'source' => "@node's field '@field' has value",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '205',
+  'location' => 'not literally,  includes/content.rules.inc:279,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'Select the machine-name of the field to look at.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '206',
+  'location' => '@node?,  includes/content.rules.inc:285',
+  'textgroup' => 'default',
+  'source' => "@node's field '@field' has been changed",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '207',
+  'location' => 'includes/content.token.inc:12;15',
+  'textgroup' => 'default',
+  'source' => 'Token',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '208',
+  'location' => 'includes/content.token.inc:81',
+  'textgroup' => 'default',
+  'source' => 'Referenced node ID',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '209',
+  'location' => 'includes/content.token.inc:82',
+  'textgroup' => 'default',
+  'source' => 'Referenced node title',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '210',
   'location' => 'includes/content.token.inc:83',
   'textgroup' => 'default',
-  'source' => 'Referenced node unfiltered title. WARNING - raw user input.',
+  'source' => 'Referenced node unfiltered title. WARNING - raw user input.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '211',
+  'location' => 'includes/content.token.inc:84',
+  'textgroup' => 'default',
+  'source' => 'Formatted html link to the referenced node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '212',
+  'location' => 'includes/content.token.inc:85',
+  'textgroup' => 'default',
+  'source' => 'Relative path alias to the referenced node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '213',
+  'location' => 'includes/content.token.inc:86',
+  'textgroup' => 'default',
+  'source' => 'Absolute path alias to the referenced node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '214',
+  'location' => 'includes/content.token.inc:114',
+  'textgroup' => 'default',
+  'source' => 'Raw number value',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '215',
+  'location' => 'includes/content.token.inc:115',
+  'textgroup' => 'default',
+  'source' => 'Formatted number value',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '216',
+  'location' => 'includes/content.token.inc:138',
+  'textgroup' => 'default',
+  'source' => 'Raw, unfiltered text',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '217',
+  'location' => 'includes/content.token.inc:139',
+  'textgroup' => 'default',
+  'source' => 'Formatted and filtered text',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '218',
+  'location' => 'includes/content.token.inc:161',
+  'textgroup' => 'default',
+  'source' => 'Referenced user ID',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '219',
+  'location' => 'includes/content.token.inc:162',
+  'textgroup' => 'default',
+  'source' => 'Referenced user name',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '220',
+  'location' => 'includes/content.token.inc:163',
+  'textgroup' => 'default',
+  'source' => 'Formatted HTML link to referenced user',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '221',
+  'location' => 'includes/content.token.inc:164',
+  'textgroup' => 'default',
+  'source' => 'Relative path alias to the referenced user.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '222',
+  'location' => 'includes/content.token.inc:165',
+  'textgroup' => 'default',
+  'source' => 'Absolute path alias to the referenced user.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '223',
+  'location' => 'includes/views/content.views.inc:245;261',
+  'textgroup' => 'default',
+  'source' => '@label (!name)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '224',
+  'location' => 'includes/views/content.views.inc:249',
+  'textgroup' => 'default',
+  'source' => '@label (!name) - !column',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '225',
+  'location' => 'includes/views/content.views.inc:250',
+  'textgroup' => 'default',
+  'source' => '@label-truncated - !column',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '226',
+  'location' => 'includes/views/content.views.inc:257',
+  'textgroup' => 'default',
+  'source' => 'Appears in: @types',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '227',
+  'location' => 'includes/views/handlers/content_handler_field.inc:56',
+  'textgroup' => 'default',
+  'source' => 'None',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '228',
+  'location' => 'includes/views/handlers/content_handler_field.inc:57',
+  'textgroup' => 'default',
+  'source' => 'Widget label (@label)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '229',
+  'location' => 'includes/views/handlers/content_handler_field.inc:58',
+  'textgroup' => 'default',
+  'source' => 'Custom',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '230',
+  'location' => 'includes/views/handlers/content_handler_field.inc:64',
+  'textgroup' => 'default',
+  'source' => 'Custom label',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '231',
+  'location' => 'includes/views/handlers/content_handler_field.inc:80',
+  'textgroup' => 'default',
+  'source' => 'Format',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '232',
+  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:56',
+  'textgroup' => 'default',
+  'source' => 'Group multiple values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '233',
+  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:61',
+  'textgroup' => 'default',
+  'source' => 'If unchecked, each item in the field will create a new row, which may appear to cause duplicates. This setting is not compatible with click-sorting in table displays.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '234',
+  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:63',
+  'textgroup' => 'default',
+  'source' => 'Show @count value(s)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '235',
+  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:74',
+  'textgroup' => 'default',
+  'source' => 'starting from @count',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '236',
+  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:85',
+  'textgroup' => 'default',
+  'source' => 'Reversed (start from last values)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '237',
+  'location' => 'includes/views/handlers/content_handler_relationship.inc:40,  includes/views/handlers/content_handler_sort.inc:41',
+  'textgroup' => 'default',
+  'source' => 'All',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '238',
+  'location' => 'includes/views/handlers/content_handler_relationship.inc:48,  includes/views/handlers/content_handler_sort.inc:49',
+  'textgroup' => 'default',
+  'source' => 'Delta',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '239',
+  'location' => 'includes/views/handlers/content_handler_relationship.inc:49',
+  'textgroup' => 'default',
+  'source' => 'The delta allows you to select which item in a multiple value field to key the relationship off of. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '240',
+  'location' => 'includes/views/handlers/content_handler_sort.inc:50',
+  'textgroup' => 'default',
+  'source' => 'The delta allows you to select which item in a multiple value field will be used for sorting. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '241',
+  'location' => 'modules/content_copy/content_copy_export_form.tpl.php:9,  modules/content_copy/content_copy.module:191;38',
+  'textgroup' => 'default',
+  'source' => 'Export',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '242',
+  'location' => 'modules/content_copy/content_copy.module:97',
+  'textgroup' => 'default',
+  'source' => 'This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to into an existing content type or create a new content type that includes the selected fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '243',
+  'location' => 'modules/content_copy/content_copy.module:103',
+  'textgroup' => 'default',
+  'source' => 'Types',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '244',
+  'location' => 'modules/content_copy/content_copy.module:107',
+  'textgroup' => 'default',
+  'source' => 'Select the content type to export.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '245',
+  'location' => 'modules/content_copy/content_copy.module:175',
+  'textgroup' => 'default',
+  'source' => 'Export data',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '246',
+  'location' => 'modules/content_copy/content_copy.module:180',
+  'textgroup' => 'default',
+  'source' => 'Copy the export text and paste it into another content type using the import function.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '247',
+  'location' => 'content_admin.inc:42',
+  'textgroup' => 'default',
+  'source' => 'Content types',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '248',
+  'location' => 'modules/content_copy/content_copy.module:308',
+  'textgroup' => 'default',
+  'source' => 'Content type',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '249',
+  'location' => 'modules/content_copy/content_copy.module:309',
+  'textgroup' => 'default',
+  'source' => 'Select the content type to import these fields into.<br/>Select &lt;Create&gt; to create a new content type to contain the fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '250',
+  'location' => 'modules/content_copy/content_copy.module:314',
+  'textgroup' => 'default',
+  'source' => 'Import data',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '251',
+  'location' => 'modules/content_copy/content_copy.module:316',
+  'textgroup' => 'default',
+  'source' => 'Paste the text created by a content export into this field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '252',
+  'location' => 'modules/content_copy/content_copy.module:320;46',
+  'textgroup' => 'default',
+  'source' => 'Import',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '253',
+  'location' => 'modules/content_copy/content_copy.module:328',
+  'textgroup' => 'default',
+  'source' => 'A file has been pre-loaded for import.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '254',
+  'location' => 'modules/content_copy/content_copy.module:354',
+  'textgroup' => 'default',
+  'source' => 'The import data is not valid import text.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '255',
+  'location' => 'modules/content_copy/content_copy.module:403',
+  'textgroup' => 'default',
+  'source' => 'The following modules must be enabled for this import to work: %modules.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '256',
+  'location' => 'modules/content_copy/content_copy.module:411',
+  'textgroup' => 'default',
+  'source' => 'The content type %type already exists in this database.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '257',
+  'location' => 'modules/content_copy/content_copy.module:418',
+  'textgroup' => 'default',
+  'source' => 'Exiting. No import performed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '258',
+  'location' => 'modules/content_copy/content_copy.module:442',
+  'textgroup' => 'default',
+  'source' => 'An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '259',
+  'location' => 'modules/content_copy/content_copy.module:467',
+  'textgroup' => 'default',
+  'source' => 'The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '260',
+  'location' => 'modules/content_copy/content_copy.module:476',
+  'textgroup' => 'default',
+  'source' => 'The field %field_label (%field_name) was added to the content type %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '261',
+  'location' => 'modules/content_copy/content_copy.module:0',
+  'textgroup' => 'default',
+  'source' => 'content_copy',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '262',
+  'location' => 'modules/content_copy/content_copy.info:0',
+  'textgroup' => 'default',
+  'source' => 'Content Copy',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '263',
+  'location' => 'modules/content_copy/content_copy.info:0',
+  'textgroup' => 'default',
+  'source' => 'Enables ability to import/export field definitions.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '264',
+  'location' => 'modules/content_multigroup/content_multigroup.module:12',
+  'textgroup' => 'default',
+  'source' => 'The fields in a Standard group are independent of each other and each can have either single or multiple values. The fields in a Multigroup are treated as a repeating collection of single value fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '265',
+  'location' => 'modules/content_multigroup/content_multigroup.module:65;135',
+  'textgroup' => 'default',
+  'source' => 'Multigroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '266',
+  'location' => 'modules/content_multigroup/content_multigroup.module:134',
+  'textgroup' => 'default',
+  'source' => 'Standard',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '267',
+  'location' => 'includes/content.admin.inc:344,  modules/content_multigroup/content_multigroup.module:126',
+  'textgroup' => 'default',
+  'source' => 'Type of group.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '268',
+  'location' => 'modules/content_multigroup/content_multigroup.module:215',
+  'textgroup' => 'default',
+  'source' => 'The field %field has been updated to use %multiple values, to match the multiple value setting of the Multigroup %group.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '269',
+  'location' => 'modules/content_multigroup/content_multigroup.module:248',
+  'textgroup' => 'default',
+  'source' => 'This change is not allowed. The field %field already has %multiple values in the database but the group %group only allows %group_max. Making this change would result in the loss of data.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '270',
+  'location' => 'modules/content_multigroup/content_multigroup.module:272',
+  'textgroup' => 'default',
+  'source' => 'This change is not allowed. The field %field handles multiple values differently than the Content module. Making this change could result in the loss of data.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '271',
+  'location' => 'modules/content_multigroup/content_multigroup.module:287',
+  'textgroup' => 'default',
+  'source' => 'You are moving the field %field into a Multigroup.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '272',
+  'location' => 'modules/content_multigroup/content_multigroup.module:320',
+  'textgroup' => 'default',
+  'source' => 'This change is not allowed. The field %field already has data created and uses a widget that stores data differently in a Standard group than in a Multigroup. Making this change could result in the loss of data.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '273',
+  'location' => 'modules/content_multigroup/content_multigroup.module:334',
+  'textgroup' => 'default',
+  'source' => 'You are moving the field %field out of a Multigroup.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '274',
+  'location' => 'modules/content_multigroup/content_multigroup.module:369',
+  'textgroup' => 'default',
+  'source' => 'Simple',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '275',
+  'location' => 'modules/content_multigroup/content_multigroup.module:370',
+  'textgroup' => 'default',
+  'source' => 'Fieldset',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '276',
+  'location' => 'modules/content_multigroup/content_multigroup.module:371',
+  'textgroup' => 'default',
+  'source' => 'Horizontal line',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '277',
+  'location' => 'modules/content_multigroup/content_multigroup.module:372',
+  'textgroup' => 'default',
+  'source' => 'Table - Single column',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '278',
+  'location' => 'modules/content_multigroup/content_multigroup.module:373',
+  'textgroup' => 'default',
+  'source' => 'Table - Multiple columns',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '279',
+  'location' => 'modules/content_multigroup/content_multigroup.module:384',
+  'textgroup' => 'default',
+  'source' => '[Subgroup format]',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '280',
+  'location' => 'modules/content_multigroup/content_multigroup.module:461',
+  'textgroup' => 'default',
+  'source' => 'Multigroup settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '281',
+  'location' => 'modules/content_multigroup/content_multigroup.module:476',
+  'textgroup' => 'default',
+  'source' => 'Multiple columns',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '282',
+  'location' => 'modules/content_multigroup/content_multigroup.module:478',
+  'textgroup' => 'default',
+  'source' => 'Enable this option to render each field on a separate column on the node edit form.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '283',
+  'location' => 'modules/content_multigroup/content_multigroup.module:485',
+  'textgroup' => 'default',
+  'source' => 'Enable this option to require a minimum of one collection of fields in this Multigroup.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '284',
+  'location' => 'modules/content_multigroup/content_multigroup.module:488',
+  'textgroup' => 'default',
+  'source' => 'Number of times to repeat the collection of Multigroup fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '285',
+  'location' => 'modules/content_multigroup/content_multigroup.module:489',
+  'textgroup' => 'default',
+  'source' => "'Unlimited' will provide an 'Add more' button so the users can add items as many times as they like.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '286',
+  'location' => 'modules/content_multigroup/content_multigroup.module:490',
+  'textgroup' => 'default',
+  'source' => 'All fields in this group will automatically be set to allow this number of values.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '287',
+  'location' => 'modules/content_multigroup/content_multigroup.module:495',
+  'textgroup' => 'default',
+  'source' => 'Number of repeats',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '288',
+  'location' => 'modules/content_multigroup/content_multigroup.module:503',
+  'textgroup' => 'default',
+  'source' => 'Labels',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '289',
+  'location' => 'modules/content_multigroup/content_multigroup.module:504',
+  'textgroup' => 'default',
+  'source' => "Labels for each subgroup of fields. Labels can be hidden or shown in various contexts using the 'Display fields' screen.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '290',
+  'location' => 'modules/content_multigroup/content_multigroup.module:512',
+  'textgroup' => 'default',
+  'source' => 'Subgroup %number label',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '291',
+  'location' => 'modules/content_multigroup/content_multigroup.module:539',
+  'textgroup' => 'default',
+  'source' => 'The field %field in this group already has %multiple values in the database. To prevent the loss of data you cannot set the number of Multigroup values to less than this.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '292',
+  'location' => 'modules/content_multigroup/content_multigroup.module:932',
+  'textgroup' => 'default',
+  'source' => '!name field is required in group @group.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '293',
+  'location' => 'modules/content_multigroup/content_multigroup.module:946',
+  'textgroup' => 'default',
+  'source' => 'Group @name requires one collection of fields minimum.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '294',
+  'location' => 'modules/content_multigroup/content_multigroup.module:1145',
+  'textgroup' => 'default',
+  'source' => 'Add more values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '295',
+  'location' => 'modules/content_multigroup/content_multigroup.module:0',
+  'textgroup' => 'default',
+  'source' => 'content_multigroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '296',
+  'location' => 'modules/content_multigroup/content_multigroup.info:0',
+  'textgroup' => 'default',
+  'source' => 'Content Multigroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '297',
+  'location' => 'modules/content_multigroup/content_multigroup.info:0',
+  'textgroup' => 'default',
+  'source' => 'Combine multiple CCK fields into repeating field collections that work in unison.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '298',
+  'location' => 'modules/content_permissions/content_permissions.module:10',
+  'textgroup' => 'default',
+  'source' => 'edit',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '299',
+  'location' => 'modules/content_permissions/content_permissions.module:10;11',
+  'textgroup' => 'default',
+  'source' => 'field_name',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '300',
+  'location' => 'modules/content_permissions/content_permissions.module:11',
+  'textgroup' => 'default',
+  'source' => 'view',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '301',
+  'location' => 'modules/content_permissions/content_permissions.module:0',
+  'textgroup' => 'default',
+  'source' => 'content_permissions',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '302',
+  'location' => 'modules/content_permissions/content_permissions.install:9',
+  'textgroup' => 'default',
+  'source' => 'Please <a href="!url">configure your field permissions</a> immediately. All fields are inaccessible by default.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '303',
+  'location' => 'modules/content_permissions/content_permissions.info:0',
+  'textgroup' => 'default',
+  'source' => 'Content Permissions',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '304',
+  'location' => 'modules/content_permissions/content_permissions.info:0',
+  'textgroup' => 'default',
+  'source' => 'Set field-level permissions for CCK fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '305',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:10;27,  modules/fieldgroup/panels/content_types/content_fieldgroup.inc:14',
+  'textgroup' => 'default',
+  'source' => 'Content fieldgroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '306',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:30',
+  'textgroup' => 'default',
+  'source' => 'All fields from a fieldgroup on the referenced node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '307',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:91',
+  'textgroup' => 'default',
+  'source' => '@group_label (@group_type_name)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '308',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:102,  modules/fieldgroup/fieldgroup.info:0',
+  'textgroup' => 'default',
+  'source' => 'Fieldgroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '309',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:112,  modules/fieldgroup/panels/content_types/content_fieldgroup.inc:102',
+  'textgroup' => 'default',
+  'source' => 'Text to display if group has no data. Note that title will not display unless overridden.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '310',
+  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:128',
+  'textgroup' => 'default',
+  'source' => '"@s" fieldgroup @name',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '311',
+  'location' => 'modules/fieldgroup/fieldgroup.module:124',
+  'textgroup' => 'default',
+  'source' => 'Form settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '312',
+  'location' => 'modules/fieldgroup/fieldgroup.module:125',
+  'textgroup' => 'default',
+  'source' => 'These settings apply to the group in the node editing form.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '313',
+  'location' => 'modules/fieldgroup/fieldgroup.module:129',
+  'textgroup' => 'default',
+  'source' => 'Style',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '314',
+  'location' => 'modules/fieldgroup/fieldgroup.module:132',
+  'textgroup' => 'default',
+  'source' => 'always open',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '315',
+  'location' => 'modules/fieldgroup/fieldgroup.module:133',
+  'textgroup' => 'default',
+  'source' => 'collapsible',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '316',
+  'location' => 'modules/fieldgroup/fieldgroup.module:134',
+  'textgroup' => 'default',
+  'source' => 'collapsed',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '317',
+  'location' => 'modules/fieldgroup/fieldgroup.module:142',
+  'textgroup' => 'default',
+  'source' => 'Instructions to present to the user on the editing form.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '318',
+  'location' => 'modules/fieldgroup/fieldgroup.module:147',
+  'textgroup' => 'default',
+  'source' => 'Display settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '319',
+  'location' => 'modules/fieldgroup/fieldgroup.module:148',
+  'textgroup' => 'default',
+  'source' => 'These settings apply to the group on node display.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '320',
+  'location' => 'modules/fieldgroup/fieldgroup.module:155',
+  'textgroup' => 'default',
+  'source' => 'A description of the group.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '321',
+  'location' => 'modules/fieldgroup/fieldgroup.module:200',
+  'textgroup' => 'default',
+  'source' => 'Are you sure you want to remove the group %label?',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '322',
+  'location' => 'modules/fieldgroup/fieldgroup.module:202',
+  'textgroup' => 'default',
+  'source' => 'This action cannot be undone.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '323',
+  'location' => 'modules/fieldgroup/fieldgroup.module:211',
+  'textgroup' => 'default',
+  'source' => 'The group %group_name has been removed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '324',
+  'location' => 'modules/content_multigroup/content_multigroup.module:356,  modules/fieldgroup/fieldgroup.module:266',
+  'textgroup' => 'default',
+  'source' => 'none',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '325',
+  'location' => 'modules/fieldgroup/fieldgroup.module:353',
+  'textgroup' => 'default',
+  'source' => 'You need to provide a label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '326',
+  'location' => 'modules/fieldgroup/fieldgroup.module:358',
+  'textgroup' => 'default',
+  'source' => 'You need to provide a group name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '327',
+  'location' => 'modules/fieldgroup/fieldgroup.module:372',
+  'textgroup' => 'default',
+  'source' => 'The group name %group_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '328',
+  'location' => 'modules/fieldgroup/fieldgroup.module:375',
+  'textgroup' => 'default',
+  'source' => "The group name %group_name is too long. The name is limited to 32 characters, including the 'group_' prefix.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '329',
+  'location' => 'modules/fieldgroup/fieldgroup.module:381',
+  'textgroup' => 'default',
+  'source' => 'The group name %group_name already exists.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '330',
+  'location' => 'modules/fieldgroup/fieldgroup.module:400;403',
+  'textgroup' => 'default',
+  'source' => 'Add new group:',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '331',
+  'location' => 'modules/fieldgroup/fieldgroup.module:418',
+  'textgroup' => 'default',
+  'source' => 'Add new group: you need to provide a label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '332',
+  'location' => 'modules/fieldgroup/fieldgroup.module:419',
+  'textgroup' => 'default',
+  'source' => 'Add new group: you need to provide a group name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '333',
+  'location' => 'modules/fieldgroup/fieldgroup.module:648',
+  'textgroup' => 'default',
+  'source' => 'Standard group',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '334',
+  'location' => 'modules/fieldgroup/fieldgroup.module:39;46',
+  'textgroup' => 'default',
+  'source' => 'Edit group',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '335',
+  'location' => 'modules/fieldgroup/fieldgroup.module:0',
+  'textgroup' => 'default',
+  'source' => 'fieldgroup',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '336',
+  'location' => 'modules/fieldgroup/fieldgroup.info:0',
+  'textgroup' => 'default',
+  'source' => 'Create display groups for CCK fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '337',
+  'location' => 'modules/nodereference/nodereference.rules.inc:15',
+  'textgroup' => 'default',
+  'source' => 'Load a referenced node',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '338',
+  'location' => 'modules/nodereference/nodereference.rules.inc:19',
+  'textgroup' => 'default',
+  'source' => 'Content containing the node reference field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '339',
+  'location' => 'modules/nodereference/nodereference.rules.inc:25',
+  'textgroup' => 'default',
+  'source' => 'Referenced content',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '340',
+  'location' => 'modules/nodereference/nodereference.rules.inc:29',
+  'textgroup' => 'default',
+  'source' => 'Note that if the field has multiple values, only the first content node will be loaded.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '341',
+  'location' => 'modules/nodereference/nodereference.rules.inc:50',
+  'textgroup' => 'default',
+  'source' => 'There are no nodereference fields defined.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '342',
+  'location' => 'modules/nodereference/nodereference.module:60',
+  'textgroup' => 'default',
+  'source' => 'Node reference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '343',
+  'location' => 'modules/nodereference/nodereference.module:61',
+  'textgroup' => 'default',
+  'source' => 'Store the ID of a related node as an integer value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '344',
+  'location' => 'nodereference.module:51',
+  'textgroup' => 'default',
+  'source' => 'Content types that can be referenced',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '345',
+  'location' => 'modules/nodereference/nodereference.module:97,  modules/userreference/userreference.module:94',
+  'textgroup' => 'default',
+  'source' => 'Default Views',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '346',
+  'location' => 'modules/nodereference/nodereference.module:100,  modules/userreference/userreference.module:97',
+  'textgroup' => 'default',
+  'source' => 'Existing Views',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '347',
+  'location' => 'modules/nodereference/nodereference.module:97',
+  'textgroup' => 'default',
+  'source' => 'Advanced - Nodes that can be referenced (View)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '348',
+  'location' => 'modules/nodereference/nodereference.module:104',
+  'textgroup' => 'default',
+  'source' => 'View used to select the nodes',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '349',
+  'location' => 'modules/nodereference/nodereference.module:107',
+  'textgroup' => 'default',
+  'source' => '<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '350',
+  'location' => 'modules/nodereference/nodereference.module:108;121',
+  'textgroup' => 'default',
+  'source' => "<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the \"Content types\" settings above. Use the view's \"filters\" section instead.</li><li>Use the view's \"fields\" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view's \"sort criteria\" section to determine the order in which candidate nodes will be displayed.</li></ul>",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '351',
+  'location' => 'modules/nodereference/nodereference.module:122,  modules/userreference/userreference.module:119',
+  'textgroup' => 'default',
+  'source' => 'View arguments',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '352',
+  'location' => 'modules/nodereference/nodereference.module:125,  modules/userreference/userreference.module:122',
+  'textgroup' => 'default',
+  'source' => 'Provide a comma separated list of arguments to pass to the view.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '353',
+  'location' => 'modules/nodereference/nodereference.module:120',
+  'textgroup' => 'default',
+  'source' => '<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '354',
+  'location' => 'modules/nodereference/nodereference.module:216,  modules/userreference/userreference.module:195',
+  'textgroup' => 'default',
+  'source' => '%name: invalid input.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '355',
+  'location' => 'modules/nodereference/nodereference.module:217',
+  'textgroup' => 'default',
+  'source' => "%name: this post can't be referenced.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '356',
+  'location' => 'modules/nodereference/nodereference.module:242',
+  'textgroup' => 'default',
+  'source' => 'Title (link)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '357',
+  'location' => 'modules/nodereference/nodereference.module:247',
+  'textgroup' => 'default',
+  'source' => 'Title (no link)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '358',
+  'location' => 'modules/nodereference/nodereference.module:358,  modules/optionwidgets/optionwidgets.module:80,  modules/userreference/userreference.module:284',
+  'textgroup' => 'default',
+  'source' => 'Select list',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '359',
+  'location' => 'modules/nodereference/nodereference.module:366,  modules/optionwidgets/optionwidgets.module:88,  modules/userreference/userreference.module:292',
+  'textgroup' => 'default',
+  'source' => 'Check boxes/radio buttons',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '360',
+  'location' => 'modules/nodereference/nodereference.module:374,  modules/userreference/userreference.module:300',
+  'textgroup' => 'default',
+  'source' => 'Autocomplete text field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '361',
+  'location' => 'modules/nodereference/nodereference.module:429,  modules/userreference/userreference.module:355',
+  'textgroup' => 'default',
+  'source' => 'Autocomplete matching',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '362',
+  'location' => 'modules/nodereference/nodereference.module:432,  modules/userreference/userreference.module:358',
+  'textgroup' => 'default',
+  'source' => 'Starts with',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '363',
+  'location' => 'modules/nodereference/nodereference.module:433,  modules/userreference/userreference.module:359',
+  'textgroup' => 'default',
+  'source' => 'Contains',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '364',
+  'location' => 'modules/nodereference/nodereference.module:423',
+  'textgroup' => 'default',
+  'source' => 'Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '365',
+  'location' => 'modules/nodereference/nodereference.module:671',
+  'textgroup' => 'default',
+  'source' => '%name: title mismatch. Please check your selection.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '366',
+  'location' => 'modules/nodereference/nodereference.module:678',
+  'textgroup' => 'default',
+  'source' => '%name: found no valid post with that title.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '367',
+  'location' => 'modules/nodereference/nodereference.module:15',
+  'textgroup' => 'default',
+  'source' => 'Nodereference autocomplete',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '368',
+  'location' => 'nodereference.module:0',
+  'textgroup' => 'default',
+  'source' => 'nodereference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '369',
+  'location' => 'modules/nodereference/nodereference.info:0',
+  'textgroup' => 'default',
+  'source' => 'Node Reference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '370',
+  'location' => 'modules/nodereference/nodereference.info:0',
+  'textgroup' => 'default',
+  'source' => 'Defines a field type for referencing one node from another.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '371',
+  'location' => 'modules/number/number.module:34',
+  'textgroup' => 'default',
+  'source' => 'Integer',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '372',
+  'location' => 'modules/number/number.module:35',
+  'textgroup' => 'default',
+  'source' => 'Store a number in the database as an integer.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '373',
+  'location' => 'modules/number/number.module:38',
+  'textgroup' => 'default',
+  'source' => 'Decimal',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '374',
+  'location' => 'modules/number/number.module:39',
+  'textgroup' => 'default',
+  'source' => 'Store a number in the database in a fixed decimal format.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '375',
+  'location' => 'modules/number/number.module:42',
+  'textgroup' => 'default',
+  'source' => 'Float',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '376',
+  'location' => 'modules/number/number.module:43',
+  'textgroup' => 'default',
+  'source' => 'Store a number in the database in a floating point format.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '377',
+  'location' => 'modules/number/number.module:57',
+  'textgroup' => 'default',
+  'source' => 'Minimum',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '378',
+  'location' => 'modules/number/number.module:63',
+  'textgroup' => 'default',
+  'source' => 'Maximum',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '379',
+  'location' => 'modules/number/number.module:71',
+  'textgroup' => 'default',
+  'source' => 'Precision',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '380',
+  'location' => 'modules/number/number.module:72',
+  'textgroup' => 'default',
+  'source' => 'The total number of digits to store in the database, including those to the right of the decimal.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '381',
+  'location' => 'modules/number/number.module:78',
+  'textgroup' => 'default',
+  'source' => 'Scale',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '382',
+  'location' => 'modules/number/number.module:79',
+  'textgroup' => 'default',
+  'source' => 'The number of digits to the right of the decimal.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '383',
+  'location' => 'modules/number/number.module:85',
+  'textgroup' => 'default',
+  'source' => 'Decimal marker',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '384',
+  'location' => 'modules/number/number.module:86',
+  'textgroup' => 'default',
+  'source' => 'The character users will input to mark the decimal point in forms.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '385',
+  'location' => 'modules/number/number.module:92',
+  'textgroup' => 'default',
+  'source' => 'Prefix',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '386',
+  'location' => 'modules/number/number.module:95',
+  'textgroup' => 'default',
+  'source' => 'Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '387',
+  'location' => 'modules/number/number.module:99',
+  'textgroup' => 'default',
+  'source' => 'Suffix',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '388',
+  'location' => 'modules/number/number.module:102',
+  'textgroup' => 'default',
+  'source' => 'Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '389',
+  'location' => 'modules/number/number.module:109,  modules/text/text.module:72',
+  'textgroup' => 'default',
+  'source' => 'Allowed values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '390',
+  'location' => 'modules/number/number.module:115,  modules/text/text.module:78',
+  'textgroup' => 'default',
+  'source' => 'Allowed values list',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '391',
+  'location' => 'modules/number/number.module:119,  modules/text/text.module:82',
+  'textgroup' => 'default',
+  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '392',
+  'location' => 'modules/number/number.module:133,  modules/text/text.module:96',
+  'textgroup' => 'default',
+  'source' => 'Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '393',
+  'location' => 'modules/number/number.module:141,  modules/text/text.module:104',
+  'textgroup' => 'default',
+  'source' => 'This PHP code was set by an administrator and will override the allowed values list above.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '394',
+  'location' => 'modules/number/number.module:181,  modules/text/text.module:133',
+  'textgroup' => 'default',
+  'source' => '@label (!name) - Allowed values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '395',
+  'location' => 'modules/number/number.module:195',
+  'textgroup' => 'default',
+  'source' => '"Minimum" must be a number.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '396',
+  'location' => 'modules/number/number.module:202',
+  'textgroup' => 'default',
+  'source' => '"Maximum" must be a number.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '397',
+  'location' => 'modules/number/number.module:219',
+  'textgroup' => 'default',
+  'source' => '%name: the value may be no smaller than %min.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '398',
+  'location' => 'modules/number/number.module:222',
+  'textgroup' => 'default',
+  'source' => '%name: the value may be no larger than %max.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '399',
+  'location' => 'modules/number/number.module:238,  modules/text/text.module:157',
+  'textgroup' => 'default',
+  'source' => '%name: illegal value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '400',
+  'location' => 'modules/number/number.module:270',
+  'textgroup' => 'default',
+  'source' => 'unformatted',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '401',
+  'location' => 'modules/number/number.module:356,  modules/text/text.module:257',
+  'textgroup' => 'default',
+  'source' => 'Text field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '402',
+  'location' => 'Float validation: English needs work,  modules/number/number.module:509,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'Only numbers and decimals are allowed in %field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '403',
+  'location' => 'Integer validation: English needs work,  modules/number/number.module:532,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'Only numbers are allowed in %field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '404',
+  'location' => 'Decimal validation with decimal character: English needs work,  modules/number/number.module:556,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'Only numbers and the decimal character (%decimal) are allowed in %field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '405',
+  'location' => 'modules/number/number.module:0',
+  'textgroup' => 'default',
+  'source' => 'number',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '406',
+  'location' => 'modules/number/number.info:0',
+  'textgroup' => 'default',
+  'source' => 'Number',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '407',
+  'location' => 'modules/number/number.info:0',
+  'textgroup' => 'default',
+  'source' => 'Defines numeric field types.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '408',
+  'location' => 'modules/optionwidgets/optionwidgets.module:19',
+  'textgroup' => 'default',
+  'source' => 'Create a list of options as a list in <strong>Allowed values list</strong> or as an array in PHP code. These values will be the same for %field in all content types.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '409',
+  'location' => 'modules/optionwidgets/optionwidgets.module:22',
+  'textgroup' => 'default',
+  'source' => "For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '410',
+  'location' => 'modules/optionwidgets/optionwidgets.module:25',
+  'textgroup' => 'default',
+  'source' => "The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '411',
+  'location' => 'modules/optionwidgets/optionwidgets.module:37',
+  'textgroup' => 'default',
+  'source' => "You need to specify the 'allowed values' for this field.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '412',
+  'location' => 'modules/optionwidgets/optionwidgets.module:96',
+  'textgroup' => 'default',
+  'source' => 'Single on/off checkbox',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '413',
+  'location' => 'modules/optionwidgets/optionwidgets.module:331',
+  'textgroup' => 'default',
+  'source' => '%name: this field cannot hold more that @count values.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '414',
+  'location' => 'modules/optionwidgets/optionwidgets.module:411',
+  'textgroup' => 'default',
+  'source' => 'N/A',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '415',
+  'location' => 'modules/optionwidgets/optionwidgets.module:415',
+  'textgroup' => 'default',
+  'source' => '- None -',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '416',
+  'location' => 'modules/optionwidgets/optionwidgets.module:0',
+  'textgroup' => 'default',
+  'source' => 'optionwidgets',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '417',
+  'location' => 'modules/optionwidgets/optionwidgets.info:0',
+  'textgroup' => 'default',
+  'source' => 'Option Widgets',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '418',
+  'location' => 'modules/optionwidgets/optionwidgets.info:0',
+  'textgroup' => 'default',
+  'source' => 'Defines selection, check box and radio button widgets for text and numeric fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '419',
+  'location' => 'modules/text/text.module:42',
+  'textgroup' => 'default',
+  'source' => 'Store text in the database.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '420',
+  'location' => 'modules/text/text.module:55;202,  modules/userreference/userreference.module:237',
+  'textgroup' => 'default',
+  'source' => 'Plain text',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '421',
+  'location' => 'modules/text/text.module:55',
+  'textgroup' => 'default',
+  'source' => 'Filtered text (user selects input format)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '422',
+  'location' => 'modules/text/text.module:58',
+  'textgroup' => 'default',
+  'source' => 'Text processing',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '423',
+  'location' => 'modules/text/text.module:64',
+  'textgroup' => 'default',
+  'source' => 'Maximum length',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '424',
+  'location' => 'modules/text/text.module:68',
+  'textgroup' => 'default',
+  'source' => 'The maximum length of the field in characters. Leave blank for an unlimited size.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '425',
+  'location' => 'modules/text/text.module:160',
+  'textgroup' => 'default',
+  'source' => '%name: the value may not be longer than %max characters.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '426',
+  'location' => 'modules/text/text.module:197,  modules/userreference/userreference.module:232',
+  'textgroup' => 'default',
+  'source' => 'Default',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '427',
+  'location' => 'modules/text/text.module:207',
+  'textgroup' => 'default',
+  'source' => 'Trimmed',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '428',
+  'location' => 'modules/text/text.module:265',
+  'textgroup' => 'default',
+  'source' => 'Text area (multiple rows)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '429',
+  'location' => 'modules/nodereference/nodereference.module:439,  modules/text/text.module:317,  modules/userreference/userreference.module:365',
+  'textgroup' => 'default',
+  'source' => 'Size of textfield',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '430',
+  'location' => 'modules/text/text.module:326',
+  'textgroup' => 'default',
+  'source' => 'Rows',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '431',
+  'location' => 'modules/text/text.module:0',
+  'textgroup' => 'default',
+  'source' => 'text',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '432',
+  'location' => 'modules/text/text.info:0',
+  'textgroup' => 'default',
+  'source' => 'Defines simple text field types.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '433',
+  'location' => 'modules/userreference/userreference.rules.inc:15',
+  'textgroup' => 'default',
+  'source' => 'Load a referenced user',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '434',
+  'location' => 'modules/userreference/userreference.rules.inc:19',
+  'textgroup' => 'default',
+  'source' => 'Content containing the user reference field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '435',
+  'location' => 'modules/userreference/userreference.rules.inc:25',
+  'textgroup' => 'default',
+  'source' => 'Referenced user',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '436',
+  'location' => 'modules/userreference/userreference.rules.inc:29',
+  'textgroup' => 'default',
+  'source' => 'Note that if the field has multiple values, only the first user will be loaded.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '437',
+  'location' => 'modules/userreference/userreference.rules.inc:52',
+  'textgroup' => 'default',
+  'source' => 'There are no userreference fields defined.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '438',
+  'location' => 'modules/userreference/userreference.module:52',
+  'textgroup' => 'default',
+  'source' => 'User reference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '439',
+  'location' => 'modules/userreference/userreference.module:53',
+  'textgroup' => 'default',
+  'source' => 'Store the ID of a related user as an integer value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '440',
+  'location' => 'modules/userreference/userreference.module:67',
+  'textgroup' => 'default',
+  'source' => 'User roles that can be referenced',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '441',
+  'location' => 'modules/userreference/userreference.module:73',
+  'textgroup' => 'default',
+  'source' => 'User status that can be referenced',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '442',
+  'location' => 'modules/userreference/userreference.module:75',
+  'textgroup' => 'default',
+  'source' => 'Active',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '443',
+  'location' => 'modules/userreference/userreference.module:75',
+  'textgroup' => 'default',
+  'source' => 'Blocked',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '444',
+  'location' => 'modules/userreference/userreference.module:94',
+  'textgroup' => 'default',
+  'source' => 'Advanced - Users that can be referenced (View)',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '445',
+  'location' => 'modules/userreference/userreference.module:101',
+  'textgroup' => 'default',
+  'source' => 'View used to select the users',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '446',
+  'location' => 'modules/userreference/userreference.module:104',
+  'textgroup' => 'default',
+  'source' => '<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '447',
+  'location' => 'modules/userreference/userreference.module:105;118',
+  'textgroup' => 'default',
+  'source' => "<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the \"Referenceable Roles\" and \"Referenceable Status\" settings above. Use the view's \"filters\" section instead.</li><li>Use the view's \"fields\" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view's \"sort criteria\" section to determine the order in which candidate users will be displayed.</li></ul>",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '448',
+  'location' => 'modules/userreference/userreference.module:117',
+  'textgroup' => 'default',
+  'source' => '<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '449',
+  'location' => 'modules/userreference/userreference.module:196',
+  'textgroup' => 'default',
+  'source' => '%name: invalid user.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '450',
+  'location' => 'modules/userreference/userreference.module:349',
+  'textgroup' => 'default',
+  'source' => 'Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '451',
+  'location' => 'modules/userreference/userreference.module:357',
+  'textgroup' => 'default',
+  'source' => 'Reverse link',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '452',
+  'location' => 'modules/userreference/userreference.module:359',
+  'textgroup' => 'default',
+  'source' => 'If selected, a reverse link back to the referencing node will displayed on the referenced user record.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '453',
+  'location' => 'modules/userreference/userreference.module:594',
+  'textgroup' => 'default',
+  'source' => '%name: found no valid user with that name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '454',
+  'location' => 'modules/userreference/userreference.module:887',
+  'textgroup' => 'default',
+  'source' => 'Related content',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '455',
+  'location' => 'modules/userreference/userreference.module:15',
+  'textgroup' => 'default',
+  'source' => 'Userreference autocomplete',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '456',
+  'location' => 'userreference.module:0',
+  'textgroup' => 'default',
+  'source' => 'userreference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '457',
+  'location' => 'modules/userreference/userreference.info:0',
+  'textgroup' => 'default',
+  'source' => 'User Reference',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '458',
+  'location' => 'modules/userreference/userreference.info:0',
+  'textgroup' => 'default',
+  'source' => 'Defines a field type for referencing a user from a node.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '459',
+  'location' => 'theme/content-admin-field-overview-form.tpl.php:11',
+  'textgroup' => 'default',
+  'source' => 'Weight',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '460',
+  'location' => 'theme/content-admin-field-overview-form.tpl.php:53',
+  'textgroup' => 'default',
+  'source' => 'Add',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '461',
+  'location' => 'theme/content-admin-field-overview-form.tpl.php:59',
+  'textgroup' => 'default',
+  'source' => 'New field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '462',
+  'location' => 'theme/content-admin-field-overview-form.tpl.php:72',
+  'textgroup' => 'default',
+  'source' => 'Existing field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '463',
+  'location' => 'theme/content-admin-field-overview-form.tpl.php:84',
+  'textgroup' => 'default',
+  'source' => 'New group',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '464',
+  'location' => 'theme/theme.inc:11',
+  'textgroup' => 'default',
+  'source' => 'Add fields and groups to the content type, and arrange them on content display and input forms.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '465',
+  'location' => 'theme/theme.inc:13',
+  'textgroup' => 'default',
+  'source' => 'You can add a field to a group by dragging it below and to the right of the group.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '466',
+  'location' => 'theme/theme.inc:16',
+  'textgroup' => 'default',
+  'source' => 'Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '467',
+  'location' => 'theme/theme.inc:116',
+  'textgroup' => 'default',
+  'source' => "Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '468',
+  'location' => 'theme/content-edit.js:0',
+  'textgroup' => 'default',
+  'source' => 'Remove this item',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '469',
+  'location' => 'content_admin.inc:290',
+  'textgroup' => 'default',
+  'source' => 'Add field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '470',
+  'location' => 'field.php:180;190,  number.module:119,  text.module:107',
+  'textgroup' => 'default',
+  'source' => 'Illegal value for %name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '471',
+  'location' => 'examples/example_field.php:287 examples/simple_field.php:231,  modules/text/text.module:169',
+  'textgroup' => 'default',
+  'source' => '%label is longer than %max characters.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '472',
+  'location' => 'field.php:273 text.module:167',
+  'textgroup' => 'default',
+  'source' => '"Rows" must be a positive integer.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '473',
+  'location' => 'modules/number/number.module:133 modules/text/text.module:92',
+  'textgroup' => 'default',
+  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database and it must match the field storage type, %type. The label is optional and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '474',
+  'location' => 'content.module:144',
+  'textgroup' => 'default',
+  'source' => 'add field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '475',
+  'location' => 'includes/content.admin.inc:112;291',
+  'textgroup' => 'default',
+  'source' => 'There are no fields configured for this content type. You can !link.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '476',
+  'location' => 'includes/content.admin.inc:113;292',
+  'textgroup' => 'default',
+  'source' => 'Add a new field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '477',
+  'location' => 'includes/content.admin.inc:137',
+  'textgroup' => 'default',
+  'source' => 'To change the order of a field, grab a drag-and-drop handle under the Label column and drag the field to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save button at the bottom of the page.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '478',
+  'location' => 'includes/content.admin.inc:477',
+  'textgroup' => 'default',
+  'source' => 'No field modules are enabled. You need to <a href="!modules_url">enable one</a>, such as text.module, before you can add new fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '479',
+  'location' => 'content_admin.inc:277',
+  'textgroup' => 'default',
+  'source' => 'Add existing field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '480',
+  'location' => 'content_admin.inc:311',
+  'textgroup' => 'default',
+  'source' => 'Create new field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '481',
+  'location' => 'includes/content.admin.inc:606',
+  'textgroup' => 'default',
+  'source' => 'The machine-readable name of the field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '482',
+  'location' => 'includes/content.admin.inc:610',
+  'textgroup' => 'default',
+  'source' => 'This name cannot be changed.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '483',
+  'location' => 'includes/content.admin.inc:618',
+  'textgroup' => 'default',
+  'source' => "This name cannot be changed later! The name will be prefixed with 'field_' and can include lowercase unaccented letters, numbers, and underscores. The length of the name, including the prefix, is limited to no more than 32 letters.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '484',
+  'location' => 'includes/content.admin.inc:636',
+  'textgroup' => 'default',
+  'source' => 'The type of data you would like to store in the database with this field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '485',
+  'location' => 'includes/content.admin.inc:692',
+  'textgroup' => 'default',
+  'source' => 'The field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '486',
+  'location' => 'includes/content.admin.inc:695',
+  'textgroup' => 'default',
+  'source' => "The field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '487',
+  'location' => 'includes/content.admin.inc:706',
+  'textgroup' => 'default',
+  'source' => 'The field name %field_name already exists.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '488',
+  'location' => 'includes/content.admin.inc:709',
+  'textgroup' => 'default',
+  'source' => "The name 'field_instance' is a reserved name.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '489',
+  'location' => 'content_admin.inc:432',
+  'textgroup' => 'default',
+  'source' => 'Created field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '490',
+  'location' => 'includes/content.admin.inc:754',
+  'textgroup' => 'default',
+  'source' => 'Update field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '491',
+  'location' => 'includes/content.admin.inc:758',
+  'textgroup' => 'default',
+  'source' => 'There was a problem updating field %label.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '492',
+  'location' => 'includes/content.admin.inc:955',
+  'textgroup' => 'default',
+  'source' => "Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using !link_devel's 'devel load' tab on a %type content page might help you figure out the expected format.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '493',
+  'location' => 'includes/content.admin.inc:986',
+  'textgroup' => 'default',
+  'source' => "Select a specific number of values for this field, or 'Unlimited' to provide an 'Add more' button so the users can add as many values as they like.",
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '494',
+  'location' => 'includes/content.admin.inc:1131',
+  'textgroup' => 'default',
+  'source' => 'The default value PHP code created @value which is invalid.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '495',
+  'location' => 'includes/content.token.inc:62',
+  'textgroup' => 'default',
+  'source' => 'Formatted HTML link to the node',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '496',
+  'location' => 'number.module:113',
+  'textgroup' => 'default',
+  'source' => 'The value of %name may be no smaller than %min.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '497',
+  'location' => 'number.module:116',
+  'textgroup' => 'default',
+  'source' => 'The value of %name may be no larger than %max.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '498',
+  'location' => 'modules/number/number.module:476',
+  'textgroup' => 'default',
+  'source' => 'Only numbers and decimals are allowed in %field. %start was changed to %value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '499',
+  'location' => 'modules/number/number.module:494',
+  'textgroup' => 'default',
+  'source' => 'Only numbers are allowed in %field. %start was changed to %value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '500',
+  'location' => 'modules/number/number.module:513',
+  'textgroup' => 'default',
+  'source' => 'Only numbers and the decimal character (%decimal) are allowed in %field. %start was changed to %value.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '501',
+  'location' => 'modules/optionwidgets/optionwidgets.module:10',
+  'textgroup' => 'default',
+  'source' => 'Create a list of options as a list in <strong>Allowed values</strong> or as an array in PHP code. These values will be the same for %field in all content types.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '502',
+  'location' => 'misc/tabledrag.js',
+  'textgroup' => 'default',
+  'source' => 'Drag to re-order',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '503',
+  'location' => 'misc/tabledrag.js',
+  'textgroup' => 'default',
+  'source' => 'Changes made in this table will not be saved until the form is submitted.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '504',
+  'location' => 'field:profile_color:title',
+  'textgroup' => 'profile',
+  'source' => 'Favorite color',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '505',
+  'location' => 'field:profile_color:explanation',
+  'textgroup' => 'profile',
+  'source' => 'List your favorite color',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '506',
+  'location' => 'category',
+  'textgroup' => 'profile',
+  'source' => 'Personal information',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '507',
+  'location' => 'field:profile_biography:title',
+  'textgroup' => 'profile',
+  'source' => 'Biography',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '508',
+  'location' => 'field:profile_biography:explanation',
+  'textgroup' => 'profile',
+  'source' => 'Tell people a little bit about yourself',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '509',
+  'location' => 'field:profile_sell_address:title',
+  'textgroup' => 'profile',
+  'source' => 'Sell your email address?',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '510',
+  'location' => 'field:profile_sell_address:explanation',
+  'textgroup' => 'profile',
+  'source' => "If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '511',
+  'location' => 'category',
+  'textgroup' => 'profile',
+  'source' => 'Communication preferences',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '512',
+  'location' => 'field:profile_sold_to:title',
+  'textgroup' => 'profile',
+  'source' => 'Sales Category',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '513',
+  'location' => 'field:profile_sold_to:explanation',
+  'textgroup' => 'profile',
+  'source' => "Select the sales categories to which this user's address was sold.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '514',
+  'location' => 'field:profile_sold_to:options',
+  'textgroup' => 'profile',
+  'source' => "Pill spammers\r\nFitness spammers\r\nBack\\slash\r\nForward/slash\r\nDot.in.the.middle",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '515',
+  'location' => 'category',
+  'textgroup' => 'profile',
+  'source' => 'Administrative data',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '516',
+  'location' => 'field:profile_bands:title',
+  'textgroup' => 'profile',
+  'source' => 'Favorite bands',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '517',
+  'location' => 'field:profile_bands:explanation',
+  'textgroup' => 'profile',
+  'source' => "Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '518',
+  'location' => 'field:profile_birthdate:title',
+  'textgroup' => 'profile',
+  'source' => 'Birthdate',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '519',
+  'location' => 'field:profile_birthdate:explanation',
+  'textgroup' => 'profile',
+  'source' => "Enter your birth date and we'll send you a coupon.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '520',
+  'location' => 'field:profile_love_migrations:title',
+  'textgroup' => 'profile',
+  'source' => 'I love migrations',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '521',
+  'location' => 'field:profile_love_migrations:explanation',
+  'textgroup' => 'profile',
+  'source' => 'If you check this box, you love migrations.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '522',
+  'location' => 'field:profile_blog:title',
+  'textgroup' => 'profile',
+  'source' => 'Blog',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '523',
+  'location' => 'field:profile_blog:explanation',
+  'textgroup' => 'profile',
+  'source' => 'Paste the full URL, including http://, of your personal blog.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '524',
+  'location' => 'block:1:title',
+  'textgroup' => 'blocks',
+  'source' => 'Static Block',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '525',
+  'location' => 'block:1:body',
+  'textgroup' => 'blocks',
+  'source' => '<h3>My first custom block body</h3>',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '526',
+  'location' => 'block:2:title',
+  'textgroup' => 'blocks',
+  'source' => 'Another Static Block',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '527',
+  'location' => 'block:2:body',
+  'textgroup' => 'blocks',
+  'source' => '<h3>My second custom block body</h3>',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '528',
+  'location' => 'vocabulary:4:name',
+  'textgroup' => 'taxonomy',
+  'source' => 'Tags',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '529',
+  'location' => 'vocabulary:1:name',
+  'textgroup' => 'taxonomy',
+  'source' => 'vocabulary 1 (i=0)',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '530',
+  'location' => 'vocabulary:2:name',
+  'textgroup' => 'taxonomy',
+  'source' => 'vocabulary 2 (i=1)',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '531',
+  'location' => 'vocabulary:3:name',
+  'textgroup' => 'taxonomy',
+  'source' => 'vocabulary 3 (i=2)',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '532',
+  'location' => 'vocabulary:5:name',
+  'textgroup' => 'taxonomy',
+  'source' => 'vocabulary name much longer than thirty two characters',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '533',
+  'location' => 'type:article:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Article',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '534',
+  'location' => 'type:article:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Title',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '535',
+  'location' => 'type:article:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '536',
+  'location' => 'type:article:description',
+  'textgroup' => 'nodetype',
+  'source' => 'An <em>article</em>, content type.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '537',
+  'location' => 'type:company:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Company',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '538',
+  'location' => 'type:company:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Name',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '539',
+  'location' => 'type:company:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Description',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '540',
+  'location' => 'type:company:description',
+  'textgroup' => 'nodetype',
+  'source' => 'Company node type',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '541',
+  'location' => 'type:employee:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Employee',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '542',
+  'location' => 'type:employee:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Name',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '543',
+  'location' => 'type:employee:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Bio',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '544',
+  'location' => 'type:employee:description',
+  'textgroup' => 'nodetype',
+  'source' => 'Employee node type',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '545',
+  'location' => 'type:sponsor:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Sponsor',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '546',
+  'location' => 'type:sponsor:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Name',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '547',
+  'location' => 'type:sponsor:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '548',
+  'location' => 'type:sponsor:description',
+  'textgroup' => 'nodetype',
+  'source' => 'Sponsor node type',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '549',
+  'location' => 'type:story:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Story',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '550',
+  'location' => 'type:story:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Title',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '551',
+  'location' => 'type:story:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '552',
+  'location' => 'type:story:description',
+  'textgroup' => 'nodetype',
+  'source' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '553',
+  'location' => 'type:test_event:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Migrate test event',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '554',
+  'location' => 'type:test_event:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Event Name',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '555',
+  'location' => 'type:test_event:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '556',
+  'location' => 'type:test_event:description',
+  'textgroup' => 'nodetype',
+  'source' => 'test event description here',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '558',
+  'location' => 'type:test_page:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Migrate test page',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '559',
+  'location' => 'type:test_page:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Title',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '560',
+  'location' => 'type:test_page:body',
+  'textgroup' => 'nodetype',
+  'source' => 'This is the body field label',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '561',
+  'location' => 'type:test_page:description',
+  'textgroup' => 'nodetype',
+  'source' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '562',
+  'location' => 'type:test_planet:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Migrate test planet',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '563',
+  'location' => 'type:test_planet:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Title',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '564',
+  'location' => 'type:test_planet:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '565',
+  'location' => 'type:test_planet:description',
+  'textgroup' => 'nodetype',
+  'source' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '566',
+  'location' => 'type:test_story:name',
+  'textgroup' => 'nodetype',
+  'source' => 'Migrate test story',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '567',
+  'location' => 'type:test_story:title',
+  'textgroup' => 'nodetype',
+  'source' => 'Title',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '568',
+  'location' => 'type:test_story:body',
+  'textgroup' => 'nodetype',
+  'source' => 'Body',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '569',
+  'location' => 'type:test_story:description',
+  'textgroup' => 'nodetype',
+  'source' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
+  'version' => '1',
+))
+->values(array(
+  'lid' => '570',
+  'location' => 'field:story-field_test_exclude_unset:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '571',
+  'location' => 'field:story-field_test_exclude_unset:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example text field without exclude.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '572',
+  'location' => 'field:story-field_test_two:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Integer Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '573',
+  'location' => 'field:story-field_test_two:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example integer field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '574',
+  'location' => 'field:story-field_test:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '575',
+  'location' => 'field:story-field_test:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example text field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '576',
+  'location' => 'field:story-field_test_three:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Decimal Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '577',
+  'location' => 'field:story-field_test_three:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example decimal field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '578',
+  'location' => 'field:story-field_test_four:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Float Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '579',
+  'location' => 'field:story-field_test_four:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example float field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '580',
+  'location' => 'field:story-field_test_identical1:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Integer Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '581',
+  'location' => 'field:story-field_test_identical1:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example integer field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '582',
+  'location' => 'field:story-field_test_identical2:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Integer Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '583',
+  'location' => 'field:story-field_test_identical2:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example integer field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '584',
+  'location' => 'field:story-field_test_email:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Email Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '585',
+  'location' => 'field:story-field_test_email:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example email field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '586',
+  'location' => 'field:story-field_test_link:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Link Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '587',
+  'location' => 'field:story-field_test_link:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example link field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '588',
+  'location' => 'field:story-field_test_filefield:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'File Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '589',
+  'location' => 'field:story-field_test_filefield:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example image field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '590',
+  'location' => 'field:story-field_test_imagefield:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Image Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '591',
+  'location' => 'field:story-field_test_imagefield:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example image field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '592',
+  'location' => 'field:story-field_test_date:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Date Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '593',
+  'location' => 'field:story-field_test_date:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example date field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '594',
+  'location' => 'field:story-field_test_datestamp:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Date Stamp Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '595',
+  'location' => 'field:story-field_test_datestamp:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example date stamp field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '596',
+  'location' => 'field:story-field_test_datetime:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Datetime Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '597',
+  'location' => 'field:story-field_test_datetime:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example datetime field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '598',
+  'location' => 'field:story-field_test_phone:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Phone Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '599',
+  'location' => 'field:story-field_test_phone:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example phone field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '600',
+  'location' => 'field:story-field_test_decimal_radio_buttons:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Decimal Radio Buttons Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '601',
+  'location' => 'field:story-field_test_decimal_radio_buttons:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example decimal field using radio buttons.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '602',
+  'location' => 'field:field_test_decimal_radio_buttons:option_1.2',
+  'textgroup' => 'cck',
+  'source' => '1.2',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '603',
+  'location' => 'field:field_test_decimal_radio_buttons:option_2.1',
+  'textgroup' => 'cck',
+  'source' => '2.1',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '604',
+  'location' => 'field:story-field_test_float_single_checkbox:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Float Single Checkbox Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '605',
+  'location' => 'field:story-field_test_float_single_checkbox:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example float field using a single on/off checkbox.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '606',
+  'location' => 'field:field_test_float_single_checkbox:option_3.142',
+  'textgroup' => 'cck',
+  'source' => '3.142',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '607',
+  'location' => 'field:field_test_float_single_checkbox:option_1.234',
+  'textgroup' => 'cck',
+  'source' => '1.234',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '608',
+  'location' => 'field:story-field_test_integer_selectlist:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Integer Select List Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '609',
+  'location' => 'field:story-field_test_integer_selectlist:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example integer field using a select list.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '610',
+  'location' => 'field:field_test_integer_selectlist:option_1234',
+  'textgroup' => 'cck',
+  'source' => '1234',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '611',
+  'location' => 'field:field_test_integer_selectlist:option_2341',
+  'textgroup' => 'cck',
+  'source' => '2341',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '612',
+  'location' => 'field:field_test_integer_selectlist:option_3412',
+  'textgroup' => 'cck',
+  'source' => '3412',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '613',
+  'location' => 'field:field_test_integer_selectlist:option_4123',
+  'textgroup' => 'cck',
+  'source' => '4123',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '614',
+  'location' => 'field:story-field_test_text_single_checkbox:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Single Checkbox Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '615',
+  'location' => 'field:story-field_test_text_single_checkbox:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example text field using a single on/off checkbox.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '616',
+  'location' => 'field:field_test_text_single_checkbox:option_0',
+  'textgroup' => 'cck',
+  'source' => 'Hello',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '617',
+  'location' => 'field:field_test_text_single_checkbox:option_1',
+  'textgroup' => 'cck',
+  'source' => 'Goodbye',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '618',
+  'location' => 'field:story-field_test_text_single_checkbox2:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Single Checkbox Field 2',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '619',
+  'location' => 'field:story-field_test_text_single_checkbox2:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'Checkbox that uses keys only and no label.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '620',
+  'location' => 'field:field_test_text_single_checkbox2:option_Off',
+  'textgroup' => 'cck',
+  'source' => 'Off',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '621',
+  'location' => 'field:field_test_text_single_checkbox2:option_Hello',
+  'textgroup' => 'cck',
+  'source' => 'Hello',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '622',
+  'location' => 'field:test_page-field_test:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '623',
+  'location' => 'field:test_page-field_test:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example text field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '624',
+  'location' => 'field:test_planet-field_multivalue:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Decimal Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '625',
+  'location' => 'field:test_planet-field_multivalue:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example multi-valued decimal field.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '626',
+  'location' => 'field:test_planet-field_test_text_single_checkbox:widget_label',
+  'textgroup' => 'cck',
+  'source' => 'Text Single Checkbox Field',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '627',
+  'location' => 'field:test_planet-field_test_text_single_checkbox:widget_description',
+  'textgroup' => 'cck',
+  'source' => 'An example text field using a single on/off checkbox.',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '628',
+  'location' => 'misc/tableselect.js',
+  'textgroup' => 'default',
+  'source' => 'Select all rows in this table',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '629',
+  'location' => 'misc/tableselect.js',
+  'textgroup' => 'default',
+  'source' => 'Deselect all rows in this table',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '630',
+  'location' => 'sites/all/modules/filefield/filefield.js',
+  'textgroup' => 'default',
+  'source' => 'The selected file %filename cannot be uploaded. Only files with the following extensions are allowed: %extensions.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '631',
+  'location' => 'misc/teaser.js',
+  'textgroup' => 'default',
+  'source' => 'Split summary at cursor',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '632',
+  'location' => 'misc/teaser.js',
+  'textgroup' => 'default',
+  'source' => 'Join summary',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '633',
+  'location' => 'item:140:title',
+  'textgroup' => 'menu',
+  'source' => 'Drupal.org',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '634',
+  'location' => 'item:139:title',
+  'textgroup' => 'menu',
+  'source' => 'Test 2',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '635',
+  'location' => 'item:139:description',
+  'textgroup' => 'menu',
+  'source' => 'Test menu link 2',
+  'version' => '1',
+))
+->values(array(
+  'lid' => '636',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Site information',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '637',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '638',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The name of this website.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '639',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'E-mail address',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '640',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "The <em>From</em> address in automated e-mails sent during registration and new password requests, and other notifications. (Use an address ending in your site's domain to help prevent this e-mail being flagged as spam.)",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '641',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Slogan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '642',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Your site's motto, tag line, or catchphrase (often displayed alongside the title of the site).",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '643',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Mission',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '644',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Your site's mission or focus statement (often prominently displayed on the front page).",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '645',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Footer message',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '646',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '647',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Anonymous user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '648',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Anonymous',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '649',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The name used to indicate anonymous users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '650',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Default front page',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '651',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The home page displays content from this relative URL. If unsure, specify "node".',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '652',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Save configuration',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '653',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Reset to defaults',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '654',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'This is a multilingual variable.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '655',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Left sidebar',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '656',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Right sidebar',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '657',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Header',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '658',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Footer',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '659',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'RSS feed',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '660',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => '',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '661',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Administer',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '662',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Compact mode',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '663',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Content management',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '664',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Manage your site's content.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '665',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Reports',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '666',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'View reports from system logs and other status information.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '667',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Site building',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '668',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Control how your site looks and feels.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '669',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Site configuration',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '670',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Adjust basic site configuration options.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '671',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Actions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '672',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Manage the actions defined for your site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '673',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Administration theme',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '674',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Settings for how your administrative pages should look.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '675',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Clean URLs',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '676',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Enable or disable clean URLs for your site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '677',
+  'location' => 'date.module:39',
+  'textgroup' => 'default',
+  'source' => 'Date and time',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '678',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Settings for how Drupal displays date and time, as well as the system's default timezone.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '679',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Error reporting',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '680',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Control how Drupal deals with errors including 403/404 errors as well as PHP error reporting.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '681',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'File system',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '682',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Tell Drupal where to store uploaded files and how they are accessed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '683',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'File uploads',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '684',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Control how files may be attached to content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '685',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Image toolkit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '686',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Choose which image toolkit to use if you have installed optional toolkits.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '687',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Input formats',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '688',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '689',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Logging and alerts',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '690',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destination, such as syslog, database, email, ...etc.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '691',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Performance',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '692',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '693',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Site maintenance',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '694',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Take the site off-line for maintenance or bring it back online.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '695',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Events',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '696',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Set up how your site handles events.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '697',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'CCK Email Contact Form Settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '698',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Administer flood control settings for email contact forms',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '699',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'ImageAPI',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '700',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Configure ImageAPI.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '701',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Languages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '702',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Configure languages for content and the user interface.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '703',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Variables',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '704',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Edit and delete site variables.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '705',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'User management',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '706',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Manage your site's users, groups and access to site features.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '707',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Contact',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '708',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Log out',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '709',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'User account',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '710',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'User list',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '711',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Autocomplete taxonomy',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '712',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Compose tips',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '713',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Create content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '714',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Delete comment',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '715',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Edit comment',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '716',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'File download',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '717',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'User autocomplete',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '718',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'User timezone',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '719',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'My account',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '720',
+  'location' => 'content_admin.inc:199',
+  'textgroup' => 'default',
+  'source' => 'Delete',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '721',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Feed aggregator',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '722',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Books',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '723',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Save string',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '724',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Node title autocomplete',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '725',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'View user profile.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '726',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => "Who's new",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '727',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Powered by Drupal, an open source content management system',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '728',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Home',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '729',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The selected file %file could not be uploaded, because the destination %directory is not properly configured.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '730',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'French',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '731',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The configuration options have been saved.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '732',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Long',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '733',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Medium',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '734',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'Short',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '735',
+  'location' => '/?q=fr/admin/settings/site-information',
+  'textgroup' => 'default',
+  'source' => 'The e-mail address %mail is not valid.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '736',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'Default 403 (access denied) page',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '737',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'This page is displayed when the requested document is denied to the current user. If unsure, specify nothing.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '738',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'Default 404 (not found) page',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '739',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'This page is displayed when no other content matches the requested document. If unsure, specify nothing.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '740',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'Write errors to the log',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '741',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'Write errors to the log and to the screen',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '742',
+  'location' => '/?q=fr/admin/settings/error-reporting',
+  'textgroup' => 'default',
+  'source' => 'Specify where Drupal, PHP and SQL errors are logged. While it is recommended that a site running in a production environment write errors to the log only, in a development or testing environment it may be helpful to write errors both to the log and to the screen.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '743',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Access rules',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '744',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'List and create rules to disallow usernames, e-mail addresses, and IP addresses.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '745',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Permissions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '746',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Determine access to features by selecting permissions for roles.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '747',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Profiles',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '748',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Create customizable fields for your users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '749',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Roles',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '750',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'List, edit, or add user roles.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '751',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'User settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '752',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '753',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'Users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '754',
+  'location' => '/?q=fr/admin/user',
+  'textgroup' => 'default',
+  'source' => 'List, add, and edit users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '755',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'User registration settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '756',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Public registrations',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '757',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Only site administrators can create new user accounts.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '758',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Visitors can create accounts and no administrator approval is required.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '759',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Visitors can create accounts but administrator approval is required.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '760',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Require e-mail verification when a visitor creates an account',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '761',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '762',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'User registration guidelines',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '763',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'This text is displayed at the top of the user registration form and is useful for helping or instructing your users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '764',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'User e-mail settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '765',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Drupal sends emails whenever new users register on your site, and optionally, may also notify users after other account actions. Using a simple set of content templates, notification e-mails can be customized to fit the specific needs of your site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '766',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Available variables are:',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '767',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Welcome, new user created by administrator',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '768',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Customize welcome e-mail messages sent to new member accounts created by an administrator.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '769',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Subject',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '770',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Body',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '771',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Welcome, no approval required',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '772',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Customize welcome e-mail messages sent to new members upon registering, when no administrator approval is required.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '773',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Welcome, awaiting administrator approval',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '774',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Customize welcome e-mail messages sent to new members upon registering, when administrative approval is required.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '775',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Password recovery email',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '776',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Customize e-mail messages sent to users who request a new password.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '777',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Account activation email',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '778',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Enable and customize e-mail messages sent to users upon account activation (when an administrator activates an account of a user who has already registered, on a site where administrative approval is required).',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '779',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Notify user when account is activated.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '780',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Account blocked email',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '781',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Enable and customize e-mail messages sent to users when their accounts are blocked.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '782',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Notify user when account is blocked.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '783',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Account deleted email',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '784',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Enable and customize e-mail messages sent to users when their accounts are deleted.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '785',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Notify user when account is deleted.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '786',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Signatures',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '787',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Signature support',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '788',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Disabled',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '789',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Enabled',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '790',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Pictures',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '791',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Picture support',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '792',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Picture image path',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '793',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Subdirectory in the directory %dir where pictures will be stored.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '794',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Default picture',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '795',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'URL of picture to display for users with no custom picture selected. Leave blank for none.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '796',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Picture maximum dimensions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '797',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Maximum dimensions for pictures, in pixels.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '798',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Picture maximum file size',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '799',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Maximum file size for pictures, in kB.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '800',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => 'Picture guidelines',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '801',
+  'location' => '/?q=fr/admin/user/settings',
+  'textgroup' => 'default',
+  'source' => "This text is displayed at the picture upload form in addition to the default guidelines. It's useful for helping or instructing your users.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '802',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'The normal cache mode is suitable for most sites and does not cause any side effects. The aggressive cache mode causes Drupal to skip the loading (boot) and unloading (exit) of enabled modules when serving a cached page. This results in an additional performance boost but can cause unwanted side effects.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '803',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '<strong class="error">The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules</strong>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '804',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Page cache',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '805',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Enabling the page cache will offer a significant performance boost. Drupal can store and send compressed cached pages requested by <em>anonymous</em> users. By caching a web page, Drupal does not have to construct the page each time it is viewed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '806',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Caching mode',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '807',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Normal (recommended for production sites, no side effects)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '808',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Aggressive (experts only, possible side effects)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '809',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '0 sec',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '810',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '1 min',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '811',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '@count min',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '812',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '1 hour',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '813',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '@count hours',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '814',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '1 day',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '815',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Minimum cache lifetime',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '816',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'On high-traffic sites, it may be necessary to enforce a minimum cache lifetime. The minimum cache lifetime is the minimum amount of time that will elapse before the cache is emptied and recreated, and is applied to both page and block caches. A larger minimum cache lifetime offers better performance, but users will not see new content for a longer period of time.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '817',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Page compression',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '818',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'By default, Drupal compresses the pages it caches in order to save bandwidth and improve download times. This option should be disabled when using a webserver that performs compression.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '819',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Block cache',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '820',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Enabling the block cache can offer a performance increase for all users by preventing blocks from being reconstructed on each page load. If the page cache is also enabled, performance increases from enabling the block cache will mainly benefit authenticated users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '821',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Enabled (recommended)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '822',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Note that block caching is inactive when modules defining content access restrictions are enabled.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '823',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Bandwidth optimizations',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '824',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => '<p>Drupal can automatically optimize external resources like CSS and JavaScript, which can reduce both the size and number of requests made to your website. CSS files can be aggregated and compressed into a single file, while JavaScript files are aggregated (but not compressed). These optional optimizations may reduce server load, bandwidth requirements, and page loading times.</p><p>These options are disabled if you have not set up your files directory, or if your download method is set to private.</p>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '825',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Optimize CSS files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '826',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'This option can interfere with theme development and should only be enabled in a production environment.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '827',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Optimize JavaScript files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '828',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'This option can interfere with module development and should only be enabled in a production environment.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '829',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Clear cached data',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '830',
+  'location' => '/?q=fr/admin/settings/performance',
+  'textgroup' => 'default',
+  'source' => 'Caching data improves performance, but may cause problems while troubleshooting new modules, themes, or translations, if outdated information has been cached. To refresh all cached data on your site, click the button below. <em>Warning: high-traffic sites will experience performance slowdowns while cached data is rebuilt.</em>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '831',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'Site status',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '832',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'Online',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '833',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'Off-line',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '834',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'When set to "Online", all visitors will be able to browse your site normally. When set to "Off-line", only users with the "administer site configuration" permission will be able to access your site to perform maintenance; all other visitors will see the site off-line message configured below. Authorized users can log in during "Off-line" mode directly via the <a href="@user-login">user login</a> page.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '835',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'Site off-line message',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '836',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => '@site is currently under maintenance. We should be back shortly. Thank you for your patience.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '837',
+  'location' => '/?q=fr/admin/settings/site-maintenance',
+  'textgroup' => 'default',
+  'source' => 'Message to show visitors when the site is in off-line mode.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '838',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Left to right',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '839',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'English name',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '840',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Native name',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '841',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Direction',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '842',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Language negotiation',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '843',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'List',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '844',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '845',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Configure extended options for multilingual content and translations.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '846',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Multilingual variables.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '847',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Add language',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '848',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Multilingual system',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '849',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'String translation',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '850',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => "This page provides an overview of your site's enabled languages. If multiple languages are available and enabled, the text on your site interface may be translated, registered users may select their preferred language on the <em>My account</em> page, and site authors may indicate a specific language when creating posts. The site's default language is used for anonymous visitors and for users who have not selected a preferred language.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '851',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'For each language available on the site, use the <em>edit</em> link to configure language details, including name, an optional language-specific path or domain, and whether the language is natively presented either left-to-right or right-to-left. These languages also appear in the <em>Language</em> selection when creating a post of a content type with multilingual support.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '852',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => 'Use the <a href="@add-language">add language page</a> to enable additional languages (and automatically import files from a translation package, if available), the <a href="@search">translate interface page</a> to locate strings for manual translation, or the <a href="@import">import page</a> to add translations from individual <em>.po</em> files. A number of contributed translation packages containing <em>.po</em> files are available on the <a href="@translations">Drupal.org translations page</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '853',
+  'location' => '/?q=fr/admin/settings/language',
+  'textgroup' => 'default',
+  'source' => '<strong>Warning</strong>: Changing the default language may have unwanted effects on string translations. Read more about <a href="@i18nstrings-help">String translation</a>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '854',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'anonymous user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '855',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'authenticated user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '856',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'All roles may use default format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '857',
+  'location' => 'content_admin.inc:250',
+  'textgroup' => 'default',
+  'source' => 'configure',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '858',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'No roles may use this format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '859',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'Set default format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '860',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'Delete input format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '861',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'Add input format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '862',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => '<em>Input formats</em> define a way of processing user-supplied text in Drupal. Each input format uses filters to manipulate text, and most input formats apply several different filters to text, in a specific order. Each filter is designed to accomplish a specific purpose, and generally either removes elements from or adds elements to text before it is displayed. Users can choose between the available input formats when submitting content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '863',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'Use the list below to configure which input formats are available to which roles, as well as choose a default input format (used for imported content, for example). The default format is always available to users. All input formats are available to users in a role with the "administer filters" permission.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '864',
+  'location' => '/?q=fr/admin/settings/filters',
+  'textgroup' => 'default',
+  'source' => 'After updating your Input formats do not forget to review the list of formats allowed for string translations on the <a href="@configure-strings">configure translatable strings</a> page.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '865',
+  'location' => '/?q=fr/admin/settings/imageapi',
+  'textgroup' => 'default',
+  'source' => 'There are no image toolkit modules enabled. Toolkit modules can be enabled from the <a href="!admin-build-modules">module configuration page</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '866',
+  'location' => '/?q=fr/admin/settings/image-toolkit',
+  'textgroup' => 'default',
+  'source' => 'GD2 image manipulation toolkit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '867',
+  'location' => '/?q=fr/admin/settings/image-toolkit',
+  'textgroup' => 'default',
+  'source' => 'The GD toolkit is installed and working properly.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '868',
+  'location' => '/?q=fr/admin/settings/image-toolkit',
+  'textgroup' => 'default',
+  'source' => 'JPEG quality',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '869',
+  'location' => '/?q=fr/admin/settings/image-toolkit',
+  'textgroup' => 'default',
+  'source' => 'Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '870',
+  'location' => '/?q=fr/admin/settings/image-toolkit',
+  'textgroup' => 'default',
+  'source' => '%',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '871',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'General settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '872',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Maximum resolution for uploaded images',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '873',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '874',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'WIDTHxHEIGHT',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '875',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'List files by default',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '876',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'No',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '877',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Yes',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '878',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Display attached files when viewing a post.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '879',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Default permitted file extensions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '880',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '881',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Default maximum file size per upload',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '882',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'The default maximum file size a user can upload. If an image is uploaded and a maximum resolution is set, the size will be checked after the file has been resized.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '883',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'MB',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '884',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Default total file size per user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '885',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'The default maximum size of all files a user can have on the site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '886',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'KB',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '887',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => '@size @suffix',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '888',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Your PHP settings limit the maximum file size per upload to %size.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '889',
+  'location' => '/?q=fr/admin/settings/uploads',
+  'textgroup' => 'default',
+  'source' => 'Users with the <a href="@permissions">upload files permission</a> can upload attachments. Users with the <a href="@permissions">view uploaded files permission</a> can view uploaded attachments. You can choose which post types can take attachments on the <a href="@types">content types settings</a> page.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '890',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'File system path',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '891',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'A file system path where the files will be stored. This directory must exist and be writable by Drupal. If the download method is set to public, this directory must be relative to the Drupal installation directory and be accessible over the web. If the download method is set to private, this directory should not be accessible over the web. Changing this location will modify all download paths and may cause unexpected problems on an existing site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '892',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'Temporary directory',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '893',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'A file system path where uploaded files will be stored during previews.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '894',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'Download method',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '895',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'Public - files are available using HTTP directly.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '896',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'Private - files are transferred by Drupal.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '897',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'Choose the <em>Public download</em> method unless you wish to enforce fine-grained access controls over file downloads. Changing the download method will modify all download paths and may cause unexpected problems on an existing site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '898',
+  'location' => '/?q=fr/admin/settings/file-system',
+  'textgroup' => 'default',
+  'source' => 'The directory %directory does not exist.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '899',
+  'location' => '/?q=fr/admin/settings/event',
+  'textgroup' => 'default',
+  'source' => 'Event overview',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '900',
+  'location' => '/?q=fr/admin/settings/event',
+  'textgroup' => 'default',
+  'source' => 'Change how event summary information is displayed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '901',
+  'location' => '/?q=fr/admin/settings/event',
+  'textgroup' => 'default',
+  'source' => 'Timezone handling',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '902',
+  'location' => '/?q=fr/admin/settings/event',
+  'textgroup' => 'default',
+  'source' => 'Change how timezone information is saved and displayed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '903',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Event time zone input',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '904',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Use the sitewide time zone',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '905',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Use the time zone of the user editing or creating the event',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '906',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Allow users to set event time zones',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '907',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'date/time settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '908',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => "Events are saved with a time zone value. This setting allows you to determine how the time zone is determined when creating or editing an event. You must have 'Configurable time zones' enabled in the !url before you can enable user's time zones for this feature.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '909',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Event time zone display',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '910',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => "Use the event's time zone",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '911',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => "Events are saved with a time zone value. This setting allows you to determine if the event's time zone, the sitewide time zone, or the user's personal time zone setting is used to display the time for an event. You must have 'Configurable time zones' enabled in the !url before you can enable user's time zones for this feature.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '912',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'Time notation preference',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '913',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => '24h',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '914',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => '12h',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '915',
+  'location' => '/?q=fr/admin/settings/event/timezone',
+  'textgroup' => 'default',
+  'source' => 'The time notation system used for entering event times.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '916',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Upcoming event block limit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '917',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Limit the amount of events displayed in the upcoming events block by this amount.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '918',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Default overview',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '919',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Day',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '920',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Week',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '921',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Month',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '922',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Table',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '923',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'The default event view to display when no format is specifically requested. This is also the view that will be displayed from the block calendar links.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '924',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Table view default period',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '925',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'here',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '926',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'The default number of days to display in the table view. You can specify a different number of days in the url. More info on the event url format !link',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '927',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy filter controls',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '928',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Show taxonomy filter control on calendar views',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '929',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Only show taxonomy filter control when taxonomy filter view is requested',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '930',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Never show taxonomy filter control',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '931',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Content type filter controls',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '932',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Show content type filter control on calendar views',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '933',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Only show content type filter control when content type filter view is requested',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '934',
+  'location' => '/?q=fr/admin/settings/event/overview',
+  'textgroup' => 'default',
+  'source' => 'Never show content type filter control',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '935',
+  'location' => '/?q=fr/admin/settings/email',
+  'textgroup' => 'default',
+  'source' => 'Hourly threshold for a CCK Email contact form',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '936',
+  'location' => '/?q=fr/admin/settings/email',
+  'textgroup' => 'default',
+  'source' => 'The maximum number of contact form submissions a user can perform per hour.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '937',
+  'location' => '/?q=fr/admin/settings/admin',
+  'textgroup' => 'default',
+  'source' => 'System default',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '938',
+  'location' => '/?q=fr/admin/settings/admin',
+  'textgroup' => 'default',
+  'source' => 'Choose which theme the administration pages should display in. If you choose "System default" the administration pages will use the same theme as the rest of the site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '939',
+  'location' => '/?q=fr/admin/settings/admin',
+  'textgroup' => 'default',
+  'source' => 'Use administration theme for content editing',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '940',
+  'location' => '/?q=fr/admin/settings/admin',
+  'textgroup' => 'default',
+  'source' => 'Use the administration theme when editing existing posts or creating new ones.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '941',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Publish comment',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '942',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Unpublish comment',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '943',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Unpublish comment containing keyword(s)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '944',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Publish post',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '945',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Unpublish post',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '946',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Make post sticky',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '947',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Make post unsticky',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '948',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Promote post to front page',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '949',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Remove post from front page',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '950',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Change the author of a post',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '951',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Save post',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '952',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Unpublish post containing keyword(s)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '953',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Display a message to the user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '954',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Send e-mail',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '955',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Redirect to URL',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '956',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Block current user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '957',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Ban IP address of current user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '958',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => "ImageCache: Flush ALL presets for this node's filefield images",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '959',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => "ImageCache: Generate ALL presets for this node's filefield images",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '960',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => "ImageCache: Generate configured preset(s) for this node's filefield images",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '961',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Choose an advanced action',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '962',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Action type',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '963',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => '« first',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '964',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => '‹ previous',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '965',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'next ›',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '966',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'last »',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '967',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Actions available to Drupal:',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '968',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'sort by @s',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '969',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'sort icon',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '970',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'sort descending',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '971',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Make a new advanced action available',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '972',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Create',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '973',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Configure an advanced action',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '974',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Remove orphans',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '975',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Manage actions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '976',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the trigger module, can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '977',
+  'location' => '/?q=fr/admin/settings/actions',
+  'textgroup' => 'default',
+  'source' => 'There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions can do more than simple actions; for example, send an e-mail to a specified address, or check for certain words within a piece of content. These actions need to be created and configured first before they may be used. To create an advanced action, select the action from the drop-down below and click the <em>Create</em> button.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '978',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Create new account',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '979',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'role',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '980',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => '@module module',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '981',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access news feeds',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '982',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer news feeds',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '983',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer blocks',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '984',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'use PHP for block visibility',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '985',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access printer-friendly version',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '986',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'add content to books',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '987',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer book outlines',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '988',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create new books',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '989',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access comments',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '990',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer comments',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '991',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'post comments',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '992',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'post comments without approval',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '993',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access site-wide contact form',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '994',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer site-wide contact form',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '995',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer filters',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '996',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer languages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '997',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'translate interface',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '998',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer menu',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '999',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1000',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer content types',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1001',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer nodes',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1002',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create article content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1003',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create company content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1004',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create employee content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1005',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create sponsor content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1006',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1007',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create test_event content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1008',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create test_page content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1009',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create test_planet content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1010',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create test_story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1011',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any article content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1012',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any company content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1013',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any employee content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1014',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any sponsor content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1015',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1016',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any test_event content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1017',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any test_page content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1018',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any test_planet content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1019',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete any test_story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1020',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own article content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1021',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own company content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1022',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own employee content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1023',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own sponsor content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1024',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1025',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own test_event content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1026',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own test_page content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1027',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own test_planet content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1028',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete own test_story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1029',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'delete revisions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1030',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any article content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1031',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any company content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1032',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any employee content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1033',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any sponsor content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1034',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1035',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any test_event content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1036',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any test_page content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1037',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any test_planet content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1038',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit any test_story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1039',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own article content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1040',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own company content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1041',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own employee content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1042',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own sponsor content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1043',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1044',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own test_event content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1045',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own test_page content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1046',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own test_planet content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1047',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'edit own test_story content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1048',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'revert revisions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1049',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'view revisions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1050',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer url aliases',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1051',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'create url aliases',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1052',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access administration pages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1053',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access site reports',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1054',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer actions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1055',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1056',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer site configuration',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1057',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'select different theme',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1058',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer taxonomy',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1059',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'translate content',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1060',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'upload files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1061',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'view uploaded files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1062',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'access user profiles',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1063',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer permissions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1064',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1065',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'change own username',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1066',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'view date repeats',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1067',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer imageapi',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1068',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer imagecache',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1069',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'flush imagecache',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1070',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'view imagecache big_blue_cheese',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1071',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'view imagecache slackjaw_boys',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1072',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer all languages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1073',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'administer translations',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1074',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'permission',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1075',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'status',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1076',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'active',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1077',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'blocked',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1078',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Show only users where',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1079',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Filter',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1080',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'is',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1081',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Username',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1082',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Status',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1083',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Member for',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1084',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Last access',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1085',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Update options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1086',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Unblock the selected users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1087',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Block the selected users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1088',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Delete the selected users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1089',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Add a role to the selected users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1090',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Remove a role from the selected users',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1091',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Update',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1092',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => '@count years',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1093',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => '@count weeks',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1094',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => '@time ago',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1095',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => '@count sec',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1096',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'sort ascending',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1097',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Add user',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1098',
+  'location' => '/?q=fr/admin/user/user',
+  'textgroup' => 'default',
+  'source' => 'Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1099',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => 'Add role',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1100',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => 'edit permissions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1101',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => 'locked',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1102',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => 'edit role',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1103',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => 'Edit role',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1104',
+  'location' => '/?q=fr/admin/user/roles',
+  'textgroup' => 'default',
+  'source' => "<p>Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in <a href=\"@permissions\">user permissions</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the <em>role names</em> of the various roles. To delete a role choose \"edit\".</p><p>By default, Drupal comes with two user roles:</p>\n      <ul>\n      <li>Anonymous user: this role is used for users that don't have a user account or that are not authenticated.</li>\n      <li>Authenticated user: this role is automatically granted to all logged in users.</li>\n      </ul>",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1105',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Add new field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1106',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'single-line textfield',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1107',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'multi-line textfield',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1108',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'checkbox',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1109',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'list selection',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1110',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'freeform list',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1111',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'URL',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1112',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'date',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1113',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'No fields in this category. If this category remains empty when saved, it will be removed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1114',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Title',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1115',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Category',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1116',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Delete field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1117',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Edit field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1118',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => 'Profile category autocomplete',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1119',
+  'location' => '/?q=fr/admin/user/profile',
+  'textgroup' => 'default',
+  'source' => "This page displays a list of the existing custom profile fields to be displayed on a user's <em>My Account</em> page. To provide structure, similar or related fields may be placed inside a category. To add a new category (or edit an existing one), edit a profile field and provide a new category name. To change the category of a field or the order of fields within a category, grab a drag-and-drop handle under the Title column and drag the field to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save configuration</em> button at the bottom of the page.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1120',
+  'location' => '/?q=fr/admin/user/permissions',
+  'textgroup' => 'default',
+  'source' => 'Save permissions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1121',
+  'location' => '/?q=fr/admin/user/permissions',
+  'textgroup' => 'default',
+  'source' => 'Permission',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1122',
+  'location' => '/?q=fr/admin/user/permissions',
+  'textgroup' => 'default',
+  'source' => 'Permissions let you control what users can do on your site. Each user role (defined on the <a href="@role">user roles page</a>) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1123',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Access type',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1124',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Rule type',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1125',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Mask',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1126',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'username',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1127',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'e-mail',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1128',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'host',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1129',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'There are currently no access rules.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1130',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Delete rule',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1131',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Edit rule',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1132',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Add rule',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1133',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Check rules',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1134',
+  'location' => '/?q=fr/admin/user/rules',
+  'textgroup' => 'default',
+  'source' => 'Set up username and e-mail address access rules for new <em>and</em> existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1135',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'edit %title',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1136',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Field settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1137',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1138',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'The title of the new field. The title will be shown to the user. An example title is "Favorite color".',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1139',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Form name',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1140',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => "The name of the field. The form name is not shown to the user but used internally in the HTML code and URLs.\nUnless you know what you are doing, it is highly recommended that you prefix the form name with <code>profile_</code> to avoid name clashes with other fields. Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is \"profile_favorite_color\" or perhaps just \"profile_color\".",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1141',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Explanation',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1142',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'An optional explanation to go with the new field. The explanation will be shown to the user.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1143',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Selection options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1144',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'A list of all options. Put each option on a separate line. Example options are "red", "blue", "green", etc.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1145',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Visibility',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1146',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Hidden profile field, only accessible by administrators, modules and themes.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1147',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Private field, content only available to privileged users.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1148',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Public field, content shown on profile page but not used on member list pages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1149',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Public field, content shown on profile page and on member list pages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1150',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Page title',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1151',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'To enable browsing this field by value, enter a title for the resulting page. The word <code>%value</code> will be substituted with the corresponding value. An example page title is "People whose favorite color is %value". This is only applicable for a public field.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1152',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'The weights define the order in which the form fields are shown. Lighter fields "float up" towards the top of the category.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1153',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Form will auto-complete while user is typing.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1154',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'For security, auto-complete will be disabled if the user does not have access to user profiles.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1155',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'The user must enter a value.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1156',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Visible in user registration form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1157',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'Save field',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1158',
+  'location' => '/?q=fr/admin/user/profile/edit/11',
+  'textgroup' => 'default',
+  'source' => 'The specified form name contains one or more illegal characters. Spaces or any other special characters except dash (-) and underscore (_) are not allowed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1159',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'None.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1160',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'Path prefix only.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1161',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'Path prefix with language fallback.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1162',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'Domain name only.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1163',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => "Select the mechanism used to determine your site's presentation language. <strong>Modifying this setting may break all incoming URLs and should be used with caution in a production environment.</strong>",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1164',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'Save settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1165',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => "Language negotiation settings determine the site's presentation language. Available options include:",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1166',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => '<strong>None.</strong> The default language is used for site presentation, though users may (optionally) select a preferred language on the <em>My Account</em> page. (User language preferences will be used for site e-mails, if available.)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1167',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => '<strong>Path prefix only.</strong> The presentation language is determined by examining the path for a language code or other custom string that matches the path prefix (if any) specified for each language. If a suitable prefix is not identified, the default language is used. <em>Example: "example.com/de/contact" sets presentation language to German based on the use of "de" within the path.</em>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1168',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => "<strong>Path prefix with language fallback.</strong> The presentation language is determined by examining the path for a language code or other custom string that matches the path prefix (if any) specified for each language. If a suitable prefix is not identified, the display language is determined by the user's language preferences from the <em>My Account</em> page, or by the browser's language settings. If a presentation language cannot be determined, the default language is used.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1169',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => '<strong>Domain name only.</strong> The presentation language is determined by examining the domain used to access the site, and comparing it to the language domain (if any) specified for each language. If a match is not identified, the default language is used. <em>Example: "http://de.example.com/contact" sets presentation language to German based on the use of "http://de.example.com" in the domain.</em>',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1170',
+  'location' => '/?q=fr/admin/settings/language/configure',
+  'textgroup' => 'default',
+  'source' => 'The path prefix or domain name for a language may be set by editing the <a href="@languages">available languages</a>. In the absence of an appropriate match, the site is displayed in the <a href="@languages">default language</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1171',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Translatable input formats',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1172',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Only the strings that have the input formats selected will be allowed by the translation system. All the others will be deleted next time the strings are refreshed.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1173',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Built-in interface',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1174',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Blocks',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1175',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Menu',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1176',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'Profile',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1177',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => 'When translating user defined strings that have an Input format associated, translators will be able to edit the text before it is filtered which may be a security risk for some filters. An obvious example is when using the PHP filter but other filters may also be dangerous.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1178',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => "As a general rule <strong>do not allow any filtered text to be translated unless the translators already have access to that Input format</strong>. However if you are doing all your translations through this site's translation UI or the Localization client, and never importing translations for other textgroups than <i>default</i>, filter access will be checked for translators on every translation page.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1179',
+  'location' => '/?q=fr/admin/settings/language/configure/strings',
+  'textgroup' => 'default',
+  'source' => '<strong>Important:</strong> After disallowing some Input format, use the <a href="@refresh-strings">refresh strings</a> page so forbidden strings are deleted and not allowed anymore for translators.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1180',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Content selection',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1181',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Content selection mode',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1182',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Current language and language neutral.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1183',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Mixed current language (if available) or default language (if not) and language neutral.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1184',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Only default language and language neutral.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1185',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Only current language.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1186',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'All content. No language conditions apply.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1187',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Determines which content to show depending on the current page language and the default language of the site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1188',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Content translation links',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1189',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Hide content translation links',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1190',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Hide the links to translations in content body and teasers. If you choose this option, switching language will only be available from the language switcher block.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1191',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Switch interface for translating',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1192',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'Switch interface language to fit node language when creating or editing a translation. If not checked the interface language will be independent from node language.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1193',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'To set up multilingual options for vocabularies go to <a href="@configure_taxonomy">Taxonomy configuration page</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1194',
+  'location' => '/?q=fr/admin/settings/language/i18n',
+  'textgroup' => 'default',
+  'source' => 'To enable multilingual support for specific content types go to <a href="@configure_content_types">configure content types</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1195',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Drupal',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1196',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Web server',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1197',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'PHP',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1198',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'PHP register globals',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1199',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'PHP memory limit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1200',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'MySQL database',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1201',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Protected',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1202',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Configuration file',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1203',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Files directory',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1204',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Temporary files directory',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1205',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Not fully protected',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1206',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'See <a href="@url">@url</a> for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1207',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'For more information, see the online handbook entry for <a href="@cron-handbook">configuring cron jobs</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1208',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Never run',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1209',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Cron has not run.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1210',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Cron maintenance tasks',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1211',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'You can <a href="@cron">run cron manually</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1212',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Not writable',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1213',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "You may need to set the correct directory at the <a href=\"@admin-file-system\">file system settings page</a> or change the current directory's permissions so that it is writable.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1214',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Database updates',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1215',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Up to date',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1216',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Access to update.php',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1217',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Standard PHP',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1218',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'PHP Mbstring Extension',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1219',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Error',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1220',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Unicode library',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1221',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Not enabled',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1222',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1223',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Update notifications',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1224',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'set the site timezone name',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1225',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'The Date Timezone module requires you to !link.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1226',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Date Timezone requirements',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1227',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'MySQL database for event module',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1228',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Your server is capable of displaying file upload progress, but does not have the required libraries. It is recommended to install the <a href="http://pecl.php.net/package/uploadprogress">PECL uploadprogress library</a> (preferred) or to install <a href="http://us2.php.net/apc">APC</a>.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1229',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Upload progress',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1230',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'ImageAPI Toolkit',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1231',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'No ImageAPI toolkits available',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1232',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'ImageAPI requires a Toolkit such as ImageAPI GD or ImageAPI ImageMagick to function. Go to !modules and enable one of them.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1233',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'ImageCache Directory',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1234',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => '%p is not a directory or is not readable by the webserver.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1235',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'One or more problems were detected with your Drupal installation. Check the <a href="@status">status report</a> for more information.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1236',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Comments',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1237',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'List and edit site comments and the comment moderation queue.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1238',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "View, edit, and delete your site's content.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1239',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Manage posts by content type, including default status, front page promotion, etc.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1240',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Post settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1241',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Control posting behavior, such as teaser length, requiring previews before posting, and the number of posts on the front page.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1242',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'RSS publishing',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1243',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Configure the number of items per feed and whether feeds should be titles/teasers/full-text.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1244',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Manage tagging, categorization, and classification of your content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1245',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1246',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Manage your site's book outlines.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1247',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Status report',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1248',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Get a status report about your site's operation and any detected problems.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1249',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Configure what block content appears in your site's sidebars and other regions.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1250',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Contact form',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1251',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Create a system contact form and set up categories for the form to use.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1252',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Menus',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1253',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Control your site's navigation menu, primary links and secondary links, as well as rename and reorganize menu items.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1254',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Modules',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1255',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Enable or disable add-on modules for your site.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1256',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Themes',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1257',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Change which theme your site uses or allows users to set.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1258',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'URL aliases',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1259',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => "Change your site's URL paths by aliasing them.",
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1260',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Translate interface',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1261',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Translate the built in interface and optionally other text.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1262',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Hide descriptions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1263',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Compress layout by hiding descriptions.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1264',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'By task',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1265',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'By module',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1266',
+  'location' => '/?q=fr/admin',
+  'textgroup' => 'default',
+  'source' => 'Welcome to the administration section. Here you may control how your site functions.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1267',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Configure permissions',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1268',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Store a date in the database as an ISO date, recommended for historical or partial dates.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1269',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Store a date in the database as a timestamp, deprecated format to suppport legacy data.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1270',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Store a date in the database as a datetime field, recommended for complete dates and times that may need timezone conversion.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1271',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'File',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1272',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Store an arbitrary file.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1273',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Link',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1274',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Store a title, href, and attributes in the database to assemble a link.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1275',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - France',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1276',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Belgium',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1277',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Italy',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1278',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Greece',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1279',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Switzerland',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1280',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - US & Canada',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1281',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Costa Rica',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1282',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Panama',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1283',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Great Britain - United Kingdom',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1284',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Russia',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1285',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Ukraine - in Kiev',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1286',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Spain',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1287',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Australia',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1288',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Czech Republic',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1289',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Hungary',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1290',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Poland - mobiles only',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1291',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Netherland',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1292',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Sweden',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1293',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - South Africa',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1294',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Israel',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1295',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - New Zealand',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1296',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Brazil',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1297',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Chile',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1298',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - China',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1299',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Hong-Kong',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1300',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Macao',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1301',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - The Philippines',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1302',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Singapore',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1303',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Jordan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1304',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Egypt',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1305',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - Pakistan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1306',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Phone Numbers - International Phone Numbers per E.123',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1307',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Select List',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1308',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Select List with Repeat options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1309',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Text Field with custom input format',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1310',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Text Field with Repeat options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1311',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'As Time Ago',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1312',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Default email link',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1313',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Email contact form',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1314',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Email plain text',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1315',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'File Upload',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1316',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'A plain file upload widget.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1317',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Generic files',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1318',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Displays all kinds of files with an icon and a linked file description.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1319',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Path to file',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1320',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Displays the file system path to the file.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1321',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'URL to file',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1322',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Displays a full URL to the file.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1323',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => '@preset image',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1324',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => '@preset image linked to node',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1325',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => '@preset image linked to image',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1326',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => '@preset file path',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1327',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => '@preset URL',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1328',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Image',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1329',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'An edit widget for image files, including a preview of the image.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1330',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Displays image files in their original size.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1331',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Image linked to node',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1332',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Image linked to file',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1333',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Title, as link (default)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1334',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Title, as plain text',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1335',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'URL, as link',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1336',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'URL, as plain text',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1337',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'URL, as absolute URL',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1338',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Short, as link with title "Link"',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1339',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Label, as link with label as title',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1340',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Separate title and URL',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1341',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Textfield',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1342',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Revision information',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1343',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Authoring information',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1344',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Publishing options',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1345',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Comment settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1346',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Comment module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1347',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Translation settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1348',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Translation module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1349',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Path settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1350',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Path module form.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1351',
+  'location' => 'content.module:1897;1900,  fuzzy',
+  'textgroup' => 'default',
+  'source' => 'Print',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1352',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Account settings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1353',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Aggregates syndicated content (RSS, RDF, and Atom feeds).',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1354',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Controls the boxes that are displayed around the main content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1355',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows users to structure site pages in a hierarchy or outline.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1356',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows users to comment on and discuss published content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1357',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Enables the use of both personal and site-wide contact forms.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1358',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Defines CCK date/time fields and widgets.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1359',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Defines an email field type for cck',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1360',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Calendaring API, calendar display and export',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1361',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Handles the filtering of content in preparation for display.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1362',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Extends Drupal support for multilingual features.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1363',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'ImageAPI supporting multiple toolkits.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1364',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Dynamic image manipulator and cache.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1365',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Adds language handling functionality and enables the translation of the user interface to languages other than English.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1366',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows administrators to customize the site navigation menu.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1367',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows content to be submitted to the site and displayed on pages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1368',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows users to rename URLs.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1369',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Supports configurable user profiles.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1370',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Handles general site configuration for administrators.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1371',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Enables the categorization of content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1372',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows content to be translated into different languages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1373',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Allows users to upload and attach files to content.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1374',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Manages the user registration and login system.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1375',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'Variable API - Admin UI',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1376',
+  'location' => '/?q=fr/admin/by-module',
+  'textgroup' => 'default',
+  'source' => 'This page shows you all available administration tasks for each module.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1377',
+  'location' => 'field.php:102 number.module:82 text.module:80',
+  'textgroup' => 'default',
+  'source' => 'is equal to',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1378',
+  'location' => 'field.php:103 number.module:83 text.module:81',
+  'textgroup' => 'default',
+  'source' => 'is not equal to',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1379',
+  'location' => 'field.php:104 text.module:82',
+  'textgroup' => 'default',
+  'source' => 'matches the pattern',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1380',
+  'location' => 'content_admin.inc:25 content.module:119',
+  'textgroup' => 'default',
+  'source' => 'duplicate',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1381',
+  'location' => 'number.module:52,  text.module:55',
+  'textgroup' => 'default',
+  'source' => 'The possible values this field can contain. Any other values will result in an error. Enter one value per line.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1382',
+  'location' => 'content.module:73',
+  'textgroup' => 'default',
+  'source' => 'add content type',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1383',
+  'location' => 'content.module:80',
+  'textgroup' => 'default',
+  'source' => 'fields',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1384',
+  'location' => 'content.module:164',
+  'textgroup' => 'default',
+  'source' => 'remove field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1385',
+  'location' => 'nodereference.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines a field type for referencing one node from another. <em>Note: Requires content.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1386',
+  'location' => 'nodereference.module:26',
+  'textgroup' => 'default',
+  'source' => 'node reference autocomplete',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1387',
+  'location' => 'nodereference.module:204',
+  'textgroup' => 'default',
+  'source' => 'No post with that title exists.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1388',
+  'location' => 'number.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines numeric field types. <em>Note: Requires content.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1389',
+  'location' => 'optionwidgets.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines selection, check box and radio button widgets for text and numeric fields. <em>Note: Requires content.module, text.module and number.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1390',
+  'location' => 'text.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines simple text field types. <em>Note: Requires content.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1391',
+  'location' => 'userreference.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines a field type for referencing a user from a node. <em>Note: Requires content.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1392',
+  'location' => 'userreference.module:176',
+  'textgroup' => 'default',
+  'source' => 'Invalid user name.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1393',
+  'location' => 'weburl.module:15',
+  'textgroup' => 'default',
+  'source' => 'Defines simple weburl field types. <em>Note: Requires content.module.</em>',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1394',
+  'location' => 'weburl.module:164;172',
+  'textgroup' => 'default',
+  'source' => 'Not a valid Web URL.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1395',
+  'location' => 'weburl.module:0',
+  'textgroup' => 'default',
+  'source' => 'weburl',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1396',
+  'location' => 'content_admin.inc:90',
+  'textgroup' => 'default',
+  'source' => 'The human-readable name of this content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1397',
+  'location' => 'content_admin.inc:98',
+  'textgroup' => 'default',
+  'source' => 'A brief description of the content type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1398',
+  'location' => 'content_admin.inc:106',
+  'textgroup' => 'default',
+  'source' => 'Instructions to present to the user when adding new content of this type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1399',
+  'location' => 'content_admin.inc:110',
+  'textgroup' => 'default',
+  'source' => 'Title field label',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1400',
+  'location' => 'content_admin.inc:113',
+  'textgroup' => 'default',
+  'source' => 'The label for the title field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1401',
+  'location' => 'content_admin.inc:118',
+  'textgroup' => 'default',
+  'source' => 'Save content type',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1402',
+  'location' => 'content_admin.inc:182',
+  'textgroup' => 'default',
+  'source' => 'Saved content type %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1403',
+  'location' => 'content_admin.inc:198',
+  'textgroup' => 'default',
+  'source' => 'Are you sure you want to delete the content type %type?',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1404',
+  'location' => 'content_admin.inc:198',
+  'textgroup' => 'default',
+  'source' => 'If you have any content left in this content type, it will be permanently deleted. This action cannot be undone.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1405',
+  'location' => 'content_admin.inc:220',
+  'textgroup' => 'default',
+  'source' => 'Deleted content type %type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1406',
+  'location' => 'content_admin.inc:251',
+  'textgroup' => 'default',
+  'source' => 'remove',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1407',
+  'location' => 'content_admin.inc:313',
+  'textgroup' => 'default',
+  'source' => 'The human-readable name of this field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1408',
+  'location' => 'content_admin.inc:326',
+  'textgroup' => 'default',
+  'source' => 'Create field',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1409',
+  'location' => 'content_admin.inc:335',
+  'textgroup' => 'default',
+  'source' => 'No field modules are enabled. You need to <a href="%modules_url">enable one</a>, such as text.module, before you can add new fields.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1410',
+  'location' => 'content_admin.inc:487',
+  'textgroup' => 'default',
+  'source' => 'The field %field no longer exists in any content type, so it was deleted.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1411',
+  'location' => 'content_admin.inc:522',
+  'textgroup' => 'default',
+  'source' => 'Widget settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1412',
+  'location' => 'content_admin.inc:526',
+  'textgroup' => 'default',
+  'source' => 'Widget',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1413',
+  'location' => 'content_admin.inc:541',
+  'textgroup' => 'default',
+  'source' => 'In the node editing form, the heavier fields will sink and the lighter fields will be positioned nearer the top.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1414',
+  'location' => 'content_admin.inc:552',
+  'textgroup' => 'default',
+  'source' => 'Instructions to present to the user below this field on the editing form.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1415',
+  'location' => 'content_admin.inc:569',
+  'textgroup' => 'default',
+  'source' => 'Data settings',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1416',
+  'location' => 'content_admin.inc:579',
+  'textgroup' => 'default',
+  'source' => 'Multiple values',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1417',
+  'location' => 'content_admin.inc:652',
+  'textgroup' => 'default',
+  'source' => 'Saved field %field.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1418',
+  'location' => 'content_admin.inc:882;971',
+  'textgroup' => 'default',
+  'source' => 'No PostgreSQL mapping found for %type data type.',
+  'version' => 'none',
+))
+->values(array(
+  'lid' => '1419',
+  'location' => 'content_admin.inc:896;985',
+  'textgroup' => 'default',
+  'source' => 'database',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '211',
-  'location' => 'includes/content.token.inc:84',
+  'lid' => '1420',
+  'location' => 'date.module:15',
   'textgroup' => 'default',
-  'source' => 'Formatted html link to the referenced node.',
+  'source' => 'Defines a date/time field type. <em>Note: Requires content.module.</em>',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '212',
-  'location' => 'includes/content.token.inc:85',
+  'lid' => '1421',
+  'location' => 'date.module:36',
   'textgroup' => 'default',
-  'source' => 'Relative path alias to the referenced node.',
+  'source' => 'Year',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '213',
-  'location' => 'includes/content.token.inc:86',
+  'lid' => '1422',
+  'location' => 'date.module:37',
   'textgroup' => 'default',
-  'source' => 'Absolute path alias to the referenced node.',
+  'source' => 'Year and month',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '214',
-  'location' => 'includes/content.token.inc:86',
+  'lid' => '1423',
+  'location' => 'date.module:40',
   'textgroup' => 'default',
-  'source' => 'Raw number value',
+  'source' => 'Time only',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '215',
-  'location' => 'includes/content.token.inc:87',
+  'lid' => '1424',
+  'location' => 'date.module:44',
   'textgroup' => 'default',
-  'source' => 'Formatted number value',
+  'source' => 'Granularity',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '216',
-  'location' => 'includes/content.token.inc:110',
+  'lid' => '1425',
+  'location' => 'date.module:102',
   'textgroup' => 'default',
-  'source' => 'Raw, unfiltered text',
+  'source' => "Times are entered and displayed with site's time zone",
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '217',
-  'location' => 'includes/content.token.inc:111',
+  'lid' => '1426',
+  'location' => 'date.module:103',
   'textgroup' => 'default',
-  'source' => 'Formatted and filtered text',
+  'source' => "Times are entered and displayed with user's time zone",
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '218',
-  'location' => 'includes/content.token.inc:133',
+  'lid' => '1427',
+  'location' => 'date.module:107',
   'textgroup' => 'default',
-  'source' => 'Referenced user ID',
+  'source' => 'Time zone handling',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '219',
-  'location' => 'includes/content.token.inc:134',
+  'lid' => '1428',
+  'location' => 'date.module:153',
   'textgroup' => 'default',
-  'source' => 'Referenced user name',
+  'source' => '%name must be entered in ISO 8601 format (YYYYMMDDThh:mm:ss).',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '220',
-  'location' => 'includes/content.token.inc:135',
+  'lid' => '1429',
+  'location' => 'content.module:61',
   'textgroup' => 'default',
-  'source' => 'Formatted HTML link to referenced user',
+  'source' => 'content types',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '221',
-  'location' => 'includes/content.token.inc:164',
+  'lid' => '1430',
+  'location' => 'content.module:67',
   'textgroup' => 'default',
-  'source' => 'Relative path alias to the referenced user.',
+  'source' => 'list',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '222',
-  'location' => 'includes/content.token.inc:165',
+  'lid' => '1431',
+  'location' => 'modules/optionwidgets/optionwidgets.module:326',
   'textgroup' => 'default',
-  'source' => 'Absolute path alias to the referenced user.',
+  'source' => '%name: this field cannot hold more than @count values.',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '223',
-  'location' => 'includes/views/content.views.inc:245;261',
+  'lid' => '1432',
+  'location' => 'includes/panels/content_types/content_field.inc:37',
   'textgroup' => 'default',
-  'source' => '@label (!name)',
+  'source' => '@type: (@field_type) @field',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '224',
-  'location' => 'includes/views/content.views.inc:249',
+  'lid' => '1433',
+  'location' => 'includes/panels/content_types/content_field.inc:44',
   'textgroup' => 'default',
-  'source' => '@label (!name) - !column',
+  'source' => 'Field on the referenced node.',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '225',
-  'location' => 'includes/views/content.views.inc:250',
+  'lid' => '1434',
+  'location' => 'includes/panels/content_types/content_field.inc:128',
   'textgroup' => 'default',
-  'source' => '@label-truncated - !column',
+  'source' => 'Formatter',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '226',
-  'location' => 'includes/content.views.inc:93',
+  'lid' => '1435',
+  'location' => 'includes/panels/content_types/content_field.inc:131',
   'textgroup' => 'default',
-  'source' => 'Appears in: @types',
+  'source' => 'Select a formatter.',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '227',
-  'location' => 'includes/views/handlers/content_handler_field.inc:59',
+  'lid' => '1436',
+  'location' => 'includes/panels/content_types/content_field.inc:147',
   'textgroup' => 'default',
-  'source' => 'None',
+  'source' => '"@s" field (@name)',
   'version' => 'none',
 ))
 ->values(array(
-  'lid' => '228',
-  'location' => 'includes/views/handlers/content_handler_field.inc:60',
+  'lid' => '1437',
+  'location' => '/?q=zu/admin/settingsjhkjg',
   'textgroup' => 'default',
-  'source' => 'Widget label (@label)',
-  'version' => 'none',
+  'source' => 'Page not found',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '229',
-  'location' => 'includes/views/handlers/content_handler_field.inc:61',
+  'lid' => '1438',
+  'location' => '/?q=zu/admin/settingsjhkjg',
   'textgroup' => 'default',
-  'source' => 'Custom',
-  'version' => 'none',
+  'source' => 'The requested page could not be found.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '230',
-  'location' => 'includes/views/handlers/content_handler_field.inc:67',
+  'lid' => '1439',
+  'location' => '/?q=zu/admin/build/translate',
   'textgroup' => 'default',
-  'source' => 'Custom label',
-  'version' => 'none',
+  'source' => 'English (built-in)',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '231',
-  'location' => 'includes/content.views.inc:291',
+  'lid' => '1440',
+  'location' => '/?q=zu/admin/build/translate',
   'textgroup' => 'default',
-  'source' => 'Format',
-  'version' => 'none',
+  'source' => 'n/a',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1441',
+  'location' => '/?q=zu/admin/build/translate',
+  'textgroup' => 'default',
+  'source' => 'Zulu',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1442',
+  'location' => '/?q=zu/admin/build/translate',
+  'textgroup' => 'default',
+  'source' => 'Overview',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1443',
+  'location' => '/?q=zu/admin/build/translate',
+  'textgroup' => 'default',
+  'source' => 'Refresh',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1444',
+  'location' => '/?q=zu/admin/build/translate',
+  'textgroup' => 'default',
+  'source' => 'This page provides an overview of available translatable strings. Drupal displays translatable strings in text groups; modules may define additional text groups containing other translatable strings. Because text groups provide a method of grouping related strings, they are often used to focus translation efforts on specific areas of the Drupal interface.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1445',
+  'location' => '/?q=zu/admin/build/translate',
+  'textgroup' => 'default',
+  'source' => 'Review the <a href="@languages">languages page</a> for more information on adding support for additional languages.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1446',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'English',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1447',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'String contains',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1448',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Leave blank to show all strings. The search is case sensitive.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1449',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'All languages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1450',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'English (provided by Drupal)',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1451',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Search in',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1452',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Both translated and untranslated strings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1453',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Only translated strings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1454',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Only untranslated strings',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1455',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'Limit search to',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1456',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'All text groups',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1457',
+  'location' => '/?q=zu/admin/build/translate/search',
+  'textgroup' => 'default',
+  'source' => 'This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: For translation tasks involving many strings, it may be more convenient to <a href="@export">export</a> strings for off-line editing in a desktop Gettext translation editor.) Searches may be limited to strings found within a specific text group or in a specific language.',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1458',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Already added languages',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1459',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Languages not yet added',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1460',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Afar',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1461',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Abkhazian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1462',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Avestan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1463',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Afrikaans',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1464',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Akan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1465',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Amharic',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1466',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Arabic',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1467',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Assamese',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1468',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Avar',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1469',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Aymara',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1470',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Azerbaijani',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1471',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bashkir',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1472',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Belarusian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1473',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bulgarian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1474',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bihari',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1475',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bislama',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1476',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bambara',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1477',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bengali',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1478',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Tibetan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1479',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Breton',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1480',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bosnian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1481',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Catalan',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1482',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Chechen',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1483',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Chamorro',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1484',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Corsican',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1485',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Cree',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1486',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Czech',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1487',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Old Slavonic',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1488',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Chuvash',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1489',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Welsh',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1490',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Danish',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1491',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'German',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1492',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Maldivian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1493',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Bhutani',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1494',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Ewe',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1495',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Greek',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1496',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Esperanto',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1497',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Spanish',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1498',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Estonian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1499',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Basque',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1500',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Persian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1501',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Fulah',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1502',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Finnish',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1503',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Fiji',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1504',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Faeroese',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1505',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Frisian',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1506',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Irish',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1507',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Scots Gaelic',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '232',
-  'location' => 'includes/content.views.inc:372',
+  'lid' => '1508',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Group multiple values',
-  'version' => 'none',
+  'source' => 'Galician',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '233',
-  'location' => 'includes/views/handlers/content_handler_field_multiple.inc:61',
+  'lid' => '1509',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'If unchecked, each item in the field will create a new row, which may appear to cause duplicates. This setting is not compatible with click-sorting in table displays.',
-  'version' => 'none',
+  'source' => 'Guarani',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '234',
-  'location' => 'includes/content.views.inc:378',
+  'lid' => '1510',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Show @count value(s)',
-  'version' => 'none',
+  'source' => 'Gujarati',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '235',
-  'location' => 'includes/content.views.inc:387',
+  'lid' => '1511',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'starting from @count',
-  'version' => 'none',
+  'source' => 'Manx',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '236',
-  'location' => 'includes/content.views.inc:396',
+  'lid' => '1512',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Reversed (start from last values)',
-  'version' => 'none',
+  'source' => 'Hausa',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '237',
-  'location' => 'includes/views/handlers/content_handler_relationship.inc:40,  includes/views/handlers/content_handler_sort.inc:41',
+  'lid' => '1513',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'All',
-  'version' => 'none',
+  'source' => 'Hebrew',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '238',
-  'location' => 'includes/views/handlers/content_handler_relationship.inc:48,  includes/views/handlers/content_handler_sort.inc:49',
+  'lid' => '1514',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Delta',
-  'version' => 'none',
+  'source' => 'Hindi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '239',
-  'location' => 'includes/views/handlers/content_handler_relationship.inc:49',
+  'lid' => '1515',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The delta allows you to select which item in a multiple value field to key the relationship off of. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.',
-  'version' => 'none',
+  'source' => 'Hiri Motu',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '240',
-  'location' => 'includes/views/handlers/content_handler_sort.inc:50',
+  'lid' => '1516',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The delta allows you to select which item in a multiple value field will be used for sorting. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.',
-  'version' => 'none',
+  'source' => 'Croatian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '241',
-  'location' => 'modules/content_copy/content_copy_export_form.tpl.php:9,  modules/content_copy/content_copy.module:191;38',
+  'lid' => '1517',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Export',
-  'version' => 'none',
+  'source' => 'Hungarian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '242',
-  'location' => 'modules/content_copy/content_copy.module:97',
+  'lid' => '1518',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to into an existing content type or create a new content type that includes the selected fields.',
-  'version' => 'none',
+  'source' => 'Armenian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '243',
-  'location' => 'modules/content_copy/content_copy.module:103',
+  'lid' => '1519',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Types',
-  'version' => 'none',
+  'source' => 'Herero',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '244',
-  'location' => 'modules/content_copy/content_copy.module:107',
+  'lid' => '1520',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Select the content type to export.',
-  'version' => 'none',
+  'source' => 'Interlingua',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '245',
-  'location' => 'modules/content_copy/content_copy.module:175',
+  'lid' => '1521',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Export data',
-  'version' => 'none',
+  'source' => 'Indonesian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '246',
-  'location' => 'modules/content_copy/content_copy.module:180',
+  'lid' => '1522',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Copy the export text and paste it into another content type using the import function.',
-  'version' => 'none',
+  'source' => 'Interlingue',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '247',
-  'location' => 'modules/content_copy/content_copy.module:184',
+  'lid' => '1523',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content types',
-  'version' => 'none',
+  'source' => 'Igbo',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '248',
-  'location' => 'modules/content_copy/content_copy.module:308',
+  'lid' => '1524',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content type',
-  'version' => 'none',
+  'source' => 'Inupiak',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '249',
-  'location' => 'modules/content_copy/content_copy.module:309',
+  'lid' => '1525',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Select the content type to import these fields into.<br/>Select &lt;Create&gt; to create a new content type to contain the fields.',
-  'version' => 'none',
+  'source' => 'Icelandic',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '250',
-  'location' => 'modules/content_copy/content_copy.module:314',
+  'lid' => '1526',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Import data',
-  'version' => 'none',
+  'source' => 'Italian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '251',
-  'location' => 'modules/content_copy/content_copy.module:316',
+  'lid' => '1527',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Paste the text created by a content export into this field.',
-  'version' => 'none',
+  'source' => 'Inuktitut',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '252',
-  'location' => 'modules/content_copy/content_copy.module:320;46',
+  'lid' => '1528',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Import',
-  'version' => 'none',
+  'source' => 'Japanese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '253',
-  'location' => 'modules/content_copy/content_copy.module:328',
+  'lid' => '1529',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'A file has been pre-loaded for import.',
-  'version' => 'none',
+  'source' => 'Javanese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '254',
-  'location' => 'modules/content_copy/content_copy.module:354',
+  'lid' => '1530',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The import data is not valid import text.',
-  'version' => 'none',
+  'source' => 'Georgian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '255',
-  'location' => 'modules/content_copy/content_copy.module:403',
+  'lid' => '1531',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The following modules must be enabled for this import to work: %modules.',
-  'version' => 'none',
+  'source' => 'Kongo',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '256',
-  'location' => 'modules/content_copy/content_copy.module:411',
+  'lid' => '1532',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The content type %type already exists in this database.',
-  'version' => 'none',
+  'source' => 'Kikuyu',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '257',
-  'location' => 'modules/content_copy/content_copy.module:418',
+  'lid' => '1533',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Exiting. No import performed.',
-  'version' => 'none',
+  'source' => 'Kwanyama',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '258',
-  'location' => 'modules/content_copy/content_copy.module:442',
+  'lid' => '1534',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.',
-  'version' => 'none',
+  'source' => 'Kazakh',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '259',
-  'location' => 'modules/content_copy/content_copy.module:467',
+  'lid' => '1535',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.',
-  'version' => 'none',
+  'source' => 'Greenlandic',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '260',
-  'location' => 'modules/content_copy/content_copy.module:476',
+  'lid' => '1536',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The field %field_label (%field_name) was added to the content type %type.',
-  'version' => 'none',
+  'source' => 'Cambodian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '261',
-  'location' => 'modules/content_copy/content_copy.module:0',
+  'lid' => '1537',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'content_copy',
-  'version' => 'none',
+  'source' => 'Kannada',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '262',
-  'location' => 'modules/content_copy/content_copy.info:0',
+  'lid' => '1538',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content Copy',
-  'version' => 'none',
+  'source' => 'Korean',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '263',
-  'location' => 'modules/content_copy/content_copy.info:0',
+  'lid' => '1539',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Enables ability to import/export field definitions.',
-  'version' => 'none',
+  'source' => 'Kanuri',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '264',
-  'location' => 'modules/content_multigroup/content_multigroup.module:12',
+  'lid' => '1540',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The fields in a Standard group are independent of each other and each can have either single or multiple values. The fields in a Multigroup are treated as a repeating collection of single value fields.',
-  'version' => 'none',
+  'source' => 'Kashmiri',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '265',
-  'location' => 'modules/content_multigroup/content_multigroup.module:65;135',
+  'lid' => '1541',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Multigroup',
-  'version' => 'none',
+  'source' => 'Kurdish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '266',
-  'location' => 'modules/content_multigroup/content_multigroup.module:134',
+  'lid' => '1542',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Standard',
-  'version' => 'none',
+  'source' => 'Komi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '267',
-  'location' => 'modules/content_multigroup/content_multigroup.module:138',
+  'lid' => '1543',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Type of group.',
-  'version' => 'none',
+  'source' => 'Cornish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '268',
-  'location' => 'modules/content_multigroup/content_multigroup.module:215',
+  'lid' => '1544',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The field %field has been updated to use %multiple values, to match the multiple value setting of the Multigroup %group.',
-  'version' => 'none',
+  'source' => 'Kirghiz',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '269',
-  'location' => 'modules/content_multigroup/content_multigroup.module:248',
+  'lid' => '1545',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'This change is not allowed. The field %field already has %multiple values in the database but the group %group only allows %group_max. Making this change would result in the loss of data.',
-  'version' => 'none',
+  'source' => 'Latin',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '270',
-  'location' => 'modules/content_multigroup/content_multigroup.module:272',
+  'lid' => '1546',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'This change is not allowed. The field %field handles multiple values differently than the Content module. Making this change could result in the loss of data.',
-  'version' => 'none',
+  'source' => 'Luxembourgish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '271',
-  'location' => 'modules/content_multigroup/content_multigroup.module:287',
+  'lid' => '1547',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'You are moving the field %field into a Multigroup.',
-  'version' => 'none',
+  'source' => 'Luganda',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '272',
-  'location' => 'modules/content_multigroup/content_multigroup.module:320',
+  'lid' => '1548',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'This change is not allowed. The field %field already has data created and uses a widget that stores data differently in a Standard group than in a Multigroup. Making this change could result in the loss of data.',
-  'version' => 'none',
+  'source' => 'Lingala',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '273',
-  'location' => 'modules/content_multigroup/content_multigroup.module:334',
+  'lid' => '1549',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'You are moving the field %field out of a Multigroup.',
-  'version' => 'none',
+  'source' => 'Laothian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '274',
-  'location' => 'modules/content_multigroup/content_multigroup.module:369',
+  'lid' => '1550',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Simple',
-  'version' => 'none',
+  'source' => 'Lithuanian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '275',
-  'location' => 'modules/content_multigroup/content_multigroup.module:370',
+  'lid' => '1551',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Fieldset',
-  'version' => 'none',
+  'source' => 'Latvian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '276',
-  'location' => 'modules/content_multigroup/content_multigroup.module:371',
+  'lid' => '1552',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Horizontal line',
-  'version' => 'none',
+  'source' => 'Malagasy',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '277',
-  'location' => 'modules/content_multigroup/content_multigroup.module:372',
+  'lid' => '1553',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Table - Single column',
-  'version' => 'none',
+  'source' => 'Marshallese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '278',
-  'location' => 'modules/content_multigroup/content_multigroup.module:373',
+  'lid' => '1554',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Table - Multiple columns',
-  'version' => 'none',
+  'source' => 'Maori',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '279',
-  'location' => 'modules/content_multigroup/content_multigroup.module:384',
+  'lid' => '1555',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '[Subgroup format]',
-  'version' => 'none',
+  'source' => 'Macedonian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '280',
-  'location' => 'modules/content_multigroup/content_multigroup.module:461',
+  'lid' => '1556',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Multigroup settings',
-  'version' => 'none',
+  'source' => 'Malayalam',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '281',
-  'location' => 'modules/content_multigroup/content_multigroup.module:476',
+  'lid' => '1557',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Multiple columns',
-  'version' => 'none',
+  'source' => 'Mongolian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '282',
-  'location' => 'modules/content_multigroup/content_multigroup.module:478',
+  'lid' => '1558',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Enable this option to render each field on a separate column on the node edit form.',
-  'version' => 'none',
+  'source' => 'Moldavian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '283',
-  'location' => 'modules/content_multigroup/content_multigroup.module:485',
+  'lid' => '1559',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Enable this option to require a minimum of one collection of fields in this Multigroup.',
-  'version' => 'none',
+  'source' => 'Marathi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '284',
-  'location' => 'modules/content_multigroup/content_multigroup.module:488',
+  'lid' => '1560',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Number of times to repeat the collection of Multigroup fields.',
-  'version' => 'none',
+  'source' => 'Malay',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '285',
-  'location' => 'modules/content_multigroup/content_multigroup.module:489',
+  'lid' => '1561',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => "'Unlimited' will provide an 'Add more' button so the users can add items as many times as they like.",
-  'version' => 'none',
+  'source' => 'Maltese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '286',
-  'location' => 'modules/content_multigroup/content_multigroup.module:490',
+  'lid' => '1562',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'All fields in this group will automatically be set to allow this number of values.',
-  'version' => 'none',
+  'source' => 'Burmese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '287',
-  'location' => 'modules/content_multigroup/content_multigroup.module:495',
+  'lid' => '1563',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Number of repeats',
-  'version' => 'none',
+  'source' => 'Nauru',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '288',
-  'location' => 'modules/content_multigroup/content_multigroup.module:503',
+  'lid' => '1564',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Labels',
-  'version' => 'none',
+  'source' => 'North Ndebele',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '289',
-  'location' => 'modules/content_multigroup/content_multigroup.module:504',
+  'lid' => '1565',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => "Labels for each subgroup of fields. Labels can be hidden or shown in various contexts using the 'Display fields' screen.",
-  'version' => 'none',
+  'source' => 'Nepali',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '290',
-  'location' => 'modules/content_multigroup/content_multigroup.module:512',
+  'lid' => '1566',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Subgroup %number label',
-  'version' => 'none',
+  'source' => 'Ndonga',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '291',
-  'location' => 'modules/content_multigroup/content_multigroup.module:539',
+  'lid' => '1567',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The field %field in this group already has %multiple values in the database. To prevent the loss of data you cannot set the number of Multigroup values to less than this.',
-  'version' => 'none',
+  'source' => 'Dutch',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '292',
-  'location' => 'modules/content_multigroup/content_multigroup.module:932',
+  'lid' => '1568',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '!name field is required in group @group.',
-  'version' => 'none',
+  'source' => 'Norwegian Bokmål',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '293',
-  'location' => 'modules/content_multigroup/content_multigroup.module:946',
+  'lid' => '1569',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Group @name requires one collection of fields minimum.',
-  'version' => 'none',
+  'source' => 'Norwegian Nynorsk',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '294',
-  'location' => 'modules/content_multigroup/content_multigroup.module:1145',
+  'lid' => '1570',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Add more values',
-  'version' => 'none',
+  'source' => 'South Ndebele',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '295',
-  'location' => 'modules/content_multigroup/content_multigroup.module:0',
+  'lid' => '1571',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'content_multigroup',
-  'version' => 'none',
+  'source' => 'Navajo',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '296',
-  'location' => 'modules/content_multigroup/content_multigroup.info:0',
+  'lid' => '1572',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content Multigroup',
-  'version' => 'none',
+  'source' => 'Chichewa',
+  'version' => '6.38-dev',
+))
+->values(array(
+  'lid' => '1573',
+  'location' => '/?q=zu/admin/build/translate/import',
+  'textgroup' => 'default',
+  'source' => 'Occitan',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '297',
-  'location' => 'modules/content_multigroup/content_multigroup.info:0',
+  'lid' => '1574',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Combine multiple CCK fields into repeating field collections that work in unison.',
-  'version' => 'none',
+  'source' => 'Oromo',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '298',
-  'location' => 'modules/content_permissions/content_permissions.module:10',
+  'lid' => '1575',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'edit ',
-  'version' => 'none',
+  'source' => 'Oriya',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '299',
-  'location' => 'modules/content_permissions/content_permissions.module:10;11',
+  'lid' => '1576',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'field_name',
-  'version' => 'none',
+  'source' => 'Ossetian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '300',
-  'location' => 'modules/content_permissions/content_permissions.module:11',
+  'lid' => '1577',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'view ',
-  'version' => 'none',
+  'source' => 'Punjabi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '301',
-  'location' => 'modules/content_permissions/content_permissions.module:0',
+  'lid' => '1578',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'content_permissions',
-  'version' => 'none',
+  'source' => 'Pali',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '302',
-  'location' => 'modules/content_permissions/content_permissions.install:9',
+  'lid' => '1579',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Please <a href="!url">configure your field permissions</a> immediately. All fields are inaccessible by default.',
-  'version' => 'none',
+  'source' => 'Polish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '303',
-  'location' => 'modules/content_permissions/content_permissions.info:0',
+  'lid' => '1580',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content Permissions',
-  'version' => 'none',
+  'source' => 'Pashto',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '304',
-  'location' => 'modules/content_permissions/content_permissions.info:0',
+  'lid' => '1581',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Set field-level permissions for CCK fields.',
-  'version' => 'none',
+  'source' => 'Portuguese, Portugal',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '305',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:10;27',
+  'lid' => '1582',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content fieldgroup',
-  'version' => 'none',
+  'source' => 'Portuguese, Brazil',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '306',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:30',
+  'lid' => '1583',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'All fields from a fieldgroup on the referenced node.',
-  'version' => 'none',
+  'source' => 'Quechua',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '307',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:91',
+  'lid' => '1584',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '@group_label (@group_type_name)',
-  'version' => 'none',
+  'source' => 'Rhaeto-Romance',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '308',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:102,  modules/fieldgroup/fieldgroup.info:0',
+  'lid' => '1585',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Fieldgroup',
-  'version' => 'none',
+  'source' => 'Kirundi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '309',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:112',
+  'lid' => '1586',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Text to display if group has no data. Note that title will not display unless overridden.',
-  'version' => 'none',
+  'source' => 'Romanian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '310',
-  'location' => 'modules/fieldgroup/fieldgroup.panels.inc:128',
+  'lid' => '1587',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '"@s" fieldgroup @name',
-  'version' => 'none',
+  'source' => 'Russian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '311',
-  'location' => 'modules/fieldgroup/fieldgroup.module:124',
+  'lid' => '1588',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Form settings',
-  'version' => 'none',
+  'source' => 'Kinyarwanda',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '312',
-  'location' => 'modules/fieldgroup/fieldgroup.module:125',
+  'lid' => '1589',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'These settings apply to the group in the node editing form.',
-  'version' => 'none',
+  'source' => 'Sanskrit',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '313',
-  'location' => 'modules/fieldgroup/fieldgroup.module:129',
+  'lid' => '1590',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Style',
-  'version' => 'none',
+  'source' => 'Sardinian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '314',
-  'location' => 'modules/fieldgroup/fieldgroup.module:132',
+  'lid' => '1591',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'always open',
-  'version' => 'none',
+  'source' => 'Sindhi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '315',
-  'location' => 'modules/fieldgroup/fieldgroup.module:133',
+  'lid' => '1592',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'collapsible',
-  'version' => 'none',
+  'source' => 'Northern Sami',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '316',
-  'location' => 'modules/fieldgroup/fieldgroup.module:134',
+  'lid' => '1593',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'collapsed',
-  'version' => 'none',
+  'source' => 'Sango',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '317',
-  'location' => 'modules/fieldgroup/fieldgroup.module:142',
+  'lid' => '1594',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Instructions to present to the user on the editing form.',
-  'version' => 'none',
+  'source' => 'Serbo-Croatian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '318',
-  'location' => 'modules/fieldgroup/fieldgroup.module:147',
+  'lid' => '1595',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Display settings',
-  'version' => 'none',
+  'source' => 'Sinhala',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '319',
-  'location' => 'modules/fieldgroup/fieldgroup.module:148',
+  'lid' => '1596',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'These settings apply to the group on node display.',
-  'version' => 'none',
+  'source' => 'Slovak',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '320',
-  'location' => 'modules/fieldgroup/fieldgroup.module:155',
+  'lid' => '1597',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'A description of the group.',
-  'version' => 'none',
+  'source' => 'Slovenian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '321',
-  'location' => 'modules/fieldgroup/fieldgroup.module:200',
+  'lid' => '1598',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Are you sure you want to remove the group %label?',
-  'version' => 'none',
+  'source' => 'Samoan',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '322',
-  'location' => 'modules/fieldgroup/fieldgroup.module:202',
+  'lid' => '1599',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'This action cannot be undone.',
-  'version' => 'none',
+  'source' => 'Shona',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '323',
-  'location' => 'modules/fieldgroup/fieldgroup.module:211',
+  'lid' => '1600',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The group %group_name has been removed.',
-  'version' => 'none',
+  'source' => 'Somali',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '324',
-  'location' => 'modules/fieldgroup/fieldgroup.module:293,  modules/nodereference/nodereference.module:544,  modules/userreference/userreference.module:439',
+  'lid' => '1601',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'none',
-  'version' => 'none',
+  'source' => 'Albanian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '325',
-  'location' => 'modules/fieldgroup/fieldgroup.module:353',
+  'lid' => '1602',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'You need to provide a label.',
-  'version' => 'none',
+  'source' => 'Serbian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '326',
-  'location' => 'modules/fieldgroup/fieldgroup.module:358',
+  'lid' => '1603',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'You need to provide a group name.',
-  'version' => 'none',
+  'source' => 'Siswati',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '327',
-  'location' => 'modules/fieldgroup/fieldgroup.module:372',
+  'lid' => '1604',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The group name %group_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
-  'version' => 'none',
+  'source' => 'Sesotho',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '328',
-  'location' => 'modules/fieldgroup/fieldgroup.module:375',
+  'lid' => '1605',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => "The group name %group_name is too long. The name is limited to 32 characters, including the 'group_' prefix.",
-  'version' => 'none',
+  'source' => 'Sudanese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '329',
-  'location' => 'modules/fieldgroup/fieldgroup.module:381',
+  'lid' => '1606',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The group name %group_name already exists.',
-  'version' => 'none',
+  'source' => 'Swedish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '330',
-  'location' => 'modules/fieldgroup/fieldgroup.module:400;403',
+  'lid' => '1607',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Add new group:',
-  'version' => 'none',
+  'source' => 'Swahili',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '331',
-  'location' => 'modules/fieldgroup/fieldgroup.module:418',
+  'lid' => '1608',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Add new group: you need to provide a label.',
-  'version' => 'none',
+  'source' => 'Tamil',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '332',
-  'location' => 'modules/fieldgroup/fieldgroup.module:419',
+  'lid' => '1609',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Add new group: you need to provide a group name.',
-  'version' => 'none',
+  'source' => 'Telugu',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '333',
-  'location' => 'modules/fieldgroup/fieldgroup.module:648',
+  'lid' => '1610',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Standard group',
-  'version' => 'none',
+  'source' => 'Tajik',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '334',
-  'location' => 'modules/fieldgroup/fieldgroup.module:39;46',
+  'lid' => '1611',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Edit group',
-  'version' => 'none',
+  'source' => 'Thai',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '335',
-  'location' => 'modules/fieldgroup/fieldgroup.module:0',
+  'lid' => '1612',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'fieldgroup',
-  'version' => 'none',
+  'source' => 'Tigrinya',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '336',
-  'location' => 'modules/fieldgroup/fieldgroup.info:0',
+  'lid' => '1613',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Create display groups for CCK fields.',
-  'version' => 'none',
+  'source' => 'Turkmen',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '337',
-  'location' => 'modules/nodereference/nodereference.rules.inc:15',
+  'lid' => '1614',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Load a referenced node',
-  'version' => 'none',
+  'source' => 'Tagalog',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '338',
-  'location' => 'modules/nodereference/nodereference.rules.inc:19',
+  'lid' => '1615',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content containing the node reference field',
-  'version' => 'none',
+  'source' => 'Setswana',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '339',
-  'location' => 'modules/nodereference/nodereference.rules.inc:25',
+  'lid' => '1616',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Referenced content',
-  'version' => 'none',
+  'source' => 'Tonga',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '340',
-  'location' => 'modules/nodereference/nodereference.rules.inc:29',
+  'lid' => '1617',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Note that if the field has multiple values, only the first content node will be loaded.',
-  'version' => 'none',
+  'source' => 'Turkish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '341',
-  'location' => 'modules/nodereference/nodereference.rules.inc:50',
+  'lid' => '1618',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'There are no nodereference fields defined.',
-  'version' => 'none',
+  'source' => 'Tsonga',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '342',
-  'location' => 'modules/nodereference/nodereference.module:60',
+  'lid' => '1619',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Node reference',
-  'version' => 'none',
+  'source' => 'Tatar',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '343',
-  'location' => 'modules/nodereference/nodereference.module:61',
+  'lid' => '1620',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Store the ID of a related node as an integer value.',
-  'version' => 'none',
+  'source' => 'Twi',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '344',
-  'location' => 'modules/nodereference/nodereference.module:75',
+  'lid' => '1621',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Content types that can be referenced',
-  'version' => 'none',
+  'source' => 'Tahitian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '345',
-  'location' => 'modules/nodereference/nodereference.module:87,  modules/userreference/userreference.module:84',
+  'lid' => '1622',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Default Views',
-  'version' => 'none',
+  'source' => 'Uighur',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '346',
-  'location' => 'modules/nodereference/nodereference.module:90,  modules/userreference/userreference.module:87',
+  'lid' => '1623',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Existing Views',
-  'version' => 'none',
+  'source' => 'Select text groups',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '347',
-  'location' => 'modules/nodereference/nodereference.module:97',
+  'lid' => '1624',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Advanced - Nodes that can be referenced (View)',
-  'version' => 'none',
+  'source' => 'Ukrainian',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '348',
-  'location' => 'modules/nodereference/nodereference.module:104',
+  'lid' => '1625',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'View used to select the nodes',
-  'version' => 'none',
+  'source' => 'If a text group is no showing up here it means this feature is not implemented for it.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '349',
-  'location' => 'modules/nodereference/nodereference.module:107',
+  'lid' => '1626',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>',
-  'version' => 'none',
+  'source' => 'Urdu',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '350',
-  'location' => 'modules/nodereference/nodereference.module:108;121',
+  'lid' => '1627',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => "<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the \"Content types\" settings above. Use the view's \"filters\" section instead.</li><li>Use the view's \"fields\" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view's \"sort criteria\" section to determine the order in which candidate nodes will be displayed.</li></ul>",
-  'version' => 'none',
+  'source' => 'Refresh strings',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '351',
-  'location' => 'modules/nodereference/nodereference.module:112,  modules/userreference/userreference.module:109',
+  'lid' => '1628',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'View arguments',
-  'version' => 'none',
+  'source' => 'Uzbek',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '352',
-  'location' => 'modules/nodereference/nodereference.module:115,  modules/userreference/userreference.module:112',
+  'lid' => '1629',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Provide a comma separated list of arguments to pass to the view.',
-  'version' => 'none',
+  'source' => 'This will create all the missing strings for the selected text groups.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '353',
-  'location' => 'modules/nodereference/nodereference.module:120',
+  'lid' => '1630',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '<p>The list of nodes that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>',
-  'version' => 'none',
+  'source' => 'Venda',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '354',
-  'location' => 'modules/nodereference/nodereference.module:205,  modules/userreference/userreference.module:184',
+  'lid' => '1631',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => '%name: invalid input.',
-  'version' => 'none',
+  'source' => 'Select languages',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '355',
-  'location' => 'modules/nodereference/nodereference.module:217',
+  'lid' => '1632',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => "%name: this post can't be referenced.",
-  'version' => 'none',
+  'source' => 'Vietnamese',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '356',
-  'location' => 'modules/nodereference/nodereference.module:242',
+  'lid' => '1633',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Title (link)',
-  'version' => 'none',
+  'source' => 'Update translations',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '357',
-  'location' => 'modules/nodereference/nodereference.module:247',
+  'lid' => '1634',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Title (no link)',
-  'version' => 'none',
+  'source' => 'Wolof',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '358',
-  'location' => 'modules/nodereference/nodereference.module:303,  modules/optionwidgets/optionwidgets.module:62,  modules/userreference/userreference.module:198',
+  'lid' => '1635',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Select list',
-  'version' => 'none',
+  'source' => 'This will fetch all existing translations from the localization tables for the selected text groups and languages.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '359',
-  'location' => 'modules/optionwidgets/optionwidgets.module:70',
+  'lid' => '1636',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Check boxes/radio buttons',
-  'version' => 'none',
+  'source' => 'Xhosa',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '360',
-  'location' => 'modules/nodereference/nodereference.module:311,  modules/userreference/userreference.module:206',
+  'lid' => '1637',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Autocomplete text field',
-  'version' => 'none',
+  'source' => 'Yiddish',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '361',
-  'location' => 'modules/nodereference/nodereference.module:417,  modules/userreference/userreference.module:343',
+  'lid' => '1638',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Autocomplete matching',
-  'version' => 'none',
+  'source' => 'Yoruba',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '362',
-  'location' => 'modules/nodereference/nodereference.module:420,  modules/userreference/userreference.module:346',
+  'lid' => '1639',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Starts with',
-  'version' => 'none',
+  'source' => 'On this page you can refresh and update values for user defined strings.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '363',
-  'location' => 'modules/nodereference/nodereference.module:421,  modules/userreference/userreference.module:347',
+  'lid' => '1640',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Contains',
-  'version' => 'none',
+  'source' => 'Zhuang',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '364',
-  'location' => 'modules/nodereference/nodereference.module:423',
+  'lid' => '1641',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.',
-  'version' => 'none',
+  'source' => 'Use the refresh option when you are missing strings to translate for a given text group. All the strings will be re-created keeping existing translations.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '365',
-  'location' => 'modules/nodereference/nodereference.module:671',
+  'lid' => '1642',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => '%name: title mismatch. Please check your selection.',
-  'version' => 'none',
+  'source' => 'Chinese, Simplified',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '366',
-  'location' => 'modules/nodereference/nodereference.module:678',
+  'lid' => '1643',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => '%name: found no valid post with that title.',
-  'version' => 'none',
+  'source' => 'Use the update option when some of the strings had been previously translated with the localization system, but the translations are not showing up for the configurable strings.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '367',
-  'location' => 'modules/nodereference/nodereference.module:15',
+  'lid' => '1644',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Nodereference autocomplete',
-  'version' => 'none',
+  'source' => 'Chinese, Traditional',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '368',
-  'location' => 'modules/nodereference/nodereference.module:0',
+  'lid' => '1645',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'nodereference',
-  'version' => 'none',
+  'source' => 'To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '369',
-  'location' => 'modules/nodereference/nodereference.info:0',
+  'lid' => '1646',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Node Reference',
-  'version' => 'none',
+  'source' => 'Import translation',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '370',
-  'location' => 'modules/nodereference/nodereference.info:0',
+  'lid' => '1647',
+  'location' => '/?q=zu/admin/build/translate/refresh',
   'textgroup' => 'default',
-  'source' => 'Defines a field type for referencing one node from another.',
-  'version' => 'none',
+  'source' => '<strong>Important:</strong> To configure which Input formats are safe for translation, visit the <a href="@configure-strings">configure strings</a> page before refreshing your strings.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '371',
-  'location' => 'modules/number/number.module:41',
+  'lid' => '1648',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Integer',
-  'version' => 'none',
+  'source' => 'Language file',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '372',
-  'location' => 'modules/number/number.module:42',
+  'lid' => '1649',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Store a number in the database as an integer.',
-  'version' => 'none',
+  'source' => 'A Gettext Portable Object (<em>.po</em>) file.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '373',
-  'location' => 'modules/number/number.module:49',
+  'lid' => '1650',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Decimal',
-  'version' => 'none',
+  'source' => 'Import into',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '374',
-  'location' => 'modules/number/number.module:50',
+  'lid' => '1651',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Store a number in the database in a fixed decimal format.',
-  'version' => 'none',
+  'source' => 'Choose the language you want to add strings into. If you choose a language which is not yet set up, it will be added.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '375',
-  'location' => 'modules/number/number.module:57',
+  'lid' => '1652',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Float',
-  'version' => 'none',
+  'source' => 'Text group',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '376',
-  'location' => 'modules/number/number.module:58',
+  'lid' => '1653',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Store a number in the database in a floating point format.',
-  'version' => 'none',
+  'source' => 'Imported translations will be added to this text group.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '377',
-  'location' => 'modules/number/number.module:76',
+  'lid' => '1654',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Minimum',
-  'version' => 'none',
+  'source' => 'Mode',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '378',
-  'location' => 'modules/number/number.module:81',
+  'lid' => '1655',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Maximum',
-  'version' => 'none',
+  'source' => 'Strings in the uploaded file replace existing ones, new ones are added',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '379',
-  'location' => 'modules/number/number.module:88',
+  'lid' => '1656',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Precision',
-  'version' => 'none',
+  'source' => 'Existing strings are kept, only new strings are added',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '380',
-  'location' => 'modules/number/number.module:89',
+  'lid' => '1657',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'The total number of digits to store in the database, including those to the right of the decimal.',
-  'version' => 'none',
+  'source' => 'This page imports the translated strings contained in an individual Gettext Portable Object (<em>.po</em>) file. Normally distributed as part of a translation package (each translation package may contain several <em>.po</em> files), a <em>.po</em> file may need to be imported after off-line editing in a Gettext translation editor. Importing an individual <em>.po</em> file may be a lengthy process.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '381',
-  'location' => 'modules/number/number.module:95',
+  'lid' => '1658',
+  'location' => '/?q=zu/admin/build/translate/import',
   'textgroup' => 'default',
-  'source' => 'Scale',
-  'version' => 'none',
+  'source' => 'Note that the <em>.po</em> files within a translation package are imported automatically (if available) when new modules or themes are enabled, or as new languages are added. Since this page only allows the import of one <em>.po</em> file at a time, it may be simpler to download and extract a translation package into your Drupal installation directory and <a href="@language-add">add the language</a> (which automatically imports all <em>.po</em> files within the package). Translation packages are available for download on the <a href="@translations">Drupal translation page</a>.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '382',
-  'location' => 'modules/number/number.module:96',
+  'lid' => '1659',
+  'location' => '/?q=zu/admin/settings/language/i18n/variables',
   'textgroup' => 'default',
-  'source' => 'The number of digits to the right of the decimal.',
-  'version' => 'none',
+  'source' => 'Variable name',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '383',
-  'location' => 'modules/number/number.module:102',
+  'lid' => '1660',
+  'location' => '/?q=zu/admin/settings/language/i18n/variables',
   'textgroup' => 'default',
-  'source' => 'Decimal marker',
-  'version' => 'none',
+  'source' => 'Is multilingual',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '384',
-  'location' => 'modules/number/number.module:103',
+  'lid' => '1661',
+  'location' => '/?q=zu/admin/settings/language/i18n/variables',
   'textgroup' => 'default',
-  'source' => 'The character users will input to mark the decimal point in forms.',
-  'version' => 'none',
+  'source' => 'Has translations',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '385',
-  'location' => 'modules/number/number.module:109',
+  'lid' => '1662',
+  'location' => '/?q=zu/admin/settings/language/i18n/variables',
   'textgroup' => 'default',
-  'source' => 'Prefix',
-  'version' => 'none',
+  'source' => 'Delete all existing translations for variables.',
+  'version' => '6.38-dev',
 ))
 ->values(array(
-  'lid' => '386',
-  'location' => 'modules/number/number.module:112',
+  'lid' => '1663',
+  'location' => '/?q=zu/admin/settings/language/i18n/variables',
   'textgroup' => 'default',
-  'source' => 'Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).',
-  'version' => 'none',
+  'source' => 'Delete all translations',
+  'version' => '6.38-dev',
+))
+->execute();
+
+$connection->schema()->createTable('locales_target', array(
+  'fields' => array(
+    'lid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'translation' => array(
+      'type' => 'blob',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
+    'plid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'plural' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'i18n_status' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+  ),
+  'primary key' => array(
+    'language',
+    'lid',
+    'plural',
+  ),
+  'indexes' => array(
+    'lid' => array(
+      'lid',
+    ),
+    'plid' => array(
+      'plid',
+    ),
+    'plural' => array(
+      'plural',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('locales_target')
+->fields(array(
+  'lid',
+  'translation',
+  'language',
+  'plid',
+  'plural',
+  'i18n_status',
 ))
 ->values(array(
-  'lid' => '387',
-  'location' => 'modules/number/number.module:116',
-  'textgroup' => 'default',
-  'source' => 'Suffix',
-  'version' => 'none',
+  'lid' => '5',
+  'translation' => "Le module Content, composant obligatoire du kit CCK (Content Construction Kit) permet aux administrateurs d'associer des champs personnalisés à des types de contenus. Au sein de Drupal, les types de contenus servent à définir les caractéristiques d'une publication, y compris le titre et la description des champs affichés sur ses pages \"ajouter\" et \"éditer\". Le module Content (et les modules auxiliaires inclus dans CCK) permet d'ajouter des champs personnalisés en plus des champs par défaut \"Titre\" et \"Corps\". Les fonctionnalités de CCK sont accessible via différents onglets sur la <a href=\"@content-types\">page d'administration des types de contenus</a>. (Voir la <a href=\"@node-help\">page d'aide du module Node</a> pour plus d'informations sur les types de contenus).",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '6',
+  'translation' => "Lorsque vous ajoutez un champ personnalisé à un type de contenu, vous déterminez son type (c'est-à-dire s'il doit contenir du texte, des nombres ou des références à d'autres objets) et la façon dont il doit être affiché (en tant que champ ou zone de texte, liste de sélection, case à cocher, bouton radio, ou champ à auto-complètement). Un champ peut présenter plusieurs valeurs (par exemple, une \"personne\" peut disposer de plusieurs adresses courriel) ou une seule (par exemple, un \"employé\" possède un numéro d'identification unique). À mesure que vous ajoutez et modifiez des champs, CCK ajuste automatiquement la structure de la base de données en fonction. CCK propose également un certain nombre d'autres fonctionnalités, par exemple un cache intelligent pour vos données personnalisées, des fonctionnalités d'import et d'export pour les définitions de types de contenus, ainsi qu'une intégration à d'autres modules provenant des contributions.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '7',
+  'translation' => "Des types de champs personnalisés sont proposés par plusieurs modules optionnels inclus dans CCK (chaque module fournissant un type différent). La <a href=\"@modules\">page des modules</a> vous permet d'activer ou de désactiver des composants CCK. Une installation par défaut de CCK inclut :",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '8',
+  'translation' => "<em>Number</em>, qui ajoute des types de champs numériques (formats entier, décimal ou réel à virgule flottante). Vous pouvez définir un jeu ou un intervalle de valeurs autorisées. Divers formats sont disponibles pour l'affichage des données numériques.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '9',
+  'translation' => "<em>Text</em>, qui ajoute des types de champs de texte. Un champ texte peut contenir du texte brut uniquement ou, optionnellement, utiliser les filtres des formats d'entrée que propose Drupal pour gérer en toute sécurité des textes enrichis. Les champs de saisie de texte peuvent être constitués d'une seule ligne (champ texte), de plusieurs lignes (zone de texte) ou, pour un meilleur contrôle des valeurs saisies, une liste de sélection, des cases à cocher ou des boutons radio. Si besoin, CCK peut valider les saisies sur la base d'un ensemble de valeurs autorisées.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '10',
+  'translation' => '<em>Node Reference</em>, qui crée des références personnalisées entre nœuds de Drupal. En ajoutant, par exemple, un champ <em>nodereference</em> et deux types de contenus différents, vous pouvez facilement créer des relations complexes de type parent/enfant entre données (par exemple plusieurs nœuds "employé" peuvent présenter un champ <em>nodereference</em> pointant vers un même nœud "employeur").',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '11',
+  'translation' => "<em>User reference</em>, qui crée des références personnalisées vers les comptes des utilisateurs de votre site. En ajoutant un champ <em>userreference</em>, vous pouvez créer des relations complexes entre les utilisateurs de votre site et des publications. Ainsi, pour tracer l'implication d'un utilisateur dans une publication (au delà du champ Drupal standard <em>Écrit par</em>), vous pouvez ajouter à un type de contenu un champ <em>userreference</em> intitulé \"Édité par\" pour enregistrer un lien vers la page du compte utilisateur ayant édité la publication.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '12',
+  'translation' => "<em>Fieldgroup</em>, qui crée des groupes de champs liés. Les groupe de champ peuvent être repliés, et vous pouvez choisir qu'ils soient dépliés ou repliés par défaut. L'ordre des groupes de champs, ainsi que l'ordre des champs au sein d'un groupe, est géré grâce à l'interface par glisser-déposer fournie par le module Content.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '13',
+  'translation' => "Pour plus d'informations, reportez-vous à l'entrée de manuel en ligne relative à <a href=\"@handbook-cck\">CCK</a> ou à la <a href=\"@project-cck\">page du projet CCK</a>.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '14',
+  'translation' => 'Configurez ici la manière dont les champs et étiquettes de champs de ce type de contenu doivent être affichées, lorsque le contenu est vu en mode résumé ou en pleine page.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '15',
+  'translation' => "Configurez ici la façon dont les champs de ce type de contenu doivent être affichés lorsqu'il est rendu dans les contextes suivants.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '16',
+  'translation' => "Contrôlez ici l'ordre des champs dans le formulaire de saisie.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '17',
+  'translation' => 'Ce champ est obligatoire.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '18',
+  'translation' => '!title : !required',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '19',
+  'translation' => 'Ordre',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '20',
+  'translation' => 'Élément de flux RSS',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '21',
+  'translation' => 'Index de recherche',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '388',
-  'location' => 'modules/number/number.module:119',
-  'textgroup' => 'default',
-  'source' => 'Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).',
-  'version' => 'none',
+  'lid' => '22',
+  'translation' => 'Résultat de recherche',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '389',
-  'location' => 'modules/number/number.module:123 modules/text/text.module:82',
-  'textgroup' => 'default',
-  'source' => 'Allowed values',
-  'version' => 'none',
+  'lid' => '23',
+  'translation' => 'Langue',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '390',
-  'location' => 'examples/example_field.php:174 modules/number/number.module:129,  modules/text/text.module:88',
-  'textgroup' => 'default',
-  'source' => 'Allowed values list',
-  'version' => 'none',
+  'lid' => '24',
+  'translation' => 'Taxonomie',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '391',
-  'location' => 'modules/number/number.module:116,  modules/text/text.module:81',
-  'textgroup' => 'default',
-  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags',
-  'version' => 'none',
+  'lid' => '25',
+  'translation' => 'Fichiers attachés',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '392',
-  'location' => 'examples/example_field.php:191 modules/number/number.module:147,  modules/text/text.module:106',
-  'textgroup' => 'default',
-  'source' => 'Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.',
-  'version' => 'none',
+  'lid' => '26',
+  'translation' => 'Mise à jour du type de champ %type avec le module %module.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '393',
-  'location' => 'modules/number/number.module:155 modules/text/text.module:114',
-  'textgroup' => 'default',
-  'source' => 'This PHP code was set by an administrator and will override the allowed values list above.',
-  'version' => 'none',
+  'lid' => '27',
+  'translation' => 'Mise à jour du type de widget %widget avec le module %module.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '394',
-  'location' => 'modules/number/number.module:178,  modules/text/text.module:132',
-  'textgroup' => 'default',
-  'source' => '@label (!name) - Allowed values',
-  'version' => 'none',
+  'lid' => '28',
+  'translation' => "Utiliser du code PHP pour le paramétrage des champs (dangereux - à n'autoriser qu'avec précautions)",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '395',
-  'location' => 'modules/number/number.module:162',
-  'textgroup' => 'default',
-  'source' => '"Minimum" must be a number.',
-  'version' => 'none',
+  'lid' => '29',
+  'translation' => 'Gérer les champs',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '396',
-  'location' => 'modules/number/number.module:165',
-  'textgroup' => 'default',
-  'source' => '"Maximum" must be a number.',
-  'version' => 'none',
+  'lid' => '30',
+  'translation' => 'Afficher les champs',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '397',
-  'location' => 'modules/number/number.module:219',
-  'textgroup' => 'default',
-  'source' => '%name: the value may be no smaller than %min.',
-  'version' => 'none',
+  'lid' => '31',
+  'translation' => 'Général',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '398',
-  'location' => 'modules/number/number.module:222',
-  'textgroup' => 'default',
-  'source' => '%name: the value may be no larger than %max.',
-  'version' => 'none',
+  'lid' => '32',
+  'translation' => 'Avancé',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '399',
-  'location' => 'modules/number/number.module:235,  modules/text/text.module:156',
-  'textgroup' => 'default',
-  'source' => '%name: illegal value.',
-  'version' => 'none',
+  'lid' => '33',
+  'translation' => 'Supprimer un champ',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '400',
-  'location' => 'modules/number/number.module:263',
-  'textgroup' => 'default',
-  'source' => 'unformatted',
-  'version' => 'none',
+  'lid' => '34',
+  'translation' => 'Content',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '401',
-  'location' => 'examples/example_field.php:476 examples/simple_field.php:400,  modules/number/number.module:342 modules/text/text.module:264',
-  'textgroup' => 'default',
-  'source' => 'Text field',
-  'version' => 'none',
+  'lid' => '35',
+  'translation' => 'Permet aux administrateurs de définir des nouveaux types de contenu.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '402',
-  'location' => 'modules/number/number.module:512',
-  'textgroup' => 'default',
-  'source' => 'Only numbers and decimals are allowed in %field.',
-  'version' => 'none',
+  'lid' => '36',
+  'translation' => 'CCK',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '403',
-  'location' => 'modules/number/number.module:535',
-  'textgroup' => 'default',
-  'source' => 'Only numbers are allowed in %field.',
-  'version' => 'none',
+  'lid' => '37',
+  'translation' => 'Texte',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '404',
-  'location' => 'modules/number/number.module:559',
-  'textgroup' => 'default',
-  'source' => 'Only numbers and the decimal character (%decimal) are allowed in %field.',
-  'version' => 'none',
+  'lid' => '38',
+  'translation' => "Les valeurs possibles pour ce champ. Saisissez une valeur par ligne, sous la forme <em>clé|libellé</em>. La clé est la valeur enregistrée dans la base de données, et elle doit correspondre au type de stockage du champ, %type. Le libellé est optionnel et, s'il n'est pas spécifié, la clé sera utilisée comme libellé.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '405',
-  'location' => 'modules/number/number.module:0',
-  'textgroup' => 'default',
-  'source' => 'number',
-  'version' => 'none',
+  'lid' => '39',
+  'translation' => 'Zone de texte',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '406',
-  'location' => 'modules/number/number.info:0',
-  'textgroup' => 'default',
-  'source' => 'Number',
-  'version' => 'none',
+  'lid' => '40',
+  'translation' => 'Ôter',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '407',
-  'location' => 'modules/number/number.info:0',
-  'textgroup' => 'default',
-  'source' => 'Defines numeric field types.',
-  'version' => 'none',
+  'lid' => '41',
+  'translation' => 'Basique',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '408',
-  'location' => 'modules/optionwidgets/optionwidgets.module:19',
-  'textgroup' => 'default',
-  'source' => 'Create a list of options as a list in <strong>Allowed values list</strong> or as an array in PHP code. These values will be the same for %field in all content types.',
-  'version' => 'none',
+  'lid' => '42',
+  'translation' => 'Résumé',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '409',
-  'location' => 'modules/optionwidgets/optionwidgets.module:12',
-  'textgroup' => 'default',
-  'source' => "For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.",
-  'version' => 'none',
+  'lid' => '43',
+  'translation' => 'Nœud complet',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '410',
-  'location' => 'modules/optionwidgets/optionwidgets.module:15',
-  'textgroup' => 'default',
-  'source' => "The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.",
-  'version' => 'none',
+  'lid' => '44',
+  'translation' => 'RSS',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '411',
-  'location' => 'modules/optionwidgets/optionwidgets.module:37',
-  'textgroup' => 'default',
-  'source' => "You need to specify the 'allowed values' for this field.",
-  'version' => 'none',
+  'lid' => '45',
+  'translation' => 'Recherche',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '412',
-  'location' => 'modules/optionwidgets/optionwidgets.module:78',
-  'textgroup' => 'default',
-  'source' => 'Single on/off checkbox',
-  'version' => 'none',
+  'lid' => '46',
+  'translation' => 'Formulaire du module node.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '413',
-  'location' => 'modules/optionwidgets/optionwidgets.module:331',
-  'textgroup' => 'default',
-  'source' => '%name: this field cannot hold more that @count values.',
-  'version' => 'none',
+  'lid' => '47',
+  'translation' => 'Formulaire du module locale.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '414',
-  'location' => 'modules/optionwidgets/optionwidgets.module:364',
-  'textgroup' => 'default',
-  'source' => 'N/A',
-  'version' => 'none',
+  'lid' => '48',
+  'translation' => 'Paramètres du menu',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '415',
-  'location' => 'modules/optionwidgets/optionwidgets.module:420',
-  'textgroup' => 'default',
-  'source' => '- None -',
-  'version' => 'none',
+  'lid' => '49',
+  'translation' => 'Formulaire du module menu.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '416',
-  'location' => 'modules/optionwidgets/optionwidgets.module:0',
-  'textgroup' => 'default',
-  'source' => 'optionwidgets',
-  'version' => 'none',
+  'lid' => '50',
+  'translation' => 'Formulaire du module taxonomy.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '417',
-  'location' => 'modules/optionwidgets/optionwidgets.info:0',
-  'textgroup' => 'default',
-  'source' => 'Option Widgets',
-  'version' => 'none',
+  'lid' => '51',
+  'translation' => 'Livre',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '418',
-  'location' => 'modules/optionwidgets/optionwidgets.info:0',
-  'textgroup' => 'default',
-  'source' => 'Defines selection, check box and radio button widgets for text and numeric fields.',
-  'version' => 'none',
+  'lid' => '52',
+  'translation' => 'Formulaire du module livre (book).',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '419',
-  'location' => 'modules/text/text.module:50',
-  'textgroup' => 'default',
-  'source' => 'Store text in the database.',
-  'version' => 'none',
+  'lid' => '53',
+  'translation' => 'Titre du sondage',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '420',
-  'location' => 'examples/example_field.php:158;388 examples/simple_field.php:332,  modules/text/text.module:66;209,  modules/userreference/userreference.module:151',
-  'textgroup' => 'default',
-  'source' => 'Plain text',
-  'version' => 'none',
+  'lid' => '54',
+  'translation' => 'Titre du module sondage (Poll)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '421',
-  'location' => 'examples/example_field.php:158 modules/text/text.module:66',
-  'textgroup' => 'default',
-  'source' => 'Filtered text (user selects input format)',
-  'version' => 'none',
+  'lid' => '55',
+  'translation' => 'Choix du sondage',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '422',
-  'location' => 'examples/example_field.php:161 modules/text/text.module:69',
-  'textgroup' => 'default',
-  'source' => 'Text processing',
-  'version' => 'none',
+  'lid' => '56',
+  'translation' => 'Choix du module sondage (poll).',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '423',
-  'location' => 'examples/example_field.php:167 examples/simple_field.php:164,  modules/text/text.module:75',
-  'textgroup' => 'default',
-  'source' => 'Maximum length',
-  'version' => 'none',
+  'lid' => '57',
+  'translation' => 'Paramètrage du sondage',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '424',
-  'location' => 'examples/example_field.php:170 examples/simple_field.php:167,  modules/text/text.module:78',
-  'textgroup' => 'default',
-  'source' => 'The maximum length of the field in characters. Leave blank for an unlimited size.',
-  'version' => 'none',
+  'lid' => '58',
+  'translation' => 'Paramètres du module sondage (poll).',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '425',
-  'location' => 'modules/text/text.module:159',
-  'textgroup' => 'default',
-  'source' => '%name: the value may not be longer than %max characters.',
-  'version' => 'none',
+  'lid' => '59',
+  'translation' => 'Formulaire du module upload.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '426',
-  'location' => 'examples/example_field.php:383 examples/simple_field.php:327,  modules/text/text.module:204 modules/userreference/userreference.module:146',
-  'textgroup' => 'default',
-  'source' => 'Default',
-  'version' => 'none',
+  'lid' => '60',
+  'translation' => 'contenu',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '427',
-  'location' => 'examples/example_field.php:393 modules/text/text.module:214',
-  'textgroup' => 'default',
-  'source' => 'Trimmed',
-  'version' => 'none',
+  'lid' => '61',
+  'translation' => 'Champs',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '428',
-  'location' => 'modules/text/text.module:272',
-  'textgroup' => 'default',
-  'source' => 'Text area (multiple rows)',
-  'version' => 'none',
+  'lid' => '62',
+  'translation' => "Les mises à jour des modules liés à CCK ne sont pas exécutées tant que les modules ne sont pas activés sur la  <a href=\"@admin-modules-path\">page d'administration des modules</a>. Lorsque vous les activerez, vous devrez retourner sur la page <a href=\"@update-php\">update.php</a> et exécuter les mises à jour restantes.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '429',
-  'location' => 'modules/text/text.module:316',
-  'textgroup' => 'default',
-  'source' => 'Size of textfield',
-  'version' => 'none',
+  'lid' => '63',
+  'translation' => "!module.module possède des mises à jour mais ne peut pas être mis à jour car content.module n'est pas activé.<br /> Le cas échéant, lors de l'activation de content.module, vous devrez exécuter à nouveau le script de mise à jour. Vous continuerez à voir ce message jusqu'à ce que le module soit activé et les mises à jour exécutées.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '430',
-  'location' => 'examples/example_field.php:551 examples/simple_field.php:430,  modules/text/text.module:324',
-  'textgroup' => 'default',
-  'source' => 'Rows',
-  'version' => 'none',
+  'lid' => '64',
+  'translation' => "!module.module possède des mises à jour et est disponible dans le répertoire des modules, mais n'est pas activé.<br /> Le cas échéant, lorsque vous l'aurez activé, vous devrez ré-exécuter le script de mise à jour. Vous continuerez à voir ce message jusqu'à l'activation du module et l'exécution des mises à jour. ",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '431',
-  'location' => 'modules/text/text.module:0',
-  'textgroup' => 'default',
-  'source' => 'text',
-  'version' => 'none',
+  'lid' => '65',
+  'translation' => 'Des mises à jour sont toujours en attente. Veuillez retourner sur <a href="@update-php">update.php</a> et exécuter les mises à jour restarntes.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '432',
-  'location' => 'modules/text/text.info:0',
-  'textgroup' => 'default',
-  'source' => 'Defines simple text field types.',
-  'version' => 'none',
+  'lid' => '66',
+  'translation' => 'CCK - Aucune Intégration aux Vues',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '433',
-  'location' => 'modules/userreference/userreference.rules.inc:15',
-  'textgroup' => 'default',
-  'source' => 'Load a referenced user',
-  'version' => 'none',
+  'lid' => '67',
+  'translation' => 'L"intégration de CCK avec le module Views requiert Views 6.x-2.0-rc2 ou une version supérieure.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '434',
-  'location' => 'modules/userreference/userreference.rules.inc:19',
-  'textgroup' => 'default',
-  'source' => 'Content containing the user reference field',
-  'version' => 'none',
+  'lid' => '68',
+  'translation' => 'Nom',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '435',
-  'location' => 'modules/userreference/userreference.rules.inc:25',
-  'textgroup' => 'default',
-  'source' => 'Referenced user',
-  'version' => 'none',
+  'lid' => '69',
+  'translation' => 'Type',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '436',
-  'location' => 'modules/userreference/userreference.rules.inc:29',
-  'textgroup' => 'default',
-  'source' => 'Note that if the field has multiple values, only the first user will be loaded.',
-  'version' => 'none',
+  'lid' => '70',
+  'translation' => 'Description',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '437',
-  'location' => 'modules/userreference/userreference.rules.inc:52',
-  'textgroup' => 'default',
-  'source' => 'There are no userreference fields defined.',
-  'version' => 'none',
+  'lid' => '71',
+  'translation' => 'Opérations',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '438',
-  'location' => 'modules/userreference/userreference.module:52',
-  'textgroup' => 'default',
-  'source' => 'User reference',
-  'version' => 'none',
+  'lid' => '72',
+  'translation' => 'éditer',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '439',
-  'location' => 'modules/userreference/userreference.module:53',
-  'textgroup' => 'default',
-  'source' => 'Store the ID of a related user as an integer value.',
-  'version' => 'none',
+  'lid' => '73',
+  'translation' => 'gérer les champs',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '440',
-  'location' => 'modules/userreference/userreference.module:67',
-  'textgroup' => 'default',
-  'source' => 'User roles that can be referenced',
-  'version' => 'none',
+  'lid' => '74',
+  'translation' => 'supprimer',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '441',
-  'location' => 'modules/userreference/userreference.module:73',
-  'textgroup' => 'default',
-  'source' => 'User status that can be referenced',
-  'version' => 'none',
+  'lid' => '75',
+  'translation' => 'Aucun type de contenu disponible.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '442',
-  'location' => 'modules/userreference/userreference.module:75',
-  'textgroup' => 'default',
-  'source' => 'Active',
-  'version' => 'none',
+  'lid' => '76',
+  'translation' => '» Ajouter un nouveau type de contenu',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '443',
-  'location' => 'modules/userreference/userreference.module:75',
-  'textgroup' => 'default',
-  'source' => 'Blocked',
-  'version' => 'none',
+  'lid' => '77',
+  'translation' => 'Nom du champ',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '444',
-  'location' => 'modules/userreference/userreference.module:94',
-  'textgroup' => 'default',
-  'source' => 'Advanced - Users that can be referenced (View)',
-  'version' => 'none',
+  'lid' => '78',
+  'translation' => 'Type de champ',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '445',
-  'location' => 'modules/userreference/userreference.module:101',
-  'textgroup' => 'default',
-  'source' => 'View used to select the users',
-  'version' => 'none',
+  'lid' => '79',
+  'translation' => 'Utilisé dans',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '446',
-  'location' => 'modules/userreference/userreference.module:104',
-  'textgroup' => 'default',
-  'source' => '<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>',
-  'version' => 'none',
+  'lid' => '80',
+  'translation' => '@field_name (Verrouillé)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '447',
-  'location' => 'modules/userreference/userreference.module:105;118',
-  'textgroup' => 'default',
-  'source' => "<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the \"Referenceable Roles\" and \"Referenceable Status\" settings above. Use the view's \"filters\" section instead.</li><li>Use the view's \"fields\" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view's \"sort criteria\" section to determine the order in which candidate users will be displayed.</li></ul>",
-  'version' => 'none',
+  'lid' => '81',
+  'translation' => "Aucun champ n'est pour l'instant défini sur l'ensemble des types de contenu.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '448',
-  'location' => 'modules/userreference/userreference.module:117',
-  'textgroup' => 'default',
-  'source' => '<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>',
-  'version' => 'none',
+  'lid' => '82',
+  'translation' => "Ce type de contenu possède des champs inactifs. Les champs inactifs ne sont pas inclus dans la liste de champs disponibles, jusqu'à l'activation des modules correspondants.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '449',
-  'location' => 'modules/userreference/userreference.module:196',
-  'textgroup' => 'default',
-  'source' => '%name: invalid user.',
-  'version' => 'none',
+  'lid' => '83',
+  'translation' => '!field (!field_name) est un champ inactif de type !field_type, qui utilise un widget de type !widget_type.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '450',
-  'location' => 'modules/userreference/userreference.module:349',
-  'textgroup' => 'default',
-  'source' => 'Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.',
-  'version' => 'none',
+  'lid' => '84',
+  'translation' => 'Configurer',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '451',
-  'location' => 'modules/userreference/userreference.module:357',
-  'textgroup' => 'default',
-  'source' => 'Reverse link',
-  'version' => 'none',
+  'lid' => '85',
+  'translation' => 'Verrouillé',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '452',
-  'location' => 'modules/userreference/userreference.module:359',
-  'textgroup' => 'default',
-  'source' => 'If selected, a reverse link back to the referencing node will displayed on the referenced user record.',
-  'version' => 'none',
+  'lid' => '86',
+  'translation' => '- Sélectionnez un type de champ -',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '453',
-  'location' => 'modules/userreference/userreference.module:594',
-  'textgroup' => 'default',
-  'source' => '%name: found no valid user with that name.',
-  'version' => 'none',
+  'lid' => '87',
+  'translation' => '- Sélectionnez un widget -',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '454',
-  'location' => 'modules/userreference/userreference.module:887',
-  'textgroup' => 'default',
-  'source' => 'Related content',
-  'version' => 'none',
+  'lid' => '88',
+  'translation' => 'Étiquette',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '455',
-  'location' => 'modules/userreference/userreference.module:15',
-  'textgroup' => 'default',
-  'source' => 'Userreference autocomplete',
-  'version' => 'none',
+  'lid' => '89',
+  'translation' => 'Nom du champ (a-z, 0-9, _)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '456',
-  'location' => 'modules/userreference/userreference.module:0',
-  'textgroup' => 'default',
-  'source' => 'userreference',
-  'version' => 'none',
+  'lid' => '90',
+  'translation' => 'Type de données à stocker.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '457',
-  'location' => 'modules/userreference/userreference.info:0',
-  'textgroup' => 'default',
-  'source' => 'User Reference',
-  'version' => 'none',
+  'lid' => '91',
+  'translation' => "Elément du formulaire pour l'édition des données.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '458',
-  'location' => 'modules/userreference/userreference.info:0',
-  'textgroup' => 'default',
-  'source' => 'Defines a field type for referencing a user from a node.',
-  'version' => 'none',
+  'lid' => '92',
+  'translation' => '- Sélectionnez un champ existant -',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '459',
-  'location' => 'includes/content.admin.inc:212',
-  'textgroup' => 'default',
-  'source' => 'Weight',
-  'version' => 'none',
+  'lid' => '93',
+  'translation' => 'Champ à partager',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '460',
-  'location' => 'theme/content-admin-field-overview-form.tpl.php:53',
-  'textgroup' => 'default',
-  'source' => 'Add',
-  'version' => 'none',
+  'lid' => '94',
+  'translation' => 'Nom du groupe (a-z, 0-9, _)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '461',
-  'location' => 'theme/content-admin-field-overview-form.tpl.php:59',
-  'textgroup' => 'default',
-  'source' => 'New field',
-  'version' => 'none',
+  'lid' => '95',
+  'translation' => 'Enregistrer',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '462',
-  'location' => 'theme/content-admin-field-overview-form.tpl.php:72',
-  'textgroup' => 'default',
-  'source' => 'Existing field',
-  'version' => 'none',
+  'lid' => '96',
+  'translation' => 'Ajouter un nouveau champ : vous devez fournir une étiquette.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '463',
-  'location' => 'theme/content-admin-field-overview-form.tpl.php:84',
-  'textgroup' => 'default',
-  'source' => 'New group',
-  'version' => 'none',
+  'lid' => '97',
+  'translation' => 'Ajouter un nouveau champ : vous devez fournir un nom de champ.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '464',
-  'location' => 'theme/theme.inc:11',
-  'textgroup' => 'default',
-  'source' => 'Add fields and groups to the content type, and arrange them on content display and input forms.',
-  'version' => 'none',
+  'lid' => '98',
+  'translation' => "Ajouter un nouveau champ : le nom de champ %field_name n'est pas valide. Le nom doit seulement contenir des lettre minuscules non accentuées, des nombres, et des underscores. ",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '465',
-  'location' => 'theme/theme.inc:13',
-  'textgroup' => 'default',
-  'source' => 'You can add a field to a group by dragging it below and to the right of the group.',
-  'version' => 'none',
+  'lid' => '99',
+  'translation' => "Ajouter un nouveau champ : le nom de champ %field_name est trop long. Le nom est limité à 32 caractères, en comptant le préfixe 'field_'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '466',
-  'location' => 'theme/theme.inc:16',
-  'textgroup' => 'default',
-  'source' => 'Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.',
-  'version' => 'none',
+  'lid' => '100',
+  'translation' => "Ajouter un nouveau champ : le nom 'field_instance' est un nom réservé.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
-->values(array(
-  'lid' => '467',
-  'location' => 'theme/theme.inc:116',
-  'textgroup' => 'default',
-  'source' => "Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.",
-  'version' => 'none',
+->values(array(
+  'lid' => '101',
+  'translation' => 'Ajouter un nouveau champ : le nom du champ %field_name existe déjà.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '468',
-  'location' => 'theme/content-edit.js:0',
-  'textgroup' => 'default',
-  'source' => 'Remove this item',
-  'version' => 'none',
+  'lid' => '102',
+  'translation' => 'Ajouter un nouveau champ : vous devez sélectionner un type de champ.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '469',
-  'location' => 'content.module:156 includes/content.admin.inc:528',
-  'textgroup' => 'default',
-  'source' => 'Add field',
-  'version' => 'none',
+  'lid' => '103',
+  'translation' => 'Ajouter un nouveau champ : vous devez sélectionner un widget.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '470',
-  'location' => 'examples/example_field.php:278 modules/number/number.module:228,  modules/text/text.module:160',
-  'textgroup' => 'default',
-  'source' => 'Illegal value for %name.',
-  'version' => 'none',
+  'lid' => '104',
+  'translation' => 'Ajouter un nouveau champ : widget non valide.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '471',
-  'location' => 'examples/example_field.php:287 examples/simple_field.php:231,  modules/text/text.module:169',
-  'textgroup' => 'default',
-  'source' => '%label is longer than %max characters.',
-  'version' => 'none',
+  'lid' => '105',
+  'translation' => 'Ajouter un champ existant : vous devez fournir une étiquette.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '472',
-  'location' => 'examples/example_field.php:560 examples/simple_field.php:438,  modules/text/text.module:333',
-  'textgroup' => 'default',
-  'source' => '"Rows" must be a positive integer.',
-  'version' => 'none',
+  'lid' => '106',
+  'translation' => 'Ajouter un champ existant : vous devez sélectionner un champ.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '473',
-  'location' => 'modules/number/number.module:133 modules/text/text.module:92',
-  'textgroup' => 'default',
-  'source' => 'The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database and it must match the field storage type, %type. The label is optional and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags',
-  'version' => 'none',
+  'lid' => '107',
+  'translation' => 'Ajouter un champ existant: vous devez sélectionner un widget.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '474',
-  'location' => 'includes/content.admin.inc:33',
-  'textgroup' => 'default',
-  'source' => 'add field',
-  'version' => 'none',
+  'lid' => '108',
+  'translation' => 'Ajouter un champ existant : widget non valide.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '475',
-  'location' => 'includes/content.admin.inc:112;291',
-  'textgroup' => 'default',
-  'source' => 'There are no fields configured for this content type. You can !link.',
-  'version' => 'none',
+  'lid' => '109',
+  'translation' => "Un problème est survenu à la création du champ '%label'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '476',
-  'location' => 'includes/content.admin.inc:113;292',
-  'textgroup' => 'default',
-  'source' => 'Add a new field',
-  'version' => 'none',
+  'lid' => '110',
+  'translation' => "Le champ %label n'a pas pu être ajouté au type de contenu car il est verrouillé.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '477',
-  'location' => 'includes/content.admin.inc:137',
-  'textgroup' => 'default',
-  'source' => 'To change the order of a field, grab a drag-and-drop handle under the Label column and drag the field to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the Save button at the bottom of the page.',
-  'version' => 'none',
+  'lid' => '111',
+  'translation' => "Un problème est survenu lors de l'ajout du champ '%label'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '478',
-  'location' => 'includes/content.admin.inc:477',
-  'textgroup' => 'default',
-  'source' => 'No field modules are enabled. You need to <a href="!modules_url">enable one</a>, such as text.module, before you can add new fields.',
-  'version' => 'none',
+  'lid' => '112',
+  'translation' => "Il n'y a aucun champ configuré pour ce type de contenu. Vous pouvez ajouter de nouveaux champs sur la page <a href=\"@link\">Gérer les champs</a>.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '479',
-  'location' => 'includes/content.admin.inc:519',
-  'textgroup' => 'default',
-  'source' => 'Add existing field',
-  'version' => 'none',
+  'lid' => '113',
+  'translation' => 'Au dessus',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '480',
-  'location' => 'includes/content.admin.inc:590',
-  'textgroup' => 'default',
-  'source' => 'Create new field',
-  'version' => 'none',
+  'lid' => '114',
+  'translation' => 'Sur la même ligne',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '481',
-  'location' => 'includes/content.admin.inc:606',
-  'textgroup' => 'default',
-  'source' => 'The machine-readable name of the field.',
-  'version' => 'none',
+  'lid' => '115',
+  'translation' => 'Inclure',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '482',
-  'location' => 'includes/content.admin.inc:610',
-  'textgroup' => 'default',
-  'source' => 'This name cannot be changed.',
-  'version' => 'none',
+  'lid' => '116',
+  'translation' => 'Exclure',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '483',
-  'location' => 'includes/content.admin.inc:618',
-  'textgroup' => 'default',
-  'source' => "This name cannot be changed later! The name will be prefixed with 'field_' and can include lowercase unaccented letters, numbers, and underscores. The length of the name, including the prefix, is limited to no more than 32 letters.",
-  'version' => 'none',
+  'lid' => '117',
+  'translation' => 'aucune mise en forme',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '484',
-  'location' => 'includes/content.admin.inc:636',
-  'textgroup' => 'default',
-  'source' => 'The type of data you would like to store in the database with this field.',
-  'version' => 'none',
+  'lid' => '118',
+  'translation' => 'simple',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '485',
-  'location' => 'includes/content.admin.inc:692',
-  'textgroup' => 'default',
-  'source' => 'The field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.',
-  'version' => 'none',
+  'lid' => '119',
+  'translation' => 'groupe de champs',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '486',
-  'location' => 'includes/content.admin.inc:695',
-  'textgroup' => 'default',
-  'source' => "The field name %field_name is too long. The name is limited to 32 characters, including the 'field_' prefix.",
-  'version' => 'none',
+  'lid' => '120',
+  'translation' => 'groupe de champs - repliable',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '487',
-  'location' => 'includes/content.admin.inc:706',
-  'textgroup' => 'default',
-  'source' => 'The field name %field_name already exists.',
-  'version' => 'none',
+  'lid' => '121',
+  'translation' => 'groupe de champs - replié',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '488',
-  'location' => 'includes/content.admin.inc:709',
-  'textgroup' => 'default',
-  'source' => "The name 'field_instance' is a reserved name.",
-  'version' => 'none',
+  'lid' => '122',
+  'translation' => 'Vos paramètres ont été enregistrés.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '489',
-  'location' => 'includes/content.admin.inc:741',
-  'textgroup' => 'default',
-  'source' => 'Created field %label.',
-  'version' => 'none',
+  'lid' => '123',
+  'translation' => '@type : @field (@label)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '490',
-  'location' => 'includes/content.admin.inc:754',
-  'textgroup' => 'default',
-  'source' => 'Update field %label.',
-  'version' => 'none',
+  'lid' => '124',
+  'translation' => 'Éditer les informations de base',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '491',
-  'location' => 'includes/content.admin.inc:758',
-  'textgroup' => 'default',
-  'source' => 'There was a problem updating field %label.',
-  'version' => 'none',
+  'lid' => '125',
+  'translation' => 'Le nom lisible par une machine du champ. Ce nom ne peut être changé.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '492',
-  'location' => 'includes/content.admin.inc:955',
-  'textgroup' => 'default',
-  'source' => "Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using !link_devel's 'devel load' tab on a %type content page might help you figure out the expected format.",
-  'version' => 'none',
+  'lid' => '126',
+  'translation' => "Nom lisible par une personne, destiné à servir d'étiquette pour ce champ au sein du type de contenu '%type'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '493',
-  'location' => 'includes/content.admin.inc:986',
-  'textgroup' => 'default',
-  'source' => "Select a specific number of values for this field, or 'Unlimited' to provide an 'Add more' button so the users can add as many values as they like.",
-  'version' => 'none',
+  'lid' => '127',
+  'translation' => 'Type de données que vous souhaitez enregistrer, par le biais de ce champ, dans la base de données. Cette option ne peut être modifiée.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '494',
-  'location' => 'includes/content.admin.inc:1131',
-  'textgroup' => 'default',
-  'source' => 'The default value PHP code created @value which is invalid.',
-  'version' => 'none',
+  'lid' => '128',
+  'translation' => 'Type de widget',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '495',
-  'location' => 'includes/content.token.inc:62',
-  'textgroup' => 'default',
-  'source' => 'Formatted HTML link to the node',
-  'version' => 'none',
+  'lid' => '129',
+  'translation' => "Type d'élément de formulaire que vous souhaitez présenter à l'utilisateur lorsqu'il renseigne ce champ dans le type de contenu '%type'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '496',
-  'location' => 'modules/number/number.module:222',
-  'textgroup' => 'default',
-  'source' => 'The value of %name may be no smaller than %min.',
-  'version' => 'none',
+  'lid' => '130',
+  'translation' => 'Continuer',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '497',
-  'location' => 'modules/number/number.module:225',
-  'textgroup' => 'default',
-  'source' => 'The value of %name may be no larger than %max.',
-  'version' => 'none',
+  'lid' => '131',
+  'translation' => 'Les paramètres basiques du champ %label ont été mis à jour.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '498',
-  'location' => 'modules/number/number.module:476',
-  'textgroup' => 'default',
-  'source' => 'Only numbers and decimals are allowed in %field. %start was changed to %value.',
-  'version' => 'none',
+  'lid' => '132',
+  'translation' => 'Un problème a été rencontré lors de la mise à jour des paramètres basiques du champ %label.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '499',
-  'location' => 'modules/number/number.module:494',
-  'textgroup' => 'default',
-  'source' => 'Only numbers are allowed in %field. %start was changed to %value.',
-  'version' => 'none',
+  'lid' => '133',
+  'translation' => "Êtes-vous certain de vouloir enlever le champ '%field' ?",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '500',
-  'location' => 'modules/number/number.module:513',
-  'textgroup' => 'default',
-  'source' => 'Only numbers and the decimal character (%decimal) are allowed in %field. %start was changed to %value.',
-  'version' => 'none',
+  'lid' => '134',
+  'translation' => 'Si vous avez encore du contenu dans ce champ, il sera perdu. Cette action est irréversible.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '501',
-  'location' => 'modules/optionwidgets/optionwidgets.module:10',
-  'textgroup' => 'default',
-  'source' => 'Create a list of options as a list in <strong>Allowed values</strong> or as an array in PHP code. These values will be the same for %field in all content types.',
-  'version' => 'none',
+  'lid' => '135',
+  'translation' => 'Annuler',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '502',
-  'location' => 'misc/tabledrag.js',
-  'textgroup' => 'default',
-  'source' => 'Drag to re-order',
-  'version' => 'none',
+  'lid' => '136',
+  'translation' => 'Ce champ est <strong>verrouillé</strong> et ne peut être supprimé.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '503',
-  'location' => 'misc/tabledrag.js',
-  'textgroup' => 'default',
-  'source' => 'Changes made in this table will not be saved until the form is submitted.',
-  'version' => 'none',
+  'lid' => '137',
+  'translation' => "Le champ '%field' de '%type' a été enlevé.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
-->execute();
-
-$connection->schema()->createTable('locales_target', array(
-  'fields' => array(
-    'lid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'translation' => array(
-      'type' => 'blob',
-      'not null' => TRUE,
-      'size' => 'normal',
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => '',
-    ),
-    'plid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'plural' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-  ),
-  'primary key' => array(
-    'language',
-    'lid',
-    'plural',
-  ),
-  'indexes' => array(
-    'lid' => array(
-      'lid',
-    ),
-    'plid' => array(
-      'plid',
-    ),
-    'plural' => array(
-      'plural',
-    ),
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('locales_target')
-->fields(array(
-  'lid',
-  'translation',
-  'language',
-  'plid',
-  'plural',
+->values(array(
+  'lid' => '138',
+  'translation' => "Un problème est survenu à la suppression du champ '%field' du type '%type'.",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '5',
-  'translation' => "Le module Content, composant obligatoire du kit CCK (Content Construction Kit) permet aux administrateurs d'associer des champs personnalisés à des types de contenus. Au sein de Drupal, les types de contenus servent à définir les caractéristiques d'une publication, y compris le titre et la description des champs affichés sur ses pages \"ajouter\" et \"éditer\". Le module Content (et les modules auxiliaires inclus dans CCK) permet d'ajouter des champs personnalisés en plus des champs par défaut \"Titre\" et \"Corps\". Les fonctionnalités de CCK sont accessible via différents onglets sur la <a href=\"@content-types\">page d'administration des types de contenus</a>. (Voir la <a href=\"@node-help\">page d'aide du module Node</a> pour plus d'informations sur les types de contenus).",
+  'lid' => '139',
+  'translation' => 'Le champ %field est verouillé et ne peut être édité.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '6',
-  'translation' => "Lorsque vous ajoutez un champ personnalisé à un type de contenu, vous déterminez son type (c'est-à-dire s'il doit contenir du texte, des nombres ou des références à d'autres objets) et la façon dont il doit être affiché (en tant que champ ou zone de texte, liste de sélection, case à cocher, bouton radio, ou champ à auto-complètement). Un champ peut présenter plusieurs valeurs (par exemple, une \"personne\" peut disposer de plusieurs adresses courriel) ou une seule (par exemple, un \"employé\" possède un numéro d'identification unique). À mesure que vous ajoutez et modifiez des champs, CCK ajuste automatiquement la structure de la base de données en fonction. CCK propose également un certain nombre d'autres fonctionnalités, par exemple un cache intelligent pour vos données personnalisées, des fonctionnalités d'import et d'export pour les définitions de types de contenus, ainsi qu'une intégration à d'autres modules provenant des contributions.",
+  'lid' => '140',
+  'translation' => "Informations de base pour '%type'",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '7',
-  'translation' => "Des types de champs personnalisés sont proposés par plusieurs modules optionnels inclus dans CCK (chaque module fournissant un type différent). La <a href=\"@modules\">page des modules</a> vous permet d'activer ou de désactiver des composants CCK. Une installation par défaut de CCK inclut :",
+  'lid' => '141',
+  'translation' => 'Modifier les informations de base',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '8',
-  'translation' => "<em>Number</em>, qui ajoute des types de champs numériques (formats entier, décimal ou réel à virgule flottante). Vous pouvez définir un jeu ou un intervalle de valeurs autorisées. Divers formats sont disponibles pour l'affichage des données numériques.",
+  'lid' => '142',
+  'translation' => "Paramètres de '%type'",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '9',
-  'translation' => "<em>Text</em>, qui ajoute des types de champs de texte. Un champ texte peut contenir du texte brut uniquement ou, optionnellement, utiliser les filtres des formats d'entrée que propose Drupal pour gérer en toute sécurité des textes enrichis. Les champs de saisie de texte peuvent être constitués d'une seule ligne (champ texte), de plusieurs lignes (zone de texte) ou, pour un meilleur contrôle des valeurs saisies, une liste de sélection, des cases à cocher ou des boutons radio. Si besoin, CCK peut valider les saisies sur la base d'un ensemble de valeurs autorisées.",
+  'lid' => '143',
+  'translation' => "Ces paramètres ne s'applique qu'au champ '%field' tel qu'il apparaît dans le type contenu '%type'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '10',
-  'translation' => '<em>Node Reference</em>, qui crée des références personnalisées entre nœuds de Drupal. En ajoutant, par exemple, un champ <em>nodereference</em> et deux types de contenus différents, vous pouvez facilement créer des relations complexes de type parent/enfant entre données (par exemple plusieurs nœuds "employé" peuvent présenter un champ <em>nodereference</em> pointant vers un même nœud "employeur").',
+  'lid' => '144',
+  'translation' => "Texte d'aide",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '11',
-  'translation' => "<em>User reference</em>, qui crée des références personnalisées vers les comptes des utilisateurs de votre site. En ajoutant un champ <em>userreference</em>, vous pouvez créer des relations complexes entre les utilisateurs de votre site et des publications. Ainsi, pour tracer l'implication d'un utilisateur dans une publication (au delà du champ Drupal standard <em>Écrit par</em>), vous pouvez ajouter à un type de contenu un champ <em>userreference</em> intitulé \"Édité par\" pour enregistrer un lien vers la page du compte utilisateur ayant édité la publication.",
+  'lid' => '145',
+  'translation' => "Instructions à présenter à l'utilisateur sous ce champ, dans le formulaire d'édition.<br />Balises HTML autorisées : @tags",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '12',
-  'translation' => "<em>Fieldgroup</em>, qui crée des groupes de champs liés. Les groupe de champ peuvent être repliés, et vous pouvez choisir qu'ils soient dépliés ou repliés par défaut. L'ordre des groupes de champs, ainsi que l'ordre des champs au sein d'un groupe, est géré grâce à l'interface par glisser-déposer fournie par le module Content.",
+  'lid' => '146',
+  'translation' => 'Valeur par défaut',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '13',
-  'translation' => "Pour plus d'informations, reportez-vous à l'entrée de manuel en ligne relative à <a href=\"@handbook-cck\">CCK</a> ou à la <a href=\"@project-cck\">page du projet CCK</a>.",
+  'lid' => '147',
+  'translation' => 'Code PHP',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '14',
-  'translation' => 'Configurez ici la manière dont les champs et étiquettes de champs de ce type de contenu doivent être affichées, lorsque le contenu est vu en mode résumé ou en pleine page.',
+  'lid' => '148',
+  'translation' => "'@column' => valeur de @column",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '15',
-  'translation' => "Configurez ici la façon dont les champs de ce type de contenu doivent être affichés lorsqu'il est rendu dans les contextes suivants.",
+  'lid' => '149',
+  'translation' => "return array(\n  0 => array(@columns),\n  // Vous voudrez vous arrêter là dans la plupart des cas. Fournir plus de valeurs\n  // si vous souhaitez que votre 'valeur par défaut' ait des valeurs multiples :\n  1 => array(@columns),\n  2 => ...\n);",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '16',
-  'translation' => "Contrôlez ici l'ordre des champs dans le formulaire de saisie.",
+  'lid' => '150',
+  'translation' => 'Code',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '17',
-  'translation' => 'Ce champ est obligatoire.',
+  'lid' => '151',
+  'translation' => "Usage avancé seulement : code PHP retournant une valeur par défaut. Ne doit pas contenir les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, la valeur retournée par ce code écrasera toute valeur spécifiée ci-dessus. Format attendu : <pre>!sample</pre>. Pour vous faire une idée du format attendu, vous pouvez utiliser l'onglet <em>devel load</em> fourni par <a href=\"@link_devel\">le module devel</a> sur une page de contenu de type  %type.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '18',
-  'translation' => '!title : !required',
+  'lid' => '152',
+  'translation' => '&lt;aucun&gt;',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '19',
-  'translation' => 'Ordre',
+  'lid' => '153',
+  'translation' => "Vous n'êtes pas autorisé à saisir du code PHP.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '20',
-  'translation' => 'Élément de flux RSS',
+  'lid' => '154',
+  'translation' => 'Ce code PHP a été inséré par un administrateur et supplantera toute valeur spécifiée ci-dessus.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '21',
-  'translation' => 'Index de recherche',
+  'lid' => '155',
+  'translation' => 'Paramètres globaux',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '22',
-  'translation' => 'Résultat de recherche',
+  'lid' => '156',
+  'translation' => "Ces paramètres s'appliquent au champ '%field' dans tous les types de contenu où il apparaît.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '23',
-  'translation' => 'Langue',
+  'lid' => '157',
+  'translation' => 'Obligatoire',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '24',
-  'translation' => 'Taxonomie',
+  'lid' => '158',
+  'translation' => "Le nombre maximum de valeurs qu'un utilisateur peut entrer pour ce champ.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '25',
-  'translation' => 'Fichiers attachés',
+  'lid' => '159',
+  'translation' => "'Illimité' fournira un bouton 'Ajouter plus' pour que les utilisateurs puissent ajouter autant de valeurs qu'ils le souhaitent.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '26',
-  'translation' => 'Mise à jour du type de champ %type avec le module %module.',
+  'lid' => '160',
+  'translation' => 'Attention ! Changer ce paramètre alors que des données ont déjà été créées peut conduire à perdre des données !',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '27',
-  'translation' => 'Mise à jour du type de widget %widget avec le module %module.',
+  'lid' => '161',
+  'translation' => 'Nombre de valeurs',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '28',
-  'translation' => "Utiliser du code PHP pour le paramétrage des champs (dangereux - à n'autoriser qu'avec précautions)",
+  'lid' => '162',
+  'translation' => 'Illimité',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '29',
-  'translation' => 'Gérer les champs',
+  'lid' => '163',
+  'translation' => 'Enregistrer les paramètres du champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '30',
-  'translation' => 'Afficher les champs',
+  'lid' => '164',
+  'translation' => "Le code PHP pour la 'valeur par défaut' a retourné @value, qui n'est pas valide.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '31',
-  'translation' => 'Général',
+  'lid' => '165',
+  'translation' => 'La valeur par défaut est invalide.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '32',
-  'translation' => 'Avancé',
+  'lid' => '166',
+  'translation' => "Le champ '%label' a été ajouté.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '33',
-  'translation' => 'Supprimer un champ',
+  'lid' => '167',
+  'translation' => "Champ '%label' enregistré.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '34',
-  'translation' => 'Content',
+  'lid' => '168',
+  'translation' => 'Exécution',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '35',
-  'translation' => 'Permet aux administrateurs de définir des nouveaux types de contenu.',
+  'lid' => '169',
+  'translation' => 'La mise à jour a échoué.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '36',
-  'translation' => 'CCK',
+  'lid' => '170',
+  'translation' => 'La base de données a été modifiée et des données ont été déplacées ou supprimées.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '37',
-  'translation' => 'Texte',
+  'lid' => '171',
+  'translation' => 'Une erreur est survenue et a interrompu la modification de la base de données.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '38',
-  'translation' => "Les valeurs possibles pour ce champ. Saisissez une valeur par ligne, sous la forme <em>clé|libellé</em>. La clé est la valeur enregistrée dans la base de données, et elle doit correspondre au type de stockage du champ, %type. Le libellé est optionnel et, s'il n'est pas spécifié, la clé sera utilisée comme libellé.",
+  'lid' => '172',
+  'translation' => "'%title' en cours de traitement",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '39',
-  'translation' => 'Zone de texte',
+  'lid' => '173',
+  'translation' => '%name doit être un entier.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '40',
-  'translation' => 'Ôter',
+  'lid' => '174',
+  'translation' => '%name doit être un entier positif.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '41',
-  'translation' => 'Basique',
+  'lid' => '175',
+  'translation' => '%name doit être un nombre.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '42',
-  'translation' => 'Résumé',
+  'lid' => '176',
+  'translation' => '1 élément traité avec succès&nbsp:',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '43',
-  'translation' => 'Nœud complet',
+  'lid' => '177',
+  'translation' => '@count éléments traités avec succès&nbsp:',
   'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
+  'plid' => '176',
+  'plural' => '1',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '44',
-  'translation' => 'RSS',
+  'lid' => '178',
+  'translation' => "La table de champs a été renommée de '%old_name' à '%new_name' et les instances des champs ont été mises à jour.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '45',
-  'translation' => 'Recherche',
+  'lid' => '179',
+  'translation' => "La table de champs '%name' a été supprimée.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '46',
-  'translation' => 'Formulaire du module node.',
+  'lid' => '180',
+  'translation' => 'Ajouter un autre élément',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '47',
-  'translation' => 'Formulaire du module locale.',
+  'lid' => '181',
+  'translation' => 'Contenu du champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '48',
-  'translation' => 'Paramètres du menu',
+  'lid' => '182',
+  'translation' => 'Un champ de contenu du node référencé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '49',
-  'translation' => 'Formulaire du module menu.',
+  'lid' => '183',
+  'translation' => 'Noeud',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '50',
-  'translation' => 'Formulaire du module taxonomy.',
+  'lid' => '184',
+  'translation' => 'Contexte du noeud',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '51',
-  'translation' => 'Livre',
+  'lid' => '185',
+  'translation' => 'Titre du bloc',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '52',
-  'translation' => 'Formulaire du module livre (book).',
+  'lid' => '186',
+  'translation' => 'Caché',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '53',
-  'translation' => 'Titre du sondage',
+  'lid' => '187',
+  'translation' => "Configurer la manière dont l'étiquette est affichée.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '54',
-  'translation' => 'Titre du module sondage (Poll)',
+  'lid' => '188',
+  'translation' => 'Champ / Formateur',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '55',
-  'translation' => 'Choix du sondage',
+  'lid' => '189',
+  'translation' => 'Sélectionner un champ et un formateur.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '56',
-  'translation' => 'Choix du module sondage (poll).',
+  'lid' => '190',
+  'translation' => '"@s" champ @name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '57',
-  'translation' => 'Paramètrage du sondage',
+  'lid' => '191',
+  'translation' => 'Remplir un champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '58',
-  'translation' => 'Paramètres du module sondage (poll).',
+  'lid' => '192',
+  'translation' => 'Vous devez vous assurer que le champ existe pour le type de contenu donné.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '59',
-  'translation' => 'Formulaire du module upload.',
+  'lid' => '193',
+  'translation' => 'Champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '60',
-  'translation' => 'contenu',
+  'lid' => '194',
+  'translation' => 'Sélectionnez le nom-machine du champ.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '61',
-  'translation' => 'Champs',
+  'lid' => '195',
+  'translation' => 'Avancé : Préciser les valeurs des champs avec du code PHP',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '62',
-  'translation' => "Les mises à jour des modules liés à CCK ne sont pas exécutées tant que les modules ne sont pas activés sur la  <a href=\"@admin-modules-path\">page d'administration des modules</a>. Lorsque vous les activerez, vous devrez retourner sur la page <a href=\"@update-php\">update.php</a> et exécuter les mises à jour restantes.",
+  'lid' => '196',
+  'translation' => "Usage avancé seulement : code PHP retournant la valeur à définir. Ne doit pas contenir les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, la valeur retournée par ce code écrasera toute valeur spécifiée ci-dessus. Format attendu : <pre>!sample</pre>. Pour vous faire une idée du format attendu, vous pouvez utiliser l'onglet <em>devel load</em> fourni par <a href=\"@link_devel\">le module devel</a> sur une page de contenu de type  %type.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '63',
-  'translation' => "!module.module possède des mises à jour mais ne peut pas être mis à jour car content.module n'est pas activé.<br /> Le cas échéant, lors de l'activation de content.module, vous devrez exécuter à nouveau le script de mise à jour. Vous continuerez à voir ce message jusqu'à ce que le module soit activé et les mises à jour exécutées.",
+  'lid' => '197',
+  'translation' => 'Vous devez retourner la valeur par défaut dans le format attendu.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '64',
-  'translation' => "!module.module possède des mises à jour et est disponible dans le répertoire des modules, mais n'est pas activé.<br /> Le cas échéant, lorsque vous l'aurez activé, vous devrez ré-exécuter le script de mise à jour. Vous continuerez à voir ce message jusqu'à l'activation du module et l'exécution des mises à jour. ",
+  'lid' => '198',
+  'translation' => "Remplir le champ '@field' de @node",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '65',
-  'translation' => 'Des mises à jour sont toujours en attente. Veuillez retourner sur <a href="@update-php">update.php</a> et exécuter les mises à jour restarntes.',
+  'lid' => '199',
+  'translation' => 'Le champ possède une valeur',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '66',
-  'translation' => 'CCK - Aucune Intégration aux Vues',
+  'lid' => '200',
+  'translation' => 'Vous devez vous assurer que le champ utilisé existe dans le type de contenu donné. La condition retourne TRUE, si le champ sélectionné possède la valeur donnée.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '67',
-  'translation' => 'L"intégration de CCK avec le module Views requiert Views 6.x-2.0-rc2 ou une version supérieure.',
+  'lid' => '201',
+  'translation' => 'Le champ a été modifié',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '68',
-  'translation' => 'Nom',
+  'lid' => '202',
+  'translation' => 'Contenu contenant des modifications',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '69',
-  'translation' => 'Type',
+  'lid' => '203',
+  'translation' => 'Contenu ne contenant pas de modification',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '70',
-  'translation' => 'Description',
+  'lid' => '204',
+  'translation' => "Le champ '@field' de @node possède une valeur",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '71',
-  'translation' => 'Opérations',
+  'lid' => '205',
+  'translation' => 'Sélectionnez le nom-machine du champ à voir.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '72',
-  'translation' => 'éditer',
+  'lid' => '206',
+  'translation' => "Le champ '@field' de @node a été modifié",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '73',
-  'translation' => 'gérer les champs',
+  'lid' => '207',
+  'translation' => 'Jeton (Token)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '74',
-  'translation' => 'supprimer',
+  'lid' => '208',
+  'translation' => 'Identifiant du nœud référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '75',
-  'translation' => 'Aucun type de contenu disponible.',
+  'lid' => '209',
+  'translation' => 'Titre du nœud référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '76',
-  'translation' => '» Ajouter un nouveau type de contenu',
+  'lid' => '210',
+  'translation' => 'Titre non filtré du noeud référencé. ATTENTION - saisie brute utilisateur.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '77',
-  'translation' => 'Nom du champ',
+  'lid' => '211',
+  'translation' => 'Lien html formaté vers le noeud référencé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '78',
-  'translation' => 'Type de champ',
+  'lid' => '212',
+  'translation' => 'Alias de chemin relatif vers le noeud référencé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '79',
-  'translation' => 'Utilisé dans',
+  'lid' => '213',
+  'translation' => 'Alias de chemin absolu vers le noeud référencé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '80',
-  'translation' => '@field_name (Verrouillé)',
+  'lid' => '214',
+  'translation' => 'Valeur numérique brute',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '81',
-  'translation' => "Aucun champ n'est pour l'instant défini sur l'ensemble des types de contenu.",
+  'lid' => '215',
+  'translation' => 'Valeur numérique mise en forme',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '82',
-  'translation' => "Ce type de contenu possède des champs inactifs. Les champs inactifs ne sont pas inclus dans la liste de champs disponibles, jusqu'à l'activation des modules correspondants.",
+  'lid' => '216',
+  'translation' => 'Texte brut, non filtré',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '83',
-  'translation' => '!field (!field_name) est un champ inactif de type !field_type, qui utilise un widget de type !widget_type.',
+  'lid' => '217',
+  'translation' => 'Texte filtré et mis en forme',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '84',
-  'translation' => 'Configurer',
+  'lid' => '218',
+  'translation' => "Identifiant de l'utilisateur référencé",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '85',
-  'translation' => 'Verrouillé',
+  'lid' => '219',
+  'translation' => "Nom de l'utilisateur référencé",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '86',
-  'translation' => '- Sélectionnez un type de champ -',
+  'lid' => '220',
+  'translation' => "Lien HTML mis en forme vers l'utilisateur référencé",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '87',
-  'translation' => '- Sélectionnez un widget -',
+  'lid' => '221',
+  'translation' => "Alias de chemin relatif vers l'utilisateur référencé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '88',
-  'translation' => 'Étiquette',
+  'lid' => '222',
+  'translation' => "Alias de chemin absolu vers l'utilisateur référencé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '89',
-  'translation' => 'Nom du champ (a-z, 0-9, _)',
+  'lid' => '223',
+  'translation' => '@label (!name)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '90',
-  'translation' => 'Type de données à stocker.',
+  'lid' => '224',
+  'translation' => '@label (!name) - !column',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '91',
-  'translation' => "Elément du formulaire pour l'édition des données.",
+  'lid' => '225',
+  'translation' => '@label-truncated - !column',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '92',
-  'translation' => '- Sélectionnez un champ existant -',
+  'lid' => '226',
+  'translation' => 'Apparaît dans : @types',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '93',
-  'translation' => 'Champ à partager',
+  'lid' => '227',
+  'translation' => 'Aucun',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '94',
-  'translation' => 'Nom du groupe (a-z, 0-9, _)',
+  'lid' => '228',
+  'translation' => 'Étiquette du widget (@label)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '95',
-  'translation' => 'Enregistrer',
+  'lid' => '229',
+  'translation' => 'Personnalisé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '96',
-  'translation' => 'Ajouter un nouveau champ : vous devez fournir une étiquette.',
+  'lid' => '230',
+  'translation' => 'Étiquette personnalisée',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '97',
-  'translation' => 'Ajouter un nouveau champ : vous devez fournir un nom de champ.',
+  'lid' => '231',
+  'translation' => 'Format',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '98',
-  'translation' => "Ajouter un nouveau champ : le nom de champ %field_name n'est pas valide. Le nom doit seulement contenir des lettre minuscules non accentuées, des nombres, et des underscores. ",
+  'lid' => '232',
+  'translation' => 'Grouper plusieurs valeurs',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '99',
-  'translation' => "Ajouter un nouveau champ : le nom de champ %field_name est trop long. Le nom est limité à 32 caractères, en comptant le préfixe 'field_'.",
+  'lid' => '233',
+  'translation' => "Si non coché, chaque élément du champ créera une nouvelle ligne, ce qui pourrait apparemment entraîner des doublons. Ce paramètre n'est pas compatible avec le tri par clic dans l'affichage du tableau. ",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '100',
-  'translation' => "Ajouter un nouveau champ : le nom 'field_instance' est un nom réservé.",
+  'lid' => '234',
+  'translation' => 'Afficher @count valeur(s)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '101',
-  'translation' => 'Ajouter un nouveau champ : le nom du champ %field_name existe déjà.',
+  'lid' => '235',
+  'translation' => 'en commençant à @count',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '102',
-  'translation' => 'Ajouter un nouveau champ : vous devez sélectionner un type de champ.',
+  'lid' => '236',
+  'translation' => 'Inversé (commencer à partir des dernières valeurs)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '103',
-  'translation' => 'Ajouter un nouveau champ : vous devez sélectionner un widget.',
+  'lid' => '237',
+  'translation' => 'Tous / Toutes',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '104',
-  'translation' => 'Ajouter un nouveau champ : widget non valide.',
+  'lid' => '238',
+  'translation' => 'Delta',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '105',
-  'translation' => 'Ajouter un champ existant : vous devez fournir une étiquette.',
+  'lid' => '239',
+  'translation' => "Le delta vous permet de sélectionner quel élément d'un champ à valeur multiple sera la clé de la relation. Sélectionnez \"1\" pour utiliser le premier élément, \"2\" pour le second et ainsi de suite. Si vous sélectionnez \"Tous\", chaque élément du champ créera une nouvelle ligne, ce qui pourrait causer des doublons.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '106',
-  'translation' => 'Ajouter un champ existant : vous devez sélectionner un champ.',
+  'lid' => '240',
+  'translation' => "Le delta vous permet de sélectionner quel élément d'un champ à valeur multiple sera utilisé pour les tris. Sélectionnez \"1\" pour utiliser le premier élément, \"2\" pour le second et ainsi de suite. Si vous sélectionnez \"Tous\", chaque élément du champ créera une nouvelle ligne, ce qui pourrait causer des doublons.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '107',
-  'translation' => 'Ajouter un champ existant: vous devez sélectionner un widget.',
+  'lid' => '241',
+  'translation' => 'Exporter',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '108',
-  'translation' => 'Ajouter un champ existant : widget non valide.',
+  'lid' => '242',
+  'translation' => "Ce formulaire traitera un type de contenu et un ou plusieurs champs de ce type, pour en exporter les paramètres. Le code d'export ainsi généré peut être copié et collé dans la page d'import, vers la base de données courante ou vers une autre base de données. L'opération d'import ajoutera les champs à un type de contenu existant ou créera un nouveau type de contenu intégrant les champs sélectionnés.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '109',
-  'translation' => "Un problème est survenu à la création du champ '%label'.",
+  'lid' => '243',
+  'translation' => 'Types',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '110',
-  'translation' => "Le champ %label n'a pas pu être ajouté au type de contenu car il est verrouillé.",
+  'lid' => '244',
+  'translation' => 'Sélectionner le type de contenu à exporter.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '111',
-  'translation' => "Un problème est survenu lors de l'ajout du champ '%label'.",
+  'lid' => '245',
+  'translation' => 'Données exportée',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '112',
-  'translation' => "Il n'y a aucun champ configuré pour ce type de contenu. Vous pouvez ajouter de nouveaux champs sur la page <a href=\"@link\">Gérer les champs</a>.",
+  'lid' => '246',
+  'translation' => "Copiez le texte exporté et collez-le dans le type de contenu de votre choix, à l'aide de la fonction d'import.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '113',
-  'translation' => 'Au dessus',
+  'lid' => '247',
+  'translation' => 'Types de contenu',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '114',
-  'translation' => 'Sur la même ligne',
+  'lid' => '248',
+  'translation' => 'Type de contenu',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '115',
-  'translation' => 'Inclure',
+  'lid' => '249',
+  'translation' => 'Séléctionnez le type de contenu dans lequel importer ces champs.<br />Sélectionnez &lt;Créer&gt; pour créer un nouveau type de contenu qui contiendra ces champs.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '116',
-  'translation' => 'Exclure',
+  'lid' => '250',
+  'translation' => 'Données à importer',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '117',
-  'translation' => 'aucune mise en forme',
+  'lid' => '251',
+  'translation' => 'Collez dans ce champ le texte créé par un export de contenu.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '118',
-  'translation' => 'simple',
+  'lid' => '252',
+  'translation' => 'Importer',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '119',
-  'translation' => 'groupe de champs',
+  'lid' => '253',
+  'translation' => "Un fichier a été préchargé pour l'import.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '120',
-  'translation' => 'groupe de champs - repliable',
+  'lid' => '254',
+  'translation' => "Les données d'import ne sont valides.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '121',
-  'translation' => 'groupe de champs - replié',
+  'lid' => '255',
+  'translation' => "Les modules suivants doivent être activés pour que l'import fonctionne : '%modules'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '122',
-  'translation' => 'Vos paramètres ont été enregistrés.',
+  'lid' => '256',
+  'translation' => "Le type de contenu '%type' existe déjà dans cette base de données.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '123',
-  'translation' => '@type : @field (@label)',
+  'lid' => '257',
+  'translation' => "Abandon. L'import n'a pas été réalisé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '124',
-  'translation' => 'Éditer les informations de base',
+  'lid' => '258',
+  'translation' => "Une erreur s'est produite lors de l'ajout du nouveau type de contenu %type.<br> Veuillez vérifier les erreurs affichées pour plus de détails.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '125',
-  'translation' => 'Le nom lisible par une machine du champ. Ce nom ne peut être changé.',
+  'lid' => '259',
+  'translation' => "Le champ importé '%field_label' (%field_name) n'a pas été ajouté à '%type' car ce champ existe déjà.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '126',
-  'translation' => "Nom lisible par une personne, destiné à servir d'étiquette pour ce champ au sein du type de contenu '%type'.",
+  'lid' => '260',
+  'translation' => "Le champ importé '%field_label' (%field_name) a été ajouté au type de contenu '%type'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '127',
-  'translation' => 'Type de données que vous souhaitez enregistrer, par le biais de ce champ, dans la base de données. Cette option ne peut être modifiée.',
+  'lid' => '261',
+  'translation' => 'content_copy',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '128',
-  'translation' => 'Type de widget',
+  'lid' => '262',
+  'translation' => 'Content Copy',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '129',
-  'translation' => "Type d'élément de formulaire que vous souhaitez présenter à l'utilisateur lorsqu'il renseigne ce champ dans le type de contenu '%type'.",
+  'lid' => '263',
+  'translation' => "Permet d'importer et d'exporter des définitions de champs.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '130',
-  'translation' => 'Continuer',
+  'lid' => '264',
+  'translation' => "Les champs d'un groupe Standard sont indépendants les uns des autres, et chacun peut soit avoir une valeur unique, soit des valeurs multiples. Les champs d'un Multigroupe sont traités comme une ensemble répétable de champs à valeurs uniques.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '131',
-  'translation' => 'Les paramètres basiques du champ %label ont été mis à jour.',
+  'lid' => '265',
+  'translation' => 'Multigroupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '132',
-  'translation' => 'Un problème a été rencontré lors de la mise à jour des paramètres basiques du champ %label.',
+  'lid' => '266',
+  'translation' => 'Standard',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '133',
-  'translation' => "Êtes-vous certain de vouloir enlever le champ '%field' ?",
+  'lid' => '267',
+  'translation' => 'Type de groupe.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '134',
-  'translation' => 'Si vous avez encore du contenu dans ce champ, il sera perdu. Cette action est irréversible.',
+  'lid' => '268',
+  'translation' => "Le champ %field a été mis à jour pour l'utilisation de valeurs %multiple, afin de correspondre au paramètre de valeur multipe du Multigroup %group.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '135',
-  'translation' => 'Annuler',
+  'lid' => '269',
+  'translation' => "Cette modification n'est pas autorisée. Le champ %field possède déjà des valeurs multiples dans la base de données, mais le groupe %group en autorise seulement %group_max. Effectuer cette modification pourrait entraîner la perte de données. ",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '136',
-  'translation' => 'Ce champ est <strong>verrouillé</strong> et ne peut être supprimé.',
+  'lid' => '270',
+  'translation' => "Cette modification n'est pas autorisée. Le champ %field manipule les valeurs multiples différemment du module Content. Effectuer cette modification pourrait entraîner la perte de données. ",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '137',
-  'translation' => "Le champ '%field' de '%type' a été enlevé.",
+  'lid' => '271',
+  'translation' => "Vous êtes en train d'inclure le champ %field dans un Multigroupe",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '138',
-  'translation' => "Un problème est survenu à la suppression du champ '%field' du type '%type'.",
+  'lid' => '272',
+  'translation' => "Cette modification n'est pas autorisée. Le champ %field possède déjà des données créées, et utilise un widget qui stocke les données différemment dans un groupe Standard que dans un Multigroupe. Effectuer ce changement pourrait entraîner la perte de données.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '139',
-  'translation' => 'Le champ %field est verouillé et ne peut être édité.',
+  'lid' => '273',
+  'translation' => "Vous êtes en train de retirer le champ %field d'un Multigroupe",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '140',
-  'translation' => "Informations de base pour '%type'",
+  'lid' => '274',
+  'translation' => 'Simple',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '141',
-  'translation' => 'Modifier les informations de base',
+  'lid' => '275',
+  'translation' => 'Groupe de champs',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '142',
-  'translation' => "Paramètres de '%type'",
+  'lid' => '276',
+  'translation' => 'Ligne horizontale',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '143',
-  'translation' => "Ces paramètres ne s'applique qu'au champ '%field' tel qu'il apparaît dans le type contenu '%type'.",
+  'lid' => '277',
+  'translation' => 'Tableau - Colonne unique',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '144',
-  'translation' => "Texte d'aide",
+  'lid' => '278',
+  'translation' => 'Tableau - Colonnes multiples',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '145',
-  'translation' => "Instructions à présenter à l'utilisateur sous ce champ, dans le formulaire d'édition.<br />Balises HTML autorisées : @tags",
+  'lid' => '279',
+  'translation' => '[Format du sous-groupe]',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '146',
-  'translation' => 'Valeur par défaut',
+  'lid' => '280',
+  'translation' => 'Paramètres multigroupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '147',
-  'translation' => 'Code PHP',
+  'lid' => '281',
+  'translation' => 'Colonnes multiples',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '148',
-  'translation' => "'@column' => valeur de @column",
+  'lid' => '282',
+  'translation' => "Activez cette option pour rendre chaque champs dans une colonne disctincte sur le formulaire d'édition de noeud.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '149',
-  'translation' => "return array(\n  0 => array(@columns),\n  // Vous voudrez vous arrêter là dans la plupart des cas. Fournir plus de valeurs\n  // si vous souhaitez que votre 'valeur par défaut' ait des valeurs multiples :\n  1 => array(@columns),\n  2 => ...\n);",
+  'lid' => '283',
+  'translation' => "Activez cette option pour rendre obligatoire un minimum d'une collection de champs dans ce Multigroupe.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '150',
-  'translation' => 'Code',
+  'lid' => '284',
+  'translation' => "Nombre de fois où répéter l'ensemble Multigroupe de champs.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '151',
-  'translation' => "Usage avancé seulement : code PHP retournant une valeur par défaut. Ne doit pas contenir les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, la valeur retournée par ce code écrasera toute valeur spécifiée ci-dessus. Format attendu : <pre>!sample</pre>. Pour vous faire une idée du format attendu, vous pouvez utiliser l'onglet <em>devel load</em> fourni par <a href=\"@link_devel\">le module devel</a> sur une page de contenu de type  %type.",
+  'lid' => '285',
+  'translation' => "'Illimité' fournira un bouton 'Ajouter plus' pour que les utilisateurs puissent ajouter des éléments autant de fois qu'ils le souhaitent.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '152',
-  'translation' => '&lt;aucun&gt;',
+  'lid' => '286',
+  'translation' => 'Tous les champs de ce groupe seront automatiquement paramétrés pour autoriser ce nombre de valeurs.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '153',
-  'translation' => "Vous n'êtes pas autorisé à saisir du code PHP.",
+  'lid' => '287',
+  'translation' => 'Nombre de répétitions',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '154',
-  'translation' => 'Ce code PHP a été inséré par un administrateur et supplantera toute valeur spécifiée ci-dessus.',
+  'lid' => '288',
+  'translation' => 'Etiquettes',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '155',
-  'translation' => 'Paramètres globaux',
+  'lid' => '289',
+  'translation' => "Etiquettes pour chaque sous-groupe de champs. Les étiquettes peuvent être cachées ou affichées dans des contextes divers en utilisant l'écran 'Afficher les champs'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '156',
-  'translation' => "Ces paramètres s'appliquent au champ '%field' dans tous les types de contenu où il apparaît.",
+  'lid' => '290',
+  'translation' => 'Etiquette du sous-groupe %number',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '157',
-  'translation' => 'Obligatoire',
+  'lid' => '291',
+  'translation' => 'Le champ %field dans ce groupe possède déjà %multiple valeurs dans la base de données. Pour éviter la perte de données, vous ne pouvez définir le nombre de valeurs du Multigroupe à une valeur inférieure.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '158',
-  'translation' => "Le nombre maximum de valeurs qu'un utilisateur peut entrer pour ce champ.",
+  'lid' => '292',
+  'translation' => 'Le champ !name est obligatoire dans le groupe @group.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '159',
-  'translation' => "'Illimité' fournira un bouton 'Ajouter plus' pour que les utilisateurs puissent ajouter autant de valeurs qu'ils le souhaitent.",
+  'lid' => '293',
+  'translation' => 'Le groupe @name requiert au minimum un groupe de champs.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '160',
-  'translation' => 'Attention ! Changer ce paramètre alors que des données ont déjà été créées peut conduire à perdre des données !',
+  'lid' => '294',
+  'translation' => 'Ajouter plus de valeurs',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '161',
-  'translation' => 'Nombre de valeurs',
+  'lid' => '295',
+  'translation' => 'content_multigroup',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '162',
-  'translation' => 'Illimité',
+  'lid' => '296',
+  'translation' => 'Contenu Multigroupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '163',
-  'translation' => 'Enregistrer les paramètres du champ',
+  'lid' => '297',
+  'translation' => "Combinez de multiples champs CCK au sein de collections de champs qui fonctionnent à l'unisson.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '164',
-  'translation' => "Le code PHP pour la 'valeur par défaut' a retourné @value, qui n'est pas valide.",
+  'lid' => '298',
+  'translation' => 'éditer',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '165',
-  'translation' => 'La valeur par défaut est invalide.',
+  'lid' => '299',
+  'translation' => 'field_name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '166',
-  'translation' => "Le champ '%label' a été ajouté.",
+  'lid' => '300',
+  'translation' => 'voir',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '167',
-  'translation' => "Champ '%label' enregistré.",
+  'lid' => '301',
+  'translation' => 'content_permissions',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '168',
-  'translation' => 'Exécution',
+  'lid' => '302',
+  'translation' => 'Veuillez <a href="!url">configurer vos permissions sur les champs</a> immédiatement. Tous les champs sont inaccessibles par défaut.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '169',
-  'translation' => 'La mise à jour a échoué.',
+  'lid' => '303',
+  'translation' => 'Permissions sur les Contenus',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '170',
-  'translation' => 'La base de données a été modifiée et des données ont été déplacées ou supprimées.',
+  'lid' => '304',
+  'translation' => 'Définit un niveau de permission par champ pour les champs CCK.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '171',
-  'translation' => 'Une erreur est survenue et a interrompu la modification de la base de données.',
+  'lid' => '305',
+  'translation' => 'Contenu du groupe de champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '172',
-  'translation' => "'%title' en cours de traitement",
+  'lid' => '306',
+  'translation' => "Tous les champs d'un groupe de champs sur le node référencé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '173',
-  'translation' => '%name doit être un entier.',
+  'lid' => '307',
+  'translation' => '@group_label (@group_type_name)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '174',
-  'translation' => '%name doit être un entier positif.',
+  'lid' => '308',
+  'translation' => 'Fieldgroup',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '175',
-  'translation' => '%name doit être un nombre.',
+  'lid' => '309',
+  'translation' => "Texte à afficher si un groupe n'a pas de données. Notez que le titre ne s'affichera pas sauf s'il est surclassé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '176',
-  'translation' => '1 élément traité avec succès&nbsp:',
+  'lid' => '310',
+  'translation' => '"@s" groupe de champs @name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '177',
-  'translation' => '@count éléments traités avec succès&nbsp:',
+  'lid' => '311',
+  'translation' => 'Paramètres du formulaire',
   'language' => 'fr',
-  'plid' => '176',
-  'plural' => '1',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '178',
-  'translation' => "La table de champs a été renommée de '%old_name' à '%new_name' et les instances des champs ont été mises à jour.",
+  'lid' => '312',
+  'translation' => "Ces paramètres s'appliquent au groupe dans le formulaire d'édition de nœud.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '179',
-  'translation' => "La table de champs '%name' a été supprimée.",
+  'lid' => '313',
+  'translation' => 'Style',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '180',
-  'translation' => 'Ajouter un autre élément',
+  'lid' => '314',
+  'translation' => 'toujours déplié',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '181',
-  'translation' => 'Contenu du champ',
+  'lid' => '315',
+  'translation' => 'repliable',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '182',
-  'translation' => 'Un champ de contenu du node référencé.',
+  'lid' => '316',
+  'translation' => 'replié',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '183',
-  'translation' => 'Noeud',
+  'lid' => '317',
+  'translation' => "Instructions à présenter à l'utilisateur dans le formulaire d'édition.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '184',
-  'translation' => 'Contexte du noeud',
+  'lid' => '318',
+  'translation' => "Paramètres d'affichage",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '185',
-  'translation' => 'Titre du bloc',
+  'lid' => '319',
+  'translation' => "Ces paramètres s'appliquent au groupe à l'affichage du nœud.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '186',
-  'translation' => 'Caché',
+  'lid' => '320',
+  'translation' => 'Description du groupe.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '187',
-  'translation' => "Configurer la manière dont l'étiquette est affichée.",
+  'lid' => '321',
+  'translation' => "Êtes-vous sûr(e) de vouloir supprimer le groupe '%label' ?",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '188',
-  'translation' => 'Champ / Formateur',
+  'lid' => '322',
+  'translation' => 'Cette action est irréversible.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '189',
-  'translation' => 'Sélectionner un champ et un formateur.',
+  'lid' => '323',
+  'translation' => "Le groupe '%group_name' a été supprimé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '190',
-  'translation' => '"@s" champ @name',
+  'lid' => '324',
+  'translation' => 'aucun',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '191',
-  'translation' => 'Remplir un champ',
+  'lid' => '325',
+  'translation' => 'Vous devez fournir une étiquette.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '192',
-  'translation' => 'Vous devez vous assurer que le champ existe pour le type de contenu donné.',
+  'lid' => '326',
+  'translation' => 'Vous devez fournir un nom de groupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '193',
-  'translation' => 'Champ',
+  'lid' => '327',
+  'translation' => "Le nom de groupe %group_name n'est pas valide. Le nom ne doit contenir que des lettres sans accents, des nombres, et des underscores.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '194',
-  'translation' => 'Sélectionnez le nom-machine du champ.',
+  'lid' => '328',
+  'translation' => "Le nom de groupe %group_name est trop long. Le nom est limité à 32 caractères, le préfixe 'group_' compris.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '195',
-  'translation' => 'Avancé : Préciser les valeurs des champs avec du code PHP',
+  'lid' => '329',
+  'translation' => 'Le nom de groupe %group_name existe déjà.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '196',
-  'translation' => "Usage avancé seulement : code PHP retournant la valeur à définir. Ne doit pas contenir les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, la valeur retournée par ce code écrasera toute valeur spécifiée ci-dessus. Format attendu : <pre>!sample</pre>. Pour vous faire une idée du format attendu, vous pouvez utiliser l'onglet <em>devel load</em> fourni par <a href=\"@link_devel\">le module devel</a> sur une page de contenu de type  %type.",
+  'lid' => '330',
+  'translation' => 'Ajouter un nouveau groupe :',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '197',
-  'translation' => 'Vous devez retourner la valeur par défaut dans le format attendu.',
+  'lid' => '331',
+  'translation' => 'Ajouter un nouveau groupe : vous devez fournir une étiquette.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '198',
-  'translation' => "Remplir le champ '@field' de @node",
+  'lid' => '332',
+  'translation' => 'Ajouter un nouveau groupe : vous devez fournir un nom de groupe.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '199',
-  'translation' => 'Le champ possède une valeur',
+  'lid' => '333',
+  'translation' => 'Groupe standard',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '200',
-  'translation' => 'Vous devez vous assurer que le champ utilisé existe dans le type de contenu donné. La condition retourne TRUE, si le champ sélectionné possède la valeur donnée.',
+  'lid' => '334',
+  'translation' => 'Éditer le groupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '201',
-  'translation' => 'Le champ a été modifié',
+  'lid' => '335',
+  'translation' => 'fieldgroup',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '202',
-  'translation' => 'Contenu contenant des modifications',
+  'lid' => '336',
+  'translation' => "Créée des groupes d'affichage pour les champs CCK.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '203',
-  'translation' => 'Contenu ne contenant pas de modification',
+  'lid' => '337',
+  'translation' => 'Charge un noeud référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '204',
-  'translation' => "Le champ '@field' de @node possède une valeur",
+  'lid' => '338',
+  'translation' => 'Contenu contenant le champ node reference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '205',
-  'translation' => 'Sélectionnez le nom-machine du champ à voir.',
+  'lid' => '339',
+  'translation' => 'Contenu référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '206',
-  'translation' => "Le champ '@field' de @node a été modifié",
+  'lid' => '340',
+  'translation' => 'Notez que si le champs possède des valeurs multiples, seul le premier contenu sera chargé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '207',
-  'translation' => 'Jeton (Token)',
+  'lid' => '341',
+  'translation' => "Il n'y a aucun champ  nodereference défini.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '208',
-  'translation' => 'Identifiant du nœud référencé',
+  'lid' => '342',
+  'translation' => 'Node référence',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '209',
-  'translation' => 'Titre du nœud référencé',
+  'lid' => '343',
+  'translation' => "Stocker l'ID du noeud lié en tant que valeur entière.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '210',
-  'translation' => 'Titre non filtré du noeud référencé. ATTENTION - saisie brute utilisateur.',
+  'lid' => '344',
+  'translation' => 'Types de contenu pouvant être référencés',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '211',
-  'translation' => 'Lien html formaté vers le noeud référencé.',
+  'lid' => '345',
+  'translation' => 'Vues par défaut',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '212',
-  'translation' => 'Alias de chemin relatif vers le noeud référencé.',
+  'lid' => '346',
+  'translation' => 'Vues éxistantes',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '213',
-  'translation' => 'Alias de chemin absolu vers le noeud référencé.',
+  'lid' => '347',
+  'translation' => 'Avancé - Nœuds pouvant être référencés (Vue)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '214',
-  'translation' => 'Valeur numérique brute',
+  'lid' => '348',
+  'translation' => 'Vue utilisée pour sélectionner les noeuds',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '215',
-  'translation' => 'Valeur numérique mise en forme',
+  'lid' => '349',
+  'translation' => '<p>Choisissez la vue du "module Views" qui sélectionne les noeuds pouvant être référencés.<br />Note :</p>',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '216',
-  'translation' => 'Texte brut, non filtré',
+  'lid' => '350',
+  'translation' => "<ul><li>Seules les vues qui possèdent des champs fonctionneront à cet effet.</li><li>Ceci annulera les paramètres \"Types de contenu\" ci-dessus. Utilisez la section \"filtres\" de la vue à la place.</li><li>Utilisez la section \"champs\" de la vue pour afficher des informations supplémentaires à propos des noeuds candidats sur le formulaire de création/édition.</li><li>Utilisez la section \"critère de tri\" de la vue pour déterminer l'ordre dans lequel les noeuds candidats seront affichés.</li></ul>",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '217',
-  'translation' => 'Texte filtré et mis en forme',
+  'lid' => '351',
+  'translation' => 'Arguments de la vue',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '218',
-  'translation' => "Identifiant de l'utilisateur référencé",
+  'lid' => '352',
+  'translation' => "Fournit une liste d'arguments, séparés par des virgules, à transmettre à la vue.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '219',
-  'translation' => "Nom de l'utilisateur référencé",
+  'lid' => '353',
+  'translation' => "<p>La liste des noeuds pouvant être référencés peut s'appuyer sur une vue du \"module Views\" mais aucune vue appropriée n'a été trouvée. <br />Note :</p>",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '220',
-  'translation' => "Lien HTML mis en forme vers l'utilisateur référencé",
+  'lid' => '354',
+  'translation' => '%name : saisie non valide.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '221',
-  'translation' => "Alias de chemin relatif vers l'utilisateur référencé.",
+  'lid' => '355',
+  'translation' => '%name : ce contenu ne peut être référencé.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '222',
-  'translation' => "Alias de chemin absolu vers l'utilisateur référencé.",
+  'lid' => '356',
+  'translation' => 'Titre (avec lien)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '223',
-  'translation' => '@label (!name)',
+  'lid' => '357',
+  'translation' => 'Titre (sans lien)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '224',
-  'translation' => '@label (!name) - !column',
+  'lid' => '358',
+  'translation' => 'Liste de sélection',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '225',
-  'translation' => '@label-truncated - !column',
+  'lid' => '359',
+  'translation' => 'Cases à cocher/boutons radio',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '226',
-  'translation' => 'Apparaît dans : @types',
+  'lid' => '360',
+  'translation' => 'Champ texte à auto-complètement',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '227',
-  'translation' => 'Aucun',
+  'lid' => '361',
+  'translation' => "Correspondance de l'autocomplétion",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '228',
-  'translation' => 'Étiquette du widget (@label)',
+  'lid' => '362',
+  'translation' => 'Commence par',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '229',
-  'translation' => 'Personnalisé',
+  'lid' => '363',
+  'translation' => 'Contient',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '230',
-  'translation' => 'Étiquette personnalisée',
+  'lid' => '364',
+  'translation' => "Séléctionnez la méthode utilisée pour collecter les suggestions de l'autocomplétion. Notez que <em>Contient</em> peut engendrer des problèmes de performances sur des sites avec des milliers de noeuds",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '231',
-  'translation' => 'Format',
+  'lid' => '365',
+  'translation' => '%name : différence de titre. Veuillez vérifier votre sélection.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '232',
-  'translation' => 'Grouper plusieurs valeurs',
+  'lid' => '366',
+  'translation' => "%name : aucun contenu valide n'a été trouvé pour ce titre.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '233',
-  'translation' => "Si non coché, chaque élément du champ créera une nouvelle ligne, ce qui pourrait apparemment entraîner des doublons. Ce paramètre n'est pas compatible avec le tri par clic dans l'affichage du tableau. ",
+  'lid' => '367',
+  'translation' => 'Autocomplétion de nodereference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '234',
-  'translation' => 'Afficher @count valeur(s)',
+  'lid' => '368',
+  'translation' => 'nodereference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '235',
-  'translation' => 'en commençant à @count',
+  'lid' => '369',
+  'translation' => 'Node Reference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '236',
-  'translation' => 'Inversé (commencer à partir des dernières valeurs)',
+  'lid' => '370',
+  'translation' => 'Définit un type de champ pour référencer un noeud depuis un autre noeud.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '237',
-  'translation' => 'Tous / Toutes',
+  'lid' => '371',
+  'translation' => 'Entier',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '238',
-  'translation' => 'Delta',
+  'lid' => '372',
+  'translation' => 'Stocke un nombre dans la base de données en format entier.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '239',
-  'translation' => "Le delta vous permet de sélectionner quel élément d'un champ à valeur multiple sera la clé de la relation. Sélectionnez \"1\" pour utiliser le premier élément, \"2\" pour le second et ainsi de suite. Si vous sélectionnez \"Tous\", chaque élément du champ créera une nouvelle ligne, ce qui pourrait causer des doublons.",
+  'lid' => '373',
+  'translation' => 'Décimal',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '240',
-  'translation' => "Le delta vous permet de sélectionner quel élément d'un champ à valeur multiple sera utilisé pour les tris. Sélectionnez \"1\" pour utiliser le premier élément, \"2\" pour le second et ainsi de suite. Si vous sélectionnez \"Tous\", chaque élément du champ créera une nouvelle ligne, ce qui pourrait causer des doublons.",
+  'lid' => '374',
+  'translation' => 'Stocke un nombre dans la base de données en format décimal fixe.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '241',
-  'translation' => 'Exporter',
+  'lid' => '375',
+  'translation' => 'Réel (Float)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '242',
-  'translation' => "Ce formulaire traitera un type de contenu et un ou plusieurs champs de ce type, pour en exporter les paramètres. Le code d'export ainsi généré peut être copié et collé dans la page d'import, vers la base de données courante ou vers une autre base de données. L'opération d'import ajoutera les champs à un type de contenu existant ou créera un nouveau type de contenu intégrant les champs sélectionnés.",
+  'lid' => '376',
+  'translation' => 'Stocke un nombre dans la base de données en format réel.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '243',
-  'translation' => 'Types',
+  'lid' => '377',
+  'translation' => 'Minimum',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '244',
-  'translation' => 'Sélectionner le type de contenu à exporter.',
+  'lid' => '378',
+  'translation' => 'Maximum',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '245',
-  'translation' => 'Données exportée',
+  'lid' => '379',
+  'translation' => 'Précision',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '246',
-  'translation' => "Copiez le texte exporté et collez-le dans le type de contenu de votre choix, à l'aide de la fonction d'import.",
+  'lid' => '380',
+  'translation' => 'Le nombre total de chiffres à stocker dans la base de données, en incluant ceux à droite de la virgule.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '247',
-  'translation' => 'Types de contenu',
+  'lid' => '381',
+  'translation' => 'Echelle',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '248',
-  'translation' => 'Type de contenu',
+  'lid' => '382',
+  'translation' => 'Le nombre de chiffres à droite de la virgule',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '249',
-  'translation' => 'Séléctionnez le type de contenu dans lequel importer ces champs.<br />Sélectionnez &lt;Créer&gt; pour créer un nouveau type de contenu qui contiendra ces champs.',
+  'lid' => '383',
+  'translation' => 'Séparateur de décimales',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '250',
-  'translation' => 'Données à importer',
+  'lid' => '384',
+  'translation' => 'Le caractère que les utilisateurs saisiront pour séparer les décimales dans les formulaires.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '251',
-  'translation' => 'Collez dans ce champ le texte créé par un export de contenu.',
+  'lid' => '385',
+  'translation' => 'Préfixe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '252',
-  'translation' => 'Importer',
+  'lid' => '386',
+  'translation' => 'Définissez une chaîne de caractères à utiliser pour préfixer la valeur, par exemple $ ou €. Laissez vide pour ne rien afficher de plus. Séparez les valeurs singulier et pluriel par une barre verticale (euro|euros).',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '253',
-  'translation' => "Un fichier a été préchargé pour l'import.",
+  'lid' => '387',
+  'translation' => 'Suffixe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '254',
-  'translation' => "Les données d'import ne sont valides.",
+  'lid' => '388',
+  'translation' => 'Définissez une chaîne qui sera ajoutée en suffixe à la valeur, comme m², m/s², kb/s. Laisser vide pour aucun suffixe. Séparez les singulier et pluriel avec un pipe (mètre|mètres).',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '255',
-  'translation' => "Les modules suivants doivent être activés pour que l'import fonctionne : '%modules'.",
+  'lid' => '389',
+  'translation' => 'Valeurs autorisées',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '256',
-  'translation' => "Le type de contenu '%type' existe déjà dans cette base de données.",
+  'lid' => '390',
+  'translation' => 'Liste des valeurs autorisées',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '257',
-  'translation' => "Abandon. L'import n'a pas été réalisé.",
+  'lid' => '391',
+  'translation' => "Les valeurs possibles que ce champ peut contenir. Entrez une valeur par ligne, sous la forme clé|étiquette. La clé est une valeur qui sera stocker dans la base de données, elle doit correspondre au type de champ défini (%type). L'étiquette est optionnelle, si elle n'est pas précisée, la clé sera utilisée également comme étiquette.<br />Balises HTML autorisées : @tags",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '258',
-  'translation' => "Une erreur s'est produite lors de l'ajout du nouveau type de contenu %type.<br> Veuillez vérifier les erreurs affichées pour plus de détails.",
+  'lid' => '392',
+  'translation' => 'Pour usage avancé seulement : code PHP fournissant un tableau par clé des valeurs autorisées. Ne doit pas inclure les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, le tableau renvoyé par le code prendra le pas sur la liste des valeurs autorisées apparaissant ci-dessus.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '259',
-  'translation' => "Le champ importé '%field_label' (%field_name) n'a pas été ajouté à '%type' car ce champ existe déjà.",
+  'lid' => '393',
+  'translation' => 'Ce code PHP a été saisi par un administrateur et supplantera la liste des valeurs permises ci-dessus.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '260',
-  'translation' => "Le champ importé '%field_label' (%field_name) a été ajouté au type de contenu '%type'.",
+  'lid' => '394',
+  'translation' => '@label (!name) - Valeurs autorisées',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '261',
-  'translation' => 'content_copy',
+  'lid' => '395',
+  'translation' => '"Minimum" doit être un nombre.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '262',
-  'translation' => 'Content Copy',
+  'lid' => '396',
+  'translation' => '"Maximum" doit être un nombre.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '263',
-  'translation' => "Permet d'importer et d'exporter des définitions de champs.",
+  'lid' => '397',
+  'translation' => '%name : la valeur ne peut être inférieure à %min.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '264',
-  'translation' => "Les champs d'un groupe Standard sont indépendants les uns des autres, et chacun peut soit avoir une valeur unique, soit des valeurs multiples. Les champs d'un Multigroupe sont traités comme une ensemble répétable de champs à valeurs uniques.",
+  'lid' => '398',
+  'translation' => '%name : la valeur ne peut être supérieure à %max.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '265',
-  'translation' => 'Multigroupe',
+  'lid' => '399',
+  'translation' => '%name : valeur illégale.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '266',
-  'translation' => 'Standard',
+  'lid' => '400',
+  'translation' => 'non mis en forme',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '267',
-  'translation' => 'Type de groupe.',
+  'lid' => '401',
+  'translation' => 'Champ texte',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '268',
-  'translation' => "Le champ %field a été mis à jour pour l'utilisation de valeurs %multiple, afin de correspondre au paramètre de valeur multipe du Multigroup %group.",
+  'lid' => '402',
+  'translation' => 'Seuls les nombres et les décimaux sont autorisés dans %field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '269',
-  'translation' => "Cette modification n'est pas autorisée. Le champ %field possède déjà des valeurs multiples dans la base de données, mais le groupe %group en autorise seulement %group_max. Effectuer cette modification pourrait entraîner la perte de données. ",
+  'lid' => '403',
+  'translation' => 'Seuls les nombres sont autorisés dans %field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '270',
-  'translation' => "Cette modification n'est pas autorisée. Le champ %field manipule les valeurs multiples différemment du module Content. Effectuer cette modification pourrait entraîner la perte de données. ",
+  'lid' => '404',
+  'translation' => 'Seuls les nombres et le caractère décimal (%decimal) sont autorisés dans %field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '271',
-  'translation' => "Vous êtes en train d'inclure le champ %field dans un Multigroupe",
+  'lid' => '405',
+  'translation' => 'nombre',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '272',
-  'translation' => "Cette modification n'est pas autorisée. Le champ %field possède déjà des données créées, et utilise un widget qui stocke les données différemment dans un groupe Standard que dans un Multigroupe. Effectuer ce changement pourrait entraîner la perte de données.",
+  'lid' => '406',
+  'translation' => 'Nombre',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '273',
-  'translation' => "Vous êtes en train de retirer le champ %field d'un Multigroupe",
+  'lid' => '407',
+  'translation' => 'Définit des types de champs numériques.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '274',
-  'translation' => 'Simple',
+  'lid' => '408',
+  'translation' => "Créez une liste d'options en tant que liste dans la <strong>Liste des valeurs autorisées</strong>, ou en tant que tableau en code PHP. Ces valeurs seront les mêmes pour le champ %field au sein de tous les types de contenu.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '275',
-  'translation' => 'Groupe de champs',
+  'lid' => '409',
+  'translation' => "Pour un widget 'case à cocher oui/non', définissez la valeur 'non' en premier, puis la valeur 'oui', dans la section <strong>Valeurs autorisées</strong>. Notez que la case à cocher sera étiquetée avec l'étiquette de la valeur du 'oui'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '276',
-  'translation' => 'Ligne horizontale',
+  'lid' => '410',
+  'translation' => "Le widget 'cases à cocher/boutons radio' affichera des cases à cocher si l'option valeurs multiples est sélectionnées pour ce champ, autrement, des boutons radio seront affichés.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '277',
-  'translation' => 'Tableau - Colonne unique',
+  'lid' => '411',
+  'translation' => "Vous devez préciser les 'valeurs autorisées' pour ce champ.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '278',
-  'translation' => 'Tableau - Colonnes multiples',
+  'lid' => '412',
+  'translation' => 'Case à cocher on/off unique',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '279',
-  'translation' => '[Format du sous-groupe]',
+  'lid' => '413',
+  'translation' => '%name : ce champ ne peut contenir plus de @count valeurs.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '280',
-  'translation' => 'Paramètres multigroupe',
+  'lid' => '414',
+  'translation' => 'N/A',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '281',
-  'translation' => 'Colonnes multiples',
+  'lid' => '415',
+  'translation' => '- Aucun -',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '282',
-  'translation' => "Activez cette option pour rendre chaque champs dans une colonne disctincte sur le formulaire d'édition de noeud.",
+  'lid' => '416',
+  'translation' => 'optionwidgets',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '283',
-  'translation' => "Activez cette option pour rendre obligatoire un minimum d'une collection de champs dans ce Multigroupe.",
+  'lid' => '417',
+  'translation' => 'Option Widgets',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '284',
-  'translation' => "Nombre de fois où répéter l'ensemble Multigroupe de champs.",
+  'lid' => '418',
+  'translation' => 'Définit des widgets de liste déroulante, case à cocher et bouton radio pour des champs texte et numériques.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '285',
-  'translation' => "'Illimité' fournira un bouton 'Ajouter plus' pour que les utilisateurs puissent ajouter des éléments autant de fois qu'ils le souhaitent.",
+  'lid' => '419',
+  'translation' => 'Enregistre le texte dans la base de données.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '286',
-  'translation' => 'Tous les champs de ce groupe seront automatiquement paramétrés pour autoriser ce nombre de valeurs.',
+  'lid' => '420',
+  'translation' => 'Texte simple',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '287',
-  'translation' => 'Nombre de répétitions',
+  'lid' => '421',
+  'translation' => "Texte filtré (l'utilisateur choisit le format d'entrée)",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '288',
-  'translation' => 'Etiquettes',
+  'lid' => '422',
+  'translation' => 'Traitement du texte',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '289',
-  'translation' => "Etiquettes pour chaque sous-groupe de champs. Les étiquettes peuvent être cachées ou affichées dans des contextes divers en utilisant l'écran 'Afficher les champs'.",
+  'lid' => '423',
+  'translation' => 'Taille maximale',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '290',
-  'translation' => 'Etiquette du sous-groupe %number',
+  'lid' => '424',
+  'translation' => 'La taille maximale des champs, en caractères. Laisser vide pour ne pas limiter la taille.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '291',
-  'translation' => 'Le champ %field dans ce groupe possède déjà %multiple valeurs dans la base de données. Pour éviter la perte de données, vous ne pouvez définir le nombre de valeurs du Multigroupe à une valeur inférieure.',
+  'lid' => '425',
+  'translation' => '%name : la valeur ne doit pas dépasser %max caractères.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '292',
-  'translation' => 'Le champ !name est obligatoire dans le groupe @group.',
+  'lid' => '426',
+  'translation' => 'Par défaut',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '293',
-  'translation' => 'Le groupe @name requiert au minimum un groupe de champs.',
+  'lid' => '427',
+  'translation' => 'Coupé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '294',
-  'translation' => 'Ajouter plus de valeurs',
+  'lid' => '428',
+  'translation' => 'Zone de texte (plusieurs lignes)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '295',
-  'translation' => 'content_multigroup',
+  'lid' => '429',
+  'translation' => 'Taille du champ texte',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '296',
-  'translation' => 'Contenu Multigroupe',
+  'lid' => '430',
+  'translation' => 'Rangées',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '297',
-  'translation' => "Combinez de multiples champs CCK au sein de collections de champs qui fonctionnent à l'unisson.",
+  'lid' => '431',
+  'translation' => 'texte',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '298',
-  'translation' => 'éditer',
+  'lid' => '432',
+  'translation' => 'Définit les types de champs en texte simple.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '299',
-  'translation' => 'field_name',
+  'lid' => '433',
+  'translation' => 'Charge un utilisateur référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '300',
-  'translation' => 'voir',
+  'lid' => '434',
+  'translation' => 'Contenu contenant le champ userrefernece',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '301',
-  'translation' => 'content_permissions',
+  'lid' => '435',
+  'translation' => 'Utilisateur référencé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '302',
-  'translation' => 'Veuillez <a href="!url">configurer vos permissions sur les champs</a> immédiatement. Tous les champs sont inaccessibles par défaut.',
+  'lid' => '436',
+  'translation' => 'Noter que si le champ possède des valeurs multiples, seul le premier utilisateur sera chargé',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '303',
-  'translation' => 'Permissions sur les Contenus',
+  'lid' => '437',
+  'translation' => "Il n'y a aucun champ userreference défini",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '304',
-  'translation' => 'Définit un niveau de permission par champ pour les champs CCK.',
+  'lid' => '438',
+  'translation' => 'User reference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '305',
-  'translation' => 'Contenu du groupe de champ',
+  'lid' => '439',
+  'translation' => "Stocke l'ID d'un utilisateur lié sous forme d'entier",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '306',
-  'translation' => "Tous les champs d'un groupe de champs sur le node référencé.",
+  'lid' => '440',
+  'translation' => 'Rôles utilisateur pouvant être référencés',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '307',
-  'translation' => '@group_label (@group_type_name)',
+  'lid' => '441',
+  'translation' => 'Statuts utilisateur pouvant être référencés',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '308',
-  'translation' => 'Fieldgroup',
+  'lid' => '442',
+  'translation' => 'Actif',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '309',
-  'translation' => "Texte à afficher si un groupe n'a pas de données. Notez que le titre ne s'affichera pas sauf s'il est surclassé.",
+  'lid' => '443',
+  'translation' => 'Bloqué',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '310',
-  'translation' => '"@s" groupe de champs @name',
+  'lid' => '444',
+  'translation' => 'Avancé - Utilisateurs pouvant être référencés (Vue)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '311',
-  'translation' => 'Paramètres du formulaire',
+  'lid' => '445',
+  'translation' => 'Vue utilisée pour sélectionner les utilisateurs',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '312',
-  'translation' => "Ces paramètres s'appliquent au groupe dans le formulaire d'édition de nœud.",
+  'lid' => '446',
+  'translation' => '<p>Choisissez la vue du "module Views" qui sélectionne les utilisateurs pouvant être référencés.<br />Note :</p>',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '313',
-  'translation' => 'Style',
+  'lid' => '447',
+  'translation' => "<ul><li>Seules les vues qui possèdent des champs fonctionneront à cet effet.</li><li>Ceci annulera les paramètres \"Rôles Référençables\" et \"Statut Référençable\" ci-dessus. Utilisez la section \"filtres\" de la vue à la place.</li><li>Utilisez la section \"champs\" de la vue pour afficher des informations supplémentaires à propos des utilisateurs candidats sur le formulaire de création/édition.</li><li>Utilisez la section \"critère de tri\" de la vue pour déterminer l'ordre dans lequel les utilisateurs candidats seront affichés.</li></ul>",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '314',
-  'translation' => 'toujours déplié',
+  'lid' => '448',
+  'translation' => "<p>La liste d'utilisateurs pouvant être référencés peut s'appueyr sur une vue du \"module Views\", mais aucune vue appropriée n'a été trouvée. <br />Note :</p>",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '315',
-  'translation' => 'repliable',
+  'lid' => '449',
+  'translation' => '%name : utilisateur invalide.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '316',
-  'translation' => 'replié',
+  'lid' => '450',
+  'translation' => "Séléctionnez la méthode utilisée pour collecter les suggestions de l'autocomplétion. Notez que <em>Contient</em> peut engendrer des problèmes de performances sur des sites avec des milliers d'utilisateurs.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '317',
-  'translation' => "Instructions à présenter à l'utilisateur dans le formulaire d'édition.",
+  'lid' => '451',
+  'translation' => 'Lien retour',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '318',
-  'translation' => "Paramètres d'affichage",
+  'lid' => '452',
+  'translation' => "Si cette option est sélectionnée, un lien réciproque vers le nœud référençant sera affiché dans l'enregistrement utilisateur référencé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '319',
-  'translation' => "Ces paramètres s'appliquent au groupe à l'affichage du nœud.",
+  'lid' => '453',
+  'translation' => "%name : nous n'avons pas trouvé d'utilisateur valide pour ce nom.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '320',
-  'translation' => 'Description du groupe.',
+  'lid' => '454',
+  'translation' => 'Contenu lié',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '321',
-  'translation' => "Êtes-vous sûr(e) de vouloir supprimer le groupe '%label' ?",
+  'lid' => '455',
+  'translation' => 'Autocomplétion Userreference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '322',
-  'translation' => 'Cette action est irréversible.',
+  'lid' => '456',
+  'translation' => 'userreference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '323',
-  'translation' => "Le groupe '%group_name' a été supprimé.",
+  'lid' => '457',
+  'translation' => 'User Reference',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '324',
-  'translation' => 'aucun',
+  'lid' => '458',
+  'translation' => 'Définit un type de champ pour référencer un utilisateur depuis un noeud.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '325',
-  'translation' => 'Vous devez fournir une étiquette.',
+  'lid' => '459',
+  'translation' => 'Poids',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '326',
-  'translation' => 'Vous devez fournir un nom de groupe',
+  'lid' => '460',
+  'translation' => 'Ajouter',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '327',
-  'translation' => "Le nom de groupe %group_name n'est pas valide. Le nom ne doit contenir que des lettres sans accents, des nombres, et des underscores.",
+  'lid' => '461',
+  'translation' => 'Nouveau champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '328',
-  'translation' => "Le nom de groupe %group_name est trop long. Le nom est limité à 32 caractères, le préfixe 'group_' compris.",
+  'lid' => '462',
+  'translation' => 'Champ existant',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '329',
-  'translation' => 'Le nom de groupe %group_name existe déjà.',
+  'lid' => '463',
+  'translation' => 'Nouveau groupe',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '330',
-  'translation' => 'Ajouter un nouveau groupe :',
+  'lid' => '464',
+  'translation' => "Ajouter des champs et des groupes au type de contenu, et les paramétrer pour l'affichage du contenu et les formulaires de saisie.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '331',
-  'translation' => 'Ajouter un nouveau groupe : vous devez fournir une étiquette.',
+  'lid' => '465',
+  'translation' => 'Vous pouvez ajouter un champ à un groupe en le faisant glisser ci-dessous et à la droite du groupe.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '332',
-  'translation' => 'Ajouter un nouveau groupe : vous devez fournir un nom de groupe.',
+  'lid' => '466',
+  'translation' => "Note : l'installation du module <a href=\"!adv_help\">Aide avancée (Advanced help)</a> vous permettra d'accéder à plus d'aide, et de meilleure qualité.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '333',
-  'translation' => 'Groupe standard',
+  'lid' => '467',
+  'translation' => "Utiliser la case à cocher 'Exclure' pour exclure un élément de la valeur de !content transmis au gabarit du node.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '334',
-  'translation' => 'Éditer le groupe',
+  'lid' => '468',
+  'translation' => 'Supprimer cet élément',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '335',
-  'translation' => 'fieldgroup',
+  'lid' => '469',
+  'translation' => 'Ajouter un champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '336',
-  'translation' => "Créée des groupes d'affichage pour les champs CCK.",
+  'lid' => '470',
+  'translation' => "Valeur illégale pour le champ '%name'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '337',
-  'translation' => 'Charge un noeud référencé',
+  'lid' => '471',
+  'translation' => "La longueur de '%label' dépasse %max caractères.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '338',
-  'translation' => 'Contenu contenant le champ node reference',
+  'lid' => '472',
+  'translation' => "Le champ 'Rangées' doit être un entier positif.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '339',
-  'translation' => 'Contenu référencé',
+  'lid' => '473',
+  'translation' => "Les valeurs que ce champ peut contenir. Saisissez une valeur par ligne, au format clé|libellé. La clé est la valeur qui sera enregistrée dans la base de données et elle doit correspondre au type définit pour le champ dans la base, '%type'. Le libellé est optionnel et, si aucune valeur n'est spécifiée, la clé sera utilisée comme libellé.<br />Balises HTML autorisées : @tags",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '340',
-  'translation' => 'Notez que si le champs possède des valeurs multiples, seul le premier contenu sera chargé.',
+  'lid' => '474',
+  'translation' => 'ajouter un champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '341',
-  'translation' => "Il n'y a aucun champ  nodereference défini.",
+  'lid' => '475',
+  'translation' => "Il n'y a aucun champ configuré pour ce type de contenu. Vous pouvez néanmoins dès maintenant !link.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '342',
-  'translation' => 'Node référence',
+  'lid' => '476',
+  'translation' => 'ajouter un nouveau champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '343',
-  'translation' => "Stocker l'ID du noeud lié en tant que valeur entière.",
+  'lid' => '477',
+  'translation' => "Pour changer l'ordre d'un champ, utilisez la poignée qui figure sous la colonne Étiquette et faites glisser le champ jusqu'à l'emplacement désiré. Pour manipuler la poignée (l'icône en forme de croix), cliquez sur l'icône et maintenez enfoncé le bouton de la souris. N'oubliez pas que vos modifications ne seront prises en compte que lorsque vous aurez cliqué sur le bouton <em>Enregistrer</em> qui figure en base de page.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
-->values(array(
-  'lid' => '344',
-  'translation' => 'Types de contenu pouvant être référencés',
+->values(array(
+  'lid' => '478',
+  'translation' => "Aucun module de champs n'est activé. Vous devez en <a href=\"!modules_url\">activer un</a>, par exemple le module Text, avant de pouvoir ajouter des champs.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '345',
-  'translation' => 'Vues par défaut',
+  'lid' => '479',
+  'translation' => 'Ajouter un champ existant',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '346',
-  'translation' => 'Vues éxistantes',
+  'lid' => '480',
+  'translation' => 'Créer un nouveau champ',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '347',
-  'translation' => 'Avancé - Nœuds pouvant être référencés (Vue)',
+  'lid' => '481',
+  'translation' => 'Nom du champ, lisible par une machine.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '348',
-  'translation' => 'Vue utilisée pour sélectionner les noeuds',
+  'lid' => '482',
+  'translation' => ' Ce nom ne peut être modifié.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '349',
-  'translation' => '<p>Choisissez la vue du "module Views" qui sélectionne les noeuds pouvant être référencés.<br />Note :</p>',
+  'lid' => '483',
+  'translation' => " Ce nom ne pourra pas être modifié par la suite ! Le nom sera préfixé par 'field_' et peut inclure des lettres minuscules non accentués, des nombres et des caractères \"espace souligné\". La longueur du nom, y compris le préfixe, est limitée à un total de 32 caractères.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '350',
-  'translation' => "<ul><li>Seules les vues qui possèdent des champs fonctionneront à cet effet.</li><li>Ceci annulera les paramètres \"Types de contenu\" ci-dessus. Utilisez la section \"filtres\" de la vue à la place.</li><li>Utilisez la section \"champs\" de la vue pour afficher des informations supplémentaires à propos des noeuds candidats sur le formulaire de création/édition.</li><li>Utilisez la section \"critère de tri\" de la vue pour déterminer l'ordre dans lequel les noeuds candidats seront affichés.</li></ul>",
+  'lid' => '484',
+  'translation' => 'Type de données que vous souhaitez enregistrer, par le biais de ce champ, dans la base de données.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '351',
-  'translation' => 'Arguments de la vue',
+  'lid' => '485',
+  'translation' => "Le nom de champ '%field_name' est invalide. Le nom ne doit comporter que des lettres minuscules non accentuées, des nombres ou des espaces soulignés.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '352',
-  'translation' => "Fournit une liste d'arguments, séparés par des virgules, à transmettre à la vue.",
+  'lid' => '486',
+  'translation' => "Le nom de champ '%field_name' est trop long. La longueur du nom est limitée à 32 caractères, y compris le préfixe 'field_'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '353',
-  'translation' => "<p>La liste des noeuds pouvant être référencés peut s'appuyer sur une vue du \"module Views\" mais aucune vue appropriée n'a été trouvée. <br />Note :</p>",
+  'lid' => '487',
+  'translation' => "Le nom de champ '%field_name' existe déjà.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '354',
-  'translation' => '%name : saisie non valide.',
+  'lid' => '488',
+  'translation' => "Le nom 'field_instance' est un nom réservé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '355',
-  'translation' => '%name : ce contenu ne peut être référencé.',
+  'lid' => '489',
+  'translation' => "Le champ '%label' a été créé.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '356',
-  'translation' => 'Titre (avec lien)',
+  'lid' => '490',
+  'translation' => "Mettre à jour le champ '%label'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '357',
-  'translation' => 'Titre (sans lien)',
+  'lid' => '491',
+  'translation' => "Un problème est survenu à la mise à jour du champ '%label'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '358',
-  'translation' => 'Liste de sélection',
+  'lid' => '492',
+  'translation' => "Réservé à une utilisation avancée : code PHP renvoyant la valeur par défaut du champ. Ne doit pas inclure les délimiteurs &lt;?php ?&gt;. Si ce champ est renseigné, la valeur renvoyée par le code supplante toute valeur indiquée ci-desus. Format attendu : <pre>!sample</pre> Vous pouvez utiliser l'onglet 'devel load' du module !link_devel sur un nœud de type '%type' pour mieux comprendre le format attendu.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '359',
-  'translation' => 'Cases à cocher/boutons radio',
+  'lid' => '493',
+  'translation' => "Choisissez un nombre de valeurs pour ce champ, ou 'Illimité' pour proposer un bouton 'Ajouter' aux utilisateurs, de sorte qu'ils peuvent insérer autant de valeurs qu'ils le souhaitent.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '360',
-  'translation' => 'Champ texte à auto-complètement',
+  'lid' => '494',
+  'translation' => 'Le code PHP de valeur par défaut a créé @value, qui est invalide.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '361',
-  'translation' => "Correspondance de l'autocomplétion",
+  'lid' => '495',
+  'translation' => 'Lien HTML mis en forme vers le nœud',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '362',
-  'translation' => 'Commence par',
+  'lid' => '496',
+  'translation' => "La valeur de '%name 'ne peut être plus petite que %min.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '363',
-  'translation' => 'Contient',
+  'lid' => '497',
+  'translation' => "La valeur de '%name' ne peut pas être plus grande que %max.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '364',
-  'translation' => "Séléctionnez la méthode utilisée pour collecter les suggestions de l'autocomplétion. Notez que <em>Contient</em> peut engendrer des problèmes de performances sur des sites avec des milliers de noeuds",
+  'lid' => '498',
+  'translation' => "Seuls des nombres et des décimaux sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '365',
-  'translation' => '%name : différence de titre. Veuillez vérifier votre sélection.',
+  'lid' => '499',
+  'translation' => "Seuls des nombres sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '366',
-  'translation' => "%name : aucun contenu valide n'a été trouvé pour ce titre.",
+  'lid' => '500',
+  'translation' => "Seuls des nombres et le marqueur décimal (%decimal) sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '367',
-  'translation' => 'Autocomplétion de nodereference',
+  'lid' => '501',
+  'translation' => "Créez une liste d'options en tant que liste dans les <strong>Valeurs permises</strong> ou en tant que tableau dans le code PHP. Ces valeurs seront identiques pour '%field' dans tous les types de contenus.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '368',
-  'translation' => 'nodereference',
+  'lid' => '504',
+  'translation' => 'fr - Favorite color',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '369',
-  'translation' => 'Node Reference',
+  'lid' => '505',
+  'translation' => 'Inscrivez votre couleur préférée',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '370',
-  'translation' => 'Définit un type de champ pour référencer un noeud depuis un autre noeud.',
+  'lid' => '506',
+  'translation' => 'fr - Personal information',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '371',
-  'translation' => 'Entier',
+  'lid' => '507',
+  'translation' => 'fr - Biography',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '372',
-  'translation' => 'Stocke un nombre dans la base de données en format entier.',
+  'lid' => '508',
+  'translation' => 'fr - Tell people a little bit about yourself',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '373',
-  'translation' => 'Décimal',
+  'lid' => '509',
+  'translation' => 'fr - Sell your email address?',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '374',
-  'translation' => 'Stocke un nombre dans la base de données en format décimal fixe.',
+  'lid' => '510',
+  'translation' => "fr - If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '375',
-  'translation' => 'Réel (Float)',
+  'lid' => '511',
+  'translation' => 'fr - Communication preferences',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '376',
-  'translation' => 'Stocke un nombre dans la base de données en format réel.',
+  'lid' => '512',
+  'translation' => 'fr - Sales Category',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '377',
-  'translation' => 'Minimum',
+  'lid' => '513',
+  'translation' => "fr - Select the sales categories to which this user's address was sold.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '378',
-  'translation' => 'Maximum',
+  'lid' => '514',
+  'translation' => 'fr - Pill spammers Fitness spammers Back\slash Forward/slash Dot.in.the.middle',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '379',
-  'translation' => 'Précision',
+  'lid' => '515',
+  'translation' => 'fr - Administrative data',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '380',
-  'translation' => 'Le nombre total de chiffres à stocker dans la base de données, en incluant ceux à droite de la virgule.',
+  'lid' => '516',
+  'translation' => 'Mes groupes préférés',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '381',
-  'translation' => 'Echelle',
+  'lid' => '517',
+  'translation' => "fr - Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '382',
-  'translation' => 'Le nombre de chiffres à droite de la virgule',
+  'lid' => '518',
+  'translation' => 'fr - Birthdate',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '383',
-  'translation' => 'Séparateur de décimales',
+  'lid' => '519',
+  'translation' => "fr - Enter your birth date and we'll send you a coupon.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '384',
-  'translation' => 'Le caractère que les utilisateurs saisiront pour séparer les décimales dans les formulaires.',
+  'lid' => '520',
+  'translation' => "J'aime les migrations",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '385',
-  'translation' => 'Préfixe',
+  'lid' => '521',
+  'translation' => 'Si vous cochez cette case, vous aimez les migrations.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '386',
-  'translation' => 'Définissez une chaîne de caractères à utiliser pour préfixer la valeur, par exemple $ ou €. Laissez vide pour ne rien afficher de plus. Séparez les valeurs singulier et pluriel par une barre verticale (euro|euros).',
+  'lid' => '522',
+  'translation' => 'fr - Blog',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '387',
-  'translation' => 'Suffixe',
+  'lid' => '523',
+  'translation' => 'fr - Paste the full URL, including http://, of your personal blog.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '388',
-  'translation' => 'Définissez une chaîne qui sera ajoutée en suffixe à la valeur, comme m², m/s², kb/s. Laisser vide pour aucun suffixe. Séparez les singulier et pluriel avec un pipe (mètre|mètres).',
+  'lid' => '524',
+  'translation' => 'fr - Static Block',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '389',
-  'translation' => 'Valeurs autorisées',
+  'lid' => '525',
+  'translation' => '<h3>fr - My first custom block body</h3>',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '390',
-  'translation' => 'Liste des valeurs autorisées',
+  'lid' => '526',
+  'translation' => 'Encore un bloc statique',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '391',
-  'translation' => "Les valeurs possibles que ce champ peut contenir. Entrez une valeur par ligne, sous la forme clé|étiquette. La clé est une valeur qui sera stocker dans la base de données, elle doit correspondre au type de champ défini (%type). L'étiquette est optionnelle, si elle n'est pas précisée, la clé sera utilisée également comme étiquette.<br />Balises HTML autorisées : @tags",
+  'lid' => '527',
+  'translation' => 'Nom de vocabulaire beaucoup plus long que trente-deux caractères',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '392',
-  'translation' => 'Pour usage avancé seulement : code PHP fournissant un tableau par clé des valeurs autorisées. Ne doit pas inclure les délimiteurs &lt;?php ?&gt;. Si ce champ est rempli, le tableau renvoyé par le code prendra le pas sur la liste des valeurs autorisées apparaissant ci-dessus.',
+  'lid' => '528',
+  'translation' => 'fr - Tags',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '393',
-  'translation' => 'Ce code PHP a été saisi par un administrateur et supplantera la liste des valeurs permises ci-dessus.',
+  'lid' => '529',
+  'translation' => 'fr - vocabulary 1 (i=0)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '394',
-  'translation' => '@label (!name) - Valeurs autorisées',
+  'lid' => '530',
+  'translation' => 'fr - vocabulary 2 (i=1)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '395',
-  'translation' => '"Minimum" doit être un nombre.',
+  'lid' => '531',
+  'translation' => 'fr - vocabulary 3 (i=2)',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '396',
-  'translation' => '"Maximum" doit être un nombre.',
+  'lid' => '532',
+  'translation' => 'Nom de vocabulaire beaucoup plus long que trente-deux caractères',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '397',
-  'translation' => '%name : la valeur ne peut être inférieure à %min.',
+  'lid' => '533',
+  'translation' => 'fr - Article',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '398',
-  'translation' => '%name : la valeur ne peut être supérieure à %max.',
+  'lid' => '534',
+  'translation' => 'fr - Title',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '399',
-  'translation' => '%name : valeur illégale.',
+  'lid' => '535',
+  'translation' => 'fr - Body',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '400',
-  'translation' => 'non mis en forme',
+  'lid' => '536',
+  'translation' => 'fr - An <em>article</em>, content type.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '401',
-  'translation' => 'Champ texte',
+  'lid' => '537',
+  'translation' => 'fr - Company',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '402',
-  'translation' => 'Seuls les nombres et les décimaux sont autorisés dans %field.',
+  'lid' => '538',
+  'translation' => 'fr - Name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '403',
-  'translation' => 'Seuls les nombres sont autorisés dans %field.',
+  'lid' => '539',
+  'translation' => 'fr - Description',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '404',
-  'translation' => 'Seuls les nombres et le caractère décimal (%decimal) sont autorisés dans %field.',
+  'lid' => '540',
+  'translation' => 'fr - Company node type',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '405',
-  'translation' => 'nombre',
+  'lid' => '541',
+  'translation' => 'fr - Employee',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '406',
-  'translation' => 'Nombre',
+  'lid' => '542',
+  'translation' => 'fr - Name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '407',
-  'translation' => 'Définit des types de champs numériques.',
+  'lid' => '543',
+  'translation' => 'fr - Bio',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '408',
-  'translation' => "Créez une liste d'options en tant que liste dans la <strong>Liste des valeurs autorisées</strong>, ou en tant que tableau en code PHP. Ces valeurs seront les mêmes pour le champ %field au sein de tous les types de contenu.",
+  'lid' => '544',
+  'translation' => 'fr - Employee node type',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '409',
-  'translation' => "Pour un widget 'case à cocher oui/non', définissez la valeur 'non' en premier, puis la valeur 'oui', dans la section <strong>Valeurs autorisées</strong>. Notez que la case à cocher sera étiquetée avec l'étiquette de la valeur du 'oui'.",
+  'lid' => '545',
+  'translation' => 'fr - Sponsor',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '410',
-  'translation' => "Le widget 'cases à cocher/boutons radio' affichera des cases à cocher si l'option valeurs multiples est sélectionnées pour ce champ, autrement, des boutons radio seront affichés.",
+  'lid' => '546',
+  'translation' => 'fr - Name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '411',
-  'translation' => "Vous devez préciser les 'valeurs autorisées' pour ce champ.",
+  'lid' => '547',
+  'translation' => 'fr - Body',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '412',
-  'translation' => 'Case à cocher on/off unique',
+  'lid' => '548',
+  'translation' => 'fr - Sponsor node type',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '413',
-  'translation' => '%name : ce champ ne peut contenir plus de @count valeurs.',
+  'lid' => '549',
+  'translation' => 'fr - Story',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '414',
-  'translation' => 'N/A',
+  'lid' => '550',
+  'translation' => 'fr - Title',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '415',
-  'translation' => '- Aucun -',
+  'lid' => '551',
+  'translation' => 'fr - Body',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '416',
-  'translation' => 'optionwidgets',
+  'lid' => '552',
+  'translation' => "fr - A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '417',
-  'translation' => 'Option Widgets',
+  'lid' => '553',
+  'translation' => 'fr - Migrate test event',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '418',
-  'translation' => 'Définit des widgets de liste déroulante, case à cocher et bouton radio pour des champs texte et numériques.',
+  'lid' => '554',
+  'translation' => 'fr - Event Name',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '419',
-  'translation' => 'Enregistre le texte dans la base de données.',
+  'lid' => '555',
+  'translation' => 'fr - Body',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '420',
-  'translation' => 'Texte simple',
+  'lid' => '556',
+  'translation' => 'fr - test event description here',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '421',
-  'translation' => "Texte filtré (l'utilisateur choisit le format d'entrée)",
+  'lid' => '558',
+  'translation' => 'fr - Migrate test page',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '422',
-  'translation' => 'Traitement du texte',
+  'lid' => '559',
+  'translation' => 'fr - Title',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '423',
-  'translation' => 'Taille maximale',
+  'lid' => '560',
+  'translation' => 'fr - This is the body field label',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '424',
-  'translation' => 'La taille maximale des champs, en caractères. Laisser vide pour ne pas limiter la taille.',
+  'lid' => '561',
+  'translation' => "fr - A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '425',
-  'translation' => '%name : la valeur ne doit pas dépasser %max caractères.',
+  'lid' => '562',
+  'translation' => 'fr - Migrate test planet',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '426',
-  'translation' => 'Par défaut',
+  'lid' => '563',
+  'translation' => 'fr - Title',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '427',
-  'translation' => 'Coupé',
+  'lid' => '564',
+  'translation' => 'fr - Body',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '428',
-  'translation' => 'Zone de texte (plusieurs lignes)',
+  'lid' => '565',
+  'translation' => "fr - A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '429',
-  'translation' => 'Taille du champ texte',
+  'lid' => '566',
+  'translation' => 'Migrer histoire de test',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '430',
-  'translation' => 'Rangées',
+  'lid' => '567',
+  'translation' => 'Titre',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '431',
-  'translation' => 'texte',
+  'lid' => '568',
+  'translation' => 'Le corps',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '432',
-  'translation' => 'Définit les types de champs en texte simple.',
+  'lid' => '569',
+  'translation' => "A histoire, de forme semblable à un page, est idéal pour la création et l'affichage du contenu qui informe et pousse les visiteurs du site. Communiqués de presse, des annonces du site, et les entrées de blog comme informels peuvent être créés avec un histoire entrée. Par défaut, un histoire entrée est automatiquement présenté sur la page d'accueil initiale du site, et offre la possibilité de poster des commentaires.",
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '433',
-  'translation' => 'Charge un utilisateur référencé',
+  'lid' => '570',
+  'translation' => 'fr - Text Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '434',
-  'translation' => 'Contenu contenant le champ userrefernece',
+  'lid' => '571',
+  'translation' => 'fr - An example text field without exclude.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '435',
-  'translation' => 'Utilisateur référencé',
+  'lid' => '572',
+  'translation' => 'fr - Integer Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '436',
-  'translation' => 'Noter que si le champ possède des valeurs multiples, seul le premier utilisateur sera chargé',
+  'lid' => '573',
+  'translation' => 'fr - An example integer field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '437',
-  'translation' => "Il n'y a aucun champ userreference défini",
+  'lid' => '574',
+  'translation' => 'fr - Text Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '438',
-  'translation' => 'User reference',
+  'lid' => '575',
+  'translation' => 'fr -  An example text field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '439',
-  'translation' => "Stocke l'ID d'un utilisateur lié sous forme d'entier",
+  'lid' => '576',
+  'translation' => 'fr - Decimal Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '440',
-  'translation' => 'Rôles utilisateur pouvant être référencés',
+  'lid' => '577',
+  'translation' => 'fr - An example decimal field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '441',
-  'translation' => 'Statuts utilisateur pouvant être référencés',
+  'lid' => '578',
+  'translation' => 'fr - Float Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '442',
-  'translation' => 'Actif',
+  'lid' => '579',
+  'translation' => 'fr - An example float field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '443',
-  'translation' => 'Bloqué',
+  'lid' => '580',
+  'translation' => 'fr - Integer Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '444',
-  'translation' => 'Avancé - Utilisateurs pouvant être référencés (Vue)',
+  'lid' => '581',
+  'translation' => 'fr - An example integer field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '445',
-  'translation' => 'Vue utilisée pour sélectionner les utilisateurs',
+  'lid' => '582',
+  'translation' => 'fr - Integer Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '446',
-  'translation' => '<p>Choisissez la vue du "module Views" qui sélectionne les utilisateurs pouvant être référencés.<br />Note :</p>',
+  'lid' => '583',
+  'translation' => 'fr - An example integer field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
-->values(array(
-  'lid' => '447',
-  'translation' => "<ul><li>Seules les vues qui possèdent des champs fonctionneront à cet effet.</li><li>Ceci annulera les paramètres \"Rôles Référençables\" et \"Statut Référençable\" ci-dessus. Utilisez la section \"filtres\" de la vue à la place.</li><li>Utilisez la section \"champs\" de la vue pour afficher des informations supplémentaires à propos des utilisateurs candidats sur le formulaire de création/édition.</li><li>Utilisez la section \"critère de tri\" de la vue pour déterminer l'ordre dans lequel les utilisateurs candidats seront affichés.</li></ul>",
+->values(array(
+  'lid' => '584',
+  'translation' => 'fr - Email Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '448',
-  'translation' => "<p>La liste d'utilisateurs pouvant être référencés peut s'appueyr sur une vue du \"module Views\", mais aucune vue appropriée n'a été trouvée. <br />Note :</p>",
+  'lid' => '585',
+  'translation' => 'fr - An example email field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '449',
-  'translation' => '%name : utilisateur invalide.',
+  'lid' => '586',
+  'translation' => 'fr - Link Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '450',
-  'translation' => "Séléctionnez la méthode utilisée pour collecter les suggestions de l'autocomplétion. Notez que <em>Contient</em> peut engendrer des problèmes de performances sur des sites avec des milliers d'utilisateurs.",
+  'lid' => '587',
+  'translation' => 'fr - An example link field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '451',
-  'translation' => 'Lien retour',
+  'lid' => '588',
+  'translation' => 'fr - File Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '452',
-  'translation' => "Si cette option est sélectionnée, un lien réciproque vers le nœud référençant sera affiché dans l'enregistrement utilisateur référencé.",
+  'lid' => '589',
+  'translation' => 'fr - An example image field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '453',
-  'translation' => "%name : nous n'avons pas trouvé d'utilisateur valide pour ce nom.",
+  'lid' => '590',
+  'translation' => 'fr - Image Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '454',
-  'translation' => 'Contenu lié',
+  'lid' => '591',
+  'translation' => 'fr - An example image field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '455',
-  'translation' => 'Autocomplétion Userreference',
+  'lid' => '592',
+  'translation' => 'fr - Date Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '456',
-  'translation' => 'userreference',
+  'lid' => '593',
+  'translation' => 'fr - An example date field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '457',
-  'translation' => 'User Reference',
+  'lid' => '594',
+  'translation' => 'fr - Date Stamp Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '458',
-  'translation' => 'Définit un type de champ pour référencer un utilisateur depuis un noeud.',
+  'lid' => '595',
+  'translation' => 'fr - An example date stamp field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '459',
-  'translation' => 'Poids',
+  'lid' => '596',
+  'translation' => 'fr - Datetime Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '460',
-  'translation' => 'Ajouter',
+  'lid' => '597',
+  'translation' => 'fr - An example datetime field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '461',
-  'translation' => 'Nouveau champ',
+  'lid' => '598',
+  'translation' => 'fr - Phone Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '462',
-  'translation' => 'Champ existant',
+  'lid' => '599',
+  'translation' => 'fr - An example phone field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '463',
-  'translation' => 'Nouveau groupe',
+  'lid' => '600',
+  'translation' => 'fr - Decimal Radio Buttons Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '464',
-  'translation' => "Ajouter des champs et des groupes au type de contenu, et les paramétrer pour l'affichage du contenu et les formulaires de saisie.",
+  'lid' => '601',
+  'translation' => 'fr - An example decimal field using radio buttons.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '465',
-  'translation' => 'Vous pouvez ajouter un champ à un groupe en le faisant glisser ci-dessous et à la droite du groupe.',
+  'lid' => '604',
+  'translation' => 'fr - Float Single Checkbox Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '466',
-  'translation' => "Note : l'installation du module <a href=\"!adv_help\">Aide avancée (Advanced help)</a> vous permettra d'accéder à plus d'aide, et de meilleure qualité.",
+  'lid' => '605',
+  'translation' => 'fr - An example float field using a single on/off checkbox.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '467',
-  'translation' => "Utiliser la case à cocher 'Exclure' pour exclure un élément de la valeur de !content transmis au gabarit du node.",
+  'lid' => '608',
+  'translation' => 'fr - Integer Select List Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '468',
-  'translation' => 'Supprimer cet élément',
+  'lid' => '609',
+  'translation' => 'fr - An example integer field using a select list.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '469',
-  'translation' => 'Ajouter un champ',
+  'lid' => '614',
+  'translation' => 'fr - Text Single Checkbox Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '470',
-  'translation' => "Valeur illégale pour le champ '%name'.",
+  'lid' => '615',
+  'translation' => 'fr - An example text field using a single on/off checkbox.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '471',
-  'translation' => "La longueur de '%label' dépasse %max caractères.",
+  'lid' => '616',
+  'translation' => 'fr - Hello',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '472',
-  'translation' => "Le champ 'Rangées' doit être un entier positif.",
+  'lid' => '617',
+  'translation' => 'fr - Goodbye',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '473',
-  'translation' => "Les valeurs que ce champ peut contenir. Saisissez une valeur par ligne, au format clé|libellé. La clé est la valeur qui sera enregistrée dans la base de données et elle doit correspondre au type définit pour le champ dans la base, '%type'. Le libellé est optionnel et, si aucune valeur n'est spécifiée, la clé sera utilisée comme libellé.<br />Balises HTML autorisées : @tags",
+  'lid' => '618',
+  'translation' => 'fr - Text Single Checkbox Field 2',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '474',
-  'translation' => 'ajouter un champ',
+  'lid' => '619',
+  'translation' => 'fr - Checkbox that uses keys only and no label.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '475',
-  'translation' => "Il n'y a aucun champ configuré pour ce type de contenu. Vous pouvez néanmoins dès maintenant !link.",
+  'lid' => '620',
+  'translation' => 'fr - Off',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '476',
-  'translation' => 'ajouter un nouveau champ',
+  'lid' => '621',
+  'translation' => 'fr - Hello',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '477',
-  'translation' => "Pour changer l'ordre d'un champ, utilisez la poignée qui figure sous la colonne Étiquette et faites glisser le champ jusqu'à l'emplacement désiré. Pour manipuler la poignée (l'icône en forme de croix), cliquez sur l'icône et maintenez enfoncé le bouton de la souris. N'oubliez pas que vos modifications ne seront prises en compte que lorsque vous aurez cliqué sur le bouton <em>Enregistrer</em> qui figure en base de page.",
+  'lid' => '622',
+  'translation' => 'Champ de texte',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '478',
-  'translation' => "Aucun module de champs n'est activé. Vous devez en <a href=\"!modules_url\">activer un</a>, par exemple le module Text, avant de pouvoir ajouter des champs.",
+  'lid' => '623',
+  'translation' => 'fr - An example text field.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '479',
-  'translation' => 'Ajouter un champ existant',
+  'lid' => '624',
+  'translation' => 'fr - Decimal Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '480',
-  'translation' => 'Créer un nouveau champ',
+  'lid' => '625',
+  'translation' => 'Un exemple plusieurs valeurs champ décimal.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '481',
-  'translation' => 'Nom du champ, lisible par une machine.',
+  'lid' => '626',
+  'translation' => 'fr - Text Single Checkbox Field',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '482',
-  'translation' => ' Ce nom ne peut être modifié.',
+  'lid' => '627',
+  'translation' => 'fr - An example text field using a single on/off checkbox.',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '483',
-  'translation' => " Ce nom ne pourra pas être modifié par la suite ! Le nom sera préfixé par 'field_' et peut inclure des lettres minuscules non accentués, des nombres et des caractères \"espace souligné\". La longueur du nom, y compris le préfixe, est limitée à un total de 32 caractères.",
+  'lid' => '633',
+  'translation' => 'fr - Drupal.org',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '484',
-  'translation' => 'Type de données que vous souhaitez enregistrer, par le biais de ce champ, dans la base de données.',
+  'lid' => '634',
+  'translation' => 'fr - Test 2',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '485',
-  'translation' => "Le nom de champ '%field_name' est invalide. Le nom ne doit comporter que des lettres minuscules non accentuées, des nombres ou des espaces soulignés.",
+  'lid' => '635',
+  'translation' => 'fr - Test menu link 2',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '486',
-  'translation' => "Le nom de champ '%field_name' est trop long. La longueur du nom est limitée à 32 caractères, y compris le préfixe 'field_'.",
+  'lid' => '663',
+  'translation' => 'fr - Content management',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '487',
-  'translation' => "Le nom de champ '%field_name' existe déjà.",
+  'lid' => '1254',
+  'translation' => 'fr - Modules',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '488',
-  'translation' => "Le nom 'field_instance' est un nom réservé.",
+  'lid' => '1264',
+  'translation' => 'fr - By task',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '489',
-  'translation' => "Le champ '%label' a été créé.",
+  'lid' => '1265',
+  'translation' => 'fr - By module',
   'language' => 'fr',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '490',
-  'translation' => "Mettre à jour le champ '%label'.",
-  'language' => 'fr',
+  'lid' => '66',
+  'translation' => 'zu - CCK - Aucune Intégration aux Vues',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '491',
-  'translation' => "Un problème est survenu à la mise à jour du champ '%label'.",
-  'language' => 'fr',
+  'lid' => '506',
+  'translation' => 'zu - Personal information',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '492',
-  'translation' => "Réservé à une utilisation avancée : code PHP renvoyant la valeur par défaut du champ. Ne doit pas inclure les délimiteurs &lt;?php ?&gt;. Si ce champ est renseigné, la valeur renvoyée par le code supplante toute valeur indiquée ci-desus. Format attendu : <pre>!sample</pre> Vous pouvez utiliser l'onglet 'devel load' du module !link_devel sur un nœud de type '%type' pour mieux comprendre le format attendu.",
-  'language' => 'fr',
+  'lid' => '512',
+  'translation' => 'zu - Sales Category',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '493',
-  'translation' => "Choisissez un nombre de valeurs pour ce champ, ou 'Illimité' pour proposer un bouton 'Ajouter' aux utilisateurs, de sorte qu'ils peuvent insérer autant de valeurs qu'ils le souhaitent.",
-  'language' => 'fr',
+  'lid' => '513',
+  'translation' => "zu - Select the sales categories to which this user's address was sold.",
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '494',
-  'translation' => 'Le code PHP de valeur par défaut a créé @value, qui est invalide.',
-  'language' => 'fr',
+  'lid' => '514',
+  'translation' => 'zu - Pill spammers Fitness spammers Back\slash Forward/slash Dot.in.the.middle',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '495',
-  'translation' => 'Lien HTML mis en forme vers le nœud',
-  'language' => 'fr',
+  'lid' => '525',
+  'translation' => '<h3>zu - My first custom block body</h3>',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '496',
-  'translation' => "La valeur de '%name 'ne peut être plus petite que %min.",
-  'language' => 'fr',
+  'lid' => '529',
+  'translation' => 'zu - vocabulary 1 (i=0)',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '497',
-  'translation' => "La valeur de '%name' ne peut pas être plus grande que %max.",
-  'language' => 'fr',
+  'lid' => '535',
+  'translation' => 'zu - Body',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '498',
-  'translation' => "Seuls des nombres et des décimaux sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
-  'language' => 'fr',
+  'lid' => '590',
+  'translation' => 'zu - Image Field',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '499',
-  'translation' => "Seuls des nombres sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
-  'language' => 'fr',
+  'lid' => '591',
+  'translation' => 'zu - An example image field.',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '500',
-  'translation' => "Seuls des nombres et le marqueur décimal (%decimal) sont autorisés dans '%field'. La valeur saisie, '%start', a été modifié en '%value'.",
-  'language' => 'fr',
+  'lid' => '621',
+  'translation' => 'zu - Hello',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->values(array(
-  'lid' => '501',
-  'translation' => "Créez une liste d'options en tant que liste dans les <strong>Valeurs permises</strong> ou en tant que tableau dans le code PHP. Ces valeurs seront identiques pour '%field' dans tous les types de contenus.",
-  'language' => 'fr',
+  'lid' => '635',
+  'translation' => 'zu - Test menu link 2',
+  'language' => 'zu',
   'plid' => '0',
   'plural' => '0',
+  'i18n_status' => '0',
 ))
 ->execute();
 
@@ -20019,11 +31276,146 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '361',
-  'plid' => '357',
-  'link_path' => 'admin/content/aggregator/edit/feed/%',
-  'router_path' => 'admin/content/aggregator/edit/feed/%',
-  'link_title' => 'Edit feed',
+  'mlid' => '361',
+  'plid' => '357',
+  'link_path' => 'admin/content/aggregator/edit/feed/%',
+  'router_path' => 'admin/content/aggregator/edit/feed/%',
+  'link_title' => 'Edit feed',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '144',
+  'p2' => '157',
+  'p3' => '357',
+  'p4' => '361',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '363',
+  'plid' => '0',
+  'link_path' => 'book',
+  'router_path' => 'book',
+  'link_title' => 'Books',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '363',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '364',
+  'plid' => '363',
+  'link_path' => 'book/js/form',
+  'router_path' => 'book/js/form',
+  'link_title' => '',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '363',
+  'p2' => '364',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '366',
+  'plid' => '157',
+  'link_path' => 'admin/content/book',
+  'router_path' => 'admin/content/book',
+  'link_title' => 'Books',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:33:\"Manage your site's book outlines.\";}}",
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '144',
+  'p2' => '157',
+  'p3' => '366',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '367',
+  'plid' => '363',
+  'link_path' => 'book/export/%/%',
+  'router_path' => 'book/export/%/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '363',
+  'p2' => '367',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '369',
+  'plid' => '366',
+  'link_path' => 'admin/content/book/%',
+  'router_path' => 'admin/content/book/%',
+  'link_title' => 'Re-order book pages and change titles',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20035,8 +31427,8 @@
   'customized' => '0',
   'p1' => '144',
   'p2' => '157',
-  'p3' => '357',
-  'p4' => '361',
+  'p3' => '366',
+  'p4' => '369',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20046,21 +31438,21 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '363',
+  'mlid' => '370',
   'plid' => '0',
-  'link_path' => 'book',
-  'router_path' => 'book',
-  'link_title' => 'Books',
+  'link_path' => 'node/%/outline/remove',
+  'router_path' => 'node/%/outline/remove',
+  'link_title' => 'Remove from outline',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '363',
+  'p1' => '370',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20072,23 +31464,23 @@
   'updated' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '364',
-  'plid' => '363',
-  'link_path' => 'book/js/form',
-  'router_path' => 'book/js/form',
-  'link_title' => '',
+  'menu_name' => 'secondary-links',
+  'mlid' => '393',
+  'plid' => '0',
+  'link_path' => 'user/login',
+  'router_path' => 'user/login',
+  'link_title' => 'Test 3',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '363',
-  'p2' => '364',
+  'weight' => '-47',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '393',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -20100,12 +31492,12 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '366',
-  'plid' => '157',
-  'link_path' => 'admin/content/book',
-  'router_path' => 'admin/content/book',
-  'link_title' => 'Books',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:33:\"Manage your site's book outlines.\";}}",
+  'mlid' => '394',
+  'plid' => '166',
+  'link_path' => 'admin/build/path',
+  'router_path' => 'admin/build/path',
+  'link_title' => 'URL aliases',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:46:\"Change your site's URL paths by aliasing them.\";}}",
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
@@ -20115,8 +31507,8 @@
   'depth' => '3',
   'customized' => '0',
   'p1' => '144',
-  'p2' => '157',
-  'p3' => '366',
+  'p2' => '166',
+  'p3' => '394',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20127,11 +31519,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '367',
-  'plid' => '363',
-  'link_path' => 'book/export/%/%',
-  'router_path' => 'book/export/%/%',
-  'link_title' => '',
+  'mlid' => '395',
+  'plid' => '394',
+  'link_path' => 'admin/build/path/delete',
+  'router_path' => 'admin/build/path/delete',
+  'link_title' => 'Delete alias',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20139,12 +31531,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '363',
-  'p2' => '367',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '166',
+  'p3' => '394',
+  'p4' => '395',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20154,11 +31546,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '369',
-  'plid' => '366',
-  'link_path' => 'admin/content/book/%',
-  'router_path' => 'admin/content/book/%',
-  'link_title' => 'Re-order book pages and change titles',
+  'mlid' => '396',
+  'plid' => '394',
+  'link_path' => 'admin/build/path/edit',
+  'router_path' => 'admin/build/path/edit',
+  'link_title' => 'Edit alias',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20169,9 +31561,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '144',
-  'p2' => '157',
-  'p3' => '366',
-  'p4' => '369',
+  'p2' => '166',
+  'p3' => '394',
+  'p4' => '396',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20181,11 +31573,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '370',
+  'mlid' => '397',
   'plid' => '0',
-  'link_path' => 'node/%/outline/remove',
-  'router_path' => 'node/%/outline/remove',
-  'link_title' => 'Remove from outline',
+  'link_path' => 'system/files/imagecache',
+  'router_path' => 'system/files/imagecache',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20195,7 +31587,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '370',
+  'p1' => '397',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20208,23 +31600,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '372',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test/remove',
-  'link_title' => 'Remove field',
-  'options' => 'a:0:{}',
+  'mlid' => '398',
+  'plid' => '167',
+  'link_path' => 'admin/settings/imageapi',
+  'router_path' => 'admin/settings/imageapi',
+  'link_title' => 'ImageAPI',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:19:"Configure ImageAPI.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '372',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '144',
+  'p2' => '167',
+  'p3' => '398',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20235,23 +31627,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '373',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_date/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_date/remove',
-  'link_title' => 'Remove field',
-  'options' => 'a:0:{}',
+  'mlid' => '399',
+  'plid' => '167',
+  'link_path' => 'admin/settings/language',
+  'router_path' => 'admin/settings/language',
+  'link_title' => 'Languages',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:55:"Configure languages for content and the user interface.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '373',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '144',
+  'p2' => '167',
+  'p3' => '399',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20262,11 +31654,38 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '374',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_datestamp/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_datestamp/remove',
-  'link_title' => 'Remove field',
+  'mlid' => '400',
+  'plid' => '166',
+  'link_path' => 'admin/build/translate',
+  'router_path' => 'admin/build/translate',
+  'link_title' => 'Translate interface',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"Translate the built in interface and optionally other text.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '144',
+  'p2' => '166',
+  'p3' => '400',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '401',
+  'plid' => '399',
+  'link_path' => 'admin/settings/language/delete/%',
+  'router_path' => 'admin/settings/language/delete/%',
+  'link_title' => 'Confirm',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20274,12 +31693,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '374',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '167',
+  'p3' => '399',
+  'p4' => '401',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20289,11 +31708,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '375',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_datetime/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_datetime/remove',
-  'link_title' => 'Remove field',
+  'mlid' => '403',
+  'plid' => '400',
+  'link_path' => 'admin/build/translate/delete/%',
+  'router_path' => 'admin/build/translate/delete/%',
+  'link_title' => 'Delete string',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20301,12 +31720,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '375',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '166',
+  'p3' => '400',
+  'p4' => '403',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20316,11 +31735,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '376',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_decimal_radio_buttons/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_decimal_radio_buttons/remove',
-  'link_title' => 'Remove field',
+  'mlid' => '404',
+  'plid' => '399',
+  'link_path' => 'admin/settings/language/edit/%',
+  'router_path' => 'admin/settings/language/edit/%',
+  'link_title' => 'Edit language',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20328,12 +31747,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '376',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '167',
+  'p3' => '399',
+  'p4' => '404',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20343,11 +31762,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '377',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_email/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_email/remove',
-  'link_title' => 'Remove field',
+  'mlid' => '405',
+  'plid' => '400',
+  'link_path' => 'admin/build/translate/edit/%',
+  'router_path' => 'admin/build/translate/edit/%',
+  'link_title' => 'Edit string',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20355,12 +31774,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '377',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '166',
+  'p3' => '400',
+  'p4' => '405',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20370,11 +31789,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '378',
+  'mlid' => '407',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_exclude_unset/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_exclude_unset/remove',
-  'link_title' => 'Remove field',
+  'link_path' => 'i18nstrings/save',
+  'router_path' => 'i18nstrings/save',
+  'link_title' => 'Save string',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20384,7 +31803,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '378',
+  'p1' => '407',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20397,11 +31816,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '379',
+  'mlid' => '408',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_filefield/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_filefield/remove',
-  'link_title' => 'Remove field',
+  'link_path' => 'i18n/node/autocomplete',
+  'router_path' => 'i18n/node/autocomplete',
+  'link_title' => 'Node title autocomplete',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20411,7 +31830,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '379',
+  'p1' => '408',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20424,11 +31843,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '380',
+  'mlid' => '411',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_float_single_checkbox/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_float_single_checkbox/remove',
-  'link_title' => 'Remove field',
+  'link_path' => 'core/modules/simpletest/files/imagecache',
+  'router_path' => 'core/modules/simpletest/files/imagecache',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20438,7 +31857,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '380',
+  'p1' => '411',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20451,10 +31870,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '381',
+  'mlid' => '412',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_four/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_four/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20465,7 +31884,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '381',
+  'p1' => '412',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20478,10 +31897,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '382',
+  'mlid' => '413',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_identical1/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_identical1/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_date/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_date/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20492,7 +31911,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '382',
+  'p1' => '413',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20505,10 +31924,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '383',
+  'mlid' => '414',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_identical2/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_identical2/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_datestamp/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_datestamp/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20519,7 +31938,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '383',
+  'p1' => '414',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20532,10 +31951,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '384',
+  'mlid' => '415',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_imagefield/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_imagefield/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_datetime/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_datetime/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20546,7 +31965,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '384',
+  'p1' => '415',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20559,10 +31978,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '385',
+  'mlid' => '416',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_integer_selectlist/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_integer_selectlist/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_decimal_radio_buttons/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_decimal_radio_buttons/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20573,7 +31992,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '385',
+  'p1' => '416',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20586,10 +32005,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '386',
+  'mlid' => '417',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_link/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_link/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_email/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_email/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20600,7 +32019,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '386',
+  'p1' => '417',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20613,10 +32032,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '387',
+  'mlid' => '418',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_phone/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_phone/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_exclude_unset/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_exclude_unset/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20627,7 +32046,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '387',
+  'p1' => '418',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20640,10 +32059,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '388',
+  'mlid' => '419',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_filefield/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_filefield/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20654,7 +32073,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '388',
+  'p1' => '419',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20667,10 +32086,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '389',
+  'mlid' => '420',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_three/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_three/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_float_single_checkbox/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_float_single_checkbox/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20681,7 +32100,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '389',
+  'p1' => '420',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20694,10 +32113,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '390',
+  'mlid' => '421',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/story/fields/field_test_two/remove',
-  'router_path' => 'admin/content/node-type/story/fields/field_test_two/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_four/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_four/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20708,7 +32127,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '390',
+  'p1' => '421',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20721,10 +32140,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '391',
+  'mlid' => '422',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/test-page/fields/field_test/remove',
-  'router_path' => 'admin/content/node-type/test-page/fields/field_test/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_identical1/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_identical1/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20735,7 +32154,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '391',
+  'p1' => '422',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20748,10 +32167,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '392',
+  'mlid' => '423',
   'plid' => '0',
-  'link_path' => 'admin/content/node-type/test-planet/fields/field_multivalue/remove',
-  'router_path' => 'admin/content/node-type/test-planet/fields/field_multivalue/remove',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_identical2/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_identical2/remove',
   'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -20762,7 +32181,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '392',
+  'p1' => '423',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20774,22 +32193,22 @@
   'updated' => '0',
 ))
 ->values(array(
-  'menu_name' => 'secondary-links',
-  'mlid' => '393',
+  'menu_name' => 'navigation',
+  'mlid' => '424',
   'plid' => '0',
-  'link_path' => 'user/login',
-  'router_path' => 'user/login',
-  'link_title' => 'Test 3',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_imagefield/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_imagefield/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-47',
+  'weight' => '0',
   'depth' => '1',
-  'customized' => '1',
-  'p1' => '393',
+  'customized' => '0',
+  'p1' => '424',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20802,23 +32221,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '394',
-  'plid' => '166',
-  'link_path' => 'admin/build/path',
-  'router_path' => 'admin/build/path',
-  'link_title' => 'URL aliases',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:46:\"Change your site's URL paths by aliasing them.\";}}",
+  'mlid' => '425',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_integer_selectlist/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_integer_selectlist/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '394',
+  'p1' => '425',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20829,11 +32248,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '395',
-  'plid' => '394',
-  'link_path' => 'admin/build/path/delete',
-  'router_path' => 'admin/build/path/delete',
-  'link_title' => 'Delete alias',
+  'mlid' => '426',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_link/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_link/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20841,12 +32260,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '394',
-  'p4' => '395',
+  'p1' => '426',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20856,11 +32275,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '396',
-  'plid' => '394',
-  'link_path' => 'admin/build/path/edit',
-  'router_path' => 'admin/build/path/edit',
-  'link_title' => 'Edit alias',
+  'mlid' => '427',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_phone/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_phone/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20868,12 +32287,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '394',
-  'p4' => '396',
+  'p1' => '427',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -20883,11 +32302,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '397',
+  'mlid' => '428',
   'plid' => '0',
-  'link_path' => 'system/files/imagecache',
-  'router_path' => 'system/files/imagecache',
-  'link_title' => '',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -20897,7 +32316,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '397',
+  'p1' => '428',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -20910,23 +32329,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '398',
-  'plid' => '167',
-  'link_path' => 'admin/settings/imageapi',
-  'router_path' => 'admin/settings/imageapi',
-  'link_title' => 'ImageAPI',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:19:"Configure ImageAPI.";}}',
+  'mlid' => '429',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_text_single_checkbox2/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '398',
+  'p1' => '429',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20937,23 +32356,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '399',
-  'plid' => '167',
-  'link_path' => 'admin/settings/language',
-  'router_path' => 'admin/settings/language',
-  'link_title' => 'Languages',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:55:"Configure languages for content and the user interface.";}}',
+  'mlid' => '430',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_three/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_three/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '399',
+  'p1' => '430',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20964,23 +32383,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '400',
-  'plid' => '166',
-  'link_path' => 'admin/build/translate',
-  'router_path' => 'admin/build/translate',
-  'link_title' => 'Translate interface',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"Translate the built in interface and optionally other text.";}}',
+  'mlid' => '431',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/story/fields/field_test_two/remove',
+  'router_path' => 'admin/content/node-type/story/fields/field_test_two/remove',
+  'link_title' => 'Remove field',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '400',
+  'p1' => '431',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -20991,11 +32410,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '401',
-  'plid' => '399',
-  'link_path' => 'admin/settings/language/delete/%',
-  'router_path' => 'admin/settings/language/delete/%',
-  'link_title' => 'Confirm',
+  'mlid' => '432',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/test-page/fields/field_test/remove',
+  'router_path' => 'admin/content/node-type/test-page/fields/field_test/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -21003,12 +32422,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '167',
-  'p3' => '399',
-  'p4' => '401',
+  'p1' => '432',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21018,11 +32437,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '402',
+  'mlid' => '433',
   'plid' => '0',
-  'link_path' => 'core/modules/simpletest/files/imagecache',
-  'router_path' => 'core/modules/simpletest/files/imagecache',
-  'link_title' => '',
+  'link_path' => 'admin/content/node-type/test-planet/fields/field_multivalue/remove',
+  'router_path' => 'admin/content/node-type/test-planet/fields/field_multivalue/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -21032,7 +32451,7 @@
   'weight' => '0',
   'depth' => '1',
   'customized' => '0',
-  'p1' => '402',
+  'p1' => '433',
   'p2' => '0',
   'p3' => '0',
   'p4' => '0',
@@ -21045,11 +32464,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '403',
-  'plid' => '400',
-  'link_path' => 'admin/build/translate/delete/%',
-  'router_path' => 'admin/build/translate/delete/%',
-  'link_title' => 'Delete string',
+  'mlid' => '434',
+  'plid' => '0',
+  'link_path' => 'admin/content/node-type/test-planet/fields/field_test_text_single_checkbox/remove',
+  'router_path' => 'admin/content/node-type/test-planet/fields/field_test_text_single_checkbox/remove',
+  'link_title' => 'Remove field',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -21057,12 +32476,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '144',
-  'p2' => '166',
-  'p3' => '400',
-  'p4' => '403',
+  'p1' => '434',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21072,24 +32491,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '404',
-  'plid' => '399',
-  'link_path' => 'admin/settings/language/edit/%',
-  'router_path' => 'admin/settings/language/edit/%',
-  'link_title' => 'Edit language',
-  'options' => 'a:0:{}',
+  'mlid' => '438',
+  'plid' => '167',
+  'link_path' => 'admin/settings/variable',
+  'router_path' => 'admin/settings/variable',
+  'link_title' => 'Variables',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:31:"Edit and delete site variables.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '144',
   'p2' => '167',
-  'p3' => '399',
-  'p4' => '404',
+  'p3' => '438',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21099,14 +32518,14 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '405',
-  'plid' => '400',
-  'link_path' => 'admin/build/translate/edit/%',
-  'router_path' => 'admin/build/translate/edit/%',
-  'link_title' => 'Edit string',
+  'mlid' => '439',
+  'plid' => '438',
+  'link_path' => 'admin/settings/variable/edit/%',
+  'router_path' => 'admin/settings/variable/edit/%',
+  'link_title' => 'Edit variable',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -21114,9 +32533,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '144',
-  'p2' => '166',
-  'p3' => '400',
-  'p4' => '405',
+  'p2' => '167',
+  'p3' => '438',
+  'p4' => '439',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21126,24 +32545,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '406',
-  'plid' => '0',
-  'link_path' => 'admin/content/node-type/test-planet/fields/field_test_text_single_checkbox/remove',
-  'router_path' => 'admin/content/node-type/test-planet/fields/field_test_text_single_checkbox/remove',
-  'link_title' => 'Remove field',
-  'options' => 'a:0:{}',
+  'mlid' => '440',
+  'plid' => '438',
+  'link_path' => 'admin/settings/variable/group/%',
+  'router_path' => 'admin/settings/variable/group/%',
+  'link_title' => 'Variables group',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:32:"Edit and delete group variables.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '406',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '144',
+  'p2' => '167',
+  'p3' => '438',
+  'p4' => '440',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -21458,7 +32877,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/bluemarine/bluemarine.info";s:4:"name";s:10:"bluemarine";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/bluemarine/bluemarine.info";s:4:"name";s:10:"bluemarine";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:10:"bluemarine";}',
   'fit' => '31',
@@ -21480,7 +32899,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":11:{s:8:"filename";s:31:"themes/chameleon/chameleon.info";s:4:"name";s:9:"chameleon";s:4:"type";s:5:"theme";s:5:"owner";s:32:"themes/chameleon/chameleon.theme";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:12:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":11:{s:8:"filename";s:31:"themes/chameleon/chameleon.info";s:4:"name";s:9:"chameleon";s:4:"type";s:5:"theme";s:5:"owner";s:32:"themes/chameleon/chameleon.theme";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:10:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:9:"chameleon";}',
   'fit' => '31',
@@ -21502,7 +32921,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:7:"garland";}',
   'fit' => '31',
@@ -21546,7 +32965,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:35:"themes/chameleon/marvin/marvin.info";s:4:"name";s:6:"marvin";s:4:"type";s:5:"theme";s:5:"owner";s:0:"";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:10:"base_theme";s:9:"chameleon";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:35:"themes/chameleon/marvin/marvin.info";s:4:"name";s:6:"marvin";s:4:"type";s:5:"theme";s:5:"owner";s:0:"";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:10:"base_theme";s:9:"chameleon";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:6:"marvin";}',
   'fit' => '31',
@@ -21568,7 +32987,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":13:{s:8:"filename";s:37:"themes/garland/minnelli/minnelli.info";s:4:"name";s:8:"minnelli";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:14:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:6:"engine";s:11:"phptemplate";s:10:"base_theme";s:7:"garland";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":13:{s:8:"filename";s:37:"themes/garland/minnelli/minnelli.info";s:4:"name";s:8:"minnelli";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:12:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:6:"engine";s:11:"phptemplate";s:10:"base_theme";s:7:"garland";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:8:"minnelli";}',
   'fit' => '31',
@@ -21590,7 +33009,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/pushbutton/pushbutton.info";s:4:"name";s:10:"pushbutton";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/pushbutton/pushbutton.info";s:4:"name";s:10:"pushbutton";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:10:"pushbutton";}',
   'fit' => '31',
@@ -22294,7 +33713,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/bluemarine/bluemarine.info";s:4:"name";s:10:"bluemarine";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/bluemarine/bluemarine.info";s:4:"name";s:10:"bluemarine";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:10:"bluemarine";}',
   'fit' => '31',
@@ -22316,7 +33735,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":11:{s:8:"filename";s:31:"themes/chameleon/chameleon.info";s:4:"name";s:9:"chameleon";s:4:"type";s:5:"theme";s:5:"owner";s:32:"themes/chameleon/chameleon.theme";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:12:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":11:{s:8:"filename";s:31:"themes/chameleon/chameleon.info";s:4:"name";s:9:"chameleon";s:4:"type";s:5:"theme";s:5:"owner";s:32:"themes/chameleon/chameleon.theme";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:10:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:9:"chameleon";}',
   'fit' => '31',
@@ -22338,7 +33757,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:7:"garland";}',
   'fit' => '31',
@@ -22382,7 +33801,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:35:"themes/chameleon/marvin/marvin.info";s:4:"name";s:6:"marvin";s:4:"type";s:5:"theme";s:5:"owner";s:0:"";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:10:"base_theme";s:9:"chameleon";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:35:"themes/chameleon/marvin/marvin.info";s:4:"name";s:6:"marvin";s:4:"type";s:5:"theme";s:5:"owner";s:0:"";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:10:"base_theme";s:9:"chameleon";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:6:"marvin";}',
   'fit' => '31',
@@ -22404,7 +33823,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":13:{s:8:"filename";s:37:"themes/garland/minnelli/minnelli.info";s:4:"name";s:8:"minnelli";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:14:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:6:"engine";s:11:"phptemplate";s:10:"base_theme";s:7:"garland";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":13:{s:8:"filename";s:37:"themes/garland/minnelli/minnelli.info";s:4:"name";s:8:"minnelli";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:12:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:6:"engine";s:11:"phptemplate";s:10:"base_theme";s:7:"garland";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:8:"minnelli";}',
   'fit' => '31',
@@ -22426,7 +33845,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/pushbutton/pushbutton.info";s:4:"name";s:10:"pushbutton";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:13:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:33:"themes/pushbutton/pushbutton.info";s:4:"name";s:10:"pushbutton";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:8:"throttle";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:11:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:10:"pushbutton";}',
   'fit' => '31',
@@ -22576,6 +33995,28 @@
   'file' => '',
 ))
 ->values(array(
+  'path' => 'admin/build/translate/refresh',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:19:"translate interface";}',
+  'page_callback' => 'i18nstrings_admin_refresh_page',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '15',
+  'number_parts' => '4',
+  'tab_parent' => 'admin/build/translate',
+  'tab_root' => 'admin/build/translate',
+  'title' => 'Refresh',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '20',
+  'file' => 'sites/all/modules/i18n/i18nstrings/i18nstrings.admin.inc',
+))
+->values(array(
   'path' => 'admin/build/translate/search',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -24870,7 +36311,7 @@
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:14:"help text here";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
+  'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:0:"";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
   'fit' => '15',
   'number_parts' => '4',
   'tab_parent' => '',
@@ -24892,7 +36333,7 @@
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:24:"node_type_delete_confirm";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:14:"help text here";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
+  'page_arguments' => 'a:2:{i:0;s:24:"node_type_delete_confirm";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:0:"";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
   'fit' => '31',
   'number_parts' => '5',
   'tab_parent' => '',
@@ -25002,7 +36443,7 @@
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:14:"help text here";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
+  'page_arguments' => 'a:2:{i:0;s:14:"node_type_form";i:1;O:8:"stdClass":14:{s:4:"type";s:10:"test_event";s:4:"name";s:18:"Migrate test event";s:6:"module";s:4:"node";s:11:"description";s:27:"test event description here";s:4:"help";s:0:"";s:9:"has_title";s:1:"1";s:11:"title_label";s:10:"Event Name";s:8:"has_body";s:1:"1";s:10:"body_label";s:4:"Body";s:14:"min_word_count";s:1:"0";s:6:"custom";s:1:"1";s:8:"modified";s:1:"1";s:6:"locked";s:1:"0";s:9:"orig_type";s:5:"event";}}',
   'fit' => '31',
   'number_parts' => '5',
   'tab_parent' => 'admin/content/node-type/test-event',
@@ -25832,6 +37273,28 @@
   'file' => 'modules/taxonomy/taxonomy.admin.inc',
 ))
 ->values(array(
+  'path' => 'admin/content/taxonomy/%/translation',
+  'load_functions' => 'a:1:{i:3;s:24:"taxonomy_vocabulary_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => '_i18ntaxonomy_translation_tab',
+  'access_arguments' => 'a:1:{i:0;i:3;}',
+  'page_callback' => 'i18ntaxonomy_page_vocabulary',
+  'page_arguments' => 'a:3:{i:0;i:3;i:1;i:5;i:2;i:6;}',
+  'fit' => '29',
+  'number_parts' => '5',
+  'tab_parent' => 'admin/content/taxonomy/%',
+  'tab_root' => 'admin/content/taxonomy/%',
+  'title' => 'Translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.admin.inc',
+))
+->values(array(
   'path' => 'admin/content/taxonomy/add/vocabulary',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -26954,6 +38417,50 @@
   'file' => '',
 ))
 ->values(array(
+  'path' => 'admin/settings/language/configure/language',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:20:"administer languages";}',
+  'page_callback' => 'locale_inc_callback',
+  'page_arguments' => 'a:2:{i:0;s:15:"drupal_get_form";i:1;s:31:"locale_languages_configure_form";}',
+  'fit' => '31',
+  'number_parts' => '5',
+  'tab_parent' => 'admin/settings/language/configure',
+  'tab_root' => 'admin/settings/language',
+  'title' => 'Language negotiation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '136',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '-10',
+  'file' => '',
+))
+->values(array(
+  'path' => 'admin/settings/language/configure/strings',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:18:"administer filters";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:26:"i18nstrings_admin_settings";}',
+  'fit' => '31',
+  'number_parts' => '5',
+  'tab_parent' => 'admin/settings/language/configure',
+  'tab_root' => 'admin/settings/language',
+  'title' => 'String translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '20',
+  'file' => 'sites/all/modules/i18n/i18nstrings/i18nstrings.admin.inc',
+))
+->values(array(
   'path' => 'admin/settings/language/delete/%',
   'load_functions' => 'a:1:{i:4;N;}',
   'to_arg_functions' => '',
@@ -26998,6 +38505,72 @@
   'file' => '',
 ))
 ->values(array(
+  'path' => 'admin/settings/language/i18n',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:19:"i18n_admin_settings";}',
+  'fit' => '15',
+  'number_parts' => '4',
+  'tab_parent' => 'admin/settings/language',
+  'tab_root' => 'admin/settings/language',
+  'title' => 'Multilingual system',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => 'Configure extended options for multilingual content and translations.',
+  'position' => '',
+  'weight' => '10',
+  'file' => 'sites/all/modules/i18n/i18n.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/language/i18n/configure',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:19:"i18n_admin_settings";}',
+  'fit' => '31',
+  'number_parts' => '5',
+  'tab_parent' => 'admin/settings/language/i18n',
+  'tab_root' => 'admin/settings/language',
+  'title' => 'Options',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '136',
+  'block_callback' => '',
+  'description' => 'Configure extended options for multilingual content and translations.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/i18n/i18n.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/language/i18n/variables',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:25:"i18n_admin_variables_form";}',
+  'fit' => '31',
+  'number_parts' => '5',
+  'tab_parent' => 'admin/settings/language/i18n',
+  'tab_root' => 'admin/settings/language',
+  'title' => 'Variables',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '128',
+  'block_callback' => '',
+  'description' => 'Multilingual variables.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/i18n/i18n.admin.inc',
+))
+->values(array(
   'path' => 'admin/settings/language/overview',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -27056,78 +38629,210 @@
   'title' => 'Performance',
   'title_callback' => 't',
   'title_arguments' => '',
-  'type' => '6',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'modules/system/system.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/site-information',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:32:"system_site_information_settings";}',
+  'fit' => '7',
+  'number_parts' => '3',
+  'tab_parent' => '',
+  'tab_root' => 'admin/settings/site-information',
+  'title' => 'Site information',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'modules/system/system.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/site-maintenance',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:32:"system_site_maintenance_settings";}',
+  'fit' => '7',
+  'number_parts' => '3',
+  'tab_parent' => '',
+  'tab_root' => 'admin/settings/site-maintenance',
+  'title' => 'Site maintenance',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => 'Take the site off-line for maintenance or bring it back online.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'modules/system/system.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/uploads',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:21:"upload_admin_settings";}',
+  'fit' => '7',
+  'number_parts' => '3',
+  'tab_parent' => '',
+  'tab_root' => 'admin/settings/uploads',
+  'title' => 'File uploads',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => 'Control how files may be attached to content.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'modules/upload/upload.admin.inc',
+))
+->values(array(
+  'path' => 'admin/settings/variable',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'variable_admin_page_overview',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '7',
+  'number_parts' => '3',
+  'tab_parent' => '',
+  'tab_root' => 'admin/settings/variable',
+  'title' => 'Variables',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => 'Edit and delete site variables.',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
+))
+->values(array(
+  'path' => 'admin/settings/variable/edit/%',
+  'load_functions' => 'a:1:{i:4;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'variable_access',
+  'access_arguments' => 'a:1:{i:0;i:4;}',
+  'page_callback' => 'variable_admin_page_edit',
+  'page_arguments' => 'a:1:{i:0;i:4;}',
+  'fit' => '30',
+  'number_parts' => '5',
+  'tab_parent' => '',
+  'tab_root' => 'admin/settings/variable/edit/%',
+  'title' => 'Edit variable',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '6',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
+))
+->values(array(
+  'path' => 'admin/settings/variable/group',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'variable_admin_page_overview',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '15',
+  'number_parts' => '4',
+  'tab_parent' => 'admin/settings/variable',
+  'tab_root' => 'admin/settings/variable',
+  'title' => 'By group',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '136',
   'block_callback' => '',
-  'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
+  'description' => 'Variables by group.',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/site-information',
-  'load_functions' => '',
+  'path' => 'admin/settings/variable/group/%',
+  'load_functions' => 'a:1:{i:4;N;}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:32:"system_site_information_settings";}',
-  'fit' => '7',
-  'number_parts' => '3',
+  'page_callback' => 'variable_admin_page_group',
+  'page_arguments' => 'a:1:{i:0;i:4;}',
+  'fit' => '30',
+  'number_parts' => '5',
   'tab_parent' => '',
-  'tab_root' => 'admin/settings/site-information',
-  'title' => 'Site information',
+  'tab_root' => 'admin/settings/variable/group/%',
+  'title' => 'Variables group',
   'title_callback' => 't',
   'title_arguments' => '',
   'type' => '6',
   'block_callback' => '',
-  'description' => 'Change basic site information, such as the site name, slogan, e-mail address, mission, front page and more.',
+  'description' => 'Edit and delete group variables.',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/site-maintenance',
+  'path' => 'admin/settings/variable/modules',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:32:"system_site_maintenance_settings";}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/site-maintenance',
-  'title' => 'Site maintenance',
+  'page_callback' => 'variable_admin_page_modules',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '15',
+  'number_parts' => '4',
+  'tab_parent' => 'admin/settings/variable',
+  'tab_root' => 'admin/settings/variable',
+  'title' => 'By module',
   'title_callback' => 't',
   'title_arguments' => '',
-  'type' => '6',
+  'type' => '128',
   'block_callback' => '',
-  'description' => 'Take the site off-line for maintenance or bring it back online.',
+  'description' => 'Variables by module.',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/system/system.admin.inc',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
 ))
 ->values(array(
-  'path' => 'admin/settings/uploads',
+  'path' => 'admin/settings/variable/undefined',
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:1:{i:0;s:21:"upload_admin_settings";}',
-  'fit' => '7',
-  'number_parts' => '3',
-  'tab_parent' => '',
-  'tab_root' => 'admin/settings/uploads',
-  'title' => 'File uploads',
+  'page_callback' => 'variable_admin_page_undefined',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '15',
+  'number_parts' => '4',
+  'tab_parent' => 'admin/settings/variable',
+  'tab_root' => 'admin/settings/variable',
+  'title' => 'Undefined',
   'title_callback' => 't',
   'title_arguments' => '',
-  'type' => '6',
+  'type' => '128',
   'block_callback' => '',
-  'description' => 'Control how files may be attached to content.',
+  'description' => 'Unknown variables.',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/upload/upload.admin.inc',
+  'file' => 'sites/all/modules/variable/variable_admin/variable_admin.pages.inc',
 ))
 ->values(array(
   'path' => 'admin/user',
@@ -28274,6 +39979,50 @@
   'file' => 'modules/filter/filter.pages.inc',
 ))
 ->values(array(
+  'path' => 'i18n/node/autocomplete',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
+  'page_callback' => 'i18n_node_autocomplete',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '7',
+  'number_parts' => '3',
+  'tab_parent' => '',
+  'tab_root' => 'i18n/node/autocomplete',
+  'title' => 'Node title autocomplete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '4',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'i18nstrings/save',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:23:"use on-page translation";}',
+  'page_callback' => 'i18nstrings_save_string',
+  'page_arguments' => 'a:0:{}',
+  'fit' => '3',
+  'number_parts' => '2',
+  'tab_parent' => '',
+  'tab_root' => 'i18nstrings/save',
+  'title' => 'Save string',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'type' => '4',
+  'block_callback' => '',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'file' => '',
+))
+->values(array(
   'path' => 'logout',
   'load_functions' => '',
   'to_arg_functions' => '',
@@ -28543,7 +40292,7 @@
   'to_arg_functions' => '',
   'access_callback' => '_translation_tab_access',
   'access_arguments' => 'a:1:{i:0;i:1;}',
-  'page_callback' => 'translation_node_overview',
+  'page_callback' => 'i18n_translation_node_overview',
   'page_arguments' => 'a:1:{i:0;i:1;}',
   'fit' => '5',
   'number_parts' => '3',
@@ -28557,7 +40306,7 @@
   'description' => '',
   'position' => '',
   'weight' => '2',
-  'file' => 'modules/translation/translation.pages.inc',
+  'file' => 'sites/all/modules/i18n/i18n.pages.inc',
 ))
 ->values(array(
   'path' => 'node/%/view',
@@ -28587,7 +40336,7 @@
   'to_arg_functions' => '',
   'access_callback' => '_node_add_access',
   'access_arguments' => 'a:0:{}',
-  'page_callback' => 'node_add_page',
+  'page_callback' => 'i18ncontent_node_add_page',
   'page_arguments' => 'a:0:{}',
   'fit' => '3',
   'number_parts' => '2',
@@ -28609,15 +40358,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:7:"article";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/article',
   'title' => 'Article',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:26:"nodetype:type:article:name";i:1;s:7:"Article";}',
   'type' => '6',
   'block_callback' => '',
   'description' => 'An <em>article</em>, content type.',
@@ -28631,15 +40380,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:7:"company";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/company',
   'title' => 'Company',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:26:"nodetype:type:company:name";i:1;s:7:"Company";}',
   'type' => '6',
   'block_callback' => '',
   'description' => 'Company node type',
@@ -28653,15 +40402,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:8:"employee";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/employee',
   'title' => 'Employee',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:27:"nodetype:type:employee:name";i:1;s:8:"Employee";}',
   'type' => '6',
   'block_callback' => '',
   'description' => 'Employee node type',
@@ -28675,15 +40424,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:7:"sponsor";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/sponsor',
   'title' => 'Sponsor',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:26:"nodetype:type:sponsor:name";i:1;s:7:"Sponsor";}',
   'type' => '6',
   'block_callback' => '',
   'description' => 'Sponsor node type',
@@ -28697,15 +40446,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:5:"story";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/story',
   'title' => 'Story',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:24:"nodetype:type:story:name";i:1;s:5:"Story";}',
   'type' => '6',
   'block_callback' => '',
   'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
@@ -28719,15 +40468,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:10:"test_event";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/test-event',
   'title' => 'Migrate test event',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test_event:name";i:1;s:18:"Migrate test event";}',
   'type' => '6',
   'block_callback' => '',
   'description' => 'test event description here',
@@ -28741,15 +40490,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:9:"test_page";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/test-page',
   'title' => 'Migrate test page',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:28:"nodetype:type:test_page:name";i:1;s:17:"Migrate test page";}',
   'type' => '6',
   'block_callback' => '',
   'description' => "A <em>page</em>, similar in form to a <em>story</em>, is a simple method for creating and displaying information that rarely changes, such as an \"About us\" section of a website. By default, a <em>page</em> entry does not allow visitor comments and is not featured on the site's initial home page.",
@@ -28763,15 +40512,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:11:"test_planet";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/test-planet',
   'title' => 'Migrate test planet',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:30:"nodetype:type:test_planet:name";i:1;s:19:"Migrate test planet";}',
   'type' => '6',
   'block_callback' => '',
   'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
@@ -28785,15 +40534,15 @@
   'to_arg_functions' => '',
   'access_callback' => 'node_access',
   'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:10:"test_story";}',
-  'page_callback' => 'node_add',
+  'page_callback' => 'i18ncontent_node_add',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '7',
   'number_parts' => '3',
   'tab_parent' => '',
   'tab_root' => 'node/add/test-story',
   'title' => 'Migrate test story',
-  'title_callback' => 'check_plain',
-  'title_arguments' => '',
+  'title_callback' => 'i18nstrings_title_callback',
+  'title_arguments' => 'a:2:{i:0;s:29:"nodetype:type:test_story:name";i:1;s:18:"Migrate test story";}',
   'type' => '6',
   'block_callback' => '',
   'description' => "A <em>story</em>, similar in form to a <em>page</em>, is ideal for creating and displaying content that informs or engages website visitors. Press releases, site announcements, and informal blog-like entries may all be created with a <em>story</em> entry. By default, a <em>story</em> entry is automatically featured on the site's initial home page, and provides the ability to post comments.",
@@ -28917,7 +40666,7 @@
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'taxonomy_autocomplete',
+  'page_callback' => 'i18ntaxonomy_autocomplete',
   'page_arguments' => 'a:0:{}',
   'fit' => '3',
   'number_parts' => '2',
@@ -28931,7 +40680,7 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/taxonomy/taxonomy.pages.inc',
+  'file' => 'sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.pages.inc',
 ))
 ->values(array(
   'path' => 'taxonomy/term/%',
@@ -28939,7 +40688,7 @@
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'taxonomy_term_page',
+  'page_callback' => 'i18ntaxonomy_term_page',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'fit' => '6',
   'number_parts' => '3',
@@ -28953,7 +40702,7 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'file' => 'modules/taxonomy/taxonomy.pages.inc',
+  'file' => 'sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.pages.inc',
 ))
 ->values(array(
   'path' => 'upload/js',
@@ -29122,7 +40871,7 @@
   'tab_parent' => 'user/%/edit',
   'tab_root' => 'user/%',
   'title' => '',
-  'title_callback' => 'check_plain',
+  'title_callback' => 'i18nprofile_translate_category',
   'title_arguments' => 'a:1:{i:0;s:19:"Administrative data";}',
   'type' => '128',
   'block_callback' => '',
@@ -29144,7 +40893,7 @@
   'tab_parent' => 'user/%/edit',
   'tab_root' => 'user/%',
   'title' => '',
-  'title_callback' => 'check_plain',
+  'title_callback' => 'i18nprofile_translate_category',
   'title_arguments' => 'a:1:{i:0;s:25:"Communication preferences";}',
   'type' => '128',
   'block_callback' => '',
@@ -29166,7 +40915,7 @@
   'tab_parent' => 'user/%/edit',
   'tab_root' => 'user/%',
   'title' => '',
-  'title_callback' => 'check_plain',
+  'title_callback' => 'i18nprofile_translate_category',
   'title_arguments' => 'a:1:{i:0;s:20:"Personal information";}',
   'type' => '128',
   'block_callback' => '',
@@ -30221,7 +41970,7 @@
   'name' => 'Migrate test event',
   'module' => 'node',
   'description' => 'test event description here',
-  'help' => 'help text here',
+  'help' => '',
   'has_title' => '1',
   'title_label' => 'Event Name',
   'has_body' => '1',
@@ -31000,7 +42749,7 @@
   'bootstrap' => '0',
   'schema_version' => '6001',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:10:"Aggregator";s:11:"description";s:57:"Aggregates syndicated content (RSS, RDF, and Atom feeds).";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:10:"Aggregator";s:11:"description";s:57:"Aggregates syndicated content (RSS, RDF, and Atom feeds).";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/block/block.module',
@@ -31012,7 +42761,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:5:"Block";s:11:"description";s:62:"Controls the boxes that are displayed around the main content.";s:7:"package";s:15:"Core - required";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:5:"Block";s:11:"description";s:62:"Controls the boxes that are displayed around the main content.";s:7:"package";s:15:"Core - required";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/blog/blog.module',
@@ -31024,7 +42773,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Blog";s:11:"description";s:69:"Enables keeping easily and regularly updated user web pages or blogs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Blog";s:11:"description";s:69:"Enables keeping easily and regularly updated user web pages or blogs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/blogapi/blogapi.module',
@@ -31036,7 +42785,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:8:"Blog API";s:11:"description";s:79:"Allows users to post content using applications that support XML-RPC blog APIs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:8:"Blog API";s:11:"description";s:79:"Allows users to post content using applications that support XML-RPC blog APIs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/book/book.module',
@@ -31048,7 +42797,7 @@
   'bootstrap' => '0',
   'schema_version' => '6000',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Book";s:11:"description";s:63:"Allows users to structure site pages in a hierarchy or outline.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Book";s:11:"description";s:63:"Allows users to structure site pages in a hierarchy or outline.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/color/color.module',
@@ -31060,7 +42809,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:5:"Color";s:11:"description";s:61:"Allows the user to change the color scheme of certain themes.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:5:"Color";s:11:"description";s:61:"Allows the user to change the color scheme of certain themes.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/comment/comment.module',
@@ -31072,7 +42821,7 @@
   'bootstrap' => '0',
   'schema_version' => '6005',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Comment";s:11:"description";s:57:"Allows users to comment on and discuss published content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:7:"Comment";s:11:"description";s:57:"Allows users to comment on and discuss published content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/contact/contact.module',
@@ -31084,7 +42833,7 @@
   'bootstrap' => '0',
   'schema_version' => '6001',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Contact";s:11:"description";s:61:"Enables the use of both personal and site-wide contact forms.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:7:"Contact";s:11:"description";s:61:"Enables the use of both personal and site-wide contact forms.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/dblog/dblog.module',
@@ -31096,7 +42845,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:16:"Database logging";s:11:"description";s:47:"Logs and records system events to the database.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:16:"Database logging";s:11:"description";s:47:"Logs and records system events to the database.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/filter/filter.module',
@@ -31108,7 +42857,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Filter";s:11:"description";s:60:"Handles the filtering of content in preparation for display.";s:7:"package";s:15:"Core - required";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"Filter";s:11:"description";s:60:"Handles the filtering of content in preparation for display.";s:7:"package";s:15:"Core - required";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/forum/forum.module',
@@ -31120,7 +42869,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:5:"Forum";s:11:"description";s:50:"Enables threaded discussions about general topics.";s:12:"dependencies";a:2:{i:0;s:8:"taxonomy";i:1;s:7:"comment";}s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:5:"Forum";s:11:"description";s:50:"Enables threaded discussions about general topics.";s:12:"dependencies";a:2:{i:0;s:8:"taxonomy";i:1;s:7:"comment";}s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/help/help.module',
@@ -31132,7 +42881,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Help";s:11:"description";s:35:"Manages the display of online help.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Help";s:11:"description";s:35:"Manages the display of online help.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/locale/locale.module',
@@ -31144,7 +42893,7 @@
   'bootstrap' => '0',
   'schema_version' => '6007',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Locale";s:11:"description";s:119:"Adds language handling functionality and enables the translation of the user interface to languages other than English.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"Locale";s:11:"description";s:119:"Adds language handling functionality and enables the translation of the user interface to languages other than English.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/menu/menu.module',
@@ -31156,7 +42905,7 @@
   'bootstrap' => '0',
   'schema_version' => '6000',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Menu";s:11:"description";s:60:"Allows administrators to customize the site navigation menu.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Menu";s:11:"description";s:60:"Allows administrators to customize the site navigation menu.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/node/node.module',
@@ -31168,7 +42917,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Node";s:11:"description";s:66:"Allows content to be submitted to the site and displayed on pages.";s:7:"package";s:15:"Core - required";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Node";s:11:"description";s:66:"Allows content to be submitted to the site and displayed on pages.";s:7:"package";s:15:"Core - required";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/openid/openid.module',
@@ -31180,7 +42929,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"OpenID";s:11:"description";s:48:"Allows users to log into your site using OpenID.";s:7:"version";s:4:"6.37";s:7:"package";s:15:"Core - optional";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"OpenID";s:11:"description";s:48:"Allows users to log into your site using OpenID.";s:7:"version";s:8:"6.38-dev";s:7:"package";s:15:"Core - optional";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/path/path.module',
@@ -31192,7 +42941,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Path";s:11:"description";s:28:"Allows users to rename URLs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Path";s:11:"description";s:28:"Allows users to rename URLs.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/php/php.module',
@@ -31204,7 +42953,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:10:"PHP filter";s:11:"description";s:50:"Allows embedded PHP code/snippets to be evaluated.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:10:"PHP filter";s:11:"description";s:50:"Allows embedded PHP code/snippets to be evaluated.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/ping/ping.module',
@@ -31216,7 +42965,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Ping";s:11:"description";s:51:"Alerts other sites when your site has been updated.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Ping";s:11:"description";s:51:"Alerts other sites when your site has been updated.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/poll/poll.module',
@@ -31228,7 +42977,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Poll";s:11:"description";s:95:"Allows your site to capture votes on different topics in the form of multiple choice questions.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"Poll";s:11:"description";s:95:"Allows your site to capture votes on different topics in the form of multiple choice questions.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/profile/profile.module',
@@ -31240,7 +42989,7 @@
   'bootstrap' => '0',
   'schema_version' => '6001',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Profile";s:11:"description";s:36:"Supports configurable user profiles.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:7:"Profile";s:11:"description";s:36:"Supports configurable user profiles.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/search/search.module',
@@ -31252,7 +43001,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Search";s:11:"description";s:36:"Enables site-wide keyword searching.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"Search";s:11:"description";s:36:"Enables site-wide keyword searching.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/statistics/statistics.module',
@@ -31264,7 +43013,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:10:"Statistics";s:11:"description";s:37:"Logs access statistics for your site.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:10:"Statistics";s:11:"description";s:37:"Logs access statistics for your site.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/syslog/syslog.module',
@@ -31276,7 +43025,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Syslog";s:11:"description";s:41:"Logs and records system events to syslog.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"Syslog";s:11:"description";s:41:"Logs and records system events to syslog.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/system/system.module',
@@ -31288,7 +43037,7 @@
   'bootstrap' => '0',
   'schema_version' => '6055',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"System";s:11:"description";s:54:"Handles general site configuration for administrators.";s:7:"package";s:15:"Core - required";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"System";s:11:"description";s:54:"Handles general site configuration for administrators.";s:7:"package";s:15:"Core - required";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/taxonomy/taxonomy.module',
@@ -31300,7 +43049,7 @@
   'bootstrap' => '0',
   'schema_version' => '6001',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:8:"Taxonomy";s:11:"description";s:38:"Enables the categorization of content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:8:"Taxonomy";s:11:"description";s:38:"Enables the categorization of content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/throttle/throttle.module',
@@ -31312,7 +43061,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:8:"Throttle";s:11:"description";s:66:"Handles the auto-throttling mechanism, to control site congestion.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:8:"Throttle";s:11:"description";s:66:"Handles the auto-throttling mechanism, to control site congestion.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/tracker/tracker.module',
@@ -31324,7 +43073,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Tracker";s:11:"description";s:43:"Enables tracking of recent posts for users.";s:12:"dependencies";a:1:{i:0;s:7:"comment";}s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:7:"Tracker";s:11:"description";s:43:"Enables tracking of recent posts for users.";s:12:"dependencies";a:1:{i:0;s:7:"comment";}s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/translation/translation.module',
@@ -31336,7 +43085,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:19:"Content translation";s:11:"description";s:57:"Allows content to be translated into different languages.";s:12:"dependencies";a:1:{i:0;s:6:"locale";}s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:19:"Content translation";s:11:"description";s:57:"Allows content to be translated into different languages.";s:12:"dependencies";a:1:{i:0;s:6:"locale";}s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/trigger/trigger.module',
@@ -31348,7 +43097,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Trigger";s:11:"description";s:90:"Enables actions to be fired on certain system events, such as when new content is created.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:7:"Trigger";s:11:"description";s:90:"Enables actions to be fired on certain system events, such as when new content is created.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/update/update.module',
@@ -31360,7 +43109,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:13:"Update status";s:11:"description";s:88:"Checks the status of available updates for Drupal and your installed modules and themes.";s:7:"version";s:4:"6.37";s:7:"package";s:15:"Core - optional";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:13:"Update status";s:11:"description";s:88:"Checks the status of available updates for Drupal and your installed modules and themes.";s:7:"version";s:8:"6.38-dev";s:7:"package";s:15:"Core - optional";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/upload/upload.module',
@@ -31372,7 +43121,7 @@
   'bootstrap' => '0',
   'schema_version' => '6000',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Upload";s:11:"description";s:51:"Allows users to upload and attach files to content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:6:"Upload";s:11:"description";s:51:"Allows users to upload and attach files to content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'modules/user/user.module',
@@ -31384,7 +43133,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"User";s:11:"description";s:47:"Manages the user registration and login system.";s:7:"package";s:15:"Core - required";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:8:{s:4:"name";s:4:"User";s:11:"description";s:47:"Manages the user registration and login system.";s:7:"package";s:15:"Core - required";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/content.module',
@@ -31396,7 +43145,7 @@
   'bootstrap' => '0',
   'schema_version' => '6010',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:7:"Content";s:11:"description";s:50:"Allows administrators to define new content types.";s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:7:"Content";s:11:"description";s:50:"Allows administrators to define new content types.";s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/content_copy/content_copy.module',
@@ -31408,7 +43157,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:12:"Content Copy";s:11:"description";s:51:"Enables ability to import/export field definitions.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:12:"Content Copy";s:11:"description";s:51:"Enables ability to import/export field definitions.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/content_permissions/content_permissions.module',
@@ -31420,7 +43169,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:19:"Content Permissions";s:11:"description";s:43:"Set field-level permissions for CCK fields.";s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:19:"Content Permissions";s:11:"description";s:43:"Set field-level permissions for CCK fields.";s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/fieldgroup/fieldgroup.module',
@@ -31432,7 +43181,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:10:"Fieldgroup";s:11:"description";s:37:"Create display groups for CCK fields.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:10:"Fieldgroup";s:11:"description";s:37:"Create display groups for CCK fields.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/nodereference/nodereference.module',
@@ -31444,7 +43193,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:14:"Node Reference";s:11:"description";s:59:"Defines a field type for referencing one node from another.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:14:"Node Reference";s:11:"description";s:59:"Defines a field type for referencing one node from another.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/number/number.module',
@@ -31456,7 +43205,7 @@
   'bootstrap' => '0',
   'schema_version' => '6000',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:6:"Number";s:11:"description";s:28:"Defines numeric field types.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:6:"Number";s:11:"description";s:28:"Defines numeric field types.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/optionwidgets/optionwidgets.module',
@@ -31468,7 +43217,7 @@
   'bootstrap' => '0',
   'schema_version' => '6001',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:14:"Option Widgets";s:11:"description";s:82:"Defines selection, check box and radio button widgets for text and numeric fields.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:14:"Option Widgets";s:11:"description";s:82:"Defines selection, check box and radio button widgets for text and numeric fields.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/text/text.module',
@@ -31480,7 +43229,7 @@
   'bootstrap' => '0',
   'schema_version' => '6003',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:4:"Text";s:11:"description";s:32:"Defines simple text field types.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:4:"Text";s:11:"description";s:32:"Defines simple text field types.";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/cck/modules/userreference/userreference.module',
@@ -31492,7 +43241,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:14:"User Reference";s:11:"description";s:56:"Defines a field type for referencing a user from a node.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.10";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1434568159";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:14:"User Reference";s:11:"description";s:56:"Defines a field type for referencing a user from a node.";s:12:"dependencies";a:3:{i:0;s:7:"content";i:1;s:4:"text";i:2;s:13:"optionwidgets";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-2.9";s:7:"project";s:3:"cck";s:9:"datestamp";s:10:"1294407979";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date/date.module',
@@ -31711,6 +43460,138 @@
   'info' => 'a:10:{s:4:"name";s:14:"FileField Meta";s:11:"description";s:48:"Add metadata gathering and storage to FileField.";s:12:"dependencies";a:2:{i:0;s:9:"filefield";i:1;s:6:"getid3";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:3:"php";s:3:"5.0";s:7:"version";s:8:"6.x-3.13";s:7:"project";s:9:"filefield";s:9:"datestamp";s:10:"1405541029";s:10:"dependents";a:0:{}}',
 ))
 ->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n.module',
+  'name' => 'i18n',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '1',
+  'schema_version' => '9',
+  'weight' => '10',
+  'info' => 'a:10:{s:4:"name";s:20:"Internationalization";s:11:"description";s:49:"Extends Drupal support for multilingual features.";s:12:"dependencies";a:2:{i:0;s:6:"locale";i:1;s:11:"translation";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18nblocks/i18nblocks.module',
+  'name' => 'i18nblocks',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6001',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:17:"Block translation";s:11:"description";s:50:"Enables multilingual blocks and block translation.";s:12:"dependencies";a:2:{i:0;s:4:"i18n";i:1;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18ncck/i18ncck.module',
+  'name' => 'i18ncck',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '0',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:15:"CCK translation";s:11:"description";s:56:"Supports translatable custom CCK fields and fieldgroups.";s:12:"dependencies";a:3:{i:0;s:4:"i18n";i:1;s:7:"content";i:2;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18ncontent/i18ncontent.module',
+  'name' => 'i18ncontent',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6002',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:24:"Content type translation";s:11:"description";s:99:"Add multilingual options for content and translate related strings: name, description, help text...";s:12:"dependencies";a:1:{i:0;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18nmenu/i18nmenu.module',
+  'name' => 'i18nmenu',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '0',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:16:"Menu translation";s:11:"description";s:40:"Supports translatable custom menu items.";s:12:"dependencies";a:4:{i:0;s:4:"i18n";i:1;s:4:"menu";i:2;s:10:"i18nblocks";i:3;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18npoll/i18npoll.module',
+  'name' => 'i18npoll',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:14:"Poll aggregate";s:11:"description";s:45:"Aggregates poll results for all translations.";s:12:"dependencies";a:2:{i:0;s:11:"translation";i:1;s:4:"poll";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18nprofile/i18nprofile.module',
+  'name' => 'i18nprofile',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '2',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:19:"Profile translation";s:11:"description";s:36:"Enables multilingual profile fields.";s:12:"dependencies";a:2:{i:0;s:7:"profile";i:1;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18nstrings/i18nstrings.module',
+  'name' => 'i18nstrings',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6006',
+  'weight' => '10',
+  'info' => 'a:10:{s:4:"name";s:18:"String translation";s:11:"description";s:57:"Provides support for translation of user defined strings.";s:12:"dependencies";a:1:{i:0;s:6:"locale";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18nsync/i18nsync.module',
+  'name' => 'i18nsync',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:24:"Synchronize translations";s:11:"description";s:74:"Synchronizes taxonomy and fields accross translations of the same content.";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18ntaxonomy/i18ntaxonomy.module',
+  'name' => 'i18ntaxonomy',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6002',
+  'weight' => '5',
+  'info' => 'a:10:{s:4:"name";s:20:"Taxonomy translation";s:11:"description";s:30:"Enables multilingual taxonomy.";s:12:"dependencies";a:3:{i:0;s:4:"i18n";i:1;s:8:"taxonomy";i:2;s:11:"i18nstrings";}s:7:"package";s:13:"Multilanguage";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/tests/i18n_test.module',
+  'name' => 'i18n_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:10:{s:4:"name";s:26:"Internationalization tests";s:11:"description";s:55:"Helper module for testing i18n (do not enable manually)";s:12:"dependencies";a:3:{i:0;s:6:"locale";i:1;s:11:"translation";i:2;s:4:"i18n";}s:7:"package";s:7:"Testing";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-1.10";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1318336004";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
   'filename' => 'sites/all/modules/imageapi/imageapi.module',
   'name' => 'imageapi',
   'type' => 'module',
@@ -31819,6 +43700,30 @@
   'info' => 'a:10:{s:4:"name";s:11:"Phone - CCK";s:11:"description";s:84:"The phone module allows administrators to define a CCK field type for phone numbers.";s:7:"package";s:3:"CCK";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.18";s:7:"project";s:5:"phone";s:9:"datestamp";s:10:"1294067495";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
+  'filename' => 'sites/all/modules/variable/variable.module',
+  'name' => 'variable',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:7:{s:4:"name";s:12:"Variable API";s:11:"description";s:12:"Variable API";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable_admin/variable_admin.module',
+  'name' => 'variable_admin',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '0',
+  'weight' => '0',
+  'info' => 'a:7:{s:4:"name";s:14:"Variable admin";s:11:"description";s:23:"Variable API - Admin UI";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
   'filename' => 'sites/all/modules/views/tests/views_test.module',
   'name' => 'views_test',
   'type' => 'module',
@@ -31840,7 +43745,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:5:"Views";s:11:"description";s:55:"Create customized lists and queries from your database.";s:7:"package";s:5:"Views";s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-3.0";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1325638545";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:5:"Views";s:11:"description";s:55:"Create customized lists and queries from your database.";s:7:"package";s:5:"Views";s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.18";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1423647793";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/views_export/views_export.module',
@@ -31852,7 +43757,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:14:"Views exporter";s:11:"description";s:40:"Allows exporting multiple views at once.";s:7:"package";s:5:"Views";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:4:"core";s:3:"6.x";s:7:"version";s:7:"6.x-3.0";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1325638545";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:14:"Views exporter";s:11:"description";s:40:"Allows exporting multiple views at once.";s:7:"package";s:5:"Views";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:4:"core";s:3:"6.x";s:7:"version";s:8:"6.x-2.18";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1423647793";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/views_ui.module',
@@ -31864,7 +43769,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:8:"Views UI";s:11:"description";s:93:"Administrative interface to views. Without this module, you cannot create or edit your views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:7:"version";s:7:"6.x-3.0";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1325638545";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:8:"Views UI";s:11:"description";s:93:"Administrative interface to views. Without this module, you cannot create or edit your views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:7:"version";s:8:"6.x-2.18";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1423647793";s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'themes/bluemarine/bluemarine.info',
@@ -31876,7 +43781,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:11:{s:4:"name";s:10:"Bluemarine";s:11:"description";s:66:"Table-based multi-column theme with a marine and ash color scheme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/bluemarine/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/bluemarine/script.js";}s:10:"screenshot";s:32:"themes/bluemarine/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'themes/chameleon/chameleon.info',
@@ -31888,7 +43793,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:10:{s:4:"name";s:9:"Chameleon";s:11:"description";s:42:"Minimalist tabled theme with light colors.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:8:"features";a:4:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";}s:11:"stylesheets";a:1:{s:3:"all";a:2:{s:9:"style.css";s:26:"themes/chameleon/style.css";s:10:"common.css";s:27:"themes/chameleon/common.css";}}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:7:"scripts";a:1:{s:9:"script.js";s:26:"themes/chameleon/script.js";}s:10:"screenshot";s:31:"themes/chameleon/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'themes/chameleon/marvin/marvin.info',
@@ -31900,7 +43805,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:11:{s:4:"name";s:6:"Marvin";s:11:"description";s:31:"Boxy tabled theme in all grays.";s:7:"regions";a:2:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";}s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:9:"chameleon";s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:33:"themes/chameleon/marvin/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/chameleon/marvin/script.js";}s:10:"screenshot";s:38:"themes/chameleon/marvin/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'themes/garland/garland.info',
@@ -31912,7 +43817,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:11:{s:4:"name";s:7:"Garland";s:11:"description";s:66:"Tableless, recolorable, multi-column, fluid width theme (default).";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:24:"themes/garland/script.js";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
   'filename' => 'themes/garland/minnelli/minnelli.info',
@@ -31924,7 +43829,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}',
+  'info' => 'a:12:{s:4:"name";s:8:"Minnelli";s:11:"description";s:56:"Tableless, recolorable, multi-column, fixed width theme.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:10:"base theme";s:7:"garland";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:12:"minnelli.css";s:36:"themes/garland/minnelli/minnelli.css";}}s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:7:"scripts";a:1:{s:9:"script.js";s:33:"themes/garland/minnelli/script.js";}s:10:"screenshot";s:38:"themes/garland/minnelli/screenshot.png";s:3:"php";s:5:"4.3.5";s:6:"engine";s:11:"phptemplate";}',
 ))
 ->values(array(
   'filename' => 'themes/pushbutton/pushbutton.info',
@@ -31936,7 +43841,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:4:"6.37";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1440020160";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}',
+  'info' => 'a:11:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:8:"6.38-dev";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
 ->execute();
 
@@ -31972,6 +43877,18 @@
       'size' => 'normal',
       'default' => '0',
     ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
+    'trid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
   ),
   'primary key' => array(
     'tid',
@@ -31986,6 +43903,8 @@
   'name',
   'description',
   'weight',
+  'language',
+  'trid',
 ))
 ->values(array(
   'tid' => '1',
@@ -31993,6 +43912,8 @@
   'name' => 'term 1 of vocabulary 1',
   'description' => 'description of term 1 of vocabulary 1',
   'weight' => '0',
+  'language' => '',
+  'trid' => '0',
 ))
 ->values(array(
   'tid' => '2',
@@ -32000,6 +43921,8 @@
   'name' => 'term 2 of vocabulary 2',
   'description' => 'description of term 2 of vocabulary 2',
   'weight' => '3',
+  'language' => '',
+  'trid' => '0',
 ))
 ->values(array(
   'tid' => '3',
@@ -32007,6 +43930,8 @@
   'name' => 'term 3 of vocabulary 2',
   'description' => 'description of term 3 of vocabulary 2',
   'weight' => '4',
+  'language' => '',
+  'trid' => '0',
 ))
 ->values(array(
   'tid' => '4',
@@ -32014,6 +43939,8 @@
   'name' => 'term 4 of vocabulary 3',
   'description' => 'description of term 4 of vocabulary 3',
   'weight' => '6',
+  'language' => '',
+  'trid' => '0',
 ))
 ->values(array(
   'tid' => '5',
@@ -32021,6 +43948,8 @@
   'name' => 'term 5 of vocabulary 3',
   'description' => 'description of term 5 of vocabulary 3',
   'weight' => '7',
+  'language' => '',
+  'trid' => '0',
 ))
 ->values(array(
   'tid' => '6',
@@ -32028,6 +43957,8 @@
   'name' => 'term 6 of vocabulary 3',
   'description' => 'description of term 6 of vocabulary 3',
   'weight' => '8',
+  'language' => '',
+  'trid' => '0',
 ))
 ->execute();
 
@@ -32552,8 +44483,8 @@
   'signature' => '',
   'signature_format' => '0',
   'created' => '0',
-  'access' => '1444943005',
-  'login' => '1444943005',
+  'access' => '1458198052',
+  'login' => '1458193160',
   'status' => '1',
   'timezone' => NULL,
   'language' => '',
@@ -32833,6 +44764,10 @@
   'value' => 's:5:"Guest";',
 ))
 ->values(array(
+  'name' => 'array_filter',
+  'value' => 'b:1;',
+))
+->values(array(
   'name' => 'book_allowed_types',
   'value' => 'a:1:{i:0;s:4:"book";}',
 ))
@@ -33214,7 +45149,7 @@
 ))
 ->values(array(
   'name' => 'css_js_query_string',
-  'value' => 's:20:"SAkMTxRZndiw70000000";',
+  'value' => 's:20:"8SAkMTxRZndiw7000000";',
 ))
 ->values(array(
   'name' => 'date:story:4:field_test_datestamp_fromto',
@@ -33513,6 +45448,10 @@
   'value' => 's:3:"all";',
 ))
 ->values(array(
+  'name' => 'event_timezone_display',
+  'value' => 's:5:"event";',
+))
+->values(array(
   'name' => 'feed_default_items',
   'value' => 'i:10;',
 ))
@@ -33593,6 +45532,10 @@
   'value' => 's:2:"25";',
 ))
 ->values(array(
+  'name' => 'i18nstrings_allowed_formats',
+  'value' => 'a:2:{i:0;i:1;i:1;i:2;}',
+))
+->values(array(
   'name' => 'image_jpeg_quality',
   'value' => 'i:75;',
 ))
@@ -33602,7 +45545,7 @@
 ))
 ->values(array(
   'name' => 'javascript_parsed',
-  'value' => 'a:0:{}',
+  'value' => 'a:21:{i:0;s:14:"misc/jquery.js";i:1;s:14:"misc/drupal.js";i:2;s:19:"misc/tableheader.js";i:3;s:16:"misc/collapse.js";i:4;s:16:"misc/textarea.js";i:5;s:20:"modules/user/user.js";i:6;s:17:"misc/tabledrag.js";i:7;s:26:"modules/profile/profile.js";i:8;s:12:"misc/form.js";i:9;s:19:"misc/tableselect.js";i:10;s:20:"misc/autocomplete.js";s:10:"refresh:ga";s:7:"waiting";s:10:"refresh:ab";s:7:"waiting";s:10:"refresh:ca";s:7:"waiting";s:10:"refresh:fi";s:7:"waiting";s:10:"refresh:es";s:7:"waiting";i:11;s:16:"misc/progress.js";i:12;s:13:"misc/batch.js";s:10:"refresh:nl";s:7:"waiting";s:10:"refresh:de";s:7:"waiting";s:10:"refresh:pl";s:7:"waiting";}',
 ))
 ->values(array(
   'name' => 'language_content_type_article',
@@ -33610,13 +45553,17 @@
 ))
 ->values(array(
   'name' => 'language_count',
-  'value' => 'i:2;',
+  'value' => 'i:11;',
 ))
 ->values(array(
   'name' => 'language_default',
   'value' => 'O:8:"stdClass":11:{s:8:"language";s:2:"en";s:4:"name";s:7:"English";s:6:"native";s:7:"English";s:9:"direction";s:1:"0";s:7:"enabled";i:1;s:7:"plurals";s:1:"0";s:7:"formula";s:0:"";s:6:"domain";s:0:"";s:6:"prefix";s:0:"";s:6:"weight";s:1:"0";s:10:"javascript";s:0:"";}',
 ))
 ->values(array(
+  'name' => 'language_negotiation',
+  'value' => 's:1:"1";',
+))
+->values(array(
   'name' => 'locale_cache_strings',
   'value' => 'i:1;',
 ))
@@ -34018,6 +45965,12 @@
       'size' => 'normal',
       'default' => '0',
     ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
   ),
   'primary key' => array(
     'vid',
@@ -34038,6 +45991,7 @@
   'tags',
   'module',
   'weight',
+  'language',
 ))
 ->values(array(
   'vid' => '1',
@@ -34051,6 +46005,7 @@
   'tags' => '0',
   'module' => 'taxonomy',
   'weight' => '4',
+  'language' => '',
 ))
 ->values(array(
   'vid' => '2',
@@ -34064,6 +46019,7 @@
   'tags' => '1',
   'module' => 'taxonomy',
   'weight' => '5',
+  'language' => '',
 ))
 ->values(array(
   'vid' => '3',
@@ -34077,6 +46033,7 @@
   'tags' => '0',
   'module' => 'taxonomy',
   'weight' => '6',
+  'language' => '',
 ))
 ->values(array(
   'vid' => '4',
@@ -34090,6 +46047,7 @@
   'tags' => '0',
   'module' => 'taxonomy',
   'weight' => '0',
+  'language' => '',
 ))
 ->values(array(
   'vid' => '5',
@@ -34103,6 +46061,7 @@
   'tags' => '0',
   'module' => 'taxonomy',
   'weight' => '7',
+  'language' => '',
 ))
 ->execute();
 
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
new file mode 100644
index 0000000..68c4211
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/MigrateDrupalTestBase.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+
+/**
+ * Base class for Drupal migration tests.
+ */
+abstract class MigrateDrupalTestBase extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'field', 'migrate_drupal', 'options', 'file');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installConfig(['migrate_drupal', 'system']);
+  }
+
+  /**
+   * Loads a database fixture into the source database connection.
+   *
+   * @param string $path
+   *   Path to the dump file.
+   */
+  protected function loadFixture($path) {
+    $default_db = Database::getConnection()->getKey();
+    Database::setActiveConnection($this->sourceDatabase->getKey());
+
+    if (substr($path, -3) == '.gz') {
+      $path = 'compress.zlib://' . $path;
+    }
+    require $path;
+
+    Database::setActiveConnection($default_db);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
new file mode 100644
index 0000000..fc271a5
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d6\EntityContentBaseTest.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * @group migrate_drupal
+ */
+class EntityContentBaseTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['migrate_overwrite_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a field on the user entity so that we can test nested property
+    // overwrites.
+    // @see static::testOverwriteSelectedNestedProperty()
+    FieldStorageConfig::create([
+      'field_name' => 'signature',
+      'entity_type' => 'user',
+      'type' => 'text_long',
+    ])->save();
+
+    FieldConfig::create([
+      'field_name' => 'signature',
+      'entity_type' => 'user',
+      'bundle' => 'user',
+    ])->save();
+
+    User::create([
+      'uid' => 2,
+      'name' => 'Ford Prefect',
+      'mail' => 'ford.prefect@localhost',
+      'signature' => array(
+        array(
+          'value' => 'Bring a towel.',
+          'format' => 'filtered_html',
+        ),
+      ),
+      'init' => 'proto@zo.an',
+    ])->save();
+
+    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
+  }
+
+  /**
+   * Tests overwriting all mapped properties in the destination entity (default
+   * behavior).
+   */
+  public function testOverwriteAllMappedProperties() {
+    $this->executeMigration('d6_user');
+    /** @var \Drupal\user\UserInterface $account */
+    $account = User::load(2);
+    $this->assertIdentical('john.doe', $account->label());
+    $this->assertIdentical('john.doe@example.com', $account->getEmail());
+    $this->assertIdentical('doe@example.com', $account->getInitialEmail());
+  }
+
+  /**
+   * Tests overwriting selected properties in the destination entity, specified
+   * in the destination configuration.
+   */
+  public function testOverwriteProperties() {
+    // Execute the migration in migrate_overwrite_test, which documents how
+    // property overwrites work.
+    $this->executeMigration('users');
+
+    /** @var \Drupal\user\UserInterface $account */
+    $account = User::load(2);
+    $this->assertIdentical('john.doe', $account->label());
+    $this->assertIdentical('john.doe@example.com', $account->getEmail());
+    $this->assertIdentical('The answer is 42.', $account->signature->value);
+    // This value is not overwritten because it's not listed in
+    // overwrite_properties.
+    $this->assertIdentical('proto@zo.an', $account->getInitialEmail());
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
new file mode 100644
index 0000000..c650f57
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6TestBase.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+
+/**
+ * Base class for Drupal 6 migration tests.
+ */
+abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'datetime',
+    'filter',
+    'image',
+    'link',
+    'node',
+    'options',
+    'telephone',
+    'text',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture( __DIR__ . '/../../../fixtures/drupal6.php');
+  }
+
+  /**
+   * Executes all user migrations.
+   *
+   * @param bool $include_pictures
+   *   If TRUE, migrates user pictures.
+   */
+  protected function migrateUsers($include_pictures = TRUE) {
+    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
+
+    if ($include_pictures) {
+      $this->installEntitySchema('file');
+      $this->executeMigrations([
+        'd6_file',
+        'd6_user_picture_file',
+        'user_picture_field',
+        'user_picture_field_instance',
+        'user_picture_entity_display',
+        'user_picture_entity_form_display',
+      ]);
+    }
+
+    $this->executeMigration('d6_user');
+  }
+
+  /**
+   * Migrates node types.
+   */
+  protected function migrateContentTypes() {
+    $this->installConfig(['node']);
+    $this->executeMigration('d6_node_type');
+  }
+
+  /**
+   * Executes all field migrations.
+   */
+  protected function migrateFields() {
+    $this->migrateContentTypes();
+    $this->executeMigrations([
+      'd6_field',
+      'd6_field_instance',
+      'd6_field_instance_widget_settings',
+      'd6_view_modes',
+      'd6_field_formatter_settings',
+      'd6_upload_field',
+      'd6_upload_field_instance',
+    ]);
+  }
+
+  /**
+   * Executes all content migrations.
+   *
+   * @param bool $include_revisions
+   *   If TRUE, migrates node revisions.
+   */
+  protected function migrateContent($include_revisions = FALSE) {
+    $this->migrateUsers(FALSE);
+    $this->migrateFields();
+
+    $this->installEntitySchema('node');
+    $this->executeMigrations(['d6_node_settings', 'd6_node']);
+
+    if ($include_revisions) {
+      $this->executeMigrations(['d6_node_revision']);
+    }
+  }
+
+  /**
+   * Executes all taxonomy migrations.
+   */
+  protected function migrateTaxonomy() {
+    $this->migrateContentTypes();
+    $this->installEntitySchema('taxonomy_term');
+    $this->executeMigrations([
+      'd6_taxonomy_vocabulary',
+      'd6_vocabulary_field',
+      'd6_vocabulary_field_instance',
+      'd6_vocabulary_entity_display',
+      'd6_vocabulary_entity_form_display',
+      'd6_taxonomy_term',
+    ]);
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
new file mode 100644
index 0000000..3a15ff6
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7TestBase.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+
+/**
+ * Base class for Drupal 7 migration tests.
+ */
+abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(__DIR__ . '/../../../fixtures/drupal7.php');
+  }
+
+}
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
new file mode 100644
index 0000000..fb63811
--- /dev/null
+++ b/core/modules/migrate_drupal/tests/src/Kernel/dependencies/MigrateDependenciesTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\migrate_drupal\Kernel\dependencies\MigrateDependenciesTest.
+ */
+
+namespace Drupal\Tests\migrate_drupal\Kernel\dependencies;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Ensure the consistency among the dependencies for migrate.
+ *
+ * @group migrate_drupal
+ */
+class MigrateDependenciesTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator', 'comment'];
+
+  /**
+   * Tests that the order is correct when loading several migrations.
+   */
+  public function testMigrateDependenciesOrder() {
+    $migration_items = array('d6_comment', 'd6_filter_format', 'd6_node:page');
+    $migrations = $this->container->get('plugin.manager.migration')->createInstances($migration_items);
+    $expected_order = array('d6_filter_format', 'd6_node:page', 'd6_comment');
+    $this->assertIdentical(array_keys($migrations), $expected_order);
+    $expected_requirements = array(
+      // d6_comment depends on d6_node:*, which the deriver expands into every
+      // variant of d6_node.
+      'd6_node:article',
+      'd6_node:company',
+      'd6_node:employee',
+      'd6_node:event',
+      'd6_node:page',
+      'd6_node:sponsor',
+      'd6_node:story',
+      'd6_node:test_event',
+      'd6_node:test_page',
+      'd6_node:test_planet',
+      'd6_node:test_story',
+      'd6_node_type',
+      'd6_node_settings',
+      'd6_filter_format',
+      'd6_user',
+      'd6_comment_type',
+      'd6_comment_entity_display',
+      'd6_comment_entity_form_display',
+    );
+    // Migration dependencies for comment include dependencies for node
+    // migration as well.
+    $actual_requirements = $migrations['d6_comment']->get('requirements');
+    $this->assertIdentical(count($actual_requirements), count($expected_requirements));
+    foreach ($expected_requirements as $requirement) {
+      $this->assertIdentical($actual_requirements[$requirement], $requirement);
+    }
+  }
+
+  /**
+   * Tests dependencies on the migration of aggregator feeds & items.
+   */
+  public function testAggregatorMigrateDependencies() {
+    /** @var \Drupal\migrate\Plugin\Migration $migration */
+    $migration = $this->getMigration('d6_aggregator_item');
+    $executable = new MigrateExecutable($migration, $this);
+    $this->startCollectingMessages();
+    $executable->import();
+    $this->assertEqual($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id()))));
+    $this->collectMessages = FALSE;
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml
new file mode 100644
index 0000000..4a9c448
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml
@@ -0,0 +1,11 @@
+name: 'Drupal Upgrade UI'
+type: module
+description: 'UI for direct upgrades from older Drupal versions.'
+package: 'Core (Experimental)'
+version: VERSION
+core: 8.x
+configure: migrate_drupal_ui.upgrade
+dependencies:
+  - migrate
+  - migrate_drupal
+  - dblog
diff --git a/core/modules/migrate_drupal_ui/migrate_drupal_ui.install b/core/modules/migrate_drupal_ui/migrate_drupal_ui.install
new file mode 100644
index 0000000..7df3f17
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.install
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @file
+ * Install, update, and uninstall functions for the migrate_drupal_ui module.
+ */
+
+use Drupal\Core\Url;
+
+/**
+ * Implements hook_install().
+ */
+function migrate_drupal_ui_install() {
+  $url = Url::fromUri('base:upgrade')->toString();
+  drupal_set_message(t('The Drupal Upgrade UI module has been enabled. Proceed to the <a href=":url">upgrade form</a>.', [':url' => $url]));
+}
diff --git a/core/modules/migrate_drupal_ui/migrate_drupal_ui.module b/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
new file mode 100644
index 0000000..6202081
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.module
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Alert administrators before starting the import process.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function migrate_drupal_ui_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'help.page.migrate_drupal_ui':
+      $output = '<p>' . t('The Drupal Upgrade UI module provides a one-click upgrade from an earlier version of Drupal. For details, see the <a href=":migrate">online documentation for the Drupal Upgrade UI module</a> in the handbook on upgrading from previous versions.', [':migrate' => 'https://www.drupal.org/upgrade/migrate']) . '</p>';
+      return $output;
+  }
+}
diff --git a/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml b/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml
new file mode 100644
index 0000000..2d99abd
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml
@@ -0,0 +1,18 @@
+migrate_drupal_ui.upgrade:
+  path: '/upgrade'
+  defaults:
+    _form: '\Drupal\migrate_drupal_ui\Form\MigrateUpgradeForm'
+    _title: 'Upgrade'
+  requirements:
+    _custom_access: '\Drupal\migrate_drupal_ui\MigrateAccessCheck::checkAccess'
+  options:
+    _admin_route: TRUE
+
+migrate_drupal_ui.log:
+  path: '/upgrade/log'
+  defaults:
+      _controller: '\Drupal\migrate_drupal_ui\Controller\MigrateController::showLog'
+  requirements:
+    _custom_access: '\Drupal\migrate_drupal_ui\MigrateAccessCheck::checkAccess'
+  options:
+    _admin_route: TRUE
diff --git a/core/modules/migrate_drupal_ui/src/Controller/MigrateController.php b/core/modules/migrate_drupal_ui/src/Controller/MigrateController.php
new file mode 100644
index 0000000..5d4a885
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Controller/MigrateController.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Controller\MigrateController.
+ */
+
+namespace Drupal\migrate_drupal_ui\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Provides controller methods for the migration.
+ */
+class MigrateController extends ControllerBase {
+
+  /**
+   * Sets a log filter and redirects to the log.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   A redirect response object that may be returned by the controller.
+   */
+  public function showLog() {
+    $_SESSION['dblog_overview_filter'] = [];
+    $_SESSION['dblog_overview_filter']['type'] = ['migrate_drupal_ui' => 'migrate_drupal_ui'];
+    return $this->redirect('dblog.overview');
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
new file mode 100644
index 0000000..bf50d5b
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php
@@ -0,0 +1,1123 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Form\MigrateUpgradeForm.
+ */
+
+namespace Drupal\migrate_drupal_ui\Form;
+
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\State\StateInterface;
+use Drupal\Core\Url;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
+use Drupal\migrate_drupal_ui\MigrateUpgradeRunBatch;
+use Drupal\migrate_drupal\MigrationCreationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines a multi-step form for performing direct site upgrades.
+ */
+class MigrateUpgradeForm extends ConfirmFormBase {
+
+  use MigrationCreationTrait;
+
+  /**
+   * Mapping of known migrations and their source and destination modules.
+   *
+   * @todo https://www.drupal.org/node/2569805 Hardcoding this information is
+   *   not robust - the migrations themselves should hold the necessary
+   *   information.
+   *
+   * @var array[]
+   */
+  protected $moduleUpgradePaths = [
+    'd6_action_settings' => [
+      'source_module' => 'system',
+      'destination_module' => 'action',
+    ],
+    'd6_aggregator_feed' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd6_aggregator_item' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd6_aggregator_settings' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd7_aggregator_feed' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd7_aggregator_item' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd7_aggregator_settings' => [
+      'source_module' => 'aggregator',
+      'destination_module' => 'aggregator',
+    ],
+    'd7_blocked_ips' => [
+      'source_module' => 'system',
+      'destination_module' => 'ban',
+    ],
+    'd6_block' => [
+      'source_module' => 'block',
+      'destination_module' => 'block',
+    ],
+    'd7_block' => [
+      'source_module' => 'block',
+      'destination_module' => 'block',
+    ],
+    'block_content_body_field' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
+    'block_content_type' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
+    'd6_custom_block' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
+    'd7_custom_block' => [
+      'source_module' => 'block',
+      'destination_module' => 'block_content',
+    ],
+    'd6_book' => [
+      'source_module' => 'book',
+      'destination_module' => 'book',
+    ],
+    'd6_book_settings' => [
+      'source_module' => 'book',
+      'destination_module' => 'book',
+    ],
+    'd6_comment' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_entity_display' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_entity_form_display' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_entity_form_display_subject' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_field' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_field_instance' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd6_comment_type' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_entity_display' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_entity_form_display' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_entity_form_display_subject' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_field' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_field_instance' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'd7_comment_type' => [
+      'source_module' => 'comment',
+      'destination_module' => 'comment',
+    ],
+    'contact_category' => [
+      'source_module' => 'contact',
+      'destination_module' => 'contact',
+    ],
+    'd6_contact_settings' => [
+      'source_module' => 'contact',
+      'destination_module' => 'contact',
+    ],
+    'd7_contact_settings' => [
+      'source_module' => 'contact',
+      'destination_module' => 'contact',
+    ],
+    'd6_dblog_settings' => [
+      'source_module' => 'dblog',
+      'destination_module' => 'dblog',
+    ],
+    'd7_dblog_settings' => [
+      'source_module' => 'dblog',
+      'destination_module' => 'dblog',
+    ],
+    'd6_field' => [
+      'source_module' => 'content',
+      'destination_module' => 'field',
+    ],
+    'd6_field_formatter_settings' => [
+      'source_module' => 'content',
+      'destination_module' => 'field',
+    ],
+    'd6_field_instance' => [
+      'source_module' => 'content',
+      'destination_module' => 'field',
+    ],
+    'd6_field_instance_widget_settings' => [
+      'source_module' => 'content',
+      'destination_module' => 'field',
+    ],
+    'd7_field' => [
+      'source_module' => 'field',
+      'destination_module' => 'field',
+    ],
+    'd7_field_formatter_settings' => [
+      'source_module' => 'field',
+      'destination_module' => 'field',
+    ],
+    'd7_field_instance' => [
+      'source_module' => 'field',
+      'destination_module' => 'field',
+    ],
+    'd7_field_instance_widget_settings' => [
+      'source_module' => 'field',
+      'destination_module' => 'field',
+    ],
+    'd7_view_modes' => [
+      'source_module' => 'field',
+      'destination_module' => 'field',
+    ],
+    'd6_file' => [
+      'source_module' => 'system',
+      'destination_module' => 'file',
+    ],
+    'd6_file_settings' => [
+      'source_module' => 'system',
+      'destination_module' => 'file',
+    ],
+    'd6_upload' => [
+      'source_module' => 'upload',
+      'destination_module' => 'file',
+    ],
+    'd6_upload_entity_display' => [
+      'source_module' => 'upload',
+      'destination_module' => 'file',
+    ],
+    'd6_upload_entity_form_display' => [
+      'source_module' => 'upload',
+      'destination_module' => 'file',
+    ],
+    'd6_upload_field' => [
+      'source_module' => 'upload',
+      'destination_module' => 'file',
+    ],
+    'd6_upload_field_instance' => [
+      'source_module' => 'upload',
+      'destination_module' => 'file',
+    ],
+    'd7_file' => [
+      'source_module' => 'file',
+      'destination_module' => 'file',
+    ],
+    'd6_filter_format' => [
+      'source_module' => 'filter',
+      'destination_module' => 'filter',
+    ],
+    'd7_filter_format' => [
+      'source_module' => 'filter',
+      'destination_module' => 'filter',
+    ],
+    'd6_forum_settings' => [
+      'source_module' => 'forum',
+      'destination_module' => 'forum',
+    ],
+    'd7_forum_settings' => [
+      'source_module' => 'forum',
+      'destination_module' => 'forum',
+    ],
+    'd6_imagecache_presets' => [
+      'source_module' => 'imagecache',
+      'destination_module' => 'image',
+    ],
+    'd7_image_settings' => [
+      'source_module' => 'image',
+      'destination_module' => 'image',
+    ],
+    'd7_image_styles' => [
+      'source_module' => 'image',
+      'destination_module' => 'image',
+    ],
+    'd7_language_negotiation_settings' => [
+      'source_module' => 'locale',
+      'destination_module' => 'language',
+    ],
+    'language' => [
+      'source_module' => 'locale',
+      'destination_module' => 'language',
+    ],
+    'locale_settings' => [
+      'source_module' => 'locale',
+      'destination_module' => 'locale',
+    ],
+    'menu_links' => [
+      'source_module' => 'menu',
+      'destination_module' => 'menu_link_content',
+    ],
+    'menu_settings' => [
+      'source_module' => 'menu',
+      'destination_module' => 'menu_ui',
+    ],
+    'd6_node' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_revision' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_setting_promote' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_setting_status' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_setting_sticky' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_settings' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_node_type' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_view_modes' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd7_node' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd7_node_revision' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd7_node_settings' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd7_node_title_label' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd7_node_type' => [
+      'source_module' => 'node',
+      'destination_module' => 'node',
+    ],
+    'd6_url_alias' => [
+      'source_module' => 'path',
+      'destination_module' => 'path',
+    ],
+    'd7_url_alias' => [
+      'source_module' => 'path',
+      'destination_module' => 'path',
+    ],
+    'search_page' => [
+      'source_module' => 'search',
+      'destination_module' => 'search',
+    ],
+    'd6_search_settings' => [
+      'source_module' => 'search',
+      'destination_module' => 'search',
+    ],
+    'd7_search_settings' => [
+      'source_module' => 'search',
+      'destination_module' => 'search',
+    ],
+    'd7_shortcut' => [
+      'source_module' => 'shortcut',
+      'destination_module' => 'shortcut',
+    ],
+    'd7_shortcut_set' => [
+      'source_module' => 'shortcut',
+      'destination_module' => 'shortcut',
+    ],
+    'd7_shortcut_set_users' => [
+      'source_module' => 'shortcut',
+      'destination_module' => 'shortcut',
+    ],
+    'd6_simpletest_settings' => [
+      'source_module' => 'simpletest',
+      'destination_module' => 'simpletest',
+    ],
+    'd7_simpletest_settings' => [
+      'source_module' => 'simpletest',
+      'destination_module' => 'simpletest',
+    ],
+    'd6_statistics_settings' => [
+      'source_module' => 'statistics',
+      'destination_module' => 'statistics',
+    ],
+    'd6_syslog_settings' => [
+      'source_module' => 'syslog',
+      'destination_module' => 'syslog',
+    ],
+    'd7_syslog_settings' => [
+      'source_module' => 'syslog',
+      'destination_module' => 'syslog',
+    ],
+    'd6_date_formats' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_cron' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_date' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_file' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_image' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_image_gd' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_logging' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_maintenance' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_performance' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_rss' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'd6_system_site' => [
+      'source_module' => 'system',
+      'destination_module' => 'system',
+    ],
+    'menu' => [
+      'source_module' => 'menu',
+      'destination_module' => 'system',
+    ],
+    'taxonomy_settings' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_taxonomy_term' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_taxonomy_vocabulary' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_term_node' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_term_node_revision' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_vocabulary_entity_display' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_vocabulary_entity_form_display' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_vocabulary_field' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd6_vocabulary_field_instance' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd7_taxonomy_term' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'd7_taxonomy_vocabulary' => [
+      'source_module' => 'taxonomy',
+      'destination_module' => 'taxonomy',
+    ],
+    'text_settings' => [
+      'source_module' => 'text',
+      'destination_module' => 'text',
+    ],
+    'd7_tracker_node' => [
+      'source_module' => 'tracker',
+      'destination_module' => 'tracker',
+    ],
+    'd7_tracker_settings' => [
+      'source_module' => 'tracker',
+      'destination_module' => 'tracker',
+    ],
+    'd7_tracker_user' => [
+      'source_module' => 'tracker',
+      'destination_module' => 'tracker',
+    ],
+    'update_settings' => [
+      'source_module' => 'update',
+      'destination_module' => 'update',
+    ],
+    'd6_profile_values' => [
+      'source_module' => 'profile',
+      'destination_module' => 'user',
+    ],
+    'd6_user' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd6_user_contact_settings' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd6_user_mail' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd6_user_picture_file' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd6_user_role' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd6_user_settings' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd7_user' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd7_user_flood' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd7_user_mail' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'd7_user_role' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'user_picture_entity_display' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'user_picture_entity_form_display' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'user_picture_field' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'user_picture_field_instance' => [
+      'source_module' => 'user',
+      'destination_module' => 'user',
+    ],
+    'user_profile_entity_display' => [
+      'source_module' => 'profile',
+      'destination_module' => 'user',
+    ],
+    'user_profile_entity_form_display' => [
+      'source_module' => 'profile',
+      'destination_module' => 'user',
+    ],
+    'user_profile_field' => [
+      'source_module' => 'profile',
+      'destination_module' => 'user',
+    ],
+    'user_profile_field_instance' => [
+      'source_module' => 'profile',
+      'destination_module' => 'user',
+    ],
+  ];
+
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * The renderer service.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface
+   */
+  protected $pluginManager;
+
+  /**
+   * Constructs the MigrateUpgradeForm.
+   *
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state service.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $plugin_manager
+   *   The migration plugin manager.
+   */
+  public function __construct(StateInterface $state, DateFormatterInterface $date_formatter, RendererInterface $renderer, MigrationPluginManagerInterface $plugin_manager) {
+    $this->state = $state;
+    $this->dateFormatter = $date_formatter;
+    $this->renderer = $renderer;
+    $this->pluginManager = $plugin_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('state'),
+      $container->get('date.formatter'),
+      $container->get('renderer'),
+      $container->get('plugin.manager.migration')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'migrate_drupal_ui_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $step = $form_state->getValue('step', 'overview');
+    switch ($step) {
+      case 'overview':
+        return $this->buildOverviewForm($form, $form_state);
+
+      case 'credentials':
+        return $this->buildCredentialForm($form, $form_state);
+
+      case 'confirm':
+        return $this->buildConfirmForm($form, $form_state);
+
+      default:
+        drupal_set_message($this->t('Unrecognized form step @step', ['@step' => $step]), 'error');
+        return [];
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // This method is intentionally empty, see the specific submit methods for
+    // each form step.
+  }
+
+  /**
+   * Builds the form presenting an overview of the migration process.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   The form structure.
+   */
+  public function buildOverviewForm(array $form, FormStateInterface $form_state) {
+    $form['#title'] = $this->t('Drupal Upgrade');
+
+    if ($date_performed = $this->state->get('migrate_drupal_ui.performed')) {
+      // @todo Add back support for rollbacks and incremental migrations.
+      //   https://www.drupal.org/node/2687843
+      //   https://www.drupal.org/node/2687849
+      $form['upgrade_option_item'] = [
+        '#type' => 'item',
+        '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks and incremental migrations are not yet supported through the user interface. For more information, see the <a href=":url">upgrading handbook</a>.', [':url' => 'https://www.drupal.org/upgrade/migrate']),
+        '#description' => $this->t('<p>Last upgrade: @date</p>', ['@date' => $this->dateFormatter->format($date_performed)]),
+      ];
+      return $form;
+    }
+    else {
+      $form['info_header'] = [
+        '#markup' => '<p>' . $this->t('Upgrade a Drupal site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the <a href=":url">upgrading handbook</a> for more detailed information.', [
+          ':url' => 'https://www.drupal.org/upgrade/migrate',
+        ]),
+      ];
+
+      $info[] = $this->t('<strong>Back up the database for this site</strong>. Upgrade will change the database for this site.');
+      $info[] = $this->t('Make sure that the host this site is on has access to the database for your previous site.');
+      $info[] = $this->t('If your previous site has private files to be migrated, a copy of your files directory must be accessible on the host this site is on.');
+      $info[] = $this->t('In general, enable all modules on this site that are enabled on the previous site. For example, if you have used the book module on the previous site then you must enable the book module on this site for that data to be available on this site.');
+      $info[] = $this->t('Put this site into <a href=":url">maintenance mode</a>.', [
+        ':url' => Url::fromRoute('system.site_maintenance_mode')->toString(TRUE)->getGeneratedUrl(),
+      ]);
+
+      $form['info'] = [
+        '#theme' => 'item_list',
+        '#list_type' => 'ol',
+        '#items' => $info,
+      ];
+
+      $form['info_footer'] = [
+        '#markup' => '<p>' . $this->t('This upgrade can take a long time. It is better to import a local copy of your site instead of directly importing from your live site.'),
+      ];
+
+      $validate = [];
+    }
+
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['save'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Continue'),
+      '#button_type' => 'primary',
+      '#validate' => $validate,
+      '#submit' => ['::submitOverviewForm'],
+    ];
+    return $form;
+  }
+
+  /**
+   * Form submission handler for the overview form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitOverviewForm(array &$form, FormStateInterface $form_state) {
+    $form_state->setValue('step', 'credentials');
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Builds the database credential form and adds file location information.
+   *
+   * This is largely borrowed from \Drupal\Core\Installer\Form\SiteSettingsForm.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   The form structure.
+   *
+   * @todo Private files directory not yet implemented, depends on
+   *   https://www.drupal.org/node/2547125.
+   */
+  public function buildCredentialForm(array $form, FormStateInterface $form_state) {
+    $form['#title'] = $this->t('Drupal Upgrade');
+
+    $drivers = $this->getDatabaseTypes();
+    $drivers_keys = array_keys($drivers);
+    // @todo https://www.drupal.org/node/2678510 Because this is a multi-step
+    //   form, the form is not rebuilt during submission. Ideally we would get
+    //   the chosen driver from form input, if available, in order to use
+    //   #limit_validation_errors in the same way
+    //   \Drupal\Core\Installer\Form\SiteSettingsForm does.
+    $default_driver = current($drivers_keys);
+
+    $default_options = [];
+
+    $form['database'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Source database'),
+      '#description' => $this->t('Provide credentials for the database of the Drupal site you want to upgrade.'),
+      '#open' => TRUE,
+    ];
+
+    $form['database']['driver'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('Database type'),
+      '#required' => TRUE,
+      '#default_value' => $default_driver,
+    ];
+    if (count($drivers) == 1) {
+      $form['database']['driver']['#disabled'] = TRUE;
+    }
+
+    // Add driver-specific configuration options.
+    foreach ($drivers as $key => $driver) {
+      $form['database']['driver']['#options'][$key] = $driver->name();
+
+      $form['database']['settings'][$key] = $driver->getFormOptions($default_options);
+      // @todo https://www.drupal.org/node/2678510 Using
+      //   #limit_validation_errors in the submit does not work so it is not
+      //   possible to require the database and username for mysql and pgsql.
+      //   This is because this is a multi-step form.
+      $form['database']['settings'][$key]['database']['#required'] = FALSE;
+      $form['database']['settings'][$key]['username']['#required'] = FALSE;
+      $form['database']['settings'][$key]['#prefix'] = '<h2 class="js-hide">' . $this->t('@driver_name settings', ['@driver_name' => $driver->name()]) . '</h2>';
+      $form['database']['settings'][$key]['#type'] = 'container';
+      $form['database']['settings'][$key]['#tree'] = TRUE;
+      $form['database']['settings'][$key]['advanced_options']['#parents'] = [$key];
+      $form['database']['settings'][$key]['#states'] = [
+        'visible' => [
+          ':input[name=driver]' => ['value' => $key],
+        ],
+      ];
+
+      // Move the host fields out of advanced settings.
+      if (isset($form['database']['settings'][$key]['advanced_options']['host'])) {
+        $form['database']['settings'][$key]['host'] = $form['database']['settings'][$key]['advanced_options']['host'];
+        $form['database']['settings'][$key]['host']['#title'] = 'Database host';
+        $form['database']['settings'][$key]['host']['#weight'] = -1;
+        unset($form['database']['settings'][$key]['database']['#default_value']);
+        unset($form['database']['settings'][$key]['advanced_options']['host']);
+      }
+    }
+
+    $form['source'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Source files'),
+      '#open' => TRUE,
+    ];
+    $form['source']['source_base_path'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Files directory'),
+      '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (e.g. http://example.com).'),
+    ];
+
+    $form['actions'] = ['#type' => 'actions'];
+    $form['actions']['save'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Review upgrade'),
+      '#button_type' => 'primary',
+      '#validate' => ['::validateCredentialForm'],
+      '#submit' => ['::submitCredentialForm'],
+    ];
+    return $form;
+  }
+
+  /**
+   * Validation handler for the credentials form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function validateCredentialForm(array &$form, FormStateInterface $form_state) {
+
+    // Retrieve the database driver from the form, use reflection to get the
+    // namespace, and then construct a valid database array the same as in
+    // settings.php.
+    $driver = $form_state->getValue('driver');
+    $drivers = $this->getDatabaseTypes();
+    $reflection = new \ReflectionClass($drivers[$driver]);
+    $install_namespace = $reflection->getNamespaceName();
+
+    $database = $form_state->getValue($driver);
+    // Cut the trailing \Install from namespace.
+    $database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
+    $database['driver'] = $driver;
+
+    // Validate the driver settings and just end here if we have any issues.
+    if ($errors = $drivers[$driver]->validateDatabaseSettings($database)) {
+      foreach ($errors as $name => $message) {
+        $form_state->setErrorByName($name, $message);
+      }
+      return;
+    }
+
+    try {
+      $connection = $this->getConnection($database);
+      $version = $this->getLegacyDrupalVersion($connection);
+      if (!$version) {
+        $form_state->setErrorByName($database['driver'] . '][0', $this->t('Source database does not contain a recognizable Drupal version.'));
+      }
+      else {
+        $this->createDatabaseStateSettings($database, $version);
+        $migrations = $this->getMigrations('migrate_drupal_' . $version, $version);
+
+        // Get the system data from source database.
+        $system_data = $this->getSystemData($connection);
+
+        // Convert the migration object into array
+        // so that it can be stored in form storage.
+        $migration_array = [];
+        foreach ($migrations as $migration) {
+          $migration_array[$migration->id()] = $migration->label();
+        }
+
+        // Store the retrieved migration IDs in form storage.
+        $form_state->set('migrations', $migration_array);
+        $form_state->set('source_base_path', $form_state->getValue('source_base_path'));
+
+        // Store the retrived system data in form storage.
+        $form_state->set('system_data', $system_data);
+      }
+    }
+    catch (\Exception $e) {
+      $error_message = [
+        '#type' => 'inline_template',
+        '#template' => '{% trans %}Resolve the issue below to continue the upgrade.{% endtrans%}{{ errors }}',
+        '#context' => [
+          'errors' => [
+            '#theme' => 'item_list',
+            '#items' => [$e->getMessage()],
+          ],
+        ],
+      ];
+
+      $form_state->setErrorByName($database['driver'] . '][0', $this->renderer->renderPlain($error_message));
+    }
+  }
+
+  /**
+   * Submission handler for the credentials form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitCredentialForm(array &$form, FormStateInterface $form_state) {
+    // Indicate the next step is confirmation.
+    $form_state->setValue('step', 'confirm');
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Confirmation form for missing migrations, etc.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   The form structure.
+   */
+  public function buildConfirmForm(array $form, FormStateInterface $form_state) {
+    $form = parent::buildForm($form, $form_state);
+    $form['actions']['submit']['#submit'] = ['::submitConfirmForm'];
+
+    $form['actions']['submit']['#value'] = $this->t('Perform upgrade');
+
+    $table_data = [];
+    $system_data = [];
+    foreach ($form_state->get('migrations') as $migration_id => $migration_label) {
+      // Fetch the system data at the first opportunity.
+      if (empty($system_data)) {
+        $system_data = $form_state->get('system_data');
+      }
+
+      // Handle derivatives.
+      list($migration_id,) = explode(':', $migration_id, 2);
+      $source_module = $this->moduleUpgradePaths[$migration_id]['source_module'];
+      $destination_module = $this->moduleUpgradePaths[$migration_id]['destination_module'];
+      $table_data[$source_module][$destination_module][$migration_id] = $migration_label;
+    }
+    // Sort the table by source module names and within that destination
+    // module names.
+    ksort($table_data);
+    foreach ($table_data as $source_module => $destination_module_info) {
+      ksort($table_data[$source_module]);
+    }
+    $unmigrated_source_modules = array_diff_key($system_data['module'], $table_data);
+
+    // Missing migrations.
+    $form['missing_module_list_title'] = [
+      '#type' => 'item',
+      '#title' => $this->t('Missing upgrade paths'),
+      '#description' => $this->t('The following items will not be upgraded. For more information see <a href=":migrate">Upgrading from Drupal 6 or 7 to Drupal 8</a>.', array(':migrate' => 'https://www.drupal.org/upgrade/migrate')),
+    ];
+    $form['missing_module_list'] = [
+      '#type' => 'table',
+      '#header' => [
+        $this->t('Source'),
+        $this->t('Destination'),
+      ],
+    ];
+    $missing_count = 0;
+    ksort($unmigrated_source_modules);
+    foreach ($unmigrated_source_modules as $source_module => $module_data) {
+      if ($module_data['status']) {
+        $missing_count++;
+        $form['missing_module_list'][$source_module] = [
+          'source_module' => ['#plain_text' => $source_module],
+          'destination_module' => ['#plain_text' => 'Missing'],
+        ];
+      }
+    }
+    // Available migrations.
+    $form['available_module_list'] = [
+      '#tree' => TRUE,
+      '#type' => 'details',
+      '#title' => $this->t('Available upgrade paths'),
+    ];
+
+    $form['available_module_list']['module_list'] = [
+      '#type' => 'table',
+      '#header' => [
+        $this->t('Source'),
+        $this->t('Destination'),
+      ],
+    ];
+
+    $available_count = 0;
+    foreach ($table_data as $source_module => $destination_module_info) {
+      $available_count++;
+      $destination_details = [];
+      foreach ($destination_module_info as $destination_module => $migration_ids) {
+        $destination_details[$destination_module] = [
+          '#type' => 'item',
+          '#plain_text' => $destination_module,
+        ];
+      }
+      $form['available_module_list']['module_list'][$source_module] = [
+        'source_module' => ['#plain_text' => $source_module],
+        'destination_module' => $destination_details,
+      ];
+    }
+    $form['counts'] = [
+      '#type' => 'item',
+      '#title' => '<ul><li>' . $this->t('@count available upgrade paths', ['@count' => $available_count]) . '</li><li>' . $this->t('@count missing upgrade paths', ['@count' => $missing_count]) . '</li></ul>',
+      '#weight' => -15,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * Submission handler for the confirmation form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitConfirmForm(array &$form, FormStateInterface $form_state) {
+    $storage = $form_state->getStorage();
+
+    $migrations = $storage['migrations'];
+    $config['source_base_path'] = $storage['source_base_path'];
+    $batch = [
+      'title' => $this->t('Running upgrade'),
+      'progress_message' => '',
+      'operations' => [
+        [
+          [MigrateUpgradeRunBatch::class, 'run'],
+          [array_keys($migrations), 'import', $config],
+        ],
+      ],
+      'finished' => [
+        MigrateUpgradeRunBatch::class,
+        'finished',
+      ],
+    ];
+    batch_set($batch);
+    $form_state->setRedirect('<front>');
+    $this->state->set('migrate_drupal_ui.performed', REQUEST_TIME);
+  }
+
+  /**
+   * Returns all supported database driver installer objects.
+   *
+   * @return \Drupal\Core\Database\Install\Tasks[]
+   *   An array of available database driver installer objects.
+   */
+  protected function getDatabaseTypes() {
+    // Make sure the install API is available.
+    include_once DRUPAL_ROOT . '/core/includes/install.inc';
+    return drupal_get_database_types();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure?');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('migrate_drupal_ui.upgrade');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return $this->t('<p><strong>Upgrade analysis report</strong></p>');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Perform upgrade');
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/MigrateAccessCheck.php b/core/modules/migrate_drupal_ui/src/MigrateAccessCheck.php
new file mode 100644
index 0000000..e66fad7
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/MigrateAccessCheck.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\MigrateAccessCheck.
+ */
+
+namespace Drupal\migrate_drupal_ui;
+
+use Drupal\Core\Access\AccessResultAllowed;
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * Checks access for migrate_drupal_ui routes.
+ *
+ * The Drupal Upgrade UI can only be used by user 1. This is because any other
+ * user might have different permissions on the source and target site.
+ *
+ * This class is designed to be used with '_custom_access' route requirement.
+ *
+ * @see \Drupal\Core\Access\CustomAccessCheck
+ */
+class MigrateAccessCheck {
+
+  /**
+   * Checks if the user is user 1 and grants access if so.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The current user account.
+   *
+   * @return \Drupal\Core\Access\AccessResult
+   *   The access result.
+   */
+  public function checkAccess(AccountInterface $account) {
+    // The access result is uncacheable because it is just limiting access to
+    // the migrate UI which is not worth caching.
+    return AccessResultAllowed::allowedIf((int) $account->id() === 1)->mergeCacheMaxAge(0);
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/MigrateMessageCapture.php b/core/modules/migrate_drupal_ui/src/MigrateMessageCapture.php
new file mode 100644
index 0000000..9e220f1
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/MigrateMessageCapture.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\MigrateMessageCapture.
+ */
+
+namespace Drupal\migrate_drupal_ui;
+
+use Drupal\migrate\MigrateMessageInterface;
+
+/**
+ * Allows capturing messages rather than displaying them directly.
+ */
+class MigrateMessageCapture implements MigrateMessageInterface {
+
+  /**
+   * Array of recorded messages.
+   *
+   * @var array
+   */
+  protected $messages = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function display($message, $type = 'status') {
+    $this->messages[] = $message;
+  }
+
+  /**
+   * Clears out any captured messages.
+   */
+  public function clear() {
+    $this->messages = [];
+  }
+
+  /**
+   * Returns any captured messages.
+   *
+   * @return array
+   *   The captured messages.
+   */
+  public function getMessages() {
+    return $this->messages;
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php b/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php
new file mode 100644
index 0000000..2ce971b
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/MigrateUpgradeRunBatch.php
@@ -0,0 +1,355 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\MigrateUpgradeRunBatch.
+ */
+
+namespace Drupal\migrate_drupal_ui;
+
+use Drupal\Core\Link;
+use Drupal\Core\Url;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\Event\MigrateIdMapMessageEvent;
+use Drupal\migrate\Event\MigrateMapDeleteEvent;
+use Drupal\migrate\Event\MigrateMapSaveEvent;
+use Drupal\migrate\Event\MigratePostRowSaveEvent;
+use Drupal\migrate\Event\MigrateRowDeleteEvent;
+use Drupal\migrate\MigrateExecutable;
+
+/**
+ * Runs a single migration batch.
+ */
+class MigrateUpgradeRunBatch {
+
+  /**
+   * Maximum number of previous messages to display.
+   */
+  const MESSAGE_LENGTH = 20;
+
+  /**
+   * The processed items for one batch of a given migration.
+   *
+   * @var int
+   */
+  protected static $numProcessed = 0;
+
+  /**
+   * Ensure we only add the listeners once per request.
+   *
+   * @var bool
+   */
+  protected static $listenersAdded = FALSE;
+
+  /**
+   * The maximum length in seconds to allow processing in a request.
+   *
+   * @see self::run()
+   *
+   * @var int
+   */
+  protected static $maxExecTime;
+
+  /**
+   * MigrateMessage instance to capture messages during the migration process.
+   *
+   * @var \Drupal\migrate_drupal_ui\MigrateMessageCapture
+   */
+  protected static $messages;
+
+  /**
+   * Runs a single migration batch.
+   *
+   * @param int[] $initial_ids
+   *   The full set of migration IDs to import.
+   * @param string $operation
+   *   The operation to perform. Only 'import' is currently supported.
+   * @param array $config
+   *   An array of additional configuration from the form.
+   * @param array $context
+   *   The batch context.
+   *
+   * @todo Remove the $operation parameter and conditionals for it below, and
+   *   refactor this method. https://www.drupal.org/node/2687851
+   */
+  public static function run($initial_ids, $operation, $config, &$context) {
+    if (!static::$listenersAdded) {
+      $event_dispatcher = \Drupal::service('event_dispatcher');
+      if ($operation == 'import') {
+        $event_dispatcher->addListener(MigrateEvents::POST_ROW_SAVE, [static::class, 'onPostRowSave']);
+        $event_dispatcher->addListener(MigrateEvents::MAP_SAVE, [static::class, 'onMapSave']);
+        $event_dispatcher->addListener(MigrateEvents::IDMAP_MESSAGE, [static::class, 'onIdMapMessage']);
+      }
+      static::$maxExecTime = ini_get('max_execution_time');
+      if (static::$maxExecTime <= 0) {
+        static::$maxExecTime = 60;
+      }
+      // Set an arbitrary threshold of 3 seconds (e.g., if max_execution_time is
+      // 45 seconds, we will quit at 42 seconds so a slow item or cleanup
+      // overhead don't put us over 45).
+      static::$maxExecTime -= 3;
+      static::$listenersAdded = TRUE;
+    }
+    if (!isset($context['sandbox']['migration_ids'])) {
+      $context['sandbox']['max'] = count($initial_ids);
+      $context['sandbox']['current'] = 1;
+      // Total number processed for this migration.
+      $context['sandbox']['num_processed'] = 0;
+      // migration_ids will be the list of IDs remaining to run.
+      $context['sandbox']['migration_ids'] = $initial_ids;
+      $context['sandbox']['messages'] = [];
+      $context['results']['failures'] = 0;
+      $context['results']['successes'] = 0;
+      $context['results']['operation'] = $operation;
+    }
+
+    // Number processed in this batch.
+    static::$numProcessed = 0;
+
+    $migration_id = reset($context['sandbox']['migration_ids']);
+    /** @var \Drupal\migrate\Plugin\Migration $migration */
+    $migration = \Drupal::service('plugin.manager.migration')->createInstance($migration_id);
+
+    // @TODO, remove this in https://www.drupal.org/node/2681869.
+    $destination = $migration->getDestinationConfiguration();
+    if ($destination['plugin'] === 'entity:file') {
+      // Make sure we have a single trailing slash.
+      $source_base_path = rtrim($config['source_base_path'], '/') . '/';
+      $destination['source_base_path'] = $source_base_path;
+      $migration->set('destination', $destination);
+    }
+
+    if ($migration) {
+      static::$messages = new MigrateMessageCapture();
+      $executable = new MigrateExecutable($migration, static::$messages);
+
+      $migration_name = $migration->label() ? $migration->label() : $migration_id;
+
+      try {
+        if ($operation == 'import') {
+          $migration_status = $executable->import();
+        }
+      }
+      catch (\Exception $e) {
+        static::logger()->error($e->getMessage());
+        $migration_status = MigrationInterface::RESULT_FAILED;
+      }
+
+      switch ($migration_status) {
+        case MigrationInterface::RESULT_COMPLETED:
+          // Store the number processed in the sandbox.
+          $context['sandbox']['num_processed'] += static::$numProcessed;
+          if ($operation == 'import') {
+            $message = static::getTranslation()->formatPlural(
+              $context['sandbox']['num_processed'], 'Upgraded @migration (processed 1 item total)', 'Upgraded @migration (processed @num_processed items total)',
+              ['@migration' => $migration_name, '@num_processed' => $context['sandbox']['num_processed']]);
+          }
+          $context['sandbox']['messages'][] = $message;
+          static::logger()->notice($message);
+          $context['sandbox']['num_processed'] = 0;
+          $context['results']['successes']++;
+          break;
+
+        case MigrationInterface::RESULT_INCOMPLETE:
+          $context['sandbox']['messages'][] = static::getTranslation()->formatPlural(
+            static::$numProcessed, 'Continuing with @migration (processed 1 item)', 'Continuing with @migration (processed @num_processed items)',
+            ['@migration' => $migration_name, '@num_processed' => static::$numProcessed]);
+          $context['sandbox']['num_processed'] += static::$numProcessed;
+          break;
+
+        case MigrationInterface::RESULT_STOPPED:
+          $context['sandbox']['messages'][] = t('Operation stopped by request');
+          break;
+
+        case MigrationInterface::RESULT_FAILED:
+          $context['sandbox']['messages'][] = t('Operation on @migration failed', ['@migration' => $migration_name]);
+          $context['results']['failures']++;
+          static::logger()->error('Operation on @migration failed', ['@migration' => $migration_name]);
+          break;
+
+        case MigrationInterface::RESULT_SKIPPED:
+          $context['sandbox']['messages'][] = t('Operation on @migration skipped due to unfulfilled dependencies', ['@migration' => $migration_name]);
+          static::logger()->error('Operation on @migration skipped due to unfulfilled dependencies', ['@migration' => $migration_name]);
+          break;
+
+        case MigrationInterface::RESULT_DISABLED:
+          // Skip silently if disabled.
+          break;
+      }
+
+      // Unless we're continuing on with this migration, take it off the list.
+      if ($migration_status != MigrationInterface::RESULT_INCOMPLETE) {
+        array_shift($context['sandbox']['migration_ids']);
+        $context['sandbox']['current']++;
+      }
+
+      // Add and log any captured messages.
+      foreach (static::$messages->getMessages() as $message) {
+        $context['sandbox']['messages'][] = $message;
+        static::logger()->error($message);
+      }
+
+      // Only display the last MESSAGE_LENGTH messages, in reverse order.
+      $message_count = count($context['sandbox']['messages']);
+      $context['message'] = '';
+      for ($index = max(0, $message_count - self::MESSAGE_LENGTH); $index < $message_count; $index++) {
+        $context['message'] = $context['sandbox']['messages'][$index] . "<br />\n" . $context['message'];
+      }
+      if ($message_count > self::MESSAGE_LENGTH) {
+        // Indicate there are earlier messages not displayed.
+        $context['message'] .= '&hellip;';
+      }
+      // At the top of the list, display the next one (which will be the one
+      // that is running while this message is visible).
+      if (!empty($context['sandbox']['migration_ids'])) {
+        $migration_id = reset($context['sandbox']['migration_ids']);
+        $migration = \Drupal::service('plugin.manager.migration')->createInstance($migration_id);
+        $migration_name = $migration->label() ? $migration->label() : $migration_id;
+        if ($operation == 'import') {
+          $context['message'] = t('Currently upgrading @migration (@current of @max total tasks)', [
+            '@migration' => $migration_name,
+            '@current' => $context['sandbox']['current'],
+            '@max' => $context['sandbox']['max'],
+          ]) . "<br />\n" . $context['message'];
+        }
+      }
+    }
+    else {
+      array_shift($context['sandbox']['migration_ids']);
+      $context['sandbox']['current']++;
+    }
+
+    $context['finished'] = 1 - count($context['sandbox']['migration_ids']) / $context['sandbox']['max'];
+  }
+
+  /**
+   * Returns the logger using the migrate_drupal_ui channel.
+   *
+   * @return \Psr\Log\LoggerInterface
+   *   The logger instance.
+   */
+  protected static function logger() {
+    return \Drupal::logger('migrate_drupal_ui');
+  }
+
+  /**
+   * Wraps the translation manager.
+   *
+   * @return \Drupal\Core\StringTranslation\TranslationManager
+   *   The string translation manager.
+   */
+  protected static function getTranslation() {
+    return \Drupal::translation();
+  }
+
+  /**
+   * Implements the Batch API finished method.
+   */
+  public static function finished($success, $results, $operations, $elapsed) {
+    static::displayResults($results);
+  }
+
+  /**
+   * Displays counts of success/failures on the migration upgrade complete page.
+   *
+   * @param array $results
+   *   An array of result data built during the batch.
+   */
+  protected static function displayResults($results) {
+    $successes = $results['successes'];
+    $failures = $results['failures'];
+
+    // If we had any successes log that for the user.
+    if ($successes > 0) {
+      if ($results['operation'] == 'import') {
+        drupal_set_message(static::getTranslation()->formatPlural($successes, 'Completed 1 upgrade task successfully', 'Completed @count upgrade tasks successfully'));
+      }
+    }
+
+    // If we had failures, log them and show the migration failed.
+    if ($failures > 0) {
+      if ($results['operation'] == 'import') {
+        drupal_set_message(static::getTranslation()->formatPlural($failures, '1 upgrade failed', '@count upgrades failed'));
+        drupal_set_message(t('Upgrade process not completed'), 'error');
+      }
+    }
+    else {
+      if ($results['operation'] == 'import') {
+        // Everything went off without a hitch. We may not have had successes
+        // but we didn't have failures so this is fine.
+        drupal_set_message(t('Congratulations, you upgraded Drupal!'));
+      }
+    }
+
+    if (\Drupal::moduleHandler()->moduleExists('dblog')) {
+      $url = Url::fromRoute('migrate_drupal_ui.log');
+      drupal_set_message(Link::fromTextAndUrl(t('Review the detailed upgrade log'), $url), $failures ? 'error' : 'status');
+    }
+  }
+
+  /**
+   * Reacts to item import.
+   *
+   * @param \Drupal\migrate\Event\MigratePostRowSaveEvent $event
+   *   The post-save event.
+   */
+  public static function onPostRowSave(MigratePostRowSaveEvent $event) {
+    // We want to interrupt this batch and start a fresh one.
+    if ((time() - REQUEST_TIME) > static::$maxExecTime) {
+      $event->getMigration()->interruptMigration(MigrationInterface::RESULT_INCOMPLETE);
+    }
+  }
+
+  /**
+   * Reacts to item deletion.
+   *
+   * @param \Drupal\migrate\Event\MigrateRowDeleteEvent $event
+   *   The post-save event.
+   */
+  public static function onPostRowDelete(MigrateRowDeleteEvent $event) {
+    // We want to interrupt this batch and start a fresh one.
+    if ((time() - REQUEST_TIME) > static::$maxExecTime) {
+      $event->getMigration()->interruptMigration(MigrationInterface::RESULT_INCOMPLETE);
+    }
+  }
+
+  /**
+   * Counts up any map save events.
+   *
+   * @param \Drupal\migrate\Event\MigrateMapSaveEvent $event
+   *   The map event.
+   */
+  public static function onMapSave(MigrateMapSaveEvent $event) {
+    static::$numProcessed++;
+  }
+
+  /**
+   * Counts up any map delete events.
+   *
+   * @param \Drupal\migrate\Event\MigrateMapDeleteEvent $event
+   *   The map event.
+   */
+  public static function onMapDelete(MigrateMapDeleteEvent $event) {
+    static::$numProcessed++;
+  }
+
+  /**
+   * Displays any messages being logged to the ID map.
+   *
+   * @param \Drupal\migrate\Event\MigrateIdMapMessageEvent $event
+   *   The message event.
+   */
+  public static function onIdMapMessage(MigrateIdMapMessageEvent $event) {
+    if ($event->getLevel() == MigrationInterface::MESSAGE_NOTICE || $event->getLevel() == MigrationInterface::MESSAGE_INFORMATIONAL) {
+      $type = 'status';
+    }
+    else {
+      $type = 'error';
+    }
+    $source_id_string = implode(',', $event->getSourceIdValues());
+    $message = t('Source ID @source_id: @message', ['@source_id' => $source_id_string, '@message' => $event->getMessage()]);
+    static::$messages->display($message, $type);
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
new file mode 100644
index 0000000..88fe0bc
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateAccessTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Tests\MigrateAccessTest.
+ */
+
+namespace Drupal\migrate_drupal_ui\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests that only user 1 can access the migrate UI.
+ *
+ * @group migrate_drupal_ui
+ */
+class MigrateAccessTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate_drupal_ui'];
+
+  /**
+   * Tests that only user 1 can access the migrate UI.
+   */
+  protected function testAccess() {
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('upgrade');
+    $this->assertResponse(200);
+    $this->assertText(t('Drupal Upgrade'));
+
+    $user = $this->createUser(['administer software updates']);
+    $this->drupalLogin($user);
+    $this->drupalGet('upgrade');
+    $this->assertResponse(403);
+    $this->assertNoText(t('Drupal Upgrade'));
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
new file mode 100644
index 0000000..583dd10
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Tests\MigrateUpgradeTestBase.
+ */
+
+namespace Drupal\migrate_drupal_ui\Tests;
+
+use Drupal\Core\Database\Database;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate_drupal\MigrationCreationTrait;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Provides a base class for testing migration upgrades in the UI.
+ */
+abstract class MigrateUpgradeTestBase extends WebTestBase {
+  use MigrationCreationTrait;
+
+  /**
+   * Use the Standard profile to test help implementations of many core modules.
+   */
+  protected $profile = 'standard';
+
+  /**
+   * The source database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $sourceDatabase;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['migrate_drupal_ui', 'telephone'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->createMigrationConnection();
+    $this->sourceDatabase = Database::getConnection('default', 'migrate_drupal_ui');
+
+    // Log in as user 1. Migrations in the UI can only be performed as user 1.
+    $this->drupalLogin($this->rootUser);
+  }
+
+  /**
+   * Loads a database fixture into the source database connection.
+   *
+   * @param string $path
+   *   Path to the dump file.
+   */
+  protected function loadFixture($path) {
+    $default_db = Database::getConnection()->getKey();
+    Database::setActiveConnection($this->sourceDatabase->getKey());
+
+    if (substr($path, -3) == '.gz') {
+      $path = 'compress.zlib://' . $path;
+    }
+    require $path;
+
+    Database::setActiveConnection($default_db);
+  }
+
+  /**
+   * Changes the database connection to the prefixed one.
+   *
+   * @todo Remove when we don't use global. https://www.drupal.org/node/2552791
+   */
+  protected function createMigrationConnection() {
+    $connection_info = Database::getConnectionInfo('default')['default'];
+    if ($connection_info['driver'] === 'sqlite') {
+      // Create database file in the test site's public file directory so that
+      // \Drupal\simpletest\TestBase::restoreEnvironment() will delete this once
+      // the test is complete.
+      $file = $this->publicFilesDirectory . '/' . $this->testId . '-migrate.db.sqlite';
+      touch($file);
+      $connection_info['database'] = $file;
+      $connection_info['prefix'] = '';
+    }
+    else {
+      $prefix = is_array($connection_info['prefix']) ? $connection_info['prefix']['default'] : $connection_info['prefix'];
+      // Simpletest uses fixed length prefixes. Create a new prefix for the
+      // source database. Adding to the end of the prefix ensures that
+      // \Drupal\simpletest\TestBase::restoreEnvironment() will remove the
+      // additional tables.
+      $connection_info['prefix'] = $prefix . '0';
+    }
+
+    Database::addConnectionInfo('migrate_drupal_ui', 'default', $connection_info);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function tearDown() {
+    Database::removeConnection('migrate_drupal_ui');
+    parent::tearDown();
+  }
+
+  /**
+   * Executes all steps of migrations upgrade.
+   */
+  protected function testMigrateUpgrade() {
+    $connection_options = $this->sourceDatabase->getConnectionOptions();
+    $this->drupalGet('/upgrade');
+    $this->assertText('Upgrade a Drupal site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the upgrading handbook for more detailed information.');
+
+    $this->drupalPostForm(NULL, [], t('Continue'));
+    $this->assertText('Provide credentials for the database of the Drupal site you want to upgrade.');
+    $this->assertFieldByName('mysql[host]');
+
+    $driver = $connection_options['driver'];
+    $connection_options['prefix'] = $connection_options['prefix']['default'];
+
+    // Use the driver connection form to get the correct options out of the
+    // database settings. This supports all of the databases we test against.
+    $drivers = drupal_get_database_types();
+    $form = $drivers[$driver]->getFormOptions($connection_options);
+    $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']);
+    $edit = [
+      $driver => $connection_options,
+      'source_base_path' => $this->getSourceBasePath(),
+    ];
+    if (count($drivers) !== 1) {
+      $edit['driver'] = $driver;
+    }
+    $edits = $this->translatePostValues($edit);
+
+    // Ensure submitting the form with invalid database credentials gives us a
+    // nice warning.
+    $this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
+    $this->assertText('Resolve the issue below to continue the upgrade.');
+
+    $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
+    $this->assertResponse(200);
+    $this->assertText('Are you sure?');
+    $this->drupalPostForm(NULL, [], t('Perform upgrade'));
+    $this->assertText(t('Congratulations, you upgraded Drupal!'));
+
+    // Have to reset all the statics after migration to ensure entities are
+    // loadable.
+    $this->resetAll();
+
+    $expected_counts = $this->getEntityCounts();
+    foreach (array_keys(\Drupal::entityTypeManager()->getDefinitions()) as $entity_type) {
+      $real_count = count(\Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple());
+      $expected_count = isset($expected_counts[$entity_type]) ? $expected_counts[$entity_type] : 0;
+      $this->assertEqual($expected_count, $real_count, "Found $real_count $entity_type entities, expected $expected_count.");
+    }
+
+    $version_tag = 'Drupal ' . $this->getLegacyDrupalVersion($this->sourceDatabase);
+    $plugin_manager = \Drupal::service('plugin.manager.migration');
+    /** @var \Drupal\migrate\Plugin\Migration[] $all_migrations */
+    $all_migrations = $plugin_manager->createInstancesByTag($version_tag);
+    foreach ($all_migrations as $migration) {
+      $id_map = $migration->getIdMap();
+      foreach ($id_map as $source_id => $map) {
+        // Convert $source_id into a keyless array so that
+        // \Drupal\migrate\Plugin\migrate\id_map\Sql::getSourceHash() works as
+        // expected.
+        $source_id_values = array_values(unserialize($source_id));
+        $row = $id_map->getRowBySource($source_id_values);
+        $destination = serialize($id_map->currentDestination());
+        $message = "Successful migration of $source_id to $destination as part of the {$migration->id()} migration. The source row status is " . $row['source_row_status'];
+        // A completed migration should have maps with
+        // MigrateIdMapInterface::STATUS_IGNORED or
+        // MigrateIdMapInterface::STATUS_IMPORTED.
+        if ($row['source_row_status'] == MigrateIdMapInterface::STATUS_FAILED || $row['source_row_status'] == MigrateIdMapInterface::STATUS_NEEDS_UPDATE) {
+          $this->fail($message);
+        }
+        else {
+          $this->pass($message);
+        }
+      }
+    }
+  }
+
+  /**
+   * Gets the source base path for the concrete test.
+   *
+   * @return string
+   *   The source base path.
+   */
+  abstract protected function getSourceBasePath();
+
+  /**
+   * Gets the expected number of entities per entity type after migration.
+   *
+   * @return int[]
+   *   An array of expected counts keyed by entity type ID.
+   */
+  abstract protected function getEntityCounts();
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
new file mode 100644
index 0000000..a7e0e8a
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Tests\d6\MigrateUpgrade6Test.
+ */
+
+namespace Drupal\migrate_drupal_ui\Tests\d6;
+
+use Drupal\migrate_drupal_ui\Tests\MigrateUpgradeTestBase;
+
+/**
+ * Tests Drupal 6 upgrade using the migrate UI.
+ *
+ * The test method is provided by the MigrateUpgradeTestBase class.
+ *
+ * @group migrate_drupal_ui
+ */
+class MigrateUpgrade6Test extends MigrateUpgradeTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSourceBasePath() {
+    return __DIR__ . '/files';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCounts() {
+    return [
+      'block' => 30,
+      'block_content' => 2,
+      'block_content_type' => 1,
+      'comment' => 3,
+      'comment_type' => 2,
+      'contact_form' => 5,
+      'editor' => 2,
+      'field_config' => 62,
+      'field_storage_config' => 43,
+      'file' => 7,
+      'filter_format' => 8,
+      'image_style' => 5,
+      'migration' => 105,
+      'node' => 9,
+      'node_type' => 11,
+      'rdf_mapping' => 5,
+      'search_page' => 2,
+      'shortcut' => 2,
+      'shortcut_set' => 1,
+      'action' => 22,
+      'menu' => 8,
+      'taxonomy_term' => 6,
+      'taxonomy_vocabulary' => 6,
+      'tour' => 1,
+      'user' => 7,
+      'user_role' => 6,
+      'menu_link_content' => 4,
+      'view' => 12,
+      'date_format' => 11,
+      'entity_form_display' => 15,
+      'entity_form_mode' => 1,
+      'entity_view_display' => 32,
+      'entity_view_mode' => 12,
+      'base_field_override' => 33,
+    ];
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/html-1.txt b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/html-1.txt
new file mode 100644
index 0000000..494470d
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/html-1.txt
@@ -0,0 +1 @@
+<h1>SimpleTest HTML</h1>
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-1.png b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-1.png
new file mode 100644
index 0000000..09e64d6
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-1.png
@@ -0,0 +1,179 @@
+�PNG
+
+
IHDR
h�̡��dIDATx^d���eו&�}k�{߻�Ub%�*���%RE�V��
��q�ذ
�aܰ������
f<�i�[j�[�-�E��T�X�Ux��{��{���n�w��w���\@$ HD$HB"�>dz P1=b��>�rr���(��*�'!��(> ��m9c�
������B1�a4�ˁ���%-�)��C��T��'% b��}g�ԥX)p9�p͡��3+��a I7
+����9"�epS3�S$%��h���Qy�R���a�s�$Iyca��
�U�ah��Zs�*+h��ݥ�j�`�K.I�@�DP �F��H��R�q��v�1��4#P&B�E5�Q��+�̓A
0ALJ�`�g���)\��ǒ�aB��;0M��|+`QS
+��� �QJs9E�P�A�$�"�Y��$TH0%3�SJ�P� ɤ��r��RZ<E�pp&��AZ�C���2c�oq�.�И2���RA��.����R���Uh��	]���)�6H�d ���)"�(9O��5yj��Q�h�J�Q�&���)$�@L*��D��A��I�$�c
.3���Z��}�B�b��$Ls*�!0�]
$�
i�Y��(M)�`���0�	�`��r`FJ�s�	JYE���G.dC))AAZ�jw�Z��̤�J$����A����p�T�`��Rc133�.��t'�0Ҍ�e
+YJ�n�C:�h�jNԔM
�B4�D����#�$OZH�DV0J(�B�(1t{|�N�u\
+
�gr�H�y
<�%A��A�S�R�� h0ys	��6y#5%.'_Ӻ+45�
&悲
+�	��-A��H#]�\1��yЂbT1��`H�or�!V�>�p�Q�$�4�o<G�͋��8<�n����U-��)���n�A
�d�$��8�\�&�cr�R��/��?F
+����
r��,�b$�
+ (y�M� �V+僠
+�f+�&9�����)�:.�����;MrH&��$3a�HF�0�AK�C�)�F^��0��ҕR:�Q�aH�� &�@̜S��K�SBN3X�	B��#�6P�%�PE�QL����B�H)M:\4��:UR��9J Ƈ�+�9;y cp�����hhf�4�w�adpR4�;��
+<�؝Ba�U��\��pN"�p�̤��T��dl5�p�=
&BHq&
43�$8pP
T�'1�b��P��juVڡ���f '��r&�HżI`�E"
2HZ����f�9au7��{h6+�U��E�.֙
�a�UBCJD�9!
�s:~����9Ho3Ab)�џk��(4,<"��k�m�,h(�F0p?i_Q�k�*ҏ�1�"vcr���#M�	eE��C`�aED��Ib�%�`$G�(��4�
+
 �*�Z�!�������͈ ��C�(��H��4�af�(���F3Z����)u@�����j���!���n�
0�ا�c�I*�It)�D�0��D�{Z��n�U�;P�R��u3cd����j^�c�A��L�(9@X[
:�� �F�H���B3�N'�kH�Q�
+pŦx8Iq�	I���;�U�D-�B�r��A	�Rk,V
�+�{RA�Ϛ�7�a����4-���dFo�)t�t�l{��[z��6�l�a�DDsb(
"!��=�J�j`�8���}�P�����U�HJ3��?y�#w4�38�I��&���8�w/|"R.Bs{�W�,�v�14��W����f ��P�Hc>��~�
�����@)t�d,�bIo(t7�b�>\��j}805r��f(*f2��JP1hL(�/��cDuK������\h %��{\j'�h��U1��M+�����SPB�����=�	����V+�&K��迫�B>��xD�B��x�
Yz�p�P8ir4L^Y1�2s��@߯Uj�EI���a(�۾�4%�#X���2ԭF��cd<L��V�0��VS
Qvwх
��߷��V�k+(j.�'c�B�[}��S�f�ߒ����0l�w�����2Y�	Hrf���ܬ�
cHט �hL6O9A�x+����P1�
`E�4"���@2�_���̝P0��yNi+���L3�*���z�7x�� ���|��?ԅ� F�bC�W���5	�����l�(B�;�c�=]��A�qd�H���頥Ϡ�L
d�tR^�\
��B<��陕�7��\�h���j�8�re~u���)�ԥ
+Tr?
s�z���`8�`�b�el��?~�W�����\&�����
+W���ڍ%g!WB��l����k����
)R%Z$�}Hu���@��!�*p�)
��rr8��(&�4�4"�re�C0�lHTC�F��܎M��F儤	�X��#�8 ������w�^0���x��l�yҟa	:dXL�d$)?����l����US��԰x��߼vK�K���u@�KT�=C.��Y�(�L��`�$т��!5i����OΓId�,8����ْ2�'M��e��e��G�c�|WZt���N!v�vv�ژc����o�Z?(��M�MNK	&X���G�Puo����^���R`ز<��ߊ�Y��-ขe��S�M��FtP
�ܘqG�b�!�� ��=�PJ&�
+�¬��h�����J���Y�F�Ӛ���&�s�����r�����g^�������D�h.=ro��A-Gt�5���[��.\��RO����Ｚ��A_G@����=)����)��OFۯ� KC4���A��$F@��\J�=�E�z�m0�)�����j0A�K��A�
%Ñ<i��#�d���<���-~s#4��vp��_�2`)�;i�����s������=�/W��휸�悗���kE���*���{�-I��� �� ��lwR=z�N�F�&u&B�(�oHr+@+P�_�W�0�U�+y�xr�b�a}c�u	��1#'T�~�W�zP�Z�<}�b�ˆb�@B[
+�X�4����~��#��(�R���m��,�Ъ"])��IS FHAJ�碥���aa�������p�@���A�2:�)���t����]{�� �k_�؁y4�W6����bm$��O}����6l�9x�Q}���(�ck/Ul�Ǟ������gY�{w�`O]"C�w�[_z���ݛ ��9*$��dt2��bt"�E �/�Hx���f��SQ�����Rc�����|�8�����P���}��%���'�%��ͪ7�b���ű[t��a>�BS��_^��L��
���bx��
�N5h�Ϝ�xU��c���e{�`�����?mB�"��W~�寞{��Y}D��s"k�!�&�E3��+%^d���@mS���"���ǽ^	Yr�;f�I\n�g<x�|��
�D�h+?���o?��	�	0�L�~���>�ݒ,"\o��i�?�Fa/�������3<�����C��h��+�g��c�\\����n���'f-�mo�K�g�8�dP������OwJp���
+o�
�Û-rN�3S�6�L$��KpDz�=��0��F�ړ%)�p=y�4�bY����}�s��~y5�8��߻��֩k����OZ�֚=����y���n��f^UW��I��\�j��N���v��懞ڕK�\^����?������zv���պn��
B��΍#�����9S��Ͽy�Gl��9֤J%�b��^�Fk";H�@A�S�0,�$8��{��b��	B�I�
-���??�o~����D�������_?>/t�]�5f�2���G~��\~m�X�cD ��|�7��qg6_�%���K
�����W_�#٢
D����������`��|H�؜y�Z
E�ac8�u���@�[��3�x�X;Ř����`�h��q���*�go�$ko�!|*4al�z �ضW�٫j��������$��s�W���ٳb	�4�C#�8X=�лW�����طn�W�0Ƕa�n�w�����α2XnH����rs
бmls���%�G��x�����gG��9��n����=�p���w6��G]Zi��'�G�D����D��s(�:=��Q��]'�*i-��&+�G
+@'\S2M�8ܽx���v���~X*�x�ͻN_x��C/�w��2lק�냛W��M���u�z�O<pͷ8sro���j�:|��`R���84XD7���~���{�*(�?��Ǘ*oBO�Ӽ6�7ugU-�u}�6�u4�p�]x�b2����"'Lj�`�J&�9ha�6'� ��L�i*�%e�I�!�I��&P.�<
+����n�4c���pu>���흭O���9���a�B�R�l�?Pl�6���_h�4�cO��}��|��|u={�{���)A���l�:Ah��gO=��/-�7C��7����/O.�rX~�[���۳g�\�:�w���4k<�f�P$b��/���ݓ���W�#`E[TK�g�	�ZRt,�_��z�d��M�%+n���b$�8A	.F��edLs/��p�U��'���7��1l>���Ɖ?ֽc��|��Y�	��lEYi�ͫq���px�6�������}��>>�_�l�v��>��	F��x��(3�4���7��տ�����K���N��n}������o��Kv��|���gu������,�p�:��F9	���G���G?�p5#
c��R4и��PEc�¡�d`&�Ƽ�1�Y@�S^@��	��>#�3�Gt�ir�@\F�U'6��n�nlȾ�;�>���b�����@	k��-\=ѩ���n�@
'Oηn5�c߬~�问�����۟�g�"�v�O�6� �yb�~���n��&�f��q�������������٭;2�_���v�-�pV���m��~�;��s���'A�,B�ɻ�#Q,LB0Ir�ba$�o-&ňޘ*Lila&F�@��z3
�?p�	�0ۺ6��/��]k;u�}w�G��l�� K���?u�hǿv��#7��ډ�zk�z��O�z�;������������~PV���ֺ.w�](,tm�ssk������U�?�Y?q�l�_zWW����
,�z���X�z�����(�L*I��#�U
+t��#1y!L���9g&U셓Dw�h
Lio�Ag����
+����"��ث2?�=q�Q.�z�
+ȡ4W��i3]���yg��t�v�M������.~�����݃G�|����9sow��l��ޙ5���\n���.�
+�(;�K��5�XՕN\3�Y6.��678?���L�s[���$�x�����t�"�:�(���	L�l��2
+� ��8	8b�0Z�`L|�B=�EN�siL�	����Ԋ�>���q����e�Ú���co����y[���ޏW��(�ko?�g{�{7?ۻ�ԹK����7/���r��{�٥���g�Z޺3p��p��s/�7����G���#��:p�G�\������E�Z_;8wim{7���]�*puf{鲍�
+w�����W~��&+��"F�VS�� ��Lo��w���e�L��̥U9&{��Q�e�$z~��"�E5��k���S���F9�����l�o�{쁛��?���Z7*���\��T��X
�}��[��/�7��f��˽/�i�f%��
+o��'���eu��������c�ݨ�k�����&P���.C�[�lp�_��� �pw(&8,g���LU�|+�2� ��/H�;#ܧ�'��ǃ1�w$�_Ż��,�T )hm1¬#F/�\�8u�GR��_�߯��������f��_�ls/O|�?���~�߼iM�@D���IΟ�xp����{s��TY���o��k���64=v�� ����?s�VW�A�����_������(@7��d��K���%&*oU�
+���B�H��zFk���0x��`�A���������Unc�D4����Y�;�n~H4,/�\�ֿ
o>�A����O�O$��KWB `�a�;
bv�ƹ�$���̱�J��b�׫ ��[{cv�zty{�&��]�]H2S�����I�!F⩾�bO��	�3���u6��� sfZ��L]�S�(/�����~�Vm���`%��F�/^�
:ȩm��,>�2	�J.�)Lis����_Z��
P�V�lPl(�0~x��(�C��y�v�zDj�s���-;n��"E�����y;��ʔ"�"�Y�ve阓���N���$�<)
+>�e37s��ݍRnsFU7s������D��u٣w�r��T��;?{��o�k����]񶘷��Ч�t�
&3b��<�������杧w�!uᑀ�
WH��Y�KPf�FL�B�OH�)5�k�z�_A_H��`Nc�@���g�
`s�zm�.�:[C�S(:���M��淲���_��v�;w?"�*��<�V�6
m�������z�0?���/����S��4��?c���z}�h��Ȋ"9��
��c��n�_�*�� ���h9��]���1X����dN/>"��}#L����@�����Q���p�*{�Q����y�ѳW7;�F�5a��/���=�`}��OZ6B�x�a����ݤ�0=#
� 
���5U��nA�d;�4G�4ϖ��uĤbY]4Nh3��@:O;��b�)����c>��"�TkV6�dE�rK��
+
+d`]�%Z@洦����﯃F1���~��l��$3p^��z���w�;�):��)%S|����1�Wn���Z�?)�>
�t��a����}/�,�?SY�{������	�1�di ��I�S�	�%�{L˥!羷������/s�8��O�
�q��w�[;D��{A�)��v�\�(oi���qY���MbM4&�&@��I�Mb|@:{�We���N=U������$E���$d��}�|��O�Կ>%�Q�_�cs��O��Ϛ&�r���dZ�g$j3бB��ũQ�����
+��+М�	����ޞL��	��5 N��U$v8J�kR�����'�#$e LJ
�:��I;vA����]�S��usұ_��y�:MS��t���,{QJ�Կ�7��
�'��)g'�� u� :���VI�	�
hdC�U�N�tp�R�E�d����QWG^Lj%�0q�]�&u�Ͷ�
���ŭ�Mh�#�(�8������eU#ڐqgz�<��!�eO��#��y?�f�Nڔ>0
����#	,�FM� I�ΎSh�
^�����sQɬ�C$(΂�&sA���LhPn}d�+�ֱ%�C���k���R�S)c^P����|J�F¿�A�h�ք8��	�TQ�˒\fdǿ�R*aG
+���0�щ��O��Rp�N��2V�$�0�%��VV`\�#<ꊑ���,q���^�VJƈ���;�U*�]="��-R�R�6�_��P�v���
���1�1R���
+r��3Hp�j`��B���jR]�
+6�4M���Y���N�&6f��X�ﲮH�yC��KiG׻��dTc'KOkD��)��'hI��hN�O=�	)� Y������H�ͦm�43���w��V�HWջ�M{��_/t%d3����)������	ba�Y��`=8��<z�ۡ���/MY�`�3�Kv�`��)�DI����nH�&ѭ?9*l�����Ё9$�q&�\�r䚤��YM
�)4�B�(M
+��q�$#��)1�i�TR1&	����8��Q�b�'H������'N�����<~���h��)?E�7�*��D���WQYf�QB
�t����].�
4Z:Ғeb�ik���V�X˼��~�ՠc��EE��u`��p��3��|���Q䉖t1mM�]�E�6����7טzR������v*��|)�ua�)�;�Ӛɫ�.��ю9�Y�I�M&Z��d9I2D�h�IJIp���k�*N�#A1�0)��@����s�2<����'���(ɖ�S����Z�j��F�y�Q2��/�������0H�	rw�֪���i��'��4Ll�G��)��
+o�DQ�\{�sp����x��t�8��V)$g
uƇ��ᯔ�A���Tn�
����7_���K���p��#w/�:`cm���>楄�0�����*���/�<~Ղh������h(L��{�I��n(%4lS�Dq��k�T��0Fz�(�Oa�L���$�=�mI�Q$�ۄIr��Ifx����g6�af���Iý�[-[��
�2��p��]T��?B��T���(��,v���aI�9wTo��`�z=,ٳ�4�i
+�2��px�����oLm�H�Č�G��q�H�(`1�Z����K�A݃��H�%;v�#�9�'ŵ��� �A]Z��¹{ۛ̚A���?/U(Z��]�������3�t��q���<#T�/�ik�`>k�Dd0��&�NΝ4�h%��C���dMc�O�ʪy�^�5���3n�5ʃ�2p��̽�N|����&�c�.��~d
��-9�Ԧ8�Vv~={��,V�8��齝��뱧��L�n��
�L��ѓ���5�O��S]4�O�|�K���&D��#靌�Q��aƩ ��v4I1W������K�ӕ�B��Z�� �<'�@�;�'��ؐs��d�|��:�94I�Ҋ��n�����_\�Q���ç�]=h��߽���[_���@�����n^_�1�x�E8�x��PL����Vnˏ���Ʌ�re� zV�e
t�f�M�
6�K����1���a��C��Q�H�Ṛ��9h�^��Ɣw)���\({�%ļ�BF#aݍ��.@	�$.��6�i��G�>��wh��{��O}��^Y?��e{��?�J�7/J\���.J��03*� ]<|��V6���w��(<�\�V��
`,Dw6���j��l�3Bi_�|�P�F��ќ.�
+.��Ӑ�K�f4Hn�X�b�!4����C Ax���
F��,����JG��ԛ=���o���������aM��7�9���Gn��W?;��[����~�A
+�;W>^��v�^��]�}��(n6G�yf�#�yTlʌk�m���f[��cX9,pY��
\/�5S?2	�
+*M]�
-Ġ�sp�9HK�1\��8�y5fhFI�)ܡ��fu,��]##��p�5�)��:2``e��3���lw^�C�h7�Ћ��k/|�­���Ƣy6@�ܖV�V�r� ���Ig��y��>��U��+�Vbی�)����[���6A	:�����!{��[�4��)�a��Yѐ��U�„Z±��Ie��G�nf�b�nє�
dP��]�a���v�a_�kY}���#m�imfP1]��������߸�2涜�cx���PH3���@��}*�s�p���ΎbX����V��m\��l(�|����;�ΐy-u��-�z�8�A��
4zS�{F0F�
���ގ��VI
+\a�w$�"��D��Y 1Wd��kVb	��<Ȕg�@LKo8�ݨ7��9�栅����w�.w��õ���4��+�'f��s;��'���~���у]eE�ɋ����ë������C����3�lqdQ��V������
+	.���^T��F�F"	
�����7��lY��MKM$��`��bq�8I�&��S�Q�O�9�e1m��/��V3Q��Ϟ}��c]�k�n|B�����:
`A�{h.�77n����O=���Y�+����|��"�ʈ�g�����zk�x��#3�����|�>\�P"+�D�!ҤeV���`B.B,�V�.���J0Ab�"v��4332`�!��)b��М�^A=�ux��i�aA#tg�=���vk�觬M���|dx��EC�6�v~
�&�(��&2X���It׽ó�T������a���ƃ��E�9�"6�}����R�6�����<�Ý��[�`��?��f��#F�QZI;�TUa��ɗ����
+�i��}@�D*���\ K1��)l���E�E�*�i,0EZ��Q�q��P�h���
g�~�6�q��Y��ҡյ��%�Cp%fË���͓S	��ݽ���+�⅝��º����wZY_>���z������{�P��W��s�˭E�u/�����4���s?��&��l�����f��J��i�JA��f��cI���sȉF����� �h��#��c
+@��l�V����@�Ѓ?�[]76XDȚ���A���BIjP7g{��Z�J�:�
�����u�����y贽����63��ƙ����M�"�
����X��"R��*�p�a��>���b(p
-�K��t� $[�Y!L.��d�U�E\�����{j�a=�K��h��*�
�(3�*E�0d��MN�i�1�(/�Ol�έWM���5i����	�v?y��3������
�[�{�3_4�$ǽ�7�S
:6�
Κ�_΀�)�4UFkJ2�F)F9�1�����A��4��
+)��J%4��O�15`��KPa�_"�Aۙ0�
+��sUl�Rem�g�fTj%�B
%���f���.wo�=�9u��p��ۑ��ԕ�gm9\��6l,�Z���}�k_ܙ�7��5���h�@B�#IS���U��_>:]c~m�>}-��]d��HX\4d�9]P�₊<f3��`}DZ��b�QK{�~D7i�irR05���=\���/��e�B���3��xH�����m�5V85��ްٱ�/,����~y�?��w��/>��_��}iq��]�|��Ͼr��E)ýw@�_���v�����ZJ5u���UH4��%8G���4��Q~��6��@�Q��S:
�@�҈@,#�+0͡s�_!�9��O���fr	�D1���t���jhq^
+>�3AV��V�zcfe�>�rh��_���_9���K��<���w����m�v���lܼ53���ae[�T�sf!M��-|�+����N������78�@8,+T(�E]8$�
+�e[��u5�xt�H1��4�d���^T'�f{p��^c�l��C�ǿ�Zk�H�Ɉ���B�˥���F�iM֜Fc3�����?(��o?z�w��>]k ���Fܳm����wI��� L6Gr}���+��9��r�=����O�䄓V Wb@�>��)�FI�sX���`��|Y	N�b���q�9���U���L��e��˧	D��с~�@B�V�݆jK,,�F��{;�0_���{r��[�Z�V��k��$3E�愥_=�b��.^��
+F�i��8��F��0-f!�:�v
+��w��k[�U�[���$4E99�rҔ8
���Fr0��$���}hB�W�z,N�����YA	 
,T�����F[����.6TWu9��g���25�����IG�J�n����T�F@i��v�(�S��r,D��k۴{���k+���R����em���[�b��71vt��X
+�hX���<ҁT%�HP�N�%0:�\7„
`a�/+f�h3���J
(���=$���D��{��.Xkb��@���s;!kbfC��L����\�=9����z�l���wgۃԆ��[�������z4���UǼg�Bg��tk�B��rtg0w9�ӊ���ށg�*���r���Ģ�c+E��B��	�;���c�!x!���Ͳ���d�����hkT�]�GAFo7������rZK�LcqM���`pl՛w�b�`E����7���{��#�"�@�iGF�b�3i&Q!�LMuip�܅�����@��%�<l�4cPR���{ˌ�bh �n�a�Z�#�Cj��%�$���#$|	fT�1(�Q���p뀯����*���N��b�:h��h.�UfՌ��ް(���Νzduw��<J��]Q�aeX<^Y�v-
"�WzLy�ܰV��!�6bo���l���Clt��|Jb��1[
Ի�Fǟ\��#����2־1���HٓG�6oӵ�jc��hh>�4N����
+�D�E��;L� ���"z� >� �rۻ]7���Mh�6��q���3Ӻ�O/�����evO�1�0���<���,j��O���ǯ{��� ���a�c�^
+�@��U�/����?�R�<����-���ff3�C�O�X�)��F�s9T�3��b����Z�z���:�p˃�n����z��b���X5T�m����lyrn]��a� �C���RhdȃB�p����� �o|��%dS�D�'$�&vhts����_�j�.<���o���&!�/Ĕ���iI��Sխ���ye<�Odj�j,�����N�SW�����|u�������Ʀ�7��V����}�������c�KB�:	W��K��˗0L%wb	d�h�,Y��W?�!@�A�4�F���d�T �4�C�����W���cϿx�]�����A	/dգA��y�;��iM�����Ʒ&�����f(��Ԯ���f2	Z�t�ɛ+8#H�����z�,;��Ϭ��>��4�Y���U a
	l�bH���&b�)�E蟘�B/zn=̈́�������A�
D
eM��y�=n���>=�eNC'�2�=y�ܓk�������Zjd�f{��`g�B��,B���j�/BȆ>dzo1�Yp�!r�����
�*��U��NP�]���
6�1�I�T#'�!aash0�C���|�������;�z���j�.�o}�ٟ����S����rL�)N��~�*U5�$�o5T:��r$Î2����N���
+�.��[���Ν�E�^4����Ѥm�k����=�fE5�m�7ͦ2��Y9M��LcV��z�1
5
X	jK�)UO!�ڰ��Z茋��4���{���ǫg����w�̭�N>��w������A)��)#uk�U⧉�!�p ze?
�M%-
�L�sNX�P�Q��·D`�׫�Q-t�A
+�Q;�
�j�@|/]��W��1,J�kgT!T"D!0c@d;�;R��l�i%ui�0�Yע��6�Yk�%gTB�S�a֢�
g���������������郇��}]��U���.���옽�\�+oE�dh��[#
��!��B�*�s�X�&ۀQ��+hq��9�\��v��CU�L7���vw����rĕ'	<ٿ\ ��;�/IȀ2�� ��04�D��ڍ��$_M�yVϤ���#S�ۗ������?y���H�||��k�r8[��?��bH�c�j���PH(B
(JT
S
+�(���q���'u�r���)\�z1zJ4��3H>�����8dT�t��[��T�N�U�ћώ_y���_�ữ�#B��Z���W��Z��Cɂ�1u��^U�l�����@��y$�� 
+R��b�
�E�zh�һ�������xi��'�۟L��|�����ZG1IH��	��/��2�?5SI%QXc+q\GɎ�&)9gʶʶ�0̂
+�J�:�#�����v�����ڵ�.��=ޜ^���}xe$����??|�{��	S����G�tJ������������\�q&�W�`'�����d�$8���Zw�	����
T�
+�����|����
+�����k�9TQx�߼���&oN���0���[[������tuVb
+l�
+��/~鯢O
+d���
D�MCZ�:
+�h���M�¼�e7G�$I��V�����\�^/.���at�wnV��Ģ쭖{�g����7��՟�9_����������|�zz~��1X
FE�N엿�_���3ը�Z���Ow�֍�$tv|}ճ{���
����{��o�'@��W�����p6�t�������ݺ�n�.>�����W���o��
+��������$e�����H)	
H�a�j0�<#�>,�Z�.�#㸳.HYh̢mD�bE�F�~�v�����Xt�O�˽��>ܱdPj�,p���֛�W�sG�K'?���*���=���6��e[c	�sj�_�v^^��S��&�	X������?}��	�w��o��?�g D
El���Z���T�!��{_�1��4��;7�rV[�����޿?��}���h�?]���#E
+4}����dO���'>�ԉ�������*�LA}j�`�:�i�M����}R|�� �������2�WdgSt2��hƳ��hǰ�M�\8��_ɫ����������k�t��tmu:�ks�V���!ceO>�|���`�Y���Q}��(�G����ŗ����x ����{���G/|� Q?~�����=���\?���� �h���]\,{o�9m��?;�pL=#��ȱ�������(8�X��%��"U=7)o[`��
F3��fX�c�U���b	���95{������|���4��"�r=髗��y�}��ř�:�O�_�:��������cR�x�?>CG���,?ytՂG��5��}��Iu|��'��߿g�f���l��'�������v������x��7��/��s��?x�
+`O595��j���m�K����r��[0Z��]�. ��QV���B���'�_Fi�T>&�Ic)���5
+B�n�9�8S��`i�-x������Y5�&���+B��FC�T<���/_<z���I�����O~��N!�>��RPB��c�A��q��~z��~��/�?F���Ӫ:��G'��@�^<ۘ[��ֿy�t�����m�dr�Jջ�#T}]�FH�L��
+�����]L܍��^v�k�.;i�WJ�"-�:8�Q� �S,����h��<BRBH�?�T:�ۗ�2Z����:ծ��z��ΨAv^�	XC@m]m�}/;ݦB�٧�:H�	����?:
�(��=��U�B��h�Ni��|~�����G��;O�[h��
+�����~x�8Y}��?|�7.����*0��A�v�
��������1a6��
~����z�_9�)"�h Xn�Qxq��!P·Q�O|q[i�6)b,�E�f���!�,�"�uX0 �ڜ���l�|�֤nȣG���|��ڎ�bF�+%B`��Ҟ���7��|t�3 ��D?v�<��gO��<&� ����̾E���?��~�
����ӳ{�_����3�@,A��7�����+=���c�ӯ��/���?6�w�{m��g�N�}��C)�(��$�ٷ�}Q�`��,��X��q��TTj��������w�^���C`�i��=����P
������S��"%&��#H�_�4�7�R�p��1�A�iXp0����ˣ�M�tr�Ԇ��w�GgJ�{�ڵ�g�g�:szmtm}4����ߞ}��ɉ�v��k|z
Sq�BP����W~
&�T`T���/plU5 >W]!����3D;��CH�}'�_!��G�+���i (���*
�7͛����$jX��
N��?�
fs,%@���E# -Yvƀa�Y'��k���#g��ٷ�75�
+>��n���'O|��z��W���'�����?����{ͬ��G��U�@U�'�lI�x,��0*��;̉,�Ii��m'���i�b(�Gdݜ�5U�
@��\A�M3���4ME�f�k��J/
+�݅fb�@�Prx
`��lɌ�#��hF�
+� �z��(���d^��X�X�5X����f��=♊e�]�F{���ß~��j�������6b�����}��9n6��?Uc�KU�kV�9Ұ-�@���H�pM�r�5�#�:p�k$3(�6����D4��͆j�K��胠�����[��SaLpBe5B�c���$4)�7����	�j�-̄��7���w�|�&8����
+���y�~�ãN��]U�!mܽ���k������@"�Z�V�p�
�ɸA�n&.�J*T�$wR��/+ʉ(E!!1X�9r����M�Ԏ�K@-k/��f���O��NO/^��Q�	)�UFe"I��=�Q�{졈
+?m4!� ����r�r��A+
�oܾ>��8��j�|�9ׇ�����Y����@�4z�z?>\���,J�z]{p�HJ�`�
+iF�fűb7m���K3�_(�n
Ƣq�����@ͬ�h�,˵�
0z���D`B�?����.O����%�
P~�TYQ�e�ieQ/�h�|��Eq�!%5=��7�fX��=�<�ק�+uj��"�0�W� �D1�͓��X��{S�1�=�Ϻ�y��T;T�z&�ܽ��Wk!�ݱ�LՓb˙�;�{�d5Q�Re�[��I�^�h�eLc��Y#k�h������'�����w�������ݯپ��r�u5�A@ġQ�Y@��1q��J#��/��|��(��_yk�VH}�Z7Z�a<�Xh�D��.�U%,�?��	
K��Tae�?f�1��o��"L�u���g5h����Z	���.iaD��&�ȏ2>TH-�`Ӕ
9 ����|�R#������������
+��Uxax��ڭ'瓗oN��B�� ��2�D�3�lJ�Ib`b��(*�>Z����{��ՏF-�`��xKA@;4�zQq�>?��9NH*��B`������V�׏?o�h��������!poia��Fq�%�a���r��~4Z��Ƣ�,�O���ko0w�6��'�G�{;'_�{��].��2KU)��
�M�gB"U`QT$2ӫ��UD�j�����
H@�TU0���
p�0a��:=�T4�Dl�"���M�(tR5`V?m� �?qH��u�J
+PB_�{
�E��ŅN[�p`Qs9�ڊ��.%g�~,*��dv
`�L�o������du0:��&��x8���e��U&%�4�CD��'8
p9� ��	�3.)�����k��x���@� ���n��,�y�~�F
�Q�|���ώ;PPcMe��aKR	��,���
z&U1�
+��2�v
+��E��C
c��1��K���(�	1(�[T�UFD�����Z������?=�K�^����w_���k3y�Of���"��¶����V��@O��x*N
��N糛7o\<zu磧�Hz�$\�N��Eף�&4�d���`|��������j��pd�VLL�D�'�|�aVxwI���g~��<`�s��"4��t���@q_�R������\"H��xo_�^�����xְ4/�{�׼;�ka�����rBW�7��ɭ346k�EQ:��ׅ"�C������P����������q�3��b�n���o��@*���r�}:��<PS�V�ڣ��>��U+�~�i����
��{�Uʏ�xliЖ�
h�����P����GS��tX脬-3��R�$=֓��Gw��f�]5~�������d��T��{�-@�����gI-1�P ��<g�A)� �F<�����ƭ�_����^;�t0�|i�Ϳ�Z��99Z�{�b�⠪g�J�{ma=5RO`t��������5�HX�W��9����Ʋ�C��Fy���Q0w J��b)a���t[�(�?�"{@������Oޭa|x0=ϟ-����/�GԻ��b}�2Q_��.��L�D0	�s�
+��?uc�lX=�[�Sq~�w�}X��^���a�	������=k ű}0j/��ug@$��Ɠ1۪���3{iF���_���߷V�R̆ p��+WITC���3�$y꤆G{�&&�%�2!'2_!�30|�7I�%�l�f�=ݜ�Vl�iW�`CSC�'���ޯ|��%�\�������Q!�?�ِ�j�}�����u?}���_���TN]�f��ܑ�ă��G��f�D�WK�f6mV��i�sF
��<گ�ڄ�';���@� �����GS���'�1���z�v��n
g�Oi
+7�h'RD��pFT�b�5((����˳�M�=U��;+�6�����^
��[X7S�}&$\@*r�%5��LN6�4Cd
�o�~�����W'�x+��o'�B���g�^G*�=MvV��_^\,�6�{;c@Ue����yA,�$
�p�z�Q�T ��Pm�bq
+Pv�}����c���)��rՒ�Q9<%�� �imA�i�l����؞Է*�޺va�;g���!ջM���?��8�(P��q���_J��允w� "�._������P�7�i<�U3�E�|�z!а�����j�n�x]�Ϛ��:�h�i�gqC�Tb���2�J����<t���0J�u�֗~v��E}af �0�=�x0�܍�ym���1��"�;��hw�x���3a��\��6A�b�p����ź��CB�`X{6�BS�p#���2�J�/����f�BTe��ZT�@}��OnK��k��M��_��{Q��ƾy�4PP#�HX�Z|a���AG��#��ǁ��6"�{	J�"<�hJ
+�J�կ��=����E(�@h�ya�Q��\XD6~"���tO�wfW]��X�eq�t�:>�wF��/_�{&A��
+�0�`�?��a����a�����g#
��4�GQUP���s�pwozV�mk�/���%ux�����Y;KR�q���AAlҤ֠$j@�'�!�r�fS��� �������B���g���6>a��i�$�F�'qy��a3��S�pDJ�3�3����7\m���Uxq���O?17�����W.}��h��@y��9M�w�
�n���W�7hB�{�AD�t}
��vg#vó9�n\ �xu��h�[�u�,��^���/�1���X1�ӹ\��D��,�PHh7Yqu���+m	!b<=��ck�W���Çg�#V&�1�3���n��E�H��*���Wo��d�r���ݏ�����b����j݅��xˆw�?�}�N@b"*�F
+�4�q~��[�Md��<������>����u�w~\�@<^�DF=��f��ˋ@/��7L���@(p�� "p-��>����~��6k�/��`�j2]EDI�O9��?j���.Mi&�
+`
+�E���#�� &�;ޖ@�\펯�:�1u��yi�&+�۵��r���%�g�n���j@�@���}=~�钀4�	\�	���7�>�q��FH}Ţ(N�����AVg�q5�|>�8�=���̪���"���v�7w�l��C!c�i���B��B�nߡ��7�����l}�����&��'�
:y}�b8�kPQ�ɣ��_��@���]5��� e,���E5��
+,�&��Xxr���ڦ�>���iU0�f�<�d��ˇ�`:�>@��@��@������Q'��T�Q(x~�7_�������a��rI���ōڵhd���?��Ճ9 t�$����պX��ls������F	�^xkt��/-��h�m2((����k���7���g?�?|�g���Ɠ�p����O{�{����Mߜ����b=�U�=s�|�Ѳ�))�j0CK􋌦��LAD���y����d^8�t�m�-��i-�<*s��iu����l�Xu�6R�Zq�n�.���ե�R�„,�������Ë�����O�a%�l-^�W�R��>�ī�l�~�?%�ja���C�.y.�iv�����S���?��폡W��LY��Mn_�����'?�����3�����L�޿�ŷ>��_�;^7�
+��������_����?<R4;��m<�PՀ��;��T�Ai��:�@�[ Q7h���p����ɥx�ր��6m�����ryr�LgF����"V$�u�����@R��!E���|��n�R��+�FQV���hC_T��prQ

+kX-�ig~~�=��x��
&�+����ƻ��'�����&PX,[�V֠BQ I�����<]��}#Ͼ�?}�˟]�Q������������'fs;������0�Z5W"�^�������6k
VI�Y�'ΰ
�~�"��?�
�#x�VS�mw�`����Bu�߽v���WєD9 
@}wP?��T/��?`��������ލa�u�F����ܥ@�Ai�q�ԫ��'p�{���w���W�&���*�P�����[5�����mv�T��g7y�V7�v�Y��:����13}��?����;�}pϊG4����ۿ����w�q�iU2~�����������G�0�I5��L�w7Р��
+�"R��Ӆ`�2!���J"�j�h��x>����Ŀ��Y��%�+�~�K�6
�Pt1Febog/���KS�@o�g�/Ը	D ��)�VX_>��;8��_����oνh/���d I��JV��LFh���Q�G��|/����/AV�hCx��N�E=�˯�L�|��'������;�1���}AN�'�j�`�⏙�"�)��1�Kv�X�G1�)�F5mҡ�_Pa"��+:PRe�p΄�էm�p�W�ͷ�Z�\^u�#ŔC"$'�w��#@U�]
��⪻_��m
+��lP��Ћ��8�
+������vz�\���h�a��(��t�:y��t1Yz
+0����#��F�'>�r\U�}�C�ڈ1���u�\T��;{��gߙ�t4�{g�|�G���&��>.t�'�&P�<c�>o'H����@���J��S��FW�����tgZ3=/��VW�[.�+P�w��L�]g�p��ޙ�<ڠ൯�.��
e�wقP�ԅ�A=~p�;��|���j���Ճ��{|K]�z�a�Vs{�tL&Y
�W&�s{B$�0KS P��g��;�/?|����B��Lj�C"��̏�£���"�j��'
J%/�\�PAcٍQ%;��h��sT�'��� F
Q�Sf������hgw6��-޿�ە`��P�t��S����#d����ۣ���ɭo~�1S<�ŋ�j��@��K�Q#UA/�������Q3
�>
+8Y�����3��ȤWF��⠈���?R"�lv��<j�3��G�>4^?���)���w���'ߺX�.7��T�� Efj���
+I� ��?� !o9
+Z�u�m 
�IEq������+u?~EZq�-;bUJ ��>=�
����U7�&7��uP�D�Ԇw
+�j��k�PD����;7����{�}�ɧW���=��'=&�	xœ�ҠL4$c)�`��H���+�������G�&������Q��׿��LC
C&�7$gPL��\�jQA ,P1%�R,$M$�՚;W��T�mv,f��n6L�/�;��WNB�T,���~�
Ӄ�ͷ�������
+А��VE	ظ�h3V
�BAN1��k?{"{׮�����_�^<4��OϥBʊG��@T�?����EY������a�ȈUV�P`c���t�}��nA�6�����߫Qe5��F
i�(G��<��O4�AJ����d��;ë͋S�
E�h�ƃ����������f�9�LU@f �>m+C����?�1-6�R
+A�U�+4(G˽��,S蟝3P3?��{a���J���y����G�@���`iP?�%%
%�R�0�RL�����g(��/w�����sP�����k�!�`�w[-Q,y4�!V���8TB!���"
p�����g�W�}����\YR3�Vkm�n4n���Q� &y&��r��͝��[�T��d��:\�Б4̂j��Y� z�7�mM��˝����㓵�8������ޗ�DI�:j��]FHT:1�y#���%�����"��Ũom��^��ƤUVQ(����";�ؙb6��r$��Ҋd����|.v4&;�J83B?i��-�js�uu֣QaR0F�D%4�W����_�LW���{�a�pP��
+�
y��}~Ui[��� ,���_Mg��ͽ�E�ɳ��kT"�$�EJ�� 
�dH�E��i{^��\���UH[����§[uCl��
+�b������c���h".lV��y��pݬ�ni����'��f���%��G]<6�_~�U�&`1��O���FSo}甙�k!��ގ*����
���	�e`+��=�Gp��f����M�&G�2��S}��abL>���e>]���Z���(>l hY���
�ay�E�5&�(��f"~5�ɔ���zwF׭T�5����eW�v�ٙ-9��~utF�^HP�f���f�o�A��`����'kQk薵A^vu�M`m����o��
+�������[
+A;s�n��O��'ǭ�qRF̄���q�#�BQ�")��I^�$()�A��ƀ�J��":�b@����-C�-"9�R��%�͒(u��kƻ���4����4����� �/����Q=m��Y���������t~�Wo3
+��j�(��A�v6�JU��ԃ,{d�ԈsDJfc�'�3=7 ���zz!Lժ�4Mr�مu���DP��\H���JBC��*�JG�&�+:�.)�f�lCA�D�D`�
E˂�VU�>�� K
��T�ry��B(#Cv������l�/	P=����&;2��赋�߹��X�gctm
��xb����E�����T�ڱ�\_�
zPU�vG8u�<�œ�5���6D�`خk5�p!g�r=%
+��k�4����)*ªZ\:AD�
��g%C��c�	��X\�3ZD1s��k��qqs ��I��������#�[��H@UI;�
�V@��ɳ{�Z�ՠ��Ԑ4� m�I+]WH��݅1�xRlO�0۫7F]mV�mA:���B� �������u8
��m�Zz��� 2* �@0��|z��rL�ZD�!��
w쬘�F����mѕ(��呭W�`~ ��Q���y��5��Ǟ���ҩ_�w4�^����}��bU��L*Da`,B��`ܪ&PQ�l��B4�Pgg�V�YC@&���Ox1���z���h��h=�s�c�����u
=4�A�L��C�m�9��}�o
+i�ei{I�dM\��HYX<��Mi	�[��E�#�h�ya�F�ɩ_�����b�%��
MU5Ӊ�7g?���j�-��4;VA�Q�A��q��B�
+L�c;�=��k�ɘ�֕,�=�
zrWOE}�'�κ-7̲�4�~4ۓ��":���r�(��X��4R1*�������M��i,jJ�!|��iv��Lo#�ln�Q�p%&�H�M'��2ۖ�3����{�̘��
+�UDt-(h�vk/�4h*�<�܌Bk혤zi��%�����KEA�
�VJ��!I_c��0*5h�e"
'�*�>#�4��@Rɺ��lK����Y�X4�̴mK�����
2�_@5�v�Wm+�ʻ1/�.�0C�,ر�*����|���jjݸB$¨�'+"*T{����t��Q=3�^=^�C3���y�󏖈Hp�U���+��g��IW��4�'%g�{��[t���6�3_A!B�����f�9tP�VŲ~�#歌<�����`�$�[8��wҭwn��,�B'�TP�H��q�^��s��7�_lF��Zά"�@$�ň��հ�G^,�_����&�k89�j�����.-$=����(P�L���KRpK!
+
�)�r�R;o�=H���$�.KS
+B�$��N�[[0"�R�L&Ųb���.Q��S\�䔗0s�"���~���kK�НNo-��|}�ҥ�aW�Ȩ�����ő�7����𿻶XOio��T
=��.�"�z*�W^���;K8��Y�/_nFF�e[���_^�Qe�F�gJ���H��`^�X���v{Q�”:�\<�3DN�d%ET�-�`�1����������ҭ����7
���_�Þ��pLX������^M�W4���'��<������Mۺ�l�{PB�ꩶ~��}������<�6��О�^u����o6O�_��f֯����cUJZ�Y�?�&s���EUHw�1�*
+z�r�)P����f�U,XR�����g���Hj��A%Fh��Ʉ?9�I�[���&�#��wȺX�o虭�T����A�f��+�\�-@^��g'�6�c
+��ī5��>H+6Ԯ:�G
���>[�YMRY�V���E%�^�ه�Q����*��0"`�ޠ�Pм���t��6�7gk�h��9���,´�1��d080���U��
!Pl_al� n��b�����݆ԛ�1�
	�r򲿚	��lز
c�tZ5��'3������cj}4v���U���18��1*^��'�==�hL�Q���	�>LF{�����cc�‚���2��PY�"'Je���'�R��J��d���z�t�)�NTS�W��=j��ɾ3�5�i���f'�A_���Z�V����pҪV7v\�����R_O/'��{����kAfEO(�-����f=n\�n����C���z�X�6�����
+�g�p��գ^Ӵ
0�bb�|" r�9GA�HnM�"��[R��r���!��<�HX���P��2��H_5Nu%"!x�\��ۿ1멱F{�8��bы��dygsV
N��ߨ�Z�t�F������_��f_n6�I�8

A x��/@{Q��N�y�6WOO��ý���J��j�.u��J"����[�pD����?�uH�Ɏ

x���fH�Q�F�Tv�d�+��������4��hMy�x�S��[&D���"z�w���$@V�h� wZ��O.o__-����x%��,��������d�}������U���@3`d&�* �m��dO�ŷ��ӅpPA+��y��zԣ�"2$�W�j�q~2�|[P�U
+pD�$9����$hBbj��H�)�G���<W�`!
Ee�ɐā���}�w_3hI��Q��Qoנ@`q^9�I���xt�zoɲ�v���b�ח?������?�7��y��"�x�ƐW	~<F��M��l�T�9p��Z�����+74�$í0����"vx	S*I
,�[J���nBH{�����m�KYj�
�T���)��Y&�YM�ػ���/Y���R��ۓ@�Ior�~�?|����{��w�IP�g���\����ƻ��Ɵ��c<[|0�Y\
+�)h;���
��s�� ��<۰����ޢWD���O�/%���Ҵ�0~Q���ܪ�_Q�Ѳ_c�I�9V�4�C�b��
+�LY4���4@T43U(%)2�����( ����3�c�uX�������vF@��w���is���-��ٚ�D���P�������ۯ�x��$��@@f� >�����)���=�ƍQm�?yx��g�����2�H%6Ⱗ5%Hqi�J9n�vW�M���6<�<�q��V�q>:�Ͳ~��8�����bA}�_��7+t@B�h�[N���Qs�(u0ƑY5��zs�/έ����5���7�������w�zPm�%T��Wp���لеWkY��ރ+[�`��ս�8�7'�;d�����">)�*�M����4	�k�[rq#XR��N���	 ��U�VYd))�"&\�"+ՔJ�g�}����n	�EQe���弞�����@�����B*�2�k���j��a:��F��;'�+��o���}+
�%'��
n�U�N[��#�8��]�E����s��{rՕf(�|���t&* TU(p��3#�l�,ř�d��X:?�sJ$�LIlJ5�r��:J�sk>(@�E(R�x��}����
�)��<9?��~t4'4��{_�N��ƜK��J�73���uv�/W��_��÷�q��;B�*�HHi�X�_w8�ʚ�����!ˡ�x��,�N���\�8	�
~B�Xc���e�5p�m�"V�ܡOj�
+`ȸ�B�y�媢T���*]!6� �j��9�M�|��?�
��`��B�sz�/;o�H�\���}<kH�[���Ž��)�N��k�j�n�(;_����e�	DU!C�
��Z����Fҝ|�����HϛNj~��ġHt�-���J%���Q%D�R�0�U��9�DPE�ټJe����E�4��l�r��ߒEb9?��*�o~�_ϔ
3'b)�X/��u8�HB����i;D[s8Z\��;�+ݭq��ƌ�~L
+կ|��ޫ��UC@�.�:�<��h�����Jm���'�'筨
+p�%nҐ�!��(#E��F���
A�~��b�=��y+u�J]�*0��2�[�l��B��yv"�%J
���܏~��s(�<IQ�D't�R{1y�?~��,��;�N?�t;;��ݚ�+f ��t���K�@�V���L���օ����{�`
�P�;v��TC�'����M�4�\E�*%U��1!�DC�ѹ��
+5���XU%�<"@�D!9��ݮ`�L�$�d~� �ȪѼZ8�����[��`N_�&�jc�>�`���=��w���%U]�|��9���w����:��j����u�޻��(N,����d<������c�u�|���R
8hV!G,�|$̒�:|/J��
+��T�cO#w/E	�9�Y��� �"_�������0�Ä

H"v@a��,��[��YLO�_�ׯ3!mɗ�㦗�wF�{�ߣ/����_{�������j~����U�-�j�`�p����7f��w��snV9���`-����7lS��.�_j���EƊ�����N���T�]���,O��AN�s_B�5��(%C�4)�xJ��j�~'M������[�eX嘻����z�'`��"
+��1n������e���zl��=?r��ly5;ܜ��3��L�2�	�>��q���l��
8�\ٚ���O����Ʋ9���"gX4�?�!�>*2$U" �X=�ft�����ɛ�Ԥ��|�c%]�4Z��P�h
+�L&g�EP��)�2-Z4ޫ�7�|�<%QHR���m,];{��4������i�Z��nV�
TG�
+�]�
V�*x����K@��
j�
�������.C��ѓ
�>X�v{i��
� ���`J�b�Nu�o�&����Or�ˊ�n���H���3.a��ƵB���Q�wчxg��o��$h�bL
� "j��w��׼�?���f
H��i�Ke���!�*�=<=�L���!jPQ�Խi�PMО��8lL->���?�8��[	:H�%܊!�*i�xo��nP�\�l�;5��(I�H”f��R�PD�$�&�-��
+�(���H�p��� �
29��[��o�&nP6�z/J}�a��뀎�
d�!{��ٙ\]�Æ���|5�����j�R@厫�+�닇��:a-���g��k�Kc�͇[iKxIe:I��@@� �ի�@��*,����$�sk
Jmg
 QIYq"��
	X�I�-�B�C�������Fh��׈�#*1��2���A�����P+
"ηph6�C��1����Aj���
+�0�U��R	� 5w�<Yֲ��1��������
�$[J�v�"P����4G�(N/��0��<�6����aB&*��$@HG��K�4������&,�k�[ iF���oa=�O�D@!K��,�~��_U��稩�to3�h@%��t�\�"�$�`'��7���=���Nɛ���}v&Y����y�6�
+#ֹPFTI�PA��
��y	5�ߒ$�Oi>�R)Z0ҥ�+ѪXA��3�
+J��bx�ޒ`��2�"������X�0��ȈȢAD i�J���Ć�3�a_!�w�P`<߬f��o��Zq���0􏟝�N�>���K���`Z#�bV�B�Hi(k��i��#n�Ҹ}~/A������4���E��+h8~��U���D�fj
:�7�*r[���"�xQˈ@2�{kd)���"d�Y@�hǒ�5��! 3��U'ԯ6��A�����R{��2�Nx�����1��^r����X�!)CRA��@>or��q�]&R�r��{������R:h!�������V����w☾��'Op�.V
f
Q1Α��A�Ñ5YEQl2���F���w�gX}E
Q��ĵ�s����Ts4�O�ZOF\��N�>�bU*���5,��Ϫ�j�<	8���|����mT��+�%t h�dl���ۀ
&��)0�U�j�����v�ф���w�3^�v�.v�an;F��ݺOF�
+|��w��b��fd��E������~e�(�PY�Z��‹m��,l�����
+)ǻ�-�b�&	�@Jq�	"�P�\,�…�OJV�,NJ��`
+XbII�A���
�r50�[��>�j�`�[�/7�x,Ⱦ�D��.XCkl��k0@u��P����'�e6�ͮ�	U]I�VF����F��l†D��Ó�����T'�w�]���k�io6���9H2A$S��:�
&�
+�i��	O�w�s��~2��"I����E����h�j�(�p�
��<V)j�E�!��j���ӝ��!*aP@F5�V6T5k�
H�������Q���#��$j���C諒���ų�J���;���@U-V���G�6 ��M�҆s
H�8��	D���bg�e.U���P�s
+�ڗR)�p~
i|
+�Cz�Iy��	�z��9��2{i�����@�	@��A���%(�-��lߝ=�F�٨" &r��u{ ��x`�wλڈ=�5��RG�Un��L'n�	�x�q��Qu"8��"e�I�َ�d�M�d��`�El�8a���)K����ҕ$��**�ĕ
סZ�lBG"j��U� %����k���+g��.����:aׂi�S*���6���dD*C�.v�V���w�L%�7�ɨ�Ġ;��{@�H{��c�L�˵��}ܣ"J��H+�e1�������0�,�47z�D,#��IJb�33}�@:������!	��yT�!I/��)m�b��j���Wv�	�AA�%֍N|cRئ[ۡkV�/�'�
�!dV�}͈��;��"TE�۟؍��h�~q��lO���K���
+�e#oKR��9mՄq,=��\I1(oKF�X<�|�!DŽ��h���^������9��h���gE�Aj�{~�����M�X��q�I��0 O*<Y-pZ������;;MS

-
"��R�k/@d�)��?ݸV?]�O7�hϞl��h�vK��	�B®m;be�JA(`V��a~���FQLC��!�������H$Cpt�K�DÈ��sT L�e�H�?P����0}�0�b����0��n��l|�5/?o^:h,%�3�7�{�L@e}������ߞuܭ6/��vO5(Ċ�t���6Ꮮ;�J�U�R��I\�8�J)'c���L$/8 d �DRL��TsB��#��y��0
1�2f�n�d��$jLj��xR��#A���ΰ������bg�5�: �ǫ7o�9���
+�j�{��@�-��'����Wf���Ɏ�Lt~t]*����x}�.��v�Z(K�;W�|�����B��s�7aN�R^�5��8
K�@�-O��<�Z��fm�lH����R���a|w�Q�@q%0k?!.y�{��u���\n`�r�tm֞��;>v#������>z　dw��0��Txw��
+ON;@)�/�a��.��\�E��s�*�7J=�ij��n
�"bO0����I��\|^:E!R�U���j�ҹCDP��-@Q`�
+$P�
+`Ռ<�?^���kϓ���{s�?��
MmE%@P����i@���޷��ZmW�6����.�A�@Vʺz�A�?��Т/]�zJD.ѥ��J������Oq+j5�'�b
D�5����:+Vl�11V"f;�ٺ��a7����@ƒ1�"1+J73�5�l�?�lcN�zT;9�V,�ţ�eUL>���`��:z�V�߁Mo`�\�Ѵ>9:�]Z�1`@��9N��'M�%e��BgZJ�%l�@*i�/�����K듐�(���Z�(��|+cGS�+a�U"�0�y�����VPUO���ܣP��y���*\��z��߻==;yCP�n߬m^��E�*�"q����Laԭ��^���]�����<�Z�&��:����
�M�a���H�DE�/��)��G6��pd@T��4���ӨQ��E�*��P>Ɯ�X{��T�Ȉ8�1�/��D�Mٹ
�o|�8ҁi	 �F�N�vkn�������d�QG������t�c:����\ޘL؉�������3���ٓ�Ϯ�D����-�p���)&�E(a�-��b��&��qyP�9��LD�j��D3_ E8�>Wra]�y<S�Q>h�u���}ˑ�Ō�!�	���1�퍯Ofg��U=	�,^�
+��]���h��qkπ*�ˤ=?�\=k�"��g�ِe��3���:�gN�����$DB�Y��n���K0qIJM/C~.�+���	���	�t��
Ը�)�����5��'�@�<�����bn�,��i�?;ݩ�[�zB���\r�籮l��٘��U��Ν�{��G�4���A�9�.UQ�$g�Qԭ��W觀��B�=dQZ�*������aNÊ��J�{ђX
+�>��-����iJM\TMH�D+�A���s���B�D�3Q���d<Y,���f�0_.�
+��VǗ��!Hj�k{4���Rk�`$`ߒ���'���{�?>#��ޫ�H���%	`�E`P�B��K�&	�#M�
+��
+A,{�W
Ib$.s��I�7D2E��|�ڪ��[pTL3ât�y�1�&o��
+lJ�6�mЎ��#q�VĞ/��r�#z�>h��#U}�,3x`��d�<w�=�wg�9�W
��J}�\��@��jTL��\@zJQ��h��($R\
!We��Q2���\RI2��"�����������9C�(
qL�h
+JM4)q'<��[w�'Dc
���^��J�s~1�Nft�ZZoD��t�i�DSU��VnfJ�����t�S��x/��
�%%P�GZ�9e�_�|���t7��zR�)NCCȧ^��t>gD�Z�,*Ih";~��
+�D"6U%&,�2��0@2&%
+�Vo�ک�0���:�`/76��������dҞ��ٷ���9j,
+���z��-���o�$F$��
t�	8�+�RA���
�ӣTak�{�WlK' 8*RA!n#-
+�4�F�a�Q,,��EK�7,t4|Ҝs|t�A-�%�_7o�^#2,a0V��P��;��#�o.�W��߬�����5%�3�Jk���S��ZLh���^�AA�
]�PM�N�=g"U^J�̩
5T���IӍg"��� �3�p�S�+m��G��>������Z��E��$�G���<�|��ы�L*��8�v��c�
+~d%�w]XZdu>�7w��2|UEP�����-��A_�48Fq�4��>Z g5��W���<!Eȃ,$H�i�kL�\�cU�����$Y%���b>�K�O)���$B4�����.@�]�(��~)�QĻI�i�N���w-�>��v��wgSEP2�ȪPD��H
V{�J�L*�*�
V��
r�
Kb��B�ϓ{�B�	8,�6#�a�%K|(�����D)]|,�����;+��n�����
{M1��dVE�Y�l��{�v}O:D!L9���6�D�y�4�Iش�`�`}�A �����6�ns�d����z$�a�n�#����&LZ*	P��'I�����E�$J�	�[4K�c���Ze��`��C	�3�VW��y>ͶKݺ2��p�TЁ=è��ae������
y��1 �WL@�j�+VO�csA:q�j:�#�4M�&�zUЀ���BO{��\�ׄB�l��#���>n�O�g{[�Q*�����'J9c�"�F��_�����RM실�Lel�

SM�~�CUi@$��Ͷ���}��$�P����A��#�H�䲒O���x������.à�f@"!c@ԯt<���!��t}�Z���q�������V�$!,��$�L��ӈ)�4�üFY
M��'@�ԟ��Ѫ%����o�vY;�3���SO4O�A��Gc��y������J�d�e=5�El�B��T�ڝ�s�L *C$�
��#x�i+$
�I%�vv�f�33���+L���4,��@�ؚ�l%�HĪ�lN�S4��j�j� �r��rDn��[�⑓���1�1V>�����]��@F�
+
+Ou������[q����h�U�rD��;����茎 �`�S�y��X<1�8���@J�Ҏ��^(=G�X�Ec��ʴ��i��ݟ�3<��2�)�b3���#rA5�.D`o�%����&��{*�"�o`F+���A�hp�B�K�
�<T`�n��>�V���=���4c^��:T[A��>H׊�I�
I�	�ۺ����n=
�Cc�).�F4��˫��Nh(5�>/xg��V�ImL(<�B�H���f���%K#�F7�<���T�����@4t�
��2"B���$��o�΂!J,���h݄��ٜ[��m�*j�� �/[d�Zj
+���;��M̩1�¶bNs10f�ha��CbH��V˿[���uB�*��R*|4�������w��n��E�A.r��)��
��#o�U�L x�1V
+j��i�z�;h�_���8�lmP��&��*z�I��K`$
+D��u��C@�|d�"AebWSs?�낥!C%(�Z0�ԗ1��C:���se�m�	ş#�ڸ��Ϧ��Jd���Y�A
+�Ĕ	!?�y��n������

+��\�*r�'�;���w��޻1��;Og�AA��O.o5�{�:�HB�{�L�:0(V�"��1R�6Y-��*x���$=_��K�����8�uE^7����Vgӛ
��JA��F��#�b�K�WVy��2�ͼAh��		r��j����	���V��_Y��������?"*^Z\�̐�"=�����v.Ԍ��@�4Y�2nmA��(W>o�
"���� P)tb�
�MHK;I�W;R@��JG`�3g�\��Im��ֹ���M��?Ā�!�Ĥ�Wd('�����n�-G�|�?��y2�A�3���ʢ�3I =M�T����k�9 c�V	4���ޤZY��(��I",oy"�f�
+��ܲ�P��,~+��g��NIn߷q��Cu3����\���(�wa$Q�iЯ�����ض�JC��//�
�qөt�0���kUz��)�1����<O��{�J�
���D�:����o��
xQ��P��t�U������Us�ҥz��'͠�0�5C;�2�<�1�P�,�����d�BI)��Y
� ����FO�t��w�~}%��s�c��f��q- �0J�Ct�Lk�a
����
j^�ފ�6%�
���V�d�s��<������TC)6��h%9P��Jސ0����BJK�#{�,�7^���_��I:jK��81�6�N�2�T���t���r
+�²~�əV�_̚�B�
+����
���nj�W��k>�˧֬��Ce ����q���QJ�Mqc�Y�1JTma�5r0�bs��k�G�bfTe�⺐>2p����Es�D�,RR�������]�����se�]""᥽�"ԓU75ݣ�Z��������ߚ������a�u�~ٍ�{����
95���2�+Tݬ��f*hF�����"�U/����̨f�8��4�|nn������a��\��x$�jd4�ӱ�܀��7��v��&n
��P�D�W¡�$��l=	�_s���6X�-kC���ޏo\�Wk��$hHD�R��fp|(��Y�M�uSk늃���Ɣ�&��|�Ǻ)��	@�Bc�2infR,S�,xIJiW�Ds���H���nA�p�	�&�[�"�Z�ۤBL�P
+Ȃ��;Ǘ�Jۣ_�F*����u*Ktk7�qج�
���k�����L����whm����j���wB8�L���%h��!F/�D���kd����|��"�����A��Y��%oh��������<�Ϛ���|��x�I}ł�d��𜴗q,�\<[Y(֨8���M�]w8��UY%k�t�?_V�\X4�"3�@kd"��9@�d�G����_$�xy+�-�ƅA�	4�Iq�0�e��1iL[p��P����h!��r���U�G�?�zi�Bh=P
���B�D����u�nŏ��}�{�������9T
Jb+�tv��*�v쬂�
 �6�B�G$P��r\�<�$�x���=�0V��X��I��C�#]�m
��+/�ټ�T�y'��С�K*�s�2��|U�d�>��_��>J#*R.D�"͊B�8�ruR�z�=Ӫk=��v0ڹ��a�Z�����a�+'ٝ�̛�[�J.�7����**��j�&2�#R��Y+C�{4%qJ�XE��d�Q��X����i�@����uΐ_U�/���Yة�SE5;٠-��~�1����H��6h@�������+��5��Zx�~����;����BC�����G�IhP�}�
�!�EՒ<cl����?�2�`ca�����E_Q�|�Fh�J\��F�b����l�Es=��X�jsF?�O5%V��.}
P3P�(�r`��a�����G!�U��J�^�z��hd���]+��
+������5��o&�l�;3����vˀ������v�Ȅ���Ũ���]o�|hR�'6��h6DI��e���T�
�aׄ�VIٷ*��+H�Ga9��_�o2�z�C*E�}��?�ԦĠ�Z�z���z���܄��f2�ɍ�x�zU�`���riF�K�~��3���ࡪ�j��Rm@TB�U@A��H:������Є@�YFR�B��oB�v����S���S�\Ojԃ��C/��#�ܦ]P�w��RY	�4$��ED5#P�qMUH�Re���R=���tْn��kuP_�5�*ˍ�B��A��'M�@b������_��
+:E�Iŷ��ER9�� � Q[J9�s\�-J~�����L����qBf�c�4���뀍�l/�����T��
G($@~�ki�RqcT�X=2T`
+*�w�Ʒͣ���h�ye��`��0�s����rF{PM��6
#x0���_՞]��Y<	0I
�nwx�s'��*�.Tn-v�����(�,w��q�*I>�Ld���ePP1D�s�E�$�[.�R�XC齍ځ��zUC�bH�64��e��:�ΨwJ�a������(��y[a�X��NGt� � �
+�O��Q��xb<4
�(���V�K�O�� H|*�
9�9=�(�(��ȃ����%Z���)����R:R�LȜb�WV��i�{���F���4�xb
AP�A���<[��r�i�8o6Wq4���X|��I��dq�u�X��|>2��z\c kTHdz�����m���N-���
:�M���M�3G����4�J��QA����[��\�p��oqC�2�iX�*Ƃ (���n�C�3 >=�"EO��y�2�X����w�ek��6c�*�ϕ�����(T��˕��������b#���1��+�A�R�^T$웩��n�";{�2[�m���*�U�W5�M�e(���B���كJb��܎L����+���+R���pr��5��1��	�x��悩���~�
+�;�,������s�4D�4��s�Uߝ�]��`U���ܢ[���@l$(�/;C=�j�,���0�����'���<�ҹ�[�c�nqpt��*�jA�n��3�(+_j�|�nӃT�T��A������
	C
��$y#�N5�� ��4FŻ��r�-���ý�;bSC5�N��*���bLՌj�v�1V�@�k0��X��ldۀ���0P��R���ݖ��F��H��[.��7���)v���#�*î��*n�(`
C�(��&���>���o؛*4����B
Ud5�
��i[�+3��ss8q��v�C��z����2�3"x	�*jfS�Vų%���Xf���~^�+ !�8���c����
9/�ٰ�%*�:>41�$���ǼdzX�ѡk��ܑ?b$�"o�O��:/� �u��^�҄W8�L�,֣k�������
��iF�����v���j�u��c��Ql"B ]x�0H�"a:�B��e�d�%��o��"C�ʔU#�I�U�R�%�WL�i!j
G�����[.��Jʇ�-�B�3�Q�
��*B��U�����=5<-qf*���'0�u
cwr��f\��d>�Q�
ԣ�-����:�@����lĨX
�	L"C)����ݢ)�j(�W"�1a��@�fs�aM�"W�W�!?(��|
2
<72}N"�Ȗ/r����u-}�*BL�8Ǧ�N�34&,��mf�oߺ��>tG��H��4
�[���X��Xû��Cߣ!�A@�=	��5EŤ�.��%���
7�l��1�+I��82���b�=矷�,OHQ�@��M����:�¦���W:�b��:�(�\r�DBL\�6/��'�9�4��_�5�P��O�aD�v�����55��5����̈́�bH= ZF��2���)U��;s%X#h�.UJY��"Ѣ��m�<�U�y�b
+����3_i[YW�]�|�g�ðD
�ܻ-]iU�y0�A��Ad0�w��s�i��;���ۇc�au��C�tjL5�Lg#�֫�lA�{Tq��֚k	"���@X�#�LbҜ���]#�QҚ`�R���.
����A�9���

+��lZ��B�nKˮ�mU���� ����&�1�LAA�� �ZK*Grه��z����L�5�[}|�NW��f<7�QX��wҰ��@���ړSfr}� ��b�B����H�+l���UK����	Z٫�,~IcK�]���	�,%��儅�K���cV0��K���So��1����I�+2�TD0��~��3�a��Ѹ2p��ӣ=x�;���cj[�k0
�e$ ���o!�4��2�	Xf�y���!JS�ɡ��������rj\��v�C��v[��(��F"X�1
+T���fO�����ql��
0�zT
�A$t�說�6�i%��^7�1�����zu��n2��Ov��s��~\! ��{Qn8���:�2!2*ZKڵ����%�N���ɕ����f		(��
+�>�Us6����E�[Kv"��QףD�k�h{$Ɯ
,�IW(/t:a""0%b��x $E=��v*��tg��LJ�x�y?[^.\��to2���4l�>�ؐ
+�>���Wk�A�Y��B+q���'�x+R�5��p8�`rEɞ�[Ya�>�����K�i�1BI$���"��ͺ�Z�,��	)�A��<  �
��<y�:�z��GG�{t�Њ�f4i���'�ʃm�IU������վs"lI�~��̺���T��y��~�
+�YCIG�w5&,P�|A
��d�vY[M�_|�s3H��LP�,A����l�j�4[��}��jj
�����cV�.����T��`�1G�_�g���H�[�$$bU��� ��=�	��La�,�ۈ��A����5�
�����2���,Ş"
{qZ���ù�\�u4Jz�a��W�����ԪQ,@�rJg�(#��[��*���P�P%����������ȻU�x��lM�F;���dd0��<�"�W�p*@Ii�û�!�j��� ڵ:��fNm��$J;JZ�X�(
}�mB	B��,q��g���X��d3$8b3<l�_�{�STA
m������A	��<)2��H���V#��w��Z������+���F�twg6���]���yS�B��+�:AT���8��M7UѮG�!����)��{����j~�9Eύcp;�A)[���"H���!�0�Th��F
+�
4��UZd�7���5�
!�pU���ޠ 9��
�ݜ�����٧oL3��L�f:"/�eۍF�j��Whm3�6H��M �l�X���ׁ��I�hK�
%j��I���)�JiY�CE�.�墏a	�u��'d�)�
xq�,�eT��Wk�'~!ʤ��S5"b�А[I@1t�ڮ1��@�G�����U�6�f�sm:o���:5`�jbT%����1u���Ajx�i��oR�]@(n�����L-�6M�_���BJ<�\�i�d���I�o�Ƞ5��L���(�P<�1sj*
꒠�Am}@d$�U�AT|]��Q�';{��w��O���S�G����l<�Q}�J��j�`�@F@�Z(LN}@��y?e$�
�eCa��oWš
�,	eLLWA-�����e0CD�R�s��ֶF���t0F�J\pRU.���z6�EZ�3xbLM^�	D�D�=L���WXcw�^-�6m�	���|go4ߛ�)8ׯ�I�X�14�Ip��{���޺ŕ1֐��c��B[*��ʹW�y�,:��ҭ��z�p=��nNWH5Lh&���Ly�+���ï�hKbor����f�zb���2@ /�l���"zTv�n��;�C��6ӝ�d���S��ηK�aLL���５�gcT
��^<��
�5aṈ���I_GoL=g���r$ebq��b��qw����G��)�/����
+F�L�WZhHF.�ϽCNZ�<���,ai�\��!U�B	*m����a������I�P�R�
+��*V�,�5$ݚ�q���<�*>�e&�<�+ݸ�y�Jz������P��r���G)����
'/�<�t��IEND�B`�
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-2.jpg b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-2.jpg
new file mode 100644
index 0000000..ace07d0
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-2.jpg
@@ -0,0 +1,19 @@
+����JFIF


HH��C
+
+
+		
+%# , #&')*)-0-(0%()(��C

+
+
+
+(((((((((((((((((((((((((((((((((((((((((((((((((((��<P
"

��

��8

!1AQaq"��#2B��4��Cb�������



��#

!1"A4a���
?�E
|�U�Sa��z��>4��~�L�S ��A:!��b\�%g8��s�ЬT�f��`8S�Wǂ�ˆ�������<���utF# ��]��i�B��DOo�u���[۸��PJ��O��]$� Ԣk��"ʢ�{��'�C=;l�l�cS�<D��ᩧ�w��
��Q��[L�6B��ߧ\������=���C
,Q2�#*���d�@qI�2�^%���
+<��k	�w$9i�Ǔ ��&�—;`穦!OL�X🇯�����"�nC�a��0�S��I0$��ǖ�$���9��B�ƹI#�q�e<��:�rHA����D���|��gG�L��݌TU:*�gm���2Z�i�͘���(9�*g>#�:���!1�r�O�p1�����f��A�w�f���µr��˶�䒖Z@�Ȏ�:��۪�ᖤB�9I\��Q�b�MC� ������Yq�aq��~��*1�@�����jϳzhe�y�cbe ����.ج�Z���i�Ҹ0� �H鷎�{?5��JH��3�#r�
�$�N@�Da�t��q,pF�
K�>2Ű3�2z�A�p���@i�DU.�
+��}��x��P�5����<��a��ּmn���#�V^��(�V�C���u��5��QCU�������>Dz��s!�Ps�N;�k�m|�ƅcs&�V���I:����%92��!|F"p]0�Gj�����UφF?}�c�����tQ�5Tj
+ �Ơ�������U������:�c������Qs�����b���]�����<UT�Q.-��S����̠��q�>������':u0�M
+p�E��&��NDgf_oN��������Z�T�Gީif}�Q����].�")̢�����|Ct	��t;���m�}|Έ8�)Yi+bh�n�A�d�|ƌ��a�����d<�/9f�R?s��K�^���%��B���S	\r�tt5�+�(��x1kl��Lr\YMi�
+vu�pA<��z�X��j�j�'�$.1�Ч_/u�xk֖3�n2GQ�7	.y�z�TF�rD�3�
l�}B���D���Mw���������ƚ}�[ym�Q$�Q�H� ����F�7
 �`�ȗ�X@�ӂH�3�~����Q>A���J����]
+� c�軳�����S6?ԺCԿ�
+t�I�p�:��f�R��A�-����\�U�AS$�?v��2�g��Fq��;�������t�nwo�����
zDNVU.�Ĝ�w
+�}��l.����~�$��RV�0��#n޸��3�7;|7\��
+�R+x��i���K��utEdn�9x4sOc� f�|��_�~GF2TP<�[o������� ��zx�"�2�]䨅�,S�S�ͦgg�5–��EtIp��]�#؝0On��UUwo�1��w���G�.~l��
+����D�
%$�G<��y�P��җ��۶�����
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.gif b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.gif
new file mode 100644
index 0000000..432990b
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.gif
@@ -0,0 +1,2 @@
+GIF89a(���������!�
,(|8��0��
l��ݵ�ҍԇ�d
+�gp,�E��
T�l
����{Q���1�����|�ĩ���^ޮ`L0
er�^���`�����7��G�{vnoyi�V4�0zk*$����a�����r	;
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.jpg b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.jpg
new file mode 100644
index 0000000..de4eace
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.jpg
@@ -0,0 +1,10 @@
+����JFIF


HH��C































































��C
































































��(


��
	
+��1		

+x�6789uw����

	
+��3
	8w�5u��
+67vx���
?BsO���f��,��ҁ�\C���������Y�_���ԏ��ĬJ'����f)��d8E��v�#[�nz]w.�m��t6l���-�=���O��0G7!�S�B
�@�$��M��mI��Ӹ)L����
�����&V�"U+F^`Z3p�0C�0�ሄ���O��|�N�ӼA�� �j�T�{�sQ�M�LG�N{~F�NW#BaE����)Pƨ�Oc��֍8r>'���6�!��2)��n�]ۈ��f^�gQ��������W�8�/R�@v��~�v���ָ�ݚ&vv�T���XV_fgǴ��π{��S���I�{�5,�ϞJ���-�Ŝ�r^rM9��<�ɳm{ΣJ���k�\R��fa�̷�����L��Zf� d�=E���A+�H��Y�I�Zp)@bVm�:H��4�YD5�)pQj���e�������Q�ɑ�nH�K�759�iE�:���\HwLj@n'����%�`�o7
�h[��
+�(ihi�-�(O-D҅�n(ZY
8���ߓ	�?$
f
Yg�yjB$�,u����wi�-0O��HF�{��J���߬�\��e~��U?}>��q¾�c�	���>	��{C�G�Y[��!���ن^�H�:I�a��"�t�$͑3��l���*�k�뉓\]�=�=k4��ҶGt|J�V��:b@�6�$d�Dg�<ҳ�J����4����_u���3������DBK}A���Ms;�2��4z�1�SjQ)<�B5)�ߘ��1��KvQn$����7#�_�$�"�Me�)U����!�U��%e
TJOq��.`؉��z�/Y����0_^[�LL�wc�?�EV؊tG
+�c?u./�:x5�T3�C�f�;
��\�Ed�9*]P5�G6�\g�v�1�2��׷(��ҧ5-��@Ա���'��� �V̅F�
+ÂQ��I�c���n2�=�}��?��>����$�r�%�N����W�\�Dڶ���y�j�M���G��л��}�����۟��T��~k����
+7�;8�0��܏���i��D�t�}L�\���~����H�a$F��:�\�?�EF5��d����m�ͷM��QZ|Z�/��,3��U��_t�����Bnr���K��ԦE�q����>VT��)c�h�%4��ԕQr������힦1�,]A��;A[%�"aUVGWڅQW���ݍQ%��gkиca���2�ӤL�	W��I�j�-�C��-�-���5/�-Pޥk��੩��ո \�!13RB0,���S�@+Fp��"�C�
�GL�Ŀ�6�LF�a���"�z}=)$��A�l��!��ԝ4d��y�L5U�SY��ޕUz�R��P�g���}5��9����5�|��b�rI3���W�Y[w'�%�v�v���y�v�IRQ���>�I4�e${�zש�B��Sj�]�/^�N�LBB3՞i�)�%9]݄�Ya0�?��c��۱�
+�듽�|��O�
F���:w���<�T��C��G��t6u:�N�S�і������#���m���Vm���u�l}�m��W՝���
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.png b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.png
new file mode 100644
index 0000000..39c0419
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/core/modules/simpletest/files/image-test.png
@@ -0,0 +1,4 @@
+�PNG
+
+
IHDR(�F�DIDATx���1
+@������z�4� d%�0y���Rtֆ�
��@�7���[ �x8�p�@��y����a�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/files/tmp/some-temp-file.jpg b/core/modules/migrate_drupal_ui/src/Tests/d6/files/tmp/some-temp-file.jpg
new file mode 100644
index 0000000..494470d
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d6/files/tmp/some-temp-file.jpg
@@ -0,0 +1 @@
+<h1>SimpleTest HTML</h1>
\ No newline at end of file
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
new file mode 100644
index 0000000..da48648
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/MigrateUpgrade7Test.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal_ui\Tests\d7\MigrateUpgrade7Test.
+ */
+
+namespace Drupal\migrate_drupal_ui\Tests\d7;
+
+use Drupal\migrate_drupal_ui\Tests\MigrateUpgradeTestBase;
+
+/**
+ * Tests Drupal 7 upgrade using the migrate UI.
+ *
+ * The test method is provided by the MigrateUpgradeTestBase class.
+ *
+ * @group migrate_drupal_ui
+ */
+class MigrateUpgrade7Test extends MigrateUpgradeTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSourceBasePath() {
+    return __DIR__ . '/files';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityCounts() {
+    return [
+      'block' => 25,
+      'block_content' => 1,
+      'block_content_type' => 1,
+      'comment' => 1,
+      'comment_type' => 7,
+      'contact_form' => 3,
+      'editor' => 2,
+      'field_config' => 41,
+      'field_storage_config' => 31,
+      'file' => 1,
+      'filter_format' => 7,
+      'image_style' => 6,
+      'migration' => 59,
+      'node' => 2,
+      'node_type' => 6,
+      'rdf_mapping' => 5,
+      'search_page' => 2,
+      'shortcut' => 6,
+      'shortcut_set' => 2,
+      'action' => 18,
+      'menu' => 10,
+      'taxonomy_term' => 18,
+      'taxonomy_vocabulary' => 3,
+      'tour' => 1,
+      'user' => 3,
+      'user_role' => 4,
+      'menu_link_content' => 9,
+      'view' => 12,
+      'date_format' => 11,
+      'entity_form_display' => 15,
+      'entity_form_mode' => 1,
+      'entity_view_display' => 22,
+      'entity_view_mode' => 10,
+      'base_field_override' => 7,
+    ];
+  }
+
+}
diff --git a/core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/cube.jpeg b/core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/cube.jpeg
new file mode 100644
index 0000000..652a7db
--- /dev/null
+++ b/core/modules/migrate_drupal_ui/src/Tests/d7/files/sites/default/files/cube.jpeg
@@ -0,0 +1 @@
+********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
\ No newline at end of file
diff --git a/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml
index 526c484..124e900 100644
--- a/core/modules/node/config/optional/views.view.content.yml
+++ b/core/modules/node/config/optional/views.view.content.yml
@@ -181,7 +181,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Content Type'
+          label: 'Content type'
           exclude: false
           alter:
             alter_text: false
@@ -421,7 +421,7 @@ display:
           exposed: true
           expose:
             operator_id: type_op
-            label: Type
+            label: 'Content type'
             description: ''
             use_operator: false
             operator: type_op
diff --git a/core/modules/node/config/schema/node.source.schema.yml b/core/modules/node/config/schema/node.source.schema.yml
deleted file mode 100644
index 319072c..0000000
--- a/core/modules/node/config/schema/node.source.schema.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-migrate.source.d6_view_mode:
-  type: migrate_source_sql
-  label: 'Drupal 6 view mode'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        targetEntityType:
-          type: string
-          label: 'Target entity type'
-        status:
-          type: boolean
-          label: 'Status'
-
-migrate.source.d6_node_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 node type'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_node:
-  type: migrate_source_sql
-  label: 'Drupal 6 node'
-  mapping:
-    node_type:
-      type: string
-      label: 'Node type'
-
-migrate.source.d7_node:
-  type: migrate_source_sql
-  label: 'Drupal 7 node'
-  mapping:
-    node_type:
-      type: string
-      label: 'Node type'
-
-migrate.source.d6_node_revision:
-  type: migrate_source_sql
-  label: 'Drupal 6 node revision'
-  mapping:
-    node_type:
-      type: string
-      label: 'Node type'
-
-migrate.source.d7_node_revision:
-  type: migrate_source_sql
-  label: 'Drupal 7 node revision'
-  mapping:
-    node_type:
-      type: string
-      label: 'Node type'
-
-migrate.source.d7_node_type:
-  type: migrate_source_sql
-  label: 'Drupal 7 node type'
diff --git a/core/modules/node/content_types.js b/core/modules/node/content_types.js
index 96733a2..eed93f0 100644
--- a/core/modules/node/content_types.js
+++ b/core/modules/node/content_types.js
@@ -3,7 +3,7 @@
  * Javascript for the node content editing form.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -59,4 +59,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/node/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml
index 01642f7..82571b8 100644
--- a/core/modules/node/migration_templates/d6_node.yml
+++ b/core/modules/node/migration_templates/d6_node.yml
@@ -2,8 +2,7 @@ id: d6_node
 label: Nodes
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_node
+deriver: Drupal\node\Plugin\migrate\D6NodeDeriver
 source:
   plugin: d6_node
 process:
diff --git a/core/modules/node/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml
index e7f3b54..cd32ea0 100644
--- a/core/modules/node/migration_templates/d6_node_revision.yml
+++ b/core/modules/node/migration_templates/d6_node_revision.yml
@@ -2,8 +2,7 @@ id: d6_node_revision
 label: Node revisions
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_node
+deriver: Drupal\node\Plugin\migrate\D6NodeDeriver
 source:
   plugin: d6_node_revision
 process:
diff --git a/core/modules/node/migration_templates/d7_node.yml b/core/modules/node/migration_templates/d7_node.yml
index a6d3cb8..18e01d1 100644
--- a/core/modules/node/migration_templates/d7_node.yml
+++ b/core/modules/node/migration_templates/d7_node.yml
@@ -2,8 +2,7 @@ id: d7_node
 label: Nodes
 migration_tags:
   - Drupal 7
-builder:
-  plugin: d7_node
+deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
 source:
   plugin: d7_node
 process:
diff --git a/core/modules/node/migration_templates/d7_node_revision.yml b/core/modules/node/migration_templates/d7_node_revision.yml
index edb56f3..11f9d0a 100644
--- a/core/modules/node/migration_templates/d7_node_revision.yml
+++ b/core/modules/node/migration_templates/d7_node_revision.yml
@@ -2,8 +2,7 @@ id: d7_node_revision
 label: Node revisions
 migration_tags:
   - Drupal 7
-builder:
-  plugin: d7_node
+deriver: Drupal\node\Plugin\migrate\D7NodeDeriver
 source:
   plugin: d7_node_revision
 process:
@@ -28,4 +27,4 @@ destination:
   plugin: entity_revision:node
 migration_dependencies:
   required:
-    - d7_node:*
+    - d7_node
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 5566566..49a94d8 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -108,10 +108,10 @@ function _node_mass_update_helper(NodeInterface $node, array $updates, $langcode
  * @param bool $revisions
  *   (optional) TRUE if $nodes contains an array of revision IDs instead of
  *   node IDs. Defaults to FALSE; will be ignored if $load is FALSE.
- * @param array $context
+ * @param array|\ArrayAccess $context.
  *   An array of contextual key/values.
  */
-function _node_mass_update_batch_process(array $nodes, array $updates, $load, $revisions, array &$context) {
+function _node_mass_update_batch_process(array $nodes, array $updates, $load, $revisions, &$context) {
   if (!isset($context['sandbox']['progress'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = count($nodes);
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 7be1829..11689c3 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -1,15 +1,15 @@
 <?php
 
-use Drupal\node\NodeInterface;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Access\AccessResult;
-
 /**
  * @file
  * Hooks specific to the Node module.
  */
 
+use Drupal\node\NodeInterface;
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Access\AccessResult;
+
 /**
  * @addtogroup hooks
  * @{
@@ -148,7 +148,7 @@ function hook_node_grants(\Drupal\Core\Session\AccountInterface $account, $op) {
  * @param \Drupal\node\NodeInterface $node
  *   The node that has just been saved.
  *
- * @return array
+ * @return
  *   An array of grants as defined above.
  *
  * @see hook_node_access_records_alter()
@@ -336,7 +336,7 @@ function hook_node_access(\Drupal\node\NodeInterface $node, $op, \Drupal\Core\Se
         return AccessResult::allowed()->cachePerPermissions();
       }
       else {
-        return AccessResult::allowedIf($account->hasPermission('edit own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($node);
+        return AccessResult::allowedIf($account->hasPermission('edit own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->addCacheableDependency($node);
       }
 
     case 'delete':
@@ -344,7 +344,7 @@ function hook_node_access(\Drupal\node\NodeInterface $node, $op, \Drupal\Core\Se
         return AccessResult::allowed()->cachePerPermissions();
       }
       else {
-        return AccessResult::allowedIf($account->hasPermission('delete own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($node);
+        return AccessResult::allowedIf($account->hasPermission('delete own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->addCacheableDependency($node);
       }
 
     default:
diff --git a/core/modules/node/node.links.menu.yml b/core/modules/node/node.links.menu.yml
index 4a85f5e..ae7a9af 100644
--- a/core/modules/node/node.links.menu.yml
+++ b/core/modules/node/node.links.menu.yml
@@ -1,7 +1,7 @@
 entity.node_type.collection:
   title: 'Content types'
   parent: system.admin_structure
-  description: 'Create content types and manage their default settings.'
+  description: 'Create and manage fields, forms, and display settings for your content.'
   route_name: entity.node_type.collection
 node.add_page:
   title: 'Add content'
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 2a75844..ebfd07f 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -324,12 +324,12 @@ function node_add_body_field(NodeTypeInterface $type, $label = 'Body') {
   $field_storage = FieldStorageConfig::loadByName('node', 'body');
   $field = FieldConfig::loadByName('node', $type->id(), 'body');
   if (empty($field)) {
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => $type->id(),
       'label' => $label,
       'settings' => array('display_summary' => TRUE),
-    ));
+    ]);
     $field->save();
 
     // Assign widget settings for the 'default' form mode.
@@ -832,6 +832,7 @@ function node_form_system_themes_admin_form_alter(&$form, FormStateInterface $fo
   $form['admin_theme']['use_admin_theme'] = array(
     '#type' => 'checkbox',
     '#title' => t('Use the administration theme when editing or creating content'),
+    '#description' => t('Control which roles can "View the administration theme" on the <a href=":permissions">Permissions page</a>.', array(':permissions' => Url::fromRoute('user.admin_permissions')->toString())),
     '#default_value' => \Drupal::configFactory()->getEditable('node.settings')->get('use_admin_theme'),
   );
   $form['#submit'][] = 'node_form_system_themes_admin_form_submit';
@@ -914,7 +915,7 @@ function node_node_access(NodeInterface $node, $op, $account) {
         return AccessResult::allowed()->cachePerPermissions();
       }
       else {
-        return AccessResult::allowedIf($account->hasPermission('edit own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($node);
+        return AccessResult::allowedIf($account->hasPermission('edit own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->addCacheableDependency($node);
       }
 
     case 'delete':
@@ -922,7 +923,7 @@ function node_node_access(NodeInterface $node, $op, $account) {
         return AccessResult::allowed()->cachePerPermissions();
       }
       else {
-        return AccessResult::allowedIf($account->hasPermission('delete own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($node);
+        return AccessResult::allowedIf($account->hasPermission('delete own ' . $type . ' content', $account) && ($account->id() == $node->getOwnerId()))->cachePerPermissions()->cachePerUser()->addCacheableDependency($node);
       }
 
     default:
@@ -1046,18 +1047,29 @@ function node_query_node_access_alter(AlterableInterface $query) {
 
   $tables = $query->getTables();
   $base_table = $query->getMetaData('base_table');
-  // If the base table is not given, default to node if present.
+  // If the base table is not given, default to one of the node base tables.
   if (!$base_table) {
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = \Drupal::entityTypeManager()->getStorage('node')->getTableMapping();
+    $node_base_tables = $table_mapping->getTableNames();
+
     foreach ($tables as $table_info) {
       if (!($table_info instanceof SelectInterface)) {
         $table = $table_info['table'];
-        // If the node table is in the query, it wins immediately.
+        // Ensure that 'node' and 'node_field_data' are always preferred over
+        // 'node_revision' and 'node_field_revision'.
         if ($table == 'node' || $table == 'node_field_data') {
           $base_table = $table;
           break;
         }
+        // If one of the node base tables are in the query, add it to the list
+        // of possible base tables to join against.
+        if (in_array($table, $node_base_tables)) {
+          $base_table = $table;
+        }
       }
     }
+
     // Bail out if the base table is missing.
     if (!$base_table) {
       throw new Exception(t('Query tagged for node access but there is no node table, specify the base_table using meta data.'));
@@ -1133,6 +1145,7 @@ function node_access_needs_rebuild($rebuild = NULL) {
  */
 function node_access_rebuild($batch_mode = FALSE) {
   $node_storage = \Drupal::entityManager()->getStorage('node');
+  /** @var \Drupal\node\NodeAccessControlHandlerInterface $access_control_handler */
   $access_control_handler = \Drupal::entityManager()->getAccessControlHandler('node');
   $access_control_handler->deleteGrants();
   // Only recalculate if the site is using a node_access module.
@@ -1167,7 +1180,8 @@ function node_access_rebuild($batch_mode = FALSE) {
         // To preserve database integrity, only write grants if the node
         // loads successfully.
         if (!empty($node)) {
-          $access_control_handler->writeGrants($node);
+          $grants = $access_control_handler->acquireGrants($node);
+          \Drupal::service('node.grant_storage')->write($node, $grants);
         }
       }
     }
@@ -1222,7 +1236,10 @@ function _node_access_rebuild_batch_operation(&$context) {
     // To preserve database integrity, only write grants if the node
     // loads successfully.
     if (!empty($node)) {
-      \Drupal::entityManager()->getAccessControlHandler('node')->writeGrants($node);
+      /** @var \Drupal\node\NodeAccessControlHandlerInterface $access_control_handler */
+      $access_control_handler = \Drupal::entityManager()->getAccessControlHandler('node');
+      $grants = $access_control_handler->acquireGrants($node);
+      \Drupal::service('node.grant_storage')->write($node, $grants);
     }
     $context['sandbox']['progress']++;
     $context['sandbox']['current_node'] = $nid;
@@ -1275,22 +1292,6 @@ function node_modules_installed($modules) {
  * Implements hook_modules_uninstalled().
  */
 function node_modules_uninstalled($modules) {
-  // Remove module-specific settings from all node types.
-  $config_names = \Drupal::configFactory()->listAll('node.type.');
-  foreach ($config_names as $config_name) {
-    $config = \Drupal::config($config_name);
-    $changed = FALSE;
-    foreach ($modules as $module) {
-      if ($config->get('settings.' . $module)) {
-        $config->clear('settings.' . $module);
-        $changed = TRUE;
-      }
-    }
-    if ($changed) {
-      $config->save();
-    }
-  }
-
   // Check whether any of the disabled modules implemented hook_node_grants(),
   // in which case the node access table needs to be rebuilt.
   foreach ($modules as $module) {
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
deleted file mode 100644
index e353fc0..0000000
--- a/core/modules/node/node.views.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Provide views data for node.module.
- */
-
-/**
- * Implements hook_views_wizard().
- */
-function node_views_wizard() {
-  // @todo: figure this piece out.
-  if (\Drupal::moduleHandler()->moduleExists('statistics')) {
-    $plugins['node']['available_sorts']['node_counter-totalcount:DESC'] = t('Number of hits');
-  }
-
-}
diff --git a/core/modules/node/src/Entity/Node.php b/core/modules/node/src/Entity/Node.php
index 118e862..7b20a3b 100644
--- a/core/modules/node/src/Entity/Node.php
+++ b/core/modules/node/src/Entity/Node.php
@@ -131,7 +131,10 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     // default revision. There's no need to delete existing records if the node
     // is new.
     if ($this->isDefaultRevision()) {
-      \Drupal::entityManager()->getAccessControlHandler('node')->writeGrants($this, $update);
+      /** @var \Drupal\node\NodeAccessControlHandlerInterface $access_control_handler */
+      $access_control_handler = \Drupal::entityManager()->getAccessControlHandler('node');
+      $grants = $access_control_handler->acquireGrants($this);
+      \Drupal::service('node.grant_storage')->write($this, $grants, NULL, $update);
     }
 
     // Reindex the node when it is updated. The node is automatically indexed
@@ -322,41 +325,7 @@ public function setRevisionAuthorId($uid) {
    * {@inheritdoc}
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields['nid'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Node ID'))
-      ->setDescription(t('The node ID.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['uuid'] = BaseFieldDefinition::create('uuid')
-      ->setLabel(t('UUID'))
-      ->setDescription(t('The node UUID.'))
-      ->setReadOnly(TRUE);
-
-    $fields['vid'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Revision ID'))
-      ->setDescription(t('The node revision ID.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['type'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Type'))
-      ->setDescription(t('The node type.'))
-      ->setSetting('target_type', 'node_type')
-      ->setReadOnly(TRUE);
-
-    $fields['langcode'] = BaseFieldDefinition::create('language')
-      ->setLabel(t('Language'))
-      ->setDescription(t('The node language code.'))
-      ->setTranslatable(TRUE)
-      ->setRevisionable(TRUE)
-      ->setDisplayOptions('view', array(
-        'type' => 'hidden',
-      ))
-      ->setDisplayOptions('form', array(
-        'type' => 'language_select',
-        'weight' => 2,
-      ));
+    $fields = parent::baseFieldDefinitions($entity_type);
 
     $fields['title'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Title'))
diff --git a/core/modules/node/src/Form/NodeRevisionRevertForm.php b/core/modules/node/src/Form/NodeRevisionRevertForm.php
index 717cf28..f4899f3 100644
--- a/core/modules/node/src/Form/NodeRevisionRevertForm.php
+++ b/core/modules/node/src/Form/NodeRevisionRevertForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Form;
 
-use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -37,7 +37,7 @@ class NodeRevisionRevertForm extends ConfirmFormBase {
   /**
    * The date formatter service.
    *
-   * @var \Drupal\Core\Datetime\DateFormatter
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
    */
   protected $dateFormatter;
 
@@ -46,10 +46,10 @@ class NodeRevisionRevertForm extends ConfirmFormBase {
    *
    * @param \Drupal\Core\Entity\EntityStorageInterface $node_storage
    *   The node storage.
-   * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
    */
-  public function __construct(EntityStorageInterface $node_storage, DateFormatter $date_formatter) {
+  public function __construct(EntityStorageInterface $node_storage, DateFormatterInterface $date_formatter) {
     $this->nodeStorage = $node_storage;
     $this->dateFormatter = $date_formatter;
   }
diff --git a/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php b/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
index d2c996e..7e8a4eb 100644
--- a/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
+++ b/core/modules/node/src/Form/NodeRevisionRevertTranslationForm.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\node\Form;
 
-use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
@@ -38,12 +38,12 @@ class NodeRevisionRevertTranslationForm extends NodeRevisionRevertForm {
    *
    * @param \Drupal\Core\Entity\EntityStorageInterface $node_storage
    *   The node storage.
-   * @param \Drupal\Core\Datetime\DateFormatter $date_formatter
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    */
-  public function __construct(EntityStorageInterface $node_storage, DateFormatter $date_formatter, LanguageManagerInterface $language_manager) {
+  public function __construct(EntityStorageInterface $node_storage, DateFormatterInterface $date_formatter, LanguageManagerInterface $language_manager) {
     parent::__construct($node_storage, $date_formatter);
     $this->languageManager = $language_manager;
   }
diff --git a/core/modules/node/src/NodeAccessControlHandler.php b/core/modules/node/src/NodeAccessControlHandler.php
index 490846f..51ae928 100644
--- a/core/modules/node/src/NodeAccessControlHandler.php
+++ b/core/modules/node/src/NodeAccessControlHandler.php
@@ -105,7 +105,7 @@ protected function checkAccess(EntityInterface $node, $operation, AccountInterfa
 
     // Check if authors can view their own unpublished nodes.
     if ($operation === 'view' && !$status && $account->hasPermission('view own unpublished content') && $account->isAuthenticated() && $account->id() == $uid) {
-      return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->cacheUntilEntityChanges($node);
+      return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($node);
     }
 
     // Evaluate node grants.
diff --git a/core/modules/node/src/NodeAccessControlHandlerInterface.php b/core/modules/node/src/NodeAccessControlHandlerInterface.php
index 9e7c34a..0b629d7 100644
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -35,13 +35,11 @@ public function acquireGrants(NodeInterface $node);
   /**
    * Writes a list of grants to the database, deleting any previously saved ones.
    *
-   * If a realm is provided, it will only delete grants from that realm, but it
-   * will always delete a grant from the 'all' realm. Modules that use node
-   * access can use this function when doing mass updates due to widespread
-   * permission changes.
+   * Modules that use node access can use this function when doing mass updates
+   * due to widespread permission changes.
    *
    * Note: Don't call this function directly from a contributed module. Call
-   * node_access_acquire_grants() instead.
+   * \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants() instead.
    *
    * @param \Drupal\node\NodeInterface $node
    *   The node whose grants are being written.
@@ -49,6 +47,9 @@ public function acquireGrants(NodeInterface $node);
    *   (optional) If false, does not delete records. This is only for optimization
    *   purposes, and assumes the caller has already performed a mass delete of
    *   some form. Defaults to TRUE.
+   *
+   * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+   *   Use \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants().
    */
   public function writeGrants(NodeInterface $node, $delete = TRUE);
 
diff --git a/core/modules/node/src/NodeGrantDatabaseStorage.php b/core/modules/node/src/NodeGrantDatabaseStorage.php
index 58f8540..b71783a 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -76,7 +76,7 @@ public function access(NodeInterface $node, $operation, AccountInterface $accoun
       // Return the equivalent of the default grant, defined by
       // self::writeDefault().
       if ($operation === 'view') {
-        return AccessResult::allowedIf($node->isPublished())->cacheUntilEntityChanges($node);
+        return AccessResult::allowedIf($node->isPublished())->addCacheableDependency($node);
       }
       else {
         return AccessResult::neutral();
diff --git a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
index c59f941..9a2586f 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
@@ -61,7 +61,7 @@ public function alterQuery($query, array $tables, $op, AccountInterface $account
    * permission changes.
    *
    * Note: Don't call this method directly from a contributed module. Call
-   * node_access_write_grants() instead.
+   * \Drupal\node\NodeAccessControlHandlerInterface::acquireGrants() instead.
    *
    * @param \Drupal\node\NodeInterface $node
    *   The node whose grants are being written.
@@ -78,9 +78,6 @@ public function alterQuery($query, array $tables, $op, AccountInterface $account
    *   (optional) If false, does not delete records. This is only for optimization
    *   purposes, and assumes the caller has already performed a mass delete of
    *   some form. Defaults to TRUE.
-   *
-   * @see node_access_write_grants()
-   * @see node_access_acquire_grants()
    */
   public function write(NodeInterface $node, array $grants, $realm = NULL, $delete = TRUE);
 
diff --git a/core/modules/node/src/NodeTypeAccessControlHandler.php b/core/modules/node/src/NodeTypeAccessControlHandler.php
index befaa0b..6e591b1 100644
--- a/core/modules/node/src/NodeTypeAccessControlHandler.php
+++ b/core/modules/node/src/NodeTypeAccessControlHandler.php
@@ -30,10 +30,10 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
 
       case 'delete':
         if ($entity->isLocked()) {
-          return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+          return AccessResult::forbidden()->addCacheableDependency($entity);
         }
         else {
-          return parent::checkAccess($entity, $operation, $account)->cacheUntilEntityChanges($entity);
+          return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
         }
         break;
 
diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php
index 72a0baa..1c648c4 100644
--- a/core/modules/node/src/NodeViewsData.php
+++ b/core/modules/node/src/NodeViewsData.php
@@ -37,43 +37,43 @@ public function getViewsData() {
 
     $data['node_field_data']['type']['argument']['id'] = 'node_type';
 
-    $data['node_field_data']['langcode']['help'] = t('The language of the content or translation.');
+    $data['node_field_data']['langcode']['help'] = $this->t('The language of the content or translation.');
 
-    $data['node_field_data']['status']['filter']['label'] = t('Published status');
+    $data['node_field_data']['status']['filter']['label'] = $this->t('Published status');
     $data['node_field_data']['status']['filter']['type'] = 'yes-no';
     // Use status = 1 instead of status <> 0 in WHERE statement.
     $data['node_field_data']['status']['filter']['use_equal'] = TRUE;
 
     $data['node_field_data']['status_extra'] = array(
-      'title' => t('Published status or admin user'),
-      'help' => t('Filters out unpublished content if the current user cannot view it.'),
+      'title' => $this->t('Published status or admin user'),
+      'help' => $this->t('Filters out unpublished content if the current user cannot view it.'),
       'filter' => array(
         'field' => 'status',
         'id' => 'node_status',
-        'label' => t('Published status or admin user'),
+        'label' => $this->t('Published status or admin user'),
       ),
     );
 
-    $data['node_field_data']['promote']['help'] = t('A boolean indicating whether the node is visible on the front page.');
-    $data['node_field_data']['promote']['filter']['label'] = t('Promoted to front page status');
+    $data['node_field_data']['promote']['help'] = $this->t('A boolean indicating whether the node is visible on the front page.');
+    $data['node_field_data']['promote']['filter']['label'] = $this->t('Promoted to front page status');
     $data['node_field_data']['promote']['filter']['type'] = 'yes-no';
 
-    $data['node_field_data']['sticky']['help'] = t('A boolean indicating whether the node should sort to the top of content lists.');
-    $data['node_field_data']['sticky']['filter']['label'] = t('Sticky status');
+    $data['node_field_data']['sticky']['help'] = $this->t('A boolean indicating whether the node should sort to the top of content lists.');
+    $data['node_field_data']['sticky']['filter']['label'] = $this->t('Sticky status');
     $data['node_field_data']['sticky']['filter']['type'] = 'yes-no';
-    $data['node_field_data']['sticky']['sort']['help'] = t('Whether or not the content is sticky. To list sticky content first, set this to descending.');
+    $data['node_field_data']['sticky']['sort']['help'] = $this->t('Whether or not the content is sticky. To list sticky content first, set this to descending.');
 
     $data['node']['path'] = array(
       'field' => array(
-        'title' => t('Path'),
-        'help' => t('The aliased path to this content.'),
+        'title' => $this->t('Path'),
+        'help' => $this->t('The aliased path to this content.'),
         'id' => 'node_path',
       ),
     );
 
     $data['node']['node_bulk_form'] = array(
-      'title' => t('Node operations bulk form'),
-      'help' => t('Add a form element that lets you run operations on multiple nodes.'),
+      'title' => $this->t('Node operations bulk form'),
+      'help' => $this->t('Add a form element that lets you run operations on multiple nodes.'),
       'field' => array(
         'id' => 'node_bulk_form',
       ),
@@ -84,8 +84,8 @@ public function getViewsData() {
     // @todo Add similar support to any date field
     // @see https://www.drupal.org/node/2337507
     $data['node_field_data']['created_fulldate'] = array(
-      'title' => t('Created date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Created date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_fulldate',
@@ -93,8 +93,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['created_year_month'] = array(
-      'title' => t('Created year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Created year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_year_month',
@@ -102,8 +102,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['created_year'] = array(
-      'title' => t('Created year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Created year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_year',
@@ -111,8 +111,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['created_month'] = array(
-      'title' => t('Created month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Created month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_month',
@@ -120,8 +120,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['created_day'] = array(
-      'title' => t('Created day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Created day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_day',
@@ -129,8 +129,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['created_week'] = array(
-      'title' => t('Created week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Created week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_week',
@@ -138,8 +138,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_fulldate'] = array(
-      'title' => t('Updated date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Updated date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_fulldate',
@@ -147,8 +147,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_year_month'] = array(
-      'title' => t('Updated year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Updated year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year_month',
@@ -156,8 +156,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_year'] = array(
-      'title' => t('Updated year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Updated year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year',
@@ -165,8 +165,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_month'] = array(
-      'title' => t('Updated month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Updated month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_month',
@@ -174,8 +174,8 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_day'] = array(
-      'title' => t('Updated day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Updated day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_day',
@@ -183,30 +183,30 @@ public function getViewsData() {
     );
 
     $data['node_field_data']['changed_week'] = array(
-      'title' => t('Updated week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Updated week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_week',
       ),
     );
 
-    $data['node_field_data']['uid']['help'] = t('The user authoring the content. If you need more fields than the uid add the content: author relationship');
+    $data['node_field_data']['uid']['help'] = $this->t('The user authoring the content. If you need more fields than the uid add the content: author relationship');
     $data['node_field_data']['uid']['filter']['id'] = 'user_name';
-    $data['node_field_data']['uid']['relationship']['title'] = t('Content author');
-    $data['node_field_data']['uid']['relationship']['help'] = t('Relate content to the user who created it.');
-    $data['node_field_data']['uid']['relationship']['label'] = t('author');
+    $data['node_field_data']['uid']['relationship']['title'] = $this->t('Content author');
+    $data['node_field_data']['uid']['relationship']['help'] = $this->t('Relate content to the user who created it.');
+    $data['node_field_data']['uid']['relationship']['label'] = $this->t('author');
 
     $data['node']['node_listing_empty'] = array(
-      'title' => t('Empty Node Frontpage behavior'),
-      'help' => t('Provides a link to the node add overview page.'),
+      'title' => $this->t('Empty Node Frontpage behavior'),
+      'help' => $this->t('Provides a link to the node add overview page.'),
       'area' => array(
         'id' => 'node_listing_empty',
       ),
     );
 
-    $data['node_field_data']['uid_revision']['title'] = t('User has a revision');
-    $data['node_field_data']['uid_revision']['help'] = t('All nodes where a certain user has a revision');
+    $data['node_field_data']['uid_revision']['title'] = $this->t('User has a revision');
+    $data['node_field_data']['uid_revision']['help'] = $this->t('All nodes where a certain user has a revision');
     $data['node_field_data']['uid_revision']['real field'] = 'nid';
     $data['node_field_data']['uid_revision']['filter']['id'] = 'node_uid_revision';
     $data['node_field_data']['uid_revision']['argument']['id'] = 'node_uid_revision';
@@ -214,7 +214,7 @@ public function getViewsData() {
     $data['node_field_revision']['table']['wizard_id'] = 'node_revision';
 
     // Advertise this table as a possible base table.
-    $data['node_field_revision']['table']['base']['help'] = t('Content revision is a history of changes to content.');
+    $data['node_field_revision']['table']['base']['help'] = $this->t('Content revision is a history of changes to content.');
     $data['node_field_revision']['table']['base']['defaults']['title'] = 'title';
 
     $data['node_field_revision']['nid']['argument'] = [
@@ -227,8 +227,8 @@ public function getViewsData() {
     $data['node_field_revision']['nid']['relationship']['id'] = 'standard';
     $data['node_field_revision']['nid']['relationship']['base'] = 'node_field_data';
     $data['node_field_revision']['nid']['relationship']['base field'] = 'nid';
-    $data['node_field_revision']['nid']['relationship']['title'] = t('Content');
-    $data['node_field_revision']['nid']['relationship']['label'] = t('Get the actual content from a content revision.');
+    $data['node_field_revision']['nid']['relationship']['title'] = $this->t('Content');
+    $data['node_field_revision']['nid']['relationship']['label'] = $this->t('Get the actual content from a content revision.');
 
     $data['node_field_revision']['vid'] = array(
       'argument' => array(
@@ -239,35 +239,35 @@ public function getViewsData() {
         'id' => 'standard',
         'base' => 'node_field_data',
         'base field' => 'vid',
-        'title' => t('Content'),
-        'label' => t('Get the actual content from a content revision.'),
+        'title' => $this->t('Content'),
+        'label' => $this->t('Get the actual content from a content revision.'),
       ),
     ) + $data['node_field_revision']['vid'];
 
-    $data['node_field_revision']['langcode']['help'] = t('The language the original content is in.');
+    $data['node_field_revision']['langcode']['help'] = $this->t('The language the original content is in.');
 
-    $data['node_revision']['revision_uid']['help'] = t('Relate a content revision to the user who created the revision.');
-    $data['node_revision']['revision_uid']['relationship']['label'] = t('revision user');
+    $data['node_revision']['revision_uid']['help'] = $this->t('Relate a content revision to the user who created the revision.');
+    $data['node_revision']['revision_uid']['relationship']['label'] = $this->t('revision user');
 
     $data['node_field_revision']['table']['wizard_id'] = 'node_field_revision';
 
     $data['node_field_revision']['table']['join']['node_field_data']['left_field'] = 'vid';
     $data['node_field_revision']['table']['join']['node_field_data']['field'] = 'vid';
 
-    $data['node_field_revision']['status']['filter']['label'] = t('Published');
+    $data['node_field_revision']['status']['filter']['label'] = $this->t('Published');
     $data['node_field_revision']['status']['filter']['type'] = 'yes-no';
     $data['node_field_revision']['status']['filter']['use_equal'] = TRUE;
 
-    $data['node_field_revision']['promote']['help'] = t('A boolean indicating whether the node is visible on the front page.');
+    $data['node_field_revision']['promote']['help'] = $this->t('A boolean indicating whether the node is visible on the front page.');
 
-    $data['node_field_revision']['sticky']['help'] = t('A boolean indicating whether the node should sort to the top of content lists.');
+    $data['node_field_revision']['sticky']['help'] = $this->t('A boolean indicating whether the node should sort to the top of content lists.');
 
-    $data['node_field_revision']['langcode']['help'] = t('The language of the content or translation.');
+    $data['node_field_revision']['langcode']['help'] = $this->t('The language of the content or translation.');
 
     $data['node_field_revision']['link_to_revision'] = array(
       'field' => array(
-        'title' => t('Link to revision'),
-        'help' => t('Provide a simple link to the revision.'),
+        'title' => $this->t('Link to revision'),
+        'help' => $this->t('Provide a simple link to the revision.'),
         'id' => 'node_revision_link',
         'click sortable' => FALSE,
       ),
@@ -275,8 +275,8 @@ public function getViewsData() {
 
     $data['node_field_revision']['revert_revision'] = array(
       'field' => array(
-        'title' => t('Link to revert revision'),
-        'help' => t('Provide a simple link to revert to the revision.'),
+        'title' => $this->t('Link to revert revision'),
+        'help' => $this->t('Provide a simple link to revert to the revision.'),
         'id' => 'node_revision_link_revert',
         'click sortable' => FALSE,
       ),
@@ -284,8 +284,8 @@ public function getViewsData() {
 
     $data['node_field_revision']['delete_revision'] = array(
       'field' => array(
-        'title' => t('Link to delete revision'),
-        'help' => t('Provide a simple link to delete the content revision.'),
+        'title' => $this->t('Link to delete revision'),
+        'help' => $this->t('Provide a simple link to delete the content revision.'),
         'id' => 'node_revision_link_delete',
         'click sortable' => FALSE,
       ),
@@ -293,7 +293,7 @@ public function getViewsData() {
 
     // Define the base group of this table. Fields that don't have a group defined
     // will go into this field by default.
-    $data['node_access']['table']['group']  = t('Content access');
+    $data['node_access']['table']['group']  = $this->t('Content access');
 
     // For other base tables, explain how we join.
     $data['node_access']['table']['join'] = array(
@@ -303,11 +303,11 @@ public function getViewsData() {
       ),
     );
     $data['node_access']['nid'] = array(
-      'title' => t('Access'),
-      'help' => t('Filter by access.'),
+      'title' => $this->t('Access'),
+      'help' => $this->t('Filter by access.'),
       'filter' => array(
         'id' => 'node_access',
-        'help' => t('Filter for content by view access. <strong>Not necessary if you are using node as your base table.</strong>'),
+        'help' => $this->t('Filter for content by view access. <strong>Not necessary if you are using node as your base table.</strong>'),
       ),
     );
 
@@ -324,7 +324,7 @@ public function getViewsData() {
       }
 
       if ($enabled) {
-        $data['node_search_index']['table']['group'] = t('Search');
+        $data['node_search_index']['table']['group'] = $this->t('Search');
 
         // Automatically join to the node table (or actually, node_field_data).
         // Use a Views table alias to allow other modules to use this table too,
@@ -357,8 +357,8 @@ public function getViewsData() {
         );
 
         $data['node_search_index']['score'] = array(
-          'title' => t('Score'),
-          'help' => t('The score of the search item. This will not be used if the search filter is not also present.'),
+          'title' => $this->t('Score'),
+          'help' => $this->t('The score of the search item. This will not be used if the search filter is not also present.'),
           'field' => array(
             'id' => 'search_score',
             'float' => TRUE,
@@ -371,8 +371,8 @@ public function getViewsData() {
         );
 
         $data['node_search_index']['keys'] = array(
-          'title' => t('Search Keywords'),
-          'help' => t('The keywords to search for.'),
+          'title' => $this->t('Search Keywords'),
+          'help' => $this->t('The keywords to search for.'),
           'filter' => array(
             'id' => 'search_keywords',
             'no group by' => TRUE,
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 0fa464e..85515fd 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -429,8 +429,23 @@ public function updateIndex() {
     // per cron run.
     $limit = (int) $this->searchSettings->get('index.cron_limit');
 
-    $result = $this->database->queryRange("SELECT n.nid, MAX(sd.reindex) FROM {node} n LEFT JOIN {search_dataset} sd ON sd.sid = n.nid AND sd.type = :type WHERE sd.sid IS NULL OR sd.reindex <> 0 GROUP BY n.nid ORDER BY MAX(sd.reindex) is null DESC, MAX(sd.reindex) ASC, n.nid ASC", 0, $limit, array(':type' => $this->getPluginId()), array('target' => 'replica'));
-    $nids = $result->fetchCol();
+    $query = db_select('node', 'n', array('target' => 'replica'));
+    $query->addField('n', 'nid');
+    $query->leftJoin('search_dataset', 'sd', 'sd.sid = n.nid AND sd.type = :type', array(':type' => $this->getPluginId()));
+    $query->addExpression('CASE MAX(sd.reindex) WHEN NULL THEN 0 ELSE 1 END', 'ex');
+    $query->addExpression('MAX(sd.reindex)', 'ex2');
+    $query->condition(
+        $query->orConditionGroup()
+        ->where('sd.sid IS NULL')
+        ->condition('sd.reindex', 0, '<>')
+      );
+    $query->orderBy('ex', 'DESC')
+      ->orderBy('ex2')
+      ->orderBy('n.nid')
+      ->groupBy('n.nid')
+      ->range(0, $limit);
+
+    $nids = $query->execute()->fetchCol();
     if (!$nids) {
       return;
     }
diff --git a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
new file mode 100644
index 0000000..f6f8ba3
--- /dev/null
+++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Plugin\migrate\D6NodeDeriver.
+ */
+
+namespace Drupal\node\Plugin\migrate;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\MigrationDeriverTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Deriver for Drupal 6 node and node revision migrations based on node types.
+ */
+class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
+  use MigrationDeriverTrait;
+
+  /**
+   * The base plugin ID this derivative is for.
+   *
+   * @var string
+   */
+  protected $basePluginId;
+
+  /**
+   * Already-instantiated cckfield plugins, keyed by ID.
+   *
+   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface[]
+   */
+  protected $cckPluginCache;
+
+  /**
+   * The CCK plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $cckPluginManager;
+
+  /**
+   * D6NodeDeriver constructor.
+   *
+   * @param string $base_plugin_id
+   *   The base plugin ID for the plugin ID.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $cck_manager
+   *   The CCK plugin manager.
+   */
+  public function __construct($base_plugin_id, PluginManagerInterface $cck_manager) {
+    $this->basePluginId = $base_plugin_id;
+    $this->cckPluginManager = $cck_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, $base_plugin_id) {
+    return new static(
+      $base_plugin_id,
+      $container->get('plugin.manager.migrate.cckfield')
+    );
+  }
+
+  /**
+   * Gets the definition of all derivatives of a base plugin.
+   *
+   * @param array $base_plugin_definition
+   *   The definition array of the base plugin.
+   *
+   * @return array
+   *   An array of full derivative definitions keyed on derivative id.
+   *
+   * @see \Drupal\Component\Plugin\Derivative\DeriverBase::getDerivativeDefinition()
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    // Read all CCK field instance definitions in the source database.
+    $fields = array();
+    try {
+      $source_plugin = static::getSourcePlugin('d6_field_instance');
+      $source_plugin->checkRequirements();
+
+      foreach ($source_plugin as $row) {
+        $fields[$row->getSourceProperty('type_name')][$row->getSourceProperty('field_name')] = $row->getSource();
+      }
+    }
+    catch (RequirementsException $e) {
+      // If checkRequirements() failed then the content module did not exist and
+      // we do not have any CCK fields. Therefore, $fields will be empty and
+      // below we'll create a migration just for the node properties.
+    }
+
+    try {
+      foreach (static::getSourcePlugin('d6_node_type') as $row) {
+        $node_type = $row->getSourceProperty('type');
+        $values = $base_plugin_definition;
+
+        $values['label'] = t("@label (@type)", [
+          '@label' => $values['label'],
+          '@type' => $node_type,
+        ]);
+        $values['source']['node_type'] = $node_type;
+
+        // If this migration is based on the d6_node_revision migration, it
+        // should explicitly depend on the corresponding d6_node variant.
+        if ($base_plugin_definition['id'] == 'd6_node_revision') {
+          $values['migration_dependencies']['required'][] = 'd6_node:' . $node_type;
+        }
+
+        $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
+        if (isset($fields[$node_type])) {
+          foreach ($fields[$node_type] as $field_name => $info) {
+            $field_type = $info['type'];
+            if ($this->cckPluginManager->hasDefinition($info['type'])) {
+              if (!isset($this->cckPluginCache[$field_type])) {
+                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
+              }
+              $this->cckPluginCache[$field_type]
+                ->processCckFieldValues($migration, $field_name, $info);
+            }
+            else {
+              $migration->setProcessOfProperty($field_name, $field_name);
+            }
+          }
+        }
+        $this->derivatives[$node_type] = $migration->getPluginDefinition();
+      }
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      // Once we begin iterating the source plugin it is possible that the
+      // source tables will not exist. This can happen when the
+      // MigrationPluginManager gathers up the migration definitions but we do
+      // not actually have a Drupal 6 source database.
+    }
+
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
new file mode 100644
index 0000000..6307fce
--- /dev/null
+++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Plugin\migrate\D7NodeDeriver.
+ */
+
+namespace Drupal\node\Plugin\migrate;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\MigrationDeriverTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Deriver for Drupal 7 node and node revision migrations based on node types.
+ */
+class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
+  use MigrationDeriverTrait;
+
+  /**
+   * The base plugin ID this derivative is for.
+   *
+   * @var string
+   */
+  protected $basePluginId;
+
+  /**
+   * Already-instantiated cckfield plugins, keyed by ID.
+   *
+   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface[]
+   */
+  protected $cckPluginCache;
+
+  /**
+   * The CCK plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $cckPluginManager;
+
+  /**
+   * D7NodeDeriver constructor.
+   *
+   * @param string $base_plugin_id
+   *   The base plugin ID for the plugin ID.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $cck_manager
+   *   The CCK plugin manager.
+   */
+  public function __construct($base_plugin_id, PluginManagerInterface $cck_manager) {
+    $this->basePluginId = $base_plugin_id;
+    $this->cckPluginManager = $cck_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, $base_plugin_id) {
+    return new static(
+      $base_plugin_id,
+      $container->get('plugin.manager.migrate.cckfield')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    $fields = [];
+    try {
+      $source_plugin = static::getSourcePlugin('d7_field_instance');
+      $source_plugin->checkRequirements();
+
+      // Read all field instance definitions in the source database.
+      foreach ($source_plugin as $row) {
+        if ($row->getSourceProperty('entity_type') == 'node') {
+          $fields[$row->getSourceProperty('bundle')][$row->getSourceProperty('field_name')] = $row->getSource();
+        }
+      }
+    }
+    catch (RequirementsException $e) {
+      // If checkRequirements() failed then the field module did not exist and
+      // we do not have any fields. Therefore, $fields will be empty and below
+      // we'll create a migration just for the node properties.
+    }
+
+    try {
+      foreach (static::getSourcePlugin('d7_node_type') as $row) {
+        $node_type = $row->getSourceProperty('type');
+        $values = $base_plugin_definition;
+
+        $values['label'] = t('@label (@type)', [
+          '@label' => $values['label'],
+          '@type' => $row->getSourceProperty('name'),
+        ]);
+        $values['source']['node_type'] = $node_type;
+
+        $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($values);
+        if (isset($fields[$node_type])) {
+          foreach ($fields[$node_type] as $field_name => $info) {
+            $field_type = $info['type'];
+            if ($this->cckPluginManager->hasDefinition($field_type)) {
+              if (!isset($this->cckPluginCache[$field_type])) {
+                $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
+              }
+              $this->cckPluginCache[$field_type]
+                ->processCckFieldValues($migration, $field_name, $info);
+            }
+            else {
+              $migration->setProcessOfProperty($field_name, $field_name);
+            }
+          }
+        }
+        $this->derivatives[$node_type] = $migration->getPluginDefinition();
+      }
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      // Once we begin iterating the source plugin it is possible that the
+      // source tables will not exist. This can happen when the
+      // MigrationPluginManager gathers up the migration definitions but we do
+      // not actually have a Drupal 7 source database.
+    }
+
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/node/src/Plugin/migrate/builder/d6/Node.php b/core/modules/node/src/Plugin/migrate/builder/d6/Node.php
deleted file mode 100644
index 99f8d45..0000000
--- a/core/modules/node/src/Plugin/migrate/builder/d6/Node.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Plugin\migrate\builder\d6\Node.
- */
-
-namespace Drupal\node\Plugin\migrate\builder\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
-
-/**
- * @PluginID("d6_node")
- */
-class Node extends CckBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migrations = [];
-
-    // Read all CCK field instance definitions in the source database.
-    $fields = array();
-    $source_plugin = $this->getSourcePlugin('d6_field_instance', $template['source']);
-    try {
-      $source_plugin->checkRequirements();
-
-      foreach ($source_plugin as $field) {
-        $info = $field->getSource();
-        $fields[$info['type_name']][$info['field_name']] = $info;
-      }
-    }
-    catch (RequirementsException $e) {
-      // Don't do anything; $fields will be empty.
-    }
-
-    foreach ($this->getSourcePlugin('d6_node_type', $template['source']) as $row) {
-      $node_type = $row->getSourceProperty('type');
-      $values = $template;
-      $values['id'] = $template['id'] . '__' . $node_type;
-
-      $label = $template['label'];
-      $values['label'] = $this->t("@label (@type)", ['@label' => $label, '@type' => $node_type]);
-      $values['source']['node_type'] = $node_type;
-
-      // If this migration is based on the d6_node_revision template, it should
-      // explicitly depend on the corresponding d6_node variant.
-      if ($template['id'] == 'd6_node_revision') {
-        $values['migration_dependencies']['required'][] = 'd6_node__' . $node_type;
-      }
-
-      $migration = Migration::create($values);
-
-      if (isset($fields[$node_type])) {
-        foreach ($fields[$node_type] as $field => $info) {
-          if ($this->cckPluginManager->hasDefinition($info['type'])) {
-            $this->getCckPlugin($info['type'])
-              ->processCckFieldValues($migration, $field, $info);
-          }
-          else {
-            $migration->setProcessOfProperty($field, $field);
-          }
-        }
-      }
-
-      $migrations[] = $migration;
-    }
-
-    return $migrations;
-  }
-
-}
diff --git a/core/modules/node/src/Plugin/migrate/builder/d7/Node.php b/core/modules/node/src/Plugin/migrate/builder/d7/Node.php
deleted file mode 100644
index 44b124c..0000000
--- a/core/modules/node/src/Plugin/migrate/builder/d7/Node.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Plugin\migrate\builder\d7\Node.
- */
-
-namespace Drupal\node\Plugin\migrate\builder\d7;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
-
-/**
- * @PluginID("d7_node")
- */
-class Node extends CckBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migrations = [];
-
-    // Read all field instance definitions in the source database.
-    $fields = array();
-    foreach ($this->getSourcePlugin('d7_field_instance', $template['source']) as $field) {
-      $info = $field->getSource();
-      $fields[$info['entity_type']][$info['bundle']][$info['field_name']] = $info;
-    }
-
-    foreach ($this->getSourcePlugin('d7_node_type', $template['source']) as $node_type) {
-      $bundle = $node_type->getSourceProperty('type');
-      $values = $template;
-      $values['id'] .= '__' . $bundle;
-      $values['label'] = $this->t('@label (@type)', ['@label' => $values['label'], '@type' => $node_type->getSourceProperty('name')]);
-      $values['source']['node_type'] = $bundle;
-      $migration = Migration::create($values);
-
-      if (isset($fields['node'][$bundle])) {
-        foreach ($fields['node'][$bundle] as $field => $data) {
-          if ($this->cckPluginManager->hasDefinition($data['type'])) {
-            $this->getCckPlugin($data['type'])
-              ->processCckFieldValues($migration, $field, $data);
-          }
-          else {
-            $migration->setProcessOfProperty($field, $field);
-          }
-        }
-      }
-
-      $migrations[] = $migration;
-    }
-
-    return $migrations;
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Condition/NodeConditionTest.php b/core/modules/node/src/Tests/Condition/NodeConditionTest.php
index d739751..6af1d77 100644
--- a/core/modules/node/src/Tests/Condition/NodeConditionTest.php
+++ b/core/modules/node/src/Tests/Condition/NodeConditionTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests\Condition;
 
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
 
 /**
@@ -22,11 +24,11 @@ protected function setUp() {
     parent::setUp();
 
     // Create the node bundles required for testing.
-    $type = entity_create('node_type', array('type' => 'page', 'name' => 'page'));
+    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
     $type->save();
-    $type = entity_create('node_type', array('type' => 'article', 'name' => 'article'));
+    $type = NodeType::create(['type' => 'article', 'name' => 'article']);
     $type->save();
-    $type = entity_create('node_type', array('type' => 'test', 'name' => 'test'));
+    $type = NodeType::create(['type' => 'test', 'name' => 'test']);
     $type->save();
   }
 
@@ -38,11 +40,11 @@ function testConditions() {
     $this->createUser();
 
     // Get some nodes of various types to check against.
-    $page = entity_create('node', array('type' => 'page', 'title' => $this->randomMachineName(), 'uid' => 1));
+    $page = Node::create(['type' => 'page', 'title' => $this->randomMachineName(), 'uid' => 1]);
     $page->save();
-    $article = entity_create('node', array('type' => 'article', 'title' => $this->randomMachineName(), 'uid' => 1));
+    $article = Node::create(['type' => 'article', 'title' => $this->randomMachineName(), 'uid' => 1]);
     $article->save();
-    $test = entity_create('node', array('type' => 'test', 'title' => $this->randomMachineName(), 'uid' => 1));
+    $test = Node::create(['type' => 'test', 'title' => $this->randomMachineName(), 'uid' => 1]);
     $test->save();
 
     // Grab the node type condition and configure it to check against node type
diff --git a/core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php b/core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php
deleted file mode 100644
index 22d140b..0000000
--- a/core/modules/node/src/Tests/Migrate/MigrateNodeStubTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\MigrateNodeStubTest.
- */
-
-namespace Drupal\node\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Test stub creation for nodes.
- *
- * @group node
- */
-class MigrateNodeStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('node');
-    // Need at least one node type present.
-    NodeType::create([
-      'type' => 'testnodetype',
-      'name' => 'Test node type',
-    ])->save();
-  }
-
-  /**
-   * Tests creation of node stubs.
-   */
-  public function testStub() {
-    $this->performStubTest('node');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
deleted file mode 100644
index 774d344..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBuilderTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\migrate\Entity\Migration;
-
-/**
- * @group migrate_drupal_6
- */
-class MigrateNodeBuilderTest extends MigrateDrupal6TestBase {
-
-  /**
-   * @var MigrationInterface[]
-   */
-  protected $builtMigrations = [];
-
-  /**
-   * Asserts various aspects of a migration entity.
-   *
-   * @param string $id
-   *   The migration ID.
-   * @param string $label
-   *   The label.
-   */
-  protected function assertEntity($id, $label) {
-    $migration = $this->builtMigrations[$id];
-    $this->assertTrue($migration instanceof Migration);
-    $this->assertIdentical($id, $migration->id());
-    $this->assertEqual($label, $migration->label());
-  }
-
-  /**
-   * Tests creating migrations from a template, using a builder plugin.
-   */
-  public function testCreateMigrations() {
-    $templates = [
-      'd6_node' => [
-        'id' => 'd6_node',
-        'label' => 'Drupal 6 nodes',
-        'builder' => [
-          'plugin' => 'd6_node',
-        ],
-        'source' => [
-          'plugin' => 'd6_node',
-        ],
-        'process' => [
-          'nid' => 'nid',
-          'vid' => 'vid',
-          'uid' => 'uid',
-        ],
-        'destination' => [
-          'plugin' => 'entity:node',
-        ],
-      ],
-    ];
-
-    $migrations = \Drupal::service('migrate.migration_builder')->createMigrations($templates);
-    // Key the array.
-    foreach ($migrations as $migration) {
-      $this->builtMigrations[$migration->id()] = $migration;
-    }
-    $this->assertIdentical(11, count($this->builtMigrations));
-    $this->assertEntity('d6_node__article', 'Drupal 6 nodes (article)');
-    $this->assertEntity('d6_node__company', 'Drupal 6 nodes (company)');
-    $this->assertEntity('d6_node__employee', 'Drupal 6 nodes (employee)');
-    $this->assertEntity('d6_node__event', 'Drupal 6 nodes (event)');
-    $this->assertEntity('d6_node__page', 'Drupal 6 nodes (page)');
-    $this->assertEntity('d6_node__sponsor', 'Drupal 6 nodes (sponsor)');
-    $this->assertEntity('d6_node__story', 'Drupal 6 nodes (story)');
-    $this->assertEntity('d6_node__test_event', 'Drupal 6 nodes (test_event)');
-    $this->assertEntity('d6_node__test_page', 'Drupal 6 nodes (test_page)');
-    $this->assertEntity('d6_node__test_planet', 'Drupal 6 nodes (test_planet)');
-    $this->assertEntity('d6_node__test_story', 'Drupal 6 nodes (test_story)');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
deleted file mode 100644
index d229661..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBundleSettingsTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Test migrating node settings into the base_field_bundle_override config entity.
- *
- * @group migrate_drupal_6
- */
-class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['node']);
-    $this->executeMigration('d6_node_type');
-
-    // Create a config entity that already exists.
-    BaseFieldOverride::create([
-      'field_name' => 'promote',
-      'entity_type' => 'node',
-      'bundle' => 'page',
-    ])->save();
-
-    $this->executeMigrations([
-      'd6_node_setting_promote',
-      'd6_node_setting_status',
-      'd6_node_setting_sticky'
-    ]);
-  }
-
-  /**
-   * Tests Drupal 6 node type settings to Drupal 8 migration.
-   */
-  public function testNodeBundleSettings() {
-    // Test settings on test_page bundle.
-    $node = Node::create(['type' => 'test_page']);
-    $this->assertIdentical(1, $node->status->value);
-    $this->assertIdentical(1, $node->promote->value);
-    $this->assertIdentical(1, $node->sticky->value);
-
-    // Test settings for test_story bundle.
-    $node = Node::create(['type' => 'test_story']);
-    $this->assertIdentical(1, $node->status->value);
-    $this->assertIdentical(1, $node->promote->value);
-    $this->assertIdentical(0, $node->sticky->value);
-
-    // Test settings for the test_event bundle.
-    $node = Node::create(['type' => 'test_event']);
-    $this->assertIdentical(0, $node->status->value);
-    $this->assertIdentical(0, $node->promote->value);
-    $this->assertIdentical(1, $node->sticky->value);
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
deleted file mode 100644
index 26c5fcb..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeConfigsTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to node.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_node_settings');
-  }
-
-  /**
-   * Tests Drupal 6 node settings to Drupal 8 migration.
-   */
-  public function testNodeSettings() {
-    $config = $this->config('node.settings');
-    $this->assertIdentical(FALSE, $config->get('use_admin_theme'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'node.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
index b8ee0c2..19c7c09 100644
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
+++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php
@@ -2,10 +2,11 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeRevisionTest.
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeRevisionTest.
  */
 
 namespace Drupal\node\Tests\Migrate\d6;
+use Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase;
 
 /**
  * Node content revisions migration.
@@ -19,7 +20,7 @@ class MigrateNodeRevisionTest extends MigrateNodeTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigrations(['d6_node:*', 'd6_node_revision:*']);
+    $this->executeMigrations(['d6_node', 'd6_node_revision']);
   }
 
   /**
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php
deleted file mode 100644
index a4c7850..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingPromoteTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeSettingPromoteTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * @group migrate_drupal_6
- */
-class MigrateNodeSettingPromoteTest extends MigrateDrupal6TestBase {
-
-  public static $modules = ['node', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['node']);
-    $this->executeMigration('d6_node_type');
-    $this->executeMigration('d6_node_setting_promote');
-  }
-
-  /**
-   * Tests migration of the promote checkbox's settings.
-   */
-  public function testMigration() {
-    $this->assertIdentical('Promoted to front page', BaseFieldOverride::load('node.article.promote')->label());
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php
deleted file mode 100644
index 0adbb43..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeSettingStickyTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeSettingStickyTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * @group migrate_drupal_6
- */
-class MigrateNodeSettingStickyTest extends MigrateDrupal6TestBase {
-
-  public static $modules = ['node', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['node']);
-    $this->executeMigration('d6_node_type');
-    $this->executeMigration('d6_node_setting_sticky');
-  }
-
-  /**
-   * Tests migration of the sticky checkbox's settings.
-   */
-  public function testMigration() {
-    $this->assertIdentical('Sticky at the top of lists', BaseFieldOverride::load('node.article.sticky')->label());
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
deleted file mode 100644
index cf0c44b..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\Core\Database\Database;
-use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\node\Entity\Node;
-
-/**
- * Node content migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateNodeTest extends MigrateNodeTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations(['d6_node:*']);
-  }
-
-  /**
-   * Test node migration from Drupal 6 to 8.
-   */
-  public function testNode() {
-    $node = Node::load(1);
-    $this->assertIdentical('1', $node->id(), 'Node 1 loaded.');
-    $this->assertIdentical('und', $node->langcode->value);
-    $this->assertIdentical('test', $node->body->value);
-    $this->assertIdentical('test', $node->body->summary);
-    $this->assertIdentical('filtered_html', $node->body->format);
-    $this->assertIdentical('story', $node->getType(), 'Node has the correct bundle.');
-    $this->assertIdentical('Test title', $node->getTitle(), 'Node has the correct title.');
-    $this->assertIdentical('1388271197', $node->getCreatedTime(), 'Node has the correct created time.');
-    $this->assertIdentical(FALSE, $node->isSticky());
-    $this->assertIdentical('1', $node->getOwnerId());
-    $this->assertIdentical('1420861423', $node->getRevisionCreationTime());
-
-    /** @var \Drupal\node\NodeInterface $node_revision */
-    $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1);
-    $this->assertIdentical('Test title', $node_revision->getTitle());
-    $this->assertIdentical('1', $node_revision->getRevisionAuthor()->id(), 'Node revision has the correct user');
-    // This is empty on the first revision.
-    $this->assertIdentical(NULL, $node_revision->revision_log->value);
-
-    $node = Node::load(2);
-    $this->assertIdentical('Test title rev 3', $node->getTitle());
-    $this->assertIdentical('test rev 3', $node->body->value);
-    $this->assertIdentical('filtered_html', $node->body->format);
-
-    // Test that link fields are migrated.
-    $this->assertIdentical('http://groups.drupal.org/', $node->field_test_link->uri);
-    $this->assertIdentical('Drupal Groups', $node->field_test_link->title);
-    $this->assertIdentical([], $node->field_test_link->options['attributes']);
-
-    // Rerun migration with invalid link attributes and a different URL and
-    // title. If only the attributes are changed the error does not occur.
-    Database::getConnection('default', 'migrate')
-      ->update('content_type_story')
-      ->fields([
-        'field_test_link_url' => 'https://www.drupal.org/node/2127611',
-        'field_test_link_title' => 'Migrate API in Drupal 8',
-        'field_test_link_attributes' => '',
-      ])
-      ->condition('nid', '2')
-      ->condition('vid', '3')
-      ->execute();
-
-    $this->rerunMigration();
-    $node = Node::load(2);
-    $this->assertIdentical('https://www.drupal.org/node/2127611', $node->field_test_link->uri);
-    $this->assertIdentical('Migrate API in Drupal 8', $node->field_test_link->title);
-    $this->assertIdentical([], $node->field_test_link->options['attributes']);
-
-    // Test that we can re-import using the EntityContentBase destination.
-    $title = $this->rerunMigration();
-    $node = Node::load(2);
-    $this->assertIdentical($title, $node->getTitle());
-    // Test multi-column fields are correctly upgraded.
-    $this->assertIdentical('test rev 3', $node->body->value);
-    $this->assertIdentical('full_html', $node->body->format);
-
-    // Now insert a row indicating a failure and set to update later.
-    $title = $this->rerunMigration(array(
-      'sourceid1' => 2,
-      'destid1' => NULL,
-      'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
-    ));
-    $node = Node::load(2);
-    $this->assertIdentical($title, $node->getTitle());
-  }
-
-  /**
-   * Execute the migration a second time.
-   *
-   * @param array $new_row
-   *   An optional row to be inserted into the id map.
-   *
-   * @return string
-   *   The new title in the source for vid 3.
-   */
-  protected function rerunMigration($new_row = []) {
-    $title = $this->randomString();
-    $migration = Migration::load('d6_node__story');
-    $source_connection = Database::getConnection('default', 'migrate');
-    $source_connection->update('node_revisions')
-      ->fields(array(
-        'title' => $title,
-        'format' => 2,
-      ))
-      ->condition('vid', 3)
-      ->execute();
-    $table_name = $migration->getIdMap()->mapTableName();
-    $default_connection = \Drupal::database();
-    $default_connection->truncate($table_name)->execute();
-    if ($new_row) {
-      $hash = $migration->getIdMap()->getSourceIDsHash(['nid' => $new_row['sourceid1']]);
-      $new_row['source_ids_hash'] = $hash;
-      $default_connection->insert($table_name)
-        ->fields($new_row)
-        ->execute();
-    }
-    $this->executeMigration($migration);
-    return $title;
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
deleted file mode 100644
index f88fba2..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\user\Entity\User;
-
-/**
- * Base class for Node migration tests.
- */
-abstract class MigrateNodeTestBase extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installConfig(['node']);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('system', ['sequences']);
-
-    // Create a new user which needs to have UID 1, because that is expected by
-    // the assertions from
-    // \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest.
-    User::create([
-      'uid' => 1,
-      'name' => $this->randomMachineName(),
-      'status' => 1,
-    ])->enforceIsNew()->save();
-
-    $this->migrateUsers(FALSE);
-    $this->migrateFields();
-    $this->executeMigration('d6_node_settings');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
deleted file mode 100644
index 97d2597..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTypeTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Upgrade node types to node.type.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['node']);
-    $this->executeMigration('d6_node_type');
-  }
-
-  /**
-   * Tests Drupal 6 node type to Drupal 8 migration.
-   */
-  public function testNodeType() {
-    $id_map = Migration::load('d6_node_type')->getIdMap();
-    // Test the test_page content type.
-    $node_type_page = NodeType::load('test_page');
-    $this->assertIdentical('test_page', $node_type_page->id(), 'Node type test_page loaded');
-    $this->assertIdentical(TRUE, $node_type_page->displaySubmitted());
-    $this->assertIdentical(FALSE, $node_type_page->isNewRevision());
-    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_page->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_page')), array('test_page'));
-
-    // Test we have a body field.
-    $field = FieldConfig::loadByName('node', 'test_page', 'body');
-    $this->assertIdentical('This is the body field label', $field->getLabel(), 'Body field was found.');
-
-    // Test the test_story content type.
-    $node_type_story = NodeType::load('test_story');
-    $this->assertIdentical('test_story', $node_type_story->id(), 'Node type test_story loaded');
-
-    $this->assertIdentical(TRUE, $node_type_story->displaySubmitted());
-    $this->assertIdentical(FALSE, $node_type_story->isNewRevision());
-    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_story->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_story')), array('test_story'));
-
-    // Test we don't have a body field.
-    $field = FieldConfig::loadByName('node', 'test_story', 'body');
-    $this->assertIdentical(NULL, $field, 'No body field found');
-
-    // Test the test_event content type.
-    $node_type_event = NodeType::load('test_event');
-    $this->assertIdentical('test_event', $node_type_event->id(), 'Node type test_event loaded');
-
-    $this->assertIdentical(TRUE, $node_type_event->displaySubmitted());
-    $this->assertIdentical(TRUE, $node_type_event->isNewRevision());
-    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_event->getPreviewMode());
-    $this->assertIdentical($id_map->lookupDestinationID(array('test_event')), array('test_event'));
-
-    // Test we have a body field.
-    $field = FieldConfig::loadByName('node', 'test_event', 'body');
-    $this->assertIdentical('Body', $field->getLabel(), 'Body field was found.');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
deleted file mode 100644
index 4aef44c..0000000
--- a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d6\MigrateViewModesTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityViewMode;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate view modes.
- *
- * @group migrate_drupal_6
- */
-class MigrateViewModesTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_view_modes');
-  }
-
-  /**
-   * Tests Drupal 6 view modes to Drupal 8 migration.
-   */
-  public function testViewModes() {
-    // Test a new view mode.
-    $view_mode = EntityViewMode::load('node.preview');
-    $this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
-    $this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
-    // Test the ID map.
-    $this->assertIdentical(array('node', 'preview'), Migration::load('d6_view_modes')->getIdMap()->lookupDestinationID(array(1)));
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php
deleted file mode 100644
index 0bccde9..0000000
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeSettingsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeSettingsTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d7;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Upgrade variables to node.settings config object.
- *
- * @group node
- */
-class MigrateNodeSettingsTest extends MigrateDrupal7TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_node_settings');
-  }
-
-  /**
-   * Tests migration of node variables to node.settings config object.
-   */
-  public function testAggregatorSettings() {
-    $config = $this->config('node.settings');
-    $this->assertEqual(1, $config->get('use_admin_theme'));
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
deleted file mode 100644
index deed28c..0000000
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-
-/**
- * Tests node migration.
- *
- * @group node
- */
-class MigrateNodeTest extends MigrateDrupal7TestBase {
-
-  static $modules = array(
-    'comment',
-    'datetime',
-    'filter',
-    'image',
-    'link',
-    'node',
-    'taxonomy',
-    'telephone',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('file');
-    $this->installConfig(static::$modules);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('system', ['sequences']);
-
-    $this->executeMigrations([
-      'd7_user_role',
-      'd7_user',
-      'd7_node_type',
-      'd7_comment_type',
-      'd7_field',
-      'd7_field_instance',
-      'd7_node__test_content_type',
-      'd7_node__article',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a node.
-   *
-   * @param string $id
-   *   The node ID.
-   * @param string $type
-   *   The node type.
-   * @param string $langcode
-   *   The expected language code.
-   * @param string $title
-   *   The expected title.
-   * @param int $uid
-   *   The expected author ID.
-   * @param bool $status
-   *   The expected status of the node.
-   * @param int $created
-   *   The expected creation time.
-   * @param int $changed
-   *   The expected modification time.
-   * @param bool $promoted
-   *   Whether the node is expected to be promoted to the front page.
-   * @param bool $sticky
-   *   Whether the node is expected to be sticky.
-   */
-  protected function assertEntity($id, $type, $langcode, $title, $uid, $status, $created, $changed, $promoted, $sticky) {
-    /** @var \Drupal\node\NodeInterface $node */
-    $node = Node::load($id);
-    $this->assertTrue($node instanceof NodeInterface);
-    $this->assertIdentical($type, $node->getType());
-    $this->assertIdentical($langcode, $node->langcode->value);
-    $this->assertIdentical($title, $node->getTitle());
-    $this->assertIdentical($uid, $node->getOwnerId());
-    $this->assertIdentical($status, $node->isPublished());
-    $this->assertIdentical($created, $node->getCreatedTime());
-    if (isset($changed)) {
-      $this->assertIdentical($changed, $node->getChangedTime());
-    }
-    $this->assertIdentical($promoted, $node->isPromoted());
-    $this->assertIdentical($sticky, $node->isSticky());
-  }
-
-  /**
-   * Asserts various aspects of a node revision.
-   *
-   * @param int $id
-   *   The revision ID.
-   * @param string $title
-   *   The expected title.
-   * @param int $uid
-   *   The revision author ID.
-   * @param string $log
-   *   The revision log message.
-   * @param int $timestamp
-   *   The revision's time stamp.
-   */
-  protected function assertRevision($id, $title, $uid, $log, $timestamp) {
-    $revision = \Drupal::entityManager()->getStorage('node')->loadRevision($id);
-    $this->assertTrue($revision instanceof NodeInterface);
-    $this->assertIdentical($title, $revision->getTitle());
-    $this->assertIdentical($uid, $revision->getRevisionAuthor()->id());
-    $this->assertIdentical($log, $revision->revision_log->value);
-    $this->assertIdentical($timestamp, $revision->getRevisionCreationTime());
-  }
-
-  /**
-   * Test node migration from Drupal 7 to 8.
-   */
-  public function testNode() {
-    $this->assertEntity(1, 'test_content_type', 'en', 'A Node', '2', TRUE, '1421727515', '1441032132', TRUE, FALSE);
-    $this->assertRevision(1, 'A Node', '1', NULL, '1441032132');
-
-    $node = Node::load(1);
-    $this->assertTrue($node->field_boolean->value);
-    $this->assertIdentical('99-99-99-99', $node->field_phone->value);
-    // Use assertEqual() here instead, since SQLite interprets floats strictly.
-    $this->assertEqual('1', $node->field_float->value);
-    $this->assertIdentical('5', $node->field_integer->value);
-    $this->assertIdentical('Some more text', $node->field_text_list[0]->value);
-    $this->assertIdentical('7', $node->field_integer_list[0]->value);
-    $this->assertIdentical('qwerty', $node->field_text->value);
-    $this->assertIdentical('2', $node->field_file->target_id);
-    $this->assertIdentical('file desc', $node->field_file->description);
-    $this->assertTrue($node->field_file->display);
-    $this->assertIdentical('1', $node->field_images->target_id);
-    $this->assertIdentical('alt text', $node->field_images->alt);
-    $this->assertIdentical('title text', $node->field_images->title);
-    $this->assertIdentical('93', $node->field_images->width);
-    $this->assertIdentical('93', $node->field_images->height);
-
-    $node = Node::load(2);
-    $this->assertIdentical("...is that it's the absolute best show ever. Trust me, I would know.", $node->body->value);
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php
deleted file mode 100644
index 93f3749..0000000
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTitleLabelTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTitleLabelTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d7;
-
-use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of the title field label for node types.
- *
- * @group node
- */
-class MigrateNodeTitleLabelTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->installEntitySchema('node');
-    $this->executeMigrations(['d7_node_type', 'd7_node_title_label']);
-  }
-
-  /**
-   * Asserts various aspects of a base_field_override entity.
-   *
-   * @param string $id
-   *   The override ID.
-   * @param string $label
-   *   The label's expected (overridden) value.
-   */
-  protected function assertEntity($id, $label) {
-    $override = BaseFieldOverride::load($id);
-    $this->assertTrue($override instanceof BaseFieldOverride);
-    /** @var \Drupal\Core\Field\Entity\BaseFieldOverride $override */
-    $this->assertIdentical($label, $override->getLabel());
-  }
-
-  /**
-   * Tests migration of node title field overrides.
-   */
-  public function testMigration() {
-    $this->assertEntity('node.article.title', 'Title');
-    $this->assertEntity('node.blog.title', 'Title');
-    $this->assertEntity('node.book.title', 'Title');
-    $this->assertEntity('node.forum.title', 'Subject');
-    $this->assertEntity('node.page.title', 'Title');
-    $this->assertEntity('node.test_content_type.title', 'Title');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
deleted file mode 100644
index c3706a9..0000000
--- a/core/modules/node/src/Tests/Migrate/d7/MigrateNodeTypeTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d7\MigrateNodeTypeTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d7;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\FieldConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\NodeType;
-use Drupal\node\NodeTypeInterface;
-
-/**
- * Upgrade node types to node.type.*.yml.
- *
- * @group node
- */
-class MigrateNodeTypeTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'text', 'filter');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('node'));
-    $this->executeMigration('d7_node_type');
-  }
-
-  /**
-   * Tests a single node type.
-   *
-   * @dataProvider testNodeTypeDataProvider
-   * @param string $id
-   *  The node type ID.
-   * @param string $label
-   *  The expected label.
-   * @param string $description
-   *  The expected node type description.
-   * @param string $help
-   *  The expected help text.
-   */
-  protected function assertEntity($id, $label, $description, $help, $display_submitted, $new_revision, $body_label = NULL) {
-    /** @var \Drupal\node\NodeTypeInterface $entity */
-    $entity = NodeType::load($id);
-    $this->assertTrue($entity instanceof NodeTypeInterface);
-    $this->assertIdentical($label, $entity->label());
-    $this->assertIdentical($description, $entity->getDescription());
-    $this->assertIdentical($help, $entity->getHelp());
-
-    $this->assertIdentical($display_submitted, $entity->displaySubmitted(), 'Submission info is displayed');
-    $this->assertIdentical($new_revision, $entity->isNewRevision(), 'Is a new revision');
-
-    if ($body_label) {
-      /** @var \Drupal\field\FieldConfigInterface $body */
-      $body = FieldConfig::load('node.' . $id . '.body');
-      $this->assertTrue($body instanceof FieldConfigInterface);
-      $this->assertIdentical($body_label, $body->label());
-    }
-  }
-
-  /**
-   * Tests Drupal 7 node type to Drupal 8 migration.
-   */
-  public function testNodeType() {
-    $this->assertEntity('article', 'Article', 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.', 'Help text for articles', TRUE, FALSE, "Body");
-    $this->assertEntity('blog', 'Blog entry', 'Use for multi-user blogs. Every user gets a personal blog.', 'Blog away, good sir!', TRUE, FALSE, 'Body');
-    // book's display_submitted flag is not set, so it will default to TRUE.
-    $this->assertEntity('book', 'Book page', '<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.', '', TRUE, TRUE, "Body");
-    $this->assertEntity('forum', 'Forum topic', 'A <em>forum topic</em> starts a new discussion thread within a forum.', 'No name-calling, no flame wars. Be nice.', TRUE, FALSE, 'Body');
-    $this->assertEntity('page', 'Basic page', "Use <em>basic pages</em> for your static content, such as an 'About us' page.", 'Help text for basic pages', FALSE, FALSE, "Body");
-    // This node type does not carry a body field.
-    $this->assertEntity('test_content_type', 'Test content type', 'This is the description of the test content type.', 'Help text for test content type', FALSE, TRUE);
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/NodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d7/NodeBuilderTest.php
deleted file mode 100644
index 09172f7..0000000
--- a/core/modules/node/src/Tests/Migrate/d7/NodeBuilderTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Migrate\d7\NodeBuilderTest.
- */
-
-namespace Drupal\node\Tests\Migrate\d7;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests the d7_node builder.
- *
- * @group node
- */
-class NodeBuilderTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['node'];
-
-  public function testBuilder() {
-    $process = Migration::load('d7_node__test_content_type')->getProcess();
-    $this->assertIdentical('field_boolean', $process['field_boolean'][0]['source']);
-    $this->assertIdentical('field_email', $process['field_email'][0]['source']);
-    $this->assertIdentical('field_phone', $process['field_phone'][0]['source']);
-    $this->assertIdentical('field_date', $process['field_date'][0]['source']);
-    $this->assertIdentical('field_date_with_end_time', $process['field_date_with_end_time'][0]['source']);
-    $this->assertIdentical('field_file', $process['field_file'][0]['source']);
-    $this->assertIdentical('field_float', $process['field_float'][0]['source']);
-    $this->assertIdentical('field_images', $process['field_images'][0]['source']);
-    $this->assertIdentical('field_integer', $process['field_integer'][0]['source']);
-    $this->assertIdentical('field_link', $process['field_link'][0]['source']);
-    $this->assertIdentical('field_text_list', $process['field_text_list'][0]['source']);
-    $this->assertIdentical('field_integer_list', $process['field_integer_list'][0]['source']);
-    $this->assertIdentical('field_long_text', $process['field_long_text'][0]['source']);
-    $this->assertIdentical('field_term_reference', $process['field_term_reference'][0]['source']);
-    $this->assertIdentical('field_text', $process['field_text'][0]['source']);
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php b/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
new file mode 100644
index 0000000..7a08d3f
--- /dev/null
+++ b/core/modules/node/src/Tests/Migrate/d7/NodeMigrateDeriverTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Tests\Migrate\d7\NodeMigrateDeriverTest.
+ */
+
+namespace Drupal\node\Tests\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the d7_node node deriver.
+ *
+ * @group node
+ */
+class NodeMigrateDeriverTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node'];
+
+  public function testBuilder() {
+    $process = $this->getMigration('d7_node:test_content_type')->getProcess();
+    $this->assertIdentical('field_boolean', $process['field_boolean'][0]['source']);
+    $this->assertIdentical('field_email', $process['field_email'][0]['source']);
+    $this->assertIdentical('field_phone', $process['field_phone'][0]['source']);
+    $this->assertIdentical('field_date', $process['field_date'][0]['source']);
+    $this->assertIdentical('field_date_with_end_time', $process['field_date_with_end_time'][0]['source']);
+    $this->assertIdentical('field_file', $process['field_file'][0]['source']);
+    $this->assertIdentical('field_float', $process['field_float'][0]['source']);
+    $this->assertIdentical('field_images', $process['field_images'][0]['source']);
+    $this->assertIdentical('field_integer', $process['field_integer'][0]['source']);
+    $this->assertIdentical('field_link', $process['field_link'][0]['source']);
+    $this->assertIdentical('field_text_list', $process['field_text_list'][0]['source']);
+    $this->assertIdentical('field_integer_list', $process['field_integer_list'][0]['source']);
+    $this->assertIdentical('field_long_text', $process['field_long_text'][0]['source']);
+    $this->assertIdentical('field_term_reference', $process['field_term_reference'][0]['source']);
+    $this->assertIdentical('field_text', $process['field_text'][0]['source']);
+  }
+
+}
diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
index 84ffbe2..9e3803f 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the persistence of basic options through multiple steps.
@@ -32,7 +34,7 @@ function testMultiStepNodeFormBasicOptions() {
 
     // Create an unlimited cardinality field.
     $this->fieldName = Unicode::strtolower($this->randomMachineName());
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text',
@@ -40,12 +42,12 @@ function testMultiStepNodeFormBasicOptions() {
     ))->save();
 
     // Attach an instance of the field to the page content type.
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => $this->randomMachineName() . '_label',
-    ))->save();
+    ])->save();
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($this->fieldName, array(
         'type' => 'text_textfield',
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index ab490bb..d9f39b4 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the interaction of the node access system with fields.
@@ -54,16 +56,16 @@ protected function setUp() {
 
     // Add a custom field to the page content type.
     $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => 'text'
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => 'page',
-    ))->save();
+    ])->save();
     entity_get_display('node', 'page', 'default')
       ->setComponent($this->fieldName)
       ->save();
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
index 3051af1..3d52bc7 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareCombinationTest.php
@@ -8,9 +8,11 @@
 namespace Drupal\node\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Entity\NodeType;
 use Drupal\user\Entity\User;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests node access functionality with multiple languages and two node access
@@ -55,7 +57,7 @@ protected function setUp() {
 
     // Create the 'private' field, which allows the node to be marked as private
     // (restricted access) in a given translation.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'field_private',
       'entity_type' => 'node',
       'type' => 'boolean',
@@ -63,7 +65,7 @@ protected function setUp() {
     ));
     $field_storage->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
       'widget' => array(
@@ -73,7 +75,7 @@ protected function setUp() {
         'on_label' => 'Private',
         'off_label' => 'Not private',
       ),
-    ))->save();
+    ])->save();
 
     // After enabling a node access module, the access table has to be rebuild.
     node_access_rebuild();
diff --git a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
index 5770746..6715cc0 100644
--- a/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
+++ b/core/modules/node/src/Tests/NodeAccessLanguageAwareTest.php
@@ -8,8 +8,10 @@
 namespace Drupal\node\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\user\Entity\User;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests node_access and db_select() with node_access tag functionality with
@@ -52,7 +54,7 @@ protected function setUp() {
 
     // Create the 'private' field, which allows the node to be marked as private
     // (restricted access) in a given translation.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'field_private',
       'entity_type' => 'node',
       'type' => 'boolean',
@@ -60,7 +62,7 @@ protected function setUp() {
     ));
     $field_storage->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'page',
       'widget' => array(
@@ -70,7 +72,7 @@ protected function setUp() {
         'on_label' => 'Private',
         'off_label' => 'Not private',
       ),
-    ))->save();
+    ])->save();
 
     // After enabling a node access module, the access table has to be rebuild.
     node_access_rebuild();
diff --git a/core/modules/node/src/Tests/NodeAccessPagerTest.php b/core/modules/node/src/Tests/NodeAccessPagerTest.php
index c442566..6eb9eff 100644
--- a/core/modules/node/src/Tests/NodeAccessPagerTest.php
+++ b/core/modules/node/src/Tests/NodeAccessPagerTest.php
@@ -10,6 +10,7 @@
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests access controlled node views have the right amount of comment pages.
@@ -45,7 +46,7 @@ public function testCommentPager() {
 
     // Create 60 comments.
     for ($i = 0; $i < 60; $i++) {
-      $comment = entity_create('comment', array(
+      $comment = Comment::create(array(
         'entity_id' => $node->id(),
         'entity_type' => 'node',
         'field_name' => 'comment',
diff --git a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php b/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php
index ddf7559..2441a57 100644
--- a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php
+++ b/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php
@@ -29,7 +29,6 @@ class NodeBodyFieldStorageTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->installSchema('system', 'sequences');
-    $this->installSchema('system', array('router'));
     // Necessary for module uninstall.
     $this->installSchema('user', 'users_data');
     $this->installEntitySchema('user');
diff --git a/core/modules/node/src/Tests/NodeCacheTagsTest.php b/core/modules/node/src/Tests/NodeCacheTagsTest.php
index 5940d4c..b10bcb6 100644
--- a/core/modules/node/src/Tests/NodeCacheTagsTest.php
+++ b/core/modules/node/src/Tests/NodeCacheTagsTest.php
@@ -8,6 +8,8 @@
 namespace Drupal\node\Tests;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 
 /**
@@ -27,13 +29,13 @@ class NodeCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    */
   protected function createEntity() {
     // Create a "Camelids" node type.
-    entity_create('node_type', array(
+    NodeType::create([
       'name' => 'Camelids',
       'type' => 'camelids',
-    ))->save();
+    ])->save();
 
     // Create a "Llama" node.
-    $node = entity_create('node', array('type' => 'camelids'));
+    $node = Node::create(['type' => 'camelids']);
     $node->setTitle('Llama')
       ->setPublished(TRUE)
       ->save();
diff --git a/core/modules/node/src/Tests/NodeCreationTest.php b/core/modules/node/src/Tests/NodeCreationTest.php
index abe7ba7..d625e52 100644
--- a/core/modules/node/src/Tests/NodeCreationTest.php
+++ b/core/modules/node/src/Tests/NodeCreationTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\node\Entity\Node;
 
 /**
  * Create a node and test saving it.
@@ -90,7 +91,7 @@ function testFailedPageCreation() {
     try {
       // An exception is generated by node_test_exception_node_insert() if the
       // title is 'testing_transaction_exception'.
-      entity_create('node', $edit)->save();
+      Node::create($edit)->save();
       $this->fail(t('Expected exception has not been thrown.'));
     }
     catch (\Exception $e) {
diff --git a/core/modules/node/src/Tests/NodeEditFormTest.php b/core/modules/node/src/Tests/NodeEditFormTest.php
index f2701a4..d6c40b6 100644
--- a/core/modules/node/src/Tests/NodeEditFormTest.php
+++ b/core/modules/node/src/Tests/NodeEditFormTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\node\Tests;
 
 use Drupal\node\NodeInterface;
+use Drupal\user\Entity\User;
 
 /**
  * Create a node and test node edit functionality.
@@ -205,10 +206,17 @@ protected function checkVariousAuthoredByValues(NodeInterface $node, $form_eleme
     // won't do.
     $this->assertTrue($uid === 0 || $uid === '0', 'Node authored by anonymous user.');
 
+    // Go back to the edit form and check that the correct value is displayed
+    // in the author widget.
+    $this->drupalGet('node/' . $node->id() . '/edit');
+    $anonymous_user = User::getAnonymousUser();
+    $expected = $anonymous_user->label() . ' (' . $anonymous_user->id() . ')';
+    $this->assertFieldByName($form_element_name, $expected, 'Authored by field displays the correct value for the anonymous user.');
+
     // Change the authored by field to another user's name (that is not
     // logged in).
     $edit[$form_element_name] = $this->webUser->getUsername();
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
     $this->nodeStorage->resetCache(array($node->id()));
     $node = $this->nodeStorage->load($node->id());
     $this->assertIdentical($node->getOwnerId(), $this->webUser->id(), 'Node authored by normal user.');
diff --git a/core/modules/node/src/Tests/NodeQueryAlterTest.php b/core/modules/node/src/Tests/NodeQueryAlterTest.php
index d0d615e..d8e0640 100644
--- a/core/modules/node/src/Tests/NodeQueryAlterTest.php
+++ b/core/modules/node/src/Tests/NodeQueryAlterTest.php
@@ -73,6 +73,24 @@ function testNodeQueryAlterLowLevelWithAccess() {
   }
 
   /**
+   * Tests 'node_access' query alter with revision-enabled nodes.
+   */
+  public function testNodeQueryAlterWithRevisions() {
+    // Execute a query that only deals with the 'node_revision' table.
+    try {
+      $query = \Drupal::entityTypeManager()->getStorage('node')->getQuery();
+      $result = $query
+        ->allRevisions()
+        ->execute();
+
+      $this->assertEqual(count($result), 4, 'User with access can see correct nodes');
+    }
+    catch (\Exception $e) {
+      $this->fail('Altered query is malformed');
+    }
+  }
+
+  /**
    * Tests 'node_access' query alter, for user without access.
    *
    * Verifies that a non-standard table alias can be used, and that a user
diff --git a/core/modules/node/src/Tests/NodeSaveTest.php b/core/modules/node/src/Tests/NodeSaveTest.php
index 3acbf82..7fcea9b 100644
--- a/core/modules/node/src/Tests/NodeSaveTest.php
+++ b/core/modules/node/src/Tests/NodeSaveTest.php
@@ -64,7 +64,7 @@ function testImport() {
       'nid' => $test_nid,
     );
     /** @var \Drupal\node\NodeInterface $node */
-    $node = entity_create('node', $node);
+    $node = Node::create($node);
     $node->enforceIsNew();
 
     $this->assertEqual($node->getOwnerId(), $this->webUser->id());
@@ -89,7 +89,7 @@ function testTimestamps() {
       'title' => $this->randomMachineName(8),
     );
 
-    entity_create('node', $edit)->save();
+    Node::create($edit)->save();
     $node = $this->drupalGetNodeByTitle($edit['title']);
     $this->assertEqual($node->getCreatedTime(), REQUEST_TIME, 'Creating a node sets default "created" timestamp.');
     $this->assertEqual($node->getChangedTime(), REQUEST_TIME, 'Creating a node sets default "changed" timestamp.');
@@ -118,7 +118,7 @@ function testTimestamps() {
       'changed' => 979534800, // Drupal 1.0 release.
     );
 
-    entity_create('node', $edit)->save();
+    Node::create($edit)->save();
     $node = $this->drupalGetNodeByTitle($edit['title']);
     $this->assertEqual($node->getCreatedTime(), 280299600, 'Creating a node programmatically uses programmatically set "created" timestamp.');
     $this->assertEqual($node->getChangedTime(), 979534800, 'Creating a node programmatically uses programmatically set "changed" timestamp.');
@@ -144,11 +144,11 @@ function testTimestamps() {
    */
   function testDeterminingChanges() {
     // Initial creation.
-    $node = entity_create('node', array(
+    $node = Node::create([
       'uid' => $this->webUser->id(),
       'type' => 'article',
       'title' => 'test_changes',
-    ));
+    ]);
     $node->save();
 
     // Update the node without applying changes.
diff --git a/core/modules/node/src/Tests/NodeTokenReplaceTest.php b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
index bc6a049..9050de9 100644
--- a/core/modules/node/src/Tests/NodeTokenReplaceTest.php
+++ b/core/modules/node/src/Tests/NodeTokenReplaceTest.php
@@ -10,6 +10,8 @@
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 use Drupal\system\Tests\System\TokenReplaceUnitTestBase;
 
 /**
@@ -34,7 +36,7 @@ protected function setUp() {
     parent::setUp();
     $this->installConfig(array('filter', 'node'));
 
-    $node_type = entity_create('node_type', array('type' => 'article', 'name' => 'Article'));
+    $node_type = NodeType::create(['type' => 'article', 'name' => 'Article']);
     $node_type->save();
     node_add_body_field($node_type);
   }
@@ -51,13 +53,13 @@ function testNodeTokenReplacement() {
     // Create a user and a node.
     $account = $this->createUser();
     /* @var $node \Drupal\node\NodeInterface */
-    $node = entity_create('node', array(
+    $node = Node::create([
       'type' => 'article',
       'tnid' => 0,
       'uid' => $account->id(),
       'title' => '<blink>Blinking Text</blink>',
       'body' => [['value' => 'Regular NODE body for the test.', 'summary' => 'Fancy NODE summary.', 'format' => 'plain_text']],
-    ));
+    ]);
     $node->save();
 
     // Generate and test tokens.
@@ -110,12 +112,12 @@ function testNodeTokenReplacement() {
     }
 
     // Repeat for a node without a summary.
-    $node = entity_create('node', array(
+    $node = Node::create([
       'type' => 'article',
       'uid' => $account->id(),
       'title' => '<blink>Blinking Text</blink>',
       'body' => [['value' => 'A string that looks random like TR5c2I', 'format' => 'plain_text']],
-    ));
+    ]);
     $node->save();
 
     // Generate and test token - use full body as expected value.
diff --git a/core/modules/node/src/Tests/NodeTranslationUITest.php b/core/modules/node/src/Tests/NodeTranslationUITest.php
index 0bb81c0..ca31f3b 100644
--- a/core/modules/node/src/Tests/NodeTranslationUITest.php
+++ b/core/modules/node/src/Tests/NodeTranslationUITest.php
@@ -30,7 +30,8 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
     'theme',
     'route',
     'timezone',
-    'url',
+    'url.path',
+    'url.query_args:_wrapper_format',
     'user'
   ];
 
diff --git a/core/modules/node/src/Tests/NodeTypeTest.php b/core/modules/node/src/Tests/NodeTypeTest.php
index 945c83f..8152cf5 100644
--- a/core/modules/node/src/Tests/NodeTypeTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTest.php
@@ -10,7 +10,6 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\node\Entity\NodeType;
 use Drupal\Core\Url;
-use Drupal\node\NodeTypeInterface;
 
 /**
  * Ensures that node type functions work correctly.
@@ -126,7 +125,7 @@ function testNodeTypeEditing() {
     $this->assertRaw('Body', 'Body field was found.');
 
     // Change the name through the API
-    /** @var NodeTypeInterface $node_type */
+    /** @var \Drupal\node\NodeTypeInterface $node_type */
     $node_type = NodeType::load('page');
     $node_type->set('name', 'NewBar');
     $node_type->save();
diff --git a/core/modules/node/src/Tests/NodeTypeTranslationTest.php b/core/modules/node/src/Tests/NodeTypeTranslationTest.php
index 10c6865..487a5e5 100644
--- a/core/modules/node/src/Tests/NodeTypeTranslationTest.php
+++ b/core/modules/node/src/Tests/NodeTypeTranslationTest.php
@@ -14,6 +14,10 @@
 /**
  * Ensures that node types translation work correctly.
  *
+ * Note that the child site is installed in French; therefore, when making
+ * assertions on translated text it is important to provide a langcode. This
+ * ensures the asserts pass regardless of the Drupal version.
+ *
  * @group node
  */
 class NodeTypeTranslationTest extends WebTestBase {
@@ -105,12 +109,16 @@ public function testNodeTypeTranslation() {
     // Check the name is translated without admin theme for editing.
     $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '0'), t('Save configuration'));
     $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
+    // This is a Spanish page, so ensure the text asserted is translated in
+    // Spanish and not French by adding the langcode option.
+    $this->assertRaw(t('Create @name', array('@name' => $translated_name), array('langcode' => $langcode)));
 
     // Check the name is translated with admin theme for editing.
     $this->drupalPostForm('admin/appearance', array('use_admin_theme' => '1'), t('Save configuration'));
     $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Create @name', array('@name' => $translated_name)));
+    // This is a Spanish page, so ensure the text asserted is translated in
+    // Spanish and not French by adding the langcode option.
+    $this->assertRaw(t('Create @name', array('@name' => $translated_name), array('langcode' => $langcode)));
   }
 
   /**
@@ -128,17 +136,19 @@ public function testNodeTypeTitleLabelTranslation() {
 
     // Assert that the title label is displayed on the translation form with the right value.
     $this->drupalGet("admin/structure/types/manage/$type/translate/$langcode/add");
-    $this->assertRaw(t('Label'));
-    $this->assertRaw(t('Edited title'));
+    $this->assertText('Edited title');
 
     // Translate the title label.
     $this->drupalPostForm(NULL, array("translation[config_names][core.base_field_override.node.$type.title][label]" => 'Translated title'), t('Save translation'));
 
-    // Assert that the right title label is displayed on the node add form.
+    // Assert that the right title label is displayed on the node add form. The
+    // translations are created in this test; therefore, the assertions do not
+    // use t(). If t() were used then the correct langcodes would need to be
+    // provided.
     $this->drupalGet("node/add/$type");
-    $this->assertRaw(t('Edited title'));
+    $this->assertText('Edited title');
     $this->drupalGet("$langcode/node/add/$type");
-    $this->assertRaw(t('Translated title'));
+    $this->assertText('Translated title');
   }
 
 }
diff --git a/core/modules/node/src/Tests/NodeValidationTest.php b/core/modules/node/src/Tests/NodeValidationTest.php
index 9f6bccc..c6e26cc 100644
--- a/core/modules/node/src/Tests/NodeValidationTest.php
+++ b/core/modules/node/src/Tests/NodeValidationTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\node\Tests;
 
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
 
 /**
@@ -30,7 +32,7 @@ protected function setUp() {
     parent::setUp();
 
     // Create a node type for testing.
-    $type = entity_create('node_type', array('type' => 'page', 'name' => 'page'));
+    $type = NodeType::create(['type' => 'page', 'name' => 'page']);
     $type->save();
   }
 
@@ -39,7 +41,7 @@ protected function setUp() {
    */
   public function testValidation() {
     $this->createUser();
-    $node = entity_create('node', array('type' => 'page', 'title' => 'test', 'uid' => 1));
+    $node = Node::create(['type' => 'page', 'title' => 'test', 'uid' => 1]);
     $violations = $node->validate();
     $this->assertEqual(count($violations), 0, 'No violations when validating a default node.');
 
diff --git a/core/modules/node/src/Tests/PagePreviewTest.php b/core/modules/node/src/Tests/PagePreviewTest.php
index 903636a..3c9debe 100644
--- a/core/modules/node/src/Tests/PagePreviewTest.php
+++ b/core/modules/node/src/Tests/PagePreviewTest.php
@@ -15,6 +15,8 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\NodeType;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Tests the node entity preview functionality.
@@ -48,24 +50,24 @@ protected function setUp() {
     $this->drupalLogin($web_user);
 
     // Add a vocabulary so we can test different view modes.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => $this->randomMachineName(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'help' => '',
-    ));
+    ]);
     $vocabulary->save();
 
     $this->vocabulary = $vocabulary;
 
     // Add a term to the vocabulary.
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => $this->vocabulary->id(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $term->save();
 
     $this->term = $term;
diff --git a/core/modules/node/src/Tests/Views/NidArgumentTest.php b/core/modules/node/src/Tests/Views/NidArgumentTest.php
deleted file mode 100644
index 456dd74..0000000
--- a/core/modules/node/src/Tests/Views/NidArgumentTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Views\NidArgumentTest.
- */
-
-namespace Drupal\node\Tests\Views;
-
-use Drupal\node\Entity\Node;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Views;
-
-/**
- * Tests the nid argument handler.
- *
- * @group node
- * @see \Drupal\node\Plugin\views\argument\Nid
- */
-class NidArgumentTest extends ViewKernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node', 'field', 'text', 'node_test_config', 'user', 'node_test_views'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_nid_argument'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-    $this->installConfig(['node', 'field']);
-
-    ViewTestData::createTestViews(get_class($this), ['node_test_views']);
-  }
-
-  /**
-   * Test the nid argument.
-   */
-  public function testNidArgument() {
-    $view = Views::getView('test_nid_argument');
-    $view->setDisplay();
-
-    $node1 = Node::create([
-      'type' => 'default',
-      'title' => $this->randomMachineName(),
-    ]);
-    $node1->save();
-    $node2 = Node::create([
-      'type' => 'default',
-      'title' => $this->randomMachineName(),
-    ]);
-    $node2->save();
-
-    $view->preview();
-    $this->assertEqual(count($view->result), 2, 'Found the expected number of results.');
-
-    // Set an the second node id as an argument.
-    $view->destroy();
-    $view->preview('default', [$node2->id()]);
-    // Verify that the title is overridden.
-    $this->assertEqual($view->getTitle(), $node2->getTitle());
-    // Verify that the argument filtering works.
-    $this->assertEqual(count($view->result), 1, 'Found the expected number of results.');
-    $this->assertEqual($node2->id(), (string) $view->style_plugin->getField(0, 'nid'), 'Found the correct nid.');
-
-    // Verify that setting a non-existing id as argument results in no nodes
-    // being shown.
-    $view->destroy();
-    $view->preview('default', [22]);
-    $this->assertEqual(count($view->result), 0, 'Found the expected number of results.');
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
index 5cc96c7..46fbb23 100644
--- a/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
+++ b/core/modules/node/src/Tests/Views/NodeFieldTokensTest.php
@@ -6,6 +6,8 @@
  */
 
 namespace Drupal\node\Tests\Views;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 
 /**
  * Tests replacement of Views tokens supplied by the Node module.
@@ -28,7 +30,7 @@ class NodeFieldTokensTest extends NodeTestBase {
   public function testViewsTokenReplacement() {
     // Create the Article content type with a standard body field.
     /* @var $node_type \Drupal\node\NodeTypeInterface */
-    $node_type = entity_create('node_type', ['type' => 'article', 'name' => 'Article']);
+    $node_type = NodeType::create(['type' => 'article', 'name' => 'Article']);
     $node_type->save();
     node_add_body_field($node_type);
 
@@ -38,7 +40,7 @@ public function testViewsTokenReplacement() {
     $summary = $this->randomMachineName(16);
 
     /** @var $node \Drupal\node\NodeInterface */
-    $node = entity_create('node', [
+    $node = Node::create([
       'type' => 'article',
       'tnid' => 0,
       'uid' => $account->id(),
diff --git a/core/modules/node/src/Tests/Views/NodeViewsFieldAccessTest.php b/core/modules/node/src/Tests/Views/NodeViewsFieldAccessTest.php
deleted file mode 100644
index 379cf30..0000000
--- a/core/modules/node/src/Tests/Views/NodeViewsFieldAccessTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Views\NodeViewsFieldAccessTest.
- */
-
-namespace Drupal\node\Tests\Views;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\user\Entity\User;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the node entity.
- *
- * @group Node
- */
-class NodeViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('node');
-  }
-
-  /**
-   * Check access for node fields.
-   */
-  public function testNodeFields() {
-    $user = User::create([
-      'name' => 'test user',
-    ]);
-    $user->save();
-    NodeType::create([
-      'type' => 'article',
-      'name' => 'Article',
-    ])->save();
-    $node = Node::create([
-      'type' => 'article',
-      'title' => 'Test title',
-      'uid' => $user->id(),
-      'status' => 1,
-      'promote' => 1,
-      'sticky' => 0,
-      'created' => 123456,
-    ]);
-
-    $node->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('node', 'nid', $node->id());
-    $this->assertFieldAccess('node', 'uuid', $node->uuid());
-    $this->assertFieldAccess('node', 'vid', $node->id());
-    $this->assertFieldAccess('node', 'type', $node->type->entity->label());
-    $this->assertFieldAccess('node', 'langcode', $node->language()->getName());
-    $this->assertFieldAccess('node', 'title', 'Test title');
-    $this->assertFieldAccess('node', 'uid', $user->getUsername());
-    // @todo Don't we want to display Published / Unpublished by default,
-    //   see https://www.drupal.org/node/2465623
-    $this->assertFieldAccess('node', 'status', 'On');
-    $this->assertFieldAccess('node', 'promote', 'On');
-    $this->assertFieldAccess('node', 'sticky', 'Off');
-
-    // $this->assertFieldAccess('node', 'created', \Drupal::service('date.formatter')->format(123456));
-    // $this->assertFieldAccess('node', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
-  }
-
-}
diff --git a/core/modules/node/src/Tests/Views/RevisionCreateTimestampTest.php b/core/modules/node/src/Tests/Views/RevisionCreateTimestampTest.php
deleted file mode 100644
index 54dd1a4..0000000
--- a/core/modules/node/src/Tests/Views/RevisionCreateTimestampTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Tests\Views\RevisionCreateTimestampTest.
- */
-
-namespace Drupal\node\Tests\Views;
-
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Views;
-
-/**
- * Ensures that the revision create time can be accessed in views.
- *
- * @group views
- */
-class RevisionCreateTimestampTest extends ViewKernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node_test_views', 'node', 'views', 'user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $testViews = ['test_node_revision_timestamp'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installSchema('node', 'node_access');
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-
-    if ($import_test_views) {
-      ViewTestData::createTestViews(get_class($this), ['node_test_views']);
-    }
-  }
-
-  public function testRevisionCreateTimestampView() {
-    $node_type = NodeType::create([
-      'type' => 'article',
-      'label' => 'Article',
-    ]);
-    $node_type->save();
-    $node = Node::create([
-      'title' => 'Test node',
-      'type' => 'article',
-      'revision_timestamp' => 1000,
-    ]);
-    $node->save();
-
-    $node->setRevisionCreationTime(1200);
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    $node->setRevisionCreationTime(1400);
-    $node->setNewRevision(TRUE);
-    $node->save();
-
-    $view = Views::getView('test_node_revision_timestamp');
-    $this->executeView($view);
-
-    $this->assertIdenticalResultset($view, [
-      ['vid' => 3, 'revision_timestamp' => 1400],
-      ['vid' => 2, 'revision_timestamp' => 1200],
-      ['vid' => 1, 'revision_timestamp' => 1000],
-    ], ['vid' => 'vid', 'revision_timestamp' => 'revision_timestamp']);
-  }
-
-
-}
diff --git a/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
index c36b377..306df50 100644
--- a/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
+++ b/core/modules/node/src/Tests/Views/RevisionRelationshipsTest.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\node\Tests\Views\RevisionRelationshipsTest.
  */
+
 namespace Drupal\node\Tests\Views;
 
 use Drupal\views\Views;
diff --git a/core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php b/core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php
new file mode 100644
index 0000000..af4e0f8
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/MigrateNodeStubTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\MigrateNodeStubTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Test stub creation for nodes.
+ *
+ * @group node
+ */
+class MigrateNodeStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('node');
+    // Need at least one node type present.
+    NodeType::create([
+      'type' => 'testnodetype',
+      'name' => 'Test node type',
+    ])->save();
+  }
+
+  /**
+   * Tests creation of node stubs.
+   */
+  public function testStub() {
+    $this->performStubTest('node');
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
new file mode 100644
index 0000000..b98d0f3
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeBundleSettingsTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeBundleSettingsTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Core\Field\Entity\BaseFieldOverride;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Test migrating node settings into the base_field_bundle_override config entity.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['node']);
+    $this->executeMigration('d6_node_type');
+
+    // Create a config entity that already exists.
+    BaseFieldOverride::create([
+      'field_name' => 'promote',
+      'entity_type' => 'node',
+      'bundle' => 'page',
+    ])->save();
+
+    $this->executeMigrations([
+      'd6_node_setting_promote',
+      'd6_node_setting_status',
+      'd6_node_setting_sticky'
+    ]);
+  }
+
+  /**
+   * Tests Drupal 6 node type settings to Drupal 8 migration.
+   */
+  public function testNodeBundleSettings() {
+    // Test settings on test_page bundle.
+    $node = Node::create(['type' => 'test_page']);
+    $this->assertIdentical(1, $node->status->value);
+    $this->assertIdentical(1, $node->promote->value);
+    $this->assertIdentical(1, $node->sticky->value);
+
+    // Test settings for test_story bundle.
+    $node = Node::create(['type' => 'test_story']);
+    $this->assertIdentical(1, $node->status->value);
+    $this->assertIdentical(1, $node->promote->value);
+    $this->assertIdentical(0, $node->sticky->value);
+
+    // Test settings for the test_event bundle.
+    $node = Node::create(['type' => 'test_event']);
+    $this->assertIdentical(0, $node->status->value);
+    $this->assertIdentical(0, $node->promote->value);
+    $this->assertIdentical(1, $node->sticky->value);
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
new file mode 100644
index 0000000..242ed8f
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeConfigsTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to node.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_node_settings');
+  }
+
+  /**
+   * Tests Drupal 6 node settings to Drupal 8 migration.
+   */
+  public function testNodeSettings() {
+    $config = $this->config('node.settings');
+    $this->assertIdentical(FALSE, $config->get('use_admin_theme'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'node.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php
new file mode 100644
index 0000000..2231b08
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingPromoteTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeSettingPromoteTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Core\Field\Entity\BaseFieldOverride;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * @group migrate_drupal_6
+ */
+class MigrateNodeSettingPromoteTest extends MigrateDrupal6TestBase {
+
+  public static $modules = ['node', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['node']);
+    $this->executeMigration('d6_node_type');
+    $this->executeMigration('d6_node_setting_promote');
+  }
+
+  /**
+   * Tests migration of the promote checkbox's settings.
+   */
+  public function testMigration() {
+    $this->assertIdentical('Promoted to front page', BaseFieldOverride::load('node.article.promote')->label());
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php
new file mode 100644
index 0000000..904d29e
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeSettingStickyTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeSettingStickyTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Core\Field\Entity\BaseFieldOverride;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * @group migrate_drupal_6
+ */
+class MigrateNodeSettingStickyTest extends MigrateDrupal6TestBase {
+
+  public static $modules = ['node', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['node']);
+    $this->executeMigration('d6_node_type');
+    $this->executeMigration('d6_node_setting_sticky');
+  }
+
+  /**
+   * Tests migration of the sticky checkbox's settings.
+   */
+  public function testMigration() {
+    $this->assertIdentical('Sticky at the top of lists', BaseFieldOverride::load('node.article.sticky')->label());
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
new file mode 100644
index 0000000..64088a8
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Core\Database\Database;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\node\Entity\Node;
+use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait;
+
+/**
+ * Node content migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateNodeTest extends MigrateNodeTestBase {
+
+  use FileMigrationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->setUpMigratedFiles();
+    $this->installSchema('file', ['file_usage']);
+    $this->executeMigrations(['d6_node']);
+  }
+
+  /**
+   * Test node migration from Drupal 6 to 8.
+   */
+  public function testNode() {
+    $node = Node::load(1);
+    $this->assertIdentical('1', $node->id(), 'Node 1 loaded.');
+    $this->assertIdentical('und', $node->langcode->value);
+    $this->assertIdentical('test', $node->body->value);
+    $this->assertIdentical('test', $node->body->summary);
+    $this->assertIdentical('filtered_html', $node->body->format);
+    $this->assertIdentical('story', $node->getType(), 'Node has the correct bundle.');
+    $this->assertIdentical('Test title', $node->getTitle(), 'Node has the correct title.');
+    $this->assertIdentical('1388271197', $node->getCreatedTime(), 'Node has the correct created time.');
+    $this->assertIdentical(FALSE, $node->isSticky());
+    $this->assertIdentical('1', $node->getOwnerId());
+    $this->assertIdentical('1420861423', $node->getRevisionCreationTime());
+
+    /** @var \Drupal\node\NodeInterface $node_revision */
+    $node_revision = \Drupal::entityManager()->getStorage('node')->loadRevision(1);
+    $this->assertIdentical('Test title', $node_revision->getTitle());
+    $this->assertIdentical('1', $node_revision->getRevisionAuthor()->id(), 'Node revision has the correct user');
+    // This is empty on the first revision.
+    $this->assertIdentical(NULL, $node_revision->revision_log->value);
+    $this->assertIdentical('This is a shared text field', $node->field_test->value);
+    $this->assertIdentical('filtered_html', $node->field_test->format);
+    $this->assertIdentical('10', $node->field_test_two->value);
+    $this->assertIdentical('20', $node->field_test_two[1]->value);
+
+    $this->assertIdentical('42.42', $node->field_test_three->value, 'Single field second value is correct.');
+    $this->assertIdentical('3412', $node->field_test_integer_selectlist[0]->value);
+    $this->assertIdentical('1', $node->field_test_identical1->value, 'Integer value is correct');
+    $this->assertIdentical('1', $node->field_test_identical2->value, 'Integer value is correct');
+    $this->assertIdentical('This is a field with exclude unset.', $node->field_test_exclude_unset->value, 'Field with exclude unset is correct.');
+
+    // Test that link fields are migrated.
+    $this->assertIdentical('https://www.drupal.org/project/drupal', $node->field_test_link->uri);
+    $this->assertIdentical('Drupal project page', $node->field_test_link->title);
+    $this->assertIdentical(['target' => '_blank'], $node->field_test_link->options['attributes']);
+
+    // Test the file field meta.
+    $this->assertIdentical('desc', $node->field_test_filefield->description);
+    $this->assertIdentical('5', $node->field_test_filefield->target_id);
+
+    $node = Node::load(2);
+    $this->assertIdentical('Test title rev 3', $node->getTitle());
+    $this->assertIdentical('test rev 3', $node->body->value);
+    $this->assertIdentical('filtered_html', $node->body->format);
+
+    // Test that link fields are migrated.
+    $this->assertIdentical('http://groups.drupal.org/', $node->field_test_link->uri);
+    $this->assertIdentical('Drupal Groups', $node->field_test_link->title);
+    $this->assertIdentical([], $node->field_test_link->options['attributes']);
+
+    // Rerun migration with invalid link attributes and a different URL and
+    // title. If only the attributes are changed the error does not occur.
+    Database::getConnection('default', 'migrate')
+      ->update('content_type_story')
+      ->fields([
+        'field_test_link_url' => 'https://www.drupal.org/node/2127611',
+        'field_test_link_title' => 'Migrate API in Drupal 8',
+        'field_test_link_attributes' => '',
+      ])
+      ->condition('nid', '2')
+      ->condition('vid', '3')
+      ->execute();
+
+    $this->rerunMigration();
+    $node = Node::load(2);
+    $this->assertIdentical('https://www.drupal.org/node/2127611', $node->field_test_link->uri);
+    $this->assertIdentical('Migrate API in Drupal 8', $node->field_test_link->title);
+    $this->assertIdentical([], $node->field_test_link->options['attributes']);
+
+    // Test that we can re-import using the EntityContentBase destination.
+    $title = $this->rerunMigration();
+    $node = Node::load(2);
+    $this->assertIdentical($title, $node->getTitle());
+    // Test multi-column fields are correctly upgraded.
+    $this->assertIdentical('test rev 3', $node->body->value);
+    $this->assertIdentical('full_html', $node->body->format);
+
+    // Now insert a row indicating a failure and set to update later.
+    $title = $this->rerunMigration(array(
+      'sourceid1' => 2,
+      'destid1' => NULL,
+      'source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE,
+    ));
+    $node = Node::load(2);
+    $this->assertIdentical($title, $node->getTitle());
+  }
+
+  /**
+   * Execute the migration a second time.
+   *
+   * @param array $new_row
+   *   An optional row to be inserted into the id map.
+   *
+   * @return string
+   *   The new title in the source for vid 3.
+   */
+  protected function rerunMigration($new_row = []) {
+    $title = $this->randomString();
+    $source_connection = Database::getConnection('default', 'migrate');
+    $source_connection->update('node_revisions')
+      ->fields(array(
+        'title' => $title,
+        'format' => 2,
+      ))
+      ->condition('vid', 3)
+      ->execute();
+    $migration = $this->getMigration('d6_node:story');
+    $table_name = $migration->getIdMap()->mapTableName();
+    $default_connection = \Drupal::database();
+    $default_connection->truncate($table_name)->execute();
+    if ($new_row) {
+      $hash = $migration->getIdMap()->getSourceIDsHash(['nid' => $new_row['sourceid1']]);
+      $new_row['source_ids_hash'] = $hash;
+      $default_connection->insert($table_name)
+        ->fields($new_row)
+        ->execute();
+    }
+    $this->executeMigration($migration);
+    return $title;
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php
new file mode 100644
index 0000000..3567cc2
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTestBase.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTestBase.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Base class for Node migration tests.
+ */
+abstract class MigrateNodeTestBase extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig(['node']);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('system', ['sequences']);
+
+    // Create a new user which needs to have UID 1, because that is expected by
+    // the assertions from
+    // \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest.
+    User::create([
+      'uid' => 1,
+      'name' => $this->randomMachineName(),
+      'status' => 1,
+    ])->enforceIsNew()->save();
+
+    $this->migrateUsers(FALSE);
+    $this->migrateFields();
+    $this->executeMigration('d6_node_settings');
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
new file mode 100644
index 0000000..ddfce03
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTypeTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateNodeTypeTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Upgrade node types to node.type.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['node']);
+    $this->executeMigration('d6_node_type');
+  }
+
+  /**
+   * Tests Drupal 6 node type to Drupal 8 migration.
+   */
+  public function testNodeType() {
+    $id_map = $this->getMigration('d6_node_type')->getIdMap();
+    // Test the test_page content type.
+    $node_type_page = NodeType::load('test_page');
+    $this->assertIdentical('test_page', $node_type_page->id(), 'Node type test_page loaded');
+    $this->assertIdentical(TRUE, $node_type_page->displaySubmitted());
+    $this->assertIdentical(FALSE, $node_type_page->isNewRevision());
+    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_page->getPreviewMode());
+    $this->assertIdentical($id_map->lookupDestinationID(array('test_page')), array('test_page'));
+
+    // Test we have a body field.
+    $field = FieldConfig::loadByName('node', 'test_page', 'body');
+    $this->assertIdentical('This is the body field label', $field->getLabel(), 'Body field was found.');
+
+    // Test the test_story content type.
+    $node_type_story = NodeType::load('test_story');
+    $this->assertIdentical('test_story', $node_type_story->id(), 'Node type test_story loaded');
+
+    $this->assertIdentical(TRUE, $node_type_story->displaySubmitted());
+    $this->assertIdentical(FALSE, $node_type_story->isNewRevision());
+    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_story->getPreviewMode());
+    $this->assertIdentical($id_map->lookupDestinationID(array('test_story')), array('test_story'));
+
+    // Test we don't have a body field.
+    $field = FieldConfig::loadByName('node', 'test_story', 'body');
+    $this->assertIdentical(NULL, $field, 'No body field found');
+
+    // Test the test_event content type.
+    $node_type_event = NodeType::load('test_event');
+    $this->assertIdentical('test_event', $node_type_event->id(), 'Node type test_event loaded');
+
+    $this->assertIdentical(TRUE, $node_type_event->displaySubmitted());
+    $this->assertIdentical(TRUE, $node_type_event->isNewRevision());
+    $this->assertIdentical(DRUPAL_OPTIONAL, $node_type_event->getPreviewMode());
+    $this->assertIdentical($id_map->lookupDestinationID(array('test_event')), array('test_event'));
+
+    // Test we have a body field.
+    $field = FieldConfig::loadByName('node', 'test_event', 'body');
+    $this->assertIdentical('Body', $field->getLabel(), 'Body field was found.');
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
new file mode 100644
index 0000000..1a40e15
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d6\MigrateViewModesTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityViewMode;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate view modes.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateViewModesTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_view_modes');
+  }
+
+  /**
+   * Tests Drupal 6 view modes to Drupal 8 migration.
+   */
+  public function testViewModes() {
+    // Test a new view mode.
+    $view_mode = EntityViewMode::load('node.preview');
+    $this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
+    $this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
+    // Test the ID map.
+    $this->assertIdentical(array('node', 'preview'), $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationID(array(1)));
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
new file mode 100644
index 0000000..10a9f7e
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeSettingsTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to node.settings config object.
+ *
+ * @group node
+ */
+class MigrateNodeSettingsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_node_settings');
+  }
+
+  /**
+   * Tests migration of node variables to node.settings config object.
+   */
+  public function testAggregatorSettings() {
+    $config = $this->config('node.settings');
+    $this->assertEqual(1, $config->get('use_admin_theme'));
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
new file mode 100644
index 0000000..e548fa0
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php
@@ -0,0 +1,152 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
+
+/**
+ * Tests node migration.
+ *
+ * @group node
+ */
+class MigrateNodeTest extends MigrateDrupal7TestBase {
+
+  static $modules = array(
+    'comment',
+    'datetime',
+    'filter',
+    'image',
+    'link',
+    'node',
+    'taxonomy',
+    'telephone',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('file');
+    $this->installConfig(static::$modules);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('system', ['sequences']);
+
+    $this->executeMigrations([
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_comment_type',
+      'd7_field',
+      'd7_field_instance',
+      'd7_node:test_content_type',
+      'd7_node:article',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a node.
+   *
+   * @param string $id
+   *   The node ID.
+   * @param string $type
+   *   The node type.
+   * @param string $langcode
+   *   The expected language code.
+   * @param string $title
+   *   The expected title.
+   * @param int $uid
+   *   The expected author ID.
+   * @param bool $status
+   *   The expected status of the node.
+   * @param int $created
+   *   The expected creation time.
+   * @param int $changed
+   *   The expected modification time.
+   * @param bool $promoted
+   *   Whether the node is expected to be promoted to the front page.
+   * @param bool $sticky
+   *   Whether the node is expected to be sticky.
+   */
+  protected function assertEntity($id, $type, $langcode, $title, $uid, $status, $created, $changed, $promoted, $sticky) {
+    /** @var \Drupal\node\NodeInterface $node */
+    $node = Node::load($id);
+    $this->assertTrue($node instanceof NodeInterface);
+    $this->assertIdentical($type, $node->getType());
+    $this->assertIdentical($langcode, $node->langcode->value);
+    $this->assertIdentical($title, $node->getTitle());
+    $this->assertIdentical($uid, $node->getOwnerId());
+    $this->assertIdentical($status, $node->isPublished());
+    $this->assertIdentical($created, $node->getCreatedTime());
+    if (isset($changed)) {
+      $this->assertIdentical($changed, $node->getChangedTime());
+    }
+    $this->assertIdentical($promoted, $node->isPromoted());
+    $this->assertIdentical($sticky, $node->isSticky());
+  }
+
+  /**
+   * Asserts various aspects of a node revision.
+   *
+   * @param int $id
+   *   The revision ID.
+   * @param string $title
+   *   The expected title.
+   * @param int $uid
+   *   The revision author ID.
+   * @param string $log
+   *   The revision log message.
+   * @param int $timestamp
+   *   The revision's time stamp.
+   */
+  protected function assertRevision($id, $title, $uid, $log, $timestamp) {
+    $revision = \Drupal::entityManager()->getStorage('node')->loadRevision($id);
+    $this->assertTrue($revision instanceof NodeInterface);
+    $this->assertIdentical($title, $revision->getTitle());
+    $this->assertIdentical($uid, $revision->getRevisionAuthor()->id());
+    $this->assertIdentical($log, $revision->revision_log->value);
+    $this->assertIdentical($timestamp, $revision->getRevisionCreationTime());
+  }
+
+  /**
+   * Test node migration from Drupal 7 to 8.
+   */
+  public function testNode() {
+    $this->assertEntity(1, 'test_content_type', 'en', 'A Node', '2', TRUE, '1421727515', '1441032132', TRUE, FALSE);
+    $this->assertRevision(1, 'A Node', '1', NULL, '1441032132');
+
+    $node = Node::load(1);
+    $this->assertTrue($node->field_boolean->value);
+    $this->assertIdentical('99-99-99-99', $node->field_phone->value);
+    // Use assertEqual() here instead, since SQLite interprets floats strictly.
+    $this->assertEqual('1', $node->field_float->value);
+    $this->assertIdentical('5', $node->field_integer->value);
+    $this->assertIdentical('Some more text', $node->field_text_list[0]->value);
+    $this->assertIdentical('7', $node->field_integer_list[0]->value);
+    $this->assertIdentical('qwerty', $node->field_text->value);
+    $this->assertIdentical('2', $node->field_file->target_id);
+    $this->assertIdentical('file desc', $node->field_file->description);
+    $this->assertTrue($node->field_file->display);
+    $this->assertIdentical('1', $node->field_images->target_id);
+    $this->assertIdentical('alt text', $node->field_images->alt);
+    $this->assertIdentical('title text', $node->field_images->title);
+    $this->assertIdentical('93', $node->field_images->width);
+    $this->assertIdentical('93', $node->field_images->height);
+
+    $node = Node::load(2);
+    $this->assertIdentical("...is that it's the absolute best show ever. Trust me, I would know.", $node->body->value);
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
new file mode 100644
index 0000000..ccf2533
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTitleLabelTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\Core\Field\Entity\BaseFieldOverride;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of the title field label for node types.
+ *
+ * @group node
+ */
+class MigrateNodeTitleLabelTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['node', 'text'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->installEntitySchema('node');
+    $this->executeMigrations(['d7_node_type', 'd7_node_title_label']);
+  }
+
+  /**
+   * Asserts various aspects of a base_field_override entity.
+   *
+   * @param string $id
+   *   The override ID.
+   * @param string $label
+   *   The label's expected (overridden) value.
+   */
+  protected function assertEntity($id, $label) {
+    $override = BaseFieldOverride::load($id);
+    $this->assertTrue($override instanceof BaseFieldOverride);
+    /** @var \Drupal\Core\Field\Entity\BaseFieldOverride $override */
+    $this->assertIdentical($label, $override->getLabel());
+  }
+
+  /**
+   * Tests migration of node title field overrides.
+   */
+  public function testMigration() {
+    $this->assertEntity('node.article.title', 'Title');
+    $this->assertEntity('node.blog.title', 'Title');
+    $this->assertEntity('node.book.title', 'Title');
+    $this->assertEntity('node.forum.title', 'Subject');
+    $this->assertEntity('node.page.title', 'Title');
+    $this->assertEntity('node.test_content_type.title', 'Title');
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
new file mode 100644
index 0000000..059b2c9
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTypeTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Migrate\d7\MigrateNodeTypeTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Migrate\d7;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\FieldConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\Entity\NodeType;
+use Drupal\node\NodeTypeInterface;
+
+/**
+ * Upgrade node types to node.type.*.yml.
+ *
+ * @group node
+ */
+class MigrateNodeTypeTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'text', 'filter');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('node'));
+    $this->executeMigration('d7_node_type');
+  }
+
+  /**
+   * Tests a single node type.
+   *
+   * @dataProvider testNodeTypeDataProvider
+   * @param string $id
+   *  The node type ID.
+   * @param string $label
+   *  The expected label.
+   * @param string $description
+   *  The expected node type description.
+   * @param string $help
+   *  The expected help text.
+   */
+  protected function assertEntity($id, $label, $description, $help, $display_submitted, $new_revision, $body_label = NULL) {
+    /** @var \Drupal\node\NodeTypeInterface $entity */
+    $entity = NodeType::load($id);
+    $this->assertTrue($entity instanceof NodeTypeInterface);
+    $this->assertIdentical($label, $entity->label());
+    $this->assertIdentical($description, $entity->getDescription());
+    $this->assertIdentical($help, $entity->getHelp());
+
+    $this->assertIdentical($display_submitted, $entity->displaySubmitted(), 'Submission info is displayed');
+    $this->assertIdentical($new_revision, $entity->isNewRevision(), 'Is a new revision');
+
+    if ($body_label) {
+      /** @var \Drupal\field\FieldConfigInterface $body */
+      $body = FieldConfig::load('node.' . $id . '.body');
+      $this->assertTrue($body instanceof FieldConfigInterface);
+      $this->assertIdentical($body_label, $body->label());
+    }
+  }
+
+  /**
+   * Tests Drupal 7 node type to Drupal 8 migration.
+   */
+  public function testNodeType() {
+    $this->assertEntity('article', 'Article', 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.', 'Help text for articles', TRUE, FALSE, "Body");
+    $this->assertEntity('blog', 'Blog entry', 'Use for multi-user blogs. Every user gets a personal blog.', 'Blog away, good sir!', TRUE, FALSE, 'Body');
+    // book's display_submitted flag is not set, so it will default to TRUE.
+    $this->assertEntity('book', 'Book page', '<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.', '', TRUE, TRUE, "Body");
+    $this->assertEntity('forum', 'Forum topic', 'A <em>forum topic</em> starts a new discussion thread within a forum.', 'No name-calling, no flame wars. Be nice.', TRUE, FALSE, 'Body');
+    $this->assertEntity('page', 'Basic page', "Use <em>basic pages</em> for your static content, such as an 'About us' page.", 'Help text for basic pages', FALSE, FALSE, "Body");
+    // This node type does not carry a body field.
+    $this->assertEntity('test_content_type', 'Test content type', 'This is the description of the test content type.', 'Help text for test content type', FALSE, TRUE);
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php b/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
new file mode 100644
index 0000000..26ac790
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Views\NidArgumentTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Views;
+
+use Drupal\node\Entity\Node;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\views\Views;
+
+/**
+ * Tests the nid argument handler.
+ *
+ * @group node
+ * @see \Drupal\node\Plugin\views\argument\Nid
+ */
+class NidArgumentTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'field', 'text', 'node_test_config', 'user', 'node_test_views'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_nid_argument'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+    $this->installConfig(['node', 'field']);
+
+    ViewTestData::createTestViews(get_class($this), ['node_test_views']);
+  }
+
+  /**
+   * Test the nid argument.
+   */
+  public function testNidArgument() {
+    $view = Views::getView('test_nid_argument');
+    $view->setDisplay();
+
+    $node1 = Node::create([
+      'type' => 'default',
+      'title' => $this->randomMachineName(),
+    ]);
+    $node1->save();
+    $node2 = Node::create([
+      'type' => 'default',
+      'title' => $this->randomMachineName(),
+    ]);
+    $node2->save();
+
+    $view->preview();
+    $this->assertEqual(count($view->result), 2, 'Found the expected number of results.');
+
+    // Set an the second node id as an argument.
+    $view->destroy();
+    $view->preview('default', [$node2->id()]);
+    // Verify that the title is overridden.
+    $this->assertEqual($view->getTitle(), $node2->getTitle());
+    // Verify that the argument filtering works.
+    $this->assertEqual(count($view->result), 1, 'Found the expected number of results.');
+    $this->assertEqual($node2->id(), (string) $view->style_plugin->getField(0, 'nid'), 'Found the correct nid.');
+
+    // Verify that setting a non-existing id as argument results in no nodes
+    // being shown.
+    $view->destroy();
+    $view->preview('default', [22]);
+    $this->assertEqual(count($view->result), 0, 'Found the expected number of results.');
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Views/NodeViewsFieldAccessTest.php b/core/modules/node/tests/src/Kernel/Views/NodeViewsFieldAccessTest.php
new file mode 100644
index 0000000..ea2185f
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Views/NodeViewsFieldAccessTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Views\NodeViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Views;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\user\Entity\User;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the node entity.
+ *
+ * @group Node
+ */
+class NodeViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('node');
+  }
+
+  /**
+   * Check access for node fields.
+   */
+  public function testNodeFields() {
+    $user = User::create([
+      'name' => 'test user',
+    ]);
+    $user->save();
+    NodeType::create([
+      'type' => 'article',
+      'name' => 'Article',
+    ])->save();
+    $node = Node::create([
+      'type' => 'article',
+      'title' => 'Test title',
+      'uid' => $user->id(),
+      'status' => 1,
+      'promote' => 1,
+      'sticky' => 0,
+      'created' => 123456,
+    ]);
+
+    $node->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('node', 'nid', $node->id());
+    $this->assertFieldAccess('node', 'uuid', $node->uuid());
+    $this->assertFieldAccess('node', 'vid', $node->id());
+    $this->assertFieldAccess('node', 'type', $node->type->entity->label());
+    $this->assertFieldAccess('node', 'langcode', $node->language()->getName());
+    $this->assertFieldAccess('node', 'title', 'Test title');
+    $this->assertFieldAccess('node', 'uid', $user->getUsername());
+    // @todo Don't we want to display Published / Unpublished by default,
+    //   see https://www.drupal.org/node/2465623
+    $this->assertFieldAccess('node', 'status', 'On');
+    $this->assertFieldAccess('node', 'promote', 'On');
+    $this->assertFieldAccess('node', 'sticky', 'Off');
+
+    // $this->assertFieldAccess('node', 'created', \Drupal::service('date.formatter')->format(123456));
+    // $this->assertFieldAccess('node', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
+  }
+
+}
diff --git a/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php b/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php
new file mode 100644
index 0000000..44beaac
--- /dev/null
+++ b/core/modules/node/tests/src/Kernel/Views/RevisionCreateTimestampTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\node\Kernel\Views\RevisionCreateTimestampTest.
+ */
+
+namespace Drupal\Tests\node\Kernel\Views;
+
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\views\Views;
+
+/**
+ * Ensures that the revision create time can be accessed in views.
+ *
+ * @group views
+ */
+class RevisionCreateTimestampTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node_test_views', 'node', 'views', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_node_revision_timestamp'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installSchema('node', 'node_access');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+
+    if ($import_test_views) {
+      ViewTestData::createTestViews(get_class($this), ['node_test_views']);
+    }
+  }
+
+  public function testRevisionCreateTimestampView() {
+    $node_type = NodeType::create([
+      'type' => 'article',
+      'label' => 'Article',
+    ]);
+    $node_type->save();
+    $node = Node::create([
+      'title' => 'Test node',
+      'type' => 'article',
+      'revision_timestamp' => 1000,
+    ]);
+    $node->save();
+
+    $node->setRevisionCreationTime(1200);
+    $node->setNewRevision(TRUE);
+    $node->save();
+
+    $node->setRevisionCreationTime(1400);
+    $node->setNewRevision(TRUE);
+    $node->save();
+
+    $view = Views::getView('test_node_revision_timestamp');
+    $this->executeView($view);
+
+    $this->assertIdenticalResultset($view, [
+      ['vid' => 3, 'revision_timestamp' => 1400],
+      ['vid' => 2, 'revision_timestamp' => 1200],
+      ['vid' => 1, 'revision_timestamp' => 1000],
+    ], ['vid' => 'vid', 'revision_timestamp' => 'revision_timestamp']);
+  }
+
+
+}
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
index 870ad91..ff2e25c 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
@@ -104,7 +104,7 @@ public static function simplifyAllowedValues(array $structured_values) {
       // Cast the value to a float first so that .5 and 0.5 are the same value
       // and then cast to a string so that values like 0.5 can be used as array
       // keys.
-      // @see http://php.net/manual/en/language.types.array.php
+      // @see http://php.net/manual/language.types.array.php
       $values[(string) (float) $item['value']] = $item['label'];
     }
     return $values;
diff --git a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
index 0bc99f0..ed1565d 100644
--- a/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
+++ b/core/modules/options/src/Tests/OptionsDynamicValuesTestBase.php
@@ -7,7 +7,10 @@
 
 namespace Drupal\options\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\FieldTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\entity_test\Entity\EntityTestRev;
 
 /**
  * Base class for testing allowed values of options fields.
@@ -39,7 +42,7 @@ protected function setUp() {
     parent::setUp();
 
     $field_name = 'test_options';
-    $this->fieldStorage = entity_create('field_storage_config', [
+    $this->fieldStorage = FieldStorageConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test_rev',
       'type' => 'list_string',
@@ -50,7 +53,7 @@ protected function setUp() {
     ]);
     $this->fieldStorage->save();
 
-    $this->field = entity_create('field_config', [
+    $this->field = FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'entity_test_rev',
       'bundle' => 'entity_test_rev',
@@ -68,7 +71,7 @@ protected function setUp() {
       'user_id' => mt_rand(1, 10),
       'name' => $this->randomMachineName(),
     ];
-    $this->entity = entity_create('entity_test_rev', $values);
+    $this->entity = EntityTestRev::create($values);
     $this->entity->save();
     $this->test = [
       'label' => $this->entity->label(),
diff --git a/core/modules/options/src/Tests/OptionsFieldTest.php b/core/modules/options/src/Tests/OptionsFieldTest.php
deleted file mode 100644
index a7d3ffe..0000000
--- a/core/modules/options/src/Tests/OptionsFieldTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\OptionsFieldTest.
- */
-
-namespace Drupal\options\Tests;
-
-use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
-
-/**
- * Tests for the 'Options' field types.
- *
- * @group options
- */
-class OptionsFieldTest extends OptionsFieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('options');
-
-  /**
-   * Test that allowed values can be updated.
-   */
-  function testUpdateAllowedValues() {
-    // All three options appear.
-    $entity = entity_create('entity_test');
-    $form = \Drupal::service('entity.form_builder')->getForm($entity);
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][1]), 'Option 1 exists');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][3]), 'Option 3 exists');
-
-    // Use one of the values in an actual entity, and check that this value
-    // cannot be removed from the list.
-    $entity = entity_create('entity_test');
-    $entity->{$this->fieldName}->value = 1;
-    $entity->save();
-    $this->fieldStorage->setSetting('allowed_values', [2 => 'Two']);
-    try {
-      $this->fieldStorage->save();
-      $this->fail(t('Cannot update a list field storage to not include keys with existing data.'));
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass(t('Cannot update a list field storage to not include keys with existing data.'));
-    }
-    // Empty the value, so that we can actually remove the option.
-    unset($entity->{$this->fieldName});
-    $entity->save();
-
-    // Removed options do not appear.
-    $this->fieldStorage->setSetting('allowed_values', [2 => 'Two']);
-    $this->fieldStorage->save();
-    $entity = entity_create('entity_test');
-    $form = \Drupal::service('entity.form_builder')->getForm($entity);
-    $this->assertTrue(empty($form[$this->fieldName]['widget'][1]), 'Option 1 does not exist');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
-    $this->assertTrue(empty($form[$this->fieldName]['widget'][3]), 'Option 3 does not exist');
-
-    // Completely new options appear.
-    $this->fieldStorage->setSetting('allowed_values', [10 => 'Update', 20 => 'Twenty']);
-    $this->fieldStorage->save();
-    // The entity holds an outdated field object with the old allowed values
-    // setting, so we need to reinitialize the entity object.
-    $entity = entity_create('entity_test');
-    $form = \Drupal::service('entity.form_builder')->getForm($entity);
-    $this->assertTrue(empty($form[$this->fieldName]['widget'][1]), 'Option 1 does not exist');
-    $this->assertTrue(empty($form[$this->fieldName]['widget'][2]), 'Option 2 does not exist');
-    $this->assertTrue(empty($form[$this->fieldName]['widget'][3]), 'Option 3 does not exist');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][10]), 'Option 10 exists');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][20]), 'Option 20 exists');
-
-    // Options are reset when a new field with the same name is created.
-    $this->fieldStorage->delete();
-    entity_create('field_storage_config', $this->fieldStorageDefinition)->save();
-    entity_create('field_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'required' => TRUE,
-    ))->save();
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, array(
-        'type' => 'options_buttons',
-      ))
-      ->save();
-    $entity = entity_create('entity_test');
-    $form = \Drupal::service('entity.form_builder')->getForm($entity);
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][1]), 'Option 1 exists');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
-    $this->assertTrue(!empty($form[$this->fieldName]['widget'][3]), 'Option 3 exists');
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create('entity_test');
-    $entity->{$this->fieldName}->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-}
diff --git a/core/modules/options/src/Tests/OptionsFieldUITest.php b/core/modules/options/src/Tests/OptionsFieldUITest.php
index d4219c6..360f548 100644
--- a/core/modules/options/src/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/src/Tests/OptionsFieldUITest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\options\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Tests\FieldTestBase;
 
@@ -267,16 +268,16 @@ function testOptionsTrimmedValuesText() {
    */
   protected function createOptionsField($type) {
     // Create a field.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'type' => $type,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $this->fieldName,
       'entity_type' => 'node',
       'bundle' => $this->type,
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', $this->type, 'default')->setComponent($this->fieldName)->save();
 
diff --git a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php
deleted file mode 100644
index fcfe4f8..0000000
--- a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\OptionsFieldUnitTestBase.
- */
-
-
-namespace Drupal\options\Tests;
-
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Base class for Options module integration tests.
- */
-abstract class OptionsFieldUnitTestBase extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('options');
-
-  /**
-   * The field name used in the test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'test_options';
-
-  /**
-   * The field storage definition used to created the field storage.
-   *
-   * @var array
-   */
-  protected $fieldStorageDefinition;
-
-  /**
-   * The list field storage used in the test.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * The list field used in the test.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->fieldStorageDefinition = array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => 'list_integer',
-      'cardinality' => 1,
-      'settings' => array(
-        'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'),
-      ),
-    );
-    $this->fieldStorage = entity_create('field_storage_config', $this->fieldStorageDefinition);
-    $this->fieldStorage->save();
-
-    $this->field = entity_create('field_config', array(
-      'field_storage' => $this->fieldStorage,
-      'bundle' => 'entity_test',
-    ));
-    $this->field->save();
-
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, array(
-        'type' => 'options_buttons',
-      ))
-      ->save();
-  }
-
-}
diff --git a/core/modules/options/src/Tests/OptionsFormattersTest.php b/core/modules/options/src/Tests/OptionsFormattersTest.php
deleted file mode 100644
index 8d97ab4..0000000
--- a/core/modules/options/src/Tests/OptionsFormattersTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\OptionsFormattersTest.
- */
-
-namespace Drupal\options\Tests;
-
-/**
- * Tests the Options field type formatters.
- *
- * @group options
- * @see \Drupal\options\Plugin\Field\FieldFormatter\OptionsDefaultFormatter
- * @see \Drupal\options\Plugin\Field\FieldFormatter\OptionsKeyFormatter
- */
-class OptionsFormattersTest extends OptionsFieldUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * Tests the formatters.
-   */
-  public function testFormatter() {
-    $entity = entity_create('entity_test');
-    $entity->{$this->fieldName}->value = 1;
-
-    $items = $entity->get($this->fieldName);
-
-    $build = $items->view();
-    $this->assertEqual($build['#formatter'], 'list_default', 'Ensure to fall back to the default formatter.');
-    $this->assertEqual($build[0]['#markup'], 'One');
-
-    $build = $items->view(array('type' => 'list_key'));
-    $this->assertEqual($build['#formatter'], 'list_key', 'The chosen formatter is used.');
-    $this->assertEqual((string) $build[0]['#markup'], 1);
-  }
-
-}
diff --git a/core/modules/options/src/Tests/OptionsWidgetsTest.php b/core/modules/options/src/Tests/OptionsWidgetsTest.php
index 93293ca..58b666d 100644
--- a/core/modules/options/src/Tests/OptionsWidgetsTest.php
+++ b/core/modules/options/src/Tests/OptionsWidgetsTest.php
@@ -7,7 +7,10 @@
 
 namespace Drupal\options\Tests;
 
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\FieldTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the Options widgets.
@@ -42,7 +45,7 @@ protected function setUp() {
     parent::setUp();
 
     // Field storage with cardinality 1.
-    $this->card1 = entity_create('field_storage_config', [
+    $this->card1 = FieldStorageConfig::create([
       'field_name' => 'card_1',
       'entity_type' => 'entity_test',
       'type' => 'list_integer',
@@ -62,7 +65,7 @@ protected function setUp() {
     $this->card1->save();
 
     // Field storage with cardinality 2.
-    $this->card2 = entity_create('field_storage_config', [
+    $this->card2 = FieldStorageConfig::create([
       'field_name' => 'card_2',
       'entity_type' => 'entity_test',
       'type' => 'list_integer',
@@ -88,7 +91,7 @@ protected function setUp() {
    */
   function testRadioButtons() {
     // Create an instance of the 'single value' field.
-    $field = entity_create('field_config', [
+    $field = FieldConfig::create([
       'field_storage' => $this->card1,
       'bundle' => 'entity_test',
     ]);
@@ -100,7 +103,7 @@ function testRadioButtons() {
       ->save();
 
     // Create an entity.
-    $entity = entity_create('entity_test', [
+    $entity = EntityTest::create([
       'user_id' => 1,
       'name' => $this->randomMachineName(),
     ]);
@@ -145,10 +148,10 @@ function testRadioButtons() {
    */
   function testCheckBoxes() {
     // Create an instance of the 'multiple values' field.
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $this->card2,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($this->card2->getName(), array(
@@ -157,7 +160,7 @@ function testCheckBoxes() {
       ->save();
 
     // Create an entity.
-    $entity = entity_create('entity_test', array(
+    $entity = EntityTest::create(array(
       'user_id' => 1,
       'name' => $this->randomMachineName(),
     ));
@@ -234,11 +237,11 @@ function testCheckBoxes() {
    */
   function testSelectListSingle() {
     // Create an instance of the 'single value' field.
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $this->card1,
       'bundle' => 'entity_test',
       'required' => TRUE,
-    ));
+    ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($this->card1->getName(), array(
@@ -247,7 +250,7 @@ function testSelectListSingle() {
       ->save();
 
     // Create an entity.
-    $entity = entity_create('entity_test', array(
+    $entity = EntityTest::create(array(
       'user_id' => 1,
       'name' => $this->randomMachineName(),
     ));
@@ -334,10 +337,10 @@ function testSelectListSingle() {
    */
   function testSelectListMultiple() {
     // Create an instance of the 'multiple values' field.
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $this->card2,
       'bundle' => 'entity_test',
-    ));
+    ]);
     $field->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($this->card2->getName(), array(
@@ -346,7 +349,7 @@ function testSelectListMultiple() {
       ->save();
 
     // Create an entity.
-    $entity = entity_create('entity_test', array(
+    $entity = EntityTest::create(array(
       'user_id' => 1,
       'name' => $this->randomMachineName(),
     ));
@@ -455,7 +458,7 @@ function testSelectListMultiple() {
    */
   function testEmptyValue() {
     // Create an instance of the 'single value' field.
-    $field = entity_create('field_config', [
+    $field = FieldConfig::create([
       'field_storage' => $this->card1,
       'bundle' => 'entity_test',
     ]);
@@ -469,7 +472,7 @@ function testEmptyValue() {
       ->save();
 
     // Create an entity.
-    $entity = entity_create('entity_test', [
+    $entity = EntityTest::create([
       'user_id' => 1,
       'name' => $this->randomMachineName(),
     ]);
diff --git a/core/modules/options/src/Tests/Views/OptionsListArgumentTest.php b/core/modules/options/src/Tests/Views/OptionsListArgumentTest.php
deleted file mode 100644
index 198ebd1..0000000
--- a/core/modules/options/src/Tests/Views/OptionsListArgumentTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\Views\OptionsListArgumentTest.
- */
-
-namespace Drupal\options\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests options list argument for views.
- *
- * @see \Drupal\options\Plugin\views\argument\NumberListField.
- * @group views
- */
-class OptionsListArgumentTest extends OptionsTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_options_list_argument_numeric', 'test_options_list_argument_string'];
-
-  /**
-   * Tests the options field argument.
-   */
-  public function testViewsTestOptionsListArgument() {
-    $view = Views::getView('test_options_list_argument_numeric');
-    $this->executeView($view, [1]);
-
-    $resultset = [
-      ['nid' => $this->nodes[0]->nid->value],
-      ['nid' => $this->nodes[1]->nid->value],
-    ];
-
-    $column_map = ['nid' => 'nid'];
-    $this->assertIdenticalResultset($view, $resultset, $column_map);
-
-    $view = Views::getView('test_options_list_argument_string');
-    $this->executeView($view, ['man', 'woman']);
-
-    $resultset = [
-      ['nid' => $this->nodes[0]->nid->value],
-      ['nid' => $this->nodes[1]->nid->value],
-    ];
-
-    $column_map = ['nid' => 'nid'];
-    $this->assertIdenticalResultset($view, $resultset, $column_map);
-  }
-
-}
diff --git a/core/modules/options/src/Tests/Views/OptionsListFilterTest.php b/core/modules/options/src/Tests/Views/OptionsListFilterTest.php
deleted file mode 100644
index 164bf15..0000000
--- a/core/modules/options/src/Tests/Views/OptionsListFilterTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\Views\OptionsListFilterTest.
- */
-
-namespace Drupal\options\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests options list filter for views.
- *
- * @see \Drupal\field\Plugin\views\filter\ListField.
- * @group views
- */
-class OptionsListFilterTest extends OptionsTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_options_list_filter'];
-
-  /**
-   * Tests options list field filter.
-   */
-  public function testViewsTestOptionsListFilter() {
-    $view = Views::getView('test_options_list_filter');
-    $this->executeView($view);
-
-    $resultset = [
-      ['nid' => $this->nodes[0]->nid->value],
-      ['nid' => $this->nodes[1]->nid->value],
-    ];
-
-    $column_map = ['nid' => 'nid'];
-    $this->assertIdenticalResultset($view, $resultset, $column_map);
-  }
-
-}
diff --git a/core/modules/options/src/Tests/Views/OptionsTestBase.php b/core/modules/options/src/Tests/Views/OptionsTestBase.php
deleted file mode 100644
index 972c00b..0000000
--- a/core/modules/options/src/Tests/Views/OptionsTestBase.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\Views\OptionsTestBase.
- */
-
-namespace Drupal\options\Tests\Views;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Base class for options views tests.
- */
-abstract class OptionsTestBase extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['options', 'options_test_views', 'node', 'user', 'field'];
-
-  /**
-   * Stores the nodes used for the different tests.
-   *
-   * @var array
-   */
-  protected $nodes = [];
-
-  /**
-   * Stores the field values used for the different tests.
-   *
-   * @var array
-   */
-  protected $fieldValues = [];
-
-  /**
-   * The used field names.
-   *
-   * @var string[]
-   */
-  protected $fieldNames;
-
-  protected function setUp() {
-    parent::setUp();
-    $this->mockStandardInstall();
-
-    ViewTestData::createTestViews(get_class($this), ['options_test_views']);
-
-    $settings = [];
-    $settings['type'] = 'article';
-    $settings['title'] = $this->randomString();
-    $settings['field_test_list_string'][]['value'] = $this->fieldValues[0];
-    $settings['field_test_list_integer'][]['value'] = 0;
-
-    $node = Node::create($settings);
-    $node->save();
-
-    $this->nodes[] = $node;
-    $node = $node->createDuplicate();
-    $node->save();
-    $this->nodes[] = $node;
-  }
-
-  /**
-   * Provides a workaround for the inability to use the standard profile.
-   *
-   * @see https://www.drupal.org/node/1708692
-   */
-  protected function mockStandardInstall() {
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-
-    NodeType::create(
-      ['type' => 'article']
-    )->save();
-    $this->fieldValues = [
-      $this->randomMachineName(),
-      $this->randomMachineName(),
-    ];
-
-    $this->fieldNames = ['field_test_list_string', 'field_test_list_integer'];
-
-    // Create two field entities.
-    FieldStorageConfig::create([
-      'field_name' => $this->fieldNames[0],
-      'entity_type' => 'node',
-      'type' => 'list_string',
-      'cardinality' => 1,
-      'settings' => [
-        'allowed_values' => [
-          $this->fieldValues[0] => $this->fieldValues[0],
-          $this->fieldValues[1] => $this->fieldValues[1],
-        ],
-      ],
-    ])->save();
-    FieldStorageConfig::create([
-      'field_name' => $this->fieldNames[1],
-      'entity_type' => 'node',
-      'type' => 'list_integer',
-      'cardinality' => 1,
-      'settings' => [
-        'allowed_values' => [
-          $this->fieldValues[0],
-          $this->fieldValues[1],
-        ],
-      ],
-    ])->save();
-    foreach ($this->fieldNames as $field_name) {
-      FieldConfig::create([
-        'field_name' => $field_name,
-        'entity_type' => 'node',
-        'label' => 'Test options list field',
-        'bundle' => 'article',
-      ])->save();
-    }
-  }
-
-}
diff --git a/core/modules/options/src/Tests/Views/ViewsDataTest.php b/core/modules/options/src/Tests/Views/ViewsDataTest.php
deleted file mode 100644
index f743f4c..0000000
--- a/core/modules/options/src/Tests/Views/ViewsDataTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\options\Tests\Views\ViewsDataTest.
- */
-
-namespace Drupal\options\Tests\Views;
-
-/**
- * Test to ensure views data is properly created for the Options module.
- *
- * @group views
- */
-class ViewsDataTest extends OptionsTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['options', 'options_test', 'entity_test', 'views'];
-
-  /**
-   * The field storage.
-   *
-   * @var \Drupal\Core\Field\FieldStorageDefinitionInterface
-   */
-  protected $fieldStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $field_name = 'test_options';
-    $this->fieldStorage = entity_create('field_storage_config', [
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'list_string',
-      'cardinality' => 1,
-      'settings' => [
-        'allowed_values_function' => 'options_test_dynamic_values_callback',
-      ],
-    ]);
-    $this->fieldStorage->save();
-
-    $this->field = entity_create('field_config', [
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'required' => TRUE,
-    ])->save();
-  }
-
-  /**
-   * Tests the option module's implementation of hook_field_views_data().
-   */
-  public function testOptionsFieldViewsData() {
-    $field_data = \Drupal::service('views.views_data')->get('entity_test__test_options');
-
-    // Check that the options module has properly overridden default views data.
-    $test_options_field = $field_data['test_options_value'];
-    $this->assertEqual($test_options_field['argument']['id'], 'string_list_field', 'Argument handler is properly set for fields with allowed value callbacks.');
-    $this->assertEqual($test_options_field['filter']['id'], 'list_field', 'Filter handler is properly set for fields with allowed value callbacks.');
-  }
-
-}
diff --git a/core/modules/options/tests/src/Kernel/OptionsFieldTest.php b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
new file mode 100644
index 0000000..c1c04fe
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\OptionsFieldTest.
+ */
+
+namespace Drupal\Tests\options\Kernel;
+
+use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests for the 'Options' field types.
+ *
+ * @group options
+ */
+class OptionsFieldTest extends OptionsFieldUnitTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('options');
+
+  /**
+   * Test that allowed values can be updated.
+   */
+  function testUpdateAllowedValues() {
+    // All three options appear.
+    $entity = EntityTest::create();
+    $form = \Drupal::service('entity.form_builder')->getForm($entity);
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][1]), 'Option 1 exists');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][3]), 'Option 3 exists');
+
+    // Use one of the values in an actual entity, and check that this value
+    // cannot be removed from the list.
+    $entity = EntityTest::create();
+    $entity->{$this->fieldName}->value = 1;
+    $entity->save();
+    $this->fieldStorage->setSetting('allowed_values', [2 => 'Two']);
+    try {
+      $this->fieldStorage->save();
+      $this->fail(t('Cannot update a list field storage to not include keys with existing data.'));
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass(t('Cannot update a list field storage to not include keys with existing data.'));
+    }
+    // Empty the value, so that we can actually remove the option.
+    unset($entity->{$this->fieldName});
+    $entity->save();
+
+    // Removed options do not appear.
+    $this->fieldStorage->setSetting('allowed_values', [2 => 'Two']);
+    $this->fieldStorage->save();
+    $entity = EntityTest::create();
+    $form = \Drupal::service('entity.form_builder')->getForm($entity);
+    $this->assertTrue(empty($form[$this->fieldName]['widget'][1]), 'Option 1 does not exist');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
+    $this->assertTrue(empty($form[$this->fieldName]['widget'][3]), 'Option 3 does not exist');
+
+    // Completely new options appear.
+    $this->fieldStorage->setSetting('allowed_values', [10 => 'Update', 20 => 'Twenty']);
+    $this->fieldStorage->save();
+    // The entity holds an outdated field object with the old allowed values
+    // setting, so we need to reinitialize the entity object.
+    $entity = EntityTest::create();
+    $form = \Drupal::service('entity.form_builder')->getForm($entity);
+    $this->assertTrue(empty($form[$this->fieldName]['widget'][1]), 'Option 1 does not exist');
+    $this->assertTrue(empty($form[$this->fieldName]['widget'][2]), 'Option 2 does not exist');
+    $this->assertTrue(empty($form[$this->fieldName]['widget'][3]), 'Option 3 does not exist');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][10]), 'Option 10 exists');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][20]), 'Option 20 exists');
+
+    // Options are reset when a new field with the same name is created.
+    $this->fieldStorage->delete();
+    FieldStorageConfig::create($this->fieldStorageDefinition)->save();
+    FieldConfig::create([
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'required' => TRUE,
+    ])->save();
+    entity_get_form_display('entity_test', 'entity_test', 'default')
+      ->setComponent($this->fieldName, array(
+        'type' => 'options_buttons',
+      ))
+      ->save();
+    $entity = EntityTest::create();
+    $form = \Drupal::service('entity.form_builder')->getForm($entity);
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][1]), 'Option 1 exists');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][2]), 'Option 2 exists');
+    $this->assertTrue(!empty($form[$this->fieldName]['widget'][3]), 'Option 3 exists');
+
+    // Test the generateSampleValue() method.
+    $entity = EntityTest::create();
+    $entity->{$this->fieldName}->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+}
diff --git a/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php b/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php
new file mode 100644
index 0000000..33eab18
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\OptionsFieldUnitTestBase.
+ */
+
+namespace Drupal\Tests\options\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Base class for Options module integration tests.
+ */
+abstract class OptionsFieldUnitTestBase extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('options');
+
+  /**
+   * The field name used in the test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'test_options';
+
+  /**
+   * The field storage definition used to created the field storage.
+   *
+   * @var array
+   */
+  protected $fieldStorageDefinition;
+
+  /**
+   * The list field storage used in the test.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The list field used in the test.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->fieldStorageDefinition = array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => 'list_integer',
+      'cardinality' => 1,
+      'settings' => array(
+        'allowed_values' => array(1 => 'One', 2 => 'Two', 3 => 'Three'),
+      ),
+    );
+    $this->fieldStorage = FieldStorageConfig::create($this->fieldStorageDefinition);
+    $this->fieldStorage->save();
+
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'entity_test',
+    ]);
+    $this->field->save();
+
+    entity_get_form_display('entity_test', 'entity_test', 'default')
+      ->setComponent($this->fieldName, array(
+        'type' => 'options_buttons',
+      ))
+      ->save();
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php b/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php
new file mode 100644
index 0000000..53eb36d
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\OptionsFormattersTest.
+ */
+
+namespace Drupal\Tests\options\Kernel;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests the Options field type formatters.
+ *
+ * @group options
+ * @see \Drupal\options\Plugin\Field\FieldFormatter\OptionsDefaultFormatter
+ * @see \Drupal\options\Plugin\Field\FieldFormatter\OptionsKeyFormatter
+ */
+class OptionsFormattersTest extends OptionsFieldUnitTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * Tests the formatters.
+   */
+  public function testFormatter() {
+    $entity = EntityTest::create();
+    $entity->{$this->fieldName}->value = 1;
+
+    $items = $entity->get($this->fieldName);
+
+    $build = $items->view();
+    $this->assertEqual($build['#formatter'], 'list_default', 'Ensure to fall back to the default formatter.');
+    $this->assertEqual($build[0]['#markup'], 'One');
+
+    $build = $items->view(array('type' => 'list_key'));
+    $this->assertEqual($build['#formatter'], 'list_key', 'The chosen formatter is used.');
+    $this->assertEqual((string) $build[0]['#markup'], 1);
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php b/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php
new file mode 100644
index 0000000..3d25b8f
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/Views/FileViewsDataTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\Views\FileViewsDataTest.
+ */
+
+namespace Drupal\Tests\options\Kernel\Views;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests file views data.
+ *
+ * @group file
+ */
+class FileViewsDataTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('file', 'views', 'entity_test', 'user', 'field');
+
+  /**
+   * Tests views data generated for file field relationship.
+   *
+   * @see file_field_views_data()
+   * @see file_field_views_data_views_data_alter()
+   */
+  public function testRelationshipViewsData() {
+    // Create file field to entity_test.
+    FieldStorageConfig::create(array(
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_base_file',
+      'type' => 'file',
+    ))->save();
+    FieldConfig::create(array(
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_base_file',
+      'bundle' => 'entity_test',
+    ))->save();
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test__field_base_file');
+    $relationship = $views_data['field_base_file_target_id']['relationship'];
+    $this->assertEqual($relationship['id'], 'standard');
+    $this->assertEqual($relationship['base'], 'file_managed');
+    $this->assertEqual($relationship['base field'], 'fid');
+    $this->assertEqual($relationship['entity type'], 'file');
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('file_managed');
+    $relationship = $views_data['reverse_field_base_file_entity_test']['relationship'];
+    $this->assertEqual($relationship['id'], 'entity_reverse');
+    $this->assertEqual($relationship['base'], 'entity_test');
+    $this->assertEqual($relationship['base field'], 'id');
+    $this->assertEqual($relationship['field table'], 'entity_test__field_base_file');
+    $this->assertEqual($relationship['field field'], 'field_base_file_target_id');
+    $this->assertEqual($relationship['field_name'], 'field_base_file');
+    $this->assertEqual($relationship['entity_type'], 'entity_test');
+    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+
+    // Create file field to entity_test_mul.
+    FieldStorageConfig::create(array(
+      'entity_type' => 'entity_test_mul',
+      'field_name' => 'field_data_file',
+      'type' => 'file',
+    ))->save();
+    FieldConfig::create(array(
+      'entity_type' => 'entity_test_mul',
+      'field_name' => 'field_data_file',
+      'bundle' => 'entity_test_mul',
+    ))->save();
+    // Check the generated views data.
+    $views_data = Views::viewsData()->get('entity_test_mul__field_data_file');
+    $relationship = $views_data['field_data_file_target_id']['relationship'];
+    $this->assertEqual($relationship['id'], 'standard');
+    $this->assertEqual($relationship['base'], 'file_managed');
+    $this->assertEqual($relationship['base field'], 'fid');
+    $this->assertEqual($relationship['entity type'], 'file');
+    // Check the backwards reference.
+    $views_data = Views::viewsData()->get('file_managed');
+    $relationship = $views_data['reverse_field_data_file_entity_test_mul']['relationship'];
+    $this->assertEqual($relationship['id'], 'entity_reverse');
+    $this->assertEqual($relationship['base'], 'entity_test_mul_property_data');
+    $this->assertEqual($relationship['base field'], 'id');
+    $this->assertEqual($relationship['field table'], 'entity_test_mul__field_data_file');
+    $this->assertEqual($relationship['field field'], 'field_data_file_target_id');
+    $this->assertEqual($relationship['field_name'], 'field_data_file');
+    $this->assertEqual($relationship['entity_type'], 'entity_test_mul');
+    $this->assertEqual($relationship['join_extra'][0], ['field' => 'deleted', 'value' => 0, 'numeric' => TRUE]);
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/Views/OptionsListArgumentTest.php b/core/modules/options/tests/src/Kernel/Views/OptionsListArgumentTest.php
new file mode 100644
index 0000000..15302ad
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/Views/OptionsListArgumentTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\Views\OptionsListArgumentTest.
+ */
+
+namespace Drupal\Tests\options\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests options list argument for views.
+ *
+ * @see \Drupal\options\Plugin\views\argument\NumberListField.
+ * @group views
+ */
+class OptionsListArgumentTest extends OptionsTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_options_list_argument_numeric', 'test_options_list_argument_string'];
+
+  /**
+   * Tests the options field argument.
+   */
+  public function testViewsTestOptionsListArgument() {
+    $view = Views::getView('test_options_list_argument_numeric');
+    $this->executeView($view, [1]);
+
+    $resultset = [
+      ['nid' => $this->nodes[0]->nid->value],
+      ['nid' => $this->nodes[1]->nid->value],
+    ];
+
+    $column_map = ['nid' => 'nid'];
+    $this->assertIdenticalResultset($view, $resultset, $column_map);
+
+    $view = Views::getView('test_options_list_argument_string');
+    $this->executeView($view, ['man', 'woman']);
+
+    $resultset = [
+      ['nid' => $this->nodes[0]->nid->value],
+      ['nid' => $this->nodes[1]->nid->value],
+    ];
+
+    $column_map = ['nid' => 'nid'];
+    $this->assertIdenticalResultset($view, $resultset, $column_map);
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php b/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php
new file mode 100644
index 0000000..afd4b2d
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/Views/OptionsListFilterTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\Views\OptionsListFilterTest.
+ */
+
+namespace Drupal\Tests\options\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests options list filter for views.
+ *
+ * @see \Drupal\field\Plugin\views\filter\ListField.
+ * @group views
+ */
+class OptionsListFilterTest extends OptionsTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_options_list_filter'];
+
+  /**
+   * Tests options list field filter.
+   */
+  public function testViewsTestOptionsListFilter() {
+    $view = Views::getView('test_options_list_filter');
+    $this->executeView($view);
+
+    $resultset = [
+      ['nid' => $this->nodes[0]->nid->value],
+      ['nid' => $this->nodes[1]->nid->value],
+    ];
+
+    $column_map = ['nid' => 'nid'];
+    $this->assertIdenticalResultset($view, $resultset, $column_map);
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php b/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
new file mode 100644
index 0000000..419dd6e
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\Views\OptionsTestBase.
+ */
+
+namespace Drupal\Tests\options\Kernel\Views;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Base class for options views tests.
+ */
+abstract class OptionsTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['options', 'options_test_views', 'node', 'user', 'field'];
+
+  /**
+   * Stores the nodes used for the different tests.
+   *
+   * @var array
+   */
+  protected $nodes = [];
+
+  /**
+   * Stores the field values used for the different tests.
+   *
+   * @var array
+   */
+  protected $fieldValues = [];
+
+  /**
+   * The used field names.
+   *
+   * @var string[]
+   */
+  protected $fieldNames;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+    $this->mockStandardInstall();
+
+    ViewTestData::createTestViews(get_class($this), ['options_test_views']);
+
+    $settings = [];
+    $settings['type'] = 'article';
+    $settings['title'] = $this->randomString();
+    $settings['field_test_list_string'][]['value'] = $this->fieldValues[0];
+    $settings['field_test_list_integer'][]['value'] = 0;
+
+    $node = Node::create($settings);
+    $node->save();
+
+    $this->nodes[] = $node;
+    $node = $node->createDuplicate();
+    $node->save();
+    $this->nodes[] = $node;
+  }
+
+  /**
+   * Provides a workaround for the inability to use the standard profile.
+   *
+   * @see https://www.drupal.org/node/1708692
+   */
+  protected function mockStandardInstall() {
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+
+    NodeType::create(
+      ['type' => 'article']
+    )->save();
+    $this->fieldValues = [
+      $this->randomMachineName(),
+      $this->randomMachineName(),
+    ];
+
+    $this->fieldNames = ['field_test_list_string', 'field_test_list_integer'];
+
+    // Create two field entities.
+    FieldStorageConfig::create([
+      'field_name' => $this->fieldNames[0],
+      'entity_type' => 'node',
+      'type' => 'list_string',
+      'cardinality' => 1,
+      'settings' => [
+        'allowed_values' => [
+          $this->fieldValues[0] => $this->fieldValues[0],
+          $this->fieldValues[1] => $this->fieldValues[1],
+        ],
+      ],
+    ])->save();
+    FieldStorageConfig::create([
+      'field_name' => $this->fieldNames[1],
+      'entity_type' => 'node',
+      'type' => 'list_integer',
+      'cardinality' => 1,
+      'settings' => [
+        'allowed_values' => [
+          $this->fieldValues[0],
+          $this->fieldValues[1],
+        ],
+      ],
+    ])->save();
+    foreach ($this->fieldNames as $field_name) {
+      FieldConfig::create([
+        'field_name' => $field_name,
+        'entity_type' => 'node',
+        'label' => 'Test options list field',
+        'bundle' => 'article',
+      ])->save();
+    }
+  }
+
+}
diff --git a/core/modules/options/tests/src/Kernel/Views/ViewsDataTest.php b/core/modules/options/tests/src/Kernel/Views/ViewsDataTest.php
new file mode 100644
index 0000000..dcfaba7
--- /dev/null
+++ b/core/modules/options/tests/src/Kernel/Views/ViewsDataTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\options\Kernel\Views\ViewsDataTest.
+ */
+
+namespace Drupal\Tests\options\Kernel\Views;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Test to ensure views data is properly created for the Options module.
+ *
+ * @group views
+ */
+class ViewsDataTest extends OptionsTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['options', 'options_test', 'entity_test', 'views'];
+
+  /**
+   * The field storage.
+   *
+   * @var \Drupal\Core\Field\FieldStorageDefinitionInterface
+   */
+  protected $fieldStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $field_name = 'test_options';
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'list_string',
+      'cardinality' => 1,
+      'settings' => [
+        'allowed_values_function' => 'options_test_dynamic_values_callback',
+      ],
+    ]);
+    $this->fieldStorage->save();
+
+    $this->field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'required' => TRUE,
+    ])->save();
+  }
+
+  /**
+   * Tests the option module's implementation of hook_field_views_data().
+   */
+  public function testOptionsFieldViewsData() {
+    $field_data = \Drupal::service('views.views_data')->get('entity_test__test_options');
+
+    // Check that the options module has properly overridden default views data.
+    $test_options_field = $field_data['test_options_value'];
+    $this->assertEqual($test_options_field['argument']['id'], 'string_list_field', 'Argument handler is properly set for fields with allowed value callbacks.');
+    $this->assertEqual($test_options_field['filter']['id'], 'list_field', 'Filter handler is properly set for fields with allowed value callbacks.');
+  }
+
+}
diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index ab1c8f2..039772d 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\page_cache\Tests;
 
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\simpletest\WebTestBase;
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
@@ -77,7 +78,8 @@ function testPageCacheTags() {
       'user',
       // The placed block is only visible on certain URLs through a visibility
       // condition.
-      'url',
+      'url.path',
+      'url.query_args:' . MainContentViewSubscriber::WRAPPER_FORMAT,
     ];
 
     // Full node page 1.
diff --git a/core/modules/page_cache/src/Tests/PageCacheTest.php b/core/modules/page_cache/src/Tests/PageCacheTest.php
index 0183b31..42fbec5 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTest.php
@@ -263,7 +263,7 @@ function testPageCache() {
     $this->drupalGet('system-test/set-header', array('query' => array('name' => 'Foo', 'value' => 'bar')));
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Caching was bypassed.');
     $this->assertTrue(strpos(strtolower($this->drupalGetHeader('Vary')), 'cookie') === FALSE, 'Vary: Cookie header was not sent.');
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', 'Cache-Control header was sent.');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent.');
     $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.');
     $this->assertEqual($this->drupalGetHeader('Foo'), 'bar', 'Custom header was sent.');
 
@@ -452,12 +452,12 @@ public function testCacheableResponseResponses() {
     // GET a URL, which would be marked as a cache miss if it were cacheable.
     $this->drupalGet('/system-test/respond-reponse');
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Drupal page cache header not found.');
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', 'Cache-Control header was sent');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent');
 
     // GET it again, verify it's still not cached.
     $this->drupalGet('/system-test/respond-reponse');
     $this->assertFalse($this->drupalGetHeader('X-Drupal-Cache'), 'Drupal page cache header not found.');
-    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, post-check=0, pre-check=0, private', 'Cache-Control header was sent');
+    $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'must-revalidate, no-cache, private', 'Cache-Control header was sent');
 
     // GET a URL, which would be marked as a cache miss if it were cacheable.
     $this->drupalGet('/system-test/respond-public-response');
diff --git a/core/modules/path/path.js b/core/modules/path/path.js
index 4cca889..dfa2c05 100644
--- a/core/modules/path/path.js
+++ b/core/modules/path/path.js
@@ -2,7 +2,7 @@
  * @file
  * Attaches behaviors for the Path module.
  */
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -26,4 +26,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 24309b7..06efa7b 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -7,7 +7,6 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\FieldDefinition;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
diff --git a/core/modules/path/src/Form/EditForm.php b/core/modules/path/src/Form/EditForm.php
index a1f4a77..2f9739e 100644
--- a/core/modules/path/src/Form/EditForm.php
+++ b/core/modules/path/src/Form/EditForm.php
@@ -40,28 +40,25 @@ public function buildForm(array $form, FormStateInterface $form_state, $pid = NU
       '#type' => 'hidden',
       '#value' => $this->path['pid'],
     );
-    $form['actions']['delete'] = array(
-      '#type' => 'submit',
-      '#value' => $this->t('Delete'),
-      '#submit' => array('::deleteSubmit'),
-    );
-    return $form;
-  }
 
-  /**
-   * Submits the delete form.
-   */
-  public function deleteSubmit(array &$form, FormStateInterface $form_state) {
     $url = new Url('path.delete', array(
-      'pid' => $form_state->getValue('pid'),
+      'pid' => $this->path['pid'],
     ));
 
     if ($this->getRequest()->query->has('destination')) {
       $url->setOption('query', $this->getDestinationArray());
-      $this->getRequest()->query->remove('destination');
     }
 
-    $form_state->setRedirectUrl($url);
+    $form['actions']['delete'] = array(
+      '#type' => 'link',
+      '#title' => $this->t('Delete'),
+      '#url' => $url,
+      '#attributes' => array(
+        'class' => array('button', 'button--danger'),
+      ),
+    );
+
+    return $form;
   }
 
 }
diff --git a/core/modules/path/src/Form/PathFormBase.php b/core/modules/path/src/Form/PathFormBase.php
index 95d261a..80b99cb 100644
--- a/core/modules/path/src/Form/PathFormBase.php
+++ b/core/modules/path/src/Form/PathFormBase.php
@@ -116,7 +116,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $pid = NU
       '#default_value' => $this->path['alias'],
       '#maxlength' => 255,
       '#size' => 45,
-      '#description' => $this->t('Specify an alternative path by which this data can be accessed. For example, type "/about" when writing an about page. Use a relative path with a slash in front..'),
+      '#description' => $this->t('Specify an alternative path by which this data can be accessed. For example, type "/about" when writing an about page. Use a relative path with a slash in front.'),
       '#field_prefix' => $this->requestContext->getCompleteBaseUrl(),
       '#required' => TRUE,
     );
@@ -151,6 +151,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $pid = NU
     $form['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => $this->t('Save'),
+      '#button_type' => 'primary',
     );
 
     return $form;
diff --git a/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
index 20b2c31..c617c55 100644
--- a/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
+++ b/core/modules/path/src/Plugin/migrate/destination/UrlAlias.php
@@ -8,7 +8,7 @@
 namespace Drupal\path\Plugin\migrate\destination;
 
 use Drupal\Core\Path\AliasStorage;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -37,7 +37,7 @@ class UrlAlias extends DestinationBase implements ContainerFactoryPluginInterfac
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param \Drupal\Core\Path\AliasStorage $alias_storage
    *   The alias storage service.
@@ -90,8 +90,8 @@ public function fields(MigrationInterface $migration = NULL) {
     return [
       'pid' => 'The path id',
       'source' => 'The source path.',
-      'alias' => 'The url alias.',
-      'langcode' => 'The language code for the url.',
+      'alias' => 'The URL alias.',
+      'langcode' => 'The language code for the URL.',
     ];
   }
 
diff --git a/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php b/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
index a45f404..c77b41c 100644
--- a/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
+++ b/core/modules/path/src/Plugin/migrate/source/UrlAliasBase.php
@@ -27,7 +27,7 @@ public function query() {
   public function fields() {
     return array(
       'pid' => $this->t('The numeric identifier of the path alias.'),
-      'language' => $this->t('The language code of the url alias.'),
+      'language' => $this->t('The language code of the URL alias.'),
     );
   }
 
diff --git a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
deleted file mode 100644
index a37cb65..0000000
--- a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\path\Tests\Migrate\d6\MigrateUrlAliasTest.
- */
-
-namespace Drupal\path\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * URL alias migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('path');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['url_alias']);
-    $this->executeMigration('d6_url_alias');
-  }
-
-  /**
-   * Assert a path.
-   *
-   * @param string pid
-   *   The path id.
-   * @param array $conditions
-   *   The path conditions.
-   * @param array $path
-   *   The path.
-   */
-  private function assertPath($pid, $conditions, $path) {
-    $this->assertTrue($path, "Path alias for " . $conditions['source'] . " successfully loaded.");
-    $this->assertIdentical($conditions['alias'], $path['alias']);
-    $this->assertIdentical($conditions['langcode'], $path['langcode']);
-    $this->assertIdentical($conditions['source'], $path['source']);
-  }
-
-  /**
-   * Test the url alias migration.
-   */
-  public function testUrlAlias() {
-    $id_map = Migration::load('d6_url_alias')->getIdMap();
-    $conditions = array(
-      'source' => '/node/1',
-      'alias' => '/alias-one',
-      'langcode' => 'af',
-    );
-    $path = \Drupal::service('path.alias_storage')->load($conditions);
-    $this->assertPath('1', $conditions, $path);
-    $this->assertIdentical($id_map->lookupDestinationID(array($path['pid'])), array('1'), "Test IdMap");
-
-    $conditions = array(
-      'source' => '/node/2',
-      'alias' => '/alias-two',
-      'langcode' => 'en',
-    );
-    $path = \Drupal::service('path.alias_storage')->load($conditions);
-    $this->assertPath('2', $conditions, $path);
-
-    // Test that we can re-import using the UrlAlias destination.
-    Database::getConnection('default', 'migrate')
-      ->update('url_alias')
-      ->fields(array('dst' => 'new-url-alias'))
-      ->condition('src', 'node/2')
-      ->execute();
-
-    \Drupal::database()
-      ->update($id_map->mapTableName())
-      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE))
-      ->execute();
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('d6_url_alias');
-    $this->executeMigration($migration);
-
-    $path = \Drupal::service('path.alias_storage')->load(array('pid' => $path['pid']));
-    $conditions['alias'] = '/new-url-alias';
-    $this->assertPath('2', $conditions, $path);
-
-    $conditions = array(
-      'source' => '/node/3',
-      'alias' => '/alias-three',
-      'langcode' => 'und',
-    );
-    $path = \Drupal::service('path.alias_storage')->load($conditions);
-    $this->assertPath('3', $conditions, $path);
-  }
-
-}
diff --git a/core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php
deleted file mode 100644
index 829a872..0000000
--- a/core/modules/path/src/Tests/Migrate/d7/MigrateUrlAliasTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\path\Tests\Migrate\d7\MigrateUrlAliasTest.
- */
-
-namespace Drupal\path\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests URL alias migration.
- *
- * @group path
- */
-class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['path'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['url_alias']);
-    $this->executeMigration('d7_url_alias');
-  }
-
-  /**
-   * Test the URL alias migration.
-   */
-  public function testUrlAlias() {
-    $path = \Drupal::service('path.alias_storage')->load([
-      'source' => '/taxonomy/term/4',
-      'alias' => '/term33',
-      'langcode' => 'und',
-    ]);
-    $this->assertIdentical('/taxonomy/term/4', $path['source']);
-    $this->assertIdentical('/term33', $path['alias']);
-    $this->assertIdentical('und', $path['langcode']);
-  }
-
-}
diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php
index 7e85cda..7a58787 100644
--- a/core/modules/path/src/Tests/PathAliasTest.php
+++ b/core/modules/path/src/Tests/PathAliasTest.php
@@ -145,7 +145,9 @@ function testAdminAlias() {
     ]), 'Attempt to move upper-case alias was rejected.');
 
     // Delete alias.
-    $this->drupalPostForm('admin/config/search/path/edit/' . $pid, array(), t('Delete'));
+    $this->drupalGet('admin/config/search/path/edit/' . $pid);
+    $this->clickLink(t('Delete'));
+    $this->assertRaw(t('Are you sure you want to delete path alias %name?', array('%name' => $edit['alias'])));
     $this->drupalPostForm(NULL, array(), t('Confirm'));
 
     // Confirm that the alias no longer works.
diff --git a/core/modules/path/src/Tests/PathTaxonomyTermTest.php b/core/modules/path/src/Tests/PathTaxonomyTermTest.php
index 98372df..c11594e 100644
--- a/core/modules/path/src/Tests/PathTaxonomyTermTest.php
+++ b/core/modules/path/src/Tests/PathTaxonomyTermTest.php
@@ -27,10 +27,10 @@ protected function setUp() {
     parent::setUp();
 
     // Create a Tags vocabulary for the Article node type.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => t('Tags'),
       'vid' => 'tags',
-    ));
+    ]);
     $vocabulary->save();
 
     // Create and login user.
diff --git a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
new file mode 100644
index 0000000..02d4583
--- /dev/null
+++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\path\Kernel\Migrate\d6\MigrateUrlAliasTest.
+ */
+
+namespace Drupal\Tests\path\Kernel\Migrate\d6;
+
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * URL alias migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('path');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_url_alias');
+  }
+
+  /**
+   * Assert a path.
+   *
+   * @param string pid
+   *   The path id.
+   * @param array $conditions
+   *   The path conditions.
+   * @param array $path
+   *   The path.
+   */
+  private function assertPath($pid, $conditions, $path) {
+    $this->assertTrue($path, "Path alias for " . $conditions['source'] . " successfully loaded.");
+    $this->assertIdentical($conditions['alias'], $path['alias']);
+    $this->assertIdentical($conditions['langcode'], $path['langcode']);
+    $this->assertIdentical($conditions['source'], $path['source']);
+  }
+
+  /**
+   * Test the url alias migration.
+   */
+  public function testUrlAlias() {
+    $id_map = $this->getMigration('d6_url_alias')->getIdMap();
+    // Test that the field exists.
+    $conditions = array(
+      'source' => '/node/1',
+      'alias' => '/alias-one',
+      'langcode' => 'af',
+    );
+    $path = \Drupal::service('path.alias_storage')->load($conditions);
+    $this->assertPath('1', $conditions, $path);
+    $this->assertIdentical($id_map->lookupDestinationID(array($path['pid'])), array('1'), "Test IdMap");
+
+    $conditions = array(
+      'source' => '/node/2',
+      'alias' => '/alias-two',
+      'langcode' => 'en',
+    );
+    $path = \Drupal::service('path.alias_storage')->load($conditions);
+    $this->assertPath('2', $conditions, $path);
+
+    // Test that we can re-import using the UrlAlias destination.
+    Database::getConnection('default', 'migrate')
+      ->update('url_alias')
+      ->fields(array('dst' => 'new-url-alias'))
+      ->condition('src', 'node/2')
+      ->execute();
+
+    \Drupal::database()
+      ->update($id_map->mapTableName())
+      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE))
+      ->execute();
+    $migration = $this->getMigration('d6_url_alias');
+    $this->executeMigration($migration);
+
+    $path = \Drupal::service('path.alias_storage')->load(array('pid' => $path['pid']));
+    $conditions['alias'] = '/new-url-alias';
+    $this->assertPath('2', $conditions, $path);
+
+    $conditions = array(
+      'source' => '/node/3',
+      'alias' => '/alias-three',
+      'langcode' => 'und',
+    );
+    $path = \Drupal::service('path.alias_storage')->load($conditions);
+    $this->assertPath('3', $conditions, $path);
+  }
+
+}
diff --git a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
new file mode 100644
index 0000000..ad5121c
--- /dev/null
+++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\path\Kernel\Migrate\d7\MigrateUrlAliasTest.
+ */
+
+namespace Drupal\Tests\path\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests URL alias migration.
+ *
+ * @group path
+ */
+class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['path'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_url_alias');
+  }
+
+  /**
+   * Test the URL alias migration.
+   */
+  public function testUrlAlias() {
+    $path = \Drupal::service('path.alias_storage')->load([
+      'source' => '/taxonomy/term/4',
+      'alias' => '/term33',
+      'langcode' => 'und',
+    ]);
+    $this->assertIdentical('/taxonomy/term/4', $path['source']);
+    $this->assertIdentical('/term33', $path['alias']);
+    $this->assertIdentical('und', $path['langcode']);
+  }
+
+}
diff --git a/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php b/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
index 6fa9c1b..3a545b4 100644
--- a/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
+++ b/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
@@ -30,7 +30,6 @@ protected function setUp() {
 
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('entity_test_mul');
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
 
     // Adding german language.
diff --git a/core/modules/quickedit/js/editors/formEditor.js b/core/modules/quickedit/js/editors/formEditor.js
index 49fc6f0..374e5c2 100644
--- a/core/modules/quickedit/js/editors/formEditor.js
+++ b/core/modules/quickedit/js/editors/formEditor.js
@@ -3,7 +3,7 @@
  * Form-based in-place editor. Works for any field type.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, _) {
 
   'use strict';
 
@@ -252,4 +252,4 @@
     }
   });
 
-})(jQuery, Drupal);
+})(jQuery, Drupal, _);
diff --git a/core/modules/quickedit/js/models/BaseModel.js b/core/modules/quickedit/js/models/BaseModel.js
index f1c31d7..7579b6f 100644
--- a/core/modules/quickedit/js/models/BaseModel.js
+++ b/core/modules/quickedit/js/models/BaseModel.js
@@ -3,7 +3,7 @@
  * A Backbone Model subclass that enforces validation when calling set().
  */
 
-(function (Backbone) {
+(function (Drupal, Backbone) {
 
   'use strict';
 
@@ -57,4 +57,4 @@
 
   });
 
-}(Backbone));
+}(Drupal, Backbone));
diff --git a/core/modules/quickedit/quickedit.module b/core/modules/quickedit/quickedit.module
index 16d236a..2d69a66 100644
--- a/core/modules/quickedit/quickedit.module
+++ b/core/modules/quickedit/quickedit.module
@@ -124,6 +124,11 @@ function quickedit_preprocess_page_title(&$variables) {
  * Implements hook_preprocess_HOOK() for field templates.
  */
 function quickedit_preprocess_field(&$variables) {
+  $variables['#cache']['contexts'][] = 'user.permissions';
+  if (!\Drupal::currentUser()->hasPermission('access in-place editing')) {
+    return;
+  }
+
   $element = $variables['element'];
   /** @var $entity \Drupal\Core\Entity\EntityInterface */
   $entity = $element['#object'];
@@ -148,5 +153,10 @@ function quickedit_preprocess_field(&$variables) {
  * Implements hook_entity_view_alter().
  */
 function quickedit_entity_view_alter(&$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
+  $build['#cache']['contexts'][] = 'user.permissions';
+  if (!\Drupal::currentUser()->hasPermission('access in-place editing')) {
+    return;
+  }
+
   $build['#attributes']['data-quickedit-entity-id'] = $entity->getEntityTypeId() . '/' . $entity->id();
 }
diff --git a/core/modules/quickedit/src/Tests/EditorSelectionTest.php b/core/modules/quickedit/src/Tests/EditorSelectionTest.php
index 25e0095..dfc73f0 100644
--- a/core/modules/quickedit/src/Tests/EditorSelectionTest.php
+++ b/core/modules/quickedit/src/Tests/EditorSelectionTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\quickedit\Tests;
 
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\quickedit\EditorSelector;
 
 /**
@@ -65,7 +66,7 @@ public function testText() {
     );
 
     // Create an entity with values for this text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$field_name}->value = 'Hello, world!';
     $entity->save();
 
@@ -104,7 +105,7 @@ public function testTextWysiwyg() {
     );
 
     // Create an entity with values for this text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$field_name}->value = 'Hello, world!';
     $entity->{$field_name}->format = 'filtered_html';
     $entity->save();
@@ -141,7 +142,7 @@ public function testNumber() {
     );
 
     // Create an entity with values for this text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$field_name}->value = 42;
     $entity->save();
 
diff --git a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
index 0335703..f4633e1 100644
--- a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
@@ -7,9 +7,11 @@
 
 namespace Drupal\quickedit\Tests;
 
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\quickedit\EditorSelector;
 use Drupal\quickedit\MetadataGenerator;
 use Drupal\quickedit_test\MockEditEntityFieldAccessCheck;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests in-place field editing metadata.
@@ -92,7 +94,7 @@ public function testSimpleEntityType() {
     );
 
     // Create an entity with values for this text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$field_1_name}->value = 'Test';
     $entity->{$field_2_name}->value = 42;
     $entity->save();
@@ -123,8 +125,6 @@ public function testSimpleEntityType() {
    * Tests a field whose associated in-place editor generates custom metadata.
    */
   public function testEditorWithCustomMetadata() {
-    $this->installSchema('system', 'url_alias');
-
     $this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
     $this->editorSelector = new EditorSelector($this->editorManager, $this->container->get('plugin.manager.field.formatter'));
     $this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager);
@@ -149,7 +149,7 @@ public function testEditorWithCustomMetadata() {
     );
 
     // Create a text format.
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -160,7 +160,7 @@ public function testEditorWithCustomMetadata() {
     $full_html_format->save();
 
     // Create an entity with values for this rich text field.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->{$field_name}->value = 'Test';
     $entity->{$field_name}->format = 'full_html';
     $entity->save();
diff --git a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
index 677c927..a728694 100644
--- a/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditAutocompleteTermTest.php
@@ -12,6 +12,8 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests in-place editing of autocomplete tags.
@@ -78,7 +80,7 @@ protected function setUp() {
       'type' => 'article',
     ));
     // Create the vocabulary for the tag field.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', [
+    $this->vocabulary = Vocabulary::create([
       'name' => 'quickedit testing tags',
       'vid' => 'quickedit_testing_tags',
     ]);
@@ -202,14 +204,14 @@ public function testAutocompleteQuickEdit() {
   protected function createTerm() {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       // Use the first available text format.
       'format' => $format->id(),
       'vid' => $this->vocabulary->id(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $term->save();
     return $term;
   }
diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
index 6e6fffb..4c05469 100644
--- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php
@@ -17,6 +17,7 @@
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\WebTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests loading of in-place editing functionality and lazy loading of its
@@ -57,7 +58,7 @@ protected function setUp() {
     parent::setUp();
 
     // Create a text format.
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'weight' => 0,
@@ -101,9 +102,10 @@ public function testUserWithoutPermission() {
     $this->assertNoRaw('core/modules/quickedit/js/quickedit.js', 'Quick Edit library not loaded.');
     $this->assertNoRaw('core/modules/quickedit/js/editors/formEditor.js', "'form' in-place editor not loaded.");
 
-    // HTML annotation must always exist (to not break the render cache).
-    $this->assertRaw('data-quickedit-entity-id="node/1"');
-    $this->assertRaw('data-quickedit-field-id="node/1/body/en/full"');
+    // HTML annotation does not exist for users without permission to in-place
+    // edit.
+    $this->assertNoRaw('data-quickedit-entity-id="node/1"');
+    $this->assertNoRaw('data-quickedit-field-id="node/1/body/en/full"');
 
     // Retrieving the metadata should result in an empty 403 response.
     $post = array('fields[0]' => 'node/1/body/en/full');
@@ -518,6 +520,7 @@ public function testContentBlock() {
     $this->drupalPlaceBlock('block_content:' . $block->uuid());
 
     // Check that the data- attribute is present.
+    $this->drupalLogin($this->editorUser);
     $this->drupalGet('');
     $this->assertRaw('data-quickedit-entity-id="block_content/1"');
   }
diff --git a/core/modules/quickedit/src/Tests/QuickEditTestBase.php b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
index eb779ad..85884ff 100644
--- a/core/modules/quickedit/src/Tests/QuickEditTestBase.php
+++ b/core/modules/quickedit/src/Tests/QuickEditTestBase.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\quickedit\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\KernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Base class for testing Quick Edit functionality.
@@ -70,7 +72,7 @@ protected function setUp() {
    */
   protected function createFieldWithStorage($field_name, $type, $cardinality, $label, $field_settings, $widget_type, $widget_settings, $formatter_type, $formatter_settings) {
     $field_storage = $field_name . '_field_storage';
-    $this->fields->$field_storage = entity_create('field_storage_config', array(
+    $this->fields->$field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $type,
@@ -79,14 +81,14 @@ protected function createFieldWithStorage($field_name, $type, $cardinality, $lab
     $this->fields->$field_storage->save();
 
     $field = $field_name . '_field';
-    $this->fields->$field = entity_create('field_config', array(
+    $this->fields->$field = FieldConfig::create([
       'field_storage' => $this->fields->$field_storage,
       'bundle' => 'entity_test',
       'label' => $label,
       'description' => $label,
       'weight' => mt_rand(0, 127),
       'settings' => $field_settings,
-    ));
+    ]);
     $this->fields->$field->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 33a3e92..0c7cf5c 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -7,6 +7,7 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
+use Drupal\rdf\Entity\RdfMapping;
 
 /**
  * Implements hook_help().
@@ -73,7 +74,7 @@ function rdf_get_mapping($entity_type, $bundle) {
 
   // If not found, create a fresh mapping object.
   if (!$mapping) {
-    $mapping = entity_create('rdf_mapping', array(
+    $mapping = RdfMapping::create(array(
       'targetEntityType' => $entity_type,
       'bundle' => $bundle,
     ));
diff --git a/core/modules/rdf/src/Tests/CommentAttributesTest.php b/core/modules/rdf/src/Tests/CommentAttributesTest.php
index 8d3beb7..552fbaf 100644
--- a/core/modules/rdf/src/Tests/CommentAttributesTest.php
+++ b/core/modules/rdf/src/Tests/CommentAttributesTest.php
@@ -11,6 +11,7 @@
 use Drupal\comment\CommentManagerInterface;
 use Drupal\comment\Tests\CommentTestBase;
 use Drupal\user\RoleInterface;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests the RDFa markup of comments.
@@ -372,7 +373,7 @@ function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
       $values += $contact;
     }
 
-    $comment = entity_create('comment', $values);
+    $comment = Comment::create($values);
     $comment->save();
     return $comment;
   }
diff --git a/core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php
deleted file mode 100644
index 1b47b40..0000000
--- a/core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\DateTimeFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by datetime field formatters.
- *
- * @group rdf
- */
-class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'datetime';
-
-  /**
-   * The 'value' property value for testing.
-   *
-   * @var string
-   */
-  protected $testValue = '2014-01-28T06:01:01';
-
-  /**
-  * {@inheritdoc}
-  */
-  public static $modules = array('datetime');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:dateCreated'),
-    ))->save();
-
-    // Set up test entity.
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-  }
-
-  /**
-   * Tests the default formatter.
-   */
-  public function testDefaultFormatter() {
-    $this->assertFormatterRdfa(array('type'=>'datetime_default'), 'http://schema.org/dateCreated', array('value' => $this->testValue . 'Z', 'type' => 'literal', 'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime'));
-  }
-}
diff --git a/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php
deleted file mode 100644
index cda7ee7..0000000
--- a/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\EmailFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by email field formatters.
- *
- * @group rdf
- */
-class EmailFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'email';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('text');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:email'),
-    ))->save();
-
-    // Set up test values.
-    $this->testValue = 'test@example.com';
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-  }
-
-  /**
-   * Tests all email formatters.
-   */
-  public function testAllFormatters() {
-    // Test the plain formatter.
-    $this->assertFormatterRdfa(array('type'=>'string'), 'http://schema.org/email', array('value' => $this->testValue));
-    // Test the mailto formatter.
-    $this->assertFormatterRdfa(array('type'=>'email_mailto'), 'http://schema.org/email', array('value' => $this->testValue));
-  }
-}
diff --git a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php b/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php
deleted file mode 100644
index 73e6e53..0000000
--- a/core/modules/rdf/src/Tests/Field/EntityReferenceRdfaTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\EntityReferenceRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Tests the RDFa output of the entity reference field formatter.
- *
- * @group rdf
- */
-class EntityReferenceRdfaTest extends FieldRdfaTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'entity_reference';
-
-  /**
-   * The entity type used in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'entity_test';
-
-  /**
-   * The bundle used in this test.
-   *
-   * @var string
-   */
-  protected $bundle = 'entity_test';
-
-  /**
-   * The term for testing.
-   *
-   * @var \Drupal\taxonomy\Entity\Term
-   */
-  protected $targetEntity;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['text', 'filter'];
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-
-    // Give anonymous users permission to view test entities.
-    $this->installConfig(array('user'));
-    Role::load(RoleInterface::ANONYMOUS_ID)
-      ->grantPermission('view test entity')
-      ->save();
-
-    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType);
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:knows'),
-    ))->save();
-
-    // Create the entity to be referenced.
-    $this->targetEntity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-    $this->targetEntity->save();
-
-    // Create the entity that will have the entity reference field.
-    $this->entity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
-    $this->entity->save();
-    $this->entity->{$this->fieldName}->entity = $this->targetEntity;
-    $this->uri = $this->getAbsoluteUri($this->entity);
-  }
-
-  /**
-   * Tests all the entity reference formatters.
-   */
-  public function testAllFormatters() {
-    $entity_uri = $this->getAbsoluteUri($this->targetEntity);
-
-    // Tests the label formatter.
-    $this->assertFormatterRdfa(array('type' => 'entity_reference_label'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
-    // Tests the entity formatter.
-    $this->assertFormatterRdfa(array('type' => 'entity_reference_entity_view'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
-  }
-
-}
diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php b/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php
deleted file mode 100644
index 0b43c30..0000000
--- a/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\FieldRdfaDatatypeCallbackTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests the RDFa output of a text field formatter with a datatype callback.
- *
- * @group rdf
- */
-class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'text';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('text', 'filter');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    $this->installConfig(array('filter'));
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:interactionCount'),
-      'datatype_callback' => array(
-        'callable' => 'Drupal\rdf\Tests\Field\TestDataConverter::convertFoo',
-      ),
-    ))->save();
-
-    // Set up test values.
-    $this->testValue = $this->randomMachineName();
-    $this->entity = entity_create('entity_test');
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-    $this->entity->save();
-
-    $this->uri = $this->getAbsoluteUri($this->entity);
-  }
-
-  /**
-   * Tests the default formatter.
-   */
-  public function testDefaultFormatter() {
-    // Expected value is the output of the datatype callback, not the raw value.
-    $this->assertFormatterRdfa(array('type'=>'text_default'), 'http://schema.org/interactionCount', array('value' => 'foo' . $this->testValue));
-  }
-
-}
-
diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
deleted file mode 100644
index cb8f584..0000000
--- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\FieldRdfaTestBase.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-use Drupal\field\Tests\FieldUnitTestBase;
-
-abstract class FieldRdfaTestBase extends FieldUnitTestBase {
-
-  /**
-   * The machine name of the field type to test.
-   *
-   * @var string
-   */
-  protected $fieldType;
-
-  /**
-   * The name of the field to create for testing.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  /**
-   * The URI to identify the entity.
-   *
-   * @var string
-   */
-  protected $uri = 'http://ex.com';
-
-  /**
-   * The entity to render for testing.
-   *
-   * @var \Drupal\Core\Entity\ContentEntityBase
-   */
-  protected $entity;
-
-  /**
-   * TRUE if verbose debugging is enabled.
-   *
-   * @var bool
-   */
-  protected $debug = TRUE;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('rdf');
-
-  /**
-   * @var string
-   */
-  protected $testValue;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Helper function to test the formatter's RDFa.
-   *
-   * @param array $formatter
-   *   An associative array describing the formatter to test and its settings
-   *   containing:
-   *   - type: The machine name of the field formatter to test.
-   *   - settings: The settings of the field formatter to test.
-   * @param string $property
-   *   The property that should be found.
-   * @param array $expected_rdf_value
-   *   An associative array describing the expected value of the property
-   *   containing:
-   *   - value: The actual value of the string or URI.
-   *   - type: The type of RDF value, e.g. 'literal' for a string, or 'uri'.
-   *   Defaults to 'literal'.
-   *   - datatype: (optional) The datatype of the value (e.g. xsd:dateTime).
-   */
-  protected function assertFormatterRdfa($formatter, $property, $expected_rdf_value) {
-    $expected_rdf_value += array('type' => 'literal');
-
-    // The field formatter will be rendered inside the entity. Set the field
-    // formatter in the entity display options before rendering the entity.
-    entity_get_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, $formatter)
-      ->save();
-    $build = entity_view($this->entity, 'default');
-    $output = \Drupal::service('renderer')->renderRoot($build);
-    $graph = new \EasyRdf_Graph($this->uri, $output, 'rdfa');
-    $this->setRawContent($output);
-
-    // If verbose debugging is turned on, display the HTML and parsed RDF
-    // in the results.
-    if ($this->debug) {
-      debug($output);
-      debug($graph->toRdfPhp());
-    }
-
-    $this->assertTrue($graph->hasProperty($this->uri, $property, $expected_rdf_value), "Formatter {$formatter['type']} exposes data correctly for {$this->fieldType} fields.");
-  }
-
-  /**
-   * Creates the field for testing.
-   *
-   * @param array $field_settings
-   *   (optional) An array of field settings.
-   */
-  protected function createTestField($field_settings = array()) {
-    entity_create('field_storage_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'type' => $this->fieldType,
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => $this->fieldName,
-      'bundle' => 'entity_test',
-      'settings' => $field_settings,
-    ))->save();
-  }
-
-  /**
-   * Gets the absolute URI of an entity.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityBase $entity
-   *   The entity for which to generate the URI.
-   *
-   * @return string
-   *   The absolute URI.
-   */
-  protected function getAbsoluteUri($entity) {
-    return $entity->url('canonical', array('absolute' => TRUE));
-  }
-
-  /**
-   * Parses a content and return the html element.
-   *
-   * @param string $content
-   *   The html to parse.
-   *
-   * @return array
-   *   An array containing simplexml objects.
-   */
-  protected function parseContent($content) {
-    $htmlDom = new \DOMDocument();
-    @$htmlDom->loadHTML('<?xml encoding="UTF-8">' . $content);
-    $elements = simplexml_import_dom($htmlDom);
-
-    return $elements;
-  }
-
-  /**
-   * Performs an xpath search on a certain content.
-   *
-   * The search is relative to the root element of the $content variable.
-   *
-   * @param string $content
-   *   The html to parse.
-   * @param string $xpath
-   *   The xpath string to use in the search.
-   * @param array $arguments
-   *   Some arguments for the xpath.
-   *
-   * @return array|FALSE
-   *   The return value of the xpath search. For details on the xpath string
-   *   format and return values see the SimpleXML documentation,
-   *   http://php.net/manual/function.simplexml-element-xpath.php.
-   */
-  protected function xpathContent($content, $xpath, array $arguments = array()) {
-    if ($elements = $this->parseContent($content)) {
-      $xpath = $this->buildXPathQuery($xpath, $arguments);
-      $result = $elements->xpath($xpath);
-      // Some combinations of PHP / libxml versions return an empty array
-      // instead of the documented FALSE. Forcefully convert any falsish values
-      // to an empty array to allow foreach(...) constructions.
-      return $result ? $result : array();
-    }
-    else {
-      return FALSE;
-    }
-  }
-
-}
diff --git a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
deleted file mode 100644
index 3a58b80..0000000
--- a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\LinkFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests the placement of RDFa in link field formatters.
- *
- * @group rdf
- */
-class LinkFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'link';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('link', 'text');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:link'),
-    ))->save();
-
-  }
-
-  /**
-   * Tests all formatters with link to external page.
-   */
-  public function testAllFormattersExternal() {
-    // Set up test values.
-    $this->testValue = 'http://test.me/foo/bar/neque/porro/quisquam/est/qui-dolorem?foo/bar/neque/porro/quisquam/est/qui-dolorem';
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->uri = $this->testValue;
-
-    // Set up the expected result.
-    $expected_rdf = array(
-      'value' => $this->testValue,
-      'type' => 'uri',
-    );
-
-    $this->runTestAllFormatters($expected_rdf, 'external');
-  }
-
-  /**
-   * Tests all formatters with link to internal page.
-   */
-  public function testAllFormattersInternal() {
-    // Set up test values.
-    $this->testValue = 'admin';
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->uri = 'internal:/admin';
-
-    // Set up the expected result.
-    // AssertFormatterRdfa looks for a full path.
-    $expected_rdf = array(
-      'value' => $this->uri . '/' . $this->testValue,
-      'type' => 'uri',
-    );
-
-    $this->runTestAllFormatters($expected_rdf, 'internal');
-  }
-
-  /**
-   * Tests all formatters with link to frontpage.
-   */
-  public function testAllFormattersFront() {
-    // Set up test values.
-    $this->testValue = '/';
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->uri = 'internal:/';
-
-    // Set up the expected result.
-    $expected_rdf = array(
-      'value' =>  $this->uri . '/',
-      'type' => 'uri',
-    );
-
-    $this->runTestAllFormatters($expected_rdf, 'front');
-  }
-
-  /**
-   * Helper function to test all link formatters.
-   */
-  public function runTestAllFormatters($expected_rdf, $type = NULL) {
-
-    // Test the link formatter: trim at 80, no other settings.
-    $formatter = array(
-      'type' => 'link',
-      'settings' => array(
-        'trim_length' => 80,
-        'url_only' => FALSE,
-        'url_plain' => FALSE,
-        'rel' => '',
-        'target' => '',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-
-    // Test the link formatter: trim at 40, nofollow, new window.
-    $formatter = array(
-      'type' => 'link',
-      'settings' => array(
-        'trim_length' => 40,
-        'url_only' => FALSE,
-        'url_plain' => FALSE,
-        'rel' => 'nofollow',
-        'target' => '_blank',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-
-    // Test the link formatter: trim at 40, URL only (not plaintext) nofollow,
-    // new window.
-    $formatter = array(
-      'type' => 'link',
-      'settings' => array(
-        'trim_length' => 40,
-        'url_only' => TRUE,
-        'url_plain' => FALSE,
-        'rel' => 'nofollow',
-        'target' => '_blank',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-
-    // Test the link_separate formatter: trim at 40, nofollow, new window.
-    $formatter = array(
-      'type' => 'link_separate',
-      'settings' => array(
-        'trim_length' => 40,
-        'rel' => 'nofollow',
-        'target' => '_blank',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-
-    // Change the expected value here to literal. When formatted as plaintext
-    // then the RDF is expecting a 'literal' not a 'uri'.
-    $expected_rdf = array(
-      'value' => $this->testValue,
-      'type' => 'literal',
-    );
-    // Test the link formatter: trim at 20, url only (as plaintext.)
-    $formatter = array(
-      'type' => 'link',
-      'settings' => array(
-        'trim_length' => 20,
-        'url_only' => TRUE,
-        'url_plain' => TRUE,
-        'rel' => '0',
-        'target' => '0',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-
-    // Test the link formatter: do not trim, url only (as plaintext.)
-    $formatter = array(
-      'type' => 'link',
-      'settings' => array(
-        'trim_length' => 0,
-        'url_only' => TRUE,
-        'url_plain' => TRUE,
-        'rel' => '0',
-        'target' => '0',
-      ),
-    );
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
-  }
-
-}
diff --git a/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php
deleted file mode 100644
index 120d6f0..0000000
--- a/core/modules/rdf/src/Tests/Field/NumberFieldRdfaTest.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\NumberFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by number field formatters.
- *
- * @group rdf
- */
-class NumberFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * Tests the integer formatter.
-   */
-  public function testIntegerFormatter() {
-    $this->fieldType = 'integer';
-    $testValue = 3;
-    $this->createTestField();
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_integer'), 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is not created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests the integer formatter with settings.
-   */
-  public function testIntegerFormatterWithSettings() {
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-    $this->fieldType = 'integer';
-    $formatter = array(
-      'type' => 'number_integer',
-      'settings' => array(
-        'thousand_separator' => '.',
-        'prefix_suffix' => TRUE,
-      ),
-    );
-    $testValue = 3333333.33;
-    $field_settings = array(
-      'prefix' => '#',
-      'suffix' => ' llamas.',
-    );
-    $this->createTestField($field_settings);
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Tests the float formatter.
-   */
-  public function testFloatFormatter() {
-    $this->fieldType = 'float';
-    $testValue = 3.33;
-    $this->createTestField();
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_unformatted'), 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is not created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests the float formatter with settings.
-   */
-  public function testFloatFormatterWithSettings() {
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-    $this->fieldType = 'float';
-    $formatter = array(
-      'type' => 'number_decimal',
-      'settings' => array(
-        'thousand_separator' => '.',
-        'decimal_separator' => ',',
-        'prefix_suffix' => TRUE,
-      ),
-    );
-    $testValue = 3333333.33;
-    $field_settings = array(
-      'prefix' => '$',
-      'suffix' => ' more.',
-    );
-    $this->createTestField($field_settings);
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Tests the float formatter with a scale. Scale is not exercised.
-   */
-  public function testFloatFormatterWithScale() {
-    $this->fieldType = 'float';
-    $formatter = array(
-      'type' => 'number_decimal',
-      'settings' => array(
-        'scale' => 5,
-      ),
-    );
-    $testValue = 3.33;
-    $this->createTestField();
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is not created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests the float formatter with a scale. Scale is exercised.
-   */
-  public function testFloatFormatterWithScaleExercised() {
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-    $this->fieldType = 'float';
-    $formatter = array(
-      'type' => 'number_decimal',
-      'settings' => array(
-        'scale' => 5,
-      ),
-    );
-    $testValue = 3.1234567;
-    $this->createTestField();
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Tests the decimal formatter.
-   */
-  public function testDecimalFormatter() {
-    $this->fieldType = 'decimal';
-    $testValue = 3.33;
-    $this->createTestField();
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa(array('type' => 'number_decimal'), 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is not created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
-    $this->assertFalse($result);
-  }
-
-  /**
-   * Tests the decimal formatter with settings.
-   */
-  public function testDecimalFormatterWithSettings() {
-    \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
-    $this->fieldType = 'decimal';
-    $formatter = array(
-      'type' => 'number_decimal',
-      'settings' => array(
-        'thousand_separator' => 't',
-        'decimal_separator' => '#',
-        'prefix_suffix' => TRUE,
-      ),
-    );
-    $testValue = 3333333.33;
-    $field_settings = array(
-      'prefix' => '$',
-      'suffix' => ' more.',
-    );
-    $this->createTestField($field_settings);
-    $this->createTestEntity($testValue);
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
-
-    // Test that the content attribute is created.
-    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Creates the RDF mapping for the field.
-   */
-  protected function createTestEntity($testValue) {
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:baseSalary'),
-    ))->save();
-
-    // Set up test entity.
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->value = $testValue;
-  }
-}
diff --git a/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php
deleted file mode 100644
index 9805682..0000000
--- a/core/modules/rdf/src/Tests/Field/StringFieldRdfaTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\StringFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by text field formatters.
- *
- * @group rdf
- */
-class StringFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'string';
-
-  /**
-   * The 'value' property value for testing.
-   *
-   * @var string
-   */
-  protected $testValue = 'test_text_value';
-
-  /**
-   * The 'summary' property value for testing.
-   *
-   * @var string
-   */
-  protected $testSummary = 'test_summary_value';
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:text'),
-    ))->save();
-
-    // Set up test entity.
-    $this->entity = entity_create('entity_test');
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-    $this->entity->{$this->fieldName}->summary = $this->testSummary;
-  }
-
-  /**
-   * Tests string formatters.
-   */
-  public function testStringFormatters() {
-    // Tests the string formatter.
-    $this->assertFormatterRdfa(array('type'=>'string'), 'http://schema.org/text', array('value' => $this->testValue));
-  }
-}
diff --git a/core/modules/rdf/src/Tests/Field/TelephoneFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/TelephoneFieldRdfaTest.php
deleted file mode 100644
index 002db43..0000000
--- a/core/modules/rdf/src/Tests/Field/TelephoneFieldRdfaTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\TelephoneFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by telephone field formatters.
- *
- * @group rdf
- */
-class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * A test value for the telephone field.
-   *
-   * @var string
-   */
-  protected $testValue;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'telephone';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('telephone', 'text');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:telephone'),
-    ))->save();
-
-    // Set up test values.
-    $this->testValue = '555-555-5555';
-    $this->entity = entity_create('entity_test', array());
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-  }
-
-  /**
-   * Tests the field formatters.
-   */
-  public function testAllFormatters() {
-    // Tests the plain formatter.
-    $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/telephone', array('value' => $this->testValue));
-    // Tests the telephone link formatter.
-    $this->assertFormatterRdfa(array('type' => 'telephone_link'), 'http://schema.org/telephone', array('value' => 'tel:' . $this->testValue, 'type' => 'uri'));
-
-    $formatter = array(
-      'type' => 'telephone_link',
-      'settings' => array('title' => 'Contact us'),
-    );
-    $expected_rdf_value = array(
-      'value' => 'tel:' . $this->testValue,
-      'type' => 'uri',
-    );
-    // Tests the telephone link formatter with custom title.
-    $this->assertFormatterRdfa($formatter, 'http://schema.org/telephone', $expected_rdf_value);
-  }
-}
diff --git a/core/modules/rdf/src/Tests/Field/TextFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/TextFieldRdfaTest.php
deleted file mode 100644
index 0e97b27..0000000
--- a/core/modules/rdf/src/Tests/Field/TextFieldRdfaTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rdf\Tests\Field\TextFieldRdfaTest.
- */
-
-namespace Drupal\rdf\Tests\Field;
-
-/**
- * Tests RDFa output by text field formatters.
- *
- * @group rdf
- */
-class TextFieldRdfaTest extends FieldRdfaTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $fieldType = 'text';
-
-  /**
-   * The 'value' property value for testing.
-   *
-   * @var string
-   */
-  protected $testValue = 'test_text_value';
-
-  /**
-   * The 'summary' property value for testing.
-   *
-   * @var string
-   */
-  protected $testSummary = 'test_summary_value';
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('text', 'filter');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('filter'));
-
-    $this->createTestField();
-
-    // Add the mapping.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping($this->fieldName, array(
-      'properties' => array('schema:text'),
-    ))->save();
-
-    // Set up test entity.
-    $this->entity = entity_create('entity_test');
-    $this->entity->{$this->fieldName}->value = $this->testValue;
-    $this->entity->{$this->fieldName}->summary = $this->testSummary;
-  }
-
-  /**
-   * Tests all formatters.
-   *
-   * @todo Check for the summary mapping.
-   */
-  public function testAllFormatters() {
-    $formatted_value = strip_tags($this->entity->{$this->fieldName}->processed);
-
-    // Tests the default formatter.
-    $this->assertFormatterRdfa(array('type'=>'text_default'), 'http://schema.org/text', array('value' => $formatted_value));
-    // Tests the summary formatter.
-    $this->assertFormatterRdfa(array('type'=>'text_summary_or_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
-    // Tests the trimmed formatter.
-    $this->assertFormatterRdfa(array('type'=>'text_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
-  }
-}
diff --git a/core/modules/rdf/src/Tests/StandardProfileTest.php b/core/modules/rdf/src/Tests/StandardProfileTest.php
index 57f4c3f..e5b42ac 100644
--- a/core/modules/rdf/src/Tests/StandardProfileTest.php
+++ b/core/modules/rdf/src/Tests/StandardProfileTest.php
@@ -8,10 +8,13 @@
 namespace Drupal\rdf\Tests;
 
 use Drupal\Core\Url;
+use Drupal\file\Entity\File;
 use Drupal\image\Entity\ImageStyle;
 use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Entity\Comment;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests the RDF mappings and RDFa markup of the standard profile.
@@ -109,7 +112,7 @@ protected function setUp() {
 
     // Use Classy theme for testing markup output.
     \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_handler')->setDefault('classy');
 
     $this->baseUri = \Drupal::url('<front>', [], ['absolute' => TRUE]);
 
@@ -130,16 +133,16 @@ protected function setUp() {
     $this->drupalLogin($this->adminUser);
 
     // Create term.
-    $this->term = entity_create('taxonomy_term', array(
+    $this->term = Term::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => 'tags',
-    ));
+    ]);
     $this->term->save();
 
     // Create image.
     file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', 'public://example.jpg');
-    $this->image = entity_create('file', array('uri' => 'public://example.jpg'));
+    $this->image = File::create(['uri' => 'public://example.jpg']);
     $this->image->save();
 
     // Create article.
@@ -515,7 +518,7 @@ protected function saveComment($nid, $uid, $contact = NULL, $pid = 0) {
       $values += $contact;
     }
 
-    $comment = entity_create('comment', $values);
+    $comment = Comment::create($values);
     $comment->save();
     return $comment;
   }
diff --git a/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
new file mode 100644
index 0000000..e128c74
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\DateTimeFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by datetime field formatters.
+ *
+ * @group rdf
+ */
+class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'datetime';
+
+  /**
+   * The 'value' property value for testing.
+   *
+   * @var string
+   */
+  protected $testValue = '2014-01-28T06:01:01';
+
+  /**
+  * {@inheritdoc}
+  */
+  public static $modules = array('datetime');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:dateCreated'),
+    ))->save();
+
+    // Set up test entity.
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+  }
+
+  /**
+   * Tests the default formatter.
+   */
+  public function testDefaultFormatter() {
+    $this->assertFormatterRdfa(array('type'=>'datetime_default'), 'http://schema.org/dateCreated', array('value' => $this->testValue . 'Z', 'type' => 'literal', 'datatype' => 'http://www.w3.org/2001/XMLSchema#dateTime'));
+  }
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
new file mode 100644
index 0000000..3b57a81
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\EmailFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by email field formatters.
+ *
+ * @group rdf
+ */
+class EmailFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'email';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('text');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:email'),
+    ))->save();
+
+    // Set up test values.
+    $this->testValue = 'test@example.com';
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+  }
+
+  /**
+   * Tests all email formatters.
+   */
+  public function testAllFormatters() {
+    // Test the plain formatter.
+    $this->assertFormatterRdfa(array('type'=>'string'), 'http://schema.org/email', array('value' => $this->testValue));
+    // Test the mailto formatter.
+    $this->assertFormatterRdfa(array('type'=>'email_mailto'), 'http://schema.org/email', array('value' => $this->testValue));
+  }
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
new file mode 100644
index 0000000..27d2028
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\EntityReferenceRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests the RDFa output of the entity reference field formatter.
+ *
+ * @group rdf
+ */
+class EntityReferenceRdfaTest extends FieldRdfaTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'entity_reference';
+
+  /**
+   * The entity type used in this test.
+   *
+   * @var string
+   */
+  protected $entityType = 'entity_test';
+
+  /**
+   * The bundle used in this test.
+   *
+   * @var string
+   */
+  protected $bundle = 'entity_test';
+
+  /**
+   * The term for testing.
+   *
+   * @var \Drupal\taxonomy\Entity\Term
+   */
+  protected $targetEntity;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['text', 'filter'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+
+    // Give anonymous users permission to view test entities.
+    $this->installConfig(array('user'));
+    Role::load(RoleInterface::ANONYMOUS_ID)
+      ->grantPermission('view test entity')
+      ->save();
+
+    $this->createEntityReferenceField($this->entityType, $this->bundle, $this->fieldName, 'Field test', $this->entityType);
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:knows'),
+    ))->save();
+
+    // Create the entity to be referenced.
+    $this->targetEntity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+    $this->targetEntity->save();
+
+    // Create the entity that will have the entity reference field.
+    $this->entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
+    $this->entity->save();
+    $this->entity->{$this->fieldName}->entity = $this->targetEntity;
+    $this->uri = $this->getAbsoluteUri($this->entity);
+  }
+
+  /**
+   * Tests all the entity reference formatters.
+   */
+  public function testAllFormatters() {
+    $entity_uri = $this->getAbsoluteUri($this->targetEntity);
+
+    // Tests the label formatter.
+    $this->assertFormatterRdfa(array('type' => 'entity_reference_label'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
+    // Tests the entity formatter.
+    $this->assertFormatterRdfa(array('type' => 'entity_reference_entity_view'), 'http://schema.org/knows', array('value' => $entity_uri, 'type' => 'uri'));
+  }
+
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
new file mode 100644
index 0000000..fe338be
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\FieldRdfaDatatypeCallbackTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests the RDFa output of a text field formatter with a datatype callback.
+ *
+ * @group rdf
+ */
+class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'text';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('text', 'filter');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    $this->installConfig(array('filter'));
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:interactionCount'),
+      'datatype_callback' => array(
+        'callable' => 'Drupal\rdf\Tests\Field\TestDataConverter::convertFoo',
+      ),
+    ))->save();
+
+    // Set up test values.
+    $this->testValue = $this->randomMachineName();
+    $this->entity = EntityTest::create();
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+    $this->entity->save();
+
+    $this->uri = $this->getAbsoluteUri($this->entity);
+  }
+
+  /**
+   * Tests the default formatter.
+   */
+  public function testDefaultFormatter() {
+    // Expected value is the output of the datatype callback, not the raw value.
+    $this->assertFormatterRdfa(array('type'=>'text_default'), 'http://schema.org/interactionCount', array('value' => 'foo' . $this->testValue));
+  }
+
+}
+
diff --git a/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
new file mode 100644
index 0000000..30f9cd1
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\FieldRdfaTestBase.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+abstract class FieldRdfaTestBase extends FieldKernelTestBase {
+
+  /**
+   * The machine name of the field type to test.
+   *
+   * @var string
+   */
+  protected $fieldType;
+
+  /**
+   * The name of the field to create for testing.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_test';
+
+  /**
+   * The URI to identify the entity.
+   *
+   * @var string
+   */
+  protected $uri = 'http://ex.com';
+
+  /**
+   * The entity to render for testing.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityBase
+   */
+  protected $entity;
+
+  /**
+   * TRUE if verbose debugging is enabled.
+   *
+   * @var bool
+   */
+  protected $debug = FALSE;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('rdf');
+
+  /**
+   * @var string
+   */
+  protected $testValue;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Helper function to test the formatter's RDFa.
+   *
+   * @param array $formatter
+   *   An associative array describing the formatter to test and its settings
+   *   containing:
+   *   - type: The machine name of the field formatter to test.
+   *   - settings: The settings of the field formatter to test.
+   * @param string $property
+   *   The property that should be found.
+   * @param array $expected_rdf_value
+   *   An associative array describing the expected value of the property
+   *   containing:
+   *   - value: The actual value of the string or URI.
+   *   - type: The type of RDF value, e.g. 'literal' for a string, or 'uri'.
+   *   Defaults to 'literal'.
+   *   - datatype: (optional) The datatype of the value (e.g. xsd:dateTime).
+   */
+  protected function assertFormatterRdfa($formatter, $property, $expected_rdf_value) {
+    $expected_rdf_value += array('type' => 'literal');
+
+    // The field formatter will be rendered inside the entity. Set the field
+    // formatter in the entity display options before rendering the entity.
+    entity_get_display('entity_test', 'entity_test', 'default')
+      ->setComponent($this->fieldName, $formatter)
+      ->save();
+    $build = entity_view($this->entity, 'default');
+    $output = \Drupal::service('renderer')->renderRoot($build);
+    $graph = new \EasyRdf_Graph($this->uri, $output, 'rdfa');
+    $this->setRawContent($output);
+
+    // If verbose debugging is turned on, display the HTML and parsed RDF
+    // in the results.
+    if ($this->debug) {
+      print_r($output);
+      print_r($graph->toRdfPhp());
+    }
+
+    $this->assertTrue($graph->hasProperty($this->uri, $property, $expected_rdf_value), "Formatter {$formatter['type']} exposes data correctly for {$this->fieldType} fields.");
+  }
+
+  /**
+   * Creates the field for testing.
+   *
+   * @param array $field_settings
+   *   (optional) An array of field settings.
+   */
+  protected function createTestField($field_settings = array()) {
+    FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => 'entity_test',
+      'type' => $this->fieldType,
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => $this->fieldName,
+      'bundle' => 'entity_test',
+      'settings' => $field_settings,
+    ])->save();
+  }
+
+  /**
+   * Gets the absolute URI of an entity.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityBase $entity
+   *   The entity for which to generate the URI.
+   *
+   * @return string
+   *   The absolute URI.
+   */
+  protected function getAbsoluteUri($entity) {
+    return $entity->url('canonical', array('absolute' => TRUE));
+  }
+
+  /**
+   * Parses a content and return the html element.
+   *
+   * @param string $content
+   *   The html to parse.
+   *
+   * @return array
+   *   An array containing simplexml objects.
+   */
+  protected function parseContent($content) {
+    $htmlDom = new \DOMDocument();
+    @$htmlDom->loadHTML('<?xml encoding="UTF-8">' . $content);
+    $elements = simplexml_import_dom($htmlDom);
+
+    return $elements;
+  }
+
+  /**
+   * Performs an xpath search on a certain content.
+   *
+   * The search is relative to the root element of the $content variable.
+   *
+   * @param string $content
+   *   The html to parse.
+   * @param string $xpath
+   *   The xpath string to use in the search.
+   * @param array $arguments
+   *   Some arguments for the xpath.
+   *
+   * @return array|FALSE
+   *   The return value of the xpath search. For details on the xpath string
+   *   format and return values see the SimpleXML documentation,
+   *   http://php.net/manual/function.simplexml-element-xpath.php.
+   */
+  protected function xpathContent($content, $xpath, array $arguments = array()) {
+    if ($elements = $this->parseContent($content)) {
+      $xpath = $this->buildXPathQuery($xpath, $arguments);
+      $result = $elements->xpath($xpath);
+      // Some combinations of PHP / libxml versions return an empty array
+      // instead of the documented FALSE. Forcefully convert any falsish values
+      // to an empty array to allow foreach(...) constructions.
+      return $result ? $result : array();
+    }
+    else {
+      return FALSE;
+    }
+  }
+
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
new file mode 100644
index 0000000..e65f271
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\LinkFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests the placement of RDFa in link field formatters.
+ *
+ * @group rdf
+ */
+class LinkFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'link';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('link', 'text');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:link'),
+    ))->save();
+
+  }
+
+  /**
+   * Tests all formatters with link to external page.
+   */
+  public function testAllFormattersExternal() {
+    // Set up test values.
+    $this->testValue = 'http://test.me/foo/bar/neque/porro/quisquam/est/qui-dolorem?foo/bar/neque/porro/quisquam/est/qui-dolorem';
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->uri = $this->testValue;
+
+    // Set up the expected result.
+    $expected_rdf = array(
+      'value' => $this->testValue,
+      'type' => 'uri',
+    );
+
+    $this->runTestAllFormatters($expected_rdf, 'external');
+  }
+
+  /**
+   * Tests all formatters with link to internal page.
+   */
+  public function testAllFormattersInternal() {
+    // Set up test values.
+    $this->testValue = 'admin';
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->uri = 'internal:/admin';
+
+    // Set up the expected result.
+    // AssertFormatterRdfa looks for a full path.
+    $expected_rdf = array(
+      'value' => $this->uri . '/' . $this->testValue,
+      'type' => 'uri',
+    );
+
+    $this->runTestAllFormatters($expected_rdf, 'internal');
+  }
+
+  /**
+   * Tests all formatters with link to frontpage.
+   */
+  public function testAllFormattersFront() {
+    // Set up test values.
+    $this->testValue = '/';
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->uri = 'internal:/';
+
+    // Set up the expected result.
+    $expected_rdf = array(
+      'value' =>  $this->uri . '/',
+      'type' => 'uri',
+    );
+
+    $this->runTestAllFormatters($expected_rdf, 'front');
+  }
+
+  /**
+   * Helper function to test all link formatters.
+   */
+  public function runTestAllFormatters($expected_rdf, $type = NULL) {
+
+    // Test the link formatter: trim at 80, no other settings.
+    $formatter = array(
+      'type' => 'link',
+      'settings' => array(
+        'trim_length' => 80,
+        'url_only' => FALSE,
+        'url_plain' => FALSE,
+        'rel' => '',
+        'target' => '',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+
+    // Test the link formatter: trim at 40, nofollow, new window.
+    $formatter = array(
+      'type' => 'link',
+      'settings' => array(
+        'trim_length' => 40,
+        'url_only' => FALSE,
+        'url_plain' => FALSE,
+        'rel' => 'nofollow',
+        'target' => '_blank',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+
+    // Test the link formatter: trim at 40, URL only (not plaintext) nofollow,
+    // new window.
+    $formatter = array(
+      'type' => 'link',
+      'settings' => array(
+        'trim_length' => 40,
+        'url_only' => TRUE,
+        'url_plain' => FALSE,
+        'rel' => 'nofollow',
+        'target' => '_blank',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+
+    // Test the link_separate formatter: trim at 40, nofollow, new window.
+    $formatter = array(
+      'type' => 'link_separate',
+      'settings' => array(
+        'trim_length' => 40,
+        'rel' => 'nofollow',
+        'target' => '_blank',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+
+    // Change the expected value here to literal. When formatted as plaintext
+    // then the RDF is expecting a 'literal' not a 'uri'.
+    $expected_rdf = array(
+      'value' => $this->testValue,
+      'type' => 'literal',
+    );
+    // Test the link formatter: trim at 20, url only (as plaintext.)
+    $formatter = array(
+      'type' => 'link',
+      'settings' => array(
+        'trim_length' => 20,
+        'url_only' => TRUE,
+        'url_plain' => TRUE,
+        'rel' => '0',
+        'target' => '0',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+
+    // Test the link formatter: do not trim, url only (as plaintext.)
+    $formatter = array(
+      'type' => 'link',
+      'settings' => array(
+        'trim_length' => 0,
+        'url_only' => TRUE,
+        'url_plain' => TRUE,
+        'rel' => '0',
+        'target' => '0',
+      ),
+    );
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/link', $expected_rdf);
+  }
+
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
new file mode 100644
index 0000000..52553a9
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\NumberFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by number field formatters.
+ *
+ * @group rdf
+ */
+class NumberFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * Tests the integer formatter.
+   */
+  public function testIntegerFormatter() {
+    $this->fieldType = 'integer';
+    $testValue = 3;
+    $this->createTestField();
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa(array('type' => 'number_integer'), 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is not created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
+    $this->assertFalse($result);
+  }
+
+  /**
+   * Tests the integer formatter with settings.
+   */
+  public function testIntegerFormatterWithSettings() {
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->fieldType = 'integer';
+    $formatter = array(
+      'type' => 'number_integer',
+      'settings' => array(
+        'thousand_separator' => '.',
+        'prefix_suffix' => TRUE,
+      ),
+    );
+    $testValue = 3333333.33;
+    $field_settings = array(
+      'prefix' => '#',
+      'suffix' => ' llamas.',
+    );
+    $this->createTestField($field_settings);
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Tests the float formatter.
+   */
+  public function testFloatFormatter() {
+    $this->fieldType = 'float';
+    $testValue = 3.33;
+    $this->createTestField();
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa(array('type' => 'number_unformatted'), 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is not created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
+    $this->assertFalse($result);
+  }
+
+  /**
+   * Tests the float formatter with settings.
+   */
+  public function testFloatFormatterWithSettings() {
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->fieldType = 'float';
+    $formatter = array(
+      'type' => 'number_decimal',
+      'settings' => array(
+        'thousand_separator' => '.',
+        'decimal_separator' => ',',
+        'prefix_suffix' => TRUE,
+      ),
+    );
+    $testValue = 3333333.33;
+    $field_settings = array(
+      'prefix' => '$',
+      'suffix' => ' more.',
+    );
+    $this->createTestField($field_settings);
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Tests the float formatter with a scale. Scale is not exercised.
+   */
+  public function testFloatFormatterWithScale() {
+    $this->fieldType = 'float';
+    $formatter = array(
+      'type' => 'number_decimal',
+      'settings' => array(
+        'scale' => 5,
+      ),
+    );
+    $testValue = 3.33;
+    $this->createTestField();
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is not created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
+    $this->assertFalse($result);
+  }
+
+  /**
+   * Tests the float formatter with a scale. Scale is exercised.
+   */
+  public function testFloatFormatterWithScaleExercised() {
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->fieldType = 'float';
+    $formatter = array(
+      'type' => 'number_decimal',
+      'settings' => array(
+        'scale' => 5,
+      ),
+    );
+    $testValue = 3.1234567;
+    $this->createTestField();
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Tests the decimal formatter.
+   */
+  public function testDecimalFormatter() {
+    $this->fieldType = 'decimal';
+    $testValue = 3.33;
+    $this->createTestField();
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa(array('type' => 'number_decimal'), 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is not created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__items") and @content]');
+    $this->assertFalse($result);
+  }
+
+  /**
+   * Tests the decimal formatter with settings.
+   */
+  public function testDecimalFormatterWithSettings() {
+    \Drupal::service('theme_handler')->install(['classy']);
+    \Drupal::service('theme_handler')->setDefault('classy');
+    $this->fieldType = 'decimal';
+    $formatter = array(
+      'type' => 'number_decimal',
+      'settings' => array(
+        'thousand_separator' => 't',
+        'decimal_separator' => '#',
+        'prefix_suffix' => TRUE,
+      ),
+    );
+    $testValue = 3333333.33;
+    $field_settings = array(
+      'prefix' => '$',
+      'suffix' => ' more.',
+    );
+    $this->createTestField($field_settings);
+    $this->createTestEntity($testValue);
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/baseSalary', array('value' => $testValue));
+
+    // Test that the content attribute is created.
+    $result = $this->xpathContent($this->getRawContent(), '//div[contains(@class, "field__item") and @content=:testValue]', array(':testValue' => $testValue));
+    $this->assertTrue($result);
+  }
+
+  /**
+   * Creates the RDF mapping for the field.
+   */
+  protected function createTestEntity($testValue) {
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:baseSalary'),
+    ))->save();
+
+    // Set up test entity.
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->value = $testValue;
+  }
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
new file mode 100644
index 0000000..42da79b
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\StringFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by text field formatters.
+ *
+ * @group rdf
+ */
+class StringFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'string';
+
+  /**
+   * The 'value' property value for testing.
+   *
+   * @var string
+   */
+  protected $testValue = 'test_text_value';
+
+  /**
+   * The 'summary' property value for testing.
+   *
+   * @var string
+   */
+  protected $testSummary = 'test_summary_value';
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:text'),
+    ))->save();
+
+    // Set up test entity.
+    $this->entity = EntityTest::create();
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+    $this->entity->{$this->fieldName}->summary = $this->testSummary;
+  }
+
+  /**
+   * Tests string formatters.
+   */
+  public function testStringFormatters() {
+    // Tests the string formatter.
+    $this->assertFormatterRdfa(array('type'=>'string'), 'http://schema.org/text', array('value' => $this->testValue));
+  }
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
new file mode 100644
index 0000000..6f7bcae
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\TelephoneFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by telephone field formatters.
+ *
+ * @group rdf
+ */
+class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * A test value for the telephone field.
+   *
+   * @var string
+   */
+  protected $testValue;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'telephone';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('telephone', 'text');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:telephone'),
+    ))->save();
+
+    // Set up test values.
+    $this->testValue = '555-555-5555';
+    $this->entity = EntityTest::create(array());
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+  }
+
+  /**
+   * Tests the field formatters.
+   */
+  public function testAllFormatters() {
+    // Tests the plain formatter.
+    $this->assertFormatterRdfa(array('type' => 'string'), 'http://schema.org/telephone', array('value' => $this->testValue));
+    // Tests the telephone link formatter.
+    $this->assertFormatterRdfa(array('type' => 'telephone_link'), 'http://schema.org/telephone', array('value' => 'tel:' . $this->testValue, 'type' => 'uri'));
+
+    $formatter = array(
+      'type' => 'telephone_link',
+      'settings' => array('title' => 'Contact us'),
+    );
+    $expected_rdf_value = array(
+      'value' => 'tel:' . $this->testValue,
+      'type' => 'uri',
+    );
+    // Tests the telephone link formatter with custom title.
+    $this->assertFormatterRdfa($formatter, 'http://schema.org/telephone', $expected_rdf_value);
+  }
+}
diff --git a/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
new file mode 100644
index 0000000..c8ad5e2
--- /dev/null
+++ b/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\rdf\Kernel\Field\TextFieldRdfaTest.
+ */
+
+namespace Drupal\Tests\rdf\Kernel\Field;
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
+ * Tests RDFa output by text field formatters.
+ *
+ * @group rdf
+ */
+class TextFieldRdfaTest extends FieldRdfaTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $fieldType = 'text';
+
+  /**
+   * The 'value' property value for testing.
+   *
+   * @var string
+   */
+  protected $testValue = 'test_text_value';
+
+  /**
+   * The 'summary' property value for testing.
+   *
+   * @var string
+   */
+  protected $testSummary = 'test_summary_value';
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('text', 'filter');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(array('filter'));
+
+    $this->createTestField();
+
+    // Add the mapping.
+    $mapping = rdf_get_mapping('entity_test', 'entity_test');
+    $mapping->setFieldMapping($this->fieldName, array(
+      'properties' => array('schema:text'),
+    ))->save();
+
+    // Set up test entity.
+    $this->entity = EntityTest::create();
+    $this->entity->{$this->fieldName}->value = $this->testValue;
+    $this->entity->{$this->fieldName}->summary = $this->testSummary;
+  }
+
+  /**
+   * Tests all formatters.
+   *
+   * @todo Check for the summary mapping.
+   */
+  public function testAllFormatters() {
+    $formatted_value = strip_tags($this->entity->{$this->fieldName}->processed);
+
+    // Tests the default formatter.
+    $this->assertFormatterRdfa(array('type'=>'text_default'), 'http://schema.org/text', array('value' => $formatted_value));
+    // Tests the summary formatter.
+    $this->assertFormatterRdfa(array('type'=>'text_summary_or_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
+    // Tests the trimmed formatter.
+    $this->assertFormatterRdfa(array('type'=>'text_trimmed'), 'http://schema.org/text', array('value' => $formatted_value));
+  }
+}
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index aa959a3..7df1da8 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -37,7 +37,7 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Breakpoint groups: viewport sizing vs art direction') . '</dt>';
       $output .= '<dd>' . t('The breakpoint group typically only needs a single breakpoint with an empty media query in order to do <em>viewport sizing.</em> Multiple breakpoints are used for changing the crop or aspect ratio of images at different viewport sizes, which is often referred to as <em>art direction.</em> Once you select a breakpoint group, you can choose which breakpoints to use for the responsive image style. By default, the option <em>do not use this breakpoint</em> is selected for each breakpoint. See the <a href=":breakpoint_help">help page of the Breakpoint module</a> for more information.', array(':breakpoint_help' => \Drupal::url('help.page', array('name' => 'breakpoint')))) . '</dd>';
       $output .= '<dt>' . t('Breakpoint settings: sizes vs image styles') . '</dt>';
-      $output .= '<dd>' . t('While you have the option to provide only image style per breakpoint, the sizes option allows you to provide more options to browsers as to which image file it can display, even when using multiple breakpoints for art direction. Breakpoints are defined in the configuration files of the theme.</dd>');
+      $output .= '<dd>' . t('While you have the option to provide only one image style per breakpoint, the sizes option allows you to provide more options to browsers as to which image file it can display, even when using multiple breakpoints for art direction. Breakpoints are defined in the configuration files of the theme.</dd>');
       $output .= '<dt>' . t('Sizes field') . '</dt>';
       $output .= '<dd>' . t('Once the sizes option is selected, you can let the browser know the size of this image in relation to the site layout, using the <em>Sizes</em> field. For a hero image that always fills the entire screen, you could simply enter 100vw, which means 100% of the viewport width. For an image that fills 90% of the screen for small viewports, but only fills 40% of the screen when the viewport is larger than 40em (typically 640px), you could enter "(min-width: 40em) 40vw, 90vw" in the Sizes field. The last item in the comma-separated list is the smallest viewport size: other items in the comma-separated list should have a media condition paired with an image width. <em>Media conditions</em> are similar to a media query, often a min-width paired with a viewport width using em or px units: e.g. (min-width: 640px) or (min-width: 40em). This is paired with the <em>image width</em> at that viewport size using px, em or vw units. The vw unit is viewport width and is used instead of a percentage because the percentage always refers to the width of the entire viewport.</dd>');
       $output .= '<dt>' . t('Image styles for sizes') . '</dt>';
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index a6f2930..e8e7aae 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -13,6 +13,7 @@
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
 use Drupal\responsive_image\Plugin\Field\FieldFormatter\ResponsiveImageFormatter;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 use Drupal\user\RoleInterface;
 
 /**
@@ -60,7 +61,7 @@ protected function setUp() {
     ));
     $this->drupalLogin($this->adminUser);
     // Add responsive image style.
-    $this->responsiveImgStyle = entity_create('responsive_image_style', array(
+    $this->responsiveImgStyle = ResponsiveImageStyle::create(array(
       'id' => 'style_one',
       'label' => 'Style One',
       'breakpoint_group' => 'responsive_image_test_module',
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
index af5a955..214ba2b 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -10,6 +10,7 @@
 
 use Drupal\field_ui\Tests\FieldUiTestTrait;
 use Drupal\simpletest\WebTestBase;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
 
 /**
  * Tests the "Responsive Image" formatter settings form.
@@ -65,7 +66,7 @@ function testResponsiveImageFormatterUI() {
     $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
 
     // Create responsive image styles.
-    $responsive_image_style = entity_create('responsive_image_style', array(
+    $responsive_image_style = ResponsiveImageStyle::create(array(
       'id' => 'style_one',
       'label' => 'Style One',
       'breakpoint_group' => 'responsive_image_test_module',
diff --git a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
index a483044..58270a4 100644
--- a/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/EntityResource.php
@@ -18,6 +18,8 @@
 /**
  * Represents entities as resources.
  *
+ * @see \Drupal\rest\Plugin\Deriver\EntityDeriver
+ *
  * @RestResource(
  *   id = "entity",
  *   label = @Translation("Entity"),
@@ -28,8 +30,6 @@
  *     "https://www.drupal.org/link-relations/create" = "/entity/{entity_type}"
  *   }
  * )
- *
- * @see \Drupal\rest\Plugin\Deriver\EntityDeriver
  */
 class EntityResource extends ResourceBase {
 
@@ -112,9 +112,10 @@ public function post(EntityInterface $entity = NULL) {
       $entity->save();
       $this->logger->notice('Created entity %type with ID %id.', array('%type' => $entity->getEntityTypeId(), '%id' => $entity->id()));
 
-      // 201 Created responses have an empty body.
+      // 201 Created responses return the newly created entity in the response
+      // body.
       $url = $entity->urlInfo('canonical', ['absolute' => TRUE])->toString(TRUE);
-      $response = new ResourceResponse(NULL, 201, ['Location' => $url->getGeneratedUrl()]);
+      $response = new ResourceResponse($entity, 201, ['Location' => $url->getGeneratedUrl()]);
       // Responses after creating an entity are not cacheable, so we add no
       // cacheability metadata here.
       return $response;
diff --git a/core/modules/rest/src/Tests/CreateTest.php b/core/modules/rest/src/Tests/CreateTest.php
index fc6037c..47673af 100644
--- a/core/modules/rest/src/Tests/CreateTest.php
+++ b/core/modules/rest/src/Tests/CreateTest.php
@@ -361,8 +361,14 @@ public function createAccountPerEntity($entity_type) {
   public function assertCreateEntityOverRestApi($entity_type, $serialized = NULL) {
     // Note: this will fail with PHP 5.6 when always_populate_raw_post_data is
     // set to something other than -1. See https://www.drupal.org/node/2456025.
-    $this->httpRequest('entity/' . $entity_type, 'POST', $serialized, $this->defaultMimeType);
+    $response = $this->httpRequest('entity/' . $entity_type, 'POST', $serialized, $this->defaultMimeType);
     $this->assertResponse(201);
+
+    // Make sure that the response includes an entity in the body and check the
+    // UUID as an example.
+    $request = Json::decode($serialized);
+    $response = Json::decode($response);
+    $this->assertEqual($request['uuid'][0]['value'], $response['uuid'][0]['value'], 'Got new entity created as response after successful POST over Rest API');
   }
 
   /**
diff --git a/core/modules/rest/src/Tests/CsrfTest.php b/core/modules/rest/src/Tests/CsrfTest.php
index af49a33..25beae1 100644
--- a/core/modules/rest/src/Tests/CsrfTest.php
+++ b/core/modules/rest/src/Tests/CsrfTest.php
@@ -54,7 +54,9 @@ protected function setUp() {
     // request.
     $serializer = $this->container->get('serializer');
     $entity_values = $this->entityValues($this->testEntityType);
-    $entity = entity_create($this->testEntityType, $entity_values);
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->testEntityType)
+      ->create($entity_values);
     $this->serialized = $serializer->serialize($entity, $this->defaultFormat);
   }
 
diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php
index db7d123..e503216 100644
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/src/Tests/RESTTestBase.php
@@ -93,6 +93,7 @@ protected function httpRequest($url, $method, $body = NULL, $mime_type = NULL) {
 
     $url = $this->buildUrl($url);
 
+    $curl_options = array();
     switch ($method) {
       case 'GET':
         // Set query if there are additional GET parameters.
@@ -105,6 +106,16 @@ protected function httpRequest($url, $method, $body = NULL, $mime_type = NULL) {
         );
         break;
 
+        case 'HEAD':
+          $curl_options = array(
+            CURLOPT_HTTPGET => FALSE,
+            CURLOPT_CUSTOMREQUEST => 'HEAD',
+            CURLOPT_URL => $url,
+            CURLOPT_NOBODY => TRUE,
+            CURLOPT_HTTPHEADER => array('Accept: ' . $mime_type),
+          );
+          break;
+
       case 'POST':
         $curl_options = array(
           CURLOPT_HTTPGET => FALSE,
@@ -183,7 +194,9 @@ protected function httpRequest($url, $method, $body = NULL, $mime_type = NULL) {
    *   The new entity object.
    */
   protected function entityCreate($entity_type) {
-    return entity_create($entity_type, $this->entityValues($entity_type));
+    return $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create($this->entityValues($entity_type));
   }
 
   /**
diff --git a/core/modules/rest/src/Tests/ReadTest.php b/core/modules/rest/src/Tests/ReadTest.php
index eb3f222..1cf1eac 100644
--- a/core/modules/rest/src/Tests/ReadTest.php
+++ b/core/modules/rest/src/Tests/ReadTest.php
@@ -94,7 +94,7 @@ public function testRead() {
     // application/hal+json, so it returns a 406.
     $this->assertResponse('406', 'HTTP response code is 406 when the resource does not define formats, because it falls back to the canonical, non-REST route.');
     $this->assertEqual($response, Json::encode([
-      'message' => 'Not acceptable',
+      'message' => 'Not acceptable format: hal_json',
     ]));
   }
 
diff --git a/core/modules/rest/src/Tests/RestLinkManagerTest.php b/core/modules/rest/src/Tests/RestLinkManagerTest.php
index 4adee7c..a8acb33 100644
--- a/core/modules/rest/src/Tests/RestLinkManagerTest.php
+++ b/core/modules/rest/src/Tests/RestLinkManagerTest.php
@@ -25,7 +25,6 @@ class RestLinkManagerTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', ['router']);
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/modules/rest/src/Tests/UpdateTest.php b/core/modules/rest/src/Tests/UpdateTest.php
index ef18a74..f407c1e 100644
--- a/core/modules/rest/src/Tests/UpdateTest.php
+++ b/core/modules/rest/src/Tests/UpdateTest.php
@@ -50,7 +50,9 @@ public function testPatchUpdate() {
       'value' => $this->randomString(),
       'format' => 'plain_text',
     ));
-    $patch_entity = entity_create($entity_type, $patch_values);
+    $patch_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create($patch_values);
     // We don't want to overwrite the UUID.
     $patch_entity->set('uuid', NULL);
     $serialized = $serializer->serialize($patch_entity, $this->defaultFormat, $context);
diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
index b590504..7e882a6 100644
--- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -66,7 +66,7 @@ protected function setUp() {
 
     // Save some entity_test entities.
     for ($i = 1; $i <= 10; $i++) {
-      entity_create('entity_test', array('name' => 'test_' . $i, 'user_id' => $this->adminUser->id()))->save();
+      EntityTest::create(array('name' => 'test_' . $i, 'user_id' => $this->adminUser->id()))->save();
     }
 
     $this->enableViewsTestModule();
diff --git a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
index 4b30b88..aa01d15 100644
--- a/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
+++ b/core/modules/rest/tests/src/Kernel/RequestHandlerTest.php
@@ -13,7 +13,6 @@
 use Drupal\rest\Plugin\Type\ResourcePluginManager;
 use Drupal\rest\RequestHandler;
 use Drupal\rest\ResourceResponse;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
diff --git a/core/modules/search/src/Controller/SearchController.php b/core/modules/search/src/Controller/SearchController.php
index 0893259..000ecf2 100644
--- a/core/modules/search/src/Controller/SearchController.php
+++ b/core/modules/search/src/Controller/SearchController.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\search\SearchPageInterface;
 use Drupal\search\SearchPageRepositoryInterface;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -47,14 +46,12 @@ class SearchController extends ControllerBase {
    *
    * @param \Drupal\search\SearchPageRepositoryInterface $search_page_repository
    *   The search page repository.
-   * @param \Psr\Log\LoggerInterface $logger
-   *   A logger instance.
    * @param \Drupal\Core\Render\RendererInterface $renderer
    *   The renderer.
    */
-  public function __construct(SearchPageRepositoryInterface $search_page_repository, LoggerInterface $logger, RendererInterface $renderer) {
+  public function __construct(SearchPageRepositoryInterface $search_page_repository, RendererInterface $renderer) {
     $this->searchPageRepository = $search_page_repository;
-    $this->logger = $logger;
+    $this->logger = $this->getLogger('search');
     $this->renderer = $renderer;
   }
 
@@ -64,7 +61,6 @@ public function __construct(SearchPageRepositoryInterface $search_page_repositor
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('search.search_page_repository'),
-      $container->get('logger.factory')->get('search'),
       $container->get('renderer')
     );
   }
diff --git a/core/modules/search/src/SearchPageAccessControlHandler.php b/core/modules/search/src/SearchPageAccessControlHandler.php
index 3bd2a6e..36b952a 100644
--- a/core/modules/search/src/SearchPageAccessControlHandler.php
+++ b/core/modules/search/src/SearchPageAccessControlHandler.php
@@ -27,21 +27,21 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     /** @var $entity \Drupal\search\SearchPageInterface */
     if (in_array($operation, array('delete', 'disable'))) {
       if ($entity->isDefaultSearch()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       else {
-        return parent::checkAccess($entity, $operation, $account)->cacheUntilEntityChanges($entity);
+        return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
       }
     }
     if ($operation == 'view') {
       if (!$entity->status()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       $plugin = $entity->getPlugin();
       if ($plugin instanceof AccessibleInterface) {
-        return $plugin->access($operation, $account, TRUE)->cacheUntilEntityChanges($entity);
+        return $plugin->access($operation, $account, TRUE)->addCacheableDependency($entity);
       }
-      return AccessResult::allowed()->cacheUntilEntityChanges($entity);
+      return AccessResult::allowed()->addCacheableDependency($entity);
     }
     return parent::checkAccess($entity, $operation, $account);
   }
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
deleted file mode 100644
index 8f04775..0000000
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchPageTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d6;
-
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\search\Entity\SearchPage;
-
-/**
- * Upgrade search rank settings to search.page.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSearchPageTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['search'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('search_page');
-  }
-
-  /**
-   * Tests Drupal 6 search settings to Drupal 8 search page entity migration.
-   */
-  public function testSearchPage() {
-    $id = 'node_search';
-    /** @var \Drupal\search\Entity\SearchPage $search_page */
-    $search_page = SearchPage::load($id);
-    $this->assertIdentical($id, $search_page->id());
-    $configuration = $search_page->getPlugin()->getConfiguration();
-    $this->assertIdentical($configuration['rankings'], array(
-      'comments' => 5,
-      'promote' => 0,
-      'recent' => 0,
-      'relevance' => 2,
-      'sticky' => 8,
-      'views' => 1,
-    ));
-    $this->assertIdentical('node', $search_page->getPath());
-
-    // Test that we can re-import using the EntitySearchPage destination.
-    Database::getConnection('default', 'migrate')
-      ->update('variable')
-      ->fields(array('value' => serialize(4)))
-      ->condition('name', 'node_rank_comments')
-      ->execute();
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('search_page');
-    // Indicate we're rerunning a migration that's already run.
-    $migration->getIdMap()->prepareUpdate();
-    $this->executeMigration($migration);
-
-    $configuration = SearchPage::load($id)->getPlugin()->getConfiguration();
-    $this->assertIdentical(4, $configuration['rankings']['comments']);
-  }
-
-}
diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
deleted file mode 100644
index 634a3a4..0000000
--- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d6\MigrateSearchSettingsTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to search.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSearchSettingsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['search'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_search_settings');
-  }
-
-  /**
-   * Tests migration of search variables to search.settings.yml.
-   */
-  public function testSearchSettings() {
-    $config = $this->config('search.settings');
-    $this->assertIdentical(3, $config->get('index.minimum_word_size'));
-    $this->assertIdentical(TRUE, $config->get('index.overlap_cjk'));
-    $this->assertIdentical(100, $config->get('index.cron_limit'));
-    $this->assertIdentical(TRUE, $config->get('logging'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'search.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
deleted file mode 100644
index 4781dbc..0000000
--- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchPageTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchPageTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d7;
-
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\search\Entity\SearchPage;
-
-/**
- * Upgrade search rank settings to search.page.*.yml.
- *
- * @group migrate_drupal_7
- */
-class MigrateSearchPageTest extends MigrateDrupal7TestBase {
-
-  /**
-   * The modules to be enabled during the test.
-   *
-   * {@inheritdoc}
-   */
-  public static $modules = array('node', 'search');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('search_page');
-  }
-
-  /**
-   * Tests Drupal 7 search ranking to Drupal 8 search page entity migration.
-   */
-  public function testSearchPage() {
-    $id = 'node_search';
-    /** @var \Drupal\search\Entity\SearchPage $search_page */
-    $search_page = SearchPage::load($id);
-    $this->assertIdentical($id, $search_page->id());
-    $configuration = $search_page->getPlugin()->getConfiguration();
-    $expected_rankings = array(
-      'comments' => 0,
-      'promote' => 0,
-      'relevance' => 2,
-      'sticky' => 0,
-      'views' => 0,
-    );
-    $this->assertIdentical($expected_rankings, $configuration['rankings']);
-    $this->assertIdentical('node', $search_page->getPath());
-
-    // Test that we can re-import using the EntitySearchPage destination.
-    Database::getConnection('default', 'migrate')
-      ->update('variable')
-      ->fields(array('value' => serialize(4)))
-      ->condition('name', 'node_rank_comments')
-      ->execute();
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('search_page');
-    // Indicate we're rerunning a migration that's already run.
-    $migration->getIdMap()->prepareUpdate();
-    $this->executeMigration($migration);
-
-    $configuration = SearchPage::load($id)->getPlugin()->getConfiguration();
-    $this->assertIdentical(4, $configuration['rankings']['comments']);
-  }
-
-}
diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php
deleted file mode 100644
index ac0e4c0..0000000
--- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\search\Tests\Migrate\d7\MigrateSearchSettingsTest.
- */
-
-namespace Drupal\search\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Search variables to configuration.
- *
- * @group search
- */
-class MigrateSearchSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['search'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_search_settings');
-  }
-
-  /**
-   * Tests the migration of Search's variables to configuration.
-   */
-  public function testSearchSettings() {
-    $config = $this->config('search.settings');
-    $this->assertIdentical('node_search', $config->get('default_page'));
-    $this->assertIdentical(4, $config->get('index.minimum_word_size'));
-    $this->assertTrue($config->get('index.overlap_cjk'));
-    $this->assertIdentical(100, $config->get('index.cron_limit'));
-    $this->assertIdentical(7, $config->get('and_or_limit'));
-    $this->assertIdentical(25, $config->get('index.tag_weights.h1'));
-    $this->assertIdentical(18, $config->get('index.tag_weights.h2'));
-    $this->assertIdentical(15, $config->get('index.tag_weights.h3'));
-    $this->assertIdentical(12, $config->get('index.tag_weights.h4'));
-    $this->assertIdentical(9, $config->get('index.tag_weights.h5'));
-    $this->assertIdentical(6, $config->get('index.tag_weights.h6'));
-    $this->assertIdentical(3, $config->get('index.tag_weights.u'));
-    $this->assertIdentical(3, $config->get('index.tag_weights.b'));
-    $this->assertIdentical(3, $config->get('index.tag_weights.i'));
-    $this->assertIdentical(3, $config->get('index.tag_weights.strong'));
-    $this->assertIdentical(3, $config->get('index.tag_weights.em'));
-    $this->assertIdentical(10, $config->get('index.tag_weights.a'));
-    $this->assertTrue($config->get('logging'));
-  }
-
-}
diff --git a/core/modules/search/src/Tests/SearchBlockTest.php b/core/modules/search/src/Tests/SearchBlockTest.php
index 5406502..2da3da7 100644
--- a/core/modules/search/src/Tests/SearchBlockTest.php
+++ b/core/modules/search/src/Tests/SearchBlockTest.php
@@ -78,7 +78,7 @@ public function testSearchFormBlock() {
     $this->assertEqual(
       $this->getUrl(),
       \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => $terms['keys']), 'absolute' => TRUE)),
-      'Submitted to correct url.'
+      'Submitted to correct URL.'
     );
 
     // Test an empty search via the block form, from the front page.
@@ -92,7 +92,7 @@ public function testSearchFormBlock() {
     $this->assertEqual(
       $this->getUrl(),
       \Drupal::url('search.view_' . $entity_id, array(), array('query' => array('keys' => ''), 'absolute' => TRUE)),
-      'Redirected to correct url.'
+      'Redirected to correct URL.'
     );
 
     // Test that after entering a too-short keyword in the form, you can then
diff --git a/core/modules/search/src/Tests/SearchCommentTest.php b/core/modules/search/src/Tests/SearchCommentTest.php
index d7f7255..faec089 100644
--- a/core/modules/search/src/Tests/SearchCommentTest.php
+++ b/core/modules/search/src/Tests/SearchCommentTest.php
@@ -11,6 +11,7 @@
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\user\RoleInterface;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests integration searching comments.
@@ -59,7 +60,7 @@ class SearchCommentTest extends SearchTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -90,7 +91,7 @@ protected function setUp() {
   function testSearchResultsComment() {
     $node_storage = $this->container->get('entity.manager')->getStorage('node');
     // Create basic_html format that escapes all HTML.
-    $basic_html_format = entity_create('filter_format', array(
+    $basic_html_format = FilterFormat::create(array(
       'format' => 'basic_html',
       'name' => 'Basic HTML',
       'weight' => 1,
diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php
index 4f12cdf..6c9f0e9 100644
--- a/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/core/modules/search/src/Tests/SearchRankingTest.php
@@ -10,6 +10,7 @@
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Core\Url;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Indexes content and tests ranking factors.
@@ -203,7 +204,7 @@ public function testRankings() {
    * Test rankings of HTML tags.
    */
   public function testHTMLRankings() {
-    $full_html_format = entity_create('filter_format', array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
     ));
diff --git a/core/modules/search/tests/modules/search_query_alter/search_query_alter.module b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
index 57bdb16..aee8e6c 100644
--- a/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
+++ b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
@@ -1,12 +1,12 @@
 <?php
 
-use Drupal\Core\Database\Query\AlterableInterface;
-
 /**
  * @file
  * Test module that alters search queries.
  */
 
+use Drupal\Core\Database\Query\AlterableInterface;
+
 /**
  * Implements hook_query_TAG_alter(): tag search_$type with $type node_search.
  */
diff --git a/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
new file mode 100644
index 0000000..5f12a33
--- /dev/null
+++ b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchPageTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d6\MigrateSearchPageTest.
+ */
+
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\search\Entity\SearchPage;
+
+/**
+ * Upgrade search rank settings to search.page.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSearchPageTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['search'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('search_page');
+  }
+
+  /**
+   * Tests Drupal 6 search settings to Drupal 8 search page entity migration.
+   */
+  public function testSearchPage() {
+    $id = 'node_search';
+    /** @var \Drupal\search\Entity\SearchPage $search_page */
+    $search_page = SearchPage::load($id);
+    $this->assertIdentical($id, $search_page->id());
+    $configuration = $search_page->getPlugin()->getConfiguration();
+    $this->assertIdentical($configuration['rankings'], array(
+      'comments' => 5,
+      'promote' => 0,
+      'recent' => 0,
+      'relevance' => 2,
+      'sticky' => 8,
+      'views' => 1,
+    ));
+    $this->assertIdentical('node', $search_page->getPath());
+
+    // Test that we can re-import using the EntitySearchPage destination.
+    Database::getConnection('default', 'migrate')
+      ->update('variable')
+      ->fields(array('value' => serialize(4)))
+      ->condition('name', 'node_rank_comments')
+      ->execute();
+
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('search_page');
+    // Indicate we're rerunning a migration that's already run.
+    $migration->getIdMap()->prepareUpdate();
+    $this->executeMigration($migration);
+
+    $configuration = SearchPage::load($id)->getPlugin()->getConfiguration();
+    $this->assertIdentical(4, $configuration['rankings']['comments']);
+  }
+
+}
diff --git a/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
new file mode 100644
index 0000000..a37a89e
--- /dev/null
+++ b/core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d6\MigrateSearchSettingsTest.
+ */
+
+namespace Drupal\Tests\search\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to search.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSearchSettingsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['search'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_search_settings');
+  }
+
+  /**
+   * Tests migration of search variables to search.settings.yml.
+   */
+  public function testSearchSettings() {
+    $config = $this->config('search.settings');
+    $this->assertIdentical(3, $config->get('index.minimum_word_size'));
+    $this->assertIdentical(TRUE, $config->get('index.overlap_cjk'));
+    $this->assertIdentical(100, $config->get('index.cron_limit'));
+    $this->assertIdentical(TRUE, $config->get('logging'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'search.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
new file mode 100644
index 0000000..44cb6ad
--- /dev/null
+++ b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchPageTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d7\MigrateSearchPageTest.
+ */
+
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\search\Entity\SearchPage;
+
+/**
+ * Upgrade search rank settings to search.page.*.yml.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateSearchPageTest extends MigrateDrupal7TestBase {
+
+  /**
+   * The modules to be enabled during the test.
+   *
+   * {@inheritdoc}
+   */
+  public static $modules = array('node', 'search');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('search_page');
+  }
+
+  /**
+   * Tests Drupal 7 search ranking to Drupal 8 search page entity migration.
+   */
+  public function testSearchPage() {
+    $id = 'node_search';
+    /** @var \Drupal\search\Entity\SearchPage $search_page */
+    $search_page = SearchPage::load($id);
+    $this->assertIdentical($id, $search_page->id());
+    $configuration = $search_page->getPlugin()->getConfiguration();
+    $expected_rankings = array(
+      'comments' => 0,
+      'promote' => 0,
+      'relevance' => 2,
+      'sticky' => 0,
+      'views' => 0,
+    );
+    $this->assertIdentical($expected_rankings, $configuration['rankings']);
+    $this->assertIdentical('node', $search_page->getPath());
+
+    // Test that we can re-import using the EntitySearchPage destination.
+    Database::getConnection('default', 'migrate')
+      ->update('variable')
+      ->fields(array('value' => serialize(4)))
+      ->condition('name', 'node_rank_comments')
+      ->execute();
+
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('search_page');
+    // Indicate we're rerunning a migration that's already run.
+    $migration->getIdMap()->prepareUpdate();
+    $this->executeMigration($migration);
+
+    $configuration = SearchPage::load($id)->getPlugin()->getConfiguration();
+    $this->assertIdentical(4, $configuration['rankings']['comments']);
+  }
+
+}
diff --git a/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php
new file mode 100644
index 0000000..8373e05
--- /dev/null
+++ b/core/modules/search/tests/src/Kernel/Migrate/d7/MigrateSearchSettingsTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\search\Kernel\Migrate\d7\MigrateSearchSettingsTest.
+ */
+
+namespace Drupal\Tests\search\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Search variables to configuration.
+ *
+ * @group search
+ */
+class MigrateSearchSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['search'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_search_settings');
+  }
+
+  /**
+   * Tests the migration of Search's variables to configuration.
+   */
+  public function testSearchSettings() {
+    $config = $this->config('search.settings');
+    $this->assertIdentical('node_search', $config->get('default_page'));
+    $this->assertIdentical(4, $config->get('index.minimum_word_size'));
+    $this->assertTrue($config->get('index.overlap_cjk'));
+    $this->assertIdentical(100, $config->get('index.cron_limit'));
+    $this->assertIdentical(7, $config->get('and_or_limit'));
+    $this->assertIdentical(25, $config->get('index.tag_weights.h1'));
+    $this->assertIdentical(18, $config->get('index.tag_weights.h2'));
+    $this->assertIdentical(15, $config->get('index.tag_weights.h3'));
+    $this->assertIdentical(12, $config->get('index.tag_weights.h4'));
+    $this->assertIdentical(9, $config->get('index.tag_weights.h5'));
+    $this->assertIdentical(6, $config->get('index.tag_weights.h6'));
+    $this->assertIdentical(3, $config->get('index.tag_weights.u'));
+    $this->assertIdentical(3, $config->get('index.tag_weights.b'));
+    $this->assertIdentical(3, $config->get('index.tag_weights.i'));
+    $this->assertIdentical(3, $config->get('index.tag_weights.strong'));
+    $this->assertIdentical(3, $config->get('index.tag_weights.em'));
+    $this->assertIdentical(10, $config->get('index.tag_weights.a'));
+    $this->assertTrue($config->get('logging'));
+  }
+
+}
diff --git a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
index d007bd9..0fb0a0b 100644
--- a/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
+++ b/core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
@@ -27,12 +27,18 @@ class EntityReferenceFieldItemNormalizer extends ComplexDataNormalizer {
   public function normalize($field_item, $format = NULL, array $context = []) {
     $values = parent::normalize($field_item, $format, $context);
 
-    // Add a 'url' value if there is a reference and a canonical URL. Hard code
-    // 'canonical' here as config entities override the default $rel parameter
-    // value to 'edit-form.
     /** @var \Drupal\Core\Entity\EntityInterface $entity */
-    if (($entity = $field_item->get('entity')->getValue()) && ($url = $entity->url('canonical'))) {
-      $values['url'] = $url;
+    if ($entity = $field_item->get('entity')->getValue()) {
+      $values['target_type'] = $entity->getEntityTypeId();
+      // Add the target entity UUID to the normalized output values.
+      $values['target_uuid'] = $entity->uuid();
+
+      // Add a 'url' value if there is a reference and a canonical URL. Hard
+      // code 'canonical' here as config entities override the default $rel
+      // parameter value to 'edit-form.
+      if ($url = $entity->url('canonical')) {
+        $values['url'] = $url;
+      }
     }
 
     return $values;
diff --git a/core/modules/serialization/src/Tests/EntityResolverTest.php b/core/modules/serialization/src/Tests/EntityResolverTest.php
index e362b8d..481afc3 100644
--- a/core/modules/serialization/src/Tests/EntityResolverTest.php
+++ b/core/modules/serialization/src/Tests/EntityResolverTest.php
@@ -8,6 +8,8 @@
 
 use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests that entities references can be resolved.
@@ -36,7 +38,7 @@ protected function setUp() {
     \Drupal::service('router.builder')->rebuild();
 
     // Create the test field storage.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_entity_reference',
       'type' => 'entity_reference',
@@ -46,11 +48,11 @@ protected function setUp() {
     ))->save();
 
     // Create the test field.
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_entity_reference',
       'bundle' => 'entity_test_mulrev',
-    ))->save();
+    ])->save();
   }
 
   /**
diff --git a/core/modules/serialization/src/Tests/EntitySerializationTest.php b/core/modules/serialization/src/Tests/EntitySerializationTest.php
index d9be353..abcac01 100644
--- a/core/modules/serialization/src/Tests/EntitySerializationTest.php
+++ b/core/modules/serialization/src/Tests/EntitySerializationTest.php
@@ -116,6 +116,8 @@ public function testNormalize() {
       'user_id' => array(
         array(
           'target_id' => $this->user->id(),
+          'target_type' => $this->user->getEntityTypeId(),
+          'target_uuid' => $this->user->uuid(),
           'url' => $this->user->url(),
         ),
       ),
@@ -190,7 +192,7 @@ public function testSerialize() {
       'name' => '<name><value>' . $this->values['name'] . '</value></name>',
       'type' => '<type><value>entity_test_mulrev</value></type>',
       'created' => '<created><value>' . $this->entity->created->value . '</value></created>',
-      'user_id' => '<user_id><target_id>' . $this->user->id() . '</target_id><url>' . $this->user->url() . '</url></user_id>',
+      'user_id' => '<user_id><target_id>' . $this->user->id() . '</target_id><target_type>' . $this->user->getEntityTypeId() . '</target_type><target_uuid>' . $this->user->uuid() . '</target_uuid><url>' . $this->user->url() . '</url></user_id>',
       'revision_id' => '<revision_id><value>' . $this->entity->getRevisionId() . '</value></revision_id>',
       'default_langcode' => '<default_langcode><value>1</value></default_langcode>',
       'field_test_text' => '<field_test_text><value>' . $this->values['field_test_text']['value'] . '</value><format>' . $this->values['field_test_text']['format'] . '</format></field_test_text>',
diff --git a/core/modules/serialization/src/Tests/NormalizerTestBase.php b/core/modules/serialization/src/Tests/NormalizerTestBase.php
index 50e3c87..42c4bcc 100644
--- a/core/modules/serialization/src/Tests/NormalizerTestBase.php
+++ b/core/modules/serialization/src/Tests/NormalizerTestBase.php
@@ -25,13 +25,12 @@ protected function setUp() {
 
     $this->installEntitySchema('entity_test_mulrev');
     $this->installEntitySchema('user');
-    $this->installSchema('system', array('url_alias', 'router'));
     $this->installConfig(array('field'));
     \Drupal::service('router.builder')->rebuild();
     \Drupal::moduleHandler()->invoke('rest', 'install');
 
     // Auto-create a field for testing.
-    FieldstorageConfig::create(array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'entity_test_mulrev',
       'field_name' => 'field_test_text',
       'type' => 'text',
diff --git a/core/modules/serialization/tests/modules/entity_serialization_test/entity_serialization_test.module b/core/modules/serialization/tests/modules/entity_serialization_test/entity_serialization_test.module
index a75e21c..26bd88c 100644
--- a/core/modules/serialization/tests/modules/entity_serialization_test/entity_serialization_test.module
+++ b/core/modules/serialization/tests/modules/entity_serialization_test/entity_serialization_test.module
@@ -18,6 +18,6 @@ function entity_serialization_test_entity_field_access_alter(array &$grants, arr
   // Override default access control from UserAccessControlHandler to allow
   // access to 'pass' field for the test user.
   if ($context['field_definition']->getName() == 'pass' && $context['account']->getUsername() == 'serialization_test_user') {
-    $grants[':default'] = AccessResult::allowed()->inheritCacheability($grants[':default'])->cacheUntilEntityChanges($context['items']->getEntity());
+    $grants[':default'] = AccessResult::allowed()->inheritCacheability($grants[':default'])->addCacheableDependency($context['items']->getEntity());
   }
 }
diff --git a/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php b/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php
index a86b6f7..04cfa16 100644
--- a/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php
+++ b/core/modules/serialization/tests/src/Unit/Normalizer/EntityReferenceFieldItemNormalizerTest.php
@@ -78,6 +78,12 @@ public function testNormalize() {
     $entity->url('canonical')
       ->willReturn($test_url)
       ->shouldBeCalled();
+    $entity->uuid()
+      ->willReturn('080e3add-f9d5-41ac-9821-eea55b7b42fb')
+      ->shouldBeCalled();
+    $entity->getEntityTypeId()
+      ->willReturn('test_type')
+      ->shouldBeCalled();
 
     $entity_reference = $this->prophesize(TypedDataInterface::class);
     $entity_reference->getValue()
@@ -92,6 +98,8 @@ public function testNormalize() {
 
     $expected = [
       'target_id' => ['value' => 'test'],
+      'target_type' => 'test_type',
+      'target_uuid' => '080e3add-f9d5-41ac-9821-eea55b7b42fb',
       'url' => $test_url,
     ];
     $this->assertSame($expected, $normalized);
diff --git a/core/modules/shortcut/shortcut.install b/core/modules/shortcut/shortcut.install
index 73986b8..8df408f 100644
--- a/core/modules/shortcut/shortcut.install
+++ b/core/modules/shortcut/shortcut.install
@@ -64,6 +64,6 @@ function shortcut_uninstall() {
   // Theme settings are not configuration entities and cannot depend on modules
   // so to unset a module-specific setting, we need to unset it with logic.
   if (\Drupal::service('theme_handler')->themeExists('seven')) {
-    \Drupal::configFactory()->getEditable('seven.settings')->clear('third_party_settings.shortcut.module_link')->save(TRUE);
+    \Drupal::configFactory()->getEditable('seven.settings')->clear('third_party_settings.shortcut')->save(TRUE);
   }
 }
diff --git a/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php b/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
index 557fea3..8d57b42 100644
--- a/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
+++ b/core/modules/shortcut/src/Plugin/migrate/destination/ShortcutSetUsers.php
@@ -9,7 +9,7 @@
 
 use Drupal\shortcut\ShortcutSetStorageInterface;
 use Drupal\user\Entity\User;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -38,7 +38,7 @@ class ShortcutSetUsers extends DestinationBase implements ContainerFactoryPlugin
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param \Drupal\shortcut\ShortcutSetStorageInterface $shortcut_set_storage
    *   The shortcut_set entity storage handler.
diff --git a/core/modules/shortcut/src/ShortcutAccessControlHandler.php b/core/modules/shortcut/src/ShortcutAccessControlHandler.php
index f760937..cbfae00 100644
--- a/core/modules/shortcut/src/ShortcutAccessControlHandler.php
+++ b/core/modules/shortcut/src/ShortcutAccessControlHandler.php
@@ -61,7 +61,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     }
     // @todo Fix this bizarre code: how can a shortcut exist without a shortcut
     // set? The above if-test is unnecessary. See https://www.drupal.org/node/2339903.
-    return AccessResult::neutral()->cacheUntilEntityChanges($entity);
+    return AccessResult::neutral()->addCacheableDependency($entity);
   }
 
   /**
diff --git a/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php b/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
index 3e9edc7..b859ff6 100644
--- a/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
+++ b/core/modules/shortcut/src/ShortcutSetAccessControlHandler.php
@@ -31,7 +31,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
         if (!$account->hasPermission('access shortcuts')) {
           return AccessResult::neutral()->cachePerPermissions();
         }
-        return AccessResult::allowedIf($account->hasPermission('customize shortcut links') && $entity == shortcut_current_displayed_set($account))->cachePerPermissions()->cacheUntilEntityChanges($entity);
+        return AccessResult::allowedIf($account->hasPermission('customize shortcut links') && $entity == shortcut_current_displayed_set($account))->cachePerPermissions()->addCacheableDependency($entity);
 
       case 'delete':
         return AccessResult::allowedIf($account->hasPermission('administer shortcuts') && $entity->id() != 'default')->cachePerPermissions();
diff --git a/core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php b/core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php
deleted file mode 100644
index ba9a000..0000000
--- a/core/modules/shortcut/src/Tests/Migrate/MigrateShortcutStubTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\shortcut\Tests\Migrate\MigrateShortcutStubTest.
- */
-
-namespace Drupal\shortcut\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for shortcut entities.
- *
- * @group shortcut
- */
-class MigrateShortcutStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['shortcut', 'link'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('shortcut');
-    // Make sure the 'default' shortcut_set is installed.
-    $this->installConfig(['shortcut']);
-  }
-
-  /**
-   * Tests creation of shortcut stubs.
-   */
-  public function testStub() {
-    $this->performStubTest('shortcut');
-  }
-
-}
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php b/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php
deleted file mode 100644
index ff2cd8f..0000000
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutSetTest.
- */
-
-namespace Drupal\shortcut\Tests\Migrate\d7;
-
-use Drupal\shortcut\Entity\ShortcutSet;
-use Drupal\shortcut\ShortcutSetInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Test shortcut_set migration to ShortcutSet entities.
- *
- * @group shortcut
- */
-class MigrateShortcutSetTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  static $modules = array(
-    'link',
-    'field',
-    'shortcut',
-    'menu_link_content',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-    $this->installEntitySchema('shortcut');
-    $this->installEntitySchema('menu_link_content');
-    \Drupal::service('router.builder')->rebuild();
-    $this->executeMigration('d7_shortcut_set');
-    $this->executeMigration('menu');
-    $this->executeMigration('menu_links');
-    $this->executeMigration('d7_shortcut');
-  }
-
-  /**
-   * Test the shortcut set migration.
-   */
-  public function testShortcutSetMigration() {
-    $this->assertEntity('default', 'Default', 2);
-    $this->assertEntity('shortcut_set_2', 'Alternative shortcut set', 2);
-  }
-
-  /**
-   * Asserts various aspects of a shortcut set entity.
-   *
-   * @param string $id
-   *   The expected shortcut set ID.
-   * @param string $label
-   *   The expected shortcut set label.
-   * @param int $expected_size
-   *   The number of shortcuts expected to be in the set.
-   */
-  protected function assertEntity($id, $label, $expected_size) {
-    $shortcut_set = ShortcutSet::load($id);
-    $this->assertTrue($shortcut_set instanceof ShortcutSetInterface);
-    /** @var \Drupal\shortcut\ShortcutSetInterface $shortcut_set */
-    $this->assertIdentical($id, $shortcut_set->id());
-    $this->assertIdentical($label, $shortcut_set->label());
-
-    // Check the number of shortcuts in the set.
-    $shortcuts = $shortcut_set->getShortcuts();
-    $this->assertIdentical(count($shortcuts), $expected_size);
-  }
-
-}
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php b/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php
deleted file mode 100644
index ed63ac0..0000000
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutSetUsersTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutSetUsersTest.
- */
-
-namespace Drupal\shortcut\Tests\Migrate\d7;
-
-use Drupal\user\Entity\User;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Test shortcut_set_users migration.
- *
- * @group shortcut
- */
-class MigrateShortcutSetUsersTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  static $modules = array(
-    'link',
-    'field',
-    'shortcut',
-    'menu_link_content',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-    $this->installEntitySchema('shortcut');
-    $this->installEntitySchema('menu_link_content');
-    $this->installSchema('shortcut', ['shortcut_set_users']);
-    \Drupal::service('router.builder')->rebuild();
-    $this->executeMigration('d7_user_role');
-    $this->executeMigration('d7_user');
-    $this->executeMigration('d7_shortcut_set');
-    $this->executeMigration('menu');
-    $this->executeMigration('menu_links');
-    $this->executeMigration('d7_shortcut');
-    $this->executeMigration('d7_shortcut_set_users');
-  }
-
-  /**
-   * Test the shortcut set migration.
-   */
-  public function testShortcutSetUsersMigration() {
-    // Check if migrated user has correct migrated shortcut set assigned.
-    $account = User::load(2);
-    $shortcut_set = shortcut_current_displayed_set($account);
-    /** @var \Drupal\shortcut\ShortcutSetInterface $shortcut_set */
-    $this->assertIdentical('shortcut_set_2', $shortcut_set->id());
-  }
-
-}
diff --git a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php b/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php
deleted file mode 100644
index 0d333fe..0000000
--- a/core/modules/shortcut/src/Tests/Migrate/d7/MigrateShortcutTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\shortcut\Tests\Migrate\d7\MigrateShortcutTest.
- */
-
-namespace Drupal\shortcut\Tests\Migrate\d7;
-
-use Drupal\shortcut\Entity\Shortcut;
-use Drupal\shortcut\ShortcutInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Test shortcut menu links migration to Shortcut entities.
- *
- * @group shortcut
- */
-class MigrateShortcutTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  static $modules = array(
-    'link',
-    'field',
-    'shortcut',
-    'menu_link_content',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-    $this->installEntitySchema('shortcut');
-    $this->installEntitySchema('menu_link_content');
-    \Drupal::service('router.builder')->rebuild();
-    $this->executeMigration('d7_shortcut_set');
-    $this->executeMigration('menu');
-    $this->executeMigration('menu_links');
-    $this->executeMigration('d7_shortcut');
-  }
-
-  /**
-   * Asserts various aspects of a shortcut entity.
-   *
-   * @param int $id
-   *   The shortcut ID.
-   * @param string $title
-   *   The expected title of the shortcut.
-   * @param int $weight
-   *   The expected weight of the shortcut.
-   * @param string $url
-   *   The expected URL of the shortcut.
-   */
-  protected function assertEntity($id, $title, $weight, $url) {
-    $shortcut = Shortcut::load($id);
-    $this->assertTrue($shortcut instanceof ShortcutInterface);
-    /** @var \Drupal\shortcut\ShortcutInterface $shortcut */
-    $this->assertIdentical($title, $shortcut->getTitle());
-    $this->assertIdentical($weight, $shortcut->getWeight());
-    $this->assertIdentical($url, $shortcut->getUrl()->toString());
-  }
-
-  /**
-   * Test the shortcut migration.
-   */
-  public function testShortcutMigration() {
-    // Check if the 4 shortcuts were migrated correctly.
-    $this->assertEntity(1, 'Add content', '-20', '/node/add');
-    $this->assertEntity(2, 'Find content', '-19', '/admin/content');
-    $this->assertEntity(3, 'Help', '-49', '/admin/help');
-    $this->assertEntity(4, 'People', '-50', '/admin/people');
-  }
-
-}
diff --git a/core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php
new file mode 100644
index 0000000..526a273
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/MigrateShortcutStubTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\MigrateShortcutStubTest.
+ */
+
+namespace Drupal\Tests\shortcut\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for shortcut entities.
+ *
+ * @group shortcut
+ */
+class MigrateShortcutStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['shortcut', 'link'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('shortcut');
+    // Make sure the 'default' shortcut_set is installed.
+    $this->installConfig(['shortcut']);
+  }
+
+  /**
+   * Tests creation of shortcut stubs.
+   */
+  public function testStub() {
+    $this->performStubTest('shortcut');
+  }
+
+}
diff --git a/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
new file mode 100644
index 0000000..0e0510b
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\d7\MigrateShortcutSetTest.
+ */
+
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
+
+use Drupal\shortcut\Entity\ShortcutSet;
+use Drupal\shortcut\ShortcutSetInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test shortcut_set migration to ShortcutSet entities.
+ *
+ * @group shortcut
+ */
+class MigrateShortcutSetTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'link',
+    'field',
+    'shortcut',
+    'menu_link_content',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('shortcut');
+    $this->installEntitySchema('menu_link_content');
+    \Drupal::service('router.builder')->rebuild();
+    $this->executeMigration('d7_shortcut_set');
+    $this->executeMigration('menu');
+    $this->executeMigration('menu_links');
+    $this->executeMigration('d7_shortcut');
+  }
+
+  /**
+   * Test the shortcut set migration.
+   */
+  public function testShortcutSetMigration() {
+    $this->assertEntity('default', 'Default', 2);
+    $this->assertEntity('shortcut_set_2', 'Alternative shortcut set', 2);
+  }
+
+  /**
+   * Asserts various aspects of a shortcut set entity.
+   *
+   * @param string $id
+   *   The expected shortcut set ID.
+   * @param string $label
+   *   The expected shortcut set label.
+   * @param int $expected_size
+   *   The number of shortcuts expected to be in the set.
+   */
+  protected function assertEntity($id, $label, $expected_size) {
+    $shortcut_set = ShortcutSet::load($id);
+    $this->assertTrue($shortcut_set instanceof ShortcutSetInterface);
+    /** @var \Drupal\shortcut\ShortcutSetInterface $shortcut_set */
+    $this->assertIdentical($id, $shortcut_set->id());
+    $this->assertIdentical($label, $shortcut_set->label());
+
+    // Check the number of shortcuts in the set.
+    $shortcuts = $shortcut_set->getShortcuts();
+    $this->assertIdentical(count($shortcuts), $expected_size);
+  }
+
+}
diff --git a/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
new file mode 100644
index 0000000..76f4944
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutSetUsersTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\shortcut\Tests\Migrate\d7\MigrateShortcutSetUsersTest.
+ */
+
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
+
+use Drupal\user\Entity\User;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test shortcut_set_users migration.
+ *
+ * @group shortcut
+ */
+class MigrateShortcutSetUsersTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'link',
+    'field',
+    'shortcut',
+    'menu_link_content',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('shortcut');
+    $this->installEntitySchema('menu_link_content');
+    $this->installSchema('shortcut', ['shortcut_set_users']);
+    \Drupal::service('router.builder')->rebuild();
+    $this->executeMigration('d7_user_role');
+    $this->executeMigration('d7_user');
+    $this->executeMigration('d7_shortcut_set');
+    $this->executeMigration('menu');
+    $this->executeMigration('menu_links');
+    $this->executeMigration('d7_shortcut');
+    $this->executeMigration('d7_shortcut_set_users');
+  }
+
+  /**
+   * Test the shortcut set migration.
+   */
+  public function testShortcutSetUsersMigration() {
+    // Check if migrated user has correct migrated shortcut set assigned.
+    $account = User::load(2);
+    $shortcut_set = shortcut_current_displayed_set($account);
+    /** @var \Drupal\shortcut\ShortcutSetInterface $shortcut_set */
+    $this->assertIdentical('shortcut_set_2', $shortcut_set->id());
+  }
+
+}
diff --git a/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
new file mode 100644
index 0000000..45bb9d1
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Kernel/Migrate/d7/MigrateShortcutTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\shortcut\Kernel\Migrate\d7\MigrateShortcutTest.
+ */
+
+namespace Drupal\Tests\shortcut\Kernel\Migrate\d7;
+
+use Drupal\shortcut\Entity\Shortcut;
+use Drupal\shortcut\ShortcutInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Test shortcut menu links migration to Shortcut entities.
+ *
+ * @group shortcut
+ */
+class MigrateShortcutTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  static $modules = array(
+    'link',
+    'field',
+    'shortcut',
+    'menu_link_content',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('shortcut');
+    $this->installEntitySchema('menu_link_content');
+    \Drupal::service('router.builder')->rebuild();
+    $this->executeMigration('d7_shortcut_set');
+    $this->executeMigration('menu');
+    $this->executeMigration('menu_links');
+    $this->executeMigration('d7_shortcut');
+  }
+
+  /**
+   * Asserts various aspects of a shortcut entity.
+   *
+   * @param int $id
+   *   The shortcut ID.
+   * @param string $title
+   *   The expected title of the shortcut.
+   * @param int $weight
+   *   The expected weight of the shortcut.
+   * @param string $url
+   *   The expected URL of the shortcut.
+   */
+  protected function assertEntity($id, $title, $weight, $url) {
+    $shortcut = Shortcut::load($id);
+    $this->assertTrue($shortcut instanceof ShortcutInterface);
+    /** @var \Drupal\shortcut\ShortcutInterface $shortcut */
+    $this->assertIdentical($title, $shortcut->getTitle());
+    $this->assertIdentical($weight, $shortcut->getWeight());
+    $this->assertIdentical($url, $shortcut->getUrl()->toString());
+  }
+
+  /**
+   * Test the shortcut migration.
+   */
+  public function testShortcutMigration() {
+    // Check if the 4 shortcuts were migrated correctly.
+    $this->assertEntity(1, 'Add content', '-20', '/node/add');
+    $this->assertEntity(2, 'Find content', '-19', '/admin/content');
+    $this->assertEntity(3, 'Help', '-49', '/admin/help');
+    $this->assertEntity(4, 'People', '-50', '/admin/people');
+  }
+
+}
diff --git a/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php b/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php
new file mode 100644
index 0000000..f027427
--- /dev/null
+++ b/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\shortcut\Kernel\ShortcutSevenIntegrationTest.
+ */
+
+namespace Drupal\Tests\shortcut\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests shortcut_install() and shortcut_uninstall().
+ *
+ * @group shortcut
+ */
+class ShortcutSevenIntegrationTest extends KernelTestBase {
+
+  public static $modules = ['system'];
+
+  /**
+   * Tests shortcut_install() and shortcut_uninstall().
+   */
+  public function testInstallUninstall() {
+    // Install seven.
+    \Drupal::service('theme_installer')->install(['seven']);
+    $this->assertNull($this->config('seven.settings')->get('third_party_settings.shortcut'), 'There are no shortcut settings in seven.settings.');
+
+    \Drupal::service('module_installer')->install(['shortcut']);
+    $this->assertTrue($this->config('seven.settings')->get('third_party_settings.shortcut.module_link'), 'The shortcut module_link setting is in seven.settings.');
+
+    \Drupal::service('module_installer')->uninstall(['shortcut']);
+    $this->assertNull($this->config('seven.settings')->get('third_party_settings.shortcut'), 'There are no shortcut settings in seven.settings.');
+  }
+
+}
diff --git a/core/modules/simpletest/files/php-1.txt b/core/modules/simpletest/files/php-1.txt
index 52788b6..c641a69 100644
--- a/core/modules/simpletest/files/php-1.txt
+++ b/core/modules/simpletest/files/php-1.txt
@@ -1,3 +1,4 @@
 <?php
+// @codingStandardsIgnoreFile
 print 'SimpleTest PHP was executed!';
 ?>
diff --git a/core/modules/simpletest/files/php-2.php b/core/modules/simpletest/files/php-2.php
index 615a8d7..29738aa 100644
--- a/core/modules/simpletest/files/php-2.php
+++ b/core/modules/simpletest/files/php-2.php
@@ -1,2 +1,3 @@
 <?php
+// @codingStandardsIgnoreFile
 print 'SimpleTest PHP was executed!';
diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install
index c501624..e5eb9a3 100644
--- a/core/modules/simpletest/simpletest.install
+++ b/core/modules/simpletest/simpletest.install
@@ -19,7 +19,6 @@ function simpletest_requirements($phase) {
   $requirements = array();
 
   $has_curl = function_exists('curl_init');
-  $has_domdocument = method_exists('DOMDocument', 'loadHTML');
   $open_basedir = ini_get('open_basedir');
 
   $requirements['curl'] = array(
@@ -28,16 +27,7 @@ function simpletest_requirements($phase) {
   );
   if (!$has_curl) {
     $requirements['curl']['severity'] = REQUIREMENT_ERROR;
-    $requirements['curl']['description'] = t('The testing framework could not be installed because the PHP <a href=":curl_url">cURL</a> library is not available.', array(':curl_url' => 'http://php.net/manual/curl.setup.php'));
-  }
-
-  $requirements['php_domdocument'] = array(
-    'title' => t('PHP DOMDocument class'),
-    'value' => $has_domdocument ? t('Enabled') : t('Not found'),
-  );
-  if (!$has_domdocument) {
-    $requirements['php_domdocument']['severity'] = REQUIREMENT_ERROR;
-    $requirements['php_domdocument']['description'] = t('The testing framework requires the DOMDocument class to be available. Check the configure command at the <a href=":link-phpinfo">PHP info page</a>.', array(':link-phpinfo' => \Drupal::url('system.php')));
+    $requirements['curl']['description'] = t('The testing framework could not be installed because the PHP <a href="http://php.net/manual/curl.setup.php">cURL</a> library is not available.');
   }
 
   // SimpleTest currently needs 2 cURL options which are incompatible with
@@ -49,7 +39,7 @@ function simpletest_requirements($phase) {
   );
   if ($open_basedir) {
     $requirements['php_open_basedir']['severity'] = REQUIREMENT_ERROR;
-    $requirements['php_open_basedir']['description'] = t('The testing framework requires the PHP <a href=":open_basedir-url">open_basedir</a> restriction to be disabled. Check your webserver configuration or contact your web host.', array(':open_basedir-url' => 'http://php.net/manual/ini.core.php#ini.open-basedir'));
+    $requirements['php_open_basedir']['description'] = t('The testing framework requires the PHP <a href="http://php.net/manual/ini.core.php#ini.open-basedir">open_basedir</a> restriction to be disabled. Check your webserver configuration or contact your web host.');
   }
 
   // Check the current memory limit. If it is set too low, SimpleTest will fail
diff --git a/core/modules/simpletest/simpletest.js b/core/modules/simpletest/simpletest.js
index dfe5fba..ba54cbf 100644
--- a/core/modules/simpletest/simpletest.js
+++ b/core/modules/simpletest/simpletest.js
@@ -3,7 +3,7 @@
  * Simpletest behaviors.
  */
 
-(function ($) {
+(function ($, Drupal, drupalSettings) {
 
   'use strict';
 
@@ -127,4 +127,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal, drupalSettings);
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index f5b85a5..4dc7544 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Provides testing functionality.
+ */
+
 use Drupal\Core\Asset\AttachedAssetsInterface;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Render\Element;
@@ -9,11 +14,6 @@
 use Symfony\Component\Process\PhpExecutableFinder;
 
 /**
- * @file
- * Provides testing functionality.
- */
-
-/**
  * Implements hook_help().
  */
 function simpletest_help($route_name, RouteMatchInterface $route_match) {
diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index e6025bf..dc933ac 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -9,7 +9,6 @@
 
 use Behat\Mink\Driver\GoutteDriver;
 use Behat\Mink\Element\Element;
-use Behat\Mink\Exception\Exception;
 use Behat\Mink\Mink;
 use Behat\Mink\Session;
 use Drupal\Component\Utility\SafeMarkup;
@@ -25,6 +24,8 @@
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\Core\Test\TestRunnerKernel;
 use Drupal\Core\Url;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
 use Drupal\user\UserInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -187,7 +188,7 @@
    *
    * @var string.
    */
-  protected $minkDefaultDriverClass = '\Behat\Mink\Driver\GoutteDriver';
+  protected $minkDefaultDriverClass = GoutteDriver::class;
 
   /*
    * Mink default driver params.
@@ -572,7 +573,7 @@ protected function drupalCreateUser(array $permissions = array(), $name = NULL)
       $edit['roles'] = array($rid);
     }
 
-    $account = entity_create('user', $edit);
+    $account = User::create($edit);
     $account->save();
 
     $this->assertNotNull($account->id(), SafeMarkup::format('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])));
@@ -620,7 +621,7 @@ protected function drupalCreateRole(array $permissions, $rid = NULL, $name = NUL
 
     // Create new role.
     /* @var \Drupal\user\RoleInterface $role */
-    $role = entity_create('user_role', array(
+    $role = Role::create(array(
       'id' => $rid,
       'label' => $name,
     ));
diff --git a/core/modules/simpletest/src/InstallerTestBase.php b/core/modules/simpletest/src/InstallerTestBase.php
index 8115840..adc5463 100644
--- a/core/modules/simpletest/src/InstallerTestBase.php
+++ b/core/modules/simpletest/src/InstallerTestBase.php
@@ -118,7 +118,7 @@ protected function setUp() {
       ->set('app.root', DRUPAL_ROOT);
     \Drupal::setContainer($this->container);
 
-    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+    $this->visitInstaller();
 
     // Select language.
     $this->setUpLanguage();
@@ -165,6 +165,13 @@ protected function setUp() {
   }
 
   /**
+   * Visits the interactive installer.
+   */
+  protected function visitInstaller() {
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+  }
+
+  /**
    * Installer step: Select language.
    */
   protected function setUpLanguage() {
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index 3460e73..75c9955 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -435,10 +435,18 @@ protected function installSchema($module, $tables) {
     if (!$this->container->get('module_handler')->moduleExists($module)) {
       throw new \RuntimeException("'$module' module is not enabled");
     }
+
     $tables = (array) $tables;
     foreach ($tables as $table) {
       $schema = drupal_get_module_schema($module, $table);
       if (empty($schema)) {
+        // BC layer to avoid some contrib tests to fail.
+        // @todo Remove the BC layer before 8.1.x release.
+        // @see https://www.drupal.org/node/2670360
+        // @see https://www.drupal.org/node/2670454
+        if ($module == 'system') {
+          continue;
+        }
         throw new \RuntimeException("Unknown '$table' table schema in '$module' module.");
       }
       $this->container->get('database')->schema()->createTable($table, $schema);
@@ -602,9 +610,7 @@ protected function registerStreamWrapper($scheme, $class, $type = StreamWrapperI
   protected function render(array &$elements) {
     // Use the bare HTML page renderer to render our links.
     $renderer = $this->container->get('bare_html_page_renderer');
-    $response = $renderer->renderBarePage(
-      $elements, '', $this->container->get('theme.manager')->getActiveTheme()->getName()
-    );
+    $response = $renderer->renderBarePage($elements, '', 'maintenance_page');
 
     // Glean the content from the response object.
     $content = $response->getContent();
diff --git a/core/modules/simpletest/src/RouteProvider.php b/core/modules/simpletest/src/RouteProvider.php
index acff99a..0784d72 100644
--- a/core/modules/simpletest/src/RouteProvider.php
+++ b/core/modules/simpletest/src/RouteProvider.php
@@ -13,6 +13,9 @@
 
 /**
  * Rebuilds the router when the provider is instantiated.
+ *
+ * @todo Move this outside of simpletest namespace to the Drupal\Tests, see
+ *   https://www.drupal.org/node/2672762
  */
 class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProviderInterface {
 
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index 1cdc231..517afb8 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -314,7 +314,7 @@
    * HTTP authentication method (specified as a CURLAUTH_* constant).
    *
    * @var int
-   * @see http://php.net/manual/en/function.curl-setopt.php
+   * @see http://php.net/manual/function.curl-setopt.php
    */
   protected $httpAuthMethod = CURLAUTH_BASIC;
 
diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index 3538934..fab8833 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -11,7 +11,6 @@
 use Doctrine\Common\Reflection\StaticReflectionParser;
 use Drupal\Component\Annotation\Reflection\MockFileFinder;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\Extension\ModuleHandlerInterface;
diff --git a/core/modules/simpletest/src/TestServiceProvider.php b/core/modules/simpletest/src/TestServiceProvider.php
index 5a1a398..ba65c37 100644
--- a/core/modules/simpletest/src/TestServiceProvider.php
+++ b/core/modules/simpletest/src/TestServiceProvider.php
@@ -33,15 +33,25 @@ function register(ContainerBuilder $container) {
    */
   public function alter(ContainerBuilder $container) {
     if (static::$currentTest instanceof KernelTestBase) {
+      static::addRouteProvider($container);
+    }
+  }
+
+  /**
+   * Add the on demand rebuild route provider service.
+   *
+   * @param \Drupal\Core\DependencyInjection\ContainerBuilder $container
+   */
+  public static function addRouteProvider(ContainerBuilder $container) {
+    foreach (['router.route_provider' => 'RouteProvider'] as $original_id => $class) {
       // While $container->get() does a recursive resolve, getDefinition() does
       // not, so do it ourselves.
-      foreach (['router.route_provider' => 'RouteProvider'] as $original_id => $class) {
-        for ($id = $original_id; $container->hasAlias($id); $id = (string) $container->getAlias($id));
-        $definition = $container->getDefinition($id);
-        $definition->clearTag('needs_destruction');
-        $container->setDefinition("simpletest.$original_id", $definition);
-        $container->setDefinition($id, new Definition('Drupal\simpletest\\' . $class));
-      }
+      for ($id = $original_id; $container->hasAlias($id); $id = (string) $container->getAlias($id));
+      $definition = $container->getDefinition($id);
+      $definition->clearTag('needs_destruction');
+      $container->setDefinition("simpletest.$original_id", $definition);
+      $container->setDefinition($id, new Definition('Drupal\simpletest\\' . $class));
     }
   }
+
 }
diff --git a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
index 2187ccc..5bcd5d3 100644
--- a/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
+++ b/core/modules/simpletest/src/Tests/KernelTestBaseTest.php
@@ -8,7 +8,10 @@
 namespace Drupal\simpletest\Tests;
 
 use Drupal\Core\Database\Database;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\KernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
 
 /**
  * Tests KernelTestBase functionality.
@@ -272,21 +275,21 @@ function testEnableModulesFixedList() {
     $this->enableModules(array('field_test'));
 
     // Create a field.
-    entity_create('entity_view_display', array(
+    $display = EntityViewDisplay::create(array(
       'targetEntityType' => 'entity_test',
       'bundle' => 'entity_test',
       'mode' => 'default',
     ));
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'test_field',
       'entity_type' => 'entity_test',
       'type' => 'test_field'
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
   }
 
   /**
diff --git a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
deleted file mode 100644
index ad66d9f..0000000
--- a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\simpletest\Tests\Migrate\d6\MigrateSimpletestConfigsTest.
- */
-
-namespace Drupal\simpletest\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to simpletest.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('simpletest');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['simpletest']);
-    $this->executeMigration('d6_simpletest_settings');
-  }
-
-  /**
-   * Tests migration of simpletest variables to simpletest.settings.yml.
-   */
-  public function testSimpletestSettings() {
-    $config = $this->config('simpletest.settings');
-    $this->assertIdentical(TRUE, $config->get('clear_results'));
-    $this->assertIdentical(CURLAUTH_BASIC, $config->get('httpauth.method'));
-    // NULL in the dump means defaults which is empty string. Same as omitting
-    // them.
-    $this->assertIdentical('', $config->get('httpauth.password'));
-    $this->assertIdentical('', $config->get('httpauth.username'));
-    $this->assertIdentical(TRUE, $config->get('verbose'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php b/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php
deleted file mode 100644
index 0528cc1..0000000
--- a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\simpletest\Tests\Migrate\d7\MigrateSimpletestSettingsTest.
- */
-
-namespace Drupal\simpletest\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of SimpleTest's variables to configuration.
- *
- * @group simpletest
- */
-class MigrateSimpletestSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['simpletest'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_simpletest_settings');
-  }
-
-  /**
-   * Tests migration of SimpleTest settings to configuration.
-   */
-  public function testMigration() {
-    $config = \Drupal::config('simpletest.settings')->get();
-    $this->assertTrue($config['clear_results']);
-    $this->assertIdentical(CURLAUTH_BASIC, $config['httpauth']['method']);
-    $this->assertIdentical('testbot', $config['httpauth']['username']);
-    $this->assertIdentical('foobaz', $config['httpauth']['password']);
-    $this->assertTrue($config['verbose']);
-  }
-
-}
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index a3bfd4c..e9b6376 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -1179,7 +1179,7 @@ protected function curlInitialize() {
    * @param $curl_options
    *   An associative array of cURL options to set, where the keys are constants
    *   defined by the cURL library. For a list of valid options, see
-   *   http://www.php.net/manual/function.curl-setopt.php
+   *   http://php.net/manual/function.curl-setopt.php
    * @param $redirect
    *   FALSE if this is an initial request, TRUE if this request is the result
    *   of a redirect.
diff --git a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
index c86a9e6..dd47547 100644
--- a/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
+++ b/core/modules/simpletest/tests/fixtures/simpletest_phpunit_run_command_test.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\Tests\simpletest\Unit\SimpletestPhpunitRunCommandTestWillDie.
+ */
+
 namespace Drupal\Tests\simpletest\Unit;
 
 use Drupal\Tests\UnitTestCase;
diff --git a/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install b/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
index b0ccbc7..447a192 100644
--- a/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
+++ b/core/modules/simpletest/tests/modules/simpletest_test/simpletest_test.install
@@ -1,6 +1,13 @@
 <?php
 
 /**
+ * @file
+ * Install hooks for test module.
+ */
+
+use Drupal\entity_test\Entity\EntityTest;
+
+/**
  * Implements hook_install().
  */
 function simpletest_test_install() {
@@ -22,6 +29,6 @@ function simpletest_test_install() {
  * Callback for batch operations.
  */
 function _simpletest_test_callback($id) {
-  $entity = entity_create('entity_test', array('id' => $id));
+  $entity = EntityTest::create(array('id' => $id));
   $entity->save();
 }
diff --git a/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
new file mode 100644
index 0000000..99c66ed
--- /dev/null
+++ b/core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\simpletest\Kernel\Migrate\d6\MigrateSimpletestConfigsTest.
+ */
+
+namespace Drupal\Tests\simpletest\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to simpletest.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSimpletestConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('simpletest');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['simpletest']);
+    $this->executeMigration('d6_simpletest_settings');
+  }
+
+  /**
+   * Tests migration of simpletest variables to simpletest.settings.yml.
+   */
+  public function testSimpletestSettings() {
+    $config = $this->config('simpletest.settings');
+    $this->assertIdentical(TRUE, $config->get('clear_results'));
+    $this->assertIdentical(CURLAUTH_BASIC, $config->get('httpauth.method'));
+    // NULL in the dump means defaults which is empty string. Same as omitting
+    // them.
+    $this->assertIdentical('', $config->get('httpauth.password'));
+    $this->assertIdentical('', $config->get('httpauth.username'));
+    $this->assertIdentical(TRUE, $config->get('verbose'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php b/core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php
new file mode 100644
index 0000000..ae62ef4
--- /dev/null
+++ b/core/modules/simpletest/tests/src/Kernel/Migrate/d7/MigrateSimpletestSettingsTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\simpletest\Kernel\Migrate\d7\MigrateSimpletestSettingsTest.
+ */
+
+namespace Drupal\Tests\simpletest\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of SimpleTest's variables to configuration.
+ *
+ * @group simpletest
+ */
+class MigrateSimpletestSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['simpletest'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_simpletest_settings');
+  }
+
+  /**
+   * Tests migration of SimpleTest settings to configuration.
+   */
+  public function testMigration() {
+    $config = \Drupal::config('simpletest.settings')->get();
+    $this->assertTrue($config['clear_results']);
+    $this->assertIdentical(CURLAUTH_BASIC, $config['httpauth']['method']);
+    $this->assertIdentical('testbot', $config['httpauth']['username']);
+    $this->assertIdentical('foobaz', $config['httpauth']['password']);
+    $this->assertTrue($config['verbose']);
+  }
+
+}
diff --git a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
index fda12f1..b96ea79 100644
--- a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\Tests\simpletest\Unit\TestInfoParsingTest.
  */
 
-namespace Drupal\Tests\simpletest\Unit;
+namespace Drupal\Tests\simpletest\Unit {
 
 use Composer\Autoload\ClassLoader;
 use Drupal\Core\Extension\Extension;
@@ -87,18 +87,18 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards.',
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'group' => 'simpletest',
+        'description' => 'Tests the Simpletest UI internal browser.',
         'type' => 'Simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
- * Bulk delete storages and fields, and clean up afterwards.
+ * Tests the Simpletest UI internal browser.
  *
- * @group field
+ * @group simpletest
  */
  ",
     ];
@@ -107,18 +107,19 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards.',
-        'type' => 'Simpletest'
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'group' => 'simpletest',
+        'description' => 'Tests the Simpletest UI internal browser.',
+        'type' => 'Simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
-   * Bulk delete storages and fields, and clean up afterwards.
+   * Tests the Simpletest UI internal browser.
    *
-   * @group field
+   * @group simpletest
+   */
    */
  ",
     ];
@@ -128,18 +129,18 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards. * @',
-        'type' => 'Simpletest'
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'group' => 'simpletest',
+        'description' => 'Tests the Simpletest UI internal browser. * @',
+        'type' => 'Simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
-   * Bulk delete storages and fields, and clean up afterwards. * @
+   * Tests the Simpletest UI internal browser. * @
    *
-   * @group field
+   * @group simpletest
    */
  ",
     ];
@@ -148,19 +149,19 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
         'group' => 'Test',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards.',
-        'type' => 'Simpletest'
+        'description' => 'Tests the Simpletest UI internal browser.',
+        'type' => 'Simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
- * Bulk delete storages and fields, and clean up afterwards.
+ * Tests the Simpletest UI internal browser.
  *
  * @group Test
- * @group field
+ * @group simpletest
  */
  ",
     ];
@@ -169,20 +170,20 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards.',
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'description' => 'Tests the Simpletest UI internal browser.',
+        'type' => 'Simpletest',
         'requires' => ['module' => ['test']],
-        'type' => 'Simpletest'
+        'group' => 'simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
- * Bulk delete storages and fields, and clean up afterwards.
+ * Tests the Simpletest UI internal browser.
  *
  * @dependencies test
- * @group field
+ * @group simpletest
  */
  ",
     ];
@@ -191,20 +192,20 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards.',
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'description' => 'Tests the Simpletest UI internal browser.',
+        'type' => 'Simpletest',
         'requires' => ['module' => ['test', 'test1', 'test2']],
-        'type' => 'Simpletest'
+        'group' => 'simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
- * Bulk delete storages and fields, and clean up afterwards.
+ * Tests the Simpletest UI internal browser.
  *
- * @dependencies test, test1,test2
- * @group field
+ * @dependencies test, test1, test2
+ * @group simpletest
  */
  ",
     ];
@@ -213,18 +214,19 @@ public function infoParserProvider() {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\field\Tests\BulkDeleteTest',
-        'group' => 'field',
-        'description' => 'Bulk delete storages and fields, and clean up afterwards. And the summary line continues and there is no gap to the annotation.',
-        'type' => 'Simpletest'
+        'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest',
+        'description' => 'Tests the Simpletest UI internal browser. And the summary line continues an there is no gap to the annotation.',
+        'type' => 'Simpletest',
+        'group' => 'simpletest',
       ],
       // Classname.
-      'Drupal\field\Tests\BulkDeleteTest',
+      'Drupal\simpletest\Tests\ExampleSimpleTest',
       // Doc block.
       "/**
- * Bulk delete storages and fields, and clean up afterwards. And the summary
- * line continues and there is no gap to the annotation.
- * @group field
+ * Tests the Simpletest UI internal browser. And the summary line continues an
+ * there is no gap to the annotation.
+ *
+ * @group simpletest
  */
  ",
     ];
@@ -234,10 +236,10 @@ public function infoParserProvider() {
   /**
    * @covers ::getTestInfo
    * @expectedException \Drupal\simpletest\Exception\MissingGroupException
-   * @expectedExceptionMessage Missing @group annotation in Drupal\field\Tests\BulkDeleteTest
+   * @expectedExceptionMessage Missing @group annotation in Drupal\KernelTests\field\BulkDeleteTest
    */
   public function testTestInfoParserMissingGroup() {
-    $classname = 'Drupal\field\Tests\BulkDeleteTest';
+    $classname = 'Drupal\KernelTests\field\BulkDeleteTest';
     $doc_comment = <<<EOT
 /**
  * Bulk delete storages and fields, and clean up afterwards.
@@ -250,7 +252,7 @@ public function testTestInfoParserMissingGroup() {
    * @covers ::getTestInfo
    */
   public function testTestInfoParserMissingSummary() {
-    $classname = 'Drupal\field\Tests\BulkDeleteTest';
+    $classname = 'Drupal\KernelTests\field\BulkDeleteTest';
     $doc_comment = <<<EOT
 /**
  * @group field
@@ -410,3 +412,19 @@ public function providerTestGetPhpunitTestSuite() {
   }
 
 }
+
+}
+
+namespace Drupal\simpletest\Tests {
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the Simpletest UI internal browser.
+ *
+ * @group simpletest
+ */
+class ExampleSimpleTest extends WebTestBase {
+}
+
+}
diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
deleted file mode 100644
index 7fe673c..0000000
--- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\statistics\Tests\Migrate\d6\MigrateStatisticsConfigsTest.
- */
-
-namespace Drupal\statistics\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to statistics.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('statistics');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_statistics_settings');
-  }
-
-  /**
-   * Tests migration of statistics variables to statistics.settings.yml.
-   */
-  public function testStatisticsSettings() {
-    $config = $this->config('statistics.settings');
-    $this->assertIdentical(FALSE, $config->get('access_log.enabled'));
-    $this->assertIdentical(259200, $config->get('access_log.max_lifetime'));
-    $this->assertIdentical(0, $config->get('count_content_views'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/statistics/statistics.module b/core/modules/statistics/statistics.module
index 61d58e2..5079e43 100644
--- a/core/modules/statistics/statistics.module
+++ b/core/modules/statistics/statistics.module
@@ -48,20 +48,20 @@ function statistics_node_view(array &$build, EntityInterface $node, EntityViewDi
 /**
  * Implements hook_node_links_alter().
  */
-function statistics_node_links_alter(array &$node_links, NodeInterface $entity, array &$context) {
+function statistics_node_links_alter(array &$links, NodeInterface $entity, array &$context) {
   if ($context['view_mode'] != 'rss') {
-    $node_links['#cache']['contexts'][] = 'user.permissions';
+    $links['#cache']['contexts'][] = 'user.permissions';
     if (\Drupal::currentUser()->hasPermission('view post access counter')) {
       $statistics = statistics_get($entity->id());
       if ($statistics) {
-        $links['statistics_counter']['title'] = \Drupal::translation()->formatPlural($statistics['totalcount'], '1 view', '@count views');
-        $node_links['statistics'] = array(
+        $statistics_links['statistics_counter']['title'] = \Drupal::translation()->formatPlural($statistics['totalcount'], '1 view', '@count views');
+        $links['statistics'] = array(
           '#theme' => 'links__node__statistics',
-          '#links' => $links,
+          '#links' => $statistics_links,
           '#attributes' => array('class' => array('links', 'inline')),
         );
       }
-      $node_links['#cache']['max-age'] = \Drupal::config('statistics.settings')->get('display_max_age');
+      $links['#cache']['max-age'] = \Drupal::config('statistics.settings')->get('display_max_age');
     }
   }
 }
diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
new file mode 100644
index 0000000..dd90898
--- /dev/null
+++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\statistics\Kernel\Migrate\d6\MigrateStatisticsConfigsTest.
+ */
+
+namespace Drupal\Tests\statistics\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to statistics.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('statistics');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_statistics_settings');
+  }
+
+  /**
+   * Tests migration of statistics variables to statistics.settings.yml.
+   */
+  public function testStatisticsSettings() {
+    $config = $this->config('statistics.settings');
+    $this->assertIdentical(FALSE, $config->get('access_log.enabled'));
+    $this->assertIdentical(259200, $config->get('access_log.max_lifetime'));
+    $this->assertIdentical(0, $config->get('count_content_views'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
deleted file mode 100644
index 686bce0..0000000
--- a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\syslog\Tests\Migrate\d6\MigrateSyslogConfigsTest.
- */
-
-namespace Drupal\syslog\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to syslog.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('syslog');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_syslog_settings');
-  }
-
-  /**
-   * Tests migration of syslog variables to syslog.settings.yml.
-   */
-  public function testSyslogSettings() {
-    $config = $this->config('syslog.settings');
-    $this->assertIdentical('drupal', $config->get('identity'));
-    $this->assertIdentical('128', $config->get('facility'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'syslog.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
deleted file mode 100644
index f7ae205..0000000
--- a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\syslog\Tests\Migrate\d7\MigrateSyslogConfigsTest.
- */
-
-namespace Drupal\syslog\Tests\Migrate\d7;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Upgrade variables to syslog.settings.yml.
- *
- * @group syslog
- */
-class MigrateSyslogConfigsTest extends MigrateDrupal7TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['syslog'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(static::$modules);
-    $this->executeMigration('d7_syslog_settings');
-  }
-
-  /**
-   * Tests migration of syslog variables to syslog.settings.yml.
-   */
-  public function testSyslogSettings() {
-    $config = $this->config('syslog.settings');
-    // 8 == LOG_USER
-    $this->assertIdentical('8', $config->get('facility'));
-    $this->assertIdentical('!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message', $config->get('format'));
-    $this->assertIdentical('drupal', $config->get('identity'));
-  }
-
-}
diff --git a/core/modules/syslog/syslog.module b/core/modules/syslog/syslog.module
index e74d993..68fe614 100644
--- a/core/modules/syslog/syslog.module
+++ b/core/modules/syslog/syslog.module
@@ -17,7 +17,7 @@ function syslog_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.syslog':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Syslog module logs events by sending messages to the logging facility of your web server\'s operating system. Syslog is an operating system administrative logging tool that provides valuable information for use in system management and security auditing. Most suited to medium and large sites, Syslog provides filtering tools that allow messages to be routed by type and severity. For more information, see the <a href=":syslog">online documentation for the Syslog module</a>, as well as PHP\'s documentation pages for the <a href=":php_openlog">openlog</a> and <a href=":php_syslog">syslog</a> functions.', array(':syslog' => 'https://www.drupal.org/documentation/modules/syslog', ':php_openlog' => 'http://www.php.net/manual/function.openlog.php', ':php_syslog' => 'http://www.php.net/manual/function.syslog.php')) . '</p>';
+      $output .= '<p>' . t('The Syslog module logs events by sending messages to the logging facility of your web server\'s operating system. Syslog is an operating system administrative logging tool that provides valuable information for use in system management and security auditing. Most suited to medium and large sites, Syslog provides filtering tools that allow messages to be routed by type and severity. For more information, see the <a href=":syslog">online documentation for the Syslog module</a>, as well as PHP\'s documentation pages for the <a href="http://php.net/manual/function.openlog.php">openlog</a> and <a href="http://php.net/manual/function.syslog.php">syslog</a> functions.', array(':syslog' => 'https://www.drupal.org/documentation/modules/syslog')) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Logging for UNIX, Linux, and Mac OS X') . '</dt>';
diff --git a/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
new file mode 100644
index 0000000..25a145d
--- /dev/null
+++ b/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\syslog\Kernel\Migrate\d6\MigrateSyslogConfigsTest.
+ */
+
+namespace Drupal\Tests\syslog\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to syslog.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('syslog');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_syslog_settings');
+  }
+
+  /**
+   * Tests migration of syslog variables to syslog.settings.yml.
+   */
+  public function testSyslogSettings() {
+    $config = $this->config('syslog.settings');
+    $this->assertIdentical('drupal', $config->get('identity'));
+    $this->assertIdentical('128', $config->get('facility'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'syslog.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php b/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
new file mode 100644
index 0000000..f4830cd
--- /dev/null
+++ b/core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\syslog\Kernel\Migrate\d7\MigrateSyslogConfigsTest.
+ */
+
+namespace Drupal\Tests\syslog\Kernel\Migrate\d7;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Upgrade variables to syslog.settings.yml.
+ *
+ * @group syslog
+ */
+class MigrateSyslogConfigsTest extends MigrateDrupal7TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['syslog'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+    $this->executeMigration('d7_syslog_settings');
+  }
+
+  /**
+   * Tests migration of syslog variables to syslog.settings.yml.
+   */
+  public function testSyslogSettings() {
+    $config = $this->config('syslog.settings');
+    // 8 == LOG_USER
+    $this->assertIdentical('8', $config->get('facility'));
+    $this->assertIdentical('!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message', $config->get('format'));
+    $this->assertIdentical('drupal', $config->get('identity'));
+  }
+
+}
diff --git a/core/modules/system/src/Controller/ThemeController.php b/core/modules/system/src/Controller/ThemeController.php
index 7d64b5f..b6ac1dc 100644
--- a/core/modules/system/src/Controller/ThemeController.php
+++ b/core/modules/system/src/Controller/ThemeController.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Config\UnmetDependenciesException;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Extension\ThemeHandlerInterface;
-use Drupal\Core\Routing\RouteBuilderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
diff --git a/core/modules/system/src/DateFormatAccessControlHandler.php b/core/modules/system/src/DateFormatAccessControlHandler.php
index e817f70..daea873 100644
--- a/core/modules/system/src/DateFormatAccessControlHandler.php
+++ b/core/modules/system/src/DateFormatAccessControlHandler.php
@@ -30,10 +30,10 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     // Locked date formats cannot be updated or deleted.
     elseif (in_array($operation, array('update', 'delete'))) {
       if ($entity->isLocked()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       else {
-        return parent::checkAccess($entity, $operation, $account)->cacheUntilEntityChanges($entity);
+        return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
       }
     }
 
diff --git a/core/modules/system/src/Form/CronForm.php b/core/modules/system/src/Form/CronForm.php
index 81e44c4..ca50f4c 100644
--- a/core/modules/system/src/Form/CronForm.php
+++ b/core/modules/system/src/Form/CronForm.php
@@ -15,7 +15,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Configure cron settings for this site.
@@ -127,7 +126,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
   public function submitForm(array &$form, FormStateInterface $form_state) {
     // Run cron manually from Cron form.
     if ($this->cron->run()) {
-      drupal_set_message(t('Cron run successfully.'));
+      drupal_set_message(t('Cron ran successfully.'));
     }
     else {
       drupal_set_message(t('Cron run failed.'), 'error');
diff --git a/core/modules/system/src/Form/DateFormatFormBase.php b/core/modules/system/src/Form/DateFormatFormBase.php
index 252fba4..d5868b5 100644
--- a/core/modules/system/src/Form/DateFormatFormBase.php
+++ b/core/modules/system/src/Form/DateFormatFormBase.php
@@ -104,7 +104,7 @@ public function form(array $form, FormStateInterface $form_state) {
       '#type' => 'textfield',
       '#title' => t('Format string'),
       '#maxlength' => 100,
-      '#description' => $this->t('A user-defined date format. See the <a href=":url">PHP manual</a> for available options.', array(':url' => 'http://php.net/manual/function.date.php')),
+      '#description' => $this->t('A user-defined date format. See the <a href="http://php.net/manual/function.date.php">PHP manual</a> for available options.'),
       '#required' => TRUE,
       '#attributes' => [
         'data-drupal-date-formatter' => 'source',
diff --git a/core/modules/system/src/Form/ModulesListConfirmForm.php b/core/modules/system/src/Form/ModulesListConfirmForm.php
index dea5207..1fc6868 100644
--- a/core/modules/system/src/Form/ModulesListConfirmForm.php
+++ b/core/modules/system/src/Form/ModulesListConfirmForm.php
@@ -124,16 +124,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       return $this->redirect('system.modules_list');
     }
 
-    $items = array();
-    // Display a list of required modules that have to be installed as well but
-    // were not manually selected.
-    foreach ($this->modules['dependencies'] as $module => $dependencies) {
-      $items[] = $this->formatPlural(count($dependencies), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', array(
-        '@module' => $this->modules['install'][$module],
-        '@required' => implode(', ', $dependencies),
-      ));
-    }
-
+    $items = $this->buildMessageList();
     $form['message'] = array(
       '#theme' => 'item_list',
       '#items' => $items,
@@ -143,6 +134,31 @@ public function buildForm(array $form, FormStateInterface $form_state) {
   }
 
   /**
+   * Builds the message list for the confirmation form.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface[]
+   *   Array of markup for the list of messages on the form.
+   *
+   * @see \Drupal\system\Form\ModulesListForm::buildModuleList()
+   */
+  protected function buildMessageList() {
+    $items = [];
+    if (!empty($this->modules['dependencies'])) {
+      // Display a list of required modules that have to be installed as well
+      // but were not manually selected.
+      foreach ($this->modules['dependencies'] as $module => $dependencies) {
+        $items[] = $this->formatPlural(count($dependencies), 'You must enable the @required module to install @module.', 'You must enable the @required modules to install @module.', [
+          '@module' => $this->modules['install'][$module],
+          // It is safe to implode this because module names are not translated
+          // markup and so will not be double-escaped.
+          '@required' => implode(', ', $dependencies),
+        ]);
+      }
+    }
+    return $items;
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
diff --git a/core/modules/system/src/Form/ModulesListExperimentalConfirmForm.php b/core/modules/system/src/Form/ModulesListExperimentalConfirmForm.php
new file mode 100644
index 0000000..db83264
--- /dev/null
+++ b/core/modules/system/src/Form/ModulesListExperimentalConfirmForm.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Form\ModulesListExperimentalConfirmForm.
+ */
+
+namespace Drupal\system\Form;
+
+/**
+ * Builds a confirmation form for enabling experimental modules.
+ */
+class ModulesListExperimentalConfirmForm extends ModulesListConfirmForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you wish to enable experimental modules?');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'system_modules_experimental_confirm_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function buildMessageList() {
+    drupal_set_message($this->t('<a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', [':url' => 'https://www.drupal.org/core/experimental']), 'warning');
+
+    $items = parent::buildMessageList();
+    // Add the list of experimental modules after any other messages.
+    $items[] = $this->t('The following modules are experimental: @modules', ['@modules' => implode(', ', array_values($this->modules['experimental']))]);
+
+    return $items;
+  }
+
+}
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index e8a6cea..de67829 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -368,6 +368,7 @@ protected function buildModuleList(FormStateInterface $form_state) {
     $modules = array(
       'install' => array(),
       'dependencies' => array(),
+      'experimental' => [],
     );
 
     // Required modules have to be installed.
@@ -380,10 +381,14 @@ protected function buildModuleList(FormStateInterface $form_state) {
     }
 
     // First, build a list of all modules that were selected.
-    foreach ($packages as $items) {
+    foreach ($packages as $package => $items) {
       foreach ($items as $name => $checkbox) {
         if ($checkbox['enable'] && !$this->moduleHandler->moduleExists($name)) {
           $modules['install'][$name] = $data[$name]->info['name'];
+          // Identify experimental modules.
+          if ($package == 'Core (Experimental)') {
+            $modules['experimental'][$name] = $data[$name]->info['name'];
+          }
         }
       }
     }
@@ -394,6 +399,11 @@ protected function buildModuleList(FormStateInterface $form_state) {
         if (!isset($modules['install'][$dependency]) && !$this->moduleHandler->moduleExists($dependency)) {
           $modules['dependencies'][$module][$dependency] = $data[$dependency]->info['name'];
           $modules['install'][$dependency] = $data[$dependency]->info['name'];
+
+          // Identify experimental modules.
+          if ($data[$dependency]->info['package'] == 'Core (Experimental)') {
+            $modules['experimental'][$dependency] = $data[$dependency]->info['name'];
+          }
         }
       }
     }
@@ -423,16 +433,16 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     // Retrieve a list of modules to install and their dependencies.
     $modules = $this->buildModuleList($form_state);
 
-    // Check if we have to install any dependencies. If there is one or more
-    // dependencies that are not installed yet, redirect to the confirmation
-    // form.
-    if (!empty($modules['dependencies']) || !empty($modules['missing'])) {
+    // Redirect to a confirmation form if needed.
+    if (!empty($modules['experimental']) || !empty($modules['dependencies'])) {
+
+      $route_name = !empty($modules['experimental']) ? 'system.modules_list_experimental_confirm' : 'system.modules_list_confirm';
       // Write the list of changed module states into a key value store.
       $account = $this->currentUser()->id();
       $this->keyValueExpirable->setWithExpire($account, $modules, 60);
 
       // Redirect to the confirmation form.
-      $form_state->setRedirect('system.modules_list_confirm');
+      $form_state->setRedirect($route_name);
 
       // We can exit here because at least one modules has dependencies
       // which we have to prompt the user for in a confirmation form.
diff --git a/core/modules/system/src/MenuAccessControlHandler.php b/core/modules/system/src/MenuAccessControlHandler.php
index 789577b..4ae9e5b 100644
--- a/core/modules/system/src/MenuAccessControlHandler.php
+++ b/core/modules/system/src/MenuAccessControlHandler.php
@@ -29,10 +29,10 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
     // Locked menus could not be deleted.
     elseif ($operation == 'delete') {
       if ($entity->isLocked()) {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($entity);
+        return AccessResult::forbidden()->addCacheableDependency($entity);
       }
       else {
-        return parent::checkAccess($entity, $operation, $account)->cacheUntilEntityChanges($entity);
+        return parent::checkAccess($entity, $operation, $account)->addCacheableDependency($entity);
       }
     }
 
diff --git a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
index 25ea051..a84c3fc 100644
--- a/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemPoweredByBlock.php
@@ -22,6 +22,13 @@ class SystemPoweredByBlock extends BlockBase {
   /**
    * {@inheritdoc}
    */
+  public function defaultConfiguration() {
+    return ['label_display' => FALSE];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function build() {
     return array('#markup' => '<span>' . $this->t('Powered by <a href=":poweredby">Drupal</a>', array(':poweredby' => 'https://www.drupal.org')) . '</span>');
   }
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index f9cfb53..3314623 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -53,7 +53,7 @@ class GDToolkit extends ImageToolkitBase {
    *
    * @see \Drupal\system\Plugin\ImageToolkit\GDToolkit::parseFile()
    * @see \Drupal\system\Plugin\ImageToolkit\GDToolkit::setResource()
-   * @see http://php.net/manual/en/function.getimagesize.php
+   * @see http://php.net/manual/function.getimagesize.php
    */
   protected $preLoadInfo = NULL;
 
@@ -378,7 +378,7 @@ public function getRequirements() {
     // Check for filter and rotate support.
     if (!function_exists('imagefilter') || !function_exists('imagerotate')) {
       $requirements['version']['severity'] = REQUIREMENT_WARNING;
-      $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See <a href=":url">the PHP manual</a>.', array(':url' => 'http://www.php.net/manual/book.image.php'));
+      $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See <a href="http://php.net/manual/book.image.php">the PHP manual</a>.');
     }
 
     return $requirements;
diff --git a/core/modules/system/src/Tests/Action/ActionUnitTest.php b/core/modules/system/src/Tests/Action/ActionUnitTest.php
index 7bc57b5..6de447f 100644
--- a/core/modules/system/src/Tests/Action/ActionUnitTest.php
+++ b/core/modules/system/src/Tests/Action/ActionUnitTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\simpletest\KernelTestBase;
 use Drupal\Core\Action\ActionInterface;
+use Drupal\system\Entity\Action;
 use Drupal\user\RoleInterface;
 
 /**
@@ -80,7 +81,7 @@ public function testOperations() {
    */
   public function testDependencies() {
     // Create a new action that depends on a user role.
-    $action = entity_create('action', array(
+    $action = Action::create(array(
       'id' => 'user_add_role_action.' . RoleInterface::ANONYMOUS_ID,
       'type' => 'user',
       'label' => t('Add the anonymous role to the selected users'),
diff --git a/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php b/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
index 9732d28..144f20e 100644
--- a/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
+++ b/core/modules/system/src/Tests/Ajax/AjaxInGroupTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\system\Tests\Ajax;
 
-use Drupal\Core\Ajax\DataCommand;
-
 /**
  * Tests that form elements in groups work correctly with AJAX.
  *
diff --git a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
index a4c7bfc..c9edeb5 100644
--- a/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
+++ b/core/modules/system/src/Tests/Ajax/AjaxTestBase.php
@@ -56,7 +56,7 @@ protected function assertCommand($haystack, $needle, $message) {
       // If the command has additional data that we're not testing for, do not
       // consider that a failure. Also, == instead of ===, because we don't
       // require the key/value pairs to be in any particular order
-      // (http://www.php.net/manual/language.operators.array.php).
+      // (http://php.net/manual/language.operators.array.php).
       if (array_intersect_key($command, $needle) == $needle) {
         $found = TRUE;
         break;
diff --git a/core/modules/system/src/Tests/Ajax/FrameworkTest.php b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
index f6dfd6b..68ed9dd 100644
--- a/core/modules/system/src/Tests/Ajax/FrameworkTest.php
+++ b/core/modules/system/src/Tests/Ajax/FrameworkTest.php
@@ -198,7 +198,7 @@ public function testCurrentPathChange() {
    * Tests that overridden CSS files are not added during lazy load.
    */
   public function testLazyLoadOverriddenCSS() {
-    // The test theme overrides system.module.css without an implementation,
+    // The test theme overrides js.module.css without an implementation,
     // thereby removing it.
     \Drupal::service('theme_handler')->install(array('test_theme'));
     $this->config('system.theme')
@@ -214,6 +214,6 @@ public function testLazyLoadOverriddenCSS() {
     // information about the file; we only really care about whether it appears
     // in a LINK or STYLE tag, for which Drupal always adds a query string for
     // cache control.
-    $this->assertNoText('system.module.css?', 'Ajax lazy loading does not add overridden CSS files.');
+    $this->assertNoText('js.module.css?', 'Ajax lazy loading does not add overridden CSS files.');
   }
 }
diff --git a/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
index f87100d..3d16bca 100644
--- a/core/modules/system/src/Tests/Ajax/MultiFormTest.php
+++ b/core/modules/system/src/Tests/Ajax/MultiFormTest.php
@@ -8,6 +8,8 @@
 namespace Drupal\system\Tests\Ajax;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests that AJAX-enabled forms work when multiple instances of the same form
@@ -31,17 +33,17 @@ protected function setUp() {
 
     // Create a multi-valued field for 'page' nodes to use for Ajax testing.
     $field_name = 'field_ajax_test';
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'node',
       'field_name' => $field_name,
       'type' => 'text',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'bundle' => 'page',
-    ))->save();
+    ])->save();
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($field_name, array('type' => 'text_textfield'))
       ->save();
diff --git a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
index e10a6af..ad65b8d 100644
--- a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
+++ b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php
@@ -6,6 +6,8 @@
 
 namespace Drupal\system\Tests\Block;
 
+use Drupal\system\Entity\Menu;
+use Drupal\block\Entity\Block;
 use Drupal\Core\Render\Element;
 use Drupal\simpletest\KernelTestBase;
 use Drupal\system\Tests\Routing\MockRouteProvider;
@@ -85,7 +87,6 @@ protected function setUp() {
     parent::setUp();
     $this->installSchema('system', 'sequences');
     $this->installEntitySchema('user');
-    $this->installSchema('system', array('router'));
     $this->installEntitySchema('menu_link_content');
 
     $account = User::create([
@@ -118,7 +119,7 @@ protected function setUp() {
     $menu_name = 'mock';
     $label = $this->randomMachineName(16);
 
-    $this->menu = entity_create('menu', array(
+    $this->menu = Menu::create(array(
       'id' => $menu_name,
       'label' => $label,
       'description' => 'Description text',
@@ -155,7 +156,7 @@ protected function setUp() {
    */
   public function testSystemMenuBlockConfigDependencies() {
 
-    $block = entity_create('block', array(
+    $block = Block::create(array(
       'plugin' => 'system_menu_block:' . $this->menu->id(),
       'region' => 'footer',
       'id' => 'machinename',
diff --git a/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php b/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php
new file mode 100644
index 0000000..3041dd1
--- /dev/null
+++ b/core/modules/system/src/Tests/Cache/SessionExistsCacheContextTest.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Cache\SessionExistsCacheContextTest.
+ */
+
+namespace Drupal\system\Tests\Cache;
+
+use Drupal\Core\Url;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the 'session.exists' cache context service.
+ *
+ * @group Cache
+ */
+class SessionExistsCacheContextTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['session_exists_cache_context_test'];
+
+  /**
+   * Tests \Drupal\Core\Cache\Context\SessionExistsCacheContext::getContext().
+   */
+  public function testCacheContext() {
+    $this->dumpHeaders = TRUE;
+
+    // 1. No session (anonymous).
+    $this->assertSessionCookieOnClient(FALSE);
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $this->assertSessionCookieOnClient(FALSE);
+    $this->assertRaw('Session does not exist!');
+    $this->assertRaw('[session.exists]=0');
+
+    // 2. Session (authenticated).
+    $this->assertSessionCookieOnClient(FALSE);
+    $this->drupalLogin($this->rootUser);
+    $this->assertSessionCookieOnClient(TRUE);
+    $this->assertRaw('Session exists!');
+    $this->assertRaw('[session.exists]=1');
+    $this->drupalLogout();
+    $this->assertSessionCookieOnClient(FALSE);
+    $this->assertRaw('Session does not exist!');
+    $this->assertRaw('[session.exists]=0');
+
+    // 3. Session (anonymous).
+    $this->assertSessionCookieOnClient(FALSE);
+    $this->drupalGet(Url::fromRoute('<front>', [], ['query' => ['trigger_session' => 1]]));
+    $this->assertSessionCookieOnClient(TRUE);
+    $this->assertRaw('Session does not exist!');
+    $this->assertRaw('[session.exists]=0');
+    $this->drupalGet(Url::fromRoute('<front>'));
+    $this->assertSessionCookieOnClient(TRUE);
+    $this->assertRaw('Session exists!');
+    $this->assertRaw('[session.exists]=1');
+  }
+
+  /**
+   * Asserts whether a session cookie is present on the client or not.
+   */
+  function assertSessionCookieOnClient($expected_present) {
+    $non_deleted_cookies = array_filter($this->cookies, function ($item) { return $item['value'] !== 'deleted'; });
+    $this->assertEqual($expected_present, isset($non_deleted_cookies[$this->getSessionName()]), 'Session cookie exists.');
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Common/AddFeedTest.php b/core/modules/system/src/Tests/Common/AddFeedTest.php
index 0620051..2e8b4ce 100644
--- a/core/modules/system/src/Tests/Common/AddFeedTest.php
+++ b/core/modules/system/src/Tests/Common/AddFeedTest.php
@@ -63,9 +63,7 @@ function testBasicFeedAddNoTitle() {
 
     // Use the bare HTML page renderer to render our links.
     $renderer = $this->container->get('bare_html_page_renderer');
-    $response = $renderer->renderBarePage(
-      $build, '', $this->container->get('theme.manager')->getActiveTheme()->getName()
-    );
+    $response = $renderer->renderBarePage($build, '', 'maintenance_page');
     // Glean the content from the response object.
     $this->setRawContent($response->getContent());
     // Assert that the content contains the RSS links we specified.
diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
index 3ab2d31..99c8829 100644
--- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
+++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
@@ -51,7 +51,6 @@ class AttachedAssetsTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('router'));
     $this->container->get('router.builder')->rebuild();
 
     $this->assetResolver = $this->container->get('asset.resolver');
diff --git a/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php b/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
index b3b363a..67787db 100644
--- a/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
+++ b/core/modules/system/src/Tests/Common/EarlyRenderingControllerTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\system\Tests\Common;
 
-use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 use Drupal\simpletest\WebTestBase;
 
diff --git a/core/modules/system/src/Tests/Common/PageRenderTest.php b/core/modules/system/src/Tests/Common/PageRenderTest.php
index 1b4c387..f7a093d 100644
--- a/core/modules/system/src/Tests/Common/PageRenderTest.php
+++ b/core/modules/system/src/Tests/Common/PageRenderTest.php
@@ -21,7 +21,6 @@ class PageRenderTest extends KernelTestBase {
    */
   function testHookPageAttachmentsExceptions() {
     $this->enableModules(['common_test', 'system']);
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
 
     $this->assertPageRenderHookExceptions('common_test', 'hook_page_attachments');
@@ -32,7 +31,6 @@ function testHookPageAttachmentsExceptions() {
    */
   function testHookPageAlter() {
     $this->enableModules(['common_test', 'system']);
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
 
     $this->assertPageRenderHookExceptions('common_test', 'hook_page_attachments_alter');
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index b71b9c1..fdbdd5b 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -28,7 +28,6 @@ class RenderElementTypesTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
     $this->installConfig(array('system'));
-    $this->installSchema('system', array('router'));
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/modules/system/src/Tests/Common/RenderTest.php b/core/modules/system/src/Tests/Common/RenderTest.php
index 98de2b5..03676e7 100644
--- a/core/modules/system/src/Tests/Common/RenderTest.php
+++ b/core/modules/system/src/Tests/Common/RenderTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\system\Tests\Common;
 
-use Drupal\Core\Render\Element;
 use Drupal\simpletest\KernelTestBase;
 
 /**
@@ -58,7 +57,7 @@ public function testProcessAttached() {
     $build['#attached']['drupal_process_states'][] = [];
     $renderer = $this->container->get('bare_html_page_renderer');
     try {
-      $renderer->renderBarePage($build, '', $this->container->get('theme.manager')->getActiveTheme()->getName());
+      $renderer->renderBarePage($build, '', 'maintenance_page');
       $this->fail("Invalid #attachment 'drupal_process_states' allowed");
     }
     catch (\LogicException $e) {
diff --git a/core/modules/system/src/Tests/Condition/ConditionFormTest.php b/core/modules/system/src/Tests/Condition/ConditionFormTest.php
index cfbdb74..231806f 100644
--- a/core/modules/system/src/Tests/Condition/ConditionFormTest.php
+++ b/core/modules/system/src/Tests/Condition/ConditionFormTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Condition;
 
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -28,8 +29,13 @@ class ConditionFormTest extends WebTestBase {
   function testConfigForm() {
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Page'));
     $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
-    $article = entity_create('node', array('type' => 'article', 'title' => $this->randomMachineName()));
+
+    $article = Node::create([
+      'type' => 'article',
+      'title' => $this->randomMachineName(),
+    ]);
     $article->save();
+
     $this->drupalGet('condition_test');
     $this->assertField('bundles[article]', 'There is an article bundle selector.');
     $this->assertField('bundles[page]', 'There is a page bundle selector.');
diff --git a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
index 3139ecc..bb80e8b 100644
--- a/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
+++ b/core/modules/system/src/Tests/Condition/CurrentThemeConditionTest.php
@@ -23,14 +23,6 @@ class CurrentThemeConditionTest extends KernelTestBase {
   public static $modules = array('system', 'theme_test');
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-  }
-
-  /**
    * Tests the current theme condition.
    */
   public function testCurrentTheme() {
@@ -52,7 +44,7 @@ public function testCurrentTheme() {
     $this->assertTrue($condition_negated->execute());
 
     // Set the expected theme to be used.
-    $this->config('system.theme')->set('default', 'test_theme')->save();
+    \Drupal::service('theme_handler')->setDefault('test_theme');
     \Drupal::theme()->resetActiveTheme();
 
     $this->assertTrue($condition->execute());
diff --git a/core/modules/system/src/Tests/Database/AlterTest.php b/core/modules/system/src/Tests/Database/AlterTest.php
deleted file mode 100644
index 991ae85..0000000
--- a/core/modules/system/src/Tests/Database/AlterTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\AlterTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the hook_query_alter capabilities of the Select builder.
- *
- * @group Database
- * @see database_test_query_alter()
- */
-class AlterTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can do basic alters.
-   */
-  function testSimpleAlter() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $query->addTag('database_test_alter_add_range');
-
-    $result = $query->execute()->fetchAll();
-
-    $this->assertEqual(count($result), 2, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests that we can alter the joins on a query.
-   */
-  function testAlterWithJoin() {
-    $query = db_select('test_task');
-    $tid_field = $query->addField('test_task', 'tid');
-    $task_field = $query->addField('test_task', 'task');
-    $query->orderBy($task_field);
-    $query->addTag('database_test_alter_add_join');
-
-    $result = $query->execute();
-
-    $records = $result->fetchAll();
-
-    $this->assertEqual(count($records), 2, 'Returned the correct number of rows.');
-
-    $this->assertEqual($records[0]->name, 'George', 'Correct data retrieved.');
-    $this->assertEqual($records[0]->$tid_field, 4, 'Correct data retrieved.');
-    $this->assertEqual($records[0]->$task_field, 'sing', 'Correct data retrieved.');
-    $this->assertEqual($records[1]->name, 'George', 'Correct data retrieved.');
-    $this->assertEqual($records[1]->$tid_field, 5, 'Correct data retrieved.');
-    $this->assertEqual($records[1]->$task_field, 'sleep', 'Correct data retrieved.');
-  }
-
-  /**
-   * Tests that we can alter a query's conditionals.
-   */
-  function testAlterChangeConditional() {
-    $query = db_select('test_task');
-    $tid_field = $query->addField('test_task', 'tid');
-    $pid_field = $query->addField('test_task', 'pid');
-    $task_field = $query->addField('test_task', 'task');
-    $people_alias = $query->join('test', 'people', "test_task.pid = people.id");
-    $name_field = $query->addField($people_alias, 'name', 'name');
-    $query->condition('test_task.tid', '1');
-    $query->orderBy($tid_field);
-    $query->addTag('database_test_alter_change_conditional');
-
-    $result = $query->execute();
-
-    $records = $result->fetchAll();
-
-    $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
-    $this->assertEqual($records[0]->$name_field, 'John', 'Correct data retrieved.');
-    $this->assertEqual($records[0]->$tid_field, 2, 'Correct data retrieved.');
-    $this->assertEqual($records[0]->$pid_field, 1, 'Correct data retrieved.');
-    $this->assertEqual($records[0]->$task_field, 'sleep', 'Correct data retrieved.');
-  }
-
-  /**
-   * Tests that we can alter the fields of a query.
-   */
-  function testAlterChangeFields() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $query->orderBy('name');
-    $query->addTag('database_test_alter_change_fields');
-
-    $record = $query->execute()->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
-    $this->assertFalse(isset($record->$age_field), 'Age field not found, as intended.');
-  }
-
-  /**
-   * Tests that we can alter expressions in the query.
-   */
-  function testAlterExpression() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_field = $query->addExpression("age*2", 'double_age');
-    $query->condition('age', 27);
-    $query->addTag('database_test_alter_change_expressions');
-    $result = $query->execute();
-
-    // Ensure that we got the right record.
-    $record = $result->fetch();
-
-    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
-    $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
-  }
-
-  /**
-   * Tests that we can remove a range() value from a query.
-   *
-   * This also tests hook_query_TAG_alter().
-   */
-  function testAlterRemoveRange() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $query->range(0, 2);
-    $query->addTag('database_test_alter_remove_range');
-
-    $num_records = count($query->execute()->fetchAll());
-
-    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests that we can do basic alters on subqueries.
-   */
-  function testSimpleAlterSubquery() {
-    // Create a sub-query with an alter tag.
-    $subquery = db_select('test', 'p');
-    $subquery->addField('p', 'name');
-    $subquery->addField('p', 'id');
-    // Pick out George.
-    $subquery->condition('age', 27);
-    $subquery->addExpression("age*2", 'double_age');
-    // This query alter should change it to age * 3.
-    $subquery->addTag('database_test_alter_change_expressions');
-
-    // Create a main query and join to sub-query.
-    $query = db_select('test_task', 'tt');
-    $query->join($subquery, 'pq', 'pq.id = tt.pid');
-    $age_field = $query->addField('pq', 'double_age');
-    $name_field = $query->addField('pq', 'name');
-
-    $record = $query->execute()->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
-    $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/BasicSyntaxTest.php b/core/modules/system/src/Tests/Database/BasicSyntaxTest.php
deleted file mode 100644
index 3d4b68d..0000000
--- a/core/modules/system/src/Tests/Database/BasicSyntaxTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\BasicSyntaxTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests SQL syntax interpretation.
- *
- * In order to ensure consistent SQL handling throughout Drupal
- * across multiple kinds of database systems, we test that the
- * database system interprets SQL syntax in an expected fashion.
- *
- * @group Database
- */
-class BasicSyntaxTest extends DatabaseTestBase {
-  /**
-   * Tests string concatenation.
-   */
-  function testConcatLiterals() {
-    $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
-      ':a1' => 'This',
-      ':a2' => ' ',
-      ':a3' => 'is',
-      ':a4' => ' a ',
-      ':a5' => 'test.',
-    ));
-    $this->assertIdentical($result->fetchField(), 'This is a test.', 'Basic CONCAT works.');
-  }
-
-  /**
-   * Tests string concatenation with field values.
-   */
-  function testConcatFields() {
-    $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
-      ':a1' => 'The age of ',
-      ':a2' => ' is ',
-      ':a3' => '.',
-      ':age' => 25,
-    ));
-    $this->assertIdentical($result->fetchField(), 'The age of John is 25.', 'Field CONCAT works.');
-  }
-
-  /**
-   * Tests string concatenation with separator.
-   */
-  function testConcatWsLiterals() {
-    $result = db_query("SELECT CONCAT_WS(', ', :a1, NULL, :a2, :a3, :a4)", array(
-      ':a1' => 'Hello',
-      ':a2' => NULL,
-      ':a3' => '',
-      ':a4' => 'world.',
-    ));
-    $this->assertIdentical($result->fetchField(), 'Hello, , world.');
-  }
-
-  /**
-   * Tests string concatenation with separator, with field values.
-   */
-  function testConcatWsFields() {
-    $result = db_query("SELECT CONCAT_WS('-', :a1, name, :a2, age) FROM {test} WHERE age = :age", array(
-      ':a1' => 'name',
-      ':a2' => 'age',
-      ':age' => 25,
-    ));
-    $this->assertIdentical($result->fetchField(), 'name-John-age-25');
-  }
-
-  /**
-   * Tests escaping of LIKE wildcards.
-   */
-  function testLikeEscape() {
-    db_insert('test')
-      ->fields(array(
-        'name' => 'Ring_',
-      ))
-      ->execute();
-
-    // Match both "Ringo" and "Ring_".
-    $num_matches = db_select('test', 't')
-      ->condition('name', 'Ring_', 'LIKE')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Found 2 records.');
-    // Match only "Ring_" using a LIKE expression with no wildcards.
-    $num_matches = db_select('test', 't')
-      ->condition('name', db_like('Ring_'), 'LIKE')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Found 1 record.');
-  }
-
-  /**
-   * Tests a LIKE query containing a backslash.
-   */
-  function testLikeBackslash() {
-    db_insert('test')
-      ->fields(array('name'))
-      ->values(array(
-        'name' => 'abcde\f',
-      ))
-      ->values(array(
-        'name' => 'abc%\_',
-      ))
-      ->execute();
-
-    // Match both rows using a LIKE expression with two wildcards and a verbatim
-    // backslash.
-    $num_matches = db_select('test', 't')
-      ->condition('name', 'abc%\\\\_', 'LIKE')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Found 2 records.');
-    // Match only the former using a LIKE expression with no wildcards.
-    $num_matches = db_select('test', 't')
-      ->condition('name', db_like('abc%\_'), 'LIKE')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Found 1 record.');
-  }
-
-  /**
-   * Tests \Drupal\Core\Database\Connection::getFullQualifiedTableName().
-   */
-  public function testGetFullQualifiedTableName() {
-    $database = \Drupal::database();
-    $num_matches = $database->select($database->getFullQualifiedTableName('test'), 't')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertIdentical($num_matches, '4', 'Found 4 records.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/CaseSensitivityTest.php b/core/modules/system/src/Tests/Database/CaseSensitivityTest.php
deleted file mode 100644
index 6dcf743..0000000
--- a/core/modules/system/src/Tests/Database/CaseSensitivityTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\CaseSensitivityTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests handling case sensitive collation.
- *
- * @group Database
- */
-class CaseSensitivityTest extends DatabaseTestBase {
-  /**
-   * Tests BINARY collation in MySQL.
-   */
-  function testCaseSensitiveInsert() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    db_insert('test')
-      ->fields(array(
-        'name' => 'john', // <- A record already exists with name 'John'.
-        'age' => 2,
-        'job' => 'Baby',
-      ))
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'john'))->fetchField();
-    $this->assertIdentical($saved_age, '2', 'Can retrieve after inserting.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/ConnectionTest.php b/core/modules/system/src/Tests/Database/ConnectionTest.php
deleted file mode 100644
index 1948be1..0000000
--- a/core/modules/system/src/Tests/Database/ConnectionTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\ConnectionTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\DatabaseExceptionWrapper;
-
-/**
- * Tests of the core database system.
- *
- * @group Database
- */
-class ConnectionTest extends DatabaseTestBase {
-
-  /**
-   * Tests that connections return appropriate connection objects.
-   */
-  function testConnectionRouting() {
-    // Clone the primary credentials to a replica connection.
-    // Note this will result in two independent connection objects that happen
-    // to point to the same place.
-    $connection_info = Database::getConnectionInfo('default');
-    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
-
-    $db1 = Database::getConnection('default', 'default');
-    $db2 = Database::getConnection('replica', 'default');
-
-    $this->assertNotNull($db1, 'default connection is a real connection object.');
-    $this->assertNotNull($db2, 'replica connection is a real connection object.');
-    $this->assertNotIdentical($db1, $db2, 'Each target refers to a different connection.');
-
-    // Try to open those targets another time, that should return the same objects.
-    $db1b = Database::getConnection('default', 'default');
-    $db2b = Database::getConnection('replica', 'default');
-    $this->assertIdentical($db1, $db1b, 'A second call to getConnection() returns the same object.');
-    $this->assertIdentical($db2, $db2b, 'A second call to getConnection() returns the same object.');
-
-    // Try to open an unknown target.
-    $unknown_target = $this->randomMachineName();
-    $db3 = Database::getConnection($unknown_target, 'default');
-    $this->assertNotNull($db3, 'Opening an unknown target returns a real connection object.');
-    $this->assertIdentical($db1, $db3, 'An unknown target opens the default connection.');
-
-    // Try to open that unknown target another time, that should return the same object.
-    $db3b = Database::getConnection($unknown_target, 'default');
-    $this->assertIdentical($db3, $db3b, 'A second call to getConnection() returns the same object.');
-  }
-
-  /**
-   * Tests that connections return appropriate connection objects.
-   */
-  function testConnectionRoutingOverride() {
-    // Clone the primary credentials to a replica connection.
-    // Note this will result in two independent connection objects that happen
-    // to point to the same place.
-    $connection_info = Database::getConnectionInfo('default');
-    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
-
-    Database::ignoreTarget('default', 'replica');
-
-    $db1 = Database::getConnection('default', 'default');
-    $db2 = Database::getConnection('replica', 'default');
-
-    $this->assertIdentical($db1, $db2, 'Both targets refer to the same connection.');
-  }
-
-  /**
-   * Tests the closing of a database connection.
-   */
-  function testConnectionClosing() {
-    // Open the default target so we have an object to compare.
-    $db1 = Database::getConnection('default', 'default');
-
-    // Try to close the default connection, then open a new one.
-    Database::closeConnection('default', 'default');
-    $db2 = Database::getConnection('default', 'default');
-
-    // Opening a connection after closing it should yield an object different than the original.
-    $this->assertNotIdentical($db1, $db2, 'Opening the default connection after it is closed returns a new object.');
-  }
-
-  /**
-   * Tests the connection options of the active database.
-   */
-  function testConnectionOptions() {
-    $connection_info = Database::getConnectionInfo('default');
-
-    // Be sure we're connected to the default database.
-    $db = Database::getConnection('default', 'default');
-    $connectionOptions = $db->getConnectionOptions();
-
-    // In the MySQL driver, the port can be different, so check individual
-    // options.
-    $this->assertEqual($connection_info['default']['driver'], $connectionOptions['driver'], 'The default connection info driver matches the current connection options driver.');
-    $this->assertEqual($connection_info['default']['database'], $connectionOptions['database'], 'The default connection info database matches the current connection options database.');
-
-    // Set up identical replica and confirm connection options are identical.
-    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
-    $db2 = Database::getConnection('replica', 'default');
-    $connectionOptions2 = $db2->getConnectionOptions();
-
-    // Get a fresh copy of the default connection options.
-    $connectionOptions = $db->getConnectionOptions();
-    $this->assertIdentical($connectionOptions, $connectionOptions2, 'The default and replica connection options are identical.');
-
-    // Set up a new connection with different connection info.
-    $test = $connection_info['default'];
-    $test['database'] .= 'test';
-    Database::addConnectionInfo('test', 'default', $test);
-    $connection_info = Database::getConnectionInfo('test');
-
-    // Get a fresh copy of the default connection options.
-    $connectionOptions = $db->getConnectionOptions();
-    $this->assertNotEqual($connection_info['default']['database'], $connectionOptions['database'], 'The test connection info database does not match the current connection options database.');
-  }
-
-  /**
-   * Ensure that you cannot execute multiple statements on phpversion() > 5.5.21 or > 5.6.5.
-   */
-  public function testMultipleStatementsForNewPhp() {
-    // This just tests mysql, as other PDO integrations don't allow disabling
-    // multiple statements.
-    if (Database::getConnection()->databaseType() !== 'mysql' || !defined('\PDO::MYSQL_ATTR_MULTI_STATEMENTS')) {
-      return;
-    }
-
-    $db = Database::getConnection('default', 'default');
-    // Disable the protection at the PHP level.
-    try {
-      $db->query('SELECT * FROM {test}; SELECT * FROM {test_people}',
-        [],
-        [ 'allow_delimiter_in_query' => TRUE ]
-      );
-      $this->fail('No PDO exception thrown for multiple statements.');
-    }
-    catch (DatabaseExceptionWrapper $e) {
-      $this->pass('PDO exception thrown for multiple statements.');
-    }
-  }
-
-  /**
-   * Ensure that you cannot execute multiple statements.
-   */
-  public function testMultipleStatements() {
-
-    $db = Database::getConnection('default', 'default');
-    try {
-      $db->query('SELECT * FROM {test}; SELECT * FROM {test_people}');
-      $this->fail('No exception thrown for multiple statements.');
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass('Exception thrown for multiple statements.');
-    }
-  }
-
-  /**
-   * Test the escapeTable(), escapeField() and escapeAlias() methods with all possible reserved words in PostgreSQL.
-   */
-  public function testPostgresqlReservedWords() {
-    if (Database::getConnection()->databaseType() !== 'pgsql') {
-      return;
-    }
-
-    $db = Database::getConnection('default', 'default');
-    $stmt = $db->query("SELECT word FROM pg_get_keywords() WHERE catcode IN ('R', 'T')");
-    $stmt->execute();
-    foreach ($stmt->fetchAllAssoc('word') as $word => $row) {
-      $expected = '"' . $word . '"';
-      $this->assertIdentical($db->escapeTable($word), $expected, format_string('The reserved word %word was correctly escaped when used as a table name.', array('%word' => $word)));
-      $this->assertIdentical($db->escapeField($word), $expected, format_string('The reserved word %word was correctly escaped when used as a column name.', array('%word' => $word)));
-      $this->assertIdentical($db->escapeAlias($word), $expected, format_string('The reserved word %word was correctly escaped when used as an alias.', array('%word' => $word)));
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php b/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
deleted file mode 100644
index d1916b3..0000000
--- a/core/modules/system/src/Tests/Database/ConnectionUnitTest.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\ConnectionUnitTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests management of database connections.
- *
- * @group Database
- */
-class ConnectionUnitTest extends KernelTestBase {
-
-  protected $key;
-  protected $target;
-
-  protected $monitor;
-  protected $originalCount;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->key = 'default';
-    $this->originalTarget = 'default';
-    $this->target = 'DatabaseConnectionUnitTest';
-
-    // Determine whether the database driver is MySQL. If it is not, the test
-    // methods will not be executed.
-    // @todo Make this test driver-agnostic, or find a proper way to skip it.
-    //   See https://www.drupal.org/node/1273478.
-    $connection_info = Database::getConnectionInfo('default');
-    $this->skipTest = (bool) ($connection_info['default']['driver'] != 'mysql');
-    if ($this->skipTest) {
-      // Insert an assertion to prevent Simpletest from interpreting the test
-      // as failure.
-      $this->pass('This test is only compatible with MySQL.');
-    }
-
-    // Create an additional connection to monitor the connections being opened
-    // and closed in this test.
-    // @see TestBase::changeDatabasePrefix()
-    Database::addConnectionInfo('default', 'monitor', $connection_info['default']);
-    $this->monitor = Database::getConnection('monitor');
-  }
-
-  /**
-   * Adds a new database connection info to Database.
-   */
-  protected function addConnection() {
-    // Add a new target to the connection, by cloning the current connection.
-    $connection_info = Database::getConnectionInfo($this->key);
-    Database::addConnectionInfo($this->key, $this->target, $connection_info[$this->originalTarget]);
-
-    // Verify that the new target exists.
-    $info = Database::getConnectionInfo($this->key);
-    // Note: Custom assertion message to not expose database credentials.
-    $this->assertIdentical($info[$this->target], $connection_info[$this->key], 'New connection info found.');
-  }
-
-  /**
-   * Returns the connection ID of the current test connection.
-   *
-   * @return int
-   */
-  protected function getConnectionID() {
-    return (int) Database::getConnection($this->target, $this->key)->query('SELECT CONNECTION_ID()')->fetchField();
-  }
-
-  /**
-   * Asserts that a connection ID exists.
-   *
-   * @param int $id
-   *   The connection ID to verify.
-   */
-  protected function assertConnection($id) {
-    $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
-    return $this->assertTrue(isset($list[$id]), format_string('Connection ID @id found.', array('@id' => $id)));
-  }
-
-  /**
-   * Asserts that a connection ID does not exist.
-   *
-   * @param int $id
-   *   The connection ID to verify.
-   */
-  protected function assertNoConnection($id) {
-    $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
-    return $this->assertFalse(isset($list[$id]), format_string('Connection ID @id not found.', array('@id' => $id)));
-  }
-
-  /**
-   * Tests Database::closeConnection() without query.
-   *
-   * @todo getConnectionID() executes a query.
-   */
-  function testOpenClose() {
-    if ($this->skipTest) {
-      return;
-    }
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionID();
-    Database::getConnection($this->target, $this->key);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Close the connection.
-    Database::closeConnection($this->target, $this->key);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a query.
-   */
-  function testOpenQueryClose() {
-    if ($this->skipTest) {
-      return;
-    }
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionID();
-    Database::getConnection($this->target, $this->key);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Execute a query.
-    Database::getConnection($this->target, $this->key)->query('SHOW TABLES');
-
-    // Close the connection.
-    Database::closeConnection($this->target, $this->key);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a query and custom prefetch method.
-   */
-  function testOpenQueryPrefetchClose() {
-    if ($this->skipTest) {
-      return;
-    }
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionID();
-    Database::getConnection($this->target, $this->key);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Execute a query.
-    Database::getConnection($this->target, $this->key)->query('SHOW TABLES')->fetchCol();
-
-    // Close the connection.
-    Database::closeConnection($this->target, $this->key);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a select query.
-   */
-  function testOpenSelectQueryClose() {
-    if ($this->skipTest) {
-      return;
-    }
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionID();
-    Database::getConnection($this->target, $this->key);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Create a table.
-    $name = 'foo';
-    Database::getConnection($this->target, $this->key)->schema()->createTable($name, array(
-      'fields' => array(
-        'name' => array(
-          'type' => 'varchar',
-          'length' => 255,
-        ),
-      ),
-    ));
-
-    // Execute a query.
-    Database::getConnection($this->target, $this->key)->select('foo', 'f')
-      ->fields('f', array('name'))
-      ->execute()
-      ->fetchAll();
-
-    // Drop the table.
-    Database::getConnection($this->target, $this->key)->schema()->dropTable($name);
-
-    // Close the connection.
-    Database::closeConnection($this->target, $this->key);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests pdo options override.
-   */
-  public function testConnectionOpen() {
-    $connection = Database::getConnection('default');
-    $reflection = new \ReflectionObject($connection);
-    $connection_property = $reflection->getProperty('connection');
-    $connection_property->setAccessible(TRUE);
-    $error_mode = $connection_property->getValue($connection)
-      ->getAttribute(\PDO::ATTR_ERRMODE);
-    $this->assertEqual($error_mode, \PDO::ERRMODE_EXCEPTION, 'Ensure the default error mode is set to exception.');
-
-    $connection = Database::getConnectionInfo('default');
-    $connection['default']['pdo'][\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
-    Database::addConnectionInfo('test', 'default', $connection['default']);
-    $connection = Database::getConnection('default', 'test');
-
-    $reflection = new \ReflectionObject($connection);
-    $connection_property = $reflection->getProperty('connection');
-    $connection_property->setAccessible(TRUE);
-    $error_mode = $connection_property->getValue($connection)
-      ->getAttribute(\PDO::ATTR_ERRMODE);
-    $this->assertEqual($error_mode, \PDO::ERRMODE_SILENT, 'Ensure PDO connection options can be overridden.');
-
-    Database::removeConnection('test');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php b/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php
deleted file mode 100644
index d534e5a..0000000
--- a/core/modules/system/src/Tests/Database/DatabaseExceptionWrapperTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\DatabaseExceptionWrapperTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\Core\Database\Database;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests exceptions thrown by queries.
- *
- * @group Database
- */
-class DatabaseExceptionWrapperTest extends KernelTestBase {
-
-  /**
-   * Tests the expected database exception thrown for prepared statements.
-   */
-  public function testPreparedStatement() {
-    $connection = Database::getConnection();
-    try {
-      // SQLite validates the syntax upon preparing a statement already.
-      // @throws \PDOException
-      $query = $connection->prepare('bananas');
-
-      // MySQL only validates the syntax upon trying to execute a query.
-      // @throws \Drupal\Core\Database\DatabaseExceptionWrapper
-      $connection->query($query);
-
-      $this->fail('Expected PDOException or DatabaseExceptionWrapper, none was thrown.');
-    }
-    catch (\PDOException $e) {
-      $this->pass('Expected PDOException was thrown.');
-    }
-    catch (DatabaseExceptionWrapper $e) {
-      $this->pass('Expected DatabaseExceptionWrapper was thrown.');
-    }
-    catch (\Exception $e) {
-      $this->fail("Thrown exception is not a PDOException:\n" . (string) $e);
-    }
-  }
-
-  /**
-   * Tests the expected database exception thrown for inexistent tables.
-   */
-  public function testQueryThrowsDatabaseExceptionWrapperException() {
-    $connection = Database::getConnection();
-    try {
-      $connection->query('SELECT * FROM {does_not_exist}');
-      $this->fail('Expected PDOException, none was thrown.');
-    }
-    catch (DatabaseExceptionWrapper $e) {
-      $this->pass('Expected DatabaseExceptionWrapper was thrown.');
-    }
-    catch (\Exception $e) {
-      $this->fail("Thrown exception is not a DatabaseExceptionWrapper:\n" . (string) $e);
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/DatabaseTestBase.php b/core/modules/system/src/Tests/Database/DatabaseTestBase.php
deleted file mode 100644
index a6b7611..0000000
--- a/core/modules/system/src/Tests/Database/DatabaseTestBase.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\DatabaseTestBase.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Base class for databases database tests.
- *
- * Because all database tests share the same test data, we can centralize that
- * here.
- */
-abstract class DatabaseTestBase extends KernelTestBase {
-
-  public static $modules = array('database_test');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('database_test', array(
-      'test',
-      'test_people',
-      'test_people_copy',
-      'test_one_blob',
-      'test_two_blobs',
-      'test_task',
-      'test_null',
-      'test_serialized',
-      'test_special_columns',
-      'TEST_UPPERCASE',
-    ));
-    self::addSampleData();
-  }
-
-  /**
-   * Sets up tables for NULL handling.
-   */
-  function ensureSampleDataNull() {
-    db_insert('test_null')
-    ->fields(array('name', 'age'))
-    ->values(array(
-      'name' => 'Kermit',
-      'age' => 25,
-    ))
-    ->values(array(
-      'name' => 'Fozzie',
-      'age' => NULL,
-    ))
-    ->values(array(
-      'name' => 'Gonzo',
-      'age' => 27,
-    ))
-    ->execute();
-  }
-
-  /**
-   * Sets up our sample data.
-   */
-  static function addSampleData() {
-    // We need the IDs, so we can't use a multi-insert here.
-    $john = db_insert('test')
-      ->fields(array(
-        'name' => 'John',
-        'age' => 25,
-        'job' => 'Singer',
-      ))
-      ->execute();
-
-    $george = db_insert('test')
-      ->fields(array(
-        'name' => 'George',
-        'age' => 27,
-        'job' => 'Singer',
-      ))
-      ->execute();
-
-    db_insert('test')
-      ->fields(array(
-        'name' => 'Ringo',
-        'age' => 28,
-        'job' => 'Drummer',
-      ))
-      ->execute();
-
-    $paul = db_insert('test')
-      ->fields(array(
-        'name' => 'Paul',
-        'age' => 26,
-        'job' => 'Songwriter',
-      ))
-      ->execute();
-
-    db_insert('test_people')
-      ->fields(array(
-        'name' => 'Meredith',
-        'age' => 30,
-        'job' => 'Speaker',
-      ))
-      ->execute();
-
-    db_insert('test_task')
-      ->fields(array('pid', 'task', 'priority'))
-      ->values(array(
-        'pid' => $john,
-        'task' => 'eat',
-        'priority' => 3,
-      ))
-      ->values(array(
-        'pid' => $john,
-        'task' => 'sleep',
-        'priority' => 4,
-      ))
-      ->values(array(
-        'pid' => $john,
-        'task' => 'code',
-        'priority' => 1,
-      ))
-      ->values(array(
-        'pid' => $george,
-        'task' => 'sing',
-        'priority' => 2,
-      ))
-      ->values(array(
-        'pid' => $george,
-        'task' => 'sleep',
-        'priority' => 2,
-      ))
-      ->values(array(
-        'pid' => $paul,
-        'task' => 'found new band',
-        'priority' => 1,
-      ))
-      ->values(array(
-        'pid' => $paul,
-        'task' => 'perform at superbowl',
-        'priority' => 3,
-      ))
-      ->execute();
-
-    db_insert('test_special_columns')
-      ->fields(array(
-        'id' => 1,
-        'offset' => 'Offset value 1',
-      ))
-      ->execute();
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
index 690a2a6..db80acc 100644
--- a/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
+++ b/core/modules/system/src/Tests/Database/DatabaseWebTestBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Database;
 
+use Drupal\KernelTests\Core\Database\DatabaseTestBase;
 use Drupal\simpletest\WebTestBase;
 
 /**
diff --git a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php b/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
deleted file mode 100644
index 56f53cb..0000000
--- a/core/modules/system/src/Tests/Database/DeleteTruncateTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\DeleteTruncateTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests delete and truncate queries.
- *
- * The DELETE tests are not as extensive, as all of the interesting code for
- * DELETE queries is in the conditional which is identical to the UPDATE and
- * SELECT conditional handling.
- *
- * The TRUNCATE tests are not extensive either, because the behavior of
- * TRUNCATE queries is not consistent across database engines. We only test
- * that a TRUNCATE query actually deletes all rows from the target table.
- *
- * @group Database
- */
-class DeleteTruncateTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can use a subselect in a delete successfully.
-   */
-  function testSubselectDelete() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
-    $pid_to_delete = db_query("SELECT * FROM {test_task} WHERE task = 'sleep'")->fetchField();
-
-    $subquery = db_select('test', 't')
-      ->fields('t', array('id'))
-      ->condition('t.id', array($pid_to_delete), 'IN');
-    $delete = db_delete('test_task')
-      ->condition('task', 'sleep')
-      ->condition('pid', $subquery, 'IN');
-
-    $num_deleted = $delete->execute();
-    $this->assertEqual($num_deleted, 1, 'Deleted 1 record.');
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
-  }
-
-  /**
-   * Confirms that we can delete a single record successfully.
-   */
-  function testSimpleDelete() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    $num_deleted = db_delete('test')
-      ->condition('id', 1)
-      ->execute();
-    $this->assertIdentical($num_deleted, 1, 'Deleted 1 record.');
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
-  }
-
-  /**
-   * Confirms that we can truncate a whole table successfully.
-   */
-  function testTruncate() {
-    $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-    $this->assertTrue($num_records_before > 0, 'The table is not empty.');
-
-    db_truncate('test')->execute();
-
-    $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-    $this->assertEqual(0, $num_records_after, 'Truncate really deletes everything.');
-  }
-
-  /**
-   * Confirms that we can delete a single special column name record successfully.
-   */
-  function testSpecialColumnDelete() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
-
-    $num_deleted = db_delete('test_special_columns')
-      ->condition('id', 1)
-      ->execute();
-    $this->assertIdentical($num_deleted, 1, 'Deleted 1 special column record.');
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/FetchTest.php b/core/modules/system/src/Tests/Database/FetchTest.php
deleted file mode 100644
index 0cb8dfc..0000000
--- a/core/modules/system/src/Tests/Database/FetchTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\FetchTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\RowCountException;
-use Drupal\Core\Database\StatementInterface;
-
-/**
- * Tests the Database system's various fetch capabilities.
- *
- * We get timeout errors if we try to run too many tests at once.
- *
- * @group Database
- */
-class FetchTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can fetch a record properly in default object mode.
-   */
-  function testQueryFetchDefault() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25));
-    $this->assertTrue($result instanceof StatementInterface, 'Result set is a Drupal statement object.');
-    foreach ($result as $record) {
-      $records[] = $record;
-      $this->assertTrue(is_object($record), 'Record is an object.');
-      $this->assertIdentical($record->name, 'John', '25 year old is John.');
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record.');
-  }
-
-  /**
-   * Confirms that we can fetch a record to an object explicitly.
-   */
-  function testQueryFetchObject() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_OBJ));
-    foreach ($result as $record) {
-      $records[] = $record;
-      $this->assertTrue(is_object($record), 'Record is an object.');
-      $this->assertIdentical($record->name, 'John', '25 year old is John.');
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record.');
-  }
-
-  /**
-   * Confirms that we can fetch a record to an associative array explicitly.
-   */
-  function testQueryFetchArray() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_ASSOC));
-    foreach ($result as $record) {
-      $records[] = $record;
-      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
-        $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
-      }
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record.');
-  }
-
-  /**
-   * Confirms that we can fetch a record into a new instance of a custom class.
-   *
-   * @see \Drupal\system\Tests\Database\FakeRecord
-   */
-  function testQueryFetchClass() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'Drupal\system\Tests\Database\FakeRecord'));
-    foreach ($result as $record) {
-      $records[] = $record;
-      if ($this->assertTrue($record instanceof FakeRecord, 'Record is an object of class FakeRecord.')) {
-        $this->assertIdentical($record->name, 'John', '25 year old is John.');
-      }
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record.');
-  }
-
-  /**
-   * Confirms that we can fetch a record into an indexed array explicitly.
-   */
-  function testQueryFetchNum() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_NUM));
-    foreach ($result as $record) {
-      $records[] = $record;
-      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
-        $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
-      }
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record');
-  }
-
-  /**
-   * Confirms that we can fetch a record into a doubly-keyed array explicitly.
-   */
-  function testQueryFetchBoth() {
-    $records = array();
-    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_BOTH));
-    foreach ($result as $record) {
-      $records[] = $record;
-      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
-        $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
-        $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
-      }
-    }
-
-    $this->assertIdentical(count($records), 1, 'There is only one record.');
-  }
-
-  /**
-   * Confirms that we can fetch an entire column of a result set at once.
-   */
-  function testQueryFetchCol() {
-    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
-    $column = $result->fetchCol();
-    $this->assertIdentical(count($column), 3, 'fetchCol() returns the right number of records.');
-
-    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
-    $i = 0;
-    foreach ($result as $record) {
-      $this->assertIdentical($record->name, $column[$i++], 'Column matches direct access.');
-    }
-  }
-
-  /**
-   * Tests that rowCount() throws exception on SELECT query.
-   */
-  public function testRowCount() {
-    $result = db_query('SELECT name FROM {test}');
-    try {
-      $result->rowCount();
-      $exception = FALSE;
-    }
-    catch (RowCountException $e) {
-      $exception = TRUE;
-    }
-    $this->assertTrue($exception, 'Exception was thrown');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/InsertDefaultsTest.php b/core/modules/system/src/Tests/Database/InsertDefaultsTest.php
deleted file mode 100644
index 980b6b3..0000000
--- a/core/modules/system/src/Tests/Database/InsertDefaultsTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\InsertDefaultsTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Query\NoFieldsException;
-
-/**
- * Tests the Insert query builder with default values.
- *
- * @group Database
- */
-class InsertDefaultsTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can run a query that uses default values for everything.
-   */
-  function testDefaultInsert() {
-    $query = db_insert('test')->useDefaults(array('job'));
-    $id = $query->execute();
-
-    $schema = drupal_get_module_schema('database_test', 'test');
-
-    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
-    $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
-  }
-
-  /**
-   * Tests that no action will be preformed if no fields are specified.
-   */
-  function testDefaultEmptyInsert() {
-    $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    try {
-      db_insert('test')->execute();
-      // This is only executed if no exception has been thrown.
-      $this->fail('Expected exception NoFieldsException has not been thrown.');
-    } catch (NoFieldsException $e) {
-      $this->pass('Expected exception NoFieldsException has been thrown.');
-    }
-
-    $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before, $num_records_after, 'Do nothing as no fields are specified.');
-  }
-
-  /**
-   * Tests that we can insert fields with values and defaults in the same query.
-   */
-  function testDefaultInsertWithFields() {
-    $query = db_insert('test')
-      ->fields(array('name' => 'Bob'))
-      ->useDefaults(array('job'));
-    $id = $query->execute();
-
-    $schema = drupal_get_module_schema('database_test', 'test');
-
-    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
-    $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/InsertLobTest.php b/core/modules/system/src/Tests/Database/InsertLobTest.php
deleted file mode 100644
index 774c89a..0000000
--- a/core/modules/system/src/Tests/Database/InsertLobTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\InsertLobTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Insert query builder with LOB fields.
- *
- * @group Database
- */
-class InsertLobTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can insert a single blob field successfully.
-   */
-  function testInsertOneBlob() {
-    $data = "This is\000a test.";
-    $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
-    $id = db_insert('test_one_blob')
-      ->fields(array('blob1' => $data))
-      ->execute();
-    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, format_string('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
-  }
-
-  /**
-   * Tests that we can insert multiple blob fields in the same query.
-   */
-  function testInsertMultipleBlob() {
-    $id = db_insert('test_two_blobs')
-      ->fields(array(
-        'blob1' => 'This is',
-        'blob2' => 'a test',
-      ))
-      ->execute();
-    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', 'Can insert multiple blobs per row.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/InsertTest.php b/core/modules/system/src/Tests/Database/InsertTest.php
deleted file mode 100644
index f021ff5..0000000
--- a/core/modules/system/src/Tests/Database/InsertTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\InsertTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the insert builder.
- *
- * @group Database
- */
-class InsertTest extends DatabaseTestBase {
-
-  /**
-   * Tests very basic insert functionality.
-   */
-  function testSimpleInsert() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    $query = db_insert('test');
-    $query->fields(array(
-      'name' => 'Yoko',
-      'age' => '29',
-    ));
-    $query->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
-    $this->assertIdentical($saved_age, '29', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that we can insert multiple records in one query object.
-   */
-  function testMultiInsert() {
-    $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    $query = db_insert('test');
-    $query->fields(array(
-      'name' => 'Larry',
-      'age' => '30',
-    ));
-
-    // We should be able to specify values in any order if named.
-    $query->values(array(
-      'age' => '31',
-      'name' => 'Curly',
-    ));
-
-    // We should be able to say "use the field order".
-    // This is not the recommended mechanism for most cases, but it should work.
-    $query->values(array('Moe', '32'));
-    $query->execute();
-
-    $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical($num_records_before + 3, $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that an insert object can be reused with new data after it executes.
-   */
-  function testRepeatedInsert() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-
-    $query = db_insert('test');
-
-    $query->fields(array(
-      'name' => 'Larry',
-      'age' => '30',
-    ));
-    $query->execute();  // This should run the insert, but leave the fields intact.
-
-    // We should be able to specify values in any order if named.
-    $query->values(array(
-      'age' => '31',
-      'name' => 'Curly',
-    ));
-    $query->execute();
-
-    // We should be able to say "use the field order".
-    $query->values(array('Moe', '32'));
-    $query->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
-    $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, 'Record inserts correctly.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that we can specify fields without values and specify values later.
-   */
-  function testInsertFieldOnlyDefinition() {
-    // This is useful for importers, when we want to create a query and define
-    // its fields once, then loop over a multi-insert execution.
-    db_insert('test')
-      ->fields(array('name', 'age'))
-      ->values(array('Larry', '30'))
-      ->values(array('Curly', '31'))
-      ->values(array('Moe', '32'))
-      ->execute();
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
-    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
-    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
-    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that inserts return the proper auto-increment ID.
-   */
-  function testInsertLastInsertID() {
-    $id = db_insert('test')
-      ->fields(array(
-        'name' => 'Larry',
-        'age' => '30',
-      ))
-      ->execute();
-
-    $this->assertIdentical($id, '5', 'Auto-increment ID returned successfully.');
-  }
-
-  /**
-   * Tests that the INSERT INTO ... SELECT (fields) ... syntax works.
-   */
-  function testInsertSelectFields() {
-    $query = db_select('test_people', 'tp');
-    // The query builder will always append expressions after fields.
-    // Add the expression first to test that the insert fields are correctly
-    // re-ordered.
-    $query->addExpression('tp.age', 'age');
-    $query
-      ->fields('tp', array('name', 'job'))
-      ->condition('tp.name', 'Meredith');
-
-    // The resulting query should be equivalent to:
-    // INSERT INTO test (age, name, job)
-    // SELECT tp.age AS age, tp.name AS name, tp.job AS job
-    // FROM test_people tp
-    // WHERE tp.name = 'Meredith'
-    db_insert('test')
-      ->from($query)
-      ->execute();
-
-    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
-    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that the INSERT INTO ... SELECT * ... syntax works.
-   */
-  function testInsertSelectAll() {
-    $query = db_select('test_people', 'tp')
-      ->fields('tp')
-      ->condition('tp.name', 'Meredith');
-
-    // The resulting query should be equivalent to:
-    // INSERT INTO test_people_copy
-    // SELECT *
-    // FROM test_people tp
-    // WHERE tp.name = 'Meredith'
-    db_insert('test_people_copy')
-      ->from($query)
-      ->execute();
-
-    $saved_age = db_query('SELECT age FROM {test_people_copy} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
-    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
-  }
-
-  /**
-   * Tests that we can INSERT INTO a special named column.
-   */
-  function testSpecialColumnInsert() {
-    $id = db_insert('test_special_columns')
-      ->fields(array(
-        'id' => 2,
-        'offset' => 'Offset value 2',
-      ))
-      ->execute();
-    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 2))->fetchField();
-    $this->assertIdentical($saved_value, 'Offset value 2', 'Can retrieve special column name value after inserting.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/InvalidDataTest.php b/core/modules/system/src/Tests/Database/InvalidDataTest.php
deleted file mode 100644
index 8fcfb23..0000000
--- a/core/modules/system/src/Tests/Database/InvalidDataTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\InvalidDataTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\IntegrityConstraintViolationException;
-
-/**
- * Tests handling of some invalid data.
- *
- * @group Database
- */
-class InvalidDataTest extends DatabaseTestBase {
-  /**
-   * Tests aborting of traditional SQL database systems with invalid data.
-   */
-  function testInsertDuplicateData() {
-    // Try to insert multiple records where at least one has bad data.
-    try {
-      db_insert('test')
-        ->fields(array('name', 'age', 'job'))
-        ->values(array(
-          'name' => 'Elvis',
-          'age' => 63,
-          'job' => 'Singer',
-        ))->values(array(
-          'name' => 'John', // <-- Duplicate value on unique field.
-          'age' => 17,
-          'job' => 'Consultant',
-        ))
-        ->values(array(
-          'name' => 'Frank',
-          'age' => 75,
-          'job' => 'Singer',
-        ))
-        ->execute();
-      $this->fail('Insert succeeded when it should not have.');
-    }
-    catch (IntegrityConstraintViolationException $e) {
-      // Check if the first record was inserted.
-      $name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 63))->fetchField();
-
-      if ($name == 'Elvis') {
-        if (!Database::getConnection()->supportsTransactions()) {
-          // This is an expected fail.
-          // Database engines that don't support transactions can leave partial
-          // inserts in place when an error occurs. This is the case for MySQL
-          // when running on a MyISAM table.
-          $this->pass("The whole transaction has not been rolled-back when a duplicate key insert occurs, this is expected because the database doesn't support transactions");
-        }
-        else {
-          $this->fail('The whole transaction is rolled back when a duplicate key insert occurs.');
-        }
-      }
-      else {
-        $this->pass('The whole transaction is rolled back when a duplicate key insert occurs.');
-      }
-
-      // Ensure the other values were not inserted.
-      $record = db_select('test')
-        ->fields('test', array('name', 'age'))
-        ->condition('age', array(17, 75), 'IN')
-        ->execute()->fetchObject();
-
-      $this->assertFalse($record, 'The rest of the insert aborted as expected.');
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/LargeQueryTest.php b/core/modules/system/src/Tests/Database/LargeQueryTest.php
deleted file mode 100644
index fab1b8f..0000000
--- a/core/modules/system/src/Tests/Database/LargeQueryTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\LargeQueryTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Component\Utility\Environment;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\DatabaseException;
-
-/**
- * Tests handling of large queries.
- *
- * @group Database
- */
-class LargeQueryTest extends DatabaseTestBase {
-
-  /**
-   * Tests truncation of messages when max_allowed_packet exception occurs.
-   */
-  function testMaxAllowedPacketQueryTruncating() {
-    // This test only makes sense if we are running on a MySQL database.
-    // Test if we are.
-    $database = Database::getConnectionInfo('default');
-    if ($database['default']['driver'] == 'mysql') {
-      // The max_allowed_packet value is configured per database instance.
-      // Retrieve the max_allowed_packet value from the current instance and
-      // check if PHP is configured with sufficient allowed memory to be able
-      // to generate a query larger than max_allowed_packet.
-      $max_allowed_packet = db_query('SELECT @@global.max_allowed_packet')->fetchField();
-      if (Environment::checkMemoryLimit($max_allowed_packet + (16 * 1024 * 1024))) {
-        $long_name = str_repeat('a', $max_allowed_packet + 1);
-        try {
-          db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $long_name));
-          $this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
-        } catch (DatabaseException $e) {
-          // Close and re-open the connection. Otherwise we will run into error
-          // 2006 "MySQL server had gone away" afterwards.
-          Database::closeConnection();
-          Database::getConnection();
-          $this->assertEqual($e->getPrevious()->errorInfo[1], 1153, "Got a packet bigger than 'max_allowed_packet' bytes exception thrown.");
-          // Use strlen() to count the bytes exactly, not the unicode chars.
-          $this->assertTrue(strlen($e->getMessage()) <= $max_allowed_packet, "'max_allowed_packet' exception message truncated.");
-        }
-      }
-      else {
-        $this->verbose('The configured max_allowed_packet exceeds the php memory limit. Therefore the test is skipped.');
-      }
-    }
-    else {
-      $this->verbose('The test requires MySQL. Therefore the test is skipped.');
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/LoggingTest.php b/core/modules/system/src/Tests/Database/LoggingTest.php
deleted file mode 100644
index f17f6c5..0000000
--- a/core/modules/system/src/Tests/Database/LoggingTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\LoggingTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-
-/**
- * Tests the query logging facility.
- *
- * @group Database
- */
-class LoggingTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can log the existence of a query.
-   */
-  function testEnableLogging() {
-    Database::startLog('testing');
-
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
-
-    // Trigger a call that does not have file in the backtrace.
-    call_user_func_array('db_query', array('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo')))->fetchCol();
-
-    $queries = Database::getLog('testing', 'default');
-
-    $this->assertEqual(count($queries), 3, 'Correct number of queries recorded.');
-
-    foreach ($queries as $query) {
-      $this->assertEqual($query['caller']['function'], __FUNCTION__, 'Correct function in query log.');
-    }
-  }
-
-  /**
-   * Tests that we can run two logs in parallel.
-   */
-  function testEnableMultiLogging() {
-    Database::startLog('testing1');
-
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-
-    Database::startLog('testing2');
-
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
-
-    $queries1 = Database::getLog('testing1');
-    $queries2 = Database::getLog('testing2');
-
-    $this->assertEqual(count($queries1), 2, 'Correct number of queries recorded for log 1.');
-    $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for log 2.');
-  }
-
-  /**
-   * Tests logging queries against multiple targets on the same connection.
-   */
-  function testEnableTargetLogging() {
-    // Clone the primary credentials to a replica connection and to another fake
-    // connection.
-    $connection_info = Database::getConnectionInfo('default');
-    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
-
-    Database::startLog('testing1');
-
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'));//->fetchCol();
-
-    $queries1 = Database::getLog('testing1');
-
-    $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
-    $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
-    $this->assertEqual($queries1[1]['target'], 'replica', 'Second query used replica target.');
-  }
-
-  /**
-   * Tests that logs to separate targets use the same connection properly.
-   *
-   * This test is identical to the one above, except that it doesn't create
-   * a fake target so the query should fall back to running on the default
-   * target.
-   */
-  function testEnableTargetLoggingNoTarget() {
-    Database::startLog('testing1');
-
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-
-    // We use "fake" here as a target because any non-existent target will do.
-    // However, because all of the tests in this class share a single page
-    // request there is likely to be a target of "replica" from one of the other
-    // unit tests, so we use a target here that we know with absolute certainty
-    // does not exist.
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'fake'))->fetchCol();
-
-    $queries1 = Database::getLog('testing1');
-
-    $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
-    $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
-    $this->assertEqual($queries1[1]['target'], 'default', 'Second query used default target as fallback.');
-  }
-
-  /**
-   * Tests that we can log queries separately on different connections.
-   */
-  function testEnableMultiConnectionLogging() {
-    // Clone the primary credentials to a fake connection.
-    // That both connections point to the same physical database is irrelevant.
-    $connection_info = Database::getConnectionInfo('default');
-    Database::addConnectionInfo('test2', 'default', $connection_info['default']);
-
-    Database::startLog('testing1');
-    Database::startLog('testing1', 'test2');
-
-    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
-
-    $old_key = db_set_active('test2');
-
-    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'))->fetchCol();
-
-    db_set_active($old_key);
-
-    $queries1 = Database::getLog('testing1');
-    $queries2 = Database::getLog('testing1', 'test2');
-
-    $this->assertEqual(count($queries1), 1, 'Correct number of queries recorded for first connection.');
-    $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for second connection.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/MergeTest.php b/core/modules/system/src/Tests/Database/MergeTest.php
deleted file mode 100644
index c4e83bb..0000000
--- a/core/modules/system/src/Tests/Database/MergeTest.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\MergeTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Query\Merge;
-use Drupal\Core\Database\Query\InvalidMergeQueryException;
-
-/**
- * Tests the MERGE query builder.
- *
- * @group Database
- */
-class MergeTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can merge-insert a record successfully.
-   */
-  function testMergeInsert() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    $result = db_merge('test_people')
-      ->key('job', 'Presenter')
-      ->fields(array(
-        'age' => 31,
-        'name' => 'Tiffany',
-      ))
-      ->execute();
-
-    $this->assertEqual($result, Merge::STATUS_INSERT, 'Insert status returned.');
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
-    $this->assertEqual($person->age, 31, 'Age set correctly.');
-    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
-  }
-
-  /**
-   * Confirms that we can merge-update a record successfully.
-   */
-  function testMergeUpdate() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    $result = db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->fields(array(
-        'age' => 31,
-        'name' => 'Tiffany',
-      ))
-      ->execute();
-
-    $this->assertEqual($result, Merge::STATUS_UPDATE, 'Update status returned.');
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
-    $this->assertEqual($person->age, 31, 'Age set correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
-  }
-
-  /**
-   * Confirms that we can merge-update a record successfully.
-   *
-   * This test varies from the previous test because it manually defines which
-   * fields are inserted, and which fields are updated.
-   */
-  function testMergeUpdateExcept() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->insertFields(array('age' => 31))
-      ->updateFields(array('name' => 'Tiffany'))
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
-    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
-  }
-
-  /**
-   * Confirms that we can merge-update a record, with alternate replacement.
-   */
-  function testMergeUpdateExplicit() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->insertFields(array(
-        'age' => 31,
-        'name' => 'Tiffany',
-      ))
-      ->updateFields(array(
-        'name' => 'Joe',
-      ))
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Joe', 'Name set correctly.');
-    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
-  }
-
-  /**
-   * Confirms that we can merge-update a record successfully, with expressions.
-   */
-  function testMergeUpdateExpression() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    $age_before = db_query('SELECT age FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetchField();
-
-    // This is a very contrived example, as I have no idea why you'd want to
-    // change age this way, but that's beside the point.
-    // Note that we are also double-setting age here, once as a literal and
-    // once as an expression. This test will only pass if the expression wins,
-    // which is what is supposed to happen.
-    db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->fields(array('name' => 'Tiffany'))
-      ->insertFields(array('age' => 31))
-      ->expression('age', 'age + :age', array(':age' => 4))
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
-    $this->assertEqual($person->age, $age_before + 4, 'Age updated correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
-  }
-
-  /**
-   * Tests that we can merge-insert without any update fields.
-   */
-  function testMergeInsertWithoutUpdate() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    db_merge('test_people')
-      ->key('job', 'Presenter')
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
-    $this->assertEqual($person->name, '', 'Name set correctly.');
-    $this->assertEqual($person->age, 0, 'Age set correctly.');
-    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
-  }
-
-  /**
-   * Confirms that we can merge-update without any update fields.
-   */
-  function testMergeUpdateWithoutUpdate() {
-    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
-    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
-
-    db_merge('test_people')
-      ->key('job', 'Speaker')
-      ->insertFields(array('age' => 31))
-      ->execute();
-
-    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
-
-    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
-    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
-    $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
-  }
-
-  /**
-   * Tests that an invalid merge query throws an exception.
-   */
-  function testInvalidMerge() {
-    try {
-      // This query will fail because there is no key field specified.
-      // Normally it would throw an exception but we are suppressing it with
-      // the throw_exception option.
-      $options['throw_exception'] = FALSE;
-      db_merge('test_people', $options)
-        ->fields(array(
-          'age' => 31,
-          'name' => 'Tiffany',
-        ))
-        ->execute();
-      $this->pass('$options[\'throw_exception\'] is FALSE, no InvalidMergeQueryException thrown.');
-    }
-    catch (InvalidMergeQueryException $e) {
-      $this->fail('$options[\'throw_exception\'] is FALSE, but InvalidMergeQueryException thrown for invalid query.');
-      return;
-    }
-
-    try {
-      // This query will fail because there is no key field specified.
-      db_merge('test_people')
-        ->fields(array(
-          'age' => 31,
-          'name' => 'Tiffany',
-        ))
-        ->execute();
-    }
-    catch (InvalidMergeQueryException $e) {
-      $this->pass('InvalidMergeQueryException thrown for invalid query.');
-      return;
-    }
-    $this->fail('No InvalidMergeQueryException thrown');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/NextIdTest.php b/core/modules/system/src/Tests/Database/NextIdTest.php
deleted file mode 100644
index cabbe16..0000000
--- a/core/modules/system/src/Tests/Database/NextIdTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\NextIdTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests the sequences API.
- *
- * @group Database
- */
-class NextIdTest extends KernelTestBase {
-
-  /**
-   * The modules to enable.
-   * @var array
-   */
-  public static $modules = array('system');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'sequences');
-  }
-
-  /**
-   * Tests that the sequences API works.
-   */
-  function testDbNextId() {
-    $first = db_next_id();
-    $second = db_next_id();
-    // We can test for exact increase in here because we know there is no
-    // other process operating on these tables -- normally we could only
-    // expect $second > $first.
-    $this->assertEqual($first + 1, $second, 'The second call from a sequence provides a number increased by one.');
-    $result = db_next_id(1000);
-    $this->assertEqual($result, 1001, 'Sequence provides a larger number than the existing ID.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/QueryTest.php b/core/modules/system/src/Tests/Database/QueryTest.php
deleted file mode 100644
index dd613c5..0000000
--- a/core/modules/system/src/Tests/Database/QueryTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\QueryTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests Drupal's extended prepared statement syntax..
- *
- * @group Database
- */
-class QueryTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can pass an array of values directly in the query.
-   */
-  function testArraySubstitution() {
-    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25, 26, 27)))->fetchAll();
-    $this->assertEqual(count($names), 3, 'Correct number of names returned');
-
-    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25)))->fetchAll();
-    $this->assertEqual(count($names), 1, 'Correct number of names returned');
-  }
-
-  /**
-   * Tests that we can not pass a scalar value when an array is expected.
-   */
-  function testScalarSubstitution() {
-    try {
-      $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => 25))->fetchAll();
-      $this->fail('Array placeholder with scalar argument should result in an exception.');
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass('Array placeholder with scalar argument should result in an exception.');
-    }
-
-  }
-
-  /**
-   * Tests SQL injection via database query array arguments.
-   */
-  public function testArrayArgumentsSQLInjection() {
-    // Attempt SQL injection and verify that it does not work.
-    $condition = array(
-      "1 ;INSERT INTO {test} (name) VALUES ('test12345678'); -- " => '',
-      '1' => '',
-    );
-    try {
-      db_query("SELECT * FROM {test} WHERE name = :name", array(':name' => $condition))->fetchObject();
-      $this->fail('SQL injection attempt via array arguments should result in a database exception.');
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass('SQL injection attempt via array arguments should result in a database exception.');
-    }
-
-    // Test that the insert query that was used in the SQL injection attempt did
-    // not result in a row being inserted in the database.
-    $result = db_select('test')
-      ->condition('name', 'test12345678')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertFalse($result, 'SQL injection attempt did not result in a row being inserted in the database table.');
-  }
-
-  /**
-   * Tests SQL injection via condition operator.
-   */
-  public function testConditionOperatorArgumentsSQLInjection() {
-    $injection = "IS NOT NULL) ;INSERT INTO {test} (name) VALUES ('test12345678'); -- ";
-
-    // Convert errors to exceptions for testing purposes below.
-    set_error_handler(function ($severity, $message, $filename, $lineno) {
-      throw new \ErrorException($message, 0, $severity, $filename, $lineno);
-    });
-    try {
-      $result = db_select('test', 't')
-        ->fields('t')
-        ->condition('name', 1, $injection)
-        ->execute();
-      $this->fail('Should not be able to attempt SQL injection via condition operator.');
-    }
-    catch (\ErrorException $e) {
-      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
-    }
-
-    // Test that the insert query that was used in the SQL injection attempt did
-    // not result in a row being inserted in the database.
-    $result = db_select('test')
-      ->condition('name', 'test12345678')
-      ->countQuery()
-      ->execute()
-      ->fetchField();
-    $this->assertFalse($result, 'SQL injection attempt did not result in a row being inserted in the database table.');
-
-    // Attempt SQLi via union query with no unsafe characters.
-    $this->enableModules(['user']);
-    $this->installEntitySchema('user');
-    db_insert('test')
-      ->fields(['name' => '123456'])
-      ->execute();
-    $injection = "= 1 UNION ALL SELECT password FROM user WHERE uid =";
-
-    try {
-      $result = db_select('test', 't')
-        ->fields('t', array('name', 'name'))
-        ->condition('name', 1, $injection)
-        ->execute();
-      $this->fail('Should not be able to attempt SQL injection via operator.');
-    }
-    catch (\ErrorException $e) {
-      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
-    }
-
-    // Attempt SQLi via union query - uppercase tablename.
-    db_insert('TEST_UPPERCASE')
-      ->fields(['name' => 'secrets'])
-      ->execute();
-    $injection = "IS NOT NULL) UNION ALL SELECT name FROM {TEST_UPPERCASE} -- ";
-
-    try {
-      $result = db_select('test', 't')
-        ->fields('t', array('name'))
-        ->condition('name', 1, $injection)
-        ->execute();
-      $this->fail('Should not be able to attempt SQL injection via operator.');
-    }
-    catch (\ErrorException $e) {
-      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
-    }
-    restore_error_handler();
-  }
-
-  /**
-   * Tests numeric query parameter expansion in expressions.
-   *
-   * @see \Drupal\Core\Database\Driver\sqlite\Statement::getStatement()
-   * @see http://bugs.php.net/bug.php?id=45259
-   */
-  public function testNumericExpressionSubstitution() {
-    $count = db_query('SELECT COUNT(*) >= 3 FROM {test}')->fetchField();
-    $this->assertEqual((bool) $count, TRUE);
-
-    $count = db_query('SELECT COUNT(*) >= :count FROM {test}', array(
-      ':count' => 3,
-    ))->fetchField();
-    $this->assertEqual((bool) $count, TRUE);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/RangeQueryTest.php b/core/modules/system/src/Tests/Database/RangeQueryTest.php
deleted file mode 100644
index 13b10c1..0000000
--- a/core/modules/system/src/Tests/Database/RangeQueryTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\RangeQueryTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Range query functionality.
- *
- * @group Database
- */
-class RangeQueryTest extends DatabaseTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('database_test');
-
-  /**
-   * Confirms that range queries work and return the correct result.
-   */
-  function testRangeQuery() {
-    // Test if return correct number of rows.
-    $range_rows = db_query_range("SELECT name FROM {test} ORDER BY name", 1, 3)->fetchAll();
-    $this->assertEqual(count($range_rows), 3, 'Range query work and return correct number of rows.');
-
-    // Test if return target data.
-    $raw_rows = db_query('SELECT name FROM {test} ORDER BY name')->fetchAll();
-    $raw_rows = array_slice($raw_rows, 1, 3);
-    $this->assertEqual($range_rows, $raw_rows);
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/RegressionTest.php b/core/modules/system/src/Tests/Database/RegressionTest.php
deleted file mode 100644
index c6dbc06..0000000
--- a/core/modules/system/src/Tests/Database/RegressionTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\RegressionTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Regression tests cases for the database layer.
- *
- * @group Database
- */
-class RegressionTest extends DatabaseTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'user');
-
-  /**
-   * Ensures that non-ASCII UTF-8 data is stored in the database properly.
-   */
-  function testRegression_310447() {
-    // That's a 255 character UTF-8 string.
-    $job = str_repeat("é", 255);
-    db_insert('test')
-      ->fields(array(
-        'name' => $this->randomMachineName(),
-        'age' => 20,
-        'job' => $job,
-      ))->execute();
-
-    $from_database = db_query('SELECT job FROM {test} WHERE job = :job', array(':job' => $job))->fetchField();
-    $this->assertIdentical($job, $from_database, 'The database handles UTF-8 characters cleanly.');
-  }
-
-  /**
-   * Tests the db_table_exists() function.
-   */
-  function testDBTableExists() {
-    $this->assertIdentical(TRUE, db_table_exists('test'), 'Returns true for existent table.');
-    $this->assertIdentical(FALSE, db_table_exists('nosuchtable'), 'Returns false for nonexistent table.');
-  }
-
-  /**
-   * Tests the db_field_exists() function.
-   */
-  function testDBFieldExists() {
-    $this->assertIdentical(TRUE, db_field_exists('test', 'name'), 'Returns true for existent column.');
-    $this->assertIdentical(FALSE, db_field_exists('test', 'nosuchcolumn'), 'Returns false for nonexistent column.');
-  }
-
-  /**
-   * Tests the db_index_exists() function.
-   */
-  function testDBIndexExists() {
-    $this->assertIdentical(TRUE, db_index_exists('test', 'ages'), 'Returns true for existent index.');
-    $this->assertIdentical(FALSE, db_index_exists('test', 'nosuchindex'), 'Returns false for nonexistent index.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/SchemaTest.php b/core/modules/system/src/Tests/Database/SchemaTest.php
deleted file mode 100644
index 716a6a1..0000000
--- a/core/modules/system/src/Tests/Database/SchemaTest.php
+++ /dev/null
@@ -1,796 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SchemaTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\SchemaException;
-use Drupal\Core\Database\SchemaObjectDoesNotExistException;
-use Drupal\Core\Database\SchemaObjectExistsException;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\Component\Utility\Unicode;
-
-/**
- * Tests table creation and modification via the schema API.
- *
- * @group Database
- */
-class SchemaTest extends KernelTestBase {
-
-  /**
-   * A global counter for table and field creation.
-   */
-  protected $counter;
-
-  /**
-   * Tests database interactions.
-   */
-  function testSchema() {
-    // Try creating a table.
-    $table_specification = array(
-      'description' => 'Schema table description may contain "quotes" and could be long—very long indeed.',
-      'fields' => array(
-        'id'  => array(
-          'type' => 'int',
-          'default' => NULL,
-        ),
-        'test_field'  => array(
-          'type' => 'int',
-          'not null' => TRUE,
-          'description' => 'Schema table description may contain "quotes" and could be long—very long indeed. There could be "multiple quoted regions".',
-        ),
-        'test_field_string'  => array(
-          'type' => 'varchar',
-          'length' => 20,
-          'not null' => TRUE,
-          'default' => "'\"funky default'\"",
-          'description' => 'Schema column description for string.',
-        ),
-        'test_field_string_ascii'  => array(
-          'type' => 'varchar_ascii',
-          'length' => 255,
-          'description' => 'Schema column description for ASCII string.',
-        ),
-      ),
-    );
-    db_create_table('test_table', $table_specification);
-
-    // Assert that the table exists.
-    $this->assertTrue(db_table_exists('test_table'), 'The table exists.');
-
-    // Assert that the table comment has been set.
-    $this->checkSchemaComment($table_specification['description'], 'test_table');
-
-    // Assert that the column comment has been set.
-    $this->checkSchemaComment($table_specification['fields']['test_field']['description'], 'test_table', 'test_field');
-
-    if (Database::getConnection()->databaseType() == 'mysql') {
-      // Make sure that varchar fields have the correct collation.
-      $columns = db_query('SHOW FULL COLUMNS FROM {test_table}');
-      foreach ($columns as $column) {
-        if ($column->Field == 'test_field_string') {
-          $string_check = ($column->Collation == 'utf8mb4_general_ci');
-        }
-        if ($column->Field == 'test_field_string_ascii') {
-          $string_ascii_check = ($column->Collation == 'ascii_general_ci');
-        }
-      }
-      $this->assertTrue(!empty($string_check), 'string field has the right collation.');
-      $this->assertTrue(!empty($string_ascii_check), 'ASCII string field has the right collation.');
-    }
-
-    // An insert without a value for the column 'test_table' should fail.
-    $this->assertFalse($this->tryInsert(), 'Insert without a default failed.');
-
-    // Add a default value to the column.
-    db_field_set_default('test_table', 'test_field', 0);
-    // The insert should now succeed.
-    $this->assertTrue($this->tryInsert(), 'Insert with a default succeeded.');
-
-    // Remove the default.
-    db_field_set_no_default('test_table', 'test_field');
-    // The insert should fail again.
-    $this->assertFalse($this->tryInsert(), 'Insert without a default failed.');
-
-    // Test for fake index and test for the boolean result of indexExists().
-    $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
-    $this->assertIdentical($index_exists, FALSE, 'Fake index does not exists');
-    // Add index.
-    db_add_index('test_table', 'test_field', array('test_field'), $table_specification);
-    // Test for created index and test for the boolean result of indexExists().
-    $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
-    $this->assertIdentical($index_exists, TRUE, 'Index created.');
-
-    // Rename the table.
-    db_rename_table('test_table', 'test_table2');
-
-    // Index should be renamed.
-    $index_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
-    $this->assertTrue($index_exists, 'Index was renamed.');
-
-    // We need the default so that we can insert after the rename.
-    db_field_set_default('test_table2', 'test_field', 0);
-    $this->assertFalse($this->tryInsert(), 'Insert into the old table failed.');
-    $this->assertTrue($this->tryInsert('test_table2'), 'Insert into the new table succeeded.');
-
-    // We should have successfully inserted exactly two rows.
-    $count = db_query('SELECT COUNT(*) FROM {test_table2}')->fetchField();
-    $this->assertEqual($count, 2, 'Two fields were successfully inserted.');
-
-    // Try to drop the table.
-    db_drop_table('test_table2');
-    $this->assertFalse(db_table_exists('test_table2'), 'The dropped table does not exist.');
-
-    // Recreate the table.
-    db_create_table('test_table', $table_specification);
-    db_field_set_default('test_table', 'test_field', 0);
-    db_add_field('test_table', 'test_serial', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'description' => 'Added column description.'));
-
-    // Assert that the column comment has been set.
-    $this->checkSchemaComment('Added column description.', 'test_table', 'test_serial');
-
-    // Change the new field to a serial column.
-    db_change_field('test_table', 'test_serial', 'test_serial', array('type' => 'serial', 'not null' => TRUE, 'description' => 'Changed column description.'), array('primary key' => array('test_serial')));
-
-    // Assert that the column comment has been set.
-    $this->checkSchemaComment('Changed column description.', 'test_table', 'test_serial');
-
-    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
-    $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
-    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
-    $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
-    $this->assertTrue($max2 > $max1, 'The serial is monotone.');
-
-    $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
-    $this->assertEqual($count, 2, 'There were two rows.');
-
-    // Test renaming of keys and constraints.
-    db_drop_table('test_table');
-    $table_specification = array(
-      'fields' => array(
-        'id'  => array(
-          'type' => 'serial',
-          'not null' => TRUE,
-        ),
-        'test_field'  => array(
-          'type' => 'int',
-          'default' => 0,
-        ),
-      ),
-      'primary key' => array('id'),
-      'unique keys' => array(
-        'test_field' => array('test_field'),
-      ),
-    );
-    db_create_table('test_table', $table_specification);
-
-    // Tests for indexes are Database specific.
-    $db_type = Database::getConnection()->databaseType();
-
-    // Test for existing primary and unique keys.
-    switch ($db_type) {
-      case 'pgsql':
-        $primary_key_exists = Database::getConnection()->schema()->constraintExists('test_table', '__pkey');
-        $unique_key_exists = Database::getConnection()->schema()->constraintExists('test_table', 'test_field' . '__key');
-        break;
-      case 'sqlite':
-        // SQLite does not create a standalone index for primary keys.
-        $primary_key_exists = TRUE;
-        $unique_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
-        break;
-      default:
-        $primary_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'PRIMARY');
-        $unique_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
-        break;
-    }
-    $this->assertIdentical($primary_key_exists, TRUE, 'Primary key created.');
-    $this->assertIdentical($unique_key_exists, TRUE, 'Unique key created.');
-
-    db_rename_table('test_table', 'test_table2');
-
-    // Test for renamed primary and unique keys.
-    switch ($db_type) {
-      case 'pgsql':
-        $renamed_primary_key_exists = Database::getConnection()->schema()->constraintExists('test_table2', '__pkey');
-        $renamed_unique_key_exists = Database::getConnection()->schema()->constraintExists('test_table2', 'test_field' . '__key');
-        break;
-      case 'sqlite':
-        // SQLite does not create a standalone index for primary keys.
-        $renamed_primary_key_exists = TRUE;
-        $renamed_unique_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
-        break;
-      default:
-        $renamed_primary_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'PRIMARY');
-        $renamed_unique_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
-        break;
-    }
-    $this->assertIdentical($renamed_primary_key_exists, TRUE, 'Primary key was renamed.');
-    $this->assertIdentical($renamed_unique_key_exists, TRUE, 'Unique key was renamed.');
-
-    // For PostgreSQL check in addition that sequence was renamed.
-    if ($db_type == 'pgsql') {
-      // Get information about new table.
-      $info = Database::getConnection()->schema()->queryTableInformation('test_table2');
-      $sequence_name = Database::getConnection()->schema()->prefixNonTable('test_table2', 'id', 'seq');
-      $this->assertEqual($sequence_name, current($info->sequences), 'Sequence was renamed.');
-    }
-
-    // Use database specific data type and ensure that table is created.
-    $table_specification = array(
-      'description' => 'Schema table description.',
-      'fields' => array(
-        'timestamp'  => array(
-          'mysql_type' => 'timestamp',
-          'pgsql_type' => 'timestamp',
-          'sqlite_type' => 'datetime',
-          'not null' => FALSE,
-          'default' => NULL,
-        ),
-      ),
-    );
-    try {
-      db_create_table('test_timestamp', $table_specification);
-    }
-    catch (\Exception $e) {}
-    $this->assertTrue(db_table_exists('test_timestamp'), 'Table with database specific datatype was created.');
-  }
-
-  /**
-   * Tests that indexes on string fields are limited to 191 characters on MySQL.
-   *
-   * @see \Drupal\Core\Database\Driver\mysql\Schema::getNormalizedIndexes()
-   */
-  function testIndexLength() {
-    if (Database::getConnection()->databaseType() != 'mysql') {
-      return;
-    }
-    $table_specification = array(
-      'fields' => array(
-        'id'  => array(
-          'type' => 'int',
-          'default' => NULL,
-        ),
-        'test_field_text'  => array(
-          'type' => 'text',
-          'not null' => TRUE,
-        ),
-        'test_field_string_long'  => array(
-          'type' => 'varchar',
-          'length' => 255,
-          'not null' => TRUE,
-        ),
-        'test_field_string_ascii_long'  => array(
-          'type' => 'varchar_ascii',
-          'length' => 255,
-        ),
-        'test_field_string_short'  => array(
-          'type' => 'varchar',
-          'length' => 128,
-          'not null' => TRUE,
-        ),
-      ),
-      'indexes' => array(
-        'test_regular' => array(
-          'test_field_text',
-          'test_field_string_long',
-          'test_field_string_ascii_long',
-          'test_field_string_short',
-        ),
-        'test_length' => array(
-          array('test_field_text', 128),
-          array('test_field_string_long', 128),
-          array('test_field_string_ascii_long', 128),
-          array('test_field_string_short', 128),
-        ),
-        'test_mixed' => array(
-          array('test_field_text', 200),
-          'test_field_string_long',
-          array('test_field_string_ascii_long', 200),
-          'test_field_string_short',
-        ),
-      ),
-    );
-    db_create_table('test_table_index_length', $table_specification);
-
-    $schema_object = Database::getConnection()->schema();
-
-    // Ensure expected exception thrown when adding index with missing info.
-    $expected_exception_message = "MySQL needs the 'test_field_text' field specification in order to normalize the 'test_regular' index";
-    $missing_field_spec = $table_specification;
-    unset($missing_field_spec['fields']['test_field_text']);
-    try {
-      $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $missing_field_spec);
-      $this->fail('SchemaException not thrown when adding index with missing information.');
-    }
-    catch (SchemaException $e) {
-      $this->assertEqual($expected_exception_message, $e->getMessage());
-    }
-
-    // Add a separate index.
-    $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
-    $table_specification_with_new_index = $table_specification;
-    $table_specification_with_new_index['indexes']['test_separate'] = [['test_field_text', 200]];
-
-    // Ensure that the exceptions of addIndex are thrown as expected.
-
-    try {
-      $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
-      $this->fail('\Drupal\Core\Database\SchemaObjectExistsException exception missed.');
-    }
-    catch (SchemaObjectExistsException $e) {
-      $this->pass('\Drupal\Core\Database\SchemaObjectExistsException thrown when index already exists.');
-    }
-
-    try {
-      $schema_object->addIndex('test_table_non_existing', 'test_separate', [['test_field_text', 200]], $table_specification);
-      $this->fail('\Drupal\Core\Database\SchemaObjectDoesNotExistException exception missed.');
-    }
-    catch (SchemaObjectDoesNotExistException $e) {
-      $this->pass('\Drupal\Core\Database\SchemaObjectDoesNotExistException thrown when index already exists.');
-    }
-
-    // Get index information.
-    $results = db_query('SHOW INDEX FROM {test_table_index_length}');
-    $expected_lengths = array(
-      'test_regular' => array(
-        'test_field_text' => 191,
-        'test_field_string_long' => 191,
-        'test_field_string_ascii_long' => NULL,
-        'test_field_string_short' => NULL,
-      ),
-      'test_length' => array(
-        'test_field_text' => 128,
-        'test_field_string_long' => 128,
-        'test_field_string_ascii_long' => 128,
-        'test_field_string_short' => NULL,
-      ),
-      'test_mixed' => array(
-        'test_field_text' => 191,
-        'test_field_string_long' => 191,
-        'test_field_string_ascii_long' => 200,
-        'test_field_string_short' => NULL,
-      ),
-      'test_separate' => array(
-        'test_field_text' => 191,
-      ),
-    );
-
-    // Count the number of columns defined in the indexes.
-    $column_count = 0;
-    foreach ($table_specification_with_new_index['indexes'] as $index) {
-      foreach ($index as $field) {
-        $column_count++;
-      }
-    }
-    $test_count = 0;
-    foreach ($results as $result) {
-      $this->assertEqual($result->Sub_part, $expected_lengths[$result->Key_name][$result->Column_name], 'Index length matches expected value.');
-      $test_count++;
-    }
-    $this->assertEqual($test_count, $column_count, 'Number of tests matches expected value.');
-  }
-
-  /**
-   * Tests inserting data into an existing table.
-   *
-   * @param $table
-   *   The database table to insert data into.
-   *
-   * @return
-   *   TRUE if the insert succeeded, FALSE otherwise.
-   */
-  function tryInsert($table = 'test_table') {
-    try {
-      db_insert($table)
-        ->fields(array('id' => mt_rand(10, 20)))
-        ->execute();
-      return TRUE;
-    }
-    catch (\Exception $e) {
-      return FALSE;
-    }
-  }
-
-  /**
-   * Checks that a table or column comment matches a given description.
-   *
-   * @param $description
-   *   The asserted description.
-   * @param $table
-   *   The table to test.
-   * @param $column
-   *   Optional column to test.
-   */
-  function checkSchemaComment($description, $table, $column = NULL) {
-    if (method_exists(Database::getConnection()->schema(), 'getComment')) {
-      $comment = Database::getConnection()->schema()->getComment($table, $column);
-      // The schema comment truncation for mysql is different.
-      if (Database::getConnection()->databaseType() == 'mysql') {
-        $max_length = $column ? 255 : 60;
-        $description = Unicode::truncate($description, $max_length, TRUE, TRUE);
-      }
-      $this->assertEqual($comment, $description, 'The comment matches the schema description.');
-    }
-  }
-
-  /**
-   * Tests creating unsigned columns and data integrity thereof.
-   */
-  function testUnsignedColumns() {
-    // First create the table with just a serial column.
-    $table_name = 'unsigned_table';
-    $table_spec = array(
-      'fields' => array('serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE)),
-      'primary key' => array('serial_column'),
-    );
-    db_create_table($table_name, $table_spec);
-
-    // Now set up columns for the other types.
-    $types = array('int', 'float', 'numeric');
-    foreach ($types as $type) {
-      $column_spec = array('type' => $type, 'unsigned'=> TRUE);
-      if ($type == 'numeric') {
-        $column_spec += array('precision' => 10, 'scale' => 0);
-      }
-      $column_name = $type . '_column';
-      $table_spec['fields'][$column_name] = $column_spec;
-      db_add_field($table_name, $column_name, $column_spec);
-    }
-
-    // Finally, check each column and try to insert invalid values into them.
-    foreach ($table_spec['fields'] as $column_name => $column_spec) {
-      $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
-      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
-    }
-  }
-
-  /**
-   * Tries to insert a negative value into columns defined as unsigned.
-   *
-   * @param $table_name
-   *   The table to insert.
-   * @param $column_name
-   *   The column to insert.
-   *
-   * @return
-   *   TRUE if the insert succeeded, FALSE otherwise.
-   */
-  function tryUnsignedInsert($table_name, $column_name) {
-    try {
-      db_insert($table_name)
-        ->fields(array($column_name => -1))
-        ->execute();
-      return TRUE;
-    }
-    catch (\Exception $e) {
-      return FALSE;
-    }
-  }
-
-  /**
-   * Tests adding columns to an existing table.
-   */
-  function testSchemaAddField() {
-    // Test varchar types.
-    foreach (array(1, 32, 128, 256, 512) as $length) {
-      $base_field_spec = array(
-        'type' => 'varchar',
-        'length' => $length,
-      );
-      $variations = array(
-        array('not null' => FALSE),
-        array('not null' => FALSE, 'default' => '7'),
-        array('not null' => FALSE, 'default' => substr('"thing"', 0, $length)),
-        array('not null' => FALSE, 'default' => substr("\"'hing", 0, $length)),
-        array('not null' => TRUE, 'initial' => 'd'),
-        array('not null' => FALSE, 'default' => NULL),
-        array('not null' => TRUE, 'initial' => 'd', 'default' => '7'),
-      );
-
-      foreach ($variations as $variation) {
-        $field_spec = $variation + $base_field_spec;
-        $this->assertFieldAdditionRemoval($field_spec);
-      }
-    }
-
-    // Test int and float types.
-    foreach (array('int', 'float') as $type) {
-      foreach (array('tiny', 'small', 'medium', 'normal', 'big') as $size) {
-        $base_field_spec = array(
-          'type' => $type,
-          'size' => $size,
-        );
-        $variations = array(
-          array('not null' => FALSE),
-          array('not null' => FALSE, 'default' => 7),
-          array('not null' => TRUE, 'initial' => 1),
-          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
-        );
-
-        foreach ($variations as $variation) {
-          $field_spec = $variation + $base_field_spec;
-          $this->assertFieldAdditionRemoval($field_spec);
-        }
-      }
-    }
-
-    // Test numeric types.
-    foreach (array(1, 5, 10, 40, 65) as $precision) {
-      foreach (array(0, 2, 10, 30) as $scale) {
-        // Skip combinations where precision is smaller than scale.
-        if ($precision <= $scale) {
-          continue;
-        }
-
-        $base_field_spec = array(
-          'type' => 'numeric',
-          'scale' => $scale,
-          'precision' => $precision,
-        );
-        $variations = array(
-          array('not null' => FALSE),
-          array('not null' => FALSE, 'default' => 7),
-          array('not null' => TRUE, 'initial' => 1),
-          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
-        );
-
-        foreach ($variations as $variation) {
-          $field_spec = $variation + $base_field_spec;
-          $this->assertFieldAdditionRemoval($field_spec);
-        }
-      }
-    }
-  }
-
-  /**
-   * Asserts that a given field can be added and removed from a table.
-   *
-   * The addition test covers both defining a field of a given specification
-   * when initially creating at table and extending an existing table.
-   *
-   * @param $field_spec
-   *   The schema specification of the field.
-   */
-  protected function assertFieldAdditionRemoval($field_spec) {
-    // Try creating the field on a new table.
-    $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-        'test_field' => $field_spec,
-      ),
-      'primary key' => array('serial_column'),
-    );
-    db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
-
-    // Check the characteristics of the field.
-    $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
-
-    // Clean-up.
-    db_drop_table($table_name);
-
-    // Try adding a field to an existing table.
-    $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-      ),
-      'primary key' => array('serial_column'),
-    );
-    db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
-
-    // Insert some rows to the table to test the handling of initial values.
-    for ($i = 0; $i < 3; $i++) {
-      db_insert($table_name)
-        ->useDefaults(array('serial_column'))
-        ->execute();
-    }
-
-    db_add_field($table_name, 'test_field', $field_spec);
-    $this->pass(format_string('Column %column created.', array('%column' => 'test_field')));
-
-    // Check the characteristics of the field.
-    $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
-
-    // Clean-up.
-    db_drop_field($table_name, 'test_field');
-
-    // Add back the field and then try to delete a field which is also a primary
-    // key.
-    db_add_field($table_name, 'test_field', $field_spec);
-    db_drop_field($table_name, 'serial_column');
-    db_drop_table($table_name);
-  }
-
-  /**
-   * Asserts that a newly added field has the correct characteristics.
-   */
-  protected function assertFieldCharacteristics($table_name, $field_name, $field_spec) {
-    // Check that the initial value has been registered.
-    if (isset($field_spec['initial'])) {
-      // There should be no row with a value different then $field_spec['initial'].
-      $count = db_select($table_name)
-        ->fields($table_name, array('serial_column'))
-        ->condition($field_name, $field_spec['initial'], '<>')
-        ->countQuery()
-        ->execute()
-        ->fetchField();
-      $this->assertEqual($count, 0, 'Initial values filled out.');
-    }
-
-    // Check that the default value has been registered.
-    if (isset($field_spec['default'])) {
-      // Try inserting a row, and check the resulting value of the new column.
-      $id = db_insert($table_name)
-        ->useDefaults(array('serial_column'))
-        ->execute();
-      $field_value = db_select($table_name)
-        ->fields($table_name, array($field_name))
-        ->condition('serial_column', $id)
-        ->execute()
-        ->fetchField();
-      $this->assertEqual($field_value, $field_spec['default'], 'Default value registered.');
-    }
-  }
-
-  /**
-   * Tests changing columns between types.
-   */
-  function testSchemaChangeField() {
-    $field_specs = array(
-      array('type' => 'int', 'size' => 'normal', 'not null' => FALSE),
-      array('type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 17),
-      array('type' => 'float', 'size' => 'normal', 'not null' => FALSE),
-      array('type' => 'float', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 7.3),
-      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => FALSE),
-      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => TRUE, 'initial' => 1, 'default' => 7),
-    );
-
-    foreach ($field_specs as $i => $old_spec) {
-      foreach ($field_specs as $j => $new_spec) {
-        if ($i === $j) {
-          // Do not change a field into itself.
-          continue;
-        }
-        $this->assertFieldChange($old_spec, $new_spec);
-      }
-    }
-
-    $field_specs = array(
-      array('type' => 'varchar_ascii', 'length' => '255'),
-      array('type' => 'varchar', 'length' => '255'),
-      array('type' => 'text'),
-      array('type' => 'blob', 'size' => 'big'),
-    );
-
-    foreach ($field_specs as $i => $old_spec) {
-      foreach ($field_specs as $j => $new_spec) {
-        if ($i === $j) {
-          // Do not change a field into itself.
-          continue;
-        }
-        // Note if the serialized data contained an object this would fail on
-        // Postgres.
-        // @see https://www.drupal.org/node/1031122
-        $this->assertFieldChange($old_spec, $new_spec, serialize(['string' => "This \n has \\\\ some backslash \"*string action.\\n"]));
-      }
-    }
-
-  }
-
-  /**
-   * Asserts that a field can be changed from one spec to another.
-   *
-   * @param $old_spec
-   *   The beginning field specification.
-   * @param $new_spec
-   *   The ending field specification.
-   */
-  protected function assertFieldChange($old_spec, $new_spec, $test_data = NULL) {
-    $table_name = 'test_table_' . ($this->counter++);
-    $table_spec = array(
-      'fields' => array(
-        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
-        'test_field' => $old_spec,
-      ),
-      'primary key' => array('serial_column'),
-    );
-    db_create_table($table_name, $table_spec);
-    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
-
-    // Check the characteristics of the field.
-    $this->assertFieldCharacteristics($table_name, 'test_field', $old_spec);
-
-    // Remove inserted rows.
-    db_truncate($table_name)->execute();
-
-    if ($test_data) {
-      $id = db_insert($table_name)
-        ->fields(['test_field'], [$test_data])
-        ->execute();
-    }
-
-    // Change the field.
-    db_change_field($table_name, 'test_field', 'test_field', $new_spec);
-
-    if ($test_data) {
-      $field_value = db_select($table_name)
-        ->fields($table_name, ['test_field'])
-        ->condition('serial_column', $id)
-        ->execute()
-        ->fetchField();
-      $this->assertIdentical($field_value, $test_data);
-    }
-
-    // Check the field was changed.
-    $this->assertFieldCharacteristics($table_name, 'test_field', $new_spec);
-
-    // Clean-up.
-    db_drop_table($table_name);
-  }
-
-  /**
-   * Tests the findTables() method.
-   */
-  public function testFindTables() {
-    // We will be testing with three tables, two of them using the default
-    // prefix and the third one with an individually specified prefix.
-
-    // Set up a new connection with different connection info.
-    $connection_info = Database::getConnectionInfo();
-
-    // Add per-table prefix to the second table.
-    $new_connection_info = $connection_info['default'];
-    $new_connection_info['prefix']['test_2_table'] = $new_connection_info['prefix']['default'] . '_shared_';
-    Database::addConnectionInfo('test', 'default', $new_connection_info);
-
-    Database::setActiveConnection('test');
-
-    // Create the tables.
-    $table_specification = [
-      'description' => 'Test table.',
-      'fields' => [
-        'id'  => [
-          'type' => 'int',
-          'default' => NULL,
-        ],
-      ],
-    ];
-    Database::getConnection()->schema()->createTable('test_1_table', $table_specification);
-    Database::getConnection()->schema()->createTable('test_2_table', $table_specification);
-    Database::getConnection()->schema()->createTable('the_third_table', $table_specification);
-
-    // Check the "all tables" syntax.
-    $tables = Database::getConnection()->schema()->findTables('%');
-    sort($tables);
-    $expected = [
-      // The 'config' table is added by
-      // \Drupal\simpletest\KernelTestBase::containerBuild().
-      'config',
-      'test_1_table',
-      // This table uses a per-table prefix, yet it is returned as un-prefixed.
-      'test_2_table',
-      'the_third_table',
-    ];
-    $this->assertEqual($tables, $expected, 'All tables were found.');
-
-    // Check the restrictive syntax.
-    $tables = Database::getConnection()->schema()->findTables('test_%');
-    sort($tables);
-    $expected = [
-      'test_1_table',
-      'test_2_table',
-    ];
-    $this->assertEqual($tables, $expected, 'Two tables were found.');
-
-    // Go back to the initial connection.
-    Database::setActiveConnection('default');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/SelectCloneTest.php b/core/modules/system/src/Tests/Database/SelectCloneTest.php
deleted file mode 100644
index ad13685..0000000
--- a/core/modules/system/src/Tests/Database/SelectCloneTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SelectCloneTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests cloning Select queries.
- *
- * @group Database
- */
-class SelectCloneTest extends DatabaseTestBase {
-
-  /**
-   * Test that subqueries as value within conditions are cloned properly.
-   */
-  function testSelectConditionSubQueryCloning() {
-    $subquery = db_select('test', 't');
-    $subquery->addField('t', 'id', 'id');
-    $subquery->condition('age', 28, '<');
-
-    $query = db_select('test', 't');
-    $query->addField('t', 'name', 'name');
-    $query->condition('id', $subquery, 'IN');
-
-    $clone = clone $query;
-    // Cloned query should not be altered by the following modification
-    // happening on original query.
-    $subquery->condition('age', 25, '>');
-
-    $clone_result = $clone->countQuery()->execute()->fetchField();
-    $query_result = $query->countQuery()->execute()->fetchField();
-
-    // Make sure the cloned query has not been modified
-    $this->assertEqual(3, $clone_result, 'The cloned query returns the expected number of rows');
-    $this->assertEqual(2, $query_result, 'The query returns the expected number of rows');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/SelectComplexTest.php b/core/modules/system/src/Tests/Database/SelectComplexTest.php
deleted file mode 100644
index 880c6eb..0000000
--- a/core/modules/system/src/Tests/Database/SelectComplexTest.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SelectComplexTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\RowCountException;
-
-/**
- * Tests the Select query builder with more complex queries.
- *
- * @group Database
- */
-class SelectComplexTest extends DatabaseTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'node_access_test', 'field');
-
-  /**
-   * Tests simple JOIN statements.
-   */
-  function testDefaultJoin() {
-    $query = db_select('test_task', 't');
-    $people_alias = $query->join('test', 'p', 't.pid = p.id');
-    $name_field = $query->addField($people_alias, 'name', 'name');
-    $query->addField('t', 'task', 'task');
-    $priority_field = $query->addField('t', 'priority', 'priority');
-
-    $query->orderBy($priority_field);
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_priority = 0;
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue($record->$priority_field >= $last_priority, 'Results returned in correct order.');
-      $this->assertNotEqual($record->$name_field, 'Ringo', 'Taskless person not selected.');
-      $last_priority = $record->$priority_field;
-    }
-
-    $this->assertEqual($num_records, 7, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests LEFT OUTER joins.
-   */
-  function testLeftOuterJoin() {
-    $query = db_select('test', 'p');
-    $people_alias = $query->leftJoin('test_task', 't', 't.pid = p.id');
-    $name_field = $query->addField('p', 'name', 'name');
-    $query->addField($people_alias, 'task', 'task');
-    $query->addField($people_alias, 'priority', 'priority');
-
-    $query->orderBy($name_field);
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_name = 0;
-
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, 'Results returned in correct order.');
-    }
-
-    $this->assertEqual($num_records, 8, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests GROUP BY clauses.
-   */
-  function testGroupBy() {
-    $query = db_select('test_task', 't');
-    $count_field = $query->addExpression('COUNT(task)', 'num');
-    $task_field = $query->addField('t', 'task');
-    $query->orderBy($count_field);
-    $query->groupBy($task_field);
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_count = 0;
-    $records = array();
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
-      $last_count = $record->$count_field;
-      $records[$record->$task_field] = $record->$count_field;
-    }
-
-    $correct_results = array(
-      'eat' => 1,
-      'sleep' => 2,
-      'code' => 1,
-      'found new band' => 1,
-      'perform at superbowl' => 1,
-    );
-
-    foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
-    }
-
-    $this->assertEqual($num_records, 6, 'Returned the correct number of total rows.');
-  }
-
-  /**
-   * Tests GROUP BY and HAVING clauses together.
-   */
-  function testGroupByAndHaving() {
-    $query = db_select('test_task', 't');
-    $count_field = $query->addExpression('COUNT(task)', 'num');
-    $task_field = $query->addField('t', 'task');
-    $query->orderBy($count_field);
-    $query->groupBy($task_field);
-    $query->having('COUNT(task) >= 2');
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_count = 0;
-    $records = array();
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue($record->$count_field >= 2, 'Record has the minimum count.');
-      $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
-      $last_count = $record->$count_field;
-      $records[$record->$task_field] = $record->$count_field;
-    }
-
-    $correct_results = array(
-      'sleep' => 2,
-    );
-
-    foreach ($correct_results as $task => $count) {
-      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
-    }
-
-    $this->assertEqual($num_records, 1, 'Returned the correct number of total rows.');
-  }
-
-  /**
-   * Tests range queries.
-   *
-   * The SQL clause varies with the database.
-   */
-  function testRange() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $query->range(0, 2);
-    $query_result = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($query_result, 2, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests distinct queries.
-   */
-  function testDistinct() {
-    $query = db_select('test_task');
-    $query->addField('test_task', 'task');
-    $query->distinct();
-    $query_result = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($query_result, 6, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests that we can generate a count query from a built query.
-   */
-  function testCountQuery() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $query->orderBy('name');
-
-    $count = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($count, 4, 'Counted the correct number of records.');
-
-    // Now make sure we didn't break the original query!  We should still have
-    // all of the fields we asked for.
-    $record = $query->execute()->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
-    $this->assertEqual($record->$age_field, 27, 'Correct data retrieved.');
-  }
-
-  /**
-   * Tests having queries.
-   */
-  function testHavingCountQuery() {
-    $query = db_select('test')
-      ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
-      ->groupBy('age')
-      ->having('age + 1 > 0');
-    $query->addField('test', 'age');
-    $query->addExpression('age + 1');
-    $count = count($query->execute()->fetchCol());
-    $this->assertEqual($count, 4, 'Counted the correct number of records.');
-  }
-
-  /**
-   * Tests that countQuery removes 'all_fields' statements and ordering clauses.
-   */
-  function testCountQueryRemovals() {
-    $query = db_select('test');
-    $query->fields('test');
-    $query->orderBy('name');
-    $count = $query->countQuery();
-
-    // Check that the 'all_fields' statement is handled properly.
-    $tables = $query->getTables();
-    $this->assertEqual($tables['test']['all_fields'], 1, 'Query correctly sets \'all_fields\' statement.');
-    $tables = $count->getTables();
-    $this->assertFalse(isset($tables['test']['all_fields']), 'Count query correctly unsets \'all_fields\' statement.');
-
-    // Check that the ordering clause is handled properly.
-    $orderby = $query->getOrderBy();
-    // The orderby string is different for PostgreSQL.
-    // @see Drupal\Core\Database\Driver\pgsql\Select::orderBy()
-    $db_type = Database::getConnection()->databaseType();
-    $this->assertEqual($orderby['name'], ($db_type == 'pgsql' ? 'ASC NULLS FIRST' : 'ASC'), 'Query correctly sets ordering clause.');
-    $orderby = $count->getOrderBy();
-    $this->assertFalse(isset($orderby['name']), 'Count query correctly unsets ordering clause.');
-
-    // Make sure that the count query works.
-    $count = $count->execute()->fetchField();
-
-    $this->assertEqual($count, 4, 'Counted the correct number of records.');
-  }
-
-
-  /**
-   * Tests that countQuery properly removes fields and expressions.
-   */
-  function testCountQueryFieldRemovals() {
-    // countQuery should remove all fields and expressions, so this can be
-    // tested by adding a non-existent field and expression: if it ends
-    // up in the query, an error will be thrown. If not, it will return the
-    // number of records, which in this case happens to be 4 (there are four
-    // records in the {test} table).
-    $query = db_select('test');
-    $query->fields('test', array('fail'));
-    $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed fields');
-
-    $query = db_select('test');
-    $query->addExpression('fail');
-    $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed expressions');
-  }
-
-  /**
-   * Tests that we can generate a count query from a query with distinct.
-   */
-  function testCountQueryDistinct() {
-    $query = db_select('test_task');
-    $query->addField('test_task', 'task');
-    $query->distinct();
-
-    $count = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($count, 6, 'Counted the correct number of records.');
-  }
-
-  /**
-   * Tests that we can generate a count query from a query with GROUP BY.
-   */
-  function testCountQueryGroupBy() {
-    $query = db_select('test_task');
-    $query->addField('test_task', 'pid');
-    $query->groupBy('pid');
-
-    $count = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($count, 3, 'Counted the correct number of records.');
-
-    // Use a column alias as, without one, the query can succeed for the wrong
-    // reason.
-    $query = db_select('test_task');
-    $query->addField('test_task', 'pid', 'pid_alias');
-    $query->addExpression('COUNT(test_task.task)', 'count');
-    $query->groupBy('pid_alias');
-    $query->orderBy('pid_alias', 'asc');
-
-    $count = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($count, 3, 'Counted the correct number of records.');
-  }
-
-  /**
-   * Confirms that we can properly nest conditional clauses.
-   */
-  function testNestedConditions() {
-    // This query should translate to:
-    // "SELECT job FROM {test} WHERE name = 'Paul' AND (age = 26 OR age = 27)"
-    // That should find only one record. Yes it's a non-optimal way of writing
-    // that query but that's not the point!
-    $query = db_select('test');
-    $query->addField('test', 'job');
-    $query->condition('name', 'Paul');
-    $query->condition(db_or()->condition('age', 26)->condition('age', 27));
-
-    $job = $query->execute()->fetchField();
-    $this->assertEqual($job, 'Songwriter', 'Correct data retrieved.');
-  }
-
-  /**
-   * Confirms we can join on a single table twice with a dynamic alias.
-   */
-  function testJoinTwice() {
-    $query = db_select('test')->fields('test');
-    $alias = $query->join('test', 'test', 'test.job = %alias.job');
-    $query->addField($alias, 'name', 'othername');
-    $query->addField($alias, 'job', 'otherjob');
-    $query->where("$alias.name <> test.name");
-    $crowded_job = $query->execute()->fetch();
-    $this->assertEqual($crowded_job->job, $crowded_job->otherjob, 'Correctly joined same table twice.');
-    $this->assertNotEqual($crowded_job->name, $crowded_job->othername, 'Correctly joined same table twice.');
-  }
-
-  /**
-   * Tests that we can join on a query.
-   */
-  function testJoinSubquery() {
-    $this->installSchema('system', 'sequences');
-
-    $account = entity_create('user', array(
-      'name' => $this->randomMachineName(),
-      'mail' => $this->randomMachineName() . '@example.com',
-    ));
-
-    $query = db_select('test_task', 'tt', array('target' => 'replica'));
-    $query->addExpression('tt.pid + 1', 'abc');
-    $query->condition('priority', 1, '>');
-    $query->condition('priority', 100, '<');
-
-    $subquery = db_select('test', 'tp');
-    $subquery->join('test_one_blob', 'tpb', 'tp.id = tpb.id');
-    $subquery->join('node', 'n', 'tp.id = n.nid');
-    $subquery->addTag('node_access');
-    $subquery->addMetaData('account', $account);
-    $subquery->addField('tp', 'id');
-    $subquery->condition('age', 5, '>');
-    $subquery->condition('age', 500, '<');
-
-    $query->leftJoin($subquery, 'sq', 'tt.pid = sq.id');
-    $query->join('test_one_blob', 'tb3', 'tt.pid = tb3.id');
-
-    // Construct the query string.
-    // This is the same sequence that SelectQuery::execute() goes through.
-    $query->preExecute();
-    $query->getArguments();
-    $str = (string) $query;
-
-    // Verify that the string only has one copy of condition placeholder 0.
-    $pos = strpos($str, 'db_condition_placeholder_0', 0);
-    $pos2 = strpos($str, 'db_condition_placeholder_0', $pos + 1);
-    $this->assertFalse($pos2, 'Condition placeholder is not repeated.');
-  }
-
-  /**
-   * Tests that rowCount() throws exception on SELECT query.
-   */
-  function testSelectWithRowCount() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $result = $query->execute();
-    try {
-      $result->rowCount();
-      $exception = FALSE;
-    }
-    catch (RowCountException $e) {
-      $exception = TRUE;
-    }
-    $this->assertTrue($exception, 'Exception was thrown');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/SelectOrderedTest.php b/core/modules/system/src/Tests/Database/SelectOrderedTest.php
deleted file mode 100644
index 7b63bb7..0000000
--- a/core/modules/system/src/Tests/Database/SelectOrderedTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SelectOrderedTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Select query builder.
- *
- * @group Database
- */
-class SelectOrderedTest extends DatabaseTestBase {
-
-  /**
-   * Tests basic ORDER BY.
-   */
-  function testSimpleSelectOrdered() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $query->orderBy($age_field);
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_age = 0;
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue($record->age >= $last_age, 'Results returned in correct order.');
-      $last_age = $record->age;
-    }
-
-    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests multiple ORDER BY.
-   */
-  function testSimpleSelectMultiOrdered() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $job_field = $query->addField('test', 'job');
-    $query->orderBy($job_field);
-    $query->orderBy($age_field);
-    $result = $query->execute();
-
-    $num_records = 0;
-    $expected = array(
-      array('Ringo', 28, 'Drummer'),
-      array('John', 25, 'Singer'),
-      array('George', 27, 'Singer'),
-      array('Paul', 26, 'Songwriter'),
-    );
-    $results = $result->fetchAll(\PDO::FETCH_NUM);
-    foreach ($expected as $k => $record) {
-      $num_records++;
-      foreach ($record as $kk => $col) {
-        if ($expected[$k][$kk] != $results[$k][$kk]) {
-          $this->assertTrue(FALSE, 'Results returned in correct order.');
-        }
-      }
-    }
-    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests ORDER BY descending.
-   */
-  function testSimpleSelectOrderedDesc() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $query->orderBy($age_field, 'DESC');
-    $result = $query->execute();
-
-    $num_records = 0;
-    $last_age = 100000000;
-    foreach ($result as $record) {
-      $num_records++;
-      $this->assertTrue($record->age <= $last_age, 'Results returned in correct order.');
-      $last_age = $record->age;
-    }
-
-    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/SelectSubqueryTest.php b/core/modules/system/src/Tests/Database/SelectSubqueryTest.php
deleted file mode 100644
index 9eb3048..0000000
--- a/core/modules/system/src/Tests/Database/SelectSubqueryTest.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SelectSubqueryTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Select query builder.
- *
- * @group Database
- */
-class SelectSubqueryTest extends DatabaseTestBase {
-
-  /**
-   * Tests that we can use a subquery in a FROM clause.
-   */
-  function testFromSubquerySelect() {
-    // Create a subquery, which is just a normal query object.
-    $subquery = db_select('test_task', 'tt');
-    $subquery->addField('tt', 'pid', 'pid');
-    $subquery->addField('tt', 'task', 'task');
-    $subquery->condition('priority', 1);
-
-    for ($i = 0; $i < 2; $i++) {
-      // Create another query that joins against the virtual table resulting
-      // from the subquery.
-      $select = db_select($subquery, 'tt2');
-      $select->join('test', 't', 't.id=tt2.pid');
-      $select->addField('t', 'name');
-      if ($i) {
-        // Use a different number of conditions here to confuse the subquery
-        // placeholder counter, testing https://www.drupal.org/node/1112854.
-        $select->condition('name', 'John');
-      }
-      $select->condition('task', 'code');
-
-      // The resulting query should be equivalent to:
-      // SELECT t.name
-      // FROM (SELECT tt.pid AS pid, tt.task AS task FROM test_task tt WHERE priority=1) tt
-      //   INNER JOIN test t ON t.id=tt.pid
-      // WHERE tt.task = 'code'
-      $people = $select->execute()->fetchCol();
-
-      $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
-    }
-  }
-
-  /**
-   * Tests that we can use a subquery in a FROM clause with a LIMIT.
-   */
-  function testFromSubquerySelectWithLimit() {
-    // Create a subquery, which is just a normal query object.
-    $subquery = db_select('test_task', 'tt');
-    $subquery->addField('tt', 'pid', 'pid');
-    $subquery->addField('tt', 'task', 'task');
-    $subquery->orderBy('priority', 'DESC');
-    $subquery->range(0, 1);
-
-    // Create another query that joins against the virtual table resulting
-    // from the subquery.
-    $select = db_select($subquery, 'tt2');
-    $select->join('test', 't', 't.id=tt2.pid');
-    $select->addField('t', 'name');
-
-    // The resulting query should be equivalent to:
-    // SELECT t.name
-    // FROM (SELECT tt.pid AS pid, tt.task AS task FROM test_task tt ORDER BY priority DESC LIMIT 1 OFFSET 0) tt
-    //   INNER JOIN test t ON t.id=tt.pid
-    $people = $select->execute()->fetchCol();
-
-    $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests that we can use a subquery in a WHERE clause.
-   */
-  function testConditionSubquerySelect() {
-    // Create a subquery, which is just a normal query object.
-    $subquery = db_select('test_task', 'tt');
-    $subquery->addField('tt', 'pid', 'pid');
-    $subquery->condition('tt.priority', 1);
-
-    // Create another query that joins against the virtual table resulting
-    // from the subquery.
-    $select = db_select('test_task', 'tt2');
-    $select->addField('tt2', 'task');
-    $select->condition('tt2.pid', $subquery, 'IN');
-
-    // The resulting query should be equivalent to:
-    // SELECT tt2.name
-    // FROM test tt2
-    // WHERE tt2.pid IN (SELECT tt.pid AS pid FROM test_task tt WHERE tt.priority=1)
-    $people = $select->execute()->fetchCol();
-    $this->assertEqual(count($people), 5, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests that we can use a subquery in a JOIN clause.
-   */
-  function testJoinSubquerySelect() {
-    // Create a subquery, which is just a normal query object.
-    $subquery = db_select('test_task', 'tt');
-    $subquery->addField('tt', 'pid', 'pid');
-    $subquery->condition('priority', 1);
-
-    // Create another query that joins against the virtual table resulting
-    // from the subquery.
-    $select = db_select('test', 't');
-    $select->join($subquery, 'tt', 't.id=tt.pid');
-    $select->addField('t', 'name');
-
-    // The resulting query should be equivalent to:
-    // SELECT t.name
-    // FROM test t
-    //   INNER JOIN (SELECT tt.pid AS pid FROM test_task tt WHERE priority=1) tt ON t.id=tt.pid
-    $people = $select->execute()->fetchCol();
-
-    $this->assertEqual(count($people), 2, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests EXISTS subquery conditionals on SELECT statements.
-   *
-   * We essentially select all rows from the {test} table that have matching
-   * rows in the {test_people} table based on the shared name column.
-   */
-  function testExistsSubquerySelect() {
-    // Put George into {test_people}.
-    db_insert('test_people')
-      ->fields(array(
-        'name' => 'George',
-        'age' => 27,
-        'job' => 'Singer',
-      ))
-      ->execute();
-    // Base query to {test}.
-    $query = db_select('test', 't')
-      ->fields('t', array('name'));
-    // Subquery to {test_people}.
-    $subquery = db_select('test_people', 'tp')
-      ->fields('tp', array('name'))
-      ->where('tp.name = t.name');
-    $query->exists($subquery);
-    $result = $query->execute();
-
-    // Ensure that we got the right record.
-    $record = $result->fetch();
-    $this->assertEqual($record->name, 'George', 'Fetched name is correct using EXISTS query.');
-  }
-
-  /**
-   * Tests NOT EXISTS subquery conditionals on SELECT statements.
-   *
-   * We essentially select all rows from the {test} table that don't have
-   * matching rows in the {test_people} table based on the shared name column.
-   */
-  function testNotExistsSubquerySelect() {
-    // Put George into {test_people}.
-    db_insert('test_people')
-      ->fields(array(
-        'name' => 'George',
-        'age' => 27,
-        'job' => 'Singer',
-      ))
-      ->execute();
-
-    // Base query to {test}.
-    $query = db_select('test', 't')
-      ->fields('t', array('name'));
-    // Subquery to {test_people}.
-    $subquery = db_select('test_people', 'tp')
-      ->fields('tp', array('name'))
-      ->where('tp.name = t.name');
-    $query->notExists($subquery);
-
-    // Ensure that we got the right number of records.
-    $people = $query->execute()->fetchCol();
-    $this->assertEqual(count($people), 3, 'NOT EXISTS query returned the correct results.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/SelectTest.php b/core/modules/system/src/Tests/Database/SelectTest.php
deleted file mode 100644
index 32f743a..0000000
--- a/core/modules/system/src/Tests/Database/SelectTest.php
+++ /dev/null
@@ -1,535 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SelectTest.
- */
-
-namespace Drupal\system\Tests\Database;
-use Drupal\Core\Database\InvalidQueryException;
-use Drupal\Core\Database\Database;
-
-/**
- * Tests the Select query builder.
- *
- * @group Database
- */
-class SelectTest extends DatabaseTestBase {
-
-  /**
-   * Tests rudimentary SELECT statements.
-   */
-  function testSimpleSelect() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $num_records = $query->countQuery()->execute()->fetchField();
-
-    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
-  }
-
-  /**
-   * Tests rudimentary SELECT statement with a COMMENT.
-   */
-  function testSimpleComment() {
-    $query = db_select('test')->comment('Testing query comments');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $result = $query->execute();
-
-    $records = $result->fetchAll();
-
-    $query = (string) $query;
-    $expected = "/* Testing query comments */";
-
-    $this->assertEqual(count($records), 4, 'Returned the correct number of rows.');
-    $this->assertNotIdentical(FALSE, strpos($query, $expected), 'The flattened query contains the comment string.');
-  }
-
-  /**
-   * Tests query COMMENT system against vulnerabilities.
-   */
-  function testVulnerableComment() {
-    $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-    $result = $query->execute();
-
-    $records = $result->fetchAll();
-
-    $query = (string) $query;
-    $expected = "/* Testing query comments  * / SELECT nid FROM {node}. -- */ SELECT test.name AS name, test.age AS age\nFROM \n{test} test";
-
-    $this->assertEqual(count($records), 4, 'Returned the correct number of rows.');
-    $this->assertNotIdentical(FALSE, strpos($query, $expected), 'The flattened query contains the sanitised comment string.');
-
-    $connection = Database::getConnection();
-    foreach ($this->makeCommentsProvider() as $test_set) {
-      list($expected, $comments) = $test_set;
-      $this->assertEqual($expected, $connection->makeComment($comments));
-    }
-  }
-
-  /**
-   * Provides expected and input values for testVulnerableComment().
-   */
-  function makeCommentsProvider() {
-    return [
-      [
-        '/*  */ ',
-        [''],
-      ],
-      // Try and close the comment early.
-      [
-        '/* Exploit  * / DROP TABLE node. -- */ ',
-        ['Exploit */ DROP TABLE node; --'],
-      ],
-      // Variations on comment closing.
-      [
-        '/* Exploit  * / * / DROP TABLE node. -- */ ',
-        ['Exploit */*/ DROP TABLE node; --'],
-      ],
-      [
-        '/* Exploit  *  * // DROP TABLE node. -- */ ',
-        ['Exploit **// DROP TABLE node; --'],
-      ],
-      // Try closing the comment in the second string which is appended.
-      [
-        '/* Exploit  * / DROP TABLE node. --. Another try  * / DROP TABLE node. -- */ ',
-        ['Exploit */ DROP TABLE node; --', 'Another try */ DROP TABLE node; --'],
-      ],
-    ];
-  }
-
-  /**
-   * Tests basic conditionals on SELECT statements.
-   */
-  function testSimpleSelectConditional() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_field = $query->addField('test', 'age', 'age');
-    $query->condition('age', 27);
-    $result = $query->execute();
-
-    // Check that the aliases are being created the way we want.
-    $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
-    $this->assertEqual($age_field, 'age', 'Age field alias is correct.');
-
-    // Ensure that we got the right record.
-    $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
-    $this->assertEqual($record->$age_field, 27, 'Fetched age is correct.');
-  }
-
-  /**
-   * Tests SELECT statements with expressions.
-   */
-  function testSimpleSelectExpression() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_field = $query->addExpression("age*2", 'double_age');
-    $query->condition('age', 27);
-    $result = $query->execute();
-
-    // Check that the aliases are being created the way we want.
-    $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
-    $this->assertEqual($age_field, 'double_age', 'Age field alias is correct.');
-
-    // Ensure that we got the right record.
-    $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
-    $this->assertEqual($record->$age_field, 27*2, 'Fetched age expression is correct.');
-  }
-
-  /**
-   * Tests SELECT statements with multiple expressions.
-   */
-  function testSimpleSelectExpressionMultiple() {
-    $query = db_select('test');
-    $name_field = $query->addField('test', 'name');
-    $age_double_field = $query->addExpression("age*2");
-    $age_triple_field = $query->addExpression("age*3");
-    $query->condition('age', 27);
-    $result = $query->execute();
-
-    // Check that the aliases are being created the way we want.
-    $this->assertEqual($age_double_field, 'expression', 'Double age field alias is correct.');
-    $this->assertEqual($age_triple_field, 'expression_2', 'Triple age field alias is correct.');
-
-    // Ensure that we got the right record.
-    $record = $result->fetch();
-    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
-    $this->assertEqual($record->$age_double_field, 27*2, 'Fetched double age expression is correct.');
-    $this->assertEqual($record->$age_triple_field, 27*3, 'Fetched triple age expression is correct.');
-  }
-
-  /**
-   * Tests adding multiple fields to a SELECT statement at the same time.
-   */
-  function testSimpleSelectMultipleFields() {
-    $record = db_select('test')
-      ->fields('test', array('id', 'name', 'age', 'job'))
-      ->condition('age', 27)
-      ->execute()->fetchObject();
-
-    // Check that all fields we asked for are present.
-    $this->assertNotNull($record->id, 'ID field is present.');
-    $this->assertNotNull($record->name, 'Name field is present.');
-    $this->assertNotNull($record->age, 'Age field is present.');
-    $this->assertNotNull($record->job, 'Job field is present.');
-
-    // Ensure that we got the right record.
-    // Check that all fields we asked for are present.
-    $this->assertEqual($record->id, 2, 'ID field has the correct value.');
-    $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
-    $this->assertEqual($record->age, 27, 'Age field has the correct value.');
-    $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
-  }
-
-  /**
-   * Tests adding all fields from a given table to a SELECT statement.
-   */
-  function testSimpleSelectAllFields() {
-    $record = db_select('test')
-      ->fields('test')
-      ->condition('age', 27)
-      ->execute()->fetchObject();
-
-    // Check that all fields we asked for are present.
-    $this->assertNotNull($record->id, 'ID field is present.');
-    $this->assertNotNull($record->name, 'Name field is present.');
-    $this->assertNotNull($record->age, 'Age field is present.');
-    $this->assertNotNull($record->job, 'Job field is present.');
-
-    // Ensure that we got the right record.
-    // Check that all fields we asked for are present.
-    $this->assertEqual($record->id, 2, 'ID field has the correct value.');
-    $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
-    $this->assertEqual($record->age, 27, 'Age field has the correct value.');
-    $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
-  }
-
-  /**
-   * Tests that a comparison with NULL is always FALSE.
-   */
-  function testNullCondition() {
-    $this->ensureSampleDataNull();
-
-    $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
-      ->condition('age', NULL)
-      ->execute()->fetchCol();
-
-    $this->assertEqual(count($names), 0, 'No records found when comparing to NULL.');
-  }
-
-  /**
-   * Tests that we can find a record with a NULL value.
-   */
-  function testIsNullCondition() {
-    $this->ensureSampleDataNull();
-
-    $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
-      ->isNull('age')
-      ->execute()->fetchCol();
-
-    $this->assertEqual(count($names), 1, 'Correct number of records found with NULL age.');
-    $this->assertEqual($names[0], 'Fozzie', 'Correct record returned for NULL age.');
-  }
-
-  /**
-   * Tests that we can find a record without a NULL value.
-   */
-  function testIsNotNullCondition() {
-    $this->ensureSampleDataNull();
-
-    $names = db_select('test_null', 'tn')
-      ->fields('tn', array('name'))
-      ->isNotNull('tn.age')
-      ->orderBy('name')
-      ->execute()->fetchCol();
-
-    $this->assertEqual(count($names), 2, 'Correct number of records found withNOT NULL age.');
-    $this->assertEqual($names[0], 'Gonzo', 'Correct record returned for NOT NULL age.');
-    $this->assertEqual($names[1], 'Kermit', 'Correct record returned for NOT NULL age.');
-  }
-
-  /**
-   * Tests that we can UNION multiple Select queries together.
-   *
-   * This is semantically equal to UNION DISTINCT, so we don't explicitly test
-   * that.
-   */
-  function testUnion() {
-    $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
-
-    $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', 28);
-
-    $query_1->union($query_2);
-
-    $names = $query_1->execute()->fetchCol();
-
-    // Ensure we only get 2 records.
-    $this->assertEqual(count($names), 2, 'UNION correctly discarded duplicates.');
-
-    $this->assertEqual($names[0], 'George', 'First query returned correct name.');
-    $this->assertEqual($names[1], 'Ringo', 'Second query returned correct name.');
-  }
-
-  /**
-   * Tests that we can UNION ALL multiple SELECT queries together.
-   */
-  function testUnionAll() {
-    $query_1 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', array(27, 28), 'IN');
-
-    $query_2 = db_select('test', 't')
-      ->fields('t', array('name'))
-      ->condition('age', 28);
-
-    $query_1->union($query_2, 'ALL');
-
-    $names = $query_1->execute()->fetchCol();
-
-    // Ensure we get all 3 records.
-    $this->assertEqual(count($names), 3, 'UNION ALL correctly preserved duplicates.');
-
-    $this->assertEqual($names[0], 'George', 'First query returned correct first name.');
-    $this->assertEqual($names[1], 'Ringo', 'Second query returned correct second name.');
-    $this->assertEqual($names[2], 'Ringo', 'Third query returned correct name.');
-  }
-
-  /**
-   * Tests that we can get a count query for a UNION Select query.
-   */
-  function testUnionCount() {
-    $query_1 = db_select('test', 't')
-      ->fields('t', array('name', 'age'))
-      ->condition('age', array(27, 28), 'IN');
-
-    $query_2 = db_select('test', 't')
-      ->fields('t', array('name', 'age'))
-      ->condition('age', 28);
-
-    $query_1->union($query_2, 'ALL');
-    $names = $query_1->execute()->fetchCol();
-
-    $query_3 = $query_1->countQuery();
-    $count = $query_3->execute()->fetchField();
-
-    // Ensure the counts match.
-    $this->assertEqual(count($names), $count, "The count query's result matched the number of rows in the UNION query.");
-  }
-
-  /**
-   * Tests that random ordering of queries works.
-   *
-   * We take the approach of testing the Drupal layer only, rather than trying
-   * to test that the database's random number generator actually produces
-   * random queries (which is very difficult to do without an unacceptable risk
-   * of the test failing by accident).
-   *
-   * Therefore, in this test we simply run the same query twice and assert that
-   * the two results are reordered versions of each other (as well as of the
-   * same query without the random ordering). It is reasonable to assume that
-   * if we run the same select query twice and the results are in a different
-   * order each time, the only way this could happen is if we have successfully
-   * triggered the database's random ordering functionality.
-   */
-  function testRandomOrder() {
-    // Use 52 items, so the chance that this test fails by accident will be the
-    // same as the chance that a deck of cards will come out in the same order
-    // after shuffling it (in other words, nearly impossible).
-    $number_of_items = 52;
-    while (db_query("SELECT MAX(id) FROM {test}")->fetchField() < $number_of_items) {
-      db_insert('test')->fields(array('name' => $this->randomMachineName()))->execute();
-    }
-
-    // First select the items in order and make sure we get an ordered list.
-    $expected_ids = range(1, $number_of_items);
-    $ordered_ids = db_select('test', 't')
-      ->fields('t', array('id'))
-      ->range(0, $number_of_items)
-      ->orderBy('id')
-      ->execute()
-      ->fetchCol();
-    $this->assertEqual($ordered_ids, $expected_ids, 'A query without random ordering returns IDs in the correct order.');
-
-    // Now perform the same query, but instead choose a random ordering. We
-    // expect this to contain a differently ordered version of the original
-    // result.
-    $randomized_ids = db_select('test', 't')
-      ->fields('t', array('id'))
-      ->range(0, $number_of_items)
-      ->orderRandom()
-      ->execute()
-      ->fetchCol();
-    $this->assertNotEqual($randomized_ids, $ordered_ids, 'A query with random ordering returns an unordered set of IDs.');
-    $sorted_ids = $randomized_ids;
-    sort($sorted_ids);
-    $this->assertEqual($sorted_ids, $ordered_ids, 'After sorting the random list, the result matches the original query.');
-
-    // Now perform the exact same query again, and make sure the order is
-    // different.
-    $randomized_ids_second_set = db_select('test', 't')
-      ->fields('t', array('id'))
-      ->range(0, $number_of_items)
-      ->orderRandom()
-      ->execute()
-      ->fetchCol();
-    $this->assertNotEqual($randomized_ids_second_set, $randomized_ids, 'Performing the query with random ordering a second time returns IDs in a different order.');
-    $sorted_ids_second_set = $randomized_ids_second_set;
-    sort($sorted_ids_second_set);
-    $this->assertEqual($sorted_ids_second_set, $sorted_ids, 'After sorting the second random list, the result matches the sorted version of the first random list.');
-  }
-
-  /**
-   * Tests that filter by a regular expression works as expected.
-   */
-  public function testRegexCondition() {
-
-    $test_groups[] = array(
-      'regex' => 'hn$',
-      'expected' => array(
-        'John',
-      ),
-    );
-    $test_groups[] = array(
-      'regex' => '^Pau',
-      'expected' => array(
-        'Paul',
-      ),
-    );
-    $test_groups[] = array(
-      'regex' => 'Ringo|George',
-      'expected' => array(
-        'Ringo', 'George',
-      ),
-    );
-
-
-    $database = $this->container->get('database');
-    foreach ($test_groups as $test_group) {
-      $query = $database->select('test', 't');
-      $query->addField('t', 'name');
-      $query->condition('t.name', $test_group['regex'], 'REGEXP');
-      $result = $query->execute()->fetchCol();
-
-      $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.');
-      $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.');
-    }
-
-    // Ensure that filter by "#" still works due to the quoting.
-    $database->insert('test')
-      ->fields(array(
-        'name' => 'Pete',
-        'age' => 26,
-        'job' => '#Drummer',
-      ))
-      ->execute();
-
-    $test_groups = array();
-    $test_groups[] = array(
-      'regex' => '#Drummer',
-      'expected' => array(
-        'Pete',
-      ),
-    );
-    $test_groups[] = array(
-      'regex' => '#Singer',
-      'expected' => array(
-      ),
-    );
-
-    foreach ($test_groups as $test_group) {
-      $query = $database->select('test', 't');
-      $query->addField('t', 'name');
-      $query->condition('t.job', $test_group['regex'], 'REGEXP');
-      $result = $query->execute()->fetchCol();
-
-      $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.');
-      $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.');
-    }
-  }
-
-  /**
-   * Tests that aliases are renamed when they are duplicates.
-   */
-  function testSelectDuplicateAlias() {
-    $query = db_select('test', 't');
-    $alias1 = $query->addField('t', 'name', 'the_alias');
-    $alias2 = $query->addField('t', 'age', 'the_alias');
-    $this->assertNotIdentical($alias1, $alias2, 'Duplicate aliases are renamed.');
-  }
-
-  /**
-   * Tests that an invalid merge query throws an exception.
-   */
-  function testInvalidSelectCount() {
-    try {
-      // This query will fail because the table does not exist.
-      // Normally it would throw an exception but we are suppressing
-      // it with the throw_exception option.
-      $options['throw_exception'] = FALSE;
-      db_select('some_table_that_doesnt_exist', 't', $options)
-        ->fields('t')
-        ->countQuery()
-        ->execute();
-
-      $this->pass('$options[\'throw_exception\'] is FALSE, no Exception thrown.');
-    }
-    catch (\Exception $e) {
-      $this->fail('$options[\'throw_exception\'] is FALSE, but Exception thrown for invalid query.');
-      return;
-    }
-
-    try {
-      // This query will fail because the table does not exist.
-      db_select('some_table_that_doesnt_exist', 't')
-        ->fields('t')
-        ->countQuery()
-        ->execute();
-    }
-    catch (\Exception $e) {
-      $this->pass('Exception thrown for invalid query.');
-      return;
-    }
-    $this->fail('No Exception thrown.');
-  }
-
-  /**
-   * Tests thrown exception for IN query conditions with an empty array.
-   */
-  function testEmptyInCondition() {
-    try {
-      db_select('test', 't')
-        ->fields('t')
-        ->condition('age', array(), 'IN')
-        ->execute();
-
-      $this->fail('Expected exception not thrown');
-    }
-    catch (InvalidQueryException $e) {
-      $this->assertEqual("Query condition 'age IN ()' cannot be empty.", $e->getMessage());
-    }
-
-    try {
-      db_select('test', 't')
-        ->fields('t')
-        ->condition('age', array(), 'NOT IN')
-        ->execute();
-
-      $this->fail('Expected exception not thrown');
-    }
-    catch (InvalidQueryException $e) {
-      $this->assertEqual("Query condition 'age NOT IN ()' cannot be empty.", $e->getMessage());
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/SerializeQueryTest.php b/core/modules/system/src/Tests/Database/SerializeQueryTest.php
deleted file mode 100644
index 00f295f..0000000
--- a/core/modules/system/src/Tests/Database/SerializeQueryTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\SerializeQueryTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests serializing and unserializing a query.
- *
- * @group Database
- */
-class SerializeQueryTest extends DatabaseTestBase {
-  /**
-   * Confirms that a query can be serialized and unserialized.
-   */
-  function testSerializeQuery() {
-    $query = db_select('test');
-    $query->addField('test', 'age');
-    $query->condition('name', 'Ringo');
-    // If this doesn't work, it will throw an exception, so no need for an
-    // assertion.
-    $query = unserialize(serialize($query));
-    $results = $query->execute()->fetchCol();
-    $this->assertEqual($results[0], 28, 'Query properly executed after unserialization.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/TaggingTest.php b/core/modules/system/src/Tests/Database/TaggingTest.php
deleted file mode 100644
index a297d7b..0000000
--- a/core/modules/system/src/Tests/Database/TaggingTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\TaggingTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the tagging capabilities of the Select builder.
- *
- * Tags are a way to flag queries for alter hooks so they know
- * what type of query it is, such as "node_access".
- *
- * @group Database
- */
-class TaggingTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that a query has a tag added to it.
-   */
-  function testHasTag() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-
-    $this->assertTrue($query->hasTag('test'), 'hasTag() returned true.');
-    $this->assertFalse($query->hasTag('other'), 'hasTag() returned false.');
-  }
-
-  /**
-   * Tests query tagging "has all of these tags" functionality.
-   */
-  function testHasAllTags() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-    $query->addTag('other');
-
-    $this->assertTrue($query->hasAllTags('test', 'other'), 'hasAllTags() returned true.');
-    $this->assertFalse($query->hasAllTags('test', 'stuff'), 'hasAllTags() returned false.');
-  }
-
-  /**
-   * Tests query tagging "has at least one of these tags" functionality.
-   */
-  function testHasAnyTag() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-
-    $this->assertTrue($query->hasAnyTag('test', 'other'), 'hasAnyTag() returned true.');
-    $this->assertFalse($query->hasAnyTag('other', 'stuff'), 'hasAnyTag() returned false.');
-  }
-
-  /**
-   * Confirms that an extended query has a tag added to it.
-   */
-  function testExtenderHasTag() {
-    $query = db_select('test')
-      ->extend('Drupal\Core\Database\Query\SelectExtender');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-
-    $this->assertTrue($query->hasTag('test'), 'hasTag() returned true.');
-    $this->assertFalse($query->hasTag('other'), 'hasTag() returned false.');
-  }
-
-  /**
-   * Tests extended query tagging "has all of these tags" functionality.
-   */
-  function testExtenderHasAllTags() {
-    $query = db_select('test')
-      ->extend('Drupal\Core\Database\Query\SelectExtender');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-    $query->addTag('other');
-
-    $this->assertTrue($query->hasAllTags('test', 'other'), 'hasAllTags() returned true.');
-    $this->assertFalse($query->hasAllTags('test', 'stuff'), 'hasAllTags() returned false.');
-  }
-
-  /**
-   * Tests extended query tagging "has at least one of these tags" functionality.
-   */
-  function testExtenderHasAnyTag() {
-    $query = db_select('test')
-      ->extend('Drupal\Core\Database\Query\SelectExtender');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $query->addTag('test');
-
-    $this->assertTrue($query->hasAnyTag('test', 'other'), 'hasAnyTag() returned true.');
-    $this->assertFalse($query->hasAnyTag('other', 'stuff'), 'hasAnyTag() returned false.');
-  }
-
-  /**
-   * Tests that we can attach metadata to a query object.
-   *
-   * This is how we pass additional context to alter hooks.
-   */
-  function testMetaData() {
-    $query = db_select('test');
-    $query->addField('test', 'name');
-    $query->addField('test', 'age', 'age');
-
-    $data = array(
-      'a' => 'A',
-      'b' => 'B',
-    );
-
-    $query->addMetaData('test', $data);
-
-    $return = $query->getMetaData('test');
-    $this->assertEqual($data, $return, 'Correct metadata returned.');
-
-    $return = $query->getMetaData('nothere');
-    $this->assertNull($return, 'Non-existent key returned NULL.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/TransactionTest.php b/core/modules/system/src/Tests/Database/TransactionTest.php
deleted file mode 100644
index 5aef79c..0000000
--- a/core/modules/system/src/Tests/Database/TransactionTest.php
+++ /dev/null
@@ -1,615 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\TransactionTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\TransactionOutOfOrderException;
-use Drupal\Core\Database\TransactionNoActiveException;
-
-/**
- * Tests the transaction abstraction system.
- *
- * We test nesting by having two transaction layers, an outer and inner. The
- * outer layer encapsulates the inner layer. Our transaction nesting abstraction
- * should allow the outer layer function to call any function it wants,
- * especially the inner layer that starts its own transaction, and be
- * confident that, when the function it calls returns, its own transaction
- * is still "alive."
- *
- * Call structure:
- *   transactionOuterLayer()
- *     Start transaction
- *     transactionInnerLayer()
- *       Start transaction (does nothing in database)
- *       [Maybe decide to roll back]
- *     Do more stuff
- *     Should still be in transaction A
- *
- * @group Database
- */
-class TransactionTest extends DatabaseTestBase {
-
-  /**
-   * Encapsulates a transaction's "inner layer" with an "outer layer".
-   *
-   * This "outer layer" transaction starts and then encapsulates the "inner
-   * layer" transaction. This nesting is used to evaluate whether the database
-   * transaction API properly supports nesting. By "properly supports," we mean
-   * the outer transaction continues to exist regardless of what functions are
-   * called and whether those functions start their own transactions.
-   *
-   * In contrast, a typical database would commit the outer transaction, start
-   * a new transaction for the inner layer, commit the inner layer transaction,
-   * and then be confused when the outer layer transaction tries to commit its
-   * transaction (which was already committed when the inner transaction
-   * started).
-   *
-   * @param $suffix
-   *   Suffix to add to field values to differentiate tests.
-   * @param $rollback
-   *   Whether or not to try rolling back the transaction when we're done.
-   * @param $ddl_statement
-   *   Whether to execute a DDL statement during the inner transaction.
-   */
-  protected function transactionOuterLayer($suffix, $rollback = FALSE, $ddl_statement = FALSE) {
-    $connection = Database::getConnection();
-    $depth = $connection->transactionDepth();
-    $txn = db_transaction();
-
-    // Insert a single row into the testing table.
-    db_insert('test')
-      ->fields(array(
-        'name' => 'David' . $suffix,
-        'age' => '24',
-      ))
-      ->execute();
-
-    $this->assertTrue($connection->inTransaction(), 'In transaction before calling nested transaction.');
-
-    // We're already in a transaction, but we call ->transactionInnerLayer
-    // to nest another transaction inside the current one.
-    $this->transactionInnerLayer($suffix, $rollback, $ddl_statement);
-
-    $this->assertTrue($connection->inTransaction(), 'In transaction after calling nested transaction.');
-
-    if ($rollback) {
-      // Roll back the transaction, if requested.
-      // This rollback should propagate to the last savepoint.
-      $txn->rollback();
-      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
-    }
-  }
-
-  /**
-   * Creates an "inner layer" transaction.
-   *
-   * This "inner layer" transaction is either used alone or nested inside of the
-   * "outer layer" transaction.
-   *
-   * @param $suffix
-   *   Suffix to add to field values to differentiate tests.
-   * @param $rollback
-   *   Whether or not to try rolling back the transaction when we're done.
-   * @param $ddl_statement
-   *   Whether to execute a DDL statement during the transaction.
-   */
-  protected function transactionInnerLayer($suffix, $rollback = FALSE, $ddl_statement = FALSE) {
-    $connection = Database::getConnection();
-
-    $depth = $connection->transactionDepth();
-    // Start a transaction. If we're being called from ->transactionOuterLayer,
-    // then we're already in a transaction. Normally, that would make starting
-    // a transaction here dangerous, but the database API handles this problem
-    // for us by tracking the nesting and avoiding the danger.
-    $txn = db_transaction();
-
-    $depth2 = $connection->transactionDepth();
-    $this->assertTrue($depth < $depth2, 'Transaction depth is has increased with new transaction.');
-
-    // Insert a single row into the testing table.
-    db_insert('test')
-      ->fields(array(
-        'name' => 'Daniel' . $suffix,
-        'age' => '19',
-      ))
-      ->execute();
-
-    $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
-
-    if ($ddl_statement) {
-      $table = array(
-        'fields' => array(
-          'id' => array(
-            'type' => 'serial',
-            'unsigned' => TRUE,
-            'not null' => TRUE,
-          ),
-        ),
-        'primary key' => array('id'),
-      );
-      db_create_table('database_test_1', $table);
-
-      $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
-    }
-
-    if ($rollback) {
-      // Roll back the transaction, if requested.
-      // This rollback should propagate to the last savepoint.
-      $txn->rollback();
-      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
-    }
-  }
-
-  /**
-   * Tests transaction rollback on a database that supports transactions.
-   *
-   * If the active connection does not support transactions, this test does
-   * nothing.
-   */
-  function testTransactionRollBackSupported() {
-    // This test won't work right if transactions are not supported.
-    if (!Database::getConnection()->supportsTransactions()) {
-      return;
-    }
-    try {
-      // Create two nested transactions. Roll back from the inner one.
-      $this->transactionOuterLayer('B', TRUE);
-
-      // Neither of the rows we inserted in the two transaction layers
-      // should be present in the tables post-rollback.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
-      $this->assertNotIdentical($saved_age, '24', 'Cannot retrieve DavidB row after commit.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
-      $this->assertNotIdentical($saved_age, '19', 'Cannot retrieve DanielB row after commit.');
-    }
-    catch (\Exception $e) {
-      $this->fail($e->getMessage());
-    }
-  }
-
-  /**
-   * Tests transaction rollback on a database that doesn't support transactions.
-   *
-   * If the active driver supports transactions, this test does nothing.
-   */
-  function testTransactionRollBackNotSupported() {
-    // This test won't work right if transactions are supported.
-    if (Database::getConnection()->supportsTransactions()) {
-      return;
-    }
-    try {
-      // Create two nested transactions. Attempt to roll back from the inner one.
-      $this->transactionOuterLayer('B', TRUE);
-
-      // Because our current database claims to not support transactions,
-      // the inserted rows should be present despite the attempt to roll back.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
-      $this->assertIdentical($saved_age, '24', 'DavidB not rolled back, since transactions are not supported.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
-      $this->assertIdentical($saved_age, '19', 'DanielB not rolled back, since transactions are not supported.');
-    }
-    catch (\Exception $e) {
-      $this->fail($e->getMessage());
-    }
-  }
-
-  /**
-   * Tests a committed transaction.
-   *
-   * The behavior of this test should be identical for connections that support
-   * transactions and those that do not.
-   */
-  function testCommittedTransaction() {
-    try {
-      // Create two nested transactions. The changes should be committed.
-      $this->transactionOuterLayer('A');
-
-      // Because we committed, both of the inserted rows should be present.
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidA'))->fetchField();
-      $this->assertIdentical($saved_age, '24', 'Can retrieve DavidA row after commit.');
-      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielA'))->fetchField();
-      $this->assertIdentical($saved_age, '19', 'Can retrieve DanielA row after commit.');
-    }
-    catch (\Exception $e) {
-      $this->fail($e->getMessage());
-    }
-  }
-
-  /**
-   * Tests the compatibility of transactions with DDL statements.
-   */
-  function testTransactionWithDdlStatement() {
-    // First, test that a commit works normally, even with DDL statements.
-    $transaction = db_transaction();
-    $this->insertRow('row');
-    $this->executeDDLStatement();
-    unset($transaction);
-    $this->assertRowPresent('row');
-
-    // Even in different order.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $this->executeDDLStatement();
-    $this->insertRow('row');
-    unset($transaction);
-    $this->assertRowPresent('row');
-
-    // Even with stacking.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $transaction2 = db_transaction();
-    $this->executeDDLStatement();
-    unset($transaction2);
-    $transaction3 = db_transaction();
-    $this->insertRow('row');
-    unset($transaction3);
-    unset($transaction);
-    $this->assertRowPresent('row');
-
-    // A transaction after a DDL statement should still work the same.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $transaction2 = db_transaction();
-    $this->executeDDLStatement();
-    unset($transaction2);
-    $transaction3 = db_transaction();
-    $this->insertRow('row');
-    $transaction3->rollback();
-    unset($transaction3);
-    unset($transaction);
-    $this->assertRowAbsent('row');
-
-    // The behavior of a rollback depends on the type of database server.
-    if (Database::getConnection()->supportsTransactionalDDL()) {
-      // For database servers that support transactional DDL, a rollback
-      // of a transaction including DDL statements should be possible.
-      $this->cleanUp();
-      $transaction = db_transaction();
-      $this->insertRow('row');
-      $this->executeDDLStatement();
-      $transaction->rollback();
-      unset($transaction);
-      $this->assertRowAbsent('row');
-
-      // Including with stacking.
-      $this->cleanUp();
-      $transaction = db_transaction();
-      $transaction2 = db_transaction();
-      $this->executeDDLStatement();
-      unset($transaction2);
-      $transaction3 = db_transaction();
-      $this->insertRow('row');
-      unset($transaction3);
-      $transaction->rollback();
-      unset($transaction);
-      $this->assertRowAbsent('row');
-    }
-    else {
-      // For database servers that do not support transactional DDL,
-      // the DDL statement should commit the transaction stack.
-      $this->cleanUp();
-      $transaction = db_transaction();
-      $this->insertRow('row');
-      $this->executeDDLStatement();
-      // Rollback the outer transaction.
-      try {
-        $transaction->rollback();
-        unset($transaction);
-        // @TODO: an exception should be triggered here, but is not, because
-        // "ROLLBACK" fails silently in MySQL if there is no transaction active.
-        // $this->fail(t('Rolling back a transaction containing DDL should fail.'));
-      }
-      catch (TransactionNoActiveException $e) {
-        $this->pass('Rolling back a transaction containing DDL should fail.');
-      }
-      $this->assertRowPresent('row');
-    }
-  }
-
-  /**
-   * Inserts a single row into the testing table.
-   */
-  protected function insertRow($name) {
-    db_insert('test')
-      ->fields(array(
-        'name' => $name,
-      ))
-      ->execute();
-  }
-
-  /**
-   * Executes a DDL statement.
-   */
-  protected function executeDDLStatement() {
-    static $count = 0;
-    $table = array(
-      'fields' => array(
-        'id' => array(
-          'type' => 'serial',
-          'unsigned' => TRUE,
-          'not null' => TRUE,
-        ),
-      ),
-      'primary key' => array('id'),
-    );
-    db_create_table('database_test_' . ++$count, $table);
-  }
-
-  /**
-   * Starts over for a new test.
-   */
-  protected function cleanUp() {
-    db_truncate('test')
-      ->execute();
-  }
-
-  /**
-   * Asserts that a given row is present in the test table.
-   *
-   * @param $name
-   *   The name of the row.
-   * @param $message
-   *   The message to log for the assertion.
-   */
-  function assertRowPresent($name, $message = NULL) {
-    if (!isset($message)) {
-      $message = format_string('Row %name is present.', array('%name' => $name));
-    }
-    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
-    return $this->assertTrue($present, $message);
-  }
-
-  /**
-   * Asserts that a given row is absent from the test table.
-   *
-   * @param $name
-   *   The name of the row.
-   * @param $message
-   *   The message to log for the assertion.
-   */
-  function assertRowAbsent($name, $message = NULL) {
-    if (!isset($message)) {
-      $message = format_string('Row %name is absent.', array('%name' => $name));
-    }
-    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
-    return $this->assertFalse($present, $message);
-  }
-
-  /**
-   * Tests transaction stacking, commit, and rollback.
-   */
-  function testTransactionStacking() {
-    // This test won't work right if transactions are not supported.
-    if (!Database::getConnection()->supportsTransactions()) {
-      return;
-    }
-
-    $database = Database::getConnection();
-
-    // Standard case: pop the inner transaction before the outer transaction.
-    $transaction = db_transaction();
-    $this->insertRow('outer');
-    $transaction2 = db_transaction();
-    $this->insertRow('inner');
-    // Pop the inner transaction.
-    unset($transaction2);
-    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the inner transaction');
-    // Pop the outer transaction.
-    unset($transaction);
-    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the outer transaction');
-    $this->assertRowPresent('outer');
-    $this->assertRowPresent('inner');
-
-    // Pop the transaction in a different order they have been pushed.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $this->insertRow('outer');
-    $transaction2 = db_transaction();
-    $this->insertRow('inner');
-    // Pop the outer transaction, nothing should happen.
-    unset($transaction);
-    $this->insertRow('inner-after-outer-commit');
-    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
-    // Pop the inner transaction, the whole transaction should commit.
-    unset($transaction2);
-    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
-    $this->assertRowPresent('outer');
-    $this->assertRowPresent('inner');
-    $this->assertRowPresent('inner-after-outer-commit');
-
-    // Rollback the inner transaction.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $this->insertRow('outer');
-    $transaction2 = db_transaction();
-    $this->insertRow('inner');
-    // Now rollback the inner transaction.
-    $transaction2->rollback();
-    unset($transaction2);
-    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
-    // Pop the outer transaction, it should commit.
-    $this->insertRow('outer-after-inner-rollback');
-    unset($transaction);
-    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
-    $this->assertRowPresent('outer');
-    $this->assertRowAbsent('inner');
-    $this->assertRowPresent('outer-after-inner-rollback');
-
-    // Rollback the inner transaction after committing the outer one.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $this->insertRow('outer');
-    $transaction2 = db_transaction();
-    $this->insertRow('inner');
-    // Pop the outer transaction, nothing should happen.
-    unset($transaction);
-    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
-    // Now rollback the inner transaction, it should rollback.
-    $transaction2->rollback();
-    unset($transaction2);
-    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
-    $this->assertRowPresent('outer');
-    $this->assertRowAbsent('inner');
-
-    // Rollback the outer transaction while the inner transaction is active.
-    // In that case, an exception will be triggered because we cannot
-    // ensure that the final result will have any meaning.
-    $this->cleanUp();
-    $transaction = db_transaction();
-    $this->insertRow('outer');
-    $transaction2 = db_transaction();
-    $this->insertRow('inner');
-    $transaction3 = db_transaction();
-    $this->insertRow('inner2');
-    // Rollback the outer transaction.
-    try {
-      $transaction->rollback();
-      unset($transaction);
-      $this->fail('Rolling back the outer transaction while the inner transaction is active resulted in an exception.');
-    }
-    catch (TransactionOutOfOrderException $e) {
-      $this->pass('Rolling back the outer transaction while the inner transaction is active resulted in an exception.');
-    }
-    $this->assertFalse($database->inTransaction(), 'No more in a transaction after rolling back the outer transaction');
-    // Try to commit one inner transaction.
-    unset($transaction3);
-    $this->pass('Trying to commit an inner transaction resulted in an exception.');
-    // Try to rollback one inner transaction.
-    try {
-      $transaction->rollback();
-      unset($transaction2);
-      $this->fail('Trying to commit an inner transaction resulted in an exception.');
-    }
-    catch (TransactionNoActiveException $e) {
-      $this->pass('Trying to commit an inner transaction resulted in an exception.');
-    }
-    $this->assertRowAbsent('outer');
-    $this->assertRowAbsent('inner');
-    $this->assertRowAbsent('inner2');
-  }
-
-  /**
-   * Tests that transactions can continue to be used if a query fails.
-   */
-  public function testQueryFailureInTransaction() {
-    $connection = Database::getConnection();
-    $transaction = $connection->startTransaction('test_transaction');
-    $connection->schema()->dropTable('test');
-
-    // Test a failed query using the query() method.
-    try {
-      $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
-      $this->fail('Using the query method failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Using the query method failed.');
-    }
-
-    // Test a failed select query.
-    try {
-      $connection->select('test')
-        ->fields('test', ['name'])
-        ->execute();
-
-      $this->fail('Select query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Select query failed.');
-    }
-
-    // Test a failed insert query.
-    try {
-      $connection->insert('test')
-        ->fields([
-          'name' => 'David',
-          'age' => '24',
-        ])
-        ->execute();
-
-      $this->fail('Insert query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Insert query failed.');
-    }
-
-    // Test a failed update query.
-    try {
-      $connection->update('test')
-        ->fields(['name' => 'Tiffany'])
-        ->condition('id', 1)
-        ->execute();
-
-      $this->fail('Update query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Update query failed.');
-    }
-
-    // Test a failed delete query.
-    try {
-      $connection->delete('test')
-        ->condition('id', 1)
-        ->execute();
-
-      $this->fail('Delete query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Delete query failed.');
-    }
-
-    // Test a failed merge query.
-    try {
-      $connection->merge('test')
-        ->key('job', 'Presenter')
-        ->fields([
-          'age' => '31',
-          'name' => 'Tiffany',
-        ])
-        ->execute();
-
-      $this->fail('Merge query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Merge query failed.');
-    }
-
-    // Test a failed upsert query.
-    try {
-      $connection->upsert('test')
-        ->key('job')
-        ->fields(['job', 'age', 'name'])
-        ->values([
-          'job' => 'Presenter',
-          'age' => 31,
-          'name' => 'Tiffany',
-        ])
-        ->execute();
-
-      $this->fail('Upset query failed.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Upset query failed.');
-    }
-
-    // Create the missing schema and insert a row.
-    $this->installSchema('database_test', ['test']);
-    $connection->insert('test')
-      ->fields(array(
-        'name' => 'David',
-        'age' => '24',
-      ))
-      ->execute();
-
-    // Commit the transaction.
-    unset($transaction);
-
-    $saved_age = $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
-    $this->assertEqual('24', $saved_age);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/UpdateComplexTest.php b/core/modules/system/src/Tests/Database/UpdateComplexTest.php
deleted file mode 100644
index a53938a..0000000
--- a/core/modules/system/src/Tests/Database/UpdateComplexTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\UpdateComplexTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Update query builder, complex queries.
- *
- * @group Database
- */
-class UpdateComplexTest extends DatabaseTestBase {
-
-  /**
-   * Tests updates with OR conditionals.
-   */
-  function testOrConditionUpdate() {
-    $update = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition(db_or()
-        ->condition('name', 'John')
-        ->condition('name', 'Paul')
-      );
-    $num_updated = $update->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests WHERE IN clauses.
-   */
-  function testInConditionUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('name', array('John', 'Paul'), 'IN')
-      ->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests WHERE NOT IN clauses.
-   */
-  function testNotInConditionUpdate() {
-    // The o is lowercase in the 'NoT IN' operator, to make sure the operators
-    // work in mixed case.
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('name', array('John', 'Paul', 'George'), 'NoT IN')
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests BETWEEN conditional clauses.
-   */
-  function testBetweenConditionUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('age', array(25, 26), 'BETWEEN')
-      ->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests LIKE conditionals.
-   */
-  function testLikeConditionUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('name', '%ge%', 'LIKE')
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests UPDATE with expression values.
-   */
-  function testUpdateExpression() {
-    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $GLOBALS['larry_test'] = 1;
-    $num_updated = db_update('test')
-      ->condition('name', 'Ringo')
-      ->fields(array('job' => 'Musician'))
-      ->expression('age', 'age + :age', array(':age' => 4))
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
-
-    $person = db_query('SELECT * FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetch();
-    $this->assertEqual($person->name, 'Ringo', 'Name set correctly.');
-    $this->assertEqual($person->age, $before_age + 4, 'Age set correctly.');
-    $this->assertEqual($person->job, 'Musician', 'Job set correctly.');
-    $GLOBALS['larry_test'] = 0;
-  }
-
-  /**
-   * Tests UPDATE with only expression values.
-   */
-  function testUpdateOnlyExpression() {
-    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $num_updated = db_update('test')
-      ->condition('name', 'Ringo')
-      ->expression('age', 'age + :age', array(':age' => 4))
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $this->assertEqual($before_age + 4, $after_age, 'Age updated correctly');
-  }
-
-  /**
-   * Test UPDATE with a subselect value.
-   */
-  function testSubSelectUpdate() {
-    $subselect = db_select('test_task', 't');
-    $subselect->addExpression('MAX(priority) + :increment', 'max_priority', array(':increment' => 30));
-    // Clone this to make sure we are running a different query when
-    // asserting.
-    $select = clone $subselect;
-    $query = db_update('test')
-      ->expression('age', $subselect)
-      ->condition('name', 'Ringo');
-    // Save the number of rows that updated for assertion later.
-    $num_updated = $query->execute();
-    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
-    $expected_age = $select->execute()->fetchField();
-    $this->assertEqual($after_age, $expected_age);
-    $this->assertEqual(1, $num_updated, t('Expected 1 row to be updated in subselect update query.'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Database/UpdateLobTest.php b/core/modules/system/src/Tests/Database/UpdateLobTest.php
deleted file mode 100644
index 62c0f45..0000000
--- a/core/modules/system/src/Tests/Database/UpdateLobTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\UpdateLobTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the Update query builder with LOB fields.
- *
- * @group Database
- */
-class UpdateLobTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can update a blob column.
-   */
-  function testUpdateOneBlob() {
-    $data = "This is\000a test.";
-    $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
-    $id = db_insert('test_one_blob')
-      ->fields(array('blob1' => $data))
-      ->execute();
-
-    $data .= $data;
-    db_update('test_one_blob')
-      ->condition('id', $id)
-      ->fields(array('blob1' => $data))
-      ->execute();
-
-    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === $data, format_string('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
-  }
-
-  /**
-   * Confirms that we can update two blob columns in the same table.
-   */
-  function testUpdateMultipleBlob() {
-    $id = db_insert('test_two_blobs')
-      ->fields(array(
-        'blob1' => 'This is',
-        'blob2' => 'a test',
-      ))
-      ->execute();
-
-    db_update('test_two_blobs')
-      ->condition('id', $id)
-      ->fields(array('blob1' => 'and so', 'blob2' => 'is this'))
-      ->execute();
-
-    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
-    $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', 'Can update multiple blobs per row.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/UpdateTest.php b/core/modules/system/src/Tests/Database/UpdateTest.php
deleted file mode 100644
index 3d7f47d..0000000
--- a/core/modules/system/src/Tests/Database/UpdateTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\UpdateTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-/**
- * Tests the update query builder.
- *
- * @group Database
- */
-class UpdateTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can update a single record successfully.
-   */
-  function testSimpleUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('name' => 'Tiffany'))
-      ->condition('id', 1)
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 1))->fetchField();
-    $this->assertIdentical($saved_name, 'Tiffany', 'Updated name successfully.');
-  }
-
-  /**
-   * Confirms updating to NULL.
-   */
-  function testSimpleNullUpdate() {
-    $this->ensureSampleDataNull();
-    $num_updated = db_update('test_null')
-      ->fields(array('age' => NULL))
-      ->condition('name', 'Kermit')
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $saved_age = db_query('SELECT age FROM {test_null} WHERE name = :name', array(':name' => 'Kermit'))->fetchField();
-    $this->assertNull($saved_age, 'Updated name successfully.');
-  }
-
-  /**
-   * Confirms that we can update multiple records successfully.
-   */
-  function testMultiUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('job', 'Singer')
-      ->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Confirms that we can update multiple records with a non-equality condition.
-   */
-  function testMultiGTUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->condition('age', 26, '>')
-      ->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Confirms that we can update multiple records with a where call.
-   */
-  function testWhereUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->where('age > :age', array(':age' => 26))
-      ->execute();
-    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
-  }
-
-  /**
-   * Confirms that we can stack condition and where calls.
-   */
-  function testWhereAndConditionUpdate() {
-    $update = db_update('test')
-      ->fields(array('job' => 'Musician'))
-      ->where('age > :age', array(':age' => 26))
-      ->condition('name', 'Ringo');
-    $num_updated = $update->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
-    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
-  }
-
-  /**
-   * Tests updating with expressions.
-   */
-  function testExpressionUpdate() {
-    // Ensure that expressions are handled properly. This should set every
-    // record's age to a square of itself.
-    $num_rows = db_update('test')
-      ->expression('age', 'age * age')
-      ->execute();
-    $this->assertIdentical($num_rows, 4, 'Updated 4 records.');
-
-    $saved_name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => pow(26, 2)))->fetchField();
-    $this->assertIdentical($saved_name, 'Paul', 'Successfully updated values using an algebraic expression.');
-  }
-
-  /**
-   * Tests return value on update.
-   */
-  function testUpdateAffectedRows() {
-    // At 5am in the morning, all band members but those with a priority 1 task
-    // are sleeping. So we set their tasks to 'sleep'. 5 records match the
-    // condition and therefore are affected by the query, even though two of
-    // them actually don't have to be changed because their value was already
-    // 'sleep'. Still, execute() should return 5 affected rows, not only 3,
-    // because that's cross-db expected behavior.
-    $num_rows = db_update('test_task')
-      ->condition('priority', 1, '<>')
-      ->fields(array('task' => 'sleep'))
-      ->execute();
-    $this->assertIdentical($num_rows, 5, 'Correctly returned 5 affected rows.');
-  }
-
-  /**
-   * Confirm that we can update the primary key of a record successfully.
-   */
-  function testPrimaryKeyUpdate() {
-    $num_updated = db_update('test')
-      ->fields(array('id' => 42, 'name' => 'John'))
-      ->condition('id', 1)
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
-
-    $saved_name= db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 42))->fetchField();
-    $this->assertIdentical($saved_name, 'John', 'Updated primary key successfully.');
-  }
-
-  /**
-   * Confirm that we can update values in a column with special name.
-   */
-  function testSpecialColumnUpdate() {
-    $num_updated = db_update('test_special_columns')
-      ->fields(array('offset' => 'New offset value'))
-      ->condition('id', 1)
-      ->execute();
-    $this->assertIdentical($num_updated, 1, 'Updated 1 special column record.');
-
-    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 1))->fetchField();
-    $this->assertIdentical($saved_value, 'New offset value', 'Updated special column name value successfully.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Database/UpsertTest.php b/core/modules/system/src/Tests/Database/UpsertTest.php
deleted file mode 100644
index bd4db35..0000000
--- a/core/modules/system/src/Tests/Database/UpsertTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Database\UpsertTest.
- */
-
-namespace Drupal\system\Tests\Database;
-
-use Drupal\Core\Database\Database;
-
-/**
- * Tests the Upsert query builder.
- *
- * @group Database
- */
-class UpsertTest extends DatabaseTestBase {
-
-  /**
-   * Confirms that we can upsert (update-or-insert) records successfully.
-   */
-  public function testUpsert() {
-    $connection = Database::getConnection();
-    $num_records_before = $connection->query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-
-    $upsert = $connection->upsert('test_people')
-      ->key('job')
-      ->fields(['job', 'age', 'name']);
-
-    // Add a new row.
-    $upsert->values([
-      'job' => 'Presenter',
-      'age' => 31,
-      'name' => 'Tiffany',
-    ]);
-
-    // Update an existing row.
-    $upsert->values([
-      'job' => 'Speaker',
-      // The initial age was 30.
-      'age' => 32,
-      'name' => 'Meredith',
-    ]);
-
-    $upsert->execute();
-
-    $num_records_after = $connection->query('SELECT COUNT(*) FROM {test_people}')->fetchField();
-    $this->assertEqual($num_records_before + 1, $num_records_after, 'Rows were inserted and updated properly.');
-
-    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
-    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
-    $this->assertEqual($person->age, 31, 'Age set correctly.');
-    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
-
-    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
-    $this->assertEqual($person->job, 'Speaker', 'Job was not changed.');
-    $this->assertEqual($person->age, 32, 'Age updated correctly.');
-    $this->assertEqual($person->name, 'Meredith', 'Name was not changed.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Element/PathElementFormTest.php b/core/modules/system/src/Tests/Element/PathElementFormTest.php
index bcbe534..308504b 100644
--- a/core/modules/system/src/Tests/Element/PathElementFormTest.php
+++ b/core/modules/system/src/Tests/Element/PathElementFormTest.php
@@ -42,7 +42,7 @@ class PathElementFormTest extends KernelTestBase implements FormInterface {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', ['router', 'sequences', 'key_value_expire']);
+    $this->installSchema('system', ['sequences', 'key_value_expire']);
     $this->installEntitySchema('user');
     \Drupal::service('router.builder')->rebuild();
     /** @var \Drupal\user\RoleInterface $role */
diff --git a/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php
deleted file mode 100644
index 2a433c5..0000000
--- a/core/modules/system/src/Tests/Entity/BundleConstraintValidatorTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\BundleConstraintValidatorTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\system\Tests\TypedData;
-
-/**
- * Tests validation constraints for BundleConstraintValidator.
- *
- * @group Entity
- */
-class BundleConstraintValidatorTest extends KernelTestBase {
-
-  /**
-   * The typed data manager to use.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedData;
-
-  public static $modules = array('node', 'field', 'text', 'user');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-    $this->typedData = $this->container->get('typed_data_manager');
-  }
-
-  /**
-   * Tests bundle constraint validation.
-   */
-  public function testValidation() {
-    // Test with multiple values.
-    $this->assertValidation(array('foo', 'bar'));
-    // Test with a single string value as well.
-    $this->assertValidation('foo');
-  }
-
-  /**
-   * Executes the BundleConstraintValidator test for a given bundle.
-   *
-   * @param string|array $bundle
-   *   Bundle/bundles to use as constraint option.
-   */
-  protected function assertValidation($bundle) {
-    // Create a typed data definition with a Bundle constraint.
-    $definition = DataDefinition::create('entity_reference')
-      ->addConstraint('Bundle', $bundle);
-
-    // Test the validation.
-    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'foo'));
-
-    $typed_data = $this->typedData->create($definition, $node);
-    $violations = $typed_data->validate();
-    $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
-
-    // Test the validation when an invalid value is passed.
-    $page_node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'baz'));
-
-    $typed_data = $this->typedData->create($definition, $page_node);
-    $violations = $typed_data->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The entity must be of bundle %bundle.', array('%bundle' => implode(', ', (array) $bundle))), 'The message for invalid value is correct.');
-    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
-    $this->assertEqual($violation->getInvalidValue(), $page_node, 'The invalid value is set correctly in the violation.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
index f7fbe1c..cf60631 100644
--- a/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
+++ b/core/modules/system/src/Tests/Entity/ConfigEntityImportTest.php
@@ -9,7 +9,9 @@
 
 use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
 use Drupal\image\Entity\ImageStyle;
+use Drupal\search\Entity\SearchPage;
 use Drupal\simpletest\WebTestBase;
+use Drupal\system\Entity\Action;
 
 /**
  * Tests ConfigEntity importing.
@@ -50,7 +52,7 @@ public function testConfigUpdateImport() {
   protected function doActionUpdate() {
     // Create a test action with a known label.
     $name = 'system.action.apple';
-    $entity = entity_create('action', array(
+    $entity = Action::create(array(
       'id' => 'apple',
       'plugin' => 'action_message_action',
     ));
@@ -159,10 +161,10 @@ protected function doImageStyleUpdate() {
   protected function doSearchPageUpdate() {
     // Create a test search page with a known label.
     $name = 'search.page.apple';
-    $entity = entity_create('search_page', array(
+    $entity = SearchPage::create([
       'id' => 'apple',
       'plugin' => 'search_extra_type_search',
-    ));
+    ]);
     $entity->save();
 
     $this->checkSinglePluginConfigSync($entity, 'configuration', 'boost', 'bi');
diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
deleted file mode 100644
index d3b7795..0000000
--- a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php
+++ /dev/null
@@ -1,669 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\ConfigEntityQueryTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Config\Entity\Query\QueryFactory;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests Config Entity Query functionality.
- *
- * @group Entity
- * @see \Drupal\Core\Config\Entity\Query
- */
-class ConfigEntityQueryTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  static $modules = array('config_test');
-
-  /**
-   * Stores the search results for alter comparison.
-   *
-   * @var array
-   */
-  protected $queryResults;
-
-  /**
-   * The query factory used to construct all queries in the test.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $factory;
-
-  /**
-   * Stores all config entities created for the test.
-   *
-   * @var array
-   */
-  protected $entities;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->entities = array();
-    $this->factory = $this->container->get('entity.query');
-
-    // These two are here to make sure that matchArray needs to go over several
-    // non-matches on every levels.
-    $array['level1']['level2a'] = 9;
-    $array['level1a']['level2'] = 9;
-    // The tests match array.level1.level2.
-    $array['level1']['level2'] = 1;
-    $entity = entity_create('config_query_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => '1',
-      'number' => 31,
-      'array' => $array,
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-    $array['level1']['level2'] = 2;
-    $entity = entity_create('config_query_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => '2',
-      'number' => 41,
-      'array' => $array,
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-    $array['level1']['level2'] = 1;
-    $entity = entity_create('config_query_test', array(
-      'label' => 'test_prefix_' . $this->randomMachineName(),
-      'id' => '3',
-      'number' => 59,
-      'array' => $array,
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-    $array['level1']['level2'] = 2;
-    $entity = entity_create('config_query_test', array(
-      'label' => $this->randomMachineName() . '_test_suffix',
-      'id' => '4',
-      'number' => 26,
-      'array' => $array,
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-    $array['level1']['level2'] = 3;
-    $entity = entity_create('config_query_test', array(
-      'label' => $this->randomMachineName() . '_TEST_contains_' . $this->randomMachineName(),
-      'id' => '5',
-      'number' => 53,
-      'array' => $array,
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-  }
-
-  /**
-   * Tests basic functionality.
-   */
-  public function testConfigEntityQuery() {
-    // Run a test without any condition.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
-    // No conditions, OR.
-    $this->queryResults = $this->factory->get('config_query_test', 'OR')
-      ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
-
-    // Filter by ID with equality.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3')
-      ->execute();
-    $this->assertResults(array('3'));
-
-    // Filter by label with a known prefix.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_prefix', 'STARTS_WITH')
-      ->execute();
-    $this->assertResults(array('3'));
-
-    // Filter by label with a known suffix.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_suffix', 'ENDS_WITH')
-      ->execute();
-    $this->assertResults(array('4'));
-
-    // Filter by label with a known containing word.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_contains', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array('5'));
-
-    // Filter by ID with the IN operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('2', '3'), 'IN')
-      ->execute();
-    $this->assertResults(array('2', '3'));
-
-    // Filter by ID with the implicit IN operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('2', '3'))
-      ->execute();
-    $this->assertResults(array('2', '3'));
-
-    // Filter by ID with the > operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '>')
-      ->execute();
-    $this->assertResults(array('4', '5'));
-
-    // Filter by ID with the >= operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '>=')
-      ->execute();
-    $this->assertResults(array('3', '4', '5'));
-
-    // Filter by ID with the <> operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '<>')
-      ->execute();
-    $this->assertResults(array('1', '2', '4', '5'));
-
-    // Filter by ID with the < operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '<')
-      ->execute();
-    $this->assertResults(array('1', '2'));
-
-    // Filter by ID with the <= operator.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '<=')
-      ->execute();
-    $this->assertResults(array('1', '2', '3'));
-
-    // Filter by two conditions on the same field.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_pref', 'STARTS_WITH')
-      ->condition('label', 'test_prefix', 'STARTS_WITH')
-      ->execute();
-    $this->assertResults(array('3'));
-
-    // Filter by two conditions on different fields. The first query matches for
-    // a different ID, so the result is empty.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_prefix', 'STARTS_WITH')
-      ->condition('id', '5')
-      ->execute();
-    $this->assertResults(array());
-
-    // Filter by two different conditions on different fields. This time the
-    // first condition matches on one item, but the second one does as well.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test_prefix', 'STARTS_WITH')
-      ->condition('id', '3')
-      ->execute();
-    $this->assertResults(array('3'));
-
-    // Filter by two different conditions, of which the first one matches for
-    // every entry, the second one as well, but just the third one filters so
-    // that just two are left.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '1', '>=')
-      ->condition('number', 10, '>=')
-      ->condition('number', 50, '>=')
-      ->execute();
-    $this->assertResults(array('3', '5'));
-
-    // Filter with an OR condition group.
-    $this->queryResults = $this->factory->get('config_query_test', 'OR')
-      ->condition('id', 1)
-      ->condition('id', '2')
-      ->execute();
-    $this->assertResults(array('1', '2'));
-
-    // Simplify it with IN.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'))
-      ->execute();
-    $this->assertResults(array('1', '2'));
-    // Try explicit IN.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'), 'IN')
-      ->execute();
-    $this->assertResults(array('1', '2'));
-    // Try not IN.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', array('1', '2'), 'NOT IN')
-      ->execute();
-    $this->assertResults(array('3', '4', '5'));
-
-    // Filter with an OR condition group on different fields.
-    $this->queryResults = $this->factory->get('config_query_test', 'OR')
-      ->condition('id', 1)
-      ->condition('number', 41)
-      ->execute();
-    $this->assertResults(array('1', '2'));
-
-    // Filter with an OR condition group on different fields but matching on the
-    // same entity.
-    $this->queryResults = $this->factory->get('config_query_test', 'OR')
-      ->condition('id', 1)
-      ->condition('number', 31)
-      ->execute();
-    $this->assertResults(array('1'));
-
-    // NO simple conditions, YES complex conditions, 'AND'.
-    $query = $this->factory->get('config_query_test', 'AND');
-    $and_condition_1 = $query->orConditionGroup()
-      ->condition('id', '2')
-      ->condition('label', $this->entities[0]->label);
-    $and_condition_2 = $query->orConditionGroup()
-      ->condition('id', 1)
-      ->condition('label', $this->entities[3]->label);
-    $this->queryResults = $query
-      ->condition($and_condition_1)
-      ->condition($and_condition_2)
-      ->execute();
-    $this->assertResults(array('1'));
-
-    // NO simple conditions, YES complex conditions, 'OR'.
-    $query = $this->factory->get('config_query_test', 'OR');
-    $and_condition_1 = $query->andConditionGroup()
-      ->condition('id', 1)
-      ->condition('label', $this->entities[0]->label);
-    $and_condition_2 = $query->andConditionGroup()
-      ->condition('id', '2')
-      ->condition('label', $this->entities[1]->label);
-    $this->queryResults = $query
-      ->condition($and_condition_1)
-      ->condition($and_condition_2)
-      ->execute();
-    $this->assertResults(array('1', '2'));
-
-    // YES simple conditions, YES complex conditions, 'AND'.
-    $query = $this->factory->get('config_query_test', 'AND');
-    $and_condition_1 = $query->orConditionGroup()
-      ->condition('id', '2')
-      ->condition('label', $this->entities[0]->label);
-    $and_condition_2 = $query->orConditionGroup()
-      ->condition('id', 1)
-      ->condition('label', $this->entities[3]->label);
-    $this->queryResults = $query
-      ->condition('number', 31)
-      ->condition($and_condition_1)
-      ->condition($and_condition_2)
-      ->execute();
-    $this->assertResults(array('1'));
-
-    // YES simple conditions, YES complex conditions, 'OR'.
-    $query = $this->factory->get('config_query_test', 'OR');
-    $and_condition_1 = $query->orConditionGroup()
-      ->condition('id', '2')
-      ->condition('label', $this->entities[0]->label);
-    $and_condition_2 = $query->orConditionGroup()
-      ->condition('id', 1)
-      ->condition('label', $this->entities[3]->label);
-    $this->queryResults = $query
-      ->condition('number', 53)
-      ->condition($and_condition_1)
-      ->condition($and_condition_2)
-      ->execute();
-    $this->assertResults(array('1', '2', '4', '5'));
-
-    // Test the exists and notExists conditions.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->exists('id')
-      ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->exists('non-existent')
-      ->execute();
-    $this->assertResults(array());
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->notExists('id')
-      ->execute();
-    $this->assertResults(array());
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->notExists('non-existent')
-      ->execute();
-    $this->assertResults(array('1', '2', '3', '4', '5'));
-  }
-
-  /**
-   * Tests ID conditions.
-   */
-  public function testStringIdConditions() {
-    // We need an entity with a non-numeric ID.
-    $entity = entity_create('config_query_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => 'foo.bar',
-    ));
-    $this->entities[] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-    // Test 'STARTS_WITH' condition.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'foo.bar', 'STARTS_WITH')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'f', 'STARTS_WITH')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'miss', 'STARTS_WITH')
-      ->execute();
-    $this->assertResults(array());
-
-    // Test 'CONTAINS' condition.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'foo.bar', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'oo.ba', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'miss', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array());
-
-    // Test 'ENDS_WITH' condition.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'foo.bar', 'ENDS_WITH')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'r', 'ENDS_WITH')
-      ->execute();
-    $this->assertResults(array('foo.bar'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', 'miss', 'ENDS_WITH')
-      ->execute();
-    $this->assertResults(array());
-  }
-
-  /**
-   * Tests count query.
-   */
-  public function testCount() {
-    // Test count on no conditions.
-    $count = $this->factory->get('config_query_test')
-      ->count()
-      ->execute();
-    $this->assertIdentical($count, count($this->entities));
-
-    // Test count on a complex query.
-    $query = $this->factory->get('config_query_test', 'OR');
-    $and_condition_1 = $query->andConditionGroup()
-      ->condition('id', 1)
-      ->condition('label', $this->entities[0]->label);
-    $and_condition_2 = $query->andConditionGroup()
-      ->condition('id', '2')
-      ->condition('label', $this->entities[1]->label);
-    $count = $query
-      ->condition($and_condition_1)
-      ->condition($and_condition_2)
-      ->count()
-      ->execute();
-    $this->assertIdentical($count, 2);
-  }
-
-  /**
-   * Tests sorting and range on config entity queries.
-   */
-  public function testSortRange() {
-    // Sort by simple ascending/descending.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->sort('number', 'DESC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->sort('number', 'ASC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
-
-    // Apply some filters and sort.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '>')
-      ->sort('number', 'DESC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4'));
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('id', '3', '>')
-      ->sort('number', 'ASC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '5'));
-
-    // Apply a pager and sort.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->sort('number', 'DESC')
-      ->range('2', '2')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('2', '1'));
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->sort('number', 'ASC')
-      ->range('2', '2')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('2', '5'));
-
-    // Add a range to a query without a start parameter.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->range(0, '3')
-      ->sort('id', 'ASC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3'));
-
-    // Apply a pager with limit 4.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->pager('4', 0)
-      ->sort('id', 'ASC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4'));
-  }
-
-  /**
-   * Tests sorting with tableSort on config entity queries.
-   */
-  public function testTableSort() {
-    $header = array(
-      array('data' => t('ID'), 'specifier' => 'id'),
-      array('data' => t('Number'), 'specifier' => 'number'),
-    );
-
-    // Sort key: id
-    // Sorting with 'DESC' upper case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('id', 'DESC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
-
-    // Sorting with 'ASC' upper case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('id', 'ASC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
-
-    // Sorting with 'desc' lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('id', 'desc')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
-
-    // Sorting with 'asc' lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('id', 'asc')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
-
-    // Sort key: number
-    // Sorting with 'DeSc' mixed upper and lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('number', 'DeSc')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
-
-    // Sorting with 'AsC' mixed upper and lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('number', 'AsC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
-
-    // Sorting with 'dEsC' mixed upper and lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('number', 'dEsC')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
-
-    // Sorting with 'aSc' mixed upper and lower case
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->tableSort($header)
-      ->sort('number', 'aSc')
-      ->execute();
-    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
-  }
-
-  /**
-   * Tests dotted path matching.
-   */
-  public function testDotted() {
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('array.level1.*', 1)
-      ->execute();
-    $this->assertResults(array('1', '3'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('*.level1.level2', 2)
-      ->execute();
-    $this->assertResults(array('2', '4'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('array.level1.*', 3)
-      ->execute();
-    $this->assertResults(array('5'));
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('array.level1.level2', 3)
-      ->execute();
-    $this->assertResults(array('5'));
-    // Make sure that values on the wildcard level do not match if there are
-    // sub-keys defined. This must not find anything even if entity 2 has a
-    // top-level key number with value 41.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('*.level1.level2', 41)
-      ->execute();
-    $this->assertResults(array());
-  }
-
-  /**
-   * Tests case sensitivity.
-   */
-  public function testCaseSensitivity() {
-    // Filter by label with a known containing case-sensitive word.
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'TEST', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array('3', '4', '5'));
-
-    $this->queryResults = $this->factory->get('config_query_test')
-      ->condition('label', 'test', 'CONTAINS')
-      ->execute();
-    $this->assertResults(array('3', '4', '5'));
-  }
-
-  /**
-   * Tests lookup keys are added to the key value store.
-   */
-  public function testLookupKeys() {
-    \Drupal::service('state')->set('config_test.lookup_keys', TRUE);
-    \Drupal::entityManager()->clearCachedDefinitions();
-    $key_value = $this->container->get('keyvalue')->get(QueryFactory::CONFIG_LOOKUP_PREFIX . 'config_test');
-
-    $test_entities = [];
-    $entity = entity_create('config_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => '1',
-      'style' => 'test',
-    ));
-    $test_entities[$entity->getConfigDependencyName()] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-
-
-    $expected[] = $entity->getConfigDependencyName();
-    $this->assertEqual($expected, $key_value->get('style:test'));
-
-    $entity = entity_create('config_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => '2',
-      'style' => 'test',
-    ));
-    $test_entities[$entity->getConfigDependencyName()] = $entity;
-    $entity->enforceIsNew();
-    $entity->save();
-    $expected[] = $entity->getConfigDependencyName();
-    $this->assertEqual($expected, $key_value->get('style:test'));
-
-    $entity = entity_create('config_test', array(
-      'label' => $this->randomMachineName(),
-      'id' => '3',
-      'style' => 'blah',
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    // Do not add this entity to the list of expected result as it has a
-    // different value.
-    $this->assertEqual($expected, $key_value->get('style:test'));
-    $this->assertEqual([$entity->getConfigDependencyName()], $key_value->get('style:blah'));
-
-    // Ensure that a delete clears a key.
-    $entity->delete();
-    $this->assertEqual([], $key_value->get('style:blah'));
-
-    // Ensure that delete only clears one key.
-    $entity_id = array_pop($expected);
-    $test_entities[$entity_id]->delete();
-    $this->assertEqual($expected, $key_value->get('style:test'));
-    $entity_id = array_pop($expected);
-    $test_entities[$entity_id]->delete();
-    $this->assertEqual($expected, $key_value->get('style:test'));
-  }
-
-  /**
-   * Asserts the results as expected regardless of order.
-   *
-   * @param array $expected
-   *   Array of expected entity IDs.
-   */
-  protected function assertResults($expected) {
-    $this->assertIdentical(count($this->queryResults), count($expected));
-    foreach ($expected as $value) {
-      // This also tests whether $this->queryResults[$value] is even set at all.
-      $this->assertIdentical($this->queryResults[$value], $value);
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php b/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
deleted file mode 100644
index 94c9b12..0000000
--- a/core/modules/system/src/Tests/Entity/ContentEntityChangedTest.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\ContentEntityChangedTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\entity_test\Entity\EntityTestMulChanged;
-use Drupal\entity_test\Entity\EntityTestMulRevChanged;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests basic EntityChangedInterface functionality.
- *
- * @group Entity
- */
-class ContentEntityChangedTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['language', 'user', 'system', 'field', 'text', 'filter', 'entity_test'];
-
-  /**
-   * The EntityTestMulChanged entity type storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $mulChangedStorage;
-
-  /**
-   * The EntityTestMulRevChanged entity type storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $mulRevChangedStorage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Enable an additional language.
-    ConfigurableLanguage::createFromLangcode('de')->save();
-    ConfigurableLanguage::createFromLangcode('fr')->save();
-
-    $this->installEntitySchema('entity_test_mul_changed');
-    $this->installEntitySchema('entity_test_mulrev_changed');
-
-    $this->mulChangedStorage = $this->entityManager->getStorage('entity_test_mul_changed');
-    $this->mulRevChangedStorage = $this->entityManager->getStorage('entity_test_mulrev_changed');
-  }
-
-  /**
-   * Tests basic EntityChangedInterface functionality.
-   */
-  public function testChanged() {
-    $user1 = $this->createUser();
-    $user2 = $this->createUser();
-
-    // Create a test entity.
-    $entity = EntityTestMulChanged::create(array(
-      'name' => $this->randomString(),
-      'user_id' => $user1->id(),
-      'language' => 'en',
-    ));
-    $entity->save();
-
-    $this->assertTrue(
-      $entity->getChangedTime() >= REQUEST_TIME,
-      'Changed time of original language is valid.'
-    );
-
-    // We can't assert equality here because the created time is set to the
-    // request time, while instances of ChangedTestItem use the current
-    // timestamp every time. Therefor we check if the changed timestamp is
-    // between the created time and now.
-    $this->assertTrue(
-      ($entity->getChangedTime() >= $entity->get('created')->value) &&
-      (($entity->getChangedTime() - $entity->get('created')->value) <= time() - REQUEST_TIME),
-      'Changed and created time of original language can be assumed to be identical.'
-    );
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of original language is the same as changed time across all translations.'
-    );
-
-    $changed_en = $entity->getChangedTime();
-
-    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $german */
-    $german = $entity->addTranslation('de');
-
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertTrue(
-      $german->getChangedTime() > $entity->getChangedTime(),
-      'Changed time of the German translation is newer then the original language.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of the German translation is the newest time across all translations.'
-    );
-
-    $changed_de = $german->getChangedTime();
-
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $changed_de,
-      'Changed time of the German translation did not change.'
-    );
-
-    $entity->setOwner($user2);
-
-    $entity->save();
-
-    $this->assertTrue(
-      $entity->getChangedTime() > $changed_en,
-      'Changed time of original language did change.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $changed_de,
-      'Changed time of the German translation did not change.'
-    );
-
-    $this->assertTrue(
-      $entity->getChangedTime() > $german->getChangedTime(),
-      'Changed time of original language is newer then the German translation.'
-    );
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of the original language is the newest time across all translations.'
-    );
-
-    $changed_en = $entity->getChangedTime();
-
-    // Save entity without any changes.
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $changed_de,
-      'Changed time of the German translation did not change.'
-    );
-
-    // At this point the changed time of the original language (en) is newer
-    // than the changed time of the German translation. Now test that entity
-    // queries work as expected.
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en)->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time of original language.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en, '=', 'en')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time of original language by setting the original language as condition.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_de, '=', 'en')->execute();
-
-    $this->assertFalse(
-      $ids,
-      'There\'s no original entity stored having the changed time of the German translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en)->condition('default_langcode', '1')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time of default language.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_de)->condition('default_langcode', '1')->execute();
-
-    $this->assertFalse(
-      $ids,
-      'There\'s no entity stored using the default language having the changed time of the German translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_de)->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time of the German translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_de, '=', 'de')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time of the German translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en, '=', 'de')->execute();
-
-    $this->assertFalse(
-      $ids,
-      'There\'s no German translation stored having the changed time of the original language.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_de, '>')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time regardless of translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en, '<')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time regardless of translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', 0, '>')->execute();
-
-    $this->assertEqual(
-      reset($ids), $entity->id(),
-      'Entity query can access changed time regardless of translation.'
-    );
-
-    $query = $this->mulChangedStorage->getQuery();
-    $ids = $query->condition('changed', $changed_en, '>')->execute();
-
-    $this->assertFalse(
-      $ids,
-      'Entity query can access changed time regardless of translation.'
-    );
-  }
-
-  /**
-   * Tests revisionable EntityChangedInterface functionality.
-   */
-  public function testRevisionChanged() {
-    $user1 = $this->createUser();
-    $user2 = $this->createUser();
-
-    // Create a test entity.
-    $entity = EntityTestMulRevChanged::create(array(
-      'name' => $this->randomString(),
-      'user_id' => $user1->id(),
-      'language' => 'en',
-    ));
-    $entity->save();
-
-    $this->assertTrue(
-      $entity->getChangedTime() >= REQUEST_TIME,
-      'Changed time of original language is valid.'
-    );
-
-    // We can't assert equality here because the created time is set to the
-    // request time while instances of ChangedTestItem use the current
-    // timestamp every time.
-    $this->assertTrue(
-      ($entity->getChangedTime() >= $entity->get('created')->value) &&
-      (($entity->getChangedTime() - $entity->get('created')->value) <= time() - REQUEST_TIME),
-      'Changed and created time of original language can be assumed to be identical.'
-    );
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of original language is the same as changed time across all translations.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is set for a new entity.'
-    );
-
-    $changed_en = $entity->getChangedTime();
-
-    $entity->setNewRevision();
-    // Save entity without any changes but create new revision.
-    $entity->save();
-    // A new revision without any changes should not set a new changed time.
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is not set for new revision without changes.'
-    );
-
-    $entity->setNewRevision();
-    $entity->setOwner($user2);
-    $entity->save();
-
-    $this->assertTrue(
-      $entity->getChangedTime() > $changed_en,
-      'Changed time of original language has been updated by new revision.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is set for new revision with changes.'
-    );
-
-    $changed_en = $entity->getChangedTime();
-
-    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $german */
-    $german = $entity->addTranslation('de');
-
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertTrue(
-      $german->getChangedTime() > $entity->getChangedTime(),
-      'Changed time of the German translation is newer then the original language.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of the German translation is the newest time across all translations.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is not reset by adding a new translation.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'Changed flag of German translation is set when adding the translation.'
-    );
-
-    $changed_de = $german->getChangedTime();
-
-    $entity->setNewRevision();
-    // Save entity without any changes but create new revision.
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $changed_de,
-      'Changed time of the German translation did not change.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is not set for new revision without changes.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'Changed flag of the German translation is not set for new revision without changes.'
-    );
-
-    $entity->setNewRevision();
-    $german->setOwner($user2);
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertTrue(
-      $german->getChangedTime() > $changed_de,
-      'Changed time of the German translation did change.'
-    );
-
-    $this->assertEqual(
-      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of the German translation is the newest time across all translations.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is not set when changing the German Translation.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'Changed flag of German translation is set when changing the German translation.'
-    );
-
-    $french = $entity->addTranslation('fr');
-
-    $entity->setNewRevision();
-    $entity->save();
-
-    $this->assertEqual(
-      $entity->getChangedTime(), $changed_en,
-      'Changed time of original language did not change.'
-    );
-
-    $this->assertTrue(
-      $french->getChangedTime() > $entity->getChangedTime(),
-      'Changed time of the French translation is newer then the original language.'
-    );
-
-    $this->assertTrue(
-      $french->getChangedTime() > $entity->getChangedTime(),
-      'Changed time of the French translation is newer then the German translation.'
-    );
-
-    $this->assertEqual(
-      $french->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
-      'Changed time of the French translation is the newest time across all translations.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is reset by adding a new translation and a new revision.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'Changed flag of German translation is reset by adding a new translation and a new revision.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($french),
-      'Changed flag of French translation is set when adding the translation and a new revision.'
-    );
-
-    $entity->removeTranslation('fr');
-
-    $entity->setNewRevision();
-    $entity->save();
-
-    // This block simulates exactly the flow of a node form submission of a new
-    // translation and a new revision.
-    $form_entity_builder_entity = EntityTestMulRevChanged::load($entity->id());
-    // ContentTranslationController::prepareTranslation().
-    $form_entity_builder_entity = $form_entity_builder_entity->addTranslation('fr', $form_entity_builder_entity->toArray());
-    // EntityForm::buildEntity() during form submit.
-    $form_entity_builder_clone = clone $form_entity_builder_entity;
-    // NodeForm::submitForm().
-    $form_entity_builder_clone->setNewRevision();
-    // EntityForm::save().
-    $form_entity_builder_clone->save();
-
-    // The assertion fails unless https://www.drupal.org/node/2513094 is
-    // committed.
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($entity),
-      'Changed flag of original language is reset by adding a new translation and a new revision.'
-    );
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'Changed flag of German translation is reset by adding a new translation and a new revision.'
-    );
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($french),
-      'Changed flag of French translation is set when adding the translation and a new revision.'
-    );
-
-    $german->setOwner($user1);
-    $german->setRevisionTranslationAffected(FALSE);
-    $entity->save();
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'German translation changed but the changed flag is reset manually.'
-    );
-
-    $entity->setNewRevision();
-    $german->setRevisionTranslationAffected(TRUE);
-    $entity->save();
-
-    $this->assertTrue(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'German translation is not changed and a new revision is created but the changed flag is set manually.'
-    );
-
-    $german->setOwner($user2);
-    $entity->setNewRevision();
-    $german->setRevisionTranslationAffected(FALSE);
-    $entity->save();
-
-    $this->assertFalse(
-      $this->getRevisionTranslationAffectedFlag($german),
-      'German translation changed and a new revision is created but the changed flag is reset manually.'
-    );
-
-  }
-
-  /**
-   * Retrieves the revision translation affected flag value.
-   *
-   * @param \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity
-   *   The entity object to be checked.
-   *
-   * @return bool
-   *   The flag value.
-   */
-  protected function getRevisionTranslationAffectedFlag(EntityTestMulRevChanged $entity) {
-    $query = $this->mulRevChangedStorage->getQuery();
-    $ids = $query->condition('revision_translation_affected', 1, '=', $entity->language()->getId())->execute();
-    $id = reset($ids);
-    return (bool) ($id == $entity->id());
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php b/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php
deleted file mode 100644
index 77d1603..0000000
--- a/core/modules/system/src/Tests/Entity/ContentEntityCloneTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\ContentEntityCloneTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\entity_test\Entity\EntityTestMul;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests proper cloning of content entities.
- *
- * @group Entity
- */
-class ContentEntityCloneTest extends EntityUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['language', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Enable an additional language.
-    ConfigurableLanguage::createFromLangcode('de')->save();
-
-    $this->installEntitySchema('entity_test_mul');
-  }
-
-  /**
-   * Tests if entity references on fields are still correct after cloning.
-   */
-  public function testFieldEntityReferenceAfterClone() {
-    $user = $this->createUser();
-
-    // Create a test entity.
-    $entity = EntityTestMul::create([
-      'name' => $this->randomString(),
-      'user_id' => $user->id(),
-      'language' => 'en',
-    ]);
-
-    $clone = clone $entity->addTranslation('de');
-
-    $this->assertEqual($entity->getTranslationLanguages(), $clone->getTranslationLanguages(), 'The entity and its clone have the same translation languages.');
-
-    $default_langcode = $entity->getUntranslated()->language()->getId();
-    foreach (array_keys($clone->getTranslationLanguages()) as $langcode) {
-      $translation = $clone->getTranslation($langcode);
-      foreach ($translation->getFields() as $field_name => $field) {
-        if ($field->getFieldDefinition()->isTranslatable()) {
-          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
-          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode after cloning.', $args));
-        }
-        else {
-          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
-          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode after cloning.', $args));
-        }
-      }
-    }
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php b/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php
deleted file mode 100644
index 3eeee3b..0000000
--- a/core/modules/system/src/Tests/Entity/ContentEntityNullStorageTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\ContentEntityNullStorageTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\contact\Entity\ContactForm;
-use Drupal\Core\Config\ConfigImporter;
-use Drupal\Core\Config\StorageComparer;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests ContentEntityNullStorage entity query support.
- *
- * @see \Drupal\Core\Entity\ContentEntityNullStorage
- * @see \Drupal\Core\Entity\Query\Null\Query
- *
- * @group Entity
- */
-class ContentEntityNullStorageTest extends KernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'contact', 'user');
-
-  /**
-   * Tests using entity query with ContentEntityNullStorage.
-   *
-   * @see \Drupal\Core\Entity\Query\Null\Query
-   */
-  public function testEntityQuery() {
-    $this->assertIdentical(0, \Drupal::entityQuery('contact_message')->count()->execute(), 'Counting a null storage returns 0.');
-    $this->assertIdentical([], \Drupal::entityQuery('contact_message')->execute(), 'Querying a null storage returns an empty array.');
-    $this->assertIdentical([], \Drupal::entityQuery('contact_message')->condition('contact_form', 'test')->execute(), 'Querying a null storage returns an empty array and conditions are ignored.');
-    $this->assertIdentical([], \Drupal::entityQueryAggregate('contact_message')->aggregate('name', 'AVG')->execute(), 'Aggregate querying a null storage returns an empty array');
-
-  }
-
-  /**
-   * Tests deleting a contact form entity via a configuration import.
-   *
-   * @see \Drupal\Core\Entity\Event\BundleConfigImportValidate
-   */
-  public function testDeleteThroughImport() {
-    $contact_form = ContactForm::create(['id' => 'test']);
-    $contact_form->save();
-
-    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
-
-    // Set up the ConfigImporter object for testing.
-    $storage_comparer = new StorageComparer(
-      $this->container->get('config.storage.sync'),
-      $this->container->get('config.storage'),
-      $this->container->get('config.manager')
-    );
-    $config_importer = new ConfigImporter(
-      $storage_comparer->createChangelist(),
-      $this->container->get('event_dispatcher'),
-      $this->container->get('config.manager'),
-      $this->container->get('lock'),
-      $this->container->get('config.typed'),
-      $this->container->get('module_handler'),
-      $this->container->get('module_installer'),
-      $this->container->get('theme_handler'),
-      $this->container->get('string_translation')
-    );
-
-    // Delete the contact message in sync.
-    $sync = $this->container->get('config.storage.sync');
-    $sync->delete($contact_form->getConfigDependencyName());
-
-    // Import.
-    $config_importer->reset()->import();
-    $this->assertNull(ContactForm::load($contact_form->id()), 'The contact form has been deleted.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/Element/EntityAutocompleteElementFormTest.php b/core/modules/system/src/Tests/Entity/Element/EntityAutocompleteElementFormTest.php
deleted file mode 100644
index 3e0386c..0000000
--- a/core/modules/system/src/Tests/Entity/Element/EntityAutocompleteElementFormTest.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\Element\EntityAutocompleteElementFormTest.
- */
-
-namespace Drupal\system\Tests\Entity\Element;
-
-use Drupal\Core\Entity\Element\EntityAutocomplete;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * Tests the EntityAutocomplete Form API element.
- *
- * @group Form
- */
-class EntityAutocompleteElementFormTest extends EntityUnitTestBase implements FormInterface {
-
-  /**
-   * User for testing.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $testUser;
-
-  /**
-   * User for autocreate testing.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $testAutocreateUser;
-
-  /**
-   * An array of entities to be referenced in this test.
-   *
-   * @var \Drupal\Core\Entity\EntityInterface[]
-   */
-  protected $referencedEntities;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['router', 'key_value_expire']);
-    \Drupal::service('router.builder')->rebuild();
-
-    $this->testUser = User::create(array(
-      'name' => 'foobar1',
-      'mail' => 'foobar1@example.com',
-    ));
-    $this->testUser->save();
-    \Drupal::service('current_user')->setAccount($this->testUser);
-
-    $this->testAutocreateUser = User::create(array(
-      'name' => 'foobar2',
-      'mail' => 'foobar2@example.com',
-    ));
-    $this->testAutocreateUser->save();
-
-    for ($i = 1; $i < 3; $i++) {
-      $entity = EntityTest::create(array(
-        'name' => $this->randomMachineName()
-      ));
-      $entity->save();
-      $this->referencedEntities[] = $entity;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'test_entity_autocomplete';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['single'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-    );
-    $form['single_autocreate'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#autocreate' => array(
-        'bundle' => 'entity_test',
-      ),
-    );
-    $form['single_autocreate_specific_uid'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#autocreate' => array(
-        'bundle' => 'entity_test',
-        'uid' => $this->testAutocreateUser->id(),
-      ),
-    );
-
-    $form['tags'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#tags' => TRUE,
-    );
-    $form['tags_autocreate'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#tags' => TRUE,
-      '#autocreate' => array(
-        'bundle' => 'entity_test',
-      ),
-    );
-    $form['tags_autocreate_specific_uid'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#tags' => TRUE,
-      '#autocreate' => array(
-        'bundle' => 'entity_test',
-        'uid' => $this->testAutocreateUser->id(),
-      ),
-    );
-
-    $form['single_no_validate'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#validate_reference' => FALSE,
-    );
-    $form['single_autocreate_no_validate'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#validate_reference' => FALSE,
-      '#autocreate' => array(
-        'bundle' => 'entity_test',
-      ),
-    );
-
-    $form['single_access'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#default_value' => $this->referencedEntities[0],
-    );
-    $form['tags_access'] = array(
-      '#type' => 'entity_autocomplete',
-      '#target_type' => 'entity_test',
-      '#tags' => TRUE,
-      '#default_value' => array($this->referencedEntities[0], $this->referencedEntities[1]),
-    );
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) { }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) { }
-
-  /**
-   * Tests valid entries in the EntityAutocomplete Form API element.
-   */
-  public function testValidEntityAutocompleteElement() {
-    $form_state = (new FormState())
-      ->setValues([
-        'single' => $this->getAutocompleteInput($this->referencedEntities[0]),
-        'single_autocreate' => 'single - autocreated entity label',
-        'single_autocreate_specific_uid' => 'single - autocreated entity label with specific uid',
-        'tags' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[1]),
-        'tags_autocreate' =>
-          $this->getAutocompleteInput($this->referencedEntities[0])
-          . ', tags - autocreated entity label, '
-          . $this->getAutocompleteInput($this->referencedEntities[1]),
-        'tags_autocreate_specific_uid' =>
-          $this->getAutocompleteInput($this->referencedEntities[0])
-          . ', tags - autocreated entity label with specific uid, '
-          . $this->getAutocompleteInput($this->referencedEntities[1]),
-      ]);
-    $form_builder = $this->container->get('form_builder');
-    $form_builder->submitForm($this, $form_state);
-
-    // Valid form state.
-    $this->assertEqual(count($form_state->getErrors()), 0);
-
-    // Test the 'single' element.
-    $this->assertEqual($form_state->getValue('single'), $this->referencedEntities[0]->id());
-
-    // Test the 'single_autocreate' element.
-    $value = $form_state->getValue('single_autocreate');
-    $this->assertEqual($value['entity']->label(), 'single - autocreated entity label');
-    $this->assertEqual($value['entity']->bundle(), 'entity_test');
-    $this->assertEqual($value['entity']->getOwnerId(), $this->testUser->id());
-
-    // Test the 'single_autocreate_specific_uid' element.
-    $value = $form_state->getValue('single_autocreate_specific_uid');
-    $this->assertEqual($value['entity']->label(), 'single - autocreated entity label with specific uid');
-    $this->assertEqual($value['entity']->bundle(), 'entity_test');
-    $this->assertEqual($value['entity']->getOwnerId(), $this->testAutocreateUser->id());
-
-    // Test the 'tags' element.
-    $expected = array(
-      array('target_id' => $this->referencedEntities[0]->id()),
-      array('target_id' => $this->referencedEntities[1]->id()),
-    );
-    $this->assertEqual($form_state->getValue('tags'), $expected);
-
-    // Test the 'single_autocreate' element.
-    $value = $form_state->getValue('tags_autocreate');
-    // First value is an existing entity.
-    $this->assertEqual($value[0]['target_id'], $this->referencedEntities[0]->id());
-    // Second value is an autocreated entity.
-    $this->assertTrue(!isset($value[1]['target_id']));
-    $this->assertEqual($value[1]['entity']->label(), 'tags - autocreated entity label');
-    $this->assertEqual($value[1]['entity']->getOwnerId(), $this->testUser->id());
-    // Third value is an existing entity.
-    $this->assertEqual($value[2]['target_id'], $this->referencedEntities[1]->id());
-
-    // Test the 'tags_autocreate_specific_uid' element.
-    $value = $form_state->getValue('tags_autocreate_specific_uid');
-    // First value is an existing entity.
-    $this->assertEqual($value[0]['target_id'], $this->referencedEntities[0]->id());
-    // Second value is an autocreated entity.
-    $this->assertTrue(!isset($value[1]['target_id']));
-    $this->assertEqual($value[1]['entity']->label(), 'tags - autocreated entity label with specific uid');
-    $this->assertEqual($value[1]['entity']->getOwnerId(), $this->testAutocreateUser->id());
-    // Third value is an existing entity.
-    $this->assertEqual($value[2]['target_id'], $this->referencedEntities[1]->id());
-  }
-
-  /**
-   * Tests invalid entries in the EntityAutocomplete Form API element.
-   */
-  public function testInvalidEntityAutocompleteElement() {
-    $form_builder = $this->container->get('form_builder');
-
-    // Test 'single' with a entity label that doesn't exist
-    $form_state = (new FormState())
-      ->setValues([
-        'single' => 'single - non-existent label',
-      ]);
-    $form_builder->submitForm($this, $form_state);
-    $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
-
-    // Test 'single' with a entity ID that doesn't exist.
-    $form_state = (new FormState())
-      ->setValues([
-        'single' => 'single - non-existent label (42)',
-      ]);
-    $form_builder->submitForm($this, $form_state);
-    $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single'], t('The referenced entity (%type: %id) does not exist.', array('%type' => 'entity_test', '%id' => 42)));
-
-    // Do the same tests as above but on an element with '#validate_reference'
-    // set to FALSE.
-    $form_state = (new FormState())
-      ->setValues([
-        'single_no_validate' => 'single - non-existent label',
-        'single_autocreate_no_validate' => 'single - autocreate non-existent label'
-      ]);
-    $form_builder->submitForm($this, $form_state);
-
-    // The element without 'autocreate' support still has to emit a warning when
-    // the input doesn't end with an entity ID enclosed in parentheses.
-    $this->assertEqual(count($form_state->getErrors()), 1);
-    $this->assertEqual($form_state->getErrors()['single_no_validate'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
-
-    $form_state = (new FormState())
-      ->setValues([
-        'single_no_validate' => 'single - non-existent label (42)',
-        'single_autocreate_no_validate' => 'single - autocreate non-existent label (43)'
-      ]);
-    $form_builder->submitForm($this, $form_state);
-
-    // The input is complete (i.e. contains an entity ID at the end), no errors
-    // are triggered.
-    $this->assertEqual(count($form_state->getErrors()), 0);
-  }
-
-  /**
-   * Tests that access is properly checked by the EntityAutocomplete element.
-   */
-  public function testEntityAutocompleteAccess() {
-    $form_builder = $this->container->get('form_builder');
-    $form = $form_builder->getForm($this);
-
-    // Check that the current user has proper access to view entity labels.
-    $expected = $this->referencedEntities[0]->label() . ' (' . $this->referencedEntities[0]->id() . ')';
-    $this->assertEqual($form['single_access']['#value'], $expected);
-
-    $expected .= ', ' . $this->referencedEntities[1]->label() . ' (' . $this->referencedEntities[1]->id() . ')';
-    $this->assertEqual($form['tags_access']['#value'], $expected);
-
-    // Set up a non-admin user that is *not* allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array(), array()));
-
-    // Rebuild the form.
-    $form = $form_builder->getForm($this);
-
-    $expected = t('- Restricted access -') . ' (' . $this->referencedEntities[0]->id() . ')';
-    $this->assertEqual($form['single_access']['#value'], $expected);
-
-    $expected .= ', ' . t('- Restricted access -') . ' (' . $this->referencedEntities[1]->id() . ')';
-    $this->assertEqual($form['tags_access']['#value'], $expected);
-  }
-
-  /**
-   * Returns an entity label in the format needed by the EntityAutocomplete
-   * element.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   A Drupal entity.
-   *
-   * @return string
-   *   A string that can be used as a value for EntityAutocomplete elements.
-   */
-  protected function getAutocompleteInput(EntityInterface $entity) {
-    return EntityAutocomplete::getEntityLabels(array($entity));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php b/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php
deleted file mode 100644
index 3833476..0000000
--- a/core/modules/system/src/Tests/Entity/EntityAccessControlHandlerTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityAccessControlHandlerTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessibleInterface;
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests the entity access control handler.
- *
- * @group Entity
- */
-class EntityAccessControlHandlerTest extends EntityLanguageTestBase  {
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'url_alias');
-  }
-
-  /**
-   * Asserts entity access correctly grants or denies access.
-   */
-  function assertEntityAccess($ops, AccessibleInterface $object, AccountInterface $account = NULL) {
-    foreach ($ops as $op => $result) {
-      $message = format_string("Entity access returns @result with operation '@op'.", array(
-        '@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
-        '@op' => $op,
-      ));
-
-      $this->assertEqual($result, $object->access($op, $account), $message);
-    }
-  }
-
-  /**
-   * Ensures entity access is properly working.
-   */
-  function testEntityAccess() {
-    // Set up a non-admin user that is allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
-    $entity = entity_create('entity_test', array(
-      'name' => 'test',
-    ));
-
-    // The current user is allowed to view entities.
-    $this->assertEntityAccess(array(
-      'create' => FALSE,
-      'update' => FALSE,
-      'delete' => FALSE,
-      'view' => TRUE,
-    ), $entity);
-
-    // The custom user is not allowed to perform any operation on test entities.
-    $custom_user = $this->createUser();
-    $this->assertEntityAccess(array(
-      'create' => FALSE,
-      'update' => FALSE,
-      'delete' => FALSE,
-      'view' => FALSE,
-    ), $entity, $custom_user);
-  }
-
-  /**
-   * Ensures default entity access is checked when necessary.
-   *
-   * This ensures that the default checkAccess() implementation of the
-   * entity access control handler is considered if hook_entity_access() has not
-   * explicitly forbidden access. Therefore the default checkAccess()
-   * implementation can forbid access, even after access was already explicitly
-   * allowed by hook_entity_access().
-   *
-   * @see \Drupal\entity_test\EntityTestAccessControlHandler::checkAccess()
-   * @see entity_test_entity_access()
-   */
-  function testDefaultEntityAccess() {
-    // Set up a non-admin user that is allowed to view test entities.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
-    $entity = entity_create('entity_test', array(
-        'name' => 'forbid_access',
-      ));
-
-    // The user is denied access to the entity.
-    $this->assertEntityAccess(array(
-        'create' => FALSE,
-        'update' => FALSE,
-        'delete' => FALSE,
-        'view' => FALSE,
-      ), $entity);
-  }
-
-  /**
-   * Ensures that the default handler is used as a fallback.
-   */
-  function testEntityAccessDefaultController() {
-    // The implementation requires that the global user id can be loaded.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2)));
-
-    // Check that the default access control handler is used for entities that don't
-    // have a specific access control handler defined.
-    $handler = $this->container->get('entity.manager')->getAccessControlHandler('entity_test_default_access');
-    $this->assertTrue($handler instanceof EntityAccessControlHandler, 'The default entity handler is used for the entity_test_default_access entity type.');
-
-    $entity = entity_create('entity_test_default_access');
-    $this->assertEntityAccess(array(
-      'create' => FALSE,
-      'update' => FALSE,
-      'delete' => FALSE,
-      'view' => FALSE,
-    ), $entity);
-  }
-
-  /**
-   * Ensures entity access for entity translations is properly working.
-   */
-  function testEntityTranslationAccess() {
-
-    // Set up a non-admin user that is allowed to view test entity translations.
-    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity translations')));
-
-    // Create two test languages.
-    foreach (array('foo', 'bar') as $langcode) {
-      ConfigurableLanguage::create(array(
-        'id' => $langcode,
-        'label' => $this->randomString(),
-      ))->save();
-    }
-
-    $entity = entity_create('entity_test', array(
-      'name' => 'test',
-      'langcode' => 'foo',
-    ));
-    $entity->save();
-
-    $translation = $entity->addTranslation('bar');
-    $this->assertEntityAccess(array(
-      'view' => TRUE,
-    ), $translation);
-  }
-
-  /**
-   * Tests hook invocations.
-   */
-  public function testHooks() {
-    $state = $this->container->get('state');
-    $entity = entity_create('entity_test', array(
-      'name' => 'test',
-    ));
-
-    // Test hook_entity_create_access() and hook_ENTITY_TYPE_create_access().
-    $entity->access('create');
-    $this->assertEqual($state->get('entity_test_entity_create_access'), TRUE);
-    $this->assertIdentical($state->get('entity_test_entity_create_access_context'), [
-      'entity_type_id' => 'entity_test',
-      'langcode' => LanguageInterface::LANGCODE_DEFAULT,
-    ]);
-    $this->assertEqual($state->get('entity_test_entity_test_create_access'), TRUE);
-
-    // Test hook_entity_access() and hook_ENTITY_TYPE_access().
-    $entity->access('view');
-    $this->assertEqual($state->get('entity_test_entity_access'), TRUE);
-    $this->assertEqual($state->get('entity_test_entity_test_access'), TRUE);
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityAddUITest.php b/core/modules/system/src/Tests/Entity/EntityAddUITest.php
new file mode 100644
index 0000000..0df247a
--- /dev/null
+++ b/core/modules/system/src/Tests/Entity/EntityAddUITest.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Entity\EntityAddUITest.
+ */
+
+namespace Drupal\system\Tests\Entity;
+
+use Drupal\entity_test\Entity\EntityTestBundle;
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\entity_test\Entity\EntityTestWithBundle;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the /add and /add/{type} controllers.
+ *
+ * @group entity
+ */
+class EntityAddUITest extends WebTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $web_user = $this->drupalCreateUser([
+      "administer entity_test_with_bundle content",
+      "administer entity_test content",
+    ]);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the add page for an entity type using bundle entities.
+   */
+  public function testAddPageWithBundleEntities() {
+    $this->drupalGet('/entity_test_with_bundle/add');
+    // No bundles exist, the add bundle message should be present.
+    $this->assertText('There is no test entity bundle yet.');
+    $this->assertLink('Add a new test entity bundle.');
+
+    // One bundle exists, confirm redirection to the add-form.
+    EntityTestBundle::create([
+      'id' => 'test',
+      'label' => 'Test label',
+      'description' => 'My test description',
+    ])->save();
+    $this->drupalGet('/entity_test_with_bundle/add');
+    $this->assertUrl('/entity_test_with_bundle/add/test');
+
+    // Two bundles exist, confirm both are shown.
+    EntityTestBundle::create([
+      'id' => 'test2',
+      'label' => 'Test2 label',
+      'description' => 'My test2 description',
+    ])->save();
+    $this->drupalGet('/entity_test_with_bundle/add');
+
+    $this->assertLink('Test label');
+    $this->assertLink('Test2 label');
+    $this->assertText('My test description');
+    $this->assertText('My test2 description');
+
+    $this->clickLink('Test2 label');
+    $this->drupalGet('/entity_test_with_bundle/add/test2');
+
+    $this->drupalPostForm(NULL, ['name[0][value]' => 'test name'], t('Save'));
+    $entity = EntityTestWithBundle::load(1);
+    $this->assertEqual('test name', $entity->label());
+  }
+
+  /**
+   * Tests the add page for an entity type not using bundle entities.
+   */
+  public function testAddPageWithoutBundleEntities() {
+    entity_test_create_bundle('test', 'Test label', 'entity_test_mul');
+    // Delete the default bundle, so that we can rely on our own.
+    entity_test_delete_bundle('entity_test_mul', 'entity_test_mul');
+
+    // One bundle exists, confirm redirection to the add-form.
+    $this->drupalGet('/entity_test_mul/add');
+    $this->assertUrl('/entity_test_mul/add/test');
+
+    // Two bundles exist, confirm both are shown.
+    entity_test_create_bundle('test2', 'Test2 label', 'entity_test_mul');
+    $this->drupalGet('/entity_test_mul/add');
+
+    $this->assertLink('Test label');
+    $this->assertLink('Test2 label');
+
+    $this->clickLink('Test2 label');
+    $this->drupalGet('/entity_test_mul/add/test2');
+
+    $this->drupalPostForm(NULL, ['name[0][value]' => 'test name'], t('Save'));
+    $entity = EntityTestMul::load(1);
+    $this->assertEqual('test name', $entity->label());
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Entity/EntityApiTest.php b/core/modules/system/src/Tests/Entity/EntityApiTest.php
deleted file mode 100644
index e8153ce..0000000
--- a/core/modules/system/src/Tests/Entity/EntityApiTest.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityApiTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\user\UserInterface;
-
-/**
- * Tests basic CRUD functionality.
- *
- * @group Entity
- */
-class EntityApiTest extends EntityUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    foreach (entity_test_entity_types() as $entity_type_id) {
-      // The entity_test schema is installed by the parent.
-      if ($entity_type_id != 'entity_test') {
-        $this->installEntitySchema($entity_type_id);
-      }
-    }
-  }
-
-  /**
-   * Tests basic CRUD functionality of the Entity API.
-   */
-  public function testCRUD() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->assertCRUD($entity_type, $this->createUser());
-    }
-  }
-
-  /**
-   * Executes a test set for a defined entity type and user.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   * @param \Drupal\user\UserInterface $user1
-   *   The user to run the tests with.
-   */
-  protected function assertCRUD($entity_type, UserInterface $user1) {
-    // Create some test entities.
-    $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->id()));
-    $entity->save();
-    $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->id()));
-    $entity->save();
-    $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => NULL));
-    $entity->save();
-
-    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
-    $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
-
-    // Test loading a single entity.
-    $loaded_entity = entity_load($entity_type, $entity->id());
-    $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type)));
-
-    // Test deleting an entity.
-    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
-    $entities[0]->delete();
-    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
-    $this->assertEqual($entities, array(), format_string('%entity_type: Entity deleted.', array('%entity_type' => $entity_type)));
-
-    // Test updating an entity.
-    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
-    $entities[0]->name->value = 'test3';
-    $entities[0]->save();
-    $entity = entity_load($entity_type, $entities[0]->id());
-    $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', array('%entity_type' => $entity_type)));
-
-    // Try deleting multiple test entities by deleting all.
-    $ids = array_keys(entity_load_multiple($entity_type));
-    entity_delete_multiple($entity_type, $ids);
-
-    $all = entity_load_multiple($entity_type);
-    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
-
-    // Verify that all data got deleted.
-    $definition = \Drupal::entityManager()->getDefinition($entity_type);
-    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $definition->getBaseTable() . '}')->fetchField(), 'Base table was emptied');
-    if ($data_table = $definition->getDataTable()) {
-      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $data_table . '}')->fetchField(), 'Data table was emptied');
-    }
-    if ($revision_table = $definition->getRevisionTable()) {
-      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $revision_table . '}')->fetchField(), 'Data table was emptied');
-    }
-
-    // Test deleting a list of entities not indexed by entity id.
-    $entities = array();
-    $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->id()));
-    $entity->save();
-    $entities['test'] = $entity;
-    $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->id()));
-    $entity->save();
-    $entities['test2'] = $entity;
-    $controller = \Drupal::entityManager()->getStorage($entity_type);
-    $controller->delete($entities);
-
-    // Verify that entities got deleted.
-    $all = entity_load_multiple($entity_type);
-    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
-
-    // Verify that all data got deleted from the tables.
-    $definition = \Drupal::entityManager()->getDefinition($entity_type);
-    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $definition->getBaseTable() . '}')->fetchField(), 'Base table was emptied');
-    if ($data_table = $definition->getDataTable()) {
-      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $data_table . '}')->fetchField(), 'Data table was emptied');
-    }
-    if ($revision_table = $definition->getRevisionTable()) {
-      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $revision_table . '}')->fetchField(), 'Data table was emptied');
-    }
-  }
-
-  /**
-   * Tests that exceptions are thrown when saving or deleting an entity.
-   */
-  public function testEntityStorageExceptionHandling() {
-    $entity = entity_create('entity_test', array('name' => 'test'));
-    try {
-      $GLOBALS['entity_test_throw_exception'] = TRUE;
-      $entity->save();
-      $this->fail('Entity presave EntityStorageException thrown but not caught.');
-    }
-    catch (EntityStorageException $e) {
-      $this->assertEqual($e->getcode(), 1, 'Entity presave EntityStorageException caught.');
-    }
-
-    $entity = entity_create('entity_test', array('name' => 'test2'));
-    try {
-      unset($GLOBALS['entity_test_throw_exception']);
-      $entity->save();
-      $this->pass('Exception presave not thrown and not caught.');
-    }
-    catch (EntityStorageException $e) {
-      $this->assertNotEqual($e->getCode(), 1, 'Entity presave EntityStorageException caught.');
-    }
-
-    $entity = entity_create('entity_test', array('name' => 'test3'));
-    $entity->save();
-    try {
-      $GLOBALS['entity_test_throw_exception'] = TRUE;
-      $entity->delete();
-      $this->fail('Entity predelete EntityStorageException not thrown.');
-    }
-    catch (EntityStorageException $e) {
-      $this->assertEqual($e->getCode(), 2, 'Entity predelete EntityStorageException caught.');
-    }
-
-    unset($GLOBALS['entity_test_throw_exception']);
-    $entity = entity_create('entity_test', array('name' => 'test4'));
-    $entity->save();
-    try {
-      $entity->delete();
-      $this->pass('Entity predelete EntityStorageException not thrown and not caught.');
-    }
-    catch (EntityStorageException $e) {
-      $this->assertNotEqual($e->getCode(), 2, 'Entity predelete EntityStorageException thrown.');
-    }
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php b/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
deleted file mode 100644
index d42a07a..0000000
--- a/core/modules/system/src/Tests/Entity/EntityAutocompleteTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityAutocompleteTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\Crypt;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Tags;
-use Drupal\Core\Site\Settings;
-use Drupal\system\Controller\EntityAutocompleteController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-
-/**
- * Tests the autocomplete functionality.
- *
- * @group Entity
- */
-class EntityAutocompleteTest extends EntityUnitTestBase {
-
-  /**
-   * The entity type used in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'entity_test';
-
-  /**
-   * The bundle used in this test.
-   *
-   * @var string
-   */
-  protected $bundle = 'entity_test';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['key_value']);
-  }
-
-  /**
-   * Tests autocompletion edge cases with slashes in the names.
-   */
-  function testEntityReferenceAutocompletion() {
-    // Add an entity with a slash in its name.
-    $entity_1 = entity_create($this->entityType, array('name' => '10/16/2011'));
-    $entity_1->save();
-
-    // Add another entity that differs after the slash character.
-    $entity_2 = entity_create($this->entityType, array('name' => '10/17/2011'));
-    $entity_2->save();
-
-    // Add another entity that has both a comma, a slash and markup.
-    $entity_3 = entity_create($this->entityType, array('name' => 'label with, and / <em>test</em>'));
-    $entity_3->save();
-
-    // Try to autocomplete a entity label that matches both entities.
-    // We should get both entities in a JSON encoded string.
-    $input = '10/';
-    $data = $this->getAutocompleteResult($input);
-    $this->assertIdentical($data[0]['label'], Html::escape($entity_1->name->value), 'Autocomplete returned the first matching entity');
-    $this->assertIdentical($data[1]['label'], Html::escape($entity_2->name->value), 'Autocomplete returned the second matching entity');
-
-    // Try to autocomplete a entity label that matches the first entity.
-    // We should only get the first entity in a JSON encoded string.
-    $input = '10/16';
-    $data = $this->getAutocompleteResult($input);
-    $target = array(
-      'value' => $entity_1->name->value . ' (1)',
-      'label' => Html::escape($entity_1->name->value),
-    );
-    $this->assertIdentical(reset($data), $target, 'Autocomplete returns only the expected matching entity.');
-
-    // Try to autocomplete a entity label that matches the second entity, and
-    // the first entity  is already typed in the autocomplete (tags) widget.
-    $input = $entity_1->name->value . ' (1), 10/17';
-    $data = $this->getAutocompleteResult($input);
-    $this->assertIdentical($data[0]['label'], Html::escape($entity_2->name->value), 'Autocomplete returned the second matching entity');
-
-    // Try to autocomplete a entity label with both a comma, a slash and markup.
-    $input = '"label with, and / <em>';
-    $data = $this->getAutocompleteResult($input);
-    $n = $entity_3->name->value . ' (3)';
-    // Entity labels containing commas or quotes must be wrapped in quotes.
-    $n = Tags::encode($n);
-    $target = array(
-      'value' => $n,
-      'label' => Html::escape($entity_3->name->value),
-    );
-    $this->assertIdentical(reset($data), $target, 'Autocomplete returns an entity label containing a comma and a slash.');
-  }
-
-  /**
-   * Tests that missing or invalid selection setting key are handled correctly.
-   */
-  public function testSelectionSettingsHandling() {
-    $entity_reference_controller = EntityAutocompleteController::create($this->container);
-    $request = Request::create('entity_reference_autocomplete/' . $this->entityType . '/default');
-    $request->query->set('q', $this->randomString());
-
-    try {
-      // Pass an invalid selection settings key (i.e. one that does not exist
-      // in the key/value store).
-      $selection_settings_key = $this->randomString();
-      $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key);
-
-      $this->fail('Non-existent selection settings key throws an exception.');
-    }
-    catch (AccessDeniedHttpException $e) {
-      $this->pass('Non-existent selection settings key throws an exception.');
-    }
-
-    try {
-      // Generate a valid hash key but store a modified settings array.
-      $selection_settings = [];
-      $selection_settings_key = Crypt::hmacBase64(serialize($selection_settings) . $this->entityType . 'default', Settings::getHashSalt());
-
-      $selection_settings[$this->randomMachineName()] = $this->randomString();
-      \Drupal::keyValue('entity_autocomplete')->set($selection_settings_key, $selection_settings);
-
-      $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key);
-    }
-    catch (AccessDeniedHttpException $e) {
-      if ($e->getMessage() == 'Invalid selection settings key.') {
-        $this->pass('Invalid selection settings key throws an exception.');
-      }
-      else {
-        $this->fail('Invalid selection settings key throws an exception.');
-      }
-    }
-
-  }
-
-  /**
-   * Returns the result of an Entity reference autocomplete request.
-   *
-   * @param string $input
-   *   The label of the entity to query by.
-   *
-   * @return mixed
-   *  The JSON value encoded in its appropriate PHP type.
-   */
-  protected function getAutocompleteResult($input) {
-    $request = Request::create('entity_reference_autocomplete/' . $this->entityType . '/default');
-    $request->query->set('q', $input);
-
-    $selection_settings = [];
-    $selection_settings_key = Crypt::hmacBase64(serialize($selection_settings) . $this->entityType . 'default', Settings::getHashSalt());
-    \Drupal::keyValue('entity_autocomplete')->set($selection_settings_key, $selection_settings);
-
-    $entity_reference_controller = EntityAutocompleteController::create($this->container);
-    $result = $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key)->getContent();
-
-    return Json::decode($result);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php b/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php
deleted file mode 100644
index f1385ca..0000000
--- a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityBundleFieldTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-/**
- * Tests adding a custom bundle field.
- *
- * @group Entity
- */
-class EntityBundleFieldTest extends EntityUnitTestBase  {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('entity_schema_test');
-
-  /**
-   * The module handler.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * The database connection used.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('user', array('users_data'));
-    $this->installSchema('system', array('router'));
-    $this->moduleHandler = $this->container->get('module_handler');
-    $this->database = $this->container->get('database');
-  }
-
-  /**
-   * Tests making use of a custom bundle field.
-   */
-  public function testCustomBundleFieldUsage() {
-    entity_test_create_bundle('custom');
-
-    // Check that an entity with bundle entity_test does not have the custom
-    // field.
-    $storage = $this->entityManager->getStorage('entity_test');
-    $entity = $storage->create([
-      'type' => 'entity_test',
-    ]);
-    $this->assertFalse($entity->hasField('custom_bundle_field'));
-
-    // Check that the custom bundle has the defined custom field and check
-    // saving and deleting of custom field data.
-    $entity = $storage->create([
-      'type' => 'custom',
-    ]);
-    $this->assertTrue($entity->hasField('custom_bundle_field'));
-
-    // Ensure that the field exists in the field map.
-    $field_map = \Drupal::entityManager()->getFieldMap();
-    $this->assertEqual($field_map['entity_test']['custom_bundle_field'], ['type' => 'string', 'bundles' => ['custom' => 'custom']]);
-
-    $entity->custom_bundle_field->value = 'swanky';
-    $entity->save();
-    $storage->resetCache();
-    $entity = $storage->load($entity->id());
-    $this->assertEqual($entity->custom_bundle_field->value, 'swanky', 'Entity was saved correctly');
-
-    $entity->custom_bundle_field->value = 'cozy';
-    $entity->save();
-    $storage->resetCache();
-    $entity = $storage->load($entity->id());
-    $this->assertEqual($entity->custom_bundle_field->value, 'cozy', 'Entity was updated correctly.');
-
-    $entity->delete();
-    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-    $table_mapping = $storage->getTableMapping();
-    $table = $table_mapping->getDedicatedDataTableName($entity->getFieldDefinition('custom_bundle_field'));
-    $result = $this->database->select($table, 'f')
-      ->fields('f')
-      ->condition('f.entity_id', $entity->id())
-      ->execute();
-    $this->assertFalse($result->fetchAssoc(), 'Field data has been deleted');
-
-    // Create another entity to test that values are marked as deleted when a
-    // bundle is deleted.
-    $entity = $storage->create(['type' => 'custom', 'custom_bundle_field' => 'new']);
-    $entity->save();
-    entity_test_delete_bundle('custom');
-
-    $table = $table_mapping->getDedicatedDataTableName($entity->getFieldDefinition('custom_bundle_field'));
-    $result = $this->database->select($table, 'f')
-      ->condition('f.entity_id', $entity->id())
-      ->condition('deleted', 1)
-      ->countQuery()
-      ->execute();
-    $this->assertEqual(1, $result->fetchField(), 'Field data has been deleted');
-
-    // Ensure that the field no longer exists in the field map.
-    $field_map = \Drupal::entityManager()->getFieldMap();
-    $this->assertFalse(isset($field_map['entity_test']['custom_bundle_field']));
-
-    // @todo Test field purge and table deletion once supported. See
-    //   https://www.drupal.org/node/2282119.
-    // $this->assertFalse($this->database->schema()->tableExists($table), 'Custom field table was deleted');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index dd35bbd..2c712b1 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -73,19 +73,19 @@ protected function setUp() {
     if ($this->entity->getEntityType()->get('field_ui_base_route')) {
       // Add field, so we can modify the field storage and field entities to
       // verify that changes to those indeed clear cache tags.
-      entity_create('field_storage_config', array(
+      FieldStorageConfig::create(array(
         'field_name' => 'configurable_field',
         'entity_type' => $this->entity->getEntityTypeId(),
         'type' => 'test_field',
         'settings' => array(),
       ))->save();
-      entity_create('field_config', array(
+      FieldConfig::create([
         'entity_type' => $this->entity->getEntityTypeId(),
         'bundle' => $this->entity->bundle(),
         'field_name' => 'configurable_field',
         'label' => 'Configurable field',
         'settings' => array(),
-      ))->save();
+      ])->save();
 
       // Reload the entity now that a new field has been added to it.
       $storage = $this->container
@@ -246,7 +246,7 @@ protected function createReferenceTestEntities($referenced_entity) {
 
     // Add a field of the given type to the given entity type's "foo" bundle.
     $field_name = $referenced_entity->getEntityTypeId() . '_reference';
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'type' => 'entity_reference',
@@ -255,7 +255,7 @@ protected function createReferenceTestEntities($referenced_entity) {
         'target_type' => $referenced_entity->getEntityTypeId(),
       ),
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => $entity_type,
       'bundle' => $bundle,
@@ -269,7 +269,7 @@ protected function createReferenceTestEntities($referenced_entity) {
           'auto_create' => FALSE,
         ),
       ),
-    ))->save();
+    ])->save();
     if (!$this->entity->getEntityType()->hasHandlerClass('view_builder')) {
       entity_get_display($entity_type, $bundle, 'full')
         ->setComponent($field_name, array(
@@ -291,20 +291,24 @@ protected function createReferenceTestEntities($referenced_entity) {
 
     // Create an entity that does reference the entity being tested.
     $label_key = \Drupal::entityManager()->getDefinition($entity_type)->getKey('label');
-    $referencing_entity = entity_create($entity_type, array(
-      $label_key => 'Referencing ' . $entity_type,
-      'status' => 1,
-      'type' => $bundle,
-      $field_name => array('target_id' => $referenced_entity->id()),
-    ));
+    $referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        $label_key => 'Referencing ' . $entity_type,
+        'status' => 1,
+        'type' => $bundle,
+        $field_name => array('target_id' => $referenced_entity->id()),
+      ));
     $referencing_entity->save();
 
     // Create an entity that does not reference the entity being tested.
-    $non_referencing_entity = entity_create($entity_type, array(
-      $label_key => 'Non-referencing ' . $entity_type,
-      'status' => 1,
-      'type' => $bundle,
-    ));
+    $non_referencing_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        $label_key => 'Non-referencing ' . $entity_type,
+        'status' => 1,
+        'type' => $bundle,
+      ));
     $non_referencing_entity->save();
 
     return array(
diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
deleted file mode 100644
index 2885d47..0000000
--- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityCrudHookTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\comment\Entity\Comment;
-use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\block\Entity\Block;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\node\Entity\Node;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\user\Entity\User;
-use Drupal\file\Entity\File;
-
-/**
- * Tests the invocation of hooks when creating, inserting, loading, updating or
- * deleting an entity.
- *
- * Tested hooks are:
- * - hook_entity_insert() and hook_ENTITY_TYPE_insert()
- * - hook_entity_load() and hook_ENTITY_TYPE_load()
- * - hook_entity_update() and hook_ENTITY_TYPE_update()
- * - hook_entity_predelete() and hook_ENTITY_TYPE_predelete()
- * - hook_entity_delete() and hook_ENTITY_TYPE_delete()
- *
- * These hooks are each tested for several entity types.
- *
- * @group Entity
- */
-class EntityCrudHookTest extends EntityUnitTestBase {
-
-  use CommentTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'block_test', 'entity_crud_hook_test', 'file', 'taxonomy', 'node', 'comment');
-
-  protected $ids = array();
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('user', array('users_data'));
-    $this->installSchema('file', array('file_usage'));
-    $this->installSchema('node', array('node_access'));
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installConfig(['node', 'comment']);
-  }
-
-  /**
-   * Checks the order of CRUD hook execution messages.
-   *
-   * entity_crud_hook_test.module implements all core entity CRUD hooks and
-   * stores a message for each in $GLOBALS['entity_crud_hook_test'].
-   *
-   * @param $messages
-   *   An array of plain-text messages in the order they should appear.
-   */
-  protected function assertHookMessageOrder($messages) {
-    $positions = array();
-    foreach ($messages as $message) {
-      // Verify that each message is found and record its position.
-      $position = array_search($message, $GLOBALS['entity_crud_hook_test']);
-      if ($this->assertTrue($position !== FALSE, $message)) {
-        $positions[] = $position;
-      }
-    }
-
-    // Sort the positions and ensure they remain in the same order.
-    $sorted = $positions;
-    sort($sorted);
-    $this->assertTrue($sorted == $positions, 'The hook messages appear in the correct order.');
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on blocks.
-   */
-  public function testBlockHooks() {
-    $entity = entity_create('block', array(
-      'id' => 'stark_test_html',
-      'plugin' => 'test_html',
-      'theme' => 'stark',
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_block_create called',
-      'entity_crud_hook_test_entity_create called for type block',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $entity->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_block_presave called',
-      'entity_crud_hook_test_entity_presave called for type block',
-      'entity_crud_hook_test_block_insert called',
-      'entity_crud_hook_test_entity_insert called for type block',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $entity = Block::load($entity->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type block',
-      'entity_crud_hook_test_block_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $entity->label = 'New label';
-    $entity->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_block_presave called',
-      'entity_crud_hook_test_entity_presave called for type block',
-      'entity_crud_hook_test_block_update called',
-      'entity_crud_hook_test_entity_update called for type block',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $entity->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_block_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type block',
-      'entity_crud_hook_test_block_delete called',
-      'entity_crud_hook_test_entity_delete called for type block',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on comments.
-   */
-  public function testCommentHooks() {
-    $account = $this->createUser();
-    entity_create('node_type', array(
-      'type' => 'article',
-      'name' => 'Article',
-    ))->save();
-    $this->addDefaultCommentField('node', 'article', 'comment', CommentItemInterface::OPEN);
-
-    $node = entity_create('node', array(
-      'uid' => $account->id(),
-      'type' => 'article',
-      'title' => 'Test node',
-      'status' => 1,
-      'promote' => 0,
-      'sticky' => 0,
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'created' => REQUEST_TIME,
-      'changed' => REQUEST_TIME,
-    ));
-    $node->save();
-    $nid = $node->id();
-    $GLOBALS['entity_crud_hook_test'] = array();
-
-    $comment = entity_create('comment', array(
-      'cid' => NULL,
-      'pid' => 0,
-      'entity_id' => $nid,
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'uid' => $account->id(),
-      'subject' => 'Test comment',
-      'created' => REQUEST_TIME,
-      'changed' => REQUEST_TIME,
-      'status' => 1,
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_comment_create called',
-      'entity_crud_hook_test_entity_create called for type comment',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $comment->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_comment_presave called',
-      'entity_crud_hook_test_entity_presave called for type comment',
-      'entity_crud_hook_test_comment_insert called',
-      'entity_crud_hook_test_entity_insert called for type comment',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $comment = Comment::load($comment->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type comment',
-      'entity_crud_hook_test_comment_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $comment->setSubject('New subject');
-    $comment->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_comment_presave called',
-      'entity_crud_hook_test_entity_presave called for type comment',
-      'entity_crud_hook_test_comment_update called',
-      'entity_crud_hook_test_entity_update called for type comment',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $comment->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_comment_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type comment',
-      'entity_crud_hook_test_comment_delete called',
-      'entity_crud_hook_test_entity_delete called for type comment',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on files.
-   */
-  public function testFileHooks() {
-    $this->installEntitySchema('file');
-
-    $url = 'public://entity_crud_hook_test.file';
-    file_put_contents($url, 'Test test test');
-    $file = entity_create('file', array(
-      'fid' => NULL,
-      'uid' => 1,
-      'filename' => 'entity_crud_hook_test.file',
-      'uri' => $url,
-      'filemime' => 'text/plain',
-      'filesize' => filesize($url),
-      'status' => 1,
-      'created' => REQUEST_TIME,
-      'changed' => REQUEST_TIME,
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_file_create called',
-      'entity_crud_hook_test_entity_create called for type file',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $file->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_file_presave called',
-      'entity_crud_hook_test_entity_presave called for type file',
-      'entity_crud_hook_test_file_insert called',
-      'entity_crud_hook_test_entity_insert called for type file',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $file = File::load($file->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type file',
-      'entity_crud_hook_test_file_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $file->setFilename('new.entity_crud_hook_test.file');
-    $file->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_file_presave called',
-      'entity_crud_hook_test_entity_presave called for type file',
-      'entity_crud_hook_test_file_update called',
-      'entity_crud_hook_test_entity_update called for type file',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $file->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_file_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type file',
-      'entity_crud_hook_test_file_delete called',
-      'entity_crud_hook_test_entity_delete called for type file',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on nodes.
-   */
-  public function testNodeHooks() {
-    $account = $this->createUser();
-
-    $node = entity_create('node', array(
-      'uid' => $account->id(),
-      'type' => 'article',
-      'title' => 'Test node',
-      'status' => 1,
-      'promote' => 0,
-      'sticky' => 0,
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'created' => REQUEST_TIME,
-      'changed' => REQUEST_TIME,
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_node_create called',
-      'entity_crud_hook_test_entity_create called for type node',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $node->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_node_presave called',
-      'entity_crud_hook_test_entity_presave called for type node',
-      'entity_crud_hook_test_node_insert called',
-      'entity_crud_hook_test_entity_insert called for type node',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $node = Node::load($node->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type node',
-      'entity_crud_hook_test_node_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $node->title = 'New title';
-    $node->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_node_presave called',
-      'entity_crud_hook_test_entity_presave called for type node',
-      'entity_crud_hook_test_node_update called',
-      'entity_crud_hook_test_entity_update called for type node',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $node->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_node_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type node',
-      'entity_crud_hook_test_node_delete called',
-      'entity_crud_hook_test_entity_delete called for type node',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on taxonomy terms.
-   */
-  public function testTaxonomyTermHooks() {
-    $this->installEntitySchema('taxonomy_term');
-
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
-      'name' => 'Test vocabulary',
-      'vid' => 'test',
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'description' => NULL,
-      'module' => 'entity_crud_hook_test',
-    ));
-    $vocabulary->save();
-    $GLOBALS['entity_crud_hook_test'] = array();
-
-    $term = entity_create('taxonomy_term', array(
-      'vid' => $vocabulary->id(),
-      'name' => 'Test term',
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'description' => NULL,
-      'format' => 1,
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_term_create called',
-      'entity_crud_hook_test_entity_create called for type taxonomy_term',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $term->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_term_presave called',
-      'entity_crud_hook_test_entity_presave called for type taxonomy_term',
-      'entity_crud_hook_test_taxonomy_term_insert called',
-      'entity_crud_hook_test_entity_insert called for type taxonomy_term',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $term = Term::load($term->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_term',
-      'entity_crud_hook_test_taxonomy_term_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $term->setName('New name');
-    $term->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_term_presave called',
-      'entity_crud_hook_test_entity_presave called for type taxonomy_term',
-      'entity_crud_hook_test_taxonomy_term_update called',
-      'entity_crud_hook_test_entity_update called for type taxonomy_term',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $term->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_term_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type taxonomy_term',
-      'entity_crud_hook_test_taxonomy_term_delete called',
-      'entity_crud_hook_test_entity_delete called for type taxonomy_term',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on taxonomy vocabularies.
-   */
-  public function testTaxonomyVocabularyHooks() {
-    $this->installEntitySchema('taxonomy_term');
-
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
-      'name' => 'Test vocabulary',
-      'vid' => 'test',
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'description' => NULL,
-      'module' => 'entity_crud_hook_test',
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_vocabulary_create called',
-      'entity_crud_hook_test_entity_create called for type taxonomy_vocabulary',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $vocabulary->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_vocabulary_presave called',
-      'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
-      'entity_crud_hook_test_taxonomy_vocabulary_insert called',
-      'entity_crud_hook_test_entity_insert called for type taxonomy_vocabulary',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $vocabulary = Vocabulary::load($vocabulary->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
-      'entity_crud_hook_test_taxonomy_vocabulary_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $vocabulary->set('name', 'New name');
-    $vocabulary->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_vocabulary_presave called',
-      'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
-      'entity_crud_hook_test_taxonomy_vocabulary_update called',
-      'entity_crud_hook_test_entity_update called for type taxonomy_vocabulary',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $vocabulary->delete();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_taxonomy_vocabulary_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type taxonomy_vocabulary',
-      'entity_crud_hook_test_taxonomy_vocabulary_delete called',
-      'entity_crud_hook_test_entity_delete called for type taxonomy_vocabulary',
-    ));
-  }
-
-  /**
-   * Tests hook invocations for CRUD operations on users.
-   */
-  public function testUserHooks() {
-    $account = entity_create('user', array(
-      'name' => 'Test user',
-      'mail' => 'test@example.com',
-      'created' => REQUEST_TIME,
-      'status' => 1,
-      'language' => 'en',
-    ));
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_user_create called',
-      'entity_crud_hook_test_entity_create called for type user',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $account->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_user_presave called',
-      'entity_crud_hook_test_entity_presave called for type user',
-      'entity_crud_hook_test_user_insert called',
-      'entity_crud_hook_test_entity_insert called for type user',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    User::load($account->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_entity_load called for type user',
-      'entity_crud_hook_test_user_load called',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    $account->name = 'New name';
-    $account->save();
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_user_presave called',
-      'entity_crud_hook_test_entity_presave called for type user',
-      'entity_crud_hook_test_user_update called',
-      'entity_crud_hook_test_entity_update called for type user',
-    ));
-
-    $GLOBALS['entity_crud_hook_test'] = array();
-    user_delete($account->id());
-
-    $this->assertHookMessageOrder(array(
-      'entity_crud_hook_test_user_predelete called',
-      'entity_crud_hook_test_entity_predelete called for type user',
-      'entity_crud_hook_test_user_delete called',
-      'entity_crud_hook_test_entity_delete called for type user',
-    ));
-  }
-
-  /**
-   * Tests rollback from failed entity save.
-   */
-  function testEntityRollback() {
-    // Create a block.
-    try {
-      entity_create('entity_test', array('name' => 'fail_insert'))->save();
-      $this->fail('Expected exception has not been thrown.');
-    }
-    catch (\Exception $e) {
-      $this->pass('Expected exception has been thrown.');
-    }
-
-    if (Database::getConnection()->supportsTransactions()) {
-      // Check that the block does not exist in the database.
-      $ids = \Drupal::entityQuery('entity_test')->condition('name', 'fail_insert')->execute();
-      $this->assertTrue(empty($ids), 'Transactions supported, and entity not found in database.');
-    }
-    else {
-      // Check that the block exists in the database.
-      $ids = \Drupal::entityQuery('entity_test')->condition('name', 'fail_insert')->execute();
-      $this->assertFalse(empty($ids), 'Transactions not supported, and entity found in database.');
-    }
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
deleted file mode 100644
index a9b86b9..0000000
--- a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php
+++ /dev/null
@@ -1,813 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityDefinitionUpdateTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\DatabaseExceptionWrapper;
-use Drupal\Core\Database\IntegrityConstraintViolationException;
-use Drupal\Core\Entity\ContentEntityType;
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\Core\Entity\EntityTypeEvents;
-use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldStorageDefinitionEvents;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\entity_test\Entity\EntityTestUpdate;
-
-/**
- * Tests EntityDefinitionUpdateManager functionality.
- *
- * @group Entity
- */
-class EntityDefinitionUpdateTest extends EntityUnitTestBase {
-
-  use EntityDefinitionTestTrait;
-
-  /**
-   * The entity definition update manager.
-   *
-   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
-   */
-  protected $entityDefinitionUpdateManager;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
-    $this->database = $this->container->get('database');
-
-    // Install every entity type's schema that wasn't installed in the parent
-    // method.
-    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
-      $this->installEntitySchema($entity_type_id);
-    }
-  }
-
-  /**
-   * Tests that new entity type definitions are correctly handled.
-   */
-  public function testNewEntityType() {
-    $entity_type_id = 'entity_test_new';
-    $schema = $this->database->schema();
-
-    // Check that the "entity_test_new" is not defined.
-    $entity_types = $this->entityManager->getDefinitions();
-    $this->assertFalse(isset($entity_types[$entity_type_id]), 'The "entity_test_new" entity type does not exist.');
-    $this->assertFalse($schema->tableExists($entity_type_id), 'Schema for the "entity_test_new" entity type does not exist.');
-
-    // Check that the "entity_test_new" is now defined and the related schema
-    // has been created.
-    $this->enableNewEntityType();
-    $entity_types = $this->entityManager->getDefinitions();
-    $this->assertTrue(isset($entity_types[$entity_type_id]), 'The "entity_test_new" entity type exists.');
-    $this->assertTrue($schema->tableExists($entity_type_id), 'Schema for the "entity_test_new" entity type has been created.');
-  }
-
-  /**
-   * Tests when no definition update is needed.
-   */
-  public function testNoUpdates() {
-    // Ensure that the definition update manager reports no updates.
-    $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that no updates are needed.');
-    $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), array(), 'EntityDefinitionUpdateManager reports an empty change summary.');
-
-    // Ensure that applyUpdates() runs without error (it's not expected to do
-    // anything when there aren't updates).
-    $this->entityDefinitionUpdateManager->applyUpdates();
-  }
-
-  /**
-   * Tests updating entity schema when there are no existing entities.
-   */
-  public function testEntityTypeUpdateWithoutData() {
-    // The 'entity_test_update' entity type starts out non-revisionable, so
-    // ensure the revision table hasn't been created during setUp().
-    $this->assertFalse($this->database->schema()->tableExists('entity_test_update_revision'), 'Revision table not created for entity_test_update.');
-
-    // Update it to be revisionable and ensure the definition update manager
-    // reports that an update is needed.
-    $this->updateEntityTypeToRevisionable();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.');
-
-    // Run the update and ensure the revision table is created.
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->tableExists('entity_test_update_revision'), 'Revision table created for entity_test_update.');
-  }
-
-  /**
-   * Tests updating entity schema when there are existing entities.
-   */
-  public function testEntityTypeUpdateWithData() {
-    // Save an entity.
-    $this->entityManager->getStorage('entity_test_update')->create()->save();
-
-    // Update the entity type to be revisionable and try to apply the update.
-    // It's expected to throw an exception.
-    $this->updateEntityTypeToRevisionable();
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail('EntityStorageException thrown when trying to apply an update that requires data migration.');
-    }
-    catch (EntityStorageException $e) {
-      $this->pass('EntityStorageException thrown when trying to apply an update that requires data migration.');
-    }
-  }
-
-  /**
-   * Tests creating, updating, and deleting a base field if no entities exist.
-   */
-  public function testBaseFieldCreateUpdateDeleteWithoutData() {
-    // Add a base field, ensure the update manager reports it, and the update
-    // creates its schema.
-    $this->addBaseField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Create the %field_name field.', array('%field_name' => t('A new base field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.');
-
-    // Add an index on the base field, ensure the update manager reports it,
-    // and the update creates it.
-    $this->addBaseFieldIndex();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %field_name field.', array('%field_name' => t('A new base field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index created.');
-
-    // Remove the above index, ensure the update manager reports it, and the
-    // update deletes it.
-    $this->removeBaseFieldIndex();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %field_name field.', array('%field_name' => t('A new base field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index deleted.');
-
-    // Update the type of the base field from 'string' to 'text', ensure the
-    // update manager reports it, and the update adjusts the schema
-    // accordingly.
-    $this->modifyBaseField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %field_name field.', array('%field_name' => t('A new base field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Original column deleted in shared table for new_base_field.');
-    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__value'), 'Value column created in shared table for new_base_field.');
-    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__format'), 'Format column created in shared table for new_base_field.');
-
-    // Remove the base field, ensure the update manager reports it, and the
-    // update deletes the schema.
-    $this->removeBaseField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Delete the %field_name field.', array('%field_name' => t('A new base field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_value'), 'Value column deleted from shared table for new_base_field.');
-    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_format'), 'Format column deleted from shared table for new_base_field.');
-  }
-
-  /**
-   * Tests creating, updating, and deleting a bundle field if no entities exist.
-   */
-  public function testBundleFieldCreateUpdateDeleteWithoutData() {
-    // Add a bundle field, ensure the update manager reports it, and the update
-    // creates its schema.
-    $this->addBundleField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Create the %field_name field.', array('%field_name' => t('A new bundle field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.');
-
-    // Update the type of the base field from 'string' to 'text', ensure the
-    // update manager reports it, and the update adjusts the schema
-    // accordingly.
-    $this->modifyBundleField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %field_name field.', array('%field_name' => t('A new bundle field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update__new_bundle_field', 'new_bundle_field_format'), 'Format column created in dedicated table for new_base_field.');
-
-    // Remove the bundle field, ensure the update manager reports it, and the
-    // update deletes the schema.
-    $this->removeBundleField();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Delete the %field_name field.', array('%field_name' => t('A new bundle field'))),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.');
-  }
-
-  /**
-   * Tests creating and deleting a base field if entities exist.
-   *
-   * This tests deletion when there are existing entities, but not existing data
-   * for the field being deleted.
-   *
-   * @see testBaseFieldDeleteWithExistingData()
-   */
-  public function testBaseFieldCreateDeleteWithExistingEntities() {
-    // Save an entity.
-    $name = $this->randomString();
-    $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
-    $entity->save();
-
-    // Add a base field and run the update. Ensure the base field's column is
-    // created and the prior saved entity data is still there.
-    $this->addBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $schema_handler = $this->database->schema();
-    $this->assertTrue($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.');
-    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
-    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.');
-
-    // Remove the base field and run the update. Ensure the base field's column
-    // is deleted and the prior saved entity data is still there.
-    $this->removeBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column deleted from shared table for new_base_field.');
-    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
-    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.');
-
-    // Add a base field with a required property and run the update. Ensure
-    // 'not null' is not applied and thus no exception is thrown.
-    $this->addBaseField('shape_required');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $assert = $schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && $schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
-    $this->assertTrue($assert, 'Columns created in shared table for new_base_field.');
-
-    // Recreate the field after emptying the base table and check that its
-    // columns are not 'not null'.
-    // @todo Revisit this test when allowing for required storage field
-    //   definitions. See https://www.drupal.org/node/2390495.
-    $entity->delete();
-    $this->removeBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $assert = !$schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && !$schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
-    $this->assert($assert, 'Columns removed from the shared table for new_base_field.');
-    $this->addBaseField('shape_required');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $assert = $schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && $schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
-    $this->assertTrue($assert, 'Columns created again in shared table for new_base_field.');
-    $entity = $storage->create(array('name' => $name));
-    $entity->save();
-    $this->pass('The new_base_field columns are still nullable');
-  }
-
-  /**
-   * Tests creating and deleting a bundle field if entities exist.
-   *
-   * This tests deletion when there are existing entities, but not existing data
-   * for the field being deleted.
-   *
-   * @see testBundleFieldDeleteWithExistingData()
-   */
-  public function testBundleFieldCreateDeleteWithExistingEntities() {
-    // Save an entity.
-    $name = $this->randomString();
-    $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
-    $entity->save();
-
-    // Add a bundle field and run the update. Ensure the bundle field's table
-    // is created and the prior saved entity data is still there.
-    $this->addBundleField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $schema_handler = $this->database->schema();
-    $this->assertTrue($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.');
-    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
-    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.');
-
-    // Remove the base field and run the update. Ensure the bundle field's
-    // table is deleted and the prior saved entity data is still there.
-    $this->removeBundleField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.');
-    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
-    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.');
-
-    // Test that required columns are created as 'not null'.
-    $this->addBundleField('shape_required');
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $message = 'The new_bundle_field_shape column is not nullable.';
-    $values = array(
-      'bundle' => $entity->bundle(),
-      'deleted'=> 0,
-      'entity_id' => $entity->id(),
-      'revision_id' => $entity->id(),
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      'delta' => 0,
-      'new_bundle_field_color' => $this->randomString(),
-    );
-    try {
-      // Try to insert a record without providing a value for the 'not null'
-      // column. This should fail.
-      $this->database->insert('entity_test_update__new_bundle_field')
-        ->fields($values)
-        ->execute();
-      $this->fail($message);
-    }
-    catch (\RuntimeException $e) {
-      if ($e instanceof DatabaseExceptionWrapper || $e instanceof IntegrityConstraintViolationException) {
-        // Now provide a value for the 'not null' column. This is expected to
-        // succeed.
-        $values['new_bundle_field_shape'] = $this->randomString();
-        $this->database->insert('entity_test_update__new_bundle_field')
-          ->fields($values)
-          ->execute();
-        $this->pass($message);
-      } else {
-        // Keep throwing it.
-        throw $e;
-      }
-    }
-  }
-
-  /**
-   * Tests deleting a base field when it has existing data.
-   */
-  public function testBaseFieldDeleteWithExistingData() {
-    // Add the base field and run the update.
-    $this->addBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    // Save an entity with the base field populated.
-    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
-
-    // Remove the base field and apply updates. It's expected to throw an
-    // exception.
-    // @todo Revisit that expectation once purging is implemented for
-    //   all fields: https://www.drupal.org/node/2282119.
-    $this->removeBaseField();
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
-    }
-  }
-
-  /**
-   * Tests deleting a bundle field when it has existing data.
-   */
-  public function testBundleFieldDeleteWithExistingData() {
-    // Add the bundle field and run the update.
-    $this->addBundleField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    // Save an entity with the bundle field populated.
-    entity_test_create_bundle('custom');
-    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
-
-    // Remove the bundle field and apply updates. It's expected to throw an
-    // exception.
-    // @todo Revisit that expectation once purging is implemented for
-    //   all fields: https://www.drupal.org/node/2282119.
-    $this->removeBundleField();
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
-    }
-  }
-
-  /**
-   * Tests updating a base field when it has existing data.
-   */
-  public function testBaseFieldUpdateWithExistingData() {
-    // Add the base field and run the update.
-    $this->addBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    // Save an entity with the base field populated.
-    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
-
-    // Change the field's field type and apply updates. It's expected to
-    // throw an exception.
-    $this->modifyBaseField();
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
-    }
-  }
-
-  /**
-   * Tests updating a bundle field when it has existing data.
-   */
-  public function testBundleFieldUpdateWithExistingData() {
-    // Add the bundle field and run the update.
-    $this->addBundleField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    // Save an entity with the bundle field populated.
-    entity_test_create_bundle('custom');
-    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
-
-    // Change the field's field type and apply updates. It's expected to
-    // throw an exception.
-    $this->modifyBundleField();
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
-    }
-  }
-
-  /**
-   * Tests creating and deleting a multi-field index when there are no existing entities.
-   */
-  public function testEntityIndexCreateDeleteWithoutData() {
-    // Add an entity index and ensure the update manager reports that as an
-    // update to the entity type.
-    $this->addEntityIndex();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-
-    // Run the update and ensure the new index is created.
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created.');
-
-    // Remove the index and ensure the update manager reports that as an
-    // update to the entity type.
-    $this->removeEntityIndex();
-    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
-    $expected = array(
-      'entity_test_update' => array(
-        t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())),
-      ),
-    );
-    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
-
-    // Run the update and ensure the index is deleted.
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index deleted.');
-
-    // Test that composite indexes are handled correctly when dropping and
-    // re-creating one of their columns.
-    $this->addEntityIndex();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $storage_definition = $this->entityDefinitionUpdateManager->getFieldStorageDefinition('name', 'entity_test_update');
-    $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($storage_definition);
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created.');
-    $this->entityDefinitionUpdateManager->uninstallFieldStorageDefinition($storage_definition);
-    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index deleted.');
-    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('name', 'entity_test_update', 'entity_test', $storage_definition);
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created again.');
-  }
-
-  /**
-   * Tests creating a multi-field index when there are existing entities.
-   */
-  public function testEntityIndexCreateWithData() {
-    // Save an entity.
-    $name = $this->randomString();
-    $entity = $this->entityManager->getStorage('entity_test_update')->create(array('name' => $name));
-    $entity->save();
-
-    // Add an entity index, run the update. Ensure that the index is created
-    // despite having data.
-    $this->addEntityIndex();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index added.');
-  }
-
-  /**
-   * Tests entity type and field storage definition events.
-   */
-  public function testDefinitionEvents() {
-    /** @var \Drupal\entity_test\EntityTestDefinitionSubscriber $event_subscriber */
-    $event_subscriber = $this->container->get('entity_test.definition.subscriber');
-    $event_subscriber->enableEventTracking();
-
-    // Test field storage definition events.
-    $storage_definition = current($this->entityManager->getFieldStorageDefinitions('entity_test_rev'));
-    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::DELETE), 'Entity type delete was not dispatched yet.');
-    $this->entityManager->onFieldStorageDefinitionDelete($storage_definition);
-    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::DELETE), 'Entity type delete event successfully dispatched.');
-    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::CREATE), 'Entity type create was not dispatched yet.');
-    $this->entityManager->onFieldStorageDefinitionCreate($storage_definition);
-    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::CREATE), 'Entity type create event successfully dispatched.');
-    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::UPDATE), 'Entity type update was not dispatched yet.');
-    $this->entityManager->onFieldStorageDefinitionUpdate($storage_definition, $storage_definition);
-    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::UPDATE), 'Entity type update event successfully dispatched.');
-
-    // Test entity type events.
-    $entity_type = $this->entityManager->getDefinition('entity_test_rev');
-    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::CREATE), 'Entity type create was not dispatched yet.');
-    $this->entityManager->onEntityTypeCreate($entity_type);
-    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::CREATE), 'Entity type create event successfully dispatched.');
-    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::UPDATE), 'Entity type update was not dispatched yet.');
-    $this->entityManager->onEntityTypeUpdate($entity_type, $entity_type);
-    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::UPDATE), 'Entity type update event successfully dispatched.');
-    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::DELETE), 'Entity type delete was not dispatched yet.');
-    $this->entityManager->onEntityTypeDelete($entity_type);
-    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::DELETE), 'Entity type delete event successfully dispatched.');
-  }
-
-  /**
-   * Tests updating entity schema and creating a base field.
-   *
-   * This tests updating entity schema and creating a base field at the same
-   * time when there are no existing entities.
-   */
-  public function testEntityTypeSchemaUpdateAndBaseFieldCreateWithoutData() {
-    $this->updateEntityTypeToRevisionable();
-    $this->addBaseField();
-    $message = 'Successfully updated entity schema and created base field at the same time.';
-    // Entity type updates create base fields as well, thus make sure doing both
-    // at the same time does not lead to errors due to the base field being
-    // created twice.
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->pass($message);
-    }
-    catch (\Exception $e) {
-      $this->fail($message);
-      throw $e;
-    }
-  }
-
-  /**
-   * Tests updating entity schema and creating a revisionable base field.
-   *
-   * This tests updating entity schema and creating a revisionable base field
-   * at the same time when there are no existing entities.
-   */
-  public function testEntityTypeSchemaUpdateAndRevisionableBaseFieldCreateWithoutData() {
-    $this->updateEntityTypeToRevisionable();
-    $this->addRevisionableBaseField();
-    $message = 'Successfully updated entity schema and created revisionable base field at the same time.';
-    // Entity type updates create base fields as well, thus make sure doing both
-    // at the same time does not lead to errors due to the base field being
-    // created twice.
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->pass($message);
-    }
-    catch (\Exception $e) {
-      $this->fail($message);
-      throw $e;
-    }
-  }
-
-  /**
-   * Tests applying single updates.
-   */
-  public function testSingleActionCalls() {
-    $db_schema = $this->database->schema();
-
-    // Ensure that a non-existing entity type cannot be installed.
-    $message = 'A non-existing entity type cannot be installed';
-    try {
-      $this->entityDefinitionUpdateManager->installEntityType(new ContentEntityType(['id' => 'foo']));
-      $this->fail($message);
-    }
-    catch (PluginNotFoundException $e) {
-      $this->pass($message);
-    }
-
-    // Ensure that a field cannot be installed on non-existing entity type.
-    $message = 'A field cannot be installed on a non-existing entity type';
-    try {
-      $storage_definition = BaseFieldDefinition::create('string')
-        ->setLabel(t('A new revisionable base field'))
-        ->setRevisionable(TRUE);
-      $this->entityDefinitionUpdateManager->installFieldStorageDefinition('bar', 'foo', 'entity_test', $storage_definition);
-      $this->fail($message);
-    }
-    catch (PluginNotFoundException $e) {
-      $this->pass($message);
-    }
-
-    // Ensure that a non-existing field cannot be installed.
-    $storage_definition = BaseFieldDefinition::create('string')
-      ->setLabel(t('A new revisionable base field'))
-      ->setRevisionable(TRUE);
-    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('bar', 'entity_test_update', 'entity_test', $storage_definition);
-    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'bar'), "A non-existing field cannot be installed.");
-
-    // Ensure that installing an existing entity type is a no-op.
-    $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test_update');
-    $this->entityDefinitionUpdateManager->installEntityType($entity_type);
-    $this->assertTrue($db_schema->tableExists('entity_test_update'), 'Installing an existing entity type is a no-op');
-
-    // Create a new base field.
-    $this->addRevisionableBaseField();
-    $storage_definition = BaseFieldDefinition::create('string')
-      ->setLabel(t('A new revisionable base field'))
-      ->setRevisionable(TRUE);
-    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' does not exist before applying the update.");
-    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $storage_definition);
-    $this->assertTrue($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
-
-    // Ensure that installing an existing field is a no-op.
-    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $storage_definition);
-    $this->assertTrue($db_schema->fieldExists('entity_test_update', 'new_base_field'), 'Installing an existing field is a no-op');
-
-    // Update an existing field schema.
-    $this->modifyBaseField();
-    $storage_definition = BaseFieldDefinition::create('text')
-      ->setName('new_base_field')
-      ->setTargetEntityTypeId('entity_test_update')
-      ->setLabel(t('A new revisionable base field'))
-      ->setRevisionable(TRUE);
-    $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($storage_definition);
-    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'new_base_field'), "Previous schema for 'new_base_field' no longer exists.");
-    $this->assertTrue(
-      $db_schema->fieldExists('entity_test_update', 'new_base_field__value') && $db_schema->fieldExists('entity_test_update', 'new_base_field__format'),
-      "New schema for 'new_base_field' has been created."
-    );
-
-    // Drop an existing field schema.
-    $this->entityDefinitionUpdateManager->uninstallFieldStorageDefinition($storage_definition);
-    $this->assertFalse(
-      $db_schema->fieldExists('entity_test_update', 'new_base_field__value') || $db_schema->fieldExists('entity_test_update', 'new_base_field__format'),
-      "The schema for 'new_base_field' has been dropped."
-    );
-
-    // Make the entity type revisionable.
-    $this->updateEntityTypeToRevisionable();
-    $this->assertFalse($db_schema->tableExists('entity_test_update_revision'), "The 'entity_test_update_revision' does not exist before applying the update.");
-    $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test_update');
-    $keys = $entity_type->getKeys();
-    $keys['revision'] = 'revision_id';
-    $entity_type->set('entity_keys', $keys);
-    $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
-    $this->assertTrue($db_schema->tableExists('entity_test_update_revision'), "The 'entity_test_update_revision' table has been created.");
-  }
-
-  /**
-   * Ensures that a new field and index on a shared table are created.
-   *
-   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::createSharedTableSchema
-   */
-  public function testCreateFieldAndIndexOnSharedTable() {
-    $this->addBaseField();
-    $this->addBaseFieldIndex();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), "New index 'entity_test_update_field__new_base_field' has been created on the 'entity_test_update' table.");
-    // Check index size in for MySQL.
-    if (Database::getConnection()->driver() == 'mysql') {
-      $result = Database::getConnection()->query('SHOW INDEX FROM {entity_test_update} WHERE key_name = \'entity_test_update_field__new_base_field\' and column_name = \'new_base_field\'')->fetchObject();
-      $this->assertEqual(191, $result->Sub_part, 'The index length has been restricted to 191 characters for UTF8MB4 compatibility.');
-    }
-  }
-
-  /**
-   * Ensures that a new entity level index is created when data exists.
-   *
-   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::onEntityTypeUpdate
-   */
-  public function testCreateIndexUsingEntityStorageSchemaWithData() {
-    // Save an entity.
-    $name = $this->randomString();
-    $storage = $this->entityManager->getStorage('entity_test_update');
-    $entity = $storage->create(array('name' => $name));
-    $entity->save();
-
-    // Create an index.
-    $indexes = array(
-      'entity_test_update__type_index' => array('type'),
-    );
-    $this->state->set('entity_test_update.additional_entity_indexes', $indexes);
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__type_index'), "New index 'entity_test_update__type_index' has been created on the 'entity_test_update' table.");
-    // Check index size in for MySQL.
-    if (Database::getConnection()->driver() == 'mysql') {
-      $result = Database::getConnection()->query('SHOW INDEX FROM {entity_test_update} WHERE key_name = \'entity_test_update__type_index\' and column_name = \'type\'')->fetchObject();
-      $this->assertEqual(191, $result->Sub_part, 'The index length has been restricted to 191 characters for UTF8MB4 compatibility.');
-    }
-  }
-
-  /**
-   * Tests updating a base field when it has existing data.
-   */
-  public function testBaseFieldEntityKeyUpdateWithExistingData() {
-    // Add the base field and run the update.
-    $this->addBaseField();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    // Save an entity with the base field populated.
-    $this->entityManager->getStorage('entity_test_update')->create(['new_base_field' => $this->randomString()])->save();
-
-    // Save an entity with the base field not populated.
-    /** @var \Drupal\entity_test\Entity\EntityTestUpdate $entity */
-    $entity = $this->entityManager->getStorage('entity_test_update')->create();
-    $entity->save();
-
-    // Promote the base field to an entity key. This will trigger the addition
-    // of a NOT NULL constraint.
-    $this->makeBaseFieldEntityKey();
-
-    // Try to apply the update and verify they fail since we have a NULL value.
-    $message = 'An error occurs when trying to enabling NOT NULL constraints with NULL data.';
-    try {
-      $this->entityDefinitionUpdateManager->applyUpdates();
-      $this->fail($message);
-    }
-    catch (EntityStorageException $e) {
-      $this->pass($message);
-    }
-
-    // Check that the update is correctly applied when no NULL data is left.
-    $entity->set('new_base_field', $this->randomString());
-    $entity->save();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->pass('The update is correctly performed when no NULL data exists.');
-
-    // Check that the update actually applied a NOT NULL constraint.
-    $entity->set('new_base_field', NULL);
-    $message = 'The NOT NULL constraint was correctly applied.';
-    try {
-      $entity->save();
-      $this->fail($message);
-    }
-    catch (EntityStorageException $e) {
-      $this->pass($message);
-    }
-  }
-
-  /**
-   * Check that field schema is correctly handled with long-named fields.
-   */
-  function testLongNameFieldIndexes() {
-    $this->addLongNameBaseField();
-    $entity_type_id = 'entity_test_update';
-    $entity_type = $this->entityManager->getDefinition($entity_type_id);
-    $definitions = EntityTestUpdate::baseFieldDefinitions($entity_type);
-    $name = 'new_long_named_entity_reference_base_field';
-    $this->entityDefinitionUpdateManager->installFieldStorageDefinition($name, $entity_type_id, 'entity_test', $definitions[$name]);
-    $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'Entity and field schema data are correctly detected.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php b/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
deleted file mode 100644
index e8453ff..0000000
--- a/core/modules/system/src/Tests/Entity/EntityFieldDefaultValueTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityFieldDefaultValueTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Uuid\Uuid;
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests default values for entity fields.
- *
- * @group Entity
- */
-class EntityFieldDefaultValueTest extends EntityUnitTestBase  {
-
-  /**
-   * The UUID object to be used for generating UUIDs.
-   *
-   * @var \Drupal\Component\Uuid\UuidInterface
-   */
-  protected $uuid;
-
-  protected function setUp() {
-    parent::setUp();
-    // Initiate the generator object.
-    $this->uuid = $this->container->get('uuid');
-  }
-
-  /**
-   * Tests default values on entities and fields.
-   */
-  public function testDefaultValues() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->assertDefaultValues($entity_type);
-    }
-  }
-
-  /**
-   * Executes a test set for a defined entity type.
-   *
-   * @param string $entity_type_id
-   *   The entity type to run the tests with.
-   */
-  protected function assertDefaultValues($entity_type_id) {
-    $entity = entity_create($entity_type_id);
-    $definition = $this->entityManager->getDefinition($entity_type_id);
-    $langcode_key = $definition->getKey('langcode');
-    $this->assertEqual($entity->{$langcode_key}->value, 'en', SafeMarkup::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
-    $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
-    $this->assertEqual($entity->name->getValue(), array(), 'Field has one empty value by default.');
-  }
-
-  /**
-   * Tests custom default value callbacks.
-   */
-  public function testDefaultValueCallback() {
-    $entity = $this->entityManager->getStorage('entity_test_default_value')->create();
-    // The description field has a default value callback for testing, see
-    // entity_test_field_default_value().
-    $string = 'description_' . $entity->language()->getId();
-    $expected = array(
-      array(
-        'shape' => "shape:0:$string",
-        'color' => "color:0:$string",
-      ),
-      array(
-        'shape' => "shape:1:$string",
-        'color' => "color:1:$string",
-      ),
-    );
-    $this->assertEqual($entity->description->getValue(), $expected);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
deleted file mode 100644
index 5c9161e..0000000
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityFieldTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\Core\TypedData\Type\StringInterface;
-use Drupal\Core\TypedData\TypedDataInterface;
-use Drupal\node\Entity\NodeType;
-
-/**
- * Tests the Entity Field API.
- *
- * @group Entity
- */
-class EntityFieldTest extends EntityUnitTestBase  {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('filter', 'text', 'node', 'user', 'field_test');
-
-  /**
-   * @var string
-   */
-  protected $entityName;
-
-  /**
-   * @var \Drupal\user\Entity\User
-   */
-  protected $entityUser;
-
-  /**
-   * @var string
-   */
-  protected $entityFieldText;
-
-  protected function setUp() {
-    parent::setUp();
-
-    foreach (entity_test_entity_types() as $entity_type_id) {
-      // The entity_test schema is installed by the parent.
-      if ($entity_type_id != 'entity_test') {
-        $this->installEntitySchema($entity_type_id);
-      }
-    }
-
-    // Create the test field.
-    module_load_install('entity_test');
-    entity_test_install();
-
-    // Install required default configuration for filter module.
-    $this->installConfig(array('system', 'filter'));
-  }
-
-  /**
-   * Creates a test entity.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   */
-  protected function createTestEntity($entity_type) {
-    $this->entityName = $this->randomMachineName();
-    $this->entityUser = $this->createUser();
-    $this->entityFieldText = $this->randomMachineName();
-
-    // Pass in the value of the name field when creating. With the user
-    // field we test setting a field after creation.
-    $entity = entity_create($entity_type);
-    $entity->user_id->target_id = $this->entityUser->id();
-    $entity->name->value = $this->entityName;
-
-    // Set a value for the test field.
-    $entity->field_test_text->value = $this->entityFieldText;
-
-    return $entity;
-  }
-
-  /**
-   * Tests reading and writing properties and field items.
-   */
-  public function testReadWrite() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestReadWrite($entity_type);
-    }
-  }
-
-  /**
-   * Executes the read write test set for a defined entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestReadWrite($entity_type) {
-    $entity = $this->createTestEntity($entity_type);
-
-    $langcode = 'en';
-
-    // Access the name field.
-    $this->assertTrue($entity->name instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
-
-    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityName, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entityName)), format_string('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type)));
-
-    // Change the name.
-    $new_name = $this->randomMachineName();
-    $entity->name->value = $new_name;
-    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type)));
-
-    $new_name = $this->randomMachineName();
-    $entity->name[0]->value = $new_name;
-    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type)));
-
-    // Access the user field.
-    $this->assertTrue($entity->user_id instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
-
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
-
-    // Change the assigned user by entity.
-    $new_user1 = $this->createUser();
-    $entity->user_id->entity = $new_user1;
-    $this->assertEqual($new_user1->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
-
-    // Change the assigned user by id.
-    $new_user2 = $this->createUser();
-    $entity->user_id->target_id = $new_user2->id();
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
-
-    // Try unsetting a field property.
-    $entity->name->value = NULL;
-    $entity->user_id->target_id = NULL;
-    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
-
-    // Test setting the values via the typed data API works as well.
-    // Change the assigned user by entity.
-    $entity->user_id->first()->get('entity')->setValue($new_user2);
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
-
-    // Change the assigned user by id.
-    $entity->user_id->first()->get('target_id')->setValue($new_user2->id());
-    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
-
-    // Try unsetting a field.
-    $entity->name->first()->get('value')->setValue(NULL);
-    $entity->user_id->first()->get('target_id')->setValue(NULL);
-    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
-    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
-
-    // Create a fresh entity so target_id does not get its property object
-    // instantiated, then verify setting a new value via typed data API works.
-    $entity2 = entity_create($entity_type, array(
-      'user_id' => array('target_id' => $new_user1->id()),
-    ));
-    // Access the property object, and set a value.
-    $entity2->user_id->first()->get('target_id')->setValue($new_user2->id());
-    $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
-
-    // Test using isset(), empty() and unset().
-    $entity->name->value = 'test unset';
-    unset($entity->name->value);
-    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
-
-    $entity->name->value = 'a value';
-    $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type)));
-    $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type)));
-
-    unset($entity->name[0]);
-    $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
-
-    // Test emptying a field by assigning an empty value. NULL and array()
-    // behave the same.
-    foreach ([NULL, array(), 'unset'] as $empty) {
-      // Make sure a value is present
-      $entity->name->value = 'a value';
-      $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
-      // Now, empty the field.
-      if ($empty === 'unset') {
-        unset($entity->name);
-      }
-      else {
-        $entity->name = $empty;
-      }
-      $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-      $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
-      $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type)));
-      $this->assertIdentical($entity->name->getValue(), array(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: First name item value is not set.', array('%entity_type' => $entity_type)));
-      $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name value is not set.', array('%entity_type' => $entity_type)));
-    }
-
-    // Access the language field.
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $this->assertEqual($langcode, $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
-
-    // Change the language by code.
-    $entity->{$langcode_key}->value = \Drupal::languageManager()->getDefaultLanguage()->getId();
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
-
-    // Revert language by code then try setting it by language object.
-    $entity->{$langcode_key}->value = $langcode;
-    $entity->{$langcode_key}->language = \Drupal::languageManager()->getDefaultLanguage();
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
-
-    // Access the text field and test updating.
-    $this->assertEqual($entity->field_test_text->value, $this->entityFieldText, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
-    $new_text = $this->randomMachineName();
-    $entity->field_test_text->value = $new_text;
-    $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type)));
-
-    // Test creating the entity by passing in plain values.
-    $this->entityName = $this->randomMachineName();
-    $name_item[0]['value'] = $this->entityName;
-    $this->entityUser = $this->createUser();
-    $user_item[0]['target_id'] = $this->entityUser->id();
-    $this->entityFieldText = $this->randomMachineName();
-    $text_item[0]['value'] = $this->entityFieldText;
-
-    $entity = entity_create($entity_type, array(
-      'name' => $name_item,
-      'user_id' => $user_item,
-      'field_test_text' => $text_item,
-    ));
-    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
-
-    // Tests copying field values by assigning the TypedData objects.
-    $entity2 = $this->createTestEntity($entity_type);
-    $entity2->name = $entity->name;
-    $entity2->user_id = $entity->user_id;
-    $entity2->field_test_text = $entity->field_test_text;
-    $this->assertFalse($entity->name === $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', array('%entity_type' => $entity_type)));
-
-    // Tests that assigning TypedData objects to non-field properties keeps the
-    // assigned value as is.
-    $entity2 = $this->createTestEntity($entity_type);
-    $entity2->_not_a_field = $entity->name;
-    $this->assertTrue($entity2->_not_a_field === $entity->name, format_string('%entity_type: Typed data objects can be copied to non-field properties as is.', array('%entity_type' => $entity_type)));
-
-    // Tests adding a value to a field item list.
-    $entity->name[] = 'Another name';
-    $this->assertEqual($entity->name[1]->value, 'Another name', format_string('%entity_type: List item added via [] and the first property.', array('%entity_type' => $entity_type)));
-    $entity->name[] = array('value' => 'Third name');
-    $this->assertEqual($entity->name[2]->value, 'Third name', format_string('%entity_type: List item added via [] and an array of properties.', array('%entity_type' => $entity_type)));
-    $entity->name[3] = array('value' => 'Fourth name');
-    $this->assertEqual($entity->name[3]->value, 'Fourth name', format_string('%entity_type: List item added via offset and an array of properties.', array('%entity_type' => $entity_type)));
-    unset($entity->name[3]);
-
-    // Test removing and empty-ing list items.
-    $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', array('%entity_type' => $entity_type)));
-    unset($entity->name[1]);
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[1]->value, 'Third name', format_string('%entity_type: The subsequent items have been shifted up.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[1]->getName(), 1, format_string('%entity_type: The items names have been updated to their new delta.', array('%entity_type' => $entity_type)));
-    $entity->name[1] = NULL;
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name[1]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type)));
-
-    // Test using isEmpty().
-    unset($entity->name[1]);
-    $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type)));
-    $entity->name->value = NULL;
-    $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type)));
-    $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type)));
-
-    // Test using filterEmptyItems().
-    $entity->name = array(NULL, 'foo');
-    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: List has 2 items.', array('%entity_type' => $entity_type)));
-    $entity->name->filterEmptyItems();
-    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: The empty item was removed.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[0]->value, 'foo', format_string('%entity_type: The items were renumbered.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($entity->name[0]->getName(), 0, format_string('%entity_type: The deltas were updated in the items.', array('%entity_type' => $entity_type)));
-
-    // Test get and set field values.
-    $entity->name = 'foo';
-    $this->assertEqual($entity->name[0]->toArray(), array('value' => 'foo'), format_string('%entity_type: Field value has been retrieved via toArray()', array('%entity_type' => $entity_type)));
-
-    $values = $entity->toArray();
-    $this->assertEqual($values['name'], array(0 => array('value' => 'foo')), format_string('%entity_type: Field value has been retrieved via toArray() from an entity.', array('%entity_type' => $entity_type)));
-
-    // Make sure the user id can be set to zero.
-    $user_item[0]['target_id'] = 0;
-    $entity = entity_create($entity_type, array(
-      'name' => $name_item,
-      'user_id' => $user_item,
-      'field_test_text' => $text_item,
-    ));
-    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
-    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
-
-    // Test setting the ID with the value only.
-    $entity = entity_create($entity_type, array(
-      'name' => $name_item,
-      'user_id' => 0,
-      'field_test_text' => $text_item,
-    ));
-    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
-    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Tries to save and load an entity again.
-   */
-  public function testSave() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestSave($entity_type);
-    }
-  }
-
-  /**
-   * Executes the save tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestSave($entity_type) {
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $entity = $this->createTestEntity($entity_type);
-    $entity->save();
-    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type)));
-
-    $entity = entity_load($entity_type, $entity->id());
-    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', array('%entity_type' => $entity_type)));
-
-    // Access the name field.
-    $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual('en', $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Tests introspection and getting metadata upfront.
-   */
-  public function testIntrospection() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestIntrospection($entity_type);
-    }
-  }
-
-  /**
-   * Executes the introspection tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestIntrospection($entity_type) {
-    // Test getting metadata upfront. The entity types used for this test have
-    // a default bundle that is the same as the entity type.
-    $definitions = \Drupal::entityManager()->getFieldDefinitions($entity_type, $entity_type);
-    $this->assertEqual($definitions['name']->getType(), 'string', $entity_type .': Name field found.');
-    $this->assertEqual($definitions['user_id']->getType(), 'entity_reference', $entity_type .': User field found.');
-    $this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type .': Test-text-field field found.');
-
-    // Test deriving further metadata.
-    $this->assertTrue($definitions['name'] instanceof FieldDefinitionInterface);
-    $field_item_definition = $definitions['name']->getItemDefinition();
-    $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
-    $this->assertEqual($field_item_definition->getDataType(), 'field_item:string');
-    $value_definition = $field_item_definition->getPropertyDefinition('value');
-    $this->assertTrue($value_definition instanceof DataDefinitionInterface);
-    $this->assertEqual($value_definition->getDataType(), 'string');
-
-    // Test deriving metadata from references.
-    $entity_definition = \Drupal\Core\Entity\TypedData\EntityDataDefinition::create($entity_type);
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $reference_definition = $entity_definition->getPropertyDefinition($langcode_key)
-      ->getPropertyDefinition('language')
-      ->getTargetDefinition();
-    $this->assertEqual($reference_definition->getDataType(), 'language');
-
-    $reference_definition = $entity_definition->getPropertyDefinition('user_id')
-      ->getPropertyDefinition('entity')
-      ->getTargetDefinition();
-
-    $this->assertTrue($reference_definition instanceof \Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface, 'Definition of the referenced user retrieved.');
-    $this->assertEqual($reference_definition->getEntityTypeId(), 'user', 'Referenced entity is of type "user".');
-
-    // Test propagating down.
-    $name_definition = $reference_definition->getPropertyDefinition('name');
-    $this->assertTrue($name_definition instanceof FieldDefinitionInterface);
-    $this->assertEqual($name_definition->getPropertyDefinition('value')->getDataType(), 'string');
-
-    // Test introspecting an entity object.
-    // @todo: Add bundles and test bundles as well.
-    $entity = entity_create($entity_type);
-
-    $definitions = $entity->getFieldDefinitions();
-    $this->assertEqual($definitions['name']->getType(), 'string', $entity_type .': Name field found.');
-    $this->assertEqual($definitions['user_id']->getType(), 'entity_reference', $entity_type .': User field found.');
-    $this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type .': Test-text-field field found.');
-
-    $name_properties = $entity->name->getFieldDefinition()->getPropertyDefinitions();
-    $this->assertEqual($name_properties['value']->getDataType(), 'string', $entity_type .': String value property of the name found.');
-
-    $userref_properties = $entity->user_id->getFieldDefinition()->getPropertyDefinitions();
-    $this->assertEqual($userref_properties['target_id']->getDataType(), 'integer', $entity_type .': Entity id property of the user found.');
-    $this->assertEqual($userref_properties['entity']->getDataType(), 'entity_reference', $entity_type .': Entity reference property of the user found.');
-
-    $textfield_properties = $entity->field_test_text->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinitions();
-    $this->assertEqual($textfield_properties['value']->getDataType(), 'string', $entity_type .': String value property of the test-text field found.');
-    $this->assertEqual($textfield_properties['format']->getDataType(), 'filter_format', $entity_type .': String format field of the test-text field found.');
-    $this->assertEqual($textfield_properties['processed']->getDataType(), 'string', $entity_type .': String processed property of the test-text field found.');
-
-    // Make sure provided contextual information is right.
-    $entity_adapter = $entity->getTypedData();
-    $this->assertIdentical($entity_adapter->getRoot(), $entity_adapter, 'Entity is root object.');
-    $this->assertEqual($entity_adapter->getPropertyPath(), '');
-    $this->assertEqual($entity_adapter->getName(), '');
-    $this->assertEqual($entity_adapter->getParent(), NULL);
-
-    $field = $entity->user_id;
-    $this->assertIdentical($field->getRoot()->getValue(), $entity, 'Entity is root object.');
-    $this->assertIdentical($field->getEntity(), $entity, 'getEntity() returns the entity.');
-    $this->assertEqual($field->getPropertyPath(), 'user_id');
-    $this->assertEqual($field->getName(), 'user_id');
-    $this->assertIdentical($field->getParent()->getValue(), $entity, 'Parent object matches.');
-
-    $field_item = $field[0];
-    $this->assertIdentical($field_item->getRoot()->getValue(), $entity, 'Entity is root object.');
-    $this->assertIdentical($field_item->getEntity(), $entity, 'getEntity() returns the entity.');
-    $this->assertEqual($field_item->getPropertyPath(), 'user_id.0');
-    $this->assertEqual($field_item->getName(), '0');
-    $this->assertIdentical($field_item->getParent(), $field, 'Parent object matches.');
-
-    $item_value = $field_item->get('entity');
-    $this->assertIdentical($item_value->getRoot()->getValue(), $entity, 'Entity is root object.');
-    $this->assertEqual($item_value->getPropertyPath(), 'user_id.0.entity');
-    $this->assertEqual($item_value->getName(), 'entity');
-    $this->assertIdentical($item_value->getParent(), $field_item, 'Parent object matches.');
-  }
-
-  /**
-   * Tests iterating over properties.
-   */
-  public function testIterator() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestIterator($entity_type);
-    }
-  }
-
-  /**
-   * Executes the iterator tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestIterator($entity_type) {
-    $entity = $this->createTestEntity($entity_type);
-
-    foreach ($entity as $name => $field) {
-      $this->assertTrue($field instanceof FieldItemListInterface, $entity_type . ": Field $name implements interface.");
-
-      foreach ($field as $delta => $item) {
-        $this->assertTrue($field[0] instanceof FieldItemInterface, $entity_type . ": Item $delta of field $name implements interface.");
-
-        foreach ($item as $value_name => $value_property) {
-          $this->assertTrue($value_property instanceof TypedDataInterface, $entity_type . ": Value $value_name of item $delta of field $name implements interface.");
-
-          $value = $value_property->getValue();
-          $this->assertTrue(!isset($value) || is_scalar($value) || $value instanceof EntityInterface, $entity_type . ": Value $value_name of item $delta of field $name is a primitive or an entity.");
-        }
-      }
-    }
-
-    $fields = $entity->getFields();
-    $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), format_string('%entity_type: All fields returned.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($fields, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all fields.', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Tests working with the entity based upon the TypedData API.
-   */
-  public function testDataStructureInterfaces() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestDataStructureInterfaces($entity_type);
-    }
-  }
-
-  /**
-   * Executes the data structure interfaces tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestDataStructureInterfaces($entity_type) {
-    $entity = $this->createTestEntity($entity_type);
-
-    // Test using the whole tree of typed data by navigating through the tree of
-    // contained properties and getting all contained strings, limited by a
-    // certain depth.
-    $strings = array();
-    $this->getContainedStrings($entity->getTypedData(), 0, $strings);
-
-    // @todo: Once the user entity has defined properties this should contain
-    // the user name and other user entity strings as well.
-    $target_strings = array(
-      $entity->uuid->value,
-      'en',
-      $this->entityName,
-      // Bundle name.
-      $entity->bundle(),
-      $this->entityFieldText,
-      // Field format.
-      NULL,
-    );
-    asort($strings);
-    asort($target_strings);
-    $this->assertEqual(array_values($strings), array_values($target_strings), format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Recursive helper for getting all contained strings,
-   * i.e. properties of type string.
-   */
-  public function getContainedStrings(TypedDataInterface $wrapper, $depth, array &$strings) {
-
-    if ($wrapper instanceof StringInterface) {
-      $strings[] = $wrapper->getValue();
-    }
-
-    // Recurse until a certain depth is reached if possible.
-    if ($depth < 7) {
-      if ($wrapper instanceof \Drupal\Core\TypedData\ListInterface) {
-        foreach ($wrapper as $item) {
-          $this->getContainedStrings($item, $depth + 1, $strings);
-        }
-      }
-      elseif ($wrapper instanceof \Drupal\Core\TypedData\ComplexDataInterface) {
-        foreach ($wrapper as $property) {
-          $this->getContainedStrings($property, $depth + 1, $strings);
-        }
-      }
-    }
-  }
-
-  /**
-   * Makes sure data types are correctly derived for all entity types.
-   */
-  public function testDataTypes() {
-    $types = \Drupal::typedDataManager()->getDefinitions();
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->assertTrue($types['entity:' . $entity_type]['class'], 'Entity data type registered.');
-    }
-    // Check bundle types are provided as well.
-    entity_test_create_bundle('bundle');
-    $types = \Drupal::typedDataManager()->getDefinitions();
-    $this->assertTrue($types['entity:entity_test:bundle']['class'], 'Entity bundle data type registered.');
-  }
-
-  /**
-   * Tests a base field override on a non-existing base field.
-   *
-   * @see entity_test_entity_base_field_info_alter()
-   */
-  public function testBaseFieldNonExistingBaseField() {
-    $this->entityManager->getStorage('node_type')->create(array(
-      'type' => 'page',
-      'name' => 'page',
-    ))->save();
-    $this->entityManager->clearCachedFieldDefinitions();
-    $fields = $this->entityManager->getFieldDefinitions('node', 'page');
-    $override = $fields['status']->getConfig('page');
-    $override->setLabel($this->randomString())->save();
-    \Drupal::state()->set('entity_test.node_remove_status_field', TRUE);
-    $this->entityManager->clearCachedFieldDefinitions();
-    $fields = $this->entityManager->getFieldDefinitions('node', 'page');
-    // A base field override on a non-existing base field should not cause a
-    // field definition to come into existence.
-    $this->assertFalse(isset($fields['status']), 'Node\'s status base field does not exist.');
-  }
-
-  /**
-   * Tests creating a field override config for a bundle field.
-   *
-   * @see entity_test_entity_base_field_info_alter()
-   */
-  public function testFieldOverrideBundleField() {
-    // First make sure the bundle field override in code, which is provided by
-    // the test entity works.
-    entity_test_create_bundle('some_test_bundle', 'Some test bundle', 'entity_test_field_override');
-    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'entity_test_field_override');
-    $this->assertEqual($field_definitions['name']->getDescription(), 'The default description.');
-    $this->assertNull($field_definitions['name']->getTargetBundle());
-
-    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'some_test_bundle');
-    $this->assertEqual($field_definitions['name']->getDescription(), 'Custom description.');
-    $this->assertEqual($field_definitions['name']->getTargetBundle(), 'some_test_bundle');
-
-    // Now create a config override of the bundle field.
-    $field_config = $field_definitions['name']->getConfig('some_test_bundle');
-    $field_config->setTranslatable(FALSE);
-    $field_config->save();
-
-    // Make sure both overrides are present.
-    $this->entityManager->clearCachedFieldDefinitions();
-    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'some_test_bundle');
-    $this->assertEqual($field_definitions['name']->getDescription(), 'Custom description.');
-    $this->assertEqual($field_definitions['name']->getTargetBundle(), 'some_test_bundle');
-    $this->assertFalse($field_definitions['name']->isTranslatable());
-  }
-
-  /**
-   * Tests validation constraints provided by the Entity API.
-   */
-  public function testEntityConstraintValidation() {
-    $entity = $this->createTestEntity('entity_test');
-    $entity->save();
-    // Create a reference field item and let it reference the entity.
-    $definition = BaseFieldDefinition::create('entity_reference')
-      ->setLabel('Test entity')
-      ->setSetting('target_type', 'entity_test');
-    $reference_field = \Drupal::typedDataManager()->create($definition);
-    $reference = $reference_field->appendItem(array('entity' => $entity))->get('entity');
-
-    // Test validation the typed data object.
-    $violations = $reference->validate();
-    $this->assertEqual($violations->count(), 0);
-
-    // Test validating an entity of the wrong type.
-    $user = $this->createUser();
-    $user->save();
-    $node = entity_create('node', array(
-      'type' => 'page',
-      'uid' => $user->id(),
-      'title' => $this->randomString(),
-    ));
-    $reference->setValue($node);
-    $violations = $reference->validate();
-    $this->assertEqual($violations->count(), 1);
-
-    // Test bundle validation.
-    NodeType::create(array('type' => 'article'))
-      ->save();
-    $definition = BaseFieldDefinition::create('entity_reference')
-      ->setLabel('Test entity')
-      ->setSetting('target_type', 'node')
-      ->setSetting('handler_settings', ['target_bundles' => ['article' => 'article']]);
-    $reference_field = \Drupal::TypedDataManager()->create($definition);
-    $reference_field->appendItem(array('entity' => $node));
-    $violations = $reference_field->validate();
-    $this->assertEqual($violations->count(), 1);
-
-    $node = entity_create('node', array(
-      'type' => 'article',
-      'uid' => $user->id(),
-      'title' => $this->randomString(),
-    ));
-    $node->save();
-    $reference_field->entity = $node;
-    $violations = $reference_field->validate();
-    $this->assertEqual($violations->count(), 0);
-  }
-
-  /**
-   * Tests getting processed property values via a computed property.
-   */
-  public function testComputedProperties() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestComputedProperties($entity_type);
-    }
-  }
-
-  /**
-   * Executes the computed properties tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestComputedProperties($entity_type) {
-    $entity = $this->createTestEntity($entity_type);
-    $entity->field_test_text->value = "The <strong>text</strong> text to filter.";
-    $entity->field_test_text->format = filter_default_format();
-
-    $target = "<p>The &lt;strong&gt;text&lt;/strong&gt; text to filter.</p>\n";
-    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
-
-    // Save and load entity and make sure it still works.
-    $entity->save();
-    $entity = entity_load($entity_type, $entity->id());
-    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
deleted file mode 100644
index 61a5ad2..0000000
--- a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityLanguageTestBase.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Base class for language-aware entity tests.
- */
-abstract class EntityLanguageTestBase extends EntityUnitTestBase {
-
-  /**
-   * The language manager service.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * The available language codes.
-   *
-   * @var array
-   */
-  protected $langcodes;
-
-  /**
-   * The test field name.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * The untranslatable test field name.
-   *
-   * @var string
-   */
-  protected $untranslatableFieldName;
-
-  public static $modules = array('language', 'entity_test');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->languageManager = $this->container->get('language_manager');
-
-    foreach (entity_test_entity_types() as $entity_type_id) {
-      // The entity_test schema is installed by the parent.
-      if ($entity_type_id != 'entity_test') {
-        $this->installEntitySchema($entity_type_id);
-      }
-    }
-
-    $this->installConfig(array('language'));
-
-    // Create the test field.
-    module_load_install('entity_test');
-    entity_test_install();
-
-    // Enable translations for the test entity type.
-    $this->state->set('entity_test.translation', TRUE);
-
-    // Create a translatable test field.
-    $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
-
-    // Create an untranslatable test field.
-    $this->untranslatableFieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
-
-    // Create field fields in all entity variations.
-    foreach (entity_test_entity_types() as $entity_type) {
-      entity_create('field_storage_config', array(
-        'field_name' => $this->fieldName,
-        'entity_type' => $entity_type,
-        'type' => 'text',
-        'cardinality' => 4,
-      ))->save();
-      entity_create('field_config', array(
-        'field_name' => $this->fieldName,
-        'entity_type' => $entity_type,
-        'bundle' => $entity_type,
-        'translatable' => TRUE,
-      ))->save();
-      $this->field[$entity_type] = FieldConfig::load($entity_type . '.' . $entity_type . '.' . $this->fieldName);
-
-      entity_create('field_storage_config', array(
-        'field_name' => $this->untranslatableFieldName,
-        'entity_type' => $entity_type,
-        'type' => 'text',
-        'cardinality' => 4,
-      ))->save();
-      entity_create('field_config', array(
-        'field_name' => $this->untranslatableFieldName,
-        'entity_type' => $entity_type,
-        'bundle' => $entity_type,
-        'translatable' => FALSE,
-      ))->save();
-    }
-
-    // Create the default languages.
-    $this->installConfig(array('language'));
-
-    // Create test languages.
-    $this->langcodes = array();
-    for ($i = 0; $i < 3; ++$i) {
-      $language = ConfigurableLanguage::create(array(
-        'id' => 'l' . $i,
-        'label' => $this->randomString(),
-        'weight' => $i,
-      ));
-      $this->langcodes[$i] = $language->getId();
-      $language->save();
-    }
-  }
-
-  /**
-   * Toggles field storage translatability.
-   *
-   * @param string $entity_type
-   *   The type of the entity fields are attached to.
-   */
-  protected function toggleFieldTranslatability($entity_type, $bundle) {
-    $fields = array($this->fieldName, $this->untranslatableFieldName);
-    foreach ($fields as $field_name) {
-      $field = FieldConfig::loadByName($entity_type, $bundle, $field_name);
-      $translatable = !$field->isTranslatable();
-      $field->set('translatable', $translatable);
-      $field->save();
-      $field = FieldConfig::loadByName($entity_type, $bundle, $field_name);
-      $this->assertEqual($field->isTranslatable(), $translatable, 'Field translatability changed.');
-    }
-    \Drupal::cache('entity')->deleteAll();
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
index f38c62d..ec2ac42 100644
--- a/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityListBuilderTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\system\Tests\Entity;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -41,7 +42,7 @@ protected function setUp() {
   public function testPager() {
     // Create 51 test entities.
     for ($i = 1; $i < 52; $i++) {
-      entity_create('entity_test', array('name' => 'Test entity ' . $i))->save();
+      EntityTest::create(array('name' => 'Test entity ' . $i))->save();
     }
 
     // Load the listing page.
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php b/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php
deleted file mode 100644
index a3262ea..0000000
--- a/core/modules/system/src/Tests/Entity/EntityQueryAggregateTest.php
+++ /dev/null
@@ -1,585 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityQueryAggregateTest.
- */
-namespace Drupal\system\Tests\Entity;
-
-/**
- * Tests the Entity Query Aggregation API.
- *
- * @group Entity
- * @see \Drupal\entity_test\Entity\EntityTest
- */
-class EntityQueryAggregateTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array();
-
-  /**
-   * The entity_test storage to create the test entities.
-   *
-   * @var \Drupal\entity_test\EntityTestStorage
-   */
-  protected $entityStorage;
-
-  /**
-   * The actual query result, to compare later.
-   *
-   * @var array
-   */
-  protected $queryResult;
-
-  /**
-   * The query factory to create entity queries.
-   *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  public $factory;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->entityStorage = $this->entityManager->getStorage('entity_test');
-    $this->factory = $this->container->get('entity.query');
-
-    // Add some fieldapi fields to be used in the test.
-    for ($i = 1; $i <= 2; $i++) {
-      $field_name = 'field_test_' . $i;
-      entity_create('field_storage_config', array(
-        'field_name' => $field_name,
-        'entity_type' => 'entity_test',
-        'type' => 'integer',
-        'cardinality' => 2,
-      ))->save();
-      entity_create('field_config', array(
-        'field_name' => $field_name,
-        'entity_type' => 'entity_test',
-        'bundle' => 'entity_test',
-      ))->save();
-    }
-
-    $entity = $this->entityStorage->create(array(
-      'id' => 1,
-      'user_id' => 1,
-      'field_test_1' => 1,
-      'field_test_2' => 2,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-
-    $entity = $this->entityStorage->create(array(
-      'id' => 2,
-      'user_id' => 2,
-      'field_test_1' => 1,
-      'field_test_2' => 7,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    $entity = $this->entityStorage->create(array(
-      'id' => 3,
-      'user_id' => 2,
-      'field_test_1' => 2,
-      'field_test_2' => 1,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    $entity = $this->entityStorage->create(array(
-      'id' => 4,
-      'user_id' => 2,
-      'field_test_1' => 2,
-      'field_test_2' => 8,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    $entity = $this->entityStorage->create(array(
-      'id' => 5,
-      'user_id' => 3,
-      'field_test_1' => 2,
-      'field_test_2' => 2,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    $entity = $this->entityStorage->create(array(
-      'id' => 6,
-      'user_id' => 3,
-      'field_test_1' => 3,
-      'field_test_2' => 8,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-
-  }
-
-  /**
-   * Test aggregation support.
-   */
-  public function testAggregation() {
-    // Apply a simple groupby.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('user_id')
-      ->execute();
-
-    $this->assertResults(array(
-      array('user_id' => 1),
-      array('user_id' => 2),
-      array('user_id' => 3),
-    ));
-
-    $function_expected = array();
-    $function_expected['count'] = array(array('id_count' => 6));
-    $function_expected['min'] = array(array('id_min' => 1));
-    $function_expected['max'] = array(array('id_max' => 6));
-    $function_expected['sum'] = array(array('id_sum' => 21));
-    $function_expected['avg'] = array(array('id_avg' => (21.0/6.0)));
-
-    // Apply a simple aggregation for different aggregation functions.
-    foreach ($function_expected as $aggregation_function => $expected) {
-      $this->queryResult = $this->factory->getAggregate('entity_test')
-        ->aggregate('id', $aggregation_function)
-        ->execute();
-      $this->assertEqual($this->queryResult, $expected);
-    }
-
-    // Apply aggregation and groupby on the same query.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'id_count' => 1),
-      array('user_id' => 2, 'id_count' => 3),
-      array('user_id' => 3, 'id_count' => 2),
-    ));
-
-    // Apply aggregation and a condition which matches.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('id')
-      ->conditionAggregate('id', 'COUNT', 8)
-      ->execute();
-    $this->assertResults(array());
-
-    // Don't call aggregate to test the implicit aggregate call.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('id')
-      ->conditionAggregate('id', 'COUNT', 8)
-      ->execute();
-    $this->assertResults(array());
-
-    // Apply aggregation and a condition which matches.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'count')
-      ->groupBy('id')
-      ->conditionAggregate('id', 'COUNT', 6)
-      ->execute();
-    $this->assertResults(array(array('id_count' => 6)));
-
-    // Apply aggregation, a groupby and a condition which matches partially via
-    // the operator '='.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'count')
-      ->conditionAggregate('id', 'count', 2)
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(array('id_count' => 2, 'user_id' => 3)));
-
-    // Apply aggregation, a groupby and a condition which matches partially via
-    // the operator '>'.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'count')
-      ->conditionAggregate('id', 'COUNT', 1, '>')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('id_count' => 2, 'user_id' => 3),
-      array('id_count' => 3, 'user_id' => 2),
-    ));
-
-    // Apply aggregation and a sort. This might not be useful, but have a proper
-    // test coverage.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->sortAggregate('id', 'COUNT')
-      ->execute();
-    $this->assertSortedResults(array(array('id_count' => 6)));
-
-    // Don't call aggregate to test the implicit aggregate call.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->sortAggregate('id', 'COUNT')
-      ->execute();
-    $this->assertSortedResults(array(array('id_count' => 6)));
-
-    // Apply aggregation, groupby and a sort descending.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->sortAggregate('id', 'COUNT', 'DESC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'id_count' => 3),
-      array('user_id' => 3, 'id_count' => 2),
-      array('user_id' => 1, 'id_count' => 1),
-    ));
-
-    // Apply aggregation, groupby and a sort ascending.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->sortAggregate('id', 'COUNT', 'ASC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'id_count' => 1),
-      array('user_id' => 3, 'id_count' => 2),
-      array('user_id' => 2, 'id_count' => 3),
-    ));
-
-    // Apply aggregation, groupby, an aggregation condition and a sort with the
-    // operator '='.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->sortAggregate('id', 'COUNT')
-      ->conditionAggregate('id', 'COUNT', 2)
-      ->execute();
-    $this->assertSortedResults(array(array('id_count' => 2, 'user_id' => 3)));
-
-    // Apply aggregation, groupby, an aggregation condition and a sort with the
-    // operator '<' and order ASC.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->sortAggregate('id', 'COUNT', 'ASC')
-      ->conditionAggregate('id', 'COUNT', 3, '<')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('id_count' => 1, 'user_id' => 1),
-      array('id_count' => 2, 'user_id' => 3),
-    ));
-
-    // Apply aggregation, groupby, an aggregation condition and a sort with the
-    // operator '<' and order DESC.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('id', 'COUNT')
-      ->groupBy('user_id')
-      ->sortAggregate('id', 'COUNT', 'DESC')
-      ->conditionAggregate('id', 'COUNT', 3, '<')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('id_count' => 2, 'user_id' => 3),
-      array('id_count' => 1, 'user_id' => 1),
-    ));
-
-    // Test aggregation/groupby support for fieldapi fields.
-
-    // Just group by a fieldapi field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1),
-      array('field_test_1' => 2),
-      array('field_test_1' => 3),
-    ));
-
-    // Group by a fieldapi field and aggregate a normal property.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('user_id', 'COUNT')
-      ->groupBy('field_test_1')
-      ->execute();
-
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-      array('field_test_1' => 2, 'user_id_count' => 3),
-      array('field_test_1' => 3, 'user_id_count' => 1),
-    ));
-
-    // Group by a normal property and aggregate a fieldapi field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'COUNT')
-      ->groupBy('user_id')
-      ->execute();
-
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'SUM')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1),
-      array('user_id' => 2, 'field_test_1_sum' => 5),
-      array('user_id' => 3, 'field_test_1_sum' => 5),
-    ));
-
-    // Aggregate by two different fieldapi fields.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'SUM')
-      ->aggregate('field_test_2', 'SUM')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_2_sum' => 2),
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_2_sum' => 16),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_2_sum' => 10),
-    ));
-
-    // This time aggregate the same field twice.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'SUM')
-      ->aggregate('field_test_1', 'COUNT')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
-    ));
-
-    // Group by and aggregate by a fieldapi field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->aggregate('field_test_2', 'COUNT')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
-
-    // Group by and aggregate by a fieldapi field and use multiple aggregate
-    // functions.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->aggregate('field_test_2', 'COUNT')
-      ->aggregate('field_test_2', 'SUM')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
-      array('field_test_1' => 2, 'field_test_2_count' => 3, 'field_test_2_sum' => 11),
-      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
-    ));
-
-    // Apply an aggregate condition for a fieldapi field and group by a simple
-    // property.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->conditionAggregate('field_test_1', 'COUNT', 3)
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'SUM')
-      ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertResults(array(
-      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
-    ));
-
-    // Apply an aggregate condition for a simple property and a group by a
-    // fieldapi field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->conditionAggregate('user_id', 'COUNT', 2)
-      ->groupBy('field_test_1')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->conditionAggregate('user_id', 'COUNT', 2, '>')
-      ->groupBy('field_test_1')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'user_id_count' => 2),
-      array('field_test_1' => 2, 'user_id_count' => 3),
-    ));
-
-    // Apply an aggregate condition and a group by fieldapi fields.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->conditionAggregate('field_test_2', 'COUNT', 2)
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-    ));
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->conditionAggregate('field_test_2', 'COUNT', 2, '>')
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-    ));
-
-    // Apply an aggregate condition and a group by fieldapi fields with multiple
-    // conditions via AND.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->conditionAggregate('field_test_2', 'COUNT', 2)
-      ->conditionAggregate('field_test_2', 'SUM', 8)
-      ->execute();
-    $this->assertResults(array());
-
-    // Apply an aggregate condition and a group by fieldapi fields with multiple
-    // conditions via OR.
-    $this->queryResult = $this->factory->getAggregate('entity_test', 'OR')
-      ->groupBy('field_test_1')
-      ->conditionAggregate('field_test_2', 'COUNT', 2)
-      ->conditionAggregate('field_test_2', 'SUM', 8)
-      ->execute();
-    $this->assertResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
-      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
-    ));
-
-    // Group by a normal property and aggregate a fieldapi field and sort by the
-    // groupby field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'COUNT')
-      ->groupBy('user_id')
-      ->sort('user_id', 'DESC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 1, 'field_test_1_count' => 1),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->aggregate('field_test_1', 'COUNT')
-      ->groupBy('user_id')
-      ->sort('user_id', 'ASC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
-      ->groupBy('user_id')
-      ->sort('user_id', 'ASC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-    ));
-
-    // Group by a normal property, aggregate a fieldapi field, and sort by the
-    // aggregated field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->sortAggregate('field_test_1', 'COUNT', 'DESC')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 2, 'field_test_1_count' => 3),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 1, 'field_test_1_count' => 1),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->sortAggregate('field_test_1', 'COUNT', 'ASC')
-      ->groupBy('user_id')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('user_id' => 1, 'field_test_1_count' => 1),
-      array('user_id' => 3, 'field_test_1_count' => 2),
-      array('user_id' => 2, 'field_test_1_count' => 3),
-    ));
-
-    // Group by and aggregate by fieldapi field, and sort by the groupby field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->aggregate('field_test_2', 'COUNT')
-      ->sort('field_test_1', 'ASC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->aggregate('field_test_2', 'COUNT')
-      ->sort('field_test_1', 'DESC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-    ));
-
-    // Groupby and aggregate by fieldapi field, and sort by the aggregated
-    // field.
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->sortAggregate('field_test_2', 'COUNT', 'DESC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-    ));
-
-    $this->queryResult = $this->factory->getAggregate('entity_test')
-      ->groupBy('field_test_1')
-      ->sortAggregate('field_test_2', 'COUNT', 'ASC')
-      ->execute();
-    $this->assertSortedResults(array(
-      array('field_test_1' => 3, 'field_test_2_count' => 1),
-      array('field_test_1' => 1, 'field_test_2_count' => 2),
-      array('field_test_1' => 2, 'field_test_2_count' => 3),
-    ));
-
-  }
-
-  /**
-   * Asserts the results as expected regardless of order between and in rows.
-   *
-   * @param array $expected
-   *   An array of the expected results.
-   */
-  protected function assertResults($expected, $sorted = FALSE) {
-    $found = TRUE;
-    $expected_keys = array_keys($expected);
-    foreach ($this->queryResult as $key => $row) {
-      $keys = $sorted ? array($key) : $expected_keys;
-      foreach ($keys as $key) {
-        $expected_row = $expected[$key];
-        if (!array_diff_assoc($row, $expected_row) && !array_diff_assoc($expected_row, $row)) {
-          continue 2;
-        }
-      }
-      $found = FALSE;
-      break;
-    }
-    return $this->assertTrue($found, strtr('!expected expected, !found found', array('!expected' => print_r($expected, TRUE), '!found' => print_r($this->queryResult, TRUE))));
-  }
-
-  /**
-   * Asserts the results as expected regardless of order in rows.
-   *
-   * @param array $expected
-   *   An array of the expected results.
-   */
-  protected function assertSortedResults($expected) {
-    return $this->assertResults($expected, TRUE);
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php b/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
deleted file mode 100644
index 02a1566..0000000
--- a/core/modules/system/src/Tests/Entity/EntityQueryRelationshipTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityQueryRelationshipTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-use Drupal\Component\Utility\Unicode;
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-
-/**
- * Tests the Entity Query relationship API.
- *
- * @group Entity
- */
-class EntityQueryRelationshipTest extends EntityUnitTestBase  {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('taxonomy');
-
-  /**
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $factory;
-
-  /**
-   * Term entities.
-   *
-   * @var array
-   */
-  protected $terms;
-
-  /**
-   * User entities.
-   *
-   * @var array
-   */
-  public $accounts;
-
-  /**
-   * entity_test entities.
-   *
-   * @var array
-   */
-  protected $entities;
-
-  /**
-   * The name of the taxonomy field used for test.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * The results returned by EntityQuery.
-   *
-   * @var array
-   */
-  protected $queryResults;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('taxonomy_term');
-
-    // We want an entity reference field. It needs a vocabulary, terms, a field
-    // storage and a field. First, create the vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
-      'vid' => Unicode::strtolower($this->randomMachineName()),
-    ));
-    $vocabulary->save();
-
-    // Second, create the field.
-    entity_test_create_bundle('test_bundle');
-    $this->fieldName = strtolower($this->randomMachineName());
-    $handler_settings = array(
-      'target_bundles' => array(
-        $vocabulary->id() => $vocabulary->id(),
-       ),
-      'auto_create' => TRUE,
-    );
-    $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings);
-
-    // Create two terms and also two accounts.
-    for ($i = 0; $i <= 1; $i++) {
-      $term = entity_create('taxonomy_term', array(
-        'name' => $this->randomMachineName(),
-        'vid' => $vocabulary->id(),
-      ));
-      $term->save();
-      $this->terms[] = $term;
-      $this->accounts[] = $this->createUser();
-    }
-    // Create three entity_test entities, the 0th entity will point to the
-    // 0th account and 0th term, the 1st and 2nd entity will point to the
-    // 1st account and 1st term.
-    for ($i = 0; $i <= 2; $i++) {
-      $entity = entity_create('entity_test', array('type' => 'test_bundle'));
-      $entity->name->value = $this->randomMachineName();
-      $index = $i ? 1 : 0;
-      $entity->user_id->target_id = $this->accounts[$index]->id();
-      $entity->{$this->fieldName}->target_id = $this->terms[$index]->id();
-      $entity->save();
-      $this->entities[] = $entity;
-    }
-    $this->factory = \Drupal::service('entity.query');
-  }
-
-  /**
-   * Tests querying.
-   */
-  public function testQuery() {
-    // This returns the 0th entity as that's only one pointing to the 0th
-    // account.
-    $this->queryResults = $this->factory->get('entity_test')
-      ->condition("user_id.entity.name", $this->accounts[0]->getUsername())
-      ->execute();
-    $this->assertResults(array(0));
-    // This returns the 1st and 2nd entity as those point to the 1st account.
-    $this->queryResults = $this->factory->get('entity_test')
-      ->condition("user_id.entity.name", $this->accounts[0]->getUsername(), '<>')
-      ->execute();
-    $this->assertResults(array(1, 2));
-    // This returns all three entities because all of them point to an
-    // account.
-    $this->queryResults = $this->factory->get('entity_test')
-      ->exists("user_id.entity.name")
-      ->execute();
-    $this->assertResults(array(0, 1, 2));
-    // This returns no entities because all of them point to an account.
-    $this->queryResults = $this->factory->get('entity_test')
-      ->notExists("user_id.entity.name")
-      ->execute();
-    $this->assertEqual(count($this->queryResults), 0);
-    // This returns the 0th entity as that's only one pointing to the 0th
-    // term (test without specifying the field column).
-    $this->queryResults = $this->factory->get('entity_test')
-      ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value)
-      ->execute();
-    $this->assertResults(array(0));
-    // This returns the 0th entity as that's only one pointing to the 0th
-    // term (test with specifying the column name).
-    $this->queryResults = $this->factory->get('entity_test')
-      ->condition("$this->fieldName.target_id.entity.name", $this->terms[0]->name->value)
-      ->execute();
-    $this->assertResults(array(0));
-    // This returns the 1st and 2nd entity as those point to the 1st term.
-    $this->queryResults = $this->factory->get('entity_test')
-      ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value, '<>')
-      ->execute();
-    $this->assertResults(array(1, 2));
-  }
-
-  /**
-   * Assert the results.
-   *
-   * @param array $expected
-   *   A list of indexes in the $this->entities array.
-   */
-  protected function assertResults($expected) {
-    $this->assertEqual(count($this->queryResults), count($expected));
-    foreach ($expected as $key) {
-      $id = $this->entities[$key]->id();
-      $this->assertEqual($this->queryResults[$id], $id);
-    }
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php
deleted file mode 100644
index 932e5fb..0000000
--- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php
+++ /dev/null
@@ -1,869 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityQueryTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Tests Entity Query functionality.
- *
- * @group Entity
- */
-class EntityQueryTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field_test', 'language');
-
-  /**
-   * @var array
-   */
-  protected $queryResults;
-
-  /**
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $factory;
-
-  /**
-   * A list of bundle machine names created for this test.
-   *
-   * @var string[]
-   */
-  protected $bundles;
-
-  /**
-   * Field name for the greetings field.
-   *
-   * @var string
-   */
-  public $greetings;
-
-  /**
-   * Field name for the figures field.
-   *
-   * @var string
-   */
-  public $figures;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_mulrev');
-
-    $this->installConfig(array('language'));
-
-    $figures = Unicode::strtolower($this->randomMachineName());
-    $greetings = Unicode::strtolower($this->randomMachineName());
-    foreach (array($figures => 'shape', $greetings => 'text') as $field_name => $field_type) {
-      $field_storage = entity_create('field_storage_config', array(
-        'field_name' => $field_name,
-        'entity_type' => 'entity_test_mulrev',
-        'type' => $field_type,
-        'cardinality' => 2,
-      ));
-      $field_storage->save();
-      $field_storages[] = $field_storage;
-    }
-    $bundles = array();
-    for ($i = 0; $i < 2; $i++) {
-      // For the sake of tablesort, make sure the second bundle is higher than
-      // the first one. Beware: MySQL is not case sensitive.
-      do {
-        $bundle = $this->randomMachineName();
-      } while ($bundles && strtolower($bundles[0]) >= strtolower($bundle));
-      entity_test_create_bundle($bundle);
-      foreach ($field_storages as $field_storage) {
-        entity_create('field_config', array(
-          'field_storage' => $field_storage,
-          'bundle' => $bundle,
-        ))->save();
-      }
-      $bundles[] = $bundle;
-    }
-    // Each unit is a list of field name, langcode and a column-value array.
-    $units[] = array($figures, 'en', array(
-      'color' => 'red',
-      'shape' => 'triangle',
-    ));
-    $units[] = array($figures, 'en', array(
-      'color' => 'blue',
-      'shape' => 'circle',
-    ));
-    // To make it easier to test sorting, the greetings get formats according
-    // to their langcode.
-    $units[] = array($greetings, 'tr', array(
-      'value' => 'merhaba',
-      'format' => 'format-tr'
-    ));
-    $units[] = array($greetings, 'pl', array(
-      'value' => 'siema',
-      'format' => 'format-pl'
-    ));
-    // Make these languages available to the greetings field.
-    ConfigurableLanguage::createFromLangcode('tr')->save();
-    ConfigurableLanguage::createFromLangcode('pl')->save();
-    // Calculate the cartesian product of the unit array by looking at the
-    // bits of $i and add the unit at the bits that are 1. For example,
-    // decimal 13 is binary 1101 so unit 3,2 and 0 will be added to the
-    // entity.
-    for ($i = 1; $i <= 15; $i++) {
-      $entity = EntityTestMulRev::create(array(
-        'type' => $bundles[$i & 1],
-        'name' => $this->randomMachineName(),
-        'langcode' => 'en',
-      ));
-      // Make sure the name is set for every language that we might create.
-      foreach (array('tr', 'pl') as $langcode) {
-        $entity->addTranslation($langcode)->name = $this->randomMachineName();
-      }
-      foreach (array_reverse(str_split(decbin($i))) as $key => $bit) {
-        if ($bit) {
-          list($field_name, $langcode, $values) = $units[$key];
-          $entity->getTranslation($langcode)->{$field_name}[] = $values;
-        }
-      }
-      $entity->save();
-    }
-    $this->bundles = $bundles;
-    $this->figures = $figures;
-    $this->greetings = $greetings;
-    $this->factory = \Drupal::service('entity.query');
-  }
-
-  /**
-   * Test basic functionality.
-   */
-  function testEntityQuery() {
-    $greetings = $this->greetings;
-    $figures = $this->figures;
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->exists($greetings, 'tr')
-      ->condition("$figures.color", 'red')
-      ->sort('id')
-      ->execute();
-    // As unit 0 was the red triangle and unit 2 was the turkish greeting,
-    // bit 0 and bit 2 needs to be set.
-    $this->assertResult(5, 7, 13, 15);
-
-    $query = $this->factory->get('entity_test_mulrev', 'OR')
-      ->exists($greetings, 'tr')
-      ->condition("$figures.color", 'red')
-      ->sort('id');
-    $count_query = clone $query;
-    $this->assertEqual(12, $count_query->count()->execute());
-    $this->queryResults = $query->execute();
-    // Now bit 0 (1, 3, 5, 7, 9, 11, 13, 15) or bit 2 (4, 5, 6, 7, 12, 13, 14,
-    // 15) needs to be set.
-    $this->assertResult(1, 3, 4, 5, 6, 7, 9, 11, 12, 13, 14, 15);
-
-    // Test cloning of query conditions.
-    $query = $this->factory->get('entity_test_mulrev')
-      ->condition("$figures.color", 'red')
-      ->sort('id');
-    $cloned_query = clone $query;
-    $cloned_query
-      ->condition("$figures.shape", 'circle');
-    // Bit 0 (1, 3, 5, 7, 9, 11, 13, 15) needs to be set.
-    $this->queryResults = $query->execute();
-    $this->assertResult(1, 3, 5, 7, 9, 11, 13, 15);
-    // No red color has a circle shape.
-    $this->queryResults = $cloned_query->execute();
-    $this->assertResult();
-
-    $query = $this->factory->get('entity_test_mulrev');
-    $group = $query->orConditionGroup()
-      ->exists($greetings, 'tr')
-      ->condition("$figures.color", 'red');
-    $this->queryResults = $query
-      ->condition($group)
-      ->condition("$greetings.value", 'sie', 'STARTS_WITH')
-      ->sort('revision_id')
-      ->execute();
-    // Bit 3 and (bit 0 or 2) -- the above 8 part of the above.
-    $this->assertResult(9, 11, 12, 13, 14, 15);
-
-    // No figure has both the colors blue and red at the same time.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$figures.color", 'blue')
-      ->condition("$figures.color", 'red')
-      ->sort('id')
-      ->execute();
-    $this->assertResult();
-
-    // But an entity might have a red and a blue figure both.
-    $query = $this->factory->get('entity_test_mulrev');
-    $group_blue = $query->andConditionGroup()->condition("$figures.color", 'blue');
-    $group_red = $query->andConditionGroup()->condition("$figures.color", 'red');
-    $this->queryResults = $query
-      ->condition($group_blue)
-      ->condition($group_red)
-      ->sort('revision_id')
-      ->execute();
-    // Unit 0 and unit 1, so bits 0 1.
-    $this->assertResult(3, 7, 11, 15);
-
-    // Do the same test but with IN operator.
-    $query = $this->factory->get('entity_test_mulrev');
-    $group_blue = $query->andConditionGroup()->condition("$figures.color", array('blue'), 'IN');
-    $group_red = $query->andConditionGroup()->condition("$figures.color", array('red'), 'IN');
-    $this->queryResults = $query
-      ->condition($group_blue)
-      ->condition($group_red)
-      ->sort('id')
-      ->execute();
-    // Unit 0 and unit 1, so bits 0 1.
-    $this->assertResult(3, 7, 11, 15);
-
-    // An entity might have either red or blue figure.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$figures.color", array('blue', 'red'), 'IN')
-      ->sort('id')
-      ->execute();
-    // Bit 0 or 1 is on.
-    $this->assertResult(1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15);
-
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->exists("$figures.color")
-      ->notExists("$greetings.value")
-      ->sort('id')
-      ->execute();
-    // Bit 0 or 1 is on but 2 and 3 are not.
-    $this->assertResult(1, 2, 3);
-    // Now update the 'merhaba' string to xsiemax which is not a meaningful
-    // word but allows us to test revisions and string operations.
-    $ids = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'merhaba')
-      ->sort('id')
-      ->execute();
-    $entities = entity_load_multiple('entity_test_mulrev', $ids);
-    $first_entity = reset($entities);
-    $old_name = $first_entity->name->value;
-    foreach ($entities as $entity) {
-      $entity->setNewRevision();
-      $entity->getTranslation('tr')->$greetings->value = 'xsiemax';
-      $entity->name->value .= 'x';
-      $entity->save();
-    }
-    // We changed the entity names, so the current revision should not match.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition('name.value', $old_name)
-      ->execute();
-    $this->assertResult();
-    // Only if all revisions are queried, we find the old revision.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition('name.value', $old_name)
-      ->allRevisions()
-      ->sort('revision_id')
-      ->execute();
-    $this->assertRevisionResult(array($first_entity->id()), array($first_entity->id()));
-    // When querying current revisions, this string is no longer found.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'merhaba')
-      ->execute();
-    $this->assertResult();
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'merhaba')
-      ->allRevisions()
-      ->sort('revision_id')
-      ->execute();
-    // The query only matches the original revisions.
-    $this->assertRevisionResult(array(4, 5, 6, 7, 12, 13, 14, 15), array(4, 5, 6, 7, 12, 13, 14, 15));
-    $results = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'siema', 'CONTAINS')
-      ->sort('id')
-      ->execute();
-    // This matches both the original and new current revisions, multiple
-    // revisions are returned for some entities.
-    $assert = array(16 => '4', 17 => '5', 18 => '6', 19 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 20 => '12', 21 => '13', 22 => '14', 23 => '15');
-    $this->assertIdentical($results, $assert);
-    $results = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'siema', 'STARTS_WITH')
-      ->sort('revision_id')
-      ->execute();
-    // Now we only get the ones that originally were siema, entity id 8 and
-    // above.
-    $this->assertIdentical($results, array_slice($assert, 4, 8, TRUE));
-    $results = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'a', 'ENDS_WITH')
-      ->sort('revision_id')
-      ->execute();
-    // It is very important that we do not get the ones which only have
-    // xsiemax despite originally they were merhaba, ie. ended with a.
-    $this->assertIdentical($results, array_slice($assert, 4, 8, TRUE));
-    $results = $this->factory->get('entity_test_mulrev')
-      ->condition("$greetings.value", 'a', 'ENDS_WITH')
-      ->allRevisions()
-      ->sort('id')
-      ->sort('revision_id')
-      ->execute();
-    // Now we get everything.
-    $assert = array(4 => '4', 5 => '5', 6 => '6', 7 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 12 => '12', 20 => '12', 13 => '13', 21 => '13', 14 => '14', 22 => '14', 15 => '15', 23 => '15');
-    $this->assertIdentical($results, $assert);
-  }
-
-  /**
-   * Test sort().
-   *
-   * Warning: this is complicated.
-   */
-  function testSort() {
-    $greetings = $this->greetings;
-    $figures = $this->figures;
-    // Order up and down on a number.
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->sort('id')
-      ->execute();
-    $this->assertResult(range(1, 15));
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->sort('id', 'DESC')
-      ->execute();
-    $this->assertResult(range(15, 1));
-    $query = $this->factory->get('entity_test_mulrev')
-      ->sort("$figures.color")
-      ->sort("$greetings.format")
-      ->sort('id');
-    // As we do not have any conditions, here are the possible colors and
-    // language codes, already in order, with the first occurrence of the
-    // entity id marked with *:
-    // 8  NULL pl *
-    // 12 NULL pl *
-
-    // 4  NULL tr *
-    // 12 NULL tr
-
-    // 2  blue NULL *
-    // 3  blue NULL *
-
-    // 10 blue pl *
-    // 11 blue pl *
-    // 14 blue pl *
-    // 15 blue pl *
-
-    // 6  blue tr *
-    // 7  blue tr *
-    // 14 blue tr
-    // 15 blue tr
-
-    // 1  red  NULL
-    // 3  red  NULL
-
-    // 9  red  pl *
-    // 11 red  pl
-    // 13 red  pl *
-    // 15 red  pl
-
-    // 5  red  tr *
-    // 7  red  tr
-    // 13 red  tr
-    // 15 red  tr
-    $count_query = clone $query;
-    $this->assertEqual(15, $count_query->count()->execute());
-    $this->queryResults = $query->execute();
-    $this->assertResult(8, 12, 4, 2, 3, 10, 11, 14, 15, 6, 7, 1, 9, 13, 5);
-
-    // Test the pager by setting element #1 to page 2 with a page size of 4.
-    // Results will be #8-12 from above.
-    $request = Request::createFromGlobals();
-    $request->query->replace(array(
-      'page' => '0,2',
-    ));
-    \Drupal::getContainer()->get('request_stack')->push($request);
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->sort("$figures.color")
-      ->sort("$greetings.format")
-      ->sort('id')
-      ->pager(4, 1)
-      ->execute();
-    $this->assertResult(15, 6, 7, 1);
-
-    // Now test the reversed order.
-    $query = $this->factory->get('entity_test_mulrev')
-      ->sort("$figures.color", 'DESC')
-      ->sort("$greetings.format", 'DESC')
-      ->sort('id', 'DESC');
-    $count_query = clone $query;
-    $this->assertEqual(15, $count_query->count()->execute());
-    $this->queryResults = $query->execute();
-    $this->assertResult(15, 13, 7, 5, 11, 9, 3, 1, 14, 6, 10, 2, 12, 4, 8);
-  }
-
-  /**
-   * Test tablesort().
-   */
-  public function testTableSort() {
-    // While ordering on bundles do not give us a definite order, we can still
-    // assert that all entities from one bundle are after the other as the
-    // order dictates.
-    $request = Request::createFromGlobals();
-    $request->query->replace(array(
-      'sort' => 'asc',
-      'order' => 'Type',
-    ));
-    \Drupal::getContainer()->get('request_stack')->push($request);
-
-    $header = array(
-      'id' => array('data' => 'Id', 'specifier' => 'id'),
-      'type' => array('data' => 'Type', 'specifier' => 'type'),
-    );
-
-    $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
-      ->tableSort($header)
-      ->execute());
-    $this->assertBundleOrder('asc');
-
-    $request->query->add(array(
-      'sort' => 'desc',
-    ));
-    \Drupal::getContainer()->get('request_stack')->push($request);
-
-    $header = array(
-      'id' => array('data' => 'Id', 'specifier' => 'id'),
-      'type' => array('data' => 'Type', 'specifier' => 'type'),
-    );
-    $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
-      ->tableSort($header)
-      ->execute());
-    $this->assertBundleOrder('desc');
-
-    // Ordering on ID is definite, however.
-    $request->query->add(array(
-      'order' => 'Id',
-    ));
-    \Drupal::getContainer()->get('request_stack')->push($request);
-    $this->queryResults = $this->factory->get('entity_test_mulrev')
-      ->tableSort($header)
-      ->execute();
-    $this->assertResult(range(15, 1));
-  }
-
-  /**
-   * Test that count queries are separated across entity types.
-   */
-  public function testCount() {
-    // Create a field with the same name in a different entity type.
-    $field_name = $this->figures;
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'shape',
-      'cardinality' => 2,
-      'translatable' => TRUE,
-    ));
-    $field_storage->save();
-    $bundle = $this->randomMachineName();
-    entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => $bundle,
-    ))->save();
-
-    $entity = entity_create('entity_test', array(
-      'id' => 1,
-      'type' => $bundle,
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-
-    // As the single entity of this type we just saved does not have a value
-    // in the color field, the result should be 0.
-    $count = $this->factory->get('entity_test')
-      ->exists("$field_name.color")
-      ->count()
-      ->execute();
-     $this->assertFalse($count);
-  }
-
-  /**
-   * Tests that nested condition groups work as expected.
-   */
-  public function testNestedConditionGroups() {
-    // Query for all entities of the first bundle that have either a red
-    // triangle as a figure or the Turkish greeting as a greeting.
-    $query = $this->factory->get('entity_test_mulrev');
-
-    $first_and = $query->andConditionGroup()
-      ->condition($this->figures . '.color', 'red')
-      ->condition($this->figures . '.shape', 'triangle');
-    $second_and = $query->andConditionGroup()
-      ->condition($this->greetings . '.value', 'merhaba')
-      ->condition($this->greetings . '.format', 'format-tr');
-
-    $or = $query->orConditionGroup()
-      ->condition($first_and)
-      ->condition($second_and);
-
-    $this->queryResults = $query
-      ->condition($or)
-      ->condition('type', reset($this->bundles))
-      ->sort('id')
-      ->execute();
-
-    $this->assertResult(6, 14);
-  }
-
-  protected function assertResult() {
-    $assert = array();
-    $expected = func_get_args();
-    if ($expected && is_array($expected[0])) {
-      $expected = $expected[0];
-    }
-    foreach ($expected as $binary) {
-      $assert[$binary] = strval($binary);
-    }
-    $this->assertIdentical($this->queryResults, $assert);
-  }
-
-  protected function assertRevisionResult($keys, $expected) {
-    $assert = array();
-    foreach ($expected as $key => $binary) {
-      $assert[$keys[$key]] = strval($binary);
-    }
-    $this->assertIdentical($this->queryResults, $assert);
-    return $assert;
-  }
-
-  protected function assertBundleOrder($order) {
-    // This loop is for bundle1 entities.
-    for ($i = 1; $i <= 15; $i +=2) {
-      $ok = TRUE;
-      $index1 = array_search($i, $this->queryResults);
-      $this->assertNotIdentical($index1, FALSE, "$i found at $index1.");
-      // This loop is for bundle2 entities.
-      for ($j = 2; $j <= 15; $j += 2) {
-        if ($ok) {
-          if ($order == 'asc') {
-            $ok = $index1 > array_search($j, $this->queryResults);
-          }
-          else {
-            $ok = $index1 < array_search($j, $this->queryResults);
-          }
-        }
-      }
-      $this->assertTrue($ok, "$i is after all entities in bundle2");
-    }
-  }
-
-  /**
-   * Test adding a tag and metadata to the Entity query object.
-   *
-   * The tags and metadata should propagate to the SQL query object.
-   */
-  public function testMetaData() {
-    $query = \Drupal::entityQuery('entity_test_mulrev');
-    $query
-      ->addTag('efq_metadata_test')
-      ->addMetaData('foo', 'bar')
-      ->execute();
-
-    global $efq_test_metadata;
-    $this->assertEqual($efq_test_metadata, 'bar', 'Tag and metadata propagated to the SQL query object.');
-  }
-
-  /**
-   * Test case sensitive and in-sensitive query conditions.
-   */
-  public function testCaseSensitivity() {
-    $bundle = $this->randomMachineName();
-
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => 'field_ci',
-      'entity_type' => 'entity_test_mulrev',
-      'type' => 'string',
-      'cardinality' => 1,
-      'translatable' => FALSE,
-      'settings' => array(
-        'case_sensitive' => FALSE,
-      )
-    ));
-    $field_storage->save();
-
-    FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => $bundle,
-    ))->save();
-
-    $field_storage = FieldStorageConfig::create(array(
-      'field_name' => 'field_cs',
-      'entity_type' => 'entity_test_mulrev',
-      'type' => 'string',
-      'cardinality' => 1,
-      'translatable' => FALSE,
-      'settings' => array(
-        'case_sensitive' => TRUE,
-      ),
-    ));
-    $field_storage->save();
-
-    FieldConfig::create(array(
-      'field_storage' => $field_storage,
-      'bundle' => $bundle,
-    ))->save();
-
-    $fixtures = array();
-
-    for ($i = 0; $i < 2; $i++) {
-      // If the last 4 of the string are all numbers, then there is no
-      // difference between upper and lowercase and the case sensitive CONTAINS
-      // test will fail. Ensure that can not happen by appending a non-numeric
-      // character. See https://www.drupal.org/node/2397297.
-      $string = $this->randomMachineName(7) . 'a';
-      $fixtures[] = array(
-        'original' => $string,
-        'uppercase' => Unicode::strtoupper($string),
-        'lowercase' => Unicode::strtolower($string),
-      );
-    }
-
-    EntityTestMulRev::create(array(
-      'type' => $bundle,
-      'name' => $this->randomMachineName(),
-      'langcode' => 'en',
-      'field_ci' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase'],
-      'field_cs' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
-    ))->save();
-
-    // Check the case insensitive field, = operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase']
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase']
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, mixed.');
-
-    // Check the case sensitive field, = operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase']
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase']
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
-
-    // Check the case insensitive field, IN operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case insensitive, mixed');
-
-    // Check the case sensitive field, IN operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, mixed');
-
-    // Check the case insensitive field, STARTS_WITH operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[0]['lowercase'], 'STARTS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[0]['uppercase'], 'STARTS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
-
-    // Check the case sensitive field, STARTS_WITH operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[0]['lowercase'], 'STARTS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[0]['uppercase'], 'STARTS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
-
-
-    // Check the case insensitive field, ENDS_WITH operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[1]['lowercase'], 'ENDS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', $fixtures[1]['uppercase'], 'ENDS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
-
-    // Check the case sensitive field, ENDS_WITH operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[1]['lowercase'], 'ENDS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', $fixtures[1]['uppercase'], 'ENDS_WITH'
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
-
-
-    // Check the case insensitive field, CONTAINS operator, use the inner 8
-    // characters of the uppercase and lowercase strings.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_ci', Unicode::strtolower(Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
-
-    // Check the case sensitive field, CONTAINS operator.
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS'
-    )->execute();
-    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
-
-    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
-      'field_cs', Unicode::strtolower(Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS'
-    )->execute();
-    $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
-
-  }
-
-  /**
-   * Test base fields with multiple columns.
-   */
-  public function testBaseFieldMultipleColumns() {
-    $this->enableModules(['taxonomy']);
-    $this->installEntitySchema('taxonomy_term');
-
-    Vocabulary::create(['vid' => 'tags']);
-
-    $term1 = Term::create([
-      'name' => $this->randomMachineName(),
-      'vid' => 'tags',
-      'description' => array(
-        'value' => $this->randomString(),
-        'format' => 'format1',
-      )]);
-    $term1->save();
-
-    $term2 = Term::create([
-      'name' => $this->randomMachineName(),
-      'vid' => 'tags',
-      'description' => array(
-        'value' => $this->randomString(),
-        'format' => 'format2',
-      )]);
-    $term2->save();
-
-    $ids = \Drupal::entityQuery('taxonomy_term')
-      ->condition('description.format', 'format1')
-      ->execute();
-
-    $this->assertEqual(count($ids), 1);
-    $this->assertEqual($term1->id(), reset($ids));
-  }
-
-  /**
-   * Test forward-revisions.
-   */
-  public function testForwardRevisions() {
-    // Ensure entity 14 is returned.
-    $result = \Drupal::entityQuery('entity_test_mulrev')
-      ->condition('id', [14], 'IN')
-      ->execute();
-    $this->assertEqual(count($result), 1);
-
-    // Set a revision on entity 14 that isn't the current default.
-    $entity = EntityTestMulRev::load(14);
-    $current_values = $entity->{$this->figures}->getValue();
-
-    $entity->setNewRevision(TRUE);
-    $entity->isDefaultRevision(FALSE);
-    $entity->{$this->figures}->setValue([
-      'color' => 'red',
-      'shape' => 'square'
-    ]);
-    $entity->save();
-
-    // Entity query should still return entity 14.
-    $result = \Drupal::entityQuery('entity_test_mulrev')
-      ->condition('id', [14], 'IN')
-      ->execute();
-    $this->assertEqual(count($result), 1);
-
-    // Verify that field conditions on the default and forward revision are
-    // work as expected.
-    $result = \Drupal::entityQuery('entity_test_mulrev')
-      ->condition('id', [14], 'IN')
-      ->condition("$this->figures.color", $current_values[0]['color'])
-      ->execute();
-    $this->assertEqual($result, [14 => '14']);
-    $result = $this->factory->get('entity_test_mulrev')
-      ->condition('id', [14], 'IN')
-      ->condition("$this->figures.color", 'red')
-      ->allRevisions()
-      ->execute();
-    $this->assertEqual($result, [16 => '14']);
-  }
-
-  /**
-   * Test against SQL inject of condition field. This covers a
-   * database driver's EntityQuery\Condition class.
-   */
-  public function testInjectionInCondition() {
-    try {
-      $this->queryResults = $this->factory->get('entity_test_mulrev')
-        ->condition('1 ; -- ', array(0, 1), 'IN')
-        ->sort('id')
-        ->execute();
-      $this->fail('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
-    }
-    catch (\Exception $e) {
-      $this->pass('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
-    }
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php
deleted file mode 100644
index aa49b84..0000000
--- a/core/modules/system/src/Tests/Entity/EntityReferenceFieldTest.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityReferenceFieldTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageException;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-use Drupal\user\RoleInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Tests for the entity reference field.
- *
- * @group Entity
- */
-class EntityReferenceFieldTest extends EntityUnitTestBase {
-
-  use SchemaCheckTestTrait;
-  use EntityReferenceTestTrait;
-
-  /**
-   * The entity type used in this test.
-   *
-   * @var string
-   */
-  protected $entityType = 'entity_test';
-
-  /**
-   * The entity type that is being referenced.
-   *
-   * @var string
-   */
-  protected $referencedEntityType = 'entity_test_rev';
-
-  /**
-   * The bundle used in this test.
-   *
-   * @var string
-   */
-  protected $bundle = 'entity_test';
-
-  /**
-   * The name of the field used in this test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'field_test';
-
-  /**
-   * Modules to install.
-   *
-   * @var array
-   */
-  public static $modules = array('entity_reference_test');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-
-    // Create a field.
-    $this->createEntityReferenceField(
-      $this->entityType,
-      $this->bundle,
-      $this->fieldName,
-      'Field test',
-      $this->referencedEntityType,
-      'default',
-      array('target_bundles' => array($this->bundle)),
-      FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
-    );
-
-  }
-
-  /**
-   * Tests reference field validation.
-   */
-  public function testEntityReferenceFieldValidation() {
-    // Test a valid reference.
-    $referenced_entity = entity_create($this->referencedEntityType, array('type' => $this->bundle));
-    $referenced_entity->save();
-
-    $entity = entity_create($this->entityType, array('type' => $this->bundle));
-    $entity->{$this->fieldName}->target_id = $referenced_entity->id();
-    $violations = $entity->{$this->fieldName}->validate();
-    $this->assertEqual($violations->count(), 0, 'Validation passes.');
-
-    // Test an invalid reference.
-    $entity->{$this->fieldName}->target_id = 9999;
-    $violations = $entity->{$this->fieldName}->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
-    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => $this->referencedEntityType, '%id' => 9999)));
-
-    // Test a non-referenceable bundle.
-    entity_test_create_bundle('non_referenceable', NULL, $this->referencedEntityType);
-    $referenced_entity = entity_create($this->referencedEntityType, array('type' => 'non_referenceable'));
-    $referenced_entity->save();
-    $entity->{$this->fieldName}->target_id = $referenced_entity->id();
-    $violations = $entity->{$this->fieldName}->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
-    $this->assertEqual($violations[0]->getMessage(), t('This entity (%type: %id) cannot be referenced.', array('%type' => $this->referencedEntityType, '%id' => $referenced_entity->id())));
-  }
-
-  /**
-   * Tests the multiple target entities loader.
-   */
-  public function testReferencedEntitiesMultipleLoad() {
-    // Create the parent entity.
-    $entity = entity_create($this->entityType, array('type' => $this->bundle));
-
-    // Create three target entities and attach them to parent field.
-    $target_entities = array();
-    $reference_field = array();
-    for ($i = 0; $i < 3; $i++) {
-      $target_entity = entity_create($this->referencedEntityType, array('type' => $this->bundle));
-      $target_entity->save();
-      $target_entities[] = $target_entity;
-      $reference_field[]['target_id'] = $target_entity->id();
-    }
-
-    // Also attach a non-existent entity and a NULL target id.
-    $reference_field[3]['target_id'] = 99999;
-    $target_entities[3] = NULL;
-    $reference_field[4]['target_id'] = NULL;
-    $target_entities[4] = NULL;
-
-    // Attach the first created target entity as the sixth item ($delta == 5) of
-    // the parent entity field. We want to test the case when the same target
-    // entity is referenced twice (or more times) in the same entity reference
-    // field.
-    $reference_field[5] = $reference_field[0];
-    $target_entities[5] = $target_entities[0];
-
-    // Create a new target entity that is not saved, thus testing the
-    // "autocreate" feature.
-    $target_entity_unsaved = entity_create($this->referencedEntityType, array('type' => $this->bundle, 'name' => $this->randomString()));
-    $reference_field[6]['entity'] = $target_entity_unsaved;
-    $target_entities[6] = $target_entity_unsaved;
-
-    // Set the field value.
-    $entity->{$this->fieldName}->setValue($reference_field);
-
-    // Load the target entities using EntityReferenceField::referencedEntities().
-    $entities = $entity->{$this->fieldName}->referencedEntities();
-
-    // Test returned entities:
-    // - Deltas must be preserved.
-    // - Non-existent entities must not be retrieved in target entities result.
-    foreach ($target_entities as $delta => $target_entity) {
-      if (!empty($target_entity)) {
-        if (!$target_entity->isNew()) {
-          // There must be an entity in the loaded set having the same id for
-          // the same delta.
-          $this->assertEqual($target_entity->id(), $entities[$delta]->id());
-        }
-        else {
-          // For entities that were not yet saved, there must an entity in the
-          // loaded set having the same label for the same delta.
-          $this->assertEqual($target_entity->label(), $entities[$delta]->label());
-        }
-      }
-      else {
-        // A non-existent or NULL entity target id must not return any item in
-        // the target entities set.
-        $this->assertFalse(isset($entities[$delta]));
-      }
-    }
-  }
-
-  /**
-   * Tests referencing entities with string IDs.
-   */
-  public function testReferencedEntitiesStringId() {
-    $field_name = 'entity_reference_string_id';
-    $this->installEntitySchema('entity_test_string_id');
-    $this->createEntityReferenceField(
-      $this->entityType,
-      $this->bundle,
-      $field_name,
-      'Field test',
-      'entity_test_string_id',
-      'default',
-      array('target_bundles' => array($this->bundle)),
-      FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
-    );
-    // Create the parent entity.
-    $entity = entity_create($this->entityType, array('type' => $this->bundle));
-
-    // Create the default target entity.
-    $target_entity = entity_create('entity_test_string_id', array('id' => $this->randomString(), 'type' => $this->bundle));
-    $target_entity->save();
-
-    // Set the field value.
-    $entity->{$field_name}->setValue(array(array('target_id' => $target_entity->id())));
-
-    // Load the target entities using EntityReferenceField::referencedEntities().
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEqual($entities[0]->id(), $target_entity->id());
-
-    // Test that a string ID works as a default value and the field's config
-    // schema is correct.
-    $field = FieldConfig::loadByName($this->entityType, $this->bundle, $field_name);
-    $field->setDefaultValue($target_entity->id());
-    $field->save();
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'field.field.' . $field->id(), $field->toArray());
-
-    // Test that the default value works.
-    $entity = entity_create($this->entityType, array('type' => $this->bundle));
-    $entities = $entity->{$field_name}->referencedEntities();
-    $this->assertEqual($entities[0]->id(), $target_entity->id());
-  }
-
-  /**
-   * Tests all the possible ways to autocreate an entity via the API.
-   */
-  function testAutocreateApi() {
-    $entity = $this->entityManager
-      ->getStorage($this->entityType)
-      ->create(array('name' => $this->randomString()));
-
-    // Test content entity autocreation.
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->set('user_id', $user);
-    });
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->set('user_id', $user, FALSE);
-    });
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id->setValue($user);
-    });
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id[0]->get('entity')->setValue($user);
-    });
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id->setValue(array('entity' => $user, 'target_id' => NULL));
-    });
-    try {
-      $message = 'Setting both the entity and an invalid target_id property fails.';
-      $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-        $user->save();
-        $entity->user_id->setValue(array('entity' => $user, 'target_id' => $this->generateRandomEntityId()));
-      });
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id = $user;
-    });
-    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
-      $entity->user_id->entity = $user;
-    });
-
-    // Test config entity autocreation.
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->set('user_role', $role);
-    });
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->set('user_role', $role, FALSE);
-    });
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role->setValue($role);
-    });
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role[0]->get('entity')->setValue($role);
-    });
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role->setValue(array('entity' => $role, 'target_id' => NULL));
-    });
-    try {
-      $message = 'Setting both the entity and an invalid target_id property fails.';
-      $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-        $role->save();
-        $entity->user_role->setValue(array('entity' => $role, 'target_id' => $this->generateRandomEntityId(TRUE)));
-      });
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role = $role;
-    });
-    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
-      $entity->user_role->entity = $role;
-    });
-
-    // Test target entity saving after setting it as new.
-    $storage = $this->entityManager->getStorage('user');
-    $user_id = $this->generateRandomEntityId();
-    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
-    $entity->user_id = $user;
-    $user->save();
-    $entity->save();
-    $this->assertEqual($entity->user_id->target_id, $user->id());
-  }
-
-  /**
-   * Asserts that the setter callback performs autocreation for users.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The referencing entity.
-   * @param $setter_callback
-   *   A callback setting the target entity on the referencing entity.
-   *
-   * @return bool
-   *   TRUE if the user was autocreated, FALSE otherwise.
-   */
-  protected function assertUserAutocreate(EntityInterface $entity, $setter_callback) {
-    $storage = $this->entityManager->getStorage('user');
-    $user_id = $this->generateRandomEntityId();
-    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
-    $setter_callback($entity, $user);
-    $entity->save();
-    $storage->resetCache();
-    $user = User::load($user_id);
-    return $this->assertEqual($entity->user_id->target_id, $user->id());
-  }
-
-  /**
-   * Asserts that the setter callback performs autocreation for user roles.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The referencing entity.
-   * @param $setter_callback
-   *   A callback setting the target entity on the referencing entity.
-   *
-   * @return bool
-   *   TRUE if the user was autocreated, FALSE otherwise.
-   */
-  protected function assertUserRoleAutocreate(EntityInterface $entity, $setter_callback) {
-    $storage = $this->entityManager->getStorage('user_role');
-    $role_id = $this->generateRandomEntityId(TRUE);
-    $role = $storage->create(array('id' => $role_id, 'label' => $this->randomString()));
-    $setter_callback($entity, $role);
-    $entity->save();
-    $storage->resetCache();
-    $role = Role::load($role_id);
-    return $this->assertEqual($entity->user_role->target_id, $role->id());
-  }
-
-  /**
-   * Tests that the target entity is not unnecessarily loaded.
-   */
-  public function testTargetEntityNoLoad() {
-    // Setup a test entity type with an entity reference field to itself. We use
-    // a special storage class throwing exceptions when a load operation is
-    // triggered to be able to detect them.
-    $entity_type = clone $this->entityManager->getDefinition('entity_test_update');
-    $entity_type->setHandlerClass('storage', '\Drupal\entity_test\EntityTestNoLoadStorage');
-    $this->state->set('entity_test_update.entity_type', $entity_type);
-    $definitions = array(
-      'target_reference' => BaseFieldDefinition::create('entity_reference')
-        ->setSetting('target_type', $entity_type->id())
-        ->setSetting('handler', 'default')
-    );
-    $this->state->set('entity_test_update.additional_base_field_definitions', $definitions);
-    $this->entityManager->clearCachedDefinitions();
-    $this->installEntitySchema($entity_type->id());
-
-    // Create the target entity.
-    $storage = $this->entityManager->getStorage($entity_type->id());
-    $target_id = $this->generateRandomEntityId();
-    $target = $storage->create(array('id' => $target_id, 'name' => $this->randomString()));
-    $target->save();
-    $this->assertEqual($target_id, $target->id(), 'The target entity has a random identifier.');
-
-    // Check that populating the reference with an existing target id does not
-    // trigger a load operation.
-    $message = 'The target entity was not loaded.';
-    try {
-      $entity = $this->entityManager
-        ->getStorage($entity_type->id())
-        ->create(array('name' => $this->randomString()));
-      $entity->target_reference = $target_id;
-      $this->pass($message);
-    }
-    catch (EntityStorageException $e) {
-      $this->fail($message);
-    }
-
-    // Check that the storage actually triggers the expected exception when
-    // trying to load the target entity.
-    $message = 'An exception is thrown when trying to load the target entity';
-    try {
-      $storage->load($target_id);
-      $this->fail($message);
-    }
-    catch (EntityStorageException $e) {
-      $this->pass($message);
-    }
-  }
-
-  /**
-   * Tests the dependencies entity reference fields are created with.
-   */
-  public function testEntityReferenceFieldDependencies() {
-    $field_name = 'user_reference_field';
-    $entity_type = 'entity_test';
-
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => $field_name,
-      'type' => 'entity_reference',
-      'entity_type' => $entity_type,
-      'settings' => [
-        'target_type' => 'user',
-      ],
-    ]);
-    $field_storage->save();
-    $this->assertEqual(['module' => ['entity_test', 'user']], $field_storage->getDependencies());
-
-    $field = FieldConfig::create([
-      'field_name' => $field_name,
-      'entity_type' => $entity_type,
-      'bundle' => 'entity_test',
-      'label' => $field_name,
-      'settings' => [
-        'handler' => 'default',
-      ],
-    ]);
-    $field->save();
-    $this->assertEqual(['config' => ['field.storage.entity_test.user_reference_field'], 'module' => ['entity_test']], $field->getDependencies());
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
index 46cc952..b3fe06f 100644
--- a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php
@@ -11,8 +11,10 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\comment\CommentInterface;
+use Drupal\node\Entity\Node;
 use Drupal\simpletest\WebTestBase;
 use Drupal\user\Entity\User;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests for the base handlers provided by Entity Reference.
@@ -107,7 +109,7 @@ public function testNodeHandler() {
     $nodes = array();
     $node_labels = array();
     foreach ($node_values as $key => $values) {
-      $node = entity_create('node', $values);
+      $node = Node::create($values);
       $node->save();
       $nodes[$key] = $node;
       $node_labels[$key] = Html::escape($node->label());
@@ -234,7 +236,7 @@ public function testUserHandler() {
     $user_labels = array();
     foreach ($user_values as $key => $values) {
       if (is_array($values)) {
-        $account = entity_create('user', $values);
+        $account = User::create($values);
         $account->save();
       }
       else {
@@ -366,7 +368,7 @@ public function testCommentHandler() {
     );
     $nodes = array();
     foreach ($node_values as $key => $values) {
-      $node = entity_create('node', $values);
+      $node = Node::create($values);
       $node->save();
       $nodes[$key] = $node;
     }
@@ -413,7 +415,7 @@ public function testCommentHandler() {
     $comments = array();
     $comment_labels = array();
     foreach ($comment_values as $key => $values) {
-      $comment = entity_create('comment', $values);
+      $comment = Comment::create($values);
       $comment->save();
       $comments[$key] = $comment;
       $comment_labels[$key] = Html::escape($comment->label());
diff --git a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php b/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
deleted file mode 100644
index 3d0d4d1..0000000
--- a/core/modules/system/src/Tests/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityReferenceSelection\EntityReferenceSelectionSortTest.
- */
-
-namespace Drupal\system\Tests\Entity\EntityReferenceSelection;
-
-use Drupal\Component\Utility\Html;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests sorting referenced items.
- *
- * @group entity_reference
- */
-class EntityReferenceSelectionSortTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node');
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create an Article node type.
-    $article = NodeType::create(array(
-      'type' => 'article',
-    ));
-    $article->save();
-
-    // Test as a non-admin.
-    $normal_user = $this->createUser(array(), array('access content'));
-    \Drupal::currentUser()->setAccount($normal_user);
-  }
-
-  /**
-   * Assert sorting by field and property.
-   */
-  public function testSort() {
-    // Add text field to entity, to sort by.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_text',
-      'entity_type' => 'node',
-      'type' => 'text',
-      'entity_types' => array('node'),
-    ))->save();
-
-    entity_create('field_config', array(
-      'label' => 'Text Field',
-      'field_name' => 'field_text',
-      'entity_type' => 'node',
-      'bundle' => 'article',
-      'settings' => array(),
-      'required' => FALSE,
-    ))->save();
-
-    // Build a set of test data.
-    $node_values = array(
-      'published1' => array(
-        'type' => 'article',
-        'status' => 1,
-        'title' => 'Node published1 (<&>)',
-        'uid' => 1,
-        'field_text' => array(
-          array(
-            'value' => 1,
-          ),
-        ),
-      ),
-      'published2' => array(
-        'type' => 'article',
-        'status' => 1,
-        'title' => 'Node published2 (<&>)',
-        'uid' => 1,
-        'field_text' => array(
-          array(
-            'value' => 2,
-          ),
-        ),
-      ),
-    );
-
-    $nodes = array();
-    $node_labels = array();
-    foreach ($node_values as $key => $values) {
-      $node = Node::create($values);
-      $node->save();
-      $nodes[$key] = $node;
-      $node_labels[$key] = Html::escape($node->label());
-    }
-
-    $selection_options = array(
-      'target_type' => 'node',
-      'handler' => 'default',
-      'handler_settings' => array(
-        'target_bundles' => NULL,
-        // Add sorting.
-        'sort' => array(
-          'field' => 'field_text.value',
-          'direction' => 'DESC',
-        ),
-      ),
-    );
-    $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
-
-    // Not only assert the result, but make sure the keys are sorted as
-    // expected.
-    $result = $handler->getReferenceableEntities();
-    $expected_result = array(
-      $nodes['published2']->id() => $node_labels['published2'],
-      $nodes['published1']->id() => $node_labels['published1'],
-    );
-    $this->assertIdentical($result['article'], $expected_result, 'Query sorted by field returned expected values.');
-
-    // Assert sort by base field.
-    $selection_options['handler_settings']['sort'] = array(
-      'field' => 'nid',
-      'direction' => 'ASC',
-    );
-    $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
-    $result = $handler->getReferenceableEntities();
-    $expected_result = array(
-      $nodes['published1']->id() => $node_labels['published1'],
-      $nodes['published2']->id() => $node_labels['published2'],
-    );
-    $this->assertIdentical($result['article'], $expected_result, 'Query sorted by property returned expected values.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityRevisionTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionTranslationTest.php
deleted file mode 100644
index 0250d96..0000000
--- a/core/modules/system/src/Tests/Entity/EntityRevisionTranslationTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityRevisionTranslationTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests proper revision propagation of entities.
- *
- * @group Entity
- */
-class EntityRevisionTranslationTest extends EntityUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['language'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Enable an additional language.
-    ConfigurableLanguage::createFromLangcode('de')->save();
-
-    $this->installEntitySchema('entity_test_mulrev');
-  }
-
-  /**
-   * Tests if the translation object has the right revision id after new revision.
-   */
-  public function testNewRevisionAfterTranslation() {
-    $user = $this->createUser();
-
-    // Create a test entity.
-    $entity = EntityTestMulRev::create([
-      'name' => $this->randomString(),
-      'user_id' => $user->id(),
-      'language' => 'en',
-    ]);
-    $entity->save();
-    $old_rev_id = $entity->getRevisionId();
-
-    $translation = $entity->addTranslation('de');
-    $translation->setNewRevision();
-    $translation->save();
-
-    $this->assertTrue($translation->getRevisionId() > $old_rev_id, 'The saved translation in new revision has a newer revision id.');
-    $this->assertTrue($this->reloadEntity($entity)->getRevisionId() > $old_rev_id, 'The entity from the storage has a newer revision id.');
-  }
-
-  /**
-   * Tests if the translation object has the right revision id after new revision.
-   */
-  public function testRevertRevisionAfterTranslation() {
-    $user = $this->createUser();
-    $storage = $this->entityManager->getStorage('entity_test_mulrev');
-
-    // Create a test entity.
-    $entity = EntityTestMulRev::create([
-      'name' => $this->randomString(),
-      'user_id' => $user->id(),
-      'language' => 'en',
-    ]);
-    $entity->save();
-    $old_rev_id = $entity->getRevisionId();
-
-    $translation = $entity->addTranslation('de');
-    $translation->setNewRevision();
-    $translation->save();
-
-    $entity = $this->reloadEntity($entity);
-
-    $this->assertTrue($entity->hasTranslation('de'));
-
-    $entity = $storage->loadRevision($old_rev_id);
-
-    $entity->setNewRevision();
-    $entity->isDefaultRevision(TRUE);
-    $entity->save();
-
-    $entity = $this->reloadEntity($entity);
-
-    $this->assertFalse($entity->hasTranslation('de'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
index 39f04c3..057d23a 100644
--- a/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityRevisionsTest.php
@@ -62,10 +62,12 @@ public function testRevisions() {
   protected function runRevisionsTests($entity_type) {
 
     // Create initial entity.
-    $entity = entity_create($entity_type, array(
-      'name' => 'foo',
-      'user_id' => $this->webUser->id(),
-    ));
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => 'foo',
+        'user_id' => $this->webUser->id(),
+      ));
     $entity->field_test_text->value = 'bar';
     $entity->save();
 
diff --git a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php b/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
deleted file mode 100644
index 08395ff..0000000
--- a/core/modules/system/src/Tests/Entity/EntitySchemaTest.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntitySchemaTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\SafeMarkup;
-
-/**
- * Tests adding a custom bundle field.
- *
- * @group system
- */
-class EntitySchemaTest extends EntityUnitTestBase  {
-
-  /**
-   * The database connection used.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('user', array('users_data'));
-    $this->installSchema('system', array('router'));
-    $this->database = $this->container->get('database');
-  }
-
-  /**
-   * Tests the custom bundle field creation and deletion.
-   */
-  public function testCustomFieldCreateDelete() {
-    // Install the module which adds the field.
-    $this->installModule('entity_schema_test');
-    $this->entityManager->clearCachedDefinitions();
-    $storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test');
-    $this->assertNotNull($storage_definitions['custom_base_field'], 'Base field definition found.');
-    $this->assertNotNull($storage_definitions['custom_bundle_field'], 'Bundle field definition found.');
-
-    // Make sure the field schema can be created.
-    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_base_field']);
-    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']);
-    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-    $table_mapping = $this->entityManager->getStorage('entity_test')->getTableMapping();
-    $base_table = current($table_mapping->getTableNames());
-    $base_column = current($table_mapping->getColumnNames('custom_base_field'));
-    $this->assertTrue($this->database->schema()->fieldExists($base_table, $base_column), 'Table column created');
-    $table = $table_mapping->getDedicatedDataTableName($storage_definitions['custom_bundle_field']);
-    $this->assertTrue($this->database->schema()->tableExists($table), 'Table created');
-
-    // Make sure the field schema can be deleted.
-    $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_base_field']);
-    $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_bundle_field']);
-    $this->assertFalse($this->database->schema()->fieldExists($base_table, $base_column), 'Table column dropped');
-    $this->assertFalse($this->database->schema()->tableExists($table), 'Table dropped');
-  }
-
-  /**
-   * Updates the entity type definition.
-   *
-   * @param bool $alter
-   *   Whether the original definition should be altered or not.
-   */
-  protected function updateEntityType($alter) {
-    $entity_test_id = 'entity_test';
-    $original = $this->entityManager->getDefinition($entity_test_id);
-    $this->entityManager->clearCachedDefinitions();
-    $this->state->set('entity_schema_update', $alter);
-    $entity_type = $this->entityManager->getDefinition($entity_test_id);
-    $this->entityManager->onEntityTypeUpdate($entity_type, $original);
-  }
-
-  /**
-   * Tests that entity schema responds to changes in the entity type definition.
-   */
-  public function testEntitySchemaUpdate() {
-    $this->installModule('entity_schema_test');
-    $storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test');
-    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_base_field']);
-    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']);
-    $schema_handler = $this->database->schema();
-    $tables = array('entity_test', 'entity_test_revision', 'entity_test_field_data', 'entity_test_field_revision');
-    $dedicated_tables = array('entity_test__custom_bundle_field', 'entity_test_revision__custom_bundle_field');
-
-    // Initially only the base table and the dedicated field data table should
-    // exist.
-    foreach ($tables as $index => $table) {
-      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
-    }
-    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
-
-    // Update the entity type definition and check that the entity schema now
-    // supports translations and revisions.
-    $this->updateEntityType(TRUE);
-    foreach ($tables as $table) {
-      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
-    }
-    foreach ($dedicated_tables as $table) {
-      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
-    }
-
-    // Revert changes and check that the entity schema now does not support
-    // neither translations nor revisions.
-    $this->updateEntityType(FALSE);
-    foreach ($tables as $index => $table) {
-      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
-    }
-    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function refreshServices() {
-    parent::refreshServices();
-    $this->database = $this->container->get('database');
-  }
-
-  /**
-   * Tests that modifying the UUID field for a translatable entity works.
-   */
-  public function testModifyingTranslatableColumnSchema() {
-    $this->installModule('entity_schema_test');
-    $this->updateEntityType(TRUE);
-    $fields = ['revision_log', 'uuid'];
-    foreach ($fields as $field_name) {
-      $original_definition = $this->entityManager->getBaseFieldDefinitions('entity_test')[$field_name];
-      $new_definition = clone $original_definition;
-      $new_definition->setLabel($original_definition->getLabel() . ', the other one');
-      $this->assertTrue($this->entityManager->getStorage('entity_test')
-        ->requiresFieldDataMigration($new_definition, $original_definition));
-    }
-  }
-
-  /**
-   * Tests fields from an uninstalled module are removed from the schema.
-   */
-  public function testCleanUpStorageDefinition() {
-    // Find all the entity types provided by the entity_test module and install
-    // the schema for them.
-    $entity_type_ids = [];
-    $entities = \Drupal::entityManager()->getDefinitions();
-    foreach ($entities as $entity_type_id => $definition) {
-      if ($definition->getProvider() == 'entity_test') {
-        $this->installEntitySchema($entity_type_id);
-        $entity_type_ids[] = $entity_type_id;
-      };
-    }
-
-    // Get a list of all the entities in the schema.
-    $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
-    $schema = $key_value_store->getAll();
-
-    // Count the storage definitions provided by the entity_test module, so that
-    // after uninstall we can be sure there were some to be deleted.
-    $entity_type_id_count = 0;
-
-    foreach (array_keys($schema) as $storage_definition_name) {
-      list($entity_type_id, ,) = explode('.', $storage_definition_name);
-      if (in_array($entity_type_id, $entity_type_ids)) {
-        $entity_type_id_count++;
-      }
-    }
-
-    // Ensure that there are storage definitions from the entity_test module.
-    $this->assertNotEqual($entity_type_id_count, 0, 'There are storage definitions provided by the entity_test module in the schema.');
-
-    // Uninstall the entity_test module.
-    $this->container->get('module_installer')->uninstall(array('entity_test'));
-
-    // Get a list of all the entities in the schema.
-    $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
-    $schema = $key_value_store->getAll();
-
-    // Count the storage definitions that come from entity types provided by
-    // the entity_test module.
-    $entity_type_id_count = 0;
-
-    foreach (array_keys($schema) as $storage_definition_name) {
-      list($entity_type_id, ,) = explode('.', $storage_definition_name);
-      if (in_array($entity_type_id, $entity_type_ids)) {
-        $entity_type_id_count++;
-      }
-    }
-
-    // Ensure that all storage definitions have been removed from the schema.
-    $this->assertEqual($entity_type_id_count, 0, 'After uninstalling entity_test module the schema should not contains fields from entities provided by the module.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php b/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
deleted file mode 100644
index de62ba7..0000000
--- a/core/modules/system/src/Tests/Entity/EntityTranslationTest.php
+++ /dev/null
@@ -1,925 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityTranslationTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\language\Entity\ConfigurableLanguage;
-
-/**
- * Tests entity translation functionality.
- *
- * @group Entity
- */
-class EntityTranslationTest extends EntityLanguageTestBase {
-
-  /**
-   * Tests language related methods of the Entity class.
-   */
-  public function testEntityLanguageMethods() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->doTestEntityLanguageMethods($entity_type);
-    }
-  }
-
-  /**
-   * Executes the entity language method tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestEntityLanguageMethods($entity_type) {
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $entity = entity_create($entity_type, array(
-      'name' => 'test',
-      'user_id' => $this->container->get('current_user')->id(),
-    ));
-    $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), format_string('%entity_type: Entity created with API has default language.', array('%entity_type' => $entity_type)));
-    $entity = entity_create($entity_type, array(
-      'name' => 'test',
-      'user_id' => \Drupal::currentUser()->id(),
-      $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
-    $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
-    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
-
-    // Set the value in default language.
-    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
-    // Get the value.
-    $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get($this->fieldName);
-    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
-
-    // Try to get add a translation to language neutral entity.
-    $message = 'Adding a translation to a language-neutral entity results in an error.';
-    try {
-      $entity->addTranslation($this->langcodes[1]);
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-
-    // Now, make the entity language-specific by assigning a language and test
-    // translating it.
-    $default_langcode = $this->langcodes[0];
-    $entity->{$langcode_key}->value = $default_langcode;
-    $entity->{$this->fieldName} = array();
-    $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
-
-    // Set the value in default language.
-    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
-    // Get the value.
-    $field = $entity->get($this->fieldName);
-    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
-
-    // Set a translation.
-    $entity->addTranslation($this->langcodes[1])->set($this->fieldName, array(0 => array('value' => 'translation 1')));
-    $field = $entity->getTranslation($this->langcodes[1])->{$this->fieldName};
-    $this->assertEqual($field->value, 'translation 1', format_string('%entity_type: Translated value set.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $this->langcodes[1], format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
-
-    // Make sure the untranslated value stays.
-    $field = $entity->get($this->fieldName);
-    $this->assertEqual($field->value, 'default value', 'Untranslated value stays.');
-    $this->assertEqual($field->getLangcode(), $default_langcode, 'Untranslated value has the expected langcode.');
-
-    $translations[$this->langcodes[1]] = \Drupal::languageManager()->getLanguage($this->langcodes[1]);
-    $this->assertEqual($entity->getTranslationLanguages(FALSE), $translations, 'Translations retrieved.');
-
-    // Try to get a value using a language code for a non-existing translation.
-    $message = 'Getting a non existing translation results in an error.';
-    try {
-      $entity->getTranslation($this->langcodes[2])->get($this->fieldName)->value;
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-
-    // Try to get a not available translation.
-    $this->assertNull($entity->addTranslation($this->langcodes[2])->get($this->fieldName)->value, format_string('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type)));
-
-    // Try to get a value using an invalid language code.
-    $message = 'Getting an invalid translation results in an error.';
-    try {
-      $entity->getTranslation('invalid')->get($this->fieldName)->value;
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-
-    // Try to set a value using an invalid language code.
-    try {
-      $entity->getTranslation('invalid')->set($this->fieldName, NULL);
-      $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
-    }
-
-    // Set the value in default language.
-    $field_name = 'field_test_text';
-    $entity->getTranslation($this->langcodes[1])->set($field_name, array(0 => array('value' => 'default value2')));
-    // Get the value.
-    $field = $entity->get($field_name);
-    $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Tests multilingual properties.
-   */
-  public function testMultilingualProperties() {
-    // Test all entity variations with data table support.
-    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
-      $this->doTestMultilingualProperties($entity_type);
-    }
-  }
-
-  /**
-   * Executes the multilingual property tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestMultilingualProperties($entity_type) {
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $default_langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('default_langcode');
-    $name = $this->randomMachineName();
-    $uid = mt_rand(0, 127);
-    $langcode = $this->langcodes[0];
-
-    // Create a language neutral entity and check that properties are stored
-    // as language neutral.
-    $entity = entity_create($entity_type, array('name' => $name, 'user_id' => $uid, $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED));
-    $entity->save();
-    $entity = entity_load($entity_type, $entity->id());
-    $default_langcode = $entity->language()->getId();
-    $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type)));
-    $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
-
-    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT);
-    $field = $translation->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $translation->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type)));
-    $field = $entity->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
-
-    // Create a language-aware entity and check that properties are stored
-    // as language-aware.
-    $entity = entity_create($entity_type, array('name' => $name, 'user_id' => $uid, $langcode_key => $langcode));
-    $entity->save();
-    $entity = entity_load($entity_type, $entity->id());
-    $default_langcode = $entity->language()->getId();
-    $this->assertEqual($default_langcode, $langcode, format_string('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type)));
-    $field = $entity->getTranslation($langcode)->get('name');
-    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
-    $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
-
-    // Create property translations.
-    $properties = array();
-    $default_langcode = $langcode;
-    foreach ($this->langcodes as $langcode) {
-      if ($langcode != $default_langcode) {
-        $properties[$langcode] = array(
-          'name' => array(0 => $this->randomMachineName()),
-          'user_id' => array(0 => mt_rand(128, 256)),
-        );
-      }
-      else {
-        $properties[$langcode] = array(
-          'name' => array(0 => $name),
-          'user_id' => array(0 => $uid),
-        );
-      }
-      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
-      foreach ($properties[$langcode] as $field_name => $values) {
-        $translation->set($field_name, $values);
-      }
-    }
-    $entity->save();
-
-    // Check that property translation were correctly stored.
-    $entity = entity_load($entity_type, $entity->id());
-    foreach ($this->langcodes as $langcode) {
-      $args = array(
-        '%entity_type' => $entity_type,
-        '%langcode' => $langcode,
-      );
-      $field = $entity->getTranslation($langcode)->get('name');
-      $this->assertEqual($properties[$langcode]['name'][0], $field->value, format_string('%entity_type: The entity name has been correctly stored for language %langcode.', $args));
-      $field_langcode = ($langcode == $entity->language()->getId()) ? $default_langcode : $langcode;
-      $this->assertEqual($field_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expected langcode  %langcode.', $args));
-      $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored for language %langcode.', $args));
-    }
-
-    // Test query conditions (cache is reset at each call).
-    $translated_id = $entity->id();
-    // Create an additional entity with only the uid set. The uid for the
-    // original language is the same of one used for a translation.
-    $langcode = $this->langcodes[1];
-    entity_create($entity_type, array(
-      'user_id' => $properties[$langcode]['user_id'],
-      'name' => 'some name',
-      $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ))->save();
-
-    $entities = entity_load_multiple($entity_type);
-    $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', array('%entity_type' => $entity_type)));
-    $entities = entity_load_multiple($entity_type, array($translated_id));
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type)));
-    $entities = entity_load_multiple_by_properties($entity_type, array('name' => $name));
-    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type)));
-    // @todo The default language condition should go away in favor of an
-    // explicit parameter.
-    $entities = entity_load_multiple_by_properties($entity_type, array('name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type)));
-    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $default_langcode, 'name' => $name));
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type)));
-
-    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0]));
-    $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type)));
-    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
-    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type)));
-    $entities = entity_load_multiple_by_properties($entity_type, array('user_id' => $properties[$langcode]['user_id'][0], $default_langcode_key => NULL));
-    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type)));
-
-    // Test property conditions and orders with multiple languages in the same
-    // query.
-    $query = \Drupal::entityQuery($entity_type);
-    $group = $query->andConditionGroup()
-      ->condition('user_id', $properties[$default_langcode]['user_id'][0], '=', $default_langcode)
-      ->condition('name', $properties[$default_langcode]['name'][0], '=', $default_langcode);
-    $result = $query
-      ->condition($group)
-      ->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
-      ->execute();
-    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type)));
-
-    // Test mixed property and field conditions.
-    $entity = entity_load($entity_type, reset($result), TRUE);
-    $field_value = $this->randomString();
-    $entity->getTranslation($langcode)->set($this->fieldName, array(array('value' => $field_value)));
-    $entity->save();
-    $query = \Drupal::entityQuery($entity_type);
-    $default_langcode_group = $query->andConditionGroup()
-      ->condition('user_id', $properties[$default_langcode]['user_id'][0], '=', $default_langcode)
-      ->condition('name', $properties[$default_langcode]['name'][0], '=', $default_langcode);
-    $langcode_group = $query->andConditionGroup()
-      ->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
-      ->condition("$this->fieldName.value", $field_value, '=', $langcode);
-    $result = $query
-      ->condition($langcode_key, $default_langcode)
-      ->condition($default_langcode_group)
-      ->condition($langcode_group)
-      ->execute();
-    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type)));
-  }
-
-  /**
-   * Tests the Entity Translation API behavior.
-   */
-  function testEntityTranslationAPI() {
-    // Test all entity variations with data table support.
-    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
-      $this->doTestEntityTranslationAPI($entity_type);
-    }
-  }
-
-  /**
-   * Executes the Entity Translation API tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestEntityTranslationAPI($entity_type) {
-    $default_langcode = $this->langcodes[0];
-    $langcode = $this->langcodes[1];
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $default_langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('default_langcode');
-
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $this->entityManager
-      ->getStorage($entity_type)
-      ->create(array('name' => $this->randomMachineName(), $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED));
-
-    $entity->save();
-    $hooks = $this->getHooksInfo();
-    $this->assertFalse($hooks, 'No entity translation hooks are fired when creating an entity.');
-
-    // Verify that we obtain the entity object itself when we attempt to
-    // retrieve a translation referring to it.
-    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED);
-    $this->assertFalse($translation->isNewTranslation(), 'Existing translations are not marked as new.');
-    $this->assertIdentical($entity, $translation, 'The translation object corresponding to a non-default language is the entity object itself when the entity is language-neutral.');
-    $entity->{$langcode_key}->value = $default_langcode;
-    $translation = $entity->getTranslation($default_langcode);
-    $this->assertIdentical($entity, $translation, 'The translation object corresponding to the default language (explicit) is the entity object itself.');
-    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT);
-    $this->assertIdentical($entity, $translation, 'The translation object corresponding to the default language (implicit) is the entity object itself.');
-    $this->assertTrue($entity->{$default_langcode_key}->value, 'The translation object is the default one.');
-
-    // Verify that trying to retrieve a translation for a locked language when
-    // the entity is language-aware causes an exception to be thrown.
-    $message = 'A language-neutral translation cannot be retrieved.';
-    try {
-      $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED);
-      $this->fail($message);
-    }
-    catch (\LogicException $e) {
-      $this->pass($message);
-    }
-
-    // Create a translation and verify that the translation object and the
-    // original object behave independently.
-    $name = $default_langcode . '_' . $this->randomMachineName();
-    $entity->name->value = $name;
-    $name_translated = $langcode . '_' . $this->randomMachineName();
-    $translation = $entity->addTranslation($langcode);
-    $this->assertTrue($translation->isNewTranslation(), 'Newly added translations are marked as new.');
-    $this->assertNotIdentical($entity, $translation, 'The entity and the translation object differ from one another.');
-    $this->assertTrue($entity->hasTranslation($langcode), 'The new translation exists.');
-    $this->assertEqual($translation->language()->getId(), $langcode, 'The translation language matches the specified one.');
-    $this->assertEqual($translation->{$langcode_key}->value, $langcode, 'The translation field language value matches the specified one.');
-    $this->assertFalse($translation->{$default_langcode_key}->value, 'The translation object is not the default one.');
-    $this->assertEqual($translation->getUntranslated()->language()->getId(), $default_langcode, 'The original language can still be retrieved.');
-    $translation->name->value = $name_translated;
-    $this->assertEqual($entity->name->value, $name, 'The original name is retained after setting a translated value.');
-    $entity->name->value = $name;
-    $this->assertEqual($translation->name->value, $name_translated, 'The translated name is retained after setting the original value.');
-
-    // Save the translation and check that the expected hooks are fired.
-    $translation->save();
-    $hooks = $this->getHooksInfo();
-
-    $this->assertEqual($hooks['entity_translation_create'], $langcode, 'The generic entity translation creation hook has fired.');
-    $this->assertEqual($hooks[$entity_type . '_translation_create'], $langcode, 'The entity-type-specific entity translation creation hook has fired.');
-
-    $this->assertEqual($hooks['entity_translation_insert'], $langcode, 'The generic entity translation insertion hook has fired.');
-    $this->assertEqual($hooks[$entity_type . '_translation_insert'], $langcode, 'The entity-type-specific entity translation insertion hook has fired.');
-
-    // Verify that changing translation language causes an exception to be
-    // thrown.
-    $message = 'The translation language cannot be changed.';
-    try {
-      $translation->{$langcode_key}->value = $this->langcodes[2];
-      $this->fail($message);
-    }
-    catch (\LogicException $e) {
-      $this->pass($message);
-    }
-
-    // Verify that reassigning the same translation language is allowed.
-    $message = 'The translation language can be reassigned the same value.';
-    try {
-      $translation->{$langcode_key}->value = $langcode;
-      $this->pass($message);
-    }
-    catch (\LogicException $e) {
-      $this->fail($message);
-    }
-
-    // Verify that changing the default translation flag causes an exception to
-    // be thrown.
-    foreach ($entity->getTranslationLanguages() as $t_langcode => $language) {
-      $translation = $entity->getTranslation($t_langcode);
-      $default = $translation->isDefaultTranslation();
-
-      $message = 'The default translation flag can be reassigned the same value.';
-      try {
-        $translation->{$default_langcode_key}->value = $default;
-        $this->pass($message);
-      }
-      catch (\LogicException $e) {
-        $this->fail($message);
-      }
-
-      $message = 'The default translation flag cannot be changed.';
-      try {
-        $translation->{$default_langcode_key}->value = !$default;
-        $this->fail($message);
-      }
-      catch (\LogicException $e) {
-        $this->pass($message);
-      }
-
-      $this->assertEqual($translation->{$default_langcode_key}->value, $default);
-    }
-
-    // Check that after loading an entity the language is the default one.
-    $entity = $this->reloadEntity($entity);
-    $this->assertEqual($entity->language()->getId(), $default_langcode, 'The loaded entity is the original one.');
-
-    // Add another translation and check that everything works as expected. A
-    // new translation object can be obtained also by just specifying a valid
-    // language.
-    $langcode2 = $this->langcodes[2];
-    $translation = $entity->addTranslation($langcode2);
-    $value = $entity !== $translation && $translation->language()->getId() == $langcode2 && $entity->hasTranslation($langcode2);
-    $this->assertTrue($value, 'A new translation object can be obtained also by specifying a valid language.');
-    $this->assertEqual($entity->language()->getId(), $default_langcode, 'The original language has been preserved.');
-    $translation->save();
-    $hooks = $this->getHooksInfo();
-
-    $this->assertEqual($hooks['entity_translation_create'], $langcode2, 'The generic entity translation creation hook has fired.');
-    $this->assertEqual($hooks[$entity_type . '_translation_create'], $langcode2, 'The entity-type-specific entity translation creation hook has fired.');
-
-    $this->assertEqual($hooks['entity_translation_insert'], $langcode2, 'The generic entity translation insertion hook has fired.');
-    $this->assertEqual($hooks[$entity_type . '_translation_insert'], $langcode2, 'The entity-type-specific entity translation insertion hook has fired.');
-
-    // Verify that trying to manipulate a translation object referring to a
-    // removed translation results in exceptions being thrown.
-    $entity = $this->reloadEntity($entity);
-    $translation = $entity->getTranslation($langcode2);
-    $entity->removeTranslation($langcode2);
-    foreach (array('get', 'set', '__get', '__set', 'createDuplicate') as $method) {
-      $message = format_string('The @method method raises an exception when trying to manipulate a removed translation.', array('@method' => $method));
-      try {
-        $translation->{$method}('name', $this->randomMachineName());
-        $this->fail($message);
-      }
-      catch (\Exception $e) {
-        $this->pass($message);
-      }
-    }
-
-    // Verify that deletion hooks are fired when saving an entity with a removed
-    // translation.
-    $entity->save();
-    $hooks = $this->getHooksInfo();
-    $this->assertEqual($hooks['entity_translation_delete'], $langcode2, 'The generic entity translation deletion hook has fired.');
-    $this->assertEqual($hooks[$entity_type . '_translation_delete'], $langcode2, 'The entity-type-specific entity translation deletion hook has fired.');
-    $entity = $this->reloadEntity($entity);
-    $this->assertFalse($entity->hasTranslation($langcode2), 'The translation does not appear among available translations after saving the entity.');
-
-    // Check that removing an invalid translation causes an exception to be
-    // thrown.
-    foreach (array($default_langcode, LanguageInterface::LANGCODE_DEFAULT, $this->randomMachineName()) as $invalid_langcode) {
-      $message = format_string('Removing an invalid translation (@langcode) causes an exception to be thrown.', array('@langcode' => $invalid_langcode));
-      try {
-        $entity->removeTranslation($invalid_langcode);
-        $this->fail($message);
-      }
-      catch (\Exception $e) {
-        $this->pass($message);
-      }
-    }
-
-    // Check that hooks are fired only when actually storing data.
-    $entity = $this->reloadEntity($entity);
-    $entity->addTranslation($langcode2);
-    $entity->removeTranslation($langcode2);
-    $entity->save();
-    $hooks = $this->getHooksInfo();
-
-    $this->assertTrue(isset($hooks['entity_translation_create']), 'The generic entity translation creation hook is run when adding and removing a translation without storing it.');
-    unset($hooks['entity_translation_create']);
-    $this->assertTrue(isset($hooks[$entity_type . '_translation_create']), 'The entity-type-specific entity translation creation hook is run when adding and removing a translation without storing it.');
-    unset($hooks[$entity_type . '_translation_create']);
-
-    $this->assertFalse($hooks, 'No other hooks beyond the entity translation creation hooks are run when adding and removing a translation without storing it.');
-
-    // Check that hooks are fired only when actually storing data.
-    $entity = $this->reloadEntity($entity);
-    $entity->addTranslation($langcode2);
-    $entity->save();
-    $entity = $this->reloadEntity($entity);
-    $this->assertTrue($entity->hasTranslation($langcode2), 'Entity has translation after adding one and saving.');
-    $entity->removeTranslation($langcode2);
-    $entity->save();
-    $entity = $this->reloadEntity($entity);
-    $this->assertFalse($entity->hasTranslation($langcode2), 'Entity does not have translation after removing it and saving.');
-    // Reset hook firing information.
-    $this->getHooksInfo();
-
-    // Verify that entity serialization does not cause stale references to be
-    // left around.
-    $entity = $this->reloadEntity($entity);
-    $translation = $entity->getTranslation($langcode);
-    $entity = unserialize(serialize($entity));
-    $entity->name->value = $this->randomMachineName();
-    $name = $default_langcode . '_' . $this->randomMachineName();
-    $entity->getTranslation($default_langcode)->name->value = $name;
-    $this->assertEqual($entity->name->value, $name, 'No stale reference for the translation object corresponding to the original language.');
-    $translation2 = $entity->getTranslation($langcode);
-    $translation2->name->value .= $this->randomMachineName();
-    $this->assertNotEqual($translation->name->value, $translation2->name->value, 'No stale reference for the actual translation object.');
-    $this->assertEqual($entity, $translation2->getUntranslated(), 'No stale reference in the actual translation object.');
-
-    // Verify that deep-cloning is still available when we are not instantiating
-    // a translation object, which instead relies on shallow cloning.
-    $entity = $this->reloadEntity($entity);
-    $entity->getTranslation($langcode);
-    $cloned = clone $entity;
-    $translation = $cloned->getTranslation($langcode);
-    $this->assertNotIdentical($entity, $translation->getUntranslated(), 'A cloned entity object has no reference to the original one.');
-    $entity->removeTranslation($langcode);
-    $this->assertFalse($entity->hasTranslation($langcode));
-    $this->assertTrue($cloned->hasTranslation($langcode));
-
-    // Check that untranslatable field references keep working after serializing
-    // and cloning the entity.
-    $entity = $this->reloadEntity($entity);
-    $type = $this->randomMachineName();
-    $entity->getTranslation($langcode)->type->value = $type;
-    $entity = unserialize(serialize($entity));
-    $cloned = clone $entity;
-    $translation = $cloned->getTranslation($langcode);
-    $translation->type->value = strrev($type);
-    $this->assertEqual($cloned->type->value, $translation->type->value, 'Untranslatable field references keep working after serializing and cloning the entity.');
-
-    // Check that per-language defaults are properly populated. The
-    // 'entity_test_mul_default_value' entity type is translatable and uses
-    // entity_test_field_default_value() as a "default value callback" for its
-    // 'description' field.
-    $entity = $this->entityManager
-      ->getStorage('entity_test_mul_default_value')
-      ->create(['name' => $this->randomMachineName(), 'langcode' => $langcode]);
-    $translation = $entity->addTranslation($langcode2);
-    $expected = array(
-      array(
-        'shape' => "shape:0:description_$langcode2",
-        'color' => "color:0:description_$langcode2",
-      ),
-      array(
-        'shape' => "shape:1:description_$langcode2",
-        'color' => "color:1:description_$langcode2",
-      ),
-    );
-    $this->assertEqual($translation->description->getValue(), $expected, 'Language-aware default values correctly populated.');
-    $this->assertEqual($translation->description->getLangcode(), $langcode2, 'Field object has the expected langcode.');
-
-    // Reset hook firing information.
-    $this->getHooksInfo();
-  }
-
-  /**
-   * Tests language fallback applied to field and entity translations.
-   */
-  function testLanguageFallback() {
-    // Test all entity variations with data table support.
-    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
-      $this->doTestLanguageFallback($entity_type);
-    }
-  }
-
-  /**
-   * Executes the language fallback test for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestLanguageFallback($entity_type) {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-
-    $current_langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
-    $this->langcodes[] = $current_langcode;
-
-    $values = array();
-    foreach ($this->langcodes as $langcode) {
-      $values[$langcode]['name'] = $this->randomMachineName();
-      $values[$langcode]['user_id'] = mt_rand(0, 127);
-    }
-
-    $default_langcode = $this->langcodes[0];
-    $langcode = $this->langcodes[1];
-    $langcode2 = $this->langcodes[2];
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $languages = $this->languageManager->getLanguages();
-    $language = ConfigurableLanguage::load($languages[$langcode]->getId());
-    $language->set('weight', 1);
-    $language->save();
-    $this->languageManager->reset();
-
-    $controller = $this->entityManager->getStorage($entity_type);
-    $entity = $controller->create(array($langcode_key => $default_langcode) + $values[$default_langcode]);
-    $entity->save();
-
-    $entity->addTranslation($langcode, $values[$langcode]);
-    $entity->save();
-
-    // Check that retrieving the current translation works as expected.
-    $entity = $this->reloadEntity($entity);
-    $translation = $this->entityManager->getTranslationFromContext($entity, $langcode2);
-    $this->assertEqual($translation->language()->getId(), $default_langcode, 'The current translation language matches the expected one.');
-
-    // Check that language fallback respects language weight by default.
-    $language = ConfigurableLanguage::load($languages[$langcode]->getId());
-    $language->set('weight', -1);
-    $language->save();
-    $translation = $this->entityManager->getTranslationFromContext($entity, $langcode2);
-    $this->assertEqual($translation->language()->getId(), $langcode, 'The current translation language matches the expected one.');
-
-    // Check that the current translation is properly returned.
-    $translation = $this->entityManager->getTranslationFromContext($entity);
-    $this->assertEqual($langcode, $translation->language()->getId(), 'The current translation language matches the topmost language fallback candidate.');
-    $entity->addTranslation($current_langcode, $values[$current_langcode]);
-    $translation = $this->entityManager->getTranslationFromContext($entity);
-    $this->assertEqual($current_langcode, $translation->language()->getId(), 'The current translation language matches the current language.');
-
-    // Check that if the entity has no translation no fallback is applied.
-    $entity2 = $controller->create(array($langcode_key => $default_langcode));
-    // Get an view builder.
-    $controller = $this->entityManager->getViewBuilder($entity_type);
-    $entity2_build = $controller->view($entity2);
-    $entity2_output = (string) $renderer->renderRoot($entity2_build);
-    $translation = $this->entityManager->getTranslationFromContext($entity2, $default_langcode);
-    $translation_build = $controller->view($translation);
-    $translation_output = (string) $renderer->renderRoot($translation_build);
-    $this->assertIdentical($entity2_output, $translation_output, 'When the entity has no translation no fallback is applied.');
-
-    // Checks that entity translations are rendered properly.
-    $controller = $this->entityManager->getViewBuilder($entity_type);
-    $build = $controller->view($entity);
-    $renderer->renderRoot($build);
-    $this->assertEqual($build['label']['#markup'], $values[$current_langcode]['name'], 'By default the entity is rendered in the current language.');
-
-    $langcodes = array_combine($this->langcodes, $this->langcodes);
-    // We have no translation for the $langcode2 language, hence the expected
-    // result is the topmost existing translation, that is $langcode.
-    $langcodes[$langcode2] = $langcode;
-    foreach ($langcodes as $desired => $expected) {
-      $build = $controller->view($entity, 'full', $desired);
-      // Unset the #cache key so that a fresh render is produced with each pass,
-      // making the renderable array keys available to compare.
-      unset($build['#cache']);
-      $renderer->renderRoot($build);
-      $this->assertEqual($build['label']['#markup'], $values[$expected]['name'], 'The entity is rendered in the expected language.');
-    }
-  }
-
-  /**
-   * Check that field translatability is handled properly.
-   */
-  function testFieldDefinitions() {
-    // Check that field translatability can be altered to be enabled or disabled
-    // in field definitions.
-    $entity_type = 'entity_test_mulrev';
-    $this->state->set('entity_test.field_definitions.translatable', array('name' => FALSE));
-    $this->entityManager->clearCachedFieldDefinitions();
-    $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
-    $this->assertFalse($definitions['name']->isTranslatable(), 'Field translatability can be disabled programmatically.');
-
-    $this->state->set('entity_test.field_definitions.translatable', array('name' => TRUE));
-    $this->entityManager->clearCachedFieldDefinitions();
-    $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
-    $this->assertTrue($definitions['name']->isTranslatable(), 'Field translatability can be enabled programmatically.');
-
-    // Check that field translatability is disabled by default.
-    $base_field_definitions = EntityTestMulRev::baseFieldDefinitions($this->entityManager->getDefinition($entity_type));
-    $this->assertTrue(!isset($base_field_definitions['id']->translatable), 'Translatability for the <em>id</em> field is not defined.');
-    $this->assertFalse($definitions['id']->isTranslatable(), 'Field translatability is disabled by default.');
-
-    // Check that entity id keys have the expect translatability.
-    $translatable_fields = array(
-      'id' => TRUE,
-      'uuid' => TRUE,
-      'revision_id' => TRUE,
-      'type' => TRUE,
-      'langcode' => FALSE,
-    );
-    foreach ($translatable_fields as $name => $translatable) {
-      $this->state->set('entity_test.field_definitions.translatable', array($name => $translatable));
-      $this->entityManager->clearCachedFieldDefinitions();
-      $message = format_string('Field %field cannot be translatable.', array('%field' => $name));
-
-      try {
-        $this->entityManager->getBaseFieldDefinitions($entity_type);
-        $this->fail($message);
-      }
-      catch (\LogicException $e) {
-        $this->pass($message);
-      }
-    }
-  }
-
-  /**
-   * Tests that changing entity language does not break field language.
-   */
-  public function testLanguageChange() {
-    // Test all entity variations with data table support.
-    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
-      $this->doTestLanguageChange($entity_type);
-    }
-  }
-
-  /**
-   * Executes the entity language change test for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function doTestLanguageChange($entity_type) {
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $controller = $this->entityManager->getStorage($entity_type);
-    $langcode = $this->langcodes[0];
-
-    // check that field languages match entity language regardless of field
-    // translatability.
-    $values = array(
-      $langcode_key => $langcode,
-      $this->fieldName => $this->randomMachineName(),
-      $this->untranslatableFieldName => $this->randomMachineName(),
-    );
-    $entity = $controller->create($values);
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
-      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected.');
-    }
-
-    // Check that field languages keep matching entity language even after
-    // changing it.
-    $langcode = $this->langcodes[1];
-    $entity->{$langcode_key}->value = $langcode;
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
-      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after changing entity language.');
-    }
-
-    // Check that entity translation does not affect the language of original
-    // field values and untranslatable ones.
-    $langcode = $this->langcodes[0];
-    $entity->addTranslation($this->langcodes[2], array($this->fieldName => $this->randomMachineName()));
-    $entity->{$langcode_key}->value = $langcode;
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
-      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after translating the entity and changing language.');
-    }
-
-    // Check that setting the default language to an existing translation
-    // language causes an exception to be thrown.
-    $message = 'An exception is thrown when setting the default language to an existing translation language';
-    try {
-      $entity->{$langcode_key}->value = $this->langcodes[2];
-      $this->fail($message);
-    }
-    catch (\InvalidArgumentException $e) {
-      $this->pass($message);
-    }
-  }
-
-  /**
-   * Tests how entity adapters work with translations.
-   */
-  function testEntityAdapter() {
-    $entity_type = 'entity_test';
-    $default_langcode = 'en';
-    $values[$default_langcode] = array('name' => $this->randomString());
-    $controller = $this->entityManager->getStorage($entity_type);
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $controller->create($values[$default_langcode]);
-
-    foreach ($this->langcodes as $langcode) {
-      $values[$langcode] = array('name' => $this->randomString());
-      $entity->addTranslation($langcode, $values[$langcode]);
-    }
-
-    $langcodes = array_merge(array($default_langcode), $this->langcodes);
-    foreach ($langcodes as $langcode) {
-      $adapter = $entity->getTranslation($langcode)->getTypedData();
-      $name = $adapter->get('name')->value;
-      $this->assertEqual($name, $values[$langcode]['name'], SafeMarkup::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
-    }
-  }
-
-  /**
-   * Tests if entity references are correct after adding a new translation.
-   */
-  public function testFieldEntityReference() {
-    $entity_type = 'entity_test_mul';
-    $controller = $this->entityManager->getStorage($entity_type);
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $controller->create();
-
-    foreach ($this->langcodes as $langcode) {
-      $entity->addTranslation($langcode);
-    }
-
-    $default_langcode = $entity->getUntranslated()->language()->getId();
-    foreach (array_keys($entity->getTranslationLanguages()) as $langcode) {
-      $translation = $entity->getTranslation($langcode);
-      foreach ($translation->getFields() as $field_name => $field) {
-        if ($field->getFieldDefinition()->isTranslatable()) {
-          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
-          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode.', $args));
-        }
-        else {
-          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
-          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode.', $args));
-        }
-      }
-    }
-  }
-
-  /**
-   * Tests if entity translation statuses are correct after removing two
-   * translation.
-   */
-  public function testDeleteEntityTranslation() {
-    $entity_type = 'entity_test_mul';
-    $controller = $this->entityManager->getStorage($entity_type);
-
-    // Create a translatable test field.
-    $field_storage = FieldStorageConfig::create([
-      'entity_type' => $entity_type,
-      'field_name' => 'translatable_test_field',
-      'type' => 'field_test',
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'label' => $this->randomMachineName(),
-      'bundle' => $entity_type,
-    ]);
-    $field->save();
-
-    // Create an untranslatable test field.
-    $field_storage = FieldStorageConfig::create([
-      'entity_type' => $entity_type,
-      'field_name' => 'untranslatable_test_field',
-      'type' => 'field_test',
-      'translatable' => FALSE,
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'label' => $this->randomMachineName(),
-      'bundle' => $entity_type,
-    ]);
-    $field->save();
-
-    // Create an entity with both translatable and untranslatable test fields.
-    $values = array(
-      'name' => $this->randomString(),
-      'translatable_test_field' => $this->randomString(),
-      'untranslatable_test_field' => $this->randomString(),
-    );
-
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
-    $entity = $controller->create($values);
-
-    foreach ($this->langcodes as $langcode) {
-      $entity->addTranslation($langcode, $values);
-    }
-    $entity->save();
-
-    // Assert there are no deleted languages in the lists yet.
-    $this->assertNull(\Drupal::state()->get('entity_test.delete.translatable_test_field'));
-    $this->assertNull(\Drupal::state()->get('entity_test.delete.untranslatable_test_field'));
-
-    // Remove the second and third langcodes from the entity.
-    $entity->removeTranslation('l1');
-    $entity->removeTranslation('l2');
-    $entity->save();
-
-    // Ensure that for the translatable test field the second and third
-    // langcodes are in the deleted languages list.
-    $actual = \Drupal::state()->get('entity_test.delete.translatable_test_field');
-    $expected_translatable = ['l1', 'l2'];
-    sort($actual);
-    sort($expected_translatable);
-    $this->assertEqual($actual, $expected_translatable);
-    // Ensure that the untranslatable test field is untouched.
-    $this->assertNull(\Drupal::state()->get('entity_test.delete.untranslatable_test_field'));
-
-    // Delete the entity, which removes all remaining translations.
-    $entity->delete();
-
-    // All languages have been deleted now.
-    $actual = \Drupal::state()->get('entity_test.delete.translatable_test_field');
-    $expected_translatable[] = 'en';
-    $expected_translatable[] = 'l0';
-    sort($actual);
-    sort($expected_translatable);
-    $this->assertEqual($actual, $expected_translatable);
-
-    // The untranslatable field is shared and only deleted once, for the
-    // default langcode.
-    $actual = \Drupal::state()->get('entity_test.delete.untranslatable_test_field');
-    $expected_untranslatable = ['en'];
-    sort($actual);
-    sort($expected_untranslatable);
-    $this->assertEqual($actual, $expected_untranslatable);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php
deleted file mode 100644
index b9ebee2..0000000
--- a/core/modules/system/src/Tests/Entity/EntityTypeConstraintValidatorTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityTypeConstraintValidatorTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\system\Tests\TypedData;
-use Drupal\Core\TypedData\DataDefinition;
-
-/**
- * Tests validation constraints for EntityTypeConstraintValidator.
- *
- * @group Entity
- */
-class EntityTypeConstraintValidatorTest extends EntityUnitTestBase {
-
-  /**
-   * The typed data manager to use.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedData;
-
-  public static $modules = array('node', 'field', 'user');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->typedData = $this->container->get('typed_data_manager');
-  }
-
-  /**
-   * Tests the EntityTypeConstraintValidator.
-   */
-  public function testValidation() {
-    // Create a typed data definition with an EntityType constraint.
-    $entity_type = 'node';
-    $definition = DataDefinition::create('entity_reference')
-      ->setConstraints(array(
-        'EntityType' => $entity_type,
-      )
-    );
-
-    // Test the validation.
-    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'page'));
-    $typed_data = $this->typedData->create($definition, $node);
-    $violations = $typed_data->validate();
-    $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
-
-    // Test the validation when an invalid value (in this case a user entity)
-    // is passed.
-    $account = $this->createUser();
-
-    $typed_data = $this->typedData->create($definition, $account);
-    $violations = $typed_data->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The entity must be of type %type.', array('%type' => $entity_type)), 'The message for invalid value is correct.');
-    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
-    $this->assertEqual($violation->getInvalidValue(), $account, 'The invalid value is set correctly in the violation.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php b/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php
deleted file mode 100644
index 688b96c..0000000
--- a/core/modules/system/src/Tests/Entity/EntityTypeConstraintsTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityTypeConstraintsTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\system\Tests\TypedData;
-
-/**
- * Tests entity level validation constraints.
- *
- * @group Entity
- */
-class EntityTypeConstraintsTest extends EntityUnitTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('entity_test_constraints');
-  }
-
-  /**
-   * Tests defining entity constraints via entity type annotations and hooks.
-   */
-  public function testConstraintDefinition() {
-    // Test reading the annotation. There should be two constraints, the defined
-    // constraint and the automatically added EntityChanged constraint.
-    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
-    $default_constraints = ['NotNull' => [], 'EntityChanged' => NULL];
-    $this->assertEqual($default_constraints, $entity_type->getConstraints());
-
-    // Enable our test module and test extending constraints.
-    $this->enableModules(array_merge(static::$modules, ['entity_test_constraints']));
-    $this->container->get('module_handler')->resetImplementations();
-
-    $extra_constraints = ['Test' => []];
-    $this->state->set('entity_test_constraints.build', $extra_constraints);
-    // Re-fetch the entity manager from the new container built after the new
-    // modules were enabled.
-    $this->entityManager = $this->container->get('entity.manager');
-    $this->entityManager->clearCachedDefinitions();
-    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
-    $this->assertEqual($default_constraints + $extra_constraints, $entity_type->getConstraints());
-
-    // Test altering constraints.
-    $altered_constraints = ['Test' => [ 'some_setting' => TRUE]];
-    $this->state->set('entity_test_constraints.alter', $altered_constraints);
-    // Clear the cache in state instance in the Drupal container, so it can pick
-    // up the modified value.
-    \Drupal::state()->resetCache();
-    $this->entityManager->clearCachedDefinitions();
-    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
-    $this->assertEqual($altered_constraints, $entity_type->getConstraints());
-  }
-
-  /**
-   * Tests entity constraints are validated.
-   */
-  public function testConstraintValidation() {
-    $entity = $this->entityManager->getStorage('entity_test_constraints')->create();
-    $entity->user_id->target_id = 0;
-    $violations = $entity->validate();
-    $this->assertEqual($violations->count(), 0, 'Validation passed.');
-    $entity->save();
-    $entity->changed->value = REQUEST_TIME - 86400;
-    $violations = $entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityTypedDataDefinitionTest.php b/core/modules/system/src/Tests/Entity/EntityTypedDataDefinitionTest.php
deleted file mode 100644
index d71ca15..0000000
--- a/core/modules/system/src/Tests/Entity/EntityTypedDataDefinitionTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityTypedDataDefinitionTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Entity\TypedData\EntityDataDefinition;
-use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
-use Drupal\Core\TypedData\DataReferenceDefinition;
-use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
-use Drupal\Core\TypedData\ListDataDefinitionInterface;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests deriving metadata of entity and field data types.
- *
- * @group Entity
- */
-class EntityTypedDataDefinitionTest extends KernelTestBase {
-
-  /**
-   * The typed data manager to use.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedDataManager;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('filter', 'text', 'node', 'user');
-
-  protected function setUp() {
-    parent::setup();
-    $this->typedDataManager = $this->container->get('typed_data_manager');
-  }
-
-  /**
-   * Tests deriving metadata about fields.
-   */
-  public function testFields() {
-    $field_definition = BaseFieldDefinition::create('integer');
-    // Fields are lists of complex data.
-    $this->assertTrue($field_definition instanceof ListDataDefinitionInterface);
-    $this->assertFalse($field_definition instanceof ComplexDataDefinitionInterface);
-    $field_item_definition = $field_definition->getItemDefinition();
-    $this->assertFalse($field_item_definition instanceof ListDataDefinitionInterface);
-    $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
-
-    // Derive metadata about field item properties.
-    $this->assertEqual(array_keys($field_item_definition->getPropertyDefinitions()), array('value'));
-    $this->assertEqual($field_item_definition->getPropertyDefinition('value')->getDataType(), 'integer');
-    $this->assertEqual($field_item_definition->getMainPropertyName(), 'value');
-    $this->assertNull($field_item_definition->getPropertyDefinition('invalid'));
-
-    // Test accessing field item property metadata via the field definition.
-    $this->assertTrue($field_definition instanceof FieldDefinitionInterface);
-    $this->assertEqual(array_keys($field_definition->getPropertyDefinitions()), array('value'));
-    $this->assertEqual($field_definition->getPropertyDefinition('value')->getDataType(), 'integer');
-    $this->assertEqual($field_definition->getMainPropertyName(), 'value');
-    $this->assertNull($field_definition->getPropertyDefinition('invalid'));
-
-    // Test using the definition factory for field item lists and field items.
-    $field_item = $this->typedDataManager->createDataDefinition('field_item:integer');
-    $this->assertFalse($field_item instanceof ListDataDefinitionInterface);
-    $this->assertTrue($field_item instanceof ComplexDataDefinitionInterface);
-    // Comparison should ignore the internal static cache, so compare the
-    // serialized objects instead.
-    $this->assertEqual(serialize($field_item_definition), serialize($field_item));
-
-    $field_definition2 = $this->typedDataManager->createListDataDefinition('field_item:integer');
-    $this->assertTrue($field_definition2 instanceof ListDataDefinitionInterface);
-    $this->assertFalse($field_definition2 instanceof ComplexDataDefinitionInterface);
-    $this->assertEqual(serialize($field_definition), serialize($field_definition2));
-  }
-
-  /**
-   * Tests deriving metadata about entities.
-   */
-  public function testEntities() {
-    $entity_definition = EntityDataDefinition::create('node');
-    // Entities are complex data.
-    $this->assertFalse($entity_definition instanceof ListDataDefinitionInterface);
-    $this->assertTrue($entity_definition instanceof ComplexDataDefinitionInterface);
-
-    $field_definitions = $entity_definition->getPropertyDefinitions();
-    // Comparison should ignore the internal static cache, so compare the
-    // serialized objects instead.
-    $this->assertEqual(serialize($field_definitions), serialize(\Drupal::entityManager()->getBaseFieldDefinitions('node')));
-    $this->assertEqual($entity_definition->getPropertyDefinition('title')->getItemDefinition()->getDataType(), 'field_item:string');
-    $this->assertNull($entity_definition->getMainPropertyName());
-    $this->assertNull($entity_definition->getPropertyDefinition('invalid'));
-
-    $entity_definition2 = $this->typedDataManager->createDataDefinition('entity:node');
-    $this->assertFalse($entity_definition2 instanceof ListDataDefinitionInterface);
-    $this->assertTrue($entity_definition2 instanceof ComplexDataDefinitionInterface);
-    $this->assertEqual(serialize($entity_definition), serialize($entity_definition2));
-
-    // Test that the definition factory creates the right definitions for all
-    // entity data types variants.
-    $this->assertEqual($this->typedDataManager->createDataDefinition('entity'), EntityDataDefinition::create());
-    $this->assertEqual($this->typedDataManager->createDataDefinition('entity:node'), EntityDataDefinition::create('node'));
-
-    // Config entities don't support typed data.
-    $entity_definition = EntityDataDefinition::create('node_type');
-    $this->assertEqual(array(), $entity_definition->getPropertyDefinitions());
-  }
-
-  /**
-   * Tests deriving metadata from entity references.
-   */
-  public function testEntityReferences() {
-    $reference_definition = DataReferenceDefinition::create('entity');
-    $this->assertTrue($reference_definition instanceof DataReferenceDefinitionInterface);
-
-    // Test retrieving metadata about the referenced data.
-    $this->assertEqual($reference_definition->getTargetDefinition()->getDataType(), 'entity');
-    $this->assertTrue($reference_definition->getTargetDefinition() instanceof EntityDataDefinitionInterface);
-
-    // Test that the definition factory creates the right definition object.
-    $reference_definition2 = $this->typedDataManager->createDataDefinition('entity_reference');
-    $this->assertTrue($reference_definition2 instanceof DataReferenceDefinitionInterface);
-    $this->assertEqual($reference_definition2, $reference_definition);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityUUIDTest.php b/core/modules/system/src/Tests/Entity/EntityUUIDTest.php
deleted file mode 100644
index 48a6e4e..0000000
--- a/core/modules/system/src/Tests/Entity/EntityUUIDTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityUUIDTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-/**
- * Tests creation, saving, and loading of entity UUIDs.
- *
- * @group Entity
- */
-class EntityUUIDTest extends EntityUnitTestBase {
-
-  protected function setUp() {
-    parent::setUp();
-
-    foreach (entity_test_entity_types() as $entity_type_id) {
-      // The entity_test schema is installed by the parent.
-      if ($entity_type_id != 'entity_test') {
-        $this->installEntitySchema($entity_type_id);
-      }
-    }
-  }
-
-  /**
-   * Tests UUID generation in entity CRUD operations.
-   */
-  function testCRUD() {
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->assertCRUD($entity_type);
-    }
-  }
-
-  /**
-   * Executes the UUID CRUD tests for the given entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function assertCRUD($entity_type) {
-    // Verify that no UUID is auto-generated when passing one for creation.
-    $uuid_service = $this->container->get('uuid');
-    $uuid = $uuid_service->generate();
-    $custom_entity = entity_create($entity_type, array(
-      'name' => $this->randomMachineName(),
-      'uuid' => $uuid,
-    ));
-    $this->assertIdentical($custom_entity->uuid(), $uuid);
-    // Save this entity, so we have more than one later.
-    $custom_entity->save();
-
-    // Verify that a new UUID is generated upon creating an entity.
-    $entity = entity_create($entity_type, array('name' => $this->randomMachineName()));
-    $uuid = $entity->uuid();
-    $this->assertTrue($uuid);
-
-    // Verify that the new UUID is different.
-    $this->assertNotEqual($custom_entity->uuid(), $uuid);
-
-    // Verify that the UUID is retained upon saving.
-    $entity->save();
-    $this->assertIdentical($entity->uuid(), $uuid);
-
-    // Verify that the UUID is retained upon loading.
-    $entity_loaded = entity_load($entity_type, $entity->id(), TRUE);
-    $this->assertIdentical($entity_loaded->uuid(), $uuid);
-
-    // Verify that \Drupal::entityManager()->loadEntityByUuid() loads the same entity.
-    $entity_loaded_by_uuid = \Drupal::entityManager()->loadEntityByUuid($entity_type, $uuid, TRUE);
-    $this->assertIdentical($entity_loaded_by_uuid->uuid(), $uuid);
-    $this->assertEqual($entity_loaded_by_uuid->id(), $entity_loaded->id());
-
-    // Creating a duplicate needs to result in a new UUID.
-    $entity_duplicate = $entity->createDuplicate();
-    foreach ($entity->getFields() as $property => $value) {
-      switch($property) {
-        case 'uuid':
-          $this->assertNotNull($entity_duplicate->uuid());
-          $this->assertNotNull($entity->uuid());
-          $this->assertNotEqual($entity_duplicate->uuid(), $entity->uuid());
-          break;
-        case 'id':
-          $this->assertNull($entity_duplicate->id());
-          $this->assertNotNull($entity->id());
-          $this->assertNotEqual($entity_duplicate->id(), $entity->id());
-          break;
-        case 'revision_id':
-          $this->assertNull($entity_duplicate->getRevisionId());
-          $this->assertNotNull($entity->getRevisionId());
-          $this->assertNotEqual($entity_duplicate->getRevisionId(), $entity->getRevisionId());
-          $this->assertNotEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
-          break;
-        default:
-          $this->assertEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
-      }
-    }
-    $entity_duplicate->save();
-    $this->assertNotEqual($entity->id(), $entity_duplicate->id());
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
index c691ad6..dbeb858 100644
--- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -9,6 +9,8 @@
 
 use Drupal\simpletest\KernelTestBase;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
 
 /**
  * Defines an abstract test base for entity unit tests.
@@ -102,7 +104,7 @@ protected function setUp() {
   protected function createUser($values = array(), $permissions = array()) {
     if ($permissions) {
       // Create a new role and apply permissions to it.
-      $role = entity_create('user_role', array(
+      $role = Role::create(array(
         'id' => strtolower($this->randomMachineName(8)),
         'label' => $this->randomMachineName(8),
       ));
@@ -111,10 +113,10 @@ protected function createUser($values = array(), $permissions = array()) {
       $values['roles'][] = $role->id();
     }
 
-    $account = entity_create('user', $values + array(
+    $account = User::create($values + [
       'name' => $this->randomMachineName(),
       'status' => 1,
-    ));
+    ]);
     $account->enforceIsNew();
     $account->save();
     return $account;
diff --git a/core/modules/system/src/Tests/Entity/EntityValidationTest.php b/core/modules/system/src/Tests/Entity/EntityValidationTest.php
deleted file mode 100644
index aa85fa7..0000000
--- a/core/modules/system/src/Tests/Entity/EntityValidationTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityValidationTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
-
-/**
- * Tests the Entity Validation API.
- *
- * @group Entity
- */
-class EntityValidationTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('filter', 'text');
-
-  /**
-   * @var string
-   */
-  protected $entityName;
-
-  /**
-   * @var \Drupal\user\Entity\User
-   */
-  protected $entityUser;
-
-  /**
-   * @var string
-   */
-  protected $entityFieldText;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Create the test field.
-    module_load_install('entity_test');
-    entity_test_install();
-
-    // Install required default configuration for filter module.
-    $this->installConfig(array('system', 'filter'));
-  }
-
-  /**
-   * Creates a test entity.
-   *
-   * @param string $entity_type
-   *   An entity type.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The created test entity.
-   */
-  protected function createTestEntity($entity_type) {
-    $this->entityName = $this->randomMachineName();
-    $this->entityUser = $this->createUser();
-
-    // Pass in the value of the name field when creating. With the user
-    // field we test setting a field after creation.
-    $entity = entity_create($entity_type);
-    $entity->user_id->target_id = $this->entityUser->id();
-    $entity->name->value = $this->entityName;
-
-    // Set a value for the test field.
-    if ($entity->hasField('field_test_text')) {
-      $this->entityFieldText = $this->randomMachineName();
-      $entity->field_test_text->value = $this->entityFieldText;
-    }
-
-    return $entity;
-  }
-
-  /**
-   * Tests validating test entity types.
-   */
-  public function testValidation() {
-    // Ensure that the constraint manager is marked as cached cleared.
-
-    // Use the protected property on the cache_clearer first to check whether
-    // the constraint manager is added there.
-
-    // Ensure that the proxy class is initialized, which has the necessary
-    // method calls attached.
-    \Drupal::service('plugin.cache_clearer');
-    $plugin_cache_clearer = \Drupal::service('drupal.proxy_original_service.plugin.cache_clearer');
-    $get_cached_discoveries = function () {
-      return $this->cachedDiscoveries;
-    };
-    $get_cached_discoveries = $get_cached_discoveries->bindTo($plugin_cache_clearer, $plugin_cache_clearer);
-    $cached_discoveries = $get_cached_discoveries();
-    $cached_discovery_classes = [];
-    foreach ($cached_discoveries as $cached_discovery) {
-      $cached_discovery_classes[] = get_class($cached_discovery);
-    }
-    $this->assertTrue(in_array('Drupal\Core\Validation\ConstraintManager', $cached_discovery_classes));
-
-    // All entity variations have to have the same results.
-    foreach (entity_test_entity_types() as $entity_type) {
-      $this->checkValidation($entity_type);
-    }
-  }
-
-  /**
-   * Executes the validation test set for a defined entity type.
-   *
-   * @param string $entity_type
-   *   The entity type to run the tests with.
-   */
-  protected function checkValidation($entity_type) {
-    $entity = $this->createTestEntity($entity_type);
-    $violations = $entity->validate();
-    $this->assertEqual($violations->count(), 0, 'Validation passes.');
-
-    // Test triggering a fail for each of the constraints specified.
-    $test_entity = clone $entity;
-    $test_entity->id->value = -1;
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: The integer must be larger or equal to %min.', array('%name' => 'ID', '%min' => 0)));
-
-    $test_entity = clone $entity;
-    $test_entity->uuid->value = $this->randomString(129);
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'UUID', '@max' => 128)));
-
-    $test_entity = clone $entity;
-    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
-    $test_entity->{$langcode_key}->value = $this->randomString(13);
-    $violations = $test_entity->validate();
-    // This should fail on AllowedValues and Length constraints.
-    $this->assertEqual($violations->count(), 2, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('This value is too long. It should have %limit characters or less.', array('%limit' => '12')));
-    $this->assertEqual($violations[1]->getMessage(), t('The value you selected is not a valid choice.'));
-
-    $test_entity = clone $entity;
-    $test_entity->type->value = NULL;
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('This value should not be null.'));
-
-    $test_entity = clone $entity;
-    $test_entity->name->value = $this->randomString(33);
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'Name', '@max' => 32)));
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getRoot()->getValue(), $test_entity, 'Violation root is entity.');
-    $this->assertEqual($violation->getPropertyPath(), 'name.0.value', 'Violation property path is correct.');
-    $this->assertEqual($violation->getInvalidValue(), $test_entity->name->value, 'Violation contains invalid value.');
-
-    $test_entity = clone $entity;
-    $test_entity->set('user_id', 9999);
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => 'user', '%id' => 9999)));
-
-    $test_entity = clone $entity;
-    $test_entity->field_test_text->format = $this->randomString(33);
-    $violations = $test_entity->validate();
-    $this->assertEqual($violations->count(), 1, 'Validation failed.');
-    $this->assertEqual($violations[0]->getMessage(), t('The value you selected is not a valid choice.'));
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getRoot()->getValue(), $test_entity, 'Violation root is entity.');
-    $this->assertEqual($violation->getPropertyPath(), 'field_test_text.0.format', 'Violation property path is correct.');
-    $this->assertEqual($violation->getInvalidValue(), $test_entity->field_test_text->format, 'Violation contains invalid value.');
-  }
-
-  /**
-   * Tests composite constraints.
-   */
-  public function testCompositeConstraintValidation() {
-    $entity = $this->createTestEntity('entity_test_composite_constraint');
-    $violations = $entity->validate();
-    $this->assertEqual($violations->count(), 0);
-
-    // Trigger violation condition.
-    $entity->name->value = 'test';
-    $entity->type->value = 'test2';
-    $violations = $entity->validate();
-    $this->assertEqual($violations->count(), 1);
-
-    // Make sure we can determine this is composite constraint.
-    $constraint = $violations[0]->getConstraint();
-    $this->assertTrue($constraint instanceof CompositeConstraintBase, 'Constraint is composite constraint.');
-    $this->assertEqual('type', $violations[0]->getPropertyPath());
-
-    /** @var CompositeConstraintBase $constraint */
-    $this->assertEqual($constraint->coversFields(), ['name', 'type'], 'Information about covered fields can be retrieved.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php b/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php
deleted file mode 100644
index a3e6cd1..0000000
--- a/core/modules/system/src/Tests/Entity/EntityViewBuilderTest.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\EntityViewBuilderTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
-use Drupal\Core\Cache\Cache;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Tests the entity view builder.
- *
- * @group Entity
- */
-class EntityViewBuilderTest extends EntityUnitTestBase {
-
-  use EntityReferenceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(array('user', 'entity_test'));
-
-    // Give anonymous users permission to view test entities.
-    Role::load(RoleInterface::ANONYMOUS_ID)
-      ->grantPermission('view test entity')
-      ->save();
-  }
-
-  /**
-   * Tests entity render cache handling.
-   */
-  public function testEntityViewBuilderCache() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $cache_contexts_manager = \Drupal::service("cache_contexts_manager");
-    $cache = \Drupal::cache();
-
-    // Force a request via GET so we can get drupal_render() cache working.
-    $request = \Drupal::request();
-    $request_method = $request->server->get('REQUEST_METHOD');
-    $request->setMethod('GET');
-
-    $entity_test = $this->createTestEntity('entity_test');
-
-    // Test that new entities (before they are saved for the first time) do not
-    // generate a cache entry.
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'The render array element of new (unsaved) entities is not cached, but does have cache tags set.');
-
-    // Get a fully built entity view render array.
-    $entity_test->save();
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
-    $cid = implode(':', $cid_parts);
-    $bin = $build['#cache']['bin'];
-
-    // Mock the build array to not require the theme registry.
-    unset($build['#theme']);
-    $build['#markup'] = 'entity_render_test';
-
-    // Test that a cache entry is created.
-    $renderer->renderRoot($build);
-    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
-
-    // Re-save the entity and check that the cache entry has been deleted.
-    $cache->set('kittens', 'Kitten data', Cache::PERMANENT, $build['#cache']['tags']);
-    $entity_test->save();
-    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was saved.');
-    $this->assertFalse($cache->get('kittens'), 'The entity saving has invalidated cache tags.');
-
-    // Rebuild the render array (creating a new cache entry in the process) and
-    // delete the entity to check the cache entry is deleted.
-    unset($build['#printed']);
-    $renderer->renderRoot($build);
-    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
-    $entity_test->delete();
-    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was deleted.');
-
-    // Restore the previous request method.
-    $request->setMethod($request_method);
-  }
-
-  /**
-   * Tests entity render cache with references.
-   */
-  public function testEntityViewBuilderCacheWithReferences() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $cache_contexts_manager = \Drupal::service("cache_contexts_manager");
-
-    // Force a request via GET so we can get drupal_render() cache working.
-    $request = \Drupal::request();
-    $request_method = $request->server->get('REQUEST_METHOD');
-    $request->setMethod('GET');
-
-    // Create an entity reference field and an entity that will be referenced.
-    $this->createEntityReferenceField('entity_test', 'entity_test', 'reference_field', 'Reference', 'entity_test');
-    entity_get_display('entity_test', 'entity_test', 'full')->setComponent('reference_field', [
-      'type' => 'entity_reference_entity_view',
-      'settings' => ['link' => FALSE],
-    ])->save();
-    $entity_test_reference = $this->createTestEntity('entity_test');
-    $entity_test_reference->save();
-
-    // Get a fully built entity view render array for the referenced entity.
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test_reference, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
-    $cid_reference = implode(':', $cid_parts);
-    $bin_reference = $build['#cache']['bin'];
-
-    // Mock the build array to not require the theme registry.
-    unset($build['#theme']);
-    $build['#markup'] = 'entity_render_test';
-    $renderer->renderRoot($build);
-
-    // Test that a cache entry was created for the referenced entity.
-    $this->assertTrue($this->container->get('cache.' . $bin_reference)->get($cid_reference), 'The entity render element for the referenced entity has been cached.');
-
-    // Create another entity that references the first one.
-    $entity_test = $this->createTestEntity('entity_test');
-    $entity_test->reference_field->entity = $entity_test_reference;
-    $entity_test->save();
-
-    // Get a fully built entity view render array.
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
-    $cid = implode(':', $cid_parts);
-    $bin = $build['#cache']['bin'];
-
-    // Mock the build array to not require the theme registry.
-    unset($build['#theme']);
-    $build['#markup'] = 'entity_render_test';
-    $renderer->renderRoot($build);
-
-    // Test that a cache entry is created.
-    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
-
-    // Save the entity and verify that both cache entries have been deleted.
-    $entity_test_reference->save();
-    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was deleted.');
-    $this->assertFalse($this->container->get('cache.' . $bin_reference)->get($cid_reference), 'The entity render cache for the referenced entity has been cleared when the entity was deleted.');
-
-    // Restore the previous request method.
-    $request->setMethod($request_method);
-  }
-
-  /**
-   * Tests entity render cache toggling.
-   */
-  public function testEntityViewBuilderCacheToggling() {
-    $entity_test = $this->createTestEntity('entity_test');
-    $entity_test->save();
-
-    // Test a view mode in default conditions: render caching is enabled for
-    // the entity type and the view mode.
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age', 'keys', 'bin'] , 'A view mode with render cache enabled has the correct output (cache tags, keys, contexts, max-age and bin).');
-
-    // Test that a view mode can opt out of render caching.
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'test');
-    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'A view mode with render cache disabled has the correct output (only cache tags, contexts and max-age).');
-
-    // Test that an entity type can opt out of render caching completely.
-    $entity_test_no_cache = $this->createTestEntity('entity_test_label');
-    $entity_test_no_cache->save();
-    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test_label')->view($entity_test_no_cache, 'full');
-    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'An entity type can opt out of render caching regardless of view mode configuration, but always has cache tags, contexts and max-age set.');
-  }
-
-  /**
-   * Tests weighting of display components.
-   */
-  public function testEntityViewBuilderWeight() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-
-    // Set a weight for the label component.
-    entity_get_display('entity_test', 'entity_test', 'full')
-      ->setComponent('label', array('weight' => 20))
-      ->save();
-
-    // Create and build a test entity.
-    $entity_test = $this->createTestEntity('entity_test');
-    $view =  $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
-    $renderer->renderRoot($view);
-
-    // Check that the weight is respected.
-    $this->assertEqual($view['label']['#weight'], 20, 'The weight of a display component is respected.');
-  }
-
-  /**
-   * Creates an entity for testing.
-   *
-   * @param string $entity_type
-   *   The entity type.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The created entity.
-   */
-  protected function createTestEntity($entity_type) {
-    $data = array(
-      'bundle' => $entity_type,
-      'name' => $this->randomMachineName(),
-    );
-    return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
index 5e8e5fa..882c61d 100644
--- a/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityViewControllerTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\Entity;
 
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -67,6 +68,17 @@ function testEntityViewController() {
       $this->assertRaw('full');
     }
 
+    // Test viewing a revisionable entity.
+    $entity_test_rev = $this->createTestEntity('entity_test_rev');
+    $entity_test_rev->save();
+    $entity_test_rev->name->value = 'rev 2';
+    $entity_test_rev->setNewRevision(TRUE);
+    $entity_test_rev->isDefaultRevision(TRUE);
+    $entity_test_rev->save();
+    $this->drupalGet('entity_test_rev/' . $entity_test_rev->id() . '/revision/' . $entity_test_rev->revision_id->value . '/view');
+    $this->assertRaw($entity_test_rev->label());
+    $this->assertRaw($get_label_markup($entity_test_rev->label()));
+
     // As entity_test IDs must be integers, make sure requests for non-integer
     // IDs return a page not found error.
     $this->drupalGet('entity_test/invalid');
@@ -84,7 +96,7 @@ public function testFieldItemAttributes() {
 
     // Create an entity and save test value in field_test_text.
     $test_value = $this->randomMachineName();
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     $entity->field_test_text = $test_value;
     $entity->save();
 
diff --git a/core/modules/system/src/Tests/Entity/FieldAccessTest.php b/core/modules/system/src/Tests/Entity/FieldAccessTest.php
deleted file mode 100644
index 70fc629..0000000
--- a/core/modules/system/src/Tests/Entity/FieldAccessTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\FieldAccessTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\simpletest\KernelTestBase;
-
-/**
- * Tests Field level access hooks.
- *
- * @group Entity
- */
-class FieldAccessTest extends KernelTestBase {
-
-  /**
-   * Modules to load code from.
-   *
-   * @var array
-   */
-  public static $modules = ['entity_test', 'field', 'system', 'text', 'filter', 'user'];
-
-  /**
-   * Holds the currently active global user ID that initiated the test run.
-   *
-   * The user ID gets replaced during the test and needs to be kept here so that
-   * it can be restored at the end of the test run.
-   *
-   * @var int
-   */
-  protected $activeUid;
-
-  protected function setUp() {
-    parent::setUp();
-    // Install field configuration.
-    $this->installConfig(array('field'));
-    // The users table is needed for creating dummy user accounts.
-    $this->installEntitySchema('user');
-    // Register entity_test text field.
-    module_load_install('entity_test');
-    entity_test_install();
-  }
-
-  /**
-   * Tests hook_entity_field_access() and hook_entity_field_access_alter().
-   *
-   * @see entity_test_entity_field_access()
-   * @see entity_test_entity_field_access_alter()
-   */
-  function testFieldAccess() {
-    $values = array(
-      'name' => $this->randomMachineName(),
-      'user_id' => 1,
-      'field_test_text' => array(
-        'value' => 'no access value',
-        'format' => 'full_html',
-      ),
-    );
-    $entity = entity_create('entity_test', $values);
-
-    // Create a dummy user account for testing access with.
-    $values = array('name' => 'test');
-    $account = entity_create('user', $values);
-
-    $this->assertFalse($entity->field_test_text->access('view', $account), 'Access to the field was denied.');
-    $expected = AccessResult::forbidden()->cacheUntilEntityChanges($entity);
-    $this->assertEqual($expected, $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was denied.');
-
-    $entity->field_test_text = 'access alter value';
-    $this->assertFalse($entity->field_test_text->access('view', $account), 'Access to the field was denied.');
-    $this->assertEqual($expected, $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was denied.');
-
-    $entity->field_test_text = 'standard value';
-    $this->assertTrue($entity->field_test_text->access('view', $account), 'Access to the field was granted.');
-    $this->assertEqual(AccessResult::allowed(), $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was granted.');
-  }
-}
diff --git a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php
deleted file mode 100644
index 67b0e94..0000000
--- a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php
+++ /dev/null
@@ -1,553 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\FieldSqlStorageTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests Field SQL Storage .
- *
- * Field_sql_storage.module implements the default back-end storage plugin
- * for the Field Storage API.
- *
- * @group Entity
- */
-class FieldSqlStorageTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field', 'field_test', 'text', 'entity_test');
-
-  /**
-   * The name of the created field.
-   *
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * @var int
-   */
-  protected $fieldCardinality;
-
-  /**
-   * A field storage to use in this class.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * A field to use in this test class.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
-
-  /**
-   * Name of the data table of the field.
-   *
-   * @var string
-   */
-  protected $table;
-
-  /**
-   * Name of the revision table of the field.
-   *
-   * @var string
-   */
-  protected $revisionTable;
-
-  /**
-   * The table mapping for the tested entity type.
-   *
-   * @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping
-   */
-  protected $tableMapping;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-    $entity_type = 'entity_test_rev';
-
-    $this->fieldName = strtolower($this->randomMachineName());
-    $this->fieldCardinality = 4;
-    $this->fieldStorage = entity_create('field_storage_config', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => $entity_type,
-      'type' => 'test_field',
-      'cardinality' => $this->fieldCardinality,
-    ));
-    $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
-      'field_storage' => $this->fieldStorage,
-      'bundle' => $entity_type
-    ));
-    $this->field->save();
-
-    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-    $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping();
-    $this->tableMapping = $table_mapping;
-    $this->table = $table_mapping->getDedicatedDataTableName($this->fieldStorage);
-    $this->revisionTable = $table_mapping->getDedicatedRevisionTableName($this->fieldStorage);
-  }
-
-  /**
-   * Tests field loading works correctly by inserting directly in the tables.
-   */
-  function testFieldLoad() {
-    $entity_type = $bundle = 'entity_test_rev';
-    $storage = $this->container->get('entity.manager')->getStorage($entity_type);
-
-    $columns = array('bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode', $this->tableMapping->getFieldColumnName($this->fieldStorage, 'value'));
-
-    // Create an entity with four revisions.
-    $revision_ids = array();
-    $entity = entity_create($entity_type);
-    $entity->save();
-    $revision_ids[] = $entity->getRevisionId();
-    for ($i = 0; $i < 4; $i++) {
-      $entity->setNewRevision();
-      $entity->save();
-      $revision_ids[] = $entity->getRevisionId();
-    }
-
-    // Generate values and insert them directly in the storage tables.
-    $values = array();
-    $query = db_insert($this->revisionTable)->fields($columns);
-    foreach ($revision_ids as $revision_id) {
-      // Put one value too many.
-      for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
-        $value = mt_rand(1, 127);
-        $values[$revision_id][] = $value;
-        $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
-      }
-      $query->execute();
-    }
-    $query = db_insert($this->table)->fields($columns);
-    foreach ($values[$revision_id] as $delta => $value) {
-      $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
-    }
-    $query->execute();
-
-    // Load every revision and check the values.
-    foreach ($revision_ids as $revision_id) {
-      $entity = $storage->loadRevision($revision_id);
-      foreach ($values[$revision_id] as $delta => $value) {
-        if ($delta < $this->fieldCardinality) {
-          $this->assertEqual($entity->{$this->fieldName}[$delta]->value, $value);
-        }
-        else {
-          $this->assertFalse(array_key_exists($delta, $entity->{$this->fieldName}));
-        }
-      }
-    }
-
-    // Load the "current revision" and check the values.
-    $entity = $storage->load($entity->id());
-    foreach ($values[$revision_id] as $delta => $value) {
-      if ($delta < $this->fieldCardinality) {
-        $this->assertEqual($entity->{$this->fieldName}[$delta]->value, $value);
-      }
-      else {
-        $this->assertFalse(array_key_exists($delta, $entity->{$this->fieldName}));
-      }
-    }
-
-    // Add a translation in an unavailable language code and verify it is not
-    // loaded.
-    $unavailable_langcode = 'xx';
-    $values = array($bundle, 0, $entity->id(), $entity->getRevisionId(), 0, $unavailable_langcode, mt_rand(1, 127));
-    db_insert($this->table)->fields($columns)->values($values)->execute();
-    db_insert($this->revisionTable)->fields($columns)->values($values)->execute();
-    $entity = $storage->load($entity->id());
-    $this->assertFalse(array_key_exists($unavailable_langcode, $entity->{$this->fieldName}));
-  }
-
-  /**
-   * Tests field saving works correctly by reading directly from the tables.
-   */
-  function testFieldWrite() {
-    $entity_type = $bundle = 'entity_test_rev';
-    $entity = entity_create($entity_type);
-
-    $revision_values = array();
-
-    // Check insert. Add one value too many.
-    $values = array();
-    for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
-      $values[$delta]['value'] = mt_rand(1, 127);
-    }
-    $entity->{$this->fieldName} = $values;
-    $entity->save();
-
-    // Read the tables and check the correct values have been stored.
-    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
-    $this->assertEqual(count($rows), $this->fieldCardinality);
-    foreach ($rows as $delta => $row) {
-      $expected = array(
-        'bundle' => $bundle,
-        'deleted' => 0,
-        'entity_id' => $entity->id(),
-        'revision_id' => $entity->getRevisionId(),
-        'langcode' => $entity->language()->getId(),
-        'delta' => $delta,
-        $this->fieldName . '_value' => $values[$delta]['value'],
-      );
-      $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
-    }
-
-    // Test update. Add less values and check that the previous values did not
-    // persist.
-    $values = array();
-    for ($delta = 0; $delta <= $this->fieldCardinality - 2; $delta++) {
-      $values[$delta]['value'] = mt_rand(1, 127);
-    }
-    $entity->{$this->fieldName} = $values;
-    $entity->save();
-    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
-    $this->assertEqual(count($rows), count($values));
-    foreach ($rows as $delta => $row) {
-      $expected = array(
-        'bundle' => $bundle,
-        'deleted' => 0,
-        'entity_id' => $entity->id(),
-        'revision_id' => $entity->getRevisionId(),
-        'langcode' => $entity->language()->getId(),
-        'delta' => $delta,
-        $this->fieldName . '_value' => $values[$delta]['value'],
-      );
-      $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
-    }
-
-    // Create a new revision.
-    $revision_values[$entity->getRevisionId()] = $values;
-    $values = array();
-    for ($delta = 0; $delta < $this->fieldCardinality; $delta++) {
-      $values[$delta]['value'] = mt_rand(1, 127);
-    }
-    $entity->{$this->fieldName} = $values;
-    $entity->setNewRevision();
-    $entity->save();
-    $revision_values[$entity->getRevisionId()] = $values;
-
-    // Check that data for both revisions are in the revision table.
-    foreach ($revision_values as $revision_id => $values) {
-      $rows = db_select($this->revisionTable, 't')->fields('t')->condition('revision_id', $revision_id)->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
-      $this->assertEqual(count($rows), min(count($values), $this->fieldCardinality));
-      foreach ($rows as $delta => $row) {
-        $expected = array(
-          'bundle' => $bundle,
-          'deleted' => 0,
-          'entity_id' => $entity->id(),
-          'revision_id' => $revision_id,
-          'langcode' => $entity->language()->getId(),
-          'delta' => $delta,
-          $this->fieldName . '_value' => $values[$delta]['value'],
-        );
-        $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
-      }
-    }
-
-    // Test emptying the field.
-    $entity->{$this->fieldName} = NULL;
-    $entity->save();
-    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
-    $this->assertEqual(count($rows), 0);
-  }
-
-  /**
-   * Tests that long entity type and field names do not break.
-   */
-  function testLongNames() {
-    // Use one of the longest entity_type names in core.
-    $entity_type = $bundle = 'entity_test_label_callback';
-    $storage = $this->container->get('entity.manager')->getStorage($entity_type);
-
-    // Create two fields and generate random values.
-    $name_base = Unicode::strtolower($this->randomMachineName(FieldStorageConfig::NAME_MAX_LENGTH - 1));
-    $field_names = array();
-    $values = array();
-    for ($i = 0; $i < 2; $i++) {
-      $field_names[$i] = $name_base . $i;
-      entity_create('field_storage_config', array(
-        'field_name' => $field_names[$i],
-        'entity_type' => $entity_type,
-        'type' => 'test_field',
-      ))->save();
-      entity_create('field_config', array(
-        'field_name' => $field_names[$i],
-        'entity_type' => $entity_type,
-        'bundle' => $bundle,
-      ))->save();
-      $values[$field_names[$i]] = mt_rand(1, 127);
-    }
-
-    // Save an entity with values.
-    $entity = entity_create($entity_type, $values);
-    $entity->save();
-
-    // Load the entity back and check the values.
-    $entity = $storage->load($entity->id());
-    foreach ($field_names as $field_name) {
-      $this->assertEqual($entity->get($field_name)->value, $values[$field_name]);
-    }
-  }
-
-  /**
-   * Test trying to update a field with data.
-   */
-  function testUpdateFieldSchemaWithData() {
-    $entity_type = 'entity_test_rev';
-    // Create a decimal 5.2 field and add some data.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'decimal52',
-      'entity_type' => $entity_type,
-      'type' => 'decimal',
-      'settings' => array('precision' => 5, 'scale' => 2),
-    ));
-    $field_storage->save();
-    $field = entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => $entity_type,
-    ));
-    $field->save();
-    $entity = entity_create($entity_type, array(
-      'id' => 0,
-      'revision_id' => 0,
-    ));
-    $entity->decimal52->value = '1.235';
-    $entity->save();
-
-    // Attempt to update the field in a way that would work without data.
-    $field_storage->setSetting('scale', 3);
-    try {
-      $field_storage->save();
-      $this->fail(t('Cannot update field schema with data.'));
-    }
-    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
-      $this->pass(t('Cannot update field schema with data.'));
-    }
-  }
-
-  /**
-   * Test that failure to create fields is handled gracefully.
-   */
-  function testFieldUpdateFailure() {
-    // Create a text field.
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => 'test_text',
-      'entity_type' => 'entity_test_rev',
-      'type' => 'text',
-      'settings' => array('max_length' => 255),
-    ));
-    $field_storage->save();
-
-    // Attempt to update the field in a way that would break the storage. The
-    // parenthesis suffix is needed because SQLite has *very* relaxed rules for
-    // data types, so we actually need to provide an invalid SQL syntax in order
-    // to break it.
-    // @see https://www.sqlite.org/datatype3.html
-    $prior_field_storage = $field_storage;
-    $field_storage->setSetting('max_length', '-1)');
-    try {
-      $field_storage->save();
-      $this->fail(t('Update succeeded.'));
-    }
-    catch (\Exception $e) {
-      $this->pass(t('Update properly failed.'));
-    }
-
-    // Ensure that the field tables are still there.
-    $tables = array(
-      $this->tableMapping->getDedicatedDataTableName($prior_field_storage),
-      $this->tableMapping->getDedicatedRevisionTableName($prior_field_storage),
-    );
-    foreach ($tables as $table_name) {
-      $this->assertTrue(db_table_exists($table_name), t('Table %table exists.', array('%table' => $table_name)));
-    }
-  }
-
-  /**
-   * Test adding and removing indexes while data is present.
-   */
-  function testFieldUpdateIndexesWithData() {
-    // Create a decimal field.
-    $field_name = 'testfield';
-    $entity_type = 'entity_test_rev';
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => $field_name,
-      'entity_type' => $entity_type,
-      'type' => 'text',
-    ));
-    $field_storage->save();
-    $field = entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => $entity_type,
-    ));
-    $field->save();
-    $tables = array($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage));
-
-    // Verify the indexes we will create do not exist yet.
-    foreach ($tables as $table) {
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value'), t("No index named value exists in @table", array('@table' => $table)));
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value_format'), t("No index named value_format exists in @table", array('@table' => $table)));
-    }
-
-    // Add data so the table cannot be dropped.
-    $entity = entity_create($entity_type, array(
-      'id' => 1,
-      'revision_id' => 1,
-    ));
-    $entity->$field_name->value = 'field data';
-    $entity->enforceIsNew();
-    $entity->save();
-
-    // Add an index.
-    $field_storage->setIndexes(['value' => [['value', 255]]]);
-    $field_storage->save();
-    foreach ($tables as $table) {
-      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value created in @table", array('@table' => $table)));
-    }
-
-    // Add a different index, removing the existing custom one.
-    $field_storage->setIndexes(['value_format' => [['value', 127], ['format', 127]]]);
-    $field_storage->save();
-    foreach ($tables as $table) {
-      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), t("Index on value_format created in @table", array('@table' => $table)));
-      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value removed in @table", array('@table' => $table)));
-    }
-
-    // Verify that the tables were not dropped in the process.
-    $entity = $this->container->get('entity.manager')->getStorage($entity_type)->load(1);
-    $this->assertEqual($entity->$field_name->value, 'field data', t("Index changes performed without dropping the tables"));
-  }
-
-  /**
-   * Test foreign key support.
-   */
-  function testFieldSqlStorageForeignKeys() {
-    // Create a 'shape' field, with a configurable foreign key (see
-    // field_test_field_schema()).
-    $field_name = 'testfield';
-    $foreign_key_name = 'shape';
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'shape',
-      'settings' => array('foreign_key_name' => $foreign_key_name),
-    ));
-    $field_storage->save();
-    // Get the field schema.
-    $schema = $field_storage->getSchema();
-
-    // Retrieve the field definition and check that the foreign key is in place.
-    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name preserved through CRUD');
-    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name preserved through CRUD');
-
-    // Update the field settings, it should update the foreign key definition too.
-    $foreign_key_name = 'color';
-    $field_storage->setSetting('foreign_key_name', $foreign_key_name);
-    $field_storage->save();
-    // Reload the field schema after the update.
-    $schema = $field_storage->getSchema();
-
-    // Check that the foreign key is in place.
-    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name modified after update');
-    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name modified after update');
-  }
-
-  /**
-   * Tests table name generation.
-   */
-  public function testTableNames() {
-    // Note: we need to test entity types with long names. We therefore use
-    // fields on imaginary entity types (works as long as we don't actually save
-    // them), and just check the generated table names.
-
-    // Short entity type and field name.
-    $entity_type = 'short_entity_type';
-    $field_name = 'short_field_name';
-    $field_storage = entity_create('field_storage_config', array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name,
-      'type' => 'test_field',
-    ));
-    $expected = 'short_entity_type__short_field_name';
-    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
-    $expected = 'short_entity_type_revision__short_field_name';
-    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
-
-    // Short entity type, long field name
-    $entity_type = 'short_entity_type';
-    $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
-    $field_storage = entity_create('field_storage_config', array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name,
-      'type' => 'test_field',
-    ));
-    $expected = 'short_entity_type__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
-    $expected = 'short_entity_type_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
-
-    // Long entity type, short field name
-    $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
-    $field_name = 'short_field_name';
-    $field_storage = entity_create('field_storage_config', array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name,
-      'type' => 'test_field',
-    ));
-    $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
-    $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
-
-    // Long entity type and field name.
-    $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
-    $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
-    $field_storage = entity_create('field_storage_config', array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name,
-      'type' => 'test_field',
-    ));
-    $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
-    $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
-    // Try creating a second field and check there are no clashes.
-    $field_storage2 = entity_create('field_storage_config', array(
-      'entity_type' => $entity_type,
-      'field_name' => $field_name . '2',
-      'type' => 'test_field',
-    ));
-    $this->assertNotEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedDataTableName($field_storage2));
-    $this->assertNotEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage2));
-
-    // Deleted field.
-    $field_storage = entity_create('field_storage_config', array(
-      'entity_type' => 'some_entity_type',
-      'field_name' => 'some_field_name',
-      'type' => 'test_field',
-      'deleted' => TRUE,
-    ));
-    $expected = 'field_deleted_data_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage, TRUE), $expected);
-    $expected = 'field_deleted_revision_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
-    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage, TRUE), $expected);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php
deleted file mode 100644
index 989f00b..0000000
--- a/core/modules/system/src/Tests/Entity/FieldTranslationSqlStorageTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\FieldTranslationSqlStorageTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests Field translation SQL Storage.
- *
- * @group Entity
- */
-class FieldTranslationSqlStorageTest extends EntityLanguageTestBase {
-
-  /**
-   * Tests field SQL storage.
-   */
-  public function testFieldSqlStorage() {
-    $entity_type = 'entity_test_mul';
-
-    $controller = $this->entityManager->getStorage($entity_type);
-    $values = array(
-      $this->fieldName => $this->randomMachineName(),
-      $this->untranslatableFieldName => $this->randomMachineName(),
-    );
-    $entity = $controller->create($values);
-    $entity->save();
-
-    // Tests that when changing language field language codes are still correct.
-    $langcode = $this->langcodes[0];
-    $entity->langcode->value = $langcode;
-    $entity->save();
-    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed from language neutral.');
-    $langcode = $this->langcodes[1];
-    $entity->langcode->value = $langcode;
-    $entity->save();
-    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed.');
-    $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED;
-    $entity->langcode->value = $langcode;
-    $entity->save();
-    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed to language neutral.');
-
-    // Test that after switching field translatability things keep working as
-    // before.
-    $this->toggleFieldTranslatability($entity_type, $entity_type);
-    $entity = $this->reloadEntity($entity);
-    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
-      $this->assertEqual($entity->get($field_name)->value, $values[$field_name], 'Field language works as expected after switching translatability.');
-    }
-
-    // Test that after disabling field translatability translated values are not
-    // loaded.
-    $this->toggleFieldTranslatability($entity_type, $entity_type);
-    $entity = $this->reloadEntity($entity);
-    $entity->langcode->value = $this->langcodes[0];
-    $translation = $entity->addTranslation($this->langcodes[1]);
-    $translated_value = $this->randomMachineName();
-    $translation->get($this->fieldName)->value = $translated_value;
-    $translation->save();
-    $this->toggleFieldTranslatability($entity_type, $entity_type);
-    $entity = $this->reloadEntity($entity);
-    $this->assertEqual($entity->getTranslation($this->langcodes[1])->get($this->fieldName)->value, $values[$this->fieldName], 'Existing field translations are not loaded for untranslatable fields.');
-  }
-
-  /**
-   * Checks whether field languages are correctly stored for the given entity.
-   *
-   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
-   *   The entity fields are attached to.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   */
-  protected function assertFieldStorageLangcode(FieldableEntityInterface $entity, $message = '') {
-    $status = TRUE;
-    $entity_type = $entity->getEntityTypeId();
-    $id = $entity->id();
-    $langcode = $entity->getUntranslated()->language()->getId();
-    $fields = array($this->fieldName, $this->untranslatableFieldName);
-    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
-    $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping();
-
-    foreach ($fields as $field_name) {
-      $field_storage = FieldStorageConfig::loadByName($entity_type, $field_name);
-      $table = $table_mapping->getDedicatedDataTableName($field_storage);
-
-      $record = \Drupal::database()
-        ->select($table, 'f')
-        ->fields('f')
-        ->condition('f.entity_id', $id)
-        ->condition('f.revision_id', $id)
-        ->execute()
-        ->fetchObject();
-
-      if ($record->langcode != $langcode) {
-        $status = FALSE;
-        break;
-      }
-    }
-
-    return $this->assertTrue($status, $message);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
deleted file mode 100644
index 4f223e3..0000000
--- a/core/modules/system/src/Tests/Entity/FieldWidgetConstraintValidatorTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\FieldWidgetConstraintValidatorTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\entity_test\Entity\EntityTestCompositeConstraint;
-use Drupal\simpletest\KernelTestBase;
-use Drupal\system\Tests\TypedData;
-
-/**
- * Tests validation constraints for FieldWidgetConstraintValidatorTest.
- *
- * @group Entity
- */
-class FieldWidgetConstraintValidatorTest extends KernelTestBase {
-
-  public static $modules = array('entity_test', 'field', 'user', 'system');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['router', 'key_value']);
-    $this->container->get('router.builder')->rebuild();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test_composite_constraint');
-  }
-
-  /**
-   * Tests widget constraint validation.
-   */
-  public function testValidation() {
-    $entity_type = 'entity_test_constraint_violation';
-    $entity = entity_create($entity_type, array('id' => 1, 'revision_id' => 1));
-    $display = entity_get_form_display($entity_type, $entity_type, 'default');
-    $form = array();
-    $form_state = new FormState();
-    $display->buildForm($entity, $form, $form_state);
-
-    // Pretend the form has been built.
-    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type, 'default'));
-    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
-    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
-
-    // Validate the field constraint.
-    $form_state->getFormObject()->setEntity($entity)->setFormDisplay($display, $form_state);
-    $entity = $form_state->getFormObject()->buildEntity($form, $form_state);
-    $display->validateFormValues($entity, $form, $form_state);
-
-    $errors = $form_state->getErrors();
-    $this->assertEqual($errors['name'], 'Widget constraint has failed.', 'Constraint violation is generated correctly');
-  }
-
-  /**
-   * Gets the form errors for a given entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity
-   * @param array $hidden_fields
-   *   (optional) A list of hidden fields.
-   *
-   * @return array
-   *   The form errors.
-   */
-  protected function getErrorsForEntity(EntityInterface $entity, $hidden_fields = []) {
-    $entity_type_id = 'entity_test_composite_constraint';
-    $display = entity_get_form_display($entity_type_id, $entity_type_id, 'default');
-
-    foreach ($hidden_fields as $hidden_field) {
-      $display->removeComponent($hidden_field);
-    }
-
-    $form = [];
-    $form_state = new FormState();
-    $display->buildForm($entity, $form, $form_state);
-
-    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type_id, 'default'));
-    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
-    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
-
-    // Validate the field constraint.
-    /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
-    $form_object = $form_state->getFormObject();
-    $form_object
-      ->setEntity($entity)
-      ->setFormDisplay($display, $form_state)
-      ->validateForm($form, $form_state);
-
-    return $form_state->getErrors();
-  }
-
-  /**
-   * Tests widget constraint validation with composite constraints.
-   */
-  public function testValidationWithCompositeConstraint() {
-    // First provide a valid value, this should cause no validation.
-    $entity = EntityTestCompositeConstraint::create([
-      'name' => 'valid-value',
-    ]);
-    $entity->save();
-
-    $errors = $this->getErrorsForEntity($entity);
-    $this->assertFalse(isset($errors['name']));
-    $this->assertFalse(isset($errors['type']));
-
-    // Provide an invalid value for the name field.
-    $entity = EntityTestCompositeConstraint::create([
-      'name' => 'failure-field-name',
-    ]);
-    $errors = $this->getErrorsForEntity($entity);
-    $this->assertTrue(isset($errors['name']));
-    $this->assertFalse(isset($errors['type']));
-
-    // Hide the second field (type) and ensure the validation still happens. The
-    // error message appears on the first field (name).
-    $entity = EntityTestCompositeConstraint::create([
-      'name' => 'failure-field-name',
-    ]);
-    $errors = $this->getErrorsForEntity($entity, ['type']);
-    $this->assertTrue(isset($errors['name']));
-    $this->assertFalse(isset($errors['type']));
-
-    // Provide a violation again, but this time hide the first field (name).
-    // Ensure that the validation still happens and the error message is moved
-    // from the field to the second field and have a custom error message.
-    $entity = EntityTestCompositeConstraint::create([
-      'name' => 'failure-field-name',
-    ]);
-    $errors = $this->getErrorsForEntity($entity, ['name']);
-    $this->assertFalse(isset($errors['name']));
-    $this->assertTrue(isset($errors['type']));
-    $this->assertEqual($errors['type'], SafeMarkup::format('The validation failed because the value conflicts with the value in %field_name, which you cannot access.', ['%field_name' => 'name']));
-  }
-
-  /**
-   * Tests entity level constraint validation.
-   */
-  public function testEntityLevelConstraintValidation() {
-    $entity = EntityTestCompositeConstraint::create([
-      'name' => 'entity-level-violation'
-    ]);
-    $entity->save();
-
-    $errors = $this->getErrorsForEntity($entity);
-    $this->assertEqual($errors[''], 'Entity level validation');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Entity/ValidReferenceConstraintValidatorTest.php b/core/modules/system/src/Tests/Entity/ValidReferenceConstraintValidatorTest.php
deleted file mode 100644
index 69a7acb..0000000
--- a/core/modules/system/src/Tests/Entity/ValidReferenceConstraintValidatorTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Entity\ValidReferenceConstraintValidatorTest.
- */
-
-namespace Drupal\system\Tests\Entity;
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\system\Tests\TypedData;
-
-/**
- * Tests validation constraints for ValidReferenceConstraintValidator.
- *
- * @group Validation
- */
-class ValidReferenceConstraintValidatorTest extends EntityUnitTestBase {
-
-  /**
-   * The typed data manager to use.
-   *
-   * @var \Drupal\Core\TypedData\TypedDataManager
-   */
-  protected $typedData;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('field', 'user');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('user', array('users_data'));
-    $this->typedData = $this->container->get('typed_data_manager');
-  }
-
-  /**
-   * Tests the ValidReferenceConstraintValidator.
-   */
-  public function testValidation() {
-    // Create a test entity to be referenced.
-    $entity = $this->createUser();
-    // By default entity references already have the ValidReference constraint.
-    $definition = BaseFieldDefinition::create('entity_reference')
-      ->setSettings(array('target_type' => 'user'));
-
-    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
-    $violations = $typed_data->validate();
-    $this->assertFalse($violations->count(), 'Validation passed for correct value.');
-
-    // NULL is also considered a valid reference.
-    $typed_data = $this->typedData->create($definition, array('target_id' => NULL));
-    $violations = $typed_data->validate();
-    $this->assertFalse($violations->count(), 'Validation passed for correct value.');
-
-    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
-    // Delete the referenced entity.
-    $entity->delete();
-    $violations = $typed_data->validate();
-    $this->assertTrue($violations->count(), 'Validation failed for incorrect value.');
-
-    // Make sure the information provided by a violation is correct.
-    $violation = $violations[0];
-    $this->assertEqual($violation->getMessage(), t('The referenced entity (%type: %id) does not exist.', array(
-      '%type' => 'user',
-      '%id' => $entity->id(),
-    )), 'The message for invalid value is correct.');
-    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Field/FieldItemTest.php b/core/modules/system/src/Tests/Field/FieldItemTest.php
deleted file mode 100644
index 0bb09ea..0000000
--- a/core/modules/system/src/Tests/Field/FieldItemTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Field\FieldItemTest.
- */
-
-namespace Drupal\system\Tests\Field;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestMulRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Test field item methods.
- *
- * @group Field
- */
-class FieldItemTest extends EntityUnitTestBase {
-
-  /**
-   * @var string
-   */
-  protected $fieldName;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->container->get('state')->set('entity_test.field_test_item', TRUE);
-    $this->entityManager->clearCachedDefinitions();
-
-    $entity_type_id = 'entity_test_mulrev';
-    $this->installEntitySchema($entity_type_id);
-
-    $this->fieldName = Unicode::strtolower($this->randomMachineName());
-
-    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
-    FieldStorageConfig::create([
-      'field_name' => $this->fieldName,
-      'type' => 'field_test',
-      'entity_type' => $entity_type_id,
-      'cardinality' => 1,
-    ])->save();
-
-    FieldConfig::create([
-      'entity_type' => $entity_type_id,
-      'field_name' => $this->fieldName,
-      'bundle' => $entity_type_id,
-      'label' => 'Test field',
-    ])->save();
-
-    $this->entityManager->clearCachedDefinitions();
-    $definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
-    $this->assertTrue(!empty($definitions[$this->fieldName]));
-  }
-
-  /**
-   * Tests the field item save workflow.
-   */
-  public function testSaveWorkflow() {
-    $entity = EntityTestMulRev::create([
-      'name' => $this->randomString(),
-      'field_test_item' => $this->randomString(),
-      $this->fieldName => $this->randomString(),
-    ]);
-
-    // Save a new entity and verify that the initial field value is overwritten
-    // with a value containing the entity id, which implies a resave. Check that
-    // the entity data structure and the stored values match.
-    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:1");
-
-    // Update the entity and verify that the field value is overwritten on
-    // presave if it is not resaved.
-    $this->assertSavedFieldItemValue($entity, 'overwritten');
-
-    // Flag the field value as needing to be resaved and verify it actually is.
-    $entity->field_test_item->value = $entity->{$this->fieldName}->value = 'resave';
-    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:3");
-  }
-
-  /**
-   * Checks that the saved field item value matches the expected one.
-   *
-   * @param \Drupal\entity_test\Entity\EntityTest $entity
-   *   The test entity.
-   * @param $expected_value
-   *   The expected field item value.
-   *
-   * @return bool
-   *   TRUE if the item value matches expectations, FALSE otherwise.
-   */
-  protected function assertSavedFieldItemValue(EntityTest $entity, $expected_value) {
-    $entity->setNewRevision(TRUE);
-    $entity->save();
-    $base_field_expected_value = str_replace($this->fieldName, 'field_test_item', $expected_value);
-    $result = $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
-    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
-    $entity = $this->reloadEntity($entity);
-    $result = $result && $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
-    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
-    return $result;
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php b/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
deleted file mode 100644
index 2d7c160..0000000
--- a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Field\FieldModuleUninstallValidatorTest.
- */
-
-namespace Drupal\system\Tests\Field;
-
-use Drupal\Core\Extension\ModuleUninstallValidatorException;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\entity_test\FieldStorageDefinition;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests FieldModuleUninstallValidator functionality.
- *
- * @group Field
- */
-class FieldModuleUninstallValidatorTest extends EntityUnitTestBase {
-
-  /**
-   * The entity definition update manager.
-   *
-   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
-   */
-  protected $entityDefinitionUpdateManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('user', 'users_data');
-    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
-
-    // Setup some fields for entity_test_extra to create.
-    $definitions['extra_base_field'] = BaseFieldDefinition::create('string')
-      ->setName('extra_base_field')
-      ->setTargetEntityTypeId('entity_test')
-      ->setTargetBundle('entity_test');
-    $this->state->set('entity_test.additional_base_field_definitions', $definitions);
-    $definitions['extra_bundle_field'] = FieldStorageDefinition::create('string')
-      ->setName('extra_bundle_field')
-      ->setTargetEntityTypeId('entity_test')
-      ->setTargetBundle('entity_test');
-    $this->state->set('entity_test.additional_field_storage_definitions', $definitions);
-    $this->state->set('entity_test.entity_test.additional_bundle_field_definitions', $definitions);
-    $this->entityManager->clearCachedDefinitions();
-  }
-
-  /**
-   * Tests uninstall entity_test module with and without content for the field.
-   */
-  public function testUninstallingModule() {
-    // Test uninstall works fine without content.
-    $this->assertModuleInstallUninstall('entity_test_extra');
-
-    // Test uninstalling works fine with content having no field values.
-    $entity = $this->entityManager->getStorage('entity_test')->create([
-      'name' => $this->randomString(),
-    ]);
-    $entity->save();
-    $this->assertModuleInstallUninstall('entity_test_extra');
-    $entity->delete();
-
-    // Verify uninstall works fine without content again.
-    $this->assertModuleInstallUninstall('entity_test_extra');
-    // Verify uninstalling entity_test is not possible when there is content for
-    // the base field.
-    $this->enableModules(['entity_test_extra']);
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $entity = $this->entityManager->getStorage('entity_test')->create([
-      'name' => $this->randomString(),
-      'extra_base_field' => $this->randomString(),
-    ]);
-    $entity->save();
-
-    try {
-      $message = 'Module uninstallation fails as the module provides a base field which has content.';
-      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
-      $this->fail($message);
-    }
-    catch (ModuleUninstallValidatorException $e) {
-      $this->pass($message);
-      $this->assertEqual($e->getMessage(), 'The following reasons prevent the modules from being uninstalled: There is data for the field extra_base_field on entity type Test entity');
-    }
-
-    // Verify uninstalling entity_test is not possible when there is content for
-    // the bundle field.
-    $entity->delete();
-    $this->assertModuleInstallUninstall('entity_test_extra');
-    $this->enableModules(['entity_test_extra']);
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $entity = $this->entityManager->getStorage('entity_test')->create([
-      'name' => $this->randomString(),
-      'extra_bundle_field' => $this->randomString(),
-    ]);
-    $entity->save();
-    try {
-      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
-      $this->fail('Module uninstallation fails as the module provides a bundle field which has content.');
-    }
-    catch (ModuleUninstallValidatorException $e) {
-      $this->pass('Module uninstallation fails as the module provides a bundle field which has content.');
-    }
-  }
-
-  /**
-   * Asserts the given module can be installed and uninstalled.
-   *
-   * @param string $module_name
-   *   The module to install and uninstall.
-   */
-  protected function assertModuleInstallUninstall($module_name) {
-    $this->enableModules([$module_name]);
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertTrue($this->getModuleHandler()->moduleExists($module_name), $module_name .' module is enabled.');
-    $this->getModuleInstaller()->uninstall([$module_name]);
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    $this->assertFalse($this->getModuleHandler()->moduleExists($module_name), $module_name . ' module is disabled.');
-  }
-
-  /**
-   * Returns the ModuleHandler.
-   *
-   * @return \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected function getModuleHandler() {
-    return $this->container->get('module_handler');
-  }
-
-  /**
-   * Returns the ModuleInstaller.
-   *
-   * @return \Drupal\Core\Extension\ModuleInstallerInterface
-   */
-  protected function getModuleInstaller() {
-    return $this->container->get('module_installer');
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Field/FieldSettingsTest.php b/core/modules/system/src/Tests/Field/FieldSettingsTest.php
deleted file mode 100644
index a996f8e..0000000
--- a/core/modules/system/src/Tests/Field/FieldSettingsTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Field\FieldSettingsTest.
- */
-
-namespace Drupal\system\Tests\Field;
-
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\system\Tests\Entity\EntityUnitTestBase;
-
-/**
- * Tests field settings methods on field definition structures.
- *
- * @group Field
- */
-class FieldSettingsTest extends EntityUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('field', 'field_test');
-
-  /**
-   * @covers \Drupal\Core\Field\BaseFieldDefinition::getSettings()
-   * @covers \Drupal\Core\Field\BaseFieldDefinition::setSettings()
-   */
-  public function testBaseFieldSettings() {
-    $base_field = BaseFieldDefinition::create('test_field');
-
-    // Check that the default settings have been populated.
-    $expected_settings = [
-      'test_field_storage_setting' => 'dummy test string',
-      'changeable' => 'a changeable field storage setting',
-      'unchangeable' => 'an unchangeable field storage setting',
-      'translatable_storage_setting' => 'a translatable field storage setting',
-      'test_field_setting' => 'dummy test string',
-      'translatable_field_setting' => 'a translatable field setting',
-    ];
-    $this->assertEqual($base_field->getSettings(), $expected_settings);
-
-    // Change one single setting using setSettings(), and check that the other
-    // expected settings are still present.
-    $expected_settings['test_field_setting'] = 'another test string';
-    $base_field->setSettings(['test_field_setting' => $expected_settings['test_field_setting']]);
-    $this->assertEqual($base_field->getSettings(), $expected_settings);
-  }
-
-  /**
-   * @covers \Drupal\field\Entity\FieldStorageConfig::getSettings()
-   * @covers \Drupal\field\Entity\FieldStorageConfig::setSettings()
-   */
-  public function testConfigurableFieldStorageSettings() {
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ]);
-
-    // Check that the default settings have been populated.
-    $expected_settings = [
-      'test_field_storage_setting' => 'dummy test string',
-      'changeable' => 'a changeable field storage setting',
-      'unchangeable' => 'an unchangeable field storage setting',
-      'translatable_storage_setting' => 'a translatable field storage setting',
-    ];
-    $this->assertEqual($field_storage->getSettings(), $expected_settings);
-
-    // Change one single setting using setSettings(), and check that the other
-    // expected settings are still present.
-    $expected_settings['test_field_storage_setting'] = 'another test string';
-    $field_storage->setSettings(['test_field_storage_setting' => $expected_settings['test_field_storage_setting']]);
-    $this->assertEqual($field_storage->getSettings(), $expected_settings);
-  }
-
-  /**
-   * @covers \Drupal\field\Entity\FieldStorageConfig::getSettings()
-   * @covers \Drupal\field\Entity\FieldStorageConfig::setSettings()
-   */
-  public function testConfigurableFieldSettings() {
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'test_field',
-      'entity_type' => 'entity_test',
-      'type' => 'test_field'
-    ]);
-    $field = FieldConfig::create([
-      'field_storage' => $field_storage,
-      'bundle' => 'entity_test'
-    ]);
-    // Note: FieldConfig does not populate default settings until the config
-    // is saved.
-    // @todo Remove once https://www.drupal.org/node/2327883 is fixed.
-    $field->save();
-
-    // Check that the default settings have been populated. Note: getSettings()
-    // returns both storage and field settings.
-    $expected_settings = [
-      'test_field_storage_setting' => 'dummy test string',
-      'changeable' => 'a changeable field storage setting',
-      'unchangeable' => 'an unchangeable field storage setting',
-      'translatable_storage_setting' => 'a translatable field storage setting',
-      'test_field_setting' => 'dummy test string',
-      'translatable_field_setting' => 'a translatable field setting',
-      'field_setting_from_config_data' => TRUE,
-    ];
-    $this->assertEqual($field->getSettings(), $expected_settings);
-
-    // Change one single setting using setSettings(), and check that the other
-    // expected settings are still present.
-    $expected_settings['test_field_setting'] = 'another test string';
-    $field->setSettings(['test_field_setting' => $expected_settings['test_field_setting']]);
-    $this->assertEqual($field->getSettings(), $expected_settings);
-  }
-
-}
diff --git a/core/modules/system/src/Tests/File/StreamWrapperTest.php b/core/modules/system/src/Tests/File/StreamWrapperTest.php
index 343cd83..5816861 100644
--- a/core/modules/system/src/Tests/File/StreamWrapperTest.php
+++ b/core/modules/system/src/Tests/File/StreamWrapperTest.php
@@ -102,7 +102,6 @@ function testUriFunctions() {
     // Test file_create_url()
     // TemporaryStream::getExternalUrl() uses Url::fromRoute(), which needs
     // route information to work.
-    $this->installSchema('system', 'router');
     $this->container->get('router.builder')->rebuild();
     $this->assertTrue(strpos(file_create_url('temporary://test.txt'), 'system/temporary?file=test.txt'), 'Temporary external URL correctly built.');
     $this->assertTrue(strpos(file_create_url('public://test.txt'), Settings::get('file_public_path') . '/test.txt'), 'Public external URL correctly built.');
diff --git a/core/modules/system/src/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php
index 5239fc9..dd37222 100644
--- a/core/modules/system/src/Tests/File/UrlRewritingTest.php
+++ b/core/modules/system/src/Tests/File/UrlRewritingTest.php
@@ -61,13 +61,13 @@ function testShippedFileURL()  {
     \Drupal::state()->delete('file_test.hook_file_url_alter');
     $filepath = 'core/misc/favicon.ico';
     $url = file_create_url($filepath . '?foo');
-    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=', $url, 'Correctly generated url. The query string is present.');
+    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=', $url, 'Correctly generated URL. The query string is present.');
     $url = file_create_url($filepath . '?foo=bar');
-    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=bar', $url, 'Correctly generated url. The query string is present.');
+    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=bar', $url, 'Correctly generated URL. The query string is present.');
     $url = file_create_url($filepath . '#v1.2');
-    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '#v1.2', $url, 'Correctly generated url. The fragment is present.');
+    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '#v1.2', $url, 'Correctly generated URL. The fragment is present.');
     $url = file_create_url($filepath . '?foo=bar#v1.2');
-    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=bar#v1.2', $url, 'Correctly generated url. The query string amd fragment is present.');
+    $this->assertEqual($GLOBALS['base_url'] . '/' . $filepath . '?foo=bar#v1.2', $url, 'Correctly generated URL. The query string amd fragment is present.');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
index 09eba7b..7cee618 100644
--- a/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
+++ b/core/modules/system/src/Tests/Form/ArbitraryRebuildTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\system\Tests\Form;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests altering forms to be rebuilt so there are multiple steps.
@@ -27,19 +29,19 @@ protected function setUp() {
     parent::setUp();
 
     // Auto-create a field for testing.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => 'user',
       'field_name' => 'test_multiple',
       'type' => 'text',
       'cardinality' => -1,
       'translatable' => FALSE,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => 'user',
       'field_name' => 'test_multiple',
       'bundle' => 'user',
       'label' => 'Test a multiple valued field',
-    ))->save();
+    ])->save();
     entity_get_form_display('user', 'user', 'register')
       ->setComponent('test_multiple', array(
         'type' => 'text_textfield',
diff --git a/core/modules/system/src/Tests/Form/ConfirmFormTest.php b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
index 92a5aa9..301cf78 100644
--- a/core/modules/system/src/Tests/Form/ConfirmFormTest.php
+++ b/core/modules/system/src/Tests/Form/ConfirmFormTest.php
@@ -84,7 +84,7 @@ public function testConfirmFormWithExternalDestination() {
    */
   public function assertCancelLinkUrl(Url $url, $message = '', $group = 'Other') {
     $links = $this->xpath('//a[@href=:url]', [':url' => $url->toString()]);
-    $message = ($message ? $message : SafeMarkup::format('Cancel link with url %url found.', ['%url' => $url->toString()]));
+    $message = ($message ? $message : SafeMarkup::format('Cancel link with URL %url found.', ['%url' => $url->toString()]));
     return $this->assertTrue(isset($links[0]), $message, $group);
   }
 
diff --git a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
index 9a09442..360cb68 100644
--- a/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsLabelsTest.php
@@ -93,6 +93,12 @@ function testFormLabels() {
     $this->assertEqual($elements[0]['title'], 'Checkboxes test' . ' (' . t('Required') . ')', 'Title attribute found.');
     $elements = $this->xpath('//div[@id="edit-form-radios-title-attribute"]');
     $this->assertEqual($elements[0]['title'], 'Radios test' . ' (' . t('Required') . ')', 'Title attribute found.');
+
+    $elements = $this->xpath('//fieldset[@id="edit-form-checkboxes-title-invisible--wrapper"]/legend/span[contains(@class, "visually-hidden")]');
+    $this->assertTrue(!empty($elements), "Title/Label not displayed when 'visually-hidden' attribute is set in checkboxes.");
+
+    $elements = $this->xpath('//fieldset[@id="edit-form-radios-title-invisible--wrapper"]/legend/span[contains(@class, "visually-hidden")]');
+    $this->assertTrue(!empty($elements), "Title/Label not displayed when 'visually-hidden' attribute is set in radios.");
   }
 
   /**
@@ -122,4 +128,27 @@ function testFormDescriptions() {
     $this->assertTrue(isset($elements[0]), t('Properly renders the #description element visually-hidden.'));
   }
 
+  /**
+   * Test forms in theme-less environments.
+   */
+  function testFormsInThemeLessEnvironments() {
+    $form = $this->getFormWithLimitedProperties();
+    $render_service = $this->container->get('renderer');
+    // This should not throw any notices.
+    $render_service->renderPlain($form);
+  }
+
+  /**
+   * Return a form with element with not all properties defined.
+   */
+  protected function getFormWithLimitedProperties() {
+    $form = array();
+
+    $form['fieldset'] = array(
+      '#type' => 'fieldset',
+      '#title' => 'Fieldset',
+    );
+
+    return $form;
+  }
 }
diff --git a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
index f9ce925..b400f3d 100644
--- a/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/src/Tests/Form/ElementsTableSelectTest.php
@@ -43,6 +43,27 @@ function testMultipleTrue() {
   }
 
   /**
+   * Test the presence of ajax functionality for all options.
+   */
+  function testAjax() {
+    $rows = array('row1', 'row2', 'row3');
+    // Test checkboxes (#multiple == TRUE).
+    foreach ($rows as $row) {
+      $element = 'tableselect[' . $row . ']';
+      $edit = array($element => TRUE);
+      $result = $this->drupalPostAjaxForm('form_test/tableselect/multiple-true', $edit, $element);
+      $this->assertFalse(empty($result), t('Ajax triggers on checkbox for @row.', array('@row' => $row)));
+    }
+    // Test radios (#multiple == FALSE).
+    $element = 'tableselect';
+    foreach ($rows as $row) {
+      $edit = array($element => $row);
+      $result = $this->drupalPostAjaxForm('form_test/tableselect/multiple-false', $edit, $element);
+      $this->assertFalse(empty($result), t('Ajax triggers on radio for @row.', array('@row' => $row)));
+    }
+  }
+
+  /**
    * Test the display of radios when #multiple is FALSE.
    */
   function testMultipleFalse() {
diff --git a/core/modules/system/src/Tests/Form/FormTest.php b/core/modules/system/src/Tests/Form/FormTest.php
index f0e5af0..3e6821f 100644
--- a/core/modules/system/src/Tests/Form/FormTest.php
+++ b/core/modules/system/src/Tests/Form/FormTest.php
@@ -16,6 +16,7 @@
 use Drupal\form_test\Form\FormTestDisabledElementsForm;
 use Drupal\simpletest\WebTestBase;
 use Drupal\user\RoleInterface;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests various form element validation mechanisms.
@@ -34,7 +35,7 @@ class FormTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $filtered_html_format = entity_create('filter_format', array(
+    $filtered_html_format = FilterFormat::create(array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
     ));
diff --git a/core/modules/system/src/Tests/Form/RebuildTest.php b/core/modules/system/src/Tests/Form/RebuildTest.php
index 7674241..277b477 100644
--- a/core/modules/system/src/Tests/Form/RebuildTest.php
+++ b/core/modules/system/src/Tests/Form/RebuildTest.php
@@ -9,7 +9,9 @@
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Url;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests functionality of \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
@@ -73,17 +75,17 @@ function testRebuildPreservesValues() {
   function testPreserveFormActionAfterAJAX() {
     // Create a multi-valued field for 'page' nodes to use for Ajax testing.
     $field_name = 'field_ajax_test';
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'node',
       'type' => 'text',
       'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'node',
       'bundle' => 'page',
-    ))->save();
+    ])->save();
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($field_name, array('type' => 'text_textfield'))
       ->save();
diff --git a/core/modules/system/src/Tests/Form/RedirectTest.php b/core/modules/system/src/Tests/Form/RedirectTest.php
index 6e70174..5dcc701 100644
--- a/core/modules/system/src/Tests/Form/RedirectTest.php
+++ b/core/modules/system/src/Tests/Form/RedirectTest.php
@@ -97,7 +97,7 @@ public function testRedirectFromErrorPages() {
     $this->assertResponse(404);
     $this->drupalPostForm(NULL, array(), t('Submit'));
     $this->assertResponse(200);
-    $this->assertUrl($expected, [], 'Redirected to correct url/query.');
+    $this->assertUrl($expected, [], 'Redirected to correct URL/query.');
 
     // Visit the block admin page (403 page) and submit the form. Verify it
     // ends up at the right URL.
@@ -105,6 +105,6 @@ public function testRedirectFromErrorPages() {
     $this->assertResponse(403);
     $this->drupalPostForm(NULL, array(), t('Submit'));
     $this->assertResponse(200);
-    $this->assertUrl($expected, [], 'Redirected to correct url/query.');
+    $this->assertUrl($expected, [], 'Redirected to correct URL/query.');
   }
 }
diff --git a/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php b/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php
index 3096310..d976b37 100644
--- a/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php
+++ b/core/modules/system/src/Tests/HttpKernel/StackKernelIntegrationTest.php
@@ -31,8 +31,6 @@ class StackKernelIntegrationTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index a731f5b..1c61235 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -203,8 +203,8 @@ function testManipulations() {
         'rotate_5' => array(
           'function' => 'rotate',
           'arguments' => array('degrees' => 5, 'background' => '#FF00FF'), // Fuchsia background.
-          'width' => 42,
-          'height' => 24,
+          'width' => 41,
+          'height' => 23,
           'corners' => array_fill(0, 4, $this->fuchsia),
         ),
         'rotate_90' => array(
@@ -217,8 +217,8 @@ function testManipulations() {
         'rotate_transparent_5' => array(
           'function' => 'rotate',
           'arguments' => array('degrees' => 5),
-          'width' => 42,
-          'height' => 24,
+          'width' => 41,
+          'height' => 23,
           'corners' => array_fill(0, 4, $this->rotateTransparent),
         ),
         'rotate_transparent_90' => array(
@@ -289,20 +289,6 @@ function testManipulations() {
         $correct_dimensions_real = TRUE;
         $correct_dimensions_object = TRUE;
 
-        // PHP 5.5 GD bug: https://bugs.php.net/bug.php?id=65148. PHP 5.5 GD
-        // rotates differently then it did in PHP 5.4 resulting in different
-        // dimensions then what math teaches us. For the test images, the
-        // dimensions will be 1 pixel smaller in both dimensions (though other
-        // tests have shown a difference of 0 to 3 pixels in both dimensions.
-        // @todo: if and when the PHP bug gets solved, add an upper limit
-        //   version check.
-        // @todo: in [#1551686] the dimension calculations for rotation are
-        //   reworked. That issue should also check if these tests can be made
-        //   more robust.
-        if (version_compare(PHP_VERSION, '5.5', '>=') && $values['function'] === 'rotate' && $values['arguments']['degrees'] % 90 != 0) {
-          $values['height']--;
-          $values['width']--;
-        }
         if (imagesy($toolkit->getResource()) != $values['height'] || imagesx($toolkit->getResource()) != $values['width']) {
           $correct_dimensions_real = FALSE;
         }
diff --git a/core/modules/system/src/Tests/Image/ToolkitTest.php b/core/modules/system/src/Tests/Image/ToolkitTest.php
index ea5bd5f..363fe08 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTest.php
@@ -21,6 +21,7 @@ function testGetAvailableToolkits() {
     $manager = $this->container->get('image.toolkit.manager');
     $toolkits = $manager->getAvailableToolkits();
     $this->assertTrue(isset($toolkits['test']), 'The working toolkit was returned.');
+    $this->assertTrue(isset($toolkits['test:derived_toolkit']), 'The derived toolkit was returned.');
     $this->assertFalse(isset($toolkits['broken']), 'The toolkit marked unavailable was not returned');
     $this->assertToolkitOperationsCalled(array());
   }
@@ -71,4 +72,22 @@ function testApplyNoParameters() {
     $this->assertEqual($calls['apply'][0][0], 'my_operation', "'my_operation' was passed correctly as operation");
     $this->assertEqual($calls['apply'][0][1], array(), 'passing no parameters was handled correctly');
   }
+
+  /**
+   * Tests image toolkit operations inheritance by derivative toolkits.
+   */
+  public function testDerivative() {
+    $toolkit_manager = $this->container->get('image.toolkit.manager');
+    $operation_manager = $this->container->get('image.toolkit.operation.manager');
+
+    $toolkit = $toolkit_manager->createInstance('test:derived_toolkit');
+
+    // Load an overwritten and an inherited operation.
+    $blur = $operation_manager->getToolkitOperation($toolkit, 'blur');
+    $invert = $operation_manager->getToolkitOperation($toolkit, 'invert');
+
+    $this->assertIdentical('foo_derived', $blur->getPluginId(), "'Blur' operation overwritten by derivative.");
+    $this->assertIdentical('bar', $invert->getPluginId(), '"Invert" operation inherited from base plugin.');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
new file mode 100644
index 0000000..9f68995
--- /dev/null
+++ b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationQueryTest.php
@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Installer\DistributionProfileTranslationQueryTest.
+ */
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\simpletest\InstallerTestBase;
+
+/**
+ * Tests distribution profile support with a 'langcode' query string.
+ *
+ * @group Installer
+ *
+ * @see \Drupal\system\Tests\Installer\DistributionProfileTranslationTest
+ */
+class DistributionProfileTranslationQueryTest extends InstallerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $langcode = 'de';
+
+  /**
+   * The distribution profile info.
+   *
+   * @var array
+   */
+  protected $info;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->info = array(
+      'type' => 'profile',
+      'core' => \Drupal::CORE_COMPATIBILITY,
+      'name' => 'Distribution profile',
+      'distribution' => array(
+        'name' => 'My Distribution',
+        'langcode' => $this->langcode,
+        'install' => array(
+          'theme' => 'bartik',
+        ),
+      ),
+    );
+    // File API functions are not available yet.
+    $path = $this->siteDirectory . '/profiles/mydistro';
+    mkdir($path, 0777, TRUE);
+    file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info));
+
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function visitInstaller() {
+    // Place a custom local translation in the translations directory.
+    mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE);
+    file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de'));
+    file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.fr.po', $this->getPo('fr'));
+
+    // Pass a different language code than the one set in the distribution
+    // profile. This distribution language should still be used.
+    // The unrouted URL assembler does not exist at this point, so we build the
+    // URL ourselves.
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php' . '?langcode=fr');
+    // The language should have been automatically detected, all following
+    // screens should be translated already.
+    $elements = $this->xpath('//input[@type="submit"]/@value');
+    $this->assertEqual((string) current($elements), 'Save and continue de');
+    $this->translations['Save and continue'] = 'Save and continue de';
+
+    // Check the language direction.
+    $direction = (string) current($this->xpath('/html/@dir'));
+    $this->assertEqual($direction, 'ltr');
+
+    // Verify that the distribution name appears.
+    $this->assertRaw($this->info['distribution']['name']);
+    // Verify that the requested theme is used.
+    $this->assertRaw($this->info['distribution']['install']['theme']);
+    // Verify that the "Choose profile" step does not appear.
+    $this->assertNoText('profile');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // This step is skipped, because the distribution profile uses a fixed
+    // language.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a distribution profile.
+  }
+
+  /**
+   * Confirms that the installation succeeded.
+   */
+  public function testInstalled() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+
+    // Confirm that we are logged-in after installation.
+    $this->assertText($this->rootUser->getDisplayName());
+
+    // Verify German was configured but not English.
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertText('German');
+    $this->assertNoText('English');
+  }
+
+  /**
+   * Returns the string for the test .po file.
+   *
+   * @param string $langcode
+   *   The language code.
+   * @return string
+   *   Contents for the test .po file.
+   */
+  protected function getPo($langcode) {
+    return <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "Save and continue"
+msgstr "Save and continue $langcode"
+ENDPO;
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
new file mode 100644
index 0000000..830b1e8
--- /dev/null
+++ b/core/modules/system/src/Tests/Installer/DistributionProfileTranslationTest.php
@@ -0,0 +1,135 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Installer\DistributionProfileTranslationTest.
+ */
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\simpletest\InstallerTestBase;
+
+/**
+ * Tests distribution profile support.
+ *
+ * @group Installer
+ *
+ * @see \Drupal\system\Tests\Installer\DistributionProfileTest
+ */
+class DistributionProfileTranslationTest extends InstallerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $langcode = 'de';
+
+  /**
+   * The distribution profile info.
+   *
+   * @var array
+   */
+  protected $info;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->info = array(
+      'type' => 'profile',
+      'core' => \Drupal::CORE_COMPATIBILITY,
+      'name' => 'Distribution profile',
+      'distribution' => array(
+        'name' => 'My Distribution',
+        'langcode' => $this->langcode,
+        'install' => array(
+          'theme' => 'bartik',
+        ),
+      ),
+    );
+    // File API functions are not available yet.
+    $path = $this->siteDirectory . '/profiles/mydistro';
+    mkdir($path, 0777, TRUE);
+    file_put_contents("$path/mydistro.info.yml", Yaml::encode($this->info));
+
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function visitInstaller() {
+    // Place a custom local translation in the translations directory.
+    mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE);
+    file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de'));
+
+    parent::visitInstaller();
+
+    // The language should have been automatically detected, all following
+    // screens should be translated already.
+    $elements = $this->xpath('//input[@type="submit"]/@value');
+    $this->assertEqual((string) current($elements), 'Save and continue de');
+    $this->translations['Save and continue'] = 'Save and continue de';
+
+    // Check the language direction.
+    $direction = (string) current($this->xpath('/html/@dir'));
+    $this->assertEqual($direction, 'ltr');
+
+    // Verify that the distribution name appears.
+    $this->assertRaw($this->info['distribution']['name']);
+    // Verify that the requested theme is used.
+    $this->assertRaw($this->info['distribution']['install']['theme']);
+    // Verify that the "Choose profile" step does not appear.
+    $this->assertNoText('profile');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // This step is skipped, because the distribution profile uses a fixed
+    // language.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpProfile() {
+    // This step is skipped, because there is a distribution profile.
+  }
+
+  /**
+   * Confirms that the installation succeeded.
+   */
+  public function testInstalled() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+
+    // Confirm that we are logged-in after installation.
+    $this->assertText($this->rootUser->getDisplayName());
+
+    // Verify German was configured but not English.
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertText('German');
+    $this->assertNoText('English');
+  }
+
+  /**
+   * Returns the string for the test .po file.
+   *
+   * @param string $langcode
+   *   The language code.
+   * @return string
+   *   Contents for the test .po file.
+   */
+  protected function getPo($langcode) {
+    return <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "Save and continue"
+msgstr "Save and continue $langcode"
+ENDPO;
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php
index 08198db..bdae426 100644
--- a/core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerExistingInstallationTest.php
@@ -29,12 +29,12 @@ protected function setUp() {
    */
   public function testInstaller() {
     // Verify that Drupal can't be immediately reinstalled.
-    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+    $this->visitInstaller();
     $this->assertRaw('Drupal already installed');
 
     // Delete settings.php and attempt to reinstall again.
     unlink($this->siteDirectory . '/settings.php');
-    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+    $this->visitInstaller();
     $this->setUpLanguage();
     $this->setUpProfile();
     $this->setUpSettings();
diff --git a/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php b/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php
index d469532..4d9383e 100644
--- a/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerLanguagePageTest.php
@@ -26,7 +26,7 @@ protected function setUpLanguage() {
     touch(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.xoxo.po');
 
     // Check that all predefined languages show up with their native names.
-    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php');
+    $this->visitInstaller();
     foreach (LanguageManager::getStandardLanguageList() as $langcode => $names) {
       $this->assertOption('edit-langcode', $langcode);
       $this->assertRaw('>' . $names[1] . '<');
diff --git a/core/modules/system/src/Tests/Installer/InstallerTest.php b/core/modules/system/src/Tests/Installer/InstallerTest.php
index debb891..a2dd968 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTest.php
@@ -42,7 +42,7 @@ protected function setUpLanguage() {
     $this->assertRaw('<meta charset="utf-8" />');
 
     // Assert that the expected title is present.
-    $this->assertEqual('Choose language', $this->cssSelect('main h1')[0]);
+    $this->assertEqual('Choose language', $this->cssSelect('main h2')[0]);
 
     parent::setUpLanguage();
   }
@@ -52,7 +52,9 @@ protected function setUpLanguage() {
    */
   protected function setUpProfile() {
     // Assert that the expected title is present.
-    $this->assertEqual('Select an installation profile', $this->cssSelect('main h1')[0]);
+    $this->assertEqual('Select an installation profile', $this->cssSelect('main h2')[0]);
+    $result = $this->xpath('//span[contains(@class, :class) and contains(text(), :text)]', array(':class' => 'visually-hidden', ':text' => 'Select an installation profile'));
+    $this->assertEqual(count($result), 1, "Title/Label not displayed when '#title_display' => 'invisible' attribute is set");
 
     parent::setUpProfile();
   }
@@ -62,7 +64,7 @@ protected function setUpProfile() {
    */
   protected function setUpSettings() {
     // Assert that the expected title is present.
-    $this->assertEqual('Database configuration', $this->cssSelect('main h1')[0]);
+    $this->assertEqual('Database configuration', $this->cssSelect('main h2')[0]);
 
     parent::setUpSettings();
   }
@@ -72,7 +74,7 @@ protected function setUpSettings() {
    */
   protected function setUpSite() {
     // Assert that the expected title is present.
-    $this->assertEqual('Configure site', $this->cssSelect('main h1')[0]);
+    $this->assertEqual('Configure site', $this->cssSelect('main h2')[0]);
 
     parent::setUpSite();
   }
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php
new file mode 100644
index 0000000..dfa3d89
--- /dev/null
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationQueryTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Installer\InstallerTranslationQueryTest.
+ */
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\simpletest\InstallerTestBase;
+
+/**
+ * Installs Drupal in German and checks resulting site.
+ *
+ * @group Installer
+ *
+ * @see \Drupal\system\Tests\Installer\InstallerTranslationTest
+ */
+class InstallerTranslationQueryTest extends InstallerTestBase {
+
+  /**
+   * Overrides the language code in which to install Drupal.
+   *
+   * @var string
+   */
+  protected $langcode = 'de';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function visitInstaller() {
+    // Place a custom local translation in the translations directory.
+    mkdir(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations', 0777, TRUE);
+    file_put_contents(\Drupal::root() . '/' . $this->siteDirectory . '/files/translations/drupal-8.0.0.de.po', $this->getPo('de'));
+
+    // The unrouted URL assembler does not exist at this point, so we build the
+    // URL ourselves.
+    $this->drupalGet($GLOBALS['base_url'] . '/core/install.php' . '?langcode=' . $this->langcode);
+
+    // The language should have been automatically detected, all following
+    // screens should be translated already.
+    $elements = $this->xpath('//input[@type="submit"]/@value');
+    $this->assertEqual((string) current($elements), 'Save and continue de');
+    $this->translations['Save and continue'] = 'Save and continue de';
+
+    // Check the language direction.
+    $direction = (string) current($this->xpath('/html/@dir'));
+    $this->assertEqual($direction, 'ltr');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpLanguage() {
+    // The language was was preset by passing a query parameter in the URL, so
+    // no explicit language selection is necessary.
+  }
+
+  /**
+   * Verifies the expected behaviors of the installation result.
+   */
+  public function testInstaller() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+
+    // Verify German was configured but not English.
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertText('German');
+    $this->assertNoText('English');
+  }
+
+  /**
+   * Returns the string for the test .po file.
+   *
+   * @param string $langcode
+   *   The language code.
+   * @return string
+   *   Contents for the test .po file.
+   */
+  protected function getPo($langcode) {
+    return <<<ENDPO
+msgid ""
+msgstr ""
+
+msgid "Save and continue"
+msgstr "Save and continue $langcode"
+ENDPO;
+  }
+
+}
diff --git a/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php b/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
index 7afcda7..4a39c6f 100644
--- a/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/GarbageCollectionTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
     parent::setUp();
 
     // These additional tables are necessary due to the call to system_cron().
-    $this->installSchema('system', array('key_value_expire', 'flood', 'queue'));
+    $this->installSchema('system', array('key_value_expire'));
   }
 
   /**
diff --git a/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
index 66fd3c2..cd09af9 100644
--- a/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\simpletest\KernelTestBase;
+use Drupal\entity_test\Entity\EntityTestLabel;
 
 /**
  * Tests KeyValueEntityStorage for content entities.
@@ -39,7 +40,7 @@ protected function setUp() {
   function testCRUD() {
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
     // Verify default properties on a newly created empty entity.
-    $empty = entity_create('entity_test_label');
+    $empty = EntityTestLabel::create();
     $this->assertIdentical($empty->id->value, NULL);
     $this->assertIdentical($empty->name->value, NULL);
     $this->assertTrue($empty->uuid->value);
@@ -73,7 +74,7 @@ function testCRUD() {
     }
 
     // Verify that an entity with an empty ID string is considered empty, too.
-    $empty_id = entity_create('entity_test_label', array(
+    $empty_id = EntityTestLabel::create(array(
       'id' => '',
     ));
     $this->assertIdentical($empty_id->isNew(), TRUE);
@@ -86,7 +87,7 @@ function testCRUD() {
     }
 
     // Verify properties on a newly created entity.
-    $entity_test = entity_create('entity_test_label', $expected = array(
+    $entity_test = EntityTestLabel::create($expected = array(
       'id' => $this->randomMachineName(),
       'name' => $this->randomString(),
     ));
@@ -129,7 +130,7 @@ function testCRUD() {
 
     // Ensure that creating an entity with the same id as an existing one is not
     // possible.
-    $same_id = entity_create('entity_test_label', array(
+    $same_id = EntityTestLabel::create(array(
       'id' => $entity_test->id(),
     ));
     $this->assertIdentical($same_id->isNew(), TRUE);
diff --git a/core/modules/system/src/Tests/Lock/LockUnitTest.php b/core/modules/system/src/Tests/Lock/LockUnitTest.php
index ec249c5..b726add 100644
--- a/core/modules/system/src/Tests/Lock/LockUnitTest.php
+++ b/core/modules/system/src/Tests/Lock/LockUnitTest.php
@@ -24,17 +24,9 @@ class LockUnitTest extends KernelTestBase {
    */
   protected $lock;
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system');
-
   protected function setUp() {
     parent::setUp();
     $this->lock = new DatabaseLockBackend($this->container->get('database'));
-    $this->installSchema('system', 'semaphore');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Menu/MenuLinkDefaultIntegrationTest.php b/core/modules/system/src/Tests/Menu/MenuLinkDefaultIntegrationTest.php
index 6078875..d96b29c 100644
--- a/core/modules/system/src/Tests/Menu/MenuLinkDefaultIntegrationTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuLinkDefaultIntegrationTest.php
@@ -28,14 +28,6 @@ class MenuLinkDefaultIntegrationTest extends KernelTestBase {
   );
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', array('router'));
-  }
-
-  /**
    * Tests moving a static menu link without a specified menu to the root.
    */
   public function testMoveToRoot() {
diff --git a/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php b/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
index 011b58f..04e366a 100644
--- a/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
@@ -53,7 +53,7 @@ class MenuLinkTreeTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('router'));
+    \Drupal::service('router.builder')->rebuild();
     $this->installEntitySchema('menu_link_content');
 
     $this->linkTree = $this->container->get('menu.link_tree');
diff --git a/core/modules/system/src/Tests/Migrate/MigrateMenuTest.php b/core/modules/system/src/Tests/Migrate/MigrateMenuTest.php
deleted file mode 100644
index 9dc42d4..0000000
--- a/core/modules/system/src/Tests/Migrate/MigrateMenuTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\MigrateMenuTest.
- */
-
-namespace Drupal\system\Tests\Migrate;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\system\Entity\Menu;
-
-/**
- * Upgrade menus to system.menu.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateMenuTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('menu');
-  }
-
-  /**
-   * Tests the Drupal 6 menu to Drupal 8 migration.
-   */
-  public function testMenu() {
-    $navigation_menu = Menu::load('navigation');
-    $this->assertIdentical('navigation', $navigation_menu->id());
-    $this->assertIdentical('Navigation', $navigation_menu->label());
-    $expected = <<<EOT
-The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.
-EOT;
-    $this->assertIdentical($expected, $navigation_menu->getDescription());
-
-    // Test that we can re-import using the ConfigEntityBase destination.
-    Database::getConnection('default', 'migrate')
-      ->update('menu_custom')
-      ->fields(array('title' => 'Home Navigation'))
-      ->condition('menu_name', 'navigation')
-      ->execute();
-
-    $migration = Migration::load('menu');
-    \Drupal::database()
-        ->truncate($migration->getIdMap()->mapTableName())
-        ->execute();
-    $this->executeMigration($migration);
-
-    $navigation_menu = Menu::load('navigation');
-    $this->assertIdentical('Home Navigation', $navigation_menu->label());
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
deleted file mode 100644
index 28f90d7..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateDateFormatTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\migrate\Entity\Migration;
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade date formats to core.date_format.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateDateFormatTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_date_formats');
-  }
-
-  /**
-   * Tests the Drupal 6 date formats to Drupal 8 migration.
-   */
-  public function testDateFormats() {
-    $short_date_format = DateFormat::load('short');
-    $this->assertIdentical('\S\H\O\R\T m/d/Y - H:i', $short_date_format->getPattern());
-
-    $medium_date_format = DateFormat::load('medium');
-    $this->assertIdentical('\M\E\D\I\U\M D, m/d/Y - H:i', $medium_date_format->getPattern());
-
-    $long_date_format = DateFormat::load('long');
-    $this->assertIdentical('\L\O\N\G l, F j, Y - H:i', $long_date_format->getPattern());
-
-    // Test that we can re-import using the EntityDateFormat destination.
-    Database::getConnection('default', 'migrate')
-      ->update('variable')
-      ->fields(array('value' => serialize('\S\H\O\R\T d/m/Y - H:i')))
-      ->condition('name', 'date_format_short')
-      ->execute();
-
-    \Drupal::database()
-      ->truncate(Migration::load('d6_date_formats')->getIdMap()->mapTableName())
-      ->execute();
-
-    $migration = \Drupal::entityManager()
-      ->getStorage('migration')
-      ->loadUnchanged('d6_date_formats');
-    $this->executeMigration($migration);
-
-    $short_date_format = DateFormat::load('short');
-    $this->assertIdentical('\S\H\O\R\T d/m/Y - H:i', $short_date_format->getPattern());
-
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
deleted file mode 100644
index 97c1170..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemCronTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade cron variable to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemCronTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_cron');
-  }
-
-  /**
-   * Tests migration of system (cron) variables to system.cron.yml.
-   */
-  public function testSystemCron() {
-    $config = $this->config('system.cron');
-    $this->assertIdentical(172800, $config->get('threshold.requirements_warning'));
-    $this->assertIdentical(1209600, $config->get('threshold.requirements_error'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php
deleted file mode 100644
index 28b6bcb..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemDateTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemDateTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade date time variables to system.date config
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemDateTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_date');
-  }
-
-  /**
-   * Tests migration of user variables to system_date.yml.
-   */
-  public function testSystemDate() {
-    $config = $this->config('system.date');
-    $this->assertIdentical(4, $config->get('first_day'));
-    $this->assertIdentical(FALSE, $config->get('timezone.user.configurable'));
-    $this->assertIdentical("Europe/Paris", $config->get('timezone.default'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
deleted file mode 100644
index e0ffc34..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemFileTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemFileTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_file');
-  }
-
-  /**
-   * Tests migration of system (file) variables to system.file.yml.
-   */
-  public function testSystemFile() {
-    $config = \Drupal::configFactory()->getEditable('system.file');
-    $this->assertIdentical('files/temp', $config->get('path.temporary'));
-    $this->assertIdentical(TRUE, $config->get('allow_insecure_uploads'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
deleted file mode 100644
index bc41d52..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageGdTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade image gd variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_image_gd');
-  }
-
-  /**
-   * Tests migration of system (image GD) variables to system.image.gd.yml.
-   */
-  public function testSystemImageGd() {
-    $config = $this->config('system.image.gd');
-    $this->assertIdentical(75, $config->get('jpeg_quality'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
deleted file mode 100644
index c297ad1..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemImageTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade image variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemImageTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_image');
-  }
-
-  /**
-   * Tests migration of system (image) variables to system.image.yml.
-   */
-  public function testSystemImage() {
-    $config = $this->config('system.image');
-    $this->assertIdentical('gd', $config->get('toolkit'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
deleted file mode 100644
index eba3d51..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemLoggingTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade error_level variable to system.logging.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_logging');
-  }
-
-  /**
-   * Tests migration of system error_level variables to system.logging.yml.
-   */
-  public function testSystemLogging() {
-    $config = $this->config('system.logging');
-    $this->assertIdentical('some', $config->get('error_level'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'system.logging', $config->get());
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
deleted file mode 100644
index dd3372f..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemMaintenanceTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade maintenance variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_maintenance');
-  }
-
-  /**
-   * Tests migration of system (maintenance) variables to system.maintenance.yml.
-   */
-  public function testSystemMaintenance() {
-    $config = $this->config('system.maintenance');
-    $this->assertIdentical('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', $config->get('message'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
deleted file mode 100644
index 6b2ebc2..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemPerformanceTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade performance variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_performance');
-  }
-
-  /**
-   * Tests migration of system (Performance) variables to system.performance.yml.
-   */
-  public function testSystemPerformance() {
-    $config = $this->config('system.performance');
-    $this->assertIdentical(FALSE, $config->get('css.preprocess'));
-    $this->assertIdentical(FALSE, $config->get('js.preprocess'));
-    $this->assertIdentical(0, $config->get('cache.page.max_age'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
deleted file mode 100644
index 3e59289..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemRssTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade rss variable to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemRssTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_rss');
-  }
-
-  /**
-   * Tests migration of system (rss) variables to system.rss.yml.
-   */
-  public function testSystemRss() {
-    $config = $this->config('system.rss');
-    $this->assertIdentical(10, $config->get('items.limit'));
-    $this->assertIdentical('title', $config->get('items.view_mode'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
deleted file mode 100644
index 46596c9..0000000
--- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Migrate\d6\MigrateSystemSiteTest.
- */
-
-namespace Drupal\system\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade site variables to system.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_system_site');
-  }
-
-  /**
-   * Tests migration of system (site) variables to system.site.yml.
-   */
-  public function testSystemSite() {
-    $config = $this->config('system.site');
-    $this->assertIdentical('site_name', $config->get('name'));
-    $this->assertIdentical('site_mail@example.com', $config->get('mail'));
-    $this->assertIdentical('Migrate rocks', $config->get('slogan'));
-    $this->assertIdentical('/user', $config->get('page.403'));
-    $this->assertIdentical('/page-not-found', $config->get('page.404'));
-    $this->assertIdentical('/node', $config->get('page.front'));
-    $this->assertIdentical(FALSE, $config->get('admin_compact_mode'));
-  }
-
-}
diff --git a/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php b/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php
new file mode 100644
index 0000000..846e54b
--- /dev/null
+++ b/core/modules/system/src/Tests/Module/ExperimentalModuleTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Module\ExperimentalModuleTest.
+ */
+
+namespace Drupal\system\Tests\Module;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the installation of modules.
+ *
+ * @group Module
+ */
+class ExperimentalModuleTest extends WebTestBase {
+
+
+  /**
+   * The admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests installing experimental modules and dependencies in the UI.
+   */
+  public function testExperimentalConfirmForm() {
+
+    // First, test installing a non-experimental module with no dependencies.
+    // There should be no confirmation form and no experimental module warning.
+    $edit = [];
+    $edit["modules[Testing][test_page_test][enable]"] = TRUE;
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+    $this->assertText('Module Test page has been enabled.');
+    $this->assertNoText('Experimental modules are provided for testing purposes only.');
+
+    // Uninstall the module.
+    \Drupal::service('module_installer')->uninstall(['test_page_test']);
+
+    // Next, test installing an experimental module with no dependencies.
+    // There should be a confirmation form with an experimental warning, but no
+    // list of dependencies.
+    $edit = [];
+    $edit["modules[Core (Experimental)][experimental_module_test][enable]"] = TRUE;
+    $this->drupalPostForm('admin/modules', $edit, 'Install');
+
+    // The module should not be enabled and there should be a warning and a
+    // list of the experimental modules with only this one.
+    $this->assertNoText('Experimental Test has been enabled.');
+    $this->assertText('Experimental modules are provided for testing purposes only.');
+    $this->assertText('The following modules are experimental: Experimental Test');
+
+    // There should be no message about enabling dependencies.
+    $this->assertNoText('You must enable');
+
+    // Enable the module and confirm that it worked.
+    $this->drupalPostForm(NULL, [], 'Continue');
+    $this->assertText('Experimental Test has been enabled.');
+
+    // Uninstall the module.
+    \Drupal::service('module_installer')->uninstall(['experimental_module_test']);
+
+    // Test enabling a module that is not itself experimental, but that depends
+    // on an experimental module.
+    $edit = [];
+    $edit["modules[Testing][experimental_module_dependency_test][enable]"] = TRUE;
+    $this->drupalPostForm('admin/modules', $edit, 'Install');
+
+    // The module should not be enabled and there should be a warning and a
+    // list of the experimental modules with only this one.
+    $this->assertNoText('2 modules have been enabled: Experimental Dependency Test, Experimental Test');
+    $this->assertText('Experimental modules are provided for testing purposes only.');
+
+    $this->assertText('The following modules are experimental: Experimental Test');
+
+    // Ensure the non-experimental module is not listed as experimental.
+    $this->assertNoText('The following modules are experimental: Experimental Test, Experimental Dependency Test');
+    $this->assertNoText('The following modules are experimental: Experimental Dependency Test');
+
+    // There should be a message about enabling dependencies.
+    $this->assertText('You must enable the Experimental Test module to install Experimental Dependency Test');
+
+    // Enable the module and confirm that it worked.
+    $this->drupalPostForm(NULL, [], 'Continue');
+    $this->assertText('2 modules have been enabled: Experimental Dependency Test, Experimental Test');
+
+    // Uninstall the modules.
+    \Drupal::service('module_installer')->uninstall(['experimental_module_test', 'experimental_module_dependency_test']);
+
+    // Finally, check both the module and its experimental dependency. There is
+    // still a warning about experimental modules, but no message about
+    // dependencies, since the user specifically enabled the dependency.
+    $edit = [];
+    $edit["modules[Core (Experimental)][experimental_module_test][enable]"] = TRUE;
+    $edit["modules[Testing][experimental_module_dependency_test][enable]"] = TRUE;
+    $this->drupalPostForm('admin/modules', $edit, 'Install');
+
+    // The module should not be enabled and there should be a warning and a
+    // list of the experimental modules with only this one.
+    $this->assertNoText('2 modules have been enabled: Experimental Dependency Test, Experimental Test');
+    $this->assertText('Experimental modules are provided for testing purposes only.');
+
+    $this->assertText('The following modules are experimental: Experimental Test');
+
+    // Ensure the non-experimental module is not listed as experimental.
+    $this->assertNoText('The following modules are experimental: Experimental Test, Experimental Dependency Test');
+    $this->assertNoText('The following modules are experimental: Experimental Dependency Test');
+
+    // There should be no message about enabling dependencies.
+    $this->assertNoText('You must enable');
+
+    // Enable the module and confirm that it worked.
+    $this->drupalPostForm(NULL, [], 'Continue');
+    $this->assertText('2 modules have been enabled: Experimental Test, Experimental Dependency Test');
+
+  }
+
+}
diff --git a/core/modules/system/src/Tests/Module/InstallUninstallTest.php b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
index f50c68a..cfaa7e4 100644
--- a/core/modules/system/src/Tests/Module/InstallUninstallTest.php
+++ b/core/modules/system/src/Tests/Module/InstallUninstallTest.php
@@ -100,9 +100,24 @@ public function testInstallUninstall() {
       $edit["modules[$package][$name][enable]"] = TRUE;
       $this->drupalPostForm('admin/modules', $edit, t('Install'));
 
+      // Handle experimental modules, which require a confirmation screen.
+      if ($package == 'Core (Experimental)') {
+        $this->assertText('Are you sure you wish to enable experimental modules?');
+        if (count($modules_to_install) > 1) {
+          // When there are experimental modules, needed dependencies do not
+          // result in the same page title, but there will be expected text
+          // indicating they need to be enabled.
+          $this->assertText('You must enable');
+        }
+        $this->drupalPostForm(NULL, array(), t('Continue'));
+      }
       // Handle the case where modules were installed along with this one and
       // where we therefore hit a confirmation screen.
-      if (count($modules_to_install) > 1) {
+      elseif (count($modules_to_install) > 1) {
+        // Verify that we are on the correct form and that the expected text
+        // about enabling dependencies appears.
+        $this->assertText('Some required modules must be enabled');
+        $this->assertText('You must enable');
         $this->drupalPostForm(NULL, array(), t('Continue'));
       }
 
@@ -178,10 +193,21 @@ public function testInstallUninstall() {
     // - That enabling more than one module at the same time does not lead to
     //   any errors.
     $edit = array();
+    $experimental = FALSE;
     foreach ($all_modules as $name => $module) {
       $edit['modules[' . $module->info['package'] . '][' . $name . '][enable]'] = TRUE;
+      // Track whether there is at least one experimental module.
+      if ($module->info['package'] == 'Core (Experimental)') {
+        $experimental = TRUE;
+      }
     }
     $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    // If there are experimental modules, click the confirm form.
+    if ($experimental) {
+      $this->assertText('Are you sure you wish to enable experimental modules?');
+      $this->drupalPostForm(NULL, array(), t('Continue'));
+    }
     $this->assertText(t('@count modules have been enabled: ', array('@count' => count($all_modules))), 'Modules status has been updated.');
   }
 
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index 253ea18..8c91d8b 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -10,6 +10,8 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityMalformedException;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
 use Drupal\simpletest\WebTestBase;
 
 /**
@@ -46,12 +48,15 @@ function testUninstallPage() {
     $this->drupalLogin($account);
 
     // Create a node type.
-    $node_type = entity_create('node_type', array('type' => 'uninstall_blocker', 'name' => 'Uninstall blocker'));
+    $node_type = NodeType::create(['type' => 'uninstall_blocker', 'name' => 'Uninstall blocker']);
     // Create a dependency that can be fixed.
     $node_type->setThirdPartySetting('module_test', 'key', 'value');
     $node_type->save();
     // Add a node to prevent node from being uninstalled.
-    $node = entity_create('node', array('type' => 'uninstall_blocker', 'title' => $this->randomString()));
+    $node = Node::create([
+      'type' => 'uninstall_blocker',
+      'title' => $this->randomString(),
+    ]);
     $node->save();
 
     $this->drupalGet('admin/modules/uninstall');
diff --git a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
index 92438aa..e0545e6 100644
--- a/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
+++ b/core/modules/system/src/Tests/Path/UrlAliasFixtures.php
@@ -8,6 +8,7 @@
 namespace Drupal\system\Tests\Path;
 
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Path\AliasStorage;
 
 /**
  * Utility methods to generate sample data, database configuration, etc.
@@ -92,7 +93,7 @@ public function tableDefinition() {
     module_load_install('system');
     $schema = system_schema();
 
-    $tables['url_alias'] = $schema['url_alias'];
+    $tables['url_alias'] = AliasStorage::schemaDefinition();
     $tables['key_value'] = $schema['key_value'];
 
     return $tables;
diff --git a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
index 71915ac..7d576bc 100644
--- a/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
+++ b/core/modules/system/src/Tests/Path/UrlAlterFunctionalTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\system\Tests\Path;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests altering the inbound path and the outbound path.
@@ -64,10 +65,10 @@ function testUrlAlter() {
     $this->assertUrlOutboundAlter('/forum', '/community');
     $forum_vid = $this->config('forum.settings')->get('vocabulary');
     $term_name = $this->randomMachineName();
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => $term_name,
       'vid' => $forum_vid,
-    ));
+    ]);
     $term->save();
     $this->drupalGet("community/" . $term->id());
     $this->assertText($term_name, 'The community/{tid} path gets resolved correctly');
diff --git a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
index 5d80493..7a53844 100644
--- a/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
+++ b/core/modules/system/src/Tests/Plugin/Condition/RequestPathTest.php
@@ -62,7 +62,7 @@ class RequestPathTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', array('sequences', 'url_alias'));
+    $this->installSchema('system', array('sequences'));
 
     $this->pluginManager = $this->container->get('plugin.manager.condition');
 
diff --git a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
index 05c4c7e..4a9b73a 100644
--- a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
+++ b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
@@ -9,9 +9,11 @@
 
 use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Plugin\Context\ContextDefinition;
+use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\plugin_test\Plugin\MockBlockManager;
 use Drupal\simpletest\KernelTestBase;
+use Drupal\user\Entity\User;
 
 /**
  * Tests that contexts are properly set and working within plugins.
@@ -36,7 +38,7 @@ function testContext() {
     $manager = new MockBlockManager();
     $plugin = $manager->createInstance('user_name');
     // Create a node, add it as context, catch the exception.
-    $node = entity_create('node', array('title' => $name, 'type' => 'page'));
+    $node = Node::create(['type' => 'page', 'title' => $name]);
 
     // Try to get context that is missing its definition.
     try {
@@ -72,7 +74,7 @@ function testContext() {
 
     // Set an appropriate context value and check to make sure its methods work
     // as expected.
-    $user = entity_create('user', array('name' => $name));
+    $user = User::create(['name' => $name]);
     $plugin->setContextValue('user', $user);
 
     $this->assertEqual($plugin->getContextValue('user')->getUsername(), $user->getUsername());
diff --git a/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
index 6cca8f5..d038dbf 100644
--- a/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
+++ b/core/modules/system/src/Tests/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
@@ -57,12 +57,21 @@ protected function setUp() {
         'class' => 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange',
         'provider' => 'plugin_test',
       ),
+      'big_apple' => array(
+        'id' => 'big_apple',
+        'label' => 'Big Apple',
+        'color' => 'green',
+        'class' => 'Drupal\plugin_test_extended\Plugin\plugin_test\fruit\BigApple',
+        'provider' => 'plugin_test_extended',
+      ),
     );
 
     $base_directory = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test/src';
-    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => $base_directory));
+    $base_directory2 = \Drupal::root() . '/core/modules/system/tests/modules/plugin_test_extended/src';
+    $namespaces = new \ArrayObject(array('Drupal\plugin_test' => $base_directory, 'Drupal\plugin_test_extended' => $base_directory2));
 
-    $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/fruit', $namespaces);
+    $annotation_namespaces = ['Drupal\plugin_test\Plugin\Annotation', 'Drupal\plugin_test_extended\Plugin\Annotation'];
+    $this->discovery = new AnnotatedClassDiscovery('Plugin/plugin_test/fruit', $namespaces, 'Drupal\Component\Annotation\Plugin', $annotation_namespaces);
     $this->emptyDiscovery = new AnnotatedClassDiscovery('Plugin/non_existing_module/non_existing_plugin_type', $namespaces);
   }
 
diff --git a/core/modules/system/src/Tests/Queue/QueueSerializationTest.php b/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
index 638b3f5..4a35cce 100644
--- a/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
+++ b/core/modules/system/src/Tests/Queue/QueueSerializationTest.php
@@ -81,7 +81,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', ['key_value_expire', 'sequences', 'queue']);
+    $this->installSchema('system', ['key_value_expire', 'sequences']);
     $this->installEntitySchema('user');
     $this->queue = \Drupal::service('queue.database')->get('aggregator_refresh');
     $test_user = User::create(array(
diff --git a/core/modules/system/src/Tests/Queue/QueueTest.php b/core/modules/system/src/Tests/Queue/QueueTest.php
index ab1b083..a1ab45e 100644
--- a/core/modules/system/src/Tests/Queue/QueueTest.php
+++ b/core/modules/system/src/Tests/Queue/QueueTest.php
@@ -20,17 +20,9 @@
 class QueueTest extends KernelTestBase {
 
   /**
-   * The modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system');
-
-  /**
    * Tests the System queue.
    */
   public function testSystemQueue() {
-    $this->installSchema('system', 'queue');
     // Create two queues.
     $queue1 = new DatabaseQueue($this->randomMachineName(), Database::getConnection());
     $queue1->createQueue();
diff --git a/core/modules/system/src/Tests/Render/Element/TableTest.php b/core/modules/system/src/Tests/Render/Element/TableTest.php
index 7d94cd9..827b55a 100644
--- a/core/modules/system/src/Tests/Render/Element/TableTest.php
+++ b/core/modules/system/src/Tests/Render/Element/TableTest.php
@@ -29,7 +29,6 @@ class TableTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
   }
 
@@ -98,7 +97,7 @@ function testThemeTableWithEmptyMessage() {
 
     // Enable the Classy theme.
     \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_handler')->setDefault('classy');
 
     $this->render($table);
     $this->removeWhiteSpace();
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
index 551e4d8..f029156 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteNoneTest.php
@@ -42,7 +42,6 @@ class RouteNoneTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', ['router']);
     \Drupal::service('router.builder')->rebuild();
 
     $this->urlGenerator = \Drupal::urlGenerator();
diff --git a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
index bc341a6..8cdb9c7 100644
--- a/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
+++ b/core/modules/system/src/Tests/RouteProcessor/RouteProcessorCurrentIntegrationTest.php
@@ -41,7 +41,6 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', ['router']);
     \Drupal::service('router.builder')->rebuild();
 
     $this->urlGenerator = \Drupal::urlGenerator();
diff --git a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
index 98515b8..71d3fe2 100644
--- a/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
+++ b/core/modules/system/src/Tests/Routing/ContentNegotiationRoutingTest.php
@@ -31,7 +31,6 @@ protected function setUp() {
     \Drupal::unsetContainer();
     parent::setUp();
 
-    $this->installSchema('system', ['router', 'url_alias']);
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/modules/system/src/Tests/Routing/DestinationTest.php b/core/modules/system/src/Tests/Routing/DestinationTest.php
index a590d62..ce72f7b 100644
--- a/core/modules/system/src/Tests/Routing/DestinationTest.php
+++ b/core/modules/system/src/Tests/Routing/DestinationTest.php
@@ -74,7 +74,7 @@ public function testDestination() {
 
     // Make sure that 404 pages do not populate $_GET['destination'] with
     // external URLs.
-    \Drupal::configFactory()->getEditable('system.site')->set('page.404', 'system-test/get-destination')->save();
+    \Drupal::configFactory()->getEditable('system.site')->set('page.404', '/system-test/get-destination')->save();
     $this->drupalGet('http://example.com', ['external' => FALSE]);
     $this->assertResponse(404);
     $this->assertIdentical(Url::fromRoute('<front>')->toString(), $this->getRawContent(), 'External URL is not allowed on 404 pages.');
diff --git a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
index ee3b6eb..a404916 100644
--- a/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
+++ b/core/modules/system/src/Tests/Routing/ExceptionHandlingTest.php
@@ -30,7 +30,7 @@ class ExceptionHandlingTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', ['router']);
+    $this->installEntitySchema('date_format');
     \Drupal::service('router.builder')->rebuild();
   }
 
@@ -99,6 +99,42 @@ public function testHtml404() {
   }
 
   /**
+   * Tests that the exception response is executed in the original context.
+   */
+  public function testExceptionResponseGeneratedForOriginalRequest() {
+    // Test with 404 path pointing to a route that uses '_controller'.
+    $response = $this->doTest404Route('/router_test/test25');
+    $this->assertTrue(strpos($response->getContent(), '/not-found') !== FALSE);
+
+    // Test with 404 path pointing to a route that uses '_form'.
+    $response = $this->doTest404Route('/router_test/test26');
+    $this->assertTrue(strpos($response->getContent(), '<form class="system-logging-settings"') !== FALSE);
+
+    // Test with 404 path pointing to a route that uses '_entity_form'.
+    $response = $this->doTest404Route('/router_test/test27');
+    $this->assertTrue(strpos($response->getContent(), '<form class="date-format-add-form date-format-form"') !== FALSE);
+  }
+
+  /**
+   * Sets the given path to use as the 404 page and triggers a 404.
+   *
+   * @param string $path
+   * @return \Drupal\Core\Render\HtmlResponse
+   *
+   * @see \Drupal\system\Tests\Routing\ExceptionHandlingTest::testExceptionResponseGeneratedForOriginalRequest()
+   */
+  protected function doTest404Route($path) {
+    $this->config('system.site')->set('page.404', $path)->save();
+
+    $request = Request::create('/not-found');
+    $request->setFormat('html', ['text/html']);
+
+    /** @var \Symfony\Component\HttpKernel\HttpKernelInterface $kernel */
+    $kernel = \Drupal::getContainer()->get('http_kernel');
+    return $kernel->handle($request)->prepare($request);
+  }
+
+  /**
    * Tests if exception backtraces are properly escaped when output to HTML.
    */
   public function testBacktraceEscaping() {
diff --git a/core/modules/system/src/Tests/Routing/RouteProviderTest.php b/core/modules/system/src/Tests/Routing/RouteProviderTest.php
index 81c63b1..056a37a 100644
--- a/core/modules/system/src/Tests/Routing/RouteProviderTest.php
+++ b/core/modules/system/src/Tests/Routing/RouteProviderTest.php
@@ -86,8 +86,6 @@ protected function setUp() {
     $this->cache = new MemoryBackend('data');
     $this->pathProcessor = \Drupal::service('path_processor_manager');
     $this->cacheTagsInvalidator = \Drupal::service('cache_tags.invalidator');
-
-    $this->installSchema('system', 'url_alias');
   }
 
   /**
diff --git a/core/modules/system/src/Tests/Routing/UrlIntegrationTest.php b/core/modules/system/src/Tests/Routing/UrlIntegrationTest.php
index 66239c9..1d3f934 100644
--- a/core/modules/system/src/Tests/Routing/UrlIntegrationTest.php
+++ b/core/modules/system/src/Tests/Routing/UrlIntegrationTest.php
@@ -27,15 +27,6 @@ class UrlIntegrationTest extends KernelTestBase {
   public static $modules = array('user', 'router_test', 'system');
 
   /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', ['router']);
-  }
-
-  /**
    * Ensures that the access() method on \Drupal\Core\Url objects works.
    */
   public function testAccess() {
diff --git a/core/modules/system/src/Tests/System/AccessDeniedTest.php b/core/modules/system/src/Tests/System/AccessDeniedTest.php
index b068802..db231c3 100644
--- a/core/modules/system/src/Tests/System/AccessDeniedTest.php
+++ b/core/modules/system/src/Tests/System/AccessDeniedTest.php
@@ -23,7 +23,7 @@ class AccessDeniedTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = ['block'];
+  public static $modules = ['block', 'node', 'system_test'];
 
   protected $adminUser;
 
@@ -34,6 +34,8 @@ protected function setUp() {
 
     // Create an administrative user.
     $this->adminUser = $this->drupalCreateUser(['access administration pages', 'administer site configuration', 'link to any page', 'administer blocks']);
+    $this->adminUser->roles[] = 'administrator';
+    $this->adminUser->save();
 
     user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user profiles'));
     user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access user profiles'));
@@ -44,6 +46,14 @@ function testAccessDenied() {
     $this->assertText(t('Access denied'), 'Found the default 403 page');
     $this->assertResponse(403);
 
+    // Ensure that users without permission are denied access and have the
+    // correct path information in drupalSettings.
+    $this->drupalLogin($this->createUser([]));
+    $this->drupalGet('admin', ['query' => ['foo' => 'bar']]);
+    $this->assertEqual($this->drupalSettings['path']['currentPath'], 'admin');
+    $this->assertEqual($this->drupalSettings['path']['currentPathIsAdmin'], TRUE);
+    $this->assertEqual($this->drupalSettings['path']['currentQuery'], ['foo' => 'bar']);
+
     $this->drupalLogin($this->adminUser);
 
     // Set a custom 404 page without a starting slash.
@@ -99,6 +109,29 @@ function testAccessDenied() {
     $this->drupalPostForm('admin/config/system/site-information', $edit, t('Log in'));
 
     // Check that we're still on the same page.
-    $this->assertText(t('Site information'));
+    $this->assertText(t('Basic site settings'));
   }
+
+  /**
+   * Tests that an inaccessible custom 403 page falls back to the default.
+   */
+  public function testAccessDeniedCustomPageWithAccessDenied() {
+    // Sets up a 403 page not accessible by the anonymous user.
+    $this->config('system.site')->set('page.403', '/system-test/custom-4xx')->save();
+
+    $this->drupalGet('/system-test/always-denied');
+    $this->assertNoText('Admin-only 4xx response');
+    $this->assertText('You are not authorized to access this page.');
+    $this->assertResponse(403);
+    // Verify the access cacheability metadata for custom 403 is bubbled.
+    $this->assertCacheContext('user.roles');
+
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('/system-test/always-denied');
+    $this->assertText('Admin-only 4xx response');
+    $this->assertResponse(403);
+    // Verify the access cacheability metadata for custom 403 is bubbled.
+    $this->assertCacheContext('user.roles');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/System/CronQueueTest.php b/core/modules/system/src/Tests/System/CronQueueTest.php
index b11e9c2..dac042b 100644
--- a/core/modules/system/src/Tests/System/CronQueueTest.php
+++ b/core/modules/system/src/Tests/System/CronQueueTest.php
@@ -61,5 +61,13 @@ public function testExceptions() {
     $this->assertEqual($item->data, 'crash', 'Failing item remains in the queue.');
     $item = $queue->claimItem();
     $this->assertEqual($item->data, 'ignored', 'Item beyond the failing item remains in the queue.');
+
+    // Test the requeueing functionality.
+    $queue = $this->container->get('queue')->get('cron_queue_test_requeue_exception');
+    $queue->createItem([]);
+    $this->cronRun();
+    $this->assertEqual(\Drupal::state()->get('cron_queue_test_requeue_exception'), 2);
+    $this->assertFalse($queue->numberOfItems());
   }
+
 }
diff --git a/core/modules/system/src/Tests/System/DateTimeTest.php b/core/modules/system/src/Tests/System/DateTimeTest.php
index b2a5d2f..bb69dcf 100644
--- a/core/modules/system/src/Tests/System/DateTimeTest.php
+++ b/core/modules/system/src/Tests/System/DateTimeTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\system\Tests\System;
 
+use Drupal\Core\Datetime\Entity\DateFormat;
 use Drupal\Core\Url;
 use Drupal\simpletest\WebTestBase;
 
@@ -135,7 +136,7 @@ function testDateFormatConfiguration() {
     $this->assertText($name, 'Custom date format appears in the date format list.');
     $this->assertText(t('Delete'), 'Delete link for custom date format appears.');
 
-    $date_format = entity_create('date_format', array(
+    $date_format = DateFormat::create(array(
       'id' => 'xss_short',
       'label' => 'XSS format',
       'pattern' => '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'\X\S\S\'\)\;\<\/\s\c\r\i\p\t\>',
diff --git a/core/modules/system/src/Tests/System/PageNotFoundTest.php b/core/modules/system/src/Tests/System/PageNotFoundTest.php
index b7c0609..ffe985b 100644
--- a/core/modules/system/src/Tests/System/PageNotFoundTest.php
+++ b/core/modules/system/src/Tests/System/PageNotFoundTest.php
@@ -17,6 +17,14 @@
  * @group system
  */
 class PageNotFoundTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system_test'];
+
   protected $adminUser;
 
   protected function setUp() {
@@ -24,6 +32,8 @@ protected function setUp() {
 
     // Create an administrative user.
     $this->adminUser = $this->drupalCreateUser(array('administer site configuration', 'link to any page'));
+    $this->adminUser->roles[] = 'administrator';
+    $this->adminUser->save();
 
     user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('access user profiles'));
     user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access user profiles'));
@@ -50,4 +60,28 @@ function testPageNotFound() {
     $this->drupalGet($this->randomMachineName(10));
     $this->assertText($this->adminUser->getUsername(), 'Found the custom 404 page');
   }
+
+  /**
+   * Tests that an inaccessible custom 404 page falls back to the default.
+   */
+  public function testPageNotFoundCustomPageWithAccessDenied() {
+    // Sets up a 404 page not accessible by the anonymous user.
+    $this->config('system.site')->set('page.404', '/system-test/custom-4xx')->save();
+
+    $this->drupalGet('/this-path-does-not-exist');
+    $this->assertNoText('Admin-only 4xx response');
+    $this->assertText('The requested page could not be found.');
+    $this->assertResponse(404);
+    // Verify the access cacheability metadata for custom 404 is bubbled.
+    $this->assertCacheContext('user.roles');
+
+    $this->drupalLogin($this->adminUser);
+    $this->drupalGet('/this-path-does-not-exist');
+    $this->assertText('Admin-only 4xx response');
+    $this->assertNoText('The requested page could not be found.');
+    $this->assertResponse(404);
+    // Verify the access cacheability metadata for custom 404 is bubbled.
+    $this->assertCacheContext('user.roles');
+  }
+
 }
diff --git a/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php b/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php
new file mode 100644
index 0000000..86ba0a2
--- /dev/null
+++ b/core/modules/system/src/Tests/System/SitesDirectoryHardeningTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\System\SitesDirectoryHardeningTest.
+ */
+
+namespace Drupal\system\Tests\System;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Site\Settings;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests Drupal permissions hardening of /sites subdirectories.
+ *
+ * @group system
+ */
+class SitesDirectoryHardeningTest extends WebTestBase {
+  use StringTranslationTrait;
+
+  /**
+   * Tests the default behavior to restrict directory permissions is enforced.
+   *
+   * Checks both the the current sites directory and settings.php.
+   */
+  public function testSitesDirectoryHardening() {
+    $site_path = $this->kernel->getSitePath();
+    $settings_file = $this->settingsFile($site_path);
+
+    // First, we check based on what the initial install has set.
+    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file.', array('@file' => $site_path)));
+
+    // We intentionally don't check for settings.local.php as that file is
+    // not created by Drupal.
+    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file.', array('@file' => $settings_file)));
+
+    $this->makeWritable($site_path);
+    $this->checkSystemRequirements();
+
+    $this->assertTrue(drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir'), new FormattableMarkup('Verified permissions for @file after manual permissions change.', array('@file' => $site_path)));
+    $this->assertTrue(drupal_verify_install_file($settings_file, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE), new FormattableMarkup('Verified permissions for @file after manual permissions change.', array('@file' => $settings_file)));
+  }
+
+  /**
+   * Tests writable files remain writable when directory hardening is disabled.
+   */
+  public function testSitesDirectoryHardeningConfig() {
+    $site_path = $this->kernel->getSitePath();
+    $settings_file = $this->settingsFile($site_path);
+
+    // Disable permissions enforcement.
+    $settings = Settings::getAll();
+    $settings['skip_permissions_hardening'] = TRUE;
+    new Settings($settings);
+    $this->assertTrue(Settings::get('skip_permissions_hardening'), 'Able to set hardening to true');
+    $this->makeWritable($site_path);
+
+    // Manually trigger the requirements check.
+    $requirements = $this->checkSystemRequirements();
+    $this->assertEqual(REQUIREMENT_WARNING, $requirements['configuration_files']['severity'], 'Warning severity is properly set.');
+    $this->assertEqual($this->t('Protection disabled'), (string) $requirements['configuration_files']['description']['#context']['configuration_error_list']['#items'][0], 'Description is properly set.');
+
+    $this->assertTrue(is_writable($site_path), 'Site directory remains writable when automatically fixing permissions is disabled.');
+    $this->assertTrue(is_writable($settings_file), 'settings.php remains writable when automatically fixing permissions is disabled.');
+
+    // Re-enable permissions enforcement.
+    $settings = Settings::getAll();
+    $settings['skip_permissions_hardening'] = FALSE;
+    new Settings($settings);
+
+    // Manually trigger the requirements check.
+    $this->checkSystemRequirements();
+
+    $this->assertFalse(is_writable($site_path), 'Site directory is protected when automatically fixing permissions is enabled.');
+    $this->assertFalse(is_writable($settings_file), 'settings.php is protected when automatically fixing permissions is enabled.');
+  }
+
+  /**
+   * Checks system runtime requirements.
+   *
+   * @return array
+   *   An array of system requirements.
+   */
+  protected function checkSystemRequirements() {
+    module_load_install('system');
+    return system_requirements('runtime');
+  }
+
+  /**
+   * Makes the given path and settings file writable.
+   *
+   * @param string $site_path
+   *   The sites directory path, such as 'sites/default'.
+   */
+  protected function makeWritable($site_path) {
+    chmod($site_path, 0755);
+    chmod($this->settingsFile($site_path), 0644);
+  }
+
+  /**
+   * Returns the path to settings.php
+   *
+   * @param string $site_path
+   *   The sites subdirectory path.
+   *
+   * @return string
+   *   The path to settings.php.
+   */
+  protected function settingsFile($site_path) {
+    $settings_file = $site_path . '/settings.php';
+    return $settings_file;
+  }
+}
diff --git a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
index b8ac4f3..64517b7 100644
--- a/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
+++ b/core/modules/system/src/Tests/System/TokenReplaceUnitTest.php
@@ -85,8 +85,6 @@ public function testClear() {
    * Tests the generation of all system site information tokens.
    */
   public function testSystemSiteTokenReplacement() {
-    // The use of the \Drupal::url() method requires the url_alias table to exist.
-    $this->installSchema('system', 'url_alias');
     $url_options = array(
       'absolute' => TRUE,
       'language' => $this->interfaceLanguage,
diff --git a/core/modules/system/src/Tests/System/TokenReplaceUnitTestBase.php b/core/modules/system/src/Tests/System/TokenReplaceUnitTestBase.php
index 95ed3f5..8a22de7 100644
--- a/core/modules/system/src/Tests/System/TokenReplaceUnitTestBase.php
+++ b/core/modules/system/src/Tests/System/TokenReplaceUnitTestBase.php
@@ -39,7 +39,6 @@ protected function setUp() {
     parent::setUp();
     // Install default system configuration.
     $this->installConfig(array('system'));
-    $this->installSchema('system', array('router'));
     \Drupal::service('router.builder')->rebuild();
 
     $this->interfaceLanguage = \Drupal::languageManager()->getCurrentLanguage();
diff --git a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
index ba366a3..e1ae989 100644
--- a/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/EntityFilteringThemeTest.php
@@ -12,6 +12,8 @@
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\simpletest\WebTestBase;
+use Drupal\comment\Entity\Comment;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests themed output for each entity type in all available themes to ensure
@@ -93,10 +95,10 @@ protected function setUp() {
     $this->drupalLogin($this->user);
 
     // Create a test term.
-    $this->term = entity_create('taxonomy_term', array(
+    $this->term = Term::create([
       'name' => $this->xssLabel,
       'vid' => 1,
-    ));
+    ]);
     $this->term->save();
 
     // Add a comment field.
@@ -110,7 +112,7 @@ protected function setUp() {
     ));
 
     // Create a test comment on the test node.
-    $this->comment = entity_create('comment', array(
+    $this->comment = Comment::create(array(
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
diff --git a/core/modules/system/src/Tests/Theme/FunctionsTest.php b/core/modules/system/src/Tests/Theme/FunctionsTest.php
index 5e31422..028eb5a 100644
--- a/core/modules/system/src/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/src/Tests/Theme/FunctionsTest.php
@@ -290,6 +290,127 @@ function testLinks() {
   }
 
   /**
+   * Tests links.html.twig using links with indexed keys.
+   */
+  function testIndexedKeyedLinks() {
+    // Turn off the query for the
+    // \Drupal\Core\Utility\LinkGeneratorInterface::generate() method to compare
+    // the active link correctly.
+    $original_query = \Drupal::request()->query->all();
+    \Drupal::request()->query->replace([]);
+    // Verify that empty variables produce no output.
+    $variables = [];
+    $expected = '';
+    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback generates no output.');
+
+    $variables = [];
+    $variables['heading'] = 'Some title';
+    $expected = '';
+    $this->assertThemeOutput('links', $variables, $expected, 'Empty %callback with heading generates no output.');
+
+    // Verify that a list of links is properly rendered.
+    $variables = [];
+    $variables['attributes'] = ['id' => 'somelinks'];
+    $variables['links'] = array(
+      array(
+        'title' => 'A <link>',
+        'url' => Url::fromUri('base:a/link'),
+      ),
+      array(
+        'title' => 'Plain "text"',
+      ),
+      array(
+        'title' => SafeMarkup::format('<span class="unescaped">@text</span>', array('@text' => 'potentially unsafe text that <should> be escaped')),
+      ),
+      array(
+        'title' => 'Front page',
+        'url' => Url::fromRoute('<front>'),
+      ),
+      array(
+        'title' => 'Test route',
+        'url' => Url::fromRoute('router_test.1'),
+      ),
+      array(
+        'title' => 'Query test route',
+        'url' => Url::fromRoute('router_test.1'),
+        'query' => array(
+          'key' => 'value',
+        )
+      ),
+    );
+
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li>' . Html::escape('Plain "text"') . '</li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+
+    // Verify that passing a string as heading works.
+    $variables['heading'] = 'Links heading';
+    $expected_heading = '<h2>Links heading</h2>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Restore the original request's query.
+    \Drupal::request()->query->replace($original_query);
+
+    // Verify that passing an array as heading works (core support).
+    $variables['heading'] = [
+      'text' => 'Links heading',
+      'level' => 'h3',
+      'attributes' => ['class' => ['heading']],
+    ];
+    $expected_heading = '<h3 class="heading">Links heading</h3>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify that passing attributes for the heading works.
+    $variables['heading'] = ['text' => 'Links heading', 'level' => 'h3', 'attributes' => ['id' => 'heading']];
+    $expected_heading = '<h3 id="heading">Links heading</h3>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify that passing attributes for the links work.
+    $variables['links'][1]['attributes'] = [
+      'class' => ['a/class'],
+    ];
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+
+    // Verify the data- attributes for setting the "active" class on links.
+    \Drupal::currentUser()->setAccount(new UserSession(array('uid' => 1)));
+    $variables['set_active_class'] = TRUE;
+    $expected_links = '';
+    $expected_links .= '<ul id="somelinks">';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li data-drupal-link-system-path="&lt;front&gt;"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="&lt;front&gt;">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li data-drupal-link-system-path="router_test/test1"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Test route') . '</a></li>';
+    $query = ['key' => 'value'];
+    $encoded_query = Html::escape(Json::encode($query));
+    $expected_links .= '<li data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '</ul>';
+    $expected = $expected_heading . $expected_links;
+    $this->assertThemeOutput('links', $variables, $expected);
+  }
+
+  /**
    * Test the use of drupal_pre_render_links() on a nested array of links.
    */
   function testDrupalPreRenderLinks() {
diff --git a/core/modules/system/src/Tests/Theme/MessageTest.php b/core/modules/system/src/Tests/Theme/MessageTest.php
index db27d2a..878d5bc 100644
--- a/core/modules/system/src/Tests/Theme/MessageTest.php
+++ b/core/modules/system/src/Tests/Theme/MessageTest.php
@@ -27,7 +27,7 @@ class MessageTest extends KernelTestBase {
   function testMessages() {
     // Enable the Classy theme.
     \Drupal::service('theme_handler')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_handler')->setDefault('classy');
 
     drupal_set_message('An error occurred', 'error');
     drupal_set_message('But then something nice happened');
diff --git a/core/modules/system/src/Tests/Theme/StableThemeTest.php b/core/modules/system/src/Tests/Theme/StableThemeTest.php
index 1f898ba..0df5c71 100644
--- a/core/modules/system/src/Tests/Theme/StableThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/StableThemeTest.php
@@ -52,7 +52,7 @@ protected function setUp() {
    */
   public function testStableIsDefault() {
     $this->themeHandler->install(['test_stable']);
-    $this->config('system.theme')->set('default', 'test_stable')->save();
+    $this->themeHandler->setDefault('test_stable');
     $theme = $this->themeManager->getActiveTheme();
     /** @var \Drupal\Core\Theme\ActiveTheme $base_theme */
     $base_themes = $theme->getBaseThemes();
@@ -65,7 +65,7 @@ public function testStableIsDefault() {
    */
   public function testWildWest() {
     $this->themeHandler->install(['test_wild_west']);
-    $this->config('system.theme')->set('default', 'test_wild_west')->save();
+    $this->themeHandler->setDefault('test_wild_west');
     $theme = $this->themeManager->getActiveTheme();
     /** @var \Drupal\Core\Theme\ActiveTheme $base_theme */
     $base_themes = $theme->getBaseThemes();
diff --git a/core/modules/system/src/Tests/Theme/ThemeTest.php b/core/modules/system/src/Tests/Theme/ThemeTest.php
index a84ef8f..3d8b784 100644
--- a/core/modules/system/src/Tests/Theme/ThemeTest.php
+++ b/core/modules/system/src/Tests/Theme/ThemeTest.php
@@ -175,7 +175,7 @@ function testCSSOverride() {
     $config->set('css.preprocess', 0);
     $config->save();
     $this->drupalGet('theme-test/suggestion');
-    $this->assertNoText('system.module.css', "The theme's .info.yml file is able to remove a module CSS file from being added to the page.");
+    $this->assertNoText('js.module.css', 'The theme\'s .info.yml file is able to override a module CSS file from being added to the page.');
 
     // Also test with aggregation enabled, simply ensuring no PHP errors are
     // triggered during drupal_build_css_cache() when a source file doesn't
diff --git a/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php b/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
index 1b330d0..c220dde 100644
--- a/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigDebugMarkupTest.php
@@ -31,7 +31,7 @@ function testTwigDebugMarkup() {
     $renderer = $this->container->get('renderer');
     $extension = twig_extension();
     \Drupal::service('theme_handler')->install(array('test_theme'));
-    $this->config('system.theme')->set('default', 'test_theme')->save();
+    \Drupal::service('theme_handler')->setDefault('test_theme');
     $this->drupalCreateContentType(array('type' => 'page'));
     // Enable debug, rebuild the service container, and clear all caches.
     $parameters = $this->container->getParameter('twig.config');
diff --git a/core/modules/system/src/Tests/Theme/TwigTransTest.php b/core/modules/system/src/Tests/Theme/TwigTransTest.php
index 867c4d5..9eec247 100644
--- a/core/modules/system/src/Tests/Theme/TwigTransTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigTransTest.php
@@ -54,7 +54,7 @@ protected function setUp() {
 
     // Setup test_theme.
     \Drupal::service('theme_handler')->install(array('test_theme'));
-    $this->config('system.theme')->set('default', 'test_theme')->save();
+    \Drupal::service('theme_handler')->setDefault('test_theme');
 
     // Create and log in as admin.
     $this->adminUser = $this->drupalCreateUser(array(
diff --git a/core/modules/system/src/Tests/Theme/TwigWhiteListTest.php b/core/modules/system/src/Tests/Theme/TwigWhiteListTest.php
index 99612c2..edc0c91 100644
--- a/core/modules/system/src/Tests/Theme/TwigWhiteListTest.php
+++ b/core/modules/system/src/Tests/Theme/TwigWhiteListTest.php
@@ -46,7 +46,7 @@ class TwigWhiteListTest extends KernelTestBase {
    */
   protected function setUp() {
     parent::setUp();
-    $this->installSchema('system', array('router', 'sequences'));
+    $this->installSchema('system', array('sequences'));
     $this->installEntitySchema('node');
     $this->installEntitySchema('user');
     $this->installEntitySchema('taxonomy_term');
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
index c6a7f1c..8c24946 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
@@ -12,6 +12,7 @@
 use Drupal\Core\TypedData\ListDataDefinition;
 use Drupal\Core\TypedData\MapDataDefinition;
 use Drupal\Core\TypedData\TypedDataInterface;
+use Drupal\file\Entity\File;
 use Drupal\simpletest\KernelTestBase;
 use Drupal\Core\Datetime\DrupalDateTime;
 
@@ -247,7 +248,7 @@ public function testGetAndSet() {
     for ($i = 0; $i < 3; $i++){
       $path = "public://example_$i.png";
       file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', $path);
-      $image = entity_create('file', array('uri' => $path));
+      $image = File::create(['uri' => $path]);
       $image->save();
       $files[] = $image;
     }
diff --git a/core/modules/system/src/Tests/Update/DbDumpTest.php b/core/modules/system/src/Tests/Update/DbDumpTest.php
index 7cd099b..230743d 100644
--- a/core/modules/system/src/Tests/Update/DbDumpTest.php
+++ b/core/modules/system/src/Tests/Update/DbDumpTest.php
@@ -90,9 +90,7 @@ protected function setUp() {
     // Create some schemas so our export contains tables.
     $this->installSchema('system', [
       'key_value_expire',
-      'semaphore',
       'sessions',
-      'url_alias',
     ]);
     $this->installSchema('dblog', ['watchdog']);
     $this->installEntitySchema('block_content');
@@ -113,6 +111,9 @@ protected function setUp() {
     $account = User::create(['mail' => 'q\'uote$dollar@example.com', 'name' => '$dollar']);
     $account->save();
 
+    // Create url_alias (this will create 'url_alias').
+    $this->container->get('path.alias_storage')->save('/user/' . $account->id(), '/user/example');
+
     // Create a cache table (this will create 'cache_discovery').
     \Drupal::cache('discovery')->set('test', $this->data);
 
@@ -125,13 +126,14 @@ protected function setUp() {
       'cachetags',
       'config',
       'cache_bootstrap',
+      'cache_data',
+      'cache_default',
       'cache_discovery',
       'cache_entity',
       'file_managed',
       'key_value_expire',
       'menu_link_content',
       'menu_link_content_data',
-      'semaphore',
       'sequences',
       'sessions',
       'url_alias',
diff --git a/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php b/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
index 84c75d8..becf517 100644
--- a/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
+++ b/core/modules/system/src/Tests/Update/InvalidUpdateHookTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\system\Tests\Update;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\Core\Extension\ExtensionSchemaVersionException;
 
 /**
  * Tests that a module implementing hook_update_8000() causes an error to be
diff --git a/core/modules/system/src/Tests/Utility/LinkGenerationTest.php b/core/modules/system/src/Tests/Utility/LinkGenerationTest.php
index 62c4d23..d2d6e9a 100644
--- a/core/modules/system/src/Tests/Utility/LinkGenerationTest.php
+++ b/core/modules/system/src/Tests/Utility/LinkGenerationTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Tests\Utility;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Url;
 use Drupal\simpletest\KernelTestBase;
@@ -32,7 +32,7 @@ function testHookLinkAlter() {
       return \Drupal::l(['#markup' => '<em>link with markup</em>'], $url);
     });
     $this->setRawContent($link);
-    $this->assertTrue(SafeMarkup::isSafe($link), 'The output of link generation is marked safe as it is a link.');
+    $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
     // Ensure the content of the link is not escaped.
     $this->assertRaw('<em>link with markup</em>');
 
@@ -42,7 +42,7 @@ function testHookLinkAlter() {
       return \Drupal::l(['#markup' => '<em>link with markup</em>'], $url);
     });
     $this->setRawContent($link);
-    $this->assertTrue(SafeMarkup::isSafe($link), 'The output of link generation is marked safe as it is a link.');
+    $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
     // Ensure the content of the link is escaped.
     $this->assertEscaped('<em>link with markup</em> <strong>Test!</strong>');
 
@@ -52,7 +52,7 @@ function testHookLinkAlter() {
       return \Drupal::l(['#markup' => '<em>link with markup</em>'], $url);
     });
     $this->setRawContent($link);
-    $this->assertTrue(SafeMarkup::isSafe($link), 'The output of link generation is marked safe as it is a link.');
+    $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
     // Ensure the content of the link is escaped.
     $this->assertRaw('<em>link with markup</em> <strong>Test!</strong>');
 
@@ -61,7 +61,7 @@ function testHookLinkAlter() {
       return \Drupal::l('<em>link with markup</em>', $url);
     });
     $this->setRawContent($link);
-    $this->assertTrue(SafeMarkup::isSafe($link), 'The output of link generation is marked safe as it is a link.');
+    $this->assertTrue($link instanceof MarkupInterface, 'The output of link generation is marked safe as it is a link.');
     // Ensure the content of the link is escaped.
     $this->assertEscaped('<em>link with markup</em>');
     $this->assertRaw('<strong>Test!</strong>');
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index afa5892..44212b1 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -61,7 +61,7 @@ function system_requirements($phase) {
     if (!empty($experimental)) {
       $requirements['experimental'] = array(
         'title' => t('Experimental modules enabled'),
-        'value' => t('Experimental modules found: %module_list. Experimental modules are provided for testing purposes only. Use at your own risk.', array('%module_list' => implode(', ', $experimental))),
+        'value' => t('Experimental modules found: %module_list. <a href=":url">Experimental modules</a> are provided for testing purposes only. Use at your own risk.', array('%module_list' => implode(', ', $experimental), ':url' => 'https://www.drupal.org/core/experimental')),
         'severity' => REQUIREMENT_WARNING,
       );
     }
@@ -246,7 +246,7 @@ function system_requirements($phase) {
       $requirements['php_opcache'] = array(
         'value' => t('Not enabled'),
         'severity' => REQUIREMENT_WARNING,
-        'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href=":opcache_link" target="_blank">OPcache</a> installed on your server.', array(':opcache_link' => 'http://php.net/manual/en/opcache.installation.php')),
+        'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href="http://php.net/manual/opcache.installation.php" target="_blank">OPcache</a> installed on your server.'),
       );
     }
     else {
@@ -365,12 +365,25 @@ function system_requirements($phase) {
     else {
       $site_path = DrupalKernel::findSitePath(Request::createFromGlobals());
     }
-    if (!drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir')) {
-      $conf_errors[] = t("The directory %file is not protected from modifications and poses a security risk. You must change the directory's permissions to be non-writable.", array('%file' => $site_path));
+    // Allow system administrators to disable permissions hardening for the site
+    // directory. This allows additional files in the site directory to be
+    // updated when they are managed in a version control system.
+    if (Settings::get('skip_permissions_hardening')) {
+      $conf_errors[] = t('Protection disabled');
+      // If permissions hardening is disabled, then only show a warning for a
+      // writable file, as a reminder, rather than an error.
+      $file_protection_severity = REQUIREMENT_WARNING;
+    }
+    else {
+      // In normal operation, writable files or directories are an error.
+      $file_protection_severity = REQUIREMENT_ERROR;
+      if (!drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir')) {
+        $conf_errors[] = t("The directory %file is not protected from modifications and poses a security risk. You must change the directory's permissions to be non-writable.", array('%file' => $site_path));
+      }
     }
     foreach (array('settings.php', 'settings.local.php', 'services.yml') as $conf_file) {
       $full_path = $site_path . '/' . $conf_file;
-      if (file_exists($full_path) && !drupal_verify_install_file($full_path, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE)) {
+      if (file_exists($full_path) && (Settings::get('skip_permissions_hardening') || !drupal_verify_install_file($full_path, FILE_EXIST|FILE_READABLE|FILE_NOT_WRITABLE))) {
         $conf_errors[] = t("The file %file is not protected from modifications and poses a security risk. You must change the file's permissions to be non-writable.", array('%file' => $full_path));
       }
     }
@@ -393,7 +406,7 @@ function system_requirements($phase) {
       }
       $requirements['configuration_files'] = array(
         'value' => t('Not protected'),
-        'severity' => REQUIREMENT_ERROR,
+        'severity' => $file_protection_severity,
         'description' => $description,
       );
     }
@@ -841,83 +854,6 @@ function system_install() {
  * Implements hook_schema().
  */
 function system_schema() {
-  $schema['batch'] = array(
-    'description' => 'Stores details about batches (processes that run in multiple HTTP requests).',
-    'fields' => array(
-      'bid' => array(
-        'description' => 'Primary Key: Unique batch ID.',
-        // This is not a serial column, to allow both progressive and
-        // non-progressive batches. See batch_process().
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'token' => array(
-        'description' => "A string token generated against the current user's session id and the batch id, used to ensure that only the user who submitted the batch can effectively access it.",
-        'type' => 'varchar_ascii',
-        'length' => 64,
-        'not null' => TRUE,
-      ),
-      'timestamp' => array(
-        'description' => 'A Unix timestamp indicating when this batch was submitted for processing. Stale batches are purged at cron time.',
-        'type' => 'int',
-        'not null' => TRUE,
-      ),
-      'batch' => array(
-        'description' => 'A serialized array containing the processing data for the batch.',
-        'type' => 'blob',
-        'not null' => FALSE,
-        'size' => 'big',
-      ),
-    ),
-    'primary key' => array('bid'),
-    'indexes' => array(
-      'token' => array('token'),
-    ),
-  );
-
-  $schema['flood'] = array(
-    'description' => 'Flood controls the threshold of events, such as the number of contact attempts.',
-    'fields' => array(
-      'fid' => array(
-        'description' => 'Unique flood event ID.',
-        'type' => 'serial',
-        'not null' => TRUE,
-      ),
-      'event' => array(
-        'description' => 'Name of event (e.g. contact).',
-        'type' => 'varchar_ascii',
-        'length' => 64,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'identifier' => array(
-        'description' => 'Identifier of the visitor, such as an IP address or hostname.',
-        'type' => 'varchar_ascii',
-        'length' => 128,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'timestamp' => array(
-        'description' => 'Timestamp of the event.',
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'expiration' => array(
-        'description' => 'Expiration timestamp. Expired events are purged on cron run.',
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-    ),
-    'primary key' => array('fid'),
-    'indexes' => array(
-      'allow' => array('event', 'identifier', 'timestamp'),
-      'purge' => array('expiration'),
-    ),
-  );
-
   $schema['key_value'] = array(
     'description' => 'Generic key-value storage table. See the state system for an example.',
     'fields' => array(
@@ -983,129 +919,6 @@ function system_schema() {
     ),
   );
 
-  $schema['queue'] = array(
-    'description' => 'Stores items in queues.',
-    'fields' => array(
-      'item_id' => array(
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'description' => 'Primary Key: Unique item ID.',
-      ),
-      'name' => array(
-        'type' => 'varchar_ascii',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'The queue name.',
-      ),
-      'data' => array(
-        'type' => 'blob',
-        'not null' => FALSE,
-        'size' => 'big',
-        'serialize' => TRUE,
-        'description' => 'The arbitrary data for the item.',
-      ),
-      'expire' => array(
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'description' => 'Timestamp when the claim lease expires on the item.',
-      ),
-      'created' => array(
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'description' => 'Timestamp when the item was created.',
-      ),
-    ),
-    'primary key' => array('item_id'),
-    'indexes' => array(
-      'name_created' => array('name', 'created'),
-      'expire' => array('expire'),
-    ),
-  );
-
-  $schema['router'] = array(
-    'description' => 'Maps paths to various callbacks (access, page and title)',
-    'fields' => array(
-      'name' => array(
-        'description' => 'Primary Key: Machine name of this route',
-        'type' => 'varchar_ascii',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'path' => array(
-        'description' => 'The path for this URI',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'pattern_outline' => array(
-        'description' => 'The pattern',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'fit' => array(
-        'description' => 'A numeric representation of how specific the path is.',
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'route' => array(
-        'description' => 'A serialized Route object',
-        'type' => 'blob',
-        'size' => 'big',
-      ),
-      'number_parts' => array(
-        'description' => 'Number of parts in this router path.',
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-        'size' => 'small',
-      ),
-    ),
-    'indexes' => array(
-      'pattern_outline_parts' => array('pattern_outline', 'number_parts'),
-    ),
-    'primary key' => array('name'),
-  );
-
-  $schema['semaphore'] = array(
-    'description' => 'Table for holding semaphores, locks, flags, etc. that cannot be stored as state since they must not be cached.',
-    'fields' => array(
-      'name' => array(
-        'description' => 'Primary Key: Unique name.',
-        'type' => 'varchar_ascii',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => ''
-      ),
-      'value' => array(
-        'description' => 'A value for the semaphore.',
-        'type' => 'varchar_ascii',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => ''
-      ),
-      'expire' => array(
-        'description' => 'A Unix timestamp with microseconds indicating when the semaphore should expire.',
-        'type' => 'float',
-        'size' => 'big',
-        'not null' => TRUE
-      ),
-    ),
-    'indexes' => array(
-      'value' => array('value'),
-      'expire' => array('expire'),
-    ),
-    'primary key' => array('name'),
-  );
-
   $schema['sequences'] = array(
     'description' => 'Stores IDs.',
     'fields' => array(
@@ -1169,44 +982,6 @@ function system_schema() {
     ),
   );
 
-  $schema['url_alias'] = array(
-    'description' => 'A list of URL aliases for Drupal paths; a user may visit either the source or destination path.',
-    'fields' => array(
-      'pid' => array(
-        'description' => 'A unique path alias identifier.',
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'source' => array(
-        'description' => 'The Drupal path this alias is for; e.g. node/12.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'alias' => array(
-        'description' => 'The alias for this path; e.g. title-of-the-story.',
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-      'langcode' => array(
-        'description' => "The language code this alias is for; if 'und', the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.",
-        'type' => 'varchar_ascii',
-        'length' => 12,
-        'not null' => TRUE,
-        'default' => '',
-      ),
-    ),
-    'primary key' => array('pid'),
-    'indexes' => array(
-      'alias_langcode_pid' => array('alias', 'langcode', 'pid'),
-      'source_langcode_pid' => array('source', 'langcode', 'pid'),
-    ),
-  );
-
   return $schema;
 }
 
diff --git a/core/modules/system/system.links.menu.yml b/core/modules/system/system.links.menu.yml
index ba21cee..b5f9d87 100644
--- a/core/modules/system/system.links.menu.yml
+++ b/core/modules/system/system.links.menu.yml
@@ -18,7 +18,7 @@ system.admin_structure:
 system.themes_page:
   route_name: system.themes_page
   title: Appearance
-  description: 'Select and configure your themes.'
+  description: 'Select and configure themes.'
   parent: system.admin
   weight: -6
 system.modules_list:
@@ -40,7 +40,7 @@ system.admin_config_media:
   weight: -10
 system.file_system_settings:
   title: 'File system'
-  description: 'Tell Drupal where to store uploaded files and how they are accessed.'
+  description: 'Configure the location of uploaded files and how they are accessed.'
   parent: system.admin_config_media
   route_name: system.file_system_settings
 system.image_toolkit_settings:
@@ -56,64 +56,64 @@ system.admin_config_services:
 system.rss_feeds_settings:
   title: 'RSS publishing'
   parent: system.admin_config_services
-  description: 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.'
+  description: 'Configure the site description, the number of items per feed, and whether feeds should be titles/teasers/full-text.'
   route_name: system.rss_feeds_settings
 system.admin_config_development:
   route_name: system.admin_config_development
   parent: system.admin_config
   title: Development
-  description: 'Development tools.'
+  description: 'Configure and use development tools.'
   weight: -10
 system.site_maintenance_mode:
   title: 'Maintenance mode'
   parent: system.admin_config_development
-  description: 'Take the site offline for maintenance or bring it back online.'
+  description: 'Take the site offline for updates and other maintenance tasks.'
   route_name: system.site_maintenance_mode
   weight: -10
 system.performance_settings:
   title: Performance
   parent: system.admin_config_development
-  description: 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.'
+  description: 'Configure caching and bandwidth optimization.'
   route_name: system.performance_settings
   weight: -20
 system.logging_settings:
   title: 'Logging and errors'
   parent: system.admin_config_development
-  description: 'Settings for logging and alerts modules. Various modules can route Drupal''s system events to different destinations, such as syslog, database, email, etc.'
+  description: 'Configure the display of error messages and database logging.'
   route_name: system.logging_settings
   weight: -15
 system.admin_config_regional:
   route_name: system.admin_config_regional
   title: 'Regional and language'
   parent: system.admin_config
-  description: 'Regional settings, localization and translation.'
+  description: 'Configure regional settings, localization, and translation.'
   weight: -5
 system.regional_settings:
   title: 'Regional settings'
   parent: system.admin_config_regional
-  description: 'Settings for the site''s default time zone and country.'
+  description: 'Configure the locale and timezone settings.'
   route_name: system.regional_settings
   weight: -20
 entity.date_format.collection:
   title: 'Date and time formats'
   parent: system.admin_config_regional
-  description: 'Configure display format strings for date and time.'
+  description: 'Configure how dates and times are displayed.'
   route_name: entity.date_format.collection
   weight: -9
 system.admin_config_search:
   title: 'Search and metadata'
   route_name: system.admin_config_search
   parent: system.admin_config
-  description: 'Local site search, metadata and SEO.'
+  description: 'Configure site search, metadata, and search engine optimization.'
   weight: -10
 system.admin_config_system:
   title: System
   route_name: system.admin_config_system
   parent: system.admin_config
-  description: 'General system related configuration.'
+  description: 'Configure basic site settings, actions, and cron.'
   weight: -20
 system.site_information_settings:
-  title: 'Site information'
+  title: 'Basic site settings'
   parent: system.admin_config_system
   description: 'Change site name, email address, slogan, default front page, and error pages.'
   route_name: system.site_information_settings
@@ -128,19 +128,19 @@ system.admin_config_ui:
   title: 'User interface'
   route_name: system.admin_config_ui
   parent: system.admin_config
-  description: 'Tools that enhance the user interface.'
+  description: 'Configure the administrative user interface.'
   weight: -15
 system.admin_config_workflow:
   title: Workflow
   route_name: system.admin_config_workflow
   parent: system.admin_config
-  description: 'Content workflow, editorial workflow tools.'
+  description: 'Manage the content workflow.'
   weight: 5
 system.admin_config_content:
   title: 'Content authoring'
   route_name: system.admin_config_content
   parent: system.admin_config
-  description: 'Settings related to formatting and authoring content.'
+  description: 'Configure content formatting and authoring.'
   weight: -15
 system.admin_reports:
   title: Reports
@@ -151,5 +151,5 @@ system.admin_reports:
 system.status:
   title: 'Status report'
   parent: system.admin_reports
-  description: 'Get a status report about your site''s operation and any detected problems.'
+  description: 'Get a status report about your site''s operation.'
   route_name: system.status
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index f280866..85f55ed 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -9,6 +9,7 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Asset\AttachedAssetsInterface;
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Queue\QueueGarbageCollectionInterface;
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionDiscovery;
@@ -17,6 +18,7 @@
 use Drupal\Core\PageCache\RequestPolicyInterface;
 use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\Extension\ModuleHandler;
@@ -88,7 +90,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Disabling drag-and-drop functionality') . '</dt>';
       $output .= '<dd>' . t('The default drag-and-drop user interface for ordering tables in the administrative interface presents a challenge for some users, including users of screen readers and other assistive technology. The drag-and-drop interface can be disabled in a table by clicking a link labeled "Show row weights" above the table. The replacement interface allows users to order the table by choosing numerical weights instead of dragging table rows.') . '</dd>';
       $output .= '<dt>' . t('Configuring basic site settings') . '</dt>';
-      $output .= '<dd>' . t('The System module provides pages for managing basic site configuration, including <a href=":date-time-settings">Date and time formats</a> and basic <a href=":site-info">Site information</a> (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main <a href=":config">Configuration page</a>.', array(':date-time-settings' => \Drupal::url('entity.date_format.collection'), ':site-info' => \Drupal::url('system.site_information_settings'), ':config' => \Drupal::url('system.admin_config'))) . '</dd>';
+      $output .= '<dd>' . t('The System module provides pages for managing basic site configuration, including <a href=":date-time-settings">Date and time formats</a> and <a href=":site-info">Basic site settings</a> (site name, email address to send mail from, home page, and error pages). Additional configuration pages are listed on the main <a href=":config">Configuration page</a>.', array(':date-time-settings' => \Drupal::url('entity.date_format.collection'), ':site-info' => \Drupal::url('system.site_information_settings'), ':config' => \Drupal::url('system.admin_config'))) . '</dd>';
       $output .= '<dt>' . t('Checking site status') . '</dt>';
       $output .= '<dd>' . t('The <a href=":status">Status report</a> provides an overview of the configuration, status, and health of your site. Review this report to make sure there are not any problems to address, and to find information about the software your site and web server are using.', array(':status' => \Drupal::url('system.status'))) . '</dd>';
       $output .= '<dt>' . t('Using maintenance mode') . '</dt>';
@@ -215,6 +217,13 @@ function system_theme() {
       'variables' => array('menu_items' => NULL),
       'file' => 'system.admin.inc',
     ),
+    'entity_add_list' => array(
+      'variables' => array(
+        'bundles' => array(),
+        'add_bundle_message' => NULL,
+      ),
+      'template' => 'entity-add-list',
+    ),
   ));
 }
 
@@ -315,6 +324,25 @@ function system_theme_suggestions_field(array $variables) {
 }
 
 /**
+ * Prepares variables for the list of available bundles.
+ *
+ * Default template: entity-add-list.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - bundles: An array of bundles with the label, description, add_link keys.
+ *   - add_bundle_message: The message shown when there are no bundles. Only
++ *                         available if the entity type uses bundle entities.
+ */
+function template_preprocess_entity_add_list(&$variables) {
+  foreach ($variables['bundles'] as $bundle_name => $bundle_info) {
+    $variables['bundles'][$bundle_name]['description'] = [
+      '#markup' => $bundle_info['description'],
+    ];
+  }
+}
+
+/**
  * @defgroup authorize Authorized operations
  * @{
  * Functions to run operations with elevated privileges via authorize.php.
@@ -646,7 +674,9 @@ function system_js_settings_build(&$settings, AttachedAssetsInterface $assets) {
  * as well as theme_token ajax state.
  */
 function system_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
-  $request = \Drupal::request();
+  // As this is being output in the final response always use the master
+  // request.
+  $request = \Drupal::requestStack()->getMasterRequest();
   $current_query = $request->query->all();
 
   // Let output path processors set a prefix.
@@ -656,8 +686,12 @@ function system_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
   $path_processor->processOutbound('/', $options);
   $pathPrefix = $options['prefix'];
 
-  $current_path = \Drupal::routeMatch()->getRouteName() ? Url::fromRouteMatch(\Drupal::routeMatch())->getInternalPath() : '';
-  $current_path_is_admin = \Drupal::service('router.admin_context')->isAdminRoute();
+  $route_match = \Drupal::routeMatch();
+  if ($route_match instanceof StackedRouteMatchInterface) {
+    $route_match = $route_match->getMasterRouteMatch();
+  }
+  $current_path = $route_match->getRouteName() ? Url::fromRouteMatch($route_match)->getInternalPath() : '';
+  $current_path_is_admin = \Drupal::service('router.admin_context')->isAdminRoute($route_match->getRouteObject());
   $path_settings = [
     'baseUrl' => $request->getBaseUrl() . '/',
     'pathPrefix' => $pathPrefix,
@@ -1061,21 +1095,6 @@ function system_rebuild_module_data() {
 }
 
 /**
- * Returns an array of default theme features.
- *
- * @see \Drupal\Core\Extension\ThemeHandler::$defaultFeatures
- */
-function _system_default_theme_features() {
-  return array(
-    'favicon',
-    'logo',
-    'node_user_picture',
-    'comment_user_picture',
-    'comment_user_verification',
-  );
-}
-
-/**
  * Get a list of available regions from a specified theme.
  *
  * @param \Drupal\Core\Extension\Extension|string $theme
@@ -1266,21 +1285,10 @@ function system_cron() {
     \Drupal::service('keyvalue.expirable.database')->garbageCollection();
   }
 
-  // Clean up the queue for failed batches.
-  db_delete('queue')
-    ->condition('created', REQUEST_TIME - 864000, '<')
-    ->condition('name', 'drupal_batch:%', 'LIKE')
-    ->execute();
-
-  // Reset expired items in the default queue implementation table. If that's
-  // not used, this will simply be a no-op.
-  db_update('queue')
-    ->fields(array(
-      'expire' => 0,
-    ))
-    ->condition('expire', 0, '<>')
-    ->condition('expire', REQUEST_TIME, '<')
-    ->execute();
+  // Clean up any garbage in the queue service.
+  if (\Drupal::service('queue') instanceof QueueGarbageCollectionInterface) {
+    \Drupal::service('queue')->garbageCollection();
+  }
 
   // Clean up PHP storage.
   PhpStorageFactory::get('container')->garbageCollection();
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 14204c8..ed111f8 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -146,7 +146,7 @@ system.site_information_settings:
   path: '/admin/config/system/site-information'
   defaults:
     _form: 'Drupal\system\Form\SiteInformationForm'
-    _title: 'Site information'
+    _title: 'Basic site settings'
   requirements:
     _permission: 'administer site configuration'
 
@@ -273,6 +273,14 @@ system.modules_list_confirm:
   requirements:
     _permission: 'administer modules'
 
+system.modules_list_experimental_confirm:
+  path: '/admin/modules/list/confirm-experimental'
+  defaults:
+    _form: 'Drupal\system\Form\ModulesListExperimentalConfirmForm'
+    _title: 'Experimental modules'
+  requirements:
+    _permission: 'administer modules'
+
 system.theme_uninstall:
   path: '/admin/appearance/uninstall'
   defaults:
@@ -437,6 +445,8 @@ system.batch_page.html:
     _format: 'html'
   options:
     _admin_route: TRUE
+    # @todo Remove the '_no_big_pipe' route option when https://www.drupal.org/node/2589967 lands.
+    _no_big_pipe: TRUE
 
 system.batch_page.json:
   path: '/batch'
diff --git a/core/modules/system/templates/entity-add-list.html.twig b/core/modules/system/templates/entity-add-list.html.twig
new file mode 100644
index 0000000..8d73786
--- /dev/null
+++ b/core/modules/system/templates/entity-add-list.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of available bundles.
+ *
+ * Available variables:
+ *   - bundles: A list of bundles, each with the following properties:
+ *     - label: Bundle label.
+ *     - description: Bundle description.
+ *     - add_link: Link to create an entity of this bundle.
+ *   - add_bundle_message: The message shown when there are no bundles. Only
+ *                         available if the entity type uses bundle entities.
+ *
+ * @see template_preprocess_entity_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if bundles is not empty %}
+  <dl>
+    {% for bundle in bundles %}
+      <dt>{{ bundle.add_link }}</dt>
+      <dd>{{ bundle.description }}</dd>
+    {% endfor %}
+  </dl>
+{% elseif add_bundle_message is not empty %}
+  <p>
+    {{ add_bundle_message }}
+  </p>
+{% endif %}
diff --git a/core/modules/system/templates/install-page.html.twig b/core/modules/system/templates/install-page.html.twig
index 1d0e479..f6091fd 100644
--- a/core/modules/system/templates/install-page.html.twig
+++ b/core/modules/system/templates/install-page.html.twig
@@ -28,7 +28,7 @@
 
     <main role="main">
       {% if title %}
-        <h1>{{ title }}</h1>
+        <h2>{{ title }}</h2>
       {% endif %}
       {{ page.highlighted }}
       {{ page.content }}
diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 86713b5..77e7260 100644
--- a/core/modules/system/templates/links.html.twig
+++ b/core/modules/system/templates/links.html.twig
@@ -13,7 +13,6 @@
  *     to l() as its $options parameter.
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
- *   - link_key: The link CSS class.
  * - heading: (optional) A heading to precede the links.
  *   - text: The heading text.
  *   - level: The heading level (e.g. 'h2', 'h3').
@@ -43,8 +42,8 @@
     {%- endif -%}
   {%- endif -%}
   <ul{{ attributes }}>
-    {%- for key, item in links -%}
-      <li{{ item.attributes.addClass(key|clean_class) }}>
+    {%- for item in links -%}
+      <li{{ item.attributes }}>
         {%- if item.link -%}
           {{ item.link }}
         {%- elseif item.text_attributes -%}
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php b/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
index 3c5e9af..7a83e87 100644
--- a/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
+++ b/core/modules/system/tests/fixtures/update/drupal-8.broken_routing.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test fixture.
+ */
+
 use Drupal\Core\Database\Database;
 
 
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php
index d80e74e..05bcf8e 100644
Binary files a/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php and b/core/modules/system/tests/fixtures/update/drupal-8.language-enabled.php differ
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.without_automated_cron.php b/core/modules/system/tests/fixtures/update/drupal-8.without_automated_cron.php
index 81e4e72..87b6355 100644
--- a/core/modules/system/tests/fixtures/update/drupal-8.without_automated_cron.php
+++ b/core/modules/system/tests/fixtures/update/drupal-8.without_automated_cron.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test fixture.
+ */
+
 $connection = Drupal\Core\Database\Database::getConnection();
 $config = $connection;
 
diff --git a/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php
new file mode 100644
index 0000000..fcb90ba
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8-rc1.bare.standard.php.gz for testing
+ * the upgrade path of https://www.drupal.org/node/2649914.
+ */
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+$views_config = Yaml::decode(file_get_contents(__DIR__ . '/drupal8.views-image-style-dependency-2649914.yml'));
+
+$connection->insert('config')
+  ->fields(['collection', 'name', 'data'])
+  ->values([
+    'collection' => '',
+    'name' => 'views.view.' . $views_config['id'],
+    'data' => serialize($views_config),
+  ])->execute();
diff --git a/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml
new file mode 100644
index 0000000..585da34
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.yml
@@ -0,0 +1,43 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_image
+  module:
+    - image
+    - node
+id: foo
+label: Foo
+module: views
+description: ''
+tag: ''
+base_table: node_field_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      fields:
+        field_image:
+          id: field_image
+          table: node__field_image
+          field: field_image
+          type: image
+          settings:
+            image_style: thumbnail
+            image_link: ''
+          plugin_id: field
+        field_image_1:
+          id: field_image_1
+          table: node__field_image
+          field: field_image
+          type: image
+          settings:
+            # This field's formatter is using a non-existent image style.
+            image_style: nonexistent
+            image_link: ''
+          plugin_id: field
diff --git a/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestRequeueException.php b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestRequeueException.php
new file mode 100644
index 0000000..4478f79
--- /dev/null
+++ b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestRequeueException.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\cron_queue_test\Plugin\QueueWorker\CronQueueTestRequeueException.
+ */
+
+namespace Drupal\cron_queue_test\Plugin\QueueWorker;
+
+use Drupal\Core\Queue\QueueWorkerBase;
+use Drupal\Core\Queue\RequeueException;
+
+/**
+ * @QueueWorker(
+ *   id = "cron_queue_test_requeue_exception",
+ *   title = @Translation("RequeueException test"),
+ *   cron = {"time" = 60}
+ * )
+ */
+class CronQueueTestRequeueException extends QueueWorkerBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processItem($data) {
+    $state = \Drupal::state();
+    if (!$state->get('cron_queue_test_requeue_exception')) {
+      $state->set('cron_queue_test_requeue_exception', 1);
+      throw new RequeueException('I am not done yet!');
+    }
+    else {
+      $state->set('cron_queue_test_requeue_exception', 2);
+    }
+  }
+
+}
diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module
index b5ee9c8..460480a 100644
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Database test module.
+ */
+
 use Drupal\Core\Database\Query\AlterableInterface;
 
 /**
diff --git a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
index d671bc4..d34d949 100644
--- a/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
+++ b/core/modules/system/tests/modules/entity_test/config/schema/entity_test.schema.yml
@@ -13,3 +13,17 @@ field.storage_settings.shape:
     foreign_key_name:
       type: string
       label: 'Foreign key name'
+
+entity_test.entity_test_bundle.*:
+  type: config_entity
+  label: 'Entity test bundle'
+  mapping:
+    label:
+      type: label
+      label: 'Label'
+    id:
+      type: string
+      label: 'Machine-readable name'
+    description:
+      type: text
+      label: 'Description'
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.install b/core/modules/system/tests/modules/entity_test/entity_test.install
index a9ff423..5e3bcaa 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.install
+++ b/core/modules/system/tests/modules/entity_test/entity_test.install
@@ -6,6 +6,8 @@
  */
 
 use Drupal\system\Tests\Update\DbUpdatesTrait;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\Entity\FieldConfig;
 
 /**
  * Implements hook_install().
@@ -13,19 +15,19 @@
 function entity_test_install() {
   foreach (entity_test_entity_types() as $entity_type) {
     // Auto-create fields for testing.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'entity_type' => $entity_type,
       'field_name' => 'field_test_text',
       'type' => 'text',
       'cardinality' => 1,
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => $entity_type,
       'field_name' => 'field_test_text',
       'bundle' => $entity_type,
       'label' => 'Test text-field',
       'translatable' => FALSE,
-    ))->save();
+    ])->save();
 
     entity_get_form_display($entity_type, $entity_type, 'default')
       ->setComponent('field_test_text', array('type' => 'text_textfield'))
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 0eec45d..9d9d63c 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -67,6 +67,8 @@ function entity_test_entity_types($filter = NULL) {
   }
   if ($filter === ENTITY_TEST_TYPES_ROUTING) {
     $types[] = 'entity_test_base_field_display';
+    $types[] = 'entity_test_string_id';
+    $types[] = 'entity_test_no_id';
   }
   $types[] = 'entity_test_mulrev';
   $types[] = 'entity_test_mulrev_changed';
@@ -194,7 +196,7 @@ function entity_test_entity_bundle_info() {
   $bundles = array();
   $entity_types = \Drupal::entityManager()->getDefinitions();
   foreach ($entity_types as $entity_type_id => $entity_type) {
-    if ($entity_type->getProvider() == 'entity_test') {
+    if ($entity_type->getProvider() == 'entity_test' && $entity_type_id != 'entity_test_with_bundle') {
       $bundles[$entity_type_id] = \Drupal::state()->get($entity_type_id . '.bundles') ?: array($entity_type_id => array('label' => 'Entity Test Bundle'));
     }
   }
@@ -248,8 +250,8 @@ function entity_test_entity_extra_field_info() {
   $extra['entity_test']['bundle_with_extra_fields'] = array(
     'display' => array(
       // Note: those extra fields do not currently display anything, they are
-      // just used in \Drupal\field_ui\Tests\EntityDisplayTest to test the
-      // behavior of entity display objects.
+      // just used in \Drupal\Tests\field_ui\Kernel\EntityDisplayTest to test
+      // the behavior of entity display objects.
       'display_extra_field' => array(
         'label' => t('Display extra field'),
         'description' => t('An extra field on the display side.'),
@@ -416,7 +418,7 @@ function entity_test_entity_field_access($operation, FieldDefinitionInterface $f
  */
 function entity_test_entity_field_access_alter(array &$grants, array $context) {
   if ($context['field_definition']->getName() == 'field_test_text' && $context['items']->value == 'access alter value') {
-    $grants[':default'] = AccessResult::forbidden()->inheritCacheability($grants[':default'])->cacheUntilEntityChanges($context['items']->getEntity());
+    $grants[':default'] = AccessResult::forbidden()->inheritCacheability($grants[':default'])->addCacheableDependency($context['items']->getEntity());
   }
 }
 
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.permissions.yml b/core/modules/system/tests/modules/entity_test/entity_test.permissions.yml
index ff9810b..eb0d974 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.permissions.yml
+++ b/core/modules/system/tests/modules/entity_test/entity_test.permissions.yml
@@ -7,3 +7,6 @@ view test entity translations:
   title: 'View translations of test entities'
 view test entity field:
   title: 'View test entity field'
+administer entity_test_with_bundle content:
+  title: 'administer entity_test_with_bundle content'
+  description: 'administer entity_test_with_bundle content'
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
index 542a14e..e4353c8 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
+++ b/core/modules/system/tests/modules/entity_test/entity_test.routing.yml
@@ -58,7 +58,13 @@ entity.entity_test.collection:
 entity.entity_test_rev.revision:
   path: '/entity_test_rev/{entity_test_rev}/revision/{entity_test_rev_revision}/view'
   defaults:
-    _entity_view: 'entity_test_rev'
+    _controller: '\Drupal\Core\Entity\Controller\EntityViewController::viewRevision'
+  options:
+    parameters:
+      entity_test_rev:
+        type: entity:entity_test_rev
+      entity_test_rev_revision:
+        type: entity_revision:entity_test_rev
   requirements:
     _access: 'TRUE'
 
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.views.inc b/core/modules/system/tests/modules/entity_test/entity_test.views.inc
index d74af47..53d37da 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.views.inc
+++ b/core/modules/system/tests/modules/entity_test/entity_test.views.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Include file for test module.
+ */
+
+/**
  * Implements hook_views_data_alter().
  */
 function entity_test_views_data_alter(&$data) {
diff --git a/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php b/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
index b44c7eb..b72d691 100644
--- a/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
+++ b/core/modules/system/tests/modules/entity_test/src/Controller/EntityTestController.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\Query\QueryFactory;
-use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -45,24 +44,6 @@ public static function create(ContainerInterface $container) {
   }
 
   /**
-   * Displays the 'Add new entity_test' form.
-   *
-   * @param string $entity_type_id
-   *   Name of the entity type for which a create form should be displayed.
-   *
-   * @return array
-   *   The processed form for a new entity_test.
-   *
-   * @see \Drupal\entity_test\Routing\EntityTestRoutes::routes()
-   */
-  public function testAdd($entity_type_id) {
-    $entity = entity_create($entity_type_id, array());
-    $form = $this->entityFormBuilder()->getForm($entity);
-    $form['#title'] = $this->t('Create an @type', array('@type' => $entity_type_id));
-    return $form;
-  }
-
-  /**
    * Returns an empty page.
    *
    * @see \Drupal\entity_test\Routing\EntityTestRoutes::routes()
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
index 1197c2c..c5320e6 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTest.php
@@ -47,6 +47,7 @@
  *   },
  *   links = {
  *     "canonical" = "/entity_test/{entity_test}",
+ *     "add-form" = "/entity_test/add",
  *     "edit-form" = "/entity_test/manage/{entity_test}/edit",
  *     "delete-form" = "/entity_test/delete/entity_test/{entity_test}",
  *   },
@@ -69,21 +70,7 @@ public static function preCreate(EntityStorageInterface $storage, array &$values
    * {@inheritdoc}
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields['id'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('ID'))
-      ->setDescription(t('The ID of the test entity.'))
-      ->setReadOnly(TRUE)
-      ->setSetting('unsigned', TRUE);
-
-    $fields['uuid'] = BaseFieldDefinition::create('uuid')
-      ->setLabel(t('UUID'))
-      ->setDescription(t('The UUID of the test entity.'))
-      ->setReadOnly(TRUE);
-
-    $fields['langcode'] = BaseFieldDefinition::create('language')
-      ->setLabel(t('Language code'))
-      ->setDescription(t('The language code of the test entity.'))
-      ->setTranslatable(TRUE);
+    $fields = parent::baseFieldDefinitions($entity_type);
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
@@ -100,12 +87,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
         'weight' => -5,
       ));
 
-    // @todo: Add allowed values validation.
-    $fields['type'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Type'))
-      ->setDescription(t('The bundle of the test entity.'))
-      ->setRequired(TRUE);
-
     $fields['created'] = BaseFieldDefinition::create('created')
       ->setLabel(t('Authored on'))
       ->setDescription(t('Time the entity was created'))
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
index d2f8378..4cc7cc3 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBaseFieldDisplay.php
@@ -33,10 +33,12 @@
  *     "id" = "id",
  *     "label" = "name",
  *     "uuid" = "uuid",
- *     "bundle" = "type"
+ *     "bundle" = "type",
+ *     "langcode" = "langcode",
  *   },
  *   links = {
  *     "canonical" = "/entity_test_base_field_display/{entity_test_base_field_display}/edit",
+ *     "add-form" = "/entity_test_base_field_display/add",
  *     "edit-form" = "/entity_test_base_field_display/manage/{entity_test_base_field_display}",
  *     "delete-form" = "/entity_test/delete/entity_test_base_field_display/{entity_test_base_field_display}/edit",
  *   },
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBundle.php
new file mode 100644
index 0000000..f9abd9b
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestBundle.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\Entity\EntityTestBundle.
+ */
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+use Drupal\Core\Entity\EntityDescriptionInterface;
+
+/**
+ * Defines the Test entity bundle configuration entity.
+ *
+ * @ConfigEntityType(
+ *   id = "entity_test_bundle",
+ *   label = @Translation("Test entity bundle"),
+ *   handlers = {
+ *     "access" = "\Drupal\Core\Entity\EntityAccessControlHandler",
+ *     "form" = {
+ *       "default" = "\Drupal\Core\Entity\BundleEntityFormBase",
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   admin_permission = "administer entity_test_with_bundle content",
+ *   config_prefix = "entity_test_bundle",
+ *   bundle_of = "entity_test_with_bundle",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label"
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "description",
+ *   },
+ *   links = {
+ *     "add-form" = "/entity_test_bundle/add",
+ *   }
+ * )
+ */
+class EntityTestBundle extends ConfigEntityBundleBase implements EntityDescriptionInterface {
+
+  /**
+   * The machine name.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The human-readable name.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The description.
+   *
+   * @var string
+   */
+  protected $description;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return $this->description;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setDescription($description) {
+    $this->description = $description;
+    return $this;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php
index 1ff0264..6d95066 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabel.php
@@ -20,9 +20,11 @@
  *   base_table = "entity_test",
  *   render_cache = FALSE,
  *   entity_keys = {
+ *     "uuid" = "uuid",
  *     "id" = "id",
  *     "label" = "name",
- *     "bundle" = "type"
+ *     "bundle" = "type",
+ *     "langcode" = "langcode",
  *   }
  * )
  */
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php
index 1088114..632ae0c 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestLabelCallback.php
@@ -18,7 +18,9 @@
  *   label_callback = "entity_test_label_callback",
  *   entity_keys = {
  *     "id" = "id",
- *     "bundle" = "type"
+ *     "bundle" = "type",
+ *     "uuid" = "uuid",
+ *     "langcode" = "langcode",
  *   }
  * )
  */
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php
index d1908d3..256f031 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMul.php
@@ -38,6 +38,8 @@
  *     "langcode" = "langcode",
  *   },
  *   links = {
+ *     "add-page" = "/entity_test_mul/add",
+ *     "add-form" = "/entity_test_mul/add/{type}",
  *     "canonical" = "/entity_test_mul/manage/{entity_test_mul}",
  *     "edit-form" = "/entity_test_mul/manage/{entity_test_mul}/edit",
  *     "delete-form" = "/entity_test/delete/entity_test_mul/{entity_test_mul}",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
index 055e290..887535a 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulChanged.php
@@ -42,6 +42,7 @@
  *     "langcode" = "langcode"
  *   },
  *   links = {
+ *     "add-form" = "/entity_test_mul_changed/add",
  *     "canonical" = "/entity_test_mul_changed/manage/{entity_test_mul_changed}",
  *     "edit-form" = "/entity_test_mul_changed/manage/{entity_test_mul_changed}/edit",
  *     "delete-form" = "/entity_test/delete/entity_test_mul_changed/{entity_test_mul_changed}",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
index 3f794e5..56e3bba 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulLangcodeKey.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\entity_test\Entity;
 
-use Drupal\Core\Entity\EntityTypeInterface;
-
 /**
  * Defines a test entity class using a custom langcode entity key.
  *
@@ -41,6 +39,7 @@
  *     "default_langcode" = "custom_default_langcode_key",
  *   },
  *   links = {
+ *     "add-form" = "/entity_test_mul_langcode_key/add",
  *     "canonical" = "/entity_test_mul_langcode_key/manage/{entity_test_mul_langcode_key}",
  *     "edit-form" = "/entity_test_mul_langcode_key/manage/{entity_test_mul_langcode_key}/edit",
  *     "delete-form" = "/entity_test/delete/entity_test_mul_langcode_key/{entity_test_mul_langcode_key}",
@@ -50,14 +49,4 @@
  */
 class EntityTestMulLangcodeKey extends EntityTest {
 
-  /**
-   * {@inheritdoc}
-   */
-  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields = parent::baseFieldDefinitions($entity_type);
-    $fields['custom_langcode_key'] = $fields['langcode'];
-    unset($fields['langcode']);
-    return $fields;
-  }
-
 }
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
index 1eb7715..eaab7ac 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRev.php
@@ -41,6 +41,7 @@
  *     "langcode" = "langcode",
  *   },
  *   links = {
+ *     "add-form" = "/entity_test_mulrev/add",
  *     "canonical" = "/entity_test_mulrev/manage/{entity_test_mulrev}",
  *     "delete-form" = "/entity_test/delete/entity_test_mulrev/{entity_test_mulrev}",
  *     "edit-form" = "/entity_test_mulrev/manage/{entity_test_mulrev}/edit",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php
index f2a9667..316e206 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestMulRevChanged.php
@@ -43,6 +43,7 @@
  *     "langcode" = "langcode",
  *   },
  *   links = {
+ *     "add-form" = "/entity_test_mulrev_changed/add",
  *     "canonical" = "/entity_test_mulrev_changed/manage/{entity_test_mulrev_changed}",
  *     "delete-form" = "/entity_test/delete/entity_test_mulrev_changed/{entity_test_mulrev_changed}",
  *     "edit-form" = "/entity_test_mulrev_changed/manage/{entity_test_mulrev_changed}/edit",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoId.php
index a29c1e2..bc0661e 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoId.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoId.php
@@ -19,7 +19,11 @@
  *   entity_keys = {
  *     "bundle" = "type",
  *   },
+ *   admin_permission = "administer entity_test content",
  *   field_ui_base_route = "entity.entity_test_no_id.admin_form",
+ *   links = {
+ *     "add-form" = "/entity_test_no_id/add",
+ *   },
  * )
  */
 class EntityTestNoId extends EntityTest {
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
index 047b85d..7aed50a 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestRev.php
@@ -42,6 +42,7 @@
  *     "langcode" = "langcode",
  *   },
  *   links = {
+ *     "add-form" = "/entity_test_rev/add",
  *     "canonical" = "/entity_test_rev/manage/{entity_test_rev}",
  *     "delete-form" = "/entity_test/delete/entity_test_rev/{entity_test_rev}",
  *     "edit-form" = "/entity_test_rev/manage/{entity_test_rev}/edit",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
index 1f53e04..41f793c 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestStringId.php
@@ -34,6 +34,7 @@
  *   },
  *   links = {
  *     "canonical" = "/entity_test_string_id/manage/{entity_test_string_id}",
+ *     "add-form" = "/entity_test_string_id/add",
  *     "edit-form" = "/entity_test_string_id/manage/{entity_test_string_id}",
  *   },
  *   field_ui_base_route = "entity.entity_test_string_id.admin_form",
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
index bc83ceb..7381587 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestViewBuilder.php
@@ -21,8 +21,10 @@
  *   render_cache = FALSE,
  *   entity_keys = {
  *     "id" = "id",
+ *     "uuid" = "uuid",
  *     "label" = "name",
- *     "bundle" = "type"
+ *     "bundle" = "type",
+ *     "langcode" = "langcode",
  *   }
  * )
  */
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php
new file mode 100644
index 0000000..c06c8e3
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithBundle.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\Entity\EntityTestWithBundle.
+ */
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Defines the Test entity with bundle entity class.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_with_bundle",
+ *   label = @Translation("Test entity with bundle"),
+ *   handlers = {
+ *     "list_builder" = "Drupal\entity_test\EntityTestListBuilder",
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
+ *     "access" = "\Drupal\Core\Entity\EntityAccessControlHandler",
+ *     "form" = {
+ *       "default" = "\Drupal\Core\Entity\ContentEntityForm",
+ *       "delete" = "\Drupal\Core\Entity\EntityDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   base_table = "entity_test_with_bundle",
+ *   admin_permission = "administer entity_test_with_bundle content",
+ *   persistent_cache = FALSE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *   },
+ *   bundle_entity_type = "entity_test_bundle",
+ *   links = {
+ *     "canonical" = "/entity_test_with_bundle/{entity_test_with_bundle}",
+ *     "add-page" = "/entity_test_with_bundle/add",
+ *     "add-form" = "/entity_test_with_bundle/add/{entity_test_bundle}",
+ *     "edit-form" = "/entity_test_with_bundle/{entity_test_with_bundle}/edit",
+ *     "delete-form" = "/entity_test_with_bundle/{entity_test_with_bundle}/delete",
+ *   },
+ * )
+ */
+class EntityTestWithBundle extends ContentEntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Name'))
+      ->setDescription(t('The name of the test entity.'))
+      ->setTranslatable(TRUE)
+      ->setSetting('max_length', 32)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'string',
+        'weight' => -5,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -5,
+      ]);
+    return $fields;
+  }
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithRevisionLog.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithRevisionLog.php
new file mode 100644
index 0000000..2216f1f
--- /dev/null
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestWithRevisionLog.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity_test\Entity\EntityTestWithRevisionLog.
+ */
+
+namespace Drupal\entity_test\Entity;
+
+use Drupal\Core\Entity\RevisionableContentEntityBase;
+
+/**
+ * Defines the test entity class.
+ *
+ * @ContentEntityType(
+ *   id = "entity_test_revlog",
+ *   label = @Translation("Test entity - revisions log"),
+ *   handlers = {
+ *     "access" = "Drupal\entity_test\EntityTestAccessControlHandler",
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
+ *     "form" = {
+ *       "default" = "Drupal\entity_test\EntityTestForm",
+ *       "delete" = "Drupal\entity_test\EntityTestDeleteForm"
+ *     },
+ *     "view_builder" = "Drupal\entity_test\EntityTestViewBuilder",
+ *     "translation" = "Drupal\content_translation\ContentTranslationHandler",
+ *     "views_data" = "Drupal\views\EntityViewsData",
+ *     "route_provider" = {
+ *       "html" = "Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider",
+ *     },
+ *   },
+ *   base_table = "entity_test_revlog",
+ *   revision_table = "entity_test_revlog_revision",
+ *   admin_permission = "administer entity_test content",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *     "revision" = "revision_id",
+ *     "bundle" = "type",
+ *     "label" = "name",
+ *     "langcode" = "langcode",
+ *   },
+ *   links = {
+ *     "canonical" = "/entity_test_revlog/manage/{entity_test_revlog}",
+ *     "delete-form" = "/entity_test/delete/entity_test_revlog/{entity_test_revlog}",
+ *     "edit-form" = "/entity_test_revlog/manage/{entity_test_revlog}/edit",
+ *     "revision" = "/entity_test_revlog/{entity_test_revlog}/revision/{entity_test_revlog_revision}/view",
+ *   }
+ * )
+ */
+class EntityTestWithRevisionLog extends RevisionableContentEntityBase {
+
+}
diff --git a/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php b/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
index bdc3785..7988060 100644
--- a/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
+++ b/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\entity_test\Entity\EntityTestLabel;
 
 /**
  * Defines the access control handler for the test entity type.
@@ -26,6 +27,13 @@
 class EntityTestAccessControlHandler extends EntityAccessControlHandler {
 
   /**
+   * Allows to grant access to just the labels.
+   *
+   * @var bool
+   */
+  protected $viewLabelOperation = TRUE;
+
+  /**
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
@@ -37,7 +45,11 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
       return AccessResult::forbidden();
     }
 
-    if ($operation === 'view') {
+    if ($operation === 'view label' && $entity instanceof EntityTestLabel) {
+      // Viewing the label of the 'entity_test_label' entity type is allowed.
+      return AccessResult::allowed();
+    }
+    elseif (in_array($operation, array('view', 'view label'))) {
       if (!$entity->isDefaultTranslation()) {
         return AccessResult::allowedIfHasPermission($account, 'view test entity translations');
       }
diff --git a/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php b/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
index 8992550..b607f9f 100644
--- a/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
+++ b/core/modules/system/tests/modules/entity_test/src/Routing/EntityTestRoutes.php
@@ -22,17 +22,9 @@ class EntityTestRoutes {
    */
   public function routes() {
     $types = entity_test_entity_types(ENTITY_TEST_TYPES_ROUTING);
-    $types[] = 'entity_test_string_id';
-    $types[] = 'entity_test_no_id';
 
     $routes = array();
     foreach ($types as $entity_type_id) {
-      $routes["entity.$entity_type_id.add_form"] = new Route(
-        "$entity_type_id/add",
-        array('_controller' => '\Drupal\entity_test\Controller\EntityTestController::testAdd', 'entity_type_id' => $entity_type_id),
-        array('_permission' => 'administer entity_test content')
-      );
-
       $routes["entity.$entity_type_id.admin_form"] = new Route(
         "$entity_type_id/structure/{bundle}",
         array('_controller' => '\Drupal\entity_test\Controller\EntityTestController::testAdmin'),
diff --git a/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.info.yml b/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.info.yml
new file mode 100644
index 0000000..665417f
--- /dev/null
+++ b/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.info.yml
@@ -0,0 +1,8 @@
+name: 'Experimental Dependency Test'
+type: module
+description: 'Module with a dependency in the experimental package.'
+package: Testing
+dependencies:
+  - experimental_module_test
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.module b/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.module
new file mode 100644
index 0000000..6136004
--- /dev/null
+++ b/core/modules/system/tests/modules/experimental_module_dependency_test/experimental_module_dependency_test.module
@@ -0,0 +1,6 @@
+<?php
+
+/**
+ * @file
+ * Tests dependencies on an experimental module.
+ */
diff --git a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml
new file mode 100644
index 0000000..6cf19cd
--- /dev/null
+++ b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Experimental Test'
+type: module
+description: 'Module in the experimental package to test experimental functionality.'
+package: Core (Experimental)
+version: 8.y.x-unstable
+core: 8.x
diff --git a/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module
new file mode 100644
index 0000000..ec3ae7f
--- /dev/null
+++ b/core/modules/system/tests/modules/experimental_module_test/experimental_module_test.module
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Experimental Test module to test the Core (Experimental) package.
+ */
+
+use \Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function experimental_module_test_help($route_name, RouteMatchInterface $route_match) {
+
+  switch ($route_name) {
+    case 'help.page.experimental_module_test':
+      // Make the help text conform to core standards. See
+      // \Drupal\system\Tests\Module\InstallUninstallTest::assertHelp().
+      return t('The Experimental Test module is not done yet. It may eat your data, but you can read the <a href=":url">online documentation for the Experimental Test module</a>.', [':url' => 'http://www.example.com']);
+  }
+
+}
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index ee4c137..7114a29 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -104,3 +104,10 @@ function form_test_form_form_test_vertical_tabs_access_form_alter(&$form, &$form
   $form['fieldset1']['#access'] = FALSE;
   $form['container']['#access'] = FALSE;
 }
+
+/**
+ * Ajax callback that returns the form element.
+ */
+function form_test_tableselect_ajax_callback($form, FormStateInterface $form_state) {
+  return $form['tableselect'];
+}
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
index 75234b0..ae57d4e 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestLabelForm.php
@@ -108,7 +108,26 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ),
       '#required' => TRUE,
     );
-
+    $form['form_checkboxes_title_invisible'] = array(
+      '#type' => 'checkboxes',
+      '#title' => 'Checkboxes test invisible',
+      '#title_display' => 'invisible',
+      '#options' => array(
+        'first-checkbox' => 'First checkbox',
+        'second-checkbox' => 'Second checkbox',
+      ),
+      '#required' => TRUE,
+    );
+    $form['form_radios_title_invisible'] = array(
+      '#type' => 'radios',
+      '#title' => 'Radios test invisible',
+      '#title_display' => 'invisible',
+      '#options' => array(
+        'first-radio' => 'First radio',
+        'second-radio' => 'Second radio',
+      ),
+      '#required' => TRUE,
+    );
     return $form;
   }
 
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
index f618c92..5c3b383 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestTableSelectFormBase.php
@@ -34,11 +34,17 @@ function tableselectFormBuilder($form, FormStateInterface $form_state, $element_
     $form['tableselect'] = $element_properties;
 
     $form['tableselect'] += array(
+      '#prefix' => '<div id="tableselect-wrapper">',
+      '#suffix' => '</div>',
       '#type' => 'tableselect',
       '#header' => $header,
       '#options' => $options,
       '#multiple' => FALSE,
       '#empty' => t('Empty text.'),
+      '#ajax' => array(
+        'callback' => 'form_test_tableselect_ajax_callback',
+        'wrapper' => 'tableselect-wrapper',
+      ),
     );
 
     $form['submit'] = array(
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/DerivedToolkit.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/DerivedToolkit.php
new file mode 100644
index 0000000..2df5c2b
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/DerivedToolkit.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\DerivedToolkit.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkit;
+
+/**
+ * Provides a derivative of TestToolkit.
+ *
+ * @ImageToolkit(
+ *   id = "test:derived_toolkit",
+ *   title = @Translation("A dummy toolkit, derivative of 'test'.")
+ * )
+ */
+class DerivedToolkit extends TestToolkit { }
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
new file mode 100644
index 0000000..f3d41c9
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\Bar
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
+
+/**
+ * Builds an image toolkit operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "bar",
+ *   toolkit = "test",
+ *   operation = "invert",
+ *   label = @Translation("Invert"),
+ *   description = @Translation("Bar.")
+ * )
+ */
+class Bar extends OperationBase { }
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
new file mode 100644
index 0000000..1cf5e38
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\Foo
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
+
+/**
+ * Builds an image toolkit operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "foo",
+ *   toolkit = "test",
+ *   operation = "blur",
+ *   label = @Translation("Blur"),
+ *   description = @Translation("Foo.")
+ * )
+ */
+class Foo extends OperationBase { }
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
new file mode 100644
index 0000000..5d129a3
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\FooDerived
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
+
+/**
+ * Builds an image toolkit operation.
+ *
+ * @ImageToolkitOperation(
+ *   id = "foo_derived",
+ *   toolkit = "test:derived_toolkit",
+ *   operation = "blur",
+ *   label = @Translation("Blur Derived"),
+ *   description = @Translation("Foo derived.")
+ * )
+ */
+class FooDerived extends OperationBase { }
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
new file mode 100644
index 0000000..7dc395f
--- /dev/null
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\OperationBase.
+ */
+
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
+
+use Drupal\Core\ImageToolkit\ImageToolkitOperationBase;
+
+/**
+ * Provides a base class for test operations.
+ */
+abstract class OperationBase extends ImageToolkitOperationBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function arguments() {
+    return array();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function execute(array $arguments) {
+    // Nothing to do.
+  }
+
+}
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml b/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
index 86768ee..3d90eb3 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
+++ b/core/modules/system/tests/modules/menu_test/menu_test.links.action.yml
@@ -14,6 +14,8 @@ menu_test.local_action5:
 menu_test.local_action.cache_check:
   route_name: menu_test.local_action5
   class: '\Drupal\menu_test\Plugin\Menu\LocalAction\TestLocalActionWithConfig'
+  cache_tags:
+    - config:menu_test.links.action
   appears_on:
     - menu_test.local_action6
 
diff --git a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php
index 1be1329..92632ef 100644
--- a/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php
+++ b/core/modules/system/tests/modules/menu_test/src/Plugin/Menu/LocalAction/TestLocalActionWithConfig.php
@@ -7,38 +7,15 @@
 
 namespace Drupal\menu_test\Plugin\Menu\LocalAction;
 
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Config\Config;
 use Drupal\Core\Menu\LocalActionDefault;
 use Drupal\Core\Routing\RouteProviderInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Defines a test local action plugin class that has cache tags.
+ * Defines a test local action plugin class.
  */
-class TestLocalActionWithConfig extends LocalActionDefault implements CacheableDependencyInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheContexts() {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheTags() {
-    return ['config:menu_test.links.action'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCacheMaxAge() {
-    return Cache::PERMANENT;
-  }
+class TestLocalActionWithConfig extends LocalActionDefault {
 
   /**
    * @var \Drupal\Core\Config\Config
diff --git a/core/modules/system/tests/modules/module_required_test/module_required_test.module b/core/modules/system/tests/modules/module_required_test/module_required_test.module
index fbb6f10..6ca1759 100644
--- a/core/modules/system/tests/modules/module_required_test/module_required_test.module
+++ b/core/modules/system/tests/modules/module_required_test/module_required_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/core/modules/system/tests/modules/module_test/module_test.implementations.inc b/core/modules/system/tests/modules/module_test/module_test.implementations.inc
index a21f7ca..c0f8a2a 100644
--- a/core/modules/system/tests/modules/module_test/module_test.implementations.inc
+++ b/core/modules/system/tests/modules/module_test/module_test.implementations.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Include file for test module.
+ */
+
+/**
  * Implements hook_altered_test_hook().
  *
  * @see module_test_module_implements_alter()
diff --git a/core/modules/system/tests/modules/module_test/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module
index 2d34293..ab5a4fc 100644
--- a/core/modules/system/tests/modules/module_test/module_test.module
+++ b/core/modules/system/tests/modules/module_test/module_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/core/modules/system/tests/modules/module_test/module_test.post_update.php b/core/modules/system/tests/modules/module_test/module_test.post_update.php
index 2226578..b3785fc 100644
--- a/core/modules/system/tests/modules/module_test/module_test.post_update.php
+++ b/core/modules/system/tests/modules/module_test/module_test.post_update.php
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Post update functions for test module.
+ */
+
+/**
  * Test post update function.
  */
 function module_test_post_update_test() {
diff --git a/core/modules/system/tests/modules/plugin_test_extended/plugin_test_extended.info.yml b/core/modules/system/tests/modules/plugin_test_extended/plugin_test_extended.info.yml
new file mode 100644
index 0000000..f3d0a5b
--- /dev/null
+++ b/core/modules/system/tests/modules/plugin_test_extended/plugin_test_extended.info.yml
@@ -0,0 +1,6 @@
+name: 'Plugin Test Extended'
+type: module
+description: 'Test annotations can extend other annotations in a different namespace.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/Annotation/PluginExtended.php b/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/Annotation/PluginExtended.php
new file mode 100644
index 0000000..d8139e8
--- /dev/null
+++ b/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/Annotation/PluginExtended.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\plugin_test_extended\Plugin\Annotation\PluginExampleExtended
+ */
+
+namespace Drupal\plugin_test_extended\Plugin\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines a test annotation that extends an annotation in another namespace.
+ *
+ * @Annotation
+ */
+class PluginExtended extends Plugin {
+
+}
diff --git a/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/plugin_test/fruit/BigApple.php b/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/plugin_test/fruit/BigApple.php
new file mode 100644
index 0000000..001e405
--- /dev/null
+++ b/core/modules/system/tests/modules/plugin_test_extended/src/Plugin/plugin_test/fruit/BigApple.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\plugin_test_extended\Plugin\plugin_test\fruit\BigApple
+ */
+
+namespace Drupal\plugin_test_extended\Plugin\plugin_test\fruit;
+
+/**
+ * @PluginExtended(
+ *   id = "big_apple",
+ *   label = "Big Apple",
+ *   color = "green"
+ * )
+ */
+class BigApple {
+
+}
diff --git a/core/modules/system/tests/modules/requirements1_test/requirements1_test.install b/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
index 80220b9..c884893 100644
--- a/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
+++ b/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Install hooks for test module.
+ */
+
+/**
  * Implements hook_requirements().
  */
 function requirements1_test_requirements($phase) {
diff --git a/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml b/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
index e0c91dd..ad2d418 100644
--- a/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
+++ b/core/modules/system/tests/modules/router_test_directory/router_test.routing.yml
@@ -155,6 +155,29 @@ router_test.24:
   requirements:
     _access: 'TRUE'
 
+router_test.25:
+  path: '/router_test/test25'
+  defaults:
+    _controller: '\Drupal\router_test\TestControllers::test25'
+  requirements:
+    _access: 'TRUE'
+
+router_test.26:
+  path: '/router_test/test26'
+  defaults:
+    _form: 'Drupal\system\Form\LoggingForm'
+    _title: 'Cron'
+  requirements:
+    _access: 'TRUE'
+
+router_test.27:
+  path: '/router_test/test27'
+  defaults:
+    _entity_form: 'date_format.add'
+    _title: 'Add date format'
+  requirements:
+    _access: 'TRUE'
+
 router_test.hierarchy_parent:
   path: '/menu-test/parent'
   defaults:
diff --git a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
index 40fad0b..d603de8 100644
--- a/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+++ b/core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
@@ -106,6 +106,15 @@ public function test24() {
     throw new \Exception('Escaped content: <p> <br> <h3>');
   }
 
+  public function test25() {
+    return [
+      '#cache' => [
+        'url',
+      ],
+      '#markup' => \Drupal::requestStack()->getCurrentRequest()->getUri(),
+    ];
+  }
+
   /**
    * Throws an exception.
    *
diff --git a/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.info.yml b/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.info.yml
new file mode 100644
index 0000000..b376a57
--- /dev/null
+++ b/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.info.yml
@@ -0,0 +1,6 @@
+name: 'session.exists cache context test'
+type: module
+description: 'Support module for session.exists cache context testing.'
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.module b/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.module
new file mode 100644
index 0000000..60d2452
--- /dev/null
+++ b/core/modules/system/tests/modules/session_exists_cache_context_test/session_exists_cache_context_test.module
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Test module.
+ */
+
+/**
+ * Implements hook_page_top().
+ */
+function session_exists_cache_context_test_page_top(array &$page_top) {
+  // Ensure this hook is invoked on every page load.
+  $page_top['#cache']['max-age'] = 0;
+
+  $request = \Drupal::request();
+  $session_exists = \Drupal::service('session_configuration')->hasSession($request);
+  $page_top['session_exists_cache_context_test'] = [
+    'label' => [
+      '#markup' => '<p>' . ($session_exists ? 'Session exists!' : 'Session does not exist!') . '</p>',
+    ],
+    'cache_context_value' => [
+      '#markup' => '<code>[session.exists]=' . \Drupal::service('cache_context.session.exists')->getContext() . '</code>',
+    ],
+  ];
+
+  if (\Drupal::request()->query->get('trigger_session')) {
+    $_SESSION['session_exists_cache_context_test'] = TRUE;
+  }
+}
diff --git a/core/modules/system/tests/modules/session_test/session_test.module b/core/modules/system/tests/modules/session_test/session_test.module
index 6a08211..b3ceff8 100644
--- a/core/modules/system/tests/modules/session_test/session_test.module
+++ b/core/modules/system/tests/modules/session_test/session_test.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Test module.
+ */
+
+/**
  * Implements hook_user_login().
  */
 function session_test_user_login($account) {
diff --git a/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php b/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
index 1d8c7b6..f171efd 100644
--- a/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
+++ b/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
@@ -251,7 +251,7 @@ public static function preRenderCacheTags($elements) {
    */
   public function authorizeInit($page_title) {
     $authorize_url = Url::fromUri('base:core/authorize.php', array('absolute' => TRUE))->toString();
-    system_authorized_init('system_test_authorize_run', drupal_get_path('module', 'system_test') . '/system_test.module', array(), $page_title);
+    system_authorized_init('system_test_authorize_run', __DIR__ . '/../../system_test.module', array(), $page_title);
     return new RedirectResponse($authorize_url);
   }
 
diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module
index eef3516..04fa2da 100644
--- a/core/modules/system/tests/modules/system_test/system_test.module
+++ b/core/modules/system/tests/modules/system_test/system_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Extension\Extension;
 use Drupal\Core\Routing\RouteMatchInterface;
 
diff --git a/core/modules/system/tests/modules/system_test/system_test.routing.yml b/core/modules/system/tests/modules/system_test/system_test.routing.yml
index a933048..a91e83b 100644
--- a/core/modules/system/tests/modules/system_test/system_test.routing.yml
+++ b/core/modules/system/tests/modules/system_test/system_test.routing.yml
@@ -159,3 +159,19 @@ system_test.date:
     no_cache: 'TRUE'
   requirements:
     _access: 'TRUE'
+
+system_test.custom_4xx_with_limited_access:
+  path: '/system-test/custom-4xx'
+  defaults:
+    _title: 'Admin-only 4xx response'
+    _controller: '\Drupal\system_test\Controller\SystemTestController::mainContentFallback'
+  requirements:
+    _role: 'administrator'
+
+system_test.always_denied:
+  path: '/system-test/always-denied'
+  defaults:
+    _title: 'Always denied'
+    _controller: 'chop'
+  requirements:
+    _access: 'FALSE'
diff --git a/core/modules/system/tests/modules/theme_page_test/theme_page_test.module b/core/modules/system/tests/modules/theme_page_test/theme_page_test.module
index 7373fab..89e2c57 100644
--- a/core/modules/system/tests/modules/theme_page_test/theme_page_test.module
+++ b/core/modules/system/tests/modules/theme_page_test/theme_page_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.inc b/core/modules/system/tests/modules/theme_test/theme_test.inc
index 6cde683..1e0a7a6 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.inc
+++ b/core/modules/system/tests/modules/theme_test/theme_test.inc
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Include file for test module.
+ */
+
+/**
  * Returns HTML for the 'theme_test' theme hook used by tests.
  */
 function theme_theme_test($variables) {
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module
index f64da1e..540185e 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.services.yml b/core/modules/system/tests/modules/theme_test/theme_test.services.yml
index 482c219..271fd4b 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.services.yml
+++ b/core/modules/system/tests/modules/theme_test/theme_test.services.yml
@@ -1,7 +1,7 @@
 services:
   theme_test.subscriber:
     class: Drupal\theme_test\EventSubscriber\ThemeTestSubscriber
-    arguments: [@current_route_match, @renderer]
+    arguments: ['@current_route_match', '@renderer']
     tags:
       - { name: event_subscriber }
 
diff --git a/core/modules/system/tests/modules/twig_loader_test/src/Loader/TestLoader.php b/core/modules/system/tests/modules/twig_loader_test/src/Loader/TestLoader.php
index 9f32969..ec6c038 100644
--- a/core/modules/system/tests/modules/twig_loader_test/src/Loader/TestLoader.php
+++ b/core/modules/system/tests/modules/twig_loader_test/src/Loader/TestLoader.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\twig_loader_test\Loader;
 
-use Drupal\Core\Template\Loader;
-
 /**
  * A test Twig loader.
  */
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index cba0d5b..0d6bad8 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Test module.
+ */
+
+/**
  * Implements hook_theme().
  */
 function twig_theme_test_theme($existing, $type, $theme, $path) {
diff --git a/core/modules/system/tests/modules/update_test_failing/update_test_failing.post_update.php b/core/modules/system/tests/modules/update_test_failing/update_test_failing.post_update.php
index 5e55ca3..12b60f6 100644
--- a/core/modules/system/tests/modules/update_test_failing/update_test_failing.post_update.php
+++ b/core/modules/system/tests/modules/update_test_failing/update_test_failing.post_update.php
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Post update functions for test module.
+ */
+
+/**
  * First update, should not be run since this module's update hooks fail.
  */
 function update_test_failing_post_update_first() {
diff --git a/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.install b/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.install
index f754d94..17158be 100644
--- a/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.install
+++ b/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.install
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Install hooks for test module.
+ */
+
+/**
  * Normal update_N() function.
  */
 function update_test_postupdate_update_8001() {
diff --git a/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.post_update.php b/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.post_update.php
index ece8b7e..cddad74 100644
--- a/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.post_update.php
+++ b/core/modules/system/tests/modules/update_test_postupdate/update_test_postupdate.post_update.php
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Post update functions for test module.
+ */
+
+/**
  * First update.
  */
 function update_test_postupdate_post_update_first() {
diff --git a/core/modules/system/tests/modules/url_alter_test/url_alter_test.install b/core/modules/system/tests/modules/url_alter_test/url_alter_test.install
index edfa7f0..0237a9e 100644
--- a/core/modules/system/tests/modules/url_alter_test/url_alter_test.install
+++ b/core/modules/system/tests/modules/url_alter_test/url_alter_test.install
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Install hooks for test module.
+ */
+
+/**
  * Implements hook_install().
  */
 function url_alter_test_install() {
diff --git a/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php b/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
index f0b650e..24b4d54 100644
--- a/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
+++ b/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use \Drupal\Core\Extension\ModuleUninstallValidatorException;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -88,7 +89,7 @@ function testModuleList() {
    *   The expected values, sorted by weight and module name.
    * @param $condition
    */
-  protected function assertModuleList(Array $expected_values, $condition) {
+  protected function assertModuleList(array $expected_values, $condition) {
     $expected_values = array_values(array_unique($expected_values));
     $enabled_modules = array_keys($this->container->get('module_handler')->getModuleList());
     $this->assertEqual($expected_values, $enabled_modules, format_string('@condition: extension handler returns correct results', array('@condition' => $condition)));
@@ -238,7 +239,7 @@ function testUninstallContentDependency() {
     drupal_static_reset('system_rebuild_module_data');
 
     // Create an entity so that the modules can not be disabled.
-    $entity = entity_create('entity_test', array('name' => $this->randomString()));
+    $entity = EntityTest::create(array('name' => $this->randomString()));
     $entity->save();
 
     // Uninstalling entity_test is not possible when there is content.
diff --git a/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
new file mode 100644
index 0000000..0c2f85b
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\MigrateMenuTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\system\Entity\Menu;
+
+/**
+ * Upgrade menus to system.menu.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateMenuTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('menu');
+  }
+
+  /**
+   * Tests the Drupal 6 menu to Drupal 8 migration.
+   */
+  public function testMenu() {
+    $navigation_menu = Menu::load('navigation');
+    $this->assertIdentical('navigation', $navigation_menu->id());
+    $this->assertIdentical('Navigation', $navigation_menu->label());
+    $expected = <<<EOT
+The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.
+EOT;
+    $this->assertIdentical($expected, $navigation_menu->getDescription());
+
+    // Test that we can re-import using the ConfigEntityBase destination.
+    Database::getConnection('default', 'migrate')
+      ->update('menu_custom')
+      ->fields(array('title' => 'Home Navigation'))
+      ->condition('menu_name', 'navigation')
+      ->execute();
+
+    $migration = $this->getMigration('menu');
+    \Drupal::database()
+        ->truncate($migration->getIdMap()->mapTableName())
+        ->execute();
+    $this->executeMigration($migration);
+
+    $navigation_menu = Menu::load('navigation');
+    $this->assertIdentical('Home Navigation', $navigation_menu->label());
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
new file mode 100644
index 0000000..19dfe26
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateDateFormatTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateDateFormatTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade date formats to core.date_format.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateDateFormatTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_date_formats');
+  }
+
+  /**
+   * Tests the Drupal 6 date formats to Drupal 8 migration.
+   */
+  public function testDateFormats() {
+    $short_date_format = DateFormat::load('short');
+    $this->assertIdentical('\S\H\O\R\T m/d/Y - H:i', $short_date_format->getPattern());
+
+    $medium_date_format = DateFormat::load('medium');
+    $this->assertIdentical('\M\E\D\I\U\M D, m/d/Y - H:i', $medium_date_format->getPattern());
+
+    $long_date_format = DateFormat::load('long');
+    $this->assertIdentical('\L\O\N\G l, F j, Y - H:i', $long_date_format->getPattern());
+
+    // Test that we can re-import using the EntityDateFormat destination.
+    Database::getConnection('default', 'migrate')
+      ->update('variable')
+      ->fields(array('value' => serialize('\S\H\O\R\T d/m/Y - H:i')))
+      ->condition('name', 'date_format_short')
+      ->execute();
+
+    $migration = $this->getMigration('d6_date_formats');
+    \Drupal::database()
+      ->truncate($migration->getIdMap()->mapTableName())
+      ->execute();
+
+    $this->executeMigration($migration);
+
+    $short_date_format = DateFormat::load('short');
+    $this->assertIdentical('\S\H\O\R\T d/m/Y - H:i', $short_date_format->getPattern());
+
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
new file mode 100644
index 0000000..29b5522
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemCronTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemCronTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade cron variable to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemCronTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_cron');
+  }
+
+  /**
+   * Tests migration of system (cron) variables to system.cron.yml.
+   */
+  public function testSystemCron() {
+    $config = $this->config('system.cron');
+    $this->assertIdentical(172800, $config->get('threshold.requirements_warning'));
+    $this->assertIdentical(1209600, $config->get('threshold.requirements_error'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
new file mode 100644
index 0000000..71d4ef3
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemDateTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemDateTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade date time variables to system.date config
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemDateTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_date');
+  }
+
+  /**
+   * Tests migration of user variables to system_date.yml.
+   */
+  public function testSystemDate() {
+    $config = $this->config('system.date');
+    $this->assertIdentical(4, $config->get('first_day'));
+    $this->assertIdentical(FALSE, $config->get('timezone.user.configurable'));
+    $this->assertIdentical("Europe/Paris", $config->get('timezone.default'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
new file mode 100644
index 0000000..7312168
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemFileTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemFileTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemFileTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_file');
+  }
+
+  /**
+   * Tests migration of system (file) variables to system.file.yml.
+   */
+  public function testSystemFile() {
+    $config = \Drupal::configFactory()->getEditable('system.file');
+    $this->assertIdentical('files/temp', $config->get('path.temporary'));
+    $this->assertIdentical(TRUE, $config->get('allow_insecure_uploads'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
new file mode 100644
index 0000000..1b8ed5d
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageGdTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemImageGdTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade image gd variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemImageGdTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_image_gd');
+  }
+
+  /**
+   * Tests migration of system (image GD) variables to system.image.gd.yml.
+   */
+  public function testSystemImageGd() {
+    $config = $this->config('system.image.gd');
+    $this->assertIdentical(75, $config->get('jpeg_quality'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
new file mode 100644
index 0000000..655c1df
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemImageTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemImageTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade image variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemImageTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_image');
+  }
+
+  /**
+   * Tests migration of system (image) variables to system.image.yml.
+   */
+  public function testSystemImage() {
+    $config = $this->config('system.image');
+    $this->assertIdentical('gd', $config->get('toolkit'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
new file mode 100644
index 0000000..36c01ff
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemLoggingTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade error_level variable to system.logging.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemLoggingTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_logging');
+  }
+
+  /**
+   * Tests migration of system error_level variables to system.logging.yml.
+   */
+  public function testSystemLogging() {
+    $config = $this->config('system.logging');
+    $this->assertIdentical('some', $config->get('error_level'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'system.logging', $config->get());
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
new file mode 100644
index 0000000..03be109
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemMaintenanceTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade maintenance variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_maintenance');
+  }
+
+  /**
+   * Tests migration of system (maintenance) variables to system.maintenance.yml.
+   */
+  public function testSystemMaintenance() {
+    $config = $this->config('system.maintenance');
+    $this->assertIdentical('Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.', $config->get('message'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
new file mode 100644
index 0000000..33f8b50
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemPerformanceTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemPerformanceTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade performance variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_performance');
+  }
+
+  /**
+   * Tests migration of system (Performance) variables to system.performance.yml.
+   */
+  public function testSystemPerformance() {
+    $config = $this->config('system.performance');
+    $this->assertIdentical(FALSE, $config->get('css.preprocess'));
+    $this->assertIdentical(FALSE, $config->get('js.preprocess'));
+    $this->assertIdentical(0, $config->get('cache.page.max_age'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
new file mode 100644
index 0000000..0c4a75a
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemRssTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemRssTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade rss variable to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemRssTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_rss');
+  }
+
+  /**
+   * Tests migration of system (rss) variables to system.rss.yml.
+   */
+  public function testSystemRss() {
+    $config = $this->config('system.rss');
+    $this->assertIdentical(10, $config->get('items.limit'));
+    $this->assertIdentical('title', $config->get('items.view_mode'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
new file mode 100644
index 0000000..eac379e
--- /dev/null
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\system\Kernel\Migrate\d6\MigrateSystemSiteTest.
+ */
+
+namespace Drupal\Tests\system\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade site variables to system.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateSystemSiteTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_system_site');
+  }
+
+  /**
+   * Tests migration of system (site) variables to system.site.yml.
+   */
+  public function testSystemSite() {
+    $config = $this->config('system.site');
+    $this->assertIdentical('site_name', $config->get('name'));
+    $this->assertIdentical('site_mail@example.com', $config->get('mail'));
+    $this->assertIdentical('Migrate rocks', $config->get('slogan'));
+    $this->assertIdentical('/user', $config->get('page.403'));
+    $this->assertIdentical('/page-not-found', $config->get('page.404'));
+    $this->assertIdentical('/node', $config->get('page.front'));
+    $this->assertIdentical(FALSE, $config->get('admin_compact_mode'));
+  }
+
+}
diff --git a/core/modules/system/tests/src/Kernel/PathHooksTest.php b/core/modules/system/tests/src/Kernel/PathHooksTest.php
index 272875b..594a6fe 100644
--- a/core/modules/system/tests/src/Kernel/PathHooksTest.php
+++ b/core/modules/system/tests/src/Kernel/PathHooksTest.php
@@ -26,8 +26,6 @@ class PathHooksTest extends KernelTestBase {
    * Test system_path_*() correctly clears caches.
    */
   public function testPathHooks() {
-    $this->installSchema('system', ['url_alias']);
-
     $source = '/' . $this->randomMachineName();
     $alias = '/' . $this->randomMachineName();
 
diff --git a/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php b/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
index 47804ab..de76f49 100644
--- a/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
+++ b/core/modules/system/tests/src/Kernel/PhpStorage/PhpStorageFactoryTest.php
@@ -65,18 +65,28 @@ public function testGetOverride() {
     $this->setSettings('test', array('bin' => NULL));
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
-    $this->assertIdentical('test', $php->getConfigurationValue('bin'), 'Name value was used for bin.');
+    $this->assertSame('test', $php->getConfigurationValue('bin'), 'Name value was used for bin.');
 
     // Test that a default directory is set if it's empty.
     $this->setSettings('test', array('directory' => NULL));
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MockPhpStorage, 'An MockPhpStorage instance was returned from overridden settings.');
-    $this->assertIdentical(PublicStream::basePath() . '/php', $php->getConfigurationValue('directory'), 'Default file directory was used.');
+    $this->assertSame(PublicStream::basePath() . '/php', $php->getConfigurationValue('directory'), 'Default file directory was used.');
 
     // Test that a default storage class is set if it's empty.
     $this->setSettings('test', array('class' => NULL));
     $php = PhpStorageFactory::get('test');
     $this->assertTrue($php instanceof MTimeProtectedFileStorage, 'An MTimeProtectedFileStorage instance was returned from overridden settings with no class.');
+
+    // Test that a default secret is not returned if it's set in the override.
+    $this->setSettings('test');
+    $php = PhpStorageFactory::get('test');
+    $this->assertNotEquals('mock hash salt', $php->getConfigurationValue('secret'), 'The default secret is not used if a secret is set in the overridden settings.');
+
+    // Test that a default secret is set if it's empty.
+    $this->setSettings('test', array('secret' => NULL));
+    $php = PhpStorageFactory::get('test');
+    $this->assertSame('mock hash salt', $php->getConfigurationValue('secret'), 'The default secret is used if one is not set in the overridden settings.');
   }
 
   /**
@@ -94,6 +104,7 @@ protected function setSettings($name = 'default', array $configuration = array()
       'secret' => $this->randomString(),
       'bin' => 'test',
     );
+    $settings['hash_salt'] = 'mock hash salt';
     new Settings($settings);
   }
 
diff --git a/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
index b58d408..885314e 100644
--- a/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
+++ b/core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php
@@ -35,7 +35,8 @@ protected function setUp() {
       $this->markTestSkipped("Skipping test since the DbDumpCommand is currently only compatible with MySQL");
     }
 
-    $this->installSchema('system', 'router');
+    // Rebuild the router to ensure a routing table.
+    \Drupal::service('router.builder')->rebuild();
 
     /** @var \Drupal\Core\Database\Connection $connection */
     $connection = $this->container->get('database');
diff --git a/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
index 8cf23d5..446d3d8 100644
--- a/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
+++ b/core/modules/system/tests/src/Kernel/Scripts/DbImportCommandTest.php
@@ -42,7 +42,6 @@ class DbImportCommandTest extends KernelTestBase {
     'key_value_expire',
     'menu_link_content',
     'menu_link_content_data',
-    'semaphore',
     'sessions',
     'url_alias',
     'user__roles',
diff --git a/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme b/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
index 1467e49..42e543b 100644
--- a/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
+++ b/core/modules/system/tests/themes/test_basetheme/test_basetheme.theme
@@ -4,6 +4,7 @@
  * @file
  * Add hooks for tests to use.
  */
+
 use Drupal\views\Plugin\views\cache\CachePluginBase;
 use Drupal\views\ViewExecutable;
 
diff --git a/core/modules/system/tests/themes/test_theme/test_theme.info.yml b/core/modules/system/tests/themes/test_theme/test_theme.info.yml
index fca49c2..1c9745f 100644
--- a/core/modules/system/tests/themes/test_theme/test_theme.info.yml
+++ b/core/modules/system/tests/themes/test_theme/test_theme.info.yml
@@ -15,7 +15,7 @@ version: VERSION
 base theme: classy
 core: 8.x
 stylesheets-remove:
-  - '@system/css/system.module.css'
+  - '@system/css/js.module.css'
 libraries:
   - test_theme/global-styling
 libraries-override:
diff --git a/core/modules/system/tests/themes/test_theme_nyan_cat_engine/test_theme_nyan_cat_engine.theme b/core/modules/system/tests/themes/test_theme_nyan_cat_engine/test_theme_nyan_cat_engine.theme
index 5b69a12..ee2748a 100644
--- a/core/modules/system/tests/themes/test_theme_nyan_cat_engine/test_theme_nyan_cat_engine.theme
+++ b/core/modules/system/tests/themes/test_theme_nyan_cat_engine/test_theme_nyan_cat_engine.theme
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Test theme.
+ */
+
+/**
  * Implements hook_preprocess_theme_test_template_test().
  */
 function test_theme_nyan_cat_engine_preprocess_theme_test_template_test(&$variables) {
diff --git a/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml
deleted file mode 100644
index 8fc72ef..0000000
--- a/core/modules/taxonomy/config/schema/taxonomy.source.schema.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Schema for the migration source plugins.
-
-migrate.source.d6_taxonomy_vocabulary:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_taxonomy_vocabulary_per_type:
-  type: migrate_source_sql
-  label: 'Drupal 6 field instance form display'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.d6_term_node:
-  type: migrate_source_sql
-  label: 'Drupal 6 terms per node'
-  mapping:
-    vid:
-      type: integer
-      label: 'Vocabulary ID'
-
-migrate.source.d6_term_node_revision:
-  type: migrate_source_sql
-  label: 'Drupal 6 terms per node revision'
-  mapping:
-    vid:
-      type: integer
-      label: 'Vocabulary ID'
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node.yml b/core/modules/taxonomy/migration_templates/d6_term_node.yml
index 349bcd3..63aec85 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node.yml
@@ -2,15 +2,14 @@ id: d6_term_node
 label: Term/node relationships
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_term_node
+deriver: Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver
 source:
   plugin: d6_term_node
 process:
   nid:
     -
       plugin: migration
-      migration: d6_node:*
+      migration: d6_node
       source: nid
     -
       plugin: skip_on_empty
@@ -23,4 +22,4 @@ migration_dependencies:
   required:
     - d6_vocabulary_entity_display
     - d6_vocabulary_entity_form_display
-    - d6_node:*
+    - d6_node
diff --git a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
index 06e801a..cf1c682 100644
--- a/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
+++ b/core/modules/taxonomy/migration_templates/d6_term_node_revision.yml
@@ -2,15 +2,14 @@ id: d6_term_node_revision
 label: Term/node relationship revisions
 migration_tags:
   - Drupal 6
-builder:
-  plugin: d6_term_node
+deriver: Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver
 source:
   plugin: d6_term_node_revision
 process:
   vid:
     -
       plugin: migration
-      migration: d6_node:*
+      migration: d6_node
       source: vid
     -
       plugin: skip_on_empty
@@ -21,5 +20,5 @@ destination:
   plugin: entity_revision:node
 migration_dependencies:
   required:
-    - d6_term_node:*
-    - d6_node_revision:*
+    - d6_term_node
+    - d6_node_revision
diff --git a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
index 995a6f6..f9bb737 100644
--- a/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
+++ b/core/modules/taxonomy/src/Plugin/EntityReferenceSelection/TermSelection.php
@@ -39,13 +39,7 @@ public function entityQueryAlter(SelectInterface $query) {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
 
-    $form['target_bundles']['#title'] = $this->t('Vocabularies');
-    // @todo: Currently allow auto-create only on taxonomy terms.
-    $form['auto_create'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t("Create referenced entities if they don't already exist"),
-      '#default_value' => isset($this->configuration['handler_settings']['auto_create']) ? $this->configuration['handler_settings']['auto_create'] : FALSE,
-    );
+    $form['target_bundles']['#title'] = $this->t('Available Vocabularies');
 
     // Sorting is not possible for taxonomy terms because we use
     // \Drupal\taxonomy\TermStorageInterface::loadTree() to retrieve matches.
diff --git a/core/modules/taxonomy/src/Plugin/migrate/D6TermNodeDeriver.php b/core/modules/taxonomy/src/Plugin/migrate/D6TermNodeDeriver.php
new file mode 100644
index 0000000..245c026
--- /dev/null
+++ b/core/modules/taxonomy/src/Plugin/migrate/D6TermNodeDeriver.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Plugin\migrate\D6TermNodeDeriver.
+ */
+
+namespace Drupal\taxonomy\Plugin\migrate;
+
+use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\migrate\Plugin\MigrationDeriverTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Deriver for Drupal 6 term node migrations based on vocabularies.
+ */
+class D6TermNodeDeriver extends DeriverBase implements ContainerDeriverInterface {
+  use MigrationDeriverTrait;
+
+  /**
+   * The base plugin ID this derivative is for.
+   *
+   * @var string
+   */
+  protected $basePluginId;
+
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\Component\Plugin\PluginManagerInterface
+   */
+  protected $migrationPluginManager;
+
+  /**
+   * D6TermNodeDeriver constructor.
+   *
+   * @param string $base_plugin_id
+   *   The base plugin ID this derivative is for.
+   * @param \Drupal\Component\Plugin\PluginManagerInterface $migration_plugin_manager
+   *   The migration plugin manager.
+   */
+  public function __construct($base_plugin_id, PluginManagerInterface $migration_plugin_manager) {
+    $this->basePluginId = $base_plugin_id;
+    $this->migrationPluginManager = $migration_plugin_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, $base_plugin_id) {
+    return new static(
+      $base_plugin_id,
+      $container->get('plugin.manager.migration')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition, $base_plugin_definitions = NULL) {
+    try {
+      foreach (static::getSourcePlugin('d6_taxonomy_vocabulary') as $row) {
+        $source_vid = $row->getSourceProperty('vid');
+        $definition = $base_plugin_definition;
+        $definition['source']['vid'] = $source_vid;
+        // migrate_drupal_migration_plugins_alter() adds to this definition.
+        $this->derivatives[$source_vid] = $definition;
+      }
+    }
+    catch (\Exception $e) {
+      // It is possible no D6 tables are loaded so just eat exceptions.
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/core/modules/taxonomy/src/Plugin/migrate/builder/d6/TermNode.php b/core/modules/taxonomy/src/Plugin/migrate/builder/d6/TermNode.php
deleted file mode 100644
index d64ee23..0000000
--- a/core/modules/taxonomy/src/Plugin/migrate/builder/d6/TermNode.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Plugin\migrate\builder\d6\TermNode.
- */
-
-namespace Drupal\taxonomy\Plugin\migrate\builder\d6;
-
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessage;
-use Drupal\migrate\MigrateTemplateStorageInterface;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * @PluginID("d6_term_node")
- */
-class TermNode extends BuilderBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The migration template storage service.
-   *
-   * @var \Drupal\migrate\MigrateTemplateStorage
-   */
-  protected $templateStorage;
-
-  /**
-   * Constructs a TermNode builder.
-   *
-   * @param array $configuration
-   *   Plugin configuration.
-   * @param string $plugin_id
-   *   The plugin ID.
-   * @param mixed $plugin_definition
-   *   The plugin definition.
-   * @param \Drupal\migrate\MigrateTemplateStorageInterface $template_storage
-   *   The migration template storage handler.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrateTemplateStorageInterface $template_storage) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->templateStorage = $template_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('migrate.template_storage')
-    );
-  }
-
-  /**
-   * Builds a map of source vocabulary IDs to expected destination IDs.
-   *
-   * @param array $source
-   *   Additional configuration for the d6_taxonomy_vocabulary source.
-   *
-   * @return array
-   *   The vid map. The keys are the source IDs and the values are the
-   *   (expected) destination IDs.
-   */
-  protected function getVocabularyIdMap(array $source) {
-    $map = [];
-
-    $template = $this->templateStorage->getTemplateByName('d6_taxonomy_vocabulary');
-    $template['source'] += $source;
-
-    $migration = Migration::create($template);
-    $executable = new MigrateExecutable($migration, new MigrateMessage());
-    // Only process the destination ID properties.
-    $process = array_intersect_key($template['process'], $migration->getDestinationPlugin()->getIds());
-
-    foreach ($migration->getSourcePlugin() as $source_row) {
-      // Process the row to generate the expected destination ID.
-      $executable->processRow($source_row, $process);
-      $map[$source_row->getSourceProperty('vid')] = $source_row->getDestinationProperty('vid');
-    }
-
-    return $map;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migrations = [];
-
-    foreach ($this->getVocabularyIdMap($template['source']) as $source_vid => $destination_vid) {
-      $values = $template;
-      $values['id'] .= '__' . $source_vid;
-      $values['source']['vid'] = $source_vid;
-      $migration = Migration::create($values);
-      $migration->setProcessOfProperty($destination_vid, 'tid');
-      $migrations[] = $migration;
-    }
-
-    return $migrations;
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
index d6de1ec..098cc2c 100644
--- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
+++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\taxonomy\Plugin\migrate\cckfield;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
 /**
diff --git a/core/modules/taxonomy/src/TermViewsData.php b/core/modules/taxonomy/src/TermViewsData.php
index 9a42a84..618b4d7 100644
--- a/core/modules/taxonomy/src/TermViewsData.php
+++ b/core/modules/taxonomy/src/TermViewsData.php
@@ -20,7 +20,7 @@ class TermViewsData extends EntityViewsData {
   public function getViewsData() {
     $data = parent::getViewsData();
 
-    $data['taxonomy_term_field_data']['table']['base']['help'] = t('Taxonomy terms are attached to nodes.');
+    $data['taxonomy_term_field_data']['table']['base']['help'] = $this->t('Taxonomy terms are attached to nodes.');
     $data['taxonomy_term_field_data']['table']['base']['access query tag'] = 'term_access';
     $data['taxonomy_term_field_data']['table']['wizard_id'] = 'taxonomy_term';
 
@@ -32,21 +32,21 @@ public function getViewsData() {
       ),
     );
 
-    $data['taxonomy_term_field_data']['tid']['help'] = t('The tid of a taxonomy term.');
+    $data['taxonomy_term_field_data']['tid']['help'] = $this->t('The tid of a taxonomy term.');
 
     $data['taxonomy_term_field_data']['tid']['argument']['id'] = 'taxonomy';
     $data['taxonomy_term_field_data']['tid']['argument']['name field'] = 'name';
     $data['taxonomy_term_field_data']['tid']['argument']['zero is null'] = TRUE;
 
     $data['taxonomy_term_field_data']['tid']['filter']['id'] = 'taxonomy_index_tid';
-    $data['taxonomy_term_field_data']['tid']['filter']['title'] = t('Term');
-    $data['taxonomy_term_field_data']['tid']['filter']['help'] = t('Taxonomy term chosen from autocomplete or select widget.');
+    $data['taxonomy_term_field_data']['tid']['filter']['title'] = $this->t('Term');
+    $data['taxonomy_term_field_data']['tid']['filter']['help'] = $this->t('Taxonomy term chosen from autocomplete or select widget.');
     $data['taxonomy_term_field_data']['tid']['filter']['hierarchy table'] = 'taxonomy_term_hierarchy';
     $data['taxonomy_term_field_data']['tid']['filter']['numeric'] = TRUE;
 
     $data['taxonomy_term_field_data']['tid_raw'] = array(
-      'title' => t('Term ID'),
-      'help' => t('The tid of a taxonomy term.'),
+      'title' => $this->t('Term ID'),
+      'help' => $this->t('The tid of a taxonomy term.'),
       'real field' => 'tid',
       'filter' => array(
         'id' => 'numeric',
@@ -56,9 +56,9 @@ public function getViewsData() {
 
     $data['taxonomy_term_field_data']['tid_representative'] = array(
       'relationship' => array(
-        'title' => t('Representative node'),
-        'label'  => t('Representative node'),
-        'help' => t('Obtains a single representative node for each term, according to a chosen sort criterion.'),
+        'title' => $this->t('Representative node'),
+        'label'  => $this->t('Representative node'),
+        'help' => $this->t('Obtains a single representative node for each term, according to a chosen sort criterion.'),
         'id' => 'groupwise_max',
         'relationship field' => 'tid',
         'outer field' => 'taxonomy_term_field_data.tid',
@@ -70,23 +70,23 @@ public function getViewsData() {
       ),
     );
 
-    $data['taxonomy_term_field_data']['vid']['help'] = t('Filter the results of "Taxonomy: Term" to a particular vocabulary.');
+    $data['taxonomy_term_field_data']['vid']['help'] = $this->t('Filter the results of "Taxonomy: Term" to a particular vocabulary.');
     unset($data['taxonomy_term_field_data']['vid']['field']);
     unset($data['taxonomy_term_field_data']['vid']['argument']);
     unset($data['taxonomy_term_field_data']['vid']['sort']);
 
     $data['taxonomy_term_field_data']['name']['field']['id'] = 'term_name';
     $data['taxonomy_term_field_data']['name']['argument']['many to one'] = TRUE;
-    $data['taxonomy_term_field_data']['name']['argument']['empty field name'] = t('Uncategorized');
+    $data['taxonomy_term_field_data']['name']['argument']['empty field name'] = $this->t('Uncategorized');
 
     $data['taxonomy_term_field_data']['description__value']['field']['click sortable'] = FALSE;
 
-    $data['taxonomy_term_field_data']['changed']['title'] = t('Updated date');
-    $data['taxonomy_term_field_data']['changed']['help'] = t('The date the term was last updated.');
+    $data['taxonomy_term_field_data']['changed']['title'] = $this->t('Updated date');
+    $data['taxonomy_term_field_data']['changed']['help'] = $this->t('The date the term was last updated.');
 
     $data['taxonomy_term_field_data']['changed_fulldate'] = array(
-      'title' => t('Updated date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Updated date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_fulldate',
@@ -94,8 +94,8 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_field_data']['changed_year_month'] = array(
-      'title' => t('Updated year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Updated year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year_month',
@@ -103,8 +103,8 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_field_data']['changed_year'] = array(
-      'title' => t('Updated year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Updated year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year',
@@ -112,8 +112,8 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_field_data']['changed_month'] = array(
-      'title' => t('Updated month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Updated month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_month',
@@ -121,8 +121,8 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_field_data']['changed_day'] = array(
-      'title' => t('Updated day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Updated day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_day',
@@ -130,15 +130,15 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_field_data']['changed_week'] = array(
-      'title' => t('Updated week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Updated week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_week',
       ),
     );
 
-    $data['taxonomy_index']['table']['group']  = t('Taxonomy term');
+    $data['taxonomy_index']['table']['group']  = $this->t('Taxonomy term');
 
     $data['taxonomy_index']['table']['join'] = array(
       'taxonomy_term_field_data' => array(
@@ -158,13 +158,13 @@ public function getViewsData() {
     );
 
     $data['taxonomy_index']['nid'] = array(
-      'title' => t('Content with term'),
-      'help' => t('Relate all content tagged with a term.'),
+      'title' => $this->t('Content with term'),
+      'help' => $this->t('Relate all content tagged with a term.'),
       'relationship' => array(
         'id' => 'standard',
         'base' => 'node',
         'base field' => 'nid',
-        'label' => t('node'),
+        'label' => $this->t('node'),
         'skip base' => 'node',
       ),
     );
@@ -172,19 +172,19 @@ public function getViewsData() {
     // @todo This stuff needs to move to a node field since really it's all
     //   about nodes.
     $data['taxonomy_index']['tid'] = array(
-      'group' => t('Content'),
-      'title' => t('Has taxonomy term ID'),
-      'help' => t('Display content if it has the selected taxonomy terms.'),
+      'group' => $this->t('Content'),
+      'title' => $this->t('Has taxonomy term ID'),
+      'help' => $this->t('Display content if it has the selected taxonomy terms.'),
       'argument' => array(
         'id' => 'taxonomy_index_tid',
         'name table' => 'taxonomy_term_field_data',
         'name field' => 'name',
-        'empty field name' => t('Uncategorized'),
+        'empty field name' => $this->t('Uncategorized'),
         'numeric' => TRUE,
         'skip base' => 'taxonomy_term_field_data',
       ),
       'filter' => array(
-        'title' => t('Has taxonomy term'),
+        'title' => $this->t('Has taxonomy term'),
         'id' => 'taxonomy_index_tid',
         'hierarchy table' => 'taxonomy_term_hierarchy',
         'numeric' => TRUE,
@@ -194,32 +194,32 @@ public function getViewsData() {
     );
 
     $data['taxonomy_index']['status'] = [
-      'title' => t('Publish status'),
-      'help' => t('Whether or not the content related to a term is published.'),
+      'title' => $this->t('Publish status'),
+      'help' => $this->t('Whether or not the content related to a term is published.'),
       'filter' => [
         'id' => 'boolean',
-        'label' => t('Published status'),
+        'label' => $this->t('Published status'),
         'type' => 'yes-no',
       ],
     ];
 
     $data['taxonomy_index']['sticky'] = [
-      'title' => t('Sticky status'),
-      'help' => t('Whether or not the content related to a term is sticky.'),
+      'title' => $this->t('Sticky status'),
+      'help' => $this->t('Whether or not the content related to a term is sticky.'),
       'filter' => [
         'id' => 'boolean',
-        'label' => t('Sticky status'),
+        'label' => $this->t('Sticky status'),
         'type' => 'yes-no',
       ],
       'sort' => [
         'id' => 'standard',
-        'help' => t('Whether or not the content related to a term is sticky. To list sticky content first, set this to descending.'),
+        'help' => $this->t('Whether or not the content related to a term is sticky. To list sticky content first, set this to descending.'),
       ],
     ];
 
     $data['taxonomy_index']['created'] = [
-      'title' => t('Post date'),
-      'help' => t('The date the content related to a term was posted.'),
+      'title' => $this->t('Post date'),
+      'help' => $this->t('The date the content related to a term was posted.'),
       'sort' => [
         'id' => 'date'
       ],
@@ -228,7 +228,7 @@ public function getViewsData() {
       ],
     ];
 
-    $data['taxonomy_term_hierarchy']['table']['group']  = t('Taxonomy term');
+    $data['taxonomy_term_hierarchy']['table']['group']  = $this->t('Taxonomy term');
     $data['taxonomy_term_hierarchy']['table']['provider']  = 'taxonomy';
 
     $data['taxonomy_term_hierarchy']['table']['join'] = array(
@@ -245,20 +245,20 @@ public function getViewsData() {
     );
 
     $data['taxonomy_term_hierarchy']['parent'] = array(
-      'title' => t('Parent term'),
-      'help' => t('The parent term of the term. This can produce duplicate entries if you are using a vocabulary that allows multiple parents.'),
+      'title' => $this->t('Parent term'),
+      'help' => $this->t('The parent term of the term. This can produce duplicate entries if you are using a vocabulary that allows multiple parents.'),
       'relationship' => array(
         'base' => 'taxonomy_term_field_data',
         'field' => 'parent',
-        'label' => t('Parent'),
+        'label' => $this->t('Parent'),
         'id' => 'standard',
       ),
       'filter' => array(
-        'help' => t('Filter the results of "Taxonomy: Term" by the parent pid.'),
+        'help' => $this->t('Filter the results of "Taxonomy: Term" by the parent pid.'),
         'id' => 'numeric',
       ),
       'argument' => array(
-        'help' => t('The parent term of the term.'),
+        'help' => $this->t('The parent term of the term.'),
         'id' => 'taxonomy',
       ),
     );
diff --git a/core/modules/taxonomy/src/Tests/LegacyTest.php b/core/modules/taxonomy/src/Tests/LegacyTest.php
index 06966b8..00216a1 100644
--- a/core/modules/taxonomy/src/Tests/LegacyTest.php
+++ b/core/modules/taxonomy/src/Tests/LegacyTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use \Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Posts an article with a taxonomy term and a date prior to 1970.
@@ -28,10 +29,10 @@ protected function setUp() {
     parent::setUp();
 
     // Create a tags vocabulary for the 'article' content type.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Tags',
       'vid' => 'tags',
-    ));
+    ]);
     $vocabulary->save();
     $field_name = 'field_' . $vocabulary->id();
 
@@ -69,4 +70,5 @@ function testTaxonomyLegacyNode() {
     $node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
     $this->assertEqual($node->getCreatedTime(), $date->getTimestamp(), 'Legacy node was saved with the right date.');
   }
+
 }
diff --git a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php
deleted file mode 100644
index e70efe9..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyConfigsTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\MigrateTaxonomyConfigsTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to taxonomy.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('taxonomy');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('taxonomy_settings');
-  }
-
-  /**
-   * Tests migration of taxonomy variables to taxonomy.settings.yml.
-   */
-  public function testTaxonomySettings() {
-    $config = $this->config('taxonomy.settings');
-    $this->assertIdentical(100, $config->get('terms_per_page_admin'));
-    $this->assertIdentical(FALSE, $config->get('override_selector'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'taxonomy.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
deleted file mode 100644
index a7cd9ca..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/MigrateTaxonomyTermStubTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\MigrateTaxonomyTermStubTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-
-/**
- * Test stub creation for taxonomy terms.
- *
- * @group taxonomy
- */
-class MigrateTaxonomyTermStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy', 'text'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('taxonomy_term');
-  }
-
-  /**
-   * Tests creation of taxonomy term stubs.
-   */
-  public function testStub() {
-    Vocabulary::create([
-      'vid' => 'test_vocabulary',
-      'name' => 'Test vocabulary',
-    ])->save();
-    $this->performStubTest('taxonomy_term');
-  }
-
-  /**
-   * Tests creation of stubs when weight is mapped.
-   */
-  public function testStubWithWeightMapping() {
-    // Create a vocabulary via migration for the terms to reference.
-    $vocabulary_data_rows = [
-      ['id' => '1', 'name' => 'tags'],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'vocabularies',
-      'migration_tags' => ['Stub test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $vocabulary_data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'vid' => 'id',
-        'name' => 'name',
-      ],
-      'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
-    ];
-    $vocabulary_migration = Migration::create($config);
-    $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
-    $vocabulary_executable->import();
-
-    // We have a term referencing an unmigrated parent, forcing a stub to be
-    // created.
-    $term_data_rows = [
-      ['id' => '1', 'vocab' => '1', 'name' => 'music', 'parent' => '2'],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'terms',
-      'migration_tags' => ['Import and rollback test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $term_data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'tid' => 'id',
-        'vid' => 'vocab',
-        'name' => 'name',
-        'weight' => 'weight',
-        'parent' => [
-          'plugin' => 'migration',
-          'migration' => 'terms',
-          'source' => 'parent',
-        ],
-      ],
-      'destination' => ['plugin' => 'entity:taxonomy_term'],
-      'migration_dependencies' => ['required' => ['vocabularies']],
-    ];
-
-    $term_migration = Migration::create($config);
-    $term_migration->save();
-    $term_executable = new MigrateExecutable($term_migration, $this);
-    $term_executable->import();
-    // Load the referenced term, which should exist as a stub.
-    /** @var \Drupal\Core\Entity\ContentEntityBase $stub_entity */
-    $stub_entity = Term::load(2);
-    $this->assertTrue($stub_entity, 'Stub successfully created');
-    if ($stub_entity) {
-      $this->assertIdentical(count($stub_entity->validate()), 0, 'Stub is a valid entity');
-    }
-  }
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
deleted file mode 100644
index 952b038..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyTermTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade taxonomy terms.
- *
- * @group migrate_drupal_6
- */
-class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('taxonomy');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('taxonomy_term');
-    $this->executeMigrations(['d6_taxonomy_vocabulary', 'd6_taxonomy_term']);
-  }
-
-  /**
-   * Tests the Drupal 6 taxonomy term to Drupal 8 migration.
-   */
-  public function testTaxonomyTerms() {
-    $expected_results = array(
-      '1' => array(
-        'source_vid' => 1,
-        'vid' => 'vocabulary_1_i_0_',
-        'weight' => 0,
-        'parent' => array(0),
-      ),
-      '2' => array(
-        'source_vid' => 2,
-        'vid' => 'vocabulary_2_i_1_',
-        'weight' => 3,
-        'parent' => array(0),
-      ),
-      '3' => array(
-        'source_vid' => 2,
-        'vid' => 'vocabulary_2_i_1_',
-        'weight' => 4,
-        'parent' => array(2),
-      ),
-      '4' => array(
-        'source_vid' => 3,
-        'vid' => 'vocabulary_3_i_2_',
-        'weight' => 6,
-        'parent' => array(0),
-      ),
-      '5' => array(
-        'source_vid' => 3,
-        'vid' => 'vocabulary_3_i_2_',
-        'weight' => 7,
-        'parent' => array(4),
-      ),
-      '6' => array(
-        'source_vid' => 3,
-        'vid' => 'vocabulary_3_i_2_',
-        'weight' => 8,
-        'parent' => array(4, 5),
-      ),
-    );
-    $terms = Term::loadMultiple(array_keys($expected_results));
-    foreach ($expected_results as $tid => $values) {
-      /** @var Term $term */
-      $term = $terms[$tid];
-      $this->assertIdentical("term {$tid} of vocabulary {$values['source_vid']}", $term->name->value);
-      $this->assertIdentical("description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
-      $this->assertIdentical($values['vid'], $term->vid->target_id);
-      $this->assertIdentical((string) $values['weight'], $term->weight->value);
-      if ($values['parent'] === array(0)) {
-        $this->assertNull($term->parent->target_id);
-      }
-      else {
-        $parents = array();
-        foreach (\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid) as $parent) {
-          $parents[] = (int) $parent->id();
-        }
-        $this->assertIdentical($parents, $values['parent']);
-      }
-    }
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
deleted file mode 100644
index b4d00c3..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTaxonomyVocabularyTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('taxonomy');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d6_taxonomy_vocabulary');
-  }
-
-  /**
-   * Tests the Drupal 6 taxonomy vocabularies to Drupal 8 migration.
-   */
-  public function testTaxonomyVocabulary() {
-    for ($i = 0; $i < 3; $i++) {
-      $j = $i + 1;
-      $vocabulary = Vocabulary::load("vocabulary_{$j}_i_{$i}_");
-      $this->assertIdentical(Migration::load('d6_taxonomy_vocabulary')->getIdMap()->lookupDestinationID(array($j)), array($vocabulary->id()));
-      $this->assertIdentical("vocabulary $j (i=$i)", $vocabulary->label());
-      $this->assertIdentical("description of vocabulary $j (i=$i)", $vocabulary->getDescription());
-      $this->assertIdentical($i, $vocabulary->getHierarchy());
-      $this->assertIdentical(4 + $i, $vocabulary->get('weight'));
-    }
-    $vocabulary = Vocabulary::load('vocabulary_name_much_longer_than');
-    $this->assertIdentical('vocabulary name much longer than thirty two characters', $vocabulary->label());
-    $this->assertIdentical('description of vocabulary name much longer than thirty two characters', $vocabulary->getDescription());
-    $this->assertIdentical(3, $vocabulary->getHierarchy());
-    $this->assertIdentical(7, $vocabulary->get('weight'));
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
deleted file mode 100644
index 5dc9962..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeRevisionTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeRevisionTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade taxonomy term node associations.
- *
- * @group migrate_drupal_6
- */
-class MigrateTermNodeRevisionTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('node', ['node_access']);
-    $this->migrateContent(TRUE);
-    $this->migrateTaxonomy();
-    $this->executeMigrations(['d6_term_node:*', 'd6_term_node_revision:*']);
-  }
-
-  /**
-   * Tests the Drupal 6 term-node revision association to Drupal 8 migration.
-   */
-  public function testTermRevisionNode() {
-    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
-    $this->assertIdentical(2, count($node->vocabulary_3_i_2_));
-    $this->assertIdentical('4', $node->vocabulary_3_i_2_[0]->target_id);
-    $this->assertIdentical('5', $node->vocabulary_3_i_2_[1]->target_id);
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
deleted file mode 100644
index 8bf9e17..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateTermNodeTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Row;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\node\Entity\Node;
-
-/**
- * Upgrade taxonomy term node associations.
- *
- * @group migrate_drupal_6
- */
-class MigrateTermNodeTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('node', ['node_access']);
-    $this->migrateContent();
-    $this->migrateTaxonomy();
-  }
-
-  /**
-   * Tests the Drupal 6 term-node association to Drupal 8 migration.
-   */
-  public function testTermNode() {
-    $this->executeMigrations(['d6_term_node:*']);
-
-    $this->container->get('entity.manager')
-      ->getStorage('node')
-      ->resetCache([1, 2]);
-
-    $nodes = Node::loadMultiple([1, 2]);
-    $node = $nodes[1];
-    $this->assertIdentical(1, count($node->vocabulary_1_i_0_));
-    $this->assertIdentical('1', $node->vocabulary_1_i_0_[0]->target_id);
-    $node = $nodes[2];
-    $this->assertIdentical(2, count($node->vocabulary_2_i_1_));
-    $this->assertIdentical('2', $node->vocabulary_2_i_1_[0]->target_id);
-    $this->assertIdentical('3', $node->vocabulary_2_i_1_[1]->target_id);
-  }
-
-  /**
-   * Tests that term associations are ignored when they belong to nodes which
-   * were not migrated.
-   */
-  public function testSkipNonExistentNode() {
-    // Node 2 is migrated by d6_node__story, but we need to pretend that it
-    // failed, so record that in the map table.
-    $this->mockFailure('d6_node__story', ['nid' => 2]);
-
-    // d6_term_node__2 should skip over node 2 (a.k.a. revision 3) because,
-    // according to the map table, it failed.
-    $migration = Migration::load('d6_term_node__2');
-    $this->executeMigration($migration);
-    $this->assertNull($migration->getIdMap()->lookupDestinationId(['vid' => 3])[0]);
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
deleted file mode 100644
index 06ac310..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityDisplayTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Vocabulary entity display migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field', 'taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateTaxonomy();
-  }
-
-  /**
-   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
-   */
-  public function testVocabularyEntityDisplay() {
-    // Test that the field exists.
-    $component = EntityViewDisplay::load('node.page.default')->getComponent('tags');
-    $this->assertIdentical('entity_reference_label', $component['type']);
-    $this->assertIdentical(20, $component['weight']);
-    // Test the Id map.
-    $this->assertIdentical(array('node', 'article', 'default', 'tags'), Migration::load('d6_vocabulary_entity_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
deleted file mode 100644
index 7ecea1b..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Vocabulary entity form display migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateTaxonomy();
-  }
-
-  /**
-   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
-   */
-  public function testVocabularyEntityFormDisplay() {
-    // Test that the field exists.
-    $component = EntityFormDisplay::load('node.page.default')->getComponent('tags');
-    $this->assertIdentical('options_select', $component['type']);
-    $this->assertIdentical(20, $component['weight']);
-    // Test the Id map.
-    $this->assertIdentical(array('node', 'article', 'default', 'tags'), Migration::load('d6_vocabulary_entity_form_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
-
-    // Test the term widget tags setting.
-    $entity_form_display = EntityFormDisplay::load('node.story.default');
-    $this->assertIdentical($entity_form_display->getComponent('vocabulary_1_i_0_')['type'], 'options_select');
-    $this->assertIdentical($entity_form_display->getComponent('vocabulary_2_i_1_')['type'], 'entity_reference_autocomplete_tags');
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
deleted file mode 100644
index 8f2307d..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldInstanceTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\taxonomy\Entity\Vocabulary;
-
-/**
- * Vocabulary field instance migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateTaxonomy();
-  }
-
-  /**
-   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
-   */
-  public function testVocabularyFieldInstance() {
-    // Test that the field exists.
-    $field_id = 'node.article.tags';
-    $field = FieldConfig::load($field_id);
-    $this->assertIdentical($field_id, $field->id(), 'Field instance exists on article bundle.');
-    $this->assertIdentical('Tags', $field->label());
-    $this->assertTrue($field->isRequired(), 'Field is required');
-
-    // Test the page bundle as well.
-    $field_id = 'node.page.tags';
-    $field = FieldConfig::load($field_id);
-    $this->assertIdentical($field_id, $field->id(), 'Field instance exists on page bundle.');
-    $this->assertIdentical('Tags', $field->label());
-    $this->assertTrue($field->isRequired(), 'Field is required');
-
-    $settings = $field->getSettings();
-    $this->assertIdentical('default:taxonomy_term', $settings['handler'], 'The handler plugin ID is correct.');
-    $this->assertIdentical(['tags'], $settings['handler_settings']['target_bundles'], 'The target_bundles handler setting is correct.');
-    $this->assertIdentical(TRUE, $settings['handler_settings']['auto_create'], 'The "auto_create" setting is correct.');
-
-    $this->assertIdentical(array('node', 'article', 'tags'), Migration::load('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article')));
-
-    // Test the the field vocabulary_1_i_0_
-    $field_id = 'node.story.vocabulary_1_i_0_';
-    $field = FieldConfig::load($field_id);
-    $this->assertFalse($field->isRequired(), 'Field is not required');
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
deleted file mode 100644
index b8d99ed..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d6\MigrateVocabularyFieldTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d6;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Vocabulary field migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateTaxonomy();
-  }
-
-  /**
-   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
-   */
-  public function testVocabularyField() {
-    // Test that the field exists.
-    $field_storage_id = 'node.tags';
-    /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
-    $field_storage = FieldStorageConfig::load($field_storage_id);
-    $this->assertIdentical($field_storage_id, $field_storage->id());
-
-    $settings = $field_storage->getSettings();
-    $this->assertIdentical('taxonomy_term', $settings['target_type'], "Target type is correct.");
-    $this->assertIdentical(1, $field_storage->getCardinality(), "Field cardinality in 1.");
-
-    $this->assertIdentical(array('node', 'tags'), Migration::load('d6_vocabulary_field')->getIdMap()->lookupDestinationID(array(4)), "Test IdMap");
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php
deleted file mode 100644
index 8088c25..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateNodeTaxonomyTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateNodeTaxonomyTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d7;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\node\Entity\Node;
-use Drupal\node\NodeInterface;
-
-/**
- * @group taxonomy
- */
-class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase {
-
-  public static $modules = array(
-    'datetime',
-    'field',
-    'filter',
-    'image',
-    'link',
-    'node',
-    'taxonomy',
-    'telephone',
-    'text',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(static::$modules);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('system', ['sequences']);
-
-    $this->executeMigration('d7_node_type');
-
-    FieldStorageConfig::create(array(
-      'type' => 'entity_reference',
-      'field_name' => 'field_tags',
-      'entity_type' => 'node',
-      'settings' => array(
-        'target_type' => 'taxonomy_term',
-      ),
-      'cardinality' => FieldStorageConfigInterface::CARDINALITY_UNLIMITED,
-    ))->save();
-
-    FieldConfig::create(array(
-      'entity_type' => 'node',
-      'field_name' => 'field_tags',
-      'bundle' => 'article',
-    ))->save();
-
-    $this->executeMigrations([
-      'd7_taxonomy_vocabulary',
-      'd7_taxonomy_term',
-      'd7_user_role',
-      'd7_user',
-      'd7_node__article',
-    ]);
-  }
-
-  /**
-   * Test node migration from Drupal 7 to 8.
-   */
-  public function testMigration() {
-    $node = Node::load(2);
-    $this->assertTrue($node instanceof NodeInterface);
-    $this->assertEqual(9, $node->field_tags[0]->target_id);
-    $this->assertEqual(14, $node->field_tags[1]->target_id);
-    $this->assertEqual(17, $node->field_tags[2]->target_id);
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php
deleted file mode 100644
index 64dabde..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyTermTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateTaxonomyTermTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d7;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\taxonomy\TermInterface;
-
-/**
- * Upgrade taxonomy terms.
- *
- * @group taxonomy
- */
-class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
-
-  public static $modules = array('taxonomy', 'text');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('taxonomy_term');
-    $this->executeMigrations(['d7_taxonomy_vocabulary', 'd7_taxonomy_term']);
-  }
-
-  /**
-   * Validate a migrated term contains the expected values.
-   *
-   * @param $id
-   *   Entity ID to load and check.
-   * @param $expected_label
-   *   The label the migrated entity should have.
-   * @param $expected_vid
-   *   The parent vocabulary the migrated entity should have.
-   * @param string $expected_description
-   *   The description the migrated entity should have.
-   * @param int $expected_weight
-   *   The weight the migrated entity should have.
-   * @param array $expected_parents
-   *   The parent terms the migrated entity should have.
-   */
-  protected function assertEntity($id, $expected_label, $expected_vid, $expected_description = '', $expected_weight = 0, $expected_parents = []) {
-    /** @var \Drupal\taxonomy\TermInterface $entity */
-    $entity = Term::load($id);
-    $this->assertTrue($entity instanceof TermInterface);
-    $this->assertIdentical($expected_label, $entity->label());
-    $this->assertIdentical($expected_vid, $entity->getVocabularyId());
-    $this->assertEqual($expected_description, $entity->getDescription());
-    $this->assertEqual($expected_weight, $entity->getWeight());
-    $this->assertIdentical($expected_parents, $this->getParentIDs($id));
-  }
-
-  /**
-   * Tests the Drupal 7 taxonomy term to Drupal 8 migration.
-   */
-  public function testTaxonomyTerms() {
-    $this->assertEntity(1, 'General discussion', 'forums', '', 2);
-    $this->assertEntity(2, 'Term1', 'test_vocabulary', 'The first term.');
-    $this->assertEntity(3, 'Term2', 'test_vocabulary', 'The second term.');
-    $this->assertEntity(4, 'Term3', 'test_vocabulary', 'The third term.', 0, [3]);
-    $this->assertEntity(5, 'Custom Forum', 'forums', 'Where the cool kids are.', 3);
-    $this->assertEntity(6, 'Games', 'forums', '', 4);
-    $this->assertEntity(7, 'Minecraft', 'forums', '', 1, [6]);
-    $this->assertEntity(8, 'Half Life 3', 'forums', '', 0, [6]);
-  }
-
-  /**
-   * Retrieves the parent term IDs for a given term.
-   *
-   * @param $tid
-   *   ID of the term to check.
-   *
-   * @return array
-   *   List of parent term IDs.
-   */
-  protected function getParentIDs($tid) {
-    return array_keys(\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid));
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php
deleted file mode 100644
index 5f4f6cd..0000000
--- a/core/modules/taxonomy/src/Tests/Migrate/d7/MigrateTaxonomyVocabularyTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Migrate\d7\MigrateTaxonomyVocabularyTest.
- */
-
-namespace Drupal\taxonomy\Tests\Migrate\d7;
-
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\taxonomy\VocabularyInterface;
-
-/**
- * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
- *
- * @group taxonomy
- */
-class MigrateTaxonomyVocabularyTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('taxonomy');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_taxonomy_vocabulary');
-  }
-
-  /**
-   * Validate a migrated vocabulary contains the expected values.
-   *
-   * @param $id
-   *   Entity ID to load and check.
-   * @param $expected_label
-   *   The label the migrated entity should have.
-   * @param $expected_description
-   *   The description the migrated entity should have.
-   * @param $expected_hierarchy
-   *   The hierarchy setting the migrated entity should have.
-   * @param $expected_weight
-   *   The weight the migrated entity should have.
-   */
-  protected function assertEntity($id, $expected_label, $expected_description, $expected_hierarchy, $expected_weight) {
-    /** @var \Drupal\taxonomy\VocabularyInterface $entity */
-    $entity = Vocabulary::load($id);
-    $this->assertTrue($entity instanceof VocabularyInterface);
-    $this->assertIdentical($expected_label, $entity->label());
-    $this->assertIdentical($expected_description, $entity->getDescription());
-    $this->assertIdentical($expected_hierarchy, $entity->getHierarchy());
-    $this->assertIdentical($expected_weight, $entity->get('weight'));
-  }
-
-  /**
-   * Tests the Drupal 7 taxonomy vocabularies to Drupal 8 migration.
-   */
-  public function testTaxonomyVocabulary() {
-    $this->assertEntity('tags', 'Tags', 'Use tags to group articles on similar topics into categories.', TAXONOMY_HIERARCHY_DISABLED, 0);
-    $this->assertEntity('forums', 'Forums', 'Forum navigation vocabulary', TAXONOMY_HIERARCHY_SINGLE, -10);
-    $this->assertEntity('test_vocabulary', 'Test Vocabulary', 'This is the vocabulary description', TAXONOMY_HIERARCHY_SINGLE, 0);
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index 550c5f5..faceca2 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\taxonomy\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\user\RoleInterface;
 use Drupal\file\Entity\File;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests access checks of private image fields.
@@ -41,7 +43,7 @@ protected function setUp() {
     // Add a field to the vocabulary.
     $entity_type = 'taxonomy_term';
     $name = 'field_test';
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $name,
       'entity_type' => $entity_type,
       'type' => 'image',
@@ -49,12 +51,12 @@ protected function setUp() {
         'uri_scheme' => 'private',
       ),
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $name,
       'entity_type' => $entity_type,
       'bundle' => $this->vocabulary->id(),
       'settings' => array(),
-    ))->save();
+    ])->save();
     entity_get_display($entity_type, $this->vocabulary->id(), 'default')
       ->setComponent($name, array(
         'type' => 'image',
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
index 34971db..50f64d6 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyTestTrait.php
@@ -10,6 +10,7 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Provides common helper methods for Taxonomy module tests.
@@ -21,13 +22,13 @@
    */
   function createVocabulary() {
     // Create a vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'weight' => mt_rand(0, 10),
-    ));
+    ]);
     $vocabulary->save();
     return $vocabulary;
   }
@@ -47,16 +48,16 @@ function createVocabulary() {
   function createTerm(Vocabulary $vocabulary, $values = array()) {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
-    $term = entity_create('taxonomy_term', $values + array(
+    $term = Term::create($values + [
       'name' => $this->randomMachineName(),
-      'description' => array(
+      'description' => [
         'value' => $this->randomMachineName(),
         // Use the first available text format.
         'format' => $format->id(),
-      ),
+      ],
       'vid' => $vocabulary->id(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $term->save();
     return $term;
   }
diff --git a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php b/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
index 23bcef1..723f442 100644
--- a/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
+++ b/core/modules/taxonomy/src/Tests/TermCacheTagsTest.php
@@ -8,6 +8,8 @@
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests the Taxonomy term entity's cache tags.
@@ -26,17 +28,17 @@ class TermCacheTagsTest extends EntityWithUriCacheTagsTestBase {
    */
   protected function createEntity() {
     // Create a "Camelids" vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => 'Camelids',
       'vid' => 'camelids',
-    ));
+    ]);
     $vocabulary->save();
 
     // Create a "Llama" taxonomy term.
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => 'Llama',
       'vid' => $vocabulary->id(),
-    ));
+    ]);
     $term->save();
 
     return $term;
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index 7165722..da78d41 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -495,10 +495,10 @@ function testTaxonomyGetTermByName() {
 
     // Create a new term in a different vocabulary with the same name.
     $new_vocabulary = $this->createVocabulary();
-    $new_term = entity_create('taxonomy_term', array(
+    $new_term = Term::create([
       'name' => $term->getName(),
       'vid' => $new_vocabulary->id(),
-    ));
+    ]);
     $new_term->save();
 
     // Load multiple terms with the same name.
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php b/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
index d807d5e..f9d6bce 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTranslationFieldViewTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\taxonomy\Tests;
 
+use Drupal\node\Entity\Node;
+
 /**
  * Tests the translation of taxonomy terms field on nodes.
  *
@@ -74,16 +76,16 @@ public function testTranslatedTaxonomyTermReferenceDisplay() {
    */
   protected function setUpNode() {
     /** @var \Drupal\node\Entity\Node $node */
-    $node = entity_create('node', array(
+    $node = Node::create([
       'title' => $this->randomMachineName(),
       'type' => 'article',
-      'description' => array(
+      'description' => [[
         'value' => $this->randomMachineName(),
-        'format' => 'basic_html',
-      ),
+        'format' => 'basic_html'
+      ]],
       $this->termFieldName => array(array('target_id' => $this->term->id())),
       'langcode' => $this->baseLangcode,
-    ));
+    ]);
     $node->save();
     $node->addTranslation($this->translateToLangcode, $node->toArray());
     $node->save();
diff --git a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php b/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
index ed84144..88c59b6 100644
--- a/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
+++ b/core/modules/taxonomy/src/Tests/TermTranslationUITest.php
@@ -9,6 +9,7 @@
 
 use Drupal\content_translation\Tests\ContentTranslationUITestBase;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Tests the Term Translation UI.
@@ -44,13 +45,13 @@ protected function setupBundle() {
     parent::setupBundle();
 
     // Create a vocabulary.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->vocabulary = Vocabulary::create([
       'name' => $this->bundle,
       'description' => $this->randomMachineName(),
       'vid' => $this->bundle,
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'weight' => mt_rand(0, 10),
-    ));
+    ]);
     $this->vocabulary->save();
   }
 
@@ -113,13 +114,13 @@ function testTranslateLinkVocabularyAdminPage() {
     $translatable_tid = $this->createEntity($values, $this->langcodes[0], $this->vocabulary->id());
 
     // Create an untranslatable vocabulary.
-    $untranslatable_vocabulary = entity_create('taxonomy_vocabulary', array(
+    $untranslatable_vocabulary = Vocabulary::create([
       'name' => 'untranslatable_voc',
       'description' => $this->randomMachineName(),
       'vid' => 'untranslatable_voc',
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
       'weight' => mt_rand(0, 10),
-    ));
+    ]);
     $untranslatable_vocabulary->save();
 
     $values = array(
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
index 5dec796..b26664f 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
@@ -8,10 +8,14 @@
 namespace Drupal\taxonomy\Tests\Views;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests taxonomy field filters with translations.
@@ -61,25 +65,25 @@ function setUp() {
     );
 
     // Create a vocabulary.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->vocabulary = Vocabulary::create([
       'name' => 'Views testing tags',
       'vid' => 'views_testing_tags',
-    ));
+    ]);
     $this->vocabulary->save();
 
     // Add a translatable field to the vocabulary.
-    $field = entity_create('field_storage_config', array(
+    $field = FieldStorageConfig::create(array(
       'field_name' => 'field_foo',
       'entity_type' => 'taxonomy_term',
       'type' => 'text',
     ));
     $field->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => 'field_foo',
       'entity_type' => 'taxonomy_term',
       'label' => 'Foo',
       'bundle' => 'views_testing_tags',
-    ))->save();
+    ])->save();
 
     // Create term with translations.
     $taxonomy = $this->createTermWithProperties(array('name' => $this->termNames['en'], 'langcode' => 'en', 'description' => $this->termNames['en'], 'field_foo' => $this->termNames['en']));
@@ -171,13 +175,13 @@ protected function createTermWithProperties($properties) {
       'field_foo' => $this->randomMachineName(),
     );
 
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => $properties['name'],
       'description' => $properties['description'],
       'format' => $format->id(),
       'vid' => $this->vocabulary->id(),
       'langcode' => $properties['langcode'],
-    ));
+    ]);
     $term->field_foo->value = $properties['field_foo'];
     $term->save();
     return $term;
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
index cc83adb..7e7bc14 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyTestBase.php
@@ -12,6 +12,8 @@
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Base class for all taxonomy tests.
@@ -85,10 +87,10 @@ protected function mockStandardInstall() {
       'type' => 'article',
     ));
     // Create the vocabulary for the tag field.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->vocabulary = Vocabulary::create([
       'name' => 'Views testing tags',
       'vid' => 'views_testing_tags',
-    ));
+    ]);
     $this->vocabulary->save();
     $field_name = 'field_' . $this->vocabulary->id();
 
@@ -148,7 +150,7 @@ protected function createTerm(array $settings = []) {
       'vid' => $this->vocabulary->id(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
     ];
-    $term = entity_create('taxonomy_term', $settings);
+    $term = Term::create($settings);
     $term->save();
     return $term;
   }
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyViewsFieldAccessTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyViewsFieldAccessTest.php
deleted file mode 100644
index 132e8ed..0000000
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyViewsFieldAccessTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Tests\Views\TaxonomyViewsFieldAccessTest.
- */
-
-namespace Drupal\taxonomy\Tests\Views;
-
-use Drupal\taxonomy\Entity\Term;
-use Drupal\taxonomy\Entity\Vocabulary;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the taxonomy entity.
- *
- * @group taxonomy
- */
-class TaxonomyViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['taxonomy', 'text', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('taxonomy_term');
-  }
-
-  /**
-   * Check access for taxonomy fields.
-   */
-  public function testTermFields() {
-    $vocab = Vocabulary::create([
-      'vid' => 'random',
-      'name' => 'Randomness',
-    ]);
-    $vocab->save();
-    $term1 = Term::create([
-      'name' => 'Semi random',
-      'vid' => $vocab->id(),
-    ]);
-    $term1->save();
-
-    $term2 = Term::create([
-      'name' => 'Majorly random',
-      'vid' => $vocab->id(),
-    ]);
-    $term2->save();
-
-    $term3 = Term::create([
-      'name' => 'Not really random',
-      'vid' => $vocab->id(),
-    ]);
-    $term3->save();
-
-    $this->assertFieldAccess('taxonomy_term', 'name', 'Majorly random');
-    $this->assertFieldAccess('taxonomy_term', 'name', 'Semi random');
-    $this->assertFieldAccess('taxonomy_term', 'name', 'Not really random');
-    $this->assertFieldAccess('taxonomy_term', 'tid', $term1->id());
-    $this->assertFieldAccess('taxonomy_term', 'tid', $term2->id());
-    $this->assertFieldAccess('taxonomy_term', 'tid', $term3->id());
-    $this->assertFieldAccess('taxonomy_term', 'uuid', $term1->uuid());
-    $this->assertFieldAccess('taxonomy_term', 'uuid', $term2->uuid());
-    $this->assertFieldAccess('taxonomy_term', 'uuid', $term3->uuid());
-  }
-
-}
diff --git a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
index 6596b8e..d30bc3f 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyCrudTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests loading, saving and deleting vocabularies.
@@ -154,14 +156,14 @@ function testUninstallReinstall() {
       'type' => 'text',
       'cardinality' => 4
     );
-    entity_create('field_storage_config', $storage_definition)->save();
+    FieldStorageConfig::create($storage_definition)->save();
     $field_definition = array(
       'field_name' => $field_name,
       'entity_type' => 'taxonomy_term',
       'bundle' => $this->vocabulary->id(),
       'label' => $this->randomMachineName() . '_label',
     );
-    entity_create('field_config', $field_definition)->save();
+    FieldConfig::create($field_definition)->save();
 
     // Remove the third party setting from the memory copy of the vocabulary.
     // We keep this invalid copy around while the taxonomy module is not even
@@ -178,7 +180,7 @@ function testUninstallReinstall() {
     // an instance of this field on the same bundle name should be successful.
     $this->vocabulary->enforceIsNew();
     $this->vocabulary->save();
-    entity_create('field_storage_config', $storage_definition)->save();
-    entity_create('field_config', $field_definition)->save();
+    FieldStorageConfig::create($storage_definition)->save();
+    FieldConfig::create($field_definition)->save();
   }
 }
diff --git a/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php b/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
index 4152135..b0e442e 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyTranslationTest.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\taxonomy\Tests\VocabularyTranslationTest.
  */
+
 namespace Drupal\taxonomy\Tests;
 
 use Drupal\Component\Utility\Unicode;
diff --git a/core/modules/taxonomy/taxonomy.js b/core/modules/taxonomy/taxonomy.js
index 09e5b46..99338d5 100644
--- a/core/modules/taxonomy/taxonomy.js
+++ b/core/modules/taxonomy/taxonomy.js
@@ -3,7 +3,7 @@
  * Taxonomy behaviors.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -53,4 +53,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/taxonomy/templates/taxonomy-term.html.twig b/core/modules/taxonomy/templates/taxonomy-term.html.twig
index d6fb9bd..6636b79 100644
--- a/core/modules/taxonomy/templates/taxonomy-term.html.twig
+++ b/core/modules/taxonomy/templates/taxonomy-term.html.twig
@@ -25,7 +25,7 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes}}>
+<div{{ attributes }}>
   {{ title_prefix }}
   {% if not page %}
     <h2><a href="{{ url }}">{{ name }}</a></h2>
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/migrations/taxonomy_term_stub_test.yml b/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/migrations/taxonomy_term_stub_test.yml
new file mode 100644
index 0000000..ddca901
--- /dev/null
+++ b/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/migrations/taxonomy_term_stub_test.yml
@@ -0,0 +1,29 @@
+id: taxonomy_term_stub_test
+label: Taxonomy term stub
+migration_tags:
+  - Import and rollback test
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: 1
+      vocab: 1
+      name: music
+      parent: 2
+  ids:
+    id:
+      type: integer
+process:
+  tid: id
+  vid: vocab
+  name: name
+  weight: weight
+  parent:
+    plugin: migration
+    migration: taxonomy_term_stub_test
+    source: parent
+destination:
+  plugin: entity:taxonomy_term
+migration_dependencies:
+  required:
+    - vocabularies
diff --git a/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/taxonomy_term_stub_test.info.yml b/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/taxonomy_term_stub_test.info.yml
new file mode 100644
index 0000000..fac0381
--- /dev/null
+++ b/core/modules/taxonomy/tests/modules/taxonomy_term_stub_test/taxonomy_term_stub_test.info.yml
@@ -0,0 +1,9 @@
+name: 'Taxonomy Migrate stub test'
+type: module
+description: 'Provides a migration plugin for stub testing.'
+package: Testing
+version: VERSION
+core: 8.x
+dependencies:
+  - taxonomy
+  - migrate
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
new file mode 100644
index 0000000..7f66c9c
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\MigrateTaxonomyConfigsTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to taxonomy.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('taxonomy');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('taxonomy_settings');
+  }
+
+  /**
+   * Tests migration of taxonomy variables to taxonomy.settings.yml.
+   */
+  public function testTaxonomySettings() {
+    $config = $this->config('taxonomy.settings');
+    $this->assertIdentical(100, $config->get('terms_per_page_admin'));
+    $this->assertIdentical(FALSE, $config->get('override_selector'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'taxonomy.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
new file mode 100644
index 0000000..05277f9
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\MigrateTaxonomyTermStubTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Test stub creation for taxonomy terms.
+ *
+ * @group taxonomy
+ */
+class MigrateTaxonomyTermStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy', 'text', 'taxonomy_term_stub_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_term');
+  }
+
+  /**
+   * Tests creation of taxonomy term stubs.
+   */
+  public function testStub() {
+    Vocabulary::create([
+      'vid' => 'test_vocabulary',
+      'name' => 'Test vocabulary',
+    ])->save();
+    $this->performStubTest('taxonomy_term');
+  }
+
+  /**
+   * Tests creation of stubs when weight is mapped.
+   */
+  public function testStubWithWeightMapping() {
+    // Create a vocabulary via migration for the terms to reference.
+    $vocabulary_data_rows = [
+      ['id' => '1', 'name' => 'tags'],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'migration_tags' => ['Stub test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $vocabulary_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'vid' => 'id',
+        'name' => 'name',
+      ],
+      'destination' => ['plugin' => 'entity:taxonomy_vocabulary'],
+    ];
+    $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $vocabulary_executable = new MigrateExecutable($vocabulary_migration, $this);
+    $vocabulary_executable->import();
+
+    // We have a term referencing an unmigrated parent, forcing a stub to be
+    // created.
+    $migration = $this->getMigration('taxonomy_term_stub_test');
+    $term_executable = new MigrateExecutable($migration, $this);
+    $term_executable->import();
+    $this->assertTrue($migration->getIdMap()->getRowBySource(['2']), 'Stub row exists in the ID map table');
+
+    // Load the referenced term, which should exist as a stub.
+    /** @var \Drupal\Core\Entity\ContentEntityBase $stub_entity */
+    $stub_entity = Term::load(2);
+    $this->assertTrue($stub_entity, 'Stub successfully created');
+    if ($stub_entity) {
+      $this->assertIdentical(count($stub_entity->validate()), 0, 'Stub is a valid entity');
+    }
+  }
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
new file mode 100644
index 0000000..0d2a226
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTest.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTaxonomyTermTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\taxonomy\Entity\Term;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade taxonomy terms.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTaxonomyTermTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('taxonomy');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_term');
+    $this->executeMigrations(['d6_taxonomy_vocabulary', 'd6_taxonomy_term']);
+  }
+
+  /**
+   * Tests the Drupal 6 taxonomy term to Drupal 8 migration.
+   */
+  public function testTaxonomyTerms() {
+    $expected_results = array(
+      '1' => array(
+        'source_vid' => 1,
+        'vid' => 'vocabulary_1_i_0_',
+        'weight' => 0,
+        'parent' => array(0),
+      ),
+      '2' => array(
+        'source_vid' => 2,
+        'vid' => 'vocabulary_2_i_1_',
+        'weight' => 3,
+        'parent' => array(0),
+      ),
+      '3' => array(
+        'source_vid' => 2,
+        'vid' => 'vocabulary_2_i_1_',
+        'weight' => 4,
+        'parent' => array(2),
+      ),
+      '4' => array(
+        'source_vid' => 3,
+        'vid' => 'vocabulary_3_i_2_',
+        'weight' => 6,
+        'parent' => array(0),
+      ),
+      '5' => array(
+        'source_vid' => 3,
+        'vid' => 'vocabulary_3_i_2_',
+        'weight' => 7,
+        'parent' => array(4),
+      ),
+      '6' => array(
+        'source_vid' => 3,
+        'vid' => 'vocabulary_3_i_2_',
+        'weight' => 8,
+        'parent' => array(4, 5),
+      ),
+    );
+    $terms = Term::loadMultiple(array_keys($expected_results));
+    foreach ($expected_results as $tid => $values) {
+      /** @var Term $term */
+      $term = $terms[$tid];
+      $this->assertIdentical("term {$tid} of vocabulary {$values['source_vid']}", $term->name->value);
+      $this->assertIdentical("description of term {$tid} of vocabulary {$values['source_vid']}", $term->description->value);
+      $this->assertIdentical($values['vid'], $term->vid->target_id);
+      $this->assertIdentical((string) $values['weight'], $term->weight->value);
+      if ($values['parent'] === array(0)) {
+        $this->assertNull($term->parent->target_id);
+      }
+      else {
+        $parents = array();
+        foreach (\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid) as $parent) {
+          $parents[] = (int) $parent->id();
+        }
+        $this->assertIdentical($parents, $values['parent']);
+      }
+    }
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
new file mode 100644
index 0000000..9411f70
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTaxonomyVocabularyTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('taxonomy');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_taxonomy_vocabulary');
+  }
+
+  /**
+   * Tests the Drupal 6 taxonomy vocabularies to Drupal 8 migration.
+   */
+  public function testTaxonomyVocabulary() {
+    for ($i = 0; $i < 3; $i++) {
+      $j = $i + 1;
+      $vocabulary = Vocabulary::load("vocabulary_{$j}_i_{$i}_");
+      $this->assertIdentical($this->getMigration('d6_taxonomy_vocabulary')->getIdMap()->lookupDestinationID(array($j)), array($vocabulary->id()));
+      $this->assertIdentical("vocabulary $j (i=$i)", $vocabulary->label());
+      $this->assertIdentical("description of vocabulary $j (i=$i)", $vocabulary->getDescription());
+      $this->assertIdentical($i, $vocabulary->getHierarchy());
+      $this->assertIdentical(4 + $i, $vocabulary->get('weight'));
+    }
+    $vocabulary = Vocabulary::load('vocabulary_name_much_longer_than');
+    $this->assertIdentical('vocabulary name much longer than thirty two characters', $vocabulary->label());
+    $this->assertIdentical('description of vocabulary name much longer than thirty two characters', $vocabulary->getDescription());
+    $this->assertIdentical(3, $vocabulary->getHierarchy());
+    $this->assertIdentical(7, $vocabulary->get('weight'));
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
new file mode 100644
index 0000000..30495ae
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeRevisionTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTermNodeRevisionTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade taxonomy term node associations.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTermNodeRevisionTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('node', ['node_access']);
+    $this->migrateContent(TRUE);
+    $this->migrateTaxonomy();
+    $this->executeMigrations(['d6_term_node', 'd6_term_node_revision']);
+  }
+
+  /**
+   * Tests the Drupal 6 term-node revision association to Drupal 8 migration.
+   */
+  public function testTermRevisionNode() {
+    $node = \Drupal::entityManager()->getStorage('node')->loadRevision(2);
+    $this->assertIdentical(2, count($node->vocabulary_3_i_2_));
+    $this->assertIdentical('4', $node->vocabulary_3_i_2_[0]->target_id);
+    $this->assertIdentical('5', $node->vocabulary_3_i_2_[1]->target_id);
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
new file mode 100644
index 0000000..82ca56b
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateTermNodeTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\node\Entity\Node;
+
+/**
+ * Upgrade taxonomy term node associations.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTermNodeTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('node', ['node_access']);
+    $this->migrateContent();
+    $this->migrateTaxonomy();
+  }
+
+  /**
+   * Tests the Drupal 6 term-node association to Drupal 8 migration.
+   */
+  public function testTermNode() {
+    // This is a base plugin id and we want to run all derivatives.
+    $this->executeMigrations(['d6_term_node']);
+
+    $this->container->get('entity.manager')
+      ->getStorage('node')
+      ->resetCache([1, 2]);
+
+    $nodes = Node::loadMultiple([1, 2]);
+    $node = $nodes[1];
+    $this->assertIdentical(1, count($node->vocabulary_1_i_0_));
+    $this->assertIdentical('1', $node->vocabulary_1_i_0_[0]->target_id);
+    $node = $nodes[2];
+    $this->assertIdentical(2, count($node->vocabulary_2_i_1_));
+    $this->assertIdentical('2', $node->vocabulary_2_i_1_[0]->target_id);
+    $this->assertIdentical('3', $node->vocabulary_2_i_1_[1]->target_id);
+  }
+
+  /**
+   * Tests that term associations are ignored when they belong to nodes which
+   * were not migrated.
+   */
+  public function testSkipNonExistentNode() {
+    // Node 2 is migrated by d6_node__story, but we need to pretend that it
+    // failed, so record that in the map table.
+    $this->mockFailure('d6_node:story', ['nid' => 2]);
+
+    // d6_term_node__2 should skip over node 2 (a.k.a. revision 3) because,
+    // according to the map table, it failed.
+    $migration = $this->getMigration('d6_term_node:2');
+    $this->executeMigration($migration);
+    $this->assertNull($migration->getIdMap()->lookupDestinationId(['vid' => 3])[0]);
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
new file mode 100644
index 0000000..c11a33b
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityDisplayTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Vocabulary entity display migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateVocabularyEntityDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field', 'taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateTaxonomy();
+  }
+
+  /**
+   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
+   */
+  public function testVocabularyEntityDisplay() {
+    // Test that the field exists.
+    $component = EntityViewDisplay::load('node.page.default')->getComponent('tags');
+    $this->assertIdentical('entity_reference_label', $component['type']);
+    $this->assertIdentical(20, $component['weight']);
+    // Test the Id map.
+    $this->assertIdentical(array('node', 'article', 'default', 'tags'), $this->getMigration('d6_vocabulary_entity_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
new file mode 100644
index 0000000..9bfc9c2
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Vocabulary entity form display migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateTaxonomy();
+  }
+
+  /**
+   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
+   */
+  public function testVocabularyEntityFormDisplay() {
+    // Test that the field exists.
+    $component = EntityFormDisplay::load('node.page.default')->getComponent('tags');
+    $this->assertIdentical('options_select', $component['type']);
+    $this->assertIdentical(20, $component['weight']);
+    // Test the Id map.
+    $this->assertIdentical(array('node', 'article', 'default', 'tags'), $this->getMigration('d6_vocabulary_entity_form_display')->getIdMap()->lookupDestinationID(array(4, 'article')));
+
+    // Test the term widget tags setting.
+    $entity_form_display = EntityFormDisplay::load('node.story.default');
+    $this->assertIdentical($entity_form_display->getComponent('vocabulary_1_i_0_')['type'], 'options_select');
+    $this->assertIdentical($entity_form_display->getComponent('vocabulary_2_i_1_')['type'], 'entity_reference_autocomplete_tags');
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
new file mode 100644
index 0000000..ba0321f
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldInstanceTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Vocabulary field instance migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateVocabularyFieldInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateTaxonomy();
+  }
+
+  /**
+   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
+   */
+  public function testVocabularyFieldInstance() {
+    // Test that the field exists.
+    $field_id = 'node.article.tags';
+    $field = FieldConfig::load($field_id);
+    $this->assertIdentical($field_id, $field->id(), 'Field instance exists on article bundle.');
+    $this->assertIdentical('Tags', $field->label());
+    $this->assertTrue($field->isRequired(), 'Field is required');
+
+    // Test the page bundle as well.
+    $field_id = 'node.page.tags';
+    $field = FieldConfig::load($field_id);
+    $this->assertIdentical($field_id, $field->id(), 'Field instance exists on page bundle.');
+    $this->assertIdentical('Tags', $field->label());
+    $this->assertTrue($field->isRequired(), 'Field is required');
+
+    $settings = $field->getSettings();
+    $this->assertIdentical('default:taxonomy_term', $settings['handler'], 'The handler plugin ID is correct.');
+    $this->assertIdentical(['tags'], $settings['handler_settings']['target_bundles'], 'The target_bundles handler setting is correct.');
+    $this->assertIdentical(TRUE, $settings['handler_settings']['auto_create'], 'The "auto_create" setting is correct.');
+
+    $this->assertIdentical(array('node', 'article', 'tags'), $this->getMigration('d6_vocabulary_field_instance')->getIdMap()->lookupDestinationID(array(4, 'article')));
+
+    // Test the the field vocabulary_1_i_0_
+    $field_id = 'node.story.vocabulary_1_i_0_';
+    $field = FieldConfig::load($field_id);
+    $this->assertFalse($field->isRequired(), 'Field is not required');
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
new file mode 100644
index 0000000..4646544
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateVocabularyFieldTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d6\MigrateVocabularyFieldTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d6;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Vocabulary field migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateVocabularyFieldTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateTaxonomy();
+  }
+
+  /**
+   * Tests the Drupal 6 vocabulary-node type association to Drupal 8 migration.
+   */
+  public function testVocabularyField() {
+    // Test that the field exists.
+    $field_storage_id = 'node.tags';
+    /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
+    $field_storage = FieldStorageConfig::load($field_storage_id);
+    $this->assertIdentical($field_storage_id, $field_storage->id());
+
+    $settings = $field_storage->getSettings();
+    $this->assertIdentical('taxonomy_term', $settings['target_type'], "Target type is correct.");
+    $this->assertIdentical(1, $field_storage->getCardinality(), "Field cardinality in 1.");
+
+    $this->assertIdentical(array('node', 'tags'), $this->getMigration('d6_vocabulary_field')->getIdMap()->lookupDestinationID(array(4)), "Test IdMap");
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
new file mode 100644
index 0000000..76d301e
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateNodeTaxonomyTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
+
+/**
+ * @group taxonomy
+ */
+class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase {
+
+  public static $modules = array(
+    'datetime',
+    'field',
+    'filter',
+    'image',
+    'link',
+    'node',
+    'taxonomy',
+    'telephone',
+    'text',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(static::$modules);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('system', ['sequences']);
+
+    $this->executeMigration('d7_node_type');
+
+    FieldStorageConfig::create(array(
+      'type' => 'entity_reference',
+      'field_name' => 'field_tags',
+      'entity_type' => 'node',
+      'settings' => array(
+        'target_type' => 'taxonomy_term',
+      ),
+      'cardinality' => FieldStorageConfigInterface::CARDINALITY_UNLIMITED,
+    ))->save();
+
+    FieldConfig::create(array(
+      'entity_type' => 'node',
+      'field_name' => 'field_tags',
+      'bundle' => 'article',
+    ))->save();
+
+    $this->executeMigrations([
+      'd7_taxonomy_vocabulary',
+      'd7_taxonomy_term',
+      'd7_user_role',
+      'd7_user',
+      'd7_node:article',
+    ]);
+  }
+
+  /**
+   * Test node migration from Drupal 7 to 8.
+   */
+  public function testMigration() {
+    $node = Node::load(2);
+    $this->assertTrue($node instanceof NodeInterface);
+    $this->assertEqual(9, $node->field_tags[0]->target_id);
+    $this->assertEqual(14, $node->field_tags[1]->target_id);
+    $this->assertEqual(17, $node->field_tags[2]->target_id);
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
new file mode 100644
index 0000000..0161a05
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateTaxonomyTermTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
+
+use Drupal\taxonomy\Entity\Term;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\taxonomy\TermInterface;
+
+/**
+ * Upgrade taxonomy terms.
+ *
+ * @group taxonomy
+ */
+class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase {
+
+  public static $modules = array('taxonomy', 'text');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_term');
+    $this->executeMigrations(['d7_taxonomy_vocabulary', 'd7_taxonomy_term']);
+  }
+
+  /**
+   * Validate a migrated term contains the expected values.
+   *
+   * @param $id
+   *   Entity ID to load and check.
+   * @param $expected_label
+   *   The label the migrated entity should have.
+   * @param $expected_vid
+   *   The parent vocabulary the migrated entity should have.
+   * @param string $expected_description
+   *   The description the migrated entity should have.
+   * @param int $expected_weight
+   *   The weight the migrated entity should have.
+   * @param array $expected_parents
+   *   The parent terms the migrated entity should have.
+   */
+  protected function assertEntity($id, $expected_label, $expected_vid, $expected_description = '', $expected_weight = 0, $expected_parents = []) {
+    /** @var \Drupal\taxonomy\TermInterface $entity */
+    $entity = Term::load($id);
+    $this->assertTrue($entity instanceof TermInterface);
+    $this->assertIdentical($expected_label, $entity->label());
+    $this->assertIdentical($expected_vid, $entity->getVocabularyId());
+    $this->assertEqual($expected_description, $entity->getDescription());
+    $this->assertEqual($expected_weight, $entity->getWeight());
+    $this->assertIdentical($expected_parents, $this->getParentIDs($id));
+  }
+
+  /**
+   * Tests the Drupal 7 taxonomy term to Drupal 8 migration.
+   */
+  public function testTaxonomyTerms() {
+    $this->assertEntity(1, 'General discussion', 'forums', '', 2);
+    $this->assertEntity(2, 'Term1', 'test_vocabulary', 'The first term.');
+    $this->assertEntity(3, 'Term2', 'test_vocabulary', 'The second term.');
+    $this->assertEntity(4, 'Term3', 'test_vocabulary', 'The third term.', 0, [3]);
+    $this->assertEntity(5, 'Custom Forum', 'forums', 'Where the cool kids are.', 3);
+    $this->assertEntity(6, 'Games', 'forums', '', 4);
+    $this->assertEntity(7, 'Minecraft', 'forums', '', 1, [6]);
+    $this->assertEntity(8, 'Half Life 3', 'forums', '', 0, [6]);
+  }
+
+  /**
+   * Retrieves the parent term IDs for a given term.
+   *
+   * @param $tid
+   *   ID of the term to check.
+   *
+   * @return array
+   *   List of parent term IDs.
+   */
+  protected function getParentIDs($tid) {
+    return array_keys(\Drupal::entityManager()->getStorage('taxonomy_term')->loadParents($tid));
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
new file mode 100644
index 0000000..7144c2a
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTest.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Migrate\d7\MigrateTaxonomyVocabularyTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Migrate\d7;
+
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\taxonomy\VocabularyInterface;
+
+/**
+ * Migrate taxonomy vocabularies to taxonomy.vocabulary.*.yml.
+ *
+ * @group taxonomy
+ */
+class MigrateTaxonomyVocabularyTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('taxonomy');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_taxonomy_vocabulary');
+  }
+
+  /**
+   * Validate a migrated vocabulary contains the expected values.
+   *
+   * @param $id
+   *   Entity ID to load and check.
+   * @param $expected_label
+   *   The label the migrated entity should have.
+   * @param $expected_description
+   *   The description the migrated entity should have.
+   * @param $expected_hierarchy
+   *   The hierarchy setting the migrated entity should have.
+   * @param $expected_weight
+   *   The weight the migrated entity should have.
+   */
+  protected function assertEntity($id, $expected_label, $expected_description, $expected_hierarchy, $expected_weight) {
+    /** @var \Drupal\taxonomy\VocabularyInterface $entity */
+    $entity = Vocabulary::load($id);
+    $this->assertTrue($entity instanceof VocabularyInterface);
+    $this->assertIdentical($expected_label, $entity->label());
+    $this->assertIdentical($expected_description, $entity->getDescription());
+    $this->assertIdentical($expected_hierarchy, $entity->getHierarchy());
+    $this->assertIdentical($expected_weight, $entity->get('weight'));
+  }
+
+  /**
+   * Tests the Drupal 7 taxonomy vocabularies to Drupal 8 migration.
+   */
+  public function testTaxonomyVocabulary() {
+    $this->assertEntity('tags', 'Tags', 'Use tags to group articles on similar topics into categories.', TAXONOMY_HIERARCHY_DISABLED, 0);
+    $this->assertEntity('forums', 'Forums', 'Forum navigation vocabulary', TAXONOMY_HIERARCHY_SINGLE, -10);
+    $this->assertEntity('test_vocabulary', 'Test Vocabulary', 'This is the vocabulary description', TAXONOMY_HIERARCHY_SINGLE, 0);
+  }
+
+}
diff --git a/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php
new file mode 100644
index 0000000..a8aec54
--- /dev/null
+++ b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\taxonomy\Kernel\Views\TaxonomyViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\taxonomy\Kernel\Views;
+
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the taxonomy entity.
+ *
+ * @group taxonomy
+ */
+class TaxonomyViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy', 'text', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('taxonomy_term');
+  }
+
+  /**
+   * Check access for taxonomy fields.
+   */
+  public function testTermFields() {
+    $vocab = Vocabulary::create([
+      'vid' => 'random',
+      'name' => 'Randomness',
+    ]);
+    $vocab->save();
+    $term1 = Term::create([
+      'name' => 'Semi random',
+      'vid' => $vocab->id(),
+    ]);
+    $term1->save();
+
+    $term2 = Term::create([
+      'name' => 'Majorly random',
+      'vid' => $vocab->id(),
+    ]);
+    $term2->save();
+
+    $term3 = Term::create([
+      'name' => 'Not really random',
+      'vid' => $vocab->id(),
+    ]);
+    $term3->save();
+
+    $this->assertFieldAccess('taxonomy_term', 'name', 'Majorly random');
+    $this->assertFieldAccess('taxonomy_term', 'name', 'Semi random');
+    $this->assertFieldAccess('taxonomy_term', 'name', 'Not really random');
+    $this->assertFieldAccess('taxonomy_term', 'tid', $term1->id());
+    $this->assertFieldAccess('taxonomy_term', 'tid', $term2->id());
+    $this->assertFieldAccess('taxonomy_term', 'tid', $term3->id());
+    $this->assertFieldAccess('taxonomy_term', 'uuid', $term1->uuid());
+    $this->assertFieldAccess('taxonomy_term', 'uuid', $term2->uuid());
+    $this->assertFieldAccess('taxonomy_term', 'uuid', $term3->uuid());
+  }
+
+}
diff --git a/core/modules/telephone/src/Tests/TelephoneFieldTest.php b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
index 515d7e0..8928e8d 100644
--- a/core/modules/telephone/src/Tests/TelephoneFieldTest.php
+++ b/core/modules/telephone/src/Tests/TelephoneFieldTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\telephone\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the creation of telephone fields.
@@ -50,17 +52,17 @@ protected function setUp() {
   function testTelephoneField() {
 
     // Add the telephone field to the article content type.
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'field_telephone',
       'entity_type' => 'node',
       'type' => 'telephone',
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => 'field_telephone',
       'label' => 'Telephone Number',
       'entity_type' => 'node',
       'bundle' => 'article',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('node', 'article', 'default')
       ->setComponent('field_telephone', array(
diff --git a/core/modules/telephone/src/Tests/TelephoneItemTest.php b/core/modules/telephone/src/Tests/TelephoneItemTest.php
deleted file mode 100644
index 42b7973..0000000
--- a/core/modules/telephone/src/Tests/TelephoneItemTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\telephone\Tests\TelephoneItemTest.
- */
-
-namespace Drupal\telephone\Tests;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests the new entity API for the telephone field type.
- *
- * @group telephone
- */
-class TelephoneItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('telephone');
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Create a telephone field storage and field for validation.
-    entity_create('field_storage_config', array(
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test',
-      'type' => 'telephone',
-    ))->save();
-    entity_create('field_config', array(
-      'entity_type' => 'entity_test',
-      'field_name' => 'field_test',
-      'bundle' => 'entity_test',
-    ))->save();
-  }
-
-  /**
-   * Tests using entity fields of the telephone field type.
-   */
-  public function testTestItem() {
-    // Verify entity creation.
-    $entity = entity_create('entity_test');
-    $value = '+0123456789';
-    $entity->field_test = $value;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    // Verify entity has been created properly.
-    $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
-    $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->field_test->value, $value);
-    $this->assertEqual($entity->field_test[0]->value, $value);
-
-    // Verify changing the field value.
-    $new_value = '+41' . rand(1000000, 9999999);
-    $entity->field_test->value = $new_value;
-    $this->assertEqual($entity->field_test->value, $new_value);
-
-    // Read changed entity and assert changed values.
-    $entity->save();
-    $entity = entity_load('entity_test', $id);
-    $this->assertEqual($entity->field_test->value, $new_value);
-
-    // Test sample item generation.
-    $entity = entity_create('entity_test');
-    $entity->field_test->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-}
diff --git a/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php b/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
new file mode 100644
index 0000000..2935607
--- /dev/null
+++ b/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\telephone\Kernel\TelephoneItemTest.
+ */
+
+namespace Drupal\Tests\telephone\Kernel;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the new entity API for the telephone field type.
+ *
+ * @group telephone
+ */
+class TelephoneItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('telephone');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a telephone field storage and field for validation.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test',
+      'type' => 'telephone',
+    ))->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'field_test',
+      'bundle' => 'entity_test',
+    ])->save();
+  }
+
+  /**
+   * Tests using entity fields of the telephone field type.
+   */
+  public function testTestItem() {
+    // Verify entity creation.
+    $entity = EntityTest::create();
+    $value = '+0123456789';
+    $entity->field_test = $value;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    // Verify entity has been created properly.
+    $id = $entity->id();
+    $entity = entity_load('entity_test', $id);
+    $this->assertTrue($entity->field_test instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->field_test[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->field_test->value, $value);
+    $this->assertEqual($entity->field_test[0]->value, $value);
+
+    // Verify changing the field value.
+    $new_value = '+41' . rand(1000000, 9999999);
+    $entity->field_test->value = $new_value;
+    $this->assertEqual($entity->field_test->value, $new_value);
+
+    // Read changed entity and assert changed values.
+    $entity->save();
+    $entity = entity_load('entity_test', $id);
+    $this->assertEqual($entity->field_test->value, $new_value);
+
+    // Test sample item generation.
+    $entity = EntityTest::create();
+    $entity->field_test->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+}
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 9cb3038..85abaf4 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -4,6 +4,7 @@
  * @file
  * Contains \Drupal\text\Plugin\Field\FieldFormatter\TextTrimmedFormatter.
  */
+
 namespace Drupal\text\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FormatterBase;
diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
index a386b5f..080757e 100644
--- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
+++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\text\Plugin\migrate\cckfield;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
 
diff --git a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
index 324f2cf..437b8b6 100644
--- a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\text\Tests\Formatter;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\filter\Entity\FilterFormat;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the text formatters functionality.
@@ -44,7 +46,7 @@ class TextFormatterTest extends EntityUnitTestBase {
   protected function setUp() {
     parent::setUp();
 
-    entity_create('filter_format', array(
+    FilterFormat::create(array(
       'format' => 'my_text_format',
       'name' => 'My text format',
       'filters' => array(
@@ -55,18 +57,18 @@ protected function setUp() {
       ),
     ))->save();
 
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => 'formatted_text',
       'entity_type' => $this->entityType,
       'type' => 'text',
       'settings' => array(),
     ))->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'entity_type' => $this->entityType,
       'bundle' => $this->bundle,
       'field_name' => 'formatted_text',
       'label' => 'Filtered text',
-    ))->save();
+    ])->save();
   }
 
   /**
@@ -80,7 +82,9 @@ public function testFormatters() {
     );
 
     // Create the entity to be referenced.
-    $entity = entity_create($this->entityType, array('name' => $this->randomMachineName()));
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomMachineName()));
     $entity->formatted_text = array(
       'value' => 'Hello, world!',
       'format' => 'my_text_format',
diff --git a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php b/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
deleted file mode 100644
index 02eefb9..0000000
--- a/core/modules/text/src/Tests/Migrate/MigrateTextConfigsTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\text\Tests\Migrate\MigrateTextConfigsTest.
- */
-
-namespace Drupal\text\Tests\Migrate;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to text.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('text_settings');
-  }
-
-  /**
-   * Tests migration of text variables to text.settings.yml.
-   */
-  public function testTextSettings() {
-    $config = $this->config('text.settings');
-    $this->assertIdentical(456, $config->get('default_summary_length'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'text.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index 8279a6d..9d44003 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -8,7 +8,10 @@
 namespace Drupal\text\Tests;
 
 use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\String\StringFieldTest;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the creation of text fields.
@@ -39,7 +42,7 @@ function testTextFieldValidation() {
     // Create a field with settings to validate.
     $max_length = 3;
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => 'text',
@@ -48,13 +51,13 @@ function testTextFieldValidation() {
       )
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
-    ))->save();
+    ])->save();
 
     // Test validation with valid and invalid values.
-    $entity = entity_create('entity_test');
+    $entity = EntityTest::create();
     for ($i = 0; $i <= $max_length + 2; $i++) {
       $entity->{$field_name}->value = str_repeat('x', $i);
       $violations = $entity->{$field_name}->validate();
@@ -73,32 +76,32 @@ function testTextFieldValidation() {
   function testRequiredLongTextWithFileUpload() {
     // Create a text field.
     $text_field_name = 'text_long';
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $text_field_name,
       'entity_type' => 'entity_test',
       'type' => 'text_with_summary',
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
       'required' => TRUE,
-    ))->save();
+    ])->save();
 
     // Create a file field.
     $file_field_name = 'file_field';
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $file_field_name,
       'entity_type' => 'entity_test',
       'type' => 'file'
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
-    ))->save();
+    ])->save();
 
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($text_field_name, array(
@@ -151,17 +154,17 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
 
     // Create a field.
     $field_name = Unicode::strtolower($this->randomMachineName());
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'entity_test',
       'type' => $field_type
     ));
     $field_storage->save();
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomMachineName() . '_label',
-    ))->save();
+    ])->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
         'type' => $widget_type,
diff --git a/core/modules/text/src/Tests/TextSummaryTest.php b/core/modules/text/src/Tests/TextSummaryTest.php
index 7b1dfab..c5431a8 100644
--- a/core/modules/text/src/Tests/TextSummaryTest.php
+++ b/core/modules/text/src/Tests/TextSummaryTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\text\Tests;
 
 use Drupal\simpletest\KernelTestBase;
+use Drupal\filter\Entity\FilterFormat;
 
 /**
  * Tests text_summary() with different strings and lengths.
@@ -21,7 +22,6 @@ class TextSummaryTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', 'url_alias');
     $this->installConfig(array('text'));
   }
 
@@ -55,7 +55,7 @@ function testLongSentence() {
    * Test various summary length edge cases.
    */
   function testLength() {
-    entity_create('filter_format', array(
+    FilterFormat::create(array(
       'format' => 'autop',
       'filters' => array(
         'filter_autop' => array(
@@ -63,7 +63,7 @@ function testLength() {
         ),
       ),
     ))->save();
-    entity_create('filter_format', array(
+    FilterFormat::create(array(
       'format' => 'autop_correct',
       'filters' => array(
         'filter_autop' => array(
diff --git a/core/modules/text/src/Tests/TextWithSummaryItemTest.php b/core/modules/text/src/Tests/TextWithSummaryItemTest.php
deleted file mode 100644
index e292ffd..0000000
--- a/core/modules/text/src/Tests/TextWithSummaryItemTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\text\Tests\TextWithSummaryItemTest.
- */
-
-namespace Drupal\text\Tests;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Tests using entity fields of the text summary field type.
- *
- * @group text
- */
-class TextWithSummaryItemTest extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('filter');
-
-  /**
-   * Field storage entity.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig.
-   */
-  protected $fieldStorage;
-
-  /**
-   * Field entity.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
-
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test_rev');
-
-    // Create the necessary formats.
-    $this->installConfig(array('filter'));
-    entity_create('filter_format', array(
-      'format' => 'no_filters',
-      'filters' => array(),
-    ))->save();
-  }
-
-  /**
-   * Tests processed properties.
-   */
-  public function testCrudAndUpdate() {
-    $entity_type = 'entity_test';
-    $this->createField($entity_type);
-
-    // Create an entity with a summary and no text format.
-    $entity = entity_create($entity_type);
-    $entity->summary_field->value = $value = $this->randomMachineName();
-    $entity->summary_field->summary = $summary = $this->randomMachineName();
-    $entity->summary_field->format = NULL;
-    $entity->name->value = $this->randomMachineName();
-    $entity->save();
-
-    $entity = entity_load($entity_type, $entity->id());
-    $this->assertTrue($entity->summary_field instanceof FieldItemListInterface, 'Field implements interface.');
-    $this->assertTrue($entity->summary_field[0] instanceof FieldItemInterface, 'Field item implements interface.');
-    $this->assertEqual($entity->summary_field->value, $value);
-    $this->assertEqual($entity->summary_field->summary, $summary);
-    $this->assertNull($entity->summary_field->format);
-    // Even if no format is given, if text processing is enabled, the default
-    // format is used.
-    $this->assertEqual($entity->summary_field->processed, "<p>$value</p>\n");
-    $this->assertEqual($entity->summary_field->summary_processed, "<p>$summary</p>\n");
-
-    // Change the format, this should update the processed properties.
-    $entity->summary_field->format = 'no_filters';
-    $this->assertEqual($entity->summary_field->processed, $value);
-    $this->assertEqual($entity->summary_field->summary_processed, $summary);
-
-    // Test the generateSampleValue() method.
-    $entity = entity_create($entity_type);
-    $entity->summary_field->generateSampleItems();
-    $this->entityValidateAndSave($entity);
-  }
-
-  /**
-   * Creates a text_with_summary field storage and field.
-   *
-   * @param string $entity_type
-   *   Entity type for which the field should be created.
-   */
-  protected function createField($entity_type) {
-    // Create a field .
-    $this->fieldStorage = entity_create('field_storage_config', array(
-      'field_name' => 'summary_field',
-      'entity_type' => $entity_type,
-      'type' => 'text_with_summary',
-      'settings' => array(
-        'max_length' => 10,
-      )
-    ));
-    $this->fieldStorage->save();
-    $this->field = entity_create('field_config', array(
-      'field_storage' => $this->fieldStorage,
-      'bundle' => $entity_type,
-    ));
-    $this->field->save();
-  }
-
-}
diff --git a/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php b/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
new file mode 100644
index 0000000..fd2c15d
--- /dev/null
+++ b/core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\text\Kernel\Migrate\MigrateTextConfigsTest.
+ */
+
+namespace Drupal\Tests\text\Kernel\Migrate;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to text.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateTextConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('text_settings');
+  }
+
+  /**
+   * Tests migration of text variables to text.settings.yml.
+   */
+  public function testTextSettings() {
+    $config = $this->config('text.settings');
+    $this->assertIdentical(456, $config->get('default_summary_length'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'text.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php b/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
new file mode 100644
index 0000000..cb3519a
--- /dev/null
+++ b/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\text\Kernel\TextWithSummaryItemTest.
+ */
+
+namespace Drupal\Tests\text\Kernel;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\field\Kernel\FieldKernelTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\filter\Entity\FilterFormat;
+
+/**
+ * Tests using entity fields of the text summary field type.
+ *
+ * @group text
+ */
+class TextWithSummaryItemTest extends FieldKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter');
+
+  /**
+   * Field storage entity.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig.
+   */
+  protected $fieldStorage;
+
+  /**
+   * Field entity.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+
+    // Create the necessary formats.
+    $this->installConfig(array('filter'));
+    FilterFormat::create(array(
+      'format' => 'no_filters',
+      'filters' => array(),
+    ))->save();
+  }
+
+  /**
+   * Tests processed properties.
+   */
+  public function testCrudAndUpdate() {
+    $entity_type = 'entity_test';
+    $this->createField($entity_type);
+
+    // Create an entity with a summary and no text format.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    $entity->summary_field->value = $value = $this->randomMachineName();
+    $entity->summary_field->summary = $summary = $this->randomMachineName();
+    $entity->summary_field->format = NULL;
+    $entity->name->value = $this->randomMachineName();
+    $entity->save();
+
+    $entity = entity_load($entity_type, $entity->id());
+    $this->assertTrue($entity->summary_field instanceof FieldItemListInterface, 'Field implements interface.');
+    $this->assertTrue($entity->summary_field[0] instanceof FieldItemInterface, 'Field item implements interface.');
+    $this->assertEqual($entity->summary_field->value, $value);
+    $this->assertEqual($entity->summary_field->summary, $summary);
+    $this->assertNull($entity->summary_field->format);
+    // Even if no format is given, if text processing is enabled, the default
+    // format is used.
+    $this->assertEqual($entity->summary_field->processed, "<p>$value</p>\n");
+    $this->assertEqual($entity->summary_field->summary_processed, "<p>$summary</p>\n");
+
+    // Change the format, this should update the processed properties.
+    $entity->summary_field->format = 'no_filters';
+    $this->assertEqual($entity->summary_field->processed, $value);
+    $this->assertEqual($entity->summary_field->summary_processed, $summary);
+
+    // Test the generateSampleValue() method.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    $entity->summary_field->generateSampleItems();
+    $this->entityValidateAndSave($entity);
+  }
+
+  /**
+   * Creates a text_with_summary field storage and field.
+   *
+   * @param string $entity_type
+   *   Entity type for which the field should be created.
+   */
+  protected function createField($entity_type) {
+    // Create a field .
+    $this->fieldStorage = FieldStorageConfig::create(array(
+      'field_name' => 'summary_field',
+      'entity_type' => $entity_type,
+      'type' => 'text_with_summary',
+      'settings' => array(
+        'max_length' => 10,
+      )
+    ));
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => $entity_type,
+    ]);
+    $this->field->save();
+  }
+
+}
diff --git a/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php b/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
index 78060d6..38ee0d1 100644
--- a/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
+++ b/core/modules/text/tests/src/Unit/Migrate/TextFieldTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Tests\text\Unit\Migrate;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 use Drupal\Tests\UnitTestCase;
 use Drupal\text\Plugin\migrate\cckfield\TextField;
@@ -25,7 +25,7 @@ class TextFieldTest extends UnitTestCase {
   protected $plugin;
 
   /**
-   * @var \Drupal\migrate\Entity\MigrationInterface
+   * @var \Drupal\migrate\Plugin\MigrationInterface
    */
   protected $migration;
 
diff --git a/core/modules/text/text.js b/core/modules/text/text.js
index 615a1e6..ad89bd8 100644
--- a/core/modules/text/text.js
+++ b/core/modules/text/text.js
@@ -3,7 +3,7 @@
  * Text behaviors.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -58,4 +58,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/toolbar/tests/modules/toolbar_disable_user_toolbar/toolbar_disable_user_toolbar.module b/core/modules/toolbar/tests/modules/toolbar_disable_user_toolbar/toolbar_disable_user_toolbar.module
index 0678998..27ce3e0 100644
--- a/core/modules/toolbar/tests/modules/toolbar_disable_user_toolbar/toolbar_disable_user_toolbar.module
+++ b/core/modules/toolbar/tests/modules/toolbar_disable_user_toolbar/toolbar_disable_user_toolbar.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Test module.
+ */
+
+/**
  * Implements hook_toolbar_alter().
  */
 function toolbar_disable_user_toolbar_toolbar_alter(&$items) {
diff --git a/core/modules/toolbar/toolbar.api.php b/core/modules/toolbar/toolbar.api.php
index bcddaf8..b2d0409 100644
--- a/core/modules/toolbar/toolbar.api.php
+++ b/core/modules/toolbar/toolbar.api.php
@@ -4,6 +4,7 @@
  * @file
  * Hooks provided by the toolbar module.
  */
+
 use Drupal\Core\Url;
 
 /**
diff --git a/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php b/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php
new file mode 100644
index 0000000..49c5da2
--- /dev/null
+++ b/core/modules/tour/src/Plugin/HelpSection/TourHelpSection.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tour\Plugin\HelpSection\TourHelpSection.
+ */
+
+namespace Drupal\tour\Plugin\HelpSection;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Url;
+use Drupal\help\Plugin\HelpSection\HelpSectionPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides the tours list section for the help page.
+ *
+ * @HelpSection(
+ *   id = "tour",
+ *   title = @Translation("Tours"),
+ *   description = @Translation("Tours guide you through workflows or explain concepts on various user interface pages. The tours with links in this list are on user interface landing pages; the tours without links will show on individual pages (such as when editing a View using the Views UI module). Available tours:"),
+ *   permission = "access tour"
+ * )
+ */
+class TourHelpSection extends HelpSectionPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a TourHelpSection object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity manager service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    // The calculation of which URL (if any) gets put on which tour depends
+    // on a route access check. This can have a lot of inputs, including user
+    // permissions and other factors. Rather than doing a complicated
+    // accounting of the cache metadata for all of these possible factors, set
+    // the max age of the cache to zero to prevent using incorrect cached
+    // information.
+    return 0;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function listTopics() {
+    /** @var \Drupal\tour\TourInterface[] $tours */
+    $tours = $this->entityTypeManager->getStorage('tour')->loadMultiple();
+    // Sort in the manner defined by Tour.
+    uasort($tours, ['Drupal\tour\Entity\Tour', 'sort']);
+
+    // Make a link to each tour, using the first of its routes that can
+    // be linked to by this user, if any.
+    $topics = [];
+    foreach ($tours as $tour) {
+      $title = $tour->label();
+      $id = $tour->id();
+      $routes = $tour->getRoutes();
+      $made_link = FALSE;
+      foreach ($routes as $route) {
+        // Some tours are for routes with parameters. For instance, there is
+        // currently a tour in the Language module for the language edit page,
+        // which appears on all pages with URLs like:
+        // /admin/config/regional/language/edit/LANGCODE.
+        // There is no way to make a link to the page that displays the tour,
+        // because it is a set of pages. The easiest way to detect this is to
+        // use a try/catch exception -- try to make a link, and it will error
+        // out with a missing parameter exception if the route leads to a set
+        // of pages instead of a single page.
+        try {
+          $params = isset($route['route_params']) ? $route['route_params'] : [];
+          $url = Url::fromRoute($route['route_name'], $params);
+          // Skip this route if the current user cannot access it.
+          if (!$url->access()) {
+            continue;
+          }
+
+          // Generate the link HTML directly, using toString(), to catch
+          // missing parameter exceptions now instead of at render time.
+          $topics[$id] = Link::fromTextAndUrl($title, $url)->toString();
+          // If the line above didn't generate an exception, we have a good
+          // link that the user can access.
+          $made_link = TRUE;
+          break;
+        }
+        catch (\Exception $e) {
+          // Exceptions are normally due to routes that need parameters. If
+          // there is an exception, just try the next route and see if we can
+          // find one that will work for us.
+        }
+      }
+      if (!$made_link) {
+        // None of the routes worked to make a link, so at least display the
+        // tour title.
+        $topics[$id] = $title;
+      }
+    }
+
+    return $topics;
+  }
+
+}
diff --git a/core/modules/tour/src/Tests/TourHelpPageTest.php b/core/modules/tour/src/Tests/TourHelpPageTest.php
new file mode 100644
index 0000000..a39d6a6
--- /dev/null
+++ b/core/modules/tour/src/Tests/TourHelpPageTest.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\tour\Tests\TourHelpPageTest.
+ */
+
+namespace Drupal\tour\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Verifies help page display of tours.
+ *
+ * @group help
+ */
+class TourHelpPageTest extends WebTestBase {
+
+  /**
+   * Modules to enable, including some providing tours.
+   *
+   * @var array
+   */
+  public static $modules = ['help', 'tour', 'locale', 'language'];
+
+  /**
+   * User that can access tours and help.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $tourUser;
+
+  /**
+   * A user who can access help but not tours.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $noTourUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create users. For the Tour user, include permissions for the language
+    // tours' parent pages, but not the translation tour's parent page. See
+    // self:getTourList().
+    $this->tourUser = $this->drupalCreateUser(['access administration pages', 'access tour', 'administer languages']);
+    $this->noTourUser = $this->drupalCreateUser(['access administration pages']);
+  }
+
+  /**
+   * Logs in users, tests help pages.
+   */
+  public function testHelp() {
+    $this->drupalLogin($this->tourUser);
+    $this->verifyHelp();
+
+    $this->drupalLogin($this->noTourUser);
+    $this->verifyHelp(FALSE);
+  }
+
+  /**
+   * Verifies the logged in user has access to the help properly.
+   *
+   * @param bool $tours_ok
+   *   (optional) TRUE (default) if the user should see tours, FALSE if not.
+   */
+  protected function verifyHelp($tours_ok = TRUE) {
+    $this->drupalGet('admin/help');
+
+    // All users should be able to see the module section.
+    $this->assertText('Module overviews are provided by modules');
+    foreach ($this->getModuleList() as $name) {
+      $this->assertLink($name);
+    }
+
+    // Some users should be able to see the tour section.
+    if ($tours_ok) {
+      $this->assertText('Tours guide you through workflows');
+    }
+    else {
+      $this->assertNoText('Tours guide you through workflows');
+    }
+
+    $titles = $this->getTourList();
+
+    // Test the titles that should be links.
+    foreach ($titles[0] as $title) {
+      if ($tours_ok) {
+        $this->assertLink($title);
+      }
+      else {
+        $this->assertNoLink($title);
+        // Just test the first item in the list of links that should not
+        // be there, because the second matches the name of a module that is
+        // in the Module overviews section, so the link will be there and
+        // this test will fail. Testing one should be sufficient to verify
+        // the page is working correctly.
+        break;
+      }
+    }
+
+    // Test the titles that should not be links.
+    foreach ($titles[1] as $title) {
+      if ($tours_ok) {
+        $this->assertText($title);
+        $this->assertNoLink($title);
+      }
+      else {
+        $this->assertNoText($title);
+        // Just test the first item in the list of text that should not
+        // be there, because the second matches part of the name of a module
+        // that is in the Module overviews section, so the text will be there
+        // and this test will fail. Testing one should be sufficient to verify
+        // the page is working correctly.
+        break;
+      }
+    }
+  }
+
+  /**
+   * Gets a list of modules to test for hook_help() pages.
+   *
+   * @return array
+   *   A list of module names to test.
+   */
+  protected function getModuleList() {
+    return ['Help', 'Tour'];
+  }
+
+  /**
+   * Gets a list of tours to test.
+   *
+   * @return array
+   *   A list of tour titles to test. The first array element is a list of tours
+   *   with links, and the second is a list of tours without links. Assumes
+   *   that the user being tested has 'administer languages' permission but
+   *   not 'translate interface'.
+   */
+  protected function getTourList() {
+    return [['Adding languages', 'Language'], ['Editing languages', 'Translation']];
+  }
+
+}
diff --git a/core/modules/tour/src/Tests/TourTest.php b/core/modules/tour/src/Tests/TourTest.php
index 7f656d3..cfa311b 100644
--- a/core/modules/tour/src/Tests/TourTest.php
+++ b/core/modules/tour/src/Tests/TourTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\tour\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\tour\Entity\Tour;
 
 /**
  * Tests the functionality of tour tips.
@@ -108,7 +109,7 @@ public function testTourFunctionality() {
     $this->assertNotEqual(count($elements), 1, 'Did not find English variant of tip 1.');
 
     // Programmatically create a tour for use through the remainder of the test.
-    $tour = entity_create('tour', array(
+    $tour = Tour::create(array(
       'id' => 'tour-entity-create-test-en',
       'label' => 'Tour test english',
       'langcode' => 'en',
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php
deleted file mode 100644
index 521e74d..0000000
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerNodeTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerNodeTest.
- */
-
-namespace Drupal\tracker\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\Core\Database\Database;
-
-/**
- * Tests migration of tracker_node.
- *
- * @group tracker
- */
-class MigrateTrackerNodeTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'node',
-    'text',
-    'tracker',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installConfig(static::$modules);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
-
-    $this->executeMigrations([
-      'd7_user_role',
-      'd7_user',
-      'd7_node_type',
-      'd7_node__test_content_type',
-      'd7_tracker_node',
-    ]);
-  }
-
-  /**
-   * Tests migration of tracker node table.
-   */
-  public function testMigrateTrackerNode() {
-    $connection = Database::getConnection('default', 'migrate');
-    $num_rows = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
-    $this->assertIdentical('1', $num_rows);
-
-    $tracker_nodes = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->execute();
-    $row = $tracker_nodes->fetchAssoc();
-    $this->assertIdentical('1', $row['nid']);
-    $this->assertIdentical('1', $row['published']);
-    $this->assertIdentical('1421727536', $row['changed']);
-  }
-
-}
-
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php
deleted file mode 100644
index f37871e..0000000
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerSettingsTest.
- */
-
-namespace Drupal\tracker\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of Tracker settings to configuration.
- *
- * @group tracker
- */
-class MigrateTrackerSettingsTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['tracker'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['tracker']);
-    $this->executeMigration('d7_tracker_settings');
-  }
-
-  /**
-   * Tests migration of tracker's variables to configuration.
-   */
-  public function testMigration() {
-    $this->assertIdentical(999, \Drupal::config('tracker.settings')->get('cron_index_limit'));
-  }
-
-}
diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php
deleted file mode 100644
index a9b4a39..0000000
--- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerUserTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\tracker\Tests\Migrate\d7\MigrateTrackerUserTest.
- */
-
-namespace Drupal\tracker\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\Core\Database\Database;
-
-/**
- * Tests migration of tracker_user.
- *
- * @group tracker
- */
-class MigrateTrackerUserTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [
-    'node',
-    'text',
-    'tracker',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installConfig(static::$modules);
-    $this->installSchema('node', ['node_access']);
-    $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
-
-    $this->executeMigrations([
-      'd7_user_role',
-      'd7_user',
-      'd7_node_type',
-      'd7_node__test_content_type',
-      'd7_tracker_node',
-    ]);
-  }
-
-  /**
-   * Tests migration of tracker user table.
-   */
-  public function testMigrateTrackerUser() {
-    $connection = Database::getConnection('default', 'migrate');
-    $num_rows = $connection
-        ->select('tracker_user', 'tn')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
-    $this->assertIdentical('1', $num_rows);
-
-    $tracker_nodes = $connection
-        ->select('tracker_user', 'tu')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->execute();
-    $row = $tracker_nodes->fetchAssoc();
-    $this->assertIdentical('1', $row['nid']);
-    $this->assertIdentical('2', $row['uid']);
-    $this->assertIdentical('1', $row['published']);
-    $this->assertIdentical('1421727536', $row['changed']);
-  }
-
-}
diff --git a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
index a8b36e8..923fb0c 100644
--- a/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
+++ b/core/modules/tracker/src/Tests/Views/TrackerTestBase.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Base class for all tracker tests.
@@ -60,7 +61,7 @@ protected function setUp() {
       'status' => 1,
     ));
 
-    $this->comment = entity_create('comment', array(
+    $this->comment = Comment::create(array(
       'entity_id' => $this->node->id(),
       'entity_type' => 'node',
       'field_name' => 'comment',
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
new file mode 100644
index 0000000..fcf50c8
--- /dev/null
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerNodeTest.
+ */
+
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests migration of tracker_node.
+ *
+ * @group tracker
+ */
+class MigrateTrackerNodeTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'node',
+    'text',
+    'tracker',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig(static::$modules);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
+
+    $this->executeMigrations([
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_node:test_content_type',
+      'd7_tracker_node',
+    ]);
+  }
+
+  /**
+   * Tests migration of tracker node table.
+   */
+  public function testMigrateTrackerNode() {
+    $connection = Database::getConnection('default', 'migrate');
+    $num_rows = $connection
+        ->select('tracker_node', 'tn')
+        ->fields('tn', ['nid', 'published', 'changed'])
+        ->countQuery()
+        ->execute()
+        ->fetchField();
+    $this->assertIdentical('1', $num_rows);
+
+    $tracker_nodes = $connection
+        ->select('tracker_node', 'tn')
+        ->fields('tn', ['nid', 'published', 'changed'])
+        ->execute();
+    $row = $tracker_nodes->fetchAssoc();
+    $this->assertIdentical('1', $row['nid']);
+    $this->assertIdentical('1', $row['published']);
+    $this->assertIdentical('1421727536', $row['changed']);
+  }
+
+}
+
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
new file mode 100644
index 0000000..9613959
--- /dev/null
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerSettingsTest.
+ */
+
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of Tracker settings to configuration.
+ *
+ * @group tracker
+ */
+class MigrateTrackerSettingsTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['tracker'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['tracker']);
+    $this->executeMigration('d7_tracker_settings');
+  }
+
+  /**
+   * Tests migration of tracker's variables to configuration.
+   */
+  public function testMigration() {
+    $this->assertIdentical(999, \Drupal::config('tracker.settings')->get('cron_index_limit'));
+  }
+
+}
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
new file mode 100644
index 0000000..4751c36
--- /dev/null
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\tracker\Kernel\Migrate\d7\MigrateTrackerUserTest.
+ */
+
+namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests migration of tracker_user.
+ *
+ * @group tracker
+ */
+class MigrateTrackerUserTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'node',
+    'text',
+    'tracker',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig(static::$modules);
+    $this->installSchema('node', ['node_access']);
+    $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
+
+    $this->executeMigrations([
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_node:test_content_type',
+      'd7_tracker_node',
+    ]);
+  }
+
+  /**
+   * Tests migration of tracker user table.
+   */
+  public function testMigrateTrackerUser() {
+    $connection = Database::getConnection('default', 'migrate');
+    $num_rows = $connection
+        ->select('tracker_user', 'tn')
+        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+        ->countQuery()
+        ->execute()
+        ->fetchField();
+    $this->assertIdentical('1', $num_rows);
+
+    $tracker_nodes = $connection
+        ->select('tracker_user', 'tu')
+        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+        ->execute();
+    $row = $tracker_nodes->fetchAssoc();
+    $this->assertIdentical('1', $row['nid']);
+    $this->assertIdentical('2', $row['uid']);
+    $this->assertIdentical('1', $row['published']);
+    $this->assertIdentical('1421727536', $row['changed']);
+  }
+
+}
diff --git a/core/modules/update/src/Form/UpdateManagerInstall.php b/core/modules/update/src/Form/UpdateManagerInstall.php
index 28e0507..f47e3ee 100644
--- a/core/modules/update/src/Form/UpdateManagerInstall.php
+++ b/core/modules/update/src/Form/UpdateManagerInstall.php
@@ -128,7 +128,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $uploaded_file = $this->getRequest()->files->get('files[project_upload]', NULL, TRUE);
-    if (!($form_state->getValue('project_url') XOR !empty($uploaded_file))) {
+    if (!($form_state->getValue('project_url') xor !empty($uploaded_file))) {
       $form_state->setErrorByName('project_url', $this->t('You must either provide a URL or upload an archive file to install.'));
     }
   }
@@ -245,7 +245,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       // The page title must be passed here to ensure it is initially used when
       // authorize.php loads for the first time with the FTP/SSH credentials
       // form.
-      system_authorized_init('update_authorize_run_install', drupal_get_path('module', 'update') . '/update.authorize.inc', $arguments, $this->t('Update manager'));
+      system_authorized_init('update_authorize_run_install', __DIR__ . '/../../update.authorize.inc', $arguments, $this->t('Update manager'));
       $form_state->setRedirectUrl(system_authorized_get_url());
     }
   }
diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php
index d74d5c4..d1298ca 100644
--- a/core/modules/update/src/Form/UpdateReady.php
+++ b/core/modules/update/src/Form/UpdateReady.php
@@ -169,7 +169,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
         // The page title must be passed here to ensure it is initially used
         // when authorize.php loads for the first time with the FTP/SSH
         // credentials form.
-        system_authorized_init('update_authorize_run_update', drupal_get_path('module', 'update') . '/update.authorize.inc', array($updates), $this->t('Update manager'));
+        system_authorized_init('update_authorize_run_update', __DIR__ . '/../../update.authorize.inc', array($updates), $this->t('Update manager'));
         $form_state->setRedirectUrl(system_authorized_get_url());
       }
     }
diff --git a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
deleted file mode 100644
index 29cf502..0000000
--- a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\update\Tests\Migrate\d6\MigrateUpdateConfigsTest.
- */
-
-namespace Drupal\update\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade variables to update.settings.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = array('update');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('update_settings');
-  }
-
-  /**
-   * Tests migration of update variables to update.settings.yml.
-   */
-  public function testUpdateSettings() {
-    $config = $this->config('update.settings');
-    $this->assertIdentical(2, $config->get('fetch.max_attempts'));
-    $this->assertIdentical('http://updates.drupal.org/release-history', $config->get('fetch.url'));
-    $this->assertIdentical('all', $config->get('notification.threshold'));
-    $this->assertIdentical(array(), $config->get('notification.emails'));
-    $this->assertIdentical(7, $config->get('check.interval_days'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config->get());
-  }
-
-}
diff --git a/core/modules/update/src/Tests/UpdateCoreTest.php b/core/modules/update/src/Tests/UpdateCoreTest.php
index b105780..d76cfed 100644
--- a/core/modules/update/src/Tests/UpdateCoreTest.php
+++ b/core/modules/update/src/Tests/UpdateCoreTest.php
@@ -176,7 +176,7 @@ function testDatestampMismatch() {
     $system_info = array(
       '#all' => array(
         // We need to think we're running a -dev snapshot to see dates.
-        'version' => '8.0.0-dev',
+        'version' => '8.1.0-dev',
         'datestamp' => time(),
       ),
       'block' => array(
diff --git a/core/modules/update/src/Tests/UpdateUploadTest.php b/core/modules/update/src/Tests/UpdateUploadTest.php
index cad7d78..b9635e1 100644
--- a/core/modules/update/src/Tests/UpdateUploadTest.php
+++ b/core/modules/update/src/Tests/UpdateUploadTest.php
@@ -52,7 +52,7 @@ public function testUploadModule() {
     // Check to ensure an existing module can't be reinstalled. Also checks that
     // the archive was extracted since we can't know if the module is already
     // installed until after extraction.
-    $validArchiveFile = drupal_get_path('module', 'update') . '/tests/aaa_update_test.tar.gz';
+    $validArchiveFile = __DIR__ . '/../../tests/aaa_update_test.tar.gz';
     $edit = array(
       'files[project_upload]' => $validArchiveFile,
     );
@@ -65,7 +65,7 @@ public function testUploadModule() {
     $moduleUpdater = $updaters['module']['class'];
     $installedInfoFilePath = $this->container->get('update.root') . '/' . $moduleUpdater::getRootDirectoryRelativePath() . '/update_test_new_module/update_test_new_module.info.yml';
     $this->assertFalse(file_exists($installedInfoFilePath), 'The new module does not exist in the filesystem before it is installed with the Update Manager.');
-    $validArchiveFile = drupal_get_path('module', 'update') . '/tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
+    $validArchiveFile = __DIR__ . '/../../tests/update_test_new_module/8.x-1.0/update_test_new_module.tar.gz';
     $edit = array(
       'files[project_upload]' => $validArchiveFile,
     );
diff --git a/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php b/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
index 600d8bf..b834bbe 100644
--- a/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
+++ b/core/modules/update/tests/modules/update_test/src/Controller/UpdateTestController.php
@@ -68,8 +68,7 @@ public function updateTest($project_name, $version) {
       $availability_scenario = '#broken#';
     }
 
-    $path = drupal_get_path('module', 'update_test');
-    $file = "$path/$project_name.$availability_scenario.xml";
+    $file = __DIR__ . "/../../$project_name.$availability_scenario.xml";
     $headers = array('Content-Type' => 'text/xml; charset=utf-8');
     if (!is_file($file)) {
       // Return an empty response.
diff --git a/core/modules/update/tests/modules/update_test/update_test.module b/core/modules/update/tests/modules/update_test/update_test.module
index f8de3cd..04a77e9 100644
--- a/core/modules/update/tests/modules/update_test/update_test.module
+++ b/core/modules/update/tests/modules/update_test/update_test.module
@@ -1,12 +1,12 @@
 <?php
 
-use Drupal\Core\Extension\Extension;
-
 /**
  * @file
  * Module for testing Update Manager functionality.
  */
 
+use Drupal\Core\Extension\Extension;
+
 /**
  * Implements hook_system_info_alter().
  *
diff --git a/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
new file mode 100644
index 0000000..d491c7d
--- /dev/null
+++ b/core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\update\Kernel\Migrate\d6\MigrateUpdateConfigsTest.
+ */
+
+namespace Drupal\Tests\update\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade variables to update.settings.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('update');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('update_settings');
+  }
+
+  /**
+   * Tests migration of update variables to update.settings.yml.
+   */
+  public function testUpdateSettings() {
+    $config = $this->config('update.settings');
+    $this->assertIdentical(2, $config->get('fetch.max_attempts'));
+    $this->assertIdentical('http://updates.drupal.org/release-history', $config->get('fetch.url'));
+    $this->assertIdentical('all', $config->get('notification.threshold'));
+    $this->assertIdentical(array(), $config->get('notification.emails'));
+    $this->assertIdentical(7, $config->get('check.interval_days'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config->get());
+  }
+
+}
diff --git a/core/modules/user/config/install/user.mail.yml b/core/modules/user/config/install/user.mail.yml
index f8e41ce..9f2ad67 100644
--- a/core/modules/user/config/install/user.mail.yml
+++ b/core/modules/user/config/install/user.mail.yml
@@ -20,7 +20,7 @@ status_activated:
   body: "[user:display-name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:account-name]\npassword: Your password\n\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (approved)'
 status_blocked:
-  body: "[user:display-name],\n\nYour account on [site:account-name] has been blocked.\n\n--  [site:name] team"
+  body: "[user:display-name],\n\nYour account on [site:name] has been blocked.\n\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (blocked)'
 status_canceled:
   body: "[user:display-name],\n\nYour account on [site:name] has been canceled.\n\n--  [site:name] team"
diff --git a/core/modules/user/config/schema/user.destination.schema.yml b/core/modules/user/config/schema/user.destination.schema.yml
deleted file mode 100644
index e95158e..0000000
--- a/core/modules/user/config/schema/user.destination.schema.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Schema for the migrate destination plugin.
-
-migrate.destination.entity:user:
-  type: migrate_destination
-  label: 'User'
-  mapping:
-    md5_passwords:
-      type: boolean
-      label: 'Passwords'
diff --git a/core/modules/user/config/schema/user.source.schema.yml b/core/modules/user/config/schema/user.source.schema.yml
deleted file mode 100644
index 81d3a38..0000000
--- a/core/modules/user/config/schema/user.source.schema.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# Schema for the user module's migration source plugins.
-
-migrate.source.d6_user:
-  type: migrate_source_sql
-  label: 'Drupal 6 user'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constants'
-      mapping:
-        key:
-          type: string
-          label: 'User data key'
-        module:
-          type: string
-          label: 'Module name'
-
-migrate.source.d6_user_picture_file:
-  type: migrate_source_sql
-  label: 'Drupal 6 user picture display'
-  mapping:
-    constants:
-      type: mapping
-      label: 'Constant'
-      mapping:
-        is_public:
-          type: boolean
-          label: 'Public'
-
-migrate.source.d6_user_picture_instance:
-  type: migrate_source_sql
-  label: 'Drupal 6 user picture display'
-  mapping:
-    provider:
-      type: string
-      label: 'Provider'
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
-
-migrate.source.profile_field:
-  type: migrate_source_sql
-  label: 'Profile field'
-  mapping:
-    constants:
-      type: migrate_entity_constant
-      label: 'Constants'
diff --git a/core/modules/user/images/icon-user-active.png b/core/modules/user/images/icon-user-active.png
deleted file mode 100644
index 3c9d73b..0000000
--- a/core/modules/user/images/icon-user-active.png
+++ /dev/null
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDRĴl;tEXtSoftwareAdobe ImageReadyq�e<
IDATx�b`v�߿@����?߇��6��߿
-@|��c� q������?��DžA��2����
�:O���lll�Yp����?�a�U�H�(���
�f< )�A�˗/��q����#���~ �
�H�"̑�������O�@�'�?��F ^������9���޽�.��X���с�
�H>���@�AHH���o߾mR���%�dh������o޼�RT�F�W�^��|��a�� f����H,��	�\<��4��d���dIEND�B`�
\ No newline at end of file
diff --git a/core/modules/user/images/icon-user.png b/core/modules/user/images/icon-user.png
deleted file mode 100644
index 3c847c6..0000000
--- a/core/modules/user/images/icon-user.png
+++ /dev/null
@@ -1,6 +0,0 @@
-�PNG
-
-
IHDRĴl;tEXtSoftwareAdobe ImageReadyq�e<
&IDATx�b`j�����'O
-022��@l��x����'��� ���Ǐ+
�d*`�~4�����
6�,�����|�2@�A�$��СC o�'"8
���.���
-O$0(J�E�d�Ȉ5�pipuu}�@̀�#�`�8���`��/���� �7oEN�$�oR|}}?l�^�z5�u
@�C3�f��ƒ@zChh��W�\�40W�$|Z�>
l�e���
�@#�%K@^�O�0f
��ZD0=
-��`P����C��0q��W�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/user/migration_templates/d6_profile_values.yml b/core/modules/user/migration_templates/d6_profile_values.yml
index cb36b0e..7d4fbdd 100644
--- a/core/modules/user/migration_templates/d6_profile_values.yml
+++ b/core/modules/user/migration_templates/d6_profile_values.yml
@@ -1,5 +1,6 @@
 id: d6_profile_values
 label: Profile values
+class: Drupal\user\Plugin\migrate\ProfileValues
 migration_tags:
   - Drupal 6
 builder:
diff --git a/core/modules/user/migration_templates/d6_user.yml b/core/modules/user/migration_templates/d6_user.yml
index 6d5795b..bf6ec2a 100644
--- a/core/modules/user/migration_templates/d6_user.yml
+++ b/core/modules/user/migration_templates/d6_user.yml
@@ -26,6 +26,7 @@ process:
     plugin: migration
     migration: d6_user_picture_file
     source: uid
+    no_stub: true
 destination:
   plugin: entity:user
   md5_passwords: true
diff --git a/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
old mode 100755
new mode 100644
index 703b136..12147f8
--- a/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -2,8 +2,7 @@ id: d7_user
 label: User accounts
 migration_tags:
   - Drupal 7
-builder:
-  plugin: d7_user
+class: Drupal\user\Plugin\migrate\User
 source:
   plugin: d7_user
 process:
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index 8b0149e..9199c73 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -127,8 +127,9 @@ public function form(array $form, FormStateInterface $form_state) {
       // To skip the current password field, the user must have logged in via a
       // one-time link and have the token in the URL. Store this in $form_state
       // so it persists even on subsequent Ajax requests.
-      if (!$form_state->get('user_pass_reset')) {
-        $user_pass_reset = isset($_SESSION['pass_reset_' . $account->id()]) && Crypt::hashEquals($_SESSION['pass_reset_' . $account->id()], \Drupal::request()->query->get('pass-reset-token'));
+      if (!$form_state->get('user_pass_reset') && ($token = $this->getRequest()->get('pass-reset-token'))) {
+        $session_key = 'pass_reset_' . $account->id();
+        $user_pass_reset = isset($_SESSION[$session_key]) && Crypt::hashEquals($_SESSION[$session_key], $token);
         $form_state->set('user_pass_reset', $user_pass_reset);
       }
 
diff --git a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
index 361e7ce..681abc6 100644
--- a/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
+++ b/core/modules/user/src/EventSubscriber/AccessDeniedSubscriber.php
@@ -43,7 +43,7 @@ class AccessDeniedSubscriber implements EventSubscriberInterface {
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
    *   The URL generator.
    */
-  public function __construct(AccountInterface $account, URLGeneratorInterface $url_generator) {
+  public function __construct(AccountInterface $account, UrlGeneratorInterface $url_generator) {
     $this->account = $account;
     $this->setUrlGenerator($url_generator);
   }
diff --git a/core/modules/user/src/PermissionHandler.php b/core/modules/user/src/PermissionHandler.php
index ac6e9bb..0e5489e 100644
--- a/core/modules/user/src/PermissionHandler.php
+++ b/core/modules/user/src/PermissionHandler.php
@@ -163,8 +163,8 @@ protected function buildPermissionsYaml() {
 
               $callback_permission += array(
                 'description' => NULL,
+                'provider' => $provider,
               );
-              $callback_permission['provider'] = $provider;
 
               $all_callback_permissions[$name] = $callback_permission;
             }
@@ -182,7 +182,7 @@ protected function buildPermissionsYaml() {
         }
         $permission['title'] = $this->t($permission['title']);
         $permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
-        $permission['provider'] = $provider;
+        $permission['provider'] = !empty($permission['provider']) ? $permission['provider'] : $provider;
       }
 
       $all_permissions += $permissions;
diff --git a/core/modules/user/src/Plugin/migrate/ProfileValues.php b/core/modules/user/src/Plugin/migrate/ProfileValues.php
new file mode 100644
index 0000000..0c3e51a
--- /dev/null
+++ b/core/modules/user/src/Plugin/migrate/ProfileValues.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Plugin\migrate\ProfileValues.
+ */
+
+namespace Drupal\user\Plugin\migrate;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\Migration;
+
+/**
+ * Plugin class for user migrations dealing with profile values.
+ */
+class ProfileValues extends Migration {
+
+  /**
+   * Flag determining whether the process plugin has been initialized.
+   *
+   * @var bool
+   */
+  protected $init = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    if (!$this->init) {
+      $this->init = TRUE;
+      $definition['source'] = [
+        'plugin' => 'profile_field',
+        'ignore_map' => TRUE,
+      ] + $this->source;
+      $definition['destination']['plugin'] = 'null';
+      try {
+        $profile_field_migration = $this->migrationPluginManager->createStubMigration($definition);
+        $source_plugin = $profile_field_migration->getSourcePlugin();
+        $source_plugin->checkRequirements();
+        foreach ($source_plugin as $row) {
+          $name = $row->getSourceProperty('name');
+          $this->process[$name] = $name;
+        }
+      }
+      catch (RequirementsException $e) {
+        // The checkRequirements() call will fail when the profile module does
+        // not exist on the source site.
+      }
+    }
+    return parent::getProcess();
+  }
+
+}
diff --git a/core/modules/user/src/Plugin/migrate/User.php b/core/modules/user/src/Plugin/migrate/User.php
new file mode 100644
index 0000000..0586016
--- /dev/null
+++ b/core/modules/user/src/Plugin/migrate/User.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Plugin\migrate\User.
+ */
+
+namespace Drupal\user\Plugin\migrate;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\Migration;
+
+/**
+ * Plugin class for Drupal 7 user migrations dealing with fields and profiles.
+ */
+class User extends Migration {
+
+  /**
+   * Flag indicating whether the CCK data has been filled already.
+   *
+   * @var bool
+   */
+  protected $init = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getProcess() {
+    if (!$this->init) {
+      $this->init = TRUE;
+      $definition['source'] = [
+        'entity_type' => 'user',
+        'ignore_map' => TRUE,
+      ] + $this->source;
+      $definition['destination']['plugin'] = 'null';
+      if (\Drupal::moduleHandler()->moduleExists('field')) {
+        $definition['source']['plugin'] = 'd7_field_instance';
+        $field_migration = $this->migrationPluginManager->createStubMigration($definition);
+        foreach ($field_migration->getSourcePlugin() as $row) {
+          $field_name = $row->getSourceProperty('field_name');
+          $this->process[$field_name] = $field_name;
+        }
+      }
+      try {
+        $definition['source']['plugin'] = 'profile_field';
+        $profile_migration = $this->migrationPluginManager->createStubMigration($definition);
+        // Ensure that Profile is enabled in the source DB.
+        $profile_migration->checkRequirements();
+        foreach ($profile_migration->getSourcePlugin() as $row) {
+          $name = $row->getSourceProperty('name');
+          $this->process[$name] = $name;
+        }
+      }
+      catch (RequirementsException $e) {
+        // The checkRequirements() call will fail when the profile module does
+        // not exist on the source site.
+      }
+    }
+    return parent::getProcess();
+  }
+
+}
diff --git a/core/modules/user/src/Plugin/migrate/builder/d6/ProfileValues.php b/core/modules/user/src/Plugin/migrate/builder/d6/ProfileValues.php
deleted file mode 100644
index be33173..0000000
--- a/core/modules/user/src/Plugin/migrate/builder/d6/ProfileValues.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\builder\d6\ProfileValues.
- */
-
-namespace Drupal\user\Plugin\migrate\builder\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-
-/**
- * @PluginID("d6_profile_values")
- */
-class ProfileValues extends BuilderBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migration = Migration::create($template);
-
-    // @TODO The source plugin should accept a database connection.
-    // @see https://www.drupal.org/node/2552791
-    $source_plugin = $this->getSourcePlugin('profile_field', $template['source']);
-    try {
-      $source_plugin->checkRequirements();
-    }
-    catch (RequirementsException $e) {
-      return [];
-    }
-
-    foreach ($source_plugin as $field) {
-      $migration->setProcessOfProperty($field->getSourceProperty('name'), $field->getSourceProperty('name'));
-    }
-
-    return [$migration];
-  }
-
-}
diff --git a/core/modules/user/src/Plugin/migrate/builder/d7/User.php b/core/modules/user/src/Plugin/migrate/builder/d7/User.php
deleted file mode 100644
index 10bcb47..0000000
--- a/core/modules/user/src/Plugin/migrate/builder/d7/User.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Plugin\migrate\builder\d7\User.
- */
-
-namespace Drupal\user\Plugin\migrate\builder\d7;
-
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * @PluginID("d7_user")
- */
-class User extends BuilderBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  /**
-   * Constructs a d7_user builder plugin instance.
-   *
-   * @param array $configuration
-   *   The plugin configuration.
-   * @param string $plugin_id
-   *   The plugin ID.
-   * @param mixed $plugin_definition
-   *   The plugin definition.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moduleHandler = $module_handler;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('module_handler')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildMigrations(array $template) {
-    $migration = Migration::create($template);
-
-    if ($this->moduleHandler->moduleExists('field')) {
-      $template['source']['entity_type'] = 'user';
-
-      $source_plugin = $this->getSourcePlugin('d7_field_instance', $template['source']);
-      foreach ($source_plugin as $field) {
-        $field_name = $field->getSourceProperty('field_name');
-        $migration->setProcessOfProperty($field_name, $field_name);
-      }
-    }
-
-    try {
-      $profile_fields = $this->getSourcePlugin('profile_field', $template['source']);
-      // Ensure that Profile is enabled in the source DB.
-      $profile_fields->checkRequirements();
-      foreach ($profile_fields as $field) {
-        $field_name = $field->getSourceProperty('name');
-        $migration->setProcessOfProperty($field_name, $field_name);
-      }
-    }
-    catch (RequirementsException $e) {
-      // Profile is not enabled in the source DB, so don't do anything.
-    }
-
-    return [$migration];
-  }
-
-}
diff --git a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
index beda7c8..e85d5cd 100644
--- a/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
+++ b/core/modules/user/src/Plugin/migrate/destination/EntityUser.php
@@ -13,7 +13,7 @@
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\Plugin\Field\FieldType\EmailItem;
 use Drupal\Core\Password\PasswordInterface;
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\user\MigratePassword;
 use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
@@ -43,7 +43,7 @@ class EntityUser extends EntityContentBase {
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param EntityStorageInterface $storage
    *   The storage for this entity type.
diff --git a/core/modules/user/src/Plugin/migrate/destination/UserData.php b/core/modules/user/src/Plugin/migrate/destination/UserData.php
index 5ae639f..6f968b8 100644
--- a/core/modules/user/src/Plugin/migrate/destination/UserData.php
+++ b/core/modules/user/src/Plugin/migrate/destination/UserData.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\user\Plugin\migrate\destination;
 
-use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\user\UserData as UserDataStorage;
 use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
@@ -35,7 +35,7 @@ class UserData extends DestinationBase implements ContainerFactoryPluginInterfac
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\migrate\Entity\MigrationInterface $migration
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   The migration.
    * @param \Drupal\user\UserData $user_data
    *   The user data service.
diff --git a/core/modules/user/src/RegisterForm.php b/core/modules/user/src/RegisterForm.php
index d236dd3..fc8b0ca 100644
--- a/core/modules/user/src/RegisterForm.php
+++ b/core/modules/user/src/RegisterForm.php
@@ -7,10 +7,7 @@
 
 namespace Drupal\user;
 
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
 
 /**
  * Form handler for the user register forms.
@@ -20,13 +17,6 @@ class RegisterForm extends AccountForm {
   /**
    * {@inheritdoc}
    */
-  public function __construct(EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, QueryFactory $entity_query) {
-    parent::__construct($entity_manager, $language_manager, $entity_query);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function form(array $form, FormStateInterface $form_state) {
     $user = $this->currentUser();
     /** @var \Drupal\user\UserInterface $account */
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
deleted file mode 100644
index 5849650..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserAdminPassTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserAdminPassTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\Tests\MigrateTestBase;
-use Drupal\user\Entity\User;
-
-/**
- * Tests preservation of root account password.
- *
- * @group user
- */
-class MigrateUserAdminPassTest extends MigrateTestBase {
-
-  /**
-   * The passwords as retrieved from the account entities before migration.
-   *
-   * @var array
-   */
-  protected $originalPasswords = [];
-
-  /**
-   * Modules to enable.
-   *
-   * @var string[]
-   */
-  public static $modules = ['user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Make sure the admin user and a regular user are created.
-    $this->container->get('module_handler')->loadInclude('user', 'install');
-    $this->installEntitySchema('user');
-    user_install();
-    /** @var \Drupal\user\Entity\User $admin_account */
-    $admin_account = User::load(1);
-    $admin_account->setPassword('original');
-    $admin_account->save();
-    $this->originalPasswords[1] = $admin_account->getPassword();
-
-    /** @var \Drupal\user\Entity\User $user_account */
-    $user_account = User::create([
-      'uid' => 2,
-      'name' => 'original_username',
-      'mail' => 'original_email@example.com',
-      'pass' => 'original_password',
-    ]);
-    $user_account->save();
-    $this->originalPasswords[2] = $user_account->getPassword();
-  }
-
-  /**
-   * Tests preserving the admin user's password.
-   */
-  public function testAdminPasswordPreserved() {
-    $user_data_rows = [
-      [
-        'id' => '1',
-        'username' => 'site_admin',
-        'password' => 'new_password',
-        'email' => 'site_admin@example.com',
-      ],
-      [
-        'id' => '2',
-        'username' => 'random_user',
-        'password' => 'random_password',
-        'email' => 'random_user@example.com',
-      ],
-    ];
-    $ids = ['id' => ['type' => 'integer']];
-    $config = [
-      'id' => 'users',
-      'migration_tags' => ['Admin password test'],
-      'source' => [
-        'plugin' => 'embedded_data',
-        'data_rows' => $user_data_rows,
-        'ids' => $ids,
-      ],
-      'process' => [
-        'uid' => 'id',
-        'name' => 'username',
-        'mail' => 'email',
-        'pass' => 'password',
-      ],
-      'destination' => ['plugin' => 'entity:user'],
-    ];
-    $migration = Migration::create($config);
-    $this->executeMigration($migration);
-
-    // Verify that admin username and email were changed, but password was not.
-    /** @var \Drupal\user\Entity\User $admin_account */
-    $admin_account = User::load(1);
-    $this->assertIdentical($admin_account->getUsername(), 'site_admin');
-    $this->assertIdentical($admin_account->getEmail(), 'site_admin@example.com');
-    $this->assertIdentical($admin_account->getPassword(), $this->originalPasswords[1]);
-
-    // Verify that everything changed for the regular user.
-    /** @var \Drupal\user\Entity\User $user_account */
-    $user_account = User::load(2);
-    $this->assertIdentical($user_account->getUsername(), 'random_user');
-    $this->assertIdentical($user_account->getEmail(), 'random_user@example.com');
-    $this->assertNotIdentical($user_account->getPassword(), $this->originalPasswords[2]);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
deleted file mode 100644
index bee41a4..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityDisplayTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureEntityDisplayTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * User picture entity display.
- *
- * @group user
- */
-class MigrateUserPictureEntityDisplayTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['file', 'image'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('file');
-    $this->executeMigrations([
-      'user_picture_field',
-      'user_picture_field_instance',
-      'user_picture_entity_display',
-    ]);
-  }
-
-  /**
-   * Tests the Drupal 7 user picture to Drupal 8 entity display migration.
-   */
-  public function testUserPictureEntityDisplay() {
-    $component = EntityViewDisplay::load('user.user.default')->getComponent('user_picture');
-    $this->assertIdentical('image', $component['type']);
-    $this->assertIdentical('', $component['settings']['image_style']);
-    $this->assertIdentical('content', $component['settings']['image_link']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php
deleted file mode 100644
index f3711ff..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureEntityFormDisplayTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureEntityFormDisplayTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Tests migration of the user_picture field's entity form display settings.
- *
- * @group user
- */
-class MigrateUserPictureEntityFormDisplayTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['image', 'file'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_picture_field',
-      'user_picture_field_instance',
-      'user_picture_entity_form_display',
-    ]);
-  }
-
-  /**
-   * Tests the field's entity form display settings.
-   */
-  public function testEntityFormDisplaySettings() {
-    $component = EntityFormDisplay::load('user.user.default')->getComponent('user_picture');
-    $this->assertIdentical('image_image', $component['type']);
-    $this->assertIdentical('throbber', $component['settings']['progress_indicator']);
-    $this->assertIdentical('thumbnail', $component['settings']['preview_image_style']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
deleted file mode 100644
index 4dbb36b..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldInstanceTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureFieldInstanceTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\Core\Field\FieldConfigInterface;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * User picture field instance migration.
- *
- * @group user
- */
-class MigrateUserPictureFieldInstanceTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['image', 'file'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_picture_field',
-      'user_picture_field_instance',
-    ]);
-  }
-
-  /**
-   * Test the user picture field migration.
-   */
-  public function testUserPictureField() {
-    /** @var \Drupal\field\FieldConfigInterface $field */
-    $field = FieldConfig::load('user.user.user_picture');
-    $this->assertTrue($field instanceof FieldConfigInterface);
-    $this->assertIdentical('user', $field->getTargetEntityTypeId());
-    $this->assertIdentical('user', $field->getTargetBundle());
-    $this->assertIdentical('user_picture', $field->getName());
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
deleted file mode 100644
index 20d036a..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserPictureFieldTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserPictureFieldTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * User picture field migration.
- *
- * @group user
- */
-class MigrateUserPictureFieldTest extends MigrateDrupal7TestBase {
-
-  public static $modules = ['image', 'file'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('user_picture_field');
-  }
-
-  /**
-   * Test the user picture field migration.
-   */
-  public function testUserPictureField() {
-    /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
-    $field_storage = FieldStorageConfig::load('user.user_picture');
-    $this->assertTrue($field_storage instanceof FieldStorageConfigInterface);
-    $this->assertIdentical('user.user_picture', $field_storage->id());
-    $this->assertIdentical('image', $field_storage->getType());
-    $this->assertIdentical('user', $field_storage->getTargetEntityTypeId());
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php
deleted file mode 100644
index 1814d73..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityDisplayTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileEntityDisplayTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests the user profile entity display migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserProfileEntityDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_profile_field',
-      'user_profile_field_instance',
-      'user_profile_entity_display',
-    ]);
-  }
-
-  /**
-   * Tests migration of user profile fields.
-   */
-  public function testUserProfileFields() {
-    $display = EntityViewDisplay::load('user.user.default');
-
-    // Test a text field.
-    $component = $display->getComponent('profile_color');
-    $this->assertIdentical('text_default', $component['type']);
-
-    // Test a list field.
-    $component = $display->getComponent('profile_bands');
-    $this->assertIdentical('text_default', $component['type']);
-
-    // Test a date field.
-    $component = $display->getComponent('profile_birthdate');
-    $this->assertIdentical('datetime_default', $component['type']);
-
-    // Test PROFILE_PRIVATE field is hidden.
-    $this->assertNull($display->getComponent('profile_sell_address'));
-
-    // Test PROFILE_HIDDEN field is hidden.
-    $this->assertNull($display->getComponent('profile_sold_to'));
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php
deleted file mode 100644
index f39602e..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileEntityFormDisplayTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileEntityFormDisplayTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests the user profile entity form display migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserProfileEntityFormDisplayTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_profile_field',
-      'user_profile_field_instance',
-      'user_profile_entity_form_display',
-    ]);
-  }
-
-  /**
-   * Tests migration of user profile fields.
-   */
-  public function testUserProfileEntityFormDisplay() {
-    $display = EntityFormDisplay::load('user.user.default');
-
-    // Test a text field.
-    $component = $display->getComponent('profile_color');
-    $this->assertIdentical('text_textfield', $component['type']);
-
-    // Test a list field.
-    $component = $display->getComponent('profile_bands');
-    $this->assertIdentical('text_textfield', $component['type']);
-
-    // Test a date field.
-    $component = $display->getComponent('profile_birthdate');
-    $this->assertIdentical('datetime_default', $component['type']);
-
-    // Test PROFILE_PRIVATE field is hidden.
-    $this->assertNull($display->getComponent('profile_sell_address'));
-
-    // Test PROFILE_HIDDEN field is hidden.
-    $this->assertNull($display->getComponent('profile_sold_to'));
-
-    // Test that a checkbox field has the proper display label setting.
-    $component = $display->getComponent('profile_love_migrations');
-    $this->assertIdentical('boolean_checkbox', $component['type']);
-    $this->assertIdentical(true, $component['settings']['display_label']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php
deleted file mode 100644
index 8498a36..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldInstanceTest.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileFieldInstanceTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests the user profile field instance migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations([
-      'user_profile_field',
-      'user_profile_field_instance',
-    ]);
-  }
-
-  /**
-   * Tests migration of user profile fields.
-   */
-  public function testUserProfileFields() {
-    // Migrated a text field.
-    $field = FieldConfig::load('user.user.profile_color');
-    $this->assertIdentical('Favorite color', $field->label());
-    $this->assertIdentical('List your favorite color', $field->getDescription());
-
-    // Migrated a textarea.
-    $field = FieldConfig::load('user.user.profile_biography');
-    $this->assertIdentical('Biography', $field->label());
-    $this->assertIdentical('Tell people a little bit about yourself', $field->getDescription());
-
-    // Migrated checkbox field.
-    $field = FieldConfig::load('user.user.profile_sell_address');
-    $this->assertIdentical('Sell your email address?', $field->label());
-    $this->assertIdentical("If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!", $field->getDescription());
-
-    // Migrated selection field.
-    $field = FieldConfig::load('user.user.profile_sold_to');
-    $this->assertIdentical('Sales Category', $field->label());
-    $this->assertIdentical("Select the sales categories to which this user's address was sold.", $field->getDescription());
-
-    // Migrated list field.
-    $field = FieldConfig::load('user.user.profile_bands');
-    $this->assertIdentical('Favorite bands', $field->label());
-    $this->assertIdentical("Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.", $field->getDescription());
-
-    // Migrated URL field.
-    $field = FieldConfig::load('user.user.profile_blog');
-    $this->assertIdentical('Blog', $field->label());
-    $this->assertIdentical("Paste the full URL, including http://, of your personal blog.", $field->getDescription());
-
-    // Migrated date field.
-    $field = FieldConfig::load('user.user.profile_birthdate');
-    $this->assertIdentical('Birthdate', $field->label());
-    $this->assertIdentical("Enter your birth date and we'll send you a coupon.", $field->getDescription());
-
-    // Another migrated checkbox field, with a different source visibility setting.
-    $field = FieldConfig::load('user.user.profile_love_migrations');
-    $this->assertIdentical('I love migrations', $field->label());
-    $this->assertIdentical("If you check this box, you love migrations.", $field->getDescription());
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php
deleted file mode 100644
index 1abd419..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserProfileFieldTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserProfileFieldTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Tests the user profile field migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('user_profile_field');
-  }
-
-  /**
-   * Tests migration of user profile fields.
-   */
-  public function testUserProfileFields() {
-    // Migrated a text field.
-    $field_storage = FieldStorageConfig::load('user.profile_color');
-    $this->assertIdentical('text', $field_storage->getType(), 'Field type is text.');
-    $this->assertIdentical(1, $field_storage->getCardinality(), 'Text field has correct cardinality');
-
-    // Migrated a textarea.
-    $field_storage = FieldStorageConfig::load('user.profile_biography');
-    $this->assertIdentical('text_long', $field_storage->getType(), 'Field type is text_long.');
-
-    // Migrated checkbox field.
-    $field_storage = FieldStorageConfig::load('user.profile_sell_address');
-    $this->assertIdentical('boolean', $field_storage->getType(), 'Field type is boolean.');
-
-    // Migrated selection field.
-    $field_storage = FieldStorageConfig::load('user.profile_sold_to');
-    $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
-    $settings = $field_storage->getSettings();
-    $this->assertEqual($settings['allowed_values'], array(
-      'Pill spammers' => 'Pill spammers',
-      'Fitness spammers' => 'Fitness spammers',
-      'Back\slash' => 'Back\slash',
-      'Forward/slash' => 'Forward/slash',
-      'Dot.in.the.middle' => 'Dot.in.the.middle',
-      'Faithful servant' => 'Faithful servant',
-      'Anonymous donor' => 'Anonymous donor',
-    ));
-    $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
-
-    // Migrated list field.
-    $field_storage = FieldStorageConfig::load('user.profile_bands');
-    $this->assertIdentical('text', $field_storage->getType(), 'Field type is text.');
-    $this->assertIdentical(-1, $field_storage->getCardinality(), 'List field has correct cardinality');
-
-    // Migrated URL field.
-    $field_storage = FieldStorageConfig::load('user.profile_blog');
-    $this->assertIdentical('link', $field_storage->getType(), 'Field type is link.');
-
-    // Migrated date field.
-    $field_storage = FieldStorageConfig::load('user.profile_birthdate');
-    $this->assertIdentical('datetime', $field_storage->getType(), 'Field type is datetime.');
-    $this->assertIdentical('date', $field_storage->getSettings()['datetime_type']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php b/core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php
deleted file mode 100644
index 0a65ddf..0000000
--- a/core/modules/user/src/Tests/Migrate/MigrateUserStubTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\MigrateUserStubTest.
- */
-
-namespace Drupal\user\Tests\Migrate;
-
-use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
-use Drupal\migrate_drupal\Tests\StubTestTrait;
-
-/**
- * Test stub creation for user entities.
- *
- * @group user
- */
-class MigrateUserStubTest extends MigrateDrupalTestBase {
-
-  use StubTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installEntitySchema('user');
-    $this->installSchema('system', ['sequences']);
-  }
-
-  /**
-   * Tests creation of user stubs.
-   */
-  public function testStub() {
-    $this->performStubTest('user');
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
deleted file mode 100644
index dd9c618..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserConfigsTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\config\Tests\SchemaCheckTestTrait;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\user\AccountSettingsForm;
-use Drupal\Core\Database\Database;
-
-/**
- * Upgrade variables to user.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserConfigsTest extends MigrateDrupal6TestBase {
-
-  use SchemaCheckTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'router');
-    $this->container->get('router.builder')->rebuild();
-    $this->executeMigrations(['d6_user_mail', 'd6_user_settings']);
-  }
-
-  /**
-   * Tests migration of user variables to user.mail.yml.
-   */
-  public function testUserMail() {
-    $config = $this->config('user.mail');
-
-    $this->assertIdentical('Account details for [user:name] at [site:name] (approved)', $config->get('status_activated.subject'));
-    $this->assertIdentical("[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\nOnce you have set your own password, you will be able to log in to [site:login-url] in the future using:\n\nusername: [user:name]\n", $config->get('status_activated.body'));
-    $this->assertIdentical('Replacement login information for [user:name] at [site:name]', $config->get('password_reset.subject'));
-    $this->assertIdentical("[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in to [site:url-brief] by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password." , $config->get('password_reset.body'));
-    $this->assertIdentical('Account details for [user:name] at [site:name] (deleted)', $config->get('cancel_confirm.subject'));
-    $this->assertIdentical("[user:name],\n\nYour account on [site:name] has been deleted.", $config->get('cancel_confirm.body'));
-    $this->assertIdentical('An administrator created an account for you at [site:name]', $config->get('register_admin_created.subject'));
-    $this->assertIdentical("[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password:\n\nusername: [user:name]\npassword: \n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\n\n--  [site:name] team", $config->get('register_admin_created.body'));
-    $this->assertIdentical('Account details for [user:name] at [site:name]', $config->get('register_no_approval_required.subject'));
-    $this->assertIdentical("[user:name],\n\nThank you for registering at [site:name]. You may now log in to [site:login-url] using the following username and password:\n\nusername: [user:name]\npassword: \n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\n\n--  [site:name] team", $config->get('register_no_approval_required.body'));
-    $this->assertIdentical('Account details for [user:name] at [site:name] (pending admin approval)', $config->get('register_pending_approval.subject'));
-    $this->assertIdentical("[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  [site:name] team", $config->get('register_pending_approval.body'));
-    $this->assertIdentical('Account details for [user:name] at [site:name] (blocked)', $config->get('status_blocked.subject'));
-    $this->assertIdentical("[user:name],\n\nYour account on [site:name] has been blocked.", $config->get('status_blocked.body'));
-    $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config->get());
-  }
-
-  /**
-   * Tests migration of user variables to user.settings.yml.
-   */
-  public function testUserSettings() {
-    $config = $this->config('user.settings');
-    $this->assertIdentical(TRUE, $config->get('notify.status_blocked'));
-    $this->assertIdentical(FALSE, $config->get('notify.status_activated'));
-    $this->assertIdentical(FALSE, $config->get('verify_mail'));
-    $this->assertIdentical('admin_only', $config->get('register'));
-    $this->assertIdentical('Guest', $config->get('anonymous'));
-
-    // Tests migration of user_register using the AccountSettingsForm.
-
-    // Map D6 value to D8 value
-    $user_register_map = [
-      [0, USER_REGISTER_ADMINISTRATORS_ONLY],
-      [1, USER_REGISTER_VISITORS],
-      [2, USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL],
-    ];
-
-    foreach ($user_register_map as $map) {
-      // Tests migration of user_register = 1
-      Database::getConnection('default', 'migrate')
-          ->update('variable')
-          ->fields(['value' => serialize($map[0])])
-          ->condition('name', 'user_register')
-          ->execute();
-
-      /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-      $migration = \Drupal::entityManager()
-          ->getStorage('migration')
-          ->loadUnchanged('d6_user_settings');
-      // Indicate we're rerunning a migration that's already run.
-      $migration->getIdMap()->prepareUpdate();
-      $this->executeMigration($migration);
-      $form = $this->container->get('form_builder')->getForm(AccountSettingsForm::create($this->container));
-      $this->assertIdentical($map[1], $form['registration_cancellation']['user_register']['#value']);
-    }
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
deleted file mode 100644
index 1bdf5a5..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserContactSettingsTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Users contact settings migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserContactSettingsTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->migrateUsers(FALSE);
-    $this->installSchema('user', ['users_data']);
-    $this->executeMigration('d6_user_contact_settings');
-  }
-
-  /**
-   * Tests the Drupal6 user contact settings migration.
-   */
-  public function testUserContactSettings() {
-    $user_data = \Drupal::service('user.data');
-    $module = $key = 'contact';
-    $uid = 2;
-    $setting = $user_data->get($module, $uid, $key);
-    $this->assertIdentical('1', $setting);
-
-    $uid = 8;
-    $setting = $user_data->get($module, $uid, $key);
-    $this->assertIdentical('0', $setting);
-
-    $uid = 15;
-    $setting = $user_data->get($module, $uid, $key);
-    $this->assertIdentical(NULL, $setting);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
deleted file mode 100644
index 9f7b20a..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserPictureFileTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\file\Entity\File;
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * User pictures migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-
-    /** @var \Drupal\migrate\Entity\MigrationInterface $migration */
-    $migration = Migration::load('d6_user_picture_file');
-    $source = $migration->get('source');
-    $source['site_path'] = 'core/modules/simpletest';
-    $migration->set('source', $source);
-    $this->executeMigration($migration);
-  }
-
-  /**
-   * Tests the Drupal 6 user pictures to Drupal 8 migration.
-   */
-  public function testUserPictures() {
-    $file_ids = array();
-    foreach ($this->migration->getIdMap() as $destination_ids) {
-      $file_ids[] = reset($destination_ids);
-    }
-    $files = File::loadMultiple($file_ids);
-    /** @var \Drupal\file\FileInterface $file */
-    $file = array_shift($files);
-    $this->assertIdentical('image-test.jpg', $file->getFilename());
-    $this->assertIdentical('public://image-test.jpg', $file->getFileUri());
-    $this->assertIdentical('2', $file->getOwnerId());
-    $this->assertIdentical('1901', $file->getSize());
-    $this->assertIdentical('image/jpeg', $file->getMimeType());
-
-    $file = array_shift($files);
-    $this->assertIdentical('image-test.png', $file->getFilename());
-    $this->assertIdentical('public://image-test.png', $file->getFileUri());
-    $this->assertIdentical('8', $file->getOwnerId());
-    $this->assertFalse($files);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
deleted file mode 100644
index e4b5dd3..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserProfileValuesTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-use Drupal\user\Entity\User;
-
-/**
- * User profile values migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserProfileValuesTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->executeMigrations([
-      'user_profile_field',
-      'user_profile_field_instance',
-      'user_profile_entity_display',
-      'user_profile_entity_form_display',
-    ]);
-    $this->migrateUsers(FALSE);
-    $this->executeMigration('d6_profile_values');
-  }
-
-  /**
-   * Tests Drupal 6 profile values to Drupal 8 migration.
-   */
-  public function testUserProfileValues() {
-    $user = User::load(2);
-    $this->assertFalse(is_null($user));
-    $this->assertIdentical('red', $user->profile_color->value);
-    $expected = <<<EOT
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.
-EOT;
-    $this->assertIdentical($expected, $user->profile_biography->value);
-    $this->assertIdentical('1', $user->profile_sell_address->value);
-    $this->assertIdentical('Back\slash', $user->profile_sold_to->value);
-    $this->assertIdentical('AC/DC', $user->profile_bands[0]->value);
-    $this->assertIdentical('Eagles', $user->profile_bands[1]->value);
-    $this->assertIdentical('Elton John', $user->profile_bands[2]->value);
-    $this->assertIdentical('Lemonheads', $user->profile_bands[3]->value);
-    $this->assertIdentical('Rolling Stones', $user->profile_bands[4]->value);
-    $this->assertIdentical('Queen', $user->profile_bands[5]->value);
-    $this->assertIdentical('The White Stripes', $user->profile_bands[6]->value);
-    $this->assertIdentical('1974-06-02', $user->profile_birthdate->value);
-    $this->assertIdentical('http://example.com/blog', $user->profile_blog->uri);
-    $this->assertNull($user->profile_blog->title);
-    $this->assertIdentical([], $user->profile_blog->options);
-    $this->assertIdentical('http://example.com/blog', $user->profile_blog->uri);
-    $this->assertNull($user->profile_love_migrations->value);
-
-    $user = User::load(8);
-    $this->assertIdentical('Forward/slash', $user->profile_sold_to->value);
-
-    $user = User::load(15);
-    $this->assertIdentical('Dot.in.the.middle', $user->profile_sold_to->value);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
deleted file mode 100644
index e78bb7f..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserRoleTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\user\Entity\Role;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Upgrade user roles to user.role.*.yml.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserRoleTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
-  }
-
-  /**
-   * Tests user role migration.
-   */
-  public function testUserRole() {
-    /** @var \Drupal\migrate\entity\Migration $migration */
-    $id_map = Migration::load('d6_user_role')->getIdMap();
-    $rid = 'anonymous';
-    $anonymous = Role::load($rid);
-    $this->assertIdentical($rid, $anonymous->id());
-    $this->assertIdentical(array('migrate test anonymous permission', 'use text format filtered_html'), $anonymous->getPermissions());
-    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(1)));
-    $rid = 'authenticated';
-    $authenticated = Role::load($rid);
-    $this->assertIdentical($rid, $authenticated->id());
-    $this->assertIdentical(array('migrate test authenticated permission', 'use text format filtered_html'), $authenticated->getPermissions());
-    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(2)));
-    $rid = 'migrate_test_role_1';
-    $migrate_test_role_1 = Role::load($rid);
-    $this->assertIdentical($rid, $migrate_test_role_1->id());
-    $this->assertIdentical(array('migrate test role 1 test permission', 'use text format full_html', 'use text format php_code'), $migrate_test_role_1->getPermissions());
-    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(3)));
-    $rid = 'migrate_test_role_2';
-    $migrate_test_role_2 = Role::load($rid);
-    $this->assertIdentical(array(
-      'migrate test role 2 test permission',
-      'use PHP for settings',
-      'administer contact forms',
-      'skip comment approval',
-      'edit own blog content',
-      'edit any blog content',
-      'delete own blog content',
-      'delete any blog content',
-      'create forum content',
-      'delete any forum content',
-      'delete own forum content',
-      'edit any forum content',
-      'edit own forum content',
-      'administer nodes',
-      'access content overview',
-      'use text format php_code',
-      ), $migrate_test_role_2->getPermissions());
-    $this->assertIdentical($rid, $migrate_test_role_2->id());
-    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(4)));
-    $rid = 'migrate_test_role_3_that_is_long';
-    $migrate_test_role_3 = Role::load($rid);
-    $this->assertIdentical($rid, $migrate_test_role_3->id());
-    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(5)));
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
deleted file mode 100644
index eb94627..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\MigrateUserTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\migrate\Entity\Migration;
-use Drupal\migrate\MigrateExecutable;
-use Drupal\user\Entity\User;
-use Drupal\file\Entity\File;
-use Drupal\Core\Database\Database;
-use Drupal\user\RoleInterface;
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * Users migration.
- *
- * @group migrate_drupal_6
- */
-class MigrateUserTest extends MigrateDrupal6TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('file');
-    $this->installSchema('file', ['file_usage']);
-    $this->installEntitySchema('node');
-    $this->installSchema('user', ['users_data']);
-    // Make sure uid 1 is created.
-    user_install();
-
-    $file = File::create(array(
-      'fid' => 2,
-      'uid' => 2,
-      'filename' => 'image-test.jpg',
-      'uri' => "public://image-test.jpg",
-      'filemime' => 'image/jpeg',
-      'created' => 1,
-      'changed' => 1,
-      'status' => FILE_STATUS_PERMANENT,
-    ));
-    $file->enforceIsNew();
-    file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png'));
-    $file->save();
-
-    $file = File::create(array(
-      'fid' => 8,
-      'uid' => 8,
-      'filename' => 'image-test.png',
-      'uri' => "public://image-test.png",
-      'filemime' => 'image/png',
-      'created' => 1,
-      'changed' => 1,
-      'status' => FILE_STATUS_PERMANENT,
-    ));
-    $file->enforceIsNew();
-    file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg'));
-    $file->save();
-
-    $this->migrateUsers();
-  }
-
-  /**
-   * Tests the Drupal6 user to Drupal 8 migration.
-   */
-  public function testUser() {
-    $users = Database::getConnection('default', 'migrate')
-      ->select('users', 'u')
-      ->fields('u')
-      ->condition('uid', 0, '>')
-      ->execute()
-      ->fetchAll();
-
-    foreach ($users as $source) {
-      // Get roles directly from the source.
-      $rids = Database::getConnection('default', 'migrate')
-        ->select('users_roles', 'ur')
-        ->fields('ur', array('rid'))
-        ->condition('ur.uid', $source->uid)
-        ->execute()
-        ->fetchCol();
-      $roles = array(RoleInterface::AUTHENTICATED_ID);
-      $id_map = Migration::load('d6_user_role')->getIdMap();
-      foreach ($rids as $rid) {
-        $role = $id_map->lookupDestinationId(array($rid));
-        $roles[] = reset($role);
-      }
-
-      /** @var \Drupal\user\UserInterface $user */
-      $user = User::load($source->uid);
-      $this->assertIdentical($source->uid, $user->id());
-      $this->assertIdentical($source->name, $user->label());
-      $this->assertIdentical($source->mail, $user->getEmail());
-      $this->assertIdentical($source->created, $user->getCreatedTime());
-      $this->assertIdentical($source->access, $user->getLastAccessedTime());
-      $this->assertIdentical($source->login, $user->getLastLoginTime());
-      $is_blocked = $source->status == 0;
-      $this->assertIdentical($is_blocked, $user->isBlocked());
-      // $user->getPreferredLangcode() might fallback to default language if the
-      // user preferred language is not configured on the site. We just want to
-      // test if the value was imported correctly.
-      $this->assertIdentical($source->language, $user->preferred_langcode->value);
-      $expected_timezone_name = $source->timezone_name ?: $this->config('system.date')->get('timezone.default');
-      $this->assertIdentical($expected_timezone_name, $user->getTimeZone());
-      $this->assertIdentical($source->init, $user->getInitialEmail());
-      $this->assertIdentical($roles, $user->getRoles());
-
-      // We have one empty picture in the data so don't try load that.
-      if (!empty($source->picture)) {
-        // Test the user picture.
-        $file = File::load($user->user_picture->target_id);
-        $this->assertIdentical(basename($source->picture), $file->getFilename());
-      }
-
-      // Use the API to check if the password has been salted and re-hashed to
-      // conform to Drupal >= 7 for non-admin users.
-      if ($user->id() != 1) {
-        $this->assertTrue(\Drupal::service('password')
-          ->check($source->pass_plain, $user->getPassword()));
-      }
-    }
-    // Rollback the migration and make sure everything is deleted but uid 1.
-    (new MigrateExecutable($this->migration, $this))->rollback();
-    $users = Database::getConnection('default', 'migrate')
-      ->select('users', 'u')
-      ->fields('u', ['uid'])
-      ->condition('uid', 0, '>')
-      ->execute()
-      ->fetchCol();
-    foreach ($users as $uid) {
-      $account = User::load($uid);
-      if ($uid == 1) {
-        $this->assertNotNull($account, 'User 1 was preserved after rollback');
-      }
-      else {
-        $this->assertNull($account);
-      }
-    }
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d6/ProfileValuesBuilderTest.php b/core/modules/user/src/Tests/Migrate/d6/ProfileValuesBuilderTest.php
deleted file mode 100644
index fe623ae..0000000
--- a/core/modules/user/src/Tests/Migrate/d6/ProfileValuesBuilderTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d6\ProfileValuesBuilderTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d6;
-
-use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
-
-/**
- * @group user
- */
-class ProfileValuesBuilderTest extends MigrateDrupal6TestBase {
-
-  /**
-   * Tests that profile fields are merged into the d6_profile_values migration's
-   * process pipeline by the d6_profile_values builder.
-   */
-  public function testBuilder() {
-    $template = \Drupal::service('migrate.template_storage')
-      ->getTemplateByName('d6_profile_values');
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
-    $migrations = \Drupal::service('plugin.manager.migrate.builder')
-      ->createInstance('d6_profile_values')
-      ->buildMigrations($template);
-
-    $this->assertIdentical('d6_profile_values', $migrations[0]->id());
-    $process = $migrations[0]->getProcess();
-    $this->assertIdentical('profile_color', $process['profile_color'][0]['source']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php
deleted file mode 100644
index 020e15c..0000000
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserFloodTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserFloodTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrates user flood control configuration.
- *
- * @group user
- */
-class MigrateUserFloodTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['user']);
-    $this->executeMigration('d7_user_flood');
-  }
-
-  /**
-   * Tests the migration.
-   */
-  public function testMigration() {
-    $expected = [
-      'uid_only' => TRUE,
-      'ip_limit' => 30,
-      'ip_window' => 7200,
-      'user_limit' => 22,
-      'user_window' => 86400,
-      '_core' => [
-        'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs',
-      ],
-    ];
-    $this->assertIdentical($expected, $this->config('user.flood')->get());
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php
deleted file mode 100644
index 9c88f55..0000000
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserMailTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserMailTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * Migrates user mail configuration.
- *
- * @group user
- */
-class MigrateUserMailTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installConfig(['user']);
-    $this->executeMigration('d7_user_mail');
-  }
-
-  /**
-   * Tests the migration.
-   */
-  public function testMigration() {
-    $config = $this->config('user.mail');
-    $this->assertIdentical('Your account is approved!', $config->get('status_activated.subject'));
-    $this->assertIdentical('Your account was activated, and there was much rejoicing.', $config->get('status_activated.body'));
-    $this->assertIdentical('Fix your password', $config->get('password_reset.subject'));
-    $this->assertIdentical("Nope! You're locked out forever.", $config->get('password_reset.body'));
-    $this->assertIdentical('So long, bub', $config->get('cancel_confirm.subject'));
-    $this->assertIdentical('The gates of Drupal are closed to you. Now you will work in the salt mines.', $config->get('cancel_confirm.body'));
-    $this->assertIdentical('Gawd made you an account', $config->get('register_admin_created.subject'));
-    $this->assertIdentical('...and she could take it away.', $config->get('register_admin_created.body'));
-    $this->assertIdentical('Welcome!', $config->get('register_no_approval_required.subject'));
-    $this->assertIdentical('You can now log in if you can figure out how to use Drupal!', $config->get('register_no_approval_required.body'));
-    $this->assertIdentical('Soon...', $config->get('register_pending_approval.subject'));
-    $this->assertIdentical('...you will join our Circle. Let the Drupal flow through you.', $config->get('register_pending_approval.body'));
-    $this->assertIdentical('BEGONE!', $config->get('status_blocked.subject'));
-    $this->assertIdentical('You no longer please the robot overlords. Go to your room and chill out.', $config->get('status_blocked.body'));
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php
deleted file mode 100644
index 3c94781..0000000
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserRoleTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserRoleTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d7;
-
-use Drupal\Core\Database\Database;
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-
-/**
- * Upgrade user roles to user.role.*.yml.
- *
- * @group user
- */
-class MigrateUserRoleTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('d7_user_role');
-  }
-
-  /**
-   * Asserts aspects of a user role config entity.
-   *
-   * @param string $id
-   *   The role ID.
-   * @param string $label
-   *   The role's expected label.
-   * @param int|NULL $original_rid
-   *   The original (integer) ID of the role, to check permissions.
-   */
-  protected function assertEntity($id, $label, $original_rid) {
-    /** @var \Drupal\user\RoleInterface $entity */
-    $entity = Role::load($id);
-    $this->assertTrue($entity instanceof RoleInterface);
-    $this->assertIdentical($label, $entity->label());
-
-    if (isset($original_rid)) {
-      $permissions = Database::getConnection('default', 'migrate')
-        ->select('role_permission', 'rp')
-        ->fields('rp', ['permission'])
-        ->condition('rid', $original_rid)
-        ->execute()
-        ->fetchCol();
-      $this->assertIdentical($permissions, $entity->getPermissions());
-    }
-  }
-
-  /**
-   * Tests user role migration.
-   */
-  public function testUserRole() {
-    $this->assertEntity('anonymous', 'anonymous user', 1);
-    $this->assertEntity('authenticated', 'authenticated user', 2);
-    $this->assertEntity('administrator', 'administrator', 3);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
deleted file mode 100644
index 149672b..0000000
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d7\MigrateUserTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-use Drupal\user\Entity\User;
-use Drupal\user\RoleInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Users migration.
- *
- * @group user
- */
-class MigrateUserTest extends MigrateDrupal7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['file', 'image'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Prepare to migrate user pictures as well.
-    $this->installEntitySchema('file');
-    $this->executeMigrations([
-      'user_picture_field',
-      'user_picture_field_instance',
-      'd7_user_role',
-      'd7_user',
-    ]);
-  }
-
-  /**
-   * Asserts various aspects of a user account.
-   *
-   * @param string $id
-   *   The user ID.
-   * @param string $label
-   *   The username.
-   * @param string $mail
-   *   The user's email address.
-   * @param int $access
-   *   The last access time.
-   * @param int $login
-   *   The last login time.
-   * @param bool $blocked
-   *   Whether or not the account is blocked.
-   * @param string $langcode
-   *   The user account's language code.
-   * @param string $init
-   *   The user's initial email address.
-   * @param string[] $roles
-   *   Role IDs the user account is expected to have.
-   * @param bool $has_picture
-   *   Whether the user is expected to have a picture attached.
-   */
-  protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $langcode, $init, array $roles = [RoleInterface::AUTHENTICATED_ID], $has_picture = FALSE) {
-    /** @var \Drupal\user\UserInterface $user */
-    $user = User::load($id);
-    $this->assertTrue($user instanceof UserInterface);
-    $this->assertIdentical($label, $user->label());
-    $this->assertIdentical($mail, $user->getEmail());
-    $this->assertIdentical($access, $user->getLastAccessedTime());
-    $this->assertIdentical($login, $user->getLastLoginTime());
-    $this->assertIdentical($blocked, $user->isBlocked());
-    // $user->getPreferredLangcode() might fallback to default language if the
-    // user preferred language is not configured on the site. We just want to
-    // test if the value was imported correctly.
-    $this->assertIdentical($langcode, $user->langcode->value);
-    $this->assertIdentical($langcode, $user->preferred_langcode->value);
-    $this->assertIdentical($langcode, $user->preferred_admin_langcode->value);
-    $this->assertIdentical($init, $user->getInitialEmail());
-    $this->assertIdentical($roles, $user->getRoles());
-    $this->assertIdentical($has_picture, !$user->user_picture->isEmpty());
-  }
-
-  /**
-   * Tests the Drupal 7 user to Drupal 8 migration.
-   */
-  public function testUser() {
-    $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, '', 'odo@local.host');
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Migrate/d7/UserMigrationBuilderTest.php b/core/modules/user/src/Tests/Migrate/d7/UserMigrationBuilderTest.php
deleted file mode 100644
index 09fae9e..0000000
--- a/core/modules/user/src/Tests/Migrate/d7/UserMigrationBuilderTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Migrate\d7\UserMigrationBuilderTest.
- */
-
-namespace Drupal\user\Tests\Migrate\d7;
-
-use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
-
-/**
- * @group user
- */
-class UserMigrationBuilderTest extends MigrateDrupal7TestBase {
-
-  /**
-   * Tests that profile fields are merged into the d6_profile_values migration's
-   * process pipeline by the d6_profile_values builder.
-   */
-  public function testBuilder() {
-    $template = \Drupal::service('migrate.template_storage')
-      ->getTemplateByName('d7_user');
-    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
-    $migrations = \Drupal::service('plugin.manager.migrate.builder')
-      ->createInstance('d7_user')
-      ->buildMigrations($template);
-
-    $this->assertIdentical('d7_user', $migrations[0]->id());
-    $process = $migrations[0]->getProcess();
-    $this->assertIdentical('field_file', $process['field_file'][0]['source']);
-  }
-
-}
diff --git a/core/modules/user/src/Tests/TempStoreDatabaseTest.php b/core/modules/user/src/Tests/TempStoreDatabaseTest.php
index 6e4d837..7d104df 100644
--- a/core/modules/user/src/Tests/TempStoreDatabaseTest.php
+++ b/core/modules/user/src/Tests/TempStoreDatabaseTest.php
@@ -61,7 +61,7 @@ protected function setUp() {
 
     // Install system tables to test the key/value storage without installing a
     // full Drupal environment.
-    $this->installSchema('system', array('semaphore', 'key_value_expire'));
+    $this->installSchema('system', array('key_value_expire'));
 
     // Create several objects for testing.
     for ($i = 0; $i <= 3; $i++) {
diff --git a/core/modules/user/src/Tests/Update/UserUpdateEmailToken.php b/core/modules/user/src/Tests/Update/UserUpdateEmailToken.php
new file mode 100644
index 0000000..3e1140b
--- /dev/null
+++ b/core/modules/user/src/Tests/Update/UserUpdateEmailToken.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Tests\Update\UserUpdateEmailToken.
+ */
+
+namespace Drupal\user\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+
+/**
+ * Tests user email token upgrade path.
+ *
+ * @group Update
+ */
+class UserUpdateEmailToken extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../tests/fixtures/update/drupal-8.user-email-token-2587275.php',
+    ];
+  }
+
+  /**
+   * Tests that email token in status_blocked of user.mail is updated.
+   */
+  public function testEmailToken() {
+    $mail = \Drupal::config('user.mail')->get('status_blocked');
+    $this->assertTrue(strpos($mail['body'], '[site:account-name]'));
+    $this->runUpdates();
+    $mail = \Drupal::config('user.mail')->get('status_blocked');
+    $this->assertFalse(strpos($mail['body'], '[site:account-name]'));
+  }
+
+}
diff --git a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php
index 679eec0..843f036 100644
--- a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php
+++ b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php
@@ -79,7 +79,6 @@ function testUserEditForm() {
     $this->installConfig(array('user'));
 
     // Install the router table and then rebuild.
-    $this->installSchema('system', ['router']);
     \Drupal::service('router.builder')->rebuild();
 
     $form = $this->buildAccountForm('default');
diff --git a/core/modules/user/src/Tests/UserAdminTest.php b/core/modules/user/src/Tests/UserAdminTest.php
index cf942f9..595e0ae 100644
--- a/core/modules/user/src/Tests/UserAdminTest.php
+++ b/core/modules/user/src/Tests/UserAdminTest.php
@@ -28,6 +28,7 @@ class UserAdminTest extends WebTestBase {
    * Registers a user and deletes it.
    */
   function testUserAdmin() {
+    $config = $this->config('user.settings');
     $user_a = $this->drupalCreateUser();
     $user_a->name = 'User A';
     $user_a->mail = $this->randomMachineName() . '@example.com';
@@ -101,11 +102,16 @@ function testUserAdmin() {
     $edit = array();
     $edit['action'] = 'user_block_user_action';
     $edit['user_bulk_form[4]'] = TRUE;
+    $config
+      ->set('notify.status_blocked', TRUE)
+      ->save();
     $this->drupalPostForm('admin/people', $edit, t('Apply'), array(
       // Sort the table by username so that we know reliably which user will be
       // targeted with the blocking action.
       'query' => array('order' => 'name', 'sort' => 'asc')
     ));
+    $site_name = $this->config('system.site')->get('name');
+    $this->assertMailString('body', 'Your account on ' . $site_name . ' has been blocked.', 1, 'Blocked message found in the mail sent to user C.');
     $user_storage->resetCache(array($user_c->id()));
     $account = $user_storage->load($user_c->id());
     $this->assertTrue($account->isBlocked(), 'User C blocked');
diff --git a/core/modules/user/src/Tests/UserCacheTagsTest.php b/core/modules/user/src/Tests/UserCacheTagsTest.php
index 8bb2a6a..450f7bc 100644
--- a/core/modules/user/src/Tests/UserCacheTagsTest.php
+++ b/core/modules/user/src/Tests/UserCacheTagsTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\system\Tests\Entity\EntityWithUriCacheTagsTestBase;
 use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
 
 /**
@@ -41,10 +42,10 @@ protected function setUp() {
    */
   protected function createEntity() {
     // Create a "Llama" user.
-    $user = entity_create('user', array(
+    $user = User::create([
       'name' => 'Llama',
       'status' => TRUE,
-    ));
+    ]);
     $user->save();
 
     return $user;
diff --git a/core/modules/user/src/Tests/UserCancelTest.php b/core/modules/user/src/Tests/UserCancelTest.php
index d3be1af..3da7489 100644
--- a/core/modules/user/src/Tests/UserCancelTest.php
+++ b/core/modules/user/src/Tests/UserCancelTest.php
@@ -249,7 +249,7 @@ function testUserBlockUnpublish() {
     // Add a comment to the page.
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $node->id(),
@@ -316,7 +316,7 @@ function testUserAnonymize() {
     // Add a comment to the page.
     $comment_subject = $this->randomMachineName(8);
     $comment_body = $this->randomMachineName(8);
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'subject' => $comment_subject,
       'comment_body' => $comment_body,
       'entity_id' => $node->id(),
diff --git a/core/modules/user/src/Tests/UserCreateTest.php b/core/modules/user/src/Tests/UserCreateTest.php
index 2674f09..481c267 100644
--- a/core/modules/user/src/Tests/UserCreateTest.php
+++ b/core/modules/user/src/Tests/UserCreateTest.php
@@ -7,7 +7,9 @@
 
 namespace Drupal\user\Tests;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the create user administration page.
@@ -36,7 +38,7 @@ public function testUserAdd() {
 
     // Create a field.
     $field_name = 'test_field';
-    entity_create('field_storage_config', array(
+    FieldStorageConfig::create(array(
       'field_name' => $field_name,
       'entity_type' => 'user',
       'module' => 'image',
@@ -49,7 +51,7 @@ public function testUserAdd() {
       ),
     ))->save();
 
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $field_name,
       'entity_type' => 'user',
       'label' => 'Picture',
@@ -65,7 +67,7 @@ public function testUserAdd() {
         'max_resolution' => '85x85',
         'min_resolution' => '',
       ),
-    ))->save();
+    ])->save();
 
     // Test user creation page for valid fields.
     $this->drupalGet('admin/people/create');
diff --git a/core/modules/user/src/Tests/UserEntityCallbacksTest.php b/core/modules/user/src/Tests/UserEntityCallbacksTest.php
index ce7726a..2a2caaf 100644
--- a/core/modules/user/src/Tests/UserEntityCallbacksTest.php
+++ b/core/modules/user/src/Tests/UserEntityCallbacksTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\user\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\user\Entity\User;
 
 /**
  * Tests specific parts of the user entity like the URI callback and the label
@@ -42,7 +43,7 @@ protected function setUp() {
     parent::setUp();
 
     $this->account = $this->drupalCreateUser();
-    $this->anonymous = entity_create('user', array('uid' => 0));
+    $this->anonymous = User::create(['uid' => 0]);
   }
 
   /**
diff --git a/core/modules/user/src/Tests/UserEntityReferenceTest.php b/core/modules/user/src/Tests/UserEntityReferenceTest.php
index 65b92e5..8e21255 100644
--- a/core/modules/user/src/Tests/UserEntityReferenceTest.php
+++ b/core/modules/user/src/Tests/UserEntityReferenceTest.php
@@ -10,6 +10,7 @@
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
+use Drupal\user\Entity\Role;
 
 /**
  * Tests the user reference field functionality.
@@ -40,13 +41,13 @@ class UserEntityReferenceTest extends EntityUnitTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->role1 = entity_create('user_role', array(
+    $this->role1 = Role::create(array(
       'id' => strtolower($this->randomMachineName(8)),
       'label' => $this->randomMachineName(8),
     ));
     $this->role1->save();
 
-    $this->role2 = entity_create('user_role', array(
+    $this->role2 = Role::create(array(
       'id' => strtolower($this->randomMachineName(8)),
       'label' => $this->randomMachineName(8),
     ));
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index 420b97a..1b415fa 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -140,6 +140,15 @@ function testUserPasswordReset() {
     $this->drupalPostForm(NULL, $edit, t('Submit'));
     $this->assertTrue( count($this->drupalGetMails(array('id' => 'user_password_reset'))) === $before + 1, 'Email sent when requesting password reset using email address.');
 
+    // Visit the user edit page without pass-reset-token and make sure it does
+    // not cause an error.
+    $resetURL = $this->getResetURL();
+    $this->drupalGet($resetURL);
+    $this->drupalPostForm(NULL, NULL, t('Log in'));
+    $this->drupalGet('user/' . $this->account->id() . '/edit');
+    $this->assertNoText('Expected user_string to be a string, NULL given');
+    $this->drupalLogout();
+
     // Create a password reset link as if the request time was 60 seconds older than the allowed limit.
     $timeout = $this->config('user.settings')->get('password_reset_timeout');
     $bogus_timestamp = REQUEST_TIME - $timeout - 60;
diff --git a/core/modules/user/src/Tests/UserRegistrationTest.php b/core/modules/user/src/Tests/UserRegistrationTest.php
index 1e16bc7..bb6bbd7 100644
--- a/core/modules/user/src/Tests/UserRegistrationTest.php
+++ b/core/modules/user/src/Tests/UserRegistrationTest.php
@@ -288,19 +288,19 @@ public function testUniqueFields() {
    */
   function testRegistrationWithUserFields() {
     // Create a field on 'user' entity type.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
       'field_name' => 'test_user_field',
       'entity_type' => 'user',
       'type' => 'test_field',
       'cardinality' => 1,
     ));
     $field_storage->save();
-    $field = entity_create('field_config', array(
+    $field = FieldConfig::create([
       'field_storage' => $field_storage,
       'label' => 'Some user field',
       'bundle' => 'user',
       'required' => TRUE,
-    ));
+    ]);
     $field->save();
     entity_get_form_display('user', 'user', 'default')
       ->setComponent('test_user_field', array('type' => 'test_field_widget'))
diff --git a/core/modules/user/src/Tests/UserSaveTest.php b/core/modules/user/src/Tests/UserSaveTest.php
index 2a4e7b1..b174341 100644
--- a/core/modules/user/src/Tests/UserSaveTest.php
+++ b/core/modules/user/src/Tests/UserSaveTest.php
@@ -32,13 +32,13 @@ function testUserImport() {
     $test_name = $this->randomMachineName();
 
     // Create the base user, based on drupalCreateUser().
-    $user = entity_create('user', array(
+    $user = User::create([
       'name' => $test_name,
       'uid' => $test_uid,
       'mail' => $test_name . '@example.com',
       'pass' => user_password(),
       'status' => 1,
-    ));
+    ]);
     $user->enforceIsNew();
     $user->save();
 
diff --git a/core/modules/user/src/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php
index dfa8a21..54e0983 100644
--- a/core/modules/user/src/Tests/UserValidationTest.php
+++ b/core/modules/user/src/Tests/UserValidationTest.php
@@ -91,10 +91,10 @@ function testValidation() {
     $this->assertEqual($violations[0]->getMessage(), t('The username %name is too long: it must be %max characters or less.', array('%name' => $name, '%max' => 60)));
 
     // Create a second test user to provoke a name collision.
-    $user2 = entity_create('user', array(
+    $user2 = User::create([
       'name' => 'existing',
       'mail' => 'existing@example.com',
-    ));
+    ]);
     $user2->save();
     $user->set('name', 'existing');
     $violations = $user->validate();
@@ -165,11 +165,11 @@ function testValidation() {
     Role::create(array('id' => 'role2'))->save();
 
     // Test cardinality of user roles.
-    $user = entity_create('user', array(
+    $user = User::create([
       'name' => 'role_test',
       'mail' => 'test@example.com',
       'roles' => array('role1', 'role2'),
-    ));
+    ]);
     $violations = $user->validate();
     $this->assertEqual(count($violations), 0);
 
diff --git a/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php
deleted file mode 100644
index 0756858..0000000
--- a/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Views\HandlerFieldPermissionTest.
- */
-
-namespace Drupal\user\Tests\Views;
-
-use Drupal\views\Views;
-
-/**
- * Tests the permission field handler.
- *
- * @group user
- * @see \Drupal\user\Plugin\views\field\Permissions
- */
-class HandlerFieldPermissionTest extends UserKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_field_permission');
-
-  /**
-   * Tests the permission field handler output.
-   */
-  public function testFieldPermission() {
-    $this->setupPermissionTestData();
-
-    $view = Views::getView('test_field_permission');
-    $this->executeView($view);
-    $view->initStyle();
-    $view->render();
-    $style_plugin = $view->style_plugin;
-
-    $expected_permissions = array();
-    $expected_permissions[$this->users[0]->id()] = array();
-    $expected_permissions[$this->users[1]->id()] = array();
-    $expected_permissions[$this->users[2]->id()][] = t('Administer permissions');
-    // View user profiles comes first, because we sort by the permission
-    // machine name.
-    $expected_permissions[$this->users[3]->id()][] = t('Administer permissions');
-    $expected_permissions[$this->users[3]->id()][] = t('Administer users');
-    $expected_permissions[$this->users[3]->id()][] = t('View user information');
-
-    foreach ($view->result as $index => $row) {
-      $uid = $view->field['uid']->getValue($row);
-      $rendered_permission = $style_plugin->getField($index, 'permission');
-
-      $expected_output = implode(', ', $expected_permissions[$uid]);
-      $this->assertEqual($rendered_permission, $expected_output, 'The right permissions are rendered.');
-    }
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
deleted file mode 100644
index ac2644b..0000000
--- a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Views\HandlerFilterPermissionTest.
- */
-
-namespace Drupal\user\Tests\Views;
-
-use Drupal\Component\Utility\Html;
-use Drupal\views\Views;
-
-/**
- * Tests the permissions filter handler.
- *
- * @group user
- * @see \Drupal\user\Plugin\views\filter\Permissions
- */
-class HandlerFilterPermissionTest extends UserKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_filter_permission');
-
-  protected $columnMap;
-
-  /**
-   * Tests the permission filter handler.
-   *
-   * @todo Fix the different commented out tests by fixing the many to one
-   *   handler handling with the NOT operator.
-   */
-  public function testFilterPermission() {
-    $this->setupPermissionTestData();
-
-    $column_map = array('uid' => 'uid');
-    $view = Views::getView('test_filter_permission');
-
-    // Filter by a non existing permission.
-    $view->initHandlers();
-    $view->filter['permission']->value = array('non_existent_permission');
-    $this->executeView($view);
-    $this->assertEqual(count($view->result), 4, 'A non existent permission is not filtered so everything is the result.');
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
-    $expected[] = array('uid' => 3);
-    $expected[] = array('uid' => 4);
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-    $view->destroy();
-
-    // Filter by a permission.
-    $view->initHandlers();
-    $view->filter['permission']->value = array('administer permissions');
-    $this->executeView($view);
-    $this->assertEqual(count($view->result), 2);
-    $expected = array();
-    $expected[] = array('uid' => 3);
-    $expected[] = array('uid' => 4);
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-    $view->destroy();
-
-    // Filter by not a permission.
-    $view->initHandlers();
-    $view->filter['permission']->operator = 'not';
-    $view->filter['permission']->value = array('administer users');
-    $this->executeView($view);
-    $this->assertEqual(count($view->result), 3);
-    $expected = array();
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
-    $expected[] = array('uid' => 3);
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-    $view->destroy();
-
-    // Filter by not multiple permissions, that are present in multiple roles.
-    $view->initHandlers();
-    $view->filter['permission']->operator = 'not';
-    $view->filter['permission']->value = array('administer users', 'administer permissions');
-    $this->executeView($view);
-    $this->assertEqual(count($view->result), 2);
-    $expected = array();
-    $expected[] = array('uid' => 1);
-    $expected[] = array('uid' => 2);
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-    $view->destroy();
-
-    // Filter by another permission of a role with multiple permissions.
-    $view->initHandlers();
-    $view->filter['permission']->value = array('administer users');
-    $this->executeView($view);
-    $this->assertEqual(count($view->result), 1);
-    $expected = array();
-    $expected[] = array('uid' => 4);
-    $this->assertIdenticalResultset($view, $expected, $column_map);
-    $view->destroy();
-
-    $view->initDisplay();
-    $view->initHandlers();
-
-    // Test the value options.
-    $value_options = $view->filter['permission']->getValueOptions();
-
-    $permission_by_module = [];
-    $permissions = \Drupal::service('user.permissions')->getPermissions();
-    foreach ($permissions as $name => $permission) {
-      $permission_by_module[$permission['provider']][$name] = $permission;
-    }
-    foreach (array('system' => 'System', 'user' => 'User') as $module => $title) {
-      $expected = array_map(function ($permission) {
-        return Html::escape(strip_tags($permission['title']));
-      }, $permission_by_module[$module]);
-
-      $this->assertEqual($expected, $value_options[$title], 'Ensure the all permissions are available');
-    }
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php b/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
deleted file mode 100644
index 6873a76..0000000
--- a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Views\HandlerFilterRolesTest.
- */
-
-namespace Drupal\user\Tests\Views;
-
-use Drupal\user\Entity\Role;
-use Drupal\views\Entity\View;
-use Drupal\views\Views;
-
-/**
- * Tests the roles filter handler.
- *
- * @group user
- *
- * @see \Drupal\user\Plugin\views\filter\Roles
- */
-class HandlerFilterRolesTest extends UserKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_user_name');
-
-  /**
-   * Tests that role filter dependencies are calculated correctly.
-   */
-  public function testDependencies() {
-    $role = Role::create(['id' => 'test_user_role']);
-    $role->save();
-    $view = View::load('test_user_name');
-    $expected = [
-      'module' => ['user'],
-    ];
-    $this->assertEqual($expected, $view->getDependencies());
-
-    $display = &$view->getDisplay('default');
-    $display['display_options']['filters']['roles_target_id'] = [
-      'id' => 'roles_target_id',
-      'table' => 'user__roles',
-      'field' => 'roles_target_id',
-      'value' => [
-        'test_user_role' => 'test_user_role',
-      ],
-      'plugin_id' => 'user_roles',
-    ];
-    $view->save();
-    $expected['config'][] = 'user.role.test_user_role';
-    $this->assertEqual($expected, $view->getDependencies());
-
-    $view = Views::getView('test_user_name');
-    $view->initDisplay();
-    $view->initHandlers();
-    $this->assertEqual(array_keys($view->filter['roles_target_id']->getValueOptions()), ['test_user_role']);
-
-    $view = View::load('test_user_name');
-    $display = &$view->getDisplay('default');
-    $display['display_options']['filters']['roles_target_id'] = [
-      'id' => 'roles_target_id',
-      'table' => 'user__roles',
-      'field' => 'roles_target_id',
-      'value' => [],
-      'plugin_id' => 'user_roles',
-    ];
-    $view->save();
-    unset($expected['config']);
-    $this->assertEqual($expected, $view->getDependencies());
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Views/UserKernelTestBase.php b/core/modules/user/src/Tests/Views/UserKernelTestBase.php
deleted file mode 100644
index fa26cf2..0000000
--- a/core/modules/user/src/Tests/Views/UserKernelTestBase.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Views\UserKernelTestBase.
- */
-
-namespace Drupal\user\Tests\Views;
-
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Provides a common test base for user views tests.
- */
-abstract class UserKernelTestBase extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user_test_views', 'user', 'system', 'field');
-
-  /**
-   * Users to use during this test.
-   *
-   * @var array
-   */
-  protected $users = array();
-
-  /**
-   * The entity storage for roles.
-   *
-   * @var \Drupal\user\RoleStorage
-   */
-  protected $roleStorage;
-
-  /**
-   * The entity storage for users.
-   *
-   * @var \Drupal\user\UserStorage
-   */
-  protected $userStorage;
-
-  protected function setUp() {
-    parent::setUp();
-
-    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
-
-    $this->installEntitySchema('user');
-
-    $entity_manager = $this->container->get('entity.manager');
-    $this->roleStorage = $entity_manager->getStorage('user_role');
-    $this->userStorage = $entity_manager->getStorage('user');
-  }
-
-  /**
-   * Set some test data for permission related tests.
-   */
-  protected function setupPermissionTestData() {
-    // Setup a role without any permission.
-    $this->roleStorage->create(array('id' => 'authenticated'))
-      ->save();
-    $this->roleStorage->create(array('id' => 'no_permission'))
-      ->save();
-    // Setup a role with just one permission.
-    $this->roleStorage->create(array('id' => 'one_permission'))
-      ->save();
-    user_role_grant_permissions('one_permission', array('administer permissions'));
-    // Setup a role with multiple permissions.
-    $this->roleStorage->create(array('id' => 'multiple_permissions'))
-      ->save();
-    user_role_grant_permissions('multiple_permissions', array('administer permissions', 'administer users', 'access user profiles'));
-
-    // Setup a user without an extra role.
-    $this->users[] = $account = $this->userStorage->create(['name' => $this->randomString()]);
-    $account->save();
-    // Setup a user with just the first role (so no permission beside the
-    // ones from the authenticated role).
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'first_role'));
-    $account->addRole('no_permission');
-    $account->save();
-    // Setup a user with just the second role (so one additional permission).
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_role'));
-    $account->addRole('one_permission');
-    $account->save();
-    // Setup a user with both the second and the third role.
-    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_third_role'));
-    $account->addRole('one_permission');
-    $account->addRole('multiple_permissions');
-    $account->save();
-  }
-
-}
diff --git a/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php b/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php
deleted file mode 100644
index f3e4dc7..0000000
--- a/core/modules/user/src/Tests/Views/UserViewsFieldAccessTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\user\Tests\Views\UserViewsFieldAccessTest.
- */
-
-namespace Drupal\user\Tests\Views;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\user\Entity\user;
-use Drupal\views\Tests\Handler\FieldFieldAccessTestBase;
-
-/**
- * Tests base field access in Views for the user entity.
- *
- * @group user
- */
-class UserViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user', 'entity_test', 'language'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('user');
-  }
-
-  public function testUserFields() {
-    ConfigurableLanguage::create([
-      'id' => 'es',
-      'name' => 'Spanish',
-    ])->save();
-    ConfigurableLanguage::create([
-      'id' => 'fr',
-      'name' => 'French',
-    ])->save();
-
-    $user = User::create([
-      'name' => 'test user',
-      'mail' => 'druplicon@drop.org',
-      'status' => 1,
-      'preferred_langcode' => 'es',
-      'preferred_admin_langcode' => 'fr',
-      'timezone' => 'ut1',
-      'created' => 123456,
-    ]);
-
-    $user->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('user', 'uid', $user->id());
-    $this->assertFieldAccess('user', 'uuid', $user->uuid());
-    $this->assertFieldAccess('user', 'langcode', $user->language()->getName());
-    $this->assertFieldAccess('user', 'preferred_langcode', 'Spanish');
-    $this->assertFieldAccess('user', 'preferred_admin_langcode', 'French');
-    $this->assertFieldAccess('user', 'name', 'test user');
-    // $this->assertFieldAccess('user', 'mail', 'druplicon@drop.org');
-    $this->assertFieldAccess('user', 'timezone', 'ut1');
-    $this->assertFieldAccess('user', 'status', 'On');
-    // $this->assertFieldAccess('user', 'created', \Drupal::service('date.formatter')->format(123456));
-    // $this->assertFieldAccess('user', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
-  }
-
-}
diff --git a/core/modules/user/src/UserAccessControlHandler.php b/core/modules/user/src/UserAccessControlHandler.php
index ae52b2b..8fa13cf 100644
--- a/core/modules/user/src/UserAccessControlHandler.php
+++ b/core/modules/user/src/UserAccessControlHandler.php
@@ -22,11 +22,25 @@
 class UserAccessControlHandler extends EntityAccessControlHandler {
 
   /**
+   * Allow access to user label.
+   *
+   * @var bool
+   */
+  protected $viewLabelOperation = TRUE;
+
+  /**
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     /** @var \Drupal\user\UserInterface $entity*/
 
+    // We don't treat the user label as privileged information, so this check
+    // has to be the first one in order to allow labels for all users to be
+    // viewed, including the special anonymous user.
+    if ($operation === 'view label') {
+      return AccessResult::allowed();
+    }
+
     // The anonymous user's profile can neither be viewed, updated nor deleted.
     if ($entity->isAnonymous()) {
       return AccessResult::forbidden();
@@ -41,7 +55,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
       case 'view':
         // Only allow view access if the account is active.
         if ($account->hasPermission('access user profiles') && $entity->isActive()) {
-          return AccessResult::allowed()->cachePerPermissions()->cacheUntilEntityChanges($entity);
+          return AccessResult::allowed()->cachePerPermissions()->addCacheableDependency($entity);
         }
         // Users can view own profiles at all times.
         elseif ($account->id() == $entity->id()) {
diff --git a/core/modules/user/src/UserListBuilder.php b/core/modules/user/src/UserListBuilder.php
index 5c4e988..f5abe38 100644
--- a/core/modules/user/src/UserListBuilder.php
+++ b/core/modules/user/src/UserListBuilder.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\user;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
@@ -151,8 +152,19 @@ public function buildRow(EntityInterface $entity) {
       '#theme' => 'item_list',
       '#items' => $users_roles,
     );
-    $row['member_for'] = $this->dateFormatter->formatTimeDiffSince($entity->getCreatedTime());
-    $row['access'] = $entity->getLastAccessedTime() ? $this->t('@time ago', array('@time' => $this->dateFormatter->formatTimeDiffSince($entity->getLastAccessedTime()))) : t('never');
+    $options = [
+      'return_as_object' => TRUE,
+    ];
+    $row['member_for']['data'] = $this->dateFormatter->formatTimeDiffSince($entity->getCreatedTime(), $options)->toRenderable();
+    $last_access = $this->dateFormatter->formatTimeDiffSince($entity->getLastAccessedTime(), $options);
+
+    if ($entity->getLastAccessedTime()) {
+      $row['access']['data']['#markup'] = $last_access->getString();
+      CacheableMetadata::createFromObject($last_access)->applyTo($row['access']['data']);
+    }
+    else {
+      $row['access']['data']['#markup'] = t('never');
+    }
     return $row + parent::buildRow($entity);
   }
 
diff --git a/core/modules/user/src/UserStorage.php b/core/modules/user/src/UserStorage.php
index d6a42f4..206329e 100644
--- a/core/modules/user/src/UserStorage.php
+++ b/core/modules/user/src/UserStorage.php
@@ -7,16 +7,9 @@
 
 namespace Drupal\user;
 
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
-use Drupal\Core\Password\PasswordInterface;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Controller class for users.
@@ -27,49 +20,6 @@
 class UserStorage extends SqlContentEntityStorage implements UserStorageInterface {
 
   /**
-   * Provides the password hashing service object.
-   *
-   * @var \Drupal\Core\Password\PasswordInterface
-   */
-  protected $password;
-
-  /**
-   * Constructs a new UserStorage object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection to be used.
-   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Password\PasswordInterface $password
-   *   The password hashing service.
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The language manager.
-   */
-  public function __construct(EntityTypeInterface $entity_type, Connection $database, EntityManagerInterface $entity_manager, CacheBackendInterface $cache, PasswordInterface $password, LanguageManagerInterface $language_manager) {
-    parent::__construct($entity_type, $database, $entity_manager, $cache, $language_manager);
-
-    $this->password = $password;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('database'),
-      $container->get('entity.manager'),
-      $container->get('cache.entity'),
-      $container->get('password'),
-      $container->get('language_manager')
-    );
-  }
-
-  /**
    * {@inheritdoc}
    */
   protected function doSaveFieldItems(ContentEntityInterface $entity, array $names = []) {
diff --git a/core/modules/user/src/UserViewsData.php b/core/modules/user/src/UserViewsData.php
index c71b2ac..e31e5c5 100644
--- a/core/modules/user/src/UserViewsData.php
+++ b/core/modules/user/src/UserViewsData.php
@@ -20,7 +20,7 @@ class UserViewsData extends EntityViewsData {
   public function getViewsData() {
     $data = parent::getViewsData();
 
-    $data['users_field_data']['table']['base']['help'] = t('Users who have created accounts on your site.');
+    $data['users_field_data']['table']['base']['help'] = $this->t('Users who have created accounts on your site.');
     $data['users_field_data']['table']['base']['access query tag'] = 'user_access';
 
     $data['users_field_data']['table']['wizard_id'] = 'user';
@@ -32,31 +32,32 @@ public function getViewsData() {
       'empty field name' => \Drupal::config('user.settings')->get('anonymous'),
     );
     $data['users_field_data']['uid']['filter']['id'] = 'user_name';
-    $data['users_field_data']['uid']['filter']['title'] = t('Name');
+    $data['users_field_data']['uid']['filter']['title'] = $this->t('Name (autocomplete)');
+    $data['users_field_data']['uid']['filter']['help'] = $this->t('The user or author name. Uses an autocomplete widget to find a user name, the actual filter uses the resulting user ID.');
     $data['users_field_data']['uid']['relationship'] = array(
-      'title' => t('Content authored'),
-      'help' => t('Relate content to the user who created it. This relationship will create one record for each content item created by the user.'),
+      'title' => $this->t('Content authored'),
+      'help' => $this->t('Relate content to the user who created it. This relationship will create one record for each content item created by the user.'),
       'id' => 'standard',
       'base' => 'node_field_data',
       'base field' => 'uid',
       'field' => 'uid',
-      'label' => t('nodes'),
+      'label' => $this->t('nodes'),
     );
 
     $data['users_field_data']['uid_raw'] = array(
-      'help' => t('The raw numeric user ID.'),
+      'help' => $this->t('The raw numeric user ID.'),
       'real field' => 'uid',
       'filter' => array(
-        'title' => t('The user ID'),
+        'title' => $this->t('The user ID'),
         'id' => 'numeric',
       ),
     );
 
     $data['users_field_data']['uid_representative'] = array(
       'relationship' => array(
-        'title' => t('Representative node'),
-        'label'  => t('Representative node'),
-        'help' => t('Obtains a single representative node for each user, according to a chosen sort criterion.'),
+        'title' => $this->t('Representative node'),
+        'label'  => $this->t('Representative node'),
+        'help' => $this->t('Obtains a single representative node for each user, according to a chosen sort criterion.'),
         'id' => 'groupwise_max',
         'relationship field' => 'uid',
         'outer field' => 'users_field_data.uid',
@@ -70,33 +71,33 @@ public function getViewsData() {
 
     $data['users']['uid_current'] = array(
       'real field' => 'uid',
-      'title' => t('Current'),
-      'help' => t('Filter the view to the currently logged in user.'),
+      'title' => $this->t('Current'),
+      'help' => $this->t('Filter the view to the currently logged in user.'),
       'filter' => array(
         'id' => 'user_current',
         'type' => 'yes-no',
       ),
     );
 
-    $data['users_field_data']['name']['help'] = t('The user or author name.');
+    $data['users_field_data']['name']['help'] = $this->t('The user or author name.');
     $data['users_field_data']['name']['field']['default_formatter'] = 'user_name';
-    $data['users_field_data']['name']['filter']['title'] = t('Name (raw)');
-    $data['users_field_data']['name']['filter']['help'] = t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not use autocomplete.');
+    $data['users_field_data']['name']['filter']['title'] = $this->t('Name (raw)');
+    $data['users_field_data']['name']['filter']['help'] = $this->t('The user or author name. This filter does not check if the user exists and allows partial matching. Does not use autocomplete.');
 
     // Note that this field implements field level access control.
-    $data['users_field_data']['mail']['help'] = t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.');
+    $data['users_field_data']['mail']['help'] = $this->t('Email address for a given user. This field is normally not shown to users, so be cautious when using it.');
 
-    $data['users_field_data']['langcode']['help'] = t('Original language of the user information');
-    $data['users_field_data']['langcode']['help'] = t('Language of the translation of user information');
+    $data['users_field_data']['langcode']['help'] = $this->t('Original language of the user information');
+    $data['users_field_data']['langcode']['help'] = $this->t('Language of the translation of user information');
 
-    $data['users_field_data']['preferred_langcode']['title'] = t('Preferred language');
-    $data['users_field_data']['preferred_langcode']['help'] = t('Preferred language of the user');
-    $data['users_field_data']['preferred_admin_langcode']['title'] = t('Preferred admin language');
-    $data['users_field_data']['preferred_admin_langcode']['help'] = t('Preferred administrative language of the user');
+    $data['users_field_data']['preferred_langcode']['title'] = $this->t('Preferred language');
+    $data['users_field_data']['preferred_langcode']['help'] = $this->t('Preferred language of the user');
+    $data['users_field_data']['preferred_admin_langcode']['title'] = $this->t('Preferred admin language');
+    $data['users_field_data']['preferred_admin_langcode']['help'] = $this->t('Preferred administrative language of the user');
 
     $data['users_field_data']['created_fulldate'] = array(
-      'title' => t('Created date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Created date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_fulldate',
@@ -104,8 +105,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['created_year_month'] = array(
-      'title' => t('Created year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Created year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_year_month',
@@ -113,8 +114,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['created_year'] = array(
-      'title' => t('Created year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Created year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_year',
@@ -122,8 +123,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['created_month'] = array(
-      'title' => t('Created month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Created month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_month',
@@ -131,8 +132,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['created_day'] = array(
-      'title' => t('Created day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Created day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_day',
@@ -140,22 +141,22 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['created_week'] = array(
-      'title' => t('Created week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Created week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'created',
         'id' => 'date_week',
       ),
     );
 
-    $data['users_field_data']['status']['filter']['label'] = t('Active');
+    $data['users_field_data']['status']['filter']['label'] = $this->t('Active');
     $data['users_field_data']['status']['filter']['type'] = 'yes-no';
 
-    $data['users_field_data']['changed']['title'] = t('Updated date');
+    $data['users_field_data']['changed']['title'] = $this->t('Updated date');
 
     $data['users_field_data']['changed_fulldate'] = array(
-      'title' => t('Updated date'),
-      'help' => t('Date in the form of CCYYMMDD.'),
+      'title' => $this->t('Updated date'),
+      'help' => $this->t('Date in the form of CCYYMMDD.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_fulldate',
@@ -163,8 +164,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['changed_year_month'] = array(
-      'title' => t('Updated year + month'),
-      'help' => t('Date in the form of YYYYMM.'),
+      'title' => $this->t('Updated year + month'),
+      'help' => $this->t('Date in the form of YYYYMM.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year_month',
@@ -172,8 +173,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['changed_year'] = array(
-      'title' => t('Updated year'),
-      'help' => t('Date in the form of YYYY.'),
+      'title' => $this->t('Updated year'),
+      'help' => $this->t('Date in the form of YYYY.'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_year',
@@ -181,8 +182,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['changed_month'] = array(
-      'title' => t('Updated month'),
-      'help' => t('Date in the form of MM (01 - 12).'),
+      'title' => $this->t('Updated month'),
+      'help' => $this->t('Date in the form of MM (01 - 12).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_month',
@@ -190,8 +191,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['changed_day'] = array(
-      'title' => t('Updated day'),
-      'help' => t('Date in the form of DD (01 - 31).'),
+      'title' => $this->t('Updated day'),
+      'help' => $this->t('Date in the form of DD (01 - 31).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_day',
@@ -199,8 +200,8 @@ public function getViewsData() {
     );
 
     $data['users_field_data']['changed_week'] = array(
-      'title' => t('Updated week'),
-      'help' => t('Date in the form of WW (01 - 53).'),
+      'title' => $this->t('Updated week'),
+      'help' => $this->t('Date in the form of WW (01 - 53).'),
       'argument' => array(
         'field' => 'changed',
         'id' => 'date_week',
@@ -208,8 +209,8 @@ public function getViewsData() {
     );
 
     $data['users']['data'] = array(
-      'title' => t('Data'),
-      'help' => t('Provides access to the user data service.'),
+      'title' => $this->t('Data'),
+      'help' => $this->t('Provides access to the user data service.'),
       'real field' => 'uid',
       'field' => array(
         'id' => 'user_data',
@@ -217,14 +218,14 @@ public function getViewsData() {
     );
 
     $data['users']['user_bulk_form'] = array(
-      'title' => t('Bulk update'),
-      'help' => t('Add a form element that lets you run operations on multiple users.'),
+      'title' => $this->t('Bulk update'),
+      'help' => $this->t('Add a form element that lets you run operations on multiple users.'),
       'field' => array(
         'id' => 'user_bulk_form',
       ),
     );
 
-    $data['user__roles']['table']['group']  = t('User');
+    $data['user__roles']['table']['group']  = $this->t('User');
 
     $data['user__roles']['table']['join'] = array(
       'users_field_data' => array(
@@ -234,8 +235,8 @@ public function getViewsData() {
     );
 
     $data['user__roles']['roles_target_id'] = array(
-      'title' => t('Roles'),
-      'help' => t('Roles that a user belongs to.'),
+      'title' => $this->t('Roles'),
+      'help' => $this->t('Roles that a user belongs to.'),
       'field' => array(
         'id' => 'user_roles',
         'no group by' => TRUE,
@@ -248,15 +249,15 @@ public function getViewsData() {
         'id' => 'user__roles_rid',
         'name table' => 'role',
         'name field' => 'name',
-        'empty field name' => t('No role'),
+        'empty field name' => $this->t('No role'),
         'zero is null' => TRUE,
         'numeric' => TRUE,
       ),
     );
 
     $data['user__roles']['permission'] = array(
-      'title' => t('Permission'),
-      'help' => t('The user permissions.'),
+      'title' => $this->t('Permission'),
+      'help' => $this->t('The user permissions.'),
       'field' => array(
         'id' => 'user_permissions',
         'no group by' => TRUE,
diff --git a/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php b/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php
new file mode 100644
index 0000000..28dab8b
--- /dev/null
+++ b/core/modules/user/tests/fixtures/update/drupal-8.user-email-token-2587275.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8.bare.standard.php.gz for testing the
+ * upgrade path of https://www.drupal.org/node/2587275.
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// Replace the user.mail configuration because the dump contains the right token
+// already.
+$connection->delete('config')->condition('name', 'user.mail')->execute();
+$connection->insert('config')
+->fields(array('collection', 'name', 'data'))
+->values(array(
+  'collection' => '',
+  'name' => 'user.mail',
+  'data' => "a:10:{s:14:\"cancel_confirm\";a:2:{s:4:\"body\";s:369:\"[user:name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n--  [site:name] team\";s:7:\"subject\";s:59:\"Account cancellation request for [user:name] at [site:name]\";}s:14:\"password_reset\";a:2:{s:4:\"body\";s:397:\"[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n--  [site:name] team\";s:7:\"subject\";s:60:\"Replacement login information for [user:name] at [site:name]\";}s:22:\"register_admin_created\";a:2:{s:4:\"body\";s:463:\"[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:58:\"An administrator created an account for you at [site:name]\";}s:29:\"register_no_approval_required\";a:2:{s:4:\"body\";s:437:\"[user:name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:46:\"Account details for [user:name] at [site:name]\";}s:25:\"register_pending_approval\";a:2:{s:4:\"body\";s:281:\"[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  [site:name] team\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:31:\"register_pending_approval_admin\";a:2:{s:4:\"body\";s:56:\"[user:name] has applied for an account.\n\n[user:edit-url]\";s:7:\"subject\";s:71:\"Account details for [user:name] at [site:name] (pending admin approval)\";}s:16:\"status_activated\";a:2:{s:4:\"body\";s:446:\"[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n--  [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (approved)\";}s:14:\"status_blocked\";a:2:{s:4:\"body\";s:89:\"[user:name],\n\nYour account on [site:account-name] has been blocked.\n\n--  [site:name] team\";s:7:\"subject\";s:56:\"Account details for [user:name] at [site:name] (blocked)\";}s:15:\"status_canceled\";a:2:{s:4:\"body\";s:82:\"[user:name],\n\nYour account on [site:name] has been canceled.\n\n--  [site:name] team\";s:7:\"subject\";s:57:\"Account details for [user:name] at [site:name] (canceled)\";}s:8:\"langcode\";s:2:\"en\";}"
+))->execute();
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php
new file mode 100644
index 0000000..6f0918d
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserAdminPassTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserAdminPassTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Tests\migrate\Kernel\MigrateTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests preservation of root account password.
+ *
+ * @group user
+ */
+class MigrateUserAdminPassTest extends MigrateTestBase {
+
+  /**
+   * The passwords as retrieved from the account entities before migration.
+   *
+   * @var array
+   */
+  protected $originalPasswords = [];
+
+  /**
+   * Modules to enable.
+   *
+   * @var string[]
+   */
+  public static $modules = ['user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Make sure the admin user and a regular user are created.
+    $this->container->get('module_handler')->loadInclude('user', 'install');
+    $this->installEntitySchema('user');
+    user_install();
+    /** @var \Drupal\user\Entity\User $admin_account */
+    $admin_account = User::load(1);
+    $admin_account->setPassword('original');
+    $admin_account->save();
+    $this->originalPasswords[1] = $admin_account->getPassword();
+
+    /** @var \Drupal\user\Entity\User $user_account */
+    $user_account = User::create([
+      'uid' => 2,
+      'name' => 'original_username',
+      'mail' => 'original_email@example.com',
+      'pass' => 'original_password',
+    ]);
+    $user_account->save();
+    $this->originalPasswords[2] = $user_account->getPassword();
+  }
+
+  /**
+   * Tests preserving the admin user's password.
+   */
+  public function testAdminPasswordPreserved() {
+    $user_data_rows = [
+      [
+        'id' => '1',
+        'username' => 'site_admin',
+        'password' => 'new_password',
+        'email' => 'site_admin@example.com',
+      ],
+      [
+        'id' => '2',
+        'username' => 'random_user',
+        'password' => 'random_password',
+        'email' => 'random_user@example.com',
+      ],
+    ];
+    $ids = ['id' => ['type' => 'integer']];
+    $definition = [
+      'id' => 'users',
+      'migration_tags' => ['Admin password test'],
+      'source' => [
+        'plugin' => 'embedded_data',
+        'data_rows' => $user_data_rows,
+        'ids' => $ids,
+      ],
+      'process' => [
+        'uid' => 'id',
+        'name' => 'username',
+        'mail' => 'email',
+        'pass' => 'password',
+      ],
+      'destination' => ['plugin' => 'entity:user'],
+    ];
+    $migration = \Drupal::service('plugin.manager.migration')->createStubMigration($definition);
+    $this->executeMigration($migration);
+
+    // Verify that admin username and email were changed, but password was not.
+    /** @var \Drupal\user\Entity\User $admin_account */
+    $admin_account = User::load(1);
+    $this->assertIdentical($admin_account->getUsername(), 'site_admin');
+    $this->assertIdentical($admin_account->getEmail(), 'site_admin@example.com');
+    $this->assertIdentical($admin_account->getPassword(), $this->originalPasswords[1]);
+
+    // Verify that everything changed for the regular user.
+    /** @var \Drupal\user\Entity\User $user_account */
+    $user_account = User::load(2);
+    $this->assertIdentical($user_account->getUsername(), 'random_user');
+    $this->assertIdentical($user_account->getEmail(), 'random_user@example.com');
+    $this->assertNotIdentical($user_account->getPassword(), $this->originalPasswords[2]);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php
new file mode 100644
index 0000000..14c7c49
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityDisplayTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * User picture entity display.
+ *
+ * @group user
+ */
+class MigrateUserPictureEntityDisplayTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['file', 'image'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('file');
+    $this->executeMigrations([
+      'user_picture_field',
+      'user_picture_field_instance',
+      'user_picture_entity_display',
+    ]);
+  }
+
+  /**
+   * Tests the Drupal 7 user picture to Drupal 8 entity display migration.
+   */
+  public function testUserPictureEntityDisplay() {
+    $component = EntityViewDisplay::load('user.user.default')->getComponent('user_picture');
+    $this->assertIdentical('image', $component['type']);
+    $this->assertIdentical('', $component['settings']['image_style']);
+    $this->assertIdentical('content', $component['settings']['image_link']);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php
new file mode 100644
index 0000000..bc28eae
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureEntityFormDisplayTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of the user_picture field's entity form display settings.
+ *
+ * @group user
+ */
+class MigrateUserPictureEntityFormDisplayTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['image', 'file'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_picture_field',
+      'user_picture_field_instance',
+      'user_picture_entity_form_display',
+    ]);
+  }
+
+  /**
+   * Tests the field's entity form display settings.
+   */
+  public function testEntityFormDisplaySettings() {
+    $component = EntityFormDisplay::load('user.user.default')->getComponent('user_picture');
+    $this->assertIdentical('image_image', $component['type']);
+    $this->assertIdentical('throbber', $component['settings']['progress_indicator']);
+    $this->assertIdentical('thumbnail', $component['settings']['preview_image_style']);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php
new file mode 100644
index 0000000..6e87113
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldInstanceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Core\Field\FieldConfigInterface;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * User picture field instance migration.
+ *
+ * @group user
+ */
+class MigrateUserPictureFieldInstanceTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['image', 'file'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_picture_field',
+      'user_picture_field_instance',
+    ]);
+  }
+
+  /**
+   * Test the user picture field migration.
+   */
+  public function testUserPictureField() {
+    /** @var \Drupal\field\FieldConfigInterface $field */
+    $field = FieldConfig::load('user.user.user_picture');
+    $this->assertTrue($field instanceof FieldConfigInterface);
+    $this->assertIdentical('user', $field->getTargetEntityTypeId());
+    $this->assertIdentical('user', $field->getTargetBundle());
+    $this->assertIdentical('user_picture', $field->getName());
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php
new file mode 100644
index 0000000..3644493
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserPictureFieldTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserPictureFieldTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * User picture field migration.
+ *
+ * @group user
+ */
+class MigrateUserPictureFieldTest extends MigrateDrupal7TestBase {
+
+  public static $modules = ['image', 'file'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('user_picture_field');
+  }
+
+  /**
+   * Test the user picture field migration.
+   */
+  public function testUserPictureField() {
+    /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
+    $field_storage = FieldStorageConfig::load('user.user_picture');
+    $this->assertTrue($field_storage instanceof FieldStorageConfigInterface);
+    $this->assertIdentical('user.user_picture', $field_storage->id());
+    $this->assertIdentical('image', $field_storage->getType());
+    $this->assertIdentical('user', $field_storage->getTargetEntityTypeId());
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php
new file mode 100644
index 0000000..11c40d5
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityDisplayTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileEntityDisplayTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile entity display migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserProfileEntityDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+      'user_profile_entity_display',
+    ]);
+  }
+
+  /**
+   * Tests migration of user profile fields.
+   */
+  public function testUserProfileFields() {
+    $display = EntityViewDisplay::load('user.user.default');
+
+    // Test a text field.
+    $component = $display->getComponent('profile_color');
+    $this->assertIdentical('text_default', $component['type']);
+
+    // Test a list field.
+    $component = $display->getComponent('profile_bands');
+    $this->assertIdentical('text_default', $component['type']);
+
+    // Test a date field.
+    $component = $display->getComponent('profile_birthdate');
+    $this->assertIdentical('datetime_default', $component['type']);
+
+    // Test PROFILE_PRIVATE field is hidden.
+    $this->assertNull($display->getComponent('profile_sell_address'));
+
+    // Test PROFILE_HIDDEN field is hidden.
+    $this->assertNull($display->getComponent('profile_sold_to'));
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php
new file mode 100644
index 0000000..d212607
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileEntityFormDisplayTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileEntityFormDisplayTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile entity form display migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserProfileEntityFormDisplayTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+      'user_profile_entity_form_display',
+    ]);
+  }
+
+  /**
+   * Tests migration of user profile fields.
+   */
+  public function testUserProfileEntityFormDisplay() {
+    $display = EntityFormDisplay::load('user.user.default');
+
+    // Test a text field.
+    $component = $display->getComponent('profile_color');
+    $this->assertIdentical('text_textfield', $component['type']);
+
+    // Test a list field.
+    $component = $display->getComponent('profile_bands');
+    $this->assertIdentical('text_textfield', $component['type']);
+
+    // Test a date field.
+    $component = $display->getComponent('profile_birthdate');
+    $this->assertIdentical('datetime_default', $component['type']);
+
+    // Test PROFILE_PRIVATE field is hidden.
+    $this->assertNull($display->getComponent('profile_sell_address'));
+
+    // Test PROFILE_HIDDEN field is hidden.
+    $this->assertNull($display->getComponent('profile_sold_to'));
+
+    // Test that a checkbox field has the proper display label setting.
+    $component = $display->getComponent('profile_love_migrations');
+    $this->assertIdentical('boolean_checkbox', $component['type']);
+    $this->assertIdentical(true, $component['settings']['display_label']);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php
new file mode 100644
index 0000000..d2d2e9d
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldInstanceTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileFieldInstanceTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile field instance migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserProfileFieldInstanceTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+    ]);
+  }
+
+  /**
+   * Tests migration of user profile fields.
+   */
+  public function testUserProfileFields() {
+    // Migrated a text field.
+    $field = FieldConfig::load('user.user.profile_color');
+    $this->assertIdentical('Favorite color', $field->label());
+    $this->assertIdentical('List your favorite color', $field->getDescription());
+
+    // Migrated a textarea.
+    $field = FieldConfig::load('user.user.profile_biography');
+    $this->assertIdentical('Biography', $field->label());
+    $this->assertIdentical('Tell people a little bit about yourself', $field->getDescription());
+
+    // Migrated checkbox field.
+    $field = FieldConfig::load('user.user.profile_sell_address');
+    $this->assertIdentical('Sell your email address?', $field->label());
+    $this->assertIdentical("If you check this box, we'll sell your address to spammers to help line the pockets of our shareholders. Thanks!", $field->getDescription());
+
+    // Migrated selection field.
+    $field = FieldConfig::load('user.user.profile_sold_to');
+    $this->assertIdentical('Sales Category', $field->label());
+    $this->assertIdentical("Select the sales categories to which this user's address was sold.", $field->getDescription());
+
+    // Migrated list field.
+    $field = FieldConfig::load('user.user.profile_bands');
+    $this->assertIdentical('Favorite bands', $field->label());
+    $this->assertIdentical("Enter your favorite bands. When you've saved your profile, you'll be able to find other people with the same favorites.", $field->getDescription());
+
+    // Migrated URL field.
+    $field = FieldConfig::load('user.user.profile_blog');
+    $this->assertIdentical('Blog', $field->label());
+    $this->assertIdentical("Paste the full URL, including http://, of your personal blog.", $field->getDescription());
+
+    // Migrated date field.
+    $field = FieldConfig::load('user.user.profile_birthdate');
+    $this->assertIdentical('Birthdate', $field->label());
+    $this->assertIdentical("Enter your birth date and we'll send you a coupon.", $field->getDescription());
+
+    // Another migrated checkbox field, with a different source visibility setting.
+    $field = FieldConfig::load('user.user.profile_love_migrations');
+    $this->assertIdentical('I love migrations', $field->label());
+    $this->assertIdentical("If you check this box, you love migrations.", $field->getDescription());
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
new file mode 100644
index 0000000..bb2edf45
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserProfileFieldTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserProfileFieldTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the user profile field migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('user_profile_field');
+  }
+
+  /**
+   * Tests migration of user profile fields.
+   */
+  public function testUserProfileFields() {
+    // Migrated a text field.
+    $field_storage = FieldStorageConfig::load('user.profile_color');
+    $this->assertIdentical('text', $field_storage->getType(), 'Field type is text.');
+    $this->assertIdentical(1, $field_storage->getCardinality(), 'Text field has correct cardinality');
+
+    // Migrated a textarea.
+    $field_storage = FieldStorageConfig::load('user.profile_biography');
+    $this->assertIdentical('text_long', $field_storage->getType(), 'Field type is text_long.');
+
+    // Migrated checkbox field.
+    $field_storage = FieldStorageConfig::load('user.profile_sell_address');
+    $this->assertIdentical('boolean', $field_storage->getType(), 'Field type is boolean.');
+
+    // Migrated selection field.
+    $field_storage = FieldStorageConfig::load('user.profile_sold_to');
+    $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
+    $settings = $field_storage->getSettings();
+    $this->assertEqual($settings['allowed_values'], array(
+      'Pill spammers' => 'Pill spammers',
+      'Fitness spammers' => 'Fitness spammers',
+      'Back\slash' => 'Back\slash',
+      'Forward/slash' => 'Forward/slash',
+      'Dot.in.the.middle' => 'Dot.in.the.middle',
+      'Faithful servant' => 'Faithful servant',
+      'Anonymous donor' => 'Anonymous donor',
+    ));
+    $this->assertIdentical('list_string', $field_storage->getType(), 'Field type is list_string.');
+
+    // Migrated list field.
+    $field_storage = FieldStorageConfig::load('user.profile_bands');
+    $this->assertIdentical('text', $field_storage->getType(), 'Field type is text.');
+    $this->assertIdentical(-1, $field_storage->getCardinality(), 'List field has correct cardinality');
+
+    // Migrated URL field.
+    $field_storage = FieldStorageConfig::load('user.profile_blog');
+    $this->assertIdentical('link', $field_storage->getType(), 'Field type is link.');
+
+    // Migrated date field.
+    $field_storage = FieldStorageConfig::load('user.profile_birthdate');
+    $this->assertIdentical('datetime', $field_storage->getType(), 'Field type is datetime.');
+    $this->assertIdentical('date', $field_storage->getSettings()['datetime_type']);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php
new file mode 100644
index 0000000..8e7e6ef
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/MigrateUserStubTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\MigrateUserStubTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate;
+
+use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
+
+/**
+ * Test stub creation for user entities.
+ *
+ * @group user
+ */
+class MigrateUserStubTest extends MigrateDrupalTestBase {
+
+  use StubTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->installSchema('system', ['sequences']);
+  }
+
+  /**
+   * Tests creation of user stubs.
+   */
+  public function testStub() {
+    $this->performStubTest('user');
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
new file mode 100644
index 0000000..cd51021
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserConfigsTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\user\AccountSettingsForm;
+use Drupal\Core\Database\Database;
+
+/**
+ * Upgrade variables to user.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserConfigsTest extends MigrateDrupal6TestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->container->get('router.builder')->rebuild();
+    $this->executeMigrations(['d6_user_mail', 'd6_user_settings']);
+  }
+
+  /**
+   * Tests migration of user variables to user.mail.yml.
+   */
+  public function testUserMail() {
+    $config = $this->config('user.mail');
+
+    $this->assertIdentical('Account details for [user:name] at [site:name] (approved)', $config->get('status_activated.subject'));
+    $this->assertIdentical("[user:name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\nOnce you have set your own password, you will be able to log in to [site:login-url] in the future using:\n\nusername: [user:name]\n", $config->get('status_activated.body'));
+    $this->assertIdentical('Replacement login information for [user:name] at [site:name]', $config->get('password_reset.subject'));
+    $this->assertIdentical("[user:name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in to [site:url-brief] by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password." , $config->get('password_reset.body'));
+    $this->assertIdentical('Account details for [user:name] at [site:name] (deleted)', $config->get('cancel_confirm.subject'));
+    $this->assertIdentical("[user:name],\n\nYour account on [site:name] has been deleted.", $config->get('cancel_confirm.body'));
+    $this->assertIdentical('An administrator created an account for you at [site:name]', $config->get('register_admin_created.subject'));
+    $this->assertIdentical("[user:name],\n\nA site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password:\n\nusername: [user:name]\npassword: \n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\n\n--  [site:name] team", $config->get('register_admin_created.body'));
+    $this->assertIdentical('Account details for [user:name] at [site:name]', $config->get('register_no_approval_required.subject'));
+    $this->assertIdentical("[user:name],\n\nThank you for registering at [site:name]. You may now log in to [site:login-url] using the following username and password:\n\nusername: [user:name]\npassword: \n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n[user:one-time-login-url]\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to [user:edit-url] so you can change your password.\n\n\n--  [site:name] team", $config->get('register_no_approval_required.body'));
+    $this->assertIdentical('Account details for [user:name] at [site:name] (pending admin approval)', $config->get('register_pending_approval.subject'));
+    $this->assertIdentical("[user:name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n\n--  [site:name] team", $config->get('register_pending_approval.body'));
+    $this->assertIdentical('Account details for [user:name] at [site:name] (blocked)', $config->get('status_blocked.subject'));
+    $this->assertIdentical("[user:name],\n\nYour account on [site:name] has been blocked.", $config->get('status_blocked.body'));
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config->get());
+  }
+
+  /**
+   * Tests migration of user variables to user.settings.yml.
+   */
+  public function testUserSettings() {
+    $config = $this->config('user.settings');
+    $this->assertIdentical(TRUE, $config->get('notify.status_blocked'));
+    $this->assertIdentical(FALSE, $config->get('notify.status_activated'));
+    $this->assertIdentical(FALSE, $config->get('verify_mail'));
+    $this->assertIdentical('admin_only', $config->get('register'));
+    $this->assertIdentical('Guest', $config->get('anonymous'));
+
+    // Tests migration of user_register using the AccountSettingsForm.
+
+    // Map D6 value to D8 value
+    $user_register_map = [
+      [0, USER_REGISTER_ADMINISTRATORS_ONLY],
+      [1, USER_REGISTER_VISITORS],
+      [2, USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL],
+    ];
+
+    foreach ($user_register_map as $map) {
+      // Tests migration of user_register = 1
+      Database::getConnection('default', 'migrate')
+          ->update('variable')
+          ->fields(['value' => serialize($map[0])])
+          ->condition('name', 'user_register')
+          ->execute();
+
+      /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+      $migration = $this->getMigration('d6_user_settings');
+      // Indicate we're rerunning a migration that's already run.
+      $migration->getIdMap()->prepareUpdate();
+      $this->executeMigration($migration);
+      $form = $this->container->get('form_builder')->getForm(AccountSettingsForm::create($this->container));
+      $this->assertIdentical($map[1], $form['registration_cancellation']['user_register']['#value']);
+    }
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php
new file mode 100644
index 0000000..11bbb1a
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserContactSettingsTest.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserContactSettingsTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Users contact settings migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserContactSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['contact'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->migrateUsers(FALSE);
+    $this->installSchema('user', ['users_data']);
+    $this->executeMigration('d6_user_contact_settings');
+  }
+
+  /**
+   * Tests the Drupal6 user contact settings migration.
+   */
+  public function testUserContactSettings() {
+    $user_data = \Drupal::service('user.data');
+    $module = $key = 'contact';
+    $uid = 2;
+    $setting = $user_data->get($module, $uid, $key);
+    $this->assertIdentical('1', $setting);
+
+    $uid = 8;
+    $setting = $user_data->get($module, $uid, $key);
+    $this->assertIdentical('0', $setting);
+
+    $uid = 15;
+    $setting = $user_data->get($module, $uid, $key);
+    $this->assertIdentical(NULL, $setting);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
new file mode 100644
index 0000000..ff51635
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserPictureFileTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserPictureFileTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\file\Entity\File;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * User pictures migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('d6_user_picture_file');
+    $source = $migration->getSourceConfiguration();
+    $source['site_path'] = 'core/modules/simpletest';
+    $migration->set('source', $source);
+    $this->executeMigration($migration);
+  }
+
+  /**
+   * Tests the Drupal 6 user pictures to Drupal 8 migration.
+   */
+  public function testUserPictures() {
+    $file_ids = array();
+    foreach ($this->migration->getIdMap() as $destination_ids) {
+      $file_ids[] = reset($destination_ids);
+    }
+    $files = File::loadMultiple($file_ids);
+    /** @var \Drupal\file\FileInterface $file */
+    $file = array_shift($files);
+    $this->assertIdentical('image-test.jpg', $file->getFilename());
+    $this->assertIdentical('public://image-test.jpg', $file->getFileUri());
+    $this->assertIdentical('2', $file->getOwnerId());
+    $this->assertIdentical('1901', $file->getSize());
+    $this->assertIdentical('image/jpeg', $file->getMimeType());
+
+    $file = array_shift($files);
+    $this->assertIdentical('image-test.png', $file->getFilename());
+    $this->assertIdentical('public://image-test.png', $file->getFileUri());
+    $this->assertIdentical('8', $file->getOwnerId());
+    $this->assertFalse($files);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
new file mode 100644
index 0000000..8d273fa
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserProfileValuesTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * User profile values migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserProfileValuesTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->executeMigrations([
+      'user_profile_field',
+      'user_profile_field_instance',
+      'user_profile_entity_display',
+      'user_profile_entity_form_display',
+    ]);
+    $this->migrateUsers(FALSE);
+    $this->executeMigration('d6_profile_values');
+  }
+
+  /**
+   * Tests Drupal 6 profile values to Drupal 8 migration.
+   */
+  public function testUserProfileValues() {
+    $user = User::load(2);
+    $this->assertFalse(is_null($user));
+    $this->assertIdentical('red', $user->profile_color->value);
+    $expected = <<<EOT
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.
+EOT;
+    $this->assertIdentical($expected, $user->profile_biography->value);
+    $this->assertIdentical('1', $user->profile_sell_address->value);
+    $this->assertIdentical('Back\slash', $user->profile_sold_to->value);
+    $this->assertIdentical('AC/DC', $user->profile_bands[0]->value);
+    $this->assertIdentical('Eagles', $user->profile_bands[1]->value);
+    $this->assertIdentical('Elton John', $user->profile_bands[2]->value);
+    $this->assertIdentical('Lemonheads', $user->profile_bands[3]->value);
+    $this->assertIdentical('Rolling Stones', $user->profile_bands[4]->value);
+    $this->assertIdentical('Queen', $user->profile_bands[5]->value);
+    $this->assertIdentical('The White Stripes', $user->profile_bands[6]->value);
+    $this->assertIdentical('1974-06-02', $user->profile_birthdate->value);
+    $this->assertIdentical('http://example.com/blog', $user->profile_blog->uri);
+    $this->assertNull($user->profile_blog->title);
+    $this->assertIdentical([], $user->profile_blog->options);
+    $this->assertIdentical('http://example.com/blog', $user->profile_blog->uri);
+    $this->assertNull($user->profile_love_migrations->value);
+
+    $user = User::load(8);
+    $this->assertIdentical('Forward/slash', $user->profile_sold_to->value);
+
+    $user = User::load(15);
+    $this->assertIdentical('Dot.in.the.middle', $user->profile_sold_to->value);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
new file mode 100644
index 0000000..aeab36f
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserRoleTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\user\Entity\Role;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Upgrade user roles to user.role.*.yml.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserRoleTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigrations(['d6_filter_format', 'd6_user_role']);
+  }
+
+  /**
+   * Tests user role migration.
+   */
+  public function testUserRole() {
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $id_map = $this->getMigration('d6_user_role')->getIdMap();
+    $rid = 'anonymous';
+    $anonymous = Role::load($rid);
+    $this->assertIdentical($rid, $anonymous->id());
+    $this->assertIdentical(array('migrate test anonymous permission', 'use text format filtered_html'), $anonymous->getPermissions());
+    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(1)));
+    $rid = 'authenticated';
+    $authenticated = Role::load($rid);
+    $this->assertIdentical($rid, $authenticated->id());
+    $this->assertIdentical(array('migrate test authenticated permission', 'use text format filtered_html'), $authenticated->getPermissions());
+    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(2)));
+    $rid = 'migrate_test_role_1';
+    $migrate_test_role_1 = Role::load($rid);
+    $this->assertIdentical($rid, $migrate_test_role_1->id());
+    $this->assertIdentical(array('migrate test role 1 test permission', 'use text format full_html', 'use text format php_code'), $migrate_test_role_1->getPermissions());
+    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(3)));
+    $rid = 'migrate_test_role_2';
+    $migrate_test_role_2 = Role::load($rid);
+    $this->assertIdentical(array(
+      'migrate test role 2 test permission',
+      'use PHP for settings',
+      'administer contact forms',
+      'skip comment approval',
+      'edit own blog content',
+      'edit any blog content',
+      'delete own blog content',
+      'delete any blog content',
+      'create forum content',
+      'delete any forum content',
+      'delete own forum content',
+      'edit any forum content',
+      'edit own forum content',
+      'administer nodes',
+      'access content overview',
+      'use text format php_code',
+      ), $migrate_test_role_2->getPermissions());
+    $this->assertIdentical($rid, $migrate_test_role_2->id());
+    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(4)));
+    $rid = 'migrate_test_role_3_that_is_long';
+    $migrate_test_role_3 = Role::load($rid);
+    $this->assertIdentical($rid, $migrate_test_role_3->id());
+    $this->assertIdentical(array($rid), $id_map->lookupDestinationId(array(5)));
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
new file mode 100644
index 0000000..a7e8f4d
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d6\MigrateUserTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d6;
+
+use Drupal\migrate\MigrateExecutable;
+use Drupal\user\Entity\User;
+use Drupal\file\Entity\File;
+use Drupal\Core\Database\Database;
+use Drupal\user\RoleInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Users migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateUserTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('file');
+    $this->installSchema('file', ['file_usage']);
+    $this->installEntitySchema('node');
+    $this->installSchema('user', ['users_data']);
+    // Make sure uid 1 is created.
+    user_install();
+
+    $file = File::create(array(
+      'fid' => 2,
+      'uid' => 2,
+      'filename' => 'image-test.jpg',
+      'uri' => "public://image-test.jpg",
+      'filemime' => 'image/jpeg',
+      'created' => 1,
+      'changed' => 1,
+      'status' => FILE_STATUS_PERMANENT,
+    ));
+    $file->enforceIsNew();
+    file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png'));
+    $file->save();
+
+    $file = File::create(array(
+      'fid' => 8,
+      'uid' => 8,
+      'filename' => 'image-test.png',
+      'uri' => "public://image-test.png",
+      'filemime' => 'image/png',
+      'created' => 1,
+      'changed' => 1,
+      'status' => FILE_STATUS_PERMANENT,
+    ));
+    $file->enforceIsNew();
+    file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg'));
+    $file->save();
+
+    $this->migrateUsers();
+  }
+
+  /**
+   * Tests the Drupal6 user to Drupal 8 migration.
+   */
+  public function testUser() {
+    $users = Database::getConnection('default', 'migrate')
+      ->select('users', 'u')
+      ->fields('u')
+      ->condition('uid', 0, '>')
+      ->execute()
+      ->fetchAll();
+
+    foreach ($users as $source) {
+      // Get roles directly from the source.
+      $rids = Database::getConnection('default', 'migrate')
+        ->select('users_roles', 'ur')
+        ->fields('ur', array('rid'))
+        ->condition('ur.uid', $source->uid)
+        ->execute()
+        ->fetchCol();
+      $roles = array(RoleInterface::AUTHENTICATED_ID);
+      $id_map = $this->getMigration('d6_user_role')->getIdMap();
+      foreach ($rids as $rid) {
+        $role = $id_map->lookupDestinationId(array($rid));
+        $roles[] = reset($role);
+      }
+
+      /** @var \Drupal\user\UserInterface $user */
+      $user = User::load($source->uid);
+      $this->assertIdentical($source->uid, $user->id());
+      $this->assertIdentical($source->name, $user->label());
+      $this->assertIdentical($source->mail, $user->getEmail());
+      $this->assertIdentical($source->created, $user->getCreatedTime());
+      $this->assertIdentical($source->access, $user->getLastAccessedTime());
+      $this->assertIdentical($source->login, $user->getLastLoginTime());
+      $is_blocked = $source->status == 0;
+      $this->assertIdentical($is_blocked, $user->isBlocked());
+      // $user->getPreferredLangcode() might fallback to default language if the
+      // user preferred language is not configured on the site. We just want to
+      // test if the value was imported correctly.
+      $this->assertIdentical($source->language, $user->preferred_langcode->value);
+      $expected_timezone_name = $source->timezone_name ?: $this->config('system.date')->get('timezone.default');
+      $this->assertIdentical($expected_timezone_name, $user->getTimeZone());
+      $this->assertIdentical($source->init, $user->getInitialEmail());
+      $this->assertIdentical($roles, $user->getRoles());
+
+      // We have one empty picture in the data so don't try load that.
+      if (!empty($source->picture)) {
+        // Test the user picture.
+        $file = File::load($user->user_picture->target_id);
+        $this->assertIdentical(basename($source->picture), $file->getFilename());
+      }
+      else {
+        // Ensure the user does not have a picture.
+        $this->assertFalse($user->user_picture->target_id, sprintf('User %s does not have a picture', $user->id()));
+      }
+
+      // Use the API to check if the password has been salted and re-hashed to
+      // conform to Drupal >= 7 for non-admin users.
+      if ($user->id() != 1) {
+        $this->assertTrue(\Drupal::service('password')
+          ->check($source->pass_plain, $user->getPassword()));
+      }
+    }
+    // Rollback the migration and make sure everything is deleted but uid 1.
+    (new MigrateExecutable($this->migration, $this))->rollback();
+    $users = Database::getConnection('default', 'migrate')
+      ->select('users', 'u')
+      ->fields('u', ['uid'])
+      ->condition('uid', 0, '>')
+      ->execute()
+      ->fetchCol();
+    foreach ($users as $uid) {
+      $account = User::load($uid);
+      if ($uid == 1) {
+        $this->assertNotNull($account, 'User 1 was preserved after rollback');
+      }
+      else {
+        $this->assertNull($account);
+      }
+    }
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
new file mode 100644
index 0000000..0351006
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserFloodTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrates user flood control configuration.
+ *
+ * @group user
+ */
+class MigrateUserFloodTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['user']);
+    $this->executeMigration('d7_user_flood');
+  }
+
+  /**
+   * Tests the migration.
+   */
+  public function testMigration() {
+    $expected = [
+      'uid_only' => TRUE,
+      'ip_limit' => 30,
+      'ip_window' => 7200,
+      'user_limit' => 22,
+      'user_window' => 86400,
+      '_core' => [
+        'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs',
+      ],
+    ];
+    $this->assertIdentical($expected, $this->config('user.flood')->get());
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php
new file mode 100644
index 0000000..a9645de
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserMailTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserMailTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Migrates user mail configuration.
+ *
+ * @group user
+ */
+class MigrateUserMailTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(['user']);
+    $this->executeMigration('d7_user_mail');
+  }
+
+  /**
+   * Tests the migration.
+   */
+  public function testMigration() {
+    $config = $this->config('user.mail');
+    $this->assertIdentical('Your account is approved!', $config->get('status_activated.subject'));
+    $this->assertIdentical('Your account was activated, and there was much rejoicing.', $config->get('status_activated.body'));
+    $this->assertIdentical('Fix your password', $config->get('password_reset.subject'));
+    $this->assertIdentical("Nope! You're locked out forever.", $config->get('password_reset.body'));
+    $this->assertIdentical('So long, bub', $config->get('cancel_confirm.subject'));
+    $this->assertIdentical('The gates of Drupal are closed to you. Now you will work in the salt mines.', $config->get('cancel_confirm.body'));
+    $this->assertIdentical('Gawd made you an account', $config->get('register_admin_created.subject'));
+    $this->assertIdentical('...and she could take it away.', $config->get('register_admin_created.body'));
+    $this->assertIdentical('Welcome!', $config->get('register_no_approval_required.subject'));
+    $this->assertIdentical('You can now log in if you can figure out how to use Drupal!', $config->get('register_no_approval_required.body'));
+    $this->assertIdentical('Soon...', $config->get('register_pending_approval.subject'));
+    $this->assertIdentical('...you will join our Circle. Let the Drupal flow through you.', $config->get('register_pending_approval.body'));
+    $this->assertIdentical('BEGONE!', $config->get('status_blocked.subject'));
+    $this->assertIdentical('You no longer please the robot overlords. Go to your room and chill out.', $config->get('status_blocked.body'));
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
new file mode 100644
index 0000000..46e7834
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserRoleTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserRoleTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
+
+use Drupal\Core\Database\Database;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Upgrade user roles to user.role.*.yml.
+ *
+ * @group user
+ */
+class MigrateUserRoleTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d7_user_role');
+  }
+
+  /**
+   * Asserts aspects of a user role config entity.
+   *
+   * @param string $id
+   *   The role ID.
+   * @param string $label
+   *   The role's expected label.
+   * @param int|NULL $original_rid
+   *   The original (integer) ID of the role, to check permissions.
+   */
+  protected function assertEntity($id, $label, $original_rid) {
+    /** @var \Drupal\user\RoleInterface $entity */
+    $entity = Role::load($id);
+    $this->assertTrue($entity instanceof RoleInterface);
+    $this->assertIdentical($label, $entity->label());
+
+    if (isset($original_rid)) {
+      $permissions = Database::getConnection('default', 'migrate')
+        ->select('role_permission', 'rp')
+        ->fields('rp', ['permission'])
+        ->condition('rid', $original_rid)
+        ->execute()
+        ->fetchCol();
+      $this->assertIdentical($permissions, $entity->getPermissions());
+    }
+  }
+
+  /**
+   * Tests user role migration.
+   */
+  public function testUserRole() {
+    $this->assertEntity('anonymous', 'anonymous user', 1);
+    $this->assertEntity('authenticated', 'authenticated user', 2);
+    $this->assertEntity('administrator', 'administrator', 3);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
new file mode 100644
index 0000000..5ba23eb
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Migrate\d7\MigrateUserTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+use Drupal\user\Entity\User;
+use Drupal\user\RoleInterface;
+use Drupal\user\UserInterface;
+
+/**
+ * Users migration.
+ *
+ * @group user
+ */
+class MigrateUserTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['file', 'image'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Prepare to migrate user pictures as well.
+    $this->installEntitySchema('file');
+    $this->executeMigrations([
+      'user_picture_field',
+      'user_picture_field_instance',
+      'd7_user_role',
+      'd7_user',
+    ]);
+  }
+
+  /**
+   * Asserts various aspects of a user account.
+   *
+   * @param string $id
+   *   The user ID.
+   * @param string $label
+   *   The username.
+   * @param string $mail
+   *   The user's email address.
+   * @param int $access
+   *   The last access time.
+   * @param int $login
+   *   The last login time.
+   * @param bool $blocked
+   *   Whether or not the account is blocked.
+   * @param string $langcode
+   *   The user account's language code.
+   * @param string $init
+   *   The user's initial email address.
+   * @param string[] $roles
+   *   Role IDs the user account is expected to have.
+   * @param bool $has_picture
+   *   Whether the user is expected to have a picture attached.
+   */
+  protected function assertEntity($id, $label, $mail, $access, $login, $blocked, $langcode, $init, array $roles = [RoleInterface::AUTHENTICATED_ID], $has_picture = FALSE) {
+    /** @var \Drupal\user\UserInterface $user */
+    $user = User::load($id);
+    $this->assertTrue($user instanceof UserInterface);
+    $this->assertIdentical($label, $user->label());
+    $this->assertIdentical($mail, $user->getEmail());
+    $this->assertIdentical($access, $user->getLastAccessedTime());
+    $this->assertIdentical($login, $user->getLastLoginTime());
+    $this->assertIdentical($blocked, $user->isBlocked());
+    // $user->getPreferredLangcode() might fallback to default language if the
+    // user preferred language is not configured on the site. We just want to
+    // test if the value was imported correctly.
+    $this->assertIdentical($langcode, $user->langcode->value);
+    $this->assertIdentical($langcode, $user->preferred_langcode->value);
+    $this->assertIdentical($langcode, $user->preferred_admin_langcode->value);
+    $this->assertIdentical($init, $user->getInitialEmail());
+    $this->assertIdentical($roles, $user->getRoles());
+    $this->assertIdentical($has_picture, !$user->user_picture->isEmpty());
+  }
+
+  /**
+   * Tests the Drupal 7 user to Drupal 8 migration.
+   */
+  public function testUser() {
+    $this->assertEntity(2, 'Odo', 'odo@local.host', '0', '0', FALSE, '', 'odo@local.host');
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php
new file mode 100644
index 0000000..edd58a1
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/UserMigrationClassTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Tests\user\Kernel\Migrate\d7\UserMigrationClassTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Migrate\d7;
+
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the user migration plugin class.
+ *
+ * @group user
+ */
+class UserMigrationClassTest extends MigrateDrupal7TestBase {
+
+  /**
+   * Tests d6_profile_values builder.
+   *
+   * Ensures profile fields are merged into the d6_profile_values migration's
+   * process pipeline.
+   */
+  public function testClass() {
+    $migration = $this->getMigration('d7_user');
+    /** @var \Drupal\migrate\Plugin\MigrationInterface[] $migrations */
+    $this->assertIdentical('d7_user', $migration->id());
+    $process = $migration->getProcess();
+    $this->assertIdentical('field_file', $process['field_file'][0]['source']);
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php b/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php
new file mode 100644
index 0000000..77a9d24
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Views/HandlerFieldPermissionTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Views\HandlerFieldPermissionTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Views;
+
+use Drupal\Tests\user\Kernel\Views\UserKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the permission field handler.
+ *
+ * @group user
+ * @see \Drupal\user\Plugin\views\field\Permissions
+ */
+class HandlerFieldPermissionTest extends UserKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_field_permission');
+
+  /**
+   * Tests the permission field handler output.
+   */
+  public function testFieldPermission() {
+    $this->setupPermissionTestData();
+
+    $view = Views::getView('test_field_permission');
+    $this->executeView($view);
+    $view->initStyle();
+    $view->render();
+    $style_plugin = $view->style_plugin;
+
+    $expected_permissions = array();
+    $expected_permissions[$this->users[0]->id()] = array();
+    $expected_permissions[$this->users[1]->id()] = array();
+    $expected_permissions[$this->users[2]->id()][] = t('Administer permissions');
+    // View user profiles comes first, because we sort by the permission
+    // machine name.
+    $expected_permissions[$this->users[3]->id()][] = t('Administer permissions');
+    $expected_permissions[$this->users[3]->id()][] = t('Administer users');
+    $expected_permissions[$this->users[3]->id()][] = t('View user information');
+
+    foreach ($view->result as $index => $row) {
+      $uid = $view->field['uid']->getValue($row);
+      $rendered_permission = $style_plugin->getField($index, 'permission');
+
+      $expected_output = implode(', ', $expected_permissions[$uid]);
+      $this->assertEqual($rendered_permission, $expected_output, 'The right permissions are rendered.');
+    }
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php b/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
new file mode 100644
index 0000000..294d000
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Views/HandlerFilterPermissionTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Views\HandlerFilterPermissionTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Views;
+
+use Drupal\Component\Utility\Html;
+use Drupal\views\Views;
+
+/**
+ * Tests the permissions filter handler.
+ *
+ * @group user
+ * @see \Drupal\user\Plugin\views\filter\Permissions
+ */
+class HandlerFilterPermissionTest extends UserKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_filter_permission');
+
+  protected $columnMap;
+
+  /**
+   * Tests the permission filter handler.
+   *
+   * @todo Fix the different commented out tests by fixing the many to one
+   *   handler handling with the NOT operator.
+   */
+  public function testFilterPermission() {
+    $this->setupPermissionTestData();
+
+    $column_map = array('uid' => 'uid');
+    $view = Views::getView('test_filter_permission');
+
+    // Filter by a non existing permission.
+    $view->initHandlers();
+    $view->filter['permission']->value = array('non_existent_permission');
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 4, 'A non existent permission is not filtered so everything is the result.');
+    $expected[] = array('uid' => 1);
+    $expected[] = array('uid' => 2);
+    $expected[] = array('uid' => 3);
+    $expected[] = array('uid' => 4);
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+    $view->destroy();
+
+    // Filter by a permission.
+    $view->initHandlers();
+    $view->filter['permission']->value = array('administer permissions');
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 2);
+    $expected = array();
+    $expected[] = array('uid' => 3);
+    $expected[] = array('uid' => 4);
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+    $view->destroy();
+
+    // Filter by not a permission.
+    $view->initHandlers();
+    $view->filter['permission']->operator = 'not';
+    $view->filter['permission']->value = array('administer users');
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 3);
+    $expected = array();
+    $expected[] = array('uid' => 1);
+    $expected[] = array('uid' => 2);
+    $expected[] = array('uid' => 3);
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+    $view->destroy();
+
+    // Filter by not multiple permissions, that are present in multiple roles.
+    $view->initHandlers();
+    $view->filter['permission']->operator = 'not';
+    $view->filter['permission']->value = array('administer users', 'administer permissions');
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 2);
+    $expected = array();
+    $expected[] = array('uid' => 1);
+    $expected[] = array('uid' => 2);
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+    $view->destroy();
+
+    // Filter by another permission of a role with multiple permissions.
+    $view->initHandlers();
+    $view->filter['permission']->value = array('administer users');
+    $this->executeView($view);
+    $this->assertEqual(count($view->result), 1);
+    $expected = array();
+    $expected[] = array('uid' => 4);
+    $this->assertIdenticalResultset($view, $expected, $column_map);
+    $view->destroy();
+
+    $view->initDisplay();
+    $view->initHandlers();
+
+    // Test the value options.
+    $value_options = $view->filter['permission']->getValueOptions();
+
+    $permission_by_module = [];
+    $permissions = \Drupal::service('user.permissions')->getPermissions();
+    foreach ($permissions as $name => $permission) {
+      $permission_by_module[$permission['provider']][$name] = $permission;
+    }
+    foreach (array('system' => 'System', 'user' => 'User') as $module => $title) {
+      $expected = array_map(function ($permission) {
+        return Html::escape(strip_tags($permission['title']));
+      }, $permission_by_module[$module]);
+
+      $this->assertEqual($expected, $value_options[$title], 'Ensure the all permissions are available');
+    }
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php b/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php
new file mode 100644
index 0000000..6001f47
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Views/HandlerFilterRolesTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Views\HandlerFilterRolesTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Views;
+
+use Drupal\Tests\user\Kernel\Views\UserKernelTestBase;
+use Drupal\user\Entity\Role;
+use Drupal\views\Entity\View;
+use Drupal\views\Views;
+
+/**
+ * Tests the roles filter handler.
+ *
+ * @group user
+ *
+ * @see \Drupal\user\Plugin\views\filter\Roles
+ */
+class HandlerFilterRolesTest extends UserKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_user_name');
+
+  /**
+   * Tests that role filter dependencies are calculated correctly.
+   */
+  public function testDependencies() {
+    $role = Role::create(['id' => 'test_user_role']);
+    $role->save();
+    $view = View::load('test_user_name');
+    $expected = [
+      'module' => ['user'],
+    ];
+    $this->assertEqual($expected, $view->getDependencies());
+
+    $display = &$view->getDisplay('default');
+    $display['display_options']['filters']['roles_target_id'] = [
+      'id' => 'roles_target_id',
+      'table' => 'user__roles',
+      'field' => 'roles_target_id',
+      'value' => [
+        'test_user_role' => 'test_user_role',
+      ],
+      'plugin_id' => 'user_roles',
+    ];
+    $view->save();
+    $expected['config'][] = 'user.role.test_user_role';
+    $this->assertEqual($expected, $view->getDependencies());
+
+    $view = Views::getView('test_user_name');
+    $view->initDisplay();
+    $view->initHandlers();
+    $this->assertEqual(array_keys($view->filter['roles_target_id']->getValueOptions()), ['test_user_role']);
+
+    $view = View::load('test_user_name');
+    $display = &$view->getDisplay('default');
+    $display['display_options']['filters']['roles_target_id'] = [
+      'id' => 'roles_target_id',
+      'table' => 'user__roles',
+      'field' => 'roles_target_id',
+      'value' => [],
+      'plugin_id' => 'user_roles',
+    ];
+    $view->save();
+    unset($expected['config']);
+    $this->assertEqual($expected, $view->getDependencies());
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php b/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
new file mode 100644
index 0000000..6676007
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Views\UserKernelTestBase.
+ */
+
+namespace Drupal\Tests\user\Kernel\Views;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Provides a common test base for user views tests.
+ */
+abstract class UserKernelTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user_test_views', 'user', 'system', 'field');
+
+  /**
+   * Users to use during this test.
+   *
+   * @var array
+   */
+  protected $users = array();
+
+  /**
+   * The entity storage for roles.
+   *
+   * @var \Drupal\user\RoleStorage
+   */
+  protected $roleStorage;
+
+  /**
+   * The entity storage for users.
+   *
+   * @var \Drupal\user\UserStorage
+   */
+  protected $userStorage;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    ViewTestData::createTestViews(get_class($this), array('user_test_views'));
+
+    $this->installEntitySchema('user');
+
+    $entity_manager = $this->container->get('entity.manager');
+    $this->roleStorage = $entity_manager->getStorage('user_role');
+    $this->userStorage = $entity_manager->getStorage('user');
+  }
+
+  /**
+   * Set some test data for permission related tests.
+   */
+  protected function setupPermissionTestData() {
+    // Setup a role without any permission.
+    $this->roleStorage->create(array('id' => 'authenticated'))
+      ->save();
+    $this->roleStorage->create(array('id' => 'no_permission'))
+      ->save();
+    // Setup a role with just one permission.
+    $this->roleStorage->create(array('id' => 'one_permission'))
+      ->save();
+    user_role_grant_permissions('one_permission', array('administer permissions'));
+    // Setup a role with multiple permissions.
+    $this->roleStorage->create(array('id' => 'multiple_permissions'))
+      ->save();
+    user_role_grant_permissions('multiple_permissions', array('administer permissions', 'administer users', 'access user profiles'));
+
+    // Setup a user without an extra role.
+    $this->users[] = $account = $this->userStorage->create(['name' => $this->randomString()]);
+    $account->save();
+    // Setup a user with just the first role (so no permission beside the
+    // ones from the authenticated role).
+    $this->users[] = $account = $this->userStorage->create(array('name' => 'first_role'));
+    $account->addRole('no_permission');
+    $account->save();
+    // Setup a user with just the second role (so one additional permission).
+    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_role'));
+    $account->addRole('one_permission');
+    $account->save();
+    // Setup a user with both the second and the third role.
+    $this->users[] = $account = $this->userStorage->create(array('name' => 'second_third_role'));
+    $account->addRole('one_permission');
+    $account->addRole('multiple_permissions');
+    $account->save();
+  }
+
+}
diff --git a/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php b/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php
new file mode 100644
index 0000000..7783d7c
--- /dev/null
+++ b/core/modules/user/tests/src/Kernel/Views/UserViewsFieldAccessTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\user\Kernel\Views\UserViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\user\Kernel\Views;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\user\Entity\User;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the user entity.
+ *
+ * @group user
+ */
+class UserViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user', 'entity_test', 'language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('user');
+  }
+
+  public function testUserFields() {
+    ConfigurableLanguage::create([
+      'id' => 'es',
+      'name' => 'Spanish',
+    ])->save();
+    ConfigurableLanguage::create([
+      'id' => 'fr',
+      'name' => 'French',
+    ])->save();
+
+    $user = User::create([
+      'name' => 'test user',
+      'mail' => 'druplicon@drop.org',
+      'status' => 1,
+      'preferred_langcode' => 'es',
+      'preferred_admin_langcode' => 'fr',
+      'timezone' => 'ut1',
+      'created' => 123456,
+    ]);
+
+    $user->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('user', 'uid', $user->id());
+    $this->assertFieldAccess('user', 'uuid', $user->uuid());
+    $this->assertFieldAccess('user', 'langcode', $user->language()->getName());
+    $this->assertFieldAccess('user', 'preferred_langcode', 'Spanish');
+    $this->assertFieldAccess('user', 'preferred_admin_langcode', 'French');
+    $this->assertFieldAccess('user', 'name', 'test user');
+    // $this->assertFieldAccess('user', 'mail', 'druplicon@drop.org');
+    $this->assertFieldAccess('user', 'timezone', 'ut1');
+    $this->assertFieldAccess('user', 'status', 'On');
+    // $this->assertFieldAccess('user', 'created', \Drupal::service('date.formatter')->format(123456));
+    // $this->assertFieldAccess('user', 'changed', \Drupal::service('date.formatter')->format(REQUEST_TIME));
+  }
+
+}
diff --git a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
index e252b49..6a2b26f 100644
--- a/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+++ b/core/modules/user/tests/src/Unit/PermissionHandlerTest.php
@@ -113,6 +113,9 @@ public function testBuildPermissionsYaml() {
 "'access module b':
   title: 'Access B'
   description: 'bla bla'
+'access module a via module b':
+  title: 'Access A via B'
+  provider: 'module_a'
 ");
     mkdir($url . '/module_c');
     file_put_contents($url . '/module_c/module_c.permissions.yml',
@@ -239,6 +242,7 @@ public function testBuildPermissionsYamlCallback() {
     file_put_contents($url . '/module_b/module_b.permissions.yml',
 "permission_callbacks:
   - 'Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescription'
+  - 'Drupal\\user\\Tests\\TestPermissionCallbacks::titleProvider'
 ");
     mkdir($url . '/module_c');
     file_put_contents($url . '/module_c/module_c.permissions.yml',
@@ -272,6 +276,10 @@ public function testBuildPermissionsYamlCallback() {
       ->willReturn(array(new TestPermissionCallbacks(), 'titleDescription'));
     $this->controllerResolver->expects($this->at(2))
       ->method('getControllerFromDefinition')
+      ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleProvider')
+      ->willReturn(array(new TestPermissionCallbacks(), 'titleProvider'));
+    $this->controllerResolver->expects($this->at(3))
+      ->method('getControllerFromDefinition')
       ->with('Drupal\\user\\Tests\\TestPermissionCallbacks::titleDescriptionRestrictAccess')
       ->willReturn(array(new TestPermissionCallbacks(), 'titleDescriptionRestrictAccess'));
 
@@ -351,7 +359,7 @@ public function testPermissionsYamlStaticAndCallback() {
    *   The actual permissions
    */
   protected function assertPermissions(array $actual_permissions) {
-    $this->assertCount(3, $actual_permissions);
+    $this->assertCount(4, $actual_permissions);
     $this->assertEquals($actual_permissions['access_module_a']['title'], 'single_description');
     $this->assertEquals($actual_permissions['access_module_a']['provider'], 'module_a');
     $this->assertEquals($actual_permissions['access module b']['title'], 'Access B');
@@ -359,6 +367,7 @@ protected function assertPermissions(array $actual_permissions) {
     $this->assertEquals($actual_permissions['access_module_c']['title'], 'Access C');
     $this->assertEquals($actual_permissions['access_module_c']['provider'], 'module_c');
     $this->assertEquals($actual_permissions['access_module_c']['restrict access'], TRUE);
+    $this->assertEquals($actual_permissions['access module a via module b']['provider'], 'module_a');
   }
 
 }
@@ -409,6 +418,14 @@ public function titleDescriptionRestrictAccess() {
     );
   }
 
+  public function titleProvider() {
+    return array(
+      'access module a via module b' => array(
+        'title' => 'Access A via B',
+        'provider' => 'module_a',
+      ),
+    );
+  }
 }
 
 /**
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index 91a908e..7cc46ef 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -85,3 +85,25 @@ function user_install() {
     ))
     ->save();
 }
+
+/**
+ * @addtogroup updates-8.1.0-beta
+ * @{
+ */
+
+/**
+ * Fix invalid token in the status_blocked email body.
+ */
+function user_update_8100() {
+  $config_factory = \Drupal::configFactory();
+  $config = $config_factory->getEditable('user.mail');
+  $mail = $config->get('status_blocked');
+  if (strpos($mail['body'], '[site:account-name]') !== FALSE) {
+    $mail['body'] = str_replace('[site:account-name]', '[site:name]', $mail['body']);
+    $config->set('status_blocked', $mail)->save(TRUE);
+  }
+}
+
+/**
+ * @} End of "addtogroup updates-8.1.0-beta".
+ */
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 3d76074..0e9cedb 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Enables the user registration and login system.
+ */
+
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Render\PlainTextOutput;
 use Drupal\Component\Utility\Unicode;
@@ -13,17 +18,13 @@
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Url;
+use Drupal\system\Entity\Action;
 use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
 use Drupal\user\UserInterface;
 
 /**
- * @file
- * Enables the user registration and login system.
- */
-
-/**
  * Maximum length of username text field.
  *
  * Keep this under 191 characters so we can use a unique constraint in MySQL.
@@ -985,7 +986,7 @@ function user_user_role_insert(RoleInterface $role) {
 
   $add_id = 'user_add_role_action.' . $role->id();
   if (!entity_load('action', $add_id)) {
-    $action = entity_create('action', array(
+    $action = Action::create(array(
       'id' => $add_id,
       'type' => 'user',
       'label' => t('Add the @label role to the selected users', array('@label' => $role->label())),
@@ -998,7 +999,7 @@ function user_user_role_insert(RoleInterface $role) {
   }
   $remove_id = 'user_remove_role_action.' . $role->id();
   if (!entity_load('action', $remove_id)) {
-    $action = entity_create('action', array(
+    $action = Action::create(array(
       'id' => $remove_id,
       'type' => 'user',
       'label' => t('Remove the @label role from the selected users', array('@label' => $role->label())),
diff --git a/core/modules/user/user.permissions.js b/core/modules/user/user.permissions.js
index ec90b38..c3dc24f 100644
--- a/core/modules/user/user.permissions.js
+++ b/core/modules/user/user.permissions.js
@@ -3,7 +3,7 @@
  * User permission page behaviors.
  */
 
-(function ($) {
+(function ($, Drupal) {
 
   'use strict';
 
@@ -85,4 +85,4 @@
     }
   };
 
-})(jQuery);
+})(jQuery, Drupal);
diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml
index 58d4c0d..562e8ca 100644
--- a/core/modules/views/config/schema/views.field.schema.yml
+++ b/core/modules/views/config/schema/views.field.schema.yml
@@ -176,6 +176,13 @@ views.field.language:
       type: boolean
       label: 'Display in native language'
 
+views.field.rendered_entity:
+  type: views_field
+  label: 'Rendered entity'
+  mapping:
+    view_mode:
+      type: string
+      label: 'View mode'
 
 views.field.entity_link:
   type: views_field
diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index 57bbb45..ad61000 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -85,25 +85,25 @@
 
     // Add the ajax to exposed forms.
     this.$exposed_form = $('form#views-exposed-form-' + settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-'));
-    this.$exposed_form.once('exposed-form').each(jQuery.proxy(this.attachExposedFormAjax, this));
+    this.$exposed_form.once('exposed-form').each($.proxy(this.attachExposedFormAjax, this));
 
     // Add the ajax to pagers.
     this.$view
       // Don't attach to nested views. Doing so would attach multiple behaviors
       // to a given element.
-      .filter(jQuery.proxy(this.filterNestedViews, this))
-      .once('ajax-pager').each(jQuery.proxy(this.attachPagerAjax, this));
+      .filter($.proxy(this.filterNestedViews, this))
+      .once('ajax-pager').each($.proxy(this.attachPagerAjax, this));
 
     // Add a trigger to update this view specifically. In order to trigger a
     // refresh use the following code.
     //
     // @code
-    // jQuery('.view-name').trigger('RefreshView');
+    // $('.view-name').trigger('RefreshView');
     // @endcode
     var self_settings = $.extend({}, this.element_settings, {
       event: 'RefreshView',
       base: this.selector,
-      element: this.$view
+      element: this.$view.get(0)
     });
     this.refreshViewAjax = Drupal.ajax(self_settings);
   };
@@ -140,7 +140,7 @@
    */
   Drupal.views.ajaxView.prototype.attachPagerAjax = function () {
     this.$view.find('ul.js-pager__items > li > a, th.views-field a, .attachment .views-summary a')
-      .each(jQuery.proxy(this.attachPagerLinkAjax, this));
+      .each($.proxy(this.attachPagerLinkAjax, this));
   };
 
   /**
@@ -168,7 +168,7 @@
     var self_settings = $.extend({}, this.element_settings, {
       submit: viewData,
       base: false,
-      element: $link
+      element: link
     });
     this.pagerAjax = Drupal.ajax(self_settings);
   };
diff --git a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
index 869cc69..5c949a5 100644
--- a/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
+++ b/core/modules/views/src/Annotation/ViewsPluginAnnotationBase.php
@@ -16,15 +16,6 @@
 abstract class ViewsPluginAnnotationBase extends Plugin implements AnnotationInterface {
 
   /**
-   * A class to make the plugin derivative aware.
-   *
-   * @var string
-   *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator
-   */
-  public $derivative;
-
-  /**
    * Whether or not to register a theme function automatically.
    *
    * @var bool (optional)
diff --git a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
index f2a3778..e26accf 100644
--- a/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
+++ b/core/modules/views/src/Entity/Render/EntityFieldRenderer.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Entity\Render;
 
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -25,6 +26,7 @@
  */
 class EntityFieldRenderer extends RendererBase {
   use EntityTranslationRenderTrait;
+  use DependencySerializationTrait;
 
   /**
    * The relationship being handled.
diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index 00c7039..3b57d53 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -182,6 +182,16 @@ public function getViewsData() {
       );
     }
 
+    if ($this->entityType->hasViewBuilderClass()) {
+      $data[$base_table]['rendered_entity'] = [
+        'field' => [
+          'title' => $this->t('Rendered entity'),
+          'help' => $this->t('Renders an entity in a view mode.'),
+          'id' => 'rendered_entity',
+        ],
+      ];
+    }
+
     // Setup relations to the revisions/property data.
     if ($data_table) {
       $data[$base_table]['table']['join'][$data_table] = [
diff --git a/core/modules/views/src/Form/ViewsForm.php b/core/modules/views/src/Form/ViewsForm.php
index 39ff499..fe27c8c 100644
--- a/core/modules/views/src/Form/ViewsForm.php
+++ b/core/modules/views/src/Form/ViewsForm.php
@@ -66,6 +66,13 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
   protected $viewDisplayId;
 
   /**
+   * The arguments passed to the active view.
+   *
+   * @var string[]
+   */
+  protected $viewArguments;
+
+  /**
    * Constructs a ViewsForm object.
    *
    * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $class_resolver
@@ -78,37 +85,60 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
    *   The ID of the view.
    * @param string $view_display_id
    *   The ID of the active view's display.
+   * @param string[] $view_args
+   *   The arguments passed to the active view.
    */
-  public function __construct(ClassResolverInterface $class_resolver, UrlGeneratorInterface $url_generator, RequestStack $requestStack, $view_id, $view_display_id) {
+  public function __construct(ClassResolverInterface $class_resolver, UrlGeneratorInterface $url_generator, RequestStack $requestStack, $view_id, $view_display_id, array $view_args) {
     $this->classResolver = $class_resolver;
     $this->urlGenerator = $url_generator;
     $this->requestStack = $requestStack;
     $this->viewId = $view_id;
     $this->viewDisplayId = $view_display_id;
+    $this->viewArguments = $view_args;
   }
 
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container, $view_id = NULL, $view_display_id = NULL) {
+  public static function create(ContainerInterface $container, $view_id = NULL, $view_display_id = NULL, array $view_args = NULL) {
     return new static(
       $container->get('class_resolver'),
       $container->get('url_generator'),
       $container->get('request_stack'),
       $view_id,
-      $view_display_id
+      $view_display_id,
+      $view_args
     );
   }
 
   /**
-   * {@inheritdoc}
+   * Returns a string for the form's base ID.
+   *
+   * @return string
+   *   The string identifying the form's base ID.
    */
-  public function getFormId() {
-    $parts = array(
+  public function getBaseFormId() {
+    $parts = [
       'views_form',
       $this->viewId,
       $this->viewDisplayId,
-    );
+    ];
+
+    return implode('_', $parts);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    $parts = [
+      $this->getBaseFormId(),
+    ];
+
+    if (!empty($this->viewArguments)) {
+      // Append the passed arguments to ensure form uniqueness.
+      $parts = array_merge($parts, $this->viewArguments);
+    }
 
     return implode('_', $parts);
   }
@@ -123,6 +153,9 @@ public function buildForm(array $form, FormStateInterface $form_state, ViewExecu
     }
     $form_state->set(['step_controller', 'views_form_views_form'], 'Drupal\views\Form\ViewsFormMainForm');
 
+    // Add the base form ID.
+    $form_state->addBuildInfo('base_form_id', $this->getBaseFormId());
+
     $form = array();
 
     $query = $this->requestStack->getCurrentRequest()->query->all();
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index b8fa6d2..af1db69 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -50,13 +50,6 @@
   public $tableAlias;
 
   /**
-   * When a table has been moved this property is set.
-   *
-   * @var string
-   */
-  public $actualTable;
-
-  /**
    * The actual field in the database table, maybe different
    * on other kind of query plugins/special handlers.
    *
@@ -72,13 +65,6 @@
   public $field;
 
   /**
-   * When a field has been moved this property is set.
-   *
-   * @var string
-   */
-  public $actualField;
-
-  /**
    * The relationship used for this field.
    *
    * @var string
@@ -124,15 +110,6 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     // we have to do a lookup because the type is singular but the
     // option is stored as the plural.
 
-    // If the 'moved to' keyword moved our handler, let's fix that now.
-    if (isset($this->actualTable)) {
-      $options['table'] = $this->actualTable;
-    }
-
-    if (isset($this->actualField)) {
-      $options['field'] = $this->actualField;
-    }
-
     $this->unpackOptions($this->options, $options);
 
     // This exist on most handlers, but not all. So they are still optional.
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 462d53f..3821230 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -369,7 +369,7 @@ protected function viewsTokenReplace($text, $tokens) {
       if (strpos($token, '.') === FALSE) {
         // We need to validate tokens are valid Twig variables. Twig uses the
         // same variable naming rules as PHP.
-        // @see http://php.net/manual/en/language.variables.basics.php
+        // @see http://php.net/manual/language.variables.basics.php
         assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $token) === 1', 'Tokens need to be valid Twig variables.');
         $twig_tokens[$token] = $replacement;
       }
diff --git a/core/modules/views/src/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php
index 3079f0d..52b4e33 100644
--- a/core/modules/views/src/Plugin/views/area/Result.php
+++ b/core/modules/views/src/Plugin/views/area/Result.php
@@ -104,11 +104,15 @@ public function render($empty = FALSE) {
     }
     $current_record_count = ($end - $start) + 1;
     // Get the search information.
-    $items = array('start', 'end', 'total', 'label', 'per_page', 'current_page', 'current_record_count', 'page_count');
-    $replacements = array();
-    foreach ($items as $item) {
-      $replacements["@$item"] = ${$item};
-    }
+    $replacements = [];
+    $replacements['@start'] = $start;
+    $replacements['@end'] = $end;
+    $replacements['@total'] = $total;
+    $replacements['@label'] = $label;
+    $replacements['@per_page'] = $per_page;
+    $replacements['@current_page'] = $current_page;
+    $replacements['@current_record_count'] = $current_record_count;
+    $replacements['@page_count'] = $page_count;
     // Send the output.
     if (!empty($total)) {
       $output .= Xss::filterAdmin(str_replace(array_keys($replacements), array_values($replacements), $format));
diff --git a/core/modules/views/src/Plugin/views/argument/StringArgument.php b/core/modules/views/src/Plugin/views/argument/StringArgument.php
index 3302a52..3987a37 100644
--- a/core/modules/views/src/Plugin/views/argument/StringArgument.php
+++ b/core/modules/views/src/Plugin/views/argument/StringArgument.php
@@ -99,7 +99,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     $form['path_case'] = array(
       '#type' => 'select',
       '#title' => $this->t('Case in path'),
-      '#description' => $this->t('When printing url paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
+      '#description' => $this->t('When printing URL paths, how to transform the case of the filter value. Do not use this unless with Postgres as it uses case sensitive comparisons.'),
       '#options' => array(
         'none' => $this->t('No transform'),
         'upper' => $this->t('Upper case'),
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index e49b553..2348408 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -951,7 +951,7 @@ protected function getAllPlugins($only_overrides = FALSE) {
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    $this->addDependencies(parent::calculateDependencies());
+    $this->dependencies = parent::calculateDependencies();
     // Collect all the dependencies of handlers and plugins. Only calculate
     // their dependencies if they are configured by this display.
     $plugins = array_merge($this->getAllHandlers(TRUE), $this->getAllPlugins(TRUE));
@@ -1331,7 +1331,7 @@ public function optionsSummary(&$categories, &$options) {
         'category' => 'pager',
         'title' => $this->t('Link display'),
         'value' => $link_display,
-        'desc' => $this->t('Specify which display or custom url this display will link to.'),
+        'desc' => $this->t('Specify which display or custom URL this display will link to.'),
       );
     }
 
@@ -1485,7 +1485,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
         $form['use_more'] = array(
           '#type' => 'checkbox',
           '#title' => $this->t('Create more link'),
-          '#description' => $this->t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' section under pager. You can override the url at the link display setting."),
+          '#description' => $this->t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' section under pager. You can override the URL at the link display setting."),
           '#default_value' => $this->getOption('use_more'),
         );
         $form['use_more_always'] = array(
@@ -2195,7 +2195,7 @@ public function elementPreRender(array $element) {
         $output = $element['#empty'];
       }
 
-      $form_object = ViewsForm::create(\Drupal::getContainer(), $view->storage->id(), $view->current_display);
+      $form_object = ViewsForm::create(\Drupal::getContainer(), $view->storage->id(), $view->current_display, $view->args);
       $form = \Drupal::formBuilder()->getForm($form_object, $view, $output);
       // The form is requesting that all non-essential views elements be hidden,
       // usually because the rendered step is not a view result.
diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php
index af3dad1..91f5f6b 100644
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Plugin\views\field;
 
+use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
@@ -18,6 +19,7 @@
 use Drupal\Core\Form\FormHelper;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Plugin\PluginDependencyTrait;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\RendererInterface;
@@ -40,7 +42,9 @@
  * @ViewsField("field")
  */
 class Field extends FieldPluginBase implements CacheableDependencyInterface, MultiItemsFieldHandlerInterface {
+
   use FieldAPIHandlerTrait;
+  use PluginDependencyTrait;
 
   /**
    * An array to store field renderable arrays for use by renderItems().
@@ -471,25 +475,9 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
       $form['field_api_classes']['#description'] .= ' ' . $this->t('Checking this option will cause the group Display Type and Separator values to be ignored.');
     }
 
-    // Get the currently selected formatter.
-    $format = $this->options['type'];
-
-    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($format);
-
-    $options = array(
-      'field_definition' => $field,
-      'configuration' => array(
-        'type' => $format,
-        'settings' => $settings,
-        'label' => '',
-        'weight' => 0,
-      ),
-      'view_mode' => '_custom',
-    );
-
     // Get the settings form.
     $settings_form = array('#value' => array());
-    if ($formatter = $this->formatterPluginManager->getInstance($options)) {
+    if ($formatter = $this->getFormatterInstance()) {
       $settings_form = $formatter->settingsForm($form, $form_state);
       // Convert field UI selector states to work in the Views field form.
       FormHelper::rewriteStatesSelector($settings_form, "fields[{$field->getName()}][settings_edit_form]", 'options');
@@ -815,7 +803,7 @@ public function getItems(ResultRow $values) {
       // For grouped results we need to retrieve a massaged entity having
       // grouped field values to ensure that "grouped by" values, especially
       // those with multiple cardinality work properly. See
-      // \Drupal\views\Tests\QueryGroupByTest::testGroupByFieldWithCardinality.
+      // \Drupal\Tests\views\Kernel\QueryGroupByTest::testGroupByFieldWithCardinality.
       $display = [
         'type' => $this->options['type'],
         'settings' => $this->options['settings'],
@@ -949,21 +937,49 @@ protected function addSelfTokens(&$tokens, $item) {
   }
 
   /**
+   * Returns the field formatter instance.
+   *
+   * @return \Drupal\Core\Field\FormatterInterface|null
+   *   The field formatter instance.
+   */
+  protected function getFormatterInstance() {
+    $settings = $this->options['settings'] + $this->formatterPluginManager->getDefaultSettings($this->options['type']);
+
+    $options = [
+      'field_definition' => $this->getFieldDefinition(),
+      'configuration' => [
+        'type' => $this->options['type'],
+        'settings' => $settings,
+        'label' => '',
+        'weight' => 0,
+      ],
+      'view_mode' => '_custom',
+    ];
+
+    return $this->formatterPluginManager->getInstance($options);
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function calculateDependencies() {
-    $dependencies = parent::calculateDependencies();
+    $this->dependencies = parent::calculateDependencies();
 
     // Add the module providing the configured field storage as a dependency.
     if (($field_storage_definition = $this->getFieldStorageDefinition()) && $field_storage_definition instanceof EntityInterface) {
-      $dependencies['config'][] = $field_storage_definition->getConfigDependencyName();
+      $this->dependencies['config'][] = $field_storage_definition->getConfigDependencyName();
     }
-    // Add the module providing the formatter.
     if (!empty($this->options['type'])) {
-      $dependencies['module'][] = $this->formatterPluginManager->getDefinition($this->options['type'])['provider'];
+      // Add the module providing the formatter.
+      $this->dependencies['module'][] = $this->formatterPluginManager->getDefinition($this->options['type'])['provider'];
+
+      // Add the formatter's dependencies.
+      if (($formatter = $this->getFormatterInstance()) && $formatter instanceof DependentPluginInterface) {
+        $this->calculatePluginDependencies($formatter);
+      }
     }
 
-    return $dependencies;
+    return $this->dependencies;
   }
 
   /**
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 9208e10..8b54632 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -8,13 +8,11 @@
 namespace Drupal\views\Plugin\views\field;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Renderer;
 use Drupal\Core\Url as CoreUrl;
 use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
@@ -86,7 +84,7 @@
   public $original_value = NULL;
 
   /**
-   * Stores additional fields that get added to the query.
+   * Stores additional fields which get added to the query.
    *
    * The generated aliases are stored in $aliases.
    *
@@ -775,7 +773,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
       $form['alter']['path_case'] = array(
         '#type' => 'select',
         '#title' => $this->t('Transform the case'),
-        '#description' => $this->t('When printing url paths, how to transform the case of the filter value.'),
+        '#description' => $this->t('When printing URL paths, how to transform the case of the filter value.'),
         '#states' => array(
           'visible' => array(
             ':input[name="options[alter][make_link]"]' => array('checked' => TRUE),
@@ -1221,7 +1219,7 @@ public function renderText($alter) {
     // alterations made by this method. Any alterations or replacements made
     // within this method need to ensure that at the minimum the result is
     // XSS admin filtered. See self::renderAltered() as an example that does.
-    $value_is_safe = SafeMarkup::isSafe($this->last_render);
+    $value_is_safe = $this->last_render instanceof MarkupInterface;
     // Cast to a string so that empty checks and string functions work as
     // expected.
     $value = (string) $this->last_render;
@@ -1299,9 +1297,10 @@ public function renderText($alter) {
     }
 
     // Preserve whether or not the string is safe. Since $more_link comes from
-    // \Drupal::l(), it is safe to append. Use SafeMarkup::isSafe() here because
-    // renderAsLink() can return both safe and unsafe values.
-    if (SafeMarkup::isSafe($value)) {
+    // \Drupal::l(), it is safe to append. Check if the value is an instance of
+    // \Drupal\Component\Render\MarkupInterface here because renderAsLink()
+    // can return both safe and unsafe values.
+    if ($value instanceof MarkupInterface) {
       return ViewsRenderPipelineMarkup::create($value . $more_link);
     }
     else {
@@ -1681,8 +1680,7 @@ protected function getTokenValuesRecursive(array $array, array $parent_keys = ar
    * fields as a list. For example, the field that displays all terms
    * on a node might have tokens for the tid and the term.
    *
-   * By convention, tokens should follow the format of {{ token
-   * subtoken }}
+   * By convention, tokens should follow the format of {{ token__subtoken }}
    * where token is the field ID and subtoken is the field. If the
    * field ID is terms, then the tokens might be {{ terms__tid }} and
    * {{ terms__name }}.
diff --git a/core/modules/views/src/Plugin/views/field/RenderedEntity.php b/core/modules/views/src/Plugin/views/field/RenderedEntity.php
new file mode 100644
index 0000000..21b8ae6
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/field/RenderedEntity.php
@@ -0,0 +1,213 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\views\field\RenderedEntity.
+ */
+
+namespace Drupal\views\Plugin\views\field;
+
+use Drupal\Core\Cache\CacheableDependencyInterface;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\views\Entity\Render\EntityTranslationRenderTrait;
+use Drupal\views\ResultRow;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Provides a field handler which renders an entity in a certain view mode.
+ *
+ * @ingroup views_field_handlers
+ *
+ * @ViewsField("rendered_entity")
+ */
+class RenderedEntity extends FieldPluginBase implements CacheableDependencyInterface {
+
+  use EntityTranslationRenderTrait;
+
+  /**
+   * The entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * Constructs a new RenderedEntity object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param array $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   *    The entity manager.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   */
+  public function __construct(array $configuration, $plugin_id, array $plugin_definition, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+
+    $this->entityManager = $entity_manager;
+    $this->languageManager = $language_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity.manager'),
+      $container->get('language_manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function usesGroupBy() {
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function defineOptions() {
+    $options = parent::defineOptions();
+    $options['view_mode'] = ['default' => 'default'];
+
+    return $options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildOptionsForm(&$form, FormStateInterface $form_state) {
+    parent::buildOptionsForm($form, $form_state);
+
+    $form['view_mode'] = [
+      '#type' => 'select',
+      '#options' => $this->entityManager->getViewModeOptions($this->getEntityTypeId()),
+      '#title' => $this->t('View mode'),
+      '#default_value' => $this->options['view_mode'],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render(ResultRow $values) {
+    $entity = $this->getEntityTranslation($this->getEntity($values), $values);
+    $build = [];
+    if (isset($entity)) {
+      $access = $entity->access('view', NULL, TRUE);
+      $build['#access'] = $access;
+      if ($access->isAllowed()) {
+        $view_builder = $this->entityManager->getViewBuilder($this->getEntityTypeId());
+        $build += $view_builder->view($entity, $this->options['view_mode']);
+      }
+    }
+    return $build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheContexts() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheTags() {
+    $view_display_storage = $this->entityManager->getStorage('entity_view_display');
+    $view_displays = $view_display_storage->loadMultiple($view_display_storage
+      ->getQuery()
+      ->condition('targetEntityType', $this->getEntityTypeId())
+      ->execute());
+
+    $tags = [];
+    foreach ($view_displays as $view_display) {
+      $tags = array_merge($tags, $view_display->getCacheTags());
+    }
+    return $tags;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCacheMaxAge() {
+    return Cache::PERMANENT;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    // We purposefully do not call parent::query() because we do not want the
+    // default query behavior for Views fields. Instead, let the entity
+    // translation renderer provide the correct query behavior.
+    if ($this->languageManager->isMultilingual()) {
+      $this->getEntityTranslationRenderer()->query($this->query, $this->relationship);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityTypeId() {
+    return $this->getEntityType();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityManager() {
+    return $this->entityManager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getLanguageManager() {
+    return $this->languageManager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getView() {
+    return $this->view;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function calculateDependencies() {
+    $dependencies = parent::calculateDependencies();
+
+    $view_mode = $this->entityManager
+      ->getStorage('entity_view_mode')
+      ->load($this->getEntityTypeId() . '.' . $this->options['view_mode']);
+    if ($view_mode) {
+      $dependencies[$view_mode->getConfigDependencyKey()][] = $view_mode->getConfigDependencyName();
+    }
+
+    return $dependencies;
+  }
+
+}
diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
index e37ed31..a4cded4 100644
--- a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php
@@ -76,14 +76,14 @@ protected function operators() {
     return array(
       '=' => array(
         'title' => $this->t('Is equal to'),
-        'method' => '_queryOperatorBoolean',
+        'method' => 'queryOpBoolean',
         'short' => $this->t('='),
         'values' => 1,
         'query_operator' => static::EQUAL,
       ),
       '!=' => array(
         'title' => $this->t('Is not equal to'),
-        'method' => '_queryOperatorBoolean',
+        'method' => 'queryOpBoolean',
         'short' => $this->t('!='),
         'values' => 1,
         'query_operator' => static::NOT_EQUAL,
@@ -226,29 +226,15 @@ public function query() {
   }
 
   /**
-   * Adds a where condition to the query for a boolean value. This function
-   * remains to prevent breaks in public-facing API's.
-   *
-   * @param string $field
-   *   The field name to add the where condition for.
-   */
-  protected function queryOpBoolean($field) {
-    $this->_queryOperatorBoolean($field, static::EQUAL);
-  }
-
-  /**
    * Adds a where condition to the query for a boolean value.
    *
    * @param string $field
    *   The field name to add the where condition for.
    * @param string $query_operator
-   *   Either static::EQUAL or static::NOT_EQUAL.
-   *
-   * @internal
-   *   This method will be removed in 8.1.0 and is here to maintain backwards-
-   *   compatibility in 8.0.x releases.
+   *   (optional) Either static::EQUAL or static::NOT_EQUAL. Defaults to
+   *   static::EQUAL.
    */
-  protected function _queryOperatorBoolean($field, $query_operator) {
+  protected function queryOpBoolean($field, $query_operator = EQUAL) {
     if (empty($this->value)) {
       if ($this->accept_null) {
         if ($query_operator == static::EQUAL) {
diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index c0cd5d0..75b5297 100644
--- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -610,7 +610,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
       '#default_value' => $this->options['expose']['identifier'],
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
-      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank.'),
+      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
     );
   }
 
@@ -619,16 +619,7 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
    */
   public function validateExposeForm($form, FormStateInterface $form_state) {
     $identifier = $form_state->getValue(array('options', 'expose', 'identifier'));
-    if (empty($identifier)) {
-      $form_state->setError($form['expose']['identifier'], $this->t('The identifier is required if the filter is exposed.'));
-    }
-    elseif ($identifier == 'value') {
-      $form_state->setError($form['expose']['identifier'], $this->t('This identifier is not allowed.'));
-    }
-
-    if (!$this->view->display_handler->isIdentifierUnique($form_state->get('id'), $identifier)) {
-      $form_state->setError($form['expose']['identifier'], $this->t('This identifier is used by another handler.'));
-    }
+    $this->validateIdentifier($identifier, $form_state, $form['expose']['identifier']);
   }
 
   /**
@@ -637,17 +628,7 @@ public function validateExposeForm($form, FormStateInterface $form_state) {
   protected function buildGroupValidate($form, FormStateInterface $form_state) {
     if (!$form_state->isValueEmpty(array('options', 'group_info'))) {
       $identifier = $form_state->getValue(array('options', 'group_info', 'identifier'));
-      if (empty($identifier)) {
-        $form_state->setError($form['group_info']['identifier'], $this->t('The identifier is required if the filter is exposed.'));
-      }
-
-      elseif ($identifier == 'value') {
-        $form_state->setError($form['group_info']['identifier'], $this->t('This identifier is not allowed.'));
-      }
-
-      if (!$this->view->display_handler->isIdentifierUnique($form_state->get('id'), $identifier)) {
-        $form_state->setError($form['group_info']['identifier'], $this->t('This identifier is used by another handler.'));
-      }
+      $this->validateIdentifier($identifier, $form_state, $form['group_info']['identifier']);
     }
 
     if ($group_items = $form_state->getValue(array('options', 'group_info', 'group_items'))) {
@@ -677,6 +658,42 @@ protected function buildGroupValidate($form, FormStateInterface $form_state) {
   }
 
   /**
+   * Validates a filter identifier.
+   *
+   * Sets the form error if $form_state is passed or a error string if
+   * $form_state is not passed.
+   *
+   * @param string $identifier
+   *   The identifier to check.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   * @param array $form_group
+   *   The form element to set any errors on.
+   *
+   * @return string
+   */
+  protected function validateIdentifier($identifier, FormStateInterface $form_state = NULL, &$form_group = array()) {
+    $error = '';
+    if (empty($identifier)) {
+      $error = $this->t('The identifier is required if the filter is exposed.');
+    }
+    elseif ($identifier == 'value') {
+      $error = $this->t('This identifier is not allowed.');
+    }
+    elseif (preg_match('/[^a-zA-z0-9_~\.\-]/', $identifier)) {
+      $error = $this->t('This identifier has illegal characters.');
+    }
+
+    if ($form_state && !$this->view->display_handler->isIdentifierUnique($form_state->get('id'), $identifier)) {
+      $error = $this->t('This identifier is used by another handler.');
+    }
+
+    if (!empty($form_state) && !empty($error)) {
+      $form_state->setError($form_group, $error);
+    }
+    return $error;
+  }
+
+  /**
    * Save new group items, re-enumerates and remove groups marked to delete.
    */
   protected function buildGroupSubmit($form, FormStateInterface $form_state) {
@@ -864,7 +881,7 @@ protected function buildExposedFiltersGroupForm(&$form, FormStateInterface $form
       '#default_value' => $identifier,
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
-      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank.'),
+      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
     );
     $form['group_info']['label'] = array(
       '#type' => 'textfield',
@@ -918,7 +935,7 @@ protected function buildExposedFiltersGroupForm(&$form, FormStateInterface $form
       '#default_value' => $identifier,
       '#title' => $this->t('Filter identifier'),
       '#size' => 40,
-      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank.'),
+      '#description' => $this->t('This will appear in the URL after the ? to identify this filter. Cannot be blank. Only letters, digits and the dot ("."), hyphen ("-"), underscore ("_"), and tilde ("~") characters are allowed.'),
     );
     $form['group_info']['label'] = array(
       '#type' => 'textfield',
@@ -1485,6 +1502,15 @@ public function getCacheTags() {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validate() {
+    if (!empty($this->options['exposed']) && $error = $this->validateIdentifier($this->options['expose']['identifier'])) {
+      return [$error];
+    }
+  }
+
 }
 
 /**
diff --git a/core/modules/views/src/Plugin/views/filter/InOperator.php b/core/modules/views/src/Plugin/views/filter/InOperator.php
index 042dca5..cfcde0e 100644
--- a/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -415,7 +415,7 @@ protected function opEmpty() {
 
   public function validate() {
     $this->getValueOptions();
-    $errors = array();
+    $errors = parent::validate();
 
     // If the operator is an operator which doesn't require a value, there is
     // no need for additional validation.
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 85356fc..25374c0 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -1838,7 +1838,7 @@ public function getDateFormat($field, $format, $string_date = FALSE) {
 
         // SQLite does not have a ISO week substitution string, so it needs
         // special handling.
-        // @see http://en.wikipedia.org/wiki/ISO_week_date#Calculation
+        // @see http://wikipedia.org/wiki/ISO_week_date#Calculation
         // @see http://stackoverflow.com/a/15511864/1499564
         if ($format === '%W') {
           $expression = "((strftime('%j', date(strftime('%Y-%m-%d', $field" . $unixepoch . "), '-3 days', 'weekday 4')) - 1) / 7 + 1)";
diff --git a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
index 52b1ff7..0aae903 100644
--- a/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
+++ b/core/modules/views/src/Plugin/views/relationship/GroupwiseMax.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\Views;
+use Drupal\views\Entity\View;
 
 /**
  * Relationship handler that allows a groupwise maximum of the linked in table.
@@ -156,7 +157,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    * We use this to obtain our subquery SQL.
    */
   protected function getTemporaryView() {
-    $view = entity_create('view', array('base_table' => $this->definition['base']));
+    $view = View::create(array('base_table' => $this->definition['base']));
     $view->addDisplay('default');
     return $view->getExecutable();
   }
diff --git a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 7ca2cc90..5269074 100644
--- a/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -11,7 +11,6 @@
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\HandlerBase;
-use Drupal\views\Join;
 use Drupal\views\Views;
 
 /**
diff --git a/core/modules/views/src/Plugin/views/row/OpmlFields.php b/core/modules/views/src/Plugin/views/row/OpmlFields.php
index a2ddf43..91c3f04 100644
--- a/core/modules/views/src/Plugin/views/row/OpmlFields.php
+++ b/core/modules/views/src/Plugin/views/row/OpmlFields.php
@@ -134,7 +134,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     $form['url_field'] = array(
       '#type' => 'select',
       '#title' => $this->t('URL attribute'),
-      '#description' => $this->t('The field that is going to be used as the OPML url attribute for each row.'),
+      '#description' => $this->t('The field that is going to be used as the OPML URL attribute for each row.'),
       '#options' => $view_fields_labels,
       '#default_value' => $this->options['url_field'],
       '#states' => array(
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 148e053..65916ba 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -10,7 +10,6 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 use Drupal\views\Plugin\views\PluginBase;
 use Drupal\views\Plugin\views\wizard\WizardInterface;
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 998447c..d8f90c3 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -660,7 +660,7 @@ protected function instantiateView($form, FormStateInterface $form_state) {
       'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
     );
 
-    $view = entity_create('view', $values);
+    $view = View::create($values);
 
     // Build all display options for this view.
     $display_options = $this->buildDisplayOptions($form, $form_state);
@@ -800,7 +800,7 @@ protected function defaultDisplayOptions() {
     $display_options['cache']['type'] = 'tag';
     $display_options['query']['type'] = 'views_query';
     $display_options['exposed_form']['type'] = 'basic';
-    $display_options['pager']['type'] = 'full';
+    $display_options['pager']['type'] = 'mini';
     $display_options['style']['type'] = 'default';
     $display_options['row']['type'] = 'fields';
 
@@ -1038,9 +1038,9 @@ protected function pageDisplayOptions(array $form, FormStateInterface $form_stat
     if (empty($page['items_per_page'])) {
       $display_options['pager']['type'] = 'none';
     }
-    // If the user checked the pager checkbox use a full pager.
+    // If the user checked the pager checkbox use a mini pager.
     elseif (!empty($page['pager'])) {
-      $display_options['pager']['type'] = 'full';
+      $display_options['pager']['type'] = 'mini';
     }
     // If the user doesn't have checked the checkbox use the pager which just
     // displays a certain amount of items.
diff --git a/core/modules/views/src/Tests/BasicTest.php b/core/modules/views/src/Tests/BasicTest.php
deleted file mode 100644
index 69aacf0..0000000
--- a/core/modules/views/src/Tests/BasicTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\BasicTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\views\Views;
-
-/**
- * A basic query test for Views.
- *
- * @group views
- */
-class BasicTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view', 'test_simple_argument');
-
-  /**
-   * Tests a trivial result set.
-   */
-  public function testSimpleResultSet() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->dataSet(), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-  }
-
-  /**
-   * Tests filtering of the result set.
-   */
-  public function testSimpleFiltering() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'operator' => '<',
-        'value' => array(
-          'value' => '28',
-          'min' => '',
-          'max' => '',
-        ),
-        'group' => '0',
-        'exposed' => FALSE,
-        'expose' => array(
-          'operator' => FALSE,
-          'label' => '',
-        ),
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Build the expected result.
-    $dataset = array(
-      array(
-        'id' => 1,
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'id' => 2,
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'id' => 4,
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-    );
-
-    // Verify the result.
-    $this->assertEqual(3, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-  }
-
-  /**
-   * Tests simple argument.
-   */
-  public function testSimpleArgument() {
-    // Execute with a view
-    $view = Views::getView('test_simple_argument');
-    $view->setArguments(array(27));
-    $this->executeView($view);
-
-    // Build the expected result.
-    $dataset = array(
-      array(
-        'id' => 2,
-        'name' => 'George',
-        'age' => 27,
-      ),
-    );
-
-    // Verify the result.
-    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-
-    // Test "show all" if no argument is present.
-    $view = Views::getView('test_simple_argument');
-    $this->executeView($view);
-
-    // Build the expected result.
-    $dataset = $this->dataSet();
-
-    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/DefaultViewsTest.php b/core/modules/views/src/Tests/DefaultViewsTest.php
index 197d25e..1276378 100644
--- a/core/modules/views/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views/src/Tests/DefaultViewsTest.php
@@ -15,6 +15,9 @@
 use Drupal\Core\Url;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
 use Drupal\views\Views;
+use Drupal\comment\Entity\Comment;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
 
 /**
  * Tests the default views provided by views.
@@ -52,7 +55,7 @@ protected function setUp() {
     // Create Basic page node type.
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
@@ -60,7 +63,7 @@ protected function setUp() {
       'help' => '',
       'nodes' => array('page' => 'page'),
       'weight' => mt_rand(0, 10),
-    ));
+    ]);
     $vocabulary->save();
 
     // Create a field.
@@ -101,7 +104,7 @@ protected function setUp() {
         'entity_type' => 'node',
         'field_name' => 'comment'
       );
-      entity_create('comment', $comment)->save();
+      Comment::create($comment)->save();
     }
 
     // Some views, such as the "Who's Online" view, only return results if at
@@ -148,14 +151,14 @@ public function testDefaultViews() {
   function createTerm($vocabulary) {
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
-    $term = entity_create('taxonomy_term', array(
+    $term = Term::create([
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       // Use the first available text format.
       'format' => $format->id(),
       'vid' => $vocabulary->id(),
       'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-    ));
+    ]);
     $term->save();
     return $term;
   }
diff --git a/core/modules/views/src/Tests/Entity/FieldEntityTest.php b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
index 925ed10..6f34dda 100644
--- a/core/modules/views/src/Tests/Entity/FieldEntityTest.php
+++ b/core/modules/views/src/Tests/Entity/FieldEntityTest.php
@@ -8,9 +8,12 @@
 namespace Drupal\views\Tests\Entity;
 
 use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\node\Entity\Node;
+use Drupal\user\Entity\User;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
+use Drupal\comment\Entity\Comment;
 
 /**
  * Tests the field plugin base integration with the entity system.
@@ -54,12 +57,16 @@ public function testGetEntity() {
     // The view is a view of comments, their nodes and their authors, so there
     // are three layers of entities.
 
-    $account = entity_create('user', array('name' => $this->randomMachineName(), 'bundle' => 'user'));
+    $account = User::create(['name' => $this->randomMachineName(), 'bundle' => 'user']);
     $account->save();
 
-    $node = entity_create('node', array('uid' => $account->id(), 'type' => 'page', 'title' => $this->randomString()));
+    $node = Node::create([
+      'uid' => $account->id(),
+      'type' => 'page',
+      'title' => $this->randomString(),
+    ]);
     $node->save();
-    $comment = entity_create('comment', array(
+    $comment = Comment::create(array(
       'uid' => $account->id(),
       'entity_id' => $node->id(),
       'entity_type' => 'node',
diff --git a/core/modules/views/src/Tests/Entity/FieldEntityTranslationTest.php b/core/modules/views/src/Tests/Entity/FieldEntityTranslationTest.php
index 8e4515a..540ff04 100644
--- a/core/modules/views/src/Tests/Entity/FieldEntityTranslationTest.php
+++ b/core/modules/views/src/Tests/Entity/FieldEntityTranslationTest.php
@@ -46,9 +46,7 @@ protected function setUp($import_test_views = TRUE) {
     /** @var \Drupal\content_translation\ContentTranslationManagerInterface $content_translation_manager */
     $content_translation_manager = \Drupal::service('content_translation.manager');
 
-    $content_translation_manager->setEnabled('node', 'article', 'title');
-    $content_translation_manager->setEnabled('node', 'article', 'sticky');
-    $content_translation_manager->setEnabled('node', 'article', 'published');
+    $content_translation_manager->setEnabled('node', 'article', TRUE);
 
     $language = ConfigurableLanguage::create([
       'id' => 'es',
diff --git a/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
index 709dd37..99a7193 100644
--- a/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
+++ b/core/modules/views/src/Tests/Entity/FilterEntityBundleTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\views\Tests\Entity;
 
+use Drupal\node\Entity\Node;
 use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\views\Views;
@@ -60,7 +61,11 @@ protected function setUp() {
 
     foreach ($this->entityBundles as $key => $info) {
       for ($i = 0; $i < 5; $i++) {
-        $entity = entity_create('node', array('title' => $this->randomString(), 'uid' => 1, 'type' => $key));
+        $entity = Node::create([
+          'title' => $this->randomString(),
+          'uid' => 1,
+          'type' => $key,
+        ]);
         $entity->save();
         $this->entities[$key][$entity->id()] = $entity;
         $this->entities['count']++;
diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
deleted file mode 100644
index f69444a..0000000
--- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Entity\RowEntityRenderersTest.
- */
-
-namespace Drupal\views\Tests\Entity;
-
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\node\Entity\NodeType;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the entity row renderers.
- *
- * @group views
- * @see \Drupal\views\Entity\Render\RendererBase
- */
-class RowEntityRenderersTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'filter', 'text', 'node', 'user', 'language', 'views_test_language'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_entity_row_renderers');
-
-  /**
-   * An array of added languages.
-   *
-   * @var array
-   */
-  protected $langcodes;
-
-  /**
-   * An array of titles for each node per language.
-   *
-   * @var array
-   */
-  protected $expected;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-    $this->installSchema('node', array('node_access'));
-    $this->installConfig(array('node', 'language'));
-
-    // The entity.node.canonical route must exist when nodes are rendered.
-    $this->container->get('router.builder')->rebuild();
-
-    $this->langcodes = array(\Drupal::languageManager()->getDefaultLanguage()->getId());
-    for ($i = 0; $i < 2; $i++) {
-      $langcode = 'l' . $i;
-      $this->langcodes[] = $langcode;
-      ConfigurableLanguage::createFromLangcode($langcode)->save();
-    }
-
-    // Make sure we do not try to render non-existing user data.
-    $node_type = NodeType::create(array('type' => 'test'));
-    $node_type->setDisplaySubmitted(FALSE);
-    $node_type->save();
-
-    $this->values = array();
-    $controller = \Drupal::entityManager()->getStorage('node');
-    $langcode_index = 0;
-
-    for ($i = 0; $i < count($this->langcodes); $i++) {
-      // Create a node with a different default language each time.
-      $default_langcode = $this->langcodes[$langcode_index++];
-      $node = $controller->create(array('type' => 'test', 'uid' => 0, 'langcode' => $default_langcode));
-      // Ensure the default language is processed first.
-      $langcodes = array_merge(array($default_langcode), array_diff($this->langcodes, array($default_langcode)));
-
-      foreach ($langcodes as $langcode) {
-        // Ensure we have a predictable result order.
-        $this->values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
-
-        if ($langcode != $default_langcode) {
-          $node->addTranslation($langcode, array('title' => $this->values[$i][$langcode]));
-        }
-        else {
-          $node->setTitle($this->values[$i][$langcode]);
-        }
-
-        $node->save();
-      }
-    }
-  }
-
-  /**
-   * Tests the entity row renderers.
-   */
-  public function testEntityRenderers() {
-    $this->checkLanguageRenderers('page_1', $this->values);
-  }
-
-  /**
-   * Tests the field row renderers.
-   */
-  public function testFieldRenderers() {
-    $this->checkLanguageRenderers('page_2', $this->values);
-  }
-
-  /**
-   * Checks that the language renderer configurations work as expected.
-   *
-   * @param string $display
-   *   Name of display to test with.
-   * @param array $values
-   *   An array of node information which are each an array of node titles
-   *   associated with language keys appropriate for the translation of that
-   *   node.
-   */
-  protected function checkLanguageRenderers($display, $values) {
-    $expected = array(
-      $values[0]['en'],
-      $values[0]['en'],
-      $values[0]['en'],
-      $values[1]['en'],
-      $values[1]['en'],
-      $values[1]['en'],
-      $values[2]['en'],
-      $values[2]['en'],
-      $values[2]['en'],
-    );
-    $this->assertTranslations($display, '***LANGUAGE_language_content***', $expected, 'The current language renderer behaves as expected.');
-
-    $expected = array(
-      $values[0]['en'],
-      $values[0]['en'],
-      $values[0]['en'],
-      $values[1]['l0'],
-      $values[1]['l0'],
-      $values[1]['l0'],
-      $values[2]['l1'],
-      $values[2]['l1'],
-      $values[2]['l1'],
-    );
-    $this->assertTranslations($display, '***LANGUAGE_entity_default***', $expected, 'The default language renderer behaves as expected.');
-
-    $expected = array(
-      $values[0]['en'],
-      $values[0]['l0'],
-      $values[0]['l1'],
-      $values[1]['en'],
-      $values[1]['l0'],
-      $values[1]['l1'],
-      $values[2]['en'],
-      $values[2]['l0'],
-      $values[2]['l1'],
-    );
-    $this->assertTranslations($display, '***LANGUAGE_entity_translation***', $expected, 'The translation language renderer behaves as expected.');
-
-    $expected = array(
-      $values[0][$this->langcodes[0]],
-      $values[0][$this->langcodes[0]],
-      $values[0][$this->langcodes[0]],
-      $values[1][$this->langcodes[0]],
-      $values[1][$this->langcodes[0]],
-      $values[1][$this->langcodes[0]],
-      $values[2][$this->langcodes[0]],
-      $values[2][$this->langcodes[0]],
-      $values[2][$this->langcodes[0]],
-    );
-    $this->assertTranslations($display, '***LANGUAGE_site_default***', $expected, 'The site default language renderer behaves as expected.');
-
-    $expected = array(
-      $values[0]['l0'],
-      $values[0]['l0'],
-      $values[0]['l0'],
-      $values[1]['l0'],
-      $values[1]['l0'],
-      $values[1]['l0'],
-      $values[2]['l0'],
-      $values[2]['l0'],
-      $values[2]['l0'],
-    );
-    $this->assertTranslations($display, 'l0', $expected, 'The language specific renderer behaves as expected.');
-  }
-
-  /**
-   * Checks that the view results match the expected values.
-   *
-   * @param string $display
-   *   Name of display to test with.
-   * @param string $renderer_id
-   *   The id of the renderer to be tested.
-   * @param array $expected
-   *   An array of expected title translation values, one for each result row.
-   * @param string $message
-   *   (optional) A message to display with the assertion.
-   * @param string $group
-   *   (optional) The group this message is in.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertTranslations($display, $renderer_id, array $expected, $message = '', $group = 'Other') {
-    $view = Views::getView('test_entity_row_renderers');
-    $view->storage->invalidateCaches();
-    $view->setDisplay($display);
-    $view->getDisplay()->setOption('rendering_language', $renderer_id);
-    $view->preview();
-
-    $result = FALSE;
-    foreach ($expected as $index => $expected_output) {
-      if (!empty($view->result[$index])) {
-        $build = $view->rowPlugin->render($view->result[$index]);
-        $output = \Drupal::service('renderer')->renderRoot($build);
-        $result = strpos($output, $expected_output) !== FALSE;
-        if (!$result) {
-          break;
-        }
-      }
-      else {
-        $result = FALSE;
-        break;
-      }
-    }
-
-    return $this->assertTrue($result, $message, $group);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php
deleted file mode 100644
index 632be6a..0000000
--- a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Entity\ViewEntityDependenciesTest.
- */
-
-namespace Drupal\views\Tests\Entity;
-
-use Drupal\Component\Utility\Unicode;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the calculation of dependencies for views.
- *
- * @group views
- */
-class ViewEntityDependenciesTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_field_get_entity', 'test_relationship_dependency', 'test_plugin_dependencies', 'test_argument_dependency'];
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['node', 'comment', 'user', 'field', 'text', 'search'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp(FALSE);
-
-    // Install the necessary dependencies for node type creation to work.
-    $this->installEntitySchema('node');
-    $this->installConfig(array('field', 'node'));
-
-    $comment_type = entity_create('comment_type', array(
-      'id' => 'comment',
-      'label' => 'Comment settings',
-      'description' => 'Comment settings',
-      'target_entity_type_id' => 'node',
-    ));
-    $comment_type->save();
-
-    $content_type = entity_create('node_type', array(
-      'type' => $this->randomMachineName(),
-      'name' => $this->randomString(),
-    ));
-    $content_type->save();
-    $field_storage = entity_create('field_storage_config', array(
-      'field_name' => Unicode::strtolower($this->randomMachineName()),
-      'entity_type' => 'node',
-      'type' => 'comment',
-    ));
-    $field_storage->save();
-    entity_create('field_config', array(
-      'field_storage' => $field_storage,
-      'bundle' => $content_type->id(),
-      'label' => $this->randomMachineName() . '_label',
-      'description' => $this->randomMachineName() . '_description',
-      'settings' => array(
-        'comment_type' => $comment_type->id(),
-      ),
-    ))->save();
-    entity_create('field_config', array(
-      'field_storage' => FieldStorageConfig::loadByName('node', 'body'),
-      'bundle' => $content_type->id(),
-      'label' => $this->randomMachineName() . '_body',
-      'settings' => array('display_summary' => TRUE),
-    ))->save();
-
-    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
-  }
-
-  /**
-   * Tests the getDependencies method.
-   */
-  public function testGetDependencies() {
-    $expected = [];
-    $expected['test_field_get_entity'] = [
-      'module' => [
-        'comment',
-        'node',
-        'user',
-      ]
-    ];
-    // Tests dependencies of relationships.
-    $expected['test_relationship_dependency'] = [
-      'module' => [
-        'comment',
-        'node',
-        'user',
-      ]
-    ];
-    $expected['test_plugin_dependencies'] = [
-      'module' => [
-        'comment',
-        'views_test_data',
-      ],
-      'content' => [
-        'RowTest',
-        'StaticTest',
-        'StyleTest',
-      ]
-    ];
-
-    $expected['test_argument_dependency'] = [
-      'config' => [
-        'core.entity_view_mode.node.teaser',
-        'field.storage.node.body'
-      ],
-      'content' => [
-        'ArgumentDefaultTest',
-        'ArgumentValidatorTest'
-      ],
-      'module' => [
-        'node',
-        // The argument handler is provided by the search module.
-        'search',
-        'text',
-        'user'
-      ],
-    ];
-
-    foreach ($this::$testViews as $view_id) {
-      $view = Views::getView($view_id);
-
-      $dependencies = $view->getDependencies();
-      $this->assertEqual($expected[$view_id], $dependencies);
-      $config = $this->config('views.view.' . $view_id);
-      \Drupal::service('config.storage.sync')->write($view_id, $config->get());
-    }
-
-    // Ensure that dependencies are calculated on the display level.
-    $expected_display['default'] = [
-      'config' => [
-        'core.entity_view_mode.node.teaser',
-      ],
-      'content' => [
-        'ArgumentDefaultTest',
-        'ArgumentValidatorTest'
-      ],
-      'module' => [
-        'core',
-        'node',
-        'search',
-        'user',
-        'views'
-      ],
-    ];
-    $expected_display['page'] = [
-      'config' => [
-        'field.storage.node.body'
-      ],
-      'module' => [
-        'core',
-        'text',
-        'views'
-      ],
-    ];
-
-    $view = Views::getView('test_argument_dependency');
-    $view->initDisplay();
-    foreach ($view->displayHandlers as $display) {
-      // Calculate the dependencies each display has.
-      $this->assertEqual($expected_display[$display->getPluginId()], $display->calculateDependencies());
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
deleted file mode 100644
index 1f8491a..0000000
--- a/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ /dev/null
@@ -1,466 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\EventSubscriber\ViewsEntitySchemaSubscriberIntegrationTest.
- */
-
-namespace Drupal\views\Tests\EventSubscriber;
-
-use Drupal\Core\Entity\EntityTypeEvent;
-use Drupal\Core\Entity\EntityTypeEvents;
-use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber
- *
- * @group Views
- */
-class ViewsEntitySchemaSubscriberIntegrationTest extends ViewKernelTestBase {
-
-  use EntityDefinitionTestTrait;
-
-  /**
-   * The entity definition update manager.
-   *
-   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
-   */
-  protected $entityDefinitionUpdateManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['entity_test', 'user', 'text'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_view_entity_test', 'test_view_entity_test_revision', 'test_view_entity_test_data', 'test_view_entity_test_additional_base_field'];
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $eventDispatcher;
-
-  /**
-   * The tested event subscriber of views.
-   *
-   * @var \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber
-   */
-  protected $eventSubscriber;
-
-  /**
-   * The entity manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityManagerInterface
-   */
-  protected $entityManager;
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->eventDispatcher = $this->container->get('event_dispatcher');
-    $this->eventSubscriber = $this->container->get('views.entity_schema_subscriber');
-    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
-    $this->entityManager = $this->container->get('entity.manager');
-    $this->state = $this->container->get('state');
-
-    $this->database = $this->container->get('database');
-
-    // Install every entity type's schema that wasn't installed in the parent
-    // method.
-    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
-      $this->installEntitySchema($entity_type_id);
-    }
-
-    $this->installSchema('system', 'key_value_expire');
-  }
-
-  /**
-   * Tests that views are disabled when an entity type is deleted.
-   */
-  public function testDeleteEntityType() {
-    $entity_storage = $this->entityManager->getStorage('view');
-
-    $views = $entity_storage->loadMultiple();
-
-    // Ensure that all test views exists.
-    $this->assertTrue(isset($views['test_view_entity_test']));
-    $this->assertTrue(isset($views['test_view_entity_test_revision']));
-    $this->assertTrue(isset($views['test_view_entity_test_data']));
-    $this->assertTrue(isset($views['test_view_entity_test_additional_base_field']));
-
-    $event = new EntityTypeEvent($this->entityManager->getDefinition('entity_test_update'));
-    $this->eventDispatcher->dispatch(EntityTypeEvents::DELETE, $event);
-
-    // We expect that views which use 'entity_test_update' as base tables are
-    // disabled.
-    $views = $entity_storage->loadMultiple();
-
-    // Ensure that all test views still exists after the deletion of the
-    // entity type.
-    $this->assertTrue(isset($views['test_view_entity_test']));
-    $this->assertTrue(isset($views['test_view_entity_test_revision']));
-    $this->assertTrue(isset($views['test_view_entity_test_data']));
-    $this->assertTrue(isset($views['test_view_entity_test_additional_base_field']));
-
-    // Ensure that they are all disabled.
-    $this->assertFalse($views['test_view_entity_test']->status());
-    $this->assertFalse($views['test_view_entity_test_revision']->status());
-    $this->assertFalse($views['test_view_entity_test_data']->status());
-    $this->assertFalse($views['test_view_entity_test_additional_base_field']->status());
-  }
-
-  /**
-   * Tests that renaming base tables adapts the views.
-   */
-  public function testBaseTableRename() {
-    $this->renameBaseTable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test');
-
-    // Ensure the base table got renamed, so also the views fields.
-    $this->assertEqual('entity_test_update_new', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that renaming data tables adapts the views.
-   */
-  public function testDataTableRename() {
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_data');
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    // Ensure that the data table is used.
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->renameDataTable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_data');
-
-    // Ensure the data table got renamed, so also the views fields.
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data_new', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that renaming revision tables adapts the views.
-   */
-  public function testRevisionBaseTableRename() {
-    $this->updateEntityTypeToRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_revision');
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
-
-    $this->renameRevisionBaseTable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_revision');
-
-    // Ensure the base table got renamed, so also the views fields.
-    $this->assertEqual('entity_test_update_revision_new', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that renaming revision tables adapts the views.
-   */
-  public function testRevisionDataTableRename() {
-    $this->updateEntityTypeToRevisionable();
-    // Multiple changes, so we have to invalidate the caches, otherwise
-    // the second update will revert the first.
-    $this->entityManager->clearCachedDefinitions();
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_revision');
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']);
-
-    $this->renameRevisionDataTable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_revision');
-
-    // Ensure the base table got renamed, so also the views fields.
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision_data_new', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that adding data tables adapts the views.
-   */
-  public function testDataTableAddition() {
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test');
-
-    // Ensure the data table got renamed, so also the views fields.
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that enabling revisions doesn't do anything.
-   */
-  public function testRevisionEnabling() {
-    $this->updateEntityTypeToRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test');
-
-    // Ensure that nothing happens.
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $display = $view->getDisplay('default');
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests that removing revision support disables the view.
-   */
-  public function testRevisionDisabling() {
-    $this->updateEntityTypeToRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    $this->updateEntityTypeToNotRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-
-    /** @var \Drupal\views\Entity\View $view */
-    $entity_storage = $this->entityManager->getStorage('view');
-    $view = $entity_storage->load('test_view_entity_test_revision');
-
-    $this->assertFalse($view->status());
-  }
-
-  /**
-   * Tests a bunch possible entity definition table updates.
-   */
-  public function testVariousTableUpdates() {
-    // We want to test the following permutations of entity definition updates:
-    // base <-> base + translation
-    // base + translation <-> base + translation + revision
-    // base + revision <-> base + translation + revision
-    // base <-> base + revision
-    // base <-> base + translation + revision
-
-    // base <-> base + translation
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-
-    $this->resetEntityType();
-
-    // base + translation <-> base + translation + revision
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->resetEntityType();
-
-    // base + revision <-> base + translation + revision
-    $this->updateEntityTypeToRevisionable();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-
-    $this->resetEntityType();
-
-    // base <-> base + revision
-    $this->updateEntityTypeToRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotRevisionable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-
-    $this->resetEntityType();
-
-    // base <-> base + translation + revision
-    $this->updateEntityTypeToRevisionable();
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotRevisionable();
-    $this->updateEntityTypeToNotTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay();
-
-    $this->assertEqual('entity_test_update', $view->get('base_table'));
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
-  }
-
-  /**
-   * Tests some possible entity table updates for a revision view.
-   */
-  public function testVariousTableUpdatesForRevisionView() {
-    // base + revision <-> base + translation + revision
-    $this->updateEntityTypeToRevisionable();
-    // Multiple changes, so we have to invalidate the caches, otherwise
-    // the second update will revert the first.
-    $this->entityManager->clearCachedDefinitions();
-
-    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
-
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
-
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']);
-
-    $this->updateEntityTypeToNotTranslatable();
-    $this->entityDefinitionUpdateManager->applyUpdates();
-    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
-
-    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
-    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
-
-    $this->resetEntityType();
-  }
-
-  /**
-   * Gets a view and its display.
-   *
-   * @param bool $revision
-   *   (optional) TRUE if we want to get a revision view.
-   *
-   * @return array
-   *   An array with the view as first item, and the display as second.
-   */
-  protected function getUpdatedViewAndDisplay($revision = FALSE) {
-    $entity_storage = $this->entityManager->getStorage('view');
-    /** @var \Drupal\views\Entity\View $view */
-    $view = $entity_storage->load($revision ? 'test_view_entity_test_revision' : 'test_view_entity_test');
-    $display = $view->getDisplay('default');
-
-    return [$view, $display];
-  }
-
-}
diff --git a/core/modules/views/src/Tests/FieldApiDataTest.php b/core/modules/views/src/Tests/FieldApiDataTest.php
index 72ee0be..68e1250 100644
--- a/core/modules/views/src/Tests/FieldApiDataTest.php
+++ b/core/modules/views/src/Tests/FieldApiDataTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
       'bundle' => 'page',
       'label' => 'GiraffeA" label'
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
 
     // Attach the same field to a different bundle with a different label.
     $this->drupalCreateContentType(['type' => 'article']);
diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
deleted file mode 100644
index 434463b..0000000
--- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\AreaEntityTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\block\Entity\Block;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Form\FormState;
-use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the generic entity area handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\area\Entity
- */
-class AreaEntityTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['entity_test', 'user', 'block'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_entity_area');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpFixtures() {
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test');
-    $this->installConfig(['entity_test']);
-
-    Block::create([
-      'id' => 'test_block',
-      'plugin' => 'system_main_block',
-    ])->save();
-
-    parent::setUpFixtures();
-  }
-
-  /**
-   * Tests views data for entity area handlers.
-   */
-  public function testEntityAreaData() {
-    $data = $this->container->get('views.views_data')->get('views');
-    $entity_types = $this->container->get('entity.manager')->getDefinitions();
-
-    $expected_entities = array_filter($entity_types, function (EntityTypeInterface $entity_type) {
-      return $entity_type->hasViewBuilderClass();
-    });
-
-    // Test that all expected entity types have data.
-    foreach (array_keys($expected_entities) as $entity) {
-      $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', array('@entity' => $entity)));
-      // Test that entity_type is set correctly in the area data.
-      $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', array('@entity' => $entity)));
-    }
-
-    $expected_entities = array_filter($entity_types, function (EntityTypeInterface $type) {
-      return !$type->hasViewBuilderClass();
-    });
-
-    // Test that no configuration entity types have data.
-    foreach (array_keys($expected_entities) as $entity) {
-      $this->assertTrue(empty($data['entity_' . $entity]), format_string('Views config entity area data not found for @entity', array('@entity' => $entity)));
-    }
-  }
-
-  /**
-   * Tests the area handler.
-   */
-  public function testEntityArea() {
-    /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
-    $entities = array();
-    for ($i = 0; $i < 3; $i++) {
-      $random_label = $this->randomMachineName();
-      $data = array('bundle' => 'entity_test', 'name' => $random_label);
-      $entity_test = $this->container->get('entity.manager')
-        ->getStorage('entity_test')
-        ->create($data);
-
-      $uuid_map[0] = 'aa0c61cb-b7bb-4795-972a-493dabcf529c';
-      $uuid_map[1] = '62cef0ff-6f30-4f7a-b9d6-a8ed5a3a6bf3';
-      $uuid_map[2] = '3161d6e9-3326-4719-b513-8fa68a731ba2';
-      $entity_test->uuid->value = $uuid_map[$i];
-
-      $entity_test->save();
-      $entities[] = $entity_test;
-      \Drupal::state()
-        ->set('entity_test_entity_access.view.' . $entity_test->id(), $i != 2);
-    }
-
-    $this->doTestCalculateDependencies();
-    $this->doTestRender($entities);
-  }
-
-  /**
-   * Tests rendering the entity area handler.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface[] $entities
-   *   The entities.
-   */
-  public function doTestRender($entities) {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $view = Views::getView('test_entity_area');
-    $preview = $view->preview('default', [$entities[1]->id()]);
-    $this->setRawContent(\Drupal::service('renderer')->renderRoot($preview));
-    $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $header_xpath = '//div[@class = "' . $view_class . '"]/header[1]';
-    $footer_xpath = '//div[@class = "' . $view_class . '"]/footer[1]';
-
-    $result = $this->xpath($header_xpath);
-    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
-    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
-
-    $result = $this->xpath($footer_xpath);
-    $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
-    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
-
-    $preview = $view->preview('default', array($entities[1]->id()));
-    $this->setRawContent($renderer->renderRoot($preview));
-
-    $result = $this->xpath($header_xpath);
-    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
-    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
-
-    $result = $this->xpath($footer_xpath);
-    $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
-    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
-
-    // Mark entity_test test view_mode as customizable.
-    $entity_view_mode = \Drupal::entityManager()->getStorage('entity_view_mode')->load('entity_test.test');
-    $entity_view_mode->enable();
-    $entity_view_mode->save();
-
-    // Change the view mode of the area handler.
-    $view = Views::getView('test_entity_area');
-    $item = $view->getHandler('default', 'header', 'entity_entity_test');
-    $item['view_mode'] = 'test';
-    $view->setHandler('default', 'header', 'entity_entity_test', $item);
-
-    $preview = $view->preview('default', array($entities[1]->id()));
-    $this->setRawContent($renderer->renderRoot($preview));
-    $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]');
-    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
-    $this->assertTrue(strpos(trim((string) $result[0]), 'test') !== FALSE, 'The rendered entity appeared in the right view mode.');
-
-    // Test entity access.
-    $view = Views::getView('test_entity_area');
-    $preview = $view->preview('default', array($entities[2]->id()));
-    $this->setRawContent($renderer->renderRoot($preview));
-    $view_class = 'js-view-dom-id-' . $view->dom_id;
-    $result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[1]');
-    $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.');
-
-    // Test the available view mode options.
-    $form = array();
-    $form_state = (new FormState())
-      ->set('type', 'header');
-    $view->display_handler->getHandler('header', 'entity_entity_test')->buildOptionsForm($form, $form_state);
-    $this->assertTrue(isset($form['view_mode']['#options']['test']), 'Ensure that the test view mode is available.');
-    $this->assertTrue(isset($form['view_mode']['#options']['default']), 'Ensure that the default view mode is available.');
-  }
-
-  /**
-   * Tests the calculation of the rendered dependencies.
-   */
-  public function doTestCalculateDependencies() {
-    $view = View::load('test_entity_area');
-
-    $dependencies = $view->calculateDependencies()->getDependencies();
-    // Ensure that both config and content entity dependencies are calculated.
-    $this->assertEqual([
-      'config' => ['block.block.test_block'],
-      'content' => ['entity_test:entity_test:aa0c61cb-b7bb-4795-972a-493dabcf529c'],
-    ], $dependencies);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/AreaMessagesTest.php b/core/modules/views/src/Tests/Handler/AreaMessagesTest.php
deleted file mode 100644
index c17deb1..0000000
--- a/core/modules/views/src/Tests/Handler/AreaMessagesTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\AreaMessagesTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the messages area handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\area\Messages
- */
-class AreaMessagesTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_area_messages');
-
-  /**
-   * Tests the messages area handler.
-   */
-  public function testMessageText() {
-    drupal_set_message('My drupal set message.');
-
-    $view = Views::getView('test_area_messages');
-
-    $view->setDisplay('default');
-    $this->executeView($view);
-    $output = $view->render();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-    $this->setRawContent($output);
-    $this->assertText('My drupal set message.');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/AreaTextTest.php b/core/modules/views/src/Tests/Handler/AreaTextTest.php
deleted file mode 100644
index b0723d1..0000000
--- a/core/modules/views/src/Tests/Handler/AreaTextTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\AreaTextTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core views_handler_area_text handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\area\Text
- */
-class AreaTextTest extends ViewKernelTestBase {
-
-  public static $modules = array('system', 'user', 'filter');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('system', 'filter'));
-    $this->installEntitySchema('user');
-  }
-
-  public function testAreaText() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // add a text header
-    $string = $this->randomMachineName();
-    $view->displayHandlers->get('default')->overrideOption('header', array(
-      'area' => array(
-        'id' => 'area',
-        'table' => 'views',
-        'field' => 'area',
-        'content' => array(
-          'value' => $string,
-        ),
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    $view->display_handler->handlers['header']['area']->options['content']['format'] = $this->randomString();
-    $build = $view->display_handler->handlers['header']['area']->render();
-    $this->assertEqual('', $renderer->renderRoot($build), 'Nonexistent format should return empty markup.');
-
-    $view->display_handler->handlers['header']['area']->options['content']['format'] = filter_default_format();
-    $build = $view->display_handler->handlers['header']['area']->render();
-    $this->assertEqual(check_markup($string), $renderer->renderRoot($build), 'Existent format should return something');
-
-    // Empty results, and it shouldn't be displayed .
-    $this->assertEqual(array(), $view->display_handler->handlers['header']['area']->render(TRUE), 'No result should lead to no header');
-    // Empty results, and it should be displayed.
-    $view->display_handler->handlers['header']['area']->options['empty'] = TRUE;
-    $build = $view->display_handler->handlers['header']['area']->render(TRUE);
-    $this->assertEqual(check_markup($string), $renderer->renderRoot($build), 'No result, but empty enabled lead to a full header');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/AreaTitleTest.php b/core/modules/views/src/Tests/Handler/AreaTitleTest.php
deleted file mode 100644
index 06641a9..0000000
--- a/core/modules/views/src/Tests/Handler/AreaTitleTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\AreaTitleTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the title area handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\area\Title
- */
-class AreaTitleTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_area_title');
-
-  /**
-   * Tests the title area handler.
-   */
-  public function testTitleText() {
-    $view = Views::getView('test_area_title');
-
-    $view->setDisplay('default');
-    $this->executeView($view);
-    $view->render();
-    $this->assertFalse($view->getTitle(), 'The title area does not override the title if the view is not empty.');
-    $view->destroy();
-
-    $view->setDisplay('default');
-    $this->executeView($view);
-    $view->result = array();
-    $view->render();
-    $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
-    $view->destroy();
-
-    $view->setDisplay('page_1');
-    $this->executeView($view);
-    $view->render();
-    $this->assertEqual($view->getTitle(), 'test_title_header', 'The title area on the header should override the title if the result is not empty.');
-    $view->destroy();
-
-    $view->setDisplay('page_1');
-    $this->executeView($view);
-    $view->result = array();
-    $view->render();
-    $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
-    $view->destroy();
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/AreaViewTest.php b/core/modules/views/src/Tests/Handler/AreaViewTest.php
deleted file mode 100644
index 779b795..0000000
--- a/core/modules/views/src/Tests/Handler/AreaViewTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\AreaViewTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the view area handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\area\View
- */
-class AreaViewTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_simple_argument', 'test_area_view');
-
-  /**
-   * Tests the view area handler.
-   */
-  public function testViewArea() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $view = Views::getView('test_area_view');
-
-    // Tests \Drupal\views\Plugin\views\area\View::calculateDependencies().
-    $this->assertIdentical(['config' => ['views.view.test_simple_argument']], $view->getDependencies());
-
-    $this->executeView($view);
-    $output = $view->render();
-    $output = $renderer->renderRoot($output);
-    $this->assertTrue(strpos($output, 'js-view-dom-id-' . $view->dom_id) !== FALSE, 'The test view is correctly embedded.');
-    $view->destroy();
-
-    $view->setArguments(array(27));
-    $this->executeView($view);
-    $output = $view->render();
-    $output = $renderer->renderRoot($output);
-    $this->assertTrue(strpos($output, 'John') === FALSE, 'The test view is correctly embedded with inherited arguments.');
-    $this->assertTrue(strpos($output, 'George') !== FALSE, 'The test view is correctly embedded with inherited arguments.');
-    $view->destroy();
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/ArgumentDateTest.php b/core/modules/views/src/Tests/Handler/ArgumentDateTest.php
deleted file mode 100644
index d0939b1..0000000
--- a/core/modules/views/src/Tests/Handler/ArgumentDateTest.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\ArgumentDateTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core date argument handlers.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\argument\Date
- */
-class ArgumentDateTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_argument_date');
-
-  /**
-   * Stores the column map for this testCase.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'id' => 'id',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewsData() {
-    $data = parent::viewsData();
-
-    $date_plugins = array(
-      'date_fulldate',
-      'date_day',
-      'date_month',
-      'date_week',
-      'date_year',
-      'date_year_month',
-    );
-    foreach ($date_plugins as $plugin_id) {
-      $data['views_test_data'][$plugin_id] = $data['views_test_data']['created'];
-      $data['views_test_data'][$plugin_id]['real field'] = 'created';
-      $data['views_test_data'][$plugin_id]['argument']['id'] = $plugin_id;
-    }
-    return $data;
-  }
-
-  /**
-   * Tests the CreatedFullDate handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedFullDate
-   */
-  public function testCreatedFullDateHandler() {
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('default');
-    $this->executeView($view, array('20000102'));
-    $expected = array();
-    $expected[] = array('id' => 2);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('default');
-    $this->executeView($view, array('20000101'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('default');
-    $this->executeView($view, array('20001023'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-  }
-
-  /**
-   * Tests the Day handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedDay
-   */
-  public function testDayHandler() {
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('embed_1');
-    $this->executeView($view, array('02'));
-    $expected = array();
-    $expected[] = array('id' => 2);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_1');
-    $this->executeView($view, array('01'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_1');
-    $this->executeView($view, array('23'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-  }
-
-  /**
-   * Tests the Month handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedMonth
-   */
-  public function testMonthHandler() {
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('embed_2');
-    $this->executeView($view, array('01'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
-    $expected[] = array('id' => 3);
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_2');
-    $this->executeView($view, array('12'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-  }
-
-  /**
-   * Tests the Week handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedWeek
-   */
-  public function testWeekHandler() {
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 9, 26, 2008)))
-      ->condition('id', 1)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 2, 29, 2004)))
-      ->condition('id', 2)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2000)))
-      ->condition('id', 3)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 10, 2000)))
-      ->condition('id', 4)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 2, 1, 2000)))
-      ->condition('id', 5)
-      ->execute();
-
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('embed_3');
-    // Check the week calculation for a leap year.
-    // @see http://en.wikipedia.org/wiki/ISO_week_date#Calculation
-    $this->executeView($view, array('39'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_3');
-    // Check the week calculation for the 29th of February in a leap year.
-    // @see http://en.wikipedia.org/wiki/ISO_week_date#Calculation
-    $this->executeView($view, array('09'));
-    $expected = array();
-    $expected[] = array('id' => 2);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_3');
-    // The first jan 2000 was still in the last week of the previous year.
-    $this->executeView($view, array('52'));
-    $expected = array();
-    $expected[] = array('id' => 3);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_3');
-    $this->executeView($view, array('02'));
-    $expected = array();
-    $expected[] = array('id' => 4);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_3');
-    $this->executeView($view, array('05'));
-    $expected = array();
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_3');
-    $this->executeView($view, array('23'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-  }
-
-  /**
-   * Tests the Year handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedYear
-   */
-  public function testYearHandler() {
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
-      ->condition('id', 3)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
-      ->condition('id', 4)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
-      ->condition('id', 5)
-      ->execute();
-
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('embed_4');
-    $this->executeView($view, array('2000'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_4');
-    $this->executeView($view, array('2001'));
-    $expected = array();
-    $expected[] = array('id' => 3);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_4');
-    $this->executeView($view, array('2002'));
-    $expected = array();
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_4');
-    $this->executeView($view, array('23'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-  }
-
-  /**
-   * Tests the YearMonth handler.
-   *
-   * @see \Drupal\node\Plugin\views\argument\CreatedYearMonth
-   */
-  public function testYearMonthHandler() {
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
-      ->condition('id', 3)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
-      ->condition('id', 4)
-      ->execute();
-
-    $this->container->get('database')->update('views_test_data')
-      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
-      ->condition('id', 5)
-      ->execute();
-
-    $view = Views::getView('test_argument_date');
-    $view->setDisplay('embed_5');
-    $this->executeView($view, array('200001'));
-    $expected = array();
-    $expected[] = array('id' => 1);
-    $expected[] = array('id' => 2);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_5');
-    $this->executeView($view, array('200101'));
-    $expected = array();
-    $expected[] = array('id' => 3);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_5');
-    $this->executeView($view, array('200104'));
-    $expected = array();
-    $expected[] = array('id' => 4);
-    $expected[] = array('id' => 5);
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-    $view->destroy();
-
-    $view->setDisplay('embed_5');
-    $this->executeView($view, array('201301'));
-    $expected = array();
-    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
-  }
-}
diff --git a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
deleted file mode 100644
index 6f8be53..0000000
--- a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\ArgumentNullTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\argument\NullArgument handler.
- *
- * @group views
- */
-class ArgumentNullTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['id']['argument']['id'] = 'null';
-
-    return $data;
-  }
-
-  public function testAreaText() {
-    // Test validation
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a null argument.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'null' => array(
-        'id' => 'null',
-        'table' => 'views',
-        'field' => 'null',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    // Make sure that the argument is not validated yet.
-    unset($view->argument['null']->argument_validated);
-    $this->assertTrue($view->argument['null']->validateArgument(26));
-    // test must_not_be option.
-    unset($view->argument['null']->argument_validated);
-    $view->argument['null']->options['must_not_be'] = TRUE;
-    $this->assertFalse($view->argument['null']->validateArgument(26), 'must_not_be returns FALSE, if there is an argument');
-    unset($view->argument['null']->argument_validated);
-    $this->assertTrue($view->argument['null']->validateArgument(NULL), 'must_not_be returns TRUE, if there is no argument');
-
-    // Test execution.
-    $view->destroy();
-    $view->setDisplay();
-
-    // Add a argument, which has null as handler.
-    $view->displayHandlers->get('default')->overrideOption('arguments', array(
-      'id' => array(
-        'id' => 'id',
-        'table' => 'views_test_data',
-        'field' => 'id',
-      ),
-    ));
-
-    $this->executeView($view, array(26));
-
-    // The argument should be ignored, so every result should return.
-    $this->assertEqual(5, count($view->result));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/EntityTestViewsFieldAccessTest.php b/core/modules/views/src/Tests/Handler/EntityTestViewsFieldAccessTest.php
deleted file mode 100644
index 1e2704b..0000000
--- a/core/modules/views/src/Tests/Handler/EntityTestViewsFieldAccessTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\EntityTestViewsFieldAccessTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-use Drupal\entity_test\Entity\EntityTest;
-
-/**
- * Tests base field access in Views for the entity_test entity.
- *
- * @group entity_test
- */
-class EntityTestViewsFieldAccessTest extends FieldFieldAccessTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('entity_test');
-  }
-
-  public function testEntityTestFields() {
-    $entity_test = EntityTest::create([
-      'name' => 'test entity name',
-    ]);
-    $entity_test->save();
-
-    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
-
-    $this->assertFieldAccess('entity_test', 'id', $entity_test->id());
-    $this->assertFieldAccess('entity_test', 'langcode', $entity_test->language()->getName());
-    $this->assertFieldAccess('entity_test', 'name', $entity_test->getName());
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
deleted file mode 100644
index da32482..0000000
--- a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldBooleanTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\Boolean handler.
- *
- * @group views
- */
-class FieldBooleanTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  function dataSet() {
-    // Use default dataset but remove the age from john and paul
-    $data = parent::dataSet();
-    $data[0]['age'] = 0;
-    $data[3]['age'] = 0;
-    return $data;
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['age']['field']['id'] = 'boolean';
-    return $data;
-  }
-
-  public function testFieldBoolean() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    // This is john, which has no age, there are no custom formats defined, yet.
-    $this->assertEqual(t('No'), $view->field['age']->advancedRender($view->result[0]));
-    $this->assertEqual(t('Yes'), $view->field['age']->advancedRender($view->result[1]));
-
-    // Reverse the output.
-    $view->field['age']->options['not'] = TRUE;
-    $this->assertEqual(t('Yes'), $view->field['age']->advancedRender($view->result[0]));
-    $this->assertEqual(t('No'), $view->field['age']->advancedRender($view->result[1]));
-
-    unset($view->field['age']->options['not']);
-
-    // Use another output format.
-    $view->field['age']->options['type'] = 'true-false';
-    $this->assertEqual(t('False'), $view->field['age']->advancedRender($view->result[0]));
-    $this->assertEqual(t('True'), $view->field['age']->advancedRender($view->result[1]));
-
-    // test awesome unicode.
-    $view->field['age']->options['type'] = 'unicode-yes-no';
-    $this->assertEqual('✖', $view->field['age']->advancedRender($view->result[0]));
-    $this->assertEqual('✔', $view->field['age']->advancedRender($view->result[1]));
-
-    // Set a custom output format.
-    $view->field['age']->formats['test'] = array(t('Test-True'), t('Test-False'));
-    $view->field['age']->options['type'] = 'test';
-    $this->assertEqual(t('Test-False'), $view->field['age']->advancedRender($view->result[0]));
-    $this->assertEqual(t('Test-True'), $view->field['age']->advancedRender($view->result[1]));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
deleted file mode 100644
index 4561ad6..0000000
--- a/core/modules/views/src/Tests/Handler/FieldCounterTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldCounterTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the Drupal\views\Plugin\views\field\Counter handler.
- *
- * @group views
- */
-class FieldCounterTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  function testSimple() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'counter' => array(
-        'id' => 'counter',
-        'table' => 'views',
-        'field' => 'counter',
-        'relationship' => 'none',
-      ),
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-      ),
-    ));
-    $view->preview();
-
-    $counter = $view->style_plugin->getField(0, 'counter');
-    $this->assertEqual($counter, '1', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
-    $counter = $view->style_plugin->getField(1, 'counter');
-    $this->assertEqual($counter, '2', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
-    $counter = $view->style_plugin->getField(2, 'counter');
-    $this->assertEqual($counter, '3', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
-    $view->destroy();
-    $view->storage->invalidateCaches();
-
-    $view->setDisplay();
-    $rand_start = rand(5, 10);
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'counter' => array(
-        'id' => 'counter',
-        'table' => 'views',
-        'field' => 'counter',
-        'relationship' => 'none',
-        'counter_start' => $rand_start
-      ),
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-      ),
-    ));
-    $view->preview();
-
-    $counter = $view->style_plugin->getField(0, 'counter');
-    $expected_number = 0 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
-    $counter = $view->style_plugin->getField(1, 'counter');
-    $expected_number = 1 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
-    $counter = $view->style_plugin->getField(2, 'counter');
-    $expected_number = 2 + $rand_start;
-    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
-  }
-
-  // @TODO: Write tests for pager.
-  function testPager() {
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldCustomTest.php b/core/modules/views/src/Tests/Handler/FieldCustomTest.php
deleted file mode 100644
index cc3d92b..0000000
--- a/core/modules/views/src/Tests/Handler/FieldCustomTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldCustomTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Render\RenderContext;
-use Drupal\views\Plugin\views\PluginBase;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\Custom handler.
- *
- * @group views
- */
-class FieldCustomTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * {@inheritdoc}
-   */
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['name']['field']['id'] = 'custom';
-    return $data;
-  }
-
-  /**
-   * Ensure that custom fields work and doesn't escape unnecessary markup.
-   */
-  public function testFieldCustom() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Alter the text of the field to a random string.
-    $random = '<div>' . $this->randomMachineName() . '</div>';
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'alter' => array(
-          'text' => $random,
-        ),
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $this->assertEqual($random, $view->style_plugin->getField(0, 'name'));
-  }
-
-  /**
-   * Ensure that custom fields can use tokens.
-   */
-  public function testFieldCustomTokens() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', [
-      'age' => [
-        'id' => 'age',
-        'exclude' => TRUE,
-        'table' => 'views_test_data',
-        'field' => 'age',
-      ],
-      'name' => [
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'alter' => [
-          'text' => 'Amount of kittens: {{ age }}',
-        ],
-      ],
-    ]);
-
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    $preview = $view->preview();
-    $output = $renderer->renderRoot($preview);
-
-    $expected_text = 'Amount of kittens: ' . $view->style_plugin->getField(0, 'age');
-    $this->assertTrue(strpos((string) $output, $expected_text), 'The views token has been successfully replaced.');
-  }
-
-  /**
-   * Ensure that custom field content is XSS filtered.
-   */
-  public function testCustomFieldXss() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Alter the text of the field to include XSS.
-    $text = '<script>alert("kittens")</script>';
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'alter' => array(
-          'text' => $text,
-        ),
-      ),
-    ));
-    $this->executeView($view);
-    $this->assertEqual(Xss::filter($text), $view->style_plugin->getField(0, 'name'));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldDateTest.php b/core/modules/views/src/Tests/Handler/FieldDateTest.php
deleted file mode 100644
index 004118f..0000000
--- a/core/modules/views/src/Tests/Handler/FieldDateTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldDateTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\Date handler.
- *
- * @group views
- */
-class FieldDateTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * {@inheritdoc}
-   */
-  public function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['destroyed'] = array(
-      'description' => "The destruction date of this record",
-      'type' => 'int',
-      'unsigned' => TRUE,
-      'not null' => FALSE,
-      'default' => 0,
-    );
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['created']['field']['id'] = 'date';
-    $data['views_test_data']['destroyed'] = array(
-      'title' => 'Destroyed',
-      'help' => 'Date in future this will be destroyed.',
-      'field' => array('id' => 'date'),
-      'argument' => array('id' => 'date'),
-      'filter' => array('id' => 'date'),
-      'sort' => array('id' => 'date'),
-    );
-    return $data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function dataSet() {
-    $datas = parent::dataSet();
-    foreach ($datas as $i => $data) {
-      $datas[$i]['destroyed'] = gmmktime(0, 0, 0, 1, 1, 2050);
-    }
-    return $datas;
-  }
-
-  /**
-   * Sets up functional test of the views date field.
-   */
-  public function testFieldDate() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'created' => array(
-        'id' => 'created',
-        'table' => 'views_test_data',
-        'field' => 'created',
-        'relationship' => 'none',
-        // ISO 8601 format @see http://php.net/manual/en/function.date.php
-        'custom_date_format' => 'c',
-      ),
-      'destroyed' => array(
-        'id' => 'destroyed',
-        'table' => 'views_test_data',
-        'field' => 'destroyed',
-        'relationship' => 'none',
-        'custom_date_format' => 'c',
-      ),
-    ));
-    $time = gmmktime(0, 0, 0, 1, 1, 2000);
-
-    $this->executeView($view);
-
-    $timezones = array(
-      NULL,
-      'UTC',
-      'America/New_York',
-    );
-
-    // Check each date/time in various timezones.
-    foreach ($timezones as $timezone) {
-      $dates = array(
-        'short' => format_date($time, 'short', '', $timezone),
-        'medium' => format_date($time, 'medium', '', $timezone),
-        'long' => format_date($time, 'long', '', $timezone),
-        'custom' => format_date($time, 'custom', 'c', $timezone),
-        'fallback' => format_date($time, 'fallback', '', $timezone),
-        'html_date' => format_date($time, 'html_date', '', $timezone),
-        'html_datetime' => format_date($time, 'html_datetime', '', $timezone),
-        'html_month' => format_date($time, 'html_month', '', $timezone),
-        'html_time' => format_date($time, 'html_time', '', $timezone),
-        'html_week' => format_date($time, 'html_week', '', $timezone),
-        'html_year' => format_date($time, 'html_year', '', $timezone),
-        'html_yearless_date' => format_date($time, 'html_yearless_date', '', $timezone),
-      );
-      $this->assertRenderedDatesEqual($view, $dates, $timezone);
-    }
-
-    // Check times in the past.
-    $time_since = $this->container->get('date.formatter')->formatTimeDiffSince($time);
-    $intervals = array(
-      'raw time ago' => $time_since,
-      'time ago' => t('%time ago', array('%time' => $time_since)),
-      'raw time span' => $time_since,
-      'inverse time span' => -$time_since,
-      'time span' => t('%time ago', array('%time' => $time_since)),
-    );
-    $this->assertRenderedDatesEqual($view, $intervals);
-
-    // Check times in the future.
-    $time = gmmktime(0, 0, 0, 1, 1, 2050);
-    $formatted = $this->container->get('date.formatter')->formatTimeDiffUntil($time);
-    $intervals = array(
-      'raw time span' => -$formatted,
-      'time span' => t('%time hence', array(
-        '%time' => $formatted,
-      )),
-    );
-    $this->assertRenderedFutureDatesEqual($view, $intervals);
-  }
-
-  /**
-   * Asserts properly formatted display against 'created' field in view.
-   *
-   * @param mixed $view
-   *   View to be tested.
-   * @param array $map
-   *   Data map.
-   * @param null $timezone
-   *   Optional timezone.
-   */
-  protected function assertRenderedDatesEqual($view, $map, $timezone = NULL) {
-    foreach ($map as $date_format => $expected_result) {
-      $view->field['created']->options['date_format'] = $date_format;
-      $t_args = array(
-        '%value' => $expected_result,
-        '%format' => $date_format,
-      );
-      if (isset($timezone)) {
-        $t_args['%timezone'] = $timezone;
-        $message = t('Value %value in %format format for timezone %timezone matches.', $t_args);
-        $view->field['created']->options['timezone'] = $timezone;
-      }
-      else {
-        $message = t('Value %value in %format format matches.', $t_args);
-      }
-      $actual_result = $view->field['created']->advancedRender($view->result[0]);
-      $this->assertEqual($expected_result, $actual_result, $message);
-    }
-  }
-
-  /**
-   * Asserts properly formatted display against 'destroyed' field in view.
-   *
-   * @param mixed $view
-   *   View to be tested.
-   * @param array $map
-   *   Data map.
-   */
-  protected function assertRenderedFutureDatesEqual($view, $map) {
-    foreach ($map as $format => $result) {
-      $view->field['destroyed']->options['date_format'] = $format;
-      $view_result = $view->field['destroyed']->advancedRender($view->result[0]);
-      $t_args = array(
-        '%value' => $result,
-        '%format' => $format,
-        '%actual' => $view_result,
-      );
-      $message = t('Value %value in %format matches %actual', $t_args);
-      $this->assertEqual($view_result, $result, $message);
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php b/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php
deleted file mode 100644
index 0ab8409..0000000
--- a/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldEntityLinkTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Core\Session\AccountInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\simpletest\UserCreationTrait;
-use Drupal\user\Entity\Role;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\EntityOperations handler.
- *
- * @group views
- */
-class FieldEntityLinkTest extends ViewKernelTestBase {
-
-  use UserCreationTrait;
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_entity_test_link');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user', 'entity_test');
-
-  /**
-   * An admin user account.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpFixtures() {
-    parent::setUpFixtures();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test');
-    $this->installConfig(['user']);
-
-    // Create some test entities.
-    for ($i = 0; $i < 5; $i++) {
-      EntityTest::create(['name' => $this->randomString()])->save();
-    }
-
-    // Create and admin user.
-    $this->adminUser = $this->createUser(['view test entity'], FALSE, TRUE);
-
-    Role::load(AccountInterface::ANONYMOUS_ROLE)
-      ->grantPermission('view test entity')
-      ->save();
-  }
-
-  /**
-   * Tests entity link fields.
-   */
-  public function testEntityLink() {
-    // Anonymous users cannot see edit/delete links.
-    $expected_results = ['canonical' => TRUE, 'edit-form' => FALSE, 'delete-form' => FALSE];
-    $this->doTestEntityLink(\Drupal::currentUser(), $expected_results);
-
-    // Admin users cannot see all links.
-    $expected_results = ['canonical' => TRUE, 'edit-form' => TRUE, 'delete-form' => TRUE];
-    $this->doTestEntityLink($this->adminUser, $expected_results);
-  }
-
-  /**
-   * Tests whether entity links behave as expected.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The user account to be used to run the test;
-   * @param bool[] $expected_results
-   *   An associative array of expected results keyed by link template name.
-   */
-  protected function doTestEntityLink(AccountInterface $account, $expected_results) {
-    \Drupal::currentUser()->setAccount($account);
-
-    $view = Views::getView('test_entity_test_link');
-    $view->preview();
-
-    $info = [
-      'canonical' => [
-        'label' => 'View entity test',
-        'field_id' => 'view_entity_test',
-        'destination' => FALSE,
-      ],
-      'edit-form' => [
-        'label' => 'Edit entity test',
-        'field_id' => 'edit_entity_test',
-        'destination' => TRUE,
-      ],
-      'delete-form' => [
-        'label' => 'Delete entity test',
-        'field_id' => 'delete_entity_test',
-        'destination' => TRUE,
-      ],
-    ];
-
-    $index = 0;
-    foreach (EntityTest::loadMultiple() as $entity) {
-      foreach ($expected_results as $template => $expected_result) {
-        $expected_link = '';
-        if ($expected_result) {
-          $path = $entity->url($template);
-          $destination = $info[$template]['destination'] ? '?destination=/' : '';
-          $expected_link = '<a href="' . $path . $destination . '" hreflang="en">' . $info[$template]['label'] . '</a>';
-        }
-        $link = $view->style_plugin->getField($index, $info[$template]['field_id']);
-        $this->assertEqual($link, $expected_link);
-      }
-      $index++;
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php b/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
deleted file mode 100644
index 48bd00c..0000000
--- a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldFieldAccessTestBase.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\user\Entity\Role;
-use Drupal\user\Entity\User;
-use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Provides a base class for base field access in views.
- */
-abstract class FieldFieldAccessTestBase extends ViewKernelTestBase {
-
-  /**
-   * Stores an user entity with access to fields.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $userWithAccess;
-
-  /**
-   * Stores an user entity without access to fields.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $userWithoutAccess;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('user');
-
-    $role_with_access = Role::create([
-      'id' => 'with_access',
-      'permissions' => ['view test entity field'],
-    ]);
-    $role_with_access->save();
-    $role_without_access = Role::create([
-      'id' => 'without_access',
-      'permissions' => [],
-    ]);
-    $role_without_access->save();
-
-    $this->userWithAccess = User::create([
-      'name' => $this->randomMachineName(),
-      'roles' => [$role_with_access->id()],
-    ]);
-    $this->userWithAccess->save();
-    $this->userWithoutAccess = User::create([
-      'name' => $this->randomMachineName(),
-      'roles' => [$role_without_access->id()],
-    ]);
-    $this->userWithoutAccess->save();
-  }
-
-  /**
-   * Checks views field access for a given entity type and field name.
-   *
-   * To use this method, set up an entity of type $entity_type_id, with field
-   * $field_name. Create an entity instance that contains content $field_content
-   * in that field.
-   *
-   * This method will check that a user with permission can see the content in a
-   * view, and a user without access permission on that field cannot.
-   *
-   * @param string $entity_type_id
-   *   The entity type ID.
-   * @param string $field_name
-   *   The field name.
-   * @param string $field_content
-   *   The expected field content.
-   */
-  protected function assertFieldAccess($entity_type_id, $field_name, $field_content) {
-    \Drupal::state()->set('views_field_access_test-field', $field_name);
-
-    $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
-    $view_id = $this->randomMachineName();
-    $data_table = $entity_type->getDataTable();
-    // Use the data table as long as the field is not 'uuid'. This is the only
-    // column that can only be obtained from the base table.
-    $base_table = ($data_table && ($field_name !== 'uuid')) ? $data_table : $entity_type->getBaseTable();
-    $entity = View::create([
-      'id' => $view_id,
-      'base_table' => $base_table,
-      'display' => [
-        'default' => [
-          'display_plugin' => 'default',
-          'id' => 'default',
-          'display_options' => [
-            'fields' => [
-              $field_name => [
-                'table' => $base_table,
-                'field' => $field_name,
-                'id' => $field_name,
-                'plugin_id' => 'field',
-              ],
-            ],
-          ],
-        ],
-      ],
-    ]);
-    $entity->save();
-
-    /** @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
-    $account_switcher = \Drupal::service('account_switcher');
-
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $account_switcher->switchTo($this->userWithAccess);
-    $executable = Views::getView($view_id);
-    $build = $executable->preview();
-    $this->setRawContent($renderer->renderRoot($build));
-
-    $this->assertText($field_content);
-    $this->assertTrue(isset($executable->field[$field_name]));
-
-    $account_switcher->switchTo($this->userWithoutAccess);
-    $executable = Views::getView($view_id);
-    $build = $executable->preview();
-    $this->setRawContent($renderer->renderRoot($build));
-
-    $this->assertNoText($field_content);
-    $this->assertFalse(isset($executable->field[$field_name]));
-
-    \Drupal::state()->delete('views_field_access_test-field');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldTest.php b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
deleted file mode 100644
index aa2d1df..0000000
--- a/core/modules/views/src/Tests/Handler/FieldFieldTest.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldFieldTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\user\Entity\User;
-use Drupal\views\Plugin\views\field\Field;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Provides some integration tests for the Field handler.
- *
- * @see \Drupal\views\Plugin\views\field\Field
- * @group views
- */
-class FieldFieldTest extends ViewKernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field', 'entity_test', 'user', 'views_test_formatter'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $testViews = ['test_field_field_test', 'test_field_alias_test', 'test_field_field_complex_test', 'test_field_field_attachment_test', 'test_field_field_revision_test', 'test_field_field_revision_complex_test'];
-
-  /**
-   * The stored test entities.
-   *
-   * @var \Drupal\entity_test\Entity\EntityTest[]
-   */
-  protected $entities;
-
-  /**
-   * The stored revisionable test entities.
-   *
-   * @var \Drupal\entity_test\Entity\EntityTestRev[]
-   */
-  protected $entityRevision;
-
-  /**
-   * Stores a couple of test users.
-   *
-   * @var \Drupal\user\UserInterface[]
-   */
-  protected $testUsers;
-
-  /**
-   * The admin user.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test_rev');
-
-    // Bypass any field access.
-    $this->adminUser = User::create(['name' => $this->randomString()]);
-    $this->adminUser->save();
-    $this->container->get('current_user')->setAccount($this->adminUser);
-
-    $this->testUsers = [];
-    for ($i = 0; $i < 5; $i++) {
-      $this->testUsers[$i] = User::create([
-        'name' => 'test ' . $i,
-        'timezone' => User::getAllowedTimezones()[$i],
-        'created' => REQUEST_TIME - rand(0, 3600)
-      ]);
-      $this->testUsers[$i]->save();
-    }
-
-    // Setup a field storage and field, but also change the views data for the
-    // entity_test entity type.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'field_test',
-      'type' => 'integer',
-      'entity_type' => 'entity_test',
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    ]);
-    $field->save();
-
-    $field_storage_multiple = FieldStorageConfig::create([
-      'field_name' => 'field_test_multiple',
-      'type' => 'integer',
-      'entity_type' => 'entity_test',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ]);
-    $field_storage_multiple->save();
-
-    $field_multiple = FieldConfig::create([
-      'field_name' => 'field_test_multiple',
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-    ]);
-    $field_multiple->save();
-
-    $random_number = (string) 30856;
-    $random_number_multiple = (string) 1370359990;
-    for ($i = 0; $i < 5; $i++) {
-      $this->entities[$i] = $entity = EntityTest::create([
-        'bundle' => 'entity_test',
-        'name' => 'test ' . $i,
-        'field_test' => $random_number[$i],
-        'field_test_multiple' => [$random_number_multiple[$i * 2], $random_number_multiple[$i * 2 + 1]],
-        'user_id' => $this->testUsers[$i]->id(),
-      ]);
-      $entity->save();
-    }
-
-    // Setup some test data for entities with revisions.
-    // We are testing both base field revisions and field config revisions.
-    $field_storage = FieldStorageConfig::create([
-      'field_name' => 'field_test',
-      'type' => 'integer',
-      'entity_type' => 'entity_test_rev',
-    ]);
-    $field_storage->save();
-
-    $field = FieldConfig::create([
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test_rev',
-      'bundle' => 'entity_test_rev',
-    ]);
-    $field->save();
-
-    $field_storage_multiple = FieldStorageConfig::create([
-      'field_name' => 'field_test_multiple',
-      'type' => 'integer',
-      'entity_type' => 'entity_test_rev',
-      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
-    ]);
-    $field_storage_multiple->save();
-
-    $field_multiple = FieldConfig::create([
-      'field_name' => 'field_test_multiple',
-      'entity_type' => 'entity_test_rev',
-      'bundle' => 'entity_test_rev',
-    ]);
-    $field_multiple->save();
-
-    $this->entityRevision = [];
-    $this->entityRevision[0] = $entity = EntityTestRev::create([
-      'name' => 'base value',
-      'field_test' => 1,
-      'field_test_multiple' => [1, 3, 7],
-      'user_id' =>  $this->testUsers[0]->id(),
-    ]);
-    $entity->save();
-    $original_entity = clone $entity;
-
-    $entity = clone $original_entity;
-    $entity->setNewRevision(TRUE);
-    $entity->name->value = 'revision value1';
-    $entity->field_test->value = 2;
-    $entity->field_test_multiple[0]->value = 0;
-    $entity->field_test_multiple[1]->value = 3;
-    $entity->field_test_multiple[2]->value = 5;
-    $entity->user_id->target_id = $this->testUsers[1]->id();
-    $entity->save();
-    $this->entityRevision[1] = $entity;
-
-    $entity = clone $original_entity;
-    $entity->setNewRevision(TRUE);
-    $entity->name->value = 'revision value2';
-    $entity->field_test->value = 3;
-    $entity->field_test_multiple[0]->value = 9;
-    $entity->field_test_multiple[1]->value = 9;
-    $entity->field_test_multiple[2]->value = 9;
-    $entity->user_id->target_id = $this->testUsers[2]->id();
-    $entity->save();
-    $this->entityRevision[2] = $entity;
-
-    $this->entityRevision[3] = $entity = EntityTestRev::create([
-      'name' => 'next entity value',
-      'field_test' => 4,
-      'field_test_multiple' => [2, 9, 9],
-      'user_id' => $this->testUsers[3]->id(),
-    ]);
-    $entity->save();
-
-    \Drupal::state()->set('entity_test.views_data', [
-      'entity_test' => [
-        'id' => [
-          'field' => [
-            'id' => 'field',
-          ],
-        ],
-      ],
-      'entity_test_rev_revision' => [
-        'id' => [
-          'field' => [
-            'id' => 'field',
-          ],
-        ],
-      ],
-    ]);
-
-    Views::viewsData()->clear();
-  }
-
-  /**
-   * Tests the result of a view with base fields and configurable fields.
-   */
-  public function testSimpleExecute() {
-    $executable = Views::getView('test_field_field_test');
-    $executable->execute();
-
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['field_test'] instanceof Field);
-
-    $this->assertIdenticalResultset($executable,
-      [
-        ['id' => 1, 'field_test' => 3],
-        ['id' => 2, 'field_test' => 0],
-        ['id' => 3, 'field_test' => 8],
-        ['id' => 4, 'field_test' => 5],
-        ['id' => 5, 'field_test' => 6],
-      ],
-      ['id' => 'id', 'field_test' => 'field_test']
-    );
-  }
-
-  /**
-   * Tests the output of a view with base fields and configurable fields.
-   */
-  public function testSimpleRender() {
-    $executable = Views::getView('test_field_field_test');
-    $executable->execute();
-
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual('3', $executable->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual('2', $executable->getStyle()->getField(1, 'id'));
-    // @todo Switch this assertion to assertIdentical('', ...) when
-    //   https://www.drupal.org/node/2488006 gets fixed.
-    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test'));
-    $this->assertEqual('3', $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual('8', $executable->getStyle()->getField(2, 'field_test'));
-    $this->assertEqual('4', $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual('5', $executable->getStyle()->getField(3, 'field_test'));
-    $this->assertEqual('5', $executable->getStyle()->getField(4, 'id'));
-    $this->assertEqual('6', $executable->getStyle()->getField(4, 'field_test'));
-  }
-
-  /**
-   * Tests that formatter's #attached assets are correctly preserved.
-   *
-   * @see \Drupal\views_test_formatter\Plugin\Field\FieldFormatter\AttachmentTestFormatter::viewElements()
-   */
-  public function testAttachedRender() {
-    $executable = Views::getView('test_field_field_attachment_test');
-    $executable->execute();
-
-    // Check that the attachments added by AttachmentTestFormatter have been
-    // preserved in the render array.
-    $render = $executable->display_handler->render();
-    $expected_attachments = [
-      'library' => [
-        'views/views.module'
-      ]
-    ];
-    foreach ($this->entities as $entity) {
-      $expected_attachments['library'][] = 'foo/fake_library';
-      $expected_attachments['drupalSettings']['AttachmentIntegerFormatter'][$entity->id()] = $entity->id();
-    }
-    $this->assertEqual($expected_attachments, $render['#attached']);
-  }
-
-  /**
-   * Tests the result of a view with complex field configuration.
-   *
-   * A complex field configuration contains multiple times the same field, with
-   * different delta limit / offset.
-   */
-  public function testFieldAlias() {
-    $executable = Views::getView('test_field_alias_test');
-    $executable->execute();
-
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['name'] instanceof Field);
-    $this->assertTrue($executable->field['name_alias'] instanceof Field);
-
-    $this->assertIdenticalResultset($executable,
-      [
-        ['id' => 1, 'name' => 'test 0', 'name_alias' => 'test 0'],
-        ['id' => 2, 'name' => 'test 1', 'name_alias' => 'test 1'],
-        ['id' => 3, 'name' => 'test 2', 'name_alias' => 'test 2'],
-        ['id' => 4, 'name' => 'test 3', 'name_alias' => 'test 3'],
-        ['id' => 5, 'name' => 'test 4', 'name_alias' => 'test 4'],
-      ],
-      ['id' => 'id', 'name' => 'name', 'name_alias' => 'name_alias']
-    );
-  }
-
-  /**
-   * Tests the result of a view with complex field configuration.
-   *
-   * A complex field configuration contains multiple times the same field, with
-   * different delta limit / offset.
-   */
-  public function testFieldAliasRender() {
-    $executable = Views::getView('test_field_alias_test');
-    $executable->execute();
-
-    for ($i = 0; $i < 5; $i++) {
-      $this->assertEqual((string) ($i + 1), $executable->getStyle()->getField($i, 'id'));
-      $this->assertEqual('test ' . $i, $executable->getStyle()->getField($i, 'name'));
-      $entity = EntityTest::load($i + 1);
-      $this->assertEqual('<a href="' . $entity->url() . '" hreflang="' . $entity->language()->getId() . '">test ' . $i . '</a>', (string) $executable->getStyle()->getField($i, 'name_alias'));
-    }
-  }
-
-  /**
-   * Tests the result of a view with complex field configuration.
-   *
-   * A complex field configuration contains multiple times the same field, with
-   * different delta limit / offset.
-   */
-  public function testComplexExecute() {
-    $executable = Views::getView('test_field_field_complex_test');
-    $executable->execute();
-
-    $timezones = [];
-    foreach ($this->testUsers as $user) {
-      $timezones[] = $user->getTimeZone();
-    }
-
-    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
-    $this->assertTrue($executable->field['timezone'] instanceof Field);
-
-    $this->assertIdenticalResultset($executable,
-      [
-        ['timezone' => $timezones[0], 'field_test_multiple' => [1, 3], 'field_test_multiple_1' => [1, 3], 'field_test_multiple_2' => [1, 3]],
-        ['timezone' => $timezones[1], 'field_test_multiple' => [7, 0], 'field_test_multiple_1' => [7, 0], 'field_test_multiple_2' => [7, 0]],
-        ['timezone' => $timezones[2], 'field_test_multiple' => [3, 5], 'field_test_multiple_1' => [3, 5], 'field_test_multiple_2' => [3, 5]],
-        ['timezone' => $timezones[3], 'field_test_multiple' => [9, 9], 'field_test_multiple_1' => [9, 9], 'field_test_multiple_2' => [9, 9]],
-        ['timezone' => $timezones[4], 'field_test_multiple' => [9, 0], 'field_test_multiple_1' => [9, 0], 'field_test_multiple_2' => [9, 0]],
-      ],
-      ['timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
-    );
-  }
-
-  /**
-   * Tests the output of a view with complex field configuration.
-   */
-  public function testComplexRender() {
-    $executable = Views::getView('test_field_field_complex_test');
-    $executable->execute();
-    $date_formatter = \Drupal::service('date.formatter');
-
-    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
-    $this->assertEqual("1, 3", $executable->getStyle()->getField(0, 'field_test_multiple'));
-    $this->assertEqual("1", $executable->getStyle()->getField(0, 'field_test_multiple_1'));
-    $this->assertEqual("3", $executable->getStyle()->getField(0, 'field_test_multiple_2'));
-    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(0, 'created'));
-    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(0, 'created_1'));
-    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(0, 'created_2'));
-
-    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
-    $this->assertEqual("7, 0", $executable->getStyle()->getField(1, 'field_test_multiple'));
-    $this->assertEqual("7", $executable->getStyle()->getField(1, 'field_test_multiple_1'));
-    $this->assertEqual("0", $executable->getStyle()->getField(1, 'field_test_multiple_2'));
-    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(1, 'created'));
-    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(1, 'created_1'));
-    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(1, 'created_2'));
-
-    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
-    $this->assertEqual("3, 5", $executable->getStyle()->getField(2, 'field_test_multiple'));
-    $this->assertEqual("3", $executable->getStyle()->getField(2, 'field_test_multiple_1'));
-    $this->assertEqual("5", $executable->getStyle()->getField(2, 'field_test_multiple_2'));
-    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(2, 'created'));
-    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(2, 'created_1'));
-    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(2, 'created_2'));
-
-    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
-    $this->assertEqual("9, 9", $executable->getStyle()->getField(3, 'field_test_multiple'));
-    $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_1'));
-    $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_2'));
-    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(3, 'created'));
-    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(3, 'created_1'));
-    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(3, 'created_2'));
-
-    $this->assertEqual($this->testUsers[4]->getTimeZone(), $executable->getStyle()->getField(4, 'timezone'));
-    $this->assertEqual("9, 0", $executable->getStyle()->getField(4, 'field_test_multiple'));
-    $this->assertEqual("9", $executable->getStyle()->getField(4, 'field_test_multiple_1'));
-    $this->assertEqual("0", $executable->getStyle()->getField(4, 'field_test_multiple_2'));
-    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(4, 'created'));
-    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(4, 'created_1'));
-    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(4, 'created_2'));
-  }
-
-  /**
-   * Tests the revision result.
-   */
-  public function testRevisionExecute() {
-    $executable = Views::getView('test_field_field_revision_test');
-    $executable->execute();
-
-    $this->assertTrue($executable->field['name'] instanceof Field);
-    $this->assertTrue($executable->field['field_test'] instanceof Field);
-
-    $this->assertIdenticalResultset($executable,
-      [
-        ['id' => 1, 'field_test' => 1, 'revision_id' => 1, 'name' => 'base value'],
-        ['id' => 1, 'field_test' => 2, 'revision_id' => 2, 'name' => 'revision value1'],
-        ['id' => 1, 'field_test' => 3, 'revision_id' => 3, 'name' => 'revision value2'],
-        ['id' => 2, 'field_test' => 4, 'revision_id' => 4, 'name' => 'next entity value'],
-      ],
-      ['entity_test_rev_revision_id' => 'id', 'revision_id' => 'revision_id', 'name' => 'name', 'field_test' => 'field_test']
-    );
-  }
-
-  /**
-   * Tests the output of a revision view with base and configurable fields.
-   */
-  public function testRevisionRender() {
-    $executable = Views::getView('test_field_field_revision_test');
-    $executable->execute();
-
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual('base value', $executable->getStyle()->getField(0, 'name'));
-
-    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
-    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
-    $this->assertEqual('2', $executable->getStyle()->getField(1, 'field_test'));
-    $this->assertEqual('revision value1', $executable->getStyle()->getField(1, 'name'));
-
-    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
-    $this->assertEqual('3', $executable->getStyle()->getField(2, 'field_test'));
-    $this->assertEqual('revision value2', $executable->getStyle()->getField(2, 'name'));
-
-    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
-    $this->assertEqual('4', $executable->getStyle()->getField(3, 'field_test'));
-    $this->assertEqual('next entity value', $executable->getStyle()->getField(3, 'name'));
-  }
-
-  /**
-   * Tests the result set of a complex revision view.
-   */
-  public function testRevisionComplexExecute() {
-    $executable = Views::getView('test_field_field_revision_complex_test');
-    $executable->execute();
-
-    $timezones = [];
-    foreach ($this->testUsers as $user) {
-      $timezones[] = $user->getTimeZone();
-    }
-
-    $this->assertTrue($executable->field['id'] instanceof Field);
-    $this->assertTrue($executable->field['revision_id'] instanceof Field);
-    $this->assertTrue($executable->field['timezone'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
-    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
-
-    $this->assertIdenticalResultset($executable,
-      [
-        ['id' => 1, 'field_test' => 1, 'revision_id' => 1, 'uid' => $this->testUsers[0]->id(), 'timezone' => $timezones[0], 'field_test_multiple' => [1, 3, 7], 'field_test_multiple_1' => [1, 3, 7], 'field_test_multiple_2' => [1, 3, 7]],
-        ['id' => 1, 'field_test' => 2, 'revision_id' => 2, 'uid' => $this->testUsers[1]->id(), 'timezone' => $timezones[1], 'field_test_multiple' => [0, 3, 5], 'field_test_multiple_1' => [0, 3, 5], 'field_test_multiple_2' => [0, 3, 5]],
-        ['id' => 1, 'field_test' => 3, 'revision_id' => 3, 'uid' => $this->testUsers[2]->id(), 'timezone' => $timezones[2], 'field_test_multiple' => [9, 9, 9], 'field_test_multiple_1' => [9, 9, 9], 'field_test_multiple_2' => [9, 9, 9]],
-        ['id' => 2, 'field_test' => 4, 'revision_id' => 4, 'uid' => $this->testUsers[3]->id(), 'timezone' => $timezones[3], 'field_test_multiple' => [2, 9, 9], 'field_test_multiple_1' => [2, 9, 9], 'field_test_multiple_2' => [2, 9, 9]],
-      ],
-      ['entity_test_rev_revision_id' => 'id', 'revision_id' => 'revision_id', 'users_field_data_entity_test_rev_revision_uid' => 'uid', 'timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
-    );
-  }
-
-  /**
-   * Tests the output of a revision view with base fields and configurable fields.
-   */
-  public function testRevisionComplexRender() {
-    $executable = Views::getView('test_field_field_revision_complex_test');
-    $executable->execute();
-
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
-    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
-    $this->assertEqual('1, 3, 7', $executable->getStyle()->getField(0, 'field_test_multiple'));
-    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test_multiple_1'));
-    $this->assertEqual('3, 7', $executable->getStyle()->getField(0, 'field_test_multiple_2'));
-
-    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
-    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
-    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
-    $this->assertEqual('0, 3, 5', $executable->getStyle()->getField(1, 'field_test_multiple'));
-    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test_multiple_1'));
-    $this->assertEqual('3, 5', $executable->getStyle()->getField(1, 'field_test_multiple_2'));
-
-    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
-    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
-    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
-    $this->assertEqual('9, 9, 9', $executable->getStyle()->getField(2, 'field_test_multiple'));
-    $this->assertEqual('9', $executable->getStyle()->getField(2, 'field_test_multiple_1'));
-    $this->assertEqual('9, 9', $executable->getStyle()->getField(2, 'field_test_multiple_2'));
-
-    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
-    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
-    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
-    $this->assertEqual('2, 9, 9', $executable->getStyle()->getField(3, 'field_test_multiple'));
-    $this->assertEqual('2', $executable->getStyle()->getField(3, 'field_test_multiple_1'));
-    $this->assertEqual('9, 9', $executable->getStyle()->getField(3, 'field_test_multiple_2'));
-  }
-
-  /**
-   * Tests that a field not available for every bundle is rendered as empty.
-   */
-  public function testMissingBundleFieldRender() {
-    // Create a new bundle not having the test field attached.
-    $bundle = $this->randomMachineName();
-    entity_test_create_bundle($bundle);
-
-    $entity = EntityTest::create([
-      'type' => $bundle,
-      'name' => $this->randomString(),
-      'user_id' => $this->testUsers[0]->id(),
-    ]);
-    $entity->save();
-
-    $executable = Views::getView('test_field_field_test');
-    $executable->execute();
-
-    $this->assertEqual('', $executable->getStyle()->getField(6, 'field_test'));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
deleted file mode 100644
index dd97f1b..0000000
--- a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldFileSizeTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\FileSize handler.
- *
- * @group views
- * @see CommonXssUnitTest
- */
-class FieldFileSizeTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  function dataSet() {
-    $data = parent::dataSet();
-    $data[0]['age'] = 0;
-    $data[1]['age'] = 10;
-    $data[2]['age'] = 1000;
-    $data[3]['age'] = 10000;
-
-    return $data;
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['age']['field']['id'] = 'file_size';
-
-    return $data;
-  }
-
-  public function testFieldFileSize() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    // Test with the formatted option.
-    $this->assertEqual($view->field['age']->advancedRender($view->result[0]), '');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[1]), '10 bytes');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[2]), '1000 bytes');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[3]), '9.77 KB');
-    // Test with the bytes option.
-    $view->field['age']->options['file_size_display'] = 'bytes';
-    $this->assertEqual($view->field['age']->advancedRender($view->result[0]), '');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[1]), '10');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[2]), '1000');
-    $this->assertEqual($view->field['age']->advancedRender($view->result[3]), '10000');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
index 9cfd854..fa1a6aa 100644
--- a/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldGroupRowsTest.php
@@ -9,7 +9,9 @@
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Render\RenderContext;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\views\Views;
+use Drupal\field\Entity\FieldStorageConfig;
 
 /**
  * Tests the "Display all values in the same row" setting.
@@ -48,7 +50,7 @@ protected function setUp() {
     $node_type = $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
 
     // Create the unlimited text field.
-    $field_storage = entity_create('field_storage_config', array(
+    $field_storage = FieldStorageConfig::create(array(
         'field_name' => $this->fieldName,
         'entity_type' => 'node',
         'type' => 'text',
@@ -61,7 +63,7 @@ protected function setUp() {
       'field_storage' => $field_storage,
       'bundle' => $node_type->id(),
     );
-    entity_create('field_config', $field)->save();
+    FieldConfig::create($field)->save();
   }
 
   /**
diff --git a/core/modules/views/src/Tests/Handler/FieldKernelTest.php b/core/modules/views/src/Tests/Handler/FieldKernelTest.php
deleted file mode 100644
index 815b1ec..0000000
--- a/core/modules/views/src/Tests/Handler/FieldKernelTest.php
+++ /dev/null
@@ -1,797 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldKernelTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Core\Render\RenderContext;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\views\Views;
-
-/**
- * Tests the generic field handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\field\FieldPluginBase
- */
-class FieldKernelTest extends ViewKernelTestBase {
-
-  public static $modules = array('user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view', 'test_field_tokens', 'test_field_argument_tokens', 'test_field_output');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['job']['field']['id'] = 'test_field';
-    $data['views_test_data']['job']['field']['click sortable'] = FALSE;
-    $data['views_test_data']['id']['field']['click sortable'] = TRUE;
-    return $data;
-  }
-
-  /**
-   * Tests that the render function is called.
-   */
-  public function testRender() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_field_tokens');
-    $this->executeView($view);
-
-    $random_text = $this->randomMachineName();
-    $view->field['job']->setTestValue($random_text);
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['job']->theme($view->result[0]);
-    });
-    $this->assertEqual($output, $random_text, 'Make sure the render method rendered the manual set value.');
-  }
-
-  /**
-   * Tests all things related to the query.
-   */
-  public function testQuery() {
-    // Tests adding additional fields to the query.
-    $view = Views::getView('test_view');
-    $view->initHandlers();
-
-    $id_field = $view->field['id'];
-    $id_field->additional_fields['job'] = 'job';
-    // Choose also a field alias key which doesn't match to the table field.
-    $id_field->additional_fields['created_test'] = array('table' => 'views_test_data', 'field' => 'created');
-    $view->build();
-
-    // Make sure the field aliases have the expected value.
-    $this->assertEqual($id_field->aliases['job'], 'views_test_data_job');
-    $this->assertEqual($id_field->aliases['created_test'], 'views_test_data_created');
-
-    $this->executeView($view);
-    // Tests the getValue method with and without a field aliases.
-    foreach ($this->dataSet() as $key => $row) {
-      $id = $key + 1;
-      $result = $view->result[$key];
-      $this->assertEqual($id_field->getValue($result), $id);
-      $this->assertEqual($id_field->getValue($result, 'job'), $row['job']);
-      $this->assertEqual($id_field->getValue($result, 'created_test'), $row['created']);
-    }
-  }
-
-  /**
-   * Asserts that a string is part of another string.
-   *
-   * @param string $haystack
-   *   The value to search in.
-   * @param string $needle
-   *   The value to search for.
-   * @param string $message
-   *   (optional) A message to display with the assertion. Do not translate
-   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
-   *   variables in the message text, not t(). If left blank, a default message
-   *   will be displayed.
-   * @param string $group
-   *   (optional) The group this message is in, which is displayed in a column
-   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
-   *   translate this string. Defaults to 'Other'; most tests do not override
-   *   this default.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertSubString($haystack, $needle, $message = '', $group = 'Other') {
-    return $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message, $group);
-  }
-
-  /**
-   * Asserts that a string is not part of another string.
-   *
-   * @param string $haystack
-   *   The value to search in.
-   * @param string $needle
-   *   The value to search for.
-   * @param string $message
-   *   (optional) A message to display with the assertion. Do not translate
-   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
-   *   variables in the message text, not t(). If left blank, a default message
-   *   will be displayed.
-   * @param string $group
-   *   (optional) The group this message is in, which is displayed in a column
-   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
-   *   translate this string. Defaults to 'Other'; most tests do not override
-   *   this default.
-   *
-   * @return bool
-   *   TRUE if the assertion succeeded, FALSE otherwise.
-   */
-  protected function assertNotSubString($haystack, $needle, $message = '', $group = 'Other') {
-    return $this->assertTrue(strpos($haystack, $needle) === FALSE, $message, $group);
-  }
-
-  /**
-   * Tests general rewriting of the output.
-   */
-  public function testRewrite() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_view');
-    $view->initHandlers();
-    $this->executeView($view);
-    $row = $view->result[0];
-    $id_field = $view->field['id'];
-
-    // Don't check the rewrite checkbox, so the text shouldn't appear.
-    $id_field->options['alter']['text'] = $random_text = $this->randomMachineName();
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
-      return $id_field->theme($row);
-    });
-    $this->assertNotSubString($output, $random_text);
-
-    $id_field->options['alter']['alter_text'] = TRUE;
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
-      return $id_field->theme($row);
-    });
-    $this->assertSubString($output, $random_text);
-  }
-
-  /**
-   * Tests the arguments tokens on field level.
-   */
-  public function testArgumentTokens() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_field_argument_tokens');
-    $this->executeView($view, ['{{ { "#pre_render": ["views_test_data_test_pre_render_function"]} }}']);
-
-    $name_field_0 = $view->field['name'];
-
-    // Test the old style tokens.
-    $name_field_0->options['alter']['alter_text'] = TRUE;
-    $name_field_0->options['alter']['text'] = '%1 !1';
-
-    $row = $view->result[0];
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
-      return $name_field_0->advancedRender($row);
-    });
-
-    $this->assertFalse(strpos((string) $output, 'views_test_data_test_pre_render_function executed') !== FALSE, 'Ensure that the pre_render function was not executed');
-    $this->assertEqual('%1 !1', (string) $output, "Ensure that old style placeholders aren't replaced");
-
-    // This time use new style tokens but ensure that we still don't allow
-    // arbitrary code execution.
-    $name_field_0->options['alter']['alter_text'] = TRUE;
-    $name_field_0->options['alter']['text'] = '{{ arguments.null }} {{ raw_arguments.null }}';
-
-    $row = $view->result[0];
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
-      return $name_field_0->advancedRender($row);
-    });
-
-    $this->assertFalse(strpos((string) $output, 'views_test_data_test_pre_render_function executed') !== FALSE, 'Ensure that the pre_render function was not executed');
-    $this->assertEqual('{{ { &quot;#pre_render&quot;: [&quot;views_test_data_test_pre_render_function&quot;]} }} {{ { &quot;#pre_render&quot;: [&quot;views_test_data_test_pre_render_function&quot;]} }}', (string) $output, 'Ensure that new style placeholders are replaced');
-  }
-
-  /**
-   * Tests the field tokens, row level and field level.
-   */
-  public function testFieldTokens() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_field_tokens');
-    $this->executeView($view);
-    $name_field_0 = $view->field['name'];
-    $name_field_1 = $view->field['name_1'];
-    $name_field_2 = $view->field['name_2'];
-    $row = $view->result[0];
-
-    $name_field_0->options['alter']['alter_text'] = TRUE;
-    $name_field_0->options['alter']['text'] = '{{ name }}';
-
-    $name_field_1->options['alter']['alter_text'] = TRUE;
-    $name_field_1->options['alter']['text'] = '{{ name_1 }} {{ name }}';
-
-    $name_field_2->options['alter']['alter_text'] = TRUE;
-    $name_field_2->options['alter']['text'] = '{% if name_2|length > 3 %}{{ name_2 }} {{ name_1 }}{% endif %}';
-
-    foreach ($view->result as $row) {
-      $expected_output_0 = $row->views_test_data_name;
-      $expected_output_1 = "$row->views_test_data_name $row->views_test_data_name";
-      $expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name";
-
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
-        return $name_field_0->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "@token" gave "@output"', [
-        '@token' => $name_field_0->options['alter']['text'],
-        '@output' => $output,
-      ]));
-
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_1, $row) {
-        return $name_field_1->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "@token" gave "@output"', [
-        '@token' => $name_field_1->options['alter']['text'],
-        '@output' => $output,
-      ]));
-
-      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_2, $row) {
-        return $name_field_2->advancedRender($row);
-      });
-      $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "@token" gave "@output"', [
-        '@token' => $name_field_2->options['alter']['text'],
-        '@output' => $output,
-      ]));
-    }
-
-    $job_field = $view->field['job'];
-    $job_field->options['alter']['alter_text'] = TRUE;
-    $job_field->options['alter']['text'] = '{{ job }}';
-
-    $random_text = $this->randomMachineName();
-    $job_field->setTestValue($random_text);
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
-      return $job_field->advancedRender($row);
-    });
-    $this->assertSubString($output, $random_text, format_string('Make sure the self token (@token => @value) appears in the output (@output)', [
-      '@value' => $random_text,
-      '@output' => $output,
-      '@token' => $job_field->options['alter']['text'],
-    ]));
-
-    // Verify the token format used in D7 and earlier does not get substituted.
-    $old_token = '[job]';
-    $job_field->options['alter']['text'] = $old_token;
-    $random_text = $this->randomMachineName();
-    $job_field->setTestValue($random_text);
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
-      return $job_field->advancedRender($row);
-    });
-    $this->assertEqual($output, $old_token, format_string('Make sure the old token style (@token => @value) is not changed in the output (@output)', [
-      '@value' => $random_text,
-      '@output' => $output,
-      '@token' => $job_field->options['alter']['text'],
-    ]));
-
-    // Verify HTML tags are allowed in rewrite templates while token
-    // replacements are escaped.
-    $job_field->options['alter']['text'] = '<h1>{{ job }}</h1>';
-    $random_text = $this->randomMachineName();
-    $job_field->setTestValue('<span>' . $random_text . '</span>');
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
-      return $job_field->advancedRender($row);
-    });
-    $this->assertEqual($output, '<h1>&lt;span&gt;' . $random_text . '&lt;/span&gt;</h1>', 'Valid tags are allowed in rewrite templates and token replacements.');
-
-    // Verify <script> tags are correctly removed from rewritten text.
-    $rewrite_template = '<script>alert("malicious");</script>';
-    $job_field->options['alter']['text'] = $rewrite_template;
-    $random_text = $this->randomMachineName();
-    $job_field->setTestValue($random_text);
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
-      return $job_field->advancedRender($row);
-    });
-    $this->assertNotSubString($output, '<script>', 'Ensure a script tag in the rewrite template is removed.');
-
-    $rewrite_template = '<script>{{ job }}</script>';
-    $job_field->options['alter']['text'] = $rewrite_template;
-    $random_text = $this->randomMachineName();
-    $job_field->setTestValue($random_text);
-    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
-      return $job_field->advancedRender($row);
-    });
-    $this->assertEqual($output, $random_text, format_string('Make sure a script tag in the template (@template) is removed, leaving only the replaced token in the output (@output)', [
-      '@output' => $output,
-      '@template' => $rewrite_template,
-    ]));
-  }
-
-  /**
-   * Tests the exclude setting.
-   */
-  public function testExclude() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = $this->container->get('renderer');
-    $view = Views::getView('test_field_output');
-    $view->initHandlers();
-    // Hide the field and see whether it's rendered.
-    $view->field['name']->options['exclude'] = TRUE;
-
-    $output = $view->preview();
-    $output = $renderer->renderRoot($output);
-    foreach ($this->dataSet() as $entry) {
-      $this->assertNotSubString($output, $entry['name']);
-    }
-
-    // Show and check the field.
-    $view->field['name']->options['exclude'] = FALSE;
-
-    $output = $view->preview();
-    $output = $renderer->renderRoot($output);
-    foreach ($this->dataSet() as $entry) {
-      $this->assertSubString($output, $entry['name']);
-    }
-  }
-
-  /**
-   * Tests everything related to empty output of a field.
-   */
-  function testEmpty() {
-    $this->_testHideIfEmpty();
-    $this->_testEmptyText();
-  }
-
-  /**
-   * Tests the hide if empty functionality.
-   *
-   * This tests alters the result to get easier and less coupled results. It is
-   * important that assertIdentical() is used in this test since in PHP 0 == ''.
-   */
-  function _testHideIfEmpty() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_view');
-    $view->initDisplay();
-    $this->executeView($view);
-
-    $column_map_reversed = array_flip($this->columnMap);
-    $view->row_index = 0;
-    $random_name = $this->randomMachineName();
-    $random_value = $this->randomMachineName();
-
-    // Test when results are not rewritten and empty values are not hidden.
-    $view->field['name']->options['hide_alter_empty'] = FALSE;
-    $view->field['name']->options['hide_empty'] = FALSE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'By default, a string should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'By default, "" should not be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, '0', 'By default, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'By default, "0" should not be treated as empty.');
-
-    // Test when results are not rewritten and non-zero empty values are hidden.
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If hide_empty is checked, a string should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If hide_empty is checked, "" should be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, '0', 'If hide_empty is checked, but not empty_zero, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If hide_empty is checked, but not empty_zero, "0" should not be treated as empty.');
-
-    // Test when results are not rewritten and all empty values are hidden.
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = TRUE;
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, 0 should be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, "0" should be treated as empty.');
-
-    // Test when results are rewritten to a valid string and non-zero empty
-    // results are hidden.
-    $view->field['name']->options['hide_alter_empty'] = FALSE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $view->field['name']->options['alter']['text'] = $random_name;
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_value;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, it should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, "" should not be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, "0" should not be treated as empty.');
-
-    // Test when results are rewritten to an empty string and non-zero empty results are hidden.
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $view->field['name']->options['alter']['text'] = "";
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is empty, it should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If the rewritten string is empty, "" should be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, '0', 'If the rewritten string is empty, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If the rewritten string is empty, "0" should not be treated as empty.');
-
-    // Test when results are rewritten to zero as a string and non-zero empty
-    // results are hidden.
-    $view->field['name']->options['hide_alter_empty'] = FALSE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $view->field['name']->options['alter']['text'] = "0";
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, the string rewritten as 0 should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, "" rewritten as 0 should not be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, "0" should not be treated as empty.');
-
-    // Test when results are rewritten to a valid string and non-zero empty
-    // results are hidden.
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = FALSE;
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $view->field['name']->options['alter']['text'] = $random_value;
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, it should not be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If either the original or rewritten string is invalid, "" should be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, "0" should not be treated as empty.');
-
-    // Test when results are rewritten to zero as a string and all empty
-    // original values and results are hidden.
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $view->field['name']->options['hide_empty'] = TRUE;
-    $view->field['name']->options['empty_zero'] = TRUE;
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $view->field['name']->options['alter']['text'] = "0";
-
-    // Test a valid string.
-    $view->result[0]->{$column_map_reversed['name']} = $random_name;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "", 'If the rewritten string is zero, it should be treated as empty.');
-
-    // Test an empty string.
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If the rewritten string is zero, "" should be treated as empty.');
-
-    // Test zero as an integer.
-    $view->result[0]->{$column_map_reversed['name']} = 0;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If the rewritten string is zero, 0 should not be treated as empty.');
-
-    // Test zero as a string.
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical($render, "", 'If the rewritten string is zero, "0" should not be treated as empty.');
-  }
-
-  /**
-   * Tests the usage of the empty text.
-   */
-  function _testEmptyText() {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $view = Views::getView('test_view');
-    $view->initDisplay();
-    $this->executeView($view);
-
-    $column_map_reversed = array_flip($this->columnMap);
-    $view->row_index = 0;
-
-    $empty_text = $view->field['name']->options['empty'] = $this->randomMachineName();
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $empty_text, 'If a field is empty, the empty text should be used for the output.');
-
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, "0", 'If a field is 0 and empty_zero is not checked, the empty text should not be used for the output.');
-
-    $view->result[0]->{$column_map_reversed['name']} = "0";
-    $view->field['name']->options['empty_zero'] = TRUE;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $empty_text, 'If a field is 0 and empty_zero is checked, the empty text should be used for the output.');
-
-    $view->result[0]->{$column_map_reversed['name']} = "";
-    $view->field['name']->options['alter']['alter_text'] = TRUE;
-    $alter_text = $view->field['name']->options['alter']['text'] = $this->randomMachineName();
-    $view->field['name']->options['hide_alter_empty'] = FALSE;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $alter_text, 'If a field is empty, some rewrite text exists, but hide_alter_empty is not checked, render the rewrite text.');
-
-    $view->field['name']->options['hide_alter_empty'] = TRUE;
-    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
-      return $view->field['name']->advancedRender($view->result[0]);
-    });
-    $this->assertIdentical((string) $render, $empty_text, 'If a field is empty, some rewrite text exists, and hide_alter_empty is checked, use the empty text.');
-  }
-
-  /**
-   * Tests views_handler_field::isValueEmpty().
-   */
-  function testIsValueEmpty() {
-    $view = Views::getView('test_view');
-    $view->initHandlers();
-    $field = $view->field['name'];
-
-    $this->assertFalse($field->isValueEmpty("not empty", TRUE), 'A normal string is not empty.');
-    $this->assertTrue($field->isValueEmpty("not empty", TRUE, FALSE), 'A normal string which skips empty() can be seen as empty.');
-
-    $this->assertTrue($field->isValueEmpty("", TRUE), '"" is considered as empty.');
-
-    $this->assertTrue($field->isValueEmpty('0', TRUE), '"0" is considered as empty if empty_zero is TRUE.');
-    $this->assertTrue($field->isValueEmpty(0, TRUE), '0 is considered as empty if empty_zero is TRUE.');
-    $this->assertFalse($field->isValueEmpty('0', FALSE), '"0" is considered not as empty if empty_zero is FALSE.');
-    $this->assertFalse($field->isValueEmpty(0, FALSE), '0 is considered not as empty if empty_zero is FALSE.');
-
-    $this->assertTrue($field->isValueEmpty(NULL, TRUE, TRUE), 'Null should be always seen as empty, regardless of no_skip_empty.');
-    $this->assertTrue($field->isValueEmpty(NULL, TRUE, FALSE), 'Null should be always seen as empty, regardless of no_skip_empty.');
-  }
-
-  /**
-   * Tests whether the filters are click sortable as expected.
-   */
-  public function testClickSortable() {
-    // Test that clickSortable is TRUE by default.
-    $item = array(
-      'table' => 'views_test_data',
-      'field' => 'name',
-    );
-    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
-    $this->assertTrue($plugin->clickSortable(), 'TRUE as a default value is correct.');
-
-    // Test that clickSortable is TRUE by when set TRUE in the data.
-    $item['field'] = 'id';
-    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
-    $this->assertTrue($plugin->clickSortable(), 'TRUE as a views data value is correct.');
-
-    // Test that clickSortable is FALSE by when set FALSE in the data.
-    $item['field'] = 'job';
-    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
-    $this->assertFalse($plugin->clickSortable(), 'FALSE as a views data value is correct.');
-  }
-
-  /**
-   * Tests the trimText method.
-   */
-  public function testTrimText() {
-    // Test unicode. See https://www.drupal.org/node/513396#comment-2839416.
-    $text = array(
-      'Tuy nhiên, những hi vọng',
-      'Giả sử chúng tôi có 3 Apple',
-      'siêu nhỏ này là bộ xử lý',
-      'Di động của nhà sản xuất Phần Lan',
-      'khoảng cách từ đại lí đến',
-      'của hãng bao gồm ba dòng',
-      'сд асд асд ас',
-      'асд асд асд ас'
-    );
-    // Just test maxlength without word boundary.
-    $alter = array(
-      'max_length' => 10,
-    );
-    $expect = array(
-      'Tuy nhiên,',
-      'Giả sử chú',
-      'siêu nhỏ n',
-      'Di động củ',
-      'khoảng các',
-      'của hãng b',
-      'сд асд асд',
-      'асд асд ас',
-    );
-
-    foreach ($text as $key => $line) {
-      $result_text = FieldPluginBase::trimText($alter, $line);
-      $this->assertEqual($result_text, $expect[$key]);
-    }
-
-    // Test also word_boundary
-    $alter['word_boundary'] = TRUE;
-    $expect = array(
-      'Tuy nhiên',
-      'Giả sử',
-      'siêu nhỏ',
-      'Di động',
-      'khoảng',
-      'của hãng',
-      'сд асд',
-      'асд асд',
-    );
-
-    foreach ($text as $key => $line) {
-      $result_text = FieldPluginBase::trimText($alter, $line);
-      $this->assertEqual($result_text, $expect[$key]);
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FieldUrlTest.php b/core/modules/views/src/Tests/Handler/FieldUrlTest.php
deleted file mode 100644
index d3451aa..0000000
--- a/core/modules/views/src/Tests/Handler/FieldUrlTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FieldUrlTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Core\Url;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\field\Url handler.
- *
- * @group views
- */
-class FieldUrlTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'url_alias');
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['name']['field']['id'] = 'url';
-    return $data;
-  }
-
-  public function testFieldUrl() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'display_as_link' => FALSE,
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $this->assertEqual('John', $view->field['name']->advancedRender($view->result[0]));
-
-    // Make the url a link.
-    $view->destroy();
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('fields', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $this->assertEqual(\Drupal::l('John', Url::fromUri('base:John')), $view->field['name']->advancedRender($view->result[0]));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
deleted file mode 100644
index d3f3688..0000000
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterBooleanOperatorStringTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\filter\BooleanOperatorString
- * handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\filter\BooleanOperatorString
- */
-class FilterBooleanOperatorStringTest extends ViewKernelTestBase {
-
-  /**
-   * The modules to enable for this test.
-   *
-   * @var array
-   */
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_id' => 'id',
-  );
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-
-    $schema['views_test_data']['fields']['status'] = array(
-      'description' => 'The status of this record',
-      'type' => 'varchar',
-      'length' => 255,
-      'not null' => TRUE,
-      'default' => '',
-    );
-
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $views_data = parent::viewsData();
-
-    $views_data['views_test_data']['status']['filter']['id'] = 'boolean_string';
-
-    return $views_data;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function dataSet() {
-    $data = parent::dataSet();
-
-    foreach ($data as &$row) {
-      if ($row['status']) {
-        $row['status'] = 'Enabled';
-      }
-      else {
-        $row['status'] = '';
-      }
-    }
-
-    return $data;
-  }
-
-  /**
-   * Tests the BooleanOperatorString filter.
-   */
-  public function testFilterBooleanOperatorString() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
-        'id' => 'status',
-        'field' => 'status',
-        'table' => 'views_test_data',
-        'value' => 0,
-      ),
-    ));
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Add the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
-        'id' => 'status',
-        'field' => 'status',
-        'table' => 'views_test_data',
-        'value' => 1,
-      ),
-    ));
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  /**
-   * Tests the Boolean filter with grouped exposed form enabled.
-   */
-  public function testFilterGroupedExposed() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-
-    $view->setExposedInput(array('status' => 1));
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-    $view->destroy();
-
-    $view->setExposedInput(array('status' => 2));
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  /**
-   * Provides grouped exposed filter configuration.
-   *
-   * @return array
-   *   Returns the filter configuration for exposed filters.
-   */
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'status' => array(
-        'id' => 'status',
-        'table' => 'views_test_data',
-        'field' => 'status',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'status_op',
-          'label' => 'status',
-          'identifier' => 'status',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'status',
-          'identifier' => 'status',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Active',
-              'operator' => '=',
-              'value' => '1',
-            ),
-            2 => array(
-              'title' => 'Blocked',
-              'operator' => '=',
-              'value' => '0',
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
deleted file mode 100644
index 7e6c310..0000000
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterBooleanOperatorTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\filter\BooleanOperator handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\filter\BooleanOperator
- */
-class FilterBooleanOperatorTest extends ViewKernelTestBase {
-
-  /**
-   * The modules to enable for this test.
-   *
-   * @var array
-   */
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_id' => 'id',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-  /**
-   * Tests the BooleanOperator filter.
-   */
-  public function testFilterBooleanOperator() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
-        'id' => 'status',
-        'field' => 'status',
-        'table' => 'views_test_data',
-        'value' => 0,
-      ),
-    ));
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Add the status boolean filter.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
-        'id' => 'status',
-        'field' => 'status',
-        'table' => 'views_test_data',
-        'value' => 1,
-      ),
-    ));
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Testing the same scenario but using the reverse status and operation.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'status' => array(
-        'id' => 'status',
-        'field' => 'status',
-        'table' => 'views_test_data',
-        'value' => 0,
-        'operator' => '!=',
-      ),
-    ));
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  /**
-   * Tests the boolean filter with grouped exposed form enabled.
-   */
-  public function testFilterGroupedExposed() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-
-    $view->setExposedInput(array('status' => 1));
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-    $view->destroy();
-
-    $view->setExposedInput(array('status' => 2));
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 2),
-      array('id' => 4),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-
-    $view->destroy();
-
-    // Expecting the same results as for ['status' => 1].
-    $view->setExposedInput(['status' => 3]);
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array('id' => 1),
-      array('id' => 3),
-      array('id' => 5),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  /**
-   * Provides grouped exposed filter configuration.
-   *
-   * @return array
-   */
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'status' => array(
-        'id' => 'status',
-        'table' => 'views_test_data',
-        'field' => 'status',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'status_op',
-          'label' => 'status',
-          'identifier' => 'status',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'status',
-          'identifier' => 'status',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Active',
-              'operator' => '=',
-              'value' => '1',
-            ),
-            2 => array(
-              'title' => 'Blocked',
-              'operator' => '=',
-              'value' => '0',
-            ),
-            // This group should return the same results as group 1, because it
-            // is the negation of group 2.
-            3 => array(
-              'title' => 'Active (reverse)',
-              'operator' => '!=',
-              'value' => '0',
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
-
diff --git a/core/modules/views/src/Tests/Handler/FilterCombineTest.php b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
deleted file mode 100644
index 9ad83c3..0000000
--- a/core/modules/views/src/Tests/Handler/FilterCombineTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterCombineTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the combine filter handler.
- *
- * @group views
- */
-class FilterCombineTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-    'views_test_data_job' => 'job',
-  );
-
-  public function testFilterCombineContains() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'job' => array(
-        'id' => 'job',
-        'table' => 'views_test_data',
-        'field' => 'job',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'combine',
-        'table' => 'views',
-        'field' => 'combine',
-        'relationship' => 'none',
-        'operator' => 'contains',
-        'fields' => array(
-          'name',
-          'job',
-        ),
-        'value' => 'ing',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-        'job' => 'Singer',
-      ),
-      array(
-        'name' => 'George',
-        'job' => 'Singer',
-      ),
-      array(
-        'name' => 'Ringo',
-        'job' => 'Drummer',
-      ),
-      array(
-        'name' => 'Ginger',
-        'job' => NULL,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  /**
-   * Tests if the filter can handle removed fields.
-   *
-   * Tests the combined filter handler when a field overwrite is done
-   * and fields set in the combine filter are removed from the display
-   * but not from the combined filter settings.
-   */
-  public function testFilterCombineContainsFieldsOverwritten() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'job' => array(
-        'id' => 'job',
-        'table' => 'views_test_data',
-        'field' => 'job',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'combine',
-        'table' => 'views',
-        'field' => 'combine',
-        'relationship' => 'none',
-        'operator' => 'contains',
-        'fields' => array(
-          'name',
-          'job',
-          // Add a dummy field to the combined fields to simulate
-          // a removed or deleted field.
-          'dummy',
-        ),
-        'value' => 'ing',
-      ),
-    ));
-
-    $this->executeView($view);
-    // Make sure this view will not get displayed.
-    $this->assertTrue($view->build_info['fail'], "View build has been marked as failed.");
-    // Make sure this view does not pass validation with the right error.
-    $errors = $view->validate();
-    $this->assertEqual(reset($errors['default']), t('Field %field set in %filter is not set in this display.', array('%field' => 'dummy', '%filter' => 'Global: Combine fields filter')));
-  }
-
-  /**
-   * Additional data to test the NULL issue.
-   */
-  protected function dataSet() {
-    $data_set = parent::dataSet();
-    $data_set[] = array(
-      'name' => 'Ginger',
-      'age' => 25,
-      'job' => NULL,
-      'created' => gmmktime(0, 0, 0, 1, 2, 2000),
-      'status' => 1,
-    );
-    return $data_set;
-  }
-
-  /**
-   * Allow {views_test_data}.job to be NULL.
-   */
-  protected function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-    unset($schema['views_test_data']['fields']['job']['not null']);
-    return $schema;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
deleted file mode 100644
index a25d9ba..0000000
--- a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterEqualityTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\filter\Equality handler.
- *
- * @group views
- */
-class FilterEqualityTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['name']['filter']['id'] = 'equality';
-    return $data;
-  }
-
-  function testEqual() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => '=',
-        'value' => 'Ringo',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testEqualGroupedExposed() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Name, Operator: =, Value: Ringo
-    $filters['name']['group_info']['default_group'] = 1;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testNotEqual() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => '!=',
-        'value' => 'Ringo',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testEqualGroupedNotExposed() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Name, Operator: !=, Value: Ringo
-    $filters['name']['group_info']['default_group'] = 2;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'name' => array(
-        'id' => 'name',
-        'plugin_id' => 'equality',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'group' => 1,
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'name_op',
-          'label' => 'name',
-          'identifier' => 'name',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'name',
-          'identifier' => 'name',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Name is equal to Ringo',
-              'operator' => '=',
-              'value' => 'Ringo',
-            ),
-            2 => array(
-              'title' => 'Name is not equal to Ringo',
-              'operator' => '!=',
-              'value' => 'Ringo',
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
deleted file mode 100644
index 65c645c..0000000
--- a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterInOperatorTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\filter\InOperator handler.
- *
- * @group views
- */
-class FilterInOperatorTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-    'views_test_data_age' => 'age',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['age']['filter']['id'] = 'in_operator';
-    return $data;
-  }
-
-  public function testFilterInOperatorSimple() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a in_operator ordering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'field' => 'age',
-        'table' => 'views_test_data',
-        'value' => array(26, 30),
-        'operator' => 'in',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Add a in_operator ordering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'field' => 'age',
-        'table' => 'views_test_data',
-        'value' => array(26, 30),
-        'operator' => 'not in',
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  public function testFilterInOperatorGroupedExposedSimple() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-
-    // Filter: Age, Operator: in, Value: 26, 30
-    $filters['age']['group_info']['default_group'] = 1;
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-
-    $this->assertEqual(2, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  public function testFilterNotInOperatorGroupedExposedSimple() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-
-    // Filter: Age, Operator: in, Value: 26, 30
-    $filters['age']['group_info']['default_group'] = 2;
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-    );
-
-    $this->assertEqual(3, count($view->result));
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'age_op',
-          'label' => 'age',
-          'identifier' => 'age',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'age',
-          'identifier' => 'age',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Age is one of 26, 30',
-              'operator' => 'in',
-              'value' => array(26, 30),
-            ),
-            2 => array(
-              'title' => 'Age is not one of 26, 30',
-              'operator' => 'not in',
-              'value' => array(26, 30),
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterNumericTest.php b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
deleted file mode 100644
index 2da40ce..0000000
--- a/core/modules/views/src/Tests/Handler/FilterNumericTest.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterNumericTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the numeric filter handler.
- *
- * @group views
- */
-class FilterNumericTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-    'views_test_data_age' => 'age',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['age']['filter']['allow empty'] = TRUE;
-    $data['views_test_data']['id']['filter']['allow empty'] = FALSE;
-
-    return $data;
-  }
-
-  public function testFilterNumericSimple() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'operator' => '=',
-        'value' => array('value' => 28),
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericExposedGroupedSimple() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Age, Operator: =, Value: 28
-    $filters['age']['group_info']['default_group'] = 1;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericBetween() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'operator' => 'between',
-        'value' => array(
-          'min' => 26,
-          'max' => 29,
-        ),
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-
-    // test not between
-    $view->destroy();
-    $view->setDisplay();
-
-      // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'operator' => 'not between',
-        'value' => array(
-          'min' => 26,
-          'max' => 29,
-        ),
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericExposedGroupedBetween() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Age, Operator: between, Value: 26 and 29
-    $filters['age']['group_info']['default_group'] = 2;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericExposedGroupedNotBetween() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Age, Operator: between, Value: 26 and 29
-    $filters['age']['group_info']['default_group'] = 3;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericEmpty() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'operator' => 'empty',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'operator' => 'not empty',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-    array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericExposedGroupedEmpty() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Age, Operator: empty, Value:
-    $filters['age']['group_info']['default_group'] = 4;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testFilterNumericExposedGroupedNotEmpty() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = Views::getView('test_view');
-    $view->newDisplay('page', 'Page', 'page_1');
-
-    // Filter: Age, Operator: empty, Value:
-    $filters['age']['group_info']['default_group'] = 5;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-    array(
-        'name' => 'John',
-        'age' => 25,
-      ),
-      array(
-        'name' => 'George',
-        'age' => 27,
-      ),
-      array(
-        'name' => 'Ringo',
-        'age' => 28,
-      ),
-      array(
-        'name' => 'Paul',
-        'age' => 26,
-      ),
-      array(
-        'name' => 'Meredith',
-        'age' => 30,
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  public function testAllowEmpty() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'id' => array(
-        'id' => 'id',
-        'table' => 'views_test_data',
-        'field' => 'id',
-        'relationship' => 'none',
-      ),
-      'age' => array(
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-      ),
-    ));
-
-    $view->initHandlers();
-
-    $id_operators = $view->filter['id']->operators();
-    $age_operators = $view->filter['age']->operators();
-
-    $this->assertFalse(isset($id_operators['empty']));
-    $this->assertFalse(isset($id_operators['not empty']));
-    $this->assertTrue(isset($age_operators['empty']));
-    $this->assertTrue(isset($age_operators['not empty']));
-  }
-
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'age' => array(
-        'id' => 'age',
-        'plugin_id' => 'numeric',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'age_op',
-          'label' => 'age',
-          'identifier' => 'age',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'age',
-          'identifier' => 'age',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Age is 28',
-              'operator' => '=',
-              'value' => array('value' => 28),
-            ),
-            2 => array(
-              'title' => 'Age is between 26 and 29',
-              'operator' => 'between',
-              'value' => array(
-                'min' => 26,
-                'max' => 29,
-              ),
-            ),
-            3 => array(
-              'title' => 'Age is not between 26 and 29',
-              'operator' => 'not between',
-              'value' => array(
-                'min' => 26,
-                'max' => 29,
-              ),
-            ),
-            4 => array(
-              'title' => 'Age is empty',
-              'operator' => 'empty',
-            ),
-            5 => array(
-              'title' => 'Age is not empty',
-              'operator' => 'not empty',
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php
deleted file mode 100644
index acd3f50..0000000
--- a/core/modules/views/src/Tests/Handler/FilterStringTest.php
+++ /dev/null
@@ -1,869 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\FilterStringTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the core Drupal\views\Plugin\views\filter\StringFilter handler.
- *
- * @group views
- */
-class FilterStringTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Map column names.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-  );
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', array('key_value_expire'));
-  }
-
-  function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['name']['filter']['allow empty'] = TRUE;
-    $data['views_test_data']['job']['filter']['allow empty'] = FALSE;
-    $data['views_test_data']['description'] = $data['views_test_data']['name'];
-
-    return $data;
-  }
-
-  protected function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-    $schema['views_test_data']['fields']['description'] = array(
-      'description' => "A person's description",
-      'type' => 'text',
-      'not null' => FALSE,
-      'size' => 'big',
-    );
-
-    return $schema;
-  }
-
-  /**
-   * An extended test dataset.
-   */
-  protected function dataSet() {
-    $dataset = parent::dataSet();
-    $dataset[0]['description'] = 'John Winston Ono Lennon, MBE (9 October 1940 – 8 December 1980) was an English musician and singer-songwriter who rose to worldwide fame as one of the founding members of The Beatles, one of the most commercially successful and critically acclaimed acts in the history of popular music. Along with fellow Beatle Paul McCartney, he formed one of the most successful songwriting partnerships of the 20th century.';
-    $dataset[1]['description'] = 'George Harrison,[1] MBE (25 February 1943 – 29 November 2001)[2] was an English rock guitarist, singer-songwriter, actor and film producer who achieved international fame as lead guitarist of The Beatles.';
-    $dataset[2]['description'] = 'Richard Starkey, MBE (born 7 July 1940), better known by his stage name Ringo Starr, is an English musician, singer-songwriter, and actor who gained worldwide fame as the drummer for The Beatles.';
-    $dataset[3]['description'] = 'Sir James Paul McCartney, MBE (born 18 June 1942) is an English musician, singer-songwriter and composer. Formerly of The Beatles (1960–1970) and Wings (1971–1981), McCartney is the most commercially successful songwriter in the history of popular music, according to Guinness World Records.[1]';
-    $dataset[4]['description'] = NULL;
-
-    return $dataset;
-  }
-
-  /**
-   * Build and return a Page view of the views_test_data table.
-   *
-   * @return view
-   */
-  protected function getBasicPageView() {
-    $view = Views::getView('test_view');
-
-    // In order to test exposed filters, we have to disable
-    // the exposed forms cache.
-    \Drupal::service('views.exposed_form_cache')->reset();
-
-    $view->newDisplay('page', 'Page', 'page_1');
-    return $view;
-  }
-
-  function testFilterStringEqual() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => '=',
-        'value' => 'Ringo',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedEqual() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: =, Value: Ringo
-    $filters['name']['group_info']['default_group'] = 1;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringNotEqual() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => '!=',
-        'value' => 'Ringo',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedNotEqual() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: !=, Value: Ringo
-    $filters['name']['group_info']['default_group'] = '2';
-
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringContains() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => 'contains',
-        'value' => 'ing',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  function testFilterStringGroupedExposedContains() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: contains, Value: ing
-    $filters['name']['group_info']['default_group'] = '3';
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  function testFilterStringWord() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'word',
-        'value' => 'actor',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-    $view->destroy();
-
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'allwords',
-        'value' => 'Richard Starkey',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  function testFilterStringGroupedExposedWord() {
-      $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: contains, Value: ing
-    $filters['name']['group_info']['default_group'] = '3';
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-    $view->destroy();
-
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Description, Operator: contains, Value: actor
-    $filters['description']['group_info']['default_group'] = '1';
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringStarts() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'starts',
-        'value' => 'George',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedStarts() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: starts, Value: George
-    $filters['description']['group_info']['default_group'] = 2;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringNotStarts() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'not_starts',
-        'value' => 'George',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedNotStarts() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: not_starts, Value: George
-    $filters['description']['group_info']['default_group'] = 3;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringEnds() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'ends',
-        'value' => 'Beatles.',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedEnds() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Description, Operator: ends, Value: Beatles
-    $filters['description']['group_info']['default_group'] = 4;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'George',
-      ),
-      array(
-        'name' => 'Ringo',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringNotEnds() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'not_ends',
-        'value' => 'Beatles.',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedNotEnds() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Description, Operator: not_ends, Value: Beatles
-    $filters['description']['group_info']['default_group'] = 5;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringNot() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'not',
-        'value' => 'Beatles.',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  function testFilterStringGroupedExposedNot() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Description, Operator: not (does not contains), Value: Beatles
-    $filters['description']['group_info']['default_group'] = 6;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-      // There is no Meredith returned because his description is empty
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-
-  }
-
-  function testFilterStringShorter() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => 'shorterthan',
-        'value' => 5,
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedShorter() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: shorterthan, Value: 5
-    $filters['name']['group_info']['default_group'] = 4;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'John',
-      ),
-      array(
-        'name' => 'Paul',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringLonger() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'name' => array(
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'operator' => 'longerthan',
-        'value' => 7,
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedLonger() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Name, Operator: longerthan, Value: 4
-    $filters['name']['group_info']['default_group'] = 5;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-
-  function testFilterStringEmpty() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the filtering
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'description' => array(
-        'id' => 'description',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'operator' => 'empty',
-      ),
-    ));
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  function testFilterStringGroupedExposedEmpty() {
-    $filters = $this->getGroupedExposedFilters();
-    $view = $this->getBasicPageView();
-
-    // Filter: Description, Operator: empty, Value:
-    $filters['description']['group_info']['default_group'] = 7;
-    $view->setDisplay('page_1');
-    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
-    $view->save();
-    $this->container->get('router.builder')->rebuild();
-
-    $this->executeView($view);
-    $resultset = array(
-      array(
-        'name' => 'Meredith',
-      ),
-    );
-    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
-  }
-
-  protected function getGroupedExposedFilters() {
-    $filters = array(
-      'name' => array(
-        'id' => 'name',
-        'plugin_id' => 'string',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'name_op',
-          'label' => 'name',
-          'identifier' => 'name',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'name',
-          'identifier' => 'name',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Is Ringo',
-              'operator' => '=',
-              'value' => 'Ringo',
-            ),
-            2 => array(
-              'title' => 'Is not Ringo',
-              'operator' => '!=',
-              'value' => 'Ringo',
-            ),
-            3 => array(
-              'title' => 'Contains ing',
-              'operator' => 'contains',
-              'value' => 'ing',
-            ),
-            4 => array(
-              'title' => 'Shorter than 5 letters',
-              'operator' => 'shorterthan',
-              'value' => 5,
-            ),
-            5 => array(
-              'title' => 'Longer than 7 letters',
-              'operator' => 'longerthan',
-              'value' => 7,
-            ),
-          ),
-        ),
-      ),
-      'description' => array(
-        'id' => 'description',
-        'plugin_id' => 'string',
-        'table' => 'views_test_data',
-        'field' => 'description',
-        'relationship' => 'none',
-        'exposed' => TRUE,
-        'expose' => array(
-          'operator' => 'description_op',
-          'label' => 'description',
-          'identifier' => 'description',
-        ),
-        'is_grouped' => TRUE,
-        'group_info' => array(
-          'label' => 'description',
-          'identifier' => 'description',
-          'default_group' => 'All',
-          'group_items' => array(
-            1 => array(
-              'title' => 'Contains the word: Actor',
-              'operator' => 'word',
-              'value' => 'actor',
-            ),
-            2 => array(
-              'title' => 'Starts with George',
-              'operator' => 'starts',
-              'value' => 'George',
-            ),
-            3 => array(
-              'title' => 'Not Starts with: George',
-              'operator' => 'not_starts',
-              'value' => 'George',
-            ),
-            4 => array(
-              'title' => 'Ends with: Beatles',
-              'operator' => 'ends',
-              'value' => 'Beatles.',
-            ),
-            5 => array(
-              'title' => 'Not Ends with: Beatles',
-              'operator' => 'not_ends',
-              'value' => 'Beatles.',
-            ),
-            6 => array(
-              'title' => 'Does not contain: Beatles',
-              'operator' => 'not',
-              'value' => 'Beatles.',
-            ),
-            7 => array(
-              'title' => 'Empty description',
-              'operator' => 'empty',
-              'value' => '',
-            ),
-          ),
-        ),
-      ),
-    );
-    return $filters;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
deleted file mode 100644
index 3a229a6..0000000
--- a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\HandlerAliasTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests handler table and field aliases.
- *
- * @group views
- */
-class HandlerAliasTest extends ViewKernelTestBase {
-
-  public static $modules = array('user');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_filter', 'test_alias');
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-    // User the existing test_filter plugin.
-    $data['views_test_data_alias']['table']['real table'] = 'views_test_data';
-    $data['views_test_data_alias']['name_alias']['filter']['id'] = 'test_filter';
-    $data['views_test_data_alias']['name_alias']['filter']['real field'] = 'name';
-
-    return $data;
-  }
-
-  public function testPluginAliases() {
-    $view = Views::getView('test_filter');
-    $view->initDisplay();
-
-    // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
-        'id' => 'test_filter',
-        'table' => 'views_test_data_alias',
-        'field' => 'name_alias',
-        'operator' => '=',
-        'value' => 'John',
-        'group' => 0,
-      ),
-    ));
-
-    $this->executeView($view);
-
-    $filter = $view->filter['test_filter'];
-
-    // Check the definition values are present.
-    $this->assertIdentical($filter->definition['real table'], 'views_test_data');
-    $this->assertIdentical($filter->definition['real field'], 'name');
-
-    $this->assertIdentical($filter->table, 'views_test_data');
-    $this->assertIdentical($filter->realField, 'name');
-
-    // Test an existing user uid field.
-    $view = Views::getView('test_alias');
-    $view->initDisplay();
-    $this->executeView($view);
-
-    $filter = $view->filter['uid_raw'];
-
-    $this->assertIdentical($filter->definition['real field'], 'uid');
-
-    $this->assertIdentical($filter->field, 'uid_raw');
-    $this->assertIdentical($filter->table, 'users_field_data');
-    $this->assertIdentical($filter->realField, 'uid');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/HandlerAllTest.php b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
index 84579a8..4c321a8 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAllTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAllTest.php
@@ -11,6 +11,7 @@
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\Plugin\views\filter\InOperator;
+use Drupal\views\Entity\View;
 
 /**
  * Tests instances of all handlers.
@@ -59,7 +60,7 @@ public function testHandlers() {
         continue;
       }
 
-      $view = entity_create('view', array('base_table' => $base_table));
+      $view = View::create(array('base_table' => $base_table));
       $view = $view->getExecutable();
 
       // @todo The groupwise relationship is currently broken.
diff --git a/core/modules/views/src/Tests/Handler/RelationshipTest.php b/core/modules/views/src/Tests/Handler/RelationshipTest.php
deleted file mode 100644
index 884aca6..0000000
--- a/core/modules/views/src/Tests/Handler/RelationshipTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\RelationshipTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\simpletest\UserCreationTrait;
-use Drupal\views\Views;
-use Drupal\views\Tests\Plugin\RelationshipJoinTestBase;
-
-/**
- * Tests the base relationship handler.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\relationship\RelationshipPluginBase
- */
-class RelationshipTest extends RelationshipJoinTestBase {
-  use UserCreationTrait;
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Maps between the key in the expected result and the query result.
-   *
-   * @var array
-   */
-  protected $columnMap = array(
-    'views_test_data_name' => 'name',
-    'users_field_data_views_test_data_uid' => 'uid',
-  );
-
-  /**
-   * Tests the query result of a view with a relationship.
-   */
-  public function testRelationshipQuery() {
-    // Set the first entry to have the admin as author.
-    db_query("UPDATE {views_test_data} SET uid = 1 WHERE id = 1");
-    db_query("UPDATE {views_test_data} SET uid = 2 WHERE id <> 1");
-
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->displayHandlers->get('default')->overrideOption('relationships', array(
-      'uid' => array(
-        'id' => 'uid',
-        'table' => 'views_test_data',
-        'field' => 'uid',
-      ),
-    ));
-
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'uid' => array(
-        'id' => 'uid',
-        'table' => 'users_field_data',
-        'field' => 'uid',
-        'relationship' => 'uid',
-      ),
-    ));
-
-    $fields = $view->displayHandlers->get('default')->getOption('fields');
-    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
-      'uid' => array(
-        'id' => 'uid',
-        'table' => 'users_field_data',
-        'field' => 'uid',
-        'relationship' => 'uid',
-      ),
-    ));
-
-    $view->initHandlers();
-
-    // Check for all beatles created by admin.
-    $view->filter['uid']->value = array(1);
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'John',
-        'uid' => 1
-      )
-    );
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-    $view->destroy();
-
-    // Check for all beatles created by another user, which so doesn't exist.
-    $view->initHandlers();
-    $view->filter['uid']->value = array(3);
-    $this->executeView($view);
-    $expected_result = array();
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-    $view->destroy();
-
-    // Set the relationship to required, so only results authored by the admin
-    // should return.
-    $view->initHandlers();
-    $view->relationship['uid']->options['required'] = TRUE;
-    $this->executeView($view);
-
-    $expected_result = array(
-      array(
-        'name' => 'John',
-        'uid' => 1
-      )
-    );
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-    $view->destroy();
-
-    // Set the relationship to optional should cause to return all beatles.
-    $view->initHandlers();
-    $view->relationship['uid']->options['required'] = FALSE;
-    $this->executeView($view);
-
-    $expected_result = $this->dataSet();
-    // Alter the expected result to contain the right uids.
-    foreach ($expected_result as &$row) {
-      // Only John has an existing author.
-      if ($row['name'] == 'John') {
-        $row['uid'] = 1;
-      }
-      else {
-        // The LEFT join should set an empty {users}.uid field.
-        $row['uid'] = NULL;
-      }
-    }
-
-    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
-  }
-
-  /**
-   * Tests rendering of a view with a relationship.
-   */
-  public function testRelationshipRender() {
-    $author1 = $this->createUser();
-    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 1", [':uid' => $author1->id()]);
-    $author2 = $this->createUser();
-    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 2", [':uid' => $author2->id()]);
-    // Set uid to non-existing author uid for row 3.
-    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 3", [':uid' => $author2->id() + 123]);
-
-    $view = Views::getView('test_view');
-    // Add a relationship for authors.
-    $view->getDisplay()->overrideOption('relationships', [
-      'uid' => [
-        'id' => 'uid',
-        'table' => 'views_test_data',
-        'field' => 'uid',
-      ],
-    ]);
-    // Add fields for {views_test_data}.id and author name.
-    $view->getDisplay()->overrideOption('fields', [
-      'id' => [
-        'id' => 'id',
-        'table' => 'views_test_data',
-        'field' => 'id',
-      ],
-      'author' => [
-        'id' => 'author',
-        'table' => 'users_field_data',
-        'field' => 'name',
-        'relationship' => 'uid',
-      ],
-    ]);
-
-    // Render the view.
-    $output = $view->preview();
-    $html = $this->container->get('renderer')->renderRoot($output);
-    $this->setRawContent($html);
-
-    // Check that the output contains correct values.
-    $xpath = '//div[@class="views-row" and div[@class="views-field views-field-id"]=:id and div[@class="views-field views-field-author"]=:author]';
-    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 1, ':author' => $author1->getUsername()])));
-    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 2, ':author' => $author2->getUsername()])));
-    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 3, ':author' => ''])));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
deleted file mode 100644
index b494cf6..0000000
--- a/core/modules/views/src/Tests/Handler/SortDateTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\SortDateTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests for core Drupal\views\Plugin\views\sort\Date handler.
- *
- * @group views
- */
-class SortDateTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  protected function expectedResultSet($granularity, $reverse = TRUE) {
-    $expected = array();
-    if (!$reverse) {
-      switch ($granularity) {
-          case 'second':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'Paul'),
-              array('name' => 'Meredith'),
-              array('name' => 'Ringo'),
-              array('name' => 'George'),
-            );
-            break;
-          case 'minute':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'Paul'),
-              array('name' => 'Ringo'),
-              array('name' => 'Meredith'),
-              array('name' => 'George'),
-            );
-            break;
-          case 'hour':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'Ringo'),
-              array('name' => 'Paul'),
-              array('name' => 'Meredith'),
-              array('name' => 'George'),
-            );
-            break;
-          case 'day':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'Ringo'),
-              array('name' => 'Paul'),
-              array('name' => 'Meredith'),
-              array('name' => 'George'),
-            );
-            break;
-          case 'month':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'George'),
-              array('name' => 'Ringo'),
-              array('name' => 'Paul'),
-              array('name' => 'Meredith'),
-            );
-            break;
-          case 'year':
-            $expected = array(
-              array('name' => 'John'),
-              array('name' => 'George'),
-              array('name' => 'Ringo'),
-              array('name' => 'Paul'),
-              array('name' => 'Meredith'),
-            );
-            break;
-        }
-    }
-    else {
-      switch ($granularity) {
-        case 'second':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Meredith'),
-            array('name' => 'Paul'),
-            array('name' => 'John'),
-          );
-          break;
-        case 'minute':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Meredith'),
-            array('name' => 'Paul'),
-            array('name' => 'John'),
-           );
-          break;
-        case 'hour':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-            array('name' => 'John'),
-          );
-          break;
-        case 'day':
-          $expected = array(
-            array('name' => 'George'),
-            array('name' => 'John'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
-          break;
-        case 'month':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
-          break;
-        case 'year':
-          $expected = array(
-            array('name' => 'John'),
-            array('name' => 'George'),
-            array('name' => 'Ringo'),
-            array('name' => 'Paul'),
-            array('name' => 'Meredith'),
-          );
-          break;
-      }
-    }
-
-    return $expected;
-  }
-
-  /**
-   * Tests numeric ordering of the result set.
-   */
-  public function testDateOrdering() {
-    foreach (array('second', 'minute', 'hour', 'day', 'month', 'year') as $granularity) {
-      foreach (array(FALSE, TRUE) as $reverse) {
-        $view = Views::getView('test_view');
-        $view->setDisplay();
-
-        // Change the fields.
-        $view->displayHandlers->get('default')->overrideOption('fields', array(
-          'name' => array(
-            'id' => 'name',
-            'table' => 'views_test_data',
-            'field' => 'name',
-            'relationship' => 'none',
-          ),
-          'created' => array(
-            'id' => 'created',
-            'table' => 'views_test_data',
-            'field' => 'created',
-            'relationship' => 'none',
-          ),
-        ));
-
-        // Change the ordering
-        $view->displayHandlers->get('default')->overrideOption('sorts', array(
-          'created' => array(
-            'id' => 'created',
-            'table' => 'views_test_data',
-            'field' => 'created',
-            'relationship' => 'none',
-            'granularity' => $granularity,
-            'order' => $reverse ? 'DESC' : 'ASC',
-          ),
-          'id' => array(
-            'id' => 'id',
-            'table' => 'views_test_data',
-            'field' => 'id',
-            'relationship' => 'none',
-            'order' => 'ASC',
-          ),
-        ));
-
-        // Execute the view.
-        $this->executeView($view);
-
-        // Verify the result.
-        $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-        $this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), array(
-          'views_test_data_name' => 'name',
-        ), SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
-        $view->destroy();
-        unset($view);
-      }
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/SortRandomTest.php b/core/modules/views/src/Tests/Handler/SortRandomTest.php
deleted file mode 100644
index 9a9b5a6..0000000
--- a/core/modules/views/src/Tests/Handler/SortRandomTest.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\SortRandomTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests for core Drupal\views\Plugin\views\sort\Random handler.
- *
- * @group views
- */
-class SortRandomTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Add more items to the test set, to make the order tests more robust.
-   *
-   * In total we have then 60 entries, which makes a probability of a collision
-   * of 1/60!, which is around 1/1E80, which is higher than the estimated amount
-   * of protons / electrons in the observable universe, also called the
-   * eddington number.
-   *
-   * @see http://en.wikipedia.org/wiki/Eddington_number
-   */
-  protected function dataSet() {
-    $data = parent::dataSet();
-    for ($i = 0; $i < 55; $i++) {
-      $data[] = array(
-        'name' => 'name_' . $i,
-        'age' => $i,
-        'job' => 'job_' . $i,
-        'created' => rand(0, time()),
-        'status' => 1,
-      );
-    }
-    return $data;
-  }
-
-  /**
-   * Return a basic view with random ordering.
-   */
-  protected function getBasicRandomView() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Add a random ordering.
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'random' => array(
-        'id' => 'random',
-        'field' => 'random',
-        'table' => 'views',
-      ),
-    ));
-
-    return $view;
-  }
-
-  /**
-   * Tests random ordering of the result set.
-   *
-   * @see DatabaseSelectTestCase::testRandomOrder()
-   */
-  public function testRandomOrdering() {
-    // Execute a basic view first.
-    $view = Views::getView('test_view');
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->dataSet(), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-
-    // Execute a random view, we expect the result set to be different.
-    $view_random = $this->getBasicRandomView();
-    $this->executeView($view_random);
-    $this->assertEqual(count($this->dataSet()), count($view_random->result), 'The number of returned rows match.');
-    $this->assertNotIdenticalResultset($view_random, $view->result, array(
-      'views_test_data_name' => 'views_test_data_name',
-      'views_test_data_age' => 'views_test_data_name',
-    ));
-
-    // Execute a second random view, we expect the result set to be different again.
-    $view_random_2 = $this->getBasicRandomView();
-    $this->executeView($view_random_2);
-    $this->assertEqual(count($this->dataSet()), count($view_random_2->result), 'The number of returned rows match.');
-    $this->assertNotIdenticalResultset($view_random, $view->result, array(
-      'views_test_data_name' => 'views_test_data_name',
-      'views_test_data_age' => 'views_test_data_name',
-    ));
-  }
-
-  /**
-   * Tests random ordering with tags based caching.
-   *
-   * The random sorting should opt out of caching by defining a max age of 0.
-   * At the same time, the row render caching still works.
-   */
-  public function testRandomOrderingWithRenderCaching() {
-    $view_random = $this->getBasicRandomView();
-
-    $display = &$view_random->storage->getDisplay('default');
-    $display['display_options']['cache'] = [
-      'type' => 'tag',
-    ];
-
-    $view_random->storage->save();
-
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    /** @var \Drupal\Core\Render\RenderCacheInterface $render_cache */
-    $render_cache = \Drupal::service('render_cache');
-
-    $original = $build = DisplayPluginBase::buildBasicRenderable($view_random->id(), 'default');
-    $result = $renderer->renderPlain($build);
-
-    $original['#cache'] += ['contexts' => []];
-    $original['#cache']['contexts'] = Cache::mergeContexts($original['#cache']['contexts'], $this->container->getParameter('renderer.config')['required_cache_contexts']);
-
-    $this->assertFalse($render_cache->get($original), 'Ensure there is no render cache entry.');
-
-    $build = DisplayPluginBase::buildBasicRenderable($view_random->id(), 'default');
-    $result2 = $renderer->renderPlain($build);
-
-    // Ensure that the random ordering works and don't produce the same result.
-    $this->assertNotEqual($result, $result2);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Handler/SortTest.php b/core/modules/views/src/Tests/Handler/SortTest.php
deleted file mode 100644
index e050a3f..0000000
--- a/core/modules/views/src/Tests/Handler/SortTest.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Handler\SortTest.
- */
-
-namespace Drupal\views\Tests\Handler;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler.
- *
- * @group views
- */
-class SortTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Tests numeric ordering of the result set.
-   */
-  public function testNumericOrdering() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'age' => array(
-        'order' => 'ASC',
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age'), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Reverse the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'age' => array(
-        'order' => 'DESC',
-        'id' => 'age',
-        'table' => 'views_test_data',
-        'field' => 'age',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age', TRUE), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-  }
-
-  /**
-   * Tests string ordering of the result set.
-   */
-  public function testStringOrdering() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Change the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'name' => array(
-        'order' => 'ASC',
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name'), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-
-    $view->destroy();
-    $view->setDisplay();
-
-    // Reverse the ordering
-    $view->displayHandlers->get('default')->overrideOption('sorts', array(
-      'name' => array(
-        'order' => 'DESC',
-        'id' => 'name',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'relationship' => 'none',
-      ),
-    ));
-
-    // Execute the view.
-    $this->executeView($view);
-
-    // Verify the result.
-    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name', TRUE), array(
-      'views_test_data_name' => 'name',
-      'views_test_data_age' => 'age',
-    ));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php
deleted file mode 100644
index 0c7ff8b..0000000
--- a/core/modules/views/src/Tests/ModuleTest.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\ModuleTest.
- */
-
-namespace Drupal\views\Tests;
-
-/**
- * Tests basic functions from the Views module.
- *
- * @group views
- */
-use Drupal\views\Plugin\views\filter\Standard;
-use Drupal\views\Views;
-use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Component\Render\FormattableMarkup;
-
-class ModuleTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view_status', 'test_view', 'test_argument');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['field', 'user', 'block'];
-
-  /**
-   * Stores the last triggered error, for example via debug().
-   *
-   * @var string
-   *
-   * @see \Drupal\views\Tests\ModuleTest::errorHandler()
-   */
-  protected $lastErrorMessage;
-
-  /**
-   * Tests the views_get_handler method.
-   *
-   * @see views_get_handler()
-   */
-  public function testViewsGetHandler() {
-    $types = array('field', 'area', 'filter');
-    foreach ($types as $type) {
-      $item = array(
-        'table' => $this->randomMachineName(),
-        'field' => $this->randomMachineName(),
-      );
-      $handler = $this->container->get('plugin.manager.views.' . $type)->getHandler($item);
-      $this->assertEqual('Drupal\views\Plugin\views\\' . $type . '\Broken', get_class($handler), new FormattableMarkup('Make sure that a broken handler of type: @type is created.', ['@type' => $type]));
-    }
-
-    $views_data = $this->viewsData();
-    $test_tables = array('views_test_data' => array('id', 'name'));
-    foreach ($test_tables as $table => $fields) {
-      foreach ($fields as $field) {
-        $data = $views_data[$table][$field];
-        $item = array(
-          'table' => $table,
-          'field' => $field,
-        );
-        foreach ($data as $id => $field_data) {
-          if (!in_array($id, array('title', 'help'))) {
-            $handler = $this->container->get('plugin.manager.views.' . $id)->getHandler($item);
-            $this->assertInstanceHandler($handler, $table, $field, $id);
-          }
-        }
-      }
-    }
-
-    // Test the override handler feature.
-    $item = array(
-      'table' => 'views_test_data',
-      'field' => 'job',
-    );
-    $handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard');
-    $this->assertTrue($handler instanceof Standard);
-
-    // @todo Reinstate these tests when the debug() in views_get_handler() is
-    //   restored.
-    return;
-
-    // Test non-existent tables/fields.
-    set_error_handler(array($this, 'customErrorHandler'));
-    $item = array(
-      'table' => 'views_test_data',
-      'field' => 'field_invalid',
-    );
-    $this->container->get('plugin.manager.views.field')->getHandler($item);
-    $this->assertTrue(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'))) !== FALSE, 'An invalid field name throws a debug message.');
-    unset($this->lastErrorMessage);
-
-    $item = array(
-      'table' => 'table_invalid',
-      'field' => 'id',
-    );
-    $this->container->get('plugin.manager.views.filter')->getHandler($item);
-    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
-    unset($this->lastErrorMessage);
-
-    $item = array(
-      'table' => 'table_invalid',
-      'field' => 'id',
-    );
-    $this->container->get('plugin.manager.views.filter')->getHandler($item);
-    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
-    unset($this->lastErrorMessage);
-
-    restore_error_handler();
-  }
-
-  /**
-   * Defines an error handler which is used in the test.
-   *
-   * @param int $error_level
-   *   The level of the error raised.
-   * @param string $message
-   *   The error message.
-   * @param string $filename
-   *   The filename that the error was raised in.
-   * @param int $line
-   *   The line number the error was raised at.
-   * @param array $context
-   *   An array that points to the active symbol table at the point the error
-   *   occurred.
-   *
-   * Because this is registered in set_error_handler(), it has to be public.
-   * @see set_error_handler()
-   */
-  public function customErrorHandler($error_level, $message, $filename, $line, $context) {
-    $this->lastErrorMessage = $message;
-  }
-
-  /**
-   * Tests the load wrapper/helper functions.
-   */
-  public function testLoadFunctions() {
-    $this->enableModules(array('field', 'text', 'node'));
-    $this->installConfig(array('node'));
-    $storage = $this->container->get('entity.manager')->getStorage('view');
-
-    // Test views_view_is_enabled/disabled.
-    $archive = $storage->load('archive');
-    $this->assertTrue(views_view_is_disabled($archive), 'views_view_is_disabled works as expected.');
-    // Enable the view and check this.
-    $archive->enable();
-    $this->assertTrue(views_view_is_enabled($archive), ' views_view_is_enabled works as expected.');
-
-    // We can store this now, as we have enabled/disabled above.
-    $all_views = $storage->loadMultiple();
-
-    // Test Views::getAllViews().
-    $this->assertIdentical(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.');
-
-    // Test Views::getEnabledViews().
-    $expected_enabled = array_filter($all_views, function($view) {
-      return views_view_is_enabled($view);
-    });
-    $this->assertIdentical(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.');
-
-    // Test Views::getDisabledViews().
-    $expected_disabled = array_filter($all_views, function($view) {
-      return views_view_is_disabled($view);
-    });
-    $this->assertIdentical(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.');
-
-    // Test Views::getViewsAsOptions().
-    // Test the $views_only parameter.
-    $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.');
-    $expected_options = array();
-    foreach ($all_views as $id => $view) {
-      $expected_options[$id] = $view->label();
-    }
-    $this->assertIdentical($expected_options, $this->castSafeStrings(Views::getViewsAsOptions(TRUE)), 'Expected options array was returned.');
-
-    // Test the default.
-    $this->assertIdentical($this->formatViewOptions($all_views), $this->castSafeStrings(Views::getViewsAsOptions()), 'Expected options array for all views was returned.');
-    // Test enabled views.
-    $this->assertIdentical($this->formatViewOptions($expected_enabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'enabled')), 'Expected enabled options array was returned.');
-    // Test disabled views.
-    $this->assertIdentical($this->formatViewOptions($expected_disabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'disabled')), 'Expected disabled options array was returned.');
-
-    // Test the sort parameter.
-    $all_views_sorted = $all_views;
-    ksort($all_views_sorted);
-    $this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order');
-
-    // Test $exclude_view parameter.
-    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name');
-    $this->assertFalse(array_key_exists('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name');
-    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
-
-    // Test the $opt_group parameter.
-    $expected_opt_groups = array();
-    foreach ($all_views as $view) {
-      foreach ($view->get('display') as $display) {
-          $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = (string) t('@view : @display', array('@view' => $view->id(), '@display' => $display['id']));
-      }
-    }
-    $this->assertIdentical($expected_opt_groups, $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE)), 'Expected option array for an option group returned.');
-  }
-
-  /**
-   * Tests view enable and disable procedural wrapper functions.
-   */
-  function testStatusFunctions() {
-    $view = Views::getView('test_view_status')->storage;
-
-    $this->assertFalse($view->status(), 'The view status is disabled.');
-
-    views_enable_view($view);
-    $this->assertTrue($view->status(), 'A view has been enabled.');
-    $this->assertEqual($view->status(), views_view_is_enabled($view), 'views_view_is_enabled is correct.');
-
-    views_disable_view($view);
-    $this->assertFalse($view->status(), 'A view has been disabled.');
-    $this->assertEqual(!$view->status(), views_view_is_disabled($view), 'views_view_is_disabled is correct.');
-  }
-
-  /**
-   * Tests the \Drupal\views\Views::fetchPluginNames() method.
-   */
-  public function testViewsFetchPluginNames() {
-    // All style plugins should be returned, as we have not specified a type.
-    $plugins = Views::fetchPluginNames('style');
-    $definitions = $this->container->get('plugin.manager.views.style')->getDefinitions();
-    $expected = array();
-    foreach ($definitions as $id =>$definition) {
-      $expected[$id] = $definition['title'];
-    }
-    asort($expected);
-    $this->assertIdentical(array_keys($plugins), array_keys($expected));
-
-    // Test using the 'test' style plugin type only returns the test_style and
-    // mapping_test plugins.
-    $plugins = Views::fetchPluginNames('style', 'test');
-    $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style'));
-
-    // Test a non existent style plugin type returns no plugins.
-    $plugins = Views::fetchPluginNames('style', $this->randomString());
-    $this->assertIdentical($plugins, array());
-  }
-
-  /**
-   * Tests the \Drupal\views\Views::pluginList() method.
-   */
-  public function testViewsPluginList() {
-    $plugin_list = Views::pluginList();
-    // Only plugins used by 'test_view' should be in the plugin list.
-    foreach (array('display:default', 'pager:none') as $key) {
-      list($plugin_type, $plugin_id) = explode(':', $key);
-      $plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
-
-      $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', array('@key' => $key)));
-      $plugin_details = $plugin_list[$key];
-
-      $this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
-      $this->assertEqual($plugin_details['title'], $plugin_def['title'], 'The expected plugin title was found.');
-      $this->assertEqual($plugin_details['provider'], $plugin_def['provider'], 'The expected plugin provider was found.');
-      $this->assertTrue(in_array('test_view', $plugin_details['views']), 'The test_view View was found in the list of views using this plugin.');
-    }
-  }
-
-  /**
-   * Tests views.module: views_embed_view().
-   */
-  public function testViewsEmbedView() {
-    $this->enableModules(array('user'));
-
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
-    $result = views_embed_view('test_argument');
-    $renderer->renderPlain($result);
-    $this->assertEqual(count($result['view_build']['#view']->result), 5);
-
-    $result = views_embed_view('test_argument', 'default', 1);
-    $renderer->renderPlain($result);
-    $this->assertEqual(count($result['view_build']['#view']->result), 1);
-
-    $result = views_embed_view('test_argument', 'default', '1,2');
-    $renderer->renderPlain($result);
-    $this->assertEqual(count($result['view_build']['#view']->result), 2);
-
-    $result = views_embed_view('test_argument', 'default', '1,2', 'John');
-    $renderer->renderPlain($result);
-    $this->assertEqual(count($result['view_build']['#view']->result), 1);
-
-    $result = views_embed_view('test_argument', 'default', '1,2', 'John,George');
-    $renderer->renderPlain($result);
-    $this->assertEqual(count($result['view_build']['#view']->result), 2);
-  }
-
-  /**
-   * Tests the \Drupal\views\ViewsExecutable::preview() method.
-   */
-  public function testViewsPreview() {
-    $this->enableModules(array('user'));
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default');
-    $this->assertEqual(count($result['#view']->result), 5);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => 1));
-    $this->assertEqual(count($result['#view']->result), 1);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => 1));
-    $this->assertEqual(count($result['#view']->result), 1);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2'));
-    $this->assertEqual(count($result['#view']->result), 2);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2'));
-    $this->assertEqual(count($result['#view']->result), 2);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2', '1' => 'John'));
-    $this->assertEqual(count($result['#view']->result), 1);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2', '4' => 'John'));
-    $this->assertEqual(count($result['#view']->result), 1);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('0' => '1,2', '1' => 'John,George'));
-    $this->assertEqual(count($result['#view']->result), 2);
-
-    $view = Views::getView('test_argument');
-    $result = $view->preview('default', array('3' => '1,2', '4' => 'John,George'));
-    $this->assertEqual(count($result['#view']->result), 2);
-  }
-
-  /**
-   * Helper to return an expected views option array.
-   *
-   * @param array $views
-   *   An array of Drupal\views\Entity\View objects for which to
-   *   create an options array.
-   *
-   * @return array
-   *   A formatted options array that matches the expected output.
-   */
-  protected function formatViewOptions(array $views = array()) {
-    $expected_options = array();
-    foreach ($views as $view) {
-      foreach ($view->get('display') as $display) {
-        $expected_options[$view->id() . ':' . $display['id']] = (string) t('View: @view - Display: @display',
-          array('@view' => $view->id(), '@display' => $display['id']));
-      }
-    }
-
-    return $expected_options;
-  }
-
-  /**
-   * Ensure that a certain handler is a instance of a certain table/field.
-   */
-  function assertInstanceHandler($handler, $table, $field, $id) {
-    $table_data = $this->container->get('views.views_data')->get($table);
-    $field_data = $table_data[$field][$id];
-
-    $this->assertEqual($field_data['id'], $handler->getPluginId());
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
deleted file mode 100644
index 08b8984..0000000
--- a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\ArgumentValidatorTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-use Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest as ArgumentValidatorTestPlugin;
-
-/**
- * Tests Views argument validators.
- *
- * @group views
- */
-class ArgumentValidatorTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = ['test_view_argument_validate_numeric', 'test_view'];
-
-  function testArgumentValidateNumeric() {
-    $view = Views::getView('test_view_argument_validate_numeric');
-    $view->initHandlers();
-    $this->assertFalse($view->argument['null']->validateArgument($this->randomString()));
-    // Reset safed argument validation.
-    $view->argument['null']->argument_validated = NULL;
-    $this->assertTrue($view->argument['null']->validateArgument(12));
-  }
-
-  /**
-   * Tests the argument validator test plugin.
-   *
-   * @see Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest
-   */
-  public function testArgumentValidatorPlugin() {
-    $view = Views::getView('test_view');
-
-    // Add a new argument and set the test plugin for the argument_validator.
-    $options = [
-      'specify_validation' => TRUE,
-      'validate' => [
-        'type' => 'argument_validator_test'
-      ]
-    ];
-    $id = $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
-    $view->initHandlers();
-
-    $test_value = $this->randomMachineName();
-
-    $argument = $view->argument[$id];
-    $argument->options['validate_options']['test_value'] = $test_value;
-    $this->assertFalse($argument->validateArgument($this->randomMachineName()), 'A random value does not validate.');
-    // Reset internal flag.
-    $argument->argument_validated = NULL;
-    $this->assertTrue($argument->validateArgument($test_value), 'The right argument validates.');
-
-    $plugin = $argument->getPlugin('argument_validator');
-    $this->assertTrue($plugin instanceof ArgumentValidatorTestPlugin, 'The correct argument validator plugin is used.');
-    $this->assertFalse($plugin->validateArgument($this->randomMachineName()), 'A random value does not validate.');
-    $this->assertTrue($plugin->validateArgument($test_value), 'The right argument validates.');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
deleted file mode 100644
index 6a5064c..0000000
--- a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\BlockDependenciesTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests views block config dependencies functionality.
- *
- * @group views
- */
-class BlockDependenciesTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_exposed_block');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'block', 'user', 'field');
-
-  /**
-   * Tests that exposed filter blocks have the correct dependencies.
-   *
-   * @see \Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock::getDerivativeDefinitions()
-   */
-  public function testExposedBlock() {
-    $block = $this->createBlock('views_exposed_filter_block:test_exposed_block-page_1');
-    $dependencies = $block->calculateDependencies()->getDependencies();
-    $expected = array(
-      'config' => array('views.view.test_exposed_block'),
-      'module' => array('views'),
-      'theme' => array('stark')
-    );
-    $this->assertIdentical($expected, $dependencies);
-  }
-
-  /**
-   * Tests that exposed filter blocks have the correct dependencies.
-   *
-   * @see \Drupal\views\Plugin\Derivative\ViewsBlock::getDerivativeDefinitions()
-   */
-  public function testViewsBlock() {
-    $block = $this->createBlock('views_block:content_recent-block_1');
-    $dependencies = $block->calculateDependencies()->getDependencies();
-    $expected = array(
-      'config' => array('views.view.content_recent'),
-      'module' => array('views'),
-      'theme' => array('stark')
-    );
-    $this->assertIdentical($expected, $dependencies);
-  }
-
-  /**
-   * Creates a block instance based on default settings.
-   *
-   * @param string $plugin_id
-   *   The plugin ID of the block type for this block instance.
-   * @param array $settings
-   *   (optional) An associative array of settings for the block entity.
-   *   Override the defaults by specifying the key and value in the array, for
-   *   example:
-   *   @code
-   *     $this->createBlock('system_powered_by_block', array(
-   *       'label' => t('Hello, world!'),
-   *     ));
-   *   @endcode
-   *   The following defaults are provided:
-   *   - label: Random string.
-   *   - id: Random string.
-   *   - region: 'sidebar_first'.
-   *   - theme: The default theme.
-   *   - visibility: Empty array.
-   *
-   * @return \Drupal\block\Entity\Block
-   *   The block entity.
-   */
-  protected function createBlock($plugin_id, array $settings = array()) {
-    $settings += array(
-      'plugin' => $plugin_id,
-      'region' => 'sidebar_first',
-      'id' => strtolower($this->randomMachineName(8)),
-      'theme' => $this->config('system.theme')->get('default'),
-      'label' => $this->randomMachineName(8),
-      'visibility' => array(),
-      'weight' => 0,
-    );
-    $values = [];
-    foreach (array('region', 'id', 'theme', 'plugin', 'weight', 'visibility') as $key) {
-      $values[$key] = $settings[$key];
-      // Remove extra values that do not belong in the settings array.
-      unset($settings[$key]);
-    }
-    foreach ($values['visibility'] as $id => $visibility) {
-      $values['visibility'][$id]['id'] = $id;
-    }
-    $values['settings'] = $settings;
-    $block = entity_create('block', $values);
-    $block->save();
-    return $block;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php
deleted file mode 100644
index be23770..0000000
--- a/core/modules/views/src/Tests/Plugin/CacheTest.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\CacheTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\Core\Render\RenderContext;
-use Drupal\node\Entity\Node;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
-
-/**
- * Tests pluggable caching for views.
- *
- * @group views
- * @see views_plugin_cache
- */
-class CacheTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view', 'test_cache', 'test_groupwise_term_ui', 'test_display', 'test_filter');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('taxonomy', 'text', 'user', 'node');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('taxonomy_term');
-    $this->installEntitySchema('user');
-
-    // Setup the current time properly.
-    \Drupal::request()->server->set('REQUEST_TIME', time());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-
-    $data['views_test_data']['test_cache_context'] = [
-      'real field' => 'name',
-      'title' => 'Test cache context',
-      'filter' => [
-        'id' => 'views_test_test_cache_context',
-      ],
-    ];
-
-    return $data;
-  }
-
-
-  /**
-   * Tests time based caching.
-   *
-   * @see views_plugin_cache_time
-   */
-  public function testTimeResultCaching() {
-    $view = Views::getView('test_cache');
-    $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'time',
-      'options' => array(
-        'results_lifespan' => '3600',
-        'output_lifespan' => '3600',
-      )
-    ));
-
-    // Test the default (non-paged) display.
-    $this->executeView($view);
-    // Verify the result.
-    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-
-    // Add another man to the beatles.
-    $record = array(
-      'name' => 'Rod Davis',
-      'age' => 29,
-      'job' => 'Banjo',
-    );
-    db_insert('views_test_data')->fields($record)->execute();
-
-    // The result should be the same as before, because of the caching. (Note
-    // that views_test_data records don't have associated cache tags, and hence
-    // the results cache items aren't invalidated.)
-    $view->destroy();
-    $this->executeView($view);
-    // Verify the result.
-    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-  }
-
-  /**
-   * Tests result caching with filters.
-   *
-   * @see views_plugin_cache_time
-   */
-  public function testTimeResultCachingWithFilter() {
-    // Check that we can find the test filter plugin.
-    $plugin = $this->container->get('plugin.manager.views.filter')->createInstance('test_filter');
-    $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
-
-    $view = Views::getView('test_filter');
-    $view->initDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'time',
-      'options' => array(
-        'results_lifespan' => '3600',
-        'output_lifespan' => '3600',
-      ),
-    ));
-
-    // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
-        'id' => 'test_filter',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'operator' => '=',
-        'value' => 'John',
-        'group' => 0,
-      ),
-    ));
-
-    $this->executeView($view);
-
-    // Get the cache item.
-    $cid1 = $view->display_handler->getPlugin('cache')->generateResultsKey();
-
-    // Build the expected result.
-    $dataset = array(array('name' => 'John'));
-
-    // Verify the result.
-    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
-      'views_test_data_name' => 'name',
-    ));
-
-    $view->destroy();
-
-    $view->initDisplay();
-
-    // Change the filtering.
-    $view->displayHandlers->get('default')->overrideOption('filters', array(
-      'test_filter' => array(
-        'id' => 'test_filter',
-        'table' => 'views_test_data',
-        'field' => 'name',
-        'operator' => '=',
-        'value' => 'Ringo',
-        'group' => 0,
-      ),
-    ));
-
-    $this->executeView($view);
-
-    // Get the cache item.
-    $cid2 = $view->display_handler->getPlugin('cache')->generateResultsKey();
-    $this->assertNotEqual($cid1, $cid2, "Results keys are different.");
-
-    // Build the expected result.
-    $dataset = array(array('name' => 'Ringo'));
-
-    // Verify the result.
-    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
-    $this->assertIdenticalResultSet($view, $dataset, array(
-      'views_test_data_name' => 'name',
-    ));
-  }
-
-  /**
-   * Tests result caching with a pager.
-   */
-  public function testTimeResultCachingWithPager() {
-    $view = Views::getView('test_cache');
-    $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'time',
-      'options' => array(
-        'results_lifespan' => '3600',
-        'output_lifespan' => '3600',
-      )
-    ));
-
-    $mapping = ['views_test_data_name' => 'name'];
-
-    $view->setDisplay('page_1');
-    $view->setCurrentPage(0);
-    $this->executeView($view);
-    $this->assertIdenticalResultset($view, [['name' => 'John'], ['name' => 'George']], $mapping);
-    $view->destroy();
-
-    $view->setDisplay('page_1');
-    $view->setCurrentPage(1);
-    $this->executeView($view);
-    $this->assertIdenticalResultset($view, [['name' => 'Ringo'], ['name' => 'Paul']], $mapping);
-    $view->destroy();
-
-    $view->setDisplay('page_1');
-    $view->setCurrentPage(0);
-    $this->executeView($view);
-    $this->assertIdenticalResultset($view, [['name' => 'John'], ['name' => 'George']], $mapping);
-    $view->destroy();
-
-    $view->setDisplay('page_1');
-    $view->setCurrentPage(2);
-    $this->executeView($view);
-    $this->assertIdenticalResultset($view, [['name' => 'Meredith']], $mapping);
-    $view->destroy();
-  }
-
-  /**
-   * Tests no caching.
-   *
-   * @see views_plugin_cache_time
-   */
-  function testNoneResultCaching() {
-    // Create a basic result which just 2 results.
-    $view = Views::getView('test_cache');
-    $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'none',
-      'options' => array(),
-    ));
-
-    $this->executeView($view);
-    // Verify the result.
-    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
-
-    // Add another man to the beatles.
-    $record = array(
-      'name' => 'Rod Davis',
-      'age' => 29,
-      'job' => 'Banjo',
-    );
-    db_insert('views_test_data')->fields($record)->execute();
-
-    // The Result changes, because the view is not cached.
-    $view = Views::getView('test_cache');
-    $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'none',
-      'options' => array(),
-    ));
-
-    $this->executeView($view);
-    // Verify the result.
-    $this->assertEqual(6, count($view->result), 'The number of returned rows match.');
-  }
-
-  /**
-   * Tests css/js storage and restoring mechanism.
-   */
-  function testHeaderStorage() {
-    // Create a view with output caching enabled.
-    // Some hook_views_pre_render in views_test_data.module adds the test css/js file.
-    // so they should be added to the css/js storage.
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-    $view->storage->set('id', 'test_cache_header_storage');
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'time',
-      'options' => array(
-        'output_lifespan' => '3600',
-      )
-    ));
-
-    $output = $view->buildRenderable();
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
-      return $renderer->render($output);
-    });
-
-    unset($view->pre_render_called);
-    $view->destroy();
-
-    $view->setDisplay();
-    $output = $view->buildRenderable();
-    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
-      return $renderer->render($output);
-    });
-
-    $this->assertTrue(in_array('views_test_data/test', $output['#attached']['library']), 'Make sure libraries are added for cached views.');
-    $this->assertEqual(['foo' => 'bar'], $output['#attached']['drupalSettings'], 'Make sure drupalSettings are added for cached views.');
-    // Note: views_test_data_views_pre_render() adds some cache tags.
-    $this->assertEqual(['config:views.view.test_cache_header_storage', 'views_test_data:1'], $output['#cache']['tags']);
-    $this->assertEqual(['non-existing-placeholder-just-for-testing-purposes' => ['#lazy_builder' => ['views_test_data_placeholders', ['bar']]]], $output['#attached']['placeholders']);
-    $this->assertFalse(!empty($view->build_info['pre_render_called']), 'Make sure hook_views_pre_render is not called for the cached view.');
-  }
-
-  /**
-   * Tests that Subqueries are cached as expected.
-   */
-  public function testSubqueryStringCache() {
-    // Execute the view.
-    $view = Views::getView('test_groupwise_term_ui');
-    $view->setDisplay();
-    $this->executeView($view);
-    // Request for the cache.
-    $cid = 'views_relationship_groupwise_max:test_groupwise_term_ui:default:tid_representative';
-    $cache = \Drupal::cache('data')->get($cid);
-    $this->assertEqual($cid, $cache->cid, 'Subquery String cached as expected.');
-  }
-
-  /**
-   * Tests the data contained in cached items.
-   */
-  public function testCacheData() {
-    for ($i = 1; $i <= 5; $i++) {
-      Node::create([
-        'title' => $this->randomMachineName(8),
-        'type' => 'page',
-      ])->save();
-    }
-
-    $view = Views::getView('test_display');
-    $view->setDisplay();
-    $view->display_handler->overrideOption('cache', array(
-      'type' => 'time',
-      'options' => array(
-        'results_lifespan' => '3600',
-        'output_lifespan' => '3600',
-      )
-    ));
-    $this->executeView($view);
-
-    // Get the cache item.
-    $cid = $view->display_handler->getPlugin('cache')->generateResultsKey();
-    $cache = \Drupal::cache('data')->get($cid);
-
-    // Assert there are results, empty results would mean this test case would
-    // pass otherwise.
-    $this->assertTrue(count($cache->data['result']), 'Results saved in cached data.');
-
-    // Assert each row doesn't contain '_entity' or '_relationship_entities'
-    // items.
-    foreach ($cache->data['result'] as $row) {
-      $this->assertIdentical($row->_entity, NULL, 'Cached row "_entity" property is NULL');
-      $this->assertIdentical($row->_relationship_entities, [], 'Cached row "_relationship_entities" property is empty');
-    }
-  }
-
-  /**
-   * Tests the cache context integration for views result cache.
-   */
-  public function testCacheContextIntegration() {
-    $view = Views::getView('test_cache');
-    $view->setDisplay('page_2');
-    \Drupal::state()->set('views_test_cache_context', 'George');
-    $this->executeView($view);
-
-    $map = ['views_test_data_name' => 'name'];
-    $this->assertIdenticalResultset($view, [['name' => 'George']], $map);
-
-    // Update the entry in the DB to ensure that result caching works.
-    \Drupal::database()->update('views_test_data')
-      ->condition('name', 'George')
-      ->fields(['name' => 'egroeG'])
-      ->execute();
-
-    $view = Views::getView('test_cache');
-    $view->setDisplay('page_2');
-    $this->executeView($view);
-    $this->assertIdenticalResultset($view, [['name' => 'George']], $map);
-
-    // Now change the cache context value, a different query should be executed.
-    $view = Views::getView('test_cache');
-    $view->setDisplay('page_2');
-    \Drupal::state()->set('views_test_cache_context', 'Paul');
-    $this->executeView($view);
-
-    $this->assertIdenticalResultset($view, [['name' => 'Paul']], $map);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/DisplayKernelTest.php b/core/modules/views/src/Tests/Plugin/DisplayKernelTest.php
deleted file mode 100644
index e07a536..0000000
--- a/core/modules/views/src/Tests/Plugin/DisplayKernelTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\DisplayKernelTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Plugin\views\style\StylePluginBase;
-use Drupal\views\Plugin\views\access\AccessPluginBase;
-use Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase;
-use Drupal\views\Plugin\views\pager\PagerPluginBase;
-use Drupal\views\Plugin\views\query\QueryPluginBase;
-use Drupal\views\Plugin\views\cache\CachePluginBase;
-use Drupal\views\Plugin\views\row\RowPluginBase;
-
-/**
- * Drupal unit tests for the DisplayPluginBase class.
- *
- * @group views
- */
-class DisplayKernelTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'node', 'field', 'user');
-
-  /**
-   * Views plugin types to test.
-   *
-   * @var array
-   */
-  protected $pluginTypes = array(
-    'access',
-    'cache',
-    'query',
-    'exposed_form',
-    'pager',
-    'style',
-    'row',
-  );
-
-  /**
-   * Views handler types to test.
-   *
-   * @var array
-   */
-  protected $handlerTypes = array(
-    'fields',
-    'sorts',
-  );
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_display_defaults');
-
-  /**
-   * Tests the default display options.
-   */
-  public function testDefaultOptions() {
-    // Save the view.
-    $view = Views::getView('test_display_defaults');
-    $view->mergeDefaults();
-    $view->save();
-
-    // Reload to get saved storage values.
-    $view = Views::getView('test_display_defaults');
-    $view->initDisplay();
-    $display_data = $view->storage->get('display');
-
-    foreach ($view->displayHandlers as $id => $display) {
-      // Test the view plugin options against the storage.
-      foreach ($this->pluginTypes as $type) {
-        $options = $display->getOption($type);
-        $this->assertIdentical($display_data[$id]['display_options'][$type]['options'], $options['options']);
-      }
-      // Test the view handler options against the storage.
-      foreach ($this->handlerTypes as $type) {
-        $options = $display->getOption($type);
-        $this->assertIdentical($display_data[$id]['display_options'][$type], $options);
-      }
-    }
-  }
-
-  /**
-   * Tests the \Drupal\views\Plugin\views\display\DisplayPluginBase::getPlugin() method.
-   */
-  public function testGetPlugin() {
-    $view = Views::getView('test_display_defaults');
-    $view->initDisplay();
-    $display_handler = $view->display_handler;
-
-    $this->assertTrue($display_handler->getPlugin('access') instanceof AccessPluginBase, 'An access plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('cache') instanceof CachePluginBase, 'A cache plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('exposed_form') instanceof ExposedFormPluginBase, 'An exposed_form plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('pager') instanceof PagerPluginBase, 'A pager plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('query') instanceof QueryPluginBase, 'A query plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('row') instanceof RowPluginBase, 'A row plugin instance was returned.');
-    $this->assertTrue($display_handler->getPlugin('style') instanceof StylePluginBase, 'A style plugin instance was returned.');
-    // Test that nothing is returned when an invalid type is requested.
-    $this->assertNull($display_handler->getPlugin('invalid'), 'NULL was returned for an invalid instance');
-    // Test that nothing was returned for an instance with no 'type' in options.
-    unset($display_handler->options['access']);
-    $this->assertNull($display_handler->getPlugin('access'), 'NULL was returned for a plugin type with no "type" option');
-
-    // Get a plugin twice, and make sure the same instance is returned.
-    $view->destroy();
-    $view->initDisplay();
-    $first = spl_object_hash($display_handler->getPlugin('style'));
-    $second = spl_object_hash($display_handler->getPlugin('style'));
-    $this->assertIdentical($first, $second, 'The same plugin instance was returned.');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/DisplayPageTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageTest.php
deleted file mode 100644
index 7c7593d..0000000
--- a/core/modules/views/src/Tests/Plugin/DisplayPageTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\DisplayPageTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\Core\Menu\MenuTreeParameters;
-use Drupal\Core\Session\AnonymousUserSession;
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * Tests the page display plugin.
- *
- * @group views
- * @see \Drupal\views\Plugin\display\Page
- */
-class DisplayPageTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_page_display', 'test_page_display_route', 'test_page_display_menu');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'field');
-
-  /**
-   * The router dumper to get all routes.
-   *
-   * @var \Drupal\Core\Routing\MatcherDumper
-   */
-  protected $routerDumper;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    // Setup the needed tables in order to make the drupal router working.
-    $this->installSchema('system', array('url_alias'));
-  }
-
-  /**
-   * Checks the behavior of the page for access denied/not found behaviors.
-   */
-  public function testPageResponses() {
-    \Drupal::currentUser()->setAccount(new AnonymousUserSession());
-    $subrequest = Request::create('/test_page_display_403', 'GET');
-    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
-    $this->assertEqual($response->getStatusCode(), 403);
-
-    $subrequest = Request::create('/test_page_display_404', 'GET');
-    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
-    $this->assertEqual($response->getStatusCode(), 404);
-
-    $subrequest = Request::create('/test_page_display_200', 'GET');
-    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
-    $this->assertEqual($response->getStatusCode(), 200);
-
-    $subrequest = Request::create('/test_page_display_200', 'GET');
-    \Drupal::getContainer()->get('request_stack')->push($subrequest);
-
-    // Test accessing a disabled page for a view.
-    $view = Views::getView('test_page_display');
-    // Disable the view, rebuild menu, and request the page again.
-    $view->storage->disable()->save();
-    // Router rebuild would occur in a kernel terminate event so we need to
-    // simulate that here.
-    \Drupal::service('router.builder')->rebuild();
-
-    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
-    $this->assertEqual($response->getStatusCode(), 404);
-  }
-
-  /**
-   * Checks that the router items are properly registered
-   */
-  public function testPageRouterItems() {
-    $collection = \Drupal::service('views.route_subscriber')->routes();
-
-    // Check the controller defaults.
-    foreach ($collection as $id => $route) {
-      $this->assertEqual($route->getDefault('_controller'), 'Drupal\views\Routing\ViewPageController::handle');
-      $id_parts = explode('.', $id);
-      $this->assertEqual($route->getDefault('view_id'), $id_parts[1]);
-      $this->assertEqual($route->getDefault('display_id'), $id_parts[2]);
-    }
-
-    // Check the generated patterns and default values.
-    $route = $collection->get('view.test_page_display_route.page_1');
-    $this->assertEqual($route->getPath(), '/test_route_without_arguments');
-
-    $route = $collection->get('view.test_page_display_route.page_2');
-    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}');
-    $this->assertTrue($route->hasDefault('arg_0'), 'A default value is set for the optional argument id.');
-
-    $route = $collection->get('view.test_page_display_route.page_3');
-    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/suffix');
-    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
-
-    $route = $collection->get('view.test_page_display_route.page_4');
-    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/suffix/{arg_1}');
-    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
-    $this->assertTrue($route->hasDefault('arg_1'), 'A default value is set for the optional argument id_2.');
-
-    $route = $collection->get('view.test_page_display_route.page_5');
-    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/{arg_1}');
-    $this->assertTrue($route->hasDefault('arg_0'), 'A default value is set for the optional argument id.');
-    $this->assertTrue($route->hasDefault('arg_1'), 'A default value is set for the optional argument id_2.');
-
-    $route = $collection->get('view.test_page_display_route.page_6');
-    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/{arg_1}');
-    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
-    $this->assertFalse($route->hasDefault('arg_1'), 'No default value is set for the required argument id_2.');
-  }
-
-  /**
-   * Tests the generated menu links of views.
-   */
-  public function testMenuLinks() {
-    \Drupal::service('plugin.manager.menu.link')->rebuild();
-    $tree = \Drupal::menuTree()->load('admin', new MenuTreeParameters());
-    $this->assertTrue(isset($tree['system.admin']->subtree['views_view:views.test_page_display_menu.page_4']));
-    $menu_link = $tree['system.admin']->subtree['views_view:views.test_page_display_menu.page_4']->link;
-    $this->assertEqual($menu_link->getTitle(), 'Test child (with parent)');
-    $this->assertEqual($menu_link->isExpanded(), TRUE);
-    $this->assertEqual($menu_link->getDescription(), 'Sample description.');
-  }
-
-  /**
-   * Tests the calculated dependencies for various views using Page displays.
-   */
-  public function testDependencies() {
-    $view = Views::getView('test_page_display');
-    $this->assertIdentical([], $view->getDependencies());
-
-    $view = Views::getView('test_page_display_route');
-    $expected = [
-      'content' => ['StaticTest'],
-      'module' => ['views_test_data'],
-    ];
-    $this->assertIdentical($expected, $view->getDependencies());
-
-    $view = Views::getView('test_page_display_menu');
-    $expected = [
-      'config' => [
-        'system.menu.admin',
-        'system.menu.tools',
-      ],
-    ];
-    $this->assertIdentical($expected, $view->getDependencies());
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php
index 20aa722..be003cf 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Plugin;
 
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\views\Entity\View;
 use Drupal\views\Views;
 use Drupal\views_test_data\Plugin\views\display\DisplayTest as DisplayTestPlugin;
 
@@ -230,7 +231,7 @@ public function testReadMore() {
     $this->assertTrue(empty($result), 'The more link is not shown when view has more records.');
 
     // Test the default value of use_more_always.
-    $view = entity_create('view')->getExecutable();
+    $view = View::create()->getExecutable();
     $this->assertTrue($view->getDisplay()->getOption('use_more_always'), 'Always display the more link by default.');
   }
 
diff --git a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
index 1c520e0..3634e23 100644
--- a/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
+++ b/core/modules/views/src/Tests/Plugin/ExposedFormTest.php
@@ -85,6 +85,69 @@ public function testSubmitButton() {
   }
 
   /**
+   * Tests the exposed form with a non-standard identifier.
+   */
+  public function testExposedIdentifier() {
+    // Alter the identifier of the filter to a random string.
+    $view = Views::getView('test_exposed_form_buttons');
+    $view->setDisplay();
+    $identifier = 'new_identifier';
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'type' => [
+        'exposed' => TRUE,
+        'field' => 'type',
+        'id' => 'type',
+        'table' => 'node_field_data',
+        'plugin_id' => 'in_operator',
+        'entity_type' => 'node',
+        'entity_field' => 'type',
+        'expose' => [
+          'identifier' => $identifier,
+          'label' => 'Content: Type',
+          'operator_id' => 'type_op',
+          'reduce' => FALSE,
+          'description' => 'Exposed overridden description'
+        ],
+      ]
+    ));
+    $view->save();
+    $this->drupalGet('test_exposed_form_buttons', array('query' => array($identifier => 'article')));
+    $this->assertFieldById(Html::getId('edit-' . $identifier), 'article', "Article type filter set with new identifier.");
+
+    // Alter the identifier of the filter to a random string containing
+    // restricted characters.
+    $view = Views::getView('test_exposed_form_buttons');
+    $view->setDisplay();
+    $identifier = 'bad identifier';
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'type' => [
+        'exposed' =>  TRUE,
+        'field' => 'type',
+        'id' => 'type',
+        'table' => 'node_field_data',
+        'plugin_id' => 'in_operator',
+        'entity_type' => 'node',
+        'entity_field' => 'type',
+        'expose' => [
+          'identifier' => $identifier,
+          'label' => 'Content: Type',
+          'operator_id' => 'type_op',
+          'reduce' => FALSE,
+          'description' => 'Exposed overridden description'
+        ],
+      ]
+    ));
+    $this->executeView($view);
+
+    $errors = $view->validate();
+    $expected = [
+      'default' => ['This identifier has illegal characters.'],
+      'page_1' => ['This identifier has illegal characters.'],
+    ];
+    $this->assertEqual($errors, $expected);
+  }
+
+  /**
    * Tests whether the reset button works on an exposed form.
    */
   public function testResetButton() {
diff --git a/core/modules/views/src/Tests/Plugin/JoinTest.php b/core/modules/views/src/Tests/Plugin/JoinTest.php
deleted file mode 100644
index fa1460c..0000000
--- a/core/modules/views/src/Tests/Plugin/JoinTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\JoinTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views_test_data\Plugin\views\join\JoinTest as JoinTestPlugin;
-use Drupal\views\Plugin\views\join\JoinPluginBase;
-use Drupal\views\Views;
-
-
-/**
- * Tests the join plugin.
- *
- * @group views
- * @see \Drupal\views_test_data\Plugin\views\join\JoinTest
- * @see \Drupal\views\Plugin\views\join\JoinPluginBase
- */
-class JoinTest extends RelationshipJoinTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * A plugin manager which handlers the instances of joins.
-   *
-   * @var \Drupal\views\Plugin\ViewsPluginManager
-   */
-  protected $manager;
-
-  protected function setUp() {
-    parent::setUp();
-
-    // Add a join plugin manager which can be used in all of the tests.
-    $this->manager = $this->container->get('plugin.manager.views.join');
-  }
-
-  /**
-   * Tests an example join plugin.
-   */
-  public function testExamplePlugin() {
-
-    // Setup a simple join and test the result sql.
-    $view = Views::getView('test_view');
-    $view->initDisplay();
-    $view->initQuery();
-
-    $configuration = array(
-      'left_table' => 'views_test_data',
-      'left_field' => 'uid',
-      'table' => 'users_field_data',
-      'field' => 'uid',
-    );
-    $join = $this->manager->createInstance('join_test', $configuration);
-    $this->assertTrue($join instanceof JoinTestPlugin, 'The correct join class got loaded.');
-
-    $rand_int = rand(0, 1000);
-    $join->setJoinValue($rand_int);
-
-    $query = db_select('views_test_data');
-    $table = array('alias' => 'users_field_data');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users_field_data'];
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = $rand_int") !== FALSE, 'Make sure that the custom join plugin can extend the join base and alter the result.');
-  }
-
-  /**
-   * Tests the join plugin base.
-   */
-  public function testBasePlugin() {
-
-    // Setup a simple join and test the result sql.
-    $view = Views::getView('test_view');
-    $view->initDisplay();
-    $view->initQuery();
-
-    // First define a simple join without an extra condition.
-    // Set the various options on the join object.
-    $configuration = array(
-      'left_table' => 'views_test_data',
-      'left_field' => 'uid',
-      'table' => 'users_field_data',
-      'field' => 'uid',
-      'adjusted' => TRUE,
-    );
-    $join = $this->manager->createInstance('standard', $configuration);
-    $this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.');
-    $this->assertNull($join->extra, 'The field extra was not overridden.');
-    $this->assertTrue($join->adjusted, 'The field adjusted was set correctly.');
-
-    // Build the actual join values and read them back from the dbtng query
-    // object.
-    $query = db_select('views_test_data');
-    $table = array('alias' => 'users_field_data');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users_field_data'];
-    $this->assertEqual($join_info['join type'], 'LEFT', 'Make sure the default join type is LEFT');
-    $this->assertEqual($join_info['table'], $configuration['table']);
-    $this->assertEqual($join_info['alias'], 'users_field_data');
-    $this->assertEqual($join_info['condition'], 'views_test_data.uid = users_field_data.uid');
-
-    // Set a different alias and make sure table info is as expected.
-    $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users1');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users1'];
-    $this->assertEqual($join_info['alias'], 'users1');
-
-    // Set a different join type (INNER) and make sure it is used.
-    $configuration['type'] = 'INNER';
-    $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users2');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users2'];
-    $this->assertEqual($join_info['join type'], 'INNER');
-
-    // Setup addition conditions and make sure it is used.
-    $random_name_1 = $this->randomMachineName();
-    $random_name_2 = $this->randomMachineName();
-    $configuration['extra'] = array(
-      array(
-        'field' => 'name',
-        'value' => $random_name_1
-      ),
-      array(
-        'field' => 'name',
-        'value' => $random_name_2,
-        'operator' => '<>'
-      ),
-    );
-    $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users3');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users3'];
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users3.uid") !== FALSE, 'Make sure the join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users3.name = :views_join_condition_0") !== FALSE, 'Make sure the first extra join condition appears in the query and uses the first placeholder.');
-    $this->assertTrue(strpos($join_info['condition'], "users3.name <> :views_join_condition_1") !== FALSE, 'Make sure the second extra join condition appears in the query and uses the second placeholder.');
-    $this->assertEqual(array_values($join_info['arguments']), array($random_name_1, $random_name_2), 'Make sure the arguments are in the right order');
-
-    // Test that 'IN' conditions are properly built.
-    $random_name_1 = $this->randomMachineName();
-    $random_name_2 = $this->randomMachineName();
-    $random_name_3 = $this->randomMachineName();
-    $random_name_4 = $this->randomMachineName();
-    $configuration['extra'] = array(
-      array(
-        'field' => 'name',
-        'value' => $random_name_1
-      ),
-      array(
-        'field' => 'name',
-        'value' => array($random_name_2, $random_name_3, $random_name_4),
-      ),
-    );
-    $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users4');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users4'];
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users4.uid") !== FALSE, 'Make sure the join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users4.name = :views_join_condition_2") !== FALSE, 'Make sure the first extra join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3, :views_join_condition_4, :views_join_condition_5 )") !== FALSE, 'The IN condition for the join is properly formed.');
-
-    // Test that all the conditions are properly built.
-    $configuration['extra'] = array(
-      array(
-        'field' => 'langcode',
-        'value' => 'en'
-      ),
-      array(
-        'left_field' => 'status',
-        'value' => 0,
-        'numeric' => TRUE,
-      ),
-      array(
-        'field' => 'name',
-        'left_field' => 'name'
-      ),
-    );
-    $join = $this->manager->createInstance('standard', $configuration);
-    $table = array('alias' => 'users5');
-    $join->buildJoin($query, $table, $view->query);
-
-    $tables = $query->getTables();
-    $join_info = $tables['users5'];
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users5.uid") !== FALSE, 'Make sure the join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_6") !== FALSE, 'Make sure the first extra join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_7") !== FALSE, 'Make sure the second extra join condition appears in the query.');
-    $this->assertTrue(strpos($join_info['condition'], "users5.name = views_test_data.name") !== FALSE, 'Make sure the third extra join condition appears in the query.');
-    $this->assertEqual(array_values($join_info['arguments']), array('en', 0), 'Make sure the arguments are in the right order');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
index 8e75e4d..8efa45a 100644
--- a/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
+++ b/core/modules/views/src/Tests/Plugin/NumericFormatPluralTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\views\Tests\Plugin;
 
 use Drupal\Component\Gettext\PoHeader;
+use Drupal\file\Entity\File;
 use Drupal\views\Tests\ViewTestBase;
 
 /**
@@ -144,7 +145,7 @@ function testNumericFormatPlural() {
    */
   protected function createFile() {
     // Create a new file entity.
-    $file = entity_create('file', array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'druplicon.txt',
       'uri' => 'public://druplicon.txt',
@@ -152,7 +153,7 @@ protected function createFile() {
       'created' => 1,
       'changed' => 1,
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
 
     // Save it, inserting a new record.
diff --git a/core/modules/views/src/Tests/Plugin/PagerKernelTest.php b/core/modules/views/src/Tests/Plugin/PagerKernelTest.php
deleted file mode 100644
index 9edfa4c..0000000
--- a/core/modules/views/src/Tests/Plugin/PagerKernelTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\PagerKernelTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests pager-related APIs.
- *
- * @group views
- */
-class PagerKernelTest extends ViewKernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $testViews = ['test_pager_full'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp($import_test_views = TRUE) {
-    parent::setUp($import_test_views);
-
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('user');
-  }
-
-  /**
-   * Tests pager-related setter methods on ViewExecutable.
-   *
-   * @see \Drupal\views\ViewExecutable::setItemsPerPage
-   * @see \Drupal\views\ViewExecutable::setOffset
-   * @see \Drupal\views\ViewExecutable::setCurrentPage
-   */
-  public function testSetPagerMethods() {
-    $view = Views::getView('test_pager_full');
-
-    // Mark the view as cacheable in order have the cache checking working
-    // below.
-    $display = &$view->storage->getDisplay('default');
-    $display['display_options']['cache']['type'] = 'tag';
-    $view->storage->save();
-
-    $output = $view->preview();
-
-    \Drupal::service('renderer')->renderPlain($output);
-    $this->assertIdentical(CacheBackendInterface::CACHE_PERMANENT, $output['#cache']['max-age']);
-
-    foreach (['setItemsPerPage', 'setOffset', 'setCurrentPage'] as $method) {
-      $view = Views::getView('test_pager_full');
-      $view->setDisplay('default');
-      $view->{$method}(1);
-      $output = $view->preview();
-
-      \Drupal::service('renderer')->renderPlain($output);
-      $this->assertIdentical(CacheBackendInterface::CACHE_PERMANENT, $output['#cache']['max-age'], 'Max age kept.');
-    }
-
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/PagerTest.php b/core/modules/views/src/Tests/Plugin/PagerTest.php
index bdd95ed..a4f2f42 100644
--- a/core/modules/views/src/Tests/Plugin/PagerTest.php
+++ b/core/modules/views/src/Tests/Plugin/PagerTest.php
@@ -47,6 +47,9 @@ class PagerTest extends PluginTestBase {
    * @see https://www.drupal.org/node/652712
    */
   public function testStorePagerSettings() {
+    // Show the master display so the override selection is shown.
+    \Drupal::configFactory()->getEditable('views.settings')->set('ui.show.master_display', TRUE)->save();
+
     $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
     $this->drupalLogin($admin_user);
     // Test behavior described in
@@ -106,7 +109,7 @@ public function testStorePagerSettings() {
       'pager[type]' => 'mini',
     );
     $this->drupalPostForm('admin/structure/views/nojs/display/test_store_pager_settings/page_1/pager', $edit, t('Apply'));
-    $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit');
+    $this->drupalGet('admin/structure/views/view/test_store_pager_settings/edit/page_1');
     $this->assertText('Mini', 'Changed pager plugin, should change some text');
 
     $edit = array(
diff --git a/core/modules/views/src/Tests/Plugin/QueryTest.php b/core/modules/views/src/Tests/Plugin/QueryTest.php
deleted file mode 100644
index 7dcff7e..0000000
--- a/core/modules/views/src/Tests/Plugin/QueryTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\QueryTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
-
-/**
- * Tests query plugins.
- *
- * @group views
- */
-class QueryTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  protected function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['table']['base']['query_id'] = 'query_test';
-
-    return $data;
-  }
-
-  /**
-   * Tests query plugins.
-   */
-  public function testQuery() {
-    $this->_testInitQuery();
-    $this->_testQueryExecute();
-    $this->queryMethodsTests();
-  }
-
-  /**
-   * Tests the ViewExecutable::initQuery method.
-   */
-  public function _testInitQuery() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->initQuery();
-    $this->assertTrue($view->query instanceof QueryTestPlugin, 'Make sure the right query plugin got instantiated.');
-  }
-
-  public function _testQueryExecute() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->initQuery();
-    $view->query->setAllItems($this->dataSet());
-
-    $this->executeView($view);
-    $this->assertTrue($view->result, 'Make sure the view result got filled');
-  }
-
-  /**
-   * Test methods provided by the QueryPluginBase.
-   *
-   * @see \Drupal\views\Plugin\views\query\QueryPluginBase
-   */
-  protected function queryMethodsTests() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->initQuery();
-    $this->assertFalse($view->query->getLimit(), 'Default to an empty limit.');
-    $rand_number = rand(5, 10);
-    $view->query->setLimit($rand_number);
-    $this->assertEqual($view->query->getLimit(), $rand_number, 'set_limit adapts the amount of items.');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
deleted file mode 100644
index d57fa27..0000000
--- a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\RelationshipJoinTestBase.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-
-/**
- * Provides a base class for a testing a relationship.
- *
- * @see \Drupal\views\Tests\Handler\JoinTest
- * @see \Drupal\views\Tests\Plugin\RelationshipTest
- */
-abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('system', 'user', 'field');
-
-  /**
-   * @var \Drupal\user\Entity\User
-   */
-  protected $rootUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpFixtures() {
-    $this->installEntitySchema('user');
-    $this->installConfig(array('user'));
-    parent::setUpFixtures();
-
-    // Create a record for uid 1.
-    $this->rootUser = entity_create('user', array('name' => $this->randomMachineName()));
-    $this->rootUser->save();
-
-    Views::viewsData()->clear();
-  }
-
-  /**
-   * Overrides \Drupal\views\Tests\ViewTestBase::schemaDefinition().
-   *
-   * Adds a uid column to test the relationships.
-   */
-  protected function schemaDefinition() {
-    $schema = parent::schemaDefinition();
-
-    $schema['views_test_data']['fields']['uid'] = array(
-      'description' => "The {users_field_data}.uid of the author of the beatle entry.",
-      'type' => 'int',
-      'unsigned' => TRUE,
-      'not null' => TRUE,
-      'default' => 0
-    );
-
-    return $schema;
-  }
-
-  /**
-   * Overrides \Drupal\views\Tests\ViewTestBase::viewsData().
-   *
-   * Adds a relationship for the uid column.
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['uid'] = array(
-      'title' => t('UID'),
-      'help' => t('The test data UID'),
-      'relationship' => array(
-        'id' => 'standard',
-        'base' => 'users_field_data',
-        'base field' => 'uid'
-      )
-    );
-
-    return $data;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/RowEntityTest.php b/core/modules/views/src/Tests/Plugin/RowEntityTest.php
deleted file mode 100644
index 9723750..0000000
--- a/core/modules/views/src/Tests/Plugin/RowEntityTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\RowEntityTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\Core\Form\FormState;
-use Drupal\views\Views;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests the generic entity row plugin.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\row\EntityRow
- */
-class RowEntityTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['taxonomy', 'text', 'filter', 'field', 'system', 'node', 'user'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_entity_row');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('taxonomy_term');
-    $this->installConfig(array('taxonomy'));
-    \Drupal::service('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests the entity row handler.
-   */
-  public function testEntityRow() {
-    $vocab = entity_create('taxonomy_vocabulary', array('name' => $this->randomMachineName(), 'vid' => strtolower($this->randomMachineName())));
-    $vocab->save();
-    $term = entity_create('taxonomy_term', array('name' => $this->randomMachineName(), 'vid' => $vocab->id() ));
-    $term->save();
-
-    $view = Views::getView('test_entity_row');
-    $build = $view->preview();
-    $this->render($build);
-
-    $this->assertText($term->getName(), 'The rendered entity appears as row in the view.');
-
-    // Tests the available view mode options.
-    $form = array();
-    $form_state = new FormState();
-    $form_state->set('view', $view->storage);
-    $view->rowPlugin->buildOptionsForm($form, $form_state);
-
-    $this->assertTrue(isset($form['view_mode']['#options']['default']), 'Ensure that the default view mode is available');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php b/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
deleted file mode 100644
index c00d584..0000000
--- a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\RowRenderCacheTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\Core\Session\AccountInterface;
-use Drupal\node\Entity\Node;
-use Drupal\node\Entity\NodeType;
-use Drupal\node\NodeInterface;
-use Drupal\simpletest\UserCreationTrait;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests row render caching.
- *
- * @group views
- */
-class RowRenderCacheTest extends ViewKernelTestBase {
-
-  use UserCreationTrait;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('user', 'node');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_row_render_cache');
-
-  /**
-   * An editor user account.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $editorUser;
-
-  /**
-   * A power user account.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $powerUser;
-
-  /**
-   * A regular user account.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $regularUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpFixtures() {
-    parent::setUpFixtures();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installSchema('node', 'node_access');
-
-    $type = NodeType::create(['type' => 'test']);
-    $type->save();
-
-    $this->editorUser = $this->createUser(['bypass node access']);
-    $this->powerUser = $this->createUser(['access content', 'create test content', 'edit own test content', 'delete own test content']);
-    $this->regularUser = $this->createUser(['access content']);
-
-    // Create some test entities.
-    for ($i = 0; $i < 5; $i++) {
-      Node::create(['title' => 'b' . $i . $this->randomMachineName(), 'type' => 'test'])->save();
-    }
-
-    // Create a power user node.
-    Node::create(['title' => 'z' . $this->randomMachineName(), 'uid' => $this->powerUser->id(), 'type' => 'test'])->save();
-  }
-
-  /**
-   * Test complex field rewriting and uncacheable field handlers.
-   */
-  public function testAdvancedCaching() {
-    // Test that row field output is actually cached and with the proper cache
-    // contexts.
-    $this->doTestRenderedOutput($this->editorUser);
-    $this->doTestRenderedOutput($this->editorUser, TRUE);
-    $this->doTestRenderedOutput($this->powerUser);
-    $this->doTestRenderedOutput($this->powerUser, TRUE);
-    $this->doTestRenderedOutput($this->regularUser);
-    $this->doTestRenderedOutput($this->regularUser, TRUE);
-
-    // Alter the result set order and check that counter is still working
-    // correctly.
-    $this->doTestRenderedOutput($this->editorUser);
-    /** @var \Drupal\node\NodeInterface $node */
-    $node = Node::load(6);
-    $node->setTitle('a' . $this->randomMachineName());
-    $node->save();
-    $this->doTestRenderedOutput($this->editorUser);
-  }
-
-  /**
-   * Check whether the rendered output matches expectations.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The user account to tests rendering with.
-   * @param bool $check_cache
-   *   (optional) Whether explicitly test render cache entries.
-   */
-  protected function doTestRenderedOutput(AccountInterface $account, $check_cache = FALSE) {
-    $this->setCurrentUser($account);
-    $view = Views::getView('test_row_render_cache');
-    $view->setDisplay();
-    $view->preview();
-
-    /** @var \Drupal\Core\Render\RenderCacheInterface $render_cache */
-    $render_cache = $this->container->get('render_cache');
-
-    /** @var \Drupal\views\Plugin\views\cache\CachePluginBase $cache_plugin */
-    $cache_plugin = $view->display_handler->getPlugin('cache');
-
-    // Retrieve nodes and sort them in alphabetical order to match view results.
-    $nodes = Node::loadMultiple();
-    usort($nodes, function (NodeInterface $a, NodeInterface $b) {
-      return strcmp($a->label(), $b->label());
-    });
-
-    $index = 0;
-    foreach ($nodes as $node) {
-      $nid = $node->id();
-      $access = $node->access('update');
-
-      $counter = $index + 1;
-      $expected = "$nid: $counter (just in case: $nid)";
-      $counter_output = $view->style_plugin->getField($index, 'counter');
-      $this->assertEqual($counter_output, $expected);
-
-      $node_url = $node->url();
-      $expected = "<a href=\"$node_url\"><span class=\"da-title\">{$node->label()}</span> <span class=\"counter\">$counter_output</span></a>";
-      $output = $view->style_plugin->getField($index, 'title');
-      $this->assertEqual($output, $expected);
-
-      $expected = $access ? "<a href=\"$node_url/edit?destination=/\" hreflang=\"en\">edit</a>" : "";
-      $output = $view->style_plugin->getField($index, 'edit_node');
-      $this->assertEqual($output, $expected);
-
-      $expected = $access ? "<a href=\"$node_url/delete?destination=/\" hreflang=\"en\">delete</a>" : "";
-      $output = $view->style_plugin->getField($index, 'delete_node');
-      $this->assertEqual($output, $expected);
-
-      $expected = $access ? "  <div class=\"dropbutton-wrapper\"><div class=\"dropbutton-widget\"><ul class=\"dropbutton\">" .
-          "<li class=\"edit\"><a href=\"$node_url/edit?destination=/\" hreflang=\"en\">Edit</a></li>" .
-          "<li class=\"delete\"><a href=\"$node_url/delete?destination=/\" hreflang=\"en\">Delete</a></li>" .
-          "</ul></div></div>" : "";
-      $output = $view->style_plugin->getField($index, 'operations');
-      $this->assertEqual($output, $expected);
-
-      if ($check_cache) {
-        $keys = $cache_plugin->getRowCacheKeys($view->result[$index]);
-        $user_context = !$account->hasPermission('edit any test content') ? 'user' : 'user.permissions';
-        $element = $render_cache->get(['#cache' => ['keys' => $keys, 'contexts' => ['languages:language_interface', 'theme', $user_context]]]);
-        $this->assertTrue($element);
-      }
-
-      $index++;
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/SqlQueryTest.php b/core/modules/views/src/Tests/Plugin/SqlQueryTest.php
deleted file mode 100644
index 0880a07..0000000
--- a/core/modules/views/src/Tests/Plugin/SqlQueryTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\SqlQueryTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the sql query plugin.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\query\Sql
- */
-class SqlQueryTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function viewsData() {
-    $data = parent::viewsData();
-    $data['views_test_data']['table']['base']['access query tag'] = 'test_tag';
-    $data['views_test_data']['table']['base']['query metadata'] = array('key1' => 'test_metadata', 'key2' => 'test_metadata2');
-
-    return $data;
-  }
-
-  /**
-   * Tests adding some metadata/tags to the views query.
-   */
-  public function testExecuteMetadata() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    $view->initQuery();
-    $view->execute();
-    /** @var \Drupal\Core\Database\Query\Select $query */
-    $main_query = $view->build_info['query'];
-    /** @var \Drupal\Core\Database\Query\Select $count_query */
-    $count_query = $view->build_info['count_query'];
-
-    foreach (array($main_query, $count_query) as $query) {
-      // Check query access tags.
-      $this->assertTrue($query->hasTag('test_tag'));
-
-      // Check metadata.
-      $this->assertIdentical($query->getMetaData('key1'), 'test_metadata');
-      $this->assertIdentical($query->getMetaData('key2'), 'test_metadata2');
-    }
-
-    $query_options = $view->display_handler->getOption('query');
-    $query_options['options']['disable_sql_rewrite'] = TRUE;
-    $view->display_handler->setOption('query', $query_options);
-    $view->save();
-    $view->destroy();
-
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-    $view->initQuery();
-    $view->execute();
-    /** @var \Drupal\Core\Database\Query\Select $query */
-    $main_query = $view->build_info['query'];
-    /** @var \Drupal\Core\Database\Query\Select $count_query */
-    $count_query = $view->build_info['count_query'];
-
-    foreach (array($main_query, $count_query) as $query) {
-      // Check query access tags.
-      $this->assertFalse($query->hasTag('test_tag'));
-
-      // Check metadata.
-      $this->assertIdentical($query->getMetaData('key1'), NULL);
-      $this->assertIdentical($query->getMetaData('key2'), NULL);
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
deleted file mode 100644
index 1ff45b1..0000000
--- a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\StyleHtmlListTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views\Views;
-
-/**
- * Tests the HTML list style plugin.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\style\HtmlList
- */
-class StyleHtmlListTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_style_html_list');
-
-  /**
-   * Make sure that the HTML list style markup is correct.
-   */
-  function testDefaultRowClasses() {
-    $view = Views::getView('test_style_html_list');
-    $output = $view->preview();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-
-    // Check that an empty class attribute is not added if the wrapper class is
-    // not set.
-    $this->assertTrue(strpos($output, '<div>') !== FALSE, 'Empty class is not added to DIV when class is not set');
-
-    // Check that an empty class attribute is not added if the list class is
-    // not set.
-    $this->assertTrue(strpos($output, '<ul>') !== FALSE, 'Empty class is not added to UL when class is not set');
-
-    // Set wrapper class and list class in style options.
-    $view->style_plugin->options['class'] = 'class';
-    $view->style_plugin->options['wrapper_class'] = 'wrapper-class';
-
-    $output = $view->preview();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-
-    // Check that class attribute is present if the wrapper class is set.
-    $this->assertTrue(strpos($output, '<div class="wrapper-class">') !== FALSE, 'Class is added to DIV');
-
-    // Check that class attribute is present if the list class is set.
-    $this->assertTrue(strpos($output, '<ul class="class">') !== FALSE, 'Class is added to UL');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php b/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
deleted file mode 100644
index 58984fe..0000000
--- a/core/modules/views/src/Tests/Plugin/StyleMappingTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\StyleMappingTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-
-/**
- * Tests mapping style functionality.
- *
- * @group views
- */
-class StyleMappingTest extends StyleTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_style_mapping');
-
-  /**
-   * Verifies that the fields were mapped correctly.
-   */
-  public function testMappedOutput() {
-    $view = Views::getView('test_style_mapping');
-    $output = $this->mappedOutputHelper($view);
-    $this->assertTrue(strpos($output, 'job') === FALSE, 'The job field is added to the view but not in the mapping.');
-    $view->destroy();
-
-    $view->setDisplay();
-    $view->displayHandlers->get('default')->options['style']['options']['mapping']['name_field'] = 'job';
-    $output = $this->mappedOutputHelper($view);
-    $this->assertTrue(strpos($output, 'job') !== FALSE, 'The job field is added to the view and is in the mapping.');
-  }
-
-  /**
-   * Tests the mapping of fields.
-   *
-   * @param \Drupal\views\ViewExecutable $view
-   *   The view to test.
-   *
-   * @return string
-   *   The view rendered as HTML.
-   */
-  protected function mappedOutputHelper($view) {
-    $output = $view->preview();
-    $rendered_output = \Drupal::service('renderer')->renderRoot($output);
-    $this->storeViewPreview($rendered_output);
-    $rows = $this->elements->body->div->div;
-    $data_set = $this->dataSet();
-
-    $count = 0;
-    foreach ($rows as $row) {
-      $attributes = $row->attributes();
-      $class = (string) $attributes['class'][0];
-      $this->assertTrue(strpos($class, 'views-row-mapping-test') !== FALSE, 'Make sure that each row has the correct CSS class.');
-
-      foreach ($row->div as $field) {
-        // Split up the field-level class, the first part is the mapping name
-        // and the second is the field ID.
-        $field_attributes = $field->attributes();
-        $name = strtok((string) $field_attributes['class'][0], '-');
-        $field_id = strtok('-');
-
-        // The expected result is the mapping name and the field value,
-        // separated by ':'.
-        $expected_result = $name . ':' . $data_set[$count][$field_id];
-        $actual_result = (string) $field;
-        $this->assertIdentical($expected_result, $actual_result, format_string('The fields were mapped successfully: %name => %field_id', array('%name' => $name, '%field_id' => $field_id)));
-      }
-
-      $count++;
-    }
-
-    return $rendered_output;
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
index 6580c0c..c3db24b 100644
--- a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php
@@ -74,7 +74,7 @@ public function testOpmlOutput() {
     $outline = $this->xpath('//outline[1]');
     $this->assertEqual($outline[0]['type'], 'link', 'The correct type attribute is used for link OPML.');
     $this->assertEqual($outline[0]['text'], $feed->label(), 'The correct text attribute is used for link OPML.');
-    $this->assertEqual($outline[0]['url'], $feed->getUrl(), 'The correct url attribute is used for link OPML.');
+    $this->assertEqual($outline[0]['url'], $feed->getUrl(), 'The correct URL attribute is used for link OPML.');
     // xmlUrl should not be present when type is link.
     $this->assertNull($outline[0]['xmlUrl'], 'The xmlUrl attribute is not used for link OPML.');
   }
diff --git a/core/modules/views/src/Tests/Plugin/StyleSummaryTest.php b/core/modules/views/src/Tests/Plugin/StyleSummaryTest.php
index cea8fba..cf585ce 100644
--- a/core/modules/views/src/Tests/Plugin/StyleSummaryTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleSummaryTest.php
@@ -20,7 +20,7 @@ class StyleSummaryTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['entity_test'];
+  public static $modules = ['entity_test', 'views_ui'];
 
   /**
    * {@inheritdoc}
@@ -48,6 +48,9 @@ protected function setUp($import_test_views = TRUE) {
         $entity->save();
       }
     }
+
+    $views_user = $this->drupalCreateUser(['administer views']);
+    $this->drupalLogin($views_user);
   }
 
   /**
@@ -72,6 +75,71 @@ public function testSummaryView() {
     $this->clickLink('type1');
     $entries = $this->cssSelect('div.view-content div.views-row');
     $this->assertEqual(2, count($entries));
+
+    // Add a base path to the summary settings.
+    $edit = [
+      'options[summary][options][default_summary][base_path]' => 'test-summary',
+    ];
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_summary/page_1/argument/type', $edit, t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    // Test that the links still work.
+    $this->drupalGet('test-summary');
+    $this->clickLink('type1');
+    $entries = $this->cssSelect('div.view-content div.views-row');
+    $this->assertEqual(2, count($entries));
+
+    // Change the summary display to an unformatted list displaying 3 items.
+    $edit = [
+      'options[summary][format]' => 'unformatted_summary',
+      'options[summary][options][unformatted_summary][override]' => '1',
+      'options[summary][options][unformatted_summary][items_per_page]' => '3',
+    ];
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_summary/page_1/argument/type', $edit, t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    $this->drupalGet('admin/structure/views/nojs/handler/test_summary/page_1/argument/type');
+    $this->drupalGet('test-summary');
+
+    $summary_list = $this->cssSelect('.views-summary-unformatted');
+    $this->assertEqual(3, count($summary_list));
+
+    foreach ($summary_list as $summary_list_item) {
+      $this->assertEqual('(5)', trim((string) $summary_list_item));
+    }
+
+    $summary_links = $this->cssSelect('.views-summary-unformatted a');
+    $this->assertEqual(3, count($summary_links));
+    foreach ($summary_links as $index => $summary_link) {
+      $this->assertEqual('type' . $index, trim((string) $summary_link));
+    }
+
+    $this->clickLink('type1');
+    $entries = $this->cssSelect('div.view-content div.views-row');
+    $this->assertEqual(2, count($entries));
+
+    // Add a base path to the summary settings.
+    $edit = [
+      'options[summary][options][unformatted_summary][base_path]' => 'test-summary',
+    ];
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_summary/page_1/argument/type', $edit, t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    // Test that the links still work.
+    $this->drupalGet('test-summary');
+    $this->clickLink('type1');
+    $entries = $this->cssSelect('div.view-content div.views-row');
+    $this->assertEqual(2, count($entries));
+
+    // Set base_path to an unknown path and test that the links lead to the
+    // front page.
+    $edit = [
+      'options[summary][options][unformatted_summary][base_path]' => 'unknown-path',
+    ];
+    $this->drupalPostForm('admin/structure/views/nojs/handler/test_summary/page_1/argument/type', $edit, t('Apply'));
+    $this->drupalPostForm(NULL, [], t('Save'));
+    $this->drupalGet('test-summary');
+    $this->assertLinkByHref('/');
   }
 
 }
diff --git a/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php
deleted file mode 100644
index 54095e4..0000000
--- a/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\StyleTableUnitTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-use Drupal\views\ViewExecutable;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Tests the table style plugin.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\style\Table
- */
-class StyleTableUnitTest extends PluginKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_table');
-
-  /**
-   * Tests the table style.
-   */
-  public function testTable() {
-    $view = Views::getView('test_table');
-
-    $view->setDisplay('default');
-    $view->initStyle();
-    $view->initHandlers();
-    $view->initQuery();
-    $style_plugin = $view->style_plugin;
-
-    // Test the buildSort() method.
-    $request = new Request();
-    $view->setRequest($request);
-
-    $style_plugin->options['override'] = FALSE;
-
-    $style_plugin->options['default'] = '';
-    $this->assertTrue($style_plugin->buildSort(), 'If no order and no default order is specified, the normal sort should be used.');
-
-    $style_plugin->options['default'] = 'id';
-    $this->assertTrue($style_plugin->buildSort(), 'If no order but a default order is specified, the normal sort should be used.');
-
-    $request->attributes->set('order', $this->randomMachineName());
-    $this->assertTrue($style_plugin->buildSort(), 'If no valid field is chosen for order, the normal sort should be used.');
-
-    $request->attributes->set('order', 'id');
-    $this->assertTrue($style_plugin->buildSort(), 'If a valid order is specified but the table is configured to not override, the normal sort should be used.');
-
-    $style_plugin->options['override'] = TRUE;
-
-    $this->assertFalse($style_plugin->buildSort(), 'If a valid order is specified and the table is configured to override, the normal sort should not be used.');
-
-    // Test the buildSortPost() method.
-    $request = new Request();
-    $view->setRequest($request);
-
-    // Setup no valid default.
-    $this->prepareView($view);
-    $style_plugin = $view->style_plugin;
-    $style_plugin->options['default'] = '';
-    $style_plugin->buildSortPost();
-    $this->assertIdentical($style_plugin->order, NULL, 'No sort order was set, when no order was specified and no default column was selected.');
-    $this->assertIdentical($style_plugin->active, NULL, 'No sort field was set, when no order was specified and no default column was selected.');
-    $view->destroy();
-
-    // Setup a valid default + column specific default sort order.
-    $this->prepareView($view);
-    $style_plugin = $view->style_plugin;
-    $style_plugin->options['default'] = 'id';
-    $style_plugin->options['info']['id']['default_sort_order'] = 'desc';
-    $style_plugin->buildSortPost();
-    $this->assertIdentical($style_plugin->order, 'desc', 'Fallback to the right default sort order.');
-    $this->assertIdentical($style_plugin->active, 'id', 'Fallback to the right default sort field.');
-    $view->destroy();
-
-    // Setup a valid default + table default sort order.
-    $this->prepareView($view);
-    $style_plugin = $view->style_plugin;
-    $style_plugin->options['default'] = 'id';
-    $style_plugin->options['info']['id']['default_sort_order'] = NULL;
-    $style_plugin->options['order'] = 'asc';
-    $style_plugin->buildSortPost();
-    $this->assertIdentical($style_plugin->order, 'asc', 'Fallback to the right default sort order.');
-    $this->assertIdentical($style_plugin->active, 'id', 'Fallback to the right default sort field.');
-    $view->destroy();
-
-    // Use an invalid field.
-    $this->prepareView($view);
-    $style_plugin = $view->style_plugin;
-    $request->query->set('sort', 'asc');
-    $random_name = $this->randomMachineName();
-    $request->query->set('order', $random_name);
-    $style_plugin->buildSortPost();
-    $this->assertIdentical($style_plugin->order, 'asc', 'No sort order was set, when invalid sort order was specified.');
-    $this->assertIdentical($style_plugin->active, NULL, 'No sort field was set, when invalid sort order was specified.');
-    $view->destroy();
-
-    // Use a existing field, and sort both ascending and descending.
-    foreach (array('asc', 'desc') as $order) {
-      $this->prepareView($view);
-      $style_plugin = $view->style_plugin;
-      $request->query->set('sort', $order);
-      $request->query->set('order', 'id');
-      $style_plugin->buildSortPost();
-      $this->assertIdentical($style_plugin->order, $order, 'Ensure the right sort order was set.');
-      $this->assertIdentical($style_plugin->active, 'id', 'Ensure the right order was set.');
-      $view->destroy();
-    }
-
-    $view->destroy();
-
-    // Excluded field to make sure its wrapping td doesn't show.
-    $this->prepareView($view);
-    $view->field['name']->options['exclude'] = TRUE;
-    $output = $view->preview();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-    $this->assertFalse(strpos($output, 'views-field-name') !== FALSE, "Excluded field's wrapper was not rendered.");
-    $view->destroy();
-
-    // Render a non empty result, and ensure that the empty area handler is not
-    // rendered.
-    $this->executeView($view);
-    $output = $view->preview();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-
-    $this->assertFalse(strpos($output, 'custom text') !== FALSE, 'Empty handler was not rendered on a non empty table.');
-
-    // Render an empty result, and ensure that the area handler is rendered.
-    $view->setDisplay('default');
-    $view->executed = TRUE;
-    $view->result = array();
-    $output = $view->preview();
-    $output = \Drupal::service('renderer')->renderRoot($output);
-
-    $this->assertTrue(strpos($output, 'custom text') !== FALSE, 'Empty handler got rendered on an empty table.');
-  }
-
-  /**
-   * Prepares a view executable by initializing everything which is needed.
-   *
-   * @param \Drupal\views\ViewExecutable $view
-   *   The executable to prepare.
-   */
-  protected function prepareView(ViewExecutable $view) {
-    $view->setDisplay();
-    $view->initStyle();
-    $view->initHandlers();
-    $view->initQuery();
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/StyleTestBase.php b/core/modules/views/src/Tests/Plugin/StyleTestBase.php
deleted file mode 100644
index 508fc12..0000000
--- a/core/modules/views/src/Tests/Plugin/StyleTestBase.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\StyleTestBase.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Masterminds\HTML5;
-
-/**
- * Tests some general style plugin related functionality.
- */
-abstract class StyleTestBase extends ViewKernelTestBase {
-
-  /**
-   * Stores the SimpleXML representation of the output.
-   *
-   * @var \SimpleXMLElement
-   */
-  protected $elements;
-
-  /**
-   * Stores a view output in the elements.
-   */
-  function storeViewPreview($output) {
-    $html5 = new HTML5();
-    $htmlDom = $html5->loadHTML('<html><body>' . $output . '</body></html>');
-    if ($htmlDom) {
-      // It's much easier to work with simplexml than DOM, luckily enough
-      // we can just simply import our DOM tree.
-      $this->elements = simplexml_import_dom($htmlDom);
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php
deleted file mode 100644
index af45c3c..0000000
--- a/core/modules/views/src/Tests/Plugin/StyleUnformattedTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\StyleUnformattedTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Views;
-
-/**
- * Tests unformatted style functionality.
- *
- * @group views
- */
-class StyleUnformattedTest extends StyleTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * Make sure that the default css classes works as expected.
-   */
-  function testDefaultRowClasses() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-    $output = $view->preview();
-    $this->storeViewPreview(\Drupal::service('renderer')->renderRoot($output));
-
-    $rows = $this->elements->body->div->div;
-    $count = 0;
-    $count_result = count($view->result);
-    foreach ($rows as $row) {
-      $count++;
-      $attributes = $row->attributes();
-      $class = (string) $attributes['class'][0];
-      $this->assertTrue(strpos($class, 'views-row') !== FALSE, 'Make sure that the views row class is set right.');
-    }
-    $this->assertIdentical($count, $count_result);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php b/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php
deleted file mode 100644
index 1cb8b09..0000000
--- a/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\ViewsBlockTest.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Plugin\Block\ViewsBlock;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewKernelTestBase;
-
-/**
- * Tests native behaviors of the block views plugin.
- *
- * @group views
- */
-class ViewsBlockTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('block', 'block_test_views');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view_block');
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    ViewTestData::createTestViews(get_class($this), array('block_test_views'));
-  }
-
-  /**
-   * Tests that ViewsBlock::getMachineNameSuggestion() produces the right value.
-   *
-   * @see \Drupal\views\Plugin\Block::getmachineNameSuggestion().
-   */
-  public function testMachineNameSuggestion() {
-    $plugin_definition = array(
-      'provider' => 'views',
-    );
-    $plugin_id = 'views_block:test_view_block-block_1';
-    $views_block = ViewsBlock::create($this->container, array(), $plugin_id, $plugin_definition);
-
-    $this->assertEqual($views_block->getMachineNameSuggestion(), 'views_block__test_view_block_block_1');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php
deleted file mode 100644
index 8647030..0000000
--- a/core/modules/views/src/Tests/PluginInstanceTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\PluginInstanceTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\views\Views;
-
-/**
- * Tests that an instance of all views plugins can be created.
- *
- * @group views
- */
-class PluginInstanceTest extends ViewKernelTestBase {
-
-  /**
-   * All views plugin types.
-   *
-   * @var array
-   */
-  protected $pluginTypes = array(
-    'access',
-    'area',
-    'argument',
-    'argument_default',
-    'argument_validator',
-    'cache',
-    'display_extender',
-    'display',
-    'exposed_form',
-    'field',
-    'filter',
-    'join',
-    'pager',
-    'query',
-    'relationship',
-    'row',
-    'sort',
-    'style',
-    'wizard',
-  );
-
-  /**
-   * An array of plugin definitions, keyed by plugin type.
-   *
-   * @var array
-   */
-  protected $definitions;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->definitions = Views::getPluginDefinitions();
-  }
-
-  /**
-   * Confirms that there is plugin data for all views plugin types.
-   */
-  public function testPluginData() {
-    // Check that we have an array of data.
-    $this->assertTrue(is_array($this->definitions), 'Plugin data is an array.');
-
-    // Check all plugin types.
-    foreach ($this->pluginTypes as $type) {
-      $this->assertTrue(array_key_exists($type, $this->definitions), format_string('Key for plugin type @type found.', array('@type' => $type)));
-      $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), format_string('Plugin type @type has an array of plugins.', array('@type' => $type)));
-    }
-
-    // Tests that the plugin list has not missed any types.
-    $diff = array_diff(array_keys($this->definitions), $this->pluginTypes);
-    $this->assertTrue(empty($diff), 'All plugins were found and matched.');
-  }
-
-  /**
-   * Tests creating instances of every views plugin.
-   *
-   * This will iterate through all plugins from _views_fetch_plugin_data().
-   */
-  public function testPluginInstances() {
-    foreach ($this->definitions as $type => $plugins) {
-      // Get a plugin manager for this type.
-      $manager = $this->container->get("plugin.manager.views.$type");
-      foreach ($plugins as $id => $definition) {
-        // Get a reflection class for this plugin.
-        // We only want to test true plugins, i.e. They extend PluginBase.
-        $reflection = new \ReflectionClass($definition['class']);
-        if ($reflection->isSubclassOf('Drupal\views\Plugin\views\PluginBase')) {
-          // Create a plugin instance and check what it is. This is not just
-          // good to check they can be created but for throwing any notices for
-          // method signatures etc. too.
-          $instance = $manager->createInstance($id);
-          $this->assertTrue($instance instanceof $definition['class'], format_string('Instance of @type:@id created', array('@type' => $type, '@id' => $id)));
-        }
-      }
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/QueryGroupByTest.php b/core/modules/views/src/Tests/QueryGroupByTest.php
deleted file mode 100644
index 0cb38a1..0000000
--- a/core/modules/views/src/Tests/QueryGroupByTest.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\QueryGroupByTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\entity_test\Entity\EntityTestMul;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Views;
-
-/**
- * Tests aggregate functionality of views, for example count.
- *
- * @group views
- */
-class QueryGroupByTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_group_by_in_filters', 'test_aggregate_count', 'test_group_by_count', 'test_group_by_count_multicardinality', 'test_group_by_field_not_within_bundle');
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('entity_test', 'system', 'field', 'user', 'language');
-
-  /**
-   * The storage for the test entity type.
-   *
-   * @var \Drupal\Core\Entity\Sql\SqlContentEntityStorage
-   */
-  public $storage;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('entity_test_mul');
-
-    $this->storage = $this->container->get('entity.manager')->getStorage('entity_test');
-
-    ConfigurableLanguage::createFromLangcode('it')->save();
-  }
-
-
-  /**
-   * Tests aggregate count feature.
-   */
-  public function testAggregateCount() {
-    $this->setupTestEntities();
-
-    $view = Views::getView('test_aggregate_count');
-    $this->executeView($view);
-
-    $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
-
-    $types = array();
-    foreach ($view->result as $item) {
-      // num_records is a alias for id.
-      $types[$item->entity_test_name] = $item->num_records;
-    }
-
-    $this->assertEqual($types['name1'], 4, 'Groupby the name: name1 returned the expected amount of results.');
-    $this->assertEqual($types['name2'], 3, 'Groupby the name: name2 returned the expected amount of results.');
-  }
-
-  /**
-   * Provides a test helper which runs a view with some aggregation function.
-   *
-   * @param string|null $aggregation_function
-   *   Which aggregation function should be used, for example sum or count. If
-   *   NULL is passed the aggregation will be tested with no function.
-   * @param array $values
-   *   The expected views result.
-   */
-  public function groupByTestHelper($aggregation_function, $values) {
-    $this->setupTestEntities();
-
-    $view = Views::getView('test_group_by_count');
-    $view->setDisplay();
-    // There is no need for a function in order to have aggregation.
-    if (empty($aggregation_function)) {
-      // The test table has 2 fields ('id' and 'name'). We'll remove 'id'
-      // because it's unique and will test aggregation on 'name'.
-      unset($view->displayHandlers->get('default')->options['fields']['id']);
-    }
-    else {
-      $view->displayHandlers->get('default')->options['fields']['id']['group_type'] = $aggregation_function;
-    }
-
-    $this->executeView($view);
-
-    $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
-    // Group by name to identify the right count.
-    $results = array();
-    foreach ($view->result as $item) {
-      $results[$item->entity_test_name] = $item->id;
-    }
-    $this->assertEqual($results['name1'], $values[0], format_string('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
-    $this->assertEqual($results['name2'], $values[1], format_string('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
-  }
-
-  /**
-   * Helper method that creates some test entities.
-   */
-  protected function setupTestEntities() {
-    // Create 4 entities with name1 and 3 entities with name2.
-    $entity_1 = array(
-      'name' => 'name1',
-    );
-
-    $this->storage->create($entity_1)->save();
-    $this->storage->create($entity_1)->save();
-    $this->storage->create($entity_1)->save();
-    $this->storage->create($entity_1)->save();
-
-    $entity_2 = array(
-      'name' => 'name2',
-    );
-    $this->storage->create($entity_2)->save();
-    $this->storage->create($entity_2)->save();
-    $this->storage->create($entity_2)->save();
-  }
-
-  /**
-   * Tests the count aggregation function.
-   */
-  public function testGroupByCount() {
-    $this->groupByTestHelper('count', array(4, 3));
-  }
-
-  /**
-   * Tests the sum aggregation function.
-   */
-  public function testGroupBySum() {
-    $this->groupByTestHelper('sum', array(10, 18));
-  }
-
-  /**
-   * Tests the average aggregation function.
-   */
-  public function testGroupByAverage() {
-    $this->groupByTestHelper('avg', array(2.5, 6));
-  }
-
-  /**
-   * Tests the min aggregation function.
-   */
-  public function testGroupByMin() {
-    $this->groupByTestHelper('min', array(1, 5));
-  }
-
-  /**
-   * Tests the max aggregation function.
-   */
-  public function testGroupByMax() {
-    $this->groupByTestHelper('max', array(4, 7));
-  }
-
-  /**
-   * Tests aggregation with no specific function.
-   */
-  public function testGroupByNone() {
-    $this->groupByTestHelper(NULL, array(1, 5));
-  }
-
-  /**
-   * Tests groupby with filters.
-   */
-  public function testGroupByCountOnlyFilters() {
-    // Check if GROUP BY and HAVING are included when a view
-    // doesn't display SUM, COUNT, MAX, etc. functions in SELECT statement.
-
-    for ($x = 0; $x < 10; $x++) {
-      $this->storage->create(array('name' => 'name1'))->save();
-    }
-
-    $view = Views::getView('test_group_by_in_filters');
-    $this->executeView($view);
-
-    $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY'), 'Make sure that GROUP BY is in the query');
-    $this->assertTrue(strpos($view->build_info['query'], 'HAVING'), 'Make sure that HAVING is in the query');
-  }
-
-  /**
-   * Tests grouping on base field.
-   */
-  public function testGroupByBaseField() {
-    $this->setupTestEntities();
-
-    $view = Views::getView('test_group_by_count');
-    $view->setDisplay();
-    // This tests that the GROUP BY portion of the query is properly formatted
-    // to include the base table to avoid ambiguous field errors.
-    $view->displayHandlers->get('default')->options['fields']['name']['group_type'] = 'min';
-    unset($view->displayHandlers->get('default')->options['fields']['id']['group_type']);
-    $this->executeView($view);
-    $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY entity_test.id'), 'GROUP BY field includes the base table name when grouping on the base field.');
-  }
-
-  /**
-   * Tests grouping a field with cardinality > 1.
-   */
-  public function testGroupByFieldWithCardinality() {
-    $field_storage = FieldStorageConfig::create([
-      'type' => 'integer',
-      'field_name' => 'field_test',
-      'cardinality' => 4,
-      'entity_type' => 'entity_test_mul',
-    ]);
-    $field_storage->save();
-    $field = FieldConfig::create([
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test_mul',
-      'bundle' => 'entity_test_mul',
-    ]);
-    $field->save();
-
-    $entities = [];
-    $entity = EntityTestMul::create([
-      'field_test' => [1, 1, 1],
-    ]);
-    $entity->save();
-    $entities[] = $entity;
-
-    $entity = EntityTestMul::create([
-      'field_test' => [2, 2, 2],
-    ]);
-    $entity->save();
-    $entities[] = $entity;
-
-    $entity = EntityTestMul::create([
-      'field_test' => [2, 2, 2],
-    ]);
-    $entity->save();
-    $entities[] = $entity;
-
-    $view = Views::getView('test_group_by_count_multicardinality');
-    $this->executeView($view);
-    $this->assertEqual(2, count($view->result));
-
-    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
-    $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual('6', $view->getStyle()->getField(1, 'id'));
-    $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
-
-    $entities[2]->field_test[0]->value = 3;
-    $entities[2]->field_test[1]->value = 4;
-    $entities[2]->field_test[2]->value = 5;
-    $entities[2]->save();
-
-    $view = Views::getView('test_group_by_count_multicardinality');
-    $this->executeView($view);
-    $this->assertEqual(5, count($view->result));
-
-    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
-    $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
-    $this->assertEqual('3', $view->getStyle()->getField(1, 'id'));
-    $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
-    $this->assertEqual('1', $view->getStyle()->getField(2, 'id'));
-    $this->assertEqual('3', $view->getStyle()->getField(2, 'field_test'));
-    $this->assertEqual('1', $view->getStyle()->getField(3, 'id'));
-    $this->assertEqual('4', $view->getStyle()->getField(3, 'field_test'));
-    $this->assertEqual('1', $view->getStyle()->getField(4, 'id'));
-    $this->assertEqual('5', $view->getStyle()->getField(4, 'field_test'));
-
-    // Check that translated values are correctly retrieved and are not grouped
-    // into the original entity.
-    $translation = $entity->addTranslation('it');
-    $translation->field_test = [6, 6, 6];
-    $translation->save();
-
-    $view = Views::getView('test_group_by_count_multicardinality');
-    $this->executeView($view);
-
-    $this->assertEqual(6, count($view->result));
-    $this->assertEqual('3', $view->getStyle()->getField(5, 'id'));
-    $this->assertEqual('6', $view->getStyle()->getField(5, 'field_test'));
-  }
-
-  /**
-   * Tests groupby with a field not existing on some bundle.
-   */
-  public function testGroupByWithFieldsNotExistingOnBundle() {
-    $field_storage = FieldStorageConfig::create([
-      'type' => 'integer',
-      'field_name' => 'field_test',
-      'cardinality' => 4,
-      'entity_type' => 'entity_test_mul',
-    ]);
-    $field_storage->save();
-    $field = FieldConfig::create([
-      'field_name' => 'field_test',
-      'entity_type' => 'entity_test_mul',
-      'bundle' => 'entity_test_mul',
-    ]);
-    $field->save();
-
-    $entities = [];
-    $entity = EntityTestMul::create([
-      'field_test' => [1],
-      'type' => 'entity_test_mul',
-    ]);
-    $entity->save();
-    $entities[] = $entity;
-
-    $entity = EntityTestMul::create([
-      'type' => 'entity_test_mul2',
-    ]);
-    $entity->save();
-    $entities[] = $entity;
-
-    $view = Views::getView('test_group_by_field_not_within_bundle');
-    $this->executeView($view);
-
-    $this->assertEqual(2, count($view->result));
-    // The first result is coming from entity_test_mul2, so no field could be
-    // rendered.
-    $this->assertEqual('', $view->getStyle()->getField(0, 'field_test'));
-    // The second result is coming from entity_test_mul, so its field value
-    // could be rendered.
-    $this->assertEqual('1', $view->getStyle()->getField(1, 'field_test'));
-  }
-
-}
diff --git a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
deleted file mode 100644
index a5b7cad..0000000
--- a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\RenderCacheIntegrationTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\views\Views;
-use Drupal\views\Entity\View;
-
-/**
- * Tests the general integration between views and the render cache.
- *
- * @group views
- */
-class RenderCacheIntegrationTest extends ViewKernelTestBase {
-
-  use AssertViewsCacheTagsTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $testViews = ['test_view', 'test_display', 'entity_test_fields', 'entity_test_row'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['entity_test', 'user', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installEntitySchema('entity_test');
-    $this->installEntitySchema('user');
-  }
-
-  /**
-   * Tests a field-based view's cache tags when using the "none" cache plugin.
-   */
-  public function testFieldBasedViewCacheTagsWithCachePluginNone() {
-    $view = Views::getview('entity_test_fields');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'none',
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForFieldBasedView(FALSE);
-  }
-
-  /**
-   * Tests a field-based view's cache tags when using the "tag" cache plugin.
-   */
-  public function testFieldBasedViewCacheTagsWithCachePluginTag() {
-    $view = Views::getview('entity_test_fields');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'tag',
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForFieldBasedView(TRUE);
-  }
-
-  /**
-   * Tests a field-based view's cache tags when using the "time" cache plugin.
-   */
-  public function testFieldBasedViewCacheTagsWithCachePluginTime() {
-    $view = Views::getview('entity_test_fields');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'time',
-      'options' => [
-        'results_lifespan' => 3600,
-        'output_lifespan' => 3600,
-      ],
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForFieldBasedView(TRUE);
-  }
-
-  /**
-   * Tests cache tags on output & result cache items for a field-based view.
-   *
-   * @param bool $do_assert_views_caches
-   *   Whether to check Views' result & output caches.
-   */
-  protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
-    $this->pass('Checking cache tags for field-based view.');
-    $view = Views::getview('entity_test_fields');
-
-    // Empty result (no entities yet).
-    $this->pass('Test without entities');
-    $base_tags =  ['config:views.view.entity_test_fields', 'entity_test_list'];
-    $this->assertViewsCacheTags($view, $base_tags, $do_assert_views_caches, $base_tags);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $base_tags, $do_assert_views_caches);
-
-
-    // Non-empty result (1 entity).
-    /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
-    $entities[] = $entity = EntityTest::create();
-    $entity->save();
-
-    $this->pass('Test with entities');
-    $tags_with_entity = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
-    $this->assertViewsCacheTags($view, $tags_with_entity, $do_assert_views_caches, $tags_with_entity);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_with_entity, $do_assert_views_caches);
-
-
-    // Paged result (more entities than the items-per-page limit).
-    for ($i = 0; $i < 5; $i++) {
-      $entities[] = $entity = EntityTest::create();
-      $entity->save();
-    }
-
-    // Page 1.
-    $this->pass('Test pager');
-    $this->pass('Page 1');
-    \Drupal::request()->query->set('page', 0);
-    $tags_page_1 = Cache::mergeTags($base_tags, $entities[1]->getCacheTags());
-    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[2]->getCacheTags());
-    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[3]->getCacheTags());
-    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[4]->getCacheTags());
-    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[5]->getCacheTags());
-    $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
-    $view->destroy();
-    // Page 2.
-    $this->pass('Page 2');
-    $view->setCurrentPage(1);
-    \Drupal::request()->query->set('page', 1);
-    $tags_page_2 = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
-    $this->assertViewsCacheTags($view, $tags_page_2, $do_assert_views_caches, $tags_page_2);
-    $view->destroy();
-
-    // Ensure that invalidation works on both pages.
-    $this->pass('Page invalidations');
-    $this->pass('Page 2');
-    $view->setCurrentPage(1);
-    \Drupal::request()->query->set('page', 1);
-    $entities[0]->name->value = $random_name = $this->randomMachineName();
-    $entities[0]->save();
-    $build = $this->assertViewsCacheTags($view, $tags_page_2, $do_assert_views_caches, $tags_page_2);
-    // @todo Static render arrays don't support different pages yet, see
-    //   https://www.drupal.org/node/2500701.
-    // $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_2, $do_assert_views_caches);
-    $this->assertTrue(strpos($build['#markup'], $random_name) !== FALSE);
-    $view->destroy();
-
-    $this->pass('Page 1');
-    $view->setCurrentPage(0);
-    \Drupal::request()->query->set('page', 0);
-    $entities[1]->name->value = $random_name = $this->randomMachineName();
-    $entities[1]->save();
-    $build = $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
-    $this->assertTrue(strpos($build['#markup'], $random_name) !== FALSE);
-    $view->destroy();
-
-    // Setup arguments to ensure that render caching also varies by them.
-    $this->pass('Test arguments');
-
-    // Custom assert for a single result row.
-    $single_entity_assertions = function(array $build, EntityInterface $entity) {
-      $this->setRawContent($build['#markup']);
-
-      $result = $this->cssSelect('div.views-row');
-      $count = count($result);
-      $this->assertEqual($count, 1);
-
-      $this->assertEqual((string) $result[0]->div->span, (string) $entity->id());
-    };
-
-    // Execute the view once with a static renderable and one with a full
-    // prepared render array.
-    $tags_argument = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
-    $view->setArguments([$entities[0]->id()]);
-    $build = $this->assertViewsCacheTags($view, $tags_argument, $do_assert_views_caches, $tags_argument);
-    $single_entity_assertions($build, $entities[0]);
-
-    $view->setArguments([$entities[0]->id()]);
-    $build = $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_argument, $do_assert_views_caches);
-    $single_entity_assertions($build, $entities[0]);
-
-    // Set a different argument and ensure that the result is different.
-    $tags2_argument = Cache::mergeTags($base_tags, $entities[1]->getCacheTags());
-    $view->setArguments([$entities[1]->id()]);
-    $build = $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags2_argument, $do_assert_views_caches);
-    $single_entity_assertions($build, $entities[1]);
-
-    $view->destroy();
-  }
-
-  /**
-   * Tests a entity-based view's cache tags when using the "none" cache plugin.
-   */
-  public function testEntityBasedViewCacheTagsWithCachePluginNone() {
-    $view = Views::getview('entity_test_row');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'none',
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForEntityBasedView(FALSE);
-  }
-
-  /**
-   * Tests a entity-based view's cache tags when using the "tag" cache plugin.
-   */
-  public function testEntityBasedViewCacheTagsWithCachePluginTag() {
-    $view = Views::getview('entity_test_row');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'tag',
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForEntityBasedView(TRUE);
-  }
-
-  /**
-   * Tests a entity-based view's cache tags when using the "time" cache plugin.
-   */
-  public function testEntityBasedViewCacheTagsWithCachePluginTime() {
-    $view = Views::getview('entity_test_row');
-    $view->getDisplay()->overrideOption('cache', [
-      'type' => 'time',
-      'options' => [
-        'results_lifespan' => 3600,
-        'output_lifespan' => 3600,
-      ],
-    ]);
-    $view->save();
-
-    $this->assertCacheTagsForEntityBasedView(TRUE);
-  }
-
-  /**
-   * Tests cache tags on output & result cache items for an entity-based view.
-   */
-  protected function assertCacheTagsForEntityBasedView($do_assert_views_caches) {
-    $this->pass('Checking cache tags for entity-based view.');
-    $view = Views::getview('entity_test_row');
-
-    // Empty result (no entities yet).
-    $base_tags = $base_render_tags = ['config:views.view.entity_test_row', 'entity_test_list'];
-    $this->assertViewsCacheTags($view, $base_tags, $do_assert_views_caches, $base_tags);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $base_tags, $do_assert_views_caches);
-
-    // Non-empty result (1 entity).
-    $entities[] = $entity = EntityTest::create();
-    $entity->save();
-
-    $result_tags_with_entity = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
-    $render_tags_with_entity = Cache::mergeTags($base_render_tags, $entities[0]->getCacheTags());
-    $render_tags_with_entity = Cache::mergeTags($render_tags_with_entity, ['entity_test_view']);
-    $this->assertViewsCacheTags($view, $result_tags_with_entity, $do_assert_views_caches, $render_tags_with_entity);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_with_entity, $do_assert_views_caches);
-
-
-    // Paged result (more entities than the items-per-page limit).
-    for ($i = 0; $i < 5; $i++) {
-      $entities[] = $entity = EntityTest::create();
-      $entity->save();
-    }
-
-    $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags());
-    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[3]->getCacheTags());
-    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[4]->getCacheTags());
-    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[5]->getCacheTags());
-    $result_tags_page_1 = Cache::mergeTags($base_tags, $new_entities_cache_tags);
-    $render_tags_page_1 = Cache::mergeTags($base_render_tags, $new_entities_cache_tags);
-    $render_tags_page_1 = Cache::mergeTags($render_tags_page_1, ['entity_test_view']);
-    $this->assertViewsCacheTags($view, $result_tags_page_1, $do_assert_views_caches, $render_tags_page_1);
-    $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_page_1, $do_assert_views_caches);
-  }
-
-  /**
-   * Ensure that the view renderable contains the cache contexts.
-   */
-  public function testBuildRenderableWithCacheContexts() {
-    $view = View::load('test_view');
-    $display =& $view->getDisplay('default');
-    $display['cache_metadata']['contexts'] = ['views_test_cache_context'];
-    $executable = $view->getExecutable();
-
-    $build = $executable->buildRenderable();
-    $this->assertEqual(['views_test_cache_context'], $build['#cache']['contexts']);
-  }
-
-  /**
-   * Ensures that saving a view calculates the cache contexts.
-   */
-  public function testViewAddCacheMetadata() {
-    $view = View::load('test_display');
-    $view->save();
-
-    $this->assertEqual(['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'url.query_args', 'user.node_grants:view', 'user.permissions'], $view->getDisplay('default')['cache_metadata']['contexts']);
-  }
-
-}
diff --git a/core/modules/views/src/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php
deleted file mode 100644
index 149280f..0000000
--- a/core/modules/views/src/Tests/TokenReplaceTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\TokenReplaceTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\Core\Render\BubbleableMetadata;
-use Drupal\views\Views;
-
-/**
- * Tests core view token replacement.
- *
- * @group views
- */
-class TokenReplaceTest extends ViewKernelTestBase {
-
-  public static $modules = array('system');
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_tokens');
-
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', 'url_alias');
-    $this->container->get('router.builder')->rebuild();
-  }
-
-  /**
-   * Tests core token replacements generated from a view.
-   */
-  function testTokenReplacement() {
-    $token_handler = \Drupal::token();
-    $view = Views::getView('test_tokens');
-    $view->setDisplay('page_1');
-    $this->executeView($view);
-
-    $expected = array(
-      '[view:label]' => 'Test tokens',
-      '[view:description]' => 'Test view to token replacement tests.',
-      '[view:id]' => 'test_tokens',
-      '[view:title]' => 'Test token page',
-      '[view:url]' => $view->getUrl(NULL, 'page_1')->setAbsolute(TRUE)->toString(),
-      '[view:total-rows]' => (string) $view->total_rows,
-      '[view:base-table]' => 'views_test_data',
-      '[view:base-field]' => 'id',
-      '[view:items-per-page]' => '10',
-      '[view:current-page]' => '1',
-      '[view:page-count]' => '1',
-    );
-
-    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($view->storage);
-    $metadata_tests = [];
-    $metadata_tests['[view:label]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:description]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:id]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:title]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:url]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:total-rows]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:base-table]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:base-field]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:items-per-page]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:current-page]'] = $base_bubbleable_metadata;
-    $metadata_tests['[view:page-count]'] = $base_bubbleable_metadata;
-
-    foreach ($expected as $token => $expected_output) {
-      $bubbleable_metadata = new BubbleableMetadata();
-      $output = $token_handler->replace($token, array('view' => $view), [], $bubbleable_metadata);
-      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
-      $this->assertEqual($bubbleable_metadata, $metadata_tests[$token]);
-    }
-  }
-
-  /**
-   * Tests core token replacements generated from a view without results.
-   */
-  function testTokenReplacementNoResults() {
-    $token_handler = \Drupal::token();
-    $view = Views::getView('test_tokens');
-    $view->setDisplay('page_2');
-    $this->executeView($view);
-
-    $expected = array(
-      '[view:page-count]' => '1',
-    );
-
-    foreach ($expected as $token => $expected_output) {
-      $output = $token_handler->replace($token, array('view' => $view));
-      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php b/core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php
new file mode 100644
index 0000000..be2521c
--- /dev/null
+++ b/core/modules/views/src/Tests/Update/ImageStyleDependencyUpdateTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\Update\ImageStyleDependencyUpdateTest.
+ */
+
+namespace Drupal\views\Tests\Update;
+
+use Drupal\system\Tests\Update\UpdatePathTestBase;
+use Drupal\views\Entity\View;
+
+/**
+ * Tests Views image style dependencies update.
+ *
+ * @group views
+ */
+class ImageStyleDependencyUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8-rc1.bare.standard.php.gz',
+      __DIR__ . '/../../../../system/tests/fixtures/update/drupal8.views-image-style-dependency-2649914.php',
+    ];
+  }
+
+  /**
+   * Tests the updating of views dependencies to image styles.
+   */
+  public function testUpdateImageStyleDependencies() {
+    $config_dependencies = View::load('foo')->getDependencies()['config'];
+
+    // Checks that 'thumbnail' image style is not a dependency of view 'foo'.
+    $this->assertFalse(in_array('image.style.thumbnail', $config_dependencies));
+
+    // We test the case the the field formatter image style doesn't exist.
+    // Checks that 'nonexistent' image style is not a dependency of view 'foo'.
+    $this->assertFalse(in_array('image.style.nonexistent', $config_dependencies));
+
+    // Run updates.
+    $this->runUpdates();
+
+    $config_dependencies = View::load('foo')->getDependencies()['config'];
+
+    // Checks that 'thumbnail' image style is a dependency of view 'foo'.
+    $this->assertTrue(in_array('image.style.thumbnail', $config_dependencies));
+
+    // The 'nonexistent' style doesn't exist, thus is not a dependency. Checks
+    // that 'nonexistent' image style is a not dependency of view 'foo'.
+    $this->assertFalse(in_array('image.style.nonexistent', $config_dependencies));
+  }
+
+}
diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php
deleted file mode 100644
index e4f17b5..0000000
--- a/core/modules/views/src/Tests/ViewExecutableTest.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\ViewExecutableTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Component\Utility\Xss;
-use Drupal\views\Entity\View;
-use Drupal\views\Views;
-use Drupal\views\ViewExecutable;
-use Drupal\views\ViewExecutableFactory;
-use Drupal\views\DisplayPluginCollection;
-use Drupal\views\Plugin\views\display\DefaultDisplay;
-use Drupal\views\Plugin\views\display\Page;
-use Drupal\views\Plugin\views\style\DefaultStyle;
-use Drupal\views\Plugin\views\style\Grid;
-use Drupal\views\Plugin\views\row\Fields;
-use Drupal\views\Plugin\views\query\Sql;
-use Drupal\views\Plugin\views\pager\PagerPluginBase;
-use Drupal\views\Plugin\views\query\QueryPluginBase;
-use Drupal\views_test_data\Plugin\views\display\DisplayTest;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Tests the ViewExecutable class.
- *
- * @group views
- * @see \Drupal\views\ViewExecutable
- */
-class ViewExecutableTest extends ViewKernelTestBase {
-
-  use CommentTestTrait;
-
-  public static $modules = ['system', 'node', 'comment', 'user', 'filter', 'field', 'text'];
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_destroy', 'test_executable_displays');
-
-  /**
-   * Properties that should be stored in the configuration.
-   *
-   * @var array
-   */
-  protected $configProperties = array(
-    'disabled',
-    'name',
-    'description',
-    'tag',
-    'base_table',
-    'label',
-    'core',
-    'display',
-  );
-
-  /**
-   * Properties that should be stored in the executable.
-   *
-   * @var array
-   */
-  protected $executableProperties = array(
-    'storage',
-    'built',
-    'executed',
-    'args',
-    'build_info',
-    'result',
-    'attachment_before',
-    'attachment_after',
-    'exposed_data',
-    'exposed_raw_input',
-    'old_view',
-    'parent_views',
-  );
-
-  protected function setUpFixtures() {
-    $this->installEntitySchema('user');
-    $this->installEntitySchema('node');
-    $this->installEntitySchema('comment');
-    $this->installSchema('comment', array('comment_entity_statistics'));
-    $this->installConfig(array('system', 'field', 'node', 'comment'));
-
-    entity_create('node_type', array(
-      'type' => 'page',
-      'name' => 'Page',
-    ))->save();
-    $this->addDefaultCommentField('node', 'page');
-    parent::setUpFixtures();
-
-    $this->installConfig(array('filter'));
-  }
-
-  /**
-   * Tests the views.executable container service.
-   */
-  public function testFactoryService() {
-    $factory = $this->container->get('views.executable');
-    $this->assertTrue($factory instanceof ViewExecutableFactory, 'A ViewExecutableFactory instance was returned from the container.');
-    $view = entity_load('view', 'test_executable_displays');
-    $this->assertTrue($factory->get($view) instanceof ViewExecutable, 'A ViewExecutable instance was returned from the factory.');
-  }
-
-  /**
-   * Tests the initDisplay() and initHandlers() methods.
-   */
-  public function testInitMethods() {
-    $view = Views::getView('test_destroy');
-    $view->initDisplay();
-
-    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
-    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
-
-    $view->destroy();
-    $view->initHandlers();
-
-    // Check for all handler types.
-    $handler_types = array_keys(ViewExecutable::getHandlerTypes());
-    foreach ($handler_types as $type) {
-      // The views_test integration doesn't have relationships.
-      if ($type == 'relationship') {
-        continue;
-      }
-      $this->assertTrue(count($view->$type), format_string('Make sure a %type instance got instantiated.', array('%type' => $type)));
-    }
-
-    // initHandlers() should create display handlers automatically as well.
-    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
-    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
-
-    $view_hash = spl_object_hash($view);
-    $display_hash = spl_object_hash($view->display_handler);
-
-    // Test the initStyle() method.
-    $view->initStyle();
-    $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'Make sure a reference to the style plugin is set.');
-    // Test the plugin has been inited and view have references to the view and
-    // display handler.
-    $this->assertEqual(spl_object_hash($view->style_plugin->view), $view_hash);
-    $this->assertEqual(spl_object_hash($view->style_plugin->displayHandler), $display_hash);
-
-    // Test the initQuery method().
-    $view->initQuery();
-    $this->assertTrue($view->query instanceof Sql, 'Make sure a reference to the query is set');
-    $this->assertEqual(spl_object_hash($view->query->view), $view_hash);
-    $this->assertEqual(spl_object_hash($view->query->displayHandler), $display_hash);
-
-    $view->destroy();
-
-    // Test the plugin  get methods.
-    $display_plugin = $view->getDisplay();
-    $this->assertTrue($display_plugin instanceof DefaultDisplay, 'An instance of DefaultDisplay was returned.');
-    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'The display_handler property has been set.');
-    $this->assertIdentical($display_plugin, $view->getDisplay(), 'The same display plugin instance was returned.');
-
-    $style_plugin = $view->getStyle();
-    $this->assertTrue($style_plugin instanceof DefaultStyle, 'An instance of DefaultStyle was returned.');
-    $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'The style_plugin property has been set.');
-    $this->assertIdentical($style_plugin, $view->getStyle(), 'The same style plugin instance was returned.');
-
-    $pager_plugin = $view->getPager();
-    $this->assertTrue($pager_plugin instanceof PagerPluginBase, 'An instance of PagerPluginBase was returned.');
-    $this->assertTrue($view->pager instanceof PagerPluginBase, 'The pager property has been set.');
-    $this->assertIdentical($pager_plugin, $view->getPager(), 'The same pager plugin instance was returned.');
-
-    $query_plugin = $view->getQuery();
-    $this->assertTrue($query_plugin instanceof QueryPluginBase, 'An instance of QueryPluginBase was returned.');
-    $this->assertTrue($view->query instanceof QueryPluginBase, 'The query property has been set.');
-    $this->assertIdentical($query_plugin, $view->getQuery(), 'The same query plugin instance was returned.');
-  }
-
-  /**
-   * Tests the generation of the executable object.
-   */
-  public function testConstructing() {
-    Views::getView('test_destroy');
-  }
-
-  /**
-   * Tests the accessing of values on the object.
-   */
-  public function testProperties() {
-    $view = Views::getView('test_destroy');
-    foreach ($this->executableProperties as $property) {
-      $this->assertTrue(isset($view->{$property}));
-    }
-
-    // Per default exposed input should fall back to an empty array.
-    $this->assertEqual($view->getExposedInput(), []);
-  }
-
-  /**
-   * Tests the display related methods and properties.
-   */
-  public function testDisplays() {
-    $view = Views::getView('test_executable_displays');
-
-    // Tests Drupal\views\ViewExecutable::initDisplay().
-    $view->initDisplay();
-    $this->assertTrue($view->displayHandlers instanceof DisplayPluginCollection, 'The displayHandlers property has the right class.');
-    // Tests the classes of the instances.
-    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay);
-    $this->assertTrue($view->displayHandlers->get('page_1') instanceof Page);
-    $this->assertTrue($view->displayHandlers->get('page_2') instanceof Page);
-
-    // After initializing the default display is the current used display.
-    $this->assertEqual($view->current_display, 'default');
-    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
-
-    // All handlers should have a reference to the default display.
-    $this->assertEqual(spl_object_hash($view->displayHandlers->get('page_1')->default_display), spl_object_hash($view->displayHandlers->get('default')));
-    $this->assertEqual(spl_object_hash($view->displayHandlers->get('page_2')->default_display), spl_object_hash($view->displayHandlers->get('default')));
-
-    // Tests Drupal\views\ViewExecutable::setDisplay().
-    $view->setDisplay();
-    $this->assertEqual($view->current_display, 'default', 'If setDisplay is called with no parameter the default display should be used.');
-    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
-
-    // Set two different valid displays.
-    $view->setDisplay('page_1');
-    $this->assertEqual($view->current_display, 'page_1', 'If setDisplay is called with a valid display id the appropriate display should be used.');
-    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_1')));
-
-    $view->setDisplay('page_2');
-    $this->assertEqual($view->current_display, 'page_2', 'If setDisplay is called with a valid display id the appropriate display should be used.');
-    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_2')));
-
-    // Destroy the view, so we can start again and test an invalid display.
-    $view->destroy();
-
-    $count_before = count($this->assertions);
-    $view->setDisplay('invalid');
-    $count_after = count($this->assertions);
-    $this->assertTrue($count_after - $count_before, 'Error is triggered while calling the wrong display.');
-
-    $this->assertEqual($view->current_display, 'default', 'If setDisplay is called with an invalid display id the default display should be used.');
-    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
-
-    // Test the style and row plugins are replaced correctly when setting the
-    // display.
-    $view->setDisplay('page_1');
-    $view->initStyle();
-    $this->assertTrue($view->style_plugin instanceof DefaultStyle);
-    $this->assertTrue($view->rowPlugin instanceof Fields);
-
-    $view->setDisplay('page_2');
-    $view->initStyle();
-    $this->assertTrue($view->style_plugin instanceof Grid);
-    // @todo Change this rowPlugin type too.
-    $this->assertTrue($view->rowPlugin instanceof Fields);
-
-    // Test the newDisplay() method.
-    $view = $this->container->get('entity.manager')->getStorage('view')->create(array('id' => 'test_executable_displays'));
-    $executable = $view->getExecutable();
-
-    $executable->newDisplay('page');
-    $executable->newDisplay('page');
-    $executable->newDisplay('display_test');
-
-    $this->assertTrue($executable->displayHandlers->get('default') instanceof DefaultDisplay);
-    $this->assertFalse(isset($executable->displayHandlers->get('default')->default_display));
-    $this->assertTrue($executable->displayHandlers->get('page_1') instanceof Page);
-    $this->assertTrue($executable->displayHandlers->get('page_1')->default_display instanceof DefaultDisplay);
-    $this->assertTrue($executable->displayHandlers->get('page_2') instanceof Page);
-    $this->assertTrue($executable->displayHandlers->get('page_2')->default_display instanceof DefaultDisplay);
-    $this->assertTrue($executable->displayHandlers->get('display_test_1') instanceof DisplayTest);
-    $this->assertTrue($executable->displayHandlers->get('display_test_1')->default_display instanceof DefaultDisplay);
-  }
-
-  /**
-   * Tests the setting/getting of properties.
-   */
-  public function testPropertyMethods() {
-    $view = Views::getView('test_executable_displays');
-
-    // Test the setAjaxEnabled() method.
-    $this->assertFalse($view->ajaxEnabled());
-    $view->setAjaxEnabled(TRUE);
-    $this->assertTrue($view->ajaxEnabled());
-
-    $view->setDisplay();
-    // There should be no pager set initially.
-    $this->assertNull($view->usePager());
-
-    // Add a pager, initialize, and test.
-    $view->displayHandlers->get('default')->overrideOption('pager', array(
-      'type' => 'full',
-      'options' => array('items_per_page' => 10),
-    ));
-    $view->initPager();
-    $this->assertTrue($view->usePager());
-
-    // Test setting and getting the offset.
-    $rand = rand();
-    $view->setOffset($rand);
-    $this->assertEqual($view->getOffset(), $rand);
-
-    // Test the getBaseTable() method.
-    $expected = array(
-      'views_test_data' => TRUE,
-      '#global' => TRUE,
-    );
-    $this->assertIdentical($view->getBaseTables(), $expected);
-
-    // Test response methods.
-    $this->assertTrue($view->getResponse() instanceof Response, 'New response object returned.');
-    $new_response = new Response();
-    $view->setResponse($new_response);
-    $this->assertIdentical(spl_object_hash($view->getResponse()), spl_object_hash($new_response), 'New response object correctly set.');
-
-    // Test the getPath() method.
-    $path = $this->randomMachineName();
-    $view->displayHandlers->get('page_1')->overrideOption('path', $path);
-    $view->setDisplay('page_1');
-    $this->assertEqual($view->getPath(), $path);
-    // Test the override_path property override.
-    $override_path = $this->randomMachineName();
-    $view->override_path = $override_path;
-    $this->assertEqual($view->getPath(), $override_path);
-
-    // Test the title methods.
-    $title = $this->randomString();
-    $view->setTitle($title);
-    $this->assertEqual($view->getTitle(), Xss::filterAdmin($title));
-  }
-
-  /**
-   * Tests the deconstructor to be sure that necessary objects are removed.
-   */
-  public function testDestroy() {
-    $view = Views::getView('test_destroy');
-
-    $view->preview();
-    $view->destroy();
-
-    $this->assertViewDestroy($view);
-  }
-
-  /**
-   * Asserts that expected view properties have been unset by destroy().
-   *
-   * @param \Drupal\views\ViewExecutable $view
-   */
-  protected function assertViewDestroy($view) {
-    $reflection = new \ReflectionClass($view);
-    $defaults = $reflection->getDefaultProperties();
-    // The storage and user should remain.
-    unset($defaults['storage'], $defaults['user'], $defaults['request'], $defaults['routeProvider']);
-
-    foreach ($defaults as $property => $default) {
-      $this->assertIdentical($this->getProtectedProperty($view, $property), $default);
-    }
-  }
-
-  /**
-   * Returns a protected property from a class instance.
-   *
-   * @param object $instance
-   *   The class instance to return the property from.
-   * @param string $property
-   *   The name of the property to return.
-   *
-   * @return mixed
-   *   The instance property value.
-   */
-  protected function getProtectedProperty($instance, $property) {
-    $reflection = new \ReflectionProperty($instance, $property);
-    $reflection->setAccessible(TRUE);
-    return $reflection->getValue($instance);
-  }
-
-  /**
-   * Tests ViewExecutable::getHandlerTypes().
-   */
-  public function testGetHandlerTypes() {
-    $types = ViewExecutable::getHandlerTypes();
-    foreach (array('field', 'filter', 'argument', 'sort', 'header', 'footer', 'empty') as $type) {
-      $this->assertTrue(isset($types[$type]));
-      // @todo The key on the display should be footers, headers and empties
-      //   or something similar instead of the singular, but so long check for
-      //   this special case.
-      if (isset($types[$type]['type']) && $types[$type]['type'] == 'area') {
-        $this->assertEqual($types[$type]['plural'], $type);
-      }
-      else {
-        $this->assertEqual($types[$type]['plural'], $type . 's');
-      }
-    }
-  }
-
-  /**
-   * Tests ViewExecutable::getHandlers().
-   */
-  public function testGetHandlers() {
-    $view = Views::getView('test_executable_displays');
-    $view->setDisplay('page_1');
-
-    $view->getHandlers('field', 'page_2');
-
-    // getHandlers() shouldn't change the active display.
-    $this->assertEqual('page_1', $view->current_display, "The display shouldn't change after getHandlers()");
-  }
-
-  /**
-   * Tests the validation of display handlers.
-   */
-  public function testValidate() {
-    $view = Views::getView('test_executable_displays');
-    $view->setDisplay('page_1');
-
-    $validate = $view->validate();
-
-    // Validating a view shouldn't change the active display.
-    $this->assertEqual('page_1', $view->current_display, "The display should be constant while validating");
-
-    $count = 0;
-    foreach ($view->displayHandlers as $id => $display) {
-      $match = function($value) use ($display) {
-        return strpos($value, $display->display['display_title']) !== false;
-      };
-      $this->assertTrue(array_filter($validate[$id], $match), format_string('Error message found for @id display', array('@id' => $id)));
-      $count++;
-    }
-
-    $this->assertEqual(count($view->displayHandlers), $count, 'Error messages from all handlers merged.');
-
-    // Test that a deleted display is not included.
-    $display = &$view->storage->getDisplay('default');
-    $display['deleted'] = TRUE;
-    $validate_deleted = $view->validate();
-
-    $this->assertNotIdentical($validate, $validate_deleted, 'Master display has not been validated.');
-  }
-
-  /**
-   * Tests that nested loops of the display handlers won't break validation.
-   */
-  public function testValidateNestedLoops() {
-    $view = View::create(['id' => 'test_validate_nested_loops']);
-    $executable = $view->getExecutable();
-
-    $executable->newDisplay('display_test');
-    $executable->newDisplay('display_test');
-    $errors = $executable->validate();
-    $total_error_count = array_reduce($errors, function ($carry, $item) {
-      $carry += count($item);
-
-      return $carry;
-    });
-    // Assert that there were 9 total errors across 3 displays.
-    $this->assertIdentical(9, $total_error_count);
-    $this->assertIdentical(3, count($errors));
-  }
-
-  /**
-   * Tests serialization of the ViewExecutable object.
-   */
-  public function testSerialization() {
-    $view = Views::getView('test_executable_displays');
-    $view->setDisplay('page_1');
-    $view->setArguments(['test']);
-    $view->setCurrentPage(2);
-
-    $serialized = serialize($view);
-
-    // Test the view storage object is not present in the actual serialized
-    // string.
-    $this->assertIdentical(strpos($serialized, '"Drupal\views\Entity\View"'), FALSE, 'The Drupal\views\Entity\View class was not found in the serialized string.');
-
-    /** @var \Drupal\views\ViewExecutable $unserialized */
-    $unserialized = unserialize($serialized);
-
-    $this->assertTrue($unserialized instanceof ViewExecutable);
-    $this->assertIdentical($view->storage->id(), $unserialized->storage->id(), 'The expected storage entity was loaded on the unserialized view.');
-    $this->assertIdentical($unserialized->current_display, 'page_1', 'The expected display was set on the unserialized view.');
-    $this->assertIdentical($unserialized->args, ['test'], 'The expected argument was set on the unserialized view.');
-    $this->assertIdentical($unserialized->getCurrentPage(), 2, 'The expected current page was set on the unserialized view.');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/ViewKernelTestBase.php b/core/modules/views/src/Tests/ViewKernelTestBase.php
index fe794ea..4c3e4a5 100644
--- a/core/modules/views/src/Tests/ViewKernelTestBase.php
+++ b/core/modules/views/src/Tests/ViewKernelTestBase.php
@@ -8,7 +8,6 @@
 namespace Drupal\views\Tests;
 
 use Drupal\Core\Database\Query\SelectInterface;
-use Drupal\views\ViewsBundle;
 use Drupal\simpletest\KernelTestBase;
 
 /**
@@ -18,7 +17,10 @@
  * requires the full web test environment provided by WebTestBase, extend
  * ViewTestBase instead.
  *
- * @see \Drupal\views\Tests\ViewTestBase
+ * @deprecated in Drupal 8.0.x, will be removed in Drupal 8.2.x. Use
+ *   \Drupal\Tests\views\Kernel\ViewsKernelTestBase instead.
+ *
+ * @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase
  */
 abstract class ViewKernelTestBase extends KernelTestBase {
 
@@ -42,7 +44,7 @@
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
-    $this->installSchema('system', array('router', 'sequences'));
+    $this->installSchema('system', array('sequences'));
     $this->setUpFixtures();
 
     if ($import_test_views) {
diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php
deleted file mode 100644
index 7728b1f..0000000
--- a/core/modules/views/src/Tests/ViewStorageTest.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\ViewStorageTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\views\Entity\View;
-use Drupal\views\Plugin\views\display\Page;
-use Drupal\views\Views;
-
-/**
- * Tests the CRUD functionality for a view.
- *
- * @group views
- * @see \Drupal\views\Entity\View
- * @see \Drupal\Core\Config\Entity\ConfigEntityStorage
- */
-class ViewStorageTest extends ViewKernelTestBase {
-
-  /**
-   * Properties that should be stored in the configuration.
-   *
-   * @var array
-   */
-  protected $configProperties = array(
-    'status',
-    'module',
-    'id',
-    'description',
-    'tag',
-    'base_table',
-    'label',
-    'core',
-    'display',
-  );
-
-  /**
-   * The entity type definition.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeInterface
-   */
-  protected $entityType;
-
-  /**
-   * The configuration entity storage.
-   *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
-   */
-  protected $controller;
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view_storage');
-
-  /**
-   * Tests CRUD operations.
-   */
-  function testConfigurationEntityCRUD() {
-    // Get the configuration entity type and controller.
-    $this->entityType = \Drupal::entityManager()->getDefinition('view');
-    $this->controller = $this->container->get('entity.manager')->getStorage('view');
-
-    // Confirm that an info array has been returned.
-    $this->assertTrue($this->entityType instanceof EntityTypeInterface, 'The View info array is loaded.');
-
-    // CRUD tests.
-    $this->loadTests();
-    $this->createTests();
-    $this->displayTests();
-
-    // Helper method tests
-    $this->displayMethodTests();
-  }
-
-  /**
-   * Tests loading configuration entities.
-   */
-  protected function loadTests() {
-    $view = entity_load('view', 'test_view_storage');
-    $data = $this->config('views.view.test_view_storage')->get();
-
-    // Confirm that an actual view object is loaded and that it returns all of
-    // expected properties.
-    $this->assertTrue($view instanceof View, 'Single View instance loaded.');
-    foreach ($this->configProperties as $property) {
-      $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', array('@property' => $property)));
-    }
-
-    // Check the displays have been loaded correctly from config display data.
-    $expected_displays = array('default', 'block_1', 'page_1');
-    $this->assertEqual(array_keys($view->get('display')), $expected_displays, 'The correct display names are present.');
-
-    // Check each ViewDisplay object and confirm that it has the correct key and
-    // property values.
-    foreach ($view->get('display') as $key => $display) {
-      $this->assertEqual($key, $display['id'], 'The display has the correct ID assigned.');
-
-      // Get original display data and confirm that the display options array
-      // exists.
-      $original_options = $data['display'][$key];
-      foreach ($original_options as $orig_key => $value) {
-        $this->assertIdentical($display[$orig_key], $value, format_string('@key is identical to saved data', array('@key' => $key)));
-      }
-    }
-
-    // Make sure that loaded default views get a UUID.
-    $view = Views::getView('test_view_storage');
-    $this->assertTrue($view->storage->uuid());
-  }
-
-  /**
-   * Tests creating configuration entities.
-   */
-  protected function createTests() {
-    // Create a new View instance with empty values.
-    $created = $this->controller->create(array());
-
-    $this->assertTrue($created instanceof View, 'Created object is a View.');
-    // Check that the View contains all of the properties.
-    foreach ($this->configProperties as $property) {
-      $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', array('@property' => $property)));
-    }
-
-    // Create a new View instance with config values.
-    $values = $this->config('views.view.test_view_storage')->get();
-    $values['id'] = 'test_view_storage_new';
-    unset($values['uuid']);
-    $created = $this->controller->create($values);
-
-    $this->assertTrue($created instanceof View, 'Created object is a View.');
-    // Check that the View contains all of the properties.
-    $properties = $this->configProperties;
-    // Remove display from list.
-    array_pop($properties);
-
-    // Test all properties except displays.
-    foreach ($properties as $property) {
-      $this->assertTrue($created->get($property) !== NULL, format_string('Property: @property created on View.', array('@property' => $property)));
-      $this->assertIdentical($values[$property], $created->get($property), format_string('Property value: @property matches configuration value.', array('@property' => $property)));
-    }
-
-    // Check the UUID of the loaded View.
-    $created->save();
-    $created_loaded = entity_load('view', 'test_view_storage_new');
-    $this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.');
-  }
-
-  /**
-   * Tests adding, saving, and loading displays on configuration entities.
-   */
-  protected function displayTests() {
-    // Check whether a display can be added and saved to a View.
-    $view = entity_load('view', 'test_view_storage_new');
-
-    $new_id = $view->addDisplay('page', 'Test', 'test');
-    $display = $view->get('display');
-
-    // Ensure the right display_plugin is created/instantiated.
-    $this->assertEqual($display[$new_id]['display_plugin'], 'page', 'New page display "test" uses the right display plugin.');
-
-    $executable = $view->getExecutable();
-    $executable->initDisplay();
-    $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
-
-    // To save this with a new ID, we should use createDuplicate().
-    $view = $view->createDuplicate();
-    $view->set('id', 'test_view_storage_new_new2');
-    $view->save();
-    $values = $this->config('views.view.test_view_storage_new_new2')->get();
-
-    $this->assertTrue(isset($values['display']['test']) && is_array($values['display']['test']), 'New display was saved.');
-  }
-
-  /**
-   * Tests the display related functions like getDisplaysList().
-   */
-  protected function displayMethodTests() {
-    // Enable the system module so the link generator can work using url_alias
-    // table.
-    $this->installSchema('system', 'url_alias');
-
-    $config['display'] = array(
-      'page_1' => array(
-        'display_options' => array('path' => 'test'),
-        'display_plugin' => 'page',
-        'id' => 'page_2',
-        'display_title' => 'Page 1',
-        'position' => 1
-      ),
-      'feed_1' => array(
-        'display_options' => array('path' => 'test.xml'),
-        'display_plugin' => 'feed',
-        'id' => 'feed',
-        'display_title' => 'Feed',
-        'position' => 2
-      ),
-      'page_2' => array(
-        'display_options' => array('path' => 'test/%/extra'),
-        'display_plugin' => 'page',
-        'id' => 'page_2',
-        'display_title' => 'Page 2',
-        'position' => 3
-      )
-    );
-    $view = $this->controller->create($config);
-
-    // Tests Drupal\views\Entity\View::addDisplay()
-    $view = $this->controller->create(array());
-    $random_title = $this->randomMachineName();
-
-    $id = $view->addDisplay('page', $random_title);
-    $this->assertEqual($id, 'page_1', format_string('Make sure the first display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_1')));
-    $display = $view->get('display');
-    $this->assertEqual($display[$id]['display_title'], $random_title);
-
-    $random_title = $this->randomMachineName();
-    $id = $view->addDisplay('page', $random_title);
-    $display = $view->get('display');
-    $this->assertEqual($id, 'page_2', format_string('Make sure the second display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_2')));
-    $this->assertEqual($display[$id]['display_title'], $random_title);
-
-    $id = $view->addDisplay('page');
-    $display = $view->get('display');
-    $this->assertEqual($display[$id]['display_title'], 'Page 3');
-
-    // Ensure the 'default' display always has position zero, regardless of when
-    // it was set relative to other displays. Even if the 'default' display
-    // exists, adding it again will overwrite it, which is asserted with the new
-    // title.
-    $view->addDisplay('default', $random_title);
-    $displays = $view->get('display');
-    $this->assertEqual($displays['default']['display_title'], $random_title, 'Default display is defined with the new title');
-    $this->assertEqual($displays['default']['position'], 0, 'Default displays are always in position zero');
-
-    // Tests Drupal\views\Entity\View::generateDisplayId(). Since
-    // generateDisplayId() is protected, we have to use reflection to unit-test
-    // it.
-    $view = $this->controller->create(array());
-    $ref_generate_display_id = new \ReflectionMethod($view, 'generateDisplayId');
-    $ref_generate_display_id->setAccessible(TRUE);
-    $this->assertEqual(
-      $ref_generate_display_id->invoke($view, 'default'),
-      'default',
-      'The plugin ID for default is always default.'
-    );
-    $this->assertEqual(
-      $ref_generate_display_id->invoke($view, 'feed'),
-      'feed_1',
-      'The generated ID for the first instance of a plugin type should have an suffix of _1.'
-    );
-    $view->addDisplay('feed', 'feed title');
-    $this->assertEqual(
-      $ref_generate_display_id->invoke($view, 'feed'),
-      'feed_2',
-      'The generated ID for the first instance of a plugin type should have an suffix of _2.'
-    );
-
-    // Tests item related methods().
-    $view = $this->controller->create(array('base_table' => 'views_test_data'));
-    $view->addDisplay('default');
-    $view = $view->getExecutable();
-
-    $display_id = 'default';
-    $expected_items = array();
-    // Tests addHandler with getItem.
-    // Therefore add one item without any options and one item with some
-    // options.
-    $id1 = $view->addHandler($display_id, 'field', 'views_test_data', 'id');
-    $item1 = $view->getHandler($display_id, 'field', 'id');
-    $expected_items[$id1] = $expected_item = array(
-      'id' => 'id',
-      'table' => 'views_test_data',
-      'field' => 'id',
-      'plugin_id' => 'numeric',
-    );
-    $this->assertEqual($item1, $expected_item);
-
-    $options = array(
-      'alter' => array(
-        'text' => $this->randomMachineName()
-      )
-    );
-    $id2 = $view->addHandler($display_id, 'field', 'views_test_data', 'name', $options);
-    $item2 = $view->getHandler($display_id, 'field', 'name');
-    $expected_items[$id2] = $expected_item = array(
-      'id' => 'name',
-      'table' => 'views_test_data',
-      'field' => 'name',
-      'plugin_id' => 'standard',
-    ) + $options;
-    $this->assertEqual($item2, $expected_item);
-
-    // Tests the expected fields from the previous additions.
-    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
-
-    // Alter an existing item via setItem and check the result via getItem
-    // and getItems.
-    $item = array(
-      'alter' => array(
-        'text' => $this->randomMachineName(),
-      )
-    ) + $item1;
-    $expected_items[$id1] = $item;
-    $view->setHandler($display_id, 'field', $id1, $item);
-    $this->assertEqual($view->getHandler($display_id, 'field', 'id'), $item);
-    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
-
-    // Test removeItem method.
-    unset($expected_items[$id2]);
-    $view->removeHandler($display_id, 'field', $id2);
-    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
-  }
-
-  /**
-   * Tests the createDuplicate() View method.
-   */
-  public function testCreateDuplicate() {
-    $view = Views::getView('test_view_storage');
-    $copy = $view->storage->createDuplicate();
-
-    $this->assertTrue($copy instanceof View, 'The copied object is a View.');
-
-    // Check that the original view and the copy have different UUIDs.
-    $this->assertNotIdentical($view->storage->uuid(), $copy->uuid(), 'The copied view has a new UUID.');
-
-    // Check the 'name' (ID) is using the View objects default value (NULL) as it
-    // gets unset.
-    $this->assertIdentical($copy->id(), NULL, 'The ID has been reset.');
-
-    // Check the other properties.
-    // @todo Create a reusable property on the base test class for these?
-    $config_properties = array(
-      'disabled',
-      'description',
-      'tag',
-      'base_table',
-      'label',
-      'core',
-    );
-
-    foreach ($config_properties as $property) {
-      $this->assertIdentical($view->storage->get($property), $copy->get($property), format_string('@property property is identical.', array('@property' => $property)));
-    }
-
-    // Check the displays are the same.
-    $copy_display = $copy->get('display');
-    foreach ($view->storage->get('display') as $id => $display) {
-      // assertIdentical will not work here.
-      $this->assertEqual($display, $copy_display[$id], format_string('The @display display has been copied correctly.', array('@display' => $id)));
-    }
-  }
-
-}
diff --git a/core/modules/views/src/Tests/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php
index ae67dcf..c7cce87 100644
--- a/core/modules/views/src/Tests/ViewTestBase.php
+++ b/core/modules/views/src/Tests/ViewTestBase.php
@@ -15,10 +15,10 @@
  * Defines a base class for Views testing in the full web test environment.
  *
  * Use this base test class if you need to emulate a full Drupal installation.
- * When possible, ViewKernelTestBase should be used instead. Both base classes
+ * When possible, ViewsKernelTestBase should be used instead. Both base classes
  * include the same methods.
  *
- * @see \Drupal\views\Tests\ViewKernelTestBase
+ * @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase
  * @see \Drupal\simpletest\WebTestBase
  */
 abstract class ViewTestBase extends WebTestBase {
diff --git a/core/modules/views/src/Tests/ViewTestData.php b/core/modules/views/src/Tests/ViewTestData.php
index 536470c..b214d6e 100644
--- a/core/modules/views/src/Tests/ViewTestData.php
+++ b/core/modules/views/src/Tests/ViewTestData.php
@@ -14,7 +14,7 @@
  *
  * The methods will be used by both views test base classes.
  *
- * @see \Drupal\views\Tests\ViewKernelTestBase.
+ * @see \Drupal\Tests\views\Kernel\ViewsKernelTestBase.
  * @see \Drupal\views\Tests\ViewTestBase.
  */
 class ViewTestData {
diff --git a/core/modules/views/src/Tests/ViewsFormMultipleTest.php b/core/modules/views/src/Tests/ViewsFormMultipleTest.php
new file mode 100644
index 0000000..2baa451
--- /dev/null
+++ b/core/modules/views/src/Tests/ViewsFormMultipleTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\ViewsFormMultipleTest.
+ */
+
+namespace Drupal\views\Tests;
+
+/**
+ * Tests a page with multiple Views forms.
+ *
+ * @group views
+ */
+class ViewsFormMultipleTest extends ViewTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_form_multiple'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->enableViewsTestModule();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['field_form_button_test']['field'] = [
+      'title' => t('Button test'),
+      'help' => t('Adds a test form button.'),
+      'id' => 'field_form_button_test',
+    ];
+    return $data;
+  }
+
+
+  /**
+   * Tests the a page with multiple View forms in it.
+   */
+  public function testViewsFormMultiple() {
+    // Get the test page.
+    $this->drupalGet('views_test_form_multiple');
+
+    $this->assertText('Test base form ID with Views forms and arguments.');
+
+    // Submit the forms, validate argument returned in message set by handler.
+    // @note There is not a way to specify a specific index for a submit button. So
+    // the row index returned is always the last occurrence.
+    $this->drupalPostForm(NULL, [], t('Test Button'), [], [], 'views-form-test-form-multiple-default-arg2');
+    $this->assertText('The test button at row 4 for test_form_multiple (default) View with args: arg2 was submitted.');
+    $this->drupalPostForm(NULL, [], t('Test Button'), [], [], 'views-form-test-form-multiple-default-arg1');
+    $this->assertText('The test button at row 4 for test_form_multiple (default) View with args: arg1 was submitted.');
+  }
+
+}
diff --git a/core/modules/views/src/Tests/ViewsHooksTest.php b/core/modules/views/src/Tests/ViewsHooksTest.php
deleted file mode 100644
index 714a3ec..0000000
--- a/core/modules/views/src/Tests/ViewsHooksTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\ViewsHooksTest.
- */
-
-namespace Drupal\views\Tests;
-
-use Drupal\Core\Render\RenderContext;
-use Drupal\views\Views;
-
-/**
- * Tests that views hooks are registered when defined in $module.views.inc.
- *
- * @group views
- * @see views_hook_info().
- * @see field_hook_info().
- */
-class ViewsHooksTest extends ViewKernelTestBase {
-
-  /**
-   * Views used by this test.
-   *
-   * @var array
-   */
-  public static $testViews = array('test_view');
-
-  /**
-   * An array of available views hooks to test.
-   *
-   * @var array
-   */
-  protected static $hooks = array (
-    'views_data' => 'all',
-    'views_data_alter' => 'alter',
-    'views_query_substitutions' => 'view',
-    'views_form_substitutions' => 'view',
-    'views_analyze' => 'view',
-    'views_pre_view' => 'view',
-    'views_pre_build' => 'view',
-    'views_post_build' => 'view',
-    'views_pre_execute' => 'view',
-    'views_post_execute' => 'view',
-    'views_pre_render' => 'view',
-    'views_post_render' => 'view',
-    'views_query_alter'  => 'view',
-    'views_invalidate_cache' => 'all',
-  );
-
-  /**
-   * The module handler to use for invoking hooks.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->moduleHandler = $this->container->get('module_handler');
-  }
-
-  /**
-   * Tests the hooks.
-   */
-  public function testHooks() {
-    $view = Views::getView('test_view');
-    $view->setDisplay();
-
-    // Test each hook is found in the implementations array and is invoked.
-    foreach (static::$hooks as $hook => $type) {
-      $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), format_string('The hook @hook was registered.', array('@hook' => $hook)));
-
-      if ($hook == 'views_post_render') {
-        $this->moduleHandler->invoke('views_test_data', $hook, array($view, &$view->display_handler->output, $view->display_handler->getPlugin('cache')));
-        continue;
-      }
-
-      switch ($type) {
-        case 'view':
-          $this->moduleHandler->invoke('views_test_data', $hook, array($view));
-          break;
-
-        case 'alter':
-          $data = array();
-          $this->moduleHandler->invoke('views_test_data', $hook, array($data));
-          break;
-
-        default:
-          $this->moduleHandler->invoke('views_test_data', $hook);
-      }
-
-      $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), format_string('The %hook hook was invoked.', array('%hook' => $hook)));
-      // Reset the module implementations cache, so we ensure that the
-      // .views.inc file is loaded actively.
-      $this->moduleHandler->resetImplementations();
-    }
-  }
-
-  /**
-   * Tests how hook_views_form_substitutions() makes substitutions.
-   *
-   * @see views_test_data_views_form_substitutions()
-   * @see views_pre_render_views_form_views_form()
-   */
-  public function testViewsPreRenderViewsFormViewsForm() {
-    $element = [
-      'output' => [
-        '#plain_text' => '<!--will-be-escaped--><!--will-be-not-escaped-->',
-      ],
-      '#substitutions' => ['#value' => []],
-    ];
-    $element = \Drupal::service('renderer')->executeInRenderContext(new RenderContext(), function() use ($element) {
-      return views_pre_render_views_form_views_form($element);
-    });
-    $this->setRawContent((string) $element['output']['#markup']);
-    $this->assertEscaped('<em>escaped</em>');
-    $this->assertRaw('<em>unescaped</em>');
-  }
-
-}
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index b87bca6..7b532fd 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -212,7 +212,7 @@ public function testWizardDefaultValues() {
 
     // Make sure the plugin types that should not have empty options don't have.
     // Test against all values is unit tested.
-    // @see \Drupal\views\Tests\Plugin\DisplayKernelTest
+    // @see \Drupal\Tests\views\Kernel\Plugin\DisplayKernelTest
     $view = Views::getView($random_id);
     $displays = $view->storage->get('display');
 
diff --git a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
index a1d4df8..0533fd6 100644
--- a/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
+++ b/core/modules/views/src/Tests/Wizard/TaggedWithTest.php
@@ -8,7 +8,9 @@
 namespace Drupal\views\Tests\Wizard;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\taxonomy\Entity\Vocabulary;
 
 /**
  * Tests the ability of the views wizard to create views filtered by taxonomy.
@@ -77,10 +79,10 @@ protected function setUp() {
     $this->nodeTypeWithoutTags = $this->drupalCreateContentType();
 
     // Create the vocabulary for the tag field.
-    $this->tagVocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->tagVocabulary = Vocabulary::create([
       'name' => 'Views testing tags',
       'vid' => 'views_testing_tags',
-    ));
+    ]);
     $this->tagVocabulary->save();
 
     // Create the tag field itself.
@@ -201,7 +203,7 @@ function testTaggedWithByNodeType() {
 
     // If we add an instance of the tagging field to the second node type, the
     // "tagged with" form element should not appear for it too.
-    entity_create('field_config', array(
+    FieldConfig::create([
       'field_name' => $this->tagFieldName,
       'entity_type' => 'node',
       'bundle' => $this->nodeTypeWithoutTags->id(),
@@ -214,7 +216,7 @@ function testTaggedWithByNodeType() {
           'auto_create' => TRUE,
         ),
       ),
-    ))->save();
+    ])->save();
     entity_get_form_display('node', $this->nodeTypeWithoutTags->id(), 'default')
       ->setComponent($this->tagFieldName, array(
         'type' => 'entity_reference_autocomplete_tags',
diff --git a/core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php b/core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php
deleted file mode 100644
index 009536e..0000000
--- a/core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Wizard\WizardPluginBaseKernelTest.
- */
-
-namespace Drupal\views\Tests\Wizard;
-
-use Drupal\Core\Form\FormState;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views_ui\ViewUI;
-
-/**
- * Tests the wizard base plugin class.
- *
- * @group views
- * @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
- */
-class WizardPluginBaseKernelTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('language', 'system', 'user', 'views_ui');
-
-  /**
-   * Contains thw wizard plugin manager.
-   *
-   * @var \Drupal\views\Plugin\views\wizard\WizardPluginBase
-   */
-  protected $wizard;
-
-  protected function setUp() {
-    parent::setUp();
-
-    $this->installConfig(array('language'));
-
-    $this->wizard = $this->container->get('plugin.manager.views.wizard')->createInstance('standard:views_test_data', array());
-  }
-
-  /**
-   * Tests the creating of a view.
-   *
-   * @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
-   */
-  public function testCreateView() {
-    $form = array();
-    $form_state = new FormState();
-    $form = $this->wizard->buildForm($form, $form_state);
-    $random_id = strtolower($this->randomMachineName());
-    $random_label = $this->randomMachineName();
-    $random_description = $this->randomMachineName();
-
-    // Add a new language and mark it as default.
-    ConfigurableLanguage::createFromLangcode('it')->save();
-    $this->config('system.site')->set('default_langcode', 'it')->save();
-
-    $form_state->setValues([
-      'id' => $random_id,
-      'label' => $random_label,
-      'description' => $random_description,
-      'base_table' => 'views_test_data',
-    ]);
-
-    $this->wizard->validateView($form, $form_state);
-    $view = $this->wizard->createView($form, $form_state);
-    $this->assertTrue($view instanceof ViewUI, 'The created view is a ViewUI object.');
-    $this->assertEqual($view->get('id'), $random_id);
-    $this->assertEqual($view->get('label'), $random_label);
-    $this->assertEqual($view->get('description'), $random_description);
-    $this->assertEqual($view->get('base_table'), 'views_test_data');
-    $this->assertEqual($view->get('langcode'), 'it');
-  }
-}
-
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index 4ad44fe..716bf76 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -1896,10 +1896,6 @@ public function getUrl($args = NULL, $display_id = NULL) {
       return $this->override_url;
     }
 
-    if (!isset($path)) {
-      $path = $this->getPath();
-    }
-
     $display_handler = $this->displayHandlers->get($display_id ?: $this->current_display)->getRoutedDisplay();
     if (!$display_handler instanceof DisplayRouterInterface) {
       throw new \InvalidArgumentException('You cannot create a URL to a display without routes.');
@@ -1919,6 +1915,9 @@ public function getUrl($args = NULL, $display_id = NULL) {
         }
       }
     }
+
+    $path = $this->getPath();
+
     // Don't bother working if there's nothing to do:
     if (empty($path) || (empty($args) && strpos($path, '%') === FALSE)) {
       return $display_handler->getUrlInfo();
@@ -2460,24 +2459,28 @@ public function serialize() {
   public function unserialize($serialized) {
     list($storage, $current_display, $args, $current_page, $exposed_input, $exposed_raw_input, $exposed_data, $dom_id, $executed) = unserialize($serialized);
 
-    $this->setRequest(\Drupal::request());
-    $this->user = \Drupal::currentUser();
+    // There are cases, like in testing, where we don't have a container
+    // available.
+    if (\Drupal::hasContainer()) {
+      $this->setRequest(\Drupal::request());
+      $this->user = \Drupal::currentUser();
 
-    $this->storage = \Drupal::entityManager()->getStorage('view')->load($storage);
+      $this->storage = \Drupal::entityManager()->getStorage('view')->load($storage);
 
-    $this->setDisplay($current_display);
-    $this->setArguments($args);
-    $this->setCurrentPage($current_page);
-    $this->setExposedInput($exposed_input);
-    $this->exposed_data = $exposed_data;
-    $this->exposed_raw_input = $exposed_raw_input;
-    $this->dom_id = $dom_id;
+      $this->setDisplay($current_display);
+      $this->setArguments($args);
+      $this->setCurrentPage($current_page);
+      $this->setExposedInput($exposed_input);
+      $this->exposed_data = $exposed_data;
+      $this->exposed_raw_input = $exposed_raw_input;
+      $this->dom_id = $dom_id;
 
-    $this->initHandlers();
+      $this->initHandlers();
 
-    // If the display was previously executed, execute it now.
-    if ($executed) {
-      $this->execute($this->current_display);
+      // If the display was previously executed, execute it now.
+      if ($executed) {
+        $this->execute($this->current_display);
+      }
     }
   }
 
diff --git a/core/modules/views/tests/fixtures/update/argument-placeholder.php b/core/modules/views/tests/fixtures/update/argument-placeholder.php
index 9b7a6d9..525299c 100644
--- a/core/modules/views/tests/fixtures/update/argument-placeholder.php
+++ b/core/modules/views/tests/fixtures/update/argument-placeholder.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Text fixture.
+ */
+
 $connection = Drupal\Core\Database\Database::getConnection();
 
 $connection->insert('config')
diff --git a/core/modules/views/tests/fixtures/update/duplicate-field-handler.php b/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
index 2b78f12..69aa8e8 100644
--- a/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
+++ b/core/modules/views/tests/fixtures/update/duplicate-field-handler.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Test fixture.
+ */
+
 $connection = Drupal\Core\Database\Database::getConnection();
 
 $connection->insert('config')
diff --git a/core/modules/views/tests/modules/views_entity_test/views_entity_test.module b/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
index f71a65b..0506710 100644
--- a/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
+++ b/core/modules/views/tests/modules/views_entity_test/views_entity_test.module
@@ -4,6 +4,7 @@
  * @file
  * Contains main module functionality.
  */
+
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -38,7 +39,7 @@ function views_entity_test_entity_field_access($operation, FieldDefinitionInterf
   if ($field_definition->getName() == 'test_text_access') {
     if ($items) {
       if ($items->value == 'no access value') {
-        return AccessResult::forbidden()->cacheUntilEntityChanges($items->getEntity());
+        return AccessResult::forbidden()->addCacheableDependency($items->getEntity());
       }
     }
   }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
index 745140b..e4d1b93 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_type_filter.yml
@@ -34,7 +34,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: 'Content Type'
+          label: 'Content type'
           exclude: false
           alter:
             alter_text: false
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml
new file mode 100644
index 0000000..541ee96
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_field_entity_test_rendered.yml
@@ -0,0 +1,161 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_test
+    - user
+id: test_field_entity_test_rendered
+label: 'Test Rendered entity test'
+module: views
+description: ''
+tag: ''
+base_table: entity_test
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: fields
+        options:
+          inline: {  }
+          separator: ''
+          hide_empty: false
+          default_field_elements: true
+      fields:
+        rendered_entity:
+          id: rendered_entity
+          table: entity_test
+          field: rendered_entity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          view_mode: foobar
+          entity_type: entity_test
+          plugin_id: rendered_entity
+      filters: {  }
+      sorts:
+        id:
+          id: id
+          table: entity_test
+          field: id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: ASC
+          exposed: false
+          expose:
+            label: ''
+          entity_type: entity_test
+          entity_field: nid
+          plugin_id: standard
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_interface'
+        - url.query_args
+        - user.permissions
+      tags: { }
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml
new file mode 100644
index 0000000..138517c
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_form_multiple.yml
@@ -0,0 +1,130 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+id: test_form_multiple
+label: ''
+module: views
+description: ''
+tag: ''
+base_table: views_test_data
+base_field: nid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    display_title: Master
+    id: default
+    position: 0
+    display_options:
+      access:
+        type: none
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      pager:
+        options:
+          id: 0
+          items_per_page: 10
+          offset: 0
+        type: full
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            id: id
+            field_form_button_test: field_form_button_test
+          info:
+            field_form_button_test:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: '-1'
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        id:
+          field: id
+          id: id
+          relationship: none
+          table: views_test_data
+          plugin_id: numeric
+        field_form_button_test:
+          id: field_form_button_test
+          table: views_test_data
+          field: field_form_button_test
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Field form button test'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: field_form_button_test
+      arguments:
+        'null':
+          default_action: default
+          default_argument_type: fixed
+          field: 'null'
+          id: 'null'
+          must_not_be: false
+          table: views
+          plugin_id: 'null'
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml
index daf92fa..3784bd9 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml
+++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_summary.yml
@@ -75,6 +75,7 @@ display:
           specify_validation: true
           plugin_id: string
           entity_type: entity_test
+          admin_label: type
       fields:
         id:
           id: id
diff --git a/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestFormMultipleController.php b/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestFormMultipleController.php
new file mode 100644
index 0000000..85cb0ad
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_data/src/Controller/ViewsTestFormMultipleController.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_test_data\Controller\ViewsTestFormMultipleController.
+ */
+
+namespace Drupal\views_test_data\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Controller routines for views form multiple test routes.
+ */
+class ViewsTestFormMultipleController extends ControllerBase {
+
+  /**
+   * Returns a test page having test_form_multiple view embedded twice.
+   */
+  public function testPage() {
+    $build = [
+      'view_arg1' => [
+        '#prefix' => '<div class="view-test-form-multiple-1">',
+        '#suffix' => '</div>',
+        '#type' => 'view',
+        '#name' => 'test_form_multiple',
+        '#display_id' => 'default',
+        '#arguments' => ['arg1'],
+        '#embed' => TRUE,
+      ],
+      'view_arg2' => [
+        '#prefix' => '<div class="view-test-form-multiple-2">',
+        '#suffix' => '</div>',
+        '#type' => 'view',
+        '#name' => 'test_form_multiple',
+        '#display_id' => 'default',
+        '#arguments' => ['arg2'],
+        '#embed' => TRUE,
+      ],
+    ];
+    return $build;
+  }
+
+}
diff --git a/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php
new file mode 100644
index 0000000..95a4a98
--- /dev/null
+++ b/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_test_data\Plugin\views\field\FieldFormButtonTest.
+ */
+
+namespace Drupal\views_test_data\Plugin\views\field;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\views\Plugin\views\field\UncacheableFieldHandlerTrait;
+use Drupal\views\ResultRow;
+
+/**
+ * A handler to provide a field that is completely custom by the administrator.
+ *
+ * @ingroup views_field_handlers
+ *
+ * @ViewsField("field_form_button_test")
+ */
+class FieldFormButtonTest extends FieldPluginBase {
+
+  use UncacheableFieldHandlerTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getValue(ResultRow $row, $field = NULL) {
+    return '<!--form-item-' . $this->options['id'] . '--' . $row->index . '-->';
+  }
+
+  /**
+   * Form constructor for the views form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function viewsForm(&$form, FormStateInterface $form_state) {
+    // Make sure we do not accidentally cache this form.
+    $form['#cache']['max-age'] = 0;
+    // The view is empty, abort.
+    if (empty($this->view->result)) {
+      unset($form['actions']);
+      return;
+    }
+
+    $form[$this->options['id']]['#tree'] = TRUE;
+    foreach ($this->view->result as $row_index => $row) {
+      $form[$this->options['id']][$row_index] = [
+        '#type' => 'submit',
+        '#value' => t('Test Button'),
+        '#name' => 'test-button-' . $row_index,
+        '#test_button' => TRUE,
+        '#row_index' => $row_index,
+        '#attributes' => ['class' => ['test-button']],
+      ];
+    }
+  }
+
+  /**
+   * Submit handler for the views form.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function viewsFormSubmit(&$form, FormStateInterface $form_state) {
+    $triggering_element = $form_state->getTriggeringElement();
+    if (!empty($triggering_element['#test_button'])) {
+      $row_index = $triggering_element['#row_index'];
+      $view_args = !empty($this->view->args) ? implode(', ', $this->view->args) : $this->t('no arguments');
+      drupal_set_message($this->t('The test button at row @row_index for @view_id (@display) View with args: @args was submitted.', [
+        '@display' => $this->view->current_display,
+        '@view_id' => $this->view->id(),
+        '@args' => $view_args,
+        '@row_index' => $row_index,
+      ]));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    // Do nothing.
+  }
+
+}
diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.module b/core/modules/views/tests/modules/views_test_data/views_test_data.module
index 5853fd5..f041651d 100644
--- a/core/modules/views/tests/modules/views_test_data/views_test_data.module
+++ b/core/modules/views/tests/modules/views_test_data/views_test_data.module
@@ -122,3 +122,10 @@ function views_test_data_test_pre_render_function($element) {
   $element['#markup'] = 'views_test_data_test_pre_render_function executed';
   return $element;
 }
+
+/**
+ * Implements hook_form_BASE_FORM_ID_alter().
+ */
+function views_test_data_form_views_form_test_form_multiple_default_alter(&$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id) {
+  drupal_set_message(t('Test base form ID with Views forms and arguments.'));
+}
diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml b/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
index 63d8ac8..cb0ad63 100644
--- a/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
+++ b/core/modules/views/tests/modules/views_test_data/views_test_data.routing.yml
@@ -11,3 +11,11 @@ views_test_data.element_embed:
     _form: '\Drupal\views_test_data\Form\ViewsTestDataElementEmbedForm'
   requirements:
     _access: 'TRUE'
+
+views_test_data.form_multiple:
+  path: '/views_test_form_multiple'
+  defaults:
+    _title: 'Test Views Form Multiple'
+    _controller: '\Drupal\views_test_data\Controller\ViewsTestFormMultipleController::testPage'
+  requirements:
+    _access: 'TRUE'
diff --git a/core/modules/views/tests/src/Kernel/BasicTest.php b/core/modules/views/tests/src/Kernel/BasicTest.php
new file mode 100644
index 0000000..9d006d0
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/BasicTest.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\BasicTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\views\Views;
+
+/**
+ * A basic query test for Views.
+ *
+ * @group views
+ */
+class BasicTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view', 'test_simple_argument');
+
+  /**
+   * Tests a trivial result set.
+   */
+  public function testSimpleResultSet() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->dataSet(), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+  }
+
+  /**
+   * Tests filtering of the result set.
+   */
+  public function testSimpleFiltering() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a filter.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'operator' => '<',
+        'value' => array(
+          'value' => '28',
+          'min' => '',
+          'max' => '',
+        ),
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
+          'operator' => FALSE,
+          'label' => '',
+        ),
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Build the expected result.
+    $dataset = array(
+      array(
+        'id' => 1,
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'id' => 2,
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'id' => 4,
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+    );
+
+    // Verify the result.
+    $this->assertEqual(3, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultSet($view, $dataset, array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+  }
+
+  /**
+   * Tests simple argument.
+   */
+  public function testSimpleArgument() {
+    // Execute with a view
+    $view = Views::getView('test_simple_argument');
+    $view->setArguments(array(27));
+    $this->executeView($view);
+
+    // Build the expected result.
+    $dataset = array(
+      array(
+        'id' => 2,
+        'name' => 'George',
+        'age' => 27,
+      ),
+    );
+
+    // Verify the result.
+    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultSet($view, $dataset, array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+
+    // Test "show all" if no argument is present.
+    $view = Views::getView('test_simple_argument');
+    $this->executeView($view);
+
+    // Build the expected result.
+    $dataset = $this->dataSet();
+
+    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultSet($view, $dataset, array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php b/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
new file mode 100644
index 0000000..120fae2
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Entity/RowEntityRenderersTest.php
@@ -0,0 +1,238 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Entity\RowEntityRenderersTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Entity;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the entity row renderers.
+ *
+ * @group views
+ * @see \Drupal\views\Entity\Render\RendererBase
+ */
+class RowEntityRenderersTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'filter', 'text', 'node', 'user', 'language', 'views_test_language'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_entity_row_renderers');
+
+  /**
+   * An array of added languages.
+   *
+   * @var array
+   */
+  protected $langcodes;
+
+  /**
+   * An array of titles for each node per language.
+   *
+   * @var array
+   */
+  protected $expected;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+    $this->installSchema('node', array('node_access'));
+    $this->installConfig(array('node', 'language'));
+
+    // The entity.node.canonical route must exist when nodes are rendered.
+    $this->container->get('router.builder')->rebuild();
+
+    $this->langcodes = array(\Drupal::languageManager()->getDefaultLanguage()->getId());
+    for ($i = 0; $i < 2; $i++) {
+      $langcode = 'l' . $i;
+      $this->langcodes[] = $langcode;
+      ConfigurableLanguage::createFromLangcode($langcode)->save();
+    }
+
+    // Make sure we do not try to render non-existing user data.
+    $node_type = NodeType::create(array('type' => 'test'));
+    $node_type->setDisplaySubmitted(FALSE);
+    $node_type->save();
+
+    $this->values = array();
+    $controller = \Drupal::entityManager()->getStorage('node');
+    $langcode_index = 0;
+
+    for ($i = 0; $i < count($this->langcodes); $i++) {
+      // Create a node with a different default language each time.
+      $default_langcode = $this->langcodes[$langcode_index++];
+      $node = $controller->create(array('type' => 'test', 'uid' => 0, 'langcode' => $default_langcode));
+      // Ensure the default language is processed first.
+      $langcodes = array_merge(array($default_langcode), array_diff($this->langcodes, array($default_langcode)));
+
+      foreach ($langcodes as $langcode) {
+        // Ensure we have a predictable result order.
+        $this->values[$i][$langcode] = $i . '-' . $langcode . '-' . $this->randomMachineName();
+
+        if ($langcode != $default_langcode) {
+          $node->addTranslation($langcode, array('title' => $this->values[$i][$langcode]));
+        }
+        else {
+          $node->setTitle($this->values[$i][$langcode]);
+        }
+
+        $node->save();
+      }
+    }
+  }
+
+  /**
+   * Tests the entity row renderers.
+   */
+  public function testEntityRenderers() {
+    $this->checkLanguageRenderers('page_1', $this->values);
+  }
+
+  /**
+   * Tests the field row renderers.
+   */
+  public function testFieldRenderers() {
+    $this->checkLanguageRenderers('page_2', $this->values);
+  }
+
+  /**
+   * Checks that the language renderer configurations work as expected.
+   *
+   * @param string $display
+   *   Name of display to test with.
+   * @param array $values
+   *   An array of node information which are each an array of node titles
+   *   associated with language keys appropriate for the translation of that
+   *   node.
+   */
+  protected function checkLanguageRenderers($display, $values) {
+    $expected = array(
+      $values[0]['en'],
+      $values[0]['en'],
+      $values[0]['en'],
+      $values[1]['en'],
+      $values[1]['en'],
+      $values[1]['en'],
+      $values[2]['en'],
+      $values[2]['en'],
+      $values[2]['en'],
+    );
+    $this->assertTranslations($display, '***LANGUAGE_language_content***', $expected, 'The current language renderer behaves as expected.');
+
+    $expected = array(
+      $values[0]['en'],
+      $values[0]['en'],
+      $values[0]['en'],
+      $values[1]['l0'],
+      $values[1]['l0'],
+      $values[1]['l0'],
+      $values[2]['l1'],
+      $values[2]['l1'],
+      $values[2]['l1'],
+    );
+    $this->assertTranslations($display, '***LANGUAGE_entity_default***', $expected, 'The default language renderer behaves as expected.');
+
+    $expected = array(
+      $values[0]['en'],
+      $values[0]['l0'],
+      $values[0]['l1'],
+      $values[1]['en'],
+      $values[1]['l0'],
+      $values[1]['l1'],
+      $values[2]['en'],
+      $values[2]['l0'],
+      $values[2]['l1'],
+    );
+    $this->assertTranslations($display, '***LANGUAGE_entity_translation***', $expected, 'The translation language renderer behaves as expected.');
+
+    $expected = array(
+      $values[0][$this->langcodes[0]],
+      $values[0][$this->langcodes[0]],
+      $values[0][$this->langcodes[0]],
+      $values[1][$this->langcodes[0]],
+      $values[1][$this->langcodes[0]],
+      $values[1][$this->langcodes[0]],
+      $values[2][$this->langcodes[0]],
+      $values[2][$this->langcodes[0]],
+      $values[2][$this->langcodes[0]],
+    );
+    $this->assertTranslations($display, '***LANGUAGE_site_default***', $expected, 'The site default language renderer behaves as expected.');
+
+    $expected = array(
+      $values[0]['l0'],
+      $values[0]['l0'],
+      $values[0]['l0'],
+      $values[1]['l0'],
+      $values[1]['l0'],
+      $values[1]['l0'],
+      $values[2]['l0'],
+      $values[2]['l0'],
+      $values[2]['l0'],
+    );
+    $this->assertTranslations($display, 'l0', $expected, 'The language specific renderer behaves as expected.');
+  }
+
+  /**
+   * Checks that the view results match the expected values.
+   *
+   * @param string $display
+   *   Name of display to test with.
+   * @param string $renderer_id
+   *   The id of the renderer to be tested.
+   * @param array $expected
+   *   An array of expected title translation values, one for each result row.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   * @param string $group
+   *   (optional) The group this message is in.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertTranslations($display, $renderer_id, array $expected, $message = '', $group = 'Other') {
+    $view = Views::getView('test_entity_row_renderers');
+    $view->storage->invalidateCaches();
+    $view->setDisplay($display);
+    $view->getDisplay()->setOption('rendering_language', $renderer_id);
+    $view->preview();
+
+    $result = FALSE;
+    foreach ($expected as $index => $expected_output) {
+      if (!empty($view->result[$index])) {
+        $build = $view->rowPlugin->render($view->result[$index]);
+        $output = \Drupal::service('renderer')->renderRoot($build);
+        $result = strpos($output, $expected_output) !== FALSE;
+        if (!$result) {
+          break;
+        }
+      }
+      else {
+        $result = FALSE;
+        break;
+      }
+    }
+
+    return $this->assertTrue($result, $message, $group);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php b/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
new file mode 100644
index 0000000..84e6e33
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Entity/ViewEntityDependenciesTest.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Entity\ViewEntityDependenciesTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Entity;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\node\Entity\NodeType;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\comment\Entity\CommentType;
+
+/**
+ * Tests the calculation of dependencies for views.
+ *
+ * @group views
+ */
+class ViewEntityDependenciesTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_field_get_entity', 'test_relationship_dependency', 'test_plugin_dependencies', 'test_argument_dependency'];
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'comment', 'user', 'field', 'text', 'search'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp(FALSE);
+
+    // Install the necessary dependencies for node type creation to work.
+    $this->installEntitySchema('node');
+    $this->installConfig(array('field', 'node'));
+
+    $comment_type = CommentType::create(array(
+      'id' => 'comment',
+      'label' => 'Comment settings',
+      'description' => 'Comment settings',
+      'target_entity_type_id' => 'node',
+    ));
+    $comment_type->save();
+
+    $content_type = NodeType::create([
+      'type' => $this->randomMachineName(),
+      'name' => $this->randomString(),
+    ]);
+    $content_type->save();
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => Unicode::strtolower($this->randomMachineName()),
+      'entity_type' => 'node',
+      'type' => 'comment',
+    ));
+    $field_storage->save();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $content_type->id(),
+      'label' => $this->randomMachineName() . '_label',
+      'description' => $this->randomMachineName() . '_description',
+      'settings' => array(
+        'comment_type' => $comment_type->id(),
+      ),
+    ])->save();
+    FieldConfig::create([
+      'field_storage' => FieldStorageConfig::loadByName('node', 'body'),
+      'bundle' => $content_type->id(),
+      'label' => $this->randomMachineName() . '_body',
+      'settings' => array('display_summary' => TRUE),
+    ])->save();
+
+    ViewTestData::createTestViews(get_class($this), array('views_test_config'));
+  }
+
+  /**
+   * Tests the getDependencies method.
+   */
+  public function testGetDependencies() {
+    $expected = [];
+    $expected['test_field_get_entity'] = [
+      'module' => [
+        'comment',
+        'node',
+        'user',
+      ]
+    ];
+    // Tests dependencies of relationships.
+    $expected['test_relationship_dependency'] = [
+      'module' => [
+        'comment',
+        'node',
+        'user',
+      ]
+    ];
+    $expected['test_plugin_dependencies'] = [
+      'module' => [
+        'comment',
+        'views_test_data',
+      ],
+      'content' => [
+        'RowTest',
+        'StaticTest',
+        'StyleTest',
+      ]
+    ];
+
+    $expected['test_argument_dependency'] = [
+      'config' => [
+        'core.entity_view_mode.node.teaser',
+        'field.storage.node.body'
+      ],
+      'content' => [
+        'ArgumentDefaultTest',
+        'ArgumentValidatorTest'
+      ],
+      'module' => [
+        'node',
+        // The argument handler is provided by the search module.
+        'search',
+        'text',
+        'user'
+      ],
+    ];
+
+    foreach ($this::$testViews as $view_id) {
+      $view = Views::getView($view_id);
+
+      $dependencies = $view->getDependencies();
+      $this->assertEqual($expected[$view_id], $dependencies);
+      $config = $this->config('views.view.' . $view_id);
+      \Drupal::service('config.storage.sync')->write($view_id, $config->get());
+    }
+
+    // Ensure that dependencies are calculated on the display level.
+    $expected_display['default'] = [
+      'config' => [
+        'core.entity_view_mode.node.teaser',
+      ],
+      'content' => [
+        'ArgumentDefaultTest',
+        'ArgumentValidatorTest'
+      ],
+      'module' => [
+        'core',
+        'node',
+        'search',
+        'user',
+        'views'
+      ],
+    ];
+    $expected_display['page'] = [
+      'config' => [
+        'field.storage.node.body'
+      ],
+      'module' => [
+        'core',
+        'text',
+        'views'
+      ],
+    ];
+
+    $view = Views::getView('test_argument_dependency');
+    $view->initDisplay();
+    foreach ($view->displayHandlers as $display) {
+      // Calculate the dependencies each display has.
+      $this->assertEqual($expected_display[$display->getPluginId()], $display->calculateDependencies());
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
new file mode 100644
index 0000000..5893ece
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -0,0 +1,464 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\EventSubscriber\ViewsEntitySchemaSubscriberIntegrationTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\EventSubscriber;
+
+use Drupal\Core\Entity\EntityTypeEvent;
+use Drupal\Core\Entity\EntityTypeEvents;
+use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Tests \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber
+ *
+ * @group Views
+ */
+class ViewsEntitySchemaSubscriberIntegrationTest extends ViewsKernelTestBase {
+
+  use EntityDefinitionTestTrait;
+
+  /**
+   * The entity definition update manager.
+   *
+   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
+   */
+  protected $entityDefinitionUpdateManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'user', 'text'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view_entity_test', 'test_view_entity_test_revision', 'test_view_entity_test_data', 'test_view_entity_test_additional_base_field'];
+
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
+  protected $eventDispatcher;
+
+  /**
+   * The tested event subscriber of views.
+   *
+   * @var \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber
+   */
+  protected $eventSubscriber;
+
+  /**
+   * The entity manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface
+   */
+  protected $entityManager;
+
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->eventDispatcher = $this->container->get('event_dispatcher');
+    $this->eventSubscriber = $this->container->get('views.entity_schema_subscriber');
+    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
+    $this->entityManager = $this->container->get('entity.manager');
+    $this->state = $this->container->get('state');
+
+    $this->database = $this->container->get('database');
+
+    // Install every entity type's schema that wasn't installed in the parent
+    // method.
+    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
+      $this->installEntitySchema($entity_type_id);
+    }
+  }
+
+  /**
+   * Tests that views are disabled when an entity type is deleted.
+   */
+  public function testDeleteEntityType() {
+    $entity_storage = $this->entityManager->getStorage('view');
+
+    $views = $entity_storage->loadMultiple();
+
+    // Ensure that all test views exists.
+    $this->assertTrue(isset($views['test_view_entity_test']));
+    $this->assertTrue(isset($views['test_view_entity_test_revision']));
+    $this->assertTrue(isset($views['test_view_entity_test_data']));
+    $this->assertTrue(isset($views['test_view_entity_test_additional_base_field']));
+
+    $event = new EntityTypeEvent($this->entityManager->getDefinition('entity_test_update'));
+    $this->eventDispatcher->dispatch(EntityTypeEvents::DELETE, $event);
+
+    // We expect that views which use 'entity_test_update' as base tables are
+    // disabled.
+    $views = $entity_storage->loadMultiple();
+
+    // Ensure that all test views still exists after the deletion of the
+    // entity type.
+    $this->assertTrue(isset($views['test_view_entity_test']));
+    $this->assertTrue(isset($views['test_view_entity_test_revision']));
+    $this->assertTrue(isset($views['test_view_entity_test_data']));
+    $this->assertTrue(isset($views['test_view_entity_test_additional_base_field']));
+
+    // Ensure that they are all disabled.
+    $this->assertFalse($views['test_view_entity_test']->status());
+    $this->assertFalse($views['test_view_entity_test_revision']->status());
+    $this->assertFalse($views['test_view_entity_test_data']->status());
+    $this->assertFalse($views['test_view_entity_test_additional_base_field']->status());
+  }
+
+  /**
+   * Tests that renaming base tables adapts the views.
+   */
+  public function testBaseTableRename() {
+    $this->renameBaseTable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test');
+
+    // Ensure the base table got renamed, so also the views fields.
+    $this->assertEqual('entity_test_update_new', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_new', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that renaming data tables adapts the views.
+   */
+  public function testDataTableRename() {
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_data');
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    // Ensure that the data table is used.
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->renameDataTable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_data');
+
+    // Ensure the data table got renamed, so also the views fields.
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data_new', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that renaming revision tables adapts the views.
+   */
+  public function testRevisionBaseTableRename() {
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_revision');
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
+
+    $this->renameRevisionBaseTable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_revision');
+
+    // Ensure the base table got renamed, so also the views fields.
+    $this->assertEqual('entity_test_update_revision_new', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision_new', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that renaming revision tables adapts the views.
+   */
+  public function testRevisionDataTableRename() {
+    $this->updateEntityTypeToRevisionable();
+    // Multiple changes, so we have to invalidate the caches, otherwise
+    // the second update will revert the first.
+    $this->entityManager->clearCachedDefinitions();
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_revision');
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']);
+
+    $this->renameRevisionDataTable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_revision');
+
+    // Ensure the base table got renamed, so also the views fields.
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision_data_new', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that adding data tables adapts the views.
+   */
+  public function testDataTableAddition() {
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test');
+
+    // Ensure the data table got renamed, so also the views fields.
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that enabling revisions doesn't do anything.
+   */
+  public function testRevisionEnabling() {
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test');
+
+    // Ensure that nothing happens.
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $display = $view->getDisplay('default');
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests that removing revision support disables the view.
+   */
+  public function testRevisionDisabling() {
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    $this->updateEntityTypeToNotRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    /** @var \Drupal\views\Entity\View $view */
+    $entity_storage = $this->entityManager->getStorage('view');
+    $view = $entity_storage->load('test_view_entity_test_revision');
+
+    $this->assertFalse($view->status());
+  }
+
+  /**
+   * Tests a bunch possible entity definition table updates.
+   */
+  public function testVariousTableUpdates() {
+    // We want to test the following permutations of entity definition updates:
+    // base <-> base + translation
+    // base + translation <-> base + translation + revision
+    // base + revision <-> base + translation + revision
+    // base <-> base + revision
+    // base <-> base + translation + revision
+
+    // base <-> base + translation
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+
+    $this->resetEntityType();
+
+    // base + translation <-> base + translation + revision
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->resetEntityType();
+
+    // base + revision <-> base + translation + revision
+    $this->updateEntityTypeToRevisionable();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+
+    $this->resetEntityType();
+
+    // base <-> base + revision
+    $this->updateEntityTypeToRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotRevisionable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+
+    $this->resetEntityType();
+
+    // base <-> base + translation + revision
+    $this->updateEntityTypeToRevisionable();
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotRevisionable();
+    $this->updateEntityTypeToNotTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay();
+
+    $this->assertEqual('entity_test_update', $view->get('base_table'));
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update', $display['display_options']['fields']['name']['table']);
+  }
+
+  /**
+   * Tests some possible entity table updates for a revision view.
+   */
+  public function testVariousTableUpdatesForRevisionView() {
+    // base + revision <-> base + translation + revision
+    $this->updateEntityTypeToRevisionable();
+    // Multiple changes, so we have to invalidate the caches, otherwise
+    // the second update will revert the first.
+    $this->entityManager->clearCachedDefinitions();
+
+    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
+
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
+
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision_data', $display['display_options']['fields']['name']['table']);
+
+    $this->updateEntityTypeToNotTranslatable();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    list($view, $display) = $this->getUpdatedViewAndDisplay(TRUE);
+
+    $this->assertEqual('entity_test_update_revision', $view->get('base_table'));
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['id']['table']);
+    $this->assertEqual('entity_test_update_revision', $display['display_options']['fields']['name']['table']);
+
+    $this->resetEntityType();
+  }
+
+  /**
+   * Gets a view and its display.
+   *
+   * @param bool $revision
+   *   (optional) TRUE if we want to get a revision view.
+   *
+   * @return array
+   *   An array with the view as first item, and the display as second.
+   */
+  protected function getUpdatedViewAndDisplay($revision = FALSE) {
+    $entity_storage = $this->entityManager->getStorage('view');
+    /** @var \Drupal\views\Entity\View $view */
+    $view = $entity_storage->load($revision ? 'test_view_entity_test_revision' : 'test_view_entity_test');
+    $display = $view->getDisplay('default');
+
+    return [$view, $display];
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
new file mode 100644
index 0000000..3067d32
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\AreaEntityTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\block\Entity\Block;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Entity\View;
+use Drupal\views\Views;
+
+/**
+ * Tests the generic entity area handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\area\Entity
+ */
+class AreaEntityTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'user', 'block'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_entity_area');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpFixtures() {
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    $this->installConfig(['entity_test']);
+
+    Block::create([
+      'id' => 'test_block',
+      'plugin' => 'system_main_block',
+    ])->save();
+
+    parent::setUpFixtures();
+  }
+
+  /**
+   * Tests views data for entity area handlers.
+   */
+  public function testEntityAreaData() {
+    $data = $this->container->get('views.views_data')->get('views');
+    $entity_types = $this->container->get('entity.manager')->getDefinitions();
+
+    $expected_entities = array_filter($entity_types, function (EntityTypeInterface $entity_type) {
+      return $entity_type->hasViewBuilderClass();
+    });
+
+    // Test that all expected entity types have data.
+    foreach (array_keys($expected_entities) as $entity) {
+      $this->assertTrue(!empty($data['entity_' . $entity]), format_string('Views entity area data found for @entity', array('@entity' => $entity)));
+      // Test that entity_type is set correctly in the area data.
+      $this->assertEqual($entity, $data['entity_' . $entity]['area']['entity_type'], format_string('Correct entity_type set for @entity', array('@entity' => $entity)));
+    }
+
+    $expected_entities = array_filter($entity_types, function (EntityTypeInterface $type) {
+      return !$type->hasViewBuilderClass();
+    });
+
+    // Test that no configuration entity types have data.
+    foreach (array_keys($expected_entities) as $entity) {
+      $this->assertTrue(empty($data['entity_' . $entity]), format_string('Views config entity area data not found for @entity', array('@entity' => $entity)));
+    }
+  }
+
+  /**
+   * Tests the area handler.
+   */
+  public function testEntityArea() {
+    /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
+    $entities = array();
+    for ($i = 0; $i < 3; $i++) {
+      $random_label = $this->randomMachineName();
+      $data = array('bundle' => 'entity_test', 'name' => $random_label);
+      $entity_test = $this->container->get('entity.manager')
+        ->getStorage('entity_test')
+        ->create($data);
+
+      $uuid_map[0] = 'aa0c61cb-b7bb-4795-972a-493dabcf529c';
+      $uuid_map[1] = '62cef0ff-6f30-4f7a-b9d6-a8ed5a3a6bf3';
+      $uuid_map[2] = '3161d6e9-3326-4719-b513-8fa68a731ba2';
+      $entity_test->uuid->value = $uuid_map[$i];
+
+      $entity_test->save();
+      $entities[] = $entity_test;
+      \Drupal::state()
+        ->set('entity_test_entity_access.view.' . $entity_test->id(), $i != 2);
+    }
+
+    $this->doTestCalculateDependencies();
+    $this->doTestRender($entities);
+  }
+
+  /**
+   * Tests rendering the entity area handler.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface[] $entities
+   *   The entities.
+   */
+  public function doTestRender($entities) {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $view = Views::getView('test_entity_area');
+    $preview = $view->preview('default', [$entities[1]->id()]);
+    $this->setRawContent(\Drupal::service('renderer')->renderRoot($preview));
+    $view_class = 'js-view-dom-id-' . $view->dom_id;
+    $header_xpath = '//div[@class = "' . $view_class . '"]/header[1]';
+    $footer_xpath = '//div[@class = "' . $view_class . '"]/footer[1]';
+
+    $result = $this->xpath($header_xpath);
+    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
+    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+
+    $result = $this->xpath($footer_xpath);
+    $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
+    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+
+    $preview = $view->preview('default', array($entities[1]->id()));
+    $this->setRawContent($renderer->renderRoot($preview));
+
+    $result = $this->xpath($header_xpath);
+    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
+    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+
+    $result = $this->xpath($footer_xpath);
+    $this->assertTrue(strpos(trim((string) $result[0]), $entities[1]->label()) !== FALSE, 'The rendered entity appears in the footer of the view.');
+    $this->assertTrue(strpos(trim((string) $result[0]), 'full') !== FALSE, 'The rendered entity appeared in the right view mode.');
+
+    // Mark entity_test test view_mode as customizable.
+    $entity_view_mode = \Drupal::entityManager()->getStorage('entity_view_mode')->load('entity_test.test');
+    $entity_view_mode->enable();
+    $entity_view_mode->save();
+
+    // Change the view mode of the area handler.
+    $view = Views::getView('test_entity_area');
+    $item = $view->getHandler('default', 'header', 'entity_entity_test');
+    $item['view_mode'] = 'test';
+    $view->setHandler('default', 'header', 'entity_entity_test', $item);
+
+    $preview = $view->preview('default', array($entities[1]->id()));
+    $this->setRawContent($renderer->renderRoot($preview));
+    $view_class = 'js-view-dom-id-' . $view->dom_id;
+    $result = $this->xpath('//div[@class = "' . $view_class . '"]/header[1]');
+    $this->assertTrue(strpos(trim((string) $result[0]), $entities[0]->label()) !== FALSE, 'The rendered entity appears in the header of the view.');
+    $this->assertTrue(strpos(trim((string) $result[0]), 'test') !== FALSE, 'The rendered entity appeared in the right view mode.');
+
+    // Test entity access.
+    $view = Views::getView('test_entity_area');
+    $preview = $view->preview('default', array($entities[2]->id()));
+    $this->setRawContent($renderer->renderRoot($preview));
+    $view_class = 'js-view-dom-id-' . $view->dom_id;
+    $result = $this->xpath('//div[@class = "' . $view_class . '"]/footer[1]');
+    $this->assertTrue(strpos($result[0], $entities[2]->label()) === FALSE, 'The rendered entity does not appear in the footer of the view.');
+
+    // Test the available view mode options.
+    $form = array();
+    $form_state = (new FormState())
+      ->set('type', 'header');
+    $view->display_handler->getHandler('header', 'entity_entity_test')->buildOptionsForm($form, $form_state);
+    $this->assertTrue(isset($form['view_mode']['#options']['test']), 'Ensure that the test view mode is available.');
+    $this->assertTrue(isset($form['view_mode']['#options']['default']), 'Ensure that the default view mode is available.');
+  }
+
+  /**
+   * Tests the calculation of the rendered dependencies.
+   */
+  public function doTestCalculateDependencies() {
+    $view = View::load('test_entity_area');
+
+    $dependencies = $view->calculateDependencies()->getDependencies();
+    // Ensure that both config and content entity dependencies are calculated.
+    $this->assertEqual([
+      'config' => ['block.block.test_block'],
+      'content' => ['entity_test:entity_test:aa0c61cb-b7bb-4795-972a-493dabcf529c'],
+    ], $dependencies);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php
new file mode 100644
index 0000000..9c30bbe
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaMessagesTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\AreaMessagesTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the messages area handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\area\Messages
+ */
+class AreaMessagesTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_area_messages');
+
+  /**
+   * Tests the messages area handler.
+   */
+  public function testMessageText() {
+    drupal_set_message('My drupal set message.');
+
+    $view = Views::getView('test_area_messages');
+
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $output = $view->render();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+    $this->setRawContent($output);
+    $this->assertText('My drupal set message.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
new file mode 100644
index 0000000..28bd977
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\AreaTextTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core views_handler_area_text handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\area\Text
+ */
+class AreaTextTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system', 'user', 'filter');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installConfig(array('system', 'filter'));
+    $this->installEntitySchema('user');
+  }
+
+  public function testAreaText() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // add a text header
+    $string = $this->randomMachineName();
+    $view->displayHandlers->get('default')->overrideOption('header', array(
+      'area' => array(
+        'id' => 'area',
+        'table' => 'views',
+        'field' => 'area',
+        'content' => array(
+          'value' => $string,
+        ),
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    $view->display_handler->handlers['header']['area']->options['content']['format'] = $this->randomString();
+    $build = $view->display_handler->handlers['header']['area']->render();
+    $this->assertEqual('', $renderer->renderRoot($build), 'Nonexistent format should return empty markup.');
+
+    $view->display_handler->handlers['header']['area']->options['content']['format'] = filter_default_format();
+    $build = $view->display_handler->handlers['header']['area']->render();
+    $this->assertEqual(check_markup($string), $renderer->renderRoot($build), 'Existent format should return something');
+
+    // Empty results, and it shouldn't be displayed .
+    $this->assertEqual(array(), $view->display_handler->handlers['header']['area']->render(TRUE), 'No result should lead to no header');
+    // Empty results, and it should be displayed.
+    $view->display_handler->handlers['header']['area']->options['empty'] = TRUE;
+    $build = $view->display_handler->handlers['header']['area']->render(TRUE);
+    $this->assertEqual(check_markup($string), $renderer->renderRoot($build), 'No result, but empty enabled lead to a full header');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php
new file mode 100644
index 0000000..2343951
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaTitleTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\AreaTitleTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the title area handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\area\Title
+ */
+class AreaTitleTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_area_title');
+
+  /**
+   * Tests the title area handler.
+   */
+  public function testTitleText() {
+    $view = Views::getView('test_area_title');
+
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $view->render();
+    $this->assertFalse($view->getTitle(), 'The title area does not override the title if the view is not empty.');
+    $view->destroy();
+
+    $view->setDisplay('default');
+    $this->executeView($view);
+    $view->result = array();
+    $view->render();
+    $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
+    $view->destroy();
+
+    $view->setDisplay('page_1');
+    $this->executeView($view);
+    $view->render();
+    $this->assertEqual($view->getTitle(), 'test_title_header', 'The title area on the header should override the title if the result is not empty.');
+    $view->destroy();
+
+    $view->setDisplay('page_1');
+    $this->executeView($view);
+    $view->result = array();
+    $view->render();
+    $this->assertEqual($view->getTitle(), 'test_title_empty', 'The title area should override the title if the result is empty.');
+    $view->destroy();
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
new file mode 100644
index 0000000..53d6066
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/AreaViewTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\AreaViewTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the view area handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\area\View
+ */
+class AreaViewTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_simple_argument', 'test_area_view');
+
+  /**
+   * Tests the view area handler.
+   */
+  public function testViewArea() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $view = Views::getView('test_area_view');
+
+    // Tests \Drupal\views\Plugin\views\area\View::calculateDependencies().
+    $this->assertIdentical(['config' => ['views.view.test_simple_argument']], $view->getDependencies());
+
+    $this->executeView($view);
+    $output = $view->render();
+    $output = $renderer->renderRoot($output);
+    $this->assertTrue(strpos($output, 'js-view-dom-id-' . $view->dom_id) !== FALSE, 'The test view is correctly embedded.');
+    $view->destroy();
+
+    $view->setArguments(array(27));
+    $this->executeView($view);
+    $output = $view->render();
+    $output = $renderer->renderRoot($output);
+    $this->assertTrue(strpos($output, 'John') === FALSE, 'The test view is correctly embedded with inherited arguments.');
+    $this->assertTrue(strpos($output, 'George') !== FALSE, 'The test view is correctly embedded with inherited arguments.');
+    $view->destroy();
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
new file mode 100644
index 0000000..16a8144
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/ArgumentDateTest.php
@@ -0,0 +1,323 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\ArgumentDateTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core date argument handlers.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\argument\Date
+ */
+class ArgumentDateTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_argument_date');
+
+  /**
+   * Stores the column map for this testCase.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'id' => 'id',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewsData() {
+    $data = parent::viewsData();
+
+    $date_plugins = array(
+      'date_fulldate',
+      'date_day',
+      'date_month',
+      'date_week',
+      'date_year',
+      'date_year_month',
+    );
+    foreach ($date_plugins as $plugin_id) {
+      $data['views_test_data'][$plugin_id] = $data['views_test_data']['created'];
+      $data['views_test_data'][$plugin_id]['real field'] = 'created';
+      $data['views_test_data'][$plugin_id]['argument']['id'] = $plugin_id;
+    }
+    return $data;
+  }
+
+  /**
+   * Tests the CreatedFullDate handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedFullDate
+   */
+  public function testCreatedFullDateHandler() {
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('default');
+    $this->executeView($view, array('20000102'));
+    $expected = array();
+    $expected[] = array('id' => 2);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('default');
+    $this->executeView($view, array('20000101'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $expected[] = array('id' => 3);
+    $expected[] = array('id' => 4);
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('default');
+    $this->executeView($view, array('20001023'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+  }
+
+  /**
+   * Tests the Day handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedDay
+   */
+  public function testDayHandler() {
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('embed_1');
+    $this->executeView($view, array('02'));
+    $expected = array();
+    $expected[] = array('id' => 2);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_1');
+    $this->executeView($view, array('01'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $expected[] = array('id' => 3);
+    $expected[] = array('id' => 4);
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_1');
+    $this->executeView($view, array('23'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+  }
+
+  /**
+   * Tests the Month handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedMonth
+   */
+  public function testMonthHandler() {
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('embed_2');
+    $this->executeView($view, array('01'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $expected[] = array('id' => 2);
+    $expected[] = array('id' => 3);
+    $expected[] = array('id' => 4);
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_2');
+    $this->executeView($view, array('12'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+  }
+
+  /**
+   * Tests the Week handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedWeek
+   */
+  public function testWeekHandler() {
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 9, 26, 2008)))
+      ->condition('id', 1)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 2, 29, 2004)))
+      ->condition('id', 2)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2000)))
+      ->condition('id', 3)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 10, 2000)))
+      ->condition('id', 4)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 2, 1, 2000)))
+      ->condition('id', 5)
+      ->execute();
+
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('embed_3');
+    // Check the week calculation for a leap year.
+    // @see http://wikipedia.org/wiki/ISO_week_date#Calculation
+    $this->executeView($view, array('39'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    // Check the week calculation for the 29th of February in a leap year.
+    // @see http://wikipedia.org/wiki/ISO_week_date#Calculation
+    $this->executeView($view, array('09'));
+    $expected = array();
+    $expected[] = array('id' => 2);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    // The first jan 2000 was still in the last week of the previous year.
+    $this->executeView($view, array('52'));
+    $expected = array();
+    $expected[] = array('id' => 3);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    $this->executeView($view, array('02'));
+    $expected = array();
+    $expected[] = array('id' => 4);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    $this->executeView($view, array('05'));
+    $expected = array();
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_3');
+    $this->executeView($view, array('23'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+  }
+
+  /**
+   * Tests the Year handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedYear
+   */
+  public function testYearHandler() {
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
+      ->condition('id', 3)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
+      ->condition('id', 4)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2002)))
+      ->condition('id', 5)
+      ->execute();
+
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('embed_4');
+    $this->executeView($view, array('2000'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $expected[] = array('id' => 2);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_4');
+    $this->executeView($view, array('2001'));
+    $expected = array();
+    $expected[] = array('id' => 3);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_4');
+    $this->executeView($view, array('2002'));
+    $expected = array();
+    $expected[] = array('id' => 4);
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_4');
+    $this->executeView($view, array('23'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+  }
+
+  /**
+   * Tests the YearMonth handler.
+   *
+   * @see \Drupal\node\Plugin\views\argument\CreatedYearMonth
+   */
+  public function testYearMonthHandler() {
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 1, 1, 2001)))
+      ->condition('id', 3)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
+      ->condition('id', 4)
+      ->execute();
+
+    $this->container->get('database')->update('views_test_data')
+      ->fields(array('created' => gmmktime(0, 0, 0, 4, 1, 2001)))
+      ->condition('id', 5)
+      ->execute();
+
+    $view = Views::getView('test_argument_date');
+    $view->setDisplay('embed_5');
+    $this->executeView($view, array('200001'));
+    $expected = array();
+    $expected[] = array('id' => 1);
+    $expected[] = array('id' => 2);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_5');
+    $this->executeView($view, array('200101'));
+    $expected = array();
+    $expected[] = array('id' => 3);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_5');
+    $this->executeView($view, array('200104'));
+    $expected = array();
+    $expected[] = array('id' => 4);
+    $expected[] = array('id' => 5);
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+    $view->destroy();
+
+    $view->setDisplay('embed_5');
+    $this->executeView($view, array('201301'));
+    $expected = array();
+    $this->assertIdenticalResultset($view, $expected, $this->columnMap);
+  }
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php b/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
new file mode 100644
index 0000000..ede303b
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/ArgumentNullTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\ArgumentNullTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\argument\NullArgument handler.
+ *
+ * @group views
+ */
+class ArgumentNullTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['id']['argument']['id'] = 'null';
+
+    return $data;
+  }
+
+  public function testAreaText() {
+    // Test validation
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a null argument.
+    $view->displayHandlers->get('default')->overrideOption('arguments', array(
+      'null' => array(
+        'id' => 'null',
+        'table' => 'views',
+        'field' => 'null',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    // Make sure that the argument is not validated yet.
+    unset($view->argument['null']->argument_validated);
+    $this->assertTrue($view->argument['null']->validateArgument(26));
+    // test must_not_be option.
+    unset($view->argument['null']->argument_validated);
+    $view->argument['null']->options['must_not_be'] = TRUE;
+    $this->assertFalse($view->argument['null']->validateArgument(26), 'must_not_be returns FALSE, if there is an argument');
+    unset($view->argument['null']->argument_validated);
+    $this->assertTrue($view->argument['null']->validateArgument(NULL), 'must_not_be returns TRUE, if there is no argument');
+
+    // Test execution.
+    $view->destroy();
+    $view->setDisplay();
+
+    // Add a argument, which has null as handler.
+    $view->displayHandlers->get('default')->overrideOption('arguments', array(
+      'id' => array(
+        'id' => 'id',
+        'table' => 'views_test_data',
+        'field' => 'id',
+      ),
+    ));
+
+    $this->executeView($view, array(26));
+
+    // The argument should be ignored, so every result should return.
+    $this->assertEqual(5, count($view->result));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php b/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php
new file mode 100644
index 0000000..a4b0925
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/EntityTestViewsFieldAccessTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\EntityTestViewsFieldAccessTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase;
+
+/**
+ * Tests base field access in Views for the entity_test entity.
+ *
+ * @group entity_test
+ */
+class EntityTestViewsFieldAccessTest extends FieldFieldAccessTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('entity_test');
+  }
+
+  public function testEntityTestFields() {
+    $entity_test = EntityTest::create([
+      'name' => 'test entity name',
+    ]);
+    $entity_test->save();
+
+    // @todo Expand the test coverage in https://www.drupal.org/node/2464635
+
+    $this->assertFieldAccess('entity_test', 'id', $entity_test->id());
+    $this->assertFieldAccess('entity_test', 'langcode', $entity_test->language()->getName());
+    $this->assertFieldAccess('entity_test', 'name', $entity_test->getName());
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
new file mode 100644
index 0000000..2503cae
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldBooleanTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldBooleanTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\Boolean handler.
+ *
+ * @group views
+ */
+class FieldBooleanTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  function dataSet() {
+    // Use default dataset but remove the age from john and paul
+    $data = parent::dataSet();
+    $data[0]['age'] = 0;
+    $data[3]['age'] = 0;
+    return $data;
+  }
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['age']['field']['id'] = 'boolean';
+    return $data;
+  }
+
+  public function testFieldBoolean() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    // This is john, which has no age, there are no custom formats defined, yet.
+    $this->assertEqual(t('No'), $view->field['age']->advancedRender($view->result[0]));
+    $this->assertEqual(t('Yes'), $view->field['age']->advancedRender($view->result[1]));
+
+    // Reverse the output.
+    $view->field['age']->options['not'] = TRUE;
+    $this->assertEqual(t('Yes'), $view->field['age']->advancedRender($view->result[0]));
+    $this->assertEqual(t('No'), $view->field['age']->advancedRender($view->result[1]));
+
+    unset($view->field['age']->options['not']);
+
+    // Use another output format.
+    $view->field['age']->options['type'] = 'true-false';
+    $this->assertEqual(t('False'), $view->field['age']->advancedRender($view->result[0]));
+    $this->assertEqual(t('True'), $view->field['age']->advancedRender($view->result[1]));
+
+    // test awesome unicode.
+    $view->field['age']->options['type'] = 'unicode-yes-no';
+    $this->assertEqual('✖', $view->field['age']->advancedRender($view->result[0]));
+    $this->assertEqual('✔', $view->field['age']->advancedRender($view->result[1]));
+
+    // Set a custom output format.
+    $view->field['age']->formats['test'] = array(t('Test-True'), t('Test-False'));
+    $view->field['age']->options['type'] = 'test';
+    $this->assertEqual(t('Test-False'), $view->field['age']->advancedRender($view->result[0]));
+    $this->assertEqual(t('Test-True'), $view->field['age']->advancedRender($view->result[1]));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
new file mode 100644
index 0000000..fb2d4fc
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldCounterTest.php
@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldCounterTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the Drupal\views\Plugin\views\field\Counter handler.
+ *
+ * @group views
+ */
+class FieldCounterTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  function testSimple() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'counter' => array(
+        'id' => 'counter',
+        'table' => 'views',
+        'field' => 'counter',
+        'relationship' => 'none',
+      ),
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+      ),
+    ));
+    $view->preview();
+
+    $counter = $view->style_plugin->getField(0, 'counter');
+    $this->assertEqual($counter, '1', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter)));
+    $counter = $view->style_plugin->getField(1, 'counter');
+    $this->assertEqual($counter, '2', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 2, '@counter' => $counter)));
+    $counter = $view->style_plugin->getField(2, 'counter');
+    $this->assertEqual($counter, '3', format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter)));
+    $view->destroy();
+    $view->storage->invalidateCaches();
+
+    $view->setDisplay();
+    $rand_start = rand(5, 10);
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'counter' => array(
+        'id' => 'counter',
+        'table' => 'views',
+        'field' => 'counter',
+        'relationship' => 'none',
+        'counter_start' => $rand_start
+      ),
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+      ),
+    ));
+    $view->preview();
+
+    $counter = $view->style_plugin->getField(0, 'counter');
+    $expected_number = 0 + $rand_start;
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $counter = $view->style_plugin->getField(1, 'counter');
+    $expected_number = 1 + $rand_start;
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+    $counter = $view->style_plugin->getField(2, 'counter');
+    $expected_number = 2 + $rand_start;
+    $this->assertEqual($counter, (string) $expected_number, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => $expected_number, '@counter' => $counter)));
+  }
+
+  // @TODO: Write tests for pager.
+  function testPager() {
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
new file mode 100644
index 0000000..c009b6c
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldCustomTest.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldCustomTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\Custom handler.
+ *
+ * @group views
+ */
+class FieldCustomTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * {@inheritdoc}
+   */
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['name']['field']['id'] = 'custom';
+    return $data;
+  }
+
+  /**
+   * Ensure that custom fields work and doesn't escape unnecessary markup.
+   */
+  public function testFieldCustom() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Alter the text of the field to a random string.
+    $random = '<div>' . $this->randomMachineName() . '</div>';
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'alter' => array(
+          'text' => $random,
+        ),
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $this->assertEqual($random, $view->style_plugin->getField(0, 'name'));
+  }
+
+  /**
+   * Ensure that custom fields can use tokens.
+   */
+  public function testFieldCustomTokens() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'age' => [
+        'id' => 'age',
+        'exclude' => TRUE,
+        'table' => 'views_test_data',
+        'field' => 'age',
+      ],
+      'name' => [
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'alter' => [
+          'text' => 'Amount of kittens: {{ age }}',
+        ],
+      ],
+    ]);
+
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+    $preview = $view->preview();
+    $output = $renderer->renderRoot($preview);
+
+    $expected_text = 'Amount of kittens: ' . $view->style_plugin->getField(0, 'age');
+    $this->assertTrue(strpos((string) $output, $expected_text), 'The views token has been successfully replaced.');
+  }
+
+  /**
+   * Ensure that custom field content is XSS filtered.
+   */
+  public function testCustomFieldXss() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Alter the text of the field to include XSS.
+    $text = '<script>alert("kittens")</script>';
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'alter' => array(
+          'text' => $text,
+        ),
+      ),
+    ));
+    $this->executeView($view);
+    $this->assertEqual(Xss::filter($text), $view->style_plugin->getField(0, 'name'));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php
new file mode 100644
index 0000000..123d4f4
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldDateTest.php
@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldDateTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\Date handler.
+ *
+ * @group views
+ */
+class FieldDateTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * {@inheritdoc}
+   */
+  public function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+    $schema['views_test_data']['fields']['destroyed'] = array(
+      'description' => "The destruction date of this record",
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => FALSE,
+      'default' => 0,
+    );
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['created']['field']['id'] = 'date';
+    $data['views_test_data']['destroyed'] = array(
+      'title' => 'Destroyed',
+      'help' => 'Date in future this will be destroyed.',
+      'field' => array('id' => 'date'),
+      'argument' => array('id' => 'date'),
+      'filter' => array('id' => 'date'),
+      'sort' => array('id' => 'date'),
+    );
+    return $data;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function dataSet() {
+    $datas = parent::dataSet();
+    foreach ($datas as $i => $data) {
+      $datas[$i]['destroyed'] = gmmktime(0, 0, 0, 1, 1, 2050);
+    }
+    return $datas;
+  }
+
+  /**
+   * Sets up functional test of the views date field.
+   */
+  public function testFieldDate() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'created' => array(
+        'id' => 'created',
+        'table' => 'views_test_data',
+        'field' => 'created',
+        'relationship' => 'none',
+        // ISO 8601 format, see http://php.net/manual/function.date.php
+        'custom_date_format' => 'c',
+      ),
+      'destroyed' => array(
+        'id' => 'destroyed',
+        'table' => 'views_test_data',
+        'field' => 'destroyed',
+        'relationship' => 'none',
+        'custom_date_format' => 'c',
+      ),
+    ));
+    $time = gmmktime(0, 0, 0, 1, 1, 2000);
+
+    $this->executeView($view);
+
+    $timezones = array(
+      NULL,
+      'UTC',
+      'America/New_York',
+    );
+
+    // Check each date/time in various timezones.
+    foreach ($timezones as $timezone) {
+      $dates = array(
+        'short' => format_date($time, 'short', '', $timezone),
+        'medium' => format_date($time, 'medium', '', $timezone),
+        'long' => format_date($time, 'long', '', $timezone),
+        'custom' => format_date($time, 'custom', 'c', $timezone),
+        'fallback' => format_date($time, 'fallback', '', $timezone),
+        'html_date' => format_date($time, 'html_date', '', $timezone),
+        'html_datetime' => format_date($time, 'html_datetime', '', $timezone),
+        'html_month' => format_date($time, 'html_month', '', $timezone),
+        'html_time' => format_date($time, 'html_time', '', $timezone),
+        'html_week' => format_date($time, 'html_week', '', $timezone),
+        'html_year' => format_date($time, 'html_year', '', $timezone),
+        'html_yearless_date' => format_date($time, 'html_yearless_date', '', $timezone),
+      );
+      $this->assertRenderedDatesEqual($view, $dates, $timezone);
+    }
+
+    // Check times in the past.
+    $time_since = $this->container->get('date.formatter')->formatTimeDiffSince($time);
+    $intervals = array(
+      'raw time ago' => $time_since,
+      'time ago' => t('%time ago', array('%time' => $time_since)),
+      'raw time span' => $time_since,
+      'inverse time span' => "-$time_since",
+      'time span' => t('%time ago', array('%time' => $time_since)),
+    );
+    $this->assertRenderedDatesEqual($view, $intervals);
+
+    // Check times in the future.
+    $time = gmmktime(0, 0, 0, 1, 1, 2050);
+    $formatted = $this->container->get('date.formatter')->formatTimeDiffUntil($time);
+    $intervals = array(
+      'raw time span' => "-$formatted",
+      'time span' => t('%time hence', array(
+        '%time' => $formatted,
+      )),
+    );
+    $this->assertRenderedFutureDatesEqual($view, $intervals);
+  }
+
+  /**
+   * Asserts properly formatted display against 'created' field in view.
+   *
+   * @param mixed $view
+   *   View to be tested.
+   * @param array $map
+   *   Data map.
+   * @param null $timezone
+   *   Optional timezone.
+   */
+  protected function assertRenderedDatesEqual($view, $map, $timezone = NULL) {
+    foreach ($map as $date_format => $expected_result) {
+      $view->field['created']->options['date_format'] = $date_format;
+      $t_args = array(
+        '%value' => $expected_result,
+        '%format' => $date_format,
+      );
+      if (isset($timezone)) {
+        $t_args['%timezone'] = $timezone;
+        $message = t('Value %value in %format format for timezone %timezone matches.', $t_args);
+        $view->field['created']->options['timezone'] = $timezone;
+      }
+      else {
+        $message = t('Value %value in %format format matches.', $t_args);
+      }
+      $actual_result = $view->field['created']->advancedRender($view->result[0]);
+      $this->assertEqual($expected_result, $actual_result, $message);
+    }
+  }
+
+  /**
+   * Asserts properly formatted display against 'destroyed' field in view.
+   *
+   * @param mixed $view
+   *   View to be tested.
+   * @param array $map
+   *   Data map.
+   */
+  protected function assertRenderedFutureDatesEqual($view, $map) {
+    foreach ($map as $format => $result) {
+      $view->field['destroyed']->options['date_format'] = $format;
+      $view_result = $view->field['destroyed']->advancedRender($view->result[0]);
+      $t_args = array(
+        '%value' => $result,
+        '%format' => $format,
+        '%actual' => $view_result,
+      );
+      $message = t('Value %value in %format matches %actual', $t_args);
+      $this->assertEqual($view_result, $result, $message);
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php
new file mode 100644
index 0000000..4df2d59
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldEntityLinkTest.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldEntityLinkTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Session\AccountInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\simpletest\UserCreationTrait;
+use Drupal\user\Entity\Role;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\EntityOperations handler.
+ *
+ * @group views
+ */
+class FieldEntityLinkTest extends ViewsKernelTestBase {
+
+  use UserCreationTrait;
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_entity_test_link');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'entity_test');
+
+  /**
+   * An admin user account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpFixtures() {
+    parent::setUpFixtures();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    $this->installConfig(['user']);
+
+    // Create some test entities.
+    for ($i = 0; $i < 5; $i++) {
+      EntityTest::create(['name' => $this->randomString()])->save();
+    }
+
+    // Create and admin user.
+    $this->adminUser = $this->createUser(['view test entity'], FALSE, TRUE);
+
+    Role::load(AccountInterface::ANONYMOUS_ROLE)
+      ->grantPermission('view test entity')
+      ->save();
+  }
+
+  /**
+   * Tests entity link fields.
+   */
+  public function testEntityLink() {
+    // Anonymous users cannot see edit/delete links.
+    $expected_results = ['canonical' => TRUE, 'edit-form' => FALSE, 'delete-form' => FALSE];
+    $this->doTestEntityLink(\Drupal::currentUser(), $expected_results);
+
+    // Admin users cannot see all links.
+    $expected_results = ['canonical' => TRUE, 'edit-form' => TRUE, 'delete-form' => TRUE];
+    $this->doTestEntityLink($this->adminUser, $expected_results);
+  }
+
+  /**
+   * Tests whether entity links behave as expected.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user account to be used to run the test;
+   * @param bool[] $expected_results
+   *   An associative array of expected results keyed by link template name.
+   */
+  protected function doTestEntityLink(AccountInterface $account, $expected_results) {
+    \Drupal::currentUser()->setAccount($account);
+
+    $view = Views::getView('test_entity_test_link');
+    $view->preview();
+
+    $info = [
+      'canonical' => [
+        'label' => 'View entity test',
+        'field_id' => 'view_entity_test',
+        'destination' => FALSE,
+      ],
+      'edit-form' => [
+        'label' => 'Edit entity test',
+        'field_id' => 'edit_entity_test',
+        'destination' => TRUE,
+      ],
+      'delete-form' => [
+        'label' => 'Delete entity test',
+        'field_id' => 'delete_entity_test',
+        'destination' => TRUE,
+      ],
+    ];
+
+    $index = 0;
+    foreach (EntityTest::loadMultiple() as $entity) {
+      foreach ($expected_results as $template => $expected_result) {
+        $expected_link = '';
+        if ($expected_result) {
+          $path = $entity->url($template);
+          $destination = $info[$template]['destination'] ? '?destination=/' : '';
+          $expected_link = '<a href="' . $path . $destination . '" hreflang="en">' . $info[$template]['label'] . '</a>';
+        }
+        $link = $view->style_plugin->getField($index, $info[$template]['field_id']);
+        $this->assertEqual($link, $expected_link);
+      }
+      $index++;
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php
new file mode 100644
index 0000000..4cdf592
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldFieldAccessTestBase.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldFieldAccessTestBase.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
+use Drupal\views\Entity\View;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Provides a base class for base field access in views.
+ */
+abstract class FieldFieldAccessTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Stores an user entity with access to fields.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $userWithAccess;
+
+  /**
+   * Stores an user entity without access to fields.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $userWithoutAccess;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('user');
+
+    $role_with_access = Role::create([
+      'id' => 'with_access',
+      'permissions' => ['view test entity field'],
+    ]);
+    $role_with_access->save();
+    $role_without_access = Role::create([
+      'id' => 'without_access',
+      'permissions' => [],
+    ]);
+    $role_without_access->save();
+
+    $this->userWithAccess = User::create([
+      'name' => $this->randomMachineName(),
+      'roles' => [$role_with_access->id()],
+    ]);
+    $this->userWithAccess->save();
+    $this->userWithoutAccess = User::create([
+      'name' => $this->randomMachineName(),
+      'roles' => [$role_without_access->id()],
+    ]);
+    $this->userWithoutAccess->save();
+  }
+
+  /**
+   * Checks views field access for a given entity type and field name.
+   *
+   * To use this method, set up an entity of type $entity_type_id, with field
+   * $field_name. Create an entity instance that contains content $field_content
+   * in that field.
+   *
+   * This method will check that a user with permission can see the content in a
+   * view, and a user without access permission on that field cannot.
+   *
+   * @param string $entity_type_id
+   *   The entity type ID.
+   * @param string $field_name
+   *   The field name.
+   * @param string $field_content
+   *   The expected field content.
+   */
+  protected function assertFieldAccess($entity_type_id, $field_name, $field_content) {
+    \Drupal::state()->set('views_field_access_test-field', $field_name);
+
+    $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
+    $view_id = $this->randomMachineName();
+    $data_table = $entity_type->getDataTable();
+    // Use the data table as long as the field is not 'uuid'. This is the only
+    // column that can only be obtained from the base table.
+    $base_table = ($data_table && ($field_name !== 'uuid')) ? $data_table : $entity_type->getBaseTable();
+    $entity = View::create([
+      'id' => $view_id,
+      'base_table' => $base_table,
+      'display' => [
+        'default' => [
+          'display_plugin' => 'default',
+          'id' => 'default',
+          'display_options' => [
+            'fields' => [
+              $field_name => [
+                'table' => $base_table,
+                'field' => $field_name,
+                'id' => $field_name,
+                'plugin_id' => 'field',
+              ],
+            ],
+          ],
+        ],
+      ],
+    ]);
+    $entity->save();
+
+    /** @var \Drupal\Core\Session\AccountSwitcherInterface $account_switcher */
+    $account_switcher = \Drupal::service('account_switcher');
+
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $account_switcher->switchTo($this->userWithAccess);
+    $executable = Views::getView($view_id);
+    $build = $executable->preview();
+    $this->setRawContent($renderer->renderRoot($build));
+
+    $this->assertText($field_content);
+    $this->assertTrue(isset($executable->field[$field_name]));
+
+    $account_switcher->switchTo($this->userWithoutAccess);
+    $executable = Views::getView($view_id);
+    $build = $executable->preview();
+    $this->setRawContent($renderer->renderRoot($build));
+
+    $this->assertNoText($field_content);
+    $this->assertFalse(isset($executable->field[$field_name]));
+
+    \Drupal::state()->delete('views_field_access_test-field');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
new file mode 100644
index 0000000..aa5197f
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldFieldTest.php
@@ -0,0 +1,554 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldFieldTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\user\Entity\User;
+use Drupal\views\Plugin\views\field\Field;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Provides some integration tests for the Field handler.
+ *
+ * @see \Drupal\views\Plugin\views\field\Field
+ * @group views
+ */
+class FieldFieldTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field', 'entity_test', 'user', 'views_test_formatter'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_field_field_test', 'test_field_alias_test', 'test_field_field_complex_test', 'test_field_field_attachment_test', 'test_field_field_revision_test', 'test_field_field_revision_complex_test'];
+
+  /**
+   * The stored test entities.
+   *
+   * @var \Drupal\entity_test\Entity\EntityTest[]
+   */
+  protected $entities;
+
+  /**
+   * The stored revisionable test entities.
+   *
+   * @var \Drupal\entity_test\Entity\EntityTestRev[]
+   */
+  protected $entityRevision;
+
+  /**
+   * Stores a couple of test users.
+   *
+   * @var \Drupal\user\UserInterface[]
+   */
+  protected $testUsers;
+
+  /**
+   * The admin user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test_rev');
+
+    // Bypass any field access.
+    $this->adminUser = User::create(['name' => $this->randomString()]);
+    $this->adminUser->save();
+    $this->container->get('current_user')->setAccount($this->adminUser);
+
+    $this->testUsers = [];
+    for ($i = 0; $i < 5; $i++) {
+      $this->testUsers[$i] = User::create([
+        'name' => 'test ' . $i,
+        'timezone' => User::getAllowedTimezones()[$i],
+        'created' => REQUEST_TIME - rand(0, 3600)
+      ]);
+      $this->testUsers[$i]->save();
+    }
+
+    // Setup a field storage and field, but also change the views data for the
+    // entity_test entity type.
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'field_test',
+      'type' => 'integer',
+      'entity_type' => 'entity_test',
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ]);
+    $field->save();
+
+    $field_storage_multiple = FieldStorageConfig::create([
+      'field_name' => 'field_test_multiple',
+      'type' => 'integer',
+      'entity_type' => 'entity_test',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+    ]);
+    $field_storage_multiple->save();
+
+    $field_multiple = FieldConfig::create([
+      'field_name' => 'field_test_multiple',
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ]);
+    $field_multiple->save();
+
+    $random_number = (string) 30856;
+    $random_number_multiple = (string) 1370359990;
+    for ($i = 0; $i < 5; $i++) {
+      $this->entities[$i] = $entity = EntityTest::create([
+        'bundle' => 'entity_test',
+        'name' => 'test ' . $i,
+        'field_test' => $random_number[$i],
+        'field_test_multiple' => [$random_number_multiple[$i * 2], $random_number_multiple[$i * 2 + 1]],
+        'user_id' => $this->testUsers[$i]->id(),
+      ]);
+      $entity->save();
+    }
+
+    // Setup some test data for entities with revisions.
+    // We are testing both base field revisions and field config revisions.
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'field_test',
+      'type' => 'integer',
+      'entity_type' => 'entity_test_rev',
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test_rev',
+      'bundle' => 'entity_test_rev',
+    ]);
+    $field->save();
+
+    $field_storage_multiple = FieldStorageConfig::create([
+      'field_name' => 'field_test_multiple',
+      'type' => 'integer',
+      'entity_type' => 'entity_test_rev',
+      'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
+    ]);
+    $field_storage_multiple->save();
+
+    $field_multiple = FieldConfig::create([
+      'field_name' => 'field_test_multiple',
+      'entity_type' => 'entity_test_rev',
+      'bundle' => 'entity_test_rev',
+    ]);
+    $field_multiple->save();
+
+    $this->entityRevision = [];
+    $this->entityRevision[0] = $entity = EntityTestRev::create([
+      'name' => 'base value',
+      'field_test' => 1,
+      'field_test_multiple' => [1, 3, 7],
+      'user_id' =>  $this->testUsers[0]->id(),
+    ]);
+    $entity->save();
+    $original_entity = clone $entity;
+
+    $entity = clone $original_entity;
+    $entity->setNewRevision(TRUE);
+    $entity->name->value = 'revision value1';
+    $entity->field_test->value = 2;
+    $entity->field_test_multiple[0]->value = 0;
+    $entity->field_test_multiple[1]->value = 3;
+    $entity->field_test_multiple[2]->value = 5;
+    $entity->user_id->target_id = $this->testUsers[1]->id();
+    $entity->save();
+    $this->entityRevision[1] = $entity;
+
+    $entity = clone $original_entity;
+    $entity->setNewRevision(TRUE);
+    $entity->name->value = 'revision value2';
+    $entity->field_test->value = 3;
+    $entity->field_test_multiple[0]->value = 9;
+    $entity->field_test_multiple[1]->value = 9;
+    $entity->field_test_multiple[2]->value = 9;
+    $entity->user_id->target_id = $this->testUsers[2]->id();
+    $entity->save();
+    $this->entityRevision[2] = $entity;
+
+    $this->entityRevision[3] = $entity = EntityTestRev::create([
+      'name' => 'next entity value',
+      'field_test' => 4,
+      'field_test_multiple' => [2, 9, 9],
+      'user_id' => $this->testUsers[3]->id(),
+    ]);
+    $entity->save();
+
+    \Drupal::state()->set('entity_test.views_data', [
+      'entity_test' => [
+        'id' => [
+          'field' => [
+            'id' => 'field',
+          ],
+        ],
+      ],
+      'entity_test_rev_revision' => [
+        'id' => [
+          'field' => [
+            'id' => 'field',
+          ],
+        ],
+      ],
+    ]);
+
+    Views::viewsData()->clear();
+  }
+
+  /**
+   * Tests the result of a view with base fields and configurable fields.
+   */
+  public function testSimpleExecute() {
+    $executable = Views::getView('test_field_field_test');
+    $executable->execute();
+
+    $this->assertTrue($executable->field['id'] instanceof Field);
+    $this->assertTrue($executable->field['field_test'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['id' => 1, 'field_test' => 3],
+        ['id' => 2, 'field_test' => 0],
+        ['id' => 3, 'field_test' => 8],
+        ['id' => 4, 'field_test' => 5],
+        ['id' => 5, 'field_test' => 6],
+      ],
+      ['id' => 'id', 'field_test' => 'field_test']
+    );
+  }
+
+  /**
+   * Tests the output of a view with base fields and configurable fields.
+   */
+  public function testSimpleRender() {
+    $executable = Views::getView('test_field_field_test');
+    $executable->execute();
+
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'id'));
+    // @todo Switch this assertion to assertIdentical('', ...) when
+    //   https://www.drupal.org/node/2488006 gets fixed.
+    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('8', $executable->getStyle()->getField(2, 'field_test'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('5', $executable->getStyle()->getField(3, 'field_test'));
+    $this->assertEqual('5', $executable->getStyle()->getField(4, 'id'));
+    $this->assertEqual('6', $executable->getStyle()->getField(4, 'field_test'));
+  }
+
+  /**
+   * Tests that formatter's #attached assets are correctly preserved.
+   *
+   * @see \Drupal\views_test_formatter\Plugin\Field\FieldFormatter\AttachmentTestFormatter::viewElements()
+   */
+  public function testAttachedRender() {
+    $executable = Views::getView('test_field_field_attachment_test');
+    $executable->execute();
+
+    // Check that the attachments added by AttachmentTestFormatter have been
+    // preserved in the render array.
+    $render = $executable->display_handler->render();
+    $expected_attachments = [
+      'library' => [
+        'views/views.module'
+      ]
+    ];
+    foreach ($this->entities as $entity) {
+      $expected_attachments['library'][] = 'foo/fake_library';
+      $expected_attachments['drupalSettings']['AttachmentIntegerFormatter'][$entity->id()] = $entity->id();
+    }
+    $this->assertEqual($expected_attachments, $render['#attached']);
+  }
+
+  /**
+   * Tests the result of a view with complex field configuration.
+   *
+   * A complex field configuration contains multiple times the same field, with
+   * different delta limit / offset.
+   */
+  public function testFieldAlias() {
+    $executable = Views::getView('test_field_alias_test');
+    $executable->execute();
+
+    $this->assertTrue($executable->field['id'] instanceof Field);
+    $this->assertTrue($executable->field['name'] instanceof Field);
+    $this->assertTrue($executable->field['name_alias'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['id' => 1, 'name' => 'test 0', 'name_alias' => 'test 0'],
+        ['id' => 2, 'name' => 'test 1', 'name_alias' => 'test 1'],
+        ['id' => 3, 'name' => 'test 2', 'name_alias' => 'test 2'],
+        ['id' => 4, 'name' => 'test 3', 'name_alias' => 'test 3'],
+        ['id' => 5, 'name' => 'test 4', 'name_alias' => 'test 4'],
+      ],
+      ['id' => 'id', 'name' => 'name', 'name_alias' => 'name_alias']
+    );
+  }
+
+  /**
+   * Tests the result of a view with complex field configuration.
+   *
+   * A complex field configuration contains multiple times the same field, with
+   * different delta limit / offset.
+   */
+  public function testFieldAliasRender() {
+    $executable = Views::getView('test_field_alias_test');
+    $executable->execute();
+
+    for ($i = 0; $i < 5; $i++) {
+      $this->assertEqual((string) ($i + 1), $executable->getStyle()->getField($i, 'id'));
+      $this->assertEqual('test ' . $i, $executable->getStyle()->getField($i, 'name'));
+      $entity = EntityTest::load($i + 1);
+      $this->assertEqual('<a href="' . $entity->url() . '" hreflang="' . $entity->language()->getId() . '">test ' . $i . '</a>', (string) $executable->getStyle()->getField($i, 'name_alias'));
+    }
+  }
+
+  /**
+   * Tests the result of a view with complex field configuration.
+   *
+   * A complex field configuration contains multiple times the same field, with
+   * different delta limit / offset.
+   */
+  public function testComplexExecute() {
+    $executable = Views::getView('test_field_field_complex_test');
+    $executable->execute();
+
+    $timezones = [];
+    foreach ($this->testUsers as $user) {
+      $timezones[] = $user->getTimeZone();
+    }
+
+    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
+    $this->assertTrue($executable->field['timezone'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['timezone' => $timezones[0], 'field_test_multiple' => [1, 3], 'field_test_multiple_1' => [1, 3], 'field_test_multiple_2' => [1, 3]],
+        ['timezone' => $timezones[1], 'field_test_multiple' => [7, 0], 'field_test_multiple_1' => [7, 0], 'field_test_multiple_2' => [7, 0]],
+        ['timezone' => $timezones[2], 'field_test_multiple' => [3, 5], 'field_test_multiple_1' => [3, 5], 'field_test_multiple_2' => [3, 5]],
+        ['timezone' => $timezones[3], 'field_test_multiple' => [9, 9], 'field_test_multiple_1' => [9, 9], 'field_test_multiple_2' => [9, 9]],
+        ['timezone' => $timezones[4], 'field_test_multiple' => [9, 0], 'field_test_multiple_1' => [9, 0], 'field_test_multiple_2' => [9, 0]],
+      ],
+      ['timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
+    );
+  }
+
+  /**
+   * Tests the output of a view with complex field configuration.
+   */
+  public function testComplexRender() {
+    $executable = Views::getView('test_field_field_complex_test');
+    $executable->execute();
+    $date_formatter = \Drupal::service('date.formatter');
+
+    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
+    $this->assertEqual("1, 3", $executable->getStyle()->getField(0, 'field_test_multiple'));
+    $this->assertEqual("1", $executable->getStyle()->getField(0, 'field_test_multiple_1'));
+    $this->assertEqual("3", $executable->getStyle()->getField(0, 'field_test_multiple_2'));
+    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(0, 'created'));
+    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(0, 'created_1'));
+    $this->assertEqual($date_formatter->format($this->testUsers[0]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(0, 'created_2'));
+
+    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
+    $this->assertEqual("7, 0", $executable->getStyle()->getField(1, 'field_test_multiple'));
+    $this->assertEqual("7", $executable->getStyle()->getField(1, 'field_test_multiple_1'));
+    $this->assertEqual("0", $executable->getStyle()->getField(1, 'field_test_multiple_2'));
+    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(1, 'created'));
+    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(1, 'created_1'));
+    $this->assertEqual($date_formatter->format($this->testUsers[1]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(1, 'created_2'));
+
+    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
+    $this->assertEqual("3, 5", $executable->getStyle()->getField(2, 'field_test_multiple'));
+    $this->assertEqual("3", $executable->getStyle()->getField(2, 'field_test_multiple_1'));
+    $this->assertEqual("5", $executable->getStyle()->getField(2, 'field_test_multiple_2'));
+    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(2, 'created'));
+    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(2, 'created_1'));
+    $this->assertEqual($date_formatter->format($this->testUsers[2]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(2, 'created_2'));
+
+    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
+    $this->assertEqual("9, 9", $executable->getStyle()->getField(3, 'field_test_multiple'));
+    $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_1'));
+    $this->assertEqual("9", $executable->getStyle()->getField(3, 'field_test_multiple_2'));
+    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(3, 'created'));
+    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(3, 'created_1'));
+    $this->assertEqual($date_formatter->format($this->testUsers[3]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(3, 'created_2'));
+
+    $this->assertEqual($this->testUsers[4]->getTimeZone(), $executable->getStyle()->getField(4, 'timezone'));
+    $this->assertEqual("9, 0", $executable->getStyle()->getField(4, 'field_test_multiple'));
+    $this->assertEqual("9", $executable->getStyle()->getField(4, 'field_test_multiple_1'));
+    $this->assertEqual("0", $executable->getStyle()->getField(4, 'field_test_multiple_2'));
+    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'custom', 'Y'), $executable->getStyle()->getField(4, 'created'));
+    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'custom', 'H:i:s'), $executable->getStyle()->getField(4, 'created_1'));
+    $this->assertEqual($date_formatter->format($this->testUsers[4]->getCreatedTime(), 'fallback'), $executable->getStyle()->getField(4, 'created_2'));
+  }
+
+  /**
+   * Tests the revision result.
+   */
+  public function testRevisionExecute() {
+    $executable = Views::getView('test_field_field_revision_test');
+    $executable->execute();
+
+    $this->assertTrue($executable->field['name'] instanceof Field);
+    $this->assertTrue($executable->field['field_test'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['id' => 1, 'field_test' => 1, 'revision_id' => 1, 'name' => 'base value'],
+        ['id' => 1, 'field_test' => 2, 'revision_id' => 2, 'name' => 'revision value1'],
+        ['id' => 1, 'field_test' => 3, 'revision_id' => 3, 'name' => 'revision value2'],
+        ['id' => 2, 'field_test' => 4, 'revision_id' => 4, 'name' => 'next entity value'],
+      ],
+      ['entity_test_rev_revision_id' => 'id', 'revision_id' => 'revision_id', 'name' => 'name', 'field_test' => 'field_test']
+    );
+  }
+
+  /**
+   * Tests the output of a revision view with base and configurable fields.
+   */
+  public function testRevisionRender() {
+    $executable = Views::getView('test_field_field_revision_test');
+    $executable->execute();
+
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('base value', $executable->getStyle()->getField(0, 'name'));
+
+    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('revision value1', $executable->getStyle()->getField(1, 'name'));
+
+    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'field_test'));
+    $this->assertEqual('revision value2', $executable->getStyle()->getField(2, 'name'));
+
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'field_test'));
+    $this->assertEqual('next entity value', $executable->getStyle()->getField(3, 'name'));
+  }
+
+  /**
+   * Tests the result set of a complex revision view.
+   */
+  public function testRevisionComplexExecute() {
+    $executable = Views::getView('test_field_field_revision_complex_test');
+    $executable->execute();
+
+    $timezones = [];
+    foreach ($this->testUsers as $user) {
+      $timezones[] = $user->getTimeZone();
+    }
+
+    $this->assertTrue($executable->field['id'] instanceof Field);
+    $this->assertTrue($executable->field['revision_id'] instanceof Field);
+    $this->assertTrue($executable->field['timezone'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_1'] instanceof Field);
+    $this->assertTrue($executable->field['field_test_multiple_2'] instanceof Field);
+
+    $this->assertIdenticalResultset($executable,
+      [
+        ['id' => 1, 'field_test' => 1, 'revision_id' => 1, 'uid' => $this->testUsers[0]->id(), 'timezone' => $timezones[0], 'field_test_multiple' => [1, 3, 7], 'field_test_multiple_1' => [1, 3, 7], 'field_test_multiple_2' => [1, 3, 7]],
+        ['id' => 1, 'field_test' => 2, 'revision_id' => 2, 'uid' => $this->testUsers[1]->id(), 'timezone' => $timezones[1], 'field_test_multiple' => [0, 3, 5], 'field_test_multiple_1' => [0, 3, 5], 'field_test_multiple_2' => [0, 3, 5]],
+        ['id' => 1, 'field_test' => 3, 'revision_id' => 3, 'uid' => $this->testUsers[2]->id(), 'timezone' => $timezones[2], 'field_test_multiple' => [9, 9, 9], 'field_test_multiple_1' => [9, 9, 9], 'field_test_multiple_2' => [9, 9, 9]],
+        ['id' => 2, 'field_test' => 4, 'revision_id' => 4, 'uid' => $this->testUsers[3]->id(), 'timezone' => $timezones[3], 'field_test_multiple' => [2, 9, 9], 'field_test_multiple_1' => [2, 9, 9], 'field_test_multiple_2' => [2, 9, 9]],
+      ],
+      ['entity_test_rev_revision_id' => 'id', 'revision_id' => 'revision_id', 'users_field_data_entity_test_rev_revision_uid' => 'uid', 'timezone' => 'timezone', 'field_test_multiple' => 'field_test_multiple', 'field_test_multiple_1' => 'field_test_multiple_1', 'field_test_multiple_2' => 'field_test_multiple_2']
+    );
+  }
+
+  /**
+   * Tests the output of a revision view with base fields and configurable fields.
+   */
+  public function testRevisionComplexRender() {
+    $executable = Views::getView('test_field_field_revision_complex_test');
+    $executable->execute();
+
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'revision_id'));
+    $this->assertEqual($this->testUsers[0]->getTimeZone(), $executable->getStyle()->getField(0, 'timezone'));
+    $this->assertEqual('1, 3, 7', $executable->getStyle()->getField(0, 'field_test_multiple'));
+    $this->assertEqual('1', $executable->getStyle()->getField(0, 'field_test_multiple_1'));
+    $this->assertEqual('3, 7', $executable->getStyle()->getField(0, 'field_test_multiple_2'));
+
+    $this->assertEqual('1', $executable->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $executable->getStyle()->getField(1, 'revision_id'));
+    $this->assertEqual($this->testUsers[1]->getTimeZone(), $executable->getStyle()->getField(1, 'timezone'));
+    $this->assertEqual('0, 3, 5', $executable->getStyle()->getField(1, 'field_test_multiple'));
+    $this->assertEqual('0', $executable->getStyle()->getField(1, 'field_test_multiple_1'));
+    $this->assertEqual('3, 5', $executable->getStyle()->getField(1, 'field_test_multiple_2'));
+
+    $this->assertEqual('1', $executable->getStyle()->getField(2, 'id'));
+    $this->assertEqual('3', $executable->getStyle()->getField(2, 'revision_id'));
+    $this->assertEqual($this->testUsers[2]->getTimeZone(), $executable->getStyle()->getField(2, 'timezone'));
+    $this->assertEqual('9, 9, 9', $executable->getStyle()->getField(2, 'field_test_multiple'));
+    $this->assertEqual('9', $executable->getStyle()->getField(2, 'field_test_multiple_1'));
+    $this->assertEqual('9, 9', $executable->getStyle()->getField(2, 'field_test_multiple_2'));
+
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'id'));
+    $this->assertEqual('4', $executable->getStyle()->getField(3, 'revision_id'));
+    $this->assertEqual($this->testUsers[3]->getTimeZone(), $executable->getStyle()->getField(3, 'timezone'));
+    $this->assertEqual('2, 9, 9', $executable->getStyle()->getField(3, 'field_test_multiple'));
+    $this->assertEqual('2', $executable->getStyle()->getField(3, 'field_test_multiple_1'));
+    $this->assertEqual('9, 9', $executable->getStyle()->getField(3, 'field_test_multiple_2'));
+  }
+
+  /**
+   * Tests that a field not available for every bundle is rendered as empty.
+   */
+  public function testMissingBundleFieldRender() {
+    // Create a new bundle not having the test field attached.
+    $bundle = $this->randomMachineName();
+    entity_test_create_bundle($bundle);
+
+    $entity = EntityTest::create([
+      'type' => $bundle,
+      'name' => $this->randomString(),
+      'user_id' => $this->testUsers[0]->id(),
+    ]);
+    $entity->save();
+
+    $executable = Views::getView('test_field_field_test');
+    $executable->execute();
+
+    $this->assertEqual('', $executable->getStyle()->getField(6, 'field_test'));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php
new file mode 100644
index 0000000..6ce0a66
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldFileSizeTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldFileSizeTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\FileSize handler.
+ *
+ * @group views
+ * @see CommonXssUnitTest
+ */
+class FieldFileSizeTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  function dataSet() {
+    $data = parent::dataSet();
+    $data[0]['age'] = 0;
+    $data[1]['age'] = 10;
+    $data[2]['age'] = 1000;
+    $data[3]['age'] = 10000;
+
+    return $data;
+  }
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['age']['field']['id'] = 'file_size';
+
+    return $data;
+  }
+
+  public function testFieldFileSize() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    // Test with the formatted option.
+    $this->assertEqual($view->field['age']->advancedRender($view->result[0]), '');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[1]), '10 bytes');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[2]), '1000 bytes');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[3]), '9.77 KB');
+    // Test with the bytes option.
+    $view->field['age']->options['file_size_display'] = 'bytes';
+    $this->assertEqual($view->field['age']->advancedRender($view->result[0]), '');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[1]), '10');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[2]), '1000');
+    $this->assertEqual($view->field['age']->advancedRender($view->result[3]), '10000');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
new file mode 100644
index 0000000..c5bfb5d
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldKernelTest.php
@@ -0,0 +1,797 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldKernelTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Render\RenderContext;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the generic field handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\field\FieldPluginBase
+ */
+class FieldKernelTest extends ViewsKernelTestBase {
+
+  public static $modules = array('user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view', 'test_field_tokens', 'test_field_argument_tokens', 'test_field_output');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['job']['field']['id'] = 'test_field';
+    $data['views_test_data']['job']['field']['click sortable'] = FALSE;
+    $data['views_test_data']['id']['field']['click sortable'] = TRUE;
+    return $data;
+  }
+
+  /**
+   * Tests that the render function is called.
+   */
+  public function testRender() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_field_tokens');
+    $this->executeView($view);
+
+    $random_text = $this->randomMachineName();
+    $view->field['job']->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['job']->theme($view->result[0]);
+    });
+    $this->assertEqual($output, $random_text, 'Make sure the render method rendered the manual set value.');
+  }
+
+  /**
+   * Tests all things related to the query.
+   */
+  public function testQuery() {
+    // Tests adding additional fields to the query.
+    $view = Views::getView('test_view');
+    $view->initHandlers();
+
+    $id_field = $view->field['id'];
+    $id_field->additional_fields['job'] = 'job';
+    // Choose also a field alias key which doesn't match to the table field.
+    $id_field->additional_fields['created_test'] = array('table' => 'views_test_data', 'field' => 'created');
+    $view->build();
+
+    // Make sure the field aliases have the expected value.
+    $this->assertEqual($id_field->aliases['job'], 'views_test_data_job');
+    $this->assertEqual($id_field->aliases['created_test'], 'views_test_data_created');
+
+    $this->executeView($view);
+    // Tests the getValue method with and without a field aliases.
+    foreach ($this->dataSet() as $key => $row) {
+      $id = $key + 1;
+      $result = $view->result[$key];
+      $this->assertEqual($id_field->getValue($result), $id);
+      $this->assertEqual($id_field->getValue($result, 'job'), $row['job']);
+      $this->assertEqual($id_field->getValue($result, 'created_test'), $row['created']);
+    }
+  }
+
+  /**
+   * Asserts that a string is part of another string.
+   *
+   * @param string $haystack
+   *   The value to search in.
+   * @param string $needle
+   *   The value to search for.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+   *   variables in the message text, not t(). If left blank, a default message
+   *   will be displayed.
+   * @param string $group
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; most tests do not override
+   *   this default.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertSubString($haystack, $needle, $message = '', $group = 'Other') {
+    return $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message, $group);
+  }
+
+  /**
+   * Asserts that a string is not part of another string.
+   *
+   * @param string $haystack
+   *   The value to search in.
+   * @param string $needle
+   *   The value to search for.
+   * @param string $message
+   *   (optional) A message to display with the assertion. Do not translate
+   *   messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed
+   *   variables in the message text, not t(). If left blank, a default message
+   *   will be displayed.
+   * @param string $group
+   *   (optional) The group this message is in, which is displayed in a column
+   *   in test output. Use 'Debug' to indicate this is debugging output. Do not
+   *   translate this string. Defaults to 'Other'; most tests do not override
+   *   this default.
+   *
+   * @return bool
+   *   TRUE if the assertion succeeded, FALSE otherwise.
+   */
+  protected function assertNotSubString($haystack, $needle, $message = '', $group = 'Other') {
+    return $this->assertTrue(strpos($haystack, $needle) === FALSE, $message, $group);
+  }
+
+  /**
+   * Tests general rewriting of the output.
+   */
+  public function testRewrite() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_view');
+    $view->initHandlers();
+    $this->executeView($view);
+    $row = $view->result[0];
+    $id_field = $view->field['id'];
+
+    // Don't check the rewrite checkbox, so the text shouldn't appear.
+    $id_field->options['alter']['text'] = $random_text = $this->randomMachineName();
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
+    $this->assertNotSubString($output, $random_text);
+
+    $id_field->options['alter']['alter_text'] = TRUE;
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
+      return $id_field->theme($row);
+    });
+    $this->assertSubString($output, $random_text);
+  }
+
+  /**
+   * Tests the arguments tokens on field level.
+   */
+  public function testArgumentTokens() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_field_argument_tokens');
+    $this->executeView($view, ['{{ { "#pre_render": ["views_test_data_test_pre_render_function"]} }}']);
+
+    $name_field_0 = $view->field['name'];
+
+    // Test the old style tokens.
+    $name_field_0->options['alter']['alter_text'] = TRUE;
+    $name_field_0->options['alter']['text'] = '%1 !1';
+
+    $row = $view->result[0];
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
+      return $name_field_0->advancedRender($row);
+    });
+
+    $this->assertFalse(strpos((string) $output, 'views_test_data_test_pre_render_function executed') !== FALSE, 'Ensure that the pre_render function was not executed');
+    $this->assertEqual('%1 !1', (string) $output, "Ensure that old style placeholders aren't replaced");
+
+    // This time use new style tokens but ensure that we still don't allow
+    // arbitrary code execution.
+    $name_field_0->options['alter']['alter_text'] = TRUE;
+    $name_field_0->options['alter']['text'] = '{{ arguments.null }} {{ raw_arguments.null }}';
+
+    $row = $view->result[0];
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
+      return $name_field_0->advancedRender($row);
+    });
+
+    $this->assertFalse(strpos((string) $output, 'views_test_data_test_pre_render_function executed') !== FALSE, 'Ensure that the pre_render function was not executed');
+    $this->assertEqual('{{ { &quot;#pre_render&quot;: [&quot;views_test_data_test_pre_render_function&quot;]} }} {{ { &quot;#pre_render&quot;: [&quot;views_test_data_test_pre_render_function&quot;]} }}', (string) $output, 'Ensure that new style placeholders are replaced');
+  }
+
+  /**
+   * Tests the field tokens, row level and field level.
+   */
+  public function testFieldTokens() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_field_tokens');
+    $this->executeView($view);
+    $name_field_0 = $view->field['name'];
+    $name_field_1 = $view->field['name_1'];
+    $name_field_2 = $view->field['name_2'];
+    $row = $view->result[0];
+
+    $name_field_0->options['alter']['alter_text'] = TRUE;
+    $name_field_0->options['alter']['text'] = '{{ name }}';
+
+    $name_field_1->options['alter']['alter_text'] = TRUE;
+    $name_field_1->options['alter']['text'] = '{{ name_1 }} {{ name }}';
+
+    $name_field_2->options['alter']['alter_text'] = TRUE;
+    $name_field_2->options['alter']['text'] = '{% if name_2|length > 3 %}{{ name_2 }} {{ name_1 }}{% endif %}';
+
+    foreach ($view->result as $row) {
+      $expected_output_0 = $row->views_test_data_name;
+      $expected_output_1 = "$row->views_test_data_name $row->views_test_data_name";
+      $expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name";
+
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_0, $row) {
+        return $name_field_0->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_output_0, format_string('Test token replacement: "@token" gave "@output"', [
+        '@token' => $name_field_0->options['alter']['text'],
+        '@output' => $output,
+      ]));
+
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_1, $row) {
+        return $name_field_1->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_output_1, format_string('Test token replacement: "@token" gave "@output"', [
+        '@token' => $name_field_1->options['alter']['text'],
+        '@output' => $output,
+      ]));
+
+      $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($name_field_2, $row) {
+        return $name_field_2->advancedRender($row);
+      });
+      $this->assertEqual($output, $expected_output_2, format_string('Test token replacement: "@token" gave "@output"', [
+        '@token' => $name_field_2->options['alter']['text'],
+        '@output' => $output,
+      ]));
+    }
+
+    $job_field = $view->field['job'];
+    $job_field->options['alter']['alter_text'] = TRUE;
+    $job_field->options['alter']['text'] = '{{ job }}';
+
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertSubString($output, $random_text, format_string('Make sure the self token (@token => @value) appears in the output (@output)', [
+      '@value' => $random_text,
+      '@output' => $output,
+      '@token' => $job_field->options['alter']['text'],
+    ]));
+
+    // Verify the token format used in D7 and earlier does not get substituted.
+    $old_token = '[job]';
+    $job_field->options['alter']['text'] = $old_token;
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, $old_token, format_string('Make sure the old token style (@token => @value) is not changed in the output (@output)', [
+      '@value' => $random_text,
+      '@output' => $output,
+      '@token' => $job_field->options['alter']['text'],
+    ]));
+
+    // Verify HTML tags are allowed in rewrite templates while token
+    // replacements are escaped.
+    $job_field->options['alter']['text'] = '<h1>{{ job }}</h1>';
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue('<span>' . $random_text . '</span>');
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, '<h1>&lt;span&gt;' . $random_text . '&lt;/span&gt;</h1>', 'Valid tags are allowed in rewrite templates and token replacements.');
+
+    // Verify <script> tags are correctly removed from rewritten text.
+    $rewrite_template = '<script>alert("malicious");</script>';
+    $job_field->options['alter']['text'] = $rewrite_template;
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertNotSubString($output, '<script>', 'Ensure a script tag in the rewrite template is removed.');
+
+    $rewrite_template = '<script>{{ job }}</script>';
+    $job_field->options['alter']['text'] = $rewrite_template;
+    $random_text = $this->randomMachineName();
+    $job_field->setTestValue($random_text);
+    $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($job_field, $row) {
+      return $job_field->advancedRender($row);
+    });
+    $this->assertEqual($output, $random_text, format_string('Make sure a script tag in the template (@template) is removed, leaving only the replaced token in the output (@output)', [
+      '@output' => $output,
+      '@template' => $rewrite_template,
+    ]));
+  }
+
+  /**
+   * Tests the exclude setting.
+   */
+  public function testExclude() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $view = Views::getView('test_field_output');
+    $view->initHandlers();
+    // Hide the field and see whether it's rendered.
+    $view->field['name']->options['exclude'] = TRUE;
+
+    $output = $view->preview();
+    $output = $renderer->renderRoot($output);
+    foreach ($this->dataSet() as $entry) {
+      $this->assertNotSubString($output, $entry['name']);
+    }
+
+    // Show and check the field.
+    $view->field['name']->options['exclude'] = FALSE;
+
+    $output = $view->preview();
+    $output = $renderer->renderRoot($output);
+    foreach ($this->dataSet() as $entry) {
+      $this->assertSubString($output, $entry['name']);
+    }
+  }
+
+  /**
+   * Tests everything related to empty output of a field.
+   */
+  function testEmpty() {
+    $this->_testHideIfEmpty();
+    $this->_testEmptyText();
+  }
+
+  /**
+   * Tests the hide if empty functionality.
+   *
+   * This tests alters the result to get easier and less coupled results. It is
+   * important that assertIdentical() is used in this test since in PHP 0 == ''.
+   */
+  function _testHideIfEmpty() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_view');
+    $view->initDisplay();
+    $this->executeView($view);
+
+    $column_map_reversed = array_flip($this->columnMap);
+    $view->row_index = 0;
+    $random_name = $this->randomMachineName();
+    $random_value = $this->randomMachineName();
+
+    // Test when results are not rewritten and empty values are not hidden.
+    $view->field['name']->options['hide_alter_empty'] = FALSE;
+    $view->field['name']->options['hide_empty'] = FALSE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'By default, a string should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'By default, "" should not be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, '0', 'By default, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'By default, "0" should not be treated as empty.');
+
+    // Test when results are not rewritten and non-zero empty values are hidden.
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If hide_empty is checked, a string should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If hide_empty is checked, "" should be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, '0', 'If hide_empty is checked, but not empty_zero, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If hide_empty is checked, but not empty_zero, "0" should not be treated as empty.');
+
+    // Test when results are not rewritten and all empty values are hidden.
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = TRUE;
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, 0 should be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, "0" should be treated as empty.');
+
+    // Test when results are rewritten to a valid string and non-zero empty
+    // results are hidden.
+    $view->field['name']->options['hide_alter_empty'] = FALSE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $view->field['name']->options['alter']['text'] = $random_name;
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_value;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, it should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, "" should not be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is not empty, "0" should not be treated as empty.');
+
+    // Test when results are rewritten to an empty string and non-zero empty results are hidden.
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $view->field['name']->options['alter']['text'] = "";
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_name, 'If the rewritten string is empty, it should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If the rewritten string is empty, "" should be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, '0', 'If the rewritten string is empty, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If the rewritten string is empty, "0" should not be treated as empty.');
+
+    // Test when results are rewritten to zero as a string and non-zero empty
+    // results are hidden.
+    $view->field['name']->options['hide_alter_empty'] = FALSE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $view->field['name']->options['alter']['text'] = "0";
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, the string rewritten as 0 should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, "" rewritten as 0 should not be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If the rewritten string is zero and empty_zero is not checked, "0" should not be treated as empty.');
+
+    // Test when results are rewritten to a valid string and non-zero empty
+    // results are hidden.
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = FALSE;
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $view->field['name']->options['alter']['text'] = $random_value;
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, it should not be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If either the original or rewritten string is invalid, "" should be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $random_value, 'If the original and rewritten strings are valid, "0" should not be treated as empty.');
+
+    // Test when results are rewritten to zero as a string and all empty
+    // original values and results are hidden.
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $view->field['name']->options['hide_empty'] = TRUE;
+    $view->field['name']->options['empty_zero'] = TRUE;
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $view->field['name']->options['alter']['text'] = "0";
+
+    // Test a valid string.
+    $view->result[0]->{$column_map_reversed['name']} = $random_name;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "", 'If the rewritten string is zero, it should be treated as empty.');
+
+    // Test an empty string.
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If the rewritten string is zero, "" should be treated as empty.');
+
+    // Test zero as an integer.
+    $view->result[0]->{$column_map_reversed['name']} = 0;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If the rewritten string is zero, 0 should not be treated as empty.');
+
+    // Test zero as a string.
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical($render, "", 'If the rewritten string is zero, "0" should not be treated as empty.');
+  }
+
+  /**
+   * Tests the usage of the empty text.
+   */
+  function _testEmptyText() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $view = Views::getView('test_view');
+    $view->initDisplay();
+    $this->executeView($view);
+
+    $column_map_reversed = array_flip($this->columnMap);
+    $view->row_index = 0;
+
+    $empty_text = $view->field['name']->options['empty'] = $this->randomMachineName();
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $empty_text, 'If a field is empty, the empty text should be used for the output.');
+
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, "0", 'If a field is 0 and empty_zero is not checked, the empty text should not be used for the output.');
+
+    $view->result[0]->{$column_map_reversed['name']} = "0";
+    $view->field['name']->options['empty_zero'] = TRUE;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $empty_text, 'If a field is 0 and empty_zero is checked, the empty text should be used for the output.');
+
+    $view->result[0]->{$column_map_reversed['name']} = "";
+    $view->field['name']->options['alter']['alter_text'] = TRUE;
+    $alter_text = $view->field['name']->options['alter']['text'] = $this->randomMachineName();
+    $view->field['name']->options['hide_alter_empty'] = FALSE;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $alter_text, 'If a field is empty, some rewrite text exists, but hide_alter_empty is not checked, render the rewrite text.');
+
+    $view->field['name']->options['hide_alter_empty'] = TRUE;
+    $render = $renderer->executeInRenderContext(new RenderContext(), function () use ($view) {
+      return $view->field['name']->advancedRender($view->result[0]);
+    });
+    $this->assertIdentical((string) $render, $empty_text, 'If a field is empty, some rewrite text exists, and hide_alter_empty is checked, use the empty text.');
+  }
+
+  /**
+   * Tests views_handler_field::isValueEmpty().
+   */
+  function testIsValueEmpty() {
+    $view = Views::getView('test_view');
+    $view->initHandlers();
+    $field = $view->field['name'];
+
+    $this->assertFalse($field->isValueEmpty("not empty", TRUE), 'A normal string is not empty.');
+    $this->assertTrue($field->isValueEmpty("not empty", TRUE, FALSE), 'A normal string which skips empty() can be seen as empty.');
+
+    $this->assertTrue($field->isValueEmpty("", TRUE), '"" is considered as empty.');
+
+    $this->assertTrue($field->isValueEmpty('0', TRUE), '"0" is considered as empty if empty_zero is TRUE.');
+    $this->assertTrue($field->isValueEmpty(0, TRUE), '0 is considered as empty if empty_zero is TRUE.');
+    $this->assertFalse($field->isValueEmpty('0', FALSE), '"0" is considered not as empty if empty_zero is FALSE.');
+    $this->assertFalse($field->isValueEmpty(0, FALSE), '0 is considered not as empty if empty_zero is FALSE.');
+
+    $this->assertTrue($field->isValueEmpty(NULL, TRUE, TRUE), 'Null should be always seen as empty, regardless of no_skip_empty.');
+    $this->assertTrue($field->isValueEmpty(NULL, TRUE, FALSE), 'Null should be always seen as empty, regardless of no_skip_empty.');
+  }
+
+  /**
+   * Tests whether the filters are click sortable as expected.
+   */
+  public function testClickSortable() {
+    // Test that clickSortable is TRUE by default.
+    $item = array(
+      'table' => 'views_test_data',
+      'field' => 'name',
+    );
+    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
+    $this->assertTrue($plugin->clickSortable(), 'TRUE as a default value is correct.');
+
+    // Test that clickSortable is TRUE by when set TRUE in the data.
+    $item['field'] = 'id';
+    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
+    $this->assertTrue($plugin->clickSortable(), 'TRUE as a views data value is correct.');
+
+    // Test that clickSortable is FALSE by when set FALSE in the data.
+    $item['field'] = 'job';
+    $plugin = $this->container->get('plugin.manager.views.field')->getHandler($item);
+    $this->assertFalse($plugin->clickSortable(), 'FALSE as a views data value is correct.');
+  }
+
+  /**
+   * Tests the trimText method.
+   */
+  public function testTrimText() {
+    // Test unicode. See https://www.drupal.org/node/513396#comment-2839416.
+    $text = array(
+      'Tuy nhiên, những hi vọng',
+      'Giả sử chúng tôi có 3 Apple',
+      'siêu nhỏ này là bộ xử lý',
+      'Di động của nhà sản xuất Phần Lan',
+      'khoảng cách từ đại lí đến',
+      'của hãng bao gồm ba dòng',
+      'сд асд асд ас',
+      'асд асд асд ас'
+    );
+    // Just test maxlength without word boundary.
+    $alter = array(
+      'max_length' => 10,
+    );
+    $expect = array(
+      'Tuy nhiên,',
+      'Giả sử chú',
+      'siêu nhỏ n',
+      'Di động củ',
+      'khoảng các',
+      'của hãng b',
+      'сд асд асд',
+      'асд асд ас',
+    );
+
+    foreach ($text as $key => $line) {
+      $result_text = FieldPluginBase::trimText($alter, $line);
+      $this->assertEqual($result_text, $expect[$key]);
+    }
+
+    // Test also word_boundary
+    $alter['word_boundary'] = TRUE;
+    $expect = array(
+      'Tuy nhiên',
+      'Giả sử',
+      'siêu nhỏ',
+      'Di động',
+      'khoảng',
+      'của hãng',
+      'сд асд',
+      'асд асд',
+    );
+
+    foreach ($text as $key => $line) {
+      $result_text = FieldPluginBase::trimText($alter, $line);
+      $this->assertEqual($result_text, $expect[$key]);
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldRenderedEntityTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldRenderedEntityTest.php
new file mode 100644
index 0000000..88dca35
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldRenderedEntityTest.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldRenderedEntityTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\user\Entity\User;
+use Drupal\views\Entity\View;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\Core\Entity\Entity\EntityViewMode;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\RenderedEntity handler.
+ *
+ * @group views
+ */
+class FieldRenderedEntityTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'field'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_field_entity_test_rendered'];
+
+  /**
+   * The logged in user.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $user;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpFixtures() {
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    $this->installConfig(['entity_test']);
+
+    EntityViewMode::create([
+      'id' => 'entity_test.foobar',
+      'targetEntityType' => 'entity_test',
+      'status' => TRUE,
+      'enabled' => TRUE,
+      'label' => 'My view mode',
+    ])->save();
+
+    $display = EntityViewDisplay::create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'foobar',
+      'label' => 'My view mode',
+      'status' => TRUE,
+    ]);
+    $display->save();
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'test_field',
+      'entity_type' => 'entity_test',
+      'type' => 'string',
+    ]);
+    $field_storage->save();
+
+    $field_config = FieldConfig::create([
+      'field_name' => 'test_field',
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+    ]);
+    $field_config->save();
+
+    // Create some test entities.
+    for ($i = 1; $i <= 3; $i++) {
+      EntityTest::create([
+        'name' => "Article title $i",
+        'test_field' => "Test $i",
+      ])->save();
+    }
+
+    $this->user = User::create([
+      'name' => 'test user',
+    ]);
+    $this->user->save();
+
+    parent::setUpFixtures();
+  }
+
+  /**
+   * Tests the default rendered entity output.
+   */
+  public function testRenderedEntityWithoutField() {
+    \Drupal::currentUser()->setAccount($this->user);
+
+    EntityViewDisplay::load('entity_test.entity_test.foobar')
+      ->removeComponent('test_field')
+      ->save();
+
+    $view = Views::getView('test_field_entity_test_rendered');
+    $build = [
+      '#type' => 'view',
+      '#name' => 'test_field_entity_test_rendered',
+      '#view' => $view,
+      '#display_id' => 'default',
+    ];
+    $renderer = \Drupal::service('renderer');
+    $renderer->renderPlain($build);
+    for ($i = 1; $i <= 3; $i++) {
+      $view_field = $view->style_plugin->getField($i - 1, 'rendered_entity');
+      $search_result = strpos($view_field, "Test $i") !== FALSE;
+      $this->assertFalse($search_result, "The text 'Test $i' not found in the view.");
+    }
+
+    $this->assertConfigDependencies($view->storage);
+    $this->assertCacheabilityMetadata($build);
+  }
+
+  /**
+   * Ensures that the expected cacheability metadata is applied.
+   *
+   * @param array $build
+   *   The render array
+   */
+  protected function assertCacheabilityMetadata($build) {
+    $this->assertEqual([
+      'config:core.entity_view_display.entity_test.entity_test.foobar',
+      'config:views.view.test_field_entity_test_rendered',
+      'entity_test:1',
+      'entity_test:2',
+      'entity_test:3',
+      'entity_test_list',
+      'entity_test_view',
+    ], $build['#cache']['tags']);
+
+    $this->assertEqual([
+      'entity_test_view_grants',
+      'languages:language_interface',
+      'theme',
+      'url.query_args',
+      'user.permissions',
+    ], $build['#cache']['contexts']);
+  }
+
+  /**
+   * Ensures that the config dependencies are calculated the right way.
+   *
+   * @param \Drupal\views\Entity\View $storage
+   */
+  protected function assertConfigDependencies(View $storage) {
+    $storage->calculateDependencies();
+    $this->assertEqual([
+      'config' => ['core.entity_view_mode.entity_test.foobar'],
+      'module' => ['entity_test'],
+    ], $storage->getDependencies());
+  }
+
+  /**
+   * Tests the rendered entity output with the test field configured to show.
+   */
+  public function testRenderedEntityWithField() {
+    \Drupal::currentUser()->setAccount($this->user);
+
+    // Show the test_field on the entity_test.entity_test.foobar view display.
+    EntityViewDisplay::load('entity_test.entity_test.foobar')->setComponent('test_field', ['type' => 'string', 'label' => 'above'])->save();
+
+    $view = Views::getView('test_field_entity_test_rendered');
+    $build = [
+      '#type' => 'view',
+      '#name' => 'test_field_entity_test_rendered',
+      '#view' => $view,
+      '#display_id' => 'default',
+    ];
+
+    $renderer = \Drupal::service('renderer');
+    $renderer->renderPlain($build);
+    for ($i = 1; $i <= 3; $i++) {
+      $view_field = $view->style_plugin->getField($i - 1, 'rendered_entity');
+      $search_result = strpos($view_field, "Test $i") !== FALSE;
+      $this->assertTrue($search_result, "The text 'Test $i' found in the view.");
+    }
+
+    $this->assertConfigDependencies($view->storage);
+    $this->assertCacheabilityMetadata($build);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
new file mode 100644
index 0000000..494d939
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FieldUrlTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Url;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\field\Url handler.
+ *
+ * @group views
+ */
+class FieldUrlTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['name']['field']['id'] = 'url';
+    return $data;
+  }
+
+  public function testFieldUrl() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'display_as_link' => FALSE,
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $this->assertEqual('John', $view->field['name']->advancedRender($view->result[0]));
+
+    // Make the url a link.
+    $view->destroy();
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('fields', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $this->assertEqual(\Drupal::l('John', Url::fromUri('base:John'))->getGeneratedLink(), $view->field['name']->advancedRender($view->result[0]));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
new file mode 100644
index 0000000..a334677
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
@@ -0,0 +1,221 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterBooleanOperatorStringTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\filter\BooleanOperatorString
+ * handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\filter\BooleanOperatorString
+ */
+class FilterBooleanOperatorStringTest extends ViewsKernelTestBase {
+
+  /**
+   * The modules to enable for this test.
+   *
+   * @var array
+   */
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_id' => 'id',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+
+    $schema['views_test_data']['fields']['status'] = array(
+      'description' => 'The status of this record',
+      'type' => 'varchar',
+      'length' => 255,
+      'not null' => TRUE,
+      'default' => '',
+    );
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $views_data = parent::viewsData();
+
+    $views_data['views_test_data']['status']['filter']['id'] = 'boolean_string';
+
+    return $views_data;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function dataSet() {
+    $data = parent::dataSet();
+
+    foreach ($data as &$row) {
+      if ($row['status']) {
+        $row['status'] = 'Enabled';
+      }
+      else {
+        $row['status'] = '';
+      }
+    }
+
+    return $data;
+  }
+
+  /**
+   * Tests the BooleanOperatorString filter.
+   */
+  public function testFilterBooleanOperatorString() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a the status boolean filter.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'status' => array(
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 0,
+      ),
+    ));
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 2),
+      array('id' => 4),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Add the status boolean filter.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'status' => array(
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 1,
+      ),
+    ));
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  /**
+   * Tests the Boolean filter with grouped exposed form enabled.
+   */
+  public function testFilterGroupedExposed() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+
+    $view->setExposedInput(array('status' => 1));
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+    $view->destroy();
+
+    $view->setExposedInput(array('status' => 2));
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 2),
+      array('id' => 4),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  /**
+   * Provides grouped exposed filter configuration.
+   *
+   * @return array
+   *   Returns the filter configuration for exposed filters.
+   */
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'status' => array(
+        'id' => 'status',
+        'table' => 'views_test_data',
+        'field' => 'status',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'status_op',
+          'label' => 'status',
+          'identifier' => 'status',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'status',
+          'identifier' => 'status',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Active',
+              'operator' => '=',
+              'value' => '1',
+            ),
+            2 => array(
+              'title' => 'Blocked',
+              'operator' => '=',
+              'value' => '0',
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
new file mode 100644
index 0000000..1f58fe9
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorTest.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterBooleanOperatorTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\filter\BooleanOperator handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\filter\BooleanOperator
+ */
+class FilterBooleanOperatorTest extends ViewsKernelTestBase {
+
+  /**
+   * The modules to enable for this test.
+   *
+   * @var array
+   */
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_id' => 'id',
+  );
+
+  /**
+   * Tests the BooleanOperator filter.
+   */
+  public function testFilterBooleanOperator() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a the status boolean filter.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'status' => array(
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 0,
+      ),
+    ));
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 2),
+      array('id' => 4),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Add the status boolean filter.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'status' => array(
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 1,
+      ),
+    ));
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Testing the same scenario but using the reverse status and operation.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'status' => array(
+        'id' => 'status',
+        'field' => 'status',
+        'table' => 'views_test_data',
+        'value' => 0,
+        'operator' => '!=',
+      ),
+    ));
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  /**
+   * Tests the boolean filter with grouped exposed form enabled.
+   */
+  public function testFilterGroupedExposed() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+
+    $view->setExposedInput(array('status' => 1));
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+    $view->destroy();
+
+    $view->setExposedInput(array('status' => 2));
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 2),
+      array('id' => 4),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+
+    $view->destroy();
+
+    // Expecting the same results as for ['status' => 1].
+    $view->setExposedInput(['status' => 3]);
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array('id' => 1),
+      array('id' => 3),
+      array('id' => 5),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  /**
+   * Provides grouped exposed filter configuration.
+   *
+   * @return array
+   */
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'status' => array(
+        'id' => 'status',
+        'table' => 'views_test_data',
+        'field' => 'status',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'status_op',
+          'label' => 'status',
+          'identifier' => 'status',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'status',
+          'identifier' => 'status',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Active',
+              'operator' => '=',
+              'value' => '1',
+            ),
+            2 => array(
+              'title' => 'Blocked',
+              'operator' => '=',
+              'value' => '0',
+            ),
+            // This group should return the same results as group 1, because it
+            // is the negation of group 2.
+            3 => array(
+              'title' => 'Active (reverse)',
+              'operator' => '!=',
+              'value' => '0',
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
+
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
new file mode 100644
index 0000000..66b3a8b
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterCombineTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the combine filter handler.
+ *
+ * @group views
+ */
+class FilterCombineTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+    'views_test_data_job' => 'job',
+  );
+
+  public function testFilterCombineContains() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $fields = $view->displayHandlers->get('default')->getOption('fields');
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
+      'job' => array(
+        'id' => 'job',
+        'table' => 'views_test_data',
+        'field' => 'job',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'combine',
+        'table' => 'views',
+        'field' => 'combine',
+        'relationship' => 'none',
+        'operator' => 'contains',
+        'fields' => array(
+          'name',
+          'job',
+        ),
+        'value' => 'ing',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+        'job' => 'Singer',
+      ),
+      array(
+        'name' => 'George',
+        'job' => 'Singer',
+      ),
+      array(
+        'name' => 'Ringo',
+        'job' => 'Drummer',
+      ),
+      array(
+        'name' => 'Ginger',
+        'job' => NULL,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  /**
+   * Tests if the filter can handle removed fields.
+   *
+   * Tests the combined filter handler when a field overwrite is done
+   * and fields set in the combine filter are removed from the display
+   * but not from the combined filter settings.
+   */
+  public function testFilterCombineContainsFieldsOverwritten() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $fields = $view->displayHandlers->get('default')->getOption('fields');
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
+      'job' => array(
+        'id' => 'job',
+        'table' => 'views_test_data',
+        'field' => 'job',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'combine',
+        'table' => 'views',
+        'field' => 'combine',
+        'relationship' => 'none',
+        'operator' => 'contains',
+        'fields' => array(
+          'name',
+          'job',
+          // Add a dummy field to the combined fields to simulate
+          // a removed or deleted field.
+          'dummy',
+        ),
+        'value' => 'ing',
+      ),
+    ));
+
+    $this->executeView($view);
+    // Make sure this view will not get displayed.
+    $this->assertTrue($view->build_info['fail'], "View build has been marked as failed.");
+    // Make sure this view does not pass validation with the right error.
+    $errors = $view->validate();
+    $this->assertEqual(reset($errors['default']), t('Field %field set in %filter is not set in this display.', array('%field' => 'dummy', '%filter' => 'Global: Combine fields filter')));
+  }
+
+  /**
+   * Additional data to test the NULL issue.
+   */
+  protected function dataSet() {
+    $data_set = parent::dataSet();
+    $data_set[] = array(
+      'name' => 'Ginger',
+      'age' => 25,
+      'job' => NULL,
+      'created' => gmmktime(0, 0, 0, 1, 2, 2000),
+      'status' => 1,
+    );
+    return $data_set;
+  }
+
+  /**
+   * Allow {views_test_data}.job to be NULL.
+   */
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+    unset($schema['views_test_data']['fields']['job']['not null']);
+    return $schema;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
new file mode 100644
index 0000000..cd97231
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterEqualityTest.php
@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterEqualityTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\filter\Equality handler.
+ *
+ * @group views
+ */
+class FilterEqualityTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+  );
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['name']['filter']['id'] = 'equality';
+    return $data;
+  }
+
+  function testEqual() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => '=',
+        'value' => 'Ringo',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testEqualGroupedExposed() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Name, Operator: =, Value: Ringo
+    $filters['name']['group_info']['default_group'] = 1;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testNotEqual() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => '!=',
+        'value' => 'Ringo',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testEqualGroupedNotExposed() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Name, Operator: !=, Value: Ringo
+    $filters['name']['group_info']['default_group'] = 2;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'name' => array(
+        'id' => 'name',
+        'plugin_id' => 'equality',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'group' => 1,
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'name_op',
+          'label' => 'name',
+          'identifier' => 'name',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'name',
+          'identifier' => 'name',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Name is equal to Ringo',
+              'operator' => '=',
+              'value' => 'Ringo',
+            ),
+            2 => array(
+              'title' => 'Name is not equal to Ringo',
+              'operator' => '!=',
+              'value' => 'Ringo',
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
new file mode 100644
index 0000000..92c2984
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterInOperatorTest.php
@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterInOperatorTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\filter\InOperator handler.
+ *
+ * @group views
+ */
+class FilterInOperatorTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+    'views_test_data_age' => 'age',
+  );
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['age']['filter']['id'] = 'in_operator';
+    return $data;
+  }
+
+  public function testFilterInOperatorSimple() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a in_operator ordering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'field' => 'age',
+        'table' => 'views_test_data',
+        'value' => array(26, 30),
+        'operator' => 'in',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Add a in_operator ordering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'field' => 'age',
+        'table' => 'views_test_data',
+        'value' => array(26, 30),
+        'operator' => 'not in',
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  public function testFilterInOperatorGroupedExposedSimple() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+
+    // Filter: Age, Operator: in, Value: 26, 30
+    $filters['age']['group_info']['default_group'] = 1;
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+
+    $this->assertEqual(2, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  public function testFilterNotInOperatorGroupedExposedSimple() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+
+    // Filter: Age, Operator: in, Value: 26, 30
+    $filters['age']['group_info']['default_group'] = 2;
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+    );
+
+    $this->assertEqual(3, count($view->result));
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'age_op',
+          'label' => 'age',
+          'identifier' => 'age',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'age',
+          'identifier' => 'age',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Age is one of 26, 30',
+              'operator' => 'in',
+              'value' => array(26, 30),
+            ),
+            2 => array(
+              'title' => 'Age is not one of 26, 30',
+              'operator' => 'not in',
+              'value' => array(26, 30),
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
new file mode 100644
index 0000000..40ab4f9
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
@@ -0,0 +1,430 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterNumericTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the numeric filter handler.
+ *
+ * @group views
+ */
+class FilterNumericTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+    'views_test_data_age' => 'age',
+  );
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['age']['filter']['allow empty'] = TRUE;
+    $data['views_test_data']['id']['filter']['allow empty'] = FALSE;
+
+    return $data;
+  }
+
+  public function testFilterNumericSimple() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => '=',
+        'value' => array('value' => 28),
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericExposedGroupedSimple() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: =, Value: 28
+    $filters['age']['group_info']['default_group'] = 1;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericBetween() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => 'between',
+        'value' => array(
+          'min' => 26,
+          'max' => 29,
+        ),
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+
+    // test not between
+    $view->destroy();
+    $view->setDisplay();
+
+      // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => 'not between',
+        'value' => array(
+          'min' => 26,
+          'max' => 29,
+        ),
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericExposedGroupedBetween() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: between, Value: 26 and 29
+    $filters['age']['group_info']['default_group'] = 2;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericExposedGroupedNotBetween() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: between, Value: 26 and 29
+    $filters['age']['group_info']['default_group'] = 3;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericEmpty() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => 'empty',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'operator' => 'not empty',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+    array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericExposedGroupedEmpty() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: empty, Value:
+    $filters['age']['group_info']['default_group'] = 4;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testFilterNumericExposedGroupedNotEmpty() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = Views::getView('test_view');
+    $view->newDisplay('page', 'Page', 'page_1');
+
+    // Filter: Age, Operator: empty, Value:
+    $filters['age']['group_info']['default_group'] = 5;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+    array(
+        'name' => 'John',
+        'age' => 25,
+      ),
+      array(
+        'name' => 'George',
+        'age' => 27,
+      ),
+      array(
+        'name' => 'Ringo',
+        'age' => 28,
+      ),
+      array(
+        'name' => 'Paul',
+        'age' => 26,
+      ),
+      array(
+        'name' => 'Meredith',
+        'age' => 30,
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  public function testAllowEmpty() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'id' => array(
+        'id' => 'id',
+        'table' => 'views_test_data',
+        'field' => 'id',
+        'relationship' => 'none',
+      ),
+      'age' => array(
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    $view->initHandlers();
+
+    $id_operators = $view->filter['id']->operators();
+    $age_operators = $view->filter['age']->operators();
+
+    $this->assertFalse(isset($id_operators['empty']));
+    $this->assertFalse(isset($id_operators['not empty']));
+    $this->assertTrue(isset($age_operators['empty']));
+    $this->assertTrue(isset($age_operators['not empty']));
+  }
+
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'age' => array(
+        'id' => 'age',
+        'plugin_id' => 'numeric',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'age_op',
+          'label' => 'age',
+          'identifier' => 'age',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'age',
+          'identifier' => 'age',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Age is 28',
+              'operator' => '=',
+              'value' => array('value' => 28),
+            ),
+            2 => array(
+              'title' => 'Age is between 26 and 29',
+              'operator' => 'between',
+              'value' => array(
+                'min' => 26,
+                'max' => 29,
+              ),
+            ),
+            3 => array(
+              'title' => 'Age is not between 26 and 29',
+              'operator' => 'not between',
+              'value' => array(
+                'min' => 26,
+                'max' => 29,
+              ),
+            ),
+            4 => array(
+              'title' => 'Age is empty',
+              'operator' => 'empty',
+            ),
+            5 => array(
+              'title' => 'Age is not empty',
+              'operator' => 'not empty',
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
new file mode 100644
index 0000000..27ca0db
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/FilterStringTest.php
@@ -0,0 +1,863 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\FilterStringTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the core Drupal\views\Plugin\views\filter\StringFilter handler.
+ *
+ * @group views
+ */
+class FilterStringTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Map column names.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+  );
+
+  function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['name']['filter']['allow empty'] = TRUE;
+    $data['views_test_data']['job']['filter']['allow empty'] = FALSE;
+    $data['views_test_data']['description'] = $data['views_test_data']['name'];
+
+    return $data;
+  }
+
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+    $schema['views_test_data']['fields']['description'] = array(
+      'description' => "A person's description",
+      'type' => 'text',
+      'not null' => FALSE,
+      'size' => 'big',
+    );
+
+    return $schema;
+  }
+
+  /**
+   * An extended test dataset.
+   */
+  protected function dataSet() {
+    $dataset = parent::dataSet();
+    $dataset[0]['description'] = 'John Winston Ono Lennon, MBE (9 October 1940 – 8 December 1980) was an English musician and singer-songwriter who rose to worldwide fame as one of the founding members of The Beatles, one of the most commercially successful and critically acclaimed acts in the history of popular music. Along with fellow Beatle Paul McCartney, he formed one of the most successful songwriting partnerships of the 20th century.';
+    $dataset[1]['description'] = 'George Harrison,[1] MBE (25 February 1943 – 29 November 2001)[2] was an English rock guitarist, singer-songwriter, actor and film producer who achieved international fame as lead guitarist of The Beatles.';
+    $dataset[2]['description'] = 'Richard Starkey, MBE (born 7 July 1940), better known by his stage name Ringo Starr, is an English musician, singer-songwriter, and actor who gained worldwide fame as the drummer for The Beatles.';
+    $dataset[3]['description'] = 'Sir James Paul McCartney, MBE (born 18 June 1942) is an English musician, singer-songwriter and composer. Formerly of The Beatles (1960–1970) and Wings (1971–1981), McCartney is the most commercially successful songwriter in the history of popular music, according to Guinness World Records.[1]';
+    $dataset[4]['description'] = NULL;
+
+    return $dataset;
+  }
+
+  /**
+   * Build and return a Page view of the views_test_data table.
+   *
+   * @return view
+   */
+  protected function getBasicPageView() {
+    $view = Views::getView('test_view');
+
+    // In order to test exposed filters, we have to disable
+    // the exposed forms cache.
+    \Drupal::service('views.exposed_form_cache')->reset();
+
+    $view->newDisplay('page', 'Page', 'page_1');
+    return $view;
+  }
+
+  function testFilterStringEqual() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => '=',
+        'value' => 'Ringo',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedEqual() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: =, Value: Ringo
+    $filters['name']['group_info']['default_group'] = 1;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringNotEqual() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => '!=',
+        'value' => 'Ringo',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedNotEqual() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: !=, Value: Ringo
+    $filters['name']['group_info']['default_group'] = '2';
+
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringContains() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => 'contains',
+        'value' => 'ing',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  function testFilterStringGroupedExposedContains() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: contains, Value: ing
+    $filters['name']['group_info']['default_group'] = '3';
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  function testFilterStringWord() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'word',
+        'value' => 'actor',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+    $view->destroy();
+
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'allwords',
+        'value' => 'Richard Starkey',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  function testFilterStringGroupedExposedWord() {
+      $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: contains, Value: ing
+    $filters['name']['group_info']['default_group'] = '3';
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+    $view->destroy();
+
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Description, Operator: contains, Value: actor
+    $filters['description']['group_info']['default_group'] = '1';
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringStarts() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'starts',
+        'value' => 'George',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedStarts() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: starts, Value: George
+    $filters['description']['group_info']['default_group'] = 2;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringNotStarts() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'not_starts',
+        'value' => 'George',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedNotStarts() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: not_starts, Value: George
+    $filters['description']['group_info']['default_group'] = 3;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringEnds() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'ends',
+        'value' => 'Beatles.',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedEnds() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Description, Operator: ends, Value: Beatles
+    $filters['description']['group_info']['default_group'] = 4;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'George',
+      ),
+      array(
+        'name' => 'Ringo',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringNotEnds() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'not_ends',
+        'value' => 'Beatles.',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedNotEnds() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Description, Operator: not_ends, Value: Beatles
+    $filters['description']['group_info']['default_group'] = 5;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringNot() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'not',
+        'value' => 'Beatles.',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  function testFilterStringGroupedExposedNot() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Description, Operator: not (does not contains), Value: Beatles
+    $filters['description']['group_info']['default_group'] = 6;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+      // There is no Meredith returned because his description is empty
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+
+  }
+
+  function testFilterStringShorter() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => 'shorterthan',
+        'value' => 5,
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedShorter() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: shorterthan, Value: 5
+    $filters['name']['group_info']['default_group'] = 4;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'John',
+      ),
+      array(
+        'name' => 'Paul',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringLonger() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'name' => array(
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'operator' => 'longerthan',
+        'value' => 7,
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedLonger() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Name, Operator: longerthan, Value: 4
+    $filters['name']['group_info']['default_group'] = 5;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+
+  function testFilterStringEmpty() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the filtering
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'description' => array(
+        'id' => 'description',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'operator' => 'empty',
+      ),
+    ));
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  function testFilterStringGroupedExposedEmpty() {
+    $filters = $this->getGroupedExposedFilters();
+    $view = $this->getBasicPageView();
+
+    // Filter: Description, Operator: empty, Value:
+    $filters['description']['group_info']['default_group'] = 7;
+    $view->setDisplay('page_1');
+    $view->displayHandlers->get('page_1')->overrideOption('filters', $filters);
+    $view->save();
+    $this->container->get('router.builder')->rebuild();
+
+    $this->executeView($view);
+    $resultset = array(
+      array(
+        'name' => 'Meredith',
+      ),
+    );
+    $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
+  protected function getGroupedExposedFilters() {
+    $filters = array(
+      'name' => array(
+        'id' => 'name',
+        'plugin_id' => 'string',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'name_op',
+          'label' => 'name',
+          'identifier' => 'name',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'name',
+          'identifier' => 'name',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Is Ringo',
+              'operator' => '=',
+              'value' => 'Ringo',
+            ),
+            2 => array(
+              'title' => 'Is not Ringo',
+              'operator' => '!=',
+              'value' => 'Ringo',
+            ),
+            3 => array(
+              'title' => 'Contains ing',
+              'operator' => 'contains',
+              'value' => 'ing',
+            ),
+            4 => array(
+              'title' => 'Shorter than 5 letters',
+              'operator' => 'shorterthan',
+              'value' => 5,
+            ),
+            5 => array(
+              'title' => 'Longer than 7 letters',
+              'operator' => 'longerthan',
+              'value' => 7,
+            ),
+          ),
+        ),
+      ),
+      'description' => array(
+        'id' => 'description',
+        'plugin_id' => 'string',
+        'table' => 'views_test_data',
+        'field' => 'description',
+        'relationship' => 'none',
+        'exposed' => TRUE,
+        'expose' => array(
+          'operator' => 'description_op',
+          'label' => 'description',
+          'identifier' => 'description',
+        ),
+        'is_grouped' => TRUE,
+        'group_info' => array(
+          'label' => 'description',
+          'identifier' => 'description',
+          'default_group' => 'All',
+          'group_items' => array(
+            1 => array(
+              'title' => 'Contains the word: Actor',
+              'operator' => 'word',
+              'value' => 'actor',
+            ),
+            2 => array(
+              'title' => 'Starts with George',
+              'operator' => 'starts',
+              'value' => 'George',
+            ),
+            3 => array(
+              'title' => 'Not Starts with: George',
+              'operator' => 'not_starts',
+              'value' => 'George',
+            ),
+            4 => array(
+              'title' => 'Ends with: Beatles',
+              'operator' => 'ends',
+              'value' => 'Beatles.',
+            ),
+            5 => array(
+              'title' => 'Not Ends with: Beatles',
+              'operator' => 'not_ends',
+              'value' => 'Beatles.',
+            ),
+            6 => array(
+              'title' => 'Does not contain: Beatles',
+              'operator' => 'not',
+              'value' => 'Beatles.',
+            ),
+            7 => array(
+              'title' => 'Empty description',
+              'operator' => 'empty',
+              'value' => '',
+            ),
+          ),
+        ),
+      ),
+    );
+    return $filters;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php b/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
new file mode 100644
index 0000000..368bec5
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\HandlerAliasTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests handler table and field aliases.
+ *
+ * @group views
+ */
+class HandlerAliasTest extends ViewsKernelTestBase {
+
+  public static $modules = array('user');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_filter', 'test_alias');
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    // User the existing test_filter plugin.
+    $data['views_test_data_alias']['table']['real table'] = 'views_test_data';
+    $data['views_test_data_alias']['name_alias']['filter']['id'] = 'test_filter';
+    $data['views_test_data_alias']['name_alias']['filter']['real field'] = 'name';
+
+    return $data;
+  }
+
+  public function testPluginAliases() {
+    $view = Views::getView('test_filter');
+    $view->initDisplay();
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'test_filter' => array(
+        'id' => 'test_filter',
+        'table' => 'views_test_data_alias',
+        'field' => 'name_alias',
+        'operator' => '=',
+        'value' => 'John',
+        'group' => 0,
+      ),
+    ));
+
+    $this->executeView($view);
+
+    $filter = $view->filter['test_filter'];
+
+    // Check the definition values are present.
+    $this->assertIdentical($filter->definition['real table'], 'views_test_data');
+    $this->assertIdentical($filter->definition['real field'], 'name');
+
+    $this->assertIdentical($filter->table, 'views_test_data');
+    $this->assertIdentical($filter->realField, 'name');
+
+    // Test an existing user uid field.
+    $view = Views::getView('test_alias');
+    $view->initDisplay();
+    $this->executeView($view);
+
+    $filter = $view->filter['uid_raw'];
+
+    $this->assertIdentical($filter->definition['real field'], 'uid');
+
+    $this->assertIdentical($filter->field, 'uid_raw');
+    $this->assertIdentical($filter->table, 'users_field_data');
+    $this->assertIdentical($filter->realField, 'uid');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
new file mode 100644
index 0000000..da13b81
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\SortDateTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests for core Drupal\views\Plugin\views\sort\Date handler.
+ *
+ * @group views
+ */
+class SortDateTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  protected function expectedResultSet($granularity, $reverse = TRUE) {
+    $expected = array();
+    if (!$reverse) {
+      switch ($granularity) {
+          case 'second':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'Paul'),
+              array('name' => 'Meredith'),
+              array('name' => 'Ringo'),
+              array('name' => 'George'),
+            );
+            break;
+          case 'minute':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'Paul'),
+              array('name' => 'Ringo'),
+              array('name' => 'Meredith'),
+              array('name' => 'George'),
+            );
+            break;
+          case 'hour':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'Ringo'),
+              array('name' => 'Paul'),
+              array('name' => 'Meredith'),
+              array('name' => 'George'),
+            );
+            break;
+          case 'day':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'Ringo'),
+              array('name' => 'Paul'),
+              array('name' => 'Meredith'),
+              array('name' => 'George'),
+            );
+            break;
+          case 'month':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'George'),
+              array('name' => 'Ringo'),
+              array('name' => 'Paul'),
+              array('name' => 'Meredith'),
+            );
+            break;
+          case 'year':
+            $expected = array(
+              array('name' => 'John'),
+              array('name' => 'George'),
+              array('name' => 'Ringo'),
+              array('name' => 'Paul'),
+              array('name' => 'Meredith'),
+            );
+            break;
+        }
+    }
+    else {
+      switch ($granularity) {
+        case 'second':
+          $expected = array(
+            array('name' => 'George'),
+            array('name' => 'Ringo'),
+            array('name' => 'Meredith'),
+            array('name' => 'Paul'),
+            array('name' => 'John'),
+          );
+          break;
+        case 'minute':
+          $expected = array(
+            array('name' => 'George'),
+            array('name' => 'Ringo'),
+            array('name' => 'Meredith'),
+            array('name' => 'Paul'),
+            array('name' => 'John'),
+           );
+          break;
+        case 'hour':
+          $expected = array(
+            array('name' => 'George'),
+            array('name' => 'Ringo'),
+            array('name' => 'Paul'),
+            array('name' => 'Meredith'),
+            array('name' => 'John'),
+          );
+          break;
+        case 'day':
+          $expected = array(
+            array('name' => 'George'),
+            array('name' => 'John'),
+            array('name' => 'Ringo'),
+            array('name' => 'Paul'),
+            array('name' => 'Meredith'),
+          );
+          break;
+        case 'month':
+          $expected = array(
+            array('name' => 'John'),
+            array('name' => 'George'),
+            array('name' => 'Ringo'),
+            array('name' => 'Paul'),
+            array('name' => 'Meredith'),
+          );
+          break;
+        case 'year':
+          $expected = array(
+            array('name' => 'John'),
+            array('name' => 'George'),
+            array('name' => 'Ringo'),
+            array('name' => 'Paul'),
+            array('name' => 'Meredith'),
+          );
+          break;
+      }
+    }
+
+    return $expected;
+  }
+
+  /**
+   * Tests numeric ordering of the result set.
+   */
+  public function testDateOrdering() {
+    foreach (array('second', 'minute', 'hour', 'day', 'month', 'year') as $granularity) {
+      foreach (array(FALSE, TRUE) as $reverse) {
+        $view = Views::getView('test_view');
+        $view->setDisplay();
+
+        // Change the fields.
+        $view->displayHandlers->get('default')->overrideOption('fields', array(
+          'name' => array(
+            'id' => 'name',
+            'table' => 'views_test_data',
+            'field' => 'name',
+            'relationship' => 'none',
+          ),
+          'created' => array(
+            'id' => 'created',
+            'table' => 'views_test_data',
+            'field' => 'created',
+            'relationship' => 'none',
+          ),
+        ));
+
+        // Change the ordering
+        $view->displayHandlers->get('default')->overrideOption('sorts', array(
+          'created' => array(
+            'id' => 'created',
+            'table' => 'views_test_data',
+            'field' => 'created',
+            'relationship' => 'none',
+            'granularity' => $granularity,
+            'order' => $reverse ? 'DESC' : 'ASC',
+          ),
+          'id' => array(
+            'id' => 'id',
+            'table' => 'views_test_data',
+            'field' => 'id',
+            'relationship' => 'none',
+            'order' => 'ASC',
+          ),
+        ));
+
+        // Execute the view.
+        $this->executeView($view);
+
+        // Verify the result.
+        $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+        $this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), array(
+          'views_test_data_name' => 'name',
+        ), SafeMarkup::format('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? 'reverse' : 'forward')));
+        $view->destroy();
+        unset($view);
+      }
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php b/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php
new file mode 100644
index 0000000..cc72fab
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/SortRandomTest.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\SortRandomTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\views\Plugin\views\display\DisplayPluginBase;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests for core Drupal\views\Plugin\views\sort\Random handler.
+ *
+ * @group views
+ */
+class SortRandomTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Add more items to the test set, to make the order tests more robust.
+   *
+   * In total we have then 60 entries, which makes a probability of a collision
+   * of 1/60!, which is around 1/1E80, which is higher than the estimated amount
+   * of protons / electrons in the observable universe, also called the
+   * eddington number.
+   *
+   * @see http://wikipedia.org/wiki/Eddington_number
+   */
+  protected function dataSet() {
+    $data = parent::dataSet();
+    for ($i = 0; $i < 55; $i++) {
+      $data[] = array(
+        'name' => 'name_' . $i,
+        'age' => $i,
+        'job' => 'job_' . $i,
+        'created' => rand(0, time()),
+        'status' => 1,
+      );
+    }
+    return $data;
+  }
+
+  /**
+   * Return a basic view with random ordering.
+   */
+  protected function getBasicRandomView() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Add a random ordering.
+    $view->displayHandlers->get('default')->overrideOption('sorts', array(
+      'random' => array(
+        'id' => 'random',
+        'field' => 'random',
+        'table' => 'views',
+      ),
+    ));
+
+    return $view;
+  }
+
+  /**
+   * Tests random ordering of the result set.
+   *
+   * @see DatabaseSelectTestCase::testRandomOrder()
+   */
+  public function testRandomOrdering() {
+    // Execute a basic view first.
+    $view = Views::getView('test_view');
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->dataSet(), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+
+    // Execute a random view, we expect the result set to be different.
+    $view_random = $this->getBasicRandomView();
+    $this->executeView($view_random);
+    $this->assertEqual(count($this->dataSet()), count($view_random->result), 'The number of returned rows match.');
+    $this->assertNotIdenticalResultset($view_random, $view->result, array(
+      'views_test_data_name' => 'views_test_data_name',
+      'views_test_data_age' => 'views_test_data_name',
+    ));
+
+    // Execute a second random view, we expect the result set to be different again.
+    $view_random_2 = $this->getBasicRandomView();
+    $this->executeView($view_random_2);
+    $this->assertEqual(count($this->dataSet()), count($view_random_2->result), 'The number of returned rows match.');
+    $this->assertNotIdenticalResultset($view_random, $view->result, array(
+      'views_test_data_name' => 'views_test_data_name',
+      'views_test_data_age' => 'views_test_data_name',
+    ));
+  }
+
+  /**
+   * Tests random ordering with tags based caching.
+   *
+   * The random sorting should opt out of caching by defining a max age of 0.
+   * At the same time, the row render caching still works.
+   */
+  public function testRandomOrderingWithRenderCaching() {
+    $view_random = $this->getBasicRandomView();
+
+    $display = &$view_random->storage->getDisplay('default');
+    $display['display_options']['cache'] = [
+      'type' => 'tag',
+    ];
+
+    $view_random->storage->save();
+
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+    /** @var \Drupal\Core\Render\RenderCacheInterface $render_cache */
+    $render_cache = \Drupal::service('render_cache');
+
+    $original = $build = DisplayPluginBase::buildBasicRenderable($view_random->id(), 'default');
+    $result = $renderer->renderPlain($build);
+
+    $original['#cache'] += ['contexts' => []];
+    $original['#cache']['contexts'] = Cache::mergeContexts($original['#cache']['contexts'], $this->container->getParameter('renderer.config')['required_cache_contexts']);
+
+    $this->assertFalse($render_cache->get($original), 'Ensure there is no render cache entry.');
+
+    $build = DisplayPluginBase::buildBasicRenderable($view_random->id(), 'default');
+    $result2 = $renderer->renderPlain($build);
+
+    // Ensure that the random ordering works and don't produce the same result.
+    $this->assertNotEqual($result, $result2);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Handler/SortTest.php b/core/modules/views/tests/src/Kernel/Handler/SortTest.php
new file mode 100644
index 0000000..bec86c6
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Handler/SortTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Handler\SortTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Handler;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler.
+ *
+ * @group views
+ */
+class SortTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Tests numeric ordering of the result set.
+   */
+  public function testNumericOrdering() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the ordering
+    $view->displayHandlers->get('default')->overrideOption('sorts', array(
+      'age' => array(
+        'order' => 'ASC',
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age'), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Reverse the ordering
+    $view->displayHandlers->get('default')->overrideOption('sorts', array(
+      'age' => array(
+        'order' => 'DESC',
+        'id' => 'age',
+        'table' => 'views_test_data',
+        'field' => 'age',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age', TRUE), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+  }
+
+  /**
+   * Tests string ordering of the result set.
+   */
+  public function testStringOrdering() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Change the ordering
+    $view->displayHandlers->get('default')->overrideOption('sorts', array(
+      'name' => array(
+        'order' => 'ASC',
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name'), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+
+    $view->destroy();
+    $view->setDisplay();
+
+    // Reverse the ordering
+    $view->displayHandlers->get('default')->overrideOption('sorts', array(
+      'name' => array(
+        'order' => 'DESC',
+        'id' => 'name',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'relationship' => 'none',
+      ),
+    ));
+
+    // Execute the view.
+    $this->executeView($view);
+
+    // Verify the result.
+    $this->assertEqual(count($this->dataSet()), count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name', TRUE), array(
+      'views_test_data_name' => 'name',
+      'views_test_data_age' => 'age',
+    ));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ModuleTest.php b/core/modules/views/tests/src/Kernel/ModuleTest.php
new file mode 100644
index 0000000..a77fe6b
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -0,0 +1,374 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ModuleTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+/**
+ * Tests basic functions from the Views module.
+ *
+ * @group views
+ */
+use Drupal\views\Plugin\views\filter\Standard;
+use Drupal\views\Views;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
+
+class ModuleTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view_status', 'test_view', 'test_argument');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['field', 'user', 'block'];
+
+  /**
+   * Stores the last triggered error, for example via debug().
+   *
+   * @var string
+   *
+   * @see \Drupal\views\Tests\ModuleTest::errorHandler()
+   */
+  protected $lastErrorMessage;
+
+  /**
+   * Tests the views_get_handler method.
+   *
+   * @see views_get_handler()
+   */
+  public function testViewsGetHandler() {
+    $types = array('field', 'area', 'filter');
+    foreach ($types as $type) {
+      $item = array(
+        'table' => $this->randomMachineName(),
+        'field' => $this->randomMachineName(),
+      );
+      $handler = $this->container->get('plugin.manager.views.' . $type)->getHandler($item);
+      $this->assertEqual('Drupal\views\Plugin\views\\' . $type . '\Broken', get_class($handler), new FormattableMarkup('Make sure that a broken handler of type: @type is created.', ['@type' => $type]));
+    }
+
+    $views_data = $this->viewsData();
+    $test_tables = array('views_test_data' => array('id', 'name'));
+    foreach ($test_tables as $table => $fields) {
+      foreach ($fields as $field) {
+        $data = $views_data[$table][$field];
+        $item = array(
+          'table' => $table,
+          'field' => $field,
+        );
+        foreach ($data as $id => $field_data) {
+          if (!in_array($id, array('title', 'help'))) {
+            $handler = $this->container->get('plugin.manager.views.' . $id)->getHandler($item);
+            $this->assertInstanceHandler($handler, $table, $field, $id);
+          }
+        }
+      }
+    }
+
+    // Test the override handler feature.
+    $item = array(
+      'table' => 'views_test_data',
+      'field' => 'job',
+    );
+    $handler = $this->container->get('plugin.manager.views.filter')->getHandler($item, 'standard');
+    $this->assertTrue($handler instanceof Standard);
+
+    // @todo Reinstate these tests when the debug() in views_get_handler() is
+    //   restored.
+    return;
+
+    // Test non-existent tables/fields.
+    set_error_handler(array($this, 'customErrorHandler'));
+    $item = array(
+      'table' => 'views_test_data',
+      'field' => 'field_invalid',
+    );
+    $this->container->get('plugin.manager.views.field')->getHandler($item);
+    $this->assertTrue(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'views_test_data', '@field' => 'field_invalid', '@type' => 'field'))) !== FALSE, 'An invalid field name throws a debug message.');
+    unset($this->lastErrorMessage);
+
+    $item = array(
+      'table' => 'table_invalid',
+      'field' => 'id',
+    );
+    $this->container->get('plugin.manager.views.filter')->getHandler($item);
+    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+    unset($this->lastErrorMessage);
+
+    $item = array(
+      'table' => 'table_invalid',
+      'field' => 'id',
+    );
+    $this->container->get('plugin.manager.views.filter')->getHandler($item);
+    $this->assertEqual(strpos($this->lastErrorMessage, format_string("Missing handler: @table @field @type", array('@table' => 'table_invalid', '@field' => 'id', '@type' => 'filter'))) !== FALSE, 'An invalid table name throws a debug message.');
+    unset($this->lastErrorMessage);
+
+    restore_error_handler();
+  }
+
+  /**
+   * Defines an error handler which is used in the test.
+   *
+   * @param int $error_level
+   *   The level of the error raised.
+   * @param string $message
+   *   The error message.
+   * @param string $filename
+   *   The filename that the error was raised in.
+   * @param int $line
+   *   The line number the error was raised at.
+   * @param array $context
+   *   An array that points to the active symbol table at the point the error
+   *   occurred.
+   *
+   * Because this is registered in set_error_handler(), it has to be public.
+   * @see set_error_handler()
+   */
+  public function customErrorHandler($error_level, $message, $filename, $line, $context) {
+    $this->lastErrorMessage = $message;
+  }
+
+  /**
+   * Tests the load wrapper/helper functions.
+   */
+  public function testLoadFunctions() {
+    $this->enableModules(array('text', 'node'));
+    $this->installConfig(array('node'));
+    $storage = $this->container->get('entity.manager')->getStorage('view');
+
+    // Test views_view_is_enabled/disabled.
+    $archive = $storage->load('archive');
+    $this->assertTrue(views_view_is_disabled($archive), 'views_view_is_disabled works as expected.');
+    // Enable the view and check this.
+    $archive->enable();
+    $this->assertTrue(views_view_is_enabled($archive), ' views_view_is_enabled works as expected.');
+
+    // We can store this now, as we have enabled/disabled above.
+    $all_views = $storage->loadMultiple();
+
+    // Test Views::getAllViews().
+    ksort($all_views);
+    $this->assertEquals(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.');
+
+    // Test Views::getEnabledViews().
+    $expected_enabled = array_filter($all_views, function($view) {
+      return views_view_is_enabled($view);
+    });
+    $this->assertEquals(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.');
+
+    // Test Views::getDisabledViews().
+    $expected_disabled = array_filter($all_views, function($view) {
+      return views_view_is_disabled($view);
+    });
+    $this->assertEquals(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.');
+
+    // Test Views::getViewsAsOptions().
+    // Test the $views_only parameter.
+    $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.');
+    $expected_options = array();
+    foreach ($all_views as $id => $view) {
+      $expected_options[$id] = $view->label();
+    }
+    $this->assertIdentical($expected_options, $this->castSafeStrings(Views::getViewsAsOptions(TRUE)), 'Expected options array was returned.');
+
+    // Test the default.
+    $this->assertIdentical($this->formatViewOptions($all_views), $this->castSafeStrings(Views::getViewsAsOptions()), 'Expected options array for all views was returned.');
+    // Test enabled views.
+    $this->assertIdentical($this->formatViewOptions($expected_enabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'enabled')), 'Expected enabled options array was returned.');
+    // Test disabled views.
+    $this->assertIdentical($this->formatViewOptions($expected_disabled), $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'disabled')), 'Expected disabled options array was returned.');
+
+    // Test the sort parameter.
+    $all_views_sorted = $all_views;
+    ksort($all_views_sorted);
+    $this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order');
+
+    // Test $exclude_view parameter.
+    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name');
+    $this->assertFalse(array_key_exists('archive:default', Views::getViewsAsOptions(FALSE, 'all', 'archive:default')), 'View display excluded from options based on name');
+    $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', $archive->getExecutable())), 'View excluded from options based on object');
+
+    // Test the $opt_group parameter.
+    $expected_opt_groups = array();
+    foreach ($all_views as $view) {
+      foreach ($view->get('display') as $display) {
+          $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = (string) t('@view : @display', array('@view' => $view->id(), '@display' => $display['id']));
+      }
+    }
+    $this->assertIdentical($expected_opt_groups, $this->castSafeStrings(Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE)), 'Expected option array for an option group returned.');
+  }
+
+  /**
+   * Tests view enable and disable procedural wrapper functions.
+   */
+  function testStatusFunctions() {
+    $view = Views::getView('test_view_status')->storage;
+
+    $this->assertFalse($view->status(), 'The view status is disabled.');
+
+    views_enable_view($view);
+    $this->assertTrue($view->status(), 'A view has been enabled.');
+    $this->assertEqual($view->status(), views_view_is_enabled($view), 'views_view_is_enabled is correct.');
+
+    views_disable_view($view);
+    $this->assertFalse($view->status(), 'A view has been disabled.');
+    $this->assertEqual(!$view->status(), views_view_is_disabled($view), 'views_view_is_disabled is correct.');
+  }
+
+  /**
+   * Tests the \Drupal\views\Views::fetchPluginNames() method.
+   */
+  public function testViewsFetchPluginNames() {
+    // All style plugins should be returned, as we have not specified a type.
+    $plugins = Views::fetchPluginNames('style');
+    $definitions = $this->container->get('plugin.manager.views.style')->getDefinitions();
+    $expected = array();
+    foreach ($definitions as $id =>$definition) {
+      $expected[$id] = $definition['title'];
+    }
+    asort($expected);
+    $this->assertIdentical(array_keys($plugins), array_keys($expected));
+
+    // Test using the 'test' style plugin type only returns the test_style and
+    // mapping_test plugins.
+    $plugins = Views::fetchPluginNames('style', 'test');
+    $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style'));
+
+    // Test a non existent style plugin type returns no plugins.
+    $plugins = Views::fetchPluginNames('style', $this->randomString());
+    $this->assertIdentical($plugins, array());
+  }
+
+  /**
+   * Tests the \Drupal\views\Views::pluginList() method.
+   */
+  public function testViewsPluginList() {
+    $plugin_list = Views::pluginList();
+    // Only plugins used by 'test_view' should be in the plugin list.
+    foreach (array('display:default', 'pager:none') as $key) {
+      list($plugin_type, $plugin_id) = explode(':', $key);
+      $plugin_def = $this->container->get("plugin.manager.views.$plugin_type")->getDefinition($plugin_id);
+
+      $this->assertTrue(isset($plugin_list[$key]), SafeMarkup::format('The expected @key plugin list key was found.', array('@key' => $key)));
+      $plugin_details = $plugin_list[$key];
+
+      $this->assertEqual($plugin_details['type'], $plugin_type, 'The expected plugin type was found.');
+      $this->assertEqual($plugin_details['title'], $plugin_def['title'], 'The expected plugin title was found.');
+      $this->assertEqual($plugin_details['provider'], $plugin_def['provider'], 'The expected plugin provider was found.');
+      $this->assertTrue(in_array('test_view', $plugin_details['views']), 'The test_view View was found in the list of views using this plugin.');
+    }
+  }
+
+  /**
+   * Tests views.module: views_embed_view().
+   */
+  public function testViewsEmbedView() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    $result = views_embed_view('test_argument');
+    $renderer->renderPlain($result);
+    $this->assertEqual(count($result['view_build']['#view']->result), 5);
+
+    $result = views_embed_view('test_argument', 'default', 1);
+    $renderer->renderPlain($result);
+    $this->assertEqual(count($result['view_build']['#view']->result), 1);
+
+    $result = views_embed_view('test_argument', 'default', '1,2');
+    $renderer->renderPlain($result);
+    $this->assertEqual(count($result['view_build']['#view']->result), 2);
+
+    $result = views_embed_view('test_argument', 'default', '1,2', 'John');
+    $renderer->renderPlain($result);
+    $this->assertEqual(count($result['view_build']['#view']->result), 1);
+
+    $result = views_embed_view('test_argument', 'default', '1,2', 'John,George');
+    $renderer->renderPlain($result);
+    $this->assertEqual(count($result['view_build']['#view']->result), 2);
+  }
+
+  /**
+   * Tests the \Drupal\views\ViewsExecutable::preview() method.
+   */
+  public function testViewsPreview() {
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default');
+    $this->assertEqual(count($result['#view']->result), 5);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('0' => 1));
+    $this->assertEqual(count($result['#view']->result), 1);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('3' => 1));
+    $this->assertEqual(count($result['#view']->result), 1);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('0' => '1,2'));
+    $this->assertEqual(count($result['#view']->result), 2);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('3' => '1,2'));
+    $this->assertEqual(count($result['#view']->result), 2);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('0' => '1,2', '1' => 'John'));
+    $this->assertEqual(count($result['#view']->result), 1);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('3' => '1,2', '4' => 'John'));
+    $this->assertEqual(count($result['#view']->result), 1);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('0' => '1,2', '1' => 'John,George'));
+    $this->assertEqual(count($result['#view']->result), 2);
+
+    $view = Views::getView('test_argument');
+    $result = $view->preview('default', array('3' => '1,2', '4' => 'John,George'));
+    $this->assertEqual(count($result['#view']->result), 2);
+  }
+
+  /**
+   * Helper to return an expected views option array.
+   *
+   * @param array $views
+   *   An array of Drupal\views\Entity\View objects for which to
+   *   create an options array.
+   *
+   * @return array
+   *   A formatted options array that matches the expected output.
+   */
+  protected function formatViewOptions(array $views = array()) {
+    $expected_options = array();
+    foreach ($views as $view) {
+      foreach ($view->get('display') as $display) {
+        $expected_options[$view->id() . ':' . $display['id']] = (string) t('View: @view - Display: @display',
+          array('@view' => $view->id(), '@display' => $display['id']));
+      }
+    }
+
+    return $expected_options;
+  }
+
+  /**
+   * Ensure that a certain handler is a instance of a certain table/field.
+   */
+  function assertInstanceHandler($handler, $table, $field, $id) {
+    $table_data = $this->container->get('views.views_data')->get($table);
+    $field_data = $table_data[$field][$id];
+
+    $this->assertEqual($field_data['id'], $handler->getPluginId());
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php b/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
new file mode 100644
index 0000000..ff477dc
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/ArgumentValidatorTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\ArgumentValidatorTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest as ArgumentValidatorTestPlugin;
+
+/**
+ * Tests Views argument validators.
+ *
+ * @group views
+ */
+class ArgumentValidatorTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view_argument_validate_numeric', 'test_view'];
+
+  function testArgumentValidateNumeric() {
+    $view = Views::getView('test_view_argument_validate_numeric');
+    $view->initHandlers();
+    $this->assertFalse($view->argument['null']->validateArgument($this->randomString()));
+    // Reset safed argument validation.
+    $view->argument['null']->argument_validated = NULL;
+    $this->assertTrue($view->argument['null']->validateArgument(12));
+  }
+
+  /**
+   * Tests the argument validator test plugin.
+   *
+   * @see Drupal\views_test_data\Plugin\views\argument_validator\ArgumentValidatorTest
+   */
+  public function testArgumentValidatorPlugin() {
+    $view = Views::getView('test_view');
+
+    // Add a new argument and set the test plugin for the argument_validator.
+    $options = [
+      'specify_validation' => TRUE,
+      'validate' => [
+        'type' => 'argument_validator_test'
+      ]
+    ];
+    $id = $view->addHandler('default', 'argument', 'views_test_data', 'name', $options);
+    $view->initHandlers();
+
+    $test_value = $this->randomMachineName();
+
+    $argument = $view->argument[$id];
+    $argument->options['validate_options']['test_value'] = $test_value;
+    $this->assertFalse($argument->validateArgument($this->randomMachineName()), 'A random value does not validate.');
+    // Reset internal flag.
+    $argument->argument_validated = NULL;
+    $this->assertTrue($argument->validateArgument($test_value), 'The right argument validates.');
+
+    $plugin = $argument->getPlugin('argument_validator');
+    $this->assertTrue($plugin instanceof ArgumentValidatorTestPlugin, 'The correct argument validator plugin is used.');
+    $this->assertFalse($plugin->validateArgument($this->randomMachineName()), 'A random value does not validate.');
+    $this->assertTrue($plugin->validateArgument($test_value), 'The right argument validates.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php b/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
new file mode 100644
index 0000000..12d37bb
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/BlockDependenciesTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\BlockDependenciesTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\block\Entity\Block;
+
+/**
+ * Tests views block config dependencies functionality.
+ *
+ * @group views
+ */
+class BlockDependenciesTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_exposed_block');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'block', 'user', 'field');
+
+  /**
+   * Tests that exposed filter blocks have the correct dependencies.
+   *
+   * @see \Drupal\views\Plugin\Derivative\ViewsExposedFilterBlock::getDerivativeDefinitions()
+   */
+  public function testExposedBlock() {
+    $block = $this->createBlock('views_exposed_filter_block:test_exposed_block-page_1');
+    $dependencies = $block->calculateDependencies()->getDependencies();
+    $expected = array(
+      'config' => array('views.view.test_exposed_block'),
+      'module' => array('views'),
+      'theme' => array('stark')
+    );
+    $this->assertIdentical($expected, $dependencies);
+  }
+
+  /**
+   * Tests that exposed filter blocks have the correct dependencies.
+   *
+   * @see \Drupal\views\Plugin\Derivative\ViewsBlock::getDerivativeDefinitions()
+   */
+  public function testViewsBlock() {
+    $block = $this->createBlock('views_block:content_recent-block_1');
+    $dependencies = $block->calculateDependencies()->getDependencies();
+    $expected = array(
+      'config' => array('views.view.content_recent'),
+      'module' => array('views'),
+      'theme' => array('stark')
+    );
+    $this->assertIdentical($expected, $dependencies);
+  }
+
+  /**
+   * Creates a block instance based on default settings.
+   *
+   * @param string $plugin_id
+   *   The plugin ID of the block type for this block instance.
+   * @param array $settings
+   *   (optional) An associative array of settings for the block entity.
+   *   Override the defaults by specifying the key and value in the array, for
+   *   example:
+   *   @code
+   *     $this->createBlock('system_powered_by_block', array(
+   *       'label' => t('Hello, world!'),
+   *     ));
+   *   @endcode
+   *   The following defaults are provided:
+   *   - label: Random string.
+   *   - id: Random string.
+   *   - region: 'sidebar_first'.
+   *   - theme: The default theme.
+   *   - visibility: Empty array.
+   *
+   * @return \Drupal\block\Entity\Block
+   *   The block entity.
+   */
+  protected function createBlock($plugin_id, array $settings = array()) {
+    $settings += array(
+      'plugin' => $plugin_id,
+      'region' => 'sidebar_first',
+      'id' => strtolower($this->randomMachineName(8)),
+      'theme' => $this->config('system.theme')->get('default'),
+      'label' => $this->randomMachineName(8),
+      'visibility' => array(),
+      'weight' => 0,
+    );
+    $values = [];
+    foreach (array('region', 'id', 'theme', 'plugin', 'weight', 'visibility') as $key) {
+      $values[$key] = $settings[$key];
+      // Remove extra values that do not belong in the settings array.
+      unset($settings[$key]);
+    }
+    foreach ($values['visibility'] as $id => $visibility) {
+      $values['visibility'][$id]['id'] = $id;
+    }
+    $values['settings'] = $settings;
+    $block = Block::create($values);
+    $block->save();
+    return $block;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php b/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
new file mode 100644
index 0000000..cd367f4
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
@@ -0,0 +1,391 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\CacheTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Core\Render\RenderContext;
+use Drupal\node\Entity\Node;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
+
+/**
+ * Tests pluggable caching for views.
+ *
+ * @group views
+ * @see views_plugin_cache
+ */
+class CacheTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view', 'test_cache', 'test_groupwise_term_ui', 'test_display', 'test_filter');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('taxonomy', 'text', 'user', 'node');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('taxonomy_term');
+    $this->installEntitySchema('user');
+
+    // Setup the current time properly.
+    \Drupal::request()->server->set('REQUEST_TIME', time());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+
+    $data['views_test_data']['test_cache_context'] = [
+      'real field' => 'name',
+      'title' => 'Test cache context',
+      'filter' => [
+        'id' => 'views_test_test_cache_context',
+      ],
+    ];
+
+    return $data;
+  }
+
+
+  /**
+   * Tests time based caching.
+   *
+   * @see views_plugin_cache_time
+   */
+  public function testTimeResultCaching() {
+    $view = Views::getView('test_cache');
+    $view->setDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'time',
+      'options' => array(
+        'results_lifespan' => '3600',
+        'output_lifespan' => '3600',
+      )
+    ));
+
+    // Test the default (non-paged) display.
+    $this->executeView($view);
+    // Verify the result.
+    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+
+    // Add another man to the beatles.
+    $record = array(
+      'name' => 'Rod Davis',
+      'age' => 29,
+      'job' => 'Banjo',
+    );
+    db_insert('views_test_data')->fields($record)->execute();
+
+    // The result should be the same as before, because of the caching. (Note
+    // that views_test_data records don't have associated cache tags, and hence
+    // the results cache items aren't invalidated.)
+    $view->destroy();
+    $this->executeView($view);
+    // Verify the result.
+    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+  }
+
+  /**
+   * Tests result caching with filters.
+   *
+   * @see views_plugin_cache_time
+   */
+  public function testTimeResultCachingWithFilter() {
+    // Check that we can find the test filter plugin.
+    $plugin = $this->container->get('plugin.manager.views.filter')->createInstance('test_filter');
+    $this->assertTrue($plugin instanceof FilterPlugin, 'Test filter plugin found.');
+
+    $view = Views::getView('test_filter');
+    $view->initDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'time',
+      'options' => array(
+        'results_lifespan' => '3600',
+        'output_lifespan' => '3600',
+      ),
+    ));
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'test_filter' => array(
+        'id' => 'test_filter',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'operator' => '=',
+        'value' => 'John',
+        'group' => 0,
+      ),
+    ));
+
+    $this->executeView($view);
+
+    // Get the cache item.
+    $cid1 = $view->display_handler->getPlugin('cache')->generateResultsKey();
+
+    // Build the expected result.
+    $dataset = array(array('name' => 'John'));
+
+    // Verify the result.
+    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultSet($view, $dataset, array(
+      'views_test_data_name' => 'name',
+    ));
+
+    $view->destroy();
+
+    $view->initDisplay();
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'test_filter' => array(
+        'id' => 'test_filter',
+        'table' => 'views_test_data',
+        'field' => 'name',
+        'operator' => '=',
+        'value' => 'Ringo',
+        'group' => 0,
+      ),
+    ));
+
+    $this->executeView($view);
+
+    // Get the cache item.
+    $cid2 = $view->display_handler->getPlugin('cache')->generateResultsKey();
+    $this->assertNotEqual($cid1, $cid2, "Results keys are different.");
+
+    // Build the expected result.
+    $dataset = array(array('name' => 'Ringo'));
+
+    // Verify the result.
+    $this->assertEqual(1, count($view->result), 'The number of returned rows match.');
+    $this->assertIdenticalResultSet($view, $dataset, array(
+      'views_test_data_name' => 'name',
+    ));
+  }
+
+  /**
+   * Tests result caching with a pager.
+   */
+  public function testTimeResultCachingWithPager() {
+    $view = Views::getView('test_cache');
+    $view->setDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'time',
+      'options' => array(
+        'results_lifespan' => '3600',
+        'output_lifespan' => '3600',
+      )
+    ));
+
+    $mapping = ['views_test_data_name' => 'name'];
+
+    $view->setDisplay('page_1');
+    $view->setCurrentPage(0);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['name' => 'John'], ['name' => 'George']], $mapping);
+    $view->destroy();
+
+    $view->setDisplay('page_1');
+    $view->setCurrentPage(1);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['name' => 'Ringo'], ['name' => 'Paul']], $mapping);
+    $view->destroy();
+
+    $view->setDisplay('page_1');
+    $view->setCurrentPage(0);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['name' => 'John'], ['name' => 'George']], $mapping);
+    $view->destroy();
+
+    $view->setDisplay('page_1');
+    $view->setCurrentPage(2);
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['name' => 'Meredith']], $mapping);
+    $view->destroy();
+  }
+
+  /**
+   * Tests no caching.
+   *
+   * @see views_plugin_cache_time
+   */
+  function testNoneResultCaching() {
+    // Create a basic result which just 2 results.
+    $view = Views::getView('test_cache');
+    $view->setDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'none',
+      'options' => array(),
+    ));
+
+    $this->executeView($view);
+    // Verify the result.
+    $this->assertEqual(5, count($view->result), 'The number of returned rows match.');
+
+    // Add another man to the beatles.
+    $record = array(
+      'name' => 'Rod Davis',
+      'age' => 29,
+      'job' => 'Banjo',
+    );
+    db_insert('views_test_data')->fields($record)->execute();
+
+    // The Result changes, because the view is not cached.
+    $view = Views::getView('test_cache');
+    $view->setDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'none',
+      'options' => array(),
+    ));
+
+    $this->executeView($view);
+    // Verify the result.
+    $this->assertEqual(6, count($view->result), 'The number of returned rows match.');
+  }
+
+  /**
+   * Tests css/js storage and restoring mechanism.
+   */
+  function testHeaderStorage() {
+    // Create a view with output caching enabled.
+    // Some hook_views_pre_render in views_test_data.module adds the test css/js file.
+    // so they should be added to the css/js storage.
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $view->storage->set('id', 'test_cache_header_storage');
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'time',
+      'options' => array(
+        'output_lifespan' => '3600',
+      )
+    ));
+
+    $output = $view->buildRenderable();
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
+      return $renderer->render($output);
+    });
+
+    unset($view->pre_render_called);
+    $view->destroy();
+
+    $view->setDisplay();
+    $output = $view->buildRenderable();
+    $renderer->executeInRenderContext(new RenderContext(), function () use (&$output, $renderer) {
+      return $renderer->render($output);
+    });
+
+    $this->assertTrue(in_array('views_test_data/test', $output['#attached']['library']), 'Make sure libraries are added for cached views.');
+    $this->assertEqual(['foo' => 'bar'], $output['#attached']['drupalSettings'], 'Make sure drupalSettings are added for cached views.');
+    // Note: views_test_data_views_pre_render() adds some cache tags.
+    $this->assertEqual(['config:views.view.test_cache_header_storage', 'views_test_data:1'], $output['#cache']['tags']);
+    $this->assertEqual(['non-existing-placeholder-just-for-testing-purposes' => ['#lazy_builder' => ['views_test_data_placeholders', ['bar']]]], $output['#attached']['placeholders']);
+    $this->assertFalse(!empty($view->build_info['pre_render_called']), 'Make sure hook_views_pre_render is not called for the cached view.');
+  }
+
+  /**
+   * Tests that Subqueries are cached as expected.
+   */
+  public function testSubqueryStringCache() {
+    // Execute the view.
+    $view = Views::getView('test_groupwise_term_ui');
+    $view->setDisplay();
+    $this->executeView($view);
+    // Request for the cache.
+    $cid = 'views_relationship_groupwise_max:test_groupwise_term_ui:default:tid_representative';
+    $cache = \Drupal::cache('data')->get($cid);
+    $this->assertEqual($cid, $cache->cid, 'Subquery String cached as expected.');
+  }
+
+  /**
+   * Tests the data contained in cached items.
+   */
+  public function testCacheData() {
+    for ($i = 1; $i <= 5; $i++) {
+      Node::create([
+        'title' => $this->randomMachineName(8),
+        'type' => 'page',
+      ])->save();
+    }
+
+    $view = Views::getView('test_display');
+    $view->setDisplay();
+    $view->display_handler->overrideOption('cache', array(
+      'type' => 'time',
+      'options' => array(
+        'results_lifespan' => '3600',
+        'output_lifespan' => '3600',
+      )
+    ));
+    $this->executeView($view);
+
+    // Get the cache item.
+    $cid = $view->display_handler->getPlugin('cache')->generateResultsKey();
+    $cache = \Drupal::cache('data')->get($cid);
+
+    // Assert there are results, empty results would mean this test case would
+    // pass otherwise.
+    $this->assertTrue(count($cache->data['result']), 'Results saved in cached data.');
+
+    // Assert each row doesn't contain '_entity' or '_relationship_entities'
+    // items.
+    foreach ($cache->data['result'] as $row) {
+      $this->assertIdentical($row->_entity, NULL, 'Cached row "_entity" property is NULL');
+      $this->assertIdentical($row->_relationship_entities, [], 'Cached row "_relationship_entities" property is empty');
+    }
+  }
+
+  /**
+   * Tests the cache context integration for views result cache.
+   */
+  public function testCacheContextIntegration() {
+    $view = Views::getView('test_cache');
+    $view->setDisplay('page_2');
+    \Drupal::state()->set('views_test_cache_context', 'George');
+    $this->executeView($view);
+
+    $map = ['views_test_data_name' => 'name'];
+    $this->assertIdenticalResultset($view, [['name' => 'George']], $map);
+
+    // Update the entry in the DB to ensure that result caching works.
+    \Drupal::database()->update('views_test_data')
+      ->condition('name', 'George')
+      ->fields(['name' => 'egroeG'])
+      ->execute();
+
+    $view = Views::getView('test_cache');
+    $view->setDisplay('page_2');
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, [['name' => 'George']], $map);
+
+    // Now change the cache context value, a different query should be executed.
+    $view = Views::getView('test_cache');
+    $view->setDisplay('page_2');
+    \Drupal::state()->set('views_test_cache_context', 'Paul');
+    $this->executeView($view);
+
+    $this->assertIdenticalResultset($view, [['name' => 'Paul']], $map);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php b/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
new file mode 100644
index 0000000..8467e66
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/DisplayKernelTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\DisplayKernelTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\views\Views;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Plugin\views\style\StylePluginBase;
+use Drupal\views\Plugin\views\access\AccessPluginBase;
+use Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase;
+use Drupal\views\Plugin\views\pager\PagerPluginBase;
+use Drupal\views\Plugin\views\query\QueryPluginBase;
+use Drupal\views\Plugin\views\cache\CachePluginBase;
+use Drupal\views\Plugin\views\row\RowPluginBase;
+
+/**
+ * Drupal unit tests for the DisplayPluginBase class.
+ *
+ * @group views
+ */
+class DisplayKernelTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('block', 'node', 'field', 'user');
+
+  /**
+   * Views plugin types to test.
+   *
+   * @var array
+   */
+  protected $pluginTypes = array(
+    'access',
+    'cache',
+    'query',
+    'exposed_form',
+    'pager',
+    'style',
+    'row',
+  );
+
+  /**
+   * Views handler types to test.
+   *
+   * @var array
+   */
+  protected $handlerTypes = array(
+    'fields',
+    'sorts',
+  );
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_display_defaults');
+
+  /**
+   * Tests the default display options.
+   */
+  public function testDefaultOptions() {
+    // Save the view.
+    $view = Views::getView('test_display_defaults');
+    $view->mergeDefaults();
+    $view->save();
+
+    // Reload to get saved storage values.
+    $view = Views::getView('test_display_defaults');
+    $view->initDisplay();
+    $display_data = $view->storage->get('display');
+
+    foreach ($view->displayHandlers as $id => $display) {
+      // Test the view plugin options against the storage.
+      foreach ($this->pluginTypes as $type) {
+        $options = $display->getOption($type);
+        $this->assertIdentical($display_data[$id]['display_options'][$type]['options'], $options['options']);
+      }
+      // Test the view handler options against the storage.
+      foreach ($this->handlerTypes as $type) {
+        $options = $display->getOption($type);
+        $this->assertIdentical($display_data[$id]['display_options'][$type], $options);
+      }
+    }
+  }
+
+  /**
+   * Tests the \Drupal\views\Plugin\views\display\DisplayPluginBase::getPlugin() method.
+   */
+  public function testGetPlugin() {
+    $view = Views::getView('test_display_defaults');
+    $view->initDisplay();
+    $display_handler = $view->display_handler;
+
+    $this->assertTrue($display_handler->getPlugin('access') instanceof AccessPluginBase, 'An access plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('cache') instanceof CachePluginBase, 'A cache plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('exposed_form') instanceof ExposedFormPluginBase, 'An exposed_form plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('pager') instanceof PagerPluginBase, 'A pager plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('query') instanceof QueryPluginBase, 'A query plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('row') instanceof RowPluginBase, 'A row plugin instance was returned.');
+    $this->assertTrue($display_handler->getPlugin('style') instanceof StylePluginBase, 'A style plugin instance was returned.');
+    // Test that nothing is returned when an invalid type is requested.
+    $this->assertNull($display_handler->getPlugin('invalid'), 'NULL was returned for an invalid instance');
+    // Test that nothing was returned for an instance with no 'type' in options.
+    unset($display_handler->options['access']);
+    $this->assertNull($display_handler->getPlugin('access'), 'NULL was returned for a plugin type with no "type" option');
+
+    // Get a plugin twice, and make sure the same instance is returned.
+    $view->destroy();
+    $view->initDisplay();
+    $first = spl_object_hash($display_handler->getPlugin('style'));
+    $second = spl_object_hash($display_handler->getPlugin('style'));
+    $this->assertIdentical($first, $second, 'The same plugin instance was returned.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php b/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
new file mode 100644
index 0000000..9573712
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\DisplayPageTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Core\Menu\MenuTreeParameters;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\views\Views;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Tests the page display plugin.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\display\Page
+ */
+class DisplayPageTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_page_display', 'test_page_display_route', 'test_page_display_menu');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'field');
+
+  /**
+   * The router dumper to get all routes.
+   *
+   * @var \Drupal\Core\Routing\MatcherDumper
+   */
+  protected $routerDumper;
+
+  /**
+   * Checks the behavior of the page for access denied/not found behaviors.
+   */
+  public function testPageResponses() {
+    \Drupal::currentUser()->setAccount(new AnonymousUserSession());
+    $subrequest = Request::create('/test_page_display_403', 'GET');
+    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    $this->assertEqual($response->getStatusCode(), 403);
+
+    $subrequest = Request::create('/test_page_display_404', 'GET');
+    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    $this->assertEqual($response->getStatusCode(), 404);
+
+    $subrequest = Request::create('/test_page_display_200', 'GET');
+    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    $this->assertEqual($response->getStatusCode(), 200);
+
+    $subrequest = Request::create('/test_page_display_200', 'GET');
+    \Drupal::getContainer()->get('request_stack')->push($subrequest);
+
+    // Test accessing a disabled page for a view.
+    $view = Views::getView('test_page_display');
+    // Disable the view, rebuild menu, and request the page again.
+    $view->storage->disable()->save();
+    // Router rebuild would occur in a kernel terminate event so we need to
+    // simulate that here.
+    \Drupal::service('router.builder')->rebuild();
+
+    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    $this->assertEqual($response->getStatusCode(), 404);
+  }
+
+  /**
+   * Checks that the router items are properly registered
+   */
+  public function testPageRouterItems() {
+    $collection = \Drupal::service('views.route_subscriber')->routes();
+
+    // Check the controller defaults.
+    foreach ($collection as $id => $route) {
+      $this->assertEqual($route->getDefault('_controller'), 'Drupal\views\Routing\ViewPageController::handle');
+      $id_parts = explode('.', $id);
+      $this->assertEqual($route->getDefault('view_id'), $id_parts[1]);
+      $this->assertEqual($route->getDefault('display_id'), $id_parts[2]);
+    }
+
+    // Check the generated patterns and default values.
+    $route = $collection->get('view.test_page_display_route.page_1');
+    $this->assertEqual($route->getPath(), '/test_route_without_arguments');
+
+    $route = $collection->get('view.test_page_display_route.page_2');
+    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}');
+    $this->assertTrue($route->hasDefault('arg_0'), 'A default value is set for the optional argument id.');
+
+    $route = $collection->get('view.test_page_display_route.page_3');
+    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/suffix');
+    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
+
+    $route = $collection->get('view.test_page_display_route.page_4');
+    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/suffix/{arg_1}');
+    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
+    $this->assertTrue($route->hasDefault('arg_1'), 'A default value is set for the optional argument id_2.');
+
+    $route = $collection->get('view.test_page_display_route.page_5');
+    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/{arg_1}');
+    $this->assertTrue($route->hasDefault('arg_0'), 'A default value is set for the optional argument id.');
+    $this->assertTrue($route->hasDefault('arg_1'), 'A default value is set for the optional argument id_2.');
+
+    $route = $collection->get('view.test_page_display_route.page_6');
+    $this->assertEqual($route->getPath(), '/test_route_with_argument/{arg_0}/{arg_1}');
+    $this->assertFalse($route->hasDefault('arg_0'), 'No default value is set for the required argument id.');
+    $this->assertFalse($route->hasDefault('arg_1'), 'No default value is set for the required argument id_2.');
+  }
+
+  /**
+   * Tests the generated menu links of views.
+   */
+  public function testMenuLinks() {
+    \Drupal::service('plugin.manager.menu.link')->rebuild();
+    $tree = \Drupal::menuTree()->load('admin', new MenuTreeParameters());
+    $this->assertTrue(isset($tree['system.admin']->subtree['views_view:views.test_page_display_menu.page_4']));
+    $menu_link = $tree['system.admin']->subtree['views_view:views.test_page_display_menu.page_4']->link;
+    $this->assertEqual($menu_link->getTitle(), 'Test child (with parent)');
+    $this->assertEqual($menu_link->isExpanded(), TRUE);
+    $this->assertEqual($menu_link->getDescription(), 'Sample description.');
+  }
+
+  /**
+   * Tests the calculated dependencies for various views using Page displays.
+   */
+  public function testDependencies() {
+    $view = Views::getView('test_page_display');
+    $this->assertIdentical([], $view->getDependencies());
+
+    $view = Views::getView('test_page_display_route');
+    $expected = [
+      'content' => ['StaticTest'],
+      'module' => ['views_test_data'],
+    ];
+    $this->assertIdentical($expected, $view->getDependencies());
+
+    $view = Views::getView('test_page_display_menu');
+    $expected = [
+      'config' => [
+        'system.menu.admin',
+        'system.menu.tools',
+      ],
+    ];
+    $this->assertIdentical($expected, $view->getDependencies());
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
new file mode 100644
index 0000000..8412825
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\JoinTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\Plugin\RelationshipJoinTestBase;
+use Drupal\views_test_data\Plugin\views\join\JoinTest as JoinTestPlugin;
+use Drupal\views\Plugin\views\join\JoinPluginBase;
+use Drupal\views\Views;
+
+
+/**
+ * Tests the join plugin.
+ *
+ * @group views
+ * @see \Drupal\views_test_data\Plugin\views\join\JoinTest
+ * @see \Drupal\views\Plugin\views\join\JoinPluginBase
+ */
+class JoinTest extends RelationshipJoinTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * A plugin manager which handlers the instances of joins.
+   *
+   * @var \Drupal\views\Plugin\ViewsPluginManager
+   */
+  protected $manager;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    // Add a join plugin manager which can be used in all of the tests.
+    $this->manager = $this->container->get('plugin.manager.views.join');
+  }
+
+  /**
+   * Tests an example join plugin.
+   */
+  public function testExamplePlugin() {
+
+    // Setup a simple join and test the result sql.
+    $view = Views::getView('test_view');
+    $view->initDisplay();
+    $view->initQuery();
+
+    $configuration = array(
+      'left_table' => 'views_test_data',
+      'left_field' => 'uid',
+      'table' => 'users_field_data',
+      'field' => 'uid',
+    );
+    $join = $this->manager->createInstance('join_test', $configuration);
+    $this->assertTrue($join instanceof JoinTestPlugin, 'The correct join class got loaded.');
+
+    $rand_int = rand(0, 1000);
+    $join->setJoinValue($rand_int);
+
+    $query = db_select('views_test_data');
+    $table = array('alias' => 'users_field_data');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users_field_data'];
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = $rand_int") !== FALSE, 'Make sure that the custom join plugin can extend the join base and alter the result.');
+  }
+
+  /**
+   * Tests the join plugin base.
+   */
+  public function testBasePlugin() {
+
+    // Setup a simple join and test the result sql.
+    $view = Views::getView('test_view');
+    $view->initDisplay();
+    $view->initQuery();
+
+    // First define a simple join without an extra condition.
+    // Set the various options on the join object.
+    $configuration = array(
+      'left_table' => 'views_test_data',
+      'left_field' => 'uid',
+      'table' => 'users_field_data',
+      'field' => 'uid',
+      'adjusted' => TRUE,
+    );
+    $join = $this->manager->createInstance('standard', $configuration);
+    $this->assertTrue($join instanceof JoinPluginBase, 'The correct join class got loaded.');
+    $this->assertNull($join->extra, 'The field extra was not overridden.');
+    $this->assertTrue($join->adjusted, 'The field adjusted was set correctly.');
+
+    // Build the actual join values and read them back from the dbtng query
+    // object.
+    $query = db_select('views_test_data');
+    $table = array('alias' => 'users_field_data');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users_field_data'];
+    $this->assertEqual($join_info['join type'], 'LEFT', 'Make sure the default join type is LEFT');
+    $this->assertEqual($join_info['table'], $configuration['table']);
+    $this->assertEqual($join_info['alias'], 'users_field_data');
+    $this->assertEqual($join_info['condition'], 'views_test_data.uid = users_field_data.uid');
+
+    // Set a different alias and make sure table info is as expected.
+    $join = $this->manager->createInstance('standard', $configuration);
+    $table = array('alias' => 'users1');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users1'];
+    $this->assertEqual($join_info['alias'], 'users1');
+
+    // Set a different join type (INNER) and make sure it is used.
+    $configuration['type'] = 'INNER';
+    $join = $this->manager->createInstance('standard', $configuration);
+    $table = array('alias' => 'users2');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users2'];
+    $this->assertEqual($join_info['join type'], 'INNER');
+
+    // Setup addition conditions and make sure it is used.
+    $random_name_1 = $this->randomMachineName();
+    $random_name_2 = $this->randomMachineName();
+    $configuration['extra'] = array(
+      array(
+        'field' => 'name',
+        'value' => $random_name_1
+      ),
+      array(
+        'field' => 'name',
+        'value' => $random_name_2,
+        'operator' => '<>'
+      ),
+    );
+    $join = $this->manager->createInstance('standard', $configuration);
+    $table = array('alias' => 'users3');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users3'];
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users3.uid") !== FALSE, 'Make sure the join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users3.name = :views_join_condition_0") !== FALSE, 'Make sure the first extra join condition appears in the query and uses the first placeholder.');
+    $this->assertTrue(strpos($join_info['condition'], "users3.name <> :views_join_condition_1") !== FALSE, 'Make sure the second extra join condition appears in the query and uses the second placeholder.');
+    $this->assertEqual(array_values($join_info['arguments']), array($random_name_1, $random_name_2), 'Make sure the arguments are in the right order');
+
+    // Test that 'IN' conditions are properly built.
+    $random_name_1 = $this->randomMachineName();
+    $random_name_2 = $this->randomMachineName();
+    $random_name_3 = $this->randomMachineName();
+    $random_name_4 = $this->randomMachineName();
+    $configuration['extra'] = array(
+      array(
+        'field' => 'name',
+        'value' => $random_name_1
+      ),
+      array(
+        'field' => 'name',
+        'value' => array($random_name_2, $random_name_3, $random_name_4),
+      ),
+    );
+    $join = $this->manager->createInstance('standard', $configuration);
+    $table = array('alias' => 'users4');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users4'];
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users4.uid") !== FALSE, 'Make sure the join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users4.name = :views_join_condition_2") !== FALSE, 'Make sure the first extra join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users4.name IN ( :views_join_condition_3, :views_join_condition_4, :views_join_condition_5 )") !== FALSE, 'The IN condition for the join is properly formed.');
+
+    // Test that all the conditions are properly built.
+    $configuration['extra'] = array(
+      array(
+        'field' => 'langcode',
+        'value' => 'en'
+      ),
+      array(
+        'left_field' => 'status',
+        'value' => 0,
+        'numeric' => TRUE,
+      ),
+      array(
+        'field' => 'name',
+        'left_field' => 'name'
+      ),
+    );
+    $join = $this->manager->createInstance('standard', $configuration);
+    $table = array('alias' => 'users5');
+    $join->buildJoin($query, $table, $view->query);
+
+    $tables = $query->getTables();
+    $join_info = $tables['users5'];
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.uid = users5.uid") !== FALSE, 'Make sure the join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users5.langcode = :views_join_condition_6") !== FALSE, 'Make sure the first extra join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "views_test_data.status = :views_join_condition_7") !== FALSE, 'Make sure the second extra join condition appears in the query.');
+    $this->assertTrue(strpos($join_info['condition'], "users5.name = views_test_data.name") !== FALSE, 'Make sure the third extra join condition appears in the query.');
+    $this->assertEqual(array_values($join_info['arguments']), array('en', 0), 'Make sure the arguments are in the right order');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/PagerKernelTest.php b/core/modules/views/tests/src/Kernel/Plugin/PagerKernelTest.php
new file mode 100644
index 0000000..b589de9
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/PagerKernelTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\PagerKernelTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests pager-related APIs.
+ *
+ * @group views
+ */
+class PagerKernelTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_pager_full'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp($import_test_views);
+
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('user');
+  }
+
+  /**
+   * Tests pager-related setter methods on ViewExecutable.
+   *
+   * @see \Drupal\views\ViewExecutable::setItemsPerPage
+   * @see \Drupal\views\ViewExecutable::setOffset
+   * @see \Drupal\views\ViewExecutable::setCurrentPage
+   */
+  public function testSetPagerMethods() {
+    $view = Views::getView('test_pager_full');
+
+    // Mark the view as cacheable in order have the cache checking working
+    // below.
+    $display = &$view->storage->getDisplay('default');
+    $display['display_options']['cache']['type'] = 'tag';
+    $view->storage->save();
+
+    $output = $view->preview();
+
+    \Drupal::service('renderer')->renderPlain($output);
+    $this->assertIdentical(CacheBackendInterface::CACHE_PERMANENT, $output['#cache']['max-age']);
+
+    foreach (['setItemsPerPage', 'setOffset', 'setCurrentPage'] as $method) {
+      $view = Views::getView('test_pager_full');
+      $view->setDisplay('default');
+      $view->{$method}(1);
+      $output = $view->preview();
+
+      \Drupal::service('renderer')->renderPlain($output);
+      $this->assertIdentical(CacheBackendInterface::CACHE_PERMANENT, $output['#cache']['max-age'], 'Max age kept.');
+    }
+
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/PluginKernelTestBase.php b/core/modules/views/tests/src/Kernel/Plugin/PluginKernelTestBase.php
new file mode 100644
index 0000000..2c41446
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/PluginKernelTestBase.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\PluginKernelTestBase.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Base test class for views plugin unit tests.
+ */
+abstract class PluginKernelTestBase extends ViewsKernelTestBase {
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php b/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
new file mode 100644
index 0000000..d8b3de5
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/QueryTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\QueryTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\views\Views;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
+
+/**
+ * Tests query plugins.
+ *
+ * @group views
+ */
+class QueryTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['table']['base']['query_id'] = 'query_test';
+
+    return $data;
+  }
+
+  /**
+   * Tests query plugins.
+   */
+  public function testQuery() {
+    $this->_testInitQuery();
+    $this->_testQueryExecute();
+    $this->queryMethodsTests();
+  }
+
+  /**
+   * Tests the ViewExecutable::initQuery method.
+   */
+  public function _testInitQuery() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->initQuery();
+    $this->assertTrue($view->query instanceof QueryTestPlugin, 'Make sure the right query plugin got instantiated.');
+  }
+
+  public function _testQueryExecute() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->initQuery();
+    $view->query->setAllItems($this->dataSet());
+
+    $this->executeView($view);
+    $this->assertTrue($view->result, 'Make sure the view result got filled');
+  }
+
+  /**
+   * Test methods provided by the QueryPluginBase.
+   *
+   * @see \Drupal\views\Plugin\views\query\QueryPluginBase
+   */
+  protected function queryMethodsTests() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->initQuery();
+    $this->assertFalse($view->query->getLimit(), 'Default to an empty limit.');
+    $rand_number = rand(5, 10);
+    $view->query->setLimit($rand_number);
+    $this->assertEqual($view->query->getLimit(), $rand_number, 'set_limit adapts the amount of items.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php b/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
new file mode 100644
index 0000000..3dd3209
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\RelationshipJoinTestBase.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\Plugin\PluginKernelTestBase;
+use Drupal\user\Entity\User;
+use Drupal\views\Views;
+
+/**
+ * Provides a base class for a testing a relationship.
+ *
+ * @see \Drupal\views\Tests\Handler\JoinTest
+ * @see \Drupal\views\Tests\Plugin\RelationshipTest
+ */
+abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'field');
+
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $rootUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpFixtures() {
+    $this->installEntitySchema('user');
+    $this->installConfig(array('user'));
+    parent::setUpFixtures();
+
+    // Create a record for uid 1.
+    $this->rootUser = User::create(['name' => $this->randomMachineName()]);
+    $this->rootUser->save();
+
+    Views::viewsData()->clear();
+  }
+
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::schemaDefinition().
+   *
+   * Adds a uid column to test the relationships.
+   */
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+
+    $schema['views_test_data']['fields']['uid'] = array(
+      'description' => "The {users_field_data}.uid of the author of the beatle entry.",
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0
+    );
+
+    return $schema;
+  }
+
+  /**
+   * Overrides \Drupal\views\Tests\ViewTestBase::viewsData().
+   *
+   * Adds a relationship for the uid column.
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['uid'] = array(
+      'title' => t('UID'),
+      'help' => t('The test data UID'),
+      'relationship' => array(
+        'id' => 'standard',
+        'base' => 'users_field_data',
+        'base field' => 'uid'
+      )
+    );
+
+    return $data;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php b/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
new file mode 100644
index 0000000..2868c18
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/RelationshipTest.php
@@ -0,0 +1,184 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\RelationshipTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\simpletest\UserCreationTrait;
+use Drupal\views\Views;
+use Drupal\Tests\views\Kernel\Plugin\RelationshipJoinTestBase;
+
+/**
+ * Tests the base relationship handler.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\relationship\RelationshipPluginBase
+ */
+class RelationshipTest extends RelationshipJoinTestBase {
+  use UserCreationTrait;
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Maps between the key in the expected result and the query result.
+   *
+   * @var array
+   */
+  protected $columnMap = array(
+    'views_test_data_name' => 'name',
+    'users_field_data_views_test_data_uid' => 'uid',
+  );
+
+  /**
+   * Tests the query result of a view with a relationship.
+   */
+  public function testRelationshipQuery() {
+    // Set the first entry to have the admin as author.
+    db_query("UPDATE {views_test_data} SET uid = 1 WHERE id = 1");
+    db_query("UPDATE {views_test_data} SET uid = 2 WHERE id <> 1");
+
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->displayHandlers->get('default')->overrideOption('relationships', array(
+      'uid' => array(
+        'id' => 'uid',
+        'table' => 'views_test_data',
+        'field' => 'uid',
+      ),
+    ));
+
+    $view->displayHandlers->get('default')->overrideOption('filters', array(
+      'uid' => array(
+        'id' => 'uid',
+        'table' => 'users_field_data',
+        'field' => 'uid',
+        'relationship' => 'uid',
+      ),
+    ));
+
+    $fields = $view->displayHandlers->get('default')->getOption('fields');
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + array(
+      'uid' => array(
+        'id' => 'uid',
+        'table' => 'users_field_data',
+        'field' => 'uid',
+        'relationship' => 'uid',
+      ),
+    ));
+
+    $view->initHandlers();
+
+    // Check for all beatles created by admin.
+    $view->filter['uid']->value = array(1);
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'John',
+        'uid' => 1
+      )
+    );
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+    $view->destroy();
+
+    // Check for all beatles created by another user, which so doesn't exist.
+    $view->initHandlers();
+    $view->filter['uid']->value = array(3);
+    $this->executeView($view);
+    $expected_result = array();
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+    $view->destroy();
+
+    // Set the relationship to required, so only results authored by the admin
+    // should return.
+    $view->initHandlers();
+    $view->relationship['uid']->options['required'] = TRUE;
+    $this->executeView($view);
+
+    $expected_result = array(
+      array(
+        'name' => 'John',
+        'uid' => 1
+      )
+    );
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+    $view->destroy();
+
+    // Set the relationship to optional should cause to return all beatles.
+    $view->initHandlers();
+    $view->relationship['uid']->options['required'] = FALSE;
+    $this->executeView($view);
+
+    $expected_result = $this->dataSet();
+    // Alter the expected result to contain the right uids.
+    foreach ($expected_result as &$row) {
+      // Only John has an existing author.
+      if ($row['name'] == 'John') {
+        $row['uid'] = 1;
+      }
+      else {
+        // The LEFT join should set an empty {users}.uid field.
+        $row['uid'] = NULL;
+      }
+    }
+
+    $this->assertIdenticalResultset($view, $expected_result, $this->columnMap);
+  }
+
+  /**
+   * Tests rendering of a view with a relationship.
+   */
+  public function testRelationshipRender() {
+    $author1 = $this->createUser();
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 1", [':uid' => $author1->id()]);
+    $author2 = $this->createUser();
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 2", [':uid' => $author2->id()]);
+    // Set uid to non-existing author uid for row 3.
+    db_query("UPDATE {views_test_data} SET uid = :uid WHERE id = 3", [':uid' => $author2->id() + 123]);
+
+    $view = Views::getView('test_view');
+    // Add a relationship for authors.
+    $view->getDisplay()->overrideOption('relationships', [
+      'uid' => [
+        'id' => 'uid',
+        'table' => 'views_test_data',
+        'field' => 'uid',
+      ],
+    ]);
+    // Add fields for {views_test_data}.id and author name.
+    $view->getDisplay()->overrideOption('fields', [
+      'id' => [
+        'id' => 'id',
+        'table' => 'views_test_data',
+        'field' => 'id',
+      ],
+      'author' => [
+        'id' => 'author',
+        'table' => 'users_field_data',
+        'field' => 'name',
+        'relationship' => 'uid',
+      ],
+    ]);
+
+    // Render the view.
+    $output = $view->preview();
+    $html = $this->container->get('renderer')->renderRoot($output);
+    $this->setRawContent($html);
+
+    // Check that the output contains correct values.
+    $xpath = '//div[@class="views-row" and div[@class="views-field views-field-id"]=:id and div[@class="views-field views-field-author"]=:author]';
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 1, ':author' => $author1->getUsername()])));
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 2, ':author' => $author2->getUsername()])));
+    $this->assertEqual(1, count($this->xpath($xpath, [':id' => 3, ':author' => ''])));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php b/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
new file mode 100644
index 0000000..4c8df8e
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/RowEntityTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\RowEntityTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Core\Form\FormState;
+use Drupal\views\Views;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
+
+/**
+ * Tests the generic entity row plugin.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\row\EntityRow
+ */
+class RowEntityTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy', 'text', 'filter', 'field', 'system', 'node', 'user'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_entity_row');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('taxonomy_term');
+    $this->installConfig(array('taxonomy'));
+    \Drupal::service('router.builder')->rebuild();
+  }
+
+  /**
+   * Tests the entity row handler.
+   */
+  public function testEntityRow() {
+    $vocab = Vocabulary::create(['name' => $this->randomMachineName(), 'vid' => strtolower($this->randomMachineName())]);
+    $vocab->save();
+    $term = Term::create(['name' => $this->randomMachineName(), 'vid' => $vocab->id() ]);
+    $term->save();
+
+    $view = Views::getView('test_entity_row');
+    $build = $view->preview();
+    $this->render($build);
+
+    $this->assertText($term->getName(), 'The rendered entity appears as row in the view.');
+
+    // Tests the available view mode options.
+    $form = array();
+    $form_state = new FormState();
+    $form_state->set('view', $view->storage);
+    $view->rowPlugin->buildOptionsForm($form, $form_state);
+
+    $this->assertTrue(isset($form['view_mode']['#options']['default']), 'Ensure that the default view mode is available');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php b/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php
new file mode 100644
index 0000000..1dc561d
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/RowRenderCacheTest.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\RowRenderCacheTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Core\Session\AccountInterface;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\node\NodeInterface;
+use Drupal\simpletest\UserCreationTrait;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests row render caching.
+ *
+ * @group views
+ */
+class RowRenderCacheTest extends ViewsKernelTestBase {
+
+  use UserCreationTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'node');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_row_render_cache');
+
+  /**
+   * An editor user account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $editorUser;
+
+  /**
+   * A power user account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $powerUser;
+
+  /**
+   * A regular user account.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $regularUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUpFixtures() {
+    parent::setUpFixtures();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installSchema('node', 'node_access');
+
+    $type = NodeType::create(['type' => 'test']);
+    $type->save();
+
+    $this->editorUser = $this->createUser(['bypass node access']);
+    $this->powerUser = $this->createUser(['access content', 'create test content', 'edit own test content', 'delete own test content']);
+    $this->regularUser = $this->createUser(['access content']);
+
+    // Create some test entities.
+    for ($i = 0; $i < 5; $i++) {
+      Node::create(['title' => 'b' . $i . $this->randomMachineName(), 'type' => 'test'])->save();
+    }
+
+    // Create a power user node.
+    Node::create(['title' => 'z' . $this->randomMachineName(), 'uid' => $this->powerUser->id(), 'type' => 'test'])->save();
+  }
+
+  /**
+   * Test complex field rewriting and uncacheable field handlers.
+   */
+  public function testAdvancedCaching() {
+    // Test that row field output is actually cached and with the proper cache
+    // contexts.
+    $this->doTestRenderedOutput($this->editorUser);
+    $this->doTestRenderedOutput($this->editorUser, TRUE);
+    $this->doTestRenderedOutput($this->powerUser);
+    $this->doTestRenderedOutput($this->powerUser, TRUE);
+    $this->doTestRenderedOutput($this->regularUser);
+    $this->doTestRenderedOutput($this->regularUser, TRUE);
+
+    // Alter the result set order and check that counter is still working
+    // correctly.
+    $this->doTestRenderedOutput($this->editorUser);
+    /** @var \Drupal\node\NodeInterface $node */
+    $node = Node::load(6);
+    $node->setTitle('a' . $this->randomMachineName());
+    $node->save();
+    $this->doTestRenderedOutput($this->editorUser);
+  }
+
+  /**
+   * Check whether the rendered output matches expectations.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user account to tests rendering with.
+   * @param bool $check_cache
+   *   (optional) Whether explicitly test render cache entries.
+   */
+  protected function doTestRenderedOutput(AccountInterface $account, $check_cache = FALSE) {
+    $this->setCurrentUser($account);
+    $view = Views::getView('test_row_render_cache');
+    $view->setDisplay();
+    $view->preview();
+
+    /** @var \Drupal\Core\Render\RenderCacheInterface $render_cache */
+    $render_cache = $this->container->get('render_cache');
+
+    /** @var \Drupal\views\Plugin\views\cache\CachePluginBase $cache_plugin */
+    $cache_plugin = $view->display_handler->getPlugin('cache');
+
+    // Retrieve nodes and sort them in alphabetical order to match view results.
+    $nodes = Node::loadMultiple();
+    usort($nodes, function (NodeInterface $a, NodeInterface $b) {
+      return strcmp($a->label(), $b->label());
+    });
+
+    $index = 0;
+    foreach ($nodes as $node) {
+      $nid = $node->id();
+      $access = $node->access('update');
+
+      $counter = $index + 1;
+      $expected = "$nid: $counter (just in case: $nid)";
+      $counter_output = $view->style_plugin->getField($index, 'counter');
+      $this->assertEqual($counter_output, $expected);
+
+      $node_url = $node->url();
+      $expected = "<a href=\"$node_url\"><span class=\"da-title\">{$node->label()}</span> <span class=\"counter\">$counter_output</span></a>";
+      $output = $view->style_plugin->getField($index, 'title');
+      $this->assertEqual($output, $expected);
+
+      $expected = $access ? "<a href=\"$node_url/edit?destination=/\" hreflang=\"en\">edit</a>" : "";
+      $output = $view->style_plugin->getField($index, 'edit_node');
+      $this->assertEqual($output, $expected);
+
+      $expected = $access ? "<a href=\"$node_url/delete?destination=/\" hreflang=\"en\">delete</a>" : "";
+      $output = $view->style_plugin->getField($index, 'delete_node');
+      $this->assertEqual($output, $expected);
+      $expected = $access ? '  <div class="dropbutton-wrapper"><div class="dropbutton-widget"><ul class="dropbutton">' .
+        '<li><a href="' . $node_url . '/edit?destination=/" hreflang="en">Edit</a></li>' .
+        '<li><a href="' . $node_url . '/delete?destination=/" hreflang="en">Delete</a></li>' .
+        '</ul></div></div>' : '';
+      $output = $view->style_plugin->getField($index, 'operations');
+      $this->assertEqual($output, $expected);
+
+      if ($check_cache) {
+        $keys = $cache_plugin->getRowCacheKeys($view->result[$index]);
+        $user_context = !$account->hasPermission('edit any test content') ? 'user' : 'user.permissions';
+        $element = $render_cache->get(['#cache' => ['keys' => $keys, 'contexts' => ['languages:language_interface', 'theme', $user_context]]]);
+        $this->assertTrue($element);
+      }
+
+      $index++;
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php b/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php
new file mode 100644
index 0000000..ec985be
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/SqlQueryTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\SqlQueryTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the sql query plugin.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\query\Sql
+ */
+class SqlQueryTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['table']['base']['access query tag'] = 'test_tag';
+    $data['views_test_data']['table']['base']['query metadata'] = array('key1' => 'test_metadata', 'key2' => 'test_metadata2');
+
+    return $data;
+  }
+
+  /**
+   * Tests adding some metadata/tags to the views query.
+   */
+  public function testExecuteMetadata() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $view->initQuery();
+    $view->execute();
+    /** @var \Drupal\Core\Database\Query\Select $query */
+    $main_query = $view->build_info['query'];
+    /** @var \Drupal\Core\Database\Query\Select $count_query */
+    $count_query = $view->build_info['count_query'];
+
+    foreach (array($main_query, $count_query) as $query) {
+      // Check query access tags.
+      $this->assertTrue($query->hasTag('test_tag'));
+
+      // Check metadata.
+      $this->assertIdentical($query->getMetaData('key1'), 'test_metadata');
+      $this->assertIdentical($query->getMetaData('key2'), 'test_metadata2');
+    }
+
+    $query_options = $view->display_handler->getOption('query');
+    $query_options['options']['disable_sql_rewrite'] = TRUE;
+    $view->display_handler->setOption('query', $query_options);
+    $view->save();
+    $view->destroy();
+
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $view->initQuery();
+    $view->execute();
+    /** @var \Drupal\Core\Database\Query\Select $query */
+    $main_query = $view->build_info['query'];
+    /** @var \Drupal\Core\Database\Query\Select $count_query */
+    $count_query = $view->build_info['count_query'];
+
+    foreach (array($main_query, $count_query) as $query) {
+      // Check query access tags.
+      $this->assertFalse($query->hasTag('test_tag'));
+
+      // Check metadata.
+      $this->assertIdentical($query->getMetaData('key1'), NULL);
+      $this->assertIdentical($query->getMetaData('key2'), NULL);
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
new file mode 100644
index 0000000..ab4421b
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleHtmlListTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\StyleHtmlListTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests the HTML list style plugin.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\style\HtmlList
+ */
+class StyleHtmlListTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_style_html_list');
+
+  /**
+   * Make sure that the HTML list style markup is correct.
+   */
+  function testDefaultRowClasses() {
+    $view = Views::getView('test_style_html_list');
+    $output = $view->preview();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+
+    // Check that an empty class attribute is not added if the wrapper class is
+    // not set.
+    $this->assertTrue(strpos($output, '<div>') !== FALSE, 'Empty class is not added to DIV when class is not set');
+
+    // Check that an empty class attribute is not added if the list class is
+    // not set.
+    $this->assertTrue(strpos($output, '<ul>') !== FALSE, 'Empty class is not added to UL when class is not set');
+
+    // Set wrapper class and list class in style options.
+    $view->style_plugin->options['class'] = 'class';
+    $view->style_plugin->options['wrapper_class'] = 'wrapper-class';
+
+    $output = $view->preview();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+
+    // Check that class attribute is present if the wrapper class is set.
+    $this->assertTrue(strpos($output, '<div class="wrapper-class">') !== FALSE, 'Class is added to DIV');
+
+    // Check that class attribute is present if the list class is set.
+    $this->assertTrue(strpos($output, '<ul class="class">') !== FALSE, 'Class is added to UL');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
new file mode 100644
index 0000000..dcf6742
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleMappingTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\StyleMappingTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\Plugin\StyleTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests mapping style functionality.
+ *
+ * @group views
+ */
+class StyleMappingTest extends StyleTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_style_mapping');
+
+  /**
+   * Verifies that the fields were mapped correctly.
+   */
+  public function testMappedOutput() {
+    $view = Views::getView('test_style_mapping');
+    $output = $this->mappedOutputHelper($view);
+    $this->assertTrue(strpos($output, 'job') === FALSE, 'The job field is added to the view but not in the mapping.');
+    $view->destroy();
+
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->options['style']['options']['mapping']['name_field'] = 'job';
+    $output = $this->mappedOutputHelper($view);
+    $this->assertTrue(strpos($output, 'job') !== FALSE, 'The job field is added to the view and is in the mapping.');
+  }
+
+  /**
+   * Tests the mapping of fields.
+   *
+   * @param \Drupal\views\ViewExecutable $view
+   *   The view to test.
+   *
+   * @return string
+   *   The view rendered as HTML.
+   */
+  protected function mappedOutputHelper($view) {
+    $output = $view->preview();
+    $rendered_output = \Drupal::service('renderer')->renderRoot($output);
+    $this->storeViewPreview($rendered_output);
+    $rows = $this->elements->body->div->div;
+    $data_set = $this->dataSet();
+
+    $count = 0;
+    foreach ($rows as $row) {
+      $attributes = $row->attributes();
+      $class = (string) $attributes['class'][0];
+      $this->assertTrue(strpos($class, 'views-row-mapping-test') !== FALSE, 'Make sure that each row has the correct CSS class.');
+
+      foreach ($row->div as $field) {
+        // Split up the field-level class, the first part is the mapping name
+        // and the second is the field ID.
+        $field_attributes = $field->attributes();
+        $name = strtok((string) $field_attributes['class'][0], '-');
+        $field_id = strtok('-');
+
+        // The expected result is the mapping name and the field value,
+        // separated by ':'.
+        $expected_result = $name . ':' . $data_set[$count][$field_id];
+        $actual_result = (string) $field;
+        $this->assertIdentical($expected_result, $actual_result, format_string('The fields were mapped successfully: %name => %field_id', array('%name' => $name, '%field_id' => $field_id)));
+      }
+
+      $count++;
+    }
+
+    return $rendered_output;
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
new file mode 100644
index 0000000..adffd6f
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleTableUnitTest.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\StyleTableUnitTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\views\Views;
+use Drupal\views\ViewExecutable;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests the table style plugin.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\style\Table
+ */
+class StyleTableUnitTest extends PluginKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_table');
+
+  /**
+   * Tests the table style.
+   */
+  public function testTable() {
+    $view = Views::getView('test_table');
+
+    $view->setDisplay('default');
+    $view->initStyle();
+    $view->initHandlers();
+    $view->initQuery();
+    $style_plugin = $view->style_plugin;
+
+    // Test the buildSort() method.
+    $request = new Request();
+    $view->setRequest($request);
+
+    $style_plugin->options['override'] = FALSE;
+
+    $style_plugin->options['default'] = '';
+    $this->assertTrue($style_plugin->buildSort(), 'If no order and no default order is specified, the normal sort should be used.');
+
+    $style_plugin->options['default'] = 'id';
+    $this->assertTrue($style_plugin->buildSort(), 'If no order but a default order is specified, the normal sort should be used.');
+
+    $request->attributes->set('order', $this->randomMachineName());
+    $this->assertTrue($style_plugin->buildSort(), 'If no valid field is chosen for order, the normal sort should be used.');
+
+    $request->attributes->set('order', 'id');
+    $this->assertTrue($style_plugin->buildSort(), 'If a valid order is specified but the table is configured to not override, the normal sort should be used.');
+
+    $style_plugin->options['override'] = TRUE;
+
+    $this->assertFalse($style_plugin->buildSort(), 'If a valid order is specified and the table is configured to override, the normal sort should not be used.');
+
+    // Test the buildSortPost() method.
+    $request = new Request();
+    $view->setRequest($request);
+
+    // Setup no valid default.
+    $this->prepareView($view);
+    $style_plugin = $view->style_plugin;
+    $style_plugin->options['default'] = '';
+    $style_plugin->buildSortPost();
+    $this->assertIdentical($style_plugin->order, NULL, 'No sort order was set, when no order was specified and no default column was selected.');
+    $this->assertIdentical($style_plugin->active, NULL, 'No sort field was set, when no order was specified and no default column was selected.');
+    $view->destroy();
+
+    // Setup a valid default + column specific default sort order.
+    $this->prepareView($view);
+    $style_plugin = $view->style_plugin;
+    $style_plugin->options['default'] = 'id';
+    $style_plugin->options['info']['id']['default_sort_order'] = 'desc';
+    $style_plugin->buildSortPost();
+    $this->assertIdentical($style_plugin->order, 'desc', 'Fallback to the right default sort order.');
+    $this->assertIdentical($style_plugin->active, 'id', 'Fallback to the right default sort field.');
+    $view->destroy();
+
+    // Setup a valid default + table default sort order.
+    $this->prepareView($view);
+    $style_plugin = $view->style_plugin;
+    $style_plugin->options['default'] = 'id';
+    $style_plugin->options['info']['id']['default_sort_order'] = NULL;
+    $style_plugin->options['order'] = 'asc';
+    $style_plugin->buildSortPost();
+    $this->assertIdentical($style_plugin->order, 'asc', 'Fallback to the right default sort order.');
+    $this->assertIdentical($style_plugin->active, 'id', 'Fallback to the right default sort field.');
+    $view->destroy();
+
+    // Use an invalid field.
+    $this->prepareView($view);
+    $style_plugin = $view->style_plugin;
+    $request->query->set('sort', 'asc');
+    $random_name = $this->randomMachineName();
+    $request->query->set('order', $random_name);
+    $style_plugin->buildSortPost();
+    $this->assertIdentical($style_plugin->order, 'asc', 'No sort order was set, when invalid sort order was specified.');
+    $this->assertIdentical($style_plugin->active, NULL, 'No sort field was set, when invalid sort order was specified.');
+    $view->destroy();
+
+    // Use a existing field, and sort both ascending and descending.
+    foreach (array('asc', 'desc') as $order) {
+      $this->prepareView($view);
+      $style_plugin = $view->style_plugin;
+      $request->query->set('sort', $order);
+      $request->query->set('order', 'id');
+      $style_plugin->buildSortPost();
+      $this->assertIdentical($style_plugin->order, $order, 'Ensure the right sort order was set.');
+      $this->assertIdentical($style_plugin->active, 'id', 'Ensure the right order was set.');
+      $view->destroy();
+    }
+
+    $view->destroy();
+
+    // Excluded field to make sure its wrapping td doesn't show.
+    $this->prepareView($view);
+    $view->field['name']->options['exclude'] = TRUE;
+    $output = $view->preview();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+    $this->assertFalse(strpos($output, 'views-field-name') !== FALSE, "Excluded field's wrapper was not rendered.");
+    $view->destroy();
+
+    // Render a non empty result, and ensure that the empty area handler is not
+    // rendered.
+    $this->executeView($view);
+    $output = $view->preview();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+
+    $this->assertFalse(strpos($output, 'custom text') !== FALSE, 'Empty handler was not rendered on a non empty table.');
+
+    // Render an empty result, and ensure that the area handler is rendered.
+    $view->setDisplay('default');
+    $view->executed = TRUE;
+    $view->result = array();
+    $output = $view->preview();
+    $output = \Drupal::service('renderer')->renderRoot($output);
+
+    $this->assertTrue(strpos($output, 'custom text') !== FALSE, 'Empty handler got rendered on an empty table.');
+  }
+
+  /**
+   * Prepares a view executable by initializing everything which is needed.
+   *
+   * @param \Drupal\views\ViewExecutable $view
+   *   The executable to prepare.
+   */
+  protected function prepareView(ViewExecutable $view) {
+    $view->setDisplay();
+    $view->initStyle();
+    $view->initHandlers();
+    $view->initQuery();
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php b/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php
new file mode 100644
index 0000000..4daed1f
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleTestBase.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\StyleTestBase.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Masterminds\HTML5;
+
+/**
+ * Tests some general style plugin related functionality.
+ */
+abstract class StyleTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Stores the SimpleXML representation of the output.
+   *
+   * @var \SimpleXMLElement
+   */
+  protected $elements;
+
+  /**
+   * Stores a view output in the elements.
+   */
+  function storeViewPreview($output) {
+    $html5 = new HTML5();
+    $htmlDom = $html5->loadHTML('<html><body>' . $output . '</body></html>');
+    if ($htmlDom) {
+      // It's much easier to work with simplexml than DOM, luckily enough
+      // we can just simply import our DOM tree.
+      $this->elements = simplexml_import_dom($htmlDom);
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
new file mode 100644
index 0000000..2b5575c
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleUnformattedTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\StyleUnformattedTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\views\Views;
+
+/**
+ * Tests unformatted style functionality.
+ *
+ * @group views
+ */
+class StyleUnformattedTest extends StyleTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * Make sure that the default css classes works as expected.
+   */
+  function testDefaultRowClasses() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $output = $view->preview();
+    $this->storeViewPreview(\Drupal::service('renderer')->renderRoot($output));
+
+    $rows = $this->elements->body->div->div;
+    $count = 0;
+    $count_result = count($view->result);
+    foreach ($rows as $row) {
+      $count++;
+      $attributes = $row->attributes();
+      $class = (string) $attributes['class'][0];
+      $this->assertTrue(strpos($class, 'views-row') !== FALSE, 'Make sure that the views row class is set right.');
+    }
+    $this->assertIdentical($count, $count_result);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php b/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
new file mode 100644
index 0000000..a3ab063
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Plugin\ViewsBlockTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Plugin;
+
+use Drupal\views\Plugin\Block\ViewsBlock;
+use Drupal\views\Tests\ViewTestData;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Tests native behaviors of the block views plugin.
+ *
+ * @group views
+ */
+class ViewsBlockTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('block', 'block_test_views');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view_block');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    ViewTestData::createTestViews(get_class($this), array('block_test_views'));
+  }
+
+  /**
+   * Tests that ViewsBlock::getMachineNameSuggestion() produces the right value.
+   *
+   * @see \Drupal\views\Plugin\Block::getmachineNameSuggestion().
+   */
+  public function testMachineNameSuggestion() {
+    $plugin_definition = array(
+      'provider' => 'views',
+    );
+    $plugin_id = 'views_block:test_view_block-block_1';
+    $views_block = ViewsBlock::create($this->container, array(), $plugin_id, $plugin_definition);
+
+    $this->assertEqual($views_block->getMachineNameSuggestion(), 'views_block__test_view_block_block_1');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/PluginInstanceTest.php b/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
new file mode 100644
index 0000000..0e33855
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\PluginInstanceTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\views\Views;
+
+/**
+ * Tests that an instance of all views plugins can be created.
+ *
+ * @group views
+ */
+class PluginInstanceTest extends ViewsKernelTestBase {
+
+  /**
+   * All views plugin types.
+   *
+   * @var array
+   */
+  protected $pluginTypes = array(
+    'access',
+    'area',
+    'argument',
+    'argument_default',
+    'argument_validator',
+    'cache',
+    'display_extender',
+    'display',
+    'exposed_form',
+    'field',
+    'filter',
+    'join',
+    'pager',
+    'query',
+    'relationship',
+    'row',
+    'sort',
+    'style',
+    'wizard',
+  );
+
+  /**
+   * An array of plugin definitions, keyed by plugin type.
+   *
+   * @var array
+   */
+  protected $definitions;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->definitions = Views::getPluginDefinitions();
+  }
+
+  /**
+   * Confirms that there is plugin data for all views plugin types.
+   */
+  public function testPluginData() {
+    // Check that we have an array of data.
+    $this->assertTrue(is_array($this->definitions), 'Plugin data is an array.');
+
+    // Check all plugin types.
+    foreach ($this->pluginTypes as $type) {
+      $this->assertTrue(array_key_exists($type, $this->definitions), format_string('Key for plugin type @type found.', array('@type' => $type)));
+      $this->assertTrue(is_array($this->definitions[$type]) && !empty($this->definitions[$type]), format_string('Plugin type @type has an array of plugins.', array('@type' => $type)));
+    }
+
+    // Tests that the plugin list has not missed any types.
+    $diff = array_diff(array_keys($this->definitions), $this->pluginTypes);
+    $this->assertTrue(empty($diff), 'All plugins were found and matched.');
+  }
+
+  /**
+   * Tests creating instances of every views plugin.
+   *
+   * This will iterate through all plugins from _views_fetch_plugin_data().
+   */
+  public function testPluginInstances() {
+    foreach ($this->definitions as $type => $plugins) {
+      // Get a plugin manager for this type.
+      $manager = $this->container->get("plugin.manager.views.$type");
+      foreach ($plugins as $id => $definition) {
+        // Get a reflection class for this plugin.
+        // We only want to test true plugins, i.e. They extend PluginBase.
+        $reflection = new \ReflectionClass($definition['class']);
+        if ($reflection->isSubclassOf('Drupal\views\Plugin\views\PluginBase')) {
+          // Create a plugin instance and check what it is. This is not just
+          // good to check they can be created but for throwing any notices for
+          // method signatures etc. too.
+          $instance = $manager->createInstance($id);
+          $this->assertTrue($instance instanceof $definition['class'], format_string('Instance of @type:@id created', array('@type' => $type, '@id' => $id)));
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/QueryGroupByTest.php b/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
new file mode 100644
index 0000000..69df4dc
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
@@ -0,0 +1,340 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\QueryGroupByTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests aggregate functionality of views, for example count.
+ *
+ * @group views
+ */
+class QueryGroupByTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_group_by_in_filters', 'test_aggregate_count', 'test_group_by_count', 'test_group_by_count_multicardinality', 'test_group_by_field_not_within_bundle');
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('entity_test', 'system', 'field', 'user', 'language');
+
+  /**
+   * The storage for the test entity type.
+   *
+   * @var \Drupal\Core\Entity\Sql\SqlContentEntityStorage
+   */
+  public $storage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('entity_test_mul');
+
+    $this->storage = $this->container->get('entity.manager')->getStorage('entity_test');
+
+    ConfigurableLanguage::createFromLangcode('it')->save();
+  }
+
+
+  /**
+   * Tests aggregate count feature.
+   */
+  public function testAggregateCount() {
+    $this->setupTestEntities();
+
+    $view = Views::getView('test_aggregate_count');
+    $this->executeView($view);
+
+    $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+
+    $types = array();
+    foreach ($view->result as $item) {
+      // num_records is a alias for id.
+      $types[$item->entity_test_name] = $item->num_records;
+    }
+
+    $this->assertEqual($types['name1'], 4, 'Groupby the name: name1 returned the expected amount of results.');
+    $this->assertEqual($types['name2'], 3, 'Groupby the name: name2 returned the expected amount of results.');
+  }
+
+  /**
+   * Provides a test helper which runs a view with some aggregation function.
+   *
+   * @param string|null $aggregation_function
+   *   Which aggregation function should be used, for example sum or count. If
+   *   NULL is passed the aggregation will be tested with no function.
+   * @param array $values
+   *   The expected views result.
+   */
+  public function groupByTestHelper($aggregation_function, $values) {
+    $this->setupTestEntities();
+
+    $view = Views::getView('test_group_by_count');
+    $view->setDisplay();
+    // There is no need for a function in order to have aggregation.
+    if (empty($aggregation_function)) {
+      // The test table has 2 fields ('id' and 'name'). We'll remove 'id'
+      // because it's unique and will test aggregation on 'name'.
+      unset($view->displayHandlers->get('default')->options['fields']['id']);
+    }
+    else {
+      $view->displayHandlers->get('default')->options['fields']['id']['group_type'] = $aggregation_function;
+    }
+
+    $this->executeView($view);
+
+    $this->assertEqual(count($view->result), 2, 'Make sure the count of items is right.');
+    // Group by name to identify the right count.
+    $results = array();
+    foreach ($view->result as $item) {
+      $results[$item->entity_test_name] = $item->id;
+    }
+    $this->assertEqual($results['name1'], $values[0], format_string('Aggregation with @aggregation_function and groupby name: name1 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
+    $this->assertEqual($results['name2'], $values[1], format_string('Aggregation with @aggregation_function and groupby name: name2 returned the expected amount of results', array('@aggregation_function' => $aggregation_function)));
+  }
+
+  /**
+   * Helper method that creates some test entities.
+   */
+  protected function setupTestEntities() {
+    // Create 4 entities with name1 and 3 entities with name2.
+    $entity_1 = array(
+      'name' => 'name1',
+    );
+
+    $this->storage->create($entity_1)->save();
+    $this->storage->create($entity_1)->save();
+    $this->storage->create($entity_1)->save();
+    $this->storage->create($entity_1)->save();
+
+    $entity_2 = array(
+      'name' => 'name2',
+    );
+    $this->storage->create($entity_2)->save();
+    $this->storage->create($entity_2)->save();
+    $this->storage->create($entity_2)->save();
+  }
+
+  /**
+   * Tests the count aggregation function.
+   */
+  public function testGroupByCount() {
+    $this->groupByTestHelper('count', array(4, 3));
+  }
+
+  /**
+   * Tests the sum aggregation function.
+   */
+  public function testGroupBySum() {
+    $this->groupByTestHelper('sum', array(10, 18));
+  }
+
+  /**
+   * Tests the average aggregation function.
+   */
+  public function testGroupByAverage() {
+    $this->groupByTestHelper('avg', array(2.5, 6));
+  }
+
+  /**
+   * Tests the min aggregation function.
+   */
+  public function testGroupByMin() {
+    $this->groupByTestHelper('min', array(1, 5));
+  }
+
+  /**
+   * Tests the max aggregation function.
+   */
+  public function testGroupByMax() {
+    $this->groupByTestHelper('max', array(4, 7));
+  }
+
+  /**
+   * Tests aggregation with no specific function.
+   */
+  public function testGroupByNone() {
+    $this->groupByTestHelper(NULL, array(1, 5));
+  }
+
+  /**
+   * Tests groupby with filters.
+   */
+  public function testGroupByCountOnlyFilters() {
+    // Check if GROUP BY and HAVING are included when a view
+    // doesn't display SUM, COUNT, MAX, etc. functions in SELECT statement.
+
+    for ($x = 0; $x < 10; $x++) {
+      $this->storage->create(array('name' => 'name1'))->save();
+    }
+
+    $view = Views::getView('test_group_by_in_filters');
+    $this->executeView($view);
+
+    $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY'), 'Make sure that GROUP BY is in the query');
+    $this->assertTrue(strpos($view->build_info['query'], 'HAVING'), 'Make sure that HAVING is in the query');
+  }
+
+  /**
+   * Tests grouping on base field.
+   */
+  public function testGroupByBaseField() {
+    $this->setupTestEntities();
+
+    $view = Views::getView('test_group_by_count');
+    $view->setDisplay();
+    // This tests that the GROUP BY portion of the query is properly formatted
+    // to include the base table to avoid ambiguous field errors.
+    $view->displayHandlers->get('default')->options['fields']['name']['group_type'] = 'min';
+    unset($view->displayHandlers->get('default')->options['fields']['id']['group_type']);
+    $this->executeView($view);
+    $this->assertTrue(strpos($view->build_info['query'], 'GROUP BY entity_test.id'), 'GROUP BY field includes the base table name when grouping on the base field.');
+  }
+
+  /**
+   * Tests grouping a field with cardinality > 1.
+   */
+  public function testGroupByFieldWithCardinality() {
+    $field_storage = FieldStorageConfig::create([
+      'type' => 'integer',
+      'field_name' => 'field_test',
+      'cardinality' => 4,
+      'entity_type' => 'entity_test_mul',
+    ]);
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test_mul',
+      'bundle' => 'entity_test_mul',
+    ]);
+    $field->save();
+
+    $entities = [];
+    $entity = EntityTestMul::create([
+      'field_test' => [1, 1, 1],
+    ]);
+    $entity->save();
+    $entities[] = $entity;
+
+    $entity = EntityTestMul::create([
+      'field_test' => [2, 2, 2],
+    ]);
+    $entity->save();
+    $entities[] = $entity;
+
+    $entity = EntityTestMul::create([
+      'field_test' => [2, 2, 2],
+    ]);
+    $entity->save();
+    $entities[] = $entity;
+
+    $view = Views::getView('test_group_by_count_multicardinality');
+    $this->executeView($view);
+    $this->assertEqual(2, count($view->result));
+
+    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('6', $view->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
+
+    $entities[2]->field_test[0]->value = 3;
+    $entities[2]->field_test[1]->value = 4;
+    $entities[2]->field_test[2]->value = 5;
+    $entities[2]->save();
+
+    $view = Views::getView('test_group_by_count_multicardinality');
+    $this->executeView($view);
+    $this->assertEqual(5, count($view->result));
+
+    $this->assertEqual('3', $view->getStyle()->getField(0, 'id'));
+    $this->assertEqual('1', $view->getStyle()->getField(0, 'field_test'));
+    $this->assertEqual('3', $view->getStyle()->getField(1, 'id'));
+    $this->assertEqual('2', $view->getStyle()->getField(1, 'field_test'));
+    $this->assertEqual('1', $view->getStyle()->getField(2, 'id'));
+    $this->assertEqual('3', $view->getStyle()->getField(2, 'field_test'));
+    $this->assertEqual('1', $view->getStyle()->getField(3, 'id'));
+    $this->assertEqual('4', $view->getStyle()->getField(3, 'field_test'));
+    $this->assertEqual('1', $view->getStyle()->getField(4, 'id'));
+    $this->assertEqual('5', $view->getStyle()->getField(4, 'field_test'));
+
+    // Check that translated values are correctly retrieved and are not grouped
+    // into the original entity.
+    $translation = $entity->addTranslation('it');
+    $translation->field_test = [6, 6, 6];
+    $translation->save();
+
+    $view = Views::getView('test_group_by_count_multicardinality');
+    $this->executeView($view);
+
+    $this->assertEqual(6, count($view->result));
+    $this->assertEqual('3', $view->getStyle()->getField(5, 'id'));
+    $this->assertEqual('6', $view->getStyle()->getField(5, 'field_test'));
+  }
+
+  /**
+   * Tests groupby with a field not existing on some bundle.
+   */
+  public function testGroupByWithFieldsNotExistingOnBundle() {
+    $field_storage = FieldStorageConfig::create([
+      'type' => 'integer',
+      'field_name' => 'field_test',
+      'cardinality' => 4,
+      'entity_type' => 'entity_test_mul',
+    ]);
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_name' => 'field_test',
+      'entity_type' => 'entity_test_mul',
+      'bundle' => 'entity_test_mul',
+    ]);
+    $field->save();
+
+    $entities = [];
+    $entity = EntityTestMul::create([
+      'field_test' => [1],
+      'type' => 'entity_test_mul',
+    ]);
+    $entity->save();
+    $entities[] = $entity;
+
+    $entity = EntityTestMul::create([
+      'type' => 'entity_test_mul2',
+    ]);
+    $entity->save();
+    $entities[] = $entity;
+
+    $view = Views::getView('test_group_by_field_not_within_bundle');
+    $this->executeView($view);
+
+    $this->assertEqual(2, count($view->result));
+    // The first result is coming from entity_test_mul2, so no field could be
+    // rendered.
+    $this->assertEqual('', $view->getStyle()->getField(0, 'field_test'));
+    // The second result is coming from entity_test_mul, so its field value
+    // could be rendered.
+    $this->assertEqual('1', $view->getStyle()->getField(1, 'field_test'));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php b/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
new file mode 100644
index 0000000..c7f07db
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
@@ -0,0 +1,308 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\RenderCacheIntegrationTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\views\Tests\AssertViewsCacheTagsTrait;
+use Drupal\views\Views;
+use Drupal\views\Entity\View;
+
+/**
+ * Tests the general integration between views and the render cache.
+ *
+ * @group views
+ */
+class RenderCacheIntegrationTest extends ViewsKernelTestBase {
+
+  use AssertViewsCacheTagsTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['test_view', 'test_display', 'entity_test_fields', 'entity_test_row'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'user', 'node'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
+  }
+
+  /**
+   * Tests a field-based view's cache tags when using the "none" cache plugin.
+   */
+  public function testFieldBasedViewCacheTagsWithCachePluginNone() {
+    $view = Views::getview('entity_test_fields');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'none',
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForFieldBasedView(FALSE);
+  }
+
+  /**
+   * Tests a field-based view's cache tags when using the "tag" cache plugin.
+   */
+  public function testFieldBasedViewCacheTagsWithCachePluginTag() {
+    $view = Views::getview('entity_test_fields');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'tag',
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForFieldBasedView(TRUE);
+  }
+
+  /**
+   * Tests a field-based view's cache tags when using the "time" cache plugin.
+   */
+  public function testFieldBasedViewCacheTagsWithCachePluginTime() {
+    $view = Views::getview('entity_test_fields');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'time',
+      'options' => [
+        'results_lifespan' => 3600,
+        'output_lifespan' => 3600,
+      ],
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForFieldBasedView(TRUE);
+  }
+
+  /**
+   * Tests cache tags on output & result cache items for a field-based view.
+   *
+   * @param bool $do_assert_views_caches
+   *   Whether to check Views' result & output caches.
+   */
+  protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) {
+    $this->pass('Checking cache tags for field-based view.');
+    $view = Views::getview('entity_test_fields');
+
+    // Empty result (no entities yet).
+    $this->pass('Test without entities');
+    $base_tags =  ['config:views.view.entity_test_fields', 'entity_test_list'];
+    $this->assertViewsCacheTags($view, $base_tags, $do_assert_views_caches, $base_tags);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $base_tags, $do_assert_views_caches);
+
+
+    // Non-empty result (1 entity).
+    /** @var \Drupal\Core\Entity\EntityInterface[] $entities */
+    $entities[] = $entity = EntityTest::create();
+    $entity->save();
+
+    $this->pass('Test with entities');
+    $tags_with_entity = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
+    $this->assertViewsCacheTags($view, $tags_with_entity, $do_assert_views_caches, $tags_with_entity);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_with_entity, $do_assert_views_caches);
+
+
+    // Paged result (more entities than the items-per-page limit).
+    for ($i = 0; $i < 5; $i++) {
+      $entities[] = $entity = EntityTest::create();
+      $entity->save();
+    }
+
+    // Page 1.
+    $this->pass('Test pager');
+    $this->pass('Page 1');
+    \Drupal::request()->query->set('page', 0);
+    $tags_page_1 = Cache::mergeTags($base_tags, $entities[1]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[2]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[3]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[4]->getCacheTags());
+    $tags_page_1 = Cache::mergeTags($tags_page_1, $entities[5]->getCacheTags());
+    $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
+    $view->destroy();
+    // Page 2.
+    $this->pass('Page 2');
+    $view->setCurrentPage(1);
+    \Drupal::request()->query->set('page', 1);
+    $tags_page_2 = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
+    $this->assertViewsCacheTags($view, $tags_page_2, $do_assert_views_caches, $tags_page_2);
+    $view->destroy();
+
+    // Ensure that invalidation works on both pages.
+    $this->pass('Page invalidations');
+    $this->pass('Page 2');
+    $view->setCurrentPage(1);
+    \Drupal::request()->query->set('page', 1);
+    $entities[0]->name->value = $random_name = $this->randomMachineName();
+    $entities[0]->save();
+    $build = $this->assertViewsCacheTags($view, $tags_page_2, $do_assert_views_caches, $tags_page_2);
+    // @todo Static render arrays don't support different pages yet, see
+    //   https://www.drupal.org/node/2500701.
+    // $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_2, $do_assert_views_caches);
+    $this->assertTrue(strpos($build['#markup'], $random_name) !== FALSE);
+    $view->destroy();
+
+    $this->pass('Page 1');
+    $view->setCurrentPage(0);
+    \Drupal::request()->query->set('page', 0);
+    $entities[1]->name->value = $random_name = $this->randomMachineName();
+    $entities[1]->save();
+    $build = $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_page_1, $do_assert_views_caches);
+    $this->assertTrue(strpos($build['#markup'], $random_name) !== FALSE);
+    $view->destroy();
+
+    // Setup arguments to ensure that render caching also varies by them.
+    $this->pass('Test arguments');
+
+    // Custom assert for a single result row.
+    $single_entity_assertions = function(array $build, EntityInterface $entity) {
+      $this->setRawContent($build['#markup']);
+
+      $result = $this->cssSelect('div.views-row');
+      $count = count($result);
+      $this->assertEqual($count, 1);
+
+      $this->assertEqual((string) $result[0]->div->span, (string) $entity->id());
+    };
+
+    // Execute the view once with a static renderable and one with a full
+    // prepared render array.
+    $tags_argument = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
+    $view->setArguments([$entities[0]->id()]);
+    $build = $this->assertViewsCacheTags($view, $tags_argument, $do_assert_views_caches, $tags_argument);
+    $single_entity_assertions($build, $entities[0]);
+
+    $view->setArguments([$entities[0]->id()]);
+    $build = $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags_argument, $do_assert_views_caches);
+    $single_entity_assertions($build, $entities[0]);
+
+    // Set a different argument and ensure that the result is different.
+    $tags2_argument = Cache::mergeTags($base_tags, $entities[1]->getCacheTags());
+    $view->setArguments([$entities[1]->id()]);
+    $build = $this->assertViewsCacheTagsFromStaticRenderArray($view, $tags2_argument, $do_assert_views_caches);
+    $single_entity_assertions($build, $entities[1]);
+
+    $view->destroy();
+  }
+
+  /**
+   * Tests a entity-based view's cache tags when using the "none" cache plugin.
+   */
+  public function testEntityBasedViewCacheTagsWithCachePluginNone() {
+    $view = Views::getview('entity_test_row');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'none',
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForEntityBasedView(FALSE);
+  }
+
+  /**
+   * Tests a entity-based view's cache tags when using the "tag" cache plugin.
+   */
+  public function testEntityBasedViewCacheTagsWithCachePluginTag() {
+    $view = Views::getview('entity_test_row');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'tag',
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForEntityBasedView(TRUE);
+  }
+
+  /**
+   * Tests a entity-based view's cache tags when using the "time" cache plugin.
+   */
+  public function testEntityBasedViewCacheTagsWithCachePluginTime() {
+    $view = Views::getview('entity_test_row');
+    $view->getDisplay()->overrideOption('cache', [
+      'type' => 'time',
+      'options' => [
+        'results_lifespan' => 3600,
+        'output_lifespan' => 3600,
+      ],
+    ]);
+    $view->save();
+
+    $this->assertCacheTagsForEntityBasedView(TRUE);
+  }
+
+  /**
+   * Tests cache tags on output & result cache items for an entity-based view.
+   */
+  protected function assertCacheTagsForEntityBasedView($do_assert_views_caches) {
+    $this->pass('Checking cache tags for entity-based view.');
+    $view = Views::getview('entity_test_row');
+
+    // Empty result (no entities yet).
+    $base_tags = $base_render_tags = ['config:views.view.entity_test_row', 'entity_test_list'];
+    $this->assertViewsCacheTags($view, $base_tags, $do_assert_views_caches, $base_tags);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $base_tags, $do_assert_views_caches);
+
+    // Non-empty result (1 entity).
+    $entities[] = $entity = EntityTest::create();
+    $entity->save();
+
+    $result_tags_with_entity = Cache::mergeTags($base_tags, $entities[0]->getCacheTags());
+    $render_tags_with_entity = Cache::mergeTags($base_render_tags, $entities[0]->getCacheTags());
+    $render_tags_with_entity = Cache::mergeTags($render_tags_with_entity, ['entity_test_view']);
+    $this->assertViewsCacheTags($view, $result_tags_with_entity, $do_assert_views_caches, $render_tags_with_entity);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_with_entity, $do_assert_views_caches);
+
+
+    // Paged result (more entities than the items-per-page limit).
+    for ($i = 0; $i < 5; $i++) {
+      $entities[] = $entity = EntityTest::create();
+      $entity->save();
+    }
+
+    $new_entities_cache_tags = Cache::mergeTags($entities[1]->getCacheTags(), $entities[2]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[3]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[4]->getCacheTags());
+    $new_entities_cache_tags = Cache::mergeTags($new_entities_cache_tags, $entities[5]->getCacheTags());
+    $result_tags_page_1 = Cache::mergeTags($base_tags, $new_entities_cache_tags);
+    $render_tags_page_1 = Cache::mergeTags($base_render_tags, $new_entities_cache_tags);
+    $render_tags_page_1 = Cache::mergeTags($render_tags_page_1, ['entity_test_view']);
+    $this->assertViewsCacheTags($view, $result_tags_page_1, $do_assert_views_caches, $render_tags_page_1);
+    $this->assertViewsCacheTagsFromStaticRenderArray($view, $render_tags_page_1, $do_assert_views_caches);
+  }
+
+  /**
+   * Ensure that the view renderable contains the cache contexts.
+   */
+  public function testBuildRenderableWithCacheContexts() {
+    $view = View::load('test_view');
+    $display =& $view->getDisplay('default');
+    $display['cache_metadata']['contexts'] = ['views_test_cache_context'];
+    $executable = $view->getExecutable();
+
+    $build = $executable->buildRenderable();
+    $this->assertEqual(['views_test_cache_context'], $build['#cache']['contexts']);
+  }
+
+  /**
+   * Ensures that saving a view calculates the cache contexts.
+   */
+  public function testViewAddCacheMetadata() {
+    $view = View::load('test_display');
+    $view->save();
+
+    $this->assertEqual(['languages:' . LanguageInterface::TYPE_CONTENT, 'languages:' . LanguageInterface::TYPE_INTERFACE, 'url.query_args', 'user.node_grants:view', 'user.permissions'], $view->getDisplay('default')['cache_metadata']['contexts']);
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/TokenReplaceTest.php b/core/modules/views/tests/src/Kernel/TokenReplaceTest.php
new file mode 100644
index 0000000..7f4f2fa
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/TokenReplaceTest.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\TokenReplaceTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\views\Views;
+
+/**
+ * Tests core view token replacement.
+ *
+ * @group views
+ */
+class TokenReplaceTest extends ViewsKernelTestBase {
+
+  public static $modules = array('system');
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_tokens');
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+    $this->container->get('router.builder')->rebuild();
+  }
+
+  /**
+   * Tests core token replacements generated from a view.
+   */
+  function testTokenReplacement() {
+    $token_handler = \Drupal::token();
+    $view = Views::getView('test_tokens');
+    $view->setDisplay('page_1');
+    $this->executeView($view);
+
+    $expected = array(
+      '[view:label]' => 'Test tokens',
+      '[view:description]' => 'Test view to token replacement tests.',
+      '[view:id]' => 'test_tokens',
+      '[view:title]' => 'Test token page',
+      '[view:url]' => $view->getUrl(NULL, 'page_1')->setAbsolute(TRUE)->toString(),
+      '[view:total-rows]' => (string) $view->total_rows,
+      '[view:base-table]' => 'views_test_data',
+      '[view:base-field]' => 'id',
+      '[view:items-per-page]' => '10',
+      '[view:current-page]' => '1',
+      '[view:page-count]' => '1',
+    );
+
+    $base_bubbleable_metadata = BubbleableMetadata::createFromObject($view->storage);
+    $metadata_tests = [];
+    $metadata_tests['[view:label]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:description]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:id]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:title]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:url]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:total-rows]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:base-table]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:base-field]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:items-per-page]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:current-page]'] = $base_bubbleable_metadata;
+    $metadata_tests['[view:page-count]'] = $base_bubbleable_metadata;
+
+    foreach ($expected as $token => $expected_output) {
+      $bubbleable_metadata = new BubbleableMetadata();
+      $output = $token_handler->replace($token, array('view' => $view), [], $bubbleable_metadata);
+      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+      $this->assertEqual($bubbleable_metadata, $metadata_tests[$token]);
+    }
+  }
+
+  /**
+   * Tests core token replacements generated from a view without results.
+   */
+  function testTokenReplacementNoResults() {
+    $token_handler = \Drupal::token();
+    $view = Views::getView('test_tokens');
+    $view->setDisplay('page_2');
+    $this->executeView($view);
+
+    $expected = array(
+      '[view:page-count]' => '1',
+    );
+
+    foreach ($expected as $token => $expected_output) {
+      $output = $token_handler->replace($token, array('view' => $view));
+      $this->assertIdentical($output, $expected_output, format_string('Token %token replaced correctly.', array('%token' => $token)));
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewExecutableTest.php b/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
new file mode 100644
index 0000000..db50c39
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ViewExecutableTest.php
@@ -0,0 +1,492 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ViewExecutableTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Component\Utility\Xss;
+use Drupal\node\Entity\NodeType;
+use Drupal\views\Entity\View;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+use Drupal\views\ViewExecutable;
+use Drupal\views\ViewExecutableFactory;
+use Drupal\views\DisplayPluginCollection;
+use Drupal\views\Plugin\views\display\DefaultDisplay;
+use Drupal\views\Plugin\views\display\Page;
+use Drupal\views\Plugin\views\style\DefaultStyle;
+use Drupal\views\Plugin\views\style\Grid;
+use Drupal\views\Plugin\views\row\Fields;
+use Drupal\views\Plugin\views\query\Sql;
+use Drupal\views\Plugin\views\pager\PagerPluginBase;
+use Drupal\views\Plugin\views\query\QueryPluginBase;
+use Drupal\views_test_data\Plugin\views\display\DisplayTest;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Tests the ViewExecutable class.
+ *
+ * @group views
+ * @see \Drupal\views\ViewExecutable
+ */
+class ViewExecutableTest extends ViewsKernelTestBase {
+
+  use CommentTestTrait;
+
+  public static $modules = ['system', 'node', 'comment', 'user', 'filter', 'field', 'text'];
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_destroy', 'test_executable_displays');
+
+  /**
+   * Properties that should be stored in the configuration.
+   *
+   * @var array
+   */
+  protected $configProperties = array(
+    'disabled',
+    'name',
+    'description',
+    'tag',
+    'base_table',
+    'label',
+    'core',
+    'display',
+  );
+
+  /**
+   * Properties that should be stored in the executable.
+   *
+   * @var array
+   */
+  protected $executableProperties = array(
+    'storage',
+    'built',
+    'executed',
+    'args',
+    'build_info',
+    'result',
+    'attachment_before',
+    'attachment_after',
+    'exposed_data',
+    'exposed_raw_input',
+    'old_view',
+    'parent_views',
+  );
+
+  protected function setUpFixtures() {
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installEntitySchema('comment');
+    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installConfig(array('system', 'field', 'node', 'comment'));
+
+    NodeType::create([
+      'type' => 'page',
+      'name' => 'Page',
+    ])->save();
+    $this->addDefaultCommentField('node', 'page');
+    parent::setUpFixtures();
+
+    $this->installConfig(array('filter'));
+  }
+
+  /**
+   * Tests the views.executable container service.
+   */
+  public function testFactoryService() {
+    $factory = $this->container->get('views.executable');
+    $this->assertTrue($factory instanceof ViewExecutableFactory, 'A ViewExecutableFactory instance was returned from the container.');
+    $view = entity_load('view', 'test_executable_displays');
+    $this->assertTrue($factory->get($view) instanceof ViewExecutable, 'A ViewExecutable instance was returned from the factory.');
+  }
+
+  /**
+   * Tests the initDisplay() and initHandlers() methods.
+   */
+  public function testInitMethods() {
+    $view = Views::getView('test_destroy');
+    $view->initDisplay();
+
+    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
+    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
+
+    $view->destroy();
+    $view->initHandlers();
+
+    // Check for all handler types.
+    $handler_types = array_keys(ViewExecutable::getHandlerTypes());
+    foreach ($handler_types as $type) {
+      // The views_test integration doesn't have relationships.
+      if ($type == 'relationship') {
+        continue;
+      }
+      $this->assertTrue(count($view->$type), format_string('Make sure a %type instance got instantiated.', array('%type' => $type)));
+    }
+
+    // initHandlers() should create display handlers automatically as well.
+    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'Make sure a reference to the current display handler is set.');
+    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay, 'Make sure a display handler is created for each display.');
+
+    $view_hash = spl_object_hash($view);
+    $display_hash = spl_object_hash($view->display_handler);
+
+    // Test the initStyle() method.
+    $view->initStyle();
+    $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'Make sure a reference to the style plugin is set.');
+    // Test the plugin has been inited and view have references to the view and
+    // display handler.
+    $this->assertEqual(spl_object_hash($view->style_plugin->view), $view_hash);
+    $this->assertEqual(spl_object_hash($view->style_plugin->displayHandler), $display_hash);
+
+    // Test the initQuery method().
+    $view->initQuery();
+    $this->assertTrue($view->query instanceof Sql, 'Make sure a reference to the query is set');
+    $this->assertEqual(spl_object_hash($view->query->view), $view_hash);
+    $this->assertEqual(spl_object_hash($view->query->displayHandler), $display_hash);
+
+    $view->destroy();
+
+    // Test the plugin  get methods.
+    $display_plugin = $view->getDisplay();
+    $this->assertTrue($display_plugin instanceof DefaultDisplay, 'An instance of DefaultDisplay was returned.');
+    $this->assertTrue($view->display_handler instanceof DefaultDisplay, 'The display_handler property has been set.');
+    $this->assertIdentical($display_plugin, $view->getDisplay(), 'The same display plugin instance was returned.');
+
+    $style_plugin = $view->getStyle();
+    $this->assertTrue($style_plugin instanceof DefaultStyle, 'An instance of DefaultStyle was returned.');
+    $this->assertTrue($view->style_plugin instanceof DefaultStyle, 'The style_plugin property has been set.');
+    $this->assertIdentical($style_plugin, $view->getStyle(), 'The same style plugin instance was returned.');
+
+    $pager_plugin = $view->getPager();
+    $this->assertTrue($pager_plugin instanceof PagerPluginBase, 'An instance of PagerPluginBase was returned.');
+    $this->assertTrue($view->pager instanceof PagerPluginBase, 'The pager property has been set.');
+    $this->assertIdentical($pager_plugin, $view->getPager(), 'The same pager plugin instance was returned.');
+
+    $query_plugin = $view->getQuery();
+    $this->assertTrue($query_plugin instanceof QueryPluginBase, 'An instance of QueryPluginBase was returned.');
+    $this->assertTrue($view->query instanceof QueryPluginBase, 'The query property has been set.');
+    $this->assertIdentical($query_plugin, $view->getQuery(), 'The same query plugin instance was returned.');
+  }
+
+  /**
+   * Tests the generation of the executable object.
+   */
+  public function testConstructing() {
+    Views::getView('test_destroy');
+  }
+
+  /**
+   * Tests the accessing of values on the object.
+   */
+  public function testProperties() {
+    $view = Views::getView('test_destroy');
+    foreach ($this->executableProperties as $property) {
+      $this->assertTrue(isset($view->{$property}));
+    }
+
+    // Per default exposed input should fall back to an empty array.
+    $this->assertEqual($view->getExposedInput(), []);
+  }
+
+  public function testSetDisplayWithInvalidDisplay() {
+    $view = Views::getView('test_executable_displays');
+    $view->initDisplay();
+
+    // Error is triggered while calling the wrong display.
+    $this->setExpectedException(\PHPUnit_Framework_Error::class);
+    $view->setDisplay('invalid');
+
+    $this->assertEqual($view->current_display, 'default', 'If setDisplay is called with an invalid display id the default display should be used.');
+    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
+  }
+
+  /**
+   * Tests the display related methods and properties.
+   */
+  public function testDisplays() {
+    $view = Views::getView('test_executable_displays');
+
+    // Tests Drupal\views\ViewExecutable::initDisplay().
+    $view->initDisplay();
+    $this->assertTrue($view->displayHandlers instanceof DisplayPluginCollection, 'The displayHandlers property has the right class.');
+    // Tests the classes of the instances.
+    $this->assertTrue($view->displayHandlers->get('default') instanceof DefaultDisplay);
+    $this->assertTrue($view->displayHandlers->get('page_1') instanceof Page);
+    $this->assertTrue($view->displayHandlers->get('page_2') instanceof Page);
+
+    // After initializing the default display is the current used display.
+    $this->assertEqual($view->current_display, 'default');
+    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
+
+    // All handlers should have a reference to the default display.
+    $this->assertEqual(spl_object_hash($view->displayHandlers->get('page_1')->default_display), spl_object_hash($view->displayHandlers->get('default')));
+    $this->assertEqual(spl_object_hash($view->displayHandlers->get('page_2')->default_display), spl_object_hash($view->displayHandlers->get('default')));
+
+    // Tests Drupal\views\ViewExecutable::setDisplay().
+    $view->setDisplay();
+    $this->assertEqual($view->current_display, 'default', 'If setDisplay is called with no parameter the default display should be used.');
+    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('default')));
+
+    // Set two different valid displays.
+    $view->setDisplay('page_1');
+    $this->assertEqual($view->current_display, 'page_1', 'If setDisplay is called with a valid display id the appropriate display should be used.');
+    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_1')));
+
+    $view->setDisplay('page_2');
+    $this->assertEqual($view->current_display, 'page_2', 'If setDisplay is called with a valid display id the appropriate display should be used.');
+    $this->assertEqual(spl_object_hash($view->display_handler), spl_object_hash($view->displayHandlers->get('page_2')));
+
+    // Destroy the view, so we can start again and test an invalid display.
+    $view->destroy();
+
+    // Test the style and row plugins are replaced correctly when setting the
+    // display.
+    $view->setDisplay('page_1');
+    $view->initStyle();
+    $this->assertTrue($view->style_plugin instanceof DefaultStyle);
+    $this->assertTrue($view->rowPlugin instanceof Fields);
+
+    $view->setDisplay('page_2');
+    $view->initStyle();
+    $this->assertTrue($view->style_plugin instanceof Grid);
+    // @todo Change this rowPlugin type too.
+    $this->assertTrue($view->rowPlugin instanceof Fields);
+
+    // Test the newDisplay() method.
+    $view = $this->container->get('entity.manager')->getStorage('view')->create(array('id' => 'test_executable_displays'));
+    $executable = $view->getExecutable();
+
+    $executable->newDisplay('page');
+    $executable->newDisplay('page');
+    $executable->newDisplay('display_test');
+
+    $this->assertTrue($executable->displayHandlers->get('default') instanceof DefaultDisplay);
+    $this->assertFalse(isset($executable->displayHandlers->get('default')->default_display));
+    $this->assertTrue($executable->displayHandlers->get('page_1') instanceof Page);
+    $this->assertTrue($executable->displayHandlers->get('page_1')->default_display instanceof DefaultDisplay);
+    $this->assertTrue($executable->displayHandlers->get('page_2') instanceof Page);
+    $this->assertTrue($executable->displayHandlers->get('page_2')->default_display instanceof DefaultDisplay);
+    $this->assertTrue($executable->displayHandlers->get('display_test_1') instanceof DisplayTest);
+    $this->assertTrue($executable->displayHandlers->get('display_test_1')->default_display instanceof DefaultDisplay);
+  }
+
+  /**
+   * Tests the setting/getting of properties.
+   */
+  public function testPropertyMethods() {
+    $view = Views::getView('test_executable_displays');
+
+    // Test the setAjaxEnabled() method.
+    $this->assertFalse($view->ajaxEnabled());
+    $view->setAjaxEnabled(TRUE);
+    $this->assertTrue($view->ajaxEnabled());
+
+    $view->setDisplay();
+    // There should be no pager set initially.
+    $this->assertNull($view->usePager());
+
+    // Add a pager, initialize, and test.
+    $view->displayHandlers->get('default')->overrideOption('pager', array(
+      'type' => 'full',
+      'options' => array('items_per_page' => 10),
+    ));
+    $view->initPager();
+    $this->assertTrue($view->usePager());
+
+    // Test setting and getting the offset.
+    $rand = rand();
+    $view->setOffset($rand);
+    $this->assertEqual($view->getOffset(), $rand);
+
+    // Test the getBaseTable() method.
+    $expected = array(
+      'views_test_data' => TRUE,
+      '#global' => TRUE,
+    );
+    $this->assertIdentical($view->getBaseTables(), $expected);
+
+    // Test response methods.
+    $this->assertTrue($view->getResponse() instanceof Response, 'New response object returned.');
+    $new_response = new Response();
+    $view->setResponse($new_response);
+    $this->assertIdentical(spl_object_hash($view->getResponse()), spl_object_hash($new_response), 'New response object correctly set.');
+
+    // Test the getPath() method.
+    $path = $this->randomMachineName();
+    $view->displayHandlers->get('page_1')->overrideOption('path', $path);
+    $view->setDisplay('page_1');
+    $this->assertEqual($view->getPath(), $path);
+    // Test the override_path property override.
+    $override_path = $this->randomMachineName();
+    $view->override_path = $override_path;
+    $this->assertEqual($view->getPath(), $override_path);
+
+    // Test the title methods.
+    $title = $this->randomString();
+    $view->setTitle($title);
+    $this->assertEqual($view->getTitle(), Xss::filterAdmin($title));
+  }
+
+  /**
+   * Tests the deconstructor to be sure that necessary objects are removed.
+   */
+  public function testDestroy() {
+    $view = Views::getView('test_destroy');
+
+    $view->preview();
+    $view->destroy();
+
+    $this->assertViewDestroy($view);
+  }
+
+  /**
+   * Asserts that expected view properties have been unset by destroy().
+   *
+   * @param \Drupal\views\ViewExecutable $view
+   */
+  protected function assertViewDestroy($view) {
+    $reflection = new \ReflectionClass($view);
+    $defaults = $reflection->getDefaultProperties();
+    // The storage and user should remain.
+    unset($defaults['storage'], $defaults['user'], $defaults['request'], $defaults['routeProvider']);
+
+    foreach ($defaults as $property => $default) {
+      $this->assertIdentical($this->getProtectedProperty($view, $property), $default);
+    }
+  }
+
+  /**
+   * Returns a protected property from a class instance.
+   *
+   * @param object $instance
+   *   The class instance to return the property from.
+   * @param string $property
+   *   The name of the property to return.
+   *
+   * @return mixed
+   *   The instance property value.
+   */
+  protected function getProtectedProperty($instance, $property) {
+    $reflection = new \ReflectionProperty($instance, $property);
+    $reflection->setAccessible(TRUE);
+    return $reflection->getValue($instance);
+  }
+
+  /**
+   * Tests ViewExecutable::getHandlerTypes().
+   */
+  public function testGetHandlerTypes() {
+    $types = ViewExecutable::getHandlerTypes();
+    foreach (array('field', 'filter', 'argument', 'sort', 'header', 'footer', 'empty') as $type) {
+      $this->assertTrue(isset($types[$type]));
+      // @todo The key on the display should be footers, headers and empties
+      //   or something similar instead of the singular, but so long check for
+      //   this special case.
+      if (isset($types[$type]['type']) && $types[$type]['type'] == 'area') {
+        $this->assertEqual($types[$type]['plural'], $type);
+      }
+      else {
+        $this->assertEqual($types[$type]['plural'], $type . 's');
+      }
+    }
+  }
+
+  /**
+   * Tests ViewExecutable::getHandlers().
+   */
+  public function testGetHandlers() {
+    $view = Views::getView('test_executable_displays');
+    $view->setDisplay('page_1');
+
+    $view->getHandlers('field', 'page_2');
+
+    // getHandlers() shouldn't change the active display.
+    $this->assertEqual('page_1', $view->current_display, "The display shouldn't change after getHandlers()");
+  }
+
+  /**
+   * Tests the validation of display handlers.
+   */
+  public function testValidate() {
+    $view = Views::getView('test_executable_displays');
+    $view->setDisplay('page_1');
+
+    $validate = $view->validate();
+
+    // Validating a view shouldn't change the active display.
+    $this->assertEqual('page_1', $view->current_display, "The display should be constant while validating");
+
+    $count = 0;
+    foreach ($view->displayHandlers as $id => $display) {
+      $match = function($value) use ($display) {
+        return strpos($value, $display->display['display_title']) !== false;
+      };
+      $this->assertTrue(array_filter($validate[$id], $match), format_string('Error message found for @id display', array('@id' => $id)));
+      $count++;
+    }
+
+    $this->assertEqual(count($view->displayHandlers), $count, 'Error messages from all handlers merged.');
+
+    // Test that a deleted display is not included.
+    $display = &$view->storage->getDisplay('default');
+    $display['deleted'] = TRUE;
+    $validate_deleted = $view->validate();
+
+    $this->assertNotIdentical($validate, $validate_deleted, 'Master display has not been validated.');
+  }
+
+  /**
+   * Tests that nested loops of the display handlers won't break validation.
+   */
+  public function testValidateNestedLoops() {
+    $view = View::create(['id' => 'test_validate_nested_loops']);
+    $executable = $view->getExecutable();
+
+    $executable->newDisplay('display_test');
+    $executable->newDisplay('display_test');
+    $errors = $executable->validate();
+    $total_error_count = array_reduce($errors, function ($carry, $item) {
+      $carry += count($item);
+
+      return $carry;
+    });
+    // Assert that there were 9 total errors across 3 displays.
+    $this->assertIdentical(9, $total_error_count);
+    $this->assertIdentical(3, count($errors));
+  }
+
+  /**
+   * Tests serialization of the ViewExecutable object.
+   */
+  public function testSerialization() {
+    $view = Views::getView('test_executable_displays');
+    $view->setDisplay('page_1');
+    $view->setArguments(['test']);
+    $view->setCurrentPage(2);
+
+    $serialized = serialize($view);
+
+    // Test the view storage object is not present in the actual serialized
+    // string.
+    $this->assertIdentical(strpos($serialized, '"Drupal\views\Entity\View"'), FALSE, 'The Drupal\views\Entity\View class was not found in the serialized string.');
+
+    /** @var \Drupal\views\ViewExecutable $unserialized */
+    $unserialized = unserialize($serialized);
+
+    $this->assertTrue($unserialized instanceof ViewExecutable);
+    $this->assertIdentical($view->storage->id(), $unserialized->storage->id(), 'The expected storage entity was loaded on the unserialized view.');
+    $this->assertIdentical($unserialized->current_display, 'page_1', 'The expected display was set on the unserialized view.');
+    $this->assertIdentical($unserialized->args, ['test'], 'The expected argument was set on the unserialized view.');
+    $this->assertIdentical($unserialized->getCurrentPage(), 2, 'The expected current page was set on the unserialized view.');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewStorageTest.php b/core/modules/views/tests/src/Kernel/ViewStorageTest.php
new file mode 100644
index 0000000..0a8c07b
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ViewStorageTest.php
@@ -0,0 +1,356 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ViewStorageTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\views\Entity\View;
+use Drupal\views\Plugin\views\display\Page;
+use Drupal\views\Views;
+
+/**
+ * Tests the CRUD functionality for a view.
+ *
+ * @group views
+ * @see \Drupal\views\Entity\View
+ * @see \Drupal\Core\Config\Entity\ConfigEntityStorage
+ */
+class ViewStorageTest extends ViewsKernelTestBase {
+
+  /**
+   * Properties that should be stored in the configuration.
+   *
+   * @var array
+   */
+  protected $configProperties = array(
+    'status',
+    'module',
+    'id',
+    'description',
+    'tag',
+    'base_table',
+    'label',
+    'core',
+    'display',
+  );
+
+  /**
+   * The entity type definition.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
+  protected $entityType;
+
+  /**
+   * The configuration entity storage.
+   *
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage
+   */
+  protected $controller;
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view_storage');
+
+  /**
+   * Tests CRUD operations.
+   */
+  function testConfigurationEntityCRUD() {
+    // Get the configuration entity type and controller.
+    $this->entityType = \Drupal::entityManager()->getDefinition('view');
+    $this->controller = $this->container->get('entity.manager')->getStorage('view');
+
+    // Confirm that an info array has been returned.
+    $this->assertTrue($this->entityType instanceof EntityTypeInterface, 'The View info array is loaded.');
+
+    // CRUD tests.
+    $this->loadTests();
+    $this->createTests();
+    $this->displayTests();
+
+    // Helper method tests
+    $this->displayMethodTests();
+  }
+
+  /**
+   * Tests loading configuration entities.
+   */
+  protected function loadTests() {
+    $view = entity_load('view', 'test_view_storage');
+    $data = $this->config('views.view.test_view_storage')->get();
+
+    // Confirm that an actual view object is loaded and that it returns all of
+    // expected properties.
+    $this->assertTrue($view instanceof View, 'Single View instance loaded.');
+    foreach ($this->configProperties as $property) {
+      $this->assertTrue($view->get($property) !== NULL, format_string('Property: @property loaded onto View.', array('@property' => $property)));
+    }
+
+    // Check the displays have been loaded correctly from config display data.
+    $expected_displays = array('default', 'block_1', 'page_1');
+    $this->assertEqual(array_keys($view->get('display')), $expected_displays, 'The correct display names are present.');
+
+    // Check each ViewDisplay object and confirm that it has the correct key and
+    // property values.
+    foreach ($view->get('display') as $key => $display) {
+      $this->assertEqual($key, $display['id'], 'The display has the correct ID assigned.');
+
+      // Get original display data and confirm that the display options array
+      // exists.
+      $original_options = $data['display'][$key];
+      foreach ($original_options as $orig_key => $value) {
+        $this->assertIdentical($display[$orig_key], $value, format_string('@key is identical to saved data', array('@key' => $key)));
+      }
+    }
+
+    // Make sure that loaded default views get a UUID.
+    $view = Views::getView('test_view_storage');
+    $this->assertTrue($view->storage->uuid());
+  }
+
+  /**
+   * Tests creating configuration entities.
+   */
+  protected function createTests() {
+    // Create a new View instance with empty values.
+    $created = $this->controller->create(array());
+
+    $this->assertTrue($created instanceof View, 'Created object is a View.');
+    // Check that the View contains all of the properties.
+    foreach ($this->configProperties as $property) {
+      $this->assertTrue(property_exists($created, $property), format_string('Property: @property created on View.', array('@property' => $property)));
+    }
+
+    // Create a new View instance with config values.
+    $values = $this->config('views.view.test_view_storage')->get();
+    $values['id'] = 'test_view_storage_new';
+    unset($values['uuid']);
+    $created = $this->controller->create($values);
+
+    $this->assertTrue($created instanceof View, 'Created object is a View.');
+    // Check that the View contains all of the properties.
+    $properties = $this->configProperties;
+    // Remove display from list.
+    array_pop($properties);
+
+    // Test all properties except displays.
+    foreach ($properties as $property) {
+      $this->assertTrue($created->get($property) !== NULL, format_string('Property: @property created on View.', array('@property' => $property)));
+      $this->assertIdentical($values[$property], $created->get($property), format_string('Property value: @property matches configuration value.', array('@property' => $property)));
+    }
+
+    // Check the UUID of the loaded View.
+    $created->save();
+    $created_loaded = entity_load('view', 'test_view_storage_new');
+    $this->assertIdentical($created->uuid(), $created_loaded->uuid(), 'The created UUID has been saved correctly.');
+  }
+
+  /**
+   * Tests adding, saving, and loading displays on configuration entities.
+   */
+  protected function displayTests() {
+    // Check whether a display can be added and saved to a View.
+    $view = entity_load('view', 'test_view_storage_new');
+
+    $new_id = $view->addDisplay('page', 'Test', 'test');
+    $display = $view->get('display');
+
+    // Ensure the right display_plugin is created/instantiated.
+    $this->assertEqual($display[$new_id]['display_plugin'], 'page', 'New page display "test" uses the right display plugin.');
+
+    $executable = $view->getExecutable();
+    $executable->initDisplay();
+    $this->assertTrue($executable->displayHandlers->get($new_id) instanceof Page, 'New page display "test" uses the right display plugin.');
+
+    // To save this with a new ID, we should use createDuplicate().
+    $view = $view->createDuplicate();
+    $view->set('id', 'test_view_storage_new_new2');
+    $view->save();
+    $values = $this->config('views.view.test_view_storage_new_new2')->get();
+
+    $this->assertTrue(isset($values['display']['test']) && is_array($values['display']['test']), 'New display was saved.');
+  }
+
+  /**
+   * Tests the display related functions like getDisplaysList().
+   */
+  protected function displayMethodTests() {
+    $config['display'] = array(
+      'page_1' => array(
+        'display_options' => array('path' => 'test'),
+        'display_plugin' => 'page',
+        'id' => 'page_2',
+        'display_title' => 'Page 1',
+        'position' => 1
+      ),
+      'feed_1' => array(
+        'display_options' => array('path' => 'test.xml'),
+        'display_plugin' => 'feed',
+        'id' => 'feed',
+        'display_title' => 'Feed',
+        'position' => 2
+      ),
+      'page_2' => array(
+        'display_options' => array('path' => 'test/%/extra'),
+        'display_plugin' => 'page',
+        'id' => 'page_2',
+        'display_title' => 'Page 2',
+        'position' => 3
+      )
+    );
+    $view = $this->controller->create($config);
+
+    // Tests Drupal\views\Entity\View::addDisplay()
+    $view = $this->controller->create(array());
+    $random_title = $this->randomMachineName();
+
+    $id = $view->addDisplay('page', $random_title);
+    $this->assertEqual($id, 'page_1', format_string('Make sure the first display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_1')));
+    $display = $view->get('display');
+    $this->assertEqual($display[$id]['display_title'], $random_title);
+
+    $random_title = $this->randomMachineName();
+    $id = $view->addDisplay('page', $random_title);
+    $display = $view->get('display');
+    $this->assertEqual($id, 'page_2', format_string('Make sure the second display (%id_new) has the expected ID (%id)', array('%id_new' => $id, '%id' => 'page_2')));
+    $this->assertEqual($display[$id]['display_title'], $random_title);
+
+    $id = $view->addDisplay('page');
+    $display = $view->get('display');
+    $this->assertEqual($display[$id]['display_title'], 'Page 3');
+
+    // Ensure the 'default' display always has position zero, regardless of when
+    // it was set relative to other displays. Even if the 'default' display
+    // exists, adding it again will overwrite it, which is asserted with the new
+    // title.
+    $view->addDisplay('default', $random_title);
+    $displays = $view->get('display');
+    $this->assertEqual($displays['default']['display_title'], $random_title, 'Default display is defined with the new title');
+    $this->assertEqual($displays['default']['position'], 0, 'Default displays are always in position zero');
+
+    // Tests Drupal\views\Entity\View::generateDisplayId(). Since
+    // generateDisplayId() is protected, we have to use reflection to unit-test
+    // it.
+    $view = $this->controller->create(array());
+    $ref_generate_display_id = new \ReflectionMethod($view, 'generateDisplayId');
+    $ref_generate_display_id->setAccessible(TRUE);
+    $this->assertEqual(
+      $ref_generate_display_id->invoke($view, 'default'),
+      'default',
+      'The plugin ID for default is always default.'
+    );
+    $this->assertEqual(
+      $ref_generate_display_id->invoke($view, 'feed'),
+      'feed_1',
+      'The generated ID for the first instance of a plugin type should have an suffix of _1.'
+    );
+    $view->addDisplay('feed', 'feed title');
+    $this->assertEqual(
+      $ref_generate_display_id->invoke($view, 'feed'),
+      'feed_2',
+      'The generated ID for the first instance of a plugin type should have an suffix of _2.'
+    );
+
+    // Tests item related methods().
+    $view = $this->controller->create(array('base_table' => 'views_test_data'));
+    $view->addDisplay('default');
+    $view = $view->getExecutable();
+
+    $display_id = 'default';
+    $expected_items = array();
+    // Tests addHandler with getItem.
+    // Therefore add one item without any options and one item with some
+    // options.
+    $id1 = $view->addHandler($display_id, 'field', 'views_test_data', 'id');
+    $item1 = $view->getHandler($display_id, 'field', 'id');
+    $expected_items[$id1] = $expected_item = array(
+      'id' => 'id',
+      'table' => 'views_test_data',
+      'field' => 'id',
+      'plugin_id' => 'numeric',
+    );
+    $this->assertEqual($item1, $expected_item);
+
+    $options = array(
+      'alter' => array(
+        'text' => $this->randomMachineName()
+      )
+    );
+    $id2 = $view->addHandler($display_id, 'field', 'views_test_data', 'name', $options);
+    $item2 = $view->getHandler($display_id, 'field', 'name');
+    $expected_items[$id2] = $expected_item = array(
+      'id' => 'name',
+      'table' => 'views_test_data',
+      'field' => 'name',
+      'plugin_id' => 'standard',
+    ) + $options;
+    $this->assertEqual($item2, $expected_item);
+
+    // Tests the expected fields from the previous additions.
+    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
+
+    // Alter an existing item via setItem and check the result via getItem
+    // and getItems.
+    $item = array(
+      'alter' => array(
+        'text' => $this->randomMachineName(),
+      )
+    ) + $item1;
+    $expected_items[$id1] = $item;
+    $view->setHandler($display_id, 'field', $id1, $item);
+    $this->assertEqual($view->getHandler($display_id, 'field', 'id'), $item);
+    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
+
+    // Test removeItem method.
+    unset($expected_items[$id2]);
+    $view->removeHandler($display_id, 'field', $id2);
+    $this->assertEqual($view->getHandlers('field', $display_id), $expected_items);
+  }
+
+  /**
+   * Tests the createDuplicate() View method.
+   */
+  public function testCreateDuplicate() {
+    $view = Views::getView('test_view_storage');
+    $copy = $view->storage->createDuplicate();
+
+    $this->assertTrue($copy instanceof View, 'The copied object is a View.');
+
+    // Check that the original view and the copy have different UUIDs.
+    $this->assertNotIdentical($view->storage->uuid(), $copy->uuid(), 'The copied view has a new UUID.');
+
+    // Check the 'name' (ID) is using the View objects default value (NULL) as it
+    // gets unset.
+    $this->assertIdentical($copy->id(), NULL, 'The ID has been reset.');
+
+    // Check the other properties.
+    // @todo Create a reusable property on the base test class for these?
+    $config_properties = array(
+      'disabled',
+      'description',
+      'tag',
+      'base_table',
+      'label',
+      'core',
+    );
+
+    foreach ($config_properties as $property) {
+      $this->assertIdentical($view->storage->get($property), $copy->get($property), format_string('@property property is identical.', array('@property' => $property)));
+    }
+
+    // Check the displays are the same.
+    $copy_display = $copy->get('display');
+    foreach ($view->storage->get('display') as $id => $display) {
+      // assertIdentical will not work here.
+      $this->assertEqual($display, $copy_display[$id], format_string('The @display display has been copied correctly.', array('@display' => $id)));
+    }
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php b/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php
new file mode 100644
index 0000000..25db7d9
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ViewsConfigDependenciesIntegrationTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ViewsConfigDependenciesIntegrationTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\image\Entity\ImageStyle;
+use Drupal\views\Entity\View;
+
+/**
+ * Tests integration of views with other modules.
+ *
+ * @group views
+ */
+class ViewsConfigDependenciesIntegrationTest extends ViewsKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['field', 'file', 'image', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $testViews = ['entity_test_fields'];
+
+  /**
+   * Tests integration with image module.
+   */
+  public function testImage() {
+    /** @var \Drupal\image\ImageStyleInterface $style */
+    $style = ImageStyle::create(['name' => 'foo']);
+    $style->save();
+
+    // Create a new image field 'bar' to be used in 'entity_test_fields' view.
+    FieldStorageConfig::create([
+      'entity_type' => 'entity_test',
+      'field_name' => 'bar',
+      'type' => 'image',
+    ])->save();
+    FieldConfig::create([
+      'entity_type' => 'entity_test',
+      'bundle' => 'entity_test',
+      'field_name' => 'bar',
+    ])->save();
+
+    /** @var \Drupal\views\ViewEntityInterface $view */
+    $view = View::load('entity_test_fields');
+    $display =& $view->getDisplay('default');
+
+    // Add the 'bar' image field to 'entity_test_fields' view.
+    $display['display_options']['fields']['bar'] = [
+      'id' => 'bar',
+      'field' => 'bar',
+      'plugin_id' => 'field',
+      'table' => 'entity_test__bar',
+      'entity_type' => 'entity_test',
+      'entity_field' => 'bar',
+      'type' => 'image',
+      'settings' => ['image_style' => 'foo', 'image_link' => ''],
+    ];
+    $view->save();
+
+    $dependencies = $view->getDependencies() + ['config' => []];
+
+    // Checks that style 'foo' is a dependency of view 'entity_test_fields'.
+    $this->assertTrue(in_array('image.style.foo', $dependencies['config']));
+
+    // Delete the 'foo' image style.
+    $style->delete();
+
+    // Checks that the view has been deleted too.
+    $this->assertNull(View::load('entity_test_fields'));
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewsHooksTest.php b/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
new file mode 100644
index 0000000..1c59604
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
@@ -0,0 +1,123 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ViewsHooksTest.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Render\RenderContext;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views\Views;
+
+/**
+ * Tests that views hooks are registered when defined in $module.views.inc.
+ *
+ * @group views
+ * @see views_hook_info().
+ * @see field_hook_info().
+ */
+class ViewsHooksTest extends ViewsKernelTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  /**
+   * An array of available views hooks to test.
+   *
+   * @var array
+   */
+  protected static $hooks = array (
+    'views_data' => 'all',
+    'views_data_alter' => 'alter',
+    'views_query_substitutions' => 'view',
+    'views_form_substitutions' => 'view',
+    'views_analyze' => 'view',
+    'views_pre_view' => 'view',
+    'views_pre_build' => 'view',
+    'views_post_build' => 'view',
+    'views_pre_execute' => 'view',
+    'views_post_execute' => 'view',
+    'views_pre_render' => 'view',
+    'views_post_render' => 'view',
+    'views_query_alter'  => 'view',
+    'views_invalidate_cache' => 'all',
+  );
+
+  /**
+   * The module handler to use for invoking hooks.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->moduleHandler = $this->container->get('module_handler');
+  }
+
+  /**
+   * Tests the hooks.
+   */
+  public function testHooks() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    // Test each hook is found in the implementations array and is invoked.
+    foreach (static::$hooks as $hook => $type) {
+      $this->assertTrue($this->moduleHandler->implementsHook('views_test_data', $hook), format_string('The hook @hook was registered.', array('@hook' => $hook)));
+
+      if ($hook == 'views_post_render') {
+        $this->moduleHandler->invoke('views_test_data', $hook, array($view, &$view->display_handler->output, $view->display_handler->getPlugin('cache')));
+        continue;
+      }
+
+      switch ($type) {
+        case 'view':
+          $this->moduleHandler->invoke('views_test_data', $hook, array($view));
+          break;
+
+        case 'alter':
+          $data = array();
+          $this->moduleHandler->invoke('views_test_data', $hook, array($data));
+          break;
+
+        default:
+          $this->moduleHandler->invoke('views_test_data', $hook);
+      }
+
+      $this->assertTrue($this->container->get('state')->get('views_hook_test_' . $hook), format_string('The %hook hook was invoked.', array('%hook' => $hook)));
+      // Reset the module implementations cache, so we ensure that the
+      // .views.inc file is loaded actively.
+      $this->moduleHandler->resetImplementations();
+    }
+  }
+
+  /**
+   * Tests how hook_views_form_substitutions() makes substitutions.
+   *
+   * @see views_test_data_views_form_substitutions()
+   * @see views_pre_render_views_form_views_form()
+   */
+  public function testViewsPreRenderViewsFormViewsForm() {
+    $element = [
+      'output' => [
+        '#plain_text' => '<!--will-be-escaped--><!--will-be-not-escaped-->',
+      ],
+      '#substitutions' => ['#value' => []],
+    ];
+    $element = \Drupal::service('renderer')->executeInRenderContext(new RenderContext(), function() use ($element) {
+      return views_pre_render_views_form_views_form($element);
+    });
+    $this->setRawContent((string) $element['output']['#markup']);
+    $this->assertEscaped('<em>escaped</em>');
+    $this->assertRaw('<em>unescaped</em>');
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
new file mode 100644
index 0000000..9d6e47a
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\ViewsKernelTestBase.
+ */
+
+namespace Drupal\Tests\views\Kernel;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\SelectInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\views\Tests\ViewResultAssertionTrait;
+use Drupal\views\Tests\ViewTestData;
+
+/**
+ * Defines a base class for Views kernel testing.
+ */
+class ViewsKernelTestBase extends KernelTestBase {
+
+  use ViewResultAssertionTrait;
+
+  /**
+   * Views to be enabled.
+   *
+   * Test classes should override this property and provide the list of testing
+   * views.
+   *
+   * @var array
+   */
+  public static $testViews = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system', 'views', 'views_test_config', 'views_test_data', 'user'];
+
+  /**
+   * {@inheritdoc}
+   *
+   * @param bool $import_test_views
+   *   Should the views specified on the test class be imported. If you need
+   *   to setup some additional stuff, like fields, you need to call false and
+   *   then call createTestViews for your own.
+   */
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installSchema('system', ['router', 'sequences', 'key_value_expire']);
+    $this->setUpFixtures();
+
+    if ($import_test_views) {
+      ViewTestData::createTestViews(get_class($this), ['views_test_config']);
+    }
+  }
+  /**
+   * Sets up the configuration and schema of views and views_test_data modules.
+   *
+   * Because the schema of views_test_data.module is dependent on the test
+   * using it, it cannot be enabled normally.
+   */
+  protected function setUpFixtures() {
+    // First install the system module. Many Views have Page displays have menu
+    // links, and for those to work, the system menus must already be present.
+    $this->installConfig(['system']);
+
+    /** @var \Drupal\Core\State\StateInterface $state */
+    $state = $this->container->get('state');
+    // Define the schema and views data variable before enabling the test module.
+    $state->set('views_test_data_schema', $this->schemaDefinition());
+    $state->set('views_test_data_views_data', $this->viewsData());
+
+    $this->installConfig(['views', 'views_test_config', 'views_test_data']);
+    foreach ($this->schemaDefinition() as $table => $schema) {
+      $this->installSchema('views_test_data', $table);
+    }
+
+    $this->container->get('router.builder')->rebuild();
+
+    // Load the test dataset.
+    $data_set = $this->dataSet();
+    $query = Database::getConnection()->insert('views_test_data')
+      ->fields(array_keys($data_set[0]));
+    foreach ($data_set as $record) {
+      $query->values($record);
+    }
+    $query->execute();
+  }
+
+  /**
+   * Orders a nested array containing a result set based on a given column.
+   *
+   * @param array $result_set
+   *   An array of rows from a result set, with each row as an associative
+   *   array keyed by column name.
+   * @param string $column
+   *   The column name by which to sort the result set.
+   * @param bool $reverse
+   *   (optional) Boolean indicating whether to sort the result set in reverse
+   *   order. Defaults to FALSE.
+   *
+   * @return array
+   *   The sorted result set.
+   */
+  protected function orderResultSet($result_set, $column, $reverse = FALSE) {
+    $order = $reverse ? -1 : 1;
+    usort($result_set, function ($a, $b) use ($column, $order) {
+      if ($a[$column] == $b[$column]) {
+        return 0;
+      }
+      return $order * (($a[$column] < $b[$column]) ? -1 : 1);
+    });
+    return $result_set;
+  }
+
+  /**
+   * Executes a view with debugging.
+   *
+   * @param \Drupal\views\ViewExecutable $view
+   *   The view object.
+   * @param array $args
+   *   (optional) An array of the view arguments to use for the view.
+   */
+  protected function executeView($view, array $args = []) {
+    $view->setDisplay();
+    $view->preExecute($args);
+    $view->execute();
+    $verbose_message = '<pre>Executed view: ' . ((string) $view->build_info['query']). '</pre>';
+    if ($view->build_info['query'] instanceof SelectInterface) {
+      $verbose_message .= '<pre>Arguments: ' . print_r($view->build_info['query']->getArguments(), TRUE) . '</pre>';
+    }
+    $this->verbose($verbose_message);
+  }
+
+  /**
+   * Returns the schema definition.
+   */
+  protected function schemaDefinition() {
+    return ViewTestData::schemaDefinition();
+  }
+
+  /**
+   * Returns the views data definition.
+   */
+  protected function viewsData() {
+    return ViewTestData::viewsData();
+  }
+
+  /**
+   * Returns a very simple test dataset.
+   */
+  protected function dataSet() {
+    return ViewTestData::dataSet();
+  }
+
+}
diff --git a/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
new file mode 100644
index 0000000..ccc5e40
--- /dev/null
+++ b/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views\Kernel\Wizard\WizardPluginBaseKernelTest.
+ */
+
+namespace Drupal\Tests\views\Kernel\Wizard;
+
+use Drupal\Core\Form\FormState;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views_ui\ViewUI;
+
+/**
+ * Tests the wizard base plugin class.
+ *
+ * @group views
+ * @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
+ */
+class WizardPluginBaseKernelTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('language', 'system', 'user', 'views_ui');
+
+  /**
+   * Contains thw wizard plugin manager.
+   *
+   * @var \Drupal\views\Plugin\views\wizard\WizardPluginBase
+   */
+  protected $wizard;
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+
+    $this->installConfig(array('language'));
+
+    $this->wizard = $this->container->get('plugin.manager.views.wizard')->createInstance('standard:views_test_data', array());
+  }
+
+  /**
+   * Tests the creating of a view.
+   *
+   * @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
+   */
+  public function testCreateView() {
+    $form = array();
+    $form_state = new FormState();
+    $form = $this->wizard->buildForm($form, $form_state);
+    $random_id = strtolower($this->randomMachineName());
+    $random_label = $this->randomMachineName();
+    $random_description = $this->randomMachineName();
+
+    // Add a new language and mark it as default.
+    ConfigurableLanguage::createFromLangcode('it')->save();
+    $this->config('system.site')->set('default_langcode', 'it')->save();
+
+    $form_state->setValues([
+      'id' => $random_id,
+      'label' => $random_label,
+      'description' => $random_description,
+      'base_table' => 'views_test_data',
+    ]);
+
+    $this->wizard->validateView($form, $form_state);
+    $view = $this->wizard->createView($form, $form_state);
+    $this->assertTrue($view instanceof ViewUI, 'The created view is a ViewUI object.');
+    $this->assertEqual($view->get('id'), $random_id);
+    $this->assertEqual($view->get('label'), $random_label);
+    $this->assertEqual($view->get('description'), $random_description);
+    $this->assertEqual($view->get('base_table'), 'views_test_data');
+    $this->assertEqual($view->get('langcode'), 'it');
+  }
+}
+
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index 67771b5..e6d8f9f 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -94,6 +94,7 @@ protected function setUp() {
       'id' => 'entity_test',
       'label' => 'Entity test',
       'entity_keys' => [
+        'uuid' => 'uuid',
         'id' => 'id',
         'langcode' => 'langcode',
         'bundle' => 'type',
@@ -991,4 +992,3 @@ function t($string, array $args = []) {
     }
   }
 }
-
diff --git a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
index 785028c..0245e3f5 100644
--- a/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
@@ -7,9 +7,15 @@
 
 namespace Drupal\Tests\views\Unit\Plugin\area;
 
+use Drupal\Core\Routing\RouteProviderInterface;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\Tests\UnitTestCase;
+use Drupal\views\Entity\View;
+use Drupal\views\Plugin\views\pager\PagerPluginBase;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\area\Result;
+use Drupal\views\ViewsData;
+use Prophecy\Argument;
 
 /**
  * @coversDefaultClass \Drupal\views\Plugin\views\area\Result
@@ -34,22 +40,16 @@ class ResultTest extends UnitTestCase {
   protected function setUp() {
     parent::setUp();
 
-    $storage = $this->getMockBuilder('Drupal\views\Entity\View')
-      ->disableOriginalConstructor()
-      ->setMethods(array('label'))
-      ->getMock();
-    $storage->expects($this->any())
-      ->method('label')
-      ->will($this->returnValue('ResultTest'));
-
-    $user = $this->getMock('Drupal\Core\Session\AccountInterface');
-    $views_data = $this->getMockBuilder('Drupal\views\ViewsData')
-      ->disableOriginalConstructor()
-      ->getMock();
-    $route_provider = $this->getMock('Drupal\Core\Routing\RouteProviderInterface');
-    $this->view = new ViewExecutable($storage, $user, $views_data, $route_provider);
-
-    $this->resultHandler = new Result(array(), 'result', array());
+    $storage = $this->prophesize(View::class);
+    $storage->label()->willReturn('ResultTest');
+    $storage->set(Argument::cetera())->willReturn(NULL);
+
+    $user = $this->prophesize(AccountInterface::class)->reveal();
+    $views_data = $this->prophesize(ViewsData::class)->reveal();
+    $route_provider = $this->prophesize(RouteProviderInterface::class)->reveal();
+    $this->view = new ViewExecutable($storage->reveal(), $user, $views_data, $route_provider);
+
+    $this->resultHandler = new Result([], 'result', []);
     $this->resultHandler->view = $this->view;
   }
 
@@ -121,18 +121,15 @@ public function providerTestResultArea() {
    *   The value to return from getItemsPerPage().
    */
   protected function setupViewPager($items_per_page = 0) {
-    $pager = $this->getMockBuilder('Drupal\views\Plugin\views\pager\PagerPluginBase')
-      ->disableOriginalConstructor()
-      ->setMethods(array('getItemsPerPage', 'getCurrentPage'))
-      ->getMock();
-    $pager->expects($this->once())
-      ->method('getItemsPerPage')
-      ->will($this->returnValue($items_per_page));
-    $pager->expects($this->once())
-      ->method('getCurrentPage')
-      ->will($this->returnValue(0));
-
-    $this->view->pager = $pager;
+    $pager = $this->prophesize(PagerPluginBase::class);
+    $pager->getItemsPerPage()
+      ->willReturn($items_per_page)
+      ->shouldBeCalledTimes(1);
+    $pager->getCurrentPage()
+      ->willReturn(0)
+      ->shouldBeCalledTimes(1);
+
+    $this->view->pager = $pager->reveal();
     $this->view->style_plugin = new \stdClass();
     $this->view->total_rows = 100;
     $this->view->result = array(1, 2, 3, 4, 5);
diff --git a/core/modules/views/views.install b/core/modules/views/views.install
index d4af0ea..37d03b6 100644
--- a/core/modules/views/views.install
+++ b/core/modules/views/views.install
@@ -347,3 +347,19 @@ function views_update_8004() {
 /**
  * @} End of "addtogroup updates-8.0.x".
  */
+
+/**
+ * @addtogroup updates-8.1.0
+ * @{
+ */
+
+/**
+ * Clear views data cache.
+ */
+function views_update_8005() {
+  // Empty update function to rebuild the views data.
+}
+
+/**
+ * @} End of "addtogroup updates-8.1.0".
+ */
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index b8c2560..c6632a5 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -5,12 +5,11 @@
  * Primarily Drupal hooks and global API functions to manipulate views.
  */
 
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Database\Query\AlterableInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\views\Plugin\Derivative\ViewsLocalTask;
@@ -622,7 +621,7 @@ function views_pre_render_views_form_views_form($element) {
   foreach ($substitutions as $placeholder => $substitution) {
     $search[] = Html::escape($placeholder);
     // Ensure that any replacements made are safe to make.
-    if (!SafeMarkup::isSafe($substitution)) {
+    if (!($substitution instanceof MarkupInterface)) {
       $substitution = Html::escape($substitution);
     }
     $replace[] = $substitution;
diff --git a/core/modules/views/views.post_update.php b/core/modules/views/views.post_update.php
index ecbf851..09a08f6 100644
--- a/core/modules/views/views.post_update.php
+++ b/core/modules/views/views.post_update.php
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\views\Entity\View;
 use Drupal\views\Views;
 
 /**
@@ -139,3 +140,22 @@ function views_post_update_cleanup_duplicate_views_data() {
 /**
  * @} End of "addtogroup updates-8.0.0-rc".
  */
+
+/**
+ * @addtogroup updates-8.0.x
+ * @{
+ */
+
+/**
+ * Include field formatter dependencies in a view when the formatter is used.
+ */
+function views_post_update_field_formatter_dependencies() {
+  $views = View::loadMultiple();
+  array_walk($views, function(View $view) {
+    $view->save();
+  });
+}
+
+/**
+ * @} End of "addtogroup updates-8.0.x".
+ */
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index c14416f..94c519e 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -277,11 +277,29 @@ function template_preprocess_views_view_summary(&$variables) {
 
     if (!empty($argument->options['summary_options']['base_path'])) {
       $base_path = $argument->options['summary_options']['base_path'];
-      $tokens = $this->getArgumentsTokens();
-      $base_path = $this->viewsTokenReplace($base_path, $tokens);
+      $tokens = $view->getDisplay()->getArgumentsTokens();
+      $base_path = $argument->globalTokenReplace($base_path, $tokens);
       // @todo Views should expect and store a leading /. See:
       //   https://www.drupal.org/node/2423913
       $url = Url::fromUserInput('/' . $base_path);
+      try {
+        /** @var \Symfony\Component\Routing\Route $route */
+        $route_name = $url->getRouteName();
+        $route = \Drupal::service('router.route_provider')->getRouteByName($route_name);
+
+        $route_variables = $route->compile()->getVariables();
+        $parameters = $url->getRouteParameters();
+
+        foreach ($route_variables as $variable_name) {
+          $parameters[$variable_name] = array_shift($args);
+        }
+
+        $url->setRouteParameters($parameters);
+      }
+      catch (Exception $e) {
+        // If the given route doesn't exist, default to <front>
+        $url = Url::fromRoute('<front>');
+      }
     }
     else {
       $url = $view->getUrl($args)->setOptions($url_options);
@@ -307,6 +325,7 @@ function template_preprocess_views_view_summary(&$variables) {
  *       visually distinct.
  */
 function template_preprocess_views_view_summary_unformatted(&$variables) {
+  /** @var \Drupal\views\ViewExecutable $view */
   $view = $variables['view'];
   $argument = $view->argument[$view->build_info['summary_level']];
 
@@ -346,11 +365,27 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
 
     if (!empty($argument->options['summary_options']['base_path'])) {
       $base_path = $argument->options['summary_options']['base_path'];
-      $tokens = $this->getArgumentsTokens();
-      $base_path = $this->viewsTokenReplace($base_path, $tokens);
+      $tokens = $view->getDisplay()->getArgumentsTokens();
+      $base_path = $argument->globalTokenReplace($base_path, $tokens);
       // @todo Views should expect and store a leading /. See:
       //   https://www.drupal.org/node/2423913
       $url = Url::fromUserInput('/' . $base_path);
+      try {
+        /** @var \Symfony\Component\Routing\Route $route */
+        $route = \Drupal::service('router.route_provider')->getRouteByName($url->getRouteName());
+        $route_variables = $route->compile()->getVariables();
+        $parameters = $url->getRouteParameters();
+
+        foreach ($route_variables as $variable_name) {
+          $parameters[$variable_name] = array_shift($args);
+        }
+
+        $url->setRouteParameters($parameters);
+      }
+      catch (Exception $e) {
+        // If the given route doesn't exist, default to <front>
+        $url = Url::fromRoute('<front>');
+      }
     }
     else {
       $url = $view->getUrl($args)->setOptions($url_options);
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index 01bcf7a..fd031d2 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -226,7 +226,11 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
     $form['progress']['#weight'] = -1001;
   }
 
-  if ($current_display->isDefaultDisplay()) {
+  // The dropdown should not be added when :
+  // - this is the default display.
+  // - there is no master shown and just one additional display (mostly page)
+  //   and the current display is defaulted.
+  if ($current_display->isDefaultDisplay() || ($current_display->isDefaulted($section) && !\Drupal::config('views.settings')->get('ui.show.master_display') && count($displays) <= 2)) {
     return;
   }
 
diff --git a/core/modules/views_ui/images/arrow-active.png b/core/modules/views_ui/images/arrow-active.png
deleted file mode 100644
index 3bbd3c2..0000000
--- a/core/modules/views_ui/images/arrow-active.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR��~
gAMA���OX2tEXtSoftwareAdobe ImageReadyq�e<EPLTEJJJRRRKKK���������LLL��ĺ��������������NNN������dddOOO�����ؓ��III���gFN�zIDATx�b��bc�0�AL��  ���  C��� CT�GL ��QFf1��0D�*",@`���@�L�@]
2�d@
�`�
�A�b@1�l0a�	v�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/views_ui/images/close.png b/core/modules/views_ui/images/close.png
deleted file mode 100644
index 2af0da5..0000000
--- a/core/modules/views_ui/images/close.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR��atEXtSoftwareAdobe ImageReadyq�e<�IDATxڬSA���ȓ��g�׊1�F�;��Y"1���e�XǵF;tђ��Lܱk?���$3C���
)��TQ��&V-7/�;�tnap��58��S>�d�����E:���J�d�H?gd|�\���?�IEND�B`�
\ No newline at end of file
diff --git a/core/modules/views_ui/images/expanded-options.png b/core/modules/views_ui/images/expanded-options.png
deleted file mode 100644
index b7b755c..0000000
--- a/core/modules/views_ui/images/expanded-options.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR��2�sBIT��O��IDAT���1�0Em���s��L�r��s��9+3s�-Y��Ъ
PU�����723���m���7��"��DB�ڃ��"|˲x��Ѧi��R�W�����4M��?Ǯ�s}��|V�Qk=��:�tq�43��q,�ܭ�'u!"���[}����4IEND�B`�
\ No newline at end of file
diff --git a/core/modules/views_ui/images/loading.gif b/core/modules/views_ui/images/loading.gif
deleted file mode 100644
index 2dbcd62..0000000
--- a/core/modules/views_ui/images/loading.gif
+++ /dev/null
@@ -1,43 +0,0 @@
-GIF89a00�###'''(((---111555:::===CCCGGGKKKMMMQQQUUUZZZ^^^aaaggghhhmmmqqqwwwxxx{{{������������������������������������������������������������������������������������///333444>>>AAAEEEIIIOOORRRXXX```eeekkklllssszzz~~~������������������������������������������������������&&&***,,,222666<<<JJJYYYrrrvvv|||���������������������������������������...;;;HHHLLLPPPWWW\\\dddiii}}}���������������������������������%%%@@@DDDttt������������������$$$+++777999]]]nnnuuuyyy���������������������������FFFSSS___bbbppp������������)))!�NETSCAPE2.0
!�-Made by Krasimira Nejcheva (www.loadinfo.net)!�
-�,00�@�pH,
�BApl:����j� 
�vK��f���嚛�X8k��E�z�)Ï���4��wFD
%}`%y	yP#/0�)D�3D
��G#��0,C+}+�B��
-�F���D*k*D	�ѽZƯ'��C
��Zؚ'Ny�Ҿ	Z�0!�M
-�Ѧ���Nf<��
 (V�r�a ��5p�EA�(B@xx���
l;`��Z�D3�̚HrQ��÷�p8�H����BH8���"�E"`P.PP0D��MW�@�S�Y/T@�p��@�@V��^pPUDܸ�Pp!ma�������M-��k!�L�㎜j�p�
-n0H���X�f��e+D��O�
-B B�
-k�����!=�1M��UUs��v=x��y�,T����&L�(!�z
6p�`
�� ��7Q™�oؿ��K���w�	q@����,PX�|&|�X�`�t9Q���y@�����JIU� �9�E%@�D�� |�
������TO���!�
��� U�%8�MpP€&���и�*��<N@4�@!Q��4�	B��� @Rs|��c�5!A�����6q~��A���@_vЀu5	�@h@A{F*�K�!�
-�,00�������

56������
JOOJ
�����CQ00T�C����;S���Q<���G���G��
L��T#���4EA�
K�T��I�8FJA5�7+�+$=�C���D�
ARV�VP9�4I,�+�M�NϢSN�	j@ŝ;'�$=�b���hb�J���4�S�o W,�A��
H���b�;�4��6��!aj�tiE	' �B�@�*	�V�p2@��=(�P
��rʍN=�ܫ�T*
G6R��*��%L�� &K@�&�����)@tQ	��W�߿����)�
-4�HHx�
;p��cD'M�x�1x
>~���@ �1;��d2�;D���@[#�/�nҠ��������˪uW�
��ٚhxH���r�·���îݫW���F��?��&�9yk氅��=��x�8��<���D�%��
�
"�
�I��]6� '@�$��b@lP��d@���'9 �ĉ�<�!!:T0ċC(�I
����yb�0��k��@6�x�'=�c��ID�(n a:
�uJ?(	c,�
�F�X
4����d��I��Pv4H
Bl��GA� <�Y�U�@��K(q�i4T��xV0Y
Ah�C�6����v���m�D�=�Չ;D{��G|z����7�Xث�~J냆<�k�x�l!5�(�E�w� ;ѫ�>K�
j���7р�.�!�
-�,00�������WWZZ�������<c##d<�����k,,+,k����]'�+�,']���W���+��We��,e���Y
`a[���,d�\cZ�ci'jjJ;���,_�Wk0�/#8ŎYc��j'g8�["СD4�c�wGh�� M�|�.ʡD���: ��B�&0�N�Y�:-0`x�PP�7��t�!�|e�t�3��� ܳ�F̼GW��t'Q�3���
-�k�m�q��4�B�"�*�P�Pƌ�L���@8��D�.b�bɒ��"��n�W� DW���Dž6�ň�2
N5 ���1\
-��ƒ���n�`h���g�$Oޢ5�6�y��̸ɂ�ض��
-1gxw�
\P��[l�"Fyg�͟Cw#��n徛_��8�^'�`�9m�5H�ٌ.����Zc	�y�R~p!�e�-&�d�-H�a�
��,[<�?�� !Zt�9�&	�a�b$�
-���r��'�(�V;��;�����A�'2�J.��"�l��'^��&W4��?��$�cl�)X�\L9ɕJf�Ibp��a(]x
�C�/�8P$XL@��)�c�^��Yx��;,��D��8�����j	g�AfJ�@���^z)^f8l��$W�J(�o� ;\��c�����:���_�E���EHЀ
��E��!�
-�,00�
H��AW޼�r��Ç
���cƌ�8!j�(�
-?N��$
!#Ǔ�l҉?P�,XAdK�M*��y�OH�-���I��;A�h!xEЛ��	�!O�7'1���&��d�A:$

-���
�QB�..��q	�O��	��U��V�r��UrFI���l�'�@
k3��RG�ŋ5`!��N�
-t�rf��@y4
]W4�7Lز%H�F:�A���s�f@w4j�Ӹ�>qP:��z-	8��Yܧ$�+C������ɩ4T�(��|��ѓ`&,pۿ�O������B�QGw̡Z����L�!�IWġ{`XA
�$�TP
T�f���1@
M�("���w��b}.�!c�$Rq�r����1x�?��D
E���I2Ȥ�M��ōR��">b����%�_@Œ2R�D:n��@r8!� &6��
-�9y��s���
���w(GXh��Lo�a�`7�w����r4����LX�Q���@�Y��qG��
-�)Gw��*��X������L��뮱A4��j�iȱ�����:;�$���
B-�}hG����r@`ȡ�J�;Cr]QG�A,���v0&�A�N���zǭp��
C�WG���m�s̑@��A1��uy(�G�_Jt��2���
�j3iuT,�U;d �u\�AZ�AqlytD��!�
-�,00�
H��A�h�8Ȱ�Æ�B��!B3j$�@�� 5�H��D̀Lt��K����Q9�J /s�`s�Or2`���`JIS塂[|\8�`�F@6���B!��L���@B̘0q��d�J7ϖ���T	QR��άlb�U���ҥkv��<M��x��`F#�YLw�!B`
X��ǂâY�"�͜7t�!
��O}�@1g �3":�ڄ��4.l��Q��H�6s7c�<�� j<#�	���Y@rK�����#f<xe
�I&�-������{��@�_�PQ��yt\!�7��RD"��+�0
X[T8��>, 
 x�‹+��Xh�!-1�0�����`����G�=.B�\B����J�����%� "�F%b�"�,~#(00�Mb�@�th&
-#�E�*ڛ��`��i���|�$(L�>�
��EC!4���$�g�p�"^�@i�Ց�~F�é0�p\F4P����Q�F>���)�W�
>�
-*�]�wƭ�����&[ڌ�G�	Ģ�HF��
-ji��
-��ў:FFQ��li�Ā
-3�;�
-j�H�����.{�
+���
-�.�B�U*:��>4���kA>��ȩ�,��F�lQ�!7�H#
��Hp7\��@��qC�r�'���C�<��6�@!ǐY����ʐG���@B-��҃����A=P@!�
-�,00�
H�`AG=z䨡��#Jtt�N�Jwn �ȱ�A9�ƈcI�Ǔ#�)�R$�0:`�R�Ƙo�Ds��aRd��Ѐ�wz��I���Iw�<B9@�ŋw^d���ul����<�<:�Z	�E<�@�+KJGF��,��x�r�q�m�J`B�u�!iN�K����z1�C��Ir`��#
��b�3ё��W=�xZu�I��\��윔�����A�
9��sG�Rc#7�$Δt���Bt�Ht��$� �ͷ�t���K���d�^���8���q����rD"AW��Ѓ�8
20�"��&r2 Ʉ$B ~T!��&+>��'���
$(z��,v��%
5P#�P��Q��.���
-I�G")��>�"��^�6N����ɖg�ؐ���f�V0<�vE"	�X�@���:	H�
�	$wh0F�9*
- ����c�$�S��"�t�&wh��# �D&�8x�0X�!�U�1U��T�
-+t��&xt���Z�O�:E'�6��|5�G��j�+�6�,kaB��Qx�A0�m�t����v��@�.5&�drn�Et4	�VdB��� ��`&���+IGp���
	'W'��I��B�!O;E�a��xԀ&�~p�xBDWD�9���g�S$�XR�$���8<�l�"��E�0F�H2�QD\�A�zb�'�\=��0��o^�I�I{!�
-�,00�
H��A��`Ax��Ç

4� �A
�3D0j��!�>i��@ǏG� ɲ��(崜	 ̏��4H��O�rӣ��5�
-�IhF,rD��!��ʁ��9��=��p"��?����e Q7E9-�CX�{$8uX`�Z�ր�B��5�
���CjӪ�s �r��؋���v�B�4����VN�v��`Ea4Pڴ�.$%܅�G!��4���0Iv��c
/~E��ѲAr�{0֘��]j��H��!�/���S5����;���|�	5(s”��	FT?ܐ!��Ƃn�J�`��H������|X`@�fPH�HX��!���ǒ%�@"� T�S+2H�}�H c�4j�E
8��Ǝ��0�
-I��F�x(%�(c�i���
f!b�%��2�ƒ�`��_F!!YxQAH�N	�ȣ��x���K]�r�	g��!�hPFal��(+��).hhA�L`�	�2*F7���.���@���B�&��C����"�
���)/��	Y����:F{ls�
-�B�@X0�lIP�����	+���
0D�&��!D5�a�
-�	T�+��n�"|���r@�c~�C
-�
-4J��B<�e0�j
-�T�n�T 'B��q����z
�Uh"G�B�����bs{]�02'�hC=����,�0��f5��"$B�fRö4!�
-�,00�
H��A�::Ȱ�ÆZ4h�@�Ë��!B�d�p��:F�2��˂8>~L��˛v��(s�Å#�L�)�M�
-h*��� ���1
�XgH�@NG�_E�#a�Y0Z^�r5+�)�b�&����5��
Ն�ܺ�Dp��;��ɷ1�=�
-H���p�(�a�ƍ�>�4k'�;����Y�S���FuCG^\�Mp���U$�nG�k	jJ���T.�i<�����(!
�K8
<2�@}���
Z��t��oy���;>C���s&d�
����D�#C�Â0p��9Rl0�F4%�R0�`	�
��Z8�F�*�x���A@^x��8��.28~.�f�c�J
<�Ï@�䅉D�H�=��$I4y"W�<С�S�(�`h��e	z���Me^�y�7��za'P����m|^�|�F8�e��I�$`�g$�Ţ�J��*f�@��I'PQ(A�@@&����Cp��i��B��Ũ	)p��b"��J�	��z�Ĩ���xq����i'g$�e�"&�";�Ey�,��j�`4��\F�-�\�@��"A8 �ĽM q�@��n�

������j
��	'Mp�yp��oQ�9t���A4̰�M�8��~�A*!>4�y1����o���񗸓D�C��92��7�
��%� ��C8����M���B���h@��C��`�dH��:"�S@;
\ No newline at end of file
diff --git a/core/modules/views_ui/images/overridden.gif b/core/modules/views_ui/images/overridden.gif
deleted file mode 100644
index b781191..0000000
--- a/core/modules/views_ui/images/overridden.gif
+++ /dev/null
@@ -1,2 +0,0 @@
-GIF89a		���������������������������赶������������Ƽ��������������������!�
,		, %�$�	����@��1�K#�=A	�
����01
-��D

;
\ No newline at end of file
diff --git a/core/modules/views_ui/images/status-active.gif b/core/modules/views_ui/images/status-active.gif
deleted file mode 100644
index 207e95c..0000000
--- a/core/modules/views_ui/images/status-active.gif
+++ /dev/null
@@ -1,10 +0,0 @@
-GIF89a

�s�{�{���5��F��Z��k�؋�ᵵ�����ｽ����������������������������������������������������!�NETSCAPE2.0
!�,

w
@!
��` �C�4,@�1rذ@�
L���`�@&�0���
xHrfCj�\�!g�2=08��fN�\�2�Ď��)��4�8��և$*$��`

!�,

`
0aA*\(���(p���	z�@ ���
-=$`���+HTi��A(��`
�. p8���
-�00bO�FoZ�4hL�Q\!�,

V
pa`��"��A�rX(Ѓ�	N`�:
-� �C�
PD( 
E` �B�(�g3#
-�`p�ą>�!�,

a
@!
��
TH(PB
 "0 �ÄR��Ѓ�	8p��(Xdp0�@�
b�!�8��x$��^T���px�!�7*0 !�,

b
0aA*\(���(p``��3^�����
-/ ���C���( ����`c�N:� Q��
�00�@�y@S�3A�ppa@!�,

W
pa`��"��A��a��
'`Q� � �E�	@.D ��
-*	00A66,��
�w.�`�$I�!�,

^
@
��
TH(PB
 "0 ��x1�C�$p����Q<�2%�PdPp`�0'4DX�f�	xr$ #
/0D�a��!�,

_
0
@*\(���(p``��3^�����
-/ �X��A+�Pq���(�A�
-X�a���L����ˆ9���q�
�!
2!�,

X
pa`��"��A��a��
'`Q�<X@D�p��G'��llH`N�B�� ˒�(:0 !�,

b
@!
��
TH(PB
 "0 �ÄR�x@
	8@��X)0$��.$����@�6
-�����	
XرDV�0�Cn<HT`@!�,

a
0aA*\(���(p``��#2xAb:��

 �X���8�@`Œx�P!�B$n �CƟ5�l	��Мv��0 !�,

X
pa`��"��A�rX ��
'0,`�@�<<��


,����B�� �bA�MhX@�Dž<
�HS����0 ;
\ No newline at end of file
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index aebff07..3cc0f4c 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -797,7 +797,7 @@
         newRow = $('<tr class="filter-group-operator-row"><td colspan="5"></td></tr>');
         newRow.find('td').append(fakeOperator);
         newRow.insertBefore(titleRow);
-        dropdowns = dropdowns.add(fakeOperator);
+        dropdowns.add(fakeOperator);
       }
 
       return dropdowns;
diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index e82dc42..d3fdd6a 100644
--- a/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -8,7 +8,6 @@
 namespace Drupal\views_ui\Form\Ajax;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\views\ViewEntityInterface;
 use Drupal\views\ViewExecutable;
 use Drupal\views\Views;
diff --git a/core/modules/views_ui/src/Form/BasicSettingsForm.php b/core/modules/views_ui/src/Form/BasicSettingsForm.php
index 1732c9a..712433c 100644
--- a/core/modules/views_ui/src/Form/BasicSettingsForm.php
+++ b/core/modules/views_ui/src/Form/BasicSettingsForm.php
@@ -134,8 +134,19 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ),
     );
 
+    $form['live_preview']['options']['ui_show_sql_query_enabled'] = array(
+      '#type' => 'checkbox',
+      '#title' => $this->t('Show the SQL query'),
+      '#default_value' => $config->get('ui.show.sql_query.enabled'),
+    );
+
     $form['live_preview']['options']['ui_show_sql_query_where'] = array(
       '#type' => 'radios',
+      '#states' => array(
+        'visible' => array(
+          ':input[name="ui_show_sql_query_enabled"]' => array('checked' => TRUE),
+        ),
+      ),
       '#title' => t('Show SQL query'),
       '#options' => array(
         'above' => $this->t('Above the preview'),
@@ -144,11 +155,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $config->get('ui.show.sql_query.where'),
     );
 
-    $form['live_preview']['options']['ui_show_sql_query_enabled'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Show the SQL query'),
-      '#default_value' => $config->get('ui.show.sql_query.enabled'),
-    );
     $form['live_preview']['options']['ui_show_performance_statistics'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Show performance statistics'),
diff --git a/core/modules/views_ui/src/Tests/DisplayTest.php b/core/modules/views_ui/src/Tests/DisplayTest.php
index 4fab7d8..7c3eb7a 100644
--- a/core/modules/views_ui/src/Tests/DisplayTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayTest.php
@@ -182,7 +182,7 @@ public function testLinkDisplay() {
     // The form redirects to the master display.
     $this->drupalGet($path);
 
-    $this->assertLink(t('Custom URL'), 0, 'The link option has custom url as summary.');
+    $this->assertLink(t('Custom URL'), 0, 'The link option has custom URL as summary.');
 
     // Test the default link_url value for new display
     $this->drupalPostForm(NULL, array(), t('Add Block'));
@@ -305,4 +305,32 @@ public function testActionLinks() {
     $this->assertNoRaw($display_title);
   }
 
+  /**
+   * Tests that the override option is hidden when it's not needed.
+   */
+  public function testHideDisplayOverride() {
+    // Test that the override option appears with two displays.
+    $this->drupalGet('admin/structure/views/nojs/handler/test_display/page_1/field/title');
+    $this->assertText('All displays');
+
+    // Remove a display and test if the override option is hidden.
+    $this->drupalPostForm('admin/structure/views/view/test_display/edit/block_1', [], t('Delete @display', ['@display' => 'Block']));
+    $this->drupalPostForm(NULL, [], t('Save'));
+
+    $this->drupalGet('admin/structure/views/nojs/handler/test_display/page_1/field/title');
+    $this->assertNoText('All displays');
+
+    // Test that the override option is shown when display master is on.
+    \Drupal::configFactory()->getEditable('views.settings')->set('ui.show.master_display', TRUE)->save();
+    $this->drupalGet('admin/structure/views/nojs/handler/test_display/page_1/field/title');
+    $this->assertText('All displays');
+
+    // Test that the override option is shown if the current display is
+    // overridden so that the option to revert is available.
+    $this->drupalPostForm(NULL, ['override[dropdown]' => 'page_1'], t('Apply'));
+    \Drupal::configFactory()->getEditable('views.settings')->set('ui.show.master_display', FALSE)->save();
+    $this->drupalGet('admin/structure/views/nojs/handler/test_display/page_1/field/title');
+    $this->assertText('Revert to default');
+  }
+
 }
diff --git a/core/modules/views_ui/src/Tests/FilterUITest.php b/core/modules/views_ui/src/Tests/FilterUITest.php
index 1b1cc13..6ed031b 100644
--- a/core/modules/views_ui/src/Tests/FilterUITest.php
+++ b/core/modules/views_ui/src/Tests/FilterUITest.php
@@ -72,7 +72,7 @@ public function testFiltersUI() {
 
     $this->drupalGet('admin/structure/views/view/test_filter_groups');
 
-    $this->assertLink('Content: Node ID (= 1)', 0, 'Content: Node ID (= 1) link appears correctly.');
+    $this->assertLink('Content: ID (= 1)', 0, 'Content: ID (= 1) link appears correctly.');
 
     // Tests that we can create a new filter group from UI.
     $this->drupalGet('admin/structure/views/nojs/rearrange-filter/test_filter_groups/page');
@@ -95,4 +95,33 @@ public function testFiltersUI() {
     $this->assertNoRaw('<span>Group 3</span>', 'Group 3 has not been added yet.');
   }
 
+  /**
+   * Tests the identifier settings and restrictions.
+   */
+  public function testFilterIdentifier() {
+    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $this->drupalLogin($admin_user);
+    $path = 'admin/structure/views/nojs/handler/test_filter_in_operator_ui/default/filter/type';
+
+    // Set an empty identifier.
+    $edit = array(
+      'options[expose][identifier]' => '',
+    );
+    $this->drupalPostForm($path, $edit, t('Apply'));
+    $this->assertText('The identifier is required if the filter is exposed.');
+
+    // Set the identifier to 'value'.
+    $edit = array(
+      'options[expose][identifier]' => 'value',
+    );
+    $this->drupalPostForm($path, $edit, t('Apply'));
+    $this->assertText('This identifier is not allowed.');
+
+    // Set the identifier to a value with a restricted character.
+    $edit = array(
+      'options[expose][identifier]' => 'value value',
+    );
+    $this->drupalPostForm($path, $edit, t('Apply'));
+    $this->assertText('This identifier has illegal characters.');
+  }
 }
diff --git a/core/modules/views_ui/src/Tests/HandlerTest.php b/core/modules/views_ui/src/Tests/HandlerTest.php
index 0394f10..bc3e018 100644
--- a/core/modules/views_ui/src/Tests/HandlerTest.php
+++ b/core/modules/views_ui/src/Tests/HandlerTest.php
@@ -245,9 +245,9 @@ public function testNoDuplicateFields() {
       $add_handler_url = 'admin/structure/views/nojs/add-handler/test_node_view/default/' . $handler_type;
       $this->drupalGet($add_handler_url);
 
-      $this->assertNoDuplicateField('Node ID', 'Content');
-      $this->assertNoDuplicateField('Node ID', 'Content revision');
-      $this->assertNoDuplicateField('Type', 'Content');
+      $this->assertNoDuplicateField('ID', 'Content');
+      $this->assertNoDuplicateField('ID', 'Content revision');
+      $this->assertNoDuplicateField('Content type', 'Content');
       $this->assertNoDuplicateField('UUID', 'Content');
       $this->assertNoDuplicateField('Revision ID', 'Content');
       $this->assertNoDuplicateField('Revision ID', 'Content revision');
diff --git a/core/modules/views_ui/src/Tests/RedirectTest.php b/core/modules/views_ui/src/Tests/RedirectTest.php
index 30d387c..2edb970 100644
--- a/core/modules/views_ui/src/Tests/RedirectTest.php
+++ b/core/modules/views_ui/src/Tests/RedirectTest.php
@@ -44,7 +44,7 @@ public function testRedirect() {
 
     $this->drupalPostForm($path_edit_path, array('path' => $new_path), t('Apply'));
     $this->drupalPostForm($edit_path, array(), t('Save'), array('query' => array('destination' => 'test-redirect-view')));
-    $this->assertUrl($new_path, array(), 'Make sure the user got redirected to the expected page after changing the url of a page display.');
+    $this->assertUrl($new_path, array(), 'Make sure the user got redirected to the expected page after changing the URL of a page display.');
   }
 
 }
diff --git a/core/modules/views_ui/src/Tests/TagTest.php b/core/modules/views_ui/src/Tests/TagTest.php
deleted file mode 100644
index b18ee98..0000000
--- a/core/modules/views_ui/src/Tests/TagTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views_ui\Tests\TagTest.
- */
-
-namespace Drupal\views_ui\Tests;
-
-use Drupal\views\Tests\ViewKernelTestBase;
-use Drupal\views_ui\Controller\ViewsUIController;
-use Drupal\Component\Utility\Html;
-
-/**
- * Tests the views ui tagging functionality.
- *
- * @group views_ui
- */
-class TagTest extends ViewKernelTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('views', 'views_ui', 'user');
-
-  /**
-   * Tests the views_ui_autocomplete_tag function.
-   */
-  public function testViewsUiAutocompleteTag() {
-    \Drupal::moduleHandler()->loadInclude('views_ui', 'inc', 'admin');
-
-    // Save 15 views with a tag.
-    $tags = array();
-    for ($i = 0; $i < 16; $i++) {
-      $suffix = $i % 2 ? 'odd' : 'even';
-      $tag = 'autocomplete_tag_test_' . $suffix . $this->randomMachineName();
-      $tags[] = $tag;
-      entity_create('view', array('tag' => $tag, 'id' => $this->randomMachineName()))->save();
-    }
-
-    // Make sure just ten results are returns.
-    $controller = ViewsUIController::create($this->container);
-    $request = $this->container->get('request_stack')->getCurrentRequest();
-    $request->query->set('q', 'autocomplete_tag_test');
-    $result = $controller->autocompleteTag($request);
-    $matches = (array) json_decode($result->getContent(), TRUE);
-    $this->assertEqual(count($matches), 10, 'Make sure the maximum amount of tag results is 10.');
-
-    // Make sure the returned array has the proper format.
-    $suggestions = array_map(function ($tag) {
-      return array('value' => $tag, 'label' => Html::escape($tag));
-    }, $tags);
-    foreach ($matches as $match) {
-      $this->assertTrue(in_array($match, $suggestions), 'Make sure the returned array has the proper format.');
-    }
-
-
-    // Make sure that matching by a certain prefix works.
-    $request->query->set('q', 'autocomplete_tag_test_even');
-    $result = $controller->autocompleteTag($request);
-    $matches = (array) json_decode($result->getContent(), TRUE);
-    $this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
-    foreach ($matches as $tag) {
-      $this->assertTrue(array_search($tag['value'], $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', array('@tag' => $tag['value'])));
-    }
-
-    // Make sure an invalid result doesn't return anything.
-    $request->query->set('q', $this->randomMachineName());
-    $result = $controller->autocompleteTag($request);
-    $matches = (array) json_decode($result->getContent());
-    $this->assertEqual(count($matches), 0, "Make sure an invalid tag doesn't return anything.");
-  }
-
-}
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 284473c..818c4b4 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -15,7 +15,6 @@
 use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Render\ElementInfoManagerInterface;
 use Drupal\Core\Url;
 use Drupal\user\SharedTempStoreFactory;
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 8783c3e..784c59b 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -12,7 +12,6 @@
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\views\Views;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\views\ViewExecutable;
diff --git a/core/modules/views_ui/tests/src/Kernel/TagTest.php b/core/modules/views_ui/tests/src/Kernel/TagTest.php
new file mode 100644
index 0000000..54f34df
--- /dev/null
+++ b/core/modules/views_ui/tests/src/Kernel/TagTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\views_ui\Kernel\TagTest.
+ */
+
+namespace Drupal\Tests\views_ui\Kernel;
+
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+use Drupal\views_ui\Controller\ViewsUIController;
+use Drupal\Component\Utility\Html;
+use Drupal\views\Entity\View;
+
+/**
+ * Tests the views ui tagging functionality.
+ *
+ * @group views_ui
+ */
+class TagTest extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('views', 'views_ui', 'user');
+
+  /**
+   * Tests the views_ui_autocomplete_tag function.
+   */
+  public function testViewsUiAutocompleteTag() {
+    \Drupal::moduleHandler()->loadInclude('views_ui', 'inc', 'admin');
+
+    // Save 15 views with a tag.
+    $tags = array();
+    for ($i = 0; $i < 16; $i++) {
+      $suffix = $i % 2 ? 'odd' : 'even';
+      $tag = 'autocomplete_tag_test_' . $suffix . $this->randomMachineName();
+      $tags[] = $tag;
+      View::create(array('tag' => $tag, 'id' => $this->randomMachineName()))->save();
+    }
+
+    // Make sure just ten results are returns.
+    $controller = ViewsUIController::create($this->container);
+    $request = $this->container->get('request_stack')->getCurrentRequest();
+    $request->query->set('q', 'autocomplete_tag_test');
+    $result = $controller->autocompleteTag($request);
+    $matches = (array) json_decode($result->getContent(), TRUE);
+    $this->assertEqual(count($matches), 10, 'Make sure the maximum amount of tag results is 10.');
+
+    // Make sure the returned array has the proper format.
+    $suggestions = array_map(function ($tag) {
+      return array('value' => $tag, 'label' => Html::escape($tag));
+    }, $tags);
+    foreach ($matches as $match) {
+      $this->assertTrue(in_array($match, $suggestions), 'Make sure the returned array has the proper format.');
+    }
+
+
+    // Make sure that matching by a certain prefix works.
+    $request->query->set('q', 'autocomplete_tag_test_even');
+    $result = $controller->autocompleteTag($request);
+    $matches = (array) json_decode($result->getContent(), TRUE);
+    $this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
+    foreach ($matches as $tag) {
+      $this->assertTrue(array_search($tag['value'], $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', array('@tag' => $tag['value'])));
+    }
+
+    // Make sure an invalid result doesn't return anything.
+    $request->query->set('q', $this->randomMachineName());
+    $result = $controller->autocompleteTag($request);
+    $matches = (array) json_decode($result->getContent());
+    $this->assertEqual(count($matches), 0, "Make sure an invalid tag doesn't return anything.");
+  }
+
+}
diff --git a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
index 4089d3a..215728c 100644
--- a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
+++ b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Tests\views_ui\Unit;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Tests\UnitTestCase;
@@ -168,8 +167,6 @@ public function testBuildRowEntityList() {
     $display_paths = $row['data']['path']['data']['#items'];
     // These values will be escaped by Twig when rendered.
     $this->assertEquals('/test_page, /<object>malformed_path</object>, /<script>alert("placeholder_page/%")</script>', implode(', ', $display_paths));
-    $this->assertFalse(SafeMarkup::isSafe('/<object>malformed_path</object>'), '/<script>alert("/<object>malformed_path</object> is not marked safe.');
-    $this->assertFalse(SafeMarkup::isSafe('/<script>alert("placeholder_page/%")'), '/<script>alert("/<script>alert("placeholder_page/%") is not marked safe.');
   }
 
 }
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 25abf71..150881c 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -10,68 +10,35 @@
   <!--Exclude test files that are intentionally empty, or intentionally violate coding standards.-->
   <exclude-pattern>./modules/system/tests/fixtures/HtaccessTest</exclude-pattern>
 
-  <!--Blacklist of coding standard rules that are not yet fixed. Ref. https://www.drupal.org/node/2571965-->
-  <rule ref="Drupal">
-    <exclude name="Drupal.Array.Array"/>
-    <exclude name="Drupal.Classes.ClassCreateInstance"/>
-    <exclude name="Drupal.Classes.ClassDeclaration"/>
-    <exclude name="Drupal.Classes.InterfaceName"/>
-    <exclude name="Drupal.Classes.UnusedUseStatement"/>
-    <exclude name="Drupal.Commenting.ClassComment"/>
-    <exclude name="Drupal.Commenting.DocComment"/>
-    <exclude name="Drupal.Commenting.FileComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment"/>
-    <exclude name="Drupal.Commenting.HookComment"/>
-    <exclude name="Drupal.Commenting.InlineComment"/>
-    <exclude name="Drupal.Commenting.PostStatementComment"/>
-    <exclude name="Drupal.ControlStructures.ControlSignature"/>
-    <exclude name="Drupal.ControlStructures.InlineControlStructure"/>
-    <exclude name="Drupal.Files.EndFileNewline"/>
-    <exclude name="Drupal.Files.LineLength"/>
-    <exclude name="Drupal.Formatting.MultiLineAssignment"/>
-    <exclude name="Drupal.Formatting.SpaceInlineIf"/>
-    <exclude name="Drupal.Formatting.SpaceUnaryOperator"/>
-    <exclude name="Drupal.Functions.FunctionDeclaration"/>
-    <exclude name="Drupal.NamingConventions.ValidClassName"/>
-    <exclude name="Drupal.NamingConventions.ValidFunctionName"/>
-    <exclude name="Drupal.NamingConventions.ValidGlobal"/>
-    <exclude name="Drupal.NamingConventions.ValidVariableName"/>
-    <exclude name="Drupal.Semantics.ConstantName"/>
-    <exclude name="Drupal.Semantics.FunctionAlias"/>
-    <exclude name="Drupal.Semantics.FunctionT"/>
-    <exclude name="Drupal.Semantics.RemoteAddress"/>
-    <exclude name="Drupal.Strings.UnnecessaryStringConcat"/>
-    <exclude name="Drupal.WhiteSpace.CloseBracketSpacing"/>
-    <exclude name="Drupal.WhiteSpace.EmptyLines"/>
-    <exclude name="Drupal.WhiteSpace.ObjectOperatorSpacing"/>
-    <exclude name="Drupal.WhiteSpace.OpenBracketSpacing"/>
-    <exclude name="Drupal.WhiteSpace.OperatorSpacing"/>
-    <exclude name="Drupal.WhiteSpace.ScopeClosingBrace"/>
-    <exclude name="Drupal.WhiteSpace.ScopeIndent"/>
-    <exclude name="Generic.Formatting.SpaceAfterCast"/>
-    <exclude name="Generic.Functions.FunctionCallArgumentSpacing"/>
-    <exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie"/>
-    <exclude name="Generic.NamingConventions.ConstructorName"/>
-    <exclude name="Generic.PHP.UpperCaseConstant"/>
-    <exclude name="Internal.NoCodeFound"/>
-    <exclude name="PEAR.Functions.FunctionCallSignature"/>
-    <exclude name="PEAR.Functions.ValidDefaultValue"/>
-    <exclude name="PSR2.Classes.PropertyDeclaration"/>
-    <exclude name="Squiz.Arrays.ArrayBracketSpacing"/>
-    <exclude name="Squiz.Arrays.ArrayDeclaration"/>
-    <exclude name="Squiz.Classes.LowercaseClassKeywords"/>
-    <exclude name="Squiz.Commenting.DocCommentAlignment"/>
-    <exclude name="Squiz.Commenting.PostStatementComment"/>
-    <exclude name="Squiz.ControlStructures.ForEachLoopDeclaration"/>
-    <exclude name="Squiz.ControlStructures.ForLoopDeclaration"/>
-    <exclude name="Squiz.ControlStructures.SwitchDeclaration"/>
-    <exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing"/>
-    <exclude name="Squiz.PHP.LowercasePHPFunctions"/>
-    <exclude name="Squiz.PHP.NonExecutableCode"/>
-    <exclude name="Squiz.Scope.MethodScope"/>
-    <exclude name="Squiz.Strings.ConcatenationSpacing"/>
-    <exclude name="Squiz.WhiteSpace.LanguageConstructSpacing"/>
-    <exclude name="Squiz.WhiteSpace.SemicolonSpacing"/>
-    <exclude name="Squiz.WhiteSpace.SuperfluousWhitespace"/>
-  </rule>
+  <!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
+  <!-- Drupal sniffs -->
+  <rule ref="Drupal.Classes.UnusedUseStatement"/>
+  <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
+  <rule ref="Drupal.CSS.ColourDefinition"/>
+  <rule ref="Drupal.Commenting.DocCommentStar"/>
+  <rule ref="Drupal.Commenting.FileComment"/>
+  <rule ref="Drupal.ControlStructures.ElseIf"/>
+  <rule ref="Drupal.Files.TxtFileLineLength"/>
+  <rule ref="Drupal.Functions.DiscouragedFunctions"/>
+  <rule ref="Drupal.InfoFiles.AutoAddedKeys"/>
+  <rule ref="Drupal.InfoFiles.ClassFiles"/>
+  <rule ref="Drupal.InfoFiles.DuplicateEntry"/>
+  <rule ref="Drupal.InfoFiles.Required"/>
+  <rule ref="Drupal.Semantics.EmptyInstall"/>
+  <rule ref="Drupal.Semantics.FunctionWatchdog"/>
+  <rule ref="Drupal.Semantics.InstallHooks"/>
+  <rule ref="Drupal.Semantics.LStringTranslatable"/>
+  <rule ref="Drupal.Semantics.PregSecurity"/>
+  <rule ref="Drupal.Semantics.TInHookMenu"/>
+  <rule ref="Drupal.Semantics.TInHookSchema"/>
+  <rule ref="Drupal.WhiteSpace.Comma"/>
+  <rule ref="Drupal.WhiteSpace.ObjectOperatorIndent"/>
+
+  <!-- Generic sniffs -->
+  <rule ref="Generic.Files.LineEndings"/>
+  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
+  <rule ref="Generic.PHP.DeprecatedFunctions"/>
+  <rule ref="Generic.PHP.DisallowShortOpenTag"/>
+  <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
+
 </ruleset>
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index 744963a..841c10b 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -6,6 +6,7 @@
 
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
+use Drupal\shortcut\Entity\Shortcut;
 
 /**
  * Implements hook_install().
@@ -31,6 +32,10 @@ function standard_install() {
   $user->roles[] = 'administrator';
   $user->save();
 
+  // We install some menu links, so we have to rebuild the router, to ensure the
+  // menu links are valid.
+  \Drupal::service('router.builder')->rebuildIfNeeded();
+
   // Enable the Contact link in the footer menu.
   /** @var \Drupal\Core\Menu\MenuLinkManagerInterface $menu_link_manager */
   $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
@@ -43,7 +48,7 @@ function standard_install() {
   user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('access shortcuts'));
 
   // Populate the default shortcut set.
-  $shortcut = entity_create('shortcut', array(
+  $shortcut = Shortcut::create(array(
     'shortcut_set' => 'default',
     'title' => t('Add content'),
     'weight' => -20,
@@ -51,7 +56,7 @@ function standard_install() {
   ));
   $shortcut->save();
 
-  $shortcut = entity_create('shortcut', array(
+  $shortcut = Shortcut::create(array(
     'shortcut_set' => 'default',
     'title' => t('All content'),
     'weight' => -19,
diff --git a/core/scripts/db-tools.php b/core/scripts/db-tools.php
index 316c62f..476b422 100644
--- a/core/scripts/db-tools.php
+++ b/core/scripts/db-tools.php
@@ -1,6 +1,11 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @file
+ * A command line application to import a database generation script.
+ */
+
 use Drupal\Core\Command\DbToolsApplication;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Site\Settings;
diff --git a/core/scripts/dump-database-d8-mysql.php b/core/scripts/dump-database-d8-mysql.php
old mode 100755
new mode 100644
index c4f7507..73f7b94
--- a/core/scripts/dump-database-d8-mysql.php
+++ b/core/scripts/dump-database-d8-mysql.php
@@ -1,6 +1,11 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @file
+ * A command line application to dump a database to a generation script.
+ */
+
 use Drupal\Core\Command\DbDumpApplication;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Site\Settings;
diff --git a/core/scripts/generate-proxy-class.php b/core/scripts/generate-proxy-class.php
index d5f0e43..8eeb663 100644
--- a/core/scripts/generate-proxy-class.php
+++ b/core/scripts/generate-proxy-class.php
@@ -1,6 +1,11 @@
 #!/usr/bin/env php
 <?php
 
+/**
+ * @file
+ * A command line application to generate proxy classes.
+ */
+
 use Drupal\Core\Command\GenerateProxyClassApplication;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\ProxyBuilder\ProxyBuilder;
diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 1b7a45a..df61328 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -14,6 +14,7 @@
 use Drupal\Core\Test\TestRunnerKernel;
 use Drupal\simpletest\Form\SimpletestResultsForm;
 use Drupal\simpletest\TestBase;
+use Drupal\simpletest\TestDiscovery;
 use Symfony\Component\HttpFoundation\Request;
 
 $autoloader = require_once __DIR__ . '/../../autoload.php';
@@ -913,10 +914,12 @@ function simpletest_script_cleanup($test_id, $test_class, $exitcode) {
 function simpletest_script_get_test_list() {
   global $args;
 
+  $types_processed = empty($args['types']);
   $test_list = array();
   if ($args['all'] || $args['module']) {
     try {
       $groups = simpletest_test_get_all($args['module'], $args['types']);
+      $types_processed = TRUE;
     }
     catch (Exception $e) {
       echo (string) $e;
@@ -1040,6 +1043,7 @@ function simpletest_script_get_test_list() {
     else {
       try {
         $groups = simpletest_test_get_all(NULL, $args['types']);
+        $types_processed = TRUE;
       }
       catch (Exception $e) {
         echo (string) $e;
@@ -1058,6 +1062,15 @@ function simpletest_script_get_test_list() {
     }
   }
 
+  // If the test list creation does not automatically limit by test type then
+  // we need to do so here.
+  if (!$types_processed) {
+    $test_list = array_filter($test_list, function ($test_class) use ($args) {
+      $test_info = TestDiscovery::getTestInfo($test_class);
+      return in_array($test_info['type'], $args['types'], TRUE);
+    });
+  }
+
   if (empty($test_list)) {
     simpletest_script_print_error('No valid tests were specified.');
     exit(SIMPLETEST_SCRIPT_EXIT_FAILURE);
diff --git a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php b/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
index c337f75..0637ef7 100644
--- a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
+++ b/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
@@ -29,7 +29,6 @@ class SafeMarkupKernelTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', 'router');
     $this->container->get('router.builder')->rebuild();
   }
 
diff --git a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
index 2557737..93a0e2e 100644
--- a/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
+++ b/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
@@ -46,8 +46,6 @@ protected function setUp() {
     // drupal_get_filename().
     // @todo Remove as part of https://www.drupal.org/node/2186491
     system_rebuild_module_data();
-
-    $this->installSchema('system', 'router');
   }
 
   /**
diff --git a/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php b/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php
index c05d630..ff2bf6a 100644
--- a/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Cache/CacheCollectorTest.php
@@ -20,19 +20,6 @@ class CacheCollectorTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['system'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->installSchema('system', ['semaphore']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function register(ContainerBuilder $container) {
     parent::register($container);
     // Change container to database cache backends.
diff --git a/core/tests/Drupal/KernelTests/Core/Config/CacheabilityMetadataConfigOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Config/CacheabilityMetadataConfigOverrideTest.php
new file mode 100644
index 0000000..c081871
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/CacheabilityMetadataConfigOverrideTest.php
@@ -0,0 +1,94 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\CacheabilityMetadataConfigOverrideTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\config_override_test\Cache\PirateDayCacheContext;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests if configuration overrides correctly affect cacheability metadata.
+ *
+ * @group config
+ */
+class CacheabilityMetadataConfigOverrideTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'block',
+    'block_content',
+    'config',
+    'config_override_test',
+    'system',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('block_content');
+    $this->installConfig(['config_override_test']);
+  }
+
+  /**
+   * Tests if config overrides correctly set cacheability metadata.
+   */
+  public function testConfigOverride() {
+    // It's pirate day today!
+    $GLOBALS['it_is_pirate_day'] = TRUE;
+
+    $config_factory = $this->container->get('config.factory');
+    $config = $config_factory->get('system.theme');
+
+    // Check that we are using the Pirate theme.
+    $theme = $config->get('default');
+    $this->assertEqual('pirate', $theme);
+
+    // Check that the cacheability metadata is correct.
+    $this->assertEqual(['pirate_day'], $config->getCacheContexts());
+    $this->assertEqual(['config:system.theme', 'pirate-day-tag'], $config->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $config->getCacheMaxAge());
+  }
+
+  /**
+   * Tests if config overrides set cacheability metadata on config entities.
+   */
+  public function testConfigEntityOverride() {
+    // It's pirate day today!
+    $GLOBALS['it_is_pirate_day'] = TRUE;
+
+    // Load the User login block and check that its cacheability metadata is
+    // overridden correctly. This verifies that the metadata is correctly
+    // applied to config entities.
+    /** @var \Drupal\Core\Entity\EntityManagerInterface $entity_manager */
+    $entity_manager = $this->container->get('entity.manager');
+    $block = $entity_manager->getStorage('block')->load('call_to_action');
+
+    // Check that our call to action message is appealing to filibusters.
+    $this->assertEqual($block->label(), 'Draw yer cutlasses!');
+
+    // Check that the cacheability metadata is correct.
+    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
+    $this->assertEqual(['config:block.block.call_to_action', 'pirate-day-tag'], $block->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
+
+    // Check that duplicating a config entity does not have the original config
+    // entity's cache tag.
+    $this->assertEqual(['config:block.block.', 'pirate-day-tag'], $block->createDuplicate()->getCacheTags());
+
+    // Check that renaming a config entity does not have the original config
+    // entity's cache tag.
+    $block->set('id', 'call_to_looting')->save();
+    $this->assertEqual(['pirate_day'], $block->getCacheContexts());
+    $this->assertEqual(['config:block.block.call_to_looting', 'pirate-day-tag'], $block->getCacheTags());
+    $this->assertEqual(PirateDayCacheContext::PIRATE_DAY_MAX_AGE, $block->getCacheMaxAge());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
new file mode 100644
index 0000000..5929b7c
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -0,0 +1,323 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigCRUDTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Component\Utility\Crypt;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Config\ConfigNameException;
+use Drupal\Core\Config\ConfigValueException;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\DatabaseStorage;
+use Drupal\Core\Config\UnsupportedDataTypeConfigException;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests CRUD operations on configuration objects.
+ *
+ * @group config
+ */
+class ConfigCRUDTest extends KernelTestBase {
+
+  /**
+   * Exempt from strict schema checking.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = FALSE;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system');
+
+  /**
+   * Tests CRUD operations.
+   */
+  function testCRUD() {
+    $storage = $this->container->get('config.storage');
+    $config_factory = $this->container->get('config.factory');
+    $name = 'config_test.crud';
+
+    $config = $this->config($name);
+    $this->assertIdentical($config->isNew(), TRUE);
+
+    // Create a new configuration object.
+    $config->set('value', 'initial');
+    $config->save();
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Verify the active configuration contains the saved value.
+    $actual_data = $storage->read($name);
+    $this->assertIdentical($actual_data, array('value' => 'initial'));
+
+    // Update the configuration object instance.
+    $config->set('value', 'instance-update');
+    $config->save();
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Verify the active configuration contains the updated value.
+    $actual_data = $storage->read($name);
+    $this->assertIdentical($actual_data, array('value' => 'instance-update'));
+
+    // Verify a call to $this->config() immediately returns the updated value.
+    $new_config = $this->config($name);
+    $this->assertIdentical($new_config->get(), $config->get());
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Pollute the config factory static cache.
+    $config_factory->getEditable($name);
+
+    // Delete the configuration object.
+    $config->delete();
+
+    // Verify the configuration object is empty.
+    $this->assertIdentical($config->get(), array());
+    $this->assertIdentical($config->isNew(), TRUE);
+
+    // Verify that all copies of the configuration has been removed from the
+    // static cache.
+    $this->assertIdentical($config_factory->getEditable($name)->isNew(), TRUE);
+
+    // Verify the active configuration contains no value.
+    $actual_data = $storage->read($name);
+    $this->assertIdentical($actual_data, FALSE);
+
+    // Verify $this->config() returns no data.
+    $new_config = $this->config($name);
+    $this->assertIdentical($new_config->get(), $config->get());
+    $this->assertIdentical($config->isNew(), TRUE);
+
+    // Re-create the configuration object.
+    $config->set('value', 're-created');
+    $config->save();
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Verify the active configuration contains the updated value.
+    $actual_data = $storage->read($name);
+    $this->assertIdentical($actual_data, array('value' => 're-created'));
+
+    // Verify a call to $this->config() immediately returns the updated value.
+    $new_config = $this->config($name);
+    $this->assertIdentical($new_config->get(), $config->get());
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Rename the configuration object.
+    $new_name = 'config_test.crud_rename';
+    $this->container->get('config.factory')->rename($name, $new_name);
+    $renamed_config = $this->config($new_name);
+    $this->assertIdentical($renamed_config->get(), $config->get());
+    $this->assertIdentical($renamed_config->isNew(), FALSE);
+
+    // Ensure that the old configuration object is removed from both the cache
+    // and the configuration storage.
+    $config = $this->config($name);
+    $this->assertIdentical($config->get(), array());
+    $this->assertIdentical($config->isNew(), TRUE);
+
+    // Test renaming when config.factory does not have the object in its static
+    // cache.
+    $name = 'config_test.crud_rename';
+    // Pollute the non-overrides static cache.
+    $config_factory->getEditable($name);
+    // Pollute the overrides static cache.
+    $config = $config_factory->get($name);
+    // Rename and ensure that happened properly.
+    $new_name = 'config_test.crud_rename_no_cache';
+    $config_factory->rename($name, $new_name);
+    $renamed_config = $config_factory->get($new_name);
+    $this->assertIdentical($renamed_config->get(), $config->get());
+    $this->assertIdentical($renamed_config->isNew(), FALSE);
+    // Ensure the overrides static cache has been cleared.
+    $this->assertIdentical($config_factory->get($name)->isNew(), TRUE);
+    // Ensure the non-overrides static cache has been cleared.
+    $this->assertIdentical($config_factory->getEditable($name)->isNew(), TRUE);
+
+    // Merge data into the configuration object.
+    $new_config = $this->config($new_name);
+    $expected_values = array(
+      'value' => 'herp',
+      '404' => 'derp',
+    );
+    $new_config->merge($expected_values);
+    $new_config->save();
+    $this->assertIdentical($new_config->get('value'), $expected_values['value']);
+    $this->assertIdentical($new_config->get('404'), $expected_values['404']);
+
+    // Test that getMultiple() does not return new config objects that were
+    // previously accessed with get()
+    $new_config = $config_factory->get('non_existing_key');
+    $this->assertTrue($new_config->isNew());
+    $this->assertEqual(0, count($config_factory->loadMultiple(['non_existing_key'])), 'loadMultiple() does not return new objects');
+  }
+
+  /**
+   * Tests the validation of configuration object names.
+   */
+  function testNameValidation() {
+    // Verify that an object name without namespace causes an exception.
+    $name = 'nonamespace';
+    $message = 'Expected ConfigNameException was thrown for a name without a namespace.';
+    try {
+      $this->config($name)->save();
+      $this->fail($message);
+    }
+    catch (ConfigNameException $e) {
+      $this->pass($message);
+    }
+
+    // Verify that a name longer than the maximum length causes an exception.
+    $name = 'config_test.herman_melville.moby_dick_or_the_whale.harper_1851.now_small_fowls_flew_screaming_over_the_yet_yawning_gulf_a_sullen_white_surf_beat_against_its_steep_sides_then_all_collapsed_and_the_great_shroud_of_the_sea_rolled_on_as_it_rolled_five_thousand_years_ago';
+    $message = 'Expected ConfigNameException was thrown for a name longer than Config::MAX_NAME_LENGTH.';
+    try {
+      $this->config($name)->save();
+      $this->fail($message);
+    }
+    catch (ConfigNameException $e) {
+      $this->pass($message);
+    }
+
+    // Verify that disallowed characters in the name cause an exception.
+    $characters = $test_characters = array(':', '?', '*', '<', '>', '"', '\'', '/', '\\');
+    foreach ($test_characters as $i => $c) {
+      try {
+        $name = 'namespace.object' . $c;
+        $config = $this->config($name);
+        $config->save();
+      }
+      catch (ConfigNameException $e) {
+        unset($test_characters[$i]);
+      }
+    }
+    $this->assertTrue(empty($test_characters), format_string('Expected ConfigNameException was thrown for all invalid name characters: @characters', array(
+      '@characters' => implode(' ', $characters),
+    )));
+
+    // Verify that a valid config object name can be saved.
+    $name = 'namespace.object';
+    $message = 'ConfigNameException was not thrown for a valid object name.';
+    try {
+      $config = $this->config($name);
+      $config->save();
+      $this->pass($message);
+    }
+    catch (ConfigNameException $e) {
+      $this->fail($message);
+    }
+
+  }
+
+  /**
+   * Tests the validation of configuration object values.
+   */
+  function testValueValidation() {
+    // Verify that setData() will catch dotted keys.
+    $message = 'Expected ConfigValueException was thrown from setData() for value with dotted keys.';
+    try {
+      $this->config('namespace.object')->setData(array('key.value' => 12))->save();
+      $this->fail($message);
+    }
+    catch (ConfigValueException $e) {
+      $this->pass($message);
+    }
+
+    // Verify that set() will catch dotted keys.
+    $message = 'Expected ConfigValueException was thrown from set() for value with dotted keys.';
+    try {
+      $this->config('namespace.object')->set('foo', array('key.value' => 12))->save();
+      $this->fail($message);
+    }
+    catch (ConfigValueException $e) {
+      $this->pass($message);
+    }
+  }
+
+  /**
+   * Tests data type handling.
+   */
+  public function testDataTypes() {
+    \Drupal::service('module_installer')->install(array('config_test'));
+    $storage = new DatabaseStorage($this->container->get('database'), 'config');
+    $name = 'config_test.types';
+    $config = $this->config($name);
+    $original_content = file_get_contents(drupal_get_path('module', 'config_test') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.yml");
+    $this->verbose('<pre>' . $original_content . "\n" . var_export($storage->read($name), TRUE));
+
+    // Verify variable data types are intact.
+    $data = array(
+      'array' => array(),
+      'boolean' => TRUE,
+      'exp' => 1.2e+34,
+      'float' => 3.14159,
+      'float_as_integer' => (float) 1,
+      'hex' => 0xC,
+      'int' => 99,
+      'octal' => 0775,
+      'string' => 'string',
+      'string_int' => '1',
+    );
+    $data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data));
+    $this->assertIdentical($config->get(), $data);
+
+    // Re-set each key using Config::set().
+    foreach($data as $key => $value) {
+      $config->set($key, $value);
+    }
+    $config->save();
+    $this->assertIdentical($config->get(), $data);
+    // Assert the data against the file storage.
+    $this->assertIdentical($storage->read($name), $data);
+    $this->verbose('<pre>' . $name . var_export($storage->read($name), TRUE));
+
+    // Set data using config::setData().
+    $config->setData($data)->save();
+    $this->assertIdentical($config->get(), $data);
+    $this->assertIdentical($storage->read($name), $data);
+
+    // Test that schema type enforcement can be overridden by trusting the data.
+    $this->assertIdentical(99, $config->get('int'));
+    $config->set('int', '99')->save(TRUE);
+    $this->assertIdentical('99', $config->get('int'));
+    // Test that re-saving without testing the data enforces the schema type.
+    $config->save();
+    $this->assertIdentical($data, $config->get());
+
+    // Test that setting an unsupported type for a config object with a schema
+    // fails.
+    try {
+      $config->set('stream', fopen(__FILE__, 'r'))->save();
+      $this->fail('No Exception thrown upon saving invalid data type.');
+    }
+    catch (UnsupportedDataTypeConfigException $e) {
+      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
+        '%class' => get_class($e),
+      )));
+    }
+
+    // Test that setting an unsupported type for a config object with no schema
+    // also fails.
+    $typed_config_manager = $this->container->get('config.typed');
+    $config_name = 'config_test.no_schema';
+    $config = $this->config($config_name);
+    $this->assertFalse($typed_config_manager->hasConfigSchema($config_name));
+
+    try {
+      $config->set('stream', fopen(__FILE__, 'r'))->save();
+      $this->fail('No Exception thrown upon saving invalid data type.');
+    }
+    catch (UnsupportedDataTypeConfigException $e) {
+      $this->pass(SafeMarkup::format('%class thrown upon saving invalid data type.', array(
+        '%class' => get_class($e),
+      )));
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
new file mode 100644
index 0000000..d5ae77d
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -0,0 +1,486 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigDependencyTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Tests for configuration dependencies.
+ *
+ * @group config
+ */
+class ConfigDependencyTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * The entity_test module is enabled to provide content entity types.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'entity_test', 'user');
+
+  /**
+   * Tests that calculating dependencies for system module.
+   */
+  public function testNonEntity() {
+    $this->installConfig(array('system'));
+    $config_manager = \Drupal::service('config.manager');
+    $dependents = $config_manager->findConfigEntityDependents('module', array('system'));
+    $this->assertTrue(isset($dependents['system.site']), 'Simple configuration system.site has a UUID key even though it is not a configuration entity and therefore is found when looking for dependencies of the System module.');
+    // Ensure that calling
+    // \Drupal\Core\Config\ConfigManager::findConfigEntityDependentsAsEntities()
+    // does not try to load system.site as an entity.
+    $config_manager->findConfigEntityDependentsAsEntities('module', array('system'));
+  }
+
+  /**
+   * Tests creating dependencies on configuration entities.
+   */
+  public function testDependencyManagement() {
+    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
+    $config_manager = \Drupal::service('config.manager');
+    $storage = $this->container->get('entity.manager')->getStorage('config_test');
+    // Test dependencies between modules.
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1',
+        'dependencies' => array(
+          'enforced' => array(
+            'module' => array('node')
+          )
+        )
+      )
+    );
+    $entity1->save();
+
+    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
+    $dependents = $config_manager->findConfigEntityDependents('module', array('config_test'));
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the config_test module.');
+    $dependents = $config_manager->findConfigEntityDependents('module', array('views'));
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Views module.');
+    // Ensure that the provider of the config entity is not actually written to
+    // the dependencies array.
+    $raw_config = $this->config('config_test.dynamic.entity1');
+    $root_module_dependencies = $raw_config->get('dependencies.module');
+    $this->assertTrue(empty($root_module_dependencies), 'Node module is not written to the root dependencies array as it is enforced.');
+
+    // Create additional entities to test dependencies on config entities.
+    $entity2 = $storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))));
+    $entity2->save();
+    $entity3 = $storage->create(array('id' => 'entity3', 'dependencies' => array('enforced' => array('config' => array($entity2->getConfigDependencyName())))));
+    $entity3->save();
+    $entity4 = $storage->create(array('id' => 'entity4', 'dependencies' => array('enforced' => array('config' => array($entity3->getConfigDependencyName())))));
+    $entity4->save();
+
+    // Test getting $entity1's dependencies as configuration dependency objects.
+    $dependents = $config_manager->findConfigEntityDependents('config', array($entity1->getConfigDependencyName()));
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on itself.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
+
+    // Test getting $entity2's dependencies as entities.
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity2->getConfigDependencyName()));
+    $dependent_ids = $this->getDependentIds($dependents);
+    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on config_test.dynamic.entity1.');
+    $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on itself.');
+    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity2.');
+    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity2.');
+
+    // Test getting node module's dependencies as configuration dependency
+    // objects.
+    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 has a dependency on the Node module.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the Node module.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
+
+    // Test getting node module's dependencies as configuration dependency
+    // objects after making $entity3 also dependent on node module but $entity1
+    // no longer depend on node module.
+    $entity1->setEnforcedDependencies([])->save();
+    $entity3->setEnforcedDependencies(['module' => ['node'], 'config' => [$entity2->getConfigDependencyName()]])->save();
+    $dependents = $config_manager->findConfigEntityDependents('module', array('node'));
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the Node module.');
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 does not have a dependency on the Node module.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the Node module.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the Node module.');
+
+    // Test dependency on a content entity.
+    $entity_test = EntityTest::create(array(
+      'name' => $this->randomString(),
+      'type' => 'entity_test',
+    ));
+    $entity_test->save();
+    $entity2->setEnforcedDependencies(['config' => [$entity1->getConfigDependencyName()], 'content' => [$entity_test->getConfigDependencyName()]])->save();;
+    $dependents = $config_manager->findConfigEntityDependents('content', array($entity_test->getConfigDependencyName()));
+    $this->assertFalse(isset($dependents['config_test.dynamic.entity1']), 'config_test.dynamic.entity1 does not have a dependency on the content entity.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity2']), 'config_test.dynamic.entity2 has a dependency on the content entity.');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity3']), 'config_test.dynamic.entity3 has a dependency on the content entity (via entity2).');
+    $this->assertTrue(isset($dependents['config_test.dynamic.entity4']), 'config_test.dynamic.entity4 has a dependency on the content entity (via entity3).');
+
+    // Create a configuration entity of a different type with the same ID as one
+    // of the entities already created.
+    $alt_storage = $this->container->get('entity.manager')->getStorage('config_query_test');
+    $alt_storage->create(array('id' => 'entity1', 'dependencies' => array('enforced' => array('config' => array($entity1->getConfigDependencyName())))))->save();
+    $alt_storage->create(array('id' => 'entity2', 'dependencies' => array('enforced' => array('module' => array('views')))))->save();
+
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('config', array($entity1->getConfigDependencyName()));
+    $dependent_ids = $this->getDependentIds($dependents);
+    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on itself.');
+    $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test.dynamic.entity1.');
+    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test.dynamic.entity1.');
+    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test.dynamic.entity1.');
+    $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_query_test.dynamic.entity1 has a dependency on config_test.dynamic.entity1.');
+    $this->assertFalse(in_array('config_query_test:entity2', $dependent_ids), 'config_query_test.dynamic.entity2 does not have a dependency on config_test.dynamic.entity1.');
+
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('node', 'views'));
+    $dependent_ids = $this->getDependentIds($dependents);
+    $this->assertFalse(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 does not have a dependency on Views or Node.');
+    $this->assertFalse(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 does not have a dependency on Views or Node.');
+    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on Views or Node.');
+    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on Views or Node.');
+    $this->assertFalse(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 does not have a dependency on Views or Node.');
+    $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on Views or Node.');
+
+    $dependents = $config_manager->findConfigEntityDependentsAsEntities('module', array('config_test'));
+    $dependent_ids = $this->getDependentIds($dependents);
+    $this->assertTrue(in_array('config_test:entity1', $dependent_ids), 'config_test.dynamic.entity1 has a dependency on config_test module.');
+    $this->assertTrue(in_array('config_test:entity2', $dependent_ids), 'config_test.dynamic.entity2 has a dependency on config_test module.');
+    $this->assertTrue(in_array('config_test:entity3', $dependent_ids), 'config_test.dynamic.entity3 has a dependency on config_test module.');
+    $this->assertTrue(in_array('config_test:entity4', $dependent_ids), 'config_test.dynamic.entity4 has a dependency on config_test module.');
+    $this->assertTrue(in_array('config_query_test:entity1', $dependent_ids), 'config_test.query.entity1 has a dependency on config_test module.');
+    $this->assertTrue(in_array('config_query_test:entity2', $dependent_ids), 'config_test.query.entity2 has a dependency on config_test module.');
+
+    // Test the ability to find missing content dependencies.
+    $missing_dependencies = $config_manager->findMissingContentDependencies();
+    $this->assertEqual([], $missing_dependencies);
+
+    $expected = [$entity_test->uuid() => [
+      'entity_type' => 'entity_test',
+      'bundle' => $entity_test->bundle(),
+      'uuid' => $entity_test->uuid(),
+    ]];
+    // Delete the content entity so that is it now missing.
+    $entity_test->delete();
+    $missing_dependencies = $config_manager->findMissingContentDependencies();
+    $this->assertEqual($expected, $missing_dependencies);
+
+    // Add a fake missing dependency to ensure multiple missing dependencies
+    // work.
+    $entity1->setEnforcedDependencies(['content' => [$entity_test->getConfigDependencyName(), 'entity_test:bundle:uuid']])->save();;
+    $expected['uuid'] = [
+      'entity_type' => 'entity_test',
+      'bundle' => 'bundle',
+      'uuid' => 'uuid',
+    ];
+    $missing_dependencies = $config_manager->findMissingContentDependencies();
+    $this->assertEqual($expected, $missing_dependencies);
+  }
+
+  /**
+   * Tests ConfigManager::uninstall() and config entity dependency management.
+   */
+  public function testConfigEntityUninstall() {
+    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
+    $config_manager = \Drupal::service('config.manager');
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
+    $storage = $this->container->get('entity.manager')->getStorage('config_test');
+    // Test dependencies between modules.
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1',
+        'dependencies' => array(
+          'enforced' => array(
+            'module' => array('node', 'config_test')
+          ),
+        ),
+      )
+    );
+    $entity1->save();
+    $entity2 = $storage->create(
+      array(
+        'id' => 'entity2',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity2->save();
+    // Perform a module rebuild so we can know where the node module is located
+    // and uninstall it.
+    // @todo Remove as part of https://www.drupal.org/node/2186491
+    system_rebuild_module_data();
+    // Test that doing a config uninstall of the node module deletes entity2
+    // since it is dependent on entity1 which is dependent on the node module.
+    $config_manager->uninstall('module', 'node');
+    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
+    $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
+
+    // Set a more complicated test where dependencies will be fixed.
+    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
+    \Drupal::state()->set('config_test.on_dependency_removal_called', []);
+    // Entity1 will be deleted because it depends on node.
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1',
+        'dependencies' => array(
+          'enforced' => array(
+            'module' => array('node', 'config_test')
+          ),
+        ),
+      )
+    );
+    $entity1->save();
+
+    // Entity2 has a dependency on Entity1 but it can be fixed because
+    // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
+    // dependency before config entities are deleted.
+    $entity2 = $storage->create(
+      array(
+        'id' => 'entity2',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity2->save();
+
+    // Entity3 will be unchanged because it is dependent on Entity2 which can
+    // be fixed. The ConfigEntityInterface::onDependencyRemoval() method will
+    // not be called for this entity.
+    $entity3 = $storage->create(
+      array(
+        'id' => 'entity3',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity2->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity3->save();
+
+    // Entity4's config dependency will be fixed but it will still be deleted
+    // because it also depends on the node module.
+    $entity4 = $storage->create(
+      array(
+        'id' => 'entity4',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName()),
+            'module' => array('node', 'config_test')
+          ),
+        ),
+      )
+    );
+    $entity4->save();
+
+    // Do a dry run using
+    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
+    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('module', ['node']);
+    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
+    $this->assertEqual($entity2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
+    $this->assertEqual($entity3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
+    $this->assertEqual($entity4->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 4 will be deleted.');
+
+    $called = \Drupal::state()->get('config_test.on_dependency_removal_called', []);
+    $this->assertFalse(in_array($entity3->id(), $called), 'ConfigEntityInterface::onDependencyRemoval() is not called for entity 3.');
+    $this->assertIdentical(['entity1', 'entity2', 'entity4'], $called, 'The most dependent entites have ConfigEntityInterface::onDependencyRemoval() called first.');
+
+    // Perform the uninstall.
+    $config_manager->uninstall('module', 'node');
+
+    // Test that expected actions have been performed.
+    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
+    $entity2 = $storage->load('entity2');
+    $this->assertTrue($entity2, 'Entity 2 not deleted');
+    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
+    $entity3 = $storage->load('entity3');
+    $this->assertTrue($entity3, 'Entity 3 not deleted');
+    $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
+    $this->assertFalse($storage->load('entity4'), 'Entity 4 deleted');
+  }
+
+  /**
+   * Tests deleting a configuration entity and dependency management.
+   */
+  public function testConfigEntityDelete() {
+    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
+    $config_manager = \Drupal::service('config.manager');
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
+    $storage = $this->container->get('entity.manager')->getStorage('config_test');
+    // Test dependencies between configuration entities.
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1'
+      )
+    );
+    $entity1->save();
+    $entity2 = $storage->create(
+      array(
+        'id' => 'entity2',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity2->save();
+
+    // Do a dry run using
+    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
+    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('config', [$entity1->getConfigDependencyName()]);
+    $this->assertEqual($entity2->uuid(), reset($config_entities['delete'])->uuid(), 'Entity 2 will be deleted.');
+    $this->assertTrue(empty($config_entities['update']), 'No dependent configuration entities will be updated.');
+    $this->assertTrue(empty($config_entities['unchanged']), 'No dependent configuration entities will be unchanged.');
+
+    // Test that doing a delete of entity1 deletes entity2 since it is dependent
+    // on entity1.
+    $entity1->delete();
+    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
+    $this->assertFalse($storage->load('entity2'), 'Entity 2 deleted');
+
+    // Set a more complicated test where dependencies will be fixed.
+    \Drupal::state()->set('config_test.fix_dependencies', array($entity1->getConfigDependencyName()));
+
+    // Entity1 will be deleted by the test.
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1',
+      )
+    );
+    $entity1->save();
+
+    // Entity2 has a dependency on Entity1 but it can be fixed because
+    // \Drupal\config_test\Entity::onDependencyRemoval() will remove the
+    // dependency before config entities are deleted.
+    $entity2 = $storage->create(
+      array(
+        'id' => 'entity2',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity2->save();
+
+    // Entity3 will be unchanged because it is dependent on Entity2 which can
+    // be fixed.
+    $entity3 = $storage->create(
+      array(
+        'id' => 'entity3',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity2->getConfigDependencyName()),
+          ),
+        ),
+      )
+    );
+    $entity3->save();
+
+    // Do a dry run using
+    // \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval().
+    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('config', [$entity1->getConfigDependencyName()]);
+    $this->assertTrue(empty($config_entities['delete']), 'No dependent configuration entities will be deleted.');
+    $this->assertEqual($entity2->uuid(), reset($config_entities['update'])->uuid(), 'Entity 2 will be updated.');
+    $this->assertEqual($entity3->uuid(), reset($config_entities['unchanged'])->uuid(), 'Entity 3 is not changed.');
+
+    // Perform the uninstall.
+    $entity1->delete();
+
+    // Test that expected actions have been performed.
+    $this->assertFalse($storage->load('entity1'), 'Entity 1 deleted');
+    $entity2 = $storage->load('entity2');
+    $this->assertTrue($entity2, 'Entity 2 not deleted');
+    $this->assertEqual($entity2->calculateDependencies()->getDependencies()['config'], array(), 'Entity 2 dependencies updated to remove dependency on Entity1.');
+    $entity3 = $storage->load('entity3');
+    $this->assertTrue($entity3, 'Entity 3 not deleted');
+    $this->assertEqual($entity3->calculateDependencies()->getDependencies()['config'], [$entity2->getConfigDependencyName()], 'Entity 3 still depends on Entity 2.');
+  }
+
+  /**
+   * Tests getConfigEntitiesToChangeOnDependencyRemoval() with content entities.
+   *
+   * At the moment there is no runtime code that calculates configuration
+   * dependencies on content entity delete because this calculation is expensive
+   * and all content dependencies are soft. This test ensures that the code
+   * works for content entities.
+   *
+   * @see \Drupal\Core\Config\ConfigManager::getConfigEntitiesToChangeOnDependencyRemoval()
+   */
+  public function testContentEntityDelete() {
+    $this->installEntitySchema('entity_test');
+    /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
+    $config_manager = \Drupal::service('config.manager');
+
+    $content_entity = EntityTest::create();
+    $content_entity->save();
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
+    $storage = $this->container->get('entity.manager')->getStorage('config_test');
+    $entity1 = $storage->create(
+      array(
+        'id' => 'entity1',
+        'dependencies' => array(
+          'enforced' => array(
+            'content' => array($content_entity->getConfigDependencyName())
+          ),
+        ),
+      )
+    );
+    $entity1->save();
+    $entity2 = $storage->create(
+      array(
+        'id' => 'entity2',
+        'dependencies' => array(
+          'enforced' => array(
+            'config' => array($entity1->getConfigDependencyName())
+          ),
+        ),
+      )
+    );
+    $entity2->save();
+
+    // Create a configuration entity that is not in the dependency chain.
+    $entity3 = $storage->create(array('id' => 'entity3'));
+    $entity3->save();
+
+    $config_entities = $config_manager->getConfigEntitiesToChangeOnDependencyRemoval('content', [$content_entity->getConfigDependencyName()]);
+    $this->assertEqual($entity1->uuid(), $config_entities['delete'][0]->uuid(), 'Entity 1 will be deleted.');
+    $this->assertEqual($entity2->uuid(), $config_entities['delete'][1]->uuid(), 'Entity 2 will be deleted.');
+    $this->assertTrue(empty($config_entities['update']), 'No dependencies of the content entity will be updated.');
+    $this->assertTrue(empty($config_entities['unchanged']), 'No dependencies of the content entity will be unchanged.');
+  }
+
+  /**
+   * Gets a list of identifiers from an array of configuration entities.
+   *
+   * @param \Drupal\Core\Config\Entity\ConfigEntityInterface[] $dependents
+   *   An array of configuration entities.
+   *
+   * @return array
+   *   An array with values of entity_type_id:ID
+   */
+  protected function getDependentIds(array $dependents) {
+    $dependent_ids = array();
+    foreach($dependents as $dependent) {
+      $dependent_ids[] = $dependent->getEntityTypeId() . ':' . $dependent->id();
+    }
+    return $dependent_ids;
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
new file mode 100644
index 0000000..b6162a7
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
@@ -0,0 +1,147 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigDiffTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Calculating the difference between two sets of configuration.
+ *
+ * @group config
+ */
+class ConfigDiffTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'system');
+
+  /**
+   * Tests calculating the difference between two sets of configuration.
+   */
+  function testDiff() {
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $config_name = 'config_test.system';
+    $change_key = 'foo';
+    $remove_key = '404';
+    $add_key = 'biff';
+    $add_data = 'bangpow';
+    $change_data = 'foobar';
+
+    // Install the default config.
+    $this->installConfig(array('config_test'));
+    $original_data = \Drupal::config($config_name)->get();
+
+    // Change a configuration value in sync.
+    $sync_data = $original_data;
+    $sync_data[$change_key] = $change_data;
+    $sync_data[$add_key] = $add_data;
+    $sync->write($config_name, $sync_data);
+
+    // Verify that the diff reflects a change.
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'change', 'The first item in the diff is a change.');
+    $this->assertEqual($edits[0]->orig[0], $change_key . ': ' . $original_data[$change_key], format_string("The active value for key '%change_key' is '%original_data'.", array('%change_key' => $change_key, '%original_data' => $original_data[$change_key])));
+    $this->assertEqual($edits[0]->closing[0], $change_key . ': ' . $change_data, format_string("The sync value for key '%change_key' is '%change_data'.", array('%change_key' => $change_key, '%change_data' => $change_data)));
+
+    // Reset data back to original, and remove a key
+    $sync_data = $original_data;
+    unset($sync_data[$remove_key]);
+    $sync->write($config_name, $sync_data);
+
+    // Verify that the diff reflects a removed key.
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
+    $this->assertEqual($edits[1]->type, 'delete', 'The second item in the diff is a delete.');
+    $this->assertEqual($edits[1]->orig[0], $remove_key . ': ' . $original_data[$remove_key], format_string("The active value for key '%remove_key' is '%original_data'.", array('%remove_key' => $remove_key, '%original_data' => $original_data[$remove_key])));
+    $this->assertFalse($edits[1]->closing, format_string("The key '%remove_key' does not exist in sync.", array('%remove_key' => $remove_key)));
+
+    // Reset data back to original and add a key
+    $sync_data = $original_data;
+    $sync_data[$add_key] = $add_data;
+    $sync->write($config_name, $sync_data);
+
+    // Verify that the diff reflects an added key.
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
+    $this->assertEqual($edits[1]->type, 'add', 'The second item in the diff is an add.');
+    $this->assertFalse($edits[1]->orig, format_string("The key '%add_key' does not exist in active.", array('%add_key' => $add_key)));
+    $this->assertEqual($edits[1]->closing[0], $add_key . ': ' . $add_data, format_string("The sync value for key '%add_key' is '%add_data'.", array('%add_key' => $add_key, '%add_data' => $add_data)));
+
+    // Test diffing a renamed config entity.
+    $test_entity_id = $this->randomMachineName();
+    $test_entity = entity_create('config_test', array(
+      'id' => $test_entity_id,
+      'label' => $this->randomMachineName(),
+    ));
+    $test_entity->save();
+    $data = $active->read('config_test.dynamic.' . $test_entity_id);
+    $sync->write('config_test.dynamic.' . $test_entity_id, $data);
+    $config_name = 'config_test.dynamic.' . $test_entity_id;
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, $config_name);
+    // Prove the fields match.
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
+    $this->assertEqual(count($edits), 1, 'There is one item in the diff');
+
+    // Rename the entity.
+    $new_test_entity_id = $this->randomMachineName();
+    $test_entity->set('id', $new_test_entity_id);
+    $test_entity->save();
+
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, 'config_test.dynamic.' . $new_test_entity_id, $config_name);
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
+    $this->assertEqual($edits[1]->type, 'change', 'The second item in the diff is a change.');
+    $this->assertEqual($edits[1]->orig, array('id: ' . $new_test_entity_id));
+    $this->assertEqual($edits[1]->closing, array('id: ' . $test_entity_id));
+    $this->assertEqual($edits[2]->type, 'copy', 'The third item in the diff is a copy.');
+    $this->assertEqual(count($edits), 3, 'There are three items in the diff.');
+  }
+
+  /**
+   * Tests calculating the difference between two sets of config collections.
+   */
+  function testCollectionDiff() {
+    /** @var \Drupal\Core\Config\StorageInterface $active */
+    $active = $this->container->get('config.storage');
+    /** @var \Drupal\Core\Config\StorageInterface $sync */
+    $sync = $this->container->get('config.storage.sync');
+    $active_test_collection = $active->createCollection('test');
+    $sync_test_collection = $sync->createCollection('test');
+
+    $config_name = 'config_test.test';
+    $data = array('foo' => 'bar');
+
+    $active->write($config_name, $data);
+    $sync->write($config_name, $data);
+    $active_test_collection->write($config_name, $data);
+    $sync_test_collection->write($config_name, array('foo' => 'baz'));
+
+    // Test the fields match in the default collection diff.
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name);
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'copy', 'The first item in the diff is a copy.');
+    $this->assertEqual(count($edits), 1, 'There is one item in the diff');
+
+    // Test that the differences are detected when diffing the collection.
+    $diff = \Drupal::service('config.manager')->diff($active, $sync, $config_name, NULL, 'test');
+    $edits = $diff->getEdits();
+    $this->assertEqual($edits[0]->type, 'change', 'The second item in the diff is a copy.');
+    $this->assertEqual($edits[0]->orig, array('foo: bar'));
+    $this->assertEqual($edits[0]->closing, array('foo: baz'));
+    $this->assertEqual($edits[1]->type, 'copy', 'The second item in the diff is a copy.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
new file mode 100644
index 0000000..65fe117
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEntityNormalizeTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the listing of configuration entities.
+ *
+ * @group config
+ */
+class ConfigEntityNormalizeTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(static::$modules);
+  }
+
+  public function testNormalize() {
+    $config_entity = entity_create('config_test', array('id' => 'system', 'label' => 'foobar', 'weight' => 1));
+    $config_entity->save();
+
+    // Modify stored config entity, this is comparable with a schema change.
+    $config = $this->config('config_test.dynamic.system');
+    $data = array(
+      'label' => 'foobar',
+      'additional_key' => TRUE
+    ) + $config->getRawData();
+    $config->setData($data)->save();
+    $this->assertNotIdentical($config_entity->toArray(), $config->getRawData(), 'Stored config entity is not is equivalent to config schema.');
+
+    $config_entity = entity_load('config_test', 'system', TRUE);
+    $config_entity->save();
+
+    $config = $this->config('config_test.dynamic.system');
+    $this->assertIdentical($config_entity->toArray(), $config->getRawData(), 'Stored config entity is equivalent to config schema.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php
new file mode 100644
index 0000000..d807ea9
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStaticCacheTest.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEntityStaticCacheTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\config_entity_static_cache_test\ConfigOverrider;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the entity static cache when used by config entities.
+ *
+ * @group config
+ */
+class ConfigEntityStaticCacheTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'config_entity_static_cache_test');
+
+  /**
+   * The type ID of the entity under test.
+   *
+   * @var string
+   */
+  protected $entityTypeId;
+
+  /**
+   * The entity ID of the entity under test.
+   *
+   * @var string
+   */
+  protected $entityId;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->entityTypeId = 'config_test';
+    $this->entityId = 'test_1';
+    $this->container->get('entity_type.manager')
+      ->getStorage($this->entityTypeId)
+      ->create(array('id' => $this->entityId, 'label' => 'Original label'))
+      ->save();
+  }
+
+  /**
+   * Tests that the static cache is working.
+   */
+  public function testCacheHit() {
+    $entity_1 = entity_load($this->entityTypeId, $this->entityId);
+    $entity_2 = entity_load($this->entityTypeId, $this->entityId);
+    // config_entity_static_cache_test_config_test_load() sets _loadStamp to a
+    // random string. If they match, it means $entity_2 was retrieved from the
+    // static cache rather than going through a separate load sequence.
+    $this->assertIdentical($entity_1->_loadStamp, $entity_2->_loadStamp);
+  }
+
+  /**
+   * Tests that the static cache is reset on entity save and delete.
+   */
+  public function testReset() {
+    $entity = entity_load($this->entityTypeId, $this->entityId);
+
+    // Ensure loading after a save retrieves the updated entity rather than an
+    // obsolete cached one.
+    $entity->label = 'New label';
+    $entity->save();
+    $entity = entity_load($this->entityTypeId, $this->entityId);
+    $this->assertIdentical($entity->label, 'New label');
+
+    // Ensure loading after a delete retrieves NULL rather than an obsolete
+    // cached one.
+    $entity->delete();
+    $this->assertNull(entity_load($this->entityTypeId, $this->entityId));
+  }
+
+  /**
+   * Tests that the static cache is sensitive to config overrides.
+   */
+  public function testConfigOverride() {
+    /** @var \Drupal\Core\Config\Entity\ConfigEntityStorage $storage */
+    $storage = \Drupal::entityManager()->getStorage($this->entityTypeId);
+    // Prime the cache prior to adding a config override.
+    $storage->load($this->entityId);
+
+    // Add the config override, and ensure that what is loaded is correct
+    // despite the prior cache priming.
+    \Drupal::configFactory()->addOverride(new ConfigOverrider());
+    $entity_override = $storage->load($this->entityId);
+    $this->assertIdentical($entity_override->label, 'Overridden label');
+
+    // Load override free to ensure that loading the config entity again does
+    // not return the overridden value.
+    $entity_no_override = $storage->loadOverrideFree($this->entityId);
+    $this->assertNotIdentical($entity_no_override->label, 'Overridden label');
+    $this->assertNotIdentical($entity_override->_loadStamp, $entity_no_override->_loadStamp);
+
+    // Reload the entity and ensure the cache is used.
+    $this->assertIdentical($storage->loadOverrideFree($this->entityId)->_loadStamp, $entity_no_override->_loadStamp);
+
+    // Enable overrides and reload the entity and ensure the cache is used.
+    $this->assertIdentical($storage->load($this->entityId)->_loadStamp, $entity_override->_loadStamp);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
new file mode 100644
index 0000000..477fdf4
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEntityStatusTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests configuration entity status functionality.
+ *
+ * @group config
+ */
+class ConfigEntityStatusTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test');
+
+  /**
+   * Tests the enabling/disabling of entities.
+   */
+  function testCRUD() {
+    $entity = entity_create('config_test', array(
+      'id' => strtolower($this->randomMachineName()),
+    ));
+    $this->assertTrue($entity->status(), 'Default status is enabled.');
+    $entity->save();
+    $this->assertTrue($entity->status(), 'Status is enabled after saving.');
+
+    $entity->disable()->save();
+    $this->assertFalse($entity->status(), 'Entity is disabled after disabling.');
+
+    $entity->enable()->save();
+    $this->assertTrue($entity->status(), 'Entity is enabled after enabling.');
+
+    $entity = entity_load('config_test', $entity->id());
+    $this->assertTrue($entity->status(), 'Status is enabled after reload.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
new file mode 100644
index 0000000..33953a1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEntityStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\ConfigDuplicateUUIDException;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests sync and importing config entities with IDs and UUIDs that match
+ * existing config.
+ *
+ * @group config
+ */
+class ConfigEntityStorageTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test');
+
+  /**
+   * Tests creating configuration entities with changed UUIDs.
+   */
+  public function testUUIDConflict() {
+    $entity_type = 'config_test';
+    $id = 'test_1';
+    // Load the original configuration entity.
+    $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => $id))
+      ->save();
+    $entity = entity_load($entity_type, $id);
+
+    $original_properties = $entity->toArray();
+
+    // Override with a new UUID and try to save.
+    $new_uuid = $this->container->get('uuid')->generate();
+    $entity->set('uuid', $new_uuid);
+
+    try {
+      $entity->save();
+      $this->fail('Exception thrown when attempting to save a configuration entity with a UUID that does not match the existing UUID.');
+    }
+    catch (ConfigDuplicateUUIDException $e) {
+      $this->pass(format_string('Exception thrown when attempting to save a configuration entity with a UUID that does not match existing data: %e.', array('%e' => $e)));
+    }
+
+    // Ensure that the config entity was not corrupted.
+    $entity = entity_load('config_test', $entity->id(), TRUE);
+    $this->assertIdentical($entity->toArray(), $original_properties);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
new file mode 100644
index 0000000..0b57f5b
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityUnitTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEntityUnitTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Unit tests for configuration entity base methods.
+ *
+ * @group config
+ */
+class ConfigEntityUnitTest extends KernelTestBase {
+
+  /**
+   * Exempt from strict schema checking.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = FALSE;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test');
+
+  /**
+   * The config_test entity storage.
+   *
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->storage = $this->container->get('entity.manager')->getStorage('config_test');
+  }
+
+  /**
+   * Tests storage methods.
+   */
+  public function testStorageMethods() {
+    $entity_type = \Drupal::entityManager()->getDefinition('config_test');
+
+    // Test the static extractID() method.
+    $expected_id = 'test_id';
+    $config_name = $entity_type->getConfigPrefix() . '.' . $expected_id;
+    $storage = $this->storage;
+    $this->assertIdentical($storage::getIDFromConfigName($config_name, $entity_type->getConfigPrefix()), $expected_id);
+
+    // Create three entities, two with the same style.
+    $style = $this->randomMachineName(8);
+    for ($i = 0; $i < 2; $i++) {
+      $entity = $this->storage->create(array(
+        'id' => $this->randomMachineName(),
+        'label' => $this->randomString(),
+        'style' => $style,
+      ));
+      $entity->save();
+    }
+    $entity = $this->storage->create(array(
+      'id' => $this->randomMachineName(),
+      'label' => $this->randomString(),
+      // Use a different length for the entity to ensure uniqueness.
+      'style' => $this->randomMachineName(9),
+    ));
+    $entity->save();
+
+    // Ensure that the configuration entity can be loaded by UUID.
+    $entity_loaded_by_uuid = \Drupal::entityManager()->loadEntityByUuid($entity_type->id(), $entity->uuid());
+    if (!$entity_loaded_by_uuid) {
+      $this->fail(sprintf("Failed to load '%s' entity ID '%s' by UUID '%s'.", $entity_type->id(), $entity->id(), $entity->uuid()));
+    }
+    // Compare UUIDs as the objects are not identical since
+    // $entity->enforceIsNew is FALSE and $entity_loaded_by_uuid->enforceIsNew
+    // is NULL.
+    $this->assertIdentical($entity->uuid(), $entity_loaded_by_uuid->uuid());
+
+    $entities = $this->storage->loadByProperties();
+    $this->assertEqual(count($entities), 3, 'Three entities are loaded when no properties are specified.');
+
+    $entities = $this->storage->loadByProperties(array('style' => $style));
+    $this->assertEqual(count($entities), 2, 'Two entities are loaded when the style property is specified.');
+
+    // Assert that both returned entities have a matching style property.
+    foreach ($entities as $entity) {
+      $this->assertIdentical($entity->get('style'), $style, 'The loaded entity has the correct style value specified.');
+    }
+
+    // Test that schema type enforcement can be overridden by trusting the data.
+    $entity = $this->storage->create(array(
+      'id' => $this->randomMachineName(),
+      'label' => $this->randomString(),
+      'style' => 999
+    ));
+    $entity->save();
+    $this->assertIdentical('999', $entity->style);
+    $entity->style = 999;
+    $entity->trustData()->save();
+    $this->assertIdentical(999, $entity->style);
+    $entity->save();
+    $this->assertIdentical('999', $entity->style);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php
new file mode 100644
index 0000000..fc7944d
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEventsTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigEventsTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\Config;
+use Drupal\Core\Config\ConfigEvents;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests events fired on configuration objects.
+ *
+ * @group config
+ */
+class ConfigEventsTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_events_test');
+
+  /**
+   * Tests configuration events.
+   */
+  function testConfigEvents() {
+    $name = 'config_events_test.test';
+
+    $config = new Config($name, \Drupal::service('config.storage'), \Drupal::service('event_dispatcher'), \Drupal::service('config.typed'));
+    $config->set('key', 'initial');
+    $this->assertIdentical(\Drupal::state()->get('config_events_test.event', array()), array(), 'No events fired by creating a new configuration object');
+    $config->save();
+
+    $event = \Drupal::state()->get('config_events_test.event', array());
+    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
+    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
+    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
+    $this->assertIdentical($event['original_config_data'], array());
+
+    $config->set('key', 'updated')->save();
+    $event = \Drupal::state()->get('config_events_test.event', array());
+    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
+    $this->assertIdentical($event['current_config_data'], array('key' => 'updated'));
+    $this->assertIdentical($event['raw_config_data'], array('key' => 'updated'));
+    $this->assertIdentical($event['original_config_data'], array('key' => 'initial'));
+
+    $config->delete();
+    $event = \Drupal::state()->get('config_events_test.event', array());
+    $this->assertIdentical($event['event_name'], ConfigEvents::DELETE);
+    $this->assertIdentical($event['current_config_data'], array());
+    $this->assertIdentical($event['raw_config_data'], array());
+    $this->assertIdentical($event['original_config_data'], array('key' => 'updated'));
+  }
+
+  /**
+   * Tests configuration rename event that is fired from the ConfigFactory.
+   */
+  function testConfigRenameEvent() {
+    $name = 'config_events_test.test';
+    $new_name = 'config_events_test.test_rename';
+    $GLOBALS['config'][$name] = array('key' => 'overridden');
+    $GLOBALS['config'][$new_name] = array('key' => 'new overridden');
+
+    $config = $this->config($name);
+    $config->set('key', 'initial')->save();
+    $event = \Drupal::state()->get('config_events_test.event', array());
+    $this->assertIdentical($event['event_name'], ConfigEvents::SAVE);
+    $this->assertIdentical($event['current_config_data'], array('key' => 'initial'));
+
+    // Override applies when getting runtime config.
+    $this->assertEqual($GLOBALS['config'][$name], \Drupal::config($name)->get());
+
+    \Drupal::configFactory()->rename($name, $new_name);
+    $event = \Drupal::state()->get('config_events_test.event', array());
+    $this->assertIdentical($event['event_name'], ConfigEvents::RENAME);
+    $this->assertIdentical($event['current_config_data'], array('key' => 'new overridden'));
+    $this->assertIdentical($event['raw_config_data'], array('key' => 'initial'));
+    $this->assertIdentical($event['original_config_data'], array('key' => 'new overridden'));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
new file mode 100644
index 0000000..1e3bf56
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigFileContentTest.php
@@ -0,0 +1,235 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigFileContentTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\FileStorage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests reading and writing of configuration files.
+ *
+ * @group config
+ */
+class ConfigFileContentTest extends KernelTestBase {
+
+  /**
+   * Exempt from strict schema checking.
+   *
+   * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker
+   *
+   * @var bool
+   */
+  protected $strictConfigSchema = FALSE;
+
+  /**
+   * Tests setting, writing, and reading of a configuration setting.
+   */
+  function testReadWriteConfig() {
+    $storage = $this->container->get('config.storage');
+
+    $name = 'foo.bar';
+    $key = 'foo';
+    $value = 'bar';
+    $nested_key = 'biff.bang';
+    $nested_value = 'pow';
+    $array_key = 'array';
+    $array_value = array(
+      'foo' => 'bar',
+      'biff' => array(
+        'bang' => 'pow',
+      ),
+    );
+    $casting_array_key = 'casting_array';
+    $casting_array_false_value_key = 'casting_array.cast.false';
+    $casting_array_value = array(
+      'cast' => array(
+        'false' => FALSE,
+      ),
+    );
+    $nested_array_key = 'nested.array';
+    $true_key = 'true';
+    $false_key = 'false';
+
+    // Attempt to read non-existing configuration.
+    $config = $this->config($name);
+
+    // Verify a configuration object is returned.
+    $this->assertEqual($config->getName(), $name);
+    $this->assertTrue($config, 'Config object created.');
+
+    // Verify the configuration object is empty.
+    $this->assertEqual($config->get(), array(), 'New config object is empty.');
+
+    // Verify nothing was saved.
+    $data = $storage->read($name);
+    $this->assertIdentical($data, FALSE);
+
+    // Add a top level value.
+    $config = $this->config($name);
+    $config->set($key, $value);
+
+    // Add a nested value.
+    $config->set($nested_key, $nested_value);
+
+    // Add an array.
+    $config->set($array_key, $array_value);
+
+    // Add a nested array.
+    $config->set($nested_array_key, $array_value);
+
+    // Add a boolean false value. Should get cast to 0.
+    $config->set($false_key, FALSE);
+
+    // Add a boolean true value. Should get cast to 1.
+    $config->set($true_key, TRUE);
+
+    // Add a null value. Should get cast to an empty string.
+    $config->set('null', NULL);
+
+    // Add an array with a nested boolean false that should get cast to 0.
+    $config->set($casting_array_key, $casting_array_value);
+    $config->save();
+
+    // Verify the database entry exists.
+    $data = $storage->read($name);
+    $this->assertTrue($data);
+
+    // Read top level value.
+    $config = $this->config($name);
+    $this->assertEqual($config->getName(), $name);
+    $this->assertTrue($config, 'Config object created.');
+    $this->assertEqual($config->get($key), 'bar', 'Top level configuration value found.');
+
+    // Read nested value.
+    $this->assertEqual($config->get($nested_key), $nested_value, 'Nested configuration value found.');
+
+    // Read array.
+    $this->assertEqual($config->get($array_key), $array_value, 'Top level array configuration value found.');
+
+    // Read nested array.
+    $this->assertEqual($config->get($nested_array_key), $array_value, 'Nested array configuration value found.');
+
+    // Read a top level value that doesn't exist.
+    $this->assertNull($config->get('i_dont_exist'), 'Non-existent top level value returned NULL.');
+
+    // Read a nested value that doesn't exist.
+    $this->assertNull($config->get('i.dont.exist'), 'Non-existent nested value returned NULL.');
+
+    // Read false value.
+    $this->assertFalse($config->get($false_key), "Boolean FALSE value returned the FALSE.");
+
+    // Read true value.
+    $this->assertTrue($config->get($true_key), "Boolean TRUE value returned the TRUE.");
+
+    // Read null value.
+    $this->assertIdentical($config->get('null'), NULL);
+
+    // Read false that had been nested in an array value.
+    $this->assertSame($config->get($casting_array_false_value_key), FALSE, "Nested boolean FALSE value returned FALSE.");
+
+    // Unset a top level value.
+    $config->clear($key);
+
+    // Unset a nested value.
+    $config->clear($nested_key);
+    $config->save();
+    $config = $this->config($name);
+
+    // Read unset top level value.
+    $this->assertNull($config->get($key), 'Top level value unset.');
+
+    // Read unset nested value.
+    $this->assertNull($config->get($nested_key), 'Nested value unset.');
+
+    // Create two new configuration files to test listing.
+    $config = $this->config('foo.baz');
+    $config->set($key, $value);
+    $config->save();
+
+    // Test chained set()->save().
+    $chained_name = 'biff.bang';
+    $config = $this->config($chained_name);
+    $config->set($key, $value)->save();
+
+    // Verify the database entry exists from a chained save.
+    $data = $storage->read($chained_name);
+    $this->assertEqual($data, $config->get());
+
+    // Get file listing for all files starting with 'foo'. Should return
+    // two elements.
+    $files = $storage->listAll('foo');
+    $this->assertEqual(count($files), 2, 'Two files listed with the prefix \'foo\'.');
+
+    // Get file listing for all files starting with 'biff'. Should return
+    // one element.
+    $files = $storage->listAll('biff');
+    $this->assertEqual(count($files), 1, 'One file listed with the prefix \'biff\'.');
+
+    // Get file listing for all files starting with 'foo.bar'. Should return
+    // one element.
+    $files = $storage->listAll('foo.bar');
+    $this->assertEqual(count($files), 1, 'One file listed with the prefix \'foo.bar\'.');
+
+    // Get file listing for all files starting with 'bar'. Should return
+    // an empty array.
+    $files = $storage->listAll('bar');
+    $this->assertEqual($files, array(), 'No files listed with the prefix \'bar\'.');
+
+    // Delete the configuration.
+    $config = $this->config($name);
+    $config->delete();
+
+    // Verify the database entry no longer exists.
+    $data = $storage->read($name);
+    $this->assertIdentical($data, FALSE);
+  }
+
+  /**
+   * Tests serialization of configuration to file.
+   */
+  function testSerialization() {
+    $name = $this->randomMachineName(10) . '.' . $this->randomMachineName(10);
+    $config_data = array(
+      // Indexed arrays; the order of elements is essential.
+      'numeric keys' => array('i', 'n', 'd', 'e', 'x', 'e', 'd'),
+      // Infinitely nested keys using arbitrary element names.
+      'nested keys' => array(
+        // HTML/XML in values.
+        'HTML' => '<strong> <bold> <em> <blockquote>',
+        // UTF-8 in values.
+        'UTF-8' => 'FrançAIS is ÜBER-åwesome',
+        // Unicode in keys and values.
+        'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ' => 'αβγδεζηθικλμνξοσὠ',
+      ),
+      'invalid xml' => '</title><script type="text/javascript">alert("Title XSS!");</script> & < > " \' ',
+    );
+
+    // Encode and write, and reload and decode the configuration data.
+    $filestorage = new FileStorage(config_get_config_directory(CONFIG_SYNC_DIRECTORY));
+    $filestorage->write($name, $config_data);
+    $config_parsed = $filestorage->read($name);
+
+    $key = 'numeric keys';
+    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
+
+    $key = 'nested keys';
+    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
+
+    $key = 'HTML';
+    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
+
+    $key = 'UTF-8';
+    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
+
+    $key = 'ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΣὨ';
+    $this->assertIdentical($config_data['nested keys'][$key], $config_parsed['nested keys'][$key]);
+
+    $key = 'invalid xml';
+    $this->assertIdentical($config_data[$key], $config_parsed[$key]);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
new file mode 100644
index 0000000..26a08de
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigImportRecreateTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Tests importing recreated configuration entities.
+ *
+ * @group config
+ */
+class ConfigImportRecreateTest extends KernelTestBase {
+
+  /**
+   * Config Importer object used for testing.
+   *
+   * @var \Drupal\Core\Config\ConfigImporter
+   */
+  protected $configImporter;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'field', 'text', 'user', 'node'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('node');
+    $this->installConfig(array('field', 'node'));
+
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $this->configImporter = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+  }
+
+  public function testRecreateEntity() {
+    $type_name = Unicode::strtolower($this->randomMachineName(16));
+    $content_type = NodeType::create([
+      'type' => $type_name,
+      'name' => 'Node type one',
+    ]);
+    $content_type->save();
+    node_add_body_field($content_type);
+    /** @var \Drupal\Core\Config\StorageInterface $active */
+    $active = $this->container->get('config.storage');
+    /** @var \Drupal\Core\Config\StorageInterface $sync */
+    $sync = $this->container->get('config.storage.sync');
+
+    $config_name = $content_type->getEntityType()->getConfigPrefix() . '.' . $content_type->id();
+    $this->copyConfig($active, $sync);
+
+    // Delete the content type. This will also delete a field storage, a field,
+    // an entity view display and an entity form display.
+    $content_type->delete();
+    $this->assertFalse($active->exists($config_name), 'Content type\'s old name does not exist active store.');
+    // Recreate with the same type - this will have a different UUID.
+    $content_type = NodeType::create([
+      'type' => $type_name,
+      'name' => 'Node type two',
+    ]);
+    $content_type->save();
+    node_add_body_field($content_type);
+
+    $this->configImporter->reset();
+    // A node type, a field, an entity view display and an entity form display
+    // will be recreated.
+    $creates = $this->configImporter->getUnprocessedConfiguration('create');
+    $deletes = $this->configImporter->getUnprocessedConfiguration('delete');
+    $this->assertEqual(5, count($creates), 'There are 5 configuration items to create.');
+    $this->assertEqual(5, count($deletes), 'There are 5 configuration items to delete.');
+    $this->assertEqual(0, count($this->configImporter->getUnprocessedConfiguration('update')), 'There are no configuration items to update.');
+    $this->assertIdentical($creates, array_reverse($deletes), 'Deletes and creates contain the same configuration names in opposite orders due to dependencies.');
+
+    $this->configImporter->import();
+
+    // Verify that there is nothing more to import.
+    $this->assertFalse($this->configImporter->reset()->hasUnprocessedConfigurationChanges());
+    $content_type = NodeType::load($type_name);
+    $this->assertEqual('Node type one', $content_type->label());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
new file mode 100644
index 0000000..80b4cb1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigImportRenameValidationTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Utility\Unicode;
+use Drupal\Component\Uuid\Php;
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\ConfigImporterException;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\node\Entity\NodeType;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests validating renamed configuration in a configuration import.
+ *
+ * @group config
+ */
+class ConfigImportRenameValidationTest extends KernelTestBase {
+
+  /**
+   * Config Importer object used for testing.
+   *
+   * @var \Drupal\Core\Config\ConfigImporter
+   */
+  protected $configImporter;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'user', 'node', 'field', 'text', 'config_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('node');
+    $this->installConfig(array('field'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $this->configImporter = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock.persistent'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+  }
+
+  /**
+   * Tests configuration renaming validation.
+   */
+  public function testRenameValidation() {
+    // Create a test entity.
+    $test_entity_id = $this->randomMachineName();
+    $test_entity = entity_create('config_test', array(
+      'id' => $test_entity_id,
+      'label' => $this->randomMachineName(),
+    ));
+    $test_entity->save();
+    $uuid = $test_entity->uuid();
+
+    // Stage the test entity and then delete it from the active storage.
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+    $test_entity->delete();
+
+    // Create a content type with a matching UUID in the active storage.
+    $content_type = NodeType::create([
+      'type' => Unicode::strtolower($this->randomMachineName(16)),
+      'name' => $this->randomMachineName(),
+      'uuid' => $uuid,
+    ]);
+    $content_type->save();
+
+    // Confirm that the staged configuration is detected as a rename since the
+    // UUIDs match.
+    $this->configImporter->reset();
+    $expected = array(
+      'node.type.' . $content_type->id() . '::config_test.dynamic.' . $test_entity_id,
+    );
+    $renames = $this->configImporter->getUnprocessedConfiguration('rename');
+    $this->assertIdentical($expected, $renames);
+
+    // Try to import the configuration. We expect an exception to be thrown
+    // because the staged entity is of a different type.
+    try {
+      $this->configImporter->import();
+      $this->fail('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->pass('Expected ConfigImporterException thrown when a renamed configuration entity does not match the existing entity type.');
+      $expected = array(
+        SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id))
+      );
+      $this->assertEqual($expected, $this->configImporter->getErrors());
+    }
+  }
+
+  /**
+   * Tests configuration renaming validation for simple configuration.
+   */
+  public function testRenameSimpleConfigValidation() {
+    $uuid = new Php();
+    // Create a simple configuration with a UUID.
+    $config = $this->config('config_test.new');
+    $uuid_value = $uuid->generate();
+    $config->set('uuid', $uuid_value)->save();
+
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $this->copyConfig($active, $sync);
+    $config->delete();
+
+    // Create another simple configuration with the same UUID.
+    $config = $this->config('config_test.old');
+    $config->set('uuid', $uuid_value)->save();
+
+    // Confirm that the staged configuration is detected as a rename since the
+    // UUIDs match.
+    $this->configImporter->reset();
+    $expected = array(
+      'config_test.old::config_test.new'
+    );
+    $renames = $this->configImporter->getUnprocessedConfiguration('rename');
+    $this->assertIdentical($expected, $renames);
+
+    // Try to import the configuration. We expect an exception to be thrown
+    // because the rename is for simple configuration.
+    try {
+      $this->configImporter->import();
+      $this->fail('Expected ConfigImporterException thrown when simple configuration is renamed.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->pass('Expected ConfigImporterException thrown when simple configuration is renamed.');
+      $expected = array(
+        SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => 'config_test.old', '@new_name' => 'config_test.new'))
+      );
+      $this->assertEqual($expected, $this->configImporter->getErrors());
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
new file mode 100644
index 0000000..7b4dc0c
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigImporterMissingContentTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests importing configuration which has missing content dependencies.
+ *
+ * @group config
+ */
+class ConfigImporterMissingContentTest extends KernelTestBase {
+
+  /**
+   * Config Importer object used for testing.
+   *
+   * @var \Drupal\Core\Config\ConfigImporter
+   */
+  protected $configImporter;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'entity_test', 'config_test', 'config_import_test');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('system', 'sequences');
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
+    $this->installConfig(array('config_test'));
+    // Installing config_test's default configuration pollutes the global
+    // variable being used for recording hook invocations by this test already,
+    // so it has to be cleared out manually.
+    unset($GLOBALS['hook_config_test']);
+
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $this->configImporter = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+  }
+
+  /**
+   * Tests the missing content event is fired.
+   *
+   * @see \Drupal\Core\Config\ConfigImporter::processMissingContent()
+   * @see \Drupal\config_import_test\EventSubscriber
+   */
+  function testMissingContent() {
+    \Drupal::state()->set('config_import_test.config_import_missing_content', TRUE);
+
+    // Update a configuration entity in the sync directory to have a dependency
+    // on two content entities that do not exist.
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $entity_one = EntityTest::create(array('name' => 'one'));
+    $entity_two = EntityTest::create(array('name' => 'two'));
+    $entity_three = EntityTest::create(array('name' => 'three'));
+    $dynamic_name = 'config_test.dynamic.dotted.default';
+    $original_dynamic_data = $storage->read($dynamic_name);
+    // Entity one will be resolved by
+    // \Drupal\config_import_test\EventSubscriber::onConfigImporterMissingContentOne().
+    $original_dynamic_data['dependencies']['content'][] = $entity_one->getConfigDependencyName();
+    // Entity two will be resolved by
+    // \Drupal\config_import_test\EventSubscriber::onConfigImporterMissingContentTwo().
+    $original_dynamic_data['dependencies']['content'][] = $entity_two->getConfigDependencyName();
+    // Entity three will be resolved by
+    // \Drupal\Core\Config\Importer\FinalMissingContentSubscriber.
+    $original_dynamic_data['dependencies']['content'][] = $entity_three->getConfigDependencyName();
+    $sync->write($dynamic_name, $original_dynamic_data);
+
+    // Import.
+    $this->configImporter->reset()->import();
+    $this->assertEqual([], $this->configImporter->getErrors(), 'There were no errors during the import.');
+    $this->assertEqual($entity_one->uuid(), \Drupal::state()->get('config_import_test.config_import_missing_content_one'), 'The missing content event is fired during configuration import.');
+    $this->assertEqual($entity_two->uuid(), \Drupal::state()->get('config_import_test.config_import_missing_content_two'), 'The missing content event is fired during configuration import.');
+    $original_dynamic_data = $storage->read($dynamic_name);
+    $this->assertEqual([$entity_one->getConfigDependencyName(), $entity_two->getConfigDependencyName(), $entity_three->getConfigDependencyName()], $original_dynamic_data['dependencies']['content'], 'The imported configuration entity has the missing content entity dependency.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
new file mode 100644
index 0000000..62b6228
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -0,0 +1,694 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigImporterTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\ConfigImporterException;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests importing configuration from files into active configuration.
+ *
+ * @group config
+ */
+class ConfigImporterTest extends KernelTestBase {
+
+  /**
+   * Config Importer object used for testing.
+   *
+   * @var \Drupal\Core\Config\ConfigImporter
+   */
+  protected $configImporter;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'system', 'config_import_test');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(array('config_test'));
+    // Installing config_test's default configuration pollutes the global
+    // variable being used for recording hook invocations by this test already,
+    // so it has to be cleared out manually.
+    unset($GLOBALS['hook_config_test']);
+
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $this->configImporter = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+  }
+
+  /**
+   * Tests omission of module APIs for bare configuration operations.
+   */
+  function testNoImport() {
+    $dynamic_name = 'config_test.dynamic.dotted.default';
+
+    // Verify the default configuration values exist.
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('id'), 'dotted.default');
+
+    // Verify that a bare $this->config() does not involve module APIs.
+    $this->assertFalse(isset($GLOBALS['hook_config_test']));
+  }
+
+  /**
+   * Tests that trying to import from an empty sync configuration directory
+   * fails.
+   */
+  function testEmptyImportFails() {
+    try {
+      $this->container->get('config.storage.sync')->deleteAll();
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException thrown, successfully stopping an empty import.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->pass('ConfigImporterException thrown, successfully stopping an empty import.');
+    }
+  }
+
+  /**
+   * Tests verification of site UUID before importing configuration.
+   */
+  function testSiteUuidValidate() {
+    $sync = \Drupal::service('config.storage.sync');
+    // Create updated configuration object.
+    $config_data = $this->config('system.site')->get();
+    // Generate a new site UUID.
+    $config_data['uuid'] = \Drupal::service('uuid')->generate();
+    $sync->write('system.site', $config_data);
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to mis-matching site UUID.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      $expected = array('Site UUID in source storage does not match the target storage.');
+      $this->assertEqual($expected, $error_log);
+    }
+  }
+
+  /**
+   * Tests deletion of configuration during import.
+   */
+  function testDeleted() {
+    $dynamic_name = 'config_test.dynamic.dotted.default';
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+
+    // Verify the default configuration values exist.
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('id'), 'dotted.default');
+
+    // Delete the file from the sync directory.
+    $sync->delete($dynamic_name);
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    // Verify the file has been removed.
+    $this->assertIdentical($storage->read($dynamic_name), FALSE);
+
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('id'), NULL);
+
+    // Verify that appropriate module API hooks have been invoked.
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['load']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['presave']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['insert']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['predelete']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['delete']));
+
+    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 0);
+  }
+
+  /**
+   * Tests creation of configuration during import.
+   */
+  function testNew() {
+    $dynamic_name = 'config_test.dynamic.new';
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+
+    // Verify the configuration to create does not exist yet.
+    $this->assertIdentical($storage->exists($dynamic_name), FALSE, $dynamic_name . ' not found.');
+
+    // Create new config entity.
+    $original_dynamic_data = array(
+      'uuid' => '30df59bd-7b03-4cf7-bb35-d42fc49f0651',
+      'langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId(),
+      'status' => TRUE,
+      'dependencies' => array(),
+      'id' => 'new',
+      'label' => 'New',
+      'weight' => 0,
+      'style' => '',
+      'size' => '',
+      'size_value' => '',
+      'protected_property' => '',
+    );
+    $sync->write($dynamic_name, $original_dynamic_data);
+
+    $this->assertIdentical($sync->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    // Verify the values appeared.
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('label'), $original_dynamic_data['label']);
+
+    // Verify that appropriate module API hooks have been invoked.
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['load']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['insert']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
+
+    // Verify that hook_config_import_steps_alter() can add steps to
+    // configuration synchronization.
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['config_import_steps_alter']));
+
+    // Verify that there is nothing more to import.
+    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 0);
+  }
+
+  /**
+   * Tests that secondary writes are overwritten.
+   */
+  function testSecondaryWritePrimaryFirst() {
+    $name_primary = 'config_test.dynamic.primary';
+    $name_secondary = 'config_test.dynamic.secondary';
+    $sync = $this->container->get('config.storage.sync');
+    $uuid = $this->container->get('uuid');
+
+    $values_primary = array(
+      'id' => 'primary',
+      'label' => 'Primary',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+    );
+    $sync->write($name_primary, $values_primary);
+    $values_secondary = array(
+      'id' => 'secondary',
+      'label' => 'Secondary Sync',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on primary, to ensure that is synced first.
+      'dependencies' => array(
+        'config' => array($name_primary),
+      )
+    );
+    $sync->write($name_secondary, $values_secondary);
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
+    $primary = $entity_storage->load('primary');
+    $this->assertEqual($primary->id(), 'primary');
+    $this->assertEqual($primary->uuid(), $values_primary['uuid']);
+    $this->assertEqual($primary->label(), $values_primary['label']);
+    $secondary = $entity_storage->load('secondary');
+    $this->assertEqual($secondary->id(), 'secondary');
+    $this->assertEqual($secondary->uuid(), $values_secondary['uuid']);
+    $this->assertEqual($secondary->label(), $values_secondary['label']);
+
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 1);
+    $this->assertEqual($logs[0], SafeMarkup::format('Deleted and replaced configuration entity "@name"', array('@name' => $name_secondary)));
+  }
+
+  /**
+   * Tests that secondary writes are overwritten.
+   */
+  function testSecondaryWriteSecondaryFirst() {
+    $name_primary = 'config_test.dynamic.primary';
+    $name_secondary = 'config_test.dynamic.secondary';
+    $sync = $this->container->get('config.storage.sync');
+    $uuid = $this->container->get('uuid');
+
+    $values_primary = array(
+      'id' => 'primary',
+      'label' => 'Primary',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on secondary, so that is synced first.
+      'dependencies' => array(
+        'config' => array($name_secondary),
+      )
+    );
+    $sync->write($name_primary, $values_primary);
+    $values_secondary = array(
+      'id' => 'secondary',
+      'label' => 'Secondary Sync',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+    );
+    $sync->write($name_secondary, $values_secondary);
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
+    $primary = $entity_storage->load('primary');
+    $this->assertEqual($primary->id(), 'primary');
+    $this->assertEqual($primary->uuid(), $values_primary['uuid']);
+    $this->assertEqual($primary->label(), $values_primary['label']);
+    $secondary = $entity_storage->load('secondary');
+    $this->assertEqual($secondary->id(), 'secondary');
+    $this->assertEqual($secondary->uuid(), $values_secondary['uuid']);
+    $this->assertEqual($secondary->label(), $values_secondary['label']);
+
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 1);
+    $this->assertEqual($logs[0], Html::escape("Unexpected error during import with operation create for $name_primary: 'config_test' entity with ID 'secondary' already exists."));
+  }
+
+  /**
+   * Tests that secondary updates for deleted files work as expected.
+   */
+  function testSecondaryUpdateDeletedDeleterFirst() {
+    $name_deleter = 'config_test.dynamic.deleter';
+    $name_deletee = 'config_test.dynamic.deletee';
+    $name_other = 'config_test.dynamic.other';
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $uuid = $this->container->get('uuid');
+
+    $values_deleter = array(
+      'id' => 'deleter',
+      'label' => 'Deleter',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+    );
+    $storage->write($name_deleter, $values_deleter);
+    $values_deleter['label'] = 'Updated Deleter';
+    $sync->write($name_deleter, $values_deleter);
+    $values_deletee = array(
+      'id' => 'deletee',
+      'label' => 'Deletee',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on deleter, to make sure that is synced first.
+      'dependencies' => array(
+        'config' => array($name_deleter),
+      )
+    );
+    $storage->write($name_deletee, $values_deletee);
+    $values_deletee['label'] = 'Updated Deletee';
+    $sync->write($name_deletee, $values_deletee);
+
+    // Ensure that import will continue after the error.
+    $values_other = array(
+      'id' => 'other',
+      'label' => 'Other',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on deleter, to make sure that is synced first. This
+      // will also be synced after the deletee due to alphabetical ordering.
+      'dependencies' => array(
+        'config' => array($name_deleter),
+      )
+    );
+    $storage->write($name_other, $values_other);
+    $values_other['label'] = 'Updated other';
+    $sync->write($name_other, $values_other);
+
+    // Check update changelist order.
+    $updates = $this->configImporter->reset()->getStorageComparer()->getChangelist('update');
+    $expected = array(
+      $name_deleter,
+      $name_deletee,
+      $name_other,
+    );
+    $this->assertIdentical($expected, $updates);
+
+    // Import.
+    $this->configImporter->import();
+
+    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
+    $deleter = $entity_storage->load('deleter');
+    $this->assertEqual($deleter->id(), 'deleter');
+    $this->assertEqual($deleter->uuid(), $values_deleter['uuid']);
+    $this->assertEqual($deleter->label(), $values_deleter['label']);
+
+    // The deletee was deleted in
+    // \Drupal\config_test\Entity\ConfigTest::postSave().
+    $this->assertFalse($entity_storage->load('deletee'));
+
+    $other = $entity_storage->load('other');
+    $this->assertEqual($other->id(), 'other');
+    $this->assertEqual($other->uuid(), $values_other['uuid']);
+    $this->assertEqual($other->label(), $values_other['label']);
+
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 1);
+    $this->assertEqual($logs[0], SafeMarkup::format('Update target "@name" is missing.', array('@name' => $name_deletee)));
+  }
+
+  /**
+   * Tests that secondary updates for deleted files work as expected.
+   *
+   * This test is completely hypothetical since we only support full
+   * configuration tree imports. Therefore, any configuration updates that cause
+   * secondary deletes should be reflected already in the staged configuration.
+   */
+  function testSecondaryUpdateDeletedDeleteeFirst() {
+    $name_deleter = 'config_test.dynamic.deleter';
+    $name_deletee = 'config_test.dynamic.deletee';
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $uuid = $this->container->get('uuid');
+
+    $values_deleter = array(
+      'id' => 'deleter',
+      'label' => 'Deleter',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on deletee, to make sure that is synced first.
+      'dependencies' => array(
+        'config' => array($name_deletee),
+      ),
+    );
+    $storage->write($name_deleter, $values_deleter);
+    $values_deleter['label'] = 'Updated Deleter';
+    $sync->write($name_deleter, $values_deleter);
+    $values_deletee = array(
+      'id' => 'deletee',
+      'label' => 'Deletee',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+    );
+    $storage->write($name_deletee, $values_deletee);
+    $values_deletee['label'] = 'Updated Deletee';
+    $sync->write($name_deletee, $values_deletee);
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
+    // Both entities are deleted. ConfigTest::postSave() causes updates of the
+    // deleter entity to delete the deletee entity. Since the deleter depends on
+    // the deletee, removing the deletee causes the deleter to be removed.
+    $this->assertFalse($entity_storage->load('deleter'));
+    $this->assertFalse($entity_storage->load('deletee'));
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 0);
+  }
+
+  /**
+   * Tests that secondary deletes for deleted files work as expected.
+   */
+  function testSecondaryDeletedDeleteeSecond() {
+    $name_deleter = 'config_test.dynamic.deleter';
+    $name_deletee = 'config_test.dynamic.deletee';
+    $storage = $this->container->get('config.storage');
+
+    $uuid = $this->container->get('uuid');
+
+    $values_deleter = array(
+      'id' => 'deleter',
+      'label' => 'Deleter',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+      // Add a dependency on deletee, to make sure this delete is synced first.
+      'dependencies' => array(
+        'config' => array($name_deletee),
+      ),
+    );
+    $storage->write($name_deleter, $values_deleter);
+    $values_deletee = array(
+      'id' => 'deletee',
+      'label' => 'Deletee',
+      'weight' => 0,
+      'uuid' => $uuid->generate(),
+    );
+    $storage->write($name_deletee, $values_deletee);
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    $entity_storage = \Drupal::entityManager()->getStorage('config_test');
+    $this->assertFalse($entity_storage->load('deleter'));
+    $this->assertFalse($entity_storage->load('deletee'));
+    // The deletee entity does not exist as the delete worked and although the
+    // delete occurred in \Drupal\config_test\Entity\ConfigTest::postDelete()
+    // this does not matter.
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 0);
+  }
+
+  /**
+   * Tests updating of configuration during import.
+   */
+  function testUpdated() {
+    $name = 'config_test.system';
+    $dynamic_name = 'config_test.dynamic.dotted.default';
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+
+    // Verify that the configuration objects to import exist.
+    $this->assertIdentical($storage->exists($name), TRUE, $name . ' found.');
+    $this->assertIdentical($storage->exists($dynamic_name), TRUE, $dynamic_name . ' found.');
+
+    // Replace the file content of the existing configuration objects in the
+    // sync directory.
+    $original_name_data = array(
+      'foo' => 'beer',
+    );
+    $sync->write($name, $original_name_data);
+    $original_dynamic_data = $storage->read($dynamic_name);
+    $original_dynamic_data['label'] = 'Updated';
+    $sync->write($dynamic_name, $original_dynamic_data);
+
+    // Verify the active configuration still returns the default values.
+    $config = $this->config($name);
+    $this->assertIdentical($config->get('foo'), 'bar');
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('label'), 'Default');
+
+    // Import.
+    $this->configImporter->reset()->import();
+
+    // Verify the values were updated.
+    \Drupal::configFactory()->reset($name);
+    $config = $this->config($name);
+    $this->assertIdentical($config->get('foo'), 'beer');
+    $config = $this->config($dynamic_name);
+    $this->assertIdentical($config->get('label'), 'Updated');
+
+    // Verify that the original file content is still the same.
+    $this->assertIdentical($sync->read($name), $original_name_data);
+    $this->assertIdentical($sync->read($dynamic_name), $original_dynamic_data);
+
+    // Verify that appropriate module API hooks have been invoked.
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['load']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['insert']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['update']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
+
+    // Verify that there is nothing more to import.
+    $this->assertFalse($this->configImporter->hasUnprocessedConfigurationChanges());
+    $logs = $this->configImporter->getErrors();
+    $this->assertEqual(count($logs), 0);
+  }
+
+  /**
+   * Tests the isInstallable method()
+   */
+  function testIsInstallable() {
+    $config_name = 'config_test.dynamic.isinstallable';
+    $this->assertFalse($this->container->get('config.storage')->exists($config_name));
+    \Drupal::state()->set('config_test.isinstallable', TRUE);
+    $this->installConfig(array('config_test'));
+    $this->assertTrue($this->container->get('config.storage')->exists($config_name));
+  }
+
+  /**
+   * Tests dependency validation during configuration import.
+   *
+   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
+   * @see \Drupal\Core\Config\ConfigImporter::createExtensionChangelist()
+   */
+  public function testUnmetDependency() {
+    $storage = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+
+    // Test an unknown configuration owner.
+    $sync->write('unknown.config', ['test' => 'test']);
+
+    // Make a config entity have unmet dependencies.
+    $config_entity_data = $sync->read('config_test.dynamic.dotted.default');
+    $config_entity_data['dependencies'] = ['module' => ['unknown']];
+    $sync->write('config_test.dynamic.dotted.module', $config_entity_data);
+    $config_entity_data['dependencies'] = ['theme' => ['unknown']];
+    $sync->write('config_test.dynamic.dotted.theme', $config_entity_data);
+    $config_entity_data['dependencies'] = ['config' => ['unknown']];
+    $sync->write('config_test.dynamic.dotted.config', $config_entity_data);
+
+    // Make an active config depend on something that is missing in sync.
+    // The whole configuration needs to be consistent, not only the updated one.
+    $config_entity_data['dependencies'] = [];
+    $storage->write('config_test.dynamic.dotted.deleted', $config_entity_data);
+    $config_entity_data['dependencies'] = ['config' => ['config_test.dynamic.dotted.deleted']];
+    $storage->write('config_test.dynamic.dotted.existing', $config_entity_data);
+    $sync->write('config_test.dynamic.dotted.existing', $config_entity_data);
+
+    $extensions = $sync->read('core.extension');
+    // Add a module and a theme that do not exist.
+    $extensions['module']['unknown_module'] = 0;
+    $extensions['theme']['unknown_theme'] = 0;
+    // Add a module and a theme that depend on uninstalled extensions.
+    $extensions['module']['book'] = 0;
+    $extensions['theme']['bartik'] = 0;
+
+    $sync->write('core.extension', $extensions);
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown; an invalid import was not stopped due to missing dependencies.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      $expected = [
+        'Unable to install the <em class="placeholder">unknown_module</em> module since it does not exist.',
+        'Unable to install the <em class="placeholder">Book</em> module since it requires the <em class="placeholder">Node, Text, Field, Filter, User</em> modules.',
+        'Unable to install the <em class="placeholder">unknown_theme</em> theme since it does not exist.',
+        'Unable to install the <em class="placeholder">Bartik</em> theme since it requires the <em class="placeholder">Classy</em> theme.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on the <em class="placeholder">unknown</em> configuration that will not exist after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.existing</em> depends on the <em class="placeholder">config_test.dynamic.dotted.deleted</em> configuration that will not exist after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on the <em class="placeholder">unknown</em> module that will not be installed after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on the <em class="placeholder">unknown</em> theme that will not be installed after import.',
+        'Configuration <em class="placeholder">unknown.config</em> depends on the <em class="placeholder">unknown</em> extension that will not be installed after import.',
+      ];
+      foreach ($expected as $expected_message) {
+        $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
+      }
+    }
+
+    // Make a config entity have mulitple unmet dependencies.
+    $config_entity_data = $sync->read('config_test.dynamic.dotted.default');
+    $config_entity_data['dependencies'] = ['module' => ['unknown', 'dblog']];
+    $sync->write('config_test.dynamic.dotted.module', $config_entity_data);
+    $config_entity_data['dependencies'] = ['theme' => ['unknown', 'seven']];
+    $sync->write('config_test.dynamic.dotted.theme', $config_entity_data);
+    $config_entity_data['dependencies'] = ['config' => ['unknown', 'unknown2']];
+    $sync->write('config_test.dynamic.dotted.config', $config_entity_data);
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to missing dependencies.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      $expected = [
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on configuration (<em class="placeholder">unknown, unknown2</em>) that will not exist after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on modules (<em class="placeholder">unknown, Database Logging</em>) that will not be installed after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Seven</em>) that will not be installed after import.',
+      ];
+      foreach ($expected as $expected_message) {
+        $this->assertTrue(in_array($expected_message, $error_log), $expected_message);
+      }
+    }
+  }
+
+  /**
+   * Tests missing core.extension during configuration import.
+   *
+   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
+   */
+  public function testMissingCoreExtension() {
+    $sync = $this->container->get('config.storage.sync');
+    $sync->delete('core.extension');
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown, invalid import was not stopped due to missing dependencies.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      $this->assertEqual(['The core.extension configuration does not exist.'], $error_log);
+    }
+  }
+
+  /**
+   * Tests install profile validation during configuration import.
+   *
+   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
+   */
+  public function testInstallProfile() {
+    $sync = $this->container->get('config.storage.sync');
+
+    $extensions = $sync->read('core.extension');
+    // Add an install profile.
+    $extensions['module']['standard'] = 0;
+
+    $sync->write('core.extension', $extensions);
+    try {
+      $this->configImporter->reset()->import();
+      $this->fail('ConfigImporterException not thrown; an invalid import was not stopped due to missing dependencies.');
+    }
+    catch (ConfigImporterException $e) {
+      $this->assertEqual($e->getMessage(), 'There were errors validating the config synchronization.');
+      $error_log = $this->configImporter->getErrors();
+      // Install profiles should not even be scanned at this point.
+      $this->assertEqual(['Unable to install the <em class="placeholder">standard</em> module since it does not exist.'], $error_log);
+    }
+  }
+
+  /**
+   * Tests config_get_config_directory().
+   */
+  public function testConfigGetConfigDirectory() {
+    global $config_directories;
+    $directory = config_get_config_directory(CONFIG_SYNC_DIRECTORY);
+    $this->assertEqual($config_directories[CONFIG_SYNC_DIRECTORY], $directory);
+
+    $message = 'Calling config_get_config_directory() with CONFIG_ACTIVE_DIRECTORY results in an exception.';
+    try {
+      config_get_config_directory(CONFIG_ACTIVE_DIRECTORY);
+      $this->fail($message);
+    }
+    catch (\Exception $e) {
+      $this->pass($message);
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
new file mode 100644
index 0000000..9522370
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
@@ -0,0 +1,253 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigInstallTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\PreExistingConfigException;
+use Drupal\Core\Config\UnmetDependenciesException;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests installation of configuration objects in installation functionality.
+ *
+ * @group config
+ * @see \Drupal\Core\Config\ConfigInstaller
+ */
+class ConfigInstallTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Ensure the global variable being asserted by this test does not exist;
+    // a previous test executed in this request/process might have set it.
+    unset($GLOBALS['hook_config_test']);
+  }
+
+  /**
+   * Tests module installation.
+   */
+  function testModuleInstallation() {
+    $default_config = 'config_test.system';
+    $default_configuration_entity = 'config_test.dynamic.dotted.default';
+
+    // Verify that default module config does not exist before installation yet.
+    $config = $this->config($default_config);
+    $this->assertIdentical($config->isNew(), TRUE);
+    $config = $this->config($default_configuration_entity);
+    $this->assertIdentical($config->isNew(), TRUE);
+
+    // Ensure that schema provided by modules that are not installed is not
+    // available.
+    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
+
+    // Install the test module.
+    $this->installModules(array('config_test'));
+
+    // Verify that default module config exists.
+    \Drupal::configFactory()->reset($default_config);
+    \Drupal::configFactory()->reset($default_configuration_entity);
+    $config = $this->config($default_config);
+    $this->assertIdentical($config->isNew(), FALSE);
+    $config = $this->config($default_configuration_entity);
+    $this->assertIdentical($config->isNew(), FALSE);
+
+    // Verify that config_test API hooks were invoked for the dynamic default
+    // configuration entity.
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['load']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['presave']));
+    $this->assertTrue(isset($GLOBALS['hook_config_test']['insert']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['update']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['predelete']));
+    $this->assertFalse(isset($GLOBALS['hook_config_test']['delete']));
+
+    // Install the schema test module.
+    $this->enableModules(array('config_schema_test'));
+    $this->installConfig(array('config_schema_test'));
+
+    // After module installation the new schema should exist.
+    $this->assertTrue(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema exists.');
+
+    // Test that uninstalling configuration removes configuration schema.
+    $this->config('core.extension')->set('module', array())->save();
+    \Drupal::service('config.manager')->uninstall('module', 'config_test');
+    $this->assertFalse(\Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'), 'Configuration schema for config_schema_test.someschema does not exist.');
+  }
+
+  /**
+   * Tests that collections are ignored if the event does not return anything.
+   */
+  public function testCollectionInstallationNoCollections() {
+    // Install the test module.
+    $this->enableModules(array('config_collection_install_test'));
+    $this->installConfig(array('config_collection_install_test'));
+    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
+    $active_storage = \Drupal::service('config.storage');
+    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
+  }
+
+  /**
+   * Tests config objects in collections are installed as expected.
+   */
+  public function testCollectionInstallationCollections() {
+    $collections = array(
+      'another_collection',
+      'collection.test1',
+      'collection.test2',
+    );
+    // Set the event listener to return three possible collections.
+    // @see \Drupal\config_collection_install_test\EventSubscriber
+    \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
+    // Install the test module.
+    $this->enableModules(array('config_collection_install_test'));
+    $this->installConfig(array('config_collection_install_test'));
+    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
+    $active_storage = \Drupal::service('config.storage');
+    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
+    foreach ($collections as $collection) {
+      $collection_storage = $active_storage->createCollection($collection);
+      $data = $collection_storage->read('config_collection_install_test.test');
+      $this->assertEqual($collection, $data['collection']);
+    }
+
+    // Tests that clashing configuration in collections is detected.
+    try {
+      \Drupal::service('module_installer')->install(['config_collection_clash_install_test']);
+      $this->fail('Expected PreExistingConfigException not thrown.');
+    }
+    catch (PreExistingConfigException $e) {
+      $this->assertEqual($e->getExtension(), 'config_collection_clash_install_test');
+      $this->assertEqual($e->getConfigObjects(), [
+        'another_collection' => ['config_collection_install_test.test'],
+        'collection.test1' => ['config_collection_install_test.test'],
+        'collection.test2' => ['config_collection_install_test.test'],
+      ]);
+      $this->assertEqual($e->getMessage(), 'Configuration objects (another_collection/config_collection_install_test.test, collection/test1/config_collection_install_test.test, collection/test2/config_collection_install_test.test) provided by config_collection_clash_install_test already exist in active configuration');
+    }
+
+    // Test that the we can use the config installer to install all the
+    // available default configuration in a particular collection for enabled
+    // extensions.
+    \Drupal::service('config.installer')->installCollectionDefaultConfig('entity');
+    // The 'entity' collection will not exist because the 'config_test' module
+    // is not enabled.
+    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
+    // Enable the 'config_test' module and try again.
+    $this->enableModules(array('config_test'));
+    \Drupal::service('config.installer')->installCollectionDefaultConfig('entity');
+    $collections[] = 'entity';
+    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
+    $collection_storage = $active_storage->createCollection('entity');
+    $data = $collection_storage->read('config_test.dynamic.dotted.default');
+    $this->assertIdentical(array('label' => 'entity'), $data);
+
+    // Test that the config manager uninstalls configuration from collections
+    // as expected.
+    \Drupal::service('config.manager')->uninstall('module', 'config_collection_install_test');
+    $this->assertEqual(array('entity'), $active_storage->getAllCollectionNames());
+    \Drupal::service('config.manager')->uninstall('module', 'config_test');
+    $this->assertEqual(array(), $active_storage->getAllCollectionNames());
+  }
+
+  /**
+   * Tests collections which do not support config entities install correctly.
+   *
+   * Config entity detection during config installation is done by matching
+   * config name prefixes. If a collection provides a configuration with a
+   * matching name but does not support config entities it should be created
+   * using simple configuration.
+   */
+  public function testCollectionInstallationCollectionConfigEntity() {
+    $collections = array(
+      'entity',
+    );
+    \Drupal::state()->set('config_collection_install_test.collection_names', $collections);
+    // Install the test module.
+    $this->installModules(array('config_test', 'config_collection_install_test'));
+    /** @var \Drupal\Core\Config\StorageInterface $active_storage */
+    $active_storage = \Drupal::service('config.storage');
+    $this->assertEqual($collections, $active_storage->getAllCollectionNames());
+    $collection_storage = $active_storage->createCollection('entity');
+
+    // The config_test.dynamic.dotted.default configuration object saved in the
+    // active store should be a configuration entity complete with UUID. Because
+    // the entity collection does not support configuration entities the
+    // configuration object stored there with the same name should only contain
+    // a label.
+    $name = 'config_test.dynamic.dotted.default';
+    $data = $active_storage->read($name);
+    $this->assertTrue(isset($data['uuid']));
+    $data = $collection_storage->read($name);
+    $this->assertIdentical(array('label' => 'entity'), $data);
+  }
+
+  /**
+   * Tests the configuration with unmet dependencies is not installed.
+   */
+  public function testDependencyChecking() {
+    $this->installModules(['config_test']);
+    try {
+      $this->installModules(['config_install_dependency_test']);
+      $this->fail('Expected UnmetDependenciesException not thrown.');
+    }
+    catch (UnmetDependenciesException $e) {
+      $this->assertEqual($e->getExtension(), 'config_install_dependency_test');
+      $this->assertEqual($e->getConfigObjects(), ['config_test.dynamic.other_module_test_with_dependency']);
+      $this->assertEqual($e->getMessage(), 'Configuration objects (config_test.dynamic.other_module_test_with_dependency) provided by config_install_dependency_test have unmet dependencies');
+    }
+    $this->installModules(['config_other_module_config_test']);
+    $this->installModules(['config_install_dependency_test']);
+    $entity = \Drupal::entityManager()->getStorage('config_test')->load('other_module_test_with_dependency');
+    $this->assertTrue($entity, 'The config_test.dynamic.other_module_test_with_dependency configuration has been created during install.');
+    // Ensure that dependencies can be added during module installation by
+    // hooks.
+    $this->assertIdentical('config_install_dependency_test', $entity->getDependencies()['module'][0]);
+  }
+
+  /**
+   * Tests imported configuration entities with and without language information.
+   */
+  function testLanguage() {
+    $this->installModules(['config_test_language']);
+    // Test imported configuration with implicit language code.
+    $storage = new InstallStorage();
+    $data = $storage->read('config_test.dynamic.dotted.english');
+    $this->assertTrue(!isset($data['langcode']));
+    $this->assertEqual(
+      $this->config('config_test.dynamic.dotted.english')->get('langcode'),
+      'en'
+    );
+
+    // Test imported configuration with explicit language code.
+    $data = $storage->read('config_test.dynamic.dotted.french');
+    $this->assertEqual($data['langcode'], 'fr');
+    $this->assertEqual(
+      $this->config('config_test.dynamic.dotted.french')->get('langcode'),
+      'fr'
+    );
+  }
+
+  /**
+   * Installs a module.
+   *
+   * @param array $modules
+   *   The module names.
+   */
+  protected function installModules(array $modules) {
+    $this->container->get('module_installer')->install($modules);
+    $this->container = \Drupal::getContainer();
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
new file mode 100644
index 0000000..5dcb54a
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigLanguageOverrideTest.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigLanguageOverrideTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Confirm that language overrides work.
+ *
+ * @group config
+ */
+class ConfigLanguageOverrideTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('user', 'language', 'config_test', 'system', 'field');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('config_test'));
+  }
+
+  /**
+   * Tests locale override based on language.
+   */
+  function testConfigLanguageOverride() {
+    // The language module implements a config factory override object that
+    // overrides configuration when the Language module is enabled. This test ensures that
+    // English overrides work.
+    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('en'));
+    $config = \Drupal::config('config_test.system');
+    $this->assertIdentical($config->get('foo'), 'en bar');
+
+    // Ensure that the raw data is not translated.
+    $raw = $config->getRawData();
+    $this->assertIdentical($raw['foo'], 'bar');
+
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('fr'));
+    $config = \Drupal::config('config_test.system');
+    $this->assertIdentical($config->get('foo'), 'fr bar');
+
+    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('de'));
+    $config = \Drupal::config('config_test.system');
+    $this->assertIdentical($config->get('foo'), 'de bar');
+
+    // Test overrides of completely new configuration objects. In normal runtime
+    // this should only happen for configuration entities as we should not be
+    // creating simple configuration objects on the fly.
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride('de', 'config_test.new')
+      ->set('language', 'override')
+      ->save();
+    $config = \Drupal::config('config_test.new');
+    $this->assertTrue($config->isNew(), 'The configuration object config_test.new is new');
+    $this->assertIdentical($config->get('language'), 'override');
+    $this->assertIdentical($config->getOriginal('language', FALSE), NULL);
+
+    // Test how overrides react to base configuration changes. Set up some base
+    // values.
+    \Drupal::configFactory()->getEditable('config_test.foo')
+      ->set('value', array('key' => 'original'))
+      ->set('label', 'Original')
+      ->save();
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride('de', 'config_test.foo')
+      ->set('value', array('key' => 'override'))
+      ->set('label', 'Override')
+      ->save();
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride('fr', 'config_test.foo')
+      ->set('value', array('key' => 'override'))
+      ->save();
+    \Drupal::configFactory()->clearStaticCache();
+    $config = \Drupal::config('config_test.foo');
+    $this->assertIdentical($config->get('value'), array('key' => 'override'));
+
+    // Ensure renaming the config will rename the override.
+    \Drupal::languageManager()->setConfigOverrideLanguage(\Drupal::languageManager()->getLanguage('en'));
+    \Drupal::configFactory()->rename('config_test.foo', 'config_test.bar');
+    $config = \Drupal::config('config_test.bar');
+    $this->assertEqual($config->get('value'), array('key' => 'original'));
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.foo');
+    $this->assertTrue($override->isNew());
+    $this->assertEqual($override->get('value'), NULL);
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
+    $this->assertFalse($override->isNew());
+    $this->assertEqual($override->get('value'), array('key' => 'override'));
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
+    $this->assertFalse($override->isNew());
+    $this->assertEqual($override->get('value'), array('key' => 'override'));
+
+    // Ensure changing data in the config will update the overrides.
+    $config = \Drupal::configFactory()->getEditable('config_test.bar')->clear('value.key')->save();
+    $this->assertEqual($config->get('value'), array());
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
+    $this->assertFalse($override->isNew());
+    $this->assertEqual($override->get('value'), NULL);
+    // The French override will become empty and therefore removed.
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'config_test.bar');
+    $this->assertTrue($override->isNew());
+    $this->assertEqual($override->get('value'), NULL);
+
+    // Ensure deleting the config will delete the override.
+    \Drupal::configFactory()->getEditable('config_test.bar')->delete();
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('de', 'config_test.bar');
+    $this->assertTrue($override->isNew());
+    $this->assertEqual($override->get('value'), NULL);
+  }
+}
+
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
new file mode 100644
index 0000000..443c428
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigModuleOverridesTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigModuleOverridesTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests module overrides of configuration using event subscribers.
+ *
+ * @group config
+ */
+class ConfigModuleOverridesTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'config', 'config_override_test');
+
+  public function testSimpleModuleOverrides() {
+    $GLOBALS['config_test_run_module_overrides'] = TRUE;
+    $name = 'system.site';
+    $overridden_name = 'ZOMG overridden site name';
+    $non_overridden_name = 'ZOMG this name is on disk mkay';
+    $overridden_slogan = 'Yay for overrides!';
+    $non_overridden_slogan = 'Yay for defaults!';
+    $config_factory = $this->container->get('config.factory');
+    $config_factory
+      ->getEditable($name)
+      ->set('name', $non_overridden_name)
+      ->set('slogan', $non_overridden_slogan)
+      ->save();
+
+    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->getOriginal('name', FALSE));
+    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->getOriginal('slogan', FALSE));
+    $this->assertEqual($overridden_name, $config_factory->get('system.site')->get('name'));
+    $this->assertEqual($overridden_slogan, $config_factory->get('system.site')->get('slogan'));
+
+    // Test overrides of completely new configuration objects. In normal runtime
+    // this should only happen for configuration entities as we should not be
+    // creating simple configuration objects on the fly.
+    $config = $config_factory->get('config_override_test.new');
+    $this->assertTrue($config->isNew(), 'The configuration object config_override_test.new is new');
+    $this->assertIdentical($config->get('module'), 'override');
+    $this->assertIdentical($config->getOriginal('module', FALSE), NULL);
+
+    unset($GLOBALS['config_test_run_module_overrides']);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
new file mode 100644
index 0000000..a268be1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigOverrideTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests configuration overrides via $config in settings.php.
+ *
+ * @group config
+ */
+class ConfigOverrideTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'config_test');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+  }
+
+  /**
+   * Tests configuration override.
+   */
+  function testConfOverride() {
+    $expected_original_data = array(
+      'foo' => 'bar',
+      'baz' => NULL,
+      '404' => 'herp',
+    );
+
+    // Set globals before installing to prove that the installed file does not
+    // contain these values.
+    $overrides['config_test.system']['foo'] = 'overridden';
+    $overrides['config_test.system']['baz'] = 'injected';
+    $overrides['config_test.system']['404'] = 'derp';
+    $GLOBALS['config'] = $overrides;
+
+    $this->installConfig(array('config_test'));
+
+    // Verify that the original configuration data exists. Have to read storage
+    // directly otherwise overrides will apply.
+    $active = $this->container->get('config.storage');
+    $data = $active->read('config_test.system');
+    $this->assertIdentical($data['foo'], $expected_original_data['foo']);
+    $this->assertFalse(isset($data['baz']));
+    $this->assertIdentical($data['404'], $expected_original_data['404']);
+
+    // Get the configuration object with overrides.
+    $config = \Drupal::configFactory()->get('config_test.system');
+
+    // Verify that it contains the overridden data from $config.
+    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
+    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
+    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
+
+    // Get the configuration object which does not have overrides.
+    $config = \Drupal::configFactory()->getEditable('config_test.system');
+
+    // Verify that it does not contains the overridden data from $config.
+    $this->assertIdentical($config->get('foo'), $expected_original_data['foo']);
+    $this->assertIdentical($config->get('baz'), NULL);
+    $this->assertIdentical($config->get('404'), $expected_original_data['404']);
+
+    // Set the value for 'baz' (on the original data).
+    $expected_original_data['baz'] = 'original baz';
+    $config->set('baz', $expected_original_data['baz']);
+
+    // Set the value for '404' (on the original data).
+    $expected_original_data['404'] = 'original 404';
+    $config->set('404', $expected_original_data['404']);
+
+    // Save the configuration object (having overrides applied).
+    $config->save();
+
+    // Reload it and verify that it still contains overridden data from $config.
+    $config = \Drupal::config('config_test.system');
+    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
+    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
+    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
+
+    // Verify that raw config data has changed.
+    $this->assertIdentical($config->getOriginal('foo', FALSE), $expected_original_data['foo']);
+    $this->assertIdentical($config->getOriginal('baz', FALSE), $expected_original_data['baz']);
+    $this->assertIdentical($config->getOriginal('404', FALSE), $expected_original_data['404']);
+
+    // Write file to sync.
+    $sync = $this->container->get('config.storage.sync');
+    $expected_new_data = array(
+      'foo' => 'barbar',
+      '404' => 'herpderp',
+    );
+    $sync->write('config_test.system', $expected_new_data);
+
+    // Import changed data from sync to active.
+    $this->configImporter()->import();
+    $data = $active->read('config_test.system');
+
+    // Verify that the new configuration data exists. Have to read storage
+    // directly otherwise overrides will apply.
+    $this->assertIdentical($data['foo'], $expected_new_data['foo']);
+    $this->assertFalse(isset($data['baz']));
+    $this->assertIdentical($data['404'], $expected_new_data['404']);
+
+    // Verify that the overrides are still working.
+    $config = \Drupal::config('config_test.system');
+    $this->assertIdentical($config->get('foo'), $overrides['config_test.system']['foo']);
+    $this->assertIdentical($config->get('baz'), $overrides['config_test.system']['baz']);
+    $this->assertIdentical($config->get('404'), $overrides['config_test.system']['404']);
+
+    // Test overrides of completely new configuration objects. In normal runtime
+    // this should only happen for configuration entities as we should not be
+    // creating simple configuration objects on the fly.
+    $GLOBALS['config']['config_test.new']['key'] = 'override';
+    $config = \Drupal::config('config_test.new');
+    $this->assertTrue($config->isNew(), 'The configuration object config_test.new is new');
+    $this->assertIdentical($config->get('key'), 'override');
+    $config_raw = \Drupal::configFactory()->getEditable('config_test.new');
+    $this->assertIdentical($config_raw->get('key'), NULL);
+    $config_raw
+      ->set('key', 'raw')
+      ->set('new_key', 'new_value')
+      ->save();
+    // Ensure override is preserved but all other data has been updated
+    // accordingly.
+    $config = \Drupal::config('config_test.new');
+    $this->assertFalse($config->isNew(), 'The configuration object config_test.new is not new');
+    $this->assertIdentical($config->get('key'), 'override');
+    $this->assertIdentical($config->get('new_key'), 'new_value');
+    $raw_data = $config->getRawData();
+    $this->assertIdentical($raw_data['key'], 'raw');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
new file mode 100644
index 0000000..3f64608
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigOverridesPriorityTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Language\Language;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that language, module and settings.php are applied in the correct
+ * order.
+ *
+ * @group config
+ */
+class ConfigOverridesPriorityTest extends KernelTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'config', 'config_override_test', 'language');
+
+  public function testOverridePriorities() {
+    $GLOBALS['config_test_run_module_overrides'] = FALSE;
+
+    $non_overridden_mail =  'site@example.com';
+    $language_overridden_mail = 'french@example.com';
+
+    $language_overridden_name = 'French site name';
+    $module_overridden_name = 'ZOMG overridden site name';
+    $non_overridden_name = 'ZOMG this name is on disk mkay';
+
+    $module_overridden_slogan = 'Yay for overrides!';
+    $non_overridden_slogan = 'Yay for defaults!';
+
+    /** @var \Drupal\Core\Config\ConfigFactoryInterface $config_factory */
+    $config_factory = $this->container->get('config.factory');
+    $config_factory
+      ->getEditable('system.site')
+      ->set('name', $non_overridden_name)
+      ->set('slogan', $non_overridden_slogan)
+      ->set('mail', $non_overridden_mail)
+      ->set('weight_select_max', 50)
+      ->save();
+
+    // Ensure that no overrides are applying.
+    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->get('name'));
+    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
+    $this->assertEqual($non_overridden_mail, $config_factory->get('system.site')->get('mail'));
+    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
+
+    // Override using language.
+    $language = new Language(array(
+      'name' => 'French',
+      'id' => 'fr',
+    ));
+    \Drupal::languageManager()->setConfigOverrideLanguage($language);
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride($language->getId(), 'system.site')
+      ->set('name', $language_overridden_name)
+      ->set('mail', $language_overridden_mail)
+      ->save();
+
+    $this->assertEqual($language_overridden_name, $config_factory->get('system.site')->get('name'));
+    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
+    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
+    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
+
+    // Enable module overrides. Do not override system.site:mail to prove that
+    // the language override still applies.
+    $GLOBALS['config_test_run_module_overrides'] = TRUE;
+    $config_factory->reset('system.site');
+    $this->assertEqual($module_overridden_name, $config_factory->get('system.site')->get('name'));
+    $this->assertEqual($module_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
+    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
+    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
+
+    // Configure a global override to simulate overriding using settings.php. Do
+    // not override system.site:mail or system.site:slogan to prove that the
+    // language and module overrides still apply.
+    $GLOBALS['config']['system.site']['name'] = 'Site name global conf override';
+    $config_factory->reset('system.site');
+    $this->assertEqual('Site name global conf override', $config_factory->get('system.site')->get('name'));
+    $this->assertEqual($module_overridden_slogan, $config_factory->get('system.site')->get('slogan'));
+    $this->assertEqual($language_overridden_mail, $config_factory->get('system.site')->get('mail'));
+    $this->assertEqual(50, $config_factory->get('system.site')->get('weight_select_max'));
+
+    $this->assertEqual($non_overridden_name, $config_factory->get('system.site')->getOriginal('name', FALSE));
+    $this->assertEqual($non_overridden_slogan, $config_factory->get('system.site')->getOriginal('slogan', FALSE));
+    $this->assertEqual($non_overridden_mail, $config_factory->get('system.site')->getOriginal('mail', FALSE));
+    $this->assertEqual(50, $config_factory->get('system.site')->getOriginal('weight_select_max', FALSE));
+
+    unset($GLOBALS['config_test_run_module_overrides']);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
new file mode 100644
index 0000000..e962bc7
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -0,0 +1,641 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigSchemaTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\Schema\ConfigSchemaAlterException;
+use Drupal\Core\TypedData\Type\IntegerInterface;
+use Drupal\Core\TypedData\Type\StringInterface;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests schema for configuration objects.
+ *
+ * @group config
+ */
+class ConfigSchemaTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'language', 'field', 'image', 'config_test', 'config_schema_test');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('system', 'image', 'config_schema_test'));
+  }
+
+  /**
+   * Tests the basic metadata retrieval layer.
+   */
+  function testSchemaMapping() {
+    // Nonexistent configuration key will have Undefined as metadata.
+    $this->assertIdentical(FALSE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.no_such_key'));
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.no_such_key');
+    $expected = array();
+    $expected['label'] = 'Undefined';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['type'] = 'undefined';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for nonexistent configuration.');
+
+    // Configuration file without schema will return Undefined as well.
+    $this->assertIdentical(FALSE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.noschema'));
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.noschema');
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for configuration with no schema.');
+
+    // Configuration file with only some schema.
+    $this->assertIdentical(TRUE, \Drupal::service('config.typed')->hasConfigSchema('config_schema_test.someschema'));
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema');
+    $expected = array();
+    $expected['label'] = 'Schema test data';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['mapping']['langcode']['type'] = 'string';
+    $expected['mapping']['langcode']['label'] = 'Language code';
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['mapping']['testitem'] = array('label' => 'Test item');
+    $expected['mapping']['testlist'] = array('label' => 'Test list');
+    $expected['type'] = 'config_schema_test.someschema';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for configuration with only some schema.');
+
+    // Check type detection on elements with undefined types.
+    $config = \Drupal::service('config.typed')->get('config_schema_test.someschema');
+    $definition = $config->get('testitem')->getDataDefinition()->toArray();
+    $expected = array();
+    $expected['label'] = 'Test item';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['type'] = 'undefined';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
+    $this->assertEqual($definition, $expected, 'Automatic type detected for a scalar is undefined.');
+    $definition = $config->get('testlist')->getDataDefinition()->toArray();
+    $expected = array();
+    $expected['label'] = 'Test list';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['type'] = 'undefined';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
+    $this->assertEqual($definition, $expected, 'Automatic type detected for a list is undefined.');
+    $definition = $config->get('testnoschema')->getDataDefinition()->toArray();
+    $expected = array();
+    $expected['label'] = 'Undefined';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Undefined';
+    $expected['type'] = 'undefined';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
+    $this->assertEqual($definition, $expected, 'Automatic type detected for an undefined integer is undefined.');
+
+    // Simple case, straight metadata.
+    $definition = \Drupal::service('config.typed')->getDefinition('system.maintenance');
+    $expected = array();
+    $expected['label'] = 'Maintenance mode';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['mapping']['message'] = array(
+      'label' =>  'Message to display when in maintenance mode',
+      'type' => 'text',
+    );
+    $expected['mapping']['langcode'] = array(
+      'label' => 'Language code',
+      'type' => 'string',
+    );
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['type'] = 'system.maintenance';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for system.maintenance');
+
+    // Mixed schema with ignore elements.
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.ignore');
+    $expected = array();
+    $expected['label'] = 'Ignore test';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $expected['mapping']['langcode'] = array(
+      'type' => 'string',
+      'label' => 'Language code',
+    );
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['mapping']['label'] = array(
+      'label' =>  'Label',
+      'type' => 'label',
+    );
+    $expected['mapping']['irrelevant'] = array(
+      'label' => 'Irrelevant',
+      'type' => 'ignore',
+    );
+    $expected['mapping']['indescribable'] = array(
+      'label' => 'Indescribable',
+      'type' => 'ignore',
+    );
+    $expected['mapping']['weight'] = array(
+      'label' => 'Weight',
+      'type' => 'integer',
+    );
+    $expected['type'] = 'config_schema_test.ignore';
+
+    $this->assertEqual($definition, $expected);
+
+    // The ignore elements themselves.
+    $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('irrelevant')->getDataDefinition()->toArray();
+    $expected = array();
+    $expected['type'] = 'ignore';
+    $expected['label'] = 'Irrelevant';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Ignore';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\DataDefinition';
+    $this->assertEqual($definition, $expected);
+    $definition = \Drupal::service('config.typed')->get('config_schema_test.ignore')->get('indescribable')->getDataDefinition()->toArray();
+    $expected['label'] = 'Indescribable';
+    $this->assertEqual($definition, $expected);
+
+    // More complex case, generic type. Metadata for image style.
+    $definition = \Drupal::service('config.typed')->getDefinition('image.style.large');
+    $expected = array();
+    $expected['label'] = 'Image style';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $expected['mapping']['name']['type'] = 'string';
+    $expected['mapping']['uuid']['type'] = 'string';
+    $expected['mapping']['uuid']['label'] = 'UUID';
+    $expected['mapping']['langcode']['type'] = 'string';
+    $expected['mapping']['langcode']['label'] = 'Language code';
+    $expected['mapping']['status']['type'] = 'boolean';
+    $expected['mapping']['status']['label'] = 'Status';
+    $expected['mapping']['dependencies']['type'] = 'config_dependencies';
+    $expected['mapping']['dependencies']['label'] = 'Dependencies';
+    $expected['mapping']['name']['type'] = 'string';
+    $expected['mapping']['label']['type'] = 'label';
+    $expected['mapping']['label']['label'] = 'Label';
+    $expected['mapping']['effects']['type'] = 'sequence';
+    $expected['mapping']['effects']['sequence']['type'] = 'mapping';
+    $expected['mapping']['effects']['sequence']['mapping']['id']['type'] = 'string';
+    $expected['mapping']['effects']['sequence']['mapping']['data']['type'] = 'image.effect.[%parent.id]';
+    $expected['mapping']['effects']['sequence']['mapping']['weight']['type'] = 'integer';
+    $expected['mapping']['effects']['sequence']['mapping']['uuid']['type'] = 'string';
+    $expected['mapping']['third_party_settings']['type'] = 'sequence';
+    $expected['mapping']['third_party_settings']['label'] = 'Third party settings';
+    $expected['mapping']['third_party_settings']['sequence']['type'] = '[%parent.%parent.%type].third_party.[%key]';
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['type'] = 'image.style.*';
+
+    $this->assertEqual($definition, $expected);
+
+    // More complex, type based on a complex one.
+    $definition = \Drupal::service('config.typed')->getDefinition('image.effect.image_scale');
+    // This should be the schema for image.effect.image_scale.
+    $expected = array();
+    $expected['label'] = 'Image scale';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $expected['mapping']['width']['type'] = 'integer';
+    $expected['mapping']['width']['label'] = 'Width';
+    $expected['mapping']['height']['type'] = 'integer';
+    $expected['mapping']['height']['label'] = 'Height';
+    $expected['mapping']['upscale']['type'] = 'boolean';
+    $expected['mapping']['upscale']['label'] = 'Upscale';
+    $expected['type'] = 'image.effect.image_scale';
+
+
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for image.effect.image_scale');
+
+    // Most complex case, get metadata for actual configuration element.
+    $effects = \Drupal::service('config.typed')->get('image.style.medium')->get('effects');
+    $definition = $effects->get('bddf0d06-42f9-4c75-a700-a33cafa25ea0')->get('data')->getDataDefinition()->toArray();
+    // This should be the schema for image.effect.image_scale, reuse previous one.
+    $expected['type'] =  'image.effect.image_scale';
+
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for the first effect of image.style.medium');
+
+    $a = \Drupal::config('config_test.dynamic.third_party');
+    $test = \Drupal::service('config.typed')->get('config_test.dynamic.third_party')->get('third_party_settings.config_schema_test');
+    $definition = $test->getDataDefinition()->toArray();
+    $expected = array();
+    $expected['type'] = 'config_test.dynamic.*.third_party.config_schema_test';
+    $expected['label'] = 'Mapping';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $expected['mapping'] = [
+      'integer' => ['type' => 'integer'],
+      'string' => ['type' => 'string'],
+    ];
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_test.dynamic.third_party:third_party_settings.config_schema_test');
+
+    // More complex, several level deep test.
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_one.subsection');
+    // This should be the schema of config_schema_test.someschema.somemodule.*.*.
+    $expected = array();
+    $expected['label'] = 'Schema multiple filesystem marker test';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['mapping']['langcode']['type'] = 'string';
+    $expected['mapping']['langcode']['label'] = 'Language code';
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['mapping']['testid']['type'] = 'string';
+    $expected['mapping']['testid']['label'] = 'ID';
+    $expected['mapping']['testdescription']['type'] = 'text';
+    $expected['mapping']['testdescription']['label'] = 'Description';
+    $expected['type'] = 'config_schema_test.someschema.somemodule.*.*';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_one.subsection');
+
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.someschema.somemodule.section_two.subsection');
+    // The other file should have the same schema.
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.someschema.somemodule.section_two.subsection');
+  }
+
+  /**
+   * Tests metadata retrieval with several levels of %parent indirection.
+   */
+  function testSchemaMappingWithParents() {
+    $config_data = \Drupal::service('config.typed')->get('config_schema_test.someschema.with_parents');
+
+    // Test fetching parent one level up.
+    $entry = $config_data->get('one_level');
+    $definition = $entry->get('testitem')->getDataDefinition()->toArray();
+    $expected = array(
+      'type' => 'config_schema_test.someschema.with_parents.key_1',
+      'label' => 'Test item nested one level',
+      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
+    );
+    $this->assertEqual($definition, $expected);
+
+    // Test fetching parent two levels up.
+    $entry = $config_data->get('two_levels');
+    $definition = $entry->get('wrapper')->get('testitem')->getDataDefinition()->toArray();
+    $expected = array(
+      'type' => 'config_schema_test.someschema.with_parents.key_2',
+      'label' => 'Test item nested two levels',
+      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
+    );
+    $this->assertEqual($definition, $expected);
+
+    // Test fetching parent three levels up.
+    $entry = $config_data->get('three_levels');
+    $definition = $entry->get('wrapper_1')->get('wrapper_2')->get('testitem')->getDataDefinition()->toArray();
+    $expected = array(
+      'type' => 'config_schema_test.someschema.with_parents.key_3',
+      'label' => 'Test item nested three levels',
+      'class' => '\Drupal\Core\TypedData\Plugin\DataType\StringData',
+      'definition_class' => '\Drupal\Core\TypedData\DataDefinition',
+    );
+    $this->assertEqual($definition, $expected);
+  }
+
+  /**
+   * Tests metadata applied to configuration objects.
+   */
+  function testSchemaData() {
+    // Try a simple property.
+    $meta = \Drupal::service('config.typed')->get('system.site');
+    $property = $meta->get('page')->get('front');
+    $this->assertTrue($property instanceof StringInterface, 'Got the right wrapper fo the page.front property.');
+    $this->assertEqual($property->getValue(), '/user/login', 'Got the right value for page.front data.');
+    $definition = $property->getDataDefinition();
+    $this->assertTrue(empty($definition['translatable']), 'Got the right translatability setting for page.front data.');
+
+    // Check nested array of properties.
+    $list = $meta->get('page')->getElements();
+    $this->assertEqual(count($list), 3, 'Got a list with the right number of properties for site page data');
+    $this->assertTrue(isset($list['front']) && isset($list['403']) && isset($list['404']), 'Got a list with the right properties for site page data.');
+    $this->assertEqual($list['front']->getValue(), '/user/login', 'Got the right value for page.front data from the list.');
+
+    // And test some TypedConfigInterface methods.
+    $properties = $list;
+    $this->assertTrue(count($properties) == 3 && $properties['front'] == $list['front'], 'Got the right properties for site page.');
+    $values = $meta->get('page')->toArray();
+    $this->assertTrue(count($values) == 3 && $values['front'] == '/user/login', 'Got the right property values for site page.');
+
+    // Now let's try something more complex, with nested objects.
+    $wrapper = \Drupal::service('config.typed')->get('image.style.large');
+    $effects = $wrapper->get('effects');
+    $this->assertTrue(count($effects->toArray()) == 1, 'Got an array with effects for image.style.large data');
+    $uuid = key($effects->getValue());
+    $effect = $effects->get($uuid)->getElements();
+    $this->assertTrue(!$effect['data']->isEmpty() && $effect['id']->getValue() == 'image_scale', 'Got data for the image scale effect from metadata.');
+    $this->assertTrue($effect['data']->get('width') instanceof IntegerInterface, 'Got the right type for the scale effect width.');
+    $this->assertEqual($effect['data']->get('width')->getValue(), 480, 'Got the right value for the scale effect width.' );
+  }
+
+  /**
+   * Test configuration value data type enforcement using schemas.
+   */
+  public function testConfigSaveWithSchema() {
+    $untyped_values = array(
+      'string' => 1,
+      'empty_string' => '',
+      'null_string' => NULL,
+      'integer' => '100',
+      'null_integer' => '',
+      'boolean' => 1,
+      // If the config schema doesn't have a type it shouldn't be casted.
+      'no_type' => 1,
+      'mapping' => array(
+        'string' => 1
+      ),
+      'float' => '3.14',
+      'null_float' => '',
+      'sequence' => array (1, 0, 1),
+      'sequence_bc' => array(1, 0, 1),
+      // Not in schema and therefore should be left untouched.
+      'not_present_in_schema' => TRUE,
+      // Test a custom type.
+      'config_schema_test_integer' => '1',
+      'config_schema_test_integer_empty_string' => '',
+    );
+    $untyped_to_typed = $untyped_values;
+
+    $typed_values = array(
+      'string' => '1',
+      'empty_string' => '',
+      'null_string' => NULL,
+      'integer' => 100,
+      'null_integer' => NULL,
+      'boolean' => TRUE,
+      'no_type' => 1,
+      'mapping' => array(
+        'string' => '1'
+      ),
+      'float' => 3.14,
+      'null_float' => NULL,
+      'sequence' => array (TRUE, FALSE, TRUE),
+      'sequence_bc' => array(TRUE, FALSE, TRUE),
+      'not_present_in_schema' => TRUE,
+      'config_schema_test_integer' => 1,
+      'config_schema_test_integer_empty_string' => NULL,
+    );
+
+    // Save config which has a schema that enforces types.
+    $this->config('config_schema_test.schema_data_types')
+      ->setData($untyped_to_typed)
+      ->save();
+    $this->assertIdentical($this->config('config_schema_test.schema_data_types')->get(), $typed_values);
+
+    // Save config which does not have a schema that enforces types.
+    $this->config('config_schema_test.no_schema_data_types')
+      ->setData($untyped_values)
+      ->save();
+    $this->assertIdentical($this->config('config_schema_test.no_schema_data_types')->get(), $untyped_values);
+
+    // Ensure that configuration objects with keys marked as ignored are not
+    // changed when saved. The 'config_schema_test.ignore' will have been saved
+    // during the installation of configuration in the setUp method.
+    $extension_path = __DIR__ . '/../../../../../modules/config/tests/config_schema_test/';
+    $install_storage = new FileStorage($extension_path . InstallStorage::CONFIG_INSTALL_DIRECTORY);
+    $original_data = $install_storage->read('config_schema_test.ignore');
+    $installed_data = $this->config('config_schema_test.ignore')->get();
+    unset($installed_data['_core']);
+    $this->assertIdentical($installed_data, $original_data);
+  }
+
+  /**
+   * Tests fallback to a greedy wildcard.
+   */
+  function testSchemaFallback() {
+    $definition = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something');
+    // This should be the schema of config_schema_test.wildcard_fallback.*.
+    $expected = array();
+    $expected['label'] = 'Schema wildcard fallback test';
+    $expected['class'] = '\Drupal\Core\Config\Schema\Mapping';
+    $expected['definition_class'] = '\Drupal\Core\TypedData\MapDataDefinition';
+    $expected['mapping']['langcode']['type'] = 'string';
+    $expected['mapping']['langcode']['label'] = 'Language code';
+    $expected['mapping']['_core']['type'] = '_core_config_info';
+    $expected['mapping']['testid']['type'] = 'string';
+    $expected['mapping']['testid']['label'] = 'ID';
+    $expected['mapping']['testdescription']['type'] = 'text';
+    $expected['mapping']['testdescription']['label'] = 'Description';
+    $expected['type'] = 'config_schema_test.wildcard_fallback.*';
+
+    $this->assertEqual($definition, $expected, 'Retrieved the right metadata for config_schema_test.wildcard_fallback.something');
+
+    $definition2 = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something.something');
+    // This should be the schema of config_schema_test.wildcard_fallback.* as
+    //well.
+    $this->assertIdentical($definition, $definition2);
+  }
+
+  /**
+   * Tests use of colons in schema type determination.
+   *
+   * @see \Drupal\Core\Config\TypedConfigManager::getFallbackName()
+   */
+  function testColonsInSchemaTypeDetermination() {
+    $tests = \Drupal::service('config.typed')->get('config_schema_test.plugin_types')->get('tests')->getElements();
+    $definition = $tests[0]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test.plugin_types.boolean');
+
+    $definition = $tests[1]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test.plugin_types.boolean:*');
+
+    $definition = $tests[2]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test.plugin_types.*');
+
+    $definition = $tests[3]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test.plugin_types.*');
+
+    $tests = \Drupal::service('config.typed')->get('config_schema_test.plugin_types')->get('test_with_parents')->getElements();
+    $definition = $tests[0]->get('settings')->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.boolean');
+
+    $definition = $tests[1]->get('settings')->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.boolean:*');
+
+    $definition = $tests[2]->get('settings')->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.*');
+
+    $definition = $tests[3]->get('settings')->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'test_with_parents.plugin_types.*');
+  }
+
+  /**
+   * Tests hook_config_schema_info_alter().
+   */
+  public function testConfigSchemaInfoAlter() {
+    /** @var \Drupal\Core\Config\TypedConfigManagerInterface $typed_config */
+    $typed_config = \Drupal::service('config.typed');
+    $typed_config->clearCachedDefinitions();
+
+    // Ensure that keys can not be added or removed by
+    // hook_config_schema_info_alter().
+    \Drupal::state()->set('config_schema_test_exception_remove', TRUE);
+    $message = 'Expected ConfigSchemaAlterException thrown.';
+    try {
+      $typed_config->getDefinitions();
+      $this->fail($message);
+    }
+    catch (ConfigSchemaAlterException $e) {
+      $this->pass($message);
+      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has removed (config_schema_test.hook) schema definitions');
+    }
+
+    \Drupal::state()->set('config_schema_test_exception_add', TRUE);
+    $message = 'Expected ConfigSchemaAlterException thrown.';
+    try {
+      $typed_config->getDefinitions();
+      $this->fail($message);
+    }
+    catch (ConfigSchemaAlterException $e) {
+      $this->pass($message);
+      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has added (config_schema_test.hook_added_defintion) and removed (config_schema_test.hook) schema definitions');
+    }
+
+    \Drupal::state()->set('config_schema_test_exception_remove', FALSE);
+    $message = 'Expected ConfigSchemaAlterException thrown.';
+    try {
+      $typed_config->getDefinitions();
+      $this->fail($message);
+    }
+    catch (ConfigSchemaAlterException $e) {
+      $this->pass($message);
+      $this->assertEqual($e->getMessage(), 'Invoking hook_config_schema_info_alter() has added (config_schema_test.hook_added_defintion) schema definitions');
+    }
+
+    // Tests that hook_config_schema_info_alter() can add additional metadata to
+    // existing configuration schema.
+    \Drupal::state()->set('config_schema_test_exception_add', FALSE);
+    $definitions = $typed_config->getDefinitions();
+    $this->assertEqual($definitions['config_schema_test.hook']['additional_metadata'], 'new schema info');
+  }
+
+  /**
+   * Tests saving config when the type is wrapped by a dynamic type.
+   */
+  public function testConfigSaveWithWrappingSchema() {
+    $untyped_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'plugin_id' => 'wrapper:foo',
+          'internal_value' => 100,
+        ],
+      ],
+    ];
+
+    $typed_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'plugin_id' => 'wrapper:foo',
+          'internal_value' => '100',
+        ],
+      ],
+    ];
+
+    // Save config which has a schema that enforces types.
+    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.plugin_types')
+      ->setData($untyped_values)
+      ->save();
+    $this->assertIdentical(\Drupal::config('wrapping.config_schema_test.plugin_types')
+      ->get(), $typed_values);
+  }
+
+  /**
+   * Tests dynamic config schema type with multiple sub-key references.
+   */
+  public function testConfigSaveWithWrappingSchemaDoubleBrackets() {
+    $untyped_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'turtle',
+          'bar' => 'horse',
+          // Converted to a string by 'test.double_brackets.turtle.horse'
+          // schema.
+          'another_key' => '100',
+        ],
+      ],
+    ];
+
+    $typed_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'turtle',
+          'bar' => 'horse',
+          'another_key' => 100,
+        ],
+      ],
+    ];
+
+    // Save config which has a schema that enforces types.
+    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.double_brackets')
+      ->setData($untyped_values)
+      ->save();
+    $this->assertIdentical(\Drupal::config('wrapping.config_schema_test.double_brackets')
+      ->get(), $typed_values);
+
+    $tests = \Drupal::service('config.typed')->get('wrapping.config_schema_test.double_brackets')->get('tests')->getElements();
+    $definition = $tests[0]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.turtle.horse');
+
+    $untyped_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'cat',
+          'bar' => 'dog',
+          // Converted to a string by 'test.double_brackets.cat.dog' schema.
+          'another_key' => 100,
+        ],
+      ],
+    ];
+
+    $typed_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'cat',
+          'bar' => 'dog',
+          'another_key' => '100',
+        ],
+      ],
+    ];
+
+    // Save config which has a schema that enforces types.
+    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.double_brackets')
+      ->setData($untyped_values)
+      ->save();
+    $this->assertIdentical(\Drupal::config('wrapping.config_schema_test.double_brackets')
+      ->get(), $typed_values);
+
+    $tests = \Drupal::service('config.typed')->get('wrapping.config_schema_test.double_brackets')->get('tests')->getElements();
+    $definition = $tests[0]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.cat.dog');
+
+    // Combine everything in a single save.
+    $typed_values = [
+      'tests' => [
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'cat',
+          'bar' => 'dog',
+          'another_key' => 100,
+        ],
+        [
+          'wrapper_value' => 'foo',
+          'foo' => 'turtle',
+          'bar' => 'horse',
+          'another_key' => '100',
+        ],
+      ],
+    ];
+    \Drupal::configFactory()->getEditable('wrapping.config_schema_test.double_brackets')
+      ->setData($typed_values)
+      ->save();
+    $tests = \Drupal::service('config.typed')->get('wrapping.config_schema_test.double_brackets')->get('tests')->getElements();
+    $definition = $tests[0]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.cat.dog');
+    $definition = $tests[1]->getDataDefinition()->toArray();
+    $this->assertEqual($definition['type'], 'wrapping.test.double_brackets.*||test.double_brackets.turtle.horse');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php
new file mode 100644
index 0000000..838cb61
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSnapshotTest.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\ConfigSnapshotTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\StorageComparer;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests config snapshot creation and updating.
+ *
+ * @group config
+ */
+class ConfigSnapshotTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'system');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Update the config snapshot. This allows the parent::setUp() to write
+    // configuration files.
+    \Drupal::service('config.manager')->createSnapshot(\Drupal::service('config.storage'), \Drupal::service('config.storage.snapshot'));
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+  }
+
+  /**
+   * Tests config snapshot creation and updating.
+   */
+  function testSnapshot() {
+    $active = $this->container->get('config.storage');
+    $sync = $this->container->get('config.storage.sync');
+    $snapshot = $this->container->get('config.storage.snapshot');
+    $config_manager = $this->container->get('config.manager');
+    $config_name = 'config_test.system';
+    $config_key = 'foo';
+    $new_data = 'foobar';
+
+    $active_snapshot_comparer = new StorageComparer($active, $snapshot, $config_manager);
+    $sync_snapshot_comparer = new StorageComparer($sync, $snapshot, $config_manager);
+
+    // Verify that we have an initial snapshot that matches the active
+    // configuration. This has to be true as no config should be installed.
+    $this->assertFalse($active_snapshot_comparer->createChangelist()->hasChanges());
+
+    // Install the default config.
+    $this->installConfig(array('config_test'));
+    // Although we have imported config this has not affected the snapshot.
+    $this->assertTrue($active_snapshot_comparer->reset()->hasChanges());
+
+    // Update the config snapshot.
+    \Drupal::service('config.manager')->createSnapshot($active, $snapshot);
+
+    // The snapshot and active config should now contain the same config
+    // objects.
+    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
+
+    // Change a configuration value in sync.
+    $sync_data = $this->config($config_name)->get();
+    $sync_data[$config_key] = $new_data;
+    $sync->write($config_name, $sync_data);
+
+    // Verify that active and snapshot match, and that sync doesn't match
+    // active.
+    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
+    $this->assertTrue($sync_snapshot_comparer->createChangelist()->hasChanges());
+
+    // Import changed data from sync to active.
+    $this->configImporter()->import();
+
+    // Verify changed config was properly imported.
+    \Drupal::configFactory()->reset($config_name);
+    $this->assertIdentical($this->config($config_name)->get($config_key), $new_data);
+
+    // Verify that a new snapshot was created which and that it matches
+    // the active config.
+    $this->assertFalse($active_snapshot_comparer->reset()->hasChanges());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php b/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
new file mode 100644
index 0000000..aa0111f
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\DefaultConfigTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\config_test\TestInstallStorage;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Tests that default configuration provided by all modules matches schema.
+ *
+ * @group config
+ */
+class DefaultConfigTest extends KernelTestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'config_test');
+
+  /**
+   * Themes which provide default configuration and need enabling.
+   *
+   * If a theme provides default configuration but does not have a schema
+   * because it can rely on schemas added by system_config_schema_info_alter()
+   * then this test needs to enable it.
+   *
+   * @var array
+   */
+  protected $themes = ['seven'];
+
+  protected function setUp() {
+    parent::setUp();
+    \Drupal::service('theme_handler')->install($this->themes);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+    $container->register('default_config_test.schema_storage')
+      ->setClass('\Drupal\config_test\TestInstallStorage')
+      ->addArgument(InstallStorage::CONFIG_SCHEMA_DIRECTORY);
+
+    $definition = $container->getDefinition('config.typed');
+    $definition->replaceArgument(1, new Reference('default_config_test.schema_storage'));
+  }
+
+  /**
+   * Tests default configuration data type.
+   */
+  public function testDefaultConfig() {
+    $typed_config = \Drupal::service('config.typed');
+    // Create a configuration storage with access to default configuration in
+    // every module, profile and theme.
+    $default_config_storage = new TestInstallStorage();
+
+    foreach ($default_config_storage->listAll() as $config_name) {
+      // Skip files provided by the config_schema_test module since that module
+      // is explicitly for testing schema.
+      if (strpos($config_name, 'config_schema_test') === 0) {
+        continue;
+      }
+
+      $data = $default_config_storage->read($config_name);
+      $this->assertConfigSchema($typed_config, $config_name, $data);
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
new file mode 100644
index 0000000..510932f
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/SchemaCheckTraitTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\SchemaCheckTraitTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\Schema\SchemaCheckTrait;
+use Drupal\KernelTests\KernelTestBase;
+
+
+/**
+ * Tests the functionality of SchemaCheckTrait.
+ *
+ * @group config
+ */
+class SchemaCheckTraitTest extends KernelTestBase {
+
+  use SchemaCheckTrait;
+
+  /**
+   * The typed config manager.
+   *
+   * @var \Drupal\Core\Config\TypedConfigManagerInterface
+   */
+  protected $typedConfig;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'config_schema_test');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('config_test', 'config_schema_test'));
+    $this->typedConfig = \Drupal::service('config.typed');
+  }
+
+  /**
+   * Tests \Drupal\Core\Config\Schema\SchemaCheckTrait.
+   */
+  public function testTrait() {
+    // Test a non existing schema.
+    $ret = $this->checkConfigSchema($this->typedConfig, 'config_schema_test.noschema', $this->config('config_schema_test.noschema')->get());
+    $this->assertIdentical($ret, FALSE);
+
+    // Test an existing schema with valid data.
+    $config_data = $this->config('config_test.types')->get();
+    $ret = $this->checkConfigSchema($this->typedConfig, 'config_test.types', $config_data);
+    $this->assertIdentical($ret, TRUE);
+
+    // Add a new key, a new array and overwrite boolean with array to test the
+    // error messages.
+    $config_data = array('new_key' => 'new_value', 'new_array' => array()) + $config_data;
+    $config_data['boolean'] = array();
+    $ret = $this->checkConfigSchema($this->typedConfig, 'config_test.types', $config_data);
+    $expected = array(
+      'config_test.types:new_key' => 'missing schema',
+      'config_test.types:new_array' => 'missing schema',
+      'config_test.types:boolean' => 'non-scalar value but not defined as an array (such as mapping or sequence)',
+    );
+    $this->assertEqual($ret, $expected);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php b/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php
new file mode 100644
index 0000000..c927fe8
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/SchemaConfigListenerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\SchemaConfigListenerTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config;
+
+use Drupal\Core\Config\Schema\SchemaIncompleteException;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the functionality of ConfigSchemaChecker in KernelTestBase tests.
+ *
+ * @group config
+ */
+class SchemaConfigListenerTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('config_test');
+
+  /**
+   * Tests \Drupal\Core\Config\Testing\ConfigSchemaChecker.
+   */
+  public function testConfigSchemaChecker() {
+    // Test a non-existing schema.
+    $message = 'Expected SchemaIncompleteException thrown';
+    try {
+      $this->config('config_schema_test.schemaless')->set('foo', 'bar')->save();
+      $this->fail($message);
+    }
+    catch (SchemaIncompleteException $e) {
+      $this->pass($message);
+      $this->assertEqual('No schema for config_schema_test.schemaless', $e->getMessage());
+    }
+
+    // Test a valid schema.
+    $message = 'Unexpected SchemaIncompleteException thrown';
+    $config = $this->config('config_test.types')->set('int', 10);
+    try {
+      $config->save();
+      $this->pass($message);
+    }
+    catch (SchemaIncompleteException $e) {
+      $this->fail($message);
+    }
+
+    // Test an invalid schema.
+    $message = 'Expected SchemaIncompleteException thrown';
+    $config = $this->config('config_test.types')
+      ->set('foo', 'bar')
+      ->set('array', 1);
+    try {
+      $config->save();
+      $this->fail($message);
+    }
+    catch (SchemaIncompleteException $e) {
+      $this->pass($message);
+      $this->assertEqual('Schema errors for config_test.types with the following errors: config_test.types:foo missing schema, config_test.types:array variable type is integer but applied schema class is Drupal\Core\Config\Schema\Sequence', $e->getMessage());
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php b/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
new file mode 100644
index 0000000..546899a
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\Storage\CachedStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config\Storage;
+
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\CachedStorage;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\StreamWrapper\PublicStream;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Tests CachedStorage operations.
+ *
+ * @group config
+ */
+class CachedStorageTest extends ConfigStorageTestBase {
+
+  /**
+   * The cache backend the cached storage is using.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $cache;
+
+  /**
+   * The file storage the cached storage is using.
+   *
+   * @var \Drupal\Core\Config\FileStorage
+   */
+  protected $fileStorage;
+
+  protected function setUp() {
+    parent::setUp();
+    // Create a directory.
+    $dir = PublicStream::basePath() . '/config';
+    $this->fileStorage = new FileStorage($dir);
+    $this->storage = new CachedStorage($this->fileStorage, \Drupal::service('cache.config'));
+    $this->cache = \Drupal::service('cache_factory')->get('config');
+    // ::listAll() verifications require other configuration data to exist.
+    $this->storage->write('system.performance', array());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function testInvalidStorage() {
+    // No-op as this test does not make sense.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function read($name) {
+    $data = $this->cache->get($name);
+    // Cache misses fall through to the underlying storage.
+    return $data ? $data->data : $this->fileStorage->read($name);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function insert($name, $data) {
+    $this->fileStorage->write($name, $data);
+    $this->cache->set($name, $data);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function update($name, $data) {
+    $this->fileStorage->write($name, $data);
+    $this->cache->set($name, $data);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function delete($name) {
+    $this->cache->delete($name);
+    unlink($this->fileStorage->getFilePath($name));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function containerBuild(ContainerBuilder $container) {
+    parent::containerBuild($container);
+    // Use the regular database cache backend to aid testing.
+    $container->register('cache_factory', 'Drupal\Core\Cache\DatabaseBackendFactory')
+      ->addArgument(new Reference('database'))
+      ->addArgument(new Reference('cache_tags.invalidator.checksum'));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php b/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
new file mode 100644
index 0000000..5ddb987
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
@@ -0,0 +1,271 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\Storage\ConfigStorageTestBase.
+ */
+
+namespace Drupal\KernelTests\Core\Config\Storage;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Base class for testing storage operations.
+ *
+ * All configuration storages are expected to behave identically in
+ * terms of reading, writing, listing, deleting, as well as error handling.
+ *
+ * Therefore, storage tests use an uncommon test case class structure;
+ * the base class defines the test method(s) to execute, which are identical
+ * for all storages. The storage specific test case classes supply the
+ * necessary helper methods to interact with the raw/native storage
+ * directly.
+ */
+abstract class ConfigStorageTestBase extends KernelTestBase {
+
+  /**
+   * @var \Drupal\Core\Config\StorageInterface
+   */
+  protected $storage;
+
+  /**
+   * @var \Drupal\Core\Config\StorageInterface
+   */
+  protected $invalidStorage;
+
+  /**
+   * Tests storage CRUD operations.
+   *
+   * @todo Coverage: Trigger PDOExceptions / Database exceptions.
+   */
+  function testCRUD() {
+    $name = 'config_test.storage';
+
+    // Checking whether a non-existing name exists returns FALSE.
+    $this->assertIdentical($this->storage->exists($name), FALSE);
+
+    // Reading a non-existing name returns FALSE.
+    $data = $this->storage->read($name);
+    $this->assertIdentical($data, FALSE);
+
+    // Writing data returns TRUE and the data has been written.
+    $data = array('foo' => 'bar');
+    $result = $this->storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+
+    $raw_data = $this->read($name);
+    $this->assertIdentical($raw_data, $data);
+
+    // Checking whether an existing name exists returns TRUE.
+    $this->assertIdentical($this->storage->exists($name), TRUE);
+
+    // Writing the identical data again still returns TRUE.
+    $result = $this->storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+
+    // Listing all names returns all.
+    $names = $this->storage->listAll();
+    $this->assertTrue(in_array('system.performance', $names));
+    $this->assertTrue(in_array($name, $names));
+
+    // Listing all names with prefix returns names with that prefix only.
+    $names = $this->storage->listAll('config_test.');
+    $this->assertFalse(in_array('system.performance', $names));
+    $this->assertTrue(in_array($name, $names));
+
+    // Rename the configuration storage object.
+    $new_name = 'config_test.storage_rename';
+    $this->storage->rename($name, $new_name);
+    $raw_data = $this->read($new_name);
+    $this->assertIdentical($raw_data, $data);
+    // Rename it back so further tests work.
+    $this->storage->rename($new_name, $name);
+
+    // Deleting an existing name returns TRUE.
+    $result = $this->storage->delete($name);
+    $this->assertIdentical($result, TRUE);
+
+    // Deleting a non-existing name returns FALSE.
+    $result = $this->storage->delete($name);
+    $this->assertIdentical($result, FALSE);
+
+    // Deleting all names with prefix deletes the appropriate data and returns
+    // TRUE.
+    $files = array(
+      'config_test.test.biff',
+      'config_test.test.bang',
+      'config_test.test.pow',
+    );
+    foreach ($files as $name) {
+      $this->storage->write($name, $data);
+    }
+
+    $result = $this->storage->deleteAll('config_test.');
+    $names = $this->storage->listAll('config_test.');
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($names, array());
+
+    // Test renaming an object that does not exist throws an exception.
+    try {
+      $this->storage->rename('config_test.storage_does_not_exist', 'config_test.storage_does_not_exist_rename');
+    }
+    catch (\Exception $e) {
+      $class = get_class($e);
+      $this->pass($class . ' thrown upon renaming a nonexistent storage bin.');
+    }
+
+    // Test renaming to an object that already exists throws an exception.
+    try {
+      $this->storage->rename('system.cron', 'system.performance');
+    }
+    catch (\Exception $e) {
+      $class = get_class($e);
+      $this->pass($class . ' thrown upon renaming a nonexistent storage bin.');
+    }
+  }
+
+  /**
+   * Tests an invalid storage.
+   */
+  public function testInvalidStorage() {
+    $name = 'config_test.storage';
+
+    // Write something to the valid storage to prove that the storages do not
+    // pollute one another.
+    $data = array('foo' => 'bar');
+    $result = $this->storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+
+    $raw_data = $this->read($name);
+    $this->assertIdentical($raw_data, $data);
+
+    // Reading from a non-existing storage bin returns FALSE.
+    $result = $this->invalidStorage->read($name);
+    $this->assertIdentical($result, FALSE);
+
+    // Deleting from a non-existing storage bin throws an exception.
+    try {
+      $this->invalidStorage->delete($name);
+      $this->fail('Exception not thrown upon deleting from a non-existing storage bin.');
+    }
+    catch (\Exception $e) {
+      $class = get_class($e);
+      $this->pass($class . ' thrown upon deleting from a non-existing storage bin.');
+    }
+
+    // Listing on a non-existing storage bin returns an empty array.
+    $result = $this->invalidStorage->listAll();
+    $this->assertIdentical($result, array());
+    // Writing to a non-existing storage bin creates the bin.
+    $this->invalidStorage->write($name, array('foo' => 'bar'));
+    $result = $this->invalidStorage->read($name);
+    $this->assertIdentical($result, array('foo' => 'bar'));
+  }
+
+  /**
+   * Tests storage writing and reading data preserving data type.
+   */
+  function testDataTypes() {
+    $name = 'config_test.types';
+    $data = array(
+      'array' => array(),
+      'boolean' => TRUE,
+      'exp' => 1.2e+34,
+      'float' => 3.14159,
+      'hex' => 0xC,
+      'int' => 99,
+      'octal' => 0775,
+      'string' => 'string',
+      'string_int' => '1',
+    );
+
+    $result = $this->storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+
+    $read_data = $this->storage->read($name);
+    $this->assertIdentical($read_data, $data);
+  }
+
+  /**
+   * Tests that the storage supports collections.
+   */
+  public function testCollection() {
+    $name = 'config_test.storage';
+    $data = array('foo' => 'bar');
+    $result = $this->storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($data, $this->storage->read($name));
+
+    // Create configuration in a new collection.
+    $new_storage = $this->storage->createCollection('collection.sub.new');
+    $this->assertFalse($new_storage->exists($name));
+    $this->assertEqual(array(), $new_storage->listAll());
+    $new_storage->write($name, $data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($data, $new_storage->read($name));
+    $this->assertEqual(array($name), $new_storage->listAll());
+    $this->assertTrue($new_storage->exists($name));
+    $new_data = array('foo' => 'baz');
+    $new_storage->write($name, $new_data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($new_data, $new_storage->read($name));
+
+    // Create configuration in another collection.
+    $another_storage = $this->storage->createCollection('collection.sub.another');
+    $this->assertFalse($another_storage->exists($name));
+    $this->assertEqual(array(), $another_storage->listAll());
+    $another_storage->write($name, $new_data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($new_data, $another_storage->read($name));
+    $this->assertEqual(array($name), $another_storage->listAll());
+    $this->assertTrue($another_storage->exists($name));
+
+    // Create configuration in yet another collection.
+    $alt_storage = $this->storage->createCollection('alternate');
+    $alt_storage->write($name, $new_data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($new_data, $alt_storage->read($name));
+
+    // Switch back to the collection-less mode and check the data still exists
+    // add has not been touched.
+    $this->assertIdentical($data, $this->storage->read($name));
+
+    // Check that the getAllCollectionNames() method works.
+    $this->assertIdentical(array('alternate', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+
+    // Check that the collections are removed when they are empty.
+    $alt_storage->delete($name);
+    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+
+    // Create configuration in collection called 'collection'. This ensures that
+    // FileStorage's collection storage works regardless of its use of
+    // subdirectories.
+    $parent_storage = $this->storage->createCollection('collection');
+    $this->assertFalse($parent_storage->exists($name));
+    $this->assertEqual(array(), $parent_storage->listAll());
+    $parent_storage->write($name, $new_data);
+    $this->assertIdentical($result, TRUE);
+    $this->assertIdentical($new_data, $parent_storage->read($name));
+    $this->assertEqual(array($name), $parent_storage->listAll());
+    $this->assertTrue($parent_storage->exists($name));
+    $this->assertIdentical(array('collection', 'collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+    $parent_storage->deleteAll();
+    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+
+    // Check that the having an empty collection-less storage does not break
+    // anything. Before deleting check that the previous delete did not affect
+    // data in another collection.
+    $this->assertIdentical($data, $this->storage->read($name));
+    $this->storage->delete($name);
+    $this->assertIdentical(array('collection.sub.another', 'collection.sub.new'), $this->storage->getAllCollectionNames());
+  }
+
+  abstract protected function read($name);
+
+  abstract protected function insert($name, $data);
+
+  abstract protected function update($name, $data);
+
+  abstract protected function delete($name);
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php b/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php
new file mode 100644
index 0000000..727ad72
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/Storage/DatabaseStorageTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\Storage\DatabaseStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config\Storage;
+
+use Drupal\Core\Config\DatabaseStorage;
+
+/**
+ * Tests DatabaseStorage operations.
+ *
+ * @group config
+ */
+class DatabaseStorageTest extends ConfigStorageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->storage = new DatabaseStorage($this->container->get('database'), 'config');
+    $this->invalidStorage = new DatabaseStorage($this->container->get('database'), 'invalid');
+
+    // ::listAll() verifications require other configuration data to exist.
+    $this->storage->write('system.performance', array());
+  }
+
+  protected function read($name) {
+    $data = db_query('SELECT data FROM {config} WHERE name = :name', array(':name' => $name))->fetchField();
+    return unserialize($data);
+  }
+
+  protected function insert($name, $data) {
+    db_insert('config')->fields(array('name' => $name, 'data' => $data))->execute();
+  }
+
+  protected function update($name, $data) {
+    db_update('config')->fields(array('data' => $data))->condition('name', $name)->execute();
+  }
+
+  protected function delete($name) {
+    db_delete('config')->condition('name', $name)->execute();
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php b/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
new file mode 100644
index 0000000..583e3a1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Config/Storage/FileStorageTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Config\Storage\FileStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Config\Storage;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Config\FileStorage;
+use Drupal\Core\Config\UnsupportedDataTypeConfigException;
+use Drupal\Core\StreamWrapper\PublicStream;
+
+/**
+ * Tests FileStorage operations.
+ *
+ * @group config
+ */
+class FileStorageTest extends ConfigStorageTestBase {
+
+  /**
+   * A directory to store configuration in.
+   *
+   * @var string
+   */
+  protected $directory;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Create a directory.
+    $this->directory = PublicStream::basePath() . '/config';
+    $this->storage = new FileStorage($this->directory);
+    $this->invalidStorage = new FileStorage($this->directory . '/nonexisting');
+
+    // FileStorage::listAll() requires other configuration data to exist.
+    $this->storage->write('system.performance', $this->config('system.performance')->get());
+    $this->storage->write('core.extension', array('module' => array()));
+  }
+
+  protected function read($name) {
+    $data = file_get_contents($this->storage->getFilePath($name));
+    return Yaml::decode($data);
+  }
+
+  protected function insert($name, $data) {
+    file_put_contents($this->storage->getFilePath($name), $data);
+  }
+
+  protected function update($name, $data) {
+    file_put_contents($this->storage->getFilePath($name), $data);
+  }
+
+  protected function delete($name) {
+    unlink($this->storage->getFilePath($name));
+  }
+
+  /**
+   * Tests the FileStorage::listAll method with a relative and absolute path.
+   */
+  public function testlistAll() {
+    $expected_files = array(
+      'core.extension',
+      'system.performance',
+    );
+
+    $config_files = $this->storage->listAll();
+    $this->assertIdentical($config_files, $expected_files, 'Relative path, two config files found.');
+
+    // @todo https://www.drupal.org/node/2666954 FileStorage::listAll() is
+    //   case-sensitive. However, \Drupal\Core\Config\DatabaseStorage::listAll()
+    //   is case-insensitive.
+    $this->assertIdentical(['system.performance'], $this->storage->listAll('system'), 'The FileStorage::listAll() with prefix works.');
+    $this->assertIdentical([], $this->storage->listAll('System'), 'The FileStorage::listAll() is case sensitive.');
+  }
+
+  /**
+   * Test UnsupportedDataTypeConfigException displays path of
+   * erroneous file during read.
+   */
+  public function testReadUnsupportedDataTypeConfigException() {
+    file_put_contents($this->storage->getFilePath('core.extension'), PHP_EOL . 'foo : [bar}', FILE_APPEND);
+    try {
+      $config_parsed = $this->storage->read('core.extension');
+    }
+    catch (UnsupportedDataTypeConfigException $e) {
+      $this->pass('Exception thrown when trying to read a field containing invalid data type.');
+      $this->assertTrue((strpos($e->getMessage(), $this->storage->getFilePath('core.extension')) !== FALSE), 'Erroneous file path is displayed.');
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php b/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
new file mode 100644
index 0000000..6079d33
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/AlterTest.php
@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\AlterTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the hook_query_alter capabilities of the Select builder.
+ *
+ * @group Database
+ * @see database_test_query_alter()
+ */
+class AlterTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can do basic alters.
+   */
+  function testSimpleAlter() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $query->addTag('database_test_alter_add_range');
+
+    $result = $query->execute()->fetchAll();
+
+    $this->assertEqual(count($result), 2, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests that we can alter the joins on a query.
+   */
+  function testAlterWithJoin() {
+    $query = db_select('test_task');
+    $tid_field = $query->addField('test_task', 'tid');
+    $task_field = $query->addField('test_task', 'task');
+    $query->orderBy($task_field);
+    $query->addTag('database_test_alter_add_join');
+
+    $result = $query->execute();
+
+    $records = $result->fetchAll();
+
+    $this->assertEqual(count($records), 2, 'Returned the correct number of rows.');
+
+    $this->assertEqual($records[0]->name, 'George', 'Correct data retrieved.');
+    $this->assertEqual($records[0]->$tid_field, 4, 'Correct data retrieved.');
+    $this->assertEqual($records[0]->$task_field, 'sing', 'Correct data retrieved.');
+    $this->assertEqual($records[1]->name, 'George', 'Correct data retrieved.');
+    $this->assertEqual($records[1]->$tid_field, 5, 'Correct data retrieved.');
+    $this->assertEqual($records[1]->$task_field, 'sleep', 'Correct data retrieved.');
+  }
+
+  /**
+   * Tests that we can alter a query's conditionals.
+   */
+  function testAlterChangeConditional() {
+    $query = db_select('test_task');
+    $tid_field = $query->addField('test_task', 'tid');
+    $pid_field = $query->addField('test_task', 'pid');
+    $task_field = $query->addField('test_task', 'task');
+    $people_alias = $query->join('test', 'people', "test_task.pid = people.id");
+    $name_field = $query->addField($people_alias, 'name', 'name');
+    $query->condition('test_task.tid', '1');
+    $query->orderBy($tid_field);
+    $query->addTag('database_test_alter_change_conditional');
+
+    $result = $query->execute();
+
+    $records = $result->fetchAll();
+
+    $this->assertEqual(count($records), 1, 'Returned the correct number of rows.');
+    $this->assertEqual($records[0]->$name_field, 'John', 'Correct data retrieved.');
+    $this->assertEqual($records[0]->$tid_field, 2, 'Correct data retrieved.');
+    $this->assertEqual($records[0]->$pid_field, 1, 'Correct data retrieved.');
+    $this->assertEqual($records[0]->$task_field, 'sleep', 'Correct data retrieved.');
+  }
+
+  /**
+   * Tests that we can alter the fields of a query.
+   */
+  function testAlterChangeFields() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $query->orderBy('name');
+    $query->addTag('database_test_alter_change_fields');
+
+    $record = $query->execute()->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
+    $this->assertFalse(isset($record->$age_field), 'Age field not found, as intended.');
+  }
+
+  /**
+   * Tests that we can alter expressions in the query.
+   */
+  function testAlterExpression() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_field = $query->addExpression("age*2", 'double_age');
+    $query->condition('age', 27);
+    $query->addTag('database_test_alter_change_expressions');
+    $result = $query->execute();
+
+    // Ensure that we got the right record.
+    $record = $result->fetch();
+
+    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
+  }
+
+  /**
+   * Tests that we can remove a range() value from a query.
+   *
+   * This also tests hook_query_TAG_alter().
+   */
+  function testAlterRemoveRange() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $query->range(0, 2);
+    $query->addTag('database_test_alter_remove_range');
+
+    $num_records = count($query->execute()->fetchAll());
+
+    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests that we can do basic alters on subqueries.
+   */
+  function testSimpleAlterSubquery() {
+    // Create a sub-query with an alter tag.
+    $subquery = db_select('test', 'p');
+    $subquery->addField('p', 'name');
+    $subquery->addField('p', 'id');
+    // Pick out George.
+    $subquery->condition('age', 27);
+    $subquery->addExpression("age*2", 'double_age');
+    // This query alter should change it to age * 3.
+    $subquery->addTag('database_test_alter_change_expressions');
+
+    // Create a main query and join to sub-query.
+    $query = db_select('test_task', 'tt');
+    $query->join($subquery, 'pq', 'pq.id = tt.pid');
+    $age_field = $query->addField('pq', 'double_age');
+    $name_field = $query->addField('pq', 'name');
+
+    $record = $query->execute()->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27*3, 'Fetched age expression is correct.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php b/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
new file mode 100644
index 0000000..8d8f7cb
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/BasicSyntaxTest.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\BasicSyntaxTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests SQL syntax interpretation.
+ *
+ * In order to ensure consistent SQL handling throughout Drupal
+ * across multiple kinds of database systems, we test that the
+ * database system interprets SQL syntax in an expected fashion.
+ *
+ * @group Database
+ */
+class BasicSyntaxTest extends DatabaseTestBase {
+  /**
+   * Tests string concatenation.
+   */
+  function testConcatLiterals() {
+    $result = db_query('SELECT CONCAT(:a1, CONCAT(:a2, CONCAT(:a3, CONCAT(:a4, :a5))))', array(
+      ':a1' => 'This',
+      ':a2' => ' ',
+      ':a3' => 'is',
+      ':a4' => ' a ',
+      ':a5' => 'test.',
+    ));
+    $this->assertIdentical($result->fetchField(), 'This is a test.', 'Basic CONCAT works.');
+  }
+
+  /**
+   * Tests string concatenation with field values.
+   */
+  function testConcatFields() {
+    $result = db_query('SELECT CONCAT(:a1, CONCAT(name, CONCAT(:a2, CONCAT(age, :a3)))) FROM {test} WHERE age = :age', array(
+      ':a1' => 'The age of ',
+      ':a2' => ' is ',
+      ':a3' => '.',
+      ':age' => 25,
+    ));
+    $this->assertIdentical($result->fetchField(), 'The age of John is 25.', 'Field CONCAT works.');
+  }
+
+  /**
+   * Tests string concatenation with separator.
+   */
+  function testConcatWsLiterals() {
+    $result = db_query("SELECT CONCAT_WS(', ', :a1, NULL, :a2, :a3, :a4)", array(
+      ':a1' => 'Hello',
+      ':a2' => NULL,
+      ':a3' => '',
+      ':a4' => 'world.',
+    ));
+    $this->assertIdentical($result->fetchField(), 'Hello, , world.');
+  }
+
+  /**
+   * Tests string concatenation with separator, with field values.
+   */
+  function testConcatWsFields() {
+    $result = db_query("SELECT CONCAT_WS('-', :a1, name, :a2, age) FROM {test} WHERE age = :age", array(
+      ':a1' => 'name',
+      ':a2' => 'age',
+      ':age' => 25,
+    ));
+    $this->assertIdentical($result->fetchField(), 'name-John-age-25');
+  }
+
+  /**
+   * Tests escaping of LIKE wildcards.
+   */
+  function testLikeEscape() {
+    db_insert('test')
+      ->fields(array(
+        'name' => 'Ring_',
+      ))
+      ->execute();
+
+    // Match both "Ringo" and "Ring_".
+    $num_matches = db_select('test', 't')
+      ->condition('name', 'Ring_', 'LIKE')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Found 2 records.');
+    // Match only "Ring_" using a LIKE expression with no wildcards.
+    $num_matches = db_select('test', 't')
+      ->condition('name', db_like('Ring_'), 'LIKE')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Found 1 record.');
+  }
+
+  /**
+   * Tests a LIKE query containing a backslash.
+   */
+  function testLikeBackslash() {
+    db_insert('test')
+      ->fields(array('name'))
+      ->values(array(
+        'name' => 'abcde\f',
+      ))
+      ->values(array(
+        'name' => 'abc%\_',
+      ))
+      ->execute();
+
+    // Match both rows using a LIKE expression with two wildcards and a verbatim
+    // backslash.
+    $num_matches = db_select('test', 't')
+      ->condition('name', 'abc%\\\\_', 'LIKE')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Found 2 records.');
+    // Match only the former using a LIKE expression with no wildcards.
+    $num_matches = db_select('test', 't')
+      ->condition('name', db_like('abc%\_'), 'LIKE')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Found 1 record.');
+  }
+
+  /**
+   * Tests \Drupal\Core\Database\Connection::getFullQualifiedTableName().
+   */
+  public function testGetFullQualifiedTableName() {
+    $database = \Drupal::database();
+    $num_matches = $database->select($database->getFullQualifiedTableName('test'), 't')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertIdentical($num_matches, '4', 'Found 4 records.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php b/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php
new file mode 100644
index 0000000..2ecdfce
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/CaseSensitivityTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\CaseSensitivityTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests handling case sensitive collation.
+ *
+ * @group Database
+ */
+class CaseSensitivityTest extends DatabaseTestBase {
+  /**
+   * Tests BINARY collation in MySQL.
+   */
+  function testCaseSensitiveInsert() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    db_insert('test')
+      ->fields(array(
+        'name' => 'john', // <- A record already exists with name 'John'.
+        'age' => 2,
+        'job' => 'Baby',
+      ))
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'john'))->fetchField();
+    $this->assertIdentical($saved_age, '2', 'Can retrieve after inserting.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php b/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
new file mode 100644
index 0000000..adfadd8
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\ConnectionTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+
+/**
+ * Tests of the core database system.
+ *
+ * @group Database
+ */
+class ConnectionTest extends DatabaseTestBase {
+
+  /**
+   * Tests that connections return appropriate connection objects.
+   */
+  function testConnectionRouting() {
+    // Clone the primary credentials to a replica connection.
+    // Note this will result in two independent connection objects that happen
+    // to point to the same place.
+    $connection_info = Database::getConnectionInfo('default');
+    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
+
+    $db1 = Database::getConnection('default', 'default');
+    $db2 = Database::getConnection('replica', 'default');
+
+    $this->assertNotNull($db1, 'default connection is a real connection object.');
+    $this->assertNotNull($db2, 'replica connection is a real connection object.');
+    $this->assertNotIdentical($db1, $db2, 'Each target refers to a different connection.');
+
+    // Try to open those targets another time, that should return the same objects.
+    $db1b = Database::getConnection('default', 'default');
+    $db2b = Database::getConnection('replica', 'default');
+    $this->assertIdentical($db1, $db1b, 'A second call to getConnection() returns the same object.');
+    $this->assertIdentical($db2, $db2b, 'A second call to getConnection() returns the same object.');
+
+    // Try to open an unknown target.
+    $unknown_target = $this->randomMachineName();
+    $db3 = Database::getConnection($unknown_target, 'default');
+    $this->assertNotNull($db3, 'Opening an unknown target returns a real connection object.');
+    $this->assertIdentical($db1, $db3, 'An unknown target opens the default connection.');
+
+    // Try to open that unknown target another time, that should return the same object.
+    $db3b = Database::getConnection($unknown_target, 'default');
+    $this->assertIdentical($db3, $db3b, 'A second call to getConnection() returns the same object.');
+  }
+
+  /**
+   * Tests that connections return appropriate connection objects.
+   */
+  function testConnectionRoutingOverride() {
+    // Clone the primary credentials to a replica connection.
+    // Note this will result in two independent connection objects that happen
+    // to point to the same place.
+    $connection_info = Database::getConnectionInfo('default');
+    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
+
+    Database::ignoreTarget('default', 'replica');
+
+    $db1 = Database::getConnection('default', 'default');
+    $db2 = Database::getConnection('replica', 'default');
+
+    $this->assertIdentical($db1, $db2, 'Both targets refer to the same connection.');
+  }
+
+  /**
+   * Tests the closing of a database connection.
+   */
+  function testConnectionClosing() {
+    // Open the default target so we have an object to compare.
+    $db1 = Database::getConnection('default', 'default');
+
+    // Try to close the default connection, then open a new one.
+    Database::closeConnection('default', 'default');
+    $db2 = Database::getConnection('default', 'default');
+
+    // Opening a connection after closing it should yield an object different than the original.
+    $this->assertNotIdentical($db1, $db2, 'Opening the default connection after it is closed returns a new object.');
+  }
+
+  /**
+   * Tests the connection options of the active database.
+   */
+  function testConnectionOptions() {
+    $connection_info = Database::getConnectionInfo('default');
+
+    // Be sure we're connected to the default database.
+    $db = Database::getConnection('default', 'default');
+    $connectionOptions = $db->getConnectionOptions();
+
+    // In the MySQL driver, the port can be different, so check individual
+    // options.
+    $this->assertEqual($connection_info['default']['driver'], $connectionOptions['driver'], 'The default connection info driver matches the current connection options driver.');
+    $this->assertEqual($connection_info['default']['database'], $connectionOptions['database'], 'The default connection info database matches the current connection options database.');
+
+    // Set up identical replica and confirm connection options are identical.
+    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
+    $db2 = Database::getConnection('replica', 'default');
+    $connectionOptions2 = $db2->getConnectionOptions();
+
+    // Get a fresh copy of the default connection options.
+    $connectionOptions = $db->getConnectionOptions();
+    $this->assertIdentical($connectionOptions, $connectionOptions2, 'The default and replica connection options are identical.');
+
+    // Set up a new connection with different connection info.
+    $test = $connection_info['default'];
+    $test['database'] .= 'test';
+    Database::addConnectionInfo('test', 'default', $test);
+    $connection_info = Database::getConnectionInfo('test');
+
+    // Get a fresh copy of the default connection options.
+    $connectionOptions = $db->getConnectionOptions();
+    $this->assertNotEqual($connection_info['default']['database'], $connectionOptions['database'], 'The test connection info database does not match the current connection options database.');
+  }
+
+  /**
+   * Ensure that you cannot execute multiple statements on phpversion() > 5.5.21 or > 5.6.5.
+   */
+  public function testMultipleStatementsForNewPhp() {
+    // This just tests mysql, as other PDO integrations don't allow disabling
+    // multiple statements.
+    if (Database::getConnection()->databaseType() !== 'mysql' || !defined('\PDO::MYSQL_ATTR_MULTI_STATEMENTS')) {
+      return;
+    }
+
+    $db = Database::getConnection('default', 'default');
+    // Disable the protection at the PHP level.
+    try {
+      $db->query('SELECT * FROM {test}; SELECT * FROM {test_people}',
+        [],
+        [ 'allow_delimiter_in_query' => TRUE ]
+      );
+      $this->fail('No PDO exception thrown for multiple statements.');
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      $this->pass('PDO exception thrown for multiple statements.');
+    }
+  }
+
+  /**
+   * Ensure that you cannot execute multiple statements.
+   */
+  public function testMultipleStatements() {
+
+    $db = Database::getConnection('default', 'default');
+    try {
+      $db->query('SELECT * FROM {test}; SELECT * FROM {test_people}');
+      $this->fail('No exception thrown for multiple statements.');
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass('Exception thrown for multiple statements.');
+    }
+  }
+
+  /**
+   * Test the escapeTable(), escapeField() and escapeAlias() methods with all possible reserved words in PostgreSQL.
+   */
+  public function testPostgresqlReservedWords() {
+    if (Database::getConnection()->databaseType() !== 'pgsql') {
+      return;
+    }
+
+    $db = Database::getConnection('default', 'default');
+    $stmt = $db->query("SELECT word FROM pg_get_keywords() WHERE catcode IN ('R', 'T')");
+    $stmt->execute();
+    foreach ($stmt->fetchAllAssoc('word') as $word => $row) {
+      $expected = '"' . $word . '"';
+      $this->assertIdentical($db->escapeTable($word), $expected, format_string('The reserved word %word was correctly escaped when used as a table name.', array('%word' => $word)));
+      $this->assertIdentical($db->escapeField($word), $expected, format_string('The reserved word %word was correctly escaped when used as a column name.', array('%word' => $word)));
+      $this->assertIdentical($db->escapeAlias($word), $expected, format_string('The reserved word %word was correctly escaped when used as an alias.', array('%word' => $word)));
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php b/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
new file mode 100644
index 0000000..78bae36
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\ConnectionUnitTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests management of database connections.
+ *
+ * @group Database
+ */
+class ConnectionUnitTest extends KernelTestBase {
+
+  protected $key;
+  protected $target;
+
+  protected $monitor;
+  protected $originalCount;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->key = 'default';
+    $this->originalTarget = 'default';
+    $this->target = 'DatabaseConnectionUnitTest';
+
+    // Determine whether the database driver is MySQL. If it is not, the test
+    // methods will not be executed.
+    // @todo Make this test driver-agnostic, or find a proper way to skip it.
+    //   See https://www.drupal.org/node/1273478.
+    $connection_info = Database::getConnectionInfo('default');
+    $this->skipTest = (bool) ($connection_info['default']['driver'] != 'mysql');
+    if ($this->skipTest) {
+      // Insert an assertion to prevent Simpletest from interpreting the test
+      // as failure.
+      $this->pass('This test is only compatible with MySQL.');
+    }
+
+    // Create an additional connection to monitor the connections being opened
+    // and closed in this test.
+    // @see TestBase::changeDatabasePrefix()
+    Database::addConnectionInfo('default', 'monitor', $connection_info['default']);
+    $this->monitor = Database::getConnection('monitor');
+  }
+
+  /**
+   * Adds a new database connection info to Database.
+   */
+  protected function addConnection() {
+    // Add a new target to the connection, by cloning the current connection.
+    $connection_info = Database::getConnectionInfo($this->key);
+    Database::addConnectionInfo($this->key, $this->target, $connection_info[$this->originalTarget]);
+
+    // Verify that the new target exists.
+    $info = Database::getConnectionInfo($this->key);
+    // Note: Custom assertion message to not expose database credentials.
+    $this->assertIdentical($info[$this->target], $connection_info[$this->key], 'New connection info found.');
+  }
+
+  /**
+   * Returns the connection ID of the current test connection.
+   *
+   * @return int
+   */
+  protected function getConnectionID() {
+    return (int) Database::getConnection($this->target, $this->key)->query('SELECT CONNECTION_ID()')->fetchField();
+  }
+
+  /**
+   * Asserts that a connection ID exists.
+   *
+   * @param int $id
+   *   The connection ID to verify.
+   */
+  protected function assertConnection($id) {
+    $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
+    return $this->assertTrue(isset($list[$id]), format_string('Connection ID @id found.', array('@id' => $id)));
+  }
+
+  /**
+   * Asserts that a connection ID does not exist.
+   *
+   * @param int $id
+   *   The connection ID to verify.
+   */
+  protected function assertNoConnection($id) {
+    $list = $this->monitor->query('SHOW PROCESSLIST')->fetchAllKeyed(0, 0);
+    return $this->assertFalse(isset($list[$id]), format_string('Connection ID @id not found.', array('@id' => $id)));
+  }
+
+  /**
+   * Tests Database::closeConnection() without query.
+   *
+   * @todo getConnectionID() executes a query.
+   */
+  function testOpenClose() {
+    if ($this->skipTest) {
+      return;
+    }
+    // Add and open a new connection.
+    $this->addConnection();
+    $id = $this->getConnectionID();
+    Database::getConnection($this->target, $this->key);
+
+    // Verify that there is a new connection.
+    $this->assertConnection($id);
+
+    // Close the connection.
+    Database::closeConnection($this->target, $this->key);
+    // Wait 20ms to give the database engine sufficient time to react.
+    usleep(20000);
+
+    // Verify that we are back to the original connection count.
+    $this->assertNoConnection($id);
+  }
+
+  /**
+   * Tests Database::closeConnection() with a query.
+   */
+  function testOpenQueryClose() {
+    if ($this->skipTest) {
+      return;
+    }
+    // Add and open a new connection.
+    $this->addConnection();
+    $id = $this->getConnectionID();
+    Database::getConnection($this->target, $this->key);
+
+    // Verify that there is a new connection.
+    $this->assertConnection($id);
+
+    // Execute a query.
+    Database::getConnection($this->target, $this->key)->query('SHOW TABLES');
+
+    // Close the connection.
+    Database::closeConnection($this->target, $this->key);
+    // Wait 20ms to give the database engine sufficient time to react.
+    usleep(20000);
+
+    // Verify that we are back to the original connection count.
+    $this->assertNoConnection($id);
+  }
+
+  /**
+   * Tests Database::closeConnection() with a query and custom prefetch method.
+   */
+  function testOpenQueryPrefetchClose() {
+    if ($this->skipTest) {
+      return;
+    }
+    // Add and open a new connection.
+    $this->addConnection();
+    $id = $this->getConnectionID();
+    Database::getConnection($this->target, $this->key);
+
+    // Verify that there is a new connection.
+    $this->assertConnection($id);
+
+    // Execute a query.
+    Database::getConnection($this->target, $this->key)->query('SHOW TABLES')->fetchCol();
+
+    // Close the connection.
+    Database::closeConnection($this->target, $this->key);
+    // Wait 20ms to give the database engine sufficient time to react.
+    usleep(20000);
+
+    // Verify that we are back to the original connection count.
+    $this->assertNoConnection($id);
+  }
+
+  /**
+   * Tests Database::closeConnection() with a select query.
+   */
+  function testOpenSelectQueryClose() {
+    if ($this->skipTest) {
+      return;
+    }
+    // Add and open a new connection.
+    $this->addConnection();
+    $id = $this->getConnectionID();
+    Database::getConnection($this->target, $this->key);
+
+    // Verify that there is a new connection.
+    $this->assertConnection($id);
+
+    // Create a table.
+    $name = 'foo';
+    Database::getConnection($this->target, $this->key)->schema()->createTable($name, array(
+      'fields' => array(
+        'name' => array(
+          'type' => 'varchar',
+          'length' => 255,
+        ),
+      ),
+    ));
+
+    // Execute a query.
+    Database::getConnection($this->target, $this->key)->select('foo', 'f')
+      ->fields('f', array('name'))
+      ->execute()
+      ->fetchAll();
+
+    // Drop the table.
+    Database::getConnection($this->target, $this->key)->schema()->dropTable($name);
+
+    // Close the connection.
+    Database::closeConnection($this->target, $this->key);
+    // Wait 20ms to give the database engine sufficient time to react.
+    usleep(20000);
+
+    // Verify that we are back to the original connection count.
+    $this->assertNoConnection($id);
+  }
+
+  /**
+   * Tests pdo options override.
+   */
+  public function testConnectionOpen() {
+    $connection = Database::getConnection('default');
+    $reflection = new \ReflectionObject($connection);
+    $connection_property = $reflection->getProperty('connection');
+    $connection_property->setAccessible(TRUE);
+    $error_mode = $connection_property->getValue($connection)
+      ->getAttribute(\PDO::ATTR_ERRMODE);
+    $this->assertEqual($error_mode, \PDO::ERRMODE_EXCEPTION, 'Ensure the default error mode is set to exception.');
+
+    $connection = Database::getConnectionInfo('default');
+    $connection['default']['pdo'][\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
+    Database::addConnectionInfo('test', 'default', $connection['default']);
+    $connection = Database::getConnection('default', 'test');
+
+    $reflection = new \ReflectionObject($connection);
+    $connection_property = $reflection->getProperty('connection');
+    $connection_property->setAccessible(TRUE);
+    $error_mode = $connection_property->getValue($connection)
+      ->getAttribute(\PDO::ATTR_ERRMODE);
+    $this->assertEqual($error_mode, \PDO::ERRMODE_SILENT, 'Ensure PDO connection options can be overridden.');
+
+    Database::removeConnection('test');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php
new file mode 100644
index 0000000..5b8a085
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\DatabaseExceptionWrapperTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Database\Database;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests exceptions thrown by queries.
+ *
+ * @group Database
+ */
+class DatabaseExceptionWrapperTest extends KernelTestBase {
+
+  /**
+   * Tests the expected database exception thrown for prepared statements.
+   */
+  public function testPreparedStatement() {
+    $connection = Database::getConnection();
+    try {
+      // SQLite validates the syntax upon preparing a statement already.
+      // @throws \PDOException
+      $query = $connection->prepare('bananas');
+
+      // MySQL only validates the syntax upon trying to execute a query.
+      // @throws \Drupal\Core\Database\DatabaseExceptionWrapper
+      $connection->query($query);
+
+      $this->fail('Expected PDOException or DatabaseExceptionWrapper, none was thrown.');
+    }
+    catch (\PDOException $e) {
+      $this->pass('Expected PDOException was thrown.');
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      $this->pass('Expected DatabaseExceptionWrapper was thrown.');
+    }
+    catch (\Exception $e) {
+      $this->fail("Thrown exception is not a PDOException:\n" . (string) $e);
+    }
+  }
+
+  /**
+   * Tests the expected database exception thrown for inexistent tables.
+   */
+  public function testQueryThrowsDatabaseExceptionWrapperException() {
+    $connection = Database::getConnection();
+    try {
+      $connection->query('SELECT * FROM {does_not_exist}');
+      $this->fail('Expected PDOException, none was thrown.');
+    }
+    catch (DatabaseExceptionWrapper $e) {
+      $this->pass('Expected DatabaseExceptionWrapper was thrown.');
+    }
+    catch (\Exception $e) {
+      $this->fail("Thrown exception is not a DatabaseExceptionWrapper:\n" . (string) $e);
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
new file mode 100644
index 0000000..444e53b
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\DatabaseTestBase.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Base class for databases database tests.
+ *
+ * Because all database tests share the same test data, we can centralize that
+ * here.
+ */
+abstract class DatabaseTestBase extends KernelTestBase {
+
+  public static $modules = array('database_test');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('database_test', array(
+      'test',
+      'test_people',
+      'test_people_copy',
+      'test_one_blob',
+      'test_two_blobs',
+      'test_task',
+      'test_null',
+      'test_serialized',
+      'test_special_columns',
+      'TEST_UPPERCASE',
+    ));
+    self::addSampleData();
+  }
+
+  /**
+   * Sets up tables for NULL handling.
+   */
+  function ensureSampleDataNull() {
+    db_insert('test_null')
+    ->fields(array('name', 'age'))
+    ->values(array(
+      'name' => 'Kermit',
+      'age' => 25,
+    ))
+    ->values(array(
+      'name' => 'Fozzie',
+      'age' => NULL,
+    ))
+    ->values(array(
+      'name' => 'Gonzo',
+      'age' => 27,
+    ))
+    ->execute();
+  }
+
+  /**
+   * Sets up our sample data.
+   */
+  static function addSampleData() {
+    // We need the IDs, so we can't use a multi-insert here.
+    $john = db_insert('test')
+      ->fields(array(
+        'name' => 'John',
+        'age' => 25,
+        'job' => 'Singer',
+      ))
+      ->execute();
+
+    $george = db_insert('test')
+      ->fields(array(
+        'name' => 'George',
+        'age' => 27,
+        'job' => 'Singer',
+      ))
+      ->execute();
+
+    db_insert('test')
+      ->fields(array(
+        'name' => 'Ringo',
+        'age' => 28,
+        'job' => 'Drummer',
+      ))
+      ->execute();
+
+    $paul = db_insert('test')
+      ->fields(array(
+        'name' => 'Paul',
+        'age' => 26,
+        'job' => 'Songwriter',
+      ))
+      ->execute();
+
+    db_insert('test_people')
+      ->fields(array(
+        'name' => 'Meredith',
+        'age' => 30,
+        'job' => 'Speaker',
+      ))
+      ->execute();
+
+    db_insert('test_task')
+      ->fields(array('pid', 'task', 'priority'))
+      ->values(array(
+        'pid' => $john,
+        'task' => 'eat',
+        'priority' => 3,
+      ))
+      ->values(array(
+        'pid' => $john,
+        'task' => 'sleep',
+        'priority' => 4,
+      ))
+      ->values(array(
+        'pid' => $john,
+        'task' => 'code',
+        'priority' => 1,
+      ))
+      ->values(array(
+        'pid' => $george,
+        'task' => 'sing',
+        'priority' => 2,
+      ))
+      ->values(array(
+        'pid' => $george,
+        'task' => 'sleep',
+        'priority' => 2,
+      ))
+      ->values(array(
+        'pid' => $paul,
+        'task' => 'found new band',
+        'priority' => 1,
+      ))
+      ->values(array(
+        'pid' => $paul,
+        'task' => 'perform at superbowl',
+        'priority' => 3,
+      ))
+      ->execute();
+
+    db_insert('test_special_columns')
+      ->fields(array(
+        'id' => 1,
+        'offset' => 'Offset value 1',
+      ))
+      ->execute();
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php b/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
new file mode 100644
index 0000000..1cce4b8
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\DeleteTruncateTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests delete and truncate queries.
+ *
+ * The DELETE tests are not as extensive, as all of the interesting code for
+ * DELETE queries is in the conditional which is identical to the UPDATE and
+ * SELECT conditional handling.
+ *
+ * The TRUNCATE tests are not extensive either, because the behavior of
+ * TRUNCATE queries is not consistent across database engines. We only test
+ * that a TRUNCATE query actually deletes all rows from the target table.
+ *
+ * @group Database
+ */
+class DeleteTruncateTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can use a subselect in a delete successfully.
+   */
+  function testSubselectDelete() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
+    $pid_to_delete = db_query("SELECT * FROM {test_task} WHERE task = 'sleep'")->fetchField();
+
+    $subquery = db_select('test', 't')
+      ->fields('t', array('id'))
+      ->condition('t.id', array($pid_to_delete), 'IN');
+    $delete = db_delete('test_task')
+      ->condition('task', 'sleep')
+      ->condition('pid', $subquery, 'IN');
+
+    $num_deleted = $delete->execute();
+    $this->assertEqual($num_deleted, 1, 'Deleted 1 record.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_task}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
+  }
+
+  /**
+   * Confirms that we can delete a single record successfully.
+   */
+  function testSimpleDelete() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    $num_deleted = db_delete('test')
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_deleted, 1, 'Deleted 1 record.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
+  }
+
+  /**
+   * Confirms that we can truncate a whole table successfully.
+   */
+  function testTruncate() {
+    $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
+    $this->assertTrue($num_records_before > 0, 'The table is not empty.');
+
+    db_truncate('test')->execute();
+
+    $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
+    $this->assertEqual(0, $num_records_after, 'Truncate really deletes everything.');
+  }
+
+  /**
+   * Confirms that we can delete a single special column name record successfully.
+   */
+  function testSpecialColumnDelete() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
+
+    $num_deleted = db_delete('test_special_columns')
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_deleted, 1, 'Deleted 1 special column record.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_special_columns}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after + $num_deleted, 'Deletion adds up.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php b/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
new file mode 100644
index 0000000..987b810
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/FetchTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\FetchTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\RowCountException;
+use Drupal\Core\Database\StatementInterface;
+use Drupal\system\Tests\Database\FakeRecord;
+
+/**
+ * Tests the Database system's various fetch capabilities.
+ *
+ * We get timeout errors if we try to run too many tests at once.
+ *
+ * @group Database
+ */
+class FetchTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can fetch a record properly in default object mode.
+   */
+  function testQueryFetchDefault() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25));
+    $this->assertTrue($result instanceof StatementInterface, 'Result set is a Drupal statement object.');
+    foreach ($result as $record) {
+      $records[] = $record;
+      $this->assertTrue(is_object($record), 'Record is an object.');
+      $this->assertIdentical($record->name, 'John', '25 year old is John.');
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record.');
+  }
+
+  /**
+   * Confirms that we can fetch a record to an object explicitly.
+   */
+  function testQueryFetchObject() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_OBJ));
+    foreach ($result as $record) {
+      $records[] = $record;
+      $this->assertTrue(is_object($record), 'Record is an object.');
+      $this->assertIdentical($record->name, 'John', '25 year old is John.');
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record.');
+  }
+
+  /**
+   * Confirms that we can fetch a record to an associative array explicitly.
+   */
+  function testQueryFetchArray() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_ASSOC));
+    foreach ($result as $record) {
+      $records[] = $record;
+      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
+        $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
+      }
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record.');
+  }
+
+  /**
+   * Confirms that we can fetch a record into a new instance of a custom class.
+   *
+   * @see \Drupal\system\Tests\Database\FakeRecord
+   */
+  function testQueryFetchClass() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => 'Drupal\system\Tests\Database\FakeRecord'));
+    foreach ($result as $record) {
+      $records[] = $record;
+      if ($this->assertTrue($record instanceof FakeRecord, 'Record is an object of class FakeRecord.')) {
+        $this->assertIdentical($record->name, 'John', '25 year old is John.');
+      }
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record.');
+  }
+
+  /**
+   * Confirms that we can fetch a record into an indexed array explicitly.
+   */
+  function testQueryFetchNum() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_NUM));
+    foreach ($result as $record) {
+      $records[] = $record;
+      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
+        $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
+      }
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record');
+  }
+
+  /**
+   * Confirms that we can fetch a record into a doubly-keyed array explicitly.
+   */
+  function testQueryFetchBoth() {
+    $records = array();
+    $result = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 25), array('fetch' => \PDO::FETCH_BOTH));
+    foreach ($result as $record) {
+      $records[] = $record;
+      if ($this->assertTrue(is_array($record), 'Record is an array.')) {
+        $this->assertIdentical($record[0], 'John', 'Record can be accessed numerically.');
+        $this->assertIdentical($record['name'], 'John', 'Record can be accessed associatively.');
+      }
+    }
+
+    $this->assertIdentical(count($records), 1, 'There is only one record.');
+  }
+
+  /**
+   * Confirms that we can fetch an entire column of a result set at once.
+   */
+  function testQueryFetchCol() {
+    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
+    $column = $result->fetchCol();
+    $this->assertIdentical(count($column), 3, 'fetchCol() returns the right number of records.');
+
+    $result = db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25));
+    $i = 0;
+    foreach ($result as $record) {
+      $this->assertIdentical($record->name, $column[$i++], 'Column matches direct access.');
+    }
+  }
+
+  /**
+   * Tests that rowCount() throws exception on SELECT query.
+   */
+  public function testRowCount() {
+    $result = db_query('SELECT name FROM {test}');
+    try {
+      $result->rowCount();
+      $exception = FALSE;
+    }
+    catch (RowCountException $e) {
+      $exception = TRUE;
+    }
+    $this->assertTrue($exception, 'Exception was thrown');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php b/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
new file mode 100644
index 0000000..5256e4d
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\InsertDefaultsTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Query\NoFieldsException;
+
+/**
+ * Tests the Insert query builder with default values.
+ *
+ * @group Database
+ */
+class InsertDefaultsTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can run a query that uses default values for everything.
+   */
+  function testDefaultInsert() {
+    $query = db_insert('test')->useDefaults(array('job'));
+    $id = $query->execute();
+
+    $schema = drupal_get_module_schema('database_test', 'test');
+
+    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
+    $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
+  }
+
+  /**
+   * Tests that no action will be preformed if no fields are specified.
+   */
+  function testDefaultEmptyInsert() {
+    $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    try {
+      db_insert('test')->execute();
+      // This is only executed if no exception has been thrown.
+      $this->fail('Expected exception NoFieldsException has not been thrown.');
+    } catch (NoFieldsException $e) {
+      $this->pass('Expected exception NoFieldsException has been thrown.');
+    }
+
+    $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertIdentical($num_records_before, $num_records_after, 'Do nothing as no fields are specified.');
+  }
+
+  /**
+   * Tests that we can insert fields with values and defaults in the same query.
+   */
+  function testDefaultInsertWithFields() {
+    $query = db_insert('test')
+      ->fields(array('name' => 'Bob'))
+      ->useDefaults(array('job'));
+    $id = $query->execute();
+
+    $schema = drupal_get_module_schema('database_test', 'test');
+
+    $job = db_query('SELECT job FROM {test} WHERE id = :id', array(':id' => $id))->fetchField();
+    $this->assertEqual($job, $schema['fields']['job']['default'], 'Default field value is set.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php b/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php
new file mode 100644
index 0000000..2037e69
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/InsertLobTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\InsertLobTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Insert query builder with LOB fields.
+ *
+ * @group Database
+ */
+class InsertLobTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can insert a single blob field successfully.
+   */
+  function testInsertOneBlob() {
+    $data = "This is\000a test.";
+    $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
+    $id = db_insert('test_one_blob')
+      ->fields(array('blob1' => $data))
+      ->execute();
+    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $this->assertTrue($r['blob1'] === $data, format_string('Can insert a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+  }
+
+  /**
+   * Tests that we can insert multiple blob fields in the same query.
+   */
+  function testInsertMultipleBlob() {
+    $id = db_insert('test_two_blobs')
+      ->fields(array(
+        'blob1' => 'This is',
+        'blob2' => 'a test',
+      ))
+      ->execute();
+    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $this->assertTrue($r['blob1'] === 'This is' && $r['blob2'] === 'a test', 'Can insert multiple blobs per row.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php b/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php
new file mode 100644
index 0000000..2f91c7f
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/InsertTest.php
@@ -0,0 +1,214 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\InsertTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the insert builder.
+ *
+ * @group Database
+ */
+class InsertTest extends DatabaseTestBase {
+
+  /**
+   * Tests very basic insert functionality.
+   */
+  function testSimpleInsert() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    $query = db_insert('test');
+    $query->fields(array(
+      'name' => 'Yoko',
+      'age' => '29',
+    ));
+
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
+    $query->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertIdentical($num_records_before + 1, (int) $num_records_after, 'Record inserts correctly.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Yoko'))->fetchField();
+    $this->assertIdentical($saved_age, '29', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that we can insert multiple records in one query object.
+   */
+  function testMultiInsert() {
+    $num_records_before = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    $query = db_insert('test');
+    $query->fields(array(
+      'name' => 'Larry',
+      'age' => '30',
+    ));
+
+    // We should be able to specify values in any order if named.
+    $query->values(array(
+      'age' => '31',
+      'name' => 'Curly',
+    ));
+
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 2, 'Two records are queued for insertion.');
+
+    // We should be able to say "use the field order".
+    // This is not the recommended mechanism for most cases, but it should work.
+    $query->values(array('Moe', '32'));
+
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 3, 'Three records are queued for insertion.');
+    $query->execute();
+
+    $num_records_after = (int) db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertIdentical($num_records_before + 3, $num_records_after, 'Record inserts correctly.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that an insert object can be reused with new data after it executes.
+   */
+  function testRepeatedInsert() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+
+    $query = db_insert('test');
+
+    $query->fields(array(
+      'name' => 'Larry',
+      'age' => '30',
+    ));
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
+    $query->execute();  // This should run the insert, but leave the fields intact.
+
+    // We should be able to specify values in any order if named.
+    $query->values(array(
+      'age' => '31',
+      'name' => 'Curly',
+    ));
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
+    $query->execute();
+
+    // We should be able to say "use the field order".
+    $query->values(array('Moe', '32'));
+
+    // Check how many records are queued for insertion.
+    $this->assertIdentical($query->count(), 1, 'One record is queued for insertion.');
+    $query->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test}')->fetchField();
+    $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, 'Record inserts correctly.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that we can specify fields without values and specify values later.
+   */
+  function testInsertFieldOnlyDefinition() {
+    // This is useful for importers, when we want to create a query and define
+    // its fields once, then loop over a multi-insert execution.
+    db_insert('test')
+      ->fields(array('name', 'age'))
+      ->values(array('Larry', '30'))
+      ->values(array('Curly', '31'))
+      ->values(array('Moe', '32'))
+      ->execute();
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Larry'))->fetchField();
+    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Curly'))->fetchField();
+    $this->assertIdentical($saved_age, '31', 'Can retrieve after inserting.');
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Moe'))->fetchField();
+    $this->assertIdentical($saved_age, '32', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that inserts return the proper auto-increment ID.
+   */
+  function testInsertLastInsertID() {
+    $id = db_insert('test')
+      ->fields(array(
+        'name' => 'Larry',
+        'age' => '30',
+      ))
+      ->execute();
+
+    $this->assertIdentical($id, '5', 'Auto-increment ID returned successfully.');
+  }
+
+  /**
+   * Tests that the INSERT INTO ... SELECT (fields) ... syntax works.
+   */
+  function testInsertSelectFields() {
+    $query = db_select('test_people', 'tp');
+    // The query builder will always append expressions after fields.
+    // Add the expression first to test that the insert fields are correctly
+    // re-ordered.
+    $query->addExpression('tp.age', 'age');
+    $query
+      ->fields('tp', array('name', 'job'))
+      ->condition('tp.name', 'Meredith');
+
+    // The resulting query should be equivalent to:
+    // INSERT INTO test (age, name, job)
+    // SELECT tp.age AS age, tp.name AS name, tp.job AS job
+    // FROM test_people tp
+    // WHERE tp.name = 'Meredith'
+    db_insert('test')
+      ->from($query)
+      ->execute();
+
+    $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
+    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that the INSERT INTO ... SELECT * ... syntax works.
+   */
+  function testInsertSelectAll() {
+    $query = db_select('test_people', 'tp')
+      ->fields('tp')
+      ->condition('tp.name', 'Meredith');
+
+    // The resulting query should be equivalent to:
+    // INSERT INTO test_people_copy
+    // SELECT *
+    // FROM test_people tp
+    // WHERE tp.name = 'Meredith'
+    db_insert('test_people_copy')
+      ->from($query)
+      ->execute();
+
+    $saved_age = db_query('SELECT age FROM {test_people_copy} WHERE name = :name', array(':name' => 'Meredith'))->fetchField();
+    $this->assertIdentical($saved_age, '30', 'Can retrieve after inserting.');
+  }
+
+  /**
+   * Tests that we can INSERT INTO a special named column.
+   */
+  function testSpecialColumnInsert() {
+    $id = db_insert('test_special_columns')
+      ->fields(array(
+        'id' => 2,
+        'offset' => 'Offset value 2',
+      ))
+      ->execute();
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 2))->fetchField();
+    $this->assertIdentical($saved_value, 'Offset value 2', 'Can retrieve special column name value after inserting.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php b/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php
new file mode 100644
index 0000000..8cb54de
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/InvalidDataTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\InvalidDataTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\IntegrityConstraintViolationException;
+
+/**
+ * Tests handling of some invalid data.
+ *
+ * @group Database
+ */
+class InvalidDataTest extends DatabaseTestBase {
+  /**
+   * Tests aborting of traditional SQL database systems with invalid data.
+   */
+  function testInsertDuplicateData() {
+    // Try to insert multiple records where at least one has bad data.
+    try {
+      db_insert('test')
+        ->fields(array('name', 'age', 'job'))
+        ->values(array(
+          'name' => 'Elvis',
+          'age' => 63,
+          'job' => 'Singer',
+        ))->values(array(
+          'name' => 'John', // <-- Duplicate value on unique field.
+          'age' => 17,
+          'job' => 'Consultant',
+        ))
+        ->values(array(
+          'name' => 'Frank',
+          'age' => 75,
+          'job' => 'Singer',
+        ))
+        ->execute();
+      $this->fail('Insert succeeded when it should not have.');
+    }
+    catch (IntegrityConstraintViolationException $e) {
+      // Check if the first record was inserted.
+      $name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => 63))->fetchField();
+
+      if ($name == 'Elvis') {
+        if (!Database::getConnection()->supportsTransactions()) {
+          // This is an expected fail.
+          // Database engines that don't support transactions can leave partial
+          // inserts in place when an error occurs. This is the case for MySQL
+          // when running on a MyISAM table.
+          $this->pass("The whole transaction has not been rolled-back when a duplicate key insert occurs, this is expected because the database doesn't support transactions");
+        }
+        else {
+          $this->fail('The whole transaction is rolled back when a duplicate key insert occurs.');
+        }
+      }
+      else {
+        $this->pass('The whole transaction is rolled back when a duplicate key insert occurs.');
+      }
+
+      // Ensure the other values were not inserted.
+      $record = db_select('test')
+        ->fields('test', array('name', 'age'))
+        ->condition('age', array(17, 75), 'IN')
+        ->execute()->fetchObject();
+
+      $this->assertFalse($record, 'The rest of the insert aborted as expected.');
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
new file mode 100644
index 0000000..76451dd
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\LargeQueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Component\Utility\Environment;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseException;
+
+/**
+ * Tests handling of large queries.
+ *
+ * @group Database
+ */
+class LargeQueryTest extends DatabaseTestBase {
+
+  /**
+   * Tests truncation of messages when max_allowed_packet exception occurs.
+   */
+  function testMaxAllowedPacketQueryTruncating() {
+    // This test only makes sense if we are running on a MySQL database.
+    // Test if we are.
+    $database = Database::getConnectionInfo('default');
+    if ($database['default']['driver'] == 'mysql') {
+      // The max_allowed_packet value is configured per database instance.
+      // Retrieve the max_allowed_packet value from the current instance and
+      // check if PHP is configured with sufficient allowed memory to be able
+      // to generate a query larger than max_allowed_packet.
+      $max_allowed_packet = db_query('SELECT @@global.max_allowed_packet')->fetchField();
+      if (Environment::checkMemoryLimit($max_allowed_packet + (16 * 1024 * 1024))) {
+        $long_name = str_repeat('a', $max_allowed_packet + 1);
+        try {
+          db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $long_name));
+          $this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
+        } catch (DatabaseException $e) {
+          // Close and re-open the connection. Otherwise we will run into error
+          // 2006 "MySQL server had gone away" afterwards.
+          Database::closeConnection();
+          Database::getConnection();
+          $this->assertEqual($e->getPrevious()->errorInfo[1], 1153, "Got a packet bigger than 'max_allowed_packet' bytes exception thrown.");
+          // Use strlen() to count the bytes exactly, not the unicode chars.
+          $this->assertTrue(strlen($e->getMessage()) <= $max_allowed_packet, "'max_allowed_packet' exception message truncated.");
+        }
+      }
+      else {
+        $this->verbose('The configured max_allowed_packet exceeds the php memory limit. Therefore the test is skipped.');
+      }
+    }
+    else {
+      $this->verbose('The test requires MySQL. Therefore the test is skipped.');
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php b/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
new file mode 100644
index 0000000..e98d069
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
@@ -0,0 +1,133 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\LoggingTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests the query logging facility.
+ *
+ * @group Database
+ */
+class LoggingTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can log the existence of a query.
+   */
+  function testEnableLogging() {
+    Database::startLog('testing');
+
+    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
+
+    // Trigger a call that does not have file in the backtrace.
+    call_user_func_array('db_query', array('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo')))->fetchCol();
+
+    $queries = Database::getLog('testing', 'default');
+
+    $this->assertEqual(count($queries), 3, 'Correct number of queries recorded.');
+
+    foreach ($queries as $query) {
+      $this->assertEqual($query['caller']['function'], __FUNCTION__, 'Correct function in query log.');
+    }
+  }
+
+  /**
+   * Tests that we can run two logs in parallel.
+   */
+  function testEnableMultiLogging() {
+    Database::startLog('testing1');
+
+    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+
+    Database::startLog('testing2');
+
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchCol();
+
+    $queries1 = Database::getLog('testing1');
+    $queries2 = Database::getLog('testing2');
+
+    $this->assertEqual(count($queries1), 2, 'Correct number of queries recorded for log 1.');
+    $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for log 2.');
+  }
+
+  /**
+   * Tests logging queries against multiple targets on the same connection.
+   */
+  function testEnableTargetLogging() {
+    // Clone the primary credentials to a replica connection and to another fake
+    // connection.
+    $connection_info = Database::getConnectionInfo('default');
+    Database::addConnectionInfo('default', 'replica', $connection_info['default']);
+
+    Database::startLog('testing1');
+
+    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'));//->fetchCol();
+
+    $queries1 = Database::getLog('testing1');
+
+    $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+    $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
+    $this->assertEqual($queries1[1]['target'], 'replica', 'Second query used replica target.');
+  }
+
+  /**
+   * Tests that logs to separate targets use the same connection properly.
+   *
+   * This test is identical to the one above, except that it doesn't create
+   * a fake target so the query should fall back to running on the default
+   * target.
+   */
+  function testEnableTargetLoggingNoTarget() {
+    Database::startLog('testing1');
+
+    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+
+    // We use "fake" here as a target because any non-existent target will do.
+    // However, because all of the tests in this class share a single page
+    // request there is likely to be a target of "replica" from one of the other
+    // unit tests, so we use a target here that we know with absolute certainty
+    // does not exist.
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'fake'))->fetchCol();
+
+    $queries1 = Database::getLog('testing1');
+
+    $this->assertEqual(count($queries1), 2, 'Recorded queries from all targets.');
+    $this->assertEqual($queries1[0]['target'], 'default', 'First query used default target.');
+    $this->assertEqual($queries1[1]['target'], 'default', 'Second query used default target as fallback.');
+  }
+
+  /**
+   * Tests that we can log queries separately on different connections.
+   */
+  function testEnableMultiConnectionLogging() {
+    // Clone the primary credentials to a fake connection.
+    // That both connections point to the same physical database is irrelevant.
+    $connection_info = Database::getConnectionInfo('default');
+    Database::addConnectionInfo('test2', 'default', $connection_info['default']);
+
+    Database::startLog('testing1');
+    Database::startLog('testing1', 'test2');
+
+    db_query('SELECT name FROM {test} WHERE age > :age', array(':age' => 25))->fetchCol();
+
+    $old_key = db_set_active('test2');
+
+    db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'), array('target' => 'replica'))->fetchCol();
+
+    db_set_active($old_key);
+
+    $queries1 = Database::getLog('testing1');
+    $queries2 = Database::getLog('testing1', 'test2');
+
+    $this->assertEqual(count($queries1), 1, 'Correct number of queries recorded for first connection.');
+    $this->assertEqual(count($queries2), 1, 'Correct number of queries recorded for second connection.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php b/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php
new file mode 100644
index 0000000..3e57857
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/MergeTest.php
@@ -0,0 +1,237 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\MergeTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Query\Merge;
+use Drupal\Core\Database\Query\InvalidMergeQueryException;
+
+/**
+ * Tests the MERGE query builder.
+ *
+ * @group Database
+ */
+class MergeTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can merge-insert a record successfully.
+   */
+  function testMergeInsert() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    $result = db_merge('test_people')
+      ->key('job', 'Presenter')
+      ->fields(array(
+        'age' => 31,
+        'name' => 'Tiffany',
+      ))
+      ->execute();
+
+    $this->assertEqual($result, Merge::STATUS_INSERT, 'Insert status returned.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+    $this->assertEqual($person->age, 31, 'Age set correctly.');
+    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
+  }
+
+  /**
+   * Confirms that we can merge-update a record successfully.
+   */
+  function testMergeUpdate() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    $result = db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->fields(array(
+        'age' => 31,
+        'name' => 'Tiffany',
+      ))
+      ->execute();
+
+    $this->assertEqual($result, Merge::STATUS_UPDATE, 'Update status returned.');
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+    $this->assertEqual($person->age, 31, 'Age set correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
+  }
+
+  /**
+   * Confirms that we can merge-update a record successfully.
+   *
+   * This test varies from the previous test because it manually defines which
+   * fields are inserted, and which fields are updated.
+   */
+  function testMergeUpdateExcept() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->insertFields(array('age' => 31))
+      ->updateFields(array('name' => 'Tiffany'))
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
+  }
+
+  /**
+   * Confirms that we can merge-update a record, with alternate replacement.
+   */
+  function testMergeUpdateExplicit() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->insertFields(array(
+        'age' => 31,
+        'name' => 'Tiffany',
+      ))
+      ->updateFields(array(
+        'name' => 'Joe',
+      ))
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Joe', 'Name set correctly.');
+    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
+  }
+
+  /**
+   * Confirms that we can merge-update a record successfully, with expressions.
+   */
+  function testMergeUpdateExpression() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    $age_before = db_query('SELECT age FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetchField();
+
+    // This is a very contrived example, as I have no idea why you'd want to
+    // change age this way, but that's beside the point.
+    // Note that we are also double-setting age here, once as a literal and
+    // once as an expression. This test will only pass if the expression wins,
+    // which is what is supposed to happen.
+    db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->fields(array('name' => 'Tiffany'))
+      ->insertFields(array('age' => 31))
+      ->expression('age', 'age + :age', array(':age' => 4))
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge updated properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+    $this->assertEqual($person->age, $age_before + 4, 'Age updated correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job set correctly.');
+  }
+
+  /**
+   * Tests that we can merge-insert without any update fields.
+   */
+  function testMergeInsertWithoutUpdate() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    db_merge('test_people')
+      ->key('job', 'Presenter')
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before + 1, $num_records_after, 'Merge inserted properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $this->assertEqual($person->name, '', 'Name set correctly.');
+    $this->assertEqual($person->age, 0, 'Age set correctly.');
+    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
+  }
+
+  /**
+   * Confirms that we can merge-update without any update fields.
+   */
+  function testMergeUpdateWithoutUpdate() {
+    $num_records_before = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
+    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
+
+    db_merge('test_people')
+      ->key('job', 'Speaker')
+      ->insertFields(array('age' => 31))
+      ->execute();
+
+    $num_records_after = db_query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before, $num_records_after, 'Merge skipped properly.');
+
+    $person = db_query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->name, 'Meredith', 'Name skipped correctly.');
+    $this->assertEqual($person->age, 30, 'Age skipped correctly.');
+    $this->assertEqual($person->job, 'Speaker', 'Job skipped correctly.');
+  }
+
+  /**
+   * Tests that an invalid merge query throws an exception.
+   */
+  function testInvalidMerge() {
+    try {
+      // This query will fail because there is no key field specified.
+      // Normally it would throw an exception but we are suppressing it with
+      // the throw_exception option.
+      $options['throw_exception'] = FALSE;
+      db_merge('test_people', $options)
+        ->fields(array(
+          'age' => 31,
+          'name' => 'Tiffany',
+        ))
+        ->execute();
+      $this->pass('$options[\'throw_exception\'] is FALSE, no InvalidMergeQueryException thrown.');
+    }
+    catch (InvalidMergeQueryException $e) {
+      $this->fail('$options[\'throw_exception\'] is FALSE, but InvalidMergeQueryException thrown for invalid query.');
+      return;
+    }
+
+    try {
+      // This query will fail because there is no key field specified.
+      db_merge('test_people')
+        ->fields(array(
+          'age' => 31,
+          'name' => 'Tiffany',
+        ))
+        ->execute();
+    }
+    catch (InvalidMergeQueryException $e) {
+      $this->pass('InvalidMergeQueryException thrown for invalid query.');
+      return;
+    }
+    $this->fail('No InvalidMergeQueryException thrown');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php b/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
new file mode 100644
index 0000000..43754b0
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\NextIdTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the sequences API.
+ *
+ * @group Database
+ */
+class NextIdTest extends KernelTestBase {
+
+  /**
+   * The modules to enable.
+   * @var array
+   */
+  public static $modules = array('system');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('system', 'sequences');
+  }
+
+  /**
+   * Tests that the sequences API works.
+   */
+  function testDbNextId() {
+    $first = db_next_id();
+    $second = db_next_id();
+    // We can test for exact increase in here because we know there is no
+    // other process operating on these tables -- normally we could only
+    // expect $second > $first.
+    $this->assertEqual($first + 1, $second, 'The second call from a sequence provides a number increased by one.');
+    $result = db_next_id(1000);
+    $this->assertEqual($result, 1001, 'Sequence provides a larger number than the existing ID.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
new file mode 100644
index 0000000..c56d2d5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/QueryTest.php
@@ -0,0 +1,153 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\QueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests Drupal's extended prepared statement syntax..
+ *
+ * @group Database
+ */
+class QueryTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can pass an array of values directly in the query.
+   */
+  function testArraySubstitution() {
+    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25, 26, 27)))->fetchAll();
+    $this->assertEqual(count($names), 3, 'Correct number of names returned');
+
+    $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => array(25)))->fetchAll();
+    $this->assertEqual(count($names), 1, 'Correct number of names returned');
+  }
+
+  /**
+   * Tests that we can not pass a scalar value when an array is expected.
+   */
+  function testScalarSubstitution() {
+    try {
+      $names = db_query('SELECT name FROM {test} WHERE age IN ( :ages[] ) ORDER BY age', array(':ages[]' => 25))->fetchAll();
+      $this->fail('Array placeholder with scalar argument should result in an exception.');
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass('Array placeholder with scalar argument should result in an exception.');
+    }
+
+  }
+
+  /**
+   * Tests SQL injection via database query array arguments.
+   */
+  public function testArrayArgumentsSQLInjection() {
+    // Attempt SQL injection and verify that it does not work.
+    $condition = array(
+      "1 ;INSERT INTO {test} (name) VALUES ('test12345678'); -- " => '',
+      '1' => '',
+    );
+    try {
+      db_query("SELECT * FROM {test} WHERE name = :name", array(':name' => $condition))->fetchObject();
+      $this->fail('SQL injection attempt via array arguments should result in a database exception.');
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass('SQL injection attempt via array arguments should result in a database exception.');
+    }
+
+    // Test that the insert query that was used in the SQL injection attempt did
+    // not result in a row being inserted in the database.
+    $result = db_select('test')
+      ->condition('name', 'test12345678')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertFalse($result, 'SQL injection attempt did not result in a row being inserted in the database table.');
+  }
+
+  /**
+   * Tests SQL injection via condition operator.
+   */
+  public function testConditionOperatorArgumentsSQLInjection() {
+    $injection = "IS NOT NULL) ;INSERT INTO {test} (name) VALUES ('test12345678'); -- ";
+
+    // Convert errors to exceptions for testing purposes below.
+    set_error_handler(function ($severity, $message, $filename, $lineno) {
+      throw new \ErrorException($message, 0, $severity, $filename, $lineno);
+    });
+    try {
+      $result = db_select('test', 't')
+        ->fields('t')
+        ->condition('name', 1, $injection)
+        ->execute();
+      $this->fail('Should not be able to attempt SQL injection via condition operator.');
+    }
+    catch (\ErrorException $e) {
+      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
+    }
+
+    // Test that the insert query that was used in the SQL injection attempt did
+    // not result in a row being inserted in the database.
+    $result = db_select('test')
+      ->condition('name', 'test12345678')
+      ->countQuery()
+      ->execute()
+      ->fetchField();
+    $this->assertFalse($result, 'SQL injection attempt did not result in a row being inserted in the database table.');
+
+    // Attempt SQLi via union query with no unsafe characters.
+    $this->enableModules(['user']);
+    $this->installEntitySchema('user');
+    db_insert('test')
+      ->fields(['name' => '123456'])
+      ->execute();
+    $injection = "= 1 UNION ALL SELECT password FROM user WHERE uid =";
+
+    try {
+      $result = db_select('test', 't')
+        ->fields('t', array('name', 'name'))
+        ->condition('name', 1, $injection)
+        ->execute();
+      $this->fail('Should not be able to attempt SQL injection via operator.');
+    }
+    catch (\ErrorException $e) {
+      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
+    }
+
+    // Attempt SQLi via union query - uppercase tablename.
+    db_insert('TEST_UPPERCASE')
+      ->fields(['name' => 'secrets'])
+      ->execute();
+    $injection = "IS NOT NULL) UNION ALL SELECT name FROM {TEST_UPPERCASE} -- ";
+
+    try {
+      $result = db_select('test', 't')
+        ->fields('t', array('name'))
+        ->condition('name', 1, $injection)
+        ->execute();
+      $this->fail('Should not be able to attempt SQL injection via operator.');
+    }
+    catch (\ErrorException $e) {
+      $this->pass('SQL injection attempt via condition arguments should result in a database exception.');
+    }
+    restore_error_handler();
+  }
+
+  /**
+   * Tests numeric query parameter expansion in expressions.
+   *
+   * @see \Drupal\Core\Database\Driver\sqlite\Statement::getStatement()
+   * @see http://bugs.php.net/bug.php?id=45259
+   */
+  public function testNumericExpressionSubstitution() {
+    $count = db_query('SELECT COUNT(*) >= 3 FROM {test}')->fetchField();
+    $this->assertEqual((bool) $count, TRUE);
+
+    $count = db_query('SELECT COUNT(*) >= :count FROM {test}', array(
+      ':count' => 3,
+    ))->fetchField();
+    $this->assertEqual((bool) $count, TRUE);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
new file mode 100644
index 0000000..13067f0
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/RangeQueryTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\RangeQueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Range query functionality.
+ *
+ * @group Database
+ */
+class RangeQueryTest extends DatabaseTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('database_test');
+
+  /**
+   * Confirms that range queries work and return the correct result.
+   */
+  function testRangeQuery() {
+    // Test if return correct number of rows.
+    $range_rows = db_query_range("SELECT name FROM {test} ORDER BY name", 1, 3)->fetchAll();
+    $this->assertEqual(count($range_rows), 3, 'Range query work and return correct number of rows.');
+
+    // Test if return target data.
+    $raw_rows = db_query('SELECT name FROM {test} ORDER BY name')->fetchAll();
+    $raw_rows = array_slice($raw_rows, 1, 3);
+    $this->assertEqual($range_rows, $raw_rows);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php b/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php
new file mode 100644
index 0000000..c5d1753
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/RegressionTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\RegressionTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Regression tests cases for the database layer.
+ *
+ * @group Database
+ */
+class RegressionTest extends DatabaseTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node', 'user');
+
+  /**
+   * Ensures that non-ASCII UTF-8 data is stored in the database properly.
+   */
+  function testRegression_310447() {
+    // That's a 255 character UTF-8 string.
+    $job = str_repeat("é", 255);
+    db_insert('test')
+      ->fields(array(
+        'name' => $this->randomMachineName(),
+        'age' => 20,
+        'job' => $job,
+      ))->execute();
+
+    $from_database = db_query('SELECT job FROM {test} WHERE job = :job', array(':job' => $job))->fetchField();
+    $this->assertIdentical($job, $from_database, 'The database handles UTF-8 characters cleanly.');
+  }
+
+  /**
+   * Tests the db_table_exists() function.
+   */
+  function testDBTableExists() {
+    $this->assertIdentical(TRUE, db_table_exists('test'), 'Returns true for existent table.');
+    $this->assertIdentical(FALSE, db_table_exists('nosuchtable'), 'Returns false for nonexistent table.');
+  }
+
+  /**
+   * Tests the db_field_exists() function.
+   */
+  function testDBFieldExists() {
+    $this->assertIdentical(TRUE, db_field_exists('test', 'name'), 'Returns true for existent column.');
+    $this->assertIdentical(FALSE, db_field_exists('test', 'nosuchcolumn'), 'Returns false for nonexistent column.');
+  }
+
+  /**
+   * Tests the db_index_exists() function.
+   */
+  function testDBIndexExists() {
+    $this->assertIdentical(TRUE, db_index_exists('test', 'ages'), 'Returns true for existent index.');
+    $this->assertIdentical(FALSE, db_index_exists('test', 'nosuchindex'), 'Returns false for nonexistent index.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
new file mode 100644
index 0000000..393dedf
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
@@ -0,0 +1,796 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SchemaTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\SchemaException;
+use Drupal\Core\Database\SchemaObjectDoesNotExistException;
+use Drupal\Core\Database\SchemaObjectExistsException;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\Component\Utility\Unicode;
+
+/**
+ * Tests table creation and modification via the schema API.
+ *
+ * @group Database
+ */
+class SchemaTest extends KernelTestBase {
+
+  /**
+   * A global counter for table and field creation.
+   */
+  protected $counter;
+
+  /**
+   * Tests database interactions.
+   */
+  function testSchema() {
+    // Try creating a table.
+    $table_specification = array(
+      'description' => 'Schema table description may contain "quotes" and could be long—very long indeed.',
+      'fields' => array(
+        'id'  => array(
+          'type' => 'int',
+          'default' => NULL,
+        ),
+        'test_field'  => array(
+          'type' => 'int',
+          'not null' => TRUE,
+          'description' => 'Schema table description may contain "quotes" and could be long—very long indeed. There could be "multiple quoted regions".',
+        ),
+        'test_field_string'  => array(
+          'type' => 'varchar',
+          'length' => 20,
+          'not null' => TRUE,
+          'default' => "'\"funky default'\"",
+          'description' => 'Schema column description for string.',
+        ),
+        'test_field_string_ascii'  => array(
+          'type' => 'varchar_ascii',
+          'length' => 255,
+          'description' => 'Schema column description for ASCII string.',
+        ),
+      ),
+    );
+    db_create_table('test_table', $table_specification);
+
+    // Assert that the table exists.
+    $this->assertTrue(db_table_exists('test_table'), 'The table exists.');
+
+    // Assert that the table comment has been set.
+    $this->checkSchemaComment($table_specification['description'], 'test_table');
+
+    // Assert that the column comment has been set.
+    $this->checkSchemaComment($table_specification['fields']['test_field']['description'], 'test_table', 'test_field');
+
+    if (Database::getConnection()->databaseType() == 'mysql') {
+      // Make sure that varchar fields have the correct collation.
+      $columns = db_query('SHOW FULL COLUMNS FROM {test_table}');
+      foreach ($columns as $column) {
+        if ($column->Field == 'test_field_string') {
+          $string_check = ($column->Collation == 'utf8mb4_general_ci');
+        }
+        if ($column->Field == 'test_field_string_ascii') {
+          $string_ascii_check = ($column->Collation == 'ascii_general_ci');
+        }
+      }
+      $this->assertTrue(!empty($string_check), 'string field has the right collation.');
+      $this->assertTrue(!empty($string_ascii_check), 'ASCII string field has the right collation.');
+    }
+
+    // An insert without a value for the column 'test_table' should fail.
+    $this->assertFalse($this->tryInsert(), 'Insert without a default failed.');
+
+    // Add a default value to the column.
+    db_field_set_default('test_table', 'test_field', 0);
+    // The insert should now succeed.
+    $this->assertTrue($this->tryInsert(), 'Insert with a default succeeded.');
+
+    // Remove the default.
+    db_field_set_no_default('test_table', 'test_field');
+    // The insert should fail again.
+    $this->assertFalse($this->tryInsert(), 'Insert without a default failed.');
+
+    // Test for fake index and test for the boolean result of indexExists().
+    $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
+    $this->assertIdentical($index_exists, FALSE, 'Fake index does not exists');
+    // Add index.
+    db_add_index('test_table', 'test_field', array('test_field'), $table_specification);
+    // Test for created index and test for the boolean result of indexExists().
+    $index_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
+    $this->assertIdentical($index_exists, TRUE, 'Index created.');
+
+    // Rename the table.
+    db_rename_table('test_table', 'test_table2');
+
+    // Index should be renamed.
+    $index_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
+    $this->assertTrue($index_exists, 'Index was renamed.');
+
+    // We need the default so that we can insert after the rename.
+    db_field_set_default('test_table2', 'test_field', 0);
+    $this->assertFalse($this->tryInsert(), 'Insert into the old table failed.');
+    $this->assertTrue($this->tryInsert('test_table2'), 'Insert into the new table succeeded.');
+
+    // We should have successfully inserted exactly two rows.
+    $count = db_query('SELECT COUNT(*) FROM {test_table2}')->fetchField();
+    $this->assertEqual($count, 2, 'Two fields were successfully inserted.');
+
+    // Try to drop the table.
+    db_drop_table('test_table2');
+    $this->assertFalse(db_table_exists('test_table2'), 'The dropped table does not exist.');
+
+    // Recreate the table.
+    db_create_table('test_table', $table_specification);
+    db_field_set_default('test_table', 'test_field', 0);
+    db_add_field('test_table', 'test_serial', array('type' => 'int', 'not null' => TRUE, 'default' => 0, 'description' => 'Added column description.'));
+
+    // Assert that the column comment has been set.
+    $this->checkSchemaComment('Added column description.', 'test_table', 'test_serial');
+
+    // Change the new field to a serial column.
+    db_change_field('test_table', 'test_serial', 'test_serial', array('type' => 'serial', 'not null' => TRUE, 'description' => 'Changed column description.'), array('primary key' => array('test_serial')));
+
+    // Assert that the column comment has been set.
+    $this->checkSchemaComment('Changed column description.', 'test_table', 'test_serial');
+
+    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
+    $max1 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
+    $this->assertTrue($this->tryInsert(), 'Insert with a serial succeeded.');
+    $max2 = db_query('SELECT MAX(test_serial) FROM {test_table}')->fetchField();
+    $this->assertTrue($max2 > $max1, 'The serial is monotone.');
+
+    $count = db_query('SELECT COUNT(*) FROM {test_table}')->fetchField();
+    $this->assertEqual($count, 2, 'There were two rows.');
+
+    // Test renaming of keys and constraints.
+    db_drop_table('test_table');
+    $table_specification = array(
+      'fields' => array(
+        'id'  => array(
+          'type' => 'serial',
+          'not null' => TRUE,
+        ),
+        'test_field'  => array(
+          'type' => 'int',
+          'default' => 0,
+        ),
+      ),
+      'primary key' => array('id'),
+      'unique keys' => array(
+        'test_field' => array('test_field'),
+      ),
+    );
+    db_create_table('test_table', $table_specification);
+
+    // Tests for indexes are Database specific.
+    $db_type = Database::getConnection()->databaseType();
+
+    // Test for existing primary and unique keys.
+    switch ($db_type) {
+      case 'pgsql':
+        $primary_key_exists = Database::getConnection()->schema()->constraintExists('test_table', '__pkey');
+        $unique_key_exists = Database::getConnection()->schema()->constraintExists('test_table', 'test_field' . '__key');
+        break;
+      case 'sqlite':
+        // SQLite does not create a standalone index for primary keys.
+        $primary_key_exists = TRUE;
+        $unique_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
+        break;
+      default:
+        $primary_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'PRIMARY');
+        $unique_key_exists = Database::getConnection()->schema()->indexExists('test_table', 'test_field');
+        break;
+    }
+    $this->assertIdentical($primary_key_exists, TRUE, 'Primary key created.');
+    $this->assertIdentical($unique_key_exists, TRUE, 'Unique key created.');
+
+    db_rename_table('test_table', 'test_table2');
+
+    // Test for renamed primary and unique keys.
+    switch ($db_type) {
+      case 'pgsql':
+        $renamed_primary_key_exists = Database::getConnection()->schema()->constraintExists('test_table2', '__pkey');
+        $renamed_unique_key_exists = Database::getConnection()->schema()->constraintExists('test_table2', 'test_field' . '__key');
+        break;
+      case 'sqlite':
+        // SQLite does not create a standalone index for primary keys.
+        $renamed_primary_key_exists = TRUE;
+        $renamed_unique_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
+        break;
+      default:
+        $renamed_primary_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'PRIMARY');
+        $renamed_unique_key_exists = Database::getConnection()->schema()->indexExists('test_table2', 'test_field');
+        break;
+    }
+    $this->assertIdentical($renamed_primary_key_exists, TRUE, 'Primary key was renamed.');
+    $this->assertIdentical($renamed_unique_key_exists, TRUE, 'Unique key was renamed.');
+
+    // For PostgreSQL check in addition that sequence was renamed.
+    if ($db_type == 'pgsql') {
+      // Get information about new table.
+      $info = Database::getConnection()->schema()->queryTableInformation('test_table2');
+      $sequence_name = Database::getConnection()->schema()->prefixNonTable('test_table2', 'id', 'seq');
+      $this->assertEqual($sequence_name, current($info->sequences), 'Sequence was renamed.');
+    }
+
+    // Use database specific data type and ensure that table is created.
+    $table_specification = array(
+      'description' => 'Schema table description.',
+      'fields' => array(
+        'timestamp'  => array(
+          'mysql_type' => 'timestamp',
+          'pgsql_type' => 'timestamp',
+          'sqlite_type' => 'datetime',
+          'not null' => FALSE,
+          'default' => NULL,
+        ),
+      ),
+    );
+    try {
+      db_create_table('test_timestamp', $table_specification);
+    }
+    catch (\Exception $e) {}
+    $this->assertTrue(db_table_exists('test_timestamp'), 'Table with database specific datatype was created.');
+  }
+
+  /**
+   * Tests that indexes on string fields are limited to 191 characters on MySQL.
+   *
+   * @see \Drupal\Core\Database\Driver\mysql\Schema::getNormalizedIndexes()
+   */
+  function testIndexLength() {
+    if (Database::getConnection()->databaseType() != 'mysql') {
+      return;
+    }
+    $table_specification = array(
+      'fields' => array(
+        'id'  => array(
+          'type' => 'int',
+          'default' => NULL,
+        ),
+        'test_field_text'  => array(
+          'type' => 'text',
+          'not null' => TRUE,
+        ),
+        'test_field_string_long'  => array(
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+        ),
+        'test_field_string_ascii_long'  => array(
+          'type' => 'varchar_ascii',
+          'length' => 255,
+        ),
+        'test_field_string_short'  => array(
+          'type' => 'varchar',
+          'length' => 128,
+          'not null' => TRUE,
+        ),
+      ),
+      'indexes' => array(
+        'test_regular' => array(
+          'test_field_text',
+          'test_field_string_long',
+          'test_field_string_ascii_long',
+          'test_field_string_short',
+        ),
+        'test_length' => array(
+          array('test_field_text', 128),
+          array('test_field_string_long', 128),
+          array('test_field_string_ascii_long', 128),
+          array('test_field_string_short', 128),
+        ),
+        'test_mixed' => array(
+          array('test_field_text', 200),
+          'test_field_string_long',
+          array('test_field_string_ascii_long', 200),
+          'test_field_string_short',
+        ),
+      ),
+    );
+    db_create_table('test_table_index_length', $table_specification);
+
+    $schema_object = Database::getConnection()->schema();
+
+    // Ensure expected exception thrown when adding index with missing info.
+    $expected_exception_message = "MySQL needs the 'test_field_text' field specification in order to normalize the 'test_regular' index";
+    $missing_field_spec = $table_specification;
+    unset($missing_field_spec['fields']['test_field_text']);
+    try {
+      $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $missing_field_spec);
+      $this->fail('SchemaException not thrown when adding index with missing information.');
+    }
+    catch (SchemaException $e) {
+      $this->assertEqual($expected_exception_message, $e->getMessage());
+    }
+
+    // Add a separate index.
+    $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
+    $table_specification_with_new_index = $table_specification;
+    $table_specification_with_new_index['indexes']['test_separate'] = [['test_field_text', 200]];
+
+    // Ensure that the exceptions of addIndex are thrown as expected.
+
+    try {
+      $schema_object->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
+      $this->fail('\Drupal\Core\Database\SchemaObjectExistsException exception missed.');
+    }
+    catch (SchemaObjectExistsException $e) {
+      $this->pass('\Drupal\Core\Database\SchemaObjectExistsException thrown when index already exists.');
+    }
+
+    try {
+      $schema_object->addIndex('test_table_non_existing', 'test_separate', [['test_field_text', 200]], $table_specification);
+      $this->fail('\Drupal\Core\Database\SchemaObjectDoesNotExistException exception missed.');
+    }
+    catch (SchemaObjectDoesNotExistException $e) {
+      $this->pass('\Drupal\Core\Database\SchemaObjectDoesNotExistException thrown when index already exists.');
+    }
+
+    // Get index information.
+    $results = db_query('SHOW INDEX FROM {test_table_index_length}');
+    $expected_lengths = array(
+      'test_regular' => array(
+        'test_field_text' => 191,
+        'test_field_string_long' => 191,
+        'test_field_string_ascii_long' => NULL,
+        'test_field_string_short' => NULL,
+      ),
+      'test_length' => array(
+        'test_field_text' => 128,
+        'test_field_string_long' => 128,
+        'test_field_string_ascii_long' => 128,
+        'test_field_string_short' => NULL,
+      ),
+      'test_mixed' => array(
+        'test_field_text' => 191,
+        'test_field_string_long' => 191,
+        'test_field_string_ascii_long' => 200,
+        'test_field_string_short' => NULL,
+      ),
+      'test_separate' => array(
+        'test_field_text' => 191,
+      ),
+    );
+
+    // Count the number of columns defined in the indexes.
+    $column_count = 0;
+    foreach ($table_specification_with_new_index['indexes'] as $index) {
+      foreach ($index as $field) {
+        $column_count++;
+      }
+    }
+    $test_count = 0;
+    foreach ($results as $result) {
+      $this->assertEqual($result->Sub_part, $expected_lengths[$result->Key_name][$result->Column_name], 'Index length matches expected value.');
+      $test_count++;
+    }
+    $this->assertEqual($test_count, $column_count, 'Number of tests matches expected value.');
+  }
+
+  /**
+   * Tests inserting data into an existing table.
+   *
+   * @param $table
+   *   The database table to insert data into.
+   *
+   * @return
+   *   TRUE if the insert succeeded, FALSE otherwise.
+   */
+  function tryInsert($table = 'test_table') {
+    try {
+      db_insert($table)
+        ->fields(array('id' => mt_rand(10, 20)))
+        ->execute();
+      return TRUE;
+    }
+    catch (\Exception $e) {
+      return FALSE;
+    }
+  }
+
+  /**
+   * Checks that a table or column comment matches a given description.
+   *
+   * @param $description
+   *   The asserted description.
+   * @param $table
+   *   The table to test.
+   * @param $column
+   *   Optional column to test.
+   */
+  function checkSchemaComment($description, $table, $column = NULL) {
+    if (method_exists(Database::getConnection()->schema(), 'getComment')) {
+      $comment = Database::getConnection()->schema()->getComment($table, $column);
+      // The schema comment truncation for mysql is different.
+      if (Database::getConnection()->databaseType() == 'mysql') {
+        $max_length = $column ? 255 : 60;
+        $description = Unicode::truncate($description, $max_length, TRUE, TRUE);
+      }
+      $this->assertEqual($comment, $description, 'The comment matches the schema description.');
+    }
+  }
+
+  /**
+   * Tests creating unsigned columns and data integrity thereof.
+   */
+  function testUnsignedColumns() {
+    // First create the table with just a serial column.
+    $table_name = 'unsigned_table';
+    $table_spec = array(
+      'fields' => array('serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE)),
+      'primary key' => array('serial_column'),
+    );
+    db_create_table($table_name, $table_spec);
+
+    // Now set up columns for the other types.
+    $types = array('int', 'float', 'numeric');
+    foreach ($types as $type) {
+      $column_spec = array('type' => $type, 'unsigned'=> TRUE);
+      if ($type == 'numeric') {
+        $column_spec += array('precision' => 10, 'scale' => 0);
+      }
+      $column_name = $type . '_column';
+      $table_spec['fields'][$column_name] = $column_spec;
+      db_add_field($table_name, $column_name, $column_spec);
+    }
+
+    // Finally, check each column and try to insert invalid values into them.
+    foreach ($table_spec['fields'] as $column_name => $column_spec) {
+      $this->assertTrue(db_field_exists($table_name, $column_name), format_string('Unsigned @type column was created.', array('@type' => $column_spec['type'])));
+      $this->assertFalse($this->tryUnsignedInsert($table_name, $column_name), format_string('Unsigned @type column rejected a negative value.', array('@type' => $column_spec['type'])));
+    }
+  }
+
+  /**
+   * Tries to insert a negative value into columns defined as unsigned.
+   *
+   * @param $table_name
+   *   The table to insert.
+   * @param $column_name
+   *   The column to insert.
+   *
+   * @return
+   *   TRUE if the insert succeeded, FALSE otherwise.
+   */
+  function tryUnsignedInsert($table_name, $column_name) {
+    try {
+      db_insert($table_name)
+        ->fields(array($column_name => -1))
+        ->execute();
+      return TRUE;
+    }
+    catch (\Exception $e) {
+      return FALSE;
+    }
+  }
+
+  /**
+   * Tests adding columns to an existing table.
+   */
+  function testSchemaAddField() {
+    // Test varchar types.
+    foreach (array(1, 32, 128, 256, 512) as $length) {
+      $base_field_spec = array(
+        'type' => 'varchar',
+        'length' => $length,
+      );
+      $variations = array(
+        array('not null' => FALSE),
+        array('not null' => FALSE, 'default' => '7'),
+        array('not null' => FALSE, 'default' => substr('"thing"', 0, $length)),
+        array('not null' => FALSE, 'default' => substr("\"'hing", 0, $length)),
+        array('not null' => TRUE, 'initial' => 'd'),
+        array('not null' => FALSE, 'default' => NULL),
+        array('not null' => TRUE, 'initial' => 'd', 'default' => '7'),
+      );
+
+      foreach ($variations as $variation) {
+        $field_spec = $variation + $base_field_spec;
+        $this->assertFieldAdditionRemoval($field_spec);
+      }
+    }
+
+    // Test int and float types.
+    foreach (array('int', 'float') as $type) {
+      foreach (array('tiny', 'small', 'medium', 'normal', 'big') as $size) {
+        $base_field_spec = array(
+          'type' => $type,
+          'size' => $size,
+        );
+        $variations = array(
+          array('not null' => FALSE),
+          array('not null' => FALSE, 'default' => 7),
+          array('not null' => TRUE, 'initial' => 1),
+          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
+        );
+
+        foreach ($variations as $variation) {
+          $field_spec = $variation + $base_field_spec;
+          $this->assertFieldAdditionRemoval($field_spec);
+        }
+      }
+    }
+
+    // Test numeric types.
+    foreach (array(1, 5, 10, 40, 65) as $precision) {
+      foreach (array(0, 2, 10, 30) as $scale) {
+        // Skip combinations where precision is smaller than scale.
+        if ($precision <= $scale) {
+          continue;
+        }
+
+        $base_field_spec = array(
+          'type' => 'numeric',
+          'scale' => $scale,
+          'precision' => $precision,
+        );
+        $variations = array(
+          array('not null' => FALSE),
+          array('not null' => FALSE, 'default' => 7),
+          array('not null' => TRUE, 'initial' => 1),
+          array('not null' => TRUE, 'initial' => 1, 'default' => 7),
+        );
+
+        foreach ($variations as $variation) {
+          $field_spec = $variation + $base_field_spec;
+          $this->assertFieldAdditionRemoval($field_spec);
+        }
+      }
+    }
+  }
+
+  /**
+   * Asserts that a given field can be added and removed from a table.
+   *
+   * The addition test covers both defining a field of a given specification
+   * when initially creating at table and extending an existing table.
+   *
+   * @param $field_spec
+   *   The schema specification of the field.
+   */
+  protected function assertFieldAdditionRemoval($field_spec) {
+    // Try creating the field on a new table.
+    $table_name = 'test_table_' . ($this->counter++);
+    $table_spec = array(
+      'fields' => array(
+        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+        'test_field' => $field_spec,
+      ),
+      'primary key' => array('serial_column'),
+    );
+    db_create_table($table_name, $table_spec);
+    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+
+    // Check the characteristics of the field.
+    $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
+
+    // Clean-up.
+    db_drop_table($table_name);
+
+    // Try adding a field to an existing table.
+    $table_name = 'test_table_' . ($this->counter++);
+    $table_spec = array(
+      'fields' => array(
+        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+      ),
+      'primary key' => array('serial_column'),
+    );
+    db_create_table($table_name, $table_spec);
+    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+
+    // Insert some rows to the table to test the handling of initial values.
+    for ($i = 0; $i < 3; $i++) {
+      db_insert($table_name)
+        ->useDefaults(array('serial_column'))
+        ->execute();
+    }
+
+    db_add_field($table_name, 'test_field', $field_spec);
+    $this->pass(format_string('Column %column created.', array('%column' => 'test_field')));
+
+    // Check the characteristics of the field.
+    $this->assertFieldCharacteristics($table_name, 'test_field', $field_spec);
+
+    // Clean-up.
+    db_drop_field($table_name, 'test_field');
+
+    // Add back the field and then try to delete a field which is also a primary
+    // key.
+    db_add_field($table_name, 'test_field', $field_spec);
+    db_drop_field($table_name, 'serial_column');
+    db_drop_table($table_name);
+  }
+
+  /**
+   * Asserts that a newly added field has the correct characteristics.
+   */
+  protected function assertFieldCharacteristics($table_name, $field_name, $field_spec) {
+    // Check that the initial value has been registered.
+    if (isset($field_spec['initial'])) {
+      // There should be no row with a value different then $field_spec['initial'].
+      $count = db_select($table_name)
+        ->fields($table_name, array('serial_column'))
+        ->condition($field_name, $field_spec['initial'], '<>')
+        ->countQuery()
+        ->execute()
+        ->fetchField();
+      $this->assertEqual($count, 0, 'Initial values filled out.');
+    }
+
+    // Check that the default value has been registered.
+    if (isset($field_spec['default'])) {
+      // Try inserting a row, and check the resulting value of the new column.
+      $id = db_insert($table_name)
+        ->useDefaults(array('serial_column'))
+        ->execute();
+      $field_value = db_select($table_name)
+        ->fields($table_name, array($field_name))
+        ->condition('serial_column', $id)
+        ->execute()
+        ->fetchField();
+      $this->assertEqual($field_value, $field_spec['default'], 'Default value registered.');
+    }
+  }
+
+  /**
+   * Tests changing columns between types.
+   */
+  function testSchemaChangeField() {
+    $field_specs = array(
+      array('type' => 'int', 'size' => 'normal', 'not null' => FALSE),
+      array('type' => 'int', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 17),
+      array('type' => 'float', 'size' => 'normal', 'not null' => FALSE),
+      array('type' => 'float', 'size' => 'normal', 'not null' => TRUE, 'initial' => 1, 'default' => 7.3),
+      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => FALSE),
+      array('type' => 'numeric', 'scale' => 2, 'precision' => 10, 'not null' => TRUE, 'initial' => 1, 'default' => 7),
+    );
+
+    foreach ($field_specs as $i => $old_spec) {
+      foreach ($field_specs as $j => $new_spec) {
+        if ($i === $j) {
+          // Do not change a field into itself.
+          continue;
+        }
+        $this->assertFieldChange($old_spec, $new_spec);
+      }
+    }
+
+    $field_specs = array(
+      array('type' => 'varchar_ascii', 'length' => '255'),
+      array('type' => 'varchar', 'length' => '255'),
+      array('type' => 'text'),
+      array('type' => 'blob', 'size' => 'big'),
+    );
+
+    foreach ($field_specs as $i => $old_spec) {
+      foreach ($field_specs as $j => $new_spec) {
+        if ($i === $j) {
+          // Do not change a field into itself.
+          continue;
+        }
+        // Note if the serialized data contained an object this would fail on
+        // Postgres.
+        // @see https://www.drupal.org/node/1031122
+        $this->assertFieldChange($old_spec, $new_spec, serialize(['string' => "This \n has \\\\ some backslash \"*string action.\\n"]));
+      }
+    }
+
+  }
+
+  /**
+   * Asserts that a field can be changed from one spec to another.
+   *
+   * @param $old_spec
+   *   The beginning field specification.
+   * @param $new_spec
+   *   The ending field specification.
+   */
+  protected function assertFieldChange($old_spec, $new_spec, $test_data = NULL) {
+    $table_name = 'test_table_' . ($this->counter++);
+    $table_spec = array(
+      'fields' => array(
+        'serial_column' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+        'test_field' => $old_spec,
+      ),
+      'primary key' => array('serial_column'),
+    );
+    db_create_table($table_name, $table_spec);
+    $this->pass(format_string('Table %table created.', array('%table' => $table_name)));
+
+    // Check the characteristics of the field.
+    $this->assertFieldCharacteristics($table_name, 'test_field', $old_spec);
+
+    // Remove inserted rows.
+    db_truncate($table_name)->execute();
+
+    if ($test_data) {
+      $id = db_insert($table_name)
+        ->fields(['test_field'], [$test_data])
+        ->execute();
+    }
+
+    // Change the field.
+    db_change_field($table_name, 'test_field', 'test_field', $new_spec);
+
+    if ($test_data) {
+      $field_value = db_select($table_name)
+        ->fields($table_name, ['test_field'])
+        ->condition('serial_column', $id)
+        ->execute()
+        ->fetchField();
+      $this->assertIdentical($field_value, $test_data);
+    }
+
+    // Check the field was changed.
+    $this->assertFieldCharacteristics($table_name, 'test_field', $new_spec);
+
+    // Clean-up.
+    db_drop_table($table_name);
+  }
+
+  /**
+   * Tests the findTables() method.
+   */
+  public function testFindTables() {
+    // We will be testing with three tables, two of them using the default
+    // prefix and the third one with an individually specified prefix.
+
+    // Set up a new connection with different connection info.
+    $connection_info = Database::getConnectionInfo();
+
+    // Add per-table prefix to the second table.
+    $new_connection_info = $connection_info['default'];
+    $new_connection_info['prefix']['test_2_table'] = $new_connection_info['prefix']['default'] . '_shared_';
+    Database::addConnectionInfo('test', 'default', $new_connection_info);
+
+    Database::setActiveConnection('test');
+
+    // Create the tables.
+    $table_specification = [
+      'description' => 'Test table.',
+      'fields' => [
+        'id'  => [
+          'type' => 'int',
+          'default' => NULL,
+        ],
+      ],
+    ];
+    Database::getConnection()->schema()->createTable('test_1_table', $table_specification);
+    Database::getConnection()->schema()->createTable('test_2_table', $table_specification);
+    Database::getConnection()->schema()->createTable('the_third_table', $table_specification);
+
+    // Check the "all tables" syntax.
+    $tables = Database::getConnection()->schema()->findTables('%');
+    sort($tables);
+    $expected = [
+      // The 'config' table is added by
+      // \Drupal\KernelTests\KernelTestBase::containerBuild().
+      'config',
+      'test_1_table',
+      // This table uses a per-table prefix, yet it is returned as un-prefixed.
+      'test_2_table',
+      'the_third_table',
+    ];
+    $this->assertEqual($tables, $expected, 'All tables were found.');
+
+    // Check the restrictive syntax.
+    $tables = Database::getConnection()->schema()->findTables('test_%');
+    sort($tables);
+    $expected = [
+      'test_1_table',
+      'test_2_table',
+    ];
+    $this->assertEqual($tables, $expected, 'Two tables were found.');
+
+    // Go back to the initial connection.
+    Database::setActiveConnection('default');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php
new file mode 100644
index 0000000..3e57ff5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectCloneTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SelectCloneTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests cloning Select queries.
+ *
+ * @group Database
+ */
+class SelectCloneTest extends DatabaseTestBase {
+
+  /**
+   * Test that subqueries as value within conditions are cloned properly.
+   */
+  function testSelectConditionSubQueryCloning() {
+    $subquery = db_select('test', 't');
+    $subquery->addField('t', 'id', 'id');
+    $subquery->condition('age', 28, '<');
+
+    $query = db_select('test', 't');
+    $query->addField('t', 'name', 'name');
+    $query->condition('id', $subquery, 'IN');
+
+    $clone = clone $query;
+    // Cloned query should not be altered by the following modification
+    // happening on original query.
+    $subquery->condition('age', 25, '>');
+
+    $clone_result = $clone->countQuery()->execute()->fetchField();
+    $query_result = $query->countQuery()->execute()->fetchField();
+
+    // Make sure the cloned query has not been modified
+    $this->assertEqual(3, $clone_result, 'The cloned query returns the expected number of rows');
+    $this->assertEqual(2, $query_result, 'The query returns the expected number of rows');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
new file mode 100644
index 0000000..17ad747
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
@@ -0,0 +1,383 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SelectComplexTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\RowCountException;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests the Select query builder with more complex queries.
+ *
+ * @group Database
+ */
+class SelectComplexTest extends DatabaseTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'user', 'node_access_test', 'field');
+
+  /**
+   * Tests simple JOIN statements.
+   */
+  function testDefaultJoin() {
+    $query = db_select('test_task', 't');
+    $people_alias = $query->join('test', 'p', 't.pid = p.id');
+    $name_field = $query->addField($people_alias, 'name', 'name');
+    $query->addField('t', 'task', 'task');
+    $priority_field = $query->addField('t', 'priority', 'priority');
+
+    $query->orderBy($priority_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_priority = 0;
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->$priority_field >= $last_priority, 'Results returned in correct order.');
+      $this->assertNotEqual($record->$name_field, 'Ringo', 'Taskless person not selected.');
+      $last_priority = $record->$priority_field;
+    }
+
+    $this->assertEqual($num_records, 7, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests LEFT OUTER joins.
+   */
+  function testLeftOuterJoin() {
+    $query = db_select('test', 'p');
+    $people_alias = $query->leftJoin('test_task', 't', 't.pid = p.id');
+    $name_field = $query->addField('p', 'name', 'name');
+    $query->addField($people_alias, 'task', 'task');
+    $query->addField($people_alias, 'priority', 'priority');
+
+    $query->orderBy($name_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_name = 0;
+
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, 'Results returned in correct order.');
+    }
+
+    $this->assertEqual($num_records, 8, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests GROUP BY clauses.
+   */
+  function testGroupBy() {
+    $query = db_select('test_task', 't');
+    $count_field = $query->addExpression('COUNT(task)', 'num');
+    $task_field = $query->addField('t', 'task');
+    $query->orderBy($count_field);
+    $query->groupBy($task_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_count = 0;
+    $records = array();
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
+      $last_count = $record->$count_field;
+      $records[$record->$task_field] = $record->$count_field;
+    }
+
+    $correct_results = array(
+      'eat' => 1,
+      'sleep' => 2,
+      'code' => 1,
+      'found new band' => 1,
+      'perform at superbowl' => 1,
+    );
+
+    foreach ($correct_results as $task => $count) {
+      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+    }
+
+    $this->assertEqual($num_records, 6, 'Returned the correct number of total rows.');
+  }
+
+  /**
+   * Tests GROUP BY and HAVING clauses together.
+   */
+  function testGroupByAndHaving() {
+    $query = db_select('test_task', 't');
+    $count_field = $query->addExpression('COUNT(task)', 'num');
+    $task_field = $query->addField('t', 'task');
+    $query->orderBy($count_field);
+    $query->groupBy($task_field);
+    $query->having('COUNT(task) >= 2');
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_count = 0;
+    $records = array();
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->$count_field >= 2, 'Record has the minimum count.');
+      $this->assertTrue($record->$count_field >= $last_count, 'Results returned in correct order.');
+      $last_count = $record->$count_field;
+      $records[$record->$task_field] = $record->$count_field;
+    }
+
+    $correct_results = array(
+      'sleep' => 2,
+    );
+
+    foreach ($correct_results as $task => $count) {
+      $this->assertEqual($records[$task], $count, format_string("Correct number of '@task' records found.", array('@task' => $task)));
+    }
+
+    $this->assertEqual($num_records, 1, 'Returned the correct number of total rows.');
+  }
+
+  /**
+   * Tests range queries.
+   *
+   * The SQL clause varies with the database.
+   */
+  function testRange() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $query->range(0, 2);
+    $query_result = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($query_result, 2, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests distinct queries.
+   */
+  function testDistinct() {
+    $query = db_select('test_task');
+    $query->addField('test_task', 'task');
+    $query->distinct();
+    $query_result = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($query_result, 6, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests that we can generate a count query from a built query.
+   */
+  function testCountQuery() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $query->orderBy('name');
+
+    $count = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($count, 4, 'Counted the correct number of records.');
+
+    // Now make sure we didn't break the original query!  We should still have
+    // all of the fields we asked for.
+    $record = $query->execute()->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Correct data retrieved.');
+    $this->assertEqual($record->$age_field, 27, 'Correct data retrieved.');
+  }
+
+  /**
+   * Tests having queries.
+   */
+  function testHavingCountQuery() {
+    $query = db_select('test')
+      ->extend('Drupal\Core\Database\Query\PagerSelectExtender')
+      ->groupBy('age')
+      ->having('age + 1 > 0');
+    $query->addField('test', 'age');
+    $query->addExpression('age + 1');
+    $count = count($query->execute()->fetchCol());
+    $this->assertEqual($count, 4, 'Counted the correct number of records.');
+  }
+
+  /**
+   * Tests that countQuery removes 'all_fields' statements and ordering clauses.
+   */
+  function testCountQueryRemovals() {
+    $query = db_select('test');
+    $query->fields('test');
+    $query->orderBy('name');
+    $count = $query->countQuery();
+
+    // Check that the 'all_fields' statement is handled properly.
+    $tables = $query->getTables();
+    $this->assertEqual($tables['test']['all_fields'], 1, 'Query correctly sets \'all_fields\' statement.');
+    $tables = $count->getTables();
+    $this->assertFalse(isset($tables['test']['all_fields']), 'Count query correctly unsets \'all_fields\' statement.');
+
+    // Check that the ordering clause is handled properly.
+    $orderby = $query->getOrderBy();
+    // The orderby string is different for PostgreSQL.
+    // @see Drupal\Core\Database\Driver\pgsql\Select::orderBy()
+    $db_type = Database::getConnection()->databaseType();
+    $this->assertEqual($orderby['name'], ($db_type == 'pgsql' ? 'ASC NULLS FIRST' : 'ASC'), 'Query correctly sets ordering clause.');
+    $orderby = $count->getOrderBy();
+    $this->assertFalse(isset($orderby['name']), 'Count query correctly unsets ordering clause.');
+
+    // Make sure that the count query works.
+    $count = $count->execute()->fetchField();
+
+    $this->assertEqual($count, 4, 'Counted the correct number of records.');
+  }
+
+
+  /**
+   * Tests that countQuery properly removes fields and expressions.
+   */
+  function testCountQueryFieldRemovals() {
+    // countQuery should remove all fields and expressions, so this can be
+    // tested by adding a non-existent field and expression: if it ends
+    // up in the query, an error will be thrown. If not, it will return the
+    // number of records, which in this case happens to be 4 (there are four
+    // records in the {test} table).
+    $query = db_select('test');
+    $query->fields('test', array('fail'));
+    $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed fields');
+
+    $query = db_select('test');
+    $query->addExpression('fail');
+    $this->assertEqual(4, $query->countQuery()->execute()->fetchField(), 'Count Query removed expressions');
+  }
+
+  /**
+   * Tests that we can generate a count query from a query with distinct.
+   */
+  function testCountQueryDistinct() {
+    $query = db_select('test_task');
+    $query->addField('test_task', 'task');
+    $query->distinct();
+
+    $count = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($count, 6, 'Counted the correct number of records.');
+  }
+
+  /**
+   * Tests that we can generate a count query from a query with GROUP BY.
+   */
+  function testCountQueryGroupBy() {
+    $query = db_select('test_task');
+    $query->addField('test_task', 'pid');
+    $query->groupBy('pid');
+
+    $count = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($count, 3, 'Counted the correct number of records.');
+
+    // Use a column alias as, without one, the query can succeed for the wrong
+    // reason.
+    $query = db_select('test_task');
+    $query->addField('test_task', 'pid', 'pid_alias');
+    $query->addExpression('COUNT(test_task.task)', 'count');
+    $query->groupBy('pid_alias');
+    $query->orderBy('pid_alias', 'asc');
+
+    $count = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($count, 3, 'Counted the correct number of records.');
+  }
+
+  /**
+   * Confirms that we can properly nest conditional clauses.
+   */
+  function testNestedConditions() {
+    // This query should translate to:
+    // "SELECT job FROM {test} WHERE name = 'Paul' AND (age = 26 OR age = 27)"
+    // That should find only one record. Yes it's a non-optimal way of writing
+    // that query but that's not the point!
+    $query = db_select('test');
+    $query->addField('test', 'job');
+    $query->condition('name', 'Paul');
+    $query->condition(db_or()->condition('age', 26)->condition('age', 27));
+
+    $job = $query->execute()->fetchField();
+    $this->assertEqual($job, 'Songwriter', 'Correct data retrieved.');
+  }
+
+  /**
+   * Confirms we can join on a single table twice with a dynamic alias.
+   */
+  function testJoinTwice() {
+    $query = db_select('test')->fields('test');
+    $alias = $query->join('test', 'test', 'test.job = %alias.job');
+    $query->addField($alias, 'name', 'othername');
+    $query->addField($alias, 'job', 'otherjob');
+    $query->where("$alias.name <> test.name");
+    $crowded_job = $query->execute()->fetch();
+    $this->assertEqual($crowded_job->job, $crowded_job->otherjob, 'Correctly joined same table twice.');
+    $this->assertNotEqual($crowded_job->name, $crowded_job->othername, 'Correctly joined same table twice.');
+  }
+
+  /**
+   * Tests that we can join on a query.
+   */
+  function testJoinSubquery() {
+    $this->installSchema('system', 'sequences');
+
+    $account = User::create([
+      'name' => $this->randomMachineName(),
+      'mail' => $this->randomMachineName() . '@example.com',
+    ]);
+
+    $query = db_select('test_task', 'tt', array('target' => 'replica'));
+    $query->addExpression('tt.pid + 1', 'abc');
+    $query->condition('priority', 1, '>');
+    $query->condition('priority', 100, '<');
+
+    $subquery = db_select('test', 'tp');
+    $subquery->join('test_one_blob', 'tpb', 'tp.id = tpb.id');
+    $subquery->join('node', 'n', 'tp.id = n.nid');
+    $subquery->addTag('node_access');
+    $subquery->addMetaData('account', $account);
+    $subquery->addField('tp', 'id');
+    $subquery->condition('age', 5, '>');
+    $subquery->condition('age', 500, '<');
+
+    $query->leftJoin($subquery, 'sq', 'tt.pid = sq.id');
+    $query->join('test_one_blob', 'tb3', 'tt.pid = tb3.id');
+
+    // Construct the query string.
+    // This is the same sequence that SelectQuery::execute() goes through.
+    $query->preExecute();
+    $query->getArguments();
+    $str = (string) $query;
+
+    // Verify that the string only has one copy of condition placeholder 0.
+    $pos = strpos($str, 'db_condition_placeholder_0', 0);
+    $pos2 = strpos($str, 'db_condition_placeholder_0', $pos + 1);
+    $this->assertFalse($pos2, 'Condition placeholder is not repeated.');
+  }
+
+  /**
+   * Tests that rowCount() throws exception on SELECT query.
+   */
+  function testSelectWithRowCount() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $result = $query->execute();
+    try {
+      $result->rowCount();
+      $exception = FALSE;
+    }
+    catch (RowCountException $e) {
+      $exception = TRUE;
+    }
+    $this->assertTrue($exception, 'Exception was thrown');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php
new file mode 100644
index 0000000..6715b95
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectOrderedTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SelectOrderedTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Select query builder.
+ *
+ * @group Database
+ */
+class SelectOrderedTest extends DatabaseTestBase {
+
+  /**
+   * Tests basic ORDER BY.
+   */
+  function testSimpleSelectOrdered() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $query->orderBy($age_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_age = 0;
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->age >= $last_age, 'Results returned in correct order.');
+      $last_age = $record->age;
+    }
+
+    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests multiple ORDER BY.
+   */
+  function testSimpleSelectMultiOrdered() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $job_field = $query->addField('test', 'job');
+    $query->orderBy($job_field);
+    $query->orderBy($age_field);
+    $result = $query->execute();
+
+    $num_records = 0;
+    $expected = array(
+      array('Ringo', 28, 'Drummer'),
+      array('John', 25, 'Singer'),
+      array('George', 27, 'Singer'),
+      array('Paul', 26, 'Songwriter'),
+    );
+    $results = $result->fetchAll(\PDO::FETCH_NUM);
+    foreach ($expected as $k => $record) {
+      $num_records++;
+      foreach ($record as $kk => $col) {
+        if ($expected[$k][$kk] != $results[$k][$kk]) {
+          $this->assertTrue(FALSE, 'Results returned in correct order.');
+        }
+      }
+    }
+    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests ORDER BY descending.
+   */
+  function testSimpleSelectOrderedDesc() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $query->orderBy($age_field, 'DESC');
+    $result = $query->execute();
+
+    $num_records = 0;
+    $last_age = 100000000;
+    foreach ($result as $record) {
+      $num_records++;
+      $this->assertTrue($record->age <= $last_age, 'Results returned in correct order.');
+      $last_age = $record->age;
+    }
+
+    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
new file mode 100644
index 0000000..d81e7c5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
@@ -0,0 +1,183 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SelectSubqueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Select query builder.
+ *
+ * @group Database
+ */
+class SelectSubqueryTest extends DatabaseTestBase {
+
+  /**
+   * Tests that we can use a subquery in a FROM clause.
+   */
+  function testFromSubquerySelect() {
+    // Create a subquery, which is just a normal query object.
+    $subquery = db_select('test_task', 'tt');
+    $subquery->addField('tt', 'pid', 'pid');
+    $subquery->addField('tt', 'task', 'task');
+    $subquery->condition('priority', 1);
+
+    for ($i = 0; $i < 2; $i++) {
+      // Create another query that joins against the virtual table resulting
+      // from the subquery.
+      $select = db_select($subquery, 'tt2');
+      $select->join('test', 't', 't.id=tt2.pid');
+      $select->addField('t', 'name');
+      if ($i) {
+        // Use a different number of conditions here to confuse the subquery
+        // placeholder counter, testing https://www.drupal.org/node/1112854.
+        $select->condition('name', 'John');
+      }
+      $select->condition('task', 'code');
+
+      // The resulting query should be equivalent to:
+      // SELECT t.name
+      // FROM (SELECT tt.pid AS pid, tt.task AS task FROM test_task tt WHERE priority=1) tt
+      //   INNER JOIN test t ON t.id=tt.pid
+      // WHERE tt.task = 'code'
+      $people = $select->execute()->fetchCol();
+
+      $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
+    }
+  }
+
+  /**
+   * Tests that we can use a subquery in a FROM clause with a LIMIT.
+   */
+  function testFromSubquerySelectWithLimit() {
+    // Create a subquery, which is just a normal query object.
+    $subquery = db_select('test_task', 'tt');
+    $subquery->addField('tt', 'pid', 'pid');
+    $subquery->addField('tt', 'task', 'task');
+    $subquery->orderBy('priority', 'DESC');
+    $subquery->range(0, 1);
+
+    // Create another query that joins against the virtual table resulting
+    // from the subquery.
+    $select = db_select($subquery, 'tt2');
+    $select->join('test', 't', 't.id=tt2.pid');
+    $select->addField('t', 'name');
+
+    // The resulting query should be equivalent to:
+    // SELECT t.name
+    // FROM (SELECT tt.pid AS pid, tt.task AS task FROM test_task tt ORDER BY priority DESC LIMIT 1 OFFSET 0) tt
+    //   INNER JOIN test t ON t.id=tt.pid
+    $people = $select->execute()->fetchCol();
+
+    $this->assertEqual(count($people), 1, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests that we can use a subquery in a WHERE clause.
+   */
+  function testConditionSubquerySelect() {
+    // Create a subquery, which is just a normal query object.
+    $subquery = db_select('test_task', 'tt');
+    $subquery->addField('tt', 'pid', 'pid');
+    $subquery->condition('tt.priority', 1);
+
+    // Create another query that joins against the virtual table resulting
+    // from the subquery.
+    $select = db_select('test_task', 'tt2');
+    $select->addField('tt2', 'task');
+    $select->condition('tt2.pid', $subquery, 'IN');
+
+    // The resulting query should be equivalent to:
+    // SELECT tt2.name
+    // FROM test tt2
+    // WHERE tt2.pid IN (SELECT tt.pid AS pid FROM test_task tt WHERE tt.priority=1)
+    $people = $select->execute()->fetchCol();
+    $this->assertEqual(count($people), 5, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests that we can use a subquery in a JOIN clause.
+   */
+  function testJoinSubquerySelect() {
+    // Create a subquery, which is just a normal query object.
+    $subquery = db_select('test_task', 'tt');
+    $subquery->addField('tt', 'pid', 'pid');
+    $subquery->condition('priority', 1);
+
+    // Create another query that joins against the virtual table resulting
+    // from the subquery.
+    $select = db_select('test', 't');
+    $select->join($subquery, 'tt', 't.id=tt.pid');
+    $select->addField('t', 'name');
+
+    // The resulting query should be equivalent to:
+    // SELECT t.name
+    // FROM test t
+    //   INNER JOIN (SELECT tt.pid AS pid FROM test_task tt WHERE priority=1) tt ON t.id=tt.pid
+    $people = $select->execute()->fetchCol();
+
+    $this->assertEqual(count($people), 2, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests EXISTS subquery conditionals on SELECT statements.
+   *
+   * We essentially select all rows from the {test} table that have matching
+   * rows in the {test_people} table based on the shared name column.
+   */
+  function testExistsSubquerySelect() {
+    // Put George into {test_people}.
+    db_insert('test_people')
+      ->fields(array(
+        'name' => 'George',
+        'age' => 27,
+        'job' => 'Singer',
+      ))
+      ->execute();
+    // Base query to {test}.
+    $query = db_select('test', 't')
+      ->fields('t', array('name'));
+    // Subquery to {test_people}.
+    $subquery = db_select('test_people', 'tp')
+      ->fields('tp', array('name'))
+      ->where('tp.name = t.name');
+    $query->exists($subquery);
+    $result = $query->execute();
+
+    // Ensure that we got the right record.
+    $record = $result->fetch();
+    $this->assertEqual($record->name, 'George', 'Fetched name is correct using EXISTS query.');
+  }
+
+  /**
+   * Tests NOT EXISTS subquery conditionals on SELECT statements.
+   *
+   * We essentially select all rows from the {test} table that don't have
+   * matching rows in the {test_people} table based on the shared name column.
+   */
+  function testNotExistsSubquerySelect() {
+    // Put George into {test_people}.
+    db_insert('test_people')
+      ->fields(array(
+        'name' => 'George',
+        'age' => 27,
+        'job' => 'Singer',
+      ))
+      ->execute();
+
+    // Base query to {test}.
+    $query = db_select('test', 't')
+      ->fields('t', array('name'));
+    // Subquery to {test_people}.
+    $subquery = db_select('test_people', 'tp')
+      ->fields('tp', array('name'))
+      ->where('tp.name = t.name');
+    $query->notExists($subquery);
+
+    // Ensure that we got the right number of records.
+    $people = $query->execute()->fetchCol();
+    $this->assertEqual(count($people), 3, 'NOT EXISTS query returned the correct results.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
new file mode 100644
index 0000000..abd363d
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SelectTest.php
@@ -0,0 +1,535 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SelectTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+use Drupal\Core\Database\InvalidQueryException;
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests the Select query builder.
+ *
+ * @group Database
+ */
+class SelectTest extends DatabaseTestBase {
+
+  /**
+   * Tests rudimentary SELECT statements.
+   */
+  function testSimpleSelect() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $num_records = $query->countQuery()->execute()->fetchField();
+
+    $this->assertEqual($num_records, 4, 'Returned the correct number of rows.');
+  }
+
+  /**
+   * Tests rudimentary SELECT statement with a COMMENT.
+   */
+  function testSimpleComment() {
+    $query = db_select('test')->comment('Testing query comments');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $result = $query->execute();
+
+    $records = $result->fetchAll();
+
+    $query = (string) $query;
+    $expected = "/* Testing query comments */";
+
+    $this->assertEqual(count($records), 4, 'Returned the correct number of rows.');
+    $this->assertNotIdentical(FALSE, strpos($query, $expected), 'The flattened query contains the comment string.');
+  }
+
+  /**
+   * Tests query COMMENT system against vulnerabilities.
+   */
+  function testVulnerableComment() {
+    $query = db_select('test')->comment('Testing query comments */ SELECT nid FROM {node}; --');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+    $result = $query->execute();
+
+    $records = $result->fetchAll();
+
+    $query = (string) $query;
+    $expected = "/* Testing query comments  * / SELECT nid FROM {node}. -- */ SELECT test.name AS name, test.age AS age\nFROM \n{test} test";
+
+    $this->assertEqual(count($records), 4, 'Returned the correct number of rows.');
+    $this->assertNotIdentical(FALSE, strpos($query, $expected), 'The flattened query contains the sanitised comment string.');
+
+    $connection = Database::getConnection();
+    foreach ($this->makeCommentsProvider() as $test_set) {
+      list($expected, $comments) = $test_set;
+      $this->assertEqual($expected, $connection->makeComment($comments));
+    }
+  }
+
+  /**
+   * Provides expected and input values for testVulnerableComment().
+   */
+  function makeCommentsProvider() {
+    return [
+      [
+        '/*  */ ',
+        [''],
+      ],
+      // Try and close the comment early.
+      [
+        '/* Exploit  * / DROP TABLE node. -- */ ',
+        ['Exploit */ DROP TABLE node; --'],
+      ],
+      // Variations on comment closing.
+      [
+        '/* Exploit  * / * / DROP TABLE node. -- */ ',
+        ['Exploit */*/ DROP TABLE node; --'],
+      ],
+      [
+        '/* Exploit  *  * // DROP TABLE node. -- */ ',
+        ['Exploit **// DROP TABLE node; --'],
+      ],
+      // Try closing the comment in the second string which is appended.
+      [
+        '/* Exploit  * / DROP TABLE node. --. Another try  * / DROP TABLE node. -- */ ',
+        ['Exploit */ DROP TABLE node; --', 'Another try */ DROP TABLE node; --'],
+      ],
+    ];
+  }
+
+  /**
+   * Tests basic conditionals on SELECT statements.
+   */
+  function testSimpleSelectConditional() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_field = $query->addField('test', 'age', 'age');
+    $query->condition('age', 27);
+    $result = $query->execute();
+
+    // Check that the aliases are being created the way we want.
+    $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
+    $this->assertEqual($age_field, 'age', 'Age field alias is correct.');
+
+    // Ensure that we got the right record.
+    $record = $result->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27, 'Fetched age is correct.');
+  }
+
+  /**
+   * Tests SELECT statements with expressions.
+   */
+  function testSimpleSelectExpression() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_field = $query->addExpression("age*2", 'double_age');
+    $query->condition('age', 27);
+    $result = $query->execute();
+
+    // Check that the aliases are being created the way we want.
+    $this->assertEqual($name_field, 'name', 'Name field alias is correct.');
+    $this->assertEqual($age_field, 'double_age', 'Age field alias is correct.');
+
+    // Ensure that we got the right record.
+    $record = $result->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+    $this->assertEqual($record->$age_field, 27*2, 'Fetched age expression is correct.');
+  }
+
+  /**
+   * Tests SELECT statements with multiple expressions.
+   */
+  function testSimpleSelectExpressionMultiple() {
+    $query = db_select('test');
+    $name_field = $query->addField('test', 'name');
+    $age_double_field = $query->addExpression("age*2");
+    $age_triple_field = $query->addExpression("age*3");
+    $query->condition('age', 27);
+    $result = $query->execute();
+
+    // Check that the aliases are being created the way we want.
+    $this->assertEqual($age_double_field, 'expression', 'Double age field alias is correct.');
+    $this->assertEqual($age_triple_field, 'expression_2', 'Triple age field alias is correct.');
+
+    // Ensure that we got the right record.
+    $record = $result->fetch();
+    $this->assertEqual($record->$name_field, 'George', 'Fetched name is correct.');
+    $this->assertEqual($record->$age_double_field, 27*2, 'Fetched double age expression is correct.');
+    $this->assertEqual($record->$age_triple_field, 27*3, 'Fetched triple age expression is correct.');
+  }
+
+  /**
+   * Tests adding multiple fields to a SELECT statement at the same time.
+   */
+  function testSimpleSelectMultipleFields() {
+    $record = db_select('test')
+      ->fields('test', array('id', 'name', 'age', 'job'))
+      ->condition('age', 27)
+      ->execute()->fetchObject();
+
+    // Check that all fields we asked for are present.
+    $this->assertNotNull($record->id, 'ID field is present.');
+    $this->assertNotNull($record->name, 'Name field is present.');
+    $this->assertNotNull($record->age, 'Age field is present.');
+    $this->assertNotNull($record->job, 'Job field is present.');
+
+    // Ensure that we got the right record.
+    // Check that all fields we asked for are present.
+    $this->assertEqual($record->id, 2, 'ID field has the correct value.');
+    $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
+    $this->assertEqual($record->age, 27, 'Age field has the correct value.');
+    $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
+  }
+
+  /**
+   * Tests adding all fields from a given table to a SELECT statement.
+   */
+  function testSimpleSelectAllFields() {
+    $record = db_select('test')
+      ->fields('test')
+      ->condition('age', 27)
+      ->execute()->fetchObject();
+
+    // Check that all fields we asked for are present.
+    $this->assertNotNull($record->id, 'ID field is present.');
+    $this->assertNotNull($record->name, 'Name field is present.');
+    $this->assertNotNull($record->age, 'Age field is present.');
+    $this->assertNotNull($record->job, 'Job field is present.');
+
+    // Ensure that we got the right record.
+    // Check that all fields we asked for are present.
+    $this->assertEqual($record->id, 2, 'ID field has the correct value.');
+    $this->assertEqual($record->name, 'George', 'Name field has the correct value.');
+    $this->assertEqual($record->age, 27, 'Age field has the correct value.');
+    $this->assertEqual($record->job, 'Singer', 'Job field has the correct value.');
+  }
+
+  /**
+   * Tests that a comparison with NULL is always FALSE.
+   */
+  function testNullCondition() {
+    $this->ensureSampleDataNull();
+
+    $names = db_select('test_null', 'tn')
+      ->fields('tn', array('name'))
+      ->condition('age', NULL)
+      ->execute()->fetchCol();
+
+    $this->assertEqual(count($names), 0, 'No records found when comparing to NULL.');
+  }
+
+  /**
+   * Tests that we can find a record with a NULL value.
+   */
+  function testIsNullCondition() {
+    $this->ensureSampleDataNull();
+
+    $names = db_select('test_null', 'tn')
+      ->fields('tn', array('name'))
+      ->isNull('age')
+      ->execute()->fetchCol();
+
+    $this->assertEqual(count($names), 1, 'Correct number of records found with NULL age.');
+    $this->assertEqual($names[0], 'Fozzie', 'Correct record returned for NULL age.');
+  }
+
+  /**
+   * Tests that we can find a record without a NULL value.
+   */
+  function testIsNotNullCondition() {
+    $this->ensureSampleDataNull();
+
+    $names = db_select('test_null', 'tn')
+      ->fields('tn', array('name'))
+      ->isNotNull('tn.age')
+      ->orderBy('name')
+      ->execute()->fetchCol();
+
+    $this->assertEqual(count($names), 2, 'Correct number of records found withNOT NULL age.');
+    $this->assertEqual($names[0], 'Gonzo', 'Correct record returned for NOT NULL age.');
+    $this->assertEqual($names[1], 'Kermit', 'Correct record returned for NOT NULL age.');
+  }
+
+  /**
+   * Tests that we can UNION multiple Select queries together.
+   *
+   * This is semantically equal to UNION DISTINCT, so we don't explicitly test
+   * that.
+   */
+  function testUnion() {
+    $query_1 = db_select('test', 't')
+      ->fields('t', array('name'))
+      ->condition('age', array(27, 28), 'IN');
+
+    $query_2 = db_select('test', 't')
+      ->fields('t', array('name'))
+      ->condition('age', 28);
+
+    $query_1->union($query_2);
+
+    $names = $query_1->execute()->fetchCol();
+
+    // Ensure we only get 2 records.
+    $this->assertEqual(count($names), 2, 'UNION correctly discarded duplicates.');
+
+    $this->assertEqual($names[0], 'George', 'First query returned correct name.');
+    $this->assertEqual($names[1], 'Ringo', 'Second query returned correct name.');
+  }
+
+  /**
+   * Tests that we can UNION ALL multiple SELECT queries together.
+   */
+  function testUnionAll() {
+    $query_1 = db_select('test', 't')
+      ->fields('t', array('name'))
+      ->condition('age', array(27, 28), 'IN');
+
+    $query_2 = db_select('test', 't')
+      ->fields('t', array('name'))
+      ->condition('age', 28);
+
+    $query_1->union($query_2, 'ALL');
+
+    $names = $query_1->execute()->fetchCol();
+
+    // Ensure we get all 3 records.
+    $this->assertEqual(count($names), 3, 'UNION ALL correctly preserved duplicates.');
+
+    $this->assertEqual($names[0], 'George', 'First query returned correct first name.');
+    $this->assertEqual($names[1], 'Ringo', 'Second query returned correct second name.');
+    $this->assertEqual($names[2], 'Ringo', 'Third query returned correct name.');
+  }
+
+  /**
+   * Tests that we can get a count query for a UNION Select query.
+   */
+  function testUnionCount() {
+    $query_1 = db_select('test', 't')
+      ->fields('t', array('name', 'age'))
+      ->condition('age', array(27, 28), 'IN');
+
+    $query_2 = db_select('test', 't')
+      ->fields('t', array('name', 'age'))
+      ->condition('age', 28);
+
+    $query_1->union($query_2, 'ALL');
+    $names = $query_1->execute()->fetchCol();
+
+    $query_3 = $query_1->countQuery();
+    $count = $query_3->execute()->fetchField();
+
+    // Ensure the counts match.
+    $this->assertEqual(count($names), $count, "The count query's result matched the number of rows in the UNION query.");
+  }
+
+  /**
+   * Tests that random ordering of queries works.
+   *
+   * We take the approach of testing the Drupal layer only, rather than trying
+   * to test that the database's random number generator actually produces
+   * random queries (which is very difficult to do without an unacceptable risk
+   * of the test failing by accident).
+   *
+   * Therefore, in this test we simply run the same query twice and assert that
+   * the two results are reordered versions of each other (as well as of the
+   * same query without the random ordering). It is reasonable to assume that
+   * if we run the same select query twice and the results are in a different
+   * order each time, the only way this could happen is if we have successfully
+   * triggered the database's random ordering functionality.
+   */
+  function testRandomOrder() {
+    // Use 52 items, so the chance that this test fails by accident will be the
+    // same as the chance that a deck of cards will come out in the same order
+    // after shuffling it (in other words, nearly impossible).
+    $number_of_items = 52;
+    while (db_query("SELECT MAX(id) FROM {test}")->fetchField() < $number_of_items) {
+      db_insert('test')->fields(array('name' => $this->randomMachineName()))->execute();
+    }
+
+    // First select the items in order and make sure we get an ordered list.
+    $expected_ids = range(1, $number_of_items);
+    $ordered_ids = db_select('test', 't')
+      ->fields('t', array('id'))
+      ->range(0, $number_of_items)
+      ->orderBy('id')
+      ->execute()
+      ->fetchCol();
+    $this->assertEqual($ordered_ids, $expected_ids, 'A query without random ordering returns IDs in the correct order.');
+
+    // Now perform the same query, but instead choose a random ordering. We
+    // expect this to contain a differently ordered version of the original
+    // result.
+    $randomized_ids = db_select('test', 't')
+      ->fields('t', array('id'))
+      ->range(0, $number_of_items)
+      ->orderRandom()
+      ->execute()
+      ->fetchCol();
+    $this->assertNotEqual($randomized_ids, $ordered_ids, 'A query with random ordering returns an unordered set of IDs.');
+    $sorted_ids = $randomized_ids;
+    sort($sorted_ids);
+    $this->assertEqual($sorted_ids, $ordered_ids, 'After sorting the random list, the result matches the original query.');
+
+    // Now perform the exact same query again, and make sure the order is
+    // different.
+    $randomized_ids_second_set = db_select('test', 't')
+      ->fields('t', array('id'))
+      ->range(0, $number_of_items)
+      ->orderRandom()
+      ->execute()
+      ->fetchCol();
+    $this->assertNotEqual($randomized_ids_second_set, $randomized_ids, 'Performing the query with random ordering a second time returns IDs in a different order.');
+    $sorted_ids_second_set = $randomized_ids_second_set;
+    sort($sorted_ids_second_set);
+    $this->assertEqual($sorted_ids_second_set, $sorted_ids, 'After sorting the second random list, the result matches the sorted version of the first random list.');
+  }
+
+  /**
+   * Tests that filter by a regular expression works as expected.
+   */
+  public function testRegexCondition() {
+
+    $test_groups[] = array(
+      'regex' => 'hn$',
+      'expected' => array(
+        'John',
+      ),
+    );
+    $test_groups[] = array(
+      'regex' => '^Pau',
+      'expected' => array(
+        'Paul',
+      ),
+    );
+    $test_groups[] = array(
+      'regex' => 'Ringo|George',
+      'expected' => array(
+        'Ringo', 'George',
+      ),
+    );
+
+
+    $database = $this->container->get('database');
+    foreach ($test_groups as $test_group) {
+      $query = $database->select('test', 't');
+      $query->addField('t', 'name');
+      $query->condition('t.name', $test_group['regex'], 'REGEXP');
+      $result = $query->execute()->fetchCol();
+
+      $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.');
+      $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.');
+    }
+
+    // Ensure that filter by "#" still works due to the quoting.
+    $database->insert('test')
+      ->fields(array(
+        'name' => 'Pete',
+        'age' => 26,
+        'job' => '#Drummer',
+      ))
+      ->execute();
+
+    $test_groups = array();
+    $test_groups[] = array(
+      'regex' => '#Drummer',
+      'expected' => array(
+        'Pete',
+      ),
+    );
+    $test_groups[] = array(
+      'regex' => '#Singer',
+      'expected' => array(
+      ),
+    );
+
+    foreach ($test_groups as $test_group) {
+      $query = $database->select('test', 't');
+      $query->addField('t', 'name');
+      $query->condition('t.job', $test_group['regex'], 'REGEXP');
+      $result = $query->execute()->fetchCol();
+
+      $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.');
+      $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.');
+    }
+  }
+
+  /**
+   * Tests that aliases are renamed when they are duplicates.
+   */
+  function testSelectDuplicateAlias() {
+    $query = db_select('test', 't');
+    $alias1 = $query->addField('t', 'name', 'the_alias');
+    $alias2 = $query->addField('t', 'age', 'the_alias');
+    $this->assertNotIdentical($alias1, $alias2, 'Duplicate aliases are renamed.');
+  }
+
+  /**
+   * Tests that an invalid merge query throws an exception.
+   */
+  function testInvalidSelectCount() {
+    try {
+      // This query will fail because the table does not exist.
+      // Normally it would throw an exception but we are suppressing
+      // it with the throw_exception option.
+      $options['throw_exception'] = FALSE;
+      db_select('some_table_that_doesnt_exist', 't', $options)
+        ->fields('t')
+        ->countQuery()
+        ->execute();
+
+      $this->pass('$options[\'throw_exception\'] is FALSE, no Exception thrown.');
+    }
+    catch (\Exception $e) {
+      $this->fail('$options[\'throw_exception\'] is FALSE, but Exception thrown for invalid query.');
+      return;
+    }
+
+    try {
+      // This query will fail because the table does not exist.
+      db_select('some_table_that_doesnt_exist', 't')
+        ->fields('t')
+        ->countQuery()
+        ->execute();
+    }
+    catch (\Exception $e) {
+      $this->pass('Exception thrown for invalid query.');
+      return;
+    }
+    $this->fail('No Exception thrown.');
+  }
+
+  /**
+   * Tests thrown exception for IN query conditions with an empty array.
+   */
+  function testEmptyInCondition() {
+    try {
+      db_select('test', 't')
+        ->fields('t')
+        ->condition('age', array(), 'IN')
+        ->execute();
+
+      $this->fail('Expected exception not thrown');
+    }
+    catch (InvalidQueryException $e) {
+      $this->assertEqual("Query condition 'age IN ()' cannot be empty.", $e->getMessage());
+    }
+
+    try {
+      db_select('test', 't')
+        ->fields('t')
+        ->condition('age', array(), 'NOT IN')
+        ->execute();
+
+      $this->fail('Expected exception not thrown');
+    }
+    catch (InvalidQueryException $e) {
+      $this->assertEqual("Query condition 'age NOT IN ()' cannot be empty.", $e->getMessage());
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php
new file mode 100644
index 0000000..9199eb2
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/SerializeQueryTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\SerializeQueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests serializing and unserializing a query.
+ *
+ * @group Database
+ */
+class SerializeQueryTest extends DatabaseTestBase {
+  /**
+   * Confirms that a query can be serialized and unserialized.
+   */
+  function testSerializeQuery() {
+    $query = db_select('test');
+    $query->addField('test', 'age');
+    $query->condition('name', 'Ringo');
+    // If this doesn't work, it will throw an exception, so no need for an
+    // assertion.
+    $query = unserialize(serialize($query));
+    $results = $query->execute()->fetchCol();
+    $this->assertEqual($results[0], 28, 'Query properly executed after unserialization.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php b/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
new file mode 100644
index 0000000..0de1413
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/TaggingTest.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\TaggingTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the tagging capabilities of the Select builder.
+ *
+ * Tags are a way to flag queries for alter hooks so they know
+ * what type of query it is, such as "node_access".
+ *
+ * @group Database
+ */
+class TaggingTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that a query has a tag added to it.
+   */
+  function testHasTag() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+
+    $this->assertTrue($query->hasTag('test'), 'hasTag() returned true.');
+    $this->assertFalse($query->hasTag('other'), 'hasTag() returned false.');
+  }
+
+  /**
+   * Tests query tagging "has all of these tags" functionality.
+   */
+  function testHasAllTags() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+    $query->addTag('other');
+
+    $this->assertTrue($query->hasAllTags('test', 'other'), 'hasAllTags() returned true.');
+    $this->assertFalse($query->hasAllTags('test', 'stuff'), 'hasAllTags() returned false.');
+  }
+
+  /**
+   * Tests query tagging "has at least one of these tags" functionality.
+   */
+  function testHasAnyTag() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+
+    $this->assertTrue($query->hasAnyTag('test', 'other'), 'hasAnyTag() returned true.');
+    $this->assertFalse($query->hasAnyTag('other', 'stuff'), 'hasAnyTag() returned false.');
+  }
+
+  /**
+   * Confirms that an extended query has a tag added to it.
+   */
+  function testExtenderHasTag() {
+    $query = db_select('test')
+      ->extend('Drupal\Core\Database\Query\SelectExtender');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+
+    $this->assertTrue($query->hasTag('test'), 'hasTag() returned true.');
+    $this->assertFalse($query->hasTag('other'), 'hasTag() returned false.');
+  }
+
+  /**
+   * Tests extended query tagging "has all of these tags" functionality.
+   */
+  function testExtenderHasAllTags() {
+    $query = db_select('test')
+      ->extend('Drupal\Core\Database\Query\SelectExtender');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+    $query->addTag('other');
+
+    $this->assertTrue($query->hasAllTags('test', 'other'), 'hasAllTags() returned true.');
+    $this->assertFalse($query->hasAllTags('test', 'stuff'), 'hasAllTags() returned false.');
+  }
+
+  /**
+   * Tests extended query tagging "has at least one of these tags" functionality.
+   */
+  function testExtenderHasAnyTag() {
+    $query = db_select('test')
+      ->extend('Drupal\Core\Database\Query\SelectExtender');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $query->addTag('test');
+
+    $this->assertTrue($query->hasAnyTag('test', 'other'), 'hasAnyTag() returned true.');
+    $this->assertFalse($query->hasAnyTag('other', 'stuff'), 'hasAnyTag() returned false.');
+  }
+
+  /**
+   * Tests that we can attach metadata to a query object.
+   *
+   * This is how we pass additional context to alter hooks.
+   */
+  function testMetaData() {
+    $query = db_select('test');
+    $query->addField('test', 'name');
+    $query->addField('test', 'age', 'age');
+
+    $data = array(
+      'a' => 'A',
+      'b' => 'B',
+    );
+
+    $query->addMetaData('test', $data);
+
+    $return = $query->getMetaData('test');
+    $this->assertEqual($data, $return, 'Correct metadata returned.');
+
+    $return = $query->getMetaData('nothere');
+    $this->assertNull($return, 'Non-existent key returned NULL.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php b/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php
new file mode 100644
index 0000000..abf41bd
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/TransactionTest.php
@@ -0,0 +1,615 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\TransactionTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\TransactionOutOfOrderException;
+use Drupal\Core\Database\TransactionNoActiveException;
+
+/**
+ * Tests the transaction abstraction system.
+ *
+ * We test nesting by having two transaction layers, an outer and inner. The
+ * outer layer encapsulates the inner layer. Our transaction nesting abstraction
+ * should allow the outer layer function to call any function it wants,
+ * especially the inner layer that starts its own transaction, and be
+ * confident that, when the function it calls returns, its own transaction
+ * is still "alive."
+ *
+ * Call structure:
+ *   transactionOuterLayer()
+ *     Start transaction
+ *     transactionInnerLayer()
+ *       Start transaction (does nothing in database)
+ *       [Maybe decide to roll back]
+ *     Do more stuff
+ *     Should still be in transaction A
+ *
+ * @group Database
+ */
+class TransactionTest extends DatabaseTestBase {
+
+  /**
+   * Encapsulates a transaction's "inner layer" with an "outer layer".
+   *
+   * This "outer layer" transaction starts and then encapsulates the "inner
+   * layer" transaction. This nesting is used to evaluate whether the database
+   * transaction API properly supports nesting. By "properly supports," we mean
+   * the outer transaction continues to exist regardless of what functions are
+   * called and whether those functions start their own transactions.
+   *
+   * In contrast, a typical database would commit the outer transaction, start
+   * a new transaction for the inner layer, commit the inner layer transaction,
+   * and then be confused when the outer layer transaction tries to commit its
+   * transaction (which was already committed when the inner transaction
+   * started).
+   *
+   * @param $suffix
+   *   Suffix to add to field values to differentiate tests.
+   * @param $rollback
+   *   Whether or not to try rolling back the transaction when we're done.
+   * @param $ddl_statement
+   *   Whether to execute a DDL statement during the inner transaction.
+   */
+  protected function transactionOuterLayer($suffix, $rollback = FALSE, $ddl_statement = FALSE) {
+    $connection = Database::getConnection();
+    $depth = $connection->transactionDepth();
+    $txn = db_transaction();
+
+    // Insert a single row into the testing table.
+    db_insert('test')
+      ->fields(array(
+        'name' => 'David' . $suffix,
+        'age' => '24',
+      ))
+      ->execute();
+
+    $this->assertTrue($connection->inTransaction(), 'In transaction before calling nested transaction.');
+
+    // We're already in a transaction, but we call ->transactionInnerLayer
+    // to nest another transaction inside the current one.
+    $this->transactionInnerLayer($suffix, $rollback, $ddl_statement);
+
+    $this->assertTrue($connection->inTransaction(), 'In transaction after calling nested transaction.');
+
+    if ($rollback) {
+      // Roll back the transaction, if requested.
+      // This rollback should propagate to the last savepoint.
+      $txn->rollback();
+      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
+    }
+  }
+
+  /**
+   * Creates an "inner layer" transaction.
+   *
+   * This "inner layer" transaction is either used alone or nested inside of the
+   * "outer layer" transaction.
+   *
+   * @param $suffix
+   *   Suffix to add to field values to differentiate tests.
+   * @param $rollback
+   *   Whether or not to try rolling back the transaction when we're done.
+   * @param $ddl_statement
+   *   Whether to execute a DDL statement during the transaction.
+   */
+  protected function transactionInnerLayer($suffix, $rollback = FALSE, $ddl_statement = FALSE) {
+    $connection = Database::getConnection();
+
+    $depth = $connection->transactionDepth();
+    // Start a transaction. If we're being called from ->transactionOuterLayer,
+    // then we're already in a transaction. Normally, that would make starting
+    // a transaction here dangerous, but the database API handles this problem
+    // for us by tracking the nesting and avoiding the danger.
+    $txn = db_transaction();
+
+    $depth2 = $connection->transactionDepth();
+    $this->assertTrue($depth < $depth2, 'Transaction depth is has increased with new transaction.');
+
+    // Insert a single row into the testing table.
+    db_insert('test')
+      ->fields(array(
+        'name' => 'Daniel' . $suffix,
+        'age' => '19',
+      ))
+      ->execute();
+
+    $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
+
+    if ($ddl_statement) {
+      $table = array(
+        'fields' => array(
+          'id' => array(
+            'type' => 'serial',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+          ),
+        ),
+        'primary key' => array('id'),
+      );
+      db_create_table('database_test_1', $table);
+
+      $this->assertTrue($connection->inTransaction(), 'In transaction inside nested transaction.');
+    }
+
+    if ($rollback) {
+      // Roll back the transaction, if requested.
+      // This rollback should propagate to the last savepoint.
+      $txn->rollback();
+      $this->assertTrue(($connection->transactionDepth() == $depth), 'Transaction has rolled back to the last savepoint after calling rollback().');
+    }
+  }
+
+  /**
+   * Tests transaction rollback on a database that supports transactions.
+   *
+   * If the active connection does not support transactions, this test does
+   * nothing.
+   */
+  function testTransactionRollBackSupported() {
+    // This test won't work right if transactions are not supported.
+    if (!Database::getConnection()->supportsTransactions()) {
+      return;
+    }
+    try {
+      // Create two nested transactions. Roll back from the inner one.
+      $this->transactionOuterLayer('B', TRUE);
+
+      // Neither of the rows we inserted in the two transaction layers
+      // should be present in the tables post-rollback.
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
+      $this->assertNotIdentical($saved_age, '24', 'Cannot retrieve DavidB row after commit.');
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
+      $this->assertNotIdentical($saved_age, '19', 'Cannot retrieve DanielB row after commit.');
+    }
+    catch (\Exception $e) {
+      $this->fail($e->getMessage());
+    }
+  }
+
+  /**
+   * Tests transaction rollback on a database that doesn't support transactions.
+   *
+   * If the active driver supports transactions, this test does nothing.
+   */
+  function testTransactionRollBackNotSupported() {
+    // This test won't work right if transactions are supported.
+    if (Database::getConnection()->supportsTransactions()) {
+      return;
+    }
+    try {
+      // Create two nested transactions. Attempt to roll back from the inner one.
+      $this->transactionOuterLayer('B', TRUE);
+
+      // Because our current database claims to not support transactions,
+      // the inserted rows should be present despite the attempt to roll back.
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidB'))->fetchField();
+      $this->assertIdentical($saved_age, '24', 'DavidB not rolled back, since transactions are not supported.');
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielB'))->fetchField();
+      $this->assertIdentical($saved_age, '19', 'DanielB not rolled back, since transactions are not supported.');
+    }
+    catch (\Exception $e) {
+      $this->fail($e->getMessage());
+    }
+  }
+
+  /**
+   * Tests a committed transaction.
+   *
+   * The behavior of this test should be identical for connections that support
+   * transactions and those that do not.
+   */
+  function testCommittedTransaction() {
+    try {
+      // Create two nested transactions. The changes should be committed.
+      $this->transactionOuterLayer('A');
+
+      // Because we committed, both of the inserted rows should be present.
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DavidA'))->fetchField();
+      $this->assertIdentical($saved_age, '24', 'Can retrieve DavidA row after commit.');
+      $saved_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'DanielA'))->fetchField();
+      $this->assertIdentical($saved_age, '19', 'Can retrieve DanielA row after commit.');
+    }
+    catch (\Exception $e) {
+      $this->fail($e->getMessage());
+    }
+  }
+
+  /**
+   * Tests the compatibility of transactions with DDL statements.
+   */
+  function testTransactionWithDdlStatement() {
+    // First, test that a commit works normally, even with DDL statements.
+    $transaction = db_transaction();
+    $this->insertRow('row');
+    $this->executeDDLStatement();
+    unset($transaction);
+    $this->assertRowPresent('row');
+
+    // Even in different order.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $this->executeDDLStatement();
+    $this->insertRow('row');
+    unset($transaction);
+    $this->assertRowPresent('row');
+
+    // Even with stacking.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $transaction2 = db_transaction();
+    $this->executeDDLStatement();
+    unset($transaction2);
+    $transaction3 = db_transaction();
+    $this->insertRow('row');
+    unset($transaction3);
+    unset($transaction);
+    $this->assertRowPresent('row');
+
+    // A transaction after a DDL statement should still work the same.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $transaction2 = db_transaction();
+    $this->executeDDLStatement();
+    unset($transaction2);
+    $transaction3 = db_transaction();
+    $this->insertRow('row');
+    $transaction3->rollback();
+    unset($transaction3);
+    unset($transaction);
+    $this->assertRowAbsent('row');
+
+    // The behavior of a rollback depends on the type of database server.
+    if (Database::getConnection()->supportsTransactionalDDL()) {
+      // For database servers that support transactional DDL, a rollback
+      // of a transaction including DDL statements should be possible.
+      $this->cleanUp();
+      $transaction = db_transaction();
+      $this->insertRow('row');
+      $this->executeDDLStatement();
+      $transaction->rollback();
+      unset($transaction);
+      $this->assertRowAbsent('row');
+
+      // Including with stacking.
+      $this->cleanUp();
+      $transaction = db_transaction();
+      $transaction2 = db_transaction();
+      $this->executeDDLStatement();
+      unset($transaction2);
+      $transaction3 = db_transaction();
+      $this->insertRow('row');
+      unset($transaction3);
+      $transaction->rollback();
+      unset($transaction);
+      $this->assertRowAbsent('row');
+    }
+    else {
+      // For database servers that do not support transactional DDL,
+      // the DDL statement should commit the transaction stack.
+      $this->cleanUp();
+      $transaction = db_transaction();
+      $this->insertRow('row');
+      $this->executeDDLStatement();
+      // Rollback the outer transaction.
+      try {
+        $transaction->rollback();
+        unset($transaction);
+        // @TODO: an exception should be triggered here, but is not, because
+        // "ROLLBACK" fails silently in MySQL if there is no transaction active.
+        // $this->fail(t('Rolling back a transaction containing DDL should fail.'));
+      }
+      catch (TransactionNoActiveException $e) {
+        $this->pass('Rolling back a transaction containing DDL should fail.');
+      }
+      $this->assertRowPresent('row');
+    }
+  }
+
+  /**
+   * Inserts a single row into the testing table.
+   */
+  protected function insertRow($name) {
+    db_insert('test')
+      ->fields(array(
+        'name' => $name,
+      ))
+      ->execute();
+  }
+
+  /**
+   * Executes a DDL statement.
+   */
+  protected function executeDDLStatement() {
+    static $count = 0;
+    $table = array(
+      'fields' => array(
+        'id' => array(
+          'type' => 'serial',
+          'unsigned' => TRUE,
+          'not null' => TRUE,
+        ),
+      ),
+      'primary key' => array('id'),
+    );
+    db_create_table('database_test_' . ++$count, $table);
+  }
+
+  /**
+   * Starts over for a new test.
+   */
+  protected function cleanUp() {
+    db_truncate('test')
+      ->execute();
+  }
+
+  /**
+   * Asserts that a given row is present in the test table.
+   *
+   * @param $name
+   *   The name of the row.
+   * @param $message
+   *   The message to log for the assertion.
+   */
+  function assertRowPresent($name, $message = NULL) {
+    if (!isset($message)) {
+      $message = format_string('Row %name is present.', array('%name' => $name));
+    }
+    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
+    return $this->assertTrue($present, $message);
+  }
+
+  /**
+   * Asserts that a given row is absent from the test table.
+   *
+   * @param $name
+   *   The name of the row.
+   * @param $message
+   *   The message to log for the assertion.
+   */
+  function assertRowAbsent($name, $message = NULL) {
+    if (!isset($message)) {
+      $message = format_string('Row %name is absent.', array('%name' => $name));
+    }
+    $present = (boolean) db_query('SELECT 1 FROM {test} WHERE name = :name', array(':name' => $name))->fetchField();
+    return $this->assertFalse($present, $message);
+  }
+
+  /**
+   * Tests transaction stacking, commit, and rollback.
+   */
+  function testTransactionStacking() {
+    // This test won't work right if transactions are not supported.
+    if (!Database::getConnection()->supportsTransactions()) {
+      return;
+    }
+
+    $database = Database::getConnection();
+
+    // Standard case: pop the inner transaction before the outer transaction.
+    $transaction = db_transaction();
+    $this->insertRow('outer');
+    $transaction2 = db_transaction();
+    $this->insertRow('inner');
+    // Pop the inner transaction.
+    unset($transaction2);
+    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the inner transaction');
+    // Pop the outer transaction.
+    unset($transaction);
+    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the outer transaction');
+    $this->assertRowPresent('outer');
+    $this->assertRowPresent('inner');
+
+    // Pop the transaction in a different order they have been pushed.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $this->insertRow('outer');
+    $transaction2 = db_transaction();
+    $this->insertRow('inner');
+    // Pop the outer transaction, nothing should happen.
+    unset($transaction);
+    $this->insertRow('inner-after-outer-commit');
+    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
+    // Pop the inner transaction, the whole transaction should commit.
+    unset($transaction2);
+    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
+    $this->assertRowPresent('outer');
+    $this->assertRowPresent('inner');
+    $this->assertRowPresent('inner-after-outer-commit');
+
+    // Rollback the inner transaction.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $this->insertRow('outer');
+    $transaction2 = db_transaction();
+    $this->insertRow('inner');
+    // Now rollback the inner transaction.
+    $transaction2->rollback();
+    unset($transaction2);
+    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
+    // Pop the outer transaction, it should commit.
+    $this->insertRow('outer-after-inner-rollback');
+    unset($transaction);
+    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
+    $this->assertRowPresent('outer');
+    $this->assertRowAbsent('inner');
+    $this->assertRowPresent('outer-after-inner-rollback');
+
+    // Rollback the inner transaction after committing the outer one.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $this->insertRow('outer');
+    $transaction2 = db_transaction();
+    $this->insertRow('inner');
+    // Pop the outer transaction, nothing should happen.
+    unset($transaction);
+    $this->assertTrue($database->inTransaction(), 'Still in a transaction after popping the outer transaction');
+    // Now rollback the inner transaction, it should rollback.
+    $transaction2->rollback();
+    unset($transaction2);
+    $this->assertFalse($database->inTransaction(), 'Transaction closed after popping the inner transaction');
+    $this->assertRowPresent('outer');
+    $this->assertRowAbsent('inner');
+
+    // Rollback the outer transaction while the inner transaction is active.
+    // In that case, an exception will be triggered because we cannot
+    // ensure that the final result will have any meaning.
+    $this->cleanUp();
+    $transaction = db_transaction();
+    $this->insertRow('outer');
+    $transaction2 = db_transaction();
+    $this->insertRow('inner');
+    $transaction3 = db_transaction();
+    $this->insertRow('inner2');
+    // Rollback the outer transaction.
+    try {
+      $transaction->rollback();
+      unset($transaction);
+      $this->fail('Rolling back the outer transaction while the inner transaction is active resulted in an exception.');
+    }
+    catch (TransactionOutOfOrderException $e) {
+      $this->pass('Rolling back the outer transaction while the inner transaction is active resulted in an exception.');
+    }
+    $this->assertFalse($database->inTransaction(), 'No more in a transaction after rolling back the outer transaction');
+    // Try to commit one inner transaction.
+    unset($transaction3);
+    $this->pass('Trying to commit an inner transaction resulted in an exception.');
+    // Try to rollback one inner transaction.
+    try {
+      $transaction->rollback();
+      unset($transaction2);
+      $this->fail('Trying to commit an inner transaction resulted in an exception.');
+    }
+    catch (TransactionNoActiveException $e) {
+      $this->pass('Trying to commit an inner transaction resulted in an exception.');
+    }
+    $this->assertRowAbsent('outer');
+    $this->assertRowAbsent('inner');
+    $this->assertRowAbsent('inner2');
+  }
+
+  /**
+   * Tests that transactions can continue to be used if a query fails.
+   */
+  public function testQueryFailureInTransaction() {
+    $connection = Database::getConnection();
+    $transaction = $connection->startTransaction('test_transaction');
+    $connection->schema()->dropTable('test');
+
+    // Test a failed query using the query() method.
+    try {
+      $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
+      $this->fail('Using the query method failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Using the query method failed.');
+    }
+
+    // Test a failed select query.
+    try {
+      $connection->select('test')
+        ->fields('test', ['name'])
+        ->execute();
+
+      $this->fail('Select query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Select query failed.');
+    }
+
+    // Test a failed insert query.
+    try {
+      $connection->insert('test')
+        ->fields([
+          'name' => 'David',
+          'age' => '24',
+        ])
+        ->execute();
+
+      $this->fail('Insert query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Insert query failed.');
+    }
+
+    // Test a failed update query.
+    try {
+      $connection->update('test')
+        ->fields(['name' => 'Tiffany'])
+        ->condition('id', 1)
+        ->execute();
+
+      $this->fail('Update query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Update query failed.');
+    }
+
+    // Test a failed delete query.
+    try {
+      $connection->delete('test')
+        ->condition('id', 1)
+        ->execute();
+
+      $this->fail('Delete query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Delete query failed.');
+    }
+
+    // Test a failed merge query.
+    try {
+      $connection->merge('test')
+        ->key('job', 'Presenter')
+        ->fields([
+          'age' => '31',
+          'name' => 'Tiffany',
+        ])
+        ->execute();
+
+      $this->fail('Merge query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Merge query failed.');
+    }
+
+    // Test a failed upsert query.
+    try {
+      $connection->upsert('test')
+        ->key('job')
+        ->fields(['job', 'age', 'name'])
+        ->values([
+          'job' => 'Presenter',
+          'age' => 31,
+          'name' => 'Tiffany',
+        ])
+        ->execute();
+
+      $this->fail('Upset query failed.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Upset query failed.');
+    }
+
+    // Create the missing schema and insert a row.
+    $this->installSchema('database_test', ['test']);
+    $connection->insert('test')
+      ->fields(array(
+        'name' => 'David',
+        'age' => '24',
+      ))
+      ->execute();
+
+    // Commit the transaction.
+    unset($transaction);
+
+    $saved_age = $connection->query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'David'))->fetchField();
+    $this->assertEqual('24', $saved_age);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php b/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php
new file mode 100644
index 0000000..e74de9c
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/UpdateComplexTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\UpdateComplexTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Update query builder, complex queries.
+ *
+ * @group Database
+ */
+class UpdateComplexTest extends DatabaseTestBase {
+
+  /**
+   * Tests updates with OR conditionals.
+   */
+  function testOrConditionUpdate() {
+    $update = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition(db_or()
+        ->condition('name', 'John')
+        ->condition('name', 'Paul')
+      );
+    $num_updated = $update->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests WHERE IN clauses.
+   */
+  function testInConditionUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('name', array('John', 'Paul'), 'IN')
+      ->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests WHERE NOT IN clauses.
+   */
+  function testNotInConditionUpdate() {
+    // The o is lowercase in the 'NoT IN' operator, to make sure the operators
+    // work in mixed case.
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('name', array('John', 'Paul', 'George'), 'NoT IN')
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests BETWEEN conditional clauses.
+   */
+  function testBetweenConditionUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('age', array(25, 26), 'BETWEEN')
+      ->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests LIKE conditionals.
+   */
+  function testLikeConditionUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('name', '%ge%', 'LIKE')
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests UPDATE with expression values.
+   */
+  function testUpdateExpression() {
+    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $GLOBALS['larry_test'] = 1;
+    $num_updated = db_update('test')
+      ->condition('name', 'Ringo')
+      ->fields(array('job' => 'Musician'))
+      ->expression('age', 'age + :age', array(':age' => 4))
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
+
+    $person = db_query('SELECT * FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetch();
+    $this->assertEqual($person->name, 'Ringo', 'Name set correctly.');
+    $this->assertEqual($person->age, $before_age + 4, 'Age set correctly.');
+    $this->assertEqual($person->job, 'Musician', 'Job set correctly.');
+    $GLOBALS['larry_test'] = 0;
+  }
+
+  /**
+   * Tests UPDATE with only expression values.
+   */
+  function testUpdateOnlyExpression() {
+    $before_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $num_updated = db_update('test')
+      ->condition('name', 'Ringo')
+      ->expression('age', 'age + :age', array(':age' => 4))
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $this->assertEqual($before_age + 4, $after_age, 'Age updated correctly');
+  }
+
+  /**
+   * Test UPDATE with a subselect value.
+   */
+  function testSubSelectUpdate() {
+    $subselect = db_select('test_task', 't');
+    $subselect->addExpression('MAX(priority) + :increment', 'max_priority', array(':increment' => 30));
+    // Clone this to make sure we are running a different query when
+    // asserting.
+    $select = clone $subselect;
+    $query = db_update('test')
+      ->expression('age', $subselect)
+      ->condition('name', 'Ringo');
+    // Save the number of rows that updated for assertion later.
+    $num_updated = $query->execute();
+    $after_age = db_query('SELECT age FROM {test} WHERE name = :name', array(':name' => 'Ringo'))->fetchField();
+    $expected_age = $select->execute()->fetchField();
+    $this->assertEqual($after_age, $expected_age);
+    $this->assertEqual(1, $num_updated, t('Expected 1 row to be updated in subselect update query.'));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php b/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php
new file mode 100644
index 0000000..bfe51ec
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/UpdateLobTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\UpdateLobTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the Update query builder with LOB fields.
+ *
+ * @group Database
+ */
+class UpdateLobTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can update a blob column.
+   */
+  function testUpdateOneBlob() {
+    $data = "This is\000a test.";
+    $this->assertTrue(strlen($data) === 15, 'Test data contains a NULL.');
+    $id = db_insert('test_one_blob')
+      ->fields(array('blob1' => $data))
+      ->execute();
+
+    $data .= $data;
+    db_update('test_one_blob')
+      ->condition('id', $id)
+      ->fields(array('blob1' => $data))
+      ->execute();
+
+    $r = db_query('SELECT * FROM {test_one_blob} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $this->assertTrue($r['blob1'] === $data, format_string('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
+  }
+
+  /**
+   * Confirms that we can update two blob columns in the same table.
+   */
+  function testUpdateMultipleBlob() {
+    $id = db_insert('test_two_blobs')
+      ->fields(array(
+        'blob1' => 'This is',
+        'blob2' => 'a test',
+      ))
+      ->execute();
+
+    db_update('test_two_blobs')
+      ->condition('id', $id)
+      ->fields(array('blob1' => 'and so', 'blob2' => 'is this'))
+      ->execute();
+
+    $r = db_query('SELECT * FROM {test_two_blobs} WHERE id = :id', array(':id' => $id))->fetchAssoc();
+    $this->assertTrue($r['blob1'] === 'and so' && $r['blob2'] === 'is this', 'Can update multiple blobs per row.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php b/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php
new file mode 100644
index 0000000..638cdc3
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/UpdateTest.php
@@ -0,0 +1,162 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\UpdateTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+/**
+ * Tests the update query builder.
+ *
+ * @group Database
+ */
+class UpdateTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can update a single record successfully.
+   */
+  function testSimpleUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('name' => 'Tiffany'))
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $saved_name = db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 1))->fetchField();
+    $this->assertIdentical($saved_name, 'Tiffany', 'Updated name successfully.');
+  }
+
+  /**
+   * Confirms updating to NULL.
+   */
+  function testSimpleNullUpdate() {
+    $this->ensureSampleDataNull();
+    $num_updated = db_update('test_null')
+      ->fields(array('age' => NULL))
+      ->condition('name', 'Kermit')
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $saved_age = db_query('SELECT age FROM {test_null} WHERE name = :name', array(':name' => 'Kermit'))->fetchField();
+    $this->assertNull($saved_age, 'Updated name successfully.');
+  }
+
+  /**
+   * Confirms that we can update multiple records successfully.
+   */
+  function testMultiUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('job', 'Singer')
+      ->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Confirms that we can update multiple records with a non-equality condition.
+   */
+  function testMultiGTUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->condition('age', 26, '>')
+      ->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Confirms that we can update multiple records with a where call.
+   */
+  function testWhereUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->where('age > :age', array(':age' => 26))
+      ->execute();
+    $this->assertIdentical($num_updated, 2, 'Updated 2 records.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '2', 'Updated fields successfully.');
+  }
+
+  /**
+   * Confirms that we can stack condition and where calls.
+   */
+  function testWhereAndConditionUpdate() {
+    $update = db_update('test')
+      ->fields(array('job' => 'Musician'))
+      ->where('age > :age', array(':age' => 26))
+      ->condition('name', 'Ringo');
+    $num_updated = $update->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $num_matches = db_query('SELECT COUNT(*) FROM {test} WHERE job = :job', array(':job' => 'Musician'))->fetchField();
+    $this->assertIdentical($num_matches, '1', 'Updated fields successfully.');
+  }
+
+  /**
+   * Tests updating with expressions.
+   */
+  function testExpressionUpdate() {
+    // Ensure that expressions are handled properly. This should set every
+    // record's age to a square of itself.
+    $num_rows = db_update('test')
+      ->expression('age', 'age * age')
+      ->execute();
+    $this->assertIdentical($num_rows, 4, 'Updated 4 records.');
+
+    $saved_name = db_query('SELECT name FROM {test} WHERE age = :age', array(':age' => pow(26, 2)))->fetchField();
+    $this->assertIdentical($saved_name, 'Paul', 'Successfully updated values using an algebraic expression.');
+  }
+
+  /**
+   * Tests return value on update.
+   */
+  function testUpdateAffectedRows() {
+    // At 5am in the morning, all band members but those with a priority 1 task
+    // are sleeping. So we set their tasks to 'sleep'. 5 records match the
+    // condition and therefore are affected by the query, even though two of
+    // them actually don't have to be changed because their value was already
+    // 'sleep'. Still, execute() should return 5 affected rows, not only 3,
+    // because that's cross-db expected behavior.
+    $num_rows = db_update('test_task')
+      ->condition('priority', 1, '<>')
+      ->fields(array('task' => 'sleep'))
+      ->execute();
+    $this->assertIdentical($num_rows, 5, 'Correctly returned 5 affected rows.');
+  }
+
+  /**
+   * Confirm that we can update the primary key of a record successfully.
+   */
+  function testPrimaryKeyUpdate() {
+    $num_updated = db_update('test')
+      ->fields(array('id' => 42, 'name' => 'John'))
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 record.');
+
+    $saved_name= db_query('SELECT name FROM {test} WHERE id = :id', array(':id' => 42))->fetchField();
+    $this->assertIdentical($saved_name, 'John', 'Updated primary key successfully.');
+  }
+
+  /**
+   * Confirm that we can update values in a column with special name.
+   */
+  function testSpecialColumnUpdate() {
+    $num_updated = db_update('test_special_columns')
+      ->fields(array('offset' => 'New offset value'))
+      ->condition('id', 1)
+      ->execute();
+    $this->assertIdentical($num_updated, 1, 'Updated 1 special column record.');
+
+    $saved_value = db_query('SELECT "offset" FROM {test_special_columns} WHERE id = :id', array(':id' => 1))->fetchField();
+    $this->assertIdentical($saved_value, 'New offset value', 'Updated special column name value successfully.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php b/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php
new file mode 100644
index 0000000..b8f440e
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Database/UpsertTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Database\UpsertTest.
+ */
+
+namespace Drupal\KernelTests\Core\Database;
+
+use Drupal\Core\Database\Database;
+
+/**
+ * Tests the Upsert query builder.
+ *
+ * @group Database
+ */
+class UpsertTest extends DatabaseTestBase {
+
+  /**
+   * Confirms that we can upsert (update-or-insert) records successfully.
+   */
+  public function testUpsert() {
+    $connection = Database::getConnection();
+    $num_records_before = $connection->query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+
+    $upsert = $connection->upsert('test_people')
+      ->key('job')
+      ->fields(['job', 'age', 'name']);
+
+    // Add a new row.
+    $upsert->values([
+      'job' => 'Presenter',
+      'age' => 31,
+      'name' => 'Tiffany',
+    ]);
+
+    // Update an existing row.
+    $upsert->values([
+      'job' => 'Speaker',
+      // The initial age was 30.
+      'age' => 32,
+      'name' => 'Meredith',
+    ]);
+
+    $upsert->execute();
+
+    $num_records_after = $connection->query('SELECT COUNT(*) FROM {test_people}')->fetchField();
+    $this->assertEqual($num_records_before + 1, $num_records_after, 'Rows were inserted and updated properly.');
+
+    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Presenter'))->fetch();
+    $this->assertEqual($person->job, 'Presenter', 'Job set correctly.');
+    $this->assertEqual($person->age, 31, 'Age set correctly.');
+    $this->assertEqual($person->name, 'Tiffany', 'Name set correctly.');
+
+    $person = $connection->query('SELECT * FROM {test_people} WHERE job = :job', array(':job' => 'Speaker'))->fetch();
+    $this->assertEqual($person->job, 'Speaker', 'Job was not changed.');
+    $this->assertEqual($person->age, 32, 'Age updated correctly.');
+    $this->assertEqual($person->name, 'Meredith', 'Name was not changed.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
new file mode 100644
index 0000000..53120e0
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\BundleConstraintValidatorTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests validation constraints for BundleConstraintValidator.
+ *
+ * @group Entity
+ */
+class BundleConstraintValidatorTest extends KernelTestBase {
+
+  /**
+   * The typed data manager to use.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataManager
+   */
+  protected $typedData;
+
+  public static $modules = array('node', 'field', 'text', 'user');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('user');
+    $this->typedData = $this->container->get('typed_data_manager');
+  }
+
+  /**
+   * Tests bundle constraint validation.
+   */
+  public function testValidation() {
+    // Test with multiple values.
+    $this->assertValidation(array('foo', 'bar'));
+    // Test with a single string value as well.
+    $this->assertValidation('foo');
+  }
+
+  /**
+   * Executes the BundleConstraintValidator test for a given bundle.
+   *
+   * @param string|array $bundle
+   *   Bundle/bundles to use as constraint option.
+   */
+  protected function assertValidation($bundle) {
+    // Create a typed data definition with a Bundle constraint.
+    $definition = DataDefinition::create('entity_reference')
+      ->addConstraint('Bundle', $bundle);
+
+    // Test the validation.
+    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'foo'));
+
+    $typed_data = $this->typedData->create($definition, $node);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
+
+    // Test the validation when an invalid value is passed.
+    $page_node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'baz'));
+
+    $typed_data = $this->typedData->create($definition, $page_node);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getMessage(), t('The entity must be of bundle %bundle.', array('%bundle' => implode(', ', (array) $bundle))), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
+    $this->assertEqual($violation->getInvalidValue(), $page_node, 'The invalid value is set correctly in the violation.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
new file mode 100644
index 0000000..3687f34
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
@@ -0,0 +1,670 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\ConfigEntityQueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Config\Entity\Query\QueryFactory;
+use Drupal\config_test\Entity\ConfigQueryTest;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests Config Entity Query functionality.
+ *
+ * @group Entity
+ * @see \Drupal\Core\Config\Entity\Query
+ */
+class ConfigEntityQueryTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  static $modules = array('config_test');
+
+  /**
+   * Stores the search results for alter comparison.
+   *
+   * @var array
+   */
+  protected $queryResults;
+
+  /**
+   * The query factory used to construct all queries in the test.
+   *
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $factory;
+
+  /**
+   * Stores all config entities created for the test.
+   *
+   * @var array
+   */
+  protected $entities;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->entities = array();
+    $this->factory = $this->container->get('entity.query');
+
+    // These two are here to make sure that matchArray needs to go over several
+    // non-matches on every levels.
+    $array['level1']['level2a'] = 9;
+    $array['level1a']['level2'] = 9;
+    // The tests match array.level1.level2.
+    $array['level1']['level2'] = 1;
+    $entity = ConfigQueryTest::create(array(
+      'label' => $this->randomMachineName(),
+      'id' => '1',
+      'number' => 31,
+      'array' => $array,
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+    $array['level1']['level2'] = 2;
+    $entity = ConfigQueryTest::create(array(
+      'label' => $this->randomMachineName(),
+      'id' => '2',
+      'number' => 41,
+      'array' => $array,
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+    $array['level1']['level2'] = 1;
+    $entity = ConfigQueryTest::create(array(
+      'label' => 'test_prefix_' . $this->randomMachineName(),
+      'id' => '3',
+      'number' => 59,
+      'array' => $array,
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+    $array['level1']['level2'] = 2;
+    $entity = ConfigQueryTest::create(array(
+      'label' => $this->randomMachineName() . '_test_suffix',
+      'id' => '4',
+      'number' => 26,
+      'array' => $array,
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+    $array['level1']['level2'] = 3;
+    $entity = ConfigQueryTest::create(array(
+      'label' => $this->randomMachineName() . '_TEST_contains_' . $this->randomMachineName(),
+      'id' => '5',
+      'number' => 53,
+      'array' => $array,
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+  }
+
+  /**
+   * Tests basic functionality.
+   */
+  public function testConfigEntityQuery() {
+    // Run a test without any condition.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->execute();
+    $this->assertResults(array('1', '2', '3', '4', '5'));
+    // No conditions, OR.
+    $this->queryResults = $this->factory->get('config_query_test', 'OR')
+      ->execute();
+    $this->assertResults(array('1', '2', '3', '4', '5'));
+
+    // Filter by ID with equality.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3')
+      ->execute();
+    $this->assertResults(array('3'));
+
+    // Filter by label with a known prefix.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_prefix', 'STARTS_WITH')
+      ->execute();
+    $this->assertResults(array('3'));
+
+    // Filter by label with a known suffix.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_suffix', 'ENDS_WITH')
+      ->execute();
+    $this->assertResults(array('4'));
+
+    // Filter by label with a known containing word.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_contains', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array('5'));
+
+    // Filter by ID with the IN operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', array('2', '3'), 'IN')
+      ->execute();
+    $this->assertResults(array('2', '3'));
+
+    // Filter by ID with the implicit IN operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', array('2', '3'))
+      ->execute();
+    $this->assertResults(array('2', '3'));
+
+    // Filter by ID with the > operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '>')
+      ->execute();
+    $this->assertResults(array('4', '5'));
+
+    // Filter by ID with the >= operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '>=')
+      ->execute();
+    $this->assertResults(array('3', '4', '5'));
+
+    // Filter by ID with the <> operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '<>')
+      ->execute();
+    $this->assertResults(array('1', '2', '4', '5'));
+
+    // Filter by ID with the < operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '<')
+      ->execute();
+    $this->assertResults(array('1', '2'));
+
+    // Filter by ID with the <= operator.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '<=')
+      ->execute();
+    $this->assertResults(array('1', '2', '3'));
+
+    // Filter by two conditions on the same field.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_pref', 'STARTS_WITH')
+      ->condition('label', 'test_prefix', 'STARTS_WITH')
+      ->execute();
+    $this->assertResults(array('3'));
+
+    // Filter by two conditions on different fields. The first query matches for
+    // a different ID, so the result is empty.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_prefix', 'STARTS_WITH')
+      ->condition('id', '5')
+      ->execute();
+    $this->assertResults(array());
+
+    // Filter by two different conditions on different fields. This time the
+    // first condition matches on one item, but the second one does as well.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test_prefix', 'STARTS_WITH')
+      ->condition('id', '3')
+      ->execute();
+    $this->assertResults(array('3'));
+
+    // Filter by two different conditions, of which the first one matches for
+    // every entry, the second one as well, but just the third one filters so
+    // that just two are left.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '1', '>=')
+      ->condition('number', 10, '>=')
+      ->condition('number', 50, '>=')
+      ->execute();
+    $this->assertResults(array('3', '5'));
+
+    // Filter with an OR condition group.
+    $this->queryResults = $this->factory->get('config_query_test', 'OR')
+      ->condition('id', 1)
+      ->condition('id', '2')
+      ->execute();
+    $this->assertResults(array('1', '2'));
+
+    // Simplify it with IN.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', array('1', '2'))
+      ->execute();
+    $this->assertResults(array('1', '2'));
+    // Try explicit IN.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', array('1', '2'), 'IN')
+      ->execute();
+    $this->assertResults(array('1', '2'));
+    // Try not IN.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', array('1', '2'), 'NOT IN')
+      ->execute();
+    $this->assertResults(array('3', '4', '5'));
+
+    // Filter with an OR condition group on different fields.
+    $this->queryResults = $this->factory->get('config_query_test', 'OR')
+      ->condition('id', 1)
+      ->condition('number', 41)
+      ->execute();
+    $this->assertResults(array('1', '2'));
+
+    // Filter with an OR condition group on different fields but matching on the
+    // same entity.
+    $this->queryResults = $this->factory->get('config_query_test', 'OR')
+      ->condition('id', 1)
+      ->condition('number', 31)
+      ->execute();
+    $this->assertResults(array('1'));
+
+    // NO simple conditions, YES complex conditions, 'AND'.
+    $query = $this->factory->get('config_query_test', 'AND');
+    $and_condition_1 = $query->orConditionGroup()
+      ->condition('id', '2')
+      ->condition('label', $this->entities[0]->label);
+    $and_condition_2 = $query->orConditionGroup()
+      ->condition('id', 1)
+      ->condition('label', $this->entities[3]->label);
+    $this->queryResults = $query
+      ->condition($and_condition_1)
+      ->condition($and_condition_2)
+      ->execute();
+    $this->assertResults(array('1'));
+
+    // NO simple conditions, YES complex conditions, 'OR'.
+    $query = $this->factory->get('config_query_test', 'OR');
+    $and_condition_1 = $query->andConditionGroup()
+      ->condition('id', 1)
+      ->condition('label', $this->entities[0]->label);
+    $and_condition_2 = $query->andConditionGroup()
+      ->condition('id', '2')
+      ->condition('label', $this->entities[1]->label);
+    $this->queryResults = $query
+      ->condition($and_condition_1)
+      ->condition($and_condition_2)
+      ->execute();
+    $this->assertResults(array('1', '2'));
+
+    // YES simple conditions, YES complex conditions, 'AND'.
+    $query = $this->factory->get('config_query_test', 'AND');
+    $and_condition_1 = $query->orConditionGroup()
+      ->condition('id', '2')
+      ->condition('label', $this->entities[0]->label);
+    $and_condition_2 = $query->orConditionGroup()
+      ->condition('id', 1)
+      ->condition('label', $this->entities[3]->label);
+    $this->queryResults = $query
+      ->condition('number', 31)
+      ->condition($and_condition_1)
+      ->condition($and_condition_2)
+      ->execute();
+    $this->assertResults(array('1'));
+
+    // YES simple conditions, YES complex conditions, 'OR'.
+    $query = $this->factory->get('config_query_test', 'OR');
+    $and_condition_1 = $query->orConditionGroup()
+      ->condition('id', '2')
+      ->condition('label', $this->entities[0]->label);
+    $and_condition_2 = $query->orConditionGroup()
+      ->condition('id', 1)
+      ->condition('label', $this->entities[3]->label);
+    $this->queryResults = $query
+      ->condition('number', 53)
+      ->condition($and_condition_1)
+      ->condition($and_condition_2)
+      ->execute();
+    $this->assertResults(array('1', '2', '4', '5'));
+
+    // Test the exists and notExists conditions.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->exists('id')
+      ->execute();
+    $this->assertResults(array('1', '2', '3', '4', '5'));
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->exists('non-existent')
+      ->execute();
+    $this->assertResults(array());
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->notExists('id')
+      ->execute();
+    $this->assertResults(array());
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->notExists('non-existent')
+      ->execute();
+    $this->assertResults(array('1', '2', '3', '4', '5'));
+  }
+
+  /**
+   * Tests ID conditions.
+   */
+  public function testStringIdConditions() {
+    // We need an entity with a non-numeric ID.
+    $entity = ConfigQueryTest::create(array(
+      'label' => $this->randomMachineName(),
+      'id' => 'foo.bar',
+    ));
+    $this->entities[] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+    // Test 'STARTS_WITH' condition.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'foo.bar', 'STARTS_WITH')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'f', 'STARTS_WITH')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'miss', 'STARTS_WITH')
+      ->execute();
+    $this->assertResults(array());
+
+    // Test 'CONTAINS' condition.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'foo.bar', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'oo.ba', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'miss', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array());
+
+    // Test 'ENDS_WITH' condition.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'foo.bar', 'ENDS_WITH')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'r', 'ENDS_WITH')
+      ->execute();
+    $this->assertResults(array('foo.bar'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', 'miss', 'ENDS_WITH')
+      ->execute();
+    $this->assertResults(array());
+  }
+
+  /**
+   * Tests count query.
+   */
+  public function testCount() {
+    // Test count on no conditions.
+    $count = $this->factory->get('config_query_test')
+      ->count()
+      ->execute();
+    $this->assertIdentical($count, count($this->entities));
+
+    // Test count on a complex query.
+    $query = $this->factory->get('config_query_test', 'OR');
+    $and_condition_1 = $query->andConditionGroup()
+      ->condition('id', 1)
+      ->condition('label', $this->entities[0]->label);
+    $and_condition_2 = $query->andConditionGroup()
+      ->condition('id', '2')
+      ->condition('label', $this->entities[1]->label);
+    $count = $query
+      ->condition($and_condition_1)
+      ->condition($and_condition_2)
+      ->count()
+      ->execute();
+    $this->assertIdentical($count, 2);
+  }
+
+  /**
+   * Tests sorting and range on config entity queries.
+   */
+  public function testSortRange() {
+    // Sort by simple ascending/descending.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->sort('number', 'DESC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->sort('number', 'ASC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+
+    // Apply some filters and sort.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '>')
+      ->sort('number', 'DESC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('5', '4'));
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('id', '3', '>')
+      ->sort('number', 'ASC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('4', '5'));
+
+    // Apply a pager and sort.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->sort('number', 'DESC')
+      ->range('2', '2')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('2', '1'));
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->sort('number', 'ASC')
+      ->range('2', '2')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('2', '5'));
+
+    // Add a range to a query without a start parameter.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->range(0, '3')
+      ->sort('id', 'ASC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3'));
+
+    // Apply a pager with limit 4.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->pager('4', 0)
+      ->sort('id', 'ASC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4'));
+  }
+
+  /**
+   * Tests sorting with tableSort on config entity queries.
+   */
+  public function testTableSort() {
+    $header = array(
+      array('data' => t('ID'), 'specifier' => 'id'),
+      array('data' => t('Number'), 'specifier' => 'number'),
+    );
+
+    // Sort key: id
+    // Sorting with 'DESC' upper case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('id', 'DESC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
+
+    // Sorting with 'ASC' upper case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('id', 'ASC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
+
+    // Sorting with 'desc' lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('id', 'desc')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('5', '4', '3', '2', '1'));
+
+    // Sorting with 'asc' lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('id', 'asc')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('1', '2', '3', '4', '5'));
+
+    // Sort key: number
+    // Sorting with 'DeSc' mixed upper and lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('number', 'DeSc')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+
+    // Sorting with 'AsC' mixed upper and lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('number', 'AsC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+
+    // Sorting with 'dEsC' mixed upper and lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('number', 'dEsC')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('3', '5', '2', '1', '4'));
+
+    // Sorting with 'aSc' mixed upper and lower case
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->tableSort($header)
+      ->sort('number', 'aSc')
+      ->execute();
+    $this->assertIdentical(array_values($this->queryResults), array('4', '1', '2', '5', '3'));
+  }
+
+  /**
+   * Tests dotted path matching.
+   */
+  public function testDotted() {
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('array.level1.*', 1)
+      ->execute();
+    $this->assertResults(array('1', '3'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('*.level1.level2', 2)
+      ->execute();
+    $this->assertResults(array('2', '4'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('array.level1.*', 3)
+      ->execute();
+    $this->assertResults(array('5'));
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('array.level1.level2', 3)
+      ->execute();
+    $this->assertResults(array('5'));
+    // Make sure that values on the wildcard level do not match if there are
+    // sub-keys defined. This must not find anything even if entity 2 has a
+    // top-level key number with value 41.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('*.level1.level2', 41)
+      ->execute();
+    $this->assertResults(array());
+  }
+
+  /**
+   * Tests case sensitivity.
+   */
+  public function testCaseSensitivity() {
+    // Filter by label with a known containing case-sensitive word.
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'TEST', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array('3', '4', '5'));
+
+    $this->queryResults = $this->factory->get('config_query_test')
+      ->condition('label', 'test', 'CONTAINS')
+      ->execute();
+    $this->assertResults(array('3', '4', '5'));
+  }
+
+  /**
+   * Tests lookup keys are added to the key value store.
+   */
+  public function testLookupKeys() {
+    \Drupal::service('state')->set('config_test.lookup_keys', TRUE);
+    \Drupal::entityManager()->clearCachedDefinitions();
+    $key_value = $this->container->get('keyvalue')->get(QueryFactory::CONFIG_LOOKUP_PREFIX . 'config_test');
+
+    $test_entities = [];
+    $entity = entity_create('config_test', array(
+      'label' => $this->randomMachineName(),
+      'id' => '1',
+      'style' => 'test',
+    ));
+    $test_entities[$entity->getConfigDependencyName()] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+
+
+    $expected[] = $entity->getConfigDependencyName();
+    $this->assertEqual($expected, $key_value->get('style:test'));
+
+    $entity = entity_create('config_test', array(
+      'label' => $this->randomMachineName(),
+      'id' => '2',
+      'style' => 'test',
+    ));
+    $test_entities[$entity->getConfigDependencyName()] = $entity;
+    $entity->enforceIsNew();
+    $entity->save();
+    $expected[] = $entity->getConfigDependencyName();
+    $this->assertEqual($expected, $key_value->get('style:test'));
+
+    $entity = entity_create('config_test', array(
+      'label' => $this->randomMachineName(),
+      'id' => '3',
+      'style' => 'blah',
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+    // Do not add this entity to the list of expected result as it has a
+    // different value.
+    $this->assertEqual($expected, $key_value->get('style:test'));
+    $this->assertEqual([$entity->getConfigDependencyName()], $key_value->get('style:blah'));
+
+    // Ensure that a delete clears a key.
+    $entity->delete();
+    $this->assertEqual(NULL, $key_value->get('style:blah'));
+
+    // Ensure that delete only clears one key.
+    $entity_id = array_pop($expected);
+    $test_entities[$entity_id]->delete();
+    $this->assertEqual($expected, $key_value->get('style:test'));
+    $entity_id = array_pop($expected);
+    $test_entities[$entity_id]->delete();
+    $this->assertEqual(NULL, $key_value->get('style:test'));
+  }
+
+  /**
+   * Asserts the results as expected regardless of order.
+   *
+   * @param array $expected
+   *   Array of expected entity IDs.
+   */
+  protected function assertResults($expected) {
+    $this->assertIdentical(count($this->queryResults), count($expected));
+    foreach ($expected as $value) {
+      // This also tests whether $this->queryResults[$value] is even set at all.
+      $this->assertIdentical($this->queryResults[$value], $value);
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
new file mode 100644
index 0000000..eddb268
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
@@ -0,0 +1,545 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\ContentEntityChangedTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMulChanged;
+use Drupal\entity_test\Entity\EntityTestMulRevChanged;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests basic EntityChangedInterface functionality.
+ *
+ * @group Entity
+ */
+class ContentEntityChangedTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'user', 'system', 'field', 'text', 'filter', 'entity_test'];
+
+  /**
+   * The EntityTestMulChanged entity type storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $mulChangedStorage;
+
+  /**
+   * The EntityTestMulRevChanged entity type storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $mulRevChangedStorage;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Enable an additional language.
+    ConfigurableLanguage::createFromLangcode('de')->save();
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+
+    $this->installEntitySchema('entity_test_mul_changed');
+    $this->installEntitySchema('entity_test_mulrev_changed');
+
+    $this->mulChangedStorage = $this->entityManager->getStorage('entity_test_mul_changed');
+    $this->mulRevChangedStorage = $this->entityManager->getStorage('entity_test_mulrev_changed');
+  }
+
+  /**
+   * Tests basic EntityChangedInterface functionality.
+   */
+  public function testChanged() {
+    $user1 = $this->createUser();
+    $user2 = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMulChanged::create(array(
+      'name' => $this->randomString(),
+      'user_id' => $user1->id(),
+      'language' => 'en',
+    ));
+    $entity->save();
+
+    $this->assertTrue(
+      $entity->getChangedTime() >= REQUEST_TIME,
+      'Changed time of original language is valid.'
+    );
+
+    // We can't assert equality here because the created time is set to the
+    // request time, while instances of ChangedTestItem use the current
+    // timestamp every time. Therefor we check if the changed timestamp is
+    // between the created time and now.
+    $this->assertTrue(
+      ($entity->getChangedTime() >= $entity->get('created')->value) &&
+      (($entity->getChangedTime() - $entity->get('created')->value) <= time() - REQUEST_TIME),
+      'Changed and created time of original language can be assumed to be identical.'
+    );
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of original language is the same as changed time across all translations.'
+    );
+
+    $changed_en = $entity->getChangedTime();
+
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $german */
+    $german = $entity->addTranslation('de');
+
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertTrue(
+      $german->getChangedTime() > $entity->getChangedTime(),
+      'Changed time of the German translation is newer then the original language.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of the German translation is the newest time across all translations.'
+    );
+
+    $changed_de = $german->getChangedTime();
+
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $changed_de,
+      'Changed time of the German translation did not change.'
+    );
+
+    $entity->setOwner($user2);
+
+    $entity->save();
+
+    $this->assertTrue(
+      $entity->getChangedTime() > $changed_en,
+      'Changed time of original language did change.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $changed_de,
+      'Changed time of the German translation did not change.'
+    );
+
+    $this->assertTrue(
+      $entity->getChangedTime() > $german->getChangedTime(),
+      'Changed time of original language is newer then the German translation.'
+    );
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of the original language is the newest time across all translations.'
+    );
+
+    $changed_en = $entity->getChangedTime();
+
+    // Save entity without any changes.
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $changed_de,
+      'Changed time of the German translation did not change.'
+    );
+
+    // At this point the changed time of the original language (en) is newer
+    // than the changed time of the German translation. Now test that entity
+    // queries work as expected.
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en)->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time of original language.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en, '=', 'en')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time of original language by setting the original language as condition.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_de, '=', 'en')->execute();
+
+    $this->assertFalse(
+      $ids,
+      'There\'s no original entity stored having the changed time of the German translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en)->condition('default_langcode', '1')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time of default language.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_de)->condition('default_langcode', '1')->execute();
+
+    $this->assertFalse(
+      $ids,
+      'There\'s no entity stored using the default language having the changed time of the German translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_de)->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time of the German translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_de, '=', 'de')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time of the German translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en, '=', 'de')->execute();
+
+    $this->assertFalse(
+      $ids,
+      'There\'s no German translation stored having the changed time of the original language.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_de, '>')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time regardless of translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en, '<')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time regardless of translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', 0, '>')->execute();
+
+    $this->assertEqual(
+      reset($ids), $entity->id(),
+      'Entity query can access changed time regardless of translation.'
+    );
+
+    $query = $this->mulChangedStorage->getQuery();
+    $ids = $query->condition('changed', $changed_en, '>')->execute();
+
+    $this->assertFalse(
+      $ids,
+      'Entity query can access changed time regardless of translation.'
+    );
+  }
+
+  /**
+   * Tests revisionable EntityChangedInterface functionality.
+   */
+  public function testRevisionChanged() {
+    $user1 = $this->createUser();
+    $user2 = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMulRevChanged::create(array(
+      'name' => $this->randomString(),
+      'user_id' => $user1->id(),
+      'language' => 'en',
+    ));
+    $entity->save();
+
+    $this->assertTrue(
+      $entity->getChangedTime() >= REQUEST_TIME,
+      'Changed time of original language is valid.'
+    );
+
+    // We can't assert equality here because the created time is set to the
+    // request time while instances of ChangedTestItem use the current
+    // timestamp every time.
+    $this->assertTrue(
+      ($entity->getChangedTime() >= $entity->get('created')->value) &&
+      (($entity->getChangedTime() - $entity->get('created')->value) <= time() - REQUEST_TIME),
+      'Changed and created time of original language can be assumed to be identical.'
+    );
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of original language is the same as changed time across all translations.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is set for a new entity.'
+    );
+
+    $changed_en = $entity->getChangedTime();
+
+    $entity->setNewRevision();
+    // Save entity without any changes but create new revision.
+    $entity->save();
+    // A new revision without any changes should not set a new changed time.
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is not set for new revision without changes.'
+    );
+
+    $entity->setNewRevision();
+    $entity->setOwner($user2);
+    $entity->save();
+
+    $this->assertTrue(
+      $entity->getChangedTime() > $changed_en,
+      'Changed time of original language has been updated by new revision.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is set for new revision with changes.'
+    );
+
+    $changed_en = $entity->getChangedTime();
+
+    /** @var \Drupal\entity_test\Entity\EntityTestMulRevChanged $german */
+    $german = $entity->addTranslation('de');
+
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertTrue(
+      $german->getChangedTime() > $entity->getChangedTime(),
+      'Changed time of the German translation is newer then the original language.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of the German translation is the newest time across all translations.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is not reset by adding a new translation.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'Changed flag of German translation is set when adding the translation.'
+    );
+
+    $changed_de = $german->getChangedTime();
+
+    $entity->setNewRevision();
+    // Save entity without any changes but create new revision.
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $changed_de,
+      'Changed time of the German translation did not change.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is not set for new revision without changes.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'Changed flag of the German translation is not set for new revision without changes.'
+    );
+
+    $entity->setNewRevision();
+    $german->setOwner($user2);
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertTrue(
+      $german->getChangedTime() > $changed_de,
+      'Changed time of the German translation did change.'
+    );
+
+    $this->assertEqual(
+      $german->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of the German translation is the newest time across all translations.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is not set when changing the German Translation.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'Changed flag of German translation is set when changing the German translation.'
+    );
+
+    $french = $entity->addTranslation('fr');
+
+    $entity->setNewRevision();
+    $entity->save();
+
+    $this->assertEqual(
+      $entity->getChangedTime(), $changed_en,
+      'Changed time of original language did not change.'
+    );
+
+    $this->assertTrue(
+      $french->getChangedTime() > $entity->getChangedTime(),
+      'Changed time of the French translation is newer then the original language.'
+    );
+
+    $this->assertTrue(
+      $french->getChangedTime() > $entity->getChangedTime(),
+      'Changed time of the French translation is newer then the German translation.'
+    );
+
+    $this->assertEqual(
+      $french->getChangedTime(), $entity->getChangedTimeAcrossTranslations(),
+      'Changed time of the French translation is the newest time across all translations.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is reset by adding a new translation and a new revision.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'Changed flag of German translation is reset by adding a new translation and a new revision.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($french),
+      'Changed flag of French translation is set when adding the translation and a new revision.'
+    );
+
+    $entity->removeTranslation('fr');
+
+    $entity->setNewRevision();
+    $entity->save();
+
+    // This block simulates exactly the flow of a node form submission of a new
+    // translation and a new revision.
+    $form_entity_builder_entity = EntityTestMulRevChanged::load($entity->id());
+    // ContentTranslationController::prepareTranslation().
+    $form_entity_builder_entity = $form_entity_builder_entity->addTranslation('fr', $form_entity_builder_entity->toArray());
+    // EntityForm::buildEntity() during form submit.
+    $form_entity_builder_clone = clone $form_entity_builder_entity;
+    // NodeForm::submitForm().
+    $form_entity_builder_clone->setNewRevision();
+    // EntityForm::save().
+    $form_entity_builder_clone->save();
+
+    // The assertion fails unless https://www.drupal.org/node/2513094 is
+    // committed.
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($entity),
+      'Changed flag of original language is reset by adding a new translation and a new revision.'
+    );
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'Changed flag of German translation is reset by adding a new translation and a new revision.'
+    );
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($french),
+      'Changed flag of French translation is set when adding the translation and a new revision.'
+    );
+
+    $german->setOwner($user1);
+    $german->setRevisionTranslationAffected(FALSE);
+    $entity->save();
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'German translation changed but the changed flag is reset manually.'
+    );
+
+    $entity->setNewRevision();
+    $german->setRevisionTranslationAffected(TRUE);
+    $entity->save();
+
+    $this->assertTrue(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'German translation is not changed and a new revision is created but the changed flag is set manually.'
+    );
+
+    $german->setOwner($user2);
+    $entity->setNewRevision();
+    $german->setRevisionTranslationAffected(FALSE);
+    $entity->save();
+
+    $this->assertFalse(
+      $this->getRevisionTranslationAffectedFlag($german),
+      'German translation changed and a new revision is created but the changed flag is reset manually.'
+    );
+
+  }
+
+  /**
+   * Retrieves the revision translation affected flag value.
+   *
+   * @param \Drupal\entity_test\Entity\EntityTestMulRevChanged $entity
+   *   The entity object to be checked.
+   *
+   * @return bool
+   *   The flag value.
+   */
+  protected function getRevisionTranslationAffectedFlag(EntityTestMulRevChanged $entity) {
+    $query = $this->mulRevChangedStorage->getQuery();
+    $ids = $query->condition('revision_translation_affected', 1, '=', $entity->language()->getId())->execute();
+    $id = reset($ids);
+    return (bool) ($id == $entity->id());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
new file mode 100644
index 0000000..742708a
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityCloneTest.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\ContentEntityCloneTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMul;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests proper cloning of content entities.
+ *
+ * @group Entity
+ */
+class ContentEntityCloneTest extends EntityKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'entity_test'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Enable an additional language.
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    $this->installEntitySchema('entity_test_mul');
+  }
+
+  /**
+   * Tests if entity references on fields are still correct after cloning.
+   */
+  public function testFieldEntityReferenceAfterClone() {
+    $user = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMul::create([
+      'name' => $this->randomString(),
+      'user_id' => $user->id(),
+      'language' => 'en',
+    ]);
+
+    $clone = clone $entity->addTranslation('de');
+
+    $this->assertEqual($entity->getTranslationLanguages(), $clone->getTranslationLanguages(), 'The entity and its clone have the same translation languages.');
+
+    $default_langcode = $entity->getUntranslated()->language()->getId();
+    foreach (array_keys($clone->getTranslationLanguages()) as $langcode) {
+      $translation = $clone->getTranslation($langcode);
+      foreach ($translation->getFields() as $field_name => $field) {
+        if ($field->getFieldDefinition()->isTranslatable()) {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
+          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode after cloning.', $args));
+        }
+        else {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
+          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode after cloning.', $args));
+        }
+      }
+    }
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
new file mode 100644
index 0000000..6d4b70c
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\ContentEntityNullStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\contact\Entity\ContactForm;
+use Drupal\Core\Config\ConfigImporter;
+use Drupal\Core\Config\StorageComparer;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests ContentEntityNullStorage entity query support.
+ *
+ * @see \Drupal\Core\Entity\ContentEntityNullStorage
+ * @see \Drupal\Core\Entity\Query\Null\Query
+ *
+ * @group Entity
+ */
+class ContentEntityNullStorageTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system', 'contact', 'user');
+
+  /**
+   * Tests using entity query with ContentEntityNullStorage.
+   *
+   * @see \Drupal\Core\Entity\Query\Null\Query
+   */
+  public function testEntityQuery() {
+    $this->assertIdentical(0, \Drupal::entityQuery('contact_message')->count()->execute(), 'Counting a null storage returns 0.');
+    $this->assertIdentical([], \Drupal::entityQuery('contact_message')->execute(), 'Querying a null storage returns an empty array.');
+    $this->assertIdentical([], \Drupal::entityQuery('contact_message')->condition('contact_form', 'test')->execute(), 'Querying a null storage returns an empty array and conditions are ignored.');
+    $this->assertIdentical([], \Drupal::entityQueryAggregate('contact_message')->aggregate('name', 'AVG')->execute(), 'Aggregate querying a null storage returns an empty array');
+
+  }
+
+  /**
+   * Tests deleting a contact form entity via a configuration import.
+   *
+   * @see \Drupal\Core\Entity\Event\BundleConfigImportValidate
+   */
+  public function testDeleteThroughImport() {
+    $contact_form = ContactForm::create(['id' => 'test']);
+    $contact_form->save();
+
+    $this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));
+
+    // Set up the ConfigImporter object for testing.
+    $storage_comparer = new StorageComparer(
+      $this->container->get('config.storage.sync'),
+      $this->container->get('config.storage'),
+      $this->container->get('config.manager')
+    );
+    $config_importer = new ConfigImporter(
+      $storage_comparer->createChangelist(),
+      $this->container->get('event_dispatcher'),
+      $this->container->get('config.manager'),
+      $this->container->get('lock'),
+      $this->container->get('config.typed'),
+      $this->container->get('module_handler'),
+      $this->container->get('module_installer'),
+      $this->container->get('theme_handler'),
+      $this->container->get('string_translation')
+    );
+
+    // Delete the contact message in sync.
+    $sync = $this->container->get('config.storage.sync');
+    $sync->delete($contact_form->getConfigDependencyName());
+
+    // Import.
+    $config_importer->reset()->import();
+    $this->assertNull(ContactForm::load($contact_form->id()), 'The contact form has been deleted.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
new file mode 100644
index 0000000..2622910
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
@@ -0,0 +1,332 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\Element\EntityAutocompleteElementFormTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity\Element;
+
+use Drupal\Core\Entity\Element\EntityAutocomplete;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests the EntityAutocomplete Form API element.
+ *
+ * @group Form
+ */
+class EntityAutocompleteElementFormTest extends EntityKernelTestBase implements FormInterface {
+
+  /**
+   * User for testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $testUser;
+
+  /**
+   * User for autocreate testing.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $testAutocreateUser;
+
+  /**
+   * An array of entities to be referenced in this test.
+   *
+   * @var \Drupal\Core\Entity\EntityInterface[]
+   */
+  protected $referencedEntities;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', ['key_value_expire']);
+    \Drupal::service('router.builder')->rebuild();
+
+    $this->testUser = User::create(array(
+      'name' => 'foobar1',
+      'mail' => 'foobar1@example.com',
+    ));
+    $this->testUser->save();
+    \Drupal::service('current_user')->setAccount($this->testUser);
+
+    $this->testAutocreateUser = User::create(array(
+      'name' => 'foobar2',
+      'mail' => 'foobar2@example.com',
+    ));
+    $this->testAutocreateUser->save();
+
+    for ($i = 1; $i < 3; $i++) {
+      $entity = EntityTest::create(array(
+        'name' => $this->randomMachineName()
+      ));
+      $entity->save();
+      $this->referencedEntities[] = $entity;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'test_entity_autocomplete';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['single'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+    );
+    $form['single_autocreate'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#autocreate' => array(
+        'bundle' => 'entity_test',
+      ),
+    );
+    $form['single_autocreate_specific_uid'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#autocreate' => array(
+        'bundle' => 'entity_test',
+        'uid' => $this->testAutocreateUser->id(),
+      ),
+    );
+
+    $form['tags'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#tags' => TRUE,
+    );
+    $form['tags_autocreate'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#tags' => TRUE,
+      '#autocreate' => array(
+        'bundle' => 'entity_test',
+      ),
+    );
+    $form['tags_autocreate_specific_uid'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#tags' => TRUE,
+      '#autocreate' => array(
+        'bundle' => 'entity_test',
+        'uid' => $this->testAutocreateUser->id(),
+      ),
+    );
+
+    $form['single_no_validate'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#validate_reference' => FALSE,
+    );
+    $form['single_autocreate_no_validate'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#validate_reference' => FALSE,
+      '#autocreate' => array(
+        'bundle' => 'entity_test',
+      ),
+    );
+
+    $form['single_access'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#default_value' => $this->referencedEntities[0],
+    );
+    $form['tags_access'] = array(
+      '#type' => 'entity_autocomplete',
+      '#target_type' => 'entity_test',
+      '#tags' => TRUE,
+      '#default_value' => array($this->referencedEntities[0], $this->referencedEntities[1]),
+    );
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) { }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) { }
+
+  /**
+   * Tests valid entries in the EntityAutocomplete Form API element.
+   */
+  public function testValidEntityAutocompleteElement() {
+    $form_state = (new FormState())
+      ->setValues([
+        'single' => $this->getAutocompleteInput($this->referencedEntities[0]),
+        'single_autocreate' => 'single - autocreated entity label',
+        'single_autocreate_specific_uid' => 'single - autocreated entity label with specific uid',
+        'tags' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[1]),
+        'tags_autocreate' =>
+          $this->getAutocompleteInput($this->referencedEntities[0])
+          . ', tags - autocreated entity label, '
+          . $this->getAutocompleteInput($this->referencedEntities[1]),
+        'tags_autocreate_specific_uid' =>
+          $this->getAutocompleteInput($this->referencedEntities[0])
+          . ', tags - autocreated entity label with specific uid, '
+          . $this->getAutocompleteInput($this->referencedEntities[1]),
+      ]);
+    $form_builder = $this->container->get('form_builder');
+    $form_builder->submitForm($this, $form_state);
+
+    // Valid form state.
+    $this->assertEqual(count($form_state->getErrors()), 0);
+
+    // Test the 'single' element.
+    $this->assertEqual($form_state->getValue('single'), $this->referencedEntities[0]->id());
+
+    // Test the 'single_autocreate' element.
+    $value = $form_state->getValue('single_autocreate');
+    $this->assertEqual($value['entity']->label(), 'single - autocreated entity label');
+    $this->assertEqual($value['entity']->bundle(), 'entity_test');
+    $this->assertEqual($value['entity']->getOwnerId(), $this->testUser->id());
+
+    // Test the 'single_autocreate_specific_uid' element.
+    $value = $form_state->getValue('single_autocreate_specific_uid');
+    $this->assertEqual($value['entity']->label(), 'single - autocreated entity label with specific uid');
+    $this->assertEqual($value['entity']->bundle(), 'entity_test');
+    $this->assertEqual($value['entity']->getOwnerId(), $this->testAutocreateUser->id());
+
+    // Test the 'tags' element.
+    $expected = array(
+      array('target_id' => $this->referencedEntities[0]->id()),
+      array('target_id' => $this->referencedEntities[1]->id()),
+    );
+    $this->assertEqual($form_state->getValue('tags'), $expected);
+
+    // Test the 'single_autocreate' element.
+    $value = $form_state->getValue('tags_autocreate');
+    // First value is an existing entity.
+    $this->assertEqual($value[0]['target_id'], $this->referencedEntities[0]->id());
+    // Second value is an autocreated entity.
+    $this->assertTrue(!isset($value[1]['target_id']));
+    $this->assertEqual($value[1]['entity']->label(), 'tags - autocreated entity label');
+    $this->assertEqual($value[1]['entity']->getOwnerId(), $this->testUser->id());
+    // Third value is an existing entity.
+    $this->assertEqual($value[2]['target_id'], $this->referencedEntities[1]->id());
+
+    // Test the 'tags_autocreate_specific_uid' element.
+    $value = $form_state->getValue('tags_autocreate_specific_uid');
+    // First value is an existing entity.
+    $this->assertEqual($value[0]['target_id'], $this->referencedEntities[0]->id());
+    // Second value is an autocreated entity.
+    $this->assertTrue(!isset($value[1]['target_id']));
+    $this->assertEqual($value[1]['entity']->label(), 'tags - autocreated entity label with specific uid');
+    $this->assertEqual($value[1]['entity']->getOwnerId(), $this->testAutocreateUser->id());
+    // Third value is an existing entity.
+    $this->assertEqual($value[2]['target_id'], $this->referencedEntities[1]->id());
+  }
+
+  /**
+   * Tests invalid entries in the EntityAutocomplete Form API element.
+   */
+  public function testInvalidEntityAutocompleteElement() {
+    $form_builder = $this->container->get('form_builder');
+
+    // Test 'single' with a entity label that doesn't exist
+    $form_state = (new FormState())
+      ->setValues([
+        'single' => 'single - non-existent label',
+      ]);
+    $form_builder->submitForm($this, $form_state);
+    $this->assertEqual(count($form_state->getErrors()), 1);
+    $this->assertEqual($form_state->getErrors()['single'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
+
+    // Test 'single' with a entity ID that doesn't exist.
+    $form_state = (new FormState())
+      ->setValues([
+        'single' => 'single - non-existent label (42)',
+      ]);
+    $form_builder->submitForm($this, $form_state);
+    $this->assertEqual(count($form_state->getErrors()), 1);
+    $this->assertEqual($form_state->getErrors()['single'], t('The referenced entity (%type: %id) does not exist.', array('%type' => 'entity_test', '%id' => 42)));
+
+    // Do the same tests as above but on an element with '#validate_reference'
+    // set to FALSE.
+    $form_state = (new FormState())
+      ->setValues([
+        'single_no_validate' => 'single - non-existent label',
+        'single_autocreate_no_validate' => 'single - autocreate non-existent label'
+      ]);
+    $form_builder->submitForm($this, $form_state);
+
+    // The element without 'autocreate' support still has to emit a warning when
+    // the input doesn't end with an entity ID enclosed in parentheses.
+    $this->assertEqual(count($form_state->getErrors()), 1);
+    $this->assertEqual($form_state->getErrors()['single_no_validate'], t('There are no entities matching "%value".', array('%value' => 'single - non-existent label')));
+
+    $form_state = (new FormState())
+      ->setValues([
+        'single_no_validate' => 'single - non-existent label (42)',
+        'single_autocreate_no_validate' => 'single - autocreate non-existent label (43)'
+      ]);
+    $form_builder->submitForm($this, $form_state);
+
+    // The input is complete (i.e. contains an entity ID at the end), no errors
+    // are triggered.
+    $this->assertEqual(count($form_state->getErrors()), 0);
+  }
+
+  /**
+   * Tests that access is properly checked by the EntityAutocomplete element.
+   */
+  public function testEntityAutocompleteAccess() {
+    $form_builder = $this->container->get('form_builder');
+    $form = $form_builder->getForm($this);
+
+    // Check that the current user has proper access to view entity labels.
+    $expected = $this->referencedEntities[0]->label() . ' (' . $this->referencedEntities[0]->id() . ')';
+    $this->assertEqual($form['single_access']['#value'], $expected);
+
+    $expected .= ', ' . $this->referencedEntities[1]->label() . ' (' . $this->referencedEntities[1]->id() . ')';
+    $this->assertEqual($form['tags_access']['#value'], $expected);
+
+    // Set up a non-admin user that is *not* allowed to view test entities.
+    \Drupal::currentUser()->setAccount($this->createUser(array(), array()));
+
+    // Rebuild the form.
+    $form = $form_builder->getForm($this);
+
+    $expected = t('- Restricted access -') . ' (' . $this->referencedEntities[0]->id() . ')';
+    $this->assertEqual($form['single_access']['#value'], $expected);
+
+    $expected .= ', ' . t('- Restricted access -') . ' (' . $this->referencedEntities[1]->id() . ')';
+    $this->assertEqual($form['tags_access']['#value'], $expected);
+  }
+
+  /**
+   * Returns an entity label in the format needed by the EntityAutocomplete
+   * element.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   A Drupal entity.
+   *
+   * @return string
+   *   A string that can be used as a value for EntityAutocomplete elements.
+   */
+  protected function getAutocompleteInput(EntityInterface $entity) {
+    return EntityAutocomplete::getEntityLabels(array($entity));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
new file mode 100644
index 0000000..8e52453
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
@@ -0,0 +1,230 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityAccessControlHandlerTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessibleInterface;
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Session\AnonymousUserSession;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestDefaultAccess;
+use Drupal\entity_test\Entity\EntityTestLabel;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests the entity access control handler.
+ *
+ * @group Entity
+ */
+class EntityAccessControlHandlerTest extends EntityLanguageTestBase  {
+
+  /**
+   * Asserts entity access correctly grants or denies access.
+   */
+  function assertEntityAccess($ops, AccessibleInterface $object, AccountInterface $account = NULL) {
+    foreach ($ops as $op => $result) {
+      $message = format_string("Entity access returns @result with operation '@op'.", array(
+        '@result' => !isset($result) ? 'null' : ($result ? 'true' : 'false'),
+        '@op' => $op,
+      ));
+
+      $this->assertEqual($result, $object->access($op, $account), $message);
+    }
+  }
+
+  /**
+   * Ensures user labels are accessible for everyone.
+   */
+  public function testUserLabelAccess() {
+    // Set up a non-admin user.
+    \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2]));
+
+    $anonymous_user = User::getAnonymousUser();
+    $user = $this->createUser();
+
+    // The current user is allowed to view the anonymous user label.
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+      'view label' => TRUE,
+    ), $anonymous_user);
+
+    // The current user is allowed to view user labels.
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+      'view label' => TRUE,
+    ), $user);
+
+    // Switch to a anonymous user account.
+    $account_switcher = \Drupal::service('account_switcher');
+    $account_switcher->switchTo(new AnonymousUserSession());
+
+    // The anonymous user is allowed to view the anonymous user label.
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+      'view label' => TRUE,
+    ), $anonymous_user);
+
+    // The anonymous user is allowed to view user labels.
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+      'view label' => TRUE,
+    ), $user);
+
+    // Restore user account.
+    $account_switcher->switchBack();
+  }
+
+  /**
+   * Ensures entity access is properly working.
+   */
+  function testEntityAccess() {
+    // Set up a non-admin user that is allowed to view test entities.
+    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
+
+    // Use the 'entity_test_label' entity type in order to test the 'view label'
+    // access operation.
+    $entity = EntityTestLabel::create(array(
+      'name' => 'test',
+    ));
+
+    // The current user is allowed to view entities.
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => TRUE,
+      'view label' => TRUE,
+    ), $entity);
+
+    // The custom user is not allowed to perform any operation on test entities,
+    // except for viewing their label.
+    $custom_user = $this->createUser();
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+      'view label' => TRUE,
+    ), $entity, $custom_user);
+  }
+
+  /**
+   * Ensures default entity access is checked when necessary.
+   *
+   * This ensures that the default checkAccess() implementation of the
+   * entity access control handler is considered if hook_entity_access() has not
+   * explicitly forbidden access. Therefore the default checkAccess()
+   * implementation can forbid access, even after access was already explicitly
+   * allowed by hook_entity_access().
+   *
+   * @see \Drupal\entity_test\EntityTestAccessControlHandler::checkAccess()
+   * @see entity_test_entity_access()
+   */
+  function testDefaultEntityAccess() {
+    // Set up a non-admin user that is allowed to view test entities.
+    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity')));
+    $entity = EntityTest::create(array(
+        'name' => 'forbid_access',
+      ));
+
+    // The user is denied access to the entity.
+    $this->assertEntityAccess(array(
+        'create' => FALSE,
+        'update' => FALSE,
+        'delete' => FALSE,
+        'view' => FALSE,
+      ), $entity);
+  }
+
+  /**
+   * Ensures that the default handler is used as a fallback.
+   */
+  function testEntityAccessDefaultController() {
+    // The implementation requires that the global user id can be loaded.
+    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2)));
+
+    // Check that the default access control handler is used for entities that don't
+    // have a specific access control handler defined.
+    $handler = $this->container->get('entity.manager')->getAccessControlHandler('entity_test_default_access');
+    $this->assertTrue($handler instanceof EntityAccessControlHandler, 'The default entity handler is used for the entity_test_default_access entity type.');
+
+    $entity = EntityTestDefaultAccess::create();
+    $this->assertEntityAccess(array(
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+    ), $entity);
+  }
+
+  /**
+   * Ensures entity access for entity translations is properly working.
+   */
+  function testEntityTranslationAccess() {
+
+    // Set up a non-admin user that is allowed to view test entity translations.
+    \Drupal::currentUser()->setAccount($this->createUser(array('uid' => 2), array('view test entity translations')));
+
+    // Create two test languages.
+    foreach (array('foo', 'bar') as $langcode) {
+      ConfigurableLanguage::create(array(
+        'id' => $langcode,
+        'label' => $this->randomString(),
+      ))->save();
+    }
+
+    $entity = EntityTest::create(array(
+      'name' => 'test',
+      'langcode' => 'foo',
+    ));
+    $entity->save();
+
+    $translation = $entity->addTranslation('bar');
+    $this->assertEntityAccess(array(
+      'view' => TRUE,
+    ), $translation);
+  }
+
+  /**
+   * Tests hook invocations.
+   */
+  public function testHooks() {
+    $state = $this->container->get('state');
+    $entity = EntityTest::create(array(
+      'name' => 'test',
+    ));
+
+    // Test hook_entity_create_access() and hook_ENTITY_TYPE_create_access().
+    $entity->access('create');
+    $this->assertEqual($state->get('entity_test_entity_create_access'), TRUE);
+    $this->assertIdentical($state->get('entity_test_entity_create_access_context'), [
+      'entity_type_id' => 'entity_test',
+      'langcode' => LanguageInterface::LANGCODE_DEFAULT,
+    ]);
+    $this->assertEqual($state->get('entity_test_entity_test_create_access'), TRUE);
+
+    // Test hook_entity_access() and hook_ENTITY_TYPE_access().
+    $entity->access('view');
+    $this->assertEqual($state->get('entity_test_entity_access'), TRUE);
+    $this->assertEqual($state->get('entity_test_entity_test_access'), TRUE);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
new file mode 100644
index 0000000..90520e2
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityApiTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\user\UserInterface;
+
+/**
+ * Tests basic CRUD functionality.
+ *
+ * @group Entity
+ */
+class EntityApiTest extends EntityKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    foreach (entity_test_entity_types() as $entity_type_id) {
+      // The entity_test schema is installed by the parent.
+      if ($entity_type_id != 'entity_test') {
+        $this->installEntitySchema($entity_type_id);
+      }
+    }
+  }
+
+  /**
+   * Tests basic CRUD functionality of the Entity API.
+   */
+  public function testCRUD() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->assertCRUD($entity_type, $this->createUser());
+    }
+  }
+
+  /**
+   * Executes a test set for a defined entity type and user.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   * @param \Drupal\user\UserInterface $user1
+   *   The user to run the tests with.
+   */
+  protected function assertCRUD($entity_type, UserInterface $user1) {
+    // Create some test entities.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => 'test', 'user_id' => $user1->id()));
+    $entity->save();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => 'test2', 'user_id' => $user1->id()));
+    $entity->save();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => 'test', 'user_id' => NULL));
+    $entity->save();
+
+    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
+    $this->assertEqual($entities[0]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entities[1]->name->value, 'test', format_string('%entity_type: Created and loaded entity', array('%entity_type' => $entity_type)));
+
+    // Test loading a single entity.
+    $loaded_entity = entity_load($entity_type, $entity->id());
+    $this->assertEqual($loaded_entity->id(), $entity->id(), format_string('%entity_type: Loaded a single entity by id.', array('%entity_type' => $entity_type)));
+
+    // Test deleting an entity.
+    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
+    $entities[0]->delete();
+    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test2')));
+    $this->assertEqual($entities, array(), format_string('%entity_type: Entity deleted.', array('%entity_type' => $entity_type)));
+
+    // Test updating an entity.
+    $entities = array_values(entity_load_multiple_by_properties($entity_type, array('name' => 'test')));
+    $entities[0]->name->value = 'test3';
+    $entities[0]->save();
+    $entity = entity_load($entity_type, $entities[0]->id());
+    $this->assertEqual($entity->name->value, 'test3', format_string('%entity_type: Entity updated.', array('%entity_type' => $entity_type)));
+
+    // Try deleting multiple test entities by deleting all.
+    $ids = array_keys(entity_load_multiple($entity_type));
+    entity_delete_multiple($entity_type, $ids);
+
+    $all = entity_load_multiple($entity_type);
+    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
+
+    // Verify that all data got deleted.
+    $definition = \Drupal::entityManager()->getDefinition($entity_type);
+    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $definition->getBaseTable() . '}')->fetchField(), 'Base table was emptied');
+    if ($data_table = $definition->getDataTable()) {
+      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $data_table . '}')->fetchField(), 'Data table was emptied');
+    }
+    if ($revision_table = $definition->getRevisionTable()) {
+      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $revision_table . '}')->fetchField(), 'Data table was emptied');
+    }
+
+    // Test deleting a list of entities not indexed by entity id.
+    $entities = array();
+    $entity = entity_create($entity_type, array('name' => 'test', 'user_id' => $user1->id()));
+    $entity->save();
+    $entities['test'] = $entity;
+    $entity = entity_create($entity_type, array('name' => 'test2', 'user_id' => $user1->id()));
+    $entity->save();
+    $entities['test2'] = $entity;
+    $controller = \Drupal::entityManager()->getStorage($entity_type);
+    $controller->delete($entities);
+
+    // Verify that entities got deleted.
+    $all = entity_load_multiple($entity_type);
+    $this->assertTrue(empty($all), format_string('%entity_type: Deleted all entities.', array('%entity_type' => $entity_type)));
+
+    // Verify that all data got deleted from the tables.
+    $definition = \Drupal::entityManager()->getDefinition($entity_type);
+    $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $definition->getBaseTable() . '}')->fetchField(), 'Base table was emptied');
+    if ($data_table = $definition->getDataTable()) {
+      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $data_table . '}')->fetchField(), 'Data table was emptied');
+    }
+    if ($revision_table = $definition->getRevisionTable()) {
+      $this->assertEqual(0, db_query('SELECT COUNT(*) FROM {' . $revision_table . '}')->fetchField(), 'Data table was emptied');
+    }
+  }
+
+  /**
+   * Tests that exceptions are thrown when saving or deleting an entity.
+   */
+  public function testEntityStorageExceptionHandling() {
+    $entity = EntityTest::create(array('name' => 'test'));
+    try {
+      $GLOBALS['entity_test_throw_exception'] = TRUE;
+      $entity->save();
+      $this->fail('Entity presave EntityStorageException thrown but not caught.');
+    }
+    catch (EntityStorageException $e) {
+      $this->assertEqual($e->getcode(), 1, 'Entity presave EntityStorageException caught.');
+    }
+
+    $entity = EntityTest::create(array('name' => 'test2'));
+    try {
+      unset($GLOBALS['entity_test_throw_exception']);
+      $entity->save();
+      $this->pass('Exception presave not thrown and not caught.');
+    }
+    catch (EntityStorageException $e) {
+      $this->assertNotEqual($e->getCode(), 1, 'Entity presave EntityStorageException caught.');
+    }
+
+    $entity = EntityTest::create(array('name' => 'test3'));
+    $entity->save();
+    try {
+      $GLOBALS['entity_test_throw_exception'] = TRUE;
+      $entity->delete();
+      $this->fail('Entity predelete EntityStorageException not thrown.');
+    }
+    catch (EntityStorageException $e) {
+      $this->assertEqual($e->getCode(), 2, 'Entity predelete EntityStorageException caught.');
+    }
+
+    unset($GLOBALS['entity_test_throw_exception']);
+    $entity = EntityTest::create(array('name' => 'test4'));
+    $entity->save();
+    try {
+      $entity->delete();
+      $this->pass('Entity predelete EntityStorageException not thrown and not caught.');
+    }
+    catch (EntityStorageException $e) {
+      $this->assertNotEqual($e->getCode(), 2, 'Entity predelete EntityStorageException thrown.');
+    }
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
new file mode 100644
index 0000000..4392aa5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityAutocompleteTest.php
@@ -0,0 +1,170 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityAutocompleteTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Serialization\Json;
+use Drupal\Component\Utility\Crypt;
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\Tags;
+use Drupal\Core\Site\Settings;
+use Drupal\system\Controller\EntityAutocompleteController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+
+/**
+ * Tests the autocomplete functionality.
+ *
+ * @group Entity
+ */
+class EntityAutocompleteTest extends EntityKernelTestBase {
+
+  /**
+   * The entity type used in this test.
+   *
+   * @var string
+   */
+  protected $entityType = 'entity_test';
+
+  /**
+   * The bundle used in this test.
+   *
+   * @var string
+   */
+  protected $bundle = 'entity_test';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('system', ['key_value']);
+  }
+
+  /**
+   * Tests autocompletion edge cases with slashes in the names.
+   */
+  function testEntityReferenceAutocompletion() {
+    // Add an entity with a slash in its name.
+    $entity_1 = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => '10/16/2011'));
+    $entity_1->save();
+
+    // Add another entity that differs after the slash character.
+    $entity_2 = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => '10/17/2011'));
+    $entity_2->save();
+
+    // Add another entity that has both a comma, a slash and markup.
+    $entity_3 = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('name' => 'label with, and / test'));
+    $entity_3->save();
+
+    // Try to autocomplete a entity label that matches both entities.
+    // We should get both entities in a JSON encoded string.
+    $input = '10/';
+    $data = $this->getAutocompleteResult($input);
+    $this->assertIdentical($data[0]['label'], Html::escape($entity_1->name->value), 'Autocomplete returned the first matching entity');
+    $this->assertIdentical($data[1]['label'], Html::escape($entity_2->name->value), 'Autocomplete returned the second matching entity');
+
+    // Try to autocomplete a entity label that matches the first entity.
+    // We should only get the first entity in a JSON encoded string.
+    $input = '10/16';
+    $data = $this->getAutocompleteResult($input);
+    $target = array(
+      'value' => $entity_1->name->value . ' (1)',
+      'label' => Html::escape($entity_1->name->value),
+    );
+    $this->assertIdentical(reset($data), $target, 'Autocomplete returns only the expected matching entity.');
+
+    // Try to autocomplete a entity label that matches the second entity, and
+    // the first entity  is already typed in the autocomplete (tags) widget.
+    $input = $entity_1->name->value . ' (1), 10/17';
+    $data = $this->getAutocompleteResult($input);
+    $this->assertIdentical($data[0]['label'], Html::escape($entity_2->name->value), 'Autocomplete returned the second matching entity');
+
+    // Try to autocomplete a entity label with both a comma, a slash and markup.
+    $input = '"label with, and /"';
+    $data = $this->getAutocompleteResult($input);
+    $n = $entity_3->name->value . ' (3)';
+    // Entity labels containing commas or quotes must be wrapped in quotes.
+    $n = Tags::encode($n);
+    $target = array(
+      'value' => $n,
+      'label' => Html::escape($entity_3->name->value),
+    );
+    $this->assertIdentical(reset($data), $target, 'Autocomplete returns an entity label containing a comma and a slash.');
+  }
+
+  /**
+   * Tests that missing or invalid selection setting key are handled correctly.
+   */
+  public function testSelectionSettingsHandling() {
+    $entity_reference_controller = EntityAutocompleteController::create($this->container);
+    $request = Request::create('entity_reference_autocomplete/' . $this->entityType . '/default');
+    $request->query->set('q', $this->randomString());
+
+    try {
+      // Pass an invalid selection settings key (i.e. one that does not exist
+      // in the key/value store).
+      $selection_settings_key = $this->randomString();
+      $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key);
+
+      $this->fail('Non-existent selection settings key throws an exception.');
+    }
+    catch (AccessDeniedHttpException $e) {
+      $this->pass('Non-existent selection settings key throws an exception.');
+    }
+
+    try {
+      // Generate a valid hash key but store a modified settings array.
+      $selection_settings = [];
+      $selection_settings_key = Crypt::hmacBase64(serialize($selection_settings) . $this->entityType . 'default', Settings::getHashSalt());
+
+      $selection_settings[$this->randomMachineName()] = $this->randomString();
+      \Drupal::keyValue('entity_autocomplete')->set($selection_settings_key, $selection_settings);
+
+      $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key);
+    }
+    catch (AccessDeniedHttpException $e) {
+      if ($e->getMessage() == 'Invalid selection settings key.') {
+        $this->pass('Invalid selection settings key throws an exception.');
+      }
+      else {
+        $this->fail('Invalid selection settings key throws an exception.');
+      }
+    }
+
+  }
+
+  /**
+   * Returns the result of an Entity reference autocomplete request.
+   *
+   * @param string $input
+   *   The label of the entity to query by.
+   *
+   * @return mixed
+   *  The JSON value encoded in its appropriate PHP type.
+   */
+  protected function getAutocompleteResult($input) {
+    $request = Request::create('entity_reference_autocomplete/' . $this->entityType . '/default');
+    $request->query->set('q', $input);
+
+    $selection_settings = [];
+    $selection_settings_key = Crypt::hmacBase64(serialize($selection_settings) . $this->entityType . 'default', Settings::getHashSalt());
+    \Drupal::keyValue('entity_autocomplete')->set($selection_settings_key, $selection_settings);
+
+    $entity_reference_controller = EntityAutocompleteController::create($this->container);
+    $result = $entity_reference_controller->handleAutocomplete($request, $this->entityType, 'default', $selection_settings_key)->getContent();
+
+    return Json::decode($result);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php
new file mode 100644
index 0000000..0d69d71
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityBundleFieldTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityBundleFieldTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+/**
+ * Tests adding a custom bundle field.
+ *
+ * @group Entity
+ */
+class EntityBundleFieldTest extends EntityKernelTestBase  {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('entity_schema_test');
+
+  /**
+   * The module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The database connection used.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('user', array('users_data'));
+    $this->moduleHandler = $this->container->get('module_handler');
+    $this->database = $this->container->get('database');
+  }
+
+  /**
+   * Tests making use of a custom bundle field.
+   */
+  public function testCustomBundleFieldUsage() {
+    entity_test_create_bundle('custom');
+
+    // Check that an entity with bundle entity_test does not have the custom
+    // field.
+    $storage = $this->entityManager->getStorage('entity_test');
+    $entity = $storage->create([
+      'type' => 'entity_test',
+    ]);
+    $this->assertFalse($entity->hasField('custom_bundle_field'));
+
+    // Check that the custom bundle has the defined custom field and check
+    // saving and deleting of custom field data.
+    $entity = $storage->create([
+      'type' => 'custom',
+    ]);
+    $this->assertTrue($entity->hasField('custom_bundle_field'));
+
+    // Ensure that the field exists in the field map.
+    $field_map = \Drupal::entityManager()->getFieldMap();
+    $this->assertEqual($field_map['entity_test']['custom_bundle_field'], ['type' => 'string', 'bundles' => ['custom' => 'custom']]);
+
+    $entity->custom_bundle_field->value = 'swanky';
+    $entity->save();
+    $storage->resetCache();
+    $entity = $storage->load($entity->id());
+    $this->assertEqual($entity->custom_bundle_field->value, 'swanky', 'Entity was saved correctly');
+
+    $entity->custom_bundle_field->value = 'cozy';
+    $entity->save();
+    $storage->resetCache();
+    $entity = $storage->load($entity->id());
+    $this->assertEqual($entity->custom_bundle_field->value, 'cozy', 'Entity was updated correctly.');
+
+    $entity->delete();
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = $storage->getTableMapping();
+    $table = $table_mapping->getDedicatedDataTableName($entity->getFieldDefinition('custom_bundle_field'));
+    $result = $this->database->select($table, 'f')
+      ->fields('f')
+      ->condition('f.entity_id', $entity->id())
+      ->execute();
+    $this->assertFalse($result->fetchAssoc(), 'Field data has been deleted');
+
+    // Create another entity to test that values are marked as deleted when a
+    // bundle is deleted.
+    $entity = $storage->create(['type' => 'custom', 'custom_bundle_field' => 'new']);
+    $entity->save();
+    entity_test_delete_bundle('custom');
+
+    $table = $table_mapping->getDedicatedDataTableName($entity->getFieldDefinition('custom_bundle_field'));
+    $result = $this->database->select($table, 'f')
+      ->condition('f.entity_id', $entity->id())
+      ->condition('deleted', 1)
+      ->countQuery()
+      ->execute();
+    $this->assertEqual(1, $result->fetchField(), 'Field data has been deleted');
+
+    // Ensure that the field no longer exists in the field map.
+    $field_map = \Drupal::entityManager()->getFieldMap();
+    $this->assertFalse(isset($field_map['entity_test']['custom_bundle_field']));
+
+    // @todo Test field purge and table deletion once supported. See
+    //   https://www.drupal.org/node/2282119.
+    // $this->assertFalse($this->database->schema()->tableExists($table), 'Custom field table was deleted');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
new file mode 100644
index 0000000..6bd70f1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
@@ -0,0 +1,564 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityCrudHookTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\comment\Entity\Comment;
+use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\comment\Tests\CommentTestTrait;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\block\Entity\Block;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\node\Entity\NodeType;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\node\Entity\Node;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\user\Entity\User;
+use Drupal\file\Entity\File;
+
+/**
+ * Tests the invocation of hooks when creating, inserting, loading, updating or
+ * deleting an entity.
+ *
+ * Tested hooks are:
+ * - hook_entity_insert() and hook_ENTITY_TYPE_insert()
+ * - hook_entity_load() and hook_ENTITY_TYPE_load()
+ * - hook_entity_update() and hook_ENTITY_TYPE_update()
+ * - hook_entity_predelete() and hook_ENTITY_TYPE_predelete()
+ * - hook_entity_delete() and hook_ENTITY_TYPE_delete()
+ *
+ * These hooks are each tested for several entity types.
+ *
+ * @group Entity
+ */
+class EntityCrudHookTest extends EntityKernelTestBase {
+
+  use CommentTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('block', 'block_test', 'entity_crud_hook_test', 'file', 'taxonomy', 'node', 'comment');
+
+  protected $ids = array();
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('user', array('users_data'));
+    $this->installSchema('file', array('file_usage'));
+    $this->installSchema('node', array('node_access'));
+    $this->installSchema('comment', array('comment_entity_statistics'));
+    $this->installConfig(['node', 'comment']);
+  }
+
+  /**
+   * Checks the order of CRUD hook execution messages.
+   *
+   * entity_crud_hook_test.module implements all core entity CRUD hooks and
+   * stores a message for each in $GLOBALS['entity_crud_hook_test'].
+   *
+   * @param $messages
+   *   An array of plain-text messages in the order they should appear.
+   */
+  protected function assertHookMessageOrder($messages) {
+    $positions = array();
+    foreach ($messages as $message) {
+      // Verify that each message is found and record its position.
+      $position = array_search($message, $GLOBALS['entity_crud_hook_test']);
+      if ($this->assertTrue($position !== FALSE, $message)) {
+        $positions[] = $position;
+      }
+    }
+
+    // Sort the positions and ensure they remain in the same order.
+    $sorted = $positions;
+    sort($sorted);
+    $this->assertTrue($sorted == $positions, 'The hook messages appear in the correct order.');
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on blocks.
+   */
+  public function testBlockHooks() {
+    $entity = Block::create(array(
+      'id' => 'stark_test_html',
+      'plugin' => 'test_html',
+      'theme' => 'stark',
+    ));
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_block_create called',
+      'entity_crud_hook_test_entity_create called for type block',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $entity->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_block_presave called',
+      'entity_crud_hook_test_entity_presave called for type block',
+      'entity_crud_hook_test_block_insert called',
+      'entity_crud_hook_test_entity_insert called for type block',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $entity = Block::load($entity->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type block',
+      'entity_crud_hook_test_block_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $entity->label = 'New label';
+    $entity->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_block_presave called',
+      'entity_crud_hook_test_entity_presave called for type block',
+      'entity_crud_hook_test_block_update called',
+      'entity_crud_hook_test_entity_update called for type block',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $entity->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_block_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type block',
+      'entity_crud_hook_test_block_delete called',
+      'entity_crud_hook_test_entity_delete called for type block',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on comments.
+   */
+  public function testCommentHooks() {
+    $account = $this->createUser();
+    NodeType::create([
+      'type' => 'article',
+      'name' => 'Article',
+    ])->save();
+    $this->addDefaultCommentField('node', 'article', 'comment', CommentItemInterface::OPEN);
+
+    $node = Node::create([
+      'uid' => $account->id(),
+      'type' => 'article',
+      'title' => 'Test node',
+      'status' => 1,
+      'promote' => 0,
+      'sticky' => 0,
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'created' => REQUEST_TIME,
+      'changed' => REQUEST_TIME,
+    ]);
+    $node->save();
+    $nid = $node->id();
+    $GLOBALS['entity_crud_hook_test'] = array();
+
+    $comment = Comment::create(array(
+      'cid' => NULL,
+      'pid' => 0,
+      'entity_id' => $nid,
+      'entity_type' => 'node',
+      'field_name' => 'comment',
+      'uid' => $account->id(),
+      'subject' => 'Test comment',
+      'created' => REQUEST_TIME,
+      'changed' => REQUEST_TIME,
+      'status' => 1,
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ));
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_comment_create called',
+      'entity_crud_hook_test_entity_create called for type comment',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $comment->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_comment_presave called',
+      'entity_crud_hook_test_entity_presave called for type comment',
+      'entity_crud_hook_test_comment_insert called',
+      'entity_crud_hook_test_entity_insert called for type comment',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $comment = Comment::load($comment->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type comment',
+      'entity_crud_hook_test_comment_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $comment->setSubject('New subject');
+    $comment->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_comment_presave called',
+      'entity_crud_hook_test_entity_presave called for type comment',
+      'entity_crud_hook_test_comment_update called',
+      'entity_crud_hook_test_entity_update called for type comment',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $comment->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_comment_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type comment',
+      'entity_crud_hook_test_comment_delete called',
+      'entity_crud_hook_test_entity_delete called for type comment',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on files.
+   */
+  public function testFileHooks() {
+    $this->installEntitySchema('file');
+
+    $url = 'public://entity_crud_hook_test.file';
+    file_put_contents($url, 'Test test test');
+    $file = File::create([
+      'fid' => NULL,
+      'uid' => 1,
+      'filename' => 'entity_crud_hook_test.file',
+      'uri' => $url,
+      'filemime' => 'text/plain',
+      'filesize' => filesize($url),
+      'status' => 1,
+      'created' => REQUEST_TIME,
+      'changed' => REQUEST_TIME,
+    ]);
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_file_create called',
+      'entity_crud_hook_test_entity_create called for type file',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $file->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_file_presave called',
+      'entity_crud_hook_test_entity_presave called for type file',
+      'entity_crud_hook_test_file_insert called',
+      'entity_crud_hook_test_entity_insert called for type file',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $file = File::load($file->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type file',
+      'entity_crud_hook_test_file_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $file->setFilename('new.entity_crud_hook_test.file');
+    $file->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_file_presave called',
+      'entity_crud_hook_test_entity_presave called for type file',
+      'entity_crud_hook_test_file_update called',
+      'entity_crud_hook_test_entity_update called for type file',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $file->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_file_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type file',
+      'entity_crud_hook_test_file_delete called',
+      'entity_crud_hook_test_entity_delete called for type file',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on nodes.
+   */
+  public function testNodeHooks() {
+    $account = $this->createUser();
+
+    $node = Node::create([
+      'uid' => $account->id(),
+      'type' => 'article',
+      'title' => 'Test node',
+      'status' => 1,
+      'promote' => 0,
+      'sticky' => 0,
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'created' => REQUEST_TIME,
+      'changed' => REQUEST_TIME,
+    ]);
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_node_create called',
+      'entity_crud_hook_test_entity_create called for type node',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $node->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_node_presave called',
+      'entity_crud_hook_test_entity_presave called for type node',
+      'entity_crud_hook_test_node_insert called',
+      'entity_crud_hook_test_entity_insert called for type node',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $node = Node::load($node->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type node',
+      'entity_crud_hook_test_node_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $node->title = 'New title';
+    $node->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_node_presave called',
+      'entity_crud_hook_test_entity_presave called for type node',
+      'entity_crud_hook_test_node_update called',
+      'entity_crud_hook_test_entity_update called for type node',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $node->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_node_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type node',
+      'entity_crud_hook_test_node_delete called',
+      'entity_crud_hook_test_entity_delete called for type node',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on taxonomy terms.
+   */
+  public function testTaxonomyTermHooks() {
+    $this->installEntitySchema('taxonomy_term');
+
+    $vocabulary = Vocabulary::create([
+      'name' => 'Test vocabulary',
+      'vid' => 'test',
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'description' => NULL,
+      'module' => 'entity_crud_hook_test',
+    ]);
+    $vocabulary->save();
+    $GLOBALS['entity_crud_hook_test'] = array();
+
+    $term = Term::create([
+      'vid' => $vocabulary->id(),
+      'name' => 'Test term',
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'description' => NULL,
+      'format' => 1,
+    ]);
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_term_create called',
+      'entity_crud_hook_test_entity_create called for type taxonomy_term',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $term->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_term_presave called',
+      'entity_crud_hook_test_entity_presave called for type taxonomy_term',
+      'entity_crud_hook_test_taxonomy_term_insert called',
+      'entity_crud_hook_test_entity_insert called for type taxonomy_term',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $term = Term::load($term->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type taxonomy_term',
+      'entity_crud_hook_test_taxonomy_term_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $term->setName('New name');
+    $term->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_term_presave called',
+      'entity_crud_hook_test_entity_presave called for type taxonomy_term',
+      'entity_crud_hook_test_taxonomy_term_update called',
+      'entity_crud_hook_test_entity_update called for type taxonomy_term',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $term->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_term_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type taxonomy_term',
+      'entity_crud_hook_test_taxonomy_term_delete called',
+      'entity_crud_hook_test_entity_delete called for type taxonomy_term',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on taxonomy vocabularies.
+   */
+  public function testTaxonomyVocabularyHooks() {
+    $this->installEntitySchema('taxonomy_term');
+
+    $vocabulary = Vocabulary::create([
+      'name' => 'Test vocabulary',
+      'vid' => 'test',
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'description' => NULL,
+      'module' => 'entity_crud_hook_test',
+    ]);
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_vocabulary_create called',
+      'entity_crud_hook_test_entity_create called for type taxonomy_vocabulary',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $vocabulary->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_vocabulary_presave called',
+      'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
+      'entity_crud_hook_test_taxonomy_vocabulary_insert called',
+      'entity_crud_hook_test_entity_insert called for type taxonomy_vocabulary',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $vocabulary = Vocabulary::load($vocabulary->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type taxonomy_vocabulary',
+      'entity_crud_hook_test_taxonomy_vocabulary_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $vocabulary->set('name', 'New name');
+    $vocabulary->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_vocabulary_presave called',
+      'entity_crud_hook_test_entity_presave called for type taxonomy_vocabulary',
+      'entity_crud_hook_test_taxonomy_vocabulary_update called',
+      'entity_crud_hook_test_entity_update called for type taxonomy_vocabulary',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $vocabulary->delete();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_taxonomy_vocabulary_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type taxonomy_vocabulary',
+      'entity_crud_hook_test_taxonomy_vocabulary_delete called',
+      'entity_crud_hook_test_entity_delete called for type taxonomy_vocabulary',
+    ));
+  }
+
+  /**
+   * Tests hook invocations for CRUD operations on users.
+   */
+  public function testUserHooks() {
+    $account = User::create([
+      'name' => 'Test user',
+      'mail' => 'test@example.com',
+      'created' => REQUEST_TIME,
+      'status' => 1,
+      'language' => 'en',
+    ]);
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_user_create called',
+      'entity_crud_hook_test_entity_create called for type user',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $account->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_user_presave called',
+      'entity_crud_hook_test_entity_presave called for type user',
+      'entity_crud_hook_test_user_insert called',
+      'entity_crud_hook_test_entity_insert called for type user',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    User::load($account->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_entity_load called for type user',
+      'entity_crud_hook_test_user_load called',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    $account->name = 'New name';
+    $account->save();
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_user_presave called',
+      'entity_crud_hook_test_entity_presave called for type user',
+      'entity_crud_hook_test_user_update called',
+      'entity_crud_hook_test_entity_update called for type user',
+    ));
+
+    $GLOBALS['entity_crud_hook_test'] = array();
+    user_delete($account->id());
+
+    $this->assertHookMessageOrder(array(
+      'entity_crud_hook_test_user_predelete called',
+      'entity_crud_hook_test_entity_predelete called for type user',
+      'entity_crud_hook_test_user_delete called',
+      'entity_crud_hook_test_entity_delete called for type user',
+    ));
+  }
+
+  /**
+   * Tests rollback from failed entity save.
+   */
+  function testEntityRollback() {
+    // Create a block.
+    try {
+      EntityTest::create(array('name' => 'fail_insert'))->save();
+      $this->fail('Expected exception has not been thrown.');
+    }
+    catch (\Exception $e) {
+      $this->pass('Expected exception has been thrown.');
+    }
+
+    if (Database::getConnection()->supportsTransactions()) {
+      // Check that the block does not exist in the database.
+      $ids = \Drupal::entityQuery('entity_test')->condition('name', 'fail_insert')->execute();
+      $this->assertTrue(empty($ids), 'Transactions supported, and entity not found in database.');
+    }
+    else {
+      // Check that the block exists in the database.
+      $ids = \Drupal::entityQuery('entity_test')->condition('name', 'fail_insert')->execute();
+      $this->assertFalse(empty($ids), 'Transactions not supported, and entity found in database.');
+    }
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
new file mode 100644
index 0000000..e3b3b41
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
@@ -0,0 +1,814 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityDefinitionUpdateTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\DatabaseExceptionWrapper;
+use Drupal\Core\Database\IntegrityConstraintViolationException;
+use Drupal\Core\Entity\ContentEntityType;
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Entity\EntityTypeEvents;
+use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldStorageDefinitionEvents;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTestUpdate;
+use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
+
+/**
+ * Tests EntityDefinitionUpdateManager functionality.
+ *
+ * @group Entity
+ */
+class EntityDefinitionUpdateTest extends EntityKernelTestBase {
+
+  use EntityDefinitionTestTrait;
+
+  /**
+   * The entity definition update manager.
+   *
+   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
+   */
+  protected $entityDefinitionUpdateManager;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
+    $this->database = $this->container->get('database');
+
+    // Install every entity type's schema that wasn't installed in the parent
+    // method.
+    foreach (array_diff_key($this->entityManager->getDefinitions(), array_flip(array('user', 'entity_test'))) as $entity_type_id => $entity_type) {
+      $this->installEntitySchema($entity_type_id);
+    }
+  }
+
+  /**
+   * Tests that new entity type definitions are correctly handled.
+   */
+  public function testNewEntityType() {
+    $entity_type_id = 'entity_test_new';
+    $schema = $this->database->schema();
+
+    // Check that the "entity_test_new" is not defined.
+    $entity_types = $this->entityManager->getDefinitions();
+    $this->assertFalse(isset($entity_types[$entity_type_id]), 'The "entity_test_new" entity type does not exist.');
+    $this->assertFalse($schema->tableExists($entity_type_id), 'Schema for the "entity_test_new" entity type does not exist.');
+
+    // Check that the "entity_test_new" is now defined and the related schema
+    // has been created.
+    $this->enableNewEntityType();
+    $entity_types = $this->entityManager->getDefinitions();
+    $this->assertTrue(isset($entity_types[$entity_type_id]), 'The "entity_test_new" entity type exists.');
+    $this->assertTrue($schema->tableExists($entity_type_id), 'Schema for the "entity_test_new" entity type has been created.');
+  }
+
+  /**
+   * Tests when no definition update is needed.
+   */
+  public function testNoUpdates() {
+    // Ensure that the definition update manager reports no updates.
+    $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that no updates are needed.');
+    $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), array(), 'EntityDefinitionUpdateManager reports an empty change summary.');
+
+    // Ensure that applyUpdates() runs without error (it's not expected to do
+    // anything when there aren't updates).
+    $this->entityDefinitionUpdateManager->applyUpdates();
+  }
+
+  /**
+   * Tests updating entity schema when there are no existing entities.
+   */
+  public function testEntityTypeUpdateWithoutData() {
+    // The 'entity_test_update' entity type starts out non-revisionable, so
+    // ensure the revision table hasn't been created during setUp().
+    $this->assertFalse($this->database->schema()->tableExists('entity_test_update_revision'), 'Revision table not created for entity_test_update.');
+
+    // Update it to be revisionable and ensure the definition update manager
+    // reports that an update is needed.
+    $this->updateEntityTypeToRevisionable();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.');
+
+    // Run the update and ensure the revision table is created.
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->tableExists('entity_test_update_revision'), 'Revision table created for entity_test_update.');
+  }
+
+  /**
+   * Tests updating entity schema when there are existing entities.
+   */
+  public function testEntityTypeUpdateWithData() {
+    // Save an entity.
+    $this->entityManager->getStorage('entity_test_update')->create()->save();
+
+    // Update the entity type to be revisionable and try to apply the update.
+    // It's expected to throw an exception.
+    $this->updateEntityTypeToRevisionable();
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail('EntityStorageException thrown when trying to apply an update that requires data migration.');
+    }
+    catch (EntityStorageException $e) {
+      $this->pass('EntityStorageException thrown when trying to apply an update that requires data migration.');
+    }
+  }
+
+  /**
+   * Tests creating, updating, and deleting a base field if no entities exist.
+   */
+  public function testBaseFieldCreateUpdateDeleteWithoutData() {
+    // Add a base field, ensure the update manager reports it, and the update
+    // creates its schema.
+    $this->addBaseField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be installed.', ['%field_name' => t('A new base field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.');
+
+    // Add an index on the base field, ensure the update manager reports it,
+    // and the update creates it.
+    $this->addBaseFieldIndex();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index created.');
+
+    // Remove the above index, ensure the update manager reports it, and the
+    // update deletes it.
+    $this->removeBaseFieldIndex();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index deleted.');
+
+    // Update the type of the base field from 'string' to 'text', ensure the
+    // update manager reports it, and the update adjusts the schema
+    // accordingly.
+    $this->modifyBaseField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be updated.', ['%field_name' => t('A new base field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Original column deleted in shared table for new_base_field.');
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__value'), 'Value column created in shared table for new_base_field.');
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__format'), 'Format column created in shared table for new_base_field.');
+
+    // Remove the base field, ensure the update manager reports it, and the
+    // update deletes the schema.
+    $this->removeBaseField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be uninstalled.', ['%field_name' => t('A new base field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_value'), 'Value column deleted from shared table for new_base_field.');
+    $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_format'), 'Format column deleted from shared table for new_base_field.');
+  }
+
+  /**
+   * Tests creating, updating, and deleting a bundle field if no entities exist.
+   */
+  public function testBundleFieldCreateUpdateDeleteWithoutData() {
+    // Add a bundle field, ensure the update manager reports it, and the update
+    // creates its schema.
+    $this->addBundleField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be installed.', ['%field_name' => t('A new bundle field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.');
+
+    // Update the type of the base field from 'string' to 'text', ensure the
+    // update manager reports it, and the update adjusts the schema
+    // accordingly.
+    $this->modifyBundleField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => [
+        t('The %field_name field needs to be updated.', ['%field_name' => t('A new bundle field')]),
+      ],
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update__new_bundle_field', 'new_bundle_field_format'), 'Format column created in dedicated table for new_base_field.');
+
+    // Remove the bundle field, ensure the update manager reports it, and the
+    // update deletes the schema.
+    $this->removeBundleField();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %field_name field needs to be uninstalled.', ['%field_name' => t('A new bundle field')]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.');
+  }
+
+  /**
+   * Tests creating and deleting a base field if entities exist.
+   *
+   * This tests deletion when there are existing entities, but not existing data
+   * for the field being deleted.
+   *
+   * @see testBaseFieldDeleteWithExistingData()
+   */
+  public function testBaseFieldCreateDeleteWithExistingEntities() {
+    // Save an entity.
+    $name = $this->randomString();
+    $storage = $this->entityManager->getStorage('entity_test_update');
+    $entity = $storage->create(array('name' => $name));
+    $entity->save();
+
+    // Add a base field and run the update. Ensure the base field's column is
+    // created and the prior saved entity data is still there.
+    $this->addBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $schema_handler = $this->database->schema();
+    $this->assertTrue($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.');
+    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
+    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.');
+
+    // Remove the base field and run the update. Ensure the base field's column
+    // is deleted and the prior saved entity data is still there.
+    $this->removeBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column deleted from shared table for new_base_field.');
+    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
+    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.');
+
+    // Add a base field with a required property and run the update. Ensure
+    // 'not null' is not applied and thus no exception is thrown.
+    $this->addBaseField('shape_required');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $assert = $schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && $schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
+    $this->assertTrue($assert, 'Columns created in shared table for new_base_field.');
+
+    // Recreate the field after emptying the base table and check that its
+    // columns are not 'not null'.
+    // @todo Revisit this test when allowing for required storage field
+    //   definitions. See https://www.drupal.org/node/2390495.
+    $entity->delete();
+    $this->removeBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $assert = !$schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && !$schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
+    $this->assert($assert, 'Columns removed from the shared table for new_base_field.');
+    $this->addBaseField('shape_required');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $assert = $schema_handler->fieldExists('entity_test_update', 'new_base_field__shape') && $schema_handler->fieldExists('entity_test_update', 'new_base_field__color');
+    $this->assertTrue($assert, 'Columns created again in shared table for new_base_field.');
+    $entity = $storage->create(array('name' => $name));
+    $entity->save();
+    $this->pass('The new_base_field columns are still nullable');
+  }
+
+  /**
+   * Tests creating and deleting a bundle field if entities exist.
+   *
+   * This tests deletion when there are existing entities, but not existing data
+   * for the field being deleted.
+   *
+   * @see testBundleFieldDeleteWithExistingData()
+   */
+  public function testBundleFieldCreateDeleteWithExistingEntities() {
+    // Save an entity.
+    $name = $this->randomString();
+    $storage = $this->entityManager->getStorage('entity_test_update');
+    $entity = $storage->create(array('name' => $name));
+    $entity->save();
+
+    // Add a bundle field and run the update. Ensure the bundle field's table
+    // is created and the prior saved entity data is still there.
+    $this->addBundleField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $schema_handler = $this->database->schema();
+    $this->assertTrue($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.');
+    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
+    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.');
+
+    // Remove the base field and run the update. Ensure the bundle field's
+    // table is deleted and the prior saved entity data is still there.
+    $this->removeBundleField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.');
+    $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id());
+    $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.');
+
+    // Test that required columns are created as 'not null'.
+    $this->addBundleField('shape_required');
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $message = 'The new_bundle_field_shape column is not nullable.';
+    $values = array(
+      'bundle' => $entity->bundle(),
+      'deleted'=> 0,
+      'entity_id' => $entity->id(),
+      'revision_id' => $entity->id(),
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'delta' => 0,
+      'new_bundle_field_color' => $this->randomString(),
+    );
+    try {
+      // Try to insert a record without providing a value for the 'not null'
+      // column. This should fail.
+      $this->database->insert('entity_test_update__new_bundle_field')
+        ->fields($values)
+        ->execute();
+      $this->fail($message);
+    }
+    catch (\RuntimeException $e) {
+      if ($e instanceof DatabaseExceptionWrapper || $e instanceof IntegrityConstraintViolationException) {
+        // Now provide a value for the 'not null' column. This is expected to
+        // succeed.
+        $values['new_bundle_field_shape'] = $this->randomString();
+        $this->database->insert('entity_test_update__new_bundle_field')
+          ->fields($values)
+          ->execute();
+        $this->pass($message);
+      } else {
+        // Keep throwing it.
+        throw $e;
+      }
+    }
+  }
+
+  /**
+   * Tests deleting a base field when it has existing data.
+   */
+  public function testBaseFieldDeleteWithExistingData() {
+    // Add the base field and run the update.
+    $this->addBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    // Save an entity with the base field populated.
+    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
+
+    // Remove the base field and apply updates. It's expected to throw an
+    // exception.
+    // @todo Revisit that expectation once purging is implemented for
+    //   all fields: https://www.drupal.org/node/2282119.
+    $this->removeBaseField();
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
+    }
+  }
+
+  /**
+   * Tests deleting a bundle field when it has existing data.
+   */
+  public function testBundleFieldDeleteWithExistingData() {
+    // Add the bundle field and run the update.
+    $this->addBundleField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    // Save an entity with the bundle field populated.
+    entity_test_create_bundle('custom');
+    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
+
+    // Remove the bundle field and apply updates. It's expected to throw an
+    // exception.
+    // @todo Revisit that expectation once purging is implemented for
+    //   all fields: https://www.drupal.org/node/2282119.
+    $this->removeBundleField();
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to apply an update that deletes a non-purgeable field with data.');
+    }
+  }
+
+  /**
+   * Tests updating a base field when it has existing data.
+   */
+  public function testBaseFieldUpdateWithExistingData() {
+    // Add the base field and run the update.
+    $this->addBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    // Save an entity with the base field populated.
+    $this->entityManager->getStorage('entity_test_update')->create(array('new_base_field' => 'foo'))->save();
+
+    // Change the field's field type and apply updates. It's expected to
+    // throw an exception.
+    $this->modifyBaseField();
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
+    }
+  }
+
+  /**
+   * Tests updating a bundle field when it has existing data.
+   */
+  public function testBundleFieldUpdateWithExistingData() {
+    // Add the bundle field and run the update.
+    $this->addBundleField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    // Save an entity with the bundle field populated.
+    entity_test_create_bundle('custom');
+    $this->entityManager->getStorage('entity_test_update')->create(array('type' => 'test_bundle', 'new_bundle_field' => 'foo'))->save();
+
+    // Change the field's field type and apply updates. It's expected to
+    // throw an exception.
+    $this->modifyBundleField();
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass('FieldStorageDefinitionUpdateForbiddenException thrown when trying to update a field schema that has data.');
+    }
+  }
+
+  /**
+   * Tests creating and deleting a multi-field index when there are no existing entities.
+   */
+  public function testEntityIndexCreateDeleteWithoutData() {
+    // Add an entity index and ensure the update manager reports that as an
+    // update to the entity type.
+    $this->addEntityIndex();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+
+    // Run the update and ensure the new index is created.
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created.');
+
+    // Remove the index and ensure the update manager reports that as an
+    // update to the entity type.
+    $this->removeEntityIndex();
+    $this->assertTrue($this->entityDefinitionUpdateManager->needsUpdates(), 'EntityDefinitionUpdateManager reports that updates are needed.');
+    $expected = array(
+      'entity_test_update' => array(
+        t('The %entity_type entity type needs to be updated.', ['%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel()]),
+      ),
+    );
+    $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.');
+
+    // Run the update and ensure the index is deleted.
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index deleted.');
+
+    // Test that composite indexes are handled correctly when dropping and
+    // re-creating one of their columns.
+    $this->addEntityIndex();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $storage_definition = $this->entityDefinitionUpdateManager->getFieldStorageDefinition('name', 'entity_test_update');
+    $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($storage_definition);
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created.');
+    $this->entityDefinitionUpdateManager->uninstallFieldStorageDefinition($storage_definition);
+    $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index deleted.');
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('name', 'entity_test_update', 'entity_test', $storage_definition);
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index created again.');
+  }
+
+  /**
+   * Tests creating a multi-field index when there are existing entities.
+   */
+  public function testEntityIndexCreateWithData() {
+    // Save an entity.
+    $name = $this->randomString();
+    $entity = $this->entityManager->getStorage('entity_test_update')->create(array('name' => $name));
+    $entity->save();
+
+    // Add an entity index, run the update. Ensure that the index is created
+    // despite having data.
+    $this->addEntityIndex();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__new_index'), 'Index added.');
+  }
+
+  /**
+   * Tests entity type and field storage definition events.
+   */
+  public function testDefinitionEvents() {
+    /** @var \Drupal\entity_test\EntityTestDefinitionSubscriber $event_subscriber */
+    $event_subscriber = $this->container->get('entity_test.definition.subscriber');
+    $event_subscriber->enableEventTracking();
+
+    // Test field storage definition events.
+    $storage_definition = current($this->entityManager->getFieldStorageDefinitions('entity_test_rev'));
+    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::DELETE), 'Entity type delete was not dispatched yet.');
+    $this->entityManager->onFieldStorageDefinitionDelete($storage_definition);
+    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::DELETE), 'Entity type delete event successfully dispatched.');
+    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::CREATE), 'Entity type create was not dispatched yet.');
+    $this->entityManager->onFieldStorageDefinitionCreate($storage_definition);
+    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::CREATE), 'Entity type create event successfully dispatched.');
+    $this->assertFalse($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::UPDATE), 'Entity type update was not dispatched yet.');
+    $this->entityManager->onFieldStorageDefinitionUpdate($storage_definition, $storage_definition);
+    $this->assertTrue($event_subscriber->hasEventFired(FieldStorageDefinitionEvents::UPDATE), 'Entity type update event successfully dispatched.');
+
+    // Test entity type events.
+    $entity_type = $this->entityManager->getDefinition('entity_test_rev');
+    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::CREATE), 'Entity type create was not dispatched yet.');
+    $this->entityManager->onEntityTypeCreate($entity_type);
+    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::CREATE), 'Entity type create event successfully dispatched.');
+    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::UPDATE), 'Entity type update was not dispatched yet.');
+    $this->entityManager->onEntityTypeUpdate($entity_type, $entity_type);
+    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::UPDATE), 'Entity type update event successfully dispatched.');
+    $this->assertFalse($event_subscriber->hasEventFired(EntityTypeEvents::DELETE), 'Entity type delete was not dispatched yet.');
+    $this->entityManager->onEntityTypeDelete($entity_type);
+    $this->assertTrue($event_subscriber->hasEventFired(EntityTypeEvents::DELETE), 'Entity type delete event successfully dispatched.');
+  }
+
+  /**
+   * Tests updating entity schema and creating a base field.
+   *
+   * This tests updating entity schema and creating a base field at the same
+   * time when there are no existing entities.
+   */
+  public function testEntityTypeSchemaUpdateAndBaseFieldCreateWithoutData() {
+    $this->updateEntityTypeToRevisionable();
+    $this->addBaseField();
+    $message = 'Successfully updated entity schema and created base field at the same time.';
+    // Entity type updates create base fields as well, thus make sure doing both
+    // at the same time does not lead to errors due to the base field being
+    // created twice.
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->pass($message);
+    }
+    catch (\Exception $e) {
+      $this->fail($message);
+      throw $e;
+    }
+  }
+
+  /**
+   * Tests updating entity schema and creating a revisionable base field.
+   *
+   * This tests updating entity schema and creating a revisionable base field
+   * at the same time when there are no existing entities.
+   */
+  public function testEntityTypeSchemaUpdateAndRevisionableBaseFieldCreateWithoutData() {
+    $this->updateEntityTypeToRevisionable();
+    $this->addRevisionableBaseField();
+    $message = 'Successfully updated entity schema and created revisionable base field at the same time.';
+    // Entity type updates create base fields as well, thus make sure doing both
+    // at the same time does not lead to errors due to the base field being
+    // created twice.
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->pass($message);
+    }
+    catch (\Exception $e) {
+      $this->fail($message);
+      throw $e;
+    }
+  }
+
+  /**
+   * Tests applying single updates.
+   */
+  public function testSingleActionCalls() {
+    $db_schema = $this->database->schema();
+
+    // Ensure that a non-existing entity type cannot be installed.
+    $message = 'A non-existing entity type cannot be installed';
+    try {
+      $this->entityDefinitionUpdateManager->installEntityType(new ContentEntityType(['id' => 'foo']));
+      $this->fail($message);
+    }
+    catch (PluginNotFoundException $e) {
+      $this->pass($message);
+    }
+
+    // Ensure that a field cannot be installed on non-existing entity type.
+    $message = 'A field cannot be installed on a non-existing entity type';
+    try {
+      $storage_definition = BaseFieldDefinition::create('string')
+        ->setLabel(t('A new revisionable base field'))
+        ->setRevisionable(TRUE);
+      $this->entityDefinitionUpdateManager->installFieldStorageDefinition('bar', 'foo', 'entity_test', $storage_definition);
+      $this->fail($message);
+    }
+    catch (PluginNotFoundException $e) {
+      $this->pass($message);
+    }
+
+    // Ensure that a non-existing field cannot be installed.
+    $storage_definition = BaseFieldDefinition::create('string')
+      ->setLabel(t('A new revisionable base field'))
+      ->setRevisionable(TRUE);
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('bar', 'entity_test_update', 'entity_test', $storage_definition);
+    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'bar'), "A non-existing field cannot be installed.");
+
+    // Ensure that installing an existing entity type is a no-op.
+    $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test_update');
+    $this->entityDefinitionUpdateManager->installEntityType($entity_type);
+    $this->assertTrue($db_schema->tableExists('entity_test_update'), 'Installing an existing entity type is a no-op');
+
+    // Create a new base field.
+    $this->addRevisionableBaseField();
+    $storage_definition = BaseFieldDefinition::create('string')
+      ->setLabel(t('A new revisionable base field'))
+      ->setRevisionable(TRUE);
+    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' does not exist before applying the update.");
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $storage_definition);
+    $this->assertTrue($db_schema->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
+
+    // Ensure that installing an existing field is a no-op.
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition('new_base_field', 'entity_test_update', 'entity_test', $storage_definition);
+    $this->assertTrue($db_schema->fieldExists('entity_test_update', 'new_base_field'), 'Installing an existing field is a no-op');
+
+    // Update an existing field schema.
+    $this->modifyBaseField();
+    $storage_definition = BaseFieldDefinition::create('text')
+      ->setName('new_base_field')
+      ->setTargetEntityTypeId('entity_test_update')
+      ->setLabel(t('A new revisionable base field'))
+      ->setRevisionable(TRUE);
+    $this->entityDefinitionUpdateManager->updateFieldStorageDefinition($storage_definition);
+    $this->assertFalse($db_schema->fieldExists('entity_test_update', 'new_base_field'), "Previous schema for 'new_base_field' no longer exists.");
+    $this->assertTrue(
+      $db_schema->fieldExists('entity_test_update', 'new_base_field__value') && $db_schema->fieldExists('entity_test_update', 'new_base_field__format'),
+      "New schema for 'new_base_field' has been created."
+    );
+
+    // Drop an existing field schema.
+    $this->entityDefinitionUpdateManager->uninstallFieldStorageDefinition($storage_definition);
+    $this->assertFalse(
+      $db_schema->fieldExists('entity_test_update', 'new_base_field__value') || $db_schema->fieldExists('entity_test_update', 'new_base_field__format'),
+      "The schema for 'new_base_field' has been dropped."
+    );
+
+    // Make the entity type revisionable.
+    $this->updateEntityTypeToRevisionable();
+    $this->assertFalse($db_schema->tableExists('entity_test_update_revision'), "The 'entity_test_update_revision' does not exist before applying the update.");
+    $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test_update');
+    $keys = $entity_type->getKeys();
+    $keys['revision'] = 'revision_id';
+    $entity_type->set('entity_keys', $keys);
+    $this->entityDefinitionUpdateManager->updateEntityType($entity_type);
+    $this->assertTrue($db_schema->tableExists('entity_test_update_revision'), "The 'entity_test_update_revision' table has been created.");
+  }
+
+  /**
+   * Ensures that a new field and index on a shared table are created.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::createSharedTableSchema
+   */
+  public function testCreateFieldAndIndexOnSharedTable() {
+    $this->addBaseField();
+    $this->addBaseFieldIndex();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), "New field 'new_base_field' has been created on the 'entity_test_update' table.");
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), "New index 'entity_test_update_field__new_base_field' has been created on the 'entity_test_update' table.");
+    // Check index size in for MySQL.
+    if (Database::getConnection()->driver() == 'mysql') {
+      $result = Database::getConnection()->query('SHOW INDEX FROM {entity_test_update} WHERE key_name = \'entity_test_update_field__new_base_field\' and column_name = \'new_base_field\'')->fetchObject();
+      $this->assertEqual(191, $result->Sub_part, 'The index length has been restricted to 191 characters for UTF8MB4 compatibility.');
+    }
+  }
+
+  /**
+   * Ensures that a new entity level index is created when data exists.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema::onEntityTypeUpdate
+   */
+  public function testCreateIndexUsingEntityStorageSchemaWithData() {
+    // Save an entity.
+    $name = $this->randomString();
+    $storage = $this->entityManager->getStorage('entity_test_update');
+    $entity = $storage->create(array('name' => $name));
+    $entity->save();
+
+    // Create an index.
+    $indexes = array(
+      'entity_test_update__type_index' => array('type'),
+    );
+    $this->state->set('entity_test_update.additional_entity_indexes', $indexes);
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update__type_index'), "New index 'entity_test_update__type_index' has been created on the 'entity_test_update' table.");
+    // Check index size in for MySQL.
+    if (Database::getConnection()->driver() == 'mysql') {
+      $result = Database::getConnection()->query('SHOW INDEX FROM {entity_test_update} WHERE key_name = \'entity_test_update__type_index\' and column_name = \'type\'')->fetchObject();
+      $this->assertEqual(191, $result->Sub_part, 'The index length has been restricted to 191 characters for UTF8MB4 compatibility.');
+    }
+  }
+
+  /**
+   * Tests updating a base field when it has existing data.
+   */
+  public function testBaseFieldEntityKeyUpdateWithExistingData() {
+    // Add the base field and run the update.
+    $this->addBaseField();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+
+    // Save an entity with the base field populated.
+    $this->entityManager->getStorage('entity_test_update')->create(['new_base_field' => $this->randomString()])->save();
+
+    // Save an entity with the base field not populated.
+    /** @var \Drupal\entity_test\Entity\EntityTestUpdate $entity */
+    $entity = $this->entityManager->getStorage('entity_test_update')->create();
+    $entity->save();
+
+    // Promote the base field to an entity key. This will trigger the addition
+    // of a NOT NULL constraint.
+    $this->makeBaseFieldEntityKey();
+
+    // Try to apply the update and verify they fail since we have a NULL value.
+    $message = 'An error occurs when trying to enabling NOT NULL constraints with NULL data.';
+    try {
+      $this->entityDefinitionUpdateManager->applyUpdates();
+      $this->fail($message);
+    }
+    catch (EntityStorageException $e) {
+      $this->pass($message);
+    }
+
+    // Check that the update is correctly applied when no NULL data is left.
+    $entity->set('new_base_field', $this->randomString());
+    $entity->save();
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->pass('The update is correctly performed when no NULL data exists.');
+
+    // Check that the update actually applied a NOT NULL constraint.
+    $entity->set('new_base_field', NULL);
+    $message = 'The NOT NULL constraint was correctly applied.';
+    try {
+      $entity->save();
+      $this->fail($message);
+    }
+    catch (EntityStorageException $e) {
+      $this->pass($message);
+    }
+  }
+
+  /**
+   * Check that field schema is correctly handled with long-named fields.
+   */
+  function testLongNameFieldIndexes() {
+    $this->addLongNameBaseField();
+    $entity_type_id = 'entity_test_update';
+    $entity_type = $this->entityManager->getDefinition($entity_type_id);
+    $definitions = EntityTestUpdate::baseFieldDefinitions($entity_type);
+    $name = 'new_long_named_entity_reference_base_field';
+    $this->entityDefinitionUpdateManager->installFieldStorageDefinition($name, $entity_type_id, 'entity_test', $definitions[$name]);
+    $this->assertFalse($this->entityDefinitionUpdateManager->needsUpdates(), 'Entity and field schema data are correctly detected.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
new file mode 100644
index 0000000..bf56c91
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityFieldDefaultValueTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Uuid\Uuid;
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Tests default values for entity fields.
+ *
+ * @group Entity
+ */
+class EntityFieldDefaultValueTest extends EntityKernelTestBase  {
+
+  /**
+   * The UUID object to be used for generating UUIDs.
+   *
+   * @var \Drupal\Component\Uuid\UuidInterface
+   */
+  protected $uuid;
+
+  protected function setUp() {
+    parent::setUp();
+    // Initiate the generator object.
+    $this->uuid = $this->container->get('uuid');
+  }
+
+  /**
+   * Tests default values on entities and fields.
+   */
+  public function testDefaultValues() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->assertDefaultValues($entity_type);
+    }
+  }
+
+  /**
+   * Executes a test set for a defined entity type.
+   *
+   * @param string $entity_type_id
+   *   The entity type to run the tests with.
+   */
+  protected function assertDefaultValues($entity_type_id) {
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type_id)
+      ->create();
+    $definition = $this->entityManager->getDefinition($entity_type_id);
+    $langcode_key = $definition->getKey('langcode');
+    $this->assertEqual($entity->{$langcode_key}->value, 'en', SafeMarkup::format('%entity_type: Default language', array('%entity_type' => $entity_type_id)));
+    $this->assertTrue(Uuid::isValid($entity->uuid->value), SafeMarkup::format('%entity_type: Default UUID', array('%entity_type' => $entity_type_id)));
+    $this->assertEqual($entity->name->getValue(), array(), 'Field has one empty value by default.');
+  }
+
+  /**
+   * Tests custom default value callbacks.
+   */
+  public function testDefaultValueCallback() {
+    $entity = $this->entityManager->getStorage('entity_test_default_value')->create();
+    // The description field has a default value callback for testing, see
+    // entity_test_field_default_value().
+    $string = 'description_' . $entity->language()->getId();
+    $expected = array(
+      array(
+        'shape' => "shape:0:$string",
+        'color' => "color:0:$string",
+      ),
+      array(
+        'shape' => "shape:1:$string",
+        'color' => "color:1:$string",
+      ),
+    );
+    $this->assertEqual($entity->description->getValue(), $expected);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
new file mode 100644
index 0000000..fbb4db6
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
@@ -0,0 +1,752 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityFieldTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
+use Drupal\Core\TypedData\DataDefinitionInterface;
+use Drupal\Core\TypedData\Type\StringInterface;
+use Drupal\Core\TypedData\TypedDataInterface;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+
+/**
+ * Tests the Entity Field API.
+ *
+ * @group Entity
+ */
+class EntityFieldTest extends EntityKernelTestBase  {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter', 'text', 'node', 'user', 'field_test');
+
+  /**
+   * @var string
+   */
+  protected $entityName;
+
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $entityUser;
+
+  /**
+   * @var string
+   */
+  protected $entityFieldText;
+
+  protected function setUp() {
+    parent::setUp();
+
+    foreach (entity_test_entity_types() as $entity_type_id) {
+      // The entity_test schema is installed by the parent.
+      if ($entity_type_id != 'entity_test') {
+        $this->installEntitySchema($entity_type_id);
+      }
+    }
+
+    // Create the test field.
+    module_load_install('entity_test');
+    entity_test_install();
+
+    // Install required default configuration for filter module.
+    $this->installConfig(array('system', 'filter'));
+  }
+
+  /**
+   * Creates a test entity.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   */
+  protected function createTestEntity($entity_type) {
+    $this->entityName = $this->randomMachineName();
+    $this->entityUser = $this->createUser();
+    $this->entityFieldText = $this->randomMachineName();
+
+    // Pass in the value of the name field when creating. With the user
+    // field we test setting a field after creation.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    $entity->user_id->target_id = $this->entityUser->id();
+    $entity->name->value = $this->entityName;
+
+    // Set a value for the test field.
+    $entity->field_test_text->value = $this->entityFieldText;
+
+    return $entity;
+  }
+
+  /**
+   * Tests reading and writing properties and field items.
+   */
+  public function testReadWrite() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestReadWrite($entity_type);
+    }
+  }
+
+  /**
+   * Executes the read write test set for a defined entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestReadWrite($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
+
+    $langcode = 'en';
+
+    // Access the name field.
+    $this->assertTrue($entity->name instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+
+    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityName, $entity->name[0]->value, format_string('%entity_type: Name value can be read through list access.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $this->entityName)), format_string('%entity_type: Plain field value returned.', array('%entity_type' => $entity_type)));
+
+    // Change the name.
+    $new_name = $this->randomMachineName();
+    $entity->name->value = $new_name;
+    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name->getValue(), array(0 => array('value' => $new_name)), format_string('%entity_type: Plain field value reflects the update.', array('%entity_type' => $entity_type)));
+
+    $new_name = $this->randomMachineName();
+    $entity->name[0]->value = $new_name;
+    $this->assertEqual($new_name, $entity->name->value, format_string('%entity_type: Name can be updated and read through list access.', array('%entity_type' => $entity_type)));
+
+    // Access the user field.
+    $this->assertTrue($entity->user_id instanceof FieldItemListInterface, format_string('%entity_type: Field implements interface', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->user_id[0] instanceof FieldItemInterface, format_string('%entity_type: Field item implements interface', array('%entity_type' => $entity_type)));
+
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+
+    // Change the assigned user by entity.
+    $new_user1 = $this->createUser();
+    $entity->user_id->entity = $new_user1;
+    $this->assertEqual($new_user1->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user1->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+
+    // Change the assigned user by id.
+    $new_user2 = $this->createUser();
+    $entity->user_id->target_id = $new_user2->id();
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated username value can be read.', array('%entity_type' => $entity_type)));
+
+    // Try unsetting a field property.
+    $entity->name->value = NULL;
+    $entity->user_id->target_id = NULL;
+    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+
+    // Test setting the values via the typed data API works as well.
+    // Change the assigned user by entity.
+    $entity->user_id->first()->get('entity')->setValue($new_user2);
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+
+    // Change the assigned user by id.
+    $entity->user_id->first()->get('target_id')->setValue($new_user2->id());
+    $this->assertEqual($new_user2->id(), $entity->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+
+    // Try unsetting a field.
+    $entity->name->first()->get('value')->setValue(NULL);
+    $entity->user_id->first()->get('target_id')->setValue(NULL);
+    $this->assertNull($entity->name->value, format_string('%entity_type: Name field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->user_id->target_id, format_string('%entity_type: User ID field is not set.', array('%entity_type' => $entity_type)));
+    $this->assertNull($entity->user_id->entity, format_string('%entity_type: User entity field is not set.', array('%entity_type' => $entity_type)));
+
+    // Create a fresh entity so target_id does not get its property object
+    // instantiated, then verify setting a new value via typed data API works.
+    $entity2 = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'user_id' => array('target_id' => $new_user1->id()),
+      ));
+    // Access the property object, and set a value.
+    $entity2->user_id->first()->get('target_id')->setValue($new_user2->id());
+    $this->assertEqual($new_user2->id(), $entity2->user_id->target_id, format_string('%entity_type: Updated user id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($new_user2->name->value, $entity2->user_id->entity->name->value, format_string('%entity_type: Updated user name value can be read.', array('%entity_type' => $entity_type)));
+
+    // Test using isset(), empty() and unset().
+    $entity->name->value = 'test unset';
+    unset($entity->name->value);
+    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(empty($entity->name->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(empty($entity->name[0]->value), format_string('%entity_type: Name is empty.', array('%entity_type' => $entity_type)));
+
+    $entity->name->value = 'a value';
+    $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(isset($entity->name[0]->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(empty($entity->name->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(empty($entity->name[0]->value), format_string('%entity_type: Name is not empty.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(isset($entity->name[0]), format_string('%entity_type: Name string item is set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name[1]), format_string('%entity_type: Second name string item is not set as it does not exist', array('%entity_type' => $entity_type)));
+    $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->nameInvalid), format_string('%entity_type: Not existing field is not set.', array('%entity_type' => $entity_type)));
+
+    unset($entity->name[0]);
+    $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+    $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name is not set.', array('%entity_type' => $entity_type)));
+
+    // Test emptying a field by assigning an empty value. NULL and array()
+    // behave the same.
+    foreach ([NULL, array(), 'unset'] as $empty) {
+      // Make sure a value is present
+      $entity->name->value = 'a value';
+      $this->assertTrue(isset($entity->name->value), format_string('%entity_type: Name is set.', array('%entity_type' => $entity_type)));
+      // Now, empty the field.
+      if ($empty === 'unset') {
+        unset($entity->name);
+      }
+      else {
+        $entity->name = $empty;
+      }
+      $this->assertTrue(isset($entity->name), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+      $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is set.', array('%entity_type' => $entity_type)));
+      $this->assertIdentical(count($entity->name), 0, format_string('%entity_type: Name field contains no items.', array('%entity_type' => $entity_type)));
+      $this->assertIdentical($entity->name->getValue(), array(), format_string('%entity_type: Name field value is an empty array.', array('%entity_type' => $entity_type)));
+      $this->assertFalse(isset($entity->name[0]), format_string('%entity_type: Name field item is not set.', array('%entity_type' => $entity_type)));
+      $this->assertFalse(isset($entity->name[0]->value), format_string('%entity_type: First name item value is not set.', array('%entity_type' => $entity_type)));
+      $this->assertFalse(isset($entity->name->value), format_string('%entity_type: Name value is not set.', array('%entity_type' => $entity_type)));
+    }
+
+    // Access the language field.
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $this->assertEqual($langcode, $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getLanguage($langcode), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+
+    // Change the language by code.
+    $entity->{$langcode_key}->value = \Drupal::languageManager()->getDefaultLanguage()->getId();
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+
+    // Revert language by code then try setting it by language object.
+    $entity->{$langcode_key}->value = $langcode;
+    $entity->{$langcode_key}->language = \Drupal::languageManager()->getDefaultLanguage();
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage(), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+
+    // Access the text field and test updating.
+    $this->assertEqual($entity->field_test_text->value, $this->entityFieldText, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+    $new_text = $this->randomMachineName();
+    $entity->field_test_text->value = $new_text;
+    $this->assertEqual($entity->field_test_text->value, $new_text, format_string('%entity_type: Updated text field can be read.', array('%entity_type' => $entity_type)));
+
+    // Test creating the entity by passing in plain values.
+    $this->entityName = $this->randomMachineName();
+    $name_item[0]['value'] = $this->entityName;
+    $this->entityUser = $this->createUser();
+    $user_item[0]['target_id'] = $this->entityUser->id();
+    $this->entityFieldText = $this->randomMachineName();
+    $text_item[0]['value'] = $this->entityFieldText;
+
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => $name_item,
+        'user_id' => $user_item,
+        'field_test_text' => $text_item,
+      ));
+    $this->assertEqual($this->entityName, $entity->name->value, format_string('%entity_type: Name value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+
+    // Tests copying field values by assigning the TypedData objects.
+    $entity2 = $this->createTestEntity($entity_type);
+    $entity2->name = $entity->name;
+    $entity2->user_id = $entity->user_id;
+    $entity2->field_test_text = $entity->field_test_text;
+    $this->assertFalse($entity->name === $entity2->name, format_string('%entity_type: Copying properties results in a different field object.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name->value, $entity2->name->value, format_string('%entity_type: Name field copied.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->user_id->target_id, $entity2->user_id->target_id, format_string('%entity_type: User id field copied.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->field_test_text->value, $entity2->field_test_text->value, format_string('%entity_type: Text field copied.', array('%entity_type' => $entity_type)));
+
+    // Tests that assigning TypedData objects to non-field properties keeps the
+    // assigned value as is.
+    $entity2 = $this->createTestEntity($entity_type);
+    $entity2->_not_a_field = $entity->name;
+    $this->assertTrue($entity2->_not_a_field === $entity->name, format_string('%entity_type: Typed data objects can be copied to non-field properties as is.', array('%entity_type' => $entity_type)));
+
+    // Tests adding a value to a field item list.
+    $entity->name[] = 'Another name';
+    $this->assertEqual($entity->name[1]->value, 'Another name', format_string('%entity_type: List item added via [] and the first property.', array('%entity_type' => $entity_type)));
+    $entity->name[] = array('value' => 'Third name');
+    $this->assertEqual($entity->name[2]->value, 'Third name', format_string('%entity_type: List item added via [] and an array of properties.', array('%entity_type' => $entity_type)));
+    $entity->name[3] = array('value' => 'Fourth name');
+    $this->assertEqual($entity->name[3]->value, 'Fourth name', format_string('%entity_type: List item added via offset and an array of properties.', array('%entity_type' => $entity_type)));
+    unset($entity->name[3]);
+
+    // Test removing and empty-ing list items.
+    $this->assertEqual(count($entity->name), 3, format_string('%entity_type: List has 3 items.', array('%entity_type' => $entity_type)));
+    unset($entity->name[1]);
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Second list item has been removed.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[1]->value, 'Third name', format_string('%entity_type: The subsequent items have been shifted up.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[1]->getName(), 1, format_string('%entity_type: The items names have been updated to their new delta.', array('%entity_type' => $entity_type)));
+    $entity->name[1] = NULL;
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: Assigning NULL does not reduce array count.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name[1]->isEmpty(), format_string('%entity_type: Assigning NULL empties the item.', array('%entity_type' => $entity_type)));
+
+    // Test using isEmpty().
+    unset($entity->name[1]);
+    $this->assertFalse($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is not empty.', array('%entity_type' => $entity_type)));
+    $entity->name->value = NULL;
+    $this->assertTrue($entity->name[0]->isEmpty(), format_string('%entity_type: Name item is empty.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name->isEmpty(), format_string('%entity_type: Name field is empty.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: Empty item is considered when counting.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(count(iterator_to_array($entity->name->getIterator())), count($entity->name), format_string('%entity_type: Count matches iterator count.', array('%entity_type' => $entity_type)));
+    $this->assertTrue($entity->name->getValue() === array(0 => array('value' => NULL)), format_string('%entity_type: Name field value contains a NULL value.', array('%entity_type' => $entity_type)));
+
+    // Test using filterEmptyItems().
+    $entity->name = array(NULL, 'foo');
+    $this->assertEqual(count($entity->name), 2, format_string('%entity_type: List has 2 items.', array('%entity_type' => $entity_type)));
+    $entity->name->filterEmptyItems();
+    $this->assertEqual(count($entity->name), 1, format_string('%entity_type: The empty item was removed.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[0]->value, 'foo', format_string('%entity_type: The items were renumbered.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($entity->name[0]->getName(), 0, format_string('%entity_type: The deltas were updated in the items.', array('%entity_type' => $entity_type)));
+
+    // Test get and set field values.
+    $entity->name = 'foo';
+    $this->assertEqual($entity->name[0]->toArray(), array('value' => 'foo'), format_string('%entity_type: Field value has been retrieved via toArray()', array('%entity_type' => $entity_type)));
+
+    $values = $entity->toArray();
+    $this->assertEqual($values['name'], array(0 => array('value' => 'foo')), format_string('%entity_type: Field value has been retrieved via toArray() from an entity.', array('%entity_type' => $entity_type)));
+
+    // Make sure the user id can be set to zero.
+    $user_item[0]['target_id'] = 0;
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => $name_item,
+        'user_id' => $user_item,
+        'field_test_text' => $text_item,
+      ));
+    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
+    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+
+    // Test setting the ID with the value only.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => $name_item,
+        'user_id' => 0,
+        'field_test_text' => $text_item,
+      ));
+    $this->assertNotNull($entity->user_id->target_id, format_string('%entity_type: User id is not NULL', array('%entity_type' => $entity_type)));
+    $this->assertIdentical($entity->user_id->target_id, 0, format_string('%entity_type: User id has been set to 0', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Tries to save and load an entity again.
+   */
+  public function testSave() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestSave($entity_type);
+    }
+  }
+
+  /**
+   * Executes the save tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestSave($entity_type) {
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $entity = $this->createTestEntity($entity_type);
+    $entity->save();
+    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity has received an id.', array('%entity_type' => $entity_type)));
+
+    $entity = entity_load($entity_type, $entity->id());
+    $this->assertTrue((bool) $entity->id(), format_string('%entity_type: Entity loaded.', array('%entity_type' => $entity_type)));
+
+    // Access the name field.
+    $this->assertEqual(1, $entity->id->value, format_string('%entity_type: ID value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertTrue(is_string($entity->uuid->value), format_string('%entity_type: UUID value can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual('en', $entity->{$langcode_key}->value, format_string('%entity_type: Language code can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual(\Drupal::languageManager()->getLanguage('en'), $entity->{$langcode_key}->language, format_string('%entity_type: Language object can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->id(), $entity->user_id->target_id, format_string('%entity_type: User id can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityUser->getUsername(), $entity->user_id->entity->name->value, format_string('%entity_type: User name can be read.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($this->entityFieldText, $entity->field_test_text->value, format_string('%entity_type: Text field can be read.', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Tests introspection and getting metadata upfront.
+   */
+  public function testIntrospection() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestIntrospection($entity_type);
+    }
+  }
+
+  /**
+   * Executes the introspection tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestIntrospection($entity_type) {
+    // Test getting metadata upfront. The entity types used for this test have
+    // a default bundle that is the same as the entity type.
+    $definitions = \Drupal::entityManager()->getFieldDefinitions($entity_type, $entity_type);
+    $this->assertEqual($definitions['name']->getType(), 'string', $entity_type .': Name field found.');
+    $this->assertEqual($definitions['user_id']->getType(), 'entity_reference', $entity_type .': User field found.');
+    $this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type .': Test-text-field field found.');
+
+    // Test deriving further metadata.
+    $this->assertTrue($definitions['name'] instanceof FieldDefinitionInterface);
+    $field_item_definition = $definitions['name']->getItemDefinition();
+    $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
+    $this->assertEqual($field_item_definition->getDataType(), 'field_item:string');
+    $value_definition = $field_item_definition->getPropertyDefinition('value');
+    $this->assertTrue($value_definition instanceof DataDefinitionInterface);
+    $this->assertEqual($value_definition->getDataType(), 'string');
+
+    // Test deriving metadata from references.
+    $entity_definition = \Drupal\Core\Entity\TypedData\EntityDataDefinition::create($entity_type);
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $reference_definition = $entity_definition->getPropertyDefinition($langcode_key)
+      ->getPropertyDefinition('language')
+      ->getTargetDefinition();
+    $this->assertEqual($reference_definition->getDataType(), 'language');
+
+    $reference_definition = $entity_definition->getPropertyDefinition('user_id')
+      ->getPropertyDefinition('entity')
+      ->getTargetDefinition();
+
+    $this->assertTrue($reference_definition instanceof \Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface, 'Definition of the referenced user retrieved.');
+    $this->assertEqual($reference_definition->getEntityTypeId(), 'user', 'Referenced entity is of type "user".');
+
+    // Test propagating down.
+    $name_definition = $reference_definition->getPropertyDefinition('name');
+    $this->assertTrue($name_definition instanceof FieldDefinitionInterface);
+    $this->assertEqual($name_definition->getPropertyDefinition('value')->getDataType(), 'string');
+
+    // Test introspecting an entity object.
+    // @todo: Add bundles and test bundles as well.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+
+    $definitions = $entity->getFieldDefinitions();
+    $this->assertEqual($definitions['name']->getType(), 'string', $entity_type .': Name field found.');
+    $this->assertEqual($definitions['user_id']->getType(), 'entity_reference', $entity_type .': User field found.');
+    $this->assertEqual($definitions['field_test_text']->getType(), 'text', $entity_type .': Test-text-field field found.');
+
+    $name_properties = $entity->name->getFieldDefinition()->getPropertyDefinitions();
+    $this->assertEqual($name_properties['value']->getDataType(), 'string', $entity_type .': String value property of the name found.');
+
+    $userref_properties = $entity->user_id->getFieldDefinition()->getPropertyDefinitions();
+    $this->assertEqual($userref_properties['target_id']->getDataType(), 'integer', $entity_type .': Entity id property of the user found.');
+    $this->assertEqual($userref_properties['entity']->getDataType(), 'entity_reference', $entity_type .': Entity reference property of the user found.');
+
+    $textfield_properties = $entity->field_test_text->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinitions();
+    $this->assertEqual($textfield_properties['value']->getDataType(), 'string', $entity_type .': String value property of the test-text field found.');
+    $this->assertEqual($textfield_properties['format']->getDataType(), 'filter_format', $entity_type .': String format field of the test-text field found.');
+    $this->assertEqual($textfield_properties['processed']->getDataType(), 'string', $entity_type .': String processed property of the test-text field found.');
+
+    // Make sure provided contextual information is right.
+    $entity_adapter = $entity->getTypedData();
+    $this->assertIdentical($entity_adapter->getRoot(), $entity_adapter, 'Entity is root object.');
+    $this->assertEqual($entity_adapter->getPropertyPath(), '');
+    $this->assertEqual($entity_adapter->getName(), '');
+    $this->assertEqual($entity_adapter->getParent(), NULL);
+
+    $field = $entity->user_id;
+    $this->assertIdentical($field->getRoot()->getValue(), $entity, 'Entity is root object.');
+    $this->assertIdentical($field->getEntity(), $entity, 'getEntity() returns the entity.');
+    $this->assertEqual($field->getPropertyPath(), 'user_id');
+    $this->assertEqual($field->getName(), 'user_id');
+    $this->assertIdentical($field->getParent()->getValue(), $entity, 'Parent object matches.');
+
+    $field_item = $field[0];
+    $this->assertIdentical($field_item->getRoot()->getValue(), $entity, 'Entity is root object.');
+    $this->assertIdentical($field_item->getEntity(), $entity, 'getEntity() returns the entity.');
+    $this->assertEqual($field_item->getPropertyPath(), 'user_id.0');
+    $this->assertEqual($field_item->getName(), '0');
+    $this->assertIdentical($field_item->getParent(), $field, 'Parent object matches.');
+
+    $item_value = $field_item->get('entity');
+    $this->assertIdentical($item_value->getRoot()->getValue(), $entity, 'Entity is root object.');
+    $this->assertEqual($item_value->getPropertyPath(), 'user_id.0.entity');
+    $this->assertEqual($item_value->getName(), 'entity');
+    $this->assertIdentical($item_value->getParent(), $field_item, 'Parent object matches.');
+  }
+
+  /**
+   * Tests iterating over properties.
+   */
+  public function testIterator() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestIterator($entity_type);
+    }
+  }
+
+  /**
+   * Executes the iterator tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestIterator($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
+
+    foreach ($entity as $name => $field) {
+      $this->assertTrue($field instanceof FieldItemListInterface, $entity_type . ": Field $name implements interface.");
+
+      foreach ($field as $delta => $item) {
+        $this->assertTrue($field[0] instanceof FieldItemInterface, $entity_type . ": Item $delta of field $name implements interface.");
+
+        foreach ($item as $value_name => $value_property) {
+          $this->assertTrue($value_property instanceof TypedDataInterface, $entity_type . ": Value $value_name of item $delta of field $name implements interface.");
+
+          $value = $value_property->getValue();
+          $this->assertTrue(!isset($value) || is_scalar($value) || $value instanceof EntityInterface, $entity_type . ": Value $value_name of item $delta of field $name is a primitive or an entity.");
+        }
+      }
+    }
+
+    $fields = $entity->getFields();
+    $this->assertEqual(array_keys($fields), array_keys($entity->getTypedData()->getDataDefinition()->getPropertyDefinitions()), format_string('%entity_type: All fields returned.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($fields, iterator_to_array($entity->getIterator()), format_string('%entity_type: Entity iterator iterates over all fields.', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Tests working with the entity based upon the TypedData API.
+   */
+  public function testDataStructureInterfaces() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestDataStructureInterfaces($entity_type);
+    }
+  }
+
+  /**
+   * Executes the data structure interfaces tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestDataStructureInterfaces($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
+
+    // Test using the whole tree of typed data by navigating through the tree of
+    // contained properties and getting all contained strings, limited by a
+    // certain depth.
+    $strings = array();
+    $this->getContainedStrings($entity->getTypedData(), 0, $strings);
+
+    // @todo: Once the user entity has defined properties this should contain
+    // the user name and other user entity strings as well.
+    $target_strings = array(
+      $entity->uuid->value,
+      'en',
+      $this->entityName,
+      // Bundle name.
+      $entity->bundle(),
+      $this->entityFieldText,
+      // Field format.
+      NULL,
+    );
+    asort($strings);
+    asort($target_strings);
+    $this->assertEqual(array_values($strings), array_values($target_strings), format_string('%entity_type: All contained strings found.', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Recursive helper for getting all contained strings,
+   * i.e. properties of type string.
+   */
+  public function getContainedStrings(TypedDataInterface $wrapper, $depth, array &$strings) {
+
+    if ($wrapper instanceof StringInterface) {
+      $strings[] = $wrapper->getValue();
+    }
+
+    // Recurse until a certain depth is reached if possible.
+    if ($depth < 7) {
+      if ($wrapper instanceof \Drupal\Core\TypedData\ListInterface) {
+        foreach ($wrapper as $item) {
+          $this->getContainedStrings($item, $depth + 1, $strings);
+        }
+      }
+      elseif ($wrapper instanceof \Drupal\Core\TypedData\ComplexDataInterface) {
+        foreach ($wrapper as $property) {
+          $this->getContainedStrings($property, $depth + 1, $strings);
+        }
+      }
+    }
+  }
+
+  /**
+   * Makes sure data types are correctly derived for all entity types.
+   */
+  public function testDataTypes() {
+    $types = \Drupal::typedDataManager()->getDefinitions();
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->assertTrue($types['entity:' . $entity_type]['class'], 'Entity data type registered.');
+    }
+    // Check bundle types are provided as well.
+    entity_test_create_bundle('bundle');
+    $types = \Drupal::typedDataManager()->getDefinitions();
+    $this->assertTrue($types['entity:entity_test:bundle']['class'], 'Entity bundle data type registered.');
+  }
+
+  /**
+   * Tests a base field override on a non-existing base field.
+   *
+   * @see entity_test_entity_base_field_info_alter()
+   */
+  public function testBaseFieldNonExistingBaseField() {
+    $this->entityManager->getStorage('node_type')->create(array(
+      'type' => 'page',
+      'name' => 'page',
+    ))->save();
+    $this->entityManager->clearCachedFieldDefinitions();
+    $fields = $this->entityManager->getFieldDefinitions('node', 'page');
+    $override = $fields['status']->getConfig('page');
+    $override->setLabel($this->randomString())->save();
+    \Drupal::state()->set('entity_test.node_remove_status_field', TRUE);
+    $this->entityManager->clearCachedFieldDefinitions();
+    $fields = $this->entityManager->getFieldDefinitions('node', 'page');
+    // A base field override on a non-existing base field should not cause a
+    // field definition to come into existence.
+    $this->assertFalse(isset($fields['status']), 'Node\'s status base field does not exist.');
+  }
+
+  /**
+   * Tests creating a field override config for a bundle field.
+   *
+   * @see entity_test_entity_base_field_info_alter()
+   */
+  public function testFieldOverrideBundleField() {
+    // First make sure the bundle field override in code, which is provided by
+    // the test entity works.
+    entity_test_create_bundle('some_test_bundle', 'Some test bundle', 'entity_test_field_override');
+    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'entity_test_field_override');
+    $this->assertEqual($field_definitions['name']->getDescription(), 'The default description.');
+    $this->assertNull($field_definitions['name']->getTargetBundle());
+
+    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'some_test_bundle');
+    $this->assertEqual($field_definitions['name']->getDescription(), 'Custom description.');
+    $this->assertEqual($field_definitions['name']->getTargetBundle(), 'some_test_bundle');
+
+    // Now create a config override of the bundle field.
+    $field_config = $field_definitions['name']->getConfig('some_test_bundle');
+    $field_config->setTranslatable(FALSE);
+    $field_config->save();
+
+    // Make sure both overrides are present.
+    $this->entityManager->clearCachedFieldDefinitions();
+    $field_definitions = $this->entityManager->getFieldDefinitions('entity_test_field_override', 'some_test_bundle');
+    $this->assertEqual($field_definitions['name']->getDescription(), 'Custom description.');
+    $this->assertEqual($field_definitions['name']->getTargetBundle(), 'some_test_bundle');
+    $this->assertFalse($field_definitions['name']->isTranslatable());
+  }
+
+  /**
+   * Tests validation constraints provided by the Entity API.
+   */
+  public function testEntityConstraintValidation() {
+    $entity = $this->createTestEntity('entity_test');
+    $entity->save();
+    // Create a reference field item and let it reference the entity.
+    $definition = BaseFieldDefinition::create('entity_reference')
+      ->setLabel('Test entity')
+      ->setSetting('target_type', 'entity_test');
+    $reference_field = \Drupal::typedDataManager()->create($definition);
+    $reference = $reference_field->appendItem(array('entity' => $entity))->get('entity');
+
+    // Test validation the typed data object.
+    $violations = $reference->validate();
+    $this->assertEqual($violations->count(), 0);
+
+    // Test validating an entity of the wrong type.
+    $user = $this->createUser();
+    $user->save();
+    $node = $node = Node::create([
+      'type' => 'page',
+      'uid' => $user->id(),
+      'title' => $this->randomString(),
+    ]);
+    $reference->setValue($node);
+    $violations = $reference->validate();
+    $this->assertEqual($violations->count(), 1);
+
+    // Test bundle validation.
+    NodeType::create(array('type' => 'article'))
+      ->save();
+    $definition = BaseFieldDefinition::create('entity_reference')
+      ->setLabel('Test entity')
+      ->setSetting('target_type', 'node')
+      ->setSetting('handler_settings', ['target_bundles' => ['article' => 'article']]);
+    $reference_field = \Drupal::TypedDataManager()->create($definition);
+    $reference_field->appendItem(array('entity' => $node));
+    $violations = $reference_field->validate();
+    $this->assertEqual($violations->count(), 1);
+
+    $node = Node::create([
+      'type' => 'article',
+      'uid' => $user->id(),
+      'title' => $this->randomString(),
+    ]);
+    $node->save();
+    $reference_field->entity = $node;
+    $violations = $reference_field->validate();
+    $this->assertEqual($violations->count(), 0);
+  }
+
+  /**
+   * Tests getting processed property values via a computed property.
+   */
+  public function testComputedProperties() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestComputedProperties($entity_type);
+    }
+  }
+
+  /**
+   * Executes the computed properties tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestComputedProperties($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
+    $entity->field_test_text->value = "The <strong>text</strong> text to filter.";
+    $entity->field_test_text->format = filter_default_format();
+
+    $target = "<p>The &lt;strong&gt;text&lt;/strong&gt; text to filter.</p>\n";
+    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+
+    // Save and load entity and make sure it still works.
+    $entity->save();
+    $entity = entity_load($entity_type, $entity->id());
+    $this->assertEqual($entity->field_test_text->processed, $target, format_string('%entity_type: Text is processed with the default filter.', array('%entity_type' => $entity_type)));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
new file mode 100644
index 0000000..8897eeb
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityLanguageTestBase.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Base class for language-aware entity tests.
+ */
+abstract class EntityLanguageTestBase extends EntityKernelTestBase {
+
+  /**
+   * The language manager service.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * The available language codes.
+   *
+   * @var array
+   */
+  protected $langcodes;
+
+  /**
+   * The test field name.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The untranslatable test field name.
+   *
+   * @var string
+   */
+  protected $untranslatableFieldName;
+
+  public static $modules = array('language', 'entity_test');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->languageManager = $this->container->get('language_manager');
+
+    foreach (entity_test_entity_types() as $entity_type_id) {
+      // The entity_test schema is installed by the parent.
+      if ($entity_type_id != 'entity_test') {
+        $this->installEntitySchema($entity_type_id);
+      }
+    }
+
+    $this->installConfig(array('language'));
+
+    // Create the test field.
+    module_load_install('entity_test');
+    entity_test_install();
+
+    // Enable translations for the test entity type.
+    $this->state->set('entity_test.translation', TRUE);
+
+    // Create a translatable test field.
+    $this->fieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
+
+    // Create an untranslatable test field.
+    $this->untranslatableFieldName = Unicode::strtolower($this->randomMachineName() . '_field_name');
+
+    // Create field fields in all entity variations.
+    foreach (entity_test_entity_types() as $entity_type) {
+      FieldStorageConfig::create(array(
+        'field_name' => $this->fieldName,
+        'entity_type' => $entity_type,
+        'type' => 'text',
+        'cardinality' => 4,
+      ))->save();
+      FieldConfig::create([
+        'field_name' => $this->fieldName,
+        'entity_type' => $entity_type,
+        'bundle' => $entity_type,
+        'translatable' => TRUE,
+      ])->save();
+
+      FieldStorageConfig::create(array(
+        'field_name' => $this->untranslatableFieldName,
+        'entity_type' => $entity_type,
+        'type' => 'text',
+        'cardinality' => 4,
+      ))->save();
+      FieldConfig::create([
+        'field_name' => $this->untranslatableFieldName,
+        'entity_type' => $entity_type,
+        'bundle' => $entity_type,
+        'translatable' => FALSE,
+      ])->save();
+    }
+
+    // Create the default languages.
+    $this->installConfig(array('language'));
+
+    // Create test languages.
+    $this->langcodes = array();
+    for ($i = 0; $i < 3; ++$i) {
+      $language = ConfigurableLanguage::create(array(
+        'id' => 'l' . $i,
+        'label' => $this->randomString(),
+        'weight' => $i,
+      ));
+      $this->langcodes[$i] = $language->getId();
+      $language->save();
+    }
+  }
+
+  /**
+   * Toggles field storage translatability.
+   *
+   * @param string $entity_type
+   *   The type of the entity fields are attached to.
+   */
+  protected function toggleFieldTranslatability($entity_type, $bundle) {
+    $fields = array($this->fieldName, $this->untranslatableFieldName);
+    foreach ($fields as $field_name) {
+      $field = FieldConfig::loadByName($entity_type, $bundle, $field_name);
+      $translatable = !$field->isTranslatable();
+      $field->set('translatable', $translatable);
+      $field->save();
+      $field = FieldConfig::loadByName($entity_type, $bundle, $field_name);
+      $this->assertEqual($field->isTranslatable(), $translatable, 'Field translatability changed.');
+    }
+    \Drupal::cache('entity')->deleteAll();
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
new file mode 100644
index 0000000..d7ab5e9
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
@@ -0,0 +1,589 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityQueryAggregateTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests the Entity Query Aggregation API.
+ *
+ * @group Entity
+ * @see \Drupal\entity_test\Entity\EntityTest
+ */
+class EntityQueryAggregateTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array();
+
+  /**
+   * The entity_test storage to create the test entities.
+   *
+   * @var \Drupal\entity_test\EntityTestStorage
+   */
+  protected $entityStorage;
+
+  /**
+   * The actual query result, to compare later.
+   *
+   * @var array
+   */
+  protected $queryResult;
+
+  /**
+   * The query factory to create entity queries.
+   *
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  public $factory;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->entityStorage = $this->entityManager->getStorage('entity_test');
+    $this->factory = $this->container->get('entity.query');
+
+    // Add some fieldapi fields to be used in the test.
+    for ($i = 1; $i <= 2; $i++) {
+      $field_name = 'field_test_' . $i;
+      FieldStorageConfig::create(array(
+        'field_name' => $field_name,
+        'entity_type' => 'entity_test',
+        'type' => 'integer',
+        'cardinality' => 2,
+      ))->save();
+      FieldConfig::create([
+        'field_name' => $field_name,
+        'entity_type' => 'entity_test',
+        'bundle' => 'entity_test',
+      ])->save();
+    }
+
+    $entity = $this->entityStorage->create(array(
+      'id' => 1,
+      'user_id' => 1,
+      'field_test_1' => 1,
+      'field_test_2' => 2,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+
+    $entity = $this->entityStorage->create(array(
+      'id' => 2,
+      'user_id' => 2,
+      'field_test_1' => 1,
+      'field_test_2' => 7,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+    $entity = $this->entityStorage->create(array(
+      'id' => 3,
+      'user_id' => 2,
+      'field_test_1' => 2,
+      'field_test_2' => 1,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+    $entity = $this->entityStorage->create(array(
+      'id' => 4,
+      'user_id' => 2,
+      'field_test_1' => 2,
+      'field_test_2' => 8,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+    $entity = $this->entityStorage->create(array(
+      'id' => 5,
+      'user_id' => 3,
+      'field_test_1' => 2,
+      'field_test_2' => 2,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+    $entity = $this->entityStorage->create(array(
+      'id' => 6,
+      'user_id' => 3,
+      'field_test_1' => 3,
+      'field_test_2' => 8,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+
+  }
+
+  /**
+   * Test aggregation support.
+   */
+  public function testAggregation() {
+    // Apply a simple groupby.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('user_id')
+      ->execute();
+
+    $this->assertResults(array(
+      array('user_id' => 1),
+      array('user_id' => 2),
+      array('user_id' => 3),
+    ));
+
+    $function_expected = array();
+    $function_expected['count'] = array(array('id_count' => 6));
+    $function_expected['min'] = array(array('id_min' => 1));
+    $function_expected['max'] = array(array('id_max' => 6));
+    $function_expected['sum'] = array(array('id_sum' => 21));
+    $function_expected['avg'] = array(array('id_avg' => (21.0/6.0)));
+
+    // Apply a simple aggregation for different aggregation functions.
+    foreach ($function_expected as $aggregation_function => $expected) {
+      $this->queryResult = $this->factory->getAggregate('entity_test')
+        ->aggregate('id', $aggregation_function)
+        ->execute();
+      $this->assertEqual($this->queryResult, $expected);
+    }
+
+    // Apply aggregation and groupby on the same query.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 1, 'id_count' => 1),
+      array('user_id' => 2, 'id_count' => 3),
+      array('user_id' => 3, 'id_count' => 2),
+    ));
+
+    // Apply aggregation and a condition which matches.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('id')
+      ->conditionAggregate('id', 'COUNT', 8)
+      ->execute();
+    $this->assertResults(array());
+
+    // Don't call aggregate to test the implicit aggregate call.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('id')
+      ->conditionAggregate('id', 'COUNT', 8)
+      ->execute();
+    $this->assertResults(array());
+
+    // Apply aggregation and a condition which matches.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'count')
+      ->groupBy('id')
+      ->conditionAggregate('id', 'COUNT', 6)
+      ->execute();
+    $this->assertResults(array(array('id_count' => 6)));
+
+    // Apply aggregation, a groupby and a condition which matches partially via
+    // the operator '='.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'count')
+      ->conditionAggregate('id', 'count', 2)
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(array('id_count' => 2, 'user_id' => 3)));
+
+    // Apply aggregation, a groupby and a condition which matches partially via
+    // the operator '>'.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'count')
+      ->conditionAggregate('id', 'COUNT', 1, '>')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('id_count' => 2, 'user_id' => 3),
+      array('id_count' => 3, 'user_id' => 2),
+    ));
+
+    // Apply aggregation and a sort. This might not be useful, but have a proper
+    // test coverage.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->sortAggregate('id', 'COUNT')
+      ->execute();
+    $this->assertSortedResults(array(array('id_count' => 6)));
+
+    // Don't call aggregate to test the implicit aggregate call.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->sortAggregate('id', 'COUNT')
+      ->execute();
+    $this->assertSortedResults(array(array('id_count' => 6)));
+
+    // Apply aggregation, groupby and a sort descending.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->sortAggregate('id', 'COUNT', 'DESC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 2, 'id_count' => 3),
+      array('user_id' => 3, 'id_count' => 2),
+      array('user_id' => 1, 'id_count' => 1),
+    ));
+
+    // Apply aggregation, groupby and a sort ascending.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->sortAggregate('id', 'COUNT', 'ASC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 1, 'id_count' => 1),
+      array('user_id' => 3, 'id_count' => 2),
+      array('user_id' => 2, 'id_count' => 3),
+    ));
+
+    // Apply aggregation, groupby, an aggregation condition and a sort with the
+    // operator '='.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->sortAggregate('id', 'COUNT')
+      ->conditionAggregate('id', 'COUNT', 2)
+      ->execute();
+    $this->assertSortedResults(array(array('id_count' => 2, 'user_id' => 3)));
+
+    // Apply aggregation, groupby, an aggregation condition and a sort with the
+    // operator '<' and order ASC.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->sortAggregate('id', 'COUNT', 'ASC')
+      ->conditionAggregate('id', 'COUNT', 3, '<')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('id_count' => 1, 'user_id' => 1),
+      array('id_count' => 2, 'user_id' => 3),
+    ));
+
+    // Apply aggregation, groupby, an aggregation condition and a sort with the
+    // operator '<' and order DESC.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('id', 'COUNT')
+      ->groupBy('user_id')
+      ->sortAggregate('id', 'COUNT', 'DESC')
+      ->conditionAggregate('id', 'COUNT', 3, '<')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('id_count' => 2, 'user_id' => 3),
+      array('id_count' => 1, 'user_id' => 1),
+    ));
+
+    // Test aggregation/groupby support for fieldapi fields.
+
+    // Just group by a fieldapi field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1),
+      array('field_test_1' => 2),
+      array('field_test_1' => 3),
+    ));
+
+    // Group by a fieldapi field and aggregate a normal property.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('user_id', 'COUNT')
+      ->groupBy('field_test_1')
+      ->execute();
+
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'user_id_count' => 2),
+      array('field_test_1' => 2, 'user_id_count' => 3),
+      array('field_test_1' => 3, 'user_id_count' => 1),
+    ));
+
+    // Group by a normal property and aggregate a fieldapi field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'COUNT')
+      ->groupBy('user_id')
+      ->execute();
+
+    $this->assertResults(array(
+      array('user_id' => 1, 'field_test_1_count' => 1),
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'SUM')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 1, 'field_test_1_sum' => 1),
+      array('user_id' => 2, 'field_test_1_sum' => 5),
+      array('user_id' => 3, 'field_test_1_sum' => 5),
+    ));
+
+    // Aggregate by two different fieldapi fields.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'SUM')
+      ->aggregate('field_test_2', 'SUM')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_2_sum' => 2),
+      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_2_sum' => 16),
+      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_2_sum' => 10),
+    ));
+
+    // This time aggregate the same field twice.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'SUM')
+      ->aggregate('field_test_1', 'COUNT')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 1, 'field_test_1_sum' => 1, 'field_test_1_count' => 1),
+      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
+    ));
+
+    // Group by and aggregate by a fieldapi field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->aggregate('field_test_2', 'COUNT')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+      array('field_test_1' => 3, 'field_test_2_count' => 1),
+    ));
+
+    // Group by and aggregate by a fieldapi field and use multiple aggregate
+    // functions.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->aggregate('field_test_2', 'COUNT')
+      ->aggregate('field_test_2', 'SUM')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
+      array('field_test_1' => 2, 'field_test_2_count' => 3, 'field_test_2_sum' => 11),
+      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
+    ));
+
+    // Apply an aggregate condition for a fieldapi field and group by a simple
+    // property.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->conditionAggregate('field_test_1', 'COUNT', 3)
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'SUM')
+      ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertResults(array(
+      array('user_id' => 2, 'field_test_1_sum' => 5, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_sum' => 5, 'field_test_1_count' => 2),
+    ));
+
+    // Apply an aggregate condition for a simple property and a group by a
+    // fieldapi field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->conditionAggregate('user_id', 'COUNT', 2)
+      ->groupBy('field_test_1')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'user_id_count' => 2),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->conditionAggregate('user_id', 'COUNT', 2, '>')
+      ->groupBy('field_test_1')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'user_id_count' => 2),
+      array('field_test_1' => 2, 'user_id_count' => 3),
+    ));
+
+    // Apply an aggregate condition and a group by fieldapi fields.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->conditionAggregate('field_test_2', 'COUNT', 2)
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+    ));
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->conditionAggregate('field_test_2', 'COUNT', 2, '>')
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+    ));
+
+    // Apply an aggregate condition and a group by fieldapi fields with multiple
+    // conditions via AND.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->conditionAggregate('field_test_2', 'COUNT', 2)
+      ->conditionAggregate('field_test_2', 'SUM', 8)
+      ->execute();
+    $this->assertResults(array());
+
+    // Apply an aggregate condition and a group by fieldapi fields with multiple
+    // conditions via OR.
+    $this->queryResult = $this->factory->getAggregate('entity_test', 'OR')
+      ->groupBy('field_test_1')
+      ->conditionAggregate('field_test_2', 'COUNT', 2)
+      ->conditionAggregate('field_test_2', 'SUM', 8)
+      ->execute();
+    $this->assertResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2, 'field_test_2_sum' => 9),
+      array('field_test_1' => 3, 'field_test_2_count' => 1, 'field_test_2_sum' => 8),
+    ));
+
+    // Group by a normal property and aggregate a fieldapi field and sort by the
+    // groupby field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'COUNT')
+      ->groupBy('user_id')
+      ->sort('user_id', 'DESC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 3, 'field_test_1_count' => 2),
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 1, 'field_test_1_count' => 1),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->aggregate('field_test_1', 'COUNT')
+      ->groupBy('user_id')
+      ->sort('user_id', 'ASC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 1, 'field_test_1_count' => 1),
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->conditionAggregate('field_test_1', 'COUNT', 2, '>')
+      ->groupBy('user_id')
+      ->sort('user_id', 'ASC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+    ));
+
+    // Group by a normal property, aggregate a fieldapi field, and sort by the
+    // aggregated field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->sortAggregate('field_test_1', 'COUNT', 'DESC')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 2, 'field_test_1_count' => 3),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+      array('user_id' => 1, 'field_test_1_count' => 1),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->sortAggregate('field_test_1', 'COUNT', 'ASC')
+      ->groupBy('user_id')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('user_id' => 1, 'field_test_1_count' => 1),
+      array('user_id' => 3, 'field_test_1_count' => 2),
+      array('user_id' => 2, 'field_test_1_count' => 3),
+    ));
+
+    // Group by and aggregate by fieldapi field, and sort by the groupby field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->aggregate('field_test_2', 'COUNT')
+      ->sort('field_test_1', 'ASC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+      array('field_test_1' => 3, 'field_test_2_count' => 1),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->aggregate('field_test_2', 'COUNT')
+      ->sort('field_test_1', 'DESC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('field_test_1' => 3, 'field_test_2_count' => 1),
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+    ));
+
+    // Groupby and aggregate by fieldapi field, and sort by the aggregated
+    // field.
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->sortAggregate('field_test_2', 'COUNT', 'DESC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+      array('field_test_1' => 3, 'field_test_2_count' => 1),
+    ));
+
+    $this->queryResult = $this->factory->getAggregate('entity_test')
+      ->groupBy('field_test_1')
+      ->sortAggregate('field_test_2', 'COUNT', 'ASC')
+      ->execute();
+    $this->assertSortedResults(array(
+      array('field_test_1' => 3, 'field_test_2_count' => 1),
+      array('field_test_1' => 1, 'field_test_2_count' => 2),
+      array('field_test_1' => 2, 'field_test_2_count' => 3),
+    ));
+
+  }
+
+  /**
+   * Asserts the results as expected regardless of order between and in rows.
+   *
+   * @param array $expected
+   *   An array of the expected results.
+   */
+  protected function assertResults($expected, $sorted = FALSE) {
+    $found = TRUE;
+    $expected_keys = array_keys($expected);
+    foreach ($this->queryResult as $key => $row) {
+      $keys = $sorted ? array($key) : $expected_keys;
+      foreach ($keys as $key) {
+        $expected_row = $expected[$key];
+        if (!array_diff_assoc($row, $expected_row) && !array_diff_assoc($expected_row, $row)) {
+          continue 2;
+        }
+      }
+      $found = FALSE;
+      break;
+    }
+    return $this->assertTrue($found, strtr('!expected expected, !found found', array('!expected' => print_r($expected, TRUE), '!found' => print_r($this->queryResult, TRUE))));
+  }
+
+  /**
+   * Asserts the results as expected regardless of order in rows.
+   *
+   * @param array $expected
+   *   An array of the expected results.
+   */
+  protected function assertSortedResults($expected) {
+    return $this->assertResults($expected, TRUE);
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
new file mode 100644
index 0000000..4639e78
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -0,0 +1,177 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityQueryRelationshipTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\taxonomy\Entity\Term;
+
+/**
+ * Tests the Entity Query relationship API.
+ *
+ * @group Entity
+ */
+class EntityQueryRelationshipTest extends EntityKernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('taxonomy');
+
+  /**
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $factory;
+
+  /**
+   * Term entities.
+   *
+   * @var array
+   */
+  protected $terms;
+
+  /**
+   * User entities.
+   *
+   * @var array
+   */
+  public $accounts;
+
+  /**
+   * entity_test entities.
+   *
+   * @var array
+   */
+  protected $entities;
+
+  /**
+   * The name of the taxonomy field used for test.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * The results returned by EntityQuery.
+   *
+   * @var array
+   */
+  protected $queryResults;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('taxonomy_term');
+
+    // We want an entity reference field. It needs a vocabulary, terms, a field
+    // storage and a field. First, create the vocabulary.
+    $vocabulary = Vocabulary::create([
+      'vid' => Unicode::strtolower($this->randomMachineName()),
+    ]);
+    $vocabulary->save();
+
+    // Second, create the field.
+    entity_test_create_bundle('test_bundle');
+    $this->fieldName = strtolower($this->randomMachineName());
+    $handler_settings = array(
+      'target_bundles' => array(
+        $vocabulary->id() => $vocabulary->id(),
+       ),
+      'auto_create' => TRUE,
+    );
+    $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings);
+
+    // Create two terms and also two accounts.
+    for ($i = 0; $i <= 1; $i++) {
+      $term = Term::create([
+        'name' => $this->randomMachineName(),
+        'vid' => $vocabulary->id(),
+      ]);
+      $term->save();
+      $this->terms[] = $term;
+      $this->accounts[] = $this->createUser();
+    }
+    // Create three entity_test entities, the 0th entity will point to the
+    // 0th account and 0th term, the 1st and 2nd entity will point to the
+    // 1st account and 1st term.
+    for ($i = 0; $i <= 2; $i++) {
+      $entity = EntityTest::create(array('type' => 'test_bundle'));
+      $entity->name->value = $this->randomMachineName();
+      $index = $i ? 1 : 0;
+      $entity->user_id->target_id = $this->accounts[$index]->id();
+      $entity->{$this->fieldName}->target_id = $this->terms[$index]->id();
+      $entity->save();
+      $this->entities[] = $entity;
+    }
+    $this->factory = \Drupal::service('entity.query');
+  }
+
+  /**
+   * Tests querying.
+   */
+  public function testQuery() {
+    // This returns the 0th entity as that's only one pointing to the 0th
+    // account.
+    $this->queryResults = $this->factory->get('entity_test')
+      ->condition("user_id.entity.name", $this->accounts[0]->getUsername())
+      ->execute();
+    $this->assertResults(array(0));
+    // This returns the 1st and 2nd entity as those point to the 1st account.
+    $this->queryResults = $this->factory->get('entity_test')
+      ->condition("user_id.entity.name", $this->accounts[0]->getUsername(), '<>')
+      ->execute();
+    $this->assertResults(array(1, 2));
+    // This returns all three entities because all of them point to an
+    // account.
+    $this->queryResults = $this->factory->get('entity_test')
+      ->exists("user_id.entity.name")
+      ->execute();
+    $this->assertResults(array(0, 1, 2));
+    // This returns no entities because all of them point to an account.
+    $this->queryResults = $this->factory->get('entity_test')
+      ->notExists("user_id.entity.name")
+      ->execute();
+    $this->assertEqual(count($this->queryResults), 0);
+    // This returns the 0th entity as that's only one pointing to the 0th
+    // term (test without specifying the field column).
+    $this->queryResults = $this->factory->get('entity_test')
+      ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value)
+      ->execute();
+    $this->assertResults(array(0));
+    // This returns the 0th entity as that's only one pointing to the 0th
+    // term (test with specifying the column name).
+    $this->queryResults = $this->factory->get('entity_test')
+      ->condition("$this->fieldName.target_id.entity.name", $this->terms[0]->name->value)
+      ->execute();
+    $this->assertResults(array(0));
+    // This returns the 1st and 2nd entity as those point to the 1st term.
+    $this->queryResults = $this->factory->get('entity_test')
+      ->condition("$this->fieldName.entity.name", $this->terms[0]->name->value, '<>')
+      ->execute();
+    $this->assertResults(array(1, 2));
+  }
+
+  /**
+   * Assert the results.
+   *
+   * @param array $expected
+   *   A list of indexes in the $this->entities array.
+   */
+  protected function assertResults($expected) {
+    $this->assertEqual(count($this->queryResults), count($expected));
+    foreach ($expected as $key) {
+      $id = $this->entities[$key]->id();
+      $this->assertEqual($this->queryResults[$id], $id);
+    }
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
new file mode 100644
index 0000000..fbda4e1
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -0,0 +1,870 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityQueryTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests Entity Query functionality.
+ *
+ * @group Entity
+ */
+class EntityQueryTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_test', 'language');
+
+  /**
+   * @var array
+   */
+  protected $queryResults;
+
+  /**
+   * @var \Drupal\Core\Entity\Query\QueryFactory
+   */
+  protected $factory;
+
+  /**
+   * A list of bundle machine names created for this test.
+   *
+   * @var string[]
+   */
+  protected $bundles;
+
+  /**
+   * Field name for the greetings field.
+   *
+   * @var string
+   */
+  public $greetings;
+
+  /**
+   * Field name for the figures field.
+   *
+   * @var string
+   */
+  public $figures;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_mulrev');
+
+    $this->installConfig(array('language'));
+
+    $figures = Unicode::strtolower($this->randomMachineName());
+    $greetings = Unicode::strtolower($this->randomMachineName());
+    foreach (array($figures => 'shape', $greetings => 'text') as $field_name => $field_type) {
+      $field_storage = FieldStorageConfig::create(array(
+        'field_name' => $field_name,
+        'entity_type' => 'entity_test_mulrev',
+        'type' => $field_type,
+        'cardinality' => 2,
+      ));
+      $field_storage->save();
+      $field_storages[] = $field_storage;
+    }
+    $bundles = array();
+    for ($i = 0; $i < 2; $i++) {
+      // For the sake of tablesort, make sure the second bundle is higher than
+      // the first one. Beware: MySQL is not case sensitive.
+      do {
+        $bundle = $this->randomMachineName();
+      } while ($bundles && strtolower($bundles[0]) >= strtolower($bundle));
+      entity_test_create_bundle($bundle);
+      foreach ($field_storages as $field_storage) {
+        FieldConfig::create([
+          'field_storage' => $field_storage,
+          'bundle' => $bundle,
+        ])->save();
+      }
+      $bundles[] = $bundle;
+    }
+    // Each unit is a list of field name, langcode and a column-value array.
+    $units[] = array($figures, 'en', array(
+      'color' => 'red',
+      'shape' => 'triangle',
+    ));
+    $units[] = array($figures, 'en', array(
+      'color' => 'blue',
+      'shape' => 'circle',
+    ));
+    // To make it easier to test sorting, the greetings get formats according
+    // to their langcode.
+    $units[] = array($greetings, 'tr', array(
+      'value' => 'merhaba',
+      'format' => 'format-tr'
+    ));
+    $units[] = array($greetings, 'pl', array(
+      'value' => 'siema',
+      'format' => 'format-pl'
+    ));
+    // Make these languages available to the greetings field.
+    ConfigurableLanguage::createFromLangcode('tr')->save();
+    ConfigurableLanguage::createFromLangcode('pl')->save();
+    // Calculate the cartesian product of the unit array by looking at the
+    // bits of $i and add the unit at the bits that are 1. For example,
+    // decimal 13 is binary 1101 so unit 3,2 and 0 will be added to the
+    // entity.
+    for ($i = 1; $i <= 15; $i++) {
+      $entity = EntityTestMulRev::create(array(
+        'type' => $bundles[$i & 1],
+        'name' => $this->randomMachineName(),
+        'langcode' => 'en',
+      ));
+      // Make sure the name is set for every language that we might create.
+      foreach (array('tr', 'pl') as $langcode) {
+        $entity->addTranslation($langcode)->name = $this->randomMachineName();
+      }
+      foreach (array_reverse(str_split(decbin($i))) as $key => $bit) {
+        if ($bit) {
+          list($field_name, $langcode, $values) = $units[$key];
+          $entity->getTranslation($langcode)->{$field_name}[] = $values;
+        }
+      }
+      $entity->save();
+    }
+    $this->bundles = $bundles;
+    $this->figures = $figures;
+    $this->greetings = $greetings;
+    $this->factory = \Drupal::service('entity.query');
+  }
+
+  /**
+   * Test basic functionality.
+   */
+  function testEntityQuery() {
+    $greetings = $this->greetings;
+    $figures = $this->figures;
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->exists($greetings, 'tr')
+      ->condition("$figures.color", 'red')
+      ->sort('id')
+      ->execute();
+    // As unit 0 was the red triangle and unit 2 was the turkish greeting,
+    // bit 0 and bit 2 needs to be set.
+    $this->assertResult(5, 7, 13, 15);
+
+    $query = $this->factory->get('entity_test_mulrev', 'OR')
+      ->exists($greetings, 'tr')
+      ->condition("$figures.color", 'red')
+      ->sort('id');
+    $count_query = clone $query;
+    $this->assertEqual(12, $count_query->count()->execute());
+    $this->queryResults = $query->execute();
+    // Now bit 0 (1, 3, 5, 7, 9, 11, 13, 15) or bit 2 (4, 5, 6, 7, 12, 13, 14,
+    // 15) needs to be set.
+    $this->assertResult(1, 3, 4, 5, 6, 7, 9, 11, 12, 13, 14, 15);
+
+    // Test cloning of query conditions.
+    $query = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.color", 'red')
+      ->sort('id');
+    $cloned_query = clone $query;
+    $cloned_query
+      ->condition("$figures.shape", 'circle');
+    // Bit 0 (1, 3, 5, 7, 9, 11, 13, 15) needs to be set.
+    $this->queryResults = $query->execute();
+    $this->assertResult(1, 3, 5, 7, 9, 11, 13, 15);
+    // No red color has a circle shape.
+    $this->queryResults = $cloned_query->execute();
+    $this->assertResult();
+
+    $query = $this->factory->get('entity_test_mulrev');
+    $group = $query->orConditionGroup()
+      ->exists($greetings, 'tr')
+      ->condition("$figures.color", 'red');
+    $this->queryResults = $query
+      ->condition($group)
+      ->condition("$greetings.value", 'sie', 'STARTS_WITH')
+      ->sort('revision_id')
+      ->execute();
+    // Bit 3 and (bit 0 or 2) -- the above 8 part of the above.
+    $this->assertResult(9, 11, 12, 13, 14, 15);
+
+    // No figure has both the colors blue and red at the same time.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.color", 'blue')
+      ->condition("$figures.color", 'red')
+      ->sort('id')
+      ->execute();
+    $this->assertResult();
+
+    // But an entity might have a red and a blue figure both.
+    $query = $this->factory->get('entity_test_mulrev');
+    $group_blue = $query->andConditionGroup()->condition("$figures.color", 'blue');
+    $group_red = $query->andConditionGroup()->condition("$figures.color", 'red');
+    $this->queryResults = $query
+      ->condition($group_blue)
+      ->condition($group_red)
+      ->sort('revision_id')
+      ->execute();
+    // Unit 0 and unit 1, so bits 0 1.
+    $this->assertResult(3, 7, 11, 15);
+
+    // Do the same test but with IN operator.
+    $query = $this->factory->get('entity_test_mulrev');
+    $group_blue = $query->andConditionGroup()->condition("$figures.color", array('blue'), 'IN');
+    $group_red = $query->andConditionGroup()->condition("$figures.color", array('red'), 'IN');
+    $this->queryResults = $query
+      ->condition($group_blue)
+      ->condition($group_red)
+      ->sort('id')
+      ->execute();
+    // Unit 0 and unit 1, so bits 0 1.
+    $this->assertResult(3, 7, 11, 15);
+
+    // An entity might have either red or blue figure.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$figures.color", array('blue', 'red'), 'IN')
+      ->sort('id')
+      ->execute();
+    // Bit 0 or 1 is on.
+    $this->assertResult(1, 2, 3, 5, 6, 7, 9, 10, 11, 13, 14, 15);
+
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->exists("$figures.color")
+      ->notExists("$greetings.value")
+      ->sort('id')
+      ->execute();
+    // Bit 0 or 1 is on but 2 and 3 are not.
+    $this->assertResult(1, 2, 3);
+    // Now update the 'merhaba' string to xsiemax which is not a meaningful
+    // word but allows us to test revisions and string operations.
+    $ids = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'merhaba')
+      ->sort('id')
+      ->execute();
+    $entities = entity_load_multiple('entity_test_mulrev', $ids);
+    $first_entity = reset($entities);
+    $old_name = $first_entity->name->value;
+    foreach ($entities as $entity) {
+      $entity->setNewRevision();
+      $entity->getTranslation('tr')->$greetings->value = 'xsiemax';
+      $entity->name->value .= 'x';
+      $entity->save();
+    }
+    // We changed the entity names, so the current revision should not match.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition('name.value', $old_name)
+      ->execute();
+    $this->assertResult();
+    // Only if all revisions are queried, we find the old revision.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition('name.value', $old_name)
+      ->allRevisions()
+      ->sort('revision_id')
+      ->execute();
+    $this->assertRevisionResult(array($first_entity->id()), array($first_entity->id()));
+    // When querying current revisions, this string is no longer found.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'merhaba')
+      ->execute();
+    $this->assertResult();
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'merhaba')
+      ->allRevisions()
+      ->sort('revision_id')
+      ->execute();
+    // The query only matches the original revisions.
+    $this->assertRevisionResult(array(4, 5, 6, 7, 12, 13, 14, 15), array(4, 5, 6, 7, 12, 13, 14, 15));
+    $results = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'siema', 'CONTAINS')
+      ->sort('id')
+      ->execute();
+    // This matches both the original and new current revisions, multiple
+    // revisions are returned for some entities.
+    $assert = array(16 => '4', 17 => '5', 18 => '6', 19 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 20 => '12', 21 => '13', 22 => '14', 23 => '15');
+    $this->assertIdentical($results, $assert);
+    $results = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'siema', 'STARTS_WITH')
+      ->sort('revision_id')
+      ->execute();
+    // Now we only get the ones that originally were siema, entity id 8 and
+    // above.
+    $this->assertIdentical($results, array_slice($assert, 4, 8, TRUE));
+    $results = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'a', 'ENDS_WITH')
+      ->sort('revision_id')
+      ->execute();
+    // It is very important that we do not get the ones which only have
+    // xsiemax despite originally they were merhaba, ie. ended with a.
+    $this->assertIdentical($results, array_slice($assert, 4, 8, TRUE));
+    $results = $this->factory->get('entity_test_mulrev')
+      ->condition("$greetings.value", 'a', 'ENDS_WITH')
+      ->allRevisions()
+      ->sort('id')
+      ->sort('revision_id')
+      ->execute();
+    // Now we get everything.
+    $assert = array(4 => '4', 5 => '5', 6 => '6', 7 => '7', 8 => '8', 9 => '9', 10 => '10', 11 => '11', 12 => '12', 20 => '12', 13 => '13', 21 => '13', 14 => '14', 22 => '14', 15 => '15', 23 => '15');
+    $this->assertIdentical($results, $assert);
+  }
+
+  /**
+   * Test sort().
+   *
+   * Warning: this is complicated.
+   */
+  function testSort() {
+    $greetings = $this->greetings;
+    $figures = $this->figures;
+    // Order up and down on a number.
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->sort('id')
+      ->execute();
+    $this->assertResult(range(1, 15));
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->sort('id', 'DESC')
+      ->execute();
+    $this->assertResult(range(15, 1));
+    $query = $this->factory->get('entity_test_mulrev')
+      ->sort("$figures.color")
+      ->sort("$greetings.format")
+      ->sort('id');
+    // As we do not have any conditions, here are the possible colors and
+    // language codes, already in order, with the first occurrence of the
+    // entity id marked with *:
+    // 8  NULL pl *
+    // 12 NULL pl *
+
+    // 4  NULL tr *
+    // 12 NULL tr
+
+    // 2  blue NULL *
+    // 3  blue NULL *
+
+    // 10 blue pl *
+    // 11 blue pl *
+    // 14 blue pl *
+    // 15 blue pl *
+
+    // 6  blue tr *
+    // 7  blue tr *
+    // 14 blue tr
+    // 15 blue tr
+
+    // 1  red  NULL
+    // 3  red  NULL
+
+    // 9  red  pl *
+    // 11 red  pl
+    // 13 red  pl *
+    // 15 red  pl
+
+    // 5  red  tr *
+    // 7  red  tr
+    // 13 red  tr
+    // 15 red  tr
+    $count_query = clone $query;
+    $this->assertEqual(15, $count_query->count()->execute());
+    $this->queryResults = $query->execute();
+    $this->assertResult(8, 12, 4, 2, 3, 10, 11, 14, 15, 6, 7, 1, 9, 13, 5);
+
+    // Test the pager by setting element #1 to page 2 with a page size of 4.
+    // Results will be #8-12 from above.
+    $request = Request::createFromGlobals();
+    $request->query->replace(array(
+      'page' => '0,2',
+    ));
+    \Drupal::getContainer()->get('request_stack')->push($request);
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->sort("$figures.color")
+      ->sort("$greetings.format")
+      ->sort('id')
+      ->pager(4, 1)
+      ->execute();
+    $this->assertResult(15, 6, 7, 1);
+
+    // Now test the reversed order.
+    $query = $this->factory->get('entity_test_mulrev')
+      ->sort("$figures.color", 'DESC')
+      ->sort("$greetings.format", 'DESC')
+      ->sort('id', 'DESC');
+    $count_query = clone $query;
+    $this->assertEqual(15, $count_query->count()->execute());
+    $this->queryResults = $query->execute();
+    $this->assertResult(15, 13, 7, 5, 11, 9, 3, 1, 14, 6, 10, 2, 12, 4, 8);
+  }
+
+  /**
+   * Test tablesort().
+   */
+  public function testTableSort() {
+    // While ordering on bundles do not give us a definite order, we can still
+    // assert that all entities from one bundle are after the other as the
+    // order dictates.
+    $request = Request::createFromGlobals();
+    $request->query->replace(array(
+      'sort' => 'asc',
+      'order' => 'Type',
+    ));
+    \Drupal::getContainer()->get('request_stack')->push($request);
+
+    $header = array(
+      'id' => array('data' => 'Id', 'specifier' => 'id'),
+      'type' => array('data' => 'Type', 'specifier' => 'type'),
+    );
+
+    $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
+      ->tableSort($header)
+      ->execute());
+    $this->assertBundleOrder('asc');
+
+    $request->query->add(array(
+      'sort' => 'desc',
+    ));
+    \Drupal::getContainer()->get('request_stack')->push($request);
+
+    $header = array(
+      'id' => array('data' => 'Id', 'specifier' => 'id'),
+      'type' => array('data' => 'Type', 'specifier' => 'type'),
+    );
+    $this->queryResults = array_values($this->factory->get('entity_test_mulrev')
+      ->tableSort($header)
+      ->execute());
+    $this->assertBundleOrder('desc');
+
+    // Ordering on ID is definite, however.
+    $request->query->add(array(
+      'order' => 'Id',
+    ));
+    \Drupal::getContainer()->get('request_stack')->push($request);
+    $this->queryResults = $this->factory->get('entity_test_mulrev')
+      ->tableSort($header)
+      ->execute();
+    $this->assertResult(range(15, 1));
+  }
+
+  /**
+   * Test that count queries are separated across entity types.
+   */
+  public function testCount() {
+    // Create a field with the same name in a different entity type.
+    $field_name = $this->figures;
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'shape',
+      'cardinality' => 2,
+      'translatable' => TRUE,
+    ));
+    $field_storage->save();
+    $bundle = $this->randomMachineName();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $bundle,
+    ])->save();
+
+    $entity = EntityTest::create(array(
+      'id' => 1,
+      'type' => $bundle,
+    ));
+    $entity->enforceIsNew();
+    $entity->save();
+
+    // As the single entity of this type we just saved does not have a value
+    // in the color field, the result should be 0.
+    $count = $this->factory->get('entity_test')
+      ->exists("$field_name.color")
+      ->count()
+      ->execute();
+     $this->assertFalse($count);
+  }
+
+  /**
+   * Tests that nested condition groups work as expected.
+   */
+  public function testNestedConditionGroups() {
+    // Query for all entities of the first bundle that have either a red
+    // triangle as a figure or the Turkish greeting as a greeting.
+    $query = $this->factory->get('entity_test_mulrev');
+
+    $first_and = $query->andConditionGroup()
+      ->condition($this->figures . '.color', 'red')
+      ->condition($this->figures . '.shape', 'triangle');
+    $second_and = $query->andConditionGroup()
+      ->condition($this->greetings . '.value', 'merhaba')
+      ->condition($this->greetings . '.format', 'format-tr');
+
+    $or = $query->orConditionGroup()
+      ->condition($first_and)
+      ->condition($second_and);
+
+    $this->queryResults = $query
+      ->condition($or)
+      ->condition('type', reset($this->bundles))
+      ->sort('id')
+      ->execute();
+
+    $this->assertResult(6, 14);
+  }
+
+  protected function assertResult() {
+    $assert = array();
+    $expected = func_get_args();
+    if ($expected && is_array($expected[0])) {
+      $expected = $expected[0];
+    }
+    foreach ($expected as $binary) {
+      $assert[$binary] = strval($binary);
+    }
+    $this->assertIdentical($this->queryResults, $assert);
+  }
+
+  protected function assertRevisionResult($keys, $expected) {
+    $assert = array();
+    foreach ($expected as $key => $binary) {
+      $assert[$keys[$key]] = strval($binary);
+    }
+    $this->assertIdentical($this->queryResults, $assert);
+    return $assert;
+  }
+
+  protected function assertBundleOrder($order) {
+    // This loop is for bundle1 entities.
+    for ($i = 1; $i <= 15; $i +=2) {
+      $ok = TRUE;
+      $index1 = array_search($i, $this->queryResults);
+      $this->assertNotIdentical($index1, FALSE, "$i found at $index1.");
+      // This loop is for bundle2 entities.
+      for ($j = 2; $j <= 15; $j += 2) {
+        if ($ok) {
+          if ($order == 'asc') {
+            $ok = $index1 > array_search($j, $this->queryResults);
+          }
+          else {
+            $ok = $index1 < array_search($j, $this->queryResults);
+          }
+        }
+      }
+      $this->assertTrue($ok, "$i is after all entities in bundle2");
+    }
+  }
+
+  /**
+   * Test adding a tag and metadata to the Entity query object.
+   *
+   * The tags and metadata should propagate to the SQL query object.
+   */
+  public function testMetaData() {
+    $query = \Drupal::entityQuery('entity_test_mulrev');
+    $query
+      ->addTag('efq_metadata_test')
+      ->addMetaData('foo', 'bar')
+      ->execute();
+
+    global $efq_test_metadata;
+    $this->assertEqual($efq_test_metadata, 'bar', 'Tag and metadata propagated to the SQL query object.');
+  }
+
+  /**
+   * Test case sensitive and in-sensitive query conditions.
+   */
+  public function testCaseSensitivity() {
+    $bundle = $this->randomMachineName();
+
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_ci',
+      'entity_type' => 'entity_test_mulrev',
+      'type' => 'string',
+      'cardinality' => 1,
+      'translatable' => FALSE,
+      'settings' => array(
+        'case_sensitive' => FALSE,
+      )
+    ));
+    $field_storage->save();
+
+    FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => $bundle,
+    ))->save();
+
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'field_cs',
+      'entity_type' => 'entity_test_mulrev',
+      'type' => 'string',
+      'cardinality' => 1,
+      'translatable' => FALSE,
+      'settings' => array(
+        'case_sensitive' => TRUE,
+      ),
+    ));
+    $field_storage->save();
+
+    FieldConfig::create(array(
+      'field_storage' => $field_storage,
+      'bundle' => $bundle,
+    ))->save();
+
+    $fixtures = array();
+
+    for ($i = 0; $i < 2; $i++) {
+      // If the last 4 of the string are all numbers, then there is no
+      // difference between upper and lowercase and the case sensitive CONTAINS
+      // test will fail. Ensure that can not happen by appending a non-numeric
+      // character. See https://www.drupal.org/node/2397297.
+      $string = $this->randomMachineName(7) . 'a';
+      $fixtures[] = array(
+        'original' => $string,
+        'uppercase' => Unicode::strtoupper($string),
+        'lowercase' => Unicode::strtolower($string),
+      );
+    }
+
+    EntityTestMulRev::create(array(
+      'type' => $bundle,
+      'name' => $this->randomMachineName(),
+      'langcode' => 'en',
+      'field_ci' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase'],
+      'field_cs' => $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
+    ))->save();
+
+    // Check the case insensitive field, = operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase']
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase']
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, mixed.');
+
+    // Check the case sensitive field, = operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[0]['lowercase'] . $fixtures[1]['lowercase']
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['uppercase']
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[0]['uppercase'] . $fixtures[1]['lowercase']
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+
+    // Check the case insensitive field, IN operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, lowercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, uppercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case insensitive, mixed');
+
+    // Check the case sensitive field, IN operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['lowercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['uppercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, uppercase');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', array($fixtures[0]['uppercase'] . $fixtures[1]['lowercase']), 'IN'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, mixed');
+
+    // Check the case insensitive field, STARTS_WITH operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[0]['lowercase'], 'STARTS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[0]['uppercase'], 'STARTS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+
+    // Check the case sensitive field, STARTS_WITH operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[0]['lowercase'], 'STARTS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[0]['uppercase'], 'STARTS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+
+
+    // Check the case insensitive field, ENDS_WITH operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[1]['lowercase'], 'ENDS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', $fixtures[1]['uppercase'], 'ENDS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+
+    // Check the case sensitive field, ENDS_WITH operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[1]['lowercase'], 'ENDS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', $fixtures[1]['uppercase'], 'ENDS_WITH'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
+
+
+    // Check the case insensitive field, CONTAINS operator, use the inner 8
+    // characters of the uppercase and lowercase strings.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_ci', Unicode::strtolower(Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, exact match.');
+
+    // Check the case sensitive field, CONTAINS operator.
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8), 'CONTAINS'
+    )->execute();
+    $this->assertIdentical(count($result), 1, 'Case sensitive, lowercase.');
+
+    $result = \Drupal::entityQuery('entity_test_mulrev')->condition(
+      'field_cs', Unicode::strtolower(Unicode::substr($fixtures[0]['uppercase'] . $fixtures[1]['lowercase'], 4, 8)), 'CONTAINS'
+    )->execute();
+    $this->assertIdentical(count($result), 0, 'Case sensitive, exact match.');
+
+  }
+
+  /**
+   * Test base fields with multiple columns.
+   */
+  public function testBaseFieldMultipleColumns() {
+    $this->enableModules(['taxonomy']);
+    $this->installEntitySchema('taxonomy_term');
+
+    Vocabulary::create(['vid' => 'tags']);
+
+    $term1 = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => 'tags',
+      'description' => array(
+        'value' => $this->randomString(),
+        'format' => 'format1',
+      )]);
+    $term1->save();
+
+    $term2 = Term::create([
+      'name' => $this->randomMachineName(),
+      'vid' => 'tags',
+      'description' => array(
+        'value' => $this->randomString(),
+        'format' => 'format2',
+      )]);
+    $term2->save();
+
+    $ids = \Drupal::entityQuery('taxonomy_term')
+      ->condition('description.format', 'format1')
+      ->execute();
+
+    $this->assertEqual(count($ids), 1);
+    $this->assertEqual($term1->id(), reset($ids));
+  }
+
+  /**
+   * Test forward-revisions.
+   */
+  public function testForwardRevisions() {
+    // Ensure entity 14 is returned.
+    $result = \Drupal::entityQuery('entity_test_mulrev')
+      ->condition('id', [14], 'IN')
+      ->execute();
+    $this->assertEqual(count($result), 1);
+
+    // Set a revision on entity 14 that isn't the current default.
+    $entity = EntityTestMulRev::load(14);
+    $current_values = $entity->{$this->figures}->getValue();
+
+    $entity->setNewRevision(TRUE);
+    $entity->isDefaultRevision(FALSE);
+    $entity->{$this->figures}->setValue([
+      'color' => 'red',
+      'shape' => 'square'
+    ]);
+    $entity->save();
+
+    // Entity query should still return entity 14.
+    $result = \Drupal::entityQuery('entity_test_mulrev')
+      ->condition('id', [14], 'IN')
+      ->execute();
+    $this->assertEqual(count($result), 1);
+
+    // Verify that field conditions on the default and forward revision are
+    // work as expected.
+    $result = \Drupal::entityQuery('entity_test_mulrev')
+      ->condition('id', [14], 'IN')
+      ->condition("$this->figures.color", $current_values[0]['color'])
+      ->execute();
+    $this->assertEqual($result, [14 => '14']);
+    $result = $this->factory->get('entity_test_mulrev')
+      ->condition('id', [14], 'IN')
+      ->condition("$this->figures.color", 'red')
+      ->allRevisions()
+      ->execute();
+    $this->assertEqual($result, [16 => '14']);
+  }
+
+  /**
+   * Test against SQL inject of condition field. This covers a
+   * database driver's EntityQuery\Condition class.
+   */
+  public function testInjectionInCondition() {
+    try {
+      $this->queryResults = $this->factory->get('entity_test_mulrev')
+        ->condition('1 ; -- ', array(0, 1), 'IN')
+        ->sort('id')
+        ->execute();
+      $this->fail('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
+    }
+    catch (\Exception $e) {
+      $this->pass('SQL Injection attempt in Entity Query condition in operator should result in an exception.');
+    }
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php
new file mode 100644
index 0000000..e529140
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php
@@ -0,0 +1,459 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityReferenceFieldTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\user\Entity\Role;
+use Drupal\user\Entity\User;
+use Drupal\user\RoleInterface;
+use Drupal\user\UserInterface;
+use Drupal\entity_test\Entity\EntityTestStringId;
+
+/**
+ * Tests for the entity reference field.
+ *
+ * @group Entity
+ */
+class EntityReferenceFieldTest extends EntityKernelTestBase {
+
+  use SchemaCheckTestTrait;
+  use EntityReferenceTestTrait;
+
+  /**
+   * The entity type used in this test.
+   *
+   * @var string
+   */
+  protected $entityType = 'entity_test';
+
+  /**
+   * The entity type that is being referenced.
+   *
+   * @var string
+   */
+  protected $referencedEntityType = 'entity_test_rev';
+
+  /**
+   * The bundle used in this test.
+   *
+   * @var string
+   */
+  protected $bundle = 'entity_test';
+
+  /**
+   * The name of the field used in this test.
+   *
+   * @var string
+   */
+  protected $fieldName = 'field_test';
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('entity_reference_test');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+
+    // Create a field.
+    $this->createEntityReferenceField(
+      $this->entityType,
+      $this->bundle,
+      $this->fieldName,
+      'Field test',
+      $this->referencedEntityType,
+      'default',
+      array('target_bundles' => array($this->bundle)),
+      FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
+    );
+
+  }
+
+  /**
+   * Tests reference field validation.
+   */
+  public function testEntityReferenceFieldValidation() {
+    // Test a valid reference.
+    $referenced_entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->referencedEntityType)
+      ->create(array('type' => $this->bundle));
+    $referenced_entity->save();
+
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('type' => $this->bundle));
+    $entity->{$this->fieldName}->target_id = $referenced_entity->id();
+    $violations = $entity->{$this->fieldName}->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passes.');
+
+    // Test an invalid reference.
+    $entity->{$this->fieldName}->target_id = 9999;
+    $violations = $entity->{$this->fieldName}->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
+    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => $this->referencedEntityType, '%id' => 9999)));
+
+    // Test a non-referenceable bundle.
+    entity_test_create_bundle('non_referenceable', NULL, $this->referencedEntityType);
+    $referenced_entity = entity_create($this->referencedEntityType, array('type' => 'non_referenceable'));
+    $referenced_entity->save();
+    $entity->{$this->fieldName}->target_id = $referenced_entity->id();
+    $violations = $entity->{$this->fieldName}->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation throws a violation.');
+    $this->assertEqual($violations[0]->getMessage(), t('This entity (%type: %id) cannot be referenced.', array('%type' => $this->referencedEntityType, '%id' => $referenced_entity->id())));
+  }
+
+  /**
+   * Tests the multiple target entities loader.
+   */
+  public function testReferencedEntitiesMultipleLoad() {
+    // Create the parent entity.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('type' => $this->bundle));
+
+    // Create three target entities and attach them to parent field.
+    $target_entities = array();
+    $reference_field = array();
+    for ($i = 0; $i < 3; $i++) {
+      $target_entity = $this->container->get('entity_type.manager')
+        ->getStorage($this->referencedEntityType)
+        ->create(array('type' => $this->bundle));
+      $target_entity->save();
+      $target_entities[] = $target_entity;
+      $reference_field[]['target_id'] = $target_entity->id();
+    }
+
+    // Also attach a non-existent entity and a NULL target id.
+    $reference_field[3]['target_id'] = 99999;
+    $target_entities[3] = NULL;
+    $reference_field[4]['target_id'] = NULL;
+    $target_entities[4] = NULL;
+
+    // Attach the first created target entity as the sixth item ($delta == 5) of
+    // the parent entity field. We want to test the case when the same target
+    // entity is referenced twice (or more times) in the same entity reference
+    // field.
+    $reference_field[5] = $reference_field[0];
+    $target_entities[5] = $target_entities[0];
+
+    // Create a new target entity that is not saved, thus testing the
+    // "autocreate" feature.
+    $target_entity_unsaved = $this->container->get('entity_type.manager')
+      ->getStorage($this->referencedEntityType)
+      ->create(array('type' => $this->bundle, 'name' => $this->randomString()));
+    $reference_field[6]['entity'] = $target_entity_unsaved;
+    $target_entities[6] = $target_entity_unsaved;
+
+    // Set the field value.
+    $entity->{$this->fieldName}->setValue($reference_field);
+
+    // Load the target entities using EntityReferenceField::referencedEntities().
+    $entities = $entity->{$this->fieldName}->referencedEntities();
+
+    // Test returned entities:
+    // - Deltas must be preserved.
+    // - Non-existent entities must not be retrieved in target entities result.
+    foreach ($target_entities as $delta => $target_entity) {
+      if (!empty($target_entity)) {
+        if (!$target_entity->isNew()) {
+          // There must be an entity in the loaded set having the same id for
+          // the same delta.
+          $this->assertEqual($target_entity->id(), $entities[$delta]->id());
+        }
+        else {
+          // For entities that were not yet saved, there must an entity in the
+          // loaded set having the same label for the same delta.
+          $this->assertEqual($target_entity->label(), $entities[$delta]->label());
+        }
+      }
+      else {
+        // A non-existent or NULL entity target id must not return any item in
+        // the target entities set.
+        $this->assertFalse(isset($entities[$delta]));
+      }
+    }
+  }
+
+  /**
+   * Tests referencing entities with string IDs.
+   */
+  public function testReferencedEntitiesStringId() {
+    $field_name = 'entity_reference_string_id';
+    $this->installEntitySchema('entity_test_string_id');
+    $this->createEntityReferenceField(
+      $this->entityType,
+      $this->bundle,
+      $field_name,
+      'Field test',
+      'entity_test_string_id',
+      'default',
+      array('target_bundles' => array($this->bundle)),
+      FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED
+    );
+    // Create the parent entity.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('type' => $this->bundle));
+
+    // Create the default target entity.
+    $target_entity = EntityTestStringId::create([
+      'id' => $this->randomString(),
+      'type' => $this->bundle
+    ]);
+    $target_entity->save();
+
+    // Set the field value.
+    $entity->{$field_name}->setValue(array(array('target_id' => $target_entity->id())));
+
+    // Load the target entities using EntityReferenceField::referencedEntities().
+    $entities = $entity->{$field_name}->referencedEntities();
+    $this->assertEqual($entities[0]->id(), $target_entity->id());
+
+    // Test that a string ID works as a default value and the field's config
+    // schema is correct.
+    $field = FieldConfig::loadByName($this->entityType, $this->bundle, $field_name);
+    $field->setDefaultValue($target_entity->id());
+    $field->save();
+    $this->assertConfigSchema(\Drupal::service('config.typed'), 'field.field.' . $field->id(), $field->toArray());
+
+    // Test that the default value works.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($this->entityType)
+      ->create(array('type' => $this->bundle));
+    $entities = $entity->{$field_name}->referencedEntities();
+    $this->assertEqual($entities[0]->id(), $target_entity->id());
+  }
+
+  /**
+   * Tests all the possible ways to autocreate an entity via the API.
+   */
+  function testAutocreateApi() {
+    $entity = $this->entityManager
+      ->getStorage($this->entityType)
+      ->create(array('name' => $this->randomString()));
+
+    // Test content entity autocreation.
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->set('user_id', $user);
+    });
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->set('user_id', $user, FALSE);
+    });
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->user_id->setValue($user);
+    });
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->user_id[0]->get('entity')->setValue($user);
+    });
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->user_id->setValue(array('entity' => $user, 'target_id' => NULL));
+    });
+    try {
+      $message = 'Setting both the entity and an invalid target_id property fails.';
+      $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+        $user->save();
+        $entity->user_id->setValue(array('entity' => $user, 'target_id' => $this->generateRandomEntityId()));
+      });
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->user_id = $user;
+    });
+    $this->assertUserAutocreate($entity, function(EntityInterface $entity, UserInterface $user) {
+      $entity->user_id->entity = $user;
+    });
+
+    // Test config entity autocreation.
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->set('user_role', $role);
+    });
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->set('user_role', $role, FALSE);
+    });
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->user_role->setValue($role);
+    });
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->user_role[0]->get('entity')->setValue($role);
+    });
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->user_role->setValue(array('entity' => $role, 'target_id' => NULL));
+    });
+    try {
+      $message = 'Setting both the entity and an invalid target_id property fails.';
+      $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+        $role->save();
+        $entity->user_role->setValue(array('entity' => $role, 'target_id' => $this->generateRandomEntityId(TRUE)));
+      });
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->user_role = $role;
+    });
+    $this->assertUserRoleAutocreate($entity, function(EntityInterface $entity, RoleInterface $role) {
+      $entity->user_role->entity = $role;
+    });
+
+    // Test target entity saving after setting it as new.
+    $storage = $this->entityManager->getStorage('user');
+    $user_id = $this->generateRandomEntityId();
+    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
+    $entity->user_id = $user;
+    $user->save();
+    $entity->save();
+    $this->assertEqual($entity->user_id->target_id, $user->id());
+  }
+
+  /**
+   * Asserts that the setter callback performs autocreation for users.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The referencing entity.
+   * @param $setter_callback
+   *   A callback setting the target entity on the referencing entity.
+   *
+   * @return bool
+   *   TRUE if the user was autocreated, FALSE otherwise.
+   */
+  protected function assertUserAutocreate(EntityInterface $entity, $setter_callback) {
+    $storage = $this->entityManager->getStorage('user');
+    $user_id = $this->generateRandomEntityId();
+    $user = $storage->create(array('uid' => $user_id, 'name' => $this->randomString()));
+    $setter_callback($entity, $user);
+    $entity->save();
+    $storage->resetCache();
+    $user = User::load($user_id);
+    return $this->assertEqual($entity->user_id->target_id, $user->id());
+  }
+
+  /**
+   * Asserts that the setter callback performs autocreation for user roles.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The referencing entity.
+   * @param $setter_callback
+   *   A callback setting the target entity on the referencing entity.
+   *
+   * @return bool
+   *   TRUE if the user was autocreated, FALSE otherwise.
+   */
+  protected function assertUserRoleAutocreate(EntityInterface $entity, $setter_callback) {
+    $storage = $this->entityManager->getStorage('user_role');
+    $role_id = $this->generateRandomEntityId(TRUE);
+    $role = $storage->create(array('id' => $role_id, 'label' => $this->randomString()));
+    $setter_callback($entity, $role);
+    $entity->save();
+    $storage->resetCache();
+    $role = Role::load($role_id);
+    return $this->assertEqual($entity->user_role->target_id, $role->id());
+  }
+
+  /**
+   * Tests that the target entity is not unnecessarily loaded.
+   */
+  public function testTargetEntityNoLoad() {
+    // Setup a test entity type with an entity reference field to itself. We use
+    // a special storage class throwing exceptions when a load operation is
+    // triggered to be able to detect them.
+    $entity_type = clone $this->entityManager->getDefinition('entity_test_update');
+    $entity_type->setHandlerClass('storage', '\Drupal\entity_test\EntityTestNoLoadStorage');
+    $this->state->set('entity_test_update.entity_type', $entity_type);
+    $definitions = array(
+      'target_reference' => BaseFieldDefinition::create('entity_reference')
+        ->setSetting('target_type', $entity_type->id())
+        ->setSetting('handler', 'default')
+    );
+    $this->state->set('entity_test_update.additional_base_field_definitions', $definitions);
+    $this->entityManager->clearCachedDefinitions();
+    $this->installEntitySchema($entity_type->id());
+
+    // Create the target entity.
+    $storage = $this->entityManager->getStorage($entity_type->id());
+    $target_id = $this->generateRandomEntityId();
+    $target = $storage->create(array('id' => $target_id, 'name' => $this->randomString()));
+    $target->save();
+    $this->assertEqual($target_id, $target->id(), 'The target entity has a random identifier.');
+
+    // Check that populating the reference with an existing target id does not
+    // trigger a load operation.
+    $message = 'The target entity was not loaded.';
+    try {
+      $entity = $this->entityManager
+        ->getStorage($entity_type->id())
+        ->create(array('name' => $this->randomString()));
+      $entity->target_reference = $target_id;
+      $this->pass($message);
+    }
+    catch (EntityStorageException $e) {
+      $this->fail($message);
+    }
+
+    // Check that the storage actually triggers the expected exception when
+    // trying to load the target entity.
+    $message = 'An exception is thrown when trying to load the target entity';
+    try {
+      $storage->load($target_id);
+      $this->fail($message);
+    }
+    catch (EntityStorageException $e) {
+      $this->pass($message);
+    }
+  }
+
+  /**
+   * Tests the dependencies entity reference fields are created with.
+   */
+  public function testEntityReferenceFieldDependencies() {
+    $field_name = 'user_reference_field';
+    $entity_type = 'entity_test';
+
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'type' => 'entity_reference',
+      'entity_type' => $entity_type,
+      'settings' => [
+        'target_type' => 'user',
+      ],
+    ]);
+    $field_storage->save();
+    $this->assertEqual(['module' => ['entity_test', 'user']], $field_storage->getDependencies());
+
+    $field = FieldConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'bundle' => 'entity_test',
+      'label' => $field_name,
+      'settings' => [
+        'handler' => 'default',
+      ],
+    ]);
+    $field->save();
+    $this->assertEqual(['config' => ['field.storage.entity_test.user_reference_field'], 'module' => ['entity_test']], $field->getDependencies());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
new file mode 100644
index 0000000..f8e0ea9
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityReferenceSelection\EntityReferenceSelectionSortTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity\EntityReferenceSelection;
+
+use Drupal\Component\Utility\Html;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\system\Tests\Entity\EntityUnitTestBase;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests sorting referenced items.
+ *
+ * @group entity_reference
+ */
+class EntityReferenceSelectionSortTest extends EntityUnitTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('node');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an Article node type.
+    $article = NodeType::create(array(
+      'type' => 'article',
+    ));
+    $article->save();
+
+    // Test as a non-admin.
+    $normal_user = $this->createUser(array(), array('access content'));
+    \Drupal::currentUser()->setAccount($normal_user);
+  }
+
+  /**
+   * Assert sorting by field and property.
+   */
+  public function testSort() {
+    // Add text field to entity, to sort by.
+    FieldStorageConfig::create(array(
+      'field_name' => 'field_text',
+      'entity_type' => 'node',
+      'type' => 'text',
+      'entity_types' => array('node'),
+    ))->save();
+
+    FieldConfig::create([
+      'label' => 'Text Field',
+      'field_name' => 'field_text',
+      'entity_type' => 'node',
+      'bundle' => 'article',
+      'settings' => array(),
+      'required' => FALSE,
+    ])->save();
+
+    // Build a set of test data.
+    $node_values = array(
+      'published1' => array(
+        'type' => 'article',
+        'status' => 1,
+        'title' => 'Node published1 (<&>)',
+        'uid' => 1,
+        'field_text' => array(
+          array(
+            'value' => 1,
+          ),
+        ),
+      ),
+      'published2' => array(
+        'type' => 'article',
+        'status' => 1,
+        'title' => 'Node published2 (<&>)',
+        'uid' => 1,
+        'field_text' => array(
+          array(
+            'value' => 2,
+          ),
+        ),
+      ),
+    );
+
+    $nodes = array();
+    $node_labels = array();
+    foreach ($node_values as $key => $values) {
+      $node = Node::create($values);
+      $node->save();
+      $nodes[$key] = $node;
+      $node_labels[$key] = Html::escape($node->label());
+    }
+
+    $selection_options = array(
+      'target_type' => 'node',
+      'handler' => 'default',
+      'handler_settings' => array(
+        'target_bundles' => NULL,
+        // Add sorting.
+        'sort' => array(
+          'field' => 'field_text.value',
+          'direction' => 'DESC',
+        ),
+      ),
+    );
+    $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
+
+    // Not only assert the result, but make sure the keys are sorted as
+    // expected.
+    $result = $handler->getReferenceableEntities();
+    $expected_result = array(
+      $nodes['published2']->id() => $node_labels['published2'],
+      $nodes['published1']->id() => $node_labels['published1'],
+    );
+    $this->assertIdentical($result['article'], $expected_result, 'Query sorted by field returned expected values.');
+
+    // Assert sort by base field.
+    $selection_options['handler_settings']['sort'] = array(
+      'field' => 'nid',
+      'direction' => 'ASC',
+    );
+    $handler = $this->container->get('plugin.manager.entity_reference_selection')->getInstance($selection_options);
+    $result = $handler->getReferenceableEntities();
+    $expected_result = array(
+      $nodes['published1']->id() => $node_labels['published1'],
+      $nodes['published2']->id() => $node_labels['published2'],
+    );
+    $this->assertIdentical($result['article'], $expected_result, 'Query sorted by property returned expected values.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityRevisionTranslationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityRevisionTranslationTest.php
new file mode 100644
index 0000000..e7a4055
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityRevisionTranslationTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityRevisionTranslationTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests proper revision propagation of entities.
+ *
+ * @group Entity
+ */
+class EntityRevisionTranslationTest extends EntityKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Enable an additional language.
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    $this->installEntitySchema('entity_test_mulrev');
+  }
+
+  /**
+   * Tests if the translation object has the right revision id after new revision.
+   */
+  public function testNewRevisionAfterTranslation() {
+    $user = $this->createUser();
+
+    // Create a test entity.
+    $entity = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'user_id' => $user->id(),
+      'language' => 'en',
+    ]);
+    $entity->save();
+    $old_rev_id = $entity->getRevisionId();
+
+    $translation = $entity->addTranslation('de');
+    $translation->setNewRevision();
+    $translation->save();
+
+    $this->assertTrue($translation->getRevisionId() > $old_rev_id, 'The saved translation in new revision has a newer revision id.');
+    $this->assertTrue($this->reloadEntity($entity)->getRevisionId() > $old_rev_id, 'The entity from the storage has a newer revision id.');
+  }
+
+  /**
+   * Tests if the translation object has the right revision id after new revision.
+   */
+  public function testRevertRevisionAfterTranslation() {
+    $user = $this->createUser();
+    $storage = $this->entityManager->getStorage('entity_test_mulrev');
+
+    // Create a test entity.
+    $entity = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'user_id' => $user->id(),
+      'language' => 'en',
+    ]);
+    $entity->save();
+    $old_rev_id = $entity->getRevisionId();
+
+    $translation = $entity->addTranslation('de');
+    $translation->setNewRevision();
+    $translation->save();
+
+    $entity = $this->reloadEntity($entity);
+
+    $this->assertTrue($entity->hasTranslation('de'));
+
+    $entity = $storage->loadRevision($old_rev_id);
+
+    $entity->setNewRevision();
+    $entity->isDefaultRevision(TRUE);
+    $entity->save();
+
+    $entity = $this->reloadEntity($entity);
+
+    $this->assertFalse($entity->hasTranslation('de'));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
new file mode 100644
index 0000000..5567780
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntitySchemaTest.php
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntitySchemaTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Tests adding a custom bundle field.
+ *
+ * @group system
+ */
+class EntitySchemaTest extends EntityKernelTestBase  {
+
+  /**
+   * The database connection used.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('user', array('users_data'));
+    $this->database = $this->container->get('database');
+  }
+
+  /**
+   * Tests the custom bundle field creation and deletion.
+   */
+  public function testCustomFieldCreateDelete() {
+    // Install the module which adds the field.
+    $this->installModule('entity_schema_test');
+    $this->entityManager->clearCachedDefinitions();
+    $storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test');
+    $this->assertNotNull($storage_definitions['custom_base_field'], 'Base field definition found.');
+    $this->assertNotNull($storage_definitions['custom_bundle_field'], 'Bundle field definition found.');
+
+    // Make sure the field schema can be created.
+    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_base_field']);
+    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']);
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = $this->entityManager->getStorage('entity_test')->getTableMapping();
+    $base_table = current($table_mapping->getTableNames());
+    $base_column = current($table_mapping->getColumnNames('custom_base_field'));
+    $this->assertTrue($this->database->schema()->fieldExists($base_table, $base_column), 'Table column created');
+    $table = $table_mapping->getDedicatedDataTableName($storage_definitions['custom_bundle_field']);
+    $this->assertTrue($this->database->schema()->tableExists($table), 'Table created');
+
+    // Make sure the field schema can be deleted.
+    $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_base_field']);
+    $this->entityManager->onFieldStorageDefinitionDelete($storage_definitions['custom_bundle_field']);
+    $this->assertFalse($this->database->schema()->fieldExists($base_table, $base_column), 'Table column dropped');
+    $this->assertFalse($this->database->schema()->tableExists($table), 'Table dropped');
+  }
+
+  /**
+   * Updates the entity type definition.
+   *
+   * @param bool $alter
+   *   Whether the original definition should be altered or not.
+   */
+  protected function updateEntityType($alter) {
+    $entity_test_id = 'entity_test';
+    $original = $this->entityManager->getDefinition($entity_test_id);
+    $this->entityManager->clearCachedDefinitions();
+    $this->state->set('entity_schema_update', $alter);
+    $entity_type = $this->entityManager->getDefinition($entity_test_id);
+    $this->entityManager->onEntityTypeUpdate($entity_type, $original);
+  }
+
+  /**
+   * Tests that entity schema responds to changes in the entity type definition.
+   */
+  public function testEntitySchemaUpdate() {
+    $this->installModule('entity_schema_test');
+    $storage_definitions = $this->entityManager->getFieldStorageDefinitions('entity_test');
+    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_base_field']);
+    $this->entityManager->onFieldStorageDefinitionCreate($storage_definitions['custom_bundle_field']);
+    $schema_handler = $this->database->schema();
+    $tables = array('entity_test', 'entity_test_revision', 'entity_test_field_data', 'entity_test_field_revision');
+    $dedicated_tables = array('entity_test__custom_bundle_field', 'entity_test_revision__custom_bundle_field');
+
+    // Initially only the base table and the dedicated field data table should
+    // exist.
+    foreach ($tables as $index => $table) {
+      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+    }
+    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+
+    // Update the entity type definition and check that the entity schema now
+    // supports translations and revisions.
+    $this->updateEntityType(TRUE);
+    foreach ($tables as $table) {
+      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+    }
+    foreach ($dedicated_tables as $table) {
+      $this->assertTrue($schema_handler->tableExists($table), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+    }
+
+    // Revert changes and check that the entity schema now does not support
+    // neither translations nor revisions.
+    $this->updateEntityType(FALSE);
+    foreach ($tables as $index => $table) {
+      $this->assertEqual($schema_handler->tableExists($table), !$index, SafeMarkup::format('Entity schema correct for the @table table.', array('@table' => $table)));
+    }
+    $this->assertTrue($schema_handler->tableExists($dedicated_tables[0]), SafeMarkup::format('Field schema correct for the @table table.', array('@table' => $table)));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function refreshServices() {
+    parent::refreshServices();
+    $this->database = $this->container->get('database');
+  }
+
+  /**
+   * Tests that modifying the UUID field for a translatable entity works.
+   */
+  public function testModifyingTranslatableColumnSchema() {
+    $this->installModule('entity_schema_test');
+    $this->updateEntityType(TRUE);
+    $fields = ['revision_log', 'uuid'];
+    foreach ($fields as $field_name) {
+      $original_definition = $this->entityManager->getBaseFieldDefinitions('entity_test')[$field_name];
+      $new_definition = clone $original_definition;
+      $new_definition->setLabel($original_definition->getLabel() . ', the other one');
+      $this->assertTrue($this->entityManager->getStorage('entity_test')
+        ->requiresFieldDataMigration($new_definition, $original_definition));
+    }
+  }
+
+  /**
+   * Tests fields from an uninstalled module are removed from the schema.
+   */
+  public function testCleanUpStorageDefinition() {
+    // Find all the entity types provided by the entity_test module and install
+    // the schema for them.
+    $entity_type_ids = [];
+    $entities = \Drupal::entityManager()->getDefinitions();
+    foreach ($entities as $entity_type_id => $definition) {
+      if ($definition->getProvider() == 'entity_test') {
+        $this->installEntitySchema($entity_type_id);
+        $entity_type_ids[] = $entity_type_id;
+      };
+    }
+
+    // Get a list of all the entities in the schema.
+    $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
+    $schema = $key_value_store->getAll();
+
+    // Count the storage definitions provided by the entity_test module, so that
+    // after uninstall we can be sure there were some to be deleted.
+    $entity_type_id_count = 0;
+
+    foreach (array_keys($schema) as $storage_definition_name) {
+      list($entity_type_id, ,) = explode('.', $storage_definition_name);
+      if (in_array($entity_type_id, $entity_type_ids)) {
+        $entity_type_id_count++;
+      }
+    }
+
+    // Ensure that there are storage definitions from the entity_test module.
+    $this->assertNotEqual($entity_type_id_count, 0, 'There are storage definitions provided by the entity_test module in the schema.');
+
+    // Uninstall the entity_test module.
+    $this->container->get('module_installer')->uninstall(array('entity_test'));
+
+    // Get a list of all the entities in the schema.
+    $key_value_store = \Drupal::keyValue('entity.storage_schema.sql');
+    $schema = $key_value_store->getAll();
+
+    // Count the storage definitions that come from entity types provided by
+    // the entity_test module.
+    $entity_type_id_count = 0;
+
+    foreach (array_keys($schema) as $storage_definition_name) {
+      list($entity_type_id, ,) = explode('.', $storage_definition_name);
+      if (in_array($entity_type_id, $entity_type_ids)) {
+        $entity_type_id_count++;
+      }
+    }
+
+    // Ensure that all storage definitions have been removed from the schema.
+    $this->assertEqual($entity_type_id_count, 0, 'After uninstalling entity_test module the schema should not contains fields from entities provided by the module.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
new file mode 100644
index 0000000..5c1ac27
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
@@ -0,0 +1,937 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityTranslationTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests entity translation functionality.
+ *
+ * @group Entity
+ */
+class EntityTranslationTest extends EntityLanguageTestBase {
+
+  /**
+   * Tests language related methods of the Entity class.
+   */
+  public function testEntityLanguageMethods() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->doTestEntityLanguageMethods($entity_type);
+    }
+  }
+
+  /**
+   * Executes the entity language method tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestEntityLanguageMethods($entity_type) {
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => 'test',
+        'user_id' => $this->container->get('current_user')->id(),
+      ));
+    $this->assertEqual($entity->language()->getId(), $this->languageManager->getDefaultLanguage()->getId(), format_string('%entity_type: Entity created with API has default language.', array('%entity_type' => $entity_type)));
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => 'test',
+        'user_id' => \Drupal::currentUser()->id(),
+        $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      ));
+
+    $this->assertEqual($entity->language()->getId(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity language not specified.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+
+    // Set the value in default language.
+    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
+    // Get the value.
+    $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get($this->fieldName);
+    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->getLangcode(), LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+
+    // Try to get add a translation to language neutral entity.
+    $message = 'Adding a translation to a language-neutral entity results in an error.';
+    try {
+      $entity->addTranslation($this->langcodes[1]);
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+
+    // Now, make the entity language-specific by assigning a language and test
+    // translating it.
+    $default_langcode = $this->langcodes[0];
+    $entity->{$langcode_key}->value = $default_langcode;
+    $entity->{$this->fieldName} = array();
+    $this->assertEqual($entity->language(), \Drupal::languageManager()->getLanguage($this->langcodes[0]), format_string('%entity_type: Entity language retrieved.', array('%entity_type' => $entity_type)));
+    $this->assertFalse($entity->getTranslationLanguages(FALSE), format_string('%entity_type: No translations are available', array('%entity_type' => $entity_type)));
+
+    // Set the value in default language.
+    $entity->set($this->fieldName, array(0 => array('value' => 'default value')));
+    // Get the value.
+    $field = $entity->get($this->fieldName);
+    $this->assertEqual($field->value, 'default value', format_string('%entity_type: Untranslated value retrieved.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+
+    // Set a translation.
+    $entity->addTranslation($this->langcodes[1])->set($this->fieldName, array(0 => array('value' => 'translation 1')));
+    $field = $entity->getTranslation($this->langcodes[1])->{$this->fieldName};
+    $this->assertEqual($field->value, 'translation 1', format_string('%entity_type: Translated value set.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->getLangcode(), $this->langcodes[1], format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+
+    // Make sure the untranslated value stays.
+    $field = $entity->get($this->fieldName);
+    $this->assertEqual($field->value, 'default value', 'Untranslated value stays.');
+    $this->assertEqual($field->getLangcode(), $default_langcode, 'Untranslated value has the expected langcode.');
+
+    $translations[$this->langcodes[1]] = \Drupal::languageManager()->getLanguage($this->langcodes[1]);
+    $this->assertEqual($entity->getTranslationLanguages(FALSE), $translations, 'Translations retrieved.');
+
+    // Try to get a value using a language code for a non-existing translation.
+    $message = 'Getting a non existing translation results in an error.';
+    try {
+      $entity->getTranslation($this->langcodes[2])->get($this->fieldName)->value;
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+
+    // Try to get a not available translation.
+    $this->assertNull($entity->addTranslation($this->langcodes[2])->get($this->fieldName)->value, format_string('%entity_type: A translation that is not available is NULL.', array('%entity_type' => $entity_type)));
+
+    // Try to get a value using an invalid language code.
+    $message = 'Getting an invalid translation results in an error.';
+    try {
+      $entity->getTranslation('invalid')->get($this->fieldName)->value;
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+
+    // Try to set a value using an invalid language code.
+    try {
+      $entity->getTranslation('invalid')->set($this->fieldName, NULL);
+      $this->fail(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass(format_string('%entity_type: Setting a translation for an invalid language throws an exception.', array('%entity_type' => $entity_type)));
+    }
+
+    // Set the value in default language.
+    $field_name = 'field_test_text';
+    $entity->getTranslation($this->langcodes[1])->set($field_name, array(0 => array('value' => 'default value2')));
+    // Get the value.
+    $field = $entity->get($field_name);
+    $this->assertEqual($field->value, 'default value2', format_string('%entity_type: Untranslated value set into a translation in non-strict mode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($field->getLangcode(), $default_langcode, format_string('%entity_type: Field object has the expected langcode.', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Tests multilingual properties.
+   */
+  public function testMultilingualProperties() {
+    // Test all entity variations with data table support.
+    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
+      $this->doTestMultilingualProperties($entity_type);
+    }
+  }
+
+  /**
+   * Executes the multilingual property tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestMultilingualProperties($entity_type) {
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $default_langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('default_langcode');
+    $name = $this->randomMachineName();
+    $uid = mt_rand(0, 127);
+    $langcode = $this->langcodes[0];
+
+    // Create a language neutral entity and check that properties are stored
+    // as language neutral.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => $name, 'user_id' => $uid, $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED));
+    $entity->save();
+    $entity = entity_load($entity_type, $entity->id());
+    $default_langcode = $entity->language()->getId();
+    $this->assertEqual($default_langcode, LanguageInterface::LANGCODE_NOT_SPECIFIED, format_string('%entity_type: Entity created as language neutral.', array('%entity_type' => $entity_type)));
+    $field = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('name');
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($uid, $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as language neutral.', array('%entity_type' => $entity_type)));
+
+    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT);
+    $field = $translation->get('name');
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name defaults to neutral language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($uid, $translation->get('user_id')->target_id, format_string('%entity_type: The entity author defaults to neutral language.', array('%entity_type' => $entity_type)));
+    $field = $entity->get('name');
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($uid, $entity->get('user_id')->target_id, format_string('%entity_type: The entity author can be retrieved without specifying a language.', array('%entity_type' => $entity_type)));
+
+    // Create a language-aware entity and check that properties are stored
+    // as language-aware.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => $name, 'user_id' => $uid, $langcode_key => $langcode));
+    $entity->save();
+    $entity = entity_load($entity_type, $entity->id());
+    $default_langcode = $entity->language()->getId();
+    $this->assertEqual($default_langcode, $langcode, format_string('%entity_type: Entity created as language specific.', array('%entity_type' => $entity_type)));
+    $field = $entity->getTranslation($langcode)->get('name');
+    $this->assertEqual($name, $field->value, format_string('%entity_type: The entity name has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($default_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expect langcode.', array('%entity_type' => $entity_type)));
+    $this->assertEqual($uid, $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored as a language-aware property.', array('%entity_type' => $entity_type)));
+
+    // Create property translations.
+    $properties = array();
+    $default_langcode = $langcode;
+    foreach ($this->langcodes as $langcode) {
+      if ($langcode != $default_langcode) {
+        $properties[$langcode] = array(
+          'name' => array(0 => $this->randomMachineName()),
+          'user_id' => array(0 => mt_rand(128, 256)),
+        );
+      }
+      else {
+        $properties[$langcode] = array(
+          'name' => array(0 => $name),
+          'user_id' => array(0 => $uid),
+        );
+      }
+      $translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
+      foreach ($properties[$langcode] as $field_name => $values) {
+        $translation->set($field_name, $values);
+      }
+    }
+    $entity->save();
+
+    // Check that property translation were correctly stored.
+    $entity = entity_load($entity_type, $entity->id());
+    foreach ($this->langcodes as $langcode) {
+      $args = array(
+        '%entity_type' => $entity_type,
+        '%langcode' => $langcode,
+      );
+      $field = $entity->getTranslation($langcode)->get('name');
+      $this->assertEqual($properties[$langcode]['name'][0], $field->value, format_string('%entity_type: The entity name has been correctly stored for language %langcode.', $args));
+      $field_langcode = ($langcode == $entity->language()->getId()) ? $default_langcode : $langcode;
+      $this->assertEqual($field_langcode, $field->getLangcode(), format_string('%entity_type: The field object has the expected langcode  %langcode.', $args));
+      $this->assertEqual($properties[$langcode]['user_id'][0], $entity->getTranslation($langcode)->get('user_id')->target_id, format_string('%entity_type: The entity author has been correctly stored for language %langcode.', $args));
+    }
+
+    // Test query conditions (cache is reset at each call).
+    $translated_id = $entity->id();
+    // Create an additional entity with only the uid set. The uid for the
+    // original language is the same of one used for a translation.
+    $langcode = $this->langcodes[1];
+    $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'user_id' => $properties[$langcode]['user_id'],
+        'name' => 'some name',
+        $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      ))
+      ->save();
+
+    $entities = entity_load_multiple($entity_type);
+    $this->assertEqual(count($entities), 3, format_string('%entity_type: Three entities were created.', array('%entity_type' => $entity_type)));
+    $entities = entity_load_multiple($entity_type, array($translated_id));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by id.', array('%entity_type' => $entity_type)));
+    $entities = entity_load_multiple_by_properties($entity_type, array('name' => $name));
+    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities correctly loaded by name.', array('%entity_type' => $entity_type)));
+    // @todo The default language condition should go away in favor of an
+    // explicit parameter.
+    $entities = entity_load_multiple_by_properties($entity_type, array('name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name translation.', array('%entity_type' => $entity_type)));
+    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $default_langcode, 'name' => $name));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity correctly loaded by name and language.', array('%entity_type' => $entity_type)));
+
+    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0]));
+    $this->assertEqual(count($entities), 0, format_string('%entity_type: No entity loaded by name translation specifying the translation language.', array('%entity_type' => $entity_type)));
+    $entities = entity_load_multiple_by_properties($entity_type, array($langcode_key => $langcode, 'name' => $properties[$langcode]['name'][0], $default_langcode_key => 0));
+    $this->assertEqual(count($entities), 1, format_string('%entity_type: One entity loaded by name translation and language specifying to look for translations.', array('%entity_type' => $entity_type)));
+    $entities = entity_load_multiple_by_properties($entity_type, array('user_id' => $properties[$langcode]['user_id'][0], $default_langcode_key => NULL));
+    $this->assertEqual(count($entities), 2, format_string('%entity_type: Two entities loaded by uid without caring about property translatability.', array('%entity_type' => $entity_type)));
+
+    // Test property conditions and orders with multiple languages in the same
+    // query.
+    $query = \Drupal::entityQuery($entity_type);
+    $group = $query->andConditionGroup()
+      ->condition('user_id', $properties[$default_langcode]['user_id'][0], '=', $default_langcode)
+      ->condition('name', $properties[$default_langcode]['name'][0], '=', $default_langcode);
+    $result = $query
+      ->condition($group)
+      ->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
+      ->execute();
+    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name and uid using different language meta conditions.', array('%entity_type' => $entity_type)));
+
+    // Test mixed property and field conditions.
+    $entity = entity_load($entity_type, reset($result), TRUE);
+    $field_value = $this->randomString();
+    $entity->getTranslation($langcode)->set($this->fieldName, array(array('value' => $field_value)));
+    $entity->save();
+    $query = \Drupal::entityQuery($entity_type);
+    $default_langcode_group = $query->andConditionGroup()
+      ->condition('user_id', $properties[$default_langcode]['user_id'][0], '=', $default_langcode)
+      ->condition('name', $properties[$default_langcode]['name'][0], '=', $default_langcode);
+    $langcode_group = $query->andConditionGroup()
+      ->condition('name', $properties[$langcode]['name'][0], '=', $langcode)
+      ->condition("$this->fieldName.value", $field_value, '=', $langcode);
+    $result = $query
+      ->condition($langcode_key, $default_langcode)
+      ->condition($default_langcode_group)
+      ->condition($langcode_group)
+      ->execute();
+    $this->assertEqual(count($result), 1, format_string('%entity_type: One entity loaded by name, uid and field value using different language meta conditions.', array('%entity_type' => $entity_type)));
+  }
+
+  /**
+   * Tests the Entity Translation API behavior.
+   */
+  function testEntityTranslationAPI() {
+    // Test all entity variations with data table support.
+    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
+      $this->doTestEntityTranslationAPI($entity_type);
+    }
+  }
+
+  /**
+   * Executes the Entity Translation API tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestEntityTranslationAPI($entity_type) {
+    $default_langcode = $this->langcodes[0];
+    $langcode = $this->langcodes[1];
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $default_langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('default_langcode');
+
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $this->entityManager
+      ->getStorage($entity_type)
+      ->create(array('name' => $this->randomMachineName(), $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED));
+
+    $entity->save();
+    $hooks = $this->getHooksInfo();
+    $this->assertFalse($hooks, 'No entity translation hooks are fired when creating an entity.');
+
+    // Verify that we obtain the entity object itself when we attempt to
+    // retrieve a translation referring to it.
+    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    $this->assertFalse($translation->isNewTranslation(), 'Existing translations are not marked as new.');
+    $this->assertIdentical($entity, $translation, 'The translation object corresponding to a non-default language is the entity object itself when the entity is language-neutral.');
+    $entity->{$langcode_key}->value = $default_langcode;
+    $translation = $entity->getTranslation($default_langcode);
+    $this->assertIdentical($entity, $translation, 'The translation object corresponding to the default language (explicit) is the entity object itself.');
+    $translation = $entity->getTranslation(LanguageInterface::LANGCODE_DEFAULT);
+    $this->assertIdentical($entity, $translation, 'The translation object corresponding to the default language (implicit) is the entity object itself.');
+    $this->assertTrue($entity->{$default_langcode_key}->value, 'The translation object is the default one.');
+
+    // Verify that trying to retrieve a translation for a locked language when
+    // the entity is language-aware causes an exception to be thrown.
+    $message = 'A language-neutral translation cannot be retrieved.';
+    try {
+      $entity->getTranslation(LanguageInterface::LANGCODE_NOT_SPECIFIED);
+      $this->fail($message);
+    }
+    catch (\LogicException $e) {
+      $this->pass($message);
+    }
+
+    // Create a translation and verify that the translation object and the
+    // original object behave independently.
+    $name = $default_langcode . '_' . $this->randomMachineName();
+    $entity->name->value = $name;
+    $name_translated = $langcode . '_' . $this->randomMachineName();
+    $translation = $entity->addTranslation($langcode);
+    $this->assertTrue($translation->isNewTranslation(), 'Newly added translations are marked as new.');
+    $this->assertNotIdentical($entity, $translation, 'The entity and the translation object differ from one another.');
+    $this->assertTrue($entity->hasTranslation($langcode), 'The new translation exists.');
+    $this->assertEqual($translation->language()->getId(), $langcode, 'The translation language matches the specified one.');
+    $this->assertEqual($translation->{$langcode_key}->value, $langcode, 'The translation field language value matches the specified one.');
+    $this->assertFalse($translation->{$default_langcode_key}->value, 'The translation object is not the default one.');
+    $this->assertEqual($translation->getUntranslated()->language()->getId(), $default_langcode, 'The original language can still be retrieved.');
+    $translation->name->value = $name_translated;
+    $this->assertEqual($entity->name->value, $name, 'The original name is retained after setting a translated value.');
+    $entity->name->value = $name;
+    $this->assertEqual($translation->name->value, $name_translated, 'The translated name is retained after setting the original value.');
+
+    // Save the translation and check that the expected hooks are fired.
+    $translation->save();
+    $hooks = $this->getHooksInfo();
+
+    $this->assertEqual($hooks['entity_translation_create'], $langcode, 'The generic entity translation creation hook has fired.');
+    $this->assertEqual($hooks[$entity_type . '_translation_create'], $langcode, 'The entity-type-specific entity translation creation hook has fired.');
+
+    $this->assertEqual($hooks['entity_translation_insert'], $langcode, 'The generic entity translation insertion hook has fired.');
+    $this->assertEqual($hooks[$entity_type . '_translation_insert'], $langcode, 'The entity-type-specific entity translation insertion hook has fired.');
+
+    // Verify that changing translation language causes an exception to be
+    // thrown.
+    $message = 'The translation language cannot be changed.';
+    try {
+      $translation->{$langcode_key}->value = $this->langcodes[2];
+      $this->fail($message);
+    }
+    catch (\LogicException $e) {
+      $this->pass($message);
+    }
+
+    // Verify that reassigning the same translation language is allowed.
+    $message = 'The translation language can be reassigned the same value.';
+    try {
+      $translation->{$langcode_key}->value = $langcode;
+      $this->pass($message);
+    }
+    catch (\LogicException $e) {
+      $this->fail($message);
+    }
+
+    // Verify that changing the default translation flag causes an exception to
+    // be thrown.
+    foreach ($entity->getTranslationLanguages() as $t_langcode => $language) {
+      $translation = $entity->getTranslation($t_langcode);
+      $default = $translation->isDefaultTranslation();
+
+      $message = 'The default translation flag can be reassigned the same value.';
+      try {
+        $translation->{$default_langcode_key}->value = $default;
+        $this->pass($message);
+      }
+      catch (\LogicException $e) {
+        $this->fail($message);
+      }
+
+      $message = 'The default translation flag cannot be changed.';
+      try {
+        $translation->{$default_langcode_key}->value = !$default;
+        $this->fail($message);
+      }
+      catch (\LogicException $e) {
+        $this->pass($message);
+      }
+
+      $this->assertEqual($translation->{$default_langcode_key}->value, $default);
+    }
+
+    // Check that after loading an entity the language is the default one.
+    $entity = $this->reloadEntity($entity);
+    $this->assertEqual($entity->language()->getId(), $default_langcode, 'The loaded entity is the original one.');
+
+    // Add another translation and check that everything works as expected. A
+    // new translation object can be obtained also by just specifying a valid
+    // language.
+    $langcode2 = $this->langcodes[2];
+    $translation = $entity->addTranslation($langcode2);
+    $value = $entity !== $translation && $translation->language()->getId() == $langcode2 && $entity->hasTranslation($langcode2);
+    $this->assertTrue($value, 'A new translation object can be obtained also by specifying a valid language.');
+    $this->assertEqual($entity->language()->getId(), $default_langcode, 'The original language has been preserved.');
+    $translation->save();
+    $hooks = $this->getHooksInfo();
+
+    $this->assertEqual($hooks['entity_translation_create'], $langcode2, 'The generic entity translation creation hook has fired.');
+    $this->assertEqual($hooks[$entity_type . '_translation_create'], $langcode2, 'The entity-type-specific entity translation creation hook has fired.');
+
+    $this->assertEqual($hooks['entity_translation_insert'], $langcode2, 'The generic entity translation insertion hook has fired.');
+    $this->assertEqual($hooks[$entity_type . '_translation_insert'], $langcode2, 'The entity-type-specific entity translation insertion hook has fired.');
+
+    // Verify that trying to manipulate a translation object referring to a
+    // removed translation results in exceptions being thrown.
+    $entity = $this->reloadEntity($entity);
+    $translation = $entity->getTranslation($langcode2);
+    $entity->removeTranslation($langcode2);
+    foreach (array('get', 'set', '__get', '__set', 'createDuplicate') as $method) {
+      $message = format_string('The @method method raises an exception when trying to manipulate a removed translation.', array('@method' => $method));
+      try {
+        $translation->{$method}('name', $this->randomMachineName());
+        $this->fail($message);
+      }
+      catch (\Exception $e) {
+        $this->pass($message);
+      }
+    }
+
+    // Verify that deletion hooks are fired when saving an entity with a removed
+    // translation.
+    $entity->save();
+    $hooks = $this->getHooksInfo();
+    $this->assertEqual($hooks['entity_translation_delete'], $langcode2, 'The generic entity translation deletion hook has fired.');
+    $this->assertEqual($hooks[$entity_type . '_translation_delete'], $langcode2, 'The entity-type-specific entity translation deletion hook has fired.');
+    $entity = $this->reloadEntity($entity);
+    $this->assertFalse($entity->hasTranslation($langcode2), 'The translation does not appear among available translations after saving the entity.');
+
+    // Check that removing an invalid translation causes an exception to be
+    // thrown.
+    foreach (array($default_langcode, LanguageInterface::LANGCODE_DEFAULT, $this->randomMachineName()) as $invalid_langcode) {
+      $message = format_string('Removing an invalid translation (@langcode) causes an exception to be thrown.', array('@langcode' => $invalid_langcode));
+      try {
+        $entity->removeTranslation($invalid_langcode);
+        $this->fail($message);
+      }
+      catch (\Exception $e) {
+        $this->pass($message);
+      }
+    }
+
+    // Check that hooks are fired only when actually storing data.
+    $entity = $this->reloadEntity($entity);
+    $entity->addTranslation($langcode2);
+    $entity->removeTranslation($langcode2);
+    $entity->save();
+    $hooks = $this->getHooksInfo();
+
+    $this->assertTrue(isset($hooks['entity_translation_create']), 'The generic entity translation creation hook is run when adding and removing a translation without storing it.');
+    unset($hooks['entity_translation_create']);
+    $this->assertTrue(isset($hooks[$entity_type . '_translation_create']), 'The entity-type-specific entity translation creation hook is run when adding and removing a translation without storing it.');
+    unset($hooks[$entity_type . '_translation_create']);
+
+    $this->assertFalse($hooks, 'No other hooks beyond the entity translation creation hooks are run when adding and removing a translation without storing it.');
+
+    // Check that hooks are fired only when actually storing data.
+    $entity = $this->reloadEntity($entity);
+    $entity->addTranslation($langcode2);
+    $entity->save();
+    $entity = $this->reloadEntity($entity);
+    $this->assertTrue($entity->hasTranslation($langcode2), 'Entity has translation after adding one and saving.');
+    $entity->removeTranslation($langcode2);
+    $entity->save();
+    $entity = $this->reloadEntity($entity);
+    $this->assertFalse($entity->hasTranslation($langcode2), 'Entity does not have translation after removing it and saving.');
+    // Reset hook firing information.
+    $this->getHooksInfo();
+
+    // Verify that entity serialization does not cause stale references to be
+    // left around.
+    $entity = $this->reloadEntity($entity);
+    $translation = $entity->getTranslation($langcode);
+    $entity = unserialize(serialize($entity));
+    $entity->name->value = $this->randomMachineName();
+    $name = $default_langcode . '_' . $this->randomMachineName();
+    $entity->getTranslation($default_langcode)->name->value = $name;
+    $this->assertEqual($entity->name->value, $name, 'No stale reference for the translation object corresponding to the original language.');
+    $translation2 = $entity->getTranslation($langcode);
+    $translation2->name->value .= $this->randomMachineName();
+    $this->assertNotEqual($translation->name->value, $translation2->name->value, 'No stale reference for the actual translation object.');
+    $this->assertEqual($entity, $translation2->getUntranslated(), 'No stale reference in the actual translation object.');
+
+    // Verify that deep-cloning is still available when we are not instantiating
+    // a translation object, which instead relies on shallow cloning.
+    $entity = $this->reloadEntity($entity);
+    $entity->getTranslation($langcode);
+    $cloned = clone $entity;
+    $translation = $cloned->getTranslation($langcode);
+    $this->assertNotIdentical($entity, $translation->getUntranslated(), 'A cloned entity object has no reference to the original one.');
+    $entity->removeTranslation($langcode);
+    $this->assertFalse($entity->hasTranslation($langcode));
+    $this->assertTrue($cloned->hasTranslation($langcode));
+
+    // Check that untranslatable field references keep working after serializing
+    // and cloning the entity.
+    $entity = $this->reloadEntity($entity);
+    $type = $this->randomMachineName();
+    $entity->getTranslation($langcode)->type->value = $type;
+    $entity = unserialize(serialize($entity));
+    $cloned = clone $entity;
+    $translation = $cloned->getTranslation($langcode);
+    $translation->type->value = strrev($type);
+    $this->assertEqual($cloned->type->value, $translation->type->value, 'Untranslatable field references keep working after serializing and cloning the entity.');
+
+    // Check that per-language defaults are properly populated. The
+    // 'entity_test_mul_default_value' entity type is translatable and uses
+    // entity_test_field_default_value() as a "default value callback" for its
+    // 'description' field.
+    $entity = $this->entityManager
+      ->getStorage('entity_test_mul_default_value')
+      ->create(['name' => $this->randomMachineName(), 'langcode' => $langcode]);
+    $translation = $entity->addTranslation($langcode2);
+    $expected = array(
+      array(
+        'shape' => "shape:0:description_$langcode2",
+        'color' => "color:0:description_$langcode2",
+      ),
+      array(
+        'shape' => "shape:1:description_$langcode2",
+        'color' => "color:1:description_$langcode2",
+      ),
+    );
+    $this->assertEqual($translation->description->getValue(), $expected, 'Language-aware default values correctly populated.');
+    $this->assertEqual($translation->description->getLangcode(), $langcode2, 'Field object has the expected langcode.');
+
+    // Reset hook firing information.
+    $this->getHooksInfo();
+  }
+
+  /**
+   * Tests language fallback applied to field and entity translations.
+   */
+  function testLanguageFallback() {
+    // Test all entity variations with data table support.
+    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
+      $this->doTestLanguageFallback($entity_type);
+    }
+  }
+
+  /**
+   * Executes the language fallback test for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestLanguageFallback($entity_type) {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+
+    $current_langcode = $this->languageManager->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
+    $this->langcodes[] = $current_langcode;
+
+    $values = array();
+    foreach ($this->langcodes as $langcode) {
+      $values[$langcode]['name'] = $this->randomMachineName();
+      $values[$langcode]['user_id'] = mt_rand(0, 127);
+    }
+
+    $default_langcode = $this->langcodes[0];
+    $langcode = $this->langcodes[1];
+    $langcode2 = $this->langcodes[2];
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $languages = $this->languageManager->getLanguages();
+    $language = ConfigurableLanguage::load($languages[$langcode]->getId());
+    $language->set('weight', 1);
+    $language->save();
+    $this->languageManager->reset();
+
+    $controller = $this->entityManager->getStorage($entity_type);
+    $entity = $controller->create(array($langcode_key => $default_langcode) + $values[$default_langcode]);
+    $entity->save();
+
+    $entity->addTranslation($langcode, $values[$langcode]);
+    $entity->save();
+
+    // Check that retrieving the current translation works as expected.
+    $entity = $this->reloadEntity($entity);
+    $translation = $this->entityManager->getTranslationFromContext($entity, $langcode2);
+    $this->assertEqual($translation->language()->getId(), $default_langcode, 'The current translation language matches the expected one.');
+
+    // Check that language fallback respects language weight by default.
+    $language = ConfigurableLanguage::load($languages[$langcode]->getId());
+    $language->set('weight', -1);
+    $language->save();
+    $translation = $this->entityManager->getTranslationFromContext($entity, $langcode2);
+    $this->assertEqual($translation->language()->getId(), $langcode, 'The current translation language matches the expected one.');
+
+    // Check that the current translation is properly returned.
+    $translation = $this->entityManager->getTranslationFromContext($entity);
+    $this->assertEqual($langcode, $translation->language()->getId(), 'The current translation language matches the topmost language fallback candidate.');
+    $entity->addTranslation($current_langcode, $values[$current_langcode]);
+    $translation = $this->entityManager->getTranslationFromContext($entity);
+    $this->assertEqual($current_langcode, $translation->language()->getId(), 'The current translation language matches the current language.');
+
+    // Check that if the entity has no translation no fallback is applied.
+    $entity2 = $controller->create(array($langcode_key => $default_langcode));
+    // Get an view builder.
+    $controller = $this->entityManager->getViewBuilder($entity_type);
+    $entity2_build = $controller->view($entity2);
+    $entity2_output = (string) $renderer->renderRoot($entity2_build);
+    $translation = $this->entityManager->getTranslationFromContext($entity2, $default_langcode);
+    $translation_build = $controller->view($translation);
+    $translation_output = (string) $renderer->renderRoot($translation_build);
+    $this->assertIdentical($entity2_output, $translation_output, 'When the entity has no translation no fallback is applied.');
+
+    // Checks that entity translations are rendered properly.
+    $controller = $this->entityManager->getViewBuilder($entity_type);
+    $build = $controller->view($entity);
+    $renderer->renderRoot($build);
+    $this->assertEqual($build['label']['#markup'], $values[$current_langcode]['name'], 'By default the entity is rendered in the current language.');
+
+    $langcodes = array_combine($this->langcodes, $this->langcodes);
+    // We have no translation for the $langcode2 language, hence the expected
+    // result is the topmost existing translation, that is $langcode.
+    $langcodes[$langcode2] = $langcode;
+    foreach ($langcodes as $desired => $expected) {
+      $build = $controller->view($entity, 'full', $desired);
+      // Unset the #cache key so that a fresh render is produced with each pass,
+      // making the renderable array keys available to compare.
+      unset($build['#cache']);
+      $renderer->renderRoot($build);
+      $this->assertEqual($build['label']['#markup'], $values[$expected]['name'], 'The entity is rendered in the expected language.');
+    }
+  }
+
+  /**
+   * Check that field translatability is handled properly.
+   */
+  function testFieldDefinitions() {
+    // Check that field translatability can be altered to be enabled or disabled
+    // in field definitions.
+    $entity_type = 'entity_test_mulrev';
+    $this->state->set('entity_test.field_definitions.translatable', array('name' => FALSE));
+    $this->entityManager->clearCachedFieldDefinitions();
+    $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
+    $this->assertFalse($definitions['name']->isTranslatable(), 'Field translatability can be disabled programmatically.');
+
+    $this->state->set('entity_test.field_definitions.translatable', array('name' => TRUE));
+    $this->entityManager->clearCachedFieldDefinitions();
+    $definitions = $this->entityManager->getBaseFieldDefinitions($entity_type);
+    $this->assertTrue($definitions['name']->isTranslatable(), 'Field translatability can be enabled programmatically.');
+
+    // Check that field translatability is disabled by default.
+    $base_field_definitions = EntityTestMulRev::baseFieldDefinitions($this->entityManager->getDefinition($entity_type));
+    $this->assertTrue(!isset($base_field_definitions['id']->translatable), 'Translatability for the <em>id</em> field is not defined.');
+    $this->assertFalse($definitions['id']->isTranslatable(), 'Field translatability is disabled by default.');
+
+    // Check that entity id keys have the expect translatability.
+    $translatable_fields = array(
+      'id' => TRUE,
+      'uuid' => TRUE,
+      'revision_id' => TRUE,
+      'type' => TRUE,
+      'langcode' => FALSE,
+    );
+    foreach ($translatable_fields as $name => $translatable) {
+      $this->state->set('entity_test.field_definitions.translatable', array($name => $translatable));
+      $this->entityManager->clearCachedFieldDefinitions();
+      $message = format_string('Field %field cannot be translatable.', array('%field' => $name));
+
+      try {
+        $this->entityManager->getBaseFieldDefinitions($entity_type);
+        $this->fail($message);
+      }
+      catch (\LogicException $e) {
+        $this->pass($message);
+      }
+    }
+  }
+
+  /**
+   * Tests that changing entity language does not break field language.
+   */
+  public function testLanguageChange() {
+    // Test all entity variations with data table support.
+    foreach (entity_test_entity_types(ENTITY_TEST_TYPES_MULTILINGUAL) as $entity_type) {
+      $this->doTestLanguageChange($entity_type);
+    }
+  }
+
+  /**
+   * Executes the entity language change test for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function doTestLanguageChange($entity_type) {
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $controller = $this->entityManager->getStorage($entity_type);
+    $langcode = $this->langcodes[0];
+
+    // check that field languages match entity language regardless of field
+    // translatability.
+    $values = array(
+      $langcode_key => $langcode,
+      $this->fieldName => $this->randomMachineName(),
+      $this->untranslatableFieldName => $this->randomMachineName(),
+    );
+    $entity = $controller->create($values);
+    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected.');
+    }
+
+    // Check that field languages keep matching entity language even after
+    // changing it.
+    $langcode = $this->langcodes[1];
+    $entity->{$langcode_key}->value = $langcode;
+    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after changing entity language.');
+    }
+
+    // Check that entity translation does not affect the language of original
+    // field values and untranslatable ones.
+    $langcode = $this->langcodes[0];
+    $entity->addTranslation($this->langcodes[2], array($this->fieldName => $this->randomMachineName()));
+    $entity->{$langcode_key}->value = $langcode;
+    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+      $this->assertEqual($entity->get($field_name)->getLangcode(), $langcode, 'Field language works as expected after translating the entity and changing language.');
+    }
+
+    // Check that setting the default language to an existing translation
+    // language causes an exception to be thrown.
+    $message = 'An exception is thrown when setting the default language to an existing translation language';
+    try {
+      $entity->{$langcode_key}->value = $this->langcodes[2];
+      $this->fail($message);
+    }
+    catch (\InvalidArgumentException $e) {
+      $this->pass($message);
+    }
+  }
+
+  /**
+   * Tests how entity adapters work with translations.
+   */
+  function testEntityAdapter() {
+    $entity_type = 'entity_test';
+    $default_langcode = 'en';
+    $values[$default_langcode] = array('name' => $this->randomString());
+    $controller = $this->entityManager->getStorage($entity_type);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $controller->create($values[$default_langcode]);
+
+    foreach ($this->langcodes as $langcode) {
+      $values[$langcode] = array('name' => $this->randomString());
+      $entity->addTranslation($langcode, $values[$langcode]);
+    }
+
+    $langcodes = array_merge(array($default_langcode), $this->langcodes);
+    foreach ($langcodes as $langcode) {
+      $adapter = $entity->getTranslation($langcode)->getTypedData();
+      $name = $adapter->get('name')->value;
+      $this->assertEqual($name, $values[$langcode]['name'], SafeMarkup::format('Name correctly retrieved from "@langcode" adapter', array('@langcode' => $langcode)));
+    }
+  }
+
+  /**
+   * Tests if entity references are correct after adding a new translation.
+   */
+  public function testFieldEntityReference() {
+    $entity_type = 'entity_test_mul';
+    $controller = $this->entityManager->getStorage($entity_type);
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $controller->create();
+
+    foreach ($this->langcodes as $langcode) {
+      $entity->addTranslation($langcode);
+    }
+
+    $default_langcode = $entity->getUntranslated()->language()->getId();
+    foreach (array_keys($entity->getTranslationLanguages()) as $langcode) {
+      $translation = $entity->getTranslation($langcode);
+      foreach ($translation->getFields() as $field_name => $field) {
+        if ($field->getFieldDefinition()->isTranslatable()) {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode];
+          $this->assertEqual($langcode, $field->getEntity()->language()->getId(), format_string('Translatable field %field_name on translation %langcode has correct entity reference in translation %langcode.', $args));
+        }
+        else {
+          $args = ['%field_name' => $field_name, '%langcode' => $langcode, '%default_langcode' => $default_langcode];
+          $this->assertEqual($default_langcode, $field->getEntity()->language()->getId(), format_string('Non translatable field %field_name on translation %langcode has correct entity reference in the default translation %default_langcode.', $args));
+        }
+      }
+    }
+  }
+
+  /**
+   * Tests if entity translation statuses are correct after removing two
+   * translation.
+   */
+  public function testDeleteEntityTranslation() {
+    $entity_type = 'entity_test_mul';
+    $controller = $this->entityManager->getStorage($entity_type);
+
+    // Create a translatable test field.
+    $field_storage = FieldStorageConfig::create([
+      'entity_type' => $entity_type,
+      'field_name' => 'translatable_test_field',
+      'type' => 'field_test',
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'label' => $this->randomMachineName(),
+      'bundle' => $entity_type,
+    ]);
+    $field->save();
+
+    // Create an untranslatable test field.
+    $field_storage = FieldStorageConfig::create([
+      'entity_type' => $entity_type,
+      'field_name' => 'untranslatable_test_field',
+      'type' => 'field_test',
+      'translatable' => FALSE,
+    ]);
+    $field_storage->save();
+
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'label' => $this->randomMachineName(),
+      'bundle' => $entity_type,
+    ]);
+    $field->save();
+
+    // Create an entity with both translatable and untranslatable test fields.
+    $values = array(
+      'name' => $this->randomString(),
+      'translatable_test_field' => $this->randomString(),
+      'untranslatable_test_field' => $this->randomString(),
+    );
+
+    /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+    $entity = $controller->create($values);
+
+    foreach ($this->langcodes as $langcode) {
+      $entity->addTranslation($langcode, $values);
+    }
+    $entity->save();
+
+    // Assert there are no deleted languages in the lists yet.
+    $this->assertNull(\Drupal::state()->get('entity_test.delete.translatable_test_field'));
+    $this->assertNull(\Drupal::state()->get('entity_test.delete.untranslatable_test_field'));
+
+    // Remove the second and third langcodes from the entity.
+    $entity->removeTranslation('l1');
+    $entity->removeTranslation('l2');
+    $entity->save();
+
+    // Ensure that for the translatable test field the second and third
+    // langcodes are in the deleted languages list.
+    $actual = \Drupal::state()->get('entity_test.delete.translatable_test_field');
+    $expected_translatable = ['l1', 'l2'];
+    sort($actual);
+    sort($expected_translatable);
+    $this->assertEqual($actual, $expected_translatable);
+    // Ensure that the untranslatable test field is untouched.
+    $this->assertNull(\Drupal::state()->get('entity_test.delete.untranslatable_test_field'));
+
+    // Delete the entity, which removes all remaining translations.
+    $entity->delete();
+
+    // All languages have been deleted now.
+    $actual = \Drupal::state()->get('entity_test.delete.translatable_test_field');
+    $expected_translatable[] = 'en';
+    $expected_translatable[] = 'l0';
+    sort($actual);
+    sort($expected_translatable);
+    $this->assertEqual($actual, $expected_translatable);
+
+    // The untranslatable field is shared and only deleted once, for the
+    // default langcode.
+    $actual = \Drupal::state()->get('entity_test.delete.untranslatable_test_field');
+    $expected_untranslatable = ['en'];
+    sort($actual);
+    sort($expected_untranslatable);
+    $this->assertEqual($actual, $expected_untranslatable);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
new file mode 100644
index 0000000..40031e5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityTypeConstraintValidatorTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\TypedData\DataDefinition;
+
+/**
+ * Tests validation constraints for EntityTypeConstraintValidator.
+ *
+ * @group Entity
+ */
+class EntityTypeConstraintValidatorTest extends EntityKernelTestBase {
+
+  /**
+   * The typed data manager to use.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataManager
+   */
+  protected $typedData;
+
+  public static $modules = array('node', 'field', 'user');
+
+  protected function setUp() {
+    parent::setUp();
+    $this->typedData = $this->container->get('typed_data_manager');
+  }
+
+  /**
+   * Tests the EntityTypeConstraintValidator.
+   */
+  public function testValidation() {
+    // Create a typed data definition with an EntityType constraint.
+    $entity_type = 'node';
+    $definition = DataDefinition::create('entity_reference')
+      ->setConstraints(array(
+        'EntityType' => $entity_type,
+      )
+    );
+
+    // Test the validation.
+    $node = $this->container->get('entity.manager')->getStorage('node')->create(array('type' => 'page'));
+    $typed_data = $this->typedData->create($definition, $node);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passed for correct value.');
+
+    // Test the validation when an invalid value (in this case a user entity)
+    // is passed.
+    $account = $this->createUser();
+
+    $typed_data = $this->typedData->create($definition, $account);
+    $violations = $typed_data->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed for incorrect value.');
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getMessage(), t('The entity must be of type %type.', array('%type' => $entity_type)), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
+    $this->assertEqual($violation->getInvalidValue(), $account, 'The invalid value is set correctly in the violation.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintsTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintsTest.php
new file mode 100644
index 0000000..f0995b8
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintsTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityTypeConstraintsTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+/**
+ * Tests entity level validation constraints.
+ *
+ * @group Entity
+ */
+class EntityTypeConstraintsTest extends EntityKernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_constraints');
+  }
+
+  /**
+   * Tests defining entity constraints via entity type annotations and hooks.
+   */
+  public function testConstraintDefinition() {
+    // Test reading the annotation. There should be two constraints, the defined
+    // constraint and the automatically added EntityChanged constraint.
+    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
+    $default_constraints = ['NotNull' => [], 'EntityChanged' => NULL];
+    $this->assertEqual($default_constraints, $entity_type->getConstraints());
+
+    // Enable our test module and test extending constraints.
+    $this->enableModules(['entity_test_constraints']);
+    $this->container->get('module_handler')->resetImplementations();
+
+    $extra_constraints = ['Test' => []];
+    $this->state->set('entity_test_constraints.build', $extra_constraints);
+    // Re-fetch the entity manager from the new container built after the new
+    // modules were enabled.
+    $this->entityManager = $this->container->get('entity.manager');
+    $this->entityManager->clearCachedDefinitions();
+    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
+    $this->assertEqual($default_constraints + $extra_constraints, $entity_type->getConstraints());
+
+    // Test altering constraints.
+    $altered_constraints = ['Test' => [ 'some_setting' => TRUE]];
+    $this->state->set('entity_test_constraints.alter', $altered_constraints);
+    // Clear the cache in state instance in the Drupal container, so it can pick
+    // up the modified value.
+    \Drupal::state()->resetCache();
+    $this->entityManager->clearCachedDefinitions();
+    $entity_type = $this->entityManager->getDefinition('entity_test_constraints');
+    $this->assertEqual($altered_constraints, $entity_type->getConstraints());
+  }
+
+  /**
+   * Tests entity constraints are validated.
+   */
+  public function testConstraintValidation() {
+    $entity = $this->entityManager->getStorage('entity_test_constraints')->create();
+    $entity->user_id->target_id = 0;
+    $violations = $entity->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passed.');
+    $entity->save();
+    $entity->changed->value = REQUEST_TIME - 86400;
+    $violations = $entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.'));
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
new file mode 100644
index 0000000..2afdbd4
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityTypedDataDefinitionTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\TypedData\EntityDataDefinition;
+use Drupal\Core\Entity\TypedData\EntityDataDefinitionInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\TypedData\ComplexDataDefinitionInterface;
+use Drupal\Core\TypedData\DataReferenceDefinition;
+use Drupal\Core\TypedData\DataReferenceDefinitionInterface;
+use Drupal\Core\TypedData\ListDataDefinitionInterface;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests deriving metadata of entity and field data types.
+ *
+ * @group Entity
+ */
+class EntityTypedDataDefinitionTest extends KernelTestBase {
+
+  /**
+   * The typed data manager to use.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataManager
+   */
+  protected $typedDataManager;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter', 'text', 'node', 'user');
+
+  protected function setUp() {
+    parent::setup();
+    $this->typedDataManager = $this->container->get('typed_data_manager');
+  }
+
+  /**
+   * Tests deriving metadata about fields.
+   */
+  public function testFields() {
+    $field_definition = BaseFieldDefinition::create('integer');
+    // Fields are lists of complex data.
+    $this->assertTrue($field_definition instanceof ListDataDefinitionInterface);
+    $this->assertFalse($field_definition instanceof ComplexDataDefinitionInterface);
+    $field_item_definition = $field_definition->getItemDefinition();
+    $this->assertFalse($field_item_definition instanceof ListDataDefinitionInterface);
+    $this->assertTrue($field_item_definition instanceof ComplexDataDefinitionInterface);
+
+    // Derive metadata about field item properties.
+    $this->assertEqual(array_keys($field_item_definition->getPropertyDefinitions()), array('value'));
+    $this->assertEqual($field_item_definition->getPropertyDefinition('value')->getDataType(), 'integer');
+    $this->assertEqual($field_item_definition->getMainPropertyName(), 'value');
+    $this->assertNull($field_item_definition->getPropertyDefinition('invalid'));
+
+    // Test accessing field item property metadata via the field definition.
+    $this->assertTrue($field_definition instanceof FieldDefinitionInterface);
+    $this->assertEqual(array_keys($field_definition->getPropertyDefinitions()), array('value'));
+    $this->assertEqual($field_definition->getPropertyDefinition('value')->getDataType(), 'integer');
+    $this->assertEqual($field_definition->getMainPropertyName(), 'value');
+    $this->assertNull($field_definition->getPropertyDefinition('invalid'));
+
+    // Test using the definition factory for field item lists and field items.
+    $field_item = $this->typedDataManager->createDataDefinition('field_item:integer');
+    $this->assertFalse($field_item instanceof ListDataDefinitionInterface);
+    $this->assertTrue($field_item instanceof ComplexDataDefinitionInterface);
+    // Comparison should ignore the internal static cache, so compare the
+    // serialized objects instead.
+    $this->assertEqual(serialize($field_item_definition), serialize($field_item));
+
+    $field_definition2 = $this->typedDataManager->createListDataDefinition('field_item:integer');
+    $this->assertTrue($field_definition2 instanceof ListDataDefinitionInterface);
+    $this->assertFalse($field_definition2 instanceof ComplexDataDefinitionInterface);
+    $this->assertEqual(serialize($field_definition), serialize($field_definition2));
+  }
+
+  /**
+   * Tests deriving metadata about entities.
+   */
+  public function testEntities() {
+    $entity_definition = EntityDataDefinition::create('node');
+    // Entities are complex data.
+    $this->assertFalse($entity_definition instanceof ListDataDefinitionInterface);
+    $this->assertTrue($entity_definition instanceof ComplexDataDefinitionInterface);
+
+    $field_definitions = $entity_definition->getPropertyDefinitions();
+    // Comparison should ignore the internal static cache, so compare the
+    // serialized objects instead.
+    $this->assertEqual(serialize($field_definitions), serialize(\Drupal::entityManager()->getBaseFieldDefinitions('node')));
+    $this->assertEqual($entity_definition->getPropertyDefinition('title')->getItemDefinition()->getDataType(), 'field_item:string');
+    $this->assertNull($entity_definition->getMainPropertyName());
+    $this->assertNull($entity_definition->getPropertyDefinition('invalid'));
+
+    $entity_definition2 = $this->typedDataManager->createDataDefinition('entity:node');
+    $this->assertFalse($entity_definition2 instanceof ListDataDefinitionInterface);
+    $this->assertTrue($entity_definition2 instanceof ComplexDataDefinitionInterface);
+    $this->assertEqual(serialize($entity_definition), serialize($entity_definition2));
+
+    // Test that the definition factory creates the right definitions for all
+    // entity data types variants.
+    $this->assertEqual($this->typedDataManager->createDataDefinition('entity'), EntityDataDefinition::create());
+    $this->assertEqual($this->typedDataManager->createDataDefinition('entity:node'), EntityDataDefinition::create('node'));
+
+    // Config entities don't support typed data.
+    $entity_definition = EntityDataDefinition::create('node_type');
+    $this->assertEqual(array(), $entity_definition->getPropertyDefinitions());
+  }
+
+  /**
+   * Tests deriving metadata from entity references.
+   */
+  public function testEntityReferences() {
+    $reference_definition = DataReferenceDefinition::create('entity');
+    $this->assertTrue($reference_definition instanceof DataReferenceDefinitionInterface);
+
+    // Test retrieving metadata about the referenced data.
+    $this->assertEqual($reference_definition->getTargetDefinition()->getDataType(), 'entity');
+    $this->assertTrue($reference_definition->getTargetDefinition() instanceof EntityDataDefinitionInterface);
+
+    // Test that the definition factory creates the right definition object.
+    $reference_definition2 = $this->typedDataManager->createDataDefinition('entity_reference');
+    $this->assertTrue($reference_definition2 instanceof DataReferenceDefinitionInterface);
+    $this->assertEqual($reference_definition2, $reference_definition);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
new file mode 100644
index 0000000..b985c15
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityUUIDTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+/**
+ * Tests creation, saving, and loading of entity UUIDs.
+ *
+ * @group Entity
+ */
+class EntityUUIDTest extends EntityKernelTestBase {
+
+  protected function setUp() {
+    parent::setUp();
+
+    foreach (entity_test_entity_types() as $entity_type_id) {
+      // The entity_test schema is installed by the parent.
+      if ($entity_type_id != 'entity_test') {
+        $this->installEntitySchema($entity_type_id);
+      }
+    }
+  }
+
+  /**
+   * Tests UUID generation in entity CRUD operations.
+   */
+  function testCRUD() {
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->assertCRUD($entity_type);
+    }
+  }
+
+  /**
+   * Executes the UUID CRUD tests for the given entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function assertCRUD($entity_type) {
+    // Verify that no UUID is auto-generated when passing one for creation.
+    $uuid_service = $this->container->get('uuid');
+    $uuid = $uuid_service->generate();
+    $custom_entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'name' => $this->randomMachineName(),
+        'uuid' => $uuid,
+      ));
+    $this->assertIdentical($custom_entity->uuid(), $uuid);
+    // Save this entity, so we have more than one later.
+    $custom_entity->save();
+
+    // Verify that a new UUID is generated upon creating an entity.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('name' => $this->randomMachineName()));
+    $uuid = $entity->uuid();
+    $this->assertTrue($uuid);
+
+    // Verify that the new UUID is different.
+    $this->assertNotEqual($custom_entity->uuid(), $uuid);
+
+    // Verify that the UUID is retained upon saving.
+    $entity->save();
+    $this->assertIdentical($entity->uuid(), $uuid);
+
+    // Verify that the UUID is retained upon loading.
+    $entity_loaded = entity_load($entity_type, $entity->id(), TRUE);
+    $this->assertIdentical($entity_loaded->uuid(), $uuid);
+
+    // Verify that \Drupal::entityManager()->loadEntityByUuid() loads the same entity.
+    $entity_loaded_by_uuid = \Drupal::entityManager()->loadEntityByUuid($entity_type, $uuid, TRUE);
+    $this->assertIdentical($entity_loaded_by_uuid->uuid(), $uuid);
+    $this->assertEqual($entity_loaded_by_uuid->id(), $entity_loaded->id());
+
+    // Creating a duplicate needs to result in a new UUID.
+    $entity_duplicate = $entity->createDuplicate();
+    foreach ($entity->getFields() as $property => $value) {
+      switch($property) {
+        case 'uuid':
+          $this->assertNotNull($entity_duplicate->uuid());
+          $this->assertNotNull($entity->uuid());
+          $this->assertNotEqual($entity_duplicate->uuid(), $entity->uuid());
+          break;
+        case 'id':
+          $this->assertNull($entity_duplicate->id());
+          $this->assertNotNull($entity->id());
+          $this->assertNotEqual($entity_duplicate->id(), $entity->id());
+          break;
+        case 'revision_id':
+          $this->assertNull($entity_duplicate->getRevisionId());
+          $this->assertNotNull($entity->getRevisionId());
+          $this->assertNotEqual($entity_duplicate->getRevisionId(), $entity->getRevisionId());
+          $this->assertNotEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
+          break;
+        default:
+          $this->assertEqual($entity_duplicate->{$property}->getValue(), $entity->{$property}->getValue());
+      }
+    }
+    $entity_duplicate->save();
+    $this->assertNotEqual($entity->id(), $entity_duplicate->id());
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
new file mode 100644
index 0000000..a1fbc3a
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityValidationTest.php
@@ -0,0 +1,208 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityValidationTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\Plugin\Validation\Constraint\CompositeConstraintBase;
+
+/**
+ * Tests the Entity Validation API.
+ *
+ * @group Entity
+ */
+class EntityValidationTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('filter', 'text');
+
+  /**
+   * @var string
+   */
+  protected $entityName;
+
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $entityUser;
+
+  /**
+   * @var string
+   */
+  protected $entityFieldText;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create the test field.
+    module_load_install('entity_test');
+    entity_test_install();
+
+    // Install required default configuration for filter module.
+    $this->installConfig(array('system', 'filter'));
+  }
+
+  /**
+   * Creates a test entity.
+   *
+   * @param string $entity_type
+   *   An entity type.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The created test entity.
+   */
+  protected function createTestEntity($entity_type) {
+    $this->entityName = $this->randomMachineName();
+    $this->entityUser = $this->createUser();
+
+    // Pass in the value of the name field when creating. With the user
+    // field we test setting a field after creation.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    $entity->user_id->target_id = $this->entityUser->id();
+    $entity->name->value = $this->entityName;
+
+    // Set a value for the test field.
+    if ($entity->hasField('field_test_text')) {
+      $this->entityFieldText = $this->randomMachineName();
+      $entity->field_test_text->value = $this->entityFieldText;
+    }
+
+    return $entity;
+  }
+
+  /**
+   * Tests validating test entity types.
+   */
+  public function testValidation() {
+    // Ensure that the constraint manager is marked as cached cleared.
+
+    // Use the protected property on the cache_clearer first to check whether
+    // the constraint manager is added there.
+
+    // Ensure that the proxy class is initialized, which has the necessary
+    // method calls attached.
+    \Drupal::service('plugin.cache_clearer');
+    $plugin_cache_clearer = \Drupal::service('drupal.proxy_original_service.plugin.cache_clearer');
+    $get_cached_discoveries = function () {
+      return $this->cachedDiscoveries;
+    };
+    $get_cached_discoveries = $get_cached_discoveries->bindTo($plugin_cache_clearer, $plugin_cache_clearer);
+    $cached_discoveries = $get_cached_discoveries();
+    $cached_discovery_classes = [];
+    foreach ($cached_discoveries as $cached_discovery) {
+      $cached_discovery_classes[] = get_class($cached_discovery);
+    }
+    $this->assertTrue(in_array('Drupal\Core\Validation\ConstraintManager', $cached_discovery_classes));
+
+    // All entity variations have to have the same results.
+    foreach (entity_test_entity_types() as $entity_type) {
+      $this->checkValidation($entity_type);
+    }
+  }
+
+  /**
+   * Executes the validation test set for a defined entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to run the tests with.
+   */
+  protected function checkValidation($entity_type) {
+    $entity = $this->createTestEntity($entity_type);
+    $violations = $entity->validate();
+    $this->assertEqual($violations->count(), 0, 'Validation passes.');
+
+    // Test triggering a fail for each of the constraints specified.
+    $test_entity = clone $entity;
+    $test_entity->id->value = -1;
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('%name: The integer must be larger or equal to %min.', array('%name' => 'ID', '%min' => 0)));
+
+    $test_entity = clone $entity;
+    $test_entity->uuid->value = $this->randomString(129);
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'UUID', '@max' => 128)));
+
+    $test_entity = clone $entity;
+    $langcode_key = $this->entityManager->getDefinition($entity_type)->getKey('langcode');
+    $test_entity->{$langcode_key}->value = $this->randomString(13);
+    $violations = $test_entity->validate();
+    // This should fail on AllowedValues and Length constraints.
+    $this->assertEqual($violations->count(), 2, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('This value is too long. It should have %limit characters or less.', array('%limit' => '12')));
+    $this->assertEqual($violations[1]->getMessage(), t('The value you selected is not a valid choice.'));
+
+    $test_entity = clone $entity;
+    $test_entity->type->value = NULL;
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('This value should not be null.'));
+
+    $test_entity = clone $entity;
+    $test_entity->name->value = $this->randomString(33);
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('%name: may not be longer than @max characters.', array('%name' => 'Name', '@max' => 32)));
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getRoot()->getValue(), $test_entity, 'Violation root is entity.');
+    $this->assertEqual($violation->getPropertyPath(), 'name.0.value', 'Violation property path is correct.');
+    $this->assertEqual($violation->getInvalidValue(), $test_entity->name->value, 'Violation contains invalid value.');
+
+    $test_entity = clone $entity;
+    $test_entity->set('user_id', 9999);
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('The referenced entity (%type: %id) does not exist.', array('%type' => 'user', '%id' => 9999)));
+
+    $test_entity = clone $entity;
+    $test_entity->field_test_text->format = $this->randomString(33);
+    $violations = $test_entity->validate();
+    $this->assertEqual($violations->count(), 1, 'Validation failed.');
+    $this->assertEqual($violations[0]->getMessage(), t('The value you selected is not a valid choice.'));
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getRoot()->getValue(), $test_entity, 'Violation root is entity.');
+    $this->assertEqual($violation->getPropertyPath(), 'field_test_text.0.format', 'Violation property path is correct.');
+    $this->assertEqual($violation->getInvalidValue(), $test_entity->field_test_text->format, 'Violation contains invalid value.');
+  }
+
+  /**
+   * Tests composite constraints.
+   */
+  public function testCompositeConstraintValidation() {
+    $entity = $this->createTestEntity('entity_test_composite_constraint');
+    $violations = $entity->validate();
+    $this->assertEqual($violations->count(), 0);
+
+    // Trigger violation condition.
+    $entity->name->value = 'test';
+    $entity->type->value = 'test2';
+    $violations = $entity->validate();
+    $this->assertEqual($violations->count(), 1);
+
+    // Make sure we can determine this is composite constraint.
+    $constraint = $violations[0]->getConstraint();
+    $this->assertTrue($constraint instanceof CompositeConstraintBase, 'Constraint is composite constraint.');
+    $this->assertEqual('type', $violations[0]->getPropertyPath());
+
+    /** @var CompositeConstraintBase $constraint */
+    $this->assertEqual($constraint->coversFields(), ['name', 'type'], 'Information about covered fields can be retrieved.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
new file mode 100644
index 0000000..60ac065
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityViewBuilderTest.php
@@ -0,0 +1,217 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\EntityViewBuilderTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait;
+use Drupal\Core\Cache\Cache;
+use Drupal\user\Entity\Role;
+use Drupal\user\RoleInterface;
+
+/**
+ * Tests the entity view builder.
+ *
+ * @group Entity
+ */
+class EntityViewBuilderTest extends EntityKernelTestBase {
+
+  use EntityReferenceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installConfig(array('user', 'entity_test'));
+
+    // Give anonymous users permission to view test entities.
+    Role::load(RoleInterface::ANONYMOUS_ID)
+      ->grantPermission('view test entity')
+      ->save();
+  }
+
+  /**
+   * Tests entity render cache handling.
+   */
+  public function testEntityViewBuilderCache() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $cache_contexts_manager = \Drupal::service("cache_contexts_manager");
+    $cache = \Drupal::cache();
+
+    // Force a request via GET so we can get drupal_render() cache working.
+    $request = \Drupal::request();
+    $request_method = $request->server->get('REQUEST_METHOD');
+    $request->setMethod('GET');
+
+    $entity_test = $this->createTestEntity('entity_test');
+
+    // Test that new entities (before they are saved for the first time) do not
+    // generate a cache entry.
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
+    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'The render array element of new (unsaved) entities is not cached, but does have cache tags set.');
+
+    // Get a fully built entity view render array.
+    $entity_test->save();
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
+    $cid = implode(':', $cid_parts);
+    $bin = $build['#cache']['bin'];
+
+    // Mock the build array to not require the theme registry.
+    unset($build['#theme']);
+    $build['#markup'] = 'entity_render_test';
+
+    // Test that a cache entry is created.
+    $renderer->renderRoot($build);
+    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
+
+    // Re-save the entity and check that the cache entry has been deleted.
+    $cache->set('kittens', 'Kitten data', Cache::PERMANENT, $build['#cache']['tags']);
+    $entity_test->save();
+    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was saved.');
+    $this->assertFalse($cache->get('kittens'), 'The entity saving has invalidated cache tags.');
+
+    // Rebuild the render array (creating a new cache entry in the process) and
+    // delete the entity to check the cache entry is deleted.
+    unset($build['#printed']);
+    $renderer->renderRoot($build);
+    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
+    $entity_test->delete();
+    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was deleted.');
+
+    // Restore the previous request method.
+    $request->setMethod($request_method);
+  }
+
+  /**
+   * Tests entity render cache with references.
+   */
+  public function testEntityViewBuilderCacheWithReferences() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+    $cache_contexts_manager = \Drupal::service("cache_contexts_manager");
+
+    // Force a request via GET so we can get drupal_render() cache working.
+    $request = \Drupal::request();
+    $request_method = $request->server->get('REQUEST_METHOD');
+    $request->setMethod('GET');
+
+    // Create an entity reference field and an entity that will be referenced.
+    $this->createEntityReferenceField('entity_test', 'entity_test', 'reference_field', 'Reference', 'entity_test');
+    entity_get_display('entity_test', 'entity_test', 'full')->setComponent('reference_field', [
+      'type' => 'entity_reference_entity_view',
+      'settings' => ['link' => FALSE],
+    ])->save();
+    $entity_test_reference = $this->createTestEntity('entity_test');
+    $entity_test_reference->save();
+
+    // Get a fully built entity view render array for the referenced entity.
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test_reference, 'full');
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
+    $cid_reference = implode(':', $cid_parts);
+    $bin_reference = $build['#cache']['bin'];
+
+    // Mock the build array to not require the theme registry.
+    unset($build['#theme']);
+    $build['#markup'] = 'entity_render_test';
+    $renderer->renderRoot($build);
+
+    // Test that a cache entry was created for the referenced entity.
+    $this->assertTrue($this->container->get('cache.' . $bin_reference)->get($cid_reference), 'The entity render element for the referenced entity has been cached.');
+
+    // Create another entity that references the first one.
+    $entity_test = $this->createTestEntity('entity_test');
+    $entity_test->reference_field->entity = $entity_test_reference;
+    $entity_test->save();
+
+    // Get a fully built entity view render array.
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
+    $cid_parts = array_merge($build['#cache']['keys'], $cache_contexts_manager->convertTokensToKeys(['languages:' . LanguageInterface::TYPE_INTERFACE, 'theme', 'user.permissions'])->getKeys());
+    $cid = implode(':', $cid_parts);
+    $bin = $build['#cache']['bin'];
+
+    // Mock the build array to not require the theme registry.
+    unset($build['#theme']);
+    $build['#markup'] = 'entity_render_test';
+    $renderer->renderRoot($build);
+
+    // Test that a cache entry is created.
+    $this->assertTrue($this->container->get('cache.' . $bin)->get($cid), 'The entity render element has been cached.');
+
+    // Save the entity and verify that both cache entries have been deleted.
+    $entity_test_reference->save();
+    $this->assertFalse($this->container->get('cache.' . $bin)->get($cid), 'The entity render cache has been cleared when the entity was deleted.');
+    $this->assertFalse($this->container->get('cache.' . $bin_reference)->get($cid_reference), 'The entity render cache for the referenced entity has been cleared when the entity was deleted.');
+
+    // Restore the previous request method.
+    $request->setMethod($request_method);
+  }
+
+  /**
+   * Tests entity render cache toggling.
+   */
+  public function testEntityViewBuilderCacheToggling() {
+    $entity_test = $this->createTestEntity('entity_test');
+    $entity_test->save();
+
+    // Test a view mode in default conditions: render caching is enabled for
+    // the entity type and the view mode.
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
+    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age', 'keys', 'bin'] , 'A view mode with render cache enabled has the correct output (cache tags, keys, contexts, max-age and bin).');
+
+    // Test that a view mode can opt out of render caching.
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'test');
+    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'A view mode with render cache disabled has the correct output (only cache tags, contexts and max-age).');
+
+    // Test that an entity type can opt out of render caching completely.
+    $entity_test_no_cache = $this->createTestEntity('entity_test_label');
+    $entity_test_no_cache->save();
+    $build = $this->container->get('entity.manager')->getViewBuilder('entity_test_label')->view($entity_test_no_cache, 'full');
+    $this->assertTrue(isset($build['#cache']) && array_keys($build['#cache']) == ['tags', 'contexts', 'max-age'], 'An entity type can opt out of render caching regardless of view mode configuration, but always has cache tags, contexts and max-age set.');
+  }
+
+  /**
+   * Tests weighting of display components.
+   */
+  public function testEntityViewBuilderWeight() {
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = $this->container->get('renderer');
+
+    // Set a weight for the label component.
+    entity_get_display('entity_test', 'entity_test', 'full')
+      ->setComponent('label', array('weight' => 20))
+      ->save();
+
+    // Create and build a test entity.
+    $entity_test = $this->createTestEntity('entity_test');
+    $view =  $this->container->get('entity.manager')->getViewBuilder('entity_test')->view($entity_test, 'full');
+    $renderer->renderRoot($view);
+
+    // Check that the weight is respected.
+    $this->assertEqual($view['label']['#weight'], 20, 'The weight of a display component is respected.');
+  }
+
+  /**
+   * Creates an entity for testing.
+   *
+   * @param string $entity_type
+   *   The entity type.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The created entity.
+   */
+  protected function createTestEntity($entity_type) {
+    $data = array(
+      'bundle' => $entity_type,
+      'name' => $this->randomMachineName(),
+    );
+    return $this->container->get('entity.manager')->getStorage($entity_type)->create($data);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
new file mode 100644
index 0000000..612c441
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -0,0 +1,564 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\FieldSqlStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests Field SQL Storage .
+ *
+ * Field_sql_storage.module implements the default back-end storage plugin
+ * for the Field Storage API.
+ *
+ * @group Entity
+ */
+class FieldSqlStorageTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field', 'field_test', 'text', 'entity_test');
+
+  /**
+   * The name of the created field.
+   *
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * @var int
+   */
+  protected $fieldCardinality;
+
+  /**
+   * A field storage to use in this class.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * A field to use in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * Name of the data table of the field.
+   *
+   * @var string
+   */
+  protected $table;
+
+  /**
+   * Name of the revision table of the field.
+   *
+   * @var string
+   */
+  protected $revisionTable;
+
+  /**
+   * The table mapping for the tested entity type.
+   *
+   * @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping
+   */
+  protected $tableMapping;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_rev');
+    $entity_type = 'entity_test_rev';
+
+    $this->fieldName = strtolower($this->randomMachineName());
+    $this->fieldCardinality = 4;
+    $this->fieldStorage = FieldStorageConfig::create(array(
+      'field_name' => $this->fieldName,
+      'entity_type' => $entity_type,
+      'type' => 'test_field',
+      'cardinality' => $this->fieldCardinality,
+    ));
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => $entity_type
+    ]);
+    $this->field->save();
+
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping();
+    $this->tableMapping = $table_mapping;
+    $this->table = $table_mapping->getDedicatedDataTableName($this->fieldStorage);
+    $this->revisionTable = $table_mapping->getDedicatedRevisionTableName($this->fieldStorage);
+  }
+
+  /**
+   * Tests field loading works correctly by inserting directly in the tables.
+   */
+  function testFieldLoad() {
+    $entity_type = $bundle = 'entity_test_rev';
+    $storage = $this->container->get('entity.manager')->getStorage($entity_type);
+
+    $columns = array('bundle', 'deleted', 'entity_id', 'revision_id', 'delta', 'langcode', $this->tableMapping->getFieldColumnName($this->fieldStorage, 'value'));
+
+    // Create an entity with four revisions.
+    $revision_ids = array();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+    $entity->save();
+    $revision_ids[] = $entity->getRevisionId();
+    for ($i = 0; $i < 4; $i++) {
+      $entity->setNewRevision();
+      $entity->save();
+      $revision_ids[] = $entity->getRevisionId();
+    }
+
+    // Generate values and insert them directly in the storage tables.
+    $values = array();
+    $query = db_insert($this->revisionTable)->fields($columns);
+    foreach ($revision_ids as $revision_id) {
+      // Put one value too many.
+      for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
+        $value = mt_rand(1, 127);
+        $values[$revision_id][] = $value;
+        $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
+      }
+      $query->execute();
+    }
+    $query = db_insert($this->table)->fields($columns);
+    foreach ($values[$revision_id] as $delta => $value) {
+      $query->values(array($bundle, 0, $entity->id(), $revision_id, $delta, $entity->language()->getId(), $value));
+    }
+    $query->execute();
+
+    // Load every revision and check the values.
+    foreach ($revision_ids as $revision_id) {
+      $entity = $storage->loadRevision($revision_id);
+      foreach ($values[$revision_id] as $delta => $value) {
+        if ($delta < $this->fieldCardinality) {
+          $this->assertEqual($entity->{$this->fieldName}[$delta]->value, $value);
+        }
+        else {
+          $this->assertFalse(array_key_exists($delta, $entity->{$this->fieldName}));
+        }
+      }
+    }
+
+    // Load the "current revision" and check the values.
+    $entity = $storage->load($entity->id());
+    foreach ($values[$revision_id] as $delta => $value) {
+      if ($delta < $this->fieldCardinality) {
+        $this->assertEqual($entity->{$this->fieldName}[$delta]->value, $value);
+      }
+      else {
+        $this->assertFalse(array_key_exists($delta, $entity->{$this->fieldName}));
+      }
+    }
+
+    // Add a translation in an unavailable language code and verify it is not
+    // loaded.
+    $unavailable_langcode = 'xx';
+    $values = array($bundle, 0, $entity->id(), $entity->getRevisionId(), 0, $unavailable_langcode, mt_rand(1, 127));
+    db_insert($this->table)->fields($columns)->values($values)->execute();
+    db_insert($this->revisionTable)->fields($columns)->values($values)->execute();
+    $entity = $storage->load($entity->id());
+    $this->assertFalse(array_key_exists($unavailable_langcode, $entity->{$this->fieldName}));
+  }
+
+  /**
+   * Tests field saving works correctly by reading directly from the tables.
+   */
+  function testFieldWrite() {
+    $entity_type = $bundle = 'entity_test_rev';
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create();
+
+    $revision_values = array();
+
+    // Check insert. Add one value too many.
+    $values = array();
+    for ($delta = 0; $delta <= $this->fieldCardinality; $delta++) {
+      $values[$delta]['value'] = mt_rand(1, 127);
+    }
+    $entity->{$this->fieldName} = $values;
+    $entity->save();
+
+    // Read the tables and check the correct values have been stored.
+    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
+    $this->assertEqual(count($rows), $this->fieldCardinality);
+    foreach ($rows as $delta => $row) {
+      $expected = array(
+        'bundle' => $bundle,
+        'deleted' => 0,
+        'entity_id' => $entity->id(),
+        'revision_id' => $entity->getRevisionId(),
+        'langcode' => $entity->language()->getId(),
+        'delta' => $delta,
+        $this->fieldName . '_value' => $values[$delta]['value'],
+      );
+      $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
+    }
+
+    // Test update. Add less values and check that the previous values did not
+    // persist.
+    $values = array();
+    for ($delta = 0; $delta <= $this->fieldCardinality - 2; $delta++) {
+      $values[$delta]['value'] = mt_rand(1, 127);
+    }
+    $entity->{$this->fieldName} = $values;
+    $entity->save();
+    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
+    $this->assertEqual(count($rows), count($values));
+    foreach ($rows as $delta => $row) {
+      $expected = array(
+        'bundle' => $bundle,
+        'deleted' => 0,
+        'entity_id' => $entity->id(),
+        'revision_id' => $entity->getRevisionId(),
+        'langcode' => $entity->language()->getId(),
+        'delta' => $delta,
+        $this->fieldName . '_value' => $values[$delta]['value'],
+      );
+      $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
+    }
+
+    // Create a new revision.
+    $revision_values[$entity->getRevisionId()] = $values;
+    $values = array();
+    for ($delta = 0; $delta < $this->fieldCardinality; $delta++) {
+      $values[$delta]['value'] = mt_rand(1, 127);
+    }
+    $entity->{$this->fieldName} = $values;
+    $entity->setNewRevision();
+    $entity->save();
+    $revision_values[$entity->getRevisionId()] = $values;
+
+    // Check that data for both revisions are in the revision table.
+    foreach ($revision_values as $revision_id => $values) {
+      $rows = db_select($this->revisionTable, 't')->fields('t')->condition('revision_id', $revision_id)->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
+      $this->assertEqual(count($rows), min(count($values), $this->fieldCardinality));
+      foreach ($rows as $delta => $row) {
+        $expected = array(
+          'bundle' => $bundle,
+          'deleted' => 0,
+          'entity_id' => $entity->id(),
+          'revision_id' => $revision_id,
+          'langcode' => $entity->language()->getId(),
+          'delta' => $delta,
+          $this->fieldName . '_value' => $values[$delta]['value'],
+        );
+        $this->assertEqual($row, $expected, "Row $delta was stored as expected.");
+      }
+    }
+
+    // Test emptying the field.
+    $entity->{$this->fieldName} = NULL;
+    $entity->save();
+    $rows = db_select($this->table, 't')->fields('t')->execute()->fetchAllAssoc('delta', \PDO::FETCH_ASSOC);
+    $this->assertEqual(count($rows), 0);
+  }
+
+  /**
+   * Tests that long entity type and field names do not break.
+   */
+  function testLongNames() {
+    // Use one of the longest entity_type names in core.
+    $entity_type = $bundle = 'entity_test_label_callback';
+    $storage = $this->container->get('entity.manager')->getStorage($entity_type);
+
+    // Create two fields and generate random values.
+    $name_base = Unicode::strtolower($this->randomMachineName(FieldStorageConfig::NAME_MAX_LENGTH - 1));
+    $field_names = array();
+    $values = array();
+    for ($i = 0; $i < 2; $i++) {
+      $field_names[$i] = $name_base . $i;
+      FieldStorageConfig::create(array(
+        'field_name' => $field_names[$i],
+        'entity_type' => $entity_type,
+        'type' => 'test_field',
+      ))->save();
+      FieldConfig::create([
+        'field_name' => $field_names[$i],
+        'entity_type' => $entity_type,
+        'bundle' => $bundle,
+      ])->save();
+      $values[$field_names[$i]] = mt_rand(1, 127);
+    }
+
+    // Save an entity with values.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create($values);
+    $entity->save();
+
+    // Load the entity back and check the values.
+    $entity = $storage->load($entity->id());
+    foreach ($field_names as $field_name) {
+      $this->assertEqual($entity->get($field_name)->value, $values[$field_name]);
+    }
+  }
+
+  /**
+   * Test trying to update a field with data.
+   */
+  function testUpdateFieldSchemaWithData() {
+    $entity_type = 'entity_test_rev';
+    // Create a decimal 5.2 field and add some data.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'decimal52',
+      'entity_type' => $entity_type,
+      'type' => 'decimal',
+      'settings' => array('precision' => 5, 'scale' => 2),
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $entity_type,
+    ]);
+    $field->save();
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'id' => 0,
+        'revision_id' => 0,
+      ));
+    $entity->decimal52->value = '1.235';
+    $entity->save();
+
+    // Attempt to update the field in a way that would work without data.
+    $field_storage->setSetting('scale', 3);
+    try {
+      $field_storage->save();
+      $this->fail(t('Cannot update field schema with data.'));
+    }
+    catch (FieldStorageDefinitionUpdateForbiddenException $e) {
+      $this->pass(t('Cannot update field schema with data.'));
+    }
+  }
+
+  /**
+   * Test that failure to create fields is handled gracefully.
+   */
+  function testFieldUpdateFailure() {
+    // Create a text field.
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => 'test_text',
+      'entity_type' => 'entity_test_rev',
+      'type' => 'text',
+      'settings' => array('max_length' => 255),
+    ));
+    $field_storage->save();
+
+    // Attempt to update the field in a way that would break the storage. The
+    // parenthesis suffix is needed because SQLite has *very* relaxed rules for
+    // data types, so we actually need to provide an invalid SQL syntax in order
+    // to break it.
+    // @see https://www.sqlite.org/datatype3.html
+    $prior_field_storage = $field_storage;
+    $field_storage->setSetting('max_length', '-1)');
+    try {
+      $field_storage->save();
+      $this->fail(t('Update succeeded.'));
+    }
+    catch (\Exception $e) {
+      $this->pass(t('Update properly failed.'));
+    }
+
+    // Ensure that the field tables are still there.
+    $tables = array(
+      $this->tableMapping->getDedicatedDataTableName($prior_field_storage),
+      $this->tableMapping->getDedicatedRevisionTableName($prior_field_storage),
+    );
+    foreach ($tables as $table_name) {
+      $this->assertTrue(db_table_exists($table_name), t('Table %table exists.', array('%table' => $table_name)));
+    }
+  }
+
+  /**
+   * Test adding and removing indexes while data is present.
+   */
+  function testFieldUpdateIndexesWithData() {
+    // Create a decimal field.
+    $field_name = 'testfield';
+    $entity_type = 'entity_test_rev';
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => $entity_type,
+      'type' => 'text',
+    ));
+    $field_storage->save();
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => $entity_type,
+    ]);
+    $field->save();
+    $tables = array($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage));
+
+    // Verify the indexes we will create do not exist yet.
+    foreach ($tables as $table) {
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value'), t("No index named value exists in @table", array('@table' => $table)));
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, 'value_format'), t("No index named value_format exists in @table", array('@table' => $table)));
+    }
+
+    // Add data so the table cannot be dropped.
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array(
+        'id' => 1,
+        'revision_id' => 1,
+      ));
+    $entity->$field_name->value = 'field data';
+    $entity->enforceIsNew();
+    $entity->save();
+
+    // Add an index.
+    $field_storage->setIndexes(['value' => [['value', 255]]]);
+    $field_storage->save();
+    foreach ($tables as $table) {
+      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value created in @table", array('@table' => $table)));
+    }
+
+    // Add a different index, removing the existing custom one.
+    $field_storage->setIndexes(['value_format' => [['value', 127], ['format', 127]]]);
+    $field_storage->save();
+    foreach ($tables as $table) {
+      $this->assertTrue(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value_format"), t("Index on value_format created in @table", array('@table' => $table)));
+      $this->assertFalse(Database::getConnection()->schema()->indexExists($table, "{$field_name}_value"), t("Index on value removed in @table", array('@table' => $table)));
+    }
+
+    // Verify that the tables were not dropped in the process.
+    $entity = $this->container->get('entity.manager')->getStorage($entity_type)->load(1);
+    $this->assertEqual($entity->$field_name->value, 'field data', t("Index changes performed without dropping the tables"));
+  }
+
+  /**
+   * Test foreign key support.
+   */
+  function testFieldSqlStorageForeignKeys() {
+    // Create a 'shape' field, with a configurable foreign key (see
+    // field_test_field_schema()).
+    $field_name = 'testfield';
+    $foreign_key_name = 'shape';
+    $field_storage = FieldStorageConfig::create(array(
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => 'shape',
+      'settings' => array('foreign_key_name' => $foreign_key_name),
+    ));
+    $field_storage->save();
+    // Get the field schema.
+    $schema = $field_storage->getSchema();
+
+    // Retrieve the field definition and check that the foreign key is in place.
+    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name preserved through CRUD');
+    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name preserved through CRUD');
+
+    // Update the field settings, it should update the foreign key definition too.
+    $foreign_key_name = 'color';
+    $field_storage->setSetting('foreign_key_name', $foreign_key_name);
+    $field_storage->save();
+    // Reload the field schema after the update.
+    $schema = $field_storage->getSchema();
+
+    // Check that the foreign key is in place.
+    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['table'], $foreign_key_name, 'Foreign key table name modified after update');
+    $this->assertEqual($schema['foreign keys'][$foreign_key_name]['columns'][$foreign_key_name], 'id', 'Foreign key column name modified after update');
+  }
+
+  /**
+   * Tests table name generation.
+   */
+  public function testTableNames() {
+    // Note: we need to test entity types with long names. We therefore use
+    // fields on imaginary entity types (works as long as we don't actually save
+    // them), and just check the generated table names.
+
+    // Short entity type and field name.
+    $entity_type = 'short_entity_type';
+    $field_name = 'short_field_name';
+    $field_storage = FieldStorageConfig::create(array(
+      'entity_type' => $entity_type,
+      'field_name' => $field_name,
+      'type' => 'test_field',
+    ));
+    $expected = 'short_entity_type__short_field_name';
+    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
+    $expected = 'short_entity_type_revision__short_field_name';
+    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
+
+    // Short entity type, long field name
+    $entity_type = 'short_entity_type';
+    $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
+    $field_storage = FieldStorageConfig::create(array(
+      'entity_type' => $entity_type,
+      'field_name' => $field_name,
+      'type' => 'test_field',
+    ));
+    $expected = 'short_entity_type__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
+    $expected = 'short_entity_type_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
+
+    // Long entity type, short field name
+    $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
+    $field_name = 'short_field_name';
+    $field_storage = FieldStorageConfig::create(array(
+      'entity_type' => $entity_type,
+      'field_name' => $field_name,
+      'type' => 'test_field',
+    ));
+    $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
+    $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
+
+    // Long entity type and field name.
+    $entity_type = 'long_entity_type_abcdefghijklmnopqrstuvwxyz';
+    $field_name = 'long_field_name_abcdefghijklmnopqrstuvwxyz';
+    $field_storage = FieldStorageConfig::create(array(
+      'entity_type' => $entity_type,
+      'field_name' => $field_name,
+      'type' => 'test_field',
+    ));
+    $expected = 'long_entity_type_abcdefghijklmnopq__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $expected);
+    $expected = 'long_entity_type_abcdefghijklmnopq_r__' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $expected);
+    // Try creating a second field and check there are no clashes.
+    $field_storage2 = FieldStorageConfig::create(array(
+      'entity_type' => $entity_type,
+      'field_name' => $field_name . '2',
+      'type' => 'test_field',
+    ));
+    $this->assertNotEqual($this->tableMapping->getDedicatedDataTableName($field_storage), $this->tableMapping->getDedicatedDataTableName($field_storage2));
+    $this->assertNotEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage), $this->tableMapping->getDedicatedRevisionTableName($field_storage2));
+
+    // Deleted field.
+    $field_storage = FieldStorageConfig::create(array(
+      'entity_type' => 'some_entity_type',
+      'field_name' => 'some_field_name',
+      'type' => 'test_field',
+      'deleted' => TRUE,
+    ));
+    $expected = 'field_deleted_data_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedDataTableName($field_storage, TRUE), $expected);
+    $expected = 'field_deleted_revision_' . substr(hash('sha256', $field_storage->uuid()), 0, 10);
+    $this->assertEqual($this->tableMapping->getDedicatedRevisionTableName($field_storage, TRUE), $expected);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php b/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php
new file mode 100644
index 0000000..0adee64
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/FieldTranslationSqlStorageTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\FieldTranslationSqlStorageTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\field\Entity\FieldStorageConfig;
+
+/**
+ * Tests Field translation SQL Storage.
+ *
+ * @group Entity
+ */
+class FieldTranslationSqlStorageTest extends EntityLanguageTestBase {
+
+  /**
+   * Tests field SQL storage.
+   */
+  public function testFieldSqlStorage() {
+    $entity_type = 'entity_test_mul';
+
+    $controller = $this->entityManager->getStorage($entity_type);
+    $values = array(
+      $this->fieldName => $this->randomMachineName(),
+      $this->untranslatableFieldName => $this->randomMachineName(),
+    );
+    $entity = $controller->create($values);
+    $entity->save();
+
+    // Tests that when changing language field language codes are still correct.
+    $langcode = $this->langcodes[0];
+    $entity->langcode->value = $langcode;
+    $entity->save();
+    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed from language neutral.');
+    $langcode = $this->langcodes[1];
+    $entity->langcode->value = $langcode;
+    $entity->save();
+    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed.');
+    $langcode = LanguageInterface::LANGCODE_NOT_SPECIFIED;
+    $entity->langcode->value = $langcode;
+    $entity->save();
+    $this->assertFieldStorageLangcode($entity, 'Field language successfully changed to language neutral.');
+
+    // Test that after switching field translatability things keep working as
+    // before.
+    $this->toggleFieldTranslatability($entity_type, $entity_type);
+    $entity = $this->reloadEntity($entity);
+    foreach (array($this->fieldName, $this->untranslatableFieldName) as $field_name) {
+      $this->assertEqual($entity->get($field_name)->value, $values[$field_name], 'Field language works as expected after switching translatability.');
+    }
+
+    // Test that after disabling field translatability translated values are not
+    // loaded.
+    $this->toggleFieldTranslatability($entity_type, $entity_type);
+    $entity = $this->reloadEntity($entity);
+    $entity->langcode->value = $this->langcodes[0];
+    $translation = $entity->addTranslation($this->langcodes[1]);
+    $translated_value = $this->randomMachineName();
+    $translation->get($this->fieldName)->value = $translated_value;
+    $translation->save();
+    $this->toggleFieldTranslatability($entity_type, $entity_type);
+    $entity = $this->reloadEntity($entity);
+    $this->assertEqual($entity->getTranslation($this->langcodes[1])->get($this->fieldName)->value, $values[$this->fieldName], 'Existing field translations are not loaded for untranslatable fields.');
+  }
+
+  /**
+   * Checks whether field languages are correctly stored for the given entity.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The entity fields are attached to.
+   * @param string $message
+   *   (optional) A message to display with the assertion.
+   */
+  protected function assertFieldStorageLangcode(FieldableEntityInterface $entity, $message = '') {
+    $status = TRUE;
+    $entity_type = $entity->getEntityTypeId();
+    $id = $entity->id();
+    $langcode = $entity->getUntranslated()->language()->getId();
+    $fields = array($this->fieldName, $this->untranslatableFieldName);
+    /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
+    $table_mapping = \Drupal::entityManager()->getStorage($entity_type)->getTableMapping();
+
+    foreach ($fields as $field_name) {
+      $field_storage = FieldStorageConfig::loadByName($entity_type, $field_name);
+      $table = $table_mapping->getDedicatedDataTableName($field_storage);
+
+      $record = \Drupal::database()
+        ->select($table, 'f')
+        ->fields('f')
+        ->condition('f.entity_id', $id)
+        ->condition('f.revision_id', $id)
+        ->execute()
+        ->fetchObject();
+
+      if ($record->langcode != $langcode) {
+        $status = FALSE;
+        break;
+      }
+    }
+
+    return $this->assertTrue($status, $message);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
new file mode 100644
index 0000000..49d451d
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/FieldWidgetConstraintValidatorTest.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\FieldWidgetConstraintValidatorTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\entity_test\Entity\EntityTestCompositeConstraint;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests validation constraints for FieldWidgetConstraintValidatorTest.
+ *
+ * @group Entity
+ */
+class FieldWidgetConstraintValidatorTest extends KernelTestBase {
+
+  public static $modules = array('entity_test', 'field', 'user', 'system');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', ['key_value']);
+    $this->container->get('router.builder')->rebuild();
+
+    $this->installEntitySchema('user');
+    $this->installEntitySchema('entity_test_composite_constraint');
+  }
+
+  /**
+   * Tests widget constraint validation.
+   */
+  public function testValidation() {
+    $entity_type = 'entity_test_constraint_violation';
+    $entity = $this->container->get('entity_type.manager')
+      ->getStorage($entity_type)
+      ->create(array('id' => 1, 'revision_id' => 1));
+    $display = entity_get_form_display($entity_type, $entity_type, 'default');
+    $form = array();
+    $form_state = new FormState();
+    $display->buildForm($entity, $form, $form_state);
+
+    // Pretend the form has been built.
+    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type, 'default'));
+    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
+    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
+
+    // Validate the field constraint.
+    $form_state->getFormObject()->setEntity($entity)->setFormDisplay($display, $form_state);
+    $entity = $form_state->getFormObject()->buildEntity($form, $form_state);
+    $display->validateFormValues($entity, $form, $form_state);
+
+    $errors = $form_state->getErrors();
+    $this->assertEqual($errors['name'], 'Widget constraint has failed.', 'Constraint violation is generated correctly');
+  }
+
+  /**
+   * Gets the form errors for a given entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity
+   * @param array $hidden_fields
+   *   (optional) A list of hidden fields.
+   *
+   * @return array
+   *   The form errors.
+   */
+  protected function getErrorsForEntity(EntityInterface $entity, $hidden_fields = []) {
+    $entity_type_id = 'entity_test_composite_constraint';
+    $display = entity_get_form_display($entity_type_id, $entity_type_id, 'default');
+
+    foreach ($hidden_fields as $hidden_field) {
+      $display->removeComponent($hidden_field);
+    }
+
+    $form = [];
+    $form_state = new FormState();
+    $display->buildForm($entity, $form, $form_state);
+
+    $form_state->setFormObject(\Drupal::entityManager()->getFormObject($entity_type_id, 'default'));
+    \Drupal::formBuilder()->prepareForm('field_test_entity_form', $form, $form_state);
+    \Drupal::formBuilder()->processForm('field_test_entity_form', $form, $form_state);
+
+    // Validate the field constraint.
+    /** @var \Drupal\Core\Entity\ContentEntityFormInterface $form_object */
+    $form_object = $form_state->getFormObject();
+    $form_object
+      ->setEntity($entity)
+      ->setFormDisplay($display, $form_state)
+      ->validateForm($form, $form_state);
+
+    return $form_state->getErrors();
+  }
+
+  /**
+   * Tests widget constraint validation with composite constraints.
+   */
+  public function testValidationWithCompositeConstraint() {
+    // First provide a valid value, this should cause no validation.
+    $entity = EntityTestCompositeConstraint::create([
+      'name' => 'valid-value',
+    ]);
+    $entity->save();
+
+    $errors = $this->getErrorsForEntity($entity);
+    $this->assertFalse(isset($errors['name']));
+    $this->assertFalse(isset($errors['type']));
+
+    // Provide an invalid value for the name field.
+    $entity = EntityTestCompositeConstraint::create([
+      'name' => 'failure-field-name',
+    ]);
+    $errors = $this->getErrorsForEntity($entity);
+    $this->assertTrue(isset($errors['name']));
+    $this->assertFalse(isset($errors['type']));
+
+    // Hide the second field (type) and ensure the validation still happens. The
+    // error message appears on the first field (name).
+    $entity = EntityTestCompositeConstraint::create([
+      'name' => 'failure-field-name',
+    ]);
+    $errors = $this->getErrorsForEntity($entity, ['type']);
+    $this->assertTrue(isset($errors['name']));
+    $this->assertFalse(isset($errors['type']));
+
+    // Provide a violation again, but this time hide the first field (name).
+    // Ensure that the validation still happens and the error message is moved
+    // from the field to the second field and have a custom error message.
+    $entity = EntityTestCompositeConstraint::create([
+      'name' => 'failure-field-name',
+    ]);
+    $errors = $this->getErrorsForEntity($entity, ['name']);
+    $this->assertFalse(isset($errors['name']));
+    $this->assertTrue(isset($errors['type']));
+    $this->assertEqual($errors['type'], SafeMarkup::format('The validation failed because the value conflicts with the value in %field_name, which you cannot access.', ['%field_name' => 'name']));
+  }
+
+  /**
+   * Tests entity level constraint validation.
+   */
+  public function testEntityLevelConstraintValidation() {
+    $entity = EntityTestCompositeConstraint::create([
+      'name' => 'entity-level-violation'
+    ]);
+    $entity->save();
+
+    $errors = $this->getErrorsForEntity($entity);
+    $this->assertEqual($errors[''], 'Entity level validation');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
new file mode 100644
index 0000000..c8f0ce5
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/RevisionableContentEntityBaseTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\RevisionableContentEntityBaseTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\entity_test\Entity\EntityTestWithRevisionLog;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Entity\RevisionableContentEntityBase
+ * @group Entity
+ */
+class RevisionableContentEntityBaseTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['entity_test', 'system', 'user'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test_revlog');
+    $this->installEntitySchema('user');
+    $this->installSchema('system', 'sequences');
+  }
+
+  public function testRevisionableContentEntity() {
+    $user = User::create(['name' => 'test name']);
+    $user->save();
+    /** @var \Drupal\entity_test\Entity\EntityTestWithRevisionLog $entity */
+    $entity = EntityTestWithRevisionLog::create([
+      'type' => 'entity_test_revlog',
+    ]);
+    $entity->save();
+
+    $entity->setNewRevision(TRUE);
+    $random_timestamp = rand(1e8, 2e8);
+    $entity->setRevisionCreationTime($random_timestamp);
+    $entity->setRevisionUserId($user->id());
+    $entity->setRevisionLogMessage('This is my log message');
+    $entity->save();
+
+    $revision_id = $entity->getRevisionId();
+
+    $entity = \Drupal::entityTypeManager()->getStorage('entity_test_revlog')->loadRevision($revision_id);
+    $this->assertEquals($random_timestamp, $entity->getRevisionCreationTime());
+    $this->assertEquals($user->id(), $entity->getRevisionUserId());
+    $this->assertEquals($user->id(), $entity->getRevisionUser()->id());
+    $this->assertEquals('This is my log message', $entity->getRevisionLogMessage());
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/RouteProviderTest.php b/core/tests/Drupal/KernelTests/Core/Entity/RouteProviderTest.php
index 3b7af41..c97f03a 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/RouteProviderTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/RouteProviderTest.php
@@ -36,14 +36,6 @@ protected function setUp() {
     $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test_mul');
     $this->installEntitySchema('entity_test_admin_routes');
-    $this->installSchema('system', 'router');
-
-    $router_builder = \Drupal::service('router.builder');
-    $router_builder->rebuild();
-
-    /** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */
-    $router_builder = \Drupal::service('router.builder');
-    $router_builder->rebuild();
 
     /** @var \Drupal\user\RoleInterface $role */
     $role = Role::create([
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php
new file mode 100644
index 0000000..8b8aabf
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ValidReferenceConstraintValidatorTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Entity\ValidReferenceConstraintValidatorTest.
+ */
+
+namespace Drupal\KernelTests\Core\Entity;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Tests validation constraints for ValidReferenceConstraintValidator.
+ *
+ * @group Validation
+ */
+class ValidReferenceConstraintValidatorTest extends EntityKernelTestBase {
+
+  /**
+   * The typed data manager to use.
+   *
+   * @var \Drupal\Core\TypedData\TypedDataManager
+   */
+  protected $typedData;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('field', 'user');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('user', array('users_data'));
+    $this->typedData = $this->container->get('typed_data_manager');
+  }
+
+  /**
+   * Tests the ValidReferenceConstraintValidator.
+   */
+  public function testValidation() {
+    // Create a test entity to be referenced.
+    $entity = $this->createUser();
+    // By default entity references already have the ValidReference constraint.
+    $definition = BaseFieldDefinition::create('entity_reference')
+      ->setSettings(array('target_type' => 'user'));
+
+    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
+    $violations = $typed_data->validate();
+    $this->assertFalse($violations->count(), 'Validation passed for correct value.');
+
+    // NULL is also considered a valid reference.
+    $typed_data = $this->typedData->create($definition, array('target_id' => NULL));
+    $violations = $typed_data->validate();
+    $this->assertFalse($violations->count(), 'Validation passed for correct value.');
+
+    $typed_data = $this->typedData->create($definition, array('target_id' => $entity->id()));
+    // Delete the referenced entity.
+    $entity->delete();
+    $violations = $typed_data->validate();
+    $this->assertTrue($violations->count(), 'Validation failed for incorrect value.');
+
+    // Make sure the information provided by a violation is correct.
+    $violation = $violations[0];
+    $this->assertEqual($violation->getMessage(), t('The referenced entity (%type: %id) does not exist.', array(
+      '%type' => 'user',
+      '%id' => $entity->id(),
+    )), 'The message for invalid value is correct.');
+    $this->assertEqual($violation->getRoot(), $typed_data, 'Violation root is correct.');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
new file mode 100644
index 0000000..059cca7
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Field\FieldAccessTest.
+ */
+
+namespace Drupal\KernelTests\Core\Field;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\user\Entity\User;
+
+/**
+ * Tests Field level access hooks.
+ *
+ * @group Entity
+ */
+class FieldAccessTest extends KernelTestBase {
+
+  /**
+   * Modules to load code from.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'field', 'system', 'text', 'filter', 'user'];
+
+  /**
+   * Holds the currently active global user ID that initiated the test run.
+   *
+   * The user ID gets replaced during the test and needs to be kept here so that
+   * it can be restored at the end of the test run.
+   *
+   * @var int
+   */
+  protected $activeUid;
+
+  protected function setUp() {
+    parent::setUp();
+    // Install field configuration.
+    $this->installConfig(array('field'));
+    // The users table is needed for creating dummy user accounts.
+    $this->installEntitySchema('user');
+    // Register entity_test text field.
+    module_load_install('entity_test');
+    entity_test_install();
+  }
+
+  /**
+   * Tests hook_entity_field_access() and hook_entity_field_access_alter().
+   *
+   * @see entity_test_entity_field_access()
+   * @see entity_test_entity_field_access_alter()
+   */
+  function testFieldAccess() {
+    $values = array(
+      'name' => $this->randomMachineName(),
+      'user_id' => 1,
+      'field_test_text' => array(
+        'value' => 'no access value',
+        'format' => 'full_html',
+      ),
+    );
+    $entity = EntityTest::create($values);
+
+    // Create a dummy user account for testing access with.
+    $values = array('name' => 'test');
+    $account = User::create($values);
+
+    $this->assertFalse($entity->field_test_text->access('view', $account), 'Access to the field was denied.');
+    $expected = AccessResult::forbidden()->addCacheableDependency($entity);
+    $this->assertEqual($expected, $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was denied.');
+
+    $entity->field_test_text = 'access alter value';
+    $this->assertFalse($entity->field_test_text->access('view', $account), 'Access to the field was denied.');
+    $this->assertEqual($expected, $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was denied.');
+
+    $entity->field_test_text = 'standard value';
+    $this->assertTrue($entity->field_test_text->access('view', $account), 'Access to the field was granted.');
+    $this->assertEqual(AccessResult::allowed(), $entity->field_test_text->access('view', $account, TRUE), 'Access to the field was granted.');
+  }
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldItemTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldItemTest.php
new file mode 100644
index 0000000..533484c
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldItemTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Field\FieldItemTest.
+ */
+
+namespace Drupal\KernelTests\Core\Field;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\entity_test\Entity\EntityTestMulRev;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Test field item methods.
+ *
+ * @group Field
+ */
+class FieldItemTest extends EntityKernelTestBase {
+
+  /**
+   * @var string
+   */
+  protected $fieldName;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->container->get('state')->set('entity_test.field_test_item', TRUE);
+    $this->entityManager->clearCachedDefinitions();
+
+    $entity_type_id = 'entity_test_mulrev';
+    $this->installEntitySchema($entity_type_id);
+
+    $this->fieldName = Unicode::strtolower($this->randomMachineName());
+
+    /** @var \Drupal\field\Entity\FieldStorageConfig $field_storage */
+    FieldStorageConfig::create([
+      'field_name' => $this->fieldName,
+      'type' => 'field_test',
+      'entity_type' => $entity_type_id,
+      'cardinality' => 1,
+    ])->save();
+
+    FieldConfig::create([
+      'entity_type' => $entity_type_id,
+      'field_name' => $this->fieldName,
+      'bundle' => $entity_type_id,
+      'label' => 'Test field',
+    ])->save();
+
+    $this->entityManager->clearCachedDefinitions();
+    $definitions = $this->entityManager->getFieldStorageDefinitions($entity_type_id);
+    $this->assertTrue(!empty($definitions[$this->fieldName]));
+  }
+
+  /**
+   * Tests the field item save workflow.
+   */
+  public function testSaveWorkflow() {
+    $entity = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'field_test_item' => $this->randomString(),
+      $this->fieldName => $this->randomString(),
+    ]);
+
+    // Save a new entity and verify that the initial field value is overwritten
+    // with a value containing the entity id, which implies a resave. Check that
+    // the entity data structure and the stored values match.
+    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:1");
+
+    // Update the entity and verify that the field value is overwritten on
+    // presave if it is not resaved.
+    $this->assertSavedFieldItemValue($entity, 'overwritten');
+
+    // Flag the field value as needing to be resaved and verify it actually is.
+    $entity->field_test_item->value = $entity->{$this->fieldName}->value = 'resave';
+    $this->assertSavedFieldItemValue($entity, "field_test:{$this->fieldName}:1:3");
+  }
+
+  /**
+   * Checks that the saved field item value matches the expected one.
+   *
+   * @param \Drupal\entity_test\Entity\EntityTest $entity
+   *   The test entity.
+   * @param $expected_value
+   *   The expected field item value.
+   *
+   * @return bool
+   *   TRUE if the item value matches expectations, FALSE otherwise.
+   */
+  protected function assertSavedFieldItemValue(EntityTest $entity, $expected_value) {
+    $entity->setNewRevision(TRUE);
+    $entity->save();
+    $base_field_expected_value = str_replace($this->fieldName, 'field_test_item', $expected_value);
+    $result = $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
+    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
+    $entity = $this->reloadEntity($entity);
+    $result = $result && $this->assertEqual($entity->field_test_item->value, $base_field_expected_value);
+    $result = $result && $this->assertEqual($entity->{$this->fieldName}->value, $expected_value);
+    return $result;
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
new file mode 100644
index 0000000..9b10ccf
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldModuleUninstallValidatorTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Field\FieldModuleUninstallValidatorTest.
+ */
+
+namespace Drupal\KernelTests\Core\Field;
+
+use Drupal\Core\Extension\ModuleUninstallValidatorException;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\entity_test\FieldStorageDefinition;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Tests FieldModuleUninstallValidator functionality.
+ *
+ * @group Field
+ */
+class FieldModuleUninstallValidatorTest extends EntityKernelTestBase {
+
+  /**
+   * The entity definition update manager.
+   *
+   * @var \Drupal\Core\Entity\EntityDefinitionUpdateManagerInterface
+   */
+  protected $entityDefinitionUpdateManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('user', 'users_data');
+    $this->entityDefinitionUpdateManager = $this->container->get('entity.definition_update_manager');
+
+    // Setup some fields for entity_test_extra to create.
+    $definitions['extra_base_field'] = BaseFieldDefinition::create('string')
+      ->setName('extra_base_field')
+      ->setTargetEntityTypeId('entity_test')
+      ->setTargetBundle('entity_test');
+    $this->state->set('entity_test.additional_base_field_definitions', $definitions);
+    $definitions['extra_bundle_field'] = FieldStorageDefinition::create('string')
+      ->setName('extra_bundle_field')
+      ->setTargetEntityTypeId('entity_test')
+      ->setTargetBundle('entity_test');
+    $this->state->set('entity_test.additional_field_storage_definitions', $definitions);
+    $this->state->set('entity_test.entity_test.additional_bundle_field_definitions', $definitions);
+    $this->entityManager->clearCachedDefinitions();
+  }
+
+  /**
+   * Tests uninstall entity_test module with and without content for the field.
+   */
+  public function testUninstallingModule() {
+    // Test uninstall works fine without content.
+    $this->assertModuleInstallUninstall('entity_test_extra');
+
+    // Test uninstalling works fine with content having no field values.
+    $entity = $this->entityManager->getStorage('entity_test')->create([
+      'name' => $this->randomString(),
+    ]);
+    $entity->save();
+    $this->assertModuleInstallUninstall('entity_test_extra');
+    $entity->delete();
+
+    // Verify uninstall works fine without content again.
+    $this->assertModuleInstallUninstall('entity_test_extra');
+    // Verify uninstalling entity_test is not possible when there is content for
+    // the base field.
+    $this->enableModules(['entity_test_extra']);
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $entity = $this->entityManager->getStorage('entity_test')->create([
+      'name' => $this->randomString(),
+      'extra_base_field' => $this->randomString(),
+    ]);
+    $entity->save();
+
+    try {
+      $message = 'Module uninstallation fails as the module provides a base field which has content.';
+      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
+      $this->fail($message);
+    }
+    catch (ModuleUninstallValidatorException $e) {
+      $this->pass($message);
+      $this->assertEqual($e->getMessage(), 'The following reasons prevent the modules from being uninstalled: There is data for the field extra_base_field on entity type Test entity');
+    }
+
+    // Verify uninstalling entity_test is not possible when there is content for
+    // the bundle field.
+    $entity->delete();
+    $this->assertModuleInstallUninstall('entity_test_extra');
+    $this->enableModules(['entity_test_extra']);
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $entity = $this->entityManager->getStorage('entity_test')->create([
+      'name' => $this->randomString(),
+      'extra_bundle_field' => $this->randomString(),
+    ]);
+    $entity->save();
+    try {
+      $this->getModuleInstaller()->uninstall(array('entity_test_extra'));
+      $this->fail('Module uninstallation fails as the module provides a bundle field which has content.');
+    }
+    catch (ModuleUninstallValidatorException $e) {
+      $this->pass('Module uninstallation fails as the module provides a bundle field which has content.');
+    }
+  }
+
+  /**
+   * Asserts the given module can be installed and uninstalled.
+   *
+   * @param string $module_name
+   *   The module to install and uninstall.
+   */
+  protected function assertModuleInstallUninstall($module_name) {
+    // Install the module if it is not installed yet.
+    if (!\Drupal::moduleHandler()->moduleExists($module_name)) {
+      $this->enableModules([$module_name]);
+    }
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertTrue($this->getModuleHandler()->moduleExists($module_name), $module_name .' module is enabled.');
+    $this->getModuleInstaller()->uninstall([$module_name]);
+    $this->entityDefinitionUpdateManager->applyUpdates();
+    $this->assertFalse($this->getModuleHandler()->moduleExists($module_name), $module_name . ' module is disabled.');
+  }
+
+  /**
+   * Returns the ModuleHandler.
+   *
+   * @return \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected function getModuleHandler() {
+    return $this->container->get('module_handler');
+  }
+
+  /**
+   * Returns the ModuleInstaller.
+   *
+   * @return \Drupal\Core\Extension\ModuleInstallerInterface
+   */
+  protected function getModuleInstaller() {
+    return $this->container->get('module_installer');
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php b/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
new file mode 100644
index 0000000..7234e61
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Field/FieldSettingsTest.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\KernelTests\Core\Field\FieldSettingsTest.
+ */
+
+namespace Drupal\KernelTests\Core\Field;
+
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
+
+/**
+ * Tests field settings methods on field definition structures.
+ *
+ * @group Field
+ */
+class FieldSettingsTest extends EntityKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field', 'field_test');
+
+  /**
+   * @covers \Drupal\Core\Field\BaseFieldDefinition::getSettings
+   * @covers \Drupal\Core\Field\BaseFieldDefinition::setSettings
+   */
+  public function testBaseFieldSettings() {
+    $base_field = BaseFieldDefinition::create('test_field');
+
+    // Check that the default settings have been populated.
+    $expected_settings = [
+      'test_field_storage_setting' => 'dummy test string',
+      'changeable' => 'a changeable field storage setting',
+      'unchangeable' => 'an unchangeable field storage setting',
+      'translatable_storage_setting' => 'a translatable field storage setting',
+      'test_field_setting' => 'dummy test string',
+      'translatable_field_setting' => 'a translatable field setting',
+    ];
+    $this->assertEqual($base_field->getSettings(), $expected_settings);
+
+    // Change one single setting using setSettings(), and check that the other
+    // expected settings are still present.
+    $expected_settings['test_field_setting'] = 'another test string';
+    $base_field->setSettings(['test_field_setting' => $expected_settings['test_field_setting']]);
+    $this->assertEqual($base_field->getSettings(), $expected_settings);
+  }
+
+  /**
+   * @covers \Drupal\field\Entity\FieldStorageConfig::getSettings
+   * @covers \Drupal\field\Entity\FieldStorageConfig::setSettings
+   */
+  public function testConfigurableFieldStorageSettings() {
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'test_field',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ]);
+
+    // Check that the default settings have been populated.
+    $expected_settings = [
+      'test_field_storage_setting' => 'dummy test string',
+      'changeable' => 'a changeable field storage setting',
+      'unchangeable' => 'an unchangeable field storage setting',
+      'translatable_storage_setting' => 'a translatable field storage setting',
+    ];
+    $this->assertEqual($field_storage->getSettings(), $expected_settings);
+
+    // Change one single setting using setSettings(), and check that the other
+    // expected settings are still present.
+    $expected_settings['test_field_storage_setting'] = 'another test string';
+    $field_storage->setSettings(['test_field_storage_setting' => $expected_settings['test_field_storage_setting']]);
+    $this->assertEqual($field_storage->getSettings(), $expected_settings);
+  }
+
+  /**
+   * @covers \Drupal\field\Entity\FieldStorageConfig::getSettings
+   * @covers \Drupal\field\Entity\FieldStorageConfig::setSettings
+   */
+  public function testConfigurableFieldSettings() {
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => 'test_field',
+      'entity_type' => 'entity_test',
+      'type' => 'test_field'
+    ]);
+    $field = FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'entity_test'
+    ]);
+    // Note: FieldConfig does not populate default settings until the config
+    // is saved.
+    // @todo Remove once https://www.drupal.org/node/2327883 is fixed.
+    $field->save();
+
+    // Check that the default settings have been populated. Note: getSettings()
+    // returns both storage and field settings.
+    $expected_settings = [
+      'test_field_storage_setting' => 'dummy test string',
+      'changeable' => 'a changeable field storage setting',
+      'unchangeable' => 'an unchangeable field storage setting',
+      'translatable_storage_setting' => 'a translatable field storage setting',
+      'test_field_setting' => 'dummy test string',
+      'translatable_field_setting' => 'a translatable field setting',
+      'field_setting_from_config_data' => 'TRUE',
+    ];
+    $this->assertEqual($field->getSettings(), $expected_settings);
+
+    // Change one single setting using setSettings(), and check that the other
+    // expected settings are still present.
+    $expected_settings['test_field_setting'] = 'another test string';
+    $field->setSettings(['test_field_setting' => $expected_settings['test_field_setting']]);
+    $this->assertEqual($field->getSettings(), $expected_settings);
+  }
+
+}
diff --git a/core/tests/Drupal/KernelTests/Core/Path/AliasStorageTest.php b/core/tests/Drupal/KernelTests/Core/Path/AliasStorageTest.php
index 98180e3..17084f5 100644
--- a/core/tests/Drupal/KernelTests/Core/Path/AliasStorageTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Path/AliasStorageTest.php
@@ -30,7 +30,6 @@ class AliasStorageTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', 'url_alias');
     $this->storage = $this->container->get('path.alias_storage');
   }
 
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php b/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
index d0578af..01fed2c 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
@@ -54,7 +54,6 @@ protected function setUp() {
 
     $this->container->get('theme_installer')->install(['stable']);
 
-    $this->installSchema('system', 'router');
     $this->installAllModules();
   }
 
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
index efd84ff..cbbb75a 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeRenderAndAutoescapeTest.php
@@ -31,7 +31,6 @@ class ThemeRenderAndAutoescapeTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', 'router');
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index e60abc1..d9aee35 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -25,6 +25,7 @@
 use Drupal\simpletest\AssertContentTrait;
 use Drupal\simpletest\AssertHelperTrait;
 use Drupal\simpletest\RandomGeneratorTrait;
+use Drupal\simpletest\TestServiceProvider;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\Request;
 use org\bovigo\vfs\vfsStream;
@@ -192,6 +193,22 @@
   protected $strictConfigSchema = TRUE;
 
   /**
+   * An array of config object names that are excluded from schema checking.
+   *
+   * @var string[]
+   */
+  protected static $configSchemaCheckerExclusions = array(
+    // Following are used to test lack of or partial schema. Where partial
+    // schema is provided, that is explicitly tested in specific tests.
+    'config_schema_test.noschema',
+    'config_schema_test.someschema',
+    'config_schema_test.schema_data_types',
+    'config_schema_test.no_schema_data_types',
+    // Used to test application of schema to filtering of configuration.
+    'config_test.dynamic.system',
+  );
+
+  /**
    * {@inheritdoc}
    */
   public static function setUpBeforeClass() {
@@ -287,6 +304,13 @@ protected function bootEnvironment() {
   }
 
   /**
+   * @return string
+   */
+  public function getDatabasePrefix() {
+    return $this->databasePrefix;
+  }
+
+  /**
    * Bootstraps a kernel for a test.
    */
   private function bootKernel() {
@@ -358,6 +382,11 @@ private function bootKernel() {
       $this->container->get('module_handler')->loadAll();
     }
 
+    $this->container->get('request_stack')->push($request);
+
+    // Setup the destion to the be frontpage by default.
+    \Drupal::destination()->set('/');
+
     // Write the core.extension configuration.
     // Required for ConfigInstaller::installDefaultConfig() to work.
     $this->container->get('config.storage')->write('core.extension', array(
@@ -584,6 +613,7 @@ public function register(ContainerBuilder $container) {
       $container
         ->register('simpletest.config_schema_checker', 'Drupal\Core\Config\Testing\ConfigSchemaChecker')
         ->addArgument(new Reference('config.typed'))
+        ->addArgument($this->getConfigSchemaExclusions())
         ->addTag('event_subscriber');
     }
 
@@ -601,6 +631,26 @@ public function register(ContainerBuilder $container) {
       $container->getDefinition('password')
         ->setArguments(array(1));
     }
+    TestServiceProvider::addRouteProvider($container);
+  }
+
+  /**
+   * Gets the config schema exclusions for this test.
+   *
+   * @return string[]
+   *   An array of config object names that are excluded from schema checking.
+   */
+  protected function getConfigSchemaExclusions() {
+    $class = get_class($this);
+    $exceptions = [];
+    while ($class) {
+      if (property_exists($class, 'configSchemaCheckerExclusions')) {
+        $exceptions = array_merge($exceptions, $class::$configSchemaCheckerExclusions);
+      }
+      $class = get_parent_class($class);
+    }
+    // Filter out any duplicates.
+    return array_unique($exceptions);
   }
 
   /**
@@ -746,6 +796,13 @@ protected function installSchema($module, $tables) {
     foreach ($tables as $table) {
       $schema = drupal_get_module_schema($module, $table);
       if (empty($schema)) {
+        // BC layer to avoid some contrib tests to fail.
+        // @todo Remove the BC layer before 8.1.x release.
+        // @see https://www.drupal.org/node/2670360
+        // @see https://www.drupal.org/node/2670454
+        if ($module == 'system') {
+          continue;
+        }
         throw new \LogicException("$module module does not define a schema for table '$table'.");
       }
       $this->container->get('database')->schema()->createTable($table, $schema);
@@ -916,11 +973,15 @@ protected function disableModules(array $modules) {
    *   The rendered string output (typically HTML).
    */
   protected function render(array &$elements) {
+    // \Drupal\Core\Render\BareHtmlPageRenderer::renderBarePage calls out to
+    // system_page_attachments() directly.
+    if (!\Drupal::moduleHandler()->moduleExists('system')) {
+      throw new \Exception(__METHOD__ . ' requires system module to be installed.');
+    }
+
     // Use the bare HTML page renderer to render our links.
     $renderer = $this->container->get('bare_html_page_renderer');
-    $response = $renderer->renderBarePage(
-      $elements, '', $this->container->get('theme.manager')->getActiveTheme()->getName()
-    );
+    $response = $renderer->renderBarePage($elements, '', 'maintenance_page');
 
     // Glean the content from the response object.
     $content = $response->getContent();
@@ -1155,5 +1216,4 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
     parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
   }
 
-
 }
diff --git a/core/tests/Drupal/KernelTests/RequestProcessing/RedirectOnExceptionTest.php b/core/tests/Drupal/KernelTests/RequestProcessing/RedirectOnExceptionTest.php
index 4c7a686..5434c0e 100644
--- a/core/tests/Drupal/KernelTests/RequestProcessing/RedirectOnExceptionTest.php
+++ b/core/tests/Drupal/KernelTests/RequestProcessing/RedirectOnExceptionTest.php
@@ -29,7 +29,6 @@ class RedirectOnExceptionTest extends KernelTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->installSchema('system', ['router', 'url_alias']);
     \Drupal::service('router.builder')->rebuild();
   }
 
diff --git a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
index 9075128..6042b6f 100644
--- a/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
+++ b/core/tests/Drupal/Tests/Component/Assertion/InspectorTest.php
@@ -11,7 +11,7 @@
 
 /**
  * @coversDefaultClass \Drupal\Component\Assertion\Inspector
- * @group Inspector
+ * @group Assertion
  */
 class InspectorTest extends PHPUnit_Framework_TestCase {
 
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index 5721c64..2076895 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -9,7 +9,6 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Prophecy\Argument;
 
 /**
@@ -132,7 +131,7 @@ public function testSetParameterWithUnfrozenContainer() {
    *
    * @covers ::setParameter
    *
-   * @expectedException LogicException
+   * @expectedException \Symfony\Component\DependencyInjection\Exception\LogicException
    */
   public function testSetParameterWithFrozenContainer() {
     $this->container = new $this->containerClass($this->containerDefinition);
diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index cf4d822..c1c6058 100644
--- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -267,6 +267,10 @@ public function getDefinitionsDataProvider() {
       ) + $base_service_definition;
 
       $service_definitions[] = array(
+        'shared' => FALSE,
+      ) + $base_service_definition;
+
+      $service_definitions[] = array(
         'lazy' => TRUE,
       ) + $base_service_definition;
 
@@ -358,6 +362,10 @@ public function getDefinitionsDataProvider() {
         'shared' => FALSE,
       ) + $base_service_definition;
 
+      $service_definitions[] = array(
+          'shared' => FALSE,
+        ) + $base_service_definition;
+
       // Test factory.
       $service_definitions[] = array(
         'factory' => array(new Reference('bar'), 'factoryMethod'),
@@ -397,6 +405,7 @@ public function getDefinitionsDataProvider() {
         $definition->getProperties()->willReturn($service_definition['properties']);
         $definition->getMethodCalls()->willReturn($service_definition['calls']);
         $definition->getScope()->willReturn($service_definition['scope']);
+        $definition->isShared()->willReturn($service_definition['shared']);
         $definition->getDecoratedService()->willReturn(NULL);
         $definition->getFactory()->willReturn($service_definition['factory']);
         $definition->getConfigurator()->willReturn($service_definition['configurator']);
diff --git a/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php b/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php
new file mode 100644
index 0000000..3e46605
--- /dev/null
+++ b/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php
@@ -0,0 +1,157 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Component\Discovery\YamlDiscoveryTest.
+ */
+
+namespace Drupal\Tests\Component\Discovery;
+
+use Drupal\Component\Discovery\DiscoveryException;
+use Drupal\Component\Discovery\YamlDirectoryDiscovery;
+use Drupal\Tests\UnitTestCase;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * YamlDirectoryDiscoveryTest component unit tests.
+ *
+ * @coversDefaultClass \Drupal\Component\Discovery\YamlDirectoryDiscovery
+ *
+ * @group Discovery
+ */
+class YamlDirectoryDiscoveryTest extends UnitTestCase {
+
+  /**
+   * Tests YAML directory discovery.
+   *
+   * @covers ::findAll
+   */
+  public function testDiscovery() {
+    vfsStream::setup('modules', NULL, [
+      'test_1' => [
+        'subdir1' => [
+          'item_1.test.yml' => "id: item1\nname: 'test1 item 1'",
+        ],
+        'subdir2' => [
+          'item_2.test.yml' => "id: item2\nname: 'test1 item 2'",
+        ],
+      ],
+      'test_2' => [
+        'subdir1' => [
+          'item_3.test.yml' => "id: item3\nname: 'test2 item 3'",
+        ],
+        'subdir2' => [],
+      ],
+      'test_3' => [],
+      'test_4' => [
+        'subdir1' => [
+          'item_4.test.yml' => "id: item4\nname: 'test4 item 4'",
+          'item_5.test.yml' => "id: item5\nname: 'test4 item 5'",
+          'item_6.test.yml' => "id: item6\nname: 'test4 item 6'",
+        ],
+      ],
+    ]);
+
+    // Set up the directories to search.
+    $directories = [
+      // Multiple directories both with valid items.
+      'test_1' => [
+        vfsStream::url('modules/test_1/subdir1'),
+        vfsStream::url('modules/test_1/subdir2'),
+      ],
+      // The subdir2 directory is empty.
+      'test_2' => [
+        vfsStream::url('modules/test_2/subdir1'),
+        vfsStream::url('modules/test_2/subdir2'),
+      ],
+      // Directories that do not exist.
+      'test_3' => [
+        vfsStream::url('modules/test_3/subdir1'),
+        vfsStream::url('modules/test_3/subdir2'),
+      ],
+      // A single directory.
+      'test_4' => vfsStream::url('modules/test_4/subdir1'),
+    ];
+
+    $discovery = new YamlDirectoryDiscovery($directories, 'test');
+    $data = $discovery->findAll();
+
+    $this->assertSame(['id' => 'item1', 'name' => 'test1 item 1', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir1/item_1.test.yml'], $data['test_1']['item1']);
+    $this->assertSame(['id' => 'item2', 'name' => 'test1 item 2', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir2/item_2.test.yml'], $data['test_1']['item2']);
+    $this->assertCount(2, $data['test_1']);
+
+    $this->assertSame(['id' => 'item3', 'name' => 'test2 item 3', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_2/subdir1/item_3.test.yml'], $data['test_2']['item3']);
+    $this->assertCount(1, $data['test_2']);
+
+    $this->assertTrue(empty($data['test_3']), 'test_3 provides 0 items');
+
+    $this->assertSame(['id' => 'item4', 'name' => 'test4 item 4', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_4.test.yml'], $data['test_4']['item4']);
+    $this->assertSame(['id' => 'item5', 'name' => 'test4 item 5', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_5.test.yml'], $data['test_4']['item5']);
+    $this->assertSame(['id' => 'item6', 'name' => 'test4 item 6', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_6.test.yml'], $data['test_4']['item6']);
+    $this->assertCount(3, $data['test_4']);
+  }
+
+  /**
+   * Tests YAML directory discovery with an alternate ID key.
+   *
+   * @covers ::findAll
+   */
+  public function testDiscoveryAlternateId() {
+    vfsStream::setup('modules', NULL, [
+      'test_1' => [
+        'item_1.test.yml' => "alt_id: item1\nid: ignored",
+      ],
+    ]);
+
+    // Set up the directories to search.
+    $directories = ['test_1' => vfsStream::url('modules/test_1')];
+
+    $discovery = new YamlDirectoryDiscovery($directories, 'test', 'alt_id');
+    $data = $discovery->findAll();
+
+    $this->assertSame(['alt_id' => 'item1', 'id' => 'ignored', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/item_1.test.yml'], $data['test_1']['item1']);
+    $this->assertCount(1, $data['test_1']);
+  }
+
+  /**
+   * Tests YAML directory discovery with a missing ID key.
+   *
+   * @covers ::findAll
+   * @covers ::getIdentifier
+   */
+  public function testDiscoveryNoIdException() {
+    $this->setExpectedException(DiscoveryException::class, 'The vfs://modules/test_1/item_1.test.yml contains no data in the identifier key \'id\'');
+    vfsStream::setup('modules', NULL, [
+      'test_1' => [
+        'item_1.test.yml' => "",
+      ],
+    ]);
+
+    // Set up the directories to search.
+    $directories = ['test_1' => vfsStream::url('modules/test_1')];
+
+    $discovery = new YamlDirectoryDiscovery($directories, 'test');
+    $discovery->findAll();
+  }
+
+  /**
+   * Tests YAML directory discovery with invalid YAML.
+   *
+   * @covers ::findAll
+   */
+  public function testDiscoveryInvalidYamlException() {
+    $this->setExpectedException(DiscoveryException::class, 'The vfs://modules/test_1/item_1.test.yml contains invalid YAML');
+    vfsStream::setup('modules', NULL, [
+      'test_1' => [
+        'item_1.test.yml' => "id: invalid\nfoo : [bar}",
+      ],
+    ]);
+
+    // Set up the directories to search.
+    $directories = ['test_1' => vfsStream::url('modules/test_1')];
+
+    $discovery = new YamlDirectoryDiscovery($directories, 'test');
+    $discovery->findAll();
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
index 22b745b..4a4c52a 100644
--- a/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
+++ b/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
@@ -10,9 +10,9 @@
 use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\EventDispatcher\Tests\AbstractEventDispatcherTest;
 use Symfony\Component\EventDispatcher\Tests\CallableClass;
 use Symfony\Component\EventDispatcher\Tests\TestEventListener;
+use Symfony\Component\EventDispatcher\Tests\ContainerAwareEventDispatcherTest as SymfonyContainerAwareEventDispatcherTest;
 
 /**
  * Unit tests for the ContainerAwareEventDispatcher.
@@ -27,7 +27,7 @@
  *
  * @group EventDispatcher
  */
-class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
+class ContainerAwareEventDispatcherTest extends SymfonyContainerAwareEventDispatcherTest
 {
     protected function createEventDispatcher()
     {
@@ -175,4 +175,11 @@ public function testRemoveService()
         $otherService = $container->get('other_listener_service');
         $this->assertTrue($otherService->preFooInvoked);
     }
-}
+
+    public function testGetListenerPriority()
+    {
+        // Override the parent test as our implementation doesn't define
+        // getListenerPriority().
+    }
+
+ }
diff --git a/core/tests/Drupal/Tests/Component/FileSystem/RegexDirectoryIteratorTest.php b/core/tests/Drupal/Tests/Component/FileSystem/RegexDirectoryIteratorTest.php
new file mode 100644
index 0000000..b4b75c8
--- /dev/null
+++ b/core/tests/Drupal/Tests/Component/FileSystem/RegexDirectoryIteratorTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Component\FileSystem\RegexDirectoryIteratorTest.
+ */
+
+namespace Drupal\Tests\Component\FileSystem;
+
+use Drupal\Component\FileSystem\RegexDirectoryIterator;
+use Drupal\Tests\UnitTestCase;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * @coversDefaultClass \Drupal\Component\FileSystem\RegexDirectoryIterator
+ * @group FileSystem
+ */
+class RegexDirectoryIteratorTest extends UnitTestCase {
+
+  /**
+   * @covers ::accept
+   * @dataProvider providerTestRegexDirectoryIterator
+   */
+  public function testRegexDirectoryIterator(array $directory, $regex, array $expected) {
+    vfsStream::setup('root', NULL, $directory);
+    $iterator = new RegexDirectoryIterator(vfsStream::url('root'), $regex);
+
+    // Create an array of filenames to assert against.
+    $file_list = array_map(function(\SplFileInfo $file) {
+      return $file->getFilename();
+    }, array_values(iterator_to_array($iterator)));
+
+    $this->assertSame($expected, $file_list);
+  }
+
+  /**
+   * Provider for self::testRegexDirectoryIterator().
+   */
+  public function providerTestRegexDirectoryIterator() {
+    return [
+      [
+        [
+          '1.yml' => '',
+        ],
+        '/\.yml$/',
+        [
+          '1.yml',
+        ],
+      ],
+      [
+        [
+          '1.yml' => '',
+          '2.yml' => '',
+          '3.txt' => '',
+        ],
+        '/\.yml$/',
+        [
+          '1.yml',
+          '2.yml',
+        ],
+      ],
+      [
+        [
+          '1.yml' => '',
+          '2.yml' => '',
+          '3.txt' => '',
+        ],
+        '/\.txt/',
+        [
+          '3.txt',
+        ],
+      ],
+      [
+        [
+          '1.yml' => '',
+          // Ensure we don't recurse in directories even if that match the
+          // regex.
+          '2.yml' => [
+            '3.yml' => '',
+            '4.yml' => '',
+          ],
+          '3.txt' => '',
+        ],
+        '/\.yml$/',
+        [
+          '1.yml',
+        ],
+      ],
+      [
+        [
+          '1.yml' => '',
+          '2.yml' => '',
+          '3.txt' => '',
+        ],
+        '/^\d/',
+        [
+          '1.yml',
+          '2.yml',
+          '3.txt'
+        ],
+      ],
+      [
+        [
+          '1.yml' => '',
+          '2.yml' => '',
+          '3.txt' => '',
+        ],
+        '/^\D/',
+        [],
+      ],
+    ];
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php b/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
index de7f428..470d255 100644
--- a/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Component/Transliteration/PhpTransliterationTest.php
@@ -118,7 +118,7 @@ public function providerTestPhpTransliteration() {
     // http://www.unicode.org/charts/PDF/U1400.pdf
     $four_byte = html_entity_decode('&#x1411;', ENT_NOQUOTES, 'UTF-8');
     // These are two Gothic alphabet letters. See
-    // http://en.wikipedia.org/wiki/Gothic_alphabet
+    // http://wikipedia.org/wiki/Gothic_alphabet
     // They are not in our tables, but should at least give us '?' (unknown).
     $five_byte = html_entity_decode('&#x10330;&#x10338;', ENT_NOQUOTES, 'UTF-8');
 
diff --git a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
index bce3873..786abec 100644
--- a/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/NumberTest.php
@@ -3,8 +3,6 @@
 /**
  * @file
  * Contains \Drupal\Tests\Component\Utility\NumberTest.
- *
- * @see \Drupal\Component\Utility\Number
  */
 
 namespace Drupal\Tests\Component\Utility;
@@ -18,6 +16,8 @@
  * @group Utility
  *
  * @coversDefaultClass \Drupal\Component\Utility\Number
+ *
+ * @see \Drupal\Component\Utility\Number
  */
 class NumberTest extends UnitTestCase {
 
diff --git a/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php b/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
new file mode 100644
index 0000000..bb01113
--- /dev/null
+++ b/core/tests/Drupal/Tests/Component/Utility/RectangleTest.php
@@ -0,0 +1,4333 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Component\Utility\RectangleTest.
+ */
+
+namespace Drupal\Tests\Component\Utility;
+
+use Drupal\Component\Utility\Rectangle;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Component\Utility\Rectangle
+ * @group Image
+ */
+class RectangleTest extends UnitTestCase {
+
+  /**
+   * Tests wrong rectangle width.
+   *
+   * @covers ::rotate
+   *
+   * @expectedException \InvalidArgumentException
+   */
+  public function testWrongWidth() {
+    $rect = new Rectangle(-40, 20);
+  }
+
+  /**
+   * Tests wrong rectangle height.
+   *
+   * @covers ::rotate
+   *
+   * @expectedException \InvalidArgumentException
+   */
+  public function testWrongHeight() {
+    $rect = new Rectangle(40, 0);
+  }
+
+  /**
+   * Tests getting rectangle dimensions after a rotation operation.
+   *
+   * @param int $width
+   *   The width of the rectangle.
+   * @param int $height
+   *   The height of the rectangle.
+   * @param float $angle
+   *   The angle for rotation.
+   * @param int $exp_width
+   *   The expected width of the rotated rectangle.
+   * @param int $exp_height
+   *   The expected height of the rotated rectangle.
+   *
+   * @covers ::rotate
+   * @covers ::getBoundingWidth
+   * @covers ::getBoundingHeight
+   *
+   * @dataProvider providerPhp55RotateDimensions
+   */
+  public function testRotateDimensions($width, $height, $angle, $exp_width, $exp_height) {
+    $rect = new Rectangle($width, $height);
+    $rect->rotate($angle);
+    $this->assertEquals($exp_width, $rect->getBoundingWidth());
+    $this->assertEquals($exp_height, $rect->getBoundingHeight());
+  }
+
+  /**
+   * Provides data for image dimension rotation tests.
+   *
+   * This dataset sample was generated by running on PHP 5.5 the function below
+   * - first, for all integer rotation angles (-360 to 360) on a rectangle
+   *   40x20;
+   * - second, for 500 random float rotation angle in the range -360 to 360 on
+   *   a rectangle 40x20;
+   * - third, on 1000 rectangles of random WxH rotated to a random float angle
+   *   in the range -360 to 360
+   * - fourth, on 2000 rectangles of random WxH rotated to a random integer
+   *   angle multiple of 30 degrees in the range -360 to 360 (which is the most
+   *   tricky case).
+   * Using the GD toolkit operations gives us true data coming from the GD
+   * library that can be used to match against the Rectangle class under test.
+   * @code
+   *   protected function rotateResults($width, $height, $angle, &$new_width, &$new_height) {
+   *     $image = \Drupal::service('image.factory')->get(NULL, 'gd');
+   *     $image->createNew($width, $height);
+   *     $old_res = $image->getToolkit()->getResource();
+   *     $image->rotate($angle);
+   *     $new_width = $image->getWidth();
+   *     $new_height = $image->getHeight();
+   *     if (is_resource($old_res)) {
+   *       imagedestroy($old_res);
+   *     }
+   *   }
+   * @endcode
+   *
+   * @return array[]
+   *   A simple array of simple arrays, each having the following elements:
+   *   - original image width
+   *   - original image height
+   *   - rotation angle in degrees
+   *   - expected image width after rotation
+   *   - expected image height after rotation
+   *
+   * @see testRotateDimensions()
+   */
+  public function providerPhp55RotateDimensions() {
+    return [
+      [ 40, 20, -360, 40, 20 ],
+      [ 40, 20, -359, 39, 20 ],
+      [ 40, 20, -358, 40, 21 ],
+      [ 40, 20, -357, 40, 22 ],
+      [ 40, 20, -356, 40, 22 ],
+      [ 40, 20, -355, 41, 23 ],
+      [ 40, 20, -354, 41, 24 ],
+      [ 40, 20, -353, 41, 24 ],
+      [ 40, 20, -352, 42, 25 ],
+      [ 40, 20, -351, 42, 26 ],
+      [ 40, 20, -350, 42, 26 ],
+      [ 40, 20, -349, 43, 27 ],
+      [ 40, 20, -348, 43, 28 ],
+      [ 40, 20, -347, 42, 27 ],
+      [ 40, 20, -346, 43, 28 ],
+      [ 40, 20, -345, 43, 29 ],
+      [ 40, 20, -344, 44, 30 ],
+      [ 40, 20, -343, 44, 30 ],
+      [ 40, 20, -342, 44, 31 ],
+      [ 40, 20, -341, 44, 32 ],
+      [ 40, 20, -340, 44, 32 ],
+      [ 40, 20, -339, 44, 33 ],
+      [ 40, 20, -338, 44, 33 ],
+      [ 40, 20, -337, 44, 33 ],
+      [ 40, 20, -336, 44, 34 ],
+      [ 40, 20, -335, 44, 34 ],
+      [ 40, 20, -334, 44, 35 ],
+      [ 40, 20, -333, 44, 36 ],
+      [ 40, 20, -332, 44, 36 ],
+      [ 40, 20, -331, 44, 36 ],
+      [ 40, 20, -330, 44, 36 ],
+      [ 40, 20, -329, 44, 37 ],
+      [ 40, 20, -328, 44, 38 ],
+      [ 40, 20, -327, 44, 38 ],
+      [ 40, 20, -326, 44, 39 ],
+      [ 40, 20, -325, 43, 38 ],
+      [ 40, 20, -324, 44, 39 ],
+      [ 40, 20, -323, 43, 40 ],
+      [ 40, 20, -322, 43, 40 ],
+      [ 40, 20, -321, 44, 41 ],
+      [ 40, 20, -320, 43, 40 ],
+      [ 40, 20, -319, 43, 41 ],
+      [ 40, 20, -318, 42, 41 ],
+      [ 40, 20, -317, 43, 42 ],
+      [ 40, 20, -316, 42, 41 ],
+      [ 40, 20, -315, 42, 42 ],
+      [ 40, 20, -314, 41, 42 ],
+      [ 40, 20, -313, 42, 43 ],
+      [ 40, 20, -312, 41, 42 ],
+      [ 40, 20, -311, 41, 43 ],
+      [ 40, 20, -310, 40, 43 ],
+      [ 40, 20, -309, 41, 44 ],
+      [ 40, 20, -308, 40, 43 ],
+      [ 40, 20, -307, 40, 43 ],
+      [ 40, 20, -306, 39, 44 ],
+      [ 40, 20, -305, 38, 43 ],
+      [ 40, 20, -304, 39, 44 ],
+      [ 40, 20, -303, 38, 44 ],
+      [ 40, 20, -302, 38, 44 ],
+      [ 40, 20, -301, 37, 44 ],
+      [ 40, 20, -300, 36, 44 ],
+      [ 40, 20, -299, 36, 44 ],
+      [ 40, 20, -298, 36, 44 ],
+      [ 40, 20, -297, 36, 44 ],
+      [ 40, 20, -296, 35, 44 ],
+      [ 40, 20, -295, 34, 44 ],
+      [ 40, 20, -294, 34, 44 ],
+      [ 40, 20, -293, 33, 44 ],
+      [ 40, 20, -292, 33, 44 ],
+      [ 40, 20, -291, 33, 44 ],
+      [ 40, 20, -290, 32, 44 ],
+      [ 40, 20, -289, 32, 44 ],
+      [ 40, 20, -288, 31, 44 ],
+      [ 40, 20, -287, 30, 44 ],
+      [ 40, 20, -286, 30, 44 ],
+      [ 40, 20, -285, 29, 43 ],
+      [ 40, 20, -284, 28, 43 ],
+      [ 40, 20, -283, 27, 42 ],
+      [ 40, 20, -282, 28, 43 ],
+      [ 40, 20, -281, 27, 43 ],
+      [ 40, 20, -280, 26, 42 ],
+      [ 40, 20, -279, 26, 42 ],
+      [ 40, 20, -278, 25, 42 ],
+      [ 40, 20, -277, 24, 41 ],
+      [ 40, 20, -276, 24, 41 ],
+      [ 40, 20, -275, 23, 41 ],
+      [ 40, 20, -274, 22, 40 ],
+      [ 40, 20, -273, 22, 40 ],
+      [ 40, 20, -272, 21, 40 ],
+      [ 40, 20, -271, 20, 39 ],
+      [ 40, 20, -270, 20, 40 ],
+      [ 40, 20, -269, 20, 39 ],
+      [ 40, 20, -268, 21, 39 ],
+      [ 40, 20, -267, 22, 39 ],
+      [ 40, 20, -266, 22, 39 ],
+      [ 40, 20, -265, 23, 40 ],
+      [ 40, 20, -264, 24, 40 ],
+      [ 40, 20, -263, 24, 40 ],
+      [ 40, 20, -262, 25, 41 ],
+      [ 40, 20, -261, 26, 41 ],
+      [ 40, 20, -260, 26, 41 ],
+      [ 40, 20, -259, 27, 42 ],
+      [ 40, 20, -258, 28, 42 ],
+      [ 40, 20, -257, 27, 41 ],
+      [ 40, 20, -256, 28, 42 ],
+      [ 40, 20, -255, 29, 42 ],
+      [ 40, 20, -254, 30, 43 ],
+      [ 40, 20, -253, 30, 43 ],
+      [ 40, 20, -252, 31, 43 ],
+      [ 40, 20, -251, 32, 43 ],
+      [ 40, 20, -250, 32, 43 ],
+      [ 40, 20, -249, 33, 43 ],
+      [ 40, 20, -248, 33, 43 ],
+      [ 40, 20, -247, 33, 43 ],
+      [ 40, 20, -246, 34, 43 ],
+      [ 40, 20, -245, 34, 43 ],
+      [ 40, 20, -244, 35, 43 ],
+      [ 40, 20, -243, 36, 43 ],
+      [ 40, 20, -242, 36, 43 ],
+      [ 40, 20, -241, 36, 43 ],
+      [ 40, 20, -240, 36, 43 ],
+      [ 40, 20, -239, 37, 43 ],
+      [ 40, 20, -238, 38, 43 ],
+      [ 40, 20, -237, 38, 43 ],
+      [ 40, 20, -236, 39, 43 ],
+      [ 40, 20, -235, 38, 42 ],
+      [ 40, 20, -234, 39, 43 ],
+      [ 40, 20, -233, 40, 42 ],
+      [ 40, 20, -232, 40, 42 ],
+      [ 40, 20, -231, 41, 43 ],
+      [ 40, 20, -230, 40, 42 ],
+      [ 40, 20, -229, 41, 42 ],
+      [ 40, 20, -228, 41, 41 ],
+      [ 40, 20, -227, 42, 42 ],
+      [ 40, 20, -226, 41, 41 ],
+      [ 40, 20, -225, 42, 41 ],
+      [ 40, 20, -224, 42, 40 ],
+      [ 40, 20, -223, 43, 41 ],
+      [ 40, 20, -222, 42, 40 ],
+      [ 40, 20, -221, 43, 40 ],
+      [ 40, 20, -220, 43, 39 ],
+      [ 40, 20, -219, 44, 40 ],
+      [ 40, 20, -218, 43, 39 ],
+      [ 40, 20, -217, 43, 39 ],
+      [ 40, 20, -216, 44, 38 ],
+      [ 40, 20, -215, 43, 37 ],
+      [ 40, 20, -214, 44, 38 ],
+      [ 40, 20, -213, 44, 37 ],
+      [ 40, 20, -212, 44, 37 ],
+      [ 40, 20, -211, 44, 36 ],
+      [ 40, 20, -210, 44, 35 ],
+      [ 40, 20, -209, 44, 35 ],
+      [ 40, 20, -208, 44, 35 ],
+      [ 40, 20, -207, 44, 35 ],
+      [ 40, 20, -206, 44, 34 ],
+      [ 40, 20, -205, 44, 33 ],
+      [ 40, 20, -204, 44, 33 ],
+      [ 40, 20, -203, 44, 32 ],
+      [ 40, 20, -202, 44, 32 ],
+      [ 40, 20, -201, 44, 32 ],
+      [ 40, 20, -200, 44, 31 ],
+      [ 40, 20, -199, 44, 31 ],
+      [ 40, 20, -198, 44, 30 ],
+      [ 40, 20, -197, 44, 29 ],
+      [ 40, 20, -196, 44, 29 ],
+      [ 40, 20, -195, 43, 28 ],
+      [ 40, 20, -194, 43, 27 ],
+      [ 40, 20, -193, 42, 26 ],
+      [ 40, 20, -192, 43, 27 ],
+      [ 40, 20, -191, 43, 26 ],
+      [ 40, 20, -190, 42, 25 ],
+      [ 40, 20, -189, 42, 25 ],
+      [ 40, 20, -188, 42, 24 ],
+      [ 40, 20, -187, 41, 23 ],
+      [ 40, 20, -186, 41, 23 ],
+      [ 40, 20, -185, 41, 22 ],
+      [ 40, 20, -184, 40, 21 ],
+      [ 40, 20, -183, 40, 21 ],
+      [ 40, 20, -182, 40, 20 ],
+      [ 40, 20, -181, 39, 19 ],
+      [ 40, 20, -180, 40, 20 ],
+      [ 40, 20, -179, 39, 19 ],
+      [ 40, 20, -178, 39, 20 ],
+      [ 40, 20, -177, 39, 21 ],
+      [ 40, 20, -176, 39, 21 ],
+      [ 40, 20, -175, 40, 22 ],
+      [ 40, 20, -174, 40, 23 ],
+      [ 40, 20, -173, 40, 23 ],
+      [ 40, 20, -172, 41, 24 ],
+      [ 40, 20, -171, 41, 25 ],
+      [ 40, 20, -170, 41, 25 ],
+      [ 40, 20, -169, 42, 26 ],
+      [ 40, 20, -168, 42, 27 ],
+      [ 40, 20, -167, 41, 26 ],
+      [ 40, 20, -166, 42, 27 ],
+      [ 40, 20, -165, 42, 28 ],
+      [ 40, 20, -164, 43, 29 ],
+      [ 40, 20, -163, 43, 29 ],
+      [ 40, 20, -162, 43, 30 ],
+      [ 40, 20, -161, 43, 31 ],
+      [ 40, 20, -160, 43, 31 ],
+      [ 40, 20, -159, 43, 32 ],
+      [ 40, 20, -158, 43, 32 ],
+      [ 40, 20, -157, 43, 32 ],
+      [ 40, 20, -156, 43, 33 ],
+      [ 40, 20, -155, 43, 33 ],
+      [ 40, 20, -154, 43, 34 ],
+      [ 40, 20, -153, 43, 35 ],
+      [ 40, 20, -152, 43, 35 ],
+      [ 40, 20, -151, 43, 35 ],
+      [ 40, 20, -150, 43, 36 ],
+      [ 40, 20, -149, 43, 36 ],
+      [ 40, 20, -148, 43, 37 ],
+      [ 40, 20, -147, 43, 37 ],
+      [ 40, 20, -146, 43, 38 ],
+      [ 40, 20, -145, 42, 37 ],
+      [ 40, 20, -144, 43, 38 ],
+      [ 40, 20, -143, 42, 39 ],
+      [ 40, 20, -142, 42, 39 ],
+      [ 40, 20, -141, 43, 40 ],
+      [ 40, 20, -140, 42, 39 ],
+      [ 40, 20, -139, 42, 40 ],
+      [ 40, 20, -138, 41, 40 ],
+      [ 40, 20, -137, 42, 41 ],
+      [ 40, 20, -136, 41, 40 ],
+      [ 40, 20, -135, 41, 41 ],
+      [ 40, 20, -134, 40, 41 ],
+      [ 40, 20, -133, 41, 42 ],
+      [ 40, 20, -132, 40, 41 ],
+      [ 40, 20, -131, 40, 42 ],
+      [ 40, 20, -130, 39, 42 ],
+      [ 40, 20, -129, 40, 43 ],
+      [ 40, 20, -128, 39, 42 ],
+      [ 40, 20, -127, 39, 42 ],
+      [ 40, 20, -126, 38, 43 ],
+      [ 40, 20, -125, 37, 42 ],
+      [ 40, 20, -124, 38, 43 ],
+      [ 40, 20, -123, 37, 43 ],
+      [ 40, 20, -122, 37, 43 ],
+      [ 40, 20, -121, 36, 43 ],
+      [ 40, 20, -120, 36, 43 ],
+      [ 40, 20, -119, 35, 43 ],
+      [ 40, 20, -118, 35, 43 ],
+      [ 40, 20, -117, 35, 43 ],
+      [ 40, 20, -116, 34, 43 ],
+      [ 40, 20, -115, 33, 43 ],
+      [ 40, 20, -114, 33, 43 ],
+      [ 40, 20, -113, 32, 43 ],
+      [ 40, 20, -112, 32, 43 ],
+      [ 40, 20, -111, 32, 43 ],
+      [ 40, 20, -110, 31, 43 ],
+      [ 40, 20, -109, 31, 43 ],
+      [ 40, 20, -108, 30, 43 ],
+      [ 40, 20, -107, 29, 43 ],
+      [ 40, 20, -106, 29, 43 ],
+      [ 40, 20, -105, 28, 42 ],
+      [ 40, 20, -104, 27, 42 ],
+      [ 40, 20, -103, 26, 41 ],
+      [ 40, 20, -102, 27, 42 ],
+      [ 40, 20, -101, 26, 42 ],
+      [ 40, 20, -100, 25, 41 ],
+      [ 40, 20, -99, 25, 41 ],
+      [ 40, 20, -98, 24, 41 ],
+      [ 40, 20, -97, 23, 40 ],
+      [ 40, 20, -96, 23, 40 ],
+      [ 40, 20, -95, 22, 40 ],
+      [ 40, 20, -94, 21, 39 ],
+      [ 40, 20, -93, 21, 39 ],
+      [ 40, 20, -92, 20, 39 ],
+      [ 40, 20, -91, 19, 39 ],
+      [ 40, 20, -90, 20, 40 ],
+      [ 40, 20, -89, 19, 39 ],
+      [ 40, 20, -88, 20, 40 ],
+      [ 40, 20, -87, 21, 40 ],
+      [ 40, 20, -86, 21, 40 ],
+      [ 40, 20, -85, 22, 41 ],
+      [ 40, 20, -84, 23, 41 ],
+      [ 40, 20, -83, 23, 41 ],
+      [ 40, 20, -82, 24, 42 ],
+      [ 40, 20, -81, 25, 42 ],
+      [ 40, 20, -80, 25, 42 ],
+      [ 40, 20, -79, 26, 43 ],
+      [ 40, 20, -78, 27, 43 ],
+      [ 40, 20, -77, 26, 42 ],
+      [ 40, 20, -76, 27, 43 ],
+      [ 40, 20, -75, 28, 43 ],
+      [ 40, 20, -74, 29, 44 ],
+      [ 40, 20, -73, 29, 44 ],
+      [ 40, 20, -72, 30, 44 ],
+      [ 40, 20, -71, 31, 44 ],
+      [ 40, 20, -70, 31, 44 ],
+      [ 40, 20, -69, 32, 44 ],
+      [ 40, 20, -68, 32, 44 ],
+      [ 40, 20, -67, 32, 44 ],
+      [ 40, 20, -66, 33, 44 ],
+      [ 40, 20, -65, 33, 44 ],
+      [ 40, 20, -64, 34, 44 ],
+      [ 40, 20, -63, 35, 44 ],
+      [ 40, 20, -62, 35, 44 ],
+      [ 40, 20, -61, 35, 44 ],
+      [ 40, 20, -60, 35, 44 ],
+      [ 40, 20, -59, 36, 44 ],
+      [ 40, 20, -58, 37, 44 ],
+      [ 40, 20, -57, 37, 44 ],
+      [ 40, 20, -56, 38, 44 ],
+      [ 40, 20, -55, 37, 43 ],
+      [ 40, 20, -54, 38, 44 ],
+      [ 40, 20, -53, 39, 43 ],
+      [ 40, 20, -52, 39, 43 ],
+      [ 40, 20, -51, 40, 44 ],
+      [ 40, 20, -50, 39, 43 ],
+      [ 40, 20, -49, 40, 43 ],
+      [ 40, 20, -48, 40, 42 ],
+      [ 40, 20, -47, 41, 43 ],
+      [ 40, 20, -46, 40, 42 ],
+      [ 40, 20, -45, 41, 42 ],
+      [ 40, 20, -44, 41, 41 ],
+      [ 40, 20, -43, 42, 42 ],
+      [ 40, 20, -42, 41, 41 ],
+      [ 40, 20, -41, 42, 41 ],
+      [ 40, 20, -40, 42, 40 ],
+      [ 40, 20, -39, 43, 41 ],
+      [ 40, 20, -38, 42, 40 ],
+      [ 40, 20, -37, 42, 40 ],
+      [ 40, 20, -36, 43, 39 ],
+      [ 40, 20, -35, 42, 38 ],
+      [ 40, 20, -34, 43, 39 ],
+      [ 40, 20, -33, 43, 38 ],
+      [ 40, 20, -32, 43, 38 ],
+      [ 40, 20, -31, 43, 37 ],
+      [ 40, 20, -30, 43, 37 ],
+      [ 40, 20, -29, 43, 36 ],
+      [ 40, 20, -28, 43, 36 ],
+      [ 40, 20, -27, 43, 36 ],
+      [ 40, 20, -26, 43, 35 ],
+      [ 40, 20, -25, 43, 34 ],
+      [ 40, 20, -24, 43, 34 ],
+      [ 40, 20, -23, 43, 33 ],
+      [ 40, 20, -22, 43, 33 ],
+      [ 40, 20, -21, 43, 33 ],
+      [ 40, 20, -20, 43, 32 ],
+      [ 40, 20, -19, 43, 32 ],
+      [ 40, 20, -18, 43, 31 ],
+      [ 40, 20, -17, 43, 30 ],
+      [ 40, 20, -16, 43, 30 ],
+      [ 40, 20, -15, 42, 29 ],
+      [ 40, 20, -14, 42, 28 ],
+      [ 40, 20, -13, 41, 27 ],
+      [ 40, 20, -12, 42, 28 ],
+      [ 40, 20, -11, 42, 27 ],
+      [ 40, 20, -10, 41, 26 ],
+      [ 40, 20, -9, 41, 26 ],
+      [ 40, 20, -8, 41, 25 ],
+      [ 40, 20, -7, 40, 24 ],
+      [ 40, 20, -6, 40, 24 ],
+      [ 40, 20, -5, 40, 23 ],
+      [ 40, 20, -4, 39, 22 ],
+      [ 40, 20, -3, 39, 22 ],
+      [ 40, 20, -2, 39, 21 ],
+      [ 40, 20, -1, 39, 20 ],
+      [ 40, 20, 0, 40, 20 ],
+      [ 40, 20, 1, 39, 20 ],
+      [ 40, 20, 2, 40, 21 ],
+      [ 40, 20, 3, 40, 22 ],
+      [ 40, 20, 4, 40, 22 ],
+      [ 40, 20, 5, 41, 23 ],
+      [ 40, 20, 6, 41, 24 ],
+      [ 40, 20, 7, 41, 24 ],
+      [ 40, 20, 8, 42, 25 ],
+      [ 40, 20, 9, 42, 26 ],
+      [ 40, 20, 10, 42, 26 ],
+      [ 40, 20, 11, 43, 27 ],
+      [ 40, 20, 12, 43, 28 ],
+      [ 40, 20, 13, 42, 27 ],
+      [ 40, 20, 14, 43, 28 ],
+      [ 40, 20, 15, 43, 29 ],
+      [ 40, 20, 16, 44, 30 ],
+      [ 40, 20, 17, 44, 30 ],
+      [ 40, 20, 18, 44, 31 ],
+      [ 40, 20, 19, 44, 32 ],
+      [ 40, 20, 20, 44, 32 ],
+      [ 40, 20, 21, 44, 33 ],
+      [ 40, 20, 22, 44, 33 ],
+      [ 40, 20, 23, 44, 33 ],
+      [ 40, 20, 24, 44, 34 ],
+      [ 40, 20, 25, 44, 34 ],
+      [ 40, 20, 26, 44, 35 ],
+      [ 40, 20, 27, 44, 36 ],
+      [ 40, 20, 28, 44, 36 ],
+      [ 40, 20, 29, 44, 36 ],
+      [ 40, 20, 30, 44, 36 ],
+      [ 40, 20, 31, 44, 37 ],
+      [ 40, 20, 32, 44, 38 ],
+      [ 40, 20, 33, 44, 38 ],
+      [ 40, 20, 34, 44, 39 ],
+      [ 40, 20, 35, 43, 38 ],
+      [ 40, 20, 36, 44, 39 ],
+      [ 40, 20, 37, 43, 40 ],
+      [ 40, 20, 38, 43, 40 ],
+      [ 40, 20, 39, 44, 41 ],
+      [ 40, 20, 40, 43, 40 ],
+      [ 40, 20, 41, 43, 41 ],
+      [ 40, 20, 42, 42, 41 ],
+      [ 40, 20, 43, 43, 42 ],
+      [ 40, 20, 44, 42, 41 ],
+      [ 40, 20, 45, 42, 42 ],
+      [ 40, 20, 46, 41, 42 ],
+      [ 40, 20, 47, 42, 43 ],
+      [ 40, 20, 48, 41, 42 ],
+      [ 40, 20, 49, 41, 43 ],
+      [ 40, 20, 50, 40, 43 ],
+      [ 40, 20, 51, 41, 44 ],
+      [ 40, 20, 52, 40, 43 ],
+      [ 40, 20, 53, 40, 43 ],
+      [ 40, 20, 54, 39, 44 ],
+      [ 40, 20, 55, 38, 43 ],
+      [ 40, 20, 56, 39, 44 ],
+      [ 40, 20, 57, 38, 44 ],
+      [ 40, 20, 58, 38, 44 ],
+      [ 40, 20, 59, 37, 44 ],
+      [ 40, 20, 60, 36, 44 ],
+      [ 40, 20, 61, 36, 44 ],
+      [ 40, 20, 62, 36, 44 ],
+      [ 40, 20, 63, 36, 44 ],
+      [ 40, 20, 64, 35, 44 ],
+      [ 40, 20, 65, 34, 44 ],
+      [ 40, 20, 66, 34, 44 ],
+      [ 40, 20, 67, 33, 44 ],
+      [ 40, 20, 68, 33, 44 ],
+      [ 40, 20, 69, 33, 44 ],
+      [ 40, 20, 70, 32, 44 ],
+      [ 40, 20, 71, 32, 44 ],
+      [ 40, 20, 72, 31, 44 ],
+      [ 40, 20, 73, 30, 44 ],
+      [ 40, 20, 74, 30, 44 ],
+      [ 40, 20, 75, 29, 43 ],
+      [ 40, 20, 76, 28, 43 ],
+      [ 40, 20, 77, 27, 42 ],
+      [ 40, 20, 78, 28, 43 ],
+      [ 40, 20, 79, 27, 43 ],
+      [ 40, 20, 80, 26, 42 ],
+      [ 40, 20, 81, 26, 42 ],
+      [ 40, 20, 82, 25, 42 ],
+      [ 40, 20, 83, 24, 41 ],
+      [ 40, 20, 84, 24, 41 ],
+      [ 40, 20, 85, 23, 41 ],
+      [ 40, 20, 86, 22, 40 ],
+      [ 40, 20, 87, 22, 40 ],
+      [ 40, 20, 88, 21, 40 ],
+      [ 40, 20, 89, 20, 39 ],
+      [ 40, 20, 90, 20, 40 ],
+      [ 40, 20, 91, 20, 39 ],
+      [ 40, 20, 92, 21, 39 ],
+      [ 40, 20, 93, 22, 39 ],
+      [ 40, 20, 94, 22, 39 ],
+      [ 40, 20, 95, 23, 40 ],
+      [ 40, 20, 96, 24, 40 ],
+      [ 40, 20, 97, 24, 40 ],
+      [ 40, 20, 98, 25, 41 ],
+      [ 40, 20, 99, 26, 41 ],
+      [ 40, 20, 100, 26, 41 ],
+      [ 40, 20, 101, 27, 42 ],
+      [ 40, 20, 102, 28, 42 ],
+      [ 40, 20, 103, 27, 41 ],
+      [ 40, 20, 104, 28, 42 ],
+      [ 40, 20, 105, 29, 42 ],
+      [ 40, 20, 106, 30, 43 ],
+      [ 40, 20, 107, 30, 43 ],
+      [ 40, 20, 108, 31, 43 ],
+      [ 40, 20, 109, 32, 43 ],
+      [ 40, 20, 110, 32, 43 ],
+      [ 40, 20, 111, 33, 43 ],
+      [ 40, 20, 112, 33, 43 ],
+      [ 40, 20, 113, 33, 43 ],
+      [ 40, 20, 114, 34, 43 ],
+      [ 40, 20, 115, 34, 43 ],
+      [ 40, 20, 116, 35, 43 ],
+      [ 40, 20, 117, 36, 43 ],
+      [ 40, 20, 118, 36, 43 ],
+      [ 40, 20, 119, 36, 43 ],
+      [ 40, 20, 120, 36, 43 ],
+      [ 40, 20, 121, 37, 43 ],
+      [ 40, 20, 122, 38, 43 ],
+      [ 40, 20, 123, 38, 43 ],
+      [ 40, 20, 124, 39, 43 ],
+      [ 40, 20, 125, 38, 42 ],
+      [ 40, 20, 126, 39, 43 ],
+      [ 40, 20, 127, 40, 42 ],
+      [ 40, 20, 128, 40, 42 ],
+      [ 40, 20, 129, 41, 43 ],
+      [ 40, 20, 130, 40, 42 ],
+      [ 40, 20, 131, 41, 42 ],
+      [ 40, 20, 132, 41, 41 ],
+      [ 40, 20, 133, 42, 42 ],
+      [ 40, 20, 134, 41, 41 ],
+      [ 40, 20, 135, 42, 41 ],
+      [ 40, 20, 136, 42, 40 ],
+      [ 40, 20, 137, 43, 41 ],
+      [ 40, 20, 138, 42, 40 ],
+      [ 40, 20, 139, 43, 40 ],
+      [ 40, 20, 140, 43, 39 ],
+      [ 40, 20, 141, 44, 40 ],
+      [ 40, 20, 142, 43, 39 ],
+      [ 40, 20, 143, 43, 39 ],
+      [ 40, 20, 144, 44, 38 ],
+      [ 40, 20, 145, 43, 37 ],
+      [ 40, 20, 146, 44, 38 ],
+      [ 40, 20, 147, 44, 37 ],
+      [ 40, 20, 148, 44, 37 ],
+      [ 40, 20, 149, 44, 36 ],
+      [ 40, 20, 150, 44, 35 ],
+      [ 40, 20, 151, 44, 35 ],
+      [ 40, 20, 152, 44, 35 ],
+      [ 40, 20, 153, 44, 35 ],
+      [ 40, 20, 154, 44, 34 ],
+      [ 40, 20, 155, 44, 33 ],
+      [ 40, 20, 156, 44, 33 ],
+      [ 40, 20, 157, 44, 32 ],
+      [ 40, 20, 158, 44, 32 ],
+      [ 40, 20, 159, 44, 32 ],
+      [ 40, 20, 160, 44, 31 ],
+      [ 40, 20, 161, 44, 31 ],
+      [ 40, 20, 162, 44, 30 ],
+      [ 40, 20, 163, 44, 29 ],
+      [ 40, 20, 164, 44, 29 ],
+      [ 40, 20, 165, 43, 28 ],
+      [ 40, 20, 166, 43, 27 ],
+      [ 40, 20, 167, 42, 26 ],
+      [ 40, 20, 168, 43, 27 ],
+      [ 40, 20, 169, 43, 26 ],
+      [ 40, 20, 170, 42, 25 ],
+      [ 40, 20, 171, 42, 25 ],
+      [ 40, 20, 172, 42, 24 ],
+      [ 40, 20, 173, 41, 23 ],
+      [ 40, 20, 174, 41, 23 ],
+      [ 40, 20, 175, 41, 22 ],
+      [ 40, 20, 176, 40, 21 ],
+      [ 40, 20, 177, 40, 21 ],
+      [ 40, 20, 178, 40, 20 ],
+      [ 40, 20, 179, 39, 19 ],
+      [ 40, 20, 180, 40, 20 ],
+      [ 40, 20, 181, 39, 19 ],
+      [ 40, 20, 182, 39, 20 ],
+      [ 40, 20, 183, 39, 21 ],
+      [ 40, 20, 184, 39, 21 ],
+      [ 40, 20, 185, 40, 22 ],
+      [ 40, 20, 186, 40, 23 ],
+      [ 40, 20, 187, 40, 23 ],
+      [ 40, 20, 188, 41, 24 ],
+      [ 40, 20, 189, 41, 25 ],
+      [ 40, 20, 190, 41, 25 ],
+      [ 40, 20, 191, 42, 26 ],
+      [ 40, 20, 192, 42, 27 ],
+      [ 40, 20, 193, 41, 26 ],
+      [ 40, 20, 194, 42, 27 ],
+      [ 40, 20, 195, 42, 28 ],
+      [ 40, 20, 196, 43, 29 ],
+      [ 40, 20, 197, 43, 29 ],
+      [ 40, 20, 198, 43, 30 ],
+      [ 40, 20, 199, 43, 31 ],
+      [ 40, 20, 200, 43, 31 ],
+      [ 40, 20, 201, 43, 32 ],
+      [ 40, 20, 202, 43, 32 ],
+      [ 40, 20, 203, 43, 32 ],
+      [ 40, 20, 204, 43, 33 ],
+      [ 40, 20, 205, 43, 33 ],
+      [ 40, 20, 206, 43, 34 ],
+      [ 40, 20, 207, 43, 35 ],
+      [ 40, 20, 208, 43, 35 ],
+      [ 40, 20, 209, 43, 35 ],
+      [ 40, 20, 210, 43, 36 ],
+      [ 40, 20, 211, 43, 36 ],
+      [ 40, 20, 212, 43, 37 ],
+      [ 40, 20, 213, 43, 37 ],
+      [ 40, 20, 214, 43, 38 ],
+      [ 40, 20, 215, 42, 37 ],
+      [ 40, 20, 216, 43, 38 ],
+      [ 40, 20, 217, 42, 39 ],
+      [ 40, 20, 218, 42, 39 ],
+      [ 40, 20, 219, 43, 40 ],
+      [ 40, 20, 220, 42, 39 ],
+      [ 40, 20, 221, 42, 40 ],
+      [ 40, 20, 222, 41, 40 ],
+      [ 40, 20, 223, 42, 41 ],
+      [ 40, 20, 224, 41, 40 ],
+      [ 40, 20, 225, 41, 41 ],
+      [ 40, 20, 226, 40, 41 ],
+      [ 40, 20, 227, 41, 42 ],
+      [ 40, 20, 228, 40, 41 ],
+      [ 40, 20, 229, 40, 42 ],
+      [ 40, 20, 230, 39, 42 ],
+      [ 40, 20, 231, 40, 43 ],
+      [ 40, 20, 232, 39, 42 ],
+      [ 40, 20, 233, 39, 42 ],
+      [ 40, 20, 234, 38, 43 ],
+      [ 40, 20, 235, 37, 42 ],
+      [ 40, 20, 236, 38, 43 ],
+      [ 40, 20, 237, 37, 43 ],
+      [ 40, 20, 238, 37, 43 ],
+      [ 40, 20, 239, 36, 43 ],
+      [ 40, 20, 240, 36, 43 ],
+      [ 40, 20, 241, 35, 43 ],
+      [ 40, 20, 242, 35, 43 ],
+      [ 40, 20, 243, 35, 43 ],
+      [ 40, 20, 244, 34, 43 ],
+      [ 40, 20, 245, 33, 43 ],
+      [ 40, 20, 246, 33, 43 ],
+      [ 40, 20, 247, 32, 43 ],
+      [ 40, 20, 248, 32, 43 ],
+      [ 40, 20, 249, 32, 43 ],
+      [ 40, 20, 250, 31, 43 ],
+      [ 40, 20, 251, 31, 43 ],
+      [ 40, 20, 252, 30, 43 ],
+      [ 40, 20, 253, 29, 43 ],
+      [ 40, 20, 254, 29, 43 ],
+      [ 40, 20, 255, 28, 42 ],
+      [ 40, 20, 256, 27, 42 ],
+      [ 40, 20, 257, 26, 41 ],
+      [ 40, 20, 258, 27, 42 ],
+      [ 40, 20, 259, 26, 42 ],
+      [ 40, 20, 260, 25, 41 ],
+      [ 40, 20, 261, 25, 41 ],
+      [ 40, 20, 262, 24, 41 ],
+      [ 40, 20, 263, 23, 40 ],
+      [ 40, 20, 264, 23, 40 ],
+      [ 40, 20, 265, 22, 40 ],
+      [ 40, 20, 266, 21, 39 ],
+      [ 40, 20, 267, 21, 39 ],
+      [ 40, 20, 268, 20, 39 ],
+      [ 40, 20, 269, 19, 39 ],
+      [ 40, 20, 270, 20, 40 ],
+      [ 40, 20, 271, 19, 39 ],
+      [ 40, 20, 272, 20, 40 ],
+      [ 40, 20, 273, 21, 40 ],
+      [ 40, 20, 274, 21, 40 ],
+      [ 40, 20, 275, 22, 41 ],
+      [ 40, 20, 276, 23, 41 ],
+      [ 40, 20, 277, 23, 41 ],
+      [ 40, 20, 278, 24, 42 ],
+      [ 40, 20, 279, 25, 42 ],
+      [ 40, 20, 280, 25, 42 ],
+      [ 40, 20, 281, 26, 43 ],
+      [ 40, 20, 282, 27, 43 ],
+      [ 40, 20, 283, 26, 42 ],
+      [ 40, 20, 284, 27, 43 ],
+      [ 40, 20, 285, 28, 43 ],
+      [ 40, 20, 286, 29, 44 ],
+      [ 40, 20, 287, 29, 44 ],
+      [ 40, 20, 288, 30, 44 ],
+      [ 40, 20, 289, 31, 44 ],
+      [ 40, 20, 290, 31, 44 ],
+      [ 40, 20, 291, 32, 44 ],
+      [ 40, 20, 292, 32, 44 ],
+      [ 40, 20, 293, 32, 44 ],
+      [ 40, 20, 294, 33, 44 ],
+      [ 40, 20, 295, 33, 44 ],
+      [ 40, 20, 296, 34, 44 ],
+      [ 40, 20, 297, 35, 44 ],
+      [ 40, 20, 298, 35, 44 ],
+      [ 40, 20, 299, 35, 44 ],
+      [ 40, 20, 300, 35, 44 ],
+      [ 40, 20, 301, 36, 44 ],
+      [ 40, 20, 302, 37, 44 ],
+      [ 40, 20, 303, 37, 44 ],
+      [ 40, 20, 304, 38, 44 ],
+      [ 40, 20, 305, 37, 43 ],
+      [ 40, 20, 306, 38, 44 ],
+      [ 40, 20, 307, 39, 43 ],
+      [ 40, 20, 308, 39, 43 ],
+      [ 40, 20, 309, 40, 44 ],
+      [ 40, 20, 310, 39, 43 ],
+      [ 40, 20, 311, 40, 43 ],
+      [ 40, 20, 312, 40, 42 ],
+      [ 40, 20, 313, 41, 43 ],
+      [ 40, 20, 314, 40, 42 ],
+      [ 40, 20, 315, 41, 42 ],
+      [ 40, 20, 316, 41, 41 ],
+      [ 40, 20, 317, 42, 42 ],
+      [ 40, 20, 318, 41, 41 ],
+      [ 40, 20, 319, 42, 41 ],
+      [ 40, 20, 320, 42, 40 ],
+      [ 40, 20, 321, 43, 41 ],
+      [ 40, 20, 322, 42, 40 ],
+      [ 40, 20, 323, 42, 40 ],
+      [ 40, 20, 324, 43, 39 ],
+      [ 40, 20, 325, 42, 38 ],
+      [ 40, 20, 326, 43, 39 ],
+      [ 40, 20, 327, 43, 38 ],
+      [ 40, 20, 328, 43, 38 ],
+      [ 40, 20, 329, 43, 37 ],
+      [ 40, 20, 330, 43, 37 ],
+      [ 40, 20, 331, 43, 36 ],
+      [ 40, 20, 332, 43, 36 ],
+      [ 40, 20, 333, 43, 36 ],
+      [ 40, 20, 334, 43, 35 ],
+      [ 40, 20, 335, 43, 34 ],
+      [ 40, 20, 336, 43, 34 ],
+      [ 40, 20, 337, 43, 33 ],
+      [ 40, 20, 338, 43, 33 ],
+      [ 40, 20, 339, 43, 33 ],
+      [ 40, 20, 340, 43, 32 ],
+      [ 40, 20, 341, 43, 32 ],
+      [ 40, 20, 342, 43, 31 ],
+      [ 40, 20, 343, 43, 30 ],
+      [ 40, 20, 344, 43, 30 ],
+      [ 40, 20, 345, 42, 29 ],
+      [ 40, 20, 346, 42, 28 ],
+      [ 40, 20, 347, 41, 27 ],
+      [ 40, 20, 348, 42, 28 ],
+      [ 40, 20, 349, 42, 27 ],
+      [ 40, 20, 350, 41, 26 ],
+      [ 40, 20, 351, 41, 26 ],
+      [ 40, 20, 352, 41, 25 ],
+      [ 40, 20, 353, 40, 24 ],
+      [ 40, 20, 354, 40, 24 ],
+      [ 40, 20, 355, 40, 23 ],
+      [ 40, 20, 356, 39, 22 ],
+      [ 40, 20, 357, 39, 22 ],
+      [ 40, 20, 358, 39, 21 ],
+      [ 40, 20, 359, 39, 20 ],
+      [ 40, 20, 360, 40, 20 ],
+      [ 40, 20, 110.1, 32, 43 ],
+      [ 40, 20, 344.9, 42, 29 ],
+      [ 40, 20, 142.85, 43, 39 ],
+      [ 40, 20, -106.52, 29, 43 ],
+      [ 40, 20, -295.78, 35, 45 ],
+      [ 40, 20, 287.58, 30, 44 ],
+      [ 40, 20, -3.62, 39, 22 ],
+      [ 40, 20, -33.96, 43, 39 ],
+      [ 40, 20, 136.46, 42, 40 ],
+      [ 40, 20, -293.72, 34, 44 ],
+      [ 40, 20, 10.71, 43, 27 ],
+      [ 40, 20, -80.02, 25, 42 ],
+      [ 40, 20, 258.53, 26, 42 ],
+      [ 40, 20, -110.41, 31, 43 ],
+      [ 40, 20, 340.87, 43, 32 ],
+      [ 40, 20, 347.4, 42, 28 ],
+      [ 40, 20, -277.97, 25, 42 ],
+      [ 40, 20, 126.74, 39, 43 ],
+      [ 40, 20, 70.99, 32, 44 ],
+      [ 40, 20, 57.54, 38, 44 ],
+      [ 40, 20, 251.66, 30, 42 ],
+      [ 40, 20, -91.15, 19, 39 ],
+      [ 40, 20, 164.92, 43, 28 ],
+      [ 40, 20, -27.14, 43, 36 ],
+      [ 40, 20, 230.28, 39, 42 ],
+      [ 40, 20, 271.37, 19, 39 ],
+      [ 40, 20, -207.19, 44, 35 ],
+      [ 40, 20, -58.19, 37, 44 ],
+      [ 40, 20, -339.34, 44, 33 ],
+      [ 40, 20, 352.45, 41, 25 ],
+      [ 40, 20, -245.62, 34, 43 ],
+      [ 40, 20, 130.77, 41, 42 ],
+      [ 40, 20, 337.34, 43, 33 ],
+      [ 40, 20, 257.24, 27, 42 ],
+      [ 40, 20, -335.75, 44, 34 ],
+      [ 40, 20, -318.44, 42, 41 ],
+      [ 40, 20, 184.82, 40, 22 ],
+      [ 40, 20, 20.64, 44, 33 ],
+      [ 40, 20, 7.6, 42, 25 ],
+      [ 40, 20, -38.72, 43, 41 ],
+      [ 40, 20, 86.92, 22, 40 ],
+      [ 40, 20, -341.69, 43, 31 ],
+      [ 40, 20, 241.26, 36, 44 ],
+      [ 40, 20, -14.56, 42, 29 ],
+      [ 40, 20, -92.1, 20, 39 ],
+      [ 40, 20, 222.12, 41, 40 ],
+      [ 40, 20, -27.16, 43, 36 ],
+      [ 40, 20, -10.06, 41, 26 ],
+      [ 40, 20, -11.15, 42, 27 ],
+      [ 40, 20, -316.18, 42, 41 ],
+      [ 40, 20, -312.53, 42, 43 ],
+      [ 40, 20, -119.49, 35, 43 ],
+      [ 40, 20, -47.32, 41, 43 ],
+      [ 40, 20, 212.4, 43, 37 ],
+      [ 40, 20, 213.37, 43, 38 ],
+      [ 40, 20, -177.05, 39, 21 ],
+      [ 40, 20, 123.76, 39, 43 ],
+      [ 40, 20, -353.82, 41, 24 ],
+      [ 40, 20, 124.76, 38, 42 ],
+      [ 40, 20, 144.43, 44, 38 ],
+      [ 40, 20, 358.63, 39, 20 ],
+      [ 40, 20, 239.15, 36, 43 ],
+      [ 40, 20, -84.81, 22, 41 ],
+      [ 40, 20, 335.97, 43, 34 ],
+      [ 40, 20, 136.38, 42, 40 ],
+      [ 40, 20, -60.55, 35, 44 ],
+      [ 40, 20, -342.47, 44, 31 ],
+      [ 40, 20, -38.8, 43, 41 ],
+      [ 40, 20, 320.09, 42, 40 ],
+      [ 40, 20, 25.13, 44, 34 ],
+      [ 40, 20, 282.48, 27, 43 ],
+      [ 40, 20, 47, 42, 43 ],
+      [ 40, 20, 43.45, 43, 42 ],
+      [ 40, 20, 163.73, 44, 29 ],
+      [ 40, 20, -327.56, 44, 38 ],
+      [ 40, 20, 311.35, 40, 43 ],
+      [ 40, 20, 25.85, 44, 35 ],
+      [ 40, 20, 5.28, 41, 23 ],
+      [ 40, 20, -58.72, 36, 44 ],
+      [ 40, 20, -345.3, 43, 29 ],
+      [ 40, 20, 49.11, 41, 43 ],
+      [ 40, 20, -11.25, 42, 27 ],
+      [ 40, 20, -104.78, 28, 42 ],
+      [ 40, 20, -358.22, 40, 21 ],
+      [ 40, 20, -158.86, 43, 32 ],
+      [ 40, 20, -251.42, 31, 42 ],
+      [ 40, 20, -175.27, 40, 22 ],
+      [ 40, 20, 324.91, 42, 38 ],
+      [ 40, 20, -245.24, 34, 43 ],
+      [ 40, 20, 309.5, 39, 43 ],
+      [ 40, 20, 109.34, 32, 43 ],
+      [ 40, 20, -246.61, 33, 43 ],
+      [ 40, 20, 188.64, 41, 25 ],
+      [ 40, 20, -335.47, 44, 34 ],
+      [ 40, 20, -270.64, 20, 39 ],
+      [ 40, 20, -34.98, 42, 38 ],
+      [ 40, 20, -36.02, 43, 39 ],
+      [ 40, 20, -253.11, 30, 43 ],
+      [ 40, 20, 286.22, 29, 44 ],
+      [ 40, 20, -75.94, 27, 43 ],
+      [ 40, 20, 132.03, 41, 41 ],
+      [ 40, 20, 208.69, 44, 36 ],
+      [ 40, 20, 331.07, 44, 37 ],
+      [ 40, 20, -184.53, 41, 22 ],
+      [ 40, 20, 12.42, 43, 28 ],
+      [ 40, 20, -356.5, 40, 22 ],
+      [ 40, 20, -233.19, 39, 43 ],
+      [ 40, 20, -321.73, 43, 40 ],
+      [ 40, 20, 8.78, 42, 26 ],
+      [ 40, 20, 68.1, 33, 44 ],
+      [ 40, 20, -307.02, 40, 43 ],
+      [ 40, 20, -302.11, 38, 44 ],
+      [ 40, 20, -303.15, 38, 44 ],
+      [ 40, 20, -51.8, 39, 43 ],
+      [ 40, 20, -300.33, 37, 44 ],
+      [ 40, 20, -102, 27, 42 ],
+      [ 40, 20, 56.78, 38, 44 ],
+      [ 40, 20, -115.59, 34, 44 ],
+      [ 40, 20, -137.09, 42, 41 ],
+      [ 40, 20, 171.55, 42, 24 ],
+      [ 40, 20, -166.1, 42, 27 ],
+      [ 40, 20, 332.25, 43, 36 ],
+      [ 40, 20, 284.95, 28, 43 ],
+      [ 40, 20, -337.46, 44, 33 ],
+      [ 40, 20, 356.79, 39, 22 ],
+      [ 40, 20, -345.7, 43, 28 ],
+      [ 40, 20, -12.44, 42, 28 ],
+      [ 40, 20, -39.24, 42, 40 ],
+      [ 40, 20, -238.81, 37, 43 ],
+      [ 40, 20, -86.22, 21, 40 ],
+      [ 40, 20, 244.83, 34, 44 ],
+      [ 40, 20, 253.22, 29, 43 ],
+      [ 40, 20, -237.53, 38, 43 ],
+      [ 40, 20, 215.89, 43, 38 ],
+      [ 40, 20, -291.31, 33, 44 ],
+      [ 40, 20, 134.89, 42, 41 ],
+      [ 40, 20, 219.39, 42, 39 ],
+      [ 40, 20, -164.5, 42, 28 ],
+      [ 40, 20, 173.17, 41, 23 ],
+      [ 40, 20, -131.83, 40, 41 ],
+      [ 40, 20, 263.61, 23, 40 ],
+      [ 40, 20, 226.15, 40, 41 ],
+      [ 40, 20, -73.94, 29, 44 ],
+      [ 40, 20, 320.47, 42, 40 ],
+      [ 40, 20, -185.65, 41, 22 ],
+      [ 40, 20, -14.26, 42, 28 ],
+      [ 40, 20, -141.54, 42, 39 ],
+      [ 40, 20, 231.14, 40, 43 ],
+      [ 40, 20, 230.15, 39, 42 ],
+      [ 40, 20, 81.38, 25, 42 ],
+      [ 40, 20, 42.68, 43, 42 ],
+      [ 40, 20, -295.95, 35, 44 ],
+      [ 40, 20, 53.63, 39, 44 ],
+      [ 40, 20, -32.37, 43, 38 ],
+      [ 40, 20, -273.41, 22, 40 ],
+      [ 40, 20, 50.41, 40, 43 ],
+      [ 40, 20, -18.07, 43, 31 ],
+      [ 40, 20, 74.16, 29, 43 ],
+      [ 40, 20, -348.83, 43, 27 ],
+      [ 40, 20, 103.13, 28, 42 ],
+      [ 40, 20, 347.94, 42, 28 ],
+      [ 40, 20, 256.01, 27, 42 ],
+      [ 40, 20, -3.66, 39, 22 ],
+      [ 40, 20, -249.59, 32, 43 ],
+      [ 40, 20, 111.89, 33, 43 ],
+      [ 40, 20, 65.03, 34, 44 ],
+      [ 40, 20, 245.3, 33, 43 ],
+      [ 40, 20, -28.72, 44, 37 ],
+      [ 40, 20, 260.54, 25, 41 ],
+      [ 40, 20, 58.47, 37, 44 ],
+      [ 40, 20, 199.45, 43, 31 ],
+      [ 40, 20, 164.15, 43, 28 ],
+      [ 40, 20, -75.38, 28, 43 ],
+      [ 40, 20, -234.49, 39, 43 ],
+      [ 40, 20, 124.61, 38, 42 ],
+      [ 40, 20, 98.97, 26, 41 ],
+      [ 40, 20, 111.25, 33, 43 ],
+      [ 40, 20, 343.08, 43, 30 ],
+      [ 40, 20, -29.9, 43, 36 ],
+      [ 40, 20, -18.6, 42, 31 ],
+      [ 40, 20, 64.45, 35, 45 ],
+      [ 40, 20, -347.22, 43, 28 ],
+      [ 40, 20, 45.46, 42, 42 ],
+      [ 40, 20, -241.93, 36, 43 ],
+      [ 40, 20, -19.59, 43, 32 ],
+      [ 40, 20, 132.05, 41, 41 ],
+      [ 40, 20, 168.49, 43, 26 ],
+      [ 40, 20, 322.34, 42, 40 ],
+      [ 40, 20, -153.79, 43, 34 ],
+      [ 40, 20, 179.66, 39, 19 ],
+      [ 40, 20, 65.47, 34, 44 ],
+      [ 40, 20, -165.85, 42, 27 ],
+      [ 40, 20, 75.66, 28, 43 ],
+      [ 40, 20, -298.19, 36, 44 ],
+      [ 40, 20, -55.44, 37, 43 ],
+      [ 40, 20, -172.45, 41, 24 ],
+      [ 40, 20, 126.84, 39, 43 ],
+      [ 40, 20, -170.14, 41, 25 ],
+      [ 40, 20, 158.84, 44, 32 ],
+      [ 40, 20, 27.38, 44, 36 ],
+      [ 40, 20, 248.33, 32, 43 ],
+      [ 40, 20, -1.71, 39, 21 ],
+      [ 40, 20, -168.47, 42, 26 ],
+      [ 40, 20, -187.06, 41, 23 ],
+      [ 40, 20, 123.8, 39, 43 ],
+      [ 40, 20, 316.15, 41, 41 ],
+      [ 40, 20, 271.92, 20, 40 ],
+      [ 40, 20, -124.95, 37, 42 ],
+      [ 40, 20, 299.22, 35, 44 ],
+      [ 40, 20, -117.99, 35, 43 ],
+      [ 40, 20, 216.46, 43, 38 ],
+      [ 40, 20, 3.67, 40, 22 ],
+      [ 40, 20, -105.2, 28, 42 ],
+      [ 40, 20, -98.09, 24, 41 ],
+      [ 40, 20, 121.74, 38, 44 ],
+      [ 40, 20, 235.21, 37, 42 ],
+      [ 40, 20, -326.05, 44, 39 ],
+      [ 40, 20, -69.77, 31, 44 ],
+      [ 40, 20, 197.55, 43, 30 ],
+      [ 40, 20, -119.83, 35, 43 ],
+      [ 40, 20, -250.11, 32, 43 ],
+      [ 40, 20, -96.99, 23, 40 ],
+      [ 40, 20, 74.32, 29, 43 ],
+      [ 40, 20, 185.56, 40, 22 ],
+      [ 40, 20, -35.18, 43, 39 ],
+      [ 40, 20, -341.13, 43, 31 ],
+      [ 40, 20, -346.9, 43, 28 ],
+      [ 40, 20, -268.34, 21, 39 ],
+      [ 40, 20, -151.26, 44, 36 ],
+      [ 40, 20, 171.95, 42, 24 ],
+      [ 40, 20, 119.05, 36, 43 ],
+      [ 40, 20, -262.94, 24, 40 ],
+      [ 40, 20, -189.77, 42, 25 ],
+      [ 40, 20, 310.58, 40, 43 ],
+      [ 40, 20, -89.99, 19, 39 ],
+      [ 40, 20, 294.04, 33, 44 ],
+      [ 40, 20, 266.72, 21, 39 ],
+      [ 40, 20, -178.07, 39, 20 ],
+      [ 40, 20, -190.92, 43, 26 ],
+      [ 40, 20, 205.94, 43, 34 ],
+      [ 40, 20, 63.94, 35, 44 ],
+      [ 40, 20, -334.47, 45, 35 ],
+      [ 40, 20, -150.4, 43, 35 ],
+      [ 40, 20, 318.74, 42, 41 ],
+      [ 40, 20, -72.56, 29, 44 ],
+      [ 40, 20, 331.35, 44, 37 ],
+      [ 40, 20, 193.95, 42, 27 ],
+      [ 40, 20, -38.6, 42, 40 ],
+      [ 40, 20, -98.43, 24, 41 ],
+      [ 40, 20, 31.49, 44, 37 ],
+      [ 40, 20, 201.57, 43, 32 ],
+      [ 40, 20, 11.46, 43, 27 ],
+      [ 40, 20, 294.51, 33, 44 ],
+      [ 40, 20, -84.11, 23, 41 ],
+      [ 40, 20, -162.99, 43, 29 ],
+      [ 40, 20, -100.68, 26, 42 ],
+      [ 40, 20, -65.23, 33, 44 ],
+      [ 40, 20, -149.88, 43, 36 ],
+      [ 40, 20, -9.01, 41, 26 ],
+      [ 40, 20, 143.51, 44, 38 ],
+      [ 40, 20, -337.94, 45, 34 ],
+      [ 40, 20, -249.97, 32, 43 ],
+      [ 40, 20, 240.58, 35, 43 ],
+      [ 40, 20, -167.7, 42, 27 ],
+      [ 40, 20, -299.39, 36, 44 ],
+      [ 40, 20, -209.42, 44, 35 ],
+      [ 40, 20, -233.67, 39, 43 ],
+      [ 40, 20, 327.34, 43, 38 ],
+      [ 40, 20, -27.49, 43, 36 ],
+      [ 40, 20, -64.59, 34, 45 ],
+      [ 40, 20, 173.27, 41, 23 ],
+      [ 40, 20, -323.55, 44, 39 ],
+      [ 40, 20, -39.05, 43, 41 ],
+      [ 40, 20, -337.14, 44, 33 ],
+      [ 40, 20, 355.2, 40, 23 ],
+      [ 40, 20, 248.4, 32, 43 ],
+      [ 40, 20, 354.22, 40, 24 ],
+      [ 40, 20, 189.14, 41, 25 ],
+      [ 40, 20, -150.21, 43, 35 ],
+      [ 40, 20, -104.22, 27, 42 ],
+      [ 40, 20, -139.37, 42, 40 ],
+      [ 40, 20, -308.64, 40, 43 ],
+      [ 40, 20, 267.25, 20, 39 ],
+      [ 40, 20, -204.87, 44, 33 ],
+      [ 40, 20, -32.74, 43, 38 ],
+      [ 40, 20, -255.74, 28, 42 ],
+      [ 40, 20, 54.45, 39, 44 ],
+      [ 40, 20, 262.03, 24, 41 ],
+      [ 40, 20, -45.61, 40, 42 ],
+      [ 40, 20, -314.56, 42, 42 ],
+      [ 40, 20, 45.53, 42, 42 ],
+      [ 40, 20, -23.54, 43, 33 ],
+      [ 40, 20, -204.53, 44, 33 ],
+      [ 40, 20, -73.9, 29, 44 ],
+      [ 40, 20, 168.76, 43, 26 ],
+      [ 40, 20, -143.92, 43, 38 ],
+      [ 40, 20, 76.69, 28, 43 ],
+      [ 40, 20, 295.09, 33, 44 ],
+      [ 40, 20, -176.59, 39, 21 ],
+      [ 40, 20, -310.8, 41, 43 ],
+      [ 40, 20, -129.5, 39, 42 ],
+      [ 40, 20, 356.69, 39, 22 ],
+      [ 40, 20, -274.35, 23, 41 ],
+      [ 40, 20, 191.45, 42, 26 ],
+      [ 40, 20, -340.45, 44, 32 ],
+      [ 40, 20, -279.15, 26, 42 ],
+      [ 40, 20, 79.84, 27, 43 ],
+      [ 40, 20, -346.24, 43, 28 ],
+      [ 40, 20, 269.99, 19, 39 ],
+      [ 40, 20, 289.64, 31, 44 ],
+      [ 40, 20, -90.45, 19, 39 ],
+      [ 40, 20, -229.38, 41, 42 ],
+      [ 40, 20, 341.01, 43, 32 ],
+      [ 40, 20, -183.2, 40, 21 ],
+      [ 40, 20, -74.25, 28, 43 ],
+      [ 40, 20, -51.74, 39, 43 ],
+      [ 40, 20, -78.93, 26, 43 ],
+      [ 40, 20, 340.21, 43, 32 ],
+      [ 40, 20, -149.72, 43, 36 ],
+      [ 40, 20, 235.46, 37, 42 ],
+      [ 40, 20, -334.36, 45, 35 ],
+      [ 40, 20, 255.82, 27, 42 ],
+      [ 40, 20, -148.08, 43, 37 ],
+      [ 40, 20, -178.88, 39, 19 ],
+      [ 40, 20, -178.08, 39, 20 ],
+      [ 40, 20, -339.33, 44, 33 ],
+      [ 40, 20, 37.2, 43, 40 ],
+      [ 40, 20, 258.61, 26, 42 ],
+      [ 40, 20, 315.77, 41, 41 ],
+      [ 40, 20, 220.62, 42, 40 ],
+      [ 40, 20, 307.81, 39, 43 ],
+      [ 40, 20, -173.74, 40, 23 ],
+      [ 40, 20, 217.3, 42, 39 ],
+      [ 40, 20, -326.54, 44, 39 ],
+      [ 40, 20, -342.29, 44, 31 ],
+      [ 40, 20, 236.86, 37, 43 ],
+      [ 40, 20, -245.68, 34, 43 ],
+      [ 40, 20, 97.55, 25, 41 ],
+      [ 40, 20, 250.62, 31, 43 ],
+      [ 40, 20, -335.69, 44, 34 ],
+      [ 40, 20, 27.19, 44, 36 ],
+      [ 40, 20, -199.84, 44, 31 ],
+      [ 40, 20, -205.07, 44, 33 ],
+      [ 40, 20, 8.19, 42, 25 ],
+      [ 40, 20, -23.03, 43, 33 ],
+      [ 40, 20, 80.68, 26, 42 ],
+      [ 40, 20, 316.45, 41, 41 ],
+      [ 40, 20, 258.04, 27, 42 ],
+      [ 40, 20, 60.89, 36, 44 ],
+      [ 40, 20, -193.27, 43, 27 ],
+      [ 40, 20, 133.49, 42, 42 ],
+      [ 40, 20, 86.53, 22, 40 ],
+      [ 40, 20, -297.46, 36, 44 ],
+      [ 40, 20, 345.41, 42, 29 ],
+      [ 40, 20, 267.65, 20, 39 ],
+      [ 40, 20, -115.54, 34, 44 ],
+      [ 40, 20, -353.92, 41, 24 ],
+      [ 40, 20, -55.15, 37, 43 ],
+      [ 40, 20, -216.94, 43, 39 ],
+      [ 40, 20, 321.85, 42, 40 ],
+      [ 40, 20, -194.53, 43, 28 ],
+      [ 40, 20, -269.13, 20, 39 ],
+      [ 40, 20, -211.89, 44, 37 ],
+      [ 40, 20, -337.23, 44, 33 ],
+      [ 40, 20, -235.66, 39, 43 ],
+      [ 40, 20, -194.18, 43, 27 ],
+      [ 40, 20, 259.63, 26, 42 ],
+      [ 40, 20, -121.34, 36, 43 ],
+      [ 40, 20, 263.37, 23, 40 ],
+      [ 40, 20, 150.24, 44, 35 ],
+      [ 40, 20, -97.02, 23, 40 ],
+      [ 40, 20, -69.44, 32, 44 ],
+      [ 40, 20, 310.41, 39, 43 ],
+      [ 40, 20, 57.91, 38, 44 ],
+      [ 40, 20, 298.75, 36, 45 ],
+      [ 40, 20, -72.63, 29, 44 ],
+      [ 40, 20, -221.41, 42, 40 ],
+      [ 40, 20, 255.19, 28, 42 ],
+      [ 40, 20, -174.6, 40, 22 ],
+      [ 40, 20, 199.48, 43, 31 ],
+      [ 40, 20, -298.08, 36, 44 ],
+      [ 40, 20, 318.9, 42, 41 ],
+      [ 40, 20, -73.99, 29, 44 ],
+      [ 40, 20, -235.54, 38, 42 ],
+      [ 40, 20, 304.31, 38, 44 ],
+      [ 40, 20, -166.34, 42, 27 ],
+      [ 40, 20, 8.92, 42, 26 ],
+      [ 40, 20, 310.39, 39, 43 ],
+      [ 40, 20, 138.52, 42, 40 ],
+      [ 40, 20, 151.99, 44, 35 ],
+      [ 40, 20, 272.24, 20, 40 ],
+      [ 40, 20, 303.99, 38, 44 ],
+      [ 40, 20, 242.87, 35, 43 ],
+      [ 40, 20, -299.66, 36, 44 ],
+      [ 40, 20, 326.77, 43, 38 ],
+      [ 40, 20, -352.79, 42, 25 ],
+      [ 40, 20, -133.84, 40, 41 ],
+      [ 40, 20, 226.39, 40, 41 ],
+      [ 40, 20, -114.12, 33, 43 ],
+      [ 40, 20, -230.47, 40, 42 ],
+      [ 40, 20, 16.63, 44, 30 ],
+      [ 40, 20, 148.86, 44, 36 ],
+      [ 40, 20, 60.09, 36, 44 ],
+      [ 40, 20, -32.96, 43, 38 ],
+      [ 40, 20, -153.24, 43, 35 ],
+      [ 40, 20, -1.16, 39, 20 ],
+      [ 40, 20, 254.41, 28, 42 ],
+      [ 40, 20, -14.65, 42, 29 ],
+      [ 40, 20, -105.97, 29, 43 ],
+      [ 40, 20, -280.19, 27, 43 ],
+      [ 40, 20, -175.17, 40, 22 ],
+      [ 40, 20, -44.05, 41, 41 ],
+      [ 40, 20, -321.29, 44, 41 ],
+      [ 40, 20, 110.85, 33, 43 ],
+      [ 40, 20, 80.41, 26, 42 ],
+      [ 40, 20, 343.02, 43, 30 ],
+      [ 40, 20, 304.51, 37, 43 ],
+      [ 40, 20, -270.67, 20, 39 ],
+      [ 40, 20, 293.41, 32, 44 ],
+      [ 40, 20, 83.02, 24, 41 ],
+      [ 40, 20, 241.33, 36, 44 ],
+      [ 40, 20, 205.64, 44, 34 ],
+      [ 40, 20, 27.01, 44, 36 ],
+      [ 40, 20, 124.19, 39, 43 ],
+      [ 40, 20, 265.98, 21, 39 ],
+      [ 40, 20, -6.23, 40, 24 ],
+      [ 40, 20, 131.41, 41, 41 ],
+      [ 40, 20, -227.86, 41, 41 ],
+      [ 40, 20, -139.85, 42, 39 ],
+      [ 40, 20, -342.72, 44, 30 ],
+      [ 40, 20, -98.33, 24, 41 ],
+      [ 40, 20, 236.79, 37, 43 ],
+      [ 40, 20, 166.14, 43, 27 ],
+      [ 40, 20, 321.77, 42, 40 ],
+      [ 40, 20, -156.18, 43, 33 ],
+      [ 40, 20, -347.1, 42, 27 ],
+      [ 40, 20, -39.4, 42, 40 ],
+      [ 40, 20, -261.77, 25, 41 ],
+      [ 40, 20, -1.74, 39, 21 ],
+      [ 40, 20, 214.63, 42, 37 ],
+      [ 40, 20, -181.95, 40, 20 ],
+      [ 40, 20, 183.09, 39, 21 ],
+      [ 40, 20, -189.43, 42, 25 ],
+      [ 40, 20, -143.24, 43, 38 ],
+      [ 40, 20, -66.07, 33, 44 ],
+      [ 40, 20, 250.99, 31, 43 ],
+      [ 40, 20, -160.22, 43, 31 ],
+      [ 40, 20, -121.56, 36, 43 ],
+      [ 40, 20, 340.33, 43, 32 ],
+      [ 40, 20, -226.82, 42, 42 ],
+      [ 40, 20, 321.46, 42, 40 ],
+      [ 40, 20, 221.65, 41, 40 ],
+      [ 40, 20, 338.83, 43, 33 ],
+      [ 40, 20, -11.53, 42, 27 ],
+      [ 40, 20, -14.16, 42, 28 ],
+      [ 40, 20, 244.81, 34, 44 ],
+      [ 40, 20, 342.24, 43, 31 ],
+      [ 40, 20, -242.76, 36, 43 ],
+      [ 40, 20, -343.06, 44, 30 ],
+      [ 40, 20, -157.61, 43, 32 ],
+      [ 40, 20, -225.48, 42, 41 ],
+      [ 40, 20, -81.38, 24, 42 ],
+      [ 40, 20, -280.83, 27, 43 ],
+      [ 40, 20, 300.67, 36, 44 ],
+      [ 40, 20, -119.62, 35, 43 ],
+      [ 40, 20, -77, 26, 42 ],
+      [ 40, 20, 313.57, 40, 42 ],
+      [ 40, 20, 200.99, 43, 32 ],
+      [ 40, 20, 21.23, 44, 33 ],
+      [ 40, 20, -48.18, 40, 42 ],
+      [ 40, 20, 55.62, 39, 44 ],
+      [ 40, 20, 199.29, 43, 31 ],
+      [ 40, 20, -225.09, 42, 41 ],
+      [ 40, 20, 226.2, 40, 41 ],
+      [ 40, 20, -303.96, 39, 44 ],
+      [ 40, 20, 68.84, 33, 44 ],
+      [ 40, 20, 117.18, 36, 43 ],
+      [ 40, 20, -104.18, 27, 42 ],
+      [ 40, 20, 307.29, 39, 43 ],
+      [ 40, 20, 97.5, 25, 41 ],
+      [ 40, 20, 29.01, 44, 36 ],
+      [ 40, 20, 268.74, 19, 39 ],
+      [ 40, 20, -40.85, 42, 41 ],
+      [ 40, 20, 7.83, 42, 25 ],
+      [ 40, 20, -102.79, 27, 42 ],
+      [ 40, 20, 304.99, 37, 43 ],
+      [ 40, 20, -107.37, 29, 43 ],
+      [ 40, 20, -120.56, 36, 43 ],
+      [ 40, 20, -297.78, 36, 44 ],
+      [ 40, 20, -90.42, 19, 39 ],
+      [ 40, 20, 81.84, 25, 42 ],
+      [ 40, 20, -163.25, 43, 29 ],
+      [ 40, 20, 188.2, 41, 24 ],
+      [ 40, 20, 161.02, 44, 31 ],
+      [ 40, 20, -222.59, 43, 41 ],
+      [ 40, 20, -291.42, 33, 44 ],
+      [ 40, 20, -275.99, 24, 41 ],
+      [ 40, 20, -269.03, 20, 39 ],
+      [ 40, 20, 269.58, 19, 39 ],
+      [ 40, 20, 105.25, 29, 42 ],
+      [ 573, 347, -55.47, 609, 669 ],
+      [ 765, 205, 0.58, 766, 212 ],
+      [ 351, 714, 256.41, 775, 508 ],
+      [ 276, 434, -74.59, 490, 381 ],
+      [ 146, 6, 293.24, 62, 136 ],
+      [ 512, 715, -174.13, 581, 762 ],
+      [ 853, 14, 95.45, 95, 849 ],
+      [ 457, 224, -76.35, 324, 497 ],
+      [ 174, 370, -7.76, 221, 390 ],
+      [ 294, 467, -98.19, 502, 357 ],
+      [ 955, 129, 227, 744, 785 ],
+      [ 364, 702, -301.62, 788, 677 ],
+      [ 877, 197, -353.05, 894, 302 ],
+      [ 730, 404, 53.02, 762, 826 ],
+      [ 112, 514, 58.24, 495, 366 ],
+      [ 17, 129, 8.44, 35, 130 ],
+      [ 281, 768, 20.87, 536, 818 ],
+      [ 929, 343, 230.05, 858, 931 ],
+      [ 308, 473, -143.37, 528, 562 ],
+      [ 809, 693, 294.19, 962, 1021 ],
+      [ 158, 641, -305.47, 613, 500 ],
+      [ 993, 146, 352.59, 1002, 273 ],
+      [ 52, 36, -182.82, 53, 37 ],
+      [ 61, 583, 195.61, 214, 576 ],
+      [ 649, 666, -43.4, 928, 929 ],
+      [ 220, 678, 77.36, 710, 362 ],
+      [ 744, 121, 77.35, 280, 751 ],
+      [ 261, 49, -321.61, 234, 200 ],
+      [ 77, 280, 121.51, 279, 210 ],
+      [ 385, 119, 50.72, 335, 373 ],
+      [ 291, 237, -68.73, 325, 357 ],
+      [ 369, 213, 67.7, 337, 422 ],
+      [ 358, 251, 100.59, 312, 396 ],
+      [ 610, 297, -73.68, 455, 668 ],
+      [ 376, 15, -169.68, 371, 81 ],
+      [ 827, 179, -254.18, 397, 843 ],
+      [ 425, 737, -141.29, 791, 839 ],
+      [ 23, 164, -95.58, 164, 37 ],
+      [ 77, 222, 166.62, 125, 232 ],
+      [ 762, 510, 277.54, 604, 822 ],
+      [ 322, 728, -221.02, 720, 759 ],
+      [ 736, 236, -22.05, 770, 495 ],
+      [ 321, 504, 212.83, 541, 597 ],
+      [ 976, 193, -229.44, 781, 865 ],
+      [ 359, 475, -215.81, 569, 594 ],
+      [ 630, 326, -48.07, 662, 686 ],
+      [ 780, 644, -77.76, 793, 899 ],
+      [ 67, 661, 75.98, 657, 225 ],
+      [ 443, 718, 283.2, 799, 595 ],
+      [ 168, 522, 40.53, 466, 506 ],
+      [ 51, 763, 2.14, 78, 763 ],
+      [ 249, 547, 222.59, 552, 570 ],
+      [ 729, 19, -25.54, 664, 331 ],
+      [ 520, 750, 154.94, 789, 898 ],
+      [ 706, 251, -120.38, 573, 735 ],
+      [ 911, 723, 185.11, 970, 800 ],
+      [ 330, 540, 68.77, 622, 503 ],
+      [ 732, 590, -32.05, 932, 888 ],
+      [ 328, 154, -78.98, 212, 350 ],
+      [ 219, 279, -310.49, 354, 347 ],
+      [ 788, 317, -315.86, 786, 775 ],
+      [ 279, 503, 196.18, 406, 559 ],
+      [ 84, 282, 213.32, 224, 281 ],
+      [ 559, 671, 196.16, 722, 798 ],
+      [ 268, 432, -288.99, 495, 394 ],
+      [ 609, 347, -331.79, 700, 593 ],
+      [ 360, 594, 173.57, 424, 629 ],
+      [ 970, 375, 5.79, 1003, 470 ],
+      [ 412, 620, 149.31, 670, 742 ],
+      [ 812, 16, -309.25, 525, 638 ],
+      [ 882, 606, -12.36, 990, 780 ],
+      [ 945, 47, -261.03, 193, 939 ],
+      [ 712, 110, 2.68, 716, 143 ],
+      [ 503, 529, -88.4, 542, 517 ],
+      [ 270, 730, 316.29, 698, 714 ],
+      [ 371, 418, -79.07, 479, 443 ],
+      [ 412, 687, -242.53, 800, 681 ],
+      [ 146, 646, 108.15, 659, 338 ],
+      [ 667, 187, -31.06, 666, 504 ],
+      [ 367, 27, -16.94, 358, 132 ],
+      [ 439, 689, -168.99, 561, 758 ],
+      [ 934, 629, -125.04, 1050, 1124 ],
+      [ 50, 395, -22.51, 196, 384 ],
+      [ 566, 4, -246.96, 225, 521 ],
+      [ 952, 206, -283.43, 421, 973 ],
+      [ 890, 484, 107.7, 731, 993 ],
+      [ 266, 25, 31.52, 239, 160 ],
+      [ 433, 134, -83.19, 183, 445 ],
+      [ 75, 634, 91.53, 636, 90 ],
+      [ 543, 140, 116.69, 368, 547 ],
+      [ 6, 469, 41.81, 317, 353 ],
+      [ 278, 401, -88.97, 404, 284 ],
+      [ 612, 439, 280.54, 542, 681 ],
+      [ 68, 95, 283.63, 107, 88 ],
+      [ 229, 41, -243.53, 139, 221 ],
+      [ 338, 708, 210.11, 646, 780 ],
+      [ 1003, 139, 232.72, 717, 881 ],
+      [ 536, 463, 357.89, 551, 482 ],
+      [ 930, 519, 231.4, 985, 1049 ],
+      [ 548, 157, -357.44, 554, 181 ],
+      [ 202, 162, 82.14, 187, 222 ],
+      [ 773, 370, -262.23, 471, 814 ],
+      [ 135, 61, 148.43, 147, 121 ],
+      [ 22, 112, 236.79, 105, 78 ],
+      [ 937, 283, 274.47, 354, 956 ],
+      [ 79, 536, 217.74, 389, 471 ],
+      [ 890, 520, 347.55, 980, 699 ],
+      [ 708, 154, 61.36, 474, 695 ],
+      [ 705, 82, -172.68, 708, 169 ],
+      [ 523, 493, -25.61, 683, 671 ],
+      [ 526, 644, 125.61, 830, 801 ],
+      [ 131, 455, -248, 471, 290 ],
+      [ 270, 556, -191.46, 374, 597 ],
+      [ 993, 572, -87.31, 616, 1018 ],
+      [ 818, 506, 177.51, 839, 540 ],
+      [ 696, 565, -40.43, 894, 881 ],
+      [ 494, 464, -273.43, 492, 521 ],
+      [ 476, 227, -129.96, 478, 509 ],
+      [ 52, 755, -53.22, 635, 493 ],
+      [ 318, 379, -311.68, 494, 489 ],
+      [ 794, 5, 291.36, 293, 741 ],
+      [ 460, 103, -2.3, 462, 121 ],
+      [ 619, 305, -201.62, 687, 511 ],
+      [ 859, 282, 333.95, 894, 630 ],
+      [ 223, 127, 88.01, 134, 226 ],
+      [ 987, 649, -102.96, 852, 1106 ],
+      [ 418, 251, 331.17, 486, 421 ],
+      [ 541, 608, -176.92, 572, 635 ],
+      [ 868, 646, -189.3, 960, 777 ],
+      [ 281, 116, 165.4, 300, 181 ],
+      [ 349, 711, 169.74, 470, 761 ],
+      [ 252, 288, 265.89, 304, 271 ],
+      [ 760, 752, -168.4, 894, 888 ],
+      [ 986, 628, 95.31, 716, 1038 ],
+      [ 949, 27, 213.8, 802, 548 ],
+      [ 562, 767, 101.53, 864, 702 ],
+      [ 927, 312, 336.26, 973, 659 ],
+      [ 886, 717, 185.51, 949, 798 ],
+      [ 123, 600, 70.64, 606, 315 ],
+      [ 365, 42, 178.97, 365, 47 ],
+      [ 89, 304, 124.91, 299, 245 ],
+      [ 842, 492, -325.96, 972, 879 ],
+      [ 708, 294, -341.61, 764, 502 ],
+      [ 981, 265, 246.51, 633, 1004 ],
+      [ 604, 208, 271.05, 218, 607 ],
+      [ 396, 629, 269.55, 631, 399 ],
+      [ 29, 556, -158.42, 229, 526 ],
+      [ 1019, 453, -206.3, 1114, 856 ],
+      [ 771, 544, 355.98, 806, 597 ],
+      [ 359, 50, -324.83, 322, 247 ],
+      [ 102, 116, -40.39, 151, 154 ],
+      [ 791, 747, -299.35, 1038, 1055 ],
+      [ 840, 510, -23.99, 973, 807 ],
+      [ 866, 477, 224.07, 953, 944 ],
+      [ 705, 162, -301.25, 503, 686 ],
+      [ 578, 459, 288.1, 614, 692 ],
+      [ 450, 481, 89.13, 487, 456 ],
+      [ 736, 476, -207, 871, 757 ],
+      [ 955, 286, 302.83, 756, 957 ],
+      [ 949, 555, 349.29, 1034, 721 ],
+      [ 999, 631, -262.23, 760, 1073 ],
+      [ 430, 457, -281.97, 536, 515 ],
+      [ 516, 318, 195.96, 582, 446 ],
+      [ 994, 199, -76.86, 418, 1012 ],
+      [ 800, 727, 74.89, 910, 962 ],
+      [ 884, 393, -215, 949, 828 ],
+      [ 782, 729, 235.01, 1044, 1057 ],
+      [ 397, 513, -38.84, 630, 648 ],
+      [ 614, 461, 228.97, 750, 765 ],
+      [ 533, 404, 29.07, 661, 611 ],
+      [ 518, 385, -99.58, 465, 573 ],
+      [ 657, 707, 327.94, 930, 947 ],
+      [ 768, 326, -94.35, 382, 789 ],
+      [ 534, 303, 91.98, 321, 542 ],
+      [ 937, 135, 53.41, 666, 832 ],
+      [ 532, 29, -299.01, 282, 479 ],
+      [ 738, 615, -335.72, 925, 864 ],
+      [ 560, 144, 144.86, 540, 439 ],
+      [ 1017, 604, -143.59, 1176, 1088 ],
+      [ 830, 236, 234.95, 668, 814 ],
+      [ 360, 624, -124.39, 717, 648 ],
+      [ 730, 348, -181.98, 741, 372 ],
+      [ 684, 155, 122.85, 501, 657 ],
+      [ 38, 555, -313.91, 426, 412 ],
+      [ 681, 490, -188.19, 744, 581 ],
+      [ 245, 120, -161.22, 269, 191 ],
+      [ 332, 673, -304.93, 742, 657 ],
+      [ 366, 325, -170.16, 415, 381 ],
+      [ 60, 319, -323.93, 236, 293 ],
+      [ 368, 173, -103.4, 252, 396 ],
+      [ 190, 443, -239.3, 478, 388 ],
+      [ 525, 222, 86.17, 257, 538 ],
+      [ 779, 735, 231.02, 1060, 1066 ],
+      [ 441, 763, 31.22, 772, 881 ],
+      [ 507, 506, -230.09, 713, 712 ],
+      [ 751, 689, -118.02, 959, 985 ],
+      [ 10, 170, -207.58, 87, 154 ],
+      [ 88, 444, 96.25, 450, 134 ],
+      [ 358, 489, -325.38, 572, 605 ],
+      [ 410, 765, -163.49, 609, 848 ],
+      [ 774, 139, 250.99, 382, 775 ],
+      [ 946, 533, -261.54, 666, 1012 ],
+      [ 557, 348, -293.13, 538, 649 ],
+      [ 373, 679, -298.13, 774, 648 ],
+      [ 930, 291, 175.45, 950, 362 ],
+      [ 90, 86, 101, 101, 103 ],
+      [ 435, 93, 259.53, 169, 443 ],
+      [ 651, 159, -44.7, 573, 570 ],
+      [ 276, 427, -306.82, 507, 476 ],
+      [ 325, 734, -310.41, 769, 723 ],
+      [ 605, 546, -180.54, 609, 550 ],
+      [ 450, 487, 318.4, 658, 662 ],
+      [ 590, 137, -75.57, 279, 605 ],
+      [ 685, 416, -159.6, 786, 627 ],
+      [ 773, 345, 112.41, 613, 845 ],
+      [ 511, 412, 192.27, 586, 510 ],
+      [ 142, 738, 278.75, 749, 252 ],
+      [ 1023, 458, -293.08, 822, 1121 ],
+      [ 448, 665, 106.65, 765, 619 ],
+      [ 523, 141, 74, 280, 541 ],
+      [ 594, 594, -134.45, 838, 839 ],
+      [ 849, 163, 322.03, 768, 650 ],
+      [ 790, 605, -270.42, 610, 793 ],
+      [ 171, 351, 119.26, 389, 320 ],
+      [ 456, 162, -277.76, 222, 473 ],
+      [ 103, 545, 108.48, 549, 269 ],
+      [ 889, 651, 79.93, 796, 989 ],
+      [ 773, 650, -210.99, 997, 954 ],
+      [ 868, 218, -308.01, 706, 817 ],
+      [ 508, 610, -176.53, 543, 638 ],
+      [ 101, 287, -340.03, 192, 304 ],
+      [ 422, 155, -187.53, 438, 208 ],
+      [ 368, 747, -340.56, 596, 826 ],
+      [ 496, 107, -12.25, 506, 210 ],
+      [ 153, 448, 139.26, 407, 437 ],
+      [ 270, 525, -70.57, 583, 429 ],
+      [ 936, 424, -180.74, 940, 435 ],
+      [ 538, 235, -291.72, 417, 586 ],
+      [ 750, 118, -88.21, 140, 753 ],
+      [ 824, 499, -237.04, 867, 961 ],
+      [ 61, 575, 31.41, 352, 522 ],
+      [ 89, 123, 176.59, 95, 127 ],
+      [ 335, 399, 156.89, 465, 497 ],
+      [ 362, 2, 256.74, 84, 352 ],
+      [ 857, 117, -43.45, 701, 674 ],
+      [ 543, 319, -271.27, 331, 549 ],
+      [ 955, 253, 125.56, 761, 922 ],
+      [ 186, 656, 345.76, 340, 681 ],
+      [ 283, 450, -263.73, 477, 329 ],
+      [ 669, 300, 203.75, 732, 543 ],
+      [ 844, 345, 22.18, 911, 637 ],
+      [ 377, 412, 137.13, 556, 557 ],
+      [ 116, 663, -209.4, 426, 633 ],
+      [ 851, 166, -207.8, 829, 542 ],
+      [ 704, 40, -98.81, 146, 700 ],
+      [ 130, 447, 199.8, 272, 464 ],
+      [ 257, 395, -283.5, 443, 341 ],
+      [ 947, 534, 331.25, 1086, 923 ],
+      [ 927, 745, 33.05, 1183, 1129 ],
+      [ 40, 479, 313.89, 371, 360 ],
+      [ 842, 343, -82.76, 445, 878 ],
+      [ 361, 626, 303.08, 721, 644 ],
+      [ 44, 712, 203.88, 327, 667 ],
+      [ 258, 582, 359.09, 265, 586 ],
+      [ 475, 342, -323.57, 585, 557 ],
+      [ 846, 439, 95.2, 513, 881 ],
+      [ 618, 631, -255.2, 767, 757 ],
+      [ 727, 573, 244.51, 828, 902 ],
+      [ 686, 500, 222.61, 842, 831 ],
+      [ 221, 530, -49.12, 544, 514 ],
+      [ 156, 392, 272.31, 397, 171 ],
+      [ 550, 663, 138.28, 851, 860 ],
+      [ 469, 696, 85.4, 731, 523 ],
+      [ 247, 121, -89.45, 122, 247 ],
+      [ 246, 477, 230.48, 523, 492 ],
+      [ 298, 343, -78.27, 395, 361 ],
+      [ 945, 39, -206.96, 860, 462 ],
+      [ 70, 584, 329.99, 351, 541 ],
+      [ 930, 330, 78.29, 511, 977 ],
+      [ 734, 496, -145.75, 884, 822 ],
+      [ 153, 612, 221.61, 519, 558 ],
+      [ 28, 256, 122.53, 231, 160 ],
+      [ 736, 608, 54.16, 923, 952 ],
+      [ 346, 25, 167.09, 343, 100 ],
+      [ 731, 209, -106.47, 406, 759 ],
+      [ 546, 431, 214.67, 693, 663 ],
+      [ 947, 372, 250.3, 668, 1015 ],
+      [ 141, 424, 76.93, 444, 233 ],
+      [ 98, 353, -334.21, 242, 360 ],
+      [ 721, 135, 129.95, 565, 638 ],
+      [ 2, 249, -16.73, 72, 238 ],
+      [ 829, 270, 223.01, 789, 761 ],
+      [ 492, 54, 72.23, 201, 484 ],
+      [ 57, 313, 94.83, 316, 81 ],
+      [ 806, 92, 289.88, 360, 788 ],
+      [ 143, 502, -26.17, 348, 514 ],
+      [ 960, 444, 321.87, 1028, 941 ],
+      [ 804, 549, -1.2, 813, 565 ],
+      [ 402, 622, 329.13, 663, 740 ],
+      [ 438, 395, -264.53, 434, 473 ],
+      [ 111, 396, -31.3, 299, 395 ],
+      [ 599, 250, 221.13, 614, 581 ],
+      [ 404, 618, 271.02, 624, 414 ],
+      [ 1019, 661, -156.22, 1198, 1014 ],
+      [ 642, 497, -70.04, 685, 773 ],
+      [ 542, 604, -319.97, 803, 810 ],
+      [ 1017, 555, 95.73, 653, 1065 ],
+      [ 963, 390, -109.91, 693, 1037 ],
+      [ 449, 691, -246.89, 812, 682 ],
+      [ 405, 251, 123.08, 431, 475 ],
+      [ 541, 334, -225.77, 616, 619 ],
+      [ 1008, 15, 8.18, 999, 158 ],
+      [ 811, 318, -132.55, 781, 811 ],
+      [ 684, 314, -233.79, 657, 735 ],
+      [ 974, 27, 231.55, 625, 778 ],
+      [ 363, 434, 76.98, 504, 451 ],
+      [ 420, 428, -122.82, 586, 583 ],
+      [ 44, 382, 242.46, 358, 215 ],
+      [ 399, 718, 169.72, 520, 776 ],
+      [ 560, 254, -315.23, 576, 574 ],
+      [ 223, 659, -2.44, 249, 667 ],
+      [ 414, 647, 11.35, 532, 715 ],
+      [ 938, 487, 309.16, 969, 1035 ],
+      [ 237, 232, -116.8, 312, 315 ],
+      [ 417, 194, -91.67, 205, 421 ],
+      [ 234, 466, 314.41, 495, 493 ],
+      [ 856, 12, -4.73, 853, 82 ],
+      [ 169, 45, 352.78, 172, 66 ],
+      [ 2, 344, 305.73, 279, 202 ],
+      [ 755, 764, -176.75, 795, 804 ],
+      [ 819, 163, -279.19, 291, 834 ],
+      [ 303, 473, 327.13, 510, 561 ],
+      [ 832, 408, 63.3, 737, 926 ],
+      [ 759, 586, 280.36, 711, 851 ],
+      [ 81, 130, -257.92, 143, 105 ],
+      [ 463, 305, 178.43, 470, 316 ],
+      [ 398, 179, 189.44, 420, 241 ],
+      [ 903, 305, 230.84, 805, 892 ],
+      [ 893, 306, -167.29, 937, 494 ],
+      [ 816, 104, -171.82, 821, 218 ],
+      [ 52, 718, -19.67, 289, 693 ],
+      [ 167, 177, -296.63, 232, 228 ],
+      [ 120, 32, 85.5, 41, 122 ],
+      [ 722, 601, -85.84, 650, 764 ],
+      [ 609, 662, 35.57, 880, 892 ],
+      [ 754, 240, 321.29, 737, 658 ],
+      [ 496, 538, -231.74, 729, 721 ],
+      [ 254, 447, 53.71, 510, 469 ],
+      [ 70, 348, 340.06, 183, 350 ],
+      [ 344, 192, -282.97, 264, 378 ],
+      [ 612, 231, -330.59, 646, 501 ],
+      [ 72, 356, -165.26, 159, 361 ],
+      [ 162, 446, -135.64, 426, 431 ],
+      [ 795, 219, -292.56, 507, 818 ],
+      [ 161, 676, 327.18, 500, 655 ],
+      [ 724, 473, -168.11, 804, 611 ],
+      [ 669, 77, 336.01, 641, 342 ],
+      [ 851, 267, 34.78, 850, 704 ],
+      [ 416, 319, -359.02, 420, 326 ],
+      [ 387, 576, -179.64, 389, 577 ],
+      [ 497, 267, 36.17, 559, 509 ],
+      [ 539, 320, -350.8, 583, 402 ],
+      [ 816, 441, 66.6, 729, 923 ],
+      [ 111, 269, 271.66, 271, 118 ],
+      [ 207, 390, 184.72, 237, 405 ],
+      [ 160, 164, -92.13, 168, 164 ],
+      [ 433, 666, -20.46, 637, 775 ],
+      [ 399, 536, 229.18, 665, 650 ],
+      [ 960, 79, -192.4, 954, 282 ],
+      [ 962, 369, 347.54, 1018, 567 ],
+      [ 194, 741, -122.85, 727, 563 ],
+      [ 758, 377, 176.79, 777, 417 ],
+      [ 771, 220, -130.18, 664, 730 ],
+      [ 353, 303, 121.74, 443, 458 ],
+      [ 228, 458, -233.29, 503, 455 ],
+      [ 1002, 577, -79.69, 746, 1088 ],
+      [ 359, 133, -176.18, 366, 155 ],
+      [ 842, 432, 325.52, 938, 832 ],
+      [ 656, 384, -320.92, 751, 711 ],
+      [ 895, 337, 24.6, 953, 678 ],
+      [ 877, 482, -0.9, 883, 495 ],
+      [ 190, 282, 351.99, 226, 305 ],
+      [ 954, 91, -162, 934, 380 ],
+      [ 256, 356, 121.52, 436, 403 ],
+      [ 942, 526, -170.02, 1017, 680 ],
+      [ 98, 510, -349.45, 189, 518 ],
+      [ 496, 11, -224.86, 359, 356 ],
+      [ 758, 642, 179.75, 760, 644 ],
+      [ 709, 366, -180.86, 713, 375 ],
+      [ 764, 269, 134.32, 725, 733 ],
+      [ 287, 158, -134.37, 312, 314 ],
+      [ 798, 300, 129.27, 737, 806 ],
+      [ 787, 247, 214.41, 788, 647 ],
+      [ 44, 439, -172.34, 101, 439 ],
+      [ 729, 377, 320.69, 802, 753 ],
+      [ 999, 450, 78.19, 644, 1069 ],
+      [ 1014, 54, 88.04, 88, 1015 ],
+      [ 183, 622, -30.22, 470, 629 ],
+      [ 950, 385, 312.59, 924, 960 ],
+      [ 181, 190, -155.94, 241, 245 ],
+      [ 884, 405, -8.25, 931, 527 ],
+      [ 181, 236, 272.79, 243, 191 ],
+      [ 877, 57, -216.03, 743, 560 ],
+      [ 670, 90, 195.13, 668, 260 ],
+      [ 937, 637, -172.02, 1014, 760 ],
+      [ 881, 618, 249.25, 889, 1041 ],
+      [ 480, 610, 299.25, 765, 716 ],
+      [ 93, 747, 161.79, 321, 738 ],
+      [ 562, 691, -197.6, 744, 827 ],
+      [ 495, 59, -19.85, 484, 223 ],
+      [ 785, 721, 359.66, 787, 725 ],
+      [ 261, 89, -139.99, 255, 234 ],
+      [ 137, 746, -86.8, 751, 178 ],
+      [ 342, 480, -2.77, 363, 495 ],
+      [ 107, 414, -126.38, 395, 331 ],
+      [ 375, 306, -267.64, 321, 386 ],
+      [ 217, 666, 304.01, 672, 552 ],
+      [ 131, 735, 283.69, 744, 301 ],
+      [ 873, 388, 211.15, 947, 782 ],
+      [ 80, 759, 265.54, 762, 137 ],
+      [ 564, 579, 221.17, 804, 806 ],
+      [ 563, 7, 303.67, 317, 472 ],
+      [ 876, 109, 282.32, 291, 878 ],
+      [ 241, 365, 11.53, 309, 406 ],
+      [ 749, 446, -321.05, 862, 817 ],
+      [ 57, 726, -34.7, 458, 629 ],
+      [ 188, 121, -131.26, 213, 220 ],
+      [ 109, 219, -162.69, 168, 240 ],
+      [ 1024, 105, 200.79, 993, 460 ],
+      [ 812, 165, 191.77, 827, 326 ],
+      [ 678, 587, 14.3, 801, 736 ],
+      [ 481, 241, 20.14, 534, 391 ],
+      [ 401, 130, 122.08, 322, 407 ],
+      [ 290, 310, -255.92, 371, 355 ],
+      [ 818, 103, 161.27, 807, 359 ],
+      [ 874, 145, 121.63, 581, 819 ],
+      [ 313, 286, 234.41, 414, 419 ],
+      [ 638, 367, -281.16, 483, 696 ],
+      [ 918, 367, -183.26, 937, 417 ],
+      [ 692, 208, -29.51, 703, 521 ],
+      [ 453, 716, -199.75, 668, 826 ],
+      [ 985, 309, 25.67, 1021, 705 ],
+      [ 502, 609, 146.76, 753, 783 ],
+      [ 163, 58, -283.29, 93, 171 ],
+      [ 311, 671, -187.24, 393, 704 ],
+      [ 29, 558, -51.47, 454, 370 ],
+      [ 714, 24, 216.39, 587, 441 ],
+      [ 535, 502, -159.67, 674, 655 ],
+      [ 647, 423, 184.07, 674, 466 ],
+      [ 899, 174, -341.28, 907, 453 ],
+      [ 345, 513, 329.85, 555, 617 ],
+      [ 573, 483, -101.39, 585, 655 ],
+      [ 97, 91, -251.33, 117, 119 ],
+      [ 818, 213, -197.64, 844, 449 ],
+      [ 927, 447, -288.8, 721, 1021 ],
+      [ 149, 468, 234.16, 465, 393 ],
+      [ 587, 235, 256.52, 364, 624 ],
+      [ 383, 636, 7.03, 458, 677 ],
+      [ 668, 353, -317, 729, 713 ],
+      [ 418, 258, -154.77, 487, 410 ],
+      [ 444, 516, 325.47, 656, 676 ],
+      [ 402, 178, 58.01, 363, 434 ],
+      [ 769, 250, 143.01, 764, 661 ],
+      [ 924, 95, 342.54, 909, 368 ],
+      [ 131, 22, 40.69, 113, 102 ],
+      [ 232, 133, -241.28, 228, 266 ],
+      [ 53, 573, -21.74, 260, 551 ],
+      [ 930, 92, -146.28, 823, 592 ],
+      [ 428, 593, 183.95, 466, 620 ],
+      [ 489, 138, -294.32, 327, 502 ],
+      [ 781, 471, 189.43, 846, 591 ],
+      [ 732, 4, 355.43, 729, 62 ],
+      [ 302, 580, -130.66, 635, 606 ],
+      [ 1018, 505, -42.07, 1092, 1057 ],
+      [ 993, 603, -22.08, 1146, 932 ],
+      [ 539, 8, 102.05, 120, 528 ],
+      [ 708, 48, -81.14, 155, 706 ],
+      [ 165, 745, 4.73, 225, 755 ],
+      [ 469, 298, -160.01, 541, 439 ],
+      [ 218, 664, -31.28, 530, 680 ],
+      [ 312, 482, -310.38, 569, 549 ],
+      [ 69, 262, -307.45, 249, 213 ],
+      [ 63, 489, 236.14, 440, 323 ],
+      [ 389, 484, -10.97, 472, 549 ],
+      [ 841, 460, -166.4, 924, 643 ],
+      [ 298, 96, -158.96, 311, 195 ],
+      [ 955, 626, -114.48, 964, 1127 ],
+      [ 327, 749, -136.45, 752, 767 ],
+      [ 846, 332, 142.16, 872, 779 ],
+      [ 107, 496, 44.36, 423, 429 ],
+      [ 574, 729, -224.62, 920, 921 ],
+      [ 645, 13, 20.69, 608, 239 ],
+      [ 719, 59, -241.73, 392, 660 ],
+      [ 543, 351, 211.16, 645, 579 ],
+      [ 16, 213, -78.13, 210, 59 ],
+      [ 291, 436, 11.09, 369, 483 ],
+      [ 577, 383, -122.45, 631, 691 ],
+      [ 926, 629, -140.49, 1113, 1073 ],
+      [ 220, 495, 170.69, 297, 522 ],
+      [ 934, 574, -84.97, 652, 980 ],
+      [ 485, 236, -121.77, 455, 535 ],
+      [ 678, 720, -110.28, 909, 884 ],
+      [ 195, 491, -55.09, 513, 440 ],
+      [ 363, 130, 273.14, 148, 369 ],
+      [ 152, 141, -247.66, 187, 193 ],
+      [ 553, 359, 160.46, 641, 521 ],
+      [ 56, 23, -200.49, 60, 40 ],
+      [ 394, 717, -331.63, 687, 818 ],
+      [ 706, 114, 131.79, 555, 601 ],
+      [ 437, 46, -50.28, 313, 365 ],
+      [ 828, 410, 170.92, 882, 534 ],
+      [ 143, 150, 124.98, 204, 202 ],
+      [ 498, 296, -135.53, 561, 558 ],
+      [ 932, 568, -14.46, 1043, 782 ],
+      [ 808, 681, 117.2, 975, 1028 ],
+      [ 968, 327, -266.95, 378, 982 ],
+      [ 684, 369, -245.86, 616, 774 ],
+      [ 911, 665, -294.01, 977, 1103 ],
+      [ 952, 426, -187.84, 1001, 550 ],
+      [ 627, 753, -145.19, 943, 974 ],
+      [ 44, 606, 238.3, 538, 354 ],
+      [ 799, 713, -342, 979, 924 ],
+      [ 464, 319, -65.38, 482, 554 ],
+      [ 784, 249, -253.58, 460, 821 ],
+      [ 251, 87, -335.43, 264, 183 ],
+      [ 930, 45, -29.07, 833, 490 ],
+      [ 38, 558, 316.6, 409, 431 ],
+      [ 200, 473, 219.12, 452, 492 ],
+      [ 294, 418, -102, 469, 373 ],
+      [ 539, 120, -116.07, 343, 536 ],
+      [ 845, 153, -268.05, 181, 848 ],
+      [ 672, 751, -319.72, 998, 1007 ],
+      [ 697, 331, -21.35, 769, 561 ],
+      [ 92, 151, 211.96, 157, 175 ],
+      [ 244, 339, 293.35, 406, 358 ],
+      [ 279, 267, 335.17, 364, 359 ],
+      [ 749, 296, 137.87, 754, 721 ],
+      [ 687, 446, -139.04, 809, 786 ],
+      [ 487, 666, 252.84, 778, 660 ],
+      [ 854, 302, -354.74, 878, 379 ],
+      [ 177, 167, -212.02, 239, 234 ],
+      [ 308, 670, -228.12, 704, 675 ],
+      [ 365, 425, 81.96, 472, 420 ],
+      [ 847, 494, 222.68, 956, 936 ],
+      [ 636, 676, -180.42, 640, 679 ],
+      [ 541, 116, 69.88, 295, 547 ],
+      [ 506, 678, 346.6, 648, 777 ],
+      [ 190, 425, 43.89, 431, 437 ],
+      [ 504, 22, -52.24, 324, 411 ],
+      [ 352, 662, 230.37, 733, 692 ],
+      [ 359, 27, -333.47, 333, 184 ],
+      [ 570, 257, 294.55, 469, 625 ],
+      [ 757, 530, -27.59, 914, 820 ],
+      [ 362, 397, -285.26, 478, 453 ],
+      [ 167, 106, 347.98, 184, 138 ],
+      [ 422, 511, -263.32, 557, 477 ],
+      [ 9, 122, -348.21, 33, 120 ],
+      [ 1014, 264, 49.91, 855, 945 ],
+      [ 565, 642, 70.15, 795, 749 ],
+      [ 1003, 138, -29.48, 940, 613 ],
+      [ 818, 407, -5.06, 849, 477 ],
+      [ 856, 66, 235.38, 539, 740 ],
+      [ 763, 634, 12.1, 879, 779 ],
+      [ 212, 137, -336.25, 249, 210 ],
+      [ 318, 262, -237.7, 390, 407 ],
+      [ 301, 578, 241.1, 650, 541 ],
+      [ 438, 584, 355.3, 483, 617 ],
+      [ 455, 577, -117.24, 720, 667 ],
+      [ 14, 232, -235.53, 198, 141 ],
+      [ 626, 216, -106.74, 386, 660 ],
+      [ 72, 61, 274.4, 65, 76 ],
+      [ 577, 702, 335.87, 812, 876 ],
+      [ 399, 506, 209.55, 596, 635 ],
+      [ 929, 665, 337.4, 1112, 971 ],
+      [ 962, 135, -137.9, 803, 743 ],
+      [ 112, 360, -316.76, 328, 338 ],
+      [ 967, 688, 230.71, 1143, 1183 ],
+      [ 961, 261, 51.08, 806, 911 ],
+      [ 282, 271, 268.25, 278, 288 ],
+      [ 459, 740, -250.03, 852, 683 ],
+      [ 819, 26, -193.37, 802, 213 ],
+      [ 697, 458, -255.25, 620, 790 ],
+      [ 663, 757, 218.88, 990, 1004 ],
+      [ 449, 685, 121.42, 819, 739 ],
+      [ 417, 639, 247.11, 750, 632 ],
+      [ 733, 723, -136.06, 1028, 1028 ],
+      [ 794, 680, -211.41, 1031, 992 ],
+      [ 610, 632, 32.85, 855, 861 ],
+      [ 171, 75, 286.64, 119, 184 ],
+      [ 40, 419, 260.1, 418, 110 ],
+      [ 197, 264, 283.76, 301, 254 ],
+      [ 434, 19, -7.45, 431, 75 ],
+      [ 583, 516, -18.13, 714, 671 ],
+      [ 382, 84, -96.2, 124, 387 ],
+      [ 43, 397, -217.9, 277, 338 ],
+      [ 906, 178, -260.93, 318, 921 ],
+      [ 201, 5, -344.2, 194, 59 ],
+      [ 412, 462, 247.6, 583, 555 ],
+      [ 971, 590, 317.22, 1112, 1092 ],
+      [ 866, 620, -10.88, 966, 772 ],
+      [ 724, 768, 236.57, 1038, 1026 ],
+      [ 616, 325, 253.97, 481, 681 ],
+      [ 93, 761, 17.18, 313, 754 ],
+      [ 580, 280, 95.75, 337, 604 ],
+      [ 955, 311, -252.94, 577, 1002 ],
+      [ 133, 223, -86.78, 229, 145 ],
+      [ 274, 373, -82.53, 404, 319 ],
+      [ 296, 682, 350.52, 402, 721 ],
+      [ 136, 641, 183.43, 172, 647 ],
+      [ 76, 523, 44.45, 420, 426 ],
+      [ 572, 298, 43.57, 619, 610 ],
+      [ 397, 759, 347.43, 551, 827 ],
+      [ 246, 61, 340.77, 251, 139 ],
+      [ 782, 495, -117.54, 799, 921 ],
+      [ 406, 443, 173.94, 450, 482 ],
+      [ 559, 542, -337.71, 723, 713 ],
+      [ 947, 747, 11.49, 1077, 920 ],
+      [ 318, 201, -69.91, 297, 367 ],
+      [ 304, 303, -189.04, 348, 345 ],
+      [ 53, 359, 300.74, 335, 229 ],
+      [ 628, 20, -140.49, 496, 413 ],
+      [ 178, 317, -148.96, 314, 362 ],
+      [ 161, 501, -92.13, 505, 178 ],
+      [ 133, 319, -348.12, 196, 339 ],
+      [ 478, 624, 66.87, 761, 684 ],
+      [ 213, 274, -145.07, 330, 345 ],
+      [ 245, 216, -164.86, 291, 271 ],
+      [ 773, 454, 23.31, 889, 722 ],
+      [ 162, 682, 307.04, 640, 540 ],
+      [ 405, 722, -76.47, 795, 562 ],
+      [ 321, 425, -58.1, 529, 497 ],
+      [ 633, 558, 238.73, 804, 830 ],
+      [ 933, 678, -12.03, 1052, 857 ],
+      [ 290, 10, 286.84, 93, 280 ],
+      [ 307, 368, 151.05, 446, 469 ],
+      [ 914, 527, -312.32, 1005, 1030 ],
+      [ 196, 711, -110.04, 734, 427 ],
+      [ 473, 522, 315.35, 702, 703 ],
+      [ 1019, 643, 234.38, 1115, 1201 ],
+      [ 943, 179, 190.45, 958, 346 ],
+      [ 322, 419, -131.97, 526, 518 ],
+      [ 752, 126, -329.31, 710, 491 ],
+      [ 579, 57, 305.87, 384, 502 ],
+      [ 50, 274, 314.31, 229, 226 ],
+      [ 970, 504, -61.53, 904, 1092 ],
+      [ 673, 422, -287.69, 606, 769 ],
+      [ 741, 568, -341.9, 880, 770 ],
+      [ 72, 155, 147.35, 144, 168 ],
+      [ 9, 150, 30.13, 82, 134 ],
+      [ 854, 89, 197.41, 840, 339 ],
+      [ 613, 331, -130.07, 646, 681 ],
+      [ 937, 126, -12.79, 940, 330 ],
+      [ 981, 560, 40.29, 1110, 1061 ],
+      [ 904, 598, 297.04, 942, 1077 ],
+      [ 839, 557, 49.32, 968, 999 ],
+      [ 239, 293, -275.98, 315, 268 ],
+      [ 342, 80, 256.08, 159, 349 ],
+      [ 368, 134, -319.39, 366, 341 ],
+      [ 66, 141, -179.05, 66, 141 ],
+      [ 620, 13, -95.86, 75, 616 ],
+      [ 389, 472, 213.71, 584, 607 ],
+      [ 716, 407, 331.54, 822, 699 ],
+      [ 186, 374, 136.35, 392, 398 ],
+      [ 755, 284, -23.86, 804, 565 ],
+      [ 666, 145, -222.27, 590, 553 ],
+      [ 224, 324, 52.16, 393, 375 ],
+      [ 343, 580, 127.12, 668, 622 ],
+      [ 196, 88, 252.56, 141, 211 ],
+      [ 253, 137, -336.17, 286, 227 ],
+      [ 511, 602, -324.69, 764, 786 ],
+      [ 886, 125, 117.44, 519, 843 ],
+      [ 678, 662, -221.74, 946, 944 ],
+      [ 638, 33, 128.46, 422, 519 ],
+      [ 320, 599, -326.1, 599, 675 ],
+      [ 798, 330, -191.1, 847, 476 ],
+      [ 994, 498, 111.94, 833, 1107 ],
+      [ 556, 755, -64.69, 919, 825 ],
+      [ 225, 133, 17.12, 254, 193 ],
+      [ 72, 323, 144.73, 245, 304 ],
+      [ 106, 706, -11.75, 246, 712 ],
+      [ 156, 602, 105.1, 621, 306 ],
+      [ 835, 343, 5.2, 862, 417 ],
+      [ 8, 53, 35.77, 37, 47 ],
+      [ 702, 292, -122.9, 625, 747 ],
+      [ 751, 122, 186.23, 758, 201 ],
+      [ 991, 99, -67.53, 468, 953 ],
+      [ 638, 516, -80.16, 616, 716 ],
+      [ 34, 684, 44.43, 503, 511 ],
+      [ 570, 737, 346.85, 722, 847 ],
+      [ 264, 48, 288.03, 126, 266 ],
+      [ 760, 165, 132.14, 631, 673 ],
+      [ 397, 23, -267.13, 42, 396 ],
+      [ 916, 28, -218.24, 736, 587 ],
+      [ 455, 555, 55.17, 715, 690 ],
+      [ 792, 349, 169.23, 843, 489 ],
+      [ 545, 324, 261.67, 398, 585 ],
+      [ 961, 34, 24.65, 887, 431 ],
+      [ 335, 60, -54.7, 241, 308 ],
+      [ 910, 487, -83.82, 580, 956 ],
+      [ 892, 685, -38.88, 1123, 1092 ],
+      [ 789, 486, 115.43, 777, 920 ],
+      [ 465, 15, 136.55, 347, 329 ],
+      [ 597, 702, 162.75, 778, 846 ],
+      [ 799, 275, -37.53, 800, 704 ],
+      [ 365, 101, 289.64, 216, 377 ],
+      [ 94, 510, -126.88, 463, 380 ],
+      [ 978, 462, -95.12, 546, 1014 ],
+      [ 501, 713, -39.78, 840, 868 ],
+      [ 936, 628, -303.76, 1042, 1127 ],
+      [ 304, 528, 337.71, 480, 604 ],
+      [ 761, 352, 72.83, 560, 831 ],
+      [ 413, 701, 86.73, 723, 452 ],
+      [ 95, 380, 24.59, 244, 385 ],
+      [ 839, 211, 282.2, 382, 865 ],
+      [ 274, 485, -343.38, 401, 543 ],
+      [ 173, 555, 134.13, 518, 509 ],
+      [ 505, 520, -152.84, 685, 692 ],
+      [ 882, 128, -204.43, 856, 480 ],
+      [ 313, 61, -336.21, 311, 182 ],
+      [ 393, 289, 158.67, 471, 410 ],
+      [ 361, 92, -231.78, 295, 339 ],
+      [ 977, 401, -295.42, 781, 1054 ],
+      [ 588, 472, 60.64, 699, 743 ],
+      [ 111, 333, 258.13, 347, 175 ],
+      [ 1, 538, -7.75, 72, 533 ],
+      [ 24, 668, -207.79, 332, 601 ],
+      [ 727, 278, 279.69, 395, 763 ],
+      [ 1022, 171, -320.66, 898, 779 ],
+      [ 219, 406, -263.54, 427, 262 ],
+      [ 253, 700, 7.25, 338, 725 ],
+      [ 991, 203, 92.81, 251, 998 ],
+      [ 149, 167, -251.44, 205, 193 ],
+      [ 241, 608, 191.06, 352, 642 ],
+      [ 839, 691, -216.96, 1085, 1055 ],
+      [ 694, 691, 287.01, 863, 865 ],
+      [ 171, 709, 192.56, 319, 728 ],
+      [ 388, 486, -267.17, 504, 410 ],
+      [ 273, 484, -107.27, 542, 403 ],
+      [ 329, 648, 272.46, 660, 356 ],
+      [ 466, 69, 208.26, 442, 280 ],
+      [ 989, 44, -322.16, 808, 641 ],
+      [ 609, 155, -165.97, 627, 296 ],
+      [ 763, 335, -316.43, 783, 768 ],
+      [ 523, 196, 331.05, 551, 425 ],
+      [ 726, 716, 258.65, 843, 851 ],
+      [ 623, 76, 203, 602, 312 ],
+      [ 384, 366, -61.76, 502, 511 ],
+      [ 516, 571, -328.46, 738, 756 ],
+      [ 876, 49, 278.47, 176, 873 ],
+      [ 751, 399, 342.82, 834, 602 ],
+      [ 536, 372, -336.75, 639, 553 ],
+      [ 589, 60, -191.98, 588, 180 ],
+      [ 865, 632, 121.69, 992, 1067 ],
+      [ 927, 256, 304.9, 739, 906 ],
+      [ 886, 32, 255.78, 247, 865 ],
+      [ 742, 499, 326.58, 893, 824 ],
+      [ 519, 19, -50.51, 344, 412 ],
+      [ 943, 406, -235.77, 866, 1006 ],
+      [ 988, 294, -189.88, 1023, 458 ],
+      [ 872, 89, 183.64, 875, 143 ],
+      [ 847, 491, -187.97, 906, 602 ],
+      [ 880, 164, -131.9, 708, 763 ],
+      [ 95, 45, -259.59, 61, 100 ],
+      [ 780, 740, -19.97, 985, 962 ],
+      [ 702, 636, 10, 801, 747 ],
+      [ 554, 424, -242.69, 631, 686 ],
+      [ 506, 45, -225.48, 386, 391 ],
+      [ 946, 752, 154.49, 1177, 1085 ],
+      [ 99, 724, -290.08, 713, 341 ],
+      [ 341, 610, -206.71, 578, 697 ],
+      [ 90, 477, 252.85, 481, 225 ],
+      [ 335, 368, -313.57, 497, 496 ],
+      [ 659, 440, -271.91, 461, 673 ],
+      [ 802, 257, -298.62, 610, 827 ],
+      [ 262, 15, 297.37, 132, 239 ],
+      [ 788, 430, -25.32, 895, 726 ],
+      [ 955, 41, 16.33, 928, 307 ],
+      [ 122, 750, 0.56, 128, 751 ],
+      [ 854, 56, -41.09, 679, 603 ],
+      [ 953, 312, -190.15, 993, 473 ],
+      [ 147, 379, 256.2, 402, 231 ],
+      [ 1019, 630, -118.81, 1042, 1195 ],
+      [ 61, 356, 292.86, 350, 194 ],
+      [ 186, 189, -187.11, 207, 210 ],
+      [ 274, 385, -173.82, 312, 411 ],
+      [ 184, 208, 228.5, 276, 274 ],
+      [ 660, 155, 266.41, 195, 667 ],
+      [ 172, 247, 249.42, 290, 247 ],
+      [ 684, 119, 301.76, 460, 644 ],
+      [ 114, 65, -126.46, 118, 129 ],
+      [ 356, 175, 228.43, 366, 381 ],
+      [ 208, 171, 98.43, 199, 229 ],
+      [ 551, 216, -288.35, 378, 590 ],
+      [ 456, 356, -111.48, 496, 553 ],
+      [ 701, 560, 249.07, 772, 853 ],
+      [ 966, 698, -276.73, 806, 1041 ],
+      [ 779, 425, -131.54, 833, 864 ],
+      [ 646, 554, 99.15, 649, 724 ],
+      [ 489, 299, 209.84, 572, 501 ],
+      [ 406, 384, 270.44, 386, 408 ],
+      [ 738, 650, -285.75, 826, 886 ],
+      [ 551, 38, -125.87, 352, 467 ],
+      [ 179, 451, 76.5, 480, 279 ],
+      [ 281, 24, -310.54, 200, 229 ],
+      [ 634, 550, 214.41, 833, 811 ],
+      [ 477, 506, 148.69, 670, 678 ],
+      [ 595, 322, -173, 628, 391 ],
+      [ 920, 38, 345.67, 899, 264 ],
+      [ 549, 404, -94.74, 447, 579 ],
+      [ 335, 708, 264.69, 735, 398 ],
+      [ 208, 494, 153.81, 404, 533 ],
+      [ 314, 138, 188.81, 330, 183 ],
+      [ 647, 272, -109.12, 467, 699 ],
+      [ 243, 482, -87.11, 492, 266 ],
+      [ 314, 190, -292.29, 295, 362 ],
+      [ 107, 547, 181.54, 120, 548 ],
+      [ 830, 225, -237.15, 639, 818 ],
+      [ 72, 146, -201.94, 121, 160 ],
+      [ 52, 557, 176.6, 84, 558 ],
+      [ 429, 41, 120.19, 250, 390 ],
+      [ 293, 196, -137.62, 347, 341 ],
+      [ 1024, 431, -8.38, 1075, 575 ],
+      [ 781, 147, 246.32, 447, 773 ],
+      [ 113, 330, -21.87, 226, 348 ],
+      [ 502, 564, 155.6, 690, 720 ],
+      [ 598, 644, -52.24, 874, 866 ],
+      [ 344, 498, 157.9, 505, 589 ],
+      [ 519, 552, 294.48, 716, 701 ],
+      [ 744, 590, 96.63, 671, 806 ],
+      [ 483, 144, 134.21, 439, 445 ],
+      [ 142, 363, 317.65, 348, 363 ],
+      [ 458, 363, 1.19, 465, 372 ],
+      [ 958, 180, 138.96, 840, 764 ],
+      [ 796, 265, -272.53, 300, 807 ],
+      [ 253, 641, 256.2, 681, 397 ],
+      [ 987, 321, 139.53, 958, 883 ],
+      [ 400, 578, -113.84, 689, 598 ],
+      [ 113, 199, -316.9, 218, 222 ],
+      [ 20, 756, 236.02, 637, 438 ],
+      [ 669, 350, -349.85, 720, 462 ],
+      [ 348, 456, -9.77, 418, 508 ],
+      [ 288, 31, 330.03, 263, 170 ],
+      [ 801, 749, -221.64, 1096, 1091 ],
+      [ 487, 578, 26.13, 692, 733 ],
+      [ 611, 768, -93.8, 805, 659 ],
+      [ 464, 739, 206.31, 742, 866 ],
+      [ 150, 271, 27.98, 259, 309 ],
+      [ 500, 355, 214.08, 612, 573 ],
+      [ 562, 370, 202.66, 660, 556 ],
+      [ 385, 103, -189.69, 396, 165 ],
+      [ 400, 364, 237.25, 521, 532 ],
+      [ 898, 579, 265.83, 641, 936 ],
+      [ 855, 412, 247.68, 704, 945 ],
+      [ 28, 8, 69.11, 16, 29 ],
+      [ 577, 467, 68.26, 647, 708 ],
+      [ 956, 46, 40.72, 754, 658 ],
+      [ 737, 158, 294.26, 445, 736 ],
+      [ 265, 533, -93.23, 545, 293 ],
+      [ 57, 186, 252.73, 193, 108 ],
+      [ 858, 475, 348.77, 933, 633 ],
+      [ 76, 6, -30.9, 67, 44 ],
+      [ 925, 679, -208.65, 1137, 1038 ],
+      [ 791, 552, 176.74, 820, 594 ],
+      [ 632, 573, 184.2, 671, 616 ],
+      [ 218, 237, -98.78, 266, 250 ],
+      [ 827, 186, -56.01, 615, 789 ],
+      [ 373, 738, 92.05, 751, 397 ],
+      [ 279, 169, -128.47, 304, 322 ],
+      [ 659, 211, 45.56, 612, 618 ],
+      [ 506, 86, -229.86, 392, 440 ],
+      [ 490, 143, -224.56, 449, 444 ],
+      [ 958, 68, -308.34, 647, 793 ],
+      [ 150, 661, 208.86, 449, 650 ],
+      [ 913, 367, 25.37, 981, 723 ],
+      [ 663, 530, 247.34, 743, 814 ],
+      [ 10, 381, -299.04, 337, 193 ],
+      [ 443, 661, -327.45, 729, 795 ],
+      [ 62, 102, -169.91, 78, 109 ],
+      [ 391, 596, 27.65, 623, 709 ],
+      [ 968, 207, 107.88, 494, 984 ],
+      [ 129, 574, 241.1, 564, 388 ],
+      [ 321, 524, 304.55, 613, 561 ],
+      [ 395, 636, 204.06, 618, 741 ],
+      [ 180, 553, -172.71, 247, 570 ],
+      [ 728, 281, 323.36, 751, 659 ],
+      [ 568, 289, -39.48, 621, 584 ],
+      [ 655, 620, -140.52, 898, 894 ],
+      [ 701, 666, -45.48, 965, 966 ],
+      [ 971, 191, -207.62, 949, 618 ],
+      [ 499, 149, -14.17, 518, 266 ],
+      [ 140, 245, -196.4, 203, 273 ],
+      [ 995, 485, 294.81, 856, 1107 ],
+      [ 916, 13, 170.8, 906, 158 ],
+      [ 694, 148, -31.69, 667, 490 ],
+      [ 961, 694, 231.56, 1140, 1182 ],
+      [ 908, 351, -218.24, 930, 837 ],
+      [ 340, 74, -357.1, 343, 91 ],
+      [ 652, 599, 267.04, 630, 681 ],
+      [ 76, 559, -274.31, 562, 117 ],
+      [ 293, 164, -135.55, 323, 321 ],
+      [ 784, 269, 93.44, 316, 797 ],
+      [ 1017, 247, -171.9, 1040, 387 ],
+      [ 924, 165, -159.9, 923, 471 ],
+      [ 655, 686, -21.69, 861, 879 ],
+      [ 98, 638, -91.92, 640, 117 ],
+      [ 939, 551, 236.78, 974, 1086 ],
+      [ 117, 38, 305.36, 97, 117 ],
+      [ 121, 527, 146.37, 392, 505 ],
+      [ 1013, 583, -50.09, 1095, 1151 ],
+      [ 111, 34, 103.63, 59, 114 ],
+      [ 430, 622, 355.41, 477, 654 ],
+      [ 51, 616, -133.67, 480, 460 ],
+      [ 318, 541, 20.97, 490, 618 ],
+      [ 603, 264, -56.65, 551, 648 ],
+      [ 60, 337, -179.21, 63, 336 ],
+      [ 441, 274, 336.64, 512, 426 ],
+      [ 266, 361, -348.6, 331, 406 ],
+      [ 189, 452, 144.59, 416, 476 ],
+      [ 909, 443, -29.3, 1008, 830 ],
+      [ 325, 526, 2.12, 343, 538 ],
+      [ 985, 80, -135.32, 755, 748 ],
+      [ 978, 118, -278.03, 253, 984 ],
+      [ 276, 356, 228.81, 448, 440 ],
+      [ 818, 40, -244.03, 394, 752 ],
+      [ 225, 85, 71.79, 151, 240 ],
+      [ 483, 416, 327.8, 629, 609 ],
+      [ 449, 615, -54.23, 760, 723 ],
+      [ 466, 756, -351.4, 573, 816 ],
+      [ 159, 669, 63.34, 669, 442 ],
+      [ 630, 145, -164.34, 644, 309 ],
+      [ 121, 115, -89.96, 114, 120 ],
+      [ 440, 80, 19.91, 440, 224 ],
+      [ 557, 287, 353.35, 585, 349 ],
+      [ 370, 132, -329.54, 385, 301 ],
+      [ 535, 301, -250.42, 463, 604 ],
+      [ 125, 663, 138.77, 531, 580 ],
+      [ 79, 231, -5.19, 98, 237 ],
+      [ 514, 580, -16.94, 659, 704 ],
+      [ 526, 699, -110.11, 835, 732 ],
+      [ 105, 403, 25.22, 266, 409 ],
+      [ 383, 493, 132.67, 621, 614 ],
+      [ 767, 55, 207.66, 704, 404 ],
+      [ 283, 472, -243.5, 548, 463 ],
+      [ 274, 749, -119.81, 785, 608 ],
+      [ 317, 382, 162.07, 419, 459 ],
+      [ 473, 476, 62.93, 639, 638 ],
+      [ 158, 535, 279.41, 552, 242 ],
+      [ 663, 152, 102.91, 296, 679 ],
+      [ 127, 547, 38.04, 437, 509 ],
+      [ 482, 625, -304.52, 788, 751 ],
+      [ 6, 143, 157.38, 60, 133 ],
+      [ 707, 718, 208.39, 961, 967 ],
+      [ 490, 162, -69.52, 322, 516 ],
+      [ 656, 367, -87.51, 394, 671 ],
+      [ 997, 605, 270.38, 610, 1000 ],
+      [ 716, 191, -4.08, 727, 241 ],
+      [ 293, 309, -223.07, 425, 425 ],
+      [ 179, 38, -80.84, 65, 182 ],
+      [ 837, 133, -288.78, 395, 835 ],
+      [ 379, 494, 296.46, 609, 559 ],
+      [ 458, 498, -289.49, 621, 597 ],
+      [ 170, 260, -336.57, 258, 306 ],
+      [ 978, 627, -184.85, 1027, 706 ],
+      [ 367, 351, 158.99, 468, 458 ],
+      [ 755, 330, 5.41, 782, 400 ],
+      [ 628, 99, 184.02, 632, 142 ],
+      [ 110, 319, -246.44, 335, 227 ],
+      [ 304, 452, -211.14, 494, 543 ],
+      [ 702, 312, -87.03, 347, 717 ],
+      [ 803, 596, -344.23, 934, 792 ],
+      [ 712, 171, 122.5, 526, 691 ],
+      [ 813, 298, -354.2, 838, 378 ],
+      [ 846, 263, 233.36, 714, 834 ],
+      [ 71, 539, -158.35, 263, 526 ],
+      [ 809, 337, 150.89, 870, 686 ],
+      [ 305, 39, 243.13, 171, 289 ],
+      [ 55, 121, -178.71, 56, 121 ],
+      [ 216, 349, 244.81, 406, 343 ],
+      [ 428, 106, -183.44, 433, 130 ],
+      [ 816, 708, -345.39, 968, 890 ],
+      [ 839, 474, -185.56, 881, 552 ],
+      [ 501, 315, 93.42, 343, 518 ],
+      [ 509, 181, 339.95, 539, 344 ],
+      [ 329, 234, 124.48, 379, 402 ],
+      [ 616, 73, -280.47, 183, 618 ],
+      [ 318, 301, -244.54, 408, 415 ],
+      [ 152, 342, -131.81, 355, 340 ],
+      [ 410, 504, 194.66, 523, 590 ],
+      [ 246, 56, 294.02, 150, 247 ],
+      [ 497, 668, 237.51, 828, 777 ],
+      [ 518, 529, -38.43, 733, 735 ],
+      [ 766, 136, 256.73, 306, 775 ],
+      [ 387, 517, -293.6, 628, 561 ],
+      [ 358, 763, -74.25, 830, 551 ],
+      [ 23, 457, -6.24, 71, 456 ],
+      [ 137, 695, 275.85, 703, 207 ],
+      [ 301, 41, -123.98, 201, 271 ],
+      [ 625, 348, 347.85, 682, 471 ],
+      [ 390, 532, -319.83, 641, 658 ],
+      [ 296, 137, 306, 283, 320 ],
+      [ 122, 525, 90, 525, 122 ],
+      [ 579, 331, 210, 666, 575 ],
+      [ 433, 621, -30, 684, 754 ],
+      [ 527, 121, -30, 516, 368 ],
+      [ 933, 138, -330, 877, 586 ],
+      [ 413, 240, 330, 476, 414 ],
+      [ 293, 466, -360, 293, 466 ],
+      [ 629, 166, -30, 626, 458 ],
+      [ 611, 458, -270, 458, 611 ],
+      [ 668, 680, -120, 922, 917 ],
+      [ 592, 3, -360, 592, 3 ],
+      [ 195, 438, -30, 386, 476 ],
+      [ 1003, 762, -180, 1003, 762 ],
+      [ 451, 389, -60, 561, 584 ],
+      [ 917, 320, 60, 735, 954 ],
+      [ 967, 629, 300, 1027, 1151 ],
+      [ 920, 80, 0, 920, 80 ],
+      [ 926, 551, 150, 1076, 938 ],
+      [ 372, 242, -150, 442, 395 ],
+      [ 526, 742, -240, 905, 825 ],
+      [ 862, 418, -210, 955, 791 ],
+      [ 873, 563, 210, 1037, 923 ],
+      [ 300, 547, 210, 532, 623 ],
+      [ 554, 117, -180, 554, 117 ],
+      [ 969, 36, 150, 857, 514 ],
+      [ 544, 761, 0, 544, 761 ],
+      [ 438, 683, 90, 683, 438 ],
+      [ 953, 609, -120, 1002, 1129 ],
+      [ 664, 120, 90, 120, 664 ],
+      [ 986, 514, 90, 514, 986 ],
+      [ 167, 392, -270, 392, 167 ],
+      [ 375, 279, 300, 428, 463 ],
+      [ 142, 503, 60, 506, 373 ],
+      [ 923, 151, 180, 923, 151 ],
+      [ 175, 109, 210, 205, 180 ],
+      [ 876, 517, 210, 1016, 885 ],
+      [ 368, 78, 120, 251, 356 ],
+      [ 990, 24, -30, 868, 516 ],
+      [ 299, 522, 90, 522, 299 ],
+      [ 954, 493, -150, 1072, 903 ],
+      [ 549, 618, 210, 783, 808 ],
+      [ 701, 130, -240, 463, 671 ],
+      [ 579, 236, 240, 492, 618 ],
+      [ 162, 160, -360, 162, 160 ],
+      [ 925, 291, -270, 291, 925 ],
+      [ 711, 180, 240, 510, 704 ],
+      [ 488, 455, 330, 649, 638 ],
+      [ 150, 429, 330, 343, 447 ],
+      [ 625, 653, 90, 653, 625 ],
+      [ 235, 600, -180, 235, 600 ],
+      [ 529, 244, -300, 475, 580 ],
+      [ 322, 1, -180, 322, 1 ],
+      [ 487, 435, 30, 638, 620 ],
+      [ 298, 556, 210, 535, 630 ],
+      [ 309, 482, -270, 482, 309 ],
+      [ 466, 246, -90, 246, 466 ],
+      [ 287, 612, 360, 287, 612 ],
+      [ 211, 724, 30, 544, 732 ],
+      [ 167, 425, -90, 425, 167 ],
+      [ 818, 600, -270, 600, 818 ],
+      [ 77, 229, -30, 180, 236 ],
+      [ 160, 470, -30, 372, 487 ],
+      [ 416, 67, -330, 393, 265 ],
+      [ 987, 289, 210, 998, 742 ],
+      [ 747, 521, -90, 521, 747 ],
+      [ 894, 101, 150, 824, 532 ],
+      [ 256, 316, 0, 256, 316 ],
+      [ 225, 474, -30, 430, 522 ],
+      [ 765, 599, -360, 765, 599 ],
+      [ 128, 444, 210, 331, 448 ],
+      [ 291, 502, -300, 580, 503 ],
+      [ 778, 621, 150, 983, 925 ],
+      [ 241, 165, 210, 290, 262 ],
+      [ 284, 137, -270, 137, 284 ],
+      [ 44, 697, 240, 625, 386 ],
+      [ 446, 599, 360, 446, 599 ],
+      [ 152, 23, -90, 23, 152 ],
+      [ 673, 191, 360, 673, 191 ],
+      [ 110, 764, 210, 476, 716 ],
+      [ 113, 92, -120, 135, 142 ],
+      [ 916, 309, -360, 916, 309 ],
+      [ 999, 124, 240, 605, 926 ],
+      [ 683, 305, -360, 683, 305 ],
+      [ 456, 517, -210, 652, 674 ],
+      [ 614, 550, -300, 782, 806 ],
+      [ 441, 116, 300, 319, 439 ],
+      [ 403, 230, 300, 399, 464 ],
+      [ 786, 734, -240, 1028, 1046 ],
+      [ 777, 48, -270, 48, 777 ],
+      [ 543, 133, -180, 543, 133 ],
+      [ 899, 52, 150, 804, 493 ],
+      [ 900, 32, 270, 32, 900 ],
+      [ 704, 544, -210, 881, 821 ],
+      [ 728, 118, 300, 464, 689 ],
+      [ 935, 577, 90, 577, 935 ],
+      [ 22, 140, 210, 88, 131 ],
+      [ 931, 441, -330, 1026, 847 ],
+      [ 846, 263, -360, 846, 263 ],
+      [ 1015, 77, -300, 574, 917 ],
+      [ 154, 484, -180, 154, 484 ],
+      [ 439, 390, -120, 556, 574 ],
+      [ 112, 297, -90, 297, 112 ],
+      [ 974, 56, -300, 534, 871 ],
+      [ 194, 602, -210, 469, 616 ],
+      [ 103, 535, 360, 103, 535 ],
+      [ 744, 551, -240, 848, 918 ],
+      [ 517, 481, 180, 517, 481 ],
+      [ 595, 348, -300, 598, 689 ],
+      [ 627, 341, -240, 608, 711 ],
+      [ 723, 456, 240, 755, 853 ],
+      [ 996, 17, -150, 870, 512 ],
+      [ 312, 101, 150, 320, 241 ],
+      [ 695, 63, 210, 632, 401 ],
+      [ 779, 208, 60, 569, 778 ],
+      [ 1018, 285, -180, 1018, 285 ],
+      [ 1003, 75, 360, 1003, 75 ],
+      [ 149, 462, 90, 462, 149 ],
+      [ 907, 140, -330, 855, 574 ],
+      [ 991, 610, 0, 991, 610 ],
+      [ 153, 384, -300, 409, 324 ],
+      [ 984, 363, -300, 805, 1033 ],
+      [ 287, 597, -180, 287, 597 ],
+      [ 1008, 350, -120, 806, 1046 ],
+      [ 780, 165, 60, 532, 757 ],
+      [ 331, 161, 360, 331, 161 ],
+      [ 594, 144, -330, 586, 421 ],
+      [ 568, 256, 120, 505, 618 ],
+      [ 160, 168, 270, 168, 160 ],
+      [ 214, 143, 90, 143, 214 ],
+      [ 722, 257, -270, 257, 722 ],
+      [ 813, 227, 90, 227, 813 ],
+      [ 926, 441, -90, 441, 926 ],
+      [ 149, 429, 240, 445, 343 ],
+      [ 480, 246, -330, 538, 452 ],
+      [ 64, 493, -180, 64, 493 ],
+      [ 26, 171, -30, 107, 161 ],
+      [ 87, 597, 210, 373, 559 ],
+      [ 764, 716, 360, 764, 716 ],
+      [ 602, 108, -240, 394, 574 ],
+      [ 229, 649, 0, 229, 649 ],
+      [ 367, 490, 240, 606, 561 ],
+      [ 989, 416, -90, 416, 989 ],
+      [ 357, 528, 330, 572, 635 ],
+      [ 190, 119, -180, 190, 119 ],
+      [ 243, 167, 300, 265, 293 ],
+      [ 510, 186, -270, 186, 510 ],
+      [ 968, 251, 300, 699, 963 ],
+      [ 743, 55, 240, 418, 670 ],
+      [ 741, 506, 360, 741, 506 ],
+      [ 928, 678, 240, 1050, 1141 ],
+      [ 434, 185, -30, 467, 377 ],
+      [ 241, 158, 360, 241, 158 ],
+      [ 636, 425, 150, 762, 684 ],
+      [ 578, 568, 240, 780, 783 ],
+      [ 847, 750, -330, 1108, 1073 ],
+      [ 750, 364, -150, 830, 689 ],
+      [ 880, 322, 90, 322, 880 ],
+      [ 780, 111, 150, 730, 484 ],
+      [ 610, 666, -120, 881, 860 ],
+      [ 584, 594, -210, 802, 804 ],
+      [ 398, 151, -30, 419, 330 ],
+      [ 864, 331, 120, 718, 912 ],
+      [ 861, 39, -210, 764, 463 ],
+      [ 536, 472, 360, 536, 472 ],
+      [ 370, 340, 330, 489, 479 ],
+      [ 425, 134, -60, 327, 435 ],
+      [ 728, 25, 240, 385, 642 ],
+      [ 341, 610, 360, 341, 610 ],
+      [ 27, 299, 270, 299, 27 ],
+      [ 388, 737, 90, 737, 388 ],
+      [ 628, 267, 240, 544, 676 ],
+      [ 90, 147, -180, 90, 147 ],
+      [ 785, 24, -150, 690, 412 ],
+      [ 1023, 426, 300, 879, 1098 ],
+      [ 994, 703, -120, 1105, 1211 ],
+      [ 939, 253, 30, 939, 688 ],
+      [ 344, 31, 60, 198, 312 ],
+      [ 179, 287, -120, 337, 298 ],
+      [ 160, 307, 180, 160, 307 ],
+      [ 6, 597, 150, 303, 518 ],
+      [ 643, 300, -330, 706, 581 ],
+      [ 456, 367, -210, 577, 544 ],
+      [ 710, 188, -180, 710, 188 ],
+      [ 1016, 187, 240, 669, 972 ],
+      [ 927, 164, 180, 927, 164 ],
+      [ 267, 99, -330, 280, 219 ],
+      [ 808, 357, -300, 712, 877 ],
+      [ 358, 491, -30, 555, 604 ],
+      [ 721, 611, 270, 611, 721 ],
+      [ 458, 615, 120, 761, 702 ],
+      [ 153, 328, -330, 296, 360 ],
+      [ 204, 670, 30, 511, 681 ],
+      [ 449, 434, 210, 604, 599 ],
+      [ 725, 428, -360, 725, 428 ],
+      [ 545, 355, -210, 648, 578 ],
+      [ 277, 554, -120, 617, 515 ],
+      [ 345, 392, 240, 510, 493 ],
+      [ 455, 660, -30, 723, 799 ],
+      [ 946, 432, -180, 946, 432 ],
+      [ 822, 7, -330, 714, 416 ],
+      [ 469, 122, -30, 466, 340 ],
+      [ 516, 274, -120, 494, 582 ],
+      [ 27, 611, 300, 541, 328 ],
+      [ 812, 386, -30, 895, 740 ],
+      [ 822, 27, 330, 724, 434 ],
+      [ 24, 234, 120, 214, 136 ],
+      [ 383, 492, -270, 492, 383 ],
+      [ 194, 65, -360, 194, 65 ],
+      [ 658, 7, 60, 334, 572 ],
+      [ 912, 623, 60, 995, 1100 ],
+      [ 961, 206, 180, 961, 206 ],
+      [ 424, 593, -300, 725, 663 ],
+      [ 778, 613, 300, 918, 979 ],
+      [ 687, 454, -60, 735, 821 ],
+      [ 142, 302, -60, 331, 273 ],
+      [ 69, 320, 180, 69, 320 ],
+      [ 734, 607, -90, 607, 734 ],
+      [ 898, 752, -30, 1152, 1100 ],
+      [ 916, 477, -30, 1031, 871 ],
+      [ 487, 393, -150, 617, 582 ],
+      [ 66, 346, 30, 230, 332 ],
+      [ 832, 663, -120, 989, 1051 ],
+      [ 938, 478, -300, 882, 1051 ],
+      [ 834, 225, 150, 834, 610 ],
+      [ 221, 331, -300, 397, 356 ],
+      [ 666, 382, 0, 666, 382 ],
+      [ 398, 165, -150, 426, 341 ],
+      [ 786, 70, -150, 714, 453 ],
+      [ 236, 757, 300, 772, 582 ],
+      [ 718, 353, -60, 663, 797 ],
+      [ 1006, 403, 270, 403, 1006 ],
+      [ 545, 258, 180, 545, 258 ],
+      [ 874, 193, -120, 603, 852 ],
+      [ 996, 51, 120, 541, 886 ],
+      [ 699, 216, -330, 713, 536 ],
+      [ 805, 715, 60, 1021, 1054 ],
+      [ 312, 245, 210, 392, 367 ],
+      [ 628, 66, 270, 66, 628 ],
+      [ 922, 242, 270, 242, 922 ],
+      [ 827, 12, -120, 422, 721 ],
+      [ 231, 766, 270, 766, 231 ],
+      [ 95, 407, -240, 399, 284 ],
+      [ 842, 294, -60, 674, 876 ],
+      [ 178, 272, 0, 178, 272 ],
+      [ 838, 28, 210, 738, 442 ],
+      [ 914, 631, 150, 1106, 1001 ],
+      [ 476, 97, -360, 476, 97 ],
+      [ 257, 567, -300, 619, 505 ],
+      [ 131, 490, -60, 488, 358 ],
+      [ 1013, 342, -60, 801, 1048 ],
+      [ 317, 515, -60, 603, 531 ],
+      [ 157, 585, 360, 157, 585 ],
+      [ 341, 448, -120, 557, 518 ],
+      [ 781, 581, 150, 966, 892 ],
+      [ 265, 441, 180, 265, 441 ],
+      [ 35, 359, 30, 209, 328 ],
+      [ 757, 716, 150, 1013, 997 ],
+      [ 782, 141, -60, 511, 747 ],
+      [ 893, 238, -330, 892, 652 ],
+      [ 302, 230, 0, 302, 230 ],
+      [ 752, 467, -240, 779, 883 ],
+      [ 174, 585, 330, 442, 594 ],
+      [ 138, 72, 0, 138, 72 ],
+      [ 492, 658, -180, 492, 658 ],
+      [ 185, 88, 270, 88, 185 ],
+      [ 939, 113, -150, 869, 566 ],
+      [ 487, 681, -180, 487, 681 ],
+      [ 163, 499, -60, 512, 390 ],
+      [ 594, 400, 180, 594, 400 ],
+      [ 655, 626, -360, 655, 626 ],
+      [ 148, 422, 120, 438, 338 ],
+      [ 325, 552, -60, 639, 557 ],
+      [ 259, 655, 0, 259, 655 ],
+      [ 789, 255, -120, 614, 810 ],
+      [ 46, 394, -30, 235, 364 ],
+      [ 915, 330, 90, 330, 915 ],
+      [ 214, 695, 0, 214, 695 ],
+      [ 466, 48, -270, 48, 466 ],
+      [ 906, 494, 120, 880, 1030 ],
+      [ 638, 217, 0, 638, 217 ],
+      [ 676, 327, -360, 676, 327 ],
+      [ 312, 571, 180, 312, 571 ],
+      [ 727, 765, 90, 765, 727 ],
+      [ 214, 588, 330, 478, 616 ],
+      [ 576, 622, -30, 808, 827 ],
+      [ 31, 540, 270, 540, 31 ],
+      [ 661, 701, 210, 922, 936 ],
+      [ 149, 282, 270, 282, 149 ],
+      [ 302, 193, 0, 302, 193 ],
+      [ 987, 671, 210, 1189, 1073 ],
+      [ 459, 410, -240, 584, 601 ],
+      [ 492, 644, 330, 747, 804 ],
+      [ 236, 421, 330, 414, 483 ],
+      [ 853, 581, 150, 1028, 928 ],
+      [ 785, 245, 0, 785, 245 ],
+      [ 217, 268, -210, 321, 339 ],
+      [ 90, 763, -300, 705, 458 ],
+      [ 888, 107, 0, 888, 107 ],
+      [ 726, 333, 180, 726, 333 ],
+      [ 198, 305, 90, 305, 198 ],
+      [ 983, 649, -270, 649, 983 ],
+      [ 155, 250, 360, 155, 250 ],
+      [ 89, 427, 30, 290, 414 ],
+      [ 17, 298, -150, 162, 265 ],
+      [ 729, 118, 90, 118, 729 ],
+      [ 223, 280, 330, 332, 353 ],
+      [ 436, 347, 330, 550, 519 ],
+      [ 558, 244, -300, 489, 605 ],
+      [ 32, 20, 0, 32, 20 ],
+      [ 787, 169, 300, 538, 765 ],
+      [ 387, 137, 180, 387, 137 ],
+      [ 534, 253, -330, 588, 485 ],
+      [ 514, 320, 90, 320, 514 ],
+      [ 31, 332, -360, 31, 332 ],
+      [ 321, 111, -240, 256, 331 ],
+      [ 936, 277, 30, 948, 707 ],
+      [ 884, 604, 360, 884, 604 ],
+      [ 825, 254, -150, 840, 631 ],
+      [ 907, 278, -120, 693, 923 ],
+      [ 408, 100, 30, 403, 290 ],
+      [ 315, 390, 180, 315, 390 ],
+      [ 62, 22, -330, 64, 49 ],
+      [ 141, 407, -30, 325, 422 ],
+      [ 789, 429, 300, 765, 897 ],
+      [ 808, 670, -330, 1034, 983 ],
+      [ 984, 603, -60, 1012, 1153 ],
+      [ 509, 498, -240, 685, 688 ],
+      [ 496, 349, 30, 603, 549 ],
+      [ 808, 260, 300, 627, 829 ],
+      [ 122, 566, -360, 122, 566 ],
+      [ 684, 33, 30, 608, 370 ],
+      [ 405, 79, 30, 389, 270 ],
+      [ 463, 185, -330, 492, 391 ],
+      [ 947, 8, 90, 8, 947 ],
+      [ 850, 614, 0, 850, 614 ],
+      [ 899, 584, -150, 1069, 954 ],
+      [ 294, 197, 330, 352, 318 ],
+      [ 493, 568, -90, 568, 493 ],
+      [ 7, 406, 180, 7, 406 ],
+      [ 914, 497, -30, 1039, 887 ],
+      [ 930, 242, 0, 930, 242 ],
+      [ 440, 546, 90, 546, 440 ],
+      [ 1002, 125, 270, 125, 1002 ],
+      [ 58, 67, 270, 67, 58 ],
+      [ 710, 703, 120, 963, 964 ],
+      [ 205, 609, -60, 628, 481 ],
+      [ 505, 61, 120, 305, 466 ],
+      [ 445, 431, -60, 594, 600 ],
+      [ 848, 435, 330, 951, 801 ],
+      [ 574, 352, 60, 591, 673 ],
+      [ 29, 281, 300, 256, 165 ],
+      [ 552, 611, 90, 611, 552 ],
+      [ 155, 594, 210, 430, 590 ],
+      [ 4, 637, 270, 637, 4 ],
+      [ 887, 401, 210, 968, 789 ],
+      [ 539, 555, 60, 750, 743 ],
+      [ 968, 165, 120, 626, 919 ],
+      [ 635, 498, -210, 798, 747 ],
+      [ 36, 366, 210, 213, 334 ],
+      [ 1001, 28, -210, 880, 523 ],
+      [ 580, 49, 60, 331, 526 ],
+      [ 481, 463, -90, 463, 481 ],
+      [ 85, 579, -240, 543, 361 ],
+      [ 878, 581, 360, 878, 581 ],
+      [ 735, 478, 0, 735, 478 ],
+      [ 506, 113, -210, 494, 349 ],
+      [ 64, 71, -30, 90, 93 ],
+      [ 728, 547, -300, 837, 903 ],
+      [ 941, 574, 60, 967, 1101 ],
+      [ 710, 556, 90, 556, 710 ],
+      [ 948, 223, 120, 666, 930 ],
+      [ 536, 583, -180, 536, 583 ],
+      [ 938, 646, -360, 938, 646 ],
+      [ 83, 536, 210, 338, 504 ],
+      [ 76, 319, -60, 312, 224 ],
+      [ 603, 698, 30, 871, 905 ],
+      [ 846, 746, 120, 1068, 1104 ],
+      [ 284, 523, -120, 594, 506 ],
+      [ 385, 461, -300, 591, 563 ],
+      [ 974, 225, 240, 681, 955 ],
+      [ 575, 167, -300, 432, 580 ],
+      [ 241, 569, 270, 569, 241 ],
+      [ 524, 504, 150, 705, 696 ],
+      [ 554, 566, -60, 765, 762 ],
+      [ 334, 622, 240, 705, 599 ],
+      [ 750, 306, 180, 750, 306 ],
+      [ 294, 172, 150, 340, 294 ],
+      [ 955, 385, -90, 385, 955 ],
+      [ 297, 673, 360, 297, 673 ],
+      [ 403, 635, -180, 403, 635 ],
+      [ 226, 298, 0, 226, 298 ],
+      [ 345, 478, -210, 537, 585 ],
+      [ 216, 103, 300, 195, 238 ],
+      [ 948, 518, 90, 518, 948 ],
+      [ 346, 768, -60, 836, 683 ],
+      [ 169, 562, 240, 570, 426 ],
+      [ 921, 14, -330, 804, 472 ],
+      [ 618, 730, 30, 900, 940 ],
+      [ 1013, 184, -60, 664, 969 ],
+      [ 998, 486, -180, 998, 486 ],
+      [ 257, 655, 120, 695, 548 ],
+      [ 764, 146, -180, 764, 146 ],
+      [ 1004, 308, -60, 767, 1023 ],
+      [ 892, 250, -330, 897, 662 ],
+      [ 510, 510, -330, 696, 696 ],
+      [ 956, 636, 240, 1028, 1144 ],
+      [ 787, 558, 240, 875, 959 ],
+      [ 846, 253, 210, 858, 641 ],
+      [ 395, 245, -360, 395, 245 ],
+      [ 840, 225, 120, 614, 838 ],
+      [ 83, 417, 0, 83, 417 ],
+      [ 746, 222, 150, 757, 563 ],
+      [ 1022, 206, -300, 688, 988 ],
+      [ 412, 107, -60, 297, 409 ],
+      [ 491, 489, -330, 669, 668 ],
+      [ 569, 438, 300, 662, 711 ],
+      [ 372, 260, 90, 260, 372 ],
+      [ 194, 126, 330, 230, 206 ],
+      [ 988, 422, -180, 988, 422 ],
+      [ 1003, 283, 60, 746, 1009 ],
+      [ 641, 345, -300, 619, 727 ],
+      [ 129, 136, -90, 136, 129 ],
+      [ 835, 134, 120, 533, 789 ],
+      [ 926, 443, 240, 846, 1022 ],
+      [ 326, 42, -30, 302, 199 ],
+      [ 405, 469, -360, 405, 469 ],
+      [ 307, 747, -120, 799, 638 ],
+      [ 952, 124, 0, 952, 124 ],
+      [ 911, 96, -330, 836, 538 ],
+      [ 171, 80, -60, 153, 188 ],
+      [ 754, 561, 270, 561, 754 ],
+      [ 868, 657, -330, 1079, 1002 ],
+      [ 254, 515, -210, 476, 571 ],
+      [ 937, 441, 240, 849, 1031 ],
+      [ 740, 685, 270, 685, 740 ],
+      [ 169, 220, -30, 255, 275 ],
+      [ 183, 449, -30, 382, 480 ],
+      [ 541, 395, 90, 395, 541 ],
+      [ 44, 310, 180, 44, 310 ],
+      [ 108, 438, 240, 432, 311 ],
+      [ 549, 235, 30, 592, 478 ],
+      [ 425, 118, -60, 313, 427 ],
+      [ 481, 308, -300, 507, 570 ],
+      [ 715, 243, 120, 567, 739 ],
+      [ 515, 29, 30, 460, 282 ],
+      [ 370, 156, 240, 319, 397 ],
+      [ 849, 292, -60, 676, 881 ],
+      [ 275, 698, 330, 586, 741 ],
+      [ 891, 731, -120, 1077, 1136 ],
+      [ 610, 43, 300, 340, 549 ],
+      [ 434, 455, -210, 602, 609 ],
+      [ 1006, 6, -90, 6, 1006 ],
+      [ 405, 366, 210, 532, 518 ],
+      [ 491, 134, -330, 492, 361 ],
+      [ 139, 520, -300, 519, 380 ],
+      [ 699, 29, -150, 619, 373 ],
+      [ 528, 665, 150, 789, 838 ],
+      [ 955, 103, 90, 103, 955 ],
+      [ 884, 3, 30, 766, 444 ],
+      [ 203, 460, 90, 460, 203 ],
+      [ 104, 17, -210, 98, 65 ],
+      [ 319, 3, -210, 277, 161 ],
+      [ 691, 307, 150, 751, 610 ],
+      [ 448, 674, 270, 674, 448 ],
+      [ 529, 10, 30, 463, 273 ],
+      [ 647, 535, 60, 786, 827 ],
+      [ 973, 162, -30, 922, 626 ],
+      [ 663, 110, 60, 426, 629 ],
+      [ 259, 5, 60, 133, 226 ],
+      [ 829, 157, -240, 550, 794 ],
+      [ 432, 235, -240, 419, 490 ],
+      [ 641, 473, -210, 791, 729 ],
+      [ 857, 223, 60, 621, 853 ],
+      [ 537, 559, -30, 744, 752 ],
+      [ 396, 187, 0, 396, 187 ],
+      [ 947, 672, -240, 1055, 1155 ],
+      [ 512, 633, -90, 633, 512 ],
+      [ 963, 362, 30, 1014, 795 ],
+      [ 527, 556, 30, 734, 745 ],
+      [ 95, 410, 180, 95, 410 ],
+      [ 274, 733, -330, 603, 771 ],
+      [ 476, 446, 120, 623, 634 ],
+      [ 681, 321, 330, 749, 618 ],
+      [ 271, 723, 150, 595, 760 ],
+      [ 759, 252, 330, 782, 597 ],
+      [ 236, 194, 240, 285, 300 ],
+      [ 426, 578, 90, 578, 426 ],
+      [ 831, 532, -300, 876, 985 ],
+      [ 358, 159, 240, 316, 389 ],
+      [ 915, 229, -120, 654, 906 ],
+      [ 657, 435, -150, 785, 704 ],
+      [ 711, 23, 300, 374, 626 ],
+      [ 371, 534, -150, 587, 646 ],
+      [ 327, 736, -180, 327, 736 ],
+      [ 4, 537, 60, 466, 271 ],
+      [ 953, 714, 240, 1093, 1181 ],
+      [ 749, 265, 60, 603, 780 ],
+      [ 365, 119, -180, 365, 119 ],
+      [ 464, 388, -30, 594, 568 ],
+      [ 280, 306, 210, 394, 404 ],
+      [ 641, 30, -120, 345, 569 ],
+      [ 956, 563, -90, 563, 956 ],
+      [ 840, 72, -330, 763, 481 ],
+      [ 128, 317, -360, 128, 317 ],
+      [ 379, 320, 150, 488, 465 ],
+      [ 966, 266, 120, 712, 968 ],
+      [ 786, 60, 360, 786, 60 ],
+      [ 352, 333, -270, 333, 352 ],
+      [ 626, 681, 120, 902, 881 ],
+      [ 87, 122, -330, 136, 149 ],
+      [ 878, 603, -300, 960, 1061 ],
+      [ 199, 551, 240, 575, 447 ],
+      [ 575, 413, 300, 644, 703 ],
+      [ 638, 509, -120, 759, 806 ],
+      [ 658, 25, 180, 658, 25 ],
+      [ 369, 749, -300, 833, 693 ],
+      [ 7, 570, -240, 497, 290 ],
+      [ 1022, 66, 60, 567, 918 ],
+      [ 147, 535, 0, 147, 535 ],
+      [ 812, 600, 120, 925, 1002 ],
+      [ 861, 490, -60, 853, 990 ],
+      [ 949, 640, -270, 640, 949 ],
+      [ 763, 303, 120, 643, 810 ],
+      [ 673, 13, -120, 346, 588 ],
+      [ 1006, 506, -90, 506, 1006 ],
+      [ 740, 14, -120, 381, 646 ],
+      [ 829, 19, -300, 430, 726 ],
+      [ 996, 17, -240, 512, 869 ],
+      [ 583, 127, 270, 127, 583 ],
+      [ 53, 736, 120, 663, 412 ],
+      [ 709, 613, -150, 920, 884 ],
+      [ 121, 556, -270, 556, 121 ],
+      [ 266, 360, 0, 266, 360 ],
+      [ 962, 96, 30, 881, 563 ],
+      [ 287, 82, -240, 214, 288 ],
+      [ 668, 637, -210, 896, 884 ],
+      [ 1024, 490, -210, 1131, 934 ],
+      [ 91, 468, -180, 91, 468 ],
+      [ 269, 137, -60, 252, 300 ],
+      [ 137, 177, -90, 177, 137 ],
+      [ 804, 708, -240, 1014, 1049 ],
+      [ 76, 30, 300, 62, 80 ],
+      [ 200, 229, -90, 229, 200 ],
+      [ 728, 182, 0, 728, 182 ],
+      [ 248, 397, 60, 467, 412 ],
+      [ 442, 130, -60, 332, 447 ],
+      [ 654, 130, -330, 631, 439 ],
+      [ 892, 197, 120, 616, 869 ],
+      [ 128, 399, 270, 399, 128 ],
+      [ 557, 501, -330, 732, 712 ],
+      [ 942, 335, -360, 942, 335 ],
+      [ 95, 392, -360, 95, 392 ],
+      [ 1014, 542, -120, 975, 1148 ],
+      [ 364, 320, 60, 458, 475 ],
+      [ 866, 505, -300, 869, 1001 ],
+      [ 453, 68, -180, 453, 68 ],
+      [ 888, 558, -60, 925, 1048 ],
+      [ 952, 459, 150, 1053, 872 ],
+      [ 616, 554, -210, 810, 786 ],
+      [ 462, 203, 270, 203, 462 ],
+      [ 543, 141, -150, 540, 392 ],
+      [ 544, 212, 240, 455, 576 ],
+      [ 585, 204, 0, 585, 204 ],
+      [ 931, 477, 330, 1044, 878 ],
+      [ 495, 358, 60, 557, 607 ],
+      [ 588, 697, 120, 897, 856 ],
+      [ 854, 594, -90, 594, 854 ],
+      [ 268, 540, 360, 268, 540 ],
+      [ 968, 234, 150, 955, 685 ],
+      [ 152, 580, 360, 152, 580 ],
+      [ 3, 219, -270, 219, 3 ],
+      [ 301, 627, -60, 692, 573 ],
+      [ 96, 297, 150, 231, 303 ],
+      [ 614, 227, -150, 644, 503 ],
+      [ 533, 598, 210, 759, 783 ],
+      [ 101, 271, 150, 222, 284 ],
+      [ 782, 143, -30, 748, 515 ],
+      [ 160, 344, -240, 377, 309 ],
+      [ 148, 301, -30, 278, 335 ],
+      [ 874, 415, -210, 963, 794 ],
+      [ 847, 417, 0, 847, 417 ],
+      [ 1007, 642, -120, 1058, 1192 ],
+      [ 426, 714, 150, 725, 829 ],
+      [ 117, 406, -360, 117, 406 ],
+      [ 443, 37, 210, 401, 252 ],
+      [ 222, 113, -270, 113, 222 ],
+      [ 928, 699, -120, 1068, 1152 ],
+      [ 378, 50, 210, 351, 231 ],
+      [ 548, 161, -270, 161, 548 ],
+      [ 4, 48, 150, 27, 42 ],
+      [ 233, 682, -180, 233, 682 ],
+      [ 754, 670, -330, 987, 956 ],
+      [ 61, 221, -360, 61, 221 ],
+      [ 789, 309, 30, 837, 662 ],
+      [ 795, 641, 60, 952, 1008 ],
+      [ 573, 39, 180, 573, 39 ],
+      [ 712, 734, 90, 734, 712 ],
+      [ 18, 250, 150, 140, 224 ],
+      [ 805, 660, 300, 973, 1027 ],
+      [ 968, 663, 360, 968, 663 ],
+      [ 661, 69, 270, 69, 661 ],
+      [ 908, 634, 180, 908, 634 ],
+      [ 986, 680, -360, 986, 680 ],
+      [ 992, 503, -60, 930, 1110 ],
+      [ 514, 331, -180, 514, 331 ],
+      [ 85, 760, -150, 452, 699 ],
+      [ 830, 526, -180, 830, 526 ],
+      [ 458, 539, 60, 695, 665 ],
+      [ 152, 374, -30, 317, 400 ],
+      [ 59, 332, -150, 216, 316 ],
+      [ 29, 59, -90, 59, 29 ],
+      [ 909, 740, -210, 1157, 1094 ],
+      [ 633, 711, -300, 932, 903 ],
+      [ 651, 686, 180, 651, 686 ],
+      [ 56, 303, -240, 289, 198 ],
+      [ 314, 366, -240, 473, 453 ],
+      [ 624, 220, 270, 220, 624 ],
+      [ 888, 563, 60, 931, 1050 ],
+      [ 459, 676, -330, 735, 814 ],
+      [ 911, 720, 0, 911, 720 ],
+      [ 197, 742, 30, 541, 741 ],
+      [ 599, 655, 30, 845, 866 ],
+      [ 823, 361, -30, 892, 724 ],
+      [ 929, 81, -120, 533, 844 ],
+      [ 681, 122, 180, 681, 122 ],
+      [ 874, 358, -210, 935, 745 ],
+      [ 31, 57, 0, 31, 57 ],
+      [ 914, 722, -210, 1152, 1080 ],
+      [ 468, 298, -300, 491, 554 ],
+      [ 520, 213, -330, 556, 443 ],
+      [ 1014, 360, -360, 1014, 360 ],
+      [ 563, 42, 270, 42, 563 ],
+      [ 73, 658, -120, 605, 391 ],
+      [ 530, 587, -60, 771, 751 ],
+      [ 877, 329, 60, 723, 923 ],
+      [ 604, 216, -330, 631, 488 ],
+      [ 818, 239, -270, 239, 818 ],
+      [ 302, 156, -330, 339, 285 ],
+      [ 534, 507, -30, 715, 706 ],
+      [ 644, 128, 180, 644, 128 ],
+      [ 690, 121, -210, 657, 448 ],
+      [ 699, 542, -180, 699, 542 ],
+      [ 557, 597, -300, 795, 780 ],
+      [ 896, 226, 270, 226, 896 ],
+      [ 318, 116, -150, 332, 258 ],
+      [ 926, 568, 60, 954, 1085 ],
+      [ 987, 414, 300, 851, 1061 ],
+      [ 98, 639, -300, 601, 403 ],
+      [ 173, 272, 180, 173, 272 ],
+      [ 644, 755, 330, 934, 976 ],
+      [ 375, 504, -300, 623, 576 ],
+      [ 585, 259, 210, 635, 515 ],
+      [ 851, 677, 60, 1011, 1074 ],
+      [ 970, 580, 270, 580, 970 ],
+      [ 846, 51, -360, 846, 51 ],
+      [ 136, 745, 180, 136, 745 ],
+      [ 737, 716, -150, 995, 987 ],
+      [ 632, 22, -300, 334, 558 ],
+      [ 734, 151, -30, 710, 498 ],
+      [ 488, 633, -30, 738, 792 ],
+      [ 412, 146, -300, 331, 429 ],
+      [ 497, 585, -30, 722, 755 ],
+      [ 280, 455, -120, 533, 469 ],
+      [ 857, 413, -330, 948, 786 ],
+      [ 712, 279, -270, 279, 712 ],
+      [ 719, 381, -300, 689, 812 ],
+      [ 460, 165, -330, 480, 372 ],
+      [ 751, 639, -330, 969, 928 ],
+      [ 870, 421, -180, 870, 421 ],
+      [ 327, 18, -300, 179, 292 ],
+      [ 790, 327, -150, 847, 677 ],
+      [ 900, 699, -330, 1128, 1054 ],
+      [ 330, 141, 90, 141, 330 ],
+      [ 663, 16, -240, 345, 581 ],
+      [ 744, 549, 30, 918, 846 ],
+      [ 892, 320, -360, 892, 320 ],
+      [ 1009, 664, -180, 1009, 664 ],
+      [ 33, 459, -330, 257, 414 ],
+      [ 108, 344, 90, 344, 108 ],
+      [ 385, 589, 120, 702, 626 ],
+      [ 481, 413, -330, 622, 598 ],
+      [ 771, 320, 360, 771, 320 ],
+      [ 817, 567, -240, 899, 989 ],
+      [ 444, 296, -240, 477, 531 ],
+      [ 622, 86, 300, 383, 581 ],
+      [ 148, 755, -150, 505, 727 ],
+      [ 181, 743, -240, 733, 526 ],
+      [ 434, 767, 210, 758, 880 ],
+      [ 514, 80, -210, 485, 324 ],
+      [ 131, 368, 360, 131, 368 ],
+      [ 796, 728, 30, 1053, 1027 ],
+      [ 872, 539, 330, 1024, 903 ],
+      [ 856, 383, 150, 932, 758 ],
+      [ 3, 716, -330, 360, 621 ],
+      [ 194, 414, -240, 455, 374 ],
+      [ 93, 525, -240, 501, 341 ],
+      [ 417, 660, -270, 660, 417 ],
+      [ 602, 218, -270, 218, 602 ],
+      [ 376, 603, -210, 626, 708 ],
+      [ 607, 701, 150, 875, 909 ],
+      [ 599, 529, 120, 757, 781 ],
+      [ 117, 415, -120, 416, 308 ],
+      [ 61, 289, 270, 289, 61 ],
+      [ 760, 291, 210, 803, 631 ],
+      [ 830, 436, -120, 792, 935 ],
+      [ 1013, 505, -360, 1013, 505 ],
+      [ 153, 50, 270, 50, 153 ],
+      [ 283, 501, -270, 501, 283 ],
+      [ 412, 15, 330, 363, 219 ],
+      [ 646, 469, 270, 469, 646 ],
+      [ 347, 150, 30, 375, 303 ],
+      [ 1019, 237, -330, 1000, 714 ],
+      [ 360, 283, -30, 452, 425 ],
+      [ 211, 85, 240, 178, 224 ],
+      [ 1016, 707, -90, 707, 1016 ],
+      [ 323, 698, -330, 628, 765 ],
+      [ 330, 44, -300, 202, 307 ],
+      [ 192, 256, 210, 293, 317 ],
+      [ 343, 564, 210, 578, 658 ],
+      [ 274, 281, -90, 281, 274 ],
+      [ 115, 541, 60, 526, 369 ],
+      [ 661, 537, 300, 794, 840 ],
+      [ 736, 38, -180, 736, 38 ],
+      [ 171, 196, -90, 196, 171 ],
+      [ 1018, 190, -150, 975, 673 ],
+      [ 397, 432, -210, 559, 571 ],
+      [ 450, 679, -180, 450, 679 ],
+      [ 568, 54, 60, 330, 518 ],
+      [ 330, 311, -120, 433, 440 ],
+      [ 111, 517, 150, 354, 502 ],
+      [ 517, 602, -90, 602, 517 ],
+      [ 99, 330, -300, 335, 250 ],
+      [ 1021, 113, -270, 113, 1021 ],
+      [ 271, 241, -90, 241, 271 ],
+      [ 657, 236, 120, 532, 685 ],
+      [ 961, 534, -210, 1099, 941 ],
+      [ 147, 103, -300, 162, 178 ],
+      [ 415, 529, -270, 529, 415 ],
+      [ 1023, 8, 60, 518, 889 ],
+      [ 335, 91, -210, 335, 245 ],
+      [ 20, 479, -360, 20, 479 ],
+      [ 426, 553, -30, 644, 692 ],
+      [ 523, 550, 60, 737, 727 ],
+      [ 671, 752, 300, 985, 957 ],
+      [ 55, 477, -210, 285, 439 ],
+      [ 715, 429, 300, 728, 833 ],
+      [ 927, 539, -330, 1071, 930 ],
+      [ 1018, 82, 180, 1018, 82 ],
+      [ 158, 81, 180, 158, 81 ],
+      [ 736, 332, 270, 332, 736 ],
+      [ 978, 347, 0, 978, 347 ],
+      [ 999, 666, -210, 1198, 1075 ],
+      [ 435, 290, 300, 467, 521 ],
+      [ 21, 25, 300, 31, 30 ],
+      [ 951, 66, 0, 951, 66 ],
+      [ 148, 602, -330, 429, 594 ],
+      [ 55, 528, 210, 310, 483 ],
+      [ 99, 524, 300, 502, 347 ],
+      [ 847, 642, 360, 847, 642 ],
+      [ 581, 425, -60, 657, 715 ],
+      [ 436, 390, 270, 390, 436 ],
+      [ 929, 371, 180, 929, 371 ],
+      [ 111, 697, -300, 659, 444 ],
+      [ 24, 712, -270, 712, 24 ],
+      [ 941, 657, -210, 1142, 1038 ],
+      [ 444, 768, -360, 444, 768 ],
+      [ 519, 41, 150, 469, 294 ],
+      [ 288, 115, -90, 115, 288 ],
+      [ 166, 749, -210, 517, 730 ],
+      [ 152, 417, 210, 339, 436 ],
+      [ 579, 744, -180, 579, 744 ],
+      [ 444, 673, 180, 444, 673 ],
+      [ 173, 755, 120, 740, 525 ],
+      [ 288, 5, 60, 147, 251 ],
+      [ 436, 710, -30, 731, 833 ],
+      [ 670, 275, -30, 717, 573 ],
+      [ 683, 664, 0, 683, 664 ],
+      [ 375, 111, 120, 283, 378 ],
+      [ 765, 236, 90, 236, 765 ],
+      [ 986, 349, -240, 794, 1026 ],
+      [ 749, 15, -270, 15, 749 ],
+      [ 8, 348, -360, 8, 348 ],
+      [ 786, 477, 360, 786, 477 ],
+      [ 443, 693, 360, 443, 693 ],
+      [ 26, 251, 330, 147, 230 ],
+      [ 483, 753, -180, 483, 753 ],
+      [ 940, 497, -270, 497, 940 ],
+      [ 426, 10, -150, 372, 221 ],
+      [ 64, 583, 60, 536, 346 ],
+      [ 701, 555, -330, 884, 831 ],
+      [ 870, 348, -330, 927, 735 ],
+      [ 1005, 354, 0, 1005, 354 ],
+      [ 1013, 175, -270, 175, 1013 ],
+      [ 1004, 507, -330, 1122, 940 ],
+      [ 1001, 526, -90, 526, 1001 ],
+      [ 921, 120, -120, 563, 856 ],
+      [ 183, 56, 360, 183, 56 ],
+      [ 329, 376, -360, 329, 376 ],
+      [ 623, 423, 210, 750, 676 ],
+      [ 207, 181, 0, 207, 181 ],
+      [ 256, 65, 330, 253, 184 ],
+      [ 324, 50, -60, 203, 305 ],
+      [ 855, 42, 90, 42, 855 ],
+      [ 998, 27, -150, 877, 521 ],
+      [ 16, 9, 360, 16, 9 ],
+      [ 392, 700, -270, 700, 392 ],
+      [ 749, 69, -240, 434, 681 ],
+      [ 743, 316, 150, 801, 644 ],
+      [ 749, 15, -210, 655, 386 ],
+      [ 509, 170, -30, 524, 401 ],
+      [ 1007, 362, 30, 1053, 817 ],
+      [ 945, 604, 90, 604, 945 ],
+      [ 331, 477, 120, 578, 523 ],
+      [ 973, 458, 150, 1071, 882 ],
+      [ 243, 469, 180, 243, 469 ],
+      [ 214, 763, 90, 763, 214 ],
+      [ 344, 557, 180, 344, 557 ],
+      [ 549, 345, -270, 345, 549 ],
+      [ 229, 139, -270, 139, 229 ],
+      [ 474, 520, -90, 520, 474 ],
+      [ 959, 506, 270, 506, 959 ],
+      [ 506, 447, 90, 447, 506 ],
+      [ 119, 694, -180, 119, 694 ],
+      [ 811, 656, 270, 656, 811 ],
+      [ 514, 70, -30, 479, 318 ],
+      [ 229, 230, -30, 312, 313 ],
+      [ 877, 487, -240, 860, 1001 ],
+      [ 592, 131, 90, 131, 592 ],
+      [ 727, 302, 240, 624, 779 ],
+      [ 882, 657, -30, 1091, 1010 ],
+      [ 240, 608, -270, 608, 240 ],
+      [ 78, 219, 150, 176, 227 ],
+      [ 722, 308, 90, 308, 722 ],
+      [ 977, 147, -30, 919, 615 ],
+      [ 818, 533, 60, 870, 974 ],
+      [ 261, 704, 270, 704, 261 ],
+      [ 721, 593, 0, 721, 593 ],
+      [ 898, 268, 120, 680, 910 ],
+      [ 510, 46, -330, 464, 294 ],
+      [ 307, 707, 300, 764, 618 ],
+      [ 796, 118, 150, 748, 498 ],
+      [ 935, 177, 360, 935, 177 ],
+      [ 646, 718, -90, 718, 646 ],
+      [ 258, 682, 60, 719, 564 ],
+      [ 744, 528, -180, 744, 528 ],
+      [ 298, 723, -240, 774, 618 ],
+      [ 158, 495, 360, 158, 495 ],
+      [ 668, 400, -150, 777, 679 ],
+      [ 327, 14, -90, 14, 327 ],
+      [ 389, 244, -150, 457, 404 ],
+      [ 302, 73, -30, 297, 214 ],
+      [ 1, 6, 120, 5, 2 ],
+      [ 1016, 490, 90, 490, 1016 ],
+      [ 392, 683, 0, 392, 683 ],
+      [ 989, 472, -240, 903, 1091 ],
+      [ 246, 695, -270, 695, 246 ],
+      [ 442, 46, 210, 404, 260 ],
+      [ 404, 547, -150, 622, 675 ],
+      [ 723, 24, -150, 637, 381 ],
+      [ 78, 315, 90, 315, 78 ],
+      [ 375, 540, 150, 594, 654 ],
+      [ 829, 541, 180, 829, 541 ],
+      [ 494, 534, -120, 708, 693 ],
+      [ 92, 60, -180, 92, 60 ],
+      [ 598, 33, 270, 33, 598 ],
+      [ 783, 218, 210, 786, 579 ],
+      [ 907, 549, 240, 927, 1059 ],
+      [ 667, 83, 30, 618, 405 ],
+      [ 960, 625, 60, 1020, 1143 ],
+      [ 247, 683, 360, 247, 683 ],
+      [ 883, 196, 120, 611, 861 ],
+      [ 590, 50, -90, 50, 590 ],
+      [ 305, 420, -330, 474, 516 ],
+      [ 672, 489, -270, 489, 672 ],
+      [ 924, 168, -240, 606, 883 ],
+      [ 782, 755, -30, 1054, 1045 ],
+      [ 542, 668, -240, 849, 802 ],
+      [ 363, 400, -150, 513, 526 ],
+      [ 912, 351, -300, 759, 964 ],
+      [ 467, 536, -360, 467, 536 ],
+      [ 442, 430, -180, 442, 430 ],
+      [ 112, 104, -120, 145, 147 ],
+      [ 503, 332, 270, 332, 503 ],
+      [ 581, 68, 0, 581, 68 ],
+      [ 739, 761, 180, 739, 761 ],
+      [ 941, 579, 150, 1103, 970 ],
+      [ 409, 217, 60, 392, 462 ],
+      [ 607, 489, -300, 726, 769 ],
+      [ 916, 404, 30, 995, 807 ],
+      [ 11, 754, -180, 11, 754 ],
+      [ 15, 317, 240, 281, 170 ],
+      [ 280, 401, 330, 442, 487 ],
+      [ 611, 10, -90, 10, 611 ],
+      [ 478, 446, -30, 635, 625 ],
+      [ 995, 232, -30, 976, 698 ],
+      [ 713, 169, -210, 701, 501 ],
+      [ 413, 475, 0, 413, 475 ],
+      [ 1002, 162, -270, 162, 1002 ],
+      [ 75, 81, 120, 107, 103 ],
+      [ 640, 89, 90, 89, 640 ],
+      [ 896, 100, -330, 825, 534 ],
+      [ 699, 310, 60, 617, 760 ],
+      [ 641, 768, 60, 985, 939 ],
+      [ 1, 358, -270, 358, 1 ],
+      [ 475, 336, -30, 578, 528 ],
+      [ 938, 103, 120, 557, 862 ],
+      [ 125, 412, -150, 313, 418 ],
+      [ 623, 395, 0, 623, 395 ],
+      [ 749, 450, 90, 450, 749 ],
+      [ 390, 162, 180, 390, 162 ],
+      [ 11, 66, 270, 66, 11 ],
+      [ 55, 590, -180, 55, 590 ],
+      [ 633, 302, -180, 633, 302 ],
+      [ 199, 303, 180, 199, 303 ],
+      [ 359, 659, -240, 750, 638 ],
+      [ 827, 595, -150, 1013, 927 ],
+      [ 496, 688, 240, 843, 772 ],
+      [ 799, 387, -120, 733, 884 ],
+      [ 293, 180, 330, 342, 302 ],
+      [ 920, 472, -270, 472, 920 ],
+      [ 640, 480, -210, 794, 734 ],
+      [ 493, 521, 360, 493, 521 ],
+      [ 759, 227, -90, 227, 759 ],
+      [ 1023, 376, 210, 1072, 836 ],
+      [ 741, 645, 90, 645, 741 ],
+      [ 906, 497, -60, 881, 1032 ],
+      [ 183, 101, -150, 208, 177 ],
+      [ 9, 700, 240, 609, 356 ],
+      [ 360, 152, -330, 387, 311 ],
+      [ 287, 73, 120, 206, 283 ],
+      [ 429, 553, -150, 647, 692 ],
+      [ 659, 154, 330, 646, 462 ],
+      [ 651, 723, -180, 651, 723 ],
+      [ 21, 722, 180, 21, 722 ],
+      [ 819, 509, 60, 850, 963 ],
+      [ 447, 420, -210, 597, 586 ],
+      [ 867, 557, -90, 557, 867 ],
+      [ 155, 563, -180, 155, 563 ],
+      [ 982, 64, -30, 881, 546 ],
+      [ 1, 279, 60, 242, 139 ],
+      [ 674, 600, -150, 882, 856 ],
+      [ 962, 326, 0, 962, 326 ],
+      [ 920, 46, -60, 498, 819 ],
+      [ 157, 61, -90, 61, 157 ],
+      [ 918, 675, -360, 918, 675 ],
+      [ 492, 242, 60, 455, 547 ],
+      [ 728, 124, -150, 691, 470 ],
+      [ 74, 240, -360, 74, 240 ],
+      [ 353, 208, -300, 356, 409 ],
+      [ 833, 209, -30, 825, 597 ],
+      [ 386, 714, -180, 386, 714 ],
+      [ 676, 667, 120, 915, 917 ],
+      [ 146, 588, 180, 146, 588 ],
+      [ 580, 705, 240, 900, 854 ],
+      [ 950, 626, 150, 1135, 1015 ],
+      [ 975, 226, -360, 975, 226 ],
+      [ 534, 4, -240, 269, 463 ],
+      [ 835, 59, 0, 835, 59 ],
+      [ 861, 323, 180, 861, 323 ],
+      [ 972, 179, -360, 972, 179 ],
+      [ 430, 469, 330, 606, 621 ],
+      [ 688, 207, 240, 522, 698 ],
+      [ 356, 316, 60, 451, 466 ],
+      [ 85, 751, 0, 85, 751 ],
+      [ 920, 695, -150, 1143, 1061 ],
+      [ 606, 658, 90, 658, 606 ],
+      [ 614, 290, 90, 290, 614 ],
+      [ 786, 148, 150, 754, 519 ],
+      [ 254, 26, -300, 149, 232 ],
+      [ 1022, 755, -120, 1164, 1262 ],
+      [ 20, 309, 330, 171, 278 ],
+      [ 994, 57, -210, 888, 544 ],
+      [ 807, 324, 90, 324, 807 ],
+      [ 381, 387, 90, 387, 381 ],
+      [ 894, 309, 0, 894, 309 ],
+      [ 193, 763, -90, 763, 193 ],
+      [ 817, 455, 180, 817, 455 ],
+      [ 421, 276, 330, 501, 449 ],
+      [ 102, 466, 360, 102, 466 ],
+      [ 213, 464, 330, 415, 508 ],
+      [ 562, 479, -120, 695, 725 ],
+      [ 512, 456, -60, 649, 671 ],
+      [ 737, 294, 270, 294, 737 ],
+      [ 359, 579, -120, 679, 599 ],
+      [ 982, 481, 180, 982, 481 ],
+      [ 483, 626, 180, 483, 626 ],
+      [ 861, 470, -120, 836, 979 ],
+      [ 601, 17, 150, 528, 314 ],
+      [ 538, 93, -150, 511, 349 ],
+      [ 509, 252, 300, 471, 566 ],
+      [ 462, 674, 30, 737, 814 ],
+      [ 827, 289, -270, 289, 827 ],
+      [ 242, 73, 0, 242, 73 ],
+      [ 89, 343, -180, 89, 343 ],
+      [ 451, 311, 300, 493, 545 ],
+      [ 200, 673, 150, 509, 681 ],
+      [ 965, 550, -150, 1109, 957 ],
+      [ 288, 232, -120, 344, 364 ],
+      [ 1003, 635, -30, 1185, 1051 ],
+      [ 290, 249, 210, 375, 360 ],
+      [ 196, 595, 120, 612, 465 ],
+      [ 740, 447, -360, 740, 447 ],
+      [ 868, 628, -270, 628, 868 ],
+      [ 363, 694, 60, 782, 661 ],
+      [ 629, 264, 360, 629, 264 ],
+      [ 512, 413, 270, 413, 512 ],
+      [ 204, 369, 60, 421, 360 ],
+      [ 522, 584, 270, 584, 522 ],
+      [ 862, 568, 150, 1030, 921 ],
+      [ 302, 17, -360, 302, 17 ],
+      [ 78, 164, 210, 148, 180 ],
+      [ 751, 718, -90, 718, 751 ],
+      [ 785, 601, -240, 912, 978 ],
+      [ 916, 105, -300, 548, 845 ],
+      [ 480, 577, -60, 738, 703 ],
+      [ 457, 192, 360, 457, 192 ],
+      [ 307, 345, -30, 437, 452 ],
+      [ 888, 736, -210, 1137, 1079 ],
+      [ 755, 615, 330, 960, 910 ],
+      [ 443, 73, 360, 443, 73 ],
+      [ 462, 131, -240, 343, 464 ],
+      [ 250, 694, -270, 694, 250 ],
+      [ 632, 514, 300, 759, 804 ],
+      [ 827, 433, -360, 827, 433 ],
+      [ 922, 25, 210, 810, 482 ],
+      [ 345, 367, -360, 345, 367 ],
+      [ 317, 597, 0, 317, 597 ],
+      [ 780, 495, -30, 922, 819 ],
+      [ 998, 293, -180, 998, 293 ],
+      [ 948, 625, -120, 1014, 1132 ],
+      [ 921, 203, 0, 921, 203 ],
+      [ 87, 390, -60, 380, 270 ],
+      [ 211, 96, -300, 188, 230 ],
+      [ 111, 716, 120, 675, 453 ],
+      [ 152, 639, 120, 628, 449 ],
+      [ 961, 130, -270, 130, 961 ],
+      [ 1001, 367, 330, 1049, 818 ],
+      [ 477, 183, 60, 396, 504 ],
+      [ 933, 163, 330, 889, 607 ],
+      [ 160, 106, 210, 190, 171 ],
+      [ 508, 28, -360, 508, 28 ],
+      [ 6, 93, 30, 51, 83 ],
+      [ 428, 251, 120, 430, 494 ],
+      [ 511, 334, 60, 544, 609 ],
+      [ 147, 448, -60, 460, 351 ],
+      [ 840, 400, 60, 765, 927 ],
+      [ 997, 383, -330, 1054, 830 ],
+      [ 926, 740, -150, 1170, 1103 ],
+      [ 490, 671, 30, 759, 825 ],
+      [ 442, 23, 120, 240, 392 ],
+      [ 203, 403, 150, 376, 449 ],
+      [ 234, 407, 240, 468, 405 ],
+      [ 785, 728, -270, 728, 785 ],
+      [ 439, 343, 60, 516, 551 ],
+      [ 23, 453, -270, 453, 23 ],
+      [ 459, 314, 120, 501, 553 ],
+      [ 42, 294, -240, 275, 182 ],
+      [ 115, 220, -270, 220, 115 ],
+      [ 431, 587, -360, 431, 587 ],
+      [ 965, 150, -330, 910, 612 ],
+      [ 615, 303, 60, 569, 683 ],
+      [ 303, 478, -300, 565, 501 ],
+      [ 114, 298, -330, 247, 314 ],
+      [ 260, 627, 0, 260, 627 ],
+      [ 851, 644, -330, 1058, 983 ],
+      [ 1014, 219, 0, 1014, 219 ],
+      [ 686, 251, 270, 251, 686 ],
+      [ 868, 336, -270, 336, 868 ],
+      [ 1011, 659, 300, 1075, 1204 ],
+      [ 1024, 615, -300, 1044, 1193 ],
+      [ 43, 307, 0, 43, 307 ],
+      [ 623, 534, -270, 534, 623 ],
+      [ 722, 619, 0, 722, 619 ],
+      [ 767, 46, -120, 422, 686 ],
+      [ 243, 684, -240, 713, 551 ],
+      [ 323, 676, -30, 616, 746 ],
+      [ 821, 423, 210, 922, 775 ],
+      [ 687, 305, -210, 746, 606 ],
+      [ 845, 295, -330, 878, 677 ],
+      [ 762, 295, 270, 295, 762 ],
+      [ 878, 327, -180, 878, 327 ],
+      [ 373, 26, 360, 373, 26 ],
+      [ 505, 567, 210, 720, 742 ],
+      [ 10, 374, 240, 328, 194 ],
+      [ 350, 556, 180, 350, 556 ],
+      [ 524, 30, 90, 30, 524 ],
+      [ 989, 645, -270, 645, 989 ],
+      [ 765, 392, 30, 858, 721 ],
+      [ 988, 257, 330, 983, 717 ],
+      [ 41, 60, -150, 64, 71 ],
+      [ 938, 718, 180, 938, 718 ],
+      [ 196, 230, 210, 283, 296 ],
+      [ 165, 608, 0, 165, 608 ],
+      [ 959, 615, 360, 959, 615 ],
+      [ 790, 109, 180, 790, 109 ],
+      [ 508, 502, 210, 689, 688 ],
+      [ 104, 475, 60, 462, 327 ],
+      [ 262, 281, -300, 373, 366 ],
+      [ 827, 253, -30, 842, 632 ],
+      [ 760, 284, 30, 800, 625 ],
+      [ 62, 219, -30, 162, 221 ],
+      [ 822, 365, 180, 822, 365 ],
+      [ 593, 488, 30, 757, 719 ],
+      [ 95, 439, -120, 426, 301 ],
+      [ 95, 263, 0, 95, 263 ],
+      [ 835, 644, -270, 644, 835 ],
+      [ 590, 722, 180, 590, 722 ],
+      [ 180, 150, -270, 150, 180 ],
+      [ 292, 2, -30, 252, 148 ],
+      [ 746, 571, 240, 867, 931 ],
+      [ 256, 617, -300, 661, 529 ],
+      [ 723, 466, 60, 765, 859 ],
+      [ 472, 142, -210, 479, 357 ],
+      [ 7, 213, 210, 112, 186 ],
+      [ 362, 284, -270, 284, 362 ],
+      [ 862, 141, 360, 862, 141 ],
+      [ 1006, 583, 300, 1006, 1162 ],
+      [ 760, 718, -300, 1001, 1017 ],
+      [ 887, 169, -300, 589, 852 ],
+      [ 326, 728, 270, 728, 326 ],
+      [ 144, 152, 120, 203, 199 ],
+      [ 252, 694, -180, 252, 694 ],
+      [ 846, 279, -60, 663, 871 ],
+      [ 43, 284, 150, 179, 266 ],
+      [ 848, 555, -300, 904, 1011 ],
+      [ 980, 433, -180, 980, 433 ],
+      [ 946, 419, -360, 946, 419 ],
+      [ 849, 221, 330, 845, 615 ],
+      [ 952, 117, -240, 576, 881 ],
+      [ 32, 361, -270, 361, 32 ],
+      [ 897, 469, -120, 853, 1010 ],
+      [ 536, 657, -210, 792, 835 ],
+      [ 795, 524, 60, 851, 950 ],
+      [ 219, 556, 330, 466, 591 ],
+      [ 950, 424, 120, 841, 1033 ],
+      [ 11, 390, -180, 11, 390 ],
+      [ 283, 331, 210, 410, 427 ],
+      [ 308, 199, -330, 365, 325 ],
+      [ 267, 145, -210, 303, 258 ],
+      [ 450, 168, 150, 473, 368 ],
+      [ 578, 73, -150, 536, 351 ],
+      [ 909, 474, -240, 864, 1023 ],
+      [ 115, 303, 270, 303, 115 ],
+      [ 717, 467, 60, 762, 853 ],
+      [ 673, 411, -300, 692, 787 ],
+      [ 344, 419, 90, 419, 344 ],
+      [ 592, 630, -330, 827, 841 ],
+      [ 374, 93, -150, 369, 267 ],
+      [ 450, 293, 0, 450, 293 ],
+      [ 681, 630, 150, 904, 885 ],
+      [ 369, 295, 240, 438, 466 ],
+      [ 681, 208, -60, 519, 693 ],
+      [ 846, 295, 240, 677, 879 ],
+      [ 684, 64, -60, 395, 624 ],
+      [ 238, 569, 360, 238, 569 ],
+      [ 357, 58, 0, 357, 58 ],
+      [ 994, 502, -120, 931, 1110 ],
+      [ 25, 14, -30, 27, 24 ],
+      [ 345, 351, 240, 475, 473 ],
+      [ 857, 93, 120, 509, 787 ],
+      [ 569, 370, -360, 569, 370 ],
+      [ 378, 112, -150, 382, 285 ],
+      [ 818, 747, 150, 1081, 1054 ],
+      [ 637, 491, 210, 796, 742 ],
+      [ 54, 669, 0, 54, 669 ],
+      [ 17, 169, 60, 154, 98 ],
+      [ 539, 146, -210, 539, 394 ],
+      [ 876, 164, -180, 876, 164 ],
+      [ 312, 422, 150, 481, 519 ],
+      [ 139, 297, 240, 325, 268 ],
+      [ 805, 723, -150, 1058, 1027 ],
+      [ 839, 238, -30, 844, 625 ],
+      [ 127, 83, -60, 134, 150 ],
+      [ 832, 561, -330, 1000, 901 ],
+      [ 597, 601, 330, 817, 818 ],
+      [ 96, 613, -240, 578, 388 ],
+      [ 696, 249, -120, 563, 726 ],
+      [ 941, 137, 60, 589, 882 ],
+      [ 180, 371, -300, 410, 340 ],
+      [ 911, 475, 0, 911, 475 ],
+      [ 743, 310, -30, 797, 639 ],
+      [ 42, 171, 180, 42, 171 ],
+      [ 515, 266, 270, 266, 515 ],
+      [ 959, 122, 60, 585, 891 ],
+      [ 9, 569, -90, 569, 9 ],
+      [ 975, 640, -240, 1041, 1163 ],
+      [ 117, 394, 0, 117, 394 ],
+      [ 477, 331, 120, 525, 577 ],
+      [ 31, 465, -270, 465, 31 ],
+      [ 148, 381, 210, 318, 403 ],
+      [ 660, 169, -240, 475, 654 ],
+      [ 87, 201, -90, 201, 87 ],
+      [ 855, 587, 180, 855, 587 ],
+      [ 710, 538, 300, 819, 883 ],
+      [ 288, 544, 90, 544, 288 ],
+      [ 665, 507, -30, 828, 771 ],
+      [ 836, 594, 360, 836, 594 ],
+      [ 314, 183, -60, 313, 362 ],
+      [ 997, 206, -360, 997, 206 ],
+      [ 126, 316, 0, 126, 316 ],
+      [ 912, 43, 180, 912, 43 ],
+      [ 62, 108, 360, 62, 108 ],
+      [ 464, 749, 180, 464, 749 ],
+      [ 197, 513, -30, 426, 542 ],
+      [ 91, 728, -240, 675, 441 ],
+      [ 743, 459, 240, 768, 872 ],
+      [ 201, 318, 60, 375, 333 ],
+      [ 183, 553, 240, 569, 434 ],
+      [ 605, 532, -300, 763, 789 ],
+      [ 623, 627, 0, 623, 627 ],
+      [ 123, 542, 60, 530, 377 ],
+      [ 873, 589, 150, 1050, 945 ],
+      [ 866, 169, 150, 833, 577 ],
+      [ 616, 316, -120, 581, 690 ],
+      [ 59, 384, -150, 242, 361 ],
+      [ 227, 173, 300, 262, 282 ],
+      [ 45, 323, -150, 199, 301 ],
+      [ 655, 460, -360, 655, 460 ],
+      [ 484, 145, 150, 491, 366 ],
+      [ 587, 611, 30, 813, 822 ],
+      [ 87, 704, -210, 427, 652 ],
+      [ 668, 590, -360, 668, 590 ],
+      [ 368, 471, -210, 553, 590 ],
+      [ 41, 165, 90, 165, 41 ],
+      [ 398, 209, -270, 209, 398 ],
+      [ 702, 379, -120, 678, 796 ],
+      [ 593, 412, 210, 718, 652 ],
+      [ 907, 135, -90, 135, 907 ],
+      [ 934, 498, 60, 897, 1057 ],
+      [ 646, 170, -120, 469, 643 ],
+      [ 168, 235, -180, 168, 235 ],
+      [ 413, 736, -330, 725, 843 ],
+      [ 419, 243, 120, 419, 482 ],
+      [ 648, 274, 270, 274, 648 ],
+      [ 274, 572, -270, 572, 274 ],
+      [ 411, 330, 90, 330, 411 ],
+      [ 778, 6, -240, 393, 675 ],
+      [ 551, 686, -120, 868, 819 ],
+      [ 936, 618, 360, 936, 618 ],
+      [ 490, 334, -210, 591, 532 ],
+      [ 858, 460, 30, 973, 826 ],
+      [ 115, 1, -30, 99, 58 ],
+      [ 159, 315, 210, 294, 351 ],
+      [ 830, 33, -270, 33, 830 ],
+      [ 696, 238, 300, 552, 721 ],
+      [ 841, 546, -120, 892, 1000 ],
+      [ 466, 362, -120, 546, 583 ],
+      [ 641, 7, -210, 558, 325 ],
+      [ 995, 708, -360, 995, 708 ],
+      [ 989, 307, -30, 1009, 760 ],
+      [ 185, 182, -330, 251, 250 ],
+      [ 717, 268, -330, 754, 590 ],
+      [ 183, 387, -30, 351, 426 ],
+      [ 995, 241, 0, 995, 241 ],
+      [ 124, 763, 240, 722, 488 ],
+      [ 15, 625, 30, 324, 548 ],
+      [ 345, 207, -360, 345, 207 ],
+      [ 683, 687, -360, 683, 687 ],
+      [ 910, 665, 330, 1120, 1031 ],
+      [ 938, 638, -120, 1021, 1130 ],
+      [ 385, 8, 60, 199, 337 ],
+      [ 445, 546, 300, 694, 658 ],
+      [ 506, 682, -60, 842, 779 ],
+      [ 986, 660, 180, 986, 660 ],
+      [ 485, 753, 180, 485, 753 ],
+      [ 302, 764, 30, 643, 812 ],
+      [ 846, 254, 240, 642, 858 ],
+      [ 847, 765, 150, 1115, 1085 ],
+      [ 857, 680, 60, 1017, 1082 ],
+      [ 786, 615, -90, 615, 786 ],
+      [ 100, 135, -60, 165, 153 ],
+      [ 681, 469, -300, 746, 823 ],
+      [ 595, 80, -360, 595, 80 ],
+      [ 1023, 51, 270, 51, 1023 ],
+      [ 749, 415, 270, 415, 749 ],
+      [ 467, 641, 240, 787, 724 ],
+      [ 1017, 507, -240, 947, 1132 ],
+      [ 819, 374, -240, 733, 895 ],
+      [ 511, 248, -330, 566, 470 ],
+      [ 66, 69, 270, 69, 66 ],
+      [ 469, 144, -360, 469, 144 ],
+      [ 883, 655, 90, 655, 883 ],
+      [ 1000, 332, 180, 1000, 332 ],
+      [ 1003, 331, 210, 1033, 787 ],
+      [ 861, 125, -120, 537, 807 ],
+      [ 697, 474, -240, 758, 839 ],
+      [ 528, 469, 240, 669, 691 ],
+      [ 696, 315, -150, 759, 620 ],
+      [ 860, 698, 120, 1033, 1092 ],
+      [ 906, 747, 180, 906, 747 ],
+      [ 747, 330, 300, 658, 811 ],
+      [ 768, 224, 210, 776, 577 ],
+      [ 389, 206, -210, 439, 371 ],
+      [ 116, 190, 90, 190, 116 ],
+      [ 935, 67, 210, 842, 524 ],
+      [ 259, 590, -60, 639, 519 ],
+      [ 437, 217, -360, 437, 217 ],
+      [ 265, 739, -60, 771, 598 ],
+      [ 592, 616, -120, 828, 819 ],
+      [ 225, 527, -150, 457, 567 ],
+      [ 974, 319, 180, 974, 319 ],
+      [ 891, 126, -360, 891, 126 ],
+      [ 656, 417, -150, 776, 688 ],
+      [ 864, 504, 30, 1000, 867 ],
+      [ 489, 437, 90, 437, 489 ],
+      [ 279, 630, -90, 630, 279 ],
+      [ 701, 190, 150, 702, 514 ],
+      [ 723, 388, 120, 697, 819 ],
+      [ 140, 64, -30, 152, 125 ],
+      [ 486, 233, -270, 233, 486 ],
+      [ 803, 195, 30, 792, 570 ],
+      [ 536, 95, 150, 511, 348 ],
+      [ 567, 587, -180, 567, 587 ],
+      [ 873, 466, 300, 839, 989 ],
+      [ 408, 65, -30, 385, 260 ],
+      [ 31, 274, -150, 162, 251 ],
+      [ 440, 31, 30, 396, 246 ],
+      [ 114, 573, -330, 384, 552 ],
+      [ 772, 678, -270, 678, 772 ],
+      [ 203, 274, -60, 337, 312 ],
+      [ 336, 108, 150, 344, 260 ],
+      [ 894, 510, 240, 888, 1028 ],
+      [ 594, 167, 60, 441, 597 ],
+      [ 850, 54, -240, 471, 762 ],
+      [ 753, 359, -180, 753, 359 ],
+      [ 214, 382, 90, 382, 214 ],
+      [ 514, 712, 120, 873, 800 ],
+      [ 43, 29, -60, 45, 51 ],
+      [ 89, 608, -150, 380, 570 ],
+      [ 219, 760, 90, 760, 219 ],
+      [ 659, 244, 210, 691, 539 ],
+      [ 334, 146, -30, 361, 293 ],
+      [ 134, 591, 120, 578, 410 ],
+      [ 717, 460, 180, 717, 460 ],
+      [ 896, 257, -240, 670, 902 ],
+      [ 137, 417, 150, 326, 428 ],
+      [ 767, 34, 90, 34, 767 ],
+      [ 414, 66, 120, 263, 390 ],
+      [ 825, 132, -30, 779, 526 ],
+      [ 91, 296, -60, 300, 226 ],
+      [ 745, 22, 180, 745, 22 ],
+      [ 520, 272, 330, 585, 496 ],
+      [ 974, 372, 150, 1029, 807 ],
+      [ 626, 141, -150, 612, 434 ],
+      [ 350, 45, 120, 213, 324 ],
+      [ 552, 147, -240, 402, 550 ],
+      [ 239, 722, -210, 567, 743 ],
+      [ 873, 265, -150, 888, 664 ],
+      [ 521, 115, 0, 521, 115 ],
+      [ 979, 183, 270, 183, 979 ],
+      [ 401, 741, 300, 841, 717 ],
+      [ 147, 363, -180, 147, 363 ],
+      [ 86, 325, 180, 86, 325 ],
+      [ 813, 26, 300, 428, 717 ],
+      [ 105, 288, 360, 105, 288 ],
+      [ 763, 702, -240, 989, 1010 ],
+      [ 952, 112, -300, 572, 880 ],
+      [ 163, 767, -30, 524, 745 ],
+      [ 485, 389, 90, 389, 485 ],
+      [ 983, 355, 240, 797, 1028 ],
+      [ 852, 655, 240, 992, 1064 ],
+      [ 749, 765, -180, 749, 765 ],
+      [ 1007, 61, 150, 902, 555 ],
+      [ 737, 671, 180, 737, 671 ],
+      [ 654, 749, -300, 975, 940 ],
+      [ 631, 553, -360, 631, 553 ],
+      [ 803, 498, -240, 832, 943 ],
+      [ 914, 620, -240, 993, 1100 ],
+      [ 353, 215, 120, 362, 411 ],
+      [ 968, 185, -270, 185, 968 ],
+      [ 803, 55, 360, 803, 55 ],
+      [ 601, 616, 360, 601, 616 ],
+      [ 882, 604, -330, 1065, 963 ],
+      [ 571, 388, 330, 687, 621 ],
+      [ 295, 111, 300, 242, 310 ],
+      [ 402, 583, 90, 583, 402 ],
+      [ 420, 417, -180, 420, 417 ],
+      [ 588, 334, -330, 676, 582 ],
+      [ 753, 598, -120, 893, 950 ],
+      [ 412, 556, 60, 687, 634 ],
+      [ 545, 390, 120, 610, 665 ],
+      [ 526, 72, -30, 490, 325 ],
+      [ 502, 733, -180, 502, 733 ],
+      [ 560, 393, 210, 680, 619 ],
+      [ 487, 613, 300, 773, 727 ],
+      [ 388, 146, 120, 319, 408 ],
+      [ 1, 461, -210, 230, 398 ],
+      [ 278, 133, 90, 133, 278 ],
+      [ 357, 698, -60, 781, 658 ],
+      [ 723, 238, -270, 238, 723 ],
+      [ 310, 646, 120, 713, 590 ],
+      [ 994, 272, 180, 994, 272 ],
+      [ 451, 649, 150, 714, 786 ],
+      [ 713, 300, -210, 767, 615 ],
+      [ 467, 665, -360, 467, 665 ],
+      [ 369, 187, -240, 346, 411 ],
+      [ 24, 188, 210, 113, 174 ],
+      [ 234, 396, 360, 234, 396 ],
+      [ 889, 663, 270, 663, 889 ],
+      [ 293, 437, -240, 524, 470 ],
+      [ 438, 669, -360, 438, 669 ],
+      [ 78, 646, -90, 646, 78 ],
+      [ 836, 216, -210, 831, 603 ],
+      [ 524, 750, 90, 750, 524 ],
+      [ 733, 332, -30, 799, 654 ],
+      [ 736, 608, 180, 736, 608 ],
+      [ 933, 626, 360, 933, 626 ],
+      [ 721, 33, -30, 640, 389 ],
+      [ 686, 699, -120, 947, 943 ],
+      [ 556, 151, 300, 407, 556 ],
+      [ 743, 479, 210, 882, 785 ],
+      [ 767, 537, 90, 537, 767 ],
+      [ 130, 396, 300, 406, 310 ],
+      [ 357, 20, 270, 20, 357 ],
+      [ 984, 570, -150, 1136, 985 ],
+      [ 449, 353, -300, 530, 564 ],
+      [ 164, 285, 300, 327, 284 ],
+      [ 127, 57, 330, 137, 112 ],
+      [ 618, 571, 270, 571, 618 ],
+      [ 968, 220, -330, 948, 674 ],
+      [ 875, 9, 150, 761, 444 ],
+      [ 649, 584, -90, 584, 649 ],
+      [ 258, 681, 300, 717, 563 ],
+      [ 155, 181, 330, 224, 234 ],
+      [ 27, 151, 120, 144, 97 ],
+      [ 340, 487, -270, 487, 340 ],
+      [ 441, 610, 0, 441, 610 ],
+      [ 350, 705, 60, 785, 655 ],
+      [ 303, 400, -150, 461, 496 ],
+      [ 164, 357, 60, 390, 320 ],
+      [ 225, 245, 90, 245, 225 ],
+      [ 924, 731, -90, 731, 924 ],
+      [ 291, 156, -180, 291, 156 ],
+      [ 184, 272, 0, 184, 272 ],
+      [ 103, 292, 150, 235, 303 ],
+      [ 782, 547, -150, 950, 864 ],
+      [ 906, 109, -300, 546, 838 ],
+      [ 387, 371, -360, 387, 371 ],
+      [ 966, 598, 30, 1135, 1000 ],
+      [ 259, 721, -360, 259, 721 ],
+      [ 868, 121, -120, 538, 811 ],
+      [ 464, 46, -180, 464, 46 ],
+      [ 838, 264, 0, 838, 264 ],
+      [ 72, 402, 240, 383, 262 ],
+      [ 570, 479, -210, 732, 698 ],
+      [ 244, 297, 330, 359, 379 ],
+      [ 567, 208, -330, 595, 463 ],
+      [ 679, 497, 30, 836, 769 ],
+      [ 706, 454, -120, 745, 837 ],
+      [ 242, 648, -180, 242, 648 ],
+      [ 253, 531, -60, 585, 484 ],
+      [ 589, 111, 0, 589, 111 ],
+      [ 876, 739, 240, 1077, 1127 ],
+      [ 346, 25, -120, 194, 311 ],
+      [ 178, 452, 360, 178, 452 ],
+      [ 399, 634, -120, 747, 661 ],
+      [ 324, 292, 90, 292, 324 ],
+      [ 394, 33, -180, 394, 33 ],
+      [ 959, 562, 270, 562, 959 ],
+      [ 272, 743, 150, 606, 777 ],
+      [ 547, 164, -90, 164, 547 ],
+      [ 982, 606, 30, 1153, 1015 ],
+      [ 455, 494, 0, 455, 494 ],
+      [ 279, 753, 30, 617, 791 ],
+      [ 638, 118, -270, 118, 638 ],
+      [ 610, 417, 330, 736, 666 ],
+      [ 977, 660, -120, 1059, 1175 ],
+      [ 597, 187, -90, 187, 597 ],
+      [ 880, 138, -300, 559, 831 ],
+      [ 743, 342, -330, 814, 667 ],
+      [ 445, 752, -150, 760, 872 ],
+      [ 854, 720, -330, 1099, 1050 ],
+      [ 387, 292, 150, 481, 445 ],
+      [ 905, 501, 150, 1033, 885 ],
+      [ 431, 211, 270, 211, 431 ],
+      [ 558, 668, -90, 668, 558 ],
+      [ 507, 633, -180, 507, 633 ],
+      [ 843, 312, 0, 843, 312 ],
+      [ 199, 203, 120, 275, 272 ],
+      [ 303, 760, -300, 809, 642 ],
+      [ 374, 325, -300, 467, 485 ],
+      [ 662, 198, -360, 662, 198 ],
+      [ 734, 488, -60, 788, 879 ],
+      [ 440, 398, -330, 580, 564 ],
+      [ 126, 721, -120, 686, 469 ],
+      [ 993, 371, -210, 1044, 816 ],
+      [ 367, 750, -360, 367, 750 ],
+      [ 621, 615, -60, 842, 844 ],
+      [ 100, 764, 150, 468, 710 ],
+      [ 787, 223, 150, 792, 585 ],
+      [ 906, 503, -300, 888, 1035 ],
+      [ 1001, 231, -90, 231, 1001 ],
+      [ 8, 13, -360, 8, 13 ],
+      [ 428, 343, 0, 428, 343 ],
+      [ 491, 436, -30, 642, 623 ],
+      [ 835, 412, 330, 928, 774 ],
+      [ 20, 687, 300, 603, 360 ],
+      [ 49, 385, 150, 234, 356 ],
+      [ 493, 460, 150, 656, 643 ],
+      [ 183, 282, 360, 183, 282 ],
+      [ 886, 193, 120, 609, 862 ],
+      [ 999, 175, 330, 952, 651 ],
+      [ 350, 181, 360, 350, 181 ],
+      [ 352, 502, -60, 609, 555 ],
+      [ 883, 102, 360, 883, 102 ],
+      [ 327, 728, 0, 327, 728 ],
+      [ 264, 743, -60, 773, 599 ],
+      [ 177, 11, 300, 97, 158 ],
+      [ 909, 380, 0, 909, 380 ],
+      [ 610, 517, 270, 517, 610 ],
+      [ 608, 413, -270, 413, 608 ],
+      [ 251, 394, -120, 465, 413 ],
+      [ 202, 656, 60, 668, 502 ],
+      [ 170, 152, -180, 170, 152 ],
+      [ 594, 46, -90, 46, 594 ],
+      [ 575, 290, -120, 537, 641 ],
+      [ 82, 488, -150, 314, 463 ],
+      [ 504, 620, -150, 745, 788 ],
+      [ 415, 533, 210, 625, 668 ],
+      [ 939, 222, -30, 923, 661 ],
+      [ 813, 678, -360, 813, 678 ],
+      [ 944, 98, 0, 944, 98 ],
+      [ 284, 249, -90, 249, 284 ],
+      [ 888, 377, 60, 769, 957 ],
+      [ 113, 54, 90, 54, 113 ],
+      [ 498, 485, -360, 498, 485 ],
+      [ 828, 546, 90, 546, 828 ],
+      [ 99, 156, -30, 162, 184 ],
+      [ 409, 467, -270, 467, 409 ],
+      [ 200, 403, -60, 447, 374 ],
+      [ 679, 244, -150, 709, 549 ],
+      [ 685, 184, -60, 500, 685 ],
+      [ 191, 396, 210, 362, 437 ],
+      [ 572, 294, -180, 572, 294 ],
+      [ 130, 378, -120, 391, 300 ],
+      [ 773, 751, 330, 1044, 1036 ],
+      [ 778, 604, 120, 911, 974 ],
+      [ 409, 678, 270, 678, 409 ],
+      [ 867, 216, -30, 857, 620 ],
+      [ 1010, 366, 360, 1010, 366 ],
+      [ 425, 107, -150, 421, 304 ],
+      [ 743, 620, 30, 953, 908 ],
+      [ 167, 763, -330, 525, 744 ],
+      [ 946, 424, -30, 1030, 840 ],
+      [ 179, 521, 330, 415, 540 ],
+      [ 507, 332, 300, 540, 605 ],
+      [ 457, 147, 150, 468, 354 ],
+      [ 110, 453, 60, 446, 321 ],
+      [ 994, 335, 270, 335, 994 ],
+      [ 453, 324, -120, 506, 553 ],
+      [ 448, 642, -30, 707, 780 ],
+      [ 768, 431, -150, 880, 756 ],
+      [ 307, 556, -150, 542, 634 ],
+      [ 374, 497, 240, 616, 571 ],
+      [ 831, 631, 0, 831, 631 ],
+      [ 768, 243, 330, 786, 594 ],
+      [ 683, 585, -270, 585, 683 ],
+      [ 377, 667, 150, 659, 765 ],
+      [ 976, 645, -270, 645, 976 ],
+      [ 838, 216, 60, 605, 833 ],
+      [ 163, 552, -60, 558, 417 ],
+      [ 654, 359, 360, 654, 359 ],
+      [ 947, 589, 150, 1114, 982 ],
+      [ 210, 101, -120, 191, 231 ],
+      [ 37, 724, -240, 645, 393 ],
+      [ 557, 532, -30, 747, 739 ],
+      [ 495, 276, -180, 495, 276 ],
+      [ 628, 558, -300, 796, 822 ],
+      [ 341, 522, 330, 555, 622 ],
+      [ 500, 382, -210, 624, 579 ],
+      [ 66, 503, 330, 308, 469 ],
+      [ 488, 225, -60, 437, 534 ],
+      [ 460, 168, -240, 374, 481 ],
+      [ 148, 325, -150, 290, 354 ],
+      [ 499, 352, -180, 499, 352 ],
+      [ 667, 2, 330, 577, 335 ],
+      [ 133, 373, -150, 301, 388 ],
+      [ 379, 76, -360, 379, 76 ],
+      [ 490, 332, 150, 590, 531 ],
+      [ 435, 706, -210, 729, 827 ],
+      [ 668, 755, 270, 755, 668 ],
+      [ 612, 353, -270, 353, 612 ],
+      [ 10, 697, -90, 697, 10 ],
+      [ 193, 40, 210, 186, 130 ],
+      [ 509, 414, -180, 509, 414 ],
+      [ 766, 146, -180, 766, 146 ],
+      [ 707, 245, 180, 707, 245 ],
+      [ 1016, 529, 240, 965, 1143 ],
+      [ 20, 128, -180, 20, 128 ],
+      [ 743, 454, -240, 764, 869 ],
+      [ 950, 187, -240, 636, 914 ],
+      [ 804, 646, 90, 646, 804 ],
+      [ 957, 653, 30, 1154, 1044 ],
+      [ 309, 30, 60, 180, 282 ],
+      [ 94, 411, -270, 411, 94 ],
+      [ 347, 217, -150, 408, 360 ],
+      [ 603, 747, 90, 747, 603 ],
+      [ 331, 741, -150, 656, 806 ],
+      [ 160, 755, 0, 160, 755 ],
+      [ 431, 544, -330, 645, 686 ],
+      [ 618, 488, -150, 778, 731 ],
+      [ 788, 323, -270, 323, 788 ],
+      [ 404, 272, -360, 404, 272 ],
+      [ 948, 504, -330, 1072, 909 ],
+      [ 522, 574, 60, 757, 739 ],
+      [ 648, 66, 270, 66, 648 ],
+      [ 967, 518, 240, 931, 1095 ],
+      [ 589, 766, 210, 892, 956 ],
+      [ 915, 118, 210, 850, 558 ],
+      [ 387, 441, 0, 387, 441 ],
+      [ 464, 136, -270, 136, 464 ],
+      [ 790, 727, 30, 1047, 1024 ],
+      [ 952, 262, 300, 701, 955 ],
+      [ 960, 204, 30, 933, 656 ],
+      [ 1008, 596, -150, 1169, 1019 ],
+      [ 579, 313, -90, 313, 579 ],
+      [ 438, 270, -330, 514, 452 ],
+      [ 270, 711, -330, 588, 750 ],
+      [ 64, 629, -210, 369, 575 ],
+      [ 865, 151, 210, 824, 562 ],
+      [ 343, 499, 330, 546, 603 ],
+      [ 471, 323, 300, 514, 568 ],
+      [ 5, 268, -180, 5, 268 ],
+      [ 926, 220, 0, 926, 220 ],
+      [ 470, 208, -150, 510, 414 ],
+      [ 778, 641, 150, 993, 942 ],
+      [ 150, 202, -330, 230, 249 ],
+      [ 212, 404, 360, 212, 404 ],
+      [ 270, 451, 210, 458, 525 ],
+      [ 485, 332, 360, 485, 332 ],
+      [ 262, 588, 90, 588, 262 ],
+      [ 220, 173, -330, 276, 259 ],
+      [ 124, 176, -60, 212, 195 ],
+      [ 375, 102, 150, 375, 274 ],
+      [ 898, 454, 330, 1003, 842 ],
+      [ 166, 269, 210, 277, 315 ],
+      [ 876, 381, -330, 948, 767 ],
+      [ 921, 540, 60, 928, 1067 ],
+      [ 891, 742, -240, 1088, 1141 ],
+      [ 674, 337, 60, 628, 751 ],
+      [ 659, 533, -90, 533, 659 ],
+      [ 284, 698, 60, 745, 594 ],
+      [ 339, 22, 240, 187, 303 ],
+      [ 750, 303, 330, 800, 637 ],
+      [ 431, 208, 30, 477, 395 ],
+      [ 388, 332, 300, 480, 502 ],
+      [ 176, 221, -90, 221, 176 ],
+      [ 231, 144, -300, 240, 272 ],
+      [ 824, 43, -330, 734, 448 ],
+      [ 995, 548, 0, 995, 548 ],
+      [ 582, 274, -240, 527, 640 ],
+      [ 953, 486, -300, 897, 1068 ],
+      [ 529, 740, -300, 905, 828 ],
+      [ 340, 535, 0, 340, 535 ],
+      [ 285, 90, 210, 290, 219 ],
+      [ 835, 380, -210, 913, 745 ],
+      [ 719, 512, 0, 719, 512 ],
+      [ 86, 685, 150, 416, 634 ],
+      [ 172, 535, 180, 172, 535 ],
+      [ 222, 512, -30, 447, 554 ],
+      [ 721, 180, 240, 515, 713 ],
+      [ 906, 127, -30, 847, 563 ],
+      [ 997, 523, -60, 950, 1124 ],
+      [ 94, 10, -300, 55, 86 ],
+      [ 617, 223, -210, 645, 500 ],
+      [ 393, 81, 150, 380, 265 ],
+      [ 612, 620, -90, 620, 612 ],
+      [ 100, 684, -180, 100, 684 ],
+      [ 804, 44, 360, 804, 44 ],
+      [ 540, 211, 90, 211, 540 ],
+      [ 1007, 751, 270, 751, 1007 ],
+      [ 815, 663, -360, 815, 663 ],
+      [ 247, 642, 150, 534, 678 ],
+      [ 665, 712, 180, 665, 712 ],
+      [ 771, 407, -360, 771, 407 ],
+      [ 995, 701, -300, 1104, 1211 ],
+      [ 702, 392, 330, 802, 690 ],
+      [ 67, 467, 240, 436, 291 ],
+      [ 343, 301, 270, 301, 343 ],
+      [ 308, 705, -270, 705, 308 ],
+      [ 955, 692, -270, 692, 955 ],
+      [ 817, 535, 360, 817, 535 ],
+      [ 847, 720, 240, 1046, 1092 ],
+      [ 551, 450, 180, 551, 450 ],
+      [ 267, 259, -180, 267, 259 ],
+      [ 279, 237, -240, 344, 358 ],
+      [ 400, 764, 150, 728, 860 ],
+      [ 322, 45, -150, 300, 199 ],
+      [ 131, 302, 150, 264, 326 ],
+      [ 1023, 533, 90, 533, 1023 ],
+      [ 147, 480, 0, 147, 480 ],
+      [ 271, 324, -210, 396, 415 ],
+      [ 255, 192, -270, 192, 255 ],
+      [ 71, 604, 180, 71, 604 ],
+      [ 835, 36, -330, 741, 448 ],
+      [ 93, 245, -90, 245, 93 ],
+      [ 286, 545, -90, 545, 286 ],
+      [ 1000, 17, -60, 513, 874 ],
+      [ 288, 115, 240, 243, 306 ],
+      [ 1000, 114, 0, 1000, 114 ],
+      [ 604, 223, -270, 223, 604 ],
+      [ 106, 427, 60, 422, 304 ],
+      [ 322, 618, 240, 695, 586 ],
+      [ 472, 670, 60, 815, 743 ],
+      [ 197, 528, 120, 555, 433 ],
+      [ 267, 597, 360, 267, 597 ],
+      [ 653, 43, 120, 363, 585 ],
+      [ 9, 25, 150, 19, 25 ],
+      [ 448, 240, 270, 240, 448 ],
+      [ 265, 222, 360, 265, 222 ],
+      [ 792, 674, -180, 792, 674 ],
+      [ 934, 753, 240, 1118, 1184 ],
+      [ 484, 226, 90, 226, 484 ],
+      [ 289, 580, 0, 289, 580 ],
+      [ 900, 727, -240, 1079, 1141 ],
+      [ 533, 159, 360, 533, 159 ],
+      [ 493, 649, -360, 493, 649 ],
+      [ 155, 655, -330, 461, 644 ],
+      [ 863, 223, -90, 223, 863 ],
+      [ 700, 421, 120, 714, 815 ],
+      [ 688, 247, 30, 718, 557 ],
+      [ 973, 179, 0, 973, 179 ],
+      [ 803, 542, 240, 869, 965 ],
+      [ 431, 758, 60, 871, 752 ],
+      [ 952, 665, 0, 952, 665 ],
+      [ 128, 297, 150, 258, 319 ],
+      [ 100, 666, 60, 626, 419 ],
+      [ 129, 14, -60, 75, 118 ],
+      [ 190, 661, 150, 494, 665 ],
+      [ 570, 417, -180, 570, 417 ],
+      [ 221, 165, 60, 253, 273 ],
+      [ 769, 126, 240, 492, 727 ],
+      [ 274, 728, 0, 274, 728 ],
+      [ 80, 282, 0, 80, 282 ],
+      [ 658, 228, -90, 228, 658 ],
+      [ 157, 324, 180, 157, 324 ],
+      [ 892, 399, 90, 399, 892 ],
+      [ 442, 495, 90, 495, 442 ],
+      [ 866, 637, 0, 866, 637 ],
+      [ 561, 296, -360, 561, 296 ],
+      [ 818, 461, -180, 818, 461 ],
+      [ 379, 270, -60, 422, 463 ],
+      [ 178, 475, -120, 499, 391 ],
+      [ 699, 535, 180, 699, 535 ],
+      [ 182, 260, -360, 182, 260 ],
+      [ 551, 378, -30, 665, 602 ],
+      [ 291, 278, 360, 291, 278 ],
+      [ 919, 609, 90, 609, 919 ],
+      [ 541, 490, -60, 693, 713 ],
+      [ 19, 143, 240, 132, 87 ],
+      [ 53, 756, -60, 680, 423 ],
+      [ 305, 272, 210, 399, 387 ],
+      [ 725, 405, -90, 405, 725 ],
+      [ 66, 161, -300, 171, 137 ],
+      [ 807, 297, -60, 659, 846 ],
+      [ 827, 710, 300, 1027, 1071 ],
+      [ 255, 160, -180, 255, 160 ],
+      [ 214, 81, -330, 225, 176 ],
+      [ 833, 487, 150, 964, 837 ],
+      [ 253, 501, 300, 559, 469 ],
+      [ 66, 540, 270, 540, 66 ],
+      [ 494, 1, -210, 427, 246 ],
+      [ 257, 544, 180, 257, 544 ],
+      [ 652, 593, 360, 652, 593 ],
+      [ 737, 430, -120, 739, 852 ],
+      [ 143, 282, -180, 143, 282 ],
+      [ 53, 472, -30, 280, 435 ],
+      [ 333, 633, 60, 714, 604 ],
+      [ 401, 489, -210, 591, 622 ],
+      [ 98, 678, 270, 678, 98 ],
+      [ 1009, 727, 60, 1134, 1236 ],
+      [ 879, 329, 60, 724, 925 ],
+      [ 87, 522, -180, 87, 522 ],
+      [ 858, 243, -330, 864, 638 ],
+      [ 819, 27, 90, 27, 819 ],
+      [ 151, 134, 360, 151, 134 ],
+      [ 429, 174, 60, 365, 458 ],
+      [ 921, 423, -60, 825, 1008 ],
+      [ 496, 724, -330, 791, 874 ],
+      [ 719, 29, 330, 636, 384 ],
+      [ 585, 17, 270, 17, 585 ],
+      [ 147, 676, -150, 464, 657 ],
+      [ 733, 740, 360, 733, 740 ],
+      [ 1020, 615, -150, 1190, 1042 ],
+      [ 48, 461, -120, 422, 271 ],
+      [ 672, 574, 0, 672, 574 ],
+      [ 647, 128, 180, 647, 128 ],
+      [ 227, 50, -150, 220, 155 ],
+      [ 651, 421, -210, 773, 689 ],
+      [ 701, 192, -180, 701, 192 ],
+      [ 631, 631, -150, 861, 860 ],
+      [ 506, 741, -240, 894, 807 ],
+      [ 820, 522, -270, 522, 820 ],
+      [ 805, 519, 330, 956, 851 ],
+      [ 89, 554, 30, 354, 524 ],
+      [ 432, 290, -180, 432, 290 ],
+      [ 953, 7, -60, 481, 828 ],
+      [ 680, 177, 0, 680, 177 ],
+      [ 972, 665, -330, 1173, 1061 ],
+      [ 179, 422, -150, 365, 453 ],
+      [ 448, 127, -270, 127, 448 ],
+      [ 738, 507, -300, 807, 892 ],
+      [ 905, 354, 210, 959, 758 ],
+      [ 10, 189, -30, 102, 169 ],
+      [ 959, 255, -240, 700, 956 ],
+      [ 474, 578, 30, 699, 737 ],
+      [ 755, 524, 30, 915, 831 ],
+      [ 181, 266, 210, 288, 319 ],
+      [ 698, 227, 120, 545, 716 ],
+      [ 751, 361, -240, 688, 829 ],
+      [ 37, 696, -120, 620, 379 ],
+      [ 163, 482, -360, 163, 482 ],
+      [ 252, 392, -30, 413, 465 ],
+      [ 13, 399, 150, 210, 351 ],
+      [ 465, 350, -330, 577, 535 ],
+      [ 631, 706, 240, 925, 898 ],
+      [ 159, 503, 0, 159, 503 ],
+      [ 719, 639, 240, 911, 941 ],
+      [ 491, 394, -270, 394, 491 ],
+      [ 123, 189, 60, 225, 200 ],
+      [ 318, 217, 0, 318, 217 ],
+      [ 682, 338, -270, 338, 682 ],
+      [ 697, 527, 90, 527, 697 ],
+      [ 159, 536, -270, 536, 159 ],
+      [ 896, 116, 90, 116, 896 ],
+      [ 949, 589, 30, 1115, 984 ],
+      [ 748, 708, -240, 986, 1000 ],
+      [ 222, 479, -360, 222, 479 ],
+      [ 50, 78, 30, 82, 92 ],
+      [ 180, 170, 210, 239, 236 ],
+      [ 790, 409, -330, 888, 748 ],
+      [ 280, 152, 0, 280, 152 ],
+      [ 411, 675, -240, 790, 691 ],
+      [ 41, 26, 270, 26, 41 ],
+      [ 202, 698, -360, 202, 698 ],
+      [ 829, 641, 210, 1037, 968 ],
+      [ 348, 433, 150, 517, 547 ],
+      [ 538, 599, -120, 787, 764 ],
+      [ 555, 636, -60, 827, 798 ],
+      [ 73, 2, 120, 38, 63 ],
+      [ 867, 594, -240, 947, 1046 ],
+      [ 925, 36, -90, 36, 925 ],
+      [ 409, 344, -180, 409, 344 ],
+      [ 595, 374, -150, 701, 620 ],
+      [ 470, 525, -210, 669, 688 ],
+      [ 499, 378, -330, 621, 576 ],
+      [ 289, 638, 90, 638, 289 ],
+      [ 1021, 273, -90, 273, 1021 ],
+      [ 343, 689, -210, 641, 767 ],
+      [ 793, 743, -210, 1057, 1038 ],
+      [ 445, 625, 360, 445, 625 ],
+      [ 641, 550, -360, 641, 550 ],
+      [ 16, 89, 0, 16, 89 ],
+      [ 289, 534, 360, 289, 534 ],
+      [ 596, 119, 120, 400, 574 ],
+      [ 808, 493, -270, 493, 808 ],
+      [ 850, 709, 360, 850, 709 ],
+      [ 445, 707, -120, 833, 738 ],
+      [ 838, 195, -210, 822, 586 ],
+      [ 30, 22, -240, 33, 35 ],
+      [ 249, 355, -360, 249, 355 ],
+      [ 235, 68, 150, 237, 175 ],
+      [ 269, 79, 240, 201, 271 ],
+      [ 761, 295, 30, 806, 635 ],
+      [ 726, 742, 150, 999, 1004 ],
+      [ 367, 580, -120, 684, 606 ],
+      [ 512, 449, -180, 512, 449 ],
+      [ 483, 15, -240, 254, 424 ],
+      [ 817, 643, -60, 964, 1028 ],
+      [ 22, 665, -30, 351, 587 ],
+      [ 217, 84, 300, 180, 229 ],
+      [ 221, 260, 360, 221, 260 ],
+      [ 958, 461, -300, 877, 1059 ],
+      [ 788, 263, 0, 788, 263 ],
+      [ 307, 40, -30, 284, 188 ],
+      [ 1007, 315, -210, 1029, 775 ],
+      [ 316, 698, 210, 621, 761 ],
+      [ 569, 292, 240, 536, 637 ],
+      [ 739, 137, 120, 488, 706 ],
+      [ 146, 153, 0, 146, 153 ],
+      [ 605, 315, 90, 315, 605 ],
+      [ 512, 480, 330, 682, 672 ],
+      [ 509, 430, 30, 655, 626 ],
+      [ 610, 253, 300, 522, 654 ],
+      [ 80, 483, 330, 310, 458 ],
+      [ 539, 470, -120, 675, 700 ],
+      [ 747, 707, -180, 747, 707 ],
+      [ 528, 365, 120, 579, 638 ],
+      [ 329, 151, 240, 294, 359 ],
+      [ 987, 260, -360, 987, 260 ],
+      [ 483, 713, -60, 857, 774 ],
+      [ 90, 329, -330, 241, 329 ],
+      [ 43, 710, 90, 710, 43 ],
+      [ 610, 400, 330, 727, 651 ],
+      [ 504, 460, 60, 649, 666 ],
+      [ 450, 96, -240, 307, 436 ],
+      [ 815, 655, -300, 974, 1032 ],
+      [ 63, 283, 60, 276, 195 ],
+      [ 724, 530, 210, 891, 820 ],
+      [ 542, 501, -300, 704, 719 ],
+      [ 563, 95, -360, 563, 95 ],
+      [ 1004, 162, -30, 949, 642 ],
+      [ 36, 194, -90, 194, 36 ],
+      [ 665, 652, 300, 896, 901 ],
+      [ 607, 261, 0, 607, 261 ],
+      [ 169, 598, 90, 598, 169 ],
+      [ 357, 441, 0, 357, 441 ],
+      [ 462, 488, 270, 488, 462 ],
+      [ 29, 263, 30, 156, 242 ],
+      [ 820, 669, -240, 988, 1043 ],
+      [ 934, 323, -150, 969, 746 ],
+      [ 974, 308, 30, 997, 753 ],
+      [ 429, 334, 210, 537, 502 ],
+      [ 830, 65, 90, 65, 830 ],
+      [ 739, 520, 360, 739, 520 ],
+      [ 237, 646, 180, 237, 646 ],
+      [ 885, 145, -120, 567, 838 ],
+      [ 359, 491, 330, 555, 604 ],
+      [ 210, 512, -150, 436, 547 ],
+      [ 767, 359, -240, 694, 842 ],
+      [ 967, 291, 60, 735, 982 ],
+      [ 270, 253, 360, 270, 253 ],
+      [ 813, 574, -60, 902, 991 ],
+      [ 589, 428, 0, 589, 428 ],
+      [ 210, 214, -240, 289, 287 ],
+      [ 179, 391, -360, 179, 391 ],
+      [ 944, 287, -210, 960, 719 ],
+      [ 249, 556, 270, 556, 249 ],
+      [ 204, 713, 0, 204, 713 ],
+      [ 509, 520, 360, 509, 520 ],
+      [ 682, 477, -90, 477, 682 ],
+      [ 262, 679, 150, 565, 717 ],
+      [ 251, 520, -60, 574, 477 ],
+      [ 686, 194, 360, 686, 194 ],
+      [ 182, 351, -180, 182, 351 ],
+      [ 371, 485, 210, 563, 604 ],
+      [ 396, 425, -270, 425, 396 ],
+      [ 614, 611, 270, 611, 614 ],
+      [ 461, 763, 240, 890, 780 ],
+      [ 991, 377, 0, 991, 377 ],
+      [ 974, 120, -300, 590, 903 ],
+      [ 320, 316, 360, 320, 316 ],
+      [ 3, 504, 120, 437, 253 ],
+      [ 451, 251, 300, 441, 515 ],
+      [ 444, 387, -90, 387, 444 ],
+      [ 723, 664, -360, 723, 664 ],
+      [ 498, 193, 30, 527, 415 ],
+      [ 656, 653, -120, 893, 894 ],
+      [ 529, 230, -120, 462, 572 ],
+      [ 329, 205, 240, 341, 386 ],
+      [ 821, 168, 360, 821, 168 ],
+      [ 925, 407, -90, 407, 925 ],
+      [ 909, 409, -330, 991, 808 ],
+      [ 562, 747, -90, 747, 562 ],
+      [ 473, 312, 300, 505, 565 ],
+      [ 852, 85, 180, 852, 85 ],
+      [ 852, 459, 360, 852, 459 ],
+      [ 394, 182, 270, 182, 394 ],
+      [ 750, 579, -270, 579, 750 ],
+      [ 74, 57, -60, 84, 92 ],
+      [ 924, 672, 90, 672, 924 ],
+      [ 910, 597, -270, 597, 910 ],
+      [ 292, 511, 150, 507, 587 ],
+      [ 346, 164, 120, 314, 380 ],
+      [ 734, 518, -330, 894, 815 ],
+      [ 613, 389, -240, 643, 723 ],
+      [ 353, 260, 210, 434, 400 ],
+      [ 349, 555, -360, 349, 555 ],
+      [ 191, 349, 210, 339, 396 ],
+      [ 340, 404, 240, 519, 495 ],
+      [ 762, 329, 150, 823, 664 ],
+      [ 383, 243, 0, 383, 243 ],
+      [ 546, 462, -270, 462, 546 ],
+      [ 229, 721, -90, 721, 229 ],
+      [ 908, 503, -330, 1037, 889 ],
+      [ 977, 194, 30, 943, 656 ],
+      [ 136, 458, 300, 463, 346 ],
+      [ 930, 720, 90, 720, 930 ],
+      [ 943, 95, -330, 863, 553 ],
+      [ 702, 349, 60, 652, 781 ],
+      [ 536, 152, -360, 536, 152 ],
+      [ 243, 439, -120, 500, 429 ],
+      [ 745, 80, 330, 684, 441 ],
+      [ 903, 251, 270, 251, 903 ],
+      [ 256, 164, 30, 303, 269 ],
+      [ 299, 129, 210, 322, 260 ],
+      [ 859, 230, -90, 230, 859 ],
+      [ 742, 160, -150, 721, 509 ],
+      [ 341, 98, -60, 254, 344 ],
+      [ 404, 624, 300, 740, 661 ],
+      [ 1006, 258, -300, 725, 1000 ],
+      [ 1021, 440, 120, 891, 1103 ],
+      [ 336, 230, 180, 336, 230 ],
+      [ 266, 139, -300, 252, 299 ],
+      [ 132, 331, -150, 279, 352 ],
+      [ 669, 554, -30, 855, 814 ],
+      [ 439, 430, 210, 594, 590 ],
+      [ 820, 219, 360, 820, 219 ],
+      [ 112, 474, -300, 465, 333 ],
+      [ 553, 8, 300, 282, 482 ],
+    ];
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
index f211a00..0e43609 100644
--- a/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/SafeMarkupTest.php
@@ -138,7 +138,7 @@ public function testFormat($string, array $args, $expected, $message, $expected_
 
     $result = SafeMarkup::format($string, $args);
     $this->assertEquals($expected, $result, $message);
-    $this->assertEquals($expected_is_safe, SafeMarkup::isSafe($result), 'SafeMarkup::format correctly sets the result as safe or not safe.');
+    $this->assertEquals($expected_is_safe, $result instanceof MarkupInterface, 'SafeMarkup::format correctly sets the result as safe or not safe.');
 
     foreach ($args as $arg) {
       $this->assertSame($arg instanceof SafeMarkupTestMarkup, SafeMarkup::isSafe($arg));
diff --git a/core/tests/Drupal/Tests/Component/Utility/TimerTest.php b/core/tests/Drupal/Tests/Component/Utility/TimerTest.php
index cfb05dd..79e863f 100644
--- a/core/tests/Drupal/Tests/Component/Utility/TimerTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/TimerTest.php
@@ -39,7 +39,7 @@ public function testTimer() {
 
     // Although we sleep for 5 milliseconds, we should test that at least 4 ms
     // have past because usleep() is not reliable on Windows. See
-    // http://php.net/manual/en/function.usleep.php for more information. The
+    // http://php.net/manual/function.usleep.php for more information. The
     // purpose of the test to validate that the Timer class can measure elapsed
     // time not the granularity of usleep() on a particular OS.
     $this->assertGreaterThanOrEqual(4, $value, 'Timer failed to measure at least 4 milliseconds of sleeping while running.');
diff --git a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index e2c8505..59135a9 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -246,7 +246,7 @@ public static function providerTestFilterQueryParameters() {
    */
   public function testParse($url, $expected) {
     $parsed = UrlHelper::parse($url);
-    $this->assertEquals($expected, $parsed, 'The url was not properly parsed.');
+    $this->assertEquals($expected, $parsed, 'The URL was not properly parsed.');
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/ComposerIntegrationTest.php b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
index 4557e94..976606c 100644
--- a/core/tests/Drupal/Tests/ComposerIntegrationTest.php
+++ b/core/tests/Drupal/Tests/ComposerIntegrationTest.php
@@ -49,6 +49,7 @@ protected function getPaths() {
     return [
       $this->root,
       $this->root . '/core',
+      $this->root . '/core/lib/Drupal/Component/Bridge',
       $this->root . '/core/lib/Drupal/Component/Gettext',
       $this->root . '/core/lib/Drupal/Component/Plugin',
       $this->root . '/core/lib/Drupal/Component/ProxyBuilder',
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index 209aa64..0a35eec 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Tests\Core\Asset\CssCollectionGrouperUnitTest.
  */
 
-
 namespace Drupal\Tests\Core\Asset;
 
 use Drupal\Core\Asset\CssCollectionGrouper;
@@ -46,15 +45,15 @@ function testGrouper() {
         'browsers' => array('IE' => TRUE, '!IE' => TRUE),
         'basename' => 'system.base.css',
       ),
-      'system.theme.css' => array(
+      'js.module.css' => array(
         'group' => -100,
         'type' => 'file',
         'weight' => 0.013,
         'media' => 'all',
         'preprocess' => TRUE,
-        'data' => 'core/modules/system/system.theme.css',
+        'data' => 'core/modules/system/js.module.css',
         'browsers' => array('IE' => TRUE, '!IE' => TRUE),
-        'basename' => 'system.theme.css',
+        'basename' => 'js.module.css',
       ),
       'jquery.ui.core.css' => array(
         'group' => -100,
@@ -120,7 +119,7 @@ function testGrouper() {
     $this->assertSame($group['preprocess'], TRUE);
     $this->assertSame(count($group['items']), 3);
     $this->assertContains($css_assets['system.base.css'], $group['items']);
-    $this->assertContains($css_assets['system.theme.css'], $group['items']);
+    $this->assertContains($css_assets['js.module.css'], $group['items']);
 
     // Check group 2.
     $group = $groups[1];
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
index 48a92ee..29011e5 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionRendererUnitTest.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Tests\Core\Asset\CssCollectionRendererUnitTest.
  */
 
-
 namespace {
 
 /**
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 5922bf1..d4cad06 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -5,7 +5,6 @@
  * Contains \Drupal\Tests\Core\Asset\CssOptimizerUnitTest.
  */
 
-
 namespace {
 
 /**
diff --git a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
index b73bec2..c6829ff 100644
--- a/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
+++ b/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Tests\Core\Render\TestCacheableDependency;
 use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Render\Element;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
index 508f39b..cd589f6 100644
--- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php
@@ -854,7 +854,8 @@ public function testDeleteRevision() {
    * @covers ::doDelete
    */
   public function testDelete() {
-    // Dependencies are tested in \Drupal\config\Tests\ConfigDependencyTest.
+    // Dependencies are tested in
+    // \Drupal\Tests\config\Kernel\ConfigDependencyTest.
     $this->configManager->expects($this->any())
       ->method('getConfigEntitiesToChangeOnDependencyRemoval')
       ->willReturn(['update' => [], 'delete' => [], 'unchanged' => []]);
diff --git a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
index 1d8c416..e2fca4b 100644
--- a/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
@@ -12,6 +12,7 @@
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * @coversDefaultClass \Drupal\Core\Controller\TitleResolver
@@ -55,13 +56,7 @@ protected function setUp() {
   public function testStaticTitle() {
     $request = new Request();
     $route = new Route('/test-route', array('_title' => 'static title'));
-
-    $this->translationManager->expects($this->once())
-      ->method('translate')
-      ->with('static title', array(), array())
-      ->will($this->returnValue('translated title'));
-
-    $this->assertEquals('translated title', $this->titleResolver->getTitle($request, $route));
+    $this->assertEquals(new TranslatableMarkup('static title', array(), array(), $this->translationManager), $this->titleResolver->getTitle($request, $route));
   }
 
   /**
@@ -72,13 +67,7 @@ public function testStaticTitle() {
   public function testStaticTitleWithContext() {
     $request = new Request();
     $route = new Route('/test-route', array('_title' => 'static title', '_title_context' => 'context'));
-
-    $this->translationManager->expects($this->once())
-      ->method('translate')
-      ->with('static title', array(), array('context' => 'context'))
-      ->will($this->returnValue('translated title with context'));
-
-    $this->assertEquals('translated title with context', $this->titleResolver->getTitle($request, $route));
+    $this->assertEquals(new TranslatableMarkup('static title', array(), array('context' => 'context'), $this->translationManager), $this->titleResolver->getTitle($request, $route));
   }
 
   /**
@@ -94,20 +83,14 @@ public function testStaticTitleWithParameter($title, $expected_title) {
     $request->attributes->set('_raw_variables', $raw_variables);
 
     $route = new Route('/test-route', array('_title' => $title));
-
-    $this->translationManager->expects($this->once())
-      ->method('translate')
-      ->with($title, $this->logicalOr($this->arrayHasKey('@test'), $this->arrayHasKey('%test'), $this->arrayHasKey('!test')), array())
-      ->will($this->returnValue('static title value'));
-
     $this->assertEquals($expected_title, $this->titleResolver->getTitle($request, $route));
   }
 
   public function providerTestStaticTitleWithParameter() {
+    $translation_manager = $this->getMock('\Drupal\Core\StringTranslation\TranslationInterface');
     return array(
-      array('static title @test', 'static title value'),
-      array('static title !test', 'static title value'),
-      array('static title %test', 'static title value'),
+      array('static title @test', new TranslatableMarkup('static title @test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], array(), $translation_manager)),
+      array('static title %test', new TranslatableMarkup('static title %test', ['@test' => 'value', '%test' => 'value', '@test2' => 'value2', '%test2' => 'value2'], array(), $translation_manager)),
     );
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index 10e9c70..4198231 100644
--- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -8,9 +8,11 @@
 namespace Drupal\Tests\Core\Datetime;
 
 use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Datetime\FormattedDateDiff;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * @coversDefaultClass \Drupal\Core\Datetime\DateFormatter
@@ -96,11 +98,10 @@ protected function setUp() {
   public function testFormatInterval($interval, $granularity, $expected, $langcode = NULL) {
     // Mocks a simple formatPlural implementation.
     $this->stringTranslation->expects($this->any())
-      ->method('formatPlural')
-      ->with($this->anything(), $this->anything(), $this->anything(), array(), array('langcode' => $langcode))
-      ->will($this->returnCallback(function($count, $one, $multiple) {
-        return $count == 1 ? $one : str_replace('@count', $count, $multiple);
-      }));
+      ->method('translateString')
+      ->willReturnCallback(function (TranslatableMarkup $arg) {
+        return $arg->getUntranslatedString();
+      });
 
     // Check if the granularity is specified.
     if ($granularity) {
@@ -110,7 +111,7 @@ public function testFormatInterval($interval, $granularity, $expected, $langcode
       $result = $this->dateFormatter->formatInterval($interval);
     }
 
-    $this->assertEquals($expected, $result);
+    $this->assertEquals(new TranslatableMarkup($expected, [], ['langcode' => $langcode], $this->stringTranslation), $result);
   }
 
   /**
@@ -152,14 +153,8 @@ public function providerTestFormatInterval() {
    * Tests the formatInterval method for 0 second.
    */
   public function testFormatIntervalZeroSecond() {
-    $this->stringTranslation->expects($this->once())
-      ->method('translate')
-      ->with('0 sec', array(), array('langcode' => 'xxx-lolspeak'))
-      ->will($this->returnValue('0 sec'));
-
     $result = $this->dateFormatter->formatInterval(0, 1, 'xxx-lolspeak');
-
-    $this->assertEquals('0 sec', $result);
+    $this->assertEquals(new TranslatableMarkup('0 sec', array(), array('langcode' => 'xxx-lolspeak'), $this->stringTranslation), $result);
   }
 
   /**
@@ -194,11 +189,17 @@ public function testFormatTimeDiffUntil() {
 
     // Mocks the formatDiff function of the dateformatter object.
     $this->dateFormatterStub
-      ->expects($this->any())
+      ->expects($this->at(0))
       ->method('formatDiff')
       ->with($timestamp, $request_time, $options)
       ->will($this->returnValue($expected));
 
+    $this->dateFormatterStub
+      ->expects($this->at(1))
+      ->method('formatDiff')
+      ->with($timestamp, $request_time, $options + ['return_as_object' => TRUE])
+      ->will($this->returnValue(new FormattedDateDiff('1 second', 1)));
+
     $request = Request::createFromGlobals();
     $request->server->set('REQUEST_TIME', $request_time);
     // Mocks a the request stack getting the current request.
@@ -207,6 +208,9 @@ public function testFormatTimeDiffUntil() {
       ->willReturn($request);
 
     $this->assertEquals($expected, $this->dateFormatterStub->formatTimeDiffSince($timestamp, $options));
+    $options['return_as_object'] = TRUE;
+    $expected_object = new FormattedDateDiff('1 second', 1);
+    $this->assertEquals($expected_object, $this->dateFormatterStub->formatTimeDiffSince($timestamp, $options));
   }
 
   /**
@@ -222,11 +226,17 @@ public function testFormatTimeDiffSince() {
 
     // Mocks the formatDiff function of the dateformatter object.
     $this->dateFormatterStub
-      ->expects($this->any())
+      ->expects($this->at(0))
       ->method('formatDiff')
       ->with($request_time, $timestamp, $options)
       ->will($this->returnValue($expected));
 
+    $this->dateFormatterStub
+      ->expects($this->at(1))
+      ->method('formatDiff')
+      ->with($request_time, $timestamp, $options + ['return_as_object' => TRUE])
+      ->will($this->returnValue(new FormattedDateDiff('1 second', 1)));
+
     $request = Request::createFromGlobals();
     $request->server->set('REQUEST_TIME', $request_time);
     // Mocks a the request stack getting the current request.
@@ -235,6 +245,9 @@ public function testFormatTimeDiffSince() {
       ->willReturn($request);
 
     $this->assertEquals($expected, $this->dateFormatterStub->formatTimeDiffUntil($timestamp, $options));
+    $options['return_as_object'] = TRUE;
+    $expected_object = new FormattedDateDiff('1 second', 1);
+    $this->assertEquals($expected_object, $this->dateFormatterStub->formatTimeDiffUntil($timestamp, $options));
   }
 
   /**
@@ -244,25 +257,25 @@ public function testFormatTimeDiffSince() {
    *
    * @covers ::formatDiff
    */
-  public function testformatDiff($expected, $timestamp1, $timestamp2, $options = array()) {
-
-    // Mocks a simple formatPlural implementation.
+  public function testformatDiff($expected, $max_age, $timestamp1, $timestamp2, $options = array()) {
+    // Mocks a simple translateString implementation.
     $this->stringTranslation->expects($this->any())
-      ->method('formatPlural')
-      ->with($this->anything(), $this->anything(), $this->anything(), array(), array('langcode' => isset($options['langcode']) ? $options['langcode'] : NULL))
-      ->will($this->returnCallback(function($count, $one, $multiple) {
-        return $count == 1 ? $one : str_replace('@count', $count, $multiple);
-      }));
+      ->method('translateString')
+      ->willReturnCallback(function (TranslatableMarkup $arg) {
+        return $arg->getUntranslatedString();
+      });
 
-    // Mocks a simple translate implementation.
-    $this->stringTranslation->expects($this->any())
-      ->method('translate')
-      ->with($this->anything())
-      ->will($this->returnCallback(function($string, $args, $options) {
-        return $string;
-      }));
+    if (isset($options['langcode'])) {
+      $expected_markup = new TranslatableMarkup($expected, [], ['langcode' => $options['langcode']], $this->stringTranslation);
+    }
+    else {
+      $expected_markup = new TranslatableMarkup($expected, [], [], $this->stringTranslation);
+    }
+    $this->assertEquals($expected_markup, $this->dateFormatter->formatDiff($timestamp1, $timestamp2, $options));
 
-    $this->assertEquals($expected, $this->dateFormatter->formatDiff($timestamp1, $timestamp2, $options));
+    $options['return_as_object'] = TRUE;
+    $expected_object = new FormattedDateDiff($expected, $max_age);
+    $this->assertEquals($expected_object, $this->dateFormatter->formatDiff($timestamp1, $timestamp2, $options));
   }
 
   /**
@@ -282,103 +295,103 @@ public function providerTestFormatDiff() {
 
     $data = array(
       // Checks for equal timestamps.
-      array('0 seconds', $request_time, $request_time),
+      array('0 seconds', 0, $request_time, $request_time),
 
       // Checks for seconds only.
-      array('1 second', $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
-      array('1 second', $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
-      array('1 second', $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en),
-      array('1 second', $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak),
-      array('2 seconds', $this->createTimestamp('2013-12-11 10:09:06'), $request_time),
-      array('59 seconds', $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
-      array('59 seconds', $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
+      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
+      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time),
+      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_3 + $langcode_en),
+      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:07'), $request_time, $granularity_4 + $langcode_lolspeak),
+      array('2 seconds', 1, $this->createTimestamp('2013-12-11 10:09:06'), $request_time),
+      array('59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
+      array('59 seconds', 1, $this->createTimestamp('2013-12-11 10:08:09'), $request_time),
 
       // Checks for minutes and possibly seconds.
-      array('1 minute', $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
-      array('1 minute', $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
-      array('1 minute 1 second', $this->createTimestamp('2013-12-11 10:08:07'), $request_time),
-      array('1 minute 59 seconds', $this->createTimestamp('2013-12-11 10:07:09'), $request_time),
-      array('2 minutes', $this->createTimestamp('2013-12-11 10:07:08'), $request_time),
-      array('2 minutes 1 second', $this->createTimestamp('2013-12-11 10:07:07'), $request_time),
-      array('2 minutes 2 seconds', $this->createTimestamp('2013-12-11 10:07:06'), $request_time),
-      array('2 minutes 2 seconds', $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3),
-      array('2 minutes 2 seconds', $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4),
-      array('30 minutes', $this->createTimestamp('2013-12-11 09:39:08'), $request_time),
-      array('59 minutes 59 seconds', $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
-      array('59 minutes 59 seconds', $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
+      array('1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
+      array('1 minute', 60, $this->createTimestamp('2013-12-11 10:08:08'), $request_time),
+      array('1 minute 1 second', 1, $this->createTimestamp('2013-12-11 10:08:07'), $request_time),
+      array('1 minute 59 seconds', 1, $this->createTimestamp('2013-12-11 10:07:09'), $request_time),
+      array('2 minutes', 60, $this->createTimestamp('2013-12-11 10:07:08'), $request_time),
+      array('2 minutes 1 second', 1, $this->createTimestamp('2013-12-11 10:07:07'), $request_time),
+      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time),
+      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_3),
+      array('2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-11 10:07:06'), $request_time, $granularity_4),
+      array('30 minutes', 60, $this->createTimestamp('2013-12-11 09:39:08'), $request_time),
+      array('59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
+      array('59 minutes 59 seconds', 1, $this->createTimestamp('2013-12-11 09:09:09'), $request_time),
 
       // Checks for hours and possibly minutes or seconds.
-      array('1 hour', $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
-      array('1 hour', $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
-      array('1 hour', $this->createTimestamp('2013-12-11 09:09:07'), $request_time),
-      array('1 hour', $this->createTimestamp('2013-12-11 09:09:06'), $request_time),
-      array('1 hour 1 minute', $this->createTimestamp('2013-12-11 09:08:08'), $request_time),
-      array('1 hour 1 minute 1 second', $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3),
-      array('1 hour 1 minute 2 seconds', $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4),
-      array('1 hour 30 minutes', $this->createTimestamp('2013-12-11 08:39:08'), $request_time),
-      array('2 hours', $this->createTimestamp('2013-12-11 08:09:08'), $request_time),
-      array('23 hours 59 minutes', $this->createTimestamp('2013-12-10 10:10:08'), $request_time),
+      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
+      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:08'), $request_time),
+      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:07'), $request_time),
+      array('1 hour', 3600, $this->createTimestamp('2013-12-11 09:09:06'), $request_time),
+      array('1 hour 1 minute', 60, $this->createTimestamp('2013-12-11 09:08:08'), $request_time),
+      array('1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-11 09:08:07'), $request_time, $granularity_3),
+      array('1 hour 1 minute 2 seconds', 1, $this->createTimestamp('2013-12-11 09:08:06'), $request_time, $granularity_4),
+      array('1 hour 30 minutes', 60, $this->createTimestamp('2013-12-11 08:39:08'), $request_time),
+      array('2 hours', 3600, $this->createTimestamp('2013-12-11 08:09:08'), $request_time),
+      array('23 hours 59 minutes', 60, $this->createTimestamp('2013-12-10 10:10:08'), $request_time),
 
       // Checks for days and possibly hours, minutes or seconds.
-      array('1 day', $this->createTimestamp('2013-12-10 10:09:08'), $request_time),
-      array('1 day', $this->createTimestamp('2013-12-10 10:09:07'), $request_time),
-      array('1 day 1 hour', $this->createTimestamp('2013-12-10 09:09:08'), $request_time),
-      array('1 day 1 hour 1 minute', $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en),
-      array('1 day 1 hour 1 minute 1 second', $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak),
-      array('1 day 2 hours 2 minutes 2 seconds', $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4),
-      array('2 days', $this->createTimestamp('2013-12-09 10:09:08'), $request_time),
-      array('2 days', $this->createTimestamp('2013-12-09 10:07:08'), $request_time),
-      array('2 days 2 hours', $this->createTimestamp('2013-12-09 08:09:08'), $request_time),
-      array('2 days 2 hours 2 minutes', $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en),
-      array('2 days 2 hours 2 minutes 2 seconds', $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak),
+      array('1 day', 86400, $this->createTimestamp('2013-12-10 10:09:08'), $request_time),
+      array('1 day', 86400, $this->createTimestamp('2013-12-10 10:09:07'), $request_time),
+      array('1 day 1 hour', 3600, $this->createTimestamp('2013-12-10 09:09:08'), $request_time),
+      array('1 day 1 hour 1 minute', 60, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_3 + $langcode_en),
+      array('1 day 1 hour 1 minute 1 second', 1, $this->createTimestamp('2013-12-10 09:08:07'), $request_time, $granularity_4 + $langcode_lolspeak),
+      array('1 day 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-10 08:07:06'), $request_time, $granularity_4),
+      array('2 days', 86400, $this->createTimestamp('2013-12-09 10:09:08'), $request_time),
+      array('2 days', 86400, $this->createTimestamp('2013-12-09 10:07:08'), $request_time),
+      array('2 days 2 hours', 3600, $this->createTimestamp('2013-12-09 08:09:08'), $request_time),
+      array('2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_3 + $langcode_en),
+      array('2 days 2 hours 2 minutes 2 seconds', 1, $this->createTimestamp('2013-12-09 08:07:06'), $request_time, $granularity_4 + $langcode_lolspeak),
 
       // Checks for weeks and possibly days, hours, minutes or seconds.
-      array('1 week', $this->createTimestamp('2013-12-04 10:09:08'), $request_time),
-      array('1 week 1 day', $this->createTimestamp('2013-12-03 10:09:08'), $request_time),
-      array('2 weeks', $this->createTimestamp('2013-11-27 10:09:08'), $request_time),
-      array('2 weeks 2 days', $this->createTimestamp('2013-11-25 08:07:08'), $request_time),
-      array('2 weeks 2 days 2 hours 2 minutes', $this->createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4),
-      array('4 weeks', $this->createTimestamp('2013-11-13 10:09:08'), $request_time),
-      array('4 weeks 1 day', $this->createTimestamp('2013-11-12 10:09:08'), $request_time),
+      array('1 week', 7 * 86400, $this->createTimestamp('2013-12-04 10:09:08'), $request_time),
+      array('1 week 1 day', 86400, $this->createTimestamp('2013-12-03 10:09:08'), $request_time),
+      array('2 weeks', 7 * 86400, $this->createTimestamp('2013-11-27 10:09:08'), $request_time),
+      array('2 weeks 2 days', 86400, $this->createTimestamp('2013-11-25 08:07:08'), $request_time),
+      array('2 weeks 2 days 2 hours 2 minutes', 60, $this->createTimestamp('2013-11-25 08:07:08'), $request_time, $granularity_4),
+      array('4 weeks', 7 * 86400, $this->createTimestamp('2013-11-13 10:09:08'), $request_time),
+      array('4 weeks 1 day', 86400, $this->createTimestamp('2013-11-12 10:09:08'), $request_time),
 
       // Checks for months and possibly days, hours, minutes or seconds.
-      array('1 month', $this->createTimestamp('2013-11-11 10:09:08'), $request_time),
-      array('1 month', $this->createTimestamp('2013-11-11 10:09:07'), $request_time),
-      array('1 month', $this->createTimestamp('2013-11-11 09:09:08'), $request_time),
-      array('1 month', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3),
-      array('1 month', $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4),
-      array('1 month 4 weeks', $this->createTimestamp('2013-10-13 10:09:08'), $request_time),
-      array('1 month 4 weeks 1 day', $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3),
-      array('1 month 4 weeks', $this->createTimestamp('2013-10-12 10:09:08'), $request_time),
-      array('1 month 4 weeks 2 days', $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3),
-      array('2 months', $this->createTimestamp('2013-10-11 10:09:08'), $request_time),
-      array('2 months', $this->createTimestamp('2013-10-10 10:09:08'), $request_time),
-      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time),
-      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 months', $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4),
-      array('6 months', $this->createTimestamp('2013-06-09 10:09:08'), $request_time),
-      array('11 months', $this->createTimestamp('2013-01-11 07:09:08'), $request_time),
-      array('11 months 4 weeks', $this->createTimestamp('2012-12-12 10:09:08'), $request_time),
-      array('11 months 4 weeks 2 days', $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3),
+      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:08'), $request_time),
+      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 10:09:07'), $request_time),
+      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:09:08'), $request_time),
+      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_3),
+      array('1 month', 30 * 86400, $this->createTimestamp('2013-11-11 09:08:07'), $request_time, $granularity_4),
+      array('1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time),
+      array('1 month 4 weeks 1 day', 86400, $this->createTimestamp('2013-10-13 10:09:08'), $request_time, $granularity_3),
+      array('1 month 4 weeks', 7 * 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time),
+      array('1 month 4 weeks 2 days', 86400, $this->createTimestamp('2013-10-12 10:09:08'), $request_time, $granularity_3),
+      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-11 10:09:08'), $request_time),
+      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-10 10:09:08'), $request_time),
+      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time),
+      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_3),
+      array('2 months', 30 * 86400, $this->createTimestamp('2013-10-09 08:07:06'), $request_time, $granularity_4),
+      array('6 months', 30 * 86400, $this->createTimestamp('2013-06-09 10:09:08'), $request_time),
+      array('11 months', 30 * 86400, $this->createTimestamp('2013-01-11 07:09:08'), $request_time),
+      array('11 months 4 weeks', 7 * 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time),
+      array('11 months 4 weeks 2 days', 86400, $this->createTimestamp('2012-12-12 10:09:08'), $request_time, $granularity_3),
 
       // Checks for years and possibly months, days, hours, minutes or seconds.
-      array('1 year', $this->createTimestamp('2012-12-11 10:09:08'), $request_time),
-      array('1 year', $this->createTimestamp('2012-12-11 10:08:08'), $request_time),
-      array('1 year', $this->createTimestamp('2012-12-10 10:09:08'), $request_time),
-      array('2 years', $this->createTimestamp('2011-12-11 10:09:08'), $request_time),
-      array('2 years', $this->createTimestamp('2011-12-11 10:07:08'), $request_time),
-      array('2 years', $this->createTimestamp('2011-12-09 10:09:08'), $request_time),
-      array('2 years 2 months', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3),
-      array('2 years 2 months', $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4),
-      array('10 years', $this->createTimestamp('2003-12-11 10:09:08'), $request_time),
-      array('100 years', $this->createTimestamp('1913-12-11 10:09:08'), $request_time),
+      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:09:08'), $request_time),
+      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-11 10:08:08'), $request_time),
+      array('1 year', 365 * 86400, $this->createTimestamp('2012-12-10 10:09:08'), $request_time),
+      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:09:08'), $request_time),
+      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-11 10:07:08'), $request_time),
+      array('2 years', 365 * 86400, $this->createTimestamp('2011-12-09 10:09:08'), $request_time),
+      array('2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_3),
+      array('2 years 2 months', 30 * 86400, $this->createTimestamp('2011-10-09 08:07:06'), $request_time, $granularity_4),
+      array('10 years', 365 * 86400, $this->createTimestamp('2003-12-11 10:09:08'), $request_time),
+      array('100 years', 365 * 86400, $this->createTimestamp('1913-12-11 10:09:08'), $request_time),
 
       // Checks the non-strict option vs. strict (default).
-      array('1 second', $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07'), $non_strict),
-      array('0 seconds', $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07')),
+      array('1 second', 1, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07'), $non_strict),
+      array('0 seconds', 0, $this->createTimestamp('2013-12-11 10:09:08'), $this->createTimestamp('2013-12-11 10:09:07')),
 
       // Checks granularity limit.
-      array('2 years 3 months 1 week', $this->createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3),
+      array('2 years 3 months 1 week', 7 * 86400, $this->createTimestamp('2011-08-30 11:15:57'), $request_time, $granularity_3),
     );
 
     return $data;
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
index 2efb13f..ee13b93 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/BackendCompilerPassTest.php
@@ -72,7 +72,8 @@ public function providerTestProcess() {
 
     // Configure a manual alias for the service, so ensure that it is not
     // overridden by the default backend.
-    $container = clone $container;
+    $container = $this->getMysqlContainer($service);
+    $container->setParameter('default_backend', 'mysql');
     $container->setDefinition('mariadb.service', new Definition($prefix . 'MariaDb'));
     $container->setAlias('service', new Alias('mariadb.service'));
     $data[] = array($prefix . 'MariaDb', $container);
diff --git a/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
new file mode 100644
index 0000000..fc3bf6f
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\Tests\Core\Enhancer\EntityRevisionRouteEnhancerTest.
+ */
+
+namespace Drupal\Tests\Core\Enhancer;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
+ * @group Entity
+ */
+class EntityRevisionRouteEnhancerTest extends UnitTestCase {
+
+  /**
+   * @var \Drupal\entity\RouteEnhancer\EntityRevisionRouteEnhancer
+   */
+  protected $routeEnhancer;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->routeEnhancer = new EntityRevisionRouteEnhancer();
+  }
+
+  /**
+   * @covers ::applies
+   * @dataProvider providerTestApplies
+   */
+  public function testApplies(Route $route, $expected) {
+    $this->assertEquals($expected, $this->routeEnhancer->applies($route));
+  }
+
+  public function providerTestApplies() {
+    $data = [];
+    $data['no-parameter'] = [new Route('/test-path'), FALSE];
+    $data['none-revision-parameters'] = [new Route('/test-path/{entity_test}', [], [], ['parameters' => ['entity_test' => ['type' => 'entity:entity_test']]]), FALSE];
+    $data['with-revision-parameter'] = [new Route('/test-path/{entity_test_revision}', [], [], ['parameters' => ['entity_test_revision' => ['type' => 'entity_revision:entity_test']]]), TRUE];
+
+    return $data;
+  }
+
+  /**
+   * @covers ::enhance
+   */
+  public function testEnhanceWithoutEntityRevision() {
+    $route = new Route('/test-path/{entity_test}', [], [], ['parameters' => ['entity_test' => ['type' => 'entity:entity_test']]]);
+    $request = Request::create('/test-path/123');
+    $entity = $this->prophesize(EntityInterface::class);
+
+    $defaults = [];
+    $defaults['entity_test'] = $entity->reveal();
+    $defaults[RouteObjectInterface::ROUTE_OBJECT] = $route;
+    $this->assertEquals($defaults, $this->routeEnhancer->enhance($defaults, $request));
+  }
+
+  /**
+   * @covers ::enhance
+   */
+  public function testEnhanceWithEntityRevision() {
+    $route = new Route('/test-path/{entity_test_revision}', [], [], ['parameters' => ['entity_test_revision' => ['type' => 'entity_revision:entity_test']]]);
+    $request = Request::create('/test-path/123');
+    $entity = $this->prophesize(EntityInterface::class);
+
+    $defaults = [];
+    $defaults['entity_test_revision'] = $entity->reveal();
+    $defaults[RouteObjectInterface::ROUTE_OBJECT] = $route;
+
+    $expected = $defaults;
+    $expected['_entity_revision'] = $defaults['entity_test_revision'];
+    $this->assertEquals($expected, $this->routeEnhancer->enhance($defaults, $request));
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index 810bdd1..30bd12c 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -8,8 +8,14 @@
 namespace Drupal\Tests\Core\Entity;
 
 use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityType;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\FormState;
+use Drupal\Core\Routing\RouteMatch;
 use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Routing\Route;
 
 /**
  * @coversDefaultClass \Drupal\Core\Entity\EntityForm
@@ -25,12 +31,20 @@ class EntityFormTest extends UnitTestCase {
   protected $entityForm;
 
   /**
+   * A fake entity type used in the test.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface
+   */
+  protected $entityType;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
 
     $this->entityForm = new EntityForm();
+    $this->entityType = new EntityType(['id' => 'entity_test']);
   }
 
   /**
@@ -41,17 +55,13 @@ protected function setUp() {
    * @dataProvider providerTestFormIds
    */
   public function testFormId($expected, $definition) {
-    $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $entity_type->expects($this->any())
-      ->method('hasKey')
-      ->with('bundle')
-      ->will($this->returnValue($definition['bundle']));
+    $this->entityType->set('entity_keys', ['bundle' => $definition['bundle']]);
 
     $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\Entity', array(array(), $definition['entity_type']), '', TRUE, TRUE, TRUE, array('getEntityType', 'bundle'));
 
     $entity->expects($this->any())
       ->method('getEntityType')
-      ->will($this->returnValue($entity_type));
+      ->will($this->returnValue($this->entityType));
     $entity->expects($this->any())
       ->method('bundle')
       ->will($this->returnValue($definition['bundle']));
@@ -123,4 +133,115 @@ public function testCopyFormValuesToEntity() {
     $this->assertNull($result->get('key_controlled_by_plugin_collection'));
   }
 
+  /**
+   * Tests EntityForm::getEntityFromRouteMatch() for edit and delete forms.
+   *
+   * @covers ::getEntityFromRouteMatch
+   */
+  public function testGetEntityFromRouteMatchEditDelete() {
+    $entity = $this->prophesize(EntityInterface::class)->reveal();
+    $id = $this->entityType->id();
+    $route_match = new RouteMatch(
+      'test_route',
+      new Route('/entity-test/manage/{' . $id . '}/edit'),
+      [$id => $entity],
+      [$id => 1]
+    );
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $id);
+    $this->assertEquals($entity, $actual);
+  }
+
+  /**
+   * Tests EntityForm::getEntityFromRouteMatch() for add forms without a bundle.
+   *
+   * @covers ::getEntityFromRouteMatch
+   */
+  public function testGetEntityFromRouteMatchAdd() {
+    $entity = $this->prophesize(EntityInterface::class)->reveal();
+    $this->setUpStorage()->create([])->willReturn($entity);
+    $route_match = new RouteMatch('test_route', new Route('/entity-test/add'));
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $this->entityType->id());
+    $this->assertEquals($entity, $actual);
+  }
+
+  /**
+   * Tests EntityForm::getEntityFromRouteMatch() with a static bundle.
+   *
+   * @covers ::getEntityFromRouteMatch
+   */
+  public function testGetEntityFromRouteMatchAddStatic() {
+    $entity = $this->prophesize(EntityInterface::class)->reveal();
+    $bundle_key = 'bundle';
+    $bundle = 'test_bundle';
+    $this->entityType->set('entity_keys', ['bundle' => $bundle_key]);
+    $storage = $this->setUpStorage();
+
+    // Test without a bundle parameter in the route.
+    $storage->create([])->willReturn($entity);
+    $route_match = new RouteMatch('test_route', new Route('/entity-test/add'));
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $this->entityType->id());
+    $this->assertEquals($entity, $actual);
+
+    // Test with a static bundle parameter.
+    $storage->create([$bundle_key => 'test_bundle'])->willReturn($entity);
+    $route_match = new RouteMatch(
+      'test_route',
+      new Route('/entity-test/add/{' . $bundle_key . '}'),
+      [$bundle_key => $bundle],
+      [$bundle_key => $bundle]
+    );
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $this->entityType->id());
+    $this->assertEquals($entity, $actual);
+  }
+
+  /**
+   * Tests EntityForm::getEntityFromRouteMatch() with a config entity bundle.
+   *
+   * @covers ::getEntityFromRouteMatch
+   */
+  public function testGetEntityFromRouteMatchAddEntity() {
+    $entity = $this->prophesize(EntityInterface::class)->reveal();
+    $bundle_entity_type_id = 'entity_test_bundle';
+    $bundle = 'test_entity_bundle';
+    $this->entityType->set('bundle_entity_type', $bundle_entity_type_id);
+    $storage = $this->setUpStorage();
+
+    // Test without a bundle parameter in the route.
+    $storage->create([])->willReturn($entity);
+    $route_match = new RouteMatch('test_route', new Route('/entity-test/add'));
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $this->entityType->id());
+    $this->assertEquals($entity, $actual);
+
+    // Test with an entity bundle parameter.
+    $storage->create(['bundle' => $bundle])->willReturn($entity);
+    $bundle_entity = $this->prophesize(EntityInterface::class);
+    $bundle_entity->id()->willReturn('test_entity_bundle');
+    $route_match = new RouteMatch(
+      'test_route',
+      new Route('/entity-test/add/{entity_test_bundle}'),
+      [$bundle_entity_type_id => $bundle_entity->reveal()],
+      [$bundle_entity_type_id => $bundle]
+    );
+    $actual = $this->entityForm->getEntityFromRouteMatch($route_match, $this->entityType->id());
+    $this->assertEquals($entity, $actual);
+  }
+
+  /**
+   * Sets up the storage accessed via the entity type manager in the form.
+   *
+   * @return \Prophecy\Prophecy\ObjectProphecy
+   *   The storage prophecy.
+   */
+  protected function setUpStorage() {
+    $storage = $this->prophesize(EntityStorageInterface::class);
+
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+    $entity_type_manager->getDefinition($this->entityType->id())->willReturn($this->entityType);
+    $entity_type_manager->getStorage($this->entityType->id())->willReturn($storage->reveal());
+
+    $this->entityForm->setEntityTypeManager($entity_type_manager->reveal());
+
+    return $storage;
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index ec66c7a..9657827 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -14,7 +14,6 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityTypeRepositoryInterface;
 use Drupal\Tests\UnitTestCase;
-use Prophecy\Argument;
 
 /**
  * @coversDefaultClass \Drupal\Core\Entity\EntityManager
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index 6fa1f9c..41dccee 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -311,15 +310,7 @@ public function testGetGroupLabel() {
     $this->assertSame($default_label, $entity_type->getGroupLabel());
 
     $default_label = new TranslatableMarkup('Other', array(), array('context' => 'Entity type group'));
-    $entity_type = $this->setUpEntityType([]);
-
-    $string_translation = $this->getMock(TranslationInterface::class);
-    $string_translation->expects($this->atLeastOnce())
-      ->method('translate')
-      ->with('Other', array(), array('context' => 'Entity type group'))
-      ->willReturn($default_label);
-    $entity_type->setStringTranslation($string_translation);
-
+    $entity_type = $this->setUpEntityType(array('group_label' => $default_label));
     $this->assertSame($default_label, $entity_type->getGroupLabel());
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index 3f1e2e0..4df1fcc 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -10,9 +10,7 @@
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\Entity;
 use Drupal\Core\Language\Language;
-use Drupal\entity_test\Entity\EntityTestMul;
 use Drupal\Tests\UnitTestCase;
 
 /**
diff --git a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
index cdfd0f2..54393d4 100644
--- a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php
@@ -7,13 +7,16 @@
 
 namespace Drupal\Tests\Core\Entity\Routing;
 
-use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Argument;
+use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Routing\Route;
 
 /**
@@ -23,78 +26,199 @@
 class DefaultHtmlRouteProviderTest extends UnitTestCase {
 
   /**
-   * @covers ::getEntityTypeIdKeyType
+   * The entity type manager prophecy used in the test.
+   *
+   * @var \Prophecy\Prophecy\ProphecyInterface|\Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  public function testGetEntityTypeIdKeyType() {
-    $entity_manager = $this->prophesize(EntityManagerInterface::class);
-    $route_provider = new TestDefaultHtmlRouteProvider($entity_manager->reveal());
+  protected $entityTypeManager;
 
-    $entity_type = $this->prophesize(EntityTypeInterface::class);
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
-    $entity_type_id = 'the_entity_type_id';
-    $entity_type->id()->willReturn($entity_type_id);
-    $entity_type->getKey('id')->willReturn('id');
+  /**
+   * The entity field manager prophecy used in the test.
+   *
+   * @var \Prophecy\Prophecy\ProphecyInterface|\Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
 
-    $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
-    $field_storage_definition->getType()->willReturn('integer');
-    $entity_manager->getFieldStorageDefinitions($entity_type_id)->willReturn(['id' => $field_storage_definition]);
+  /**
+   * The HTML route provider used in the test.
+   *
+   * @var \Drupal\Tests\Core\Entity\Routing\TestDefaultHtmlRouteProvider
+   */
+  protected $routeProvider;
 
-    $type = $route_provider->getEntityTypeIdKeyType($entity_type->reveal());
-    $this->assertSame('integer', $type);
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
+    $this->entityFieldManager = $this->prophesize(EntityFieldManagerInterface::class);
+
+    $this->routeProvider = new TestDefaultHtmlRouteProvider($this->entityTypeManager->reveal(), $this->entityFieldManager->reveal());
   }
 
   /**
-   * @covers ::getEntityTypeIdKeyType
+   * @covers ::getAddPageRoute
+   * @dataProvider providerTestGetAddPageRoute
    */
-  public function testGetEntityTypeIdKeyTypeNotFieldable() {
-    $entity_manager = $this->prophesize(EntityManagerInterface::class);
-    $route_provider = new TestDefaultHtmlRouteProvider($entity_manager->reveal());
+  public function testGetAddPageRoute(Route $expected = NULL, EntityTypeInterface $entity_type) {
+    $route = $this->routeProvider->getAddPageRoute($entity_type);
+    $this->assertEquals($expected, $route);
+  }
 
-    $entity_type = $this->prophesize(EntityTypeInterface::class);
-    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
-    $entity_manager->getFieldStorageDefinitions(Argument::any())->shouldNotBeCalled();
+  public function providerTestGetAddPageRoute() {
+    $data = [];
 
-    $type = $route_provider->getEntityTypeIdKeyType($entity_type->reveal());
-    $this->assertNull($type);
+    $entity_type1 = $this->getEntityType();
+    $entity_type1->hasLinkTemplate('add-page')->willReturn(FALSE);
+    $data['no_add_page_link_template'] = [NULL, $entity_type1->reveal()];
+
+    $entity_type2 = $this->getEntityType();
+    $entity_type2->hasLinkTemplate('add-page')->willReturn(TRUE);
+    $entity_type2->getKey('bundle')->willReturn(NULL);
+    $data['no_bundle'] = [NULL, $entity_type2->reveal()];
+
+    $entity_type3 = $this->getEntityType();
+    $entity_type3->hasLinkTemplate('add-page')->willReturn(TRUE);
+    $entity_type3->getLinkTemplate('add-page')->willReturn('/the/add/page/link/template');
+    $entity_type3->id()->willReturn('the_entity_type_id');
+    $entity_type3->getKey('bundle')->willReturn('type');
+    $route = new Route('/the/add/page/link/template');
+    $route->setDefaults([
+      '_controller' => 'Drupal\Core\Entity\Controller\EntityController::addPage',
+      '_title_callback' => 'Drupal\Core\Entity\Controller\EntityController::addTitle',
+      'entity_type_id' => 'the_entity_type_id',
+    ]);
+    $route->setRequirement('_entity_create_access', 'the_entity_type_id');
+    $data['add_page'] = [clone $route, $entity_type3->reveal()];
+
+    return $data;
+  }
+
+  /**
+   * @covers ::getAddFormRoute
+   * @dataProvider providerTestGetAddFormRoute
+   */
+  public function testGetAddFormRoute(Route $expected = NULL, EntityTypeInterface $entity_type, EntityTypeInterface $bundle_entity_type = NULL, FieldStorageDefinitionInterface $field_storage_definition = NULL) {
+    if ($bundle_entity_type) {
+      $this->entityTypeManager->getDefinition('the_bundle_entity_type_id')->willReturn($bundle_entity_type);
+
+      if ($field_storage_definition) {
+        $this->entityFieldManager->getFieldStorageDefinitions('the_bundle_entity_type_id')
+          ->willReturn(['id' => $field_storage_definition]);
+      }
+    }
+
+    $route = $this->routeProvider->getAddFormRoute($entity_type);
+    $this->assertEquals($expected, $route);
+  }
+
+  public function providerTestGetAddFormRoute() {
+    $data = [];
+
+    $entity_type1 = $this->getEntityType();
+    $entity_type1->hasLinkTemplate('add-form')->willReturn(FALSE);
+    $data['no_add_form_link_template'] = [NULL, $entity_type1->reveal()];
+
+    $entity_type2 = $this->getEntityType();
+    $entity_type2->hasLinkTemplate('add-form')->willReturn(TRUE);
+    $entity_type2->id()->willReturn('the_entity_type_id');
+    $entity_type2->getLinkTemplate('add-form')->willReturn('/the/add/form/link/template');
+    $entity_type2->getFormClass('add')->willReturn(NULL);
+    $entity_type2->getKey('bundle')->willReturn(NULL);
+    $route = (new Route('/the/add/form/link/template'))
+      ->setDefaults([
+        '_entity_form' => 'the_entity_type_id.default',
+        'entity_type_id' => 'the_entity_type_id',
+        '_title_callback' => 'Drupal\Core\Entity\Controller\EntityController::addTitle',
+      ])
+      ->setRequirement('_entity_create_access', 'the_entity_type_id')
+    ;
+    $data['no_add_form_no_bundle'] = [clone $route, $entity_type2->reveal()];
+
+    $entity_type3 = $this->getEntityType($entity_type2);
+    $entity_type3->getFormClass('add')->willReturn('Drupal\Core\Entity\EntityForm');
+    $route->setDefault('_entity_form', 'the_entity_type_id.add');
+    $data['add_form_no_bundle'] = [clone $route, $entity_type3->reveal()];
+
+    $entity_type4 = $this->getEntityType($entity_type3);
+    $entity_type4->getKey('bundle')->willReturn('the_bundle_key');
+    $entity_type4->getBundleEntityType()->willReturn(NULL);
+    $route
+      ->setDefault('_title_callback', 'Drupal\Core\Entity\Controller\EntityController::addBundleTitle')
+      ->setDefault('bundle_parameter', 'the_bundle_key')
+      ->setRequirement('_entity_create_access', 'the_entity_type_id:the_bundle_key');
+    $data['add_form_bundle_static'] = [clone $route, $entity_type4->reveal()];
+
+    $entity_type5 = $this->getEntityType($entity_type4);
+    $entity_type5->getBundleEntityType()->willReturn('the_bundle_entity_type_id');
+    $bundle_entity_type = $this->getEntityType();
+    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $route
+      ->setDefault('bundle_parameter', 'the_bundle_entity_type_id')
+      ->setRequirement('_entity_create_access', 'the_entity_type_id:the_bundle_entity_type_id')
+      ->setOption('parameters', ['the_bundle_entity_type_id' => [
+        'type' => 'entity:the_bundle_entity_type_id',
+      ]]);
+    $data['add_form_bundle_entity_id_key_type_null'] = [clone $route, $entity_type5->reveal(), $bundle_entity_type->reveal()];
+
+    $entity_type6 = $this->getEntityType($entity_type5);
+    $bundle_entity_type = $this->getEntityType();
+    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
+    $field_storage_definition->getType()->willReturn('integer');
+    $route->setRequirement('the_entity_type_id', '\d+');
+    $data['add_form_bundle_entity_id_key_type_integer'] = [clone $route, $entity_type6->reveal(), $bundle_entity_type->reveal(), $field_storage_definition->reveal()];
+
+    $entity_type7 = $this->getEntityType($entity_type6);
+    $bundle_entity_type = $this->prophesize(ConfigEntityTypeInterface::class);
+    $bundle_entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
+    $route
+      // Unset the 'the_entity_type_id' requirement.
+      ->setRequirements(['_entity_create_access' => $route->getRequirement('_entity_create_access')])
+      ->setOption('parameters', ['the_bundle_entity_type_id' => [
+      'type' => 'entity:the_bundle_entity_type_id',
+      'with_config_overrides' => TRUE,
+    ]]);
+    $data['add_form_bundle_entity_id_key_type_integer'] = [clone $route, $entity_type7->reveal(), $bundle_entity_type->reveal(), $field_storage_definition->reveal()];
+
+    return $data;
   }
 
   /**
    * @covers ::getCanonicalRoute
    * @dataProvider providerTestGetCanonicalRoute
    */
-  public function testGetCanonicalRoute($entity_type_prophecy, $expected, $field_storage_definition = NULL) {
-    $entity_manager = $this->prophesize(EntityManagerInterface::class);
-    $route_provider = new TestDefaultHtmlRouteProvider($entity_manager->reveal());
-    $entity_type = $entity_type_prophecy->reveal();
-
+  public function testGetCanonicalRoute(Route $expected = NULL, EntityTypeInterface $entity_type, FieldStorageDefinitionInterface $field_storage_definition = NULL) {
     if ($field_storage_definition) {
-      $entity_manager->getFieldStorageDefinitions($entity_type->id())
+      $this->entityFieldManager->getFieldStorageDefinitions($entity_type->id())
         ->willReturn([$entity_type->getKey('id') => $field_storage_definition]);
     }
 
-    $route = $route_provider->getCanonicalRoute($entity_type);
+    $route = $this->routeProvider->getCanonicalRoute($entity_type);
     $this->assertEquals($expected, $route);
   }
 
   public function providerTestGetCanonicalRoute() {
     $data = [];
 
-    $entity_type1 = $this->prophesize(EntityTypeInterface::class);
+    $entity_type1 = $this->getEntityType();
     $entity_type1->hasLinkTemplate('canonical')->willReturn(FALSE);
-    $data['no_canonical_link_template'] = [$entity_type1, NULL];
+    $data['no_canonical_link_template'] = [NULL, $entity_type1->reveal()];
 
-    $entity_type2 = $this->prophesize(EntityTypeInterface::class);
+    $entity_type2 = $this->getEntityType();;
     $entity_type2->hasLinkTemplate('canonical')->willReturn(TRUE);
     $entity_type2->hasViewBuilderClass()->willReturn(FALSE);
-    $data['no_view_builder'] = [$entity_type2, NULL];
+    $data['no_view_builder'] = [NULL, $entity_type2->reveal()];
 
-    $entity_type3 = $this->prophesize(EntityTypeInterface::class);
-    $entity_type3->hasLinkTemplate('canonical')->willReturn(TRUE);
+    $entity_type3 = $this->getEntityType($entity_type2);
     $entity_type3->hasViewBuilderClass()->willReturn(TRUE);
     $entity_type3->id()->willReturn('the_entity_type_id');
     $entity_type3->getLinkTemplate('canonical')->willReturn('/the/canonical/link/template');
     $entity_type3->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
-    $route3 = (new Route('/the/canonical/link/template'))
+    $route = (new Route('/the/canonical/link/template'))
       ->setDefaults([
         '_entity_view' => 'the_entity_type_id.full',
         '_title_callback' => '\Drupal\Core\Entity\Controller\EntityController::title',
@@ -109,38 +233,64 @@ public function providerTestGetCanonicalRoute() {
           ],
         ],
       ]);
-    $data['id_key_type_null'] = [$entity_type3, $route3];
+    $data['id_key_type_null'] = [clone $route, $entity_type3->reveal()];
 
-    $entity_type4 = $this->prophesize(EntityTypeInterface::class);
-    $entity_type4->hasLinkTemplate('canonical')->willReturn(TRUE);
-    $entity_type4->hasViewBuilderClass()->willReturn(TRUE);
-    $entity_type4->id()->willReturn('the_entity_type_id');
-    $entity_type4->getLinkTemplate('canonical')->willReturn('/the/canonical/link/template');
+    $entity_type4 = $this->getEntityType($entity_type3);
     $entity_type4->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
     $entity_type4->getKey('id')->willReturn('id');
-    $route4 = (new Route('/the/canonical/link/template'))
-      ->setDefaults([
-        '_entity_view' => 'the_entity_type_id.full',
-        '_title_callback' => '\Drupal\Core\Entity\Controller\EntityController::title',
-      ])
-      ->setRequirements([
-        '_entity_access' => 'the_entity_type_id.view',
-        'the_entity_type_id' => '\d+',
-      ])
-      ->setOptions([
-        'parameters' => [
-          'the_entity_type_id' => [
-            'type' => 'entity:the_entity_type_id',
-          ],
-        ],
-      ]);
+    $route->setRequirement('the_entity_type_id', '\d+');
     $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
     $field_storage_definition->getType()->willReturn('integer');
-    $data['id_key_type_integer'] = [$entity_type4, $route4, $field_storage_definition];
+    $data['id_key_type_integer'] = [clone $route, $entity_type4->reveal(), $field_storage_definition->reveal()];
 
     return $data;
   }
 
+  /**
+   * @covers ::getEntityTypeIdKeyType
+   */
+  public function testGetEntityTypeIdKeyType() {
+    $entity_type = $this->prophesize(EntityTypeInterface::class);
+    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(TRUE);
+    $entity_type->id()->willReturn('the_entity_type_id');
+    $entity_type->getKey('id')->willReturn('id');
+
+    $field_storage_definition = $this->prophesize(FieldStorageDefinitionInterface::class);
+    $field_storage_definition->getType()->willReturn('integer');
+    $this->entityFieldManager->getFieldStorageDefinitions('the_entity_type_id')->willReturn(['id' => $field_storage_definition]);
+
+    $type = $this->routeProvider->getEntityTypeIdKeyType($entity_type->reveal());
+    $this->assertSame('integer', $type);
+  }
+
+  /**
+   * @covers ::getEntityTypeIdKeyType
+   */
+  public function testGetEntityTypeIdKeyTypeNotFieldable() {
+    $entity_type = $this->prophesize(EntityTypeInterface::class);
+    $entity_type->isSubclassOf(FieldableEntityInterface::class)->willReturn(FALSE);
+    $this->entityFieldManager->getFieldStorageDefinitions(Argument::any())->shouldNotBeCalled();
+
+    $type = $this->routeProvider->getEntityTypeIdKeyType($entity_type->reveal());
+    $this->assertNull($type);
+  }
+
+  /**
+   * @param \Prophecy\Prophecy\ObjectProphecy $base_entity_type
+   * @return \Prophecy\Prophecy\ObjectProphecy
+   */
+  protected function getEntityType(ObjectProphecy $base_entity_type = NULL) {
+    $entity_type = $this->prophesize(EntityTypeInterface::class);
+    if ($base_entity_type) {
+      foreach ($base_entity_type->getMethodProphecies() as $method => $prophecies) {
+        foreach ($prophecies as $prophecy) {
+          $entity_type->addMethodProphecy(clone $prophecy);
+        }
+      }
+    }
+    return $entity_type;
+  }
+
 }
 
 class TestDefaultHtmlRouteProvider extends DefaultHtmlRouteProvider {
@@ -148,6 +298,12 @@ class TestDefaultHtmlRouteProvider extends DefaultHtmlRouteProvider {
   public function getEntityTypeIdKeyType(EntityTypeInterface $entity_type) {
     return parent::getEntityTypeIdKeyType($entity_type);
   }
+  public function getAddPageRoute(EntityTypeInterface $entity_type) {
+    return parent::getAddPageRoute($entity_type);
+  }
+  public function getAddFormRoute(EntityTypeInterface $entity_type) {
+    return parent::getAddFormRoute($entity_type);
+  }
   public function getCanonicalRoute(EntityTypeInterface $entity_type) {
     return parent::getCanonicalRoute($entity_type);
   }
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index a7efb7e..e931a0c 100644
--- a/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -8,7 +8,12 @@
 namespace Drupal\Tests\Core\EventSubscriber;
 
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber;
+use Drupal\Core\Render\HtmlResponse;
+use Drupal\Core\Routing\AccessAwareRouterInterface;
+use Drupal\Core\Url;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -36,13 +41,6 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
   protected $configFactory;
 
   /**
-   * The mocked alias manager.
-   *
-   * @var \Drupal\Core\Path\AliasManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-   */
-  protected $aliasManager;
-
-  /**
    * The mocked logger.
    *
    * @var \Psr\Log\LoggerInterface
@@ -71,21 +69,50 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
   protected $redirectDestination;
 
   /**
+   * The mocked access unaware router.
+   * @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $accessUnawareRouter;
+
+  /**
+   * The access manager.
+   *
+   * @var \Drupal\Core\Access\AccessManagerInterface
+   */
+  protected $accessManager;
+
+  /**
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->configFactory = $this->getConfigFactoryStub(['system.site' => ['page.403' => 'access-denied-page', 'page.404' => 'not-found-page']]);
+    $this->configFactory = $this->getConfigFactoryStub(['system.site' => ['page.403' => '/access-denied-page', 'page.404' => '/not-found-page']]);
 
-    $this->aliasManager = $this->getMock('Drupal\Core\Path\AliasManagerInterface');
     $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
     $this->logger = $this->getMock('Psr\Log\LoggerInterface');
     $this->redirectDestination = $this->getMock('\Drupal\Core\Routing\RedirectDestinationInterface');
-
     $this->redirectDestination->expects($this->any())
       ->method('getAsArray')
       ->willReturn(['destination' => 'test']);
-
-    $this->customPageSubscriber = new CustomPageExceptionHtmlSubscriber($this->configFactory, $this->aliasManager, $this->kernel, $this->logger, $this->redirectDestination);
+    $this->accessUnawareRouter = $this->getMock('Symfony\Component\Routing\Matcher\UrlMatcherInterface');
+    $this->accessUnawareRouter->expects($this->any())
+      ->method('match')
+      ->willReturn([
+        '_controller' => 'mocked',
+      ]);
+    $this->accessManager = $this->getMock('Drupal\Core\Access\AccessManagerInterface');
+    $this->accessManager->expects($this->any())
+      ->method('checkNamedRoute')
+      ->willReturn(AccessResult::allowed()->addCacheTags(['foo', 'bar']));
+
+    $this->customPageSubscriber = new CustomPageExceptionHtmlSubscriber($this->configFactory, $this->kernel, $this->logger, $this->redirectDestination, $this->accessUnawareRouter, $this->accessManager);
+
+    $path_validator = $this->getMock('Drupal\Core\Path\PathValidatorInterface');
+    $path_validator->expects($this->any())
+      ->method('getUrlIfValidWithoutAccessCheck')
+      ->willReturn(Url::fromRoute('foo', ['foo' => 'bar']));
+    $container = new ContainerBuilder();
+    $container->set('path.validator', $path_validator);
+    \Drupal::setContainer($container);
 
     // You can't create an exception in PHP without throwing it. Store the
     // current error_log, and disable it temporarily.
@@ -100,24 +127,13 @@ protected function tearDown() {
   }
 
   /**
-   * Sets up an alias manager that does nothing.
-   */
-  protected function setupStubAliasManager() {
-    $this->aliasManager->expects($this->any())
-      ->method('getPathByAlias')
-      ->willReturnArgument(0);
-  }
-
-  /**
    * Tests onHandleException with a POST request.
    */
   public function testHandleWithPostRequest() {
-    $this->setupStubAliasManager();
-
     $request = Request::create('/test', 'POST', array('name' => 'druplicon', 'pass' => '12345'));
 
     $this->kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
-      return new Response($request->getMethod());
+      return new HtmlResponse($request->getMethod());
     }));
 
     $event = new GetResponseForExceptionEvent($this->kernel, $request, 'foo', new NotFoundHttpException('foo'));
@@ -127,15 +143,15 @@ public function testHandleWithPostRequest() {
     $response = $event->getResponse();
     $result = $response->getContent() . " " . UrlHelper::buildQuery($request->request->all());
     $this->assertEquals('POST name=druplicon&pass=12345', $result);
+    $this->assertEquals(AccessResult::allowed()->addCacheTags(['foo', 'bar']), $request->attributes->get(AccessAwareRouterInterface::ACCESS_RESULT));
   }
 
   /**
    * Tests onHandleException with a GET request.
    */
   public function testHandleWithGetRequest() {
-    $this->setupStubAliasManager();
-
     $request = Request::create('/test', 'GET', array('name' => 'druplicon', 'pass' => '12345'));
+    $request->attributes->set(AccessAwareRouterInterface::ACCESS_RESULT, AccessResult::forbidden()->addCacheTags(['druplicon']));
 
     $this->kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
       return new Response($request->getMethod() . ' ' . UrlHelper::buildQuery($request->query->all()));
@@ -147,6 +163,7 @@ public function testHandleWithGetRequest() {
     $response = $event->getResponse();
     $result = $response->getContent() . " " . UrlHelper::buildQuery($request->request->all());
     $this->assertEquals('GET name=druplicon&pass=12345&destination=test&_exception_statuscode=404 ', $result);
+    $this->assertEquals(AccessResult::forbidden()->addCacheTags(['druplicon', 'foo', 'bar']), $request->attributes->get(AccessAwareRouterInterface::ACCESS_RESULT));
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php
new file mode 100644
index 0000000..ffd8e92
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/DefaultExceptionSubscriberTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\EventSubscriber\DefaultExceptionSubscriberTest.
+ */
+
+namespace Drupal\Tests\Core\EventSubscriber;
+
+use Drupal\Core\EventSubscriber\DefaultExceptionSubscriber;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * @coversDefaultClass \Drupal\Core\EventSubscriber\DefaultExceptionSubscriber
+ * @group EventSubscriber
+ */
+class DefaultExceptionSubscriberTest extends UnitTestCase {
+
+  /**
+   * @covers ::onException
+   * @covers ::onFormatUnknown
+   */
+  public function testOnExceptionWithUnknownFormat() {
+    $config_factory = $this->getConfigFactoryStub();
+
+    // Format 'bananas' requested, yet only 'json' allowed.
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/test?_format=bananas');
+    $e = new MethodNotAllowedHttpException(['json'], 'test message');
+    $event = new GetResponseForExceptionEvent($kernel->reveal(), $request, 'GET', $e);
+    $subscriber = new DefaultExceptionSubscriber($config_factory);
+    $subscriber->onException($event);
+    $response = $event->getResponse();
+
+    $this->assertInstanceOf(Response::class, $response);
+    $this->assertEquals('test message', $response->getContent());
+    $this->assertEquals(405, $response->getStatusCode());
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/EventSubscriber/OptionsRequestSubscriberTest.php b/core/tests/Drupal/Tests/Core/EventSubscriber/OptionsRequestSubscriberTest.php
new file mode 100644
index 0000000..7c0e454
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/EventSubscriber/OptionsRequestSubscriberTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\EventSubscriber\OptionsRequestSubscriberTest.
+ */
+
+namespace Drupal\Tests\Core\EventSubscriber;
+
+use Drupal\Core\EventSubscriber\OptionsRequestSubscriber;
+use Symfony\Cmf\Component\Routing\RouteProviderInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * @coversDefaultClass \Drupal\Core\EventSubscriber\OptionsRequestSubscriber
+ * @group EventSubscriber
+ */
+class OptionsRequestSubscriberTest extends \PHPUnit_Framework_TestCase {
+
+  /**
+   * @covers ::onRequest
+   */
+  public function testWithNonOptionRequest() {
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/example', 'GET');
+
+    $route_provider = $this->prophesize(RouteProviderInterface::class);
+    $route_provider->getRouteCollectionForRequest($request)->shouldNotBeCalled();
+
+    $subscriber = new OptionsRequestSubscriber($route_provider->reveal());
+    $event = new GetResponseEvent($kernel->reveal(), $request, HttpKernelInterface::MASTER_REQUEST);
+    $subscriber->onRequest($event);
+
+    $this->assertFalse($event->hasResponse());
+  }
+
+  /**
+   * @covers ::onRequest
+   */
+  public function testWithoutMatchingRoutes() {
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/example', 'OPTIONS');
+
+    $route_provider = $this->prophesize(RouteProviderInterface::class);
+    $route_provider->getRouteCollectionForRequest($request)->willReturn(new RouteCollection())->shouldBeCalled();
+
+    $subscriber = new OptionsRequestSubscriber($route_provider->reveal());
+    $event = new GetResponseEvent($kernel->reveal(), $request, HttpKernelInterface::MASTER_REQUEST);
+    $subscriber->onRequest($event);
+
+    $this->assertFalse($event->hasResponse());
+  }
+
+  /**
+   * @covers ::onRequest
+   * @dataProvider providerTestOnRequestWithOptionsRequest
+   */
+  public function testWithOptionsRequest(RouteCollection $collection, $expected_header) {
+    $kernel = $this->prophesize(HttpKernelInterface::class);
+    $request = Request::create('/example', 'OPTIONS');
+
+    $route_provider = $this->prophesize(RouteProviderInterface::class);
+    $route_provider->getRouteCollectionForRequest($request)->willReturn($collection)->shouldBeCalled();
+
+    $subscriber = new OptionsRequestSubscriber($route_provider->reveal());
+    $event = new GetResponseEvent($kernel->reveal(), $request, HttpKernelInterface::MASTER_REQUEST);
+    $subscriber->onRequest($event);
+
+    $this->assertTrue($event->hasResponse());
+    $response = $event->getResponse();
+    $this->assertEquals(200, $response->getStatusCode());
+    $this->assertEquals($expected_header, $response->headers->get('Allow'));
+  }
+
+  public function providerTestOnRequestWithOptionsRequest() {
+    $data = [];
+
+    foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method) {
+      $collection = new RouteCollection();
+      $collection->add('example.1', new Route('/example', [], [], [], '', [], [$method]));
+      $data['one_route_' . $method] = [$collection, $method];
+    }
+
+    foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method_a) {
+      foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method_b) {
+        if ($method_a != $method_b) {
+          $collection = new RouteCollection();
+          $collection->add('example.1', new Route('/example', [], [], [], '', [], [$method_a, $method_b]));
+          $data['one_route_' . $method_a . '_' . $method_b] = [$collection, $method_a . ', ' . $method_b];
+        }
+      }
+    }
+
+    foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method_a) {
+      foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method_b) {
+        foreach (['GET', 'POST', 'PATCH', 'PUT', 'DELETE'] as $method_c) {
+          $collection = new RouteCollection();
+          $collection->add('example.1', new Route('/example', [], [], [], '', [], [$method_a]));
+          $collection->add('example.2', new Route('/example', [], [], [], '', [], [$method_a, $method_b]));
+          $collection->add('example.3', new Route('/example', [], [], [], '', [], [$method_b, $method_c]));
+          $methods = array_unique([$method_a, $method_b, $method_c]);
+          $data['multiple_routes_' . $method_a . '_' . $method_b . '_' . $method_c] = [$collection, implode(', ', $methods)];
+        }
+      }
+    }
+
+    return $data;
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
index 3576f28..00c781d 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
@@ -1,3 +1,8 @@
 <?php
 
+/**
+ * @file
+ * Include file for test module.
+ */
+
 function module_handler_test_hook_include() {}
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
index 3e36a10..18bf23c 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/module_handler_test.module
@@ -1,6 +1,11 @@
 <?php
 
 /**
+ * @file
+ * Test module.
+ */
+
+/**
  * Implements hook_hook_info().
  */
 function module_handler_test_hook_info() {
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
index 6c8e0b8..718791b 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.hook.inc
@@ -1,3 +1,8 @@
 <?php
 
+/**
+ * @file
+ * Include file for test module.
+ */
+
 function module_handler_test_added_hook($arg) { return $arg; }
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
index 183e668..0a46c33 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_added/module_handler_test_added.module
@@ -1,4 +1,8 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
 
 function module_handler_test_added_helper($arg) { return $arg; }
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
index ccb4ee9..1555aec 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all1/module_handler_test_all1.module
@@ -1,4 +1,9 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 // return an array to test nested merge in invoke all.
 function module_handler_test_all1_hook($arg) { return array($arg); }
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
index 48ce442..9275ce3 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test_all2/module_handler_test_all2.module
@@ -1,3 +1,8 @@
 <?php
 
+/**
+ * @file
+ * Test module.
+ */
+
 function module_handler_test_all2_hook($arg) { return $arg; }
diff --git a/core/tests/Drupal/Tests/Core/Field/PluginSettingsBaseTest.php b/core/tests/Drupal/Tests/Core/Field/PluginSettingsBaseTest.php
new file mode 100644
index 0000000..1312d86
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Field/PluginSettingsBaseTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Field\PluginSettingsBaseTest.
+ */
+
+namespace Drupal\Tests\Core\Field;
+
+use Drupal\Core\Field\PluginSettingsBase;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Field\PluginSettingsBase
+ * @group Field
+ */
+class PluginSettingsBaseTest extends UnitTestCase {
+
+  /**
+   * @covers ::getThirdPartySettings
+   */
+  public function testGetThirdPartySettings() {
+    $plugin_settings = new TestPluginSettingsBase();
+    $this->assertSame([], $plugin_settings->getThirdPartySettings());
+    $this->assertSame([], $plugin_settings->getThirdPartySettings('test'));
+    $plugin_settings->setThirdPartySetting('test', 'foo', 'bar');
+    $this->assertSame(['foo' => 'bar'], $plugin_settings->getThirdPartySettings('test'));
+    $this->assertSame([], $plugin_settings->getThirdPartySettings('test2'));
+  }
+
+}
+
+class TestPluginSettingsBase extends PluginSettingsBase {
+
+  public function __construct() {
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
index 24904e3..23d7a00 100644
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -536,7 +536,7 @@ public function providerTestIsMethodType() {
    * @covers ::setTemporaryValue
    */
   public function testTemporaryValue() {
-    $form_state = New FormState();
+    $form_state = new FormState();
     $this->assertFalse($form_state->hasTemporaryValue('rainbow_sparkles'));
     $form_state->setTemporaryValue('rainbow_sparkles', 'yes please');
     $this->assertSame($form_state->getTemporaryValue('rainbow_sparkles'), 'yes please');
diff --git a/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php b/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
index dd34082..6eebd80 100644
--- a/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
+++ b/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
@@ -12,6 +12,8 @@
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerTrait;
 
 /**
  * @coversDefaultClass \Drupal\Core\Logger\LoggerChannel
@@ -55,6 +57,21 @@ public function testLog(callable $expected, Request $request = NULL, AccountInte
   }
 
   /**
+   * Tests LoggerChannel::log() recursion protection.
+   *
+   * @covers ::log
+   */
+  public function testLogRecursionProtection() {
+    $channel = new LoggerChannel('test');
+    $logger = $this->getMock('Psr\Log\LoggerInterface');
+    $logger->expects($this->exactly(LoggerChannel::MAX_CALL_DEPTH))
+      ->method('log');
+    $channel->addLogger($logger);
+    $channel->addLogger(new NaughtyRecursiveLogger($channel));
+    $channel->log(rand(0, 7), $this->randomMachineName());
+  }
+
+  /**
    * Tests LoggerChannel::addLoggers().
    *
    * @covers ::addLogger
@@ -129,3 +146,19 @@ function ($context) {
   }
 
 }
+
+class NaughtyRecursiveLogger implements LoggerInterface  {
+  use LoggerTrait;
+
+  protected $channel;
+  protected $message;
+
+  public function __construct(LoggerChannel $channel) {
+    $this->channel = $channel;
+  }
+
+  public function log($level, $message, array $context = []) {
+    $this->channel->log(rand(0, 7), $message, $context);
+  }
+}
+
diff --git a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
index c29799d..21c8839 100644
--- a/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
@@ -12,7 +12,6 @@
 use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Access\AccessResultForbidden;
-use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Menu\LocalActionManager;
@@ -213,10 +212,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            // For back-compatibility in 8.0.x the max-age is Cache::PERMANENT
-            // instead of 0 for any class that does not implement
-            // \Drupal\Core\Cache\CacheableDependencyInterface.
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
       ),
@@ -258,7 +254,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
       ),
@@ -301,7 +297,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
         'plugin_id_2' => array(
@@ -316,7 +312,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
       ),
@@ -361,7 +357,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
         'plugin_id_2' => array(
@@ -376,7 +372,7 @@ public function getActionsForRouteProvider() {
           '#cache' => array(
             'contexts' => array(),
             'tags' => array(),
-            'max-age' => Cache::PERMANENT,
+            'max-age' => 0,
           ),
         ),
       ),
diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php
new file mode 100644
index 0000000..0d2988e
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/ParamConverter/EntityRevisionParamConverterTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\ParamConverter\EntityRevisionParamConverterTest.
+ */
+
+namespace Drupal\Tests\Core\ParamConverter;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\ParamConverter\EntityRevisionParamConverter;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Routing\Route;
+
+/**
+ * @coversDefaultClass \Drupal\Core\ParamConverter\EntityRevisionParamConverter
+ * @group entity
+ */
+class EntityRevisionParamConverterTest extends UnitTestCase {
+
+  /**
+   * The tested entity revision param converter.
+   *
+   * @var \Drupal\entity\ParamConverter\EntityRevisionParamConverter
+   */
+  protected $converter;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->converter = new EntityRevisionParamConverter($this->prophesize(EntityTypeManagerInterface::class)->reveal());
+  }
+
+  protected function getTestRoute() {
+    $route = new Route('/test/{test_revision}');
+    $route->setOption('parameters', [
+      'test_revision' => [
+        'type' => 'entity_revision:test',
+      ],
+    ]);
+    return $route;
+  }
+
+  /**
+   * @covers ::applies
+   */
+  public function testNonApplyingRoute() {
+    $route = new Route('/test');
+    $this->assertFalse($this->converter->applies([], 'test_revision', $route));
+  }
+
+  /**
+   * @covers ::applies
+   */
+  public function testApplyingRoute() {
+    $route = $this->getTestRoute();
+    $this->assertTrue($this->converter->applies($route->getOption('parameters')['test_revision'], 'test_revision', $route));
+  }
+
+  /**
+   * @covers ::convert
+   */
+  public function testConvert() {
+    $entity = $this->prophesize(EntityInterface::class)->reveal();
+    $storage = $this->prophesize(EntityStorageInterface::class);
+    $storage->loadRevision(1)->willReturn($entity);
+
+    $entity_type_manager = $this->prophesize(EntityTypeManagerInterface::class);
+    $entity_type_manager->getStorage('test')->willReturn($storage->reveal());
+    $converter = new EntityRevisionParamConverter($entity_type_manager->reveal());
+
+    $route = $this->getTestRoute();
+    $result = $converter->convert(1, $route->getOption('parameters')['test_revision'], 'test_revision', ['test_revision' => 1]);
+    $this->assertSame($entity, $result);
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
new file mode 100644
index 0000000..d7b2698
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDirectoryDiscoveryTest.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Plugin\Discovery\YamlDiscoveryTest.
+ */
+
+namespace Drupal\Tests\Core\Plugin\Discovery;
+
+use Drupal\Component\Discovery\YamlDirectoryDiscovery as ComponentYamlDirectoryDiscovery;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Tests\UnitTestCase;
+use Drupal\Core\Plugin\Discovery\YamlDirectoryDiscovery;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Plugin\Discovery\YamlDirectoryDiscovery
+ *
+ * @group Plugin
+ */
+class YamlDirectoryDiscoveryTest extends UnitTestCase {
+
+  /**
+   * @covers ::getDefinitions
+   */
+  public function testGetDefinitions() {
+    vfsStream::setup('modules', NULL, [
+      'module_a' => [
+        'subdir1' => [
+          'plugin1.yml' => "id: plugin1\ntest_provider: module_a",
+          'plugin2.yml' => "id: plugin2\ntest_provider: module_a",
+        ],
+        'subdir2' => [
+          'plugin3.yml' => "id: plugin3\ntest_provider: module_a",
+        ],
+        'subdir3' => [
+        ]
+      ],
+      'module_b' => [
+        'subdir1' => [
+          'plugin4.yml' => "id: plugin4\ntest_provider: module_b",
+        ],
+      ],
+    ]);
+    $directories = [
+      'module_a' => [
+        vfsStream::url('modules/module_a/subdir1'),
+        vfsStream::url('modules/module_a/subdir2'),
+        // Empty directory.
+        vfsStream::url('modules/module_a/subdir3'),
+        // Directory does not exist.
+        vfsStream::url('modules/module_a/subdir4'),
+      ],
+      'module_b' => vfsStream::url('modules/module_b/subdir1'),
+    ];
+    $discovery = new YamlDirectoryDiscovery($directories, 'test');
+
+    $definitions = $discovery->getDefinitions();
+
+    $this->assertInternalType('array', $definitions);
+    $this->assertCount(4, $definitions);
+
+    foreach ($definitions as $id => $definition) {
+      foreach (array('id', 'provider', ComponentYamlDirectoryDiscovery::FILE_KEY) as $key) {
+        $this->assertArrayHasKey($key, $definition);
+      }
+      $this->assertEquals($id, $definition['id']);
+      $this->assertEquals($definition['test_provider'], $definition['provider']);
+    }
+  }
+
+  /**
+   * @covers ::getDefinitions
+   */
+  public function testGetDefinitionsWithTranslatableDefinitions() {
+    vfsStream::setup('modules', NULL, [
+      'module_a' => [
+        'subdir1' => [
+          'plugin1.yml' => "id: plugin1\ntest_provider: module_a\ntitle: 'test title'",
+          'plugin2.yml' => "id: plugin2\ntest_provider: module_a\ntitle: 'test title'\ntitle_context: test-context",
+        ],
+      ],
+    ]);
+    $directories = [
+      'module_a' => vfsStream::url('modules/module_a/subdir1'),
+    ];
+
+    $discovery = new YamlDirectoryDiscovery($directories, 'test');
+    $discovery->addTranslatableProperty('title', 'title_context');
+    $definitions = $discovery->getDefinitions();
+
+    $this->assertCount(2, $definitions);
+    $plugin_1 = $definitions['plugin1'];
+    $plugin_2 = $definitions['plugin2'];
+
+    $this->assertInstanceOf(TranslatableMarkup::class, $plugin_1['title']);
+    $this->assertEquals([], $plugin_1['title']->getOptions());
+    $this->assertInstanceOf(TranslatableMarkup::class, $plugin_2['title']);
+    $this->assertEquals(['context' => 'test-context'], $plugin_2['title']->getOptions());
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
index 34eec8a..874b169 100644
--- a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Tests\UnitTestCase;
-use Drupal\Core\Render\Element;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
diff --git a/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php b/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
index d2abbc0..98ff8b7 100644
--- a/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\Tests\Core\Render;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Render\Element;
 
 /**
  * @coversDefaultClass \Drupal\Core\Render\PlaceholderGenerator
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index 5867b2b..e8d11b7 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -9,7 +9,6 @@
 
 use Drupal\Core\Cache\MemoryBackend;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
-use Drupal\Core\Render\Element;
 use Drupal\Core\State\State;
 use Drupal\Core\Cache\Cache;
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index d32ba5a..75722dc 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -8,7 +8,6 @@
 namespace Drupal\Tests\Core\Render;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Render\Markup;
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php b/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
index 7e7a129..8b63fb6 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererRecursionTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\Tests\Core\Render;
 
-use Drupal\Core\Render\Element;
-
 /**
  * @coversDefaultClass \Drupal\Core\Render\Renderer
  * @group Render
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index 48b394e..bed7d3d 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Tests\Core\Render;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Cache\Cache;
@@ -47,13 +47,13 @@ public function testRenderBasic($build, $expected, callable $setup_code = NULL)
     }
 
     if (isset($build['#markup'])) {
-      $this->assertFalse(SafeMarkup::isSafe($build['#markup']), 'The #markup value is not marked safe before rendering.');
+      $this->assertNotInstanceOf(MarkupInterface::class, $build['#markup'], 'The #markup value is not marked safe before rendering.');
     }
     $render_output = $this->renderer->renderRoot($build);
     $this->assertSame($expected, (string) $render_output);
     if ($render_output !== '') {
-      $this->assertTrue(SafeMarkup::isSafe($render_output), 'Output of render is marked safe.');
-      $this->assertTrue(SafeMarkup::isSafe($build['#markup']), 'The #markup value is marked safe after rendering.');
+      $this->assertInstanceOf(MarkupInterface::class, $render_output, 'Output of render is marked safe.');
+      $this->assertInstanceOf(MarkupInterface::class, $build['#markup'], 'The #markup value is marked safe after rendering.');
     }
   }
 
@@ -751,7 +751,7 @@ public function testRenderCacheProperties(array $expected_results) {
     // #custom_property_array can not be a safe_cache_property.
     $safe_cache_properties = array_diff(Element::properties(array_filter($expected_results)), ['#custom_property_array']);
     foreach ($safe_cache_properties as $cache_property) {
-      $this->assertTrue(SafeMarkup::isSafe($data[$cache_property]), "$cache_property is marked as a safe string");
+      $this->assertInstanceOf(MarkupInterface::class, $data[$cache_property], "$cache_property is marked as a safe string");
     }
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 199d170..a0ea1bb 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -11,7 +11,6 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\Context\ContextCacheKeys;
 use Drupal\Core\Cache\MemoryBackend;
-use Drupal\Core\Render\Element;
 use Drupal\Core\Render\PlaceholderGenerator;
 use Drupal\Core\Render\PlaceholderingRenderCache;
 use Drupal\Core\Render\Renderer;
diff --git a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php b/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
index b0ad040..e1c8b0f 100644
--- a/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/CurrentRouteMatchTest.php
@@ -110,4 +110,30 @@ public function testGetRouteMatchFromRequest() {
     $this->assertEquals($route, $route_match->getRouteObject());
   }
 
+  /**
+   * @covers ::resetRouteMatch
+   */
+  public function testResetRouteMatch() {
+    $route = new Route('/test-route/{foo}');
+    $request = new Request();
+    $request->attributes->set(RouteObjectInterface::ROUTE_NAME, 'test_route');
+    $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, $route);
+    $request_stack = new RequestStack();
+    $request_stack->push($request);
+
+    $current_route_match = new CurrentRouteMatch($request_stack);
+
+    $route_name = $current_route_match->getRouteName();
+    $this->assertSame('test_route', $route_name);
+
+    // Replace the matched route on the request.
+    $request->attributes->set(RouteObjectInterface::ROUTE_NAME, NULL);
+    $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, NULL);
+    // Reset the route match.
+    $current_route_match->resetRouteMatch();
+
+    $route_name = $current_route_match->getRouteName();
+    $this->assertNull($route_name);
+  }
+
 }
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index b7ec0bc..47738a8 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -217,6 +217,27 @@ public function testAliasGeneration() {
   }
 
   /**
+   * Confirms that generated routes will have aliased paths using interface constants.
+   */
+  public function testAliasGenerationUsingInterfaceConstants() {
+    $url = $this->generator->generate('test_1', array(), UrlGenerator::ABSOLUTE_PATH);
+    $this->assertEquals('/hello/world', $url);
+    // No cacheability to test; UrlGenerator::generate() doesn't support
+    // collecting cacheability metadata.
+
+    $this->routeProcessorManager->expects($this->exactly(3))
+      ->method('processOutbound')
+      ->with($this->anything());
+
+
+    // Check that the two generate methods return the same result.
+    $this->assertGenerateFromRoute('test_1', [], [], $url, (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+
+    $path = $this->generator->getPathFromRoute('test_1');
+    $this->assertEquals('test/one', $path);
+  }
+
+  /**
    * @covers ::generateFromRoute
    */
   public function testUrlGenerationWithDisabledPathProcessing() {
@@ -376,6 +397,24 @@ public function testAbsoluteURLGeneration() {
   }
 
   /**
+   * Confirms that absolute URLs work with generated routes using interface constants.
+   */
+  public function testAbsoluteURLGenerationUsingInterfaceConstants() {
+    $url = $this->generator->generate('test_1', array(), UrlGenerator::ABSOLUTE_URL);
+    $this->assertEquals('http://localhost/hello/world', $url);
+    // No cacheability to test; UrlGenerator::generate() doesn't support
+    // collecting cacheability metadata.
+
+    $this->routeProcessorManager->expects($this->exactly(2))
+      ->method('processOutbound')
+      ->with($this->anything());
+
+    $options = array('absolute' => TRUE, 'fragment' => 'top');
+    // Extra parameters should appear in the query string.
+    $this->assertGenerateFromRoute('test_1', ['zoo' => 5], $options, 'http://localhost/hello/world?zoo=5#top', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['url.site']));
+  }
+
+  /**
    * Confirms that explicitly setting the base_url works with generated routes
    */
   public function testBaseURLGeneration() {
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
index c8000bf..7985c8d 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
@@ -7,7 +7,11 @@
 
 namespace Drupal\Tests\Core\StringTranslation;
 
+use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
 
 /**
  * @coversDefaultClass \Drupal\Core\StringTranslation\StringTranslationTrait
@@ -35,11 +39,13 @@ class StringTranslationTraitTest extends UnitTestCase {
    */
   protected function setUp() {
     $this->translation = $this->getObjectForTrait('\Drupal\Core\StringTranslation\StringTranslationTrait');
-    $stub = $this->getStringTranslationStub();
-    $stub->expects($this->any())
-      ->method('formatPlural')
-      ->will($this->returnArgument(2));
-    $this->translation->setStringTranslation($stub);
+    $mock = $this->prophesize(TranslationInterface::class);
+    $mock->translate(Argument::cetera())->shouldNotBeCalled();
+    $mock->formatPlural(Argument::cetera())->shouldNotBeCalled();
+    $mock->translateString(Argument::cetera())->will(function ($args) {
+      return $args[0]->getUntranslatedString();
+    });
+    $this->translation->setStringTranslation($mock->reveal());
     $this->reflection = new \ReflectionClass(get_class($this->translation));
   }
 
@@ -50,7 +56,9 @@ public function testT() {
     $method = $this->reflection->getMethod('t');
     $method->setAccessible(TRUE);
 
-    $this->assertEquals('something', $method->invoke($this->translation, 'something'));
+    $result = $method->invoke($this->translation, 'something');
+    $this->assertInstanceOf(TranslatableMarkup::class, $result);
+    $this->assertEquals('something', $result);
   }
 
   /**
@@ -60,7 +68,9 @@ public function testFormatPlural() {
     $method = $this->reflection->getMethod('formatPlural');
     $method->setAccessible(TRUE);
 
-    $this->assertEquals('apples', $method->invoke($this->translation, 2, 'apple', 'apples'));
+    $result = $method->invoke($this->translation, 2, 'apple', 'apples');
+    $this->assertInstanceOf(PluralTranslatableMarkup::class, $result);
+    $this->assertEquals('apples', $result);
   }
 
 }
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
index 1a1b390..dfaab79 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/TranslationManagerTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\Tests\Core\StringTranslation;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\StringTranslation\TranslationManager;
 use Drupal\Tests\UnitTestCase;
@@ -64,7 +63,7 @@ public function testFormatPlural($count, $singular, $plural, array $args = array
     $this->translationManager->addTranslator($translator);
     $result = $this->translationManager->formatPlural($count, $singular, $plural, $args, $options);
     $this->assertEquals($expected, $result);
-    $this->assertTrue(SafeMarkup::isSafe($result));
+    $this->assertInstanceOf(MarkupInterface::class, $result);
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
index d403db3..7a3dd3a 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigSandboxTest.php
@@ -140,6 +140,20 @@ public function testEntitySafeMethods() {
     $this->assertEquals($result, 'testing', 'Sandbox policy allows get() to be called.');
   }
 
+  /**
+   * Tests that safe methods inside Url objects can be called.
+   */
+  public function testUrlSafeMethods() {
+    $url = $this->getMockBuilder('Drupal\Core\Url')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $url->expects($this->once())
+      ->method('toString')
+      ->willReturn('http://kittens.cat/are/cute');
+    $result = $this->twig->render('{{ url.toString }}', ['url' => $url]);
+    $this->assertEquals($result, 'http://kittens.cat/are/cute', 'Sandbox policy allows toString() to be called.');
+  }
+
 }
 
 class TestAttribute extends Attribute {}
diff --git a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
index 6788011..9dc8388 100644
--- a/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
+++ b/core/tests/Drupal/Tests/Core/Transliteration/PhpTransliterationTest.php
@@ -50,7 +50,7 @@ public function testPhpTransliterationWithAlter($langcode, $original, $expected,
           // The default transliteration of Ä is A, but change it to Z for testing.
           $overrides[0xC4] = 'Z';
           // Also provide transliterations of two 5-byte characters from
-          // http://en.wikipedia.org/wiki/Gothic_alphabet.
+          // http://wikipedia.org/wiki/Gothic_alphabet.
           $overrides[0x10330] = 'A';
           $overrides[0x10338] = 'Th';
         }
@@ -73,7 +73,7 @@ public function providerTestPhpTransliterationWithAlter() {
     // Note that the 3-byte character is overridden by the 'kg' language.
     $two_byte = 'Ä Ö Ü Å Ø äöüåøhello';
     // These are two Gothic alphabet letters. See
-    // http://en.wikipedia.org/wiki/Gothic_alphabet
+    // http://wikipedia.org/wiki/Gothic_alphabet
     // They are not in our tables, but should at least give us '?' (unknown).
     $five_byte = html_entity_decode('&#x10330;&#x10338;', ENT_NOQUOTES, 'UTF-8');
     // Five-byte characters do not work in MySQL, so make a printable version.
diff --git a/core/tests/Drupal/Tests/Listeners/DrupalStandardsListener.php b/core/tests/Drupal/Tests/Listeners/DrupalStandardsListener.php
index 4bcc2e1..325fadf 100644
--- a/core/tests/Drupal/Tests/Listeners/DrupalStandardsListener.php
+++ b/core/tests/Drupal/Tests/Listeners/DrupalStandardsListener.php
@@ -3,15 +3,14 @@
 /**
  * @file
  * Contains \Drupal\Tests\Listeners\DrupalStandardsListener.
- *
- * Listener for PHPUnit tests, to enforce various coding standards within test
- * runs.
  */
 
 namespace Drupal\Tests\Listeners;
 
 /**
  * Listens for PHPUnit tests and fails those with invalid coverage annotations.
+ *
+ * Enforces various coding standards within test runs.
  */
 class DrupalStandardsListener extends \PHPUnit_Framework_BaseTestListener {
 
diff --git a/core/themes/bartik/color/preview.js b/core/themes/bartik/color/preview.js
index cee0e0e..da8e0ca 100644
--- a/core/themes/bartik/color/preview.js
+++ b/core/themes/bartik/color/preview.js
@@ -8,7 +8,7 @@
 
   Drupal.color = {
     logoChanged: false,
-    callback: function (context, settings, form, farb, height, width) {
+    callback: function (context, settings, $form) {
       // Change the logo to be the real one.
       if (!this.logoChanged) {
         $('.color-preview .color-preview-logo img').attr('src', drupalSettings.color.logo);
@@ -19,27 +19,31 @@
         $('div').remove('.color-preview-logo');
       }
 
+      var $colorPreview = $form.find('.color-preview');
+      var $colorPalette = $form.find('.js-color-palette');
+
       // Solid background.
-      form.find('.color-preview').css('backgroundColor', $('.js-color-palette input[name="palette[bg]"]').val());
+      $colorPreview.css('backgroundColor', $colorPalette.find('input[name="palette[bg]"]').val());
 
       // Text preview.
-      form.find('.color-preview .color-preview-main h2, .color-preview .preview-content').css('color', form.find('.js-color-palette input[name="palette[text]"]').val());
-      form.find('.color-preview .color-preview-content a').css('color', form.find('.js-color-palette input[name="palette[link]"]').val());
+      $colorPreview.find('.color-preview-main h2, .color-preview .preview-content').css('color', $colorPalette.find('input[name="palette[text]"]').val());
+      $colorPreview.find('.color-preview-content a').css('color', $colorPalette.find('input[name="palette[link]"]').val());
 
       // Sidebar block.
-      form.find('.color-preview .color-preview-sidebar .color-preview-block').css('background-color', form.find('.js-color-palette input[name="palette[sidebar]"]').val());
-      form.find('.color-preview .color-preview-sidebar .color-preview-block').css('border-color', form.find('.js-color-palette input[name="palette[sidebarborders]"]').val());
+      var $colorPreviewBlock = $colorPreview.find('.color-preview-sidebar .color-preview-block');
+      $colorPreviewBlock.css('background-color', $colorPalette.find('input[name="palette[sidebar]"]').val());
+      $colorPreviewBlock.css('border-color', $colorPalette.find('input[name="palette[sidebarborders]"]').val());
 
       // Footer wrapper background.
-      form.find('.color-preview .color-preview-footer-wrapper', form).css('background-color', form.find('.js-color-palette input[name="palette[footer]"]').val());
+      $colorPreview.find('.color-preview-footer-wrapper').css('background-color', $colorPalette.find('input[name="palette[footer]"]').val());
 
       // CSS3 Gradients.
-      var gradient_start = form.find('.js-color-palette input[name="palette[top]"]').val();
-      var gradient_end = form.find('.js-color-palette input[name="palette[bottom]"]').val();
+      var gradient_start = $colorPalette.find('input[name="palette[top]"]').val();
+      var gradient_end = $colorPalette.find('input[name="palette[bottom]"]').val();
 
-      form.find('.color-preview .color-preview-header').attr('style', 'background-color: ' + gradient_start + '; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(' + gradient_start + '), to(' + gradient_end + ')); background-image: -moz-linear-gradient(-90deg, ' + gradient_start + ', ' + gradient_end + ');');
+      $colorPreview.find('.color-preview-header').attr('style', 'background-color: ' + gradient_start + '; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(' + gradient_start + '), to(' + gradient_end + ')); background-image: -moz-linear-gradient(-90deg, ' + gradient_start + ', ' + gradient_end + ');');
 
-      form.find('.color-preview .color-preview-site-name').css('color', form.find('.js-color-palette input[name="palette[titleslogan]"]').val());
+      $colorPreview.find('.color-preview-site-name').css('color', $colorPalette.find('input[name="palette[titleslogan]"]').val());
     }
   };
 })(jQuery, Drupal, drupalSettings);
diff --git a/core/themes/bartik/css/components/dropbutton.component.css b/core/themes/bartik/css/components/dropbutton.component.css
index db55965..b5113f5 100644
--- a/core/themes/bartik/css/components/dropbutton.component.css
+++ b/core/themes/bartik/css/components/dropbutton.component.css
@@ -3,10 +3,6 @@
  * Visual styles for Bartik's dropbutton component.
  */
 
-.js .dropbutton-wrapper .dropbutton-widget {
-  /* This is required to win over specifity of .js td .dropbutton-widget */
-  position: relative;
-}
 .js .dropbutton-widget {
   border: 1px solid;
   border-color: #e4e4e4 #d2d2d2 #b4b4b4 #d2d2d2;
diff --git a/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
index 8927db4..16cd5ba 100644
--- a/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -64,9 +64,6 @@
  * @see template_preprocess_comment()
  */
 #}
-{% if threaded %}
-  {{ attach_library('classy/drupal.comment.threaded') }}
-{% endif %}
 {%
   set classes = [
     'comment',
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 6fefe94..023204f 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -52,7 +52,7 @@
 #}
 <div id="page-wrapper">
   <div id="page">
-    <header id="header" class="header" role="banner" aria-label="{{ 'Site header'|t}}">
+    <header id="header" class="header" role="banner" aria-label="{{ 'Site header'|t }}">
       <div class="section layout-container clearfix">
         {{ page.secondary_menu }}
         {{ page.header }}
diff --git a/core/themes/classy/classy.info.yml b/core/themes/classy/classy.info.yml
index 007c566..34b07b5 100644
--- a/core/themes/classy/classy.info.yml
+++ b/core/themes/classy/classy.info.yml
@@ -19,3 +19,5 @@ libraries-extend:
     - classy/dialog
   file/drupal.file:
     - classy/file
+  core/drupal.progress:
+    - classy/progress
diff --git a/core/themes/classy/templates/content/links--node.html.twig b/core/themes/classy/templates/content/links--node.html.twig
index f4c3d72..a7b91e7 100644
--- a/core/themes/classy/templates/content/links--node.html.twig
+++ b/core/themes/classy/templates/content/links--node.html.twig
@@ -13,7 +13,6 @@
  *     to l() as its $options parameter.
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
- *   - link_key: The link CSS class.
  * - heading: (optional) A heading to precede the links.
  *   - text: The heading text.
  *   - level: The heading level (e.g. 'h2', 'h3').
diff --git a/core/themes/classy/templates/misc/help-section.html.twig b/core/themes/classy/templates/misc/help-section.html.twig
new file mode 100644
index 0000000..6cfaa38
--- /dev/null
+++ b/core/themes/classy/templates/misc/help-section.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * This implementation divides the links into 4 columns.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<div class="clearfix">
+  <h2>{{ title }}</h2>
+  <p>{{ description }}</p>
+  {% if links %}
+    {# Calculate the column length, to divide links into 4 columns. #}
+    {% set size = links|length // 4 %}
+    {% if size * 4 < links|length %}
+      {% set size = size + 1 %}
+    {% endif %}
+
+    {# Output the links in 4 columns. #}
+    {% set count = 0 %}
+    {% for link in links %}
+      {% if count == 0 %}
+        {# Start a new column. #}
+        <div class="layout-column layout-column--quarter"><ul>
+      {% endif %}
+      <li>{{ link }}</li>
+      {% set count = count + 1 %}
+      {% if count >= size %}
+        {# End the current column. #}
+        {% set count = 0 %}
+        </ul></div>
+      {% endif %}
+    {% endfor %}
+
+    {# End the last column, if one is open. #}
+    {% if count > 0 %}
+      </ul></div>
+    {% endif %}
+  {% else %}
+    <p>{{ empty }}</p>
+  {% endif %}
+</div>
diff --git a/core/themes/classy/templates/navigation/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig
index f82f41a..c1bff6b 100644
--- a/core/themes/classy/templates/navigation/links.html.twig
+++ b/core/themes/classy/templates/navigation/links.html.twig
@@ -13,7 +13,6 @@
  *     to l() as its $options parameter.
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
- *   - link_key: The link CSS class.
  * - heading: (optional) A heading to precede the links.
  *   - text: The heading text.
  *   - level: The heading level (e.g. 'h2', 'h3').
@@ -41,8 +40,8 @@
     {%- endif -%}
   {%- endif -%}
   <ul{{ attributes }}>
-    {%- for key, item in links -%}
-      <li{{ item.attributes.addClass(key|clean_class) }}>
+    {%- for item in links -%}
+      <li{{ item.attributes }}>
         {%- if item.link -%}
           {{ item.link }}
         {%- elseif item.text_attributes -%}
diff --git a/core/themes/seven/css/base/elements.css b/core/themes/seven/css/base/elements.css
index 76fcc4c..6644cea 100644
--- a/core/themes/seven/css/base/elements.css
+++ b/core/themes/seven/css/base/elements.css
@@ -166,9 +166,9 @@ details summary {
   padding-bottom: 0.5em;
 }
 details summary:focus {
-  border-top: 3px solid #0074bd;
   outline: none;
-  color: #0074bd;
-  margin-top: -3px;
+}
+details summary:focus,
+details summary:hover {
   text-decoration: underline;
 }
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index f74eb74..29777e4 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -91,7 +91,6 @@ label[for] {
   background-color: #fcf4f2;
 }
 .form-required:after {
-  background-image: url(../../images/required.svg);
   background-size: 7px 7px;
   width: 7px;
   height: 7px;
@@ -199,6 +198,7 @@ textarea.form-textarea {
   width: auto;
 }
 
+.form-item-options-group-info-identifier,
 .form-item-pass .description {
   clear: both;
 }
diff --git a/core/themes/seven/css/components/user.icons.admin.css b/core/themes/seven/css/components/user.icons.admin.css
new file mode 100644
index 0000000..66c2366
--- /dev/null
+++ b/core/themes/seven/css/components/user.icons.admin.css
@@ -0,0 +1,15 @@
+/**
+ * @file
+ * Styling for the user module icons.
+ */
+
+/**
+ * Toolbar tab icon.
+ */
+.toolbar-bar .toolbar-icon-user:before {
+  background-image: url(../../../misc/icons/bebebe/person.svg);
+}
+.toolbar-bar .toolbar-icon-user:active:before,
+.toolbar-bar .toolbar-icon-user.is-active:before {
+  background-image: url(../../../misc/icons/ffffff/person.svg);
+}
diff --git a/core/themes/seven/css/components/vertical-tabs.css b/core/themes/seven/css/components/vertical-tabs.css
index e3bd0eb..34b5a52 100644
--- a/core/themes/seven/css/components/vertical-tabs.css
+++ b/core/themes/seven/css/components/vertical-tabs.css
@@ -45,9 +45,6 @@
 .vertical-tabs__menu-item:active {
   z-index: 2;
 }
-.vertical-tabs__menu-item.is-selected:focus {
-  outline: none;
-}
 .vertical-tabs__menu-item a {
   display: block;
   padding: 10px 15px 15px;
@@ -64,19 +61,24 @@
 .vertical-tabs__menu-item a:focus {
   background: #fcfcfa;
   text-shadow: none;
+}
+.vertical-tabs__menu-item a:focus {
+  outline: none;
+}
+.vertical-tabs__menu-item a:focus .vertical-tabs__menu-item-title {
+  text-decoration: underline;
+}
+.vertical-tabs__menu-item a:active .vertical-tabs__menu-item-title,
+.vertical-tabs__menu-item.is-selected a:focus .vertical-tabs__menu-item-title {
   text-decoration: none;
 }
 .vertical-tabs__menu-item.is-selected a {
   color: #004f80;
-  border-left: 4px solid #0074bd; /* LTR */
   padding-left: 11px; /* LTR */
   border-bottom: none;
-  outline: none;
   text-decoration: none;
 }
 [dir=rtl] .vertical-tabs__menu-item.is-selected a {
-  border-left: 0;
-  border-right: 4px solid #0074bd;
   padding-left: 15px;
   padding-right: 11px;
 }
diff --git a/core/themes/seven/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css
index bfd4575..6849781 100644
--- a/core/themes/seven/css/components/views-ui.css
+++ b/core/themes/seven/css/components/views-ui.css
@@ -236,9 +236,14 @@ details.fieldset-no-legend {
 /* @group Rearrange filter criteria */
 
 .views-ui-rearrange-filter-form .action-links {
-  margin: 0;
+  float: left;
+  margin: 0 0 1em;
   padding: 0;
 }
+.views-ui-rearrange-filter-form .tabledrag-toggle-weight-wrapper {
+  float: right;
+  margin-bottom: 1em;
+}
 
 .views-ui-rearrange-filter-form table {
   border: medium none;
diff --git a/core/themes/seven/images/add.png b/core/themes/seven/images/add.png
deleted file mode 100644
index 1a2faf6..0000000
--- a/core/themes/seven/images/add.png
+++ /dev/null
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDR		��gIDATxڅOA� ӽY��ژ�i����cJ�%����B���@���9�[��[*��������:�'�`H*Ho����\�)��󗭹��x�-
-��u��^��b�Z�J IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-asc-active.png b/core/themes/seven/images/arrow-asc-active.png
deleted file mode 100644
index 7536eee..0000000
--- a/core/themes/seven/images/arrow-asc-active.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	��6YtEXtSoftwareAdobe ImageReadyq�e<PLTE��X���tRNS��0JIDATx�b`�F8�a2�X�`�!
^Cbl!IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-asc.png b/core/themes/seven/images/arrow-asc.png
deleted file mode 100644
index 56d2728..0000000
--- a/core/themes/seven/images/arrow-asc.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	��6YtEXtSoftwareAdobe ImageReadyq�e<PLTEHu���tRNS��0JIDATx�b`�F8�a2�X�`�!
^Cbl!IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-desc-active.png b/core/themes/seven/images/arrow-desc-active.png
deleted file mode 100644
index f1bf910..0000000
--- a/core/themes/seven/images/arrow-desc-active.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	��6YtEXtSoftwareAdobe ImageReadyq�e<PLTE��X���tRNS��0J IDATx�b`���a10������B��IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-desc.png b/core/themes/seven/images/arrow-desc.png
deleted file mode 100644
index eaf80c5..0000000
--- a/core/themes/seven/images/arrow-desc.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	��6YtEXtSoftwareAdobe ImageReadyq�e<PLTEHu���tRNS��0J IDATx�b`���a10������B��IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-next.png b/core/themes/seven/images/arrow-next.png
deleted file mode 100644
index ed551de..0000000
--- a/core/themes/seven/images/arrow-next.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR/e��=IDAT[U�[���Z�u��b�˶)�;��]��6B�F�� v�������&g
#g��KIEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/arrow-prev.png b/core/themes/seven/images/arrow-prev.png
deleted file mode 100644
index 64b2dac..0000000
--- a/core/themes/seven/images/arrow-prev.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR/e��:IDAT����+�\�d�&��S��v��Bh}K��xS��+s��+?��e�{��IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/required.svg b/core/themes/seven/images/required.svg
deleted file mode 100644
index 584c13c..0000000
--- a/core/themes/seven/images/required.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e62600" d="M0,7.562l1.114-3.438c2.565,0.906,4.43,1.688,5.59,2.35C6.398,3.553,6.237,1.544,6.22,0.447h3.511 c-0.05,1.597-0.234,3.6-0.558,6.003c1.664-0.838,3.566-1.613,5.714-2.325L16,7.562c-2.05,0.678-4.06,1.131-6.028,1.356 c0.984,0.856,2.372,2.381,4.166,4.575l-2.906,2.059c-0.935-1.274-2.041-3.009-3.316-5.206c-1.194,2.275-2.244,4.013-3.147,5.206 l-2.856-2.059c1.872-2.307,3.211-3.832,4.017-4.575C3.849,8.516,1.872,8.062,0,7.562"/></svg>
diff --git a/core/themes/seven/images/task-check.png b/core/themes/seven/images/task-check.png
deleted file mode 100644
index 64fadf8..0000000
--- a/core/themes/seven/images/task-check.png
+++ /dev/null
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDRe^|�lPLTE���6���|�������ٴ���:�<���n��yH�(���|�e�߿�ݼ���7��ԩ���d�JX�<�֮A� F�%��戸s`�DC�#�լ���n�U��k���~�h���ʨ��TIDAT��
�@���A�޻��hVK<K7�8l�)[���O�f:b�g_Ø�u{��\��=yI���t�o
-T���m��=8�IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/task-item-rtl.png b/core/themes/seven/images/task-item-rtl.png
deleted file mode 100644
index fbf6185..0000000
--- a/core/themes/seven/images/task-item-rtl.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	v+�gAMA����0PLTE������eee���555bbb222����������������?��-IDAT�c������?~@bۻ?�
	�w@�3����S$�/����FC6�IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/images/task-item.png b/core/themes/seven/images/task-item.png
deleted file mode 100644
index c2f9bf0..0000000
--- a/core/themes/seven/images/task-item.png
+++ /dev/null
@@ -1,3 +0,0 @@
-�PNG
-
-
IHDR	�3i0IDAT[c����?0�g0}�D�Bh�^��0
���!�F�I�@�
)�%kG�IEND�B`�
\ No newline at end of file
diff --git a/core/themes/seven/seven.info.yml b/core/themes/seven/seven.info.yml
index 81e77ff..ac8ce30 100644
--- a/core/themes/seven/seven.info.yml
+++ b/core/themes/seven/seven.info.yml
@@ -41,6 +41,10 @@ libraries-extend:
     - seven/vertical-tabs
   core/jquery.ui:
     - seven/seven.jquery.ui
+  toolbar/toolbar:
+    - seven/seven.toolbar
+  tour/tour-styling:
+    - seven/tour-styling
 quickedit_stylesheets:
   - css/components/quickedit.css
 regions:
diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml
index cec9887..9c4d5f7 100644
--- a/core/themes/seven/seven.libraries.yml
+++ b/core/themes/seven/seven.libraries.yml
@@ -29,7 +29,6 @@ global-styling:
       css/components/tablesort-indicator.css: {}
       css/components/system-status-report.css: {}
       css/components/tabs.css: {}
-      css/components/tour.theme.css: {}
       css/components/views-ui.css: {}
     layout:
       css/layout/layout.css: {}
@@ -44,6 +43,12 @@ node-form:
   dependencies:
     - node/form
 
+seven.toolbar:
+  version: VERSION
+  css:
+    theme:
+      css/components/user.icons.admin.css: {}
+
 maintenance-page:
   version: VERSION
   js:
@@ -93,3 +98,9 @@ seven.drupal.dialog:
   css:
     theme:
       css/components/dialog.css: {}
+
+tour-styling:
+  version: VERSION
+  css:
+    theme:
+      css/components/tour.theme.css: {}
diff --git a/core/themes/seven/templates/entity-add-list.html.twig b/core/themes/seven/templates/entity-add-list.html.twig
new file mode 100644
index 0000000..3ff2e71
--- /dev/null
+++ b/core/themes/seven/templates/entity-add-list.html.twig
@@ -0,0 +1,27 @@
+{#
+/**
+ * @file
+ * Theme override to to present a list of available bundles.
+ *
+ * Available variables:
+ *   - bundles: A list of bundles, each with the following properties:
+ *     - label: Bundle label.
+ *     - description: Bundle description.
+ *     - add_link: Link to create an entity of this bundle.
+ *   - add_bundle_message: The message shown when there are no bundles. Only
+ *                         available if the entity type uses bundle entities.
+ *
+ * @see template_preprocess_entity_add_list()
+ */
+#}
+{% if bundles is not empty %}
+  <ul class="admin-list">
+    {% for bundle in bundles %}
+      <li class="clearfix"><a href="{{ bundle.add_link.url }}"><span class="label">{{ bundle.label }}</span><div class="description">{{ bundle.description }}</div></a></li>
+    {% endfor %}
+  </ul>
+{% elseif add_bundle_message is not empty %}
+  <p>
+    {{ add_bundle_message }}
+  </p>
+{% endif %}
diff --git a/core/themes/seven/templates/install-page.html.twig b/core/themes/seven/templates/install-page.html.twig
index 2ada24d..f1335a8 100644
--- a/core/themes/seven/templates/install-page.html.twig
+++ b/core/themes/seven/templates/install-page.html.twig
@@ -30,7 +30,7 @@
 
   <main role="main">
     {% if title %}
-      <h1>{{ title }}</h1>
+      <h2 class="heading-a">{{ title }}</h2>
     {% endif %}
     {{ page.highlighted }}
     {{ page.content }}
diff --git a/core/themes/stable/css/ckeditor/plugins/language/ckeditor.language.css b/core/themes/stable/css/ckeditor/plugins/language/ckeditor.language.css
new file mode 100644
index 0000000..feea125
--- /dev/null
+++ b/core/themes/stable/css/ckeditor/plugins/language/ckeditor.language.css
@@ -0,0 +1,19 @@
+/**
+ * @file
+ * Language: add styling for elements that have a language attribute.
+ */
+
+/**
+ * Show the user that a 'lang' tag has been applied by adding a thin dotted
+ * border. We also append the value of the tag between brackets, for example:
+ * '(en)'. Since the html element has a 'lang' attribute too we only target
+ * elements within the html scope.
+ */
+html [lang] {
+  outline: 1px dotted gray;
+}
+html [lang]:after {
+  content: " ("attr(lang)")";
+  font-size: 10px;
+  color: #666;
+}
diff --git a/core/themes/stable/stable.info.yml b/core/themes/stable/stable.info.yml
index e1981fe..3476833 100644
--- a/core/themes/stable/stable.info.yml
+++ b/core/themes/stable/stable.info.yml
@@ -21,6 +21,10 @@ libraries-override:
     css:
       component:
         css/plugins/drupalimagecaption/ckeditor.drupalimagecaption.css: css/ckeditor/plugins/drupalimagecaption/ckeditor.drupalimagecaption.css
+  ckeditor/drupal.ckeditor.plugins.language:
+    css:
+      component:
+        css/plugins/language/ckeditor.language.css: css/ckeditor/plugins/language/ckeditor.language.css
   ckeditor/drupal.ckeditor.admin:
     css:
       theme:
diff --git a/core/themes/stable/stable.theme b/core/themes/stable/stable.theme
new file mode 100644
index 0000000..456a4ad
--- /dev/null
+++ b/core/themes/stable/stable.theme
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Functions to support theming in the Stable theme.
+ */
+
+use Drupal\Component\Utility\Html;
+
+/**
+ * Implements template_preprocess_links().
+ */
+function stable_preprocess_links(&$variables) {
+  // @deprecated in Drupal 8.0.x and will be removed before 9.0.0. This feature
+  // of adding a class based on the associative key can cause CSS class name
+  // conflicts.
+  if (!empty($variables['links'])) {
+    foreach ($variables['links'] as $key => $value) {
+      if (!is_numeric($key)) {
+        $class = Html::getClass($key);
+        $variables['links'][$key]['attributes']->addClass($class);
+      }
+    }
+  }
+}
diff --git a/core/themes/stable/templates/admin/block-list.html.twig b/core/themes/stable/templates/admin/block-list.html.twig
deleted file mode 100644
index 0da7e94..0000000
--- a/core/themes/stable/templates/admin/block-list.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{#
-/**
- * @file
- * Two column template for the block add/edit form.
- *
- * This template will be used when a block edit form specifies 'block_edit_form'
- * as its #theme callback.  Otherwise, by default, block add/edit forms will be
- * themed by form.html.twig.
- *
- * Available variables:
- * - form: The block add/edit form.
- */
-#}
-<div class="layout-block-list clearfix">
-  <div class="layout-region block-list-primary">
-    {{ form|without('place_blocks') }}
-  </div>
-  <div class="layout-region block-list-secondary">
-    {{ form.place_blocks }}
-  </div>
-</div>
diff --git a/core/themes/stable/templates/admin/help-section.html.twig b/core/themes/stable/templates/admin/help-section.html.twig
new file mode 100644
index 0000000..4b0d7bd
--- /dev/null
+++ b/core/themes/stable/templates/admin/help-section.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Theme override for a section of the help page.
+ *
+ * Available variables:
+ * - title: The section title.
+ * - description: The description text for the section.
+ * - links: Links to display in the section.
+ * - empty: Text to display if there are no links.
+ */
+#}
+<h2>{{ title }}</h2>
+<p>{{ description }}</p>
+{% if links %}
+  <ul>
+  {% for link in links %}
+    <li>{{ link }}</li>
+  {% endfor %}
+  </ul>
+{% else %}
+  <p>{{ empty }}</p>
+{% endif %}
diff --git a/core/themes/stable/templates/content-edit/entity-add-list.html.twig b/core/themes/stable/templates/content-edit/entity-add-list.html.twig
new file mode 100644
index 0000000..8d73786
--- /dev/null
+++ b/core/themes/stable/templates/content-edit/entity-add-list.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of available bundles.
+ *
+ * Available variables:
+ *   - bundles: A list of bundles, each with the following properties:
+ *     - label: Bundle label.
+ *     - description: Bundle description.
+ *     - add_link: Link to create an entity of this bundle.
+ *   - add_bundle_message: The message shown when there are no bundles. Only
+ *                         available if the entity type uses bundle entities.
+ *
+ * @see template_preprocess_entity_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if bundles is not empty %}
+  <dl>
+    {% for bundle in bundles %}
+      <dt>{{ bundle.add_link }}</dt>
+      <dd>{{ bundle.description }}</dd>
+    {% endfor %}
+  </dl>
+{% elseif add_bundle_message is not empty %}
+  <p>
+    {{ add_bundle_message }}
+  </p>
+{% endif %}
diff --git a/core/themes/stable/templates/content/taxonomy-term.html.twig b/core/themes/stable/templates/content/taxonomy-term.html.twig
index 09c242b..78203d9 100644
--- a/core/themes/stable/templates/content/taxonomy-term.html.twig
+++ b/core/themes/stable/templates/content/taxonomy-term.html.twig
@@ -23,7 +23,7 @@
  * @see template_preprocess_taxonomy_term()
  */
 #}
-<div{{ attributes}}>
+<div{{ attributes }}>
   {{ title_prefix }}
   {% if not page %}
     <h2><a href="{{ url }}">{{ name }}</a></h2>
diff --git a/core/themes/stable/templates/navigation/links.html.twig b/core/themes/stable/templates/navigation/links.html.twig
index f82f41a..c1bff6b 100644
--- a/core/themes/stable/templates/navigation/links.html.twig
+++ b/core/themes/stable/templates/navigation/links.html.twig
@@ -13,7 +13,6 @@
  *     to l() as its $options parameter.
  *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
  *     tag if no 'href' is supplied.
- *   - link_key: The link CSS class.
  * - heading: (optional) A heading to precede the links.
  *   - text: The heading text.
  *   - level: The heading level (e.g. 'h2', 'h3').
@@ -41,8 +40,8 @@
     {%- endif -%}
   {%- endif -%}
   <ul{{ attributes }}>
-    {%- for key, item in links -%}
-      <li{{ item.attributes.addClass(key|clean_class) }}>
+    {%- for item in links -%}
+      <li{{ item.attributes }}>
         {%- if item.link -%}
           {{ item.link }}
         {%- elseif item.text_attributes -%}
diff --git a/example.gitignore b/example.gitignore
index e2f0124..d1e35ac 100644
--- a/example.gitignore
+++ b/example.gitignore
@@ -7,9 +7,12 @@
 # Because .gitignore can be specific to your site, this file has a different
 # name; updating Drupal core will not override your custom .gitignore file.
 
-# Ignore core and vendor when managing dependencies with Composer.
+# Ignore core when managing all of a project's dependencies with Composer
+# including Drupal core.
 # core
-# vendor
+
+# Core's dependencies are managed with Composer.
+vendor
 
 # Ignore configuration files that may contain sensitive information.
 sites/*/settings*.php
diff --git a/sites/example.settings.local.php b/sites/example.settings.local.php
index dfcc244..c3347ad 100644
--- a/sites/example.settings.local.php
+++ b/sites/example.settings.local.php
@@ -93,3 +93,15 @@
  * using these parameters in a request to rebuild.php.
  */
 $settings['rebuild_access'] = TRUE;
+
+/**
+ * Skip file system permissions hardening.
+ *
+ * The system module will periodically check the permissions of your site's
+ * site directory to ensure that it is not writable by the website user. For
+ * sites that are managed with a version control system, this can cause problems
+ * when files in that directory such as settings.php are updated, because the
+ * user pulling in the changes won't have permissions to modify files in the
+ * directory.
+ */
+$settings['skip_permissions_hardening'] = TRUE;
diff --git a/vendor/.htaccess b/vendor/.htaccess
deleted file mode 100644
index 90748bb..0000000
--- a/vendor/.htaccess
+++ /dev/null
@@ -1,23 +0,0 @@
-# Deny all requests from Apache 2.4+.
-<IfModule mod_authz_core.c>
-  Require all denied
-</IfModule>
-
-# Deny all requests from Apache 2.0-2.2.
-<IfModule !mod_authz_core.c>
-  Deny from all
-</IfModule>
-# Turn off all options we don't need.
-Options -Indexes -ExecCGI -Includes -MultiViews
-
-# Set the catch-all handler to prevent scripts from being executed.
-SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-<Files *>
-  # Override the handler again if we're run later in the evaluation list.
-  SetHandler Drupal_Security_Do_Not_Remove_See_SA_2013_003
-</Files>
-
-# If we know how to do it safely, disable the PHP engine entirely.
-<IfModule mod_php5.c>
-  php_flag engine off
-</IfModule>
diff --git a/vendor/autoload.php b/vendor/autoload.php
deleted file mode 100644
index 5111b1b..0000000
--- a/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInitDrupal8::getLoader();
diff --git a/vendor/behat/mink-browserkit-driver/.gitignore b/vendor/behat/mink-browserkit-driver/.gitignore
deleted file mode 100644
index 3ccd9ee..0000000
--- a/vendor/behat/mink-browserkit-driver/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor
-composer.lock
-/phpunit.xml
diff --git a/vendor/behat/mink-browserkit-driver/.travis.yml b/vendor/behat/mink-browserkit-driver/.travis.yml
deleted file mode 100644
index 9c08e64..0000000
--- a/vendor/behat/mink-browserkit-driver/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: php
-
-sudo: false
-
-php: [5.3, 5.4, 5.5, 5.6, hhvm]
-
-matrix:
-  include:
-    - php: 5.5
-      env: SYMFONY_VERSION='2.3.*'
-    - php: 5.5
-      env: SYMFONY_VERSION='2.5.*@dev'
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-before_install:
-  - sh -c 'if [ "$SYMFONY_VERSION" != "" ]; then composer require -n --no-update symfony/symfony=$SYMFONY_VERSION; fi;'
-
-install:
-  - composer install -n
-
-script: phpunit -v --coverage-clover=coverage.clover
-
-after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/vendor/behat/mink-browserkit-driver/CHANGELOG.md b/vendor/behat/mink-browserkit-driver/CHANGELOG.md
deleted file mode 100644
index 1b8e790..0000000
--- a/vendor/behat/mink-browserkit-driver/CHANGELOG.md
+++ /dev/null
@@ -1,54 +0,0 @@
-1.3.0 / 2015-09-21
-==================
-
-BC break:
-
-* Dropped support for Symfony 2.2 and older
-* Bumped required PHP version to 5.3.6
-
-New features:
-
-* Updated the driver to use findElementsXpaths for Mink 1.7 and forward compatibility with Mink 2
-
-Bug fixes:
-
-* Improved the exception message when clicking on an invalid element
-* Use `saveHTML` to get correct HTML code back
-
-Misc:
-
-* Updated the repository structure to PSR-4
-
-1.2.0 / 2014-09-26
-==================
-
-BC break:
-
-* Changed the behavior of `getValue` for checkboxes according to the BC break in Mink 1.6
-
-New features:
-
-* Implemented `getOuterHtml`
-* Added the support of manipulating forms without submit buttons
-* Added support of any request headers instead of supporting only a few hardcoded ones
-* Added support of any BrowserKit client using `filterResponse` when using BrowserKit 2.3+
-* Added the support of reset buttons
-* Implemented `submitForm`
-* Implemented `isSelected`
-
-Bug fixes:
-
-* Fixed the support of options without value attribute in `isSelected` and `getValue`
-* Added the support of radio buttons in `isChecked`
-* Fixed the submission of empty textarea fields
-* Refactored the handling of request headers to ensure they are reset when resetting the driver
-* Fixed the handling of buttons to submit only for submit buttons rather than all buttons
-* Fixed the code to throw exceptions rather than triggering a fatal error for invalid usages of the driver
-* Fixed the removal of cookies
-* Fixed the submission of form fields with same name and without id
-* Fixed `getAttribute` to return `null` for missing attributes rather than an empty string
-
-Testing:
-
-* Updated the testsuite to use the new Mink 1.6 driver testsuite
-* Added testing on HHVM
diff --git a/vendor/behat/mink-browserkit-driver/LICENSE b/vendor/behat/mink-browserkit-driver/LICENSE
deleted file mode 100644
index 3365ae6..0000000
--- a/vendor/behat/mink-browserkit-driver/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012-2013 Konstantin Kudryashov <ever.zet@gmail.com>
-
-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/vendor/behat/mink-browserkit-driver/README.md b/vendor/behat/mink-browserkit-driver/README.md
deleted file mode 100644
index 1903a5f..0000000
--- a/vendor/behat/mink-browserkit-driver/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Mink BrowserKit Driver
-======================
-
-[![Latest Stable Version](https://poser.pugx.org/behat/mink-browserkit-driver/v/stable.png)](https://packagist.org/packages/behat/mink-browserkit-driver)
-[![Latest Unstable Version](https://poser.pugx.org/behat/mink-browserkit-driver/v/unstable.svg)](https://packagist.org/packages/behat/mink-browserkit-driver)
-[![Total Downloads](https://poser.pugx.org/behat/mink-browserkit-driver/downloads.png)](https://packagist.org/packages/behat/mink-browserkit-driver)
-[![Build Status](https://travis-ci.org/minkphp/MinkBrowserKitDriver.svg?branch=master)](https://travis-ci.org/minkphp/MinkBrowserKitDriver)
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/minkphp/MinkBrowserKitDriver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkBrowserKitDriver/)
-[![Code Coverage](https://scrutinizer-ci.com/g/minkphp/MinkBrowserKitDriver/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkBrowserKitDriver/)
-[![License](https://poser.pugx.org/behat/mink-browserkit-driver/license.svg)](https://packagist.org/packages/behat/mink-browserkit-driver)
-
-Usage Example
--------------
-
-``` php
-<?php
-
-use Behat\Mink\Mink,
-    Behat\Mink\Session,
-    Behat\Mink\Driver\BrowserKitDriver;
-
-use Symfony\Component\HttpKernel\Client;
-
-$app  = require_once(__DIR__.'/app.php'); // Silex app
-
-$mink = new Mink(array(
-    'silex' => new Session(new BrowserKitDriver(new Client($app))),
-));
-
-$mink->getSession('silex')->getPage()->findLink('Chat')->click();
-```
-
-Installation
-------------
-
-``` json
-{
-    "require": {
-        "behat/mink":                   "~1.5",
-        "behat/mink-browserkit-driver": "~1.1"
-    }
-}
-```
-
-``` bash
-$> curl -sS https://getcomposer.org/installer | php
-$> php composer.phar install
-```
-
-Maintainers
------------
-
-* Christophe Coevoet [stof](https://github.com/stof)
-* Other [awesome developers](https://github.com/minkphp/MinkBrowserKitDriver/graphs/contributors)
diff --git a/vendor/behat/mink-browserkit-driver/composer.json b/vendor/behat/mink-browserkit-driver/composer.json
deleted file mode 100644
index 7d12bbc..0000000
--- a/vendor/behat/mink-browserkit-driver/composer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name":         "behat/mink-browserkit-driver",
-    "description":  "Symfony2 BrowserKit driver for Mink framework",
-    "keywords":     ["Symfony2", "Mink", "testing", "browser"],
-    "homepage":     "http://mink.behat.org/",
-    "type":         "mink-driver",
-    "license":      "MIT",
-
-    "authors": [
-        {
-            "name":      "Konstantin Kudryashov",
-            "email":     "ever.zet@gmail.com",
-            "homepage":  "http://everzet.com"
-        }
-    ],
-
-    "require": {
-        "php":                  ">=5.3.6",
-        "behat/mink":           "~1.7@dev",
-        "symfony/browser-kit":  "~2.3",
-        "symfony/dom-crawler":  "~2.3"
-    },
-
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "silex/silex": "~1.2"
-    },
-
-    "autoload": {
-        "psr-4": {
-            "Behat\\Mink\\Driver\\": "src/"
-        }
-    },
-
-    "autoload-dev": {
-        "psr-4": {
-            "Behat\\Mink\\Tests\\Driver\\": "tests"
-        }
-    },
-
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3.x-dev"
-        }
-    }
-}
diff --git a/vendor/behat/mink-browserkit-driver/phpunit.xml.dist b/vendor/behat/mink-browserkit-driver/phpunit.xml.dist
deleted file mode 100644
index d91581c..0000000
--- a/vendor/behat/mink-browserkit-driver/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="vendor/behat/mink/driver-testsuite/bootstrap.php">
-    <php>
-        <var name="driver_config_factory" value="Behat\Mink\Tests\Driver\BrowserKitConfig::getInstance" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Driver test suite">
-            <directory>tests</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Basic</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Form</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/behat/mink-browserkit-driver/src/BrowserKitDriver.php b/vendor/behat/mink-browserkit-driver/src/BrowserKitDriver.php
deleted file mode 100644
index 70682e7..0000000
--- a/vendor/behat/mink-browserkit-driver/src/BrowserKitDriver.php
+++ /dev/null
@@ -1,855 +0,0 @@
-<?php
-
-/*
- * This file is part of the Behat\Mink.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Symfony\Component\BrowserKit\Client;
-use Symfony\Component\BrowserKit\Cookie;
-use Symfony\Component\BrowserKit\Response;
-use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\DomCrawler\Field\ChoiceFormField;
-use Symfony\Component\DomCrawler\Field\FileFormField;
-use Symfony\Component\DomCrawler\Field\FormField;
-use Symfony\Component\DomCrawler\Field\InputFormField;
-use Symfony\Component\DomCrawler\Field\TextareaFormField;
-use Symfony\Component\DomCrawler\Form;
-use Symfony\Component\HttpKernel\Client as HttpKernelClient;
-
-/**
- * Symfony2 BrowserKit driver.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class BrowserKitDriver extends CoreDriver
-{
-    private $client;
-
-    /**
-     * @var Form[]
-     */
-    private $forms = array();
-    private $serverParameters = array();
-    private $started = false;
-    private $removeScriptFromUrl = false;
-    private $removeHostFromUrl = false;
-
-    /**
-     * Initializes BrowserKit driver.
-     *
-     * @param Client      $client  BrowserKit client instance
-     * @param string|null $baseUrl Base URL for HttpKernel clients
-     */
-    public function __construct(Client $client, $baseUrl = null)
-    {
-        $this->client = $client;
-        $this->client->followRedirects(true);
-
-        if ($baseUrl !== null && $client instanceof HttpKernelClient) {
-            $client->setServerParameter('SCRIPT_FILENAME', parse_url($baseUrl, PHP_URL_PATH));
-        }
-    }
-
-    /**
-     * Returns BrowserKit HTTP client instance.
-     *
-     * @return Client
-     */
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    /**
-     * Tells driver to remove hostname from URL.
-     *
-     * @param Boolean $remove
-     *
-     * @deprecated Deprecated as of 1.2, to be removed in 2.0. Pass the base url in the constructor instead.
-     */
-    public function setRemoveHostFromUrl($remove = true)
-    {
-        trigger_error(
-            'setRemoveHostFromUrl() is deprecated as of 1.2 and will be removed in 2.0. Pass the base url in the constructor instead.',
-            E_USER_DEPRECATED
-        );
-        $this->removeHostFromUrl = (bool) $remove;
-    }
-
-    /**
-     * Tells driver to remove script name from URL.
-     *
-     * @param Boolean $remove
-     *
-     * @deprecated Deprecated as of 1.2, to be removed in 2.0. Pass the base url in the constructor instead.
-     */
-    public function setRemoveScriptFromUrl($remove = true)
-    {
-        trigger_error(
-            'setRemoveScriptFromUrl() is deprecated as of 1.2 and will be removed in 2.0. Pass the base url in the constructor instead.',
-            E_USER_DEPRECATED
-        );
-        $this->removeScriptFromUrl = (bool) $remove;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        $this->started = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStarted()
-    {
-        return $this->started;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function stop()
-    {
-        $this->reset();
-        $this->started = false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reset()
-    {
-        // Restarting the client resets the cookies and the history
-        $this->client->restart();
-        $this->forms = array();
-        $this->serverParameters = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function visit($url)
-    {
-        $this->client->request('GET', $this->prepareUrl($url), array(), array(), $this->serverParameters);
-        $this->forms = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCurrentUrl()
-    {
-        $request = $this->client->getInternalRequest();
-
-        if ($request === null) {
-            throw new DriverException('Unable to access the request before visiting a page');
-        }
-
-        return $request->getUri();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reload()
-    {
-        $this->client->reload();
-        $this->forms = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function forward()
-    {
-        $this->client->forward();
-        $this->forms = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function back()
-    {
-        $this->client->back();
-        $this->forms = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setBasicAuth($user, $password)
-    {
-        if (false === $user) {
-            unset($this->serverParameters['PHP_AUTH_USER'], $this->serverParameters['PHP_AUTH_PW']);
-
-            return;
-        }
-
-        $this->serverParameters['PHP_AUTH_USER'] = $user;
-        $this->serverParameters['PHP_AUTH_PW'] = $password;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setRequestHeader($name, $value)
-    {
-        $contentHeaders = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
-        $name = str_replace('-', '_', strtoupper($name));
-
-        // CONTENT_* are not prefixed with HTTP_ in PHP when building $_SERVER
-        if (!isset($contentHeaders[$name])) {
-            $name = 'HTTP_' . $name;
-        }
-
-        $this->serverParameters[$name] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHeaders()
-    {
-        return $this->getResponse()->getHeaders();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCookie($name, $value = null)
-    {
-        if (null === $value) {
-            $this->deleteCookie($name);
-
-            return;
-        }
-
-        $jar = $this->client->getCookieJar();
-        $jar->set(new Cookie($name, $value));
-    }
-
-    /**
-     * Deletes a cookie by name.
-     *
-     * @param string $name Cookie name.
-     */
-    private function deleteCookie($name)
-    {
-        $path = $this->getCookiePath();
-        $jar = $this->client->getCookieJar();
-
-        do {
-            if (null !== $jar->get($name, $path)) {
-                $jar->expire($name, $path);
-            }
-
-            $path = preg_replace('/.$/', '', $path);
-        } while ($path);
-    }
-
-    /**
-     * Returns current cookie path.
-     *
-     * @return string
-     */
-    private function getCookiePath()
-    {
-        $path = dirname(parse_url($this->getCurrentUrl(), PHP_URL_PATH));
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $path = str_replace('\\', '/', $path);
-        }
-
-        return $path;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCookie($name)
-    {
-        // Note that the following doesn't work well because
-        // Symfony\Component\BrowserKit\CookieJar stores cookies by name,
-        // path, AND domain and if you don't fill them all in correctly then
-        // you won't get the value that you're expecting.
-        //
-        // $jar = $this->client->getCookieJar();
-        //
-        // if (null !== $cookie = $jar->get($name)) {
-        //     return $cookie->getValue();
-        // }
-
-        $allValues = $this->client->getCookieJar()->allValues($this->getCurrentUrl());
-
-        if (isset($allValues[$name])) {
-            return $allValues[$name];
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStatusCode()
-    {
-        return $this->getResponse()->getStatus();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        return $this->getResponse()->getContent();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function findElementXpaths($xpath)
-    {
-        $nodes = $this->getCrawler()->filterXPath($xpath);
-
-        $elements = array();
-        foreach ($nodes as $i => $node) {
-            $elements[] = sprintf('(%s)[%d]', $xpath, $i + 1);
-        }
-
-        return $elements;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTagName($xpath)
-    {
-        return $this->getCrawlerNode($this->getFilteredCrawler($xpath))->nodeName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getText($xpath)
-    {
-        $text = $this->getFilteredCrawler($xpath)->text();
-        $text = str_replace("\n", ' ', $text);
-        $text = preg_replace('/ {2,}/', ' ', $text);
-
-        return trim($text);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHtml($xpath)
-    {
-        // cut the tag itself (making innerHTML out of outerHTML)
-        return preg_replace('/^\<[^\>]+\>|\<[^\>]+\>$/', '', $this->getOuterHtml($xpath));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOuterHtml($xpath)
-    {
-        $node = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-
-        return $node->ownerDocument->saveHTML($node);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttribute($xpath, $name)
-    {
-        $node = $this->getFilteredCrawler($xpath);
-
-        if ($this->getCrawlerNode($node)->hasAttribute($name)) {
-            return $node->attr($name);
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue($xpath)
-    {
-        if (in_array($this->getAttribute($xpath, 'type'), array('submit', 'image', 'button'), true)) {
-            return $this->getAttribute($xpath, 'value');
-        }
-
-        $node = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-
-        if ('option' === $node->tagName) {
-            return $this->getOptionValue($node);
-        }
-
-        try {
-            $field = $this->getFormField($xpath);
-        } catch (\InvalidArgumentException $e) {
-            return $this->getAttribute($xpath, 'value');
-        }
-
-        return $field->getValue();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setValue($xpath, $value)
-    {
-        $this->getFormField($xpath)->setValue($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function check($xpath)
-    {
-        $this->getCheckboxField($xpath)->tick();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function uncheck($xpath)
-    {
-        $this->getCheckboxField($xpath)->untick();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function selectOption($xpath, $value, $multiple = false)
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField) {
-            throw new DriverException(sprintf('Impossible to select an option on the element with XPath "%s" as it is not a select or radio input', $xpath));
-        }
-
-        if ($multiple) {
-            $oldValue   = (array) $field->getValue();
-            $oldValue[] = $value;
-            $value      = $oldValue;
-        }
-
-        $field->select($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isSelected($xpath)
-    {
-        $optionValue = $this->getOptionValue($this->getCrawlerNode($this->getFilteredCrawler($xpath)));
-        $selectField = $this->getFormField('(' . $xpath . ')/ancestor-or-self::*[local-name()="select"]');
-        $selectValue = $selectField->getValue();
-
-        return is_array($selectValue) ? in_array($optionValue, $selectValue, true) : $optionValue === $selectValue;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function click($xpath)
-    {
-        $crawler = $this->getFilteredCrawler($xpath);
-        $node = $this->getCrawlerNode($crawler);
-        $tagName = $node->nodeName;
-
-        if ('a' === $tagName) {
-            $this->client->click($crawler->link());
-            $this->forms = array();
-        } elseif ($this->canSubmitForm($node)) {
-            $this->submit($crawler->form());
-        } elseif ($this->canResetForm($node)) {
-            $this->resetForm($node);
-        } else {
-            $message = sprintf('%%s supports clicking on links and submit or reset buttons only. But "%s" provided', $tagName);
-
-            throw new UnsupportedDriverActionException($message, $this);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isChecked($xpath)
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField || 'select' === $field->getType()) {
-            throw new DriverException(sprintf('Impossible to get the checked state of the element with XPath "%s" as it is not a checkbox or radio input', $xpath));
-        }
-
-        if ('checkbox' === $field->getType()) {
-            return $field->hasValue();
-        }
-
-        $radio = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-
-        return $radio->getAttribute('value') === $field->getValue();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function attachFile($xpath, $path)
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof FileFormField) {
-            throw new DriverException(sprintf('Impossible to attach a file on the element with XPath "%s" as it is not a file input', $xpath));
-        }
-
-        $field->upload($path);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function submitForm($xpath)
-    {
-        $crawler = $this->getFilteredCrawler($xpath);
-
-        $this->submit($crawler->form());
-    }
-
-    /**
-     * @return Response
-     *
-     * @throws DriverException If there is not response yet
-     */
-    protected function getResponse()
-    {
-        $response = $this->client->getInternalResponse();
-
-        if (null === $response) {
-            throw new DriverException('Unable to access the response before visiting a page');
-        }
-
-        return $response;
-    }
-
-    /**
-     * Prepares URL for visiting.
-     * Removes "*.php/" from urls and then passes it to BrowserKitDriver::visit().
-     *
-     * @param string $url
-     *
-     * @return string
-     */
-    protected function prepareUrl($url)
-    {
-        $replacement = ($this->removeHostFromUrl ? '' : '$1') . ($this->removeScriptFromUrl ? '' : '$2');
-
-        return preg_replace('#(https?\://[^/]+)(/[^/\.]+\.php)?#', $replacement, $url);
-    }
-
-    /**
-     * Returns form field from XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return FormField
-     *
-     * @throws DriverException
-     */
-    protected function getFormField($xpath)
-    {
-        $fieldNode = $this->getCrawlerNode($this->getFilteredCrawler($xpath));
-        $fieldName = str_replace('[]', '', $fieldNode->getAttribute('name'));
-
-        $formNode = $this->getFormNode($fieldNode);
-        $formId = $this->getFormNodeId($formNode);
-
-        if (!isset($this->forms[$formId])) {
-            $this->forms[$formId] = new Form($formNode, $this->getCurrentUrl());
-        }
-
-        if (is_array($this->forms[$formId][$fieldName])) {
-            return $this->forms[$formId][$fieldName][$this->getFieldPosition($fieldNode)];
-        }
-
-        return $this->forms[$formId][$fieldName];
-    }
-
-    /**
-     * Returns the checkbox field from xpath query, ensuring it is valid.
-     *
-     * @param string $xpath
-     *
-     * @return ChoiceFormField
-     *
-     * @throws DriverException when the field is not a checkbox
-     */
-    private function getCheckboxField($xpath)
-    {
-        $field = $this->getFormField($xpath);
-
-        if (!$field instanceof ChoiceFormField) {
-            throw new DriverException(sprintf('Impossible to check the element with XPath "%s" as it is not a checkbox', $xpath));
-        }
-
-        return $field;
-    }
-
-    /**
-     * @param \DOMElement $element
-     *
-     * @return \DOMElement
-     *
-     * @throws DriverException if the form node cannot be found
-     */
-    private function getFormNode(\DOMElement $element)
-    {
-        if ($element->hasAttribute('form')) {
-            $formId = $element->getAttribute('form');
-            $formNode = $element->ownerDocument->getElementById($formId);
-
-            if (null === $formNode || 'form' !== $formNode->nodeName) {
-                throw new DriverException(sprintf('The selected node has an invalid form attribute (%s).', $formId));
-            }
-
-            return $formNode;
-        }
-
-        $formNode = $element;
-
-        do {
-            // use the ancestor form element
-            if (null === $formNode = $formNode->parentNode) {
-                throw new DriverException('The selected node does not have a form ancestor.');
-            }
-        } while ('form' !== $formNode->nodeName);
-
-        return $formNode;
-    }
-
-    /**
-     * Gets the position of the field node among elements with the same name
-     *
-     * BrowserKit uses the field name as index to find the field in its Form object.
-     * When multiple fields have the same name (checkboxes for instance), it will return
-     * an array of elements in the order they appear in the DOM.
-     *
-     * @param \DOMElement $fieldNode
-     *
-     * @return integer
-     */
-    private function getFieldPosition(\DOMElement $fieldNode)
-    {
-        $elements = $this->getCrawler()->filterXPath('//*[@name=\''.$fieldNode->getAttribute('name').'\']');
-
-        if (count($elements) > 1) {
-            // more than one element contains this name !
-            // so we need to find the position of $fieldNode
-            foreach ($elements as $key => $element) {
-                /** @var \DOMElement $element */
-                if ($element->getNodePath() === $fieldNode->getNodePath()) {
-                    return $key;
-                }
-            }
-        }
-
-        return 0;
-    }
-
-    private function submit(Form $form)
-    {
-        $formId = $this->getFormNodeId($form->getFormNode());
-
-        if (isset($this->forms[$formId])) {
-            $this->mergeForms($form, $this->forms[$formId]);
-        }
-
-        // remove empty file fields from request
-        foreach ($form->getFiles() as $name => $field) {
-            if (empty($field['name']) && empty($field['tmp_name'])) {
-                $form->remove($name);
-            }
-        }
-
-        foreach ($form->all() as $field) {
-            // Add a fix for https://github.com/symfony/symfony/pull/10733 to support Symfony versions which are not fixed
-            if ($field instanceof TextareaFormField && null === $field->getValue()) {
-                $field->setValue('');
-            }
-        }
-
-        $this->client->submit($form);
-
-        $this->forms = array();
-    }
-
-    private function resetForm(\DOMElement $fieldNode)
-    {
-        $formNode = $this->getFormNode($fieldNode);
-        $formId = $this->getFormNodeId($formNode);
-        unset($this->forms[$formId]);
-    }
-
-    /**
-     * Determines if a node can submit a form.
-     *
-     * @param \DOMElement $node Node.
-     *
-     * @return boolean
-     */
-    private function canSubmitForm(\DOMElement $node)
-    {
-        $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
-
-        if ('input' === $node->nodeName && in_array($type, array('submit', 'image'), true)) {
-            return true;
-        }
-
-        return 'button' === $node->nodeName && (null === $type || 'submit' === $type);
-    }
-
-    /**
-     * Determines if a node can reset a form.
-     *
-     * @param \DOMElement $node Node.
-     *
-     * @return boolean
-     */
-    private function canResetForm(\DOMElement $node)
-    {
-        $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
-
-        return in_array($node->nodeName, array('input', 'button'), true) && 'reset' === $type;
-    }
-
-    /**
-     * Returns form node unique identifier.
-     *
-     * @param \DOMElement $form
-     *
-     * @return string
-     */
-    private function getFormNodeId(\DOMElement $form)
-    {
-        return md5($form->getLineNo() . $form->getNodePath() . $form->nodeValue);
-    }
-
-    /**
-     * Gets the value of an option element
-     *
-     * @param \DOMElement $option
-     *
-     * @return string
-     *
-     * @see \Symfony\Component\DomCrawler\Field\ChoiceFormField::buildOptionValue
-     */
-    private function getOptionValue(\DOMElement $option)
-    {
-        if ($option->hasAttribute('value')) {
-            return $option->getAttribute('value');
-        }
-
-        if (!empty($option->nodeValue)) {
-            return $option->nodeValue;
-        }
-
-        return '1'; // DomCrawler uses 1 by default if there is no text in the option
-    }
-
-    /**
-     * Merges second form values into first one.
-     *
-     * @param Form $to   merging target
-     * @param Form $from merging source
-     */
-    private function mergeForms(Form $to, Form $from)
-    {
-        foreach ($from->all() as $name => $field) {
-            $fieldReflection = new \ReflectionObject($field);
-            $nodeReflection  = $fieldReflection->getProperty('node');
-            $valueReflection = $fieldReflection->getProperty('value');
-
-            $nodeReflection->setAccessible(true);
-            $valueReflection->setAccessible(true);
-
-            $isIgnoredField = $field instanceof InputFormField &&
-                in_array($nodeReflection->getValue($field)->getAttribute('type'), array('submit', 'button', 'image'), true);
-
-            if (!$isIgnoredField) {
-                $valueReflection->setValue($to[$name], $valueReflection->getValue($field));
-            }
-        }
-    }
-
-    /**
-     * Returns DOMElement from crawler instance.
-     *
-     * @param Crawler $crawler
-     *
-     * @return \DOMElement
-     *
-     * @throws DriverException when the node does not exist
-     */
-    private function getCrawlerNode(Crawler $crawler)
-    {
-        $crawler->rewind();
-        $node = $crawler->current();
-
-        if (null !== $node) {
-            return $node;
-        }
-
-        throw new DriverException('The element does not exist');
-    }
-
-    /**
-     * Returns a crawler filtered for the given XPath, requiring at least 1 result.
-     *
-     * @param string $xpath
-     *
-     * @return Crawler
-     *
-     * @throws DriverException when no matching elements are found
-     */
-    private function getFilteredCrawler($xpath)
-    {
-        if (!count($crawler = $this->getCrawler()->filterXPath($xpath))) {
-            throw new DriverException(sprintf('There is no element matching XPath "%s"', $xpath));
-        }
-
-        return $crawler;
-    }
-
-    /**
-     * Returns crawler instance (got from client).
-     *
-     * @return Crawler
-     *
-     * @throws DriverException
-     */
-    private function getCrawler()
-    {
-        $crawler = $this->client->getCrawler();
-
-        if (null === $crawler) {
-            throw new DriverException('Unable to access the response content before visiting a page');
-        }
-
-        return $crawler;
-    }
-}
diff --git a/vendor/behat/mink-goutte-driver/.gitignore b/vendor/behat/mink-goutte-driver/.gitignore
deleted file mode 100644
index 1d034f4..0000000
--- a/vendor/behat/mink-goutte-driver/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor
-composer.phar
-composer.lock
-phpunit.xml
diff --git a/vendor/behat/mink-goutte-driver/.travis.yml b/vendor/behat/mink-goutte-driver/.travis.yml
deleted file mode 100644
index 5b86531..0000000
--- a/vendor/behat/mink-goutte-driver/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-php: [5.3, 5.4, 5.5, 5.6, hhvm]
-
-before_install:
-  # Force using Goutte 2 on HHVM for now because Guzzle 6 is broken there
-  - if [ "hhvm" = "$TRAVIS_PHP_VERSION" ]; then composer require fabpot/goutte '~2' --no-update; fi
-
-install:
-  - composer install
-
-before_script:
-  - export WEB_FIXTURES_HOST=http://localhost:8000
-
-  # Start a webserver for web fixtures. Force using PHP 5.6 to be able to run it on PHP 5.3 and HHVM jobs too
-  - ~/.phpenv/versions/5.6/bin/php -S localhost:8000 -t vendor/behat/mink/driver-testsuite/web-fixtures > /dev/null 2>&1 &
-
-script: phpunit -v --coverage-clover=coverage.clover
-
-after_script:
-  - wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/vendor/behat/mink-goutte-driver/CHANGELOG.md b/vendor/behat/mink-goutte-driver/CHANGELOG.md
deleted file mode 100644
index 581eb5e..0000000
--- a/vendor/behat/mink-goutte-driver/CHANGELOG.md
+++ /dev/null
@@ -1,31 +0,0 @@
-1.2.0 / 2015-09-21
-==================
-
-New features:
-
-* Added support for Goutte 3.1+
-
-Misc:
-
-* Updated the repository structure to PSR-4
-
-1.1.0 / 2014-10-09
-==================
-
-The driver now relies on BrowserKitDriver 1.2.x, so all changes of this driver are relevant.
-The changes below only describe the changes related to GoutteDriver specifically.
-
-New features:
-
-* Added the possibility to use a normal Goutte client instead of requiring to use an extended one
-* Added the support of Goutte 2.0 as well
-
-Bug fixes:
-
-* Fixed the support of disabling basic auth
-* Fixed the resetting of the driver to reset the basic auth
-
-Testing:
-
-* Updated the testsuite to use the new Mink 1.6 driver testsuite
-* Added testing on HHVM
diff --git a/vendor/behat/mink-goutte-driver/LICENSE b/vendor/behat/mink-goutte-driver/LICENSE
deleted file mode 100644
index 3365ae6..0000000
--- a/vendor/behat/mink-goutte-driver/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012-2013 Konstantin Kudryashov <ever.zet@gmail.com>
-
-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/vendor/behat/mink-goutte-driver/README.md b/vendor/behat/mink-goutte-driver/README.md
deleted file mode 100644
index cba60a0..0000000
--- a/vendor/behat/mink-goutte-driver/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-Mink Goutte Driver
-==================
-
-[![Latest Stable Version](https://poser.pugx.org/behat/mink-goutte-driver/v/stable.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
-[![Latest Unstable Version](https://poser.pugx.org/behat/mink-goutte-driver/v/unstable.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
-[![Total Downloads](https://poser.pugx.org/behat/mink-goutte-driver/downloads.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
-[![Build Status](https://travis-ci.org/minkphp/MinkGoutteDriver.svg?branch=master)](https://travis-ci.org/minkphp/MinkGoutteDriver)
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/)
-[![Code Coverage](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/minkphp/MinkGoutteDriver/)
-[![License](https://poser.pugx.org/behat/mink-goutte-driver/license.svg)](https://packagist.org/packages/behat/mink-goutte-driver)
-
-Usage Example
--------------
-
-``` php
-<?php
-
-require "vendor/autoload.php";
-
-use Behat\Mink\Mink,
-    Behat\Mink\Session,
-    Behat\Mink\Driver\GoutteDriver,
-    Behat\Mink\Driver\Goutte\Client as GoutteClient;
-
-$mink = new Mink(array(
-    'goutte' => new Session(new GoutteDriver(new GoutteClient())),
-));
-
-$session = $mink->getSession('goutte');
-$session->visit("http://php.net/");
-$session->getPage()->clickLink('Downloads');
-echo $session->getCurrentUrl() . PHP_EOL;
-```
-
-Installation
-------------
-
-Add a file composer.json with content:
-
-``` json
-{
-    "require": {
-        "behat/mink":               "~1.5",
-        "behat/mink-goutte-driver": "~1.0"
-    }
-}
-```
-
-(or merge the above into your project's existing composer.json file)
-
-``` bash
-$> curl -sS https://getcomposer.org/installer | php
-$> php composer.phar install
-```
-
-Maintainers
------------
-
-* Christophe Coevoet [stof](https://github.com/stof)
-* Other [awesome developers](https://github.com/minkphp/MinkGoutteDriver/graphs/contributors)
diff --git a/vendor/behat/mink-goutte-driver/composer.json b/vendor/behat/mink-goutte-driver/composer.json
deleted file mode 100644
index 80d6ecf..0000000
--- a/vendor/behat/mink-goutte-driver/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name":         "behat/mink-goutte-driver",
-    "description":  "Goutte driver for Mink framework",
-    "keywords":     ["goutte", "headless", "testing", "browser"],
-    "homepage":     "http://mink.behat.org/",
-    "type":         "mink-driver",
-    "license":      "MIT",
-
-    "authors": [
-        {
-            "name":      "Konstantin Kudryashov",
-            "email":     "ever.zet@gmail.com",
-            "homepage":  "http://everzet.com"
-        }
-    ],
-
-    "require": {
-        "php":                           ">=5.3.1",
-        "behat/mink":                    "~1.6@dev",
-        "behat/mink-browserkit-driver":  "~1.2@dev",
-        "fabpot/goutte":                 "~1.0.4|~2.0|~3.1"
-    },
-
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7"
-    },
-
-    "autoload": {
-        "psr-4": {
-            "Behat\\Mink\\Driver\\": "src/"
-        }
-    },
-
-    "autoload-dev": {
-        "psr-4": {
-            "Behat\\Mink\\Tests\\Driver\\": "tests"
-        }
-    },
-
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
diff --git a/vendor/behat/mink-goutte-driver/phpunit.xml.dist b/vendor/behat/mink-goutte-driver/phpunit.xml.dist
deleted file mode 100644
index cbe57c4..0000000
--- a/vendor/behat/mink-goutte-driver/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="vendor/behat/mink/driver-testsuite/bootstrap.php">
-    <testsuites>
-        <testsuite name="Driver test suite">
-            <directory>tests</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Basic</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Form</directory>
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <var name="driver_config_factory" value="Behat\Mink\Tests\Driver\GoutteConfig::getInstance" />
-
-        <!--server name="WEB_FIXTURES_HOST" value="http://test.mink.dev" /-->
-    </php>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/behat/mink-goutte-driver/src/Goutte/Client.php b/vendor/behat/mink-goutte-driver/src/Goutte/Client.php
deleted file mode 100644
index 9d64be7..0000000
--- a/vendor/behat/mink-goutte-driver/src/Goutte/Client.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Behat\Mink.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Driver\Goutte;
-
-use Goutte\Client as BaseClient;
-use Symfony\Component\BrowserKit\Response;
-
-/**
- * Client overrides to support Mink functionality.
- */
-class Client extends BaseClient
-{
-    /**
-     * Reads response meta tags to guess content-type charset.
-     *
-     * @param Response $response
-     *
-     * @return Response
-     */
-    protected function filterResponse($response)
-    {
-        $contentType = $response->getHeader('Content-Type');
-
-        if (!$contentType || false === strpos($contentType, 'charset=')) {
-            if (preg_match('/\<meta[^\>]+charset *= *["\']?([a-zA-Z\-0-9]+)/i', $response->getContent(), $matches)) {
-                $headers = $response->getHeaders();
-                $headers['Content-Type'] = $contentType.';charset='.$matches[1];
-
-                $response = new Response($response->getContent(), $response->getStatus(), $headers);
-            }
-        }
-
-        return parent::filterResponse($response);
-    }
-}
diff --git a/vendor/behat/mink-goutte-driver/src/GoutteDriver.php b/vendor/behat/mink-goutte-driver/src/GoutteDriver.php
deleted file mode 100644
index a42d5a2..0000000
--- a/vendor/behat/mink-goutte-driver/src/GoutteDriver.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Behat\Mink.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Driver;
-
-use Behat\Mink\Driver\Goutte\Client as ExtendedClient;
-use Goutte\Client;
-
-/**
- * Goutte driver.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class GoutteDriver extends BrowserKitDriver
-{
-    /**
-     * Initializes Goutte driver.
-     *
-     * @param Client $client Goutte client instance
-     */
-    public function __construct(Client $client = null)
-    {
-        parent::__construct($client ?: new ExtendedClient());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setBasicAuth($user, $password)
-    {
-        if (false === $user) {
-            $this->getClient()->resetAuth();
-
-            return;
-        }
-
-        $this->getClient()->setAuth($user, $password);
-    }
-
-    /**
-     * Gets the Goutte client.
-     *
-     * The method is overwritten only to provide the appropriate return type hint.
-     *
-     * @return Client
-     */
-    public function getClient()
-    {
-        return parent::getClient();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reset()
-    {
-        parent::reset();
-        $this->getClient()->resetAuth();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function prepareUrl($url)
-    {
-        return $url;
-    }
-}
diff --git a/vendor/behat/mink/.gitignore b/vendor/behat/mink/.gitignore
deleted file mode 100644
index 66de342..0000000
--- a/vendor/behat/mink/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.tgz
-*.phar
-phpunit.xml
-composer.lock
-vendor
diff --git a/vendor/behat/mink/.travis.yml b/vendor/behat/mink/.travis.yml
deleted file mode 100644
index 677ee0e..0000000
--- a/vendor/behat/mink/.travis.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-language: php
-
-sudo: false
-
-php: [5.3, 5.4, 5.5, 5.6, 7.0, hhvm]
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.3
-      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable' SYMFONY_DEPRECATIONS_HELPER=weak
-  allow_failures:
-    - php: 7.0
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-before_install:
-  - composer self-update
-
-install:
-  - composer update $COMPOSER_FLAGS
-
-script: phpunit -v --coverage-clover=coverage.clover
-
-after_script:
-  - if [[ "7.0" != "$TRAVIS_PHP_VERSION" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/vendor/behat/mink/CHANGES.md b/vendor/behat/mink/CHANGES.md
deleted file mode 100644
index 4ef4ecb..0000000
--- a/vendor/behat/mink/CHANGES.md
+++ /dev/null
@@ -1,297 +0,0 @@
-1.7.0 / 2015-09-20
-==================
-
-New features:
-
-* Added `Session::getResponseHeader` to access a response header easily
-* Added support for header assertions
-* Added a forward compatibility layer for drivers to allow them to prepare
-  for Mink 2.0 (they won't require any change if they use it). They should
-  now overwrite `CoreDriver::findElementXpaths` instead of implementing `find`
-  and `setSession` themselves.
-* Added escaping of the locator in the NamedSelector rather than expecting
-  the caller to perform the escaping. Passing an escaped locator is still
-  supported but deprecated.
-* Remove the dependency on the Session in expectation exceptions. Passing
-  the session in the exception constructor is now deprecated. The driver
-  should be passed instead.
-
-Bug fixes:
-
-* Fixed the URL assertions when comparing paths ending in ``.php``
-* Silenced deprecation warnings (following the Symfony convention) to make
-  them less invasive. Use the `symfony/phpunit-bridge` to get them reported
-  when using Mink in your PHPUnit tests.
-* Fixed `NodeElement::hasClass` in case the class attribute contains newlines
-
-Testsuite:
-
-* Made the testsuite compatible with PHPUnit strict timing mode (only the library testsuite, not the driver one)
-* Added testing against PHP 7
-* Added testing against lowest version of dependencies to ensure we got the lower bounds right
-
-Driver testsuite:
-
-* Added an extra test to ensure the right behavior when getting the HTML with empty elements
-* Added a few more safeguards to ensure test failures rather than fatal errors for misbehaving drivers
-* Added a test ensuring that drivers follow recommended practices
-
-Misc:
-
-* Added a few missing deprecation warnings for deprecated APIs or classes.
-
-1.6.1 / 2015-02-04
-==================
-
-Bug fixes:
-
-* Added a check for empty path in `WebAssert::cleanUrl()`
-
-Driver testsuite:
-
-* Added an extra test to ensure the right behavior for traversal
-
-Misc:
-
-* Changed the description in the composer.json
-* Switched the repository structure to use PSR-4
-* Updated URLs for the move to the new Github organization
-
-1.6.0 / 2014-09-26
-==================
-
-  * [BC break] Changed the named selector to prefer exact matches over partial matches
-  * [BC break] Changed `NodeElement::getValue` for checkboxes to return the value rather than the checked state (use `isChecked` for that)
-  * Fixed the XPath prefixing when searching inside an existing element
-  * Refactored the driver testsuite entirely and expand it to cover drivers entirely (covering many more cases for consistency)
-  * Changed `NodeElement::setValue` to support any fields rather than only input elements
-  * Removed the wrapping of any driver-level exception in a MinkException on invalid usage as it was making the code too complex
-  * Fixed the matching of the input type in the named selector to be case insensitive according to the HTML spec
-  * Introduced `Behat\Mink\Selector\Xpath\Escaper` to allow reusing the XPath escaping
-  * Deprecated `Element::getSession`. Code needing the session should get it from outside rather than the element
-  * Changed ElementNotFoundException to extend from ExpectationException
-  * Added `Element::getOuterHtml` to get the HTML code of the element including itself
-  * Fixed the name selectors to match on the `placeholder` only for textual inputs
-  * Enforced consistent behavior for drivers on 4xx and 5xx response to return the response rather than throwing an exception
-  * Added `Element::waitFor` to allow retrying some code until it succeeds or the timeout is reached
-  * Added `Element::isValid` to check whether an element still exists in the page
-  * Made `Session::executeScript` compatible across drivers by ensuring they all support the same syntaxes for the JS expression
-  * Made `Session::evaluateScript` compatible across drivers by ensuring they all support the same syntaxes for the JS expression
-  * Removed `hasClass` from `DocumentElement` (instead of triggering a fatal error)
-  * Added testing on HHVM to ensure consistency
-  * Fixed `NodeElement::getTagName` to ensure that the tag name is lowercase for all drivers
-  * Fixed `Element::hasAttribute` to ensure it supports attributes with an empty value
-  * Fixed the `field` selector to avoid matching inputs with the type `submit` or `reset`
-  * Changed the button XPath selection to accept `reset` buttons as well
-  * Changed `Session::wait` to return the condition value rather than nothing
-  * Added `Session::getWindowName` and `Session::getWindowNames` to get the name of the current and of all windows
-  * Added `Session::maximizeWindow` to maximize the window
-  * Added `NodeElement::isSelected` to check whether an `<option>` is selected
-  * Added `NodeElement::submitForm` to allow submitting a form without using a button
-  * Added assertions about the value of an attribute
-  * Added the anchor in the assertion on the URL in `WebAssert`
-
-1.5.0 / 2013-04-14
-==================
-
-  * Add `CoreDriver` to simplify future drivers improvements
-  * Add `Mink::isSessionStarted()` method
-  * Fix multibite string `preg_replace` bugs
-  * Fix handling of whitespaces in `WebAssert::pageText...()` methods
-
-1.4.3 / 2013-03-02
-==================
-
-  * Bump dependencies constraints
-
-1.4.2 / 2013-02-13
-==================
-
-  * Fix wrong test case to ensure that core drivers work as expected
-
-1.4.1 / 2013-02-10
-==================
-
-  * Update dependencies
-  * Add ElementException to element actions
-  * Rel attribute support for named selectors
-  * Add hasClass() helper to traversable elements
-  * Add getScreenshot() method to session
-  * Name attr support in named selector for button
-  * Fix for bunch of bugs
-
-1.4.0 / 2012-05-40
-==================
-
-  * New `Session::selectWindow()` and `Session::selectIFrame()` methods
-  * New built-in `WebAssert` class
-  * Fixed DocBlocks (autocompletion in any IDE now should just work)
-  * Moved Behat-related code into `Behat\MinkExtension`
-  * Removed PHPUnit test case class
-  * Updated composer dependencies to not require custom repository anymore
-  * All drivers moved into separate packages
-
-1.3.3 / 2012-03-23
-==================
-
-  * Prevent exceptions in `__toString()`
-  * Added couple of useful step definitions for Behat
-  * Fixed issues #168, #211, #212, #208
-  * Lot of small bug fixes and improvements
-  * Fixed dependencies and composer installation routine
-
-1.3.2 / 2011-12-21
-==================
-
-  * Fixed webdriver registration in MinkContext
-
-1.3.1 / 2011-12-21
-==================
-
-  * Fixed Composer package
-
-1.3.0 / 2011-12-21
-==================
-
-  * Brand new Selenium2Driver (webdriver session)
-  * Multiselect bugfixes
-  * ZombieDriver back in the business
-  * Composer now manages dependencies
-  * Some MinkContext steps got fixes
-  * Lots of bug fixes and cleanup
-
-1.2.0 / 2011-11-04
-==================
-
-  * Brand new SeleniumDriver (thanks @alexandresalome)
-  * Multiselect support (multiple options selection), including new Behat steps
-  * Ability to select option by it's text (in addition to value)
-  * ZombieDriver updates
-  * Use SuiteHooks to populate parameters (no need to call parent __construct anymore)
-  * Updated Goutte and all vendors
-  * Lot of bugfixes and new tests
-
-1.1.1 / 2011-08-12
-==================
-
-  * Fixed Zombie.js server termination on Linux
-  * Fixed base_url usage for external URLs
-
-1.1.0 / 2011-08-08
-==================
-
-  * Added Zombie.js driver (thanks @b00giZm)
-  * Added pt translation (thanks Daniel Gomes)
-  * Refactored MinkContext and MinkTestCase
-
-1.0.3 / 2011-08-02
-==================
-
-  * File uploads for empty fields fixed (GoutteDriver)
-  * Lazy sessions restart
-  * `show_tmp_dir` option in MinkContext
-  * Updated to stable Symfony2 components
-  * SahiClient connection limit bumped to 60 seconds
-  * Dutch language support
-
-1.0.2 / 2011-07-22
-==================
-
-  * ElementHtmlException fixed (thanks @Stof)
-
-1.0.1 / 2011-07-21
-==================
-
-  * Fixed buggy assertions in MinkContext
-
-1.0.0 / 2011-07-20
-==================
-
-  * Added missing tests for almost everything
-  * Hude speedup for SahiDriver
-  * Support for Behat 2.0 contexts
-  * Bundled PHPUnit TestCase
-  * Deep element traversing
-  * Correct behavior of getText() method
-  * New getHtml() method
-  * Basic HTTP auth support
-  * Soft and hard session resetting
-  * Cookies management
-  * Browser history interactions (reload(), back(), forward())
-  * Weaverryan'd exception messages
-  * Huge amount of bugfixes and small additions
-
-0.3.2 / 2011-06-20
-==================
-
-  * Fixed file uploads in Goutte driver
-  * Fixed setting of long texts into fields
-  * Added getPlainText() (returns text without tags and whitespaces) method to the element's API
-  * Start_url is now optional parameter
-  * Default session (if needed) name now need to be always specified by hands with setDefaultSessionName()
-  * default_driver => default_session
-  * Updated Symfony Components
-
-0.3.1 / 2011-05-17
-==================
-
-  * Small SahiClient update (it generates SID now if no provided)
-  * setActiveSessionName => setDefaultSessionName method rename
-
-0.3.0 / 2011-05-17
-==================
-
-  * Rewritten from scratch Mink drivers handler. Now it's sessions handler. And Mink now
-    sessions-centric tool. See examples in readme. Much cleaner API now.
-
-0.2.4 / 2011-05-12
-==================
-
-  * Fixed wrong url locator function
-  * Fixed wrong regex in `should see` step
-  * Fixed delimiters use in `should see` step
-  * Added url-match step for checking urls against regex
-
-0.2.3 / 2011-05-01
-==================
-
-  * Updated SahiClient with new version, which is faster and cleaner with it's exceptions
-
-0.2.2 / 2011-05-01
-==================
-
-  * Ability to use already started browser as SahiDriver aim
-  * Added japanese translation for bundled steps (thanks @hidenorigoto)
-  * 10 seconds limit for browser connection in SahiDriver
-
-0.2.1 / 2011-04-21
-==================
-
-  * Fixed some bundled step definitions
-
-0.2.0 / 2011-04-21
-==================
-
-  * Additional step definitions
-  * Support for extended drivers configuration through behat.yml environment parameters
-  * Lots of new named selectors
-  * Bug fixes
-  * Small improvements
-
-0.1.2 / 2011-04-08
-==================
-
-  * Fixed Sahi url escaping
-
-0.1.1 / 2011-04-06
-==================
-
-  * Fixed should/should_not steps
-  * Added spanish translation
-  * Fixed forms to use <base> element
-  * Fixed small UnsupportedByDriverException issue
-
-0.1.0 / 2011-04-04
-==================
-
-  * Initial release
diff --git a/vendor/behat/mink/CONTRIBUTING.md b/vendor/behat/mink/CONTRIBUTING.md
deleted file mode 100644
index 5db4d85..0000000
--- a/vendor/behat/mink/CONTRIBUTING.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributing
-Mink is an open source, community-driven project. If you'd like to contribute, feel free to do this, but remember to follow these few simple rules:
-
-## Submitting an issues
-- __Driver-related__ issues must be reported in the corresponding driver repository
-- A reproducible example is required for every bug report, otherwise it will most probably be __closed without warning__
-- If you are going to make a big, substantial change, let's discuss it first
-
-## Working with Pull Requests
-1. Create your feature addition or a bug fix branch based on `master` branch in your repository's fork.
-2. Make necessary changes, but __don't mix__ code reformatting with code changes on topic.
-3. Add tests for those changes (please look into `tests/` folder for some examples). This is important so we don't break it in a future version unintentionally.
-4. Commit your code, but do not mess with `CHANGES.md`.
-5. Squash your commits by topic to preserve a clean and readable log.
-6. Create Pull Request.
-
-# Running tests
-Make sure that you don't break anything with your changes by running:
-
-```bash
-$> phpunit
-```
diff --git a/vendor/behat/mink/LICENSE b/vendor/behat/mink/LICENSE
deleted file mode 100644
index 854754b..0000000
--- a/vendor/behat/mink/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2011-2015 Konstantin Kudryashov <ever.zet@gmail.com>
-
-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/vendor/behat/mink/README.md b/vendor/behat/mink/README.md
deleted file mode 100644
index 2299506..0000000
--- a/vendor/behat/mink/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Mink
-====
-[![Latest Stable Version](https://poser.pugx.org/behat/mink/v/stable.svg)](https://packagist.org/packages/behat/mink)
-[![Latest Unstable Version](https://poser.pugx.org/behat/mink/v/unstable.svg)](https://packagist.org/packages/behat/mink)
-[![Total Downloads](https://poser.pugx.org/behat/mink/downloads.svg)](https://packagist.org/packages/behat/mink)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/minkphp/Mink/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/minkphp/Mink/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/minkphp/Mink/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/minkphp/Mink/)
-[![Build Status](https://travis-ci.org/minkphp/Mink.svg?branch=master)](https://travis-ci.org/minkphp/Mink)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/5bb8fab0-978f-428a-ae23-44ee4e129fbc/mini.png)](https://insight.sensiolabs.com/projects/5bb8fab0-978f-428a-ae23-44ee4e129fbc)
-[![License](https://poser.pugx.org/behat/mink/license.svg)](https://packagist.org/packages/behat/mink)
-
-
-Useful Links
-------------
-
-- The main website with documentation is at [http://mink.behat.org](http://mink.behat.org)
-- Official Google Group is at [http://groups.google.com/group/behat](http://groups.google.com/group/behat)
-- IRC channel on [#freenode](http://freenode.net/) is `#behat`
-- [Note on Patches/Pull Requests](CONTRIBUTING.md)
-
-Usage Example
--------------
-
-``` php
-<?php
-
-use Behat\Mink\Mink,
-    Behat\Mink\Session,
-    Behat\Mink\Driver\GoutteDriver,
-    Behat\Mink\Driver\Goutte\Client as GoutteClient;
-
-$startUrl = 'http://example.com';
-
-// init Mink and register sessions
-$mink = new Mink(array(
-    'goutte1' => new Session(new GoutteDriver(new GoutteClient())),
-    'goutte2' => new Session(new GoutteDriver(new GoutteClient())),
-    'custom'  => new Session(new MyCustomDriver($startUrl))
-));
-
-// set the default session name
-$mink->setDefaultSessionName('goutte2');
-
-// visit a page
-$mink->getSession()->visit($startUrl);
-
-// call to getSession() without argument will always return a default session if has one (goutte2 here)
-$mink->getSession()->getPage()->findLink('Downloads')->click();
-echo $mink->getSession()->getPage()->getContent();
-
-// call to getSession() with argument will return session by its name
-$mink->getSession('custom')->getPage()->findLink('Downloads')->click();
-echo $mink->getSession('custom')->getPage()->getContent();
-
-// this all is done to make possible mixing sessions
-$mink->getSession('goutte1')->getPage()->findLink('Chat')->click();
-$mink->getSession('goutte2')->getPage()->findLink('Chat')->click();
-```
-
-Install Dependencies
---------------------
-
-``` bash
-$> curl -sS https://getcomposer.org/installer | php
-$> php composer.phar install
-```
-
-Contributors
-------------
-
-* Konstantin Kudryashov [everzet](https://github.com/everzet) [lead developer]
-* Christophe Coevoet [stof](https://github.com/stof) [lead developer]
-* Alexander Obuhovich [aik099](https://github.com/aik099) [lead developer]
-* Other [awesome developers](https://github.com/minkphp/Mink/graphs/contributors)
diff --git a/vendor/behat/mink/composer.json b/vendor/behat/mink/composer.json
deleted file mode 100644
index 0193f43..0000000
--- a/vendor/behat/mink/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name":         "behat/mink",
-    "description":  "Browser controller/emulator abstraction for PHP",
-    "keywords":     ["web", "testing", "browser"],
-    "homepage":     "http://mink.behat.org/",
-    "type":         "library",
-    "license":      "MIT",
-
-    "authors": [
-        {
-            "name":      "Konstantin Kudryashov",
-            "email":     "ever.zet@gmail.com",
-            "homepage":  "http://everzet.com"
-        }
-    ],
-
-    "require": {
-        "php":                   ">=5.3.1",
-        "symfony/css-selector":  "~2.1"
-    },
-
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7"
-    },
-
-    "suggest": {
-        "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-        "behat/mink-goutte-driver":     "fast headless driver for any app without JS emulation",
-        "behat/mink-selenium2-driver":  "slow, but JS-enabled driver for any app (requires Selenium2)",
-        "behat/mink-zombie-driver":     "fast and JS-enabled headless driver for any app (requires node.js)"
-    },
-
-    "autoload": {
-        "psr-4": {
-            "Behat\\Mink\\": "src/"
-        }
-    },
-
-    "autoload-dev": {
-        "psr-4": {
-            "Behat\\Mink\\Tests\\": "tests"
-        }
-    },
-
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.7.x-dev"
-        }
-    }
-}
diff --git a/vendor/behat/mink/phpdoc.ini.dist b/vendor/behat/mink/phpdoc.ini.dist
deleted file mode 100644
index 3fef75d..0000000
--- a/vendor/behat/mink/phpdoc.ini.dist
+++ /dev/null
@@ -1,125 +0,0 @@
-; Default configuration file for PHPDoctor
-
-; This config file will cause PHPDoctor to generate API documentation of
-; itself.
-
-
-; PHPDoctor settings
-; -----------------------------------------------------------------------------
-
-; Names of files to parse. This can be a single filename, or a comma separated
-; list of filenames. Wildcards are allowed.
-
-files = "*.php"
-
-; Names of files or directories to ignore. This can be a single filename, or a
-; comma separated list of filenames. Wildcards are NOT allowed.
-
-ignore = "CVS, .svn, .git, _compiled"
-
-; The directory to look for files in, if not used the PHPDoctor will look in
-; the current directory (the directory it is run from).
-
-source_path = "./src"
-
-; If you do not want PHPDoctor to look in each sub directory for files
-; uncomment this line.
-
-;subdirs = off
-
-; Set how loud PHPDoctor is as it runs. Quiet mode suppresses all output other
-; than warnings and errors. Verbose mode outputs additional messages during
-; execution.
-
-;quiet = on
-;verbose = on
-
-; Select the doclet to use for generating output.
-
-doclet = standard
-;doclet = debug
-
-; The directory to find the doclet in. Doclets are expected to be in a
-; directory named after themselves at the location given.
-
-;doclet_path = ./doclets
-
-; The directory to find taglets in. Taglets allow you to make PHPDoctor handle
-; new tags and to alter the behavour of existing tags and their output.
-
-;taglet_path = ./taglets
-
-; If the code you are parsing does not use package tags or not all elements
-; have package tags, use this setting to place unbound elements into a
-; particular package.
-
-default_package = "Behat\Mink"
-
-; Specifies the name of a HTML file containing text for the overview
-; documentation to be placed on the overview page. The path is relative to
-; "source_path" unless an absolute path is given.
-
-overview = readme.html
-
-; Package comments will be looked for in a file named package.html in the same
-; directory as the first source file parsed in that package or in the directory
-; given below. If package comments are placed in the directory given below then
-; they should be named "<packageName>.html".
-
-package_comment_dir = ./
-
-; Parse out global variables and/or global constants?
-
-;globals = off
-;constants = off
-
-; Generate documentation for all class members
-
-;private = on
-
-; Generate documentation for public and protected class members
-
-;protected = on
-
-; Generate documentation for only public class members
-
-public = on
-
-; Use the PEAR compatible handling of the docblock first sentence
-
-;pear_compat = on
-
-; Standard doclet settings
-; -----------------------------------------------------------------------------
-
-; The directory to place generated documentation in. If the given path is
-; relative to it will be relative to "source_path".
-
-d = "api"
-
-; Specifies the title to be placed in the HTML <title> tag.
-
-windowtitle = "Behat\Mink"
-
-; Specifies the title to be placed near the top of the overview summary file.
-
-doctitle = "Behat\Mink: browser emulators abstraction library for PHP"
-
-; Specifies the header text to be placed at the top of each output file. The
-; header will be placed to the right of the upper navigation bar. 
-
-header = "Behat\Mink"
-
-; Specifies the footer text to be placed at the bottom of each output file. The
-; footer will be placed to the right of the lower navigation bar.
-
-footer = "Behat\Mink"
-
-; Specifies the text to be placed at the bottom of each output file. The text
-; will be placed at the bottom of the page, below the lower navigation bar.
-
-;bottom = "This document was generated by <a href="http://phpdoctor.sourceforge.net/">PHPDoctor: The PHP Documentation Creator</a>"
-
-; Create a class tree?
-
-tree = on
diff --git a/vendor/behat/mink/phpunit.xml.dist b/vendor/behat/mink/phpunit.xml.dist
deleted file mode 100644
index 6695433..0000000
--- a/vendor/behat/mink/phpunit.xml.dist
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Behat Mink test suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/behat/mink/src/Driver/CoreDriver.php b/vendor/behat/mink/src/Driver/CoreDriver.php
deleted file mode 100644
index 9b4c04e..0000000
--- a/vendor/behat/mink/src/Driver/CoreDriver.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Driver;
-
-use Behat\Mink\Element\NodeElement;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Behat\Mink\Session;
-
-/**
- * Core driver.
- * All other drivers should extend this class for future compatibility.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-abstract class CoreDriver implements DriverInterface
-{
-    /**
-     * @var Session
-     */
-    private $session;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSession(Session $session)
-    {
-        $this->session = $session;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        throw new UnsupportedDriverActionException('Starting the driver is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStarted()
-    {
-        throw new UnsupportedDriverActionException('Checking the driver state is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function stop()
-    {
-        throw new UnsupportedDriverActionException('Stopping the driver is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reset()
-    {
-        throw new UnsupportedDriverActionException('Resetting the driver is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function visit($url)
-    {
-        throw new UnsupportedDriverActionException('Visiting an url is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCurrentUrl()
-    {
-        throw new UnsupportedDriverActionException('Getting the current url is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        throw new UnsupportedDriverActionException('Getting the page content is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($xpath)
-    {
-        $elements = array();
-
-        foreach ($this->findElementXpaths($xpath) as $xpath) {
-            $elements[] = new NodeElement($xpath, $this->session);
-        }
-
-        return $elements;
-    }
-
-    /**
-     * Finds elements with specified XPath query.
-     *
-     * @see find()
-     *
-     * @param string $xpath
-     *
-     * @return string[] The XPath of the matched elements
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     */
-    protected function findElementXpaths($xpath)
-    {
-        throw new UnsupportedDriverActionException('Finding elements is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTagName($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the tag name is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getText($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the element text is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHtml($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the element inner HTML is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOuterHtml($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the element outer HTML is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttribute($xpath, $name)
-    {
-        throw new UnsupportedDriverActionException('Getting the element attribute is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the field value is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setValue($xpath, $value)
-    {
-        throw new UnsupportedDriverActionException('Setting the field value is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function check($xpath)
-    {
-        throw new UnsupportedDriverActionException('Checking a checkbox is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function uncheck($xpath)
-    {
-        throw new UnsupportedDriverActionException('Unchecking a checkbox is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isChecked($xpath)
-    {
-        throw new UnsupportedDriverActionException('Getting the state of a checkbox is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function selectOption($xpath, $value, $multiple = false)
-    {
-        throw new UnsupportedDriverActionException('Selecting an option is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function click($xpath)
-    {
-        throw new UnsupportedDriverActionException('Clicking on an element is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function attachFile($xpath, $path)
-    {
-        throw new UnsupportedDriverActionException('Attaching a file in an input is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function reload()
-    {
-        throw new UnsupportedDriverActionException('Page reloading is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function forward()
-    {
-        throw new UnsupportedDriverActionException('Forward action is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function back()
-    {
-        throw new UnsupportedDriverActionException('Backward action is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setBasicAuth($user, $password)
-    {
-        throw new UnsupportedDriverActionException('Basic auth setup is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function switchToWindow($name = null)
-    {
-        throw new UnsupportedDriverActionException('Windows management is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function switchToIFrame($name = null)
-    {
-        throw new UnsupportedDriverActionException('iFrames management is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setRequestHeader($name, $value)
-    {
-        throw new UnsupportedDriverActionException('Request headers manipulation is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHeaders()
-    {
-        throw new UnsupportedDriverActionException('Response headers are not available from %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCookie($name, $value = null)
-    {
-        throw new UnsupportedDriverActionException('Cookies manipulation is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCookie($name)
-    {
-        throw new UnsupportedDriverActionException('Cookies are not available from %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStatusCode()
-    {
-        throw new UnsupportedDriverActionException('Status code is not available from %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getScreenshot()
-    {
-        throw new UnsupportedDriverActionException('Screenshots are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWindowNames()
-    {
-        throw new UnsupportedDriverActionException('Listing all window names is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getWindowName()
-    {
-        throw new UnsupportedDriverActionException('Listing this window name is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function doubleClick($xpath)
-    {
-        throw new UnsupportedDriverActionException('Double-clicking is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rightClick($xpath)
-    {
-        throw new UnsupportedDriverActionException('Right-clicking is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isVisible($xpath)
-    {
-        throw new UnsupportedDriverActionException('Element visibility check is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isSelected($xpath)
-    {
-        throw new UnsupportedDriverActionException('Element selection check is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function mouseOver($xpath)
-    {
-        throw new UnsupportedDriverActionException('Mouse manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function focus($xpath)
-    {
-        throw new UnsupportedDriverActionException('Mouse manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function blur($xpath)
-    {
-        throw new UnsupportedDriverActionException('Mouse manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keyPress($xpath, $char, $modifier = null)
-    {
-        throw new UnsupportedDriverActionException('Keyboard manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keyDown($xpath, $char, $modifier = null)
-    {
-        throw new UnsupportedDriverActionException('Keyboard manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keyUp($xpath, $char, $modifier = null)
-    {
-        throw new UnsupportedDriverActionException('Keyboard manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dragTo($sourceXpath, $destinationXpath)
-    {
-        throw new UnsupportedDriverActionException('Mouse manipulations are not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function executeScript($script)
-    {
-        throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function evaluateScript($script)
-    {
-        throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function wait($timeout, $condition)
-    {
-        throw new UnsupportedDriverActionException('JS is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resizeWindow($width, $height, $name = null)
-    {
-        throw new UnsupportedDriverActionException('Window resizing is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function maximizeWindow($name = null)
-    {
-        throw new UnsupportedDriverActionException('Window maximize is not supported by %s', $this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function submitForm($xpath)
-    {
-        throw new UnsupportedDriverActionException('Form submission is not supported by %s', $this);
-    }
-}
diff --git a/vendor/behat/mink/src/Driver/DriverInterface.php b/vendor/behat/mink/src/Driver/DriverInterface.php
deleted file mode 100644
index 0880960..0000000
--- a/vendor/behat/mink/src/Driver/DriverInterface.php
+++ /dev/null
@@ -1,637 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Driver;
-
-use Behat\Mink\Element\NodeElement;
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Exception\UnsupportedDriverActionException;
-use Behat\Mink\Session;
-
-/**
- * Driver interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface DriverInterface
-{
-    /**
-     * Sets driver's current session.
-     *
-     * @param Session $session
-     */
-    public function setSession(Session $session);
-
-    /**
-     * Starts driver.
-     *
-     * Once started, the driver should be ready to visit a page.
-     *
-     * Calling any action before visiting a page is an undefined behavior.
-     * The only supported method calls on a fresh driver are
-     * - visit()
-     * - setRequestHeader()
-     * - setBasicAuth()
-     * - reset()
-     * - stop()
-     *
-     * Calling start on a started driver is an undefined behavior. Driver
-     * implementations are free to handle it silently or to fail with an
-     * exception.
-     *
-     * @throws DriverException When the driver cannot be started
-     */
-    public function start();
-
-    /**
-     * Checks whether driver is started.
-     *
-     * @return Boolean
-     */
-    public function isStarted();
-
-    /**
-     * Stops driver.
-     *
-     * Once stopped, the driver should be started again before using it again.
-     *
-     * Calling any action on a stopped driver is an undefined behavior.
-     * The only supported method call after stopping a driver is starting it again.
-     *
-     * Calling stop on a stopped driver is an undefined behavior. Driver
-     * implementations are free to handle it silently or to fail with an
-     * exception.
-     *
-     * @throws DriverException When the driver cannot be closed
-     */
-    public function stop();
-
-    /**
-     * Resets driver state.
-     *
-     * This should reset cookies, request headers and basic authentication.
-     * When possible, the history should be reset as well, but this is not enforced
-     * as some implementations may not be able to reset it without restarting the
-     * driver entirely. Consumers requiring a clean history should restart the driver
-     * to enforce it.
-     *
-     * Once reset, the driver should be ready to visit a page.
-     * Calling any action before visiting a page is an undefined behavior.
-     * The only supported method calls on a fresh driver are
-     * - visit()
-     * - setRequestHeader()
-     * - setBasicAuth()
-     * - reset()
-     * - stop()
-     *
-     * Calling reset on a stopped driver is an undefined behavior.
-     */
-    public function reset();
-
-    /**
-     * Visit specified URL.
-     *
-     * @param string $url url of the page
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function visit($url);
-
-    /**
-     * Returns current URL address.
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getCurrentUrl();
-
-    /**
-     * Reloads current page.
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function reload();
-
-    /**
-     * Moves browser forward 1 page.
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function forward();
-
-    /**
-     * Moves browser backward 1 page.
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function back();
-
-    /**
-     * Sets HTTP Basic authentication parameters.
-     *
-     * @param string|Boolean $user     user name or false to disable authentication
-     * @param string         $password password
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function setBasicAuth($user, $password);
-
-    /**
-     * Switches to specific browser window.
-     *
-     * @param string $name window name (null for switching back to main window)
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function switchToWindow($name = null);
-
-    /**
-     * Switches to specific iFrame.
-     *
-     * @param string $name iframe name (null for switching back)
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function switchToIFrame($name = null);
-
-    /**
-     * Sets specific request header on client.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function setRequestHeader($name, $value);
-
-    /**
-     * Returns last response headers.
-     *
-     * @return array
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getResponseHeaders();
-
-    /**
-     * Sets cookie.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function setCookie($name, $value = null);
-
-    /**
-     * Returns cookie by name.
-     *
-     * @param string $name
-     *
-     * @return string|null
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getCookie($name);
-
-    /**
-     * Returns last response status code.
-     *
-     * @return int
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getStatusCode();
-
-    /**
-     * Returns last response content.
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getContent();
-
-    /**
-     * Capture a screenshot of the current window.
-     *
-     * @return string screenshot of MIME type image/* depending
-     *                on driver (e.g., image/png, image/jpeg)
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getScreenshot();
-
-    /**
-     * Return the names of all open windows.
-     *
-     * @return array array of all open windows
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getWindowNames();
-
-    /**
-     * Return the name of the currently active window.
-     *
-     * @return string the name of the current window
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getWindowName();
-
-    /**
-     * Finds elements with specified XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return NodeElement[]
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function find($xpath);
-
-    /**
-     * Returns element's tag name by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getTagName($xpath);
-
-    /**
-     * Returns element's text by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getText($xpath);
-
-    /**
-     * Returns element's inner html by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getHtml($xpath);
-
-    /**
-     * Returns element's outer html by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return string
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getOuterHtml($xpath);
-
-    /**
-     * Returns element's attribute by it's XPath query.
-     *
-     * @param string $xpath
-     * @param string $name
-     *
-     * @return string|null
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function getAttribute($xpath, $name);
-
-    /**
-     * Returns element's value by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return string|bool|array
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::getValue
-     */
-    public function getValue($xpath);
-
-    /**
-     * Sets element's value by it's XPath query.
-     *
-     * @param string            $xpath
-     * @param string|bool|array $value
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::setValue
-     */
-    public function setValue($xpath, $value);
-
-    /**
-     * Checks checkbox by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::check
-     */
-    public function check($xpath);
-
-    /**
-     * Unchecks checkbox by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::uncheck
-     */
-    public function uncheck($xpath);
-
-    /**
-     * Checks whether checkbox or radio button located by it's XPath query is checked.
-     *
-     * @param string $xpath
-     *
-     * @return Boolean
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::isChecked
-     */
-    public function isChecked($xpath);
-
-    /**
-     * Selects option from select field or value in radio group located by it's XPath query.
-     *
-     * @param string  $xpath
-     * @param string  $value
-     * @param Boolean $multiple
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::selectOption
-     */
-    public function selectOption($xpath, $value, $multiple = false);
-
-    /**
-     * Checks whether select option, located by it's XPath query, is selected.
-     *
-     * @param string $xpath
-     *
-     * @return Boolean
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::isSelected
-     */
-    public function isSelected($xpath);
-
-    /**
-     * Clicks button or link located by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function click($xpath);
-
-    /**
-     * Double-clicks button or link located by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function doubleClick($xpath);
-
-    /**
-     * Right-clicks button or link located by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function rightClick($xpath);
-
-    /**
-     * Attaches file path to file field located by it's XPath query.
-     *
-     * @param string $xpath
-     * @param string $path
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::attachFile
-     */
-    public function attachFile($xpath, $path);
-
-    /**
-     * Checks whether element visible located by it's XPath query.
-     *
-     * @param string $xpath
-     *
-     * @return Boolean
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function isVisible($xpath);
-
-    /**
-     * Simulates a mouse over on the element.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function mouseOver($xpath);
-
-    /**
-     * Brings focus to element.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function focus($xpath);
-
-    /**
-     * Removes focus from element.
-     *
-     * @param string $xpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function blur($xpath);
-
-    /**
-     * Presses specific keyboard key.
-     *
-     * @param string     $xpath
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function keyPress($xpath, $char, $modifier = null);
-
-    /**
-     * Pressed down specific keyboard key.
-     *
-     * @param string     $xpath
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function keyDown($xpath, $char, $modifier = null);
-
-    /**
-     * Pressed up specific keyboard key.
-     *
-     * @param string     $xpath
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function keyUp($xpath, $char, $modifier = null);
-
-    /**
-     * Drag one element onto another.
-     *
-     * @param string $sourceXpath
-     * @param string $destinationXpath
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function dragTo($sourceXpath, $destinationXpath);
-
-    /**
-     * Executes JS script.
-     *
-     * @param string $script
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function executeScript($script);
-
-    /**
-     * Evaluates JS script.
-     *
-     * The "return" keyword is optional in the script passed as argument. Driver implementations
-     * must accept the expression both with and without the keyword.
-     *
-     * @param string $script
-     *
-     * @return mixed
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function evaluateScript($script);
-
-    /**
-     * Waits some time or until JS condition turns true.
-     *
-     * @param int    $timeout   timeout in milliseconds
-     * @param string $condition JS condition
-     *
-     * @return bool
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function wait($timeout, $condition);
-
-    /**
-     * Set the dimensions of the window.
-     *
-     * @param int    $width  set the window width, measured in pixels
-     * @param int    $height set the window height, measured in pixels
-     * @param string $name   window name (null for the main window)
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function resizeWindow($width, $height, $name = null);
-
-    /**
-     * Maximizes the window if it is not maximized already.
-     *
-     * @param string $name window name (null for the main window)
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     */
-    public function maximizeWindow($name = null);
-
-    /**
-     * Submits the form.
-     *
-     * @param string $xpath Xpath.
-     *
-     * @throws UnsupportedDriverActionException When operation not supported by the driver
-     * @throws DriverException                  When the operation cannot be done
-     *
-     * @see \Behat\Mink\Element\NodeElement::submitForm
-     */
-    public function submitForm($xpath);
-}
diff --git a/vendor/behat/mink/src/Element/DocumentElement.php b/vendor/behat/mink/src/Element/DocumentElement.php
deleted file mode 100644
index c2daf66..0000000
--- a/vendor/behat/mink/src/Element/DocumentElement.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Element;
-
-/**
- * Document element.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class DocumentElement extends TraversableElement
-{
-    /**
-     * Returns XPath for handled element.
-     *
-     * @return string
-     */
-    public function getXpath()
-    {
-        return '//html';
-    }
-
-    /**
-     * Returns document content.
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return trim($this->getDriver()->getContent());
-    }
-
-    /**
-     * Check whether document has specified content.
-     *
-     * @param string $content
-     *
-     * @return Boolean
-     */
-    public function hasContent($content)
-    {
-        return $this->has('named', array('content', $content));
-    }
-}
diff --git a/vendor/behat/mink/src/Element/Element.php b/vendor/behat/mink/src/Element/Element.php
deleted file mode 100644
index a2b6c0e..0000000
--- a/vendor/behat/mink/src/Element/Element.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Element;
-
-use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Exception\ElementNotFoundException;
-use Behat\Mink\Selector\SelectorsHandler;
-use Behat\Mink\Selector\Xpath\Manipulator;
-use Behat\Mink\Session;
-
-/**
- * Base element.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-abstract class Element implements ElementInterface
-{
-    /**
-     * @var Session
-     */
-    private $session;
-
-    /**
-     * Driver.
-     *
-     * @var DriverInterface
-     */
-    private $driver;
-
-    /**
-     * @var SelectorsHandler
-     */
-    private $selectorsHandler;
-
-    /**
-     * @var Manipulator
-     */
-    private $xpathManipulator;
-
-    /**
-     * Initialize element.
-     *
-     * @param Session $session
-     */
-    public function __construct(Session $session)
-    {
-        $this->xpathManipulator = new Manipulator();
-        $this->session = $session;
-
-        $this->driver = $session->getDriver();
-        $this->selectorsHandler = $session->getSelectorsHandler();
-    }
-
-    /**
-     * Returns element session.
-     *
-     * @return Session
-     *
-     * @deprecated Accessing the session from the element is deprecated as of 1.6 and will be impossible in 2.0.
-     */
-    public function getSession()
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.6 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->session;
-    }
-
-    /**
-     * Returns element's driver.
-     *
-     * @return DriverInterface
-     */
-    protected function getDriver()
-    {
-        return $this->driver;
-    }
-
-    /**
-     * Returns selectors handler.
-     *
-     * @return SelectorsHandler
-     *
-     * @deprecated Accessing the selectors handler in the element is deprecated as of 1.7 and will be impossible in 2.0.
-     */
-    protected function getSelectorsHandler()
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.7 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->selectorsHandler;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($selector, $locator)
-    {
-        return null !== $this->find($selector, $locator);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isValid()
-    {
-        return 1 === count($this->getDriver()->find($this->getXpath()));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function waitFor($timeout, $callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Given callback is not a valid callable');
-        }
-
-        $start = microtime(true);
-        $end = $start + $timeout;
-
-        do {
-            $result = call_user_func($callback, $this);
-
-            if ($result) {
-                break;
-            }
-
-            usleep(100000);
-        } while (microtime(true) < $end);
-
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($selector, $locator)
-    {
-        $items = $this->findAll($selector, $locator);
-
-        return count($items) ? current($items) : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function findAll($selector, $locator)
-    {
-        if ('named' === $selector) {
-            $items = $this->findAll('named_exact', $locator);
-            if (empty($items)) {
-                $items = $this->findAll('named_partial', $locator);
-            }
-
-            return $items;
-        }
-
-        $xpath = $this->selectorsHandler->selectorToXpath($selector, $locator);
-        $xpath = $this->xpathManipulator->prepend($xpath, $this->getXpath());
-
-        return $this->getDriver()->find($xpath);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getText()
-    {
-        return $this->getDriver()->getText($this->getXpath());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHtml()
-    {
-        return $this->getDriver()->getHtml($this->getXpath());
-    }
-
-    /**
-     * Returns element outer html.
-     *
-     * @return string
-     */
-    public function getOuterHtml()
-    {
-        return $this->getDriver()->getOuterHtml($this->getXpath());
-    }
-
-    /**
-     * Builds an ElementNotFoundException.
-     *
-     * @param string      $type
-     * @param string|null $selector
-     * @param string|null $locator
-     *
-     * @return ElementNotFoundException
-     *
-     * @deprecated as of 1.7, to be removed in 2.0
-     */
-    protected function elementNotFound($type, $selector = null, $locator = null)
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.7 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return new ElementNotFoundException($this->driver, $type, $selector, $locator);
-    }
-}
diff --git a/vendor/behat/mink/src/Element/ElementInterface.php b/vendor/behat/mink/src/Element/ElementInterface.php
deleted file mode 100644
index 1d9cc4f..0000000
--- a/vendor/behat/mink/src/Element/ElementInterface.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Element;
-
-use Behat\Mink\Session;
-
-/**
- * Element interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface ElementInterface
-{
-    /**
-     * Returns XPath for handled element.
-     *
-     * @return string
-     */
-    public function getXpath();
-
-    /**
-     * Returns element's session.
-     *
-     * @return Session
-     *
-     * @deprecated Accessing the session from the element is deprecated as of 1.6 and will be impossible in 2.0.
-     */
-    public function getSession();
-
-    /**
-     * Checks whether element with specified selector exists inside the current element.
-     *
-     * @param string       $selector selector engine name
-     * @param string|array $locator  selector locator
-     *
-     * @return Boolean
-     *
-     * @see ElementInterface::findAll for the supported selectors
-     */
-    public function has($selector, $locator);
-
-    /**
-     * Checks if an element still exists in the DOM.
-     *
-     * @return bool
-     */
-    public function isValid();
-
-    /**
-     * Waits for an element(-s) to appear and returns it.
-     *
-     * @param int|float $timeout  Maximal allowed waiting time in seconds.
-     * @param callable  $callback Callback, which result is both used as waiting condition and returned.
-     *                            Will receive reference to `this element` as first argument.
-     *
-     * @return mixed
-     *
-     * @throws \InvalidArgumentException When invalid callback given.
-     */
-    public function waitFor($timeout, $callback);
-
-    /**
-     * Finds first element with specified selector inside the current element.
-     *
-     * @param string       $selector selector engine name
-     * @param string|array $locator  selector locator
-     *
-     * @return NodeElement|null
-     *
-     * @see ElementInterface::findAll for the supported selectors
-     */
-    public function find($selector, $locator);
-
-    /**
-     * Finds all elements with specified selector inside the current element.
-     *
-     * Valid selector engines are named, xpath, css, named_partial and named_exact.
-     *
-     * 'named' is a pseudo selector engine which prefers an exact match but
-     * will return a partial match if no exact match is found.
-     * 'xpath' is a pseudo selector engine supported by SelectorsHandler.
-     *
-     * More selector engines can be registered in the SelectorsHandler.
-     *
-     * @param string       $selector selector engine name
-     * @param string|array $locator  selector locator
-     *
-     * @return NodeElement[]
-     *
-     * @see NamedSelector for the locators supported by the named selectors
-     */
-    public function findAll($selector, $locator);
-
-    /**
-     * Returns element text (inside tag).
-     *
-     * @return string
-     */
-    public function getText();
-
-    /**
-     * Returns element inner html.
-     *
-     * @return string
-     */
-    public function getHtml();
-}
diff --git a/vendor/behat/mink/src/Element/NodeElement.php b/vendor/behat/mink/src/Element/NodeElement.php
deleted file mode 100644
index bbb8573..0000000
--- a/vendor/behat/mink/src/Element/NodeElement.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Element;
-
-use Behat\Mink\Session;
-use Behat\Mink\Exception\ElementNotFoundException;
-
-/**
- * Page element node.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class NodeElement extends TraversableElement
-{
-    private $xpath;
-
-    /**
-     * Initializes node element.
-     *
-     * @param string  $xpath   element xpath
-     * @param Session $session session instance
-     */
-    public function __construct($xpath, Session $session)
-    {
-        $this->xpath = $xpath;
-
-        parent::__construct($session);
-    }
-
-    /**
-     * Returns XPath for handled element.
-     *
-     * @return string
-     */
-    public function getXpath()
-    {
-        return $this->xpath;
-    }
-
-    /**
-     * Returns parent element to the current one.
-     *
-     * @return NodeElement
-     */
-    public function getParent()
-    {
-        return $this->find('xpath', '..');
-    }
-
-    /**
-     * Returns current node tag name.
-     *
-     * The value is always returned in lowercase to allow an easy comparison.
-     *
-     * @return string
-     */
-    public function getTagName()
-    {
-        return strtolower($this->getDriver()->getTagName($this->getXpath()));
-    }
-
-    /**
-     * Returns the value of the form field or option element.
-     *
-     * For checkbox fields, the value is a boolean indicating whether the checkbox is checked.
-     * For radio buttons, the value is the value of the selected button in the radio group
-     *      or null if no button is selected.
-     * For single select boxes, the value is the value of the selected option.
-     * For multiple select boxes, the value is an array of selected option values.
-     * for file inputs, the return value is undefined given that browsers don't allow accessing
-     *      the value of file inputs for security reasons. Some drivers may allow accessing the
-     *      path of the file set in the field, but this is not required if it cannot be implemented.
-     * For textarea elements and all textual fields, the value is the content of the field.
-     * Form option elements, the value is the value of the option (the value attribute or the text
-     *      content if the attribute is not set).
-     *
-     * Calling this method on other elements than form fields or option elements is not allowed.
-     *
-     * @return string|bool|array
-     */
-    public function getValue()
-    {
-        return $this->getDriver()->getValue($this->getXpath());
-    }
-
-    /**
-     * Sets the value of the form field.
-     *
-     * Calling this method on other elements than form fields is not allowed.
-     *
-     * @param string|bool|array $value
-     *
-     * @see NodeElement::getValue for the format of the value for each type of field
-     */
-    public function setValue($value)
-    {
-        $this->getDriver()->setValue($this->getXpath(), $value);
-    }
-
-    /**
-     * Checks whether element has attribute with specified name.
-     *
-     * @param string $name
-     *
-     * @return Boolean
-     */
-    public function hasAttribute($name)
-    {
-        return null !== $this->getDriver()->getAttribute($this->getXpath(), $name);
-    }
-
-    /**
-     * Returns specified attribute value.
-     *
-     * @param string $name
-     *
-     * @return string|null
-     */
-    public function getAttribute($name)
-    {
-        return $this->getDriver()->getAttribute($this->getXpath(), $name);
-    }
-
-    /**
-     * Checks whether an element has a named CSS class.
-     *
-     * @param string $className Name of the class
-     *
-     * @return bool
-     */
-    public function hasClass($className)
-    {
-        if ($this->hasAttribute('class')) {
-            return in_array($className, preg_split('/\s+/', $this->getAttribute('class')));
-        }
-
-        return false;
-    }
-
-    /**
-     * Clicks current node.
-     */
-    public function click()
-    {
-        $this->getDriver()->click($this->getXpath());
-    }
-
-    /**
-     * Presses current button.
-     */
-    public function press()
-    {
-        $this->click();
-    }
-
-    /**
-     * Double-clicks current node.
-     */
-    public function doubleClick()
-    {
-        $this->getDriver()->doubleClick($this->getXpath());
-    }
-
-    /**
-     * Right-clicks current node.
-     */
-    public function rightClick()
-    {
-        $this->getDriver()->rightClick($this->getXpath());
-    }
-
-    /**
-     * Checks current node if it's a checkbox field.
-     */
-    public function check()
-    {
-        $this->getDriver()->check($this->getXpath());
-    }
-
-    /**
-     * Unchecks current node if it's a checkbox field.
-     */
-    public function uncheck()
-    {
-        $this->getDriver()->uncheck($this->getXpath());
-    }
-
-    /**
-     * Checks whether current node is checked if it's a checkbox or radio field.
-     *
-     * Calling this method on any other elements is not allowed.
-     *
-     * @return Boolean
-     */
-    public function isChecked()
-    {
-        return (Boolean) $this->getDriver()->isChecked($this->getXpath());
-    }
-
-    /**
-     * Selects specified option for select field or specified radio button in the group.
-     *
-     * If the current node is a select box, this selects the option found by its value or
-     * its text.
-     * If the current node is a radio button, this selects the radio button with the given
-     * value in the radio button group of the current node.
-     *
-     * Calling this method on any other elements is not allowed.
-     *
-     * @param string  $option
-     * @param Boolean $multiple whether the option should be added to the selection for multiple selects
-     *
-     * @throws ElementNotFoundException when the option is not found in the select box
-     */
-    public function selectOption($option, $multiple = false)
-    {
-        if ('select' !== $this->getTagName()) {
-            $this->getDriver()->selectOption($this->getXpath(), $option, $multiple);
-
-            return;
-        }
-
-        $opt = $this->find('named', array('option', $option));
-
-        if (null === $opt) {
-            throw new ElementNotFoundException($this->getDriver(), 'select option', 'value|text', $option);
-        }
-
-        $this->getDriver()->selectOption($this->getXpath(), $opt->getValue(), $multiple);
-    }
-
-    /**
-     * Checks whether current node is selected if it's a option field.
-     *
-     * Calling this method on any other elements is not allowed.
-     *
-     * @return Boolean
-     */
-    public function isSelected()
-    {
-        return (Boolean) $this->getDriver()->isSelected($this->getXpath());
-    }
-
-    /**
-     * Attach file to current node if it's a file input.
-     *
-     * Calling this method on any other elements than file input is not allowed.
-     *
-     * @param string $path path to file (local)
-     */
-    public function attachFile($path)
-    {
-        $this->getDriver()->attachFile($this->getXpath(), $path);
-    }
-
-    /**
-     * Checks whether current node is visible on page.
-     *
-     * @return Boolean
-     */
-    public function isVisible()
-    {
-        return (Boolean) $this->getDriver()->isVisible($this->getXpath());
-    }
-
-    /**
-     * Simulates a mouse over on the element.
-     */
-    public function mouseOver()
-    {
-        $this->getDriver()->mouseOver($this->getXpath());
-    }
-
-    /**
-     * Drags current node onto other node.
-     *
-     * @param ElementInterface $destination other node
-     */
-    public function dragTo(ElementInterface $destination)
-    {
-        $this->getDriver()->dragTo($this->getXpath(), $destination->getXpath());
-    }
-
-    /**
-     * Brings focus to element.
-     */
-    public function focus()
-    {
-        $this->getDriver()->focus($this->getXpath());
-    }
-
-    /**
-     * Removes focus from element.
-     */
-    public function blur()
-    {
-        $this->getDriver()->blur($this->getXpath());
-    }
-
-    /**
-     * Presses specific keyboard key.
-     *
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     */
-    public function keyPress($char, $modifier = null)
-    {
-        $this->getDriver()->keyPress($this->getXpath(), $char, $modifier);
-    }
-
-    /**
-     * Pressed down specific keyboard key.
-     *
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     */
-    public function keyDown($char, $modifier = null)
-    {
-        $this->getDriver()->keyDown($this->getXpath(), $char, $modifier);
-    }
-
-    /**
-     * Pressed up specific keyboard key.
-     *
-     * @param string|int $char     could be either char ('b') or char-code (98)
-     * @param string     $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-     */
-    public function keyUp($char, $modifier = null)
-    {
-        $this->getDriver()->keyUp($this->getXpath(), $char, $modifier);
-    }
-
-    /**
-     * Submits the form.
-     *
-     * Calling this method on anything else than form elements is not allowed.
-     */
-    public function submit()
-    {
-        $this->getDriver()->submitForm($this->getXpath());
-    }
-}
diff --git a/vendor/behat/mink/src/Element/TraversableElement.php b/vendor/behat/mink/src/Element/TraversableElement.php
deleted file mode 100644
index a5e05b9..0000000
--- a/vendor/behat/mink/src/Element/TraversableElement.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Element;
-
-use Behat\Mink\Exception\ElementNotFoundException;
-
-/**
- * Traversable element.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-abstract class TraversableElement extends Element
-{
-    /**
-     * Finds element by its id.
-     *
-     * @param string $id element id
-     *
-     * @return NodeElement|null
-     */
-    public function findById($id)
-    {
-        return $this->find('named', array('id', $id));
-    }
-
-    /**
-     * Checks whether element has a link with specified locator.
-     *
-     * @param string $locator link id, title, text or image alt
-     *
-     * @return Boolean
-     */
-    public function hasLink($locator)
-    {
-        return null !== $this->findLink($locator);
-    }
-
-    /**
-     * Finds link with specified locator.
-     *
-     * @param string $locator link id, title, text or image alt
-     *
-     * @return NodeElement|null
-     */
-    public function findLink($locator)
-    {
-        return $this->find('named', array('link', $locator));
-    }
-
-    /**
-     * Clicks link with specified locator.
-     *
-     * @param string $locator link id, title, text or image alt
-     *
-     * @throws ElementNotFoundException
-     */
-    public function clickLink($locator)
-    {
-        $link = $this->findLink($locator);
-
-        if (null === $link) {
-            throw new ElementNotFoundException($this->getDriver(), 'link', 'id|title|alt|text', $locator);
-        }
-
-        $link->click();
-    }
-
-    /**
-     * Checks whether element has a button (input[type=submit|image|button|reset], button) with specified locator.
-     *
-     * @param string $locator button id, value or alt
-     *
-     * @return Boolean
-     */
-    public function hasButton($locator)
-    {
-        return null !== $this->findButton($locator);
-    }
-
-    /**
-     * Finds button (input[type=submit|image|button|reset], button) with specified locator.
-     *
-     * @param string $locator button id, value or alt
-     *
-     * @return NodeElement|null
-     */
-    public function findButton($locator)
-    {
-        return $this->find('named', array('button', $locator));
-    }
-
-    /**
-     * Presses button (input[type=submit|image|button|reset], button) with specified locator.
-     *
-     * @param string $locator button id, value or alt
-     *
-     * @throws ElementNotFoundException
-     */
-    public function pressButton($locator)
-    {
-        $button = $this->findButton($locator);
-
-        if (null === $button) {
-            throw new ElementNotFoundException($this->getDriver(), 'button', 'id|name|title|alt|value', $locator);
-        }
-
-        $button->press();
-    }
-
-    /**
-     * Checks whether element has a field (input, textarea, select) with specified locator.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @return Boolean
-     */
-    public function hasField($locator)
-    {
-        return null !== $this->findField($locator);
-    }
-
-    /**
-     * Finds field (input, textarea, select) with specified locator.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @return NodeElement|null
-     */
-    public function findField($locator)
-    {
-        return $this->find('named', array('field', $locator));
-    }
-
-    /**
-     * Fills in field (input, textarea, select) with specified locator.
-     *
-     * @param string $locator input id, name or label
-     * @param string $value   value
-     *
-     * @throws ElementNotFoundException
-     *
-     * @see NodeElement::setValue
-     */
-    public function fillField($locator, $value)
-    {
-        $field = $this->findField($locator);
-
-        if (null === $field) {
-            throw new ElementNotFoundException($this->getDriver(), 'form field', 'id|name|label|value|placeholder', $locator);
-        }
-
-        $field->setValue($value);
-    }
-
-    /**
-     * Checks whether element has a checkbox with specified locator, which is checked.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @return Boolean
-     *
-     * @see NodeElement::isChecked
-     */
-    public function hasCheckedField($locator)
-    {
-        $field = $this->findField($locator);
-
-        return null !== $field && $field->isChecked();
-    }
-
-    /**
-     * Checks whether element has a checkbox with specified locator, which is unchecked.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @return Boolean
-     *
-     * @see NodeElement::isChecked
-     */
-    public function hasUncheckedField($locator)
-    {
-        $field = $this->findField($locator);
-
-        return null !== $field && !$field->isChecked();
-    }
-
-    /**
-     * Checks checkbox with specified locator.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @throws ElementNotFoundException
-     */
-    public function checkField($locator)
-    {
-        $field = $this->findField($locator);
-
-        if (null === $field) {
-            throw new ElementNotFoundException($this->getDriver(), 'form field', 'id|name|label|value', $locator);
-        }
-
-        $field->check();
-    }
-
-    /**
-     * Unchecks checkbox with specified locator.
-     *
-     * @param string $locator input id, name or label
-     *
-     * @throws ElementNotFoundException
-     */
-    public function uncheckField($locator)
-    {
-        $field = $this->findField($locator);
-
-        if (null === $field) {
-            throw new ElementNotFoundException($this->getDriver(), 'form field', 'id|name|label|value', $locator);
-        }
-
-        $field->uncheck();
-    }
-
-    /**
-     * Checks whether element has a select field with specified locator.
-     *
-     * @param string $locator select id, name or label
-     *
-     * @return Boolean
-     */
-    public function hasSelect($locator)
-    {
-        return $this->has('named', array('select', $locator));
-    }
-
-    /**
-     * Selects option from select field with specified locator.
-     *
-     * @param string  $locator  input id, name or label
-     * @param string  $value    option value
-     * @param Boolean $multiple select multiple options
-     *
-     * @throws ElementNotFoundException
-     *
-     * @see NodeElement::selectOption
-     */
-    public function selectFieldOption($locator, $value, $multiple = false)
-    {
-        $field = $this->findField($locator);
-
-        if (null === $field) {
-            throw new ElementNotFoundException($this->getDriver(), 'form field', 'id|name|label|value', $locator);
-        }
-
-        $field->selectOption($value, $multiple);
-    }
-
-    /**
-     * Checks whether element has a table with specified locator.
-     *
-     * @param string $locator table id or caption
-     *
-     * @return Boolean
-     */
-    public function hasTable($locator)
-    {
-        return $this->has('named', array('table', $locator));
-    }
-
-    /**
-     * Attach file to file field with specified locator.
-     *
-     * @param string $locator input id, name or label
-     * @param string $path    path to file
-     *
-     * @throws ElementNotFoundException
-     *
-     * @see NodeElement::attachFile
-     */
-    public function attachFileToField($locator, $path)
-    {
-        $field = $this->findField($locator);
-
-        if (null === $field) {
-            throw new ElementNotFoundException($this->getDriver(), 'form field', 'id|name|label|value', $locator);
-        }
-
-        $field->attachFile($path);
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/DriverException.php b/vendor/behat/mink/src/Exception/DriverException.php
deleted file mode 100644
index 840f8bd..0000000
--- a/vendor/behat/mink/src/Exception/DriverException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-/**
- * Exception thrown by drivers when they fail to perform an action.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class DriverException extends Exception
-{
-    /**
-     * Initializes exception.
-     *
-     * @param string          $message
-     * @param int             $code
-     * @param \Exception|null $previous
-     */
-    public function __construct($message, $code = 0, \Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/ElementException.php b/vendor/behat/mink/src/Exception/ElementException.php
deleted file mode 100644
index 16ebdc9..0000000
--- a/vendor/behat/mink/src/Exception/ElementException.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-@trigger_error('The class '.__NAMESPACE__.'\ElementException is deprecated as of Mink 1.6 and will be removed in 2.0', E_USER_DEPRECATED);
-
-use Behat\Mink\Element\Element;
-
-/**
- * A standard way for elements to re-throw exceptions.
- *
- * @deprecated This exception class is not used anymore in Mink 1.6 and will be removed in 2.0
- *
- * @author Chris Worfolk <xmeltrut@gmail.com>
- */
-class ElementException extends Exception
-{
-    private $element;
-
-    /**
-     * Initialises exception.
-     *
-     * @param Element    $element   optional message
-     * @param \Exception $exception exception
-     */
-    public function __construct(Element $element, \Exception $exception)
-    {
-        $this->element = $element;
-
-        parent::__construct(sprintf("Exception thrown by %s\n%s", $element->getXpath(), $exception->getMessage()));
-    }
-
-    /**
-     * Override default toString so we don't send a full backtrace in verbose mode.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getMessage();
-    }
-
-    /**
-     * Get the element that caused the exception.
-     *
-     * @return Element
-     */
-    public function getElement()
-    {
-        return $this->element;
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/ElementHtmlException.php b/vendor/behat/mink/src/Exception/ElementHtmlException.php
deleted file mode 100644
index fb2fed6..0000000
--- a/vendor/behat/mink/src/Exception/ElementHtmlException.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Element\Element;
-use Behat\Mink\Session;
-
-/**
- * Exception thrown when an expectation on the HTML of an element fails.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ElementHtmlException extends ExpectationException
-{
-    /**
-     * Element instance.
-     *
-     * @var Element
-     */
-    protected $element;
-
-    /**
-     * Initializes exception.
-     *
-     * @param string                  $message   optional message
-     * @param DriverInterface|Session $driver    driver instance
-     * @param Element                 $element   element
-     * @param \Exception              $exception expectation exception
-     */
-    public function __construct($message, $driver, Element $element, \Exception $exception = null)
-    {
-        $this->element = $element;
-
-        parent::__construct($message, $driver, $exception);
-    }
-
-    protected function getContext()
-    {
-        return $this->element->getOuterHtml();
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/ElementNotFoundException.php b/vendor/behat/mink/src/Exception/ElementNotFoundException.php
deleted file mode 100644
index 6716ab3..0000000
--- a/vendor/behat/mink/src/Exception/ElementNotFoundException.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
-
-/**
- * Exception thrown when an expected element is not found.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ElementNotFoundException extends ExpectationException
-{
-    /**
-     * Initializes exception.
-     *
-     * @param DriverInterface|Session $driver   driver instance
-     * @param string                  $type     element type
-     * @param string                  $selector element selector type
-     * @param string                  $locator  element locator
-     */
-    public function __construct($driver, $type = null, $selector = null, $locator = null)
-    {
-        $message = '';
-
-        if (null !== $type) {
-            $message .= ucfirst($type);
-        } else {
-            $message .= 'Tag';
-        }
-
-        if (null !== $locator) {
-            if (null === $selector || in_array($selector, array('css', 'xpath'))) {
-                $selector = 'matching '.($selector ?: 'locator');
-            } else {
-                $selector = 'with '.$selector;
-            }
-            $message .= ' '.$selector.' "'.$locator.'"';
-        }
-
-        $message .= ' not found.';
-
-        parent::__construct($message, $driver);
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/ElementTextException.php b/vendor/behat/mink/src/Exception/ElementTextException.php
deleted file mode 100644
index 5efff0f..0000000
--- a/vendor/behat/mink/src/Exception/ElementTextException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-/**
- * Exception thrown when an expectation on the text of an element fails.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ElementTextException extends ElementHtmlException
-{
-    protected function getContext()
-    {
-        return $this->element->getText();
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/Exception.php b/vendor/behat/mink/src/Exception/Exception.php
deleted file mode 100644
index 4662a5b..0000000
--- a/vendor/behat/mink/src/Exception/Exception.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-/**
- * Mink base exception class.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-abstract class Exception extends \Exception
-{
-}
diff --git a/vendor/behat/mink/src/Exception/ExpectationException.php b/vendor/behat/mink/src/Exception/ExpectationException.php
deleted file mode 100644
index 35f7150..0000000
--- a/vendor/behat/mink/src/Exception/ExpectationException.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
-
-/**
- * Exception thrown for failed expectations.
- *
- * Some specialized child classes are available to customize the error rendering.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ExpectationException extends Exception
-{
-    private $session;
-    private $driver;
-
-    /**
-     * Initializes exception.
-     *
-     * @param string                  $message   optional message
-     * @param DriverInterface|Session $driver    driver instance (or session for BC)
-     * @param \Exception|null         $exception expectation exception
-     */
-    public function __construct($message, $driver, \Exception $exception = null)
-    {
-        if ($driver instanceof Session) {
-            @trigger_error('Passing a Session object to the ExpectationException constructor is deprecated as of Mink 1.7. Pass the driver instead.', E_USER_DEPRECATED);
-
-            $this->session = $driver;
-            $this->driver = $driver->getDriver();
-        } elseif (!$driver instanceof DriverInterface) {
-            // Trigger an exception as we cannot typehint a disjunction
-            throw new \InvalidArgumentException('The ExpectationException constructor expects a DriverInterface or a Session.');
-        } else {
-            $this->driver = $driver;
-        }
-
-        if (!$message && null !== $exception) {
-            $message = $exception->getMessage();
-        }
-
-        parent::__construct($message, 0, $exception);
-    }
-
-    /**
-     * Returns exception message with additional context info.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            $pageText = $this->pipeString($this->trimString($this->getContext())."\n");
-            $string = sprintf("%s\n\n%s%s", $this->getMessage(), $this->getResponseInfo(), $pageText);
-        } catch (\Exception $e) {
-            return $this->getMessage();
-        }
-
-        return $string;
-    }
-
-    /**
-     * Gets the context rendered for this exception.
-     *
-     * @return string
-     */
-    protected function getContext()
-    {
-        return $this->trimBody($this->driver->getContent());
-    }
-
-    /**
-     * Returns driver.
-     *
-     * @return DriverInterface
-     */
-    protected function getDriver()
-    {
-        return $this->driver;
-    }
-
-    /**
-     * Returns exception session.
-     *
-     * @return Session
-     *
-     * @deprecated since 1.7, to be removed in 2.0. Use getDriver and the driver API instead.
-     */
-    protected function getSession()
-    {
-        if (null === $this->session) {
-            throw new \LogicException(sprintf('The deprecated method %s cannot be used when passing a driver in the constructor', __METHOD__));
-        }
-
-        @trigger_error(sprintf('The method %s is deprecated as of Mink 1.7 and will be removed in 2.0. Use getDriver and the driver API instead.'));
-
-        return $this->session;
-    }
-
-    /**
-     * Prepends every line in a string with pipe (|).
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    protected function pipeString($string)
-    {
-        return '|  '.strtr($string, array("\n" => "\n|  "));
-    }
-
-    /**
-     * Removes response header/footer, letting only <body /> content.
-     *
-     * @param string $string response content
-     *
-     * @return string
-     */
-    protected function trimBody($string)
-    {
-        $string = preg_replace(array('/^.*<body>/s', '/<\/body>.*$/s'), array('<body>', '</body>'), $string);
-
-        return $string;
-    }
-
-    /**
-     * Trims string to specified number of chars.
-     *
-     * @param string $string response content
-     * @param int    $count  trim count
-     *
-     * @return string
-     */
-    protected function trimString($string, $count = 1000)
-    {
-        $string = trim($string);
-
-        if ($count < mb_strlen($string)) {
-            return mb_substr($string, 0, $count - 3).'...';
-        }
-
-        return $string;
-    }
-
-    /**
-     * Returns response information string.
-     *
-     * @return string
-     */
-    protected function getResponseInfo()
-    {
-        $driver = basename(str_replace('\\', '/', get_class($this->driver)));
-
-        $info = '+--[ ';
-        try {
-            $info .= 'HTTP/1.1 '.$this->driver->getStatusCode().' | ';
-        } catch (UnsupportedDriverActionException $e) {
-            // Ignore the status code when not supported
-        }
-        $info .= $this->driver->getCurrentUrl().' | '.$driver." ]\n|\n";
-
-        return $info;
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/ResponseTextException.php b/vendor/behat/mink/src/Exception/ResponseTextException.php
deleted file mode 100644
index 515c569..0000000
--- a/vendor/behat/mink/src/Exception/ResponseTextException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-/**
- * Exception thrown when an expectation on the response text fails.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ResponseTextException extends ExpectationException
-{
-    protected function getContext()
-    {
-        return $this->getDriver()->getText('//html');
-    }
-}
diff --git a/vendor/behat/mink/src/Exception/UnsupportedDriverActionException.php b/vendor/behat/mink/src/Exception/UnsupportedDriverActionException.php
deleted file mode 100644
index d02969b..0000000
--- a/vendor/behat/mink/src/Exception/UnsupportedDriverActionException.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Exception;
-
-use Behat\Mink\Driver\DriverInterface;
-
-/**
- * Exception thrown by drivers when they don't support the requested action.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class UnsupportedDriverActionException extends DriverException
-{
-    /**
-     * Initializes exception.
-     *
-     * @param string          $template what is unsupported?
-     * @param DriverInterface $driver   driver instance
-     * @param \Exception      $previous previous exception
-     */
-    public function __construct($template, DriverInterface $driver, \Exception $previous = null)
-    {
-        $message = sprintf($template, get_class($driver));
-
-        parent::__construct($message, 0, $previous);
-    }
-}
diff --git a/vendor/behat/mink/src/Mink.php b/vendor/behat/mink/src/Mink.php
deleted file mode 100644
index 333bfbd..0000000
--- a/vendor/behat/mink/src/Mink.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink;
-
-/**
- * Mink sessions manager.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Mink
-{
-    private $defaultSessionName;
-
-    /**
-     * Sessions.
-     *
-     * @var Session[]
-     */
-    private $sessions = array();
-
-    /**
-     * Initializes manager.
-     *
-     * @param Session[] $sessions
-     */
-    public function __construct(array $sessions = array())
-    {
-        foreach ($sessions as $name => $session) {
-            $this->registerSession($name, $session);
-        }
-    }
-
-    /**
-     * Stops all started sessions.
-     */
-    public function __destruct()
-    {
-        $this->stopSessions();
-    }
-
-    /**
-     * Registers new session.
-     *
-     * @param string  $name
-     * @param Session $session
-     */
-    public function registerSession($name, Session $session)
-    {
-        $name = strtolower($name);
-
-        $this->sessions[$name] = $session;
-    }
-
-    /**
-     * Checks whether session with specified name is registered.
-     *
-     * @param string $name
-     *
-     * @return Boolean
-     */
-    public function hasSession($name)
-    {
-        return isset($this->sessions[strtolower($name)]);
-    }
-
-    /**
-     * Sets default session name to use.
-     *
-     * @param string $name name of the registered session
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setDefaultSessionName($name)
-    {
-        $name = strtolower($name);
-
-        if (!isset($this->sessions[$name])) {
-            throw new \InvalidArgumentException(sprintf('Session "%s" is not registered.', $name));
-        }
-
-        $this->defaultSessionName = $name;
-    }
-
-    /**
-     * Returns default session name or null if none.
-     *
-     * @return null|string
-     */
-    public function getDefaultSessionName()
-    {
-        return $this->defaultSessionName;
-    }
-
-    /**
-     * Returns registered session by it's name or active one and automatically starts it if required.
-     *
-     * @param string $name session name
-     *
-     * @return Session
-     *
-     * @throws \InvalidArgumentException If the named session is not registered
-     */
-    public function getSession($name = null)
-    {
-        $session = $this->locateSession($name);
-
-        // start session if needed
-        if (!$session->isStarted()) {
-            $session->start();
-        }
-
-        return $session;
-    }
-
-    /**
-     * Checks whether a named session (or the default session) has already been started.
-     *
-     * @param string $name session name - if null then the default session will be checked
-     *
-     * @return bool whether the session has been started
-     *
-     * @throws \InvalidArgumentException If the named session is not registered
-     */
-    public function isSessionStarted($name = null)
-    {
-        $session = $this->locateSession($name);
-
-        return $session->isStarted();
-    }
-
-    /**
-     * Returns session asserter.
-     *
-     * @param Session|string $session session object or name
-     *
-     * @return WebAssert
-     */
-    public function assertSession($session = null)
-    {
-        if (!($session instanceof Session)) {
-            $session = $this->getSession($session);
-        }
-
-        return new WebAssert($session);
-    }
-
-    /**
-     * Resets all started sessions.
-     */
-    public function resetSessions()
-    {
-        foreach ($this->sessions as $session) {
-            if ($session->isStarted()) {
-                $session->reset();
-            }
-        }
-    }
-
-    /**
-     * Restarts all started sessions.
-     */
-    public function restartSessions()
-    {
-        foreach ($this->sessions as $session) {
-            if ($session->isStarted()) {
-                $session->restart();
-            }
-        }
-    }
-
-    /**
-     * Stops all started sessions.
-     */
-    public function stopSessions()
-    {
-        foreach ($this->sessions as $session) {
-            if ($session->isStarted()) {
-                $session->stop();
-            }
-        }
-    }
-
-    /**
-     * Returns the named or default session without starting it.
-     *
-     * @param string $name session name
-     *
-     * @return Session
-     *
-     * @throws \InvalidArgumentException If the named session is not registered
-     */
-    protected function locateSession($name = null)
-    {
-        $name = strtolower($name) ?: $this->defaultSessionName;
-
-        if (null === $name) {
-            throw new \InvalidArgumentException('Specify session name to get');
-        }
-
-        if (!isset($this->sessions[$name])) {
-            throw new \InvalidArgumentException(sprintf('Session "%s" is not registered.', $name));
-        }
-
-        $session = $this->sessions[$name];
-
-        return $session;
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/CssSelector.php b/vendor/behat/mink/src/Selector/CssSelector.php
deleted file mode 100644
index 3636586..0000000
--- a/vendor/behat/mink/src/Selector/CssSelector.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-use Symfony\Component\CssSelector\CssSelector as CSS;
-
-/**
- * CSS selector engine. Transforms CSS to XPath.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CssSelector implements SelectorInterface
-{
-    /**
-     * Translates CSS into XPath.
-     *
-     * @param string|array $locator current selector locator
-     *
-     * @return string
-     */
-    public function translateToXPath($locator)
-    {
-        if (!is_string($locator)) {
-            throw new \InvalidArgumentException('The CssSelector expects to get a string as locator');
-        }
-
-        return CSS::toXPath($locator);
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/ExactNamedSelector.php b/vendor/behat/mink/src/Selector/ExactNamedSelector.php
deleted file mode 100644
index 03315a9..0000000
--- a/vendor/behat/mink/src/Selector/ExactNamedSelector.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-/**
- * Exact match selector engine. Like the Named selector engine but ignores partial matches.
- */
-class ExactNamedSelector extends NamedSelector
-{
-    public function __construct()
-    {
-        $this->registerReplacement('%tagTextMatch%', 'normalize-space(string(.)) = %locator%');
-        $this->registerReplacement('%valueMatch%', './@value = %locator%');
-        $this->registerReplacement('%titleMatch%', './@title = %locator%');
-        $this->registerReplacement('%altMatch%', './@alt = %locator%');
-        $this->registerReplacement('%relMatch%', './@rel = %locator%');
-        $this->registerReplacement('%labelAttributeMatch%', './@label = %locator%');
-
-        parent::__construct();
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/NamedSelector.php b/vendor/behat/mink/src/Selector/NamedSelector.php
deleted file mode 100644
index d1936cc..0000000
--- a/vendor/behat/mink/src/Selector/NamedSelector.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-use Behat\Mink\Selector\Xpath\Escaper;
-
-/**
- * Named selectors engine. Uses registered XPath selectors to create new expressions.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class NamedSelector implements SelectorInterface
-{
-    private $replacements = array(
-        // simple replacements
-        '%lowercaseType%' => "translate(./@type, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')",
-        '%lowercaseRole%' => "translate(./@role, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')",
-        '%tagTextMatch%' => 'contains(normalize-space(string(.)), %locator%)',
-        '%labelTextMatch%' => './@id = //label[%tagTextMatch%]/@for',
-        '%idMatch%' => './@id = %locator%',
-        '%valueMatch%' => 'contains(./@value, %locator%)',
-        '%idOrValueMatch%' => '(%idMatch% or %valueMatch%)',
-        '%idOrNameMatch%' => '(%idMatch% or ./@name = %locator%)',
-        '%placeholderMatch%' => './@placeholder = %locator%',
-        '%titleMatch%' => 'contains(./@title, %locator%)',
-        '%altMatch%' => 'contains(./@alt, %locator%)',
-        '%relMatch%' => 'contains(./@rel, %locator%)',
-        '%labelAttributeMatch%' => 'contains(./@label, %locator%)',
-
-        // complex replacements
-        '%inputTypeWithoutPlaceholderFilter%' => "%lowercaseType% = 'radio' or %lowercaseType% = 'checkbox' or %lowercaseType% = 'file'",
-        '%fieldFilterWithPlaceholder%' => 'self::input[not(%inputTypeWithoutPlaceholderFilter%)] | self::textarea',
-        '%fieldMatchWithPlaceholder%' => '(%idOrNameMatch% or %labelTextMatch% or %placeholderMatch%)',
-        '%fieldMatchWithoutPlaceholder%' => '(%idOrNameMatch% or %labelTextMatch%)',
-        '%fieldFilterWithoutPlaceholder%' => 'self::input[%inputTypeWithoutPlaceholderFilter%] | self::select',
-        '%buttonTypeFilter%' => "%lowercaseType% = 'submit' or %lowercaseType% = 'image' or %lowercaseType% = 'button' or %lowercaseType% = 'reset'",
-        '%notFieldTypeFilter%' => "not(%buttonTypeFilter% or %lowercaseType% = 'hidden')",
-        '%buttonMatch%' => '%idOrNameMatch% or %valueMatch% or %titleMatch%',
-        '%linkMatch%' => '(%idMatch% or %tagTextMatch% or %titleMatch% or %relMatch%)',
-        '%imgAltMatch%' => './/img[%altMatch%]',
-    );
-
-    private $selectors = array(
-        'fieldset' => <<<XPATH
-.//fieldset
-[(%idMatch% or .//legend[%tagTextMatch%])]
-XPATH
-
-        ,'field' => <<<XPATH
-.//*
-[%fieldFilterWithPlaceholder%][%notFieldTypeFilter%][%fieldMatchWithPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//*[%fieldFilterWithPlaceholder%][%notFieldTypeFilter%]
-|
-.//*
-[%fieldFilterWithoutPlaceholder%][%notFieldTypeFilter%][%fieldMatchWithoutPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//*[%fieldFilterWithoutPlaceholder%][%notFieldTypeFilter%]
-XPATH
-
-        ,'link' => <<<XPATH
-.//a
-[./@href][(%linkMatch% or %imgAltMatch%)]
-|
-.//*
-[%lowercaseRole% = 'link'][(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
-XPATH
-
-        ,'button' => <<<XPATH
-.//input
-[%buttonTypeFilter%][(%buttonMatch%)]
-|
-.//input
-[%lowercaseType% = 'image'][%altMatch%]
-|
-.//button
-[(%buttonMatch% or %tagTextMatch%)]
-|
-.//*
-[%lowercaseRole% = 'button'][(%buttonMatch% or %tagTextMatch%)]
-XPATH
-
-        ,'link_or_button' => <<<XPATH
-.//a
-[./@href][(%linkMatch% or %imgAltMatch%)]
-|
-.//input
-[%buttonTypeFilter%][(%idOrValueMatch% or %titleMatch%)]
-|
-.//input
-[%lowercaseType% = 'image'][%altMatch%]
-|
-.//button
-[(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
-|
-.//*
-[(%lowercaseRole% = 'button' or %lowercaseRole% = 'link')][(%idOrValueMatch% or %titleMatch% or %tagTextMatch%)]
-XPATH
-
-        ,'content' => <<<XPATH
-./descendant-or-self::*
-[%tagTextMatch%]
-XPATH
-
-        ,'select' => <<<XPATH
-.//select
-[%fieldMatchWithoutPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//select
-XPATH
-
-        ,'checkbox' => <<<XPATH
-.//input
-[%lowercaseType% = 'checkbox'][%fieldMatchWithoutPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//input[%lowercaseType% = 'checkbox']
-XPATH
-
-        ,'radio' => <<<XPATH
-.//input
-[%lowercaseType% = 'radio'][%fieldMatchWithoutPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//input[%lowercaseType% = 'radio']
-XPATH
-
-        ,'file' => <<<XPATH
-.//input
-[%lowercaseType% = 'file'][%fieldMatchWithoutPlaceholder%]
-|
-.//label[%tagTextMatch%]//.//input[%lowercaseType% = 'file']
-XPATH
-
-        ,'optgroup' => <<<XPATH
-.//optgroup
-[%labelAttributeMatch%]
-XPATH
-
-        ,'option' => <<<XPATH
-.//option
-[(./@value = %locator% or %tagTextMatch%)]
-XPATH
-
-        ,'table' => <<<XPATH
-.//table
-[(%idMatch% or .//caption[%tagTextMatch%])]
-XPATH
-        ,'id' => <<<XPATH
-.//*[%idMatch%]
-XPATH
-    ,'id_or_name' => <<<XPATH
-.//*[%idOrNameMatch%]
-XPATH
-    );
-    private $xpathEscaper;
-
-    /**
-     * Creates selector instance.
-     */
-    public function __construct()
-    {
-        $this->xpathEscaper = new Escaper();
-
-        foreach ($this->replacements as $from => $to) {
-            $this->replacements[$from] = strtr($to, $this->replacements);
-        }
-
-        foreach ($this->selectors as $alias => $selector) {
-            $this->selectors[$alias] = strtr($selector, $this->replacements);
-        }
-    }
-
-    /**
-     * Registers new XPath selector with specified name.
-     *
-     * @param string $name  name for selector
-     * @param string $xpath xpath expression
-     */
-    public function registerNamedXpath($name, $xpath)
-    {
-        $this->selectors[$name] = $xpath;
-    }
-
-    /**
-     * Translates provided locator into XPath.
-     *
-     * @param string|array $locator selector name or array of (selector_name, locator)
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function translateToXPath($locator)
-    {
-        if (2 < count($locator)) {
-            throw new \InvalidArgumentException('NamedSelector expects array(name, locator) as argument');
-        }
-
-        if (2 == count($locator)) {
-            $selector = $locator[0];
-            $locator = $locator[1];
-        } else {
-            $selector = (string) $locator;
-            $locator = null;
-        }
-
-        if (!isset($this->selectors[$selector])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Unknown named selector provided: "%s". Expected one of (%s)',
-                $selector,
-                implode(', ', array_keys($this->selectors))
-            ));
-        }
-
-        $xpath = $this->selectors[$selector];
-
-        if (null !== $locator) {
-            $xpath = strtr($xpath, array('%locator%' => $this->escapeLocator($locator)));
-        }
-
-        return $xpath;
-    }
-
-    /**
-     * Registers a replacement in the list of replacements.
-     *
-     * This method must be called in the constructor before calling the parent constructor.
-     *
-     * @param string $from
-     * @param string $to
-     */
-    protected function registerReplacement($from, $to)
-    {
-        $this->replacements[$from] = $to;
-    }
-
-    private function escapeLocator($locator)
-    {
-        // If the locator looks like an escaped one, don't escape it again for BC reasons.
-        if (
-            preg_match('/^\'[^\']*+\'$/', $locator)
-            || (false !== strpos($locator, '\'') && preg_match('/^"[^"]*+"$/', $locator))
-            || ((8 < $length = strlen($locator)) && 'concat(' === substr($locator, 0, 7) && ')' === $locator[$length - 1])
-        ) {
-            @trigger_error(
-                'Passing an escaped locator to the named selector is deprecated as of 1.7 and will be removed in 2.0.'
-                .' Pass the raw value instead.',
-                E_USER_DEPRECATED
-            );
-
-            return $locator;
-        }
-
-        return $this->xpathEscaper->escapeLiteral($locator);
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/PartialNamedSelector.php b/vendor/behat/mink/src/Selector/PartialNamedSelector.php
deleted file mode 100644
index b864a22..0000000
--- a/vendor/behat/mink/src/Selector/PartialNamedSelector.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-/**
- * Named selectors engine. Uses registered XPath selectors to create new expressions.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class PartialNamedSelector extends NamedSelector
-{
-    public function __construct()
-    {
-        $this->registerReplacement('%tagTextMatch%', 'contains(normalize-space(string(.)), %locator%)');
-        $this->registerReplacement('%valueMatch%', 'contains(./@value, %locator%)');
-        $this->registerReplacement('%titleMatch%', 'contains(./@title, %locator%)');
-        $this->registerReplacement('%altMatch%', 'contains(./@alt, %locator%)');
-        $this->registerReplacement('%relMatch%', 'contains(./@rel, %locator%)');
-        $this->registerReplacement('%labelAttributeMatch%', 'contains(./@label, %locator%)');
-
-        parent::__construct();
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/SelectorInterface.php b/vendor/behat/mink/src/Selector/SelectorInterface.php
deleted file mode 100644
index e4f5f17..0000000
--- a/vendor/behat/mink/src/Selector/SelectorInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-/**
- * Mink selector engine interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface SelectorInterface
-{
-    /**
-     * Translates provided locator into XPath.
-     *
-     * @param string|array $locator current selector locator
-     *
-     * @return string
-     */
-    public function translateToXPath($locator);
-}
diff --git a/vendor/behat/mink/src/Selector/SelectorsHandler.php b/vendor/behat/mink/src/Selector/SelectorsHandler.php
deleted file mode 100644
index 09b947c..0000000
--- a/vendor/behat/mink/src/Selector/SelectorsHandler.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector;
-
-use Behat\Mink\Selector\Xpath\Escaper;
-
-/**
- * Selectors handler.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class SelectorsHandler
-{
-    private $selectors;
-    private $escaper;
-
-    /**
-     * Initializes selectors handler.
-     *
-     * @param SelectorInterface[] $selectors default selectors to register
-     */
-    public function __construct(array $selectors = array())
-    {
-        $this->escaper = new Escaper();
-
-        $this->registerSelector('named_partial', new PartialNamedSelector());
-        $this->registerSelector('named_exact', new ExactNamedSelector());
-        $this->registerSelector('css', new CssSelector());
-
-        foreach ($selectors as $name => $selector) {
-            $this->registerSelector($name, $selector);
-        }
-    }
-
-    /**
-     * Registers new selector engine with specified name.
-     *
-     * @param string            $name     selector engine name
-     * @param SelectorInterface $selector selector engine instance
-     */
-    public function registerSelector($name, SelectorInterface $selector)
-    {
-        $this->selectors[$name] = $selector;
-    }
-
-    /**
-     * Checks whether selector with specified name is registered on handler.
-     *
-     * @param string $name selector engine name
-     *
-     * @return Boolean
-     */
-    public function isSelectorRegistered($name)
-    {
-        return isset($this->selectors[$name]);
-    }
-
-    /**
-     * Returns selector engine with specified name.
-     *
-     * @param string $name selector engine name
-     *
-     * @return SelectorInterface
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function getSelector($name)
-    {
-        if ('named' === $name) {
-            @trigger_error(
-                'Using the "named" selector directly from the handler is deprecated as of 1.6 and will be removed in 2.0.'
-                .' Use the "named_partial" or use the "named" selector through the Element API instead.',
-                E_USER_DEPRECATED
-            );
-            $name = 'named_partial';
-        }
-
-        if (!$this->isSelectorRegistered($name)) {
-            throw new \InvalidArgumentException("Selector \"$name\" is not registered.");
-        }
-
-        return $this->selectors[$name];
-    }
-
-    /**
-     * Translates selector with specified name to XPath.
-     *
-     * @param string       $selector selector engine name (registered)
-     * @param string|array $locator  selector locator (an array or a string depending of the selector being used)
-     *
-     * @return string
-     */
-    public function selectorToXpath($selector, $locator)
-    {
-        if ('xpath' === $selector) {
-            if (!is_string($locator)) {
-                throw new \InvalidArgumentException('The xpath selector expects to get a string as locator');
-            }
-
-            return $locator;
-        }
-
-        return $this->getSelector($selector)->translateToXPath($locator);
-    }
-
-    /**
-     * Translates string to XPath literal.
-     *
-     * @deprecated since Mink 1.7. Use \Behat\Mink\Selector\Xpath\Escaper::escapeLiteral when building Xpath
-     *             or pass the unescaped value when using the named selector.
-     *
-     * @param string $s
-     *
-     * @return string
-     */
-    public function xpathLiteral($s)
-    {
-        @trigger_error(
-            'The '.__METHOD__.' method is deprecated as of 1.7 and will be removed in 2.0.'
-            .' Use \Behat\Mink\Selector\Xpath\Escaper::escapeLiteral instead when building Xpath'
-            .' or pass the unescaped value when using the named selector.',
-            E_USER_DEPRECATED
-        );
-
-        return $this->escaper->escapeLiteral($s);
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/Xpath/Escaper.php b/vendor/behat/mink/src/Selector/Xpath/Escaper.php
deleted file mode 100644
index c3aa7a3..0000000
--- a/vendor/behat/mink/src/Selector/Xpath/Escaper.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector\Xpath;
-
-/**
- * XPath escaper.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Escaper
-{
-    /**
-     * Escapes the string as a XPath literal.
-     *
-     * @param string $s
-     *
-     * @return string
-     */
-    public function escapeLiteral($s)
-    {
-        if (false === strpos($s, "'")) {
-            return sprintf("'%s'", $s);
-        }
-
-        if (false === strpos($s, '"')) {
-            return sprintf('"%s"', $s);
-        }
-
-        $string = $s;
-        $parts = array();
-        while (true) {
-            if (false !== $pos = strpos($string, "'")) {
-                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
-                $parts[] = "\"'\"";
-                $string = substr($string, $pos + 1);
-            } else {
-                $parts[] = "'$string'";
-                break;
-            }
-        }
-
-        return sprintf('concat(%s)', implode($parts, ','));
-    }
-}
diff --git a/vendor/behat/mink/src/Selector/Xpath/Manipulator.php b/vendor/behat/mink/src/Selector/Xpath/Manipulator.php
deleted file mode 100644
index 116650a..0000000
--- a/vendor/behat/mink/src/Selector/Xpath/Manipulator.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink\Selector\Xpath;
-
-/**
- * XPath manipulation utility.
- *
- * @author Graham Bates
- * @author Christophe Coevoet <stof@notk.org>
- */
-class Manipulator
-{
-    /**
-     * Regex to find union operators not inside brackets.
-     */
-    const UNION_PATTERN = '/\|(?![^\[]*\])/';
-
-    /**
-     * Prepends the XPath prefix to the given XPath.
-     *
-     * The returned XPath will match elements matching the XPath inside an element
-     * matching the prefix.
-     *
-     * @param string $xpath
-     * @param string $prefix
-     *
-     * @return string
-     */
-    public function prepend($xpath, $prefix)
-    {
-        $expressions = array();
-
-        // If the xpath prefix contains a union we need to wrap it in parentheses.
-        if (preg_match(self::UNION_PATTERN, $prefix)) {
-            $prefix = '('.$prefix.')';
-        }
-
-        // Split any unions into individual expressions.
-        foreach (preg_split(self::UNION_PATTERN, $xpath) as $expression) {
-            $expression = trim($expression);
-            $parenthesis = '';
-
-            // If the union is inside some braces, we need to preserve the opening braces and apply
-            // the prefix only inside it.
-            if (preg_match('/^[\(\s*]+/', $expression, $matches)) {
-                $parenthesis = $matches[0];
-                $expression = substr($expression, strlen($parenthesis));
-            }
-
-            // add prefix before element selector
-            if (0 === strpos($expression, '/')) {
-                $expression = $prefix.$expression;
-            } else {
-                $expression = $prefix.'/'.$expression;
-            }
-            $expressions[] = $parenthesis.$expression;
-        }
-
-        return implode(' | ', $expressions);
-    }
-}
diff --git a/vendor/behat/mink/src/Session.php b/vendor/behat/mink/src/Session.php
deleted file mode 100644
index c8815f9..0000000
--- a/vendor/behat/mink/src/Session.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink;
-
-use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Selector\SelectorsHandler;
-use Behat\Mink\Element\DocumentElement;
-
-/**
- * Mink session.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Session
-{
-    private $driver;
-    private $page;
-    private $selectorsHandler;
-
-    /**
-     * Initializes session.
-     *
-     * @param DriverInterface  $driver
-     * @param SelectorsHandler $selectorsHandler
-     */
-    public function __construct(DriverInterface $driver, SelectorsHandler $selectorsHandler = null)
-    {
-        $driver->setSession($this);
-
-        if (null === $selectorsHandler) {
-            $selectorsHandler = new SelectorsHandler();
-        }
-
-        $this->driver = $driver;
-        $this->selectorsHandler = $selectorsHandler;
-        $this->page = new DocumentElement($this);
-    }
-
-    /**
-     * Checks whether session (driver) was started.
-     *
-     * @return Boolean
-     */
-    public function isStarted()
-    {
-        return $this->driver->isStarted();
-    }
-
-    /**
-     * Starts session driver.
-     *
-     * Calling any action before visiting a page is an undefined behavior.
-     * The only supported method calls on a fresh driver are
-     * - visit()
-     * - setRequestHeader()
-     * - setBasicAuth()
-     * - reset()
-     * - stop()
-     */
-    public function start()
-    {
-        $this->driver->start();
-    }
-
-    /**
-     * Stops session driver.
-     */
-    public function stop()
-    {
-        $this->driver->stop();
-    }
-
-    /**
-     * Restart session driver.
-     */
-    public function restart()
-    {
-        $this->driver->stop();
-        $this->driver->start();
-    }
-
-    /**
-     * Reset session driver state.
-     *
-     * Calling any action before visiting a page is an undefined behavior.
-     * The only supported method calls on a fresh driver are
-     * - visit()
-     * - setRequestHeader()
-     * - setBasicAuth()
-     * - reset()
-     * - stop()
-     */
-    public function reset()
-    {
-        $this->driver->reset();
-    }
-
-    /**
-     * Returns session driver.
-     *
-     * @return DriverInterface
-     */
-    public function getDriver()
-    {
-        return $this->driver;
-    }
-
-    /**
-     * Returns page element.
-     *
-     * @return DocumentElement
-     */
-    public function getPage()
-    {
-        return $this->page;
-    }
-
-    /**
-     * Returns selectors handler.
-     *
-     * @return SelectorsHandler
-     */
-    public function getSelectorsHandler()
-    {
-        return $this->selectorsHandler;
-    }
-
-    /**
-     * Visit specified URL.
-     *
-     * @param string $url url of the page
-     */
-    public function visit($url)
-    {
-        $this->driver->visit($url);
-    }
-
-    /**
-     * Sets HTTP Basic authentication parameters.
-     *
-     * @param string|Boolean $user     user name or false to disable authentication
-     * @param string         $password password
-     */
-    public function setBasicAuth($user, $password = '')
-    {
-        $this->driver->setBasicAuth($user, $password);
-    }
-
-    /**
-     * Sets specific request header.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function setRequestHeader($name, $value)
-    {
-        $this->driver->setRequestHeader($name, $value);
-    }
-
-    /**
-     * Returns all response headers.
-     *
-     * @return array
-     */
-    public function getResponseHeaders()
-    {
-        return $this->driver->getResponseHeaders();
-    }
-
-    /**
-     * Returns specific response header.
-     *
-     * @param string $name
-     *
-     * @return string|null
-     */
-    public function getResponseHeader($name)
-    {
-        $headers = $this->driver->getResponseHeaders();
-
-        $name = strtolower($name);
-        $headers = array_change_key_case($headers, CASE_LOWER);
-
-        if (!isset($headers[$name])) {
-            return null;
-        }
-
-        return is_array($headers[$name]) ? $headers[$name][0] : $headers[$name];
-    }
-
-    /**
-     * Sets cookie.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function setCookie($name, $value = null)
-    {
-        $this->driver->setCookie($name, $value);
-    }
-
-    /**
-     * Returns cookie by name.
-     *
-     * @param string $name
-     *
-     * @return string|null
-     */
-    public function getCookie($name)
-    {
-        return $this->driver->getCookie($name);
-    }
-
-    /**
-     * Returns response status code.
-     *
-     * @return int
-     */
-    public function getStatusCode()
-    {
-        return $this->driver->getStatusCode();
-    }
-
-    /**
-     * Returns current URL address.
-     *
-     * @return string
-     */
-    public function getCurrentUrl()
-    {
-        return $this->driver->getCurrentUrl();
-    }
-
-    /**
-     * Capture a screenshot of the current window.
-     *
-     * @return string screenshot of MIME type image/* depending
-     *                on driver (e.g., image/png, image/jpeg)
-     */
-    public function getScreenshot()
-    {
-        return $this->driver->getScreenshot();
-    }
-
-    /**
-     * Return the names of all open windows.
-     *
-     * @return array Array of all open window's names.
-     */
-    public function getWindowNames()
-    {
-        return $this->driver->getWindowNames();
-    }
-
-    /**
-     * Return the name of the currently active window.
-     *
-     * @return string The name of the current window.
-     */
-    public function getWindowName()
-    {
-        return $this->driver->getWindowName();
-    }
-
-    /**
-     * Reloads current session page.
-     */
-    public function reload()
-    {
-        $this->driver->reload();
-    }
-
-    /**
-     * Moves backward 1 page in history.
-     */
-    public function back()
-    {
-        $this->driver->back();
-    }
-
-    /**
-     * Moves forward 1 page in history.
-     */
-    public function forward()
-    {
-        $this->driver->forward();
-    }
-
-    /**
-     * Switches to specific browser window.
-     *
-     * @param string $name window name (null for switching back to main window)
-     */
-    public function switchToWindow($name = null)
-    {
-        $this->driver->switchToWindow($name);
-    }
-
-    /**
-     * Switches to specific iFrame.
-     *
-     * @param string $name iframe name (null for switching back)
-     */
-    public function switchToIFrame($name = null)
-    {
-        $this->driver->switchToIFrame($name);
-    }
-
-    /**
-     * Execute JS in browser.
-     *
-     * @param string $script javascript
-     */
-    public function executeScript($script)
-    {
-        $this->driver->executeScript($script);
-    }
-
-    /**
-     * Execute JS in browser and return it's response.
-     *
-     * @param string $script javascript
-     *
-     * @return string
-     */
-    public function evaluateScript($script)
-    {
-        return $this->driver->evaluateScript($script);
-    }
-
-    /**
-     * Waits some time or until JS condition turns true.
-     *
-     * @param int    $time      time in milliseconds
-     * @param string $condition JS condition
-     *
-     * @return bool
-     */
-    public function wait($time, $condition = 'false')
-    {
-        return $this->driver->wait($time, $condition);
-    }
-
-    /**
-     * Set the dimensions of the window.
-     *
-     * @param int    $width  set the window width, measured in pixels
-     * @param int    $height set the window height, measured in pixels
-     * @param string $name   window name (null for the main window)
-     */
-    public function resizeWindow($width, $height, $name = null)
-    {
-        $this->driver->resizeWindow($width, $height, $name);
-    }
-
-    /**
-     * Maximize the window if it is not maximized already.
-     *
-     * @param string $name window name (null for the main window)
-     */
-    public function maximizeWindow($name = null)
-    {
-        $this->driver->maximizeWindow($name);
-    }
-}
diff --git a/vendor/behat/mink/src/WebAssert.php b/vendor/behat/mink/src/WebAssert.php
deleted file mode 100644
index 0f0e6fa..0000000
--- a/vendor/behat/mink/src/WebAssert.php
+++ /dev/null
@@ -1,849 +0,0 @@
-<?php
-
-/*
- * This file is part of the Mink package.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Behat\Mink;
-
-use Behat\Mink\Element\Element;
-use Behat\Mink\Element\ElementInterface;
-use Behat\Mink\Element\NodeElement;
-use Behat\Mink\Element\TraversableElement;
-use Behat\Mink\Exception\ElementNotFoundException;
-use Behat\Mink\Exception\ExpectationException;
-use Behat\Mink\Exception\ResponseTextException;
-use Behat\Mink\Exception\ElementHtmlException;
-use Behat\Mink\Exception\ElementTextException;
-
-/**
- * Mink web assertions tool.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class WebAssert
-{
-    protected $session;
-
-    /**
-     * Initializes assertion engine.
-     *
-     * @param Session $session
-     */
-    public function __construct(Session $session)
-    {
-        $this->session = $session;
-    }
-
-    /**
-     * Checks that current session address is equals to provided one.
-     *
-     * @param string $page
-     *
-     * @throws ExpectationException
-     */
-    public function addressEquals($page)
-    {
-        $expected = $this->cleanUrl($page);
-        $actual = $this->getCurrentUrlPath();
-
-        $this->assert($actual === $expected, sprintf('Current page is "%s", but "%s" expected.', $actual, $expected));
-    }
-
-    /**
-     * Checks that current session address is not equals to provided one.
-     *
-     * @param string $page
-     *
-     * @throws ExpectationException
-     */
-    public function addressNotEquals($page)
-    {
-        $expected = $this->cleanUrl($page);
-        $actual = $this->getCurrentUrlPath();
-
-        $this->assert($actual !== $expected, sprintf('Current page is "%s", but should not be.', $actual));
-    }
-
-    /**
-     * Checks that current session address matches regex.
-     *
-     * @param string $regex
-     *
-     * @throws ExpectationException
-     */
-    public function addressMatches($regex)
-    {
-        $actual = $this->getCurrentUrlPath();
-        $message = sprintf('Current page "%s" does not match the regex "%s".', $actual, $regex);
-
-        $this->assert((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that specified cookie exists and its value equals to a given one.
-     *
-     * @param string $name  cookie name
-     * @param string $value cookie value
-     *
-     * @throws ExpectationException
-     */
-    public function cookieEquals($name, $value)
-    {
-        $this->cookieExists($name);
-
-        $actualValue = $this->session->getCookie($name);
-        $message = sprintf('Cookie "%s" value is "%s", but should be "%s".', $name, $actualValue, $value);
-
-        $this->assert($actualValue == $value, $message);
-    }
-
-    /**
-     * Checks that specified cookie exists.
-     *
-     * @param string $name cookie name
-     *
-     * @throws ExpectationException
-     */
-    public function cookieExists($name)
-    {
-        $message = sprintf('Cookie "%s" is not set, but should be.', $name);
-        $this->assert($this->session->getCookie($name) !== null, $message);
-    }
-
-    /**
-     * Checks that current response code equals to provided one.
-     *
-     * @param int $code
-     *
-     * @throws ExpectationException
-     */
-    public function statusCodeEquals($code)
-    {
-        $actual = $this->session->getStatusCode();
-        $message = sprintf('Current response status code is %d, but %d expected.', $actual, $code);
-
-        $this->assert(intval($code) === intval($actual), $message);
-    }
-
-    /**
-     * Checks that current response code not equals to provided one.
-     *
-     * @param int $code
-     *
-     * @throws ExpectationException
-     */
-    public function statusCodeNotEquals($code)
-    {
-        $actual = $this->session->getStatusCode();
-        $message = sprintf('Current response status code is %d, but should not be.', $actual);
-
-        $this->assert(intval($code) !== intval($actual), $message);
-    }
-
-    /**
-     * Checks that current response header equals value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderEquals($name, $value)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf('Current response header "%s" is "%s", but "%s" expected.', $name, $actual, $value);
-
-        $this->assert($value === $actual, $message);
-    }
-
-    /**
-     * Checks that current response header does not equal value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderNotEquals($name, $value)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf('Current response header "%s" is "%s", but should not be.', $name, $actual, $value);
-
-        $this->assert($value !== $actual, $message);
-    }
-
-    /**
-     * Checks that current response header contains value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderContains($name, $value)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf('The text "%s" was not found anywhere in the "%s" response header.', $value, $name);
-
-        $this->assert(false !== stripos($actual, $value), $message);
-    }
-
-    /**
-     * Checks that current response header does not contain value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderNotContains($name, $value)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf('The text "%s" was found in the "%s" response header, but it should not.', $value, $name);
-
-        $this->assert(false === stripos($actual, $value), $message);
-    }
-
-    /**
-     * Checks that current response header matches regex.
-     *
-     * @param string $name
-     * @param string $regex
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderMatches($name, $regex)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf('The pattern "%s" was not found anywhere in the "%s" response header.', $regex, $name);
-
-        $this->assert((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that current response header does not match regex.
-     *
-     * @param string $name
-     * @param string $regex
-     *
-     * @throws ExpectationException
-     */
-    public function responseHeaderNotMatches($name, $regex)
-    {
-        $actual = $this->session->getResponseHeader($name);
-        $message = sprintf(
-            'The pattern "%s" was found in the text of the "%s" response header, but it should not.',
-            $regex,
-            $name
-        );
-
-        $this->assert(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that current page contains text.
-     *
-     * @param string $text
-     *
-     * @throws ResponseTextException
-     */
-    public function pageTextContains($text)
-    {
-        $actual = $this->session->getPage()->getText();
-        $actual = preg_replace('/\s+/u', ' ', $actual);
-        $regex = '/'.preg_quote($text, '/').'/ui';
-        $message = sprintf('The text "%s" was not found anywhere in the text of the current page.', $text);
-
-        $this->assertResponseText((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that current page does not contains text.
-     *
-     * @param string $text
-     *
-     * @throws ResponseTextException
-     */
-    public function pageTextNotContains($text)
-    {
-        $actual = $this->session->getPage()->getText();
-        $actual = preg_replace('/\s+/u', ' ', $actual);
-        $regex = '/'.preg_quote($text, '/').'/ui';
-        $message = sprintf('The text "%s" appears in the text of this page, but it should not.', $text);
-
-        $this->assertResponseText(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that current page text matches regex.
-     *
-     * @param string $regex
-     *
-     * @throws ResponseTextException
-     */
-    public function pageTextMatches($regex)
-    {
-        $actual = $this->session->getPage()->getText();
-        $message = sprintf('The pattern %s was not found anywhere in the text of the current page.', $regex);
-
-        $this->assertResponseText((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that current page text does not matches regex.
-     *
-     * @param string $regex
-     *
-     * @throws ResponseTextException
-     */
-    public function pageTextNotMatches($regex)
-    {
-        $actual = $this->session->getPage()->getText();
-        $message = sprintf('The pattern %s was found in the text of the current page, but it should not.', $regex);
-
-        $this->assertResponseText(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that page HTML (response content) contains text.
-     *
-     * @param string $text
-     *
-     * @throws ExpectationException
-     */
-    public function responseContains($text)
-    {
-        $actual = $this->session->getPage()->getContent();
-        $regex = '/'.preg_quote($text, '/').'/ui';
-        $message = sprintf('The string "%s" was not found anywhere in the HTML response of the current page.', $text);
-
-        $this->assert((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that page HTML (response content) does not contains text.
-     *
-     * @param string $text
-     *
-     * @throws ExpectationException
-     */
-    public function responseNotContains($text)
-    {
-        $actual = $this->session->getPage()->getContent();
-        $regex = '/'.preg_quote($text, '/').'/ui';
-        $message = sprintf('The string "%s" appears in the HTML response of this page, but it should not.', $text);
-
-        $this->assert(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that page HTML (response content) matches regex.
-     *
-     * @param string $regex
-     *
-     * @throws ExpectationException
-     */
-    public function responseMatches($regex)
-    {
-        $actual = $this->session->getPage()->getContent();
-        $message = sprintf('The pattern %s was not found anywhere in the HTML response of the page.', $regex);
-
-        $this->assert((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that page HTML (response content) does not matches regex.
-     *
-     * @param $regex
-     *
-     * @throws ExpectationException
-     */
-    public function responseNotMatches($regex)
-    {
-        $actual = $this->session->getPage()->getContent();
-        $message = sprintf('The pattern %s was found in the HTML response of the page, but it should not.', $regex);
-
-        $this->assert(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that there is specified number of specific elements on the page.
-     *
-     * @param string           $selectorType element selector type (css, xpath)
-     * @param string|array     $selector     element selector
-     * @param int              $count        expected count
-     * @param ElementInterface $container    document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function elementsCount($selectorType, $selector, $count, ElementInterface $container = null)
-    {
-        $container = $container ?: $this->session->getPage();
-        $nodes = $container->findAll($selectorType, $selector);
-
-        $message = sprintf(
-            '%d %s found on the page, but should be %d.',
-            count($nodes),
-            $this->getMatchingElementRepresentation($selectorType, $selector, count($nodes) !== 1),
-            $count
-        );
-
-        $this->assert(intval($count) === count($nodes), $message);
-    }
-
-    /**
-     * Checks that specific element exists on the current page.
-     *
-     * @param string           $selectorType element selector type (css, xpath)
-     * @param string|array     $selector     element selector
-     * @param ElementInterface $container    document to check against
-     *
-     * @return NodeElement
-     *
-     * @throws ElementNotFoundException
-     */
-    public function elementExists($selectorType, $selector, ElementInterface $container = null)
-    {
-        $container = $container ?: $this->session->getPage();
-        $node = $container->find($selectorType, $selector);
-
-        if (null === $node) {
-            if (is_array($selector)) {
-                $selector = implode(' ', $selector);
-            }
-
-            throw new ElementNotFoundException($this->session->getDriver(), 'element', $selectorType, $selector);
-        }
-
-        return $node;
-    }
-
-    /**
-     * Checks that specific element does not exists on the current page.
-     *
-     * @param string           $selectorType element selector type (css, xpath)
-     * @param string|array     $selector     element selector
-     * @param ElementInterface $container    document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function elementNotExists($selectorType, $selector, ElementInterface $container = null)
-    {
-        $container = $container ?: $this->session->getPage();
-        $node = $container->find($selectorType, $selector);
-
-        $message = sprintf(
-            'An %s appears on this page, but it should not.',
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assert(null === $node, $message);
-    }
-
-    /**
-     * Checks that specific element contains text.
-     *
-     * @param string       $selectorType element selector type (css, xpath)
-     * @param string|array $selector     element selector
-     * @param string       $text         expected text
-     *
-     * @throws ElementTextException
-     */
-    public function elementTextContains($selectorType, $selector, $text)
-    {
-        $element = $this->elementExists($selectorType, $selector);
-        $actual = $element->getText();
-        $regex = '/'.preg_quote($text, '/').'/ui';
-
-        $message = sprintf(
-            'The text "%s" was not found in the text of the %s.',
-            $text,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElementText((bool) preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that specific element does not contains text.
-     *
-     * @param string       $selectorType element selector type (css, xpath)
-     * @param string|array $selector     element selector
-     * @param string       $text         expected text
-     *
-     * @throws ElementTextException
-     */
-    public function elementTextNotContains($selectorType, $selector, $text)
-    {
-        $element = $this->elementExists($selectorType, $selector);
-        $actual = $element->getText();
-        $regex = '/'.preg_quote($text, '/').'/ui';
-
-        $message = sprintf(
-            'The text "%s" appears in the text of the %s, but it should not.',
-            $text,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElementText(!preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that specific element contains HTML.
-     *
-     * @param string       $selectorType element selector type (css, xpath)
-     * @param string|array $selector     element selector
-     * @param string       $html         expected text
-     *
-     * @throws ElementHtmlException
-     */
-    public function elementContains($selectorType, $selector, $html)
-    {
-        $element = $this->elementExists($selectorType, $selector);
-        $actual = $element->getHtml();
-        $regex = '/'.preg_quote($html, '/').'/ui';
-
-        $message = sprintf(
-            'The string "%s" was not found in the HTML of the %s.',
-            $html,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElement((bool) preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that specific element does not contains HTML.
-     *
-     * @param string       $selectorType element selector type (css, xpath)
-     * @param string|array $selector     element selector
-     * @param string       $html         expected text
-     *
-     * @throws ElementHtmlException
-     */
-    public function elementNotContains($selectorType, $selector, $html)
-    {
-        $element = $this->elementExists($selectorType, $selector);
-        $actual = $element->getHtml();
-        $regex = '/'.preg_quote($html, '/').'/ui';
-
-        $message = sprintf(
-            'The string "%s" appears in the HTML of the %s, but it should not.',
-            $html,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElement(!preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that an attribute exists in an element.
-     *
-     * @param string       $selectorType
-     * @param string|array $selector
-     * @param string       $attribute
-     *
-     * @return NodeElement
-     *
-     * @throws ElementHtmlException
-     */
-    public function elementAttributeExists($selectorType, $selector, $attribute)
-    {
-        $element = $this->elementExists($selectorType, $selector);
-
-        $message = sprintf(
-            'The attribute "%s" was not found in the %s.',
-            $attribute,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElement($element->hasAttribute($attribute), $message, $element);
-
-        return $element;
-    }
-
-    /**
-     * Checks that an attribute of a specific elements contains text.
-     *
-     * @param string       $selectorType
-     * @param string|array $selector
-     * @param string       $attribute
-     * @param string       $text
-     *
-     * @throws ElementHtmlException
-     */
-    public function elementAttributeContains($selectorType, $selector, $attribute, $text)
-    {
-        $element = $this->elementAttributeExists($selectorType, $selector, $attribute);
-        $actual = $element->getAttribute($attribute);
-        $regex = '/'.preg_quote($text, '/').'/ui';
-
-        $message = sprintf(
-            'The text "%s" was not found in the attribute "%s" of the %s.',
-            $text,
-            $attribute,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElement((bool) preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that an attribute of a specific elements does not contain text.
-     *
-     * @param string       $selectorType
-     * @param string|array $selector
-     * @param string       $attribute
-     * @param string       $text
-     *
-     * @throws ElementHtmlException
-     */
-    public function elementAttributeNotContains($selectorType, $selector, $attribute, $text)
-    {
-        $element = $this->elementAttributeExists($selectorType, $selector, $attribute);
-        $actual = $element->getAttribute($attribute);
-        $regex = '/'.preg_quote($text, '/').'/ui';
-
-        $message = sprintf(
-            'The text "%s" was found in the attribute "%s" of the %s.',
-            $text,
-            $attribute,
-            $this->getMatchingElementRepresentation($selectorType, $selector)
-        );
-
-        $this->assertElement(!preg_match($regex, $actual), $message, $element);
-    }
-
-    /**
-     * Checks that specific field exists on the current page.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param TraversableElement $container document to check against
-     *
-     * @return NodeElement
-     *
-     * @throws ElementNotFoundException
-     */
-    public function fieldExists($field, TraversableElement $container = null)
-    {
-        $container = $container ?: $this->session->getPage();
-        $node = $container->findField($field);
-
-        if (null === $node) {
-            throw new ElementNotFoundException($this->session->getDriver(), 'form field', 'id|name|label|value', $field);
-        }
-
-        return $node;
-    }
-
-    /**
-     * Checks that specific field does not exists on the current page.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param TraversableElement $container document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function fieldNotExists($field, TraversableElement $container = null)
-    {
-        $container = $container ?: $this->session->getPage();
-        $node = $container->findField($field);
-
-        $this->assert(null === $node, sprintf('A field "%s" appears on this page, but it should not.', $field));
-    }
-
-    /**
-     * Checks that specific field have provided value.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param string             $value     field value
-     * @param TraversableElement $container document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function fieldValueEquals($field, $value, TraversableElement $container = null)
-    {
-        $node = $this->fieldExists($field, $container);
-        $actual = $node->getValue();
-        $regex = '/^'.preg_quote($value, '/').'$/ui';
-
-        $message = sprintf('The field "%s" value is "%s", but "%s" expected.', $field, $actual, $value);
-
-        $this->assert((bool) preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that specific field have provided value.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param string             $value     field value
-     * @param TraversableElement $container document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function fieldValueNotEquals($field, $value, TraversableElement $container = null)
-    {
-        $node = $this->fieldExists($field, $container);
-        $actual = $node->getValue();
-        $regex = '/^'.preg_quote($value, '/').'$/ui';
-
-        $message = sprintf('The field "%s" value is "%s", but it should not be.', $field, $actual);
-
-        $this->assert(!preg_match($regex, $actual), $message);
-    }
-
-    /**
-     * Checks that specific checkbox is checked.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param TraversableElement $container document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function checkboxChecked($field, TraversableElement $container = null)
-    {
-        $node = $this->fieldExists($field, $container);
-
-        $this->assert($node->isChecked(), sprintf('Checkbox "%s" is not checked, but it should be.', $field));
-    }
-
-    /**
-     * Checks that specific checkbox is unchecked.
-     *
-     * @param string             $field     field id|name|label|value
-     * @param TraversableElement $container document to check against
-     *
-     * @throws ExpectationException
-     */
-    public function checkboxNotChecked($field, TraversableElement $container = null)
-    {
-        $node = $this->fieldExists($field, $container);
-
-        $this->assert(!$node->isChecked(), sprintf('Checkbox "%s" is checked, but it should not be.', $field));
-    }
-
-    /**
-     * Gets current url of the page.
-     *
-     * @return string
-     */
-    protected function getCurrentUrlPath()
-    {
-        return $this->cleanUrl($this->session->getCurrentUrl());
-    }
-
-    /**
-     * Trims scriptname from the URL.
-     *
-     * @param string $url
-     *
-     * @return string
-     */
-    protected function cleanUrl($url)
-    {
-        $parts = parse_url($url);
-        $fragment = empty($parts['fragment']) ? '' : '#'.$parts['fragment'];
-        $path = empty($parts['path']) ? '/' : $parts['path'];
-
-        return preg_replace('/^\/[^\.\/]+\.php\//', '/', $path).$fragment;
-    }
-
-    /**
-     * Asserts a condition.
-     *
-     * @param bool   $condition
-     * @param string $message   Failure message
-     *
-     * @throws ExpectationException when the condition is not fulfilled
-     */
-    private function assert($condition, $message)
-    {
-        if ($condition) {
-            return;
-        }
-
-        throw new ExpectationException($message, $this->session->getDriver());
-    }
-
-    /**
-     * Asserts a condition involving the response text.
-     *
-     * @param bool   $condition
-     * @param string $message   Failure message
-     *
-     * @throws ResponseTextException when the condition is not fulfilled
-     */
-    private function assertResponseText($condition, $message)
-    {
-        if ($condition) {
-            return;
-        }
-
-        throw new ResponseTextException($message, $this->session->getDriver());
-    }
-
-    /**
-     * Asserts a condition on an element.
-     *
-     * @param bool    $condition
-     * @param string  $message   Failure message
-     * @param Element $element
-     *
-     * @throws ElementHtmlException when the condition is not fulfilled
-     */
-    private function assertElement($condition, $message, Element $element)
-    {
-        if ($condition) {
-            return;
-        }
-
-        throw new ElementHtmlException($message, $this->session->getDriver(), $element);
-    }
-
-    /**
-     * Asserts a condition involving the text of an element.
-     *
-     * @param bool    $condition
-     * @param string  $message   Failure message
-     * @param Element $element
-     *
-     * @throws ElementTextException when the condition is not fulfilled
-     */
-    private function assertElementText($condition, $message, Element $element)
-    {
-        if ($condition) {
-            return;
-        }
-
-        throw new ElementTextException($message, $this->session->getDriver(), $element);
-    }
-
-    /**
-     * @param string       $selectorType
-     * @param string|array $selector
-     * @param bool         $plural
-     *
-     * @return string
-     */
-    private function getMatchingElementRepresentation($selectorType, $selector, $plural = false)
-    {
-        $pluralization = $plural ? 's' : '';
-
-        if (in_array($selectorType, array('named', 'named_exact', 'named_partial'))
-            && is_array($selector) && 2 === count($selector)
-        ) {
-            return sprintf('%s%s matching locator "%s"', $selector[0], $pluralization, $selector[1]);
-        }
-
-        if (is_array($selector)) {
-            $selector = implode(' ', $selector);
-        }
-
-        return sprintf('element%s matching %s "%s"', $pluralization, $selectorType, $selector);
-    }
-}
diff --git a/vendor/bin/phpunit b/vendor/bin/phpunit
deleted file mode 120000
index 2c48930..0000000
--- a/vendor/bin/phpunit
+++ /dev/null
@@ -1 +0,0 @@
-../phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb..0000000
--- a/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-
-    private $classMapAuthoritative = false;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
deleted file mode 100644
index c8d57af..0000000
--- a/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2015 Nils Adermann, Jordi Boggiano
-
-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/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
deleted file mode 100644
index fac9eab..0000000
--- a/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Drupal\\Component\\Utility\\Timer' => $baseDir . '/core/lib/Drupal/Component/Utility/Timer.php',
-    'Drupal\\Component\\Utility\\Unicode' => $baseDir . '/core/lib/Drupal/Component/Utility/Unicode.php',
-    'Drupal\\Core\\Database\\Database' => $baseDir . '/core/lib/Drupal/Core/Database/Database.php',
-    'Drupal\\Core\\DrupalKernel' => $baseDir . '/core/lib/Drupal/Core/DrupalKernel.php',
-    'Drupal\\Core\\DrupalKernelInterface' => $baseDir . '/core/lib/Drupal/Core/DrupalKernelInterface.php',
-    'Drupal\\Core\\Site\\Settings' => $baseDir . '/core/lib/Drupal/Core/Site/Settings.php',
-    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
-    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
-    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
-    'PHPUnit_Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php',
-    'PHPUnit_Extensions_GroupTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/GroupTestSuite.php',
-    'PHPUnit_Extensions_PhptTestCase' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestCase.php',
-    'PHPUnit_Extensions_PhptTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestSuite.php',
-    'PHPUnit_Extensions_RepeatedTest' => $vendorDir . '/phpunit/phpunit/src/Extensions/RepeatedTest.php',
-    'PHPUnit_Extensions_TestDecorator' => $vendorDir . '/phpunit/phpunit/src/Extensions/TestDecorator.php',
-    'PHPUnit_Extensions_TicketListener' => $vendorDir . '/phpunit/phpunit/src/Extensions/TicketListener.php',
-    'PHPUnit_Framework_Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php',
-    'PHPUnit_Framework_AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
-    'PHPUnit_Framework_BaseTestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/BaseTestListener.php',
-    'PHPUnit_Framework_CodeCoverageException' => $vendorDir . '/phpunit/phpunit/src/Framework/CodeCoverageException.php',
-    'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint.php',
-    'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/And.php',
-    'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php',
-    'PHPUnit_Framework_Constraint_ArraySubset' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php',
-    'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Attribute.php',
-    'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Callback.php',
-    'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php',
-    'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php',
-    'PHPUnit_Framework_Constraint_Composite' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Composite.php',
-    'PHPUnit_Framework_Constraint_Count' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Count.php',
-    'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Exception.php',
-    'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php',
-    'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php',
-    'PHPUnit_Framework_Constraint_ExceptionMessageRegExp' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php',
-    'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/FileExists.php',
-    'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php',
-    'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsAnything.php',
-    'PHPUnit_Framework_Constraint_IsEmpty' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php',
-    'PHPUnit_Framework_Constraint_IsEqual' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEqual.php',
-    'PHPUnit_Framework_Constraint_IsFalse' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsFalse.php',
-    'PHPUnit_Framework_Constraint_IsIdentical' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php',
-    'PHPUnit_Framework_Constraint_IsInstanceOf' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php',
-    'PHPUnit_Framework_Constraint_IsJson' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsJson.php',
-    'PHPUnit_Framework_Constraint_IsNull' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsNull.php',
-    'PHPUnit_Framework_Constraint_IsTrue' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsTrue.php',
-    'PHPUnit_Framework_Constraint_IsType' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsType.php',
-    'PHPUnit_Framework_Constraint_JsonMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php',
-    'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
-    'PHPUnit_Framework_Constraint_LessThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/LessThan.php',
-    'PHPUnit_Framework_Constraint_Not' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Not.php',
-    'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php',
-    'PHPUnit_Framework_Constraint_Or' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Or.php',
-    'PHPUnit_Framework_Constraint_PCREMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php',
-    'PHPUnit_Framework_Constraint_SameSize' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/SameSize.php',
-    'PHPUnit_Framework_Constraint_StringContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringContains.php',
-    'PHPUnit_Framework_Constraint_StringEndsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php',
-    'PHPUnit_Framework_Constraint_StringMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringMatches.php',
-    'PHPUnit_Framework_Constraint_StringStartsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php',
-    'PHPUnit_Framework_Constraint_TraversableContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php',
-    'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php',
-    'PHPUnit_Framework_Constraint_Xor' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Xor.php',
-    'PHPUnit_Framework_Error' => $vendorDir . '/phpunit/phpunit/src/Framework/Error.php',
-    'PHPUnit_Framework_Error_Deprecated' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Deprecated.php',
-    'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Notice.php',
-    'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Warning.php',
-    'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception.php',
-    'PHPUnit_Framework_ExceptionWrapper' => $vendorDir . '/phpunit/phpunit/src/Framework/ExceptionWrapper.php',
-    'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/src/Framework/ExpectationFailedException.php',
-    'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTest.php',
-    'PHPUnit_Framework_IncompleteTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestCase.php',
-    'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
-    'PHPUnit_Framework_InvalidCoversTargetError' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php',
-    'PHPUnit_Framework_InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
-    'PHPUnit_Framework_MockObject_BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php',
-    'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php',
-    'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php',
-    'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php',
-    'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php',
-    'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php',
-    'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php',
-    'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php',
-    'PHPUnit_Framework_MockObject_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php',
-    'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php',
-    'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php',
-    'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php',
-    'PHPUnit_Framework_MockObject_Invocation_Object' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php',
-    'PHPUnit_Framework_MockObject_Invocation_Static' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php',
-    'PHPUnit_Framework_MockObject_Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php',
-    'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php',
-    'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php',
-    'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php',
-    'PHPUnit_Framework_MockObject_Matcher_Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php',
-    'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php',
-    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php',
-    'PHPUnit_Framework_MockObject_RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php',
-    'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php',
-    'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
-    'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php',
-    'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php',
-    'PHPUnit_Framework_MockObject_Stub_Return' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php',
-    'PHPUnit_Framework_MockObject_Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php',
-    'PHPUnit_Framework_OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
-    'PHPUnit_Framework_RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
-    'PHPUnit_Framework_RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
-    'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
-    'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTest.php',
-    'PHPUnit_Framework_SkippedTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestCase.php',
-    'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestError.php',
-    'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php',
-    'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/src/Framework/SyntheticError.php',
-    'PHPUnit_Framework_Test' => $vendorDir . '/phpunit/phpunit/src/Framework/Test.php',
-    'PHPUnit_Framework_TestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/TestCase.php',
-    'PHPUnit_Framework_TestFailure' => $vendorDir . '/phpunit/phpunit/src/Framework/TestFailure.php',
-    'PHPUnit_Framework_TestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/TestListener.php',
-    'PHPUnit_Framework_TestResult' => $vendorDir . '/phpunit/phpunit/src/Framework/TestResult.php',
-    'PHPUnit_Framework_TestSuite' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite.php',
-    'PHPUnit_Framework_TestSuite_DataProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php',
-    'PHPUnit_Framework_UnintentionallyCoveredCodeError' => $vendorDir . '/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php',
-    'PHPUnit_Framework_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Warning.php',
-    'PHPUnit_Runner_BaseTestRunner' => $vendorDir . '/phpunit/phpunit/src/Runner/BaseTestRunner.php',
-    'PHPUnit_Runner_Exception' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception.php',
-    'PHPUnit_Runner_Filter_Factory' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Factory.php',
-    'PHPUnit_Runner_Filter_GroupFilterIterator' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group.php',
-    'PHPUnit_Runner_Filter_Group_Exclude' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php',
-    'PHPUnit_Runner_Filter_Group_Include' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Include.php',
-    'PHPUnit_Runner_Filter_Test' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Test.php',
-    'PHPUnit_Runner_StandardTestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php',
-    'PHPUnit_Runner_TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
-    'PHPUnit_Runner_Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
-    'PHPUnit_TextUI_Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
-    'PHPUnit_TextUI_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
-    'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/src/TextUI/TestRunner.php',
-    'PHPUnit_Util_Blacklist' => $vendorDir . '/phpunit/phpunit/src/Util/Blacklist.php',
-    'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php',
-    'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php',
-    'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php',
-    'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php',
-    'PHPUnit_Util_Filter' => $vendorDir . '/phpunit/phpunit/src/Util/Filter.php',
-    'PHPUnit_Util_Getopt' => $vendorDir . '/phpunit/phpunit/src/Util/Getopt.php',
-    'PHPUnit_Util_GlobalState' => $vendorDir . '/phpunit/phpunit/src/Util/GlobalState.php',
-    'PHPUnit_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/phpunit/src/Util/InvalidArgumentHelper.php',
-    'PHPUnit_Util_Log_JSON' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JSON.php',
-    'PHPUnit_Util_Log_JUnit' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JUnit.php',
-    'PHPUnit_Util_Log_TAP' => $vendorDir . '/phpunit/phpunit/src/Util/Log/TAP.php',
-    'PHPUnit_Util_PHP' => $vendorDir . '/phpunit/phpunit/src/Util/PHP.php',
-    'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Default.php',
-    'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Windows.php',
-    'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/src/Util/Printer.php',
-    'PHPUnit_Util_Regex' => $vendorDir . '/phpunit/phpunit/src/Util/Regex.php',
-    'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/src/Util/String.php',
-    'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/src/Util/Test.php',
-    'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php',
-    'PHPUnit_Util_TestDox_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php',
-    'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php',
-    'PHPUnit_Util_TestDox_ResultPrinter_Text' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php',
-    'PHPUnit_Util_TestSuiteIterator' => $vendorDir . '/phpunit/phpunit/src/Util/TestSuiteIterator.php',
-    'PHPUnit_Util_Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
-    'PHPUnit_Util_XML' => $vendorDir . '/phpunit/phpunit/src/Util/XML.php',
-    'PHP_CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage.php',
-    'PHP_CodeCoverage_Driver' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver.php',
-    'PHP_CodeCoverage_Driver_HHVM' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php',
-    'PHP_CodeCoverage_Driver_PHPDBG' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php',
-    'PHP_CodeCoverage_Driver_Xdebug' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php',
-    'PHP_CodeCoverage_Exception' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception.php',
-    'PHP_CodeCoverage_Exception_UnintentionallyCoveredCode' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php',
-    'PHP_CodeCoverage_Filter' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Filter.php',
-    'PHP_CodeCoverage_Report_Clover' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php',
-    'PHP_CodeCoverage_Report_Crap4j' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php',
-    'PHP_CodeCoverage_Report_Factory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php',
-    'PHP_CodeCoverage_Report_HTML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php',
-    'PHP_CodeCoverage_Report_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php',
-    'PHP_CodeCoverage_Report_Node_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php',
-    'PHP_CodeCoverage_Report_Node_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php',
-    'PHP_CodeCoverage_Report_Node_Iterator' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php',
-    'PHP_CodeCoverage_Report_PHP' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php',
-    'PHP_CodeCoverage_Report_Text' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php',
-    'PHP_CodeCoverage_Report_XML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php',
-    'PHP_CodeCoverage_Report_XML_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php',
-    'PHP_CodeCoverage_Report_XML_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php',
-    'PHP_CodeCoverage_Report_XML_File_Coverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php',
-    'PHP_CodeCoverage_Report_XML_File_Method' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php',
-    'PHP_CodeCoverage_Report_XML_File_Report' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php',
-    'PHP_CodeCoverage_Report_XML_File_Unit' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php',
-    'PHP_CodeCoverage_Report_XML_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php',
-    'PHP_CodeCoverage_Report_XML_Project' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php',
-    'PHP_CodeCoverage_Report_XML_Tests' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php',
-    'PHP_CodeCoverage_Report_XML_Totals' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php',
-    'PHP_CodeCoverage_Util' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util.php',
-    'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php',
-    'PHP_Timer' => $vendorDir . '/phpunit/php-timer/src/Timer.php',
-    'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ABSTRACT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_AMPERSAND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_AND_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ARRAY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ARRAY_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_AS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ASYNC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_AT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_AWAIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BACKTICK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BAD_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BOOLEAN_AND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BOOLEAN_OR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BOOL_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_BREAK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CALLABLE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CARET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CASE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CATCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLASS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLASS_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLASS_NAME_CONSTANT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLONE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLOSE_BRACKET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLOSE_CURLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLOSE_SQUARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CLOSE_TAG' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_COALESCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_COLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_COMMA' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_COMMENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_COMPILER_HALT_OFFSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CONCAT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CONST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CONSTANT_ENCAPSED_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CONTINUE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_CURLY_OPEN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DEC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DECLARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DEFAULT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DIR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DIV' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DIV_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DNUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOC_COMMENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOLLAR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOLLAR_OPEN_CURLY_BRACES' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOUBLE_ARROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOUBLE_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOUBLE_COLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_DOUBLE_QUOTES' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ECHO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ELLIPSIS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ELSE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ELSEIF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EMPTY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENCAPSED_AND_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDDECLARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDFOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDFOREACH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDIF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDSWITCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENDWHILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_END_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ENUM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EQUALS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EVAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EXCLAMATION_MARK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EXIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_EXTENDS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FINAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FINALLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FOREACH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FUNCTION' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_FUNC_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_GLOBAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_GOTO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_HALT_COMPILER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IMPLEMENTS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INCLUDE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INCLUDE_ONCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INLINE_HTML' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INSTANCEOF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INSTEADOF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INTERFACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_INT_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ISSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_GREATER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_NOT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_NOT_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_IS_SMALLER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_Includes' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_JOIN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LAMBDA_ARROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LAMBDA_CP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LAMBDA_OP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LINE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LIST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LNUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LOGICAL_AND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LOGICAL_OR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LOGICAL_XOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_METHOD_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_MINUS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_MINUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_MOD_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_MULT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_MUL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_NAMESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_NEW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_NS_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_NS_SEPARATOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_NUM_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OBJECT_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OBJECT_OPERATOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_ONUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OPEN_BRACKET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OPEN_CURLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OPEN_SQUARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OPEN_TAG' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OPEN_TAG_WITH_ECHO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PAAMAYIM_NEKUDOTAYIM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PERCENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PIPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PLUS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PLUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_POW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_POW_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PRINT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PRIVATE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PROTECTED' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_PUBLIC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_QUESTION_MARK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_REQUIRE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_REQUIRE_ONCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_RETURN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SEMICOLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SHAPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SPACESHIP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_START_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_STATIC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_STRING_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_STRING_VARNAME' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_SWITCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_Stream' => $vendorDir . '/phpunit/php-token-stream/src/Token/Stream.php',
-    'PHP_Token_Stream_CachingFactory' => $vendorDir . '/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php',
-    'PHP_Token_THROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TILDE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TRAIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TRAIT_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TRY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TYPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TYPELIST_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_TYPELIST_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_UNSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_UNSET_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_USE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_VAR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_VARIABLE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_WHERE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_WHILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_ATTRIBUTE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_CATEGORY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_CATEGORY_LABEL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_CHILDREN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_LABEL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_REQUIRED' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_TAG_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_TAG_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XHP_TEXT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PHP_Token_YIELD_FROM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'SebastianBergmann\\Comparator\\ArrayComparator' => $vendorDir . '/sebastian/comparator/src/ArrayComparator.php',
-    'SebastianBergmann\\Comparator\\Comparator' => $vendorDir . '/sebastian/comparator/src/Comparator.php',
-    'SebastianBergmann\\Comparator\\ComparisonFailure' => $vendorDir . '/sebastian/comparator/src/ComparisonFailure.php',
-    'SebastianBergmann\\Comparator\\DOMNodeComparator' => $vendorDir . '/sebastian/comparator/src/DOMNodeComparator.php',
-    'SebastianBergmann\\Comparator\\DateTimeComparator' => $vendorDir . '/sebastian/comparator/src/DateTimeComparator.php',
-    'SebastianBergmann\\Comparator\\DoubleComparator' => $vendorDir . '/sebastian/comparator/src/DoubleComparator.php',
-    'SebastianBergmann\\Comparator\\ExceptionComparator' => $vendorDir . '/sebastian/comparator/src/ExceptionComparator.php',
-    'SebastianBergmann\\Comparator\\Factory' => $vendorDir . '/sebastian/comparator/src/Factory.php',
-    'SebastianBergmann\\Comparator\\MockObjectComparator' => $vendorDir . '/sebastian/comparator/src/MockObjectComparator.php',
-    'SebastianBergmann\\Comparator\\NumericComparator' => $vendorDir . '/sebastian/comparator/src/NumericComparator.php',
-    'SebastianBergmann\\Comparator\\ObjectComparator' => $vendorDir . '/sebastian/comparator/src/ObjectComparator.php',
-    'SebastianBergmann\\Comparator\\ResourceComparator' => $vendorDir . '/sebastian/comparator/src/ResourceComparator.php',
-    'SebastianBergmann\\Comparator\\ScalarComparator' => $vendorDir . '/sebastian/comparator/src/ScalarComparator.php',
-    'SebastianBergmann\\Comparator\\SplObjectStorageComparator' => $vendorDir . '/sebastian/comparator/src/SplObjectStorageComparator.php',
-    'SebastianBergmann\\Comparator\\TypeComparator' => $vendorDir . '/sebastian/comparator/src/TypeComparator.php',
-    'SebastianBergmann\\Diff\\Chunk' => $vendorDir . '/sebastian/diff/src/Chunk.php',
-    'SebastianBergmann\\Diff\\Diff' => $vendorDir . '/sebastian/diff/src/Diff.php',
-    'SebastianBergmann\\Diff\\Differ' => $vendorDir . '/sebastian/diff/src/Differ.php',
-    'SebastianBergmann\\Diff\\LCS\\LongestCommonSubsequence' => $vendorDir . '/sebastian/diff/src/LCS/LongestCommonSubsequence.php',
-    'SebastianBergmann\\Diff\\LCS\\MemoryEfficientImplementation' => $vendorDir . '/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php',
-    'SebastianBergmann\\Diff\\LCS\\TimeEfficientImplementation' => $vendorDir . '/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php',
-    'SebastianBergmann\\Diff\\Line' => $vendorDir . '/sebastian/diff/src/Line.php',
-    'SebastianBergmann\\Diff\\Parser' => $vendorDir . '/sebastian/diff/src/Parser.php',
-    'SebastianBergmann\\Environment\\Console' => $vendorDir . '/sebastian/environment/src/Console.php',
-    'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
-    'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
-    'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
-    'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/Exception.php',
-    'SebastianBergmann\\GlobalState\\Restorer' => $vendorDir . '/sebastian/global-state/src/Restorer.php',
-    'SebastianBergmann\\GlobalState\\RuntimeException' => $vendorDir . '/sebastian/global-state/src/RuntimeException.php',
-    'SebastianBergmann\\GlobalState\\Snapshot' => $vendorDir . '/sebastian/global-state/src/Snapshot.php',
-    'SebastianBergmann\\RecursionContext\\Context' => $vendorDir . '/sebastian/recursion-context/src/Context.php',
-    'SebastianBergmann\\RecursionContext\\Exception' => $vendorDir . '/sebastian/recursion-context/src/Exception.php',
-    'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
-    'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
-    'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php',
-    'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
-    'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
-    'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
-    'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Request.php',
-    'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/ServerBag.php',
-    'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
-    'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
-    'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/TerminableInterface.php',
-    'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
-);
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
deleted file mode 100644
index 0e9136e..0000000
--- a/vendor/composer/autoload_files.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// autoload_files.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    '454414594637b9dd94a19af83f56f1a2' => $baseDir . '/core/lib/Drupal.php',
-);
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index bb43043..0000000
--- a/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
-    'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
-    'Twig_' => array($vendorDir . '/twig/twig/lib'),
-    'Stack' => array($vendorDir . '/stack/builder/src'),
-    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
-    'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
-    'Egulias\\' => array($vendorDir . '/egulias/email-validator/src'),
-    'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
-    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
-    'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
-    'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
-    'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'),
-    'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
-    'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
-    'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src'),
-);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 030a0de..0000000
--- a/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Zumba\\Mink\\Driver\\' => array($vendorDir . '/jcalderonzumba/mink-phantomjs-driver/src'),
-    'Zumba\\GastonJS\\' => array($vendorDir . '/jcalderonzumba/gastonjs/src'),
-    'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
-    'Zend\\Hydrator\\' => array($vendorDir . '/zendframework/zend-hydrator/src'),
-    'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed/src'),
-    'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper/src'),
-    'Zend\\Diactoros\\' => array($vendorDir . '/zendframework/zend-diactoros/src'),
-    'Wikimedia\\Composer\\' => array($vendorDir . '/wikimedia/composer-merge-plugin/src'),
-    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
-    'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
-    'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
-    'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
-    'Symfony\\Component\\Routing\\' => array($vendorDir . '/symfony/routing'),
-    'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
-    'Symfony\\Component\\HttpKernel\\' => array($vendorDir . '/symfony/http-kernel'),
-    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
-    'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
-    'Symfony\\Component\\DomCrawler\\' => array($vendorDir . '/symfony/dom-crawler'),
-    'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
-    'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
-    'Symfony\\Component\\CssSelector\\' => array($vendorDir . '/symfony/css-selector'),
-    'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
-    'Symfony\\Component\\ClassLoader\\' => array($vendorDir . '/symfony/class-loader'),
-    'Symfony\\Component\\BrowserKit\\' => array($vendorDir . '/symfony/browser-kit'),
-    'Symfony\\Cmf\\Component\\Routing\\' => array($vendorDir . '/symfony-cmf/routing'),
-    'Symfony\\Bridge\\PsrHttpMessage\\' => array($vendorDir . '/symfony/psr-http-message-bridge'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
-    'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
-    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
-    'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
-    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
-    'Goutte\\' => array($vendorDir . '/fabpot/goutte/Goutte'),
-    'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver'),
-    'Drupal\\Core\\Composer\\' => array($baseDir . '/core/lib/Drupal/Core/Composer'),
-    'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core'),
-    'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component'),
-    'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
-    'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
-    'Behat\\Mink\\Driver\\' => array($vendorDir . '/behat/mink-browserkit-driver/src', $vendorDir . '/behat/mink-goutte-driver/src'),
-    'Behat\\Mink\\' => array($vendorDir . '/behat/mink/src'),
-);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
deleted file mode 100644
index 4303fce..0000000
--- a/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitDrupal8
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInitDrupal8', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitDrupal8', 'loadClassLoader'));
-
-        $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
-        }
-
-        $map = require __DIR__ . '/autoload_psr4.php';
-        foreach ($map as $namespace => $path) {
-            $loader->setPsr4($namespace, $path);
-        }
-
-        $classMap = require __DIR__ . '/autoload_classmap.php';
-        if ($classMap) {
-            $loader->addClassMap($classMap);
-        }
-
-        $loader->register(true);
-
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireDrupal8($fileIdentifier, $file);
-        }
-
-        return $loader;
-    }
-}
-
-function composerRequireDrupal8($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
deleted file mode 100644
index 28ad2e4..0000000
--- a/vendor/composer/installed.json
+++ /dev/null
@@ -1,3861 +0,0 @@
-[
-    {
-        "name": "composer/installers",
-        "version": "v1.0.21",
-        "version_normalized": "1.0.21.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/composer/installers.git",
-            "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
-            "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
-            "shasum": ""
-        },
-        "replace": {
-            "roundcube/plugin-installer": "*",
-            "shama/baton": "*"
-        },
-        "require-dev": {
-            "composer/composer": "1.0.*@dev",
-            "phpunit/phpunit": "4.1.*"
-        },
-        "time": "2015-02-18 17:17:01",
-        "type": "composer-installer",
-        "extra": {
-            "class": "Composer\\Installers\\Installer",
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Composer\\Installers\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Kyle Robinson Young",
-                "email": "kyle@dontkry.com",
-                "homepage": "https://github.com/shama"
-            }
-        ],
-        "description": "A multi-framework Composer library installer",
-        "homepage": "http://composer.github.com/installers/",
-        "keywords": [
-            "Craft",
-            "Dolibarr",
-            "Hurad",
-            "MODX Evo",
-            "OXID",
-            "SMF",
-            "Thelia",
-            "WolfCMS",
-            "agl",
-            "aimeos",
-            "annotatecms",
-            "bitrix",
-            "cakephp",
-            "chef",
-            "codeigniter",
-            "concrete5",
-            "croogo",
-            "dokuwiki",
-            "drupal",
-            "elgg",
-            "fuelphp",
-            "grav",
-            "installer",
-            "joomla",
-            "kohana",
-            "laravel",
-            "lithium",
-            "magento",
-            "mako",
-            "mediawiki",
-            "modulework",
-            "moodle",
-            "phpbb",
-            "piwik",
-            "ppi",
-            "puppet",
-            "roundcube",
-            "shopware",
-            "silverstripe",
-            "symfony",
-            "typo3",
-            "wordpress",
-            "zend",
-            "zikula"
-        ]
-    },
-    {
-        "name": "composer/semver",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/composer/semver.git",
-            "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/composer/semver/zipball/d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-            "reference": "d0e1ccc6d44ab318b758d709e19176037da6b1ba",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.5",
-            "phpunit/phpunit-mock-objects": "~2.3"
-        },
-        "time": "2015-09-21 09:42:36",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Composer\\Semver\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Rob Bast",
-                "email": "rob.bast@gmail.com"
-            },
-            {
-                "name": "Nils Adermann",
-                "email": "naderman@naderman.de",
-                "homepage": "http://www.naderman.de"
-            },
-            {
-                "name": "Jordi Boggiano",
-                "email": "j.boggiano@seld.be",
-                "homepage": "http://seld.be"
-            }
-        ],
-        "description": "Semver library that offers utilities, version constraint parsing and validation.",
-        "keywords": [
-            "semantic",
-            "semver",
-            "validation",
-            "versioning"
-        ]
-    },
-    {
-        "name": "doctrine/lexer",
-        "version": "v1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/lexer.git",
-            "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-            "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "time": "2014-09-09 13:34:57",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Lexer\\": "lib/"
-            }
-        },
-        "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": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "lexer",
-            "parser"
-        ]
-    },
-    {
-        "name": "doctrine/inflector",
-        "version": "v1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/inflector.git",
-            "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604",
-            "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*"
-        },
-        "time": "2014-12-20 21:24:13",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Inflector\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "inflection",
-            "pluralize",
-            "singularize",
-            "string"
-        ]
-    },
-    {
-        "name": "doctrine/collections",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/collections.git",
-            "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-            "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-04-14 22:21:58",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Collections\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Collections Abstraction library",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "array",
-            "collections",
-            "iterator"
-        ]
-    },
-    {
-        "name": "doctrine/cache",
-        "version": "v1.4.2",
-        "version_normalized": "1.4.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/cache.git",
-            "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
-            "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2"
-        },
-        "conflict": {
-            "doctrine/common": ">2.2,<2.4"
-        },
-        "require-dev": {
-            "phpunit/phpunit": ">=3.7",
-            "predis/predis": "~1.0",
-            "satooshi/php-coveralls": "~0.6"
-        },
-        "time": "2015-08-31 12:36:41",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.5.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Cache\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Caching library offering an object-oriented API for many cache backends",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "cache",
-            "caching"
-        ]
-    },
-    {
-        "name": "doctrine/annotations",
-        "version": "v1.2.7",
-        "version_normalized": "1.2.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/annotations.git",
-            "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-            "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/lexer": "1.*",
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "doctrine/cache": "1.*",
-            "phpunit/phpunit": "4.*"
-        },
-        "time": "2015-08-31 12:32:49",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\Annotations\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Docblock Annotations Parser",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "annotations",
-            "docblock",
-            "parser"
-        ]
-    },
-    {
-        "name": "doctrine/common",
-        "version": "v2.5.1",
-        "version_normalized": "2.5.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/common.git",
-            "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
-            "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/annotations": "1.*",
-            "doctrine/cache": "1.*",
-            "doctrine/collections": "1.*",
-            "doctrine/inflector": "1.*",
-            "doctrine/lexer": "1.*",
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~3.7"
-        },
-        "time": "2015-08-31 13:00:22",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.6.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com"
-            },
-            {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com"
-            }
-        ],
-        "description": "Common Library for Doctrine projects",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "annotations",
-            "collections",
-            "eventmanager",
-            "persistence",
-            "spl"
-        ]
-    },
-    {
-        "name": "easyrdf/easyrdf",
-        "version": "0.9.1",
-        "version_normalized": "0.9.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/njh/easyrdf.git",
-            "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/njh/easyrdf/zipball/acd09dfe0555fbcfa254291e433c45fdd4652566",
-            "reference": "acd09dfe0555fbcfa254291e433c45fdd4652566",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "php": ">=5.2.8"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~3.5",
-            "sami/sami": "~1.4",
-            "squizlabs/php_codesniffer": "~1.4.3"
-        },
-        "suggest": {
-            "ml/json-ld": "~1.0"
-        },
-        "time": "2015-02-27 09:45:49",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "EasyRdf_": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Nicholas Humfrey",
-                "email": "njh@aelius.com",
-                "homepage": "http://www.aelius.com/njh/",
-                "role": "Developer"
-            },
-            {
-                "name": "Alexey Zakhlestin",
-                "email": "indeyets@gmail.com",
-                "role": "Developer"
-            }
-        ],
-        "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
-        "homepage": "http://www.easyrdf.org/",
-        "keywords": [
-            "Linked Data",
-            "RDF",
-            "Semantic Web",
-            "Turtle",
-            "rdfa",
-            "sparql"
-        ]
-    },
-    {
-        "name": "egulias/email-validator",
-        "version": "1.2.9",
-        "version_normalized": "1.2.9.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/egulias/EmailValidator.git",
-            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/af864423f50ea59f96c87bb1eae147a70bcf67a1",
-            "reference": "af864423f50ea59f96c87bb1eae147a70bcf67a1",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/lexer": "~1.0,>=1.0.1",
-            "php": ">= 5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4",
-            "satooshi/php-coveralls": "dev-master"
-        },
-        "time": "2015-06-22 21:07:51",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Egulias\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Eduardo Gulias Davis"
-            }
-        ],
-        "description": "A library for validating emails",
-        "homepage": "https://github.com/egulias/EmailValidator",
-        "keywords": [
-            "email",
-            "emailvalidation",
-            "emailvalidator",
-            "validation",
-            "validator"
-        ]
-    },
-    {
-        "name": "guzzlehttp/promises",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/promises.git",
-            "reference": "97fe7210def29451ec74923b27e552238defd75a"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/promises/zipball/97fe7210def29451ec74923b27e552238defd75a",
-            "reference": "97fe7210def29451ec74923b27e552238defd75a",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-08-15 19:37:21",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle promises library",
-        "keywords": [
-            "promise"
-        ]
-    },
-    {
-        "name": "psr/http-message",
-        "version": "1.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-            "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2015-05-04 20:22:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP messages",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "guzzlehttp/psr7",
-        "version": "1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/psr7.git",
-            "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/psr7/zipball/4ef919b0cf3b1989523138b60163bbcb7ba1ff7e",
-            "reference": "4ef919b0cf3b1989523138b60163bbcb7ba1ff7e",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0",
-            "psr/http-message": "~1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-08-15 19:32:36",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Psr7\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "PSR-7 message implementation",
-        "keywords": [
-            "http",
-            "message",
-            "stream",
-            "uri"
-        ]
-    },
-    {
-        "name": "masterminds/html5",
-        "version": "2.1.2",
-        "version_normalized": "2.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Masterminds/html5-php.git",
-            "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
-            "reference": "8f782e0f01a6e33a319bdc8f6de9cfd6569979a4",
-            "shasum": ""
-        },
-        "require": {
-            "ext-libxml": "*",
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*",
-            "sami/sami": "~2.0",
-            "satooshi/php-coveralls": "0.6.*"
-        },
-        "time": "2015-06-07 08:43:18",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Masterminds\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Matt Butcher",
-                "email": "technosophos@gmail.com"
-            },
-            {
-                "name": "Asmir Mustafic",
-                "email": "goetas@gmail.com"
-            },
-            {
-                "name": "Matt Farina",
-                "email": "matt@mattfarina.com"
-            }
-        ],
-        "description": "An HTML5 parser and serializer.",
-        "homepage": "http://masterminds.github.io/html5-php",
-        "keywords": [
-            "HTML5",
-            "dom",
-            "html",
-            "parser",
-            "querypath",
-            "serializer",
-            "xml"
-        ]
-    },
-    {
-        "name": "psr/log",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "1.0.0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-            "reference": "1.0.0",
-            "shasum": ""
-        },
-        "time": "2012-12-21 11:40:51",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Psr\\Log\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "stack/builder",
-        "version": "v1.0.3",
-        "version_normalized": "1.0.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/stackphp/builder.git",
-            "reference": "c1f8a4693b55c563405024f708a76ef576c3b276"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/stackphp/builder/zipball/c1f8a4693b55c563405024f708a76ef576c3b276",
-            "reference": "c1f8a4693b55c563405024f708a76ef576c3b276",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0",
-            "symfony/http-foundation": "~2.1",
-            "symfony/http-kernel": "~2.1"
-        },
-        "require-dev": {
-            "silex/silex": "~1.0"
-        },
-        "time": "2014-11-23 20:37:11",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Stack": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Igor Wiedler",
-                "email": "igor@wiedler.ch"
-            }
-        ],
-        "description": "Builder for stack middlewares based on HttpKernelInterface.",
-        "keywords": [
-            "stack"
-        ]
-    },
-    {
-        "name": "symfony-cmf/routing",
-        "version": "1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony-cmf/Routing.git",
-            "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/8e87981d72c6930a27585dcd3119f3199f6cb2a6",
-            "reference": "8e87981d72c6930a27585dcd3119f3199f6cb2a6",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "psr/log": "~1.0",
-            "symfony/http-kernel": "~2.2",
-            "symfony/routing": "~2.2"
-        },
-        "require-dev": {
-            "symfony/config": "~2.2",
-            "symfony/dependency-injection": "~2.0@stable",
-            "symfony/event-dispatcher": "~2.1"
-        },
-        "suggest": {
-            "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
-        },
-        "time": "2014-10-20 20:55:17",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Cmf\\Component\\Routing\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Symfony CMF Community",
-                "homepage": "https://github.com/symfony-cmf/Routing/contributors"
-            }
-        ],
-        "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
-        "homepage": "http://cmf.symfony.com",
-        "keywords": [
-            "database",
-            "routing"
-        ]
-    },
-    {
-        "name": "symfony/psr-http-message-bridge",
-        "version": "v0.2",
-        "version_normalized": "0.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/psr-http-message-bridge.git",
-            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/dc7e308e1dc2898a46776e2221a643cb08315453",
-            "reference": "dc7e308e1dc2898a46776e2221a643cb08315453",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "psr/http-message": "~1.0",
-            "symfony/http-foundation": "~2.3|~3.0"
-        },
-        "require-dev": {
-            "symfony/phpunit-bridge": "~2.7|~3.0"
-        },
-        "suggest": {
-            "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
-        },
-        "time": "2015-05-29 17:57:12",
-        "type": "symfony-bridge",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Bridge\\PsrHttpMessage\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
-            },
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "PSR HTTP message bridge",
-        "homepage": "http://symfony.com",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "zendframework/zend-diactoros",
-        "version": "1.1.3",
-        "version_normalized": "1.1.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-diactoros.git",
-            "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-            "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4",
-            "psr/http-message": "~1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "~1.0.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.6",
-            "squizlabs/php_codesniffer": "^2.3.1"
-        },
-        "time": "2015-08-10 20:04:20",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev",
-                "dev-develop": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Diactoros\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-2-Clause"
-        ],
-        "description": "PSR HTTP Message implementations",
-        "homepage": "https://github.com/zendframework/zend-diactoros",
-        "keywords": [
-            "http",
-            "psr",
-            "psr-7"
-        ]
-    },
-    {
-        "name": "zendframework/zend-stdlib",
-        "version": "2.7.3",
-        "version_normalized": "2.7.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-stdlib.git",
-            "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-            "reference": "8ac0c77ff567fcf49b58689ee3bfa7595be102bc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-hydrator": "~1.0"
-        },
-        "require-dev": {
-            "athletic/athletic": "~0.1",
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0",
-            "zendframework/zend-config": "~2.5",
-            "zendframework/zend-eventmanager": "~2.5",
-            "zendframework/zend-filter": "~2.5",
-            "zendframework/zend-inputfilter": "~2.5",
-            "zendframework/zend-serializer": "~2.5",
-            "zendframework/zend-servicemanager": "~2.5"
-        },
-        "suggest": {
-            "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-            "zendframework/zend-filter": "To support naming strategy hydrator usage",
-            "zendframework/zend-serializer": "Zend\\Serializer component",
-            "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
-        },
-        "time": "2015-09-25 04:06:33",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev",
-                "dev-develop": "2.8-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Stdlib\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-stdlib",
-        "keywords": [
-            "stdlib",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-hydrator",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-hydrator.git",
-            "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f",
-            "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-stdlib": "^2.5.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "^2.0@dev",
-            "zendframework/zend-eventmanager": "^2.5.1",
-            "zendframework/zend-filter": "^2.5.1",
-            "zendframework/zend-inputfilter": "^2.5.1",
-            "zendframework/zend-serializer": "^2.5.1",
-            "zendframework/zend-servicemanager": "^2.5.1"
-        },
-        "suggest": {
-            "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
-            "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage",
-            "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
-            "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage"
-        },
-        "time": "2015-09-17 14:06:43",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev",
-                "dev-develop": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Hydrator\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-hydrator",
-        "keywords": [
-            "hydrator",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-escaper",
-        "version": "2.5.1",
-        "version_normalized": "2.5.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-escaper.git",
-            "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-            "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.23"
-        },
-        "require-dev": {
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-06-03 14:05:37",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.5-dev",
-                "dev-develop": "2.6-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Escaper\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "homepage": "https://github.com/zendframework/zend-escaper",
-        "keywords": [
-            "escaper",
-            "zf2"
-        ]
-    },
-    {
-        "name": "zendframework/zend-feed",
-        "version": "2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/zendframework/zend-feed.git",
-            "reference": "0661345b82b51428619e05d3aadd3de65b57fa54"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54",
-            "reference": "0661345b82b51428619e05d3aadd3de65b57fa54",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5",
-            "zendframework/zend-escaper": "~2.5",
-            "zendframework/zend-stdlib": "~2.5"
-        },
-        "require-dev": {
-            "fabpot/php-cs-fixer": "1.7.*",
-            "phpunit/phpunit": "~4.0",
-            "zendframework/zend-cache": "~2.5",
-            "zendframework/zend-db": "~2.5",
-            "zendframework/zend-http": "~2.5",
-            "zendframework/zend-servicemanager": "~2.5",
-            "zendframework/zend-validator": "~2.5"
-        },
-        "suggest": {
-            "zendframework/zend-cache": "Zend\\Cache component",
-            "zendframework/zend-db": "Zend\\Db component",
-            "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-            "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-            "zendframework/zend-validator": "Zend\\Validator component"
-        },
-        "time": "2015-08-04 21:39:18",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.5-dev",
-                "dev-develop": "2.6-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zend\\Feed\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "provides functionality for consuming RSS and Atom feeds",
-        "homepage": "https://github.com/zendframework/zend-feed",
-        "keywords": [
-            "feed",
-            "zf2"
-        ]
-    },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "6.1.0",
-        "version_normalized": "6.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/66fd14b4d0b8f2389eaf37c5458608c7cb793a81",
-            "reference": "66fd14b4d0b8f2389eaf37c5458608c7cb793a81",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/promises": "~1.0",
-            "guzzlehttp/psr7": "~1.1",
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "~4.0",
-            "psr/log": "~1.0"
-        },
-        "time": "2015-09-08 17:36:26",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "6.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/functions_include.php"
-            ],
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
-    {
-        "name": "fabpot/goutte",
-        "version": "v3.1.1",
-        "version_normalized": "3.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/FriendsOfPHP/Goutte.git",
-            "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/751a3dc5c4d86ec3e97c9f27133ef9694d9243cc",
-            "reference": "751a3dc5c4d86ec3e97c9f27133ef9694d9243cc",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "^6.0",
-            "php": ">=5.5.0",
-            "symfony/browser-kit": "~2.1",
-            "symfony/css-selector": "~2.1",
-            "symfony/dom-crawler": "~2.1"
-        },
-        "time": "2015-08-29 16:16:56",
-        "type": "application",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Goutte\\": "Goutte"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            }
-        ],
-        "description": "A simple PHP Web Scraper",
-        "homepage": "https://github.com/FriendsOfPHP/Goutte",
-        "keywords": [
-            "scraper"
-        ]
-    },
-    {
-        "name": "behat/mink",
-        "version": "v1.7.0",
-        "version_normalized": "1.7.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/minkphp/Mink.git",
-            "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/minkphp/Mink/zipball/6c129030ec2cc029905cf969a56ca8f087b2dfdf",
-            "reference": "6c129030ec2cc029905cf969a56ca8f087b2dfdf",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.1",
-            "symfony/css-selector": "~2.1"
-        },
-        "require-dev": {
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "suggest": {
-            "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-            "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
-            "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
-            "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
-        },
-        "time": "2015-09-20 20:24:03",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.7.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Behat\\Mink\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Konstantin Kudryashov",
-                "email": "ever.zet@gmail.com",
-                "homepage": "http://everzet.com"
-            }
-        ],
-        "description": "Browser controller/emulator abstraction for PHP",
-        "homepage": "http://mink.behat.org/",
-        "keywords": [
-            "browser",
-            "testing",
-            "web"
-        ]
-    },
-    {
-        "name": "behat/mink-browserkit-driver",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
-            "reference": "da47df1593dac132f04d24e7277ef40d33d9f201"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/da47df1593dac132f04d24e7277ef40d33d9f201",
-            "reference": "da47df1593dac132f04d24e7277ef40d33d9f201",
-            "shasum": ""
-        },
-        "require": {
-            "behat/mink": "~1.7@dev",
-            "php": ">=5.3.6",
-            "symfony/browser-kit": "~2.3",
-            "symfony/dom-crawler": "~2.3"
-        },
-        "require-dev": {
-            "silex/silex": "~1.2",
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "time": "2015-09-21 20:56:13",
-        "type": "mink-driver",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Behat\\Mink\\Driver\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Konstantin Kudryashov",
-                "email": "ever.zet@gmail.com",
-                "homepage": "http://everzet.com"
-            }
-        ],
-        "description": "Symfony2 BrowserKit driver for Mink framework",
-        "homepage": "http://mink.behat.org/",
-        "keywords": [
-            "Mink",
-            "Symfony2",
-            "browser",
-            "testing"
-        ]
-    },
-    {
-        "name": "behat/mink-goutte-driver",
-        "version": "v1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-            "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
-            "reference": "c8e254f127d6f2242b994afd4339fb62d471df3f",
-            "shasum": ""
-        },
-        "require": {
-            "behat/mink": "~1.6@dev",
-            "behat/mink-browserkit-driver": "~1.2@dev",
-            "fabpot/goutte": "~1.0.4|~2.0|~3.1",
-            "php": ">=5.3.1"
-        },
-        "require-dev": {
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "time": "2015-09-21 21:31:11",
-        "type": "mink-driver",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Behat\\Mink\\Driver\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Konstantin Kudryashov",
-                "email": "ever.zet@gmail.com",
-                "homepage": "http://everzet.com"
-            }
-        ],
-        "description": "Goutte driver for Mink framework",
-        "homepage": "http://mink.behat.org/",
-        "keywords": [
-            "browser",
-            "goutte",
-            "headless",
-            "testing"
-        ]
-    },
-    {
-        "name": "mikey179/vfsStream",
-        "version": "v1.6.0",
-        "version_normalized": "1.6.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/mikey179/vfsStream.git",
-            "reference": "73bcb605b741a7d5044b47592338c633788b0eb7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/73bcb605b741a7d5044b47592338c633788b0eb7",
-            "reference": "73bcb605b741a7d5044b47592338c633788b0eb7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.5"
-        },
-        "time": "2015-10-06 16:59:57",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.6.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "org\\bovigo\\vfs\\": "src/main/php"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Frank Kleine",
-                "homepage": "http://frankkleine.de/",
-                "role": "Developer"
-            }
-        ],
-        "description": "Virtual file system to mock the real file system in unit tests.",
-        "homepage": "http://vfs.bovigo.org/"
-    },
-    {
-        "name": "phpdocumentor/reflection-docblock",
-        "version": "2.0.4",
-        "version_normalized": "2.0.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-            "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-            "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "suggest": {
-            "dflydev/markdown": "~1.0",
-            "erusev/parsedown": "~1.0"
-        },
-        "time": "2015-02-03 12:10:50",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "phpDocumentor": [
-                    "src/"
-                ]
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Mike van Riel",
-                "email": "mike.vanriel@naenius.com"
-            }
-        ]
-    },
-    {
-        "name": "phpunit/php-token-stream",
-        "version": "1.4.8",
-        "version_normalized": "1.4.8.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-            "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-            "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-            "shasum": ""
-        },
-        "require": {
-            "ext-tokenizer": "*",
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.2"
-        },
-        "time": "2015-09-15 10:49:45",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            }
-        ],
-        "description": "Wrapper around PHP's tokenizer extension.",
-        "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-        "keywords": [
-            "tokenizer"
-        ]
-    },
-    {
-        "name": "sebastian/version",
-        "version": "1.0.6",
-        "version_normalized": "1.0.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/version.git",
-            "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-            "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-            "shasum": ""
-        },
-        "time": "2015-06-21 13:59:46",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-        "homepage": "https://github.com/sebastianbergmann/version"
-    },
-    {
-        "name": "sebastian/global-state",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/global-state.git",
-            "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-            "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.2"
-        },
-        "suggest": {
-            "ext-uopz": "*"
-        },
-        "time": "2014-10-06 09:23:50",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            }
-        ],
-        "description": "Snapshotting of global state",
-        "homepage": "http://www.github.com/sebastianbergmann/global-state",
-        "keywords": [
-            "global state"
-        ]
-    },
-    {
-        "name": "sebastian/recursion-context",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/recursion-context.git",
-            "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
-            "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4"
-        },
-        "time": "2015-06-21 08:04:50",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Jeff Welch",
-                "email": "whatthejeff@gmail.com"
-            },
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            },
-            {
-                "name": "Adam Harvey",
-                "email": "aharvey@php.net"
-            }
-        ],
-        "description": "Provides functionality to recursively process PHP variables",
-        "homepage": "http://www.github.com/sebastianbergmann/recursion-context"
-    },
-    {
-        "name": "sebastian/exporter",
-        "version": "1.2.1",
-        "version_normalized": "1.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/exporter.git",
-            "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
-            "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "sebastian/recursion-context": "~1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4"
-        },
-        "time": "2015-06-21 07:55:53",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Jeff Welch",
-                "email": "whatthejeff@gmail.com"
-            },
-            {
-                "name": "Volker Dusch",
-                "email": "github@wallbash.com"
-            },
-            {
-                "name": "Bernhard Schussek",
-                "email": "bschussek@2bepublished.at"
-            },
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            },
-            {
-                "name": "Adam Harvey",
-                "email": "aharvey@php.net"
-            }
-        ],
-        "description": "Provides the functionality to export PHP variables for visualization",
-        "homepage": "http://www.github.com/sebastianbergmann/exporter",
-        "keywords": [
-            "export",
-            "exporter"
-        ]
-    },
-    {
-        "name": "sebastian/environment",
-        "version": "1.3.2",
-        "version_normalized": "1.3.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/environment.git",
-            "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
-            "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4"
-        },
-        "time": "2015-08-03 06:14:51",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            }
-        ],
-        "description": "Provides functionality to handle HHVM/PHP environments",
-        "homepage": "http://www.github.com/sebastianbergmann/environment",
-        "keywords": [
-            "Xdebug",
-            "environment",
-            "hhvm"
-        ]
-    },
-    {
-        "name": "sebastian/diff",
-        "version": "1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/diff.git",
-            "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-            "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.2"
-        },
-        "time": "2015-02-22 15:13:53",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Kore Nordmann",
-                "email": "mail@kore-nordmann.de"
-            },
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            }
-        ],
-        "description": "Diff implementation",
-        "homepage": "http://www.github.com/sebastianbergmann/diff",
-        "keywords": [
-            "diff"
-        ]
-    },
-    {
-        "name": "sebastian/comparator",
-        "version": "1.2.0",
-        "version_normalized": "1.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/comparator.git",
-            "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-            "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "sebastian/diff": "~1.2",
-            "sebastian/exporter": "~1.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4"
-        },
-        "time": "2015-07-26 15:48:44",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Jeff Welch",
-                "email": "whatthejeff@gmail.com"
-            },
-            {
-                "name": "Volker Dusch",
-                "email": "github@wallbash.com"
-            },
-            {
-                "name": "Bernhard Schussek",
-                "email": "bschussek@2bepublished.at"
-            },
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de"
-            }
-        ],
-        "description": "Provides the functionality to compare PHP values for equality",
-        "homepage": "http://www.github.com/sebastianbergmann/comparator",
-        "keywords": [
-            "comparator",
-            "compare",
-            "equality"
-        ]
-    },
-    {
-        "name": "phpunit/php-text-template",
-        "version": "1.2.1",
-        "version_normalized": "1.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-text-template.git",
-            "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-            "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2015-06-21 13:50:34",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Simple template engine.",
-        "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-        "keywords": [
-            "template"
-        ]
-    },
-    {
-        "name": "doctrine/instantiator",
-        "version": "1.0.5",
-        "version_normalized": "1.0.5.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/instantiator.git",
-            "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-            "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3,<8.0-DEV"
-        },
-        "require-dev": {
-            "athletic/athletic": "~0.1.8",
-            "ext-pdo": "*",
-            "ext-phar": "*",
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~2.0"
-        },
-        "time": "2015-06-14 21:17:01",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Marco Pivetta",
-                "email": "ocramius@gmail.com",
-                "homepage": "http://ocramius.github.com/"
-            }
-        ],
-        "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-        "homepage": "https://github.com/doctrine/instantiator",
-        "keywords": [
-            "constructor",
-            "instantiate"
-        ]
-    },
-    {
-        "name": "phpunit/phpunit-mock-objects",
-        "version": "2.3.8",
-        "version_normalized": "2.3.8.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-            "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-            "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/instantiator": "^1.0.2",
-            "php": ">=5.3.3",
-            "phpunit/php-text-template": "~1.2",
-            "sebastian/exporter": "~1.2"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.4"
-        },
-        "suggest": {
-            "ext-soap": "*"
-        },
-        "time": "2015-10-02 06:51:40",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Mock Object library for PHPUnit",
-        "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-        "keywords": [
-            "mock",
-            "xunit"
-        ]
-    },
-    {
-        "name": "phpunit/php-timer",
-        "version": "1.0.7",
-        "version_normalized": "1.0.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-timer.git",
-            "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-            "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2015-06-21 08:01:12",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Utility class for timing",
-        "homepage": "https://github.com/sebastianbergmann/php-timer/",
-        "keywords": [
-            "timer"
-        ]
-    },
-    {
-        "name": "phpunit/php-file-iterator",
-        "version": "1.4.1",
-        "version_normalized": "1.4.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-            "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-            "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2015-06-21 13:08:43",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-        "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-        "keywords": [
-            "filesystem",
-            "iterator"
-        ]
-    },
-    {
-        "name": "phpunit/php-code-coverage",
-        "version": "2.2.4",
-        "version_normalized": "2.2.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-            "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-            "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3",
-            "phpunit/php-file-iterator": "~1.3",
-            "phpunit/php-text-template": "~1.2",
-            "phpunit/php-token-stream": "~1.3",
-            "sebastian/environment": "^1.3.2",
-            "sebastian/version": "~1.0"
-        },
-        "require-dev": {
-            "ext-xdebug": ">=2.1.4",
-            "phpunit/phpunit": "~4"
-        },
-        "suggest": {
-            "ext-dom": "*",
-            "ext-xdebug": ">=2.2.1",
-            "ext-xmlwriter": "*"
-        },
-        "time": "2015-10-06 15:47:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-        "keywords": [
-            "coverage",
-            "testing",
-            "xunit"
-        ]
-    },
-    {
-        "name": "phpspec/prophecy",
-        "version": "v1.5.0",
-        "version_normalized": "1.5.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/phpspec/prophecy.git",
-            "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
-            "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
-            "shasum": ""
-        },
-        "require": {
-            "doctrine/instantiator": "^1.0.2",
-            "phpdocumentor/reflection-docblock": "~2.0",
-            "sebastian/comparator": "~1.1"
-        },
-        "require-dev": {
-            "phpspec/phpspec": "~2.0"
-        },
-        "time": "2015-08-13 10:07:40",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Prophecy\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Konstantin Kudryashov",
-                "email": "ever.zet@gmail.com",
-                "homepage": "http://everzet.com"
-            },
-            {
-                "name": "Marcello Duarte",
-                "email": "marcello.duarte@gmail.com"
-            }
-        ],
-        "description": "Highly opinionated mocking framework for PHP 5.3+",
-        "homepage": "https://github.com/phpspec/prophecy",
-        "keywords": [
-            "Double",
-            "Dummy",
-            "fake",
-            "mock",
-            "spy",
-            "stub"
-        ]
-    },
-    {
-        "name": "phpunit/phpunit",
-        "version": "4.8.11",
-        "version_normalized": "4.8.11.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/phpunit.git",
-            "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5",
-            "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5",
-            "shasum": ""
-        },
-        "require": {
-            "ext-dom": "*",
-            "ext-json": "*",
-            "ext-pcre": "*",
-            "ext-reflection": "*",
-            "ext-spl": "*",
-            "php": ">=5.3.3",
-            "phpspec/prophecy": "^1.3.1",
-            "phpunit/php-code-coverage": "~2.1",
-            "phpunit/php-file-iterator": "~1.4",
-            "phpunit/php-text-template": "~1.2",
-            "phpunit/php-timer": ">=1.0.6",
-            "phpunit/phpunit-mock-objects": "~2.3",
-            "sebastian/comparator": "~1.1",
-            "sebastian/diff": "~1.2",
-            "sebastian/environment": "~1.3",
-            "sebastian/exporter": "~1.2",
-            "sebastian/global-state": "~1.0",
-            "sebastian/version": "~1.0",
-            "symfony/yaml": "~2.1|~3.0"
-        },
-        "suggest": {
-            "phpunit/php-invoker": "~1.1"
-        },
-        "time": "2015-10-07 10:39:46",
-        "bin": [
-            "phpunit"
-        ],
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "4.8.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de",
-                "role": "lead"
-            }
-        ],
-        "description": "The PHP Unit Testing framework.",
-        "homepage": "https://phpunit.de/",
-        "keywords": [
-            "phpunit",
-            "testing",
-            "xunit"
-        ]
-    },
-    {
-        "name": "symfony/class-loader",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/class-loader.git",
-            "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/class-loader/zipball/320f8d2a9cdbcbeb24be602c124aae9d998474a4",
-            "reference": "320f8d2a9cdbcbeb24be602c124aae9d998474a4",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "symfony/finder": "~2.0,>=2.0.5"
-        },
-        "time": "2015-10-23 14:47:27",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\ClassLoader\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony ClassLoader Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/console",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/console.git",
-            "reference": "5efd632294c8320ea52492db22292ff853a43766"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766",
-            "reference": "5efd632294c8320ea52492db22292ff853a43766",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/event-dispatcher": "~2.1",
-            "symfony/process": "~2.1"
-        },
-        "suggest": {
-            "psr/log": "For using the console logger",
-            "symfony/event-dispatcher": "",
-            "symfony/process": ""
-        },
-        "time": "2015-10-20 14:38:46",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Console\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Console Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/dependency-injection",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/dependency-injection.git",
-            "reference": "af284e795ec8a08c80d1fc47518fd23004b89847"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/af284e795ec8a08c80d1fc47518fd23004b89847",
-            "reference": "af284e795ec8a08c80d1fc47518fd23004b89847",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "conflict": {
-            "symfony/expression-language": "<2.6"
-        },
-        "require-dev": {
-            "symfony/config": "~2.2",
-            "symfony/expression-language": "~2.6",
-            "symfony/yaml": "~2.1"
-        },
-        "suggest": {
-            "symfony/config": "",
-            "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-            "symfony/yaml": ""
-        },
-        "time": "2015-10-27 15:38:06",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\DependencyInjection\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony DependencyInjection Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/debug",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/debug.git",
-            "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b",
-            "reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "psr/log": "~1.0"
-        },
-        "conflict": {
-            "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-        },
-        "require-dev": {
-            "symfony/class-loader": "~2.2",
-            "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Debug\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Debug Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/http-foundation",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/http-foundation.git",
-            "reference": "7598eea151ae3d4134df1f9957364b17809eea75"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7598eea151ae3d4134df1f9957364b17809eea75",
-            "reference": "7598eea151ae3d4134df1f9957364b17809eea75",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "symfony/expression-language": "~2.4"
-        },
-        "time": "2015-10-23 14:47:27",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\HttpFoundation\\": ""
-            },
-            "classmap": [
-                "Resources/stubs"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony HttpFoundation Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/event-dispatcher",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/event-dispatcher.git",
-            "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8",
-            "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/config": "~2.0,>=2.0.5",
-            "symfony/dependency-injection": "~2.6",
-            "symfony/expression-language": "~2.6",
-            "symfony/stopwatch": "~2.3"
-        },
-        "suggest": {
-            "symfony/dependency-injection": "",
-            "symfony/http-kernel": ""
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\EventDispatcher\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony EventDispatcher Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/http-kernel",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/http-kernel.git",
-            "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4260f2273a446a6715063dc9ca89fd0c475c2f77",
-            "reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "psr/log": "~1.0",
-            "symfony/debug": "~2.6,>=2.6.2",
-            "symfony/event-dispatcher": "~2.6,>=2.6.7",
-            "symfony/http-foundation": "~2.5,>=2.5.4"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "symfony/browser-kit": "~2.3",
-            "symfony/class-loader": "~2.1",
-            "symfony/config": "~2.7",
-            "symfony/console": "~2.3",
-            "symfony/css-selector": "~2.0,>=2.0.5",
-            "symfony/dependency-injection": "~2.2",
-            "symfony/dom-crawler": "~2.0,>=2.0.5",
-            "symfony/expression-language": "~2.4",
-            "symfony/finder": "~2.0,>=2.0.5",
-            "symfony/process": "~2.0,>=2.0.5",
-            "symfony/routing": "~2.2",
-            "symfony/stopwatch": "~2.3",
-            "symfony/templating": "~2.2",
-            "symfony/translation": "~2.0,>=2.0.5",
-            "symfony/var-dumper": "~2.6"
-        },
-        "suggest": {
-            "symfony/browser-kit": "",
-            "symfony/class-loader": "",
-            "symfony/config": "",
-            "symfony/console": "",
-            "symfony/dependency-injection": "",
-            "symfony/finder": "",
-            "symfony/var-dumper": ""
-        },
-        "time": "2015-10-27 19:07:21",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\HttpKernel\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony HttpKernel Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/routing",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/routing.git",
-            "reference": "f353e1f588679c3ec987624e6c617646bd01ba38"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/routing/zipball/f353e1f588679c3ec987624e6c617646bd01ba38",
-            "reference": "f353e1f588679c3ec987624e6c617646bd01ba38",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/common": "~2.2",
-            "psr/log": "~1.0",
-            "symfony/config": "~2.7",
-            "symfony/expression-language": "~2.4",
-            "symfony/http-foundation": "~2.3",
-            "symfony/yaml": "~2.0,>=2.0.5"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation loader",
-            "symfony/config": "For using the all-in-one router or any loader",
-            "symfony/expression-language": "For using expression matching",
-            "symfony/yaml": "For using the YAML loader"
-        },
-        "time": "2015-10-27 15:38:06",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Routing\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Routing Component",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "router",
-            "routing",
-            "uri",
-            "url"
-        ]
-    },
-    {
-        "name": "symfony/serializer",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/serializer.git",
-            "reference": "14056684acad23b8815eb336bccc0b4ac76bd823"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/serializer/zipball/14056684acad23b8815eb336bccc0b4ac76bd823",
-            "reference": "14056684acad23b8815eb336bccc0b4ac76bd823",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/cache": "~1.0",
-            "symfony/config": "~2.2",
-            "symfony/property-access": "~2.3",
-            "symfony/yaml": "~2.0,>=2.0.5"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-            "symfony/config": "For using the XML mapping loader.",
-            "symfony/property-access": "For using the ObjectNormalizer.",
-            "symfony/yaml": "For using the default YAML mapping loader."
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Serializer\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Serializer Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/translation",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/translation.git",
-            "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
-            "reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "conflict": {
-            "symfony/config": "<2.7"
-        },
-        "require-dev": {
-            "psr/log": "~1.0",
-            "symfony/config": "~2.7",
-            "symfony/intl": "~2.4",
-            "symfony/yaml": "~2.2"
-        },
-        "suggest": {
-            "psr/log": "To use logging capability in translator",
-            "symfony/config": "",
-            "symfony/yaml": ""
-        },
-        "time": "2015-10-27 15:38:06",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Translation\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Translation Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/validator",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/validator.git",
-            "reference": "df9021e689aa3d08367881e7f8917219fabe5e64"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/validator/zipball/df9021e689aa3d08367881e7f8917219fabe5e64",
-            "reference": "df9021e689aa3d08367881e7f8917219fabe5e64",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/translation": "~2.4"
-        },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/cache": "~1.0",
-            "doctrine/common": "~2.3",
-            "egulias/email-validator": "~1.2,>=1.2.1",
-            "symfony/config": "~2.2",
-            "symfony/expression-language": "~2.4",
-            "symfony/http-foundation": "~2.1",
-            "symfony/intl": "~2.4",
-            "symfony/property-access": "~2.3",
-            "symfony/yaml": "~2.0,>=2.0.5"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-            "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-            "egulias/email-validator": "Strict (RFC compliant) email validation",
-            "symfony/config": "",
-            "symfony/expression-language": "For using the 2.4 Expression validator",
-            "symfony/http-foundation": "",
-            "symfony/intl": "",
-            "symfony/property-access": "For using the 2.4 Validator API",
-            "symfony/yaml": ""
-        },
-        "time": "2015-10-18 20:23:18",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Validator\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Validator Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/process",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/process.git",
-            "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
-            "reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2015-10-23 14:47:27",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Process\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Process Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/yaml",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/yaml.git",
-            "reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
-            "reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\Yaml\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony Yaml Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/css-selector",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/css-selector.git",
-            "reference": "e1b865b26be4a56d22a8dee398375044a80c865b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b",
-            "reference": "e1b865b26be4a56d22a8dee398375044a80c865b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\CssSelector\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jean-François Simon",
-                "email": "jeanfrancois.simon@sensiolabs.com"
-            },
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony CssSelector Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/dom-crawler",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/dom-crawler.git",
-            "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612",
-            "reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9"
-        },
-        "require-dev": {
-            "symfony/css-selector": "~2.3"
-        },
-        "suggest": {
-            "symfony/css-selector": ""
-        },
-        "time": "2015-10-11 09:39:48",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\DomCrawler\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony DomCrawler Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "symfony/browser-kit",
-        "version": "v2.7.6",
-        "version_normalized": "2.7.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/browser-kit.git",
-            "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/browser-kit/zipball/07d664a052572ccc28eb2ab7dbbe82155b1ad367",
-            "reference": "07d664a052572ccc28eb2ab7dbbe82155b1ad367",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.9",
-            "symfony/dom-crawler": "~2.0,>=2.0.5"
-        },
-        "require-dev": {
-            "symfony/css-selector": "~2.0,>=2.0.5",
-            "symfony/process": "~2.3.34|~2.7,>=2.7.6"
-        },
-        "suggest": {
-            "symfony/process": ""
-        },
-        "time": "2015-10-23 14:47:27",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\BrowserKit\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony BrowserKit Component",
-        "homepage": "https://symfony.com"
-    },
-    {
-        "name": "twig/twig",
-        "version": "v1.23.1",
-        "version_normalized": "1.23.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/twigphp/Twig.git",
-            "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
-            "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.7"
-        },
-        "require-dev": {
-            "symfony/debug": "~2.7",
-            "symfony/phpunit-bridge": "~2.7"
-        },
-        "time": "2015-11-05 12:49:06",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.23-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Twig_": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": "http://fabien.potencier.org",
-                "role": "Lead Developer"
-            },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com",
-                "role": "Project Founder"
-            },
-            {
-                "name": "Twig Team",
-                "homepage": "http://twig.sensiolabs.org/contributors",
-                "role": "Contributors"
-            }
-        ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ]
-    },
-    {
-        "name": "jcalderonzumba/mink-phantomjs-driver",
-        "version": "v0.3.1",
-        "version_normalized": "0.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git",
-            "reference": "782892dbea4af7d04024374672b3790b6c008def"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/782892dbea4af7d04024374672b3790b6c008def",
-            "reference": "782892dbea4af7d04024374672b3790b6c008def",
-            "shasum": ""
-        },
-        "require": {
-            "behat/mink": "~1.6",
-            "jcalderonzumba/gastonjs": "~1.0",
-            "php": ">=5.4",
-            "twig/twig": "~1.20|~2.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.6",
-            "silex/silex": "~1.2",
-            "symfony/css-selector": "~2.1",
-            "symfony/phpunit-bridge": "~2.7",
-            "symfony/process": "~2.3"
-        },
-        "time": "2015-12-04 13:55:02",
-        "type": "mink-driver",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.4.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zumba\\Mink\\Driver\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Juan Francisco Calderón Zumba",
-                "email": "juanfcz@gmail.com",
-                "homepage": "http://github.com/jcalderonzumba"
-            }
-        ],
-        "description": "PhantomJS driver for Mink framework",
-        "homepage": "http://mink.behat.org/",
-        "keywords": [
-            "ajax",
-            "browser",
-            "headless",
-            "javascript",
-            "phantomjs",
-            "testing"
-        ]
-    },
-    {
-        "name": "jcalderonzumba/gastonjs",
-        "version": "v1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/jcalderonzumba/gastonjs.git",
-            "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/21bebb8ca03eb0f93ec2f3fad61192fb079e2622",
-            "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "~5.0|~6.0",
-            "php": ">=5.4"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.6",
-            "silex/silex": "~1.2",
-            "symfony/phpunit-bridge": "~2.7",
-            "symfony/process": "~2.1"
-        },
-        "time": "2016-01-18 09:21:03",
-        "type": "phantomjs-api",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Zumba\\GastonJS\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Juan Francisco Calderón Zumba",
-                "email": "juanfcz@gmail.com",
-                "homepage": "http://github.com/jcalderonzumba"
-            }
-        ],
-        "description": "PhantomJS API based server for webpage automation",
-        "homepage": "https://github.com/jcalderonzumba/gastonjs",
-        "keywords": [
-            "api",
-            "automation",
-            "browser",
-            "headless",
-            "phantomjs"
-        ]
-    },
-    {
-        "name": "wikimedia/composer-merge-plugin",
-        "version": "v1.3.1",
-        "version_normalized": "1.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-            "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
-            "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
-            "shasum": ""
-        },
-        "require": {
-            "composer-plugin-api": "^1.0",
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "composer/composer": "1.0.*@dev",
-            "jakub-onderka/php-parallel-lint": "~0.8",
-            "phpunit/phpunit": "~4.8|~5.0",
-            "squizlabs/php_codesniffer": "~2.1.0"
-        },
-        "time": "2016-03-08 17:11:37",
-        "type": "composer-plugin",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            },
-            "class": "Wikimedia\\Composer\\MergePlugin"
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Wikimedia\\Composer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Bryan Davis",
-                "email": "bd808@wikimedia.org"
-            }
-        ],
-        "description": "Composer plugin to merge multiple composer.json files"
-    }
-]
diff --git a/vendor/composer/installers/.editorconfig b/vendor/composer/installers/.editorconfig
deleted file mode 100644
index 153cf3e..0000000
--- a/vendor/composer/installers/.editorconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-end_of_line = LF
-
-[*.php]
-indent_style = space
-indent_size = 4
diff --git a/vendor/composer/installers/.gitignore b/vendor/composer/installers/.gitignore
deleted file mode 100644
index ff7f293..0000000
--- a/vendor/composer/installers/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-.idea/
diff --git a/vendor/composer/installers/.travis.yml b/vendor/composer/installers/.travis.yml
deleted file mode 100644
index 81ca8e1..0000000
--- a/vendor/composer/installers/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - curl -s http://getcomposer.org/installer | php -- --quiet
-  - php composer.phar install --dev
-
-script: phpunit
diff --git a/vendor/composer/installers/LICENSE b/vendor/composer/installers/LICENSE
deleted file mode 100644
index 85f97fc..0000000
--- a/vendor/composer/installers/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Kyle Robinson Young
-
-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.
\ No newline at end of file
diff --git a/vendor/composer/installers/README.md b/vendor/composer/installers/README.md
deleted file mode 100644
index b331771..0000000
--- a/vendor/composer/installers/README.md
+++ /dev/null
@@ -1,191 +0,0 @@
-# A Multi-Framework [Composer](http://getcomposer.org) Library Installer
-
-[![Build Status](http://img.shields.io/travis/composer/installers.svg)](http://travis-ci.org/composer/installers)
-
-This is for PHP package authors to require in their `composer.json`. It will
-install their package to the correct location based on the specified package
-type.
-
-The goal of `installers` is to be a simple package type to install path map.
-Users can also customize the install path per package and package authors can
-modify the package name upon installing.
-
-`installers` isn't intended on replacing all custom installers. If your
-package requires special installation handling then by all means, create a
-custom installer to handle it.
-
-**Natively Supported Frameworks**:
-
-The following frameworks natively work with Composer and will be
-installed to the default `vendor` directory. `composer/installers`
-is not needed to install packages with these frameworks:
-
-* Aura
-* Symfony2
-* Yii
-* Yii2
-
-**Current Supported Package Types**:
-
-> Stable types are marked as **bold**, this means that installation paths
-> for those type will not be changed. Any adjustment for those types would
-> require creation of brand new type that will cover required changes.
-
-| Framework    | Types
-| ---------    | -----
-| Aimeos       | `aimeos-extension`
-| Asgard       | `asgard-module`<br>`asgard-theme`
-| AGL          | `agl-module`
-| AnnotateCms  | `annotatecms-module`<br>`annotatecms-component`<br>`annotatecms-service`
-| Bitrix       | `bitrix-module`<br>`bitrix-component`<br>`bitrix-theme`
-| CakePHP 2+   | **`cakephp-plugin`**
-| Chef         | `chef-cookbook`<br>`chef-role`
-| CCFramework  | `ccframework-ship`<br>`ccframework-theme`
-| CodeIgniter  | `codeigniter-library`<br>`codeigniter-third-party`<br>`codeigniter-module`
-| concrete5    | `concrete5-block`<br>`concrete5-package`<br>`concrete5-theme`<br>`concrete5-update`
-| Craft        | `craft-plugin`
-| Croogo       | `croogo-plugin`<br>`croogo-theme`
-| DokuWiki     | `dokuwiki-plugin`<br>`dokuwiki-template`
-| Dolibarr     | `dolibarr-module`
-| Drupal       | <b>`drupal-module`<br>`drupal-theme`</b><br>`drupal-library`<br>`drupal-profile`<br>`drupal-drush`
-| Elgg         | `elgg-plugin`
-| FuelPHP v1.x | `fuel-module`<br>`fuel-package`<br/>`fuel-theme`
-| FuelPHP v2.x | `fuelphp-component`
-| Grav         | `grav-plugin`<br>`grav-theme`
-| Hurad        | `hurad-plugin`<br>`hurad-theme`
-| Joomla       | `joomla-component`<br>`joomla-module`<br>`joomla-template`<br>`joomla-plugin`<br>`joomla-library`
-| Kirby        | **`kirby-plugin`**
-| Kohana       | **`kohana-module`**
-| Laravel      | `laravel-library`
-| Lithium      | **`lithium-library`<br>`lithium-source`**
-| Magento      | `magento-library`<br>`magento-skin`<br>`magento-theme`
-| Mako         | `mako-package`
-| MODX Evo     | `modxevo-snippet`<br>`modxevo-plugin`<br>`modxevo-module`<br>`modxevo-template`<br>`modxevo-lib`
-| MediaWiki    | `mediawiki-extension`
-| October      | **`october-module`<br>`october-plugin`<br>`october-theme`**
-| OXID         | `oxid-module`<br>`oxid-theme`<br>`oxid-out`
-| MODULEWork   | `modulework-module`
-| Moodle       | `moodle-*` (Please [check source](https://raw.githubusercontent.com/composer/installers/master/src/Composer/Installers/MoodleInstaller.php) for all supported types)
-| Piwik        | `piwik-plugin`
-| phpBB        | `phpbb-extension`<br>`phpbb-style`<br>`phpbb-language`
-| Pimcore      | `pimcore-plugin`
-| PPI          | **`ppi-module`**
-| Puppet       | `puppet-module`
-| REDAXO       | `redaxo-addon`
-| Roundcube    | `roundcube-plugin`
-| shopware     | `shopware-backend-plugin`<br/>`shopware-core-plugin`<br/>`shopware-frontend-plugin`<br/>`shopware-theme`
-| SilverStripe | `silverstripe-module`<br>`silverstripe-theme`
-| SMF          | `smf-module`<br>`smf-theme`
-| symfony1     | **`symfony1-plugin`**
-| Tusk         | `tusk-task`<br>`tusk-command`<br>`tusk-asset`
-| TYPO3 Flow   | `typo3-flow-package`<br>`typo3-flow-framework`<br>`typo3-flow-plugin`<br>`typo3-flow-site`<br>`typo3-flow-boilerplate`<br>`typo3-flow-build`
-| TYPO3 CMS    | `typo3-cms-extension`
-| Wolf CMS     | `wolfcms-plugin`
-| WordPress    | <b>`wordpress-plugin`<br>`wordpress-theme`</b><br>`wordpress-muplugin`
-| Zend         | `zend-library`<br>`zend-extra`<br>`zend-module`
-| Zikula       | `zikula-module`<br>`zikula-theme`
-| Prestashop   | `prestashop-module`<br>`prestashop-theme`
-
-## Example `composer.json` File
-
-This is an example for a CakePHP plugin. The only important parts to set in your
-composer.json file are `"type": "cakephp-plugin"` which describes what your
-package is and `"require": { "composer/installers": "~1.0" }` which tells composer
-to load the custom installers.
-
-```json
-{
-    "name": "you/ftp",
-    "type": "cakephp-plugin",
-    "require": {
-        "composer/installers": "~1.0"
-    }
-}
-```
-
-This would install your package to the `Plugin/Ftp/` folder of a CakePHP app
-when a user runs `php composer.phar install`.
-
-So submit your packages to [packagist.org](http://packagist.org)!
-
-## Custom Install Paths
-
-If you are consuming a package that uses the `composer/installers` you can
-override the install path with the following extra in your `composer.json`:
-
-```json
-{
-    "extra": {
-        "installer-paths": {
-            "your/custom/path/{$name}/": ["shama/ftp", "vendor/package"]
-        }
-    }
-}
-```
-
-A package type can have a custom installation path with a `type:` prefix.
-
-``` json
-{
-    "extra": {
-        "installer-paths": {
-            "your/custom/path/{$name}/": ["type:wordpress-plugin"]
-        }
-    }
-}
-```
-
-This would use your custom path for each of the listed packages. The available
-variables to use in your paths are: `{$name}`, `{$vendor}`, `{$type}`.
-
-## Custom Install Names
-
-If you're a package author and need your package to be named differently when
-installed consider using the `installer-name` extra.
-
-For example you have a package named `shama/cakephp-ftp` with the type
-`cakephp-plugin`. Installing with `composer/installers` would install to the
-path `Plugin/CakephpFtp`. Due to the strict naming conventions, you as a
-package author actually need the package to be named and installed to
-`Plugin/Ftp`. Using the following config within your **package** `composer.json`
-will allow this:
-
-```json
-{
-    "name": "shama/cakephp-ftp",
-    "type": "cakephp-plugin",
-    "extra": {
-        "installer-name": "Ftp"
-    }
-}
-```
-
-Please note the name entered into `installer-name` will be the final and will
-not be inflected.
-
-## Contribute!
-
-* [Fork and clone](https://help.github.com/articles/fork-a-repo).
-* Run the command `php composer.phar install --dev` to install the dev
-  dependencies. See [Composer](https://github.com/composer/composer#installation--usage).
-* Use the command `phpunit` to run the tests. See [PHPUnit](http://phpunit.de).
-* Create a branch, commit, push and send us a
-  [pull request](https://help.github.com/articles/using-pull-requests).
-
-To ensure a consistent code base, you should make sure the code follows the
-[Coding Standards](http://symfony.com/doc/2.0/contributing/code/standards.html)
-which we borrowed from Symfony.
-
-If you would like to help, please take a look at the list of
-[issues](https://github.com/composer/installers/issues).
-
-### Should we allow dynamic package types or paths? No.
-What are they? The ability for a package author to determine where a package
-will be installed either through setting the path directly in their
-`composer.json` or through a dynamic package type: `"type":
-"framework-install-here"`.
-
-It has been proposed many times. Even implemented once early on and then
-removed. `installers` won't do this because it would allow a single package
-author to wipe out entire folders without the user's consent. That user would
-then come here to yell at us.
diff --git a/vendor/composer/installers/composer.json b/vendor/composer/installers/composer.json
deleted file mode 100644
index 6ee931e..0000000
--- a/vendor/composer/installers/composer.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "name": "composer/installers",
-    "type": "composer-installer",
-    "license": "MIT",
-    "description": "A multi-framework Composer library installer",
-    "keywords": [
-        "installer",
-        "Aimeos",
-        "AGL",
-        "AnnotateCms",
-        "Bitrix",
-        "CakePHP",
-        "Chef",
-        "CodeIgniter",
-        "concrete5",
-        "Craft",
-        "Croogo",
-        "DokuWiki",
-        "Dolibarr",
-        "Drupal",
-        "Elgg",
-        "FuelPHP",
-        "Grav",
-        "Hurad",
-        "Joomla",
-        "Kohana",
-        "Laravel",
-        "Lithium",
-        "Magento",
-        "Mako",
-        "MODX Evo",
-        "MediaWiki",
-        "OXID",
-        "MODULEWork",
-        "Moodle",
-        "Piwik",
-        "phpBB",
-        "PPI",
-        "Puppet",
-        "Roundcube",
-        "shopware",
-        "SilverStripe",
-        "SMF",
-        "symfony",
-        "Thelia",
-        "TYPO3",
-        "WolfCMS",
-        "WordPress",
-        "Zend",
-        "Zikula"
-    ],
-    "homepage": "http://composer.github.com/installers/",
-    "authors": [
-        {
-            "name": "Kyle Robinson Young",
-            "email": "kyle@dontkry.com",
-            "homepage": "https://github.com/shama"
-        }
-    ],
-    "autoload": {
-        "psr-0": { "Composer\\Installers\\": "src/" }
-    },
-    "extra": {
-        "class": "Composer\\Installers\\Installer",
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    },
-    "replace": {
-        "shama/baton": "*",
-        "roundcube/plugin-installer": "*"
-    },
-    "require-dev": {
-        "composer/composer": "1.0.*@dev",
-        "phpunit/phpunit": "4.1.*"
-    }
-}
diff --git a/vendor/composer/installers/phpunit.xml.dist b/vendor/composer/installers/phpunit.xml.dist
deleted file mode 100644
index cc5cc99..0000000
--- a/vendor/composer/installers/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +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"
->
-    <testsuites>
-        <testsuite name="Installers Test Suite">
-            <directory>tests/Composer/Installers</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>src/Composer/Installers</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
diff --git a/vendor/composer/installers/src/Composer/Installers/AglInstaller.php b/vendor/composer/installers/src/Composer/Installers/AglInstaller.php
deleted file mode 100644
index 01b8a41..0000000
--- a/vendor/composer/installers/src/Composer/Installers/AglInstaller.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class AglInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'More/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = preg_replace_callback('/(?:^|_|-)(.?)/', function ($matches) {
-            return strtoupper($matches[1]);
-        }, $vars['name']);
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/AimeosInstaller.php b/vendor/composer/installers/src/Composer/Installers/AimeosInstaller.php
deleted file mode 100644
index 79a0e95..0000000
--- a/vendor/composer/installers/src/Composer/Installers/AimeosInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class AimeosInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'extension'   => 'ext/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php b/vendor/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php
deleted file mode 100644
index 89d7ad9..0000000
--- a/vendor/composer/installers/src/Composer/Installers/AnnotateCmsInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class AnnotateCmsInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'    => 'addons/modules/{$name}/',
-        'component' => 'addons/components/{$name}/',
-        'service'   => 'addons/services/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/AsgardInstaller.php b/vendor/composer/installers/src/Composer/Installers/AsgardInstaller.php
deleted file mode 100644
index 995ee2b..0000000
--- a/vendor/composer/installers/src/Composer/Installers/AsgardInstaller.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class AsgardInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'Modules/{$name}/',
-        'theme' => 'Themes/{$name}/'
-    );
-
-    /**
-     * Format package name.
-     *
-     * For package type asgard-module, cut off a trailing '-plugin' if present.
-     *
-     * For package type asgard-theme, cut off a trailing '-theme' if present.
-     *
-     */
-    public function inflectPackageVars($vars)
-    {
-        if ($vars['type'] === 'asgard-module') {
-            return $this->inflectPluginVars($vars);
-        }
-
-        if ($vars['type'] === 'asgard-theme') {
-            return $this->inflectThemeVars($vars);
-        }
-
-        return $vars;
-    }
-
-    protected function inflectPluginVars($vars)
-    {
-        $vars['name'] = ucfirst(preg_replace('/-module/', '', $vars['name']));
-
-        return $vars;
-    }
-
-    protected function inflectThemeVars($vars)
-    {
-        $vars['name'] = ucfirst(preg_replace('/-theme$/', '', $vars['name']));
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php b/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php
deleted file mode 100644
index cc27d3e..0000000
--- a/vendor/composer/installers/src/Composer/Installers/BaseInstaller.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-use Composer\Composer;
-use Composer\Package\PackageInterface;
-
-abstract class BaseInstaller
-{
-    protected $locations = array();
-    protected $composer;
-    protected $package;
-
-    /**
-     * Initializes base installer.
-     *
-     * @param PackageInterface $package
-     * @param Composer         $composer
-     */
-    public function __construct(PackageInterface $package = null, Composer $composer = null)
-    {
-        $this->composer = $composer;
-        $this->package = $package;
-    }
-
-    /**
-     * Return the install path based on package type.
-     *
-     * @param  PackageInterface $package
-     * @param  string           $frameworkType
-     * @return string
-     */
-    public function getInstallPath(PackageInterface $package, $frameworkType = '')
-    {
-        $type = $this->package->getType();
-
-        $prettyName = $this->package->getPrettyName();
-        if (strpos($prettyName, '/') !== false) {
-            list($vendor, $name) = explode('/', $prettyName);
-        } else {
-            $vendor = '';
-            $name = $prettyName;
-        }
-
-        $availableVars = $this->inflectPackageVars(compact('name', 'vendor', 'type'));
-
-        $extra = $package->getExtra();
-        if (!empty($extra['installer-name'])) {
-            $availableVars['name'] = $extra['installer-name'];
-        }
-
-        if ($this->composer->getPackage()) {
-            $extra = $this->composer->getPackage()->getExtra();
-            if (!empty($extra['installer-paths'])) {
-                $customPath = $this->mapCustomInstallPaths($extra['installer-paths'], $prettyName, $type);
-                if ($customPath !== false) {
-                    return $this->templatePath($customPath, $availableVars);
-                }
-            }
-        }
-
-        $packageType = substr($type, strlen($frameworkType) + 1);
-        $locations = $this->getLocations();
-        if (!isset($locations[$packageType])) {
-            throw new \InvalidArgumentException(sprintf('Package type "%s" is not supported', $type));
-        }
-
-        return $this->templatePath($locations[$packageType], $availableVars);
-    }
-
-    /**
-     * For an installer to override to modify the vars per installer.
-     *
-     * @param  array $vars
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        return $vars;
-    }
-
-    /**
-     * Gets the installer's locations
-     *
-     * @return array
-     */
-    public function getLocations()
-    {
-        return $this->locations;
-    }
-
-    /**
-     * Replace vars in a path
-     *
-     * @param  string $path
-     * @param  array  $vars
-     * @return string
-     */
-    protected function templatePath($path, array $vars = array())
-    {
-        if (strpos($path, '{') !== false) {
-            extract($vars);
-            preg_match_all('@\{\$([A-Za-z0-9_]*)\}@i', $path, $matches);
-            if (!empty($matches[1])) {
-                foreach ($matches[1] as $var) {
-                    $path = str_replace('{$' . $var . '}', $$var, $path);
-                }
-            }
-        }
-
-        return $path;
-    }
-
-    /**
-     * Search through a passed paths array for a custom install path.
-     *
-     * @param  array  $paths
-     * @param  string $name
-     * @param  string $type
-     * @return string
-     */
-    protected function mapCustomInstallPaths(array $paths, $name, $type)
-    {
-        foreach ($paths as $path => $names) {
-            if (in_array($name, $names) || in_array('type:' . $type, $names)) {
-                return $path;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php b/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php
deleted file mode 100644
index 48a8367..0000000
--- a/vendor/composer/installers/src/Composer/Installers/BitrixInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class BitrixInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'    => 'local/modules/{$name}/',
-        'component' => 'local/components/{$name}/',
-        'theme'     => 'local/templates/{$name}/'
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php b/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php
deleted file mode 100644
index cbeb60b..0000000
--- a/vendor/composer/installers/src/Composer/Installers/CakePHPInstaller.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-use Composer\DependencyResolver\Pool;
-use Composer\Package\PackageInterface;
-use Composer\Package\LinkConstraint\MultiConstraint;
-use Composer\Package\LinkConstraint\VersionConstraint;
-
-class CakePHPInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'Plugin/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        if ($this->matchesCakeVersion('>=', '3.0.0')) {
-            return $vars;
-        }
-
-        $nameParts = explode('/', $vars['name']);
-        foreach ($nameParts as &$value) {
-            $value = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $value));
-            $value = str_replace(array('-', '_'), ' ', $value);
-            $value = str_replace(' ', '', ucwords($value));
-        }
-        $vars['name'] = implode('/', $nameParts);
-
-        return $vars;
-    }
-
-    /**
-     * Change the default plugin location when cakephp >= 3.0
-     */
-    public function getLocations()
-    {
-        if ($this->matchesCakeVersion('>=', '3.0.0')) {
-            $this->locations['plugin'] =  $this->composer->getConfig()->get('vendor-dir') . '/{$vendor}/{$name}/';
-        }
-        return $this->locations;
-    }
-
-    /**
-     * Check if CakePHP version matches against a version
-     *
-     * @param string $matcher
-     * @param string $version
-     * @return bool
-     */
-    protected function matchesCakeVersion($matcher, $version)
-    {
-        $repositoryManager = $this->composer->getRepositoryManager();
-        if ($repositoryManager) {
-            $repos = $repositoryManager->getLocalRepository();
-            if (!$repos) {
-                return false;
-            }
-            $cake3 = new MultiConstraint(array(
-                new VersionConstraint($matcher, $version),
-                new VersionConstraint('!=', '9999999-dev'),
-            ));
-            $pool = new Pool('dev');
-            $pool->addRepository($repos);
-            $packages = $pool->whatProvides('cakephp/cakephp');
-            foreach ($packages as $package) {
-                $installed = new VersionConstraint('=', $package->getVersion());
-                if ($cake3->matches($installed)) {
-                    return true;
-                    break;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/ChefInstaller.php b/vendor/composer/installers/src/Composer/Installers/ChefInstaller.php
deleted file mode 100644
index ab2f9aa..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ChefInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class ChefInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'cookbook'  => 'Chef/{$vendor}/{$name}/',
-        'role'      => 'Chef/roles/{$name}/',
-    );
-}
-
diff --git a/vendor/composer/installers/src/Composer/Installers/ClanCatsFrameworkInstaller.php b/vendor/composer/installers/src/Composer/Installers/ClanCatsFrameworkInstaller.php
deleted file mode 100644
index c887815..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ClanCatsFrameworkInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class ClanCatsFrameworkInstaller extends BaseInstaller
-{
-	protected $locations = array(
-		'ship'      => 'CCF/orbit/{$name}/',
-		'theme'     => 'CCF/app/themes/{$name}/',
-	);
-}
\ No newline at end of file
diff --git a/vendor/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php b/vendor/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php
deleted file mode 100644
index 3b4a4ec..0000000
--- a/vendor/composer/installers/src/Composer/Installers/CodeIgniterInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class CodeIgniterInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'library'     => 'application/libraries/{$name}/',
-        'third-party' => 'application/third_party/{$name}/',
-        'module'      => 'application/modules/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/Concrete5Installer.php b/vendor/composer/installers/src/Composer/Installers/Concrete5Installer.php
deleted file mode 100644
index 4d398a4..0000000
--- a/vendor/composer/installers/src/Composer/Installers/Concrete5Installer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class Concrete5Installer extends BaseInstaller
-{
-    protected $locations = array(
-        'block'      => 'blocks/{$name}/',
-        'package'    => 'packages/{$name}/',
-        'theme'      => 'themes/{$name}/',
-        'update'     => 'updates/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php b/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php
deleted file mode 100644
index dc3be8d..0000000
--- a/vendor/composer/installers/src/Composer/Installers/CraftInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class CraftInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'craft/plugins/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/CroogoInstaller.php b/vendor/composer/installers/src/Composer/Installers/CroogoInstaller.php
deleted file mode 100644
index d94219d..0000000
--- a/vendor/composer/installers/src/Composer/Installers/CroogoInstaller.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class CroogoInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'Plugin/{$name}/',
-        'theme' => 'View/Themed/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = strtolower(str_replace(array('-', '_'), ' ', $vars['name']));
-        $vars['name'] = str_replace(' ', '', ucwords($vars['name']));
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/DokuWikiInstaller.php b/vendor/composer/installers/src/Composer/Installers/DokuWikiInstaller.php
deleted file mode 100644
index cfd638d..0000000
--- a/vendor/composer/installers/src/Composer/Installers/DokuWikiInstaller.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class DokuWikiInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'lib/plugins/{$name}/',
-        'template' => 'lib/tpl/{$name}/',
-    );
-
-    /**
-     * Format package name.
-     *
-     * For package type dokuwiki-plugin, cut off a trailing '-plugin', 
-     * or leading dokuwiki_ if present.
-     * 
-     * For package type dokuwiki-template, cut off a trailing '-template' if present.
-     *
-     */
-    public function inflectPackageVars($vars)
-    {
-
-        if ($vars['type'] === 'dokuwiki-plugin') {
-            return $this->inflectPluginVars($vars);
-        }
-
-        if ($vars['type'] === 'dokuwiki-template') {
-            return $this->inflectTemplateVars($vars);
-        }
-
-        return $vars;
-    }
-
-    protected function inflectPluginVars($vars)
-    {
-        $vars['name'] = preg_replace('/-plugin$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/^dokuwiki_?-?/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectTemplateVars($vars)
-    {
-        $vars['name'] = preg_replace('/-template$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/^dokuwiki_?-?/', '', $vars['name']);
-
-        return $vars;
-    }
-
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/DolibarrInstaller.php b/vendor/composer/installers/src/Composer/Installers/DolibarrInstaller.php
deleted file mode 100644
index 21f7e8e..0000000
--- a/vendor/composer/installers/src/Composer/Installers/DolibarrInstaller.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * Class DolibarrInstaller
- *
- * @package Composer\Installers
- * @author  Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
- */
-class DolibarrInstaller extends BaseInstaller
-{
-    //TODO: Add support for scripts and themes
-    protected $locations = array(
-        'module' => 'htdocs/custom/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php b/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php
deleted file mode 100644
index 1794131..0000000
--- a/vendor/composer/installers/src/Composer/Installers/DrupalInstaller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class DrupalInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'core'      => 'core/',
-        'module'    => 'modules/{$name}/',
-        'theme'     => 'themes/{$name}/',
-        'library'   => 'libraries/{$name}/',
-        'profile'   => 'profiles/{$name}/',
-        'drush'     => 'drush/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/ElggInstaller.php b/vendor/composer/installers/src/Composer/Installers/ElggInstaller.php
deleted file mode 100644
index c0bb609..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ElggInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class ElggInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'mod/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/FuelInstaller.php b/vendor/composer/installers/src/Composer/Installers/FuelInstaller.php
deleted file mode 100644
index 6eba2e3..0000000
--- a/vendor/composer/installers/src/Composer/Installers/FuelInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class FuelInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'  => 'fuel/app/modules/{$name}/',
-        'package' => 'fuel/packages/{$name}/',
-        'theme'   => 'fuel/app/themes/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/FuelphpInstaller.php b/vendor/composer/installers/src/Composer/Installers/FuelphpInstaller.php
deleted file mode 100644
index 29d980b..0000000
--- a/vendor/composer/installers/src/Composer/Installers/FuelphpInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class FuelphpInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'component'  => 'components/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/GravInstaller.php b/vendor/composer/installers/src/Composer/Installers/GravInstaller.php
deleted file mode 100644
index dbe63e0..0000000
--- a/vendor/composer/installers/src/Composer/Installers/GravInstaller.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class GravInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'user/plugins/{$name}/',
-        'theme'  => 'user/themes/{$name}/',
-    );
-
-    /**
-     * Format package name
-     *
-     * @param array $vars
-     *
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        $restrictedWords = implode('|', array_keys($this->locations));
-
-        $vars['name'] = strtolower($vars['name']);
-        $vars['name'] = preg_replace('/^(?:grav-)?(?:(?:'.$restrictedWords.')-)?(.*?)(?:-(?:'.$restrictedWords.'))?$/ui',
-            '$1',
-            $vars['name']
-        );
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/HuradInstaller.php b/vendor/composer/installers/src/Composer/Installers/HuradInstaller.php
deleted file mode 100644
index 8fe017f..0000000
--- a/vendor/composer/installers/src/Composer/Installers/HuradInstaller.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class HuradInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'plugins/{$name}/',
-        'theme' => 'plugins/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        $nameParts = explode('/', $vars['name']);
-        foreach ($nameParts as &$value) {
-            $value = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $value));
-            $value = str_replace(array('-', '_'), ' ', $value);
-            $value = str_replace(' ', '', ucwords($value));
-        }
-        $vars['name'] = implode('/', $nameParts);
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/Installer.php b/vendor/composer/installers/src/Composer/Installers/Installer.php
deleted file mode 100644
index 63ba64c..0000000
--- a/vendor/composer/installers/src/Composer/Installers/Installer.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-use Composer\Installer\LibraryInstaller;
-use Composer\Package\PackageInterface;
-use Composer\Repository\InstalledRepositoryInterface;
-
-class Installer extends LibraryInstaller
-{
-    /**
-     * Package types to installer class map
-     *
-     * @var array
-     */
-    private $supportedTypes = array(
-        'aimeos'       => 'AimeosInstaller',
-        'asgard'       => 'AsgardInstaller',
-        'agl'          => 'AglInstaller',
-        'annotatecms'  => 'AnnotateCmsInstaller',
-        'bitrix'       => 'BitrixInstaller',
-        'cakephp'      => 'CakePHPInstaller',
-        'chef'         => 'ChefInstaller',
-        'ccframework'  => 'ClanCatsFrameworkInstaller',
-        'codeigniter'  => 'CodeIgniterInstaller',
-        'concrete5'    => 'Concrete5Installer',
-        'craft'        => 'CraftInstaller',
-        'croogo'       => 'CroogoInstaller',
-        'dokuwiki'     => 'DokuWikiInstaller',
-        'dolibarr'     => 'DolibarrInstaller',
-        'drupal'       => 'DrupalInstaller',
-        'elgg'         => 'ElggInstaller',
-        'fuel'         => 'FuelInstaller',
-        'fuelphp'      => 'FuelphpInstaller',
-        'grav'         => 'GravInstaller',
-        'hurad'        => 'HuradInstaller',
-        'joomla'       => 'JoomlaInstaller',
-        'kirby'        => 'KirbyInstaller',
-        'kohana'       => 'KohanaInstaller',
-        'laravel'      => 'LaravelInstaller',
-        'lithium'      => 'LithiumInstaller',
-        'magento'      => 'MagentoInstaller',
-        'mako'         => 'MakoInstaller',
-        'mediawiki'    => 'MediaWikiInstaller',
-        'microweber'    => 'MicroweberInstaller',
-        'modulework'   => 'MODULEWorkInstaller',
-        'modxevo'      => 'MODXEvoInstaller',
-        'moodle'       => 'MoodleInstaller',
-        'october'      => 'OctoberInstaller',
-        'oxid'         => 'OxidInstaller',
-        'phpbb'        => 'PhpBBInstaller',
-        'pimcore'      => 'PimcoreInstaller',
-        'piwik'        => 'PiwikInstaller',
-        'ppi'          => 'PPIInstaller',
-        'puppet'       => 'PuppetInstaller',
-        'redaxo'       => 'RedaxoInstaller',
-        'roundcube'    => 'RoundcubeInstaller',
-        'shopware'     => 'ShopwareInstaller',
-        'silverstripe' => 'SilverStripeInstaller',
-        'smf'          => 'SMFInstaller',
-        'symfony1'     => 'Symfony1Installer',
-        'thelia'       => 'TheliaInstaller',
-        'tusk'         => 'TuskInstaller',
-        'typo3-cms'    => 'TYPO3CmsInstaller',
-        'typo3-flow'   => 'TYPO3FlowInstaller',
-        'whmcs'        => 'WHMCSInstaller',
-        'wolfcms'      => 'WolfCMSInstaller',
-        'wordpress'    => 'WordPressInstaller',
-        'zend'         => 'ZendInstaller',
-        'zikula'       => 'ZikulaInstaller',
-        'prestashop'   => 'PrestashopInstaller',
-    );
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getInstallPath(PackageInterface $package)
-    {
-        $type = $package->getType();
-        $frameworkType = $this->findFrameworkType($type);
-
-        if ($frameworkType === false) {
-            throw new \InvalidArgumentException(
-                'Sorry the package type of this package is not yet supported.'
-            );
-        }
-
-        $class = 'Composer\\Installers\\' . $this->supportedTypes[$frameworkType];
-        $installer = new $class($package, $this->composer);
-
-        return $installer->getInstallPath($package, $frameworkType);
-    }
-
-    public function uninstall(InstalledRepositoryInterface $repo, PackageInterface $package)
-    {
-        if (!$repo->hasPackage($package)) {
-            throw new \InvalidArgumentException('Package is not installed: '.$package);
-        }
-
-        $repo->removePackage($package);
-
-        $installPath = $this->getInstallPath($package);
-        $this->io->write(sprintf('Deleting %s - %s', $installPath, $this->filesystem->removeDirectory($installPath) ? '<comment>deleted</comment>' : '<error>not deleted</error>'));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function supports($packageType)
-    {
-        $frameworkType = $this->findFrameworkType($packageType);
-
-        if ($frameworkType === false) {
-            return false;
-        }
-
-        $locationPattern = $this->getLocationPattern($frameworkType);
-
-        return preg_match('#' . $frameworkType . '-' . $locationPattern . '#', $packageType, $matches) === 1;
-    }
-
-    /**
-     * Finds a supported framework type if it exists and returns it
-     *
-     * @param  string $type
-     * @return string
-     */
-    protected function findFrameworkType($type)
-    {
-        $frameworkType = false;
-
-        krsort($this->supportedTypes);
-
-        foreach ($this->supportedTypes as $key => $val) {
-            if ($key === substr($type, 0, strlen($key))) {
-                $frameworkType = substr($type, 0, strlen($key));
-                break;
-            }
-        }
-
-        return $frameworkType;
-    }
-
-    /**
-     * Get the second part of the regular expression to check for support of a
-     * package type
-     *
-     * @param  string $frameworkType
-     * @return string
-     */
-    protected function getLocationPattern($frameworkType)
-    {
-        $pattern = false;
-        if (!empty($this->supportedTypes[$frameworkType])) {
-            $frameworkClass = 'Composer\\Installers\\' . $this->supportedTypes[$frameworkType];
-            /** @var BaseInstaller $framework */
-            $framework = new $frameworkClass(null, $this->composer);
-            $locations = array_keys($framework->getLocations());
-            $pattern = $locations ? '(' . implode('|', $locations) . ')' : false;
-        }
-
-        return $pattern ? : '(\w+)';
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/JoomlaInstaller.php b/vendor/composer/installers/src/Composer/Installers/JoomlaInstaller.php
deleted file mode 100644
index 9ee7759..0000000
--- a/vendor/composer/installers/src/Composer/Installers/JoomlaInstaller.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class JoomlaInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'component'    => 'components/{$name}/',
-        'module'       => 'modules/{$name}/',
-        'template'     => 'templates/{$name}/',
-        'plugin'       => 'plugins/{$name}/',
-        'library'      => 'libraries/{$name}/',
-    );
-
-    // TODO: Add inflector for mod_ and com_ names
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/KirbyInstaller.php b/vendor/composer/installers/src/Composer/Installers/KirbyInstaller.php
deleted file mode 100644
index ae7ba8a..0000000
--- a/vendor/composer/installers/src/Composer/Installers/KirbyInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class KirbyInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin'    => 'site/plugins/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/KohanaInstaller.php b/vendor/composer/installers/src/Composer/Installers/KohanaInstaller.php
deleted file mode 100644
index dcd6d26..0000000
--- a/vendor/composer/installers/src/Composer/Installers/KohanaInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class KohanaInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'modules/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/LaravelInstaller.php b/vendor/composer/installers/src/Composer/Installers/LaravelInstaller.php
deleted file mode 100644
index be4d53a..0000000
--- a/vendor/composer/installers/src/Composer/Installers/LaravelInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class LaravelInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'library' => 'libraries/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/LithiumInstaller.php b/vendor/composer/installers/src/Composer/Installers/LithiumInstaller.php
deleted file mode 100644
index 47bbd4c..0000000
--- a/vendor/composer/installers/src/Composer/Installers/LithiumInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class LithiumInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'library' => 'libraries/{$name}/',
-        'source'  => 'libraries/_source/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MODULEWorkInstaller.php b/vendor/composer/installers/src/Composer/Installers/MODULEWorkInstaller.php
deleted file mode 100644
index 9c2e9fb..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MODULEWorkInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MODULEWorkInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'    => 'modules/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MODXEvoInstaller.php b/vendor/composer/installers/src/Composer/Installers/MODXEvoInstaller.php
deleted file mode 100644
index 5a66460..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MODXEvoInstaller.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * An installer to handle MODX Evolution specifics when installing packages.
- */
-class MODXEvoInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'snippet'       => 'assets/snippets/{$name}/',
-        'plugin'        => 'assets/plugins/{$name}/',
-        'module'        => 'assets/modules/{$name}/',
-        'template'      => 'assets/templates/{$name}/',
-        'lib'           => 'assets/lib/{$name}/'
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MagentoInstaller.php b/vendor/composer/installers/src/Composer/Installers/MagentoInstaller.php
deleted file mode 100644
index cf18e94..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MagentoInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MagentoInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'theme'   => 'app/design/frontend/{$name}/',
-        'skin'    => 'skin/frontend/default/{$name}/',
-        'library' => 'lib/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MakoInstaller.php b/vendor/composer/installers/src/Composer/Installers/MakoInstaller.php
deleted file mode 100644
index ca3cfac..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MakoInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MakoInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'package' => 'app/packages/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MediaWikiInstaller.php b/vendor/composer/installers/src/Composer/Installers/MediaWikiInstaller.php
deleted file mode 100644
index 01008c6..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MediaWikiInstaller.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MediaWikiInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'extension' => 'extensions/{$name}/',
-        'skin' => 'skins/{$name}/',
-    );
-
-    /**
-     * Format package name.
-     *
-     * For package type mediawiki-extension, cut off a trailing '-extension' if present and transform
-     * to CamelCase keeping existing uppercase chars.
-     *
-     * For package type mediawiki-skin, cut off a trailing '-skin' if present.
-     *
-     */
-    public function inflectPackageVars($vars)
-    {
-
-        if ($vars['type'] === 'mediawiki-extension') {
-            return $this->inflectExtensionVars($vars);
-        }
-
-        if ($vars['type'] === 'mediawiki-skin') {
-            return $this->inflectSkinVars($vars);
-        }
-
-        return $vars;
-    }
-
-    protected function inflectExtensionVars($vars)
-    {
-        $vars['name'] = preg_replace('/-extension$/', '', $vars['name']);
-        $vars['name'] = str_replace('-', ' ', $vars['name']);
-        $vars['name'] = str_replace(' ', '', ucwords($vars['name']));
-
-        return $vars;
-    }
-
-    protected function inflectSkinVars($vars)
-    {
-        $vars['name'] = preg_replace('/-skin$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MicroweberInstaller.php b/vendor/composer/installers/src/Composer/Installers/MicroweberInstaller.php
deleted file mode 100644
index 4bbbec8..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MicroweberInstaller.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MicroweberInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'      => 'userfiles/modules/{$name}/',
-        'module-skin' => 'userfiles/modules/{$name}/templates/',
-        'template'    => 'userfiles/templates/{$name}/',
-        'element'     => 'userfiles/elements/{$name}/',
-        'vendor'      => 'vendor/{$name}/',
-        'components'  => 'components/{$name}/'
-    );
-
-    /**
-     * Format package name.
-     *
-     * For package type microweber-module, cut off a trailing '-module' if present
-     *
-     * For package type microweber-template, cut off a trailing '-template' if present.
-     *
-     */
-    public function inflectPackageVars($vars)
-    {
-        if ($vars['type'] === 'microweber-template') {
-            return $this->inflectTemplateVars($vars);
-        }
-        if ($vars['type'] === 'microweber-templates') {
-            return $this->inflectTemplatesVars($vars);
-        }
-        if ($vars['type'] === 'microweber-core') {
-            return $this->inflectCoreVars($vars);
-        }
-        if ($vars['type'] === 'microweber-adapter') {
-            return $this->inflectCoreVars($vars);
-        }
-        if ($vars['type'] === 'microweber-module') {
-            return $this->inflectModuleVars($vars);
-        }
-        if ($vars['type'] === 'microweber-modules') {
-            return $this->inflectModulesVars($vars);
-        }
-        if ($vars['type'] === 'microweber-skin') {
-            return $this->inflectSkinVars($vars);
-        }
-        if ($vars['type'] === 'microweber-element' or $vars['type'] === 'microweber-elements') {
-            return $this->inflectElementVars($vars);
-        }
-
-        return $vars;
-    }
-
-    protected function inflectTemplateVars($vars)
-    {
-        $vars['name'] = preg_replace('/-template$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/template-$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectTemplatesVars($vars)
-    {
-        $vars['name'] = preg_replace('/-templates$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/templates-$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectCoreVars($vars)
-    {
-        $vars['name'] = preg_replace('/-providers$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/-provider$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/-adapter$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectModuleVars($vars)
-    {
-        $vars['name'] = preg_replace('/-module$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/module-$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectModulesVars($vars)
-    {
-        $vars['name'] = preg_replace('/-modules$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/modules-$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectSkinVars($vars)
-    {
-        $vars['name'] = preg_replace('/-skin$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/skin-$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectElementVars($vars)
-    {
-        $vars['name'] = preg_replace('/-elements$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/elements-$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/-element$/', '', $vars['name']);
-        $vars['name'] = preg_replace('/element-$/', '', $vars['name']);
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php b/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php
deleted file mode 100644
index 04be73c..0000000
--- a/vendor/composer/installers/src/Composer/Installers/MoodleInstaller.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class MoodleInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'mod'                => 'mod/{$name}/',
-        'admin_report'       => 'admin/report/{$name}/',
-        'tool'               => 'admin/tool/{$name}/',
-        'assignment'         => 'mod/assignment/type/{$name}/',
-        'assignsubmission'   => 'mod/assign/submission/{$name}/',
-        'assignfeedback'     => 'mod/assign/feedback/{$name}/',
-        'auth'               => 'auth/{$name}/',
-        'availability'       => 'availability/condition/{$name}/',
-        'block'              => 'blocks/{$name}/',
-        'calendartype'       => 'calendar/type/{$name}/',
-        'format'             => 'course/format/{$name}/',
-        'coursereport'       => 'course/report/{$name}/',
-        'datafield'          => 'mod/data/field/{$name}/',
-        'datapreset'         => 'mod/data/preset/{$name}/',
-        'editor'             => 'lib/editor/{$name}/',
-        'enrol'              => 'enrol/{$name}/',
-        'filter'             => 'filter/{$name}/',
-        'gradeexport'        => 'grade/export/{$name}/',
-        'gradeimport'        => 'grade/import/{$name}/',
-        'gradereport'        => 'grade/report/{$name}/',
-        'gradingform'        => 'grade/grading/form/{$name}/',
-        'local'              => 'local/{$name}/',
-        'message'            => 'message/output/{$name}/',
-        'plagiarism'         => 'plagiarism/{$name}/',
-        'portfolio'          => 'portfolio/{$name}/',
-        'qbehaviour'         => 'question/behaviour/{$name}/',
-        'qformat'            => 'question/format/{$name}/',
-        'qtype'              => 'question/type/{$name}/',
-        'quizaccess'         => 'mod/quiz/accessrule/{$name}/',
-        'quiz'               => 'mod/quiz/report/{$name}/',
-        'report'             => 'report/{$name}/',
-        'repository'         => 'repository/{$name}/',
-        'scormreport'        => 'mod/scorm/report/{$name}/',
-        'theme'              => 'theme/{$name}/',
-        'profilefield'       => 'user/profile/field/{$name}/',
-        'webservice'         => 'webservice/{$name}/',
-        'workshopallocation' => 'mod/workshop/allocation/{$name}/',
-        'workshopeval'       => 'mod/workshop/eval/{$name}/',
-        'workshopform'       => 'mod/workshop/form/{$name}/'
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php b/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php
deleted file mode 100644
index 6bf53fd..0000000
--- a/vendor/composer/installers/src/Composer/Installers/OctoberInstaller.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class OctoberInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'    => 'modules/{$name}/',
-        'plugin'    => 'plugins/{$vendor}/{$name}/',
-        'theme'     => 'themes/{$name}/'
-    );
-
-    /**
-     * Format package name.
-     *
-     * For package type october-plugin, cut off a trailing '-plugin' if present.
-     *
-     * For package type october-theme, cut off a trailing '-theme' if present.
-     *
-     */
-    public function inflectPackageVars($vars)
-    {
-        if ($vars['type'] === 'october-plugin') {
-            return $this->inflectPluginVars($vars);
-        }
-
-        if ($vars['type'] === 'october-theme') {
-            return $this->inflectThemeVars($vars);
-        }
-
-        return $vars;
-    }
-
-    protected function inflectPluginVars($vars)
-    {
-        $vars['name'] = preg_replace('/-plugin$/', '', $vars['name']);
-
-        return $vars;
-    }
-
-    protected function inflectThemeVars($vars)
-    {
-        $vars['name'] = preg_replace('/-theme$/', '', $vars['name']);
-
-        return $vars;
-    }
-}
\ No newline at end of file
diff --git a/vendor/composer/installers/src/Composer/Installers/OxidInstaller.php b/vendor/composer/installers/src/Composer/Installers/OxidInstaller.php
deleted file mode 100644
index 22fb56a..0000000
--- a/vendor/composer/installers/src/Composer/Installers/OxidInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class OxidInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'    => 'modules/{$name}/',
-        'theme'  => 'application/views/{$name}/',
-        'out'    => 'out/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PPIInstaller.php b/vendor/composer/installers/src/Composer/Installers/PPIInstaller.php
deleted file mode 100644
index 170136f..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PPIInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class PPIInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'modules/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PhpBBInstaller.php b/vendor/composer/installers/src/Composer/Installers/PhpBBInstaller.php
deleted file mode 100644
index deb2b77..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PhpBBInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class PhpBBInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'extension' => 'ext/{$vendor}/{$name}/',
-        'language'  => 'language/{$name}/',
-        'style'     => 'styles/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PimcoreInstaller.php b/vendor/composer/installers/src/Composer/Installers/PimcoreInstaller.php
deleted file mode 100644
index 4781fa6..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PimcoreInstaller.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class PimcoreInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'plugins/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $vars['name']));
-        $vars['name'] = str_replace(array('-', '_'), ' ', $vars['name']);
-        $vars['name'] = str_replace(' ', '', ucwords($vars['name']));
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PiwikInstaller.php b/vendor/composer/installers/src/Composer/Installers/PiwikInstaller.php
deleted file mode 100644
index c17f457..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PiwikInstaller.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * Class PiwikInstaller
- *
- * @package Composer\Installers
- */
-class PiwikInstaller extends BaseInstaller
-{
-    /**
-     * @var array
-     */
-    protected $locations = array(
-        'plugin' => 'plugins/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     * @param array $vars
-     *
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $vars['name']));
-        $vars['name'] = str_replace(array('-', '_'), ' ', $vars['name']);
-        $vars['name'] = str_replace(' ', '', ucwords($vars['name']));
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PrestashopInstaller.php b/vendor/composer/installers/src/Composer/Installers/PrestashopInstaller.php
deleted file mode 100644
index 4c8421e..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PrestashopInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class PrestashopInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'modules/{$name}/',
-        'theme'  => 'themes/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/PuppetInstaller.php b/vendor/composer/installers/src/Composer/Installers/PuppetInstaller.php
deleted file mode 100644
index 77cc3dd..0000000
--- a/vendor/composer/installers/src/Composer/Installers/PuppetInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Composer\Installers;
-
-class PuppetInstaller extends BaseInstaller
-{
-
-    protected $locations = array(
-        'module' => 'modules/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/RedaxoInstaller.php b/vendor/composer/installers/src/Composer/Installers/RedaxoInstaller.php
deleted file mode 100644
index 0954457..0000000
--- a/vendor/composer/installers/src/Composer/Installers/RedaxoInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class RedaxoInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'addon'          => 'redaxo/include/addons/{$name}/',
-        'bestyle-plugin' => 'redaxo/include/addons/be_style/plugins/{$name}/'
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/RoundcubeInstaller.php b/vendor/composer/installers/src/Composer/Installers/RoundcubeInstaller.php
deleted file mode 100644
index d8d795b..0000000
--- a/vendor/composer/installers/src/Composer/Installers/RoundcubeInstaller.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class RoundcubeInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'plugins/{$name}/',
-    );
-
-    /**
-     * Lowercase name and changes the name to a underscores
-     *
-     * @param  array $vars
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = strtolower(str_replace('-', '_', $vars['name']));
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/SMFInstaller.php b/vendor/composer/installers/src/Composer/Installers/SMFInstaller.php
deleted file mode 100644
index 1acd3b1..0000000
--- a/vendor/composer/installers/src/Composer/Installers/SMFInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class SMFInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'Sources/{$name}/',
-        'theme' => 'Themes/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/ShopwareInstaller.php b/vendor/composer/installers/src/Composer/Installers/ShopwareInstaller.php
deleted file mode 100644
index 673f1fc..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ShopwareInstaller.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * Plugin/theme installer for shopware
- * @author Benjamin Boit
- */
-class ShopwareInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'backend-plugin'    => 'engine/Shopware/Plugins/Local/Backend/{$name}/',
-        'core-plugin'       => 'engine/Shopware/Plugins/Local/Core/{$name}/',
-        'frontend-plugin'   => 'engine/Shopware/Plugins/Local/Frontend/{$name}/',
-        'theme'             => 'templates/{$name}/'
-    );
-
-    /**
-     * Transforms the names
-     * @param  array $vars
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        if ($vars['type'] === 'shopware-theme') {
-            return $this->correctThemeName($vars);
-        } else {
-            return $this->correctPluginName($vars);
-        }
-    }
-
-    /**
-     * Changes the name to a camelcased combination of vendor and name
-     * @param  array $vars
-     * @return array
-     */
-    private function correctPluginName($vars)
-    {
-        $camelCasedName = preg_replace_callback('/(-[a-z])/', function ($matches) {
-            return strtoupper($matches[0][1]);
-        }, $vars['name']);
-
-        $vars['name'] = ucfirst($vars['vendor']) . ucfirst($camelCasedName);
-
-        return $vars;
-    }
-
-    /**
-     * Changes the name to a underscore separated name
-     * @param  array $vars
-     * @return array
-     */
-    private function correctThemeName($vars)
-    {
-        $vars['name'] = str_replace('-', '_', $vars['name']);
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/SilverStripeInstaller.php b/vendor/composer/installers/src/Composer/Installers/SilverStripeInstaller.php
deleted file mode 100644
index 17ca543..0000000
--- a/vendor/composer/installers/src/Composer/Installers/SilverStripeInstaller.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-use Composer\Package\PackageInterface;
-
-class SilverStripeInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => '{$name}/',
-        'theme'  => 'themes/{$name}/',
-    );
-
-    /**
-     * Return the install path based on package type.
-     *
-     * Relies on built-in BaseInstaller behaviour with one exception: silverstripe/framework
-     * must be installed to 'sapphire' and not 'framework' if the version is <3.0.0
-     *
-     * @param  PackageInterface $package
-     * @param  string           $frameworkType
-     * @return string
-     */
-    public function getInstallPath(PackageInterface $package, $frameworkType = '')
-    {
-        if (
-            $package->getName() == 'silverstripe/framework'
-            && preg_match('/^\d+\.\d+\.\d+/', $package->getVersion())
-            && version_compare($package->getVersion(), '2.999.999') < 0
-        ) {
-            return $this->templatePath($this->locations['module'], array('name' => 'sapphire'));
-        } else {
-            return parent::getInstallPath($package, $frameworkType);
-        }
-
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/Symfony1Installer.php b/vendor/composer/installers/src/Composer/Installers/Symfony1Installer.php
deleted file mode 100644
index 1675c4f..0000000
--- a/vendor/composer/installers/src/Composer/Installers/Symfony1Installer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * Plugin installer for symfony 1.x
- *
- * @author Jérôme Tamarelle <jerome@tamarelle.net>
- */
-class Symfony1Installer extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin'    => 'plugins/{$name}/',
-    );
-
-    /**
-     * Format package name to CamelCase
-     */
-    public function inflectPackageVars($vars)
-    {
-        $vars['name'] = preg_replace_callback('/(-[a-z])/', function ($matches) {
-            return strtoupper($matches[0][1]);
-        }, $vars['name']);
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php b/vendor/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php
deleted file mode 100644
index 8220b40..0000000
--- a/vendor/composer/installers/src/Composer/Installers/TYPO3CmsInstaller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * Extension installer for TYPO3 CMS
- *
- * @author Sascha Egerer <sascha.egerer@dkd.de>
- */
-class TYPO3CmsInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'extension'   => 'typo3conf/ext/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php b/vendor/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php
deleted file mode 100644
index 42572f4..0000000
--- a/vendor/composer/installers/src/Composer/Installers/TYPO3FlowInstaller.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-/**
- * An installer to handle TYPO3 Flow specifics when installing packages.
- */
-class TYPO3FlowInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'package'       => 'Packages/Application/{$name}/',
-        'framework'     => 'Packages/Framework/{$name}/',
-        'plugin'        => 'Packages/Plugins/{$name}/',
-        'site'          => 'Packages/Sites/{$name}/',
-        'boilerplate'   => 'Packages/Boilerplates/{$name}/',
-        'build'         => 'Build/{$name}/',
-    );
-
-    /**
-     * Modify the package name to be a TYPO3 Flow style key.
-     *
-     * @param  array $vars
-     * @return array
-     */
-    public function inflectPackageVars($vars)
-    {
-        $autoload = $this->package->getAutoload();
-        if (isset($autoload['psr-0']) && is_array($autoload['psr-0'])) {
-            $namespace = key($autoload['psr-0']);
-            $vars['name'] = str_replace('\\', '.', $namespace);
-        }
-        if (isset($autoload['psr-4']) && is_array($autoload['psr-4'])) {
-            $namespace = key($autoload['psr-4']);
-            $vars['name'] = rtrim(str_replace('\\', '.', $namespace), '.');
-        }
-
-        return $vars;
-    }
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/TheliaInstaller.php b/vendor/composer/installers/src/Composer/Installers/TheliaInstaller.php
deleted file mode 100644
index 158af52..0000000
--- a/vendor/composer/installers/src/Composer/Installers/TheliaInstaller.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class TheliaInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module'                => 'local/modules/{$name}/',
-        'frontoffice-template'  => 'templates/frontOffice/{$name}/',
-        'backoffice-template'   => 'templates/backOffice/{$name}/',
-        'email-template'        => 'templates/email/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/TuskInstaller.php b/vendor/composer/installers/src/Composer/Installers/TuskInstaller.php
deleted file mode 100644
index 7c0113b..0000000
--- a/vendor/composer/installers/src/Composer/Installers/TuskInstaller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-    namespace Composer\Installers;
-    /**
-     * Composer installer for 3rd party Tusk utilities
-     * @author Drew Ewing <drew@phenocode.com>
-     */
-    class TuskInstaller extends BaseInstaller
-    {
-        protected $locations = array(
-            'task'    => '.tusk/tasks/{$name}/',
-            'command' => '.tusk/commands/{$name}/',
-            'asset'   => 'assets/tusk/{$name}/',
-        );
-    }
diff --git a/vendor/composer/installers/src/Composer/Installers/WHMCSInstaller.php b/vendor/composer/installers/src/Composer/Installers/WHMCSInstaller.php
deleted file mode 100644
index 2cbb4a4..0000000
--- a/vendor/composer/installers/src/Composer/Installers/WHMCSInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Composer\Installers;
-
-class WHMCSInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'gateway' => 'modules/gateways/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/WolfCMSInstaller.php b/vendor/composer/installers/src/Composer/Installers/WolfCMSInstaller.php
deleted file mode 100644
index cb38788..0000000
--- a/vendor/composer/installers/src/Composer/Installers/WolfCMSInstaller.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class WolfCMSInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin' => 'wolf/plugins/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/WordPressInstaller.php b/vendor/composer/installers/src/Composer/Installers/WordPressInstaller.php
deleted file mode 100644
index b03219c..0000000
--- a/vendor/composer/installers/src/Composer/Installers/WordPressInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class WordPressInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'plugin'    => 'wp-content/plugins/{$name}/',
-        'theme'     => 'wp-content/themes/{$name}/',
-        'muplugin'  => 'wp-content/mu-plugins/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/ZendInstaller.php b/vendor/composer/installers/src/Composer/Installers/ZendInstaller.php
deleted file mode 100644
index bde9bc8..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ZendInstaller.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class ZendInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'library' => 'library/{$name}/',
-        'extra'   => 'extras/library/{$name}/',
-        'module'  => 'module/{$name}/',
-    );
-}
diff --git a/vendor/composer/installers/src/Composer/Installers/ZikulaInstaller.php b/vendor/composer/installers/src/Composer/Installers/ZikulaInstaller.php
deleted file mode 100644
index 56cdf5d..0000000
--- a/vendor/composer/installers/src/Composer/Installers/ZikulaInstaller.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Composer\Installers;
-
-class ZikulaInstaller extends BaseInstaller
-{
-    protected $locations = array(
-        'module' => 'modules/{$vendor}-{$name}/',
-        'theme'  => 'themes/{$vendor}-{$name}/'
-    );
-}
diff --git a/vendor/composer/installers/src/bootstrap.php b/vendor/composer/installers/src/bootstrap.php
deleted file mode 100644
index 0de276e..0000000
--- a/vendor/composer/installers/src/bootstrap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-function includeIfExists($file)
-{
-    if (file_exists($file)) {
-        return include $file;
-    }
-}
-if ((!$loader = includeIfExists(__DIR__ . '/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__ . '/../../../autoload.php'))) {
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
-        'php composer.phar install'.PHP_EOL);
-}
-return $loader;
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/AsgardInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/AsgardInstallerTest.php
deleted file mode 100644
index 71480ec..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/AsgardInstallerTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\AsgardInstaller;
-use Composer\Package\Package;
-use Composer\Composer;
-
-class AsgardInstallerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var OctoberInstaller
-     */
-    private $installer;
-
-    public function setUp()
-    {
-        $this->installer = new AsgardInstaller(
-            new Package('NyanCat', '4.2', '4.2'),
-            new Composer()
-        );
-    }
-
-    /**
-     * @dataProvider packageNameInflectionProvider
-     */
-    public function testInflectPackageVars($type, $name, $expected)
-    {
-        $this->assertEquals(
-            $this->installer->inflectPackageVars(array('name' => $name, 'type' => $type)),
-            array('name' => $expected, 'type' => $type)
-        );
-    }
-
-    public function packageNameInflectionProvider()
-    {
-        return array(
-            array(
-                'asgard-module',
-                'asgard-module',
-                'Asgard'
-            ),
-            array(
-                'asgard-module',
-                'blog',
-                'Blog'
-            ),
-            // tests that exactly one '-theme' is cut off
-            array(
-                'asgard-theme',
-                'some-theme-theme',
-                'Some-theme',
-            ),
-            // tests that names without '-theme' suffix stay valid
-            array(
-                'asgard-theme',
-                'someothertheme',
-                'Someothertheme',
-            ),
-        );
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php
deleted file mode 100644
index 976bd9b..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/CakePHPInstallerTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\CakePHPInstaller;
-use Composer\Repository\RepositoryManager;
-use Composer\Repository\InstalledArrayRepository;
-use Composer\Package\Package;
-use Composer\Package\RootPackage;
-use Composer\Package\Link;
-use Composer\Package\Version\VersionParser;
-use Composer\Composer;
-use Composer\Config;
-
-class CakePHPInstallerTest extends TestCase
-{
-    private $composer;
-    private $io;
-
-    /**
-     * setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->package = new Package('CamelCased', '1.0', '1.0');
-        $this->io = $this->getMock('Composer\IO\PackageInterface');
-        $this->composer = new Composer();
-        $this->composer->setConfig(new Config(false));
-    }
-
-    /**
-     * testInflectPackageVars
-     *
-     * @return void
-     */
-    public function testInflectPackageVars()
-    {
-        $installer = new CakePHPInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'CamelCased'));
-        $this->assertEquals($result, array('name' => 'CamelCased'));
-
-        $installer = new CakePHPInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'with-dash'));
-        $this->assertEquals($result, array('name' => 'WithDash'));
-
-        $installer = new CakePHPInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'with_underscore'));
-        $this->assertEquals($result, array('name' => 'WithUnderscore'));
-
-        $installer = new CakePHPInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'cake/acl'));
-        $this->assertEquals($result, array('name' => 'Cake/Acl'));
-
-        $installer = new CakePHPInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'cake/debug-kit'));
-        $this->assertEquals($result, array('name' => 'Cake/DebugKit'));
-    }
-
-    /**
-     * Test getLocations returning appropriate values based on CakePHP version
-     *
-     */
-    public function testGetLocations() {
-        $package = new RootPackage('CamelCased', '1.0', '1.0');
-        $composer = $this->composer;
-        $rm = new RepositoryManager(
-            $this->getMock('Composer\IO\IOInterface'),
-            $this->getMock('Composer\Config')
-        );
-        $composer->setRepositoryManager($rm);
-        $installer = new CakePHPInstaller($package, $composer);
-
-        // 2.0 < cakephp < 3.0
-        $this->setCakephpVersion($rm, '2.0.0');
-        $result = $installer->getLocations();
-        $this->assertContains('Plugin/', $result['plugin']);
-
-        $this->setCakephpVersion($rm, '2.5.9');
-        $result = $installer->getLocations();
-        $this->assertContains('Plugin/', $result['plugin']);
-
-        $this->setCakephpVersion($rm, '~2.5');
-        $result = $installer->getLocations();
-        $this->assertContains('Plugin/', $result['plugin']);
-
-        // special handling for 2.x versions when 3.x is still in development
-        $this->setCakephpVersion($rm, 'dev-master');
-        $result = $installer->getLocations();
-        $this->assertContains('Plugin/', $result['plugin']);
-
-        $this->setCakephpVersion($rm, '>=2.5');
-        $result = $installer->getLocations();
-        $this->assertContains('Plugin/', $result['plugin']);
-
-        // cakephp >= 3.0
-        $this->setCakephpVersion($rm, '3.0.*-dev');
-        $result = $installer->getLocations();
-        $this->assertContains('vendor/{$vendor}/{$name}/', $result['plugin']);
-
-        $this->setCakephpVersion($rm, '~8.8');
-        $result = $installer->getLocations();
-        $this->assertEquals('vendor/{$vendor}/{$name}/', $result['plugin']);
-    }
-
-    protected function setCakephpVersion($rm, $version) {
-        $parser = new VersionParser();
-        list(, $version) = explode(' ', $parser->parseConstraints($version));
-        $installed = new InstalledArrayRepository();
-        $package = new Package('cakephp/cakephp', $version, $version);
-        $installed->addPackage($package);
-        $rm->setLocalRepository($installed);
-    }
-
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/DokuWikiInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/DokuWikiInstallerTest.php
deleted file mode 100644
index 9e385e6..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/DokuWikiInstallerTest.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\DokuWikiInstaller;
-use Composer\Package\Package;
-use Composer\Composer;
-
-class DokuWikiInstallerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var DokuWikiInstaller
-     */
-    private $installer;
-
-    public function setUp()
-    {
-        $this->installer = new DokuWikiInstaller(
-            new Package('NyanCat', '4.2', '4.2'),
-            new Composer()
-        );
-    }
-
-    /**
-     * @dataProvider packageNameInflectionProvider
-     */
-    public function testInflectPackageVars($type, $name, $expected)
-    {
-        $this->assertEquals(
-            $this->installer->inflectPackageVars(array('name' => $name, 'type'=>$type)),
-            array('name' => $expected, 'type'=>$type)
-        );
-    }
-
-    public function packageNameInflectionProvider()
-    {
-        return array(
-            array(
-                'dokuwiki-plugin',
-                'dokuwiki-test-plugin',
-                'test',
-            ),
-            array(
-                'dokuwiki-plugin',
-                'test-plugin',
-                'test',
-            ),
-            array(
-                'dokuwiki-plugin',
-                'dokuwiki_test',
-                'test',
-            ),
-            array(
-                'dokuwiki-plugin',
-                'test',
-                'test',
-            ),
-            array(
-                'dokuwiki-plugin',
-                'test-template',
-                'test-template',
-            ),
-            array(
-                'dokuwiki-template',
-                'dokuwiki-test-template',
-                'test',
-            ),
-            array(
-                'dokuwiki-template',
-                'test-template',
-                'test',
-            ),
-            array(
-                'dokuwiki-template',
-                'dokuwiki_test',
-                'test',
-            ),
-            array(
-                'dokuwiki-template',
-                'test',
-                'test',
-            ),
-            array(
-                'dokuwiki-template',
-                'test-plugin',
-                'test-plugin',
-            ),
-        );
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/GravInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/GravInstallerTest.php
deleted file mode 100644
index b757799..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/GravInstallerTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Composer;
-use Composer\Installers\GravInstaller;
-
-class GravInstallerTest extends TestCase
-{
-    /* @var \Composer\Composer */
-    protected $composer;
-
-    public function setUp()
-    {
-        $this->composer = new Composer();
-    }
-
-    public function testInflectPackageVars()
-    {
-        $package     = $this->getPackage('vendor/name', '0.0.0');
-        $installer   = new GravInstaller($package, $this->composer);
-        $packageVars = $this->getPackageVars($package);
-
-        $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => 'test')));
-        $this->assertEquals('test', $result['name']);
-
-        foreach ($installer->getLocations() as $name => $location) {
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "$name-test")));
-            $this->assertEquals('test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "test-$name")));
-            $this->assertEquals('test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "$name-test-test")));
-            $this->assertEquals('test-test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "test-test-$name")));
-            $this->assertEquals('test-test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "grav-$name-test")));
-            $this->assertEquals('test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "grav-test-$name")));
-            $this->assertEquals('test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "grav-$name-test-test")));
-            $this->assertEquals('test-test', $result['name']);
-            $result = $installer->inflectPackageVars(array_merge($packageVars, array('name' => "grav-test-test-$name")));
-            $this->assertEquals('test-test', $result['name']);
-        }
-    }
-
-    /**
-     * @param $package  \Composer\Package\PackageInterface
-     */
-    public function getPackageVars($package)
-    {
-        $type = $package->getType();
-
-        $prettyName = $package->getPrettyName();
-        if (strpos($prettyName, '/') !== false) {
-            list($vendor, $name) = explode('/', $prettyName);
-        } else {
-            $vendor = '';
-            $name   = $prettyName;
-        }
-
-        return compact('name', 'vendor', 'type');
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php
deleted file mode 100644
index a516daf..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/InstallerTest.php
+++ /dev/null
@@ -1,422 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\Installer;
-use Composer\Util\Filesystem;
-use Composer\Package\Package;
-use Composer\Package\RootPackage;
-use Composer\Composer;
-use Composer\Config;
-
-class InstallerTest extends TestCase
-{
-    private $composer;
-    private $config;
-    private $vendorDir;
-    private $binDir;
-    private $dm;
-    private $repository;
-    private $io;
-    private $fs;
-
-    /**
-     * setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->fs = new Filesystem;
-
-        $this->composer = new Composer();
-        $this->config = new Config();
-        $this->composer->setConfig($this->config);
-
-        $this->vendorDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'baton-test-vendor';
-        $this->ensureDirectoryExistsAndClear($this->vendorDir);
-
-        $this->binDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'baton-test-bin';
-        $this->ensureDirectoryExistsAndClear($this->binDir);
-
-        $this->config->merge(array(
-            'config' => array(
-                'vendor-dir' => $this->vendorDir,
-                'bin-dir' => $this->binDir,
-            ),
-        ));
-
-        $this->dm = $this->getMockBuilder('Composer\Downloader\DownloadManager')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->composer->setDownloadManager($this->dm);
-
-        $this->repository = $this->getMock('Composer\Repository\InstalledRepositoryInterface');
-        $this->io = $this->getMock('Composer\IO\IOInterface');
-    }
-
-    /**
-     * tearDown
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        $this->fs->removeDirectory($this->vendorDir);
-        $this->fs->removeDirectory($this->binDir);
-    }
-
-    /**
-     * testSupports
-     *
-     * @return void
-     *
-     * @dataProvider dataForTestSupport
-     */
-    public function testSupports($type, $expected)
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $this->assertSame($expected, $installer->supports($type), sprintf('Failed to show support for %s', $type));
-    }
-
-    /**
-     * dataForTestSupport
-     */
-    public function dataForTestSupport()
-    {
-        return array(
-            array('agl-module', true),
-            array('aimeos-extension', true),
-            array('annotatecms-module', true),
-            array('annotatecms-component', true),
-            array('annotatecms-service', true),
-            array('bitrix-module', true),
-            array('bitrix-component', true),
-            array('bitrix-theme', true),
-            array('cakephp', false),
-            array('cakephp-', false),
-            array('cakephp-app', false),
-            array('cakephp-plugin', true),
-            array('chef-cookbook', true),
-            array('chef-role', true),
-            array('codeigniter-app', false),
-            array('codeigniter-library', true),
-            array('codeigniter-third-party', true),
-            array('codeigniter-module', true),
-            array('concrete5-block', true),
-            array('concrete5-package', true),
-            array('concrete5-theme', true),
-            array('concrete5-update', true),
-            array('craft-plugin', true),
-            array('croogo-plugin', true),
-            array('croogo-theme', true),
-            array('dokuwiki-plugin', true),
-            array('dokuwiki-template', true),
-            array('drupal-module', true),
-            array('dolibarr-module', true),
-            array('elgg-plugin', true),
-            array('fuel-module', true),
-            array('fuel-package', true),
-            array('fuel-theme', true),
-            array('fuelphp-component', true),
-            array('hurad-plugin', true),
-            array('hurad-theme', true),
-            array('joomla-library', true),
-            array('kirby-plugin', true),
-            array('kohana-module', true),
-            array('laravel-library', true),
-            array('lithium-library', true),
-            array('magento-library', true),
-            array('mako-package', true),
-            array('modxevo-snippet', true),
-            array('modxevo-plugin', true),
-            array('modxevo-module', true),
-            array('modxevo-template', true),
-            array('modxevo-lib', true),
-            array('mediawiki-extension', true),
-            array('mediawiki-skin', true),
-            array('microweber-module', true),
-            array('modulework-module', true),
-            array('moodle-mod', true),
-            array('october-module', true),
-            array('october-plugin', true),
-            array('piwik-plugin', true),
-            array('phpbb-extension', true),
-            array('pimcore-plugin', true),
-            array('ppi-module', true),
-            array('prestashop-module', true),
-            array('prestashop-theme', true),
-            array('puppet-module', true),
-            array('redaxo-addon', true),
-            array('redaxo-bestyle-plugin', true),
-            array('roundcube-plugin', true),
-            array('shopware-backend-plugin', true),
-            array('shopware-core-plugin', true),
-            array('shopware-frontend-plugin', true),
-            array('shopware-theme', true),
-            array('silverstripe-module', true),
-            array('silverstripe-theme', true),
-            array('smf-module', true),
-            array('smf-theme', true),
-            array('symfony1-plugin', true),
-            array('thelia-module', true),
-            array('thelia-frontoffice-template', true),
-            array('thelia-backoffice-template', true),
-            array('thelia-email-template', true),
-            array('tusk-task', true),
-            array('tusk-asset', true),
-            array('typo3-flow-plugin', true),
-            array('typo3-cms-extension', true),
-            array('whmcs-gateway', true),
-            array('wolfcms-plugin', true),
-            array('wordpress-plugin', true),
-            array('wordpress-core', false),
-            array('zend-library', true),
-            array('zikula-module', true),
-            array('zikula-theme', true),
-        );
-    }
-
-    /**
-     * testInstallPath
-     *
-     * @dataProvider dataForTestInstallPath
-     */
-    public function testInstallPath($type, $path, $name, $version = '1.0.0')
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package($name, $version, $version);
-
-        $package->setType($type);
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals($path, $result);
-    }
-
-    /**
-     * dataFormTestInstallPath
-     */
-    public function dataForTestInstallPath()
-    {
-        return array(
-            array('agl-module', 'More/MyTestPackage/', 'agl/my_test-package'),
-            array('aimeos-extension', 'ext/ai-test/', 'author/ai-test'),
-            array('annotatecms-module', 'addons/modules/my_module/', 'vysinsky/my_module'),
-            array('annotatecms-component', 'addons/components/my_component/', 'vysinsky/my_component'),
-            array('annotatecms-service', 'addons/services/my_service/', 'vysinsky/my_service'),
-            array('bitrix-module', 'local/modules/my_module/', 'author/my_module'),
-            array('bitrix-component', 'local/components/my_component/', 'author/my_component'),
-            array('bitrix-theme', 'local/templates/my_theme/', 'author/my_theme'),
-            array('cakephp-plugin', 'Plugin/Ftp/', 'shama/ftp'),
-            array('chef-cookbook', 'Chef/mre/my_cookbook/', 'mre/my_cookbook'),
-            array('chef-role', 'Chef/roles/my_role/', 'mre/my_role'),
-            array('codeigniter-library', 'application/libraries/my_package/', 'shama/my_package'),
-            array('codeigniter-module', 'application/modules/my_package/', 'shama/my_package'),
-            array('concrete5-block', 'blocks/concrete5_block/', 'remo/concrete5_block'),
-            array('concrete5-package', 'packages/concrete5_package/', 'remo/concrete5_package'),
-            array('concrete5-theme', 'themes/concrete5_theme/', 'remo/concrete5_theme'),
-            array('concrete5-update', 'updates/concrete5/', 'concrete5/concrete5'),
-            array('craft-plugin', 'craft/plugins/my_plugin/', 'mdcpepper/my_plugin'),
-            array('croogo-plugin', 'Plugin/Sitemaps/', 'fahad19/sitemaps'),
-            array('croogo-theme', 'View/Themed/Readable/', 'rchavik/readable'),
-            array('dokuwiki-plugin', 'lib/plugins/someplugin/', 'author/someplugin'),
-            array('dokuwiki-template', 'lib/tpl/sometemplate/', 'author/sometemplate'),
-            array('dolibarr-module', 'htdocs/custom/my_module/', 'shama/my_module'),
-            array('drupal-module', 'modules/my_module/', 'shama/my_module'),
-            array('drupal-theme', 'themes/my_module/', 'shama/my_module'),
-            array('drupal-profile', 'profiles/my_module/', 'shama/my_module'),
-            array('drupal-drush', 'drush/my_module/', 'shama/my_module'),
-            array('elgg-plugin', 'mod/sample_plugin/', 'test/sample_plugin'),
-            array('fuel-module', 'fuel/app/modules/module/', 'fuel/module'),
-            array('fuel-package', 'fuel/packages/orm/', 'fuel/orm'),
-            array('fuel-theme', 'fuel/app/themes/theme/', 'fuel/theme'),
-            array('fuelphp-component', 'components/demo/', 'fuelphp/demo'),
-            array('hurad-plugin', 'plugins/Akismet/', 'atkrad/akismet'),
-            array('hurad-theme', 'plugins/Hurad2013/', 'atkrad/Hurad2013'),
-            array('joomla-plugin', 'plugins/my_plugin/', 'shama/my_plugin'),
-            array('kirby-plugin', 'site/plugins/my_plugin/', 'shama/my_plugin'),
-            array('kohana-module', 'modules/my_package/', 'shama/my_package'),
-            array('laravel-library', 'libraries/my_package/', 'shama/my_package'),
-            array('lithium-library', 'libraries/li3_test/', 'user/li3_test'),
-            array('magento-library', 'lib/foo/', 'test/foo'),
-            array('modxevo-snippet', 'assets/snippets/my_snippet/', 'shama/my_snippet'),
-            array('modxevo-plugin', 'assets/plugins/my_plugin/', 'shama/my_plugin'),
-            array('modxevo-module', 'assets/modules/my_module/', 'shama/my_module'),
-            array('modxevo-template', 'assets/templates/my_template/', 'shama/my_template'),
-            array('modxevo-lib', 'assets/lib/my_lib/', 'shama/my_lib'),
-            array('mako-package', 'app/packages/my_package/', 'shama/my_package'),
-            array('mediawiki-extension', 'extensions/APC/', 'author/APC'),
-            array('mediawiki-extension', 'extensions/APC/', 'author/APC-extension'),
-            array('mediawiki-extension', 'extensions/UploadWizard/', 'author/upload-wizard'),
-            array('mediawiki-extension', 'extensions/SyntaxHighlight_GeSHi/', 'author/syntax-highlight_GeSHi'),
-            array('mediawiki-skin', 'skins/someskin/', 'author/someskin-skin'),
-            array('mediawiki-skin', 'skins/someskin/', 'author/someskin'),
-            array('microweber-module', 'userfiles/modules/my-thing/', 'author/my-thing-module'),
-            array('modulework-module', 'modules/my_package/', 'shama/my_package'),
-            array('moodle-mod', 'mod/my_package/', 'shama/my_package'),
-            array('october-module', 'modules/my_plugin/', 'shama/my_plugin'),
-            array('october-plugin', 'plugins/shama/my_plugin/', 'shama/my_plugin'),
-            array('october-theme', 'themes/my_theme/', 'shama/my_theme'),
-            array('piwik-plugin', 'plugins/VisitSummary/', 'shama/visit-summary'),
-            array('prestashop-module', 'modules/a-module/', 'vendor/a-module'),
-            array('prestashop-theme', 'themes/a-theme/', 'vendor/a-theme'),
-            array('phpbb-extension', 'ext/test/foo/', 'test/foo'),
-            array('phpbb-style', 'styles/foo/', 'test/foo'),
-            array('phpbb-language', 'language/foo/', 'test/foo'),
-            array('pimcore-plugin', 'plugins/MyPlugin/', 'ubikz/my_plugin'),
-            array('ppi-module', 'modules/foo/', 'test/foo'),
-            array('puppet-module', 'modules/puppet-name/', 'puppet/puppet-name'),
-            array('redaxo-addon', 'redaxo/include/addons/my_plugin/', 'shama/my_plugin'),
-            array('redaxo-bestyle-plugin', 'redaxo/include/addons/be_style/plugins/my_plugin/', 'shama/my_plugin'),
-            array('roundcube-plugin', 'plugins/base/', 'test/base'),
-            array('roundcube-plugin', 'plugins/replace_dash/', 'test/replace-dash'),
-            array('shopware-backend-plugin', 'engine/Shopware/Plugins/Local/Backend/ShamaMyBackendPlugin/', 'shama/my-backend-plugin'),
-            array('shopware-core-plugin', 'engine/Shopware/Plugins/Local/Core/ShamaMyCorePlugin/', 'shama/my-core-plugin'),
-            array('shopware-frontend-plugin', 'engine/Shopware/Plugins/Local/Frontend/ShamaMyFrontendPlugin/', 'shama/my-frontend-plugin'),
-            array('shopware-theme', 'templates/my_theme/', 'shama/my-theme'),
-            array('silverstripe-module', 'my_module/', 'shama/my_module'),
-            array('silverstripe-module', 'sapphire/', 'silverstripe/framework', '2.4.0'),
-            array('silverstripe-module', 'framework/', 'silverstripe/framework', '3.0.0'),
-            array('silverstripe-module', 'framework/', 'silverstripe/framework', '3.0.0-rc1'),
-            array('silverstripe-module', 'framework/', 'silverstripe/framework', 'my/branch'),
-            array('silverstripe-theme', 'themes/my_theme/', 'shama/my_theme'),
-            array('smf-module', 'Sources/my_module/', 'shama/my_module'),
-            array('smf-theme', 'Themes/my_theme/', 'shama/my_theme'),
-            array('symfony1-plugin', 'plugins/sfShamaPlugin/', 'shama/sfShamaPlugin'),
-            array('symfony1-plugin', 'plugins/sfShamaPlugin/', 'shama/sf-shama-plugin'),
-            array('thelia-module', 'local/modules/my_module/', 'shama/my_module'),
-            array('thelia-frontoffice-template', 'templates/frontOffice/my_template_fo/', 'shama/my_template_fo'),
-            array('thelia-backoffice-template', 'templates/backOffice/my_template_bo/', 'shama/my_template_bo'),
-            array('thelia-email-template', 'templates/email/my_template_email/', 'shama/my_template_email'),
-            array('tusk-task', '.tusk/tasks/my_task/', 'shama/my_task'),
-            array('typo3-flow-package', 'Packages/Application/my_package/', 'shama/my_package'),
-            array('typo3-flow-build', 'Build/my_package/', 'shama/my_package'),
-            array('typo3-cms-extension', 'typo3conf/ext/my_extension/', 'shama/my_extension'),
-            array('whmcs-gateway', 'modules/gateways/gateway_name/', 'vendor/gateway_name'),
-            array('wolfcms-plugin', 'wolf/plugins/my_plugin/', 'shama/my_plugin'),
-            array('wordpress-plugin', 'wp-content/plugins/my_plugin/', 'shama/my_plugin'),
-            array('wordpress-muplugin', 'wp-content/mu-plugins/my_plugin/', 'shama/my_plugin'),
-            array('zend-extra', 'extras/library/zend_test/', 'shama/zend_test'),
-            array('zikula-module', 'modules/my-test_module/', 'my/test_module'),
-            array('zikula-theme', 'themes/my-test_theme/', 'my/test_theme'),
-        );
-    }
-
-    /**
-     * testGetCakePHPInstallPathException
-     *
-     * @return void
-     *
-     * @expectedException \InvalidArgumentException
-     */
-    public function testGetCakePHPInstallPathException()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('shama/ftp', '1.0.0', '1.0.0');
-
-        $package->setType('cakephp-whoops');
-        $result = $installer->getInstallPath($package);
-    }
-
-    /**
-     * testCustomInstallPath
-     */
-    public function testCustomInstallPath()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('shama/ftp', '1.0.0', '1.0.0');
-        $package->setType('cakephp-plugin');
-        $consumerPackage = new RootPackage('foo/bar', '1.0.0', '1.0.0');
-        $this->composer->setPackage($consumerPackage);
-        $consumerPackage->setExtra(array(
-            'installer-paths' => array(
-                'my/custom/path/{$name}/' => array(
-                    'shama/ftp',
-                    'foo/bar',
-                ),
-            ),
-        ));
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals('my/custom/path/Ftp/', $result);
-    }
-
-    /**
-     * testCustomInstallerName
-     */
-    public function testCustomInstallerName()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('shama/cakephp-ftp-plugin', '1.0.0', '1.0.0');
-        $package->setType('cakephp-plugin');
-        $package->setExtra(array(
-            'installer-name' => 'FTP',
-        ));
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals('Plugin/FTP/', $result);
-    }
-
-    /**
-     * testCustomTypePath
-     */
-    public function testCustomTypePath()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('slbmeh/my_plugin', '1.0.0', '1.0.0');
-        $package->setType('wordpress-plugin');
-        $consumerPackage = new RootPackage('foo/bar', '1.0.0', '1.0.0');
-        $this->composer->setPackage($consumerPackage);
-        $consumerPackage->setExtra(array(
-            'installer-paths' => array(
-                'my/custom/path/{$name}/' => array(
-                    'type:wordpress-plugin'
-                ),
-            ),
-        ));
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals('my/custom/path/my_plugin/', $result);
-    }
-
-    /**
-     * testNoVendorName
-     */
-    public function testNoVendorName()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('sfPhpunitPlugin', '1.0.0', '1.0.0');
-
-        $package->setType('symfony1-plugin');
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals('plugins/sfPhpunitPlugin/', $result);
-    }
-
-    /**
-     * testTypo3Inflection
-     */
-    public function testTypo3Inflection()
-    {
-        $installer = new Installer($this->io, $this->composer);
-        $package = new Package('typo3/fluid', '1.0.0', '1.0.0');
-
-        $package->setAutoload(array(
-            'psr-0' => array(
-                'TYPO3\\Fluid' => 'Classes',
-            ),
-        ));
-
-        $package->setType('typo3-flow-package');
-        $result = $installer->getInstallPath($package);
-        $this->assertEquals('Packages/Application/TYPO3.Fluid/', $result);
-    }
-
-    public function testUninstallAndDeletePackageFromLocalRepo()
-    {
-        $package = new Package('foo', '1.0.0', '1.0.0');
-
-        $installer = $this->getMock('Composer\Installers\Installer', array('getInstallPath'), array($this->io, $this->composer));
-        $installer->expects($this->once())->method('getInstallPath')->with($package)->will($this->returnValue(sys_get_temp_dir().'/foo'));
-
-        $repo = $this->getMock('Composer\Repository\InstalledRepositoryInterface');
-        $repo->expects($this->once())->method('hasPackage')->with($package)->will($this->returnValue(true));
-        $repo->expects($this->once())->method('removePackage')->with($package);
-
-        $installer->uninstall($repo, $package);
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/MediaWikiInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/MediaWikiInstallerTest.php
deleted file mode 100644
index 3675e18..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/MediaWikiInstallerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\MediaWikiInstaller;
-use Composer\Package\Package;
-use Composer\Composer;
-
-class MediaWikiInstallerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var MediaWikiInstaller
-     */
-    private $installer;
-
-    public function setUp()
-    {
-        $this->installer = new MediaWikiInstaller(
-            new Package('NyanCat', '4.2', '4.2'),
-            new Composer()
-        );
-    }
-
-    /**
-     * @dataProvider packageNameInflectionProvider
-     */
-    public function testInflectPackageVars($type, $name, $expected)
-    {
-        $this->assertEquals(
-            $this->installer->inflectPackageVars(array('name' => $name, 'type'=>$type)),
-            array('name' => $expected, 'type'=>$type)
-        );
-    }
-
-    public function packageNameInflectionProvider()
-    {
-        return array(
-            array(
-                'mediawiki-extension',
-                'sub-page-list',
-                'SubPageList',
-            ),
-            array(
-                'mediawiki-extension',
-                'sub-page-list-extension',
-                'SubPageList',
-            ),
-            array(
-                'mediawiki-extension',
-                'semantic-mediawiki',
-                'SemanticMediawiki',
-            ),
-            // tests that exactly one '-skin' is cut off, and that skins do not get ucwords treatment like extensions
-            array(
-                'mediawiki-skin',
-                'some-skin-skin',
-                'some-skin',
-            ),
-            // tests that names without '-skin' suffix stay valid
-            array(
-                'mediawiki-skin',
-                'someotherskin',
-                'someotherskin',
-            ),
-        );
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/OctoberInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/OctoberInstallerTest.php
deleted file mode 100644
index fd427cd..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/OctoberInstallerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\OctoberInstaller;
-use Composer\Package\Package;
-use Composer\Composer;
-
-class OctoberInstallerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var OctoberInstaller
-     */
-    private $installer;
-
-    public function setUp()
-    {
-        $this->installer = new OctoberInstaller(
-            new Package('NyanCat', '4.2', '4.2'),
-            new Composer()
-        );
-    }
-
-    /**
-     * @dataProvider packageNameInflectionProvider
-     */
-    public function testInflectPackageVars($type, $name, $expected)
-    {
-        $this->assertEquals(
-            $this->installer->inflectPackageVars(array('name' => $name, 'type' => $type)),
-            array('name' => $expected, 'type' => $type)
-        );
-    }
-
-    public function packageNameInflectionProvider()
-    {
-        return array(
-            array(
-                'october-plugin',
-                'subpagelist',
-                'subpagelist',
-            ),
-            array(
-                'october-plugin',
-                'subpagelist-plugin',
-                'subpagelist',
-            ),
-            array(
-                'october-plugin',
-                'semanticoctober',
-                'semanticoctober',
-            ),
-            // tests that exactly one '-theme' is cut off
-            array(
-                'october-theme',
-                'some-theme-theme',
-                'some-theme',
-            ),
-            // tests that names without '-theme' suffix stay valid
-            array(
-                'october-theme',
-                'someothertheme',
-                'someothertheme',
-            ),
-        );
-    }
-}
\ No newline at end of file
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/PimcoreInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/PimcoreInstallerTest.php
deleted file mode 100644
index ea79374..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/PimcoreInstallerTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Installers\PimcoreInstaller;
-use Composer\Package\Package;
-use Composer\Composer;
-
-class PimcoreInstallerTest extends TestCase
-{
-    private $composer;
-    private $io;
-
-    /**
-     * setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->package = new Package('CamelCased', '1.0', '1.0');
-        $this->io = $this->getMock('Composer\IO\PackageInterface');
-        $this->composer = new Composer();
-    }
-
-    /**
-     * testInflectPackageVars
-     *
-     * @return void
-     */
-    public function testInflectPackageVars()
-    {
-        $installer = new PimcoreInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'CamelCased'));
-        $this->assertEquals($result, array('name' => 'CamelCased'));
-
-        $installer = new PimcoreInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'with-dash'));
-        $this->assertEquals($result, array('name' => 'WithDash'));
-
-        $installer = new PimcoreInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'with_underscore'));
-        $this->assertEquals($result, array('name' => 'WithUnderscore'));
-    }
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php b/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php
deleted file mode 100644
index 8d9ff3f..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/PiwikInstallerTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace Composer\Installers\Test;
-
-use Composer\Composer;
-use Composer\Installers\PiwikInstaller;
-use Composer\Package\Package;
-use Composer\Package\PackageInterface;
-
-/**
- * Class PiwikInstallerTest
- *
- * @package Composer\Installers\Test
- */
-class PiwikInstallerTest extends TestCase
-{
-    /**
-     * @varComposer
-     */
-    private $composer;
-
-    /**
-     * @var PackageInterface
-     */
-    private $io;
-
-    /**
-     * @var Package
-     */
-    private $package;
-
-    /**
-     * setUp
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        $this->package = new Package('VisitSummary', '1.0', '1.0');
-        $this->io = $this->getMock('Composer\IO\PackageInterface');
-        $this->composer = new Composer();
-    }
-
-    /**
-     * testInflectPackageVars
-     *
-     * @return void
-     */
-    public function testInflectPackageVars()
-    {
-        $installer = new PiwikInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'VisitSummary'));
-        $this->assertEquals($result, array('name' => 'VisitSummary'));
-
-        $installer = new PiwikInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'visit-summary'));
-        $this->assertEquals($result, array('name' => 'VisitSummary'));
-
-        $installer = new PiwikInstaller($this->package, $this->composer);
-        $result = $installer->inflectPackageVars(array('name' => 'visit_summary'));
-        $this->assertEquals($result, array('name' => 'VisitSummary'));
-    }
-
-}
diff --git a/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php b/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php
deleted file mode 100644
index 6418a03..0000000
--- a/vendor/composer/installers/tests/Composer/Installers/Test/TestCase.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Installers\Test;
-
-use Composer\Package\Version\VersionParser;
-use Composer\Package\Package;
-use Composer\Package\AliasPackage;
-use Composer\Package\LinkConstraint\VersionConstraint;
-use Composer\Util\Filesystem;
-
-abstract class TestCase extends \PHPUnit_Framework_TestCase
-{
-    private static $parser;
-
-    protected static function getVersionParser()
-    {
-        if (!self::$parser) {
-            self::$parser = new VersionParser();
-        }
-
-        return self::$parser;
-    }
-
-    protected function getVersionConstraint($operator, $version)
-    {
-        return new VersionConstraint(
-            $operator,
-            self::getVersionParser()->normalize($version)
-        );
-    }
-
-    protected function getPackage($name, $version)
-    {
-        $normVersion = self::getVersionParser()->normalize($version);
-
-        return new Package($name, $normVersion, $version);
-    }
-
-    protected function getAliasPackage($package, $version)
-    {
-        $normVersion = self::getVersionParser()->normalize($version);
-
-        return new AliasPackage($package, $normVersion, $version);
-    }
-
-    protected function ensureDirectoryExistsAndClear($directory)
-    {
-        $fs = new Filesystem();
-        if (is_dir($directory)) {
-            $fs->removeDirectory($directory);
-        }
-        mkdir($directory, 0777, true);
-    }
-}
diff --git a/vendor/composer/installers/tests/bootstrap.php b/vendor/composer/installers/tests/bootstrap.php
deleted file mode 100644
index 30c8fdc..0000000
--- a/vendor/composer/installers/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$loader = require __DIR__ . '/../src/bootstrap.php';
-$loader->add('Composer\Installers\Test', __DIR__);
diff --git a/vendor/composer/semver/CHANGELOG.md b/vendor/composer/semver/CHANGELOG.md
deleted file mode 100644
index 8352cb7..0000000
--- a/vendor/composer/semver/CHANGELOG.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-### [1.0.0] 2015-09-21
-
-  * Break: `VersionConstraint` renamed to `Constraint`.
-  * Break: `SpecificConstraint` renamed to `AbstractConstraint`.
-  * Break: `LinkConstraintInterface` renamed to `ConstraintInterface`.
-  * Break: `VersionParser::parseNameVersionPairs` was removed.
-  * Changed: `VersionParser::parseConstraints` allows (but ignores) build metadata now.
-  * Changed: `VersionParser::parseConstraints` allows (but ignores) prefixing numeric versions with a 'v' now.
-  * Changed: Fixed namespace(s) of test files.
-  * Changed: `Comparator::compare` no longer throws `InvalidArgumentException`.
-  * Changed: `VersionConstraint` now throws `InvalidArgumentException`.
-
-### [0.1.0] 2015-07-23
-
-  * Added: `Composer\Semver\Comparator`, various methods to compare versions.
-  * Added: various documents such as README.md, LICENSE, etc.
-  * Added: configuration files for Git, Travis, php-cs-fixer, phpunit.
-  * Break: the following namespaces were renamed:
-    - Namespace: `Composer\Package\Version` -> `Composer\Semver`
-    - Namespace: `Composer\Package\LinkConstraint` -> `Composer\Semver\Constraint`
-    - Namespace: `Composer\Test\Package\Version` -> `Composer\Test\Semver`
-    - Namespace: `Composer\Test\Package\LinkConstraint` -> `Composer\Test\Semver\Constraint`
-  * Changed: code style using php-cs-fixer.
diff --git a/vendor/composer/semver/LICENSE b/vendor/composer/semver/LICENSE
deleted file mode 100644
index 4669758..0000000
--- a/vendor/composer/semver/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2015 Composer
-
-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/vendor/composer/semver/README.md b/vendor/composer/semver/README.md
deleted file mode 100644
index c8b6979..0000000
--- a/vendor/composer/semver/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-composer/semver
-===============
-
-Semver library that offers utilities, version constraint parsing and validation.
-
-Originally written as part of [composer/composer](https://github.com/composer/composer),
-now extracted and made available as a stand-alone library.
-
-[![Build Status](https://travis-ci.org/composer/semver.svg?branch=master)](https://travis-ci.org/composer/semver)
-
-
-Installation
-------------
-
-Install the latest version with:
-
-```bash
-$ composer require composer/semver
-```
-
-
-Requirements
-------------
-
-* PHP 5.3.2 is required but using the latest version of PHP is highly recommended.
-
-
-Version Comparison
-------------------
-
-For details on how versions are compared, refer to the [Versions](https://getcomposer.org/doc/articles/versions.md)
-article in the documentation section of the [getcomposer.org](https://getcomposer.org) website.
-
-
-Basic usage
------------
-
-### Comparator
-
-The `Composer\Semver\Comparator` class provides the following methods for comparing versions:
-
-* greaterThan($v1, $v2)
-* greaterThanOrEqualTo($v1, $v2)
-* lessThan($v1, $v2)
-* lessThanOrEqualTo($v1, $v2)
-* equalTo($v1, $v2)
-* notEqualTo($v1, $v2)
-
-Each function takes two version strings as arguments. For example:
-
-```php
-use Composer\Semver\Comparator;
-
-Comparator::greaterThan('1.25.0', '1.24.0'); // 1.25.0 > 1.24.0
-```
-
-### Semver
-
-The `Composer\Semver\Semver` class providers the following methods:
-
-* satisfies($version, $constraints)
-* satisfiedBy($constraint, array $versions)
-* sort($versions)
-* rsort($versions)
-
-
-License
--------
-
-composer/semver is licensed under the MIT License, see the LICENSE file for details.
diff --git a/vendor/composer/semver/composer.json b/vendor/composer/semver/composer.json
deleted file mode 100644
index b996186..0000000
--- a/vendor/composer/semver/composer.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "name": "composer/semver",
-    "description": "Semver library that offers utilities, version constraint parsing and validation.",
-    "type": "library",
-    "license": "MIT",
-    "keywords": [
-        "semver",
-        "semantic",
-        "versioning",
-        "validation"
-    ],
-    "authors": [
-        {
-            "name": "Nils Adermann",
-            "email": "naderman@naderman.de",
-            "homepage": "http://www.naderman.de"
-        },
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "http://seld.be"
-        },
-        {
-            "name": "Rob Bast",
-            "email": "rob.bast@gmail.com"
-        }
-    ],
-    "support": {
-        "irc": "irc://irc.freenode.org/composer",
-        "issues": "https://github.com/composer/semver/issues"
-    },
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "phpunit/phpunit-mock-objects": "~2.3"
-    },
-    "autoload": {
-        "psr-4": {
-            "Composer\\Semver\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Composer\\Semver\\Test\\": "tests"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.1-dev"
-        }
-    },
-    "scripts": {
-        "test": "phpunit"
-    }
-}
diff --git a/vendor/composer/semver/src/Comparator.php b/vendor/composer/semver/src/Comparator.php
deleted file mode 100644
index a9d758f..0000000
--- a/vendor/composer/semver/src/Comparator.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver;
-
-use Composer\Semver\Constraint\Constraint;
-
-class Comparator
-{
-    /**
-     * Evaluates the expression: $version1 > $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function greaterThan($version1, $version2)
-    {
-        return self::compare($version1, '>', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 >= $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function greaterThanOrEqualTo($version1, $version2)
-    {
-        return self::compare($version1, '>=', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 < $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function lessThan($version1, $version2)
-    {
-        return self::compare($version1, '<', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 <= $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function lessThanOrEqualTo($version1, $version2)
-    {
-        return self::compare($version1, '<=', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 == $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function equalTo($version1, $version2)
-    {
-        return self::compare($version1, '==', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 != $version2.
-     *
-     * @param string $version1
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function notEqualTo($version1, $version2)
-    {
-        return self::compare($version1, '!=', $version2);
-    }
-
-    /**
-     * Evaluates the expression: $version1 $operator $version2.
-     *
-     * @param string $version1
-     * @param string $operator
-     * @param string $version2
-     *
-     * @return bool
-     */
-    public static function compare($version1, $operator, $version2)
-    {
-        $constraint = new Constraint($operator, $version2);
-
-        return $constraint->matches(new Constraint('==', $version1));
-    }
-}
diff --git a/vendor/composer/semver/src/Constraint/AbstractConstraint.php b/vendor/composer/semver/src/Constraint/AbstractConstraint.php
deleted file mode 100644
index ccd834f..0000000
--- a/vendor/composer/semver/src/Constraint/AbstractConstraint.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver\Constraint;
-
-/**
- * Base constraint class.
- */
-abstract class AbstractConstraint implements ConstraintInterface
-{
-    /** @var string */
-    protected $prettyString;
-
-    /**
-     * @param ConstraintInterface $provider
-     *
-     * @return bool
-     */
-    public function matches(ConstraintInterface $provider)
-    {
-        if ($provider instanceof MultiConstraint) {
-            // turn matching around to find a match
-            return $provider->matches($this);
-        }
-
-        if ($provider instanceof $this) {
-            // see note at bottom of this class declaration
-            return $this->matchSpecific($provider);
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $prettyString
-     */
-    public function setPrettyString($prettyString)
-    {
-        $this->prettyString = $prettyString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrettyString()
-    {
-        if ($this->prettyString) {
-            return $this->prettyString;
-        }
-
-        return $this->__toString();
-    }
-
-    // implementations must implement a method of this format:
-    // not declared abstract here because type hinting violates parameter coherence (TODO right word?)
-    // public function matchSpecific(<SpecificConstraintType> $provider);
-}
diff --git a/vendor/composer/semver/src/Constraint/Constraint.php b/vendor/composer/semver/src/Constraint/Constraint.php
deleted file mode 100644
index 8bc68db..0000000
--- a/vendor/composer/semver/src/Constraint/Constraint.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver\Constraint;
-
-/**
- * Defines a constraint.
- */
-class Constraint extends AbstractConstraint
-{
-    /* operator integer values */
-    const OP_EQ = 0;
-    const OP_LT = 1;
-    const OP_LE = 2;
-    const OP_GT = 3;
-    const OP_GE = 4;
-    const OP_NE = 5;
-
-    /**
-     * Operator to integer translation table.
-     *
-     * @var array
-     */
-    private static $transOpStr = array(
-        '=' => self::OP_EQ,
-        '==' => self::OP_EQ,
-        '<' => self::OP_LT,
-        '<=' => self::OP_LE,
-        '>' => self::OP_GT,
-        '>=' => self::OP_GE,
-        '<>' => self::OP_NE,
-        '!=' => self::OP_NE,
-    );
-
-    /**
-     * Integer to operator translation table.
-     *
-     * @var array
-     */
-    private static $transOpInt = array(
-        self::OP_EQ => '==',
-        self::OP_LT => '<',
-        self::OP_LE => '<=',
-        self::OP_GT => '>',
-        self::OP_GE => '>=',
-        self::OP_NE => '!=',
-    );
-
-    /** @var string */
-    private $operator;
-
-    /** @var string */
-    private $version;
-
-    /**
-     * Get all supported comparison operators.
-     *
-     * @return array
-     */
-    public static function getSupportedOperators()
-    {
-        return array_keys(self::$transOpStr);
-    }
-
-    /**
-     * Sets operator and version to compare with.
-     *
-     * @param string $operator
-     * @param string $version
-     *
-     * @throws \InvalidArgumentException if invalid operator is given.
-     */
-    public function __construct($operator, $version)
-    {
-        if (!isset(self::$transOpStr[$operator])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid operator "%s" given, expected one of: %s',
-                $operator,
-                implode(', ', self::getSupportedOperators())
-            ));
-        }
-
-        $this->operator = self::$transOpStr[$operator];
-        $this->version = $version;
-    }
-
-    /**
-     * @param string $a
-     * @param string $b
-     * @param string $operator
-     * @param bool $compareBranches
-     *
-     * @throws \InvalidArgumentException if invalid operator is given.
-     *
-     * @return bool
-     */
-    public function versionCompare($a, $b, $operator, $compareBranches = false)
-    {
-        if (!isset(self::$transOpStr[$operator])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid operator "%s" given, expected one of: %s',
-                $operator,
-                implode(', ', self::getSupportedOperators())
-            ));
-        }
-
-        $aIsBranch = 'dev-' === substr($a, 0, 4);
-        $bIsBranch = 'dev-' === substr($b, 0, 4);
-
-        if ($aIsBranch && $bIsBranch) {
-            return $operator === '==' && $a === $b;
-        }
-
-        // when branches are not comparable, we make sure dev branches never match anything
-        if (!$compareBranches && ($aIsBranch || $bIsBranch)) {
-            return false;
-        }
-
-        return version_compare($a, $b, $operator);
-    }
-
-    /**
-     * @param Constraint $provider
-     * @param bool $compareBranches
-     *
-     * @return bool
-     */
-    public function matchSpecific(Constraint $provider, $compareBranches = false)
-    {
-        $noEqualOp = str_replace('=', '', self::$transOpInt[$this->operator]);
-        $providerNoEqualOp = str_replace('=', '', self::$transOpInt[$provider->operator]);
-
-        $isEqualOp = self::OP_EQ === $this->operator;
-        $isNonEqualOp = self::OP_NE === $this->operator;
-        $isProviderEqualOp = self::OP_EQ === $provider->operator;
-        $isProviderNonEqualOp = self::OP_NE === $provider->operator;
-
-        // '!=' operator is match when other operator is not '==' operator or version is not match
-        // these kinds of comparisons always have a solution
-        if ($isNonEqualOp || $isProviderNonEqualOp) {
-            return !$isEqualOp && !$isProviderEqualOp
-                || $this->versionCompare($provider->version, $this->version, '!=', $compareBranches);
-        }
-
-        // an example for the condition is <= 2.0 & < 1.0
-        // these kinds of comparisons always have a solution
-        if ($this->operator !== self::OP_EQ && $noEqualOp === $providerNoEqualOp) {
-            return true;
-        }
-
-        if ($this->versionCompare($provider->version, $this->version, self::$transOpInt[$this->operator], $compareBranches)) {
-            // special case, e.g. require >= 1.0 and provide < 1.0
-            // 1.0 >= 1.0 but 1.0 is outside of the provided interval
-            if ($provider->version === $this->version
-                && self::$transOpInt[$provider->operator] === $providerNoEqualOp
-                && self::$transOpInt[$this->operator] !== $noEqualOp) {
-                return false;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return self::$transOpInt[$this->operator] . ' ' . $this->version;
-    }
-}
diff --git a/vendor/composer/semver/src/Constraint/ConstraintInterface.php b/vendor/composer/semver/src/Constraint/ConstraintInterface.php
deleted file mode 100644
index 78c099c..0000000
--- a/vendor/composer/semver/src/Constraint/ConstraintInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver\Constraint;
-
-interface ConstraintInterface
-{
-    /**
-     * @param ConstraintInterface $provider
-     *
-     * @return bool
-     */
-    public function matches(ConstraintInterface $provider);
-
-    /**
-     * @param string $prettyString
-     */
-    public function setPrettyString($prettyString);
-
-    /**
-     * @return string
-     */
-    public function getPrettyString();
-
-    /**
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/vendor/composer/semver/src/Constraint/EmptyConstraint.php b/vendor/composer/semver/src/Constraint/EmptyConstraint.php
deleted file mode 100644
index faba56b..0000000
--- a/vendor/composer/semver/src/Constraint/EmptyConstraint.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver\Constraint;
-
-/**
- * Defines the absence of a constraint.
- */
-class EmptyConstraint implements ConstraintInterface
-{
-    /** @var string */
-    protected $prettyString;
-
-    /**
-     * @param ConstraintInterface $provider
-     *
-     * @return bool
-     */
-    public function matches(ConstraintInterface $provider)
-    {
-        return true;
-    }
-
-    /**
-     * @param $prettyString
-     */
-    public function setPrettyString($prettyString)
-    {
-        $this->prettyString = $prettyString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrettyString()
-    {
-        if ($this->prettyString) {
-            return $this->prettyString;
-        }
-
-        return $this->__toString();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return '[]';
-    }
-}
diff --git a/vendor/composer/semver/src/Constraint/MultiConstraint.php b/vendor/composer/semver/src/Constraint/MultiConstraint.php
deleted file mode 100644
index 0d769b7..0000000
--- a/vendor/composer/semver/src/Constraint/MultiConstraint.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver\Constraint;
-
-/**
- * Defines a conjunctive or disjunctive set of constraints.
- */
-class MultiConstraint implements ConstraintInterface
-{
-    /** @var ConstraintInterface[] */
-    protected $constraints;
-
-    /** @var string */
-    protected $prettyString;
-
-    /** @var bool */
-    protected $conjunctive;
-
-    /**
-     * @param ConstraintInterface[] $constraints A set of constraints
-     * @param bool $conjunctive Whether the constraints should be treated as conjunctive or disjunctive
-     */
-    public function __construct(array $constraints, $conjunctive = true)
-    {
-        $this->constraints = $constraints;
-        $this->conjunctive = $conjunctive;
-    }
-
-    /**
-     * @param ConstraintInterface $provider
-     *
-     * @return bool
-     */
-    public function matches(ConstraintInterface $provider)
-    {
-        if (false === $this->conjunctive) {
-            foreach ($this->constraints as $constraint) {
-                if ($constraint->matches($provider)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        foreach ($this->constraints as $constraint) {
-            if (!$constraint->matches($provider)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $prettyString
-     */
-    public function setPrettyString($prettyString)
-    {
-        $this->prettyString = $prettyString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrettyString()
-    {
-        if ($this->prettyString) {
-            return $this->prettyString;
-        }
-
-        return $this->__toString();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $constraints = array();
-        foreach ($this->constraints as $constraint) {
-            $constraints[] = (string) $constraint;
-        }
-
-        return '[' . implode($this->conjunctive ? ' ' : ' || ', $constraints) . ']';
-    }
-}
diff --git a/vendor/composer/semver/src/Semver.php b/vendor/composer/semver/src/Semver.php
deleted file mode 100644
index 0225bb5..0000000
--- a/vendor/composer/semver/src/Semver.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver;
-
-use Composer\Semver\Constraint\Constraint;
-
-class Semver
-{
-    const SORT_ASC = 1;
-    const SORT_DESC = -1;
-
-    /** @var VersionParser */
-    private static $versionParser;
-
-    /**
-     * Determine if given version satisfies given constraints.
-     *
-     * @param string $version
-     * @param string $constraints
-     *
-     * @return bool
-     */
-    public static function satisfies($version, $constraints)
-    {
-        if (null === self::$versionParser) {
-            self::$versionParser = new VersionParser();
-        }
-
-        $versionParser = self::$versionParser;
-        $provider = new Constraint('==', $versionParser->normalize($version));
-        $constraints = $versionParser->parseConstraints($constraints);
-
-        return $constraints->matches($provider);
-    }
-
-    /**
-     * Return all versions that satisfy given constraints.
-     *
-     * @param array $versions
-     * @param string $constraints
-     *
-     * @return array
-     */
-    public static function satisfiedBy(array $versions, $constraints)
-    {
-        $versions = array_filter($versions, function ($version) use ($constraints) {
-            return Semver::satisfies($version, $constraints);
-        });
-
-        return array_values($versions);
-    }
-
-    /**
-     * Sort given array of versions.
-     *
-     * @param array $versions
-     *
-     * @return array
-     */
-    public static function sort(array $versions)
-    {
-        return self::usort($versions, self::SORT_ASC);
-    }
-
-    /**
-     * Sort given array of versions in reverse.
-     *
-     * @param array $versions
-     *
-     * @return array
-     */
-    public static function rsort(array $versions)
-    {
-        return self::usort($versions, self::SORT_DESC);
-    }
-
-    /**
-     * @param array $versions
-     * @param int $direction
-     *
-     * @return array
-     */
-    private static function usort(array $versions, $direction)
-    {
-        if (null === self::$versionParser) {
-            self::$versionParser = new VersionParser();
-        }
-
-        $versionParser = self::$versionParser;
-        $normalized = array();
-
-        // Normalize outside of usort() scope for minor performance increase.
-        // Creates an array of arrays: [[normalized, key], ...]
-        foreach ($versions as $key => $version) {
-            $normalized[] = array($versionParser->normalize($version), $key);
-        }
-
-        usort($normalized, function (array $left, array $right) use ($direction) {
-            if ($left[0] === $right[0]) {
-                return 0;
-            }
-
-            if (Comparator::lessThan($left[0], $right[0])) {
-                return -$direction;
-            }
-
-            return $direction;
-        });
-
-        // Recreate input array, using the original indexes which are now in sorted order.
-        $sorted = array();
-        foreach ($normalized as $item) {
-            $sorted[] = $versions[$item[1]];
-        }
-
-        return $sorted;
-    }
-}
diff --git a/vendor/composer/semver/src/VersionParser.php b/vendor/composer/semver/src/VersionParser.php
deleted file mode 100644
index 269aee9..0000000
--- a/vendor/composer/semver/src/VersionParser.php
+++ /dev/null
@@ -1,520 +0,0 @@
-<?php
-
-/*
- * This file is part of composer/semver.
- *
- * (c) Composer <https://github.com/composer>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Composer\Semver;
-
-use Composer\Semver\Constraint\ConstraintInterface;
-use Composer\Semver\Constraint\EmptyConstraint;
-use Composer\Semver\Constraint\MultiConstraint;
-use Composer\Semver\Constraint\Constraint;
-
-/**
- * Version parser.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class VersionParser
-{
-    /** @var string */
-    private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
-
-    /** @var array */
-    private static $stabilities = array(
-        'stable', 'RC', 'beta', 'alpha', 'dev',
-    );
-
-    /**
-     * Returns the stability of a version.
-     *
-     * @param string $version
-     *
-     * @return string
-     */
-    public static function parseStability($version)
-    {
-        $version = preg_replace('{#.+$}i', '', $version);
-
-        if ('dev-' === substr($version, 0, 4) || '-dev' === substr($version, -4)) {
-            return 'dev';
-        }
-
-        preg_match('{' . self::$modifierRegex . '$}i', strtolower($version), $match);
-        if (!empty($match[3])) {
-            return 'dev';
-        }
-
-        if (!empty($match[1])) {
-            if ('beta' === $match[1] || 'b' === $match[1]) {
-                return 'beta';
-            }
-            if ('alpha' === $match[1] || 'a' === $match[1]) {
-                return 'alpha';
-            }
-            if ('rc' === $match[1]) {
-                return 'RC';
-            }
-        }
-
-        return 'stable';
-    }
-
-    /**
-     * @param string $stability
-     *
-     * @return string
-     */
-    public static function normalizeStability($stability)
-    {
-        $stability = strtolower($stability);
-
-        return $stability === 'rc' ? 'RC' : $stability;
-    }
-
-    /**
-     * Normalizes a version string to be able to perform comparisons on it.
-     *
-     * @param string $version
-     * @param string $fullVersion optional complete version string to give more context
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return string
-     */
-    public function normalize($version, $fullVersion = null)
-    {
-        $version = trim($version);
-        if (null === $fullVersion) {
-            $fullVersion = $version;
-        }
-
-        // strip off aliasing
-        if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
-            $version = $match[1];
-        }
-
-        // strip off build metadata
-        if (preg_match('{^([^,\s+]+)\+[^\s]+$}', $version, $match)) {
-            $version = $match[1];
-        }
-
-        // match master-like branches
-        if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
-            return '9999999-dev';
-        }
-
-        if ('dev-' === strtolower(substr($version, 0, 4))) {
-            return 'dev-' . substr($version, 4);
-        }
-
-        // match classical versioning
-        if (preg_match('{^v?(\d{1,5})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
-            $version = $matches[1]
-                . (!empty($matches[2]) ? $matches[2] : '.0')
-                . (!empty($matches[3]) ? $matches[3] : '.0')
-                . (!empty($matches[4]) ? $matches[4] : '.0');
-            $index = 5;
-        // match date(time) based versioning
-        } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) {
-            $version = preg_replace('{\D}', '-', $matches[1]);
-            $index = 2;
-        }
-
-        // add version modifiers if a version was matched
-        if (isset($index)) {
-            if (!empty($matches[$index])) {
-                if ('stable' === $matches[$index]) {
-                    return $version;
-                }
-                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
-            }
-
-            if (!empty($matches[$index + 2])) {
-                $version .= '-dev';
-            }
-
-            return $version;
-        }
-
-        // match dev branches
-        if (preg_match('{(.*?)[.-]?dev$}i', $version, $match)) {
-            try {
-                return $this->normalizeBranch($match[1]);
-            } catch (\Exception $e) {
-            }
-        }
-
-        $extraMessage = '';
-        if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
-            $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-        } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
-            $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
-        }
-
-        throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
-    }
-
-    /**
-     * Extract numeric prefix from alias, if it is in numeric format, suitable for version comparison.
-     *
-     * @param string $branch Branch name (e.g. 2.1.x-dev)
-     *
-     * @return string|false Numeric prefix if present (e.g. 2.1.) or false
-     */
-    public function parseNumericAliasPrefix($branch)
-    {
-        if (preg_match('{^(?P<version>(\d+\\.)*\d+)(?:\.x)?-dev$}i', $branch, $matches)) {
-            return $matches['version'] . '.';
-        }
-
-        return false;
-    }
-
-    /**
-     * Normalizes a branch name to be able to perform comparisons on it.
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public function normalizeBranch($name)
-    {
-        $name = trim($name);
-
-        if (in_array($name, array('master', 'trunk', 'default'))) {
-            return $this->normalize($name);
-        }
-
-        if (preg_match('{^v?(\d+)(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?(\.(?:\d+|[xX*]))?$}i', $name, $matches)) {
-            $version = '';
-            for ($i = 1; $i < 5; ++$i) {
-                $version .= isset($matches[$i]) ? str_replace(array('*', 'X'), 'x', $matches[$i]) : '.x';
-            }
-
-            return str_replace('x', '9999999', $version) . '-dev';
-        }
-
-        return 'dev-' . $name;
-    }
-
-    /**
-     * Parses as constraint string into LinkConstraint objects.
-     *
-     * @param string $constraints
-     *
-     * @return ConstraintInterface
-     */
-    public function parseConstraints($constraints)
-    {
-        $prettyConstraint = $constraints;
-
-        if (preg_match('{^([^,\s]*?)@(' . implode('|', self::$stabilities) . ')$}i', $constraints, $match)) {
-            $constraints = empty($match[1]) ? '*' : $match[1];
-        }
-
-        if (preg_match('{^(dev-[^,\s@]+?|[^,\s@]+?\.x-dev)#.+$}i', $constraints, $match)) {
-            $constraints = $match[1];
-        }
-
-        $orConstraints = preg_split('{\s*\|\|?\s*}', trim($constraints));
-        $orGroups = array();
-        foreach ($orConstraints as $constraints) {
-            $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
-            if (count($andConstraints) > 1) {
-                $constraintObjects = array();
-                foreach ($andConstraints as $constraint) {
-                    foreach ($this->parseConstraint($constraint) as $parsedConstraint) {
-                        $constraintObjects[] = $parsedConstraint;
-                    }
-                }
-            } else {
-                $constraintObjects = $this->parseConstraint($andConstraints[0]);
-            }
-
-            if (1 === count($constraintObjects)) {
-                $constraint = $constraintObjects[0];
-            } else {
-                $constraint = new MultiConstraint($constraintObjects);
-            }
-
-            $orGroups[] = $constraint;
-        }
-
-        if (1 === count($orGroups)) {
-            $constraint = $orGroups[0];
-        } else {
-            $constraint = new MultiConstraint($orGroups, false);
-        }
-
-        $constraint->setPrettyString($prettyConstraint);
-
-        return $constraint;
-    }
-
-    /**
-     * @param string $constraint
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return array
-     */
-    private function parseConstraint($constraint)
-    {
-        if (preg_match('{^([^,\s]+?)@(' . implode('|', self::$stabilities) . ')$}i', $constraint, $match)) {
-            $constraint = $match[1];
-            if ($match[2] !== 'stable') {
-                $stabilityModifier = $match[2];
-            }
-        }
-
-        if (preg_match('{^[xX*](\.[xX*])*$}i', $constraint)) {
-            return array(new EmptyConstraint());
-        }
-
-        $versionRegex = 'v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?' . self::$modifierRegex . '(?:\+[^\s]+)?';
-
-        // Tilde Range
-        //
-        // Like wildcard constraints, unsuffixed tilde constraints say that they must be greater than the previous
-        // version, to ensure that unstable instances of the current version are allowed. However, if a stability
-        // suffix is added to the constraint, then a >= match on the current version is used instead.
-        if (preg_match('{^~>?' . $versionRegex . '$}i', $constraint, $matches)) {
-            if (substr($constraint, 0, 2) === '~>') {
-                throw new \UnexpectedValueException(
-                    'Could not parse version constraint ' . $constraint . ': ' .
-                    'Invalid operator "~>", you probably meant to use the "~" operator'
-                );
-            }
-
-            // Work out which position in the version we are operating at
-            if (isset($matches[4]) && '' !== $matches[4]) {
-                $position = 4;
-            } elseif (isset($matches[3]) && '' !== $matches[3]) {
-                $position = 3;
-            } elseif (isset($matches[2]) && '' !== $matches[2]) {
-                $position = 2;
-            } else {
-                $position = 1;
-            }
-
-            // Calculate the stability suffix
-            $stabilitySuffix = '';
-            if (!empty($matches[5])) {
-                $stabilitySuffix .= '-' . $this->expandStability($matches[5]) . (!empty($matches[6]) ? $matches[6] : '');
-            }
-
-            if (!empty($matches[7])) {
-                $stabilitySuffix .= '-dev';
-            }
-
-            if (!$stabilitySuffix) {
-                $stabilitySuffix = '-dev';
-            }
-
-            $lowVersion = $this->manipulateVersionString($matches, $position, 0) . $stabilitySuffix;
-            $lowerBound = new Constraint('>=', $lowVersion);
-
-            // For upper bound, we increment the position of one more significance,
-            // but highPosition = 0 would be illegal
-            $highPosition = max(1, $position - 1);
-            $highVersion = $this->manipulateVersionString($matches, $highPosition, 1) . '-dev';
-            $upperBound = new Constraint('<', $highVersion);
-
-            return array(
-                $lowerBound,
-                $upperBound,
-            );
-        }
-
-        // Caret Range
-        //
-        // Allows changes that do not modify the left-most non-zero digit in the [major, minor, patch] tuple.
-        // In other words, this allows patch and minor updates for versions 1.0.0 and above, patch updates for
-        // versions 0.X >=0.1.0, and no updates for versions 0.0.X
-        if (preg_match('{^\^' . $versionRegex . '($)}i', $constraint, $matches)) {
-            // Work out which position in the version we are operating at
-            if ('0' !== $matches[1] || '' === $matches[2]) {
-                $position = 1;
-            } elseif ('0' !== $matches[2] || '' === $matches[3]) {
-                $position = 2;
-            } else {
-                $position = 3;
-            }
-
-            // Calculate the stability suffix
-            $stabilitySuffix = '';
-            if (empty($matches[5]) && empty($matches[7])) {
-                $stabilitySuffix .= '-dev';
-            }
-
-            $lowVersion = $this->normalize(substr($constraint . $stabilitySuffix, 1));
-            $lowerBound = new Constraint('>=', $lowVersion);
-
-            // For upper bound, we increment the position of one more significance,
-            // but highPosition = 0 would be illegal
-            $highVersion = $this->manipulateVersionString($matches, $position, 1) . '-dev';
-            $upperBound = new Constraint('<', $highVersion);
-
-            return array(
-                $lowerBound,
-                $upperBound,
-            );
-        }
-
-        // X Range
-        //
-        // Any of X, x, or * may be used to "stand in" for one of the numeric values in the [major, minor, patch] tuple.
-        // A partial version range is treated as an X-Range, so the special character is in fact optional.
-        if (preg_match('{^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$}', $constraint, $matches)) {
-            if (isset($matches[3]) && '' !== $matches[3]) {
-                $position = 3;
-            } elseif (isset($matches[2]) && '' !== $matches[2]) {
-                $position = 2;
-            } else {
-                $position = 1;
-            }
-
-            $lowVersion = $this->manipulateVersionString($matches, $position) . '-dev';
-            $highVersion = $this->manipulateVersionString($matches, $position, 1) . '-dev';
-
-            if ($lowVersion === '0.0.0.0-dev') {
-                return array(new Constraint('<', $highVersion));
-            }
-
-            return array(
-                new Constraint('>=', $lowVersion),
-                new Constraint('<', $highVersion),
-            );
-        }
-
-        // Hyphen Range
-        //
-        // Specifies an inclusive set. If a partial version is provided as the first version in the inclusive range,
-        // then the missing pieces are replaced with zeroes. If a partial version is provided as the second version in
-        // the inclusive range, then all versions that start with the supplied parts of the tuple are accepted, but
-        // nothing that would be greater than the provided tuple parts.
-        if (preg_match('{^(?P<from>' . $versionRegex . ') +- +(?P<to>' . $versionRegex . ')($)}i', $constraint, $matches)) {
-            // Calculate the stability suffix
-            $lowStabilitySuffix = '';
-            if (empty($matches[6]) && empty($matches[8])) {
-                $lowStabilitySuffix = '-dev';
-            }
-
-            $lowVersion = $this->normalize($matches['from']);
-            $lowerBound = new Constraint('>=', $lowVersion . $lowStabilitySuffix);
-
-            $empty = function ($x) {
-                return ($x === 0 || $x === '0') ? false : empty($x);
-            };
-
-            if ((!$empty($matches[11]) && !$empty($matches[12])) || !empty($matches[14]) || !empty($matches[16])) {
-                $highVersion = $this->normalize($matches['to']);
-                $upperBound = new Constraint('<=', $highVersion);
-            } else {
-                $highMatch = array('', $matches[10], $matches[11], $matches[12], $matches[13]);
-                $highVersion = $this->manipulateVersionString($highMatch, $empty($matches[11]) ? 1 : 2, 1) . '-dev';
-                $upperBound = new Constraint('<', $highVersion);
-            }
-
-            return array(
-                $lowerBound,
-                $upperBound,
-            );
-        }
-
-        // Basic Comparators
-        if (preg_match('{^(<>|!=|>=?|<=?|==?)?\s*(.*)}', $constraint, $matches)) {
-            try {
-                $version = $this->normalize($matches[2]);
-
-                if (!empty($stabilityModifier) && $this->parseStability($version) === 'stable') {
-                    $version .= '-' . $stabilityModifier;
-                } elseif ('<' === $matches[1] || '>=' === $matches[1]) {
-                    if (!preg_match('/-' . self::$modifierRegex . '$/', strtolower($matches[2]))) {
-                        if (substr($matches[2], 0, 4) !== 'dev-') {
-                            $version .= '-dev';
-                        }
-                    }
-                }
-
-                return array(new Constraint($matches[1] ?: '=', $version));
-            } catch (\Exception $e) {
-            }
-        }
-
-        $message = 'Could not parse version constraint ' . $constraint;
-        if (isset($e)) {
-            $message .= ': ' . $e->getMessage();
-        }
-
-        throw new \UnexpectedValueException($message);
-    }
-
-    /**
-     * Increment, decrement, or simply pad a version number.
-     *
-     * Support function for {@link parseConstraint()}
-     *
-     * @param array $matches Array with version parts in array indexes 1,2,3,4
-     * @param int $position 1,2,3,4 - which segment of the version to increment/decrement
-     * @param int $increment
-     * @param string $pad The string to pad version parts after $position
-     *
-     * @return string The new version
-     */
-    private function manipulateVersionString($matches, $position, $increment = 0, $pad = '0')
-    {
-        for ($i = 4; $i > 0; --$i) {
-            if ($i > $position) {
-                $matches[$i] = $pad;
-            } elseif ($i === $position && $increment) {
-                $matches[$i] += $increment;
-                // If $matches[$i] was 0, carry the decrement
-                if ($matches[$i] < 0) {
-                    $matches[$i] = $pad;
-                    --$position;
-
-                    // Return null on a carry overflow
-                    if ($i === 1) {
-                        return;
-                    }
-                }
-            }
-        }
-
-        return $matches[1] . '.' . $matches[2] . '.' . $matches[3] . '.' . $matches[4];
-    }
-
-    /**
-     * Expand shorthand stability string to long version.
-     *
-     * @param string $stability
-     *
-     * @return string
-     */
-    private function expandStability($stability)
-    {
-        $stability = strtolower($stability);
-
-        switch ($stability) {
-            case 'a':
-                return 'alpha';
-            case 'b':
-                return 'beta';
-            case 'p':
-            case 'pl':
-                return 'patch';
-            case 'rc':
-                return 'RC';
-            default:
-                return $stability;
-        }
-    }
-}
diff --git a/vendor/doctrine/annotations/LICENSE b/vendor/doctrine/annotations/LICENSE
deleted file mode 100644
index 5e781fc..0000000
--- a/vendor/doctrine/annotations/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2013 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/vendor/doctrine/annotations/README.md b/vendor/doctrine/annotations/README.md
deleted file mode 100644
index ebb30e0..0000000
--- a/vendor/doctrine/annotations/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Doctrine Annotations
-
-[![Build Status](https://travis-ci.org/doctrine/annotations.png?branch=master)](https://travis-ci.org/doctrine/annotations)
-
-Docblock Annotations Parser library (extracted from [Doctrine Common](https://github.com/doctrine/common)).
-
-## Changelog
-
-### v1.2.0
-
- * HHVM support
- * Allowing dangling comma in annotations
- * Excluded annotations are no longer autoloaded
- * Importing namespaces also in traits
- * Added support for `::class` 5.5-style constant, works also in 5.3 and 5.4
-
-### v1.1
-
- * Add Exception when ZendOptimizer+ or Opcache is configured to drop comments
diff --git a/vendor/doctrine/annotations/composer.json b/vendor/doctrine/annotations/composer.json
deleted file mode 100644
index 1c65f6c..0000000
--- a/vendor/doctrine/annotations/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name": "doctrine/annotations",
-    "type": "library",
-    "description": "Docblock Annotations Parser",
-    "keywords": ["annotations", "docblock", "parser"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.3.2",
-        "doctrine/lexer": "1.*"
-    },
-    "require-dev": {
-        "doctrine/cache": "1.*",
-        "phpunit/phpunit": "4.*"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\Annotations\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
deleted file mode 100644
index a79a0f8..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Annotations;
-
-/**
- * Annotations class.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class Annotation
-{
-    /**
-     * Value property. Common among all derived classes.
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data Key-value for properties to be defined in this class.
-     */
-    public final function __construct(array $data)
-    {
-        foreach ($data as $key => $value) {
-            $this->$key = $value;
-        }
-    }
-
-    /**
-     * Error handler for unknown property accessor in Annotation class.
-     *
-     * @param string $name Unknown property name.
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __get($name)
-    {
-        throw new \BadMethodCallException(
-            sprintf("Unknown property '%s' on annotation '%s'.", $name, get_class($this))
-        );
-    }
-
-    /**
-     * Error handler for unknown property mutator in Annotation class.
-     *
-     * @param string $name  Unknown property name.
-     * @param mixed  $value Property value.
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __set($name, $value)
-    {
-        throw new \BadMethodCallException(
-            sprintf("Unknown property '%s' on annotation '%s'.", $name, get_class($this))
-        );
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
deleted file mode 100644
index dbef6df..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser
- * to check the attribute type during the parsing process.
- *
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- *
- * @Annotation
- */
-final class Attribute
-{
-    /**
-     * @var string
-     */
-    public $name;
-
-    /**
-     * @var string
-     */
-    public $type;
-
-    /**
-     * @var boolean
-     */
-    public $required = false;
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
deleted file mode 100644
index 53134e3..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser
- * to check the types of all declared attributes during the parsing process.
- *
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- *
- * @Annotation
- */
-final class Attributes
-{
-    /**
-     * @var array<Doctrine\Common\Annotations\Annotation\Attribute>
-     */
-    public $value;
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
deleted file mode 100644
index e122a75..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser
- * to check the available values during the parsing process.
- *
- * @since  2.4
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- *
- * @Annotation
- * @Attributes({
- *    @Attribute("value",   required = true,  type = "array"),
- *    @Attribute("literal", required = false, type = "array")
- * })
- */
-final class Enum
-{
-    /**
-     * @var array
-     */
-    public $value;
-
-    /**
-     * Literal target declaration.
-     *
-     * @var array
-     */
-    public $literal;
-
-    /**
-     * Annotation constructor.
-     *
-     * @param array $values
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $values)
-    {
-        if ( ! isset($values['literal'])) {
-            $values['literal'] = array();
-        }
-
-        foreach ($values['value'] as $var) {
-            if( ! is_scalar($var)) {
-                throw new \InvalidArgumentException(sprintf(
-                    '@Enum supports only scalar values "%s" given.',
-                    is_object($var) ? get_class($var) : gettype($var)
-                ));
-            }
-        }
-
-        foreach ($values['literal'] as $key => $var) {
-            if( ! in_array($key, $values['value'])) {
-                throw new \InvalidArgumentException(sprintf(
-                    'Undefined enumerator value "%s" for literal "%s".',
-                    $key , $var
-                ));
-            }
-        }
-
-        $this->value    = $values['value'];
-        $this->literal  = $values['literal'];
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
deleted file mode 100644
index 175226a..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser to ignore specific
- * annotations during the parsing process.
- *
- * @Annotation
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-final class IgnoreAnnotation
-{
-    /**
-     * @var array
-     */
-    public $names;
-
-    /**
-     * Constructor.
-     *
-     * @param array $values
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct(array $values)
-    {
-        if (is_string($values['value'])) {
-            $values['value'] = array($values['value']);
-        }
-        if (!is_array($values['value'])) {
-            throw new \RuntimeException(sprintf('@IgnoreAnnotation expects either a string name, or an array of strings, but got %s.', json_encode($values['value'])));
-        }
-
-        $this->names = $values['value'];
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
deleted file mode 100644
index d67f9606..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser
- * to check if that attribute is required during the parsing process.
- *
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- *
- * @Annotation
- */
-final class Required
-{
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
deleted file mode 100644
index f6c5445..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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\Annotations\Annotation;
-
-/**
- * Annotation that can be used to signal to the parser
- * to check the annotation target during the parsing process.
- *
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- *
- * @Annotation
- */
-final class Target
-{
-    const TARGET_CLASS              = 1;
-    const TARGET_METHOD             = 2;
-    const TARGET_PROPERTY           = 4;
-    const TARGET_ANNOTATION         = 8;
-    const TARGET_ALL                = 15;
-
-    /**
-     * @var array
-     */
-    private static $map = array(
-        'ALL'        => self::TARGET_ALL,
-        'CLASS'      => self::TARGET_CLASS,
-        'METHOD'     => self::TARGET_METHOD,
-        'PROPERTY'   => self::TARGET_PROPERTY,
-        'ANNOTATION' => self::TARGET_ANNOTATION,
-    );
-
-    /**
-     * @var array
-     */
-    public $value;
-
-    /**
-     * Targets as bitmask.
-     *
-     * @var integer
-     */
-    public $targets;
-
-    /**
-     * Literal target declaration.
-     *
-     * @var integer
-     */
-    public $literal;
-
-    /**
-     * Annotation constructor.
-     *
-     * @param array $values
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $values)
-    {
-        if (!isset($values['value'])){
-            $values['value'] = null;
-        }
-        if (is_string($values['value'])){
-            $values['value'] = array($values['value']);
-        }
-        if (!is_array($values['value'])){
-            throw new \InvalidArgumentException(
-                sprintf('@Target expects either a string value, or an array of strings, "%s" given.',
-                    is_object($values['value']) ? get_class($values['value']) : gettype($values['value'])
-                )
-            );
-        }
-
-        $bitmask = 0;
-        foreach ($values['value'] as $literal) {
-            if(!isset(self::$map[$literal])){
-                throw new \InvalidArgumentException(
-                    sprintf('Invalid Target "%s". Available targets: [%s]',
-                            $literal,  implode(', ', array_keys(self::$map)))
-                );
-            }
-            $bitmask |= self::$map[$literal];
-        }
-
-        $this->targets  = $bitmask;
-        $this->value    = $values['value'];
-        $this->literal  = implode(', ', $this->value);
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
deleted file mode 100644
index d06fe66..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?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\Annotations;
-
-/**
- * Description of AnnotationException
- *
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class AnnotationException extends \Exception
-{
-    /**
-     * Creates a new AnnotationException describing a Syntax error.
-     *
-     * @param string $message Exception message
-     *
-     * @return AnnotationException
-     */
-    public static function syntaxError($message)
-    {
-        return new self('[Syntax Error] ' . $message);
-    }
-
-    /**
-     * Creates a new AnnotationException describing a Semantical error.
-     *
-     * @param string $message Exception message
-     *
-     * @return AnnotationException
-     */
-    public static function semanticalError($message)
-    {
-        return new self('[Semantical Error] ' . $message);
-    }
-
-    /**
-     * Creates a new AnnotationException describing an error which occurred during
-     * the creation of the annotation.
-     *
-     * @since 2.2
-     *
-     * @param string $message
-     *
-     * @return AnnotationException
-     */
-    public static function creationError($message)
-    {
-        return new self('[Creation Error] ' . $message);
-    }
-
-    /**
-     * Creates a new AnnotationException describing a type error.
-     *
-     * @since 1.1
-     *
-     * @param string $message
-     *
-     * @return AnnotationException
-     */
-    public static function typeError($message)
-    {
-        return new self('[Type Error] ' . $message);
-    }
-
-    /**
-     * Creates a new AnnotationException describing a constant semantical error.
-     *
-     * @since 2.3
-     *
-     * @param string $identifier
-     * @param string $context
-     *
-     * @return AnnotationException
-     */
-    public static function semanticalErrorConstants($identifier, $context = null)
-    {
-        return self::semanticalError(sprintf(
-            "Couldn't find constant %s%s.",
-            $identifier,
-            $context ? ', ' . $context : ''
-        ));
-    }
-
-    /**
-     * Creates a new AnnotationException describing an type error of an attribute.
-     *
-     * @since 2.2
-     *
-     * @param string $attributeName
-     * @param string $annotationName
-     * @param string $context
-     * @param string $expected
-     * @param mixed  $actual
-     *
-     * @return AnnotationException
-     */
-    public static function attributeTypeError($attributeName, $annotationName, $context, $expected, $actual)
-    {
-        return self::typeError(sprintf(
-            'Attribute "%s" of @%s declared on %s expects %s, but got %s.',
-            $attributeName,
-            $annotationName,
-            $context,
-            $expected,
-            is_object($actual) ? 'an instance of ' . get_class($actual) : gettype($actual)
-        ));
-    }
-
-    /**
-     * Creates a new AnnotationException describing an required error of an attribute.
-     *
-     * @since 2.2
-     *
-     * @param string $attributeName
-     * @param string $annotationName
-     * @param string $context
-     * @param string $expected
-     *
-     * @return AnnotationException
-     */
-    public static function requiredError($attributeName, $annotationName, $context, $expected)
-    {
-        return self::typeError(sprintf(
-            'Attribute "%s" of @%s declared on %s expects %s. This value should not be null.',
-            $attributeName,
-            $annotationName,
-            $context,
-            $expected
-        ));
-    }
-
-    /**
-     * Creates a new AnnotationException describing a invalid enummerator.
-     *
-     * @since 2.4
-     *
-     * @param string $attributeName
-     * @param string $annotationName
-     * @param string $context
-     * @param array  $available
-     * @param mixed  $given
-     *
-     * @return AnnotationException
-     */
-    public static function enumeratorError($attributeName, $annotationName, $context, $available, $given)
-    {
-        return new self(sprintf(
-            '[Enum Error] Attribute "%s" of @%s declared on %s accept only [%s], but got %s.',
-            $attributeName, 
-            $annotationName,
-            $context,
-            implode(', ', $available),
-            is_object($given) ? get_class($given) : $given
-        ));
-    }
-
-    /**
-     * @return AnnotationException
-     */
-    public static function optimizerPlusSaveComments()
-    {
-        return new self(
-            "You have to enable opcache.save_comments=1 or zend_optimizerplus.save_comments=1."
-        );
-    }
-
-    /**
-     * @return AnnotationException
-     */
-    public static function optimizerPlusLoadComments()
-    {
-        return new self(
-            "You have to enable opcache.load_comments=1 or zend_optimizerplus.load_comments=1."
-        );
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
deleted file mode 100644
index 4ebd1fb..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?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\Annotations;
-
-use Doctrine\Common\Annotations\Annotation\IgnoreAnnotation;
-use Doctrine\Common\Annotations\Annotation\Target;
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionProperty;
-
-/**
- * A reader for docblock annotations.
- *
- * @author  Benjamin Eberlei <kontakt@beberlei.de>
- * @author  Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author  Jonathan Wage <jonwage@gmail.com>
- * @author  Roman Borschel <roman@code-factory.org>
- * @author  Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class AnnotationReader implements Reader
-{
-    /**
-     * Global map for imports.
-     *
-     * @var array
-     */
-    private static $globalImports = array(
-        'ignoreannotation' => 'Doctrine\Common\Annotations\Annotation\IgnoreAnnotation',
-    );
-
-    /**
-     * A list with annotations that are not causing exceptions when not resolved to an annotation class.
-     *
-     * The names are case sensitive.
-     *
-     * @var array
-     */
-    private static $globalIgnoredNames = array(
-        // Annotation tags
-        'Annotation' => true, 'Attribute' => true, 'Attributes' => true,
-        /* Can we enable this? 'Enum' => true, */
-        'Required' => true,
-        'Target' => true,
-        // Widely used tags (but not existent in phpdoc)
-        'fix' => true , 'fixme' => true,
-        'override' => true,
-        // PHPDocumentor 1 tags
-        'abstract'=> true, 'access'=> true,
-        'code' => true,
-        'deprec'=> true,
-        'endcode' => true, 'exception'=> true,
-        'final'=> true,
-        'ingroup' => true, 'inheritdoc'=> true, 'inheritDoc'=> true,
-        'magic' => true,
-        'name'=> true,
-        'toc' => true, 'tutorial'=> true,
-        'private' => true,
-        'static'=> true, 'staticvar'=> true, 'staticVar'=> true,
-        'throw' => true,
-        // PHPDocumentor 2 tags.
-        'api' => true, 'author'=> true,
-        'category'=> true, 'copyright'=> true,
-        'deprecated'=> true,
-        'example'=> true,
-        'filesource'=> true,
-        'global'=> true,
-        'ignore'=> true, /* Can we enable this? 'index' => true, */ 'internal'=> true,
-        'license'=> true, 'link'=> true,
-        'method' => true,
-        'package'=> true, 'param'=> true, 'property' => true, 'property-read' => true, 'property-write' => true,
-        'return'=> true,
-        'see'=> true, 'since'=> true, 'source' => true, 'subpackage'=> true,
-        'throws'=> true, 'todo'=> true, 'TODO'=> true,
-        'usedby'=> true, 'uses' => true,
-        'var'=> true, 'version'=> true,
-        // PHPUnit tags
-        'codeCoverageIgnore' => true, 'codeCoverageIgnoreStart' => true, 'codeCoverageIgnoreEnd' => true,
-        // PHPCheckStyle
-        'SuppressWarnings' => true,
-        // PHPStorm
-        'noinspection' => true,
-        // PEAR
-        'package_version' => true,
-        // PlantUML
-        'startuml' => true, 'enduml' => true,
-    );
-
-    /**
-     * Add a new annotation to the globally ignored annotation names with regard to exception handling.
-     *
-     * @param string $name
-     */
-    static public function addGlobalIgnoredName($name)
-    {
-        self::$globalIgnoredNames[$name] = true;
-    }
-
-    /**
-     * Annotations parser.
-     *
-     * @var \Doctrine\Common\Annotations\DocParser
-     */
-    private $parser;
-
-    /**
-     * Annotations parser used to collect parsing metadata.
-     *
-     * @var \Doctrine\Common\Annotations\DocParser
-     */
-    private $preParser;
-
-    /**
-     * PHP parser used to collect imports.
-     *
-     * @var \Doctrine\Common\Annotations\PhpParser
-     */
-    private $phpParser;
-
-    /**
-     * In-memory cache mechanism to store imported annotations per class.
-     *
-     * @var array
-     */
-    private $imports = array();
-
-    /**
-     * In-memory cache mechanism to store ignored annotations per class.
-     *
-     * @var array
-     */
-    private $ignoredAnnotationNames = array();
-
-    /**
-     * Constructor.
-     *
-     * Initializes a new AnnotationReader.
-     */
-    public function __construct()
-    {
-        if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.save_comments') === "0" || ini_get('opcache.save_comments') === "0")) {
-            throw AnnotationException::optimizerPlusSaveComments();
-        }
-
-        if (extension_loaded('Zend OPcache') && ini_get('opcache.save_comments') == 0) {
-            throw AnnotationException::optimizerPlusSaveComments();
-        }
-
-        if (PHP_VERSION_ID < 70000) {
-            if (extension_loaded('Zend Optimizer+') && (ini_get('zend_optimizerplus.load_comments') === "0" || ini_get('opcache.load_comments') === "0")) {
-                throw AnnotationException::optimizerPlusLoadComments();
-            }
-
-            if (extension_loaded('Zend OPcache') && ini_get('opcache.load_comments') == 0) {
-                throw AnnotationException::optimizerPlusLoadComments();
-            }
-        }
-
-        AnnotationRegistry::registerFile(__DIR__ . '/Annotation/IgnoreAnnotation.php');
-
-        $this->parser    = new DocParser;
-        $this->preParser = new DocParser;
-
-        $this->preParser->setImports(self::$globalImports);
-        $this->preParser->setIgnoreNotImportedAnnotations(true);
-
-        $this->phpParser = new PhpParser;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotations(ReflectionClass $class)
-    {
-        $this->parser->setTarget(Target::TARGET_CLASS);
-        $this->parser->setImports($this->getClassImports($class));
-        $this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
-
-        return $this->parser->parse($class->getDocComment(), 'class ' . $class->getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotation(ReflectionClass $class, $annotationName)
-    {
-        $annotations = $this->getClassAnnotations($class);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotations(ReflectionProperty $property)
-    {
-        $class   = $property->getDeclaringClass();
-        $context = 'property ' . $class->getName() . "::\$" . $property->getName();
-
-        $this->parser->setTarget(Target::TARGET_PROPERTY);
-        $this->parser->setImports($this->getPropertyImports($property));
-        $this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
-
-        return $this->parser->parse($property->getDocComment(), $context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotation(ReflectionProperty $property, $annotationName)
-    {
-        $annotations = $this->getPropertyAnnotations($property);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotations(ReflectionMethod $method)
-    {
-        $class   = $method->getDeclaringClass();
-        $context = 'method ' . $class->getName() . '::' . $method->getName() . '()';
-
-        $this->parser->setTarget(Target::TARGET_METHOD);
-        $this->parser->setImports($this->getMethodImports($method));
-        $this->parser->setIgnoredAnnotationNames($this->getIgnoredAnnotationNames($class));
-
-        return $this->parser->parse($method->getDocComment(), $context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotation(ReflectionMethod $method, $annotationName)
-    {
-        $annotations = $this->getMethodAnnotations($method);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the ignored annotations for the given class.
-     *
-     * @param \ReflectionClass $class
-     *
-     * @return array
-     */
-    private function getIgnoredAnnotationNames(ReflectionClass $class)
-    {
-        if (isset($this->ignoredAnnotationNames[$name = $class->getName()])) {
-            return $this->ignoredAnnotationNames[$name];
-        }
-
-        $this->collectParsingMetadata($class);
-
-        return $this->ignoredAnnotationNames[$name];
-    }
-
-    /**
-     * Retrieves imports.
-     *
-     * @param \ReflectionClass $class
-     *
-     * @return array
-     */
-    private function getClassImports(ReflectionClass $class)
-    {
-        if (isset($this->imports[$name = $class->getName()])) {
-            return $this->imports[$name];
-        }
-
-        $this->collectParsingMetadata($class);
-
-        return $this->imports[$name];
-    }
-
-    /**
-     * Retrieves imports for methods.
-     *
-     * @param \ReflectionMethod $method
-     *
-     * @return array
-     */
-    private function getMethodImports(ReflectionMethod $method)
-    {
-        $class = $method->getDeclaringClass();
-        $classImports = $this->getClassImports($class);
-        if (!method_exists($class, 'getTraits')) {
-            return $classImports;
-        }
-
-        $traitImports = array();
-
-        foreach ($class->getTraits() as $trait) {
-            if ($trait->hasMethod($method->getName())
-                && $trait->getFileName() === $method->getFileName()
-            ) {
-                $traitImports = array_merge($traitImports, $this->phpParser->parseClass($trait));
-            }
-        }
-
-        return array_merge($classImports, $traitImports);
-    }
-
-    /**
-     * Retrieves imports for properties.
-     *
-     * @param \ReflectionProperty $property
-     *
-     * @return array
-     */
-    private function getPropertyImports(ReflectionProperty $property)
-    {
-        $class = $property->getDeclaringClass();
-        $classImports = $this->getClassImports($class);
-        if (!method_exists($class, 'getTraits')) {
-            return $classImports;
-        }
-
-        $traitImports = array();
-
-        foreach ($class->getTraits() as $trait) {
-            if ($trait->hasProperty($property->getName())) {
-                $traitImports = array_merge($traitImports, $this->phpParser->parseClass($trait));
-            }
-        }
-
-        return array_merge($classImports, $traitImports);
-    }
-
-    /**
-     * Collects parsing metadata for a given class.
-     *
-     * @param \ReflectionClass $class
-     */
-    private function collectParsingMetadata(ReflectionClass $class)
-    {
-        $ignoredAnnotationNames = self::$globalIgnoredNames;
-        $annotations            = $this->preParser->parse($class->getDocComment(), 'class ' . $class->name);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof IgnoreAnnotation) {
-                foreach ($annotation->names AS $annot) {
-                    $ignoredAnnotationNames[$annot] = true;
-                }
-            }
-        }
-
-        $name = $class->getName();
-
-        $this->imports[$name] = array_merge(
-            self::$globalImports,
-            $this->phpParser->parseClass($class),
-            array('__NAMESPACE__' => $class->getNamespaceName())
-        );
-
-        $this->ignoredAnnotationNames[$name] = $ignoredAnnotationNames;
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
deleted file mode 100644
index 13ceb63..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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\Annotations;
-
-/**
- * AnnotationRegistry.
- */
-final class AnnotationRegistry
-{
-    /**
-     * A map of namespaces to use for autoloading purposes based on a PSR-0 convention.
-     *
-     * Contains the namespace as key and an array of directories as value. If the value is NULL
-     * the include path is used for checking for the corresponding file.
-     *
-     * This autoloading mechanism does not utilize the PHP autoloading but implements autoloading on its own.
-     *
-     * @var array
-     */
-    static private $autoloadNamespaces = array();
-
-    /**
-     * A map of autoloader callables.
-     *
-     * @var array
-     */
-    static private $loaders = array();
-
-    /**
-     * @return void
-     */
-    static public function reset()
-    {
-        self::$autoloadNamespaces = array();
-        self::$loaders = array();
-    }
-
-    /**
-     * Registers file.
-     *
-     * @param string $file
-     *
-     * @return void
-     */
-    static public function registerFile($file)
-    {
-        require_once $file;
-    }
-
-    /**
-     * Adds a namespace with one or many directories to look for files or null for the include path.
-     *
-     * Loading of this namespaces will be done with a PSR-0 namespace loading algorithm.
-     *
-     * @param string            $namespace
-     * @param string|array|null $dirs
-     *
-     * @return void
-     */
-    static public function registerAutoloadNamespace($namespace, $dirs = null)
-    {
-        self::$autoloadNamespaces[$namespace] = $dirs;
-    }
-
-    /**
-     * Registers multiple namespaces.
-     *
-     * Loading of this namespaces will be done with a PSR-0 namespace loading algorithm.
-     *
-     * @param array $namespaces
-     *
-     * @return void
-     */
-    static public function registerAutoloadNamespaces(array $namespaces)
-    {
-        self::$autoloadNamespaces = array_merge(self::$autoloadNamespaces, $namespaces);
-    }
-
-    /**
-     * Registers an autoloading callable for annotations, much like spl_autoload_register().
-     *
-     * NOTE: These class loaders HAVE to be silent when a class was not found!
-     * IMPORTANT: Loaders have to return true if they loaded a class that could contain the searched annotation class.
-     *
-     * @param callable $callable
-     *
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     */
-    static public function registerLoader($callable)
-    {
-        if (!is_callable($callable)) {
-            throw new \InvalidArgumentException("A callable is expected in AnnotationRegistry::registerLoader().");
-        }
-        self::$loaders[] = $callable;
-    }
-
-    /**
-     * Autoloads an annotation class silently.
-     *
-     * @param string $class
-     *
-     * @return boolean
-     */
-    static public function loadAnnotationClass($class)
-    {
-        foreach (self::$autoloadNamespaces AS $namespace => $dirs) {
-            if (strpos($class, $namespace) === 0) {
-                $file = str_replace("\\", DIRECTORY_SEPARATOR, $class) . ".php";
-                if ($dirs === null) {
-                    if ($path = stream_resolve_include_path($file)) {
-                        require $path;
-                        return true;
-                    }
-                } else {
-                    foreach((array)$dirs AS $dir) {
-                        if (is_file($dir . DIRECTORY_SEPARATOR . $file)) {
-                            require $dir . DIRECTORY_SEPARATOR . $file;
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        foreach (self::$loaders AS $loader) {
-            if (call_user_func($loader, $class) === true) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
deleted file mode 100644
index e6dc593..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?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\Annotations;
-
-use Doctrine\Common\Cache\Cache;
-
-/**
- * A cache aware annotation reader.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-final class CachedReader implements Reader
-{
-    /**
-     * @var string
-     */
-    private static $CACHE_SALT = '@[Annot]';
-
-    /**
-     * @var Reader
-     */
-    private $delegate;
-
-    /**
-     * @var Cache
-     */
-    private $cache;
-
-    /**
-     * @var boolean
-     */
-    private $debug;
-
-    /**
-     * @var array
-     */
-    private $loadedAnnotations = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Reader $reader
-     * @param Cache  $cache
-     * @param bool   $debug
-     */
-    public function __construct(Reader $reader, Cache $cache, $debug = false)
-    {
-        $this->delegate = $reader;
-        $this->cache = $cache;
-        $this->debug = (boolean) $debug;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotations(\ReflectionClass $class)
-    {
-        $cacheKey = $class->getName();
-
-        if (isset($this->loadedAnnotations[$cacheKey])) {
-            return $this->loadedAnnotations[$cacheKey];
-        }
-
-        if (false === ($annots = $this->fetchFromCache($cacheKey, $class))) {
-            $annots = $this->delegate->getClassAnnotations($class);
-            $this->saveToCache($cacheKey, $annots);
-        }
-
-        return $this->loadedAnnotations[$cacheKey] = $annots;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotation(\ReflectionClass $class, $annotationName)
-    {
-        foreach ($this->getClassAnnotations($class) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotations(\ReflectionProperty $property)
-    {
-        $class = $property->getDeclaringClass();
-        $cacheKey = $class->getName().'$'.$property->getName();
-
-        if (isset($this->loadedAnnotations[$cacheKey])) {
-            return $this->loadedAnnotations[$cacheKey];
-        }
-
-        if (false === ($annots = $this->fetchFromCache($cacheKey, $class))) {
-            $annots = $this->delegate->getPropertyAnnotations($property);
-            $this->saveToCache($cacheKey, $annots);
-        }
-
-        return $this->loadedAnnotations[$cacheKey] = $annots;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotation(\ReflectionProperty $property, $annotationName)
-    {
-        foreach ($this->getPropertyAnnotations($property) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotations(\ReflectionMethod $method)
-    {
-        $class = $method->getDeclaringClass();
-        $cacheKey = $class->getName().'#'.$method->getName();
-
-        if (isset($this->loadedAnnotations[$cacheKey])) {
-            return $this->loadedAnnotations[$cacheKey];
-        }
-
-        if (false === ($annots = $this->fetchFromCache($cacheKey, $class))) {
-            $annots = $this->delegate->getMethodAnnotations($method);
-            $this->saveToCache($cacheKey, $annots);
-        }
-
-        return $this->loadedAnnotations[$cacheKey] = $annots;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotation(\ReflectionMethod $method, $annotationName)
-    {
-        foreach ($this->getMethodAnnotations($method) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Clears loaded annotations.
-     *
-     * @return void
-     */
-    public function clearLoadedAnnotations()
-    {
-        $this->loadedAnnotations = array();
-    }
-
-    /**
-     * Fetches a value from the cache.
-     *
-     * @param string           $rawCacheKey The cache key.
-     * @param \ReflectionClass $class       The related class.
-     *
-     * @return mixed The cached value or false when the value is not in cache.
-     */
-    private function fetchFromCache($rawCacheKey, \ReflectionClass $class)
-    {
-        $cacheKey = $rawCacheKey . self::$CACHE_SALT;
-        if (($data = $this->cache->fetch($cacheKey)) !== false) {
-            if (!$this->debug || $this->isCacheFresh($cacheKey, $class)) {
-                return $data;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Saves a value to the cache.
-     *
-     * @param string $rawCacheKey The cache key.
-     * @param mixed  $value       The value.
-     *
-     * @return void
-     */
-    private function saveToCache($rawCacheKey, $value)
-    {
-        $cacheKey = $rawCacheKey . self::$CACHE_SALT;
-        $this->cache->save($cacheKey, $value);
-        if ($this->debug) {
-            $this->cache->save('[C]'.$cacheKey, time());
-        }
-    }
-
-    /**
-     * Checks if the cache is fresh.
-     *
-     * @param string           $cacheKey
-     * @param \ReflectionClass $class
-     *
-     * @return boolean
-     */
-    private function isCacheFresh($cacheKey, \ReflectionClass $class)
-    {
-        if (false === $filename = $class->getFilename()) {
-            return true;
-        }
-
-        return $this->cache->fetch('[C]'.$cacheKey) >= filemtime($filename);
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
deleted file mode 100644
index d864540..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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\Annotations;
-
-use Doctrine\Common\Lexer\AbstractLexer;
-
-/**
- * Simple lexer for docblock annotations.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-final class DocLexer extends AbstractLexer
-{
-    const T_NONE                = 1;
-    const T_INTEGER             = 2;
-    const T_STRING              = 3;
-    const T_FLOAT               = 4;
-
-    // All tokens that are also identifiers should be >= 100
-    const T_IDENTIFIER          = 100;
-    const T_AT                  = 101;
-    const T_CLOSE_CURLY_BRACES  = 102;
-    const T_CLOSE_PARENTHESIS   = 103;
-    const T_COMMA               = 104;
-    const T_EQUALS              = 105;
-    const T_FALSE               = 106;
-    const T_NAMESPACE_SEPARATOR = 107;
-    const T_OPEN_CURLY_BRACES   = 108;
-    const T_OPEN_PARENTHESIS    = 109;
-    const T_TRUE                = 110;
-    const T_NULL                = 111;
-    const T_COLON               = 112;
-
-    /**
-     * @var array
-     */
-    protected $noCase = array(
-        '@'  => self::T_AT,
-        ','  => self::T_COMMA,
-        '('  => self::T_OPEN_PARENTHESIS,
-        ')'  => self::T_CLOSE_PARENTHESIS,
-        '{'  => self::T_OPEN_CURLY_BRACES,
-        '}'  => self::T_CLOSE_CURLY_BRACES,
-        '='  => self::T_EQUALS,
-        ':'  => self::T_COLON,
-        '\\' => self::T_NAMESPACE_SEPARATOR
-    );
-
-    /**
-     * @var array
-     */
-    protected $withCase = array(
-        'true'  => self::T_TRUE,
-        'false' => self::T_FALSE,
-        'null'  => self::T_NULL
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getCatchablePatterns()
-    {
-        return array(
-            '[a-z_\\\][a-z0-9_\:\\\]*[a-z_][a-z0-9_]*',
-            '(?:[+-]?[0-9]+(?:[\.][0-9]+)*)(?:[eE][+-]?[0-9]+)?',
-            '"(?:""|[^"])*+"',
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getNonCatchablePatterns()
-    {
-        return array('\s+', '\*+', '(.)');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getType(&$value)
-    {
-        $type = self::T_NONE;
-
-        if ($value[0] === '"') {
-            $value = str_replace('""', '"', substr($value, 1, strlen($value) - 2));
-
-            return self::T_STRING;
-        }
-
-        if (isset($this->noCase[$value])) {
-            return $this->noCase[$value];
-        }
-
-        if ($value[0] === '_' || $value[0] === '\\' || ctype_alpha($value[0])) {
-            return self::T_IDENTIFIER;
-        }
-
-        $lowerValue = strtolower($value);
-
-        if (isset($this->withCase[$lowerValue])) {
-            return $this->withCase[$lowerValue];
-        }
-
-        // Checking numeric value
-        if (is_numeric($value)) {
-            return (strpos($value, '.') !== false || stripos($value, 'e') !== false)
-                ? self::T_FLOAT : self::T_INTEGER;
-        }
-
-        return $type;
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
deleted file mode 100644
index db66846..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php
+++ /dev/null
@@ -1,1138 +0,0 @@
-<?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\Annotations;
-
-use Doctrine\Common\Annotations\Annotation\Attribute;
-use ReflectionClass;
-use Doctrine\Common\Annotations\Annotation\Enum;
-use Doctrine\Common\Annotations\Annotation\Target;
-use Doctrine\Common\Annotations\Annotation\Attributes;
-
-/**
- * A parser for docblock annotations.
- *
- * It is strongly discouraged to change the default annotation parsing process.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-final class DocParser
-{
-    /**
-     * An array of all valid tokens for a class name.
-     *
-     * @var array
-     */
-    private static $classIdentifiers = array(
-        DocLexer::T_IDENTIFIER,
-        DocLexer::T_TRUE,
-        DocLexer::T_FALSE,
-        DocLexer::T_NULL
-    );
-
-    /**
-     * The lexer.
-     *
-     * @var \Doctrine\Common\Annotations\DocLexer
-     */
-    private $lexer;
-
-    /**
-     * Current target context.
-     *
-     * @var string
-     */
-    private $target;
-
-    /**
-     * Doc parser used to collect annotation target.
-     *
-     * @var \Doctrine\Common\Annotations\DocParser
-     */
-    private static $metadataParser;
-
-    /**
-     * Flag to control if the current annotation is nested or not.
-     *
-     * @var boolean
-     */
-    private $isNestedAnnotation = false;
-
-    /**
-     * Hashmap containing all use-statements that are to be used when parsing
-     * the given doc block.
-     *
-     * @var array
-     */
-    private $imports = array();
-
-    /**
-     * This hashmap is used internally to cache results of class_exists()
-     * look-ups.
-     *
-     * @var array
-     */
-    private $classExists = array();
-
-    /**
-     * Whether annotations that have not been imported should be ignored.
-     *
-     * @var boolean
-     */
-    private $ignoreNotImportedAnnotations = false;
-
-    /**
-     * An array of default namespaces if operating in simple mode.
-     *
-     * @var array
-     */
-    private $namespaces = array();
-
-    /**
-     * A list with annotations that are not causing exceptions when not resolved to an annotation class.
-     *
-     * The names must be the raw names as used in the class, not the fully qualified
-     * class names.
-     *
-     * @var array
-     */
-    private $ignoredAnnotationNames = array();
-
-    /**
-     * @var string
-     */
-    private $context = '';
-
-    /**
-     * Hash-map for caching annotation metadata.
-     *
-     * @var array
-     */
-    private static $annotationMetadata = array(
-        'Doctrine\Common\Annotations\Annotation\Target' => array(
-            'is_annotation'    => true,
-            'has_constructor'  => true,
-            'properties'       => array(),
-            'targets_literal'  => 'ANNOTATION_CLASS',
-            'targets'          => Target::TARGET_CLASS,
-            'default_property' => 'value',
-            'attribute_types'  => array(
-                'value'  => array(
-                    'required'  => false,
-                    'type'      =>'array',
-                    'array_type'=>'string',
-                    'value'     =>'array<string>'
-                )
-             ),
-        ),
-        'Doctrine\Common\Annotations\Annotation\Attribute' => array(
-            'is_annotation'    => true,
-            'has_constructor'  => false,
-            'targets_literal'  => 'ANNOTATION_ANNOTATION',
-            'targets'          => Target::TARGET_ANNOTATION,
-            'default_property' => 'name',
-            'properties'       => array(
-                'name'      => 'name',
-                'type'      => 'type',
-                'required'  => 'required'
-            ),
-            'attribute_types'  => array(
-                'value'  => array(
-                    'required'  => true,
-                    'type'      =>'string',
-                    'value'     =>'string'
-                ),
-                'type'  => array(
-                    'required'  =>true,
-                    'type'      =>'string',
-                    'value'     =>'string'
-                ),
-                'required'  => array(
-                    'required'  =>false,
-                    'type'      =>'boolean',
-                    'value'     =>'boolean'
-                )
-             ),
-        ),
-        'Doctrine\Common\Annotations\Annotation\Attributes' => array(
-            'is_annotation'    => true,
-            'has_constructor'  => false,
-            'targets_literal'  => 'ANNOTATION_CLASS',
-            'targets'          => Target::TARGET_CLASS,
-            'default_property' => 'value',
-            'properties'       => array(
-                'value' => 'value'
-            ),
-            'attribute_types'  => array(
-                'value' => array(
-                    'type'      =>'array',
-                    'required'  =>true,
-                    'array_type'=>'Doctrine\Common\Annotations\Annotation\Attribute',
-                    'value'     =>'array<Doctrine\Common\Annotations\Annotation\Attribute>'
-                )
-             ),
-        ),
-        'Doctrine\Common\Annotations\Annotation\Enum' => array(
-            'is_annotation'    => true,
-            'has_constructor'  => true,
-            'targets_literal'  => 'ANNOTATION_PROPERTY',
-            'targets'          => Target::TARGET_PROPERTY,
-            'default_property' => 'value',
-            'properties'       => array(
-                'value' => 'value'
-            ),
-            'attribute_types'  => array(
-                'value' => array(
-                    'type'      => 'array',
-                    'required'  => true,
-                ),
-                'literal' => array(
-                    'type'      => 'array',
-                    'required'  => false,
-                ),
-             ),
-        ),
-    );
-
-    /**
-     * Hash-map for handle types declaration.
-     *
-     * @var array
-     */
-    private static $typeMap = array(
-        'float'     => 'double',
-        'bool'      => 'boolean',
-        // allow uppercase Boolean in honor of George Boole
-        'Boolean'   => 'boolean',
-        'int'       => 'integer',
-    );
-
-    /**
-     * Constructs a new DocParser.
-     */
-    public function __construct()
-    {
-        $this->lexer = new DocLexer;
-    }
-
-    /**
-     * Sets the annotation names that are ignored during the parsing process.
-     *
-     * The names are supposed to be the raw names as used in the class, not the
-     * fully qualified class names.
-     *
-     * @param array $names
-     *
-     * @return void
-     */
-    public function setIgnoredAnnotationNames(array $names)
-    {
-        $this->ignoredAnnotationNames = $names;
-    }
-
-    /**
-     * Sets ignore on not-imported annotations.
-     *
-     * @param boolean $bool
-     *
-     * @return void
-     */
-    public function setIgnoreNotImportedAnnotations($bool)
-    {
-        $this->ignoreNotImportedAnnotations = (boolean) $bool;
-    }
-
-    /**
-     * Sets the default namespaces.
-     *
-     * @param array $namespace
-     *
-     * @return void
-     *
-     * @throws \RuntimeException
-     */
-    public function addNamespace($namespace)
-    {
-        if ($this->imports) {
-            throw new \RuntimeException('You must either use addNamespace(), or setImports(), but not both.');
-        }
-
-        $this->namespaces[] = $namespace;
-    }
-
-    /**
-     * Sets the imports.
-     *
-     * @param array $imports
-     *
-     * @return void
-     *
-     * @throws \RuntimeException
-     */
-    public function setImports(array $imports)
-    {
-        if ($this->namespaces) {
-            throw new \RuntimeException('You must either use addNamespace(), or setImports(), but not both.');
-        }
-
-        $this->imports = $imports;
-    }
-
-    /**
-     * Sets current target context as bitmask.
-     *
-     * @param integer $target
-     *
-     * @return void
-     */
-    public function setTarget($target)
-    {
-        $this->target = $target;
-    }
-
-    /**
-     * Parses the given docblock string for annotations.
-     *
-     * @param string $input   The docblock string to parse.
-     * @param string $context The parsing context.
-     *
-     * @return array Array of annotations. If no annotations are found, an empty array is returned.
-     */
-    public function parse($input, $context = '')
-    {
-        $pos = $this->findInitialTokenPosition($input);
-        if ($pos === null) {
-            return array();
-        }
-
-        $this->context = $context;
-
-        $this->lexer->setInput(trim(substr($input, $pos), '* /'));
-        $this->lexer->moveNext();
-
-        return $this->Annotations();
-    }
-
-    /**
-     * Finds the first valid annotation
-     *
-     * @param string $input The docblock string to parse
-     *
-     * @return int|null
-     */
-    private function findInitialTokenPosition($input)
-    {
-        $pos = 0;
-
-        // search for first valid annotation
-        while (($pos = strpos($input, '@', $pos)) !== false) {
-            // if the @ is preceded by a space or * it is valid
-            if ($pos === 0 || $input[$pos - 1] === ' ' || $input[$pos - 1] === '*') {
-                return $pos;
-            }
-
-            $pos++;
-        }
-
-        return null;
-    }
-
-    /**
-     * Attempts to match the given token with the current lookahead token.
-     * If they match, updates the lookahead token; otherwise raises a syntax error.
-     *
-     * @param integer $token Type of token.
-     *
-     * @return boolean True if tokens match; false otherwise.
-     */
-    private function match($token)
-    {
-        if ( ! $this->lexer->isNextToken($token) ) {
-            $this->syntaxError($this->lexer->getLiteral($token));
-        }
-
-        return $this->lexer->moveNext();
-    }
-
-    /**
-     * Attempts to match the current lookahead token with any of the given tokens.
-     *
-     * If any of them matches, this method updates the lookahead token; otherwise
-     * a syntax error is raised.
-     *
-     * @param array $tokens
-     *
-     * @return boolean
-     */
-    private function matchAny(array $tokens)
-    {
-        if ( ! $this->lexer->isNextTokenAny($tokens)) {
-            $this->syntaxError(implode(' or ', array_map(array($this->lexer, 'getLiteral'), $tokens)));
-        }
-
-        return $this->lexer->moveNext();
-    }
-
-    /**
-     * Generates a new syntax error.
-     *
-     * @param string     $expected Expected string.
-     * @param array|null $token    Optional token.
-     *
-     * @return void
-     *
-     * @throws AnnotationException
-     */
-    private function syntaxError($expected, $token = null)
-    {
-        if ($token === null) {
-            $token = $this->lexer->lookahead;
-        }
-
-        $message  = sprintf('Expected %s, got ', $expected);
-        $message .= ($this->lexer->lookahead === null)
-            ? 'end of string'
-            : sprintf("'%s' at position %s", $token['value'], $token['position']);
-
-        if (strlen($this->context)) {
-            $message .= ' in ' . $this->context;
-        }
-
-        $message .= '.';
-
-        throw AnnotationException::syntaxError($message);
-    }
-
-    /**
-     * Attempts to check if a class exists or not. This never goes through the PHP autoloading mechanism
-     * but uses the {@link AnnotationRegistry} to load classes.
-     *
-     * @param string $fqcn
-     *
-     * @return boolean
-     */
-    private function classExists($fqcn)
-    {
-        if (isset($this->classExists[$fqcn])) {
-            return $this->classExists[$fqcn];
-        }
-
-        // first check if the class already exists, maybe loaded through another AnnotationReader
-        if (class_exists($fqcn, false)) {
-            return $this->classExists[$fqcn] = true;
-        }
-
-        // final check, does this class exist?
-        return $this->classExists[$fqcn] = AnnotationRegistry::loadAnnotationClass($fqcn);
-    }
-
-    /**
-     * Collects parsing metadata for a given annotation class
-     *
-     * @param string $name The annotation name
-     *
-     * @return void
-     */
-    private function collectAnnotationMetadata($name)
-    {
-        if (self::$metadataParser === null) {
-            self::$metadataParser = new self();
-
-            self::$metadataParser->setIgnoreNotImportedAnnotations(true);
-            self::$metadataParser->setIgnoredAnnotationNames($this->ignoredAnnotationNames);
-            self::$metadataParser->setImports(array(
-                'enum'          => 'Doctrine\Common\Annotations\Annotation\Enum',
-                'target'        => 'Doctrine\Common\Annotations\Annotation\Target',
-                'attribute'     => 'Doctrine\Common\Annotations\Annotation\Attribute',
-                'attributes'    => 'Doctrine\Common\Annotations\Annotation\Attributes'
-            ));
-
-            AnnotationRegistry::registerFile(__DIR__ . '/Annotation/Enum.php');
-            AnnotationRegistry::registerFile(__DIR__ . '/Annotation/Target.php');
-            AnnotationRegistry::registerFile(__DIR__ . '/Annotation/Attribute.php');
-            AnnotationRegistry::registerFile(__DIR__ . '/Annotation/Attributes.php');
-        }
-
-        $class      = new \ReflectionClass($name);
-        $docComment = $class->getDocComment();
-
-        // Sets default values for annotation metadata
-        $metadata = array(
-            'default_property' => null,
-            'has_constructor'  => (null !== $constructor = $class->getConstructor()) && $constructor->getNumberOfParameters() > 0,
-            'properties'       => array(),
-            'property_types'   => array(),
-            'attribute_types'  => array(),
-            'targets_literal'  => null,
-            'targets'          => Target::TARGET_ALL,
-            'is_annotation'    => false !== strpos($docComment, '@Annotation'),
-        );
-
-        // verify that the class is really meant to be an annotation
-        if ($metadata['is_annotation']) {
-            self::$metadataParser->setTarget(Target::TARGET_CLASS);
-
-            foreach (self::$metadataParser->parse($docComment, 'class @' . $name) as $annotation) {
-                if ($annotation instanceof Target) {
-                    $metadata['targets']         = $annotation->targets;
-                    $metadata['targets_literal'] = $annotation->literal;
-
-                    continue;
-                }
-
-                if ($annotation instanceof Attributes) {
-                    foreach ($annotation->value as $attribute) {
-                        $this->collectAttributeTypeMetadata($metadata, $attribute);
-                    }
-                }
-            }
-
-            // if not has a constructor will inject values into public properties
-            if (false === $metadata['has_constructor']) {
-                // collect all public properties
-                foreach ($class->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
-                    $metadata['properties'][$property->name] = $property->name;
-
-                    if (false === ($propertyComment = $property->getDocComment())) {
-                        continue;
-                    }
-
-                    $attribute = new Attribute();
-
-                    $attribute->required = (false !== strpos($propertyComment, '@Required'));
-                    $attribute->name     = $property->name;
-                    $attribute->type     = (false !== strpos($propertyComment, '@var') && preg_match('/@var\s+([^\s]+)/',$propertyComment, $matches))
-                        ? $matches[1]
-                        : 'mixed';
-
-                    $this->collectAttributeTypeMetadata($metadata, $attribute);
-
-                    // checks if the property has @Enum
-                    if (false !== strpos($propertyComment, '@Enum')) {
-                        $context = 'property ' . $class->name . "::\$" . $property->name;
-
-                        self::$metadataParser->setTarget(Target::TARGET_PROPERTY);
-
-                        foreach (self::$metadataParser->parse($propertyComment, $context) as $annotation) {
-                            if ( ! $annotation instanceof Enum) {
-                                continue;
-                            }
-
-                            $metadata['enum'][$property->name]['value']   = $annotation->value;
-                            $metadata['enum'][$property->name]['literal'] = ( ! empty($annotation->literal))
-                                ? $annotation->literal
-                                : $annotation->value;
-                        }
-                    }
-                }
-
-                // choose the first property as default property
-                $metadata['default_property'] = reset($metadata['properties']);
-            }
-        }
-
-        self::$annotationMetadata[$name] = $metadata;
-    }
-
-    /**
-     * Collects parsing metadata for a given attribute.
-     *
-     * @param array     $metadata
-     * @param Attribute $attribute
-     *
-     * @return void
-     */
-    private function collectAttributeTypeMetadata(&$metadata, Attribute $attribute)
-    {
-        // handle internal type declaration
-        $type = isset(self::$typeMap[$attribute->type])
-            ? self::$typeMap[$attribute->type]
-            : $attribute->type;
-
-        // handle the case if the property type is mixed
-        if ('mixed' === $type) {
-            return;
-        }
-
-        // Evaluate type
-        switch (true) {
-            // Checks if the property has array<type>
-            case (false !== $pos = strpos($type, '<')):
-                $arrayType  = substr($type, $pos + 1, -1);
-                $type       = 'array';
-
-                if (isset(self::$typeMap[$arrayType])) {
-                    $arrayType = self::$typeMap[$arrayType];
-                }
-
-                $metadata['attribute_types'][$attribute->name]['array_type'] = $arrayType;
-                break;
-
-            // Checks if the property has type[]
-            case (false !== $pos = strrpos($type, '[')):
-                $arrayType  = substr($type, 0, $pos);
-                $type       = 'array';
-
-                if (isset(self::$typeMap[$arrayType])) {
-                    $arrayType = self::$typeMap[$arrayType];
-                }
-
-                $metadata['attribute_types'][$attribute->name]['array_type'] = $arrayType;
-                break;
-        }
-
-        $metadata['attribute_types'][$attribute->name]['type']     = $type;
-        $metadata['attribute_types'][$attribute->name]['value']    = $attribute->type;
-        $metadata['attribute_types'][$attribute->name]['required'] = $attribute->required;
-    }
-
-    /**
-     * Annotations ::= Annotation {[ "*" ]* [Annotation]}*
-     *
-     * @return array
-     */
-    private function Annotations()
-    {
-        $annotations = array();
-
-        while (null !== $this->lexer->lookahead) {
-            if (DocLexer::T_AT !== $this->lexer->lookahead['type']) {
-                $this->lexer->moveNext();
-                continue;
-            }
-
-            // make sure the @ is preceded by non-catchable pattern
-            if (null !== $this->lexer->token && $this->lexer->lookahead['position'] === $this->lexer->token['position'] + strlen($this->lexer->token['value'])) {
-                $this->lexer->moveNext();
-                continue;
-            }
-
-            // make sure the @ is followed by either a namespace separator, or
-            // an identifier token
-            if ((null === $peek = $this->lexer->glimpse())
-                || (DocLexer::T_NAMESPACE_SEPARATOR !== $peek['type'] && !in_array($peek['type'], self::$classIdentifiers, true))
-                || $peek['position'] !== $this->lexer->lookahead['position'] + 1) {
-                $this->lexer->moveNext();
-                continue;
-            }
-
-            $this->isNestedAnnotation = false;
-            if (false !== $annot = $this->Annotation()) {
-                $annotations[] = $annot;
-            }
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * Annotation     ::= "@" AnnotationName MethodCall
-     * AnnotationName ::= QualifiedName | SimpleName
-     * QualifiedName  ::= NameSpacePart "\" {NameSpacePart "\"}* SimpleName
-     * NameSpacePart  ::= identifier | null | false | true
-     * SimpleName     ::= identifier | null | false | true
-     *
-     * @return mixed False if it is not a valid annotation.
-     *
-     * @throws AnnotationException
-     */
-    private function Annotation()
-    {
-        $this->match(DocLexer::T_AT);
-
-        // check if we have an annotation
-        $name = $this->Identifier();
-
-        // only process names which are not fully qualified, yet
-        // fully qualified names must start with a \
-        $originalName = $name;
-
-        if ('\\' !== $name[0]) {
-            $alias = (false === $pos = strpos($name, '\\'))? $name : substr($name, 0, $pos);
-            $found = false;
-
-            if ($this->namespaces) {
-                foreach ($this->namespaces as $namespace) {
-                    if ($this->classExists($namespace.'\\'.$name)) {
-                        $name = $namespace.'\\'.$name;
-                        $found = true;
-                        break;
-                    }
-                }
-            } elseif (isset($this->imports[$loweredAlias = strtolower($alias)])) {
-                $found = true;
-                $name  = (false !== $pos)
-                    ? $this->imports[$loweredAlias] . substr($name, $pos)
-                    : $this->imports[$loweredAlias];
-            } elseif ( ! isset($this->ignoredAnnotationNames[$name])
-                && isset($this->imports['__NAMESPACE__'])
-                && $this->classExists($this->imports['__NAMESPACE__'] . '\\' . $name)
-            ) {
-                $name  = $this->imports['__NAMESPACE__'].'\\'.$name;
-                $found = true;
-            } elseif (! isset($this->ignoredAnnotationNames[$name]) && $this->classExists($name)) {
-                $found = true;
-            }
-
-            if ( ! $found) {
-                if ($this->ignoreNotImportedAnnotations || isset($this->ignoredAnnotationNames[$name])) {
-                    return false;
-                }
-
-                throw AnnotationException::semanticalError(sprintf('The annotation "@%s" in %s was never imported. Did you maybe forget to add a "use" statement for this annotation?', $name, $this->context));
-            }
-        }
-
-        if ( ! $this->classExists($name)) {
-            throw AnnotationException::semanticalError(sprintf('The annotation "@%s" in %s does not exist, or could not be auto-loaded.', $name, $this->context));
-        }
-
-        // at this point, $name contains the fully qualified class name of the
-        // annotation, and it is also guaranteed that this class exists, and
-        // that it is loaded
-
-
-        // collects the metadata annotation only if there is not yet
-        if ( ! isset(self::$annotationMetadata[$name])) {
-            $this->collectAnnotationMetadata($name);
-        }
-
-        // verify that the class is really meant to be an annotation and not just any ordinary class
-        if (self::$annotationMetadata[$name]['is_annotation'] === false) {
-            if (isset($this->ignoredAnnotationNames[$originalName])) {
-                return false;
-            }
-
-            throw AnnotationException::semanticalError(sprintf('The class "%s" is not annotated with @Annotation. Are you sure this class can be used as annotation? If so, then you need to add @Annotation to the _class_ doc comment of "%s". If it is indeed no annotation, then you need to add @IgnoreAnnotation("%s") to the _class_ doc comment of %s.', $name, $name, $originalName, $this->context));
-        }
-
-        //if target is nested annotation
-        $target = $this->isNestedAnnotation ? Target::TARGET_ANNOTATION : $this->target;
-
-        // Next will be nested
-        $this->isNestedAnnotation = true;
-
-        //if annotation does not support current target
-        if (0 === (self::$annotationMetadata[$name]['targets'] & $target) && $target) {
-            throw AnnotationException::semanticalError(
-                sprintf('Annotation @%s is not allowed to be declared on %s. You may only use this annotation on these code elements: %s.',
-                     $originalName, $this->context, self::$annotationMetadata[$name]['targets_literal'])
-            );
-        }
-
-        $values = $this->MethodCall();
-
-        if (isset(self::$annotationMetadata[$name]['enum'])) {
-            // checks all declared attributes
-            foreach (self::$annotationMetadata[$name]['enum'] as $property => $enum) {
-                // checks if the attribute is a valid enumerator
-                if (isset($values[$property]) && ! in_array($values[$property], $enum['value'])) {
-                    throw AnnotationException::enumeratorError($property, $name, $this->context, $enum['literal'], $values[$property]);
-                }
-            }
-        }
-
-        // checks all declared attributes
-        foreach (self::$annotationMetadata[$name]['attribute_types'] as $property => $type) {
-            if ($property === self::$annotationMetadata[$name]['default_property']
-                && !isset($values[$property]) && isset($values['value'])) {
-                $property = 'value';
-            }
-
-            // handle a not given attribute or null value
-            if (!isset($values[$property])) {
-                if ($type['required']) {
-                    throw AnnotationException::requiredError($property, $originalName, $this->context, 'a(n) '.$type['value']);
-                }
-
-                continue;
-            }
-
-            if ($type['type'] === 'array') {
-                // handle the case of a single value
-                if ( ! is_array($values[$property])) {
-                    $values[$property] = array($values[$property]);
-                }
-
-                // checks if the attribute has array type declaration, such as "array<string>"
-                if (isset($type['array_type'])) {
-                    foreach ($values[$property] as $item) {
-                        if (gettype($item) !== $type['array_type'] && !$item instanceof $type['array_type']) {
-                            throw AnnotationException::attributeTypeError($property, $originalName, $this->context, 'either a(n) '.$type['array_type'].', or an array of '.$type['array_type'].'s', $item);
-                        }
-                    }
-                }
-            } elseif (gettype($values[$property]) !== $type['type'] && !$values[$property] instanceof $type['type']) {
-                throw AnnotationException::attributeTypeError($property, $originalName, $this->context, 'a(n) '.$type['value'], $values[$property]);
-            }
-        }
-
-        // check if the annotation expects values via the constructor,
-        // or directly injected into public properties
-        if (self::$annotationMetadata[$name]['has_constructor'] === true) {
-            return new $name($values);
-        }
-
-        $instance = new $name();
-
-        foreach ($values as $property => $value) {
-            if (!isset(self::$annotationMetadata[$name]['properties'][$property])) {
-                if ('value' !== $property) {
-                    throw AnnotationException::creationError(sprintf('The annotation @%s declared on %s does not have a property named "%s". Available properties: %s', $originalName, $this->context, $property, implode(', ', self::$annotationMetadata[$name]['properties'])));
-                }
-
-                // handle the case if the property has no annotations
-                if ( ! $property = self::$annotationMetadata[$name]['default_property']) {
-                    throw AnnotationException::creationError(sprintf('The annotation @%s declared on %s does not accept any values, but got %s.', $originalName, $this->context, json_encode($values)));
-                }
-            }
-
-            $instance->{$property} = $value;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * MethodCall ::= ["(" [Values] ")"]
-     *
-     * @return array
-     */
-    private function MethodCall()
-    {
-        $values = array();
-
-        if ( ! $this->lexer->isNextToken(DocLexer::T_OPEN_PARENTHESIS)) {
-            return $values;
-        }
-
-        $this->match(DocLexer::T_OPEN_PARENTHESIS);
-
-        if ( ! $this->lexer->isNextToken(DocLexer::T_CLOSE_PARENTHESIS)) {
-            $values = $this->Values();
-        }
-
-        $this->match(DocLexer::T_CLOSE_PARENTHESIS);
-
-        return $values;
-    }
-
-    /**
-     * Values ::= Array | Value {"," Value}* [","]
-     *
-     * @return array
-     */
-    private function Values()
-    {
-        $values = array($this->Value());
-
-        while ($this->lexer->isNextToken(DocLexer::T_COMMA)) {
-            $this->match(DocLexer::T_COMMA);
-
-            if ($this->lexer->isNextToken(DocLexer::T_CLOSE_PARENTHESIS)) {
-                break;
-            }
-
-            $token = $this->lexer->lookahead;
-            $value = $this->Value();
-
-            if ( ! is_object($value) && ! is_array($value)) {
-                $this->syntaxError('Value', $token);
-            }
-
-            $values[] = $value;
-        }
-
-        foreach ($values as $k => $value) {
-            if (is_object($value) && $value instanceof \stdClass) {
-                $values[$value->name] = $value->value;
-            } else if ( ! isset($values['value'])){
-                $values['value'] = $value;
-            } else {
-                if ( ! is_array($values['value'])) {
-                    $values['value'] = array($values['value']);
-                }
-
-                $values['value'][] = $value;
-            }
-
-            unset($values[$k]);
-        }
-
-        return $values;
-    }
-
-    /**
-     * Constant ::= integer | string | float | boolean
-     *
-     * @return mixed
-     *
-     * @throws AnnotationException
-     */
-    private function Constant()
-    {
-        $identifier = $this->Identifier();
-
-        if ( ! defined($identifier) && false !== strpos($identifier, '::') && '\\' !== $identifier[0]) {
-            list($className, $const) = explode('::', $identifier);
-
-            $alias = (false === $pos = strpos($className, '\\')) ? $className : substr($className, 0, $pos);
-            $found = false;
-
-            switch (true) {
-                case !empty ($this->namespaces):
-                    foreach ($this->namespaces as $ns) {
-                        if (class_exists($ns.'\\'.$className) || interface_exists($ns.'\\'.$className)) {
-                             $className = $ns.'\\'.$className;
-                             $found = true;
-                             break;
-                        }
-                    }
-                    break;
-
-                case isset($this->imports[$loweredAlias = strtolower($alias)]):
-                    $found     = true;
-                    $className = (false !== $pos)
-                        ? $this->imports[$loweredAlias] . substr($className, $pos)
-                        : $this->imports[$loweredAlias];
-                    break;
-
-                default:
-                    if(isset($this->imports['__NAMESPACE__'])) {
-                        $ns = $this->imports['__NAMESPACE__'];
-
-                        if (class_exists($ns.'\\'.$className) || interface_exists($ns.'\\'.$className)) {
-                            $className = $ns.'\\'.$className;
-                            $found = true;
-                        }
-                    }
-                    break;
-            }
-
-            if ($found) {
-                 $identifier = $className . '::' . $const;
-            }
-        }
-
-        // checks if identifier ends with ::class, \strlen('::class') === 7
-        $classPos = stripos($identifier, '::class');
-        if ($classPos === strlen($identifier) - 7) {
-            return substr($identifier, 0, $classPos);
-        }
-
-        if (!defined($identifier)) {
-            throw AnnotationException::semanticalErrorConstants($identifier, $this->context);
-        }
-
-        return constant($identifier);
-    }
-
-    /**
-     * Identifier ::= string
-     *
-     * @return string
-     */
-    private function Identifier()
-    {
-        // check if we have an annotation
-        if ( ! $this->lexer->isNextTokenAny(self::$classIdentifiers)) {
-            $this->syntaxError('namespace separator or identifier');
-        }
-
-        $this->lexer->moveNext();
-
-        $className = $this->lexer->token['value'];
-
-        while ($this->lexer->lookahead['position'] === ($this->lexer->token['position'] + strlen($this->lexer->token['value']))
-                && $this->lexer->isNextToken(DocLexer::T_NAMESPACE_SEPARATOR)) {
-
-            $this->match(DocLexer::T_NAMESPACE_SEPARATOR);
-            $this->matchAny(self::$classIdentifiers);
-
-            $className .= '\\' . $this->lexer->token['value'];
-        }
-
-        return $className;
-    }
-
-    /**
-     * Value ::= PlainValue | FieldAssignment
-     *
-     * @return mixed
-     */
-    private function Value()
-    {
-        $peek = $this->lexer->glimpse();
-
-        if (DocLexer::T_EQUALS === $peek['type']) {
-            return $this->FieldAssignment();
-        }
-
-        return $this->PlainValue();
-    }
-
-    /**
-     * PlainValue ::= integer | string | float | boolean | Array | Annotation
-     *
-     * @return mixed
-     */
-    private function PlainValue()
-    {
-        if ($this->lexer->isNextToken(DocLexer::T_OPEN_CURLY_BRACES)) {
-            return $this->Arrayx();
-        }
-
-        if ($this->lexer->isNextToken(DocLexer::T_AT)) {
-            return $this->Annotation();
-        }
-
-        if ($this->lexer->isNextToken(DocLexer::T_IDENTIFIER)) {
-            return $this->Constant();
-        }
-
-        switch ($this->lexer->lookahead['type']) {
-            case DocLexer::T_STRING:
-                $this->match(DocLexer::T_STRING);
-                return $this->lexer->token['value'];
-
-            case DocLexer::T_INTEGER:
-                $this->match(DocLexer::T_INTEGER);
-                return (int)$this->lexer->token['value'];
-
-            case DocLexer::T_FLOAT:
-                $this->match(DocLexer::T_FLOAT);
-                return (float)$this->lexer->token['value'];
-
-            case DocLexer::T_TRUE:
-                $this->match(DocLexer::T_TRUE);
-                return true;
-
-            case DocLexer::T_FALSE:
-                $this->match(DocLexer::T_FALSE);
-                return false;
-
-            case DocLexer::T_NULL:
-                $this->match(DocLexer::T_NULL);
-                return null;
-
-            default:
-                $this->syntaxError('PlainValue');
-        }
-    }
-
-    /**
-     * FieldAssignment ::= FieldName "=" PlainValue
-     * FieldName ::= identifier
-     *
-     * @return array
-     */
-    private function FieldAssignment()
-    {
-        $this->match(DocLexer::T_IDENTIFIER);
-        $fieldName = $this->lexer->token['value'];
-
-        $this->match(DocLexer::T_EQUALS);
-
-        $item = new \stdClass();
-        $item->name  = $fieldName;
-        $item->value = $this->PlainValue();
-
-        return $item;
-    }
-
-    /**
-     * Array ::= "{" ArrayEntry {"," ArrayEntry}* [","] "}"
-     *
-     * @return array
-     */
-    private function Arrayx()
-    {
-        $array = $values = array();
-
-        $this->match(DocLexer::T_OPEN_CURLY_BRACES);
-
-        // If the array is empty, stop parsing and return.
-        if ($this->lexer->isNextToken(DocLexer::T_CLOSE_CURLY_BRACES)) {
-            $this->match(DocLexer::T_CLOSE_CURLY_BRACES);
-
-            return $array;
-        }
-
-        $values[] = $this->ArrayEntry();
-
-        while ($this->lexer->isNextToken(DocLexer::T_COMMA)) {
-            $this->match(DocLexer::T_COMMA);
-
-            // optional trailing comma
-            if ($this->lexer->isNextToken(DocLexer::T_CLOSE_CURLY_BRACES)) {
-                break;
-            }
-
-            $values[] = $this->ArrayEntry();
-        }
-
-        $this->match(DocLexer::T_CLOSE_CURLY_BRACES);
-
-        foreach ($values as $value) {
-            list ($key, $val) = $value;
-
-            if ($key !== null) {
-                $array[$key] = $val;
-            } else {
-                $array[] = $val;
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * ArrayEntry ::= Value | KeyValuePair
-     * KeyValuePair ::= Key ("=" | ":") PlainValue | Constant
-     * Key ::= string | integer | Constant
-     *
-     * @return array
-     */
-    private function ArrayEntry()
-    {
-        $peek = $this->lexer->glimpse();
-
-        if (DocLexer::T_EQUALS === $peek['type']
-                || DocLexer::T_COLON === $peek['type']) {
-
-            if ($this->lexer->isNextToken(DocLexer::T_IDENTIFIER)) {
-                $key = $this->Constant();
-            } else {
-                $this->matchAny(array(DocLexer::T_INTEGER, DocLexer::T_STRING));
-                $key = $this->lexer->token['value'];
-            }
-
-            $this->matchAny(array(DocLexer::T_EQUALS, DocLexer::T_COLON));
-
-            return array($key, $this->PlainValue());
-        }
-
-        return array(null, $this->Value());
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
deleted file mode 100644
index 24add1b..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?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\Annotations;
-
-/**
- * File cache reader for annotations.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- *
- * @deprecated the FileCacheReader is deprecated and will be removed
- *             in version 2.0.0 of doctrine/annotations. Please use the
- *             {@see \Doctrine\Common\Annotations\CachedReader} instead.
- */
-class FileCacheReader implements Reader
-{
-    /**
-     * @var Reader
-     */
-    private $reader;
-
-    /**
-     * @var string
-     */
-    private $dir;
-
-    /**
-     * @var bool
-     */
-    private $debug;
-
-    /**
-     * @var array
-     */
-    private $loadedAnnotations = array();
-
-    /**
-     * @var array
-     */
-    private $classNameHashes = array();
-
-    /**
-     * @var int
-     */
-    private $umask;
-
-    /**
-     * Constructor.
-     *
-     * @param Reader  $reader
-     * @param string  $cacheDir
-     * @param boolean $debug
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(Reader $reader, $cacheDir, $debug = false, $umask = 0002)
-    {
-        if ( ! is_int($umask)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The parameter umask must be an integer, was: %s',
-                gettype($umask)
-            ));
-        }
-
-        $this->reader = $reader;
-        $this->umask = $umask;
-
-        if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777 & (~$this->umask), true)) {
-            throw new \InvalidArgumentException(sprintf('The directory "%s" does not exist and could not be created.', $cacheDir));
-        }
-
-        $this->dir   = rtrim($cacheDir, '\\/');
-        $this->debug = $debug;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotations(\ReflectionClass $class)
-    {
-        if ( ! isset($this->classNameHashes[$class->name])) {
-            $this->classNameHashes[$class->name] = sha1($class->name);
-        }
-        $key = $this->classNameHashes[$class->name];
-
-        if (isset($this->loadedAnnotations[$key])) {
-            return $this->loadedAnnotations[$key];
-        }
-
-        $path = $this->dir.'/'.strtr($key, '\\', '-').'.cache.php';
-        if (!is_file($path)) {
-            $annot = $this->reader->getClassAnnotations($class);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        if ($this->debug
-            && (false !== $filename = $class->getFilename())
-            && filemtime($path) < filemtime($filename)) {
-            @unlink($path);
-
-            $annot = $this->reader->getClassAnnotations($class);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        return $this->loadedAnnotations[$key] = include $path;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotations(\ReflectionProperty $property)
-    {
-        $class = $property->getDeclaringClass();
-        if ( ! isset($this->classNameHashes[$class->name])) {
-            $this->classNameHashes[$class->name] = sha1($class->name);
-        }
-        $key = $this->classNameHashes[$class->name].'$'.$property->getName();
-
-        if (isset($this->loadedAnnotations[$key])) {
-            return $this->loadedAnnotations[$key];
-        }
-
-        $path = $this->dir.'/'.strtr($key, '\\', '-').'.cache.php';
-        if (!is_file($path)) {
-            $annot = $this->reader->getPropertyAnnotations($property);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        if ($this->debug
-            && (false !== $filename = $class->getFilename())
-            && filemtime($path) < filemtime($filename)) {
-            @unlink($path);
-
-            $annot = $this->reader->getPropertyAnnotations($property);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        return $this->loadedAnnotations[$key] = include $path;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotations(\ReflectionMethod $method)
-    {
-        $class = $method->getDeclaringClass();
-        if ( ! isset($this->classNameHashes[$class->name])) {
-            $this->classNameHashes[$class->name] = sha1($class->name);
-        }
-        $key = $this->classNameHashes[$class->name].'#'.$method->getName();
-
-        if (isset($this->loadedAnnotations[$key])) {
-            return $this->loadedAnnotations[$key];
-        }
-
-        $path = $this->dir.'/'.strtr($key, '\\', '-').'.cache.php';
-        if (!is_file($path)) {
-            $annot = $this->reader->getMethodAnnotations($method);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        if ($this->debug
-            && (false !== $filename = $class->getFilename())
-            && filemtime($path) < filemtime($filename)) {
-            @unlink($path);
-
-            $annot = $this->reader->getMethodAnnotations($method);
-            $this->saveCacheFile($path, $annot);
-            return $this->loadedAnnotations[$key] = $annot;
-        }
-
-        return $this->loadedAnnotations[$key] = include $path;
-    }
-
-    /**
-     * Saves the cache file.
-     *
-     * @param string $path
-     * @param mixed  $data
-     *
-     * @return void
-     */
-    private function saveCacheFile($path, $data)
-    {
-        if (!is_writable($this->dir)) {
-            throw new \InvalidArgumentException(sprintf('The directory "%s" is not writable. Both, the webserver and the console user need access. You can manage access rights for multiple users with "chmod +a". If your system does not support this, check out the acl package.', $this->dir));
-        }
-
-        $tempfile = tempnam($this->dir, uniqid('', true));
-
-        if (false === $tempfile) {
-            throw new \RuntimeException(sprintf('Unable to create tempfile in directory: %s', $this->dir));
-        }
-
-        $written = file_put_contents($tempfile, '<?php return unserialize('.var_export(serialize($data), true).');');
-
-        if (false === $written) {
-            throw new \RuntimeException(sprintf('Unable to write cached file to: %s', $tempfile));
-        }
-
-        @chmod($tempfile, 0666 & (~$this->umask));
-
-        if (false === rename($tempfile, $path)) {
-            @unlink($tempfile);
-            throw new \RuntimeException(sprintf('Unable to rename %s to %s', $tempfile, $path));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotation(\ReflectionClass $class, $annotationName)
-    {
-        $annotations = $this->getClassAnnotations($class);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotation(\ReflectionMethod $method, $annotationName)
-    {
-        $annotations = $this->getMethodAnnotations($method);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotation(\ReflectionProperty $property, $annotationName)
-    {
-        $annotations = $this->getPropertyAnnotations($property);
-
-        foreach ($annotations as $annotation) {
-            if ($annotation instanceof $annotationName) {
-                return $annotation;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Clears loaded annotations.
-     *
-     * @return void
-     */
-    public function clearLoadedAnnotations()
-    {
-        $this->loadedAnnotations = array();
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
deleted file mode 100644
index bf7fbdc..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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\Annotations;
-
-/**
- * Allows the reader to be used in-place of Doctrine's reader.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class IndexedReader implements Reader
-{
-    /**
-     * @var Reader
-     */
-    private $delegate;
-
-    /**
-     * Constructor.
-     *
-     * @param Reader $reader
-     */
-    public function __construct(Reader $reader)
-    {
-        $this->delegate = $reader;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotations(\ReflectionClass $class)
-    {
-        $annotations = array();
-        foreach ($this->delegate->getClassAnnotations($class) as $annot) {
-            $annotations[get_class($annot)] = $annot;
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotation(\ReflectionClass $class, $annotation)
-    {
-        return $this->delegate->getClassAnnotation($class, $annotation);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotations(\ReflectionMethod $method)
-    {
-        $annotations = array();
-        foreach ($this->delegate->getMethodAnnotations($method) as $annot) {
-            $annotations[get_class($annot)] = $annot;
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotation(\ReflectionMethod $method, $annotation)
-    {
-        return $this->delegate->getMethodAnnotation($method, $annotation);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotations(\ReflectionProperty $property)
-    {
-        $annotations = array();
-        foreach ($this->delegate->getPropertyAnnotations($property) as $annot) {
-            $annotations[get_class($annot)] = $annot;
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotation(\ReflectionProperty $property, $annotation)
-    {
-        return $this->delegate->getPropertyAnnotation($property, $annotation);
-    }
-
-    /**
-     * Proxies all methods to the delegate.
-     *
-     * @param string $method
-     * @param array  $args
-     *
-     * @return mixed
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->delegate, $method), $args);
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
deleted file mode 100644
index 21ee7cc..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Annotations;
-
-use SplFileObject;
-
-/**
- * Parses a file for namespaces/use/class declarations.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christian Kaps <christian.kaps@mohiva.com>
- */
-final class PhpParser
-{
-    /**
-     * Parses a class.
-     *
-     * @param \ReflectionClass $class A <code>ReflectionClass</code> object.
-     *
-     * @return array A list with use statements in the form (Alias => FQN).
-     */
-    public function parseClass(\ReflectionClass $class)
-    {
-        if (method_exists($class, 'getUseStatements')) {
-            return $class->getUseStatements();
-        }
-
-        if (false === $filename = $class->getFilename()) {
-            return array();
-        }
-
-        $content = $this->getFileContent($filename, $class->getStartLine());
-
-        if (null === $content) {
-            return array();
-        }
-
-        $namespace = preg_quote($class->getNamespaceName());
-        $content = preg_replace('/^.*?(\bnamespace\s+' . $namespace . '\s*[;{].*)$/s', '\\1', $content);
-        $tokenizer = new TokenParser('<?php ' . $content);
-
-        $statements = $tokenizer->parseUseStatements($class->getNamespaceName());
-
-        return $statements;
-    }
-
-    /**
-     * Gets the content of the file right up to the given line number.
-     *
-     * @param string  $filename   The name of the file to load.
-     * @param integer $lineNumber The number of lines to read from file.
-     *
-     * @return string The content of the file.
-     */
-    private function getFileContent($filename, $lineNumber)
-    {
-        if ( ! is_file($filename)) {
-            return null;
-        }
-
-        $content = '';
-        $lineCnt = 0;
-        $file = new SplFileObject($filename);
-        while (!$file->eof()) {
-            if ($lineCnt++ == $lineNumber) {
-                break;
-            }
-
-            $content .= $file->fgets();
-        }
-
-        return $content;
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
deleted file mode 100644
index 4774f87..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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\Annotations;
-
-/**
- * Interface for annotation readers.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface Reader
-{
-    /**
-     * Gets the annotations applied to a class.
-     *
-     * @param \ReflectionClass $class The ReflectionClass of the class from which
-     *                                the class annotations should be read.
-     *
-     * @return array An array of Annotations.
-     */
-    function getClassAnnotations(\ReflectionClass $class);
-
-    /**
-     * Gets a class annotation.
-     *
-     * @param \ReflectionClass $class          The ReflectionClass of the class from which
-     *                                         the class annotations should be read.
-     * @param string           $annotationName The name of the annotation.
-     *
-     * @return object|null The Annotation or NULL, if the requested annotation does not exist.
-     */
-    function getClassAnnotation(\ReflectionClass $class, $annotationName);
-
-    /**
-     * Gets the annotations applied to a method.
-     *
-     * @param \ReflectionMethod $method The ReflectionMethod of the method from which
-     *                                  the annotations should be read.
-     *
-     * @return array An array of Annotations.
-     */
-    function getMethodAnnotations(\ReflectionMethod $method);
-
-    /**
-     * Gets a method annotation.
-     *
-     * @param \ReflectionMethod $method         The ReflectionMethod to read the annotations from.
-     * @param string            $annotationName The name of the annotation.
-     *
-     * @return object|null The Annotation or NULL, if the requested annotation does not exist.
-     */
-    function getMethodAnnotation(\ReflectionMethod $method, $annotationName);
-
-    /**
-     * Gets the annotations applied to a property.
-     *
-     * @param \ReflectionProperty $property The ReflectionProperty of the property
-     *                                      from which the annotations should be read.
-     *
-     * @return array An array of Annotations.
-     */
-    function getPropertyAnnotations(\ReflectionProperty $property);
-
-    /**
-     * Gets a property annotation.
-     *
-     * @param \ReflectionProperty $property       The ReflectionProperty to read the annotations from.
-     * @param string              $annotationName The name of the annotation.
-     *
-     * @return object|null The Annotation or NULL, if the requested annotation does not exist.
-     */
-    function getPropertyAnnotation(\ReflectionProperty $property, $annotationName);
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
deleted file mode 100644
index d4757ee..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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\Annotations;
-
-/**
- * Simple Annotation Reader.
- *
- * This annotation reader is intended to be used in projects where you have
- * full-control over all annotations that are available.
- *
- * @since  2.2
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class SimpleAnnotationReader implements Reader
-{
-    /**
-     * @var DocParser
-     */
-    private $parser;
-
-    /**
-     * Constructor.
-     *
-     * Initializes a new SimpleAnnotationReader.
-     */
-    public function __construct()
-    {
-        $this->parser = new DocParser();
-        $this->parser->setIgnoreNotImportedAnnotations(true);
-    }
-
-    /**
-     * Adds a namespace in which we will look for annotations.
-     *
-     * @param string $namespace
-     *
-     * @return void
-     */
-    public function addNamespace($namespace)
-    {
-        $this->parser->addNamespace($namespace);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotations(\ReflectionClass $class)
-    {
-        return $this->parser->parse($class->getDocComment(), 'class '.$class->getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotations(\ReflectionMethod $method)
-    {
-        return $this->parser->parse($method->getDocComment(), 'method '.$method->getDeclaringClass()->name.'::'.$method->getName().'()');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotations(\ReflectionProperty $property)
-    {
-        return $this->parser->parse($property->getDocComment(), 'property '.$property->getDeclaringClass()->name.'::$'.$property->getName());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassAnnotation(\ReflectionClass $class, $annotationName)
-    {
-        foreach ($this->getClassAnnotations($class) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethodAnnotation(\ReflectionMethod $method, $annotationName)
-    {
-        foreach ($this->getMethodAnnotations($method) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPropertyAnnotation(\ReflectionProperty $property, $annotationName)
-    {
-        foreach ($this->getPropertyAnnotations($property) as $annot) {
-            if ($annot instanceof $annotationName) {
-                return $annot;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php b/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
deleted file mode 100644
index 9bdccce..0000000
--- a/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?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\Annotations;
-
-/**
- * Parses a file for namespaces/use/class declarations.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christian Kaps <christian.kaps@mohiva.com>
- */
-class TokenParser
-{
-    /**
-     * The token list.
-     *
-     * @var array
-     */
-    private $tokens;
-
-    /**
-     * The number of tokens.
-     *
-     * @var int
-     */
-    private $numTokens;
-
-    /**
-     * The current array pointer.
-     *
-     * @var int
-     */
-    private $pointer = 0;
-
-    /**
-     * @param string $contents
-     */
-    public function __construct($contents)
-    {
-        $this->tokens = token_get_all($contents);
-
-        // The PHP parser sets internal compiler globals for certain things. Annoyingly, the last docblock comment it
-        // saw gets stored in doc_comment. When it comes to compile the next thing to be include()d this stored
-        // doc_comment becomes owned by the first thing the compiler sees in the file that it considers might have a
-        // docblock. If the first thing in the file is a class without a doc block this would cause calls to
-        // getDocBlock() on said class to return our long lost doc_comment. Argh.
-        // To workaround, cause the parser to parse an empty docblock. Sure getDocBlock() will return this, but at least
-        // it's harmless to us.
-        token_get_all("<?php\n/**\n *\n */");
-
-        $this->numTokens = count($this->tokens);
-    }
-
-    /**
-     * Gets the next non whitespace and non comment token.
-     *
-     * @param boolean $docCommentIsComment If TRUE then a doc comment is considered a comment and skipped.
-     *                                     If FALSE then only whitespace and normal comments are skipped.
-     *
-     * @return array|null The token if exists, null otherwise.
-     */
-    public function next($docCommentIsComment = TRUE)
-    {
-        for ($i = $this->pointer; $i < $this->numTokens; $i++) {
-            $this->pointer++;
-            if ($this->tokens[$i][0] === T_WHITESPACE ||
-                $this->tokens[$i][0] === T_COMMENT ||
-                ($docCommentIsComment && $this->tokens[$i][0] === T_DOC_COMMENT)) {
-
-                continue;
-            }
-
-            return $this->tokens[$i];
-        }
-
-        return null;
-    }
-
-    /**
-     * Parses a single use statement.
-     *
-     * @return array A list with all found class names for a use statement.
-     */
-    public function parseUseStatement()
-    {
-        $class = '';
-        $alias = '';
-        $statements = array();
-        $explicitAlias = false;
-        while (($token = $this->next())) {
-            $isNameToken = $token[0] === T_STRING || $token[0] === T_NS_SEPARATOR;
-            if (!$explicitAlias && $isNameToken) {
-                $class .= $token[1];
-                $alias = $token[1];
-            } else if ($explicitAlias && $isNameToken) {
-                $alias .= $token[1];
-            } else if ($token[0] === T_AS) {
-                $explicitAlias = true;
-                $alias = '';
-            } else if ($token === ',') {
-                $statements[strtolower($alias)] = $class;
-                $class = '';
-                $alias = '';
-                $explicitAlias = false;
-            } else if ($token === ';') {
-                $statements[strtolower($alias)] = $class;
-                break;
-            } else {
-                break;
-            }
-        }
-
-        return $statements;
-    }
-
-    /**
-     * Gets all use statements.
-     *
-     * @param string $namespaceName The namespace name of the reflected class.
-     *
-     * @return array A list with all found use statements.
-     */
-    public function parseUseStatements($namespaceName)
-    {
-        $statements = array();
-        while (($token = $this->next())) {
-            if ($token[0] === T_USE) {
-                $statements = array_merge($statements, $this->parseUseStatement());
-                continue;
-            }
-            if ($token[0] !== T_NAMESPACE || $this->parseNamespace() != $namespaceName) {
-                continue;
-            }
-
-            // Get fresh array for new namespace. This is to prevent the parser to collect the use statements
-            // for a previous namespace with the same name. This is the case if a namespace is defined twice
-            // or if a namespace with the same name is commented out.
-            $statements = array();
-        }
-
-        return $statements;
-    }
-
-    /**
-     * Gets the namespace.
-     *
-     * @return string The found namespace.
-     */
-    public function parseNamespace()
-    {
-        $name = '';
-        while (($token = $this->next()) && ($token[0] === T_STRING || $token[0] === T_NS_SEPARATOR)) {
-            $name .= $token[1];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Gets the class name.
-     *
-     * @return string The found class name.
-     */
-    public function parseClass()
-    {
-        // Namespaces and class names are tokenized the same: T_STRINGs
-        // separated by T_NS_SEPARATOR so we can use one function to provide
-        // both.
-        return $this->parseNamespace();
-    }
-}
diff --git a/vendor/doctrine/cache/.coveralls.yml b/vendor/doctrine/cache/.coveralls.yml
deleted file mode 100644
index 0c08233..0000000
--- a/vendor/doctrine/cache/.coveralls.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# for php-coveralls
-service_name: travis-ci
-src_dir: lib
-coverage_clover: build/logs/clover.xml
diff --git a/vendor/doctrine/cache/.gitignore b/vendor/doctrine/cache/.gitignore
deleted file mode 100644
index ca23023..0000000
--- a/vendor/doctrine/cache/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-build/
-phpunit.xml
-composer.lock
\ No newline at end of file
diff --git a/vendor/doctrine/cache/.travis.yml b/vendor/doctrine/cache/.travis.yml
deleted file mode 100644
index 2952a48..0000000
--- a/vendor/doctrine/cache/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-services:
-    - riak
-    - mongodb
-    - memcached
-    - redis-server
-
-before_install:
-    - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then pecl install riak-beta; fi"
-    - sh -c "if [[ $TRAVIS_PHP_VERSION != 'hhvm' && `php-config --vernum` -ge 50500 ]] ; then pecl config-set preferred_state beta; printf "yes\n" | pecl install apcu ; else echo 'extension="apc.so"' >> ./tests/travis/php.ini ;fi"
-    - composer self-update
-    - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-add ./tests/travis/php.ini; fi"
-
-install:
-    - composer --prefer-source --dev install
-
-script:
-    - ./vendor/bin/phpunit -c ./tests/travis/phpunit.travis.xml -v
-
-after_script:
-    - php vendor/bin/coveralls -v
-
-matrix:
-  allow_failures:
-    - php: hhvm
diff --git a/vendor/doctrine/cache/LICENSE b/vendor/doctrine/cache/LICENSE
deleted file mode 100644
index 4a91f0b..0000000
--- a/vendor/doctrine/cache/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2012 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/vendor/doctrine/cache/README.md b/vendor/doctrine/cache/README.md
deleted file mode 100644
index 94f80a3..0000000
--- a/vendor/doctrine/cache/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Doctrine Cache
-
-Master: [![Build Status](https://secure.travis-ci.org/doctrine/cache.png?branch=master)](http://travis-ci.org/doctrine/cache) [![Coverage Status](https://coveralls.io/repos/doctrine/cache/badge.png?branch=master)](https://coveralls.io/r/doctrine/cache?branch=master)
-
-[![Latest Stable Version](https://poser.pugx.org/doctrine/cache/v/stable.png)](https://packagist.org/packages/doctrine/cache) [![Total Downloads](https://poser.pugx.org/doctrine/cache/downloads.png)](https://packagist.org/packages/doctrine/cache)
-
-Cache component extracted from the Doctrine Common project.
-
-## Changelog
-
-### v1.2
-
-* Added support for MongoDB as Cache Provider
-* Fix namespace version reset
diff --git a/vendor/doctrine/cache/UPGRADE.md b/vendor/doctrine/cache/UPGRADE.md
deleted file mode 100644
index e1f8a50..0000000
--- a/vendor/doctrine/cache/UPGRADE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Upgrade to 1.4
-
-## Minor BC Break: `Doctrine\Common\Cache\FileCache#$extension` is now `private`.
-
-If you need to override the value of `Doctrine\Common\Cache\FileCache#$extension`, then use the
-second parameter of `Doctrine\Common\Cache\FileCache#__construct()` instead of overriding
-the property in your own implementation.
-
-## Minor BC Break: file based caches paths changed
-
-`Doctrine\Common\Cache\FileCache`, `Doctrine\Common\Cache\PhpFileCache` and
-`Doctrine\Common\Cache\FilesystemCache` are using a different cache paths structure.
-
-If you rely on warmed up caches for deployments, consider that caches generated
-with `doctrine/cache` `<1.4` are not compatible with the new directory structure,
-and will be ignored.
diff --git a/vendor/doctrine/cache/build.properties b/vendor/doctrine/cache/build.properties
deleted file mode 100644
index 2d98c36..0000000
--- a/vendor/doctrine/cache/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version class and file
-project.version_class = Doctrine\\Common\\Cache\\Version
-project.version_file = lib/Doctrine/Common/Cache/Version.php
diff --git a/vendor/doctrine/cache/build.xml b/vendor/doctrine/cache/build.xml
deleted file mode 100644
index a7c52e3..0000000
--- a/vendor/doctrine/cache/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<project name="DoctrineCommonCache" default="build" basedir=".">
-    <property file="build.properties" />
-
-    <target name="php">
-        <exec executable="which" outputproperty="php_executable">
-            <arg value="php" />
-        </exec>
-    </target>
-
-    <target name="prepare">
-        <mkdir dir="build" />
-    </target>
-
-    <target name="build" depends="check-git-checkout-clean,prepare,php,composer">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="archive" />
-            <arg value="--dir=build" />
-        </exec>
-    </target>
-
-    <target name="composer" depends="php,composer-check,composer-download">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="install" />
-        </exec>
-    </target>
-
-    <target name="composer-check" depends="prepare">
-        <available file="build/composer.phar" property="composer.present"/>
-    </target>
-
-    <target name="composer-download" unless="composer.present">
-        <exec executable="wget">
-            <arg value="-Obuild/composer.phar" />
-            <arg value="http://getcomposer.org/composer.phar" />
-        </exec>
-    </target>
-
-    <target name="make-release" depends="check-git-checkout-clean,prepare,php">
-        <replace file="${project.version_file}" token="-DEV" value="" failOnNoReplacements="true" />
-        <exec executable="git" failonerror="true" outputproperty="current_git_branch">
-            <arg value="rev-parse" />
-            <arg value="--abbrev-ref" />
-            <arg value="HEAD" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.current_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="require_once '${project.version_file}';echo ${project.version_class}::VERSION;" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.next_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="$parts = explode('.', str_ireplace(array('-DEV', '-ALPHA', '-BETA'), '', '${doctrine.current_version}'));
-                if (count($parts) != 3) {
-                    throw new \InvalidArgumentException('Version is assumed in format x.y.z, ${doctrine.current_version} given');
-                }
-                if ('${current_git_branch}' === 'master') {
-                    $parts[1]++;
-                } else {
-                    $parts[2]++;
-                }
-                echo implode('.', $parts);
-            " />
-        </exec>
-
-        <git-commit file="${project.version_file}" message="Release ${doctrine.current_version}" />
-        <git-tag version="${doctrine.current_version}" />
-        <replace file="${project.version_file}" token="${doctrine.current_version}" value="${doctrine.next_version}-DEV" />
-        <git-commit file="${project.version_file}" message="Bump version to ${doctrine.next_version}" />
-    </target>
-
-    <target name="check-git-checkout-clean">
-        <exec executable="git" failonerror="true">
-            <arg value="diff-index" />
-            <arg value="--quiet" />
-            <arg value="HEAD" />
-        </exec>
-    </target>
-
-    <macrodef name="git-commit">
-        <attribute name="file" default="NOT SET"/>
-        <attribute name="message" default="NOT SET"/>
-
-        <sequential>
-            <exec executable="git">
-                <arg value="add" />
-                <arg value="@{file}" />
-            </exec>
-            <exec executable="git">
-                <arg value="commit" />
-                <arg value="-m" />
-                <arg value="@{message}" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="git-tag">
-        <attribute name="version" default="NOT SET" />
-
-        <sequential>
-            <exec executable="git">
-                <arg value="tag" />
-                <arg value="-m" />
-                <arg value="v@{version}" />
-                <arg value="v@{version}" />
-            </exec>
-        </sequential>
-    </macrodef>
-</project>
diff --git a/vendor/doctrine/cache/composer.json b/vendor/doctrine/cache/composer.json
deleted file mode 100644
index f3caa7a..0000000
--- a/vendor/doctrine/cache/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "doctrine/cache",
-    "type": "library",
-    "description": "Caching library offering an object-oriented API for many cache backends",
-    "keywords": ["cache", "caching"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit":         ">=3.7",
-        "satooshi/php-coveralls":  "~0.6",
-        "predis/predis":           "~1.0"
-    },
-    "conflict": {
-        "doctrine/common": ">2.2,<2.4"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\Cache\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.5.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
deleted file mode 100644
index abd5e71..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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\Cache;
-
-/**
- * APC cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class ApcCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return apc_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return apc_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return (bool) apc_store($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return apc_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return apc_clear_cache() && apc_clear_cache('user');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return apc_fetch($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = apc_cache_info('', true);
-        $sma  = apc_sma_info();
-
-        // @TODO - Temporary fix @see https://github.com/krakjoe/apcu/pull/42
-        if (PHP_VERSION_ID >= 50500) {
-            $info['num_hits']   = isset($info['num_hits'])   ? $info['num_hits']   : $info['nhits'];
-            $info['num_misses'] = isset($info['num_misses']) ? $info['num_misses'] : $info['nmisses'];
-            $info['start_time'] = isset($info['start_time']) ? $info['start_time'] : $info['stime'];
-        }
-
-        return array(
-            Cache::STATS_HITS             => $info['num_hits'],
-            Cache::STATS_MISSES           => $info['num_misses'],
-            Cache::STATS_UPTIME           => $info['start_time'],
-            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
-            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
deleted file mode 100644
index 31a0729..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Cache;
-
-/**
- * Array cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class ArrayCache extends CacheProvider
-{
-    /**
-     * @var array $data
-     */
-    private $data = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->doContains($id) ? $this->data[$id] : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        // isset() is required for performance optimizations, to avoid unnecessary function calls to array_key_exists.
-        return isset($this->data[$id]) || array_key_exists($id, $this->data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $this->data[$id] = $data;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        unset($this->data[$id]);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->data = array();
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return null;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
deleted file mode 100644
index 205a123..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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\Cache;
-
-/**
- * Interface for cache drivers.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface Cache
-{
-    const STATS_HITS             = 'hits';
-    const STATS_MISSES           = 'misses';
-    const STATS_UPTIME           = 'uptime';
-    const STATS_MEMORY_USAGE     = 'memory_usage';
-    const STATS_MEMORY_AVAILABLE = 'memory_available';
-    /**
-     * Only for backward compatibility (may be removed in next major release)
-     *
-     * @deprecated
-     */
-    const STATS_MEMORY_AVAILIABLE = 'memory_available';
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param string $id The id of the cache entry to fetch.
-     *
-     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    public function fetch($id);
-
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param string $id The cache id of the entry to check for.
-     *
-     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    public function contains($id);
-
-    /**
-     * Puts data into the cache.
-     *
-     * @param string $id       The cache id.
-     * @param mixed  $data     The cache entry/data.
-     * @param int    $lifeTime The cache lifetime.
-     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
-     *
-     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    public function save($id, $data, $lifeTime = 0);
-
-    /**
-     * Deletes a cache entry.
-     *
-     * @param string $id The cache id.
-     *
-     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
-     */
-    public function delete($id);
-
-    /**
-     * Retrieves cached information from the data store.
-     *
-     * The server's statistics array has the following values:
-     *
-     * - <b>hits</b>
-     * Number of keys that have been requested and found present.
-     *
-     * - <b>misses</b>
-     * Number of items that have been requested and not found.
-     *
-     * - <b>uptime</b>
-     * Time that the server is running.
-     *
-     * - <b>memory_usage</b>
-     * Memory used by this server to store items.
-     *
-     * - <b>memory_available</b>
-     * Memory allowed to use for storage.
-     *
-     * @since 2.2
-     *
-     * @return array|null An associative array with server's statistics if available, NULL otherwise.
-     */
-    public function getStats();
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
deleted file mode 100644
index a172a4c..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?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\Cache;
-
-/**
- * Base class for cache provider implementations.
- *
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, MultiGetCache
-{
-    const DOCTRINE_NAMESPACE_CACHEKEY = 'DoctrineNamespaceCacheKey[%s]';
-
-    /**
-     * The namespace to prefix all cache ids with.
-     *
-     * @var string
-     */
-    private $namespace = '';
-
-    /**
-     * The namespace version.
-     *
-     * @var integer|null
-     */
-    private $namespaceVersion;
-
-    /**
-     * Sets the namespace to prefix all cache ids with.
-     *
-     * @param string $namespace
-     *
-     * @return void
-     */
-    public function setNamespace($namespace)
-    {
-        $this->namespace        = (string) $namespace;
-        $this->namespaceVersion = null;
-    }
-
-    /**
-     * Retrieves the namespace that prefixes all cache ids.
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetch($id)
-    {
-        return $this->doFetch($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchMultiple(array $keys)
-    {
-        // note: the array_combine() is in place to keep an association between our $keys and the $namespacedKeys
-        $namespacedKeys = array_combine($keys, array_map(array($this, 'getNamespacedId'), $keys));
-        $items          = $this->doFetchMultiple($namespacedKeys);
-        $foundItems     = array();
-
-        // no internal array function supports this sort of mapping: needs to be iterative
-        // this filters and combines keys in one pass
-        foreach ($namespacedKeys as $requestedKey => $namespacedKey) {
-            if (isset($items[$namespacedKey])) {
-                $foundItems[$requestedKey] = $items[$namespacedKey];
-            }
-        }
-
-        return $foundItems;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function contains($id)
-    {
-        return $this->doContains($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save($id, $data, $lifeTime = 0)
-    {
-        return $this->doSave($this->getNamespacedId($id), $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($id)
-    {
-        return $this->doDelete($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStats()
-    {
-        return $this->doGetStats();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function flushAll()
-    {
-        return $this->doFlush();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function deleteAll()
-    {
-        $namespaceCacheKey = $this->getNamespaceCacheKey();
-        $namespaceVersion  = $this->getNamespaceVersion() + 1;
-
-        $this->namespaceVersion = $namespaceVersion;
-
-        return $this->doSave($namespaceCacheKey, $namespaceVersion);
-    }
-
-    /**
-     * Prefixes the passed id with the configured namespace value.
-     *
-     * @param string $id The id to namespace.
-     *
-     * @return string The namespaced id.
-     */
-    private function getNamespacedId($id)
-    {
-        $namespaceVersion  = $this->getNamespaceVersion();
-
-        return sprintf('%s[%s][%s]', $this->namespace, $id, $namespaceVersion);
-    }
-
-    /**
-     * Returns the namespace cache key.
-     *
-     * @return string
-     */
-    private function getNamespaceCacheKey()
-    {
-        return sprintf(self::DOCTRINE_NAMESPACE_CACHEKEY, $this->namespace);
-    }
-
-    /**
-     * Returns the namespace version.
-     *
-     * @return integer
-     */
-    private function getNamespaceVersion()
-    {
-        if (null !== $this->namespaceVersion) {
-            return $this->namespaceVersion;
-        }
-
-        $namespaceCacheKey = $this->getNamespaceCacheKey();
-        $namespaceVersion = $this->doFetch($namespaceCacheKey);
-
-        if (false === $namespaceVersion) {
-            $namespaceVersion = 1;
-
-            $this->doSave($namespaceCacheKey, $namespaceVersion);
-        }
-
-        $this->namespaceVersion = $namespaceVersion;
-
-        return $this->namespaceVersion;
-    }
-
-    /**
-     * Default implementation of doFetchMultiple. Each driver that supports multi-get should owerwrite it.
-     *
-     * @param array $keys Array of keys to retrieve from cache
-     * @return array Array of values retrieved for the given keys.
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $returnValues = array();
-
-        foreach ($keys as $index => $key) {
-            if (false !== ($item = $this->doFetch($key))) {
-                $returnValues[$key] = $item;
-            }
-        }
-
-        return $returnValues;
-    }
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param string $id The id of the cache entry to fetch.
-     *
-     * @return mixed|boolean The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    abstract protected function doFetch($id);
-
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param string $id The cache id of the entry to check for.
-     *
-     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    abstract protected function doContains($id);
-
-    /**
-     * Puts data into the cache.
-     *
-     * @param string $id       The cache id.
-     * @param string $data     The cache entry/data.
-     * @param int    $lifeTime The lifetime. If != 0, sets a specific lifetime for this
-     *                           cache entry (0 => infinite lifeTime).
-     *
-     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    abstract protected function doSave($id, $data, $lifeTime = 0);
-
-    /**
-     * Deletes a cache entry.
-     *
-     * @param string $id The cache id.
-     *
-     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
-     */
-    abstract protected function doDelete($id);
-
-    /**
-     * Flushes all cache entries.
-     *
-     * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise.
-     */
-    abstract protected function doFlush();
-
-    /**
-     * Retrieves cached information from the data store.
-     *
-     * @since 2.2
-     *
-     * @return array|null An associative array with server's statistics if available, NULL otherwise.
-     */
-    abstract protected function doGetStats();
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php
deleted file mode 100644
index 96c9b54..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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\Cache;
-
-/**
- * Cache provider that allows to easily chain multiple cache providers
- *
- * @author Michaël Gallego <mic.gallego@gmail.com>
- */
-class ChainCache extends CacheProvider
-{
-    /**
-     * @var CacheProvider[]
-     */
-    private $cacheProviders = array();
-
-    /**
-     * Constructor
-     *
-     * @param CacheProvider[] $cacheProviders
-     */
-    public function __construct($cacheProviders = array())
-    {
-        $this->cacheProviders = $cacheProviders;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setNamespace($namespace)
-    {
-        parent::setNamespace($namespace);
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $cacheProvider->setNamespace($namespace);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        foreach ($this->cacheProviders as $key => $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                $value = $cacheProvider->doFetch($id);
-
-                // We populate all the previous cache layers (that are assumed to be faster)
-                for ($subKey = $key - 1 ; $subKey >= 0 ; $subKey--) {
-                    $this->cacheProviders[$subKey]->doSave($id, $value);
-                }
-
-                return $value;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        foreach ($this->cacheProviders as $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $stored = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stored = $cacheProvider->doSave($id, $data, $lifeTime) && $stored;
-        }
-
-        return $stored;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        $deleted = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $deleted = $cacheProvider->doDelete($id) && $deleted;
-        }
-
-        return $deleted;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        $flushed = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $flushed = $cacheProvider->doFlush() && $flushed;
-        }
-
-        return $flushed;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        // We return all the stats from all adapters
-        $stats = array();
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stats[] = $cacheProvider->doGetStats();
-        }
-
-        return $stats;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
deleted file mode 100644
index d7b4358..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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\Cache;
-
-/**
- * Interface for cache that can be flushed.
- *
- * Intended to be used for partial clearing of a cache namespace. For a more
- * global "flushing", see {@see FlushableCache}.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Adirelle <adirelle@gmail.com>
- */
-interface ClearableCache
-{
-    /**
-     * Deletes all cache entries in the current cache namespace.
-     *
-     * @return boolean TRUE if the cache entries were successfully deleted, FALSE otherwise.
-     */
-    public function deleteAll();
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php
deleted file mode 100644
index c21691d..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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\Cache;
-
-use \Couchbase;
-
-/**
- * Couchbase cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Michael Nitschinger <michael@nitschinger.at>
- */
-class CouchbaseCache extends CacheProvider
-{
-    /**
-     * @var Couchbase|null
-     */
-    private $couchbase;
-
-    /**
-     * Sets the Couchbase instance to use.
-     *
-     * @param Couchbase $couchbase
-     *
-     * @return void
-     */
-    public function setCouchbase(Couchbase $couchbase)
-    {
-        $this->couchbase = $couchbase;
-    }
-
-    /**
-     * Gets the Couchbase instance used by the cache.
-     *
-     * @return Couchbase|null
-     */
-    public function getCouchbase()
-    {
-        return $this->couchbase;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->couchbase->get($id) ?: false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (null !== $this->couchbase->get($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->couchbase->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->couchbase->delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->couchbase->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->couchbase->getStats();
-        $servers = $this->couchbase->getServers();
-        $server  = explode(":", $servers[0]);
-        $key     = $server[0] . ":" . "11210";
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
deleted file mode 100644
index 9ad3ce2..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?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\Cache;
-
-/**
- * Base file cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-abstract class FileCache extends CacheProvider
-{
-    /**
-     * The cache directory.
-     *
-     * @var string
-     */
-    protected $directory;
-
-    /**
-     * The cache file extension.
-     *
-     * @var string
-     */
-    private $extension;
-
-    /**
-     * @var string[] regular expressions for replacing disallowed characters in file name
-     */
-    private $disallowedCharacterPatterns = array(
-        '/\-/', // replaced to disambiguate original `-` and `-` derived from replacements
-        '/[^a-zA-Z0-9\-_\[\]]/' // also excludes non-ascii chars (not supported, depending on FS)
-    );
-
-    /**
-     * @var string[] replacements for disallowed file characters
-     */
-    private $replacementCharacters = array('__', '-');
-
-    /**
-     * @var int
-     */
-    private $umask;
-
-    /**
-     * Constructor.
-     *
-     * @param string $directory The cache directory.
-     * @param string $extension The cache file extension.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($directory, $extension = '', $umask = 0002)
-    {
-        // YES, this needs to be *before* createPathIfNeeded()
-        if ( ! is_int($umask)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The umask parameter is required to be integer, was: %s',
-                gettype($umask)
-            ));
-        }
-        $this->umask = $umask;
-
-        if ( ! $this->createPathIfNeeded($directory)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The directory "%s" does not exist and could not be created.',
-                $directory
-            ));
-        }
-
-        if ( ! is_writable($directory)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The directory "%s" is not writable.',
-                $directory
-            ));
-        }
-
-        // YES, this needs to be *after* createPathIfNeeded()
-        $this->directory = realpath($directory);
-        $this->extension = (string) $extension;
-    }
-
-    /**
-     * Gets the cache directory.
-     *
-     * @return string
-     */
-    public function getDirectory()
-    {
-        return $this->directory;
-    }
-
-    /**
-     * Gets the cache file extension.
-     *
-     * @return string|null
-     */
-    public function getExtension()
-    {
-        return $this->extension;
-    }
-
-    /**
-     * @param string $id
-     *
-     * @return string
-     */
-    protected function getFilename($id)
-    {
-        return $this->directory
-            . DIRECTORY_SEPARATOR
-            . implode(str_split(hash('sha256', $id), 2), DIRECTORY_SEPARATOR)
-            . DIRECTORY_SEPARATOR
-            . preg_replace($this->disallowedCharacterPatterns, $this->replacementCharacters, $id)
-            . $this->extension;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return @unlink($this->getFilename($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        foreach ($this->getIterator() as $name => $file) {
-            @unlink($name);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $usage = 0;
-        foreach ($this->getIterator() as $file) {
-            $usage += $file->getSize();
-        }
-
-        $free = disk_free_space($this->directory);
-
-        return array(
-            Cache::STATS_HITS               => null,
-            Cache::STATS_MISSES             => null,
-            Cache::STATS_UPTIME             => null,
-            Cache::STATS_MEMORY_USAGE       => $usage,
-            Cache::STATS_MEMORY_AVAILABLE   => $free,
-        );
-    }
-
-    /**
-     * Create path if needed.
-     *
-     * @param string $path
-     * @return bool TRUE on success or if path already exists, FALSE if path cannot be created.
-     */
-    private function createPathIfNeeded($path)
-    {
-        if ( ! is_dir($path)) {
-            if (false === @mkdir($path, 0777 & (~$this->umask), true) && !is_dir($path)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Writes a string content to file in an atomic way.
-     *
-     * @param string $filename Path to the file where to write the data.
-     * @param string $content  The content to write
-     *
-     * @return bool TRUE on success, FALSE if path cannot be created, if path is not writable or an any other error.
-     */
-    protected function writeFile($filename, $content)
-    {
-        $filepath = pathinfo($filename, PATHINFO_DIRNAME);
-
-        if ( ! $this->createPathIfNeeded($filepath)) {
-            return false;
-        }
-
-        if ( ! is_writable($filepath)) {
-            return false;
-        }
-
-        $tmpFile = tempnam($filepath, 'swap');
-        @chmod($tmpFile, 0666 & (~$this->umask));
-
-        if (file_put_contents($tmpFile, $content) !== false) {
-            if (@rename($tmpFile, $filename)) {
-                return true;
-            }
-
-            @unlink($tmpFile);
-        }
-
-        return false;
-    }
-
-    /**
-     * @return \Iterator
-     */
-    private function getIterator()
-    {
-        return new \RegexIterator(
-            new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory)),
-            '/^.+' . preg_quote($this->extension, '/') . '$/i'
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
deleted file mode 100644
index 29d5e07..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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\Cache;
-
-/**
- * Filesystem cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class FilesystemCache extends FileCache
-{
-    const EXTENSION = '.doctrinecache.data';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        parent::__construct($directory, $extension, $umask);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $data     = '';
-        $lifetime = -1;
-        $filename = $this->getFilename($id);
-
-        if ( ! is_file($filename)) {
-            return false;
-        }
-
-        $resource = fopen($filename, "r");
-
-        if (false !== ($line = fgets($resource))) {
-            $lifetime = (integer) $line;
-        }
-
-        if ($lifetime !== 0 && $lifetime < time()) {
-            fclose($resource);
-
-            return false;
-        }
-
-        while (false !== ($line = fgets($resource))) {
-            $data .= $line;
-        }
-
-        fclose($resource);
-
-        return unserialize($data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $lifetime = -1;
-        $filename = $this->getFilename($id);
-
-        if ( ! is_file($filename)) {
-            return false;
-        }
-
-        $resource = fopen($filename, "r");
-
-        if (false !== ($line = fgets($resource))) {
-            $lifetime = (integer) $line;
-        }
-
-        fclose($resource);
-
-        return $lifetime === 0 || $lifetime > time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            $lifeTime = time() + $lifeTime;
-        }
-
-        $data      = serialize($data);
-        $filename  = $this->getFilename($id);
-
-        return $this->writeFile($filename, $lifeTime . PHP_EOL . $data);
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
deleted file mode 100644
index e4e606b..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Cache;
-
-/**
- * Interface for cache that can be flushed.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Adirelle <adirelle@gmail.com>
- */
-interface FlushableCache
-{
-    /**
-     * Flushes all cache entries, globally.
-     *
-     * @return boolean TRUE if the cache entries were successfully flushed, FALSE otherwise.
-     */
-    public function flushAll();
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
deleted file mode 100644
index c5098fd..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Cache;
-
-use \Memcache;
-
-/**
- * Memcache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcacheCache extends CacheProvider
-{
-    /**
-     * @var Memcache|null
-     */
-    private $memcache;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcache $memcache
-     *
-     * @return void
-     */
-    public function setMemcache(Memcache $memcache)
-    {
-        $this->memcache = $memcache;
-    }
-
-    /**
-     * Gets the memcache instance used by the cache.
-     *
-     * @return Memcache|null
-     */
-    public function getMemcache()
-    {
-        return $this->memcache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcache->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $flags = null;
-        $this->memcache->get($id, $flags);
-        
-        //if memcache has changed the value of "flags", it means the value exists
-        return ($flags !== null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcache->set($id, $data, 0, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->memcache->delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcache->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats = $this->memcache->getStats();
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
deleted file mode 100644
index 040c26c..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?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\Cache;
-
-use \Memcached;
-
-/**
- * Memcached cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcachedCache extends CacheProvider
-{
-    /**
-     * @var Memcached|null
-     */
-    private $memcached;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcached $memcached
-     *
-     * @return void
-     */
-    public function setMemcached(Memcached $memcached)
-    {
-        $this->memcached = $memcached;
-    }
-
-    /**
-     * Gets the memcached instance used by the cache.
-     *
-     * @return Memcached|null
-     */
-    public function getMemcached()
-    {
-        return $this->memcached;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcached->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return $this->memcached->getMulti($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (false !== $this->memcached->get($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcached->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->memcached->delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcached->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->memcached->getStats();
-        $servers = $this->memcached->getServerList();
-        $key     = $servers[0]['host'] . ':' . $servers[0]['port'];
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
deleted file mode 100644
index 0c7ac0a..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?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\Cache;
-
-use MongoBinData;
-use MongoCollection;
-use MongoDate;
-
-/**
- * MongoDB cache provider.
- *
- * @since  1.1
- * @author Jeremy Mikola <jmikola@gmail.com>
- */
-class MongoDBCache extends CacheProvider
-{
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a MongoDate value indicating when the
-     * cache entry should expire.
-     *
-     * With MongoDB 2.2+, entries can be automatically deleted by MongoDB by
-     * indexing this field wit the "expireAfterSeconds" option equal to zero.
-     * This will direct MongoDB to regularly query for and delete any entries
-     * whose date is older than the current time. Entries without a date value
-     * in this field will be ignored.
-     *
-     * The cache provider will also check dates on its own, in case expired
-     * entries are fetched before MongoDB's TTLMonitor pass can expire them.
-     *
-     * @see http://docs.mongodb.org/manual/tutorial/expire-data/
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var MongoCollection
-     */
-    private $collection;
-
-    /**
-     * Constructor.
-     *
-     * This provider will default to the write concern and read preference
-     * options set on the MongoCollection instance (or inherited from MongoDB or
-     * MongoClient). Using an unacknowledged write concern (< 1) may make the
-     * return values of delete() and save() unreliable. Reading from secondaries
-     * may make contain() and fetch() unreliable.
-     *
-     * @see http://www.php.net/manual/en/mongo.readpreferences.php
-     * @see http://www.php.net/manual/en/mongo.writeconcerns.php
-     * @param MongoCollection $collection
-     */
-    public function __construct(MongoCollection $collection)
-    {
-        $this->collection = $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::DATA_FIELD, self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return unserialize($document[self::DATA_FIELD]->bin);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $result = $this->collection->update(
-            array('_id' => $id),
-            array('$set' => array(
-                self::EXPIRATION_FIELD => ($lifeTime > 0 ? new MongoDate(time() + $lifeTime) : null),
-                self::DATA_FIELD => new MongoBinData(serialize($data), MongoBinData::BYTE_ARRAY),
-            )),
-            array('upsert' => true, 'multiple' => false)
-        );
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        $result = $this->collection->remove(array('_id' => $id));
-
-        return isset($result['n']) ? $result['n'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        // Use remove() in lieu of drop() to maintain any collection indexes
-        $result = $this->collection->remove();
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $serverStatus = $this->collection->db->command(array(
-            'serverStatus' => 1,
-            'locks' => 0,
-            'metrics' => 0,
-            'recordStats' => 0,
-            'repl' => 0,
-        ));
-
-        $collStats = $this->collection->db->command(array('collStats' => 1));
-
-        return array(
-            Cache::STATS_HITS => null,
-            Cache::STATS_MISSES => null,
-            Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (integer) $serverStatus['uptime'] : null),
-            Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (integer) $collStats['size'] : null),
-            Cache::STATS_MEMORY_AVAILABLE  => null,
-        );
-    }
-
-    /**
-     * Check if the document is expired.
-     *
-     * @param array $document
-     * @return boolean
-     */
-    private function isExpired(array $document)
-    {
-        return isset($document[self::EXPIRATION_FIELD]) &&
-            $document[self::EXPIRATION_FIELD] instanceof MongoDate &&
-            $document[self::EXPIRATION_FIELD]->sec < time();
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php
deleted file mode 100644
index df7146d..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Cache;
-
-/**
- * Interface for cache drivers that allows to get many items at once.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Asmir Mustafic <goetas@gmail.com>
- */
-interface MultiGetCache
-{
-    /**
-     * Returns an associative array of values for keys is found in cache.
-     *
-     * @param string[] $keys Array of keys to retrieve from cache
-     * @return mixed[] Array of retrieved values, indexed by the specified keys.
-     *                 Values that couldn't be retrieved are not contained in this array.
-     */
-    function fetchMultiple(array $keys);
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php
deleted file mode 100644
index 5e75196..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Cache;
-
-/**
- * Php file cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class PhpFileCache extends FileCache
-{
-    const EXTENSION = '.doctrinecache.php';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        parent::__construct($directory, $extension, $umask);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        if ($value['lifetime'] !== 0 && $value['lifetime'] < time()) {
-            return false;
-        }
-
-        return $value['data'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        return $value['lifetime'] === 0 || $value['lifetime'] > time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            $lifeTime = time() + $lifeTime;
-        }
-
-        if (is_object($data) && ! method_exists($data, '__set_state')) {
-            throw new \InvalidArgumentException(
-                "Invalid argument given, PhpFileCache only allows objects that implement __set_state() " .
-                "and fully support var_export(). You can use the FilesystemCache to save arbitrary object " .
-                "graphs using serialize()/deserialize()."
-            );
-        }
-
-        $filename  = $this->getFilename($id);
-
-        $value = array(
-            'lifetime'  => $lifeTime,
-            'data'      => $data
-        );
-
-        $value  = var_export($value, true);
-        $code   = sprintf('<?php return %s;', $value);
-
-        return $this->writeFile($filename, $code);
-    }
-
-    /**
-     * @param string $id
-     *
-     * @return array|false
-     */
-    private function includeFileForId($id)
-    {
-        $fileName = $this->getFilename($id);
-
-        // note: error suppression is still faster than `file_exists`, `is_file` and `is_readable`
-        $value = @include $fileName;
-
-        if (! isset($value['lifetime'])) {
-            return false;
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
deleted file mode 100644
index 823477e..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Doctrine\Common\Cache;
-
-use Predis\Client;
-
-/**
- * Predis cache provider.
- *
- * @author othillo <othillo@othillo.nl>
- */
-class PredisCache extends CacheProvider
-{
-    /**
-     * @var Client
-     */
-    private $client;
-
-    /**
-     * @param Client $client
-     *
-     * @return void
-     */
-    public function __construct(Client $client)
-    {
-        $this->client = $client;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $result = $this->client->get($id);
-        if (null === $result) {
-            return false;
-        }
-
-        return unserialize($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $fetchedItems = call_user_func_array(array($this->client, 'mget'), $keys);
-
-        return array_filter(array_combine($keys, array_map('unserialize', $fetchedItems)));
-    }
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return $this->client->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $data = serialize($data);
-        if ($lifeTime > 0) {
-            $response = $this->client->setex($id, $lifeTime, $data);
-        } else {
-            $response = $this->client->set($id, $data);
-        }
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->client->del($id) > 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $response = $this->client->flushdb();
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->client->info();
-
-        return array(
-            Cache::STATS_HITS              => $info['Stats']['keyspace_hits'],
-            Cache::STATS_MISSES            => $info['Stats']['keyspace_misses'],
-            Cache::STATS_UPTIME            => $info['Server']['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['Memory']['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
deleted file mode 100644
index 50d7c91..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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\Cache;
-
-use Redis;
-
-/**
- * Redis cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Osman Ungur <osmanungur@gmail.com>
- */
-class RedisCache extends CacheProvider
-{
-    /**
-     * @var Redis|null
-     */
-    private $redis;
-
-    /**
-     * Sets the redis instance to use.
-     *
-     * @param Redis $redis
-     *
-     * @return void
-     */
-    public function setRedis(Redis $redis)
-    {
-        $redis->setOption(Redis::OPT_SERIALIZER, $this->getSerializerValue());
-        $this->redis = $redis;
-    }
-
-    /**
-     * Gets the redis instance used by the cache.
-     *
-     * @return Redis|null
-     */
-    public function getRedis()
-    {
-        return $this->redis;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->redis->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return array_filter(array_combine($keys, $this->redis->mget($keys)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return $this->redis->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            return $this->redis->setex($id, $lifeTime, $data);
-        }
-
-        return $this->redis->set($id, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->redis->delete($id) > 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->redis->flushDB();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->redis->info();
-        return array(
-            Cache::STATS_HITS   => $info['keyspace_hits'],
-            Cache::STATS_MISSES => $info['keyspace_misses'],
-            Cache::STATS_UPTIME => $info['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-
-    /**
-     * Returns the serializer constant to use. If Redis is compiled with
-     * igbinary support, that is used. Otherwise the default PHP serializer is
-     * used.
-     *
-     * @return integer One of the Redis::SERIALIZER_* constants
-     */
-    protected function getSerializerValue()
-    {
-        if (defined('HHVM_VERSION')) {
-            return Redis::SERIALIZER_PHP;
-        }
-        return defined('Redis::SERIALIZER_IGBINARY') ? Redis::SERIALIZER_IGBINARY : Redis::SERIALIZER_PHP;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
deleted file mode 100644
index 8bb6b4b..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?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\Cache;
-
-use Riak\Bucket;
-use Riak\Connection;
-use Riak\Input;
-use Riak\Exception;
-use Riak\Object;
-
-/**
- * Riak cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  1.1
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class RiakCache extends CacheProvider
-{
-    const EXPIRES_HEADER = 'X-Riak-Meta-Expires';
-
-    /**
-     * @var \Riak\Bucket
-     */
-    private $bucket;
-
-    /**
-     * Sets the riak bucket instance to use.
-     *
-     * @param \Riak\Bucket $bucket
-     */
-    public function __construct(Bucket $bucket)
-    {
-        $this->bucket = $bucket;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        try {
-            $response = $this->bucket->get($id);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            // Check for attempted siblings
-            $object = ($response->hasSiblings())
-                ? $this->resolveConflict($id, $response->getVClock(), $response->getObjectList())
-                : $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return unserialize($object->getContent());
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\ConnectionException
-            // - Riak\CommunicationException
-            // - Riak\UnexpectedResponseException
-            // - Riak\NotFoundException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        try {
-            // We only need the HEAD, not the entire object
-            $input = new Input\GetInput();
-
-            $input->setReturnHead(true);
-
-            $response = $this->bucket->get($id, $input);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            $object = $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        try {
-            $object = new Object($id);
-
-            $object->setContent(serialize($data));
-
-            if ($lifeTime > 0) {
-                $object->addMetadata(self::EXPIRES_HEADER, (string) (time() + $lifeTime));
-            }
-
-            $this->bucket->put($object);
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        try {
-            $this->bucket->delete($id);
-
-            return true;
-        } catch (Exception\BadArgumentsException $e) {
-            // Key did not exist on cluster already
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\Exception\ConnectionException
-            // - Riak\Exception\CommunicationException
-            // - Riak\Exception\UnexpectedResponseException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        try {
-            $keyList = $this->bucket->getKeyList();
-
-            foreach ($keyList as $key) {
-                $this->bucket->delete($key);
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // Only exposed through HTTP stats API, not Protocol Buffers API
-        return null;
-    }
-
-    /**
-     * Check if a given Riak Object have expired.
-     *
-     * @param \Riak\Object $object
-     *
-     * @return boolean
-     */
-    private function isExpired(Object $object)
-    {
-        $metadataMap = $object->getMetadataMap();
-
-        return isset($metadataMap[self::EXPIRES_HEADER])
-            && $metadataMap[self::EXPIRES_HEADER] < time();
-    }
-
-    /**
-     * On-read conflict resolution. Applied approach here is last write wins.
-     * Specific needs may override this method to apply alternate conflict resolutions.
-     *
-     * {@internal Riak does not attempt to resolve a write conflict, and store
-     * it as sibling of conflicted one. By following this approach, it is up to
-     * the next read to resolve the conflict. When this happens, your fetched
-     * object will have a list of siblings (read as a list of objects).
-     * In our specific case, we do not care about the intermediate ones since
-     * they are all the same read from storage, and we do apply a last sibling
-     * (last write) wins logic.
-     * If by any means our resolution generates another conflict, it'll up to
-     * next read to properly solve it.}
-     *
-     * @param string $id
-     * @param string $vClock
-     * @param array  $objectList
-     *
-     * @return \Riak\Object
-     */
-    protected function resolveConflict($id, $vClock, array $objectList)
-    {
-        // Our approach here is last-write wins
-        $winner = $objectList[count($objectList)];
-
-        $putInput = new Input\PutInput();
-        $putInput->setVClock($vClock);
-
-        $mergedObject = new Object($id);
-        $mergedObject->setContent($winner->getContent());
-
-        $this->bucket->put($mergedObject, $putInput);
-
-        return $mergedObject;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
deleted file mode 100644
index b12978c..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?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\Cache;
-
-use SQLite3;
-use SQLite3Result;
-
-/**
- * SQLite3 cache provider.
- *
- * @since  1.4
- * @author Jake Bell <jake@theunraveler.com>
- */
-class SQLite3Cache extends CacheProvider
-{
-    /**
-     * The ID field will store the cache key.
-     */
-    const ID_FIELD = 'k';
-
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a date value indicating when the
-     * cache entry should expire.
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var SQLite3
-     */
-    private $sqlite;
-
-    /**
-     * @var string
-     */
-    private $table;
-
-    /**
-     * Constructor.
-     *
-     * Calling the constructor will ensure that the database file and table 
-     * exist and will create both if they don't.
-     *
-     * @param SQLite3 $sqlite
-     * @param string $table
-     */
-    public function __construct(SQLite3 $sqlite, $table)
-    {
-        $this->sqlite = $sqlite;
-        $this->table  = (string) $table;
-
-        list($id, $data, $exp) = $this->getFields();
-
-        return $this->sqlite->exec(sprintf(
-            'CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY NOT NULL, %s BLOB, %s INTEGER)',
-            $table,
-            $id,
-            $data,
-            $exp
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        if ($item = $this->findById($id)) {
-            return unserialize($item[self::DATA_FIELD]);
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (boolean) $this->findById($id, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $statement = $this->sqlite->prepare(sprintf(
-            'INSERT OR REPLACE INTO %s (%s) VALUES (:id, :data, :expire)',
-            $this->table,
-            implode(',', $this->getFields())
-        ));
-
-        $statement->bindValue(':id', $id);
-        $statement->bindValue(':data', serialize($data), SQLITE3_BLOB);
-        $statement->bindValue(':expire', $lifeTime > 0 ? time() + $lifeTime : null);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        list($idField) = $this->getFields();
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'DELETE FROM %s WHERE %s = :id',
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->sqlite->exec(sprintf('DELETE FROM %s', $this->table));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // no-op.
-    }
-
-    /**
-     * Find a single row by ID.
-     *
-     * @param mixed $id
-     * @param boolean $includeData
-     *
-     * @return array|null
-     */
-    private function findById($id, $includeData = true)
-    {
-        list($idField) = $fields = $this->getFields();
-
-        if (!$includeData) {
-            $key = array_search(static::DATA_FIELD, $fields);
-            unset($fields[$key]);
-        }
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'SELECT %s FROM %s WHERE %s = :id LIMIT 1',
-            implode(',', $fields),
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id, SQLITE3_TEXT);
-
-        $item = $statement->execute()->fetchArray(SQLITE3_ASSOC);
-
-        if ($item === false) {
-            return null;
-        }
-
-        if ($this->isExpired($item)) {
-            $this->doDelete($id);
-
-            return null;
-        }
-
-        return $item;
-    }
-
-    /**
-     * Gets an array of the fields in our table.
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        return array(static::ID_FIELD, static::DATA_FIELD, static::EXPIRATION_FIELD);
-    }
-
-    /**
-     * Check if the item is expired.
-     *
-     * @param array $item
-     * @return boolean
-     */
-    private function isExpired(array $item)
-    {
-        return isset($item[static::EXPIRATION_FIELD]) &&
-            $item[self::EXPIRATION_FIELD] !== null &&
-            $item[self::EXPIRATION_FIELD] < time();
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
deleted file mode 100644
index d742fa0..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Cache;
-
-class Version
-{
-    const VERSION = '1.4.0-DEV';
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
deleted file mode 100644
index 65e8456..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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\Cache;
-
-/**
- * Void cache driver. The cache could be of use in tests where you don`t need to cache anything.
- *
- * @link   www.doctrine-project.org
- * @since  1.5
- * @author Kotlyar Maksim <kotlyar.maksim@gmail.com>
- */
-class VoidCache extends CacheProvider
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        return;
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
deleted file mode 100644
index ae32772..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Cache;
-
-/**
- * WinCache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class WinCacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return wincache_ucache_get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return wincache_ucache_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return (bool) wincache_ucache_set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return wincache_ucache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return wincache_ucache_clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info    = wincache_ucache_info();
-        $meminfo = wincache_ucache_meminfo();
-
-        return array(
-            Cache::STATS_HITS             => $info['total_hit_count'],
-            Cache::STATS_MISSES           => $info['total_miss_count'],
-            Cache::STATS_UPTIME           => $info['total_cache_uptime'],
-            Cache::STATS_MEMORY_USAGE     => $meminfo['memory_total'],
-            Cache::STATS_MEMORY_AVAILABLE => $meminfo['memory_free'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
deleted file mode 100644
index a2c4ca5..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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\Cache;
-
-/**
- * Xcache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class XcacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->doContains($id) ? unserialize(xcache_get($id)) : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return xcache_isset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return xcache_set($id, serialize($data), (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return xcache_unset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->checkAuthorization();
-
-        xcache_clear_cache(XC_TYPE_VAR);
-
-        return true;
-    }
-
-    /**
-     * Checks that xcache.admin.enable_auth is Off.
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException When xcache.admin.enable_auth is On.
-     */
-    protected function checkAuthorization()
-    {
-        if (ini_get('xcache.admin.enable_auth')) {
-            throw new \BadMethodCallException(
-                'To use all features of \Doctrine\Common\Cache\XcacheCache, '
-                . 'you must set "xcache.admin.enable_auth" to "Off" in your php.ini.'
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $this->checkAuthorization();
-
-        $info = xcache_info(XC_TYPE_VAR, 0);
-        return array(
-            Cache::STATS_HITS   => $info['hits'],
-            Cache::STATS_MISSES => $info['misses'],
-            Cache::STATS_UPTIME => null,
-            Cache::STATS_MEMORY_USAGE      => $info['size'],
-            Cache::STATS_MEMORY_AVAILABLE  => $info['avail'],
-        );
-    }
-}
diff --git a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php b/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
deleted file mode 100644
index 6e35ac8..0000000
--- a/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Cache;
-
-/**
- * Zend Data Cache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Ralph Schindler <ralph.schindler@zend.com>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class ZendDataCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return zend_shm_cache_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (false !== zend_shm_cache_fetch($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return zend_shm_cache_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return zend_shm_cache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $namespace = $this->getNamespace();
-        if (empty($namespace)) {
-            return zend_shm_cache_clear();
-        }
-        return zend_shm_cache_clear($namespace);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return null;
-    }
-}
diff --git a/vendor/doctrine/cache/phpunit.xml.dist b/vendor/doctrine/cache/phpunit.xml.dist
deleted file mode 100644
index 34d7f4c..0000000
--- a/vendor/doctrine/cache/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +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/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Cache Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/doctrine/collections/.gitignore b/vendor/doctrine/collections/.gitignore
deleted file mode 100644
index 48b8bf9..0000000
--- a/vendor/doctrine/collections/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor/
diff --git a/vendor/doctrine/collections/.travis.yml b/vendor/doctrine/collections/.travis.yml
deleted file mode 100644
index 60f4792..0000000
--- a/vendor/doctrine/collections/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-  - hhvm-nightly
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.0
-
-before_script:
-    - composer --prefer-source install
-
-script:
-    - phpunit
diff --git a/vendor/doctrine/collections/LICENSE b/vendor/doctrine/collections/LICENSE
deleted file mode 100644
index 5e781fc..0000000
--- a/vendor/doctrine/collections/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2013 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/vendor/doctrine/collections/README.md b/vendor/doctrine/collections/README.md
deleted file mode 100644
index 161cab6..0000000
--- a/vendor/doctrine/collections/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Doctrine Collections
-
-[![Build Status](https://travis-ci.org/doctrine/collections.svg?branch=master)](https://travis-ci.org/doctrine/collections)
-
-Collections Abstraction library
-
-## Changelog
-
-### v1.3.0
-
-* [Explicit casting of first and max results in criteria API](https://github.com/doctrine/collections/pull/26)
-* [Keep keys when using `ArrayCollection#matching()` with sorting](https://github.com/doctrine/collections/pull/49)
-* [Made `AbstractLazyCollection#$initialized` protected for extensibility](https://github.com/doctrine/collections/pull/52)
-
-### v1.2.0
-
-* Add a new ``AbstractLazyCollection``
-
-### v1.1.0
-
-* Deprecated ``Comparison::IS``, because it's only there for SQL semantics.
-  These are fixed in the ORM instead.
-* Add ``Comparison::CONTAINS`` to perform partial string matches:
-
-        $criteria->andWhere($criteria->expr()->contains('property', 'Foo'));
diff --git a/vendor/doctrine/collections/composer.json b/vendor/doctrine/collections/composer.json
deleted file mode 100644
index 155cac4..0000000
--- a/vendor/doctrine/collections/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "doctrine/collections",
-    "type": "library",
-    "description": "Collections Abstraction library",
-    "keywords": ["collections", "array", "iterator"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\Collections\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php
deleted file mode 100644
index b907f8b..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?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\Collections;
-
-use Closure;
-
-/**
- * Lazy collection that is backed by a concrete collection
- *
- * @author Michaël Gallego <mic.gallego@gmail.com>
- * @since  1.2
- */
-abstract class AbstractLazyCollection implements Collection
-{
-    /**
-     * The backed collection to use
-     *
-     * @var Collection
-     */
-    protected $collection;
-
-    /**
-     * @var boolean
-     */
-    protected $initialized = false;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function count()
-    {
-        $this->initialize();
-        return $this->collection->count();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function add($element)
-    {
-        $this->initialize();
-        return $this->collection->add($element);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function clear()
-    {
-        $this->initialize();
-        $this->collection->clear();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function contains($element)
-    {
-        $this->initialize();
-        return $this->collection->contains($element);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isEmpty()
-    {
-        $this->initialize();
-        return $this->collection->isEmpty();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function remove($key)
-    {
-        $this->initialize();
-        return $this->collection->remove($key);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeElement($element)
-    {
-        $this->initialize();
-        return $this->collection->removeElement($element);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function containsKey($key)
-    {
-        $this->initialize();
-        return $this->collection->containsKey($key);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function get($key)
-    {
-        $this->initialize();
-        return $this->collection->get($key);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getKeys()
-    {
-        $this->initialize();
-        return $this->collection->getKeys();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getValues()
-    {
-        $this->initialize();
-        return $this->collection->getValues();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function set($key, $value)
-    {
-        $this->initialize();
-        $this->collection->set($key, $value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function toArray()
-    {
-        $this->initialize();
-        return $this->collection->toArray();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function first()
-    {
-        $this->initialize();
-        return $this->collection->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function last()
-    {
-        $this->initialize();
-        return $this->collection->last();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function key()
-    {
-        $this->initialize();
-        return $this->collection->key();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function current()
-    {
-        $this->initialize();
-        return $this->collection->current();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function next()
-    {
-        $this->initialize();
-        return $this->collection->next();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function exists(Closure $p)
-    {
-        $this->initialize();
-        return $this->collection->exists($p);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function filter(Closure $p)
-    {
-        $this->initialize();
-        return $this->collection->filter($p);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function forAll(Closure $p)
-    {
-        $this->initialize();
-        return $this->collection->forAll($p);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function map(Closure $func)
-    {
-        $this->initialize();
-        return $this->collection->map($func);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function partition(Closure $p)
-    {
-        $this->initialize();
-        return $this->collection->partition($p);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function indexOf($element)
-    {
-        $this->initialize();
-        return $this->collection->indexOf($element);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function slice($offset, $length = null)
-    {
-        $this->initialize();
-        return $this->collection->slice($offset, $length);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getIterator()
-    {
-        $this->initialize();
-        return $this->collection->getIterator();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function offsetExists($offset)
-    {
-        $this->initialize();
-        return $this->collection->offsetExists($offset);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function offsetGet($offset)
-    {
-        $this->initialize();
-        return $this->collection->offsetGet($offset);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->initialize();
-        $this->collection->offsetSet($offset, $value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function offsetUnset($offset)
-    {
-        $this->initialize();
-        $this->collection->offsetUnset($offset);
-    }
-
-    /**
-     * Is the lazy collection already initialized?
-     *
-     * @return bool
-     */
-    public function isInitialized()
-    {
-        return $this->initialized;
-    }
-
-    /**
-     * Initialize the collection
-     *
-     * @return void
-     */
-    protected function initialize()
-    {
-        if ( ! $this->initialized) {
-            $this->doInitialize();
-            $this->initialized = true;
-        }
-    }
-
-    /**
-     * Do the initialization logic
-     *
-     * @return void
-     */
-    abstract protected function doInitialize();
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
deleted file mode 100644
index bce5751..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?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\Collections;
-
-use ArrayIterator;
-use Closure;
-use Doctrine\Common\Collections\Expr\ClosureExpressionVisitor;
-
-/**
- * An ArrayCollection is a Collection implementation that wraps a regular PHP array.
- *
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class ArrayCollection implements Collection, Selectable
-{
-    /**
-     * An array containing the entries of this collection.
-     *
-     * @var array
-     */
-    private $elements;
-
-    /**
-     * Initializes a new ArrayCollection.
-     *
-     * @param array $elements
-     */
-    public function __construct(array $elements = array())
-    {
-        $this->elements = $elements;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function toArray()
-    {
-        return $this->elements;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function first()
-    {
-        return reset($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function last()
-    {
-        return end($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function key()
-    {
-        return key($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function next()
-    {
-        return next($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function current()
-    {
-        return current($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function remove($key)
-    {
-        if ( ! isset($this->elements[$key]) && ! array_key_exists($key, $this->elements)) {
-            return null;
-        }
-
-        $removed = $this->elements[$key];
-        unset($this->elements[$key]);
-
-        return $removed;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeElement($element)
-    {
-        $key = array_search($element, $this->elements, true);
-
-        if ($key === false) {
-            return false;
-        }
-
-        unset($this->elements[$key]);
-
-        return true;
-    }
-
-    /**
-     * Required by interface ArrayAccess.
-     *
-     * {@inheritDoc}
-     */
-    public function offsetExists($offset)
-    {
-        return $this->containsKey($offset);
-    }
-
-    /**
-     * Required by interface ArrayAccess.
-     *
-     * {@inheritDoc}
-     */
-    public function offsetGet($offset)
-    {
-        return $this->get($offset);
-    }
-
-    /**
-     * Required by interface ArrayAccess.
-     *
-     * {@inheritDoc}
-     */
-    public function offsetSet($offset, $value)
-    {
-        if ( ! isset($offset)) {
-            return $this->add($value);
-        }
-
-        $this->set($offset, $value);
-    }
-
-    /**
-     * Required by interface ArrayAccess.
-     *
-     * {@inheritDoc}
-     */
-    public function offsetUnset($offset)
-    {
-        return $this->remove($offset);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function containsKey($key)
-    {
-        return isset($this->elements[$key]) || array_key_exists($key, $this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function contains($element)
-    {
-        return in_array($element, $this->elements, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function exists(Closure $p)
-    {
-        foreach ($this->elements as $key => $element) {
-            if ($p($key, $element)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function indexOf($element)
-    {
-        return array_search($element, $this->elements, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function get($key)
-    {
-        return isset($this->elements[$key]) ? $this->elements[$key] : null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getKeys()
-    {
-        return array_keys($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getValues()
-    {
-        return array_values($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function count()
-    {
-        return count($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function set($key, $value)
-    {
-        $this->elements[$key] = $value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function add($value)
-    {
-        $this->elements[] = $value;
-
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isEmpty()
-    {
-        return empty($this->elements);
-    }
-
-    /**
-     * Required by interface IteratorAggregate.
-     *
-     * {@inheritDoc}
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->elements);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function map(Closure $func)
-    {
-        return new static(array_map($func, $this->elements));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function filter(Closure $p)
-    {
-        return new static(array_filter($this->elements, $p));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function forAll(Closure $p)
-    {
-        foreach ($this->elements as $key => $element) {
-            if ( ! $p($key, $element)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function partition(Closure $p)
-    {
-        $matches = $noMatches = array();
-
-        foreach ($this->elements as $key => $element) {
-            if ($p($key, $element)) {
-                $matches[$key] = $element;
-            } else {
-                $noMatches[$key] = $element;
-            }
-        }
-
-        return array(new static($matches), new static($noMatches));
-    }
-
-    /**
-     * Returns a string representation of this object.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return __CLASS__ . '@' . spl_object_hash($this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function clear()
-    {
-        $this->elements = array();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function slice($offset, $length = null)
-    {
-        return array_slice($this->elements, $offset, $length, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function matching(Criteria $criteria)
-    {
-        $expr     = $criteria->getWhereExpression();
-        $filtered = $this->elements;
-
-        if ($expr) {
-            $visitor  = new ClosureExpressionVisitor();
-            $filter   = $visitor->dispatch($expr);
-            $filtered = array_filter($filtered, $filter);
-        }
-
-        if ($orderings = $criteria->getOrderings()) {
-            foreach (array_reverse($orderings) as $field => $ordering) {
-                $next = ClosureExpressionVisitor::sortByField($field, $ordering == Criteria::DESC ? -1 : 1);
-            }
-
-            uasort($filtered, $next);
-        }
-
-        $offset = $criteria->getFirstResult();
-        $length = $criteria->getMaxResults();
-
-        if ($offset || $length) {
-            $filtered = array_slice($filtered, (int)$offset, $length);
-        }
-
-        return new static($filtered);
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php
deleted file mode 100644
index 8792f7a..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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\Collections;
-
-use ArrayAccess;
-use Closure;
-use Countable;
-use IteratorAggregate;
-
-/**
- * The missing (SPL) Collection/Array/OrderedMap interface.
- *
- * A Collection resembles the nature of a regular PHP array. That is,
- * it is essentially an <b>ordered map</b> that can also be used
- * like a list.
- *
- * A Collection has an internal iterator just like a PHP array. In addition,
- * a Collection can be iterated with external iterators, which is preferable.
- * To use an external iterator simply use the foreach language construct to
- * iterate over the collection (which calls {@link getIterator()} internally) or
- * explicitly retrieve an iterator though {@link getIterator()} which can then be
- * used to iterate over the collection.
- * You can not rely on the internal iterator of the collection being at a certain
- * position unless you explicitly positioned it before. Prefer iteration with
- * external iterators.
- *
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface Collection extends Countable, IteratorAggregate, ArrayAccess
-{
-    /**
-     * Adds an element at the end of the collection.
-     *
-     * @param mixed $element The element to add.
-     *
-     * @return boolean Always TRUE.
-     */
-    public function add($element);
-
-    /**
-     * Clears the collection, removing all elements.
-     *
-     * @return void
-     */
-    public function clear();
-
-    /**
-     * Checks whether an element is contained in the collection.
-     * This is an O(n) operation, where n is the size of the collection.
-     *
-     * @param mixed $element The element to search for.
-     *
-     * @return boolean TRUE if the collection contains the element, FALSE otherwise.
-     */
-    public function contains($element);
-
-    /**
-     * Checks whether the collection is empty (contains no elements).
-     *
-     * @return boolean TRUE if the collection is empty, FALSE otherwise.
-     */
-    public function isEmpty();
-
-    /**
-     * Removes the element at the specified index from the collection.
-     *
-     * @param string|integer $key The kex/index of the element to remove.
-     *
-     * @return mixed The removed element or NULL, if the collection did not contain the element.
-     */
-    public function remove($key);
-
-    /**
-     * Removes the specified element from the collection, if it is found.
-     *
-     * @param mixed $element The element to remove.
-     *
-     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
-     */
-    public function removeElement($element);
-
-    /**
-     * Checks whether the collection contains an element with the specified key/index.
-     *
-     * @param string|integer $key The key/index to check for.
-     *
-     * @return boolean TRUE if the collection contains an element with the specified key/index,
-     *                 FALSE otherwise.
-     */
-    public function containsKey($key);
-
-    /**
-     * Gets the element at the specified key/index.
-     *
-     * @param string|integer $key The key/index of the element to retrieve.
-     *
-     * @return mixed
-     */
-    public function get($key);
-
-    /**
-     * Gets all keys/indices of the collection.
-     *
-     * @return array The keys/indices of the collection, in the order of the corresponding
-     *               elements in the collection.
-     */
-    public function getKeys();
-
-    /**
-     * Gets all values of the collection.
-     *
-     * @return array The values of all elements in the collection, in the order they
-     *               appear in the collection.
-     */
-    public function getValues();
-
-    /**
-     * Sets an element in the collection at the specified key/index.
-     *
-     * @param string|integer $key   The key/index of the element to set.
-     * @param mixed          $value The element to set.
-     *
-     * @return void
-     */
-    public function set($key, $value);
-
-    /**
-     * Gets a native PHP array representation of the collection.
-     *
-     * @return array
-     */
-    public function toArray();
-
-    /**
-     * Sets the internal iterator to the first element in the collection and returns this element.
-     *
-     * @return mixed
-     */
-    public function first();
-
-    /**
-     * Sets the internal iterator to the last element in the collection and returns this element.
-     *
-     * @return mixed
-     */
-    public function last();
-
-    /**
-     * Gets the key/index of the element at the current iterator position.
-     *
-     * @return int|string
-     */
-    public function key();
-
-    /**
-     * Gets the element of the collection at the current iterator position.
-     *
-     * @return mixed
-     */
-    public function current();
-
-    /**
-     * Moves the internal iterator position to the next element and returns this element.
-     *
-     * @return mixed
-     */
-    public function next();
-
-    /**
-     * Tests for the existence of an element that satisfies the given predicate.
-     *
-     * @param Closure $p The predicate.
-     *
-     * @return boolean TRUE if the predicate is TRUE for at least one element, FALSE otherwise.
-     */
-    public function exists(Closure $p);
-
-    /**
-     * Returns all the elements of this collection that satisfy the predicate p.
-     * The order of the elements is preserved.
-     *
-     * @param Closure $p The predicate used for filtering.
-     *
-     * @return Collection A collection with the results of the filter operation.
-     */
-    public function filter(Closure $p);
-
-    /**
-     * Tests whether the given predicate p holds for all elements of this collection.
-     *
-     * @param Closure $p The predicate.
-     *
-     * @return boolean TRUE, if the predicate yields TRUE for all elements, FALSE otherwise.
-     */
-    public function forAll(Closure $p);
-
-    /**
-     * Applies the given function to each element in the collection and returns
-     * a new collection with the elements returned by the function.
-     *
-     * @param Closure $func
-     *
-     * @return Collection
-     */
-    public function map(Closure $func);
-
-    /**
-     * Partitions this collection in two collections according to a predicate.
-     * Keys are preserved in the resulting collections.
-     *
-     * @param Closure $p The predicate on which to partition.
-     *
-     * @return array An array with two elements. The first element contains the collection
-     *               of elements where the predicate returned TRUE, the second element
-     *               contains the collection of elements where the predicate returned FALSE.
-     */
-    public function partition(Closure $p);
-
-    /**
-     * Gets the index/key of a given element. The comparison of two elements is strict,
-     * that means not only the value but also the type must match.
-     * For objects this means reference equality.
-     *
-     * @param mixed $element The element to search for.
-     *
-     * @return int|string|bool The key/index of the element or FALSE if the element was not found.
-     */
-    public function indexOf($element);
-
-    /**
-     * Extracts a slice of $length elements starting at position $offset from the Collection.
-     *
-     * If $length is null it returns all elements from $offset to the end of the Collection.
-     * Keys have to be preserved by this method. Calling this method will only return the
-     * selected slice and NOT change the elements contained in the collection slice is called on.
-     *
-     * @param int      $offset The offset to start from.
-     * @param int|null $length The maximum number of elements to return, or null for no limit.
-     *
-     * @return array
-     */
-    public function slice($offset, $length = null);
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
deleted file mode 100644
index 3f9d43a..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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\Collections;
-
-use Doctrine\Common\Collections\Expr\Expression;
-use Doctrine\Common\Collections\Expr\CompositeExpression;
-
-/**
- * Criteria for filtering Selectable collections.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since 2.3
- */
-class Criteria
-{
-    /**
-     * @var string
-     */
-    const ASC  = 'ASC';
-
-    /**
-     * @var string
-     */
-    const DESC = 'DESC';
-
-    /**
-     * @var \Doctrine\Common\Collections\ExpressionBuilder|null
-     */
-    private static $expressionBuilder;
-
-    /**
-     * @var \Doctrine\Common\Collections\Expr\Expression|null
-     */
-    private $expression;
-
-    /**
-     * @var string[]
-     */
-    private $orderings = array();
-
-    /**
-     * @var int|null
-     */
-    private $firstResult;
-
-    /**
-     * @var int|null
-     */
-    private $maxResults;
-
-    /**
-     * Creates an instance of the class.
-     *
-     * @return Criteria
-     */
-    public static function create()
-    {
-        return new static();
-    }
-
-    /**
-     * Returns the expression builder.
-     *
-     * @return \Doctrine\Common\Collections\ExpressionBuilder
-     */
-    public static function expr()
-    {
-        if (self::$expressionBuilder === null) {
-            self::$expressionBuilder = new ExpressionBuilder();
-        }
-
-        return self::$expressionBuilder;
-    }
-
-    /**
-     * Construct a new Criteria.
-     *
-     * @param Expression    $expression
-     * @param string[]|null $orderings
-     * @param int|null      $firstResult
-     * @param int|null      $maxResults
-     */
-    public function __construct(Expression $expression = null, array $orderings = null, $firstResult = null, $maxResults = null)
-    {
-        $this->expression = $expression;
-
-        $this->setFirstResult($firstResult);
-        $this->setMaxResults($maxResults);
-
-        if (null !== $orderings) {
-            $this->orderBy($orderings);
-        }
-    }
-
-    /**
-     * Sets the where expression to evaluate when this Criteria is searched for.
-     *
-     * @param Expression $expression
-     *
-     * @return Criteria
-     */
-    public function where(Expression $expression)
-    {
-        $this->expression = $expression;
-
-        return $this;
-    }
-
-    /**
-     * Appends the where expression to evaluate when this Criteria is searched for
-     * using an AND with previous expression.
-     *
-     * @param Expression $expression
-     *
-     * @return Criteria
-     */
-    public function andWhere(Expression $expression)
-    {
-        if ($this->expression === null) {
-            return $this->where($expression);
-        }
-
-        $this->expression = new CompositeExpression(CompositeExpression::TYPE_AND, array(
-            $this->expression, $expression
-        ));
-
-        return $this;
-    }
-
-    /**
-     * Appends the where expression to evaluate when this Criteria is searched for
-     * using an OR with previous expression.
-     *
-     * @param Expression $expression
-     *
-     * @return Criteria
-     */
-    public function orWhere(Expression $expression)
-    {
-        if ($this->expression === null) {
-            return $this->where($expression);
-        }
-
-        $this->expression = new CompositeExpression(CompositeExpression::TYPE_OR, array(
-            $this->expression, $expression
-        ));
-
-        return $this;
-    }
-
-    /**
-     * Gets the expression attached to this Criteria.
-     *
-     * @return Expression|null
-     */
-    public function getWhereExpression()
-    {
-        return $this->expression;
-    }
-
-    /**
-     * Gets the current orderings of this Criteria.
-     *
-     * @return string[]
-     */
-    public function getOrderings()
-    {
-        return $this->orderings;
-    }
-
-    /**
-     * Sets the ordering of the result of this Criteria.
-     *
-     * Keys are field and values are the order, being either ASC or DESC.
-     *
-     * @see Criteria::ASC
-     * @see Criteria::DESC
-     *
-     * @param string[] $orderings
-     *
-     * @return Criteria
-     */
-    public function orderBy(array $orderings)
-    {
-        $this->orderings = array_map(
-            function ($ordering) {
-                return strtoupper($ordering) === Criteria::ASC ? Criteria::ASC : Criteria::DESC;
-            },
-            $orderings
-        );
-
-        return $this;
-    }
-
-    /**
-     * Gets the current first result option of this Criteria.
-     *
-     * @return int|null
-     */
-    public function getFirstResult()
-    {
-        return $this->firstResult;
-    }
-
-    /**
-     * Set the number of first result that this Criteria should return.
-     *
-     * @param int|null $firstResult The value to set.
-     *
-     * @return Criteria
-     */
-    public function setFirstResult($firstResult)
-    {
-        $this->firstResult = null === $firstResult ? null : (int) $firstResult;
-
-        return $this;
-    }
-
-    /**
-     * Gets maxResults.
-     *
-     * @return int|null
-     */
-    public function getMaxResults()
-    {
-        return $this->maxResults;
-    }
-
-    /**
-     * Sets maxResults.
-     *
-     * @param int|null $maxResults The value to set.
-     *
-     * @return Criteria
-     */
-    public function setMaxResults($maxResults)
-    {
-        $this->maxResults = null === $maxResults ? null : (int) $maxResults;
-
-        return $this;
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
deleted file mode 100644
index 994085f..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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\Collections\Expr;
-
-/**
- * Walks an expression graph and turns it into a PHP closure.
- *
- * This closure can be used with {@Collection#filter()} and is used internally
- * by {@ArrayCollection#select()}.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.3
- */
-class ClosureExpressionVisitor extends ExpressionVisitor
-{
-    /**
-     * Accesses the field of a given object. This field has to be public
-     * directly or indirectly (through an accessor get*, is*, or a magic
-     * method, __get, __call).
-     *
-     * @param object $object
-     * @param string $field
-     *
-     * @return mixed
-     */
-    public static function getObjectFieldValue($object, $field)
-    {
-        if (is_array($object)) {
-            return $object[$field];
-        }
-
-        $accessors = array('get', 'is');
-
-        foreach ($accessors as $accessor) {
-            $accessor .= $field;
-
-            if ( ! method_exists($object, $accessor)) {
-                continue;
-            }
-
-            return $object->$accessor();
-        }
-
-        // __call should be triggered for get.
-        $accessor = $accessors[0] . $field;
-
-        if (method_exists($object, '__call')) {
-            return $object->$accessor();
-        }
-
-        if ($object instanceof \ArrayAccess) {
-            return $object[$field];
-        }
-
-        return $object->$field;
-    }
-
-    /**
-     * Helper for sorting arrays of objects based on multiple fields + orientations.
-     *
-     * @param string   $name
-     * @param int      $orientation
-     * @param \Closure $next
-     *
-     * @return \Closure
-     */
-    public static function sortByField($name, $orientation = 1, \Closure $next = null)
-    {
-        if ( ! $next) {
-            $next = function() {
-                return 0;
-            };
-        }
-
-        return function ($a, $b) use ($name, $next, $orientation) {
-            $aValue = ClosureExpressionVisitor::getObjectFieldValue($a, $name);
-            $bValue = ClosureExpressionVisitor::getObjectFieldValue($b, $name);
-
-            if ($aValue === $bValue) {
-                return $next($a, $b);
-            }
-
-            return (($aValue > $bValue) ? 1 : -1) * $orientation;
-        };
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function walkComparison(Comparison $comparison)
-    {
-        $field = $comparison->getField();
-        $value = $comparison->getValue()->getValue(); // shortcut for walkValue()
-
-        switch ($comparison->getOperator()) {
-            case Comparison::EQ:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) === $value;
-                };
-
-            case Comparison::NEQ:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) !== $value;
-                };
-
-            case Comparison::LT:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) < $value;
-                };
-
-            case Comparison::LTE:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) <= $value;
-                };
-
-            case Comparison::GT:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) > $value;
-                };
-
-            case Comparison::GTE:
-                return function ($object) use ($field, $value) {
-                    return ClosureExpressionVisitor::getObjectFieldValue($object, $field) >= $value;
-                };
-
-            case Comparison::IN:
-                return function ($object) use ($field, $value) {
-                    return in_array(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
-                };
-
-            case Comparison::NIN:
-                return function ($object) use ($field, $value) {
-                    return ! in_array(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
-                };
-
-            case Comparison::CONTAINS:
-                return function ($object) use ($field, $value) {
-                    return false !== strpos(ClosureExpressionVisitor::getObjectFieldValue($object, $field), $value);
-                };
-
-            default:
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function walkValue(Value $value)
-    {
-        return $value->getValue();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function walkCompositeExpression(CompositeExpression $expr)
-    {
-        $expressionList = array();
-
-        foreach ($expr->getExpressionList() as $child) {
-            $expressionList[] = $this->dispatch($child);
-        }
-
-        switch($expr->getType()) {
-            case CompositeExpression::TYPE_AND:
-                return $this->andExpressions($expressionList);
-
-            case CompositeExpression::TYPE_OR:
-                return $this->orExpressions($expressionList);
-
-            default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
-        }
-    }
-
-    /**
-     * @param array $expressions
-     *
-     * @return callable
-     */
-    private function andExpressions($expressions)
-    {
-        return function ($object) use ($expressions) {
-            foreach ($expressions as $expression) {
-                if ( ! $expression($object)) {
-                    return false;
-                }
-            }
-            return true;
-        };
-    }
-
-    /**
-     * @param array $expressions
-     *
-     * @return callable
-     */
-    private function orExpressions($expressions)
-    {
-        return function ($object) use ($expressions) {
-            foreach ($expressions as $expression) {
-                if ($expression($object)) {
-                    return true;
-                }
-            }
-            return false;
-        };
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
deleted file mode 100644
index d54ecf2..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Collections\Expr;
-
-/**
- * Comparison of a field with a value by the given operator.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.3
- */
-class Comparison implements Expression
-{
-    const EQ        = '=';
-    const NEQ       = '<>';
-    const LT        = '<';
-    const LTE       = '<=';
-    const GT        = '>';
-    const GTE       = '>=';
-    const IS        = '='; // no difference with EQ
-    const IN        = 'IN';
-    const NIN       = 'NIN';
-    const CONTAINS  = 'CONTAINS';
-
-    /**
-     * @var string
-     */
-    private $field;
-
-    /**
-     * @var string
-     */
-    private $op;
-
-    /**
-     * @var Value
-     */
-    private $value;
-
-    /**
-     * @param string $field
-     * @param string $operator
-     * @param mixed  $value
-     */
-    public function __construct($field, $operator, $value)
-    {
-        if ( ! ($value instanceof Value)) {
-            $value = new Value($value);
-        }
-
-        $this->field = $field;
-        $this->op = $operator;
-        $this->value = $value;
-    }
-
-    /**
-     * @return string
-     */
-    public function getField()
-    {
-        return $this->field;
-    }
-
-    /**
-     * @return Value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOperator()
-    {
-        return $this->op;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function visit(ExpressionVisitor $visitor)
-    {
-        return $visitor->walkComparison($this);
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php
deleted file mode 100644
index 3613c02..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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\Collections\Expr;
-
-/**
- * Expression of Expressions combined by AND or OR operation.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.3
- */
-class CompositeExpression implements Expression
-{
-    const TYPE_AND = 'AND';
-    const TYPE_OR = 'OR';
-
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var Expression[]
-     */
-    private $expressions = array();
-
-    /**
-     * @param string $type
-     * @param array  $expressions
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct($type, array $expressions)
-    {
-        $this->type = $type;
-
-        foreach ($expressions as $expr) {
-            if ($expr instanceof Value) {
-                throw new \RuntimeException("Values are not supported expressions as children of and/or expressions.");
-            }
-            if ( ! ($expr instanceof Expression)) {
-                throw new \RuntimeException("No expression given to CompositeExpression.");
-            }
-
-            $this->expressions[] = $expr;
-        }
-    }
-
-    /**
-     * Returns the list of expressions nested in this composite.
-     *
-     * @return Expression[]
-     */
-    public function getExpressionList()
-    {
-        return $this->expressions;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function visit(ExpressionVisitor $visitor)
-    {
-        return $visitor->walkCompositeExpression($this);
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php
deleted file mode 100644
index 68db767..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Collections\Expr;
-
-/**
- * Expression for the {@link Selectable} interface.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-interface Expression
-{
-    /**
-     * @param ExpressionVisitor $visitor
-     *
-     * @return mixed
-     */
-    public function visit(ExpressionVisitor $visitor);
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php
deleted file mode 100644
index 080afdc..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Collections\Expr;
-
-/**
- * An Expression visitor walks a graph of expressions and turns them into a
- * query for the underlying implementation.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-abstract class ExpressionVisitor
-{
-    /**
-     * Converts a comparison expression into the target query language output.
-     *
-     * @param Comparison $comparison
-     *
-     * @return mixed
-     */
-    abstract public function walkComparison(Comparison $comparison);
-
-    /**
-     * Converts a value expression into the target query language part.
-     *
-     * @param Value $value
-     *
-     * @return mixed
-     */
-    abstract public function walkValue(Value $value);
-
-    /**
-     * Converts a composite expression into the target query language output.
-     *
-     * @param CompositeExpression $expr
-     *
-     * @return mixed
-     */
-    abstract public function walkCompositeExpression(CompositeExpression $expr);
-
-    /**
-     * Dispatches walking an expression to the appropriate handler.
-     *
-     * @param Expression $expr
-     *
-     * @return mixed
-     *
-     * @throws \RuntimeException
-     */
-    public function dispatch(Expression $expr)
-    {
-        switch (true) {
-            case ($expr instanceof Comparison):
-                return $this->walkComparison($expr);
-
-            case ($expr instanceof Value):
-                return $this->walkValue($expr);
-
-            case ($expr instanceof CompositeExpression):
-                return $this->walkCompositeExpression($expr);
-
-            default:
-                throw new \RuntimeException("Unknown Expression " . get_class($expr));
-        }
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php
deleted file mode 100644
index 7f6e831..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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\Collections\Expr;
-
-class Value implements Expression
-{
-    /**
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * @param mixed $value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function visit(ExpressionVisitor $visitor)
-    {
-        return $visitor->walkValue($this);
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
deleted file mode 100644
index 6539e3c..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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\Collections;
-
-use Doctrine\Common\Collections\Expr\Comparison;
-use Doctrine\Common\Collections\Expr\CompositeExpression;
-use Doctrine\Common\Collections\Expr\Value;
-
-/**
- * Builder for Expressions in the {@link Selectable} interface.
- *
- * Important Notice for interoperable code: You have to use scalar
- * values only for comparisons, otherwise the behavior of the comparision
- * may be different between implementations (Array vs ORM vs ODM).
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.3
- */
-class ExpressionBuilder
-{
-    /**
-     * @param mixed $x
-     *
-     * @return CompositeExpression
-     */
-    public function andX($x = null)
-    {
-        return new CompositeExpression(CompositeExpression::TYPE_AND, func_get_args());
-    }
-
-    /**
-     * @param mixed $x
-     *
-     * @return CompositeExpression
-     */
-    public function orX($x = null)
-    {
-        return new CompositeExpression(CompositeExpression::TYPE_OR, func_get_args());
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function eq($field, $value)
-    {
-        return new Comparison($field, Comparison::EQ, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function gt($field, $value)
-    {
-        return new Comparison($field, Comparison::GT, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function lt($field, $value)
-    {
-        return new Comparison($field, Comparison::LT, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function gte($field, $value)
-    {
-        return new Comparison($field, Comparison::GTE, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function lte($field, $value)
-    {
-        return new Comparison($field, Comparison::LTE, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function neq($field, $value)
-    {
-        return new Comparison($field, Comparison::NEQ, new Value($value));
-    }
-
-    /**
-     * @param string $field
-     *
-     * @return Comparison
-     */
-    public function isNull($field)
-    {
-        return new Comparison($field, Comparison::EQ, new Value(null));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $values
-     *
-     * @return Comparison
-     */
-    public function in($field, array $values)
-    {
-        return new Comparison($field, Comparison::IN, new Value($values));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $values
-     *
-     * @return Comparison
-     */
-    public function notIn($field, array $values)
-    {
-        return new Comparison($field, Comparison::NIN, new Value($values));
-    }
-
-    /**
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return Comparison
-     */
-    public function contains($field, $value)
-    {
-        return new Comparison($field, Comparison::CONTAINS, new Value($value));
-    }
-}
diff --git a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php b/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php
deleted file mode 100644
index 57660ed..0000000
--- a/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Collections;
-
-/**
- * Interface for collections that allow efficient filtering with an expression API.
- *
- * Goal of this interface is a backend independent method to fetch elements
- * from a collections. {@link Expression} is crafted in a way that you can
- * implement queries from both in-memory and database-backed collections.
- *
- * For database backed collections this allows very efficient access by
- * utilizing the query APIs, for example SQL in the ORM. Applications using
- * this API can implement efficient database access without having to ask the
- * EntityManager or Repositories.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.3
- */
-interface Selectable
-{
-    /**
-     * Selects all elements from a selectable that match the expression and
-     * returns a new collection containing these elements.
-     *
-     * @param Criteria $criteria
-     *
-     * @return Collection
-     */
-    public function matching(Criteria $criteria);
-}
diff --git a/vendor/doctrine/collections/phpunit.xml.dist b/vendor/doctrine/collections/phpunit.xml.dist
deleted file mode 100644
index 36968e9..0000000
--- a/vendor/doctrine/collections/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +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/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Collections Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-    
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-</phpunit>
diff --git a/vendor/doctrine/common/.gitignore b/vendor/doctrine/common/.gitignore
deleted file mode 100644
index b15c686..0000000
--- a/vendor/doctrine/common/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-build/
-logs/
-reports/
-dist/
-tests/Doctrine/Tests/Common/Proxy/generated/
-vendor/
-.idea
-composer.lock
-doctrine-common-*.tar
-doctrine-common-*.tar.gz
diff --git a/vendor/doctrine/common/.gitmodules b/vendor/doctrine/common/.gitmodules
deleted file mode 100644
index 51f0843..0000000
--- a/vendor/doctrine/common/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "lib/vendor/doctrine-build-common"]
-	path = lib/vendor/doctrine-build-common
-	url = git://github.com/doctrine/doctrine-build-common.git
diff --git a/vendor/doctrine/common/.travis.yml b/vendor/doctrine/common/.travis.yml
deleted file mode 100644
index 9c20a84..0000000
--- a/vendor/doctrine/common/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-  directory:
-    - $HOME/.composer/cache
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - composer --prefer-source install
-
-script:
-  - ./vendor/bin/phpunit
-
-matrix:
-  allow_failures:
-    - php: 7.0
diff --git a/vendor/doctrine/common/LICENSE b/vendor/doctrine/common/LICENSE
deleted file mode 100644
index 4a91f0b..0000000
--- a/vendor/doctrine/common/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2012 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/vendor/doctrine/common/README.md b/vendor/doctrine/common/README.md
deleted file mode 100644
index 30a080f..0000000
--- a/vendor/doctrine/common/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Doctrine Common
-
-[![Build Status](https://secure.travis-ci.org/doctrine/common.png)](http://travis-ci.org/doctrine/common)
-
-The Doctrine Common project is a library that provides extensions to core PHP functionality.
-
-## More resources:
-
-* [Website](http://www.doctrine-project.org)
-* [Documentation](http://docs.doctrine-project.org/projects/doctrine-common/en/latest/)
-* [Issue Tracker](http://www.doctrine-project.org/jira/browse/DCOM)
-* [Downloads](http://github.com/doctrine/common/downloads)
diff --git a/vendor/doctrine/common/UPGRADE_TO_2_1 b/vendor/doctrine/common/UPGRADE_TO_2_1
deleted file mode 100644
index 891a2e5..0000000
--- a/vendor/doctrine/common/UPGRADE_TO_2_1
+++ /dev/null
@@ -1,39 +0,0 @@
-This document details all the possible changes that you should investigate when updating
-your project from Doctrine Common 2.0.x to 2.1
-
-## AnnotationReader changes
-
-The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way:
-
-    $reader = new \Doctrine\Common\Annotations\AnnotationReader();
-    $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\');
-    // new code necessary starting here
-    $reader->setIgnoreNotImportedAnnotations(true);
-    $reader->setEnableParsePhpImports(false);
-    $reader = new \Doctrine\Common\Annotations\CachedReader(
-        new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache()
-    );
-
-## Annotation Base class or @Annotation
-
-Beginning after 2.1-RC2 you have to either extend ``Doctrine\Common\Annotations\Annotation`` or add @Annotation to your annotations class-level docblock, otherwise the class will simply be ignored.
-
-## Removed methods on AnnotationReader
-
-* AnnotationReader::setAutoloadAnnotations()
-* AnnotationReader::getAutoloadAnnotations()
-* AnnotationReader::isAutoloadAnnotations()
-
-## AnnotationRegistry
-
-Autoloading through the PHP autoloader is removed from the 2.1 AnnotationReader. Instead you have to use the global AnnotationRegistry for loading purposes:
-
-    \Doctrine\Common\Annotations\AnnotationRegistry::registerFile($fileWithAnnotations);
-    \Doctrine\Common\Annotations\AnnotationRegistry::registerAutoloadNamespace($namespace, $dirs = null);
-    \Doctrine\Common\Annotations\AnnotationRegistry::registerAutoloadNamespaces($namespaces);
-    \Doctrine\Common\Annotations\AnnotationRegistry::registerLoader($callable);
-
-The $callable for registering a loader accepts a class as first and only parameter and must try to silently autoload it. On success true has to be returned.
-The registerAutoloadNamespace function registers a PSR-0 compatible silent autoloader for all classes with the given namespace in the given directories.
-If null is passed as directory the include path will be used.
-
diff --git a/vendor/doctrine/common/UPGRADE_TO_2_2 b/vendor/doctrine/common/UPGRADE_TO_2_2
deleted file mode 100644
index 1d93a13..0000000
--- a/vendor/doctrine/common/UPGRADE_TO_2_2
+++ /dev/null
@@ -1,61 +0,0 @@
-This document details all the possible changes that you should investigate when 
-updating your project from Doctrine Common 2.1 to 2.2:
-
-## Annotation Changes
-
-- AnnotationReader::setIgnoreNotImportedAnnotations has been removed, you need to 
-  add ignore annotation names which are supposed to be ignored via
-  AnnotationReader::addGlobalIgnoredName
-  
-- AnnotationReader::setAutoloadAnnotations was deprecated by the AnnotationRegistry
-  in 2.1 and has been removed in 2.2
-
-- AnnotationReader::setEnableParsePhpImports was added to ease transition to the new
-  annotation mechanism in 2.1 and is removed in 2.2
-
-- AnnotationReader::isParsePhpImportsEnabled is removed (see above)
-
-- AnnotationReader::setDefaultAnnotationNamespace was deprecated in favor of explicit
-  configuration in 2.1 and will be removed in 2.2 (for isolated projects where you
-  have full-control over _all_ available annotations, we offer a dedicated reader
-  class ``SimpleAnnotationReader``)
-
-- AnnotationReader::setAnnotationCreationFunction was deprecated in 2.1 and will be
-  removed in 2.2. We only offer two creation mechanisms which cannot be changed
-  anymore to allow the same reader instance to work with all annotations regardless
-  of which library they are coming from.
-  
-- AnnotationReader::setAnnotationNamespaceAlias was deprecated in 2.1 and will be
-  removed in 2.2 (see setDefaultAnnotationNamespace)
-
-- If you use a class as annotation which has not the @Annotation marker in it's 
-  class block, we will now throw an exception instead of silently ignoring it. You
-  can however still achieve the previous behavior using the @IgnoreAnnotation, or
-  AnnotationReader::addGlobalIgnoredName (the exception message will contain detailed
-  instructions when you run into this problem).
-
-## Cache Changes
-  
-- Renamed old AbstractCache to CacheProvider
-
-- Dropped the support to the following functions of all cache providers:
-
- - CacheProvider::deleteByWildcard
-
- - CacheProvider::deleteByRegEx
-
- - CacheProvider::deleteByPrefix
-
- - CacheProvider::deleteBySuffix
-
-- CacheProvider::deleteAll will not remove ALL entries, it will only mark them as invalid
-
-- CacheProvider::flushAll will remove ALL entries, namespaced or not
-
-- Added support to MemcachedCache
-
-- Added support to WincacheCache
-
-## ClassLoader Changes
-
-- ClassLoader::fileExistsInIncludePath() no longer exists. Use the native stream_resolve_include_path() PHP function
\ No newline at end of file
diff --git a/vendor/doctrine/common/build.properties b/vendor/doctrine/common/build.properties
deleted file mode 100644
index ef51d20..0000000
--- a/vendor/doctrine/common/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version class and file
-project.version_class = Doctrine\\Common\\Version
-project.version_file = lib/Doctrine/Common/Version.php
diff --git a/vendor/doctrine/common/build.xml b/vendor/doctrine/common/build.xml
deleted file mode 100644
index 429b768..0000000
--- a/vendor/doctrine/common/build.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<project name="DoctrineCommon" default="build" basedir=".">
-    <property file="build.properties" />
-
-    <target name="php">
-        <exec executable="which" outputproperty="php_executable">
-            <arg value="php" />
-        </exec>
-    </target>
-
-    <target name="prepare">
-        <mkdir dir="build" />
-    </target>
-
-    <target name="build" depends="check-git-checkout-clean,prepare,php,composer">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="archive" />
-            <arg value="--dir=build" />
-        </exec>
-    </target>
-
-    <target name="composer" depends="php,composer-check,composer-download">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="install" />
-        </exec>
-    </target>
-
-    <target name="composer-check" depends="prepare">
-        <available file="build/composer.phar" property="composer.present"/>
-    </target>
-
-    <target name="composer-download" unless="composer.present">
-        <exec executable="wget">
-            <arg value="-Obuild/composer.phar" />
-            <arg value="http://getcomposer.org/composer.phar" />
-        </exec>
-    </target>
-
-    <target name="make-release" depends="check-git-checkout-clean,prepare,php">
-        <replace file="${project.version_file}" token="-DEV" value="" failOnNoReplacements="true" />
-        <exec executable="${php_executable}" outputproperty="doctrine.current_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="require_once '${project.version_file}';echo ${project.version_class}::VERSION;" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.next_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="$parts = explode('.', str_ireplace(array('-DEV', '-ALPHA', '-BETA'), '', '${doctrine.current_version}'));
-                if (count($parts) != 3) {
-                    throw new \InvalidArgumentException('Version is assumed in format x.y.z, ${doctrine.current_version} given');
-                }
-                $parts[2]++;
-                echo implode('.', $parts);
-            " />
-        </exec>
-
-        <git-commit file="${project.version_file}" message="Release ${doctrine.current_version}" />
-        <git-tag version="${doctrine.current_version}" />
-        <replace file="${project.version_file}" token="${doctrine.current_version}" value="${doctrine.next_version}-DEV" />
-        <git-commit file="${project.version_file}" message="Bump version to ${doctrine.next_version}" />
-    </target>
-
-    <target name="check-git-checkout-clean">
-        <exec executable="git" failonerror="true">
-            <arg value="diff-index" />
-            <arg value="--quiet" />
-            <arg value="HEAD" />
-        </exec>
-    </target>
-
-    <macrodef name="git-commit">
-        <attribute name="file" default="NOT SET"/>
-        <attribute name="message" default="NOT SET"/>
-
-        <sequential>
-            <exec executable="git">
-                <arg value="add" />
-                <arg value="@{file}" />
-            </exec>
-            <exec executable="git">
-                <arg value="commit" />
-                <arg value="-m" />
-                <arg value="@{message}" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="git-tag">
-        <attribute name="version" default="NOT SET" />
-
-        <sequential>
-            <exec executable="git">
-                <arg value="tag" />
-                <arg value="-m" />
-                <arg value="v@{version}" />
-                <arg value="v@{version}" />
-            </exec>
-        </sequential>
-    </macrodef>
-</project>
diff --git a/vendor/doctrine/common/composer.json b/vendor/doctrine/common/composer.json
deleted file mode 100644
index be42e7f..0000000
--- a/vendor/doctrine/common/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "doctrine/common",
-    "type": "library",
-    "description": "Common Library for Doctrine projects",
-    "keywords": ["collections", "spl", "eventmanager", "annotations", "persistence"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.3.2",
-        "doctrine/inflector": "1.*",
-        "doctrine/cache": "1.*",
-        "doctrine/collections": "1.*",
-        "doctrine/lexer": "1.*",
-        "doctrine/annotations": "1.*"
-    },
-    "minimum-stability": "dev",
-    "require-dev": {
-        "phpunit/phpunit": "~3.7"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6.x-dev"
-        }
-    },
-    "archive": {
-        "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar"]
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php b/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
deleted file mode 100644
index d65b9a6..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?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;
-
-/**
- * A <tt>ClassLoader</tt> is an autoloader for class files that can be
- * installed on the SPL autoload stack. It is a class loader that either loads only classes
- * of a specific namespace or all namespaces and it is suitable for working together
- * with other autoloaders in the SPL autoload stack.
- *
- * If no include path is configured through the constructor or {@link setIncludePath}, a ClassLoader
- * relies on the PHP <code>include_path</code>.
- *
- * @author Roman Borschel <roman@code-factory.org>
- * @since 2.0
- *
- * @deprecated the ClassLoader is deprecated and will be removed in version 3.0 of doctrine/common.
- */
-class ClassLoader
-{
-    /**
-     * PHP file extension.
-     *
-     * @var string
-     */
-    protected $fileExtension = '.php';
-
-    /**
-     * Current namespace.
-     *
-     * @var string|null
-     */
-    protected $namespace;
-
-    /**
-     * Current include path.
-     *
-     * @var string|null
-     */
-    protected $includePath;
-
-    /**
-     * PHP namespace separator.
-     *
-     * @var string
-     */
-    protected $namespaceSeparator = '\\';
-
-    /**
-     * Creates a new <tt>ClassLoader</tt> that loads classes of the
-     * specified namespace from the specified include path.
-     *
-     * If no include path is given, the ClassLoader relies on the PHP include_path.
-     * If neither a namespace nor an include path is given, the ClassLoader will
-     * be responsible for loading all classes, thereby relying on the PHP include_path.
-     *
-     * @param string|null $ns          The namespace of the classes to load.
-     * @param string|null $includePath The base include path to use.
-     */
-    public function __construct($ns = null, $includePath = null)
-    {
-        $this->namespace = $ns;
-        $this->includePath = $includePath;
-    }
-
-    /**
-     * Sets the namespace separator used by classes in the namespace of this ClassLoader.
-     *
-     * @param string $sep The separator to use.
-     *
-     * @return void
-     */
-    public function setNamespaceSeparator($sep)
-    {
-        $this->namespaceSeparator = $sep;
-    }
-
-    /**
-     * Gets the namespace separator used by classes in the namespace of this ClassLoader.
-     *
-     * @return string
-     */
-    public function getNamespaceSeparator()
-    {
-        return $this->namespaceSeparator;
-    }
-
-    /**
-     * Sets the base include path for all class files in the namespace of this ClassLoader.
-     *
-     * @param string|null $includePath
-     *
-     * @return void
-     */
-    public function setIncludePath($includePath)
-    {
-        $this->includePath = $includePath;
-    }
-
-    /**
-     * Gets the base include path for all class files in the namespace of this ClassLoader.
-     *
-     * @return string|null
-     */
-    public function getIncludePath()
-    {
-        return $this->includePath;
-    }
-
-    /**
-     * Sets the file extension of class files in the namespace of this ClassLoader.
-     *
-     * @param string $fileExtension
-     *
-     * @return void
-     */
-    public function setFileExtension($fileExtension)
-    {
-        $this->fileExtension = $fileExtension;
-    }
-
-    /**
-     * Gets the file extension of class files in the namespace of this ClassLoader.
-     *
-     * @return string
-     */
-    public function getFileExtension()
-    {
-        return $this->fileExtension;
-    }
-
-    /**
-     * Registers this ClassLoader on the SPL autoload stack.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        spl_autoload_register(array($this, 'loadClass'));
-    }
-
-    /**
-     * Removes this ClassLoader from the SPL autoload stack.
-     *
-     * @return void
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $className The name of the class to load.
-     *
-     * @return boolean TRUE if the class has been successfully loaded, FALSE otherwise.
-     */
-    public function loadClass($className)
-    {
-        if (self::typeExists($className)) {
-            return true;
-        }
-
-        if (! $this->canLoadClass($className)) {
-            return false;
-        }
-
-        require ($this->includePath !== null ? $this->includePath . DIRECTORY_SEPARATOR : '')
-               . str_replace($this->namespaceSeparator, DIRECTORY_SEPARATOR, $className)
-               . $this->fileExtension;
-
-        return self::typeExists($className);
-    }
-
-    /**
-     * Asks this ClassLoader whether it can potentially load the class (file) with
-     * the given name.
-     *
-     * @param string $className The fully-qualified name of the class.
-     *
-     * @return boolean TRUE if this ClassLoader can load the class, FALSE otherwise.
-     */
-    public function canLoadClass($className)
-    {
-        if ($this->namespace !== null && strpos($className, $this->namespace.$this->namespaceSeparator) !== 0) {
-            return false;
-        }
-
-        $file = str_replace($this->namespaceSeparator, DIRECTORY_SEPARATOR, $className) . $this->fileExtension;
-
-        if ($this->includePath !== null) {
-            return is_file($this->includePath . DIRECTORY_SEPARATOR . $file);
-        }
-
-        return (false !== stream_resolve_include_path($file));
-    }
-
-    /**
-     * Checks whether a class with a given name exists. A class "exists" if it is either
-     * already defined in the current request or if there is an autoloader on the SPL
-     * autoload stack that is a) responsible for the class in question and b) is able to
-     * load a class file in which the class definition resides.
-     *
-     * If the class is not already defined, each autoloader in the SPL autoload stack
-     * is asked whether it is able to tell if the class exists. If the autoloader is
-     * a <tt>ClassLoader</tt>, {@link canLoadClass} is used, otherwise the autoload
-     * function of the autoloader is invoked and expected to return a value that
-     * evaluates to TRUE if the class (file) exists. As soon as one autoloader reports
-     * that the class exists, TRUE is returned.
-     *
-     * Note that, depending on what kinds of autoloaders are installed on the SPL
-     * autoload stack, the class (file) might already be loaded as a result of checking
-     * for its existence. This is not the case with a <tt>ClassLoader</tt>, who separates
-     * these responsibilities.
-     *
-     * @param string $className The fully-qualified name of the class.
-     *
-     * @return boolean TRUE if the class exists as per the definition given above, FALSE otherwise.
-     */
-    public static function classExists($className)
-    {
-        return self::typeExists($className, true);
-    }
-
-    /**
-     * Gets the <tt>ClassLoader</tt> from the SPL autoload stack that is responsible
-     * for (and is able to load) the class with the given name.
-     *
-     * @param string $className The name of the class.
-     *
-     * @return ClassLoader The <tt>ClassLoader</tt> for the class or NULL if no such <tt>ClassLoader</tt> exists.
-     */
-    public static function getClassLoader($className)
-    {
-         foreach (spl_autoload_functions() as $loader) {
-            if (is_array($loader)
-                && ($classLoader = reset($loader))
-                && $classLoader instanceof ClassLoader
-                && $classLoader->canLoadClass($className)
-            ) {
-                return $classLoader;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Checks whether a given type exists
-     *
-     * @param string $type
-     * @param bool   $autoload
-     *
-     * @return bool
-     */
-    private static function typeExists($type, $autoload = false)
-    {
-        return class_exists($type, $autoload)
-            || interface_exists($type, $autoload)
-            || (function_exists('trait_exists') && trait_exists($type, $autoload));
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/CommonException.php b/vendor/doctrine/common/lib/Doctrine/Common/CommonException.php
deleted file mode 100644
index 2a1a08e..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/CommonException.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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;
-
-/**
- * Base exception class for package Doctrine\Common.
- *
- * @author heinrich
- */
-class CommonException extends \Exception
-{
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Comparable.php b/vendor/doctrine/common/lib/Doctrine/Common/Comparable.php
deleted file mode 100644
index 8cd02c9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Comparable.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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;
-
-/**
- * Comparable interface that allows to compare two value objects to each other for similarity.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-interface Comparable
-{
-    /**
-     * Compares the current object to the passed $other.
-     *
-     * Returns 0 if they are semantically equal, 1 if the other object
-     * is less than the current one, or -1 if its more than the current one.
-     *
-     * This method should not check for identity using ===, only for semantical equality for example
-     * when two different DateTime instances point to the exact same Date + TZ.
-     *
-     * @param mixed $other
-     *
-     * @return int
-     */
-    public function compareTo($other);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php
deleted file mode 100644
index 75506e6..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/EventArgs.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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;
-
-/**
- * EventArgs is the base class for classes containing event data.
- *
- * This class contains no event data. It is used by events that do not pass state
- * information to an event handler when an event is raised. The single empty EventArgs
- * instance can be obtained through {@link getEmptyInstance}.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class EventArgs
-{
-    /**
-     * Single instance of EventArgs.
-     *
-     * @var EventArgs
-     */
-    private static $_emptyEventArgsInstance;
-
-    /**
-     * Gets the single, empty and immutable EventArgs instance.
-     *
-     * This instance will be used when events are dispatched without any parameter,
-     * like this: EventManager::dispatchEvent('eventname');
-     *
-     * The benefit from this is that only one empty instance is instantiated and shared
-     * (otherwise there would be instances for every dispatched in the abovementioned form).
-     *
-     * @see EventManager::dispatchEvent
-     *
-     * @link http://msdn.microsoft.com/en-us/library/system.eventargs.aspx
-     *
-     * @return EventArgs
-     */
-    public static function getEmptyInstance()
-    {
-        if ( ! self::$_emptyEventArgsInstance) {
-            self::$_emptyEventArgsInstance = new EventArgs;
-        }
-
-        return self::$_emptyEventArgsInstance;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php b/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
deleted file mode 100644
index 69eb17e..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/EventManager.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?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;
-
-/**
- * The EventManager is the central point of Doctrine's event listener system.
- * Listeners are registered on the manager and events are dispatched through the
- * manager.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class EventManager
-{
-    /**
-     * Map of registered listeners.
-     * <event> => <listeners>
-     *
-     * @var array
-     */
-    private $_listeners = array();
-
-    /**
-     * Dispatches an event to all registered listeners.
-     *
-     * @param string    $eventName      The name of the event to dispatch. The name of the event is
-     *                                  the name of the method that is invoked on listeners.
-     * @param EventArgs|null $eventArgs The event arguments to pass to the event handlers/listeners.
-     *                                  If not supplied, the single empty EventArgs instance is used.
-     *
-     * @return boolean
-     */
-    public function dispatchEvent($eventName, EventArgs $eventArgs = null)
-    {
-        if (isset($this->_listeners[$eventName])) {
-            $eventArgs = $eventArgs === null ? EventArgs::getEmptyInstance() : $eventArgs;
-
-            foreach ($this->_listeners[$eventName] as $listener) {
-                $listener->$eventName($eventArgs);
-            }
-        }
-    }
-
-    /**
-     * Gets the listeners of a specific event or all listeners.
-     *
-     * @param string|null $event The name of the event.
-     *
-     * @return array The event listeners for the specified event, or all event listeners.
-     */
-    public function getListeners($event = null)
-    {
-        return $event ? $this->_listeners[$event] : $this->_listeners;
-    }
-
-    /**
-     * Checks whether an event has any registered listeners.
-     *
-     * @param string $event
-     *
-     * @return boolean TRUE if the specified event has any listeners, FALSE otherwise.
-     */
-    public function hasListeners($event)
-    {
-        return isset($this->_listeners[$event]) && $this->_listeners[$event];
-    }
-
-    /**
-     * Adds an event listener that listens on the specified events.
-     *
-     * @param string|array $events   The event(s) to listen on.
-     * @param object       $listener The listener object.
-     *
-     * @return void
-     */
-    public function addEventListener($events, $listener)
-    {
-        // Picks the hash code related to that listener
-        $hash = spl_object_hash($listener);
-
-        foreach ((array) $events as $event) {
-            // Overrides listener if a previous one was associated already
-            // Prevents duplicate listeners on same event (same instance only)
-            $this->_listeners[$event][$hash] = $listener;
-        }
-    }
-
-    /**
-     * Removes an event listener from the specified events.
-     *
-     * @param string|array $events
-     * @param object       $listener
-     *
-     * @return void
-     */
-    public function removeEventListener($events, $listener)
-    {
-        // Picks the hash code related to that listener
-        $hash = spl_object_hash($listener);
-
-        foreach ((array) $events as $event) {
-            // Check if actually have this listener associated
-            if (isset($this->_listeners[$event][$hash])) {
-                unset($this->_listeners[$event][$hash]);
-            }
-        }
-    }
-
-    /**
-     * Adds an EventSubscriber. The subscriber is asked for all the events it is
-     * interested in and added as a listener for these events.
-     *
-     * @param \Doctrine\Common\EventSubscriber $subscriber The subscriber.
-     *
-     * @return void
-     */
-    public function addEventSubscriber(EventSubscriber $subscriber)
-    {
-        $this->addEventListener($subscriber->getSubscribedEvents(), $subscriber);
-    }
-
-    /**
-     * Removes an EventSubscriber. The subscriber is asked for all the events it is
-     * interested in and removed as a listener for these events.
-     *
-     * @param \Doctrine\Common\EventSubscriber $subscriber The subscriber.
-     *
-     * @return void
-     */
-    public function removeEventSubscriber(EventSubscriber $subscriber)
-    {
-        $this->removeEventListener($subscriber->getSubscribedEvents(), $subscriber);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php b/vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php
deleted file mode 100644
index 55d0f7d..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/EventSubscriber.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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;
-
-/**
- * An EventSubscriber knows himself what events he is interested in.
- * If an EventSubscriber is added to an EventManager, the manager invokes
- * {@link getSubscribedEvents} and registers the subscriber as a listener for all
- * returned events.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface EventSubscriber
-{
-    /**
-     * Returns an array of events this subscriber wants to listen to.
-     *
-     * @return array
-     */
-    public function getSubscribedEvents();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Lexer.php b/vendor/doctrine/common/lib/Doctrine/Common/Lexer.php
deleted file mode 100644
index 0aa07f8..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Lexer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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;
-
-use Doctrine\Common\Lexer\AbstractLexer;
-
-/**
- * Base class for writing simple lexers, i.e. for creating small DSLs.
- *
- * Lexer moved into its own Component Doctrine\Common\Lexer. This class
- * only stays for being BC.
- *
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-abstract class Lexer extends AbstractLexer
-{
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php b/vendor/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php
deleted file mode 100644
index e25e999..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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;
-
-/**
- * Contract for classes that provide the service of notifying listeners of
- * changes to their properties.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface NotifyPropertyChanged
-{
-    /**
-     * Adds a listener that wants to be notified about property changes.
-     *
-     * @param PropertyChangedListener $listener
-     *
-     * @return void
-     */
-    public function addPropertyChangedListener(PropertyChangedListener $listener);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
deleted file mode 100644
index 33770f9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?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\Persistence;
-
-/**
- * Abstract implementation of the ManagerRegistry contract.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-abstract class AbstractManagerRegistry implements ManagerRegistry
-{
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var array
-     */
-    private $connections;
-
-    /**
-     * @var array
-     */
-    private $managers;
-
-    /**
-     * @var string
-     */
-    private $defaultConnection;
-
-    /**
-     * @var string
-     */
-    private $defaultManager;
-
-    /**
-     * @var string
-     */
-    private $proxyInterfaceName;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name
-     * @param array  $connections
-     * @param array  $managers
-     * @param string $defaultConnection
-     * @param string $defaultManager
-     * @param string $proxyInterfaceName
-     */
-    public function __construct($name, array $connections, array $managers, $defaultConnection, $defaultManager, $proxyInterfaceName)
-    {
-        $this->name = $name;
-        $this->connections = $connections;
-        $this->managers = $managers;
-        $this->defaultConnection = $defaultConnection;
-        $this->defaultManager = $defaultManager;
-        $this->proxyInterfaceName = $proxyInterfaceName;
-    }
-
-    /**
-     * Fetches/creates the given services.
-     *
-     * A service in this context is connection or a manager instance.
-     *
-     * @param string $name The name of the service.
-     *
-     * @return object The instance of the given service.
-     */
-    abstract protected function getService($name);
-
-    /**
-     * Resets the given services.
-     *
-     * A service in this context is connection or a manager instance.
-     *
-     * @param string $name The name of the service.
-     *
-     * @return void
-     */
-    abstract protected function resetService($name);
-
-    /**
-     * Gets the name of the registry.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConnection($name = null)
-    {
-        if (null === $name) {
-            $name = $this->defaultConnection;
-        }
-
-        if (!isset($this->connections[$name])) {
-            throw new \InvalidArgumentException(sprintf('Doctrine %s Connection named "%s" does not exist.', $this->name, $name));
-        }
-
-        return $this->getService($this->connections[$name]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConnectionNames()
-    {
-        return $this->connections;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConnections()
-    {
-        $connections = array();
-        foreach ($this->connections as $name => $id) {
-            $connections[$name] = $this->getService($id);
-        }
-
-        return $connections;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultConnectionName()
-    {
-        return $this->defaultConnection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultManagerName()
-    {
-        return $this->defaultManager;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function getManager($name = null)
-    {
-        if (null === $name) {
-            $name = $this->defaultManager;
-        }
-
-        if (!isset($this->managers[$name])) {
-            throw new \InvalidArgumentException(sprintf('Doctrine %s Manager named "%s" does not exist.', $this->name, $name));
-        }
-
-        return $this->getService($this->managers[$name]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getManagerForClass($class)
-    {
-        // Check for namespace alias
-        if (strpos($class, ':') !== false) {
-            list($namespaceAlias, $simpleClassName) = explode(':', $class, 2);
-            $class = $this->getAliasNamespace($namespaceAlias) . '\\' . $simpleClassName;
-        }
-
-        $proxyClass = new \ReflectionClass($class);
-        if ($proxyClass->implementsInterface($this->proxyInterfaceName)) {
-            $class = $proxyClass->getParentClass()->getName();
-        }
-
-        foreach ($this->managers as $id) {
-            $manager = $this->getService($id);
-
-            if (!$manager->getMetadataFactory()->isTransient($class)) {
-                return $manager;
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getManagerNames()
-    {
-        return $this->managers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getManagers()
-    {
-        $dms = array();
-        foreach ($this->managers as $name => $id) {
-            $dms[$name] = $this->getService($id);
-        }
-
-        return $dms;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRepository($persistentObjectName, $persistentManagerName = null)
-    {
-        return $this->getManager($persistentManagerName)->getRepository($persistentObjectName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resetManager($name = null)
-    {
-        if (null === $name) {
-            $name = $this->defaultManager;
-        }
-
-        if (!isset($this->managers[$name])) {
-            throw new \InvalidArgumentException(sprintf('Doctrine %s Manager named "%s" does not exist.', $this->name, $name));
-        }
-
-        // force the creation of a new document manager
-        // if the current one is closed
-        $this->resetService($this->managers[$name]);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php
deleted file mode 100644
index 7c25e98..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Persistence;
-
-/**
- * Contract covering connection for a Doctrine persistence layer ManagerRegistry class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-interface ConnectionRegistry
-{
-    /**
-     * Gets the default connection name.
-     *
-     * @return string The default connection name.
-     */
-    public function getDefaultConnectionName();
-
-    /**
-     * Gets the named connection.
-     *
-     * @param string $name The connection name (null for the default one).
-     *
-     * @return object
-     */
-    public function getConnection($name = null);
-
-    /**
-     * Gets an array of all registered connections.
-     *
-     * @return array An array of Connection instances.
-     */
-    public function getConnections();
-
-    /**
-     * Gets all connection names.
-     *
-     * @return array An array of connection names.
-     */
-    public function getConnectionNames();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php
deleted file mode 100644
index 52f41c0..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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\Persistence\Event;
-
-use Doctrine\Common\EventArgs;
-use Doctrine\Common\Persistence\ObjectManager;
-
-/**
- * Lifecycle Events are triggered by the UnitOfWork during lifecycle transitions
- * of entities.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Roman Borschel <roman@code-factory.de>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class LifecycleEventArgs extends EventArgs
-{
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var object
-     */
-    private $object;
-
-    /**
-     * Constructor.
-     *
-     * @param object        $object
-     * @param ObjectManager $objectManager
-     */
-    public function __construct($object, ObjectManager $objectManager)
-    {
-        $this->object = $object;
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Retrieves the associated entity.
-     *
-     * @deprecated
-     *
-     * @return object
-     */
-    public function getEntity()
-    {
-        return $this->object;
-    }
-
-    /**
-     * Retrieves the associated object.
-     *
-     * @return object
-     */
-    public function getObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * Retrieves the associated ObjectManager.
-     *
-     * @return ObjectManager
-     */
-    public function getObjectManager()
-    {
-        return $this->objectManager;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php
deleted file mode 100644
index 3d8abbe..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Persistence\Event;
-
-use Doctrine\Common\EventArgs;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
-
-/**
- * Class that holds event arguments for a loadMetadata event.
- *
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @since  2.2
- */
-class LoadClassMetadataEventArgs extends EventArgs
-{
-    /**
-     * @var ClassMetadata
-     */
-    private $classMetadata;
-
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * Constructor.
-     *
-     * @param ClassMetadata $classMetadata
-     * @param ObjectManager $objectManager
-     */
-    public function __construct(ClassMetadata $classMetadata, ObjectManager $objectManager)
-    {
-        $this->classMetadata = $classMetadata;
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Retrieves the associated ClassMetadata.
-     *
-     * @return ClassMetadata
-     */
-    public function getClassMetadata()
-    {
-        return $this->classMetadata;
-    }
-
-    /**
-     * Retrieves the associated ObjectManager.
-     *
-     * @return ObjectManager
-     */
-    public function getObjectManager()
-    {
-        return $this->objectManager;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php
deleted file mode 100644
index 5527d4d..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Persistence\Event;
-
-use Doctrine\Common\EventArgs;
-use Doctrine\Common\Persistence\ObjectManager;
-
-/**
- * Provides event arguments for the preFlush event.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Roman Borschel <roman@code-factory.de>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class ManagerEventArgs extends EventArgs
-{
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * Constructor.
-     *
-     * @param ObjectManager $objectManager
-     */
-    public function __construct(ObjectManager $objectManager)
-    {
-        $this->objectManager = $objectManager;
-    }
-
-    /**
-     * Retrieves the associated ObjectManager.
-     *
-     * @return ObjectManager
-     */
-    public function getObjectManager()
-    {
-        return $this->objectManager;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php
deleted file mode 100644
index b78bad9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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\Persistence\Event;
-
-use Doctrine\Common\EventArgs;
-use Doctrine\Common\Persistence\ObjectManager;
-
-/**
- * Provides event arguments for the onClear event.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Roman Borschel <roman@code-factory.de>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class OnClearEventArgs extends EventArgs
-{
-    /**
-     * @var \Doctrine\Common\Persistence\ObjectManager
-     */
-    private $objectManager;
-
-    /**
-     * @var string|null
-     */
-    private $entityClass;
-
-    /**
-     * Constructor.
-     *
-     * @param ObjectManager $objectManager The object manager.
-     * @param string|null   $entityClass   The optional entity class.
-     */
-    public function __construct($objectManager, $entityClass = null)
-    {
-        $this->objectManager = $objectManager;
-        $this->entityClass = $entityClass;
-    }
-
-    /**
-     * Retrieves the associated ObjectManager.
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager
-     */
-    public function getObjectManager()
-    {
-        return $this->objectManager;
-    }
-
-    /**
-     * Returns the name of the entity class that is cleared, or null if all are cleared.
-     *
-     * @return string|null
-     */
-    public function getEntityClass()
-    {
-        return $this->entityClass;
-    }
-
-    /**
-     * Returns whether this event clears all entities.
-     *
-     * @return bool
-     */
-    public function clearsAllEntities()
-    {
-        return ($this->entityClass === null);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php
deleted file mode 100644
index facce64..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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\Persistence\Event;
-
-use Doctrine\Common\Persistence\ObjectManager;
-
-/**
- * Class that holds event arguments for a preUpdate event.
- *
- * @author Guilherme Blanco <guilehrmeblanco@hotmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @since  2.2
- */
-class PreUpdateEventArgs extends LifecycleEventArgs
-{
-    /**
-     * @var array
-     */
-    private $entityChangeSet;
-
-    /**
-     * Constructor.
-     *
-     * @param object        $entity
-     * @param ObjectManager $objectManager
-     * @param array         $changeSet
-     */
-    public function __construct($entity, ObjectManager $objectManager, array &$changeSet)
-    {
-        parent::__construct($entity, $objectManager);
-
-        $this->entityChangeSet = &$changeSet;
-    }
-
-    /**
-     * Retrieves the entity changeset.
-     *
-     * @return array
-     */
-    public function getEntityChangeSet()
-    {
-        return $this->entityChangeSet;
-    }
-
-    /**
-     * Checks if field has a changeset.
-     *
-     * @param string $field
-     *
-     * @return boolean
-     */
-    public function hasChangedField($field)
-    {
-        return isset($this->entityChangeSet[$field]);
-    }
-
-    /**
-     * Gets the old value of the changeset of the changed field.
-     *
-     * @param string $field
-     *
-     * @return mixed
-     */
-    public function getOldValue($field)
-    {
-        $this->assertValidField($field);
-
-        return $this->entityChangeSet[$field][0];
-    }
-
-    /**
-     * Gets the new value of the changeset of the changed field.
-     *
-     * @param string $field
-     *
-     * @return mixed
-     */
-    public function getNewValue($field)
-    {
-        $this->assertValidField($field);
-
-        return $this->entityChangeSet[$field][1];
-    }
-
-    /**
-     * Sets the new value of this field.
-     *
-     * @param string $field
-     * @param mixed  $value
-     *
-     * @return void
-     */
-    public function setNewValue($field, $value)
-    {
-        $this->assertValidField($field);
-
-        $this->entityChangeSet[$field][1] = $value;
-    }
-
-    /**
-     * Asserts the field exists in changeset.
-     *
-     * @param string $field
-     *
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     */
-    private function assertValidField($field)
-    {
-        if ( ! isset($this->entityChangeSet[$field])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Field "%s" is not a valid field of the entity "%s" in PreUpdateEventArgs.',
-                $field,
-                get_class($this->getEntity())
-            ));
-        }
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php
deleted file mode 100644
index fce854b..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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\Persistence;
-
-/**
- * Contract covering object managers for a Doctrine persistence layer ManagerRegistry class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-interface ManagerRegistry extends ConnectionRegistry
-{
-    /**
-     * Gets the default object manager name.
-     *
-     * @return string The default object manager name.
-     */
-    public function getDefaultManagerName();
-
-    /**
-     * Gets a named object manager.
-     *
-     * @param string $name The object manager name (null for the default one).
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager
-     */
-    public function getManager($name = null);
-
-    /**
-     * Gets an array of all registered object managers.
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager[] An array of ObjectManager instances
-     */
-    public function getManagers();
-
-    /**
-     * Resets a named object manager.
-     *
-     * This method is useful when an object manager has been closed
-     * because of a rollbacked transaction AND when you think that
-     * it makes sense to get a new one to replace the closed one.
-     *
-     * Be warned that you will get a brand new object manager as
-     * the existing one is not useable anymore. This means that any
-     * other object with a dependency on this object manager will
-     * hold an obsolete reference. You can inject the registry instead
-     * to avoid this problem.
-     *
-     * @param string|null $name The object manager name (null for the default one).
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager
-     */
-    public function resetManager($name = null);
-
-    /**
-     * Resolves a registered namespace alias to the full namespace.
-     *
-     * This method looks for the alias in all registered object managers.
-     *
-     * @param string $alias The alias.
-     *
-     * @return string The full namespace.
-     */
-    public function getAliasNamespace($alias);
-
-    /**
-     * Gets all connection names.
-     *
-     * @return array An array of connection names.
-     */
-    public function getManagerNames();
-
-    /**
-     * Gets the ObjectRepository for an persistent object.
-     *
-     * @param string $persistentObject      The name of the persistent object.
-     * @param string $persistentManagerName The object manager name (null for the default one).
-     *
-     * @return \Doctrine\Common\Persistence\ObjectRepository
-     */
-    public function getRepository($persistentObject, $persistentManagerName = null);
-
-    /**
-     * Gets the object manager associated with a given class.
-     *
-     * @param string $class A persistent object class name.
-     *
-     * @return \Doctrine\Common\Persistence\ObjectManager|null
-     */
-    public function getManagerForClass($class);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
deleted file mode 100644
index 404fea9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?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\Persistence\Mapping;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Util\ClassUtils;
-use ReflectionException;
-
-/**
- * The ClassMetadataFactory is used to create ClassMetadata objects that contain all the
- * metadata mapping informations of a class which describes how a class should be mapped
- * to a relational database.
- *
- * This class was abstracted from the ORM ClassMetadataFactory.
- *
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-abstract class AbstractClassMetadataFactory implements ClassMetadataFactory
-{
-    /**
-     * Salt used by specific Object Manager implementation.
-     *
-     * @var string
-     */
-    protected $cacheSalt = '$CLASSMETADATA';
-
-    /**
-     * @var \Doctrine\Common\Cache\Cache|null
-     */
-    private $cacheDriver;
-
-    /**
-     * @var ClassMetadata[]
-     */
-    private $loadedMetadata = array();
-
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
-
-    /**
-     * @var ReflectionService|null
-     */
-    private $reflectionService = null;
-
-    /**
-     * Sets the cache driver used by the factory to cache ClassMetadata instances.
-     *
-     * @param \Doctrine\Common\Cache\Cache $cacheDriver
-     *
-     * @return void
-     */
-    public function setCacheDriver(Cache $cacheDriver = null)
-    {
-        $this->cacheDriver = $cacheDriver;
-    }
-
-    /**
-     * Gets the cache driver used by the factory to cache ClassMetadata instances.
-     *
-     * @return \Doctrine\Common\Cache\Cache|null
-     */
-    public function getCacheDriver()
-    {
-        return $this->cacheDriver;
-    }
-
-    /**
-     * Returns an array of all the loaded metadata currently in memory.
-     *
-     * @return ClassMetadata[]
-     */
-    public function getLoadedMetadata()
-    {
-        return $this->loadedMetadata;
-    }
-
-    /**
-     * Forces the factory to load the metadata of all classes known to the underlying
-     * mapping driver.
-     *
-     * @return array The ClassMetadata instances of all mapped classes.
-     */
-    public function getAllMetadata()
-    {
-        if ( ! $this->initialized) {
-            $this->initialize();
-        }
-
-        $driver = $this->getDriver();
-        $metadata = array();
-        foreach ($driver->getAllClassNames() as $className) {
-            $metadata[] = $this->getMetadataFor($className);
-        }
-
-        return $metadata;
-    }
-
-    /**
-     * Lazy initialization of this stuff, especially the metadata driver,
-     * since these are not needed at all when a metadata cache is active.
-     *
-     * @return void
-     */
-    abstract protected function initialize();
-
-    /**
-     * Gets the fully qualified class-name from the namespace alias.
-     *
-     * @param string $namespaceAlias
-     * @param string $simpleClassName
-     *
-     * @return string
-     */
-    abstract protected function getFqcnFromAlias($namespaceAlias, $simpleClassName);
-
-    /**
-     * Returns the mapping driver implementation.
-     *
-     * @return \Doctrine\Common\Persistence\Mapping\Driver\MappingDriver
-     */
-    abstract protected function getDriver();
-
-    /**
-     * Wakes up reflection after ClassMetadata gets unserialized from cache.
-     *
-     * @param ClassMetadata     $class
-     * @param ReflectionService $reflService
-     *
-     * @return void
-     */
-    abstract protected function wakeupReflection(ClassMetadata $class, ReflectionService $reflService);
-
-    /**
-     * Initializes Reflection after ClassMetadata was constructed.
-     *
-     * @param ClassMetadata     $class
-     * @param ReflectionService $reflService
-     *
-     * @return void
-     */
-    abstract protected function initializeReflection(ClassMetadata $class, ReflectionService $reflService);
-
-    /**
-     * Checks whether the class metadata is an entity.
-     *
-     * This method should return false for mapped superclasses or embedded classes.
-     *
-     * @param ClassMetadata $class
-     *
-     * @return boolean
-     */
-    abstract protected function isEntity(ClassMetadata $class);
-
-    /**
-     * Gets the class metadata descriptor for a class.
-     *
-     * @param string $className The name of the class.
-     *
-     * @return ClassMetadata
-     *
-     * @throws ReflectionException
-     * @throws MappingException
-     */
-    public function getMetadataFor($className)
-    {
-        if (isset($this->loadedMetadata[$className])) {
-            return $this->loadedMetadata[$className];
-        }
-
-        // Check for namespace alias
-        if (strpos($className, ':') !== false) {
-            list($namespaceAlias, $simpleClassName) = explode(':', $className, 2);
-
-            $realClassName = $this->getFqcnFromAlias($namespaceAlias, $simpleClassName);
-        } else {
-            $realClassName = ClassUtils::getRealClass($className);
-        }
-
-        if (isset($this->loadedMetadata[$realClassName])) {
-            // We do not have the alias name in the map, include it
-            return $this->loadedMetadata[$className] = $this->loadedMetadata[$realClassName];
-        }
-
-        $loadingException = null;
-
-        try {
-            if ($this->cacheDriver) {
-                if (($cached = $this->cacheDriver->fetch($realClassName . $this->cacheSalt)) !== false) {
-                    $this->loadedMetadata[$realClassName] = $cached;
-
-                    $this->wakeupReflection($cached, $this->getReflectionService());
-                } else {
-                    foreach ($this->loadMetadata($realClassName) as $loadedClassName) {
-                        $this->cacheDriver->save(
-                            $loadedClassName . $this->cacheSalt,
-                            $this->loadedMetadata[$loadedClassName],
-                            null
-                        );
-                    }
-                }
-            } else {
-                $this->loadMetadata($realClassName);
-            }
-        } catch (MappingException $loadingException) {
-            if (! $fallbackMetadataResponse = $this->onNotFoundMetadata($realClassName)) {
-                throw $loadingException;
-            }
-
-            $this->loadedMetadata[$realClassName] = $fallbackMetadataResponse;
-        }
-
-        if ($className !== $realClassName) {
-            // We do not have the alias name in the map, include it
-            $this->loadedMetadata[$className] = $this->loadedMetadata[$realClassName];
-        }
-
-        return $this->loadedMetadata[$className];
-    }
-
-    /**
-     * Checks whether the factory has the metadata for a class loaded already.
-     *
-     * @param string $className
-     *
-     * @return boolean TRUE if the metadata of the class in question is already loaded, FALSE otherwise.
-     */
-    public function hasMetadataFor($className)
-    {
-        return isset($this->loadedMetadata[$className]);
-    }
-
-    /**
-     * Sets the metadata descriptor for a specific class.
-     *
-     * NOTE: This is only useful in very special cases, like when generating proxy classes.
-     *
-     * @param string        $className
-     * @param ClassMetadata $class
-     *
-     * @return void
-     */
-    public function setMetadataFor($className, $class)
-    {
-        $this->loadedMetadata[$className] = $class;
-    }
-
-    /**
-     * Gets an array of parent classes for the given entity class.
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    protected function getParentClasses($name)
-    {
-        // Collect parent classes, ignoring transient (not-mapped) classes.
-        $parentClasses = array();
-        foreach (array_reverse($this->getReflectionService()->getParentClasses($name)) as $parentClass) {
-            if ( ! $this->getDriver()->isTransient($parentClass)) {
-                $parentClasses[] = $parentClass;
-            }
-        }
-        return $parentClasses;
-    }
-
-    /**
-     * Loads the metadata of the class in question and all it's ancestors whose metadata
-     * is still not loaded.
-     *
-     * Important: The class $name does not necesarily exist at this point here.
-     * Scenarios in a code-generation setup might have access to XML/YAML
-     * Mapping files without the actual PHP code existing here. That is why the
-     * {@see Doctrine\Common\Persistence\Mapping\ReflectionService} interface
-     * should be used for reflection.
-     *
-     * @param string $name The name of the class for which the metadata should get loaded.
-     *
-     * @return array
-     */
-    protected function loadMetadata($name)
-    {
-        if ( ! $this->initialized) {
-            $this->initialize();
-        }
-
-        $loaded = array();
-
-        $parentClasses = $this->getParentClasses($name);
-        $parentClasses[] = $name;
-
-        // Move down the hierarchy of parent classes, starting from the topmost class
-        $parent = null;
-        $rootEntityFound = false;
-        $visited = array();
-        $reflService = $this->getReflectionService();
-        foreach ($parentClasses as $className) {
-            if (isset($this->loadedMetadata[$className])) {
-                $parent = $this->loadedMetadata[$className];
-                if ($this->isEntity($parent)) {
-                    $rootEntityFound = true;
-                    array_unshift($visited, $className);
-                }
-                continue;
-            }
-
-            $class = $this->newClassMetadataInstance($className);
-            $this->initializeReflection($class, $reflService);
-
-            $this->doLoadMetadata($class, $parent, $rootEntityFound, $visited);
-
-            $this->loadedMetadata[$className] = $class;
-
-            $parent = $class;
-
-            if ($this->isEntity($class)) {
-                $rootEntityFound = true;
-                array_unshift($visited, $className);
-            }
-
-            $this->wakeupReflection($class, $reflService);
-
-            $loaded[] = $className;
-        }
-
-        return $loaded;
-    }
-
-    /**
-     * Provides a fallback hook for loading metadata when loading failed due to reflection/mapping exceptions
-     *
-     * Override this method to implement a fallback strategy for failed metadata loading
-     *
-     * @param string $className
-     *
-     * @return \Doctrine\Common\Persistence\Mapping\ClassMetadata|null
-     */
-    protected function onNotFoundMetadata($className)
-    {
-        return null;
-    }
-
-    /**
-     * Actually loads the metadata from the underlying metadata.
-     *
-     * @param ClassMetadata      $class
-     * @param ClassMetadata|null $parent
-     * @param bool               $rootEntityFound
-     * @param array              $nonSuperclassParents All parent class names
-     *                                                 that are not marked as mapped superclasses.
-     *
-     * @return void
-     */
-    abstract protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents);
-
-    /**
-     * Creates a new ClassMetadata instance for the given class name.
-     *
-     * @param string $className
-     *
-     * @return ClassMetadata
-     */
-    abstract protected function newClassMetadataInstance($className);
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isTransient($class)
-    {
-        if ( ! $this->initialized) {
-            $this->initialize();
-        }
-
-        // Check for namespace alias
-        if (strpos($class, ':') !== false) {
-            list($namespaceAlias, $simpleClassName) = explode(':', $class, 2);
-            $class = $this->getFqcnFromAlias($namespaceAlias, $simpleClassName);
-        }
-
-        return $this->getDriver()->isTransient($class);
-    }
-
-    /**
-     * Sets the reflectionService.
-     *
-     * @param ReflectionService $reflectionService
-     *
-     * @return void
-     */
-    public function setReflectionService(ReflectionService $reflectionService)
-    {
-        $this->reflectionService = $reflectionService;
-    }
-
-    /**
-     * Gets the reflection service associated with this metadata factory.
-     *
-     * @return ReflectionService
-     */
-    public function getReflectionService()
-    {
-        if ($this->reflectionService === null) {
-            $this->reflectionService = new RuntimeReflectionService();
-        }
-        return $this->reflectionService;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
deleted file mode 100644
index b8445f1..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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\Persistence\Mapping;
-
-/**
- * Contract for a Doctrine persistence layer ClassMetadata class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.1
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Jonathan Wage <jonwage@gmail.com>
- */
-interface ClassMetadata
-{
-    /**
-     * Gets the fully-qualified class name of this persistent class.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Gets the mapped identifier field name.
-     *
-     * The returned structure is an array of the identifier field names.
-     *
-     * @return array
-     */
-    public function getIdentifier();
-
-    /**
-     * Gets the ReflectionClass instance for this mapped class.
-     *
-     * @return \ReflectionClass
-     */
-    public function getReflectionClass();
-
-    /**
-     * Checks if the given field name is a mapped identifier for this class.
-     *
-     * @param string $fieldName
-     *
-     * @return boolean
-     */
-    public function isIdentifier($fieldName);
-
-    /**
-     * Checks if the given field is a mapped property for this class.
-     *
-     * @param string $fieldName
-     *
-     * @return boolean
-     */
-    public function hasField($fieldName);
-
-    /**
-     * Checks if the given field is a mapped association for this class.
-     *
-     * @param string $fieldName
-     *
-     * @return boolean
-     */
-    public function hasAssociation($fieldName);
-
-    /**
-     * Checks if the given field is a mapped single valued association for this class.
-     *
-     * @param string $fieldName
-     *
-     * @return boolean
-     */
-    public function isSingleValuedAssociation($fieldName);
-
-    /**
-     * Checks if the given field is a mapped collection valued association for this class.
-     *
-     * @param string $fieldName
-     *
-     * @return boolean
-     */
-    public function isCollectionValuedAssociation($fieldName);
-
-    /**
-     * A numerically indexed list of field names of this persistent class.
-     *
-     * This array includes identifier fields if present on this class.
-     *
-     * @return array
-     */
-    public function getFieldNames();
-
-    /**
-     * Returns an array of identifier field names numerically indexed.
-     *
-     * @return array
-     */
-    public function getIdentifierFieldNames();
-
-    /**
-     * Returns a numerically indexed list of association names of this persistent class.
-     *
-     * This array includes identifier associations if present on this class.
-     *
-     * @return array
-     */
-    public function getAssociationNames();
-
-    /**
-     * Returns a type name of this field.
-     *
-     * This type names can be implementation specific but should at least include the php types:
-     * integer, string, boolean, float/double, datetime.
-     *
-     * @param string $fieldName
-     *
-     * @return string
-     */
-    public function getTypeOfField($fieldName);
-
-    /**
-     * Returns the target class name of the given association.
-     *
-     * @param string $assocName
-     *
-     * @return string
-     */
-    public function getAssociationTargetClass($assocName);
-
-    /**
-     * Checks if the association is the inverse side of a bidirectional association.
-     *
-     * @param string $assocName
-     *
-     * @return boolean
-     */
-    public function isAssociationInverseSide($assocName);
-
-    /**
-     * Returns the target field of the owning side of the association.
-     *
-     * @param string $assocName
-     *
-     * @return string
-     */
-    public function getAssociationMappedByTargetField($assocName);
-
-    /**
-     * Returns the identifier of this object as an array with field name as key.
-     *
-     * Has to return an empty array if no identifier isset.
-     *
-     * @param object $object
-     *
-     * @return array
-     */
-    public function getIdentifierValues($object);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php
deleted file mode 100644
index 3d82881..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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\Persistence\Mapping;
-
-/**
- * Contract for a Doctrine persistence layer ClassMetadata class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.1
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Jonathan Wage <jonwage@gmail.com>
- */
-interface ClassMetadataFactory
-{
-    /**
-     * Forces the factory to load the metadata of all classes known to the underlying
-     * mapping driver.
-     *
-     * @return array The ClassMetadata instances of all mapped classes.
-     */
-    public function getAllMetadata();
-
-    /**
-     * Gets the class metadata descriptor for a class.
-     *
-     * @param string $className The name of the class.
-     *
-     * @return ClassMetadata
-     */
-    public function getMetadataFor($className);
-
-    /**
-     * Checks whether the factory has the metadata for a class loaded already.
-     *
-     * @param string $className
-     *
-     * @return boolean TRUE if the metadata of the class in question is already loaded, FALSE otherwise.
-     */
-    public function hasMetadataFor($className);
-
-    /**
-     * Sets the metadata descriptor for a specific class.
-     *
-     * @param string $className
-     *
-     * @param ClassMetadata $class
-     */
-    public function setMetadataFor($className, $class);
-
-    /**
-     * Returns whether the class with the specified name should have its metadata loaded.
-     * This is only the case if it is either mapped directly or as a MappedSuperclass.
-     *
-     * @param string $className
-     *
-     * @return boolean
-     */
-    public function isTransient($className);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
deleted file mode 100644
index 8bb574d..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * The AnnotationDriver reads the mapping metadata from docblock annotations.
- *
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-abstract class AnnotationDriver implements MappingDriver
-{
-    /**
-     * The AnnotationReader.
-     *
-     * @var AnnotationReader
-     */
-    protected $reader;
-
-    /**
-     * The paths where to look for mapping files.
-     *
-     * @var array
-     */
-    protected $paths = array();
-
-    /**
-     * The paths excluded from path where to look for mapping files.
-     *
-     * @var array
-     */
-    protected $excludePaths = array();
-
-    /**
-     * The file extension of mapping documents.
-     *
-     * @var string
-     */
-    protected $fileExtension = '.php';
-
-    /**
-     * Cache for AnnotationDriver#getAllClassNames().
-     *
-     * @var array|null
-     */
-    protected $classNames;
-
-    /**
-     * Name of the entity annotations as keys.
-     *
-     * @var array
-     */
-    protected $entityAnnotationClasses = array();
-
-    /**
-     * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading
-     * docblock annotations.
-     *
-     * @param AnnotationReader  $reader The AnnotationReader to use, duck-typed.
-     * @param string|array|null $paths  One or multiple paths where mapping classes can be found.
-     */
-    public function __construct($reader, $paths = null)
-    {
-        $this->reader = $reader;
-        if ($paths) {
-            $this->addPaths((array) $paths);
-        }
-    }
-
-    /**
-     * Appends lookup paths to metadata driver.
-     *
-     * @param array $paths
-     *
-     * @return void
-     */
-    public function addPaths(array $paths)
-    {
-        $this->paths = array_unique(array_merge($this->paths, $paths));
-    }
-
-    /**
-     * Retrieves the defined metadata lookup paths.
-     *
-     * @return array
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * Append exclude lookup paths to metadata driver.
-     *
-     * @param array $paths
-     */
-    public function addExcludePaths(array $paths)
-    {
-        $this->excludePaths = array_unique(array_merge($this->excludePaths, $paths));
-    }
-
-    /**
-     * Retrieve the defined metadata lookup exclude paths.
-     *
-     * @return array
-     */
-    public function getExcludePaths()
-    {
-        return $this->excludePaths;
-    }
-
-    /**
-     * Retrieve the current annotation reader
-     *
-     * @return AnnotationReader
-     */
-    public function getReader()
-    {
-        return $this->reader;
-    }
-
-    /**
-     * Gets the file extension used to look for mapping files under.
-     *
-     * @return string
-     */
-    public function getFileExtension()
-    {
-        return $this->fileExtension;
-    }
-
-    /**
-     * Sets the file extension used to look for mapping files under.
-     *
-     * @param string $fileExtension The file extension to set.
-     *
-     * @return void
-     */
-    public function setFileExtension($fileExtension)
-    {
-        $this->fileExtension = $fileExtension;
-    }
-
-    /**
-     * Returns whether the class with the specified name is transient. Only non-transient
-     * classes, that is entities and mapped superclasses, should have their metadata loaded.
-     *
-     * A class is non-transient if it is annotated with an annotation
-     * from the {@see AnnotationDriver::entityAnnotationClasses}.
-     *
-     * @param string $className
-     *
-     * @return boolean
-     */
-    public function isTransient($className)
-    {
-        $classAnnotations = $this->reader->getClassAnnotations(new \ReflectionClass($className));
-
-        foreach ($classAnnotations as $annot) {
-            if (isset($this->entityAnnotationClasses[get_class($annot)])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAllClassNames()
-    {
-        if ($this->classNames !== null) {
-            return $this->classNames;
-        }
-
-        if (!$this->paths) {
-            throw MappingException::pathRequired();
-        }
-
-        $classes = array();
-        $includedFiles = array();
-
-        foreach ($this->paths as $path) {
-            if ( ! is_dir($path)) {
-                throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
-            }
-
-            $iterator = new \RegexIterator(
-                new \RecursiveIteratorIterator(
-                    new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
-                    \RecursiveIteratorIterator::LEAVES_ONLY
-                ),
-                '/^.+' . preg_quote($this->fileExtension) . '$/i',
-                \RecursiveRegexIterator::GET_MATCH
-            );
-
-            foreach ($iterator as $file) {
-                $sourceFile = $file[0];
-
-                if ( ! preg_match('(^phar:)i', $sourceFile)) {
-                    $sourceFile = realpath($sourceFile);
-                }
-
-                foreach ($this->excludePaths as $excludePath) {
-                    $exclude = str_replace('\\', '/', realpath($excludePath));
-                    $current = str_replace('\\', '/', $sourceFile);
-
-                    if (strpos($current, $exclude) !== false) {
-                        continue 2;
-                    }
-                }
-
-                require_once $sourceFile;
-
-                $includedFiles[] = $sourceFile;
-            }
-        }
-
-        $declared = get_declared_classes();
-
-        foreach ($declared as $className) {
-            $rc = new \ReflectionClass($className);
-            $sourceFile = $rc->getFileName();
-            if (in_array($sourceFile, $includedFiles) && ! $this->isTransient($className)) {
-                $classes[] = $className;
-            }
-        }
-
-        $this->classNames = $classes;
-
-        return $classes;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
deleted file mode 100644
index 58a740b..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * Locates the file that contains the metadata information for a given class name.
- *
- * This behavior is independent of the actual content of the file. It just detects
- * the file which is responsible for the given class name.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class DefaultFileLocator implements FileLocator
-{
-    /**
-     * The paths where to look for mapping files.
-     *
-     * @var array
-     */
-    protected $paths = array();
-
-    /**
-     * The file extension of mapping documents.
-     *
-     * @var string|null
-     */
-    protected $fileExtension;
-
-    /**
-     * Initializes a new FileDriver that looks in the given path(s) for mapping
-     * documents and operates in the specified operating mode.
-     *
-     * @param string|array $paths         One or multiple paths where mapping documents can be found.
-     * @param string|null  $fileExtension The file extension of mapping documents, usually prefixed with a dot.
-     */
-    public function __construct($paths, $fileExtension = null)
-    {
-        $this->addPaths((array) $paths);
-        $this->fileExtension = $fileExtension;
-    }
-
-    /**
-     * Appends lookup paths to metadata driver.
-     *
-     * @param array $paths
-     *
-     * @return void
-     */
-    public function addPaths(array $paths)
-    {
-        $this->paths = array_unique(array_merge($this->paths, $paths));
-    }
-
-    /**
-     * Retrieves the defined metadata lookup paths.
-     *
-     * @return array
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * Gets the file extension used to look for mapping files under.
-     *
-     * @return string|null
-     */
-    public function getFileExtension()
-    {
-        return $this->fileExtension;
-    }
-
-    /**
-     * Sets the file extension used to look for mapping files under.
-     *
-     * @param string|null $fileExtension The file extension to set.
-     *
-     * @return void
-     */
-    public function setFileExtension($fileExtension)
-    {
-        $this->fileExtension = $fileExtension;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function findMappingFile($className)
-    {
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
-
-        // Check whether file exists
-        foreach ($this->paths as $path) {
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
-                return $path . DIRECTORY_SEPARATOR . $fileName;
-            }
-        }
-
-        throw MappingException::mappingFileNotFound($className, $fileName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAllClassNames($globalBasename)
-    {
-        $classes = array();
-
-        if ($this->paths) {
-            foreach ($this->paths as $path) {
-                if ( ! is_dir($path)) {
-                    throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
-                }
-
-                $iterator = new \RecursiveIteratorIterator(
-                    new \RecursiveDirectoryIterator($path),
-                    \RecursiveIteratorIterator::LEAVES_ONLY
-                );
-
-                foreach ($iterator as $file) {
-                    $fileName = $file->getBasename($this->fileExtension);
-
-                    if ($fileName == $file->getBasename() || $fileName == $globalBasename) {
-                        continue;
-                    }
-
-                    // NOTE: All files found here means classes are not transient!
-                    $classes[] = str_replace('.', '\\', $fileName);
-                }
-            }
-        }
-
-        return $classes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function fileExists($className)
-    {
-        $fileName = str_replace('\\', '.', $className) . $this->fileExtension;
-
-        // Check whether file exists
-        foreach ((array) $this->paths as $path) {
-            if (is_file($path . DIRECTORY_SEPARATOR . $fileName)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
deleted file mode 100644
index ccc64fa..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * Base driver for file-based metadata drivers.
- *
- * A file driver operates in a mode where it loads the mapping files of individual
- * classes on demand. This requires the user to adhere to the convention of 1 mapping
- * file per class and the file names of the mapping files must correspond to the full
- * class name, including namespace, with the namespace delimiters '\', replaced by dots '.'.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-abstract class FileDriver implements MappingDriver
-{
-    /**
-     * @var FileLocator
-     */
-    protected $locator;
-
-    /**
-     * @var array|null
-     */
-    protected $classCache;
-
-    /**
-     * @var string|null
-     */
-    protected $globalBasename;
-
-    /**
-     * Initializes a new FileDriver that looks in the given path(s) for mapping
-     * documents and operates in the specified operating mode.
-     *
-     * @param string|array|FileLocator $locator       A FileLocator or one/multiple paths
-     *                                                where mapping documents can be found.
-     * @param string|null              $fileExtension
-     */
-    public function __construct($locator, $fileExtension = null)
-    {
-        if ($locator instanceof FileLocator) {
-            $this->locator = $locator;
-        } else {
-            $this->locator = new DefaultFileLocator((array)$locator, $fileExtension);
-        }
-    }
-
-    /**
-     * Sets the global basename.
-     *
-     * @param string $file
-     *
-     * @return void
-     */
-    public function setGlobalBasename($file)
-    {
-        $this->globalBasename = $file;
-    }
-
-    /**
-     * Retrieves the global basename.
-     *
-     * @return string|null
-     */
-    public function getGlobalBasename()
-    {
-        return $this->globalBasename;
-    }
-
-    /**
-     * Gets the element of schema meta data for the class from the mapping file.
-     * This will lazily load the mapping file if it is not loaded yet.
-     *
-     * @param string $className
-     *
-     * @return array The element of schema meta data.
-     *
-     * @throws MappingException
-     */
-    public function getElement($className)
-    {
-        if ($this->classCache === null) {
-            $this->initialize();
-        }
-
-        if (isset($this->classCache[$className])) {
-            return $this->classCache[$className];
-        }
-
-        $result = $this->loadMappingFile($this->locator->findMappingFile($className));
-        if (!isset($result[$className])) {
-            throw MappingException::invalidMappingFile($className, str_replace('\\', '.', $className) . $this->locator->getFileExtension());
-        }
-
-        return $result[$className];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isTransient($className)
-    {
-        if ($this->classCache === null) {
-            $this->initialize();
-        }
-
-        if (isset($this->classCache[$className])) {
-            return false;
-        }
-
-        return !$this->locator->fileExists($className);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAllClassNames()
-    {
-        if ($this->classCache === null) {
-            $this->initialize();
-        }
-
-        $classNames = (array)$this->locator->getAllClassNames($this->globalBasename);
-        if ($this->classCache) {
-            $classNames = array_merge(array_keys($this->classCache), $classNames);
-        }
-        return $classNames;
-    }
-
-    /**
-     * Loads a mapping file with the given name and returns a map
-     * from class/entity names to their corresponding file driver elements.
-     *
-     * @param string $file The mapping file to load.
-     *
-     * @return array
-     */
-    abstract protected function loadMappingFile($file);
-
-    /**
-     * Initializes the class cache from all the global files.
-     *
-     * Using this feature adds a substantial performance hit to file drivers as
-     * more metadata has to be loaded into memory than might actually be
-     * necessary. This may not be relevant to scenarios where caching of
-     * metadata is in place, however hits very hard in scenarios where no
-     * caching is used.
-     *
-     * @return void
-     */
-    protected function initialize()
-    {
-        $this->classCache = array();
-        if (null !== $this->globalBasename) {
-            foreach ($this->locator->getPaths() as $path) {
-                $file = $path.'/'.$this->globalBasename.$this->locator->getFileExtension();
-                if (is_file($file)) {
-                    $this->classCache = array_merge(
-                        $this->classCache,
-                        $this->loadMappingFile($file)
-                    );
-                }
-            }
-        }
-    }
-
-    /**
-     * Retrieves the locator used to discover mapping files by className.
-     *
-     * @return FileLocator
-     */
-    public function getLocator()
-    {
-        return $this->locator;
-    }
-
-    /**
-     * Sets the locator used to discover mapping files by className.
-     *
-     * @param FileLocator $locator
-     */
-    public function setLocator(FileLocator $locator)
-    {
-        $this->locator = $locator;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php
deleted file mode 100644
index f622856..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-/**
- * Locates the file that contains the metadata information for a given class name.
- *
- * This behavior is independent of the actual content of the file. It just detects
- * the file which is responsible for the given class name.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface FileLocator
-{
-    /**
-     * Locates mapping file for the given class name.
-     *
-     * @param string $className
-     *
-     * @return string
-     */
-    public function findMappingFile($className);
-
-    /**
-     * Gets all class names that are found with this file locator.
-     *
-     * @param string $globalBasename Passed to allow excluding the basename.
-     *
-     * @return array
-     */
-    public function getAllClassNames($globalBasename);
-
-    /**
-     * Checks if a file can be found for this class name.
-     *
-     * @param string $className
-     *
-     * @return bool
-     */
-    public function fileExists($className);
-
-    /**
-     * Gets all the paths that this file locator looks for mapping files.
-     *
-     * @return array
-     */
-    public function getPaths();
-
-    /**
-     * Gets the file extension that mapping files are suffixed with.
-     *
-     * @return string
-     */
-    public function getFileExtension();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php
deleted file mode 100644
index b5d7ec0..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-
-/**
- * Contract for metadata drivers.
- *
- * @since  2.2
- * @author Jonathan H. Wage <jonwage@gmail.com>
- */
-interface MappingDriver
-{
-    /**
-     * Loads the metadata for the specified class into the provided container.
-     *
-     * @param string        $className
-     * @param ClassMetadata $metadata
-     *
-     * @return void
-     */
-    public function loadMetadataForClass($className, ClassMetadata $metadata);
-
-    /**
-     * Gets the names of all mapped classes known to this driver.
-     *
-     * @return array The names of all mapped classes known to this driver.
-     */
-    public function getAllClassNames();
-
-    /**
-     * Returns whether the class with the specified name should have its metadata loaded.
-     * This is only the case if it is either mapped as an Entity or a MappedSuperclass.
-     *
-     * @param string $className
-     *
-     * @return boolean
-     */
-    public function isTransient($className);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
deleted file mode 100644
index 26a9f3e..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * The DriverChain allows you to add multiple other mapping drivers for
- * certain namespaces.
- *
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class MappingDriverChain implements MappingDriver
-{
-    /**
-     * The default driver.
-     *
-     * @var MappingDriver|null
-     */
-    private $defaultDriver = null;
-
-    /**
-     * @var array
-     */
-    private $drivers = array();
-
-    /**
-     * Gets the default driver.
-     *
-     * @return MappingDriver|null
-     */
-    public function getDefaultDriver()
-    {
-        return $this->defaultDriver;
-    }
-
-    /**
-     * Set the default driver.
-     *
-     * @param MappingDriver $driver
-     *
-     * @return void
-     */
-    public function setDefaultDriver(MappingDriver $driver)
-    {
-        $this->defaultDriver = $driver;
-    }
-
-    /**
-     * Adds a nested driver.
-     *
-     * @param MappingDriver $nestedDriver
-     * @param string        $namespace
-     *
-     * @return void
-     */
-    public function addDriver(MappingDriver $nestedDriver, $namespace)
-    {
-        $this->drivers[$namespace] = $nestedDriver;
-    }
-
-    /**
-     * Gets the array of nested drivers.
-     *
-     * @return array $drivers
-     */
-    public function getDrivers()
-    {
-        return $this->drivers;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function loadMetadataForClass($className, ClassMetadata $metadata)
-    {
-        /* @var $driver MappingDriver */
-        foreach ($this->drivers as $namespace => $driver) {
-            if (strpos($className, $namespace) === 0) {
-                $driver->loadMetadataForClass($className, $metadata);
-                return;
-            }
-        }
-
-        if (null !== $this->defaultDriver) {
-            $this->defaultDriver->loadMetadataForClass($className, $metadata);
-            return;
-        }
-
-        throw MappingException::classNotFoundInNamespaces($className, array_keys($this->drivers));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAllClassNames()
-    {
-        $classNames = array();
-        $driverClasses = array();
-
-        /* @var $driver MappingDriver */
-        foreach ($this->drivers AS $namespace => $driver) {
-            $oid = spl_object_hash($driver);
-
-            if (!isset($driverClasses[$oid])) {
-                $driverClasses[$oid] = $driver->getAllClassNames();
-            }
-
-            foreach ($driverClasses[$oid] AS $className) {
-                if (strpos($className, $namespace) === 0) {
-                    $classNames[$className] = true;
-                }
-            }
-        }
-
-        if (null !== $this->defaultDriver) {
-            foreach ($this->defaultDriver->getAllClassNames() as $className) {
-                $classNames[$className] = true;
-            }
-        }
-
-        return array_keys($classNames);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isTransient($className)
-    {
-        /* @var $driver MappingDriver */
-        foreach ($this->drivers AS $namespace => $driver) {
-            if (strpos($className, $namespace) === 0) {
-                return $driver->isTransient($className);
-            }
-        }
-
-        if ($this->defaultDriver !== null) {
-            return $this->defaultDriver->isTransient($className);
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
deleted file mode 100644
index 6df54b0..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-
-/**
- * The PHPDriver includes php files which just populate ClassMetadataInfo
- * instances with plain PHP code.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class PHPDriver extends FileDriver
-{
-    /**
-     * @var ClassMetadata
-     */
-    protected $metadata;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __construct($locator, $fileExtension = null)
-    {
-        $fileExtension = ".php";
-        parent::__construct($locator, $fileExtension);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function loadMetadataForClass($className, ClassMetadata $metadata)
-    {
-        $this->metadata = $metadata;
-        $this->loadMappingFile($this->locator->findMappingFile($className));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function loadMappingFile($file)
-    {
-        $metadata = $this->metadata;
-        include $file;
-
-        return array($metadata->getName() => $metadata);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
deleted file mode 100644
index df8f477..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * The StaticPHPDriver calls a static loadMetadata() method on your entity
- * classes where you can manually populate the ClassMetadata instance.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class StaticPHPDriver implements MappingDriver
-{
-    /**
-     * Paths of entity directories.
-     *
-     * @var array
-     */
-    private $paths = array();
-
-    /**
-     * Map of all class names.
-     *
-     * @var array
-     */
-    private $classNames;
-
-    /**
-     * Constructor.
-     *
-     * @param array|string $paths
-     */
-    public function __construct($paths)
-    {
-        $this->addPaths((array) $paths);
-    }
-
-    /**
-     * Adds paths.
-     *
-     * @param array $paths
-     *
-     * @return void
-     */
-    public function addPaths(array $paths)
-    {
-        $this->paths = array_unique(array_merge($this->paths, $paths));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadMetadataForClass($className, ClassMetadata $metadata)
-    {
-        $className::loadMetadata($metadata);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @todo Same code exists in AnnotationDriver, should we re-use it somehow or not worry about it?
-     */
-    public function getAllClassNames()
-    {
-        if ($this->classNames !== null) {
-            return $this->classNames;
-        }
-
-        if (!$this->paths) {
-            throw MappingException::pathRequired();
-        }
-
-        $classes = array();
-        $includedFiles = array();
-
-        foreach ($this->paths as $path) {
-            if (!is_dir($path)) {
-                throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
-            }
-
-            $iterator = new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator($path),
-                \RecursiveIteratorIterator::LEAVES_ONLY
-            );
-
-            foreach ($iterator as $file) {
-                if ($file->getBasename('.php') == $file->getBasename()) {
-                    continue;
-                }
-
-                $sourceFile = realpath($file->getPathName());
-                require_once $sourceFile;
-                $includedFiles[] = $sourceFile;
-            }
-        }
-
-        $declared = get_declared_classes();
-
-        foreach ($declared as $className) {
-            $rc = new \ReflectionClass($className);
-            $sourceFile = $rc->getFileName();
-            if (in_array($sourceFile, $includedFiles) && !$this->isTransient($className)) {
-                $classes[] = $className;
-            }
-        }
-
-        $this->classNames = $classes;
-
-        return $classes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isTransient($className)
-    {
-        return ! method_exists($className, 'loadMetadata');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
deleted file mode 100644
index f334265..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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\Persistence\Mapping\Driver;
-
-use Doctrine\Common\Persistence\Mapping\MappingException;
-
-/**
- * The Symfony File Locator makes a simplifying assumptions compared
- * to the DefaultFileLocator. By assuming paths only contain entities of a certain
- * namespace the mapping files consists of the short classname only.
- *
- * @author  Fabien Potencier <fabien@symfony.com>
- * @author  Benjamin Eberlei <kontakt@beberlei.de>
- * @license MIT
- */
-class SymfonyFileLocator implements FileLocator
-{
-    /**
-     * The paths where to look for mapping files.
-     *
-     * @var array
-     */
-    protected $paths = array();
-
-    /**
-     * A map of mapping directory path to namespace prefix used to expand class shortnames.
-     *
-     * @var array
-     */
-    protected $prefixes = array();
-
-    /**
-     * File extension that is searched for.
-     *
-     * @var string|null
-     */
-    protected $fileExtension;
-
-    /**
-     * Represents PHP namespace delimiters when looking for files
-     *
-     * @var string
-     */
-    private $nsSeparator;
-
-    /**
-     * Constructor.
-     *
-     * @param array       $prefixes
-     * @param string|null $fileExtension
-     * @param string      $nsSeparator String which would be used when converting FQCN to filename and vice versa. Should not be empty
-     */
-    public function __construct(array $prefixes, $fileExtension = null, $nsSeparator = '.')
-    {
-        $this->addNamespacePrefixes($prefixes);
-        $this->fileExtension = $fileExtension;
-
-        if (empty($nsSeparator)) {
-            throw new \InvalidArgumentException('Namespace separator should not be empty');
-        }
-
-        $this->nsSeparator = (string) $nsSeparator;
-    }
-
-    /**
-     * Adds Namespace Prefixes.
-     *
-     * @param array $prefixes
-     *
-     * @return void
-     */
-    public function addNamespacePrefixes(array $prefixes)
-    {
-        $this->prefixes = array_merge($this->prefixes, $prefixes);
-        $this->paths = array_merge($this->paths, array_keys($prefixes));
-    }
-
-    /**
-     * Gets Namespace Prefixes.
-     *
-     * @return array
-     */
-    public function getNamespacePrefixes()
-    {
-        return $this->prefixes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFileExtension()
-    {
-        return $this->fileExtension;
-    }
-
-    /**
-     * Sets the file extension used to look for mapping files under.
-     *
-     * @param string $fileExtension The file extension to set.
-     *
-     * @return void
-     */
-    public function setFileExtension($fileExtension)
-    {
-        $this->fileExtension = $fileExtension;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function fileExists($className)
-    {
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
-        foreach ($this->paths as $path) {
-            if (!isset($this->prefixes[$path])) {
-                // global namespace class
-                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
-                    return true;
-                }
-
-                continue;
-            }
-
-            $prefix = $this->prefixes[$path];
-
-            if (0 !== strpos($className, $prefix.'\\')) {
-                continue;
-            }
-
-            $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', $this->nsSeparator).$this->fileExtension;
-            return is_file($filename);
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAllClassNames($globalBasename = null)
-    {
-        $classes = array();
-
-        if ($this->paths) {
-            foreach ((array) $this->paths as $path) {
-                if (!is_dir($path)) {
-                    throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
-                }
-
-                $iterator = new \RecursiveIteratorIterator(
-                    new \RecursiveDirectoryIterator($path),
-                    \RecursiveIteratorIterator::LEAVES_ONLY
-                );
-
-                foreach ($iterator as $file) {
-                    $fileName = $file->getBasename($this->fileExtension);
-
-                    if ($fileName == $file->getBasename() || $fileName == $globalBasename) {
-                        continue;
-                    }
-
-                    // NOTE: All files found here means classes are not transient!
-                    if (isset($this->prefixes[$path])) {
-
-                        // Calculate namespace suffix for given prefix as a relative path from basepath to file path
-                        $nsSuffix = strtr(
-                            substr(realpath($file->getPath()), strlen(realpath($path))),
-                            $this->nsSeparator,
-                            '\\'
-                        );
-
-                        $classes[] = $this->prefixes[$path] . $nsSuffix . '\\' .str_replace($this->nsSeparator, '\\', $fileName);
-                    } else {
-                        $classes[] = str_replace($this->nsSeparator, '\\', $fileName);
-                    }
-                }
-            }
-        }
-
-        return $classes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function findMappingFile($className)
-    {
-        $defaultFileName = str_replace('\\', $this->nsSeparator, $className).$this->fileExtension;
-        foreach ($this->paths as $path) {
-            if (!isset($this->prefixes[$path])) {
-                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
-                    return $path.DIRECTORY_SEPARATOR.$defaultFileName;
-                }
-
-                continue;
-            }
-
-            $prefix = $this->prefixes[$path];
-
-            if (0 !== strpos($className, $prefix.'\\')) {
-                continue;
-            }
-
-            $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', $this->nsSeparator ).$this->fileExtension;
-            if (is_file($filename)) {
-                return $filename;
-            }
-
-            throw MappingException::mappingFileNotFound($className, $filename);
-        }
-
-        throw MappingException::mappingFileNotFound($className, substr($className, strrpos($className, '\\') + 1).$this->fileExtension);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php
deleted file mode 100644
index 6e97485..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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\Persistence\Mapping;
-
-/**
- * A MappingException indicates that something is wrong with the mapping setup.
- *
- * @since 2.2
- */
-class MappingException extends \Exception
-{
-    /**
-     * @param string $className
-     * @param array  $namespaces
-     *
-     * @return self
-     */
-    public static function classNotFoundInNamespaces($className, $namespaces)
-    {
-        return new self("The class '" . $className . "' was not found in the ".
-            "chain configured namespaces " . implode(", ", $namespaces));
-    }
-
-    /**
-     * @return self
-     */
-    public static function pathRequired()
-    {
-        return new self("Specifying the paths to your entities is required ".
-            "in the AnnotationDriver to retrieve all class names.");
-    }
-
-    /**
-     * @param string|null $path
-     *
-     * @return self
-     */
-    public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
-    {
-        if ( ! empty($path)) {
-            $path = '[' . $path . ']';
-        }
-
-        return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
-        );
-    }
-
-    /**
-     * @param string $entityName
-     * @param string $fileName
-     *
-     * @return self
-     */
-    public static function mappingFileNotFound($entityName, $fileName)
-    {
-        return new self("No mapping file found named '$fileName' for class '$entityName'.");
-    }
-
-    /**
-     * @param string $entityName
-     * @param string $fileName
-     *
-     * @return self
-     */
-    public static function invalidMappingFile($entityName, $fileName)
-    {
-        return new self("Invalid mapping file '$fileName' for class '$entityName'.");
-    }
-
-    /**
-     * @param string $className
-     *
-     * @return self
-     */
-    public static function nonExistingClass($className)
-    {
-        return new self("Class '$className' does not exist");
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php
deleted file mode 100644
index 0088ed5..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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\Persistence\Mapping;
-
-/**
- * Very simple reflection service abstraction.
- *
- * This is required inside metadata layers that may require either
- * static or runtime reflection.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-interface ReflectionService
-{
-    /**
-     * Returns an array of the parent classes (not interfaces) for the given class.
-     *
-     * @param string $class
-     *
-     * @throws \Doctrine\Common\Persistence\Mapping\MappingException
-     *
-     * @return array
-     */
-    public function getParentClasses($class);
-
-    /**
-     * Returns the shortname of a class.
-     *
-     * @param string $class
-     *
-     * @return string
-     */
-    public function getClassShortName($class);
-
-    /**
-     * @param string $class
-     *
-     * @return string
-     */
-    public function getClassNamespace($class);
-
-    /**
-     * Returns a reflection class instance or null.
-     *
-     * @param string $class
-     *
-     * @return \ReflectionClass|null
-     */
-    public function getClass($class);
-
-    /**
-     * Returns an accessible property (setAccessible(true)) or null.
-     *
-     * @param string $class
-     * @param string $property
-     *
-     * @return \ReflectionProperty|null
-     */
-    public function getAccessibleProperty($class, $property);
-
-    /**
-     * Checks if the class have a public method with the given name.
-     *
-     * @param mixed $class
-     * @param mixed $method
-     *
-     * @return bool
-     */
-    public function hasPublicMethod($class, $method);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php
deleted file mode 100644
index 4598d5a..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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\Persistence\Mapping;
-
-use Doctrine\Common\Reflection\RuntimePublicReflectionProperty;
-use ReflectionClass;
-use ReflectionException;
-use ReflectionMethod;
-use ReflectionProperty;
-
-/**
- * PHP Runtime Reflection Service.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class RuntimeReflectionService implements ReflectionService
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getParentClasses($class)
-    {
-        if ( ! class_exists($class)) {
-            throw MappingException::nonExistingClass($class);
-        }
-
-        return class_parents($class);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassShortName($class)
-    {
-        $reflectionClass = new ReflectionClass($class);
-
-        return $reflectionClass->getShortName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassNamespace($class)
-    {
-        $reflectionClass = new ReflectionClass($class);
-
-        return $reflectionClass->getNamespaceName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClass($class)
-    {
-        return new ReflectionClass($class);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAccessibleProperty($class, $property)
-    {
-        $reflectionProperty = new ReflectionProperty($class, $property);
-
-        if ($reflectionProperty->isPublic()) {
-            $reflectionProperty = new RuntimePublicReflectionProperty($class, $property);
-        }
-
-        $reflectionProperty->setAccessible(true);
-
-        return $reflectionProperty;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hasPublicMethod($class, $method)
-    {
-        try {
-            $reflectionMethod = new ReflectionMethod($class, $method);
-        } catch (ReflectionException $e) {
-            return false;
-        }
-
-        return $reflectionMethod->isPublic();
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
deleted file mode 100644
index e5bcb06..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Persistence\Mapping;
-
-/**
- * PHP Runtime Reflection Service.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class StaticReflectionService implements ReflectionService
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getParentClasses($class)
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassShortName($className)
-    {
-        if (strpos($className, '\\') !== false) {
-            $className = substr($className, strrpos($className, "\\")+1);
-        }
-        return $className;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClassNamespace($className)
-    {
-        $namespace = '';
-        if (strpos($className, '\\') !== false) {
-            $namespace = strrev(substr( strrev($className), strpos(strrev($className), '\\')+1 ));
-        }
-        return $namespace;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClass($class)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getAccessibleProperty($class, $property)
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hasPublicMethod($class, $method)
-    {
-        return true;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php
deleted file mode 100644
index 02208c9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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\Persistence;
-
-/**
- * Contract for a Doctrine persistence layer ObjectManager class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.1
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Jonathan Wage <jonwage@gmail.com>
- */
-interface ObjectManager
-{
-    /**
-     * Finds an object by its identifier.
-     *
-     * This is just a convenient shortcut for getRepository($className)->find($id).
-     *
-     * @param string $className The class name of the object to find.
-     * @param mixed  $id        The identity of the object to find.
-     *
-     * @return object The found object.
-     */
-    public function find($className, $id);
-
-    /**
-     * Tells the ObjectManager to make an instance managed and persistent.
-     *
-     * The object will be entered into the database as a result of the flush operation.
-     *
-     * NOTE: The persist operation always considers objects that are not yet known to
-     * this ObjectManager as NEW. Do not pass detached objects to the persist operation.
-     *
-     * @param object $object The instance to make managed and persistent.
-     *
-     * @return void
-     */
-    public function persist($object);
-
-    /**
-     * Removes an object instance.
-     *
-     * A removed object will be removed from the database as a result of the flush operation.
-     *
-     * @param object $object The object instance to remove.
-     *
-     * @return void
-     */
-    public function remove($object);
-
-    /**
-     * Merges the state of a detached object into the persistence context
-     * of this ObjectManager and returns the managed copy of the object.
-     * The object passed to merge will not become associated/managed with this ObjectManager.
-     *
-     * @param object $object
-     *
-     * @return object
-     */
-    public function merge($object);
-
-    /**
-     * Clears the ObjectManager. All objects that are currently managed
-     * by this ObjectManager become detached.
-     *
-     * @param string|null $objectName if given, only objects of this type will get detached.
-     *
-     * @return void
-     */
-    public function clear($objectName = null);
-
-    /**
-     * Detaches an object from the ObjectManager, causing a managed object to
-     * become detached. Unflushed changes made to the object if any
-     * (including removal of the object), will not be synchronized to the database.
-     * Objects which previously referenced the detached object will continue to
-     * reference it.
-     *
-     * @param object $object The object to detach.
-     *
-     * @return void
-     */
-    public function detach($object);
-
-    /**
-     * Refreshes the persistent state of an object from the database,
-     * overriding any local changes that have not yet been persisted.
-     *
-     * @param object $object The object to refresh.
-     *
-     * @return void
-     */
-    public function refresh($object);
-
-    /**
-     * Flushes all changes to objects that have been queued up to now to the database.
-     * This effectively synchronizes the in-memory state of managed objects with the
-     * database.
-     *
-     * @return void
-     */
-    public function flush();
-
-    /**
-     * Gets the repository for a class.
-     *
-     * @param string $className
-     *
-     * @return \Doctrine\Common\Persistence\ObjectRepository
-     */
-    public function getRepository($className);
-
-    /**
-     * Returns the ClassMetadata descriptor for a class.
-     *
-     * The class name must be the fully-qualified class name without a leading backslash
-     * (as it is returned by get_class($obj)).
-     *
-     * @param string $className
-     *
-     * @return \Doctrine\Common\Persistence\Mapping\ClassMetadata
-     */
-    public function getClassMetadata($className);
-
-    /**
-     * Gets the metadata factory used to gather the metadata of classes.
-     *
-     * @return \Doctrine\Common\Persistence\Mapping\ClassMetadataFactory
-     */
-    public function getMetadataFactory();
-
-    /**
-     * Helper method to initialize a lazy loading proxy or persistent collection.
-     *
-     * This method is a no-op for other objects.
-     *
-     * @param object $obj
-     *
-     * @return void
-     */
-    public function initializeObject($obj);
-
-    /**
-     * Checks if the object is part of the current UnitOfWork and therefore managed.
-     *
-     * @param object $object
-     *
-     * @return bool
-     */
-    public function contains($object);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php
deleted file mode 100644
index 9bc248a..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Persistence;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-
-/**
- * Makes a Persistent Objects aware of its own object-manager.
- *
- * Using this interface the managing object manager and class metadata instances
- * are injected into the persistent object after construction. This allows
- * you to implement ActiveRecord functionality on top of the persistence-ignorance
- * that Doctrine propagates.
- *
- * Word of Warning: This is a very powerful hook to change how you can work with your domain models.
- * Using this hook will break the Single Responsibility Principle inside your Domain Objects
- * and increase the coupling of database and objects.
- *
- * Every ObjectManager has to implement this functionality itself.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-interface ObjectManagerAware
-{
-    /**
-     * Injects responsible ObjectManager and the ClassMetadata into this persistent object.
-     *
-     * @param ObjectManager $objectManager
-     * @param ClassMetadata $classMetadata
-     *
-     * @return void
-     */
-    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php
deleted file mode 100644
index 8946475..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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\Persistence;
-
-/**
- * Base class to simplify ObjectManager decorators
- *
- * @license http://opensource.org/licenses/MIT MIT
- * @link    www.doctrine-project.org
- * @since   2.4
- * @author  Lars Strojny <lars@strojny.net>
- */
-abstract class ObjectManagerDecorator implements ObjectManager
-{
-    /**
-     * @var ObjectManager
-     */
-    protected $wrapped;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($className, $id)
-    {
-        return $this->wrapped->find($className, $id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function persist($object)
-    {
-        return $this->wrapped->persist($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($object)
-    {
-        return $this->wrapped->remove($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge($object)
-    {
-        return $this->wrapped->merge($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear($objectName = null)
-    {
-        return $this->wrapped->clear($objectName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function detach($object)
-    {
-        return $this->wrapped->detach($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function refresh($object)
-    {
-        return $this->wrapped->refresh($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function flush()
-    {
-        return $this->wrapped->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRepository($className)
-    {
-        return $this->wrapped->getRepository($className);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClassMetadata($className)
-    {
-        return $this->wrapped->getClassMetadata($className);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        return $this->wrapped->getMetadataFactory();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initializeObject($obj)
-    {
-        return $this->wrapped->initializeObject($obj);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function contains($object)
-    {
-        return $this->wrapped->contains($object);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
deleted file mode 100644
index f607219..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Persistence;
-
-/**
- * Contract for a Doctrine persistence layer ObjectRepository class to implement.
- *
- * @link   www.doctrine-project.org
- * @since  2.1
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Jonathan Wage <jonwage@gmail.com>
- */
-interface ObjectRepository
-{
-    /**
-     * Finds an object by its primary key / identifier.
-     *
-     * @param mixed $id The identifier.
-     *
-     * @return object The object.
-     */
-    public function find($id);
-
-    /**
-     * Finds all objects in the repository.
-     *
-     * @return array The objects.
-     */
-    public function findAll();
-
-    /**
-     * Finds objects by a set of criteria.
-     *
-     * Optionally sorting and limiting details can be passed. An implementation may throw
-     * an UnexpectedValueException if certain values of the sorting or limiting details are
-     * not supported.
-     *
-     * @param array      $criteria
-     * @param array|null $orderBy
-     * @param int|null   $limit
-     * @param int|null   $offset
-     *
-     * @return array The objects.
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null);
-
-    /**
-     * Finds a single object by a set of criteria.
-     *
-     * @param array $criteria The criteria.
-     *
-     * @return object The object.
-     */
-    public function findOneBy(array $criteria);
-
-    /**
-     * Returns the class name of the object managed by the repository.
-     *
-     * @return string
-     */
-    public function getClassName();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
deleted file mode 100644
index a35b71a..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?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\Persistence;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-
-/**
- * PersistentObject base class that implements getter/setter methods for all mapped fields and associations
- * by overriding __call.
- *
- * This class is a forward compatible implementation of the PersistentObject trait.
- *
- * Limitations:
- *
- * 1. All persistent objects have to be associated with a single ObjectManager, multiple
- *    ObjectManagers are not supported. You can set the ObjectManager with `PersistentObject#setObjectManager()`.
- * 2. Setters and getters only work if a ClassMetadata instance was injected into the PersistentObject.
- *    This is either done on `postLoad` of an object or by accessing the global object manager.
- * 3. There are no hooks for setters/getters. Just implement the method yourself instead of relying on __call().
- * 4. Slower than handcoded implementations: An average of 7 method calls per access to a field and 11 for an association.
- * 5. Only the inverse side associations get autoset on the owning side as well. Setting objects on the owning side
- *    will not set the inverse side associations.
- *
- * @example
- *
- *  PersistentObject::setObjectManager($em);
- *
- *  class Foo extends PersistentObject
- *  {
- *      private $id;
- *  }
- *
- *  $foo = new Foo();
- *  $foo->getId(); // method exists through __call
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-abstract class PersistentObject implements ObjectManagerAware
-{
-    /**
-     * @var ObjectManager|null
-     */
-    private static $objectManager = null;
-
-    /**
-     * @var ClassMetadata|null
-     */
-    private $cm = null;
-
-    /**
-     * Sets the object manager responsible for all persistent object base classes.
-     *
-     * @param ObjectManager|null $objectManager
-     *
-     * @return void
-     */
-    static public function setObjectManager(ObjectManager $objectManager = null)
-    {
-        self::$objectManager = $objectManager;
-    }
-
-    /**
-     * @return ObjectManager|null
-     */
-    static public function getObjectManager()
-    {
-        return self::$objectManager;
-    }
-
-    /**
-     * Injects the Doctrine Object Manager.
-     *
-     * @param ObjectManager $objectManager
-     * @param ClassMetadata $classMetadata
-     *
-     * @return void
-     *
-     * @throws \RuntimeException
-     */
-    public function injectObjectManager(ObjectManager $objectManager, ClassMetadata $classMetadata)
-    {
-        if ($objectManager !== self::$objectManager) {
-            throw new \RuntimeException("Trying to use PersistentObject with different ObjectManager instances. " .
-                "Was PersistentObject::setObjectManager() called?");
-        }
-
-        $this->cm = $classMetadata;
-    }
-
-    /**
-     * Sets a persistent fields value.
-     *
-     * @param string $field
-     * @param array  $args
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException   When no persistent field exists by that name.
-     * @throws \InvalidArgumentException When the wrong target object type is passed to an association.
-     */
-    private function set($field, $args)
-    {
-        $this->initializeDoctrine();
-
-        if ($this->cm->hasField($field) && !$this->cm->isIdentifier($field)) {
-            $this->$field = $args[0];
-        } else if ($this->cm->hasAssociation($field) && $this->cm->isSingleValuedAssociation($field)) {
-            $targetClass = $this->cm->getAssociationTargetClass($field);
-            if (!($args[0] instanceof $targetClass) && $args[0] !== null) {
-                throw new \InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
-            }
-            $this->$field = $args[0];
-            $this->completeOwningSide($field, $targetClass, $args[0]);
-        } else {
-            throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
-        }
-    }
-
-    /**
-     * Gets a persistent field value.
-     *
-     * @param string $field
-     *
-     * @return mixed
-     *
-     * @throws \BadMethodCallException When no persistent field exists by that name.
-     */
-    private function get($field)
-    {
-        $this->initializeDoctrine();
-
-        if ( $this->cm->hasField($field) || $this->cm->hasAssociation($field) ) {
-            return $this->$field;
-        } else {
-            throw new \BadMethodCallException("no field with name '".$field."' exists on '".$this->cm->getName()."'");
-        }
-    }
-
-    /**
-     * If this is an inverse side association, completes the owning side.
-     *
-     * @param string        $field
-     * @param ClassMetadata $targetClass
-     * @param object        $targetObject
-     *
-     * @return void
-     */
-    private function completeOwningSide($field, $targetClass, $targetObject)
-    {
-        // add this object on the owning side as well, for obvious infinite recursion
-        // reasons this is only done when called on the inverse side.
-        if ($this->cm->isAssociationInverseSide($field)) {
-            $mappedByField = $this->cm->getAssociationMappedByTargetField($field);
-            $targetMetadata = self::$objectManager->getClassMetadata($targetClass);
-
-            $setter = ($targetMetadata->isCollectionValuedAssociation($mappedByField) ? "add" : "set").$mappedByField;
-            $targetObject->$setter($this);
-        }
-    }
-
-    /**
-     * Adds an object to a collection.
-     *
-     * @param string $field
-     * @param array  $args
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException
-     * @throws \InvalidArgumentException
-     */
-    private function add($field, $args)
-    {
-        $this->initializeDoctrine();
-
-        if ($this->cm->hasAssociation($field) && $this->cm->isCollectionValuedAssociation($field)) {
-            $targetClass = $this->cm->getAssociationTargetClass($field);
-            if (!($args[0] instanceof $targetClass)) {
-                throw new \InvalidArgumentException("Expected persistent object of type '".$targetClass."'");
-            }
-            if (!($this->$field instanceof Collection)) {
-                $this->$field = new ArrayCollection($this->$field ?: array());
-            }
-            $this->$field->add($args[0]);
-            $this->completeOwningSide($field, $targetClass, $args[0]);
-        } else {
-            throw new \BadMethodCallException("There is no method add".$field."() on ".$this->cm->getName());
-        }
-    }
-
-    /**
-     * Initializes Doctrine Metadata for this class.
-     *
-     * @return void
-     *
-     * @throws \RuntimeException
-     */
-    private function initializeDoctrine()
-    {
-        if ($this->cm !== null) {
-            return;
-        }
-
-        if (!self::$objectManager) {
-            throw new \RuntimeException("No runtime object manager set. Call PersistentObject#setObjectManager().");
-        }
-
-        $this->cm = self::$objectManager->getClassMetadata(get_class($this));
-    }
-
-    /**
-     * Magic methods.
-     *
-     * @param string $method
-     * @param array  $args
-     *
-     * @return mixed
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __call($method, $args)
-    {
-        $command = substr($method, 0, 3);
-        $field = lcfirst(substr($method, 3));
-        if ($command == "set") {
-            $this->set($field, $args);
-        } else if ($command == "get") {
-            return $this->get($field);
-        } else if ($command == "add") {
-            $this->add($field, $args);
-        } else {
-            throw new \BadMethodCallException("There is no method ".$method." on ".$this->cm->getName());
-        }
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php b/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php
deleted file mode 100644
index 3369eb9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Persistence;
-
-/**
- * Interface for proxy classes.
- *
- * @author Roman Borschel <roman@code-factory.org>
- * @since  2.2
- */
-interface Proxy
-{
-    /**
-     * Marker for Proxy class names.
-     *
-     * @var string
-     */
-    const MARKER = '__CG__';
-
-    /**
-     * Length of the proxy marker.
-     *
-     * @var integer
-     */
-    const MARKER_LENGTH = 6;
-
-    /**
-     * Initializes this proxy if its not yet initialized.
-     *
-     * Acts as a no-op if already initialized.
-     *
-     * @return void
-     */
-    public function __load();
-
-    /**
-     * Returns whether this proxy is initialized or not.
-     *
-     * @return bool
-     */
-    public function __isInitialized();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php b/vendor/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php
deleted file mode 100644
index 1a59cd4..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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;
-
-/**
- * Contract for classes that are potential listeners of a <tt>NotifyPropertyChanged</tt>
- * implementor.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-interface PropertyChangedListener
-{
-    /**
-     * Notifies the listener of a property change.
-     *
-     * @param object $sender       The object on which the property changed.
-     * @param string $propertyName The name of the property that changed.
-     * @param mixed  $oldValue     The old value of the property that changed.
-     * @param mixed  $newValue     The new value of the property that changed.
-     *
-     * @return void
-     */
-    function propertyChanged($sender, $propertyName, $oldValue, $newValue);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
deleted file mode 100644
index bc54690..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?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\Proxy;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
-use Doctrine\Common\Proxy\Exception\OutOfBoundsException;
-use Doctrine\Common\Util\ClassUtils;
-
-/**
- * Abstract factory for proxy objects.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-abstract class AbstractProxyFactory
-{
-    /**
-     * Never autogenerate a proxy and rely that it was generated by some
-     * process before deployment.
-     *
-     * @var integer
-     */
-    const AUTOGENERATE_NEVER = 0;
-
-    /**
-     * Always generates a new proxy in every request.
-     *
-     * This is only sane during development.
-     *
-     * @var integer
-     */
-    const AUTOGENERATE_ALWAYS = 1;
-
-    /**
-     * Autogenerate the proxy class when the proxy file does not exist.
-     *
-     * This strategy causes a file exists call whenever any proxy is used the
-     * first time in a request.
-     *
-     * @var integer
-     */
-    const AUTOGENERATE_FILE_NOT_EXISTS = 2;
-
-    /**
-     * Generate the proxy classes using eval().
-     *
-     * This strategy is only sane for development, and even then it gives me
-     * the creeps a little.
-     *
-     * @var integer
-     */
-    const AUTOGENERATE_EVAL = 3;
-
-    /**
-     * @var \Doctrine\Common\Persistence\Mapping\ClassMetadataFactory
-     */
-    private $metadataFactory;
-
-    /**
-     * @var \Doctrine\Common\Proxy\ProxyGenerator the proxy generator responsible for creating the proxy classes/files.
-     */
-    private $proxyGenerator;
-
-    /**
-     * @var bool Whether to automatically (re)generate proxy classes.
-     */
-    private $autoGenerate;
-
-    /**
-     * @var \Doctrine\Common\Proxy\ProxyDefinition[]
-     */
-    private $definitions = array();
-
-    /**
-     * @param \Doctrine\Common\Proxy\ProxyGenerator                     $proxyGenerator
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadataFactory $metadataFactory
-     * @param bool|int                                                  $autoGenerate
-     */
-    public function __construct(ProxyGenerator $proxyGenerator, ClassMetadataFactory $metadataFactory, $autoGenerate)
-    {
-        $this->proxyGenerator  = $proxyGenerator;
-        $this->metadataFactory = $metadataFactory;
-        $this->autoGenerate    = (int)$autoGenerate;
-    }
-
-    /**
-     * Gets a reference proxy instance for the entity of the given type and identified by
-     * the given identifier.
-     *
-     * @param  string $className
-     * @param  array  $identifier
-     *
-     * @return \Doctrine\Common\Proxy\Proxy
-     *
-     * @throws \Doctrine\Common\Proxy\Exception\OutOfBoundsException
-     */
-    public function getProxy($className, array $identifier)
-    {
-        $definition = isset($this->definitions[$className])
-            ? $this->definitions[$className]
-            : $this->getProxyDefinition($className);
-        $fqcn       = $definition->proxyClassName;
-        $proxy      = new $fqcn($definition->initializer, $definition->cloner);
-
-        foreach ($definition->identifierFields as $idField) {
-            if (! isset($identifier[$idField])) {
-                throw OutOfBoundsException::missingPrimaryKeyValue($className, $idField);
-            }
-
-            $definition->reflectionFields[$idField]->setValue($proxy, $identifier[$idField]);
-        }
-
-        return $proxy;
-    }
-
-    /**
-     * Generates proxy classes for all given classes.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata[] $classes The classes (ClassMetadata instances)
-     *                                                                      for which to generate proxies.
-     * @param string $proxyDir The target directory of the proxy classes. If not specified, the
-     *                         directory configured on the Configuration of the EntityManager used
-     *                         by this factory is used.
-     * @return int Number of generated proxies.
-     */
-    public function generateProxyClasses(array $classes, $proxyDir = null)
-    {
-        $generated = 0;
-
-        foreach ($classes as $class) {
-            if ($this->skipClass($class)) {
-                continue;
-            }
-
-            $proxyFileName = $this->proxyGenerator->getProxyFileName($class->getName(), $proxyDir);
-
-            $this->proxyGenerator->generateProxyClass($class, $proxyFileName);
-
-            $generated += 1;
-        }
-
-        return $generated;
-    }
-
-    /**
-     * Reset initialization/cloning logic for an un-initialized proxy
-     *
-     * @param \Doctrine\Common\Proxy\Proxy $proxy
-     *
-     * @return \Doctrine\Common\Proxy\Proxy
-     *
-     * @throws \Doctrine\Common\Proxy\Exception\InvalidArgumentException
-     */
-    public function resetUninitializedProxy(Proxy $proxy)
-    {
-        if ($proxy->__isInitialized()) {
-            throw InvalidArgumentException::unitializedProxyExpected($proxy);
-        }
-
-        $className  = ClassUtils::getClass($proxy);
-        $definition = isset($this->definitions[$className])
-            ? $this->definitions[$className]
-            : $this->getProxyDefinition($className);
-
-        $proxy->__setInitializer($definition->initializer);
-        $proxy->__setCloner($definition->cloner);
-
-        return $proxy;
-    }
-
-    /**
-     * Get a proxy definition for the given class name.
-     *
-     * @param string $className
-     *
-     * @return ProxyDefinition
-     */
-    private function getProxyDefinition($className)
-    {
-        $classMetadata = $this->metadataFactory->getMetadataFor($className);
-        $className     = $classMetadata->getName(); // aliases and case sensitivity
-
-        $this->definitions[$className] = $this->createProxyDefinition($className);
-        $proxyClassName                = $this->definitions[$className]->proxyClassName;
-
-        if ( ! class_exists($proxyClassName, false)) {
-            $fileName  = $this->proxyGenerator->getProxyFileName($className);
-
-            switch ($this->autoGenerate) {
-                case self::AUTOGENERATE_NEVER:
-                    require $fileName;
-                    break;
-
-                case self::AUTOGENERATE_FILE_NOT_EXISTS:
-                    if ( ! file_exists($fileName)) {
-                        $this->proxyGenerator->generateProxyClass($classMetadata, $fileName);
-                    }
-                    require $fileName;
-                    break;
-
-                case self::AUTOGENERATE_ALWAYS:
-                    $this->proxyGenerator->generateProxyClass($classMetadata, $fileName);
-                    require $fileName;
-                    break;
-
-                case self::AUTOGENERATE_EVAL:
-                    $this->proxyGenerator->generateProxyClass($classMetadata, false);
-                    break;
-            }
-        }
-
-        return $this->definitions[$className];
-    }
-
-    /**
-     * Determine if this class should be skipped during proxy generation.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $metadata
-     *
-     * @return bool
-     */
-    abstract protected function skipClass(ClassMetadata $metadata);
-
-    /**
-     * @param string $className
-     *
-     * @return ProxyDefinition
-     */
-    abstract protected function createProxyDefinition($className);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
deleted file mode 100644
index 0aa930b..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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\Proxy;
-
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
-
-/**
- * Special Autoloader for Proxy classes, which are not PSR-0 compliant.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class Autoloader
-{
-    /**
-     * Resolves proxy class name to a filename based on the following pattern.
-     *
-     * 1. Remove Proxy namespace from class name.
-     * 2. Remove namespace separators from remaining class name.
-     * 3. Return PHP filename from proxy-dir with the result from 2.
-     *
-     * @param string $proxyDir
-     * @param string $proxyNamespace
-     * @param string $className
-     *
-     * @return string
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function resolveFile($proxyDir, $proxyNamespace, $className)
-    {
-        if (0 !== strpos($className, $proxyNamespace)) {
-            throw InvalidArgumentException::notProxyClass($className, $proxyNamespace);
-        }
-
-        $className = str_replace('\\', '', substr($className, strlen($proxyNamespace) + 1));
-
-        return $proxyDir . DIRECTORY_SEPARATOR . $className . '.php';
-    }
-
-    /**
-     * Registers and returns autoloader callback for the given proxy dir and namespace.
-     *
-     * @param string        $proxyDir
-     * @param string        $proxyNamespace
-     * @param callable|null $notFoundCallback Invoked when the proxy file is not found.
-     *
-     * @return \Closure
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function register($proxyDir, $proxyNamespace, $notFoundCallback = null)
-    {
-        $proxyNamespace = ltrim($proxyNamespace, '\\');
-
-        if ( ! (null === $notFoundCallback || is_callable($notFoundCallback))) {
-            throw InvalidArgumentException::invalidClassNotFoundCallback($notFoundCallback);
-        }
-
-        $autoloader = function ($className) use ($proxyDir, $proxyNamespace, $notFoundCallback) {
-            if (0 === strpos($className, $proxyNamespace)) {
-                $file = Autoloader::resolveFile($proxyDir, $proxyNamespace, $className);
-
-                if ($notFoundCallback && ! file_exists($file)) {
-                    call_user_func($notFoundCallback, $proxyDir, $proxyNamespace, $className);
-                }
-
-                require $file;
-            }
-        };
-
-        spl_autoload_register($autoloader);
-
-        return $autoloader;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php
deleted file mode 100644
index dff54d9..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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\Proxy\Exception;
-
-use Doctrine\Common\Persistence\Proxy;
-use InvalidArgumentException as BaseInvalidArgumentException;
-
-/**
- * Proxy Invalid Argument Exception.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class InvalidArgumentException extends BaseInvalidArgumentException implements ProxyException
-{
-    /**
-     * @return self
-     */
-    public static function proxyDirectoryRequired()
-    {
-        return new self('You must configure a proxy directory. See docs for details');
-    }
-
-    /**
-     * @param string $className
-     * @param string $proxyNamespace
-     *
-     * @return self
-     */
-    public static function notProxyClass($className, $proxyNamespace)
-    {
-        return new self(sprintf('The class "%s" is not part of the proxy namespace "%s"', $className, $proxyNamespace));
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return self
-     */
-    public static function invalidPlaceholder($name)
-    {
-        return new self(sprintf('Provided placeholder for "%s" must be either a string or a valid callable', $name));
-    }
-
-    /**
-     * @return self
-     */
-    public static function proxyNamespaceRequired()
-    {
-        return new self('You must configure a proxy namespace');
-    }
-
-    /**
-     * @param Proxy $proxy
-     *
-     * @return self
-     */
-    public static function unitializedProxyExpected(Proxy $proxy)
-    {
-        return new self(sprintf('Provided proxy of type "%s" must not be initialized.', get_class($proxy)));
-    }
-
-    /**
-     * @param mixed $callback
-     *
-     * @return self
-     */
-    public static function invalidClassNotFoundCallback($callback)
-    {
-        $type = is_object($callback) ? get_class($callback) : gettype($callback);
-
-        return new self(sprintf('Invalid \$notFoundCallback given: must be a callable, "%s" given', $type));
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php
deleted file mode 100644
index 3c7415c..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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\Proxy\Exception;
-
-use OutOfBoundsException as BaseOutOfBoundsException;
-
-/**
- * Proxy Invalid Argument Exception.
- *
- * @link   www.doctrine-project.org
- * @author Fredrik Wendel <fredrik_w@users.sourceforge.net>
- */
-class OutOfBoundsException extends BaseOutOfBoundsException implements ProxyException
-{
-    /**
-     * @param string $className
-     * @param string $idField
-     *
-     * @return self
-     */
-    public static function missingPrimaryKeyValue($className, $idField)
-    {
-        return new self(sprintf("Missing value for primary key %s on %s", $idField, $className));
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php
deleted file mode 100644
index 0d1ff14..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Proxy\Exception;
-
-/**
- * Base exception interface for proxy exceptions.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-interface ProxyException
-{
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
deleted file mode 100644
index 154b917..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Proxy\Exception;
-
-use UnexpectedValueException as BaseUnexpectedValueException;
-
-/**
- * Proxy Unexpected Value Exception.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class UnexpectedValueException extends BaseUnexpectedValueException implements ProxyException
-{
-    /**
-     * @param string $proxyDirectory
-     *
-     * @return self
-     */
-    public static function proxyDirectoryNotWritable($proxyDirectory)
-    {
-        return new self(sprintf('Your proxy directory "%s" must be writable', $proxyDirectory));
-    }
-
-    /**
-     * @param string     $className
-     * @param string     $methodName
-     * @param string     $parameterName
-     * @param \Exception $previous
-     *
-     * @return self
-     */
-    public static function invalidParameterTypeHint($className, $methodName, $parameterName, \Exception $previous)
-    {
-        return new self(
-            sprintf(
-                'The type hint of parameter "%s" in method "%s" in class "%s" is invalid.',
-                $parameterName,
-                $methodName,
-                $className
-            ),
-            0,
-            $previous
-        );
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php
deleted file mode 100644
index bd2b088..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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\Proxy;
-
-use Closure;
-use Doctrine\Common\Persistence\Proxy as BaseProxy;
-
-/**
- * Interface for proxy classes.
- *
- * @author Roman Borschel <roman@code-factory.org>
- * @author Marco Pivetta  <ocramius@gmail.com>
- * @since  2.4
- */
-interface Proxy extends BaseProxy
-{
-    /**
-     * Marks the proxy as initialized or not.
-     *
-     * @param boolean $initialized
-     *
-     * @return void
-     */
-    public function __setInitialized($initialized);
-
-    /**
-     * Sets the initializer callback to be used when initializing the proxy. That
-     * initializer should accept 3 parameters: $proxy, $method and $params. Those
-     * are respectively the proxy object that is being initialized, the method name
-     * that triggered initialization and the parameters passed to that method.
-     *
-     * @param Closure|null $initializer
-     *
-     * @return void
-     */
-    public function __setInitializer(Closure $initializer = null);
-
-    /**
-     * Retrieves the initializer callback used to initialize the proxy.
-     *
-     * @see __setInitializer
-     *
-     * @return Closure|null
-     */
-    public function __getInitializer();
-
-    /**
-     * Sets the callback to be used when cloning the proxy. That initializer should accept
-     * a single parameter, which is the cloned proxy instance itself.
-     *
-     * @param Closure|null $cloner
-     *
-     * @return void
-     */
-    public function __setCloner(Closure $cloner = null);
-
-    /**
-     * Retrieves the callback to be used when cloning the proxy.
-     *
-     * @see __setCloner
-     *
-     * @return Closure|null
-     */
-    public function __getCloner();
-
-    /**
-     * Retrieves the list of lazy loaded properties for a given proxy
-     *
-     * @return array Keys are the property names, and values are the default values
-     *               for those properties.
-     */
-    public function __getLazyProperties();
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php
deleted file mode 100644
index 48b149a..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Proxy;
-
-/**
- * Definition structure how to create a proxy.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class ProxyDefinition
-{
-    /**
-     * @var string
-     */
-    public $proxyClassName;
-
-    /**
-     * @var array
-     */
-    public $identifierFields;
-
-    /**
-     * @var \ReflectionProperty[]
-     */
-    public $reflectionFields;
-
-    /**
-     * @var callable
-     */
-    public $initializer;
-
-    /**
-     * @var callable
-     */
-    public $cloner;
-
-    /**
-     * @param string   $proxyClassName
-     * @param array    $identifierFields
-     * @param array    $reflectionFields
-     * @param callable $initializer
-     * @param callable $cloner
-     */
-    public function __construct($proxyClassName, array $identifierFields, array $reflectionFields, $initializer, $cloner)
-    {
-        $this->proxyClassName   = $proxyClassName;
-        $this->identifierFields = $identifierFields;
-        $this->reflectionFields = $reflectionFields;
-        $this->initializer      = $initializer;
-        $this->cloner           = $cloner;
-    }
-}
-
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
deleted file mode 100644
index c9d0e2c..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php
+++ /dev/null
@@ -1,1006 +0,0 @@
-<?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\Proxy;
-
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
-use Doctrine\Common\Proxy\Exception\UnexpectedValueException;
-use Doctrine\Common\Util\ClassUtils;
-
-/**
- * This factory is used to generate proxy classes.
- * It builds proxies from given parameters, a template and class metadata.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- * @since  2.4
- */
-class ProxyGenerator
-{
-    /**
-     * Used to match very simple id methods that don't need
-     * to be decorated since the identifier is known.
-     */
-    const PATTERN_MATCH_ID_METHOD = '((public\s+)?(function\s+%s\s*\(\)\s*)\s*{\s*return\s*\$this->%s;\s*})i';
-
-    /**
-     * The namespace that contains all proxy classes.
-     *
-     * @var string
-     */
-    private $proxyNamespace;
-
-    /**
-     * The directory that contains all proxy classes.
-     *
-     * @var string
-     */
-    private $proxyDirectory;
-
-    /**
-     * Map of callables used to fill in placeholders set in the template.
-     *
-     * @var string[]|callable[]
-     */
-    protected $placeholders = array(
-        'baseProxyInterface'   => 'Doctrine\Common\Proxy\Proxy',
-        'additionalProperties' => '',
-    );
-
-    /**
-     * Template used as a blueprint to generate proxies.
-     *
-     * @var string
-     */
-    protected $proxyClassTemplate = '<?php
-
-namespace <namespace>;
-
-/**
- * DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE\'S PROXY GENERATOR
- */
-class <proxyShortClassName> extends \<className> implements \<baseProxyInterface>
-{
-    /**
-     * @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
-     *      three parameters, being respectively the proxy object to be initialized, the method that triggered the
-     *      initialization process and an array of ordered parameters that were passed to that method.
-     *
-     * @see \Doctrine\Common\Persistence\Proxy::__setInitializer
-     */
-    public $__initializer__;
-
-    /**
-     * @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
-     *
-     * @see \Doctrine\Common\Persistence\Proxy::__setCloner
-     */
-    public $__cloner__;
-
-    /**
-     * @var boolean flag indicating if this object was already initialized
-     *
-     * @see \Doctrine\Common\Persistence\Proxy::__isInitialized
-     */
-    public $__isInitialized__ = false;
-
-    /**
-     * @var array properties to be lazy loaded, with keys being the property
-     *            names and values being their default values
-     *
-     * @see \Doctrine\Common\Persistence\Proxy::__getLazyProperties
-     */
-    public static $lazyPropertiesDefaults = array(<lazyPropertiesDefaults>);
-
-<additionalProperties>
-
-<constructorImpl>
-
-<magicGet>
-
-<magicSet>
-
-<magicIsset>
-
-<sleepImpl>
-
-<wakeupImpl>
-
-<cloneImpl>
-
-    /**
-     * Forces initialization of the proxy
-     */
-    public function __load()
-    {
-        $this->__initializer__ && $this->__initializer__->__invoke($this, \'__load\', array());
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     */
-    public function __isInitialized()
-    {
-        return $this->__isInitialized__;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     */
-    public function __setInitialized($initialized)
-    {
-        $this->__isInitialized__ = $initialized;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     */
-    public function __setInitializer(\Closure $initializer = null)
-    {
-        $this->__initializer__ = $initializer;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     */
-    public function __getInitializer()
-    {
-        return $this->__initializer__;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     */
-    public function __setCloner(\Closure $cloner = null)
-    {
-        $this->__cloner__ = $cloner;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific cloning logic
-     */
-    public function __getCloner()
-    {
-        return $this->__cloner__;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @internal generated method: use only when explicitly handling proxy specific loading logic
-     * @static
-     */
-    public function __getLazyProperties()
-    {
-        return self::$lazyPropertiesDefaults;
-    }
-
-    <methods>
-}
-';
-
-    /**
-     * Initializes a new instance of the <tt>ProxyFactory</tt> class that is
-     * connected to the given <tt>EntityManager</tt>.
-     *
-     * @param string $proxyDirectory The directory to use for the proxy classes. It must exist.
-     * @param string $proxyNamespace The namespace to use for the proxy classes.
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct($proxyDirectory, $proxyNamespace)
-    {
-        if ( ! $proxyDirectory) {
-            throw InvalidArgumentException::proxyDirectoryRequired();
-        }
-
-        if ( ! $proxyNamespace) {
-            throw InvalidArgumentException::proxyNamespaceRequired();
-        }
-
-        $this->proxyDirectory        = $proxyDirectory;
-        $this->proxyNamespace        = $proxyNamespace;
-    }
-
-    /**
-     * Sets a placeholder to be replaced in the template.
-     *
-     * @param string          $name
-     * @param string|callable $placeholder
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setPlaceholder($name, $placeholder)
-    {
-        if ( ! is_string($placeholder) && ! is_callable($placeholder)) {
-            throw InvalidArgumentException::invalidPlaceholder($name);
-        }
-
-        $this->placeholders[$name] = $placeholder;
-    }
-
-    /**
-     * Sets the base template used to create proxy classes.
-     *
-     * @param string $proxyClassTemplate
-     */
-    public function setProxyClassTemplate($proxyClassTemplate)
-    {
-        $this->proxyClassTemplate = (string) $proxyClassTemplate;
-    }
-
-    /**
-     * Generates a proxy class file.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class    Metadata for the original class.
-     * @param string|bool                                        $fileName Filename (full path) for the generated class. If none is given, eval() is used.
-     *
-     * @throws UnexpectedValueException
-     */
-    public function generateProxyClass(ClassMetadata $class, $fileName = false)
-    {
-        preg_match_all('(<([a-zA-Z]+)>)', $this->proxyClassTemplate, $placeholderMatches);
-
-        $placeholderMatches = array_combine($placeholderMatches[0], $placeholderMatches[1]);
-        $placeholders       = array();
-
-        foreach ($placeholderMatches as $placeholder => $name) {
-            $placeholders[$placeholder] = isset($this->placeholders[$name])
-                ? $this->placeholders[$name]
-                : array($this, 'generate' . $name);
-        }
-
-        foreach ($placeholders as & $placeholder) {
-            if (is_callable($placeholder)) {
-                $placeholder = call_user_func($placeholder, $class);
-            }
-        }
-
-        $proxyCode = strtr($this->proxyClassTemplate, $placeholders);
-
-        if ( ! $fileName) {
-            $proxyClassName = $this->generateNamespace($class) . '\\' . $this->generateProxyShortClassName($class);
-
-            if ( ! class_exists($proxyClassName)) {
-                eval(substr($proxyCode, 5));
-            }
-
-            return;
-        }
-
-        $parentDirectory = dirname($fileName);
-
-        if ( ! is_dir($parentDirectory) && (false === @mkdir($parentDirectory, 0775, true))) {
-            throw UnexpectedValueException::proxyDirectoryNotWritable($this->proxyDirectory);
-        }
-
-        if ( ! is_writable($parentDirectory)) {
-            throw UnexpectedValueException::proxyDirectoryNotWritable($this->proxyDirectory);
-        }
-
-        $tmpFileName = $fileName . '.' . uniqid('', true);
-
-        file_put_contents($tmpFileName, $proxyCode);
-        chmod($tmpFileName, 0664);
-        rename($tmpFileName, $fileName);
-    }
-
-    /**
-     * Generates the proxy short class name to be used in the template.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateProxyShortClassName(ClassMetadata $class)
-    {
-        $proxyClassName = ClassUtils::generateProxyClassName($class->getName(), $this->proxyNamespace);
-        $parts          = explode('\\', strrev($proxyClassName), 2);
-
-        return strrev($parts[0]);
-    }
-
-    /**
-     * Generates the proxy namespace.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateNamespace(ClassMetadata $class)
-    {
-        $proxyClassName = ClassUtils::generateProxyClassName($class->getName(), $this->proxyNamespace);
-        $parts = explode('\\', strrev($proxyClassName), 2);
-
-        return strrev($parts[1]);
-    }
-
-    /**
-     * Generates the original class name.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateClassName(ClassMetadata $class)
-    {
-        return ltrim($class->getName(), '\\');
-    }
-
-    /**
-     * Generates the array representation of lazy loaded public properties and their default values.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateLazyPropertiesDefaults(ClassMetadata $class)
-    {
-        $lazyPublicProperties = $this->getLazyLoadedPublicProperties($class);
-        $values               = array();
-
-        foreach ($lazyPublicProperties as $key => $value) {
-            $values[] = var_export($key, true) . ' => ' . var_export($value, true);
-        }
-
-        return implode(', ', $values);
-    }
-
-    /**
-     * Generates the constructor code (un-setting public lazy loaded properties, setting identifier field values).
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateConstructorImpl(ClassMetadata $class)
-    {
-        $constructorImpl = <<<'EOT'
-    /**
-     * @param \Closure $initializer
-     * @param \Closure $cloner
-     */
-    public function __construct($initializer = null, $cloner = null)
-    {
-
-EOT;
-        $toUnset = array();
-
-        foreach ($this->getLazyLoadedPublicProperties($class) as $lazyPublicProperty => $unused) {
-            $toUnset[] = '$this->' . $lazyPublicProperty;
-        }
-
-        $constructorImpl .= (empty($toUnset) ? '' : '        unset(' . implode(', ', $toUnset) . ");\n")
-            . <<<'EOT'
-
-        $this->__initializer__ = $initializer;
-        $this->__cloner__      = $cloner;
-    }
-EOT;
-
-        return $constructorImpl;
-    }
-
-    /**
-     * Generates the magic getter invoked when lazy loaded public properties are requested.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateMagicGet(ClassMetadata $class)
-    {
-        $lazyPublicProperties = array_keys($this->getLazyLoadedPublicProperties($class));
-        $reflectionClass      = $class->getReflectionClass();
-        $hasParentGet         = false;
-        $returnReference      = '';
-        $inheritDoc           = '';
-
-        if ($reflectionClass->hasMethod('__get')) {
-            $hasParentGet = true;
-            $inheritDoc   = '{@inheritDoc}';
-
-            if ($reflectionClass->getMethod('__get')->returnsReference()) {
-                $returnReference = '& ';
-            }
-        }
-
-        if (empty($lazyPublicProperties) && ! $hasParentGet) {
-            return '';
-        }
-
-        $magicGet = <<<EOT
-    /**
-     * $inheritDoc
-     * @param string \$name
-     */
-    public function {$returnReference}__get(\$name)
-    {
-
-EOT;
-
-        if ( ! empty($lazyPublicProperties)) {
-            $magicGet .= <<<'EOT'
-        if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', array($name));
-
-            return $this->$name;
-        }
-
-
-EOT;
-        }
-
-        if ($hasParentGet) {
-            $magicGet .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__get', array($name));
-
-        return parent::__get($name);
-
-EOT;
-        } else {
-            $magicGet .= <<<'EOT'
-        trigger_error(sprintf('Undefined property: %s::$%s', __CLASS__, $name), E_USER_NOTICE);
-
-EOT;
-        }
-
-        $magicGet .= "    }";
-
-        return $magicGet;
-    }
-
-    /**
-     * Generates the magic setter (currently unused).
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateMagicSet(ClassMetadata $class)
-    {
-        $lazyPublicProperties = $this->getLazyLoadedPublicProperties($class);
-        $hasParentSet         = $class->getReflectionClass()->hasMethod('__set');
-
-        if (empty($lazyPublicProperties) && ! $hasParentSet) {
-            return '';
-        }
-
-        $inheritDoc = $hasParentSet ? '{@inheritDoc}' : '';
-        $magicSet   = <<<EOT
-    /**
-     * $inheritDoc
-     * @param string \$name
-     * @param mixed  \$value
-     */
-    public function __set(\$name, \$value)
-    {
-
-EOT;
-
-        if ( ! empty($lazyPublicProperties)) {
-            $magicSet .= <<<'EOT'
-        if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', array($name, $value));
-
-            $this->$name = $value;
-
-            return;
-        }
-
-
-EOT;
-        }
-
-        if ($hasParentSet) {
-            $magicSet .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__set', array($name, $value));
-
-        return parent::__set($name, $value);
-EOT;
-        } else {
-            $magicSet .= "        \$this->\$name = \$value;";
-        }
-
-        $magicSet .= "\n    }";
-
-        return $magicSet;
-    }
-
-    /**
-     * Generates the magic issetter invoked when lazy loaded public properties are checked against isset().
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateMagicIsset(ClassMetadata $class)
-    {
-        $lazyPublicProperties = array_keys($this->getLazyLoadedPublicProperties($class));
-        $hasParentIsset       = $class->getReflectionClass()->hasMethod('__isset');
-
-        if (empty($lazyPublicProperties) && ! $hasParentIsset) {
-            return '';
-        }
-
-        $inheritDoc = $hasParentIsset ? '{@inheritDoc}' : '';
-        $magicIsset = <<<EOT
-    /**
-     * $inheritDoc
-     * @param  string \$name
-     * @return boolean
-     */
-    public function __isset(\$name)
-    {
-
-EOT;
-
-        if ( ! empty($lazyPublicProperties)) {
-            $magicIsset .= <<<'EOT'
-        if (array_key_exists($name, $this->__getLazyProperties())) {
-            $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', array($name));
-
-            return isset($this->$name);
-        }
-
-
-EOT;
-        }
-
-        if ($hasParentIsset) {
-            $magicIsset .= <<<'EOT'
-        $this->__initializer__ && $this->__initializer__->__invoke($this, '__isset', array($name));
-
-        return parent::__isset($name);
-
-EOT;
-        } else {
-            $magicIsset .= "        return false;";
-        }
-
-        return $magicIsset . "\n    }";
-    }
-
-    /**
-     * Generates implementation for the `__sleep` method of proxies.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateSleepImpl(ClassMetadata $class)
-    {
-        $hasParentSleep = $class->getReflectionClass()->hasMethod('__sleep');
-        $inheritDoc     = $hasParentSleep ? '{@inheritDoc}' : '';
-        $sleepImpl      = <<<EOT
-    /**
-     * $inheritDoc
-     * @return array
-     */
-    public function __sleep()
-    {
-
-EOT;
-
-        if ($hasParentSleep) {
-            return $sleepImpl . <<<'EOT'
-        $properties = array_merge(array('__isInitialized__'), parent::__sleep());
-
-        if ($this->__isInitialized__) {
-            $properties = array_diff($properties, array_keys($this->__getLazyProperties()));
-        }
-
-        return $properties;
-    }
-EOT;
-        }
-
-        $allProperties = array('__isInitialized__');
-
-        /* @var $prop \ReflectionProperty */
-        foreach ($class->getReflectionClass()->getProperties() as $prop) {
-            if ($prop->isStatic()) {
-                continue;
-            }
-
-            $allProperties[] = $prop->isPrivate()
-                ? "\0" . $prop->getDeclaringClass()->getName() . "\0" . $prop->getName()
-                : $prop->getName();
-        }
-
-        $lazyPublicProperties = array_keys($this->getLazyLoadedPublicProperties($class));
-        $protectedProperties  = array_diff($allProperties, $lazyPublicProperties);
-
-        foreach ($allProperties as &$property) {
-            $property = var_export($property, true);
-        }
-
-        foreach ($protectedProperties as &$property) {
-            $property = var_export($property, true);
-        }
-
-        $allProperties       = implode(', ', $allProperties);
-        $protectedProperties = implode(', ', $protectedProperties);
-
-        return $sleepImpl . <<<EOT
-        if (\$this->__isInitialized__) {
-            return array($allProperties);
-        }
-
-        return array($protectedProperties);
-    }
-EOT;
-    }
-
-    /**
-     * Generates implementation for the `__wakeup` method of proxies.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateWakeupImpl(ClassMetadata $class)
-    {
-        $unsetPublicProperties = array();
-        $hasWakeup             = $class->getReflectionClass()->hasMethod('__wakeup');
-
-        foreach (array_keys($this->getLazyLoadedPublicProperties($class)) as $lazyPublicProperty) {
-            $unsetPublicProperties[] = '$this->' . $lazyPublicProperty;
-        }
-
-        $shortName  = $this->generateProxyShortClassName($class);
-        $inheritDoc = $hasWakeup ? '{@inheritDoc}' : '';
-        $wakeupImpl = <<<EOT
-    /**
-     * $inheritDoc
-     */
-    public function __wakeup()
-    {
-        if ( ! \$this->__isInitialized__) {
-            \$this->__initializer__ = function ($shortName \$proxy) {
-                \$proxy->__setInitializer(null);
-                \$proxy->__setCloner(null);
-
-                \$existingProperties = get_object_vars(\$proxy);
-
-                foreach (\$proxy->__getLazyProperties() as \$property => \$defaultValue) {
-                    if ( ! array_key_exists(\$property, \$existingProperties)) {
-                        \$proxy->\$property = \$defaultValue;
-                    }
-                }
-            };
-
-EOT;
-
-        if ( ! empty($unsetPublicProperties)) {
-            $wakeupImpl .= "\n            unset(" . implode(', ', $unsetPublicProperties) . ");";
-        }
-
-        $wakeupImpl .= "\n        }";
-
-        if ($hasWakeup) {
-            $wakeupImpl .= "\n        parent::__wakeup();";
-        }
-
-        $wakeupImpl .= "\n    }";
-
-        return $wakeupImpl;
-    }
-
-    /**
-     * Generates implementation for the `__clone` method of proxies.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateCloneImpl(ClassMetadata $class)
-    {
-        $hasParentClone  = $class->getReflectionClass()->hasMethod('__clone');
-        $inheritDoc      = $hasParentClone ? '{@inheritDoc}' : '';
-        $callParentClone = $hasParentClone ? "\n        parent::__clone();\n" : '';
-
-        return <<<EOT
-    /**
-     * $inheritDoc
-     */
-    public function __clone()
-    {
-        \$this->__cloner__ && \$this->__cloner__->__invoke(\$this, '__clone', array());
-$callParentClone    }
-EOT;
-    }
-
-    /**
-     * Generates decorated methods by picking those available in the parent class.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return string
-     */
-    private function generateMethods(ClassMetadata $class)
-    {
-        $methods           = '';
-        $methodNames       = array();
-        $reflectionMethods = $class->getReflectionClass()->getMethods(\ReflectionMethod::IS_PUBLIC);
-        $skippedMethods    = array(
-            '__sleep'   => true,
-            '__clone'   => true,
-            '__wakeup'  => true,
-            '__get'     => true,
-            '__set'     => true,
-            '__isset'   => true,
-        );
-
-        foreach ($reflectionMethods as $method) {
-            $name = $method->getName();
-
-            if (
-                $method->isConstructor() ||
-                isset($skippedMethods[strtolower($name)]) ||
-                isset($methodNames[$name]) ||
-                $method->isFinal() ||
-                $method->isStatic() ||
-                ( ! $method->isPublic())
-            ) {
-                continue;
-            }
-
-            $methodNames[$name] = true;
-            $methods .= "\n    /**\n"
-                . "     * {@inheritDoc}\n"
-                . "     */\n"
-                . '    public function ';
-
-            if ($method->returnsReference()) {
-                $methods .= '&';
-            }
-
-            $methods .= $name . '(' . $this->buildParametersString($class, $method, $method->getParameters()) . ')';
-            $methods .= "\n" . '    {' . "\n";
-
-            if ($this->isShortIdentifierGetter($method, $class)) {
-                $identifier = lcfirst(substr($name, 3));
-                $fieldType  = $class->getTypeOfField($identifier);
-                $cast       = in_array($fieldType, array('integer', 'smallint')) ? '(int) ' : '';
-
-                $methods .= '        if ($this->__isInitialized__ === false) {' . "\n";
-                $methods .= '            return ' . $cast . ' parent::' . $method->getName() . "();\n";
-                $methods .= '        }' . "\n\n";
-            }
-
-            $invokeParamsString = implode(', ', $this->getParameterNamesForInvoke($method->getParameters()));
-            $callParamsString = implode(', ', $this->getParameterNamesForParentCall($method->getParameters()));
-
-            $methods .= "\n        \$this->__initializer__ "
-                . "&& \$this->__initializer__->__invoke(\$this, " . var_export($name, true)
-                . ", array(" . $invokeParamsString . "));"
-                . "\n\n        return parent::" . $name . '(' . $callParamsString . ');'
-                . "\n" . '    }' . "\n";
-        }
-
-        return $methods;
-    }
-
-    /**
-     * Generates the Proxy file name.
-     *
-     * @param string $className
-     * @param string $baseDirectory Optional base directory for proxy file name generation.
-     *                              If not specified, the directory configured on the Configuration of the
-     *                              EntityManager will be used by this factory.
-     *
-     * @return string
-     */
-    public function getProxyFileName($className, $baseDirectory = null)
-    {
-        $baseDirectory = $baseDirectory ?: $this->proxyDirectory;
-
-        return rtrim($baseDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . Proxy::MARKER
-            . str_replace('\\', '', $className) . '.php';
-    }
-
-    /**
-     * Checks if the method is a short identifier getter.
-     *
-     * What does this mean? For proxy objects the identifier is already known,
-     * however accessing the getter for this identifier usually triggers the
-     * lazy loading, leading to a query that may not be necessary if only the
-     * ID is interesting for the userland code (for example in views that
-     * generate links to the entity, but do not display anything else).
-     *
-     * @param \ReflectionMethod                                  $method
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return boolean
-     */
-    private function isShortIdentifierGetter($method, ClassMetadata $class)
-    {
-        $identifier = lcfirst(substr($method->getName(), 3));
-        $startLine = $method->getStartLine();
-        $endLine = $method->getEndLine();
-        $cheapCheck = (
-            $method->getNumberOfParameters() == 0
-            && substr($method->getName(), 0, 3) == 'get'
-            && in_array($identifier, $class->getIdentifier(), true)
-            && $class->hasField($identifier)
-            && (($endLine - $startLine) <= 4)
-        );
-
-        if ($cheapCheck) {
-            $code = file($method->getDeclaringClass()->getFileName());
-            $code = trim(implode(' ', array_slice($code, $startLine - 1, $endLine - $startLine + 1)));
-
-            $pattern = sprintf(self::PATTERN_MATCH_ID_METHOD, $method->getName(), $identifier);
-
-            if (preg_match($pattern, $code)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Generates the list of public properties to be lazy loaded, with their default values.
-     *
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadata $class
-     *
-     * @return mixed[]
-     */
-    private function getLazyLoadedPublicProperties(ClassMetadata $class)
-    {
-        $defaultProperties = $class->getReflectionClass()->getDefaultProperties();
-        $properties = array();
-
-        foreach ($class->getReflectionClass()->getProperties(\ReflectionProperty::IS_PUBLIC) as $property) {
-            $name = $property->getName();
-
-            if (($class->hasField($name) || $class->hasAssociation($name)) && ! $class->isIdentifier($name)) {
-                $properties[$name] = $defaultProperties[$name];
-            }
-        }
-
-        return $properties;
-    }
-
-    /**
-     * @param ClassMetadata          $class
-     * @param \ReflectionMethod      $method
-     * @param \ReflectionParameter[] $parameters
-     *
-     * @return string
-     */
-    private function buildParametersString(ClassMetadata $class, \ReflectionMethod $method, array $parameters)
-    {
-        $parameterDefinitions = array();
-
-        /* @var $param \ReflectionParameter */
-        foreach ($parameters as $param) {
-            $parameterDefinition = '';
-
-            if ($parameterType = $this->getParameterType($class, $method, $param)) {
-                $parameterDefinition .= $parameterType . ' ';
-            }
-
-            if ($param->isPassedByReference()) {
-                $parameterDefinition .= '&';
-            }
-
-            if (method_exists($param, 'isVariadic')) {
-                if ($param->isVariadic()) {
-                    $parameterDefinition .= '...';
-                }
-            }
-
-            $parameters[]     = '$' . $param->getName();
-            $parameterDefinition .= '$' . $param->getName();
-
-            if ($param->isDefaultValueAvailable()) {
-                $parameterDefinition .= ' = ' . var_export($param->getDefaultValue(), true);
-            }
-
-            $parameterDefinitions[] = $parameterDefinition;
-        }
-
-        return implode(', ', $parameterDefinitions);
-    }
-
-    /**
-     * @param ClassMetadata $class
-     * @param \ReflectionMethod $method
-     * @param \ReflectionParameter $parameter
-     *
-     * @return string|null
-     */
-    private function getParameterType(ClassMetadata $class, \ReflectionMethod $method, \ReflectionParameter $parameter)
-    {
-
-        // We need to pick the type hint class too
-        if ($parameter->isArray()) {
-            return 'array';
-        }
-
-        if (method_exists($parameter, 'isCallable') && $parameter->isCallable()) {
-            return 'callable';
-        }
-
-        try {
-            $parameterClass = $parameter->getClass();
-
-            if ($parameterClass) {
-                return '\\' . $parameterClass->getName();
-            }
-        } catch (\ReflectionException $previous) {
-            throw UnexpectedValueException::invalidParameterTypeHint(
-                $class->getName(),
-                $method->getName(),
-                $parameter->getName(),
-                $previous
-            );
-        }
-
-        return null;
-    }
-
-    /**
-     * @param \ReflectionParameter[] $parameters
-     *
-     * @return string[]
-     */
-    private function getParameterNamesForInvoke(array $parameters)
-    {
-        return array_map(
-            function (\ReflectionParameter $parameter) {
-                return '$' . $parameter->getName();
-            },
-            $parameters
-        );
-    }
-
-    /**
-     * @param \ReflectionParameter[] $parameters
-     *
-     * @return string[]
-     */
-    private function getParameterNamesForParentCall(array $parameters)
-    {
-        return array_map(
-            function (\ReflectionParameter $parameter) {
-                $name = '';
-
-                if (method_exists($parameter, 'isVariadic')) {
-                    if ($parameter->isVariadic()) {
-                        $name .= '...';
-                    }
-                }
-
-                $name .= '$' . $parameter->getName();
-
-                return $name;
-            },
-            $parameters
-        );
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php
deleted file mode 100644
index 639fd69..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Reflection;
-
-/**
- * Finds a class in a PSR-0 structure.
- *
- * @author Karoly Negyesi <karoly@negyesi.net>
- */
-interface ClassFinderInterface
-{
-    /**
-     * Finds a class.
-     *
-     * @param string $class The name of the class.
-     *
-     * @return string|null The name of the class or NULL if not found.
-     */
-    public function findFile($class);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php
deleted file mode 100644
index 418bb0f..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Reflection;
-
-/**
- * Finds a class in a PSR-0 structure.
- *
- * @author Karoly Negyesi <karoly@negyesi.net>
- */
-class Psr0FindFile implements ClassFinderInterface
-{
-    /**
-     * The PSR-0 prefixes.
-     *
-     * @var array
-     */
-    protected $prefixes;
-
-    /**
-     * @param array $prefixes An array of prefixes. Each key is a PHP namespace and each value is
-     *                        a list of directories.
-     */
-    public function __construct($prefixes)
-    {
-        $this->prefixes = $prefixes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function findFile($class)
-    {
-        $lastNsPos = strrpos($class, '\\');
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        if (false !== $lastNsPos) {
-            // namespaced class name
-            $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $lastNsPos)) . DIRECTORY_SEPARATOR;
-            $className = substr($class, $lastNsPos + 1);
-        } else {
-            // PEAR-like class name
-            $classPath = null;
-            $className = $class;
-        }
-
-        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-
-        foreach ($this->prefixes as $prefix => $dirs) {
-            if (0 === strpos($class, $prefix)) {
-                foreach ($dirs as $dir) {
-                    if (is_file($dir . DIRECTORY_SEPARATOR . $classPath)) {
-                        return $dir . DIRECTORY_SEPARATOR . $classPath;
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php
deleted file mode 100644
index 3d970ee..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Reflection;
-
-interface ReflectionProviderInterface
-{
-    /**
-     * Gets the ReflectionClass equivalent for this class.
-     *
-     * @return \ReflectionClass
-     */
-    public function getReflectionClass();
-
-    /**
-     * Gets the ReflectionMethod equivalent for this class.
-     *
-     * @param string $name
-     *
-     * @return \ReflectionMethod
-     */
-    public function getReflectionMethod($name);
-
-    /**
-     * Gets the ReflectionProperty equivalent for this class.
-     *
-     * @param string $name
-     *
-     * @return \ReflectionProperty
-     */
-    public function getReflectionProperty($name);
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php
deleted file mode 100644
index 4e8ef53..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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\Reflection;
-
-use Doctrine\Common\Proxy\Proxy;
-use ReflectionProperty;
-
-/**
- * PHP Runtime Reflection Public Property - special overrides for public properties.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- * @since  2.4
- */
-class RuntimePublicReflectionProperty extends ReflectionProperty
-{
-    /**
-     * {@inheritDoc}
-     *
-     * Checks is the value actually exist before fetching it.
-     * This is to avoid calling `__get` on the provided $object if it
-     * is a {@see \Doctrine\Common\Proxy\Proxy}.
-     */
-    public function getValue($object = null)
-    {
-        $name = $this->getName();
-
-        if ($object instanceof Proxy && ! $object->__isInitialized()) {
-            $originalInitializer = $object->__getInitializer();
-            $object->__setInitializer(null);
-            $val = isset($object->$name) ? $object->$name : null;
-            $object->__setInitializer($originalInitializer);
-
-            return $val;
-        }
-
-        return isset($object->$name) ? parent::getValue($object) : null;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Avoids triggering lazy loading via `__set` if the provided object
-     * is a {@see \Doctrine\Common\Proxy\Proxy}.
-     * @link https://bugs.php.net/bug.php?id=63463
-     */
-    public function setValue($object, $value = null)
-    {
-        if ( ! ($object instanceof Proxy && ! $object->__isInitialized())) {
-            parent::setValue($object, $value);
-
-            return;
-        }
-
-        $originalInitializer = $object->__getInitializer();
-        $object->__setInitializer(null);
-        parent::setValue($object, $value);
-        $object->__setInitializer($originalInitializer);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
deleted file mode 100644
index b65979a..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?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\Reflection;
-
-use ReflectionClass;
-use ReflectionException;
-
-class StaticReflectionClass extends ReflectionClass
-{
-    /**
-     * The static reflection parser object.
-     *
-     * @var StaticReflectionParser
-     */
-    private $staticReflectionParser;
-
-    /**
-     * @param StaticReflectionParser $staticReflectionParser
-     */
-    public function __construct(StaticReflectionParser $staticReflectionParser)
-    {
-        $this->staticReflectionParser = $staticReflectionParser;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return $this->staticReflectionParser->getClassName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDocComment()
-    {
-        return $this->staticReflectionParser->getDocComment();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getNamespaceName()
-    {
-        return $this->staticReflectionParser->getNamespaceName();
-    }
-
-    /**
-     * @return array
-     */
-    public function getUseStatements()
-    {
-        return $this->staticReflectionParser->getUseStatements();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethod($name)
-    {
-        return $this->staticReflectionParser->getReflectionMethod($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getProperty($name)
-    {
-        return $this->staticReflectionParser->getReflectionProperty($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public static function export($argument, $return = false)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getConstant($name)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getConstants()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getConstructor()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefaultProperties()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getEndLine()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getExtension()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getExtensionName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFileName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getInterfaceNames()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getInterfaces()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethods($filter = null)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getModifiers()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getParentClass()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getProperties($filter = null)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getShortName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStartLine()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStaticProperties()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStaticPropertyValue($name, $default = '')
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getTraitAliases()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getTraitNames()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getTraits()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hasConstant($name)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hasMethod($name)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hasProperty($name)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function implementsInterface($interface)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function inNamespace()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isAbstract()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isCloneable()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isFinal()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isInstance($object)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isInstantiable()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isInterface()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isInternal()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isIterateable()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isSubclassOf($class)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isTrait()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isUserDefined()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function newInstance($args)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function newInstanceArgs(array $args = array())
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function newInstanceWithoutConstructor()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setStaticPropertyValue($name, $value)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __toString()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php
deleted file mode 100644
index 8d5380b..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?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\Reflection;
-
-use ReflectionException;
-use ReflectionMethod;
-
-class StaticReflectionMethod extends ReflectionMethod
-{
-    /**
-     * The PSR-0 parser object.
-     *
-     * @var StaticReflectionParser
-     */
-    protected $staticReflectionParser;
-
-    /**
-     * The name of the method.
-     *
-     * @var string
-     */
-    protected $methodName;
-
-    /**
-     * @param StaticReflectionParser $staticReflectionParser
-     * @param string                 $methodName
-     */
-    public function __construct(StaticReflectionParser $staticReflectionParser, $methodName)
-    {
-        $this->staticReflectionParser = $staticReflectionParser;
-        $this->methodName = $methodName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return $this->methodName;
-    }
-
-    /**
-     * @return StaticReflectionParser
-     */
-    protected function getStaticReflectionParser()
-    {
-        return $this->staticReflectionParser->getStaticReflectionParserForDeclaringClass('method', $this->methodName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDeclaringClass()
-    {
-        return $this->getStaticReflectionParser()->getReflectionClass();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getNamespaceName()
-    {
-        return $this->getStaticReflectionParser()->getNamespaceName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDocComment()
-    {
-        return $this->getStaticReflectionParser()->getDocComment('method', $this->methodName);
-    }
-
-    /**
-     * @return array
-     */
-    public function getUseStatements()
-    {
-        return $this->getStaticReflectionParser()->getUseStatements();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public static function export($class, $name, $return = false)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClosure($object)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getModifiers()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getPrototype()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function invoke($object, $parameter = null)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function invokeArgs($object, array $args)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isAbstract()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isConstructor()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isDestructor()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isFinal()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isPrivate()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isProtected()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isPublic()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isStatic()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setAccessible($accessible)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __toString()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClosureThis()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getEndLine()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getExtension()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getExtensionName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFileName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getNumberOfParameters()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getNumberOfRequiredParameters()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getParameters()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getShortName()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStartLine()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStaticVariables()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function inNamespace()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isClosure()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isDeprecated()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isInternal()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isUserDefined()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function returnsReference()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
deleted file mode 100644
index 922404d..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?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\Reflection;
-
-use Doctrine\Common\Annotations\TokenParser;
-use ReflectionException;
-
-/**
- * Parses a file for namespaces/use/class declarations.
- *
- * @author Karoly Negyesi <karoly@negyesi.net>
- */
-class StaticReflectionParser implements ReflectionProviderInterface
-{
-    /**
-     * The fully qualified class name.
-     *
-     * @var string
-     */
-    protected $className;
-
-    /**
-     * The short class name.
-     *
-     * @var string
-     */
-    protected $shortClassName;
-
-    /**
-     * Whether the caller only wants class annotations.
-     *
-     * @var boolean.
-     */
-    protected $classAnnotationOptimize;
-
-    /**
-     * Whether the parser has run.
-     *
-     * @var boolean
-     */
-    protected $parsed = false;
-
-    /**
-     * The namespace of the class.
-     *
-     * @var string
-     */
-    protected $namespace = '';
-
-    /**
-     * The use statements of the class.
-     *
-     * @var array
-     */
-    protected $useStatements = array();
-
-    /**
-     * The docComment of the class.
-     *
-     * @var string
-     */
-    protected $docComment = array(
-        'class' => '',
-        'property' => array(),
-        'method' => array()
-    );
-
-    /**
-     * The name of the class this class extends, if any.
-     *
-     * @var string
-     */
-    protected $parentClassName = '';
-
-    /**
-     * The parent PSR-0 Parser.
-     *
-     * @var \Doctrine\Common\Reflection\StaticReflectionParser
-     */
-    protected $parentStaticReflectionParser;
-
-    /**
-     * Parses a class residing in a PSR-0 hierarchy.
-     *
-     * @param string               $className               The full, namespaced class name.
-     * @param ClassFinderInterface $finder                  A ClassFinder object which finds the class.
-     * @param boolean              $classAnnotationOptimize Only retrieve the class docComment.
-     *                                                      Presumes there is only one statement per line.
-     */
-    public function __construct($className, $finder, $classAnnotationOptimize = false)
-    {
-        $this->className = ltrim($className, '\\');
-        $lastNsPos = strrpos($this->className, '\\');
-
-        if ($lastNsPos !== false) {
-            $this->namespace = substr($this->className, 0, $lastNsPos);
-            $this->shortClassName = substr($this->className, $lastNsPos + 1);
-        } else {
-            $this->shortClassName = $this->className;
-        }
-
-        $this->finder = $finder;
-        $this->classAnnotationOptimize = $classAnnotationOptimize;
-    }
-
-    /**
-     * @return void
-     */
-    protected function parse()
-    {
-        if ($this->parsed || !$fileName = $this->finder->findFile($this->className)) {
-            return;
-        }
-        $this->parsed = true;
-        $contents = file_get_contents($fileName);
-        if ($this->classAnnotationOptimize) {
-            if (preg_match("/\A.*^\s*((abstract|final)\s+)?class\s+{$this->shortClassName}\s+/sm", $contents, $matches)) {
-                $contents = $matches[0];
-            }
-        }
-        $tokenParser = new TokenParser($contents);
-        $docComment = '';
-        while ($token = $tokenParser->next(false)) {
-            if (is_array($token)) {
-                switch ($token[0]) {
-                    case T_USE:
-                        $this->useStatements = array_merge($this->useStatements, $tokenParser->parseUseStatement());
-                        break;
-                    case T_DOC_COMMENT:
-                        $docComment = $token[1];
-                        break;
-                    case T_CLASS:
-                        $this->docComment['class'] = $docComment;
-                        $docComment = '';
-                        break;
-                    case T_VAR:
-                    case T_PRIVATE:
-                    case T_PROTECTED:
-                    case T_PUBLIC:
-                        $token = $tokenParser->next();
-                        if ($token[0] === T_VARIABLE) {
-                            $propertyName = substr($token[1], 1);
-                            $this->docComment['property'][$propertyName] = $docComment;
-                            continue 2;
-                        }
-                        if ($token[0] !== T_FUNCTION) {
-                            // For example, it can be T_FINAL.
-                            continue 2;
-                        }
-                        // No break.
-                    case T_FUNCTION:
-                        // The next string after function is the name, but
-                        // there can be & before the function name so find the
-                        // string.
-                        while (($token = $tokenParser->next()) && $token[0] !== T_STRING);
-                        $methodName = $token[1];
-                        $this->docComment['method'][$methodName] = $docComment;
-                        $docComment = '';
-                        break;
-                    case T_EXTENDS:
-                        $this->parentClassName = $tokenParser->parseClass();
-                        $nsPos = strpos($this->parentClassName, '\\');
-                        $fullySpecified = false;
-                        if ($nsPos === 0) {
-                            $fullySpecified = true;
-                        } else {
-                            if ($nsPos) {
-                                $prefix = strtolower(substr($this->parentClassName, 0, $nsPos));
-                                $postfix = substr($this->parentClassName, $nsPos);
-                            } else {
-                                $prefix = strtolower($this->parentClassName);
-                                $postfix = '';
-                            }
-                            foreach ($this->useStatements as $alias => $use) {
-                                if ($alias == $prefix) {
-                                    $this->parentClassName = '\\' . $use . $postfix;
-                                    $fullySpecified = true;
-                              }
-                            }
-                        }
-                        if (!$fullySpecified) {
-                            $this->parentClassName = '\\' . $this->namespace . '\\' . $this->parentClassName;
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * @return StaticReflectionParser
-     */
-    protected function getParentStaticReflectionParser()
-    {
-        if (empty($this->parentStaticReflectionParser)) {
-            $this->parentStaticReflectionParser = new static($this->parentClassName, $this->finder);
-        }
-
-        return $this->parentStaticReflectionParser;
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->className;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNamespaceName()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getReflectionClass()
-    {
-        return new StaticReflectionClass($this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getReflectionMethod($methodName)
-    {
-        return new StaticReflectionMethod($this, $methodName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getReflectionProperty($propertyName)
-    {
-        return new StaticReflectionProperty($this, $propertyName);
-    }
-
-    /**
-     * Gets the use statements from this file.
-     *
-     * @return array
-     */
-    public function getUseStatements()
-    {
-        $this->parse();
-
-        return $this->useStatements;
-    }
-
-    /**
-     * Gets the doc comment.
-     *
-     * @param string $type The type: 'class', 'property' or 'method'.
-     * @param string $name The name of the property or method, not needed for 'class'.
-     *
-     * @return string The doc comment, empty string if none.
-     */
-    public function getDocComment($type = 'class', $name = '')
-    {
-        $this->parse();
-
-        return $name ? $this->docComment[$type][$name] : $this->docComment[$type];
-    }
-
-    /**
-     * Gets the PSR-0 parser for the declaring class.
-     *
-     * @param string $type The type: 'property' or 'method'.
-     * @param string $name The name of the property or method.
-     *
-     * @return StaticReflectionParser A static reflection parser for the declaring class.
-     *
-     * @throws ReflectionException
-     */
-    public function getStaticReflectionParserForDeclaringClass($type, $name)
-    {
-        $this->parse();
-        if (isset($this->docComment[$type][$name])) {
-            return $this;
-        }
-        if (!empty($this->parentClassName)) {
-            return $this->getParentStaticReflectionParser()->getStaticReflectionParserForDeclaringClass($type, $name);
-        }
-        throw new ReflectionException('Invalid ' . $type . ' "' . $name . '"');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php b/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
deleted file mode 100644
index 79b40d4..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?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\Reflection;
-
-use ReflectionException;
-use ReflectionProperty;
-
-class StaticReflectionProperty extends ReflectionProperty
-{
-    /**
-     * The PSR-0 parser object.
-     *
-     * @var StaticReflectionParser
-     */
-    protected $staticReflectionParser;
-
-    /**
-     * The name of the property.
-     *
-     * @var string|null
-     */
-    protected $propertyName;
-
-    /**
-     * @param StaticReflectionParser $staticReflectionParser
-     * @param string|null            $propertyName
-     */
-    public function __construct(StaticReflectionParser $staticReflectionParser, $propertyName)
-    {
-        $this->staticReflectionParser = $staticReflectionParser;
-        $this->propertyName = $propertyName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getName()
-    {
-        return $this->propertyName;
-    }
-
-    /**
-     * @return StaticReflectionParser
-     */
-    protected function getStaticReflectionParser()
-    {
-        return $this->staticReflectionParser->getStaticReflectionParserForDeclaringClass('property', $this->propertyName);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDeclaringClass()
-    {
-        return $this->getStaticReflectionParser()->getReflectionClass();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDocComment()
-    {
-        return $this->getStaticReflectionParser()->getDocComment('property', $this->propertyName);
-    }
-
-    /**
-     * @return array
-     */
-    public function getUseStatements()
-    {
-        return $this->getStaticReflectionParser()->getUseStatements();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public static function export ($class, $name, $return = false)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getModifiers()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getValue($object = null)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isDefault()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isPrivate()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isProtected()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isPublic()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isStatic()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setAccessible ($accessible)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setValue ($object, $value = null)
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __toString()
-    {
-        throw new ReflectionException('Method not implemented');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php b/vendor/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php
deleted file mode 100644
index 49dc7bb..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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\Util;
-
-use Doctrine\Common\Persistence\Proxy;
-
-/**
- * Class and reflection related functionality for objects that
- * might or not be proxy objects at the moment.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Johannes Schmitt <schmittjoh@gmail.com>
- */
-class ClassUtils
-{
-    /**
-     * Gets the real class name of a class name that could be a proxy.
-     *
-     * @param string $class
-     *
-     * @return string
-     */
-    public static function getRealClass($class)
-    {
-        if (false === $pos = strrpos($class, '\\'.Proxy::MARKER.'\\')) {
-            return $class;
-        }
-
-        return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
-    }
-
-    /**
-     * Gets the real class name of an object (even if its a proxy).
-     *
-     * @param object $object
-     *
-     * @return string
-     */
-    public static function getClass($object)
-    {
-        return self::getRealClass(get_class($object));
-    }
-
-    /**
-     * Gets the real parent class name of a class or object.
-     *
-     * @param string $className
-     *
-     * @return string
-     */
-    public static function getParentClass($className)
-    {
-        return get_parent_class( self::getRealClass( $className ) );
-    }
-
-    /**
-     * Creates a new reflection class.
-     *
-     * @param string $class
-     *
-     * @return \ReflectionClass
-     */
-    public static function newReflectionClass($class)
-    {
-        return new \ReflectionClass( self::getRealClass( $class ) );
-    }
-
-    /**
-     * Creates a new reflection object.
-     *
-     * @param object $object
-     *
-     * @return \ReflectionObject
-     */
-    public static function newReflectionObject($object)
-    {
-        return self::newReflectionClass( self::getClass( $object ) );
-    }
-
-    /**
-     * Given a class name and a proxy namespace returns the proxy name.
-     *
-     * @param string $className
-     * @param string $proxyNamespace
-     *
-     * @return string
-     */
-    public static function generateProxyClassName($className, $proxyNamespace)
-    {
-        return rtrim($proxyNamespace, '\\') . '\\'.Proxy::MARKER.'\\' . ltrim($className, '\\');
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php b/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
deleted file mode 100644
index 0959ce5..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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\Util;
-
-use Doctrine\Common\Persistence\Proxy;
-
-/**
- * Static class containing most used debug methods.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
- */
-final class Debug
-{
-    /**
-     * Private constructor (prevents instantiation).
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Prints a dump of the public, protected and private properties of $var.
-     *
-     * @link http://xdebug.org/
-     *
-     * @param mixed   $var       The variable to dump.
-     * @param integer $maxDepth  The maximum nesting level for object properties.
-     * @param boolean $stripTags Whether output should strip HTML tags.
-     * @param boolean $echo      Send the dumped value to the output buffer
-     *
-     * @return string
-     */
-    public static function dump($var, $maxDepth = 2, $stripTags = true, $echo = true)
-    {
-        $html = ini_get('html_errors');
-
-        if ($html !== true) {
-            ini_set('html_errors', true);
-        }
-
-        if (extension_loaded('xdebug')) {
-            ini_set('xdebug.var_display_max_depth', $maxDepth);
-        }
-
-        $var = self::export($var, $maxDepth++);
-
-        ob_start();
-        var_dump($var);
-
-        $dump = ob_get_contents();
-
-        ob_end_clean();
-
-        $dumpText = ($stripTags ? strip_tags(html_entity_decode($dump)) : $dump);
-
-        ini_set('html_errors', $html);
-        
-        if ($echo) {
-            echo $dumpText;
-        }
-        
-        return $dumpText;
-    }
-
-    /**
-     * @param mixed $var
-     * @param int   $maxDepth
-     *
-     * @return mixed
-     */
-    public static function export($var, $maxDepth)
-    {
-        $return = null;
-        $isObj = is_object($var);
-
-        if ($isObj && in_array('Doctrine\Common\Collections\Collection', class_implements($var))) {
-            $var = $var->toArray();
-        }
-
-        if ($maxDepth) {
-            if (is_array($var)) {
-                $return = array();
-
-                foreach ($var as $k => $v) {
-                    $return[$k] = self::export($v, $maxDepth - 1);
-                }
-            } else if ($isObj) {
-                $return = new \stdclass();
-                if ($var instanceof \DateTime) {
-                    $return->__CLASS__ = "DateTime";
-                    $return->date = $var->format('c');
-                    $return->timezone = $var->getTimeZone()->getName();
-                } else {
-                    $reflClass = ClassUtils::newReflectionObject($var);
-                    $return->__CLASS__ = ClassUtils::getClass($var);
-
-                    if ($var instanceof Proxy) {
-                        $return->__IS_PROXY__ = true;
-                        $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
-                    }
-
-                    if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
-                        $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
-                    }
-
-                    foreach ($reflClass->getProperties() as $reflProperty) {
-                        $name  = $reflProperty->getName();
-
-                        $reflProperty->setAccessible(true);
-                        $return->$name = self::export($reflProperty->getValue($var), $maxDepth - 1);
-                    }
-                }
-            } else {
-                $return = $var;
-            }
-        } else {
-            $return = is_object($var) ? get_class($var)
-                : (is_array($var) ? 'Array(' . count($var) . ')' : $var);
-        }
-
-        return $return;
-    }
-
-    /**
-     * Returns a string representation of an object.
-     *
-     * @param object $obj
-     *
-     * @return string
-     */
-    public static function toString($obj)
-    {
-        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj) . '@' . spl_object_hash($obj);
-    }
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Util/Inflector.php b/vendor/doctrine/common/lib/Doctrine/Common/Util/Inflector.php
deleted file mode 100644
index 082dc78..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Util/Inflector.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Util;
-
-use Doctrine\Common\Inflector\Inflector as BaseInflector;
-
-/**
- * Doctrine inflector has static methods for inflecting text.
- *
- * Kept for backwards compatibility reasons, was moved to its own component.
- */
-class Inflector extends BaseInflector
-{
-}
diff --git a/vendor/doctrine/common/lib/Doctrine/Common/Version.php b/vendor/doctrine/common/lib/Doctrine/Common/Version.php
deleted file mode 100644
index 80c1fbf..0000000
--- a/vendor/doctrine/common/lib/Doctrine/Common/Version.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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;
-
-/**
- * Class to store and retrieve the version of Doctrine.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- */
-class Version
-{
-    /**
-     * Current Doctrine Version.
-     */
-    const VERSION = '2.6.0-DEV';
-
-    /**
-     * Compares a Doctrine version with the current one.
-     *
-     * @param string $version Doctrine version to compare.
-     *
-     * @return int -1 if older, 0 if it is the same, 1 if version passed as argument is newer.
-     */
-    public static function compare($version)
-    {
-        $currentVersion = str_replace(' ', '', strtolower(self::VERSION));
-        $version = str_replace(' ', '', $version);
-
-        return version_compare($version, $currentVersion);
-    }
-}
diff --git a/vendor/doctrine/common/phpunit.xml.dist b/vendor/doctrine/common/phpunit.xml.dist
deleted file mode 100644
index f6fcf84..0000000
--- a/vendor/doctrine/common/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +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/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Common Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/doctrine/inflector/.gitignore b/vendor/doctrine/inflector/.gitignore
deleted file mode 100644
index f2cb7f8..0000000
--- a/vendor/doctrine/inflector/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-composer.lock
-composer.phar
-phpunit.xml
diff --git a/vendor/doctrine/inflector/.travis.yml b/vendor/doctrine/inflector/.travis.yml
deleted file mode 100644
index 6b1d8ff..0000000
--- a/vendor/doctrine/inflector/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-install:
-    - composer --prefer-source install
diff --git a/vendor/doctrine/inflector/LICENSE b/vendor/doctrine/inflector/LICENSE
deleted file mode 100644
index 5e781fc..0000000
--- a/vendor/doctrine/inflector/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2013 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/vendor/doctrine/inflector/README.md b/vendor/doctrine/inflector/README.md
deleted file mode 100644
index acb55a0..0000000
--- a/vendor/doctrine/inflector/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Doctrine Inflector
-
-Doctrine Inflector is a small library that can perform string manipulations
-with regard to upper-/lowercase and singular/plural forms of words.
-
-[![Build Status](https://travis-ci.org/doctrine/inflector.svg?branch=master)](https://travis-ci.org/doctrine/inflector)
diff --git a/vendor/doctrine/inflector/composer.json b/vendor/doctrine/inflector/composer.json
deleted file mode 100644
index a29c68c..0000000
--- a/vendor/doctrine/inflector/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "doctrine/inflector",
-    "type": "library",
-    "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-    "keywords": ["string", "inflection", "singularize", "pluralize"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.*"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\Inflector\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php b/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
deleted file mode 100644
index b007b21..0000000
--- a/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?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\Inflector;
-
-/**
- * Doctrine inflector has static methods for inflecting text.
- *
- * The methods in these classes are from several different sources collected
- * across several different php projects and several different authors. The
- * original author names and emails are not known.
- *
- * Pluralize & Singularize implementation are borrowed from CakePHP with some modifications.
- *
- * @link   www.doctrine-project.org
- * @since  1.0
- * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author Jonathan H. Wage <jonwage@gmail.com>
- */
-class Inflector
-{
-    /**
-     * Plural inflector rules.
-     *
-     * @var array
-     */
-    private static $plural = array(
-        'rules' => array(
-            '/(s)tatus$/i' => '\1\2tatuses',
-            '/(quiz)$/i' => '\1zes',
-            '/^(ox)$/i' => '\1\2en',
-            '/([m|l])ouse$/i' => '\1ice',
-            '/(matr|vert|ind)(ix|ex)$/i' => '\1ices',
-            '/(x|ch|ss|sh)$/i' => '\1es',
-            '/([^aeiouy]|qu)y$/i' => '\1ies',
-            '/(hive)$/i' => '\1s',
-            '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-            '/sis$/i' => 'ses',
-            '/([ti])um$/i' => '\1a',
-            '/(p)erson$/i' => '\1eople',
-            '/(m)an$/i' => '\1en',
-            '/(c)hild$/i' => '\1hildren',
-            '/(buffal|tomat)o$/i' => '\1\2oes',
-            '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
-            '/us$/i' => 'uses',
-            '/(alias)$/i' => '\1es',
-            '/(ax|cris|test)is$/i' => '\1es',
-            '/s$/' => 's',
-            '/^$/' => '',
-            '/$/' => 's',
-        ),
-        'uninflected' => array(
-            '.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people', 'cookie'
-        ),
-        'irregular' => array(
-            'atlas' => 'atlases',
-            'beef' => 'beefs',
-            'brother' => 'brothers',
-            'cafe' => 'cafes',
-            'child' => 'children',
-            'cookie' => 'cookies',
-            'corpus' => 'corpuses',
-            'cow' => 'cows',
-            'criteria' => 'criterion',
-            'ganglion' => 'ganglions',
-            'genie' => 'genies',
-            'genus' => 'genera',
-            'graffito' => 'graffiti',
-            'hoof' => 'hoofs',
-            'human' => 'humans',
-            'loaf' => 'loaves',
-            'man' => 'men',
-            'money' => 'monies',
-            'mongoose' => 'mongooses',
-            'move' => 'moves',
-            'mythos' => 'mythoi',
-            'niche' => 'niches',
-            'numen' => 'numina',
-            'occiput' => 'occiputs',
-            'octopus' => 'octopuses',
-            'opus' => 'opuses',
-            'ox' => 'oxen',
-            'penis' => 'penises',
-            'person' => 'people',
-            'sex' => 'sexes',
-            'soliloquy' => 'soliloquies',
-            'testis' => 'testes',
-            'trilby' => 'trilbys',
-            'turf' => 'turfs',
-        )
-    );
-
-    /**
-     * Singular inflector rules.
-     *
-     * @var array
-     */
-    private static $singular = array(
-        'rules' => array(
-            '/(s)tatuses$/i' => '\1\2tatus',
-            '/^(.*)(menu)s$/i' => '\1\2',
-            '/(quiz)zes$/i' => '\\1',
-            '/(matr)ices$/i' => '\1ix',
-            '/(vert|ind)ices$/i' => '\1ex',
-            '/^(ox)en/i' => '\1',
-            '/(alias)(es)*$/i' => '\1',
-            '/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
-            '/([ftw]ax)es/i' => '\1',
-            '/(cris|ax|test)es$/i' => '\1is',
-            '/(shoe|slave)s$/i' => '\1',
-            '/(o)es$/i' => '\1',
-            '/ouses$/' => 'ouse',
-            '/([^a])uses$/' => '\1us',
-            '/([m|l])ice$/i' => '\1ouse',
-            '/(x|ch|ss|sh)es$/i' => '\1',
-            '/(m)ovies$/i' => '\1\2ovie',
-            '/(s)eries$/i' => '\1\2eries',
-            '/([^aeiouy]|qu)ies$/i' => '\1y',
-            '/([lr])ves$/i' => '\1f',
-            '/(tive)s$/i' => '\1',
-            '/(hive)s$/i' => '\1',
-            '/(drive)s$/i' => '\1',
-            '/([^fo])ves$/i' => '\1fe',
-            '/(^analy)ses$/i' => '\1sis',
-            '/(analy|diagno|^ba|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
-            '/([ti])a$/i' => '\1um',
-            '/(p)eople$/i' => '\1\2erson',
-            '/(m)en$/i' => '\1an',
-            '/(c)hildren$/i' => '\1\2hild',
-            '/(n)ews$/i' => '\1\2ews',
-            '/eaus$/' => 'eau',
-            '/^(.*us)$/' => '\\1',
-            '/s$/i' => '',
-        ),
-        'uninflected' => array(
-            '.*[nrlm]ese',
-            '.*deer',
-            '.*fish',
-            '.*measles',
-            '.*ois',
-            '.*pox',
-            '.*sheep',
-            '.*ss',
-        ),
-        'irregular' => array(
-            'criterion' => 'criteria',
-            'curves' => 'curve',
-            'foes' => 'foe',
-            'waves' => 'wave',
-        )
-    );
-
-    /**
-     * Words that should not be inflected.
-     *
-     * @var array
-     */
-    private static $uninflected = array(
-        'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
-        'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
-        'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
-        'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
-        'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
-        'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', '.*?media',
-        'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
-        'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
-        'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
-        'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'staff', 'swine',
-        'testes', 'trousers', 'trout', 'tuna', 'Vermontese', 'Wenchowese', 'whiting',
-        'wildebeest', 'Yengeese'
-    );
-
-    /**
-     * Method cache array.
-     *
-     * @var array
-     */
-    private static $cache = array();
-
-    /**
-     * The initial state of Inflector so reset() works.
-     *
-     * @var array
-     */
-    private static $initialState = array();
-
-    /**
-     * Converts a word into the format for a Doctrine table name. Converts 'ModelName' to 'model_name'.
-     *
-     * @param string $word The word to tableize.
-     *
-     * @return string The tableized word.
-     */
-    public static function tableize($word)
-    {
-        return strtolower(preg_replace('~(?<=\\w)([A-Z])~', '_$1', $word));
-    }
-
-    /**
-     * Converts a word into the format for a Doctrine class name. Converts 'table_name' to 'TableName'.
-     *
-     * @param string $word The word to classify.
-     *
-     * @return string The classified word.
-     */
-    public static function classify($word)
-    {
-        return str_replace(" ", "", ucwords(strtr($word, "_-", "  ")));
-    }
-
-    /**
-     * Camelizes a word. This uses the classify() method and turns the first character to lowercase.
-     *
-     * @param string $word The word to camelize.
-     *
-     * @return string The camelized word.
-     */
-    public static function camelize($word)
-    {
-        return lcfirst(self::classify($word));
-    }
-
-    /**
-     * Clears Inflectors inflected value caches, and resets the inflection
-     * rules to the initial values.
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        if (empty(self::$initialState)) {
-            self::$initialState = get_class_vars('Inflector');
-
-            return;
-        }
-
-        foreach (self::$initialState as $key => $val) {
-            if ($key != 'initialState') {
-                self::${$key} = $val;
-            }
-        }
-    }
-
-    /**
-     * Adds custom inflection $rules, of either 'plural' or 'singular' $type.
-     *
-     * ### Usage:
-     *
-     * {{{
-     * Inflector::rules('plural', array('/^(inflect)or$/i' => '\1ables'));
-     * Inflector::rules('plural', array(
-     *     'rules' => array('/^(inflect)ors$/i' => '\1ables'),
-     *     'uninflected' => array('dontinflectme'),
-     *     'irregular' => array('red' => 'redlings')
-     * ));
-     * }}}
-     *
-     * @param string  $type  The type of inflection, either 'plural' or 'singular'
-     * @param array   $rules An array of rules to be added.
-     * @param boolean $reset If true, will unset default inflections for all
-     *                       new rules that are being defined in $rules.
-     *
-     * @return void
-     */
-    public static function rules($type, $rules, $reset = false)
-    {
-        foreach ($rules as $rule => $pattern) {
-            if ( ! is_array($pattern)) {
-                continue;
-            }
-
-            if ($reset) {
-                self::${$type}[$rule] = $pattern;
-            } else {
-                self::${$type}[$rule] = ($rule === 'uninflected')
-                    ? array_merge($pattern, self::${$type}[$rule])
-                    : $pattern + self::${$type}[$rule];
-            }
-
-            unset($rules[$rule], self::${$type}['cache' . ucfirst($rule)]);
-
-            if (isset(self::${$type}['merged'][$rule])) {
-                unset(self::${$type}['merged'][$rule]);
-            }
-
-            if ($type === 'plural') {
-                self::$cache['pluralize'] = self::$cache['tableize'] = array();
-            } elseif ($type === 'singular') {
-                self::$cache['singularize'] = array();
-            }
-        }
-
-        self::${$type}['rules'] = $rules + self::${$type}['rules'];
-    }
-
-    /**
-     * Returns a word in plural form.
-     *
-     * @param string $word The word in singular form.
-     *
-     * @return string The word in plural form.
-     */
-    public static function pluralize($word)
-    {
-        if (isset(self::$cache['pluralize'][$word])) {
-            return self::$cache['pluralize'][$word];
-        }
-
-        if (!isset(self::$plural['merged']['irregular'])) {
-            self::$plural['merged']['irregular'] = self::$plural['irregular'];
-        }
-
-        if (!isset(self::$plural['merged']['uninflected'])) {
-            self::$plural['merged']['uninflected'] = array_merge(self::$plural['uninflected'], self::$uninflected);
-        }
-
-        if (!isset(self::$plural['cacheUninflected']) || !isset(self::$plural['cacheIrregular'])) {
-            self::$plural['cacheUninflected'] = '(?:' . implode('|', self::$plural['merged']['uninflected']) . ')';
-            self::$plural['cacheIrregular']   = '(?:' . implode('|', array_keys(self::$plural['merged']['irregular'])) . ')';
-        }
-
-        if (preg_match('/(.*)\\b(' . self::$plural['cacheIrregular'] . ')$/i', $word, $regs)) {
-            self::$cache['pluralize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
-            
-            return self::$cache['pluralize'][$word];
-        }
-
-        if (preg_match('/^(' . self::$plural['cacheUninflected'] . ')$/i', $word, $regs)) {
-            self::$cache['pluralize'][$word] = $word;
-
-            return $word;
-        }
-
-        foreach (self::$plural['rules'] as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                self::$cache['pluralize'][$word] = preg_replace($rule, $replacement, $word);
-
-                return self::$cache['pluralize'][$word];
-            }
-        }
-    }
-
-    /**
-     * Returns a word in singular form.
-     *
-     * @param string $word The word in plural form.
-     *
-     * @return string The word in singular form.
-     */
-    public static function singularize($word)
-    {
-        if (isset(self::$cache['singularize'][$word])) {
-            return self::$cache['singularize'][$word];
-        }
-
-        if (!isset(self::$singular['merged']['uninflected'])) {
-            self::$singular['merged']['uninflected'] = array_merge(
-                self::$singular['uninflected'],
-                self::$uninflected
-            );
-        }
-
-        if (!isset(self::$singular['merged']['irregular'])) {
-            self::$singular['merged']['irregular'] = array_merge(
-                self::$singular['irregular'],
-                array_flip(self::$plural['irregular'])
-            );
-        }
-
-        if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) {
-            self::$singular['cacheUninflected'] = '(?:' . join('|', self::$singular['merged']['uninflected']) . ')';
-            self::$singular['cacheIrregular'] = '(?:' . join('|', array_keys(self::$singular['merged']['irregular'])) . ')';
-        }
-
-        if (preg_match('/(.*)\\b(' . self::$singular['cacheIrregular'] . ')$/i', $word, $regs)) {
-            self::$cache['singularize'][$word] = $regs[1] . substr($word, 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
-            
-            return self::$cache['singularize'][$word];
-        }
-
-        if (preg_match('/^(' . self::$singular['cacheUninflected'] . ')$/i', $word, $regs)) {
-            self::$cache['singularize'][$word] = $word;
-
-            return $word;
-        }
-
-        foreach (self::$singular['rules'] as $rule => $replacement) {
-            if (preg_match($rule, $word)) {
-                self::$cache['singularize'][$word] = preg_replace($rule, $replacement, $word);
-
-                return self::$cache['singularize'][$word];
-            }
-        }
-
-        self::$cache['singularize'][$word] = $word;
-
-        return $word;
-    }
-}
diff --git a/vendor/doctrine/inflector/phpunit.xml.dist b/vendor/doctrine/inflector/phpunit.xml.dist
deleted file mode 100644
index ef07faa..0000000
--- a/vendor/doctrine/inflector/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +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/Doctrine/Tests/TestInit.php"
->
-    <testsuites>
-        <testsuite name="Doctrine Inflector Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-    
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-</phpunit>
diff --git a/vendor/doctrine/instantiator/.gitignore b/vendor/doctrine/instantiator/.gitignore
deleted file mode 100644
index e3e368d..0000000
--- a/vendor/doctrine/instantiator/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-phpunit.xml
-composer.lock
-build
-vendor
-coverage.clover
diff --git a/vendor/doctrine/instantiator/.scrutinizer.yml b/vendor/doctrine/instantiator/.scrutinizer.yml
deleted file mode 100644
index aad5e40..0000000
--- a/vendor/doctrine/instantiator/.scrutinizer.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-before_commands:
-    - "composer install --prefer-source"
-
-tools:
-    external_code_coverage:
-        timeout: 600
-    php_code_coverage:
-        enabled: true
-        test_command: ./vendor/bin/phpunit
-    php_code_sniffer:
-        enabled: true
-        config:
-            standard: PSR2
-        filter:
-            paths: ["src/*", "tests/*"]
-    php_cpd:
-        enabled: true
-        excluded_dirs: ["build/*", "tests", "vendor"]
-    php_cs_fixer:
-        enabled: true
-        config:
-            level: all
-        filter:
-            paths: ["src/*", "tests/*"]
-    php_loc:
-        enabled: true
-        excluded_dirs: ["build", "tests", "vendor"]
-    php_mess_detector:
-        enabled: true
-        config:
-            ruleset: phpmd.xml.dist
-            design_rules: { eval_expression: false }
-        filter:
-            paths: ["src/*"]
-    php_pdepend:
-        enabled: true
-        excluded_dirs: ["build", "tests", "vendor"]
-    php_analyzer:
-        enabled: true
-        filter:
-            paths: ["src/*", "tests/*"]
-    php_hhvm:
-        enabled: true
-        filter:
-            paths: ["src/*", "tests/*"]
-    sensiolabs_security_checker: true
diff --git a/vendor/doctrine/instantiator/.travis.install.sh b/vendor/doctrine/instantiator/.travis.install.sh
deleted file mode 100755
index 2819188..0000000
--- a/vendor/doctrine/instantiator/.travis.install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -x
-if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] || [ "$TRAVIS_PHP_VERSION" = 'hhvm-nightly' ] ; then
-    curl -sS https://getcomposer.org/installer > composer-installer.php
-    hhvm composer-installer.php
-    hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar update --prefer-source
-elif [ "$TRAVIS_PHP_VERSION" = '5.3.3' ] ; then
-    composer self-update
-    composer update --prefer-source --no-dev
-    composer dump-autoload
-else
-    composer self-update
-    composer update --prefer-source
-fi
diff --git a/vendor/doctrine/instantiator/.travis.yml b/vendor/doctrine/instantiator/.travis.yml
deleted file mode 100644
index 7f1ec5f..0000000
--- a/vendor/doctrine/instantiator/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - ./.travis.install.sh
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then PHPUNIT_FLAGS="--coverage-clover coverage.clover"; else PHPUNIT_FLAGS=""; fi
-
-script:
-  - if [ $TRAVIS_PHP_VERSION = '5.3.3' ]; then phpunit; fi
-  - if [ $TRAVIS_PHP_VERSION != '5.3.3' ]; then ./vendor/bin/phpunit $PHPUNIT_FLAGS; fi
-  - if [ $TRAVIS_PHP_VERSION != '5.3.3' ]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/; fi
-  - if [[ $TRAVIS_PHP_VERSION != '5.3.3' && $TRAVIS_PHP_VERSION != '5.4.29' && $TRAVIS_PHP_VERSION != '5.5.13' ]]; then php -n ./vendor/bin/athletic -p ./tests/DoctrineTest/InstantiatorPerformance/ -f GroupedFormatter; fi
-
-after_script:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
diff --git a/vendor/doctrine/instantiator/CONTRIBUTING.md b/vendor/doctrine/instantiator/CONTRIBUTING.md
deleted file mode 100644
index 75b84b2..0000000
--- a/vendor/doctrine/instantiator/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributing
-
- * Coding standard for the project is [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
- * The project will follow strict [object calisthenics](http://www.slideshare.net/guilhermeblanco/object-calisthenics-applied-to-php)
- * Any contribution must provide tests for additional introduced conditions
- * Any un-confirmed issue needs a failing test case before being accepted
- * Pull requests must be sent from a new hotfix/feature branch, not from `master`.
-
-## Installation
-
-To install the project and run the tests, you need to clone it first:
-
-```sh
-$ git clone git://github.com/doctrine/instantiator.git
-```
-
-You will then need to run a composer installation:
-
-```sh
-$ cd Instantiator
-$ curl -s https://getcomposer.org/installer | php
-$ php composer.phar update
-```
-
-## Testing
-
-The PHPUnit version to be used is the one installed as a dev- dependency via composer:
-
-```sh
-$ ./vendor/bin/phpunit
-```
-
-Accepted coverage for new contributions is 80%. Any contribution not satisfying this requirement 
-won't be merged.
-
diff --git a/vendor/doctrine/instantiator/LICENSE b/vendor/doctrine/instantiator/LICENSE
deleted file mode 100644
index 4d983d1..0000000
--- a/vendor/doctrine/instantiator/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 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/vendor/doctrine/instantiator/README.md b/vendor/doctrine/instantiator/README.md
deleted file mode 100644
index 393ec7c..0000000
--- a/vendor/doctrine/instantiator/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Instantiator
-
-This library provides a way of avoiding usage of constructors when instantiating PHP classes.
-
-[![Build Status](https://travis-ci.org/doctrine/instantiator.svg?branch=master)](https://travis-ci.org/doctrine/instantiator)
-[![Code Coverage](https://scrutinizer-ci.com/g/doctrine/instantiator/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/doctrine/instantiator/?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/doctrine/instantiator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/doctrine/instantiator/?branch=master)
-[![Dependency Status](https://www.versioneye.com/package/php--doctrine--instantiator/badge.svg)](https://www.versioneye.com/package/php--doctrine--instantiator)
-[![HHVM Status](http://hhvm.h4cc.de/badge/doctrine/instantiator.png)](http://hhvm.h4cc.de/package/doctrine/instantiator)
-
-[![Latest Stable Version](https://poser.pugx.org/doctrine/instantiator/v/stable.png)](https://packagist.org/packages/doctrine/instantiator)
-[![Latest Unstable Version](https://poser.pugx.org/doctrine/instantiator/v/unstable.png)](https://packagist.org/packages/doctrine/instantiator)
-
-## Installation
-
-The suggested installation method is via [composer](https://getcomposer.org/):
-
-```sh
-php composer.phar require "doctrine/instantiator:~1.0.3"
-```
-
-## Usage
-
-The instantiator is able to create new instances of any class without using the constructor or any API of the class
-itself:
-
-```php
-$instantiator = new \Doctrine\Instantiator\Instantiator();
-
-$instance = $instantiator->instantiate('My\\ClassName\\Here');
-```
-
-## Contributing
-
-Please read the [CONTRIBUTING.md](CONTRIBUTING.md) contents if you wish to help out!
-
-## Credits
-
-This library was migrated from [ocramius/instantiator](https://github.com/Ocramius/Instantiator), which
-has been donated to the doctrine organization, and which is now deprecated in favour of this package.
diff --git a/vendor/doctrine/instantiator/composer.json b/vendor/doctrine/instantiator/composer.json
deleted file mode 100644
index 4823890..0000000
--- a/vendor/doctrine/instantiator/composer.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name":              "doctrine/instantiator",
-    "description":       "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-    "type":              "library",
-    "license":           "MIT",
-    "homepage":          "https://github.com/doctrine/instantiator",
-    "keywords":          [
-        "instantiate",
-        "constructor"
-    ],
-    "authors": [
-        {
-            "name":     "Marco Pivetta",
-            "email":    "ocramius@gmail.com",
-            "homepage": "http://ocramius.github.com/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3,<8.0-DEV"
-    },
-    "require-dev": {
-        "ext-phar":                  "*",
-        "ext-pdo":                   "*",
-        "phpunit/phpunit":           "~4.0",
-        "squizlabs/php_codesniffer": "~2.0",
-        "athletic/athletic":         "~0.1.8"
-    },
-    "autoload": {
-        "psr-4": {
-            "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-        }
-    },
-    "autoload-dev": {
-        "psr-0": {
-            "DoctrineTest\\InstantiatorPerformance\\": "tests",
-            "DoctrineTest\\InstantiatorTest\\": "tests",
-            "DoctrineTest\\InstantiatorTestAsset\\": "tests"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/instantiator/phpmd.xml.dist b/vendor/doctrine/instantiator/phpmd.xml.dist
deleted file mode 100644
index 8254105..0000000
--- a/vendor/doctrine/instantiator/phpmd.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ruleset
-    name="Instantiator rules"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
->
-    <rule ref="rulesets/cleancode.xml">
-        <!-- static access is used for caching purposes -->
-        <exclude name="StaticAccess"/>
-    </rule>
-    <rule ref="rulesets/codesize.xml"/>
-    <rule ref="rulesets/controversial.xml"/>
-    <rule ref="rulesets/design.xml"/>
-    <rule ref="rulesets/naming.xml"/>
-    <rule ref="rulesets/unusedcode.xml"/>
-    <rule
-        name="NPathComplexity"
-        message="The {0} {1}() has an NPath complexity of {2}. The configured NPath complexity threshold is {3}."
-        class="PHP_PMD_Rule_Design_NpathComplexity"
-    >
-        <properties>
-            <property name="minimum" description="The npath reporting threshold" value="10"/>
-        </properties>
-    </rule>
-</ruleset>
diff --git a/vendor/doctrine/instantiator/phpunit.xml.dist b/vendor/doctrine/instantiator/phpunit.xml.dist
deleted file mode 100644
index 0a8d570..0000000
--- a/vendor/doctrine/instantiator/phpunit.xml.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<phpunit
-    bootstrap="./vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    verbose="true"
-    stopOnFailure="false"
-    processIsolation="false"
-    backupGlobals="false"
-    syntaxCheck="true"
->
-    <testsuite name="Doctrine\Instantiator tests">
-        <directory>./tests/DoctrineTest/InstantiatorTest</directory>
-    </testsuite>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php
deleted file mode 100644
index 3065375..0000000
--- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Instantiator\Exception;
-
-/**
- * Base exception marker interface for the instantiator component
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php
deleted file mode 100644
index ea8d28c..0000000
--- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Instantiator\Exception;
-
-use InvalidArgumentException as BaseInvalidArgumentException;
-use ReflectionClass;
-
-/**
- * Exception for invalid arguments provided to the instantiator
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
-{
-    /**
-     * @param string $className
-     *
-     * @return self
-     */
-    public static function fromNonExistingClass($className)
-    {
-        if (interface_exists($className)) {
-            return new self(sprintf('The provided type "%s" is an interface, and can not be instantiated', $className));
-        }
-
-        if (PHP_VERSION_ID >= 50400 && trait_exists($className)) {
-            return new self(sprintf('The provided type "%s" is a trait, and can not be instantiated', $className));
-        }
-
-        return new self(sprintf('The provided class "%s" does not exist', $className));
-    }
-
-    /**
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return self
-     */
-    public static function fromAbstractClass(ReflectionClass $reflectionClass)
-    {
-        return new self(sprintf(
-            'The provided class "%s" is abstract, and can not be instantiated',
-            $reflectionClass->getName()
-        ));
-    }
-}
diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php
deleted file mode 100644
index 1681e56..0000000
--- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Instantiator\Exception;
-
-use Exception;
-use ReflectionClass;
-use UnexpectedValueException as BaseUnexpectedValueException;
-
-/**
- * Exception for given parameters causing invalid/unexpected state on instantiation
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class UnexpectedValueException extends BaseUnexpectedValueException implements ExceptionInterface
-{
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param Exception       $exception
-     *
-     * @return self
-     */
-    public static function fromSerializationTriggeredException(ReflectionClass $reflectionClass, Exception $exception)
-    {
-        return new self(
-            sprintf(
-                'An exception was raised while trying to instantiate an instance of "%s" via un-serialization',
-                $reflectionClass->getName()
-            ),
-            0,
-            $exception
-        );
-    }
-
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param string          $errorString
-     * @param int             $errorCode
-     * @param string          $errorFile
-     * @param int             $errorLine
-     *
-     * @return UnexpectedValueException
-     */
-    public static function fromUncleanUnSerialization(
-        ReflectionClass $reflectionClass,
-        $errorString,
-        $errorCode,
-        $errorFile,
-        $errorLine
-    ) {
-        return new self(
-            sprintf(
-                'Could not produce an instance of "%s" via un-serialization, since an error was triggered '
-                . 'in file "%s" at line "%d"',
-                $reflectionClass->getName(),
-                $errorFile,
-                $errorLine
-            ),
-            0,
-            new Exception($errorString, $errorCode)
-        );
-    }
-}
diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php
deleted file mode 100644
index 6d5b3b6..0000000
--- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?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\Instantiator;
-
-use Closure;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
-use Doctrine\Instantiator\Exception\UnexpectedValueException;
-use Exception;
-use ReflectionClass;
-
-/**
- * {@inheritDoc}
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-final class Instantiator implements InstantiatorInterface
-{
-    /**
-     * Markers used internally by PHP to define whether {@see \unserialize} should invoke
-     * the method {@see \Serializable::unserialize()} when dealing with classes implementing
-     * the {@see \Serializable} interface.
-     */
-    const SERIALIZATION_FORMAT_USE_UNSERIALIZER   = 'C';
-    const SERIALIZATION_FORMAT_AVOID_UNSERIALIZER = 'O';
-
-    /**
-     * @var \Closure[] of {@see \Closure} instances used to instantiate specific classes
-     */
-    private static $cachedInstantiators = array();
-
-    /**
-     * @var object[] of objects that can directly be cloned
-     */
-    private static $cachedCloneables = array();
-
-    /**
-     * {@inheritDoc}
-     */
-    public function instantiate($className)
-    {
-        if (isset(self::$cachedCloneables[$className])) {
-            return clone self::$cachedCloneables[$className];
-        }
-
-        if (isset(self::$cachedInstantiators[$className])) {
-            $factory = self::$cachedInstantiators[$className];
-
-            return $factory();
-        }
-
-        return $this->buildAndCacheFromFactory($className);
-    }
-
-    /**
-     * Builds the requested object and caches it in static properties for performance
-     *
-     * @param string $className
-     *
-     * @return object
-     */
-    private function buildAndCacheFromFactory($className)
-    {
-        $factory  = self::$cachedInstantiators[$className] = $this->buildFactory($className);
-        $instance = $factory();
-
-        if ($this->isSafeToClone(new ReflectionClass($instance))) {
-            self::$cachedCloneables[$className] = clone $instance;
-        }
-
-        return $instance;
-    }
-
-    /**
-     * Builds a {@see \Closure} capable of instantiating the given $className without
-     * invoking its constructor.
-     *
-     * @param string $className
-     *
-     * @return Closure
-     */
-    private function buildFactory($className)
-    {
-        $reflectionClass = $this->getReflectionClass($className);
-
-        if ($this->isInstantiableViaReflection($reflectionClass)) {
-            return function () use ($reflectionClass) {
-                return $reflectionClass->newInstanceWithoutConstructor();
-            };
-        }
-
-        $serializedString = sprintf(
-            '%s:%d:"%s":0:{}',
-            $this->getSerializationFormat($reflectionClass),
-            strlen($className),
-            $className
-        );
-
-        $this->checkIfUnSerializationIsSupported($reflectionClass, $serializedString);
-
-        return function () use ($serializedString) {
-            return unserialize($serializedString);
-        };
-    }
-
-    /**
-     * @param string $className
-     *
-     * @return ReflectionClass
-     *
-     * @throws InvalidArgumentException
-     */
-    private function getReflectionClass($className)
-    {
-        if (! class_exists($className)) {
-            throw InvalidArgumentException::fromNonExistingClass($className);
-        }
-
-        $reflection = new ReflectionClass($className);
-
-        if ($reflection->isAbstract()) {
-            throw InvalidArgumentException::fromAbstractClass($reflection);
-        }
-
-        return $reflection;
-    }
-
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param string          $serializedString
-     *
-     * @throws UnexpectedValueException
-     *
-     * @return void
-     */
-    private function checkIfUnSerializationIsSupported(ReflectionClass $reflectionClass, $serializedString)
-    {
-        set_error_handler(function ($code, $message, $file, $line) use ($reflectionClass, & $error) {
-            $error = UnexpectedValueException::fromUncleanUnSerialization(
-                $reflectionClass,
-                $message,
-                $code,
-                $file,
-                $line
-            );
-        });
-
-        $this->attemptInstantiationViaUnSerialization($reflectionClass, $serializedString);
-
-        restore_error_handler();
-
-        if ($error) {
-            throw $error;
-        }
-    }
-
-    /**
-     * @param ReflectionClass $reflectionClass
-     * @param string          $serializedString
-     *
-     * @throws UnexpectedValueException
-     *
-     * @return void
-     */
-    private function attemptInstantiationViaUnSerialization(ReflectionClass $reflectionClass, $serializedString)
-    {
-        try {
-            unserialize($serializedString);
-        } catch (Exception $exception) {
-            restore_error_handler();
-
-            throw UnexpectedValueException::fromSerializationTriggeredException($reflectionClass, $exception);
-        }
-    }
-
-    /**
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return bool
-     */
-    private function isInstantiableViaReflection(ReflectionClass $reflectionClass)
-    {
-        if (\PHP_VERSION_ID >= 50600) {
-            return ! ($this->hasInternalAncestors($reflectionClass) && $reflectionClass->isFinal());
-        }
-
-        return \PHP_VERSION_ID >= 50400 && ! $this->hasInternalAncestors($reflectionClass);
-    }
-
-    /**
-     * Verifies whether the given class is to be considered internal
-     *
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return bool
-     */
-    private function hasInternalAncestors(ReflectionClass $reflectionClass)
-    {
-        do {
-            if ($reflectionClass->isInternal()) {
-                return true;
-            }
-        } while ($reflectionClass = $reflectionClass->getParentClass());
-
-        return false;
-    }
-
-    /**
-     * Verifies if the given PHP version implements the `Serializable` interface serialization
-     * with an incompatible serialization format. If that's the case, use serialization marker
-     * "C" instead of "O".
-     *
-     * @link http://news.php.net/php.internals/74654
-     *
-     * @param ReflectionClass $reflectionClass
-     *
-     * @return string the serialization format marker, either self::SERIALIZATION_FORMAT_USE_UNSERIALIZER
-     *                or self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER
-     */
-    private function getSerializationFormat(ReflectionClass $reflectionClass)
-    {
-        if ($this->isPhpVersionWithBrokenSerializationFormat()
-            && $reflectionClass->implementsInterface('Serializable')
-        ) {
-            return self::SERIALIZATION_FORMAT_USE_UNSERIALIZER;
-        }
-
-        return self::SERIALIZATION_FORMAT_AVOID_UNSERIALIZER;
-    }
-
-    /**
-     * Checks whether the current PHP runtime uses an incompatible serialization format
-     *
-     * @return bool
-     */
-    private function isPhpVersionWithBrokenSerializationFormat()
-    {
-        return PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513;
-    }
-
-    /**
-     * Checks if a class is cloneable
-     *
-     * @param ReflectionClass $reflection
-     *
-     * @return bool
-     */
-    private function isSafeToClone(ReflectionClass $reflection)
-    {
-        if (method_exists($reflection, 'isCloneable') && ! $reflection->isCloneable()) {
-            return false;
-        }
-
-        // not cloneable if it implements `__clone`, as we want to avoid calling it
-        return ! $reflection->hasMethod('__clone');
-    }
-}
diff --git a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php b/vendor/doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php
deleted file mode 100644
index b665bea..0000000
--- a/vendor/doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Instantiator;
-
-/**
- * Instantiator provides utility methods to build objects without invoking their constructors
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-interface InstantiatorInterface
-{
-    /**
-     * @param string $className
-     *
-     * @return object
-     *
-     * @throws \Doctrine\Instantiator\Exception\ExceptionInterface
-     */
-    public function instantiate($className);
-}
diff --git a/vendor/doctrine/lexer/LICENSE b/vendor/doctrine/lexer/LICENSE
deleted file mode 100644
index 5e781fc..0000000
--- a/vendor/doctrine/lexer/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2013 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/vendor/doctrine/lexer/README.md b/vendor/doctrine/lexer/README.md
deleted file mode 100644
index 66f4430..0000000
--- a/vendor/doctrine/lexer/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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).
diff --git a/vendor/doctrine/lexer/composer.json b/vendor/doctrine/lexer/composer.json
deleted file mode 100644
index 8cd694c..0000000
--- a/vendor/doctrine/lexer/composer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "doctrine/lexer",
-    "type": "library",
-    "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-    "keywords": ["lexer", "parser"],
-    "homepage": "http://www.doctrine-project.org",
-    "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"
-    },
-    "autoload": {
-        "psr-0": { "Doctrine\\Common\\Lexer\\": "lib/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
deleted file mode 100644
index 399a552..0000000
--- a/vendor/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?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);
-
-        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/vendor/easyrdf/easyrdf/CHANGELOG.md b/vendor/easyrdf/easyrdf/CHANGELOG.md
deleted file mode 100644
index 1f772a0..0000000
--- a/vendor/easyrdf/easyrdf/CHANGELOG.md
+++ /dev/null
@@ -1,327 +0,0 @@
-EasyRdf 0.9.1
-=============
-
-Bug Fixes
----------
-
-* Timeout is applied to response-times, not only connection-times (see #202)
-
-EasyRdf 0.9.0
-=============
-
-Major new features
-------------------
-* Framing support in `EasyRdf_Serialiser_JsonLd`
-* JSON-LD Parser
-
-API changes
------------
-* `EasyRdf_Literal_Decimal` returns strings, instead of floats to avoid losing precision (see issue #178)
-* `EasyRdf_Literal_Decimal` requires input-strings which conform to `xs:decimal` format
-* `EasyRdf_GraphStore` supports operations over default graph now
-* `EasyRdf_Literal` typed as `xs:double` is used for PHP-floats instead of `EasyRdf_Literal_Decimal`
-* Exceptions thrown from `EasyRdf_Graph::resource()` use different message-texts now (see issue #159)
-
-Enhancements
-------------
-* Synced list of default namespaces against [RDFa Core Initial Context](http://www.w3.org/2011/rdfa-context/rdfa-1.1) rev.2014-01-17
-* Added support for empty prefixes (see issue #183)
-* `EasyRdf_Graph::newAndLoad` throws `EasyRdf_Http_Exception` in case of failure, which gives access to status and response-body. (see issue #149)
-* `EasyRdf_Graph` and `EasyRdf_Resource` have 'typesAsResources()' methods now
-
-Bug Fixes
----------
-* Fix for Turtle serialisation of FALSE (see issue #179)
-* Fix for edge-case in RDF/XML serialisation (see issue #186)
-* SPARQL-queries against endpoints which have query-params in their URL (see issue #184)
-* Float values are properly handled if locale with "other" separator is active
-* Fixed parsing of Turtle-documents with higher utf-8 characters (see issue #195)
-* Namespace-prefixes are compliant with RDFXML QName spec (see issue #185)
-* `EasyRdf_Namespace` won't generate "short" names with "/" in them anymore (see issue #115)
-* `EasyRdf_Parser_RdfXml` respects "base" specified for the document (see issue #157)
-* HTML documents are correctly detected now, not as "n-triples" (see issue #206)
-* Accept-headers are formatted in locale-independent fashion now (see issue #208)
-
-
-EasyRdf 0.8.0
-=============
-
-Major new features
-------------------
-* Now PSR-2 compliant
-* Added RDFa parser
-* Added SPARQL Update support to `EasyRdf_Sparql_Client`
-
-API changes
------------
-* `is_a()` has been renamed to `isA()`
-* `isBnode()` has been renamed to `isBNode()`
-* `getNodeId()` has been renamed to `getBNodeId()`
-* Added a `$value` property to `hasProperty()`
-* Renamed `toArray()` to `toRdfPhp()`
-* Renamed `count()` to `countValues()` in `EasyRdf_Graph` and `EasyRdf_Resource`
-* Made passing a URI to `delete()` behave more like `all()` and `get()` - you must enclose in `<>`
-* `dump(true)` has changed to `dump('html')`
-* `getUri()` in `EasyRdf_Sparql_Client` has been renamed to `getQueryUri()`
-
-Enhancements
-------------
-* Added `EasyRdf_Container` class to help iterate through `rdf:Alt`, `rdf:Bag` and `rdf:Seq`
-* Added `EasyRdf_Collection` class to help iterate through `rdf:List`
-* Added `EasyRdf_Literal_HTML` and `EasyRdf_Literal_XML`
-* Changed formatting of `xsd:dateTime` from `DateTime::ISO8601` to `DateTime::ATOM`
-* Added `rss:title` to the list of properties that `label()` will check for
-* Added support for serialising containers to the RDF/XML serialiser
-* Added getGraph method to `EasyRdf_Resource`
-* Turtle parser improvements
-* Added the `application/n-triples` MIME type for the N-Triples format
-* Added support to `EasyRdf_Namespace` for expanding `a` to `rdf:type`
-* Added `listNamedGraphs()` function to `EasyRdf_Sparql_Client`
-* Added line and column number to exceptions in the built-in parsers
-
-Bug Fixes
----------
-* Fixed bug in `EasyRdf_Namespace::expand()` (see issue #114)
-* Fix for dumping SPARQL SELECT query with unbound result (see issue #112)
-* Sesame compatibility : avoid duplicate Content-Length header
-* Fix for for passing objects of type DateTime to $graph->add() (see issue #119)
-* Fix for SPARQL queries longer than 2KB (see issue #85)
-* Fix for dumping literal with unshortenable datatype uri (see issue #120)
-* Fix for getting default mime type or extension when there isn't one
-* Fix for missing trailing slash the HTTP client
-
-
-EasyRdf 0.7.2
-=============
-
-Enhancements
-------------
-* Removed automatic registration of ARC2 and librdf parsers and serialisers
-** You must now specifically choose the parser or serialiser
-* Refactored `EasyRdf_Literal` with datatypes so that it preserves exact value
-* Changed Turtle serialiser to not escape Unicode characters unnecessarily
-* Fix for escaping literals objects in Turtle serialiser
-* Added a new static function `newAndLoad()` to `EasyRdf_Graph`
-* Added setters for each of the components of the URI to the class `EasyRdf_ParsedUri`
-* Added option to the converter example, to allow raw output, without any HTML
-
-Bug Fixes
----------
-* Fixed broken Redland parser (thanks to Jon Phipps)
-* Fix for serialising two bnodes that reference each other in Turtle
-* Added support for parsing literals with single quotes in Turtle
-* Removed require for EasyRdf/Exception.php
-* Fix for serialising `EasyRdf_Literal_DateTime` to Turtle
-* Fix for serialising Turtle literals with a shorthand syntax
-* Several typo fixes and minor corrections
-
-
-EasyRdf 0.7.1
-=============
-
-Enhancements
-------------
-* Changed minimum version of PHPUnit to 3.5.15
-* Added RDFa namespace
-* Added Open Graph Protocol namespace
-* Made improvements to formatting of the Turtle serialiser
-* Added new splitUri() function to EasyRdf_Namespace
-* Made improvements to format guessing
-
-Bug Fixes
----------
-* Fix for RDF/XML parser not returning the number of triples
-* Added re-mapping of b-nodes to N-Triples and Redland parsers
-
-
-EasyRdf 0.7.0
-=============
-
-API Changes
------------
-* You must now wrap full property URIs in angle brackets
-
-Major new features
-------------------
-* Added a new pure-PHP Turtle parser
-* Added basic property-path support for traversing graphs
-* Added support for serialising to the GraphViz dot format (and generating images)
-* Added a new class `EasyRdf_ParsedUri` - a RFC3986 compliant URI parser
-
-Enhancements
-------------
-* The load() function in `EasyRdf_Graph` no-longer takes a $data argument
-* The parse() and load() methods, now return the number of triples parsed
-* Added count() method to `EasyRdf_Resource` and `EasyRdf_Graph`
-* Added localName() method to `EasyRdf_Resource`
-* Added htmlLink() method to `EasyRdf_Resource`
-* Added methods deleteResource() and deleteLiteral() to `EasyRdf_Graph`
-* Added support for guessing the file format based on the file extension
-* Performance improvements to built-in serialisers
-
-Environment changes
--------------------
-* Added PHP Composer description to the project
-* Now properly PSR-0 autoloader compatible
-* New minimum version of PHP is 5.2.8
-* Changed test suite to require PHPUnit 3.6
-* Changed from Phing to GNU Make based build system
-* Added automated testing of the examples
-
-Bug Fixes
----------
-* Fix for loading https:// URLs
-* Fix for storing the value 0 in a `EasyRdf_Graph`
-* Fix for HTTP servers that return relative URIs in the Location header
-* Fix for Literals with languages in the SPARQL Query Results XML Format
-* Fix for SPARQL servers that put extra whitespace into the XML result
-* Fix for the httpget.php example in PHP 5.4+
-
-
-EasyRdf 0.6.3
-=============
-* Added $graph->parseFile() method.
-* Added support for SSL (https) to the built-in HTTP client
-* Fixes for HTTP responses with a charset parameter in the Content Type.
-* Improved error handling and empty documents in JSON and rapper parsers.
-* Added connivence class for xsd:hexBinary literals:
-  - `EasyRdf_Literal_HexBinary`
-* Made EasyRdf more tolerant of 'badly serialised bnodes'
-* Fix for SPARQL servers that return charset in the MIME Type.
-* Fix for using xml:lang in SPARQL 1.1 Query Results JSON Format
-* Changed datetime ISO formatting to use 'Z' instead of +0000 for UTC dateTimes
-* Added the namespace for 'The Cert Ontology' to EasyRdf.
-
-
-EasyRdf 0.6.2
-=============
-* Bug fix for missing triples in the RDF/XML serialiser.
-* Added countTriples() method to `EasyRdf_Graph`.
-* Re-factored the mechanism for mapping RDF datatypes to PHP classes.
-* Added subclasses of `EasyRdf_Literal` for various XSD datatypes:
-  - `EasyRdf_Literal_Boolean`
-  - `EasyRdf_Literal_Date`
-  - `EasyRdf_Literal_DateTime`
-  - `EasyRdf_Literal_Decimal`
-  - `EasyRdf_Literal_Integer`
-* Made the Redland based parser write triples directly to `EasyRdf_Graph`
-* Added support for datatypes and languages in the `EasyRdf_Parser_Ntriples` parser.
-* Fix for parsing XML Literals in RDF/XML
-
-
-EasyRdf 0.6.1
-=============
-* Updated API documentation for new classes and methods added in 0.6.0
-* Added a description to the top of the source code for each example.
-* Changed the generated bnode identifier names from eidXXX to genidXXX.
-* Implemented inlining of resources in the RDF/XML serialiser.
-* Added new reversePropertyUris() method to `EasyRdf_Graph` and `EasyRdf_Resource`.
-* Added addType() and setType() to `EasyRdf_Resource`.
-* Added a textarea to the converter example.
-* Added support for parsing the json-triples format.
-* Renamed `EasyRdf_SparqlClient` to `EasyRdf_Sparql_Client`
-* Renamed `EasyRdf_SparqlResult` to `EasyRdf_Sparql_Result`
-* Fix for $graph->isEmpty() failing after adding and deleting some triples
-* Added new `EasyRdf_DatatypeMapper` class that allows you to map RDF datatypes to PHP classes.
-* Renamed guessDatatype() to getDatatypeForValue() in `EasyRdf_Literal`.
-* Added getResource() and allResources() to `EasyRdf_Graph` and `EasyRdf_Resource`
-* Implemented value casting in literals based on the datatype.
-
-
-EasyRdf 0.6.0
-=============
-* Major re-factor of the way data is stored internally in `EasyRdf_Graph`.
-* Parsing and serialising is now much faster and will enable further optimisations.
-* API is mostly backwards-compatible apart from:
-  - Changed inverse property operator from - to ^ to match Sparql 1.1 property paths.
-  - New `EasyRdf_Graphs` will not automatically be loaded on creation
-    You must now call $graph->load();
-  - Setting the default HTTP client is now part of a new `EasyRdf_Http` class
-  - It is no-longer possible to add multiple properties at once using an associative array.
-* Added methods to `EasyRdf_Graph` for direct manipulation of triples.
-* Added new `EasyRdf_GraphStore` - class for fetching, saving and deleting graphs to a Graph Store over HTTP.
-* Added new `EasyRdf_SparqlClient` and `EasyRdf_SparqlResult` - class for querying a SPARQL endpoint over HTTP.
-* Added q values for each Mime-Type associated with an `EasyRdf_Format`.
-* New example demonstrating integration with the Zend Framework.
-* New `EasyRdf_HTTP_MockClient` class makes testing easier.
-
-
-EasyRdf 0.5.2
-=============
-* Added a built-in RDF/XML parser
-* Made the RDF/XML serialiser use the rdf:type to open tags
-* Added support for comments in the N-Triples parser
-* Added new resolveUriReference() function to `EasyRdf_Utils`
-* Added the application/rdf+json and text/rdf+n3 mime types
-
-
-EasyRdf 0.5.1
-=============
-* Bug fixes for PHP 5.2
-
-
-EasyRdf 0.5.0
-=============
-* Added support for inverse properties.
-* Updated RDF/XML and Turtle serialisers to create new namespaces if possible.
-* Added new is_a($type) method to `EasyRdf_Resource`.
-* Added support for passing an array of properties to the get() method.
-* Added primaryTopic() method to `EasyRdf_Resource`.
-* The function label() in `EasyRdf_Resource` will no longer attempted to shorten the URI,
-  if there is no label available.
-* Resource types are now stored as resources, instead of shortened URIs.
-* Added support for deleting a specific value for property to `EasyRdf_Resource`.
-* Properties and datatypes are now stored as full URIs and not
-  converted to qnames during import.
-* Change the TypeMapper to store full URIs internally.
-* Added bibo and geo to the set of default namespaces.
-* Improved bnode links in dump format
-* Fix for converting non-string `EasyRdf_Literal` to string.
-* Created an example that resolves UK postcodes using uk-postcodes.com.
-
-
-EasyRdf 0.4.0
-=============
-* Moved source code to Github
-* Added an `EasyRdf_Literal` class
-* Added proper support for Datatypes and Languages
-* Added built-in RDF/XML serialiser
-* Added built-in Turtle serialiser
-* Added a new `EasyRdf_Format` class to deal with mime types etc.
-* finished a major refactoring of the Parser/Serialiser registration
-* removed all parsing related code from `EasyRdf_Graph`
-* Added a basic serialisation example
-* Added additional common namespaces
-* Test fixes
-
-
-EasyRdf 0.3.0
-=============
-* Generated Wiki pages from phpdoc
-* Filtering of literals by language
-* Moved parsers into `EasyRdf_Parser_XXX` namespace
-* Added support for serialisation
-* Wrote RDF generation example (foafmaker.php)
-* Added built-in ntriples parser/generator
-* Added built-in RDF/PHP serialiser
-* Added built-in RDF/JSON serialiser
-* Added SKOS and RSS to the set of default namespaces.
-
-
-EasyRdf 0.2.0
-=============
-* Added support for Redland PHP bindings
-* Added support for n-triples document type.
-* Improved blank node handing and added newBNode() method to `EasyRdf_Graph`.
-* Add option to `EasyRdf_RapperParser` to choose location of rapper command
-* Added Rails style HTML tag helpers to examples to make them simpler
-
-
-EasyRdf 0.1.0
-=============
-* First public release
-* Support for ARC2 and Rapper
-* Built-in HTTP Client
-* API Documentation
-* PHP Unit tests for every class.
-* Several usage examples
diff --git a/vendor/easyrdf/easyrdf/DEVELOPER.md b/vendor/easyrdf/easyrdf/DEVELOPER.md
deleted file mode 100644
index f9c6dac..0000000
--- a/vendor/easyrdf/easyrdf/DEVELOPER.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Contributing to EasyRdf
-=======================
-
-Contributions to the EasyRdf codebase are welcome using the usual Github pull request workflow.
-
-To run the code style checker:
-
-```
-make cs
-```
-
-You can run the PHP unit test suite with:
-
-```
-make test-lib
-```
-
-Unit tests are automatically run after being received by Github:
-http://ci.aelius.com/job/easyrdf/
-
-The tests for the examples are run separately:
-http://ci.aelius.com/job/easyrdf-examples/
-
-
-Notes
------
-
-* Please ask on the [mailing list] before starting work on any significant changes
-* Please write tests for any new features or bug fixes. The tests should be checked in the same commit as the code.
-
-[mailing list]:http://groups.google.com/group/easyrdf
diff --git a/vendor/easyrdf/easyrdf/LICENSE.md b/vendor/easyrdf/easyrdf/LICENSE.md
deleted file mode 100644
index c5e2f5d..0000000
--- a/vendor/easyrdf/easyrdf/LICENSE.md
+++ /dev/null
@@ -1,420 +0,0 @@
-LICENSE
-=======
-
-Copyright (c) 2009-2011 Nicholas J Humfrey.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
- * 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 name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
-OTHER LICENSES
-==============
-
-Parts of this program or documentation is available under different
-licensing terms. These are as following.
-
-The appendix in the documentation about RDF formats (APPENDIX A) is a
-derivative work under CC-BY-SA-3.0. It consists of two documents:
-
-1. The RDF/PHP Specification was written/edited 2008 by Ian Davis and Keith
-   Alexander
-2. The RDF/JSON Specification was written/edited 2007, 2008 by Keith
-   Alexander, Danny Ayers, Sam Tunnicliffe, Fellahst, Ian Davis and Robman
-
-These two documents have been translated 2014 into markdown by hakre.
-
-
-Creative Commons Attribution-ShareAlike 3.0 Unported
-====================================================
-
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
-ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
-INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
-a. "Adaptation" means a work based upon the Work, or upon the Work and
-other pre-existing works, such as a translation, adaptation, derivative
-work, arrangement of music or other alterations of a literary or
-artistic work, or phonogram or performance and includes cinematographic
-adaptations or any other form in which the Work may be recast,
-transformed, or adapted including in any form recognizably derived from
-the original, except that a work that constitutes a Collection will not
-be considered an Adaptation for the purpose of this License. For the
-avoidance of doubt, where the Work is a musical work, performance or
-phonogram, the synchronization of the Work in timed-relation with a
-moving image ("synching") will be considered an Adaptation for the
-purpose of this License.
-
-b. "Collection" means a collection of literary or artistic works, such
-as encyclopedias and anthologies, or performances, phonograms or
-broadcasts, or other works or subject matter other than works listed in
-Section 1(f) below, which, by reason of the selection and arrangement of
-their contents, constitute intellectual creations, in which the Work is
-included in its entirety in unmodified form along with one or more other
-contributions, each constituting separate and independent works in
-themselves, which together are assembled into a collective whole. A work
-that constitutes a Collection will not be considered an Adaptation (as
-defined below) for the purposes of this License.
-
-c. "Creative Commons Compatible License" means a license that is listed
-at http://creativecommons.org/compatiblelicenses that has been approved
-by Creative Commons as being essentially equivalent to this License,
-including, at a minimum, because that license: (i) contains terms that
-have the same purpose, meaning and effect as the License Elements of
-this License; and, (ii) explicitly permits the relicensing of
-adaptations of works made available under that license under this
-License or a Creative Commons jurisdiction license with the same License
-Elements as this License.
-
-d. "Distribute" means to make available to the public the original and
-copies of the Work or Adaptation, as appropriate, through sale or other
-transfer of ownership.
-
-e. "License Elements" means the following high-level license attributes
-as selected by Licensor and indicated in the title of this License:
-Attribution, ShareAlike.
-
-f. "Licensor" means the individual, individuals, entity or entities that
-offer(s) the Work under the terms of this License.
-
-g. "Original Author" means, in the case of a literary or artistic work,
-the individual, individuals, entity or entities who created the Work or
-if no individual or entity can be identified, the publisher; and in
-addition (i) in the case of a performance the actors, singers,
-musicians, dancers, and other persons who act, sing, deliver, declaim,
-play in, interpret or otherwise perform literary or artistic works or
-expressions of folklore; (ii) in the case of a phonogram the producer
-being the person or legal entity who first fixes the sounds of a
-performance or other sounds; and, (iii) in the case of broadcasts, the
-organization that transmits the broadcast.
-
-h. "Work" means the literary and/or artistic work offered under the
-terms of this License including without limitation any production in the
-literary, scientific and artistic domain, whatever may be the mode or
-form of its expression including digital form, such as a book, pamphlet
-and other writing; a lecture, address, sermon or other work of the same
-nature; a dramatic or dramatico-musical work; a choreographic work or
-entertainment in dumb show; a musical composition with or without words;
-a cinematographic work to which are assimilated works expressed by a
-process analogous to cinematography; a work of drawing, painting,
-architecture, sculpture, engraving or lithography; a photographic work
-to which are assimilated works expressed by a process analogous to
-photography; a work of applied art; an illustration, map, plan, sketch
-or three-dimensional work relative to geography, topography,
-architecture or science; a performance; a broadcast; a phonogram; a
-compilation of data to the extent it is protected as a copyrightable
-work; or a work performed by a variety or circus performer to the extent
-it is not otherwise considered a literary or artistic work.
-
-i. "You" means an individual or entity exercising rights under this
-License who has not previously violated the terms of this License with
-respect to the Work, or who has received express permission from the
-Licensor to exercise rights under this License despite a previous
-violation.
-
-j. "Publicly Perform" means to perform public recitations of the Work
-and to communicate to the public those public recitations, by any means
-or process, including by wire or wireless means or public digital
-performances; to make available to the public Works in such a way that
-members of the public may access these Works from a place and at a place
-individually chosen by them; to perform the Work to the public by any
-means or process and the communication to the public of the performances
-of the Work, including by public digital performance; to broadcast and
-rebroadcast the Work by any means including signs, sounds or images.
-
-k. "Reproduce" means to make copies of the Work by any means including
-without limitation by sound or visual recordings and the right of
-fixation and reproducing fixations of the Work, including storage of a
-protected performance or phonogram in digital form or other electronic
-medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
-a. to Reproduce the Work, to incorporate the Work into one or more
-Collections, and to Reproduce the Work as incorporated in the
-Collections;
-
-b. to create and Reproduce Adaptations provided that any such
-Adaptation, including any translation in any medium, takes reasonable
-steps to clearly label, demarcate or otherwise identify that changes
-were made to the original Work. For example, a translation could be
-marked "The original work was translated from English to Spanish," or a
-modification could indicate "The original work has been modified.";
-
-c. to Distribute and Publicly Perform the Work including as incorporated
-in Collections; and,
-
-d. to Distribute and Publicly Perform Adaptations.
-
-e. For the avoidance of doubt:
-
-i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-which the right to collect royalties through any statutory or compulsory
-licensing scheme cannot be waived, the Licensor reserves the exclusive
-right to collect such royalties for any exercise by You of the rights
-granted under this License;
-
-ii. Waivable Compulsory License Schemes. In those jurisdictions in which
-the right to collect royalties through any statutory or compulsory
-licensing scheme can be waived, the Licensor waives the exclusive right
-to collect such royalties for any exercise by You of the rights granted
-under this License; and,
-
-iii. Voluntary License Schemes. The Licensor waives the right to collect
-royalties, whether individually or, in the event that the Licensor is a
-member of a collecting society that administers voluntary licensing
-schemes, via that society, from any exercise by You of the rights
-granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights
-in other media and formats. Subject to Section 8(f), all rights not
-expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly
-made subject to and limited by the following restrictions:
-
-a. You may Distribute or Publicly Perform the Work only under the terms
-of this License. You must include a copy of, or the Uniform Resource
-Identifier (URI) for, this License with every copy of the Work You
-Distribute or Publicly Perform. You may not offer or impose any terms on
-the Work that restrict the terms of this License or the ability of the
-recipient of the Work to exercise the rights granted to that recipient
-under the terms of the License. You may not sublicense the Work. You
-must keep intact all notices that refer to this License and to the
-disclaimer of warranties with every copy of the Work You Distribute or
-Publicly Perform. When You Distribute or Publicly Perform the Work, You
-may not impose any effective technological measures on the Work that
-restrict the ability of a recipient of the Work from You to exercise the
-rights granted to that recipient under the terms of the License. This
-Section 4(a) applies to the Work as incorporated in a Collection, but
-this does not require the Collection apart from the Work itself to be
-made subject to the terms of this License. If You create a Collection,
-upon notice from any Licensor You must, to the extent practicable,
-remove from the Collection any credit as required by Section 4(c), as
-requested. If You create an Adaptation, upon notice from any Licensor
-You must, to the extent practicable, remove from the Adaptation any
-credit as required by Section 4(c), as requested.
-
-b. You may Distribute or Publicly Perform an Adaptation only under the
-terms of: (i) this License; (ii) a later version of this License with
-the same License Elements as this License; (iii) a Creative Commons
-jurisdiction license (either this or a later license version) that
-contains the same License Elements as this License (e.g.,
-Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
-License. If you license the Adaptation under one of the licenses
-mentioned in (iv), you must comply with the terms of that license. If
-you license the Adaptation under the terms of any of the licenses
-mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
-comply with the terms of the Applicable License generally and the
-following provisions: (I) You must include a copy of, or the URI for,
-the Applicable License with every copy of each Adaptation You Distribute
-or Publicly Perform; (II) You may not offer or impose any terms on the
-Adaptation that restrict the terms of the Applicable License or the
-ability of the recipient of the Adaptation to exercise the rights
-granted to that recipient under the terms of the Applicable License;
-(III) You must keep intact all notices that refer to the Applicable
-License and to the disclaimer of warranties with every copy of the Work
-as included in the Adaptation You Distribute or Publicly Perform; (IV)
-when You Distribute or Publicly Perform the Adaptation, You may not
-impose any effective technological measures on the Adaptation that
-restrict the ability of a recipient of the Adaptation from You to
-exercise the rights granted to that recipient under the terms of the
-Applicable License. This Section 4(b) applies to the Adaptation as
-incorporated in a Collection, but this does not require the Collection
-apart from the Adaptation itself to be made subject to the terms of the
-Applicable License.
-
-c. If You Distribute, or Publicly Perform the Work or any Adaptations or
-Collections, You must, unless a request has been made pursuant to
-Section 4(a), keep intact all copyright notices for the Work and
-provide, reasonable to the medium or means You are utilizing: (i) the
-name of the Original Author (or pseudonym, if applicable) if supplied,
-and/or if the Original Author and/or Licensor designate another party or
-parties (e.g., a sponsor institute, publishing entity, journal) for
-attribution ("Attribution Parties") in Licensor's copyright notice,
-terms of service or by other reasonable means, the name of such party or
-parties; (ii) the title of the Work if supplied; (iii) to the extent
-reasonably practicable, the URI, if any, that Licensor specifies to be
-associated with the Work, unless such URI does not refer to the
-copyright notice or licensing information for the Work; and (iv) ,
-consistent with Ssection 3(b), in the case of an Adaptation, a credit
-identifying the use of the Work in the Adaptation (e.g., "French
-translation of the Work by Original Author," or "Screenplay based on
-original Work by Original Author"). The credit required by this Section
-4(c) may be implemented in any reasonable manner; provided, however,
-that in the case of a Adaptation or Collection, at a minimum such credit
-will appear, if a credit for all contributing authors of the Adaptation
-or Collection appears, then as part of these credits and in a manner at
-least as prominent as the credits for the other contributing authors.
-For the avoidance of doubt, You may only use the credit required by this
-Section for the purpose of attribution in the manner set out above and,
-by exercising Your rights under this License, You may not implicitly or
-explicitly assert or imply any connection with, sponsorship or
-endorsement by the Original Author, Licensor and/or Attribution Parties,
-as appropriate, of You or Your use of the Work, without the separate,
-express prior written permission of the Original Author, Licensor and/or
-Attribution Parties.
-
-d. Except as otherwise agreed in writing by the Licensor or as may be
-otherwise permitted by applicable law, if You Reproduce, Distribute or
-Publicly Perform the Work either by itself or as part of any Adaptations
-or Collections, You must not distort, mutilate, modify or take other
-derogatory action in relation to the Work which would be prejudicial to
-the Original Author's honor or reputation. Licensor agrees that in those
-jurisdictions (e.g. Japan), in which any exercise of the right granted
-in Section 3(b) of this License (the right to make Adaptations) would be
-deemed to be a distortion, mutilation, modification or other derogatory
-action prejudicial to the Original Author's honor and reputation, the
-Licensor will waive or not assert, as appropriate, this Section, to the
-fullest extent permitted by the applicable national law, to enable You
-to reasonably exercise Your right under Section 3(b) of this License
-(right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
-EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-a. This License and the rights granted hereunder will terminate
-automatically upon any breach by You of the terms of this License.
-Individuals or entities who have received Adaptations or Collections
-from You under this License, however, will not have their licenses
-terminated provided such individuals or entities remain in full
-compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-survive any termination of this License.
-
-b. Subject to the above terms and conditions, the license granted here
-is perpetual (for the duration of the applicable copyright in the Work).
-Notwithstanding the above, Licensor reserves the right to release the
-Work under different license terms or to stop distributing the Work at
-any time; provided, however that any such election will not serve to
-withdraw this License (or any other license that has been, or is
-required to be, granted under the terms of this License), and this
-License will continue in full force and effect unless terminated as
-stated above.
-
-8. Miscellaneous
-
-a. Each time You Distribute or Publicly Perform the Work or a
-Collection, the Licensor offers to the recipient a license to the Work
-on the same terms and conditions as the license granted to You under
-this License.
-
-b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-offers to the recipient a license to the original Work on the same terms
-and conditions as the license granted to You under this License.
-
-c. If any provision of this License is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this License, and without further action
-by the parties to this agreement, such provision shall be reformed to
-the minimum extent necessary to make such provision valid and
-enforceable.
-
-d.  No term or provision of this License shall be deemed waived and no
-breach consented to unless such waiver or consent shall be in writing
-and signed by the party to be charged with such waiver or consent.
-
-e. This License constitutes the entire agreement between the parties
-with respect to the Work licensed here. There are no understandings,
-agreements or representations with respect to the Work not specified
-here. Licensor shall not be bound by any additional provisions that may
-appear in any communication from You. This License may not be modified
-without the mutual written agreement of the Licensor and You.
-
-f. The rights granted under, and the subject matter referenced, in this
-License were drafted utilizing the terminology of the Berne Convention
-for the Protection of Literary and Artistic Works (as amended on
-September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
-the Universal Copyright Convention (as revised on July 24, 1971). These
-rights and subject matter take effect in the relevant jurisdiction in
-which the License terms are sought to be enforced according to the
-corresponding provisions of the implementation of those treaty
-provisions in the applicable national law. If the standard suite of
-rights granted under applicable copyright law includes additional rights
-not granted under this License, such additional rights are deemed to be
-included in the License; this License is not intended to restrict the
-license of any rights under applicable law.
-
-
-
-Creative Commons Notice
-
-Creative Commons is not a party to this License, and makes no warranty
-whatsoever in connection with the Work. Creative Commons will not be
-liable to You or any party on any legal theory for any damages
-whatsoever, including without limitation any general, special,
-incidental or consequential damages arising in connection to this
-license. Notwithstanding the foregoing two (2) sentences, if Creative
-Commons has expressly identified itself as the Licensor hereunder, it
-shall have all rights and obligations of Licensor.
-
-Except for the limited purpose of indicating to the public that the Work
-is licensed under the CCPL, Creative Commons does not authorize the use
-by either party of the trademark "Creative Commons" or any related
-trademark or logo of Creative Commons without the prior written consent
-of Creative Commons. Any permitted use will be in compliance with
-Creative Commons' then-current trademark usage guidelines, as may be
-published on its website or otherwise made available upon request from
-time to time. For the avoidance of doubt, this trademark restriction
-does not form part of the License.
-
-Creative Commons may be contacted at http://creativecommons.org/.
diff --git a/vendor/easyrdf/easyrdf/README.md b/vendor/easyrdf/easyrdf/README.md
deleted file mode 100644
index d5b9956..0000000
--- a/vendor/easyrdf/easyrdf/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-EasyRdf
-=======
-EasyRdf is a PHP library designed to make it easy to consume and produce [RDF].
-It was designed for use in mixed teams of experienced and inexperienced RDF
-developers. It is written in Object Oriented PHP and has been tested
-extensively using PHPUnit.
-
-After parsing EasyRdf builds up a graph of PHP objects that can then be walked
-around to get the data to be placed on the page. Dump methods are available to
-inspect what data is available during development.
-
-Data is typically loaded into a [EasyRdf_Graph] object from source RDF
-documents, loaded from the web via HTTP. The [EasyRdf_GraphStore] class
-simplifies loading and saving data to a SPARQL 1.1 Graph Store.
-
-SPARQL queries can be made over HTTP to a Triplestore using the
-[EasyRdf_Sparql_Client] class. SELECT and ASK queries will return an
-[EasyRdf_Sparql_Result] object and CONSTRUCT and DESCRIBE queries will return
-an [EasyRdf_Graph] object.
-
-### Example ###
-
-    $foaf = new EasyRdf_Graph("http://njh.me/foaf.rdf");
-    $foaf->load();
-    $me = $foaf->primaryTopic();
-    echo "My name is: ".$me->get('foaf:name')."\n";
-
-
-Downloads
----------
-
-The latest _stable_ version of EasyRdf can be [downloaded from the EasyRdf website].
-
-
-Links
------
-
-* [EasyRdf Homepage](http://www.easyrdf.org/)
-* [API documentation](http://www.easyrdf.org/docs/api)
-* [Change Log](http://github.com/njh/easyrdf/blob/master/CHANGELOG.md)
-* Source Code: <http://github.com/njh/easyrdf>
-* Issue Tracker: <http://github.com/njh/easyrdf/issues>
-
-
-Requirements
-------------
-
-* PHP 5.2.8 or higher
-
-
-Features
---------
-
-* API documentation written in phpdoc
-* Extensive unit tests written using phpunit
-  * Automated testing against PHP 5.2, 5.3 and 5.4
-* Built-in parsers and serialisers: RDF/JSON, N-Triples, RDF/XML, Turtle
-* Optional parsing support for: [ARC2], [Redland Bindings], [rapper]
-* Optional support for [Zend_Http_Client]
-* No required external dependancies upon other libraries (PEAR, Zend, etc...)
-* Complies with Zend Framework coding style.
-* Type mapper - resources of type foaf:Person can be mapped into PHP object of class Foaf_Person
-* Support for visualisation of graphs using [GraphViz]
-* Comes with a number of examples
-
-
-More Examples
--------------
-
-* [artistinfo.php](https://github.com/njh/easyrdf/blob/master/examples/artistinfo.php#slider) - Example of mapping an RDF class type to a PHP Class
-* [basic.php](https://github.com/njh/easyrdf/blob/master/examples/basic.php#slider) - Basic "Hello World" type example
-* [basic_sparql.php](https://github.com/njh/easyrdf/blob/master/examples/basic_sparql.php#slider) - Example of making a SPARQL SELECT query
-* [converter.php](https://github.com/njh/easyrdf/blob/master/examples/converter.php#slider) - Convert RDF from one format to another
-* [dump.php](https://github.com/njh/easyrdf/blob/master/examples/dump.php#slider) - Display the contents of a graph
-* [foafinfo.php](https://github.com/njh/easyrdf/blob/master/examples/foafinfo.php#slider) - Display the basic information in a FOAF document
-* [foafmaker.php](https://github.com/njh/easyrdf/blob/master/examples/foafmaker.php#slider) - Construct a FOAF document with a choice of serialisations
-* [graph_direct.php](https://github.com/njh/easyrdf/blob/master/examples/graph_direct.php#slider) - Example of using EasyRdf_Graph directly without EasyRdf_Resource
-* [graphstore.php](https://github.com/njh/easyrdf/blob/master/examples/graphstore.php#slider) - Store and retrieve data from a SPARQL 1.1 Graph Store
-* [graphviz.php](https://github.com/njh/easyrdf/blob/master/examples/graphviz.php#slider) - GraphViz rendering example
-* [html_tag_helpers.php](https://github.com/njh/easyrdf/blob/master/examples/html_tag_helpers.php#slider) - Rails Style html tag helpers to make the EasyRdf examples simplier
-* [httpget.php](https://github.com/njh/easyrdf/blob/master/examples/httpget.php#slider) - No RDF, just test EasyRdf_Http_Client
-* [serialise.php](https://github.com/njh/easyrdf/blob/master/examples/serialise.php#slider) - Basic serialisation example
-* [sparql_queryform.php](https://github.com/njh/easyrdf/blob/master/examples/sparql_queryform.php#slider) - Form to submit SPARQL queries and display the result
-* [uk_postcode.php](https://github.com/njh/easyrdf/blob/master/examples/uk_postcode.php#slider) - Example of resolving UK postcodes using uk-postcodes.com
-* [villages.php](https://github.com/njh/easyrdf/blob/master/examples/villages.php#slider) - Fetch and information about villages in Fife from dbpedialite.org
-* [zend_framework.php](https://github.com/njh/easyrdf/blob/master/examples/zend_framework.php#slider) - Example of using Zend_Http_Client and Zend_Loader_Autoloader with EasyRdf
-
-
-
-Licensing
----------
-
-The EasyRdf library and tests are licensed under the [BSD-3-Clause] license.
-The examples are in the public domain, for more information see [UNLICENSE].
-
-
-
-[EasyRdf_Graph]:http://www.easyrdf.org/docs/api/EasyRdf_Graph.html
-[EasyRdf_GraphStore]:http://www.easyrdf.org/docs/api/EasyRdf_GraphStore.html
-[EasyRdf_Sparql_Client]:http://www.easyrdf.org/docs/api/EasyRdf_Sparql_Client.html
-[EasyRdf_Sparql_Result]:http://www.easyrdf.org/docs/api/EasyRdf_Sparql_Result.html
-
-[ARC2]:http://github.com/semsol/arc2/
-[BSD-3-Clause]:http://www.opensource.org/licenses/BSD-3-Clause
-[downloaded from the EasyRdf website]:http://www.easyrdf.org/downloads
-[GraphViz]:http://www.graphviz.org/
-[rapper]:http://librdf.org/raptor/rapper.html
-[RDF]:http://en.wikipedia.org/wiki/Resource_Description_Framework
-[Redland Bindings]:http://librdf.org/bindings/
-[SPARQL 1.1 query language]:http://www.w3.org/TR/sparql11-query/
-[UNLICENSE]:http://unlicense.org/
-[Zend_Http_Client]:http://framework.zend.com/manual/en/zend.http.client.html
diff --git a/vendor/easyrdf/easyrdf/composer.json b/vendor/easyrdf/easyrdf/composer.json
deleted file mode 100644
index 6d0e6ec..0000000
--- a/vendor/easyrdf/easyrdf/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "easyrdf/easyrdf",
-    "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
-    "version": "0.9.1",
-    "type": "library",
-    "keywords": ["RDF", "Semantic Web", "Linked Data", "Turtle", "RDFa", "SPARQL"],
-    "homepage": "http://www.easyrdf.org/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Nicholas Humfrey",
-            "email": "njh@aelius.com",
-            "homepage": "http://www.aelius.com/njh/",
-            "role": "Developer"
-        },
-        {
-            "name": "Alexey Zakhlestin",
-            "email": "indeyets@gmail.com",
-            "role": "Developer"
-        }
-    ],
-    "support": {
-        "forum": "http://groups.google.com/group/easyrdf/",
-        "issues": "http://github.com/njh/easyrdf/issues",
-        "irc": "irc://chat.freenode.net/easyrdf"
-    },
-    "require": {
-        "php": ">=5.2.8",
-        "ext-mbstring": "*",
-        "ext-pcre": "*"
-    },
-    "suggest": {
-        "ml/json-ld": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/PHPUnit": "~3.5",
-        "squizlabs/php_codesniffer": "~1.4.3",
-        "sami/sami": "~1.4"
-    },
-    "autoload": {
-        "psr-0": { "EasyRdf_": "lib/" }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/doap.php b/vendor/easyrdf/easyrdf/doap.php
deleted file mode 100644
index 4393fe0..0000000
--- a/vendor/easyrdf/easyrdf/doap.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-    require_once "vendor/autoload.php";
-
-    // Load some properties from the composer file
-    $composer = json_decode(file_get_contents(__DIR__."/composer.json"));
-
-    // Start building up a RDF graph
-    $doap = new EasyRdf_Graph($composer->homepage.'doap.rdf');
-    $easyrdf = $doap->resource('#easyrdf', 'doap:Project', 'foaf:Project');
-    $easyrdf->addLiteral('doap:name',  'EasyRDF');
-    $easyrdf->addLiteral('doap:shortname', 'easyrdf');
-    $easyrdf->addLiteral('doap:revision', $composer->version);
-    $easyrdf->addLiteral('doap:shortdesc', $composer->description, 'en');
-    $easyrdf->addResource('doap:homepage', $composer->homepage);
-
-    $easyrdf->addLiteral('doap:programming-language', 'PHP');
-    $easyrdf->addLiteral(
-        'doap:description', 'EasyRdf is a PHP library designed to make it easy to consume and produce RDF. '.
-        'It was designed for use in mixed teams of experienced and inexperienced RDF developers. '.
-        'It is written in Object Oriented PHP and has been tested extensively using PHPUnit.', 'en'
-    );
-    $easyrdf->addResource('doap:license', 'http://usefulinc.com/doap/licenses/bsd');
-    $easyrdf->addResource('doap:download-page', 'http://github.com/njh/easyrdf/downloads');
-    $easyrdf->addResource('doap:download-page', 'http://github.com/njh/easyrdf/downloads');
-    $easyrdf->addResource('doap:bug-database', 'http://github.com/njh/easyrdf/issues');
-    $easyrdf->addResource('doap:mailing-list', 'http://groups.google.com/group/easyrdf');
-
-    $easyrdf->addResource('doap:category', 'http://dbpedia.org/resource/Resource_Description_Framework');
-    $easyrdf->addResource('doap:category', 'http://dbpedia.org/resource/PHP');
-    $easyrdf->addResource('doap:category', 'http://www.dbpedialite.org/things/24131#id');
-    $easyrdf->addResource('doap:category', 'http://www.dbpedialite.org/things/53847#id');
-
-    $repository = $doap->newBNode('doap:GitRepository');
-    $repository->addResource('doap:browse', 'http://github.com/njh/easyrdf');
-    $repository->addResource('doap:location', 'git://github.com/njh/easyrdf.git');
-    $easyrdf->addResource('doap:repository', $repository);
-
-    $njh = $doap->resource('http://njh.me/', 'foaf:Person');
-    $njh->addLiteral('foaf:name', 'Nicholas J Humfrey');
-    $njh->addResource('foaf:homepage', 'http://www.aelius.com/njh/');
-    $easyrdf->add('doap:maintainer', $njh);
-    $easyrdf->add('doap:developer', $njh);
-    $easyrdf->add('foaf:maker', $njh);
-
-    print $doap->serialise('rdfxml');
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf.php b/vendor/easyrdf/easyrdf/lib/EasyRdf.php
deleted file mode 100644
index 8c7248b..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * Use this file to load the core of EasyRdf, if you don't have an autoloader.
- *
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2011-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * @see EasyRdf_Exception
- */
-require_once "EasyRdf/Exception.php";
-
-/**
- * @see EasyRdf_Format
- */
-require_once "EasyRdf/Format.php";
-
-/**
- * @see EasyRdf_Graph
- */
-require_once "EasyRdf/Graph.php";
-
-/**
- * @see EasyRdf_GraphStore
- */
-require_once "EasyRdf/GraphStore.php";
-
-/**
- * @see EasyRdf_Http
- */
-require_once "EasyRdf/Http.php";
-
-/**
- * @see EasyRdf_Http_Client
- */
-require_once "EasyRdf/Http/Client.php";
-
-/**
- * @see EasyRdf_Http_Response
- */
-require_once "EasyRdf/Http/Response.php";
-
-/**
- * @see EasyRdf_Isomorphic
- */
-require_once "EasyRdf/Isomorphic.php";
-
-/**
- * @see EasyRdf_Namespace
- */
-require_once "EasyRdf/Namespace.php";
-
-/**
- * @see EasyRdf_Literal
- */
-require_once "EasyRdf/Literal.php";
-
-/**
- * @see EasyRdf_Literal_Boolean
- */
-require_once "EasyRdf/Literal/Boolean.php";
-
-/**
- * @see EasyRdf_Literal_Date
- */
-require_once "EasyRdf/Literal/Date.php";
-
-/**
- * @see EasyRdf_Literal_DateTime
- */
-require_once "EasyRdf/Literal/DateTime.php";
-
-/**
- * @see EasyRdf_Literal_Decimal
- */
-require_once "EasyRdf/Literal/Decimal.php";
-
-/**
- * @see EasyRdf_Literal_HexBinary
- */
-require_once "EasyRdf/Literal/HexBinary.php";
-
-/**
- * @see EasyRdf_Literal_HTML
- */
-require_once "EasyRdf/Literal/HTML.php";
-
-/**
- * @see EasyRdf_Literal_Integer
- */
-require_once "EasyRdf/Literal/Integer.php";
-
-/**
- * @see EasyRdf_Literal_XML
- */
-require_once "EasyRdf/Literal/XML.php";
-
-/**
- * @see EasyRdf_ParsedUri
- */
-require_once "EasyRdf/ParsedUri.php";
-
-/**
- * @see EasyRdf_Parser
- */
-require_once "EasyRdf/Parser.php";
-
-/**
- * @see EasyRdf_Parser_Exception
- */
-require_once "EasyRdf/Parser/Exception.php";
-
-/**
- * @see EasyRdf_Parser_RdfPhp
- */
-require_once "EasyRdf/Parser/RdfPhp.php";
-
-/**
- * @see EasyRdf_Parser_Ntriples
- */
-require_once "EasyRdf/Parser/Ntriples.php";
-
-/**
- * @see EasyRdf_Parser_Json
- */
-require_once "EasyRdf/Parser/Json.php";
-
-/**
- * @see EasyRdf_Parser_Rdfa
- */
-require_once "EasyRdf/Parser/Rdfa.php";
-
-/**
- * @see EasyRdf_Parser_RdfXml
- */
-require_once "EasyRdf/Parser/RdfXml.php";
-
-/**
- * @see EasyRdf_Parser_Turtle
- */
-require_once "EasyRdf/Parser/Turtle.php";
-
-/**
- * @see EasyRdf_Resource
- */
-require_once "EasyRdf/Resource.php";
-
-/**
- * @see EasyRdf_Collection
- */
-require_once "EasyRdf/Collection.php";
-
-/**
- * @see EasyRdf_Container
- */
-require_once "EasyRdf/Container.php";
-
-/**
- * @see EasyRdf_Serialiser
- */
-require_once "EasyRdf/Serialiser.php";
-
-/**
- * @see EasyRdf_Serialiser_GraphViz
- */
-require_once "EasyRdf/Serialiser/GraphViz.php";
-
-/**
- * @see EasyRdf_Serialiser_RdfPhp
- */
-require_once "EasyRdf/Serialiser/RdfPhp.php";
-
-/**
- * @see EasyRdf_Serialiser_Ntriples
- */
-require_once "EasyRdf/Serialiser/Ntriples.php";
-
-/**
- * @see EasyRdf_Serialiser_Json
- */
-require_once "EasyRdf/Serialiser/Json.php";
-
-/**
- * @see EasyRdf_Serialiser_RdfXml
- */
-require_once "EasyRdf/Serialiser/RdfXml.php";
-
-/**
- * @see EasyRdf_Serialiser_Turtle
- */
-require_once "EasyRdf/Serialiser/Turtle.php";
-
-/**
- * @see EasyRdf_Sparql_Client
- */
-require_once "EasyRdf/Sparql/Client.php";
-
-/**
- * @see EasyRdf_Sparql_Result
- */
-require_once "EasyRdf/Sparql/Result.php";
-
-/**
- * @see EasyRdf_TypeMapper
- */
-require_once "EasyRdf/TypeMapper.php";
-
-/**
- * @see EasyRdf_Utils
- */
-require_once "EasyRdf/Utils.php";
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Collection.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Collection.php
deleted file mode 100644
index b66646c..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Collection.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Sub-class of EasyRdf_Resource that represents an RDF collection (rdf:List)
- *
- * This class can be used to iterate through a collection of items.
- *
- * Note that items are numbered from 1 (not 0) for consistency with RDF Containers.
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#date
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Collection extends EasyRdf_Resource implements ArrayAccess, Countable, SeekableIterator
-{
-    private $position;
-    private $current;
-
-    /** Create a new collection - do not use this directly
-     *
-     * @ignore
-     */
-    public function __construct($uri, $graph)
-    {
-        $this->position = 1;
-        $this->current = null;
-        parent::__construct($uri, $graph);
-    }
-
-    /** Seek to a specific position in the container
-     *
-     * The first item is postion 1
-     *
-     * @param  integer  $position     The position in the container to seek to
-     * @throws OutOfBoundsException
-     */
-    public function seek($position)
-    {
-        if (is_int($position) and $position > 0) {
-            list($node, $actual) = $this->getCollectionNode($position);
-            if ($actual === $position) {
-                $this->position = $actual;
-                $this->current = $node;
-            } else {
-                throw new OutOfBoundsException(
-                    "Unable to seek to position $position in the collection"
-                );
-            }
-        } else {
-            throw new InvalidArgumentException(
-                "Collection position must be a positive integer"
-            );
-        }
-    }
-
-    /** Rewind the iterator back to the start of the collection
-     *
-     */
-    public function rewind()
-    {
-        $this->position = 1;
-        $this->current = null;
-    }
-
-    /** Return the current item in the collection
-     *
-     * @return mixed The current item
-     */
-    public function current()
-    {
-        if ($this->position === 1) {
-            return $this->get('rdf:first');
-        } elseif ($this->current) {
-            return $this->current->get('rdf:first');
-        }
-    }
-
-    /** Return the key / current position in the collection
-     *
-     * Note: the first item is number 1
-     *
-     * @return int The current position
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /** Move forward to next item in the collection
-     *
-     */
-    public function next()
-    {
-        if ($this->position === 1) {
-            $this->current = $this->get('rdf:rest');
-        } elseif ($this->current) {
-            $this->current = $this->current->get('rdf:rest');
-        }
-        $this->position++;
-    }
-
-    /** Checks if current position is valid
-     *
-     * @return bool True if the current position is valid
-     */
-    public function valid()
-    {
-        if ($this->position === 1 and $this->hasProperty('rdf:first')) {
-            return true;
-        } elseif ($this->current !== null and $this->current->hasProperty('rdf:first')) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /** Get a node for a particular offset into the collection
-     *
-     * This function may not return the item you requested, if
-     * it does not exist. Please check the $postion parameter
-     * returned.
-     *
-     * If the offset is null, then the last node in the
-     * collection (before rdf:nil) will be returned.
-     *
-     * @param  integer $offset          The offset into the collection (or null)
-     * @return array   $node, $postion  The node object and postion of the node
-     */
-    public function getCollectionNode($offset)
-    {
-        $position = 1;
-        $node = $this;
-        $nil = $this->graph->resource('rdf:nil');
-        while (($rest = $node->get('rdf:rest')) and $rest !== $nil and (is_null($offset) or ($position < $offset))) {
-            $node = $rest;
-            $position++;
-        }
-        return array($node, $position);
-    }
-
-    /** Counts the number of items in the collection
-     *
-     * Note that this is an slow method - it is more efficient to use
-     * the iterator interface, if you can.
-     *
-     * @return integer The number of items in the collection
-     */
-    public function count()
-    {
-        // Find the end of the collection
-        list($node, $position) = $this->getCollectionNode(null);
-        if (!$node->hasProperty('rdf:first')) {
-            return 0;
-        } else {
-            return $position;
-        }
-    }
-
-    /** Append an item to the end of the collection
-     *
-     * @param  mixed $value      The value to append
-     * @return integer           The number of values appended (1 or 0)
-     */
-    public function append($value)
-    {
-        // Find the end of the collection
-        list($node, $position) = $this->getCollectionNode(null);
-        $rest = $node->get('rdf:rest');
-
-        if ($node === $this and is_null($rest)) {
-            $node->set('rdf:first', $value);
-            $node->addResource('rdf:rest', 'rdf:nil');
-        } else {
-            $new = $this->graph->newBnode();
-            $node->set('rdf:rest', $new);
-            $new->add('rdf:first', $value);
-            $new->addResource('rdf:rest', 'rdf:nil');
-        }
-
-        return 1;
-    }
-
-    /** Array Access: check if a position exists in collection using array syntax
-     *
-     * Example: isset($list[2])
-     */
-    public function offsetExists($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            list($node, $position) = $this->getCollectionNode($offset);
-            return ($node and $position === $offset and $node->hasProperty('rdf:first'));
-        } else {
-            throw new InvalidArgumentException(
-                "Collection offset must be a positive integer"
-            );
-        }
-    }
-
-    /** Array Access: get an item at a specified position in collection using array syntax
-     *
-     * Example: $item = $list[2];
-     */
-    public function offsetGet($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            list($node, $position) = $this->getCollectionNode($offset);
-            if ($node and $position === $offset) {
-                return $node->get('rdf:first');
-            }
-        } else {
-            throw new InvalidArgumentException(
-                "Collection offset must be a positive integer"
-            );
-        }
-    }
-
-    /**
-     * Array Access: set an item at a positon in collection using array syntax
-     *
-     * Example: $list[2] = $item;
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_null($offset)) {
-            // No offset - append to end of collection
-            $this->append($value);
-        } elseif (is_int($offset) and $offset > 0) {
-            list($node, $position) = $this->getCollectionNode($offset);
-
-            // Create nodes, if they are missing
-            while ($position < $offset) {
-                $new = $this->graph->newBnode();
-                $node->set('rdf:rest', $new);
-                $new->addResource('rdf:rest', 'rdf:nil');
-                $node = $new;
-                $position++;
-            }
-
-            // Terminate the list
-            if (!$node->hasProperty('rdf:rest')) {
-                $node->addResource('rdf:rest', 'rdf:nil');
-            }
-
-            return $node->set('rdf:first', $value);
-        } else {
-            throw new InvalidArgumentException(
-                "Collection offset must be a positive integer"
-            );
-        }
-    }
-
-    /**
-     * Array Access: delete an item at a specific postion using array syntax
-     *
-     * Example: unset($seq[2]);
-     */
-    public function offsetUnset($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            list($node, $position) = $this->getCollectionNode($offset);
-        } else {
-            throw new InvalidArgumentException(
-                "Collection offset must be a positive integer"
-            );
-        }
-
-        // Does the item exist?
-        if ($node and $position === $offset) {
-            $nil = $this->graph->resource('rdf:nil');
-            if ($position === 1) {
-                $rest = $node->get('rdf:rest');
-                if ($rest and $rest !== $nil) {
-                    // Move second value, so we can keep the head of list
-                    $node->set('rdf:first', $rest->get('rdf:first'));
-                    $node->set('rdf:rest', $rest->get('rdf:rest'));
-                    $rest->delete('rdf:first');
-                    $rest->delete('rdf:rest');
-                } else {
-                    // Just remove the value
-                    $node->delete('rdf:first');
-                    $node->delete('rdf:rest');
-                }
-            } else {
-                // Remove the value and re-link the list
-                $node->delete('rdf:first');
-                $rest = $node->get('rdf:rest');
-                $previous = $node->get('^rdf:rest');
-                if (is_null($rest)) {
-                    $rest = $nil;
-                }
-                if ($previous) {
-                    $previous->set('rdf:rest', $rest);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Container.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Container.php
deleted file mode 100644
index 2207956..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Container.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Sub-class of EasyRdf_Resource that represents an RDF container
- * (rdf:Alt, rdf:Bag and rdf:Seq)
- *
- * This class can be used to iterate through a list of items.
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#date
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Container extends EasyRdf_Resource implements ArrayAccess, Countable, SeekableIterator
-{
-    private $position;
-
-    /** Create a new container - do not use this directly
-     *
-     * @ignore
-     */
-    public function __construct($uri, $graph)
-    {
-        $this->position = 1;
-        parent::__construct($uri, $graph);
-    }
-
-    /** Seek to a specific position in the container
-     *
-     * The first item is postion 1
-     *
-     * @param  integer  $position     The position in the container to seek to
-     * @throws OutOfBoundsException
-     */
-    public function seek($position)
-    {
-        if (is_int($position) and $position > 0) {
-            if ($this->hasProperty('rdf:_'.$position)) {
-                $this->position = $position;
-            } else {
-                throw new OutOfBoundsException(
-                    "Unable to seek to position $position in the container"
-                );
-            }
-        } else {
-            throw new InvalidArgumentException(
-                "Container position must be a positive integer"
-            );
-        }
-    }
-
-    /** Rewind the iterator back to the start of the container (item 1)
-     *
-     */
-    public function rewind()
-    {
-        $this->position = 1;
-    }
-
-    /** Return the current item in the container
-     *
-     * @return mixed The current item
-     */
-    public function current()
-    {
-        return $this->get('rdf:_'.$this->position);
-    }
-
-    /** Return the key / current position in the container
-     *
-     * @return int The current position
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /** Move forward to next item in the container
-     *
-     */
-    public function next()
-    {
-        $this->position++;
-    }
-
-    /** Checks if current position is valid
-     *
-     * @return bool True if the current position is valid
-     */
-    public function valid()
-    {
-        return $this->hasProperty('rdf:_'.$this->position);
-    }
-
-    /** Counts the number of items in the container
-     *
-     * Note that this is an slow method - it is more efficient to use
-     * the iterator interface, if you can.
-     *
-     * @return integer The number of items in the container
-     */
-    public function count()
-    {
-        $pos = 1;
-        while ($this->hasProperty('rdf:_'.$pos)) {
-            $pos++;
-        }
-        return $pos - 1;
-    }
-
-    /** Append an item to the end of the container
-     *
-     * @param  mixed $value      The value to append
-     * @return integer           The number of values appended (1 or 0)
-     */
-    public function append($value)
-    {
-        // Find the end of the list
-        $pos = 1;
-        while ($this->hasProperty('rdf:_'.$pos)) {
-            $pos++;
-        }
-
-        // Add the item
-        return $this->add('rdf:_'.$pos, $value);
-    }
-
-    /** Array Access: check if a position exists in container using array syntax
-     *
-     * Example: isset($seq[2])
-     */
-    public function offsetExists($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            return $this->hasProperty('rdf:_'.$offset);
-        } else {
-            throw new InvalidArgumentException(
-                "Container position must be a positive integer"
-            );
-        }
-    }
-
-    /** Array Access: get an item at a specified position in container using array syntax
-     *
-     * Example: $item = $seq[2];
-     */
-    public function offsetGet($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            return $this->get('rdf:_'.$offset);
-        } else {
-            throw new InvalidArgumentException(
-                "Container position must be a positive integer"
-            );
-        }
-    }
-
-    /**
-     * Array Access: set an item at a positon in container using array syntax
-     *
-     * Example: $seq[2] = $item;
-     *
-     * Warning: creating gaps in the sequence will result in unexpected behavior
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (is_int($offset) and $offset > 0) {
-            return $this->set('rdf:_'.$offset, $value);
-        } elseif (is_null($offset)) {
-            return $this->append($value);
-        } else {
-            throw new InvalidArgumentException(
-                "Container position must be a positive integer"
-            );
-        }
-    }
-
-    /**
-     * Array Access: delete an item at a specific postion using array syntax
-     *
-     * Example: unset($seq[2]);
-     *
-     * Warning: creating gaps in the sequence will result in unexpected behavior
-     */
-    public function offsetUnset($offset)
-    {
-        if (is_int($offset) and $offset > 0) {
-            return $this->delete('rdf:_'.$offset);
-        } else {
-            throw new InvalidArgumentException(
-                "Container position must be a positive integer"
-            );
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Exception.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Exception.php
deleted file mode 100644
index 25090a5..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Exception.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * EasyRdf Exception class
- *
- * All exceptions thrown by EasyRdf are an instance of this class.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Exception extends Exception
-{
-    // Comment to make PHP CodeSniffer happy
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Format.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Format.php
deleted file mode 100644
index d6eb670..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Format.php
+++ /dev/null
@@ -1,699 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class the represents an RDF file format.
- *
- * For each format, the name, label, URIs and associated MIME Types are
- * stored. A single parser and serialiser can also be registered to each
- * format.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Format
-{
-    private static $formats = array();
-
-    private $name = array();
-    private $label = null;
-    private $uri = null;
-    private $mimeTypes = array();
-    private $extensions = array();
-    private $parserClass = null;
-    private $serialiserClass = null;
-
-    /** Get a list of format names
-     *
-     * @return array          An array of formats name
-     */
-    public static function getNames()
-    {
-        return array_keys(self::$formats);
-    }
-
-    /** Get a list of all the registered formats
-     *
-     * @return array          An array of format objects
-     */
-    public static function getFormats()
-    {
-        return self::$formats;
-    }
-
-    /** Generates an HTTP Accept header string
-     *
-     * The string will contain all of the MIME Types that we
-     * are able to parse.
-     *
-     * It is also possible to specify additional MIME types
-     * in the form array('text/plain' => 0.5) where 0.5 is the
-     * q value for that type. The types are sorted by q value
-     * before constructing the string.
-     *
-     * @param array $extraTypes    extra MIME types to add
-     * @return string              list of supported MIME types
-     */
-    public static function getHttpAcceptHeader($extraTypes = array())
-    {
-        $accept = $extraTypes;
-        foreach (self::$formats as $format) {
-            if ($format->parserClass and count($format->mimeTypes) > 0) {
-                $accept = array_merge($accept, $format->mimeTypes);
-            }
-        }
-        arsort($accept, SORT_NUMERIC);
-
-        $acceptStr='';
-        foreach ($accept as $type => $q) {
-            if ($acceptStr) {
-                $acceptStr .= ',';
-            }
-            if ($q == 1.0) {
-                $acceptStr .= $type;
-            } else {
-                $acceptStr .= sprintf("%s;q=%1.1F", $type, $q);
-            }
-        }
-        return $acceptStr;
-    }
-
-    /** Check if a named graph exists
-     *
-     * @param string $name    the name of the format
-     * @return boolean        true if the format exists
-     */
-    public static function formatExists($name)
-    {
-        return array_key_exists($name, self::$formats);
-    }
-
-    /** Get a EasyRdf_Format from a name, uri or mime type
-     *
-     * @param string $query   a query string to search for
-     * @return object         the first EasyRdf_Format that matches the query
-     * @throws EasyRdf_Exception  if no format is found
-     */
-    public static function getFormat($query)
-    {
-        if (!is_string($query) or $query == null or $query == '') {
-            throw new InvalidArgumentException(
-                "\$query should be a string and cannot be null or empty"
-            );
-        }
-
-        foreach (self::$formats as $format) {
-            if ($query == $format->name or
-                $query == $format->uri or
-                array_key_exists($query, $format->mimeTypes) or
-                in_array($query, $format->extensions)) {
-                return $format;
-            }
-        }
-
-        # No match
-        throw new EasyRdf_Exception(
-            "Format is not recognised: $query"
-        );
-    }
-
-    /** Register a new format
-     *
-     * @param  string  $name       The name of the format (e.g. ntriples)
-     * @param  string  $label      The label for the format (e.g. N-Triples)
-     * @param  string  $uri        The URI for the format
-     * @param  string  $mimeTypes  One or more mime types for the format
-     * @param  string  $extensions One or more extensions (file suffix)
-     * @return object              The new EasyRdf_Format object
-     */
-    public static function register(
-        $name,
-        $label = null,
-        $uri = null,
-        $mimeTypes = array(),
-        $extensions = array()
-    ) {
-        if (!is_string($name) or $name == null or $name == '') {
-            throw new InvalidArgumentException(
-                "\$name should be a string and cannot be null or empty"
-            );
-        }
-
-        if (!array_key_exists($name, self::$formats)) {
-            self::$formats[$name] = new EasyRdf_Format($name);
-        }
-
-        self::$formats[$name]->setLabel($label);
-        self::$formats[$name]->setUri($uri);
-        self::$formats[$name]->setMimeTypes($mimeTypes);
-        self::$formats[$name]->setExtensions($extensions);
-        return self::$formats[$name];
-    }
-
-    /** Remove a format from the registry
-     *
-     * @param  string  $name      The name of the format (e.g. ntriples)
-     */
-    public static function unregister($name)
-    {
-        unset(self::$formats[$name]);
-    }
-
-    /** Class method to register a parser class to a format name
-     *
-     * @param  string  $name   The name of the format (e.g. ntriples)
-     * @param  string  $class  The name of the class (e.g. EasyRdf_Parser_Ntriples)
-     */
-    public static function registerParser($name, $class)
-    {
-        if (!self::formatExists($name)) {
-            self::register($name);
-        }
-        self::getFormat($name)->setParserClass($class);
-    }
-
-    /** Class method to register a serialiser class to a format name
-     *
-     * @param  string  $name   The name of the format (e.g. ntriples)
-     * @param  string  $class  The name of the class (e.g. EasyRdf_Serialiser_Ntriples)
-     */
-    public static function registerSerialiser($name, $class)
-    {
-        if (!self::formatExists($name)) {
-            self::register($name);
-        }
-        self::getFormat($name)->setSerialiserClass($class);
-    }
-
-    /** Attempt to guess the document format from some content.
-     *
-     * If $filename is given, then the suffix is first used to guess the format.
-     *
-     * If the document format is not recognised, null is returned.
-     *
-     * @param  string $data     The document data
-     * @param  string $filename Optional filename
-     * @return object EasyRdf_Format The format object
-     */
-    public static function guessFormat($data, $filename = null)
-    {
-        if (is_array($data)) {
-            # Data has already been parsed into RDF/PHP
-            return self::getFormat('php');
-        }
-
-        // First try and identify by the filename
-        if ($filename and preg_match('/\.(\w+)$/', $filename, $matches)) {
-            foreach (self::$formats as $format) {
-                if (in_array($matches[1], $format->extensions)) {
-                    return $format;
-                }
-            }
-        }
-
-        // Then try and guess by the first 1024 bytes of content
-        $short = substr($data, 0, 1024);
-        if (preg_match('/^\s*\{/', $short)) {
-            return self::getFormat('json');
-        } elseif (preg_match('/<rdf:/i', $short)) {
-            return self::getFormat('rdfxml');
-        } elseif (preg_match('|http://www.w3.org/2005/sparql-results|', $short)) {
-            return self::getFormat('sparql-xml');
-        } elseif (preg_match('/\WRDFa\W/i', $short)) {
-            return self::getFormat('rdfa');
-        } elseif (preg_match('/<!DOCTYPE html|<html/i', $short)) {
-            # We don't support any other microformats embedded in HTML
-            return self::getFormat('rdfa');
-        } elseif (preg_match('/@prefix\s|@base\s/', $short)) {
-            return self::getFormat('turtle');
-        } elseif (preg_match('/^\s*<.+> <.+>/m', $short)) {
-            return self::getFormat('ntriples');
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * This constructor is for internal use only.
-     * To create a new format, use the register method.
-     *
-     * @param  string  $name    The name of the format
-     * @see    EasyRdf_Format::register()
-     * @ignore
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-        $this->label = $name;  # Only a default
-    }
-
-    /** Get the name of a format object
-     *
-     * @return string The name of the format (e.g. rdfxml)
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /** Get the label for a format object
-     *
-     * @return string The format label (e.g. RDF/XML)
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /** Set the label for a format object
-     *
-     * @param  string $label  The new label for the format
-     */
-    public function setLabel($label)
-    {
-        if ($label) {
-            if (!is_string($label)) {
-                throw new InvalidArgumentException(
-                    "\$label should be a string"
-                );
-            }
-            return $this->label = $label;
-        } else {
-            return $this->label = null;
-        }
-    }
-
-    /** Get the URI for a format object
-     *
-     * @return string The format URI
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /** Set the URI for a format object
-     *
-     * @param string $uri  The new URI for the format
-     */
-    public function setUri($uri)
-    {
-        if ($uri) {
-            if (!is_string($uri)) {
-                throw new InvalidArgumentException(
-                    "\$uri should be a string"
-                );
-            }
-            return $this->uri = $uri;
-        } else {
-            return $this->uri = null;
-        }
-    }
-
-    /** Get the default registered mime type for a format object
-     *
-     * @return string The default mime type as a string.
-     */
-    public function getDefaultMimeType()
-    {
-        $types = array_keys($this->mimeTypes);
-        if (isset($types[0])) {
-            return $types[0];
-        }
-    }
-
-    /** Get all the registered mime types for a format object
-     *
-     * @return array One or more MIME types in an array with
-     *               the mime type as the key and q value as the value
-     */
-    public function getMimeTypes()
-    {
-        return $this->mimeTypes;
-    }
-
-    /** Set the MIME Types for a format object
-     *
-     * @param array $mimeTypes  One or more mime types
-     */
-    public function setMimeTypes($mimeTypes)
-    {
-        if ($mimeTypes) {
-            if (!is_array($mimeTypes)) {
-                $mimeTypes = array($mimeTypes);
-            }
-            $this->mimeTypes = $mimeTypes;
-        } else {
-            $this->mimeTypes = array();
-        }
-    }
-
-    /** Get the default registered file extension (filename suffix) for a format object
-     *
-     * @return string The default extension as a string.
-     */
-    public function getDefaultExtension()
-    {
-        if (isset($this->extensions[0])) {
-            return $this->extensions[0];
-        }
-    }
-
-    /** Get all the registered file extensions (filename suffix) for a format object
-     *
-     * @return array One or more extensions as an array
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /** Set the file format extensions (filename suffix) for a format object
-     *
-     * @param mixed $extensions  One or more file extensions
-     */
-    public function setExtensions($extensions)
-    {
-        if ($extensions) {
-            if (!is_array($extensions)) {
-                $extensions = array($extensions);
-            }
-            $this->extensions = $extensions;
-        } else {
-            $this->extensions = array();
-        }
-    }
-
-    /** Set the parser to use for a format
-     *
-     * @param string $class  The name of the class
-     */
-    public function setParserClass($class)
-    {
-        if ($class) {
-            if (!is_string($class)) {
-                throw new InvalidArgumentException(
-                    "\$class should be a string"
-                );
-            }
-            $this->parserClass = $class;
-        } else {
-            $this->parserClass = null;
-        }
-    }
-
-    /** Get the name of the class to use to parse the format
-     *
-     * @return string The name of the class
-     */
-    public function getParserClass()
-    {
-        return $this->parserClass;
-    }
-
-    /** Create a new parser to parse this format
-     *
-     * @return object The new parser object
-     */
-    public function newParser()
-    {
-        $parserClass = $this->parserClass;
-        if (!$parserClass) {
-            throw new EasyRdf_Exception(
-                "No parser class available for format: ".$this->getName()
-            );
-        }
-        return (new $parserClass());
-    }
-
-    /** Set the serialiser to use for a format
-     *
-     * @param string $class  The name of the class
-     */
-    public function setSerialiserClass($class)
-    {
-        if ($class) {
-            if (!is_string($class)) {
-                throw new InvalidArgumentException(
-                    "\$class should be a string"
-                );
-            }
-            $this->serialiserClass = $class;
-        } else {
-            $this->serialiserClass = null;
-        }
-    }
-
-    /** Get the name of the class to use to serialise the format
-     *
-     * @return string The name of the class
-     */
-    public function getSerialiserClass()
-    {
-        return $this->serialiserClass;
-    }
-
-    /** Create a new serialiser to parse this format
-     *
-     * @return object The new serialiser object
-     */
-    public function newSerialiser()
-    {
-        $serialiserClass = $this->serialiserClass;
-        if (!$serialiserClass) {
-            throw new EasyRdf_Exception(
-                "No serialiser class available for format: ".$this->getName()
-            );
-        }
-        return (new $serialiserClass());
-    }
-
-    /** Magic method to return the name of the format when casted to string
-     *
-     * @return string The name of the format
-     */
-    public function __toString()
-    {
-        return $this->name;
-    }
-}
-
-
-/*
-   Register default set of supported formats
-   NOTE: they are ordered by preference
-*/
-
-EasyRdf_Format::register(
-    'php',
-    'RDF/PHP',
-    'http://n2.talis.com/wiki/RDF_PHP_Specification',
-    array(
-        'application/x-httpd-php-source' => 1.0
-    ),
-    array('phps')
-);
-
-EasyRdf_Format::register(
-    'json',
-    'RDF/JSON Resource-Centric',
-    'http://n2.talis.com/wiki/RDF_JSON_Specification',
-    array(
-        'application/json' => 1.0,
-        'text/json' => 0.9,
-        'application/rdf+json' => 0.9
-    ),
-    array('json')
-);
-
-EasyRdf_Format::register(
-    'jsonld',
-    'JSON-LD',
-    'http://www.w3.org/TR/json-ld/',
-    array(
-        'application/ld+json' => 1.0
-    ),
-    array('jsonld')
-);
-
-EasyRdf_Format::register(
-    'ntriples',
-    'N-Triples',
-    'http://www.w3.org/TR/n-triples/',
-    array(
-        'application/n-triples' => 1.0,
-        'text/plain' => 0.9,
-        'text/ntriples' => 0.9,
-        'application/ntriples' => 0.9,
-        'application/x-ntriples' => 0.9
-    ),
-    array('nt')
-);
-
-EasyRdf_Format::register(
-    'turtle',
-    'Turtle Terse RDF Triple Language',
-    'http://www.dajobe.org/2004/01/turtle',
-    array(
-        'text/turtle' => 0.8,
-        'application/turtle' => 0.7,
-        'application/x-turtle' => 0.7
-    ),
-    array('ttl')
-);
-
-EasyRdf_Format::register(
-    'rdfxml',
-    'RDF/XML',
-    'http://www.w3.org/TR/rdf-syntax-grammar',
-    array(
-        'application/rdf+xml' => 0.8
-    ),
-    array('rdf', 'xrdf')
-);
-
-EasyRdf_Format::register(
-    'dot',
-    'Graphviz',
-    'http://www.graphviz.org/doc/info/lang.html',
-    array(
-        'text/vnd.graphviz' => 0.8
-    ),
-    array('gv', 'dot')
-);
-
-EasyRdf_Format::register(
-    'json-triples',
-    'RDF/JSON Triples'
-);
-
-EasyRdf_Format::register(
-    'n3',
-    'Notation3',
-    'http://www.w3.org/2000/10/swap/grammar/n3#',
-    array(
-        'text/n3' => 0.5,
-        'text/rdf+n3' => 0.5
-    ),
-    array('n3')
-);
-
-EasyRdf_Format::register(
-    'rdfa',
-    'RDFa',
-    'http://www.w3.org/TR/rdfa-core/',
-    array(
-        'text/html' => 0.4,
-        'application/xhtml+xml' => 0.4
-    ),
-    array('html')
-);
-
-EasyRdf_Format::register(
-    'sparql-xml',
-    'SPARQL XML Query Results',
-    'http://www.w3.org/TR/rdf-sparql-XMLres/',
-    array(
-        'application/sparql-results+xml' => 1.0
-    )
-);
-
-EasyRdf_Format::register(
-    'sparql-json',
-    'SPARQL JSON Query Results',
-    'http://www.w3.org/TR/rdf-sparql-json-res/',
-    array(
-        'application/sparql-results+json' => 1.0
-    )
-);
-
-EasyRdf_Format::register(
-    'png',
-    'Portable Network Graphics (PNG)',
-    'http://www.w3.org/TR/PNG/',
-    array(
-        'image/png' => 0.3
-    ),
-    array('png')
-);
-
-EasyRdf_Format::register(
-    'gif',
-    'Graphics Interchange Format (GIF)',
-    'http://www.w3.org/Graphics/GIF/spec-gif89a.txt',
-    array(
-        'image/gif' => 0.2
-    ),
-    array('gif')
-);
-
-EasyRdf_Format::register(
-    'svg',
-    'Scalable Vector Graphics (SVG)',
-    'http://www.w3.org/TR/SVG/',
-    array(
-        'image/svg+xml' => 0.3
-    ),
-    array('svg')
-);
-
-
-/*
-   Register default set of parsers and serialisers
-*/
-
-EasyRdf_Format::registerParser('json', 'EasyRdf_Parser_Json');
-EasyRdf_Format::registerParser('jsonld', 'EasyRdf_Parser_JsonLd');
-EasyRdf_Format::registerParser('ntriples', 'EasyRdf_Parser_Ntriples');
-EasyRdf_Format::registerParser('php', 'EasyRdf_Parser_RdfPhp');
-EasyRdf_Format::registerParser('rdfxml', 'EasyRdf_Parser_RdfXml');
-EasyRdf_Format::registerParser('turtle', 'EasyRdf_Parser_Turtle');
-EasyRdf_Format::registerParser('rdfa', 'EasyRdf_Parser_Rdfa');
-
-EasyRdf_Format::registerSerialiser('json', 'EasyRdf_Serialiser_Json');
-EasyRdf_Format::registerSerialiser('jsonld', 'EasyRdf_Serialiser_JsonLd');
-EasyRdf_Format::registerSerialiser('n3', 'EasyRdf_Serialiser_Turtle');
-EasyRdf_Format::registerSerialiser('ntriples', 'EasyRdf_Serialiser_Ntriples');
-EasyRdf_Format::registerSerialiser('php', 'EasyRdf_Serialiser_RdfPhp');
-EasyRdf_Format::registerSerialiser('rdfxml', 'EasyRdf_Serialiser_RdfXml');
-EasyRdf_Format::registerSerialiser('turtle', 'EasyRdf_Serialiser_Turtle');
-
-EasyRdf_Format::registerSerialiser('dot', 'EasyRdf_Serialiser_GraphViz');
-EasyRdf_Format::registerSerialiser('gif', 'EasyRdf_Serialiser_GraphViz');
-EasyRdf_Format::registerSerialiser('png', 'EasyRdf_Serialiser_GraphViz');
-EasyRdf_Format::registerSerialiser('svg', 'EasyRdf_Serialiser_GraphViz');
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Graph.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Graph.php
deleted file mode 100644
index 46ccc17..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Graph.php
+++ /dev/null
@@ -1,1663 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Container for collection of EasyRdf_Resources.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Graph
-{
-    /** The URI of the graph */
-    private $uri = null;
-    private $parsedUri = null;
-
-    /** Array of resources contained in the graph */
-    private $resources = array();
-
-    private $index = array();
-    private $revIndex = array();
-
-    /** Counter for the number of bnodes */
-    private $bNodeCount = 0;
-
-    /** Array of URLs that have been loaded into the graph */
-    private $loaded = array();
-
-    private $maxRedirects = 10;
-
-
-    /**
-     * Constructor
-     *
-     * If no URI is given then an unnamed graph is created.
-     *
-     * The $data parameter is optional and will be parsed into
-     * the graph if given.
-     *
-     * The data format is optional and should be specified if it
-     * can't be guessed by EasyRdf.
-     *
-     * @param  string  $uri     The URI of the graph
-     * @param  string  $data    Data for the graph
-     * @param  string  $format  The document type of the data (e.g. rdfxml)
-     * @return object EasyRdf_Graph
-     */
-    public function __construct($uri = null, $data = null, $format = null)
-    {
-        $this->checkResourceParam($uri, true);
-
-        if ($uri) {
-            $this->uri = $uri;
-            $this->parsedUri = new EasyRdf_ParsedUri($uri);
-            if ($data) {
-                $this->parse($data, $format, $this->uri);
-            }
-        }
-    }
-
-    /**
-     * Create a new graph and load RDF data from a URI into it
-     *
-     * This static function is shorthand for:
-     *     $graph = new EasyRdf_Graph($uri);
-     *     $graph->load($uri, $format);
-     *
-     * The document type is optional but should be specified if it
-     * can't be guessed or got from the HTTP headers.
-     *
-     * @param  string  $uri     The URI of the data to load
-     * @param  string  $format  Optional format of the data (eg. rdfxml)
-     * @return object EasyRdf_Graph    The new the graph object
-     */
-    public static function newAndLoad($uri, $format = null)
-    {
-        $graph = new self($uri);
-        $graph->load($uri, $format);
-        return $graph;
-    }
-
-    /** Get or create a resource stored in a graph
-     *
-     * If the resource did not previously exist, then a new resource will
-     * be created. If you provide an RDF type and that type is registered
-     * with the EasyRdf_TypeMapper, then the resource will be an instance
-     * of the class registered.
-     *
-     * If URI is null, then the URI of the graph is used.
-     *
-     * @param  string  $uri    The URI of the resource
-     * @param  mixed   $types  RDF type of a new resource (e.g. foaf:Person)
-     * @return object EasyRdf_Resource
-     */
-    public function resource($uri = null, $types = array())
-    {
-        $this->checkResourceParam($uri, true);
-        if (!$uri) {
-            throw new InvalidArgumentException(
-                '$uri is null and EasyRdf_Graph object has no URI either.'
-            );
-        }
-
-        // Resolve relative URIs
-        if ($this->parsedUri) {
-            $uri = $this->parsedUri->resolve($uri)->toString();
-        }
-
-        // Add the types
-        $this->addType($uri, $types);
-
-        // Create resource object if it doesn't already exist
-        if (!isset($this->resources[$uri])) {
-            $resClass = $this->classForResource($uri);
-            $this->resources[$uri] = new $resClass($uri, $this);
-        }
-
-        return $this->resources[$uri];
-    }
-
-    /** Work out the class to instantiate a resource as
-     *  @ignore
-     */
-    protected function classForResource($uri)
-    {
-        $rdfType = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
-        if (isset($this->index[$uri][$rdfType])) {
-            foreach ($this->index[$uri][$rdfType] as $type) {
-                if ($type['type'] == 'uri' or $type['type'] == 'bnode') {
-                    $class = EasyRdf_TypeMapper::get($type['value']);
-                    if ($class != null) {
-                        return $class;
-                    }
-                }
-            }
-        }
-
-        // Parsers don't typically add a rdf:type to rdf:List, so we have to
-        // do a bit of 'inference' here using properties.
-        if ($uri == 'http://www.w3.org/1999/02/22-rdf-syntax-ns#nil' or
-            isset($this->index[$uri]['http://www.w3.org/1999/02/22-rdf-syntax-ns#first']) or
-            isset($this->index[$uri]['http://www.w3.org/1999/02/22-rdf-syntax-ns#rest'])
-        ) {
-            return 'EasyRdf_Collection';
-        }
-        return 'EasyRdf_Resource';
-    }
-
-    /**
-     * Create a new blank node in the graph and return it.
-     *
-     * If you provide an RDF type and that type is registered
-     * with the EasyRdf_TypeMapper, then the resource will be an instance
-     * of the class registered.
-     *
-     * @param  mixed  $types  RDF type of a new blank node (e.g. foaf:Person)
-     * @return object EasyRdf_Resource The new blank node
-     */
-    public function newBNode($types = array())
-    {
-        return $this->resource($this->newBNodeId(), $types);
-    }
-
-    /**
-     * Create a new unique blank node identifier and return it.
-     *
-     * @return string The new blank node identifier (e.g. _:genid1)
-     */
-    public function newBNodeId()
-    {
-        return "_:genid".(++$this->bNodeCount);
-    }
-
-    /**
-     * Parse some RDF data into the graph object.
-     *
-     * @param  string  $data    Data to parse for the graph
-     * @param  string  $format  Optional format of the data
-     * @param  string  $uri     The URI of the data to load
-     * @return integer          The number of triples added to the graph
-     */
-    public function parse($data, $format = null, $uri = null)
-    {
-        $this->checkResourceParam($uri, true);
-
-        if (empty($format) or $format == 'guess') {
-            // Guess the format if it is Unknown
-            $format = EasyRdf_Format::guessFormat($data, $uri);
-        } else {
-            $format = EasyRdf_Format::getFormat($format);
-        }
-
-        if (!$format) {
-            throw new EasyRdf_Exception(
-                "Unable to parse data of an unknown format."
-            );
-        }
-
-        $parser = $format->newParser();
-        return $parser->parse($this, $data, $format, $uri);
-    }
-
-    /**
-     * Parse a file containing RDF data into the graph object.
-     *
-     * @param  string  $filename The path of the file to load
-     * @param  string  $format   Optional format of the file
-     * @param  string  $uri      The URI of the file to load
-     * @return integer           The number of triples added to the graph
-     */
-    public function parseFile($filename, $format = null, $uri = null)
-    {
-        if ($uri === null) {
-            $uri = "file://$filename";
-        }
-
-        return $this->parse(
-            file_get_contents($filename),
-            $format,
-            $uri
-        );
-    }
-
-    /**
-     * Load RDF data into the graph from a URI.
-     *
-     * If no URI is given, then the URI of the graph will be used.
-     *
-     * The document type is optional but should be specified if it
-     * can't be guessed or got from the HTTP headers.
-     *
-     * @param  string  $uri     The URI of the data to load
-     * @param  string  $format  Optional format of the data (eg. rdfxml)
-     * @return integer          The number of triples added to the graph
-     */
-    public function load($uri = null, $format = null)
-    {
-        $this->checkResourceParam($uri, true);
-
-        if (!$uri) {
-            throw new EasyRdf_Exception(
-                "No URI given to load() and the graph does not have a URI."
-            );
-        }
-
-        // Setup the HTTP client
-        $client = EasyRdf_Http::getDefaultHttpClient();
-        $client->resetParameters(true);
-        $client->setConfig(array('maxredirects' => 0));
-        $client->setMethod('GET');
-        $client->setHeaders('Accept', EasyRdf_Format::getHttpAcceptHeader());
-
-        $requestUrl = $uri;
-        $response = null;
-        $redirectCounter = 0;
-        do {
-            // Have we already loaded it into the graph?
-            $requestUrl = EasyRdf_Utils::removeFragmentFromUri($requestUrl);
-            if (in_array($requestUrl, $this->loaded)) {
-                return 0;
-            }
-
-            // Make the HTTP request
-            $client->setHeaders('host', null);
-            $client->setUri($requestUrl);
-            $response = $client->request();
-
-            // Add the URL to the list of URLs loaded
-            $this->loaded[] = $requestUrl;
-
-            if ($response->isRedirect() and $location = $response->getHeader('location')) {
-                // Avoid problems with buggy servers that add whitespace
-                $location = trim($location);
-
-                // Some servers return relative URLs in the location header
-                // resolve it in relation to previous request
-                $baseUri = new EasyRdf_ParsedUri($requestUrl);
-                $requestUrl = $baseUri->resolve($location)->toString();
-                $requestUrl = EasyRdf_Utils::removeFragmentFromUri($requestUrl);
-
-                // If it is a 303 then drop the parameters
-                if ($response->getStatus() == 303) {
-                    $client->resetParameters();
-                }
-
-                ++$redirectCounter;
-            } elseif ($response->isSuccessful()) {
-                // If we didn't get any location, stop redirecting
-                break;
-            } else {
-                throw new EasyRdf_Http_Exception(
-                    "HTTP request for {$requestUrl} failed: ".$response->getMessage(),
-                    $response->getStatus(),
-                    null,
-                    $response->getBody()
-                );
-            }
-        } while ($redirectCounter < $this->maxRedirects);
-
-        if (!$format or $format == 'guess') {
-            list($format, $params) = EasyRdf_Utils::parseMimeType(
-                $response->getHeader('Content-Type')
-            );
-        }
-
-        // Parse the data
-        return $this->parse($response->getBody(), $format, $uri);
-    }
-
-    /** Get an associative array of all the resources stored in the graph.
-     *  The keys of the array is the URI of the EasyRdf_Resource.
-     *
-     * @return array Array of EasyRdf_Resource
-     */
-    public function resources()
-    {
-        foreach ($this->index as $subject => $properties) {
-            if (!isset($this->resources[$subject])) {
-                $this->resource($subject);
-            }
-        }
-
-        foreach ($this->revIndex as $object => $properties) {
-            if (!isset($this->resources[$object])) {
-                $this->resource($object);
-            }
-        }
-
-        return $this->resources;
-    }
-
-    /** Get an arry of resources matching a certain property and optional value.
-     *
-     * For example this routine could be used as a way of getting
-     * everyone who has name:
-     * $people = $graph->resourcesMatching('foaf:name')
-     *
-     * Or everyone who is male:
-     * $people = $graph->resourcesMatching('foaf:gender', 'male');
-     *
-     * Or all homepages:
-     * $people = $graph->resourcesMatching('^foaf:homepage');
-     *
-     * @param  string  $property   The property to check.
-     * @param  mixed   $value      Optional, the value of the propery to check for.
-     * @return array   Array of EasyRdf_Resource
-     */
-    public function resourcesMatching($property, $value = null)
-    {
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        // Use the reverse index if it is an inverse property
-        if ($inverse) {
-            $index = &$this->revIndex;
-        } else {
-            $index = &$this->index;
-        }
-
-        $matched = array();
-        foreach ($index as $subject => $props) {
-            if (isset($index[$subject][$property])) {
-                if (isset($value)) {
-                    foreach ($this->index[$subject][$property] as $v) {
-                        if ($v['type'] == $value['type'] and
-                            $v['value'] == $value['value']) {
-                            $matched[] = $this->resource($subject);
-                            break;
-                        }
-                    }
-                } else {
-                    $matched[] = $this->resource($subject);
-                }
-            }
-        }
-        return $matched;
-    }
-
-    /** Get the URI of the graph
-     *
-     * @return string The URI of the graph
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /** Check that a URI/resource parameter is valid, and convert it to a string
-     *  @ignore
-     */
-    protected function checkResourceParam(&$resource, $allowNull = false)
-    {
-        if ($allowNull == true) {
-            if ($resource === null) {
-                if ($this->uri) {
-                    $resource = $this->uri;
-                } else {
-                    return;
-                }
-            }
-        } elseif ($resource === null) {
-            throw new InvalidArgumentException(
-                "\$resource should be either IRI, blank-node identifier or EasyRdf_Resource. got null"
-            );
-        }
-
-        if (is_object($resource) and $resource instanceof EasyRdf_Resource) {
-            $resource = $resource->getUri();
-        } elseif (is_object($resource) and $resource instanceof EasyRdf_ParsedUri) {
-            $resource = strval($resource);
-        } elseif (is_string($resource)) {
-            if ($resource == '') {
-                throw new InvalidArgumentException(
-                    "\$resource should be either IRI, blank-node identifier or EasyRdf_Resource. got empty string"
-                );
-            } elseif (preg_match("|^<(.+)>$|", $resource, $matches)) {
-                $resource = $matches[1];
-            } else {
-                $resource = EasyRdf_Namespace::expand($resource);
-            }
-        } else {
-            throw new InvalidArgumentException(
-                "\$resource should be either IRI, blank-node identifier or EasyRdf_Resource"
-            );
-        }
-    }
-
-    /** Check that a single URI/property parameter (not a property path)
-     *  is valid, and expand it if required
-     *  @ignore
-     */
-    protected function checkSinglePropertyParam(&$property, &$inverse)
-    {
-        if (is_object($property) and $property instanceof EasyRdf_Resource) {
-            $property = $property->getUri();
-        } elseif (is_object($property) and $property instanceof EasyRdf_ParsedUri) {
-            $property = strval($property);
-        } elseif (is_string($property)) {
-            if ($property == '') {
-                throw new InvalidArgumentException(
-                    "\$property cannot be an empty string"
-                );
-            } elseif (substr($property, 0, 1) == '^') {
-                $inverse = true;
-                $property = EasyRdf_Namespace::expand(substr($property, 1));
-            } elseif (substr($property, 0, 2) == '_:') {
-                throw new InvalidArgumentException(
-                    "\$property cannot be a blank node"
-                );
-            } else {
-                $inverse = false;
-                $property = EasyRdf_Namespace::expand($property);
-            }
-        }
-
-        if ($property === null or !is_string($property)) {
-            throw new InvalidArgumentException(
-                "\$property should be a string or EasyRdf_Resource and cannot be null"
-            );
-        }
-    }
-
-    /** Check that a value parameter is valid, and convert it to an associative array if needed
-     *  @ignore
-     */
-    protected function checkValueParam(&$value)
-    {
-        if (isset($value)) {
-            if (is_object($value)) {
-                if (!method_exists($value, 'toRdfPhp')) {
-                    // Convert to a literal object
-                    $value = EasyRdf_Literal::create($value);
-                }
-                $value = $value->toRdfPhp();
-            } elseif (is_array($value)) {
-                if (!isset($value['type'])) {
-                    throw new InvalidArgumentException(
-                        "\$value is missing a 'type' key"
-                    );
-                }
-
-                if (!isset($value['value'])) {
-                    throw new InvalidArgumentException(
-                        "\$value is missing a 'value' key"
-                    );
-                }
-
-                // Fix ordering and remove unknown keys
-                $value = array(
-                    'type' => strval($value['type']),
-                    'value' => strval($value['value']),
-                    'lang' => isset($value['lang']) ? strval($value['lang']) : null,
-                    'datatype' => isset($value['datatype']) ? strval($value['datatype']) : null
-                );
-            } else {
-                $value = array(
-                    'type' => 'literal',
-                    'value' => strval($value),
-                    'datatype' => EasyRdf_Literal::getDatatypeForValue($value)
-                );
-            }
-            if (!in_array($value['type'], array('uri', 'bnode', 'literal'), true)) {
-                throw new InvalidArgumentException(
-                    "\$value does not have a valid type (".$value['type'].")"
-                );
-            }
-            if (empty($value['datatype'])) {
-                unset($value['datatype']);
-            }
-            if (empty($value['lang'])) {
-                unset($value['lang']);
-            }
-            if (isset($value['lang']) and isset($value['datatype'])) {
-                throw new InvalidArgumentException(
-                    "\$value cannot have both and language and a datatype"
-                );
-            }
-        }
-    }
-
-    /** Get a single value for a property of a resource
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * If $property is an array, then the first item in the array that matches
-     * a property that exists is returned.
-     *
-     * This method will return null if the property does not exist.
-     *
-     * @param  string    $resource       The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string    $propertyPath   A valid property path
-     * @param  string    $type           The type of value to filter by (e.g. literal or resource)
-     * @param  string    $lang           The language to filter by (e.g. en)
-     * @return mixed                     A value associated with the property
-     */
-    public function get($resource, $propertyPath, $type = null, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-
-        if (is_object($propertyPath) and $propertyPath instanceof EasyRdf_Resource) {
-            return $this->getSingleProperty($resource, $propertyPath->getUri(), $type, $lang);
-        } elseif (is_string($propertyPath) and preg_match('|^(\^?)<(.+)>|', $propertyPath, $matches)) {
-            return $this->getSingleProperty($resource, "$matches[1]$matches[2]", $type, $lang);
-        } elseif ($propertyPath === null or !is_string($propertyPath)) {
-            throw new InvalidArgumentException(
-                "\$propertyPath should be a string or EasyRdf_Resource and cannot be null"
-            );
-        } elseif ($propertyPath === '') {
-            throw new InvalidArgumentException(
-                "\$propertyPath cannot be an empty string"
-            );
-        }
-
-        // Loop through each component in the path
-        foreach (explode('/', $propertyPath) as $part) {
-            // Stop if we come to a literal
-            if ($resource instanceof EasyRdf_Literal) {
-                return null;
-            }
-
-            // Try each of the alternative paths
-            foreach (explode('|', $part) as $p) {
-                $res = $this->getSingleProperty($resource, $p, $type, $lang);
-                if ($res) {
-                    break;
-                }
-            }
-
-            // Stop if nothing was found
-            $resource = $res;
-            if (!$resource) {
-                break;
-            }
-        }
-
-        return $resource;
-    }
-
-    /** Get a single value for a property of a resource
-     *
-     * @param  string    $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string    $property The name of the property (e.g. foaf:name)
-     * @param  string    $type     The type of value to filter by (e.g. literal or resource)
-     * @param  string    $lang     The language to filter by (e.g. en)
-     * @return mixed               A value associated with the property
-     *
-     * @ignore
-     */
-    protected function getSingleProperty($resource, $property, $type = null, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-
-        // Get an array of values for the property
-        $values = $this->propertyValuesArray($resource, $property, $inverse);
-        if (!isset($values)) {
-            return null;
-        }
-
-        // Filter the results
-        $result = null;
-        if ($type) {
-            foreach ($values as $value) {
-                if ($type == 'literal' and $value['type'] == 'literal') {
-                    if ($lang == null or (isset($value['lang']) and $value['lang'] == $lang)) {
-                        $result = $value;
-                        break;
-                    }
-                } elseif ($type == 'resource') {
-                    if ($value['type'] == 'uri' or $value['type'] == 'bnode') {
-                        $result = $value;
-                        break;
-                    }
-                }
-            }
-        } else {
-            $result = $values[0];
-        }
-
-        // Convert the internal data structure into a PHP object
-        return $this->arrayToObject($result);
-    }
-
-    /** Get a single literal value for a property of a resource
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * This method will return null if there is not literal value for the
-     * property.
-     *
-     * @param  string       $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string|array $property The name of the property (e.g. foaf:name)
-     * @param  string       $lang     The language to filter by (e.g. en)
-     * @return object EasyRdf_Literal Literal value associated with the property
-     */
-    public function getLiteral($resource, $property, $lang = null)
-    {
-        return $this->get($resource, $property, 'literal', $lang);
-    }
-
-    /** Get a single resource value for a property of a resource
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * This method will return null if there is not resource for the
-     * property.
-     *
-     * @param  string       $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string|array $property The name of the property (e.g. foaf:name)
-     * @return object EasyRdf_Resource Resource associated with the property
-     */
-    public function getResource($resource, $property)
-    {
-        return $this->get($resource, $property, 'resource');
-    }
-
-    /** Return all the values for a particular property of a resource
-     *  @ignore
-     */
-    protected function propertyValuesArray($resource, $property, $inverse = false)
-    {
-        // Is an inverse property being requested?
-        if ($inverse) {
-            if (isset($this->revIndex[$resource])) {
-                $properties = &$this->revIndex[$resource];
-            }
-        } else {
-            if (isset($this->index[$resource])) {
-                $properties = &$this->index[$resource];
-            }
-        }
-
-        if (isset($properties[$property])) {
-            return $properties[$property];
-        } else {
-            return null;
-        }
-    }
-
-    /** Get an EasyRdf_Resource or EasyRdf_Literal object from an associative array.
-     *  @ignore
-     */
-    protected function arrayToObject($data)
-    {
-        if ($data) {
-            if ($data['type'] == 'uri' or $data['type'] == 'bnode') {
-                return $this->resource($data['value']);
-            } else {
-                return EasyRdf_Literal::create($data);
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /** Get all values for a property path
-     *
-     * This method will return an empty array if the property does not exist.
-     *
-     * @param  string  $resource      The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string  $propertyPath  A valid property path
-     * @param  string  $type          The type of value to filter by (e.g. literal)
-     * @param  string  $lang          The language to filter by (e.g. en)
-     * @return array                  An array of values associated with the property
-     */
-    public function all($resource, $propertyPath, $type = null, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-
-        if (is_object($propertyPath) and $propertyPath instanceof EasyRdf_Resource) {
-            return $this->allForSingleProperty($resource, $propertyPath->getUri(), $type, $lang);
-        } elseif (is_string($propertyPath) and preg_match('|^(\^?)<(.+)>|', $propertyPath, $matches)) {
-            return $this->allForSingleProperty($resource, "$matches[1]$matches[2]", $type, $lang);
-        } elseif ($propertyPath === null or !is_string($propertyPath)) {
-            throw new InvalidArgumentException(
-                "\$propertyPath should be a string or EasyRdf_Resource and cannot be null"
-            );
-        } elseif ($propertyPath === '') {
-            throw new InvalidArgumentException(
-                "\$propertyPath cannot be an empty string"
-            );
-        }
-
-        $objects = array($resource);
-
-        // Loop through each component in the path
-        foreach (explode('/', $propertyPath) as $part) {
-
-            $results = array();
-            foreach (explode('|', $part) as $p) {
-                foreach ($objects as $o) {
-                    // Ignore literals found earlier in path
-                    if ($o instanceof EasyRdf_Literal) {
-                        continue;
-                    }
-
-                    $results = array_merge(
-                        $results,
-                        $this->allForSingleProperty($o, $p, $type, $lang)
-                    );
-                }
-            }
-
-            // Stop if we don't have anything
-            if (empty($objects)) {
-                break;
-            }
-
-            // Use the results as the input to the next iteration
-            $objects = $results;
-        }
-
-        return $results;
-    }
-
-    /** Get all values for a single property of a resource
-     *
-     * @param  string  $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $type     The type of value to filter by (e.g. literal)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return array             An array of values associated with the property
-     *
-     * @ignore
-     */
-    protected function allForSingleProperty($resource, $property, $type = null, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-
-        // Get an array of values for the property
-        $values = $this->propertyValuesArray($resource, $property, $inverse);
-        if (!isset($values)) {
-            return array();
-        }
-
-        $objects = array();
-        if ($type) {
-            foreach ($values as $value) {
-                if ($type == 'literal' and $value['type'] == 'literal') {
-                    if ($lang == null or (isset($value['lang']) and $value['lang'] == $lang)) {
-                        $objects[] = $this->arrayToObject($value);
-                    }
-                } elseif ($type == 'resource') {
-                    if ($value['type'] == 'uri' or $value['type'] == 'bnode') {
-                        $objects[] = $this->arrayToObject($value);
-                    }
-                }
-            }
-        } else {
-            foreach ($values as $value) {
-                $objects[] = $this->arrayToObject($value);
-            }
-        }
-        return $objects;
-    }
-
-    /** Get all literal values for a property of a resource
-     *
-     * This method will return an empty array if the resource does not
-     * has any literal values for that property.
-     *
-     * @param  string  $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return array             An array of values associated with the property
-     */
-    public function allLiterals($resource, $property, $lang = null)
-    {
-        return $this->all($resource, $property, 'literal', $lang);
-    }
-
-    /** Get all resources for a property of a resource
-     *
-     * This method will return an empty array if the resource does not
-     * has any resources for that property.
-     *
-     * @param  string  $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @return array             An array of values associated with the property
-     */
-    public function allResources($resource, $property)
-    {
-        return $this->all($resource, $property, 'resource');
-    }
-
-    /** Get all the resources in the graph of a certain type
-     *
-     * If no resources of the type are available and empty
-     * array is returned.
-     *
-     * @param  string  $type   The type of the resource (e.g. foaf:Person)
-     * @return array The array of resources
-     */
-    public function allOfType($type)
-    {
-        return $this->all($type, '^rdf:type');
-    }
-
-    /** Count the number of values for a property of a resource
-     *
-     * @param  string  $resource The URI of the resource (e.g. http://example.com/joe#me)
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $type     The type of value to filter by (e.g. literal)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return integer           The number of values for this property
-     */
-    public function countValues($resource, $property, $type = null, $lang = null)
-    {
-        return count($this->all($resource, $property, $type, $lang));
-    }
-
-    /** Concatenate all values for a property of a resource into a string.
-     *
-     * The default is to join the values together with a space character.
-     * This method will return an empty string if the property does not exist.
-     *
-     * @param  mixed   $resource The resource to get the property on
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $glue     The string to glue the values together with.
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return string            Concatenation of all the values.
-     */
-    public function join($resource, $property, $glue = ' ', $lang = null)
-    {
-        return join($glue, $this->all($resource, $property, 'literal', $lang));
-    }
-
-    /** Add data to the graph
-     *
-     * The resource can either be a resource or the URI of a resource.
-     *
-     * Example:
-     *   $graph->add("http://www.example.com", 'dc:title', 'Title of Page');
-     *
-     * @param  mixed $resource   The resource to add data to
-     * @param  mixed $property   The property name
-     * @param  mixed $value      The new value for the property
-     * @return integer           The number of values added (1 or 0)
-     */
-    public function add($resource, $property, $value)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        // No value given?
-        if ($value === null) {
-            return 0;
-        }
-
-        // Check that the value doesn't already exist
-        if (isset($this->index[$resource][$property])) {
-            foreach ($this->index[$resource][$property] as $v) {
-                if ($v == $value) {
-                    return 0;
-                }
-            }
-        }
-        $this->index[$resource][$property][] = $value;
-
-        // Add to the reverse index if it is a resource
-        if ($value['type'] == 'uri' or $value['type'] == 'bnode') {
-            $uri = $value['value'];
-            $this->revIndex[$uri][$property][] = array(
-                'type' => substr($resource, 0, 2) == '_:' ? 'bnode' : 'uri',
-                'value' => $resource
-            );
-        }
-
-        // Success
-        return 1;
-    }
-
-    /** Add a literal value as a property of a resource
-     *
-     * The resource can either be a resource or the URI of a resource.
-     * The value can either be a single value or an array of values.
-     *
-     * Example:
-     *   $graph->add("http://www.example.com", 'dc:title', 'Title of Page');
-     *
-     * @param  mixed  $resource  The resource to add data to
-     * @param  mixed  $property  The property name
-     * @param  mixed  $value     The value or values for the property
-     * @param  string $lang      The language of the literal
-     * @return integer           The number of values added
-     */
-    public function addLiteral($resource, $property, $value, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-
-        if (is_array($value)) {
-            $added = 0;
-            foreach ($value as $v) {
-                $added += $this->addLiteral($resource, $property, $v, $lang);
-            }
-            return $added;
-        } elseif (!is_object($value) or !$value instanceof EasyRdf_Literal) {
-            $value = EasyRdf_Literal::create($value, $lang);
-        }
-        return $this->add($resource, $property, $value);
-    }
-
-    /** Add a resource as a property of another resource
-     *
-     * The resource can either be a resource or the URI of a resource.
-     *
-     * Example:
-     *   $graph->add("http://example.com/bob", 'foaf:knows', 'http://example.com/alice');
-     *
-     * @param  mixed $resource   The resource to add data to
-     * @param  mixed $property   The property name
-     * @param  mixed $resource2  The resource to be value of the property
-     * @return integer           The number of values added
-     */
-    public function addResource($resource, $property, $resource2)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkResourceParam($resource2);
-
-        return $this->add(
-            $resource,
-            $property,
-            array(
-                'type' => substr($resource2, 0, 2) == '_:' ? 'bnode' : 'uri',
-                'value' => $resource2
-            )
-        );
-    }
-
-    /** Set a value for a property
-     *
-     * The new value will replace the existing values for the property.
-     *
-     * @param  string  $resource The resource to set the property on
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value    The value for the property
-     * @return integer           The number of values added (1 or 0)
-     */
-    public function set($resource, $property, $value)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        // Delete the old values
-        $this->delete($resource, $property);
-
-        // Add the new values
-        return $this->add($resource, $property, $value);
-    }
-
-    /** Delete a property (or optionally just a specific value)
-     *
-     * @param  mixed   $resource The resource to delete the property from
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value The value to delete (null to delete all values)
-     * @return integer The number of values deleted
-     */
-    public function delete($resource, $property, $value = null)
-    {
-        $this->checkResourceParam($resource);
-
-        if (is_object($property) and $property instanceof EasyRdf_Resource) {
-            return $this->deleteSingleProperty($resource, $property->getUri(), $value);
-        } elseif (is_string($property) and preg_match('|^(\^?)<(.+)>|', $property, $matches)) {
-            return $this->deleteSingleProperty($resource, "$matches[1]$matches[2]", $value);
-        } elseif ($property === null or !is_string($property)) {
-            throw new InvalidArgumentException(
-                "\$property should be a string or EasyRdf_Resource and cannot be null"
-            );
-        } elseif ($property === '') {
-            throw new InvalidArgumentException(
-                "\$property cannot be an empty string"
-            );
-        }
-
-        // FIXME: finish implementing property paths for delete
-        return $this->deleteSingleProperty($resource, $property, $value);
-    }
-
-
-    /** Delete a property (or optionally just a specific value)
-     *
-     * @param  mixed   $resource The resource to delete the property from
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value The value to delete (null to delete all values)
-     * @return integer The number of values deleted
-     *
-     * @ignore
-     */
-    public function deleteSingleProperty($resource, $property, $value = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        $count = 0;
-        if (isset($this->index[$resource][$property])) {
-            foreach ($this->index[$resource][$property] as $k => $v) {
-                if (!$value or $v == $value) {
-                    unset($this->index[$resource][$property][$k]);
-                    $count++;
-                    if ($v['type'] == 'uri' or $v['type'] == 'bnode') {
-                        $this->deleteInverse($v['value'], $property, $resource);
-                    }
-                }
-            }
-
-            // Clean up the indexes - remove empty properties and resources
-            if ($count) {
-                if (count($this->index[$resource][$property]) == 0) {
-                    unset($this->index[$resource][$property]);
-                }
-                if (count($this->index[$resource]) == 0) {
-                    unset($this->index[$resource]);
-                }
-            }
-        }
-
-        return $count;
-    }
-
-    /** Delete a resource from a property of another resource
-     *
-     * The resource can either be a resource or the URI of a resource.
-     *
-     * Example:
-     *   $graph->delete("http://example.com/bob", 'foaf:knows', 'http://example.com/alice');
-     *
-     * @param  mixed $resource   The resource to delete data from
-     * @param  mixed $property   The property name
-     * @param  mixed $resource2  The resource value of the property to be deleted
-     */
-    public function deleteResource($resource, $property, $resource2)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkResourceParam($resource2);
-
-        return $this->delete(
-            $resource,
-            $property,
-            array(
-                'type' => substr($resource2, 0, 2) == '_:' ? 'bnode' : 'uri',
-                'value' => $resource2
-            )
-        );
-    }
-
-    /** Delete a literal value from a property of a resource
-     *
-     * Example:
-     *   $graph->delete("http://www.example.com", 'dc:title', 'Title of Page');
-     *
-     * @param  mixed  $resource  The resource to add data to
-     * @param  mixed  $property  The property name
-     * @param  mixed  $value     The value of the property
-     * @param  string $lang      The language of the literal
-     */
-    public function deleteLiteral($resource, $property, $value, $lang = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        if ($lang) {
-            $value['lang'] = $lang;
-        }
-
-        return $this->delete($resource, $property, $value);
-    }
-
-    /** This function is for internal use only.
-     *
-     * Deletes an inverse property from a resource.
-     *
-     * @ignore
-     */
-    protected function deleteInverse($resource, $property, $value)
-    {
-        if (isset($this->revIndex[$resource])) {
-            foreach ($this->revIndex[$resource][$property] as $k => $v) {
-                if ($v['value'] === $value) {
-                    unset($this->revIndex[$resource][$property][$k]);
-                }
-            }
-            if (count($this->revIndex[$resource][$property]) == 0) {
-                unset($this->revIndex[$resource][$property]);
-            }
-            if (count($this->revIndex[$resource]) == 0) {
-                unset($this->revIndex[$resource]);
-            }
-        }
-    }
-
-    /** Check if the graph contains any statements
-     *
-     * @return boolean True if the graph contains no statements
-     */
-    public function isEmpty()
-    {
-        return count($this->index) == 0;
-    }
-
-    /** Get a list of all the shortened property names (qnames) for a resource.
-     *
-     * This method will return an empty array if the resource has no properties.
-     *
-     * @return array            Array of shortened URIs
-     */
-    public function properties($resource)
-    {
-        $this->checkResourceParam($resource);
-
-        $properties = array();
-        if (isset($this->index[$resource])) {
-            foreach ($this->index[$resource] as $property => $value) {
-                $short = EasyRdf_Namespace::shorten($property);
-                if ($short) {
-                    $properties[] = $short;
-                }
-            }
-        }
-        return $properties;
-    }
-
-    /** Get a list of the full URIs for the properties of a resource.
-     *
-     * This method will return an empty array if the resource has no properties.
-     *
-     * @return array            Array of full URIs
-     */
-    public function propertyUris($resource)
-    {
-        $this->checkResourceParam($resource);
-
-        if (isset($this->index[$resource])) {
-            return array_keys($this->index[$resource]);
-        } else {
-            return array();
-        }
-    }
-
-    /** Get a list of the full URIs for the properties that point to a resource.
-     *
-     * @return array   Array of full property URIs
-     */
-    public function reversePropertyUris($resource)
-    {
-        $this->checkResourceParam($resource);
-
-        if (isset($this->revIndex[$resource])) {
-            return array_keys($this->revIndex[$resource]);
-        } else {
-            return array();
-        }
-    }
-
-    /** Check to see if a property exists for a resource.
-     *
-     * This method will return true if the property exists.
-     * If the value parameter is given, then it will only return true
-     * if the value also exists for that property.
-     *
-     * By providing a value parameter you can use this function to check
-     * to see if a triple exists in the graph.
-     *
-     * @param  mixed   $resource The resource to check
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value    An optional value of the property
-     * @return boolean           True if value the property exists.
-     */
-    public function hasProperty($resource, $property, $value = null)
-    {
-        $this->checkResourceParam($resource);
-        $this->checkSinglePropertyParam($property, $inverse);
-        $this->checkValueParam($value);
-
-        // Use the reverse index if it is an inverse property
-        if ($inverse) {
-            $index = &$this->revIndex;
-        } else {
-            $index = &$this->index;
-        }
-
-        if (isset($index[$resource][$property])) {
-            if (is_null($value)) {
-                return true;
-            } else {
-                foreach ($index[$resource][$property] as $v) {
-                    if ($v == $value) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /** Serialise the graph into RDF
-     *
-     * The $format parameter can be an EasyRdf_Format object, a
-     * format name, a mime type or a file extension.
-     *
-     * Example:
-     *   $turtle = $graph->serialise('turtle');
-     *
-     * @param  mixed $format  The format to serialise to
-     * @param  array $options Serialiser-specific options, for fine-tuning the output
-     * @return mixed  The serialised graph
-     */
-    public function serialise($format, array $options = array())
-    {
-        if (!$format instanceof EasyRdf_Format) {
-            $format = EasyRdf_Format::getFormat($format);
-        }
-        $serialiser = $format->newSerialiser();
-        return $serialiser->serialise($this, $format->getName(), $options);
-    }
-
-    /** Return a human readable view of all the resources in the graph
-     *
-     * This method is intended to be a debugging aid and will
-     * return a pretty-print view of all the resources and their
-     * properties.
-     *
-     * @param  string  $format  Either 'html' or 'text'
-     * @return string
-     */
-    public function dump($format = 'html')
-    {
-        $result = '';
-        if ($format == 'html') {
-            $result .= "<div style='font-family:arial; font-weight: bold; padding:0.5em; ".
-                   "color: black; background-color:lightgrey;border:dashed 1px grey;'>".
-                   "Graph: ". $this->uri . "</div>\n";
-        } else {
-            $result .= "Graph: ". $this->uri . "\n";
-        }
-
-        foreach ($this->index as $resource => $properties) {
-            $result .= $this->dumpResource($resource, $format);
-        }
-        return $result;
-    }
-
-    /** Return a human readable view of a resource and its properties
-     *
-     * This method is intended to be a debugging aid and will
-     * print a resource and its properties.
-     *
-     * @param  mixed    $resource  The resource to dump
-     * @param  string   $format    Either 'html' or 'text'
-     * @return string
-     */
-    public function dumpResource($resource, $format = 'html')
-    {
-        $this->checkResourceParam($resource, true);
-
-        if (isset($this->index[$resource])) {
-            $properties = $this->index[$resource];
-        } else {
-            return '';
-        }
-
-        $plist = array();
-        foreach ($properties as $property => $values) {
-            $olist = array();
-            foreach ($values as $value) {
-                if ($value['type'] == 'literal') {
-                    $olist []= EasyRdf_Utils::dumpLiteralValue($value, $format, 'black');
-                } else {
-                    $olist []= EasyRdf_Utils::dumpResourceValue($value['value'], $format, 'blue');
-                }
-            }
-
-            $pstr = EasyRdf_Namespace::shorten($property);
-            if ($pstr == null) {
-                $pstr = $property;
-            }
-            if ($format == 'html') {
-                $plist []= "<span style='font-size:130%'>&rarr;</span> ".
-                           "<span style='text-decoration:none;color:green'>".
-                           htmlentities($pstr) . "</span> ".
-                           "<span style='font-size:130%'>&rarr;</span> ".
-                           join(", ", $olist);
-            } else {
-                $plist []= "  -> $pstr -> " . join(", ", $olist);
-            }
-        }
-
-        if ($format == 'html') {
-            return "<div id='".htmlentities($resource, ENT_QUOTES)."' " .
-                   "style='font-family:arial; padding:0.5em; ".
-                   "background-color:lightgrey;border:dashed 1px grey;'>\n".
-                   "<div>".EasyRdf_Utils::dumpResourceValue($resource, $format, 'blue')." ".
-                   "<span style='font-size: 0.8em'>(".
-                   $this->classForResource($resource).")</span></div>\n".
-                   "<div style='padding-left: 3em'>\n".
-                   "<div>".join("</div>\n<div>", $plist)."</div>".
-                   "</div></div>\n";
-        } else {
-            return $resource." (".$this->classForResource($resource).")\n" .
-                   join("\n", $plist) . "\n\n";
-        }
-    }
-
-    /** Get the resource type of the graph
-     *
-     * The type will be a shortened URI as a string.
-     * If the graph has multiple types then the type returned
-     * may be arbitrary.
-     * This method will return null if the resource has no type.
-     *
-     * @return string A type assocated with the resource (e.g. foaf:Document)
-     */
-    public function type($resource = null)
-    {
-        $type = $this->typeAsResource($resource);
-
-        if ($type) {
-            return EasyRdf_Namespace::shorten($type);
-        }
-
-        return null;
-    }
-
-    /** Get the resource type of the graph as a EasyRdf_Resource
-     *
-     * If the graph has multiple types then the type returned
-     * may be arbitrary.
-     * This method will return null if the resource has no type.
-     *
-     * @return object EasyRdf_Resource  A type assocated with the resource
-     */
-    public function typeAsResource($resource = null)
-    {
-        $this->checkResourceParam($resource, true);
-
-        if ($resource) {
-            return $this->get($resource, 'rdf:type', 'resource');
-        }
-
-        return null;
-    }
-
-    /** Get a list of types for a resource
-     *
-     * The types will each be a shortened URI as a string.
-     * This method will return an empty array if the resource has no types.
-     *
-     * If $resource is null, then it will get the types for the URI of the graph.
-     *
-     * @return array All types assocated with the resource (e.g. foaf:Person)
-     */
-    public function types($resource = null)
-    {
-        $resources = $this->typesAsResources($resource);
-
-        $types = array();
-        foreach ($resources as $type) {
-            $types[] = EasyRdf_Namespace::shorten($type);
-        }
-
-        return $types;
-    }
-
-    /**
-     * Get the resource types of the graph as a EasyRdf_Resource
-     *
-     * @return EasyRdf_Resource[]
-     */
-    public function typesAsResources($resource = null)
-    {
-        $this->checkResourceParam($resource, true);
-
-        if ($resource) {
-            return $this->all($resource, 'rdf:type', 'resource');
-        }
-
-        return array();
-    }
-
-    /** Check if a resource is of the specified type
-     *
-     * @param  string  $resource The resource to check the type of
-     * @param  string  $type     The type to check (e.g. foaf:Person)
-     * @return boolean           True if resource is of specified type
-     */
-    public function isA($resource, $type)
-    {
-        $this->checkResourceParam($resource, true);
-
-        $type = EasyRdf_Namespace::expand($type);
-        foreach ($this->all($resource, 'rdf:type', 'resource') as $t) {
-            if ($t->getUri() == $type) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /** Add one or more rdf:type properties to a resource
-     *
-     * @param  string  $resource The resource to add the type to
-     * @param  string  $types    One or more types to add (e.g. foaf:Person)
-     * @return integer           The number of types added
-     */
-    public function addType($resource, $types)
-    {
-        $this->checkResourceParam($resource, true);
-
-        if (!is_array($types)) {
-            $types = array($types);
-        }
-
-        $count = 0;
-        foreach ($types as $type) {
-            $type = EasyRdf_Namespace::expand($type);
-            $count += $this->add($resource, 'rdf:type', array('type' => 'uri', 'value' => $type));
-        }
-
-        return $count;
-    }
-
-    /** Change the rdf:type property for a resource
-     *
-     * Note that if the resource object has already previously
-     * been created, then the PHP class of the resource will not change.
-     *
-     * @param  string  $resource The resource to change the type of
-     * @param  string  $type     The new type (e.g. foaf:Person)
-     * @return integer           The number of types added
-     */
-    public function setType($resource, $type)
-    {
-        $this->checkResourceParam($resource, true);
-
-        $this->delete($resource, 'rdf:type');
-        return $this->addType($resource, $type);
-    }
-
-    /** Get a human readable label for a resource
-     *
-     * This method will check a number of properties for a resource
-     * (in the order: skos:prefLabel, rdfs:label, foaf:name, dc:title)
-     * and return an approriate first that is available. If no label
-     * is available then it will return null.
-     *
-     * @return string A label for the resource.
-     */
-    public function label($resource = null, $lang = null)
-    {
-        $this->checkResourceParam($resource, true);
-
-        if ($resource) {
-            return $this->get(
-                $resource,
-                'skos:prefLabel|rdfs:label|foaf:name|rss:title|dc:title|dc11:title',
-                'literal',
-                $lang
-            );
-        } else {
-            return null;
-        }
-    }
-
-    /** Get the primary topic of the graph
-     *
-     * @return EasyRdf_Resource The primary topic of the document.
-     */
-    public function primaryTopic($resource = null)
-    {
-        $this->checkResourceParam($resource, true);
-
-        if ($resource) {
-            return $this->get(
-                $resource,
-                'foaf:primaryTopic|^foaf:isPrimaryTopicOf',
-                'resource'
-            );
-        } else {
-            return null;
-        }
-    }
-
-    /** Returns the graph as a RDF/PHP associative array
-     *
-     * @return array The contents of the graph as an array.
-     */
-    public function toRdfPhp()
-    {
-        return $this->index;
-    }
-
-    /** Calculates the number of triples in the graph
-     *
-     * @return integer The number of triples in the graph.
-     */
-    public function countTriples()
-    {
-        $count = 0;
-        foreach ($this->index as $resource) {
-            foreach ($resource as $property => $values) {
-                $count += count($values);
-            }
-        }
-        return $count;
-    }
-
-    /** Magic method to return URI of resource when casted to string
-     *
-     * @return string The URI of the resource
-     */
-    public function __toString()
-    {
-        return $this->uri == null ? '' : $this->uri;
-    }
-
-    /** Magic method to get a property of the graph
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   $value = $graph->title;
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param  string $name The name of the property
-     * @return string       A single value for the named property
-     */
-    public function __get($name)
-    {
-        return $this->get($this->uri, $name);
-    }
-
-    /** Magic method to set the value for a property of the graph
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   $graph->title = 'Title';
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param  string $name The name of the property
-     * @param  string $value The value for the property
-     */
-    public function __set($name, $value)
-    {
-        return $this->set($this->uri, $name, $value);
-    }
-
-    /** Magic method to check if a property exists
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   if (isset($graph->title)) { blah(); }
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param string $name The name of the property
-     */
-    public function __isset($name)
-    {
-        return $this->hasProperty($this->uri, $name);
-    }
-
-    /** Magic method to delete a property of the graph
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   unset($graph->title);
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param string $name The name of the property
-     */
-    public function __unset($name)
-    {
-        return $this->delete($this->uri, $name);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/GraphStore.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/GraphStore.php
deleted file mode 100644
index 40cbf63..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/GraphStore.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * A class for fetching, saving and deleting graphs to a Graph Store.
- * Implementation of the SPARQL 1.1 Graph Store HTTP Protocol.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_GraphStore
-{
-    /**
-     * Use to reference default graph of triplestore
-     */
-    const DEFAULT_GRAPH = 'urn:easyrdf:default-graph';
-
-    /** The address of the GraphStore endpoint */
-    private $uri = null;
-    private $parsedUri = null;
-
-
-    /** Create a new SPARQL Graph Store client
-     *
-     * @param string $uri The address of the graph store endpoint
-     */
-    public function __construct($uri)
-    {
-        $this->uri = $uri;
-        $this->parsedUri = new EasyRdf_ParsedUri($uri);
-    }
-
-    /** Get the URI of the graph store
-     *
-     * @return string The URI of the graph store
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /** Fetch a named graph from the graph store
-     *
-     * The URI can either be a full absolute URI or
-     * a URI relative to the URI of the graph store.
-     *
-     * @param string $uriRef The URI of graph desired
-     * @return EasyRdf_Graph The graph requested
-     */
-    public function get($uriRef)
-    {
-        if ($uriRef === self::DEFAULT_GRAPH) {
-            $dataUrl = $this->urlForGraph(self::DEFAULT_GRAPH);
-            $graph = new EasyRdf_Graph();
-        } else {
-            $graphUri = $this->parsedUri->resolve($uriRef)->toString();
-            $dataUrl = $this->urlForGraph($graphUri);
-
-            $graph = new EasyRdf_Graph($graphUri);
-        }
-
-        $graph->load($dataUrl);
-
-        return $graph;
-    }
-
-    /**
-     * Fetch default graph from the graph store
-     * @return EasyRdf_Graph
-     */
-    public function getDefault()
-    {
-        return $this->get(self::DEFAULT_GRAPH);
-    }
-
-    /** Send some graph data to the graph store
-     *
-     * This method is used by insert() and replace()
-     *
-     * @ignore
-     */
-    protected function sendGraph($method, $graph, $uriRef, $format)
-    {
-        if (is_object($graph) and $graph instanceof EasyRdf_Graph) {
-            if ($uriRef === null) {
-                $uriRef = $graph->getUri();
-            }
-            $data = $graph->serialise($format);
-        } else {
-            $data = $graph;
-        }
-
-        if ($uriRef === null) {
-            throw new InvalidArgumentException('Graph IRI is not specified');
-        }
-
-        $formatObj = EasyRdf_Format::getFormat($format);
-        $mimeType = $formatObj->getDefaultMimeType();
-
-        if ($uriRef === self::DEFAULT_GRAPH) {
-            $dataUrl = $this->urlForGraph(self::DEFAULT_GRAPH);
-        } else {
-            $graphUri = $this->parsedUri->resolve($uriRef)->toString();
-            $dataUrl = $this->urlForGraph($graphUri);
-        }
-
-        $client = EasyRdf_Http::getDefaultHttpClient();
-        $client->resetParameters(true);
-        $client->setUri($dataUrl);
-        $client->setMethod($method);
-        $client->setRawData($data);
-        $client->setHeaders('Content-Type', $mimeType);
-
-        $response = $client->request();
-
-        if (!$response->isSuccessful()) {
-            throw new EasyRdf_Exception(
-                "HTTP request for {$dataUrl} failed: ".$response->getMessage()
-            );
-        }
-
-        return $response;
-    }
-
-    /** Replace the contents of a graph in the graph store with new data
-     *
-     * The $graph parameter is the EasyRdf_Graph object to be sent to the
-     * graph store. Alternatively it can be a string, already serialised.
-     *
-     * The URI can either be a full absolute URI or
-     * a URI relative to the URI of the graph store.
-     *
-     * The $format parameter can be given to specify the serialisation
-     * used to send the graph data to the graph store.
-     *
-     * @param EasyRdf_Graph|string $graph  Data
-     * @param string               $uriRef The URI of graph to be replaced
-     * @param string               $format The format of the data to send to the graph store
-     * @return EasyRdf_Http_Response The response from the graph store
-     */
-    public function replace($graph, $uriRef = null, $format = 'ntriples')
-    {
-        return $this->sendGraph('PUT', $graph, $uriRef, $format);
-    }
-
-    /**
-     * Replace the contents of default graph in the graph store with new data
-     *
-     * The $graph parameter is the EasyRdf_Graph object to be sent to the
-     * graph store. Alternatively it can be a string, already serialised.
-     *
-     * The $format parameter can be given to specify the serialisation
-     * used to send the graph data to the graph store.
-     *
-     * @param EasyRdf_Graph|string $graph  Data
-     * @param string               $format The format of the data to send to the graph store
-     * @return EasyRdf_Http_Response The response from the graph store
-     */
-    public function replaceDefault($graph, $format = 'ntriples')
-    {
-        return self::replace($graph, self::DEFAULT_GRAPH, $format);
-    }
-
-    /** Add data to a graph in the graph store
-     *
-     * The $graph parameter is the EasyRdf_Graph object to be sent to the
-     * graph store. Alternatively it can be a string, already serialised.
-     *
-     * The URI can either be a full absolute URI or
-     * a URI relative to the URI of the graph store.
-     *
-     * The $format parameter can be given to specify the serialisation
-     * used to send the graph data to the graph store.
-     *
-     * @param EasyRdf_Graph|string $graph  Data
-     * @param string               $uriRef The URI of graph to be added to
-     * @param string               $format The format of the data to send to the graph store
-     * @return object EasyRdf_Http_Response The response from the graph store
-     */
-    public function insert($graph, $uriRef = null, $format = 'ntriples')
-    {
-        return $this->sendGraph('POST', $graph, $uriRef, $format);
-    }
-
-    /**
-     * Add data to default graph of the graph store
-     *
-     * The $graph parameter is the EasyRdf_Graph object to be sent to the
-     * graph store. Alternatively it can be a string, already serialised.
-     *
-     * The $format parameter can be given to specify the serialisation
-     * used to send the graph data to the graph store.
-     *
-     * @param EasyRdf_Graph|string $graph  Data
-     * @param string               $format The format of the data to send to the graph store
-     * @return object EasyRdf_Http_Response The response from the graph store
-     */
-    public function insertIntoDefault($graph, $format = 'ntriples')
-    {
-        return $this->insert($graph, self::DEFAULT_GRAPH, $format);
-    }
-
-    /** Delete named graph content from the graph store
-     *
-     * The URI can either be a full absolute URI or
-     * a URI relative to the URI of the graph store.
-     *
-     * @param string $uriRef The URI of graph to be added to
-     *
-     * @throws EasyRdf_Exception
-     * @return EasyRdf_Http_Response The response from the graph store
-     */
-    public function delete($uriRef)
-    {
-        if ($uriRef === self::DEFAULT_GRAPH) {
-            $dataUrl = $this->urlForGraph(self::DEFAULT_GRAPH);
-        } else {
-            $graphUri = $this->parsedUri->resolve($uriRef)->toString();
-            $dataUrl = $this->urlForGraph($graphUri);
-        }
-
-        $client = EasyRdf_Http::getDefaultHttpClient();
-        $client->resetParameters(true);
-        $client->setUri($dataUrl);
-        $client->setMethod('DELETE');
-        $response = $client->request();
-
-        if (!$response->isSuccessful()) {
-            throw new EasyRdf_Exception(
-                "HTTP request to delete {$dataUrl} failed: ".$response->getMessage()
-            );
-        }
-
-        return $response;
-    }
-
-    /**
-     * Delete default graph content from the graph store
-     *
-     * @return EasyRdf_Http_Response
-     * @throws EasyRdf_Exception
-     */
-    public function deleteDefault()
-    {
-        return $this->delete(self::DEFAULT_GRAPH);
-    }
-
-    /** Work out the full URL for a graph store request.
-     *  by checking if if it is a direct or indirect request.
-     *  @ignore
-     */
-    protected function urlForGraph($url)
-    {
-        if ($url === self::DEFAULT_GRAPH) {
-            $url = $this->uri.'?default';
-        } elseif (strpos($url, $this->uri) === false) {
-            $url = $this->uri."?graph=".urlencode($url);
-        }
-
-        return $url;
-    }
-
-    /** Magic method to return URI of the graph store when casted to string
-     *
-     * @return string The URI of the graph store
-     */
-    public function __toString()
-    {
-        return empty($this->uri) ? '' : $this->uri;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Http.php
deleted file mode 100644
index c978463..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-
-/**
- * Static class to set the HTTP client used by EasyRdf
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Http
-{
-    /** The default HTTP Client object */
-    private static $defaultHttpClient = null;
-
-    /** Set the HTTP Client object used to fetch RDF data
-     *
-     * @param  EasyRdf_Http_Client|Zend_Http_Client $httpClient The new HTTP client object
-     * @return EasyRdf_Http_Client|Zend_Http_Client The new HTTP client object
-     */
-    public static function setDefaultHttpClient($httpClient)
-    {
-        if (!is_object($httpClient) or
-            !($httpClient instanceof Zend_Http_Client or
-              $httpClient instanceof EasyRdf_Http_Client)) {
-            throw new InvalidArgumentException(
-                "\$httpClient should be an object of class Zend_Http_Client or EasyRdf_Http_Client"
-            );
-        }
-        return self::$defaultHttpClient = $httpClient;
-    }
-
-    /** Get the HTTP Client object used to fetch RDF data
-     *
-     * If no HTTP Client has previously been set, then a new
-     * default (EasyRdf_Http_Client) client will be created.
-     *
-     * @return EasyRdf_Http_Client|Zend_Http_Client The HTTP client object
-     */
-    public static function getDefaultHttpClient()
-    {
-        if (!isset(self::$defaultHttpClient)) {
-            self::$defaultHttpClient = new EasyRdf_Http_Client();
-        }
-        return self::$defaultHttpClient;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Client.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Client.php
deleted file mode 100644
index 49f429a..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Client.php
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- * Copyright (c) 2005-2009 Zend Technologies USA Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 2005-2009 Zend Technologies USA Inc.
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * This class is an implemetation of an HTTP client in PHP.
- * It supports basic HTTP 1.0 and 1.1 requests. For a more complete
- * implementation try Zend_Http_Client.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Http_Client
-{
-    /**
-     * Configuration array, set using the constructor or using ::setConfig()
-     *
-     * @var array
-     */
-    private $config = array(
-        'maxredirects'    => 5,
-        'useragent'       => 'EasyRdf_Http_Client',
-        'timeout'         => 10
-    );
-
-    /**
-     * Request URI
-     *
-     * @var string
-     */
-    private $uri = null;
-
-    /**
-     * Associative array of request headers
-     *
-     * @var array
-     */
-    private $headers = array();
-
-    /**
-     * HTTP request method
-     *
-     * @var string
-     */
-    private $method = 'GET';
-
-    /**
-     * Associative array of GET parameters
-     *
-     * @var array
-     */
-    private $paramsGet = array();
-
-    /**
-     * The raw post data to send. Could be set by setRawData($data).
-     *
-     * @var string
-     */
-    private $rawPostData = null;
-
-    /**
-     * Redirection counter
-     *
-     * @var int
-     */
-    private $redirectCounter = 0;
-
-    /**
-     * Constructor method. Will create a new HTTP client. Accepts the target
-     * URL and optionally configuration array.
-     *
-     * @param string $uri
-     * @param array $config Configuration key-value pairs.
-     */
-    public function __construct($uri = null, $config = null)
-    {
-        if ($uri !== null) {
-            $this->setUri($uri);
-        }
-        if ($config !== null) {
-            $this->setConfig($config);
-        }
-    }
-
-    /**
-     * Set the URI for the next request
-     *
-     * @param  string $uri
-     * @return EasyRdf_Http_Client
-     */
-    public function setUri($uri)
-    {
-        if (!is_string($uri)) {
-            $uri = strval($uri);
-        }
-
-        if (!preg_match('/^http(s?):/', $uri)) {
-            throw new InvalidArgumentException(
-                "EasyRdf_Http_Client only supports the 'http' and 'https' schemes."
-            );
-        }
-
-        $this->uri = $uri;
-
-        return $this;
-    }
-
-    /**
-     * Get the URI for the next request
-     *
-     * @return string
-     */
-    public function getUri($asString = true)
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Set configuration parameters for this HTTP client
-     *
-     * @param  array $config
-     * @return EasyRdf_Http_Client
-     * @throws InvalidArgumentException
-     */
-    public function setConfig($config = array())
-    {
-        if ($config == null or !is_array($config)) {
-            throw new InvalidArgumentException(
-                "\$config should be an array and cannot be null"
-            );
-        }
-
-        foreach ($config as $k => $v) {
-            $this->config[strtolower($k)] = $v;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set a request header
-     *
-     * @param string $name Header name (e.g. 'Accept')
-     * @param string $value Header value or null
-     * @return EasyRdf_Http_Client
-     */
-    public function setHeaders($name, $value = null)
-    {
-        $normalizedName = strtolower($name);
-
-        // If $value is null or false, unset the header
-        if ($value === null || $value === false) {
-            unset($this->headers[$normalizedName]);
-        } else {
-            // Else, set the header
-            $this->headers[$normalizedName] = array($name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the next request's method
-     *
-     * Validated the passed method and sets it.
-     *
-     * @param string $method
-     * @return EasyRdf_Http_Client
-     * @throws InvalidArgumentException
-     */
-    public function setMethod($method)
-    {
-        if (!is_string($method) or !preg_match('/^[A-Z]+$/', $method)) {
-            throw new InvalidArgumentException("Invalid HTTP request method.");
-        }
-
-        $this->method = $method;
-
-        return $this;
-    }
-
-    /**
-     * Get the method for the next request
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Get the value of a specific header
-     *
-     * Note that if the header has more than one value, an array
-     * will be returned.
-     *
-     * @param string $key
-     * @return string|array|null The header value or null if it is not set
-     */
-    public function getHeader($key)
-    {
-        $key = strtolower($key);
-        if (isset($this->headers[$key])) {
-            return $this->headers[$key][1];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Set a GET parameter for the request.
-     *
-     * @param string $name
-     * @param string $value
-     * @return EasyRdf_Http_Client
-     */
-    public function setParameterGet($name, $value = null)
-    {
-        if ($value === null) {
-            if (isset($this->paramsGet[$name])) {
-                unset($this->paramsGet[$name]);
-            }
-        } else {
-            $this->paramsGet[$name] = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get a GET parameter for the request.
-     *
-     * @param string $name
-     * @return string value
-     */
-    public function getParameterGet($name)
-    {
-        if (isset($this->paramsGet[$name])) {
-            return $this->paramsGet[$name];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get all the GET parameters
-     *
-     * @return array
-     */
-    public function getParametersGet()
-    {
-        return $this->paramsGet;
-    }
-
-    /**
-     * Get the number of redirections done on the last request
-     *
-     * @return int
-     */
-    public function getRedirectionsCount()
-    {
-        return $this->redirectCounter;
-    }
-
-    /**
-     * Set the raw (already encoded) POST data.
-     *
-     * This function is here for two reasons:
-     * 1. For advanced user who would like to set their own data, already encoded
-     * 2. For backwards compatibilty: If someone uses the old post($data) method.
-     *    this method will be used to set the encoded data.
-     *
-     * $data can also be stream (such as file) from which the data will be read.
-     *
-     * @param string|resource $data
-     * @return Zend_Http_Client
-     */
-    public function setRawData($data)
-    {
-        $this->rawPostData = $data;
-        return $this;
-    }
-
-    /**
-     * Get the raw (already encoded) POST data.
-     *
-     * @return string
-     */
-    public function getRawData()
-    {
-        return $this->rawPostData;
-    }
-
-    /**
-     * Clear all GET and POST parameters
-     *
-     * Should be used to reset the request parameters if the client is
-     * used for several concurrent requests.
-     *
-     * clearAll parameter controls if we clean just parameters or also
-     * headers
-     *
-     * @param bool $clearAll Should all data be cleared?
-     * @return EasyRdf_Http_Client
-     */
-    public function resetParameters($clearAll = false)
-    {
-        // Reset parameter data
-        $this->paramsGet   = array();
-        $this->rawPostData = null;
-        $this->method      = 'GET';
-
-        if ($clearAll) {
-            $this->headers = array();
-        } else {
-            // Clear outdated headers
-            if (isset($this->headers['content-type'])) {
-                unset($this->headers['content-type']);
-            }
-            if (isset($this->headers['content-length'])) {
-                unset($this->headers['content-length']);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Send the HTTP request and return an HTTP response object
-     *
-     * @return EasyRdf_Http_Response
-     * @throws EasyRdf_Exception
-     */
-    public function request($method = null)
-    {
-        if (!$this->uri) {
-            throw new EasyRdf_Exception(
-                "Set URI before calling EasyRdf_Http_Client->request()"
-            );
-        }
-
-        if ($method) {
-            $this->setMethod($method);
-        }
-        $this->redirectCounter = 0;
-        $response = null;
-
-        // Send the first request. If redirected, continue.
-        do {
-            // Clone the URI and add the additional GET parameters to it
-            $uri = parse_url($this->uri);
-            if ($uri['scheme'] === 'http') {
-                $host = $uri['host'];
-            } elseif ($uri['scheme'] === 'https') {
-                $host = 'ssl://'.$uri['host'];
-            } else {
-                throw new EasyRdf_Exception(
-                    "Unsupported URI scheme: ".$uri['scheme']
-                );
-            }
-
-            if (isset($uri['port'])) {
-                $port = $uri['port'];
-            } else {
-                if ($uri['scheme'] === 'https') {
-                    $port = 443;
-                } else {
-                    $port = 80;
-                }
-            }
-
-            if (!empty($this->paramsGet)) {
-                if (!empty($uri['query'])) {
-                    $uri['query'] .= '&';
-                } else {
-                    $uri['query'] = '';
-                }
-                $uri['query'] .= http_build_query($this->paramsGet, null, '&');
-            }
-
-            $headers = $this->prepareHeaders($uri['host'], $port);
-
-            // Open socket to remote server
-            $socket = @fsockopen($host, $port, $errno, $errstr, $this->config['timeout']);
-            if (!$socket) {
-                throw new EasyRdf_Exception("Unable to connect to $host:$port ($errstr)");
-            }
-            stream_set_timeout($socket, $this->config['timeout']);
-            $info = stream_get_meta_data($socket);
-
-            // Write the request
-            $path = $uri['path'];
-            if (empty($path)) {
-                $path = '/';
-            }
-            if (isset($uri['query'])) {
-                $path .= '?' . $uri['query'];
-            }
-            fwrite($socket, "{$this->method} {$path} HTTP/1.1\r\n");
-            foreach ($headers as $k => $v) {
-                if (is_string($k)) {
-                    $v = ucfirst($k) . ": $v";
-                }
-                fwrite($socket, "$v\r\n");
-            }
-            fwrite($socket, "\r\n");
-
-            // Send the request body, if there is one set
-            if (isset($this->rawPostData)) {
-                fwrite($socket, $this->rawPostData);
-            }
-
-            // Read in the response
-            $content = '';
-            while (!feof($socket) && !$info['timed_out']) {
-                $content .= fgets($socket);
-                $info = stream_get_meta_data($socket);
-            }
-
-            if ($info['timed_out']) {
-                throw new EasyRdf_Exception("Request to $host:$port timed out");
-            }
-
-            // FIXME: support HTTP/1.1 100 Continue
-
-            // Close the socket
-            @fclose($socket);
-
-            // Parse the response string
-            $response = EasyRdf_Http_Response::fromString($content);
-
-            // If we got redirected, look for the Location header
-            if ($response->isRedirect() &&
-                   ($location = $response->getHeader('location'))
-               ) {
-
-                // Avoid problems with buggy servers that add whitespace at the
-                // end of some headers (See ZF-11283)
-                $location = trim($location);
-
-                // Some servers return relative URLs in the location header
-                // resolve it in relation to previous request
-                $baseUri = new EasyRdf_ParsedUri($this->uri);
-                $location = $baseUri->resolve($location)->toString();
-
-                // If it is a 303 then drop the parameters and send a GET request
-                if ($response->getStatus() == 303) {
-                    $this->resetParameters();
-                    $this->setMethod('GET');
-                }
-
-                // If we got a well formed absolute URI
-                if (parse_url($location)) {
-                    $this->setHeaders('host', null);
-                    $this->setUri($location);
-                } else {
-                    throw new EasyRdf_Exception(
-                        "Failed to parse Location header returned by ".
-                        $this->uri
-                    );
-                }
-                ++$this->redirectCounter;
-
-            } else {
-                // If we didn't get any location, stop redirecting
-                break;
-            }
-
-
-        } while ($this->redirectCounter < $this->config['maxredirects']);
-
-        return $response;
-    }
-
-    /**
-     * Prepare the request headers
-     *
-     * @ignore
-     * @return array
-     */
-    protected function prepareHeaders($host, $port)
-    {
-        $headers = array();
-
-        // Set the host header
-        if (! isset($this->headers['host'])) {
-            // If the port is not default, add it
-            if ($port !== 80 and $port !== 443) {
-                $host .= ':' . $port;
-            }
-            $headers[] = "Host: {$host}";
-        }
-
-        // Set the connection header
-        if (! isset($this->headers['connection'])) {
-            $headers[] = "Connection: close";
-        }
-
-        // Set the user agent header
-        if (! isset($this->headers['user-agent'])) {
-            $headers[] = "User-Agent: {$this->config['useragent']}";
-        }
-
-        // If we have rawPostData set, set the content-length header
-        if (isset($this->rawPostData)) {
-            $headers[] = "Content-Length: ".strlen($this->rawPostData);
-        }
-
-        // Add all other user defined headers
-        foreach ($this->headers as $header) {
-            list($name, $value) = $header;
-            if (is_array($value)) {
-                $value = implode(', ', $value);
-            }
-
-            $headers[] = "$name: $value";
-        }
-
-        return $headers;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Exception.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Exception.php
deleted file mode 100644
index 4e4c073..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Exception.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-
-class EasyRdf_Http_Exception extends EasyRdf_Exception
-{
-    private $body;
-
-    public function __construct($message = "", $code = 0, Exception $previous = null, $body = '')
-    {
-        parent::__construct($message, $code, $previous);
-        $this->body = $body;
-    }
-
-    public function getBody()
-    {
-        return $this->body;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php
deleted file mode 100644
index 21f986a..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.
- * Copyright (c) 2005-2009 Zend Technologies USA Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc.
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an HTTP 1.0 / 1.1 response message.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 2005-2009 Zend Technologies USA Inc.
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Http_Response
-{
-
-    /**
-     * The HTTP response status code
-     *
-     * @var int
-     */
-    private $status;
-
-    /**
-     * The HTTP response code as string
-     * (e.g. 'Not Found' for 404 or 'Internal Server Error' for 500)
-     *
-     * @var string
-     */
-    private $message;
-
-    /**
-     * The HTTP response headers array
-     *
-     * @var array
-     */
-    private $headers = array();
-
-    /**
-     * The HTTP response body
-     *
-     * @var string
-     */
-    private $body;
-
-    /**
-     * Constructor.
-     *
-     * @param  int     $status HTTP Status code
-     * @param  array   $headers The HTTP response headers
-     * @param  string  $body The content of the response
-     * @param  string  $version The HTTP Version (1.0 or 1.1)
-     * @param  string  $message The HTTP response Message
-     * @return object  EasyRdf_Http_Response
-     */
-    public function __construct(
-        $status,
-        $headers,
-        $body = null,
-        $version = '1.1',
-        $message = null
-    ) {
-        $this->status = intval($status);
-        $this->body = $body;
-        $this->version = $version;
-        $this->message = $message;
-
-        foreach ($headers as $k => $v) {
-            $k = ucwords(strtolower($k));
-            $this->headers[$k] = $v;
-        }
-    }
-
-    /**
-     * Check whether the response in successful
-     *
-     * @return boolean
-     */
-    public function isSuccessful()
-    {
-        return ($this->status >= 200 && $this->status < 300);
-    }
-
-    /**
-     * Check whether the response is an error
-     *
-     * @return boolean
-     */
-    public function isError()
-    {
-        return ($this->status >= 400 && $this->status < 600);
-    }
-
-    /**
-     * Check whether the response is a redirection
-     *
-     * @return boolean
-     */
-    public function isRedirect()
-    {
-        return ($this->status >= 300 && $this->status < 400);
-    }
-
-    /**
-     * Get the HTTP response status code
-     *
-     * @return int
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Return a message describing the HTTP response code
-     * (Eg. "OK", "Not Found", "Moved Permanently")
-     *
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Get the response body as string
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        // Decode the body if it was transfer-encoded
-        switch (strtolower($this->getHeader('transfer-encoding'))) {
-            // Handle chunked body
-            case 'chunked':
-                return self::decodeChunkedBody($this->body);
-                break;
-
-            // No transfer encoding, or unknown encoding extension:
-            // return body as is
-            default:
-                return $this->body;
-                break;
-        }
-    }
-
-    /**
-     * Get the raw response body (as transfered "on wire") as string
-     *
-     * If the body is encoded (with Transfer-Encoding, not content-encoding -
-     * IE "chunked" body), gzip compressed, etc. it will not be decoded.
-     *
-     * @return string
-     */
-    public function getRawBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Get the HTTP version of the response
-     *
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Get the response headers
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Get a specific header as string, or null if it is not set
-     *
-     * @param string$header
-     * @return string|array|null
-     */
-    public function getHeader($header)
-    {
-        $header = ucwords(strtolower($header));
-        if (array_key_exists($header, $this->headers)) {
-            return $this->headers[$header];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get all headers as string
-     *
-     * @param boolean $statusLine Whether to return the first status line (ie "HTTP 200 OK")
-     * @param string  $br         Line breaks (eg. "\n", "\r\n", "<br />")
-     * @return string
-     */
-    public function getHeadersAsString($statusLine = true, $br = "\n")
-    {
-        $str = '';
-
-        if ($statusLine) {
-            $str = "HTTP/{$this->version} {$this->status} {$this->message}{$br}";
-        }
-
-        // Iterate over the headers and stringify them
-        foreach ($this->headers as $name => $value) {
-            if (is_string($value)) {
-                $str .= "{$name}: {$value}{$br}";
-            } elseif (is_array($value)) {
-                foreach ($value as $subval) {
-                    $str .= "{$name}: {$subval}{$br}";
-                }
-            }
-        }
-
-        return $str;
-    }
-
-    /**
-     * Create an EasyRdf_Http_Response object from a HTTP response string
-     *
-     * @param string $responseStr
-     * @return EasyRdf_Http_Response
-     */
-    public static function fromString($responseStr)
-    {
-        // First, split body and headers
-        $matches = preg_split('|(?:\r?\n){2}|m', $responseStr, 2);
-        if ($matches and sizeof($matches) == 2) {
-            list ($headerLines, $body) = $matches;
-        } else {
-            throw new EasyRdf_Exception(
-                "Failed to parse HTTP response."
-            );
-        }
-
-        // Split headers part to lines
-        $headerLines = preg_split('|[\r\n]+|m', $headerLines);
-        $status = array_shift($headerLines);
-        if (preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]+)|", $status, $m)) {
-            $version = $m[1];
-            $status = $m[2];
-            $message = $m[3];
-        } else {
-            throw new EasyRdf_Exception(
-                "Failed to parse HTTP response status line."
-            );
-        }
-
-        // Process the rest of the header lines
-        $headers = array();
-        foreach ($headerLines as $line) {
-            if (preg_match("|^([\w-]+):\s+(.+)$|", $line, $m)) {
-                $hName = ucwords(strtolower($m[1]));
-                $hValue = $m[2];
-
-                if (isset($headers[$hName])) {
-                    if (! is_array($headers[$hName])) {
-                        $headers[$hName] = array($headers[$hName]);
-                    }
-                    $headers[$hName][] = $hValue;
-                } else {
-                    $headers[$hName] = $hValue;
-                }
-            }
-        }
-
-        return new EasyRdf_Http_Response($status, $headers, $body, $version, $message);
-    }
-
-
-    /**
-     * Decode a "chunked" transfer-encoded body and return the decoded text
-     *
-     * @param string $body
-     * @return string
-     */
-    public static function decodeChunkedBody($body)
-    {
-        $decBody = '';
-
-        while (trim($body)) {
-            if (preg_match('/^([\da-fA-F]+)[^\r\n]*\r\n/sm', $body, $m)) {
-                $length = hexdec(trim($m[1]));
-                $cut = strlen($m[0]);
-                $decBody .= substr($body, $cut, $length);
-                $body = substr($body, $cut + $length + 2);
-            } else {
-                throw new EasyRdf_Exception(
-                    "Failed to decode chunked body in HTTP response."
-                );
-            }
-        }
-
-        return $decBody;
-    }
-
-
-    /**
-     * Get the entire response as string
-     *
-     * @param string $br Line breaks (eg. "\n", "\r\n", "<br />")
-     * @return string
-     */
-    public function asString($br = "\n")
-    {
-        return $this->getHeadersAsString(true, $br) . $br . $this->getRawBody();
-    }
-
-    /**
-     * Implements magic __toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->asString();
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Isomorphic.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Isomorphic.php
deleted file mode 100644
index 5b46125..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Isomorphic.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Functions for comparing two graphs with each other
- *
- * Based on rdf-isomorphic.rb by Ben Lavender:
- * https://github.com/ruby-rdf/rdf-isomorphic
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Isomorphic
-{
-    /**
-     * Check if one graph is isomorphic (equal) to another graph
-     *
-     * For example:
-     *    $graphA = EasyRdf_Graph::newAndLoad('http://example.com/a.ttl');
-     *    $graphB = EasyRdf_Graph::newAndLoad('http://example.com/b.ttl');
-     *    if (EasyRdf_Isomorphic::isomorphic($graphA, $graphB)) print "Equal!";
-     *
-     * @param  object EasyRdf_Graph  $graphA  The first graph to be compared
-     * @param  object EasyRdf_Graph  $graphB  The second graph to be compared
-     * @return boolean True if the two graphs are isomorphic
-     */
-    public static function isomorphic($graphA, $graphB)
-    {
-        return is_array(self::bijectionBetween($graphA, $graphB));
-    }
-
-    /**
-     * Returns an associative array of bnode identifiers representing an isomorphic
-     * bijection of one EasyRdf_Graph to another EasyRdf_Graph's blank nodes or
-     * null if a bijection cannot be found.
-     *
-     * @param  object EasyRdf_Graph  $graphA  The first graph to be compared
-     * @param  object EasyRdf_Graph  $graphB  The second graph to be compared
-     * @return array bnode mapping from $graphA to $graphB
-     */
-    public static function bijectionBetween($graphA, $graphB)
-    {
-        $bnodesA = array();
-        $bnodesB = array();
-        $statementsA = array();
-        $statementsB = array();
-
-        // Quick initial check: are there differing numbers of subjects?
-        if (self::countSubjects($graphA) != self::countSubjects($graphB)) {
-            return null;
-        }
-
-        // Check if all the statements in Graph A exist in Graph B
-        $groundedStatementsMatch = self::groundedStatementsMatch($graphA, $graphB, $bnodesA, $statementsA);
-
-        if ($groundedStatementsMatch) {
-            // Check if all the statements in Graph B exist in Graph A
-            $groundedStatementsMatch = self::groundedStatementsMatch($graphB, $graphA, $bnodesB, $statementsB);
-        }
-
-        if ($groundedStatementsMatch === false) {
-            // The grounded statements do not match
-            return null;
-        } elseif (count($bnodesA) > 0 or count($bnodesB > 0)) {
-            // There are blank nodes - build a bi-jection
-            return self::buildBijectionTo($statementsA, $bnodesA, $statementsB, $bnodesB);
-        } else {
-            // No bnodes and the grounded statements match
-            return array();
-        }
-    }
-
-    /**
-     * Count the number of subjects in a graph
-     * @ignore
-     */
-    private static function countSubjects($graph)
-    {
-        return count($graph->toRdfPhp());
-    }
-
-    /**
-     * Check if all the statements in $graphA also appear in $graphB
-     * @ignore
-     */
-    private static function groundedStatementsMatch($graphA, $graphB, &$bnodes, &$anonStatements)
-    {
-        $groundedStatementsMatch = true;
-
-        foreach ($graphA->toRdfPhp() as $subject => $properties) {
-            if (substr($subject, 0, 2) == '_:') {
-                array_push($bnodes, $subject);
-                $subjectIsBnode = true;
-            } else {
-                $subjectIsBnode = false;
-            }
-
-            foreach ($properties as $property => $values) {
-                foreach ($values as $value) {
-                    if ($value['type'] == 'uri' and substr($value['value'], 0, 2) == '_:') {
-                        array_push($bnodes, $value['value']);
-                        $objectIsBnode = true;
-                    } else {
-                        $objectIsBnode = false;
-                    }
-
-                    if ($groundedStatementsMatch and
-                        $subjectIsBnode === false and
-                        $objectIsBnode === false and
-                        $graphB->hasProperty($subject, $property, $value) === false
-                    ) {
-                        $groundedStatementsMatch = false;
-                    }
-
-                    if ($subjectIsBnode or $objectIsBnode) {
-                        array_push(
-                            $anonStatements,
-                            array(
-                                array('type' => $subjectIsBnode ? 'bnode' : 'uri', 'value' => $subject),
-                                array('type' => 'uri', 'value' => $property),
-                                $value
-                            )
-                        );
-                    }
-                }
-            }
-        }
-
-        return $groundedStatementsMatch;
-    }
-
-    /**
-     * The main recursive bijection algorithm.
-     *
-     * This algorithm is very similar to the one explained by Jeremy Carroll in
-     * http://www.hpl.hp.com/techreports/2001/HPL-2001-293.pdf. Page 12 has the
-     * relevant pseudocode.
-     *
-     * @ignore
-     */
-    private static function buildBijectionTo
-    (
-        $statementsA,
-        $nodesA,
-        $statementsB,
-        $nodesB,
-        $groundedHashesA = array(),
-        $groundedHashesB = array()
-    ) {
-
-        // Create a hash signature of every node, based on the signature of
-        // statements it exists in.
-        // We also save hashes of nodes that cannot be reliably known; we will use
-        // that information to eliminate possible recursion combinations.
-        //
-        // Any mappings given in the method parameters are considered grounded.
-        list($hashesA, $ungroundedHashesA) = self::hashNodes($statementsA, $nodesA, $groundedHashesA);
-        list($hashesB, $ungroundedHashesB) = self::hashNodes($statementsB, $nodesB, $groundedHashesB);
-
-        // Grounded hashes are built at the same rate between the two graphs (if
-        // they are isomorphic).  If there exists a grounded node in one that is
-        // not in the other, we can just return.  Ungrounded nodes might still
-        // conflict, so we don't check them.  This is a little bit messy in the
-        // middle of the method, and probably slows down isomorphic checks,  but
-        // prevents almost-isomorphic cases from getting nutty.
-        foreach ($hashesA as $nodeA => $hashA) {
-            if (!in_array($hashA, $hashesB)) {
-                return null;
-            }
-        }
-        foreach ($hashesB as $nodeB => $hashB) {
-            if (!in_array($hashB, $hashesA)) {
-                return null;
-            }
-        }
-
-        // Using the created hashes, map nodes to other_nodes
-        // Ungrounded hashes will also be equal, but we keep the distinction
-        // around for when we recurse later (we only recurse on ungrounded nodes)
-        $bijection = array();
-        foreach ($nodesA as $nodeA) {
-            $foundNode = null;
-            foreach ($ungroundedHashesB as $nodeB => $hashB) {
-                if ($ungroundedHashesA[$nodeA] == $hashB) {
-                    $foundNode = $nodeB;
-                }
-            }
-
-            if ($foundNode) {
-                $bijection[$nodeA] = $foundNode;
-
-                // Deletion is required to keep counts even; two nodes with identical
-                // signatures can biject to each other at random.
-                unset($ungroundedHashesB[$foundNode]);
-            }
-        }
-
-        // bijection is now a mapping of nodes to other_nodes.  If all are
-        // accounted for on both sides, we have a bijection.
-        //
-        // If not, we will speculatively mark pairs with matching ungrounded
-        // hashes as bijected and recurse.
-        $bijectionA = array_keys($bijection);
-        $bijectionB = array_values($bijection);
-        sort($bijectionA);
-        sort($nodesA);
-        sort($bijectionB);
-        sort($nodesB);
-        if ($bijectionA != $nodesA or $bijectionB != $nodesB) {
-            $bijection = null;
-
-            foreach ($nodesA as $nodeA) {
-
-                // We don't replace grounded nodes' hashes
-                if (isset($hashesA[$nodeA])) {
-                    continue;
-                }
-
-                foreach ($nodesB as $nodeB) {
-                    // We don't replace grounded nodesB's hashes
-                    if (isset($hashesB[$nodeB])) {
-                        continue;
-                    }
-
-                    // The ungrounded signature must match for this to potentially work
-                    if ($ungroundedHashesA[$nodeA] != $ungroundedHashesB[$nodeB]) {
-                        continue;
-                    }
-
-                    $hash = sha1($nodeA);
-                    $hashesA[$nodeA] = $hash;
-                    $hashesB[$nodeB] = $hash;
-                    $bijection = self::buildBijectionTo(
-                        $statementsA,
-                        $nodesA,
-                        $statementsB,
-                        $nodesA,
-                        $hashesA,
-                        $hashesB
-                    );
-                }
-            }
-        }
-
-        return $bijection;
-    }
-
-    /**
-     * Given a set of statements, create a mapping of node => SHA1 for a given
-     * set of blank nodes.  grounded_hashes is a mapping of node => SHA1 pairs
-     * that we will take as a given, and use those to make more specific
-     * signatures of other nodes.
-     *
-     * Returns a tuple of associative arrats: one of grounded hashes, and one of all
-     * hashes.  grounded hashes are based on non-blank nodes and grounded blank
-     * nodes, and can be used to determine if a node's signature matches
-     * another.
-     *
-     * @ignore
-     */
-    private static function hashNodes($statements, $nodes, $groundedHahes)
-    {
-        $hashes = $groundedHahes;
-        $ungroundedHashes = array();
-        $hashNeeded = true;
-
-        // We may have to go over the list multiple times.  If a node is marked as
-        // grounded, other nodes can then use it to decide their own state of
-        // grounded.
-        while ($hashNeeded) {
-            $startingGroundedNodes = count($hashes);
-            foreach ($nodes as $node) {
-                if (!isset($hashes[$node])) {
-                    $hash = self::nodeHashFor($node, $statements, $hashes);
-                    if (self::nodeIsGrounded($node, $statements, $hashes)) {
-                        $hashes[$node] = $hash;
-                    }
-                }
-                $ungroundedHashes[$node] = $hash;
-            }
-
-            // after going over the list, any nodes with a unique hash can be marked
-            // as grounded, even if we have not tied them back to a root yet.
-            $uniques = array();
-            foreach ($ungroundedHashes as $node => $hash) {
-                $uniques[$hash] = isset($uniques[$hash]) ? false : $node;
-            }
-            foreach ($uniques as $hash => $node) {
-                if ($node) {
-                    $hashes[$node] = $hash;
-                }
-            }
-            $hashNeeded = ($startingGroundedNodes != count($hashes));
-        }
-
-        return array($hashes, $ungroundedHashes);
-    }
-
-    /**
-     * Generate a hash for a node based on the signature of the statements it
-     * appears in.  Signatures consist of grounded elements in statements
-     * associated with a node, that is, anything but an ungrounded anonymous
-     * node.  Creating the hash is simply hashing a sorted list of each
-     * statement's signature, which is itself a concatenation of the string form
-     * of all grounded elements.
-     *
-     * Nodes other than the given node are considered grounded if they are a
-     * member in the given hash.
-     *
-     * Returns a tuple consisting of grounded being true or false and the string
-     * for the hash
-     *
-     * @ignore
-     */
-    private static function nodeHashFor($node, $statements, $hashes)
-    {
-        $statement_signatures = array();
-        foreach ($statements as $statement) {
-            foreach ($statement as $n) {
-                if ($n['type'] != 'literal' and $n['value'] == $node) {
-                    array_push(
-                        $statement_signatures,
-                        self::hashStringFor($statement, $hashes, $node)
-                    );
-                }
-            }
-        }
-
-        // Note that we sort the signatures--without a canonical ordering,
-        // we might get different hashes for equivalent nodes
-        sort($statement_signatures);
-
-        // Convert statements into one long string and hash it
-        return sha1(implode('', $statement_signatures));
-    }
-
-    /**
-     * Returns true if a given node is grounded
-     * A node is groundd if it is not a blank node or it is included
-     * in the given mapping of grounded nodes.
-     *
-     * @ignore
-     */
-    private static function nodeIsGrounded($node, $statements, $hashes)
-    {
-        $grounded = true;
-        foreach ($statements as $statement) {
-            if (in_array($node, $statement)) {
-                foreach ($statement as $resource) {
-                    if ($node['type'] != 'bnode' or
-                        isset($hashes[$node['value']]) or
-                        $resource == $node
-                    ) {
-                        $grounded = false;
-                    }
-                }
-            }
-        }
-        return $grounded;
-    }
-
-    /**
-     * Provide a string signature for the given statement, collecting
-     * string signatures for grounded node elements.
-     *
-     * @ignore
-     */
-    private static function hashStringFor($statement, $hashes, $node)
-    {
-        $str = "";
-        foreach ($statement as $r) {
-            $str .= self::stringForNode($r, $hashes, $node);
-        }
-        return $str;
-    }
-
-    /**
-     * Provides a string for the given node for use in a string signature
-     * Non-anonymous nodes will return their string form.  Grounded anonymous
-     * nodes will return their hashed form.
-     *
-     * @ignore
-     */
-    private static function stringForNode($node, $hashes, $target)
-    {
-        if (is_null($node)) {
-            return "";
-        } elseif ($node['type'] == 'bnode') {
-            if ($node['value'] == $target) {
-                return "itself";
-            } elseif (isset($hashes[$node['value']])) {
-                return $hashes[$node['value']];
-            } else {
-                return "a blank node";
-            }
-        } else {
-            $s = new EasyRdf_Serialiser_Ntriples();
-            return $s->serialiseValue($node);
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal.php
deleted file mode 100644
index b6e5a71..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal
-{
-    /** @ignore a mapping from datatype uri to class name */
-    private static $datatypeMap = array();
-
-    /** @ignore A mapping from class name to datatype URI */
-    private static $classMap = array();
-
-    /** @ignore The string value for this literal */
-    protected $value = null;
-
-    /** @ignore The language of the literal (e.g. 'en') */
-    protected $lang = null;
-
-    /** @ignore The datatype URI of the literal */
-    protected $datatype = null;
-
-
-    /** Create a new literal object
-     *
-     * PHP values of type bool, int or float, will automatically be converted
-     * to the corresponding datatype and PHP sub-class.
-     *
-     * If a registered datatype is given, then the registered subclass of EasyRdf_Literal
-     * will instantiated.
-     *
-     * Note that literals are not required to have a language or datatype.
-     * Literals cannot have both a language and a datatype.
-     *
-     * @param  mixed  $value     The value of the literal or an associative array
-     * @param  string $lang      The natural language of the literal or null (e.g. 'en')
-     * @param  string $datatype  The datatype of the literal or null (e.g. 'xsd:integer')
-     * @return object EasyRdf_Literal (or subclass of EasyRdf_Literal)
-     */
-    public static function create($value, $lang = null, $datatype = null)
-    {
-        if (EasyRdf_Utils::isAssociativeArray($value)) {
-            if (isset($value['xml:lang'])) {
-                $lang = $value['xml:lang'];
-            } elseif (isset($value['lang'])) {
-                $lang = $value['lang'];
-            }
-            if (isset($value['datatype'])) {
-                $datatype = $value['datatype'];
-            }
-            $value = isset($value['value']) ? $value['value'] : null;
-        }
-
-        if (is_null($datatype) or $datatype === '') {
-            if (is_null($lang) or $lang === '') {
-                // Automatic datatype selection
-                $datatype = self::getDatatypeForValue($value);
-            }
-        } elseif (is_object($datatype)) {
-            $datatype = strval($datatype);
-        } else {
-            // Expand shortened URIs (qnames)
-            $datatype = EasyRdf_Namespace::expand($datatype);
-        }
-
-        // Work out what class to use for this datatype
-        if (isset(self::$datatypeMap[$datatype])) {
-            $class = self::$datatypeMap[$datatype];
-        } else {
-            $class = 'EasyRdf_Literal';
-        }
-        return new $class($value, $lang, $datatype);
-    }
-
-    /** Register an RDF datatype with a PHP class name
-     *
-     * When parsing registered class will be used whenever the datatype
-     * is seen.
-     *
-     * When serialising a registered class, the mapping will be used to
-     * set the datatype in the RDF.
-     *
-     * Example:
-     * EasyRdf_Literal::registerDatatype('xsd:dateTime', 'My_DateTime_Class');
-     *
-     * @param  string  $datatype   The RDF datatype (e.g. xsd:dateTime)
-     * @param  string  $class      The PHP class name (e.g. My_DateTime_Class)
-     */
-    public static function setDatatypeMapping($datatype, $class)
-    {
-        if (!is_string($datatype) or $datatype == null or $datatype == '') {
-            throw new InvalidArgumentException(
-                "\$datatype should be a string and cannot be null or empty"
-            );
-        }
-
-        if (!is_string($class) or $class == null or $class == '') {
-            throw new InvalidArgumentException(
-                "\$class should be a string and cannot be null or empty"
-            );
-        }
-
-        $datatype = EasyRdf_Namespace::expand($datatype);
-        self::$datatypeMap[$datatype] = $class;
-        self::$classMap[$class] = $datatype;
-    }
-
-    /** Remove the mapping between an RDF datatype and a PHP class name
-     *
-     * @param  string  $datatype   The RDF datatype (e.g. xsd:dateTime)
-     */
-    public static function deleteDatatypeMapping($datatype)
-    {
-        if (!is_string($datatype) or $datatype == null or $datatype == '') {
-            throw new InvalidArgumentException(
-                "\$datatype should be a string and cannot be null or empty"
-            );
-        }
-
-        $datatype = EasyRdf_Namespace::expand($datatype);
-        if (isset(self::$datatypeMap[$datatype])) {
-            $class = self::$datatypeMap[$datatype];
-            unset(self::$datatypeMap[$datatype]);
-            unset(self::$classMap[$class]);
-        }
-    }
-
-    /** Get datatype URI for a PHP value.
-     *
-     * This static function is intended for internal use.
-     * Given a PHP value, it will return an XSD datatype
-     * URI for that value, for example:
-     * http://www.w3.org/2001/XMLSchema#integer
-     *
-     * @return string  A URI for the datatype of $value.
-     */
-    public static function getDatatypeForValue($value)
-    {
-        if (is_float($value)) {
-            return 'http://www.w3.org/2001/XMLSchema#double';
-        } elseif (is_int($value)) {
-            return 'http://www.w3.org/2001/XMLSchema#integer';
-        } elseif (is_bool($value)) {
-            return 'http://www.w3.org/2001/XMLSchema#boolean';
-        } elseif (is_object($value) and $value instanceof DateTime) {
-            return 'http://www.w3.org/2001/XMLSchema#dateTime';
-        } else {
-            return null;
-        }
-    }
-
-
-
-    /** Constructor for creating a new literal
-     *
-     * @param  string $value     The value of the literal
-     * @param  string $lang      The natural language of the literal or null (e.g. 'en')
-     * @param  string $datatype  The datatype of the literal or null (e.g. 'xsd:string')
-     * @return object EasyRdf_Literal
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        $this->value = $value;
-        $this->lang = $lang ? $lang : null;
-        $this->datatype = $datatype ? $datatype : null;
-
-        if ($this->datatype) {
-            if (is_object($this->datatype)) {
-                // Convert objects to strings
-                $this->datatype = strval($this->datatype);
-            } else {
-                // Expand shortened URIs (CURIEs)
-                $this->datatype = EasyRdf_Namespace::expand($this->datatype);
-            }
-
-            // Literals can not have both a language and a datatype
-            $this->lang = null;
-        } else {
-            // Set the datatype based on the subclass
-            $class = get_class($this);
-            if (isset(self::$classMap[$class])) {
-                $this->datatype = self::$classMap[$class];
-                $this->lang = null;
-            }
-        }
-
-        if (is_float($this->value)) {
-            // special handling of floats, as they suffer from locale [mis]configuration
-            $this->value = rtrim(sprintf('%F', $this->value), '0');
-        } else {
-            // Cast value to string
-            settype($this->value, 'string');
-        }
-    }
-
-    /** Returns the value of the literal.
-     *
-     * @return string  Value of this literal.
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /** Returns the full datatype URI of the literal.
-     *
-     * @return string  Datatype URI of this literal.
-     */
-    public function getDatatypeUri()
-    {
-        return $this->datatype;
-    }
-
-    /** Returns the shortened datatype URI of the literal.
-     *
-     * @return string  Datatype of this literal (e.g. xsd:integer).
-     */
-    public function getDatatype()
-    {
-        if ($this->datatype) {
-            return EasyRdf_Namespace::shorten($this->datatype);
-        } else {
-            return null;
-        }
-    }
-
-    /** Returns the language of the literal.
-     *
-     * @return string  Language of this literal.
-     */
-    public function getLang()
-    {
-        return $this->lang;
-    }
-
-    /** Returns the properties of the literal as an associative array
-     *
-     * For example:
-     * array('type' => 'literal', 'value' => 'string value')
-     *
-     * @return array  The properties of the literal
-     */
-    public function toRdfPhp()
-    {
-        $array = array(
-            'type' => 'literal',
-            'value' => $this->value
-        );
-
-        if ($this->datatype) {
-            $array['datatype'] = $this->datatype;
-        }
-
-        if ($this->lang) {
-            $array['lang'] = $this->lang;
-        }
-
-        return $array;
-    }
-
-    /** Magic method to return the value of a literal as a string
-     *
-     * @return string The value of the literal
-     */
-    public function __toString()
-    {
-        return isset($this->value) ? $this->value : '';
-    }
-
-    /** Return pretty-print view of the literal
-     *
-     * @param  string $format Either 'html' or 'text'
-     * @param  string $color  The colour of the text
-     * @return string
-     */
-    public function dumpValue($format = 'html', $color = 'black')
-    {
-        return EasyRdf_Utils::dumpLiteralValue($this, $format, $color);
-    }
-}
-
-/*
-   Register default set of datatype classes
-*/
-
-EasyRdf_Literal::setDatatypeMapping('xsd:boolean', 'EasyRdf_Literal_Boolean');
-EasyRdf_Literal::setDatatypeMapping('xsd:date', 'EasyRdf_Literal_Date');
-EasyRdf_Literal::setDatatypeMapping('xsd:dateTime', 'EasyRdf_Literal_DateTime');
-EasyRdf_Literal::setDatatypeMapping('xsd:decimal', 'EasyRdf_Literal_Decimal');
-EasyRdf_Literal::setDatatypeMapping('xsd:hexBinary', 'EasyRdf_Literal_HexBinary');
-EasyRdf_Literal::setDatatypeMapping('rdf:HTML', 'EasyRdf_Literal_HTML');
-EasyRdf_Literal::setDatatypeMapping('xsd:integer', 'EasyRdf_Literal_Integer');
-EasyRdf_Literal::setDatatypeMapping('rdf:XMLLiteral', 'EasyRdf_Literal_XML');
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Boolean.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Boolean.php
deleted file mode 100644
index d8ca2ed..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Boolean.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:boolean
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#boolean
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_Boolean extends EasyRdf_Literal
-{
-    /** Constructor for creating a new boolean literal
-     *
-     * If the value is not a string, then it will be converted to 'true' or 'false'.
-     *
-     * @param  mixed  $value     The value of the literal
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'xsd:boolean')
-     * @return object EasyRdf_Literal_Boolean
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        if (!is_string($value)) {
-            $value = $value ? 'true' : 'false';
-        }
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Return the value of the literal cast to a PHP bool
-     *
-     * If the value is 'true' or '1' return true, otherwise returns false.
-     *
-     * @return bool
-     */
-    public function getValue()
-    {
-        return strtolower($this->value) === 'true' or $this->value === '1';
-    }
-
-    /** Return true if the value of the literal is 'true' or '1'
-     *
-     * @return bool
-     */
-    public function isTrue()
-    {
-        return strtolower($this->value) === 'true' or $this->value === '1';
-    }
-
-    /** Return true if the value of the literal is 'false' or '0'
-     *
-     * @return bool
-     */
-    public function isFalse()
-    {
-        return strtolower($this->value) === 'false' or $this->value === '0';
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Date.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Date.php
deleted file mode 100644
index 0e05acf..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Date.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:date
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#date
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_Date extends EasyRdf_Literal
-{
-    /** Constructor for creating a new date literal
-     *
-     * If the value is a DateTime object, then it will be converted to the xsd:date format.
-     * If no value is given or is is null, then the current date is used.
-     *
-     * @see DateTime
-     *
-     * @param  mixed  $value     The value of the literal
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'xsd:date')
-     * @return object EasyRdf_Literal_Date
-     */
-    public function __construct($value = null, $lang = null, $datatype = null)
-    {
-        // If $value is null, use today's date
-        if (is_null($value)) {
-            $value = new DateTime('today');
-        }
-
-        // Convert DateTime object into string
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d');
-        }
-
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Parses a string using DateTime and creates a new literal
-     *
-     * Example:
-     *   $date = EasyRdf_Literal_Date::parse('1 January 2011');
-     *
-     * @see DateTime
-     * @param string $value The date to parse
-     * @return object EasyRdf_Literal_Date
-     */
-    public static function parse($value)
-    {
-        $value = new DateTime($value);
-        return new EasyRdf_Literal_Date($value);
-    }
-
-    /** Returns the date as a PHP DateTime object
-     *
-     * @see DateTime::format
-     * @return string
-     */
-    public function getValue()
-    {
-        return new DateTime($this->value);
-    }
-
-    /** Returns date formatted according to given format
-     *
-     * @see DateTime::format
-     * @param string $format
-     * @return string
-     */
-    public function format($format)
-    {
-        return $this->getValue()->format($format);
-    }
-
-    /** A full integer representation of the year, 4 digits
-     *
-     * @return integer
-     */
-    public function year()
-    {
-        return (int)$this->format('Y');
-    }
-
-    /** Integer representation of the month
-     *
-     * @return integer
-     */
-    public function month()
-    {
-        return (int)$this->format('m');
-    }
-
-    /** Integer representation of the day of the month
-     *
-     * @return integer
-     */
-    public function day()
-    {
-        return (int)$this->format('d');
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/DateTime.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/DateTime.php
deleted file mode 100644
index c1c602d..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/DateTime.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:dateTime
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#date
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_DateTime extends EasyRdf_Literal_Date
-{
-    /** Constructor for creating a new date and time literal
-     *
-     * If the value is a DateTime object, then it will be converted to the xsd:dateTime format.
-     * If no value is given or is is null, then the current time is used.
-     *
-     * @see DateTime
-     *
-     * @param  mixed  $value     The value of the literal
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'xsd:dateTime')
-     * @return object EasyRdf_Literal_DateTime
-     */
-    public function __construct($value = null, $lang = null, $datatype = null)
-    {
-        // If $value is null, use 'now'
-        if (is_null($value)) {
-            $value = new DateTime('now');
-        }
-
-        // Convert DateTime objects into string
-        if ($value instanceof DateTime) {
-            $atom = $value->format(DateTime::ATOM);
-            $value = preg_replace('/[\+\-]00(\:?)00$/', 'Z', $atom);
-        }
-
-        EasyRdf_Literal::__construct($value, null, $datatype);
-    }
-
-    /** Parses a string using DateTime and creates a new literal
-     *
-     * Example:
-     *   $dt = EasyRdf_Literal_DateTime::parse('Mon 18 Jul 2011 18:45:43 BST');
-     *
-     * @see DateTime
-     * @param string $value The date and time to parse
-     * @return object EasyRdf_Literal_DateTime
-     */
-    public static function parse($value)
-    {
-        $value = new DateTime($value);
-        return new EasyRdf_Literal_DateTime($value);
-    }
-
-    /** 24-hour format of the hour as an integer
-     *
-     * @return integer
-     */
-    public function hour()
-    {
-        return (int)$this->format('H');
-    }
-
-    /** The minutes pasts the hour as an integer
-     *
-     * @return integer
-     */
-    public function min()
-    {
-        return (int)$this->format('i');
-    }
-
-    /** The seconds pasts the minute as an integer
-     *
-     * @return integer
-     */
-    public function sec()
-    {
-        return (int)$this->format('s');
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Decimal.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Decimal.php
deleted file mode 100644
index 51c59c8..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Decimal.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:decimal
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#decimal
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_Decimal extends EasyRdf_Literal
-{
-    /**
-     * written according to http://www.w3.org/TR/xmlschema-2/#decimal
-     */
-    const DECIMAL_REGEX = '^([+\-]?)(((\d+)?\.(\d+))|((\d+)\.?))$';
-
-    /** Constructor for creating a new decimal literal
-     *
-     * @param  double|int|string $value    The value of the literal
-     * @param  string            $lang     Should be null (literals with a datatype can't have a language)
-     * @param  string            $datatype Optional datatype (default 'xsd:decimal')
-     *
-     * @throws UnexpectedValueException
-     * @return EasyRdf_Literal_Decimal
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        if (is_string($value)) {
-            self::validate($value);
-        } elseif (is_double($value) or is_int($value)) {
-            $locale_data = localeconv();
-            $value = str_replace($locale_data['decimal_point'], '.', strval($value));
-        } else {
-            throw new UnexpectedValueException('EasyRdf_Literal_Decimal expects int/float/string as value');
-        }
-
-        $value = self::canonicalise($value);
-
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Return the value of the literal cast to a PHP string
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return strval($this->value);
-    }
-
-    /**
-     * @param string $value
-     *
-     * @throws UnexpectedValueException
-     */
-    public static function validate($value)
-    {
-        if (!mb_ereg_match(self::DECIMAL_REGEX, $value)) {
-            throw new UnexpectedValueException("'{$value}' doesn't look like a valid decimal");
-        }
-    }
-
-    /**
-     * Converts valid xsd:decimal literal to Canonical representation
-     * see http://www.w3.org/TR/xmlschema-2/#decimal
-     *
-     * @param string $value Valid xsd:decimal literal
-     *
-     * @return string
-     */
-    public static function canonicalise($value)
-    {
-        $pieces = array();
-        mb_ereg(self::DECIMAL_REGEX, $value, $pieces);
-
-        $sign       = $pieces[1] === '-' ? '-' : '';  // '+' is not allowed
-        $integer    = ltrim(($pieces[4] !== false) ? $pieces[4] : $pieces[7], '0');
-        $fractional = rtrim($pieces[5], '0');
-
-        if (empty($integer)) {
-            $integer = '0';
-        }
-
-        if (empty($fractional)) {
-            $fractional = '0';
-        }
-
-        return "{$sign}{$integer}.{$fractional}";
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HTML.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HTML.php
deleted file mode 100644
index a4915b7..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HTML.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype rdf:HTML
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/rdf11-concepts/#section-html
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_HTML extends EasyRdf_Literal
-{
-    /** Constructor for creating a new rdf:HTML literal
-     *
-     * @param  mixed  $value     The HTML fragment
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'rdf:HTML')
-     * @return object EasyRdf_Literal_HTML
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Strip the HTML tags from the literal
-     *
-     * @link   http://php.net/manual/en/function.strip-tags.php
-     * @param  string $allowableTags  Optional allowed tag, not be be removed
-     * @return string The literal as plain text
-     */
-    public function stripTags($allowableTags = null)
-    {
-        return strip_tags($this->value, $allowableTags);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HexBinary.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HexBinary.php
deleted file mode 100644
index 7301a10..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/HexBinary.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:hexBinary
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#hexBinary
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_HexBinary extends EasyRdf_Literal
-{
-    /** Constructor for creating a new xsd:hexBinary literal
-     *
-     * @param  mixed  $value     The value of the literal (already encoded as hexadecimal)
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'xsd:hexBinary')
-     * @return object EasyRdf_Literal_HexBinary
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        // Normalise the canonical representation, as specified here:
-        // http://www.w3.org/TR/xmlschema-2/#hexBinary-canonical-repr
-        $value = strtoupper($value);
-
-        // Validate the data
-        if (preg_match('/[^A-F0-9]/', $value)) {
-            throw new InvalidArgumentException(
-                "Literal of type xsd:hexBinary contains non-hexadecimal characters"
-            );
-        }
-
-        parent::__construct(strtoupper($value), null, 'xsd:hexBinary');
-    }
-
-    /** Constructor for creating a new literal object from a binary blob
-     *
-     * @param  string $binary  The binary data
-     * @return object EasyRdf_Literal_HexBinary
-     */
-    public static function fromBinary($binary)
-    {
-        return new self( bin2hex($binary) );
-    }
-
-    /** Decode the hexadecimal string into a binary blob
-     *
-     * @return string The binary blob
-     */
-    public function toBinary()
-    {
-        return pack("H*", $this->value);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Integer.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Integer.php
deleted file mode 100644
index 47de413..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/Integer.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype xsd:integer
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/xmlschema-2/#integer
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_Integer extends EasyRdf_Literal
-{
-    /** Constructor for creating a new integer literal
-     *
-     * @param  mixed  $value     The value of the literal
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'xsd:integer')
-     * @return object EasyRdf_Literal_Integer
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Return the value of the literal cast to a PHP int
-     *
-     * @return double
-     */
-    public function getValue()
-    {
-        return (int)$this->value;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/XML.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/XML.php
deleted file mode 100644
index 3f8dd79..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Literal/XML.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF Literal of datatype rdf:XMLLiteral
- *
- * @package    EasyRdf
- * @link       http://www.w3.org/TR/REC-rdf-syntax/#section-Syntax-XML-literals
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Literal_XML extends EasyRdf_Literal
-{
-    /** Constructor for creating a new rdf:XMLLiteral literal
-     *
-     * @param  mixed  $value     The XML fragment
-     * @param  string $lang      Should be null (literals with a datatype can't have a language)
-     * @param  string $datatype  Optional datatype (default 'rdf:XMLLiteral')
-     * @return object EasyRdf_Literal_XML
-     */
-    public function __construct($value, $lang = null, $datatype = null)
-    {
-        parent::__construct($value, null, $datatype);
-    }
-
-    /** Parse the XML literal into a DOMDocument
-     *
-     * @link   http://php.net/manual/en/domdocument.loadxml.php
-     * @return object DOMDocument
-     */
-    public function domParse()
-    {
-        $dom = new DOMDocument();
-        $dom->loadXML($this->value);
-        return $dom;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php
deleted file mode 100644
index 8990e82..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php
+++ /dev/null
@@ -1,416 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2014 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2014 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * A namespace registry and manipulation class.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2014 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Namespace
-{
-    /** Namespace registry
-     *
-     * List of default namespaces come from:
-     *  - http://www.w3.org/2011/rdfa-context/rdfa-1.1
-     *
-     * With a few extras added.
-     *
-     */
-    private static $initial_namespaces = array(
-        'bibo'    => 'http://purl.org/ontology/bibo/',
-        'cc'      => 'http://creativecommons.org/ns#',
-        'cert'    => 'http://www.w3.org/ns/auth/cert#',
-        'ctag'    => 'http://commontag.org/ns#',
-        'dc'      => 'http://purl.org/dc/terms/',
-        'dc11'    => 'http://purl.org/dc/elements/1.1/',
-        'dcat'    => 'http://www.w3.org/ns/dcat#',
-        'dcterms' => 'http://purl.org/dc/terms/',
-        'doap'    => 'http://usefulinc.com/ns/doap#',
-        'exif'    => 'http://www.w3.org/2003/12/exif/ns#',
-        'foaf'    => 'http://xmlns.com/foaf/0.1/',
-        'geo'     => 'http://www.w3.org/2003/01/geo/wgs84_pos#',
-        'gr'      => 'http://purl.org/goodrelations/v1#',
-        'grddl'   => 'http://www.w3.org/2003/g/data-view#',
-        'ical'    => 'http://www.w3.org/2002/12/cal/icaltzd#',
-        'ma'      => 'http://www.w3.org/ns/ma-ont#',
-        'og'      => 'http://ogp.me/ns#',
-        'org'     => 'http://www.w3.org/ns/org#',
-        'owl'     => 'http://www.w3.org/2002/07/owl#',
-        'prov'    => 'http://www.w3.org/ns/prov#',
-        'qb'      => 'http://purl.org/linked-data/cube#',
-        'rdf'     => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-        'rdfa'    => 'http://www.w3.org/ns/rdfa#',
-        'rdfs'    => 'http://www.w3.org/2000/01/rdf-schema#',
-        'rev'     => 'http://purl.org/stuff/rev#',
-        'rif'     => 'http://www.w3.org/2007/rif#',
-        'rr'      => 'http://www.w3.org/ns/r2rml#',
-        'rss'     => 'http://purl.org/rss/1.0/',
-        'schema'  => 'http://schema.org/',
-        'sd'      => 'http://www.w3.org/ns/sparql-service-description#',
-        'sioc'    => 'http://rdfs.org/sioc/ns#',
-        'skos'    => 'http://www.w3.org/2004/02/skos/core#',
-        'skosxl'  => 'http://www.w3.org/2008/05/skos-xl#',
-        'synd'    => 'http://purl.org/rss/1.0/modules/syndication/',
-        'v'       => 'http://rdf.data-vocabulary.org/#',
-        'vcard'   => 'http://www.w3.org/2006/vcard/ns#',
-        'void'    => 'http://rdfs.org/ns/void#',
-        'wdr'     => 'http://www.w3.org/2007/05/powder#',
-        'wdrs'    => 'http://www.w3.org/2007/05/powder-s#',
-        'wot'     => 'http://xmlns.com/wot/0.1/',
-        'xhv'     => 'http://www.w3.org/1999/xhtml/vocab#',
-        'xml'     => 'http://www.w3.org/XML/1998/namespace',
-        'xsd'     => 'http://www.w3.org/2001/XMLSchema#',
-    );
-
-    private static $namespaces = null;
-
-    private static $default = null;
-
-    /** Counter for numbering anonymous namespaces */
-    private static $anonymousNamespaceCount = 0;
-
-    /**
-      * Return all the namespaces registered
-      *
-      * @return array Associative array of all the namespaces.
-      */
-    public static function namespaces()
-    {
-        if (self::$namespaces === null) {
-            self::resetNamespaces();
-        }
-
-        return self::$namespaces;
-    }
-
-    /**
-     * Resets list of namespaces to the one, which is provided by EasyRDF
-     * useful for tests, among other things
-     */
-    public static function resetNamespaces()
-    {
-        self::$namespaces = self::$initial_namespaces;
-    }
-
-    /**
-      * Return a namespace given its prefix.
-      *
-      * @param string $prefix The namespace prefix (eg 'foaf')
-      * @return string The namespace URI (eg 'http://xmlns.com/foaf/0.1/')
-      */
-    public static function get($prefix)
-    {
-        if (!is_string($prefix) or $prefix === null) {
-            throw new InvalidArgumentException(
-                "\$prefix should be a string and cannot be null or empty"
-            );
-        }
-
-        if (preg_match('/\W/', $prefix)) {
-            throw new InvalidArgumentException(
-                "\$prefix should only contain alpha-numeric characters"
-            );
-        }
-
-        $prefix = strtolower($prefix);
-        $namespaces = self::namespaces();
-
-        if (array_key_exists($prefix, $namespaces)) {
-            return $namespaces[$prefix];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-      * Register a new namespace.
-      *
-      * @param string $prefix The namespace prefix (eg 'foaf')
-      * @param string $long The namespace URI (eg 'http://xmlns.com/foaf/0.1/')
-      */
-    public static function set($prefix, $long)
-    {
-        if (!is_string($prefix) or $prefix === null) {
-            throw new InvalidArgumentException(
-                "\$prefix should be a string and cannot be null or empty"
-            );
-        }
-
-        if ($prefix !== '') {
-            // prefix        ::= Name minus ":"                   // see: http://www.w3.org/TR/REC-xml-names/#NT-NCName
-            // Name          ::= NameStartChar (NameChar)*        // see: http://www.w3.org/TR/REC-xml/#NT-Name
-            // NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] |
-            //                   [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] |
-            //                   [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
-            // NameChar      ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
-
-            $_name_start_char =
-                'A-Z_a-z\xc0-\xD6\xd8-\xf6\xf8-\xff\x{0100}-\x{02ff}\x{0370}-\x{037d}' .
-                '\x{037F}-\x{1FFF}\x{200C}-\x{200D}\x{2070}-\x{218F}\x{2C00}-\x{2FEF}\x{3001}-\x{D7FF}' .
-                '\x{F900}-\x{FDCF}\x{FDF0}-\x{FFFD}\x{10000}-\x{EFFFF}';
-
-            $_name_char =
-                $_name_start_char .
-                '\-.0-9\xb7\x{0300}-\x{036f}\x{203f}-\x{2040}';
-
-            $regex = "#^[{$_name_start_char}]{1}[{$_name_char}]{0,}$#u";
-
-            $match_result = preg_match($regex, $prefix);
-
-            if ($match_result === false) {
-                throw new LogicException('regexp error');
-            }
-
-            if ($match_result === 0) {
-                throw new InvalidArgumentException(
-                    "\$prefix should match RDFXML-QName specification. got: {$prefix}"
-                );
-            }
-        }
-
-        if (!is_string($long) or $long === null or $long === '') {
-            throw new InvalidArgumentException(
-                "\$long should be a string and cannot be null or empty"
-            );
-        }
-
-        $prefix = strtolower($prefix);
-
-        $namespaces = self::namespaces();
-        $namespaces[$prefix] = $long;
-
-        self::$namespaces = $namespaces;
-    }
-
-    /**
-      * Get the default namespace
-      *
-      * Returns the URI of the default namespace or null
-      * if no default namespace is defined.
-      *
-      * @return string The URI of the default namespace
-      */
-    public static function getDefault()
-    {
-        return self::$default;
-    }
-
-    /**
-      * Set the default namespace
-      *
-      * Set the default namespace to either a URI or the prefix of
-      * an already defined namespace.
-      *
-      * Example:
-      *   EasyRdf_Namespace::setDefault('http://schema.org/');
-      *
-      * @param string $namespace The URI or prefix of a namespace (eg 'og')
-      */
-    public static function setDefault($namespace)
-    {
-        if (is_null($namespace) or $namespace === '') {
-            self::$default = null;
-        } elseif (preg_match('/^\w+$/', $namespace)) {
-            $namespaces = self::namespaces();
-
-            if (!isset($namespaces[$namespace])) {
-                throw new InvalidArgumentException(
-                    "Unable to set default namespace to unknown prefix: $namespace"
-                );
-            }
-
-            self::$default = $namespaces[$namespace];
-        } else {
-            self::$default = $namespace;
-        }
-    }
-
-    /**
-      * Delete an existing namespace.
-      *
-      * @param string $prefix The namespace prefix (eg 'foaf')
-      */
-    public static function delete($prefix)
-    {
-        if (!is_string($prefix) or $prefix === null or $prefix === '') {
-            throw new InvalidArgumentException(
-                "\$prefix should be a string and cannot be null or empty"
-            );
-        }
-
-        $prefix = strtolower($prefix);
-        self::namespaces();  // make sure, that self::$namespaces is initialized
-        if (isset(self::$namespaces[$prefix])) {
-            unset(self::$namespaces[$prefix]);
-        }
-    }
-
-    /**
-      * Delete the anonymous namespaces and reset the counter to 0
-      */
-    public static function reset()
-    {
-        while (self::$anonymousNamespaceCount > 0) {
-            self::delete('ns'.(self::$anonymousNamespaceCount-1));
-            self::$anonymousNamespaceCount--;
-        }
-    }
-
-    /**
-      * Try and breakup a URI into a prefix and local part
-      *
-      * If $createNamespace is true, and the URI isn't part of an existing
-      * namespace, then EasyRdf will attempt to create a new namespace and
-      * return the name of the new prefix (for example 'ns0', 'term').
-      *
-      * If it isn't possible to split the URI, then null will be returned.
-      *
-      * @param string  $uri The full URI (eg 'http://xmlns.com/foaf/0.1/name')
-      * @param bool    $createNamespace If true, a new namespace will be created
-      * @return array  The split URI (eg 'foaf', 'name') or null
-      */
-    public static function splitUri($uri, $createNamespace = false)
-    {
-        if ($uri === null or $uri === '') {
-            throw new InvalidArgumentException(
-                "\$uri cannot be null or empty"
-            );
-        }
-
-        if (is_object($uri) and ($uri instanceof EasyRdf_Resource)) {
-            $uri = $uri->getUri();
-        } elseif (!is_string($uri)) {
-            throw new InvalidArgumentException(
-                "\$uri should be a string or EasyRdf_Resource"
-            );
-        }
-
-        foreach (self::namespaces() as $prefix => $long) {
-            if (substr($uri, 0, strlen($long)) !== $long) {
-                continue;
-            }
-
-            $local_part = substr($uri, strlen($long));
-
-            if (strpos($local_part, '/') !== false) {
-                // we can't have '/' in local part
-                continue;
-            }
-
-            return array($prefix, $local_part);
-        }
-
-        if ($createNamespace) {
-            // Try and create a new namespace
-            # FIXME: check the valid characters for an XML element name
-            if (preg_match('/^(.+?)([\w\-]+)$/', $uri, $matches)) {
-                $prefix = "ns".(self::$anonymousNamespaceCount++);
-                self::set($prefix, $matches[1]);
-                return array($prefix, $matches[2]);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-      * Return the prefix namespace that a URI belongs to.
-      *
-      * @param string $uri A full URI (eg 'http://xmlns.com/foaf/0.1/name')
-      * @return string The prefix namespace that it is a part of(eg 'foaf')
-      */
-    public static function prefixOfUri($uri)
-    {
-        if ($parts = self::splitUri($uri)) {
-            return $parts[0];
-        }
-    }
-
-    /**
-      * Shorten a URI by substituting in the namespace prefix.
-      *
-      * If $createNamespace is true, and the URI isn't part of an existing
-      * namespace, then EasyRdf will attempt to create a new namespace and
-      * use that namespace to shorten the URI (for example ns0:term).
-      *
-      * If it isn't possible to shorten the URI, then null will be returned.
-      *
-      * @param string  $uri The full URI (eg 'http://xmlns.com/foaf/0.1/name')
-      * @param bool    $createNamespace If true, a new namespace will be created
-      * @return string The shortened URI (eg 'foaf:name') or null
-      */
-    public static function shorten($uri, $createNamespace = false)
-    {
-        if ($parts = self::splitUri($uri, $createNamespace)) {
-            return implode(':', $parts);
-        }
-    }
-
-    /**
-      * Expand a shortened URI (qname) back into a full URI.
-      *
-      * If it isn't possible to expand the qname, for example if the namespace
-      * isn't registered, then the original string will be returned.
-      *
-      * @param string $shortUri The short URI (eg 'foaf:name')
-      * @return string The full URI (eg 'http://xmlns.com/foaf/0.1/name')
-      */
-    public static function expand($shortUri)
-    {
-        if (!is_string($shortUri) or $shortUri === '') {
-            throw new InvalidArgumentException(
-                "\$shortUri should be a string and cannot be null or empty"
-            );
-        }
-
-        if ($shortUri === 'a') {
-            $namespaces = self::namespaces();
-            return $namespaces['rdf'] . 'type';
-        } elseif (preg_match('/^(\w+?):([\w\-]+)$/', $shortUri, $matches)) {
-            $long = self::get($matches[1]);
-            if ($long) {
-                return $long . $matches[2];
-            }
-        } elseif (preg_match('/^(\w+)$/', $shortUri) and isset(self::$default)) {
-            return self::$default . $shortUri;
-        }
-
-        return $shortUri;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/ParsedUri.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/ParsedUri.php
deleted file mode 100644
index 0b8dd47..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/ParsedUri.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-
-/**
- * A RFC3986 compliant URI parser
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- * @link       http://www.ietf.org/rfc/rfc3986.txt
- */
-class EasyRdf_ParsedUri
-{
-    // For all URIs:
-    private $scheme = null;
-    private $fragment = null;
-
-    // For hierarchical URIs:
-    private $authority = null;
-    private $path = null;
-    private $query = null;
-
-    const URI_REGEX = "|^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?|";
-
-    /** Constructor for creating a new parsed URI
-     *
-     * The $uri parameter can either be a string or an
-     * associative array with the following keys:
-     * scheme, authority, path, query, fragment
-     *
-     * @param  mixed $uri  The URI as a string or an array
-     * @return object EasyRdf_ParsedUri
-     */
-    public function __construct($uri = null)
-    {
-        if (is_string($uri)) {
-            if (preg_match(self::URI_REGEX, $uri, $matches)) {
-                if (!empty($matches[1])) {
-                    $this->scheme = isset($matches[2]) ? $matches[2] : '';
-                }
-                if (!empty($matches[3])) {
-                    $this->authority = isset($matches[4]) ? $matches[4] : '';
-                }
-                $this->path = isset($matches[5]) ? $matches[5] : '';
-                if (!empty($matches[6])) {
-                    $this->query = isset($matches[7]) ? $matches[7] : '';
-                }
-                if (!empty($matches[8])) {
-                    $this->fragment = isset($matches[9]) ? $matches[9] : '';
-                }
-            }
-        } elseif (is_array($uri)) {
-            $this->scheme = isset($uri['scheme']) ? $uri['scheme'] : null;
-            $this->authority = isset($uri['authority']) ? $uri['authority'] : null;
-            $this->path = isset($uri['path']) ? $uri['path'] : null;
-            $this->query = isset($uri['query']) ? $uri['query'] : null;
-            $this->fragment = isset($uri['fragment']) ? $uri['fragment'] : null;
-        }
-    }
-
-
-    /** Returns true if this is an absolute (complete) URI
-     * @return boolean
-     */
-    public function isAbsolute()
-    {
-        return $this->scheme !== null;
-    }
-
-    /** Returns true if this is an relative (partial) URI
-     * @return boolean
-     */
-    public function isRelative()
-    {
-        return $this->scheme === null;
-    }
-
-    /** Returns the scheme of the URI (e.g. http)
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /** Sets the scheme of the URI (e.g. http)
-     * @param string $scheme The new value for the scheme of the URI
-     */
-    public function setScheme($scheme)
-    {
-        $this->scheme = $scheme;
-    }
-
-    /** Returns the authority of the URI (e.g. www.example.com:8080)
-     * @return string
-     */
-    public function getAuthority()
-    {
-        return $this->authority;
-    }
-
-    /** Sets the authority of the URI (e.g. www.example.com:8080)
-     * @param string $authority The new value for the authority component of the URI
-     */
-    public function setAuthority($authority)
-    {
-        $this->authority = $authority;
-    }
-
-    /** Returns the path of the URI (e.g. /foo/bar)
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /** Set the path of the URI (e.g. /foo/bar)
-     * @param string $path The new value for the path component of the URI
-     */
-    public function setPath($path)
-    {
-        $this->path = $path;
-    }
-
-    /** Returns the query string part of the URI (e.g. foo=bar)
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /** Set the query string of the URI (e.g. foo=bar)
-     * @param string $query The new value for the query string component of the URI
-     */
-    public function setQuery($query)
-    {
-        $this->query = $query;
-    }
-
-    /** Returns the fragment part of the URI (i.e. after the #)
-     * @return string
-     */
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    /** Set the fragment of the URI (i.e. after the #)
-     * @param string $fragment The new value for the fragment component of the URI
-     */
-    public function setFragment($fragment)
-    {
-        $this->fragment = $fragment;
-    }
-
-
-    /**
-     * Normalises the path of this URI if it has one. Normalising a path means
-     * that any unnecessary '.' and '..' segments are removed. For example, the
-     * URI http://example.com/a/b/../c/./d would be normalised to
-     * http://example.com/a/c/d
-     *
-     * @return object EasyRdf_ParsedUri
-     */
-    public function normalise()
-    {
-        if (empty($this->path)) {
-            return $this;
-        }
-
-        // Remove ./ from the start
-        if (substr($this->path, 0, 2) == './') {
-            // Remove both characters
-            $this->path = substr($this->path, 2);
-        }
-
-        // Remove /. from the end
-        if (substr($this->path, -2) == '/.') {
-            // Remove only the last dot, not the slash!
-            $this->path = substr($this->path, 0, -1);
-        }
-
-        if (substr($this->path, -3) == '/..') {
-            $this->path .= '/';
-        }
-
-        // Split the path into its segments
-        $segments = explode('/', $this->path);
-        $newSegments = array();
-
-        // Remove all unnecessary '.' and '..' segments
-        foreach ($segments as $segment) {
-            if ($segment == '..') {
-                // Remove the previous part of the path
-                $count = count($newSegments);
-                if ($count > 0 && $newSegments[$count-1]) {
-                    array_pop($newSegments);
-                }
-            } elseif ($segment == '.') {
-                // Ignore
-                continue;
-            } else {
-                array_push($newSegments, $segment);
-            }
-        }
-
-        // Construct the new normalised path
-        $this->path = implode($newSegments, '/');
-
-        // Allow easy chaining of methods
-        return $this;
-    }
-
-    /**
-     * Resolves a relative URI using this URI as the base URI.
-     */
-    public function resolve($relUri)
-    {
-        // If it is a string, then convert it to a parsed object
-        if (is_string($relUri)) {
-            $relUri = new EasyRdf_ParsedUri($relUri);
-        }
-
-        // This code is based on the pseudocode in section 5.2.2 of RFC3986
-        $target = new EasyRdf_ParsedUri();
-        if ($relUri->scheme) {
-            $target->scheme = $relUri->scheme;
-            $target->authority = $relUri->authority;
-            $target->path = $relUri->path;
-            $target->query = $relUri->query;
-        } else {
-            if ($relUri->authority) {
-                $target->authority = $relUri->authority;
-                $target->path = $relUri->path;
-                $target->query = $relUri->query;
-            } else {
-                if (empty($relUri->path)) {
-                    $target->path = $this->path;
-                    if ($relUri->query) {
-                        $target->query = $relUri->query;
-                    } else {
-                        $target->query = $this->query;
-                    }
-                } else {
-                    if (substr($relUri->path, 0, 1) == '/') {
-                        $target->path = $relUri->path;
-                    } else {
-                        $path = $this->path;
-                        $lastSlash = strrpos($path, '/');
-                        if ($lastSlash !== false) {
-                            $path = substr($path, 0, $lastSlash + 1);
-                        } else {
-                            $path = '/';
-                        }
-
-                        $target->path .= $path . $relUri->path;
-                    }
-                    $target->query = $relUri->query;
-                }
-                $target->authority = $this->authority;
-            }
-            $target->scheme = $this->scheme;
-        }
-
-        $target->fragment = $relUri->fragment;
-
-        $target->normalise();
-
-        return $target;
-    }
-
-    /** Convert the parsed URI back into a string
-     *
-     * @return string The URI as a string
-     */
-    public function toString()
-    {
-        $str = '';
-        if ($this->scheme !== null) {
-            $str .= $this->scheme . ':';
-        }
-        if ($this->authority !== null) {
-            $str .= '//' . $this->authority;
-        }
-        $str .= $this->path;
-        if ($this->query !== null) {
-            $str .= '?' . $this->query;
-        }
-        if ($this->fragment !== null) {
-            $str .= '#' . $this->fragment;
-        }
-        return $str;
-    }
-
-    /** Magic method to convert the URI, when casted, back to a string
-     *
-     * @return string The URI as a string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser.php
deleted file mode 100644
index 196388d..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Parent class for the EasyRdf parsers
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser
-{
-    /** Mapping from source to graph bnode identifiers */
-    private $bnodeMap = array();
-
-    /** The current graph to insert triples into */
-    protected $graph = null;
-
-    /** The format of the document currently being parsed */
-    protected $format = null;
-
-    /** The base URI for the document currently being parsed */
-    protected $baseUri = null;
-
-
-    protected $tripleCount = 0;
-
-    /**
-     * Create a new, unique bnode identifier from a source identifier.
-     * If the source identifier has previously been seen, the
-     * same new bnode identifier is returned.
-     * @ignore
-     */
-    protected function remapBnode($name)
-    {
-        if (!isset($this->bnodeMap[$name])) {
-            $this->bnodeMap[$name] = $this->graph->newBNodeId();
-        }
-        return $this->bnodeMap[$name];
-    }
-
-    /**
-     * Delete the bnode mapping - to be called at the start of a new parse
-     * @ignore
-     */
-    protected function resetBnodeMap()
-    {
-        $this->bnodeMap = array();
-    }
-
-    /**
-     * Check, cleanup parameters and prepare for parsing
-     * @ignore
-     */
-    protected function checkParseParams($graph, $data, $format, $baseUri)
-    {
-        if ($graph == null or !is_object($graph) or
-            !($graph instanceof EasyRdf_Graph)) {
-            throw new InvalidArgumentException(
-                "\$graph should be an EasyRdf_Graph object and cannot be null"
-            );
-        } else {
-            $this->graph = $graph;
-        }
-
-        if ($format == null or $format == '') {
-            throw new InvalidArgumentException(
-                "\$format cannot be null or empty"
-            );
-        } elseif (is_object($format) and $format instanceof EasyRdf_Format) {
-            $this->format = $format = $format->getName();
-        } elseif (!is_string($format)) {
-            throw new InvalidArgumentException(
-                "\$format should be a string or an EasyRdf_Format object"
-            );
-        } else {
-            $this->format = $format;
-        }
-
-        if ($baseUri) {
-            if (!is_string($baseUri)) {
-                throw new InvalidArgumentException(
-                    "\$baseUri should be a string"
-                );
-            } else {
-                $this->baseUri = new EasyRdf_ParsedUri($baseUri);
-            }
-        } else {
-            $this->baseUri = null;
-        }
-
-        // Prepare for parsing
-        $this->resetBnodeMap();
-        $this->tripleCount = 0;
-    }
-
-    /**
-     * Sub-classes must follow this protocol
-     * @ignore
-     */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        throw new EasyRdf_Exception(
-            "This method should be overridden by sub-classes."
-        );
-    }
-
-    /**
-     * Add a triple to the current graph, and keep count of the number of triples
-     * @ignore
-     */
-    protected function addTriple($resource, $property, $value)
-    {
-        $count = $this->graph->add($resource, $property, $value);
-        $this->tripleCount += $count;
-        return $count;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Arc.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Arc.php
deleted file mode 100644
index b4e5e1e..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Arc.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse RDF using the ARC2 library.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Arc extends EasyRdf_Parser_RdfPhp
-{
-    private static $supportedTypes = array(
-        'rdfxml' => 'RDFXML',
-        'turtle' => 'Turtle',
-        'ntriples' => 'Turtle',
-        'rdfa' => 'SemHTML',
-    );
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_Arc
-     */
-    public function __construct()
-    {
-        require_once 'arc/ARC2.php';
-    }
-
-    /**
-      * Parse an RDF document into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if (array_key_exists($format, self::$supportedTypes)) {
-            $className = self::$supportedTypes[$format];
-        } else {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_Arc does not support: $format"
-            );
-        }
-
-        $parser = ARC2::getParser($className);
-        if ($parser) {
-            $parser->parse($baseUri, $data);
-            $rdfphp = $parser->getSimpleIndex(false);
-            return parent::parse($graph, $rdfphp, 'php', $baseUri);
-        } else {
-            throw new EasyRdf_Exception(
-                "ARC2 failed to get a $className parser."
-            );
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Exception.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Exception.php
deleted file mode 100644
index d03b5bd..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Exception.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * EasyRdf Exception class
- *
- * All exceptions thrown by EasyRdf are an instance of this class.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Exception extends EasyRdf_Exception
-{
-    protected $parserLine;
-    protected $parserColumn;
-    
-    public function __construct($message, $line = null, $column = null)
-    {
-        $this->parserLine = $line;
-        $this->parserColumn = $column;
-
-        if (!is_null($line)) {
-            $message .= " on line $line";
-            if (!is_null($column)) {
-                $message .= ", column $column";
-            }
-        }
-
-        parent::__construct($message);
-    }
-    
-    public function getParserLine()
-    {
-        return $this->parserLine;
-    }
-    
-    public function getParserColumn()
-    {
-        return $this->parserColumn;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Json.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Json.php
deleted file mode 100644
index 924abdc..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Json.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * A pure-php class to parse RDF/JSON with no dependancies.
- *
- * http://n2.talis.com/wiki/RDF_JSON_Specification
- * docs/appendix-a-rdf-formats-json.md
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Json extends EasyRdf_Parser_RdfPhp
-{
-    private $jsonLastErrorExists = false;
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_Json
-     */
-    public function __construct()
-    {
-        $this->jsonLastErrorExists = function_exists('json_last_error');
-    }
-
-    /** Return the last JSON parser error as a string
-     *
-     * If json_last_error() is not available a generic message will be returned.
-     *
-     * @ignore
-     */
-    protected function jsonLastErrorString()
-    {
-        if ($this->jsonLastErrorExists) {
-            switch (json_last_error()) {
-                case JSON_ERROR_NONE:
-                    return null;
-                case JSON_ERROR_DEPTH:
-                    return "JSON Parse error: the maximum stack depth has been exceeded";
-                case JSON_ERROR_STATE_MISMATCH:
-                    return "JSON Parse error: invalid or malformed JSON";
-                case JSON_ERROR_CTRL_CHAR:
-                    return "JSON Parse error: control character error, possibly incorrectly encoded";
-                case JSON_ERROR_SYNTAX:
-                    return "JSON Parse syntax error";
-                case JSON_ERROR_UTF8:
-                    return "JSON Parse error: malformed UTF-8 characters, possibly incorrectly encoded";
-                default:
-                    return "JSON Parse error: unknown";
-            }
-        } else {
-            return "JSON Parse error";
-        }
-    }
-
-    /** Parse the triple-centric JSON format, as output by libraptor
-     *
-     * http://librdf.org/raptor/api/serializer-json.html
-     *
-     * @ignore
-     */
-    protected function parseJsonTriples($data, $baseUri)
-    {
-        foreach ($data['triples'] as $triple) {
-            if ($triple['subject']['type'] == 'bnode') {
-                $subject = $this->remapBnode($triple['subject']['value']);
-            } else {
-                $subject = $triple['subject']['value'];
-            }
-
-            $predicate = $triple['predicate']['value'];
-
-            if ($triple['object']['type'] == 'bnode') {
-                $object = array(
-                    'type' => 'bnode',
-                    'value' => $this->remapBnode($triple['object']['value'])
-                );
-            } else {
-                $object = $triple['object'];
-            }
-
-            $this->addTriple($subject, $predicate, $object);
-        }
-
-        return $this->tripleCount;
-    }
-
-    /**
-      * Parse RDF/JSON into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        $this->checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'json') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_Json does not support: $format"
-            );
-        }
-
-        $decoded = @json_decode(strval($data), true);
-        if ($decoded === null) {
-            throw new EasyRdf_Parser_Exception(
-                $this->jsonLastErrorString()
-            );
-        }
-
-        if (array_key_exists('triples', $decoded)) {
-            return $this->parseJsonTriples($decoded, $baseUri);
-        } else {
-            return parent::parse($graph, $decoded, 'php', $baseUri);
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLd.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLd.php
deleted file mode 100644
index d0efc12..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLd.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-if (PHP_MAJOR_VERSION > 5 or (PHP_MAJOR_VERSION == 5 and PHP_MINOR_VERSION >= 3)) {
-    require dirname(__FILE__).'/JsonLdImplementation.php';
-} else {
-    throw new LogicException("JSON-LD support requires PHP 5.3+");
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLdImplementation.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLdImplementation.php
deleted file mode 100644
index d2e22c4..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/JsonLdImplementation.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse JSON-LD to an EasyRdf_Graph
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2014 Markus Lanthaler
- * @author     Markus Lanthaler <mail@markus-lanthaler.com>
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_JsonLd extends EasyRdf_Parser
-{
-    /**
-      * Parse a JSON-LD document into an EasyRdf_Graph
-      *
-      * Attention: Since JSON-LD supports datasets, a document may contain
-      * multiple graphs and not just one. This parser returns only the
-      * default graph. An alternative would be to merge all graphs.
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'jsonld') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_JsonLd does not support $format"
-            );
-        }
-
-        try {
-            $quads = \ML\JsonLD\JsonLD::toRdf($data, array('base' => $baseUri));
-        } catch (\ML\JsonLD\Exception\JsonLdException $e) {
-            throw new EasyRdf_Parser_Exception($e->getMessage());
-        }
-
-        foreach ($quads as $quad) {
-            // Ignore named graphs
-            if (null !== $quad->getGraph()) {
-                continue;
-            }
-
-            $subject = (string) $quad->getSubject();
-            if ('_:' === substr($subject, 0, 2)) {
-                $subject = $this->remapBnode($subject);
-            }
-
-            $predicate = (string) $quad->getProperty();
-
-            if ($quad->getObject() instanceof \ML\IRI\IRI) {
-                $object = array(
-                    'type' => 'uri',
-                    'value' => (string) $quad->getObject()
-                );
-
-                if ('_:' === substr($object['value'], 0, 2)) {
-                    $object = array(
-                        'type' => 'bnode',
-                        'value' => $this->remapBnode($object['value'])
-                    );
-                }
-            } else {
-                $object = array(
-                    'type' => 'literal',
-                    'value' => $quad->getObject()->getValue()
-                );
-
-                if ($quad->getObject() instanceof \ML\JsonLD\LanguageTaggedString) {
-                    $object['lang'] = $quad->getObject()->getLanguage();
-                } else {
-                    $object['datatype'] = $quad->getObject()->getType();
-                }
-            }
-
-            $this->addTriple($subject, $predicate, $object);
-        }
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Ntriples.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Ntriples.php
deleted file mode 100644
index 01ebf9d..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Ntriples.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * A pure-php class to parse N-Triples with no dependancies.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Ntriples extends EasyRdf_Parser
-{
-    /**
-     * Decodes an encoded N-Triples string. Any \-escape sequences are substituted
-     * with their decoded value.
-     *
-     * @param  string $str An encoded N-Triples string.
-     * @return The unencoded string.
-     **/
-    protected function unescapeString($str)
-    {
-        if (strpos($str, '\\') === false) {
-            return $str;
-        }
-
-        $mappings = array(
-            't' => chr(0x09),
-            'b' => chr(0x08),
-            'n' => chr(0x0A),
-            'r' => chr(0x0D),
-            'f' => chr(0x0C),
-            '\"' => chr(0x22),
-            '\'' => chr(0x27)
-        );
-        foreach ($mappings as $in => $out) {
-            $str = preg_replace('/\x5c([' . $in . '])/', $out, $str);
-        }
-
-        if (stripos($str, '\u') === false) {
-            return $str;
-        }
-
-        while (preg_match('/\\\(U)([0-9A-F]{8})/', $str, $matches) ||
-               preg_match('/\\\(u)([0-9A-F]{4})/', $str, $matches)) {
-            $no = hexdec($matches[2]);
-            if ($no < 128) {                // 0x80
-                $char = chr($no);
-            } elseif ($no < 2048) {         // 0x800
-                $char = chr(($no >> 6) + 192) .
-                        chr(($no & 63) + 128);
-            } elseif ($no < 65536) {        // 0x10000
-                $char = chr(($no >> 12) + 224) .
-                        chr((($no >> 6) & 63) + 128) .
-                        chr(($no & 63) + 128);
-            } elseif ($no < 2097152) {      // 0x200000
-                $char = chr(($no >> 18) + 240) .
-                        chr((($no >> 12) & 63) + 128) .
-                        chr((($no >> 6) & 63) + 128) .
-                        chr(($no & 63) + 128);
-            } else {
-                # FIXME: throw an exception instead?
-                $char = '';
-            }
-            $str = str_replace('\\' . $matches[1] . $matches[2], $char, $str);
-        }
-        return $str;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function parseNtriplesSubject($sub, $lineNum)
-    {
-        if (preg_match('/<([^<>]+)>/', $sub, $matches)) {
-            return $this->unescapeString($matches[1]);
-        } elseif (preg_match('/_:([A-Za-z0-9]*)/', $sub, $matches)) {
-            if (empty($matches[1])) {
-                return $this->graph->newBNodeId();
-            } else {
-                $nodeid = $this->unescapeString($matches[1]);
-                return $this->remapBnode($nodeid);
-            }
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "Failed to parse subject: $sub",
-                $lineNum
-            );
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    protected function parseNtriplesObject($obj, $lineNum)
-    {
-        if (preg_match('/"(.+)"\^\^<([^<>]+)>/', $obj, $matches)) {
-            return array(
-                'type' => 'literal',
-                'value' => $this->unescapeString($matches[1]),
-                'datatype' => $this->unescapeString($matches[2])
-            );
-        } elseif (preg_match('/"(.+)"@([\w\-]+)/', $obj, $matches)) {
-            return array(
-                'type' => 'literal',
-                'value' => $this->unescapeString($matches[1]),
-                'lang' => $this->unescapeString($matches[2])
-            );
-        } elseif (preg_match('/"(.*)"/', $obj, $matches)) {
-            return array('type' => 'literal', 'value' => $this->unescapeString($matches[1]));
-        } elseif (preg_match('/<([^<>]+)>/', $obj, $matches)) {
-            return array('type' => 'uri', 'value' => $matches[1]);
-        } elseif (preg_match('/_:([A-Za-z0-9]*)/', $obj, $matches)) {
-            if (empty($matches[1])) {
-                return array(
-                    'type' => 'bnode',
-                    'value' => $this->graph->newBNodeId()
-                );
-            } else {
-                $nodeid = $this->unescapeString($matches[1]);
-                return array(
-                    'type' => 'bnode',
-                    'value' => $this->remapBnode($nodeid)
-                );
-            }
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "Failed to parse object: $obj",
-                $lineNum
-            );
-        }
-    }
-
-    /**
-      * Parse an N-Triples document into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'ntriples') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_Ntriples does not support: $format"
-            );
-        }
-
-        $lines = preg_split('/\x0D?\x0A/', strval($data));
-        foreach ($lines as $index => $line) {
-            $lineNum = $index + 1;
-            if (preg_match('/^\s*#/', $line)) {
-                # Comment
-                continue;
-            } elseif (preg_match('/^\s*(.+?)\s+<([^<>]+?)>\s+(.+?)\s*\.\s*$/', $line, $matches)) {
-                $this->addTriple(
-                    $this->parseNtriplesSubject($matches[1], $lineNum),
-                    $this->unescapeString($matches[2]),
-                    $this->parseNtriplesObject($matches[3], $lineNum)
-                );
-            } elseif (preg_match('/^\s*$/', $line)) {
-                # Blank line
-                continue;
-            } else {
-                throw new EasyRdf_Parser_Exception(
-                    "Failed to parse statement",
-                    $lineNum
-                );
-            }
-        }
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rapper.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rapper.php
deleted file mode 100644
index ed12198..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rapper.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse RDF using the 'rapper' command line tool.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Rapper extends EasyRdf_Parser_Json
-{
-    private $rapperCmd = null;
-
-    const MINIMUM_RAPPER_VERSION = '1.4.17';
-
-    /**
-     * Constructor
-     *
-     * @param string $rapperCmd Optional path to the rapper command to use.
-     * @return object EasyRdf_Parser_Rapper
-     */
-    public function __construct($rapperCmd = 'rapper')
-    {
-        $result = exec("$rapperCmd --version 2>/dev/null", $output, $status);
-        if ($status != 0) {
-            throw new EasyRdf_Exception(
-                "Failed to execute the command '$rapperCmd': $result"
-            );
-        } elseif (version_compare($result, self::MINIMUM_RAPPER_VERSION) < 0) {
-            throw new EasyRdf_Exception(
-                "Version ".self::MINIMUM_RAPPER_VERSION." or higher of rapper is required."
-            );
-        } else {
-            $this->rapperCmd = $rapperCmd;
-        }
-    }
-
-    /**
-      * Parse an RDF document into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        $json = EasyRdf_Utils::execCommandPipe(
-            $this->rapperCmd,
-            array(
-                '--quiet',
-                '--input', $format,
-                '--output', 'json',
-                '--ignore-errors',
-                '--input-uri', $baseUri,
-                '--output-uri', '-', '-'
-            ),
-            $data
-        );
-
-        // Parse in the JSON
-        return parent::parse($graph, $json, 'json', $baseUri);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfPhp.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfPhp.php
deleted file mode 100644
index cd0ec82..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfPhp.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse RDF with no external dependancies.
- *
- * http://n2.talis.com/wiki/RDF_PHP_Specification
- * docs/appendix-a-rdf-formats-php.md
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_RdfPhp extends EasyRdf_Parser
-{
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_RdfPhp
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-      * Parse RDF/PHP into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        $this->checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'php') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_RdfPhp does not support: $format"
-            );
-        }
-
-        foreach ($data as $subject => $properties) {
-            if (substr($subject, 0, 2) === '_:') {
-                $subject = $this->remapBnode($subject);
-            } elseif (preg_match('/^\w+$/', $subject)) {
-                # Cope with invalid RDF/JSON serialisations that
-                # put the node name in, without the _: prefix
-                # (such as net.fortytwo.sesametools.rdfjson)
-                $subject = $this->remapBnode($subject);
-            }
-
-            foreach ($properties as $property => $objects) {
-                foreach ($objects as $object) {
-                    if ($object['type'] === 'bnode') {
-                        $object['value'] = $this->remapBnode($object['value']);
-                    }
-                    $this->addTriple($subject, $property, $object);
-                }
-            }
-        }
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
deleted file mode 100644
index bfbbd30..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/RdfXml.php
+++ /dev/null
@@ -1,812 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2010-2013 Nicholas J Humfrey
- * Copyright (c) 2004-2010 Benjamin Nowack (based on ARC2_RDFXMLParser.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2010-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-
-/**
- * A pure-php class to parse RDF/XML.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 2004-2010 Benjamin Nowack (based on ARC2_RDFXMLParser.php)
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_RdfXml extends EasyRdf_Parser
-{
-    private $state;
-    private $xLang;
-    private $xBase;
-    private $xml;
-    private $rdf;
-    private $nsp;
-    private $sStack;
-    private $sCount;
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_RdfXml
-     */
-    public function __construct()
-    {
-    }
-
-    /** @ignore */
-    protected function init($graph, $base)
-    {
-        $this->graph = $graph;
-        $this->state = 0;
-        $this->xLang = null;
-        $this->xBase = new EasyRdf_ParsedUri($base);
-        $this->xml = 'http://www.w3.org/XML/1998/namespace';
-        $this->rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-        $this->nsp = array($this->xml => 'xml', $this->rdf => 'rdf');
-        $this->sStack = array();
-        $this->sCount = 0;
-    }
-
-    /** @ignore */
-    protected function initXMLParser()
-    {
-        if (!isset($this->xmlParser)) {
-            $parser = xml_parser_create_ns('UTF-8', '');
-            xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
-            xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-            xml_set_element_handler($parser, 'startElementHandler', 'endElementHandler');
-            xml_set_character_data_handler($parser, 'cdataHandler');
-            xml_set_start_namespace_decl_handler($parser, 'newNamespaceHandler');
-            xml_set_object($parser, $this);
-            $this->xmlParser = $parser;
-        }
-    }
-
-    /** @ignore */
-    protected function pushS(&$s)
-    {
-        $s['pos'] = $this->sCount;
-        $this->sStack[$this->sCount] = $s;
-        $this->sCount++;
-    }
-
-    /** @ignore */
-    protected function popS()
-    {
-        $r = array();
-        $this->sCount--;
-        for ($i = 0, $iMax = $this->sCount; $i < $iMax; $i++) {
-            $r[$i] = $this->sStack[$i];
-        }
-        $this->sStack = $r;
-    }
-
-    /** @ignore */
-    protected function updateS($s)
-    {
-        $this->sStack[$s['pos']] = $s;
-    }
-
-    /** @ignore */
-    protected function getParentS()
-    {
-        if ($this->sCount && isset($this->sStack[$this->sCount - 1])) {
-            return $this->sStack[$this->sCount - 1];
-        } else {
-            return false;
-        }
-    }
-
-    /** @ignore */
-    protected function getParentXBase()
-    {
-        if ($p = $this->getParentS()) {
-            if (isset($p['p_x_base']) && $p['p_x_base']) {
-                return $p['p_x_base'];
-            } elseif (isset($p['x_base'])) {
-                return $p['x_base'];
-            } else {
-                return '';
-            }
-        } else {
-            return $this->xBase;
-        }
-    }
-
-    /** @ignore */
-    protected function getParentXLang()
-    {
-        if ($p = $this->getParentS()) {
-            if (isset($p['p_x_lang']) && $p['p_x_lang']) {
-                return $p['p_x_lang'];
-            } elseif (isset($p['x_lang'])) {
-                return $p['x_lang'];
-            } else {
-                return null;
-            }
-        } else {
-            return $this->xLang;
-        }
-    }
-
-    /** @ignore */
-    protected function splitURI($v)
-    {
-        /* auto-splitting on / or # */
-        if (preg_match('/^(.*[\/\#])([^\/\#]+)$/', $v, $m)) {
-            return array($m[1], $m[2]);
-        }
-        /* auto-splitting on last special char, e.g. urn:foo:bar */
-        if (preg_match('/^(.*[\:\/])([^\:\/]+)$/', $v, $m)) {
-            return array($m[1], $m[2]);
-        }
-        return array($v, '');
-    }
-
-    /** @ignore */
-    protected function add($s, $p, $o, $sType, $oType, $oDatatype = null, $oLang = null)
-    {
-        $this->addTriple(
-            $s,
-            $p,
-            array(
-                'type' => $oType,
-                'value' => $o,
-                'lang' => $oLang,
-                'datatype' => $oDatatype
-            )
-        );
-    }
-
-    /** @ignore */
-    protected function reify($t, $s, $p, $o, $sType, $oType, $oDatatype = null, $oLang = null)
-    {
-        $this->add($t, $this->rdf.'type', $this->rdf.'Statement', 'uri', 'uri');
-        $this->add($t, $this->rdf.'subject', $s, 'uri', $sType);
-        $this->add($t, $this->rdf.'predicate', $p, 'uri', 'uri');
-        $this->add($t, $this->rdf.'object', $o, 'uri', $oType, $oDatatype, $oLang);
-    }
-
-    /** @ignore */
-    protected function startElementHandler($p, $t, $a)
-    {
-        switch($this->state) {
-            case 0:
-                return $this->startState0($t, $a);
-            case 1:
-                return $this->startState1($t, $a);
-            case 2:
-                return $this->startState2($t, $a);
-            case 4:
-                return $this->startState4($t, $a);
-            case 5:
-                return $this->startState5($t, $a);
-            case 6:
-                return $this->startState6($t, $a);
-            default:
-                throw new EasyRdf_Parser_Exception(
-                    'startElementHandler() called at state ' . $this->state . ' in '.$t
-                );
-        }
-    }
-
-    /** @ignore */
-    protected function endElementHandler($p, $t)
-    {
-        switch($this->state){
-            case 1:
-                return $this->endState1($t);
-            case 2:
-                return $this->endState2($t);
-            case 3:
-                return $this->endState3($t);
-            case 4:
-                return $this->endState4($t);
-            case 5:
-                return $this->endState5($t);
-            case 6:
-                return $this->endState6($t);
-            default:
-                throw new EasyRdf_Parser_Exception(
-                    'endElementHandler() called at state ' . $this->state . ' in '.$t
-                );
-        }
-    }
-
-    /** @ignore */
-    protected function cdataHandler($p, $d)
-    {
-        switch($this->state){
-            case 4:
-                return $this->cdataState4($d);
-            case 6:
-                return $this->cdataState6($d);
-            default:
-                return false;
-        }
-    }
-
-    /** @ignore */
-    protected function newNamespaceHandler($p, $prf, $uri)
-    {
-        $this->nsp[$uri] = isset($this->nsp[$uri]) ? $this->nsp[$uri] : $prf;
-    }
-
-    /** @ignore */
-    protected function startState0($t, $a)
-    {
-        $this->state = 1;
-        if ($t !== $this->rdf.'RDF') {
-            $this->startState1($t, $a);
-        } else {
-            if (isset($a[$this->xml.'base'])) {
-                $this->xBase = $this->xBase->resolve($a[$this->xml.'base']);
-            }
-        }
-    }
-
-    /** @ignore */
-    protected function startState1($t, $a)
-    {
-        $s = array(
-            'x_base' => $this->getParentXBase(),
-            'x_lang' => $this->getParentXLang(),
-            'li_count' => 0,
-        );
-
-        if (isset($a[$this->xml.'base'])) {
-            $s['x_base'] = $this->xBase->resolve($a[$this->xml.'base']);
-        }
-
-        if (isset($a[$this->xml.'lang'])) {
-            $s['x_lang'] = $a[$this->xml.'lang'];
-        }
-
-        /* ID */
-        if (isset($a[$this->rdf.'ID'])) {
-            $s['type'] = 'uri';
-            $s['value'] = $s['x_base']->resolve('#'.$a[$this->rdf.'ID']);
-            /* about */
-        } elseif (isset($a[$this->rdf.'about'])) {
-            $s['type'] = 'uri';
-            $s['value'] = $s['x_base']->resolve($a[$this->rdf.'about']);
-            /* bnode */
-        } else {
-            $s['type'] = 'bnode';
-            if (isset($a[$this->rdf.'nodeID'])) {
-                $s['value'] = $this->remapBnode($a[$this->rdf.'nodeID']);
-            } else {
-                $s['value'] = $this->graph->newBNodeId();
-            }
-        }
-
-        /* sub-node */
-        if ($this->state === 4) {
-            $supS = $this->getParentS();
-            /* new collection */
-            if (isset($supS['o_is_coll']) && $supS['o_is_coll']) {
-                $coll = array(
-                    'type' => 'bnode',
-                    'value' => $this->graph->newBNodeId(),
-                    'is_coll' => true,
-                    'x_base' => $s['x_base'],
-                    'x_lang' => $s['x_lang']
-                );
-                $this->add($supS['value'], $supS['p'], $coll['value'], $supS['type'], $coll['type']);
-                $this->add($coll['value'], $this->rdf.'first', $s['value'], $coll['type'], $s['type']);
-                $this->pushS($coll);
-
-            } elseif (isset($supS['is_coll']) && $supS['is_coll']) {
-                /* new entry in existing coll */
-                $coll = array(
-                'type' => 'bnode',
-                'value' => $this->graph->newBNodeId(),
-                'is_coll' => true,
-                'x_base' => $s['x_base'],
-                'x_lang' => $s['x_lang']
-                );
-                $this->add($supS['value'], $this->rdf.'rest', $coll['value'], $supS['type'], $coll['type']);
-                $this->add($coll['value'], $this->rdf.'first', $s['value'], $coll['type'], $s['type']);
-                $this->pushS($coll);
-                /* normal sub-node */
-            } elseif (isset($supS['p']) && $supS['p']) {
-                $this->add($supS['value'], $supS['p'], $s['value'], $supS['type'], $s['type']);
-            }
-        }
-        /* typed node */
-        if ($t !== $this->rdf.'Description') {
-            $this->add($s['value'], $this->rdf.'type', $t, $s['type'], 'uri');
-        }
-        /* (additional) typing attr */
-        if (isset($a[$this->rdf.'type'])) {
-            $this->add($s['value'], $this->rdf.'type', $a[$this->rdf.'type'], $s['type'], 'uri');
-        }
-
-        /* Seq|Bag|Alt */
-        // if (in_array($t, array($this->rdf.'Seq', $this->rdf.'Bag', $this->rdf.'Alt'))) {
-        //     # FIXME: what is this?
-        //     $s['is_con'] = true;
-        // }
-
-        /* any other attrs (skip rdf and xml, except rdf:_, rdf:value, rdf:Seq) */
-        foreach ($a as $k => $v) {
-            if (((strpos($k, $this->xml) === false) && (strpos($k, $this->rdf) === false)) ||
-                preg_match('/(\_[0-9]+|value|Seq|Bag|Alt|Statement|Property|List)$/', $k)) {
-                if (strpos($k, ':')) {
-                    $this->add($s['value'], $k, $v, $s['type'], 'literal', null, $s['x_lang']);
-                }
-            }
-        }
-        $this->pushS($s);
-        $this->state = 2;
-    }
-
-    /** @ignore */
-    protected function startState2($t, $a)
-    {
-        $s = $this->getParentS();
-        foreach (array('p_x_base', 'p_x_lang', 'p_id', 'o_is_coll') as $k) {
-            unset($s[$k]);
-        }
-        /* base */
-        if (isset($a[$this->xml.'base'])) {
-            $s['p_x_base'] = $s['x_base']->resolve($a[$this->xml.'base']);
-        }
-        $b = isset($s['p_x_base']) && $s['p_x_base'] ? $s['p_x_base'] : $s['x_base'];
-        /* lang */
-        if (isset($a[$this->xml.'lang'])) {
-            $s['p_x_lang'] = $a[$this->xml.'lang'];
-        }
-        $l = isset($s['p_x_lang']) && $s['p_x_lang'] ? $s['p_x_lang'] : $s['x_lang'];
-        /* adjust li */
-        if ($t === $this->rdf.'li') {
-            $s['li_count']++;
-            $t = $this->rdf.'_'.$s['li_count'];
-        }
-        /* set p */
-        $s['p'] = $t;
-        /* reification */
-        if (isset($a[$this->rdf.'ID'])) {
-            $s['p_id'] = $a[$this->rdf.'ID'];
-        }
-        $o = array('value' => null, 'type' => null, 'x_base' => $b, 'x_lang' => $l);
-        /* resource/rdf:resource */
-        if (isset($a['resource'])) {
-            $a[$this->rdf.'resource'] = $a['resource'];
-            unset($a['resource']);
-        }
-        if (isset($a[$this->rdf.'resource'])) {
-            $o['type'] = 'uri';
-            $o['value'] = $b->resolve($a[$this->rdf.'resource']);
-            $this->add($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-            /* type */
-            if (isset($a[$this->rdf.'type'])) {
-                $this->add(
-                    $o['value'],
-                    $this->rdf.'type',
-                    $a[$this->rdf.'type'],
-                    'uri',
-                    'uri'
-                );
-            }
-            /* reification */
-            if (isset($s['p_id'])) {
-                $this->reify(
-                    $b->resolve('#'.$s['p_id']),
-                    $s['value'],
-                    $s['p'],
-                    $o['value'],
-                    $s['type'],
-                    $o['type']
-                );
-                unset($s['p_id']);
-            }
-            $this->state = 3;
-        } elseif (isset($a[$this->rdf.'nodeID'])) {
-            /* named bnode */
-            $o['value'] = $this->remapBnode($a[$this->rdf.'nodeID']);
-            $o['type'] = 'bnode';
-            $this->add($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-            $this->state = 3;
-            /* reification */
-            if (isset($s['p_id'])) {
-                $this->reify(
-                    $b->resolve('#'.$s['p_id']),
-                    $s['value'],
-                    $s['p'],
-                    $o['value'],
-                    $s['type'],
-                    $o['type']
-                );
-            }
-            /* parseType */
-        } elseif (isset($a[$this->rdf.'parseType'])) {
-            if ($a[$this->rdf.'parseType'] === 'Literal') {
-                $s['o_xml_level'] = 0;
-                $s['o_xml_data'] = '';
-                $s['p_xml_literal_level'] = 0;
-                $s['ns'] = array();
-                $this->state = 6;
-            } elseif ($a[$this->rdf.'parseType'] === 'Resource') {
-                $o['value'] = $this->graph->newBNodeId();
-                $o['type'] = 'bnode';
-                $o['hasClosingTag'] = 0;
-                $this->add($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-                $this->pushS($o);
-                /* reification */
-                if (isset($s['p_id'])) {
-                    $this->reify(
-                        $b->resolve('#'.$s['p_id']),
-                        $s['value'],
-                        $s['p'],
-                        $o['value'],
-                        $s['type'],
-                        $o['type']
-                    );
-                    unset($s['p_id']);
-                }
-                $this->state = 2;
-            } elseif ($a[$this->rdf.'parseType'] === 'Collection') {
-                $s['o_is_coll'] = true;
-                $this->state = 4;
-            }
-        } else {
-            /* sub-node or literal */
-            $s['o_cdata'] = '';
-            if (isset($a[$this->rdf.'datatype'])) {
-                $s['o_datatype'] = $a[$this->rdf.'datatype'];
-            }
-            $this->state = 4;
-        }
-        /* any other attrs (skip rdf and xml) */
-        foreach ($a as $k => $v) {
-            if (((strpos($k, $this->xml) === false) &&
-             (strpos($k, $this->rdf) === false)) ||
-             preg_match('/(\_[0-9]+|value)$/', $k)) {
-                if (strpos($k, ':')) {
-                    if (!$o['value']) {
-                        $o['value'] = $this->graph->newBNodeId();
-                        $o['type'] = 'bnode';
-                        $this->add($s['value'], $s['p'], $o['value'], $s['type'], $o['type']);
-                    }
-                    /* reification */
-                    if (isset($s['p_id'])) {
-                        $this->reify(
-                            $b->resolve('#'.$s['p_id']),
-                            $s['value'],
-                            $s['p'],
-                            $o['value'],
-                            $s['type'],
-                            $o['type']
-                        );
-                        unset($s['p_id']);
-                    }
-                    $this->add($o['value'], $k, $v, $o['type'], 'literal');
-                    $this->state = 3;
-                }
-            }
-        }
-        $this->updateS($s);
-    }
-
-    /** @ignore */
-    protected function startState4($t, $a)
-    {
-        return $this->startState1($t, $a);
-    }
-
-    /** @ignore */
-    protected function startState5($t, $a)
-    {
-        $this->state = 4;
-        return $this->startState4($t, $a);
-    }
-
-    /** @ignore */
-    protected function startState6($t, $a)
-    {
-        $s = $this->getParentS();
-        $data = isset($s['o_xml_data']) ? $s['o_xml_data'] : '';
-        $ns = isset($s['ns']) ? $s['ns'] : array();
-        $parts = $this->splitURI($t);
-        if (count($parts) === 1) {
-            $data .= '<'.$t;
-        } else {
-            $nsUri = $parts[0];
-            $name = $parts[1];
-            if (!isset($this->nsp[$nsUri])) {
-                foreach ($this->nsp as $tmp1 => $tmp2) {
-                    if (strpos($t, $tmp1) === 0) {
-                        $nsUri = $tmp1;
-                        $name = substr($t, strlen($tmp1));
-                        break;
-                    }
-                }
-            }
-
-            $nsp = isset($this->nsp[$nsUri]) ? $this->nsp[$nsUri] : '';
-            $data .= $nsp ? '<' . $nsp . ':' . $name : '<' . $name;
-            /* ns */
-            if (!isset($ns[$nsp.'='.$nsUri]) || !$ns[$nsp.'='.$nsUri]) {
-                $data .= $nsp ? ' xmlns:'.$nsp.'="'.$nsUri.'"' : ' xmlns="'.$nsUri.'"';
-                $ns[$nsp.'='.$nsUri] = true;
-                $s['ns'] = $ns;
-            }
-        }
-        foreach ($a as $k => $v) {
-            $parts = $this->splitURI($k);
-            if (count($parts) === 1) {
-                $data .= ' '.$k.'="'.$v.'"';
-            } else {
-                $nsUri = $parts[0];
-                $name = $parts[1];
-                $nsp = isset($this->nsp[$nsUri]) ? $this->nsp[$nsUri] : '';
-                $data .= $nsp ? ' '.$nsp.':'.$name.'="'.$v.'"' : ' '.$name.'="'.$v.'"' ;
-            }
-        }
-        $data .= '>';
-        $s['o_xml_data'] = $data;
-        $s['o_xml_level'] = isset($s['o_xml_level']) ? $s['o_xml_level'] + 1 : 1;
-        if ($t == $s['p']) {/* xml container prop */
-            $s['p_xml_literal_level'] = isset($s['p_xml_literal_level']) ? $s['p_xml_literal_level'] + 1 : 1;
-        }
-        $this->updateS($s);
-    }
-
-    /** @ignore */
-    protected function endState1($t)
-    {
-        /* end of doc */
-        $this->state = 0;
-    }
-
-    /** @ignore */
-    protected function endState2($t)
-    {
-        /* expecting a prop, getting a close */
-        if ($s = $this->getParentS()) {
-            $hasClosingTag = (isset($s['hasClosingTag']) && !$s['hasClosingTag']) ? 0 : 1;
-            $this->popS();
-            $this->state = 5;
-            if ($s = $this->getParentS()) {
-                /* new s */
-                if (!isset($s['p']) || !$s['p']) {
-                    /* p close after collection|parseType=Resource|node close after p close */
-                    $this->state = $this->sCount ? 4 : 1;
-                    if (!$hasClosingTag) {
-                        $this->state = 2;
-                    }
-                } elseif (!$hasClosingTag) {
-                    $this->state = 2;
-                }
-            }
-        }
-    }
-
-    /** @ignore */
-    protected function endState3($t)
-    {
-        /* p close */
-        $this->state = 2;
-    }
-
-    /** @ignore */
-    protected function endState4($t)
-    {
-        /* empty p | pClose after cdata | pClose after collection */
-        if ($s = $this->getParentS()) {
-            $b = isset($s['p_x_base']) && $s['p_x_base'] ?
-                $s['p_x_base'] : (isset($s['x_base']) ? $s['x_base'] : '');
-            if (isset($s['is_coll']) && $s['is_coll']) {
-                $this->add($s['value'], $this->rdf.'rest', $this->rdf.'nil', $s['type'], 'uri');
-                /* back to collection start */
-                while ((!isset($s['p']) || ($s['p'] != $t))) {
-                    $subS = $s;
-                    $this->popS();
-                    $s = $this->getParentS();
-                }
-                /* reification */
-                if (isset($s['p_id']) && $s['p_id']) {
-                    $this->reify(
-                        $b->resolve('#'.$s['p_id']),
-                        $s['value'],
-                        $s['p'],
-                        $subS['value'],
-                        $s['type'],
-                        $subS['type']
-                    );
-                }
-                unset($s['p']);
-                $this->updateS($s);
-            } else {
-                $dt = isset($s['o_datatype']) ? $s['o_datatype'] : null;
-                $l = isset($s['p_x_lang']) && $s['p_x_lang'] ?
-                     $s['p_x_lang'] : (isset($s['x_lang']) ? $s['x_lang'] : null);
-                $o = array('type' => 'literal', 'value' => $s['o_cdata']);
-                $this->add(
-                    $s['value'],
-                    $s['p'],
-                    $o['value'],
-                    $s['type'],
-                    $o['type'],
-                    $dt,
-                    $l
-                );
-                /* reification */
-                if (isset($s['p_id']) && $s['p_id']) {
-                    $this->reify(
-                        $b->resolve('#'.$s['p_id']),
-                        $s['value'],
-                        $s['p'],
-                        $o['value'],
-                        $s['type'],
-                        $o['type'],
-                        $dt,
-                        $l
-                    );
-                }
-                unset($s['o_cdata']);
-                unset($s['o_datatype']);
-                unset($s['p']);
-                $this->updateS($s);
-            }
-            $this->state = 2;
-        }
-    }
-
-    /** @ignore */
-    protected function endState5($t)
-    {
-        /* p close */
-        if ($s = $this->getParentS()) {
-            unset($s['p']);
-            $this->updateS($s);
-            $this->state = 2;
-        }
-    }
-
-    /** @ignore */
-    protected function endState6($t)
-    {
-        if ($s = $this->getParentS()) {
-            $l = isset($s['p_x_lang']) && $s['p_x_lang'] ?
-                $s['p_x_lang'] :
-                (isset($s['x_lang']) ? $s['x_lang'] : null);
-            $data = $s['o_xml_data'];
-            $level = $s['o_xml_level'];
-            if ($level === 0) {
-                /* pClose */
-                $this->add(
-                    $s['value'],
-                    $s['p'],
-                    trim($data, ' '),
-                    $s['type'],
-                    'literal',
-                    $this->rdf.'XMLLiteral',
-                    $l
-                );
-                unset($s['o_xml_data']);
-                $this->state = 2;
-            } else {
-                $parts = $this->splitURI($t);
-                if (count($parts) == 1) {
-                    $data .= '</'.$t.'>';
-                } else {
-                    $nsUri = $parts[0];
-                    $name = $parts[1];
-                    if (!isset($this->nsp[$nsUri])) {
-                        foreach ($this->nsp as $tmp1 => $tmp2) {
-                            if (strpos($t, $tmp1) === 0) {
-                                $nsUri = $tmp1;
-                                $name = substr($t, strlen($tmp1));
-                                break;
-                            }
-                        }
-                    }
-                    $nsp = isset($this->nsp[$nsUri]) ? $this->nsp[$nsUri] : '';
-                    $data .= $nsp ? '</'.$nsp.':'.$name.'>' : '</'.$name.'>';
-                }
-                $s['o_xml_data'] = $data;
-                $s['o_xml_level'] = $level - 1;
-                if ($t == $s['p']) {
-                    /* xml container prop */
-                    $s['p_xml_literal_level']--;
-                }
-            }
-            $this->updateS($s);
-        }
-    }
-
-    /** @ignore */
-    protected function cdataState4($d)
-    {
-        if ($s = $this->getParentS()) {
-            $s['o_cdata'] = isset($s['o_cdata']) ? $s['o_cdata'] . $d : $d;
-            $this->updateS($s);
-        }
-    }
-
-    /** @ignore */
-    protected function cdataState6($d)
-    {
-        if ($s = $this->getParentS()) {
-            if (isset($s['o_xml_data']) || preg_match('/[\n\r]/', $d) || trim($d)) {
-                $d = htmlspecialchars($d, ENT_NOQUOTES);
-                $s['o_xml_data'] = isset($s['o_xml_data']) ? $s['o_xml_data'] . $d : $d;
-            }
-            $this->updateS($s);
-        }
-    }
-
-    /**
-      * Parse an RDF/XML document into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'rdfxml') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_RdfXml does not support: $format"
-            );
-        }
-
-        $this->init($graph, $baseUri);
-        $this->resetBnodeMap();
-
-        /* xml parser */
-        $this->initXMLParser();
-
-        /* parse */
-        if (!xml_parse($this->xmlParser, $data, false)) {
-            $message = xml_error_string(xml_get_error_code($this->xmlParser));
-            throw new EasyRdf_Parser_Exception(
-                'XML error: "' . $message . '"',
-                xml_get_current_line_number($this->xmlParser),
-                xml_get_current_column_number($this->xmlParser)
-            );
-        }
-
-        xml_parser_free($this->xmlParser);
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rdfa.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rdfa.php
deleted file mode 100644
index 58eebe6..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Rdfa.php
+++ /dev/null
@@ -1,727 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2012-2013 Nicholas J Humfrey.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 1997-2006 Aduna (http://www.aduna-software.com/)
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse RDFa 1.1 with no external dependancies.
- *
- * http://www.w3.org/TR/rdfa-core/
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2012-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Rdfa extends EasyRdf_Parser
-{
-    const XML_NS = 'http://www.w3.org/XML/1998/namespace';
-    const RDF_XML_LITERAL = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral';
-    const TERM_REGEXP = '/^([a-zA-Z_])([0-9a-zA-Z_\.-]*)$/';
-
-    public $debug = false;
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_Rdfa
-     */
-    public function __construct()
-    {
-    }
-
-    protected function addTriple($resource, $property, $value)
-    {
-        if ($this->debug) {
-            print "Adding triple: $resource -> $property -> ".$value['type'].':'.$value['value']."\n";
-        }
-        $count = $this->graph->add($resource, $property, $value);
-        $this->tripleCount += $count;
-        return $count;
-    }
-
-    protected function generateList($subject, $property, $list)
-    {
-        $current = $subject;
-        $prop = $property;
-
-        // Output a blank node for each item in the list
-        foreach ($list as $item) {
-            $newNode = $this->graph->newBNodeId();
-            $this->addTriple($current, $prop, array('type' => 'bnode', 'value' => $newNode));
-            $this->addTriple($newNode, 'rdf:first', $item);
-
-            $current = $newNode;
-            $prop = 'rdf:rest';
-        }
-
-        // Finally, terminate the list
-        $this->addTriple(
-            $current,
-            $prop,
-            array('type' => 'uri', 'value' => EasyRdf_Namespace::expand('rdf:nil'))
-        );
-    }
-
-    protected function addToList($listMapping, $property, $value)
-    {
-        if ($this->debug) {
-            print "Adding to list: $property -> ".$value['type'].':'.$value['value']."\n";
-        }
-
-        // Create property in the list mapping if it doesn't already exist
-        if (!isset($listMapping->$property)) {
-            $listMapping->$property = array();
-        }
-        array_push($listMapping->$property, $value);
-    }
-
-    protected function printNode($node, $depth)
-    {
-        $indent = str_repeat('  ', $depth);
-        print $indent;
-        switch($node->nodeType) {
-            case XML_ELEMENT_NODE:
-                print 'node';
-                break;
-            case XML_ATTRIBUTE_NODE:
-                print 'attr';
-                break;
-            case XML_TEXT_NODE:
-                print 'text';
-                break;
-            case XML_CDATA_SECTION_NODE:
-                print 'cdata';
-                break;
-            case XML_ENTITY_REF_NODE:
-                print 'entref';
-                break;
-            case XML_ENTITY_NODE:
-                print 'entity';
-                break;
-            case XML_PI_NODE:
-                print 'pi';
-                break;
-            case XML_COMMENT_NODE:
-                print 'comment';
-                break;
-            case XML_DOCUMENT_NODE:
-                print 'doc';
-                break;
-            case XML_DOCUMENT_TYPE_NODE:
-                print 'doctype';
-                break;
-            case XML_HTML_DOCUMENT_NODE:
-                print 'html';
-                break;
-            default:
-                throw new EasyRdf_Exception("unknown node type: ".$node->nodeType);
-                break;
-        }
-        print ' '.$node->nodeName."\n";
-
-        if ($node->hasAttributes()) {
-            foreach ($node->attributes as $attr) {
-                print $indent.' '.$attr->nodeName." => ".$attr->nodeValue."\n";
-            }
-        }
-    }
-
-    protected function guessTimeDatatype($value)
-    {
-        if (preg_match('/^-?\d{4}-\d{2}-\d{2}(Z|[\-\+]\d{2}:\d{2})?$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#date';
-        } elseif (preg_match('/^\d{2}:\d{2}:\d{2}(Z|[\-\+]\d{2}:\d{2})?$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#time';
-        } elseif (preg_match('/^-?\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[\-\+]\d{2}:\d{2})?$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#dateTime';
-        } elseif (preg_match('/^P(\d+Y)?(\d+M)?(\d+D)?T?(\d+H)?(\d+M)?(\d+S)?$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#duration';
-        } elseif (preg_match('/^\d{4}$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#gYear';
-        } elseif (preg_match('/^\d{4}-\d{2}$/', $value)) {
-            return 'http://www.w3.org/2001/XMLSchema#gYearMonth';
-        } else {
-            return null;
-        }
-    }
-
-    protected function initialContext()
-    {
-        $context = array(
-            'prefixes' => array(),
-            'vocab' => null,
-            'subject' => $this->baseUri,
-            'property' => null,
-            'object' => null,
-            'terms' => array(),
-            'incompleteRels' => array(),
-            'incompleteRevs' => array(),
-            'listMapping' => null,
-            'lang' => null,
-            'path' => '',
-            'xmlns' => array(),
-        );
-
-        // Set the default prefix
-        $context['prefixes'][''] = 'http://www.w3.org/1999/xhtml/vocab#';
-
-        // RDFa 1.1 default term mapping
-        $context['terms']['describedby'] = 'http://www.w3.org/2007/05/powder-s#describedby';
-        $context['terms']['license'] = 'http://www.w3.org/1999/xhtml/vocab#license';
-        $context['terms']['role'] = 'http://www.w3.org/1999/xhtml/vocab#role';
-
-        return $context;
-    }
-
-    protected function expandCurie($node, &$context, $value)
-    {
-        if (preg_match('/^(\w*?):(.*)$/', $value, $matches)) {
-            list (, $prefix, $local) = $matches;
-            $prefix = strtolower($prefix);
-            if ($prefix === '_') {
-                // It is a bnode
-                return $this->remapBnode(substr($value, 2));
-            } elseif (empty($prefix) and $context['vocab']) {
-                // Empty prefix
-                return $context['vocab'] . $local;
-            } elseif (isset($context['prefixes'][$prefix])) {
-                return $context['prefixes'][$prefix] . $local;
-            } elseif ($uri = $node->lookupNamespaceURI($prefix)) {
-                return $uri . $local;
-            } elseif (!empty($prefix) and $uri = EasyRdf_Namespace::get($prefix)) {
-                // Expand using well-known prefixes
-                return $uri . $local;
-            }
-        }
-    }
-
-    protected function processUri($node, &$context, $value, $isProp = false)
-    {
-        if (preg_match('/^\[(.*)\]$/', $value, $matches)) {
-            // Safe CURIE
-            return $this->expandCurie($node, $context, $matches[1]);
-        } elseif (preg_match(self::TERM_REGEXP, $value) and $isProp) {
-            $term = strtolower($value);
-            if ($context['vocab']) {
-                return $context['vocab'] . $value;
-            } elseif (isset($context['terms'][$term])) {
-                return $context['terms'][$term];
-            }
-        } elseif (substr($value, 0, 2) === '_:' and $isProp) {
-            return null;
-        } else {
-            $uri = $this->expandCurie($node, $context, $value);
-            if ($uri) {
-                return $uri;
-            } else {
-                $parsed = new EasyRdf_ParsedUri($value);
-                if ($parsed->isAbsolute()) {
-                    return $value;
-                } elseif ($isProp) {
-                    // Properties can't be relative URIs
-                    return null;
-                } elseif ($this->baseUri) {
-                    return $this->baseUri->resolve($parsed);
-                }
-            }
-        }
-    }
-
-    protected function processUriList($node, $context, $values)
-    {
-        if (!$values) {
-            return array();
-        }
-
-        $uris = array();
-        foreach (preg_split('/\s+/', $values) as $value) {
-            $uri = $this->processUri($node, $context, $value, true);
-            if ($uri) {
-                array_push($uris, $uri);
-            }
-        }
-        return $uris;
-    }
-
-    protected function getUriAttribute($node, &$context, $attributes)
-    {
-        if (!is_array($attributes)) {
-            $attributes = array($attributes);
-        }
-
-        // Find the first attribute that returns a valid URI
-        foreach ($attributes as $attribute) {
-            if ($node->hasAttribute($attribute)) {
-                $value = $node->getAttribute($attribute);
-                $uri = $this->processUri($node, $context, $value);
-                if ($uri) {
-                    return $uri;
-                }
-            }
-        }
-    }
-
-    protected function processNode($node, &$context, $depth = 1)
-    {
-        if ($this->debug) {
-            $this->printNode($node, $depth);
-        }
-
-        // Step 1: establish local variables
-        $skip = false;
-        $subject = null;
-        $typedResource = null;
-        $object = null;
-        $rels = array();
-        $revs = array();
-        $lang = $context['lang'];
-        $incompleteRels = array();
-        $incompleteRevs = array();
-
-        if ($node->nodeType === XML_ELEMENT_NODE) {
-            $context['path'] .= '/' . $node->nodeName;
-
-            $content = $node->hasAttribute('content') ? $node->getAttribute('content') : null;
-            $datatype = $node->hasAttribute('datatype') ? $node->getAttribute('datatype') : null;
-            $property = $node->getAttribute('property') ? $node->getAttribute('property') : null;
-            $typeof = $node->getAttribute('typeof') ? $node->getAttribute('typeof') : null;
-
-            // Step 2: Default vocabulary
-            if ($node->hasAttribute('vocab')) {
-                $context['vocab'] = $node->getAttribute('vocab');
-                if ($context['vocab']) {
-                    $this->addTriple(
-                        $this->baseUri,
-                        'rdfa:usesVocabulary',
-                        array('type' => 'uri', 'value' => $context['vocab'])
-                    );
-                }
-            }
-
-            // Step 3: Set prefix mappings
-            // Support for deprecated xmlns if present in document
-            foreach ($context['xmlns'] as $prefix => $uri) {
-                if ($node->hasAttribute('xmlns:' . $prefix)) {
-                    $context['prefixes'][$prefix] = $node->getAttribute('xmlns:' . $prefix);
-                    if ($this->debug) {
-                        print "Prefix (xmlns): $prefix => $uri\n";
-                    }
-                }
-            }
-            if ($node->hasAttribute('prefix')) {
-                $mappings = preg_split('/\s+/', $node->getAttribute('prefix'));
-                while (count($mappings)) {
-                    $prefix = strtolower(array_shift($mappings));
-                    $uri = array_shift($mappings);
-
-                    if (substr($prefix, -1) === ':') {
-                        $prefix = substr($prefix, 0, -1);
-                    } else {
-                        continue;
-                    }
-
-                    if ($prefix === '_') {
-                        continue;
-                    } elseif (!empty($prefix)) {
-                        $context['prefixes'][$prefix] = $uri;
-                        if ($this->debug) {
-                            print "Prefix: $prefix => $uri\n";
-                        }
-                    }
-                }
-            }
-
-            // Step 4
-            if ($node->hasAttributeNS(self::XML_NS, 'lang')) {
-                $lang = $node->getAttributeNS(self::XML_NS, 'lang');
-            } elseif ($node->hasAttribute('lang')) {
-                $lang = $node->getAttribute('lang');
-            }
-
-            // HTML+RDFa 1.1: ignore rel and rev unless they contain CURIEs.
-            foreach (array('rel', 'rev') as $attr) {
-                if ($node->hasAttribute('property') and $node->hasAttribute($attr)) {
-                    // Quick check in case there are no CURIEs to deal with.
-                    if (strpos($node->getAttribute($attr), ':') === false) {
-                        $node->removeAttribute($attr);
-                    } else {
-                        // Only keep CURIEs.
-                        $curies = array();
-                        foreach (preg_split('/\s+/', $node->getAttribute($attr)) as $token) {
-                            if (strpos($token, ':')) {
-                                $curies[] = $token;
-                            }
-                        }
-                        $node->setAttribute($attr, implode(' ', $curies));
-                    }
-                }
-            }
-
-            $rels = $this->processUriList($node, $context, $node->getAttribute('rel'));
-            $revs = $this->processUriList($node, $context, $node->getAttribute('rev'));
-
-            if (!$node->hasAttribute('rel') and !$node->hasAttribute('rev')) {
-                // Step 5: Establish a new subject if no rel/rev
-                if ($property and is_null($content) and is_null($datatype)) {
-                    $subject = $this->getUriAttribute($node, $context, 'about');
-                    if ($typeof and !$subject) {
-                        $typedResource = $this->getUriAttribute(
-                            $node,
-                            $context,
-                            array('resource', 'href', 'src')
-                        );
-                        if (!$typedResource) {
-                            $typedResource = $this->graph->newBNodeId();
-                        }
-                        $object = $typedResource;
-                    }
-                } else {
-                    $subject = $this->getUriAttribute(
-                        $node,
-                        $context,
-                        array('about', 'resource', 'href', 'src')
-                    );
-                }
-
-                // Establish a subject if there isn't one
-                # FIXME: refactor this
-                if (is_null($subject)) {
-                    if ($context['path'] === '/html/head') {
-                        $subject = $context['object'];
-                    } elseif ($depth <= 2) {
-                        $subject = $this->baseUri;
-                    } elseif ($typeof and !$property) {
-                        $subject = $this->graph->newBNodeId();
-                    } else {
-                        if (!$property) {
-                            $skip = true;
-                        }
-                        $subject = $context['object'];
-                    }
-                }
-
-            } else {
-                // Step 6
-                // If the current element does contain a @rel or @rev attribute, then the next step is to
-                // establish both a value for new subject and a value for current object resource:
-
-                $subject = $this->getUriAttribute($node, $context, 'about');
-
-                $object = $this->getUriAttribute(
-                    $node,
-                    $context,
-                    array('resource', 'href', 'src')
-                );
-
-                if ($typeof) {
-                    if (!$object and !$subject) {
-                        $object = $this->graph->newBNodeId();
-                    }
-                    $typedResource = $subject ? $subject : $object;
-                }
-
-                # FIXME: if the element is the root element of the document
-                # then act as if there is an empty @about present
-                if (!$subject) {
-                    $subject = $context['object'];
-                }
-
-            }
-
-            # FIXME: better place for this?
-            if ($typeof and $subject and !$typedResource) {
-                $typedResource = $subject;
-            }
-
-            // Step 7: Process @typeof if there is a subject
-            if ($typedResource) {
-                foreach ($this->processUriList($node, $context, $typeof) as $type) {
-                    $this->addTriple(
-                        $typedResource,
-                        'rdf:type',
-                        array('type' => 'uri', 'value' => $type)
-                    );
-                }
-            }
-
-            // Step 8: Create new List mapping if the subject has changed
-            if ($subject and $subject !== $context['subject']) {
-                $listMapping = new StdClass();
-            } else {
-                $listMapping = $context['listMapping'];
-            }
-
-            // Step 9: Generate triples with given object
-            if ($subject and $object) {
-                foreach ($rels as $prop) {
-                    $obj = array('type' => 'uri', 'value' => $object);
-                    if ($node->hasAttribute('inlist')) {
-                        $this->addToList($listMapping, $prop, $obj);
-                    } else {
-                        $this->addTriple($subject, $prop, $obj);
-                    }
-                }
-
-                foreach ($revs as $prop) {
-                    $this->addTriple(
-                        $object,
-                        $prop,
-                        array('type' => 'uri', 'value' => $subject)
-                    );
-                }
-            } elseif ($rels or $revs) {
-                // Step 10: Incomplete triples and bnode creation
-                $object = $this->graph->newBNodeId();
-                if ($rels) {
-                    if ($node->hasAttribute('inlist')) {
-                        foreach ($rels as $prop) {
-                            # FIXME: add support for incomplete lists
-                            if (!isset($listMapping->$prop)) {
-                                $listMapping->$prop = array();
-                            }
-                        }
-                    } else {
-                        $incompleteRels = $rels;
-                        if ($this->debug) {
-                            print "Incomplete rels: ".implode(',', $rels)."\n";
-                        }
-                    }
-                }
-
-                if ($revs) {
-                    $incompleteRevs = $revs;
-                    if ($this->debug) {
-                        print "Incomplete revs: ".implode(',', $revs)."\n";
-                    }
-                }
-            }
-
-            // Step 11: establish current property value
-            if ($subject and $property) {
-                $value = array();
-
-                if ($datatype) {
-                    $datatype = $this->processUri($node, $context, $datatype, true);
-                }
-
-                if ($content !== null) {
-                    $value['value'] = $content;
-                } elseif ($node->hasAttribute('datetime')) {
-                    $value['value'] = $node->getAttribute('datetime');
-                    $datetime = true;
-                } elseif ($datatype === '') {
-                    $value['value'] = $node->textContent;
-                } elseif ($datatype === self::RDF_XML_LITERAL) {
-                    $value['value'] = '';
-                    foreach ($node->childNodes as $child) {
-                        $value['value'] .= $child->C14N();
-                    }
-                } elseif (is_null($datatype) and empty($rels) and empty($revs)) {
-                    $value['value'] = $this->getUriAttribute(
-                        $node,
-                        $context,
-                        array('resource', 'href', 'src')
-                    );
-
-                    if ($value['value']) {
-                        $value['type'] = 'uri';
-                    }
-                }
-
-                if (empty($value['value']) and $typedResource and !$node->hasAttribute('about')) {
-                    $value['type'] = 'uri';
-                    $value['value'] = $typedResource;
-                }
-
-                if (empty($value['value'])) {
-                    $value['value'] = $node->textContent;
-                }
-
-                if (empty($value['type'])) {
-                    $value['type'] = 'literal';
-                    if ($datatype) {
-                        $value['datatype'] = $datatype;
-                    } elseif (isset($datetime) or $node->nodeName === 'time') {
-                        $value['datatype'] = $this->guessTimeDatatype($value['value']);
-                    }
-
-                    if (empty($value['datatype']) and $lang) {
-                        $value['lang'] = $lang;
-                    }
-                }
-
-                // Add each of the properties
-                foreach ($this->processUriList($node, $context, $property) as $prop) {
-                    if ($node->hasAttribute('inlist')) {
-                        $this->addToList($listMapping, $prop, $value);
-                    } elseif ($subject) {
-                        $this->addTriple($subject, $prop, $value);
-                    }
-                }
-            }
-
-            // Step 12: Complete the incomplete triples from the evaluation context
-            if (!$skip and $subject and ($context['incompleteRels'] or $context['incompleteRevs'])) {
-                foreach ($context['incompleteRels'] as $prop) {
-                    $this->addTriple(
-                        $context['subject'],
-                        $prop,
-                        array('type' => 'uri', 'value' => $subject)
-                    );
-                }
-
-                foreach ($context['incompleteRevs'] as $prop) {
-                    $this->addTriple(
-                        $subject,
-                        $prop,
-                        array('type' => 'uri', 'value' => $context['subject'])
-                    );
-                }
-            }
-        }
-
-        // Step 13: create a new evaluation context and proceed recursively
-        if ($node->hasChildNodes()) {
-            if ($skip) {
-                $newContext = $context;
-            } else {
-                // Prepare a new evaluation context
-                $newContext = $context;
-                if ($object) {
-                    $newContext['object'] = $object;
-                } elseif ($subject) {
-                    $newContext['object'] = $subject;
-                } else {
-                    $newContext['object'] = $context['subject'];
-                }
-                if ($subject) {
-                    $newContext['subject'] = $subject;
-                }
-                $newContext['incompleteRels'] = $incompleteRels;
-                $newContext['incompleteRevs'] = $incompleteRevs;
-                if (isset($listMapping)) {
-                    $newContext['listMapping'] = $listMapping;
-                }
-            }
-
-            // The language is always updated, even if skip is set
-            $newContext['lang'] = $lang;
-
-            foreach ($node->childNodes as $child) {
-                if ($child->nodeType === XML_ELEMENT_NODE) {
-                    $this->processNode($child, $newContext, $depth+1);
-                }
-            }
-        }
-
-        // Step 14: create triples for lists
-        if (!empty($listMapping)) {
-            foreach ($listMapping as $prop => $list) {
-                if ($context['listMapping'] !== $listMapping) {
-                    if ($this->debug) {
-                        print "Need to create triples for $prop => ".count($list)." items\n";
-                    }
-                    $this->generateList($subject, $prop, $list);
-                }
-            }
-        }
-    }
-
-    /**
-     * Parse RDFa 1.1 into an EasyRdf_Graph
-     *
-     * @param object EasyRdf_Graph $graph   the graph to load the data into
-     * @param string               $data    the RDF document data
-     * @param string               $format  the format of the input data
-     * @param string               $baseUri the base URI of the data being parsed
-     * @return integer             The number of triples added to the graph
-     */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'rdfa') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_Rdfa does not support: $format"
-            );
-        }
-
-        // Initialise evaluation context.
-        $context = $this->initialContext();
-
-        libxml_use_internal_errors(true);
-
-        // Parse the document into DOM
-        $doc = new DOMDocument();
-        // Attempt to parse the document as strict XML, and fall back to HTML
-        // if XML parsing fails.
-        if ($doc->loadXML($data, LIBXML_NONET)) {
-            if ($this->debug) {
-                print "Document was parsed as XML.";
-            }
-            // Collect all xmlns namespaces defined throughout the document.
-            $sxe = simplexml_import_dom($doc);
-            $context['xmlns'] = $sxe->getDocNamespaces(true);
-            unset($context['xmlns']['']);
-        } else {
-            $doc->loadHTML($data);
-            if ($this->debug) {
-                print "Document was parsed as HTML.";
-            }
-        }
-
-        // Establish the base for both XHTML and HTML documents.
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('xh', "http://www.w3.org/1999/xhtml");
-        $nodeList = $xpath->query('/xh:html/xh:head/xh:base');
-        if ($node = $nodeList->item(0) and $href = $node->getAttribute('href')) {
-            $this->baseUri = new EasyRdf_ParsedUri($href);
-        }
-        $nodeList = $xpath->query('/html/head/base');
-        if ($node = $nodeList->item(0) and $href = $node->getAttribute('href')) {
-            $this->baseUri = new EasyRdf_ParsedUri($href);
-        }
-
-        // Remove the fragment from the base URI
-        $this->baseUri->setFragment(null);
-
-        // Recursively process XML nodes
-        $this->processNode($doc, $context);
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
deleted file mode 100644
index bdeb5a2..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Redland.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse RDF using Redland (librdf) C library.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Redland extends EasyRdf_Parser
-{
-    /** Variable set to the librdf world */
-    private $world = null;
-
-    /** Parser feature URI string for getting the error count of last parse. */
-    const LIBRDF_PARSER_FEATURE_ERROR_COUNT =
-        'http://feature.librdf.org/parser-error-count';
-
-    /*
-     *  Types supported by Redland:
-     *
-     *  ntriples: N-Triples
-     *  turtle: Turtle Terse RDF Triple Language
-     *  trig: TriG - Turtle with Named Graphs
-     *  rss-tag-soup: RSS Tag Soup
-     *  grddl: Gleaning Resource Descriptions from Dialects of Languages
-     *  guess: Pick the parser to use using content type and URI
-     *  rdfa: RDF/A via librdfa
-     *  raptor: (null)
-     *  rdfxml: RDF/XML
-     */
-
-
-    /**
-     * Convert a librdf node type into a string
-     * @ignore
-     */
-    protected function nodeTypeString($node)
-    {
-        switch(librdf_node_get_type($node)) {
-            case 1:
-                return 'uri';
-                break;
-            case 2:
-                return 'literal';
-                break;
-            case 4:
-                return 'bnode';
-                break;
-            default:
-                return 'unknown';
-                break;
-        }
-    }
-
-    /**
-     * Convert the URI for a node into a string
-     * @ignore
-     */
-    protected function nodeUriString($node)
-    {
-        $type = EasyRdf_Parser_Redland::nodeTypeString($node);
-        if ($type == 'uri') {
-            $uri = librdf_node_get_uri($node);
-            if (!$uri) {
-                throw new EasyRdf_Exception("Failed to get URI of node");
-            }
-            $str = librdf_uri_to_string($uri);
-            if (!$str) {
-                throw new EasyRdf_Exception(
-                    "Failed to convert librdf_uri to string"
-                );
-            }
-            return $str;
-        } elseif ($type == 'bnode') {
-            return $this->remapBnode(
-                librdf_node_get_blank_identifier($node)
-            );
-        } else {
-            throw new EasyRdf_Exception("Unsupported type: ".$type);
-        }
-    }
-
-    /**
-     * Convert a node into an associate array
-     * @ignore
-     */
-    protected function nodeToRdfPhp($node)
-    {
-        $object = array();
-        $object['type'] = EasyRdf_Parser_Redland::nodeTypeString($node);
-        if ($object['type'] == 'uri') {
-            $object['value'] = EasyRdf_Parser_Redland::nodeUriString($node);
-        } elseif ($object['type'] == 'bnode') {
-            $object['value'] = '_:'.librdf_node_get_blank_identifier($node);
-        } elseif ($object['type'] == 'literal') {
-            $object['value'] = librdf_node_get_literal_value($node);
-            $lang = librdf_node_get_literal_value_language($node);
-            if ($lang) {
-                $object['lang'] = $lang;
-            }
-            $datatype = librdf_node_get_literal_value_datatype_uri($node);
-            if ($datatype) {
-                $object['datatype'] = librdf_uri_to_string($datatype);
-            }
-        } else {
-            throw new EasyRdf_Exception("Unsupported type: ".$object['type']);
-        }
-        return $object;
-    }
-
-    /**
-     * Return the number of errors during parsing
-     * @ignore
-     */
-    protected function parserErrorCount($parser)
-    {
-        $errorUri = librdf_new_uri(
-            $this->world,
-            self::LIBRDF_PARSER_FEATURE_ERROR_COUNT
-        );
-        $errorNode = librdf_parser_get_feature($parser, $errorUri);
-        $errorCount = librdf_node_get_literal_value($errorNode);
-        librdf_free_uri($errorUri);
-        return $errorCount;
-    }
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_Redland
-     */
-    public function __construct()
-    {
-        if (extension_loaded('redland')) {
-            $this->world = librdf_php_get_world();
-            if (!$this->world) {
-                throw new EasyRdf_Exception(
-                    "Failed to initialise librdf world."
-                );
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "Redland PHP extension is not available."
-            );
-        }
-    }
-
-    /**
-      * Parse an RDF document into an EasyRdf_Graph
-      *
-      * @param object EasyRdf_Graph $graph   the graph to load the data into
-      * @param string               $data    the RDF document data
-      * @param string               $format  the format of the input data
-      * @param string               $baseUri the base URI of the data being parsed
-      * @return integer             The number of triples added to the graph
-      */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        $parser = librdf_new_parser($this->world, $format, null, null);
-        if (!$parser) {
-            throw new EasyRdf_Exception(
-                "Failed to create librdf_parser of type: $format"
-            );
-        }
-
-        $rdfUri = librdf_new_uri($this->world, $baseUri);
-        if (!$rdfUri) {
-            throw new EasyRdf_Exception(
-                "Failed to create librdf_uri from: $baseUri"
-            );
-        }
-
-        $stream = librdf_parser_parse_string_as_stream($parser, $data, $rdfUri);
-        if (!$stream) {
-            throw new EasyRdf_Parser_Exception(
-                "Failed to parse RDF stream"
-            );
-        }
-
-        do {
-            $statement = librdf_stream_get_object($stream);
-            if ($statement) {
-                $subject = EasyRdf_Parser_Redland::nodeUriString(
-                    librdf_statement_get_subject($statement)
-                );
-                $predicate = EasyRdf_Parser_Redland::nodeUriString(
-                    librdf_statement_get_predicate($statement)
-                );
-                $object = EasyRdf_Parser_Redland::nodeToRdfPhp(
-                    librdf_statement_get_object($statement)
-                );
-
-                $this->addTriple($subject, $predicate, $object);
-            }
-        } while (!librdf_stream_next($stream));
-
-        $errorCount = $this->parserErrorCount($parser);
-        if ($errorCount) {
-            throw new EasyRdf_Parser_Exception("$errorCount errors while parsing.");
-        }
-
-        librdf_free_uri($rdfUri);
-        librdf_free_stream($stream);
-        librdf_free_parser($parser);
-
-        return $this->tripleCount;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php
deleted file mode 100644
index 760cf7b..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php
+++ /dev/null
@@ -1,1317 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.
- * Copyright (c) 1997-2013 Aduna (http://www.aduna-software.com/)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 1997-2006 Aduna (http://www.aduna-software.com/)
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to parse Turtle with no external dependancies.
- *
- * It is a translation from Java to PHP of the Sesame Turtle Parser:
- * http://bit.ly/TurtleParser
- * 
- * Lasted updated against version: 
- * ecda6a15a200a2fc6a062e2e43081257c3ccd4e6   (Mon Jul 29 12:05:58 2013)
- * 
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- *             Copyright (c) 1997-2013 Aduna (http://www.aduna-software.com/)
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Parser_Turtle extends EasyRdf_Parser_Ntriples
-{
-    protected $data;
-    protected $namespaces;
-    protected $subject;
-    protected $predicate;
-    protected $object;
-    
-    protected $line;
-    protected $column;
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Parser_Turtle
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Parse Turtle into an EasyRdf_Graph
-     *
-     * @param object EasyRdf_Graph $graph   the graph to load the data into
-     * @param string               $data    the RDF document data
-     * @param string               $format  the format of the input data
-     * @param string               $baseUri the base URI of the data being parsed
-     * @return integer             The number of triples added to the graph
-     */
-    public function parse($graph, $data, $format, $baseUri)
-    {
-        parent::checkParseParams($graph, $data, $format, $baseUri);
-
-        if ($format != 'turtle') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Parser_Turtle does not support: $format"
-            );
-        }
-
-        $this->data = $data;
-        $this->namespaces = array();
-        $this->subject = null;
-        $this->predicate = null;
-        $this->object = null;
-        
-        $this->line = 1;
-        $this->column = 1;
-
-        $this->resetBnodeMap();
-
-        $c = $this->skipWSC();
-        while ($c != -1) {
-            $this->parseStatement();
-            $c = $this->skipWSC();
-        }
-
-        return $this->tripleCount;
-    }
-
-
-    /**
-     * Parse a statement [2]
-     * @ignore
-     */
-    protected function parseStatement()
-    {
-        $directive = '';
-        while (true) {
-            $c = $this->read();
-            if ($c == -1 || self::isWhitespace($c)) {
-                $this->unread($c);
-                break;
-            } else {
-                $directive .= $c;
-            }
-        }
-
-        if (preg_match('/^(@|prefix$|base$)/i', $directive)) {
-            $this->parseDirective($directive);
-            $this->skipWSC();
-            // SPARQL BASE and PREFIX lines do not end in .
-            if ($directive[0] == "@") {
-                $this->verifyCharacterOrFail($this->read(), ".");
-            }
-        } else {
-            $this->unread($directive);
-            $this->parseTriples();
-            $this->skipWSC();
-            $this->verifyCharacterOrFail($this->read(), ".");
-        }
-    }
-
-    /**
-     * Parse a directive [3]
-     * @ignore
-     */
-    protected function parseDirective($directive)
-    {
-        $directive = strtolower($directive);
-        if ($directive == "prefix" || $directive == '@prefix') {
-            $this->parsePrefixID();
-        } elseif ($directive == "base" || $directive == '@base') {
-            $this->parseBase();
-        } elseif (mb_strlen($directive, "UTF-8") == 0) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: directive name is missing, expected @prefix or @base",
-                $this->line,
-                $this->column
-            );
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: unknown directive \"$directive\"",
-                $this->line,
-                $this->column
-            );
-        }
-    }
-
-    /**
-     * Parse a prefixID [4]
-     * @ignore
-     */
-    protected function parsePrefixID()
-    {
-        $this->skipWSC();
-
-        // Read prefix ID (e.g. "rdf:" or ":")
-        $prefixID = '';
-
-        while (true) {
-            $c = $this->read();
-            if ($c == ':') {
-                $this->unread($c);
-                break;
-            } elseif (self::isWhitespace($c)) {
-                break;
-            } elseif ($c == -1) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: unexpected end of file while reading prefix id",
-                    $this->line,
-                    $this->column
-                );
-            }
-
-            $prefixID .= $c;
-        }
-
-        $this->skipWSC();
-        $this->verifyCharacterOrFail($this->read(), ":");
-        $this->skipWSC();
-
-        // Read the namespace URI
-        $namespace = $this->parseURI();
-
-        // Store local namespace mapping
-        $this->namespaces[$prefixID] = $namespace['value'];
-    }
-
-    /**
-     * Parse base [5]
-     * @ignore
-     */
-    protected function parseBase()
-    {
-        $this->skipWSC();
-
-        $baseUri = $this->parseURI();
-        $this->baseUri = new EasyRdf_ParsedUri($baseUri['value']);
-    }
-
-    /**
-     * Parse triples [6]
-     * @ignore
-     */
-    protected function parseTriples()
-    {
-        $c = $this->peek();
-
-        // If the first character is an open bracket we need to decide which of
-        // the two parsing methods for blank nodes to use
-        if ($c == '[') {
-            $c = $this->read();
-            $this->skipWSC();
-            $c = $this->peek();
-            if ($c == ']') {
-                $c = $this->read();
-                $this->subject = $this->createBNode();
-                $this->skipWSC();
-                $this->parsePredicateObjectList();
-            } else {
-                $this->unread('[');
-                $this->subject = $this->parseImplicitBlank();
-            }
-            $this->skipWSC();
-            $c = $this->peek();
-
-            // if this is not the end of the statement, recurse into the list of
-            // predicate and objects, using the subject parsed above as the subject
-            // of the statement.
-            if ($c != '.') {
-                $this->parsePredicateObjectList();
-            }
-        } else {
-            $this->parseSubject();
-            $this->skipWSC();
-            $this->parsePredicateObjectList();
-        }
-
-        $this->subject = null;
-        $this->predicate = null;
-        $this->object = null;
-    }
-
-    /**
-     * Parse a predicateObjectList [7]
-     * @ignore
-     */
-    protected function parsePredicateObjectList()
-    {
-        $this->predicate = $this->parsePredicate();
-
-        $this->skipWSC();
-        $this->parseObjectList();
-
-        while ($this->skipWSC() == ';') {
-            $this->read();
-
-            $c = $this->skipWSC();
-
-            if ($c == '.' || $c == ']') {
-                break;
-            } elseif ($c == ';') {
-                // empty predicateObjectList, skip to next
-                continue;
-            }
-
-            $this->predicate = $this->parsePredicate();
-
-            $this->skipWSC();
-
-            $this->parseObjectList();
-        }
-    }
-
-    /**
-     * Parse a objectList [8]
-     * @ignore
-     */
-    protected function parseObjectList()
-    {
-        $this->parseObject();
-
-        while ($this->skipWSC() == ',') {
-            $this->read();
-            $this->skipWSC();
-            $this->parseObject();
-        }
-    }
-
-    /**
-     * Parse a subject [10]
-     * @ignore
-     */
-    protected function parseSubject()
-    {
-        $c = $this->peek();
-        if ($c == '(') {
-            $this->subject = $this->parseCollection();
-        } elseif ($c == '[') {
-            $this->subject = $this->parseImplicitBlank();
-        } else {
-            $value = $this->parseValue();
-
-            if ($value['type'] == 'uri' or $value['type'] == 'bnode') {
-                $this->subject = $value;
-            } else {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: illegal subject type: ".$value['type'],
-                    $this->line,
-                    $this->column
-                );
-            }
-        }
-    }
-
-    /**
-     * Parse a predicate [11]
-     * @ignore
-     */
-    protected function parsePredicate()
-    {
-        // Check if the short-cut 'a' is used
-        $c1 = $this->read();
-
-        if ($c1 == 'a') {
-            $c2 = $this->read();
-
-            if (self::isWhitespace($c2)) {
-                // Short-cut is used, return the rdf:type URI
-                return array(
-                    'type' => 'uri',
-                    'value' => EasyRdf_Namespace::get('rdf') . 'type'
-                );
-            }
-
-            // Short-cut is not used, unread all characters
-            $this->unread($c2);
-        }
-        $this->unread($c1);
-
-        // Predicate is a normal resource
-        $predicate = $this->parseValue();
-        if ($predicate['type'] == 'uri') {
-            return $predicate;
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: Illegal predicate type: " . $predicate['type'],
-                $this->line,
-                $this->column
-            );
-        }
-    }
-
-    /**
-     * Parse a object [12]
-     * @ignore
-     */
-    protected function parseObject()
-    {
-        $c = $this->peek();
-
-        if ($c == '(') {
-            $this->object = $this->parseCollection();
-        } elseif ($c == '[') {
-            $this->object = $this->parseImplicitBlank();
-        } else {
-            $this->object = $this->parseValue();
-        }
-
-        $this->addTriple(
-            $this->subject['value'],
-            $this->predicate['value'],
-            $this->object
-        );
-    }
-
-    /**
-     * Parses a blankNodePropertyList [15]
-     *
-     * This method parses the token []
-     * and predicateObjectLists that are surrounded by square brackets.
-     *
-     * @ignore
-     */
-    protected function parseImplicitBlank()
-    {
-        $this->verifyCharacterOrFail($this->read(), "[");
-
-        $bnode = $this->createBNode();
-
-        $c = $this->read();
-        if ($c != ']') {
-            $this->unread($c);
-
-            // Remember current subject and predicate
-            $oldSubject = $this->subject;
-            $oldPredicate = $this->predicate;
-
-            // generated bNode becomes subject
-            $this->subject = $bnode;
-
-            // Enter recursion with nested predicate-object list
-            $this->skipWSC();
-
-            $this->parsePredicateObjectList();
-
-            $this->skipWSC();
-
-            // Read closing bracket
-            $this->verifyCharacterOrFail($this->read(), "]");
-
-            // Restore previous subject and predicate
-            $this->subject = $oldSubject;
-            $this->predicate = $oldPredicate;
-        }
-
-        return $bnode;
-    }
-
-    /**
-     * Parses a collection [16], e.g: ( item1 item2 item3 )
-     * @ignore
-     */
-    protected function parseCollection()
-    {
-        $this->verifyCharacterOrFail($this->read(), "(");
-
-        $c = $this->skipWSC();
-        if ($c == ')') {
-            // Empty list
-            $this->read();
-            return array(
-                'type' => 'uri',
-                'value' => EasyRdf_Namespace::get('rdf') . 'nil'
-            );
-        } else {
-            $listRoot = $this->createBNode();
-
-            // Remember current subject and predicate
-            $oldSubject = $this->subject;
-            $oldPredicate = $this->predicate;
-
-            // generated bNode becomes subject, predicate becomes rdf:first
-            $this->subject = $listRoot;
-            $this->predicate = array(
-                'type' => 'uri',
-                'value' => EasyRdf_Namespace::get('rdf') . 'first'
-            );
-
-            $this->parseObject();
-            $bNode = $listRoot;
-
-            while ($this->skipWSC() != ')') {
-                // Create another list node and link it to the previous
-                $newNode = $this->createBNode();
-
-                $this->addTriple(
-                    $bNode['value'],
-                    EasyRdf_Namespace::get('rdf') . 'rest',
-                    $newNode
-                );
-
-                // New node becomes the current
-                $this->subject = $bNode = $newNode;
-
-                $this->parseObject();
-            }
-
-            // Skip ')'
-            $this->read();
-
-            // Close the list
-            $this->addTriple(
-                $bNode['value'],
-                EasyRdf_Namespace::get('rdf') . 'rest',
-                array(
-                    'type' => 'uri',
-                    'value' => EasyRdf_Namespace::get('rdf') . 'nil'
-                )
-            );
-
-            // Restore previous subject and predicate
-            $this->subject = $oldSubject;
-            $this->predicate = $oldPredicate;
-
-            return $listRoot;
-        }
-    }
-
-    /**
-     * Parses an RDF value. This method parses uriref, qname, node ID, quoted
-     * literal, integer, double and boolean.
-     * @ignore
-     */
-    protected function parseValue()
-    {
-        $c = $this->peek();
-
-        if ($c == '<') {
-            // uriref, e.g. <foo://bar>
-            return $this->parseURI();
-        } elseif ($c == ':' || self::isPrefixStartChar($c)) {
-            // qname or boolean
-            return $this->parseQNameOrBoolean();
-        } elseif ($c == '_') {
-            // node ID, e.g. _:n1
-            return $this->parseNodeID();
-        } elseif ($c == '"' || $c == "'") {
-            // quoted literal, e.g. "foo" or """foo""" or 'foo' or '''foo'''
-            return $this->parseQuotedLiteral();
-        } elseif (ctype_digit($c) || $c == '.' || $c == '+' || $c == '-') {
-            // integer or double, e.g. 123 or 1.2e3
-            return $this->parseNumber();
-        } elseif ($c == -1) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: unexpected end of file while reading value",
-                $this->line,
-                $this->column
-            );
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: expected an RDF value here, found '$c'",
-                $this->line,
-                $this->column
-            );
-        }
-    }
-
-    /**
-     * Parses a quoted string, optionally followed by a language tag or datatype.
-     * @ignore
-     */
-    protected function parseQuotedLiteral()
-    {
-        $label = $this->parseQuotedString();
-
-        // Check for presence of a language tag or datatype
-        $c = $this->peek();
-
-        if ($c == '@') {
-            $this->read();
-
-            // Read language
-            $lang = '';
-            $c = $this->read();
-            if ($c == -1) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: unexpected end of file while reading language",
-                    $this->line,
-                    $this->column
-                );
-            } elseif (!self::isLanguageStartChar($c)) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: expected a letter, found '$c'",
-                    $this->line,
-                    $this->column
-                );
-            }
-
-            $lang .= $c;
-
-            $c = $this->read();
-            while (!self::isWhitespace($c)) {
-                if ($c == '.' || $c == ';' || $c == ',' || $c == ')' || $c == ']' || $c == -1) {
-                    break;
-                }
-                if (self::isLanguageChar($c)) {
-                    $lang .= $c;
-                } else {
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: illegal language tag char: '$c'",
-                        $this->line,
-                        $this->column
-                    );
-                }
-                $c = $this->read();
-            }
-
-            $this->unread($c);
-
-            return array(
-                'type' => 'literal',
-                'value' => $label,
-                'lang' => $lang
-            );
-        } elseif ($c == '^') {
-            $this->read();
-
-            // next character should be another '^'
-            $this->verifyCharacterOrFail($this->read(), "^");
-
-            // Read datatype
-            $datatype = $this->parseValue();
-            if ($datatype['type'] == 'uri') {
-                return array(
-                    'type' => 'literal',
-                    'value' => $label,
-                    'datatype' => $datatype['value']
-                );
-            } else {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: illegal datatype type: " . $datatype['type'],
-                    $this->line,
-                    $this->column
-                );
-            }
-        } else {
-            return array(
-                'type' => 'literal',
-                'value' => $label
-            );
-        }
-    }
-
-    /**
-     * Parses a quoted string, which is either a "normal string" or a """long string""".
-     * @ignore
-     */
-    protected function parseQuotedString()
-    {
-        $result = null;
-
-        $c1 = $this->read();
-
-        // First character should be ' or "
-        $this->verifyCharacterOrFail($c1, "\"\'");
-
-        // Check for long-string, which starts and ends with three double quotes
-        $c2 = $this->read();
-        $c3 = $this->read();
-
-        if ($c2 == $c1 && $c3 == $c1) {
-            // Long string
-            $result = $this->parseLongString($c2);
-        } else {
-            // Normal string
-            $this->unread($c3);
-            $this->unread($c2);
-
-            $result = $this->parseString($c1);
-        }
-
-        // Unescape any escape sequences
-        return $this->unescapeString($result);
-    }
-
-    /**
-     * Parses a "normal string". This method requires that the opening character
-     * has already been parsed.
-     * @param string  $closingCharacter  The type of quote to use (either ' or ")
-     * @ignore
-     */
-    protected function parseString($closingCharacter)
-    {
-        $str = '';
-
-        while (true) {
-            $c = $this->read();
-
-            if ($c == $closingCharacter) {
-                break;
-            } elseif ($c == -1) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: unexpected end of file while reading string",
-                    $this->line,
-                    $this->column
-                );
-            }
-
-            $str .= $c;
-
-            if ($c == '\\') {
-                // This escapes the next character, which might be a ' or a "
-                $c = $this->read();
-                if ($c == -1) {
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: unexpected end of file while reading string",
-                        $this->line,
-                        $this->column
-                    );
-                }
-                $str .= $c;
-            }
-        }
-
-        return $str;
-    }
-
-    /**
-     * Parses a """long string""". This method requires that the first three
-     * characters have already been parsed.
-     * @param string  $closingCharacter  The type of quote to use (either ' or ")
-     * @ignore
-     */
-    protected function parseLongString($closingCharacter)
-    {
-        $str = '';
-        $doubleQuoteCount = 0;
-
-        while ($doubleQuoteCount < 3) {
-            $c = $this->read();
-
-            if ($c == -1) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: unexpected end of file while reading long string",
-                    $this->line,
-                    $this->column
-                );
-            } elseif ($c == $closingCharacter) {
-                $doubleQuoteCount++;
-            } else {
-                $doubleQuoteCount = 0;
-            }
-
-            $str .= $c;
-
-            if ($c == '\\') {
-                // This escapes the next character, which might be a ' or "
-                $c = $this->read();
-                if ($c == -1) {
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: unexpected end of file while reading long string",
-                        $this->line,
-                        $this->column
-                    );
-                }
-                $str .= $c;
-            }
-        }
-
-        return mb_substr($str, 0, -3, "UTF-8");
-    }
-
-    /**
-     * Parses a numeric value, either of type integer, decimal or double
-     * @ignore
-     */
-    protected function parseNumber()
-    {
-        $value = '';
-        $datatype = EasyRdf_Namespace::get('xsd').'integer';
-
-        $c = $this->read();
-
-        // read optional sign character
-        if ($c == '+' || $c == '-') {
-            $value .= $c;
-            $c = $this->read();
-        }
-
-        while (ctype_digit($c)) {
-            $value .= $c;
-            $c = $this->read();
-        }
-
-        if ($c == '.' || $c == 'e' || $c == 'E') {
-            // read optional fractional digits
-            if ($c == '.') {
-
-                if (self::isWhitespace($this->peek())) {
-                    // We're parsing an integer that did not have a space before the
-                    // period to end the statement
-                } else {
-                    $value .= $c;
-                    $c = $this->read();
-                    while (ctype_digit($c)) {
-                        $value .= $c;
-                        $c = $this->read();
-                    }
-
-                    if (mb_strlen($value, "UTF-8") == 1) {
-                        // We've only parsed a '.'
-                        throw new EasyRdf_Parser_Exception(
-                            "Turtle Parse Error: object for statement missing",
-                            $this->line,
-                            $this->column
-                        );
-                    }
-
-                    // We're parsing a decimal or a double
-                    $datatype = EasyRdf_Namespace::get('xsd').'decimal';
-                }
-            } else {
-                if (mb_strlen($value, "UTF-8") == 0) {
-                    // We've only parsed an 'e' or 'E'
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: object for statement missing",
-                        $this->line,
-                        $this->column
-                    );
-                }
-            }
-
-            // read optional exponent
-            if ($c == 'e' || $c == 'E') {
-                $datatype = EasyRdf_Namespace::get('xsd').'double';
-                $value .= $c;
-
-                $c = $this->read();
-                if ($c == '+' || $c == '-') {
-                    $value .= $c;
-                    $c = $this->read();
-                }
-
-                if (!ctype_digit($c)) {
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: exponent value missing",
-                        $this->line,
-                        $this->column
-                    );
-                }
-
-                $value .= $c;
-
-                $c = $this->read();
-                while (ctype_digit($c)) {
-                    $value .= $c;
-                    $c = $this->read();
-                }
-            }
-        }
-
-        // Unread last character, it isn't part of the number
-        $this->unread($c);
-
-        // Return result as a typed literal
-        return array(
-            'type' => 'literal',
-            'value' => $value,
-            'datatype' => $datatype
-        );
-    }
-
-    /**
-     * Parses a URI / IRI
-     * @ignore
-     */
-    protected function parseURI()
-    {
-        $uri = '';
-
-        // First character should be '<'
-        $this->verifyCharacterOrFail($this->read(), "<");
-
-        // Read up to the next '>' character
-        while (true) {
-            $c = $this->read();
-
-            if ($c == '>') {
-                break;
-            } elseif ($c == -1) {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: unexpected end of file while reading URI",
-                    $this->line,
-                    $this->column
-                );
-            }
-
-            $uri .= $c;
-
-            if ($c == '\\') {
-                // This escapes the next character, which might be a '>'
-                $c = $this->read();
-                if ($c == -1) {
-                    throw new EasyRdf_Parser_Exception(
-                        "Turtle Parse Error: unexpected end of file while reading URI",
-                        $this->line,
-                        $this->column
-                    );
-                }
-                $uri .= $c;
-            }
-        }
-
-        // Unescape any escape sequences
-        $uri = $this->unescapeString($uri);
-
-        return array(
-            'type' => 'uri',
-            'value' => $this->resolve($uri)
-        );
-    }
-
-    /**
-     * Parses qnames and boolean values, which have equivalent starting
-     * characters.
-     * @ignore
-     */
-    protected function parseQNameOrBoolean()
-    {
-        // First character should be a ':' or a letter
-        $c = $this->read();
-        if ($c == -1) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: unexpected end of file while readying value",
-                $this->line,
-                $this->column
-            );
-        }
-        if ($c != ':' && !self::isPrefixStartChar($c)) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: expected a ':' or a letter, found '$c'",
-                $this->line,
-                $this->column
-            );
-        }
-
-        $namespace = null;
-
-        if ($c == ':') {
-            // qname using default namespace
-            if (isset($this->namespaces[''])) {
-                $namespace = $this->namespaces[''];
-            } else {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: default namespace used but not defined",
-                    $this->line,
-                    $this->column
-                );
-            }
-        } else {
-            // $c is the first letter of the prefix
-            $prefix = $c;
-
-            $c = $this->read();
-            while (self::isPrefixChar($c)) {
-                $prefix .= $c;
-                $c = $this->read();
-            }
-
-            if ($c != ':') {
-                // prefix may actually be a boolean value
-                $value = $prefix;
-
-                if ($value == "true" || $value == "false") {
-                    return array(
-                        'type' => 'literal',
-                        'value' => $value,
-                        'datatype' => EasyRdf_Namespace::get('xsd') . 'boolean'
-                    );
-                }
-            }
-
-            $this->verifyCharacterOrFail($c, ":");
-
-            if (isset($this->namespaces[$prefix])) {
-                $namespace = $this->namespaces[$prefix];
-            } else {
-                throw new EasyRdf_Parser_Exception(
-                    "Turtle Parse Error: namespace prefix '$prefix' used but not defined",
-                    $this->line,
-                    $this->column
-                );
-            }
-        }
-
-        // $c == ':', read optional local name
-        $localName = '';
-        $c = $this->read();
-        if (self::isNameStartChar($c)) {
-            if ($c == '\\') {
-                $localName .= $this->readLocalEscapedChar();
-            } else {
-                $localName .= $c;
-            }
-
-            $c = $this->read();
-            while (self::isNameChar($c)) {
-                if ($c == '\\') {
-                    $localName .= $this->readLocalEscapedChar();
-                } else {
-                    $localName .= $c;
-                }
-                $c = $this->read();
-            }
-        }
-
-        // Unread last character
-        $this->unread($c);
-
-        // Note: namespace has already been resolved
-        return array(
-            'type' => 'uri',
-            'value' => $namespace . $localName
-        );
-    }
-
-    protected function readLocalEscapedChar()
-    {
-        $c = $this->read();
-
-        if (self::isLocalEscapedChar($c)) {
-            return $c;
-        } else {
-            throw new EasyRdf_Parser_Exception(
-                "found '" . $c . "', expected one of: " . implode(', ', self::$localEscapedChars),
-                $this->line,
-                $this->column
-            );
-        }
-    }
-
-    /**
-     * Parses a blank node ID, e.g: _:node1
-     * @ignore
-     */
-    protected function parseNodeID()
-    {
-        // Node ID should start with "_:"
-        $this->verifyCharacterOrFail($this->read(), "_");
-        $this->verifyCharacterOrFail($this->read(), ":");
-
-        // Read the node ID
-        $c = $this->read();
-        if ($c == -1) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: unexpected end of file while reading node id",
-                $this->line,
-                $this->column
-            );
-        } elseif (!self::isNameStartChar($c)) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: expected a letter, found '$c'",
-                $this->line,
-                $this->column
-            );
-        }
-
-        // Read all following letter and numbers, they are part of the name
-        $name = $c;
-        $c = $this->read();
-        while (self::isNameChar($c)) {
-            $name .= $c;
-            $c = $this->read();
-        }
-
-        $this->unread($c);
-
-        return array(
-            'type' => 'bnode',
-            'value' => $this->remapBnode($name)
-        );
-    }
-
-    protected function resolve($uri)
-    {
-        if ($this->baseUri) {
-            return $this->baseUri->resolve($uri)->toString();
-        } else {
-            return $uri;
-        }
-    }
-
-    /**
-     * Verifies that the supplied character $c is one of the expected
-     * characters specified in $expected. This method will throw a
-     * exception if this is not the case.
-     * @ignore
-     */
-    protected function verifyCharacterOrFail($c, $expected)
-    {
-        if ($c == -1) {
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: unexpected end of file",
-                $this->line,
-                $this->column
-            );
-        } elseif (strpbrk($c, $expected) === false) {
-            $msg = 'expected ';
-            for ($i = 0; $i < strlen($expected); $i++) {
-                if ($i > 0) {
-                    $msg .= " or ";
-                }
-                $msg .= '\''.$expected[$i].'\'';
-            }
-            $msg .= ", found '$c'";
-
-            throw new EasyRdf_Parser_Exception(
-                "Turtle Parse Error: $msg",
-                $this->line,
-                $this->column
-            );
-        }
-    }
-
-    /**
-     * Skip through whitespace and comments
-     * @ignore
-     */
-    protected function skipWSC()
-    {
-        $c = $this->read();
-        while (self::isWhitespace($c) || $c == '#') {
-            if ($c == '#') {
-                $this->processComment();
-            }
-
-            $c = $this->read();
-        }
-
-        $this->unread($c);
-        return $c;
-    }
-
-    /**
-     * Consumes characters from reader until the first EOL has been read.
-     * @ignore
-     */
-    protected function processComment()
-    {
-        $comment = '';
-        $c = $this->read();
-        while ($c != -1 && $c != "\r" && $c != "\n") {
-            $comment .= $c;
-            $c = $this->read();
-        }
-
-        // c is equal to -1, \r or \n.
-        // In case c is equal to \r, we should also read a following \n.
-        if ($c == "\r") {
-            $c = $this->read();
-            if ($c != "\n") {
-                $this->unread($c);
-            }
-        }
-    }
-
-    /**
-     * Read a single character from the input buffer.
-     * Returns -1 when the end of the file is reached.
-     * @ignore
-     */
-    protected function read()
-    {
-        if (!empty($this->data)) {
-            $c = mb_substr($this->data, 0, 1, "UTF-8");
-            // Keep tracks of which line we are on (0A = Line Feed)
-            if ($c == "\x0A") {
-                $this->line += 1;
-                $this->column = 1;
-            } else {
-                $this->column += 1;
-            }
-
-            if (version_compare(PHP_VERSION, '5.4.8', '<')) {
-                // versions of PHP prior to 5.4.8 treat "NULL" length parameter as 0
-                $this->data = mb_substr($this->data, 1, mb_strlen($this->data), "UTF-8");
-            } else {
-                $this->data = mb_substr($this->data, 1, null, "UTF-8");
-            }
-            return $c;
-        } else {
-            return -1;
-        }
-    }
-
-    /**
-     * Gets the next character to be returned by read()
-     * without removing it from the input buffer.
-     * @ignore
-     */
-    protected function peek()
-    {
-        if (!empty($this->data)) {
-            return mb_substr($this->data, 0, 1, "UTF-8");
-        } else {
-            return -1;
-        }
-    }
-
-
-    /**
-     * Steps back, restoring the previous character read() to the input buffer
-     * @ignore
-     */
-    protected function unread($c)
-    {
-        # FIXME: deal with unreading new lines
-        $this->column -= mb_strlen($c, "UTF-8");
-        $this->data = $c . $this->data;
-    }
-
-    /** @ignore */
-    protected function createBNode()
-    {
-        return array(
-            'type' => 'bnode',
-            'value' => $this->graph->newBNodeId()
-        );
-    }
-
-    /**
-     * Returns true if $c is a whitespace character
-     * @ignore
-     */
-    public static function isWhitespace($c)
-    {
-        // Whitespace character are space, tab, newline and carriage return:
-        return $c == "\x20" || $c == "\x09" || $c == "\x0A" || $c == "\x0D";
-    }
-
-    /** @ignore */
-    public static function isPrefixStartChar($c)
-    {
-        $o = ord($c);
-        return
-            $o >= 0x41   && $o <= 0x5a ||     # A-Z
-            $o >= 0x61   && $o <= 0x7a ||     # a-z
-            $o >= 0x00C0 && $o <= 0x00D6 ||
-            $o >= 0x00D8 && $o <= 0x00F6 ||
-            $o >= 0x00F8 && $o <= 0x02FF ||
-            $o >= 0x0370 && $o <= 0x037D ||
-            $o >= 0x037F && $o <= 0x1FFF ||
-            $o >= 0x200C && $o <= 0x200D ||
-            $o >= 0x2070 && $o <= 0x218F ||
-            $o >= 0x2C00 && $o <= 0x2FEF ||
-            $o >= 0x3001 && $o <= 0xD7FF ||
-            $o >= 0xF900 && $o <= 0xFDCF ||
-            $o >= 0xFDF0 && $o <= 0xFFFD ||
-            $o >= 0x10000 && $o <= 0xEFFFF;
-    }
-
-    /** @ignore */
-    public static function isNameStartChar($c)
-    {
-        return
-            $c == '\\' ||
-            $c == '_' ||
-            $c == ':' ||
-            $c == '%' ||
-            ctype_digit($c) ||
-            self::isPrefixStartChar($c);
-    }
-
-    /** @ignore */
-    public static function isNameChar($c)
-    {
-        $o = ord($c);
-        return
-            self::isNameStartChar($c) ||
-            $o >= 0x30 && $o <= 0x39 ||     # 0-9
-            $c == '-' ||
-            $o == 0x00B7 ||
-            $o >= 0x0300 && $o <= 0x036F ||
-            $o >= 0x203F && $o <= 0x2040;
-    }
-
-    /** @ignore */
-    private static $localEscapedChars = array(
-        '_', '~', '.', '-', '!', '$', '&', '\'', '(', ')',
-        '*', '+', ',', ';', '=', '/', '?', '#', '@', '%'
-    );
-
-    /** @ignore */
-    public static function isLocalEscapedChar($c)
-    {
-        return in_array($c, self::$localEscapedChars);
-    }
-
-    /** @ignore */
-    public static function isPrefixChar($c)
-    {
-        $o = ord($c);
-        return
-            $c == '_' ||
-            $o >= 0x30 && $o <= 0x39 ||     # 0-9
-            self::isPrefixStartChar($c) ||
-            $c == '-' ||
-            $o == 0x00B7 ||
-            $c >= 0x0300 && $c <= 0x036F ||
-            $c >= 0x203F && $c <= 0x2040;
-    }
-
-    /** @ignore */
-    public static function isLanguageStartChar($c)
-    {
-        $o = ord($c);
-        return
-            $o >= 0x41 && $o <= 0x5a ||   # A-Z
-            $o >= 0x61 && $o <= 0x7a;     # a-z
-    }
-
-    /** @ignore */
-    public static function isLanguageChar($c)
-    {
-        $o = ord($c);
-        return
-            $o >= 0x41 && $o <= 0x5a ||   # A-Z
-            $o >= 0x61 && $o <= 0x7a ||   # a-z
-            $o >= 0x30 && $o <= 0x39 ||   # 0-9
-            $c == '-';
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Resource.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Resource.php
deleted file mode 100644
index 3cb2805..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Resource.php
+++ /dev/null
@@ -1,720 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class that represents an RDF resource
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Resource
-{
-    /** The URI for this resource */
-    protected $uri = null;
-
-    /** The Graph that this resource belongs to */
-    protected $graph = null;
-
-
-    /** Constructor
-     *
-     * * Please do not call new EasyRdf_Resource() directly *
-     *
-     * To create a new resource use the get method in a graph:
-     * $resource = $graph->resource('http://www.example.com/');
-     *
-     */
-    public function __construct($uri, $graph = null)
-    {
-        if (!is_string($uri) or $uri == null or $uri == '') {
-            throw new InvalidArgumentException(
-                "\$uri should be a string and cannot be null or empty"
-            );
-        }
-
-        $this->uri = $uri;
-
-        # Check that $graph is an EasyRdf_Graph object
-        if (is_object($graph) and $graph instanceof EasyRdf_Graph) {
-            $this->graph = $graph;
-        } elseif (!is_null($graph)) {
-            throw new InvalidArgumentException(
-                "\$graph should be an EasyRdf_Graph object"
-            );
-        }
-    }
-
-    /**
-     * Return the graph that this resource belongs to
-     *
-     * @return EasyRdf_Graph
-     */
-    public function getGraph()
-    {
-        return $this->graph;
-    }
-
-    /** Returns the URI for the resource.
-     *
-     * @return string  URI of this resource.
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /** Check to see if a resource is a blank node.
-     *
-     * @return bool True if this resource is a blank node.
-     */
-    public function isBNode()
-    {
-        if (substr($this->uri, 0, 2) == '_:') {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /** Get the identifier for a blank node
-     *
-     * Returns null if the resource is not a blank node.
-     *
-     * @return string The identifer for the bnode
-     */
-    public function getBNodeId()
-    {
-        if (substr($this->uri, 0, 2) == '_:') {
-            return substr($this->uri, 2);
-        } else {
-            return null;
-        }
-    }
-
-    /** Get a the prefix of the namespace that this resource is part of
-     *
-     * This method will return null the resource isn't part of any
-     * registered namespace.
-     *
-     * @return string The namespace prefix of the resource (e.g. foaf)
-     */
-    public function prefix()
-    {
-        return EasyRdf_Namespace::prefixOfUri($this->uri);
-    }
-
-    /** Get a shortened version of the resources URI.
-     *
-     * This method will return the full URI if the resource isn't part of any
-     * registered namespace.
-     *
-     * @return string The shortened URI of this resource (e.g. foaf:name)
-     */
-    public function shorten()
-    {
-        return EasyRdf_Namespace::shorten($this->uri);
-    }
-
-    /** Gets the local name of the URI of this resource
-     *
-     * The local name is defined as the part of the URI string
-     * after the last occurrence of the '#', ':' or '/' character.
-     *
-     * @return string The local name
-     */
-    public function localName()
-    {
-        if (preg_match("|([^#:/]+)$|", $this->uri, $matches)) {
-            return $matches[1];
-        }
-    }
-
-    /** Parse the URI of the resource and return as a ParsedUri object
-     *
-     * @return EasyRdf_ParsedUri
-     */
-    public function parseUri()
-    {
-        return new EasyRdf_ParsedUri($this->uri);
-    }
-
-    /** Generates an HTML anchor tag, linking to this resource.
-     *
-     * If no text is given, then the URI also uses as the link text.
-     *
-     * @param  string  $text    Text for the link.
-     * @param  array   $options Associative array of attributes for the anchor tag
-     * @return string  The HTML link string
-     */
-    public function htmlLink($text = null, $options = array())
-    {
-        $options = array_merge(array('href' => $this->uri), $options);
-        if ($text === null) {
-            $text = $this->uri;
-        }
-
-        $html = "<a";
-        foreach ($options as $key => $value) {
-            if (!preg_match('/^[-\w]+$/', $key)) {
-                throw new InvalidArgumentException(
-                    "\$options should use valid attribute names as keys"
-                );
-            }
-
-            $html .= " ".htmlspecialchars($key)."=\"".
-                         htmlspecialchars($value)."\"";
-        }
-        $html .= ">".htmlspecialchars($text)."</a>";
-
-        return $html;
-    }
-
-    /** Returns the properties of the resource as an RDF/PHP associative array
-     *
-     * For example:
-     * array('type' => 'uri', 'value' => 'http://www.example.com/')
-     *
-     * @return array  The properties of the resource
-     */
-    public function toRdfPhp()
-    {
-        if ($this->isBNode()) {
-            return array('type' => 'bnode', 'value' => $this->uri);
-        } else {
-            return array('type' => 'uri', 'value' => $this->uri);
-        }
-    }
-
-    /** Return pretty-print view of the resource
-     *
-     * @param  string $format Either 'html' or 'text'
-     * @param  string $color The colour of the text
-     * @return string
-     */
-    public function dumpValue($format = 'html', $color = 'blue')
-    {
-        return EasyRdf_Utils::dumpResourceValue($this, $format, $color);
-    }
-
-    /** Magic method to return URI of resource when casted to string
-     *
-     * @return string The URI of the resource
-     */
-    public function __toString()
-    {
-        return $this->uri;
-    }
-
-
-
-    /** Throw can exception if the resource does not belong to a graph
-     *  @ignore
-     */
-    protected function checkHasGraph()
-    {
-        if (!$this->graph) {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Resource is not part of a graph."
-            );
-        }
-    }
-
-    /** Perform a load (download of remote URI) of the resource into the graph
-     *
-     * The document type is optional but should be specified if it
-     * can't be guessed or got from the HTTP headers.
-     *
-     * @param  string  $format  Optional format of the data (eg. rdfxml)
-     */
-    public function load($format = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->load($this->uri, $format);
-    }
-
-    /** Delete a property (or optionally just a specific value)
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  object  $value The value to delete (null to delete all values)
-     * @return null
-     */
-    public function delete($property, $value = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->delete($this->uri, $property, $value);
-    }
-
-    /** Add values to for a property of the resource
-     *
-     * Example:
-     *   $resource->add('prefix:property', 'value');
-     *
-     * @param  mixed $property   The property name
-     * @param  mixed $value      The value for the property
-     * @return integer           The number of values added (1 or 0)
-     */
-    public function add($property, $value)
-    {
-        $this->checkHasGraph();
-        return $this->graph->add($this->uri, $property, $value);
-    }
-
-    /** Add a literal value as a property of the resource
-     *
-     * The value can either be a single value or an array of values.
-     *
-     * Example:
-     *   $resource->add('dc:title', 'Title of Page');
-     *
-     * @param  mixed  $property  The property name
-     * @param  mixed  $values    The value or values for the property
-     * @param  string $lang      The language of the literal
-     * @return integer           The number of values added
-     */
-    public function addLiteral($property, $values, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->addLiteral($this->uri, $property, $values, $lang);
-    }
-
-    /** Add a resource as a property of the resource
-     *
-     * Example:
-     *   $bob->add('foaf:knows', 'http://example.com/alice');
-     *
-     * @param  mixed $property   The property name
-     * @param  mixed $resource2  The resource to be the value of the property
-     * @return integer           The number of values added (1 or 0)
-     */
-    public function addResource($property, $resource2)
-    {
-        $this->checkHasGraph();
-        return $this->graph->addResource($this->uri, $property, $resource2);
-    }
-
-    /** Set value for a property
-     *
-     * The new value(s) will replace the existing values for the property.
-     * The name of the property should be a string.
-     * If you set a property to null or an empty array, then the property
-     * will be deleted.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value    The value for the property.
-     * @return integer           The number of values added (1 or 0)
-     */
-    public function set($property, $value)
-    {
-        $this->checkHasGraph();
-        return $this->graph->set($this->uri, $property, $value);
-    }
-
-    /** Get a single value for a property
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * If $property is an array, then the first item in the array that matches
-     * a property that exists is returned.
-     *
-     * This method will return null if the property does not exist.
-     *
-     * @param  string|array $property The name of the property (e.g. foaf:name)
-     * @param  string       $type     The type of value to filter by (e.g. literal or resource)
-     * @param  string       $lang     The language to filter by (e.g. en)
-     * @return mixed                  A value associated with the property
-     */
-    public function get($property, $type = null, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->get($this->uri, $property, $type, $lang);
-    }
-
-    /** Get a single literal value for a property of the resource
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * This method will return null if there is not literal value for the
-     * property.
-     *
-     * @param  string|array $property The name of the property (e.g. foaf:name)
-     * @param  string       $lang     The language to filter by (e.g. en)
-     * @return object EasyRdf_Literal Literal value associated with the property
-     */
-    public function getLiteral($property, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->get($this->uri, $property, 'literal', $lang);
-    }
-
-    /** Get a single resource value for a property of the resource
-     *
-     * If multiple values are set for a property then the value returned
-     * may be arbitrary.
-     *
-     * This method will return null if there is not resource for the
-     * property.
-     *
-     * @param  string|array $property The name of the property (e.g. foaf:name)
-     * @return object EasyRdf_Resource Resource associated with the property
-     */
-    public function getResource($property)
-    {
-        $this->checkHasGraph();
-        return $this->graph->get($this->uri, $property, 'resource');
-    }
-
-    /** Get all values for a property
-     *
-     * This method will return an empty array if the property does not exist.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $type     The type of value to filter by (e.g. literal)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return array             An array of values associated with the property
-     */
-    public function all($property, $type = null, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->all($this->uri, $property, $type, $lang);
-    }
-
-    /** Get all literal values for a property of the resource
-     *
-     * This method will return an empty array if the resource does not
-     * has any literal values for that property.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return array             An array of values associated with the property
-     */
-    public function allLiterals($property, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->all($this->uri, $property, 'literal', $lang);
-    }
-
-    /** Get all resources for a property of the resource
-     *
-     * This method will return an empty array if the resource does not
-     * has any resources for that property.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @return array             An array of values associated with the property
-     */
-    public function allResources($property)
-    {
-        $this->checkHasGraph();
-        return $this->graph->all($this->uri, $property, 'resource');
-    }
-
-    /** Count the number of values for a property of a resource
-     *
-     * This method will return 0 if the property does not exist.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $type     The type of value to filter by (e.g. literal)
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return integer           The number of values associated with the property
-     */
-    public function countValues($property, $type = null, $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->countValues($this->uri, $property, $type, $lang);
-    }
-
-    /** Concatenate all values for a property into a string.
-     *
-     * The default is to join the values together with a space character.
-     * This method will return an empty string if the property does not exist.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  string  $glue     The string to glue the values together with.
-     * @param  string  $lang     The language to filter by (e.g. en)
-     * @return string            Concatenation of all the values.
-     */
-    public function join($property, $glue = ' ', $lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->join($this->uri, $property, $glue, $lang);
-    }
-
-    /** Get a list of the full URIs for the properties of this resource.
-     *
-     * This method will return an empty array if the resource has no properties.
-     *
-     * @return array            Array of full URIs
-     */
-    public function propertyUris()
-    {
-        $this->checkHasGraph();
-        return $this->graph->propertyUris($this->uri);
-    }
-
-    /** Get a list of all the shortened property names (qnames) for a resource.
-     *
-     * This method will return an empty array if the resource has no properties.
-     *
-     * @return array            Array of shortened URIs
-     */
-    public function properties()
-    {
-        $this->checkHasGraph();
-        return $this->graph->properties($this->uri);
-    }
-
-    /** Get a list of the full URIs for the properties that point to this resource.
-     *
-     * @return array   Array of full property URIs
-     */
-    public function reversePropertyUris()
-    {
-        $this->checkHasGraph();
-        return $this->graph->reversePropertyUris($this->uri);
-    }
-
-    /** Check to see if a property exists for this resource.
-     *
-     * This method will return true if the property exists.
-     * If the value parameter is given, then it will only return true
-     * if the value also exists for that property.
-     *
-     * @param  string  $property The name of the property (e.g. foaf:name)
-     * @param  mixed   $value    An optional value of the property
-     * @return bool              True if value the property exists.
-     */
-    public function hasProperty($property, $value = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->hasProperty($this->uri, $property, $value);
-    }
-
-    /** Get a list of types for a resource.
-     *
-     * The types will each be a shortened URI as a string.
-     * This method will return an empty array if the resource has no types.
-     *
-     * @return array All types assocated with the resource (e.g. foaf:Person)
-     */
-    public function types()
-    {
-        $this->checkHasGraph();
-        return $this->graph->types($this->uri);
-    }
-
-    /** Get a single type for a resource.
-     *
-     * The type will be a shortened URI as a string.
-     * If the resource has multiple types then the type returned
-     * may be arbitrary.
-     * This method will return null if the resource has no type.
-     *
-     * @return string A type assocated with the resource (e.g. foaf:Person)
-     */
-    public function type()
-    {
-        $this->checkHasGraph();
-        return $this->graph->type($this->uri);
-    }
-
-    /** Get a single type for a resource, as a resource.
-     *
-     * The type will be returned as an EasyRdf_Resource.
-     * If the resource has multiple types then the type returned
-     * may be arbitrary.
-     * This method will return null if the resource has no type.
-     *
-     * @return EasyRdf_Resource A type assocated with the resource.
-     */
-    public function typeAsResource()
-    {
-        $this->checkHasGraph();
-        return $this->graph->typeAsResource($this->uri);
-    }
-
-    /**
-     * Get a list of types for a resource, as Resources.
-     *
-     * @return EasyRdf_Resource[]
-     * @throws EasyRdf_Exception
-     */
-    public function typesAsResources()
-    {
-        $this->checkHasGraph();
-        return $this->graph->typesAsResources($this->uri);
-    }
-
-    /** Check if a resource is of the specified type
-     *
-     * @param  string  $type The type to check (e.g. foaf:Person)
-     * @return boolean       True if resource is of specified type.
-     */
-    public function isA($type)
-    {
-        $this->checkHasGraph();
-        return $this->graph->isA($this->uri, $type);
-    }
-
-    /** Add one or more rdf:type properties to the resource
-     *
-     * @param  string  $types    One or more types to add (e.g. foaf:Person)
-     * @return integer           The number of types added
-     */
-    public function addType($types)
-    {
-        $this->checkHasGraph();
-        return $this->graph->addType($this->uri, $types);
-    }
-
-    /** Change the rdf:type property for the resource
-     *
-     * Note that the PHP class of the resource will not change.
-     *
-     * @param  string  $type     The new type (e.g. foaf:Person)
-     * @return integer           The number of types added
-     */
-    public function setType($type)
-    {
-        $this->checkHasGraph();
-        return $this->graph->setType($this->uri, $type);
-    }
-
-    /** Get the primary topic of this resource.
-     *
-     * Returns null if no primary topic is available.
-     *
-     * @return EasyRdf_Resource The primary topic of this resource.
-     */
-    public function primaryTopic()
-    {
-        $this->checkHasGraph();
-        return $this->graph->primaryTopic($this->uri);
-    }
-
-    /** Get a human readable label for this resource
-     *
-     * This method will check a number of properties for the resource
-     * (in the order: skos:prefLabel, rdfs:label, foaf:name, dc:title)
-     * and return an approriate first that is available. If no label
-     * is available then it will return null.
-     *
-     * @return string A label for the resource.
-     */
-    public function label($lang = null)
-    {
-        $this->checkHasGraph();
-        return $this->graph->label($this->uri, $lang);
-    }
-
-    /** Return a human readable view of the resource and its properties
-     *
-     * This method is intended to be a debugging aid and will
-     * print a resource and its properties.
-     *
-     * @param  string $format   Either 'html' or 'text'
-     * @return string
-     */
-    public function dump($format = 'html')
-    {
-        $this->checkHasGraph();
-        return $this->graph->dumpResource($this->uri, $format);
-    }
-
-    /** Magic method to get a property of a resource
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   $value = $resource->title;
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param  string $name The name of the property
-     * @return string       A single value for the named property
-     */
-    public function __get($name)
-    {
-        return $this->graph->get($this->uri, $name);
-    }
-
-    /** Magic method to set the value for a property of a resource
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   $resource->title = 'Title';
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param  string $name The name of the property
-     * @param  string $value The value for the property
-     */
-    public function __set($name, $value)
-    {
-        return $this->graph->set($this->uri, $name, $value);
-    }
-
-    /** Magic method to check if a property exists
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   if (isset($resource->title)) { blah(); }
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param string $name The name of the property
-     */
-    public function __isset($name)
-    {
-        return $this->graph->hasProperty($this->uri, $name);
-    }
-
-    /** Magic method to delete a property of the resource
-     *
-     * Note that only properties in the default namespace can be accessed in this way.
-     *
-     * Example:
-     *   unset($resource->title);
-     *
-     * @see EasyRdf_Namespace::setDefault()
-     * @param string $name The name of the property
-     */
-    public function __unset($name)
-    {
-        return $this->graph->delete($this->uri, $name);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser.php
deleted file mode 100644
index 1c0acb8..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Parent class for the EasyRdf serialiser
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser
-{
-    protected $prefixes = array();
-
-    public function __construct()
-    {
-    }
-
-    /**
-     * Keep track of the prefixes used while serialising
-     * @ignore
-     */
-    protected function addPrefix($qname)
-    {
-        list ($prefix) = explode(':', $qname);
-        $this->prefixes[$prefix] = true;
-    }
-
-    /**
-     * Check and cleanup parameters passed to serialise() method
-     * @ignore
-     */
-    protected function checkSerialiseParams(&$graph, &$format)
-    {
-        if (is_null($graph) or !is_object($graph) or !($graph instanceof EasyRdf_Graph)) {
-            throw new InvalidArgumentException(
-                "\$graph should be an EasyRdf_Graph object and cannot be null"
-            );
-        }
-
-        if (is_null($format) or $format == '') {
-            throw new InvalidArgumentException(
-                "\$format cannot be null or empty"
-            );
-        } elseif (is_object($format) and ($format instanceof EasyRdf_Format)) {
-            $format = $format->getName();
-        } elseif (!is_string($format)) {
-            throw new InvalidArgumentException(
-                "\$format should be a string or an EasyRdf_Format object"
-            );
-        }
-    }
-
-    /**
-     * Protected method to get the number of reverse properties for a resource
-     * If a resource only has a single property, the number of values for that
-     * property is returned instead.
-     * @ignore
-     */
-    protected function reversePropertyCount($resource)
-    {
-        $properties = $resource->reversePropertyUris();
-        $count = count($properties);
-        if ($count == 1) {
-            $property = $properties[0];
-            return $resource->countValues("^<$property>");
-        } else {
-            return $count;
-        }
-    }
-
-    /**
-     * Sub-classes must follow this protocol
-     * @ignore
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        throw new EasyRdf_Exception(
-            "This method should be overridden by sub-classes."
-        );
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Arc.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Arc.php
deleted file mode 100644
index 31bd8b7..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Arc.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise RDF using the ARC2 library.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_Arc extends EasyRdf_Serialiser_RdfPhp
-{
-    private static $supportedTypes = array(
-        'rdfxml' => 'RDFXML',
-        'turtle' => 'Turtle',
-        'ntriples' => 'NTriples',
-        'posh' => 'POSHRDF'
-    );
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Serialiser_Arc
-     */
-    public function __construct()
-    {
-        require_once 'arc/ARC2.php';
-    }
-
-    /**
-     * Serialise an EasyRdf_Graph into RDF format of choice.
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string              The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if (array_key_exists($format, self::$supportedTypes)) {
-            $className = self::$supportedTypes[$format];
-        } else {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_Arc does not support: $format"
-            );
-        }
-
-        $serialiser = ARC2::getSer($className);
-        if ($serialiser) {
-            return $serialiser->getSerializedIndex(
-                parent::serialise($graph, 'php')
-            );
-        } else {
-            throw new EasyRdf_Exception(
-                "ARC2 failed to get a $className serialiser."
-            );
-        }
-    }
-}
-
-EasyRdf_Format::register('posh', 'poshRDF');
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php
deleted file mode 100644
index 2fd22da..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/GraphViz.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2012-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to GraphViz
- *
- * Depends upon the GraphViz 'dot' command line tools to render images.
- *
- * See http://www.graphviz.org/ for more information.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2012-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_GraphViz extends EasyRdf_Serialiser
-{
-    private $dotCommand = 'dot';
-    private $useLabels = false;
-    private $onlyLabelled = false;
-    private $attributes = array('charset' => 'utf-8');
-
-    /**
-     * Constructor
-     *
-     * @return object EasyRdf_Serialiser_GraphViz
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Set the path to the GraphViz 'dot' command
-     *
-     * Default is to search PATH for the command 'dot'.
-     *
-     * @param string $cmd   The path to the 'dot' command.
-     * @return object EasyRdf_Serialiser_GraphViz
-     */
-    public function setDotCommand($cmd)
-    {
-        $this->dotCommand = $cmd;
-        return $this;
-    }
-
-    /**
-     * Get the path to the GraphViz 'dot' command
-     *
-     * The default value is simply 'dot'
-     *
-     * @return string The path to the 'dot' command.
-     */
-    public function getDotCommand()
-    {
-        return $this->dotCommand;
-    }
-
-    /**
-     * Turn on/off the option to display labels instead of URIs.
-     *
-     * When this option is turned on, then labels for resources will
-     * be displayed instead of the full URI of a resource. This makes
-     * it simpler to create friendly diagrams that non-technical people
-     * can understand.
-     *
-     * This option is turned off by default.
-     *
-     * @param bool $useLabels   A boolean value to turn labels on and off
-     * @return object EasyRdf_Serialiser_GraphViz
-     */
-    public function setUseLabels($useLabels)
-    {
-        $this->useLabels = $useLabels;
-        return $this;
-    }
-
-    /**
-     * Get the state of the use labels option
-     *
-     * @return bool The current state of the use labels option
-     */
-    public function getUseLabels()
-    {
-        return $this->useLabels;
-    }
-
-    /**
-     * Turn on/off the option to only display nodes and edges with labels
-     *
-     * When this option is turned on, then only nodes (resources and literals)
-     * and edges (properties) will only be displayed if they have a label. You
-     * can use this option, to create concise, diagrams of your data, rather than
-     * the RDF.
-     *
-     * This option is turned off by default.
-     *
-     * @param bool $onlyLabelled   A boolean value to enable/display only labelled items
-     * @return object EasyRdf_Serialiser_GraphViz
-     */
-    public function setOnlyLabelled($onlyLabelled)
-    {
-        $this->onlyLabelled = $onlyLabelled;
-        return $this;
-    }
-
-    /**
-     * Get the state of the only Only Labelled option
-     *
-     * @return bool The current state of the Only Labelled option
-     */
-    public function getOnlyLabelled()
-    {
-        return $this->onlyLabelled;
-    }
-
-    /**
-     * Set an attribute on the GraphViz graph
-     *
-     * Example:
-     *     $serialiser->setAttribute('rotate', 90);
-     *
-     * See the GraphViz tool documentation for information about the
-     * available attributes.
-     *
-     * @param string $name    The name of the attribute
-     * @param string $value   The value for the attribute
-     * @return object EasyRdf_Serialiser_GraphViz
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Get an attribute of the GraphViz graph
-     *
-     * @param string $name    Attribute name
-     * @return string The value of the graph attribute
-     */
-    public function getAttribute($name)
-    {
-        return $this->attributes[$name];
-    }
-
-    /**
-     * Convert an EasyRdf object into a GraphViz node identifier
-     *
-     * @ignore
-     */
-    protected function nodeName($entity)
-    {
-        if ($entity instanceof EasyRdf_Resource) {
-            if ($entity->isBNode()) {
-                return "B".$entity->getUri();
-            } else {
-                return "R".$entity->getUri();
-            }
-        } else {
-            return "L".$entity;
-        }
-    }
-
-    /**
-     * Internal function to escape a string into DOT safe syntax
-     *
-     * @ignore
-     */
-    protected function escape($input)
-    {
-        if (preg_match('/^([a-z_][a-z_0-9]*|-?(\.[0-9]+|[0-9]+(\.[0-9]*)?))$/i', $input)) {
-            return $input;
-        } else {
-            return '"'.str_replace(
-                array("\r\n", "\n", "\r", '"'),
-                array('\n',   '\n', '\n', '\"'),
-                $input
-            ).'"';
-        }
-    }
-
-    /**
-     * Internal function to escape an associate array of attributes and
-     * turns it into a DOT notation string
-     *
-     * @ignore
-     */
-    protected function escapeAttributes($array)
-    {
-        $items = '';
-        foreach ($array as $k => $v) {
-            $items[] = $this->escape($k).'='.$this->escape($v);
-        }
-        return '['.implode(',', $items).']';
-    }
-
-    /**
-     * Internal function to create dot syntax line for either a node or an edge
-     *
-     * @ignore
-     */
-    protected function serialiseRow($node1, $node2 = null, $attributes = array())
-    {
-        $result = '  '.$this->escape($node1);
-        if ($node2) {
-            $result .= ' -> '.$this->escape($node2);
-        }
-        if (count($attributes)) {
-            $result .= ' '.$this->escapeAttributes($attributes);
-        }
-        return $result.";\n";
-    }
-
-    /**
-     * Internal function to serialise an EasyRdf_Graph into a DOT formatted string
-     *
-     * @ignore
-     */
-    protected function serialiseDot($graph)
-    {
-        $result = "digraph {\n";
-
-        // Write the graph attributes
-        foreach ($this->attributes as $k => $v) {
-            $result .= '  '.$this->escape($k).'='.$this->escape($v).";\n";
-        }
-
-        // Go through each of the properties and write the edges
-        $nodes = array();
-        $result .= "\n  // Edges\n";
-        foreach ($graph->resources() as $resource) {
-            $name1 = $this->nodeName($resource);
-            foreach ($resource->propertyUris() as $property) {
-                $label = null;
-                if ($this->useLabels) {
-                    $label = $graph->resource($property)->label();
-                }
-                if ($label === null) {
-                    if ($this->onlyLabelled == true) {
-                        continue;
-                    } else {
-                        $label = EasyRdf_Namespace::shorten($property);
-                    }
-                }
-                foreach ($resource->all("<$property>") as $value) {
-                    $name2 = $this->nodeName($value);
-                    $nodes[$name1] = $resource;
-                    $nodes[$name2] = $value;
-                    $result .= $this->serialiseRow(
-                        $name1,
-                        $name2,
-                        array('label' => $label)
-                    );
-                }
-            }
-        }
-
-        ksort($nodes);
-
-        $result .= "\n  // Nodes\n";
-        foreach ($nodes as $name => $node) {
-            $type = substr($name, 0, 1);
-            $label = '';
-            if ($type == 'R') {
-                if ($this->useLabels) {
-                    $label = $node->label();
-                }
-                if (!$label) {
-                    $label = $node->shorten();
-                }
-                if (!$label) {
-                    $label = $node->getURI();
-                }
-                $result .= $this->serialiseRow(
-                    $name,
-                    null,
-                    array(
-                        'URL'   => $node->getURI(),
-                        'label' => $label,
-                        'shape' => 'ellipse',
-                        'color' => 'blue'
-                    )
-                );
-            } elseif ($type == 'B') {
-                if ($this->useLabels) {
-                    $label = $node->label();
-                }
-                $result .= $this->serialiseRow(
-                    $name,
-                    null,
-                    array(
-                        'label' => $label,
-                        'shape' => 'circle',
-                        'color' => 'green'
-                    )
-                );
-            } else {
-                $result .= $this->serialiseRow(
-                    $name,
-                    null,
-                    array(
-                        'label' => strval($node),
-                        'shape' => 'record',
-                    )
-                );
-            }
-
-        }
-
-        $result .= "}\n";
-
-        return $result;
-    }
-
-    /**
-     * Internal function to render a graph into an image
-     *
-     * @ignore
-     */
-    public function renderImage($graph, $format = 'png')
-    {
-        $dot = $this->serialiseDot($graph);
-
-        return EasyRdf_Utils::execCommandPipe(
-            $this->dotCommand,
-            array("-T$format"),
-            $dot
-        );
-    }
-
-    /**
-     * Serialise an EasyRdf_Graph into a GraphViz dot document.
-     *
-     * Supported output format names: dot, gif, png, svg
-     *
-     * @param EasyRdf_Graph $graph  An EasyRdf_Graph object.
-     * @param string        $format The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        switch($format) {
-            case 'dot':
-                return $this->serialiseDot($graph);
-            case 'png':
-            case 'gif':
-            case 'svg':
-                return $this->renderImage($graph, $format);
-            default:
-                throw new EasyRdf_Exception(
-                    "EasyRdf_Serialiser_GraphViz does not support: $format"
-                );
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Json.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Json.php
deleted file mode 100644
index 2ff3f59..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Json.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to RDF/JSON
- * with no external dependancies.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_Json extends EasyRdf_Serialiser_RdfPhp
-{
-    /**
-     * Method to serialise an EasyRdf_Graph to RDF/JSON
-     *
-     * http://n2.talis.com/wiki/RDF_JSON_Specification
-     * docs/appendix-a-rdf-formats-json.md
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format != 'json') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_Json does not support: $format"
-            );
-        }
-
-        return json_encode(parent::serialise($graph, 'php'));
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd.php
deleted file mode 100644
index 4265773..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-if (PHP_MAJOR_VERSION > 5 or (PHP_MAJOR_VERSION == 5 and PHP_MINOR_VERSION >= 3)) {
-    require dirname(__FILE__).'/JsonLd_real.php';
-} else {
-    throw new LogicException("JSON-LD support requires PHP 5.3+");
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd_real.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd_real.php
deleted file mode 100644
index 4fb6c49..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/JsonLd_real.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to JSON-LD
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2013 Alexey Zakhlestin
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_JsonLd extends EasyRdf_Serialiser
-{
-    public function __construct()
-    {
-        if (!class_exists('\ML\JsonLD\JsonLD')) {
-            throw new LogicException('Please install "ml/json-ld" dependency to use JSON-LD serialisation');
-        }
-
-        parent::__construct();
-    }
-
-    /**
-     * @param EasyRdf_Graph $graph
-     * @param string        $format
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format != 'jsonld') {
-            throw new EasyRdf_Exception(__CLASS__.' does not support: '.$format);
-        }
-
-
-        $ld_graph = new \ML\JsonLD\Graph();
-        $nodes = array(); // cache for id-to-node association
-
-        foreach ($graph->toRdfPhp() as $resource => $properties) {
-            if (array_key_exists($resource, $nodes)) {
-                $node = $nodes[$resource];
-            } else {
-                $node = $ld_graph->createNode($resource);
-                $nodes[$resource] = $node;
-            }
-
-            foreach ($properties as $property => $values) {
-                foreach ($values as $value) {
-                    if ($value['type'] == 'bnode' or $value['type'] == 'uri') {
-                        if (array_key_exists($value['value'], $nodes)) {
-                            $_value = $nodes[$value['value']];
-                        } else {
-                            $_value = $ld_graph->createNode($value['value']);
-                            $nodes[$value['value']] = $_value;
-                        }
-                    } elseif ($value['type'] == 'literal') {
-                        if (isset($value['lang'])) {
-                            $_value = new \ML\JsonLD\LanguageTaggedString($value['value'], $value['lang']);
-                        } elseif (isset($value['datatype'])) {
-                            $_value = new \ML\JsonLD\TypedValue($value['value'], $value['datatype']);
-                        } else {
-                            $_value = $value['value'];
-                        }
-                    } else {
-                        throw new EasyRdf_Exception(
-                            "Unable to serialise object to JSON-LD: ".$value['type']
-                        );
-                    }
-
-                    if ($property == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type") {
-                        $node->addType($_value);
-                    } else {
-                        $node->addPropertyValue($property, $_value);
-                    }
-                }
-            }
-        }
-
-        // OPTIONS
-        $use_native_types = !(isset($options['expand_native_types']) and $options['expand_native_types'] == true);
-        $should_compact = (isset($options['compact']) and $options['compact'] == true);
-        $should_frame = isset($options['frame']);
-
-        // expanded form
-        $data = $ld_graph->toJsonLd($use_native_types);
-
-        if ($should_frame) {
-            $data = \ML\JsonLD\JsonLD::frame($data, $options['frame'], $options);
-
-        }
-
-        if ($should_compact) {
-            // compact form
-            $compact_context = isset($options['context']) ? $options['context'] : null;
-            $compact_options = array(
-                'useNativeTypes' => $use_native_types,
-                'base' => $graph->getUri()
-            );
-
-            $data = \ML\JsonLD\JsonLD::compact($data, $compact_context, $compact_options);
-        }
-
-        return \ML\JsonLD\JsonLD::toString($data);
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php
deleted file mode 100644
index d77a638..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Ntriples.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to N-Triples
- * with no external dependancies.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_Ntriples extends EasyRdf_Serialiser
-{
-    private $escChars = array();   // Character encoding cache
-
-    /**
-     * @ignore
-     */
-    protected function escapeString($str)
-    {
-        if (strpos(utf8_decode(str_replace('?', '', $str)), '?') === false) {
-            $str = utf8_decode($str);
-        }
-
-        $result = '';
-        $strLen = strlen($str);
-        for ($i = 0; $i < $strLen; $i++) {
-            $c = $str[$i];
-            if (!isset($this->escChars[$c])) {
-                $this->escChars[$c] = $this->escapedChar($c);
-            }
-            $result .= $this->escChars[$c];
-        }
-        return $result;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function unicodeCharNo($c)
-    {
-        $cUtf = utf8_encode($c);
-        $bl = strlen($cUtf); /* binary length */
-        $r = 0;
-        switch ($bl) {
-            case 1: /* 0####### (0-127) */
-                $r = ord($cUtf);
-                break;
-            case 2: /* 110##### 10###### = 192+x 128+x */
-                $r = ((ord($cUtf[0]) - 192) * 64) +
-                     (ord($cUtf[1]) - 128);
-                break;
-            case 3: /* 1110#### 10###### 10###### = 224+x 128+x 128+x */
-                $r = ((ord($cUtf[0]) - 224) * 4096) +
-                     ((ord($cUtf[1]) - 128) * 64) +
-                     (ord($cUtf[2]) - 128);
-                break;
-            case 4: /* 1111#### 10###### 10###### 10###### = 240+x 128+x 128+x 128+x */
-                $r = ((ord($cUtf[0]) - 240) * 262144) +
-                     ((ord($cUtf[1]) - 128) * 4096) +
-                     ((ord($cUtf[2]) - 128) * 64) +
-                     (ord($cUtf[3]) - 128);
-                break;
-        }
-        return $r;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function escapedChar($c)
-    {
-        $no = $this->unicodeCharNo($c);
-
-        /* see http://www.w3.org/TR/rdf-testcases/#ntrip_strings */
-        if ($no < 9) {
-            return "\\u" . sprintf('%04X', $no);  /* #x0-#x8 (0-8) */
-        } elseif ($no == 9) {
-            return '\t';                          /* #x9 (9) */
-        } elseif ($no == 10) {
-            return '\n';                          /* #xA (10) */
-        } elseif ($no < 13) {
-            return "\\u" . sprintf('%04X', $no);  /* #xB-#xC (11-12) */
-        } elseif ($no == 13) {
-            return '\r';                          /* #xD (13) */
-        } elseif ($no < 32) {
-            return "\\u" . sprintf('%04X', $no);  /* #xE-#x1F (14-31) */
-        } elseif ($no < 34) {
-            return $c;                            /* #x20-#x21 (32-33) */
-        } elseif ($no == 34) {
-            return '\"';                          /* #x22 (34) */
-        } elseif ($no < 92) {
-            return $c;                            /* #x23-#x5B (35-91) */
-        } elseif ($no == 92) {
-            return '\\';                          /* #x5C (92) */
-        } elseif ($no < 127) {
-            return $c;                            /* #x5D-#x7E (93-126) */
-        } elseif ($no < 65536) {
-            return "\\u" . sprintf('%04X', $no);  /* #x7F-#xFFFF (128-65535) */
-        } elseif ($no < 1114112) {
-            return "\\U" . sprintf('%08X', $no);  /* #x10000-#x10FFFF (65536-1114111) */
-        } else {
-            return '';                            /* not defined => ignore */
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    protected function serialiseResource($res)
-    {
-        $escaped = $this->escapeString($res);
-        if (substr($res, 0, 2) == '_:') {
-            return $escaped;
-        } else {
-            return "<$escaped>";
-        }
-    }
-
-    /**
-     * Serialise an RDF value into N-Triples
-     *
-     * The value can either be an array in RDF/PHP form, or
-     * an EasyRdf_Literal or EasyRdf_Resource object.
-     *
-     * @param array|object  $value   An associative array or an object
-     * @throws EasyRdf_Exception
-     * @return string The RDF value serialised to N-Triples
-     */
-    public function serialiseValue($value)
-    {
-        if (is_object($value)) {
-            $value = $value->toRdfPhp();
-        }
-
-        if ($value['type'] == 'uri' or $value['type'] == 'bnode') {
-            return $this->serialiseResource($value['value']);
-        } elseif ($value['type'] == 'literal') {
-            $escaped = $this->escapeString($value['value']);
-            if (isset($value['lang'])) {
-                $lang = $this->escapeString($value['lang']);
-                return '"' . $escaped . '"' . '@' . $lang;
-            } elseif (isset($value['datatype'])) {
-                $datatype = $this->escapeString($value['datatype']);
-                return '"' . $escaped . '"' . "^^<$datatype>";
-            } else {
-                return '"' . $escaped . '"';
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "Unable to serialise object of type '".$value['type']."' to ntriples: "
-            );
-        }
-    }
-
-    /**
-     * Serialise an EasyRdf_Graph into N-Triples
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format == 'ntriples') {
-            $nt = '';
-            foreach ($graph->toRdfPhp() as $resource => $properties) {
-                foreach ($properties as $property => $values) {
-                    foreach ($values as $value) {
-                        $nt .= $this->serialiseResource($resource)." ";
-                        $nt .= "<" . $this->escapeString($property) . "> ";
-                        $nt .= $this->serialiseValue($value)." .\n";
-                    }
-                }
-            }
-            return $nt;
-        } else {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_Ntriples does not support: $format"
-            );
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Rapper.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Rapper.php
deleted file mode 100644
index ba42bc5..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Rapper.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to RDF
- * using the 'rapper' command line tool.
- *
- * Note: the built-in N-Triples serialiser is used to pass data to Rapper.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_Rapper extends EasyRdf_Serialiser_Ntriples
-{
-    private $rapperCmd = null;
-
-    /**
-     * Constructor
-     *
-     * @param string $rapperCmd Optional path to the rapper command to use.
-     * @return object EasyRdf_Serialiser_Rapper
-     */
-    public function __construct($rapperCmd = 'rapper')
-    {
-        $result = exec("$rapperCmd --version 2>/dev/null", $output, $status);
-        if ($status != 0) {
-            throw new EasyRdf_Exception(
-                "Failed to execute the command '$rapperCmd': $result"
-            );
-        } else {
-            $this->rapperCmd = $rapperCmd;
-        }
-    }
-
-    /**
-     * Serialise an EasyRdf_Graph to the RDF format of choice.
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        $ntriples = parent::serialise($graph, 'ntriples');
-
-        // Hack to produce more concise RDF/XML
-        if ($format == 'rdfxml') {
-            $format = 'rdfxml-abbrev';
-        }
-
-        return EasyRdf_Utils::execCommandPipe(
-            $this->rapperCmd,
-            array(
-                '--quiet',
-                '--input', 'ntriples',
-                '--output', $format,
-                '-', 'unknown://'
-            ),
-            $ntriples
-        );
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php
deleted file mode 100644
index ed851af..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfPhp.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to RDF/PHP
- * with no external dependancies.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_RdfPhp extends EasyRdf_Serialiser
-{
-    /**
-     * Method to serialise an EasyRdf_Graph to RDF/PHP
-     *
-     * http://n2.talis.com/wiki/RDF_PHP_Specification
-     * docs/appendix-a-rdf-formats-php.md
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format != 'php') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_RdfPhp does not support: $format"
-            );
-        }
-
-        // Graph is already stored as RDF/PHP resource-centric array internally within the EasyRdf_Graph object
-        return $graph->toRdfPhp();
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php
deleted file mode 100644
index 289d7dc..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/RdfXml.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to RDF/XML
- * with no external dependancies.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_RdfXml extends EasyRdf_Serialiser
-{
-    private $outputtedResources = array();
-
-    /** A constant for the RDF Type property URI */
-    const RDF_XML_LITERAL = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral';
-
-    /**
-     * Protected method to serialise an object node into an XML object
-     * @ignore
-     */
-    protected function rdfxmlObject($property, $obj, $depth)
-    {
-        $indent = str_repeat('  ', $depth);
-
-        if ($property[0] === ':') {
-            $property = substr($property, 1);
-        }
-
-        if (is_object($obj) and $obj instanceof EasyRdf_Resource) {
-            $pcount = count($obj->propertyUris());
-            $rpcount = $this->reversePropertyCount($obj);
-            $alreadyOutput = isset($this->outputtedResources[$obj->getUri()]);
-
-            $tag = "{$indent}<{$property}";
-            if ($obj->isBNode()) {
-                if ($alreadyOutput or $rpcount > 1 or $pcount == 0) {
-                    $tag .= " rdf:nodeID=\"".htmlspecialchars($obj->getBNodeId()).'"';
-                }
-            } else {
-                if ($alreadyOutput or $rpcount != 1 or $pcount == 0) {
-                    $tag .= " rdf:resource=\"".htmlspecialchars($obj->getURI()).'"';
-                }
-            }
-
-            if ($alreadyOutput == false and $rpcount == 1 and $pcount > 0) {
-                $xml = $this->rdfxmlResource($obj, false, $depth+1);
-                if ($xml) {
-                    return "$tag>$xml$indent</$property>\n\n";
-                } else {
-                    return '';
-                }
-            } else {
-                return $tag."/>\n";
-            }
-
-        } elseif (is_object($obj) and $obj instanceof EasyRdf_Literal) {
-            $atrributes = "";
-            $datatype = $obj->getDatatypeUri();
-            if ($datatype) {
-                if ($datatype == self::RDF_XML_LITERAL) {
-                    $atrributes .= " rdf:parseType=\"Literal\"";
-                    $value = strval($obj);
-                } else {
-                    $datatype = htmlspecialchars($datatype);
-                    $atrributes .= " rdf:datatype=\"$datatype\"";
-                }
-            } elseif ($obj->getLang()) {
-                $atrributes .= ' xml:lang="'.
-                               htmlspecialchars($obj->getLang()).'"';
-            }
-
-            // Escape the value
-            if (!isset($value)) {
-                $value = htmlspecialchars(strval($obj));
-            }
-
-            return "{$indent}<{$property}{$atrributes}>{$value}</{$property}>\n";
-        } else {
-            throw new EasyRdf_Exception(
-                "Unable to serialise object to xml: ".getType($obj)
-            );
-        }
-    }
-
-    /**
-     * Protected method to serialise a whole resource and its properties
-     * @ignore
-     */
-    protected function rdfxmlResource($res, $showNodeId, $depth = 1)
-    {
-        // Keep track of the resources we have already serialised
-        if (isset($this->outputtedResources[$res->getUri()])) {
-            return '';
-        } else {
-            $this->outputtedResources[$res->getUri()] = true;
-        }
-
-        // If the resource has no properties - don't serialise it
-        $properties = $res->propertyUris();
-        if (count($properties) == 0) {
-            return '';
-        }
-
-        $type = $res->type();
-        if ($type) {
-            $this->addPrefix($type);
-        } else {
-            $type = 'rdf:Description';
-        }
-
-        $indent = str_repeat('  ', $depth);
-        $xml = "\n$indent<$type";
-        if ($res->isBNode()) {
-            if ($showNodeId) {
-                $xml .= ' rdf:nodeID="'.htmlspecialchars($res->getBNodeId()).'"';
-            }
-        } else {
-            $xml .= ' rdf:about="'.htmlspecialchars($res->getUri()).'"';
-        }
-        $xml .= ">\n";
-
-        if ($res instanceof EasyRdf_Container) {
-            foreach ($res as $item) {
-                $xml .= $this->rdfxmlObject('rdf:li', $item, $depth+1);
-            }
-        } else {
-            foreach ($properties as $property) {
-                $short = EasyRdf_Namespace::shorten($property, true);
-                if ($short) {
-                    $this->addPrefix($short);
-                    $objects = $res->all("<$property>");
-                    if ($short == 'rdf:type' && $type != 'rdf:Description') {
-                        array_shift($objects);
-                    }
-                    foreach ($objects as $object) {
-                        $xml .= $this->rdfxmlObject($short, $object, $depth+1);
-                    }
-                } else {
-                    throw new EasyRdf_Exception(
-                        "It is not possible to serialse the property ".
-                        "'$property' to RDF/XML."
-                    );
-                }
-            }
-        }
-        $xml .= "$indent</$type>\n";
-
-        return $xml;
-    }
-
-
-    /**
-     * Method to serialise an EasyRdf_Graph to RDF/XML
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format != 'rdfxml') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_RdfXml does not support: $format"
-            );
-        }
-
-        // store of namespaces to be appended to the rdf:RDF tag
-        $this->prefixes = array('rdf' => true);
-
-        // store of the resource URIs we have serialised
-        $this->outputtedResources = array();
-
-        $xml = '';
-
-        // Serialise URIs first
-        foreach ($graph->resources() as $resource) {
-            if (!$resource->isBnode()) {
-                $xml .= $this->rdfxmlResource($resource, true);
-            }
-        }
-
-        // Serialise bnodes afterwards
-        foreach ($graph->resources() as $resource) {
-            if ($resource->isBnode()) {
-                $xml .= $this->rdfxmlResource($resource, true);
-            }
-        }
-
-        // iterate through namepsaces array prefix and output a string.
-        $namespaceStr = '';
-        foreach ($this->prefixes as $prefix => $count) {
-            $url = EasyRdf_Namespace::get($prefix);
-
-            if (strlen($namespaceStr)) {
-                $namespaceStr .= "\n        ";
-            }
-
-            if (strlen($prefix) === 0) {
-                $namespaceStr .= ' xmlns="'.htmlspecialchars($url).'"';
-            } else {
-                $namespaceStr .= ' xmlns:'.$prefix.'="'.htmlspecialchars($url).'"';
-            }
-        }
-
-        return "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n".
-               "<rdf:RDF". $namespaceStr . ">\n" . $xml . "\n</rdf:RDF>\n";
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Turtle.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Turtle.php
deleted file mode 100644
index b268201..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Serialiser/Turtle.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to serialise an EasyRdf_Graph to Turtle
- * with no external dependancies.
- *
- * http://www.w3.org/TR/turtle/
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Serialiser_Turtle extends EasyRdf_Serialiser
-{
-    private $outputtedBnodes = array();
-
-    /**
-     * Given a IRI string, escape and enclose in angle brackets.
-     *
-     * @param  string $resourceIri
-     * @return string
-     */
-    public static function escapeIri($resourceIri)
-    {
-        $escapedIri = str_replace('>', '\\>', $resourceIri);
-        return "<$escapedIri>";
-    }
-
-    /**
-     * Given a string, enclose in quotes and escape any quotes in the string.
-     * Strings containing tabs, linefeeds or carriage returns will be
-     * enclosed in three double quotes (""").
-     *
-     * @param  string $value
-     * @return string
-     */
-    public static function quotedString($value)
-    {
-        if (preg_match('/[\t\n\r]/', $value)) {
-            $escaped = str_replace(array('\\', '"""'), array('\\\\', '\\"""'), $value);
-            return '"""'.$escaped.'"""';
-        } else {
-            $escaped = str_replace(array('\\', '"'), array('\\\\', '\\"'), $value);
-            return '"'.$escaped.'"';
-        }
-    }
-
-    /**
-     * Given a an EasyRdf_Resource or URI, convert it into a string, suitable to
-     * be written to a Turtle document. URIs will be shortened into CURIES
-     * where possible.
-     *
-     * @param  EasyRdf_Resource $resource   The resource to convert to a Turtle string
-     * @param  boolean $createNamespace     If true, a new namespace may be created
-     * @return string
-     */
-    public function serialiseResource($resource, $createNamespace = false)
-    {
-        if (is_object($resource)) {
-            if ($resource->isBNode()) {
-                return $resource->getUri();
-            }
-
-            $resource = $resource->getUri();
-        }
-
-        $short = EasyRdf_Namespace::shorten($resource, $createNamespace);
-
-        if ($short) {
-            $this->addPrefix($short);
-            return $short;
-        }
-
-        return self::escapeIri($resource);
-    }
-
-    /**
-     * Given an EasyRdf_Literal object, convert it into a string, suitable to
-     * be written to a Turtle document. Supports multiline literals and literals with
-     * datatypes or languages.
-     *
-     * @param  EasyRdf_Literal $literal
-     * @return string
-     */
-    public function serialiseLiteral($literal)
-    {
-        $value = strval($literal);
-        $quoted = self::quotedString($value);
-
-        if ($datatype = $literal->getDatatypeUri()) {
-            if ($datatype == 'http://www.w3.org/2001/XMLSchema#integer') {
-                return sprintf('%d', $value);
-            } elseif ($datatype == 'http://www.w3.org/2001/XMLSchema#decimal') {
-                return sprintf('%s', $value);
-            } elseif ($datatype == 'http://www.w3.org/2001/XMLSchema#double') {
-                return sprintf('%e', $value);
-            } elseif ($datatype == 'http://www.w3.org/2001/XMLSchema#boolean') {
-                return sprintf('%s', $value);
-            } else {
-                $escaped = $this->serialiseResource($datatype, true);
-                return sprintf('%s^^%s', $quoted, $escaped);
-            }
-        } elseif ($lang = $literal->getLang()) {
-            return $quoted . '@' . $lang;
-        } else {
-            return $quoted;
-        }
-    }
-
-    /**
-     * Convert an EasyRdf object into a string suitable to
-     * be written to a Turtle document.
-     *
-     * @param  EasyRdf_Resource|EasyRdf_Literal $object
-     * @return string
-     */
-    public function serialiseObject($object)
-    {
-        if ($object instanceof EasyRdf_Resource) {
-            return $this->serialiseResource($object);
-        } elseif ($object instanceof EasyRdf_Literal) {
-            return $this->serialiseLiteral($object);
-        } else {
-            throw new InvalidArgumentException(
-                "serialiseObject() requires \$object to be ".
-                "of type EasyRdf_Resource or EasyRdf_Literal"
-            );
-        }
-    }
-
-
-    /**
-     * Protected method to serialise a RDF collection
-     * @ignore
-     */
-    protected function serialiseCollection($node, $indent)
-    {
-        $turtle = '(';
-        $count = 0;
-        while ($node) {
-            if ($id = $node->getBNodeId()) {
-                $this->outputtedBnodes[$id] = true;
-            }
-
-            $value = $node->get('rdf:first');
-            $node = $node->get('rdf:rest');
-            if ($node and $node->hasProperty('rdf:first')) {
-                $count++;
-            }
-
-            if ($value !== null) {
-                $serialised = $this->serialiseObject($value);
-                if ($count) {
-                    $turtle .= "\n$indent  $serialised";
-                } else {
-                    $turtle .= " ".$serialised;
-                }
-            }
-        }
-        if ($count) {
-            $turtle .= "\n$indent)";
-        } else {
-            $turtle .= " )";
-        }
-        return $turtle;
-    }
-
-    /**
-     * Protected method to serialise the properties of a resource
-     * @ignore
-     */
-    protected function serialiseProperties($res, $depth = 1)
-    {
-        $properties = $res->propertyUris();
-        $indent = str_repeat(' ', ($depth*2)-1);
-
-        $turtle = '';
-        if (count($properties) > 1) {
-            $turtle .= "\n$indent";
-        }
-
-        $pCount = 0;
-        foreach ($properties as $property) {
-            if ($property === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type') {
-                $pStr = 'a';
-            } else {
-                $pStr = $this->serialiseResource($property, true);
-            }
-
-            if ($pCount) {
-                $turtle .= " ;\n$indent";
-            }
-
-            $turtle .= ' ' . $pStr;
-
-            $oCount = 0;
-            foreach ($res->all("<$property>") as $object) {
-                if ($oCount) {
-                    $turtle .= ',';
-                }
-
-                if ($object instanceof EasyRdf_Collection) {
-                    $turtle .= ' ' . $this->serialiseCollection($object, $indent);
-                } elseif ($object instanceof EasyRdf_Resource and $object->isBNode()) {
-                    $id = $object->getBNodeId();
-                    $rpcount = $this->reversePropertyCount($object);
-                    if ($rpcount <= 1 and !isset($this->outputtedBnodes[$id])) {
-                        // Nested unlabelled Blank Node
-                        $this->outputtedBnodes[$id] = true;
-                        $turtle .= ' [';
-                        $turtle .= $this->serialiseProperties($object, $depth+1);
-                        $turtle .= ' ]';
-                    } else {
-                        // Multiple properties pointing to this blank node
-                        $turtle .= ' ' . $this->serialiseObject($object);
-                    }
-                } else {
-                    $turtle .= ' ' . $this->serialiseObject($object);
-                }
-                $oCount++;
-            }
-            $pCount++;
-        }
-
-        if ($depth == 1) {
-            $turtle .= " .";
-            if ($pCount > 1) {
-                $turtle .= "\n";
-            }
-        } elseif ($pCount > 1) {
-            $turtle .= "\n" . str_repeat(' ', (($depth-1)*2)-1);
-        }
-
-        return $turtle;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function serialisePrefixes()
-    {
-        $turtle = '';
-        foreach ($this->prefixes as $prefix => $count) {
-            $url = EasyRdf_Namespace::get($prefix);
-            $turtle .= "@prefix $prefix: <$url> .\n";
-        }
-        return $turtle;
-    }
-
-    /**
-     * @ignore
-     */
-    protected function serialiseSubjects(EasyRdf_Graph $graph, $filterType)
-    {
-        $turtle = '';
-        foreach ($graph->resources() as $resource) {
-            /** @var $resource EasyRdf_Resource */
-            // If the resource has no properties - don't serialise it
-            $properties = $resource->propertyUris();
-            if (count($properties) == 0) {
-                continue;
-            }
-
-            // Is this node of the right type?
-            $thisType = $resource->isBNode() ? 'bnode' : 'uri';
-            if ($thisType != $filterType) {
-                continue;
-            }
-
-            if ($thisType == 'bnode') {
-                $id = $resource->getBNodeId();
-
-                if (isset($this->outputtedBnodes[$id])) {
-                    // Already been serialised
-                    continue;
-                }
-
-                $this->outputtedBnodes[$id] = true;
-                $rpcount = $this->reversePropertyCount($resource);
-
-                if ($rpcount == 0) {
-                    $turtle .= '[]';
-                } else {
-                    $turtle .= $this->serialiseResource($resource);
-                }
-            } else {
-                $turtle .= $this->serialiseResource($resource);
-            }
-
-            $turtle .= $this->serialiseProperties($resource);
-            $turtle .= "\n";
-        }
-        return $turtle;
-    }
-
-    /**
-     * Serialise an EasyRdf_Graph to Turtle.
-     *
-     * @param EasyRdf_Graph $graph   An EasyRdf_Graph object.
-     * @param string        $format  The name of the format to convert to.
-     * @param array         $options
-     * @throws EasyRdf_Exception
-     * @return string The RDF in the new desired format.
-     */
-    public function serialise($graph, $format, array $options = array())
-    {
-        parent::checkSerialiseParams($graph, $format);
-
-        if ($format != 'turtle' and $format != 'n3') {
-            throw new EasyRdf_Exception(
-                "EasyRdf_Serialiser_Turtle does not support: $format"
-            );
-        }
-
-        $this->prefixes = array();
-        $this->outputtedBnodes = array();
-
-        $turtle = '';
-        $turtle .= $this->serialiseSubjects($graph, 'uri');
-        $turtle .= $this->serialiseSubjects($graph, 'bnode');
-
-        if (count($this->prefixes)) {
-            return $this->serialisePrefixes() . "\n" . $turtle;
-        } else {
-            return $turtle;
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Client.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Client.php
deleted file mode 100644
index 5f97138..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Client.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class for making SPARQL queries using the SPARQL 1.1 Protocol
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Sparql_Client
-{
-    /** The query/read address of the SPARQL Endpoint */
-    private $queryUri = null;
-
-    private $queryUri_has_params = false;
-
-    /** The update/write address of the SPARQL Endpoint */
-    private $updateUri = null;
-
-    /** Create a new SPARQL endpoint client
-     *
-     * If the query and update endpoints are the same, then you
-     * only need to give a single URI.
-     *
-     * @param string $queryUri The address of the SPARQL Query Endpoint
-     * @param string $updateUri Optional address of the SPARQL Update Endpoint
-     */
-    public function __construct($queryUri, $updateUri = null)
-    {
-        $this->queryUri = $queryUri;
-
-        if (strlen(parse_url($queryUri, PHP_URL_QUERY)) > 0) {
-            $this->queryUri_has_params = true;
-        } else {
-            $this->queryUri_has_params = false;
-        }
-
-        if ($updateUri) {
-            $this->updateUri = $updateUri;
-        } else {
-            $this->updateUri = $queryUri;
-        }
-    }
-
-    /** Get the URI of the SPARQL query endpoint
-     *
-     * @return string The query URI of the SPARQL endpoint
-     */
-    public function getQueryUri()
-    {
-        return $this->queryUri;
-    }
-
-    /** Get the URI of the SPARQL update endpoint
-     *
-     * @return string The query URI of the SPARQL endpoint
-     */
-    public function getUpdateUri()
-    {
-        return $this->updateUri;
-    }
-
-    /**
-     * @depredated
-     * @ignore
-     */
-    public function getUri()
-    {
-        return $this->queryUri;
-    }
-
-    /** Make a query to the SPARQL endpoint
-     *
-     * SELECT and ASK queries will return an object of type
-     * EasyRdf_Sparql_Result.
-     *
-     * CONSTRUCT and DESCRIBE queries will return an object
-     * of type EasyRdf_Graph.
-     *
-     * @param string $query The query string to be executed
-     * @return object EasyRdf_Sparql_Result|EasyRdf_Graph Result of the query.
-     */
-    public function query($query)
-    {
-        return $this->request('query', $query);
-    }
-
-    /** Count the number of triples in a SPARQL 1.1 endpoint
-     *
-     * Performs a SELECT query to estriblish the total number of triples.
-     *
-     * Counts total number of triples by default but a conditional triple pattern
-     * can be given to count of a subset of all triples.
-     *
-     * @param string $condition Triple-pattern condition for the count query
-     * @return integer The number of triples
-     */
-    public function countTriples($condition = '?s ?p ?o')
-    {
-        // SELECT (COUNT(*) AS ?count)
-        // WHERE {
-        //   {?s ?p ?o}
-        //   UNION
-        //   {GRAPH ?g {?s ?p ?o}}
-        // }
-        $result = $this->query('SELECT (COUNT(*) AS ?count) {'.$condition.'}');
-        return $result[0]->count->getValue();
-    }
-
-    /** Get a list of named graphs from a SPARQL 1.1 endpoint
-     *
-     * Performs a SELECT query to get a list of the named graphs
-     *
-     * @param string $limit Optional limit to the number of results
-     * @return array Array of EasyRdf_Resource objects for each named graph
-     */
-    public function listNamedGraphs($limit = null)
-    {
-        $query = "SELECT DISTINCT ?g WHERE {GRAPH ?g {?s ?p ?o}}";
-        if (!is_null($limit)) {
-            $query .= " LIMIT ".(int)$limit;
-        }
-        $result = $this->query($query);
-
-        // Convert the result object into an array of resources
-        $graphs = array();
-        foreach ($result as $row) {
-            array_push($graphs, $row->g);
-        }
-        return $graphs;
-    }
-
-    /** Make an update request to the SPARQL endpoint
-     *
-     * Successful responses will return the HTTP response object
-     *
-     * Unsuccessful responses will throw an exception
-     *
-     * @param string $query The update query string to be executed
-     * @return object EasyRdf_Http_Response HTTP response
-     */
-    public function update($query)
-    {
-        return $this->request('update', $query);
-    }
-
-    public function insert($data, $graphUri = null)
-    {
-        #$this->updateData('INSET',
-        $query = 'INSERT DATA {';
-        if ($graphUri) {
-            $query .= "GRAPH <$graphUri> {";
-        }
-        $query .= $this->convertToTriples($data);
-        if ($graphUri) {
-            $query .= "}";
-        }
-        $query .= '}';
-        return $this->update($query);
-    }
-
-    protected function updateData($operation, $data, $graphUri = null)
-    {
-        $query = "$operation DATA {";
-        if ($graphUri) {
-            $query .= "GRAPH <$graphUri> {";
-        }
-        $query .= $this->convertToTriples($data);
-        if ($graphUri) {
-            $query .= "}";
-        }
-        $query .= '}';
-        return $this->update($query);
-    }
-
-    public function clear($graphUri, $silent = false)
-    {
-        $query = "CLEAR";
-        if ($silent) {
-            $query .= " SILENT";
-        }
-        if (preg_match('/^all|named|default$/i', $graphUri)) {
-            $query .= " $graphUri";
-        } else {
-            $query .= " GRAPH <$graphUri>";
-        }
-        return $this->update($query);
-    }
-
-    /*
-     * Internal function to make an HTTP request to SPARQL endpoint
-     *
-     * @ignore
-     */
-    protected function request($type, $query)
-    {
-        // Check for undefined prefixes
-        $prefixes = '';
-        foreach (EasyRdf_Namespace::namespaces() as $prefix => $uri) {
-            if (strpos($query, "$prefix:") !== false and
-                strpos($query, "PREFIX $prefix:") === false) {
-                $prefixes .=  "PREFIX $prefix: <$uri>\n";
-            }
-        }
-
-        $client = EasyRdf_Http::getDefaultHttpClient();
-        $client->resetParameters();
-
-        // Tell the server which response formats we can parse
-        $accept = EasyRdf_Format::getHttpAcceptHeader(
-            array(
-              'application/sparql-results+json' => 1.0,
-              'application/sparql-results+xml' => 0.8
-            )
-        );
-        $client->setHeaders('Accept', $accept);
-
-        if ($type == 'update') {
-            $client->setMethod('POST');
-            $client->setUri($this->updateUri);
-            $client->setRawData($prefixes . $query);
-            $client->setHeaders('Content-Type', 'application/sparql-update');
-        } elseif ($type == 'query') {
-            // Use GET if the query is less than 2kB
-            // 2046 = 2kB minus 1 for '?' and 1 for NULL-terminated string on server
-            $encodedQuery = 'query='.urlencode($prefixes . $query);
-            if (strlen($encodedQuery) + strlen($this->queryUri) <= 2046) {
-                $delimiter = $this->queryUri_has_params ? '&' : '?';
-
-                $client->setMethod('GET');
-                $client->setUri($this->queryUri.$delimiter.$encodedQuery);
-            } else {
-                // Fall back to POST instead (which is un-cacheable)
-                $client->setMethod('POST');
-                $client->setUri($this->queryUri);
-                $client->setRawData($encodedQuery);
-                $client->setHeaders('Content-Type', 'application/x-www-form-urlencoded');
-            }
-        }
-
-        $response = $client->request();
-        if ($response->getStatus() == 204) {
-            // No content
-            return $response;
-        } elseif ($response->isSuccessful()) {
-            list($type, $params) = EasyRdf_Utils::parseMimeType(
-                $response->getHeader('Content-Type')
-            );
-            if (strpos($type, 'application/sparql-results') === 0) {
-                return new EasyRdf_Sparql_Result($response->getBody(), $type);
-            } else {
-                return new EasyRdf_Graph($this->queryUri, $response->getBody(), $type);
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "HTTP request for SPARQL query failed: ".$response->getBody()
-            );
-        }
-    }
-
-    protected function convertToTriples($data)
-    {
-        if (is_string($data)) {
-            return $data;
-        } elseif (is_object($data) and $data instanceof EasyRdf_Graph) {
-            # FIXME: insert Turtle when there is a way of seperateing out the prefixes
-            return $data->serialise('ntriples');
-        } else {
-            throw new EasyRdf_Exception(
-                "Don't know how to convert to triples for SPARQL query: ".$response->getBody()
-            );
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Result.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Result.php
deleted file mode 100644
index 22001e9..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Sparql/Result.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class for returned for SPARQL SELECT and ASK query responses.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Sparql_Result extends ArrayIterator
-{
-    private $type = null;
-    private $boolean = null;
-
-    private $ordered = null;
-    private $distinct = null;
-    private $fields = array();
-
-    /** A constant for the SPARQL Query Results XML Format namespace */
-    const SPARQL_XML_RESULTS_NS = 'http://www.w3.org/2005/sparql-results#';
-
-    /** Create a new SPARQL Result object
-     *
-     * You should not normally need to create a SPARQL result
-     * object directly - it will be constructed automatically
-     * for you by EasyRdf_Sparql_Client.
-     *
-     * @param string $data      The SPARQL result body
-     * @param string $mimeType  The MIME type of the result
-     */
-    public function __construct($data, $mimeType)
-    {
-        if ($mimeType == 'application/sparql-results+xml') {
-            return $this->parseXml($data);
-        } elseif ($mimeType == 'application/sparql-results+json') {
-            return $this->parseJson($data);
-        } else {
-            throw new EasyRdf_Exception(
-                "Unsupported SPARQL Query Results format: $mimeType"
-            );
-        }
-    }
-
-    /** Get the query result type (boolean/bindings)
-     *
-     * ASK queries return a result of type 'boolean'.
-     * SELECT query return a result of type 'bindings'.
-     *
-     * @return string The query result type.
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /** Return the boolean value of the query result
-     *
-     * If the query was of type boolean then this method will
-     * return either true or false. If the query was of some other
-     * type then this method will return null.
-     *
-     * @return boolean The result of the query.
-     */
-    public function getBoolean()
-    {
-        return $this->boolean;
-    }
-
-    /** Return true if the result of the query was true.
-     *
-     * @return boolean True if the query result was true.
-     */
-    public function isTrue()
-    {
-        return $this->boolean == true;
-    }
-
-    /** Return false if the result of the query was false.
-     *
-     * @return boolean True if the query result was false.
-     */
-    public function isFalse()
-    {
-        return $this->boolean == false;
-    }
-
-    /** Return the number of fields in a query result of type bindings.
-     *
-     * @return integer The number of fields.
-     */
-    public function numFields()
-    {
-        return count($this->fields);
-    }
-
-    /** Return the number of rows in a query result of type bindings.
-     *
-     * @return integer The number of rows.
-     */
-    public function numRows()
-    {
-        return count($this);
-    }
-
-    /** Get the field names in a query result of type bindings.
-     *
-     * @return array The names of the fields in the result.
-     */
-    public function getFields()
-    {
-        return $this->fields;
-    }
-
-    /** Return a human readable view of the query result.
-     *
-     * This method is intended to be a debugging aid and will
-     * return a pretty-print view of the query result.
-     *
-     * @param  string  $format  Either 'text' or 'html'
-     */
-    public function dump($format = 'html')
-    {
-        if ($this->type == 'bindings') {
-            $result = '';
-            if ($format == 'html') {
-                $result .= "<table class='sparql-results' style='border-collapse:collapse'>";
-                $result .= "<tr>";
-                foreach ($this->fields as $field) {
-                    $result .= "<th style='border:solid 1px #000;padding:4px;".
-                               "vertical-align:top;background-color:#eee;'>".
-                               "?$field</th>";
-                }
-                $result .= "</tr>";
-                foreach ($this as $row) {
-                    $result .= "<tr>";
-                    foreach ($this->fields as $field) {
-                        if (isset($row->$field)) {
-                            $result .= "<td style='border:solid 1px #000;padding:4px;".
-                                       "vertical-align:top'>".
-                                       $row->$field->dumpValue($format)."</td>";
-                        } else {
-                            $result .= "<td>&nbsp;</td>";
-                        }
-                    }
-                    $result .= "</tr>";
-                }
-                $result .= "</table>";
-            } else {
-                // First calculate the width of each comment
-                $colWidths = array();
-                foreach ($this->fields as $field) {
-                    $colWidths[$field] = strlen($field);
-                }
-
-                $textData = array();
-                foreach ($this as $row) {
-                    $textRow = array();
-                    foreach ($row as $k => $v) {
-                        $textRow[$k] = $v->dumpValue('text');
-                        $width = strlen($textRow[$k]);
-                        if ($colWidths[$k] < $width) {
-                            $colWidths[$k] = $width;
-                        }
-                    }
-                    $textData[] = $textRow;
-                }
-
-                // Create a horizontal rule
-                $hr = "+";
-                foreach ($colWidths as $k => $v) {
-                    $hr .= "-".str_repeat('-', $v).'-+';
-                }
-
-                // Output the field names
-                $result .= "$hr\n|";
-                foreach ($this->fields as $field) {
-                    $result .= ' '.str_pad("?$field", $colWidths[$field]).' |';
-                }
-
-                // Output each of the rows
-                $result .= "\n$hr\n";
-                foreach ($textData as $textRow) {
-                    $result .= '|';
-                    foreach ($textRow as $k => $v) {
-                        $result .= ' '.str_pad($v, $colWidths[$k]).' |';
-                    }
-                    $result .= "\n";
-                }
-                $result .= "$hr\n";
-
-            }
-            return $result;
-        } elseif ($this->type == 'boolean') {
-            $str = ($this->boolean ? 'true' : 'false');
-            if ($format == 'html') {
-                return "<p>Result: <span style='font-weight:bold'>$str</span></p>";
-            } else {
-                return "Result: $str";
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "Failed to dump SPARQL Query Results format, unknown type: ". $this->type
-            );
-        }
-    }
-
-    /** Create a new EasyRdf_Resource or EasyRdf_Literal depending
-     *  on the type of data passed in.
-     *
-     * @ignore
-     */
-    protected function newTerm($data)
-    {
-        switch($data['type']) {
-            case 'bnode':
-                return new EasyRdf_Resource('_:'.$data['value']);
-            case 'uri':
-                return new EasyRdf_Resource($data['value']);
-            case 'literal':
-            case 'typed-literal':
-                return EasyRdf_Literal::create($data);
-            default:
-                throw new EasyRdf_Exception(
-                    "Failed to parse SPARQL Query Results format, unknown term type: ".
-                    $data['type']
-                );
-        }
-    }
-
-    /** Parse a SPARQL result in the XML format into the object.
-     *
-     * @ignore
-     */
-    protected function parseXml($data)
-    {
-        $doc = new DOMDocument();
-        $doc->loadXML($data);
-
-        # Check for valid root node.
-        if ($doc->hasChildNodes() == false or
-            $doc->childNodes->length != 1 or
-            $doc->firstChild->nodeName != 'sparql' or
-            $doc->firstChild->namespaceURI != self::SPARQL_XML_RESULTS_NS) {
-            throw new EasyRdf_Exception(
-                "Incorrect root node in SPARQL XML Query Results format"
-            );
-        }
-
-        # Is it the result of an ASK query?
-        $boolean = $doc->getElementsByTagName('boolean');
-        if ($boolean->length) {
-            $this->type = 'boolean';
-            $value = $boolean->item(0)->nodeValue;
-            $this->boolean = $value == 'true' ? true : false;
-            return;
-        }
-
-        # Get a list of variables from the header
-        $head = $doc->getElementsByTagName('head');
-        if ($head->length) {
-            $variables = $head->item(0)->getElementsByTagName('variable');
-            foreach ($variables as $variable) {
-                $this->fields[] = $variable->getAttribute('name');
-            }
-        }
-
-        # Is it the result of a SELECT query?
-        $resultstag = $doc->getElementsByTagName('results');
-        if ($resultstag->length) {
-            $this->type = 'bindings';
-            $results = $resultstag->item(0)->getElementsByTagName('result');
-            foreach ($results as $result) {
-                $bindings = $result->getElementsByTagName('binding');
-                $t = new stdClass();
-                foreach ($bindings as $binding) {
-                    $key = $binding->getAttribute('name');
-                    foreach ($binding->childNodes as $node) {
-                        if ($node->nodeType != XML_ELEMENT_NODE) {
-                            continue;
-                        }
-                        $t->$key = $this->newTerm(
-                            array(
-                                'type' => $node->nodeName,
-                                'value' => $node->nodeValue,
-                                'lang' => $node->getAttribute('xml:lang'),
-                                'datatype' => $node->getAttribute('datatype')
-                            )
-                        );
-                        break;
-                    }
-                }
-                $this[] = $t;
-            }
-            return $this;
-        }
-
-        throw new EasyRdf_Exception(
-            "Failed to parse SPARQL XML Query Results format"
-        );
-    }
-
-    /** Parse a SPARQL result in the JSON format into the object.
-     *
-     * @ignore
-     */
-    protected function parseJson($data)
-    {
-        // Decode JSON to an array
-        $data = json_decode($data, true);
-
-        if (isset($data['boolean'])) {
-            $this->type = 'boolean';
-            $this->boolean = $data['boolean'];
-        } elseif (isset($data['results'])) {
-            $this->type = 'bindings';
-            if (isset($data['head']['vars'])) {
-                $this->fields = $data['head']['vars'];
-            }
-
-            foreach ($data['results']['bindings'] as $row) {
-                $t = new stdClass();
-                foreach ($row as $key => $value) {
-                    $t->$key = $this->newTerm($value);
-                }
-                $this[] = $t;
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "Failed to parse SPARQL JSON Query Results format"
-            );
-        }
-    }
-
-    /** Magic method to return value of the result to string
-     *
-     * If this is a boolean result then it will return 'true' or 'false'.
-     * If it is a bindings type, then it will dump as a text based table.
-     *
-     * @return string A string representation of the result.
-     */
-    public function __toString()
-    {
-        if ($this->type == 'boolean') {
-            return $this->boolean ? 'true' : 'false';
-        } else {
-            return $this->dump('text');
-        }
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/TypeMapper.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/TypeMapper.php
deleted file mode 100644
index 81404d2..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/TypeMapper.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-/**
- * Class to map between RDF Types and PHP Classes
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_TypeMapper
-{
-    /** The type map registry */
-    private static $map = array();
-
-    /** Get the registered class for an RDF type
-     *
-     * If a type is not registered, then this method will return null.
-     *
-     * @param  string  $type   The RDF type (e.g. foaf:Person)
-     * @return string          The class name (e.g. Model_Foaf_Name)
-     */
-    public static function get($type)
-    {
-        if (!is_string($type) or $type == null or $type == '') {
-            throw new InvalidArgumentException(
-                "\$type should be a string and cannot be null or empty"
-            );
-        }
-
-        $type = EasyRdf_Namespace::expand($type);
-        if (array_key_exists($type, self::$map)) {
-            return self::$map[$type];
-        } else {
-            return null;
-        }
-    }
-
-    /** Register an RDF type with a PHP Class name
-     *
-     * @param  string  $type   The RDF type (e.g. foaf:Person)
-     * @param  string  $class  The PHP class name (e.g. Model_Foaf_Name)
-     * @return string          The PHP class name
-     */
-    public static function set($type, $class)
-    {
-        if (!is_string($type) or $type == null or $type == '') {
-            throw new InvalidArgumentException(
-                "\$type should be a string and cannot be null or empty"
-            );
-        }
-
-        if (!is_string($class) or $class == null or $class == '') {
-            throw new InvalidArgumentException(
-                "\$class should be a string and cannot be null or empty"
-            );
-        }
-
-        $type = EasyRdf_Namespace::expand($type);
-        return self::$map[$type] = $class;
-    }
-
-    /**
-      * Delete an existing RDF type mapping.
-      *
-      * @param  string  $type   The RDF type (e.g. foaf:Person)
-      */
-    public static function delete($type)
-    {
-        if (!is_string($type) or $type == null or $type == '') {
-            throw new InvalidArgumentException(
-                "\$type should be a string and cannot be null or empty"
-            );
-        }
-
-        $type = EasyRdf_Namespace::expand($type);
-        if (isset(self::$map[$type])) {
-            unset(self::$map[$type]);
-        }
-    }
-}
-
-
-/*
-   Register default set of mapped types
-*/
-
-EasyRdf_TypeMapper::set('rdf:Alt', 'EasyRdf_Container');
-EasyRdf_TypeMapper::set('rdf:Bag', 'EasyRdf_Container');
-EasyRdf_TypeMapper::set('rdf:List', 'EasyRdf_Collection');
-EasyRdf_TypeMapper::set('rdf:Seq', 'EasyRdf_Container');
diff --git a/vendor/easyrdf/easyrdf/lib/EasyRdf/Utils.php b/vendor/easyrdf/easyrdf/lib/EasyRdf/Utils.php
deleted file mode 100644
index d854252..0000000
--- a/vendor/easyrdf/easyrdf/lib/EasyRdf/Utils.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-
-/**
- * EasyRdf
- *
- * LICENSE
- *
- * Copyright (c) 2009-2013 Nicholas J Humfrey.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 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.
- * 3. The name of the author 'Nicholas J Humfrey" 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-
-
-/**
- * Class containing static utility functions
- *
- * @package    EasyRdf
- * @copyright  Copyright (c) 2009-2013 Nicholas J Humfrey
- * @license    http://www.opensource.org/licenses/bsd-license.php
- */
-class EasyRdf_Utils
-{
-
-    /**
-     * Convert a string into CamelCase
-     *
-     * A capital letter is inserted for any non-letter (including userscore).
-     * For example:
-     * 'hello world' becomes HelloWorld
-     * 'rss-tag-soup' becomes RssTagSoup
-     * 'FOO//BAR' becomes FooBar
-     *
-     * @param string The input string
-     * @return string The input string converted to CamelCase
-     */
-    public static function camelise($str)
-    {
-        $cc = '';
-        foreach (preg_split('/[\W_]+/', $str) as $part) {
-            $cc .= ucfirst(strtolower($part));
-        }
-        return $cc;
-    }
-
-    /**
-     * Check if something is an associative array
-     *
-     * Note: this method only checks the key of the first value in the array.
-     *
-     * @param mixed $param The variable to check
-     * @return bool true if the variable is an associative array
-     */
-    public static function isAssociativeArray($param)
-    {
-        if (is_array($param)) {
-            $keys = array_keys($param);
-            if ($keys[0] === 0) {
-                return false;
-            } else {
-                return true;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Remove the fragment from a URI (if it has one)
-     *
-     * @param mixed $uri A URI
-     * @return string The same URI with the fragment removed
-     */
-    public static function removeFragmentFromUri($uri)
-    {
-        $pos = strpos($uri, '#');
-        if ($pos === false) {
-            return $uri;
-        } else {
-            return substr($uri, 0, $pos);
-        }
-    }
-
-    /** Return pretty-print view of a resource URI
-     *
-     * This method is mainly intended for internal use and is used by
-     * EasyRdf_Graph and EasyRdf_Sparql_Result to format a resource
-     * for display.
-     *
-     * @param  mixed  $resource An EasyRdf_Resource object or an associative array
-     * @param  string $format   Either 'html' or 'text'
-     * @param  string $color    The colour of the text
-     * @return string
-     */
-    public static function dumpResourceValue($resource, $format = 'html', $color = 'blue')
-    {
-        if (!preg_match('/^#?[-\w]+$/', $color)) {
-            throw new InvalidArgumentException(
-                "\$color must be a legal color code or name"
-            );
-        }
-
-        if (is_object($resource)) {
-            $resource = strval($resource);
-        } elseif (is_array($resource)) {
-            $resource = $resource['value'];
-        }
-
-        $short = EasyRdf_Namespace::shorten($resource);
-        if ($format == 'html') {
-            $escaped = htmlentities($resource, ENT_QUOTES);
-            if (substr($resource, 0, 2) == '_:') {
-                $href = '#' . $escaped;
-            } else {
-                $href = $escaped;
-            }
-            if ($short) {
-                return "<a href='$href' style='text-decoration:none;color:$color'>$short</a>";
-            } else {
-                return "<a href='$href' style='text-decoration:none;color:$color'>$escaped</a>";
-            }
-        } else {
-            if ($short) {
-                return $short;
-            } else {
-                return $resource;
-            }
-        }
-    }
-
-    /** Return pretty-print view of a literal
-     *
-     * This method is mainly intended for internal use and is used by
-     * EasyRdf_Graph and EasyRdf_Sparql_Result to format a literal
-     * for display.
-     *
-     * @param  mixed  $literal  An EasyRdf_Literal object or an associative array
-     * @param  string $format   Either 'html' or 'text'
-     * @param  string $color    The colour of the text
-     * @return string
-     */
-    public static function dumpLiteralValue($literal, $format = 'html', $color = 'black')
-    {
-        if (!preg_match('/^#?[-\w]+$/', $color)) {
-            throw new InvalidArgumentException(
-                "\$color must be a legal color code or name"
-            );
-        }
-
-        if (is_object($literal)) {
-            $literal = $literal->toRdfPhp();
-        } elseif (!is_array($literal)) {
-            $literal = array('value' => $literal);
-        }
-
-        $text = '"'.$literal['value'].'"';
-        if (isset($literal['lang'])) {
-            $text .= '@' . $literal['lang'];
-        }
-        if (isset($literal['datatype'])) {
-            $short = EasyRdf_Namespace::shorten($literal['datatype']);
-            if ($short) {
-                $text .= "^^$short";
-            } else {
-                $text .= "^^<".$literal['datatype'].">";
-            }
-        }
-
-        if ($format == 'html') {
-            return "<span style='color:$color'>".
-                   htmlentities($text, ENT_COMPAT, "UTF-8").
-                   "</span>";
-        } else {
-            return $text;
-        }
-    }
-
-    /** Clean up and split a mime-type up into its parts
-     *
-     * @param  string $mimeType   A MIME Type, optionally with parameters
-     * @return array  $type, $parameters
-     */
-    public static function parseMimeType($mimeType)
-    {
-        $parts = explode(';', strtolower($mimeType));
-        $type = trim(array_shift($parts));
-        $params = array();
-        foreach ($parts as $part) {
-            if (preg_match('/^\s*(\w+)\s*=\s*(.+?)\s*$/', $part, $matches)) {
-                $params[$matches[1]] = $matches[2];
-            }
-        }
-        return array($type, $params);
-    }
-
-    /** Execute a command as a pipe
-     *
-     * The proc_open() function is used to open a pipe to a
-     * a command line process, writing $input to STDIN, returning STDOUT
-     * and throwing an exception if anything is written to STDERR or the
-     * process returns non-zero.
-     *
-     * @param  string $command   The command to execute
-     * @param  array  $args      Optional list of arguments to pass to the command
-     * @param  string $input     Optional buffer to send to the command
-     * @param  string $dir       Path to directory to run command in (defaults to /tmp)
-     * @return string The result of the command, printed to STDOUT
-     */
-    public static function execCommandPipe($command, $args = null, $input = null, $dir = null)
-    {
-        $descriptorspec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w')
-        );
-
-        // Use the system tmp directory by default
-        if (!$dir) {
-            $dir = sys_get_temp_dir();
-        }
-
-        if (is_array($args)) {
-            $fullCommand = implode(
-                ' ',
-                array_map('escapeshellcmd', array_merge(array($command), $args))
-            );
-        } else {
-            $fullCommand = escapeshellcmd($command);
-            if ($args) {
-                $fullCommand .= ' '.escapeshellcmd($args);
-            }
-        }
-
-        $process = proc_open($fullCommand, $descriptorspec, $pipes, $dir);
-        if (is_resource($process)) {
-            // $pipes now looks like this:
-            // 0 => writeable handle connected to child stdin
-            // 1 => readable handle connected to child stdout
-            // 2 => readable handle connected to child stderr
-
-            if ($input) {
-                fwrite($pipes[0], $input);
-            }
-            fclose($pipes[0]);
-
-            $output = stream_get_contents($pipes[1]);
-            fclose($pipes[1]);
-            $error = stream_get_contents($pipes[2]);
-            fclose($pipes[2]);
-
-            // It is important that you close any pipes before calling
-            // proc_close in order to avoid a deadlock
-            $returnValue = proc_close($process);
-            if ($returnValue) {
-                throw new EasyRdf_Exception(
-                    "Error while executing command $command: ".$error
-                );
-            }
-        } else {
-            throw new EasyRdf_Exception(
-                "Failed to execute command $command"
-            );
-        }
-
-        return $output;
-    }
-}
diff --git a/vendor/easyrdf/easyrdf/scripts/copyright_updater.php b/vendor/easyrdf/easyrdf/scripts/copyright_updater.php
deleted file mode 100644
index 557356b..0000000
--- a/vendor/easyrdf/easyrdf/scripts/copyright_updater.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-$ROOT = realpath(__DIR__ . '/..');
-
-function process_file($path) {
-    $year = date('Y', filemtime($path));
-    $contents = file_get_contents($path);
-
-    $copy_statements = 0;
-    $output = '';
-    foreach (preg_split("/[\r\n]/", $contents) as $line) {
-        if (preg_match("/^(.+)Copyright\s+\(c\)\s+(\d+)-?(\d*) (Nicholas.+)$/", $line, $m)) {
-            $copy_statements++;
-            
-            if ($m[2] != $year and $m[3] != $year) {
-                // Change the line
-                $line = "$m[1]Copyright (c) $m[2]-$year $m[4]";
-            }
-        }
-        
-        // Remove trailing whitespace
-        $line = rtrim($line);
-        $output .= "$line\n";
-    }
-    
-    // Remove surplus line endings
-    while (substr($output, -2) == "\n\n") {
-        $output = substr($output, 0, -1);
-    }
-
-    if ($copy_statements == 0) {
-        print "Warning: $path does not contain any copyright statements\n";
-    } else {
-        file_put_contents($path, $output);
-    }
-}
-
-
-function process_directory($path) {
-    $dir = opendir($path);
-    
-    while ($file = readdir($dir)) {
-        if (substr($file, 0, 1) == '.') {
-            continue;
-        }
-
-        $filepath = $path . '/' . $file;
-        if (is_dir($filepath)) {
-            process_directory($filepath);
-        } elseif (is_file($filepath)) {
-            if (substr($file, -4) == '.php') {
-                process_file($filepath);
-            }
-        } else {
-            print "Unknown type: $filepath\n";
-        }
-    }
-    
-    closedir($dir);   
-}
-
-process_directory($ROOT . '/examples');
-process_directory($ROOT . '/lib');
-process_directory($ROOT . '/test');
diff --git a/vendor/egulias/email-validator/.coveralls.yml b/vendor/egulias/email-validator/.coveralls.yml
deleted file mode 100644
index 143c197..0000000
--- a/vendor/egulias/email-validator/.coveralls.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-service_name: travis-ci
-src_dir:  .
-coverage_clover: build/logs/clover*.xml
diff --git a/vendor/egulias/email-validator/.gitignore b/vendor/egulias/email-validator/.gitignore
deleted file mode 100644
index 1630814..0000000
--- a/vendor/egulias/email-validator/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-report/
-vendor/
diff --git a/vendor/egulias/email-validator/.travis.yml b/vendor/egulias/email-validator/.travis.yml
deleted file mode 100644
index f25de0f..0000000
--- a/vendor/egulias/email-validator/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-sudo: false
-
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-env:
-  global:
-    - deps=no
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.3
-      env: deps=low
-    - php: 5.6
-      env: deps=high
-
-install:
-  - if [ "$deps" = "no" ]; then composer install; fi
-  - if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
-  - if [ "$deps" = "high" ]; then composer update; fi
-
-script:
- - mkdir -p build/logs
- - phpunit --coverage-clover build/logs/clover.xml
-
-after_script:
- - php vendor/bin/coveralls
-
diff --git a/vendor/egulias/email-validator/LICENSE b/vendor/egulias/email-validator/LICENSE
deleted file mode 100644
index de4a25b..0000000
--- a/vendor/egulias/email-validator/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013 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/vendor/egulias/email-validator/README.md b/vendor/egulias/email-validator/README.md
deleted file mode 100644
index 262693b..0000000
--- a/vendor/egulias/email-validator/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-#EmailValidator
-[![Build Status](https://travis-ci.org/egulias/EmailValidator.png?branch=master)](https://travis-ci.org/egulias/EmailValidator) [![Coverage Status](https://coveralls.io/repos/egulias/EmailValidator/badge.png?branch=master)](https://coveralls.io/r/egulias/EmailValidator?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/egulias/EmailValidator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/egulias/EmailValidator/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6/small.png)](https://insight.sensiolabs.com/projects/22ba6692-9c02-42e5-a65d-1c5696bfffc6)
-=============================
-With the help of
-
-![Powered by PhpStorm](https://www.jetbrains.com/phpstorm/documentation/docs/logo_phpstorm.png)
-##Installation##
-
-Run the command below to install via Composer
-
-```shell
-composer require egulias/email-validator
-```
-
-##Usage##
-
-Simple example:
-
-```php
-<?php
-
-use Egulias\EmailValidator\EmailValidator;
-
-$validator = new EmailValidator;
-if ($validator->isValid($email)) {
-	echo $email . ' is a valid email address';
-}
-```
-
-More advanced example (returns detailed diagnostic error codes):
-
-```php
-<?php
-
-use Egulias\EmailValidator\EmailValidator;
-
-$validator = new EmailValidator;
-$email = 'dominic@sayers.cc';
-$result = $validator->isValid($email);
-
-if ($result) {
-	echo $email . ' is a valid email address';
-} else if ($validator->hasWarnings()) {
-	echo 'Warning! ' . $email . ' has unusual/deprecated features (result code ' . var_export($validator->getWarnings(), true) . ')';
-} else {
-	echo $email . ' is not a valid email address (result code ' . $validator->getError() . ')';
-}
-```
-
-##Contributors##
-As this is a port from another library and work, here are other people related to the previous:
-
-* Ricard Clau [@ricardclau](http://github.com/ricardclau):      	Performance against PHP built-in filter_var
-* Josepf Bielawski [@stloyd](http://github.com/stloyd):      		For its first re-work of Dominic's lib
-* Dominic Sayers [@dominicsayers](http://github.com/dominicsayers):  	The original isemail function
-
-##License##
-Released under the MIT License attached with this code.
-
diff --git a/vendor/egulias/email-validator/composer.json b/vendor/egulias/email-validator/composer.json
deleted file mode 100644
index 1ccb77a..0000000
--- a/vendor/egulias/email-validator/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name":         "egulias/email-validator",
-  "description":  "A library for validating emails",
-  "homepage":     "https://github.com/egulias/EmailValidator",
-  "type":         "Library",
-  "keywords":     ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
-  "license":      "MIT",
-  "authors": [
-    {"name": "Eduardo Gulias Davis"}
-  ],
-  "extra": {
-    "branch-alias": {
-      "dev-master": "2.0.x-dev"
-    }
-  },
-  "require":      {
-    "php": ">= 5.3.3",
-    "doctrine/lexer": "~1.0,>=1.0.1"
-  },
-  "require-dev" :   {
-    "satooshi/php-coveralls": "dev-master",
-    "phpunit/phpunit": "~4.4"
-  },
-  "autoload": {
-    "psr-0": {
-      "Egulias\\": "src/"
-    }
-  }
-}
diff --git a/vendor/egulias/email-validator/composer.lock b/vendor/egulias/email-validator/composer.lock
deleted file mode 100644
index 49f7df8..0000000
--- a/vendor/egulias/email-validator/composer.lock
+++ /dev/null
@@ -1,1498 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "9426f5a00cf0f71d83c287a7c0ff392b",
-    "packages": [
-        {
-            "name": "doctrine/lexer",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
-                }
-            },
-            "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": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "lexer",
-                "parser"
-            ],
-            "time": "2014-09-09 13:34:57"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "guzzle/guzzle",
-            "version": "v3.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle3.git",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=5.3.3",
-                "symfony/event-dispatcher": "~2.1"
-            },
-            "replace": {
-                "guzzle/batch": "self.version",
-                "guzzle/cache": "self.version",
-                "guzzle/common": "self.version",
-                "guzzle/http": "self.version",
-                "guzzle/inflection": "self.version",
-                "guzzle/iterator": "self.version",
-                "guzzle/log": "self.version",
-                "guzzle/parser": "self.version",
-                "guzzle/plugin": "self.version",
-                "guzzle/plugin-async": "self.version",
-                "guzzle/plugin-backoff": "self.version",
-                "guzzle/plugin-cache": "self.version",
-                "guzzle/plugin-cookie": "self.version",
-                "guzzle/plugin-curlauth": "self.version",
-                "guzzle/plugin-error-response": "self.version",
-                "guzzle/plugin-history": "self.version",
-                "guzzle/plugin-log": "self.version",
-                "guzzle/plugin-md5": "self.version",
-                "guzzle/plugin-mock": "self.version",
-                "guzzle/plugin-oauth": "self.version",
-                "guzzle/service": "self.version",
-                "guzzle/stream": "self.version"
-            },
-            "require-dev": {
-                "doctrine/cache": "~1.3",
-                "monolog/monolog": "~1.0",
-                "phpunit/phpunit": "3.7.*",
-                "psr/log": "~1.0",
-                "symfony/class-loader": "~2.1",
-                "zendframework/zend-cache": "2.*,<2.3",
-                "zendframework/zend-log": "2.*,<2.3"
-            },
-            "suggest": {
-                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Guzzle": "src/",
-                    "Guzzle\\Tests": "tests/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Guzzle Community",
-                    "homepage": "https://github.com/guzzle/guzzle/contributors"
-                }
-            ],
-            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2015-03-18 18:23:50"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2015-02-03 12:10:50"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2015-04-27 22:15:08"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.1.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
-                "reference": "631e365cf26bb2c078683e8d9bcf8bc631ac4d44",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-06-19 07:11:55"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
-                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2015-04-02 05:19:05"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d",
-                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2015-06-13 07:35:30"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
-                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-06-19 03:43:16"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.7.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f6701ef3faea759acd1910a7751d8d102a7fd5bc",
-                "reference": "f6701ef3faea759acd1910a7751d8d102a7fd5bc",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": ">=1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.2",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.7.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-06-21 07:23:36"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35",
-                "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-06-11 15:55:48"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2012-12-21 11:40:51"
-        },
-        {
-            "name": "satooshi/php-coveralls",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/satooshi/php-coveralls.git",
-                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70",
-                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "guzzle/guzzle": ">=2.7",
-                "php": ">=5.3",
-                "psr/log": "1.0.0",
-                "symfony/config": ">=2.0",
-                "symfony/console": ">=2.0",
-                "symfony/stopwatch": ">=2.2",
-                "symfony/yaml": ">=2.0"
-            },
-            "require-dev": {
-                "apigen/apigen": "2.8.*@stable",
-                "pdepend/pdepend": "dev-master as 2.0.0",
-                "phpmd/phpmd": "dev-master",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0",
-                "phpunit/phpunit": "3.7.*@stable",
-                "sebastian/finder-facade": "dev-master",
-                "sebastian/phpcpd": "1.4.*@stable",
-                "squizlabs/php_codesniffer": "1.4.*@stable",
-                "theseer/fdomdocument": "dev-master"
-            },
-            "suggest": {
-                "symfony/http-kernel": "Allows Symfony integration"
-            },
-            "bin": [
-                "composer/bin/coveralls"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Satooshi\\Component": "src/",
-                    "Satooshi\\Bundle": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kitamura Satoshi",
-                    "email": "with.no.parachute@gmail.com",
-                    "homepage": "https://www.facebook.com/satooshi.jp"
-                }
-            ],
-            "description": "PHP client library for Coveralls API",
-            "homepage": "https://github.com/satooshi/php-coveralls",
-            "keywords": [
-                "ci",
-                "coverage",
-                "github",
-                "test"
-            ],
-            "time": "2014-11-11 15:35:34"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-01-29 16:28:08"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-02-22 15:13:53"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2015-01-01 10:01:08"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "84839970d05254c73cde183a721c7af13aede943"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
-                "reference": "84839970d05254c73cde183a721c7af13aede943",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2015-01-27 07:23:06"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2014-10-06 09:23:50"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-01-24 09:48:32"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/58ded81f1f582a87c528ef3dae9a859f78b5f374",
-                "reference": "58ded81f1f582a87c528ef3dae9a859f78b5f374",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/filesystem": "~2.3"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Config Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-11 14:06:56"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/564398bc1f33faf92fc2ec86859983d30eb81806",
-                "reference": "564398bc1f33faf92fc2ec86859983d30eb81806",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-10 15:30:22"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
-                "reference": "be3c5ff8d503c46768aeb78ce6333051aa6f26d9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5",
-                "symfony/dependency-injection": "~2.6",
-                "symfony/expression-language": "~2.6",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/stopwatch": "~2.3"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-08 09:37:21"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a0d43eb3e17d4f4c6990289805a488a0482a07f3",
-                "reference": "a0d43eb3e17d4f4c6990289805a488a0482a07f3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-08 09:37:21"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
-                "reference": "c653f1985f6c2b7dbffd04d48b9c0a96aaef814b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Stopwatch Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-04 20:11:48"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/9808e75c609a14f6db02f70fccf4ca4aab53c160",
-                "reference": "9808e75c609a14f6db02f70fccf4ca4aab53c160",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-10 15:30:22"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "satooshi/php-coveralls": 20
-    },
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">= 5.3.3"
-    },
-    "platform-dev": []
-}
diff --git a/vendor/egulias/email-validator/phpunit.xml.dist b/vendor/egulias/email-validator/phpunit.xml.dist
deleted file mode 100644
index f335ec1..0000000
--- a/vendor/egulias/email-validator/phpunit.xml.dist
+++ /dev/null
@@ -1,26 +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"
->
-<testsuites>
-  <testsuite name="EmailValidator Test Suite">
-    <directory>./tests/egulias/Tests/</directory>
-    <exclude>./vendor/</exclude>
-  </testsuite>
-</testsuites>
-
-<filter>
-  <blacklist>
-    <directory>./vendor</directory>
-  </blacklist>
-</filter>
-</phpunit>
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
deleted file mode 100644
index d8522ff..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailLexer.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?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_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_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_LOWERTHAN,
-        '>'    => self::S_GREATERTHAN,
-        '{'    => self::S_OPENQBRACKET,
-        '}'    => self::S_CLOSEQBRACKET,
-        ''     => self::S_EMPTY,
-        '\0'   => self::C_NUL,
-    );
-
-    protected $hasInvalidTokens = false;
-
-    protected $previous;
-
-    public function reset()
-    {
-        $this->hasInvalidTokens = false;
-        parent::reset();
-    }
-
-    public function hasInvalidTokens()
-    {
-        return $this->hasInvalidTokens;
-    }
-
-    /**
-     * @param $type
-     * @throws \UnexpectedValueException
-     * @return boolean
-     */
-    public function find($type)
-    {
-        $search = clone $this;
-        $search->skipUntil($type);
-
-        if (!$search->lookahead) {
-            throw new \UnexpectedValueException($type . ' not found');
-        }
-        return true;
-    }
-
-    /**
-     * getPrevious
-     *
-     * @return array token
-     */
-    public function getPrevious()
-    {
-        return $this->previous;
-    }
-
-    /**
-     * moveNext
-     *
-     * @return boolean
-     */
-    public function moveNext()
-    {
-        $this->previous = $this->token;
-
-        return parent::moveNext();
-    }
-
-    /**
-     * 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;
-    }
-
-    protected function isValid($value)
-    {
-        if (isset($this->charValue[$value])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $value
-     * @return bool
-     */
-    protected function isNullType($value)
-    {
-        if ($value === "\0") {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $value
-     * @return bool
-     */
-    protected function isUTF8Invalid($value)
-    {
-        if (preg_match('/\p{Cc}+/u', $value)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function getModifiers()
-    {
-        return 'iu';
-    }
-}
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
deleted file mode 100644
index 5f4c4aa..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailParser.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Egulias\EmailValidator;
-
-use Egulias\EmailValidator\Parser\DomainPart;
-use Egulias\EmailValidator\Parser\LocalPart;
-
-/**
- * EmailParser
- *
- * @author Eduardo Gulias Davis <me@egulias.com>
- */
-class EmailParser
-{
-    const EMAIL_MAX_LENGTH = 254;
-
-    protected $warnings = array();
-    protected $domainPart = '';
-    protected $localPart = '';
-    protected $lexer;
-    protected $localPartParser;
-    protected $domainPartParser;
-
-    public function __construct(EmailLexer $lexer)
-    {
-        $this->lexer = $lexer;
-        $this->localPartParser = new LocalPart($this->lexer);
-        $this->domainPartParser = new DomainPart($this->lexer);
-    }
-
-    /**
-     * @param $str
-     * @return array
-     */
-    public function parse($str)
-    {
-        $this->lexer->setInput($str);
-
-        if (!$this->hasAtToken()) {
-            throw new \InvalidArgumentException('ERR_NOLOCALPART');
-        }
-
-
-        $this->localPartParser->parse($str);
-        $this->domainPartParser->parse($str);
-
-        $this->setParts($str);
-
-        if ($this->lexer->hasInvalidTokens()) {
-            throw new \InvalidArgumentException('ERR_INVALID_ATEXT');
-        }
-
-        return array('local' => $this->localPart, 'domain' => $this->domainPart);
-    }
-
-    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;
-    }
-
-    public function getParsedDomainPart()
-    {
-        return $this->domainPart;
-    }
-
-    protected function setParts($email)
-    {
-        $parts = explode('@', $email);
-        $this->domainPart = $this->domainPartParser->getDomainPart();
-        $this->localPart = $parts[0];
-    }
-
-    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[] = EmailValidator::RFC5322_TOOLONG;
-        }
-    }
-}
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
deleted file mode 100644
index d047dec..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/EmailValidator.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-namespace Egulias\EmailValidator;
-
-/**
- * EmailValidator
- *
- * @author Eduardo Gulias Davis <me@egulias.com>
- */
-class EmailValidator
-{
-    const ERR_CONSECUTIVEATS     = 128;
-    const ERR_EXPECTING_DTEXT    = 129;
-    const ERR_NOLOCALPART        = 130;
-    const ERR_NODOMAIN           = 131;
-    const ERR_CONSECUTIVEDOTS    = 132;
-    const ERR_ATEXT_AFTER_CFWS   = 133;
-    const ERR_ATEXT_AFTER_QS     = 134;
-    const ERR_ATEXT_AFTER_DOMLIT = 135;
-    const ERR_EXPECTING_QPAIR    = 136;
-    const ERR_EXPECTING_ATEXT    = 137;
-    const ERR_EXPECTING_QTEXT    = 138;
-    const ERR_EXPECTING_CTEXT    = 139;
-    const ERR_BACKSLASHEND       = 140;
-    const ERR_DOT_START          = 141;
-    const ERR_DOT_END            = 142;
-    const ERR_DOMAINHYPHENSTART  = 143;
-    const ERR_DOMAINHYPHENEND    = 144;
-    const ERR_UNCLOSEDQUOTEDSTR  = 145;
-    const ERR_UNCLOSEDCOMMENT    = 146;
-    const ERR_UNCLOSEDDOMLIT     = 147;
-    const ERR_FWS_CRLF_X2        = 148;
-    const ERR_FWS_CRLF_END       = 149;
-    const ERR_CR_NO_LF           = 150;
-    const ERR_DEPREC_REACHED     = 151;
-    const RFC5321_TLD             = 9;
-    const RFC5321_TLDNUMERIC      = 10;
-    const RFC5321_QUOTEDSTRING    = 11;
-    const RFC5321_ADDRESSLITERAL  = 12;
-    const RFC5321_IPV6DEPRECATED  = 13;
-    const CFWS_COMMENT            = 17;
-    const CFWS_FWS                = 18;
-    const DEPREC_LOCALPART        = 33;
-    const DEPREC_FWS              = 34;
-    const DEPREC_QTEXT            = 35;
-    const DEPREC_QP               = 36;
-    const DEPREC_COMMENT          = 37;
-    const DEPREC_CTEXT            = 38;
-    const DEPREC_CFWS_NEAR_AT     = 49;
-    const RFC5322_LOCAL_TOOLONG   = 64;
-    const RFC5322_LABEL_TOOLONG   = 63;
-    const RFC5322_DOMAIN          = 65;
-    const RFC5322_TOOLONG         = 66;
-    const RFC5322_DOMAIN_TOOLONG  = 255;
-    const RFC5322_DOMAINLITERAL   = 70;
-    const RFC5322_DOMLIT_OBSDTEXT = 71;
-    const RFC5322_IPV6_GRPCOUNT   = 72;
-    const RFC5322_IPV6_2X2XCOLON  = 73;
-    const RFC5322_IPV6_BADCHAR    = 74;
-    const RFC5322_IPV6_MAXGRPS    = 75;
-    const RFC5322_IPV6_COLONSTRT  = 76;
-    const RFC5322_IPV6_COLONEND   = 77;
-    const DNSWARN_NO_MX_RECORD    = 5;
-    const DNSWARN_NO_RECORD       = 6;
-
-    protected $parser;
-    protected $warnings = array();
-    protected $error;
-    protected $threshold = 255;
-
-    public function __construct()
-    {
-        $this->parser = new EmailParser(new EmailLexer());
-    }
-
-    public function isValid($email, $checkDNS = false, $strict = false)
-    {
-        try {
-            $this->parser->parse((string)$email);
-            $this->warnings = $this->parser->getWarnings();
-        } catch (\Exception $e) {
-            $rClass = new \ReflectionClass($this);
-            $this->error = $rClass->getConstant($e->getMessage());
-            return false;
-        }
-
-        $dns = true;
-        if ($checkDNS) {
-            $dns = $this->checkDNS();
-        }
-
-        if ($this->hasWarnings() && ((int) max($this->warnings) > $this->threshold)) {
-            $this->error = self::ERR_DEPREC_REACHED;
-
-            return false;
-        }
-
-        return !$strict || (!$this->hasWarnings() && $dns);
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasWarnings()
-    {
-        return !empty($this->warnings);
-    }
-
-    /**
-     * @return array
-     */
-    public function getWarnings()
-    {
-        return $this->warnings;
-    }
-
-    /**
-     * @return string
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * @param int $threshold
-     *
-     * @return EmailValidator
-     */
-    public function setThreshold($threshold)
-    {
-        $this->threshold = (int) $threshold;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getThreshold()
-    {
-        return $this->threshold;
-    }
-
-    protected function checkDNS()
-    {
-        $checked = true;
-
-        $result = checkdnsrr(trim($this->parser->getParsedDomainPart()), 'MX');
-
-        if (!$result) {
-            $this->warnings[] = self::DNSWARN_NO_RECORD;
-            $checked = false;
-            $this->addTLDWarnings();
-        }
-
-        return $checked;
-    }
-
-    protected function addTLDWarnings()
-    {
-        if (!in_array(self::DNSWARN_NO_RECORD, $this->warnings) &&
-            !in_array(self::DNSWARN_NO_MX_RECORD, $this->warnings) &&
-            in_array(self::RFC5322_DOMAINLITERAL, $this->warnings)
-        ) {
-            $this->warnings[] = self::RFC5321_TLD;
-        }
-    }
-}
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
deleted file mode 100644
index c4d0cf6..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/DomainPart.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-
-namespace Egulias\EmailValidator\Parser;
-
-use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\Parser\Parser;
-use Egulias\EmailValidator\EmailValidator;
-
-class DomainPart extends Parser
-{
-    const DOMAIN_MAX_LENGTH = 254;
-    protected $domainPart = '';
-
-    public function parse($domainPart)
-    {
-        $this->lexer->moveNext();
-
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-            throw new \InvalidArgumentException('ERR_DOT_START');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_EMPTY) {
-            throw new \InvalidArgumentException('ERR_NODOMAIN');
-        }
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
-            throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-            $this->warnings[] = EmailValidator::DEPREC_COMMENT;
-            $this->parseDomainComments();
-        }
-
-        $domain = $this->doParseDomainPart();
-
-        $prev = $this->lexer->getPrevious();
-        $length = strlen($domain);
-
-        if ($prev['type'] === EmailLexer::S_DOT) {
-            throw new \InvalidArgumentException('ERR_DOT_END');
-        }
-        if ($prev['type'] === EmailLexer::S_HYPHEN) {
-            throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
-        }
-        if ($length > self::DOMAIN_MAX_LENGTH) {
-            $this->warnings[] = EmailValidator::RFC5322_DOMAIN_TOOLONG;
-        }
-        if ($prev['type'] === EmailLexer::S_CR) {
-            throw new \InvalidArgumentException('ERR_FWS_CRLF_END');
-        }
-        $this->domainPart = $domain;
-    }
-
-    public function getDomainPart()
-    {
-        return $this->domainPart;
-    }
-
-    public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
-    {
-        $prev = $this->lexer->getPrevious();
-        if ($prev['type'] === EmailLexer::S_COLON) {
-            $this->warnings[] = EmailValidator::RFC5322_IPV6_COLONEND;
-        }
-
-        $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[] = EmailValidator::RFC5322_IPV6_BADCHAR;
-        }
-
-        if ($colons === false) {
-            // We need exactly the right number of groups
-            if ($groupCount !== $maxGroups) {
-                $this->warnings[] = EmailValidator::RFC5322_IPV6_GRPCOUNT;
-            }
-            return;
-        }
-
-        if ($colons !== strrpos($IPv6, '::')) {
-            $this->warnings[] = EmailValidator::RFC5322_IPV6_2X2XCOLON;
-            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[] = EmailValidator::RFC5322_IPV6_MAXGRPS;
-        } elseif ($groupCount === $maxGroups) {
-            $this->warnings[] = EmailValidator::RFC5321_IPV6DEPRECATED;
-        }
-    }
-
-    protected function doParseDomainPart()
-    {
-        $domain = '';
-        do {
-
-            $prev = $this->lexer->getPrevious();
-
-            if ($this->lexer->token['type'] === EmailLexer::S_SLASH) {
-                throw new \InvalidArgumentException('ERR_DOMAIN_CHAR_NOT_ALLOWED');
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-                $this->parseComments();
-                $this->lexer->moveNext();
-            }
-
-            $this->checkConsecutiveDots();
-            $this->checkDomainPartExceptions($prev);
-
-            if ($this->hasBrackets()) {
-                $this->parseDomainLiteral();
-            }
-
-            $this->checkLabelLength($prev);
-
-            if ($this->isFWS()) {
-                $this->parseFWS();
-            }
-
-            $domain .= $this->lexer->token['value'];
-            $this->lexer->moveNext();
-        } while ($this->lexer->token);
-
-        return $domain;
-    }
-
-    protected function parseDomainLiteral()
-    {
-        if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
-            $this->warnings[] = EmailValidator::RFC5322_IPV6_COLONSTRT;
-        }
-        if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
-            $lexer = clone $this->lexer;
-            $lexer->moveNext();
-            if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
-                $this->warnings[] = EmailValidator::RFC5322_IPV6_COLONSTRT;
-            }
-        }
-
-        return $this->doParseDomainLiteral();
-    }
-
-    protected function doParseDomainLiteral()
-    {
-        $IPv6TAG = false;
-        $addressLiteral = '';
-        do {
-            if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
-                throw new \InvalidArgumentException('ERR_EXPECTING_DTEXT');
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::INVALID ||
-                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
-                $this->lexer->token['type'] === EmailLexer::S_LF
-            ) {
-                $this->warnings[] = EmailValidator::RFC5322_DOMLIT_OBSDTEXT;
-            }
-
-            if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
-                throw new \InvalidArgumentException('ERR_EXPECTING_DTEXT');
-            }
-
-            if ($this->lexer->isNextTokenAny(
-                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
-            )) {
-                $this->warnings[] = EmailValidator::CFWS_FWS;
-                $this->parseFWS();
-            }
-
-            if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
-                throw new \InvalidArgumentException("ERR_CR_NO_LF");
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
-                $this->warnings[] = EmailValidator::RFC5322_DOMLIT_OBSDTEXT;
-                $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[] = EmailValidator::RFC5322_DOMAINLITERAL;
-            return $addressLiteral;
-        }
-
-        $this->warnings[] = EmailValidator::RFC5321_ADDRESSLITERAL;
-
-        $this->checkIPV6Tag($addressLiteral);
-
-        return $addressLiteral;
-    }
-
-    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[] = EmailValidator::RFC5321_ADDRESSLITERAL;
-                return false;
-            }
-            // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, $index) . '0:0';
-        }
-
-        return $addressLiteral;
-    }
-
-    protected function checkDomainPartExceptions($prev)
-    {
-        $invalidDomainTokens = array(
-            EmailLexer::S_DQUOTE => true,
-            EmailLexer::S_SEMICOLON => true,
-            EmailLexer::S_GREATERTHAN => true,
-            EmailLexer::S_LOWERTHAN => true,
-        );
-
-        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
-            throw new \InvalidArgumentException('ERR_COMMA_IN_DOMAIN');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
-            throw new \InvalidArgumentException('ERR_CONSECUTIVEATS');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new \InvalidArgumentException('ERR_DOMAINHYPHENEND');
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
-            && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-    }
-
-    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 \InvalidArgumentException('ERR_EXPECTING_DOMLIT_CLOSE');
-        }
-
-        return true;
-    }
-
-    protected function checkLabelLength($prev)
-    {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
-            $prev['type'] === EmailLexer::GENERIC &&
-            strlen($prev['value']) > 63
-        ) {
-            $this->warnings[] = EmailValidator::RFC5322_LABEL_TOOLONG;
-        }
-    }
-
-    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 \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-    }
-}
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
deleted file mode 100644
index 2f77164..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/LocalPart.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Egulias\EmailValidator\Parser;
-
-use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\EmailValidator;
-use \InvalidArgumentException;
-
-class LocalPart extends Parser
-{
-    public function parse($localPart)
-    {
-        $parseDQuote = true;
-        $closingQuote = false;
-
-        while ($this->lexer->token['type'] !== EmailLexer::S_AT && $this->lexer->token) {
-
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT && !$this->lexer->getPrevious()) {
-                throw new \InvalidArgumentException('ERR_DOT_START');
-            }
-
-            $closingQuote = $this->checkDQUOTE($closingQuote);
-            if ($closingQuote && $parseDQuote) {
-                $parseDQuote = $this->parseDoubleQuote();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-                $this->parseComments();
-            }
-
-            $this->checkConsecutiveDots();
-
-            if (
-                $this->lexer->token['type'] === EmailLexer::S_DOT &&
-                $this->lexer->isNextToken(EmailLexer::S_AT)
-            ) {
-                throw new \InvalidArgumentException('ERR_DOT_END');
-            }
-
-            $this->warnEscaping();
-            $this->isInvalidToken($this->lexer->token, $closingQuote);
-
-            if ($this->isFWS()) {
-                $this->parseFWS();
-            }
-
-            $this->lexer->moveNext();
-        }
-
-        $prev = $this->lexer->getPrevious();
-        if (strlen($prev['value']) > EmailValidator::RFC5322_LOCAL_TOOLONG) {
-            $this->warnings[] = EmailValidator::RFC5322_LOCAL_TOOLONG;
-        }
-    }
-
-    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 && $this->lexer->token) {
-            $parseAgain = false;
-            if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
-                $this->warnings[] = EmailValidator::CFWS_FWS;
-                $setSpecialsWarning = false;
-            }
-
-            $this->lexer->moveNext();
-
-            if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
-                throw new InvalidArgumentException("ERR_EXPECTED_ATEXT");
-            }
-        }
-
-        $prev = $this->lexer->getPrevious();
-
-        if ($prev['type'] === EmailLexer::S_BACKSLASH) {
-            if (!$this->checkDQUOTE(false)) {
-                throw new \InvalidArgumentException("ERR_UNCLOSED_DQUOTE");
-            }
-        }
-
-        if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
-            throw new \InvalidArgumentException("ERR_EXPECED_AT");
-        }
-
-        return $parseAgain;
-    }
-
-    protected function isInvalidToken($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 \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-    }
-}
diff --git a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php b/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
deleted file mode 100644
index b66279e..0000000
--- a/vendor/egulias/email-validator/src/Egulias/EmailValidator/Parser/Parser.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-namespace Egulias\EmailValidator\Parser;
-
-use Egulias\EmailValidator\EmailLexer;
-use Egulias\EmailValidator\EmailValidator;
-
-abstract class Parser
-{
-    protected $warnings = array();
-    protected $lexer;
-
-    public function __construct(EmailLexer $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    public function getWarnings()
-    {
-        return $this->warnings;
-    }
-
-    abstract function parse($str);
-
-    /**
-     * validateQuotedPair
-     */
-    protected function validateQuotedPair()
-    {
-        if (!($this->lexer->token['type'] === EmailLexer::INVALID
-            || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_QPAIR');
-        }
-
-        $this->warnings[] = EmailValidator::DEPREC_QP;
-    }
-
-    /**
-     * @return string the the comment
-     * @throws \InvalidArgumentException
-     */
-    protected function parseComments()
-    {
-        $this->isUnclosedComment();
-        $this->warnings[] = EmailValidator::CFWS_COMMENT;
-        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
-            $this->warnEscaping();
-            $this->lexer->moveNext();
-        }
-
-        $this->lexer->moveNext();
-        if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
-            $this->warnings[] = EmailValidator::DEPREC_CFWS_NEAR_AT;
-        }
-    }
-
-    protected function isUnclosedComment()
-    {
-        try {
-            $this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
-            return true;
-        } catch (\RuntimeException $e) {
-            throw new \InvalidArgumentException('ERR_UNCLOSEDCOMMENT');
-        }
-    }
-
-    protected function parseFWS()
-    {
-        $previous = $this->lexer->getPrevious();
-
-        $this->checkCRLFInFWS();
-
-        if ($this->lexer->token['type'] === EmailLexer::S_CR) {
-            throw new \InvalidArgumentException("ERR_CR_NO_LF");
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
-            throw new \InvalidArgumentException("ERR_ATEXT_AFTER_CFWS");
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_CTEXT');
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
-            $this->warnings[] = EmailValidator::DEPREC_CFWS_NEAR_AT;
-        } else {
-            $this->warnings[] = EmailValidator::CFWS_FWS;
-        }
-    }
-
-    protected function checkConsecutiveDots()
-    {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new \InvalidArgumentException('ERR_CONSECUTIVEDOTS');
-        }
-    }
-
-    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;
-    }
-
-    protected function escaped()
-    {
-        $previous = $this->lexer->getPrevious();
-
-        if ($previous['type'] === EmailLexer::S_BACKSLASH
-            &&
-            $this->lexer->token['type'] !== EmailLexer::GENERIC
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    protected function warnEscaping()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
-            return false;
-        }
-
-        if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-
-        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
-            return false;
-        }
-
-        $this->warnings[] = EmailValidator::DEPREC_QP;
-        return true;
-
-    }
-
-    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 \InvalidArgumentException('ERR_EXPECTING_ATEXT');
-        }
-
-        $this->warnings[] = EmailValidator::RFC5321_QUOTEDSTRING;
-        try {
-            $this->lexer->find(EmailLexer::S_DQUOTE);
-            $hasClosingQuote = true;
-        } catch (\Exception $e) {
-            throw new \InvalidArgumentException('ERR_UNCLOSEDQUOTEDSTR');
-        }
-
-        return $hasClosingQuote;
-    }
-
-    protected function checkCRLFInFWS()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
-            return;
-        }
-        if ($this->lexer->isNextToken(EmailLexer::CRLF)) {
-            throw new \InvalidArgumentException("ERR_FWS_CRLF_X2");
-        }
-        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
-            throw new \InvalidArgumentException("ERR_FWS_CRLF_END");
-        }
-    }
-}
diff --git a/vendor/fabpot/goutte/.gitignore b/vendor/fabpot/goutte/.gitignore
deleted file mode 100644
index 81b9258..0000000
--- a/vendor/fabpot/goutte/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-composer.lock
-phpunit.xml
-vendor
diff --git a/vendor/fabpot/goutte/.travis.yml b/vendor/fabpot/goutte/.travis.yml
deleted file mode 100644
index 26a4ed1..0000000
--- a/vendor/fabpot/goutte/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: php
-
-php:
-    - 7.0
-    - 5.6
-    - 5.5
-    - hhvm
-
-install:
-    - travis_retry composer install --no-interaction --prefer-source
-
-script:
-    - phpunit
-
-matrix:
-    allow_failures:
-        - php: hhvm
-        - php: 7.0
diff --git a/vendor/fabpot/goutte/Goutte/Client.php b/vendor/fabpot/goutte/Goutte/Client.php
deleted file mode 100644
index 1474578..0000000
--- a/vendor/fabpot/goutte/Goutte/Client.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/*
- * This file is part of the Goutte 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 Goutte;
-
-use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\ClientInterface as GuzzleClientInterface;
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Exception\RequestException;
-use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\BrowserKit\Client as BaseClient;
-use Symfony\Component\BrowserKit\Request;
-use Symfony\Component\BrowserKit\Response;
-
-/**
- * Client.
- *
- * @author Fabien Potencier <fabien.potencier@symfony-project.com>
- * @author Michael Dowling <michael@guzzlephp.org>
- * @author Charles Sarrazin <charles@sarraz.in>
- */
-class Client extends BaseClient
-{
-    protected $client;
-
-    private $headers = array();
-    private $auth = null;
-
-    public function setClient(GuzzleClientInterface $client)
-    {
-        $this->client = $client;
-
-        return $this;
-    }
-
-    public function getClient()
-    {
-        if (!$this->client) {
-            $this->client = new GuzzleClient(array('defaults' => array('allow_redirects' => false, 'cookies' => true)));
-        }
-
-        return $this->client;
-    }
-
-    public function setHeader($name, $value)
-    {
-        $this->headers[$name] = $value;
-
-        return $this;
-    }
-
-    public function removeHeader($name)
-    {
-        unset($this->headers[$name]);
-    }
-
-    public function setAuth($user, $password = '', $type = 'basic')
-    {
-        $this->auth = array($user, $password, $type);
-
-        return $this;
-    }
-
-    public function resetAuth()
-    {
-        $this->auth = null;
-
-        return $this;
-    }
-
-    /**
-     * @param Request $request
-     *
-     * @return Response
-     */
-    protected function doRequest($request)
-    {
-        $headers = array();
-        foreach ($request->getServer() as $key => $val) {
-            $key = strtolower(str_replace('_', '-', $key));
-            $contentHeaders = array('content-length' => true, 'content-md5' => true, 'content-type' => true);
-            if (0 === strpos($key, 'http-')) {
-                $headers[substr($key, 5)] = $val;
-            }
-            // CONTENT_* are not prefixed with HTTP_
-            elseif (isset($contentHeaders[$key])) {
-                $headers[$key] = $val;
-            }
-        }
-
-        $cookies = CookieJar::fromArray(
-            $this->getCookieJar()->allRawValues($request->getUri()),
-            parse_url($request->getUri(), PHP_URL_HOST)
-        );
-
-        $requestOptions = array(
-            'cookies' => $cookies,
-            'allow_redirects' => false,
-            'auth' => $this->auth,
-        );
-
-        if (!in_array($request->getMethod(), array('GET', 'HEAD'))) {
-            if (null !== $content = $request->getContent()) {
-                $requestOptions['body'] = $content;
-            } else {
-                if ($files = $request->getFiles()) {
-                    $requestOptions['multipart'] = [];
-
-                    $this->addPostFields($request->getParameters(), $requestOptions['multipart']);
-                    $this->addPostFiles($files, $requestOptions['multipart']);
-                } else {
-                    $requestOptions['form_params'] = $request->getParameters();
-                }
-            }
-        }
-
-        if (!empty($headers)) {
-            $requestOptions['headers'] = $headers;
-        }
-
-        $method = $request->getMethod();
-        $uri = $request->getUri();
-
-        foreach ($this->headers as $name => $value) {
-            $requestOptions['headers'][$name] = $value;
-        }
-
-        // Let BrowserKit handle redirects
-        try {
-            $response = $this->getClient()->request($method, $uri, $requestOptions);
-        } catch (RequestException $e) {
-            $response = $e->getResponse();
-            if (null === $response) {
-                throw $e;
-            }
-        }
-
-        return $this->createResponse($response);
-    }
-
-    protected function addPostFiles(array $files, array &$multipart, $arrayName = '')
-    {
-        if (empty($files)) {
-            return;
-        }
-
-        foreach ($files as $name => $info) {
-            if (!empty($arrayName)) {
-                $name = $arrayName.'['.$name.']';
-            }
-
-            $file = [
-                'name' => $name,
-            ];
-
-            if (is_array($info)) {
-                if (isset($info['tmp_name'])) {
-                    if ('' !== $info['tmp_name']) {
-                        $file['contents'] = fopen($info['tmp_name'], 'r');
-                        if (isset($info['name'])) {
-                            $file['filename'] = $info['name'];
-                        }
-                    } else {
-                        continue;
-                    }
-                } else {
-                    $this->addPostFiles($info, $multipart, $name);
-                    continue;
-                }
-            } else {
-                $file['contents'] = fopen($info, 'r');
-            }
-
-            $multipart[] = $file;
-        }
-    }
-
-    public function addPostFields(array $formParams, array &$multipart, $arrayName = '')
-    {
-        foreach ($formParams as $name => $value) {
-            if (!empty($arrayName)) {
-                $name = $arrayName.'['.$name.']';
-            }
-
-            if (is_array($value)) {
-                $this->addPostFields($value, $multipart, $name);
-            } else {
-                $multipart[] = [
-                    'name' => $name,
-                    'contents' => $value,
-                ];
-            }
-        }
-    }
-
-    protected function createResponse(ResponseInterface $response)
-    {
-        return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
-    }
-}
diff --git a/vendor/fabpot/goutte/Goutte/Resources/phar-stub.php b/vendor/fabpot/goutte/Goutte/Resources/phar-stub.php
deleted file mode 100644
index b9c3b44..0000000
--- a/vendor/fabpot/goutte/Goutte/Resources/phar-stub.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/*
- * This file is part of the Goutte utility.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This source file is subject to the MIT license that is bundled
- * with this source code in the file LICENSE.
- */
-
-require_once 'phar://'.__FILE__.'/vendor/autoload.php';
-
-__HALT_COMPILER();
diff --git a/vendor/fabpot/goutte/LICENSE b/vendor/fabpot/goutte/LICENSE
deleted file mode 100644
index ff727f4..0000000
--- a/vendor/fabpot/goutte/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2010-2013 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/vendor/fabpot/goutte/README.rst b/vendor/fabpot/goutte/README.rst
deleted file mode 100644
index abd847e..0000000
--- a/vendor/fabpot/goutte/README.rst
+++ /dev/null
@@ -1,115 +0,0 @@
-Goutte, a simple PHP Web Scraper
-================================
-
-Goutte is a screen scraping and web crawling library for PHP.
-
-Goutte provides a nice API to crawl websites and extract data from the HTML/XML
-responses.
-
-Requirements
-------------
-
-Goutte depends on PHP 5.5+ and Guzzle 6+.
-
-.. tip::
-
-    If you need support for PHP 5.4 or Guzzle 4-5, use Goutte 2.x (latest `phar
-    <https://github.com/FriendsOfPHP/Goutte/releases/download/v2.0.4/goutte-v2.0.4.phar>`_).
-
-    If you need support for PHP 5.3 or Guzzle 3, use Goutte 1.x (latest `phar
-    <https://github.com/FriendsOfPHP/Goutte/releases/download/v1.0.7/goutte-v1.0.7.phar>`_).
-
-Installation
-------------
-
-Add ``fabpot/goutte`` as a require dependency in your ``composer.json`` file:
-
-.. code-block:: bash
-
-    composer require fabpot/goutte
-
-Usage
------
-
-Create a Goutte Client instance (which extends
-``Symfony\Component\BrowserKit\Client``):
-
-.. code-block:: php
-
-    use Goutte\Client;
-
-    $client = new Client();
-
-Make requests with the ``request()`` method:
-
-.. code-block:: php
-
-    // Go to the symfony.com website
-    $crawler = $client->request('GET', 'http://www.symfony.com/blog/');
-
-The method returns a ``Crawler`` object
-(``Symfony\Component\DomCrawler\Crawler``).
-
-Fine-tune cURL options:
-
-.. code-block:: php
-
-    $client->getClient()->setDefaultOption('config/curl/'.CURLOPT_TIMEOUT, 60);
-
-Click on links:
-
-.. code-block:: php
-
-    // Click on the "Security Advisories" link
-    $link = $crawler->selectLink('Security Advisories')->link();
-    $crawler = $client->click($link);
-
-Extract data:
-
-.. code-block:: php
-
-    // Get the latest post in this category and display the titles
-    $crawler->filter('h2 > a')->each(function ($node) {
-        print $node->text()."\n";
-    });
-
-Submit forms:
-
-.. code-block:: php
-
-    $crawler = $client->request('GET', 'http://github.com/');
-    $crawler = $client->click($crawler->selectLink('Sign in')->link());
-    $form = $crawler->selectButton('Sign in')->form();
-    $crawler = $client->submit($form, array('login' => 'fabpot', 'password' => 'xxxxxx'));
-    $crawler->filter('.flash-error')->each(function ($node) {
-        print $node->text()."\n";
-    });
-
-More Information
-----------------
-
-Read the documentation of the BrowserKit and `DomCrawler
-<http://symfony.com/doc/any/components/dom_crawler.html>`_ Symfony Components
-for more information about what you can do with Goutte.
-
-Pronunciation
--------------
-
-Goutte is pronounced ``goot`` i.e. it rhymes with ``boot`` and not ``out``.
-
-Technical Information
----------------------
-
-Goutte is a thin wrapper around the following fine PHP libraries:
-
-* Symfony Components: BrowserKit, CssSelector and DomCrawler;
-
-*  `Guzzle`_ HTTP Component.
-
-License
--------
-
-Goutte is licensed under the MIT license.
-
-.. _`Composer`: http://getcomposer.org
-.. _`Guzzle`:   http://docs.guzzlephp.org
diff --git a/vendor/fabpot/goutte/box.json b/vendor/fabpot/goutte/box.json
deleted file mode 100644
index 943c61e..0000000
--- a/vendor/fabpot/goutte/box.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "output": "goutte.phar",
-    "chmod": "0755",
-    "compactors": [
-        "Herrera\\Box\\Compactor\\Php"
-    ],
-    "extract": false,
-    "files": [
-        "LICENSE",
-        "Goutte/Client.php"
-    ],
-    "finder": [
-        {
-            "name": ["*.php", "*.pem*"],
-            "exclude": ["Tests", "tests"],
-            "in": "vendor"
-        }
-    ],
-    "stub": "Goutte/Resources/phar-stub.php",
-    "web": false
-}
diff --git a/vendor/fabpot/goutte/composer.json b/vendor/fabpot/goutte/composer.json
deleted file mode 100644
index 1a0ed82..0000000
--- a/vendor/fabpot/goutte/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "fabpot/goutte",
-    "type": "application",
-    "description": "A simple PHP Web Scraper",
-    "keywords": ["scraper"],
-    "homepage": "https://github.com/FriendsOfPHP/Goutte",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.0",
-        "symfony/browser-kit": "~2.1",
-        "symfony/css-selector": "~2.1",
-        "symfony/dom-crawler": "~2.1",
-        "guzzlehttp/guzzle": "^6.0"
-    },
-    "autoload": {
-        "psr-4": { "Goutte\\": "Goutte" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1-dev"
-        }
-    }
-}
diff --git a/vendor/fabpot/goutte/phpunit.xml.dist b/vendor/fabpot/goutte/phpunit.xml.dist
deleted file mode 100644
index 9e7ff98..0000000
--- a/vendor/fabpot/goutte/phpunit.xml.dist
+++ /dev/null
@@ -1,18 +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="./vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Goutte Test Suite">
-            <directory>./Goutte/Tests</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/vendor/guzzlehttp/guzzle/.travis.yml b/vendor/guzzlehttp/guzzle/.travis.yml
deleted file mode 100644
index c0689d1..0000000
--- a/vendor/guzzlehttp/guzzle/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-language: php
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - curl --version
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-  - ~/.nvm/nvm.sh install v0.6.14
-  - ~/.nvm/nvm.sh run v0.6.14
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: 7.0
-  fast_finish: true
-
-before_deploy:
-  - make package
-
-deploy:
-  provider: releases
-  api_key:
-    secure: UpypqlYgsU68QT/x40YzhHXvzWjFwCNo9d+G8KAdm7U9+blFfcWhV1aMdzugvPMl6woXgvJj7qHq5tAL4v6oswCORhpSBfLgOQVFaica5LiHsvWlAedOhxGmnJqMTwuepjBCxXhs3+I8Kof1n4oUL9gKytXjOVCX/f7XU1HiinU=
-  file:
-    - build/artifacts/guzzle.phar
-    - build/artifacts/guzzle.zip
-  on:
-    repo: guzzle/guzzle
-    tags: true
-    all_branches: true
-    php: 5.5
diff --git a/vendor/guzzlehttp/guzzle/CHANGELOG.md b/vendor/guzzlehttp/guzzle/CHANGELOG.md
deleted file mode 100644
index de7da2d..0000000
--- a/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ /dev/null
@@ -1,1188 +0,0 @@
-# CHANGELOG
-
-## 6.1.0 - 2015-09-08
-
-* Feature: Added the `on_stats` request option to provide access to transfer
-  statistics for requests. https://github.com/guzzle/guzzle/pull/1202
-* Feature: Added the ability to persist session cookies in CookieJars.
-  https://github.com/guzzle/guzzle/pull/1195
-* Feature: Some compatibility updates for Google APP Engine
-  https://github.com/guzzle/guzzle/pull/1216
-* Feature: Added support for NO_PROXY to prevent the use of a proxy based on
-  a simple set of rules. https://github.com/guzzle/guzzle/pull/1197
-* Feature: Cookies can now contain square brackets.
-  https://github.com/guzzle/guzzle/pull/1237
-* Bug fix: Now correctly parsing `=` inside of quotes in Cookies.
-  https://github.com/guzzle/guzzle/pull/1232
-* Bug fix: Cusotm cURL options now correctly override curl options of the
-  same name. https://github.com/guzzle/guzzle/pull/1221
-* Bug fix: Content-Type header is now added when using an explicitly provided
-  multipart body. https://github.com/guzzle/guzzle/pull/1218
-* Bug fix: Now ignoring Set-Cookie headers that have no name.
-* Bug fix: Reason phrase is no longer cast to an int in some cases in the
-  cURL handler. https://github.com/guzzle/guzzle/pull/1187
-* Bug fix: Remove the Authorization header when redirecting if the Host
-  header changes. https://github.com/guzzle/guzzle/pull/1207
-* Bug fix: Cookie path matching fixes
-  https://github.com/guzzle/guzzle/issues/1129
-* Bug fix: Fixing the cURL `body_as_string` setting
-  https://github.com/guzzle/guzzle/pull/1201
-* Bug fix: quotes are no longer stripped when parsing cookies.
-  https://github.com/guzzle/guzzle/issues/1172
-* Bug fix: `form_params` and `query` now always uses the `&` separator.
-  https://github.com/guzzle/guzzle/pull/1163
-* Bug fix: Adding a Content-Length to PHP stream wrapper requests if not set.
-  https://github.com/guzzle/guzzle/pull/1189
-
-## 6.0.2 - 2015-07-04
-
-* Fixed a memory leak in the curl handlers in which references to callbacks
-  were not being removed by `curl_reset`.
-* Cookies are now extracted properly before redirects.
-* Cookies now allow more character ranges.
-* Decoded Content-Encoding responses are now modified to correctly reflect
-  their state if the encoding was automatically removed by a handler. This
-  means that the `Content-Encoding` header may be removed an the
-  `Content-Length` modified to reflect the message size after removing the
-  encoding.
-* Added a more explicit error message when trying to use `form_params` and
-  `multipart` in the same request.
-* Several fixes for HHVM support.
-* Functions are now conditionally required using an additional level of
-  indirection to help with global Composer installations.
-
-## 6.0.1 - 2015-05-27
-
-* Fixed a bug with serializing the `query` request option where the `&`
-  separator was missing.
-* Added a better error message for when `body` is provided as an array. Please
-  use `form_params` or `multipart` instead.
-* Various doc fixes.
-
-## 6.0.0 - 2015-05-26
-
-* See the UPGRADING.md document for more information.
-* Added `multipart` and `form_params` request options.
-* Added `synchronous` request option.
-* Added the `on_headers` request option.
-* Fixed `expect` handling.
-* No longer adding default middlewares in the client ctor. These need to be
-  present on the provided handler in order to work.
-* Requests are no longer initiated when sending async requests with the
-  CurlMultiHandler. This prevents unexpected recursion from requests completing
-  while ticking the cURL loop.
-* Removed the semantics of setting `default` to `true`. This is no longer
-  required now that the cURL loop is not ticked for async requests.
-* Added request and response logging middleware.
-* No longer allowing self signed certificates when using the StreamHandler.
-* Ensuring that `sink` is valid if saving to a file.
-* Request exceptions now include a "handler context" which provides handler
-  specific contextual information.
-* Added `GuzzleHttp\RequestOptions` to allow request options to be applied
-  using constants.
-* `$maxHandles` has been removed from CurlMultiHandler.
-* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package.
-
-## 5.3.0 - 2015-05-19
-
-* Mock now supports `save_to`
-* Marked `AbstractRequestEvent::getTransaction()` as public.
-* Fixed a bug in which multiple headers using different casing would overwrite
-  previous headers in the associative array.
-* Added `Utils::getDefaultHandler()`
-* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
-* URL scheme is now always lowercased.
-
-## 6.0.0-beta.1
-
-* Requires PHP >= 5.5
-* Updated to use PSR-7
-  * Requires immutable messages, which basically means an event based system
-    owned by a request instance is no longer possible.
-  * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7).
-  * Removed the dependency on `guzzlehttp/streams`. These stream abstractions
-    are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7`
-    namespace.
-* Added middleware and handler system
-  * Replaced the Guzzle event and subscriber system with a middleware system.
-  * No longer depends on RingPHP, but rather places the HTTP handlers directly
-    in Guzzle, operating on PSR-7 messages.
-  * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which
-    means the `guzzlehttp/retry-subscriber` is now obsolete.
-  * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`.
-* Asynchronous responses
-  * No longer supports the `future` request option to send an async request.
-    Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`,
-    `getAsync`, etc.).
-  * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid
-    recursion required by chaining and forwarding react promises. See
-    https://github.com/guzzle/promises
-  * Added `requestAsync` and `sendAsync` to send request asynchronously.
-  * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests
-    asynchronously.
-* Request options
-  * POST and form updates
-    * Added the `form_fields` and `form_files` request options.
-    * Removed the `GuzzleHttp\Post` namespace.
-    * The `body` request option no longer accepts an array for POST requests.
-  * The `exceptions` request option has been deprecated in favor of the
-    `http_errors` request options.
-  * The `save_to` request option has been deprecated in favor of `sink` request
-    option.
-* Clients no longer accept an array of URI template string and variables for
-  URI variables. You will need to expand URI templates before passing them
-  into a client constructor or request method.
-* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are
-  now magic methods that will send synchronous requests.
-* Replaced `Utils.php` with plain functions in `functions.php`.
-* Removed `GuzzleHttp\Collection`.
-* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as
-  an array.
-* Removed `GuzzleHttp\Query`. Query string handling is now handled using an
-  associative array passed into the `query` request option. The query string
-  is serialized using PHP's `http_build_query`. If you need more control, you
-  can pass the query string in as a string.
-* `GuzzleHttp\QueryParser` has been replaced with the
-  `GuzzleHttp\Psr7\parse_query`.
-
-## 5.2.0 - 2015-01-27
-
-* Added `AppliesHeadersInterface` to make applying headers to a request based
-  on the body more generic and not specific to `PostBodyInterface`.
-* Reduced the number of stack frames needed to send requests.
-* Nested futures are now resolved in the client rather than the RequestFsm
-* Finishing state transitions is now handled in the RequestFsm rather than the
-  RingBridge.
-* Added a guard in the Pool class to not use recursion for request retries.
-
-## 5.1.0 - 2014-12-19
-
-* Pool class no longer uses recursion when a request is intercepted.
-* The size of a Pool can now be dynamically adjusted using a callback.
-  See https://github.com/guzzle/guzzle/pull/943.
-* Setting a request option to `null` when creating a request with a client will
-  ensure that the option is not set. This allows you to overwrite default
-  request options on a per-request basis.
-  See https://github.com/guzzle/guzzle/pull/937.
-* Added the ability to limit which protocols are allowed for redirects by
-  specifying a `protocols` array in the `allow_redirects` request option.
-* Nested futures due to retries are now resolved when waiting for synchronous
-  responses. See https://github.com/guzzle/guzzle/pull/947.
-* `"0"` is now an allowed URI path. See
-  https://github.com/guzzle/guzzle/pull/935.
-* `Query` no longer typehints on the `$query` argument in the constructor,
-  allowing for strings and arrays.
-* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle
-  specific exceptions if necessary.
-
-## 5.0.3 - 2014-11-03
-
-This change updates query strings so that they are treated as un-encoded values
-by default where the value represents an un-encoded value to send over the
-wire. A Query object then encodes the value before sending over the wire. This
-means that even value query string values (e.g., ":") are url encoded. This
-makes the Query class match PHP's http_build_query function. However, if you
-want to send requests over the wire using valid query string characters that do
-not need to be encoded, then you can provide a string to Url::setQuery() and
-pass true as the second argument to specify that the query string is a raw
-string that should not be parsed or encoded (unless a call to getQuery() is
-subsequently made, forcing the query-string to be converted into a Query
-object).
-
-## 5.0.2 - 2014-10-30
-
-* Added a trailing `\r\n` to multipart/form-data payloads. See
-  https://github.com/guzzle/guzzle/pull/871
-* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs.
-* Status codes are now returned as integers. See
-  https://github.com/guzzle/guzzle/issues/881
-* No longer overwriting an existing `application/x-www-form-urlencoded` header
-  when sending POST requests, allowing for customized headers. See
-  https://github.com/guzzle/guzzle/issues/877
-* Improved path URL serialization.
-
-  * No longer double percent-encoding characters in the path or query string if
-    they are already encoded.
-  * Now properly encoding the supplied path to a URL object, instead of only
-    encoding ' ' and '?'.
-  * Note: This has been changed in 5.0.3 to now encode query string values by
-    default unless the `rawString` argument is provided when setting the query
-    string on a URL: Now allowing many more characters to be present in the
-    query string without being percent encoded. See http://tools.ietf.org/html/rfc3986#appendix-A
-
-## 5.0.1 - 2014-10-16
-
-Bugfix release.
-
-* Fixed an issue where connection errors still returned response object in
-  error and end events event though the response is unusable. This has been
-  corrected so that a response is not returned in the `getResponse` method of
-  these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867
-* Fixed an issue where transfer statistics were not being populated in the
-  RingBridge. https://github.com/guzzle/guzzle/issues/866
-
-## 5.0.0 - 2014-10-12
-
-Adding support for non-blocking responses and some minor API cleanup.
-
-### New Features
-
-* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`.
-* Added a public API for creating a default HTTP adapter.
-* Updated the redirect plugin to be non-blocking so that redirects are sent
-  concurrently. Other plugins like this can now be updated to be non-blocking.
-* Added a "progress" event so that you can get upload and download progress
-  events.
-* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers
-  requests concurrently using a capped pool size as efficiently as possible.
-* Added `hasListeners()` to EmitterInterface.
-* Removed `GuzzleHttp\ClientInterface::sendAll` and marked
-  `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the
-  recommended way).
-
-### Breaking changes
-
-The breaking changes in this release are relatively minor. The biggest thing to
-look out for is that request and response objects no longer implement fluent
-interfaces.
-
-* Removed the fluent interfaces (i.e., `return $this`) from requests,
-  responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`,
-  `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and
-  `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of
-  why I did this: http://ocramius.github.io/blog/fluent-interfaces-are-evil/.
-  This also makes the Guzzle message interfaces compatible with the current
-  PSR-7 message proposal.
-* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except
-  for the HTTP request functions from function.php, these functions are now
-  implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode`
-  moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to
-  `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to
-  `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be
-  `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php
-  caused problems for many users: they aren't PSR-4 compliant, require an
-  explicit include, and needed an if-guard to ensure that the functions are not
-  declared multiple times.
-* Rewrote adapter layer.
-    * Removing all classes from `GuzzleHttp\Adapter`, these are now
-      implemented as callables that are stored in `GuzzleHttp\Ring\Client`.
-    * Removed the concept of "parallel adapters". Sending requests serially or
-      concurrently is now handled using a single adapter.
-    * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The
-      Transaction object now exposes the request, response, and client as public
-      properties. The getters and setters have been removed.
-* Removed the "headers" event. This event was only useful for changing the
-  body a response once the headers of the response were known. You can implement
-  a similar behavior in a number of ways. One example might be to use a
-  FnStream that has access to the transaction being sent. For example, when the
-  first byte is written, you could check if the response headers match your
-  expectations, and if so, change the actual stream body that is being
-  written to.
-* Removed the `asArray` parameter from
-  `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-  value as an array, then use the newly added `getHeaderAsArray()` method of
-  `MessageInterface`. This change makes the Guzzle interfaces compatible with
-  the PSR-7 interfaces.
-* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add
-  custom request options using double-dispatch (this was an implementation
-  detail). Instead, you should now provide an associative array to the
-  constructor which is a mapping of the request option name mapping to a
-  function that applies the option value to a request.
-* Removed the concept of "throwImmediately" from exceptions and error events.
-  This control mechanism was used to stop a transfer of concurrent requests
-  from completing. This can now be handled by throwing the exception or by
-  cancelling a pool of requests or each outstanding future request individually.
-* Updated to "GuzzleHttp\Streams" 3.0.
-    * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a
-      `maxLen` parameter. This update makes the Guzzle streams project
-      compatible with the current PSR-7 proposal.
-    * `GuzzleHttp\Stream\Stream::__construct`,
-      `GuzzleHttp\Stream\Stream::factory`, and
-      `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second
-      argument. They now accept an associative array of options, including the
-      "size" key and "metadata" key which can be used to provide custom metadata.
-
-## 4.2.2 - 2014-09-08
-
-* Fixed a memory leak in the CurlAdapter when reusing cURL handles.
-* No longer using `request_fulluri` in stream adapter proxies.
-* Relative redirects are now based on the last response, not the first response.
-
-## 4.2.1 - 2014-08-19
-
-* Ensuring that the StreamAdapter does not always add a Content-Type header
-* Adding automated github releases with a phar and zip
-
-## 4.2.0 - 2014-08-17
-
-* Now merging in default options using a case-insensitive comparison.
-  Closes https://github.com/guzzle/guzzle/issues/767
-* Added the ability to automatically decode `Content-Encoding` response bodies
-  using the `decode_content` request option. This is set to `true` by default
-  to decode the response body if it comes over the wire with a
-  `Content-Encoding`. Set this value to `false` to disable decoding the
-  response content, and pass a string to provide a request `Accept-Encoding`
-  header and turn on automatic response decoding. This feature now allows you
-  to pass an `Accept-Encoding` header in the headers of a request but still
-  disable automatic response decoding.
-  Closes https://github.com/guzzle/guzzle/issues/764
-* Added the ability to throw an exception immediately when transferring
-  requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760
-* Updating guzzlehttp/streams dependency to ~2.1
-* No longer utilizing the now deprecated namespaced methods from the stream
-  package.
-
-## 4.1.8 - 2014-08-14
-
-* Fixed an issue in the CurlFactory that caused setting the `stream=false`
-  request option to throw an exception.
-  See: https://github.com/guzzle/guzzle/issues/769
-* TransactionIterator now calls rewind on the inner iterator.
-  See: https://github.com/guzzle/guzzle/pull/765
-* You can now set the `Content-Type` header to `multipart/form-data`
-  when creating POST requests to force multipart bodies.
-  See https://github.com/guzzle/guzzle/issues/768
-
-## 4.1.7 - 2014-08-07
-
-* Fixed an error in the HistoryPlugin that caused the same request and response
-  to be logged multiple times when an HTTP protocol error occurs.
-* Ensuring that cURL does not add a default Content-Type when no Content-Type
-  has been supplied by the user. This prevents the adapter layer from modifying
-  the request that is sent over the wire after any listeners may have already
-  put the request in a desired state (e.g., signed the request).
-* Throwing an exception when you attempt to send requests that have the
-  "stream" set to true in parallel using the MultiAdapter.
-* Only calling curl_multi_select when there are active cURL handles. This was
-  previously changed and caused performance problems on some systems due to PHP
-  always selecting until the maximum select timeout.
-* Fixed a bug where multipart/form-data POST fields were not correctly
-  aggregated (e.g., values with "&").
-
-## 4.1.6 - 2014-08-03
-
-* Added helper methods to make it easier to represent messages as strings,
-  including getting the start line and getting headers as a string.
-
-## 4.1.5 - 2014-08-02
-
-* Automatically retrying cURL "Connection died, retrying a fresh connect"
-  errors when possible.
-* cURL implementation cleanup
-* Allowing multiple event subscriber listeners to be registered per event by
-  passing an array of arrays of listener configuration.
-
-## 4.1.4 - 2014-07-22
-
-* Fixed a bug that caused multi-part POST requests with more than one field to
-  serialize incorrectly.
-* Paths can now be set to "0"
-* `ResponseInterface::xml` now accepts a `libxml_options` option and added a
-  missing default argument that was required when parsing XML response bodies.
-* A `save_to` stream is now created lazily, which means that files are not
-  created on disk unless a request succeeds.
-
-## 4.1.3 - 2014-07-15
-
-* Various fixes to multipart/form-data POST uploads
-* Wrapping function.php in an if-statement to ensure Guzzle can be used
-  globally and in a Composer install
-* Fixed an issue with generating and merging in events to an event array
-* POST headers are only applied before sending a request to allow you to change
-  the query aggregator used before uploading
-* Added much more robust query string parsing
-* Fixed various parsing and normalization issues with URLs
-* Fixing an issue where multi-valued headers were not being utilized correctly
-  in the StreamAdapter
-
-## 4.1.2 - 2014-06-18
-
-* Added support for sending payloads with GET requests
-
-## 4.1.1 - 2014-06-08
-
-* Fixed an issue related to using custom message factory options in subclasses
-* Fixed an issue with nested form fields in a multi-part POST
-* Fixed an issue with using the `json` request option for POST requests
-* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar`
-
-## 4.1.0 - 2014-05-27
-
-* Added a `json` request option to easily serialize JSON payloads.
-* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON.
-* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`.
-* Added the ability to provide an emitter to a client in the client constructor.
-* Added the ability to persist a cookie session using $_SESSION.
-* Added a trait that can be used to add event listeners to an iterator.
-* Removed request method constants from RequestInterface.
-* Fixed warning when invalid request start-lines are received.
-* Updated MessageFactory to work with custom request option methods.
-* Updated cacert bundle to latest build.
-
-4.0.2 (2014-04-16)
-------------------
-
-* Proxy requests using the StreamAdapter now properly use request_fulluri (#632)
-* Added the ability to set scalars as POST fields (#628)
-
-## 4.0.1 - 2014-04-04
-
-* The HTTP status code of a response is now set as the exception code of
-  RequestException objects.
-* 303 redirects will now correctly switch from POST to GET requests.
-* The default parallel adapter of a client now correctly uses the MultiAdapter.
-* HasDataTrait now initializes the internal data array as an empty array so
-  that the toArray() method always returns an array.
-
-## 4.0.0 - 2014-03-29
-
-* For more information on the 4.0 transition, see:
-  http://mtdowling.com/blog/2014/03/15/guzzle-4-rc/
-* For information on changes and upgrading, see:
-  https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-* Added `GuzzleHttp\batch()` as a convenience function for sending requests in
-  parallel without needing to write asynchronous code.
-* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`.
-  You can now pass a callable or an array of associative arrays where each
-  associative array contains the "fn", "priority", and "once" keys.
-
-## 4.0.0.rc-2 - 2014-03-25
-
-* Removed `getConfig()` and `setConfig()` from clients to avoid confusion
-  around whether things like base_url, message_factory, etc. should be able to
-  be retrieved or modified.
-* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface
-* functions.php functions were renamed using snake_case to match PHP idioms
-* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and
-  `GUZZLE_CURL_SELECT_TIMEOUT` environment variables
-* Added the ability to specify custom `sendAll()` event priorities
-* Added the ability to specify custom stream context options to the stream
-  adapter.
-* Added a functions.php function for `get_path()` and `set_path()`
-* CurlAdapter and MultiAdapter now use a callable to generate curl resources
-* MockAdapter now properly reads a body and emits a `headers` event
-* Updated Url class to check if a scheme and host are set before adding ":"
-  and "//". This allows empty Url (e.g., "") to be serialized as "".
-* Parsing invalid XML no longer emits warnings
-* Curl classes now properly throw AdapterExceptions
-* Various performance optimizations
-* Streams are created with the faster `Stream\create()` function
-* Marked deprecation_proxy() as internal
-* Test server is now a collection of static methods on a class
-
-## 4.0.0-rc.1 - 2014-03-15
-
-* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-
-## 3.8.1 - 2014-01-28
-
-* Bug: Always using GET requests when redirecting from a 303 response
-* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in
-  `Guzzle\Http\ClientInterface::setSslVerification()`
-* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL
-* Bug: The body of a request can now be set to `"0"`
-* Sending PHP stream requests no longer forces `HTTP/1.0`
-* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of
-  each sub-exception
-* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than
-  clobbering everything).
-* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators)
-* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`.
-  For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`.
-* Now properly escaping the regular expression delimiter when matching Cookie domains.
-* Network access is now disabled when loading XML documents
-
-## 3.8.0 - 2013-12-05
-
-* Added the ability to define a POST name for a file
-* JSON response parsing now properly walks additionalProperties
-* cURL error code 18 is now retried automatically in the BackoffPlugin
-* Fixed a cURL error when URLs contain fragments
-* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were
-  CurlExceptions
-* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e)
-* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS`
-* Fixed a bug that was encountered when parsing empty header parameters
-* UriTemplate now has a `setRegex()` method to match the docs
-* The `debug` request parameter now checks if it is truthy rather than if it exists
-* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin
-* Added the ability to combine URLs using strict RFC 3986 compliance
-* Command objects can now return the validation errors encountered by the command
-* Various fixes to cache revalidation (#437 and 29797e5)
-* Various fixes to the AsyncPlugin
-* Cleaned up build scripts
-
-## 3.7.4 - 2013-10-02
-
-* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
-* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp
-  (see https://github.com/aws/aws-sdk-php/issues/147)
-* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots
-* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420)
-* Updated the bundled cacert.pem (#419)
-* OauthPlugin now supports adding authentication to headers or query string (#425)
-
-## 3.7.3 - 2013-09-08
-
-* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
-  `CommandTransferException`.
-* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description
-* Schemas are only injected into response models when explicitly configured.
-* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of
-  an EntityBody.
-* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator.
-* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`.
-* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody()
-* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin
-* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests
-* Bug fix: Properly parsing headers that contain commas contained in quotes
-* Bug fix: mimetype guessing based on a filename is now case-insensitive
-
-## 3.7.2 - 2013-08-02
-
-* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
-  See https://github.com/guzzle/guzzle/issues/371
-* Bug fix: Cookie domains are now matched correctly according to RFC 6265
-  See https://github.com/guzzle/guzzle/issues/377
-* Bug fix: GET parameters are now used when calculating an OAuth signature
-* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted
-* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched
-* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input.
-  See https://github.com/guzzle/guzzle/issues/379
-* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See
-  https://github.com/guzzle/guzzle/pull/380
-* cURL multi cleanup and optimizations
-
-## 3.7.1 - 2013-07-05
-
-* Bug fix: Setting default options on a client now works
-* Bug fix: Setting options on HEAD requests now works. See #352
-* Bug fix: Moving stream factory before send event to before building the stream. See #353
-* Bug fix: Cookies no longer match on IP addresses per RFC 6265
-* Bug fix: Correctly parsing header parameters that are in `<>` and quotes
-* Added `cert` and `ssl_key` as request options
-* `Host` header can now diverge from the host part of a URL if the header is set manually
-* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter
-* OAuth parameters are only added via the plugin if they aren't already set
-* Exceptions are now thrown when a URL cannot be parsed
-* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails
-* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
-
-## 3.7.0 - 2013-06-10
-
-* See UPGRADING.md for more information on how to upgrade.
-* Requests now support the ability to specify an array of $options when creating a request to more easily modify a
-  request. You can pass a 'request.options' configuration setting to a client to apply default request options to
-  every request created by a client (e.g. default query string variables, headers, curl options, etc.).
-* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`.
-  See `Guzzle\Http\StaticClient::mount`.
-* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests
-      created by a command (e.g. custom headers, query string variables, timeout settings, etc.).
-* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the
-  headers of a response
-* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key
-  (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`)
-* ServiceBuilders now support storing and retrieving arbitrary data
-* CachePlugin can now purge all resources for a given URI
-* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource
-* CachePlugin now uses the Vary header to determine if a resource is a cache hit
-* `Guzzle\Http\Message\Response` now implements `\Serializable`
-* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters
-* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable
-* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()`
-* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size
-* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message
-* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older
-  Symfony users can still use the old version of Monolog.
-* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`.
-  Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`.
-* Several performance improvements to `Guzzle\Common\Collection`
-* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-* Added `Guzzle\Stream\StreamInterface::isRepeatable`
-* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`.
-* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`.
-* Removed `Guzzle\Http\ClientInterface::expandTemplate()`
-* Removed `Guzzle\Http\ClientInterface::setRequestFactory()`
-* Removed `Guzzle\Http\ClientInterface::getCurlMulti()`
-* Removed `Guzzle\Http\Message\RequestInterface::canCache`
-* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`
-* Removed `Guzzle\Http\Message\RequestInterface::isRedirect`
-* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting
-  `Guzzle\Common\Version::$emitWarnings` to true.
-* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use
-      `$request->getResponseBody()->isRepeatable()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand.
-  These will work through Guzzle 4.0
-* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params].
-* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`.
-* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`.
-* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-* Marked `Guzzle\Common\Collection::inject()` as deprecated.
-* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');`
-* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-* Always setting X-cache headers on cached responses
-* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-* Added `CacheStorageInterface::purge($url)`
-* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-## 3.6.0 - 2013-05-29
-
-* ServiceDescription now implements ToArrayInterface
-* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters
-* Guzzle can now correctly parse incomplete URLs
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-* Added the ability to cast Model objects to a string to view debug information.
-
-## 3.5.0 - 2013-05-13
-
-* Bug: Fixed a regression so that request responses are parsed only once per oncomplete event rather than multiple times
-* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove
-  itself from the EventDispatcher)
-* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values
-* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too
-* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a
-  non-existent key
-* Bug: All __call() method arguments are now required (helps with mocking frameworks)
-* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
-  to help with refcount based garbage collection of resources created by sending a request
-* Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
-* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it'sdeprecated). Use the
-  HistoryPlugin for a history.
-* Added a `responseBody` alias for the `response_body` location
-* Refactored internals to no longer rely on Response::getRequest()
-* HistoryPlugin can now be cast to a string
-* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests
-  and responses that are sent over the wire
-* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
-
-## 3.4.3 - 2013-04-30
-
-* Bug fix: Fixing bug introduced in 3.4.2 where redirect responses are duplicated on the final redirected response
-* Added a check to re-extract the temp cacert bundle from the phar before sending each request
-
-## 3.4.2 - 2013-04-29
-
-* Bug fix: Stream objects now work correctly with "a" and "a+" modes
-* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present
-* Bug fix: AsyncPlugin no longer forces HEAD requests
-* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter
-* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails
-* Setting a response on a request will write to the custom request body from the response body if one is specified
-* LogPlugin now writes to php://output when STDERR is undefined
-* Added the ability to set multiple POST files for the same key in a single call
-* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default
-* Added the ability to queue CurlExceptions to the MockPlugin
-* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send)
-* Configuration loading now allows remote files
-
-## 3.4.1 - 2013-04-16
-
-* Large refactoring to how CurlMulti handles work. There is now a proxy that sits in front of a pool of CurlMulti
-  handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost.
-* Exceptions are now properly grouped when sending requests in parallel
-* Redirects are now properly aggregated when a multi transaction fails
-* Redirects now set the response on the original object even in the event of a failure
-* Bug fix: Model names are now properly set even when using $refs
-* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax
-* Added support for oauth_callback in OAuth signatures
-* Added support for oauth_verifier in OAuth signatures
-* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
-
-## 3.4.0 - 2013-04-11
-
-* Bug fix: URLs are now resolved correctly based on http://tools.ietf.org/html/rfc3986#section-5.2. #289
-* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
-* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
-* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.
-* Bug fix: Added `number` type to service descriptions.
-* Bug fix: empty parameters are removed from an OAuth signature
-* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header
-* Bug fix: Fixed "array to string" error when validating a union of types in a service description
-* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream
-* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin.
-* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs.
-* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections.
-* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if
-  the Content-Type can be determined based on the entity body or the path of the request.
-* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder.
-* Added support for a PSR-3 LogAdapter.
-* Added a `command.after_prepare` event
-* Added `oauth_callback` parameter to the OauthPlugin
-* Added the ability to create a custom stream class when using a stream factory
-* Added a CachingEntityBody decorator
-* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized.
-* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar.
-* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies
-* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This
-  means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use
-  POST fields or files (the latter is only used when emulating a form POST in the browser).
-* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
-
-## 3.3.1 - 2013-03-10
-
-* Added the ability to create PHP streaming responses from HTTP requests
-* Bug fix: Running any filters when parsing response headers with service descriptions
-* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing
-* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across
-  response location visitors.
-* Bug fix: Removed the possibility of creating configuration files with circular dependencies
-* RequestFactory::create() now uses the key of a POST file when setting the POST file name
-* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
-
-## 3.3.0 - 2013-03-03
-
-* A large number of performance optimizations have been made
-* Bug fix: Added 'wb' as a valid write mode for streams
-* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned
-* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()`
-* BC: Removed `Guzzle\Http\Utils` class
-* BC: Setting a service description on a client will no longer modify the client's command factories.
-* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using
-  the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to
-  lowercase
-* Operation parameter objects are now lazy loaded internally
-* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses
-* Added support for instantiating responseType=class responseClass classes. Classes must implement
-  `Guzzle\Service\Command\ResponseClassInterface`
-* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These
-  additional properties also support locations and can be used to parse JSON responses where the outermost part of the
-  JSON is an array
-* Added support for nested renaming of JSON models (rename sentAs to name)
-* CachePlugin
-    * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error
-    * Debug headers can now added to cached response in the CachePlugin
-
-## 3.2.0 - 2013-02-14
-
-* CurlMulti is no longer reused globally. A new multi object is created per-client. This helps to isolate clients.
-* URLs with no path no longer contain a "/" by default
-* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url.
-* BadResponseException no longer includes the full request and response message
-* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface
-* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface
-* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription
-* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list
-* xmlEncoding can now be customized for the XML declaration of a XML service description operation
-* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value
-  aggregation and no longer uses callbacks
-* The URL encoding implementation of Guzzle\Http\QueryString can now be customized
-* Bug fix: Filters were not always invoked for array service description parameters
-* Bug fix: Redirects now use a target response body rather than a temporary response body
-* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded
-* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
-
-## 3.1.2 - 2013-01-27
-
-* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
-  response body. For example, the XmlVisitor now parses the XML response into an array in the before() method.
-* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent
-* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444)
-* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse()
-* Setting default headers on a client after setting the user-agent will not erase the user-agent setting
-
-## 3.1.1 - 2013-01-20
-
-* Adding wildcard support to Guzzle\Common\Collection::getPath()
-* Adding alias support to ServiceBuilder configs
-* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
-
-## 3.1.0 - 2013-01-12
-
-* BC: CurlException now extends from RequestException rather than BadResponseException
-* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse()
-* Added getData to ServiceDescriptionInterface
-* Added context array to RequestInterface::setState()
-* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http
-* Bug: Adding required content-type when JSON request visitor adds JSON to a command
-* Bug: Fixing the serialization of a service description with custom data
-* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing
-  an array of successful and failed responses
-* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection
-* Added Guzzle\Http\IoEmittingEntityBody
-* Moved command filtration from validators to location visitors
-* Added `extends` attributes to service description parameters
-* Added getModels to ServiceDescriptionInterface
-
-## 3.0.7 - 2012-12-19
-
-* Fixing phar detection when forcing a cacert to system if null or true
-* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()`
-* Cleaning up `Guzzle\Common\Collection::inject` method
-* Adding a response_body location to service descriptions
-
-## 3.0.6 - 2012-12-09
-
-* CurlMulti performance improvements
-* Adding setErrorResponses() to Operation
-* composer.json tweaks
-
-## 3.0.5 - 2012-11-18
-
-* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
-* Bug: Response body can now be a string containing "0"
-* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert
-* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs
-* Added support for XML attributes in service description responses
-* DefaultRequestSerializer now supports array URI parameter values for URI template expansion
-* Added better mimetype guessing to requests and post files
-
-## 3.0.4 - 2012-11-11
-
-* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
-* Bug: Cookies can now be added that have a name, domain, or value set to "0"
-* Bug: Using the system cacert bundle when using the Phar
-* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures
-* Enhanced cookie jar de-duplication
-* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added
-* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies
-* Added the ability to create any sort of hash for a stream rather than just an MD5 hash
-
-## 3.0.3 - 2012-11-04
-
-* Implementing redirects in PHP rather than cURL
-* Added PECL URI template extension and using as default parser if available
-* Bug: Fixed Content-Length parsing of Response factory
-* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams.
-* Adding ToArrayInterface throughout library
-* Fixing OauthPlugin to create unique nonce values per request
-
-## 3.0.2 - 2012-10-25
-
-* Magic methods are enabled by default on clients
-* Magic methods return the result of a command
-* Service clients no longer require a base_url option in the factory
-* Bug: Fixed an issue with URI templates where null template variables were being expanded
-
-## 3.0.1 - 2012-10-22
-
-* Models can now be used like regular collection objects by calling filter, map, etc.
-* Models no longer require a Parameter structure or initial data in the constructor
-* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
-
-## 3.0.0 - 2012-10-15
-
-* Rewrote service description format to be based on Swagger
-    * Now based on JSON schema
-    * Added nested input structures and nested response models
-    * Support for JSON and XML input and output models
-    * Renamed `commands` to `operations`
-    * Removed dot class notation
-    * Removed custom types
-* Broke the project into smaller top-level namespaces to be more component friendly
-* Removed support for XML configs and descriptions. Use arrays or JSON files.
-* Removed the Validation component and Inspector
-* Moved all cookie code to Guzzle\Plugin\Cookie
-* Magic methods on a Guzzle\Service\Client now return the command un-executed.
-* Calling getResult() or getResponse() on a command will lazily execute the command if needed.
-* Now shipping with cURL's CA certs and using it by default
-* Added previousResponse() method to response objects
-* No longer sending Accept and Accept-Encoding headers on every request
-* Only sending an Expect header by default when a payload is greater than 1MB
-* Added/moved client options:
-    * curl.blacklist to curl.option.blacklist
-    * Added ssl.certificate_authority
-* Added a Guzzle\Iterator component
-* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin
-* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin)
-* Added a more robust caching plugin
-* Added setBody to response objects
-* Updating LogPlugin to use a more flexible MessageFormatter
-* Added a completely revamped build process
-* Cleaning up Collection class and removing default values from the get method
-* Fixed ZF2 cache adapters
-
-## 2.8.8 - 2012-10-15
-
-* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
-
-## 2.8.7 - 2012-09-30
-
-* Bug: Fixed config file aliases for JSON includes
-* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests
-* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload
-* Bug: Hardening request and response parsing to account for missing parts
-* Bug: Fixed PEAR packaging
-* Bug: Fixed Request::getInfo
-* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail
-* Adding the ability for the namespace Iterator factory to look in multiple directories
-* Added more getters/setters/removers from service descriptions
-* Added the ability to remove POST fields from OAuth signatures
-* OAuth plugin now supports 2-legged OAuth
-
-## 2.8.6 - 2012-09-05
-
-* Added the ability to modify and build service descriptions
-* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command
-* Added a `json` parameter location
-* Now allowing dot notation for classes in the CacheAdapterFactory
-* Using the union of two arrays rather than an array_merge when extending service builder services and service params
-* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references
-  in service builder config files.
-* Services defined in two different config files that include one another will by default replace the previously
-  defined service, but you can now create services that extend themselves and merge their settings over the previous
-* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like
-  '_default' with a default JSON configuration file.
-
-## 2.8.5 - 2012-08-29
-
-* Bug: Suppressed empty arrays from URI templates
-* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching
-* Added support for HTTP responses that do not contain a reason phrase in the start-line
-* AbstractCommand commands are now invokable
-* Added a way to get the data used when signing an Oauth request before a request is sent
-
-## 2.8.4 - 2012-08-15
-
-* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
-* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable.
-* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream
-* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream
-* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5())
-* Added additional response status codes
-* Removed SSL information from the default User-Agent header
-* DELETE requests can now send an entity body
-* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries
-* Added the ability of the MockPlugin to consume mocked request bodies
-* LogPlugin now exposes request and response objects in the extras array
-
-## 2.8.3 - 2012-07-30
-
-* Bug: Fixed a case where empty POST requests were sent as GET requests
-* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body
-* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new
-* Added multiple inheritance to service description commands
-* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()`
-* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything
-* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
-
-## 2.8.2 - 2012-07-24
-
-* Bug: Query string values set to 0 are no longer dropped from the query string
-* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()`
-* Bug: `+` is now treated as an encoded space when parsing query strings
-* QueryString and Collection performance improvements
-* Allowing dot notation for class paths in filters attribute of a service descriptions
-
-## 2.8.1 - 2012-07-16
-
-* Loosening Event Dispatcher dependency
-* POST redirects can now be customized using CURLOPT_POSTREDIR
-
-## 2.8.0 - 2012-07-15
-
-* BC: Guzzle\Http\Query
-    * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl)
-    * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding()
-    * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool)
-    * Changed the aggregation functions of QueryString to be static methods
-    * Can now use fromString() with querystrings that have a leading ?
-* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters
-* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body
-* Cookies are no longer URL decoded by default
-* Bug: URI template variables set to null are no longer expanded
-
-## 2.7.2 - 2012-07-02
-
-* BC: Moving things to get ready for subtree splits. Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser.
-* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty()
-* CachePlugin now allows for a custom request parameter function to check if a request can be cached
-* Bug fix: CachePlugin now only caches GET and HEAD requests by default
-* Bug fix: Using header glue when transferring headers over the wire
-* Allowing deeply nested arrays for composite variables in URI templates
-* Batch divisors can now return iterators or arrays
-
-## 2.7.1 - 2012-06-26
-
-* Minor patch to update version number in UA string
-* Updating build process
-
-## 2.7.0 - 2012-06-25
-
-* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
-* BC: Removed magic setX methods from commands
-* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method
-* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable.
-* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity)
-* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace
-* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin
-* Added the ability to set POST fields and files in a service description
-* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method
-* Adding a command.before_prepare event to clients
-* Added BatchClosureTransfer and BatchClosureDivisor
-* BatchTransferException now includes references to the batch divisor and transfer strategies
-* Fixed some tests so that they pass more reliably
-* Added Guzzle\Common\Log\ArrayLogAdapter
-
-## 2.6.6 - 2012-06-10
-
-* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
-* BC: Removing Guzzle\Service\Command\CommandSet
-* Adding generic batching system (replaces the batch queue plugin and command set)
-* Updating ZF cache and log adapters and now using ZF's composer repository
-* Bug: Setting the name of each ApiParam when creating through an ApiCommand
-* Adding result_type, result_doc, deprecated, and doc_url to service descriptions
-* Bug: Changed the default cookie header casing back to 'Cookie'
-
-## 2.6.5 - 2012-06-03
-
-* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
-* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from
-* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data
-* BC: Renaming methods in the CookieJarInterface
-* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations
-* Making the default glue for HTTP headers ';' instead of ','
-* Adding a removeValue to Guzzle\Http\Message\Header
-* Adding getCookies() to request interface.
-* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
-
-## 2.6.4 - 2012-05-30
-
-* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
-* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand
-* Bug: Fixing magic method command calls on clients
-* Bug: Email constraint only validates strings
-* Bug: Aggregate POST fields when POST files are present in curl handle
-* Bug: Fixing default User-Agent header
-* Bug: Only appending or prepending parameters in commands if they are specified
-* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes
-* Allowing the use of dot notation for class namespaces when using instance_of constraint
-* Added any_match validation constraint
-* Added an AsyncPlugin
-* Passing request object to the calculateWait method of the ExponentialBackoffPlugin
-* Allowing the result of a command object to be changed
-* Parsing location and type sub values when instantiating a service description rather than over and over at runtime
-
-## 2.6.3 - 2012-05-23
-
-* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
-* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields.
-* You can now use an array of data when creating PUT request bodies in the request factory.
-* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable.
-* [Http] Adding support for Content-Type in multipart POST uploads per upload
-* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1])
-* Adding more POST data operations for easier manipulation of POST data.
-* You can now set empty POST fields.
-* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files.
-* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate.
-* CS updates
-
-## 2.6.2 - 2012-05-19
-
-* [Http] Better handling of nested scope requests in CurlMulti.  Requests are now always prepares in the send() method rather than the addRequest() method.
-
-## 2.6.1 - 2012-05-19
-
-* [BC] Removing 'path' support in service descriptions.  Use 'uri'.
-* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache.
-* [BC] Removing Guzzle\Common\NullObject.  Use https://github.com/mtdowling/NullObject if you need it.
-* [BC] Removing Guzzle\Common\XmlElement.
-* All commands, both dynamic and concrete, have ApiCommand objects.
-* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits.
-* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored.
-* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
-
-## 2.6.0 - 2012-05-15
-
-* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
-* [BC] Executing a Command returns the result of the command rather than the command
-* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed.
-* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args.
-* [BC] Moving ResourceIterator* to Guzzle\Service\Resource
-* [BC] Completely refactored ResourceIterators to iterate over a cloned command object
-* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate
-* [BC] Guzzle\Guzzle is now deprecated
-* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject
-* Adding Guzzle\Version class to give version information about Guzzle
-* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate()
-* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data
-* ServiceDescription and ServiceBuilder are now cacheable using similar configs
-* Changing the format of XML and JSON service builder configs.  Backwards compatible.
-* Cleaned up Cookie parsing
-* Trimming the default Guzzle User-Agent header
-* Adding a setOnComplete() method to Commands that is called when a command completes
-* Keeping track of requests that were mocked in the MockPlugin
-* Fixed a caching bug in the CacheAdapterFactory
-* Inspector objects can be injected into a Command object
-* Refactoring a lot of code and tests to be case insensitive when dealing with headers
-* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL
-* Adding the ability to set global option overrides to service builder configs
-* Adding the ability to include other service builder config files from within XML and JSON files
-* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
-
-## 2.5.0 - 2012-05-08
-
-* Major performance improvements
-* [BC] Simplifying Guzzle\Common\Collection.  Please check to see if you are using features that are now deprecated.
-* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component.
-* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates.  Use "{}"
-* Added the ability to passed parameters to all requests created by a client
-* Added callback functionality to the ExponentialBackoffPlugin
-* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies.
-* Rewinding request stream bodies when retrying requests
-* Exception is thrown when JSON response body cannot be decoded
-* Added configurable magic method calls to clients and commands.  This is off by default.
-* Fixed a defect that added a hash to every parsed URL part
-* Fixed duplicate none generation for OauthPlugin.
-* Emitting an event each time a client is generated by a ServiceBuilder
-* Using an ApiParams object instead of a Collection for parameters of an ApiCommand
-* cache.* request parameters should be renamed to params.cache.*
-* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle.
-* Added the ability to disable type validation of service descriptions
-* ServiceDescriptions and ServiceBuilders are now Serializable
diff --git a/vendor/guzzlehttp/guzzle/LICENSE b/vendor/guzzlehttp/guzzle/LICENSE
deleted file mode 100644
index 9af9fba..0000000
--- a/vendor/guzzlehttp/guzzle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
-
-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/vendor/guzzlehttp/guzzle/README.md b/vendor/guzzlehttp/guzzle/README.md
deleted file mode 100644
index 2d721c0..0000000
--- a/vendor/guzzlehttp/guzzle/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-Guzzle, PHP HTTP client
-=======================
-
-[![Build Status](https://secure.travis-ci.org/guzzle/guzzle.svg?branch=master)](http://travis-ci.org/guzzle/guzzle)
-
-Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
-trivial to integrate with web services.
-
-- Simple interface for building query strings, POST requests, streaming large
-  uploads, streaming large downloads, using HTTP cookies, uploading JSON data,
-  etc...
-- Can send both synchronous and asynchronous requests using the same interface.
-- Uses PSR-7 interfaces for requests, responses, and streams. This allows you
-  to utilize other PSR-7 compatible libraries with Guzzle.
-- Abstracts away the underlying HTTP transport, allowing you to write
-  environment and transport agnostic code; i.e., no hard dependency on cURL,
-  PHP streams, sockets, or non-blocking event loops.
-- Middleware system allows you to augment and compose client behavior.
-
-```php
-$client = new GuzzleHttp\Client();
-$res = $client->request('GET', 'https://api.github.com/user', [
-    'auth' => ['user', 'pass']
-]);
-echo $res->getStatusCode();
-// "200"
-echo $res->getHeader('content-type');
-// 'application/json; charset=utf8'
-echo $res->getBody();
-// {"type":"User"...'
-
-// Send an asynchronous request.
-$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
-$promise = $client->sendAsync($request)->then(function ($response) {
-    echo 'I completed! ' . $response->getBody();
-});
-$promise->wait();
-```
-
-## Help and docs
-
-- [Documentation](http://guzzlephp.org/)
-- [stackoverflow](http://stackoverflow.com/questions/tagged/guzzle)
-- [Gitter](https://gitter.im/guzzle/guzzle)
-
-
-## Installing Guzzle
-
-The recommended way to install Guzzle is through
-[Composer](http://getcomposer.org).
-
-```bash
-# Install Composer
-curl -sS https://getcomposer.org/installer | php
-```
-
-Next, run the Composer command to install the latest stable version of Guzzle:
-
-```bash
-composer.phar require guzzlehttp/guzzle
-```
-
-After installing, you need to require Composer's autoloader:
-
-```php
-require 'vendor/autoload.php';
-```
-
-You can then later update Guzzle using composer:
-
- ```bash
-composer.phar update
- ```
-
-
-## Version Guidance
-
-| Version | Status      | Packagist           | Namespace    | Repo                | Docs                | PSR-7 |
-|---------|-------------|---------------------|--------------|---------------------|---------------------|-------|
-| 3.x     | EOL         | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    |
-| 4.x     | EOL         | `guzzlehttp/guzzle` | `GuzzleHttp` | N/A                 | N/A                 | No    |
-| 5.x     | Maintained  | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    |
-| 6.x     | Latest      | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   |
-
-[guzzle-3-repo]: https://github.com/guzzle/guzzle3
-[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
-[guzzle-6-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
-[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
-[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
diff --git a/vendor/guzzlehttp/guzzle/UPGRADING.md b/vendor/guzzlehttp/guzzle/UPGRADING.md
deleted file mode 100644
index 9e31ddc..0000000
--- a/vendor/guzzlehttp/guzzle/UPGRADING.md
+++ /dev/null
@@ -1,1203 +0,0 @@
-Guzzle Upgrade Guide
-====================
-
-5.0 to 6.0
-----------
-
-Guzzle now uses [PSR-7](http://www.php-fig.org/psr/psr-7/) for HTTP messages.
-Due to the fact that these messages are immutable, this prompted a refactoring
-of Guzzle to use a middleware based system rather than an event system. Any
-HTTP message interaction (e.g., `GuzzleHttp\Message\Request`) need to be
-updated to work with the new immutable PSR-7 request and response objects. Any
-event listeners or subscribers need to be updated to become middleware
-functions that wrap handlers (or are injected into a
-`GuzzleHttp\HandlerStack`).
-
-- Removed `GuzzleHttp\BatchResults`
-- Removed `GuzzleHttp\Collection`
-- Removed `GuzzleHttp\HasDataTrait`
-- Removed `GuzzleHttp\ToArrayInterface`
-- The `guzzlehttp/streams` dependency has been removed. Stream functionality
-  is now present in the `GuzzleHttp\Psr7` namespace provided by the
-  `guzzlehttp/psr7` package.
-- Guzzle no longer uses ReactPHP promises and now uses the
-  `guzzlehttp/promises` library. We use a custom promise library for three
-  significant reasons:
-  1. React promises (at the time of writing this) are recursive. Promise
-     chaining and promise resolution will eventually blow the stack. Guzzle
-     promises are not recursive as they use a sort of trampolining technique.
-     Note: there has been movement in the React project to modify promises to
-     no longer utilize recursion.
-  2. Guzzle needs to have the ability to synchronously block on a promise to
-     wait for a result. Guzzle promises allows this functionality (and does
-     not require the use of recursion).
-  3. Because we need to be able to wait on a result, doing so using React
-     promises requires wrapping react promises with RingPHP futures. This
-     overhead is no longer needed, reducing stack sizes, reducing complexity,
-     and improving performance.
-- `GuzzleHttp\Mimetypes` has been moved to a function in
-  `GuzzleHttp\Psr7\mimetype_from_extension` and
-  `GuzzleHttp\Psr7\mimetype_from_filename`.
-- `GuzzleHttp\Query` and `GuzzleHttp\QueryParser` have been removed. Query
-  strings must now be passed into request objects as strings, or provided to
-  the `query` request option when creating requests with clients. The `query`
-  option uses PHP's `http_build_query` to convert an array to a string. If you
-  need a different serialization technique, you will need to pass the query
-  string in as a string. There are a couple helper functions that will make
-  working with query strings easier: `GuzzleHttp\Psr7\parse_query` and
-  `GuzzleHttp\Psr7\build_query`.
-- Guzzle no longer has a dependency on RingPHP. Due to the use of a middleware
-  system based on PSR-7, using RingPHP and it's middleware system as well adds
-  more complexity than the benefits it provides. All HTTP handlers that were
-  present in RingPHP have been modified to work directly with PSR-7 messages
-  and placed in the `GuzzleHttp\Handler` namespace. This significantly reduces
-  complexity in Guzzle, removes a dependency, and improves performance. RingPHP
-  will be maintained for Guzzle 5 support, but will no longer be a part of
-  Guzzle 6.
-- As Guzzle now uses a middleware based systems the event system and RingPHP
-  integration has been removed. Note: while the event system has been removed,
-  it is possible to add your own type of event system that is powered by the
-  middleware system.
-  - Removed the `Event` namespace.
-  - Removed the `Subscriber` namespace.
-  - Removed `Transaction` class
-  - Removed `RequestFsm`
-  - Removed `RingBridge`
-  - `GuzzleHttp\Subscriber\Cookie` is now provided by
-    `GuzzleHttp\Middleware::cookies`
-  - `GuzzleHttp\Subscriber\HttpError` is now provided by
-    `GuzzleHttp\Middleware::httpError`
-  - `GuzzleHttp\Subscriber\History` is now provided by
-    `GuzzleHttp\Middleware::history`
-  - `GuzzleHttp\Subscriber\Mock` is now provided by
-    `GuzzleHttp\Handler\MockHandler`
-  - `GuzzleHttp\Subscriber\Prepare` is now provided by
-    `GuzzleHttp\PrepareBodyMiddleware`
-  - `GuzzleHttp\Subscriber\Redirect` is now provided by
-    `GuzzleHttp\RedirectMiddleware`
-- Guzzle now uses `Psr\Http\Message\UriInterface` (implements in
-  `GuzzleHttp\Psr7\Uri`) for URI support. `GuzzleHttp\Url` is now gone.
-- Static functions in `GuzzleHttp\Utils` have been moved to namespaced
-  functions under the `GuzzleHttp` namespace. This requires either a Composer
-  based autoloader or you to include functions.php.
-- `GuzzleHttp\ClientInterface::getDefaultOption` has been renamed to
-  `GuzzleHttp\ClientInterface::getConfig`.
-- `GuzzleHttp\ClientInterface::setDefaultOption` has been removed.
-- The `json` and `xml` methods of response objects has been removed. With the
-  migration to strictly adhering to PSR-7 as the interface for Guzzle messages,
-  adding methods to message interfaces would actually require Guzzle messages
-  to extend from PSR-7 messages rather then work with them directly.
-
-## Migrating to middleware
-
-The change to PSR-7 unfortunately required significant refactoring to Guzzle
-due to the fact that PSR-7 messages are immutable. Guzzle 5 relied on an event
-system from plugins. The event system relied on mutability of HTTP messages and
-side effects in order to work. With immutable messages, you have to change your
-workflow to become more about either returning a value (e.g., functional
-middlewares) or setting a value on an object. Guzzle v6 has chosen the
-functional middleware approach.
-
-Instead of using the event system to listen for things like the `before` event,
-you now create a stack based middleware function that intercepts a request on
-the way in and the promise of the response on the way out. This is a much
-simpler and more predictable approach than the event system and works nicely
-with PSR-7 middleware. Due to the use of promises, the middleware system is
-also asynchronous.
-
-v5:
-
-```php
-use GuzzleHttp\Event\BeforeEvent;
-$client = new GuzzleHttp\Client();
-// Get the emitter and listen to the before event.
-$client->getEmitter()->on('before', function (BeforeEvent $e) {
-    // Guzzle v5 events relied on mutation
-    $e->getRequest()->setHeader('X-Foo', 'Bar');
-});
-```
-
-v6:
-
-In v6, you can modify the request before it is sent using the `mapRequest`
-middleware. The idiomatic way in v6 to modify the request/response lifecycle is
-to setup a handler middleware stack up front and inject the handler into a
-client.
-
-```php
-use GuzzleHttp\Middleware;
-// Create a handler stack that has all of the default middlewares attached
-$handler = GuzzleHttp\HandlerStack::create();
-// Push the handler onto the handler stack
-$handler->push(Middleware::mapRequest(function (RequestInterface $request) {
-    // Notice that we have to return a request object
-    return $request->withHeader('X-Foo', 'Bar');
-});
-// Inject the handler into the client
-$client = new GuzzleHttp\Client(['handler' => $handler]);
-```
-
-## POST Requests
-
-This version added the [`form_params`](http://guzzle.readthedocs.org/en/latest/request-options.html#form_params)
-and `multipart` request options. `form_params` is an associative array of
-strings or array of strings and is used to serialize an
-`application/x-www-form-urlencoded` POST request. The
-[`multipart`](http://guzzle.readthedocs.org/en/latest/request-options.html#multipart)
-option is now used to send a multipart/form-data POST request.
-
-`GuzzleHttp\Post\PostFile` has been removed. Use the `multipart` option to add
-POST files to a multipart/form-data request.
-
-The `body` option no longer accepts an array to send POST requests. Please use
-`multipart` or `form_params` instead.
-
-The `base_url` option has been renamed to `base_uri`.
-
-4.x to 5.0
-----------
-
-## Rewritten Adapter Layer
-
-Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send
-HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor
-is still supported, but it has now been renamed to `handler`. Instead of
-passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
-`callable` that follows the RingPHP specification.
-
-## Removed Fluent Interfaces
-
-[Fluent interfaces were removed](http://ocramius.github.io/blog/fluent-interfaces-are-evil)
-from the following classes:
-
-- `GuzzleHttp\Collection`
-- `GuzzleHttp\Url`
-- `GuzzleHttp\Query`
-- `GuzzleHttp\Post\PostBody`
-- `GuzzleHttp\Cookie\SetCookie`
-
-## Removed functions.php
-
-Removed "functions.php", so that Guzzle is truly PSR-4 compliant. The following
-functions can be used as replacements.
-
-- `GuzzleHttp\json_decode` -> `GuzzleHttp\Utils::jsonDecode`
-- `GuzzleHttp\get_path` -> `GuzzleHttp\Utils::getPath`
-- `GuzzleHttp\Utils::setPath` -> `GuzzleHttp\set_path`
-- `GuzzleHttp\Pool::batch` -> `GuzzleHttp\batch`. This function is, however,
-  deprecated in favor of using `GuzzleHttp\Pool::batch()`.
-
-The "procedural" global client has been removed with no replacement (e.g.,
-`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttp\Client`
-object as a replacement.
-
-## `throwImmediately` has been removed
-
-The concept of "throwImmediately" has been removed from exceptions and error
-events. This control mechanism was used to stop a transfer of concurrent
-requests from completing. This can now be handled by throwing the exception or
-by cancelling a pool of requests or each outstanding future request
-individually.
-
-## headers event has been removed
-
-Removed the "headers" event. This event was only useful for changing the
-body a response once the headers of the response were known. You can implement
-a similar behavior in a number of ways. One example might be to use a
-FnStream that has access to the transaction being sent. For example, when the
-first byte is written, you could check if the response headers match your
-expectations, and if so, change the actual stream body that is being
-written to.
-
-## Updates to HTTP Messages
-
-Removed the `asArray` parameter from
-`GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-value as an array, then use the newly added `getHeaderAsArray()` method of
-`MessageInterface`. This change makes the Guzzle interfaces compatible with
-the PSR-7 interfaces.
-
-3.x to 4.0
-----------
-
-## Overarching changes:
-
-- Now requires PHP 5.4 or greater.
-- No longer requires cURL to send requests.
-- Guzzle no longer wraps every exception it throws. Only exceptions that are
-  recoverable are now wrapped by Guzzle.
-- Various namespaces have been removed or renamed.
-- No longer requiring the Symfony EventDispatcher. A custom event dispatcher
-  based on the Symfony EventDispatcher is
-  now utilized in `GuzzleHttp\Event\EmitterInterface` (resulting in significant
-  speed and functionality improvements).
-
-Changes per Guzzle 3.x namespace are described below.
-
-## Batch
-
-The `Guzzle\Batch` namespace has been removed. This is best left to
-third-parties to implement on top of Guzzle's core HTTP library.
-
-## Cache
-
-The `Guzzle\Cache` namespace has been removed. (Todo: No suitable replacement
-has been implemented yet, but hoping to utilize a PSR cache interface).
-
-## Common
-
-- Removed all of the wrapped exceptions. It's better to use the standard PHP
-  library for unrecoverable exceptions.
-- `FromConfigInterface` has been removed.
-- `Guzzle\Common\Version` has been removed. The VERSION constant can be found
-  at `GuzzleHttp\ClientInterface::VERSION`.
-
-### Collection
-
-- `getAll` has been removed. Use `toArray` to convert a collection to an array.
-- `inject` has been removed.
-- `keySearch` has been removed.
-- `getPath` no longer supports wildcard expressions. Use something better like
-  JMESPath for this.
-- `setPath` now supports appending to an existing array via the `[]` notation.
-
-### Events
-
-Guzzle no longer requires Symfony's EventDispatcher component. Guzzle now uses
-`GuzzleHttp\Event\Emitter`.
-
-- `Symfony\Component\EventDispatcher\EventDispatcherInterface` is replaced by
-  `GuzzleHttp\Event\EmitterInterface`.
-- `Symfony\Component\EventDispatcher\EventDispatcher` is replaced by
-  `GuzzleHttp\Event\Emitter`.
-- `Symfony\Component\EventDispatcher\Event` is replaced by
-  `GuzzleHttp\Event\Event`, and Guzzle now has an EventInterface in
-  `GuzzleHttp\Event\EventInterface`.
-- `AbstractHasDispatcher` has moved to a trait, `HasEmitterTrait`, and
-  `HasDispatcherInterface` has moved to `HasEmitterInterface`. Retrieving the
-  event emitter of a request, client, etc. now uses the `getEmitter` method
-  rather than the `getDispatcher` method.
-
-#### Emitter
-
-- Use the `once()` method to add a listener that automatically removes itself
-  the first time it is invoked.
-- Use the `listeners()` method to retrieve a list of event listeners rather than
-  the `getListeners()` method.
-- Use `emit()` instead of `dispatch()` to emit an event from an emitter.
-- Use `attach()` instead of `addSubscriber()` and `detach()` instead of
-  `removeSubscriber()`.
-
-```php
-$mock = new Mock();
-// 3.x
-$request->getEventDispatcher()->addSubscriber($mock);
-$request->getEventDispatcher()->removeSubscriber($mock);
-// 4.x
-$request->getEmitter()->attach($mock);
-$request->getEmitter()->detach($mock);
-```
-
-Use the `on()` method to add a listener rather than the `addListener()` method.
-
-```php
-// 3.x
-$request->getEventDispatcher()->addListener('foo', function (Event $event) { /* ... */ } );
-// 4.x
-$request->getEmitter()->on('foo', function (Event $event, $name) { /* ... */ } );
-```
-
-## Http
-
-### General changes
-
-- The cacert.pem certificate has been moved to `src/cacert.pem`.
-- Added the concept of adapters that are used to transfer requests over the
-  wire.
-- Simplified the event system.
-- Sending requests in parallel is still possible, but batching is no longer a
-  concept of the HTTP layer. Instead, you must use the `complete` and `error`
-  events to asynchronously manage parallel request transfers.
-- `Guzzle\Http\Url` has moved to `GuzzleHttp\Url`.
-- `Guzzle\Http\QueryString` has moved to `GuzzleHttp\Query`.
-- QueryAggregators have been rewritten so that they are simply callable
-  functions.
-- `GuzzleHttp\StaticClient` has been removed. Use the functions provided in
-  `functions.php` for an easy to use static client instance.
-- Exceptions in `GuzzleHttp\Exception` have been updated to all extend from
-  `GuzzleHttp\Exception\TransferException`.
-
-### Client
-
-Calling methods like `get()`, `post()`, `head()`, etc. no longer create and
-return a request, but rather creates a request, sends the request, and returns
-the response.
-
-```php
-// 3.0
-$request = $client->get('/');
-$response = $request->send();
-
-// 4.0
-$response = $client->get('/');
-
-// or, to mirror the previous behavior
-$request = $client->createRequest('GET', '/');
-$response = $client->send($request);
-```
-
-`GuzzleHttp\ClientInterface` has changed.
-
-- The `send` method no longer accepts more than one request. Use `sendAll` to
-  send multiple requests in parallel.
-- `setUserAgent()` has been removed. Use a default request option instead. You
-  could, for example, do something like:
-  `$client->setConfig('defaults/headers/User-Agent', 'Foo/Bar ' . $client::getDefaultUserAgent())`.
-- `setSslVerification()` has been removed. Use default request options instead,
-  like `$client->setConfig('defaults/verify', true)`.
-
-`GuzzleHttp\Client` has changed.
-
-- The constructor now accepts only an associative array. You can include a
-  `base_url` string or array to use a URI template as the base URL of a client.
-  You can also specify a `defaults` key that is an associative array of default
-  request options. You can pass an `adapter` to use a custom adapter,
-  `batch_adapter` to use a custom adapter for sending requests in parallel, or
-  a `message_factory` to change the factory used to create HTTP requests and
-  responses.
-- The client no longer emits a `client.create_request` event.
-- Creating requests with a client no longer automatically utilize a URI
-  template. You must pass an array into a creational method (e.g.,
-  `createRequest`, `get`, `put`, etc.) in order to expand a URI template.
-
-### Messages
-
-Messages no longer have references to their counterparts (i.e., a request no
-longer has a reference to it's response, and a response no loger has a
-reference to its request). This association is now managed through a
-`GuzzleHttp\Adapter\TransactionInterface` object. You can get references to
-these transaction objects using request events that are emitted over the
-lifecycle of a request.
-
-#### Requests with a body
-
-- `GuzzleHttp\Message\EntityEnclosingRequest` and
-  `GuzzleHttp\Message\EntityEnclosingRequestInterface` have been removed. The
-  separation between requests that contain a body and requests that do not
-  contain a body has been removed, and now `GuzzleHttp\Message\RequestInterface`
-  handles both use cases.
-- Any method that previously accepts a `GuzzleHttp\Response` object now accept a
-  `GuzzleHttp\Message\ResponseInterface`.
-- `GuzzleHttp\Message\RequestFactoryInterface` has been renamed to
-  `GuzzleHttp\Message\MessageFactoryInterface`. This interface is used to create
-  both requests and responses and is implemented in
-  `GuzzleHttp\Message\MessageFactory`.
-- POST field and file methods have been removed from the request object. You
-  must now use the methods made available to `GuzzleHttp\Post\PostBodyInterface`
-  to control the format of a POST body. Requests that are created using a
-  standard `GuzzleHttp\Message\MessageFactoryInterface` will automatically use
-  a `GuzzleHttp\Post\PostBody` body if the body was passed as an array or if
-  the method is POST and no body is provided.
-
-```php
-$request = $client->createRequest('POST', '/');
-$request->getBody()->setField('foo', 'bar');
-$request->getBody()->addFile(new PostFile('file_key', fopen('/path/to/content', 'r')));
-```
-
-#### Headers
-
-- `GuzzleHttp\Message\Header` has been removed. Header values are now simply
-  represented by an array of values or as a string. Header values are returned
-  as a string by default when retrieving a header value from a message. You can
-  pass an optional argument of `true` to retrieve a header value as an array
-  of strings instead of a single concatenated string.
-- `GuzzleHttp\PostFile` and `GuzzleHttp\PostFileInterface` have been moved to
-  `GuzzleHttp\Post`. This interface has been simplified and now allows the
-  addition of arbitrary headers.
-- Custom headers like `GuzzleHttp\Message\Header\Link` have been removed. Most
-  of the custom headers are now handled separately in specific
-  subscribers/plugins, and `GuzzleHttp\Message\HeaderValues::parseParams()` has
-  been updated to properly handle headers that contain parameters (like the
-  `Link` header).
-
-#### Responses
-
-- `GuzzleHttp\Message\Response::getInfo()` and
-  `GuzzleHttp\Message\Response::setInfo()` have been removed. Use the event
-  system to retrieve this type of information.
-- `GuzzleHttp\Message\Response::getRawHeaders()` has been removed.
-- `GuzzleHttp\Message\Response::getMessage()` has been removed.
-- `GuzzleHttp\Message\Response::calculateAge()` and other cache specific
-  methods have moved to the CacheSubscriber.
-- Header specific helper functions like `getContentMd5()` have been removed.
-  Just use `getHeader('Content-MD5')` instead.
-- `GuzzleHttp\Message\Response::setRequest()` and
-  `GuzzleHttp\Message\Response::getRequest()` have been removed. Use the event
-  system to work with request and response objects as a transaction.
-- `GuzzleHttp\Message\Response::getRedirectCount()` has been removed. Use the
-  Redirect subscriber instead.
-- `GuzzleHttp\Message\Response::isSuccessful()` and other related methods have
-  been removed. Use `getStatusCode()` instead.
-
-#### Streaming responses
-
-Streaming requests can now be created by a client directly, returning a
-`GuzzleHttp\Message\ResponseInterface` object that contains a body stream
-referencing an open PHP HTTP stream.
-
-```php
-// 3.0
-use Guzzle\Stream\PhpStreamRequestFactory;
-$request = $client->get('/');
-$factory = new PhpStreamRequestFactory();
-$stream = $factory->fromRequest($request);
-$data = $stream->read(1024);
-
-// 4.0
-$response = $client->get('/', ['stream' => true]);
-// Read some data off of the stream in the response body
-$data = $response->getBody()->read(1024);
-```
-
-#### Redirects
-
-The `configureRedirects()` method has been removed in favor of a
-`allow_redirects` request option.
-
-```php
-// Standard redirects with a default of a max of 5 redirects
-$request = $client->createRequest('GET', '/', ['allow_redirects' => true]);
-
-// Strict redirects with a custom number of redirects
-$request = $client->createRequest('GET', '/', [
-    'allow_redirects' => ['max' => 5, 'strict' => true]
-]);
-```
-
-#### EntityBody
-
-EntityBody interfaces and classes have been removed or moved to
-`GuzzleHttp\Stream`. All classes and interfaces that once required
-`GuzzleHttp\EntityBodyInterface` now require
-`GuzzleHttp\Stream\StreamInterface`. Creating a new body for a request no
-longer uses `GuzzleHttp\EntityBody::factory` but now uses
-`GuzzleHttp\Stream\Stream::factory` or even better:
-`GuzzleHttp\Stream\create()`.
-
-- `Guzzle\Http\EntityBodyInterface` is now `GuzzleHttp\Stream\StreamInterface`
-- `Guzzle\Http\EntityBody` is now `GuzzleHttp\Stream\Stream`
-- `Guzzle\Http\CachingEntityBody` is now `GuzzleHttp\Stream\CachingStream`
-- `Guzzle\Http\ReadLimitEntityBody` is now `GuzzleHttp\Stream\LimitStream`
-- `Guzzle\Http\IoEmittyinEntityBody` has been removed.
-
-#### Request lifecycle events
-
-Requests previously submitted a large number of requests. The number of events
-emitted over the lifecycle of a request has been significantly reduced to make
-it easier to understand how to extend the behavior of a request. All events
-emitted during the lifecycle of a request now emit a custom
-`GuzzleHttp\Event\EventInterface` object that contains context providing
-methods and a way in which to modify the transaction at that specific point in
-time (e.g., intercept the request and set a response on the transaction).
-
-- `request.before_send` has been renamed to `before` and now emits a
-  `GuzzleHttp\Event\BeforeEvent`
-- `request.complete` has been renamed to `complete` and now emits a
-  `GuzzleHttp\Event\CompleteEvent`.
-- `request.sent` has been removed. Use `complete`.
-- `request.success` has been removed. Use `complete`.
-- `error` is now an event that emits a `GuzzleHttp\Event\ErrorEvent`.
-- `request.exception` has been removed. Use `error`.
-- `request.receive.status_line` has been removed.
-- `curl.callback.progress` has been removed. Use a custom `StreamInterface` to
-  maintain a status update.
-- `curl.callback.write` has been removed. Use a custom `StreamInterface` to
-  intercept writes.
-- `curl.callback.read` has been removed. Use a custom `StreamInterface` to
-  intercept reads.
-
-`headers` is a new event that is emitted after the response headers of a
-request have been received before the body of the response is downloaded. This
-event emits a `GuzzleHttp\Event\HeadersEvent`.
-
-You can intercept a request and inject a response using the `intercept()` event
-of a `GuzzleHttp\Event\BeforeEvent`, `GuzzleHttp\Event\CompleteEvent`, and
-`GuzzleHttp\Event\ErrorEvent` event.
-
-See: http://docs.guzzlephp.org/en/latest/events.html
-
-## Inflection
-
-The `Guzzle\Inflection` namespace has been removed. This is not a core concern
-of Guzzle.
-
-## Iterator
-
-The `Guzzle\Iterator` namespace has been removed.
-
-- `Guzzle\Iterator\AppendIterator`, `Guzzle\Iterator\ChunkedIterator`, and
-  `Guzzle\Iterator\MethodProxyIterator` are nice, but not a core requirement of
-  Guzzle itself.
-- `Guzzle\Iterator\FilterIterator` is no longer needed because an equivalent
-  class is shipped with PHP 5.4.
-- `Guzzle\Iterator\MapIterator` is not really needed when using PHP 5.5 because
-  it's easier to just wrap an iterator in a generator that maps values.
-
-For a replacement of these iterators, see https://github.com/nikic/iter
-
-## Log
-
-The LogPlugin has moved to https://github.com/guzzle/log-subscriber. The
-`Guzzle\Log` namespace has been removed. Guzzle now relies on
-`Psr\Log\LoggerInterface` for all logging. The MessageFormatter class has been
-moved to `GuzzleHttp\Subscriber\Log\Formatter`.
-
-## Parser
-
-The `Guzzle\Parser` namespace has been removed. This was previously used to
-make it possible to plug in custom parsers for cookies, messages, URI
-templates, and URLs; however, this level of complexity is not needed in Guzzle
-so it has been removed.
-
-- Cookie: Cookie parsing logic has been moved to
-  `GuzzleHttp\Cookie\SetCookie::fromString`.
-- Message: Message parsing logic for both requests and responses has been moved
-  to `GuzzleHttp\Message\MessageFactory::fromMessage`. Message parsing is only
-  used in debugging or deserializing messages, so it doesn't make sense for
-  Guzzle as a library to add this level of complexity to parsing messages.
-- UriTemplate: URI template parsing has been moved to
-  `GuzzleHttp\UriTemplate`. The Guzzle library will automatically use the PECL
-  URI template library if it is installed.
-- Url: URL parsing is now performed in `GuzzleHttp\Url::fromString` (previously
-  it was `Guzzle\Http\Url::factory()`). If custom URL parsing is necessary,
-  then developers are free to subclass `GuzzleHttp\Url`.
-
-## Plugin
-
-The `Guzzle\Plugin` namespace has been renamed to `GuzzleHttp\Subscriber`.
-Several plugins are shipping with the core Guzzle library under this namespace.
-
-- `GuzzleHttp\Subscriber\Cookie`: Replaces the old CookiePlugin. Cookie jar
-  code has moved to `GuzzleHttp\Cookie`.
-- `GuzzleHttp\Subscriber\History`: Replaces the old HistoryPlugin.
-- `GuzzleHttp\Subscriber\HttpError`: Throws errors when a bad HTTP response is
-  received.
-- `GuzzleHttp\Subscriber\Mock`: Replaces the old MockPlugin.
-- `GuzzleHttp\Subscriber\Prepare`: Prepares the body of a request just before
-  sending. This subscriber is attached to all requests by default.
-- `GuzzleHttp\Subscriber\Redirect`: Replaces the RedirectPlugin.
-
-The following plugins have been removed (third-parties are free to re-implement
-these if needed):
-
-- `GuzzleHttp\Plugin\Async` has been removed.
-- `GuzzleHttp\Plugin\CurlAuth` has been removed.
-- `GuzzleHttp\Plugin\ErrorResponse\ErrorResponsePlugin` has been removed. This
-  functionality should instead be implemented with event listeners that occur
-  after normal response parsing occurs in the guzzle/command package.
-
-The following plugins are not part of the core Guzzle package, but are provided
-in separate repositories:
-
-- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be muchs simpler
-  to build custom retry policies using simple functions rather than various
-  chained classes. See: https://github.com/guzzle/retry-subscriber
-- `Guzzle\Http\Plugin\Cache\CachePlugin` has moved to
-  https://github.com/guzzle/cache-subscriber
-- `Guzzle\Http\Plugin\Log\LogPlugin` has moved to
-  https://github.com/guzzle/log-subscriber
-- `Guzzle\Http\Plugin\Md5\Md5Plugin` has moved to
-  https://github.com/guzzle/message-integrity-subscriber
-- `Guzzle\Http\Plugin\Mock\MockPlugin` has moved to
-  `GuzzleHttp\Subscriber\MockSubscriber`.
-- `Guzzle\Http\Plugin\Oauth\OauthPlugin` has moved to
-  https://github.com/guzzle/oauth-subscriber
-
-## Service
-
-The service description layer of Guzzle has moved into two separate packages:
-
-- http://github.com/guzzle/command Provides a high level abstraction over web
-  services by representing web service operations using commands.
-- http://github.com/guzzle/guzzle-services Provides an implementation of
-  guzzle/command that provides request serialization and response parsing using
-  Guzzle service descriptions.
-
-## Stream
-
-Stream have moved to a separate package available at
-https://github.com/guzzle/streams.
-
-`Guzzle\Stream\StreamInterface` has been given a large update to cleanly take
-on the responsibilities of `Guzzle\Http\EntityBody` and
-`Guzzle\Http\EntityBodyInterface` now that they have been removed. The number
-of methods implemented by the `StreamInterface` has been drastically reduced to
-allow developers to more easily extend and decorate stream behavior.
-
-## Removed methods from StreamInterface
-
-- `getStream` and `setStream` have been removed to better encapsulate streams.
-- `getMetadata` and `setMetadata` have been removed in favor of
-  `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `getWrapper`, `getWrapperData`, `getStreamType`, and `getUri` have all been
-  removed. This data is accessible when
-  using streams that implement `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `rewind` has been removed. Use `seek(0)` for a similar behavior.
-
-## Renamed methods
-
-- `detachStream` has been renamed to `detach`.
-- `feof` has been renamed to `eof`.
-- `ftell` has been renamed to `tell`.
-- `readLine` has moved from an instance method to a static class method of
-  `GuzzleHttp\Stream\Stream`.
-
-## Metadata streams
-
-`GuzzleHttp\Stream\MetadataStreamInterface` has been added to denote streams
-that contain additional metadata accessible via `getMetadata()`.
-`GuzzleHttp\Stream\StreamInterface::getMetadata` and
-`GuzzleHttp\Stream\StreamInterface::setMetadata` have been removed.
-
-## StreamRequestFactory
-
-The entire concept of the StreamRequestFactory has been removed. The way this
-was used in Guzzle 3 broke the actual interface of sending streaming requests
-(instead of getting back a Response, you got a StreamInterface). Streeaming
-PHP requests are now implemented throught the `GuzzleHttp\Adapter\StreamAdapter`.
-
-3.6 to 3.7
-----------
-
-### Deprecations
-
-- You can now enable E_USER_DEPRECATED warnings to see if you are using any deprecated methods.:
-
-```php
-\Guzzle\Common\Version::$emitWarnings = true;
-```
-
-The following APIs and options have been marked as deprecated:
-
-- Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use `$request->getResponseBody()->isRepeatable()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-- Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-- Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-- Marked `Guzzle\Common\Collection::inject()` as deprecated.
-- Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use
-  `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));` or
-  `$client->setDefaultOption('auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));`
-
-3.7 introduces `request.options` as a parameter for a client configuration and as an optional argument to all creational
-request methods. When paired with a client's configuration settings, these options allow you to specify default settings
-for various aspects of a request. Because these options make other previous configuration options redundant, several
-configuration options and methods of a client and AbstractCommand have been deprecated.
-
-- Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use `$client->getDefaultOption('headers')`.
-- Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use `$client->setDefaultOption('headers/{header_name}', 'value')`.
-- Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use `$client->setDefaultOption('params/{param_name}', 'value')`
-- Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand. These will work through Guzzle 4.0
-
-        $command = $client->getCommand('foo', array(
-            'command.headers' => array('Test' => '123'),
-            'command.response_body' => '/path/to/file'
-        ));
-
-        // Should be changed to:
-
-        $command = $client->getCommand('foo', array(
-            'command.request_options' => array(
-                'headers' => array('Test' => '123'),
-                'save_as' => '/path/to/file'
-            )
-        ));
-
-### Interface changes
-
-Additions and changes (you will need to update any implementations or subclasses you may have created):
-
-- Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-- Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-- Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-- Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-- Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-- Added `Guzzle\Stream\StreamInterface::isRepeatable`
-- Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-
-The following methods were removed from interfaces. All of these methods are still available in the concrete classes
-that implement them, but you should update your code to use alternative methods:
-
-- Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  `$client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  `$client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))` or
-  `$client->setDefaultOption('headers/{header_name}', 'value')`. or
-  `$client->setDefaultOption('headers', array('header_name' => 'value'))`.
-- Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use `$client->getConfig()->getPath('request.options/headers')`.
-- Removed `Guzzle\Http\ClientInterface::expandTemplate()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::setRequestFactory()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::getCurlMulti()`. This is a very specific implementation detail.
-- Removed `Guzzle\Http\Message\RequestInterface::canCache`. Use the CachePlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`. Use the HistoryPlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::isRedirect`. Use the HistoryPlugin.
-
-### Cache plugin breaking changes
-
-- CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-- Always setting X-cache headers on cached responses
-- Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-- `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-- `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-- `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-- Added `CacheStorageInterface::purge($url)`
-- `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-- Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-3.5 to 3.6
-----------
-
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-  For example, setHeader() first removes the header using unset on a HeaderCollection and then calls addHeader().
-  Keeping the Host header and URL host in sync is now handled by overriding the addHeader method in Request.
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Moved getLinks() from Response to just be used on a Link header object.
-
-If you previously relied on Guzzle\Http\Message\Header::raw(), then you will need to update your code to use the
-HeaderInterface (e.g. toArray(), getAll(), etc.).
-
-### Interface changes
-
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-
-### Removed deprecated functions
-
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-
-### Deprecations
-
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-
-### Other changes
-
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-
-3.3 to 3.4
-----------
-
-Base URLs of a client now follow the rules of http://tools.ietf.org/html/rfc3986#section-5.2.2 when merging URLs.
-
-3.2 to 3.3
-----------
-
-### Response::getEtag() quote stripping removed
-
-`Guzzle\Http\Message\Response::getEtag()` no longer strips quotes around the ETag response header
-
-### Removed `Guzzle\Http\Utils`
-
-The `Guzzle\Http\Utils` class was removed. This class was only used for testing.
-
-### Stream wrapper and type
-
-`Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getStreamType()` are no longer converted to lowercase.
-
-### curl.emit_io became emit_io
-
-Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using the
-'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-
-3.1 to 3.2
-----------
-
-### CurlMulti is no longer reused globally
-
-Before 3.2, the same CurlMulti object was reused globally for each client. This can cause issue where plugins added
-to a single client can pollute requests dispatched from other clients.
-
-If you still wish to reuse the same CurlMulti object with each client, then you can add a listener to the
-ServiceBuilder's `service_builder.create_client` event to inject a custom CurlMulti object into each client as it is
-created.
-
-```php
-$multi = new Guzzle\Http\Curl\CurlMulti();
-$builder = Guzzle\Service\Builder\ServiceBuilder::factory('/path/to/config.json');
-$builder->addListener('service_builder.create_client', function ($event) use ($multi) {
-    $event['client']->setCurlMulti($multi);
-}
-});
-```
-
-### No default path
-
-URLs no longer have a default path value of '/' if no path was specified.
-
-Before:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com/
-```
-
-After:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com
-```
-
-### Less verbose BadResponseException
-
-The exception message for `Guzzle\Http\Exception\BadResponseException` no longer contains the full HTTP request and
-response information. You can, however, get access to the request and response object by calling `getRequest()` or
-`getResponse()` on the exception object.
-
-### Query parameter aggregation
-
-Multi-valued query parameters are no longer aggregated using a callback function. `Guzzle\Http\Query` now has a
-setAggregator() method that accepts a `Guzzle\Http\QueryAggregator\QueryAggregatorInterface` object. This object is
-responsible for handling the aggregation of multi-valued query string variables into a flattened hash.
-
-2.8 to 3.x
-----------
-
-### Guzzle\Service\Inspector
-
-Change `\Guzzle\Service\Inspector::fromConfig` to `\Guzzle\Common\Collection::fromConfig`
-
-**Before**
-
-```php
-use Guzzle\Service\Inspector;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Inspector::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-**After**
-
-```php
-use Guzzle\Common\Collection;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Collection::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-### Convert XML Service Descriptions to JSON
-
-**Before**
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<client>
-    <commands>
-        <!-- Groups -->
-        <command name="list_groups" method="GET" uri="groups.json">
-            <doc>Get a list of groups</doc>
-        </command>
-        <command name="search_groups" method="GET" uri='search.json?query="{{query}} type:group"'>
-            <doc>Uses a search query to get a list of groups</doc>
-            <param name="query" type="string" required="true" />
-        </command>
-        <command name="create_group" method="POST" uri="groups.json">
-            <doc>Create a group</doc>
-            <param name="data" type="array" location="body" filters="json_encode" doc="Group JSON"/>
-            <param name="Content-Type" location="header" static="application/json"/>
-        </command>
-        <command name="delete_group" method="DELETE" uri="groups/{{id}}.json">
-            <doc>Delete a group by ID</doc>
-            <param name="id" type="integer" required="true"/>
-        </command>
-        <command name="get_group" method="GET" uri="groups/{{id}}.json">
-            <param name="id" type="integer" required="true"/>
-        </command>
-        <command name="update_group" method="PUT" uri="groups/{{id}}.json">
-            <doc>Update a group</doc>
-            <param name="id" type="integer" required="true"/>
-            <param name="data" type="array" location="body" filters="json_encode" doc="Group JSON"/>
-            <param name="Content-Type" location="header" static="application/json"/>
-        </command>
-    </commands>
-</client>
-```
-
-**After**
-
-```json
-{
-    "name":       "Zendesk REST API v2",
-    "apiVersion": "2012-12-31",
-    "description":"Provides access to Zendesk views, groups, tickets, ticket fields, and users",
-    "operations": {
-        "list_groups":  {
-            "httpMethod":"GET",
-            "uri":       "groups.json",
-            "summary":   "Get a list of groups"
-        },
-        "search_groups":{
-            "httpMethod":"GET",
-            "uri":       "search.json?query=\"{query} type:group\"",
-            "summary":   "Uses a search query to get a list of groups",
-            "parameters":{
-                "query":{
-                    "location":   "uri",
-                    "description":"Zendesk Search Query",
-                    "type":       "string",
-                    "required":   true
-                }
-            }
-        },
-        "create_group": {
-            "httpMethod":"POST",
-            "uri":       "groups.json",
-            "summary":   "Create a group",
-            "parameters":{
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        },
-        "delete_group": {
-            "httpMethod":"DELETE",
-            "uri":       "groups/{id}.json",
-            "summary":   "Delete a group",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to delete by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "get_group":    {
-            "httpMethod":"GET",
-            "uri":       "groups/{id}.json",
-            "summary":   "Get a ticket",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to get by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "update_group": {
-            "httpMethod":"PUT",
-            "uri":       "groups/{id}.json",
-            "summary":   "Update a group",
-            "parameters":{
-                "id":          {
-                    "location":   "uri",
-                    "description":"Group to update by ID",
-                    "type":       "integer",
-                    "required":   true
-                },
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        }
-}
-```
-
-### Guzzle\Service\Description\ServiceDescription
-
-Commands are now called Operations
-
-**Before**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getCommands();     // @returns ApiCommandInterface[]
-$sd->hasCommand($name);
-$sd->getCommand($name); // @returns ApiCommandInterface|null
-$sd->addCommand($command); // @param ApiCommandInterface $command
-```
-
-**After**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getOperations();           // @returns OperationInterface[]
-$sd->hasOperation($name);
-$sd->getOperation($name);       // @returns OperationInterface|null
-$sd->addOperation($operation);  // @param OperationInterface $operation
-```
-
-### Guzzle\Common\Inflection\Inflector
-
-Namespace is now `Guzzle\Inflection\Inflector`
-
-### Guzzle\Http\Plugin
-
-Namespace is now `Guzzle\Plugin`. Many other changes occur within this namespace and are detailed in their own sections below.
-
-### Guzzle\Http\Plugin\LogPlugin and Guzzle\Common\Log
-
-Now `Guzzle\Plugin\Log\LogPlugin` and `Guzzle\Log` respectively.
-
-**Before**
-
-```php
-use Guzzle\Common\Log\ClosureLogAdapter;
-use Guzzle\Http\Plugin\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $verbosity is an integer indicating desired message verbosity level
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $verbosity = LogPlugin::LOG_VERBOSE);
-```
-
-**After**
-
-```php
-use Guzzle\Log\ClosureLogAdapter;
-use Guzzle\Log\MessageFormatter;
-use Guzzle\Plugin\Log\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $format is a string indicating desired message format -- @see MessageFormatter
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $format = MessageFormatter::DEBUG_FORMAT);
-```
-
-### Guzzle\Http\Plugin\CurlAuthPlugin
-
-Now `Guzzle\Plugin\CurlAuth\CurlAuthPlugin`.
-
-### Guzzle\Http\Plugin\ExponentialBackoffPlugin
-
-Now `Guzzle\Plugin\Backoff\BackoffPlugin`, and other changes.
-
-**Before**
-
-```php
-use Guzzle\Http\Plugin\ExponentialBackoffPlugin;
-
-$backoffPlugin = new ExponentialBackoffPlugin($maxRetries, array_merge(
-        ExponentialBackoffPlugin::getDefaultFailureCodes(), array(429)
-    ));
-
-$client->addSubscriber($backoffPlugin);
-```
-
-**After**
-
-```php
-use Guzzle\Plugin\Backoff\BackoffPlugin;
-use Guzzle\Plugin\Backoff\HttpBackoffStrategy;
-
-// Use convenient factory method instead -- see implementation for ideas of what
-// you can do with chaining backoff strategies
-$backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, array_merge(
-        HttpBackoffStrategy::getDefaultFailureCodes(), array(429)
-    ));
-$client->addSubscriber($backoffPlugin);
-```
-
-### Known Issues
-
-#### [BUG] Accept-Encoding header behavior changed unintentionally.
-
-(See #217) (Fixed in 09daeb8c666fb44499a0646d655a8ae36456575e)
-
-In version 2.8 setting the `Accept-Encoding` header would set the CURLOPT_ENCODING option, which permitted cURL to
-properly handle gzip/deflate compressed responses from the server. In versions affected by this bug this does not happen.
-See issue #217 for a workaround, or use a version containing the fix.
diff --git a/vendor/guzzlehttp/guzzle/composer.json b/vendor/guzzlehttp/guzzle/composer.json
deleted file mode 100644
index 1f8b070..0000000
--- a/vendor/guzzlehttp/guzzle/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "guzzlehttp/guzzle",
-    "type": "library",
-    "description": "Guzzle is a PHP HTTP client library",
-    "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
-    "homepage": "http://guzzlephp.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.0",
-        "guzzlehttp/psr7": "~1.1",
-        "guzzlehttp/promises": "~1.0"
-    },
-    "require-dev": {
-        "ext-curl": "*",
-        "phpunit/phpunit": "~4.0",
-        "psr/log": "~1.0"
-    },
-    "autoload": {
-        "files": ["src/functions_include.php"],
-        "psr-4": {
-            "GuzzleHttp\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\": "tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.1-dev"
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Client.php b/vendor/guzzlehttp/guzzle/src/Client.php
deleted file mode 100644
index 2e86ece..0000000
--- a/vendor/guzzlehttp/guzzle/src/Client.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Promise;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\UriInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * @method ResponseInterface get($uri, array $options = [])
- * @method ResponseInterface head($uri, array $options = [])
- * @method ResponseInterface put($uri, array $options = [])
- * @method ResponseInterface post($uri, array $options = [])
- * @method ResponseInterface patch($uri, array $options = [])
- * @method ResponseInterface delete($uri, array $options = [])
- * @method Promise\PromiseInterface getAsync($uri, array $options = [])
- * @method Promise\PromiseInterface headAsync($uri, array $options = [])
- * @method Promise\PromiseInterface putAsync($uri, array $options = [])
- * @method Promise\PromiseInterface postAsync($uri, array $options = [])
- * @method Promise\PromiseInterface patchAsync($uri, array $options = [])
- * @method Promise\PromiseInterface deleteAsync($uri, array $options = [])
- */
-class Client implements ClientInterface
-{
-    /** @var array Default request options */
-    private $config;
-
-    /**
-     * Clients accept an array of constructor parameters.
-     *
-     * Here's an example of creating a client using a base_uri and an array of
-     * default request options to apply to each request:
-     *
-     *     $client = new Client([
-     *         'base_uri'        => 'http://www.foo.com/1.0/',
-     *         'timeout'         => 0,
-     *         'allow_redirects' => false,
-     *         'proxy'           => '192.168.16.1:10'
-     *     ]);
-     *
-     * Client configuration settings include the following options:
-     *
-     * - handler: (callable) Function that transfers HTTP requests over the
-     *   wire. The function is called with a Psr7\Http\Message\RequestInterface
-     *   and array of transfer options, and must return a
-     *   GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
-     *   Psr7\Http\Message\ResponseInterface on success. "handler" is a
-     *   constructor only option that cannot be overridden in per/request
-     *   options. If no handler is provided, a default handler will be created
-     *   that enables all of the request options below by attaching all of the
-     *   default middleware to the handler.
-     * - base_uri: (string|UriInterface) Base URI of the client that is merged
-     *   into relative URIs. Can be a string or instance of UriInterface.
-     * - **: any request option
-     *
-     * @param array $config Client configuration settings.
-     *
-     * @see \GuzzleHttp\RequestOptions for a list of available request options.
-     */
-    public function __construct(array $config = [])
-    {
-        if (!isset($config['handler'])) {
-            $config['handler'] = HandlerStack::create();
-        }
-
-        // Convert the base_uri to a UriInterface
-        if (isset($config['base_uri'])) {
-            $config['base_uri'] = Psr7\uri_for($config['base_uri']);
-        }
-
-        $this->configureDefaults($config);
-    }
-
-    public function __call($method, $args)
-    {
-        if (count($args) < 1) {
-            throw new \InvalidArgumentException('Magic request methods require a URI and optional options array');
-        }
-
-        $uri = $args[0];
-        $opts = isset($args[1]) ? $args[1] : [];
-
-        return substr($method, -5) === 'Async'
-            ? $this->requestAsync(substr($method, 0, -5), $uri, $opts)
-            : $this->request($method, $uri, $opts);
-    }
-
-    public function sendAsync(RequestInterface $request, array $options = [])
-    {
-        // Merge the base URI into the request URI if needed.
-        $options = $this->prepareDefaults($options);
-
-        return $this->transfer(
-            $request->withUri($this->buildUri($request->getUri(), $options)),
-            $options
-        );
-    }
-
-    public function send(RequestInterface $request, array $options = [])
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-        return $this->sendAsync($request, $options)->wait();
-    }
-
-    public function requestAsync($method, $uri = null, array $options = [])
-    {
-        $options = $this->prepareDefaults($options);
-        // Remove request modifying parameter because it can be done up-front.
-        $headers = isset($options['headers']) ? $options['headers'] : [];
-        $body = isset($options['body']) ? $options['body'] : null;
-        $version = isset($options['version']) ? $options['version'] : '1.1';
-        // Merge the URI into the base URI.
-        $uri = $this->buildUri($uri, $options);
-        if (is_array($body)) {
-            $this->invalidBody();
-        }
-        $request = new Psr7\Request($method, $uri, $headers, $body, $version);
-        // Remove the option so that they are not doubly-applied.
-        unset($options['headers'], $options['body'], $options['version']);
-
-        return $this->transfer($request, $options);
-    }
-
-    public function request($method, $uri = null, array $options = [])
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-        return $this->requestAsync($method, $uri, $options)->wait();
-    }
-
-    public function getConfig($option = null)
-    {
-        return $option === null
-            ? $this->config
-            : (isset($this->config[$option]) ? $this->config[$option] : null);
-    }
-
-    private function buildUri($uri, array $config)
-    {
-        if (!isset($config['base_uri'])) {
-            return $uri instanceof UriInterface ? $uri : new Psr7\Uri($uri);
-        }
-
-        return Psr7\Uri::resolve(Psr7\uri_for($config['base_uri']), $uri);
-    }
-
-    /**
-     * Configures the default options for a client.
-     *
-     * @param array $config
-     */
-    private function configureDefaults(array $config)
-    {
-        $defaults = [
-            'allow_redirects' => RedirectMiddleware::$defaultSettings,
-            'http_errors'     => true,
-            'decode_content'  => true,
-            'verify'          => true,
-            'cookies'         => false
-        ];
-
-        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set
-        if ($proxy = getenv('HTTP_PROXY')) {
-            $defaults['proxy']['http'] = $proxy;
-        }
-
-        if ($proxy = getenv('HTTPS_PROXY')) {
-            $defaults['proxy']['https'] = $proxy;
-        }
-
-        if ($noProxy = getenv('NO_PROXY')) {
-            $cleanedNoProxy = str_replace(' ', '', $noProxy);
-            $defaults['proxy']['no'] = explode(',', $cleanedNoProxy);
-        }
-        
-        $this->config = $config + $defaults;
-
-        if (!empty($config['cookies']) && $config['cookies'] === true) {
-            $this->config['cookies'] = new CookieJar();
-        }
-
-        // Add the default user-agent header.
-        if (!isset($this->config['headers'])) {
-            $this->config['headers'] = ['User-Agent' => default_user_agent()];
-        } else {
-            // Add the User-Agent header if one was not already set.
-            foreach (array_keys($this->config['headers']) as $name) {
-                if (strtolower($name) === 'user-agent') {
-                    return;
-                }
-            }
-            $this->config['headers']['User-Agent'] = default_user_agent();
-        }
-    }
-
-    /**
-     * Merges default options into the array.
-     *
-     * @param array $options Options to modify by reference
-     *
-     * @return array
-     */
-    private function prepareDefaults($options)
-    {
-        $defaults = $this->config;
-
-        if (!empty($defaults['headers'])) {
-            // Default headers are only added if they are not present.
-            $defaults['_conditional'] = $defaults['headers'];
-            unset($defaults['headers']);
-        }
-
-        // Special handling for headers is required as they are added as
-        // conditional headers and as headers passed to a request ctor.
-        if (array_key_exists('headers', $options)) {
-            // Allows default headers to be unset.
-            if ($options['headers'] === null) {
-                $defaults['_conditional'] = null;
-                unset($options['headers']);
-            } elseif (!is_array($options['headers'])) {
-                throw new \InvalidArgumentException('headers must be an array');
-            }
-        }
-
-        // Shallow merge defaults underneath options.
-        $result = $options + $defaults;
-
-        // Remove null values.
-        foreach ($result as $k => $v) {
-            if ($v === null) {
-                unset($result[$k]);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Transfers the given request and applies request options.
-     *
-     * The URI of the request is not modified and the request options are used
-     * as-is without merging in default options.
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return Promise\PromiseInterface
-     */
-    private function transfer(RequestInterface $request, array $options)
-    {
-        // save_to -> sink
-        if (isset($options['save_to'])) {
-            $options['sink'] = $options['save_to'];
-            unset($options['save_to']);
-        }
-
-        // exceptions -> http_error
-        if (isset($options['exceptions'])) {
-            $options['http_errors'] = $options['exceptions'];
-            unset($options['exceptions']);
-        }
-
-        $request = $this->applyOptions($request, $options);
-        $handler = $options['handler'];
-
-        try {
-            return Promise\promise_for($handler($request, $options));
-        } catch (\Exception $e) {
-            return Promise\rejection_for($e);
-        }
-    }
-
-    /**
-     * Applies the array of request options to a request.
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return RequestInterface
-     */
-    private function applyOptions(RequestInterface $request, array &$options)
-    {
-        $modify = [];
-
-        if (isset($options['form_params'])) {
-            if (isset($options['multipart'])) {
-                throw new \InvalidArgumentException('You cannot use '
-                    . 'form_params and multipart at the same time. Use the '
-                    . 'form_params option if you want to send application/'
-                    . 'x-www-form-urlencoded requests, and the multipart '
-                    . 'option to send multipart/form-data requests.');
-            }
-            $options['body'] = http_build_query($options['form_params'], null, '&');
-            unset($options['form_params']);
-            $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-
-        if (isset($options['multipart'])) {
-            $elements = $options['multipart'];
-            unset($options['multipart']);
-            $options['body'] = new Psr7\MultipartStream($elements);
-        }
-
-        if (!empty($options['decode_content'])
-            && $options['decode_content'] !== true
-        ) {
-            $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
-        }
-
-        if (isset($options['headers'])) {
-            if (isset($modify['set_headers'])) {
-                $modify['set_headers'] = $options['headers'] + $modify['set_headers'];
-            } else {
-                $modify['set_headers'] = $options['headers'];
-            }
-            unset($options['headers']);
-        }
-
-        if (isset($options['body'])) {
-            if (is_array($options['body'])) {
-                $this->invalidBody();
-            }
-            $modify['body'] = Psr7\stream_for($options['body']);
-            unset($options['body']);
-        }
-
-        if (!empty($options['auth'])) {
-            $value = $options['auth'];
-            $type = is_array($value)
-                ? (isset($value[2]) ? strtolower($value[2]) : 'basic')
-                : $value;
-            $config['auth'] = $value;
-            switch (strtolower($type)) {
-                case 'basic':
-                    $modify['set_headers']['Authorization'] = 'Basic '
-                        . base64_encode("$value[0]:$value[1]");
-                    break;
-                case 'digest':
-                    // @todo: Do not rely on curl
-                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
-                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
-                    break;
-            }
-        }
-
-        if (isset($options['query'])) {
-            $value = $options['query'];
-            if (is_array($value)) {
-                $value = http_build_query($value, null, '&', PHP_QUERY_RFC3986);
-            }
-            if (!is_string($value)) {
-                throw new \InvalidArgumentException('query must be a string or array');
-            }
-            $modify['query'] = $value;
-            unset($options['query']);
-        }
-
-        if (isset($options['json'])) {
-            $modify['body'] = Psr7\stream_for(json_encode($options['json']));
-            $options['_conditional']['Content-Type'] = 'application/json';
-            unset($options['json']);
-        }
-
-        $request = Psr7\modify_request($request, $modify);
-        if ($request->getBody() instanceof Psr7\MultipartStream) {
-            // Use a multipart/form-data POST if a Content-Type is not set.
-            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
-                . $request->getBody()->getBoundary();
-        }
-
-        // Merge in conditional headers if they are not present.
-        if (isset($options['_conditional'])) {
-            // Build up the changes so it's in a single clone of the message.
-            $modify = [];
-            foreach ($options['_conditional'] as $k => $v) {
-                if (!$request->hasHeader($k)) {
-                    $modify['set_headers'][$k] = $v;
-                }
-            }
-            $request = Psr7\modify_request($request, $modify);
-            // Don't pass this internal value along to middleware/handlers.
-            unset($options['_conditional']);
-        }
-
-        return $request;
-    }
-
-    private function invalidBody()
-    {
-        throw new \InvalidArgumentException('Passing in the "body" request '
-            . 'option as an array to send a POST request has been deprecated. '
-            . 'Please use the "form_params" request option to send a '
-            . 'application/x-www-form-urlencoded request, or a the "multipart" '
-            . 'request option to send a multipart/form-data request.');
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/vendor/guzzlehttp/guzzle/src/ClientInterface.php
deleted file mode 100644
index b5b2306..0000000
--- a/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Exception\GuzzleException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Client interface for sending HTTP requests.
- */
-interface ClientInterface
-{
-    const VERSION = '6.1.0';
-
-    /**
-     * Send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     *
-     * @return ResponseInterface
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = []);
-
-    /**
-     * Asynchronously send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     *
-     * @return PromiseInterface
-     */
-    public function sendAsync(RequestInterface $request, array $options = []);
-
-    /**
-     * Create and send an HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well.
-     *
-     * @param string              $method  HTTP method
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws GuzzleException
-     */
-    public function request($method, $uri, array $options = []);
-
-    /**
-     * Create and send an asynchronous HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well. Use an array to provide a URL
-     * template and additional variables to use in the URL template expansion.
-     *
-     * @param string              $method  HTTP method
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @return PromiseInterface
-     */
-    public function requestAsync($method, $uri, array $options = []);
-
-    /**
-     * Get a client configuration option.
-     *
-     * These options include default request options of the client, a "handler"
-     * (if utilized by the concrete client), and a "base_uri" if utilized by
-     * the concrete client.
-     *
-     * @param string|null $option The config option to retrieve.
-     *
-     * @return mixed
-     */
-    public function getConfig($option = null);
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
deleted file mode 100644
index ea60068..0000000
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Cookie jar that stores cookies an an array
- */
-class CookieJar implements CookieJarInterface
-{
-    /** @var SetCookie[] Loaded cookie data */
-    private $cookies = [];
-
-    /** @var bool */
-    private $strictMode;
-
-    /**
-     * @param bool $strictMode   Set to true to throw exceptions when invalid
-     *                           cookies are added to the cookie jar.
-     * @param array $cookieArray Array of SetCookie objects or a hash of
-     *                           arrays that can be used with the SetCookie
-     *                           constructor
-     */
-    public function __construct($strictMode = false, $cookieArray = [])
-    {
-        $this->strictMode = $strictMode;
-
-        foreach ($cookieArray as $cookie) {
-            if (!($cookie instanceof SetCookie)) {
-                $cookie = new SetCookie($cookie);
-            }
-            $this->setCookie($cookie);
-        }
-    }
-
-    /**
-     * Create a new Cookie jar from an associative array and domain.
-     *
-     * @param array  $cookies Cookies to create the jar from
-     * @param string $domain  Domain to set the cookies to
-     *
-     * @return self
-     */
-    public static function fromArray(array $cookies, $domain)
-    {
-        $cookieJar = new self();
-        foreach ($cookies as $name => $value) {
-            $cookieJar->setCookie(new SetCookie([
-                'Domain'  => $domain,
-                'Name'    => $name,
-                'Value'   => $value,
-                'Discard' => true
-            ]));
-        }
-
-        return $cookieJar;
-    }
-
-    /**
-     * Quote the cookie value if it is not already quoted and it contains
-     * problematic characters.
-     *
-     * @param string $value Value that may or may not need to be quoted
-     *
-     * @return string
-     */
-    public static function getCookieValue($value)
-    {
-        if (substr($value, 0, 1) !== '"' &&
-            substr($value, -1, 1) !== '"' &&
-            strpbrk($value, ';,=')
-        ) {
-            $value = '"' . $value . '"';
-        }
-
-        return $value;
-    }
-
-    /**
-     * Evaluate if this cookie should be persisted to storage
-     * that survives between requests.
-     *
-     * @param SetCookie $cookie Being evaluated.
-     * @param bool $allowSessionCookies If we should presist session cookies
-     * @return bool
-     */
-    public static function shouldPersist(
-        SetCookie $cookie,
-        $allowSessionCookies = false
-    ) {
-        if ($cookie->getExpires() || $allowSessionCookies) {
-            if (!$cookie->getDiscard()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function toArray()
-    {
-        return array_map(function (SetCookie $cookie) {
-            return $cookie->toArray();
-        }, $this->getIterator()->getArrayCopy());
-    }
-
-    public function clear($domain = null, $path = null, $name = null)
-    {
-        if (!$domain) {
-            $this->cookies = [];
-            return;
-        } elseif (!$path) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !$cookie->matchesDomain($domain);
-                }
-            );
-        } elseif (!$name) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !($cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        } else {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain, $name) {
-                    return !($cookie->getName() == $name &&
-                        $cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        }
-    }
-
-    public function clearSessionCookies()
-    {
-        $this->cookies = array_filter(
-            $this->cookies,
-            function (SetCookie $cookie) {
-                return !$cookie->getDiscard() && $cookie->getExpires();
-            }
-        );
-    }
-
-    public function setCookie(SetCookie $cookie)
-    {
-        // If the name string is empty (but not 0), ignore the set-cookie
-        // string entirely.
-        $name = $cookie->getName();
-        if (!$name && $name !== '0') {
-            return false;
-        }
-
-        // Only allow cookies with set and valid domain, name, value
-        $result = $cookie->validate();
-        if ($result !== true) {
-            if ($this->strictMode) {
-                throw new \RuntimeException('Invalid cookie: ' . $result);
-            } else {
-                $this->removeCookieIfEmpty($cookie);
-                return false;
-            }
-        }
-
-        // Resolve conflicts with previously set cookies
-        foreach ($this->cookies as $i => $c) {
-
-            // Two cookies are identical, when their path, and domain are
-            // identical.
-            if ($c->getPath() != $cookie->getPath() ||
-                $c->getDomain() != $cookie->getDomain() ||
-                $c->getName() != $cookie->getName()
-            ) {
-                continue;
-            }
-
-            // The previously set cookie is a discard cookie and this one is
-            // not so allow the new cookie to be set
-            if (!$cookie->getDiscard() && $c->getDiscard()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the new cookie's expiration is further into the future, then
-            // replace the old cookie
-            if ($cookie->getExpires() > $c->getExpires()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the value has changed, we better change it
-            if ($cookie->getValue() !== $c->getValue()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // The cookie exists, so no need to continue
-            return false;
-        }
-
-        $this->cookies[] = $cookie;
-
-        return true;
-    }
-
-    public function count()
-    {
-        return count($this->cookies);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator(array_values($this->cookies));
-    }
-
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    ) {
-        if ($cookieHeader = $response->getHeader('Set-Cookie')) {
-            foreach ($cookieHeader as $cookie) {
-                $sc = SetCookie::fromString($cookie);
-                if (!$sc->getDomain()) {
-                    $sc->setDomain($request->getUri()->getHost());
-                }
-                $this->setCookie($sc);
-            }
-        }
-    }
-
-    public function withCookieHeader(RequestInterface $request)
-    {
-        $values = [];
-        $uri = $request->getUri();
-        $scheme = $uri->getScheme();
-        $host = $uri->getHost();
-        $path = $uri->getPath() ?: '/';
-
-        foreach ($this->cookies as $cookie) {
-            if ($cookie->matchesPath($path) &&
-                $cookie->matchesDomain($host) &&
-                !$cookie->isExpired() &&
-                (!$cookie->getSecure() || $scheme == 'https')
-            ) {
-                $values[] = $cookie->getName() . '='
-                    . self::getCookieValue($cookie->getValue());
-            }
-        }
-
-        return $values
-            ? $request->withHeader('Cookie', implode('; ', $values))
-            : $request;
-    }
-
-    /**
-     * If a cookie already exists and the server asks to set it again with a
-     * null value, the cookie must be deleted.
-     *
-     * @param SetCookie $cookie
-     */
-    private function removeCookieIfEmpty(SetCookie $cookie)
-    {
-        $cookieValue = $cookie->getValue();
-        if ($cookieValue === null || $cookieValue === '') {
-            $this->clear(
-                $cookie->getDomain(),
-                $cookie->getPath(),
-                $cookie->getName()
-            );
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
deleted file mode 100644
index 2cf298a..0000000
--- a/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Stores HTTP cookies.
- *
- * It extracts cookies from HTTP requests, and returns them in HTTP responses.
- * CookieJarInterface instances automatically expire contained cookies when
- * necessary. Subclasses are also responsible for storing and retrieving
- * cookies from a file, database, etc.
- *
- * @link http://docs.python.org/2/library/cookielib.html Inspiration
- */
-interface CookieJarInterface extends \Countable, \IteratorAggregate
-{
-    /**
-     * Create a request with added cookie headers.
-     *
-     * If no matching cookies are found in the cookie jar, then no Cookie
-     * header is added to the request and the same request is returned.
-     *
-     * @param RequestInterface $request Request object to modify.
-     *
-     * @return RequestInterface returns the modified request.
-     */
-    public function withCookieHeader(RequestInterface $request);
-
-    /**
-     * Extract cookies from an HTTP response and store them in the CookieJar.
-     *
-     * @param RequestInterface  $request  Request that was sent
-     * @param ResponseInterface $response Response that was received
-     */
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    );
-
-    /**
-     * Sets a cookie in the cookie jar.
-     *
-     * @param SetCookie $cookie Cookie to set.
-     *
-     * @return bool Returns true on success or false on failure
-     */
-    public function setCookie(SetCookie $cookie);
-
-    /**
-     * Remove cookies currently held in the cookie jar.
-     *
-     * Invoking this method without arguments will empty the whole cookie jar.
-     * If given a $domain argument only cookies belonging to that domain will
-     * be removed. If given a $domain and $path argument, cookies belonging to
-     * the specified path within that domain are removed. If given all three
-     * arguments, then the cookie with the specified name, path and domain is
-     * removed.
-     *
-     * @param string $domain Clears cookies matching a domain
-     * @param string $path   Clears cookies matching a domain and path
-     * @param string $name   Clears cookies matching a domain, path, and name
-     *
-     * @return CookieJarInterface
-     */
-    public function clear($domain = null, $path = null, $name = null);
-
-    /**
-     * Discard all sessions cookies.
-     *
-     * Removes cookies that don't have an expire field or a have a discard
-     * field set to true. To be called when the user agent shuts down according
-     * to RFC 2965.
-     */
-    public function clearSessionCookies();
-
-    /**
-     * Converts the cookie jar to an array.
-     *
-     * @return array
-     */
-    public function toArray();
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
deleted file mode 100644
index c55bb34..0000000
--- a/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-/**
- * Persists non-session cookies using a JSON formatted file
- */
-class FileCookieJar extends CookieJar
-{
-    /** @var string filename */
-    private $filename;
-
-    /** @var bool Control whether to presist session cookies or not. */
-    private $storeSessionCookies;
-    
-    /**
-     * Create a new FileCookieJar object
-     *
-     * @param string $cookieFile        File to store the cookie data
-     * @param bool $storeSessionCookies Set to true to store session cookies
-     *                                  in the cookie jar.
-     *
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function __construct($cookieFile, $storeSessionCookies = false)
-    {
-        $this->filename = $cookieFile;
-        $this->storeSessionCookies = $storeSessionCookies;
-
-        if (file_exists($cookieFile)) {
-            $this->load($cookieFile);
-        }
-    }
-
-    /**
-     * Saves the file when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save($this->filename);
-    }
-
-    /**
-     * Saves the cookies to a file.
-     *
-     * @param string $filename File to save
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function save($filename)
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            /** @var SetCookie $cookie */
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        if (false === file_put_contents($filename, json_encode($json))) {
-            throw new \RuntimeException("Unable to save file {$filename}");
-        }
-    }
-
-    /**
-     * Load cookies from a JSON formatted file.
-     *
-     * Old cookies are kept unless overwritten by newly loaded ones.
-     *
-     * @param string $filename Cookie file to load.
-     * @throws \RuntimeException if the file cannot be loaded.
-     */
-    public function load($filename)
-    {
-        $json = file_get_contents($filename);
-        if (false === $json) {
-            throw new \RuntimeException("Unable to load file {$filename}");
-        }
-
-        $data = json_decode($json, true);
-        if (is_array($data)) {
-            foreach (json_decode($json, true) as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie file: {$filename}");
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
deleted file mode 100644
index d80c480..0000000
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-/**
- * Persists cookies in the client session
- */
-class SessionCookieJar extends CookieJar
-{
-    /** @var string session key */
-    private $sessionKey;
-    
-    /** @var bool Control whether to presist session cookies or not. */
-    private $storeSessionCookies;
-
-    /**
-     * Create a new SessionCookieJar object
-     *
-     * @param string $sessionKey        Session key name to store the cookie 
-     *                                  data in session
-     * @param bool $storeSessionCookies Set to true to store session cookies
-     *                                  in the cookie jar.
-     */
-    public function __construct($sessionKey, $storeSessionCookies = false)
-    {
-        $this->sessionKey = $sessionKey;
-        $this->storeSessionCookies = $storeSessionCookies;
-        $this->load();
-    }
-
-    /**
-     * Saves cookies to session when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save();
-    }
-
-    /**
-     * Save cookies to the client session
-     */
-    public function save()
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            /** @var SetCookie $cookie */
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        $_SESSION[$this->sessionKey] = json_encode($json);
-    }
-
-    /**
-     * Load the contents of the client session into the data array
-     */
-    protected function load()
-    {
-        $cookieJar = isset($_SESSION[$this->sessionKey])
-            ? $_SESSION[$this->sessionKey]
-            : null;
-
-        $data = json_decode($cookieJar, true);
-        if (is_array($data)) {
-            foreach ($data as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie data");
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
deleted file mode 100644
index acd654d..0000000
--- a/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ /dev/null
@@ -1,404 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-/**
- * Set-Cookie object
- */
-class SetCookie
-{
-    /** @var array */
-    private static $defaults = [
-        'Name'     => null,
-        'Value'    => null,
-        'Domain'   => null,
-        'Path'     => '/',
-        'Max-Age'  => null,
-        'Expires'  => null,
-        'Secure'   => false,
-        'Discard'  => false,
-        'HttpOnly' => false
-    ];
-
-    /** @var array Cookie data */
-    private $data;
-
-    /**
-     * Create a new SetCookie object from a string
-     *
-     * @param string $cookie Set-Cookie header string
-     *
-     * @return self
-     */
-    public static function fromString($cookie)
-    {
-        // Create the default return array
-        $data = self::$defaults;
-        // Explode the cookie string using a series of semicolons
-        $pieces = array_filter(array_map('trim', explode(';', $cookie)));
-        // The name of the cookie (first kvp) must include an equal sign.
-        if (empty($pieces) || !strpos($pieces[0], '=')) {
-            return new self($data);
-        }
-
-        // Add the cookie pieces into the parsed data array
-        foreach ($pieces as $part) {
-
-            $cookieParts = explode('=', $part, 2);
-            $key = trim($cookieParts[0]);
-            $value = isset($cookieParts[1])
-                ? trim($cookieParts[1], " \n\r\t\0\x0B")
-                : true;
-
-            // Only check for non-cookies when cookies have been found
-            if (empty($data['Name'])) {
-                $data['Name'] = $key;
-                $data['Value'] = $value;
-            } else {
-                foreach (array_keys(self::$defaults) as $search) {
-                    if (!strcasecmp($search, $key)) {
-                        $data[$search] = $value;
-                        continue 2;
-                    }
-                }
-                $data[$key] = $value;
-            }
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * @param array $data Array of cookie data provided by a Cookie parser
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = array_replace(self::$defaults, $data);
-        // Extract the Expires value and turn it into a UNIX timestamp if needed
-        if (!$this->getExpires() && $this->getMaxAge()) {
-            // Calculate the Expires date
-            $this->setExpires(time() + $this->getMaxAge());
-        } elseif ($this->getExpires() && !is_numeric($this->getExpires())) {
-            $this->setExpires($this->getExpires());
-        }
-    }
-
-    public function __toString()
-    {
-        $str = $this->data['Name'] . '=' . $this->data['Value'] . '; ';
-        foreach ($this->data as $k => $v) {
-            if ($k != 'Name' && $k != 'Value' && $v !== null && $v !== false) {
-                if ($k == 'Expires') {
-                    $str .= 'Expires=' . gmdate('D, d M Y H:i:s \G\M\T', $v) . '; ';
-                } else {
-                    $str .= ($v === true ? $k : "{$k}={$v}") . '; ';
-                }
-            }
-        }
-
-        return rtrim($str, '; ');
-    }
-
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get the cookie name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->data['Name'];
-    }
-
-    /**
-     * Set the cookie name
-     *
-     * @param string $name Cookie name
-     */
-    public function setName($name)
-    {
-        $this->data['Name'] = $name;
-    }
-
-    /**
-     * Get the cookie value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->data['Value'];
-    }
-
-    /**
-     * Set the cookie value
-     *
-     * @param string $value Cookie value
-     */
-    public function setValue($value)
-    {
-        $this->data['Value'] = $value;
-    }
-
-    /**
-     * Get the domain
-     *
-     * @return string|null
-     */
-    public function getDomain()
-    {
-        return $this->data['Domain'];
-    }
-
-    /**
-     * Set the domain of the cookie
-     *
-     * @param string $domain
-     */
-    public function setDomain($domain)
-    {
-        $this->data['Domain'] = $domain;
-    }
-
-    /**
-     * Get the path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->data['Path'];
-    }
-
-    /**
-     * Set the path of the cookie
-     *
-     * @param string $path Path of the cookie
-     */
-    public function setPath($path)
-    {
-        $this->data['Path'] = $path;
-    }
-
-    /**
-     * Maximum lifetime of the cookie in seconds
-     *
-     * @return int|null
-     */
-    public function getMaxAge()
-    {
-        return $this->data['Max-Age'];
-    }
-
-    /**
-     * Set the max-age of the cookie
-     *
-     * @param int $maxAge Max age of the cookie in seconds
-     */
-    public function setMaxAge($maxAge)
-    {
-        $this->data['Max-Age'] = $maxAge;
-    }
-
-    /**
-     * The UNIX timestamp when the cookie Expires
-     *
-     * @return mixed
-     */
-    public function getExpires()
-    {
-        return $this->data['Expires'];
-    }
-
-    /**
-     * Set the unix timestamp for which the cookie will expire
-     *
-     * @param int $timestamp Unix timestamp
-     */
-    public function setExpires($timestamp)
-    {
-        $this->data['Expires'] = is_numeric($timestamp)
-            ? (int) $timestamp
-            : strtotime($timestamp);
-    }
-
-    /**
-     * Get whether or not this is a secure cookie
-     *
-     * @return null|bool
-     */
-    public function getSecure()
-    {
-        return $this->data['Secure'];
-    }
-
-    /**
-     * Set whether or not the cookie is secure
-     *
-     * @param bool $secure Set to true or false if secure
-     */
-    public function setSecure($secure)
-    {
-        $this->data['Secure'] = $secure;
-    }
-
-    /**
-     * Get whether or not this is a session cookie
-     *
-     * @return null|bool
-     */
-    public function getDiscard()
-    {
-        return $this->data['Discard'];
-    }
-
-    /**
-     * Set whether or not this is a session cookie
-     *
-     * @param bool $discard Set to true or false if this is a session cookie
-     */
-    public function setDiscard($discard)
-    {
-        $this->data['Discard'] = $discard;
-    }
-
-    /**
-     * Get whether or not this is an HTTP only cookie
-     *
-     * @return bool
-     */
-    public function getHttpOnly()
-    {
-        return $this->data['HttpOnly'];
-    }
-
-    /**
-     * Set whether or not this is an HTTP only cookie
-     *
-     * @param bool $httpOnly Set to true or false if this is HTTP only
-     */
-    public function setHttpOnly($httpOnly)
-    {
-        $this->data['HttpOnly'] = $httpOnly;
-    }
-
-    /**
-     * Check if the cookie matches a path value.
-     *
-     * A request-path path-matches a given cookie-path if at least one of
-     * the following conditions holds:
-     *
-     * - The cookie-path and the request-path are identical.
-     * - The cookie-path is a prefix of the request-path, and the last
-     *   character of the cookie-path is %x2F ("/").
-     * - The cookie-path is a prefix of the request-path, and the first
-     *   character of the request-path that is not included in the cookie-
-     *   path is a %x2F ("/") character.
-     *
-     * @param string $requestPath Path to check against
-     *
-     * @return bool
-     */
-    public function matchesPath($requestPath)
-    {
-        $cookiePath = $this->getPath();
-
-        // Match on exact matches or when path is the default empty "/"
-        if ($cookiePath == '/' || $cookiePath == $requestPath) {
-            return true;
-        }
-
-        // Ensure that the cookie-path is a prefix of the request path.
-        if (0 !== strpos($requestPath, $cookiePath)) {
-            return false;
-        }
-
-        // Match if the last character of the cookie-path is "/"
-        if (substr($cookiePath, -1, 1) == '/') {
-            return true;
-        }
-
-        // Match if the first character not included in cookie path is "/"
-        return substr($requestPath, strlen($cookiePath), 1) == '/';
-    }
-
-    /**
-     * Check if the cookie matches a domain value
-     *
-     * @param string $domain Domain to check against
-     *
-     * @return bool
-     */
-    public function matchesDomain($domain)
-    {
-        // Remove the leading '.' as per spec in RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.2.3
-        $cookieDomain = ltrim($this->getDomain(), '.');
-
-        // Domain not set or exact match.
-        if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
-            return true;
-        }
-
-        // Matching the subdomain according to RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.1.3
-        if (filter_var($domain, FILTER_VALIDATE_IP)) {
-            return false;
-        }
-
-        return (bool) preg_match('/\.' . preg_quote($cookieDomain) . '$/', $domain);
-    }
-
-    /**
-     * Check if the cookie is expired
-     *
-     * @return bool
-     */
-    public function isExpired()
-    {
-        return $this->getExpires() && time() > $this->getExpires();
-    }
-
-    /**
-     * Check if the cookie is valid according to RFC 6265
-     *
-     * @return bool|string Returns true if valid or an error message if invalid
-     */
-    public function validate()
-    {
-        // Names must not be empty, but can be 0
-        $name = $this->getName();
-        if (empty($name) && !is_numeric($name)) {
-            return 'The cookie name must not be empty';
-        }
-
-        // Check if any of the invalid characters are present in the cookie name
-        if (preg_match(
-            '/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/',
-            $name)
-        ) {
-            return 'Cookie name must not contain invalid characters: ASCII '
-                . 'Control characters (0-31;127), space, tab and the '
-                . 'following characters: ()<>@,;:\"/?={}';
-        }
-
-        // Value must not be empty, but can be 0
-        $value = $this->getValue();
-        if (empty($value) && !is_numeric($value)) {
-            return 'The cookie value must not be empty';
-        }
-
-        // Domains must not be empty, but can be 0
-        // A "0" is not a valid internet domain, but may be used as server name
-        // in a private network.
-        $domain = $this->getDomain();
-        if (empty($domain) && !is_numeric($domain)) {
-            return 'The cookie domain must not be empty';
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
deleted file mode 100644
index fd78431..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when an HTTP error occurs (4xx or 5xx error)
- */
-class BadResponseException extends RequestException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
deleted file mode 100644
index f95c09f..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when a client error is encountered (4xx codes)
- */
-class ClientException extends BadResponseException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
deleted file mode 100644
index d33b0cc..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Exception thrown when a connection cannot be established.
- *
- * Note that no response is present for a ConnectException
- */
-class ConnectException extends RequestException
-{
-    public function __construct(
-        $message,
-        RequestInterface $request,
-        \Exception $previous = null,
-        array $handlerContext = []
-    ) {
-        parent::__construct($message, $request, null, $previous, $handlerContext);
-    }
-
-    /**
-     * @return null
-     */
-    public function getResponse()
-    {
-        return null;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return false;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
deleted file mode 100644
index c82998e..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-interface GuzzleException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
deleted file mode 100644
index 23dd02c..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use GuzzleHttp\Promise\PromiseInterface;
-
-/**
- * HTTP Request exception
- */
-class RequestException extends TransferException
-{
-    /** @var RequestInterface */
-    private $request;
-
-    /** @var ResponseInterface */
-    private $response;
-
-    /** @var array */
-    private $handlerContext;
-
-    public function __construct(
-        $message,
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $previous = null,
-        array $handlerContext = []
-    ) {
-        // Set the code of the exception if the response is set and not future.
-        $code = $response && !($response instanceof PromiseInterface)
-            ? $response->getStatusCode()
-            : 0;
-        parent::__construct($message, $code, $previous);
-        $this->request = $request;
-        $this->response = $response;
-        $this->handlerContext = $handlerContext;
-    }
-
-    /**
-     * Wrap non-RequestExceptions with a RequestException
-     *
-     * @param RequestInterface $request
-     * @param \Exception       $e
-     *
-     * @return RequestException
-     */
-    public static function wrapException(RequestInterface $request, \Exception $e)
-    {
-        return $e instanceof RequestException
-            ? $e
-            : new RequestException($e->getMessage(), $request, null, $e);
-    }
-
-    /**
-     * Factory method to create a new exception with a normalized error message
-     *
-     * @param RequestInterface  $request  Request
-     * @param ResponseInterface $response Response received
-     * @param \Exception        $previous Previous exception
-     * @param array             $ctx      Optional handler context.
-     *
-     * @return self
-     */
-    public static function create(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $previous = null,
-        array $ctx = []
-    ) {
-        if (!$response) {
-            return new self(
-                'Error completing request',
-                $request,
-                null,
-                $previous,
-                $ctx
-            );
-        }
-
-        $level = floor($response->getStatusCode() / 100);
-        if ($level == '4') {
-            $label = 'Client error response';
-            $className = __NAMESPACE__ . '\\ClientException';
-        } elseif ($level == '5') {
-            $label = 'Server error response';
-            $className = __NAMESPACE__ . '\\ServerException';
-        } else {
-            $label = 'Unsuccessful response';
-            $className = __CLASS__;
-        }
-
-        $message = $label . ' [url] ' . $request->getUri()
-            . ' [http method] ' . $request->getMethod()
-            . ' [status code] ' . $response->getStatusCode()
-            . ' [reason phrase] ' . $response->getReasonPhrase();
-
-        return new $className($message, $request, $response, $previous, $ctx);
-    }
-
-    /**
-     * Get the request that caused the exception
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Get the associated response
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Check if a response was received
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return $this->response !== null;
-    }
-
-    /**
-     * Get contextual information about the error from the underlying handler.
-     *
-     * The contents of this array will vary depending on which handler you are
-     * using. It may also be just an empty array. Relying on this data will
-     * couple you to a specific handler, but can give more debug information
-     * when needed.
-     *
-     * @return array
-     */
-    public function getHandlerContext()
-    {
-        return $this->handlerContext;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php b/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
deleted file mode 100644
index a77c289..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Exception thrown when a seek fails on a stream.
- */
-class SeekException extends \RuntimeException implements GuzzleException
-{
-    private $stream;
-
-    public function __construct(StreamInterface $stream, $pos = 0, $msg = '')
-    {
-        $this->stream = $stream;
-        $msg = $msg ?: 'Could not seek the stream to position ' . $pos;
-        parent::__construct($msg);
-    }
-
-    /**
-     * @return StreamInterface
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
deleted file mode 100644
index 7cdd340..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when a server error is encountered (5xx codes)
- */
-class ServerException extends BadResponseException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
deleted file mode 100644
index b60a967..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class TooManyRedirectsException extends RequestException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
deleted file mode 100644
index b92071c..0000000
--- a/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class TransferException extends \RuntimeException implements GuzzleException {}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
deleted file mode 100644
index e8d9388..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Promise\FulfilledPromise;
-use GuzzleHttp\Promise\RejectedPromise;
-use GuzzleHttp\Psr7;
-use GuzzleHttp\Psr7\LazyOpenStream;
-use GuzzleHttp\TransferStats;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Creates curl resources from a request
- */
-class CurlFactory implements CurlFactoryInterface
-{
-    /** @var array */
-    private $handles;
-
-    /** @var int Total number of idle handles to keep in cache */
-    private $maxHandles;
-
-    /**
-     * @param int $maxHandles Maximum number of idle handles.
-     */
-    public function __construct($maxHandles)
-    {
-        $this->maxHandles = $maxHandles;
-    }
-
-    public function create(RequestInterface $request, array $options)
-    {
-        if (isset($options['curl']['body_as_string'])) {
-            $options['_body_as_string'] = $options['curl']['body_as_string'];
-            unset($options['curl']['body_as_string']);
-        }
-
-        $easy = new EasyHandle;
-        $easy->request = $request;
-        $easy->options = $options;
-        $conf = $this->getDefaultConf($easy);
-        $this->applyMethod($easy, $conf);
-        $this->applyHandlerOptions($easy, $conf);
-        $this->applyHeaders($easy, $conf);
-        unset($conf['_headers']);
-
-        // Add handler options from the request configuration options
-        if (isset($options['curl'])) {
-            $conf = array_replace($conf, $options['curl']);
-        }
-
-        $conf[CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
-        $easy->handle = $this->handles
-            ? array_pop($this->handles)
-            : curl_init();
-        curl_setopt_array($easy->handle, $conf);
-
-        return $easy;
-    }
-
-    public function release(EasyHandle $easy)
-    {
-        $resource = $easy->handle;
-        unset($easy->handle);
-
-        if (count($this->handles) >= $this->maxHandles) {
-            curl_close($resource);
-        } else {
-            // Remove all callback functions as they can hold onto references
-            // and are not cleaned up by curl_reset. Using curl_setopt_array
-            // does not work for some reason, so removing each one
-            // individually.
-            curl_setopt($resource, CURLOPT_HEADERFUNCTION, null);
-            curl_setopt($resource, CURLOPT_READFUNCTION, null);
-            curl_setopt($resource, CURLOPT_WRITEFUNCTION, null);
-            curl_setopt($resource, CURLOPT_PROGRESSFUNCTION, null);
-            curl_reset($resource);
-            $this->handles[] = $resource;
-        }
-    }
-
-    /**
-     * Completes a cURL transaction, either returning a response promise or a
-     * rejected promise.
-     *
-     * @param callable             $handler
-     * @param EasyHandle           $easy
-     * @param CurlFactoryInterface $factory Dictates how the handle is released
-     *
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public static function finish(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ) {
-        if (isset($easy->options['on_stats'])) {
-            self::invokeStats($easy);
-        }
-
-        if (!$easy->response || $easy->errno) {
-            return self::finishError($handler, $easy, $factory);
-        }
-
-        // Return the response if it is present and there is no error.
-        $factory->release($easy);
-
-        // Rewind the body of the response if possible.
-        $body = $easy->response->getBody();
-        if ($body->isSeekable()) {
-            $body->rewind();
-        }
-
-        return new FulfilledPromise($easy->response);
-    }
-
-    private static function invokeStats(EasyHandle $easy)
-    {
-        $curlStats = curl_getinfo($easy->handle);
-        $stats = new TransferStats(
-            $easy->request,
-            $easy->response,
-            $curlStats['total_time'],
-            $easy->errno,
-            $curlStats
-        );
-        call_user_func($easy->options['on_stats'], $stats);
-    }
-
-    private static function finishError(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ) {
-        // Get error information and release the handle to the factory.
-        $ctx = [
-            'errno' => $easy->errno,
-            'error' => curl_error($easy->handle),
-        ] + curl_getinfo($easy->handle);
-        $factory->release($easy);
-
-        // Retry when nothing is present or when curl failed to rewind.
-        if (empty($easy->options['_err_message'])
-            && (!$easy->errno || $easy->errno == 65)
-        ) {
-            return self::retryFailedRewind($handler, $easy, $ctx);
-        }
-
-        return self::createRejection($easy, $ctx);
-    }
-
-    private static function createRejection(EasyHandle $easy, array $ctx)
-    {
-        static $connectionErrors = [
-            CURLE_OPERATION_TIMEOUTED  => true,
-            CURLE_COULDNT_RESOLVE_HOST => true,
-            CURLE_COULDNT_CONNECT      => true,
-            CURLE_SSL_CONNECT_ERROR    => true,
-            CURLE_GOT_NOTHING          => true,
-        ];
-
-        // If an exception was encountered during the onHeaders event, then
-        // return a rejected promise that wraps that exception.
-        if ($easy->onHeadersException) {
-            return new RejectedPromise(
-                new RequestException(
-                    'An error was encountered during the on_headers event',
-                    $easy->request,
-                    $easy->response,
-                    $easy->onHeadersException,
-                    $ctx
-                )
-            );
-        }
-
-        $message = sprintf(
-            'cURL error %s: %s (%s)',
-            $ctx['errno'],
-            $ctx['error'],
-            'see http://curl.haxx.se/libcurl/c/libcurl-errors.html'
-        );
-
-        // Create a connection exception if it was a specific error code.
-        $error = isset($connectionErrors[$easy->errno])
-            ? new ConnectException($message, $easy->request, null, $ctx)
-            : new RequestException($message, $easy->request, $easy->response, null, $ctx);
-
-        return new RejectedPromise($error);
-    }
-
-    private function getDefaultConf(EasyHandle $easy)
-    {
-        $conf = [
-            '_headers'             => $easy->request->getHeaders(),
-            CURLOPT_CUSTOMREQUEST  => $easy->request->getMethod(),
-            CURLOPT_URL            => (string) $easy->request->getUri(),
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_HEADER         => false,
-            CURLOPT_CONNECTTIMEOUT => 150,
-        ];
-
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $conf[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        $version = $easy->request->getProtocolVersion();
-        if ($version == 1.1) {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-        } elseif ($version == 2.0) {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
-        } else {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
-        }
-
-        return $conf;
-    }
-
-    private function applyMethod(EasyHandle $easy, array &$conf)
-    {
-        $body = $easy->request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size > 0) {
-            $this->applyBody($easy->request, $easy->options, $conf);
-            return;
-        }
-
-        $method = $easy->request->getMethod();
-        if ($method === 'PUT' || $method === 'POST') {
-            // See http://tools.ietf.org/html/rfc7230#section-3.3.2
-            if (!$easy->request->hasHeader('Content-Length')) {
-                $conf[CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
-            }
-        } elseif ($method === 'HEAD') {
-            $conf[CURLOPT_NOBODY] = true;
-            unset(
-                $conf[CURLOPT_WRITEFUNCTION],
-                $conf[CURLOPT_READFUNCTION],
-                $conf[CURLOPT_FILE],
-                $conf[CURLOPT_INFILE]
-            );
-        }
-    }
-
-    private function applyBody(RequestInterface $request, array $options, array &$conf)
-    {
-        $size = $request->hasHeader('Content-Length')
-            ? (int) $request->getHeaderLine('Content-Length')
-            : null;
-
-        // Send the body as a string if the size is less than 1MB OR if the
-        // [curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) ||
-            !empty($options['_body_as_string'])
-        ) {
-            $conf[CURLOPT_POSTFIELDS] = (string) $request->getBody();
-            // Don't duplicate the Content-Length header
-            $this->removeHeader('Content-Length', $conf);
-            $this->removeHeader('Transfer-Encoding', $conf);
-        } else {
-            $conf[CURLOPT_UPLOAD] = true;
-            if ($size !== null) {
-                $conf[CURLOPT_INFILESIZE] = $size;
-                $this->removeHeader('Content-Length', $conf);
-            }
-            $body = $request->getBody();
-            $conf[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
-                return $body->read($length);
-            };
-        }
-
-        // If the Expect header is not present, prevent curl from adding it
-        if (!$request->hasHeader('Expect')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Expect:';
-        }
-
-        // cURL sometimes adds a content-type by default. Prevent this.
-        if (!$request->hasHeader('Content-Type')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Content-Type:';
-        }
-    }
-
-    private function applyHeaders(EasyHandle $easy, array &$conf)
-    {
-        foreach ($conf['_headers'] as $name => $values) {
-            foreach ($values as $value) {
-                $conf[CURLOPT_HTTPHEADER][] = "$name: $value";
-            }
-        }
-
-        // Remove the Accept header if one was not set
-        if (!$easy->request->hasHeader('Accept')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Accept:';
-        }
-    }
-
-    /**
-     * Remove a header from the options array.
-     *
-     * @param string $name    Case-insensitive header to remove
-     * @param array  $options Array of options to modify
-     */
-    private function removeHeader($name, array &$options)
-    {
-        foreach (array_keys($options['_headers']) as $key) {
-            if (!strcasecmp($key, $name)) {
-                unset($options['_headers'][$key]);
-                return;
-            }
-        }
-    }
-
-    private function applyHandlerOptions(EasyHandle $easy, array &$conf)
-    {
-        $options = $easy->options;
-        if (isset($options['verify'])) {
-            if ($options['verify'] === false) {
-                unset($conf[CURLOPT_CAINFO]);
-                $conf[CURLOPT_SSL_VERIFYHOST] = 0;
-                $conf[CURLOPT_SSL_VERIFYPEER] = false;
-            } else {
-                $conf[CURLOPT_SSL_VERIFYHOST] = 2;
-                $conf[CURLOPT_SSL_VERIFYPEER] = true;
-                if (is_string($options['verify'])) {
-                    $conf[CURLOPT_CAINFO] = $options['verify'];
-                    if (!file_exists($options['verify'])) {
-                        throw new \InvalidArgumentException(
-                            "SSL CA bundle not found: {$options['verify']}"
-                        );
-                    }
-                }
-            }
-        }
-
-        if (!empty($options['decode_content'])) {
-            $accept = $easy->request->getHeaderLine('Accept-Encoding');
-            if ($accept) {
-                $conf[CURLOPT_ENCODING] = $accept;
-            } else {
-                $conf[CURLOPT_ENCODING] = '';
-                // Don't let curl send the header over the wire
-                $conf[CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
-            }
-        }
-
-        if (isset($options['sink'])) {
-            $sink = $options['sink'];
-            if (!is_string($sink)) {
-                $sink = \GuzzleHttp\Psr7\stream_for($sink);
-            } elseif (!is_dir(dirname($sink))) {
-                // Ensure that the directory exists before failing in curl.
-                throw new \RuntimeException(sprintf(
-                    'Directory %s does not exist for sink value of %s',
-                    dirname($sink),
-                    $sink
-                ));
-            } else {
-                $sink = new LazyOpenStream($sink, 'w+');
-            }
-            $easy->sink = $sink;
-            $conf[CURLOPT_WRITEFUNCTION] = function ($ch, $write) use ($sink) {
-                return $sink->write($write);
-            };
-        } else {
-            // Use a default temp stream if no sink was set.
-            $conf[CURLOPT_FILE] = fopen('php://temp', 'w+');
-            $easy->sink = Psr7\stream_for($conf[CURLOPT_FILE]);
-        }
-
-        if (isset($options['timeout'])) {
-            $conf[CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
-        }
-
-        if (isset($options['connect_timeout'])) {
-            $conf[CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
-        }
-
-        if (isset($options['proxy'])) {
-            if (!is_array($options['proxy'])) {
-                $conf[CURLOPT_PROXY] = $options['proxy'];
-            } else {
-                $scheme = $easy->request->getUri()->getScheme();
-                if (isset($options['proxy'][$scheme])) {
-                    $host = $easy->request->getUri()->getHost();
-                    if (!isset($options['proxy']['no']) ||
-                        !\GuzzleHttp\is_host_in_noproxy($host, $options['proxy']['no'])
-                    ) {
-                        $conf[CURLOPT_PROXY] = $options['proxy'][$scheme];
-                    }
-                }
-            }
-        }
-
-        if (isset($options['cert'])) {
-            $cert = $options['cert'];
-            if (is_array($cert)) {
-                $conf[CURLOPT_SSLCERTPASSWD] = $cert[1];
-                $cert = $cert[0];
-            }
-            if (!file_exists($cert)) {
-                throw new \InvalidArgumentException(
-                    "SSL certificate not found: {$cert}"
-                );
-            }
-            $conf[CURLOPT_SSLCERT] = $cert;
-        }
-
-        if (isset($options['ssl_key'])) {
-            $sslKey = $options['ssl_key'];
-            if (is_array($sslKey)) {
-                $conf[CURLOPT_SSLKEYPASSWD] = $sslKey[1];
-                $sslKey = $sslKey[0];
-            }
-            if (!file_exists($sslKey)) {
-                throw new \InvalidArgumentException(
-                    "SSL private key not found: {$sslKey}"
-                );
-            }
-            $conf[CURLOPT_SSLKEY] = $sslKey;
-        }
-
-        if (isset($options['progress'])) {
-            $progress = $options['progress'];
-            if (!is_callable($progress)) {
-                throw new \InvalidArgumentException(
-                    'progress client option must be callable'
-                );
-            }
-            $conf[CURLOPT_NOPROGRESS] = false;
-            $conf[CURLOPT_PROGRESSFUNCTION] = function () use ($progress) {
-                $args = func_get_args();
-                // PHP 5.5 pushed the handle onto the start of the args
-                if (is_resource($args[0])) {
-                    array_shift($args);
-                }
-                call_user_func_array($progress, $args);
-            };
-        }
-
-        if (!empty($options['debug'])) {
-            $conf[CURLOPT_STDERR] = \GuzzleHttp\debug_resource($options['debug']);
-            $conf[CURLOPT_VERBOSE] = true;
-        }
-    }
-
-    /**
-     * This function ensures that a response was set on a transaction. If one
-     * was not set, then the request is retried if possible. This error
-     * typically means you are sending a payload, curl encountered a
-     * "Connection died, retrying a fresh connect" error, tried to rewind the
-     * stream, and then encountered a "necessary data rewind wasn't possible"
-     * error, causing the request to be sent through curl_multi_info_read()
-     * without an error status.
-     */
-    private static function retryFailedRewind(
-        callable $handler,
-        EasyHandle $easy,
-        array $ctx
-    ) {
-        try {
-            // Only rewind if the body has been read from.
-            $body = $easy->request->getBody();
-            if ($body->tell() > 0) {
-                $body->rewind();
-            }
-        } catch (\RuntimeException $e) {
-            $ctx['error'] = 'The connection unexpectedly failed without '
-                . 'providing an error. The request would have been retried, '
-                . 'but attempting to rewind the request body failed. '
-                . 'Exception: ' . $e;
-            return self::createRejection($easy, $ctx);
-        }
-
-        // Retry no more than 3 times before giving up.
-        if (!isset($easy->options['_curl_retries'])) {
-            $easy->options['_curl_retries'] = 1;
-        } elseif ($easy->options['_curl_retries'] == 2) {
-            $ctx['error'] = 'The cURL request was retried 3 times '
-                . 'and did not succeed. The most likely reason for the failure '
-                . 'is that cURL was unable to rewind the body of the request '
-                . 'and subsequent retries resulted in the same error. Turn on '
-                . 'the debug option to see what went wrong. See '
-                . 'https://bugs.php.net/bug.php?id=47204 for more information.';
-            return self::createRejection($easy, $ctx);
-        } else {
-            $easy->options['_curl_retries']++;
-        }
-
-        return $handler($easy->request, $easy->options);
-    }
-
-    private function createHeaderFn(EasyHandle $easy)
-    {
-        if (!isset($easy->options['on_headers'])) {
-            $onHeaders = null;
-        } elseif (!is_callable($easy->options['on_headers'])) {
-            throw new \InvalidArgumentException('on_headers must be callable');
-        } else {
-            $onHeaders = $easy->options['on_headers'];
-        }
-
-        return function ($ch, $h) use (
-            $onHeaders,
-            $easy,
-            &$startingResponse
-        ) {
-            $value = trim($h);
-            if ($value === '') {
-                $startingResponse = true;
-                $easy->createResponse();
-                if ($onHeaders) {
-                    try {
-                        $onHeaders($easy->response);
-                    } catch (\Exception $e) {
-                        // Associate the exception with the handle and trigger
-                        // a curl header write error by returning 0.
-                        $easy->onHeadersException = $e;
-                        return -1;
-                    }
-                }
-            } elseif ($startingResponse) {
-                $startingResponse = false;
-                $easy->headers = [$value];
-            } else {
-                $easy->headers[] = $value;
-            }
-            return strlen($h);
-        };
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
deleted file mode 100644
index b0fc236..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use Psr\Http\Message\RequestInterface;
-
-interface CurlFactoryInterface
-{
-    /**
-     * Creates a cURL handle resource.
-     *
-     * @param RequestInterface $request Request
-     * @param array            $options Transfer options
-     *
-     * @return EasyHandle
-     * @throws \RuntimeException when an option cannot be applied
-     */
-    public function create(RequestInterface $request, array $options);
-
-    /**
-     * Release an easy handle, allowing it to be reused or closed.
-     *
-     * This function must call unset on the easy handle's "handle" property.
-     *
-     * @param EasyHandle $easy
-     */
-    public function release(EasyHandle $easy);
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
deleted file mode 100644
index 43577da..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * HTTP handler that uses cURL easy handles as a transport layer.
- *
- * When using the CurlHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the "client" key of the request.
- */
-class CurlHandler
-{
-    /** @var CurlFactoryInterface */
-    private $factory;
-
-    /**
-     * Accepts an associative array of options:
-     *
-     * - factory: Optional curl factory used to create cURL handles.
-     *
-     * @param array $options Array of options to use with the handler
-     */
-    public function __construct(array $options = [])
-    {
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory']
-            : new CurlFactory(3);
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (isset($options['delay'])) {
-            usleep($options['delay'] * 1000);
-        }
-
-        $easy = $this->factory->create($request, $options);
-        curl_exec($easy->handle);
-        $easy->errno = curl_errno($easy->handle);
-
-        return CurlFactory::finish($this, $easy, $this->factory);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
deleted file mode 100644
index 417850b..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\Promise as P;
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Returns an asynchronous response using curl_multi_* functions.
- *
- * When using the CurlMultiHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the provided request options.
- *
- * @property resource $_mh Internal use only. Lazy loaded multi-handle.
- */
-class CurlMultiHandler
-{
-    /** @var CurlFactoryInterface */
-    private $factory;
-    private $selectTimeout;
-    private $active;
-    private $handles = [];
-    private $delays = [];
-
-    /**
-     * This handler accepts the following options:
-     *
-     * - handle_factory: An optional factory  used to create curl handles
-     * - select_timeout: Optional timeout (in seconds) to block before timing
-     *   out while selecting curl handles. Defaults to 1 second.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = [])
-    {
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory'] : new CurlFactory(50);
-        $this->selectTimeout = isset($options['select_timeout'])
-            ? $options['select_timeout'] : 1;
-    }
-
-    public function __get($name)
-    {
-        if ($name === '_mh') {
-            return $this->_mh = curl_multi_init();
-        }
-
-        throw new \BadMethodCallException();
-    }
-
-    public function __destruct()
-    {
-        if (isset($this->_mh)) {
-            curl_multi_close($this->_mh);
-            unset($this->_mh);
-        }
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $easy = $this->factory->create($request, $options);
-        $id = (int) $easy->handle;
-
-        $promise = new Promise(
-            [$this, 'execute'],
-            function () use ($id) { return $this->cancel($id); }
-        );
-
-        $this->addRequest(['easy' => $easy, 'deferred' => $promise]);
-
-        return $promise;
-    }
-
-    /**
-     * Ticks the curl event loop.
-     */
-    public function tick()
-    {
-        // Add any delayed handles if needed.
-        if ($this->delays) {
-            $currentTime = microtime(true);
-            foreach ($this->delays as $id => $delay) {
-                if ($currentTime >= $delay) {
-                    unset($this->delays[$id]);
-                    curl_multi_add_handle(
-                        $this->_mh,
-                        $this->handles[$id]['easy']->handle
-                    );
-                }
-            }
-        }
-
-        // Step through the task queue which may add additional requests.
-        P\queue()->run();
-
-        if ($this->active &&
-            curl_multi_select($this->_mh, $this->selectTimeout) === -1
-        ) {
-            // Perform a usleep if a select returns -1.
-            // See: https://bugs.php.net/bug.php?id=61141
-            usleep(250);
-        }
-
-        while (curl_multi_exec($this->_mh, $this->active) === CURLM_CALL_MULTI_PERFORM);
-
-        $this->processMessages();
-    }
-
-    /**
-     * Runs until all outstanding connections have completed.
-     */
-    public function execute()
-    {
-        $queue = P\queue();
-
-        while ($this->handles || !$queue->isEmpty()) {
-            // If there are no transfers, then sleep for the next delay
-            if (!$this->active && $this->delays) {
-                usleep($this->timeToNext());
-            }
-            $this->tick();
-        }
-    }
-
-    private function addRequest(array $entry)
-    {
-        $easy = $entry['easy'];
-        $id = (int) $easy->handle;
-        $this->handles[$id] = $entry;
-        if (empty($easy->options['delay'])) {
-            curl_multi_add_handle($this->_mh, $easy->handle);
-        } else {
-            $this->delays[$id] = microtime(true) + ($easy->options['delay'] / 1000);
-        }
-    }
-
-    /**
-     * Cancels a handle from sending and removes references to it.
-     *
-     * @param int $id Handle ID to cancel and remove.
-     *
-     * @return bool True on success, false on failure.
-     */
-    private function cancel($id)
-    {
-        // Cannot cancel if it has been processed.
-        if (!isset($this->handles[$id])) {
-            return false;
-        }
-
-        $handle = $this->handles[$id]['easy']->handle;
-        unset($this->delays[$id], $this->handles[$id]);
-        curl_multi_remove_handle($this->_mh, $handle);
-        curl_close($handle);
-
-        return true;
-    }
-
-    private function processMessages()
-    {
-        while ($done = curl_multi_info_read($this->_mh)) {
-            $id = (int) $done['handle'];
-            curl_multi_remove_handle($this->_mh, $done['handle']);
-
-            if (!isset($this->handles[$id])) {
-                // Probably was cancelled.
-                continue;
-            }
-
-            $entry = $this->handles[$id];
-            unset($this->handles[$id], $this->delays[$id]);
-            $entry['easy']->errno = $done['result'];
-            $entry['deferred']->resolve(
-                CurlFactory::finish(
-                    $this,
-                    $entry['easy'],
-                    $this->factory
-                )
-            );
-        }
-    }
-
-    private function timeToNext()
-    {
-        $currentTime = microtime(true);
-        $nextTime = PHP_INT_MAX;
-        foreach ($this->delays as $time) {
-            if ($time < $nextTime) {
-                $nextTime = $time;
-            }
-        }
-
-        return max(0, $currentTime - $nextTime);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
deleted file mode 100644
index c4b927e..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\Psr7\Response;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Represents a cURL easy handle and the data it populates.
- *
- * @internal
- */
-final class EasyHandle
-{
-    /** @var resource cURL resource */
-    public $handle;
-
-    /** @var StreamInterface Where data is being written */
-    public $sink;
-
-    /** @var array Received HTTP headers so far */
-    public $headers = [];
-
-    /** @var ResponseInterface Received response (if any) */
-    public $response;
-
-    /** @var RequestInterface Request being sent */
-    public $request;
-
-    /** @var array Request options */
-    public $options = [];
-
-    /** @var int cURL error number (if any) */
-    public $errno = 0;
-
-    /** @var \Exception Exception during on_headers (if any) */
-    public $onHeadersException;
-
-    /**
-     * Attach a response to the easy handle based on the received headers.
-     *
-     * @throws \RuntimeException if no headers have been received.
-     */
-    public function createResponse()
-    {
-        if (empty($this->headers)) {
-            throw new \RuntimeException('No headers have been received');
-        }
-
-        // HTTP-version SP status-code SP reason-phrase
-        $startLine = explode(' ', array_shift($this->headers), 3);
-        $headers = \GuzzleHttp\headers_from_lines($this->headers);
-        $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
-
-        if (!empty($this->options['decode_content'])
-            && isset($normalizedKeys['content-encoding'])
-        ) {
-            unset($headers[$normalizedKeys['content-encoding']]);
-            if (isset($normalizedKeys['content-length'])) {
-                $bodyLength = (int) $this->sink->getSize();
-                if ($bodyLength) {
-                    $headers[$normalizedKeys['content-length']] = $bodyLength;
-                } else {
-                    unset($headers[$normalizedKeys['content-length']]);
-                }
-            }
-        }
-
-        // Attach a response to the easy handle with the parsed headers.
-        $this->response = new Response(
-            $startLine[1],
-            $headers,
-            $this->sink,
-            substr($startLine[0], 5),
-            isset($startLine[2]) ? (string) $startLine[2] : null
-        );
-    }
-
-    public function __get($name)
-    {
-        $msg = $name === 'handle'
-            ? 'The EasyHandle has been released'
-            : 'Invalid property: ' . $name;
-        throw new \BadMethodCallException($msg);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
deleted file mode 100644
index 4b1b0af..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Promise\RejectedPromise;
-use GuzzleHttp\TransferStats;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Handler that returns responses or throw exceptions from a queue.
- */
-class MockHandler implements \Countable
-{
-    private $queue;
-    private $lastRequest;
-    private $lastOptions;
-    private $onFulfilled;
-    private $onRejected;
-
-    /**
-     * Creates a new MockHandler that uses the default handler stack list of
-     * middlewares.
-     *
-     * @param array $queue Array of responses, callables, or exceptions.
-     * @param callable $onFulfilled Callback to invoke when the return value is fulfilled.
-     * @param callable $onRejected  Callback to invoke when the return value is rejected.
-     *
-     * @return MockHandler
-     */
-    public static function createWithMiddleware(
-        array $queue = null,
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
-    }
-
-    /**
-     * The passed in value must be an array of
-     * {@see Psr7\Http\Message\ResponseInterface} objects, Exceptions,
-     * callables, or Promises.
-     *
-     * @param array $queue
-     * @param callable $onFulfilled Callback to invoke when the return value is fulfilled.
-     * @param callable $onRejected  Callback to invoke when the return value is rejected.
-     */
-    public function __construct(
-        array $queue = null,
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        $this->onFulfilled = $onFulfilled;
-        $this->onRejected = $onRejected;
-
-        if ($queue) {
-            call_user_func_array([$this, 'append'], $queue);
-        }
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (!$this->queue) {
-            throw new \OutOfBoundsException('Mock queue is empty');
-        }
-
-        if (isset($options['delay'])) {
-            usleep($options['delay'] * 1000);
-        }
-
-        $this->lastRequest = $request;
-        $this->lastOptions = $options;
-        $response = array_shift($this->queue);
-
-        if (is_callable($response)) {
-            $response = $response($request, $options);
-        }
-
-        $response = $response instanceof \Exception
-            ? new RejectedPromise($response)
-            : \GuzzleHttp\Promise\promise_for($response);
-
-        return $response->then(
-            function ($value) use ($request, $options) {
-                $this->invokeStats($request, $options, $value);
-                if ($this->onFulfilled) {
-                    call_user_func($this->onFulfilled, $value);
-                }
-                return $value;
-            },
-            function ($reason) use ($request, $options) {
-                $this->invokeStats($request, $options, null, $reason);
-                if ($this->onRejected) {
-                    call_user_func($this->onRejected, $reason);
-                }
-                return new RejectedPromise($reason);
-            }
-        );
-    }
-
-    /**
-     * Adds one or more variadic requests, exceptions, callables, or promises
-     * to the queue.
-     */
-    public function append()
-    {
-        foreach (func_get_args() as $value) {
-            if ($value instanceof ResponseInterface
-                || $value instanceof \Exception
-                || $value instanceof PromiseInterface
-                || is_callable($value)
-            ) {
-                $this->queue[] = $value;
-            } else {
-                throw new \InvalidArgumentException('Expected a response or '
-                    . 'exception. Found ' . \GuzzleHttp\describe_type($value));
-            }
-        }
-    }
-
-    /**
-     * Get the last received request.
-     *
-     * @return RequestInterface
-     */
-    public function getLastRequest()
-    {
-        return $this->lastRequest;
-    }
-
-    /**
-     * Get the last received request options.
-     *
-     * @return RequestInterface
-     */
-    public function getLastOptions()
-    {
-        return $this->lastOptions;
-    }
-
-    /**
-     * Returns the number of remaining items in the queue.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->queue);
-    }
-
-    private function invokeStats(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response = null,
-        $reason = null
-    ) {
-        if (isset($options['on_stats'])) {
-            $stats = new TransferStats($request, $response, 0, $reason);
-            call_user_func($options['on_stats'], $stats);
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
deleted file mode 100644
index 9bd76d2..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Provides basic proxies for handlers.
- */
-class Proxy
-{
-    /**
-     * Sends synchronous requests to a specific handler while sending all other
-     * requests to another handler.
-     *
-     * @param callable $default Handler used for normal responses
-     * @param callable $sync    Handler used for synchronous responses.
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapSync(
-        callable $default,
-        callable $sync
-    ) {
-        return function (RequestInterface $request, array $options) use ($default, $sync) {
-            return empty($options['sync'])
-                ? $default($request, $options)
-                : $sync($request, $options);
-        };
-    }
-
-    /**
-     * Sends streaming requests to a streaming compatible handler while sending
-     * all other requests to a default handler.
-     *
-     * This, for example, could be useful for taking advantage of the
-     * performance benefits of curl while still supporting true streaming
-     * through the StreamHandler.
-     *
-     * @param callable $default   Handler used for non-streaming responses
-     * @param callable $streaming Handler used for streaming responses
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapStreaming(
-        callable $default,
-        callable $streaming
-    ) {
-        return function (RequestInterface $request, array $options) use ($default, $streaming) {
-            return empty($options['stream'])
-                ? $default($request, $options)
-                : $streaming($request, $options);
-        };
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
deleted file mode 100644
index 2f18a48..0000000
--- a/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ /dev/null
@@ -1,456 +0,0 @@
-<?php
-namespace GuzzleHttp\Handler;
-
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Promise\FulfilledPromise;
-use GuzzleHttp\Promise\RejectedPromise;
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Psr7;
-use GuzzleHttp\TransferStats;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * HTTP handler that uses PHP's HTTP stream wrapper.
- */
-class StreamHandler
-{
-    private $lastHeaders = [];
-
-    /**
-     * Sends an HTTP request.
-     *
-     * @param RequestInterface $request Request to send.
-     * @param array            $options Request transfer options.
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        // Sleep if there is a delay specified.
-        if (isset($options['delay'])) {
-            usleep($options['delay'] * 1000);
-        }
-
-        $startTime = isset($options['on_stats']) ? microtime(true) : null;
-
-        try {
-            // Does not support the expect header.
-            $request = $request->withoutHeader('Expect');
-
-            // Append a content-length header if body size is zero to match
-            // cURL's behavior.
-            if (0 === $request->getBody()->getSize()) {
-                $request = $request->withHeader('Content-Length', 0);
-            }
-
-            return $this->createResponse(
-                $request,
-                $options,
-                $this->createStream($request, $options),
-                $startTime
-            );
-        } catch (\InvalidArgumentException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            // Determine if the error was a networking error.
-            $message = $e->getMessage();
-            // This list can probably get more comprehensive.
-            if (strpos($message, 'getaddrinfo') // DNS lookup failed
-                || strpos($message, 'Connection refused')
-                || strpos($message, "couldn't connect to host") // error on HHVM
-            ) {
-                $e = new ConnectException($e->getMessage(), $request, $e);
-            }
-            $e = RequestException::wrapException($request, $e);
-            $this->invokeStats($options, $request, $startTime, null, $e);
-
-            return new RejectedPromise($e);
-        }
-    }
-
-    private function invokeStats(
-        array $options,
-        RequestInterface $request,
-        $startTime,
-        ResponseInterface $response = null,
-        $error = null
-    ) {
-        if (isset($options['on_stats'])) {
-            $stats = new TransferStats(
-                $request,
-                $response,
-                microtime(true) - $startTime,
-                $error,
-                []
-            );
-            call_user_func($options['on_stats'], $stats);
-        }
-    }
-
-    private function createResponse(
-        RequestInterface $request,
-        array $options,
-        $stream,
-        $startTime
-    ) {
-        $hdrs = $this->lastHeaders;
-        $this->lastHeaders = [];
-        $parts = explode(' ', array_shift($hdrs), 3);
-        $ver = explode('/', $parts[0])[1];
-        $status = $parts[1];
-        $reason = isset($parts[2]) ? $parts[2] : null;
-        $headers = \GuzzleHttp\headers_from_lines($hdrs);
-        list ($stream, $headers) = $this->checkDecode($options, $headers, $stream);
-        $stream = Psr7\stream_for($stream);
-        $sink = $this->createSink($stream, $options);
-        $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
-
-        if (isset($options['on_headers'])) {
-            try {
-                $options['on_headers']($response);
-            } catch (\Exception $e) {
-                $msg = 'An error was encountered during the on_headers event';
-                $ex = new RequestException($msg, $request, $response, $e);
-                return new RejectedPromise($ex);
-            }
-        }
-
-        if ($sink !== $stream) {
-            $this->drain($stream, $sink);
-        }
-
-        $this->invokeStats($options, $request, $startTime, $response, null);
-
-        return new FulfilledPromise($response);
-    }
-
-    private function createSink(StreamInterface $stream, array $options)
-    {
-        if (!empty($options['stream'])) {
-            return $stream;
-        }
-
-        $sink = isset($options['sink'])
-            ? $options['sink']
-            : fopen('php://temp', 'r+');
-
-        return is_string($sink)
-            ? new Psr7\Stream(Psr7\try_fopen($sink, 'r+'))
-            : Psr7\stream_for($sink);
-    }
-
-    private function checkDecode(array $options, array $headers, $stream)
-    {
-        // Automatically decode responses when instructed.
-        if (!empty($options['decode_content'])) {
-            $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
-            if (isset($normalizedKeys['content-encoding'])) {
-                $encoding = $headers[$normalizedKeys['content-encoding']];
-                if ($encoding[0] == 'gzip' || $encoding[0] == 'deflate') {
-                    $stream = new Psr7\InflateStream(
-                        Psr7\stream_for($stream)
-                    );
-                    // Remove content-encoding header
-                    unset($headers[$normalizedKeys['content-encoding']]);
-                    // Fix content-length header
-                    if (isset($normalizedKeys['content-length'])) {
-                        $length = (int) $stream->getSize();
-                        if ($length == 0) {
-                            unset($headers[$normalizedKeys['content-length']]);
-                        } else {
-                            $headers[$normalizedKeys['content-length']] = [$length];
-                        }
-                    }
-                }
-            }
-        }
-
-        return [$stream, $headers];
-    }
-
-    /**
-     * Drains the source stream into the "sink" client option.
-     *
-     * @param StreamInterface $source
-     * @param StreamInterface $sink
-     *
-     * @return StreamInterface
-     * @throws \RuntimeException when the sink option is invalid.
-     */
-    private function drain(StreamInterface $source, StreamInterface $sink)
-    {
-        Psr7\copy_to_stream($source, $sink);
-        $sink->seek(0);
-        $source->close();
-
-        return $sink;
-    }
-
-    /**
-     * Create a resource and check to ensure it was created successfully
-     *
-     * @param callable $callback Callable that returns stream resource
-     *
-     * @return resource
-     * @throws \RuntimeException on error
-     */
-    private function createResource(callable $callback)
-    {
-        $errors = null;
-        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
-            $errors[] = [
-                'message' => $msg,
-                'file'    => $file,
-                'line'    => $line
-            ];
-            return true;
-        });
-
-        $resource = $callback();
-        restore_error_handler();
-
-        if (!$resource) {
-            $message = 'Error creating resource: ';
-            foreach ($errors as $err) {
-                foreach ($err as $key => $value) {
-                    $message .= "[$key] $value" . PHP_EOL;
-                }
-            }
-            throw new \RuntimeException(trim($message));
-        }
-
-        return $resource;
-    }
-
-    private function createStream(RequestInterface $request, array $options)
-    {
-        static $methods;
-        if (!$methods) {
-            $methods = array_flip(get_class_methods(__CLASS__));
-        }
-
-        // HTTP/1.1 streams using the PHP stream wrapper require a
-        // Connection: close header
-        if ($request->getProtocolVersion() == '1.1'
-            && !$request->hasHeader('Connection')
-        ) {
-            $request = $request->withHeader('Connection', 'close');
-        }
-
-        // Ensure SSL is verified by default
-        if (!isset($options['verify'])) {
-            $options['verify'] = true;
-        }
-
-        $params = [];
-        $context = $this->getDefaultContext($request, $options);
-
-        if (isset($options['on_headers']) && !is_callable($options['on_headers'])) {
-            throw new \InvalidArgumentException('on_headers must be callable');
-        }
-
-        if (!empty($options)) {
-            foreach ($options as $key => $value) {
-                $method = "add_{$key}";
-                if (isset($methods[$method])) {
-                    $this->{$method}($request, $context, $value, $params);
-                }
-            }
-        }
-
-        if (isset($options['stream_context'])) {
-            if (!is_array($options['stream_context'])) {
-                throw new \InvalidArgumentException('stream_context must be an array');
-            }
-            $context = array_replace_recursive(
-                $context,
-                $options['stream_context']
-            );
-        }
-
-        $context = $this->createResource(
-            function () use ($context, $params) {
-                return stream_context_create($context, $params);
-            }
-        );
-
-        return $this->createResource(
-            function () use ($request, &$http_response_header, $context) {
-                $resource = fopen($request->getUri(), 'r', null, $context);
-                $this->lastHeaders = $http_response_header;
-                return $resource;
-            }
-        );
-    }
-
-    private function getDefaultContext(RequestInterface $request)
-    {
-        $headers = '';
-        foreach ($request->getHeaders() as $name => $value) {
-            foreach ($value as $val) {
-                $headers .= "$name: $val\r\n";
-            }
-        }
-
-        $context = [
-            'http' => [
-                'method'           => $request->getMethod(),
-                'header'           => $headers,
-                'protocol_version' => $request->getProtocolVersion(),
-                'ignore_errors'    => true,
-                'follow_location'  => 0,
-            ],
-        ];
-
-        $body = (string) $request->getBody();
-
-        if (!empty($body)) {
-            $context['http']['content'] = $body;
-            // Prevent the HTTP handler from adding a Content-Type header.
-            if (!$request->hasHeader('Content-Type')) {
-                $context['http']['header'] .= "Content-Type:\r\n";
-            }
-        }
-
-        $context['http']['header'] = rtrim($context['http']['header']);
-
-        return $context;
-    }
-
-    private function add_proxy(RequestInterface $request, &$options, $value, &$params)
-    {
-        if (!is_array($value)) {
-            $options['http']['proxy'] = $value;
-        } else {
-            $scheme = $request->getUri()->getScheme();
-            if (isset($value[$scheme])) {
-                if (!isset($value['no'])
-                    || !\GuzzleHttp\is_host_in_noproxy(
-                        $request->getUri()->getHost(),
-                        $value['no']
-                    )
-                ) {
-                    $options['http']['proxy'] = $value[$scheme];
-                }
-            }
-        }
-    }
-
-    private function add_timeout(RequestInterface $request, &$options, $value, &$params)
-    {
-        $options['http']['timeout'] = $value;
-    }
-
-    private function add_verify(RequestInterface $request, &$options, $value, &$params)
-    {
-        if ($value === true) {
-            // PHP 5.6 or greater will find the system cert by default. When
-            // < 5.6, use the Guzzle bundled cacert.
-            if (PHP_VERSION_ID < 50600) {
-                $options['ssl']['cafile'] = \GuzzleHttp\default_ca_bundle();
-            }
-        } elseif (is_string($value)) {
-            $options['ssl']['cafile'] = $value;
-            if (!file_exists($value)) {
-                throw new \RuntimeException("SSL CA bundle not found: $value");
-            }
-        } elseif ($value === false) {
-            $options['ssl']['verify_peer'] = false;
-            return;
-        } else {
-            throw new \InvalidArgumentException('Invalid verify request option');
-        }
-
-        $options['ssl']['verify_peer'] = true;
-        $options['ssl']['allow_self_signed'] = false;
-    }
-
-    private function add_cert(RequestInterface $request, &$options, $value, &$params)
-    {
-        if (is_array($value)) {
-            $options['ssl']['passphrase'] = $value[1];
-            $value = $value[0];
-        }
-
-        if (!file_exists($value)) {
-            throw new \RuntimeException("SSL certificate not found: {$value}");
-        }
-
-        $options['ssl']['local_cert'] = $value;
-    }
-
-    private function add_progress(RequestInterface $request, &$options, $value, &$params)
-    {
-        $this->addNotification(
-            $params,
-            function ($code, $a, $b, $c, $transferred, $total) use ($value) {
-                if ($code == STREAM_NOTIFY_PROGRESS) {
-                    $value($total, $transferred, null, null);
-                }
-            }
-        );
-    }
-
-    private function add_debug(RequestInterface $request, &$options, $value, &$params)
-    {
-        if ($value === false) {
-            return;
-        }
-
-        static $map = [
-            STREAM_NOTIFY_CONNECT       => 'CONNECT',
-            STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED',
-            STREAM_NOTIFY_AUTH_RESULT   => 'AUTH_RESULT',
-            STREAM_NOTIFY_MIME_TYPE_IS  => 'MIME_TYPE_IS',
-            STREAM_NOTIFY_FILE_SIZE_IS  => 'FILE_SIZE_IS',
-            STREAM_NOTIFY_REDIRECTED    => 'REDIRECTED',
-            STREAM_NOTIFY_PROGRESS      => 'PROGRESS',
-            STREAM_NOTIFY_FAILURE       => 'FAILURE',
-            STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
-            STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
-        ];
-        static $args = ['severity', 'message', 'message_code',
-            'bytes_transferred', 'bytes_max'];
-
-        $value = \GuzzleHttp\debug_resource($value);
-        $ident = $request->getMethod() . ' ' . $request->getUri();
-        $this->addNotification(
-            $params,
-            function () use ($ident, $value, $map, $args) {
-                $passed = func_get_args();
-                $code = array_shift($passed);
-                fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
-                foreach (array_filter($passed) as $i => $v) {
-                    fwrite($value, $args[$i] . ': "' . $v . '" ');
-                }
-                fwrite($value, "\n");
-            }
-        );
-    }
-
-    private function addNotification(array &$params, callable $notify)
-    {
-        // Wrap the existing function if needed.
-        if (!isset($params['notification'])) {
-            $params['notification'] = $notify;
-        } else {
-            $params['notification'] = $this->callArray([
-                $params['notification'],
-                $notify
-            ]);
-        }
-    }
-
-    private function callArray(array $functions)
-    {
-        return function () use ($functions) {
-            $args = func_get_args();
-            foreach ($functions as $fn) {
-                call_user_func_array($fn, $args);
-            }
-        };
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/vendor/guzzlehttp/guzzle/src/HandlerStack.php
deleted file mode 100644
index f851849..0000000
--- a/vendor/guzzlehttp/guzzle/src/HandlerStack.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Creates a composed Guzzle handler function by stacking middlewares on top of
- * an HTTP handler function.
- */
-class HandlerStack
-{
-    /** @var callable */
-    private $handler;
-
-    /** @var array */
-    private $stack = [];
-
-    /** @var callable|null */
-    private $cached;
-
-    /**
-     * Creates a default handler stack that can be used by clients.
-     *
-     * The returned handler will wrap the provided handler or use the most
-     * appropriate default handler for you system. The returned HandlerStack has
-     * support for cookies, redirects, HTTP error exceptions, and preparing a body
-     * before sending.
-     *
-     * The returned handler stack can be passed to a client in the "handler"
-     * option.
-     *
-     * @param callable $handler HTTP handler function to use with the stack. If no
-     *                          handler is provided, the best handler for your
-     *                          system will be utilized.
-     *
-     * @return HandlerStack
-     */
-    public static function create(callable $handler = null)
-    {
-        $stack = new self($handler ?: choose_handler());
-        $stack->push(Middleware::httpErrors(), 'http_errors');
-        $stack->push(Middleware::redirect(), 'allow_redirects');
-        $stack->push(Middleware::cookies(), 'cookies');
-        $stack->push(Middleware::prepareBody(), 'prepare_body');
-
-        return $stack;
-    }
-
-    /**
-     * @param callable $handler Underlying HTTP handler.
-     */
-    public function __construct(callable $handler = null)
-    {
-        $this->handler = $handler;
-    }
-
-    /**
-     * Invokes the handler stack as a composed handler
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (!$this->cached) {
-            $this->cached = $this->resolve();
-        }
-
-        $handler = $this->cached;
-        return $handler($request, $options);
-    }
-
-    /**
-     * Dumps a string representation of the stack.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $depth = 0;
-        $stack = [];
-        if ($this->handler) {
-            $stack[] = "0) Handler: " . $this->debugCallable($this->handler);
-        }
-
-        $result = '';
-        foreach (array_reverse($this->stack) as $tuple) {
-            $depth++;
-            $str = "{$depth}) Name: '{$tuple[1]}', ";
-            $str .= "Function: " . $this->debugCallable($tuple[0]);
-            $result = "> {$str}\n{$result}";
-            $stack[] = $str;
-        }
-
-        foreach (array_keys($stack) as $k) {
-            $result .= "< {$stack[$k]}\n";
-        }
-
-        return $result;
-    }
-
-    /**
-     * Set the HTTP handler that actually returns a promise.
-     *
-     * @param callable $handler Accepts a request and array of options and
-     *                          returns a Promise.
-     */
-    public function setHandler(callable $handler)
-    {
-        $this->handler = $handler;
-        $this->cached = null;
-    }
-
-    /**
-     * Returns true if the builder has a handler.
-     *
-     * @return bool
-     */
-    public function hasHandler()
-    {
-        return (bool) $this->handler;
-    }
-
-    /**
-     * Unshift a middleware to the bottom of the stack.
-     *
-     * @param callable $middleware Middleware function
-     * @param string   $name       Name to register for this middleware.
-     */
-    public function unshift(callable $middleware, $name = null)
-    {
-        array_unshift($this->stack, [$middleware, $name]);
-        $this->cached = null;
-    }
-
-    /**
-     * Push a middleware to the top of the stack.
-     *
-     * @param callable $middleware Middleware function
-     * @param string   $name       Name to register for this middleware.
-     */
-    public function push(callable $middleware, $name = '')
-    {
-        $this->stack[] = [$middleware, $name];
-        $this->cached = null;
-    }
-
-    /**
-     * Add a middleware before another middleware by name.
-     *
-     * @param string   $findName   Middleware to find
-     * @param callable $middleware Middleware function
-     * @param string   $withName   Name to register for this middleware.
-     */
-    public function before($findName, callable $middleware, $withName = '')
-    {
-        $this->splice($findName, $withName, $middleware, true);
-    }
-
-    /**
-     * Add a middleware after another middleware by name.
-     *
-     * @param string   $findName   Middleware to find
-     * @param callable $middleware Middleware function
-     * @param string   $withName   Name to register for this middleware.
-     */
-    public function after($findName, callable $middleware, $withName = '')
-    {
-        $this->splice($findName, $withName, $middleware, false);
-    }
-
-    /**
-     * Remove a middleware by instance or name from the stack.
-     *
-     * @param callable|string $remove Middleware to remove by instance or name.
-     */
-    public function remove($remove)
-    {
-        $this->cached = null;
-        $idx = is_callable($remove) ? 0 : 1;
-        $this->stack = array_values(array_filter(
-            $this->stack,
-            function ($tuple) use ($idx, $remove) {
-                return $tuple[$idx] !== $remove;
-            }
-        ));
-    }
-
-    /**
-     * Compose the middleware and handler into a single callable function.
-     *
-     * @return callable
-     */
-    public function resolve()
-    {
-        if (!($prev = $this->handler)) {
-            throw new \LogicException('No handler has been specified');
-        }
-
-        foreach (array_reverse($this->stack) as $fn) {
-            $prev = $fn[0]($prev);
-        }
-
-        return $prev;
-    }
-
-    /**
-     * @param $name
-     * @return int
-     */
-    private function findByName($name)
-    {
-        foreach ($this->stack as $k => $v) {
-            if ($v[1] === $name) {
-                return $k;
-            }
-        }
-
-        throw new \InvalidArgumentException("Middleware not found: $name");
-    }
-
-    /**
-     * Splices a function into the middleware list at a specific position.
-     *
-     * @param          $findName
-     * @param          $withName
-     * @param callable $middleware
-     * @param          $before
-     */
-    private function splice($findName, $withName, callable $middleware, $before)
-    {
-        $this->cached = null;
-        $idx = $this->findByName($findName);
-        $tuple = [$middleware, $withName];
-
-        if ($before) {
-            if ($idx === 0) {
-                array_unshift($this->stack, $tuple);
-            } else {
-                $replacement = [$tuple, $this->stack[$idx]];
-                array_splice($this->stack, $idx, 1, $replacement);
-            }
-        } elseif ($idx === count($this->stack) - 1) {
-            $this->stack[] = $tuple;
-        } else {
-            $replacement = [$this->stack[$idx], $tuple];
-            array_splice($this->stack, $idx, 1, $replacement);
-        }
-    }
-
-    /**
-     * Provides a debug string for a given callable.
-     *
-     * @param array|callable $fn Function to write as a string.
-     *
-     * @return string
-     */
-    private function debugCallable($fn)
-    {
-        if (is_string($fn)) {
-            return "callable({$fn})";
-        }
-
-        if (is_array($fn)) {
-            return is_string($fn[0])
-                ? "callable({$fn[0]}::{$fn[1]})"
-                : "callable(['" . get_class($fn[0]) . "', '{$fn[1]}'])";
-        }
-
-        return 'callable(' . spl_object_hash($fn) . ')';
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
deleted file mode 100644
index 6b090a9..0000000
--- a/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use Psr\Http\Message\MessageInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Formats log messages using variable substitutions for requests, responses,
- * and other transactional data.
- *
- * The following variable substitutions are supported:
- *
- * - {request}:        Full HTTP request message
- * - {response}:       Full HTTP response message
- * - {ts}:             ISO 8601 date in GMT
- * - {date_iso_8601}   ISO 8601 date in GMT
- * - {date_common_log} Apache common log date using the configured timezone.
- * - {host}:           Host of the request
- * - {method}:         Method of the request
- * - {uri}:            URI of the request
- * - {host}:           Host of the request
- * - {version}:        Protocol version
- * - {target}:         Request target of the request (path + query + fragment)
- * - {hostname}:       Hostname of the machine that sent the request
- * - {code}:           Status code of the response (if available)
- * - {phrase}:         Reason phrase of the response  (if available)
- * - {error}:          Any error messages (if available)
- * - {req_header_*}:   Replace `*` with the lowercased name of a request header to add to the message
- * - {res_header_*}:   Replace `*` with the lowercased name of a response header to add to the message
- * - {req_headers}:    Request headers
- * - {res_headers}:    Response headers
- * - {req_body}:       Request body
- * - {res_body}:       Response body
- */
-class MessageFormatter
-{
-    /**
-     * Apache Common Log Format.
-     * @link http://httpd.apache.org/docs/2.4/logs.html#common
-     * @var string
-     */
-    const CLF = "{hostname} {req_header_User-Agent} - [{date_common_log}] \"{method} {target} HTTP/{version}\" {code} {res_header_Content-Length}";
-    const DEBUG = ">>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}";
-    const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}';
-
-    /** @var string Template used to format log messages */
-    private $template;
-
-    /**
-     * @param string $template Log message template
-     */
-    public function __construct($template = self::CLF)
-    {
-        $this->template = $template ?: self::CLF;
-    }
-
-    /**
-     * Returns a formatted message string.
-     *
-     * @param RequestInterface  $request  Request that was sent
-     * @param ResponseInterface $response Response that was received
-     * @param \Exception        $error    Exception that was received
-     *
-     * @return string
-     */
-    public function format(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $error = null
-    ) {
-        $cache = [];
-
-        return preg_replace_callback(
-            '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
-            function (array $matches) use ($request, $response, $error, &$cache) {
-
-                if (isset($cache[$matches[1]])) {
-                    return $cache[$matches[1]];
-                }
-
-                $result = '';
-                switch ($matches[1]) {
-                    case 'request':
-                        $result = Psr7\str($request);
-                        break;
-                    case 'response':
-                        $result = $response ? Psr7\str($response) : '';
-                        break;
-                    case 'req_headers':
-                        $result = trim($request->getMethod()
-                                . ' ' . $request->getRequestTarget())
-                            . ' HTTP/' . $request->getProtocolVersion() . "\r\n"
-                            . $this->headers($request);
-                        break;
-                    case 'res_headers':
-                        $result = $response ?
-                            sprintf(
-                                'HTTP/%s %d %s',
-                                $response->getProtocolVersion(),
-                                $response->getStatusCode(),
-                                $response->getReasonPhrase()
-                            ) . "\r\n" . $this->headers($response)
-                            : 'NULL';
-                        break;
-                    case 'req_body':
-                        $result = $request->getBody();
-                        break;
-                    case 'res_body':
-                        $result = $response ? $response->getBody() : 'NULL';
-                        break;
-                    case 'ts':
-                    case 'date_iso_8601':
-                        $result = gmdate('c');
-                        break;
-                    case 'date_common_log':
-                        $result = date('d/M/Y:H:i:s O');
-                        break;
-                    case 'method':
-                        $result = $request->getMethod();
-                        break;
-                    case 'version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'uri':
-                    case 'url':
-                        $result = $request->getUri();
-                        break;
-                    case 'target':
-                        $result = $request->getRequestTarget();
-                        break;
-                    case 'req_version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'res_version':
-                        $result = $response
-                            ? $response->getProtocolVersion()
-                            : 'NULL';
-                        break;
-                    case 'host':
-                        $result = $request->getHeaderLine('Host');
-                        break;
-                    case 'hostname':
-                        $result = gethostname();
-                        break;
-                    case 'code':
-                        $result = $response ? $response->getStatusCode() : 'NULL';
-                        break;
-                    case 'phrase':
-                        $result = $response ? $response->getReasonPhrase() : 'NULL';
-                        break;
-                    case 'error':
-                        $result = $error ? $error->getMessage() : 'NULL';
-                        break;
-                    default:
-                        // handle prefixed dynamic headers
-                        if (strpos($matches[1], 'req_header_') === 0) {
-                            $result = $request->getHeaderLine(substr($matches[1], 11));
-                        } elseif (strpos($matches[1], 'res_header_') === 0) {
-                            $result = $response
-                                ? $response->getHeaderLine(substr($matches[1], 11))
-                                : 'NULL';
-                        }
-                }
-
-                $cache[$matches[1]] = $result;
-                return $result;
-            },
-            $this->template
-        );
-    }
-
-    private function headers(MessageInterface $message)
-    {
-        $result = '';
-        foreach ($message->getHeaders() as $name => $values) {
-            $result .= $name . ': ' . implode(', ', $values) . "\r\n";
-        }
-
-        return trim($result);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Middleware.php b/vendor/guzzlehttp/guzzle/src/Middleware.php
deleted file mode 100644
index 2f165f3..0000000
--- a/vendor/guzzlehttp/guzzle/src/Middleware.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Cookie\CookieJarInterface;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Exception\ServerException;
-use GuzzleHttp\Promise\RejectedPromise;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-
-/**
- * Functions used to create and wrap handlers with handler middleware.
- */
-final class Middleware
-{
-    /**
-     * Middleware that adds cookies to requests.
-     *
-     * The options array must be set to a CookieJarInterface in order to use
-     * cookies. This is typically handled for you by a client.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function cookies()
-    {
-        return function (callable $handler) {
-            return function ($request, array $options) use ($handler) {
-                if (empty($options['cookies'])) {
-                    return $handler($request, $options);
-                } elseif (!($options['cookies'] instanceof CookieJarInterface)) {
-                    throw new \InvalidArgumentException('cookies must be an instance of GuzzleHttp\Cookie\CookieJarInterface');
-                }
-                $cookieJar = $options['cookies'];
-                $request = $cookieJar->withCookieHeader($request);
-                return $handler($request, $options)
-                    ->then(function ($response) use ($cookieJar, $request) {
-                        $cookieJar->extractCookies($request, $response);
-                        return $response;
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that throws exceptions for 4xx or 5xx responses when the
-     * "http_error" request option is set to true.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function httpErrors()
-    {
-        return function (callable $handler) {
-            return function ($request, array $options) use ($handler) {
-                if (empty($options['http_errors'])) {
-                    return $handler($request, $options);
-                }
-                return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($request, $handler) {
-                        $code = $response->getStatusCode();
-                        if ($code < 400) {
-                            return $response;
-                        }
-                        throw $code > 499
-                            ? new ServerException("Server error: $code", $request, $response)
-                            : new ClientException("Client error: $code", $request, $response);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that pushes history data to an ArrayAccess container.
-     *
-     * @param array $container Container to hold the history (by reference).
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function history(array &$container)
-    {
-        return function (callable $handler) use (&$container) {
-            return function ($request, array $options) use ($handler, &$container) {
-                return $handler($request, $options)->then(
-                    function ($value) use ($request, &$container, $options) {
-                        $container[] = [
-                            'request'  => $request,
-                            'response' => $value,
-                            'error'    => null,
-                            'options'  => $options
-                        ];
-                        return $value;
-                    },
-                    function ($reason) use ($request, &$container, $options) {
-                        $container[] = [
-                            'request'  => $request,
-                            'response' => null,
-                            'error'    => $reason,
-                            'options'  => $options
-                        ];
-                        return new RejectedPromise($reason);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that invokes a callback before and after sending a request.
-     *
-     * The provided listener cannot modify or alter the response. It simply
-     * "taps" into the chain to be notified before returning the promise. The
-     * before listener accepts a request and options array, and the after
-     * listener accepts a request, options array, and response promise.
-     *
-     * @param callable $before Function to invoke before forwarding the request.
-     * @param callable $after  Function invoked after forwarding.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function tap(callable $before = null, callable $after = null)
-    {
-        return function (callable $handler) use ($before, $after) {
-            return function ($request, array $options) use ($handler, $before, $after) {
-                if ($before) {
-                    $before($request, $options);
-                }
-                $response = $handler($request, $options);
-                if ($after) {
-                    $after($request, $options, $response);
-                }
-                return $response;
-            };
-        };
-    }
-
-    /**
-     * Middleware that handles request redirects.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function redirect()
-    {
-        return function (callable $handler) {
-            return new RedirectMiddleware($handler);
-        };
-    }
-
-    /**
-     * Middleware that retries requests based on the boolean result of
-     * invoking the provided "decider" function.
-     *
-     * If no delay function is provided, a simple implementation of exponential
-     * backoff will be utilized.
-     *
-     * @param callable $decider Function that accepts the number of retries,
-     *                          a request, [response], and [exception] and
-     *                          returns true if the request is to be retried.
-     * @param callable $delay   Function that accepts the number of retries and
-     *                          returns the number of milliseconds to delay.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function retry(callable $decider, callable $delay = null)
-    {
-        return function (callable $handler) use ($decider, $delay) {
-            return new RetryMiddleware($decider, $handler, $delay);
-        };
-    }
-
-    /**
-     * Middleware that logs requests, responses, and errors using a message
-     * formatter.
-     *
-     * @param LoggerInterface  $logger Logs messages.
-     * @param MessageFormatter $formatter Formatter used to create message strings.
-     * @param string           $logLevel Level at which to log requests.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
-    {
-        return function (callable $handler) use ($logger, $formatter, $logLevel) {
-            return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
-                return $handler($request, $options)->then(
-                    function ($response) use ($logger, $request, $formatter, $logLevel) {
-                        $message = $formatter->format($request, $response);
-                        $logger->log($logLevel, $message);
-                        return $response;
-                    },
-                    function ($reason) use ($logger, $request, $formatter) {
-                        $response = $reason instanceof RequestException
-                            ? $reason->getResponse()
-                            : null;
-                        $message = $formatter->format($request, $response, $reason);
-                        $logger->notice($message);
-                        return \GuzzleHttp\Promise\rejection_for($reason);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * This middleware adds a default content-type if possible, a default
-     * content-length or transfer-encoding header, and the expect header.
-     *
-     * @return callable
-     */
-    public static function prepareBody()
-    {
-        return function (callable $handler) {
-            return new PrepareBodyMiddleware($handler);
-        };
-    }
-
-    /**
-     * Middleware that applies a map function to the request before passing to
-     * the next handler.
-     *
-     * @param callable $fn Function that accepts a RequestInterface and returns
-     *                     a RequestInterface.
-     * @return callable
-     */
-    public static function mapRequest(callable $fn)
-    {
-        return function (callable $handler) use ($fn) {
-            return function ($request, array $options) use ($handler, $fn) {
-                return $handler($fn($request), $options);
-            };
-        };
-    }
-
-    /**
-     * Middleware that applies a map function to the resolved promise's
-     * response.
-     *
-     * @param callable $fn Function that accepts a ResponseInterface and
-     *                     returns a ResponseInterface.
-     * @return callable
-     */
-    public static function mapResponse(callable $fn)
-    {
-        return function (callable $handler) use ($fn) {
-            return function ($request, array $options) use ($handler, $fn) {
-                return $handler($request, $options)->then($fn);
-            };
-        };
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/Pool.php b/vendor/guzzlehttp/guzzle/src/Pool.php
deleted file mode 100644
index bc41d6e..0000000
--- a/vendor/guzzlehttp/guzzle/src/Pool.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Promise\PromisorInterface;
-use Psr\Http\Message\RequestInterface;
-use GuzzleHttp\Promise\EachPromise;
-
-/**
- * Sends and iterator of requests concurrently using a capped pool size.
- *
- * The pool will read from an iterator until it is cancelled or until the
- * iterator is consumed. When a request is yielded, the request is sent after
- * applying the "request_options" request options (if provided in the ctor).
- *
- * When a function is yielded by the iterator, the function is provided the
- * "request_options" array that should be merged on top of any existing
- * options, and the function MUST then return a wait-able promise.
- */
-class Pool implements PromisorInterface
-{
-    /** @var EachPromise */
-    private $each;
-
-    /**
-     * @param ClientInterface $client   Client used to send the requests.
-     * @param array|\Iterator $requests Requests or functions that return
-     *                                  requests to send concurrently.
-     * @param array           $config   Associative array of options
-     *     - concurrency: (int) Maximum number of requests to send concurrently
-     *     - options: Array of request options to apply to each request.
-     *     - fulfilled: (callable) Function to invoke when a request completes.
-     *     - rejected: (callable) Function to invoke when a request is rejected.
-     */
-    public function __construct(
-        ClientInterface $client,
-        $requests,
-        array $config = []
-    ) {
-        // Backwards compatibility.
-        if (isset($config['pool_size'])) {
-            $config['concurrency'] = $config['pool_size'];
-        } elseif (!isset($config['concurrency'])) {
-            $config['concurrency'] = 25;
-        }
-
-        if (isset($config['options'])) {
-            $opts = $config['options'];
-            unset($config['options']);
-        } else {
-            $opts = [];
-        }
-
-        $iterable = \GuzzleHttp\Promise\iter_for($requests);
-        $requests = function () use ($iterable, $client, $opts) {
-            foreach ($iterable as $rfn) {
-                if ($rfn instanceof RequestInterface) {
-                    yield $client->sendAsync($rfn, $opts);
-                } elseif (is_callable($rfn)) {
-                    yield $rfn($opts);
-                } else {
-                    throw new \InvalidArgumentException('Each value yielded by '
-                        . 'the iterator must be a Psr7\Http\Message\RequestInterface '
-                        . 'or a callable that returns a promise that fulfills '
-                        . 'with a Psr7\Message\Http\ResponseInterface object.');
-                }
-            }
-        };
-
-        $this->each = new EachPromise($requests(), $config);
-    }
-
-    public function promise()
-    {
-        return $this->each->promise();
-    }
-
-    /**
-     * Sends multiple requests concurrently and returns an array of responses
-     * and exceptions that uses the same ordering as the provided requests.
-     *
-     * IMPORTANT: This method keeps every request and response in memory, and
-     * as such, is NOT recommended when sending a large number or an
-     * indeterminate number of requests concurrently.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send concurrently.
-     * @param array           $options  Passes through the options available in
-     *                                  {@see GuzzleHttp\Pool::__construct}
-     *
-     * @return array Returns an array containing the response or an exception
-     *               in the same order that the requests were sent.
-     * @throws \InvalidArgumentException if the event format is incorrect.
-     */
-    public static function batch(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $res = [];
-        self::cmpCallback($options, 'fulfilled', $res);
-        self::cmpCallback($options, 'rejected', $res);
-        $pool = new static($client, $requests, $options);
-        $pool->promise()->wait();
-        ksort($res);
-
-        return $res;
-    }
-
-    private static function cmpCallback(array &$options, $name, array &$results)
-    {
-        if (!isset($options[$name])) {
-            $options[$name] = function ($v, $k) use (&$results) {
-                $results[$k] = $v;
-            };
-        } else {
-            $currentFn = $options[$name];
-            $options[$name] = function ($v, $k) use (&$results, $currentFn) {
-                $currentFn($v, $k);
-                $results[$k] = $v;
-            };
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
deleted file mode 100644
index e6d176b..0000000
--- a/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Prepares requests that contain a body, adding the Content-Length,
- * Content-Type, and Expect headers.
- */
-class PrepareBodyMiddleware
-{
-    /** @var callable  */
-    private $nextHandler;
-
-    /** @var array */
-    private static $skipMethods = ['GET' => true, 'HEAD' => true];
-
-    /**
-     * @param callable $nextHandler Next handler to invoke.
-     */
-    public function __construct(callable $nextHandler)
-    {
-        $this->nextHandler = $nextHandler;
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $fn = $this->nextHandler;
-
-        // Don't do anything if the request has no body.
-        if (isset(self::$skipMethods[$request->getMethod()])
-            || $request->getBody()->getSize() === 0
-        ) {
-            return $fn($request, $options);
-        }
-
-        $modify = [];
-
-        // Add a default content-type if possible.
-        if (!$request->hasHeader('Content-Type')) {
-            if ($uri = $request->getBody()->getMetadata('uri')) {
-                if ($type = Psr7\mimetype_from_filename($uri)) {
-                    $modify['set_headers']['Content-Type'] = $type;
-                }
-            }
-        }
-
-        // Add a default content-length or transfer-encoding header.
-        if (!isset(self::$skipMethods[$request->getMethod()])
-            && !$request->hasHeader('Content-Length')
-            && !$request->hasHeader('Transfer-Encoding')
-        ) {
-            $size = $request->getBody()->getSize();
-            if ($size !== null) {
-                $modify['set_headers']['Content-Length'] = $size;
-            } else {
-                $modify['set_headers']['Transfer-Encoding'] = 'chunked';
-            }
-        }
-
-        // Add the expect header if needed.
-        $this->addExpectHeader($request, $options, $modify);
-
-        return $fn(Psr7\modify_request($request, $modify), $options);
-    }
-
-    private function addExpectHeader(
-        RequestInterface $request,
-        array $options,
-        array &$modify
-    ) {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-
-        $expect = isset($options['expect']) ? $options['expect'] : null;
-
-        // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
-        if ($expect === false || $request->getProtocolVersion() < 1.1) {
-            return;
-        }
-
-        // The expect header is unconditionally enabled
-        if ($expect === true) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-            return;
-        }
-
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $body = $request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
deleted file mode 100644
index dbe8b87..0000000
--- a/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Exception\TooManyRedirectsException;
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Request redirect middleware.
- *
- * Apply this middleware like other middleware using
- * {@see GuzzleHttp\Middleware::redirect()}.
- */
-class RedirectMiddleware
-{
-    const HISTORY_HEADER = 'X-Guzzle-Redirect-History';
-
-    public static $defaultSettings = [
-        'max'             => 5,
-        'protocols'       => ['http', 'https'],
-        'strict'          => false,
-        'referer'         => false,
-        'track_redirects' => false,
-    ];
-
-    /** @var callable  */
-    private $nextHandler;
-
-    /**
-     * @param callable $nextHandler Next handler to invoke.
-     */
-    public function __construct(callable $nextHandler)
-    {
-        $this->nextHandler = $nextHandler;
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $fn = $this->nextHandler;
-
-        if (empty($options['allow_redirects'])) {
-            return $fn($request, $options);
-        }
-
-        if ($options['allow_redirects'] === true) {
-            $options['allow_redirects'] = self::$defaultSettings;
-        } elseif (!is_array($options['allow_redirects'])) {
-            throw new \InvalidArgumentException('allow_redirects must be true, false, or array');
-        } else {
-            // Merge the default settings with the provided settings
-            $options['allow_redirects'] += self::$defaultSettings;
-        }
-
-        if (empty($options['allow_redirects']['max'])) {
-            return $fn($request, $options);
-        }
-
-        return $fn($request, $options)
-            ->then(function (ResponseInterface $response) use ($request, $options) {
-                return $this->checkRedirect($request, $options, $response);
-            });
-    }
-
-    /**
-     * @param RequestInterface  $request
-     * @param array             $options
-     * @param ResponseInterface|PromiseInterface $response
-     *
-     * @return ResponseInterface|PromiseInterface
-     */
-    public function checkRedirect(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ) {
-        if (substr($response->getStatusCode(), 0, 1) != '3'
-            || !$response->hasHeader('Location')
-        ) {
-            return $response;
-        }
-
-        $this->guardMax($request, $options);
-        $nextRequest = $this->modifyRequest($request, $options, $response);
-
-        if (isset($options['allow_redirects']['on_redirect'])) {
-            call_user_func(
-                $options['allow_redirects']['on_redirect'],
-                $request,
-                $response,
-                $nextRequest->getUri()
-            );
-        }
-
-        /** @var PromiseInterface|ResponseInterface $promise */
-        $promise = $this($nextRequest, $options);
-
-        // Add headers to be able to track history of redirects.
-        if (!empty($options['allow_redirects']['track_redirects'])) {
-            return $this->withTracking(
-                $promise,
-                (string) $nextRequest->getUri()
-            );
-        }
-
-        return $promise;
-    }
-
-    private function withTracking(PromiseInterface $promise, $uri)
-    {
-        return $promise->then(
-            function (ResponseInterface $response) use ($uri) {
-                // Note that we are pushing to the front of the list as this
-                // would be an earlier response than what is currently present
-                // in the history header.
-                $header = $response->getHeader(self::HISTORY_HEADER);
-                array_unshift($header, $uri);
-                return $response->withHeader(self::HISTORY_HEADER, $header);
-            }
-        );
-    }
-
-    private function guardMax(RequestInterface $request, array &$options)
-    {
-        $current = isset($options['__redirect_count'])
-            ? $options['__redirect_count']
-            : 0;
-        $options['__redirect_count'] = $current + 1;
-        $max = $options['allow_redirects']['max'];
-
-        if ($options['__redirect_count'] > $max) {
-            throw new TooManyRedirectsException(
-                "Will not follow more than {$max} redirects",
-                $request
-            );
-        }
-    }
-
-    /**
-     * @param RequestInterface  $request
-     * @param array             $options
-     * @param ResponseInterface $response
-     *
-     * @return RequestInterface
-     */
-    public function modifyRequest(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ) {
-        // Request modifications to apply.
-        $modify = [];
-        $protocols = $options['allow_redirects']['protocols'];
-
-        // Use a GET request if this is an entity enclosing request and we are
-        // not forcing RFC compliance, but rather emulating what all browsers
-        // would do.
-        $statusCode = $response->getStatusCode();
-        if ($statusCode == 303 ||
-            ($statusCode <= 302 && $request->getBody() && !$options['allow_redirects']['strict'])
-        ) {
-            $modify['method'] = 'GET';
-            $modify['body'] = '';
-        }
-
-        $modify['uri'] = $this->redirectUri($request, $response, $protocols);
-        Psr7\rewind_body($request);
-
-        // Add the Referer header if it is told to do so and only
-        // add the header if we are not redirecting from https to http.
-        if ($options['allow_redirects']['referer']
-            && $modify['uri']->getScheme() === $request->getUri()->getScheme()
-        ) {
-            $uri = $request->getUri()->withUserInfo('', '');
-            $modify['set_headers']['Referer'] = (string) $uri;
-        } else {
-            $modify['remove_headers'][] = 'Referer';
-        }
-
-        // Remove Authorization header if host is different.
-        if ($request->getUri()->getHost() !== $modify['uri']->getHost()) {
-            $modify['remove_headers'][] = 'Authorization';
-        }
-
-        return Psr7\modify_request($request, $modify);
-    }
-
-    /**
-     * Set the appropriate URL on the request based on the location header
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param array             $protocols
-     *
-     * @return UriInterface
-     */
-    private function redirectUri(
-        RequestInterface $request,
-        ResponseInterface $response,
-        array $protocols
-    ) {
-        $location = Psr7\Uri::resolve(
-            $request->getUri(),
-            $response->getHeaderLine('Location')
-        );
-
-        // Ensure that the redirect URI is allowed based on the protocols.
-        if (!in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(
-                sprintf(
-                    'Redirect URI, %s, does not use one of the allowed redirect protocols: %s',
-                    $location,
-                    implode(', ', $protocols)
-                ),
-                $request,
-                $response
-            );
-        }
-
-        return $location;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/vendor/guzzlehttp/guzzle/src/RequestOptions.php
deleted file mode 100644
index 3af2f36..0000000
--- a/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * This class contains a list of built-in Guzzle request options.
- *
- * More documentation for each option can be found at http://guzzlephp.org/.
- *
- * @link http://docs.guzzlephp.org/en/v6/request-options.html
- */
-final class RequestOptions
-{
-    /**
-     * allow_redirects: (bool|array) Controls redirect behavior. Pass false
-     * to disable redirects, pass true to enable redirects, pass an
-     * associative to provide custom redirect settings. Defaults to "false".
-     * This option only works if your handler has the RedirectMiddleware. When
-     * passing an associative array, you can provide the following key value
-     * pairs:
-     *
-     * - max: (int, default=5) maximum number of allowed redirects.
-     * - strict: (bool, default=false) Set to true to use strict redirects
-     *   meaning redirect POST requests with POST requests vs. doing what most
-     *   browsers do which is redirect POST requests with GET requests
-     * - referer: (bool, default=true) Set to false to disable the Referer
-     *   header.
-     * - protocols: (array, default=['http', 'https']) Allowed redirect
-     *   protocols.
-     * - on_redirect: (callable) PHP callable that is invoked when a redirect
-     *   is encountered. The callable is invoked with the request, the redirect
-     *   response that was received, and the effective URI. Any return value
-     *   from the on_redirect function is ignored.
-     */
-    const ALLOW_REDIRECTS = 'allow_redirects';
-
-    /**
-     * auth: (array) Pass an array of HTTP authentication parameters to use
-     * with the request. The array must contain the username in index [0],
-     * the password in index [1], and you can optionally provide a built-in
-     * authentication type in index [2]. Pass null to disable authentication
-     * for a request.
-     */
-    const AUTH = 'auth';
-
-    /**
-     * body: (string|null|callable|iterator|object) Body to send in the
-     * request.
-     */
-    const BODY = 'body';
-
-    /**
-     * cert: (string|array) Set to a string to specify the path to a file
-     * containing a PEM formatted SSL client side certificate. If a password
-     * is required, then set cert to an array containing the path to the PEM
-     * file in the first array element followed by the certificate password
-     * in the second array element.
-     */
-    const CERT = 'cert';
-
-    /**
-     * cookies: (bool|GuzzleHttp\Cookie\CookieJarInterface, default=false)
-     * Specifies whether or not cookies are used in a request or what cookie
-     * jar to use or what cookies to send. This option only works if your
-     * handler has the `cookie` middleware. Valid values are `false` and
-     * an instance of {@see GuzzleHttp\Cookie\CookieJarInterface}.
-     */
-    const COOKIES = 'cookies';
-
-    /**
-     * connect_timeout: (float, default=0) Float describing the number of
-     * seconds to wait while trying to connect to a server. Use 0 to wait
-     * indefinitely (the default behavior).
-     */
-    const CONNECT_TIMEOUT = 'connect_timeout';
-
-    /**
-     * debug: (bool|resource) Set to true or set to a PHP stream returned by
-     * fopen()  enable debug output with the HTTP handler used to send a
-     * request.
-     */
-    const DEBUG = 'debug';
-
-    /**
-     * decode_content: (bool, default=true) Specify whether or not
-     * Content-Encoding responses (gzip, deflate, etc.) are automatically
-     * decoded.
-     */
-    const DECODE_CONTENT = 'decode_content';
-
-    /**
-     * delay: (int) The amount of time to delay before sending in milliseconds.
-     */
-    const DELAY = 'delay';
-
-    /**
-     * expect: (bool|integer) Controls the behavior of the
-     * "Expect: 100-Continue" header.
-     *
-     * Set to `true` to enable the "Expect: 100-Continue" header for all
-     * requests that sends a body. Set to `false` to disable the
-     * "Expect: 100-Continue" header for all requests. Set to a number so that
-     * the size of the payload must be greater than the number in order to send
-     * the Expect header. Setting to a number will send the Expect header for
-     * all requests in which the size of the payload cannot be determined or
-     * where the body is not rewindable.
-     *
-     * By default, Guzzle will add the "Expect: 100-Continue" header when the
-     * size of the body of a request is greater than 1 MB and a request is
-     * using HTTP/1.1.
-     */
-    const EXPECT = 'expect';
-
-    /**
-     * form_params: (array) Associative array of form field names to values
-     * where each value is a string or array of strings. Sets the Content-Type
-     * header to application/x-www-form-urlencoded when no Content-Type header
-     * is already present.
-     */
-    const FORM_PARAMS = 'form_params';
-
-    /**
-     * headers: (array) Associative array of HTTP headers. Each value MUST be
-     * a string or array of strings.
-     */
-    const HEADERS = 'headers';
-
-    /**
-     * http_errors: (bool, default=true) Set to false to disable exceptions
-     * when a non- successful HTTP response is received. By default,
-     * exceptions will be thrown for 4xx and 5xx responses. This option only
-     * works if your handler has the `httpErrors` middleware.
-     */
-    const HTTP_ERRORS = 'http_errors';
-
-    /**
-     * json: (mixed) Adds JSON data to a request. The provided value is JSON
-     * encoded and a Content-Type header of application/json will be added to
-     * the request if no Content-Type header is already present.
-     */
-    const JSON = 'json';
-
-    /**
-     * multipart: (array) Array of associative arrays, each containing a
-     * required "name" key mapping to the form field, name, a required
-     * "contents" key mapping to a StreamInterface|resource|string, an
-     * optional "headers" associative array of custom headers, and an
-     * optional "filename" key mapping to a string to send as the filename in
-     * the part. If no "filename" key is present, then no "filename" attribute
-     * will be added to the part.
-     */
-    const MULTIPART = 'multipart';
-
-    /**
-     * on_headers: (callable) A callable that is invoked when the HTTP headers
-     * of the response have been received but the body has not yet begun to
-     * download.
-     */
-    const ON_HEADERS = 'on_headers';
-
-    /**
-     * on_stats: (callable) allows you to get access to transfer statistics of
-     * a request and access the lower level transfer details of the handler
-     * associated with your client. ``on_stats`` is a callable that is invoked
-     * when a handler has finished sending a request. The callback is invoked
-     * with transfer statistics about the request, the response received, or
-     * the error encountered. Included in the data is the total amount of time
-     * taken to send the request.
-     */
-    const ON_STATS = 'on_stats';
-
-    /**
-     * progress: (callable) Defines a function to invoke when transfer
-     * progress is made. The function accepts the following positional
-     * arguments: the total number of bytes expected to be downloaded, the
-     * number of bytes downloaded so far, the number of bytes expected to be
-     * uploaded, the number of bytes uploaded so far.
-     */
-    const PROGRESS = 'progress';
-
-    /**
-     * proxy: (string|array) Pass a string to specify an HTTP proxy, or an
-     * array to specify different proxies for different protocols (where the
-     * key is the protocol and the value is a proxy string).
-     */
-    const PROXY = 'proxy';
-
-    /**
-     * query: (array|string) Associative array of query string values to add
-     * to the request. This option uses PHP's http_build_query() to create
-     * the string representation. Pass a string value if you need more
-     * control than what this method provides
-     */
-    const QUERY = 'query';
-
-    /**
-     * sink: (resource|string|StreamInterface) Where the data of the
-     * response is written to. Defaults to a PHP temp stream. Providing a
-     * string will write data to a file by the given name.
-     */
-    const SINK = 'sink';
-
-    /**
-     * synchronous: (bool) Set to true to inform HTTP handlers that you intend
-     * on waiting on the response. This can be useful for optimizations. Note
-     * that a promise is still returned if you are using one of the async
-     * client methods.
-     */
-    const SYNCHRONOUS = 'synchronous';
-
-    /**
-     * ssl_key: (array|string) Specify the path to a file containing a private
-     * SSL key in PEM format. If a password is required, then set to an array
-     * containing the path to the SSL key in the first array element followed
-     * by the password required for the certificate in the second element.
-     */
-    const SSL_KEY = 'ssl_key';
-
-    /**
-     * stream: Set to true to attempt to stream a response rather than
-     * download it all up-front.
-     */
-    const STREAM = 'stream';
-
-    /**
-     * verify: (bool|string, default=true) Describes the SSL certificate
-     * verification behavior of a request. Set to true to enable SSL
-     * certificate verification using the system CA bundle when available
-     * (the default). Set to false to disable certificate verification (this
-     * is insecure!). Set to a string to provide the path to a CA bundle on
-     * disk to enable verification using a custom certificate.
-     */
-    const VERIFY = 'verify';
-
-    /**
-     * timeout: (float, default=0) Float describing the timeout of the
-     * request in seconds. Use 0 to wait indefinitely (the default behavior).
-     */
-    const TIMEOUT = 'timeout';
-
-    /**
-     * version: (float) Specifies the HTTP protocol version to attempt to use.
-     */
-    const VERSION = 'version';
-}
diff --git a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
deleted file mode 100644
index 4b95a14..0000000
--- a/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Promise\PromiseInterface;
-use GuzzleHttp\Promise\RejectedPromise;
-use GuzzleHttp\Psr7;
-use Psr\Http\Message\RequestInterface;
-
-/**
- * Middleware that retries requests based on the boolean result of
- * invoking the provided "decider" function.
- */
-class RetryMiddleware
-{
-    /** @var callable  */
-    private $nextHandler;
-
-    /** @var callable */
-    private $decider;
-
-    /**
-     * @param callable $decider     Function that accepts the number of retries,
-     *                              a request, [response], and [exception] and
-     *                              returns true if the request is to be
-     *                              retried.
-     * @param callable $nextHandler Next handler to invoke.
-     * @param callable $delay       Function that accepts the number of retries
-     *                              and returns the number of milliseconds to
-     *                              delay.
-     */
-    public function __construct(
-        callable $decider,
-        callable $nextHandler,
-        callable $delay = null
-    ) {
-        $this->decider = $decider;
-        $this->nextHandler = $nextHandler;
-        $this->delay = $delay ?: __CLASS__ . '::exponentialDelay';
-    }
-
-    /**
-     * Default exponential backoff delay function.
-     *
-     * @param $retries
-     *
-     * @return int
-     */
-    public static function exponentialDelay($retries)
-    {
-        return (int) pow(2, $retries - 1);
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (!isset($options['retries'])) {
-            $options['retries'] = 0;
-        }
-
-        $fn = $this->nextHandler;
-        return $fn($request, $options)
-            ->then(
-                $this->onFulfilled($request, $options),
-                $this->onRejected($request, $options)
-            );
-    }
-
-    private function onFulfilled(RequestInterface $req, array $options)
-    {
-        return function ($value) use ($req, $options) {
-            if (!call_user_func(
-                $this->decider,
-                $options['retries'],
-                $req,
-                $value,
-                null
-            )) {
-                return $value;
-            }
-            return $this->doRetry($req, $options);
-        };
-    }
-
-    private function onRejected(RequestInterface $req, array $options)
-    {
-        return function ($reason) use ($req, $options) {
-            if (!call_user_func(
-                $this->decider,
-                $options['retries'],
-                $req,
-                null,
-                $reason
-            )) {
-                return new RejectedPromise($reason);
-            }
-            return $this->doRetry($req, $options);
-        };
-    }
-
-    private function doRetry(RequestInterface $request, array $options)
-    {
-        $options['delay'] = call_user_func($this->delay, ++$options['retries']);
-
-        return $this($request, $options);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/TransferStats.php b/vendor/guzzlehttp/guzzle/src/TransferStats.php
deleted file mode 100644
index 15f717e..0000000
--- a/vendor/guzzlehttp/guzzle/src/TransferStats.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Represents data at the point after it was transferred either successfully
- * or after a network error.
- */
-final class TransferStats
-{
-    private $request;
-    private $response;
-    private $transferTime;
-    private $handlerStats;
-    private $handlerErrorData;
-
-    /**
-     * @param RequestInterface  $request          Request that was sent.
-     * @param ResponseInterface $response         Response received (if any)
-     * @param null              $transferTime     Total handler transfer time.
-     * @param mixed             $handlerErrorData Handler error data.
-     * @param array             $handlerStats     Handler specific stats.
-     */
-    public function __construct(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        $transferTime = null,
-        $handlerErrorData = null,
-        $handlerStats = []
-    ) {
-        $this->request = $request;
-        $this->response = $response;
-        $this->transferTime = $transferTime;
-        $this->handlerErrorData = $handlerErrorData;
-        $this->handlerStats = $handlerStats;
-    }
-
-    /**
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Returns the response that was received (if any).
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Returns true if a response was received.
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return $this->response !== null;
-    }
-
-    /**
-     * Gets handler specific error data.
-     *
-     * This might be an exception, a integer representing an error code, or
-     * anything else. Relying on this value assumes that you know what handler
-     * you are using.
-     *
-     * @return mixed
-     */
-    public function getHandlerErrorData()
-    {
-        return $this->handlerErrorData;
-    }
-
-    /**
-     * Get the effective URI the request was sent to.
-     *
-     * @return UriInterface
-     */
-    public function getEffectiveUri()
-    {
-        return $this->request->getUri();
-    }
-
-    /**
-     * Get the estimated time the request was being transferred by the handler.
-     *
-     * @return float Time in seconds.
-     */
-    public function getTransferTime()
-    {
-        return $this->transferTime;
-    }
-
-    /**
-     * Gets an array of all of the handler specific transfer data.
-     *
-     * @return array
-     */
-    public function getHandlerStats()
-    {
-        return $this->handlerStats;
-    }
-
-    /**
-     * Get a specific handler statistic from the handler by name.
-     *
-     * @param string $stat Handler specific transfer stat to retrieve.
-     *
-     * @return mixed|null
-     */
-    public function getHandlerStat($stat)
-    {
-        return isset($this->handlerStats[$stat])
-            ? $this->handlerStats[$stat]
-            : null;
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/UriTemplate.php b/vendor/guzzlehttp/guzzle/src/UriTemplate.php
deleted file mode 100644
index 55dfeb5..0000000
--- a/vendor/guzzlehttp/guzzle/src/UriTemplate.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Expands URI templates. Userland implementation of PECL uri_template.
- *
- * @link http://tools.ietf.org/html/rfc6570
- */
-class UriTemplate
-{
-    /** @var string URI template */
-    private $template;
-
-    /** @var array Variables to use in the template expansion */
-    private $variables;
-
-    /** @var array Hash for quick operator lookups */
-    private static $operatorHash = array(
-        ''  => array('prefix' => '',  'joiner' => ',', 'query' => false),
-        '+' => array('prefix' => '',  'joiner' => ',', 'query' => false),
-        '#' => array('prefix' => '#', 'joiner' => ',', 'query' => false),
-        '.' => array('prefix' => '.', 'joiner' => '.', 'query' => false),
-        '/' => array('prefix' => '/', 'joiner' => '/', 'query' => false),
-        ';' => array('prefix' => ';', 'joiner' => ';', 'query' => true),
-        '?' => array('prefix' => '?', 'joiner' => '&', 'query' => true),
-        '&' => array('prefix' => '&', 'joiner' => '&', 'query' => true)
-    );
-
-    /** @var array Delimiters */
-    private static $delims = array(':', '/', '?', '#', '[', ']', '@', '!', '$',
-        '&', '\'', '(', ')', '*', '+', ',', ';', '=');
-
-    /** @var array Percent encoded delimiters */
-    private static $delimsPct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D',
-        '%40', '%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C',
-        '%3B', '%3D');
-
-    public function expand($template, array $variables)
-    {
-        if (false === strpos($template, '{')) {
-            return $template;
-        }
-
-        $this->template = $template;
-        $this->variables = $variables;
-
-        return preg_replace_callback(
-            '/\{([^\}]+)\}/',
-            [$this, 'expandMatch'],
-            $this->template
-        );
-    }
-
-    /**
-     * Parse an expression into parts
-     *
-     * @param string $expression Expression to parse
-     *
-     * @return array Returns an associative array of parts
-     */
-    private function parseExpression($expression)
-    {
-        $result = array();
-
-        if (isset(self::$operatorHash[$expression[0]])) {
-            $result['operator'] = $expression[0];
-            $expression = substr($expression, 1);
-        } else {
-            $result['operator'] = '';
-        }
-
-        foreach (explode(',', $expression) as $value) {
-            $value = trim($value);
-            $varspec = array();
-            if ($colonPos = strpos($value, ':')) {
-                $varspec['value'] = substr($value, 0, $colonPos);
-                $varspec['modifier'] = ':';
-                $varspec['position'] = (int) substr($value, $colonPos + 1);
-            } elseif (substr($value, -1) == '*') {
-                $varspec['modifier'] = '*';
-                $varspec['value'] = substr($value, 0, -1);
-            } else {
-                $varspec['value'] = (string) $value;
-                $varspec['modifier'] = '';
-            }
-            $result['values'][] = $varspec;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Process an expansion
-     *
-     * @param array $matches Matches met in the preg_replace_callback
-     *
-     * @return string Returns the replacement string
-     */
-    private function expandMatch(array $matches)
-    {
-        static $rfc1738to3986 = array('+' => '%20', '%7e' => '~');
-
-        $replacements = array();
-        $parsed = self::parseExpression($matches[1]);
-        $prefix = self::$operatorHash[$parsed['operator']]['prefix'];
-        $joiner = self::$operatorHash[$parsed['operator']]['joiner'];
-        $useQuery = self::$operatorHash[$parsed['operator']]['query'];
-
-        foreach ($parsed['values'] as $value) {
-
-            if (!isset($this->variables[$value['value']])) {
-                continue;
-            }
-
-            $variable = $this->variables[$value['value']];
-            $actuallyUseQuery = $useQuery;
-            $expanded = '';
-
-            if (is_array($variable)) {
-
-                $isAssoc = $this->isAssoc($variable);
-                $kvp = array();
-                foreach ($variable as $key => $var) {
-
-                    if ($isAssoc) {
-                        $key = rawurlencode($key);
-                        $isNestedArray = is_array($var);
-                    } else {
-                        $isNestedArray = false;
-                    }
-
-                    if (!$isNestedArray) {
-                        $var = rawurlencode($var);
-                        if ($parsed['operator'] == '+' ||
-                            $parsed['operator'] == '#'
-                        ) {
-                            $var = $this->decodeReserved($var);
-                        }
-                    }
-
-                    if ($value['modifier'] == '*') {
-                        if ($isAssoc) {
-                            if ($isNestedArray) {
-                                // Nested arrays must allow for deeply nested
-                                // structures.
-                                $var = strtr(
-                                    http_build_query([$key => $var]),
-                                    $rfc1738to3986
-                                );
-                            } else {
-                                $var = $key . '=' . $var;
-                            }
-                        } elseif ($key > 0 && $actuallyUseQuery) {
-                            $var = $value['value'] . '=' . $var;
-                        }
-                    }
-
-                    $kvp[$key] = $var;
-                }
-
-                if (empty($variable)) {
-                    $actuallyUseQuery = false;
-                } elseif ($value['modifier'] == '*') {
-                    $expanded = implode($joiner, $kvp);
-                    if ($isAssoc) {
-                        // Don't prepend the value name when using the explode
-                        // modifier with an associative array.
-                        $actuallyUseQuery = false;
-                    }
-                } else {
-                    if ($isAssoc) {
-                        // When an associative array is encountered and the
-                        // explode modifier is not set, then the result must be
-                        // a comma separated list of keys followed by their
-                        // respective values.
-                        foreach ($kvp as $k => &$v) {
-                            $v = $k . ',' . $v;
-                        }
-                    }
-                    $expanded = implode(',', $kvp);
-                }
-
-            } else {
-                if ($value['modifier'] == ':') {
-                    $variable = substr($variable, 0, $value['position']);
-                }
-                $expanded = rawurlencode($variable);
-                if ($parsed['operator'] == '+' || $parsed['operator'] == '#') {
-                    $expanded = $this->decodeReserved($expanded);
-                }
-            }
-
-            if ($actuallyUseQuery) {
-                if (!$expanded && $joiner != '&') {
-                    $expanded = $value['value'];
-                } else {
-                    $expanded = $value['value'] . '=' . $expanded;
-                }
-            }
-
-            $replacements[] = $expanded;
-        }
-
-        $ret = implode($joiner, $replacements);
-        if ($ret && $prefix) {
-            return $prefix . $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Determines if an array is associative.
-     *
-     * This makes the assumption that input arrays are sequences or hashes.
-     * This assumption is a tradeoff for accuracy in favor of speed, but it
-     * should work in almost every case where input is supplied for a URI
-     * template.
-     *
-     * @param array $array Array to check
-     *
-     * @return bool
-     */
-    private function isAssoc(array $array)
-    {
-        return $array && array_keys($array)[0] !== 0;
-    }
-
-    /**
-     * Removes percent encoding on reserved characters (used with + and #
-     * modifiers).
-     *
-     * @param string $string String to fix
-     *
-     * @return string
-     */
-    private function decodeReserved($string)
-    {
-        return str_replace(self::$delimsPct, self::$delims, $string);
-    }
-}
diff --git a/vendor/guzzlehttp/guzzle/src/functions.php b/vendor/guzzlehttp/guzzle/src/functions.php
deleted file mode 100644
index d0a2ca8..0000000
--- a/vendor/guzzlehttp/guzzle/src/functions.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Handler\CurlHandler;
-use GuzzleHttp\Handler\CurlMultiHandler;
-use GuzzleHttp\Handler\Proxy;
-use GuzzleHttp\Handler\StreamHandler;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Expands a URI template
- *
- * @param string $template  URI template
- * @param array  $variables Template variables
- *
- * @return string
- */
-function uri_template($template, array $variables)
-{
-    if (extension_loaded('uri_template')) {
-        // @codeCoverageIgnoreStart
-        return \uri_template($template, $variables);
-        // @codeCoverageIgnoreEnd
-    }
-
-    static $uriTemplate;
-    if (!$uriTemplate) {
-        $uriTemplate = new UriTemplate();
-    }
-
-    return $uriTemplate->expand($template, $variables);
-}
-
-/**
- * Debug function used to describe the provided value type and class.
- *
- * @param mixed $input
- *
- * @return string Returns a string containing the type of the variable and
- *                if a class is provided, the class name.
- */
-function describe_type($input)
-{
-    switch (gettype($input)) {
-        case 'object':
-            return 'object(' . get_class($input) . ')';
-        case 'array':
-            return 'array(' . count($input) . ')';
-        default:
-            ob_start();
-            var_dump($input);
-            // normalize float vs double
-            return str_replace('double(', 'float(', rtrim(ob_get_clean()));
-    }
-}
-
-/**
- * Parses an array of header lines into an associative array of headers.
- *
- * @param array $lines Header lines array of strings in the following
- *                     format: "Name: Value"
- * @return array
- */
-function headers_from_lines($lines)
-{
-    $headers = [];
-
-    foreach ($lines as $line) {
-        $parts = explode(':', $line, 2);
-        $headers[trim($parts[0])][] = isset($parts[1])
-            ? trim($parts[1])
-            : null;
-    }
-
-    return $headers;
-}
-
-/**
- * Returns a debug stream based on the provided variable.
- *
- * @param mixed $value Optional value
- *
- * @return resource
- */
-function debug_resource($value = null)
-{
-    if (is_resource($value)) {
-        return $value;
-    } elseif (defined('STDOUT')) {
-        return STDOUT;
-    }
-
-    return fopen('php://output', 'w');
-}
-
-/**
- * Chooses and creates a default handler to use based on the environment.
- *
- * The returned handler is not wrapped by any default middlewares.
- *
- * @throws \RuntimeException if no viable Handler is available.
- * @return callable Returns the best handler for the given system.
- */
-function choose_handler()
-{
-    $handler = null;
-    if (extension_loaded('curl')) {
-        $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
-    }
-
-    if (ini_get('allow_url_fopen')) {
-        $handler = $handler
-            ? Proxy::wrapStreaming($handler, new StreamHandler())
-            : new StreamHandler();
-    } elseif (!$handler) {
-        throw new \RuntimeException('GuzzleHttp requires cURL, the '
-            . 'allow_url_fopen ini setting, or a custom HTTP handler.');
-    }
-
-    return $handler;
-}
-
-/**
- * Get the default User-Agent string to use with Guzzle
- *
- * @return string
- */
-function default_user_agent()
-{
-    static $defaultAgent = '';
-
-    if (!$defaultAgent) {
-        $defaultAgent = 'GuzzleHttp/' . Client::VERSION;
-        if (extension_loaded('curl') && function_exists('curl_version')) {
-            $defaultAgent .= ' curl/' . \curl_version()['version'];
-        }
-        $defaultAgent .= ' PHP/' . PHP_VERSION;
-    }
-
-    return $defaultAgent;
-}
-
-/**
- * Returns the default cacert bundle for the current system.
- *
- * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
- * If those settings are not configured, then the common locations for
- * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
- * and Windows are checked. If any of these file locations are found on
- * disk, they will be utilized.
- *
- * Note: the result of this function is cached for subsequent calls.
- *
- * @return string
- * @throws \RuntimeException if no bundle can be found.
- */
-function default_ca_bundle()
-{
-    static $cached = null;
-    static $cafiles = [
-        // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
-        '/etc/pki/tls/certs/ca-bundle.crt',
-        // Ubuntu, Debian (provided by the ca-certificates package)
-        '/etc/ssl/certs/ca-certificates.crt',
-        // FreeBSD (provided by the ca_root_nss package)
-        '/usr/local/share/certs/ca-root-nss.crt',
-        // OS X provided by homebrew (using the default path)
-        '/usr/local/etc/openssl/cert.pem',
-        // Google app engine
-        '/etc/ca-certificates.crt',
-        // Windows?
-        'C:\\windows\\system32\\curl-ca-bundle.crt',
-        'C:\\windows\\curl-ca-bundle.crt',
-    ];
-
-    if ($cached) {
-        return $cached;
-    }
-
-    if ($ca = ini_get('openssl.cafile')) {
-        return $cached = $ca;
-    }
-
-    if ($ca = ini_get('curl.cainfo')) {
-        return $cached = $ca;
-    }
-
-    foreach ($cafiles as $filename) {
-        if (file_exists($filename)) {
-            return $cached = $filename;
-        }
-    }
-
-    throw new \RuntimeException(<<< EOT
-No system CA bundle could be found in any of the the common system locations.
-PHP versions earlier than 5.6 are not properly configured to use the system's
-CA bundle by default. In order to verify peer certificates, you will need to
-supply the path on disk to a certificate bundle to the 'verify' request
-option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
-need a specific certificate bundle, then Mozilla provides a commonly used CA
-bundle which can be downloaded here (provided by the maintainer of cURL):
-https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt. Once
-you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
-ini setting to point to the path to the file, allowing you to omit the 'verify'
-request option. See http://curl.haxx.se/docs/sslcerts.html for more
-information.
-EOT
-    );
-}
-
-/**
- * Creates an associative array of lowercase header names to the actual
- * header casing.
- *
- * @param array $headers
- *
- * @return array
- */
-function normalize_header_keys(array $headers)
-{
-    $result = [];
-    foreach (array_keys($headers) as $key) {
-        $result[strtolower($key)] = $key;
-    }
-
-    return $result;
-}
-
-/**
- * Returns true if the provided host matches any of the no proxy areas.
- *
- * This method will strip a port from the host if it is present. Each pattern
- * can be matched with an exact match (e.g., "foo.com" == "foo.com") or a
- * partial match: (e.g., "foo.com" == "baz.foo.com" and ".foo.com" ==
- * "baz.foo.com", but ".foo.com" != "foo.com").
- *
- * Areas are matched in the following cases:
- * 1. "*" (without quotes) always matches any hosts.
- * 2. An exact match.
- * 3. The area starts with "." and the area is the last part of the host. e.g.
- *    '.mit.edu' will match any host that ends with '.mit.edu'.
- *
- * @param string $host         Host to check against the patterns.
- * @param array  $noProxyArray An array of host patterns.
- *
- * @return bool
- */
-function is_host_in_noproxy($host, array $noProxyArray)
-{
-    if (strlen($host) === 0) {
-        throw new \InvalidArgumentException('Empty host provided');
-    }
-
-    // Strip port if present.
-    if (strpos($host, ':')) {
-        $host = explode($host, ':', 2)[0];
-    }
-
-    foreach ($noProxyArray as $area) {
-        // Always match on wildcards.
-        if ($area === '*') {
-            return true;
-        } elseif (empty($area)) {
-            // Don't match on empty values.
-            continue;
-        } elseif ($area === $host) {
-            // Exact matches.
-            return true;
-        } else {
-            // Special match if the area when prefixed with ".". Remove any
-            // existing leading "." and add a new leading ".".
-            $area = '.' . ltrim($area, '.');
-            if (substr($host, -(strlen($area))) === $area) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
diff --git a/vendor/guzzlehttp/guzzle/src/functions_include.php b/vendor/guzzlehttp/guzzle/src/functions_include.php
deleted file mode 100644
index a93393a..0000000
--- a/vendor/guzzlehttp/guzzle/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// Don't redefine the functions if included multiple times.
-if (!function_exists('GuzzleHttp\uri_template')) {
-    require __DIR__ . '/functions.php';
-}
diff --git a/vendor/guzzlehttp/promises/.gitignore b/vendor/guzzlehttp/promises/.gitignore
deleted file mode 100644
index 83ec41e..0000000
--- a/vendor/guzzlehttp/promises/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-phpunit.xml
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-build/artifacts/
-artifacts/
-docs/_build
-docs/*.pyc
-.idea
-.DS_STORE
diff --git a/vendor/guzzlehttp/promises/.travis.yml b/vendor/guzzlehttp/promises/.travis.yml
deleted file mode 100644
index 4f4d2b8..0000000
--- a/vendor/guzzlehttp/promises/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: php
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/vendor/guzzlehttp/promises/CHANGELOG.md b/vendor/guzzlehttp/promises/CHANGELOG.md
deleted file mode 100644
index daad986..0000000
--- a/vendor/guzzlehttp/promises/CHANGELOG.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# CHANGELOG
-
-## 1.0.2 - 2015-05-15
-
-* Conditionally require functions.php.
-
-## 1.0.1 - 2015-06-24
-
-* Updating EachPromise to call next on the underlying promise iterator as late
-  as possible to ensure that generators that generate new requests based on
-  callbacks are not iterated until after callbacks are invoked.
-
-## 1.0.0 - 2015-05-12
-
-* Initial release
diff --git a/vendor/guzzlehttp/promises/LICENSE b/vendor/guzzlehttp/promises/LICENSE
deleted file mode 100644
index 581d95f..0000000
--- a/vendor/guzzlehttp/promises/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
-
-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/vendor/guzzlehttp/promises/Makefile b/vendor/guzzlehttp/promises/Makefile
deleted file mode 100644
index 8d5b3ef..0000000
--- a/vendor/guzzlehttp/promises/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
diff --git a/vendor/guzzlehttp/promises/README.md b/vendor/guzzlehttp/promises/README.md
deleted file mode 100644
index c6780ab..0000000
--- a/vendor/guzzlehttp/promises/README.md
+++ /dev/null
@@ -1,501 +0,0 @@
-# Guzzle Promises
-
-[Promises/A+](https://promisesaplus.com/) implementation that handles promise
-chaining and resolution iteratively, allowing for "infinite" promise chaining
-while keeping the stack size constant. Read [this blog post](https://blog.domenic.me/youre-missing-the-point-of-promises/)
-for a general introduction to promises.
-
-- [Features](#features)
-- [Quick start](#quick-start)
-- [Synchronous wait](#synchronous-wait)
-- [Cancellation](#cancellation)
-- [API](#api)
-  - [Promise](#promise)
-  - [FulfilledPromise](#fulfilledpromise)
-  - [RejectedPromise](#rejectedpromise)
-- [Promise interop](#promise-interop)
-- [Implementation notes](#implementation-notes)
-
-
-# Features
-
-- [Promises/A+](https://promisesaplus.com/) implementation.
-- Promise resolution and chaining is handled iteratively, allowing for
-  "infinite" promise chaining.
-- Promises have a synchronous `wait` method.
-- Promises can be cancelled.
-- Works with any object that has a `then` function.
-- C# style async/await coroutine promises using
-  `GuzzleHttp\Promise\coroutine()`.
-
-
-# Quick start
-
-A *promise* represents the eventual result of an asynchronous operation. The
-primary way of interacting with a promise is through its `then` method, which
-registers callbacks to receive either a promise's eventual value or the reason
-why the promise cannot be fulfilled.
-
-
-## Callbacks
-
-Callbacks are registered with the `then` method by providing an optional 
-`$onFulfilled` followed by an optional `$onRejected` function.
-
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(
-    // $onFulfilled
-    function ($value) {
-        echo 'The promise was fulfilled.';
-    },
-    // $onRejected
-    function ($reason) {
-        echo 'The promise was rejected.';
-    }
-);
-```
-
-*Resolving* a promise means that you either fulfill a promise with a *value* or
-reject a promise with a *reason*. Resolving a promises triggers callbacks
-registered with the promises's `then` method. These callbacks are triggered
-only once and in the order in which they were added.
-
-
-## Resolving a promise
-
-Promises are fulfilled using the `resolve($value)` method. Resolving a promise
-with any value other than a `GuzzleHttp\Promise\RejectedPromise` will trigger
-all of the onFulfilled callbacks (resolving a promise with a rejected promise
-will reject the promise and trigger the `$onRejected` callbacks).
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise
-    ->then(function ($value) {
-        // Return a value and don't break the chain
-        return "Hello, " . $value;
-    })
-    // This then is executed after the first then and receives the value
-    // returned from the first then.
-    ->then(function ($value) {
-        echo $value;
-    });
-
-// Resolving the promise triggers the $onFulfilled callbacks and outputs
-// "Hello, reader".
-$promise->resolve('reader.');
-```
-
-
-## Promise forwarding
-
-Promises can be chained one after the other. Each then in the chain is a new
-promise. The return value of of a promise is what's forwarded to the next
-promise in the chain. Returning a promise in a `then` callback will cause the
-subsequent promises in the chain to only be fulfilled when the returned promise
-has been fulfilled. The next promise in the chain will be invoked with the
-resolved value of the promise.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$nextPromise = new Promise();
-
-$promise
-    ->then(function ($value) use ($nextPromise) {
-        echo $value;
-        return $nextPromise;
-    })
-    ->then(function ($value) {
-        echo $value;
-    });
-
-// Triggers the first callback and outputs "A"
-$promise->resolve('A');
-// Triggers the second callback and outputs "B"
-$nextPromise->resolve('B');
-```
-
-## Promise rejection
-
-When a promise is rejected, the `$onRejected` callbacks are invoked with the
-rejection reason.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    echo $reason;
-});
-
-$promise->reject('Error!');
-// Outputs "Error!"
-```
-
-## Rejection forwarding
-
-If an exception is thrown in an `$onRejected` callback, subsequent
-`$onRejected` callbacks are invoked with the thrown exception as the reason.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    throw new \Exception($reason);
-})->then(null, function ($reason) {
-    assert($reason->getMessage() === 'Error!');
-});
-
-$promise->reject('Error!');
-```
-
-You can also forward a rejection down the promise chain by returning a
-`GuzzleHttp\Promise\RejectedPromise` in either an `$onFulfilled` or
-`$onRejected` callback.
-
-```php
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    return new RejectedPromise($reason);
-})->then(null, function ($reason) {
-    assert($reason === 'Error!');
-});
-
-$promise->reject('Error!');
-```
-
-If an exception is not thrown in a `$onRejected` callback and the callback
-does not return a rejected promise, downstream `$onFulfilled` callbacks are
-invoked using the value returned from the `$onRejected` callback.
-
-```php
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new Promise();
-$promise
-    ->then(null, function ($reason) {
-        return "It's ok";
-    })
-    ->then(function ($value) {
-        assert($value === "It's ok");
-    });
-
-$promise->reject('Error!');
-```
-
-# Synchronous wait
-
-You can synchronously force promises to complete using a promise's `wait`
-method. When creating a promise, you can provide a wait function that is used
-to synchronously force a promise to complete. When a wait function is invoked
-it is expected to deliver a value to the promise or reject the promise. If the
-wait function does not deliver a value, then an exception is thrown. The wait
-function provided to a promise constructor is invoked when the `wait` function
-of the promise is called.
-
-```php
-$promise = new Promise(function () use (&$promise) {
-    $promise->deliver('foo');
-});
-
-// Calling wait will return the value of the promise.
-echo $promise->wait(); // outputs "foo"
-```
-
-If an exception is encountered while invoking the wait function of a promise,
-the promise is rejected with the exception and the exception is thrown.
-
-```php
-$promise = new Promise(function () use (&$promise) {
-    throw new \Exception('foo');
-});
-
-$promise->wait(); // throws the exception.
-```
-
-Calling `wait` on a promise that has been fulfilled will not trigger the wait
-function. It will simply return the previously delivered value.
-
-```php
-$promise = new Promise(function () { die('this is not called!'); });
-$promise->deliver('foo');
-echo $promise->wait(); // outputs "foo"
-```
-
-Calling `wait` on a promise that has been rejected will throw an exception. If
-the rejection reason is an instance of `\Exception` the reason is thrown.
-Otherwise, a `GuzzleHttp\Promise\RejectionException` is thrown and the reason
-can be obtained by calling the `getReason` method of the exception.
-
-```php
-$promise = new Promise();
-$promise->reject('foo');
-$promise->wait();
-```
-
-> PHP Fatal error:  Uncaught exception 'GuzzleHttp\Promise\RejectionException' with message 'The promise was rejected with value: foo'
-
-
-## Unwrapping a promise
-
-When synchronously waiting on a promise, you are joining the state of the
-promise into the current state of execution (i.e., return the value of the
-promise if it was fulfilled or throw an exception if it was rejected). This is
-called "unwrapping" the promise. Waiting on a promise will by default unwrap
-the promise state.
-
-You can force a promise to resolve and *not* unwrap the state of the promise
-by passing `false` to the first argument of the `wait` function:
-
-```php
-$promise = new Promise();
-$promise->reject('foo');
-// This will not throw an exception. It simply ensures the promise has
-// been resolved.
-$promise->wait(false);
-```
-
-When unwrapping a promise, the delivered value of the promise will be waited
-upon until the unwrapped value is not a promise. This means that if you resolve
-promise A with a promise B and unwrap promise A, the value returned by the
-wait function will be the value delivered to promise B.
-
-**Note**: when you do not unwrap the promise, no value is returned.
-
-
-# Cancellation
-
-You can cancel a promise that has not yet been fulfilled using the `cancel()`
-method of a promise. When creating a promise you can provide an optional
-cancel function that when invoked cancels the action of computing a resolution
-of the promise.
-
-
-# API
-
-
-## Promise
-
-When creating a promise object, you can provide an optional `$waitFn` and
-`$cancelFn`. `$waitFn` is a function that is invoked with no arguments and is
-expected to resolve the promise. `$cancelFn` is a function with no arguments
-that is expected to cancel the computation of a promise. It is invoked when the
-`cancel()` method of a promise is called.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise(
-    function () use (&$promise) {
-        $promise->resolve('waited');
-    },
-    function () {
-        // do something that will cancel the promise computation (e.g., close
-        // a socket, cancel a database query, etc...)
-    }
-);
-
-assert('waited' === $promise->wait());
-```
-
-A promise has the following methods:
-
-- `then(callable $onFulfilled, callable $onRejected) : PromiseInterface`
-  
-  Creates a new promise that is fulfilled or rejected when the promise is
-  resolved.
-
-- `wait($unwrap = true) : mixed`
-
-  Synchronously waits on the promise to complete.
-  
-  `$unwrap` controls whether or not the value of the promise is returned for a
-  fulfilled promise or if an exception is thrown if the promise is rejected.
-  This is set to `true` by default.
-
-- `cancel()`
-
-  Attempts to cancel the promise if possible. The promise being cancelled and
-  the parent most ancestor that has not yet been resolved will also be
-  cancelled. Any promises waiting on the cancelled promise to resolve will also
-  be cancelled.
-
-- `getState() : string`
-
-  Returns the state of the promise. One of `pending`, `fulfilled`, or
-  `rejected`.
-
-- `resolve($value)`
-
-  Fulfills the promise with the given `$value`.
-
-- `reject($reason)`
-
-  Rejects the promise with the given `$reason`.
-
-
-## FulfilledPromise
-
-A fulfilled promise can be created to represent a promise that has been
-fulfilled.
-
-```php
-use GuzzleHttp\Promise\FulfilledPromise;
-
-$promise = new FulfilledPromise('value');
-
-// Fulfilled callbacks are immediately invoked.
-$promise->then(function ($value) {
-    echo $value;
-});
-```
-
-
-## RejectedPromise
-
-A rejected promise can be created to represent a promise that has been
-rejected.
-
-```php
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new RejectedPromise('Error');
-
-// Rejected callbacks are immediately invoked.
-$promise->then(null, function ($reason) {
-    echo $reason;
-});
-```
-
-
-# Promise interop
-
-This library works with foreign promises that have a `then` method. This means
-you can use Guzzle promises with [React promises](https://github.com/reactphp/promise)
-for example. When a foreign promise is returned inside of a then method
-callback, promise resolution will occur recursively.
-
-```php
-// Create a React promise
-$deferred = new React\Promise\Deferred();
-$reactPromise = $deferred->promise();
-
-// Create a Guzzle promise that is fulfilled with a React promise.
-$guzzlePromise = new \GuzzleHttp\Promise\Promise();
-$guzzlePromise->then(function ($value) use ($reactPromise) {
-    // Do something something with the value...
-    // Return the React promise
-    return $reactPromise;
-});
-```
-
-Please note that wait and cancel chaining is no longer possible when forwarding
-a foreign promise. You will need to wrap a third-party promise with a Guzzle
-promise in order to utilize wait and cancel functions with foreign promises.
-
-
-## Event Loop Integration
-
-In order to keep the stack size constant, Guzzle promises are resolved
-asynchronously using a task queue. When waiting on promises synchronously, the
-task queue will be automatically run to ensure that the blocking promise and
-any forwarded promises are resolved. When using promises asynchronously in an
-event loop, you will need to run the task queue on each tick of the loop. If
-you do not run the task queue, then promises will not be resolved.
-
-You can run the task queue using the `run()` method of the global task queue
-instance.
-
-```php
-// Get the global task queue
-$queue = \GuzzleHttp\Promise\queue();
-$queue->run();
-```
-
-For example, you could use Guzzle promises with React using a periodic timer:
-
-```php
-$loop = React\EventLoop\Factory::create();
-$loop->addPeriodicTimer(0, [$queue, 'run']);
-```
-
-*TODO*: Perhaps adding a `futureTick()` on each tick would be faster?
-
-
-# Implementation notes
-
-
-## Promise resolution and chaining is handled iteratively
-
-By shuffling pending handlers from one owner to another, promises are
-resolved iteratively, allowing for "infinite" then chaining.
-
-```php
-<?php
-require 'vendor/autoload.php';
-
-use GuzzleHttp\Promise\Promise;
-
-$parent = new Promise();
-$p = $parent;
-
-for ($i = 0; $i < 1000; $i++) {
-    $p = $p->then(function ($v) {
-        // The stack size remains constant (a good thing)
-        echo xdebug_get_stack_depth() . ', ';
-        return $v + 1;
-    });
-}
-
-$parent->resolve(0);
-var_dump($p->wait()); // int(1000)
-
-```
-
-When a promise is fulfilled or rejected with a non-promise value, the promise
-then takes ownership of the handlers of each child promise and delivers values
-down the chain without using recursion.
-
-When a promise is resolved with another promise, the original promise transfers
-all of its pending handlers to the new promise. When the new promise is
-eventually resolved, all of the pending handlers are delivered the forwarded
-value.
-
-
-## A promise is the deferred.
-
-Some promise libraries implement promises using a deferred object to represent
-a computation and a promise object to represent the delivery of the result of
-the computation. This is a nice separation of computation and delivery because
-consumers of the promise cannot modify the value that will be eventually
-delivered.
-
-One side effect of being able to implement promise resolution and chaining
-iteratively is that you need to be able for one promise to reach into the state
-of another promise to shuffle around ownership of handlers. In order to achieve
-this without making the handlers of a promise publicly mutable, a promise is
-also the deferred value, allowing promises of the same parent class to reach
-into and modify the private properties of promises of the same type. While this
-does allow consumers of the value to modify the resolution or rejection of the
-deferred, it is a small price to pay for keeping the stack size constant.
-
-```php
-$promise = new Promise();
-$promise->then(function ($value) { echo $value; });
-// The promise is the deferred value, so you can deliver a value to it.
-$promise->deliver('foo');
-// prints "foo"
-```
diff --git a/vendor/guzzlehttp/promises/composer.json b/vendor/guzzlehttp/promises/composer.json
deleted file mode 100644
index f13844b..0000000
--- a/vendor/guzzlehttp/promises/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name": "guzzlehttp/promises",
-    "type": "library",
-    "description": "Guzzle promises library",
-    "keywords": ["promise"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Promise\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/promises/phpunit.xml.dist b/vendor/guzzlehttp/promises/phpunit.xml.dist
deleted file mode 100644
index 500cd53..0000000
--- a/vendor/guzzlehttp/promises/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/guzzlehttp/promises/src/AggregateException.php b/vendor/guzzlehttp/promises/src/AggregateException.php
deleted file mode 100644
index 6a5690c..0000000
--- a/vendor/guzzlehttp/promises/src/AggregateException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Exception thrown when too many errors occur in the some() or any() methods.
- */
-class AggregateException extends RejectionException
-{
-    public function __construct($msg, array $reasons)
-    {
-        parent::__construct(
-            $reasons,
-            sprintf('%s; %d rejected promises', $msg, count($reasons))
-        );
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/CancellationException.php b/vendor/guzzlehttp/promises/src/CancellationException.php
deleted file mode 100644
index cb360b8..0000000
--- a/vendor/guzzlehttp/promises/src/CancellationException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Exception that is set as the reason for a promise that has been cancelled.
- */
-class CancellationException extends RejectionException
-{
-}
diff --git a/vendor/guzzlehttp/promises/src/EachPromise.php b/vendor/guzzlehttp/promises/src/EachPromise.php
deleted file mode 100644
index 855d833..0000000
--- a/vendor/guzzlehttp/promises/src/EachPromise.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Represents a promise that iterates over many promises and invokes
- * side-effect functions in the process.
- */
-class EachPromise implements PromisorInterface
-{
-    private $pending = [];
-
-    /** @var \Iterator */
-    private $iterable;
-
-    /** @var callable|int */
-    private $concurrency;
-
-    /** @var callable */
-    private $onFulfilled;
-
-    /** @var callable */
-    private $onRejected;
-
-    /** @var Promise */
-    private $aggregate;
-
-    /**
-     * Configuration hash can include the following key value pairs:
-     *
-     * - fulfilled: (callable) Invoked when a promise fulfills. The function
-     *   is invoked with three arguments: the fulfillment value, the index
-     *   position from the iterable list of the promise, and the aggregate
-     *   promise that manages all of the promises. The aggregate promise may
-     *   be resolved from within the callback to short-circuit the promise.
-     * - rejected: (callable) Invoked when a promise is rejected. The
-     *   function is invoked with three arguments: the rejection reason, the
-     *   index position from the iterable list of the promise, and the
-     *   aggregate promise that manages all of the promises. The aggregate
-     *   promise may be resolved from within the callback to short-circuit
-     *   the promise.
-     * - concurrency: (integer) Pass this configuration option to limit the
-     *   allowed number of outstanding concurrently executing promises,
-     *   creating a capped pool of promises. There is no limit by default.
-     *
-     * @param mixed    $iterable Promises or values to iterate.
-     * @param array    $config   Configuration options
-     */
-    public function __construct($iterable, array $config = [])
-    {
-        $this->iterable = iter_for($iterable);
-
-        if (isset($config['concurrency'])) {
-            $this->concurrency = $config['concurrency'];
-        }
-
-        if (isset($config['fulfilled'])) {
-            $this->onFulfilled = $config['fulfilled'];
-        }
-
-        if (isset($config['rejected'])) {
-            $this->onRejected = $config['rejected'];
-        }
-    }
-
-    public function promise()
-    {
-        if ($this->aggregate) {
-            return $this->aggregate;
-        }
-
-        try {
-            $this->createPromise();
-            $this->iterable->rewind();
-            $this->refillPending();
-        } catch (\Exception $e) {
-            $this->aggregate->reject($e);
-        }
-
-        return $this->aggregate;
-    }
-
-    private function createPromise()
-    {
-        $this->aggregate = new Promise(function () {
-            reset($this->pending);
-            // Consume a potentially fluctuating list of promises while
-            // ensuring that indexes are maintained (precluding array_shift).
-            while ($promise = current($this->pending)) {
-                next($this->pending);
-                $promise->wait();
-                if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
-                    return;
-                }
-            }
-        });
-
-        // Clear the references when the promise is resolved.
-        $clearFn = function () {
-            $this->iterable = $this->concurrency = $this->pending = null;
-            $this->onFulfilled = $this->onRejected = null;
-        };
-
-        $this->aggregate->then($clearFn, $clearFn);
-    }
-
-    private function refillPending()
-    {
-        if (!$this->concurrency) {
-            // Add all pending promises.
-            while ($this->addPending() && $this->advanceIterator());
-            return;
-        }
-
-        // Add only up to N pending promises.
-        $concurrency = is_callable($this->concurrency)
-            ? call_user_func($this->concurrency, count($this->pending))
-            : $this->concurrency;
-        $concurrency = max($concurrency - count($this->pending), 0);
-        // Concurrency may be set to 0 to disallow new promises.
-        if (!$concurrency) {
-            return;
-        }
-        // Add the first pending promise.
-        $this->addPending();
-        // Note this is special handling for concurrency=1 so that we do
-        // not advance the iterator after adding the first promise. This
-        // helps work around issues with generators that might not have the
-        // next value to yield until promise callbacks are called.
-        while (--$concurrency
-            && $this->advanceIterator()
-            && $this->addPending());
-    }
-
-    private function addPending()
-    {
-        if (!$this->iterable || !$this->iterable->valid()) {
-            return false;
-        }
-
-        $promise = promise_for($this->iterable->current());
-        $idx = $this->iterable->key();
-
-        $this->pending[$idx] = $promise->then(
-            function ($value) use ($idx) {
-                if ($this->onFulfilled) {
-                    call_user_func(
-                        $this->onFulfilled, $value, $idx, $this->aggregate
-                    );
-                }
-                $this->step($idx);
-            },
-            function ($reason) use ($idx) {
-                if ($this->onRejected) {
-                    call_user_func(
-                        $this->onRejected, $reason, $idx, $this->aggregate
-                    );
-                }
-                $this->step($idx);
-            }
-        );
-
-        return true;
-    }
-
-    private function advanceIterator()
-    {
-        try {
-            $this->iterable->next();
-            return true;
-        } catch (\Exception $e) {
-            $this->aggregate->reject($e);
-            return false;
-        }
-    }
-
-    private function step($idx)
-    {
-        // If the promise was already resolved, then ignore this step.
-        if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
-            return;
-        }
-
-        unset($this->pending[$idx]);
-        $this->advanceIterator();
-
-        if (!$this->checkIfFinished()) {
-            // Add more pending promises if possible.
-            $this->refillPending();
-        }
-    }
-
-    private function checkIfFinished()
-    {
-        if (!$this->pending && !$this->iterable->valid()) {
-            // Resolve the promise if there's nothing left to do.
-            $this->aggregate->resolve(null);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/vendor/guzzlehttp/promises/src/FulfilledPromise.php
deleted file mode 100644
index 5596296..0000000
--- a/vendor/guzzlehttp/promises/src/FulfilledPromise.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * A promise that has been fulfilled.
- *
- * Thenning off of this promise will invoke the onFulfilled callback
- * immediately and ignore other callbacks.
- */
-class FulfilledPromise implements PromiseInterface
-{
-    private $value;
-
-    public function __construct($value)
-    {
-        if (method_exists($value, 'then')) {
-            throw new \InvalidArgumentException(
-                'You cannot create a FulfilledPromise with a promise.');
-        }
-
-        $this->value = $value;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        // Return itself if there is no onFulfilled function.
-        if (!$onFulfilled) {
-            return $this;
-        }
-
-        $queue = queue();
-        $p = new Promise([$queue, 'run']);
-        $value = $this->value;
-        $queue->add(static function () use ($p, $value, $onFulfilled) {
-            if ($p->getState() === self::PENDING) {
-                try {
-                    $p->resolve($onFulfilled($value));
-                } catch (\Exception $e) {
-                    $p->reject($e);
-                }
-            }
-        });
-
-        return $p;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true, $defaultDelivery = null)
-    {
-        return $unwrap ? $this->value : null;
-    }
-
-    public function getState()
-    {
-        return self::FULFILLED;
-    }
-
-    public function resolve($value)
-    {
-        if ($value !== $this->value) {
-            throw new \LogicException("Cannot resolve a fulfilled promise");
-        }
-    }
-
-    public function reject($reason)
-    {
-        throw new \LogicException("Cannot reject a fulfilled promise");
-    }
-
-    public function cancel()
-    {
-        // pass
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/Promise.php b/vendor/guzzlehttp/promises/src/Promise.php
deleted file mode 100644
index c2cf969..0000000
--- a/vendor/guzzlehttp/promises/src/Promise.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Promises/A+ implementation that avoids recursion when possible.
- *
- * @link https://promisesaplus.com/
- */
-class Promise implements PromiseInterface
-{
-    private $state = self::PENDING;
-    private $result;
-    private $cancelFn;
-    private $waitFn;
-    private $waitList;
-    private $handlers = [];
-
-    /**
-     * @param callable $waitFn   Fn that when invoked resolves the promise.
-     * @param callable $cancelFn Fn that when invoked cancels the promise.
-     */
-    public function __construct(
-        callable $waitFn = null,
-        callable $cancelFn = null
-    ) {
-        $this->waitFn = $waitFn;
-        $this->cancelFn = $cancelFn;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        if ($this->state === self::PENDING) {
-            $p = new Promise(null, [$this, 'cancel']);
-            $this->handlers[] = [$p, $onFulfilled, $onRejected];
-            $p->waitList = $this->waitList;
-            $p->waitList[] = $this;
-            return $p;
-        }
-
-        // Return a fulfilled promise and immediately invoke any callbacks.
-        if ($this->state === self::FULFILLED) {
-            return $onFulfilled
-                ? promise_for($this->result)->then($onFulfilled)
-                : promise_for($this->result);
-        }
-
-        // It's either cancelled or rejected, so return a rejected promise
-        // and immediately invoke any callbacks.
-        $rejection = rejection_for($this->result);
-        return $onRejected ? $rejection->then(null, $onRejected) : $rejection;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true)
-    {
-        $this->waitIfPending();
-
-        if (!$unwrap) {
-            return null;
-        }
-
-        if ($this->result instanceof PromiseInterface) {
-            return $this->result->wait($unwrap);
-        } elseif ($this->state === self::FULFILLED) {
-            return $this->result;
-        } else {
-            // It's rejected so "unwrap" and throw an exception.
-            throw exception_for($this->result);
-        }
-    }
-
-    public function getState()
-    {
-        return $this->state;
-    }
-
-    public function cancel()
-    {
-        if ($this->state !== self::PENDING) {
-            return;
-        }
-
-        $this->waitFn = $this->waitList = null;
-
-        if ($this->cancelFn) {
-            $fn = $this->cancelFn;
-            $this->cancelFn = null;
-            try {
-                $fn();
-            } catch (\Exception $e) {
-                $this->reject($e);
-            }
-        }
-
-        // Reject the promise only if it wasn't rejected in a then callback.
-        if ($this->state === self::PENDING) {
-            $this->reject(new CancellationException('Promise has been cancelled'));
-        }
-    }
-
-    public function resolve($value)
-    {
-        $this->settle(self::FULFILLED, $value);
-    }
-
-    public function reject($reason)
-    {
-        $this->settle(self::REJECTED, $reason);
-    }
-
-    private function settle($state, $value)
-    {
-        if ($this->state !== self::PENDING) {
-            // Ignore calls with the same resolution.
-            if ($state === $this->state && $value === $this->result) {
-                return;
-            }
-            throw $this->state === $state
-                ? new \LogicException("The promise is already {$state}.")
-                : new \LogicException("Cannot change a {$this->state} promise to {$state}");
-        }
-
-        if ($value === $this) {
-            throw new \LogicException('Cannot fulfill or reject a promise with itself');
-        }
-
-        // Clear out the state of the promise but stash the handlers.
-        $this->state = $state;
-        $this->result = $value;
-        $handlers = $this->handlers;
-        $this->handlers = null;
-        $this->waitList = $this->waitFn = null;
-        $this->cancelFn = null;
-
-        if (!$handlers) {
-            return;
-        }
-
-        // If the value was not a settled promise or a thenable, then resolve
-        // it in the task queue using the correct ID.
-        if (!method_exists($value, 'then')) {
-            $id = $state === self::FULFILLED ? 1 : 2;
-            // It's a success, so resolve the handlers in the queue.
-            queue()->add(static function () use ($id, $value, $handlers) {
-                foreach ($handlers as $handler) {
-                    self::callHandler($id, $value, $handler);
-                }
-            });
-        } elseif ($value instanceof Promise
-            && $value->getState() === self::PENDING
-        ) {
-            // We can just merge our handlers onto the next promise.
-            $value->handlers = array_merge($value->handlers, $handlers);
-        } else {
-            // Resolve the handlers when the forwarded promise is resolved.
-            $value->then(
-                static function ($value) use ($handlers) {
-                    foreach ($handlers as $handler) {
-                        self::callHandler(1, $value, $handler);
-                    }
-                },
-                static function ($reason) use ($handlers) {
-                    foreach ($handlers as $handler) {
-                        self::callHandler(2, $reason, $handler);
-                    }
-                }
-            );
-        }
-    }
-
-    /**
-     * Call a stack of handlers using a specific callback index and value.
-     *
-     * @param int   $index   1 (resolve) or 2 (reject).
-     * @param mixed $value   Value to pass to the callback.
-     * @param array $handler Array of handler data (promise and callbacks).
-     *
-     * @return array Returns the next group to resolve.
-     */
-    private static function callHandler($index, $value, array $handler)
-    {
-        /** @var PromiseInterface $promise */
-        $promise = $handler[0];
-
-        // The promise may have been cancelled or resolved before placing
-        // this thunk in the queue.
-        if ($promise->getState() !== self::PENDING) {
-            return;
-        }
-
-        try {
-            if (isset($handler[$index])) {
-                $promise->resolve($handler[$index]($value));
-            } elseif ($index === 1) {
-                // Forward resolution values as-is.
-                $promise->resolve($value);
-            } else {
-                // Forward rejections down the chain.
-                $promise->reject($value);
-            }
-        } catch (\Exception $reason) {
-            $promise->reject($reason);
-        }
-    }
-
-    private function waitIfPending()
-    {
-        if ($this->state !== self::PENDING) {
-            return;
-        } elseif ($this->waitFn) {
-            $this->invokeWaitFn();
-        } elseif ($this->waitList) {
-            $this->invokeWaitList();
-        } else {
-            // If there's not wait function, then reject the promise.
-            $this->reject('Cannot wait on a promise that has '
-                . 'no internal wait function. You must provide a wait '
-                . 'function when constructing the promise to be able to '
-                . 'wait on a promise.');
-        }
-
-        queue()->run();
-
-        if ($this->state === self::PENDING) {
-            $this->reject('Invoking the wait callback did not resolve the promise');
-        }
-    }
-
-    private function invokeWaitFn()
-    {
-        try {
-            $wfn = $this->waitFn;
-            $this->waitFn = null;
-            $wfn(true);
-        } catch (\Exception $reason) {
-            if ($this->state === self::PENDING) {
-                // The promise has not been resolved yet, so reject the promise
-                // with the exception.
-                $this->reject($reason);
-            } else {
-                // The promise was already resolved, so there's a problem in
-                // the application.
-                throw $reason;
-            }
-        }
-    }
-
-    private function invokeWaitList()
-    {
-        $waitList = $this->waitList;
-        $this->waitList = null;
-
-        foreach ($waitList as $result) {
-            descend:
-            $result->waitIfPending();
-            if ($result->result instanceof Promise) {
-                $result = $result->result;
-                goto descend;
-            }
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/PromiseInterface.php b/vendor/guzzlehttp/promises/src/PromiseInterface.php
deleted file mode 100644
index 8f5f4b9..0000000
--- a/vendor/guzzlehttp/promises/src/PromiseInterface.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * A promise represents the eventual result of an asynchronous operation.
- *
- * The primary way of interacting with a promise is through its then method,
- * which registers callbacks to receive either a promise’s eventual value or
- * the reason why the promise cannot be fulfilled.
- *
- * @link https://promisesaplus.com/
- */
-interface PromiseInterface
-{
-    const PENDING = 'pending';
-    const FULFILLED = 'fulfilled';
-    const REJECTED = 'rejected';
-
-    /**
-     * Appends fulfillment and rejection handlers to the promise, and returns
-     * a new promise resolving to the return value of the called handler.
-     *
-     * @param callable $onFulfilled Invoked when the promise fulfills.
-     * @param callable $onRejected  Invoked when the promise is rejected.
-     *
-     * @return PromiseInterface
-     */
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    );
-
-    /**
-     * Appends a rejection handler callback to the promise, and returns a new
-     * promise resolving to the return value of the callback if it is called,
-     * or to its original fulfillment value if the promise is instead
-     * fulfilled.
-     *
-     * @param callable $onRejected Invoked when the promise is rejected.
-     *
-     * @return PromiseInterface
-     */
-    public function otherwise(callable $onRejected);
-
-    /**
-     * Get the state of the promise ("pending", "rejected", or "fulfilled").
-     *
-     * The three states can be checked against the constants defined on
-     * PromiseInterface: PENDING, FULFILLED, and REJECTED.
-     *
-     * @return string
-     */
-    public function getState();
-
-    /**
-     * Resolve the promise with the given value.
-     *
-     * @param mixed $value
-     * @throws \RuntimeException if the promise is already resolved.
-     */
-    public function resolve($value);
-
-    /**
-     * Reject the promise with the given reason.
-     *
-     * @param mixed $reason
-     * @throws \RuntimeException if the promise is already resolved.
-     */
-    public function reject($reason);
-
-    /**
-     * Cancels the promise if possible.
-     *
-     * @link https://github.com/promises-aplus/cancellation-spec/issues/7
-     */
-    public function cancel();
-
-    /**
-     * Waits until the promise completes if possible.
-     *
-     * Pass $unwrap as true to unwrap the result of the promise, either
-     * returning the resolved value or throwing the rejected exception.
-     *
-     * If the promise cannot be waited on, then the promise will be rejected.
-     *
-     * @param bool $unwrap
-     *
-     * @return mixed
-     * @throws \LogicException if the promise has no wait function or if the
-     *                         promise does not settle after waiting.
-     */
-    public function wait($unwrap = true);
-}
diff --git a/vendor/guzzlehttp/promises/src/PromisorInterface.php b/vendor/guzzlehttp/promises/src/PromisorInterface.php
deleted file mode 100644
index b07fe32..0000000
--- a/vendor/guzzlehttp/promises/src/PromisorInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Interface used with classes that return a promise.
- */
-interface PromisorInterface
-{
-    /**
-     * Returns a promise.
-     *
-     * @return PromiseInterface
-     */
-    public function promise();
-}
diff --git a/vendor/guzzlehttp/promises/src/RejectedPromise.php b/vendor/guzzlehttp/promises/src/RejectedPromise.php
deleted file mode 100644
index bd499e6..0000000
--- a/vendor/guzzlehttp/promises/src/RejectedPromise.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * A promise that has been rejected.
- *
- * Thenning off of this promise will invoke the onRejected callback
- * immediately and ignore other callbacks.
- */
-class RejectedPromise implements PromiseInterface
-{
-    private $reason;
-
-    public function __construct($reason)
-    {
-        if (method_exists($reason, 'then')) {
-            throw new \InvalidArgumentException(
-                'You cannot create a RejectedPromise with a promise.');
-        }
-
-        $this->reason = $reason;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        // If there's no onRejected callback then just return self.
-        if (!$onRejected) {
-            return $this;
-        }
-
-        $queue = queue();
-        $reason = $this->reason;
-        $p = new Promise([$queue, 'run']);
-        $queue->add(static function () use ($p, $reason, $onRejected) {
-            if ($p->getState() === self::PENDING) {
-                try {
-                    // Return a resolved promise if onRejected does not throw.
-                    $p->resolve($onRejected($reason));
-                } catch (\Exception $e) {
-                    // onRejected threw, so return a rejected promise.
-                    $p->reject($e);
-                }
-            }
-        });
-
-        return $p;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true, $defaultDelivery = null)
-    {
-        if ($unwrap) {
-            throw exception_for($this->reason);
-        }
-    }
-
-    public function getState()
-    {
-        return self::REJECTED;
-    }
-
-    public function resolve($value)
-    {
-        throw new \LogicException("Cannot resolve a rejected promise");
-    }
-
-    public function reject($reason)
-    {
-        if ($reason !== $this->reason) {
-            throw new \LogicException("Cannot reject a rejected promise");
-        }
-    }
-
-    public function cancel()
-    {
-        // pass
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/RejectionException.php b/vendor/guzzlehttp/promises/src/RejectionException.php
deleted file mode 100644
index 07c1136..0000000
--- a/vendor/guzzlehttp/promises/src/RejectionException.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * A special exception that is thrown when waiting on a rejected promise.
- *
- * The reason value is available via the getReason() method.
- */
-class RejectionException extends \RuntimeException
-{
-    /** @var mixed Rejection reason. */
-    private $reason;
-
-    /**
-     * @param mixed $reason       Rejection reason.
-     * @param string $description Optional description
-     */
-    public function __construct($reason, $description = null)
-    {
-        $this->reason = $reason;
-
-        $message = 'The promise was rejected';
-
-        if ($description) {
-            $message .= ' with reason: ' . $description;
-        } elseif (is_string($reason)
-            || (is_object($reason) && method_exists($reason, '__toString'))
-        ) {
-            $message .= ' with reason: ' . $this->reason;
-        } elseif ($reason instanceof \JsonSerializable) {
-            $message .= ' with reason: '
-                . json_encode($this->reason, JSON_PRETTY_PRINT);
-        }
-
-        parent::__construct($message);
-    }
-
-    /**
-     * Returns the rejection reason.
-     *
-     * @return mixed
-     */
-    public function getReason()
-    {
-        return $this->reason;
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/TaskQueue.php b/vendor/guzzlehttp/promises/src/TaskQueue.php
deleted file mode 100644
index 5026363..0000000
--- a/vendor/guzzlehttp/promises/src/TaskQueue.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * A task queue that executes tasks in a FIFO order.
- *
- * This task queue class is used to settle promises asynchronously and
- * maintains a constant stack size. You can use the task queue asynchronously
- * by calling the `run()` function of the global task queue in an event loop.
- *
- *     GuzzleHttp\Promise\queue()->run();
- */
-class TaskQueue
-{
-    private $enableShutdown = true;
-    private $queue = [];
-
-    public function __construct($withShutdown = true)
-    {
-        if ($withShutdown) {
-            register_shutdown_function(function () {
-                if ($this->enableShutdown) {
-                    // Only run the tasks if an E_ERROR didn't occur.
-                    $err = error_get_last();
-                    if (!$err || ($err['type'] ^ E_ERROR)) {
-                        $this->run();
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Returns true if the queue is empty.
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return !$this->queue;
-    }
-
-    /**
-     * Adds a task to the queue that will be executed the next time run is
-     * called.
-     *
-     * @param callable $task
-     */
-    public function add(callable $task)
-    {
-        $this->queue[] = $task;
-    }
-
-    /**
-     * Execute all of the pending task in the queue.
-     */
-    public function run()
-    {
-        while ($task = array_shift($this->queue)) {
-            $task();
-        }
-    }
-
-    /**
-     * The task queue will be run and exhausted by default when the process
-     * exits IFF the exit is not the result of a PHP E_ERROR error.
-     *
-     * You can disable running the automatic shutdown of the queue by calling
-     * this function. If you disable the task queue shutdown process, then you
-     * MUST either run the task queue (as a result of running your event loop
-     * or manually using the run() method) or wait on each outstanding promise.
-     *
-     * Note: This shutdown will occur before any destructors are triggered.
-     */
-    public function disableShutdown()
-    {
-        $this->enableShutdown = false;
-    }
-}
diff --git a/vendor/guzzlehttp/promises/src/functions.php b/vendor/guzzlehttp/promises/src/functions.php
deleted file mode 100644
index 89c6569..0000000
--- a/vendor/guzzlehttp/promises/src/functions.php
+++ /dev/null
@@ -1,495 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise;
-
-/**
- * Get the global task queue used for promise resolution.
- *
- * This task queue MUST be run in an event loop in order for promises to be
- * settled asynchronously. It will be automatically run when synchronously
- * waiting on a promise.
- *
- * <code>
- * while ($eventLoop->isRunning()) {
- *     GuzzleHttp\Promise\queue()->run();
- * }
- * </code>
- *
- * @return TaskQueue
- */
-function queue()
-{
-    static $queue;
-
-    if (!$queue) {
-        $queue = new TaskQueue();
-    }
-
-    return $queue;
-}
-
-/**
- * Adds a function to run in the task queue when it is next `run()` and returns
- * a promise that is fulfilled or rejected with the result.
- *
- * @param callable $task Task function to run.
- *
- * @return PromiseInterface
- */
-function task(callable $task)
-{
-    $queue = queue();
-    $promise = new Promise([$queue, 'run']);
-    $queue->add(function () use ($task, $promise) {
-        try {
-            $promise->resolve($task());
-        } catch (\Exception $e) {
-            $promise->reject($e);
-        }
-    });
-
-    return $promise;
-}
-
-/**
- * Creates a promise for a value if the value is not a promise.
- *
- * @param mixed $value Promise or value.
- *
- * @return PromiseInterface
- */
-function promise_for($value)
-{
-    if ($value instanceof PromiseInterface) {
-        return $value;
-    }
-
-    // Return a Guzzle promise that shadows the given promise.
-    if (method_exists($value, 'then')) {
-        $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null;
-        $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null;
-        $promise = new Promise($wfn, $cfn);
-        $value->then([$promise, 'resolve'], [$promise, 'reject']);
-        return $promise;
-    }
-
-    return new FulfilledPromise($value);
-}
-
-/**
- * Creates a rejected promise for a reason if the reason is not a promise. If
- * the provided reason is a promise, then it is returned as-is.
- *
- * @param mixed $reason Promise or reason.
- *
- * @return PromiseInterface
- */
-function rejection_for($reason)
-{
-    if ($reason instanceof PromiseInterface) {
-        return $reason;
-    }
-
-    return new RejectedPromise($reason);
-}
-
-/**
- * Create an exception for a rejected promise value.
- *
- * @param mixed $reason
- *
- * @return \Exception
- */
-function exception_for($reason)
-{
-    return $reason instanceof \Exception
-        ? $reason
-        : new RejectionException($reason);
-}
-
-/**
- * Returns an iterator for the given value.
- *
- * @param mixed $value
- *
- * @return \Iterator
- */
-function iter_for($value)
-{
-    if ($value instanceof \Iterator) {
-        return $value;
-    } elseif (is_array($value)) {
-        return new \ArrayIterator($value);
-    } else {
-        return new \ArrayIterator([$value]);
-    }
-}
-
-/**
- * Synchronously waits on a promise to resolve and returns an inspection state
- * array.
- *
- * Returns a state associative array containing a "state" key mapping to a
- * valid promise state. If the state of the promise is "fulfilled", the array
- * will contain a "value" key mapping to the fulfilled value of the promise. If
- * the promise is rejected, the array will contain a "reason" key mapping to
- * the rejection reason of the promise.
- *
- * @param PromiseInterface $promise Promise or value.
- *
- * @return array
- */
-function inspect(PromiseInterface $promise)
-{
-    try {
-        return [
-            'state' => PromiseInterface::FULFILLED,
-            'value' => $promise->wait()
-        ];
-    } catch (RejectionException $e) {
-        return ['state' => 'rejected', 'reason' => $e->getReason()];
-    } catch (\Exception $e) {
-        return ['state' => 'rejected', 'reason' => $e];
-    }
-}
-
-/**
- * Waits on all of the provided promises, but does not unwrap rejected promises
- * as thrown exception.
- *
- * Returns an array of inspection state arrays.
- *
- * @param PromiseInterface[] $promises Traversable of promises to wait upon.
- *
- * @return array
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
- */
-function inspect_all($promises)
-{
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = inspect($promise);
-    }
-
-    return $results;
-}
-
-/**
- * Waits on all of the provided promises and returns the fulfilled values.
- *
- * Returns an array that contains the value of each promise (in the same order
- * the promises were provided). An exception is thrown if any of the promises
- * are rejected.
- *
- * @param mixed $promises Iterable of PromiseInterface objects to wait on.
- *
- * @return array
- * @throws \Exception on error
- */
-function unwrap($promises)
-{
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = $promise->wait();
-    }
-
-    return $results;
-}
-
-/**
- * Given an array of promises, return a promise that is fulfilled when all the
- * items in the array are fulfilled.
- *
- * The promise's fulfillment value is an array with fulfillment values at
- * respective positions to the original array. If any promise in the array
- * rejects, the returned promise is rejected with the rejection reason.
- *
- * @param mixed $promises Promises or values.
- *
- * @return Promise
- */
-function all($promises)
-{
-    $results = [];
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = $value;
-        },
-        function ($reason, $idx, Promise $aggregate) {
-            $aggregate->reject($reason);
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
-}
-
-/**
- * Initiate a competitive race between multiple promises or values (values will
- * become immediately fulfilled promises).
- *
- * When count amount of promises have been fulfilled, the returned promise is
- * fulfilled with an array that contains the fulfillment values of the winners
- * in order of resolution.
- *
- * This prommise is rejected with a {@see GuzzleHttp\Promise\AggregateException}
- * if the number of fulfilled promises is less than the desired $count.
- *
- * @param int   $count    Total number of promises.
- * @param mixed $promises Promises or values.
- *
- * @return Promise
- */
-function some($count, $promises)
-{
-    $results = [];
-    $rejections = [];
-
-    return each(
-        $promises,
-        function ($value, $idx, PromiseInterface $p) use (&$results, $count) {
-            if ($p->getState() !== PromiseInterface::PENDING) {
-                return;
-            }
-            $results[$idx] = $value;
-            if (count($results) >= $count) {
-                $p->resolve(null);
-            }
-        },
-        function ($reason) use (&$rejections) {
-            $rejections[] = $reason;
-        }
-    )->then(
-        function () use (&$results, &$rejections, $count) {
-            if (count($results) !== $count) {
-                throw new AggregateException(
-                    'Not enough promises to fulfill count',
-                    $rejections
-                );
-            }
-            ksort($results);
-            return array_values($results);
-        }
-    );
-}
-
-/**
- * Like some(), with 1 as count. However, if the promise fulfills, the
- * fulfillment value is not an array of 1 but the value directly.
- *
- * @param mixed $promises Promises or values.
- *
- * @return PromiseInterface
- */
-function any($promises)
-{
-    return some(1, $promises)->then(function ($values) { return $values[0]; });
-}
-
-/**
- * Returns a promise that is fulfilled when all of the provided promises have
- * been fulfilled or rejected.
- *
- * The returned promise is fulfilled with an array of inspection state arrays.
- *
- * @param mixed $promises Promises or values.
- *
- * @return Promise
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
- */
-function settle($promises)
-{
-    $results = [];
-
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = ['state' => 'fulfilled', 'value' => $value];
-        },
-        function ($reason, $idx) use (&$results) {
-            $results[$idx] = ['state' => 'rejected', 'reason' => $reason];
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
-}
-
-/**
- * Given an iterator that yields promises or values, returns a promise that is
- * fulfilled with a null value when the iterator has been consumed or the
- * aggregate promise has been fulfilled or rejected.
- *
- * $onFulfilled is a function that accepts the fulfilled value, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
- *
- * $onRejected is a function that accepts the rejection reason, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
- *
- * @param mixed    $iterable    Iterator or array to iterate over.
- * @param callable $onFulfilled
- * @param callable $onRejected
- *
- * @return Promise
- */
-function each(
-    $iterable,
-    callable $onFulfilled = null,
-    callable $onRejected = null
-) {
-    return (new EachPromise($iterable, [
-        'fulfilled' => $onFulfilled,
-        'rejected'  => $onRejected
-    ]))->promise();
-}
-
-/**
- * Like each, but only allows a certain number of outstanding promises at any
- * given time.
- *
- * $concurrency may be an integer or a function that accepts the number of
- * pending promises and returns a numeric concurrency limit value to allow for
- * dynamic a concurrency size.
- *
- * @param mixed        $iterable
- * @param int|callable $concurrency
- * @param callable     $onFulfilled
- * @param callable     $onRejected
- *
- * @return mixed
- */
-function each_limit(
-    $iterable,
-    $concurrency,
-    callable $onFulfilled = null,
-    callable $onRejected = null
-) {
-    return (new EachPromise($iterable, [
-        'fulfilled'   => $onFulfilled,
-        'rejected'    => $onRejected,
-        'concurrency' => $concurrency
-    ]))->promise();
-}
-
-/**
- * Like each_limit, but ensures that no promise in the given $iterable argument
- * is rejected. If any promise is rejected, then the aggregate promise is
- * rejected with the encountered rejection.
- *
- * @param mixed        $iterable
- * @param int|callable $concurrency
- * @param callable     $onFulfilled
- *
- * @return mixed
- */
-function each_limit_all(
-    $iterable,
-    $concurrency,
-    callable $onFulfilled = null
-) {
-    return each_limit(
-        $iterable,
-        $concurrency,
-        $onFulfilled,
-        function ($reason, $idx, PromiseInterface $aggregate) {
-            $aggregate->reject($reason);
-        }
-    );
-}
-
-/**
- * Returns true if a promise is fulfilled.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_fulfilled(PromiseInterface $promise)
-{
-    return $promise->getState() === PromiseInterface::FULFILLED;
-}
-
-/**
- * Returns true if a promise is rejected.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_rejected(PromiseInterface $promise)
-{
-    return $promise->getState() === PromiseInterface::REJECTED;
-}
-
-/**
- * Returns true if a promise is fulfilled or rejected.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_settled(PromiseInterface $promise)
-{
-    return $promise->getState() !== PromiseInterface::PENDING;
-}
-
-/**
- * Creates a promise that is resolved using a generator that yields values or
- * promises (somewhat similar to C#'s async keyword).
- *
- * When called, the coroutine function will start an instance of the generator
- * and returns a promise that is fulfilled with its final yielded value.
- *
- * Control is returned back to the generator when the yielded promise settles.
- * This can lead to less verbose code when doing lots of sequential async calls
- * with minimal processing in between.
- *
- *     use GuzzleHttp\Promise;
- *
- *     function createPromise($value) {
- *         return new Promise\FulfilledPromise($value);
- *     }
- *
- *     $promise = Promise\coroutine(function () {
- *         $value = (yield createPromise('a'));
- *         try {
- *             $value = (yield createPromise($value . 'b'));
- *         } catch (\Exception $e) {
- *             // The promise was rejected.
- *         }
- *         yield $value . 'c';
- *     });
- *
- *     // Outputs "abc"
- *     $promise->then(function ($v) { echo $v; });
- *
- * @param callable $generatorFn Generator function to wrap into a promise.
- *
- * @return Promise
- * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
- */
-function coroutine(callable $generatorFn)
-{
-    $generator = $generatorFn();
-    return __next_coroutine($generator->current(), $generator)->then();
-}
-
-/** @internal */
-function __next_coroutine($yielded, \Generator $generator)
-{
-    return promise_for($yielded)->then(
-        function ($value) use ($generator) {
-            $nextYield = $generator->send($value);
-            return $generator->valid()
-                ? __next_coroutine($nextYield, $generator)
-                : $value;
-        },
-        function ($reason) use ($generator) {
-            $nextYield = $generator->throw(exception_for($reason));
-            // The throw was caught, so keep iterating on the coroutine
-            return __next_coroutine($nextYield, $generator);
-        }
-    );
-}
diff --git a/vendor/guzzlehttp/promises/src/functions_include.php b/vendor/guzzlehttp/promises/src/functions_include.php
deleted file mode 100644
index 34cd171..0000000
--- a/vendor/guzzlehttp/promises/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// Don't redefine the functions if included multiple times.
-if (!function_exists('GuzzleHttp\Promise\promise_for')) {
-    require __DIR__ . '/functions.php';
-}
diff --git a/vendor/guzzlehttp/psr7/.gitignore b/vendor/guzzlehttp/psr7/.gitignore
deleted file mode 100644
index 83ec41e..0000000
--- a/vendor/guzzlehttp/psr7/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-phpunit.xml
-composer.phar
-composer.lock
-composer-test.lock
-vendor/
-build/artifacts/
-artifacts/
-docs/_build
-docs/*.pyc
-.idea
-.DS_STORE
diff --git a/vendor/guzzlehttp/psr7/.travis.yml b/vendor/guzzlehttp/psr7/.travis.yml
deleted file mode 100644
index b88f8da..0000000
--- a/vendor/guzzlehttp/psr7/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/vendor/guzzlehttp/psr7/CHANGELOG.md b/vendor/guzzlehttp/psr7/CHANGELOG.md
deleted file mode 100644
index 642dc9a..0000000
--- a/vendor/guzzlehttp/psr7/CHANGELOG.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# CHANGELOG
-
-## 1.2.0 - 2015-08-15
-
-* Body as `"0"` is now properly added to a response.
-* Now allowing forward seeking in CachingStream.
-* Now properly parsing HTTP requests that contain proxy targets in
-  `parse_request`.
-* functions.php is now conditionally required.
-* user-info is no longer dropped when resolving URIs.
-
-## 1.1.0 - 2015-06-24
-
-* URIs can now be relative.
-* `multipart/form-data` headers are now overridden case-insensitively.
-* URI paths no longer encode the following characters because they are allowed
-  in URIs: "(", ")", "*", "!", "'"
-* A port is no longer added to a URI when the scheme is missing and no port is
-  present.
-
-## 1.0.0 - 2015-05-19
-
-Initial release.
-
-Currently unsupported:
-
-- `Psr\Http\Message\ServerRequestInterface`
-- `Psr\Http\Message\UploadedFileInterface`
diff --git a/vendor/guzzlehttp/psr7/LICENSE b/vendor/guzzlehttp/psr7/LICENSE
deleted file mode 100644
index 581d95f..0000000
--- a/vendor/guzzlehttp/psr7/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
-
-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/vendor/guzzlehttp/psr7/Makefile b/vendor/guzzlehttp/psr7/Makefile
deleted file mode 100644
index 9c21096..0000000
--- a/vendor/guzzlehttp/psr7/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit $(TEST)
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage $(TEST)
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
diff --git a/vendor/guzzlehttp/psr7/README.md b/vendor/guzzlehttp/psr7/README.md
deleted file mode 100644
index 0b30d5a..0000000
--- a/vendor/guzzlehttp/psr7/README.md
+++ /dev/null
@@ -1,580 +0,0 @@
-# PSR-7 Message Implementation
-
-This repository contains a partial [PSR-7](http://www.php-fig.org/psr/psr-7/)
-message implementation, several stream decorators, and some helpful
-functionality like query string parsing.  Currently missing
-ServerRequestInterface and UploadedFileInterface; a pull request for these features is welcome.
-
-
-# Stream implementation
-
-This package comes with a number of stream implementations and stream
-decorators.
-
-
-## AppendStream
-
-`GuzzleHttp\Psr7\AppendStream`
-
-Reads from multiple streams, one after the other.
-
-```php
-use GuzzleHttp\Psr7;
-
-$a = Psr7\stream_for('abc, ');
-$b = Psr7\stream_for('123.');
-$composed = new Psr7\AppendStream([$a, $b]);
-
-$composed->addStream(Psr7\stream_for(' Above all listen to me').
-
-echo $composed(); // abc, 123. Above all listen to me.
-```
-
-
-## BufferStream
-
-`GuzzleHttp\Psr7\BufferStream`
-
-Provides a buffer stream that can be written to to fill a buffer, and read
-from to remove bytes from the buffer.
-
-This stream returns a "hwm" metadata value that tells upstream consumers
-what the configured high water mark of the stream is, or the maximum
-preferred size of the buffer.
-
-```php
-use GuzzleHttp\Psr7;
-
-// When more than 1024 bytes are in the buffer, it will begin returning
-// false to writes. This is an indication that writers should slow down.
-$buffer = new Psr7\BufferStream(1024);
-```
-
-
-## CachingStream
-
-The CachingStream is used to allow seeking over previously read bytes on
-non-seekable streams. This can be useful when transferring a non-seekable
-entity body fails due to needing to rewind the stream (for example, resulting
-from a redirect). Data that is read from the remote stream will be buffered in
-a PHP temp stream so that previously read bytes are cached first in memory,
-then on disk.
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for(fopen('http://www.google.com', 'r'));
-$stream = new Psr7\CachingStream($original);
-
-$stream->read(1024);
-echo $stream->tell();
-// 1024
-
-$stream->seek(0);
-echo $stream->tell();
-// 0
-```
-
-
-## DroppingStream
-
-`GuzzleHttp\Psr7\DroppingStream`
-
-Stream decorator that begins dropping data once the size of the underlying
-stream becomes too full.
-
-```php
-use GuzzleHttp\Psr7;
-
-// Create an empty stream
-$stream = Psr7\stream_for();
-
-// Start dropping data when the stream has more than 10 bytes
-$dropping = new Psr7\DroppingStream($stream, 10);
-
-$stream->write('01234567890123456789');
-echo $stream; // 0123456789
-```
-
-
-## FnStream
-
-`GuzzleHttp\Psr7\FnStream`
-
-Compose stream implementations based on a hash of functions.
-
-Allows for easy testing and extension of a provided stream without needing to
-to create a concrete class for a simple extension point.
-
-```php
-
-use GuzzleHttp\Psr7;
-
-$stream = Psr7\stream_for('hi');
-$fnStream = Psr7\FnStream::decorate($stream, [
-    'rewind' => function () use ($stream) {
-        echo 'About to rewind - ';
-        $stream->rewind();
-        echo 'rewound!';
-    }
-]);
-
-$fnStream->rewind();
-// Outputs: About to rewind - rewound!
-```
-
-
-## InflateStream
-
-`GuzzleHttp\Psr7\InflateStream`
-
-Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
-
-This stream decorator skips the first 10 bytes of the given stream to remove
-the gzip header, converts the provided stream to a PHP stream resource,
-then appends the zlib.inflate filter. The stream is then converted back
-to a Guzzle stream resource to be used as a Guzzle stream.
-
-
-## LazyOpenStream
-
-`GuzzleHttp\Psr7\LazyOpenStream`
-
-Lazily reads or writes to a file that is opened only after an IO operation
-take place on the stream.
-
-```php
-use GuzzleHttp\Psr7;
-
-$stream = new Psr7\LazyOpenStream('/path/to/file', 'r');
-// The file has not yet been opened...
-
-echo $stream->read(10);
-// The file is opened and read from only when needed.
-```
-
-
-## LimitStream
-
-`GuzzleHttp\Psr7\LimitStream`
-
-LimitStream can be used to read a subset or slice of an existing stream object.
-This can be useful for breaking a large file into smaller pieces to be sent in
-chunks (e.g. Amazon S3's multipart upload API).
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for(fopen('/tmp/test.txt', 'r+'));
-echo $original->getSize();
-// >>> 1048576
-
-// Limit the size of the body to 1024 bytes and start reading from byte 2048
-$stream = new Psr7\LimitStream($original, 1024, 2048);
-echo $stream->getSize();
-// >>> 1024
-echo $stream->tell();
-// >>> 0
-```
-
-
-## MultipartStream
-
-`GuzzleHttp\Psr7\MultipartStream`
-
-Stream that when read returns bytes for a streaming multipart or
-multipart/form-data stream.
-
-
-## NoSeekStream
-
-`GuzzleHttp\Psr7\NoSeekStream`
-
-NoSeekStream wraps a stream and does not allow seeking.
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for('foo');
-$noSeek = new Psr7\NoSeekStream($original);
-
-echo $noSeek->read(3);
-// foo
-var_export($noSeek->isSeekable());
-// false
-$noSeek->seek(0);
-var_export($noSeek->read(3));
-// NULL
-```
-
-
-## PumpStream
-
-`GuzzleHttp\Psr7\PumpStream`
-
-Provides a read only stream that pumps data from a PHP callable.
-
-When invoking the provided callable, the PumpStream will pass the amount of
-data requested to read to the callable. The callable can choose to ignore
-this value and return fewer or more bytes than requested. Any extra data
-returned by the provided callable is buffered internally until drained using
-the read() function of the PumpStream. The provided callable MUST return
-false when there is no more data to read.
-
-
-## Implementing stream decorators
-
-Creating a stream decorator is very easy thanks to the
-`GuzzleHttp\Psr7\StreamDecoratorTrait`. This trait provides methods that
-implement `Psr\Http\Message\StreamInterface` by proxying to an underlying
-stream. Just `use` the `StreamDecoratorTrait` and implement your custom
-methods.
-
-For example, let's say we wanted to call a specific function each time the last
-byte is read from a stream. This could be implemented by overriding the
-`read()` method.
-
-```php
-use Psr\Http\Message\StreamInterface;
-use GuzzleHttp\Psr7\StreamDecoratorTrait;
-
-class EofCallbackStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $callback;
-
-    public function __construct(StreamInterface $stream, callable $cb)
-    {
-        $this->stream = $stream;
-        $this->callback = $cb;
-    }
-
-    public function read($length)
-    {
-        $result = $this->stream->read($length);
-
-        // Invoke the callback when EOF is hit.
-        if ($this->eof()) {
-            call_user_func($this->callback);
-        }
-
-        return $result;
-    }
-}
-```
-
-This decorator could be added to any existing stream and used like so:
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for('foo');
-
-$eofStream = new EofCallbackStream($original, function () {
-    echo 'EOF!';
-});
-
-$eofStream->read(2);
-$eofStream->read(1);
-// echoes "EOF!"
-$eofStream->seek(0);
-$eofStream->read(3);
-// echoes "EOF!"
-```
-
-
-## PHP StreamWrapper
-
-You can use the `GuzzleHttp\Psr7\StreamWrapper` class if you need to use a
-PSR-7 stream as a PHP stream resource.
-
-Use the `GuzzleHttp\Psr7\StreamWrapper::getResource()` method to create a PHP
-stream from a PSR-7 stream.
-
-```php
-use GuzzleHttp\Psr7\StreamWrapper;
-
-$stream = GuzzleHttp\Psr7\stream_for('hello!');
-$resource = StreamWrapper::getResource($stream);
-echo fread($resource, 6); // outputs hello!
-```
-
-
-# Function API
-
-There are various functions available under the `GuzzleHttp\Psr7` namespace.
-
-
-## `function str`
-
-`function str(MessageInterface $message)`
-
-Returns the string representation of an HTTP message.
-
-```php
-$request = new GuzzleHttp\Psr7\Request('GET', 'http://example.com');
-echo GuzzleHttp\Psr7\str($request);
-```
-
-
-## `function uri_for`
-
-`function uri_for($uri)`
-
-This function accepts a string or `Psr\Http\Message\UriInterface` and returns a
-UriInterface for the given value. If the value is already a `UriInterface`, it
-is returned as-is.
-
-```php
-$uri = GuzzleHttp\Psr7\uri_for('http://example.com');
-assert($uri === GuzzleHttp\Psr7\uri_for($uri));
-```
-
-
-## `function stream_for`
-
-`function stream_for($resource = '', array $options = [])`
-
-Create a new stream based on the input type.
-
-Options is an associative array that can contain the following keys:
-
-* - metadata: Array of custom metadata.
-* - size: Size of the stream.
-
-This method accepts the following `$resource` types:
-
-- `Psr\Http\Message\StreamInterface`: Returns the value as-is.
-- `string`: Creates a stream object that uses the given string as the contents.
-- `resource`: Creates a stream object that wraps the given PHP stream resource.
-- `Iterator`: If the provided value implements `Iterator`, then a read-only
-  stream object will be created that wraps the given iterable. Each time the
-  stream is read from, data from the iterator will fill a buffer and will be
-  continuously called until the buffer is equal to the requested read size.
-  Subsequent read calls will first read from the buffer and then call `next`
-  on the underlying iterator until it is exhausted.
-- `object` with `__toString()`: If the object has the `__toString()` method,
-  the object will be cast to a string and then a stream will be returned that
-  uses the string value.
-- `NULL`: When `null` is passed, an empty stream object is returned.
-- `callable` When a callable is passed, a read-only stream object will be
-  created that invokes the given callable. The callable is invoked with the
-  number of suggested bytes to read. The callable can return any number of
-  bytes, but MUST return `false` when there is no more data to return. The
-  stream object that wraps the callable will invoke the callable until the
-  number of requested bytes are available. Any additional bytes will be
-  buffered and used in subsequent reads.
-
-```php
-$stream = GuzzleHttp\Psr7\stream_for('foo');
-$stream = GuzzleHttp\Psr7\stream_for(fopen('/path/to/file', 'r'));
-
-$generator function ($bytes) {
-    for ($i = 0; $i < $bytes; $i++) {
-        yield ' ';
-    }
-}
-
-$stream = GuzzleHttp\Psr7\stream_for($generator(100));
-```
-
-
-## `function parse_header`
-
-`function parse_header($header)`
-
-Parse an array of header values containing ";" separated data into an array of
-associative arrays representing the header key value pair data of the header.
-When a parameter does not contain a value, but just contains a key, this
-function will inject a key with a '' string value.
-
-
-## `function normalize_header`
-
-`function normalize_header($header)`
-
-Converts an array of header values that may contain comma separated headers
-into an array of headers with no comma separated values.
-
-
-## `function modify_request`
-
-`function modify_request(RequestInterface $request, array $changes)`
-
-Clone and modify a request with the given changes. This method is useful for
-reducing the number of clones needed to mutate a message.
-
-The changes can be one of:
-
-- method: (string) Changes the HTTP method.
-- set_headers: (array) Sets the given headers.
-- remove_headers: (array) Remove the given headers.
-- body: (mixed) Sets the given body.
-- uri: (UriInterface) Set the URI.
-- query: (string) Set the query string value of the URI.
-- version: (string) Set the protocol version.
-
-
-## `function rewind_body`
-
-`function rewind_body(MessageInterface $message)`
-
-Attempts to rewind a message body and throws an exception on failure. The body
-of the message will only be rewound if a call to `tell()` returns a value other
-than `0`.
-
-
-## `function try_fopen`
-
-`function try_fopen($filename, $mode)`
-
-Safely opens a PHP stream resource using a filename.
-
-When fopen fails, PHP normally raises a warning. This function adds an error
-handler that checks for errors and throws an exception instead.
-
-
-## `function copy_to_string`
-
-`function copy_to_string(StreamInterface $stream, $maxLen = -1)`
-
-Copy the contents of a stream into a string until the given number of bytes
-have been read.
-
-
-## `function copy_to_stream`
-
-`function copy_to_stream(StreamInterface $source, StreamInterface $dest, $maxLen = -1)`
-
-Copy the contents of a stream into another stream until the given number of
-bytes have been read.
-
-
-## `function hash`
-
-`function hash(StreamInterface $stream, $algo, $rawOutput = false)`
-
-Calculate a hash of a Stream. This method reads the entire stream to calculate
-a rolling hash (based on PHP's hash_init functions).
-
-
-## `function readline`
-
-`function readline(StreamInterface $stream, $maxLength = null)`
-
-Read a line from the stream up to the maximum allowed buffer length.
-
-
-## `function parse_request`
-
-`function parse_request($message)`
-
-Parses a request message string into a request object.
-
-
-## `function parse_response`
-
-`function parse_response($message)`
-
-Parses a response message string into a response object.
-
-
-## `function parse_query`
-
-`function parse_query($str, $urlEncoding = true)`
-
-Parse a query string into an associative array.
-
-If multiple values are found for the same key, the value of that key value pair
-will become an array. This function does not parse nested PHP style arrays into
-an associative array (e.g., `foo[a]=1&foo[b]=2` will be parsed into
-`['foo[a]' => '1', 'foo[b]' => '2']`).
-
-
-## `function build_query`
-
-`function build_query(array $params, $encoding = PHP_QUERY_RFC3986)`
-
-Build a query string from an array of key value pairs.
-
-This function can use the return value of parseQuery() to build a query string.
-This function does not modify the provided keys when an array is encountered
-(like http_build_query would).
-
-
-## `function mimetype_from_filename`
-
-`function mimetype_from_filename($filename)`
-
-Determines the mimetype of a file by looking at its extension.
-
-
-## `function mimetype_from_extension`
-
-`function mimetype_from_extension($extension)`
-
-Maps a file extensions to a mimetype.
-
-
-# Static URI methods
-
-The `GuzzleHttp\Psr7\Uri` class has several static methods to manipulate URIs.
-
-
-## `GuzzleHttp\Psr7\Uri::removeDotSegments`
-
-`public static function removeDotSegments($path) -> UriInterface`
-
-Removes dot segments from a path and returns the new path.
-
-See http://tools.ietf.org/html/rfc3986#section-5.2.4
-
-
-## `GuzzleHttp\Psr7\Uri::resolve`
-
-`public static function resolve(UriInterface $base, $rel) -> UriInterface`
-
-Resolve a base URI with a relative URI and return a new URI.
-
-See http://tools.ietf.org/html/rfc3986#section-5
-
-
-## `GuzzleHttp\Psr7\Uri::withQueryValue`
-
-`public static function withQueryValue(UriInterface $uri, $key, $value) -> UriInterface`
-
-Create a new URI with a specific query string value.
-
-Any existing query string values that exactly match the provided key are
-removed and replaced with the given key value pair.
-
-Note: this function will convert "=" to "%3D" and "&" to "%26".
-
-
-## `GuzzleHttp\Psr7\Uri::withoutQueryValue`
-
-`public static function withoutQueryValue(UriInterface $uri, $key, $value) -> UriInterface`
-
-Create a new URI with a specific query string value removed.
-
-Any existing query string values that exactly match the provided key are
-removed.
-
-Note: this function will convert "=" to "%3D" and "&" to "%26".
-
-
-## `GuzzleHttp\Psr7\Uri::fromParts`
-
-`public static function fromParts(array $parts) -> UriInterface`
-
-Create a `GuzzleHttp\Psr7\Uri` object from a hash of `parse_url` parts.
-
-
-# Not Implemented
-
-A few aspects of PSR-7 are not implemented in this project. A pull request for
-any of these features is welcome:
-
-- `Psr\Http\Message\ServerRequestInterface`
-- `Psr\Http\Message\UploadedFileInterface`
diff --git a/vendor/guzzlehttp/psr7/composer.json b/vendor/guzzlehttp/psr7/composer.json
deleted file mode 100644
index f2e9d4c..0000000
--- a/vendor/guzzlehttp/psr7/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "guzzlehttp/psr7",
-    "type": "library",
-    "description": "PSR-7 message implementation",
-    "keywords": ["message", "stream", "http", "uri"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "psr/http-message": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "provide": {
-        "psr/http-message-implementation": "1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Psr7\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/phpunit.xml.dist b/vendor/guzzlehttp/psr7/phpunit.xml.dist
deleted file mode 100644
index 500cd53..0000000
--- a/vendor/guzzlehttp/psr7/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-  <testsuites>
-    <testsuite>
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix="Interface.php">src/</directory>
-      </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/guzzlehttp/psr7/src/AppendStream.php b/vendor/guzzlehttp/psr7/src/AppendStream.php
deleted file mode 100644
index 23039fd..0000000
--- a/vendor/guzzlehttp/psr7/src/AppendStream.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Reads from multiple streams, one after the other.
- *
- * This is a read-only stream decorator.
- */
-class AppendStream implements StreamInterface
-{
-    /** @var StreamInterface[] Streams being decorated */
-    private $streams = [];
-
-    private $seekable = true;
-    private $current = 0;
-    private $pos = 0;
-    private $detached = false;
-
-    /**
-     * @param StreamInterface[] $streams Streams to decorate. Each stream must
-     *                                   be readable.
-     */
-    public function __construct(array $streams = [])
-    {
-        foreach ($streams as $stream) {
-            $this->addStream($stream);
-        }
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->rewind();
-            return $this->getContents();
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    /**
-     * Add a stream to the AppendStream
-     *
-     * @param StreamInterface $stream Stream to append. Must be readable.
-     *
-     * @throws \InvalidArgumentException if the stream is not readable
-     */
-    public function addStream(StreamInterface $stream)
-    {
-        if (!$stream->isReadable()) {
-            throw new \InvalidArgumentException('Each stream must be readable');
-        }
-
-        // The stream is only seekable if all streams are seekable
-        if (!$stream->isSeekable()) {
-            $this->seekable = false;
-        }
-
-        $this->streams[] = $stream;
-    }
-
-    public function getContents()
-    {
-        return copy_to_string($this);
-    }
-
-    /**
-     * Closes each attached stream.
-     *
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->pos = $this->current = 0;
-
-        foreach ($this->streams as $stream) {
-            $stream->close();
-        }
-
-        $this->streams = [];
-    }
-
-    /**
-     * Detaches each attached stream
-     *
-     * {@inheritdoc}
-     */
-    public function detach()
-    {
-        $this->close();
-        $this->detached = true;
-    }
-
-    public function tell()
-    {
-        return $this->pos;
-    }
-
-    /**
-     * Tries to calculate the size by adding the size of each stream.
-     *
-     * If any of the streams do not return a valid number, then the size of the
-     * append stream cannot be determined and null is returned.
-     *
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        $size = 0;
-
-        foreach ($this->streams as $stream) {
-            $s = $stream->getSize();
-            if ($s === null) {
-                return null;
-            }
-            $size += $s;
-        }
-
-        return $size;
-    }
-
-    public function eof()
-    {
-        return !$this->streams ||
-            ($this->current >= count($this->streams) - 1 &&
-             $this->streams[$this->current]->eof());
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    /**
-     * Attempts to seek to the given position. Only supports SEEK_SET.
-     *
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('This AppendStream is not seekable');
-        } elseif ($whence !== SEEK_SET) {
-            throw new \RuntimeException('The AppendStream can only seek with SEEK_SET');
-        }
-
-        $this->pos = $this->current = 0;
-
-        // Rewind each stream
-        foreach ($this->streams as $i => $stream) {
-            try {
-                $stream->rewind();
-            } catch (\Exception $e) {
-                throw new \RuntimeException('Unable to seek stream '
-                    . $i . ' of the AppendStream', 0, $e);
-            }
-        }
-
-        // Seek to the actual position by reading from each stream
-        while ($this->pos < $offset && !$this->eof()) {
-            $result = $this->read(min(8096, $offset - $this->pos));
-            if ($result === '') {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Reads from all of the appended streams until the length is met or EOF.
-     *
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        $buffer = '';
-        $total = count($this->streams) - 1;
-        $remaining = $length;
-        $progressToNext = false;
-
-        while ($remaining > 0) {
-
-            // Progress to the next stream if needed.
-            if ($progressToNext || $this->streams[$this->current]->eof()) {
-                $progressToNext = false;
-                if ($this->current === $total) {
-                    break;
-                }
-                $this->current++;
-            }
-
-            $result = $this->streams[$this->current]->read($remaining);
-
-            // Using a loose comparison here to match on '', false, and null
-            if ($result == null) {
-                $progressToNext = true;
-                continue;
-            }
-
-            $buffer .= $result;
-            $remaining = $length - strlen($buffer);
-        }
-
-        $this->pos += strlen($buffer);
-
-        return $buffer;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function write($string)
-    {
-        throw new \RuntimeException('Cannot write to an AppendStream');
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/BufferStream.php b/vendor/guzzlehttp/psr7/src/BufferStream.php
deleted file mode 100644
index af4d4c2..0000000
--- a/vendor/guzzlehttp/psr7/src/BufferStream.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Provides a buffer stream that can be written to to fill a buffer, and read
- * from to remove bytes from the buffer.
- *
- * This stream returns a "hwm" metadata value that tells upstream consumers
- * what the configured high water mark of the stream is, or the maximum
- * preferred size of the buffer.
- */
-class BufferStream implements StreamInterface
-{
-    private $hwm;
-    private $buffer = '';
-
-    /**
-     * @param int $hwm High water mark, representing the preferred maximum
-     *                 buffer size. If the size of the buffer exceeds the high
-     *                 water mark, then calls to write will continue to succeed
-     *                 but will return false to inform writers to slow down
-     *                 until the buffer has been drained by reading from it.
-     */
-    public function __construct($hwm = 16384)
-    {
-        $this->hwm = $hwm;
-    }
-
-    public function __toString()
-    {
-        return $this->getContents();
-    }
-
-    public function getContents()
-    {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-
-        return $buffer;
-    }
-
-    public function close()
-    {
-        $this->buffer = '';
-    }
-
-    public function detach()
-    {
-        $this->close();
-    }
-
-    public function getSize()
-    {
-        return strlen($this->buffer);
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return true;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        throw new \RuntimeException('Cannot seek a BufferStream');
-    }
-
-    public function eof()
-    {
-        return strlen($this->buffer) === 0;
-    }
-
-    public function tell()
-    {
-        throw new \RuntimeException('Cannot determine the position of a BufferStream');
-    }
-
-    /**
-     * Reads data from the buffer.
-     */
-    public function read($length)
-    {
-        $currentLength = strlen($this->buffer);
-
-        if ($length >= $currentLength) {
-            // No need to slice the buffer because we don't have enough data.
-            $result = $this->buffer;
-            $this->buffer = '';
-        } else {
-            // Slice up the result to provide a subset of the buffer.
-            $result = substr($this->buffer, 0, $length);
-            $this->buffer = substr($this->buffer, $length);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Writes data to the buffer.
-     */
-    public function write($string)
-    {
-        $this->buffer .= $string;
-
-        // TODO: What should happen here?
-        if (strlen($this->buffer) >= $this->hwm) {
-            return false;
-        }
-
-        return strlen($string);
-    }
-
-    public function getMetadata($key = null)
-    {
-        if ($key == 'hwm') {
-            return $this->hwm;
-        }
-
-        return $key ? null : [];
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/CachingStream.php b/vendor/guzzlehttp/psr7/src/CachingStream.php
deleted file mode 100644
index 796d581..0000000
--- a/vendor/guzzlehttp/psr7/src/CachingStream.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Stream decorator that can cache previously read bytes from a sequentially
- * read stream.
- */
-class CachingStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var StreamInterface Stream being wrapped */
-    private $remoteStream;
-
-    /** @var int Number of bytes to skip reading due to a write on the buffer */
-    private $skipReadBytes = 0;
-
-    /**
-     * We will treat the buffer object as the body of the stream
-     *
-     * @param StreamInterface $stream Stream to cache
-     * @param StreamInterface $target Optionally specify where data is cached
-     */
-    public function __construct(
-        StreamInterface $stream,
-        StreamInterface $target = null
-    ) {
-        $this->remoteStream = $stream;
-        $this->stream = $target ?: new Stream(fopen('php://temp', 'r+'));
-    }
-
-    public function getSize()
-    {
-        return max($this->stream->getSize(), $this->remoteStream->getSize());
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence == SEEK_SET) {
-            $byte = $offset;
-        } elseif ($whence == SEEK_CUR) {
-            $byte = $offset + $this->tell();
-        } elseif ($whence == SEEK_END) {
-            $size = $this->remoteStream->getSize();
-            if ($size === null) {
-                $size = $this->cacheEntireStream();
-            }
-            // Because 0 is the first byte, we seek to size - 1.
-            $byte = $size - 1 - $offset;
-        } else {
-            throw new \InvalidArgumentException('Invalid whence');
-        }
-
-        $diff = $byte - $this->stream->getSize();
-
-        if ($diff > 0) {
-            // If the seek byte is greater the number of read bytes, then read
-            // the difference of bytes to cache the bytes and inherently seek.
-            $this->read($diff);
-        } else {
-            // We can just do a normal seek since we've already seen this byte.
-            $this->stream->seek($byte);
-        }
-    }
-
-    public function read($length)
-    {
-        // Perform a regular read on any previously read data from the buffer
-        $data = $this->stream->read($length);
-        $remaining = $length - strlen($data);
-
-        // More data was requested so read from the remote stream
-        if ($remaining) {
-            // If data was written to the buffer in a position that would have
-            // been filled from the remote stream, then we must skip bytes on
-            // the remote stream to emulate overwriting bytes from that
-            // position. This mimics the behavior of other PHP stream wrappers.
-            $remoteData = $this->remoteStream->read(
-                $remaining + $this->skipReadBytes
-            );
-
-            if ($this->skipReadBytes) {
-                $len = strlen($remoteData);
-                $remoteData = substr($remoteData, $this->skipReadBytes);
-                $this->skipReadBytes = max(0, $this->skipReadBytes - $len);
-            }
-
-            $data .= $remoteData;
-            $this->stream->write($remoteData);
-        }
-
-        return $data;
-    }
-
-    public function write($string)
-    {
-        // When appending to the end of the currently read stream, you'll want
-        // to skip bytes from being read from the remote stream to emulate
-        // other stream wrappers. Basically replacing bytes of data of a fixed
-        // length.
-        $overflow = (strlen($string) + $this->tell()) - $this->remoteStream->tell();
-        if ($overflow > 0) {
-            $this->skipReadBytes += $overflow;
-        }
-
-        return $this->stream->write($string);
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof() && $this->remoteStream->eof();
-    }
-
-    /**
-     * Close both the remote stream and buffer stream
-     */
-    public function close()
-    {
-        $this->remoteStream->close() && $this->stream->close();
-    }
-
-    private function cacheEntireStream()
-    {
-        $target = new FnStream(['write' => 'strlen']);
-        copy_to_stream($this, $target);
-
-        return $this->tell();
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/DroppingStream.php b/vendor/guzzlehttp/psr7/src/DroppingStream.php
deleted file mode 100644
index 8935c80..0000000
--- a/vendor/guzzlehttp/psr7/src/DroppingStream.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Stream decorator that begins dropping data once the size of the underlying
- * stream becomes too full.
- */
-class DroppingStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $maxLength;
-
-    /**
-     * @param StreamInterface $stream    Underlying stream to decorate.
-     * @param int             $maxLength Maximum size before dropping data.
-     */
-    public function __construct(StreamInterface $stream, $maxLength)
-    {
-        $this->stream = $stream;
-        $this->maxLength = $maxLength;
-    }
-
-    public function write($string)
-    {
-        $diff = $this->maxLength - $this->stream->getSize();
-
-        // Begin returning 0 when the underlying stream is too large.
-        if ($diff <= 0) {
-            return 0;
-        }
-
-        // Write the stream or a subset of the stream if needed.
-        if (strlen($string) < $diff) {
-            return $this->stream->write($string);
-        }
-
-        return $this->stream->write(substr($string, 0, $diff));
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/FnStream.php b/vendor/guzzlehttp/psr7/src/FnStream.php
deleted file mode 100644
index cc9b445..0000000
--- a/vendor/guzzlehttp/psr7/src/FnStream.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Compose stream implementations based on a hash of functions.
- *
- * Allows for easy testing and extension of a provided stream without needing
- * to create a concrete class for a simple extension point.
- */
-class FnStream implements StreamInterface
-{
-    /** @var array */
-    private $methods;
-
-    /** @var array Methods that must be implemented in the given array */
-    private static $slots = ['__toString', 'close', 'detach', 'rewind',
-        'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write',
-        'isReadable', 'read', 'getContents', 'getMetadata'];
-
-    /**
-     * @param array $methods Hash of method name to a callable.
-     */
-    public function __construct(array $methods)
-    {
-        $this->methods = $methods;
-
-        // Create the functions on the class
-        foreach ($methods as $name => $fn) {
-            $this->{'_fn_' . $name} = $fn;
-        }
-    }
-
-    /**
-     * Lazily determine which methods are not implemented.
-     * @throws \BadMethodCallException
-     */
-    public function __get($name)
-    {
-        throw new \BadMethodCallException(str_replace('_fn_', '', $name)
-            . '() is not implemented in the FnStream');
-    }
-
-    /**
-     * The close method is called on the underlying stream only if possible.
-     */
-    public function __destruct()
-    {
-        if (isset($this->_fn_close)) {
-            call_user_func($this->_fn_close);
-        }
-    }
-
-    /**
-     * Adds custom functionality to an underlying stream by intercepting
-     * specific method calls.
-     *
-     * @param StreamInterface $stream  Stream to decorate
-     * @param array           $methods Hash of method name to a closure
-     *
-     * @return FnStream
-     */
-    public static function decorate(StreamInterface $stream, array $methods)
-    {
-        // If any of the required methods were not provided, then simply
-        // proxy to the decorated stream.
-        foreach (array_diff(self::$slots, array_keys($methods)) as $diff) {
-            $methods[$diff] = [$stream, $diff];
-        }
-
-        return new self($methods);
-    }
-
-    public function __toString()
-    {
-        return call_user_func($this->_fn___toString);
-    }
-
-    public function close()
-    {
-        return call_user_func($this->_fn_close);
-    }
-
-    public function detach()
-    {
-        return call_user_func($this->_fn_detach);
-    }
-
-    public function getSize()
-    {
-        return call_user_func($this->_fn_getSize);
-    }
-
-    public function tell()
-    {
-        return call_user_func($this->_fn_tell);
-    }
-
-    public function eof()
-    {
-        return call_user_func($this->_fn_eof);
-    }
-
-    public function isSeekable()
-    {
-        return call_user_func($this->_fn_isSeekable);
-    }
-
-    public function rewind()
-    {
-        call_user_func($this->_fn_rewind);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        call_user_func($this->_fn_seek, $offset, $whence);
-    }
-
-    public function isWritable()
-    {
-        return call_user_func($this->_fn_isWritable);
-    }
-
-    public function write($string)
-    {
-        return call_user_func($this->_fn_write, $string);
-    }
-
-    public function isReadable()
-    {
-        return call_user_func($this->_fn_isReadable);
-    }
-
-    public function read($length)
-    {
-        return call_user_func($this->_fn_read, $length);
-    }
-
-    public function getContents()
-    {
-        return call_user_func($this->_fn_getContents);
-    }
-
-    public function getMetadata($key = null)
-    {
-        return call_user_func($this->_fn_getMetadata, $key);
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/InflateStream.php b/vendor/guzzlehttp/psr7/src/InflateStream.php
deleted file mode 100644
index 2c8628b..0000000
--- a/vendor/guzzlehttp/psr7/src/InflateStream.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
- *
- * This stream decorator skips the first 10 bytes of the given stream to remove
- * the gzip header, converts the provided stream to a PHP stream resource,
- * then appends the zlib.inflate filter. The stream is then converted back
- * to a Guzzle stream resource to be used as a Guzzle stream.
- *
- * @link http://tools.ietf.org/html/rfc1952
- * @link http://php.net/manual/en/filters.compression.php
- */
-class InflateStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    public function __construct(StreamInterface $stream)
-    {
-        // Skip the first 10 bytes
-        $stream = new LimitStream($stream, -1, 10);
-        $resource = StreamWrapper::getResource($stream);
-        stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ);
-        $this->stream = new Stream($resource);
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php b/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
deleted file mode 100644
index 02cec3a..0000000
--- a/vendor/guzzlehttp/psr7/src/LazyOpenStream.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Lazily reads or writes to a file that is opened only after an IO operation
- * take place on the stream.
- */
-class LazyOpenStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var string File to open */
-    private $filename;
-
-    /** @var string $mode */
-    private $mode;
-
-    /**
-     * @param string $filename File to lazily open
-     * @param string $mode     fopen mode to use when opening the stream
-     */
-    public function __construct($filename, $mode)
-    {
-        $this->filename = $filename;
-        $this->mode = $mode;
-    }
-
-    /**
-     * Creates the underlying stream lazily when required.
-     *
-     * @return StreamInterface
-     */
-    protected function createStream()
-    {
-        return stream_for(try_fopen($this->filename, $this->mode));
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/LimitStream.php b/vendor/guzzlehttp/psr7/src/LimitStream.php
deleted file mode 100644
index 7f2298b..0000000
--- a/vendor/guzzlehttp/psr7/src/LimitStream.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-
-/**
- * Decorator used to return only a subset of a stream
- */
-class LimitStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var int Offset to start reading from */
-    private $offset;
-
-    /** @var int Limit the number of bytes that can be read */
-    private $limit;
-
-    /**
-     * @param StreamInterface $stream Stream to wrap
-     * @param int             $limit  Total number of bytes to allow to be read
-     *                                from the stream. Pass -1 for no limit.
-     * @param int|null        $offset Position to seek to before reading (only
-     *                                works on seekable streams).
-     */
-    public function __construct(
-        StreamInterface $stream,
-        $limit = -1,
-        $offset = 0
-    ) {
-        $this->stream = $stream;
-        $this->setLimit($limit);
-        $this->setOffset($offset);
-    }
-
-    public function eof()
-    {
-        // Always return true if the underlying stream is EOF
-        if ($this->stream->eof()) {
-            return true;
-        }
-
-        // No limit and the underlying stream is not at EOF
-        if ($this->limit == -1) {
-            return false;
-        }
-
-        return $this->stream->tell() >= $this->offset + $this->limit;
-    }
-
-    /**
-     * Returns the size of the limited subset of data
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        if (null === ($length = $this->stream->getSize())) {
-            return null;
-        } elseif ($this->limit == -1) {
-            return $length - $this->offset;
-        } else {
-            return min($this->limit, $length - $this->offset);
-        }
-    }
-
-    /**
-     * Allow for a bounded seek on the read limited stream
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence !== SEEK_SET || $offset < 0) {
-            throw new \RuntimeException(sprintf(
-                'Cannot seek to offset % with whence %s',
-                $offset,
-                $whence
-            ));
-        }
-
-        $offset += $this->offset;
-
-        if ($this->limit !== -1) {
-            if ($offset > $this->offset + $this->limit) {
-                $offset = $this->offset + $this->limit;
-            }
-        }
-
-        $this->stream->seek($offset);
-    }
-
-    /**
-     * Give a relative tell()
-     * {@inheritdoc}
-     */
-    public function tell()
-    {
-        return $this->stream->tell() - $this->offset;
-    }
-
-    /**
-     * Set the offset to start limiting from
-     *
-     * @param int $offset Offset to seek to and begin byte limiting from
-     *
-     * @throws \RuntimeException if the stream cannot be seeked.
-     */
-    public function setOffset($offset)
-    {
-        $current = $this->stream->tell();
-
-        if ($current !== $offset) {
-            // If the stream cannot seek to the offset position, then read to it
-            if ($this->stream->isSeekable()) {
-                $this->stream->seek($offset);
-            } elseif ($current > $offset) {
-                throw new \RuntimeException("Could not seek to stream offset $offset");
-            } else {
-                $this->stream->read($offset - $current);
-            }
-        }
-
-        $this->offset = $offset;
-    }
-
-    /**
-     * Set the limit of bytes that the decorator allows to be read from the
-     * stream.
-     *
-     * @param int $limit Number of bytes to allow to be read from the stream.
-     *                   Use -1 for no limit.
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-    }
-
-    public function read($length)
-    {
-        if ($this->limit == -1) {
-            return $this->stream->read($length);
-        }
-
-        // Check if the current position is less than the total allowed
-        // bytes + original offset
-        $remaining = ($this->offset + $this->limit) - $this->stream->tell();
-        if ($remaining > 0) {
-            // Only return the amount of requested data, ensuring that the byte
-            // limit is not exceeded
-            return $this->stream->read(min($remaining, $length));
-        }
-
-        return '';
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/MessageTrait.php b/vendor/guzzlehttp/psr7/src/MessageTrait.php
deleted file mode 100644
index 123205c..0000000
--- a/vendor/guzzlehttp/psr7/src/MessageTrait.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Trait implementing functionality common to requests and responses.
- */
-trait MessageTrait
-{
-    /** @var array Cached HTTP header collection with lowercase key to values */
-    private $headers = [];
-
-    /** @var array Actual key to list of values per header. */
-    private $headerLines = [];
-
-    /** @var string */
-    private $protocol = '1.1';
-
-    /** @var StreamInterface */
-    private $stream;
-
-    public function getProtocolVersion()
-    {
-        return $this->protocol;
-    }
-
-    public function withProtocolVersion($version)
-    {
-        if ($this->protocol === $version) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->protocol = $version;
-        return $new;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headerLines;
-    }
-
-    public function hasHeader($header)
-    {
-        return isset($this->headers[strtolower($header)]);
-    }
-
-    public function getHeader($header)
-    {
-        $name = strtolower($header);
-        return isset($this->headers[$name]) ? $this->headers[$name] : [];
-    }
-
-    public function getHeaderLine($header)
-    {
-        return implode(', ', $this->getHeader($header));
-    }
-
-    public function withHeader($header, $value)
-    {
-        $new = clone $this;
-        $header = trim($header);
-        $name = strtolower($header);
-
-        if (!is_array($value)) {
-            $new->headers[$name] = [trim($value)];
-        } else {
-            $new->headers[$name] = $value;
-            foreach ($new->headers[$name] as &$v) {
-                $v = trim($v);
-            }
-        }
-
-        // Remove the header lines.
-        foreach (array_keys($new->headerLines) as $key) {
-            if (strtolower($key) === $name) {
-                unset($new->headerLines[$key]);
-            }
-        }
-
-        // Add the header line.
-        $new->headerLines[$header] = $new->headers[$name];
-
-        return $new;
-    }
-
-    public function withAddedHeader($header, $value)
-    {
-        if (!$this->hasHeader($header)) {
-            return $this->withHeader($header, $value);
-        }
-
-        $new = clone $this;
-        $new->headers[strtolower($header)][] = $value;
-        $new->headerLines[$header][] = $value;
-        return $new;
-    }
-
-    public function withoutHeader($header)
-    {
-        if (!$this->hasHeader($header)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $name = strtolower($header);
-        unset($new->headers[$name]);
-
-        foreach (array_keys($new->headerLines) as $key) {
-            if (strtolower($key) === $name) {
-                unset($new->headerLines[$key]);
-            }
-        }
-
-        return $new;
-    }
-
-    public function getBody()
-    {
-        if (!$this->stream) {
-            $this->stream = stream_for('');
-        }
-
-        return $this->stream;
-    }
-
-    public function withBody(StreamInterface $body)
-    {
-        if ($body === $this->stream) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->stream = $body;
-        return $new;
-    }
-
-    private function setHeaders(array $headers)
-    {
-        $this->headerLines = $this->headers = [];
-        foreach ($headers as $header => $value) {
-            $header = trim($header);
-            $name = strtolower($header);
-            if (!is_array($value)) {
-                $value = trim($value);
-                $this->headers[$name][] = $value;
-                $this->headerLines[$header][] = $value;
-            } else {
-                foreach ($value as $v) {
-                    $v = trim($v);
-                    $this->headers[$name][] = $v;
-                    $this->headerLines[$header][] = $v;
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/MultipartStream.php b/vendor/guzzlehttp/psr7/src/MultipartStream.php
deleted file mode 100644
index fd006ec..0000000
--- a/vendor/guzzlehttp/psr7/src/MultipartStream.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Stream that when read returns bytes for a streaming multipart or
- * multipart/form-data stream.
- */
-class MultipartStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $boundary;
-
-    /**
-     * @param array  $elements Array of associative arrays, each containing a
-     *                         required "name" key mapping to the form field,
-     *                         name, a required "contents" key mapping to a
-     *                         StreamInterface/resource/string, an optional
-     *                         "headers" associative array of custom headers,
-     *                         and an optional "filename" key mapping to a
-     *                         string to send as the filename in the part.
-     * @param string $boundary You can optionally provide a specific boundary
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $elements = [], $boundary = null)
-    {
-        $this->boundary = $boundary ?: uniqid();
-        $this->stream = $this->createStream($elements);
-    }
-
-    /**
-     * Get the boundary
-     *
-     * @return string
-     */
-    public function getBoundary()
-    {
-        return $this->boundary;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    /**
-     * Get the headers needed before transferring the content of a POST file
-     */
-    private function getHeaders(array $headers)
-    {
-        $str = '';
-        foreach ($headers as $key => $value) {
-            $str .= "{$key}: {$value}\r\n";
-        }
-
-        return "--{$this->boundary}\r\n" . trim($str) . "\r\n\r\n";
-    }
-
-    /**
-     * Create the aggregate stream that will be used to upload the POST data
-     */
-    protected function createStream(array $elements)
-    {
-        $stream = new AppendStream();
-
-        foreach ($elements as $element) {
-            $this->addElement($stream, $element);
-        }
-
-        // Add the trailing boundary with CRLF
-        $stream->addStream(stream_for("--{$this->boundary}--\r\n"));
-
-        return $stream;
-    }
-
-    private function addElement(AppendStream $stream, array $element)
-    {
-        foreach (['contents', 'name'] as $key) {
-            if (!array_key_exists($key, $element)) {
-                throw new \InvalidArgumentException("A '{$key}' key is required");
-            }
-        }
-
-        $element['contents'] = stream_for($element['contents']);
-
-        if (empty($element['filename'])) {
-            $uri = $element['contents']->getMetadata('uri');
-            if (substr($uri, 0, 6) !== 'php://') {
-                $element['filename'] = $uri;
-            }
-        }
-
-        list($body, $headers) = $this->createElement(
-            $element['name'],
-            $element['contents'],
-            isset($element['filename']) ? $element['filename'] : null,
-            isset($element['headers']) ? $element['headers'] : []
-        );
-
-        $stream->addStream(stream_for($this->getHeaders($headers)));
-        $stream->addStream($body);
-        $stream->addStream(stream_for("\r\n"));
-    }
-
-    /**
-     * @return array
-     */
-    private function createElement($name, $stream, $filename, array $headers)
-    {
-        // Set a default content-disposition header if one was no provided
-        $disposition = $this->getHeader($headers, 'content-disposition');
-        if (!$disposition) {
-            $headers['Content-Disposition'] = $filename
-                ? sprintf('form-data; name="%s"; filename="%s"',
-                    $name,
-                    basename($filename))
-                : "form-data; name=\"{$name}\"";
-        }
-
-        // Set a default content-length header if one was no provided
-        $length = $this->getHeader($headers, 'content-length');
-        if (!$length) {
-            if ($length = $stream->getSize()) {
-                $headers['Content-Length'] = (string) $length;
-            }
-        }
-
-        // Set a default Content-Type if one was not supplied
-        $type = $this->getHeader($headers, 'content-type');
-        if (!$type && $filename) {
-            if ($type = mimetype_from_filename($filename)) {
-                $headers['Content-Type'] = $type;
-            }
-        }
-
-        return [$stream, $headers];
-    }
-
-    private function getHeader(array $headers, $key)
-    {
-        $lowercaseHeader = strtolower($key);
-        foreach ($headers as $k => $v) {
-            if (strtolower($k) === $lowercaseHeader) {
-                return $v;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/NoSeekStream.php b/vendor/guzzlehttp/psr7/src/NoSeekStream.php
deleted file mode 100644
index 2332218..0000000
--- a/vendor/guzzlehttp/psr7/src/NoSeekStream.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Stream decorator that prevents a stream from being seeked
- */
-class NoSeekStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        throw new \RuntimeException('Cannot seek a NoSeekStream');
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/PumpStream.php b/vendor/guzzlehttp/psr7/src/PumpStream.php
deleted file mode 100644
index ffb5440..0000000
--- a/vendor/guzzlehttp/psr7/src/PumpStream.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Provides a read only stream that pumps data from a PHP callable.
- *
- * When invoking the provided callable, the PumpStream will pass the amount of
- * data requested to read to the callable. The callable can choose to ignore
- * this value and return fewer or more bytes than requested. Any extra data
- * returned by the provided callable is buffered internally until drained using
- * the read() function of the PumpStream. The provided callable MUST return
- * false when there is no more data to read.
- */
-class PumpStream implements StreamInterface
-{
-    /** @var callable */
-    private $source;
-
-    /** @var int */
-    private $size;
-
-    /** @var int */
-    private $tellPos = 0;
-
-    /** @var array */
-    private $metadata;
-
-    /** @var BufferStream */
-    private $buffer;
-
-    /**
-     * @param callable $source Source of the stream data. The callable MAY
-     *                         accept an integer argument used to control the
-     *                         amount of data to return. The callable MUST
-     *                         return a string when called, or false on error
-     *                         or EOF.
-     * @param array $options   Stream options:
-     *                         - metadata: Hash of metadata to use with stream.
-     *                         - size: Size of the stream, if known.
-     */
-    public function __construct(callable $source, array $options = [])
-    {
-        $this->source = $source;
-        $this->size = isset($options['size']) ? $options['size'] : null;
-        $this->metadata = isset($options['metadata']) ? $options['metadata'] : [];
-        $this->buffer = new BufferStream();
-    }
-
-    public function __toString()
-    {
-        try {
-            return copy_to_string($this);
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    public function close()
-    {
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $this->tellPos = false;
-        $this->source = null;
-    }
-
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    public function tell()
-    {
-        return $this->tellPos;
-    }
-
-    public function eof()
-    {
-        return !$this->source;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        throw new \RuntimeException('Cannot seek a PumpStream');
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        throw new \RuntimeException('Cannot write to a PumpStream');
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function read($length)
-    {
-        $data = $this->buffer->read($length);
-        $readLen = strlen($data);
-        $this->tellPos += $readLen;
-        $remaining = $length - $readLen;
-
-        if ($remaining) {
-            $this->pump($remaining);
-            $data .= $this->buffer->read($remaining);
-            $this->tellPos += strlen($data) - $readLen;
-        }
-
-        return $data;
-    }
-
-    public function getContents()
-    {
-        $result = '';
-        while (!$this->eof()) {
-            $result .= $this->read(1000000);
-        }
-
-        return $result;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!$key) {
-            return $this->metadata;
-        }
-
-        return isset($this->metadata[$key]) ? $this->metadata[$key] : null;
-    }
-
-    private function pump($length)
-    {
-        if ($this->source) {
-            do {
-                $data = call_user_func($this->source, $length);
-                if ($data === false || $data === null) {
-                    $this->source = null;
-                    return;
-                }
-                $this->buffer->write($data);
-                $length -= strlen($data);
-            } while ($length > 0);
-        }
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/Request.php b/vendor/guzzlehttp/psr7/src/Request.php
deleted file mode 100644
index 0189b14..0000000
--- a/vendor/guzzlehttp/psr7/src/Request.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use InvalidArgumentException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * PSR-7 request implementation.
- */
-class Request implements RequestInterface
-{
-    use MessageTrait {
-        withHeader as protected withParentHeader;
-    }
-
-    /** @var string */
-    private $method;
-
-    /** @var null|string */
-    private $requestTarget;
-
-    /** @var null|UriInterface */
-    private $uri;
-
-    /**
-     * @param null|string $method HTTP method for the request.
-     * @param null|string $uri URI for the request.
-     * @param array  $headers Headers for the message.
-     * @param string|resource|StreamInterface $body Message body.
-     * @param string $protocolVersion HTTP protocol version.
-     *
-     * @throws InvalidArgumentException for an invalid URI
-     */
-    public function __construct(
-        $method,
-        $uri,
-        array $headers = [],
-        $body = null,
-        $protocolVersion = '1.1'
-    ) {
-        if (is_string($uri)) {
-            $uri = new Uri($uri);
-        } elseif (!($uri instanceof UriInterface)) {
-            throw new \InvalidArgumentException(
-                'URI must be a string or Psr\Http\Message\UriInterface'
-            );
-        }
-
-        $this->method = strtoupper($method);
-        $this->uri = $uri;
-        $this->setHeaders($headers);
-        $this->protocol = $protocolVersion;
-
-        $host = $uri->getHost();
-        if ($host && !$this->hasHeader('Host')) {
-            $this->updateHostFromUri($host);
-        }
-
-        if ($body) {
-            $this->stream = stream_for($body);
-        }
-    }
-
-    public function getRequestTarget()
-    {
-        if ($this->requestTarget !== null) {
-            return $this->requestTarget;
-        }
-
-        $target = $this->uri->getPath();
-        if ($target == null) {
-            $target = '/';
-        }
-        if ($this->uri->getQuery()) {
-            $target .= '?' . $this->uri->getQuery();
-        }
-
-        return $target;
-    }
-
-    public function withRequestTarget($requestTarget)
-    {
-        if (preg_match('#\s#', $requestTarget)) {
-            throw new InvalidArgumentException(
-                'Invalid request target provided; cannot contain whitespace'
-            );
-        }
-
-        $new = clone $this;
-        $new->requestTarget = $requestTarget;
-        return $new;
-    }
-
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    public function withMethod($method)
-    {
-        $new = clone $this;
-        $new->method = strtoupper($method);
-        return $new;
-    }
-
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    public function withUri(UriInterface $uri, $preserveHost = false)
-    {
-        if ($uri === $this->uri) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->uri = $uri;
-
-        if (!$preserveHost) {
-            if ($host = $uri->getHost()) {
-                $new->updateHostFromUri($host);
-            }
-        }
-
-        return $new;
-    }
-
-    public function withHeader($header, $value)
-    {
-        /** @var Request $newInstance */
-        $newInstance = $this->withParentHeader($header, $value);
-        return $newInstance;
-    }
-
-    private function updateHostFromUri($host)
-    {
-        // Ensure Host is the first header.
-        // See: http://tools.ietf.org/html/rfc7230#section-5.4
-        if ($port = $this->uri->getPort()) {
-            $host .= ':' . $port;
-        }
-
-        $this->headerLines = ['Host' => [$host]] + $this->headerLines;
-        $this->headers = ['host' => [$host]] + $this->headers;
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/Response.php b/vendor/guzzlehttp/psr7/src/Response.php
deleted file mode 100644
index c94bf8f..0000000
--- a/vendor/guzzlehttp/psr7/src/Response.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * PSR-7 response implementation.
- */
-class Response implements ResponseInterface
-{
-    use MessageTrait;
-
-    /** @var array Map of standard HTTP status code/reason phrases */
-    private static $phrases = [
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-status',
-        208 => 'Already Reported',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Switch Proxy',
-        307 => 'Temporary Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Time-out',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Large',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested range not satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Unordered Collection',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Time-out',
-        505 => 'HTTP Version not supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        511 => 'Network Authentication Required',
-    ];
-
-    /** @var null|string */
-    private $reasonPhrase = '';
-
-    /** @var int */
-    private $statusCode = 200;
-
-    /**
-     * @param int    $status  Status code for the response, if any.
-     * @param array  $headers Headers for the response, if any.
-     * @param mixed  $body    Stream body.
-     * @param string $version Protocol version.
-     * @param string $reason  Reason phrase (a default will be used if possible).
-     */
-    public function __construct(
-        $status = 200,
-        array $headers = [],
-        $body = null,
-        $version = '1.1',
-        $reason = null
-    ) {
-        $this->statusCode = (int) $status;
-
-        if ($body !== null) {
-            $this->stream = stream_for($body);
-        }
-
-        $this->setHeaders($headers);
-        if (!$reason && isset(self::$phrases[$this->statusCode])) {
-            $this->reasonPhrase = self::$phrases[$status];
-        } else {
-            $this->reasonPhrase = (string) $reason;
-        }
-
-        $this->protocol = $version;
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function withStatus($code, $reasonPhrase = '')
-    {
-        $new = clone $this;
-        $new->statusCode = (int) $code;
-        if (!$reasonPhrase && isset(self::$phrases[$new->statusCode])) {
-            $reasonPhrase = self::$phrases[$new->statusCode];
-        }
-        $new->reasonPhrase = $reasonPhrase;
-        return $new;
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/Stream.php b/vendor/guzzlehttp/psr7/src/Stream.php
deleted file mode 100644
index 0b0db01..0000000
--- a/vendor/guzzlehttp/psr7/src/Stream.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * PHP stream implementation.
- *
- * @var $stream
- */
-class Stream implements StreamInterface
-{
-    private $stream;
-    private $size;
-    private $seekable;
-    private $readable;
-    private $writable;
-    private $uri;
-    private $customMetadata;
-
-    /** @var array Hash of readable and writable stream types */
-    private static $readWriteHash = [
-        'read' => [
-            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
-            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
-            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a+' => true
-        ],
-        'write' => [
-            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
-            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
-            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true
-        ]
-    ];
-
-    /**
-     * This constructor accepts an associative array of options.
-     *
-     * - size: (int) If a read stream would otherwise have an indeterminate
-     *   size, but the size is known due to foreknownledge, then you can
-     *   provide that size, in bytes.
-     * - metadata: (array) Any additional metadata to return when the metadata
-     *   of the stream is accessed.
-     *
-     * @param resource $stream  Stream resource to wrap.
-     * @param array    $options Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the stream is not a stream resource
-     */
-    public function __construct($stream, $options = [])
-    {
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Stream must be a resource');
-        }
-
-        if (isset($options['size'])) {
-            $this->size = $options['size'];
-        }
-
-        $this->customMetadata = isset($options['metadata'])
-            ? $options['metadata']
-            : [];
-
-        $this->stream = $stream;
-        $meta = stream_get_meta_data($this->stream);
-        $this->seekable = $meta['seekable'];
-        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
-        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
-        $this->uri = $this->getMetadata('uri');
-    }
-
-    public function __get($name)
-    {
-        if ($name == 'stream') {
-            throw new \RuntimeException('The stream is detached');
-        }
-
-        throw new \BadMethodCallException('No value for ' . $name);
-    }
-
-    /**
-     * Closes the stream when the destructed
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->seek(0);
-            return (string) stream_get_contents($this->stream);
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    public function getContents()
-    {
-        $contents = stream_get_contents($this->stream);
-
-        if ($contents === false) {
-            throw new \RuntimeException('Unable to read stream contents');
-        }
-
-        return $contents;
-    }
-
-    public function close()
-    {
-        if (isset($this->stream)) {
-            if (is_resource($this->stream)) {
-                fclose($this->stream);
-            }
-            $this->detach();
-        }
-    }
-
-    public function detach()
-    {
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        $result = $this->stream;
-        unset($this->stream);
-        $this->size = $this->uri = null;
-        $this->readable = $this->writable = $this->seekable = false;
-
-        return $result;
-    }
-
-    public function getSize()
-    {
-        if ($this->size !== null) {
-            return $this->size;
-        }
-
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        // Clear the stat cache if the stream has a URI
-        if ($this->uri) {
-            clearstatcache(true, $this->uri);
-        }
-
-        $stats = fstat($this->stream);
-        if (isset($stats['size'])) {
-            $this->size = $stats['size'];
-            return $this->size;
-        }
-
-        return null;
-    }
-
-    public function isReadable()
-    {
-        return $this->readable;
-    }
-
-    public function isWritable()
-    {
-        return $this->writable;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function eof()
-    {
-        return !$this->stream || feof($this->stream);
-    }
-
-    public function tell()
-    {
-        $result = ftell($this->stream);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to determine stream position');
-        }
-
-        return $result;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('Stream is not seekable');
-        } elseif (fseek($this->stream, $offset, $whence) === -1) {
-            throw new \RuntimeException('Unable to seek to stream position '
-                . $offset . ' with whence ' . var_export($whence, true));
-        }
-    }
-
-    public function read($length)
-    {
-        if (!$this->readable) {
-            throw new \RuntimeException('Cannot read from non-readable stream');
-        }
-
-        return fread($this->stream, $length);
-    }
-
-    public function write($string)
-    {
-        if (!$this->writable) {
-            throw new \RuntimeException('Cannot write to a non-writable stream');
-        }
-
-        // We can't know the size after writing anything
-        $this->size = null;
-        $result = fwrite($this->stream, $string);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to write to stream');
-        }
-
-        return $result;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!isset($this->stream)) {
-            return $key ? null : [];
-        } elseif (!$key) {
-            return $this->customMetadata + stream_get_meta_data($this->stream);
-        } elseif (isset($this->customMetadata[$key])) {
-            return $this->customMetadata[$key];
-        }
-
-        $meta = stream_get_meta_data($this->stream);
-
-        return isset($meta[$key]) ? $meta[$key] : null;
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php b/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
deleted file mode 100644
index daec6f5..0000000
--- a/vendor/guzzlehttp/psr7/src/StreamDecoratorTrait.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Stream decorator trait
- * @property StreamInterface stream
- */
-trait StreamDecoratorTrait
-{
-    /**
-     * @param StreamInterface $stream Stream to decorate
-     */
-    public function __construct(StreamInterface $stream)
-    {
-        $this->stream = $stream;
-    }
-
-    /**
-     * Magic method used to create a new stream if streams are not added in
-     * the constructor of a decorator (e.g., LazyOpenStream).
-     *
-     * @param string $name Name of the property (allows "stream" only).
-     *
-     * @return StreamInterface
-     */
-    public function __get($name)
-    {
-        if ($name == 'stream') {
-            $this->stream = $this->createStream();
-            return $this->stream;
-        }
-
-        throw new \UnexpectedValueException("$name not found on class");
-    }
-
-    public function __toString()
-    {
-        try {
-            if ($this->isSeekable()) {
-                $this->seek(0);
-            }
-            return $this->getContents();
-        } catch (\Exception $e) {
-            // Really, PHP? https://bugs.php.net/bug.php?id=53648
-            trigger_error('StreamDecorator::__toString exception: '
-                . (string) $e, E_USER_ERROR);
-            return '';
-        }
-    }
-
-    public function getContents()
-    {
-        return copy_to_string($this);
-    }
-
-    /**
-     * Allow decorators to implement custom methods
-     *
-     * @param string $method Missing method name
-     * @param array  $args   Method arguments
-     *
-     * @return mixed
-     */
-    public function __call($method, array $args)
-    {
-        $result = call_user_func_array([$this->stream, $method], $args);
-
-        // Always return the wrapped object if the result is a return $this
-        return $result === $this->stream ? $this : $result;
-    }
-
-    public function close()
-    {
-        $this->stream->close();
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $this->stream->getMetadata($key);
-    }
-
-    public function detach()
-    {
-        return $this->stream->detach();
-    }
-
-    public function getSize()
-    {
-        return $this->stream->getSize();
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function isReadable()
-    {
-        return $this->stream->isReadable();
-    }
-
-    public function isWritable()
-    {
-        return $this->stream->isWritable();
-    }
-
-    public function isSeekable()
-    {
-        return $this->stream->isSeekable();
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        $this->stream->seek($offset, $whence);
-    }
-
-    public function read($length)
-    {
-        return $this->stream->read($length);
-    }
-
-    public function write($string)
-    {
-        return $this->stream->write($string);
-    }
-
-    /**
-     * Implement in subclasses to dynamically create streams when requested.
-     *
-     * @return StreamInterface
-     * @throws \BadMethodCallException
-     */
-    protected function createStream()
-    {
-        throw new \BadMethodCallException('Not implemented');
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/StreamWrapper.php b/vendor/guzzlehttp/psr7/src/StreamWrapper.php
deleted file mode 100644
index cf7b223..0000000
--- a/vendor/guzzlehttp/psr7/src/StreamWrapper.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Converts Guzzle streams into PHP stream resources.
- */
-class StreamWrapper
-{
-    /** @var resource */
-    public $context;
-
-    /** @var StreamInterface */
-    private $stream;
-
-    /** @var string r, r+, or w */
-    private $mode;
-
-    /**
-     * Returns a resource representing the stream.
-     *
-     * @param StreamInterface $stream The stream to get a resource for
-     *
-     * @return resource
-     * @throws \InvalidArgumentException if stream is not readable or writable
-     */
-    public static function getResource(StreamInterface $stream)
-    {
-        self::register();
-
-        if ($stream->isReadable()) {
-            $mode = $stream->isWritable() ? 'r+' : 'r';
-        } elseif ($stream->isWritable()) {
-            $mode = 'w';
-        } else {
-            throw new \InvalidArgumentException('The stream must be readable, '
-                . 'writable, or both.');
-        }
-
-        return fopen('guzzle://stream', $mode, null, stream_context_create([
-            'guzzle' => ['stream' => $stream]
-        ]));
-    }
-
-    /**
-     * Registers the stream wrapper if needed
-     */
-    public static function register()
-    {
-        if (!in_array('guzzle', stream_get_wrappers())) {
-            stream_wrapper_register('guzzle', __CLASS__);
-        }
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        $options = stream_context_get_options($this->context);
-
-        if (!isset($options['guzzle']['stream'])) {
-            return false;
-        }
-
-        $this->mode = $mode;
-        $this->stream = $options['guzzle']['stream'];
-
-        return true;
-    }
-
-    public function stream_read($count)
-    {
-        return $this->stream->read($count);
-    }
-
-    public function stream_write($data)
-    {
-        return (int) $this->stream->write($data);
-    }
-
-    public function stream_tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function stream_eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function stream_seek($offset, $whence)
-    {
-        $this->stream->seek($offset, $whence);
-
-        return true;
-    }
-
-    public function stream_stat()
-    {
-        static $modeMap = [
-            'r'  => 33060,
-            'r+' => 33206,
-            'w'  => 33188
-        ];
-
-        return [
-            'dev'     => 0,
-            'ino'     => 0,
-            'mode'    => $modeMap[$this->mode],
-            'nlink'   => 0,
-            'uid'     => 0,
-            'gid'     => 0,
-            'rdev'    => 0,
-            'size'    => $this->stream->getSize() ?: 0,
-            'atime'   => 0,
-            'mtime'   => 0,
-            'ctime'   => 0,
-            'blksize' => 0,
-            'blocks'  => 0
-        ];
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/Uri.php b/vendor/guzzlehttp/psr7/src/Uri.php
deleted file mode 100644
index d428f2e..0000000
--- a/vendor/guzzlehttp/psr7/src/Uri.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\UriInterface;
-
-/**
- * Basic PSR-7 URI implementation.
- *
- * @link https://github.com/phly/http This class is based upon
- *     Matthew Weier O'Phinney's URI implementation in phly/http.
- */
-class Uri implements UriInterface
-{
-    private static $schemes = [
-        'http'  => 80,
-        'https' => 443,
-    ];
-
-    private static $charUnreserved = 'a-zA-Z0-9_\-\.~';
-    private static $charSubDelims = '!\$&\'\(\)\*\+,;=';
-    private static $replaceQuery = ['=' => '%3D', '&' => '%26'];
-
-    /** @var string Uri scheme. */
-    private $scheme = '';
-
-    /** @var string Uri user info. */
-    private $userInfo = '';
-
-    /** @var string Uri host. */
-    private $host = '';
-
-    /** @var int|null Uri port. */
-    private $port;
-
-    /** @var string Uri path. */
-    private $path = '';
-
-    /** @var string Uri query string. */
-    private $query = '';
-
-    /** @var string Uri fragment. */
-    private $fragment = '';
-
-    /**
-     * @param string $uri URI to parse and wrap.
-     */
-    public function __construct($uri = '')
-    {
-        if ($uri != null) {
-            $parts = parse_url($uri);
-            if ($parts === false) {
-                throw new \InvalidArgumentException("Unable to parse URI: $uri");
-            }
-            $this->applyParts($parts);
-        }
-    }
-
-    public function __toString()
-    {
-        return self::createUriString(
-            $this->scheme,
-            $this->getAuthority(),
-            $this->getPath(),
-            $this->query,
-            $this->fragment
-        );
-    }
-
-    /**
-     * Removes dot segments from a path and returns the new path.
-     *
-     * @param string $path
-     *
-     * @return string
-     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
-     */
-    public static function removeDotSegments($path)
-    {
-        static $noopPaths = ['' => true, '/' => true, '*' => true];
-        static $ignoreSegments = ['.' => true, '..' => true];
-
-        if (isset($noopPaths[$path])) {
-            return $path;
-        }
-
-        $results = [];
-        $segments = explode('/', $path);
-        foreach ($segments as $segment) {
-            if ($segment == '..') {
-                array_pop($results);
-            } elseif (!isset($ignoreSegments[$segment])) {
-                $results[] = $segment;
-            }
-        }
-
-        $newPath = implode('/', $results);
-        // Add the leading slash if necessary
-        if (substr($path, 0, 1) === '/' &&
-            substr($newPath, 0, 1) !== '/'
-        ) {
-            $newPath = '/' . $newPath;
-        }
-
-        // Add the trailing slash if necessary
-        if ($newPath != '/' && isset($ignoreSegments[end($segments)])) {
-            $newPath .= '/';
-        }
-
-        return $newPath;
-    }
-
-    /**
-     * Resolve a base URI with a relative URI and return a new URI.
-     *
-     * @param UriInterface $base Base URI
-     * @param string       $rel  Relative URI
-     *
-     * @return UriInterface
-     */
-    public static function resolve(UriInterface $base, $rel)
-    {
-        if ($rel === null || $rel === '') {
-            return $base;
-        }
-
-        if (!($rel instanceof UriInterface)) {
-            $rel = new self($rel);
-        }
-
-        // Return the relative uri as-is if it has a scheme.
-        if ($rel->getScheme()) {
-            return $rel->withPath(static::removeDotSegments($rel->getPath()));
-        }
-
-        $relParts = [
-            'scheme'    => $rel->getScheme(),
-            'authority' => $rel->getAuthority(),
-            'path'      => $rel->getPath(),
-            'query'     => $rel->getQuery(),
-            'fragment'  => $rel->getFragment()
-        ];
-
-        $parts = [
-            'scheme'    => $base->getScheme(),
-            'authority' => $base->getAuthority(),
-            'path'      => $base->getPath(),
-            'query'     => $base->getQuery(),
-            'fragment'  => $base->getFragment()
-        ];
-
-        if (!empty($relParts['authority'])) {
-            $parts['authority'] = $relParts['authority'];
-            $parts['path'] = self::removeDotSegments($relParts['path']);
-            $parts['query'] = $relParts['query'];
-            $parts['fragment'] = $relParts['fragment'];
-        } elseif (!empty($relParts['path'])) {
-            if (substr($relParts['path'], 0, 1) == '/') {
-                $parts['path'] = self::removeDotSegments($relParts['path']);
-                $parts['query'] = $relParts['query'];
-                $parts['fragment'] = $relParts['fragment'];
-            } else {
-                if (!empty($parts['authority']) && empty($parts['path'])) {
-                    $mergedPath = '/';
-                } else {
-                    $mergedPath = substr($parts['path'], 0, strrpos($parts['path'], '/') + 1);
-                }
-                $parts['path'] = self::removeDotSegments($mergedPath . $relParts['path']);
-                $parts['query'] = $relParts['query'];
-                $parts['fragment'] = $relParts['fragment'];
-            }
-        } elseif (!empty($relParts['query'])) {
-            $parts['query'] = $relParts['query'];
-        } elseif ($relParts['fragment'] != null) {
-            $parts['fragment'] = $relParts['fragment'];
-        }
-
-        return new self(static::createUriString(
-            $parts['scheme'],
-            $parts['authority'],
-            $parts['path'],
-            $parts['query'],
-            $parts['fragment']
-        ));
-    }
-
-    /**
-     * Create a new URI with a specific query string value removed.
-     *
-     * Any existing query string values that exactly match the provided key are
-     * removed.
-     *
-     * Note: this function will convert "=" to "%3D" and "&" to "%26".
-     *
-     * @param UriInterface $uri URI to use as a base.
-     * @param string       $key Query string key value pair to remove.
-     *
-     * @return UriInterface
-     */
-    public static function withoutQueryValue(UriInterface $uri, $key)
-    {
-        $current = $uri->getQuery();
-        if (!$current) {
-            return $uri;
-        }
-
-        $result = [];
-        foreach (explode('&', $current) as $part) {
-            if (explode('=', $part)[0] !== $key) {
-                $result[] = $part;
-            };
-        }
-
-        return $uri->withQuery(implode('&', $result));
-    }
-
-    /**
-     * Create a new URI with a specific query string value.
-     *
-     * Any existing query string values that exactly match the provided key are
-     * removed and replaced with the given key value pair.
-     *
-     * Note: this function will convert "=" to "%3D" and "&" to "%26".
-     *
-     * @param UriInterface $uri URI to use as a base.
-     * @param string $key   Key to set.
-     * @param string $value Value to set.
-     *
-     * @return UriInterface
-     */
-    public static function withQueryValue(UriInterface $uri, $key, $value)
-    {
-        $current = $uri->getQuery();
-        $key = strtr($key, self::$replaceQuery);
-
-        if (!$current) {
-            $result = [];
-        } else {
-            $result = [];
-            foreach (explode('&', $current) as $part) {
-                if (explode('=', $part)[0] !== $key) {
-                    $result[] = $part;
-                };
-            }
-        }
-
-        if ($value !== null) {
-            $result[] = $key . '=' . strtr($value, self::$replaceQuery);
-        } else {
-            $result[] = $key;
-        }
-
-        return $uri->withQuery(implode('&', $result));
-    }
-
-    /**
-     * Create a URI from a hash of parse_url parts.
-     *
-     * @param array $parts
-     *
-     * @return self
-     */
-    public static function fromParts(array $parts)
-    {
-        $uri = new self();
-        $uri->applyParts($parts);
-        return $uri;
-    }
-
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    public function getAuthority()
-    {
-        if (empty($this->host)) {
-            return '';
-        }
-
-        $authority = $this->host;
-        if (!empty($this->userInfo)) {
-            $authority = $this->userInfo . '@' . $authority;
-        }
-
-        if ($this->isNonStandardPort($this->scheme, $this->host, $this->port)) {
-            $authority .= ':' . $this->port;
-        }
-
-        return $authority;
-    }
-
-    public function getUserInfo()
-    {
-        return $this->userInfo;
-    }
-
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    public function getPort()
-    {
-        return $this->port;
-    }
-
-    public function getPath()
-    {
-        return $this->path == null ? '' : $this->path;
-    }
-
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    public function withScheme($scheme)
-    {
-        $scheme = $this->filterScheme($scheme);
-
-        if ($this->scheme === $scheme) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->scheme = $scheme;
-        $new->port = $new->filterPort($new->scheme, $new->host, $new->port);
-        return $new;
-    }
-
-    public function withUserInfo($user, $password = null)
-    {
-        $info = $user;
-        if ($password) {
-            $info .= ':' . $password;
-        }
-
-        if ($this->userInfo === $info) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->userInfo = $info;
-        return $new;
-    }
-
-    public function withHost($host)
-    {
-        if ($this->host === $host) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->host = $host;
-        return $new;
-    }
-
-    public function withPort($port)
-    {
-        $port = $this->filterPort($this->scheme, $this->host, $port);
-
-        if ($this->port === $port) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->port = $port;
-        return $new;
-    }
-
-    public function withPath($path)
-    {
-        if (!is_string($path)) {
-            throw new \InvalidArgumentException(
-                'Invalid path provided; must be a string'
-            );
-        }
-
-        $path = $this->filterPath($path);
-
-        if ($this->path === $path) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->path = $path;
-        return $new;
-    }
-
-    public function withQuery($query)
-    {
-        if (!is_string($query) && !method_exists($query, '__toString')) {
-            throw new \InvalidArgumentException(
-                'Query string must be a string'
-            );
-        }
-
-        $query = (string) $query;
-        if (substr($query, 0, 1) === '?') {
-            $query = substr($query, 1);
-        }
-
-        $query = $this->filterQueryAndFragment($query);
-
-        if ($this->query === $query) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->query = $query;
-        return $new;
-    }
-
-    public function withFragment($fragment)
-    {
-        if (substr($fragment, 0, 1) === '#') {
-            $fragment = substr($fragment, 1);
-        }
-
-        $fragment = $this->filterQueryAndFragment($fragment);
-
-        if ($this->fragment === $fragment) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->fragment = $fragment;
-        return $new;
-    }
-
-    /**
-     * Apply parse_url parts to a URI.
-     *
-     * @param $parts Array of parse_url parts to apply.
-     */
-    private function applyParts(array $parts)
-    {
-        $this->scheme = isset($parts['scheme'])
-            ? $this->filterScheme($parts['scheme'])
-            : '';
-        $this->userInfo = isset($parts['user']) ? $parts['user'] : '';
-        $this->host = isset($parts['host']) ? $parts['host'] : '';
-        $this->port = !empty($parts['port'])
-            ? $this->filterPort($this->scheme, $this->host, $parts['port'])
-            : null;
-        $this->path = isset($parts['path'])
-            ? $this->filterPath($parts['path'])
-            : '';
-        $this->query = isset($parts['query'])
-            ? $this->filterQueryAndFragment($parts['query'])
-            : '';
-        $this->fragment = isset($parts['fragment'])
-            ? $this->filterQueryAndFragment($parts['fragment'])
-            : '';
-        if (isset($parts['pass'])) {
-            $this->userInfo .= ':' . $parts['pass'];
-        }
-    }
-
-    /**
-     * Create a URI string from its various parts
-     *
-     * @param string $scheme
-     * @param string $authority
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
-     * @return string
-     */
-    private static function createUriString($scheme, $authority, $path, $query, $fragment)
-    {
-        $uri = '';
-
-        if (!empty($scheme)) {
-            $uri .= $scheme . '://';
-        }
-
-        if (!empty($authority)) {
-            $uri .= $authority;
-        }
-
-        if ($path != null) {
-            // Add a leading slash if necessary.
-            if ($uri && substr($path, 0, 1) !== '/') {
-                $uri .= '/';
-            }
-            $uri .= $path;
-        }
-
-        if ($query != null) {
-            $uri .= '?' . $query;
-        }
-
-        if ($fragment != null) {
-            $uri .= '#' . $fragment;
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Is a given port non-standard for the current scheme?
-     *
-     * @param string $scheme
-     * @param string $host
-     * @param int $port
-     * @return bool
-     */
-    private static function isNonStandardPort($scheme, $host, $port)
-    {
-        if (!$scheme && $port) {
-            return true;
-        }
-
-        if (!$host || !$port) {
-            return false;
-        }
-
-        return !isset(static::$schemes[$scheme]) || $port !== static::$schemes[$scheme];
-    }
-
-    /**
-     * @param string $scheme
-     *
-     * @return string
-     */
-    private function filterScheme($scheme)
-    {
-        $scheme = strtolower($scheme);
-        $scheme = rtrim($scheme, ':/');
-
-        return $scheme;
-    }
-
-    /**
-     * @param string $scheme
-     * @param string $host
-     * @param int $port
-     *
-     * @return int|null
-     *
-     * @throws \InvalidArgumentException If the port is invalid.
-     */
-    private function filterPort($scheme, $host, $port)
-    {
-        if (null !== $port) {
-            $port = (int) $port;
-            if (1 > $port || 0xffff < $port) {
-                throw new \InvalidArgumentException(
-                    sprintf('Invalid port: %d. Must be between 1 and 65535', $port)
-                );
-            }
-        }
-
-        return $this->isNonStandardPort($scheme, $host, $port) ? $port : null;
-    }
-
-    /**
-     * Filters the path of a URI
-     *
-     * @param $path
-     *
-     * @return string
-     */
-    private function filterPath($path)
-    {
-        return preg_replace_callback(
-            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . ':@\/%]+|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'rawurlencodeMatchZero'],
-            $path
-        );
-    }
-
-    /**
-     * Filters the query string or fragment of a URI.
-     *
-     * @param $str
-     *
-     * @return string
-     */
-    private function filterQueryAndFragment($str)
-    {
-        return preg_replace_callback(
-            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'rawurlencodeMatchZero'],
-            $str
-        );
-    }
-
-    private function rawurlencodeMatchZero(array $match)
-    {
-        return rawurlencode($match[0]);
-    }
-}
diff --git a/vendor/guzzlehttp/psr7/src/functions.php b/vendor/guzzlehttp/psr7/src/functions.php
deleted file mode 100644
index fd3e7f5..0000000
--- a/vendor/guzzlehttp/psr7/src/functions.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-namespace GuzzleHttp\Psr7;
-
-use Psr\Http\Message\MessageInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Returns the string representation of an HTTP message.
- *
- * @param MessageInterface $message Message to convert to a string.
- *
- * @return string
- */
-function str(MessageInterface $message)
-{
-    if ($message instanceof RequestInterface) {
-        $msg = trim($message->getMethod() . ' '
-                . $message->getRequestTarget())
-            . ' HTTP/' . $message->getProtocolVersion();
-        if (!$message->hasHeader('host')) {
-            $msg .= "\r\nHost: " . $message->getUri()->getHost();
-        }
-    } elseif ($message instanceof ResponseInterface) {
-        $msg = 'HTTP/' . $message->getProtocolVersion() . ' '
-            . $message->getStatusCode() . ' '
-            . $message->getReasonPhrase();
-    } else {
-        throw new \InvalidArgumentException('Unknown message type');
-    }
-
-    foreach ($message->getHeaders() as $name => $values) {
-        $msg .= "\r\n{$name}: " . implode(', ', $values);
-    }
-
-    return "{$msg}\r\n\r\n" . $message->getBody();
-}
-
-/**
- * Returns a UriInterface for the given value.
- *
- * This function accepts a string or {@see Psr\Http\Message\UriInterface} and
- * returns a UriInterface for the given value. If the value is already a
- * `UriInterface`, it is returned as-is.
- *
- * @param string|UriInterface $uri
- *
- * @return UriInterface
- * @throws \InvalidArgumentException
- */
-function uri_for($uri)
-{
-    if ($uri instanceof UriInterface) {
-        return $uri;
-    } elseif (is_string($uri)) {
-        return new Uri($uri);
-    }
-
-    throw new \InvalidArgumentException('URI must be a string or UriInterface');
-}
-
-/**
- * Create a new stream based on the input type.
- *
- * Options is an associative array that can contain the following keys:
- * - metadata: Array of custom metadata.
- * - size: Size of the stream.
- *
- * @param resource|string|StreamInterface $resource Entity body data
- * @param array                           $options  Additional options
- *
- * @return Stream
- * @throws \InvalidArgumentException if the $resource arg is not valid.
- */
-function stream_for($resource = '', array $options = [])
-{
-    switch (gettype($resource)) {
-        case 'string':
-            $stream = fopen('php://temp', 'r+');
-            if ($resource !== '') {
-                fwrite($stream, $resource);
-                fseek($stream, 0);
-            }
-            return new Stream($stream, $options);
-        case 'resource':
-            return new Stream($resource, $options);
-        case 'object':
-            if ($resource instanceof StreamInterface) {
-                return $resource;
-            } elseif ($resource instanceof \Iterator) {
-                return new PumpStream(function () use ($resource) {
-                    if (!$resource->valid()) {
-                        return false;
-                    }
-                    $result = $resource->current();
-                    $resource->next();
-                    return $result;
-                }, $options);
-            } elseif (method_exists($resource, '__toString')) {
-                return stream_for((string) $resource, $options);
-            }
-            break;
-        case 'NULL':
-            return new Stream(fopen('php://temp', 'r+'), $options);
-    }
-
-    if (is_callable($resource)) {
-        return new PumpStream($resource, $options);
-    }
-
-    throw new \InvalidArgumentException('Invalid resource type: ' . gettype($resource));
-}
-
-/**
- * Parse an array of header values containing ";" separated data into an
- * array of associative arrays representing the header key value pair
- * data of the header. When a parameter does not contain a value, but just
- * contains a key, this function will inject a key with a '' string value.
- *
- * @param string|array $header Header to parse into components.
- *
- * @return array Returns the parsed header values.
- */
-function parse_header($header)
-{
-    static $trimmed = "\"'  \n\t\r";
-    $params = $matches = [];
-
-    foreach (normalize_header($header) as $val) {
-        $part = [];
-        foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
-            if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                $m = $matches[0];
-                if (isset($m[1])) {
-                    $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
-                } else {
-                    $part[] = trim($m[0], $trimmed);
-                }
-            }
-        }
-        if ($part) {
-            $params[] = $part;
-        }
-    }
-
-    return $params;
-}
-
-/**
- * Converts an array of header values that may contain comma separated
- * headers into an array of headers with no comma separated values.
- *
- * @param string|array $header Header to normalize.
- *
- * @return array Returns the normalized header field values.
- */
-function normalize_header($header)
-{
-    if (!is_array($header)) {
-        return array_map('trim', explode(',', $header));
-    }
-
-    $result = [];
-    foreach ($header as $value) {
-        foreach ((array) $value as $v) {
-            if (strpos($v, ',') === false) {
-                $result[] = $v;
-                continue;
-            }
-            foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $v) as $vv) {
-                $result[] = trim($vv);
-            }
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Clone and modify a request with the given changes.
- *
- * The changes can be one of:
- * - method: (string) Changes the HTTP method.
- * - set_headers: (array) Sets the given headers.
- * - remove_headers: (array) Remove the given headers.
- * - body: (mixed) Sets the given body.
- * - uri: (UriInterface) Set the URI.
- * - query: (string) Set the query string value of the URI.
- * - version: (string) Set the protocol version.
- *
- * @param RequestInterface $request Request to clone and modify.
- * @param array            $changes Changes to apply.
- *
- * @return RequestInterface
- */
-function modify_request(RequestInterface $request, array $changes)
-{
-    if (!$changes) {
-        return $request;
-    }
-
-    $headers = $request->getHeaders();
-
-    if (!isset($changes['uri'])) {
-        $uri = $request->getUri();
-    } else {
-        // Remove the host header if one is on the URI
-        if ($host = $changes['uri']->getHost()) {
-            $changes['set_headers']['Host'] = $host;
-        }
-        $uri = $changes['uri'];
-    }
-
-    if (!empty($changes['remove_headers'])) {
-        $headers = _caseless_remove($changes['remove_headers'], $headers);
-    }
-
-    if (!empty($changes['set_headers'])) {
-        $headers = _caseless_remove(array_keys($changes['set_headers']), $headers);
-        $headers = $changes['set_headers'] + $headers;
-    }
-
-    if (isset($changes['query'])) {
-        $uri = $uri->withQuery($changes['query']);
-    }
-
-    return new Request(
-        isset($changes['method']) ? $changes['method'] : $request->getMethod(),
-        $uri,
-        $headers,
-        isset($changes['body']) ? $changes['body'] : $request->getBody(),
-        isset($changes['version'])
-            ? $changes['version']
-            : $request->getProtocolVersion()
-    );
-}
-
-/**
- * Attempts to rewind a message body and throws an exception on failure.
- *
- * The body of the message will only be rewound if a call to `tell()` returns a
- * value other than `0`.
- *
- * @param MessageInterface $message Message to rewind
- *
- * @throws \RuntimeException
- */
-function rewind_body(MessageInterface $message)
-{
-    $body = $message->getBody();
-
-    if ($body->tell()) {
-        $body->rewind();
-    }
-}
-
-/**
- * Safely opens a PHP stream resource using a filename.
- *
- * When fopen fails, PHP normally raises a warning. This function adds an
- * error handler that checks for errors and throws an exception instead.
- *
- * @param string $filename File to open
- * @param string $mode     Mode used to open the file
- *
- * @return resource
- * @throws \RuntimeException if the file cannot be opened
- */
-function try_fopen($filename, $mode)
-{
-    $ex = null;
-    set_error_handler(function () use ($filename, $mode, &$ex) {
-        $ex = new \RuntimeException(sprintf(
-            'Unable to open %s using mode %s: %s',
-            $filename,
-            $mode,
-            func_get_args()[1]
-        ));
-    });
-
-    $handle = fopen($filename, $mode);
-    restore_error_handler();
-
-    if ($ex) {
-        /** @var $ex \RuntimeException */
-        throw $ex;
-    }
-
-    return $handle;
-}
-
-/**
- * Copy the contents of a stream into a string until the given number of
- * bytes have been read.
- *
- * @param StreamInterface $stream Stream to read
- * @param int             $maxLen Maximum number of bytes to read. Pass -1
- *                                to read the entire stream.
- * @return string
- * @throws \RuntimeException on error.
- */
-function copy_to_string(StreamInterface $stream, $maxLen = -1)
-{
-    $buffer = '';
-
-    if ($maxLen === -1) {
-        while (!$stream->eof()) {
-            $buf = $stream->read(1048576);
-            // Using a loose equality here to match on '' and false.
-            if ($buf == null) {
-                break;
-            }
-            $buffer .= $buf;
-        }
-        return $buffer;
-    }
-
-    $len = 0;
-    while (!$stream->eof() && $len < $maxLen) {
-        $buf = $stream->read($maxLen - $len);
-        // Using a loose equality here to match on '' and false.
-        if ($buf == null) {
-            break;
-        }
-        $buffer .= $buf;
-        $len = strlen($buffer);
-    }
-
-    return $buffer;
-}
-
-/**
- * Copy the contents of a stream into another stream until the given number
- * of bytes have been read.
- *
- * @param StreamInterface $source Stream to read from
- * @param StreamInterface $dest   Stream to write to
- * @param int             $maxLen Maximum number of bytes to read. Pass -1
- *                                to read the entire stream.
- *
- * @throws \RuntimeException on error.
- */
-function copy_to_stream(
-    StreamInterface $source,
-    StreamInterface $dest,
-    $maxLen = -1
-) {
-    if ($maxLen === -1) {
-        while (!$source->eof()) {
-            if (!$dest->write($source->read(1048576))) {
-                break;
-            }
-        }
-        return;
-    }
-
-    $bytes = 0;
-    while (!$source->eof()) {
-        $buf = $source->read($maxLen - $bytes);
-        if (!($len = strlen($buf))) {
-            break;
-        }
-        $bytes += $len;
-        $dest->write($buf);
-        if ($bytes == $maxLen) {
-            break;
-        }
-    }
-}
-
-/**
- * Calculate a hash of a Stream
- *
- * @param StreamInterface $stream    Stream to calculate the hash for
- * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
- * @param bool            $rawOutput Whether or not to use raw output
- *
- * @return string Returns the hash of the stream
- * @throws \RuntimeException on error.
- */
-function hash(
-    StreamInterface $stream,
-    $algo,
-    $rawOutput = false
-) {
-    $pos = $stream->tell();
-
-    if ($pos > 0) {
-        $stream->rewind();
-    }
-
-    $ctx = hash_init($algo);
-    while (!$stream->eof()) {
-        hash_update($ctx, $stream->read(1048576));
-    }
-
-    $out = hash_final($ctx, (bool) $rawOutput);
-    $stream->seek($pos);
-
-    return $out;
-}
-
-/**
- * Read a line from the stream up to the maximum allowed buffer length
- *
- * @param StreamInterface $stream    Stream to read from
- * @param int             $maxLength Maximum buffer length
- *
- * @return string|bool
- */
-function readline(StreamInterface $stream, $maxLength = null)
-{
-    $buffer = '';
-    $size = 0;
-
-    while (!$stream->eof()) {
-        // Using a loose equality here to match on '' and false.
-        if (null == ($byte = $stream->read(1))) {
-            return $buffer;
-        }
-        $buffer .= $byte;
-        // Break when a new line is found or the max length - 1 is reached
-        if ($byte == PHP_EOL || ++$size == $maxLength - 1) {
-            break;
-        }
-    }
-
-    return $buffer;
-}
-
-/**
- * Parses a request message string into a request object.
- *
- * @param string $message Request message string.
- *
- * @return Request
- */
-function parse_request($message)
-{
-    $data = _parse_message($message);
-    $matches = [];
-    if (!preg_match('/^[a-zA-Z]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) {
-        throw new \InvalidArgumentException('Invalid request string');
-    }
-    $parts = explode(' ', $data['start-line'], 3);
-    $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1';
-
-    $request = new Request(
-        $parts[0],
-        $matches[1] === '/' ? _parse_request_uri($parts[1], $data['headers']) : $parts[1],
-        $data['headers'],
-        $data['body'],
-        $version
-    );
-
-    return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]);
-}
-
-/**
- * Parses a response message string into a response object.
- *
- * @param string $message Response message string.
- *
- * @return Response
- */
-function parse_response($message)
-{
-    $data = _parse_message($message);
-    if (!preg_match('/^HTTP\/.* [0-9]{3} .*/', $data['start-line'])) {
-        throw new \InvalidArgumentException('Invalid response string');
-    }
-    $parts = explode(' ', $data['start-line'], 3);
-
-    return new Response(
-        $parts[1],
-        $data['headers'],
-        $data['body'],
-        explode('/', $parts[0])[1],
-        isset($parts[2]) ? $parts[2] : null
-    );
-}
-
-/**
- * Parse a query string into an associative array.
- *
- * If multiple values are found for the same key, the value of that key
- * value pair will become an array. This function does not parse nested
- * PHP style arrays into an associative array (e.g., foo[a]=1&foo[b]=2 will
- * be parsed into ['foo[a]' => '1', 'foo[b]' => '2']).
- *
- * @param string      $str         Query string to parse
- * @param bool|string $urlEncoding How the query string is encoded
- *
- * @return array
- */
-function parse_query($str, $urlEncoding = true)
-{
-    $result = [];
-
-    if ($str === '') {
-        return $result;
-    }
-
-    if ($urlEncoding === true) {
-        $decoder = function ($value) {
-            return rawurldecode(str_replace('+', ' ', $value));
-        };
-    } elseif ($urlEncoding == PHP_QUERY_RFC3986) {
-        $decoder = 'rawurldecode';
-    } elseif ($urlEncoding == PHP_QUERY_RFC1738) {
-        $decoder = 'urldecode';
-    } else {
-        $decoder = function ($str) { return $str; };
-    }
-
-    foreach (explode('&', $str) as $kvp) {
-        $parts = explode('=', $kvp, 2);
-        $key = $decoder($parts[0]);
-        $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-        if (!isset($result[$key])) {
-            $result[$key] = $value;
-        } else {
-            if (!is_array($result[$key])) {
-                $result[$key] = [$result[$key]];
-            }
-            $result[$key][] = $value;
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Build a query string from an array of key value pairs.
- *
- * This function can use the return value of parseQuery() to build a query
- * string. This function does not modify the provided keys when an array is
- * encountered (like http_build_query would).
- *
- * @param array     $params   Query string parameters.
- * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
- *                            to encode using RFC3986, or PHP_QUERY_RFC1738
- *                            to encode using RFC1738.
- * @return string
- */
-function build_query(array $params, $encoding = PHP_QUERY_RFC3986)
-{
-    if (!$params) {
-        return '';
-    }
-
-    if ($encoding === false) {
-        $encoder = function ($str) { return $str; };
-    } elseif ($encoding == PHP_QUERY_RFC3986) {
-        $encoder = 'rawurlencode';
-    } elseif ($encoding == PHP_QUERY_RFC1738) {
-        $encoder = 'urlencode';
-    } else {
-        throw new \InvalidArgumentException('Invalid type');
-    }
-
-    $qs = '';
-    foreach ($params as $k => $v) {
-        $k = $encoder($k);
-        if (!is_array($v)) {
-            $qs .= $k;
-            if ($v !== null) {
-                $qs .= '=' . $encoder($v);
-            }
-            $qs .= '&';
-        } else {
-            foreach ($v as $vv) {
-                $qs .= $k;
-                if ($vv !== null) {
-                    $qs .= '=' . $encoder($vv);
-                }
-                $qs .= '&';
-            }
-        }
-    }
-
-    return $qs ? (string) substr($qs, 0, -1) : '';
-}
-
-/**
- * Determines the mimetype of a file by looking at its extension.
- *
- * @param $filename
- *
- * @return null|string
- */
-function mimetype_from_filename($filename)
-{
-    return mimetype_from_extension(pathinfo($filename, PATHINFO_EXTENSION));
-}
-
-/**
- * Maps a file extensions to a mimetype.
- *
- * @param $extension string The file extension.
- *
- * @return string|null
- * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
- */
-function mimetype_from_extension($extension)
-{
-    static $mimetypes = [
-        '7z' => 'application/x-7z-compressed',
-        'aac' => 'audio/x-aac',
-        'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff',
-        'asc' => 'text/plain',
-        'asf' => 'video/x-ms-asf',
-        'atom' => 'application/atom+xml',
-        'avi' => 'video/x-msvideo',
-        'bmp' => 'image/bmp',
-        'bz2' => 'application/x-bzip2',
-        'cer' => 'application/pkix-cert',
-        'crl' => 'application/pkix-crl',
-        'crt' => 'application/x-x509-ca-cert',
-        'css' => 'text/css',
-        'csv' => 'text/csv',
-        'cu' => 'application/cu-seeme',
-        'deb' => 'application/x-debian-package',
-        'doc' => 'application/msword',
-        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'dvi' => 'application/x-dvi',
-        'eot' => 'application/vnd.ms-fontobject',
-        'eps' => 'application/postscript',
-        'epub' => 'application/epub+zip',
-        'etx' => 'text/x-setext',
-        'flac' => 'audio/flac',
-        'flv' => 'video/x-flv',
-        'gif' => 'image/gif',
-        'gz' => 'application/gzip',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'ico' => 'image/x-icon',
-        'ics' => 'text/calendar',
-        'ini' => 'text/plain',
-        'iso' => 'application/x-iso9660-image',
-        'jar' => 'application/java-archive',
-        'jpe' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'js' => 'text/javascript',
-        'json' => 'application/json',
-        'latex' => 'application/x-latex',
-        'log' => 'text/plain',
-        'm4a' => 'audio/mp4',
-        'm4v' => 'video/mp4',
-        'mid' => 'audio/midi',
-        'midi' => 'audio/midi',
-        'mov' => 'video/quicktime',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'mp4a' => 'audio/mp4',
-        'mp4v' => 'video/mp4',
-        'mpe' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg',
-        'mpg4' => 'video/mp4',
-        'oga' => 'audio/ogg',
-        'ogg' => 'audio/ogg',
-        'ogv' => 'video/ogg',
-        'ogx' => 'application/ogg',
-        'pbm' => 'image/x-portable-bitmap',
-        'pdf' => 'application/pdf',
-        'pgm' => 'image/x-portable-graymap',
-        'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'ppm' => 'image/x-portable-pixmap',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-        'ps' => 'application/postscript',
-        'qt' => 'video/quicktime',
-        'rar' => 'application/x-rar-compressed',
-        'ras' => 'image/x-cmu-raster',
-        'rss' => 'application/rss+xml',
-        'rtf' => 'application/rtf',
-        'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml',
-        'svg' => 'image/svg+xml',
-        'swf' => 'application/x-shockwave-flash',
-        'tar' => 'application/x-tar',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'torrent' => 'application/x-bittorrent',
-        'ttf' => 'application/x-font-ttf',
-        'txt' => 'text/plain',
-        'wav' => 'audio/x-wav',
-        'webm' => 'video/webm',
-        'wma' => 'audio/x-ms-wma',
-        'wmv' => 'video/x-ms-wmv',
-        'woff' => 'application/x-font-woff',
-        'wsdl' => 'application/wsdl+xml',
-        'xbm' => 'image/x-xbitmap',
-        'xls' => 'application/vnd.ms-excel',
-        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'xml' => 'application/xml',
-        'xpm' => 'image/x-xpixmap',
-        'xwd' => 'image/x-xwindowdump',
-        'yaml' => 'text/yaml',
-        'yml' => 'text/yaml',
-        'zip' => 'application/zip',
-    ];
-
-    $extension = strtolower($extension);
-
-    return isset($mimetypes[$extension])
-        ? $mimetypes[$extension]
-        : null;
-}
-
-/**
- * Parses an HTTP message into an associative array.
- *
- * The array contains the "start-line" key containing the start line of
- * the message, "headers" key containing an associative array of header
- * array values, and a "body" key containing the body of the message.
- *
- * @param string $message HTTP request or response to parse.
- *
- * @return array
- * @internal
- */
-function _parse_message($message)
-{
-    if (!$message) {
-        throw new \InvalidArgumentException('Invalid message');
-    }
-
-    // Iterate over each line in the message, accounting for line endings
-    $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
-    $result = ['start-line' => array_shift($lines), 'headers' => [], 'body' => ''];
-    array_shift($lines);
-
-    for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
-        $line = $lines[$i];
-        // If two line breaks were encountered, then this is the end of body
-        if (empty($line)) {
-            if ($i < $totalLines - 1) {
-                $result['body'] = implode('', array_slice($lines, $i + 2));
-            }
-            break;
-        }
-        if (strpos($line, ':')) {
-            $parts = explode(':', $line, 2);
-            $key = trim($parts[0]);
-            $value = isset($parts[1]) ? trim($parts[1]) : '';
-            $result['headers'][$key][] = $value;
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Constructs a URI for an HTTP request message.
- *
- * @param string $path    Path from the start-line
- * @param array  $headers Array of headers (each value an array).
- *
- * @return string
- * @internal
- */
-function _parse_request_uri($path, array $headers)
-{
-    $hostKey = array_filter(array_keys($headers), function ($k) {
-        return strtolower($k) === 'host';
-    });
-
-    // If no host is found, then a full URI cannot be constructed.
-    if (!$hostKey) {
-        return $path;
-    }
-
-    $host = $headers[reset($hostKey)][0];
-    $scheme = substr($host, -4) === ':443' ? 'https' : 'http';
-
-    return $scheme . '://' . $host . '/' . ltrim($path, '/');
-}
-
-/** @internal */
-function _caseless_remove($keys, array $data)
-{
-    $result = [];
-
-    foreach ($keys as &$key) {
-        $key = strtolower($key);
-    }
-
-    foreach ($data as $k => $v) {
-        if (!in_array(strtolower($k), $keys)) {
-            $result[$k] = $v;
-        }
-    }
-
-    return $result;
-}
diff --git a/vendor/guzzlehttp/psr7/src/functions_include.php b/vendor/guzzlehttp/psr7/src/functions_include.php
deleted file mode 100644
index 96a4a83..0000000
--- a/vendor/guzzlehttp/psr7/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// Don't redefine the functions if included multiple times.
-if (!function_exists('GuzzleHttp\Psr7\str')) {
-    require __DIR__ . '/functions.php';
-}
diff --git a/vendor/jcalderonzumba/gastonjs/.travis.yml b/vendor/jcalderonzumba/gastonjs/.travis.yml
deleted file mode 100644
index c64d755..0000000
--- a/vendor/jcalderonzumba/gastonjs/.travis.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.4
-      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable' SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: DEPENDENCIES=dev
-  allow_failures:
-    - php: 7.0
-    - php: hhvm
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-before_install:
-  - composer self-update
-  - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-
-install:
-  - composer update $COMPOSER_FLAGS
-
-script:
-  - bin/run-tests.sh
-
-after_script:
-  - ps axo pid,command | grep phantomjs | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
-  - ps axo pid,command | grep php | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
diff --git a/vendor/jcalderonzumba/gastonjs/LICENSE b/vendor/jcalderonzumba/gastonjs/LICENSE
deleted file mode 100644
index 7ba018a..0000000
--- a/vendor/jcalderonzumba/gastonjs/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Juan Francisco Calderón Zumba
-
-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/vendor/jcalderonzumba/gastonjs/README.md b/vendor/jcalderonzumba/gastonjs/README.md
deleted file mode 100644
index 4f8e83d..0000000
--- a/vendor/jcalderonzumba/gastonjs/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-GastonJS for Webpage automation
-================================
-[![Build Status](https://travis-ci.org/jcalderonzumba/gastonjs.svg?branch=travis_ci)](https://travis-ci.org/jcalderonzumba/gastonjs)
-[![Latest Stable Version](https://poser.pugx.org/jcalderonzumba/gastonjs/v/stable)](https://packagist.org/packages/jcalderonzumba/gastonjs)
-[![Total Downloads](https://poser.pugx.org/jcalderonzumba/gastonjs/downloads)](https://packagist.org/packages/jcalderonzumba/gastonjs)
-
-
-For full documentation go to [GastonJS doc](http://gastonjs.readthedocs.org/en/latest/)
diff --git a/vendor/jcalderonzumba/gastonjs/bin/run-tests.sh b/vendor/jcalderonzumba/gastonjs/bin/run-tests.sh
deleted file mode 100755
index 426ec94..0000000
--- a/vendor/jcalderonzumba/gastonjs/bin/run-tests.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-set -e
-
-start_browser_api(){
-  CURRENT_DIR=$(pwd)
-  LOCAL_PHANTOMJS="${CURRENT_DIR}/bin/phantomjs"
-  if [ -f ${LOCAL_PHANTOMJS} ]; then
-    ${LOCAL_PHANTOMJS} --ssl-protocol=any --ignore-ssl-errors=true src/Client/main.js 8510 1024 768 2>&1 &
-  else
-    phantomjs --ssl-protocol=any --ignore-ssl-errors=true src/Client/main.js 8510 1024 768 2>&1 >> /dev/null &
-  fi
-  sleep 2
-}
-
-stop_services(){
-  ps axo pid,command | grep phantomjs | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
-  ps axo pid,command | grep php | grep -v grep | grep -v phpstorm | awk '{print $1}' | xargs -I {} kill {}
-  sleep 2
-}
-
-mkdir -p /tmp/jcalderonzumba/phantomjs
-stop_services
-start_browser_api
-CURRENT_DIR=$(pwd)
-${CURRENT_DIR}/bin/phpunit --configuration unit_tests.xml
-
diff --git a/vendor/jcalderonzumba/gastonjs/composer.json b/vendor/jcalderonzumba/gastonjs/composer.json
deleted file mode 100644
index 7e5d96e..0000000
--- a/vendor/jcalderonzumba/gastonjs/composer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "jcalderonzumba/gastonjs",
-  "description": "PhantomJS API based server for webpage automation",
-  "keywords": [
-    "phantomjs",
-    "headless",
-    "api",
-    "automation",
-    "browser"
-  ],
-  "homepage": "https://github.com/jcalderonzumba/gastonjs",
-  "type": "phantomjs-api",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Juan Francisco Calderón Zumba",
-      "email": "juanfcz@gmail.com",
-      "homepage": "http://github.com/jcalderonzumba"
-    }
-  ],
-  "require": {
-    "php": ">=5.4",
-    "guzzlehttp/guzzle": "~5.0|~6.0"
-  },
-  "require-dev": {
-    "symfony/process": "~2.1",
-    "symfony/phpunit-bridge": "~2.7",
-    "phpunit/phpunit": "~4.6",
-    "silex/silex": "~1.2"
-  },
-  "config": {
-    "bin-dir": "bin"
-  },
-  "autoload": {
-    "psr-4": {
-      "Zumba\\GastonJS\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Zumba\\GastonJS\\Tests\\": "tests/unit"
-    }
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.1.x-dev"
-    }
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/mkdocs.yml b/vendor/jcalderonzumba/gastonjs/mkdocs.yml
deleted file mode 100644
index 51d881f..0000000
--- a/vendor/jcalderonzumba/gastonjs/mkdocs.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-site_name: GastonJS Documentation
-pages:
-  - GastonJS introduction: index.md
-  - GastonJS API :
-    - 'Introduction': api/index.md
-    - 'Available commands': api/command-list.md
-    - 'Navigation commands':
-      - 'visit': api/commands/navigation/visit.md
-      - 'current_url': api/commands/navigation/current_url.md
-      - 'reload': api/commands/navigation/reload.md
-      - 'go_back': api/commands/navigation/go_back.md
-      - 'go_forward': api/commands/navigation/go_forward.md
-    - 'Header commands' :
-      - 'get_headers': api/commands/headers/get_headers.md
-      - 'response_headers': api/commands/headers/response_headers.md
-      - 'set_headers': api/commands/headers/set_headers.md
-      - 'add_headers': api/commands/headers/add_headers.md
-      - 'add_header': api/commands/headers/add_header.md
-    - 'Javascript commands' :
-      - 'add_extension': api/commands/javascript/add_extension.md
-      - 'execute': api/commands/javascript/execute.md
-      - 'evaluate': api/commands/javascript/evaluate.md
-      - 'set_js_errors': api/commands/javascript/set_js_errors.md
-    - 'Cookies commands' :
-      - 'cookies': api/commands/cookies/cookies.md
-      - 'clear_cookies': api/commands/cookies/clear_cookies.md
-      - 'cookies_enabled': api/commands/cookies/cookies_enabled.md
-      - 'remove_cookie': api/commands/cookies/remove_cookie.md
-      - 'set_cookie': api/commands/cookies/set_cookie.md
-    - 'Mouse commands':
-        - 'click': api/commands/mouse/click.md
-        - 'right_click': api/commands/mouse/right_click.md
-        - 'hover': api/commands/mouse/hover.md
-        - 'double_click': api/commands/mouse/double_click.md
-        - 'click_coordinates': api/commands/mouse/click_coordinates.md
-        - 'mouse_event': api/commands/mouse/mouse_event.md
-    - 'Render commands':
-        - 'render': api/commands/render/render.md
-        - 'render_base64': api/commands/render/render_base64.md
-  - GastonJS PHP client: clients/php/index.md
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/Browser.php b/vendor/jcalderonzumba/gastonjs/src/Browser/Browser.php
deleted file mode 100644
index 5c2a337..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/Browser.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Class Browser
- * @package Zumba\GastonJS
- */
-class Browser extends BrowserBase {
-
-  use BrowserAuthenticationTrait;
-  use BrowserConfigurationTrait;
-  use BrowserCookieTrait;
-  use BrowserFileTrait;
-  use BrowserFrameTrait;
-  use BrowserHeadersTrait;
-  use BrowserMouseEventTrait;
-  use BrowserNavigateTrait;
-  use BrowserNetworkTrait;
-  use BrowserPageElementTrait;
-  use BrowserPageTrait;
-  use BrowserRenderTrait;
-  use BrowserScriptTrait;
-  use BrowserWindowTrait;
-
-  /**
-   * @param string $phantomJSHost
-   * @param mixed  $logger
-   */
-  public function __construct($phantomJSHost, $logger = null) {
-    $this->phantomJSHost = $phantomJSHost;
-    $this->logger = $logger;
-    $this->debug = false;
-    $this->createApiClient();
-  }
-
-  /**
-   * Returns the value of a given element in a page
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function value($pageId, $elementId) {
-    return $this->command('value', $pageId, $elementId);
-  }
-
-  /**
-   * Sets a value to a given element in a given page
-   * @param $pageId
-   * @param $elementId
-   * @param $value
-   * @return mixed
-   */
-  public function set($pageId, $elementId, $value) {
-    return $this->command('set', $pageId, $elementId, $value);
-  }
-
-  /**
-   * Tells whether an element on a page is visible or not
-   * @param $pageId
-   * @param $elementId
-   * @return bool
-   */
-  public function isVisible($pageId, $elementId) {
-    return $this->command('visible', $pageId, $elementId);
-  }
-
-  /**
-   * @param $pageId
-   * @param $elementId
-   * @return bool
-   */
-  public function isDisabled($pageId, $elementId) {
-    return $this->command('disabled', $pageId, $elementId);
-  }
-
-  /**
-   * Drag an element to a another in a given page
-   * @param $pageId
-   * @param $fromId
-   * @param $toId
-   * @return mixed
-   */
-  public function drag($pageId, $fromId, $toId) {
-    return $this->command('drag', $pageId, $fromId, $toId);
-  }
-
-  /**
-   * Selects a value in the given element and page
-   * @param $pageId
-   * @param $elementId
-   * @param $value
-   * @return mixed
-   */
-  public function select($pageId, $elementId, $value) {
-    return $this->command('select', $pageId, $elementId, $value);
-  }
-
-  /**
-   * Triggers an event to a given element on the given page
-   * @param $pageId
-   * @param $elementId
-   * @param $event
-   * @return mixed
-   */
-  public function trigger($pageId, $elementId, $event) {
-    return $this->command('trigger', $pageId, $elementId, $event);
-  }
-
-  /**
-   * TODO: not sure what this does, needs to do normalizeKeys
-   * @param int   $pageId
-   * @param int   $elementId
-   * @param array $keys
-   * @return mixed
-   */
-  public function sendKeys($pageId, $elementId, $keys) {
-    return $this->command('send_keys', $pageId, $elementId, $this->normalizeKeys($keys));
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserAuthenticationTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserAuthenticationTrait.php
deleted file mode 100644
index 7416a76..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserAuthenticationTrait.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserAuthenticationTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserAuthenticationTrait {
-  /**
-   * Sets basic HTTP authentication
-   * @param $user
-   * @param $password
-   * @return bool
-   */
-  public function setHttpAuth($user, $password) {
-    return $this->command('set_http_auth', $user, $password);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserBase.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserBase.php
deleted file mode 100644
index 3ef14d0..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserBase.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-use Zumba\GastonJS\Exception\BrowserError;
-use Zumba\GastonJS\Exception\DeadClient;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Exception\ServerException;
-
-/**
- * Class BrowserBase
- * @package Zumba\GastonJS\Browser
- */
-class BrowserBase {
-  /** @var mixed */
-  protected $logger;
-  /** @var  bool */
-  protected $debug;
-  /** @var  string */
-  protected $phantomJSHost;
-  /** @var  Client */
-  protected $apiClient;
-
-  /**
-   *  Creates an http client to consume the phantomjs API
-   */
-  protected function createApiClient() {
-    // Provide a BC switch between guzzle 5 and guzzle 6.
-    if (class_exists('GuzzleHttp\Psr7\Response')) {
-      $this->apiClient = new Client(array("base_uri" => $this->getPhantomJSHost()));
-    }
-    else {
-      $this->apiClient = new Client(array("base_url" => $this->getPhantomJSHost()));
-    }
-  }
-
-  /**
-   * TODO: not sure how to do the normalizeKeys stuff fix when needed
-   * @param $keys
-   * @return mixed
-   */
-  protected function normalizeKeys($keys) {
-    return $keys;
-  }
-
-  /**
-   * @return Client
-   */
-  public function getApiClient() {
-    return $this->apiClient;
-  }
-
-  /**
-   * @return string
-   */
-  public function getPhantomJSHost() {
-    return $this->phantomJSHost;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getLogger() {
-    return $this->logger;
-  }
-
-  /**
-   * Restarts the browser
-   */
-  public function restart() {
-    //TODO: Do we really need to do this?, we are just a client
-  }
-
-  /**
-   * Sends a command to the browser
-   * @throws BrowserError
-   * @throws \Exception
-   * @return mixed
-   */
-  public function command() {
-    try {
-      $args = func_get_args();
-      $commandName = $args[0];
-      array_shift($args);
-      $messageToSend = json_encode(array('name' => $commandName, 'args' => $args));
-      /** @var $commandResponse \GuzzleHttp\Psr7\Response|\GuzzleHttp\Message\Response */
-      $commandResponse = $this->getApiClient()->post("/api", array("body" => $messageToSend));
-      $jsonResponse = json_decode($commandResponse->getBody(), TRUE);
-    } catch (ServerException $e) {
-      $jsonResponse = json_decode($e->getResponse()->getBody()->getContents(), true);
-    } catch (ConnectException $e) {
-      throw new DeadClient($e->getMessage(), $e->getCode(), $e);
-    } catch (\Exception $e) {
-      throw $e;
-    }
-
-    if (isset($jsonResponse['error'])) {
-      throw $this->getErrorClass($jsonResponse);
-    }
-
-    return $jsonResponse['response'];
-  }
-
-  /**
-   * @param $error
-   * @return BrowserError
-   */
-  protected function getErrorClass($error) {
-    $errorClassMap = array(
-      'Poltergeist.JavascriptError'   => "Zumba\\GastonJS\\Exception\\JavascriptError",
-      'Poltergeist.FrameNotFound'     => "Zumba\\GastonJS\\Exception\\FrameNotFound",
-      'Poltergeist.InvalidSelector'   => "Zumba\\GastonJS\\Exception\\InvalidSelector",
-      'Poltergeist.StatusFailError'   => "Zumba\\GastonJS\\Exception\\StatusFailError",
-      'Poltergeist.NoSuchWindowError' => "Zumba\\GastonJS\\Exception\\NoSuchWindowError",
-      'Poltergeist.ObsoleteNode'      => "Zumba\\GastonJS\\Exception\\ObsoleteNode"
-    );
-    if (isset($error['error']['name']) && isset($errorClassMap[$error["error"]["name"]])) {
-      return new $errorClassMap[$error["error"]["name"]]($error);
-    }
-
-    return new BrowserError($error);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserConfigurationTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserConfigurationTrait.php
deleted file mode 100644
index 0db7f07..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserConfigurationTrait.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-
-/**
- * Trait BrowserConfigurationTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserConfigurationTrait {
-  /**
-   * Set whether to fail or not on javascript errors found on the page
-   * @param bool $enabled
-   * @return bool
-   */
-  public function jsErrors($enabled = true) {
-    return $this->command('set_js_errors', $enabled);
-  }
-
-  /**
-   * Set a blacklist of urls that we are not supposed to load
-   * @param array $blackList
-   * @return bool
-   */
-  public function urlBlacklist($blackList) {
-    return $this->command('set_url_blacklist', $blackList);
-  }
-
-  /**
-   * Set the debug mode on the browser
-   * @param bool $enable
-   * @return bool
-   */
-  public function debug($enable = false) {
-    $this->debug = $enable;
-    return $this->command('set_debug', $this->debug);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserCookieTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserCookieTrait.php
deleted file mode 100644
index e2318a4..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserCookieTrait.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-use Zumba\GastonJS\Cookie;
-
-/**
- * Trait BrowserCookieTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserCookieTrait {
-  /**
-   * Gets the cookies on the browser
-   *
-   * @return Cookie[]
-   */
-  public function cookies() {
-    $cookies = $this->command('cookies');
-    $objCookies = array();
-    foreach ($cookies as $cookie) {
-      $objCookies[$cookie["name"]] = new Cookie($cookie);
-    }
-    return $objCookies;
-  }
-
-  /**
-   * Sets a cookie on the browser, expires times is set in seconds
-   * @param $cookie
-   * @return mixed
-   */
-  public function setCookie($cookie) {
-    //TODO: add error control when the cookie array is not valid
-    if (isset($cookie["expires"])) {
-      $cookie["expires"] = intval($cookie["expires"]) * 1000;
-    }
-    $cookie['value'] = urlencode($cookie['value']);
-    return $this->command('set_cookie', $cookie);
-  }
-
-  /**
-   * Deletes a cookie on the browser if exists
-   * @param $cookieName
-   * @return bool
-   */
-  public function removeCookie($cookieName) {
-    return $this->command('remove_cookie', $cookieName);
-  }
-
-  /**
-   * Clear all the cookies
-   * @return bool
-   */
-  public function clearCookies() {
-    return $this->command('clear_cookies');
-  }
-
-  /**
-   * Enables or disables the cookies con phantomjs
-   * @param bool $enabled
-   * @return bool
-   */
-  public function cookiesEnabled($enabled = true) {
-    return $this->command('cookies_enabled', $enabled);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFileTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFileTrait.php
deleted file mode 100644
index 51fc745..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFileTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserFileTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserFileTrait {
-  /**
-   * Selects a file to send to the browser to a given page
-   * @param $pageId
-   * @param $elementId
-   * @param $value
-   * @return mixed
-   */
-  public function selectFile($pageId, $elementId, $value) {
-    return $this->command('select_file', $pageId, $elementId, $value);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFrameTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFrameTrait.php
deleted file mode 100644
index edefe5e..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserFrameTrait.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserFrameTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserFrameTrait {
-  /**
-   * Back to the parent of the iframe if possible
-   * @return mixed
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function popFrame() {
-    return $this->command("pop_frame");
-  }
-
-  /**
-   * Goes into the iframe to do stuff
-   * @param string $name
-   * @param int    $timeout
-   * @return mixed
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function pushFrame($name, $timeout = null) {
-    return $this->command("push_frame", $name, $timeout);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserHeadersTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserHeadersTrait.php
deleted file mode 100644
index 8300048..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserHeadersTrait.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserHeadersTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserHeadersTrait {
-  /**
-   * Returns the headers of the current page that will be used the next request
-   * @return mixed
-   */
-  public function getHeaders() {
-    return $this->command('get_headers');
-  }
-
-  /**
-   * Given an array of headers, set such headers for the requests, removing all others
-   * @param array $headers
-   * @return mixed
-   */
-  public function setHeaders($headers) {
-    return $this->command('set_headers', $headers);
-  }
-
-  /**
-   * Adds headers to current page overriding the existing ones for the next requests
-   * @param $headers
-   * @return mixed
-   */
-  public function addHeaders($headers) {
-    return $this->command('add_headers', $headers);
-  }
-
-  /**
-   * Adds a header to the page making it permanent if needed
-   * @param $header
-   * @param $permanent
-   * @return mixed
-   */
-  public function addHeader($header, $permanent = false) {
-    return $this->command('add_header', $header, $permanent);
-  }
-
-  /**
-   * Gets the response headers after a request
-   * @return mixed
-   */
-  public function responseHeaders() {
-    return $this->command('response_headers');
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserMouseEventTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserMouseEventTrait.php
deleted file mode 100644
index 38ec5a6..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserMouseEventTrait.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserMouseEventTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserMouseEventTrait {
-  /**
-   * Click on a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function click($pageId, $elementId) {
-    return $this->command('click', $pageId, $elementId);
-  }
-
-  /**
-   * Triggers a right click on a page an element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function rightClick($pageId, $elementId) {
-    return $this->command('right_click', $pageId, $elementId);
-  }
-
-  /**
-   * Triggers a double click in a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function doubleClick($pageId, $elementId) {
-    return $this->command('double_click', $pageId, $elementId);
-  }
-
-  /**
-   * Hovers over an element in a given page
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function hover($pageId, $elementId) {
-    return $this->command('hover', $pageId, $elementId);
-  }
-
-  /**
-   * Click on given coordinates, THIS DOES NOT depend on the page, it just clicks on where we are right now
-   * @param $coordX
-   * @param $coordY
-   * @return mixed
-   */
-  public function clickCoordinates($coordX, $coordY) {
-    return $this->command('click_coordinates', $coordX, $coordY);
-  }
-
-  /**
-   * Scrolls the page by a given left and top coordinates
-   * @param $left
-   * @param $top
-   * @return mixed
-   */
-  public function scrollTo($left, $top) {
-    return $this->command('scroll_to', $left, $top);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNavigateTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNavigateTrait.php
deleted file mode 100644
index 24189af..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNavigateTrait.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-use Zumba\GastonJS\Exception\BrowserError;
-
-/**
- * Trait BrowserNavigateTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserNavigateTrait {
-
-  /**
-   * Send a visit command to the browser
-   * @param $url
-   * @return mixed
-   */
-  public function visit($url) {
-    return $this->command('visit', $url);
-  }
-
-  /**
-   * Gets the current url we are in
-   * @return mixed
-   */
-  public function currentUrl() {
-    return $this->command('current_url');
-  }
-
-  /**
-   * Goes back on the browser history if possible
-   * @return bool
-   * @throws BrowserError
-   * @throws \Exception
-   */
-  public function goBack() {
-    return $this->command('go_back');
-  }
-
-  /**
-   * Goes forward on the browser history if possible
-   * @return mixed
-   * @throws BrowserError
-   * @throws \Exception
-   */
-  public function goForward() {
-    return $this->command('go_forward');
-  }
-
-  /**
-   * Reloads the current page we are in
-   */
-  public function reload() {
-    return $this->command('reload');
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNetworkTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNetworkTrait.php
deleted file mode 100644
index d79d21e..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserNetworkTrait.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-use Zumba\GastonJS\NetworkTraffic\Request;
-
-/**
- * Trait BrowserNetworkTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserNetworkTrait {
-  /**
-   * Get all the network traffic that the page have created
-   * @return array
-   */
-  public function networkTraffic() {
-    $networkTraffic = $this->command('network_traffic');
-    $requestTraffic = array();
-
-    if (count($networkTraffic) === 0) {
-      return null;
-    }
-
-    foreach ($networkTraffic as $traffic) {
-      $requestTraffic[] = new Request($traffic["request"], $traffic["responseParts"]);
-    }
-
-    return $requestTraffic;
-  }
-
-  /**
-   * Clear the network traffic data stored on the phantomjs code
-   * @return mixed
-   */
-  public function clearNetworkTraffic() {
-    return $this->command('clear_network_traffic');
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageElementTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageElementTrait.php
deleted file mode 100644
index 3f998fa..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageElementTrait.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserPageElementTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserPageElementTrait {
-  /**
-   * Find elements given a method and a selector
-   * @param $method
-   * @param $selector
-   * @return array
-   */
-  public function find($method, $selector) {
-    $result = $this->command('find', $method, $selector);
-    $found["page_id"] = $result["page_id"];
-    foreach ($result["ids"] as $id) {
-      $found["ids"][] = $id;
-    }
-    return $found;
-  }
-
-  /**
-   * Find elements within a page, method and selector
-   * @param $pageId
-   * @param $elementId
-   * @param $method
-   * @param $selector
-   * @return mixed
-   */
-  public function findWithin($pageId, $elementId, $method, $selector) {
-    return $this->command('find_within', $pageId, $elementId, $method, $selector);
-  }
-
-  /**
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function getParents($pageId, $elementId) {
-    return $this->command('parents', $pageId, $elementId);
-  }
-
-  /**
-   * Returns the text of a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function allText($pageId, $elementId) {
-    return $this->command('all_text', $pageId, $elementId);
-  }
-
-  /**
-   * Returns the inner or outer html of the given page and element
-   * @param $pageId
-   * @param $elementId
-   * @param $type
-   * @return mixed
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function allHtml($pageId, $elementId, $type = "inner") {
-    return $this->command('all_html', $pageId, $elementId, $type);
-  }
-
-  /**
-   * Returns ONLY the visible text of a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function visibleText($pageId, $elementId) {
-    return $this->command('visible_text', $pageId, $elementId);
-  }
-
-  /**
-   * Deletes the text of a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function deleteText($pageId, $elementId) {
-    return $this->command('delete_text', $pageId, $elementId);
-  }
-
-  /**
-   * Gets the tag name of a given element and page
-   * @param $pageId
-   * @param $elementId
-   * @return string
-   */
-  public function tagName($pageId, $elementId) {
-    return strtolower($this->command('tag_name', $pageId, $elementId));
-  }
-
-  /**
-   * Check if two elements are the same on a give
-   * @param $pageId
-   * @param $firstId
-   * @param $secondId
-   * @return bool
-   */
-  public function equals($pageId, $firstId, $secondId) {
-    return $this->command('equals', $pageId, $firstId, $secondId);
-  }
-
-  /**
-   * Returns the attributes of an element in a given page
-   * @param $pageId
-   * @param $elementId
-   * @return mixed
-   */
-  public function attributes($pageId, $elementId) {
-    return $this->command('attributes', $pageId, $elementId);
-  }
-
-  /**
-   * Returns the attribute of an element by name in a given page
-   * @param $pageId
-   * @param $elementId
-   * @param $name
-   * @return mixed
-   */
-  public function attribute($pageId, $elementId, $name) {
-    return $this->command('attribute', $pageId, $elementId, $name);
-  }
-
-  /**
-   * Set an attribute to the given element in the given page
-   * @param $pageId
-   * @param $elementId
-   * @param $name
-   * @param $value
-   * @return mixed
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function setAttribute($pageId, $elementId, $name, $value) {
-    return $this->command('set_attribute', $pageId, $elementId, $name, $value);
-  }
-
-  /**
-   * Remove an attribute for a given page and element
-   * @param $pageId
-   * @param $elementId
-   * @param $name
-   * @return mixed
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function removeAttribute($pageId, $elementId, $name) {
-    return $this->command('remove_attribute', $pageId, $elementId, $name);
-  }
-
-  /**
-   * Checks if an element is visible or not
-   * @param $pageId
-   * @param $elementId
-   * @return boolean
-   */
-  public function isVisible($pageId, $elementId) {
-    return $this->command("visible", $pageId, $elementId);
-  }
-
-  /**
-   * Sends the order to execute a key event on a given element
-   * @param $pageId
-   * @param $elementId
-   * @param $keyEvent
-   * @param $key
-   * @param $modifier
-   * @return mixed
-   */
-  public function keyEvent($pageId, $elementId, $keyEvent, $key, $modifier) {
-    return $this->command("key_event", $pageId, $elementId, $keyEvent, $key, $modifier);
-  }
-
-  /**
-   * Sends the command to select and option given a value
-   * @param      $pageId
-   * @param      $elementId
-   * @param      $value
-   * @param bool $multiple
-   * @return mixed
-   */
-  public function selectOption($pageId, $elementId, $value, $multiple = false) {
-    return $this->command("select_option", $pageId, $elementId, $value, $multiple);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageTrait.php
deleted file mode 100644
index 3d5f9f1..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserPageTrait.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserPageTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserPageTrait {
-  /**
-   * Gets the status code of the request we are currently in
-   * @return mixed
-   */
-  public function getStatusCode() {
-    return $this->command('status_code');
-  }
-
-  /**
-   * Returns the body of the response to a given browser request
-   * @return mixed
-   */
-  public function getBody() {
-    return $this->command('body');
-  }
-
-  /**
-   * Returns the source of the current page
-   * @return mixed
-   */
-  public function getSource() {
-    return $this->command('source');
-  }
-
-  /**
-   * Gets the current page title
-   * @return mixed
-   */
-  public function getTitle() {
-    return $this->command('title');
-  }
-
-  /**
-   * Resize the current page
-   * @param $width
-   * @param $height
-   * @return mixed
-   */
-  public function resize($width, $height) {
-    return $this->command('resize', $width, $height);
-  }
-
-  /**
-   * Resets the page we are in to a clean slate
-   * @return mixed
-   */
-  public function reset() {
-    return $this->command('reset');
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserRenderTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserRenderTrait.php
deleted file mode 100644
index 3aa10aa..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserRenderTrait.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserRenderTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserRenderTrait {
-  /**
-   * Check and fix render options
-   * @param $options
-   * @return mixed
-   */
-  protected function checkRenderOptions($options) {
-    //Default is full and no selection
-    if (count($options) === 0) {
-      $options["full"] = true;
-      $options["selector"] = null;
-    }
-
-    if (isset($options["full"]) && isset($options["selector"])) {
-      if ($options["full"]) {
-        //Whatever it is, full is more powerful than selection
-        $options["selector"] = null;
-      }
-    } else {
-      if (!isset($options["full"]) && isset($options["selector"])) {
-        $options["full"] = false;
-      }
-    }
-    return $options;
-  }
-
-  /**
-   * Renders a page or selection to a file given by path
-   * @param string $path
-   * @param array  $options
-   * @return mixed
-   */
-  public function render($path, $options = array()) {
-    $fixedOptions = $this->checkRenderOptions($options);
-    return $this->command('render', $path, $fixedOptions["full"], $fixedOptions["selector"]);
-  }
-
-  /**
-   * Renders base64 a page or selection to a file given by path
-   * @param string $imageFormat (PNG, GIF, JPEG)
-   * @param array  $options
-   * @return mixed
-   */
-  public function renderBase64($imageFormat, $options = array()) {
-    $fixedOptions = $this->checkRenderOptions($options);
-    return $this->command('render_base64', $imageFormat, $fixedOptions["full"], $fixedOptions["selector"]);
-  }
-
-  /**
-   * Sets the paper size, useful when saving to PDF
-   * @param $paperSize
-   * @return mixed
-   */
-  public function setPaperSize($paperSize) {
-    return $this->command('set_paper_size', $paperSize);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserScriptTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserScriptTrait.php
deleted file mode 100644
index 769b86f..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserScriptTrait.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Trait BrowserScriptTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserScriptTrait {
-  /**
-   * Evaluates a script on the browser
-   * @param $script
-   * @return mixed
-   */
-  public function evaluate($script) {
-    return $this->command('evaluate', $script);
-  }
-
-  /**
-   * Executes a script on the browser
-   * @param $script
-   * @return mixed
-   */
-  public function execute($script) {
-    return $this->command('execute', $script);
-  }
-
-  /**
-   * Add desired extensions to phantomjs
-   * @param $extensions
-   * @return bool
-   */
-  public function extensions($extensions) {
-    //TODO: add error control for when extensions do not exist physically
-    foreach ($extensions as $extensionName) {
-      $this->command('add_extension', $extensionName);
-    }
-    return true;
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserWindowTrait.php b/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserWindowTrait.php
deleted file mode 100644
index 8647ffc..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Browser/BrowserWindowTrait.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Browser;
-
-/**
- * Class BrowserWindowTrait
- * @package Zumba\GastonJS\Browser
- */
-trait BrowserWindowTrait {
-  /**
-   * Returns the current window handle name in the browser
-   * @param string $name
-   * @return mixed
-   */
-  public function windowHandle($name = null) {
-    return $this->command('window_handle', $name);
-  }
-
-  /**
-   * Returns all the window handles present in the browser
-   * @return array
-   */
-  public function windowHandles() {
-    return $this->command('window_handles');
-  }
-
-  /**
-   * Change the browser focus to another window
-   * @param $windowHandleName
-   * @return mixed
-   */
-  public function switchToWindow($windowHandleName) {
-    return $this->command('switch_to_window', $windowHandleName);
-  }
-
-  /**
-   * Opens a new window on the browser
-   * @return mixed
-   */
-  public function openNewWindow() {
-    return $this->command('open_new_window');
-  }
-
-  /**
-   * Closes a window on the browser by a given handler name
-   * @param $windowHandleName
-   * @return mixed
-   */
-  public function closeWindow($windowHandleName) {
-    return $this->command('close_window', $windowHandleName);
-  }
-
-  /**
-   * Gets the current request window name
-   * @return string
-   * @throws \Zumba\GastonJS\Exception\BrowserError
-   * @throws \Exception
-   */
-  public function windowName() {
-    return $this->command('window_name');
-  }
-
-  /**
-   * Zoom factor for a web page
-   * @param $zoomFactor
-   * @return mixed
-   */
-  public function setZoomFactor($zoomFactor) {
-    return $this->command('set_zoom_factor', $zoomFactor);
-  }
-
-  /**
-   * Gets the window size
-   * @param $windowHandleName
-   * @return mixed
-   */
-  public function windowSize($windowHandleName) {
-    return $this->command('window_size', $windowHandleName);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/browser_error.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/browser_error.js
deleted file mode 100644
index 892333c..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/browser_error.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Poltergeist.BrowserError = (function (_super) {
-  __extends(BrowserError, _super);
-
-  function BrowserError(message, stack) {
-    this.message = message;
-    this.stack = stack;
-  }
-
-  BrowserError.prototype.name = "Poltergeist.BrowserError";
-
-  BrowserError.prototype.args = function () {
-    return [this.message, this.stack];
-  };
-
-  return BrowserError;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/error.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/error.js
deleted file mode 100644
index 5a6f1f6..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/error.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- *  Poltergeist base error class
- */
-Poltergeist.Error = (function () {
-  function Error() {
-  }
-
-  return Error;
-
-})();
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/frame_not_found.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/frame_not_found.js
deleted file mode 100644
index d42e872..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/frame_not_found.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Poltergeist.FrameNotFound = (function (_super) {
-  __extends(FrameNotFound, _super);
-
-  function FrameNotFound(frameName) {
-    this.frameName = frameName;
-  }
-
-  FrameNotFound.prototype.name = "Poltergeist.FrameNotFound";
-
-  FrameNotFound.prototype.args = function () {
-    return [this.frameName];
-  };
-
-  return FrameNotFound;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/invalid_selector.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/invalid_selector.js
deleted file mode 100644
index 2ef4ae9..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/invalid_selector.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Poltergeist.InvalidSelector = (function (_super) {
-  __extends(InvalidSelector, _super);
-
-  function InvalidSelector(method, selector) {
-    this.method = method;
-    this.selector = selector;
-  }
-
-  InvalidSelector.prototype.name = "Poltergeist.InvalidSelector";
-
-  InvalidSelector.prototype.args = function () {
-    return [this.method, this.selector];
-  };
-
-  return InvalidSelector;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/javascript_error.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/javascript_error.js
deleted file mode 100644
index b8679e4..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/javascript_error.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Poltergeist.JavascriptError = (function (_super) {
-  __extends(JavascriptError, _super);
-
-  function JavascriptError(errors) {
-    this.errors = errors;
-  }
-
-  JavascriptError.prototype.name = "Poltergeist.JavascriptError";
-
-  JavascriptError.prototype.args = function () {
-    return [this.errors];
-  };
-
-  return JavascriptError;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/mouse_event_failed.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/mouse_event_failed.js
deleted file mode 100644
index f3d4e85..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/mouse_event_failed.js
+++ /dev/null
@@ -1,18 +0,0 @@
-Poltergeist.MouseEventFailed = (function (_super) {
-  __extends(MouseEventFailed, _super);
-
-  function MouseEventFailed(eventName, selector, position) {
-    this.eventName = eventName;
-    this.selector = selector;
-    this.position = position;
-  }
-
-  MouseEventFailed.prototype.name = "Poltergeist.MouseEventFailed";
-
-  MouseEventFailed.prototype.args = function () {
-    return [this.eventName, this.selector, this.position];
-  };
-
-  return MouseEventFailed;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/no_such_window_error.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/no_such_window_error.js
deleted file mode 100644
index ee1d5ad..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/no_such_window_error.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Poltergeist.NoSuchWindowError = (function (_super) {
-  __extends(NoSuchWindowError, _super);
-
-  function NoSuchWindowError() {
-    _ref2 = NoSuchWindowError.__super__.constructor.apply(this, arguments);
-    return _ref2;
-  }
-
-  NoSuchWindowError.prototype.name = "Poltergeist.NoSuchWindowError";
-
-  NoSuchWindowError.prototype.args = function () {
-    return [];
-  };
-
-  return NoSuchWindowError;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/obsolete_node.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/obsolete_node.js
deleted file mode 100644
index 758cfd6..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/obsolete_node.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Poltergeist.ObsoleteNode = (function (_super) {
-  __extends(ObsoleteNode, _super);
-
-  function ObsoleteNode() {
-    _ref = ObsoleteNode.__super__.constructor.apply(this, arguments);
-    return _ref;
-  }
-
-  ObsoleteNode.prototype.name = "Poltergeist.ObsoleteNode";
-
-  ObsoleteNode.prototype.args = function () {
-    return [];
-  };
-
-  ObsoleteNode.prototype.toString = function () {
-    return this.name;
-  };
-
-  return ObsoleteNode;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/status_fail_error.js b/vendor/jcalderonzumba/gastonjs/src/Client/Errors/status_fail_error.js
deleted file mode 100644
index 55f1871..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Errors/status_fail_error.js
+++ /dev/null
@@ -1,17 +0,0 @@
-Poltergeist.StatusFailError = (function (_super) {
-  __extends(StatusFailError, _super);
-
-  function StatusFailError() {
-    _ref1 = StatusFailError.__super__.constructor.apply(this, arguments);
-    return _ref1;
-  }
-
-  StatusFailError.prototype.name = "Poltergeist.StatusFailError";
-
-  StatusFailError.prototype.args = function () {
-    return [];
-  };
-
-  return StatusFailError;
-
-})(Poltergeist.Error);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Server/server.js b/vendor/jcalderonzumba/gastonjs/src/Client/Server/server.js
deleted file mode 100644
index 120d1fd..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Server/server.js
+++ /dev/null
@@ -1,80 +0,0 @@
-Poltergeist.Server = (function () {
-
-  /**
-   * Server constructor
-   * @param owner
-   * @param port
-   * @constructor
-   */
-  function Server(owner, port) {
-    this.server = require('webserver').create();
-    this.port = port;
-    this.owner = owner;
-    this.webServer = null;
-  }
-
-  /**
-   * Starts the web server
-   */
-  Server.prototype.start = function () {
-    var self = this;
-    this.webServer = this.server.listen(this.port, function (request, response) {
-      self.handleRequest(request, response);
-    });
-  };
-
-  /**
-   * Send error back with code and message
-   * @param response
-   * @param code
-   * @param message
-   * @return {boolean}
-   */
-  Server.prototype.sendError = function (response, code, message) {
-    response.statusCode = code;
-    response.setHeader('Content-Type', 'application/json');
-    response.write(JSON.stringify(message, null, 4));
-    response.close();
-    return true;
-  };
-
-
-  /**
-   * Send response back to the client
-   * @param response
-   * @param data
-   * @return {boolean}
-   */
-  Server.prototype.send = function (response, data) {
-    console.log("RESPONSE: " + JSON.stringify(data, null, 4).substr(0, 200));
-
-    response.statusCode = 200;
-    response.setHeader('Content-Type', 'application/json');
-    response.write(JSON.stringify(data, null, 4));
-    response.close();
-    return true;
-  };
-
-  /**
-   * Handles a request to the server
-   * @param request
-   * @param response
-   * @return {boolean}
-   */
-  Server.prototype.handleRequest = function (request, response) {
-    var commandData;
-    if (request.method !== "POST") {
-      return this.sendError(response, 405, "Only POST method is allowed in the service");
-    }
-    console.log("REQUEST: " + request.post + "\n");
-    try {
-      commandData = JSON.parse(request.post);
-    } catch (parseError) {
-      return this.sendError(response, 400, "JSON data invalid error: " + parseError.message);
-    }
-
-    return this.owner.serverRunCommand(commandData, response);
-  };
-
-  return Server;
-})();
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/Tools/inherit.js b/vendor/jcalderonzumba/gastonjs/src/Client/Tools/inherit.js
deleted file mode 100644
index a67a75c..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/Tools/inherit.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var __extends;
-/**
- * Helper function so objects can inherit from another
- * @param child
- * @param parent
- * @return {Object}
- * @private
- */
-__extends = function (child, parent) {
-  var __hasProp;
-  __hasProp = {}.hasOwnProperty;
-  for (var key in parent) {
-    if (parent.hasOwnProperty(key)) {
-      if (__hasProp.call(parent, key)) {
-        child[key] = parent[key];
-      }
-    }
-  }
-
-  function ClassConstructor() {
-    this.constructor = child;
-  }
-
-  ClassConstructor.prototype = parent.prototype;
-  child.prototype = new ClassConstructor();
-  child.__super__ = parent.prototype;
-  return child;
-};
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/agent.js b/vendor/jcalderonzumba/gastonjs/src/Client/agent.js
deleted file mode 100644
index 606a6c1..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/agent.js
+++ /dev/null
@@ -1,896 +0,0 @@
-var PoltergeistAgent;
-
-PoltergeistAgent = (function () {
-  function PoltergeistAgent() {
-    this.elements = [];
-    this.nodes = {};
-  }
-
-  /**
-   * Executes an external call done from the web page class
-   * @param name
-   * @param args
-   * @return {*}
-   */
-  PoltergeistAgent.prototype.externalCall = function (name, args) {
-    var error;
-    try {
-      return {
-        value: this[name].apply(this, args)
-      };
-    } catch (_error) {
-      error = _error;
-      return {
-        error: {
-          message: error.toString(),
-          stack: error.stack
-        }
-      };
-    }
-  };
-
-  /**
-   * Object stringifycation
-   * @param object
-   * @return {*}
-   */
-  PoltergeistAgent.stringify = function (object) {
-    var error;
-    try {
-      return JSON.stringify(object, function (key, value) {
-        if (Array.isArray(this[key])) {
-          return this[key];
-        } else {
-          return value;
-        }
-      });
-    } catch (_error) {
-      error = _error;
-      if (error instanceof TypeError) {
-        return '"(cyclic structure)"';
-      } else {
-        throw error;
-      }
-    }
-  };
-
-  /**
-   * Name speaks for itself
-   * @return {string}
-   */
-  PoltergeistAgent.prototype.currentUrl = function () {
-    return encodeURI(decodeURI(window.location.href));
-  };
-
-  /**
-   *  Given a method of selection (xpath or css), a selector and a possible element to search
-   *  tries to find the elements that matches such selection
-   * @param method
-   * @param selector
-   * @param within
-   * @return {Array}
-   */
-  PoltergeistAgent.prototype.find = function (method, selector, within) {
-    var elementForXpath, error, i, results, xpath, _i, _len, _results;
-    if (within == null) {
-      within = document;
-    }
-    try {
-      if (method === "xpath") {
-        xpath = document.evaluate(selector, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-        results = (function () {
-          var _i, _ref, _results;
-          _results = [];
-          for (i = _i = 0, _ref = xpath.snapshotLength; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
-            _results.push(xpath.snapshotItem(i));
-          }
-          return _results;
-        })();
-      } else {
-        results = within.querySelectorAll(selector);
-      }
-      _results = [];
-      for (_i = 0, _len = results.length; _i < _len; _i++) {
-        elementForXpath = results[_i];
-        _results.push(this.register(elementForXpath));
-      }
-      return _results;
-    } catch (_error) {
-      error = _error;
-      if (error.code === DOMException.SYNTAX_ERR || error.code === 51) {
-        throw new PoltergeistAgent.InvalidSelector;
-      } else {
-        throw error;
-      }
-    }
-  };
-
-  /**
-   *  Register the element in the agent
-   * @param element
-   * @return {number}
-   */
-  PoltergeistAgent.prototype.register = function (element) {
-    this.elements.push(element);
-    return this.elements.length - 1;
-  };
-
-  /**
-   *  Gets the size of the document
-   * @return {{height: number, width: number}}
-   */
-  PoltergeistAgent.prototype.documentSize = function () {
-    return {
-      height: document.documentElement.scrollHeight || document.documentElement.clientHeight,
-      width: document.documentElement.scrollWidth || document.documentElement.clientWidth
-    };
-  };
-
-  /**
-   * Gets a Node by a given id
-   * @param id
-   * @return {PoltergeistAgent.Node}
-   */
-  PoltergeistAgent.prototype.get = function (id) {
-    if (typeof this.nodes[id] == "undefined" || this.nodes[id] === null) {
-      //Let's try now the elements approach
-      if (typeof this.elements[id] == "undefined" || this.elements[id] === null) {
-        throw new PoltergeistAgent.ObsoleteNode;
-      }
-      return new PoltergeistAgent.Node(this, this.elements[id]);
-    }
-
-    return this.nodes[id];
-  };
-
-  /**
-   * Calls a Node agent function from the Node caller via delegates
-   * @param id
-   * @param name
-   * @param args
-   * @return {*}
-   */
-  PoltergeistAgent.prototype.nodeCall = function (id, name, args) {
-    var node;
-
-    node = this.get(id);
-    if (node.isObsolete()) {
-      throw new PoltergeistAgent.ObsoleteNode;
-    }
-    //TODO: add some error control here, we might not be able to call name function
-    return node[name].apply(node, args);
-  };
-
-  PoltergeistAgent.prototype.beforeUpload = function (id) {
-    return this.get(id).setAttribute('_poltergeist_selected', '');
-  };
-
-  PoltergeistAgent.prototype.afterUpload = function (id) {
-    return this.get(id).removeAttribute('_poltergeist_selected');
-  };
-
-  PoltergeistAgent.prototype.clearLocalStorage = function () {
-    //TODO: WTF where is variable...
-    return localStorage.clear();
-  };
-
-  return PoltergeistAgent;
-
-})();
-
-PoltergeistAgent.ObsoleteNode = (function () {
-  function ObsoleteNode() {
-  }
-
-  ObsoleteNode.prototype.toString = function () {
-    return "PoltergeistAgent.ObsoleteNode";
-  };
-
-  return ObsoleteNode;
-
-})();
-
-PoltergeistAgent.InvalidSelector = (function () {
-  function InvalidSelector() {
-  }
-
-  InvalidSelector.prototype.toString = function () {
-    return "PoltergeistAgent.InvalidSelector";
-  };
-
-  return InvalidSelector;
-
-})();
-
-PoltergeistAgent.Node = (function () {
-
-  Node.EVENTS = {
-    FOCUS: ['blur', 'focus', 'focusin', 'focusout'],
-    MOUSE: ['click', 'dblclick', 'mousedown', 'mouseenter', 'mouseleave', 'mousemove', 'mouseover', 'mouseout', 'mouseup', 'contextmenu'],
-    FORM: ['submit']
-  };
-
-  function Node(agent, element) {
-    this.agent = agent;
-    this.element = element;
-  }
-
-  /**
-   * Give me the node id of the parent of this node
-   * @return {number}
-   */
-  Node.prototype.parentId = function () {
-    return this.agent.register(this.element.parentNode);
-  };
-
-  /**
-   * Returns all the node parents ids up to first child of the dom
-   * @return {Array}
-   */
-  Node.prototype.parentIds = function () {
-    var ids, parent;
-    ids = [];
-    parent = this.element.parentNode;
-    while (parent !== document) {
-      ids.push(this.agent.register(parent));
-      parent = parent.parentNode;
-    }
-    return ids;
-  };
-
-  /**
-   * Finds and returns the node ids that matches the selector within this node
-   * @param method
-   * @param selector
-   * @return {Array}
-   */
-  Node.prototype.find = function (method, selector) {
-    return this.agent.find(method, selector, this.element);
-  };
-
-  /**
-   * Checks whether the node is obsolete or not
-   * @return boolean
-   */
-  Node.prototype.isObsolete = function () {
-    var obsolete;
-
-    obsolete = function (element) {
-      if (element.parentNode != null) {
-        if (element.parentNode === document) {
-          return false;
-        } else {
-          return obsolete(element.parentNode);
-        }
-      } else {
-        return true;
-      }
-    };
-
-    return obsolete(this.element);
-  };
-
-  Node.prototype.changed = function () {
-    var event;
-    event = document.createEvent('HTMLEvents');
-    event.initEvent('change', true, false);
-    return this.element.dispatchEvent(event);
-  };
-
-  Node.prototype.input = function () {
-    var event;
-    event = document.createEvent('HTMLEvents');
-    event.initEvent('input', true, false);
-    return this.element.dispatchEvent(event);
-  };
-
-  Node.prototype.keyupdowned = function (eventName, keyCode) {
-    var event;
-    event = document.createEvent('UIEvents');
-    event.initEvent(eventName, true, true);
-    event.keyCode = keyCode;
-    event.which = keyCode;
-    event.charCode = 0;
-    return this.element.dispatchEvent(event);
-  };
-
-  Node.prototype.keypressed = function (altKey, ctrlKey, shiftKey, metaKey, keyCode, charCode) {
-    var event;
-    event = document.createEvent('UIEvents');
-    event.initEvent('keypress', true, true);
-    event.window = this.agent.window;
-    event.altKey = altKey;
-    event.ctrlKey = ctrlKey;
-    event.shiftKey = shiftKey;
-    event.metaKey = metaKey;
-    event.keyCode = keyCode;
-    event.charCode = charCode;
-    event.which = keyCode;
-    return this.element.dispatchEvent(event);
-  };
-
-  /**
-   * Tells if the node is inside the body of the document and not somewhere else
-   * @return {boolean}
-   */
-  Node.prototype.insideBody = function () {
-    return this.element === document.body || document.evaluate('ancestor::body', this.element, null, XPathResult.BOOLEAN_TYPE, null).booleanValue;
-  };
-
-  /**
-   * Returns all text visible or not of the node
-   * @return {string}
-   */
-  Node.prototype.allText = function () {
-    return this.element.textContent;
-  };
-
-  /**
-   * Returns the inner html our outer
-   * @returns {string}
-   */
-  Node.prototype.allHTML = function (type) {
-    var returnType = type || 'inner';
-
-    if (returnType === "inner") {
-      return this.element.innerHTML;
-    }
-
-    if (returnType === "outer") {
-      if (this.element.outerHTML) {
-        return this.element.outerHTML;
-      }
-      // polyfill:
-      var wrapper = document.createElement('div');
-      wrapper.appendChild(this.element.cloneNode(true));
-      return wrapper.innerHTML;
-    }
-
-    return '';
-  };
-
-  /**
-   * If the element is visible then we return the text
-   * @return {string}
-   */
-  Node.prototype.visibleText = function () {
-    if (!this.isVisible(null)) {
-      return null;
-    }
-
-    if (this.element.nodeName === "TEXTAREA") {
-      return this.element.textContent;
-    }
-
-    return this.element.innerText;
-  };
-
-  /**
-   * Deletes the actual text being represented by a selection object from the node's element DOM.
-   * @return {*}
-   */
-  Node.prototype.deleteText = function () {
-    var range;
-    range = document.createRange();
-    range.selectNodeContents(this.element);
-    window.getSelection().removeAllRanges();
-    window.getSelection().addRange(range);
-    return window.getSelection().deleteFromDocument();
-  };
-
-  /**
-   * Returns all the attributes {name:value} in the element
-   * @return {{}}
-   */
-  Node.prototype.getAttributes = function () {
-    var attributes, i, elementAttributes;
-
-    elementAttributes = this.element.attributes;
-    attributes = {};
-    for (i = 0; i < elementAttributes.length; i++) {
-      attributes[elementAttributes[i].name] = elementAttributes[i].value.replace("\n", "\\n");
-    }
-
-    return attributes;
-  };
-
-  /**
-   * Name speaks for it self, returns the value of a given attribute by name
-   * @param name
-   * @return {string}
-   */
-  Node.prototype.getAttribute = function (name) {
-    if (name === 'checked' || name === 'selected' || name === 'multiple') {
-      return this.element[name];
-    }
-    return this.element.getAttribute(name);
-  };
-
-  /**
-   * Scrolls the current element into the visible area of the browser window
-   * @return {*}
-   */
-  Node.prototype.scrollIntoView = function () {
-    return this.element.scrollIntoViewIfNeeded();
-  };
-
-  /**
-   *  Returns the element.value property with special treatment if the element is a select
-   * @return {*}
-   */
-  Node.prototype.value = function () {
-    var options, i, values;
-
-    if (this.element.tagName.toLowerCase() === 'select' && this.element.multiple) {
-      values = [];
-      options = this.element.children;
-      for (i = 0; i < options.length; i++) {
-        if (options[i].selected) {
-          values.push(options[i].value);
-        }
-      }
-      return values;
-    }
-
-    return this.element.value;
-  };
-
-  /**
-   * Sets a given value in the element value property by simulation key interaction
-   * @param value
-   * @return {*}
-   */
-  Node.prototype.set = function (value) {
-    var char, keyCode, i, len;
-
-    if (this.element.readOnly) {
-      return null;
-    }
-
-    //respect the maxLength property if present
-    if (this.element.maxLength >= 0) {
-      value = value.substr(0, this.element.maxLength);
-    }
-
-    this.element.value = '';
-    this.trigger('focus');
-
-    if (this.element.type === 'number') {
-      this.element.value = value;
-    } else {
-      for (i = 0, len = value.length; i < len; i++) {
-        char = value[i];
-        keyCode = this.characterToKeyCode(char);
-        this.keyupdowned('keydown', keyCode);
-        this.element.value += char;
-        this.keypressed(false, false, false, false, char.charCodeAt(0), char.charCodeAt(0));
-        this.keyupdowned('keyup', keyCode);
-      }
-    }
-
-    this.changed();
-    this.input();
-
-    return this.trigger('blur');
-  };
-
-  /**
-   * Is the node multiple
-   * @return {boolean}
-   */
-  Node.prototype.isMultiple = function () {
-    return this.element.multiple;
-  };
-
-  /**
-   * Sets the value of an attribute given by name
-   * @param name
-   * @param value
-   * @return {boolean}
-   */
-  Node.prototype.setAttribute = function (name, value) {
-    if (value === null) {
-      return this.removeAttribute(name);
-    }
-
-    this.element.setAttribute(name, value);
-    return true;
-  };
-
-  /**
-   *  Removes and attribute by name
-   * @param name
-   * @return {boolean}
-   */
-  Node.prototype.removeAttribute = function (name) {
-    this.element.removeAttribute(name);
-    return true;
-  };
-
-  /**
-   *  Selects the current node
-   * @param value
-   * @return {boolean}
-   */
-  Node.prototype.select = function (value) {
-    if (value === false && !this.element.parentNode.multiple) {
-      return false;
-    }
-
-    this.element.selected = value;
-    this.changed();
-    return true;
-  };
-
-  /**
-   * Selects the radio button that has the defined value
-   * @param value
-   * @return {boolean}
-   */
-  Node.prototype.selectRadioValue = function (value) {
-    if (this.element.value == value) {
-      this.element.checked = true;
-      this.trigger('focus');
-      this.trigger('click');
-      this.changed();
-      return true;
-    }
-
-    var formElements = this.element.form.elements;
-    var name = this.element.getAttribute('name');
-    var element, i;
-
-    var deselectAllRadios = function (elements, radioName) {
-      var inputRadioElement;
-
-      for (i = 0; i < elements.length; i++) {
-        inputRadioElement = elements[i];
-        if (inputRadioElement.tagName.toLowerCase() == 'input' && inputRadioElement.type.toLowerCase() == 'radio' && inputRadioElement.name == radioName) {
-          inputRadioElement.checked = false;
-        }
-      }
-    };
-
-    var radioChange = function (radioElement) {
-      var radioEvent;
-      radioEvent = document.createEvent('HTMLEvents');
-      radioEvent.initEvent('change', true, false);
-      return radioElement.dispatchEvent(radioEvent);
-    };
-
-    var radioClickEvent = function (radioElement, name) {
-      var radioEvent;
-      radioEvent = document.createEvent('MouseEvent');
-      radioEvent.initMouseEvent(name, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-      return radioElement.dispatchEvent(radioEvent);
-    };
-
-    if (!name) {
-      throw new Poltergeist.BrowserError('The radio button does not have the value "' + value + '"');
-    }
-
-    for (i = 0; i < formElements.length; i++) {
-      element = formElements[i];
-      if (element.tagName.toLowerCase() == 'input' && element.type.toLowerCase() == 'radio' && element.name === name) {
-        if (value === element.value) {
-          deselectAllRadios(formElements, name);
-          element.checked = true;
-          radioClickEvent(element, 'click');
-          radioChange(element);
-          return true;
-        }
-      }
-    }
-
-    throw new Poltergeist.BrowserError('The radio group "' + name + '" does not have an option "' + value + '"');
-  };
-
-  /**
-   *  Checks or uncheck a radio option
-   * @param value
-   * @return {boolean}
-   */
-  Node.prototype.checked = function (value) {
-    //TODO: add error control for the checked stuff
-    this.element.checked = value;
-    return true;
-  };
-
-  /**
-   * Returns the element tag name as is, no transformations done
-   * @return {string}
-   */
-  Node.prototype.tagName = function () {
-    return this.element.tagName;
-  };
-
-  /**
-   * Checks if the element is visible either by itself of because the parents are visible
-   * @param element
-   * @return {boolean}
-   */
-  Node.prototype.isVisible = function (element) {
-    var nodeElement = element || this.element;
-
-    if (window.getComputedStyle(nodeElement).display === 'none') {
-      return false;
-    } else if (nodeElement.parentElement) {
-      return this.isVisible(nodeElement.parentElement);
-    } else {
-      return true;
-    }
-  };
-
-  /**
-   * Is the node disabled for operations with it?
-   * @return {boolean}
-   */
-  Node.prototype.isDisabled = function () {
-    return this.element.disabled || this.element.tagName === 'OPTION' && this.element.parentNode.disabled;
-  };
-
-  /**
-   * Does the node contains the selections
-   * @return {boolean}
-   */
-  Node.prototype.containsSelection = function () {
-    var selectedNode;
-
-    selectedNode = document.getSelection().focusNode;
-    if (!selectedNode) {
-      return false;
-    }
-    //this magic number is NODE.TEXT_NODE
-    if (selectedNode.nodeType === 3) {
-      selectedNode = selectedNode.parentNode;
-    }
-
-    return this.element.contains(selectedNode);
-  };
-
-  /**
-   * Returns the offset of the node in relation to the current frame
-   * @return {{top: number, left: number}}
-   */
-  Node.prototype.frameOffset = function () {
-    var offset, rect, style, win;
-    win = window;
-    offset = {
-      top: 0,
-      left: 0
-    };
-    while (win.frameElement) {
-      rect = win.frameElement.getClientRects()[0];
-      style = win.getComputedStyle(win.frameElement);
-      win = win.parent;
-      offset.top += rect.top + parseInt(style.getPropertyValue("padding-top"), 10);
-      offset.left += rect.left + parseInt(style.getPropertyValue("padding-left"), 10);
-    }
-    return offset;
-  };
-
-  /**
-   * Returns the object position in relation to the window
-   * @return {{top: *, right: *, left: *, bottom: *, width: *, height: *}}
-   */
-  Node.prototype.position = function () {
-    var frameOffset, pos, rect;
-
-    rect = this.element.getClientRects()[0];
-    if (!rect) {
-      throw new PoltergeistAgent.ObsoleteNode;
-    }
-
-    frameOffset = this.frameOffset();
-    pos = {
-      top: rect.top + frameOffset.top,
-      right: rect.right + frameOffset.left,
-      left: rect.left + frameOffset.left,
-      bottom: rect.bottom + frameOffset.top,
-      width: rect.width,
-      height: rect.height
-    };
-
-    return pos;
-  };
-
-  /**
-   * Triggers a DOM event related to the node element
-   * @param name
-   * @return {boolean}
-   */
-  Node.prototype.trigger = function (name) {
-    var event;
-    if (Node.EVENTS.MOUSE.indexOf(name) !== -1) {
-      event = document.createEvent('MouseEvent');
-      event.initMouseEvent(name, true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-    } else if (Node.EVENTS.FOCUS.indexOf(name) !== -1) {
-      event = this.obtainEvent(name);
-    } else if (Node.EVENTS.FORM.indexOf(name) !== -1) {
-      event = this.obtainEvent(name);
-    } else {
-      throw "Unknown event";
-    }
-    return this.element.dispatchEvent(event);
-  };
-
-  /**
-   * Creates a generic HTMLEvent to be use in the node element
-   * @param name
-   * @return {Event}
-   */
-  Node.prototype.obtainEvent = function (name) {
-    var event;
-    event = document.createEvent('HTMLEvents');
-    event.initEvent(name, true, true);
-    return event;
-  };
-
-  /**
-   * Does a check to see if the coordinates given
-   * match the node element or some of the parents chain
-   * @param x
-   * @param y
-   * @return {*}
-   */
-  Node.prototype.mouseEventTest = function (x, y) {
-    var elementForXpath, frameOffset, origEl;
-
-    frameOffset = this.frameOffset();
-    x -= frameOffset.left;
-    y -= frameOffset.top;
-
-    elementForXpath = origEl = document.elementFromPoint(x, y);
-    while (elementForXpath) {
-      if (elementForXpath === this.element) {
-        return {
-          status: 'success'
-        };
-      } else {
-        elementForXpath = elementForXpath.parentNode;
-      }
-    }
-
-    return {
-      status: 'failure',
-      selector: origEl && this.getSelector(origEl)
-    };
-  };
-
-  /**
-   * Returns the node selector in CSS style (NO xpath)
-   * @param elementForXpath
-   * @return {string}
-   */
-  Node.prototype.getSelector = function (elementForXpath) {
-    var className, selector, i, len, classNames;
-
-    selector = elementForXpath.tagName !== 'HTML' ? this.getSelector(elementForXpath.parentNode) + ' ' : '';
-    selector += elementForXpath.tagName.toLowerCase();
-
-    if (elementForXpath.id) {
-      selector += "#" + elementForXpath.id;
-    }
-
-    classNames = elementForXpath.classList;
-    for (i = 0, len = classNames.length; i < len; i++) {
-      className = classNames[i];
-      selector += "." + className;
-    }
-
-    return selector;
-  };
-
-  /**
-   * Returns the key code that represents the character
-   * @param character
-   * @return {number}
-   */
-  Node.prototype.characterToKeyCode = function (character) {
-    var code, specialKeys;
-    code = character.toUpperCase().charCodeAt(0);
-    specialKeys = {
-      96: 192,
-      45: 189,
-      61: 187,
-      91: 219,
-      93: 221,
-      92: 220,
-      59: 186,
-      39: 222,
-      44: 188,
-      46: 190,
-      47: 191,
-      127: 46,
-      126: 192,
-      33: 49,
-      64: 50,
-      35: 51,
-      36: 52,
-      37: 53,
-      94: 54,
-      38: 55,
-      42: 56,
-      40: 57,
-      41: 48,
-      95: 189,
-      43: 187,
-      123: 219,
-      125: 221,
-      124: 220,
-      58: 186,
-      34: 222,
-      60: 188,
-      62: 190,
-      63: 191
-    };
-    return specialKeys[code] || code;
-  };
-
-  /**
-   * Checks if one element is equal to other given by its node id
-   * @param other_id
-   * @return {boolean}
-   */
-  Node.prototype.isDOMEqual = function (other_id) {
-    return this.element === this.agent.get(other_id).element;
-  };
-
-  /**
-   * The following function allows one to pass an element and an XML document to find a unique string XPath expression leading back to that element.
-   * @param element
-   * @return {string}
-   */
-  Node.prototype.getXPathForElement = function (element) {
-    var elementForXpath = element || this.element;
-    var xpath = '';
-    var pos, tempitem2;
-
-    while (elementForXpath !== document.documentElement) {
-      pos = 0;
-      tempitem2 = elementForXpath;
-      while (tempitem2) {
-        if (tempitem2.nodeType === 1 && tempitem2.nodeName === elementForXpath.nodeName) { // If it is ELEMENT_NODE of the same name
-          pos += 1;
-        }
-        tempitem2 = tempitem2.previousSibling;
-      }
-
-      xpath = "*[name()='" + elementForXpath.nodeName + "' and namespace-uri()='" + (elementForXpath.namespaceURI === null ? '' : elementForXpath.namespaceURI) + "'][" + pos + ']' + '/' + xpath;
-
-      elementForXpath = elementForXpath.parentNode;
-    }
-
-    xpath = '/*' + "[name()='" + document.documentElement.nodeName + "' and namespace-uri()='" + (elementForXpath.namespaceURI === null ? '' : elementForXpath.namespaceURI) + "']" + '/' + xpath;
-    xpath = xpath.replace(/\/$/, '');
-    return xpath;
-  };
-
-  /**
-   * Deselect all the options for this element
-   */
-  Node.prototype.deselectAllOptions = function () {
-    //TODO: error control when the node is not a select node
-    var i, l = this.element.options.length;
-    for (i = 0; i < l; i++) {
-      this.element.options[i].selected = false;
-    }
-  };
-
-  return Node;
-
-})();
-
-window.__poltergeist = new PoltergeistAgent;
-
-document.addEventListener('DOMContentLoaded', function () {
-  return console.log('__DOMContentLoaded');
-});
-
-window.confirm = function (message) {
-  return true;
-};
-
-window.prompt = function (message, _default) {
-  return _default || null;
-};
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/browser.js b/vendor/jcalderonzumba/gastonjs/src/Client/browser.js
deleted file mode 100644
index 257b035..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/browser.js
+++ /dev/null
@@ -1,1294 +0,0 @@
-var __indexOf = [].indexOf || function (item) {
-    for (var i = 0, l = this.length; i < l; i++) {
-      if (i in this && this[i] === item) return i;
-    }
-    return -1;
-  };
-
-var xpathStringLiteral = function (s) {
-  if (s.indexOf('"') === -1)
-    return '"' + s + '"';
-  if (s.indexOf("'") === -1)
-    return "'" + s + "'";
-  return 'concat("' + s.replace(/"/g, '",\'"\',"') + '")';
-};
-
-Poltergeist.Browser = (function () {
-  /**
-   * Creates the "browser" inside phantomjs
-   * @param owner
-   * @param width
-   * @param height
-   * @param jsErrors
-   * @constructor
-   */
-  function Browser(owner, width, height, jsErrors) {
-    this.owner = owner;
-    this.width = width || 1024;
-    this.height = height || 768;
-    this.pages = [];
-    this.js_errors = (typeof jsErrors === 'boolean') ? jsErrors : true;
-    this._debug = false;
-    this._counter = 0;
-    this.resetPage();
-  }
-
-  /**
-   * Resets the browser to a clean slate
-   * @return {Function}
-   */
-  Browser.prototype.resetPage = function () {
-    var _ref;
-    var self = this;
-
-    _ref = [0, []];
-    this._counter = _ref[0];
-    this.pages = _ref[1];
-
-    if (this.page != null) {
-      if (!this.page.closed) {
-        if (this.page.currentUrl() !== 'about:blank') {
-          this.page.clearLocalStorage();
-        }
-        this.page.release();
-      }
-      phantom.clearCookies();
-    }
-
-    this.page = this.currentPage = new Poltergeist.WebPage;
-    this.page.setViewportSize({
-      width: this.width,
-      height: this.height
-    });
-    this.page.handle = "" + (this._counter++);
-    this.pages.push(this.page);
-
-    return this.page.onPageCreated = function (newPage) {
-      var page;
-      page = new Poltergeist.WebPage(newPage);
-      page.handle = "" + (self._counter++);
-      return self.pages.push(page);
-    };
-  };
-
-  /**
-   * Given a page handle id, tries to get it from the browser page list
-   * @param handle
-   * @return {WebPage}
-   */
-  Browser.prototype.getPageByHandle = function (handle) {
-    var filteredPages;
-
-    //TODO: perhaps we should throw a PageNotFoundByHandle or something like that..
-    if (handle === null || typeof handle == "undefined") {
-      return null;
-    }
-
-    filteredPages = this.pages.filter(function (p) {
-      return !p.closed && p.handle === handle;
-    });
-
-    if (filteredPages.length === 1) {
-      return filteredPages[0];
-    }
-
-    return null;
-  };
-
-  /**
-   * Sends a debug message to the console
-   * @param message
-   * @return {*}
-   */
-  Browser.prototype.debug = function (message) {
-    if (this._debug) {
-      return console.log("poltergeist [" + (new Date().getTime()) + "] " + message);
-    }
-  };
-
-  /**
-   * Given a page_id and id, gets if possible the node in such page
-   * @param page_id
-   * @param id
-   * @return {Poltergeist.Node}
-   */
-  Browser.prototype.node = function (page_id, id) {
-    if (this.currentPage.id === page_id) {
-      return this.currentPage.get(id);
-    } else {
-      throw new Poltergeist.ObsoleteNode;
-    }
-  };
-
-  /**
-   * Returns the frameUrl related to the frame given by name
-   * @param frame_name
-   * @return {*}
-   */
-  Browser.prototype.frameUrl = function (frame_name) {
-    return this.currentPage.frameUrl(frame_name);
-  };
-
-  /**
-   * This method defines the rectangular area of the web page to be rasterized when render is invoked.
-   * If no clipping rectangle is set, render will process the entire web page.
-   * @param full
-   * @param selector
-   * @return {*}
-   */
-  Browser.prototype.set_clip_rect = function (full, selector) {
-    var dimensions, clipDocument, rect, clipViewport;
-
-    dimensions = this.currentPage.validatedDimensions();
-    clipDocument = dimensions.document;
-    clipViewport = dimensions.viewport;
-
-    if (full) {
-      rect = {
-        left: 0,
-        top: 0,
-        width: clipDocument.width,
-        height: clipDocument.height
-      };
-    } else {
-      if (selector != null) {
-        rect = this.currentPage.elementBounds(selector);
-      } else {
-        rect = {
-          left: 0,
-          top: 0,
-          width: clipViewport.width,
-          height: clipViewport.height
-        };
-      }
-    }
-
-    this.currentPage.setClipRect(rect);
-    return dimensions;
-  };
-
-  /**
-   * Kill the browser, i.e kill phantomjs current process
-   * @return {int}
-   */
-  Browser.prototype.exit = function () {
-    return phantom.exit(0);
-  };
-
-  /**
-   * Do nothing
-   */
-  Browser.prototype.noop = function () {
-  };
-
-  /**
-   * Throws a new Object error
-   */
-  Browser.prototype.browser_error = function () {
-    throw new Error('zomg');
-  };
-
-  /**
-   *  Visits a page and load its content
-   * @param serverResponse
-   * @param url
-   * @return {*}
-   */
-  Browser.prototype.visit = function (serverResponse, url) {
-    var prevUrl;
-    var self = this;
-    this.currentPage.state = 'loading';
-    prevUrl = this.currentPage.source === null ? 'about:blank' : this.currentPage.currentUrl();
-    this.currentPage.open(url);
-    if (/#/.test(url) && prevUrl.split('#')[0] === url.split('#')[0]) {
-      this.currentPage.state = 'default';
-      return this.serverSendResponse({
-        status: 'success'
-      }, serverResponse);
-    } else {
-      return this.currentPage.waitState('default', function () {
-        if (self.currentPage.statusCode === null && self.currentPage.status === 'fail') {
-          return self.owner.serverSendError(new Poltergeist.StatusFailError, serverResponse);
-        } else {
-          return self.serverSendResponse({
-            status: self.currentPage.status
-          }, serverResponse);
-        }
-      });
-    }
-  };
-
-  /**
-   *  Puts the control of the browser inside the IFRAME given by name
-   * @param serverResponse
-   * @param name
-   * @param timeout
-   * @return {*}
-   */
-  Browser.prototype.push_frame = function (serverResponse, name, timeout) {
-    var _ref;
-    var self = this;
-
-    if (timeout == null) {
-      timeout = new Date().getTime() + 2000;
-    }
-
-    //TODO: WTF, else if after a if with return COMMON
-    if (_ref = this.frameUrl(name), __indexOf.call(this.currentPage.blockedUrls(), _ref) >= 0) {
-      return this.serverSendResponse(true, serverResponse);
-    } else if (this.currentPage.pushFrame(name)) {
-      if (this.currentPage.currentUrl() === 'about:blank') {
-        this.currentPage.state = 'awaiting_frame_load';
-        return this.currentPage.waitState('default', function () {
-          return self.serverSendResponse(true, serverResponse);
-        });
-      } else {
-        return this.serverSendResponse(true, serverResponse);
-      }
-    } else {
-      if (new Date().getTime() < timeout) {
-        return setTimeout((function () {
-          return self.push_frame(serverResponse, name, timeout);
-        }), 50);
-      } else {
-        return this.owner.serverSendError(new Poltergeist.FrameNotFound(name), serverResponse);
-      }
-    }
-  };
-
-  /**
-   *  Injects a javascript into the current page
-   * @param serverResponse
-   * @param extension
-   * @return {*}
-   */
-  Browser.prototype.add_extension = function (serverResponse, extension) {
-    //TODO: error control when the injection was not possible
-    this.currentPage.injectExtension(extension);
-    return this.serverSendResponse('success', serverResponse);
-  };
-
-  /**
-   *  Returns the url we are currently in
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.current_url = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.currentUrl(), serverResponse);
-  };
-
-  /**
-   *  Returns the current page window name
-   * @param serverResponse
-   * @returns {*}
-   */
-  Browser.prototype.window_name = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.windowName(), serverResponse);
-  };
-
-  /**
-   *  Returns the status code associated to the page
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.status_code = function (serverResponse) {
-    if (this.currentPage.statusCode === undefined || this.currentPage.statusCode === null) {
-      return this.owner.serverSendError(new Poltergeist.StatusFailError("status_code_error"), serverResponse);
-    }
-    return this.serverSendResponse(this.currentPage.statusCode, serverResponse);
-  };
-
-  /**
-   *  Returns the source code of the active frame, useful for when inside an IFRAME
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.body = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.content(), serverResponse);
-  };
-
-  /**
-   * Returns the source code of the page all the html
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.source = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.source, serverResponse);
-  };
-
-  /**
-   * Returns the current page title
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.title = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.title(), serverResponse);
-  };
-
-  /**
-   *  Finds the elements that match a method of selection and a selector
-   * @param serverResponse
-   * @param method
-   * @param selector
-   * @return {*}
-   */
-  Browser.prototype.find = function (serverResponse, method, selector) {
-    return this.serverSendResponse({
-      page_id: this.currentPage.id,
-      ids: this.currentPage.find(method, selector)
-    }, serverResponse);
-  };
-
-  /**
-   * Find elements within a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param method
-   * @param selector
-   * @return {*}
-   */
-  Browser.prototype.find_within = function (serverResponse, page_id, id, method, selector) {
-    return this.serverSendResponse(this.node(page_id, id).find(method, selector), serverResponse);
-  };
-
-  /**
-   * Returns ALL the text, visible and not visible from the given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.all_text = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).allText(), serverResponse);
-  };
-
-  /**
-   * Returns the inner or outer html of a given id
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param type
-   * @returns Object
-   */
-  Browser.prototype.all_html = function (serverResponse, page_id, id, type) {
-    return this.serverSendResponse(this.node(page_id, id).allHTML(type), serverResponse);
-  };
-
-  /**
-   *  Returns only the visible text in a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.visible_text = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).visibleText(), serverResponse);
-  };
-
-  /**
-   * Deletes the text in a given element leaving it empty
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.delete_text = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).deleteText(), serverResponse);
-  };
-
-  /**
-   *  Gets the value of a given attribute in an element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param name
-   * @return {*}
-   */
-  Browser.prototype.attribute = function (serverResponse, page_id, id, name) {
-    return this.serverSendResponse(this.node(page_id, id).getAttribute(name), serverResponse);
-  };
-
-  /**
-   *  Allows the possibility to set an attribute on a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param name
-   * @param value
-   * @returns {*}
-   */
-  Browser.prototype.set_attribute = function (serverResponse, page_id, id, name, value) {
-    return this.serverSendResponse(this.node(page_id, id).setAttribute(name, value), serverResponse);
-  };
-
-  /**
-   *  Allows the possibility to remove an attribute on a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param name
-   * @returns {*}
-   */
-  Browser.prototype.remove_attribute = function (serverResponse, page_id, id, name) {
-    return this.serverSendResponse(this.node(page_id, id).removeAttribute(name), serverResponse);
-  };
-
-  /**
-   * Returns all the attributes of a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param name
-   * @return {*}
-   */
-  Browser.prototype.attributes = function (serverResponse, page_id, id, name) {
-    return this.serverSendResponse(this.node(page_id, id).getAttributes(), serverResponse);
-  };
-
-  /**
-   *  Returns all the way to the document level the parents of a given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.parents = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).parentIds(), serverResponse);
-  };
-
-  /**
-   * Returns the element.value of an element given by its page and id
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.value = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).value(), serverResponse);
-  };
-
-  /**
-   *  Sets the element.value of an element by the given value
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param value
-   * @return {*}
-   */
-  Browser.prototype.set = function (serverResponse, page_id, id, value) {
-    this.node(page_id, id).set(value);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   *  Uploads a file to an input file element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param file_path
-   * @return {*}
-   */
-  Browser.prototype.select_file = function (serverResponse, page_id, id, file_path) {
-    var node = this.node(page_id, id);
-
-    this.currentPage.beforeUpload(node.id);
-    this.currentPage.uploadFile('[_poltergeist_selected]', file_path);
-    this.currentPage.afterUpload(node.id);
-
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Sets a value to the selected element (to be used in select elements)
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param value
-   * @return {*}
-   */
-  Browser.prototype.select = function (serverResponse, page_id, id, value) {
-    return this.serverSendResponse(this.node(page_id, id).select(value), serverResponse);
-  };
-
-  /**
-   *  Selects an option with the given value
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param value
-   * @param multiple
-   * @return {*}
-   */
-  Browser.prototype.select_option = function (serverResponse, page_id, id, value, multiple) {
-    return this.serverSendResponse(this.node(page_id, id).select_option(value, multiple), serverResponse);
-  };
-
-  /**
-   *
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.tag_name = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).tagName(), serverResponse);
-  };
-
-
-  /**
-   * Tells if an element is visible or not
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.visible = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).isVisible(), serverResponse);
-  };
-
-  /**
-   *  Tells if an element is disabled
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.disabled = function (serverResponse, page_id, id) {
-    return this.serverSendResponse(this.node(page_id, id).isDisabled(), serverResponse);
-  };
-
-  /**
-   *  Evaluates a javascript and returns the outcome to the client
-   *  This will be JSON response so your script better be returning objects that can be used
-   *  in JSON.stringify
-   * @param serverResponse
-   * @param script
-   * @return {*}
-   */
-  Browser.prototype.evaluate = function (serverResponse, script) {
-    return this.serverSendResponse(this.currentPage.evaluate("function() { return " + script + " }"), serverResponse);
-  };
-
-  /**
-   *  Executes a javascript and goes back to the client with true if there were no errors
-   * @param serverResponse
-   * @param script
-   * @return {*}
-   */
-  Browser.prototype.execute = function (serverResponse, script) {
-    this.currentPage.execute("function() { " + script + " }");
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * If inside a frame then we will go back to the parent
-   * Not defined behaviour if you pop and are not inside an iframe
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.pop_frame = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.popFrame(), serverResponse);
-  };
-
-  /**
-   * Gets the window handle id by a given window name
-   * @param serverResponse
-   * @param name
-   * @return {*}
-   */
-  Browser.prototype.window_handle = function (serverResponse, name) {
-    var handle, pageByWindowName;
-
-    if (name === null || typeof name == "undefined" || name.length === 0) {
-      return this.serverSendResponse(this.currentPage.handle, serverResponse);
-    }
-
-    handle = null;
-
-    //Lets search the handle by the given window name
-    var filteredPages = this.pages.filter(function (p) {
-      return !p.closed && p.windowName() === name;
-    });
-
-    //A bit of error control is always good
-    if (Array.isArray(filteredPages) && filteredPages.length >= 1) {
-      pageByWindowName = filteredPages[0];
-    } else {
-      pageByWindowName = null;
-    }
-
-    if (pageByWindowName !== null && typeof pageByWindowName != "undefined") {
-      handle = pageByWindowName.handle;
-    }
-
-    return this.serverSendResponse(handle, serverResponse);
-  };
-
-  /**
-   * Returns all the window handles of opened windows
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.window_handles = function (serverResponse) {
-    var handles, filteredPages;
-
-    filteredPages = this.pages.filter(function (p) {
-      return !p.closed;
-    });
-
-    if (filteredPages.length > 0) {
-      handles = filteredPages.map(function (p) {
-        return p.handle;
-      });
-      if (handles.length === 0) {
-        handles = null;
-      }
-    } else {
-      handles = null;
-    }
-
-    return this.serverSendResponse(handles, serverResponse);
-  };
-
-  /**
-   *  Tries to switch to a window given by the handle id
-   * @param serverResponse
-   * @param handle
-   * @return {*}
-   */
-  Browser.prototype.switch_to_window = function (serverResponse, handle) {
-    var page;
-    var self = this;
-
-    page = this.getPageByHandle(handle);
-    if (page === null || typeof page == "undefined") {
-      throw new Poltergeist.NoSuchWindowError;
-    }
-
-    if (page !== this.currentPage) {
-      return page.waitState('default', function () {
-        self.currentPage = page;
-        return self.serverSendResponse(true, serverResponse);
-      });
-    }
-
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Opens a new window where we can do stuff
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.open_new_window = function (serverResponse) {
-    return this.execute(serverResponse, 'window.open()');
-  };
-
-  /**
-   * Closes the window given by handle name if possible
-   * @param serverResponse
-   * @param handle
-   * @return {*}
-   */
-  Browser.prototype.close_window = function (serverResponse, handle) {
-    var page;
-
-    page = this.getPageByHandle(handle);
-    if (page === null || typeof  page == "undefined") {
-      //TODO: should we throw error since we actually could not find the window?
-      return this.serverSendResponse(false, serverResponse);
-    }
-
-    //TODO: we have to add some control here to actually asses that the release has been done
-    page.release();
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Generic mouse event on an element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param name
-   * @return {number}
-   */
-  Browser.prototype.mouse_event = function (serverResponse, page_id, id, name) {
-    var node;
-    var self = this;
-    node = this.node(page_id, id);
-    this.currentPage.state = 'mouse_event';
-    this.last_mouse_event = node.mouseEvent(name);
-    return setTimeout(function () {
-      if (self.currentPage.state === 'mouse_event') {
-        self.currentPage.state = 'default';
-        return self.serverSendResponse({
-          position: self.last_mouse_event
-        }, serverResponse);
-      } else {
-        return self.currentPage.waitState('default', function () {
-          return self.serverSendResponse({
-            position: self.last_mouse_event
-          }, serverResponse);
-        });
-      }
-    }, 5);
-  };
-
-  /**
-   * Simple click on the element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.click = function (serverResponse, page_id, id) {
-    return this.mouse_event(serverResponse, page_id, id, 'click');
-  };
-
-  /**
-   * Right click on the element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.right_click = function (serverResponse, page_id, id) {
-    return this.mouse_event(serverResponse, page_id, id, 'rightclick');
-  };
-
-  /**
-   *  Double click on the element given by page and id
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.double_click = function (serverResponse, page_id, id) {
-    return this.mouse_event(serverResponse, page_id, id, 'doubleclick');
-  };
-
-  /**
-   * Executes a mousemove event on the page and given element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @return {*}
-   */
-  Browser.prototype.hover = function (serverResponse, page_id, id) {
-    return this.mouse_event(serverResponse, page_id, id, 'mousemove');
-  };
-
-  /**
-   * Triggers a mouse click event on the given coordinates
-   * @param serverResponse
-   * @param x
-   * @param y
-   * @return {*}
-   */
-  Browser.prototype.click_coordinates = function (serverResponse, x, y) {
-    var response;
-
-    this.currentPage.sendEvent('click', x, y);
-    response = {
-      click: {
-        x: x,
-        y: y
-      }
-    };
-
-    return this.serverSendResponse(response, serverResponse);
-  };
-
-  /**
-   *  Drags one element into another, useful for nice javascript thingies
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param other_id
-   * @return {*}
-   */
-  Browser.prototype.drag = function (serverResponse, page_id, id, other_id) {
-    this.node(page_id, id).dragTo(this.node(page_id, other_id));
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Triggers an event on the given page and element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param event
-   * @return {*}
-   */
-  Browser.prototype.trigger = function (serverResponse, page_id, id, event) {
-    this.node(page_id, id).trigger(event);
-    return this.serverSendResponse(event, serverResponse);
-  };
-
-  /**
-   * Checks if two elements are equal on a dom level
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param other_id
-   * @return {*}
-   */
-  Browser.prototype.equals = function (serverResponse, page_id, id, other_id) {
-    return this.serverSendResponse(this.node(page_id, id).isEqual(this.node(page_id, other_id)), serverResponse);
-  };
-
-  /**
-   * Resets the current page to a clean slate
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.reset = function (serverResponse) {
-    this.resetPage();
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Scrolls to a position given by the left, top coordinates
-   * @param serverResponse
-   * @param left
-   * @param top
-   * @return {*}
-   */
-  Browser.prototype.scroll_to = function (serverResponse, left, top) {
-    this.currentPage.setScrollPosition({
-      left: left,
-      top: top
-    });
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Sends keys to an element simulating as closest as possible what a user would do
-   * when typing
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param keys
-   * @return {*}
-   */
-  Browser.prototype.send_keys = function (serverResponse, page_id, id, keys) {
-    var key, sequence, target, _i, _len;
-    target = this.node(page_id, id);
-    if (!target.containsSelection()) {
-      target.mouseEvent('click');
-    }
-    for (_i = 0, _len = keys.length; _i < _len; _i++) {
-      sequence = keys[_i];
-      key = sequence.key != null ? this.currentPage.keyCode(sequence.key) : sequence;
-      this.currentPage.sendEvent('keypress', key);
-    }
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Sends a native phantomjs key event to element
-   * @param serverResponse
-   * @param page_id
-   * @param id
-   * @param keyEvent
-   * @param key
-   * @param modifier
-   */
-  Browser.prototype.key_event = function (serverResponse, page_id, id, keyEvent, key, modifier) {
-    var keyEventModifierMap;
-    var keyEventModifier;
-    var target;
-
-    keyEventModifierMap = {
-      'none': 0x0,
-      'shift': 0x02000000,
-      'ctrl': 0x04000000,
-      'alt': 0x08000000,
-      'meta': 0x10000000
-    };
-    keyEventModifier = keyEventModifierMap[modifier];
-
-    target = this.node(page_id, id);
-    if (!target.containsSelection()) {
-      target.mouseEvent('click');
-    }
-    target.page.sendEvent(keyEvent, key, null, null, keyEventModifier);
-
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   *  Sends the rendered page in a base64 encoding
-   * @param serverResponse
-   * @param format
-   * @param full
-   * @param selector
-   * @return {*}
-   */
-  Browser.prototype.render_base64 = function (serverResponse, format, full, selector) {
-    var encoded_image;
-    if (selector == null) {
-      selector = null;
-    }
-    this.set_clip_rect(full, selector);
-    encoded_image = this.currentPage.renderBase64(format);
-    return this.serverSendResponse(encoded_image, serverResponse);
-  };
-
-  /**
-   * Renders the current page entirely or a given selection
-   * @param serverResponse
-   * @param path
-   * @param full
-   * @param selector
-   * @return {*}
-   */
-  Browser.prototype.render = function (serverResponse, path, full, selector) {
-    var dimensions;
-    if (selector == null) {
-      selector = null;
-    }
-    dimensions = this.set_clip_rect(full, selector);
-    this.currentPage.setScrollPosition({
-      left: 0,
-      top: 0
-    });
-    this.currentPage.render(path);
-    this.currentPage.setScrollPosition({
-      left: dimensions.left,
-      top: dimensions.top
-    });
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-
-  /**
-   * Sets the paper size, useful when printing to PDF
-   * @param serverResponse
-   * @param size
-   * @return {*}
-   */
-  Browser.prototype.set_paper_size = function (serverResponse, size) {
-    this.currentPage.setPaperSize(size);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   *  Sets the zoom factor on the current page
-   * @param serverResponse
-   * @param zoom_factor
-   * @return {*}
-   */
-  Browser.prototype.set_zoom_factor = function (serverResponse, zoom_factor) {
-    this.currentPage.setZoomFactor(zoom_factor);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Resizes the browser viewport, useful when testing mobile stuff
-   * @param serverResponse
-   * @param width
-   * @param height
-   * @return {*}
-   */
-  Browser.prototype.resize = function (serverResponse, width, height) {
-    this.currentPage.setViewportSize({
-      width: width,
-      height: height
-    });
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Gets the browser viewport size
-   * Because PhantomJS is headless (nothing is shown)
-   * viewportSize effectively simulates the size of the window like in a traditional browser.
-   * @param serverResponse
-   * @param handle
-   * @return {*}
-   */
-  Browser.prototype.window_size = function (serverResponse, handle) {
-    //TODO: add support for window handles
-    return this.serverSendResponse(this.currentPage.viewportSize(), serverResponse);
-  };
-
-  /**
-   * Returns the network traffic that the current page has generated
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.network_traffic = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.networkTraffic(), serverResponse);
-  };
-
-  /**
-   * Clears the accumulated network_traffic in the current page
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.clear_network_traffic = function (serverResponse) {
-    this.currentPage.clearNetworkTraffic();
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Gets the headers of the current page
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.get_headers = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.getCustomHeaders(), serverResponse);
-  };
-
-  /**
-   * Set headers in the browser
-   * @param serverResponse
-   * @param headers
-   * @return {*}
-   */
-  Browser.prototype.set_headers = function (serverResponse, headers) {
-    if (headers['User-Agent']) {
-      this.currentPage.setUserAgent(headers['User-Agent']);
-    }
-    this.currentPage.setCustomHeaders(headers);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Given an array of headers, adds them to the page
-   * @param serverResponse
-   * @param headers
-   * @return {*}
-   */
-  Browser.prototype.add_headers = function (serverResponse, headers) {
-    var allHeaders, name, value;
-    allHeaders = this.currentPage.getCustomHeaders();
-    for (name in headers) {
-      if (headers.hasOwnProperty(name)) {
-        value = headers[name];
-        allHeaders[name] = value;
-      }
-    }
-    return this.set_headers(serverResponse, allHeaders);
-  };
-
-  /**
-   * Adds a header to the page temporary or permanently
-   * @param serverResponse
-   * @param header
-   * @param permanent
-   * @return {*}
-   */
-  Browser.prototype.add_header = function (serverResponse, header, permanent) {
-    if (!permanent) {
-      this.currentPage.addTempHeader(header);
-    }
-    return this.add_headers(serverResponse, header);
-  };
-
-
-  /**
-   * Sends back the client the response headers sent from the browser when making
-   * the page request
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.response_headers = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.responseHeaders(), serverResponse);
-  };
-
-  /**
-   * Returns the cookies of the current page being browsed
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.cookies = function (serverResponse) {
-    return this.serverSendResponse(this.currentPage.cookies(), serverResponse);
-  };
-
-  /**
-   * Sets a cookie in the browser, the format of the cookies has to be the format it says
-   * on phantomjs documentation and as such you can set it in other domains, not on the
-   * current page
-   * @param serverResponse
-   * @param cookie
-   * @return {*}
-   */
-  Browser.prototype.set_cookie = function (serverResponse, cookie) {
-    return this.serverSendResponse(phantom.addCookie(cookie), serverResponse);
-  };
-
-  /**
-   * Remove a cookie set on the current page
-   * @param serverResponse
-   * @param name
-   * @return {*}
-   */
-  Browser.prototype.remove_cookie = function (serverResponse, name) {
-    //TODO: add error control to check if the cookie was properly deleted
-    this.currentPage.deleteCookie(name);
-    phantom.deleteCookie(name);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Clear the cookies in the browser
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.clear_cookies = function (serverResponse) {
-    phantom.clearCookies();
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Enables / Disables the cookies on the browser
-   * @param serverResponse
-   * @param flag
-   * @return {*}
-   */
-  Browser.prototype.cookies_enabled = function (serverResponse, flag) {
-    phantom.cookiesEnabled = flag;
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * US19: DONE
-   * Sets a basic authentication credential to access a page
-   * THIS SHOULD BE USED BEFORE accessing a page
-   * @param serverResponse
-   * @param user
-   * @param password
-   * @return {*}
-   */
-  Browser.prototype.set_http_auth = function (serverResponse, user, password) {
-    this.currentPage.setHttpAuth(user, password);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Sets the flag whether to fail on javascript errors or not.
-   * @param serverResponse
-   * @param value
-   * @return {*}
-   */
-  Browser.prototype.set_js_errors = function (serverResponse, value) {
-    this.js_errors = value;
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Sets the debug mode to boolean value
-   * @param serverResponse
-   * @param value
-   * @return {*}
-   */
-  Browser.prototype.set_debug = function (serverResponse, value) {
-    this._debug = value;
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Goes back in the history when possible
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.go_back = function (serverResponse) {
-    var self = this;
-    if (this.currentPage.canGoBack()) {
-      this.currentPage.state = 'loading';
-      this.currentPage.goBack();
-      return this.currentPage.waitState('default', function () {
-        return self.serverSendResponse(true, serverResponse);
-      });
-    } else {
-      return this.serverSendResponse(false, serverResponse);
-    }
-  };
-
-  /**
-   * Reloads the page if possible
-   * @return {*}
-   */
-  Browser.prototype.reload = function (serverResponse) {
-    var self = this;
-    this.currentPage.state = 'loading';
-    this.currentPage.reload();
-    return this.currentPage.waitState('default', function () {
-      return self.serverSendResponse(true, serverResponse);
-    });
-  };
-
-  /**
-   * Goes forward in the browser history if possible
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.go_forward = function (serverResponse) {
-    var self = this;
-    if (this.currentPage.canGoForward()) {
-      this.currentPage.state = 'loading';
-      this.currentPage.goForward();
-      return this.currentPage.waitState('default', function () {
-        return self.serverSendResponse(true, serverResponse);
-      });
-    } else {
-      return this.serverSendResponse(false, serverResponse);
-    }
-  };
-
-  /**
-   *  Sets the urlBlacklist for the given urls as parameters
-   * @return {boolean}
-   */
-  Browser.prototype.set_url_blacklist = function (serverResponse, blackList) {
-    this.currentPage.urlBlacklist = Array.prototype.slice.call(blackList);
-    return this.serverSendResponse(true, serverResponse);
-  };
-
-  /**
-   * Runs a browser command and returns the response back to the client
-   * when the command has finished the execution
-   * @param command
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.serverRunCommand = function (command, serverResponse) {
-    var commandData;
-    var commandArgs;
-    var commandName;
-
-    commandName = command.name;
-    commandArgs = command.args;
-    this.currentPage.state = 'default';
-    commandData = [serverResponse].concat(commandArgs);
-
-    if (typeof this[commandName] !== "function") {
-      //We can not run such command
-      throw new Poltergeist.Error();
-    }
-
-    return this[commandName].apply(this, commandData);
-  };
-
-  /**
-   * Sends a response back to the client who made the request
-   * @param response
-   * @param serverResponse
-   * @return {*}
-   */
-  Browser.prototype.serverSendResponse = function (response, serverResponse) {
-    var errors;
-    errors = this.currentPage.errors;
-    this.currentPage.clearErrors();
-    if (errors.length > 0 && this.js_errors) {
-      return this.owner.serverSendError(new Poltergeist.JavascriptError(errors), serverResponse);
-    } else {
-      return this.owner.serverSendResponse(response, serverResponse);
-    }
-  };
-
-  return Browser;
-
-})();
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/main.js b/vendor/jcalderonzumba/gastonjs/src/Client/main.js
deleted file mode 100644
index 59fd320..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/main.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var Poltergeist, system, _ref, _ref1, _ref2;
-
-//Inheritance tool
-phantom.injectJs("" + phantom.libraryPath + "/Tools/inherit.js");
-
-//Poltergeist main object
-phantom.injectJs("" + phantom.libraryPath + "/poltergeist.js");
-
-//Errors that are controller in the poltergeist code
-phantom.injectJs("" + phantom.libraryPath + "/Errors/error.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/obsolete_node.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/invalid_selector.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/frame_not_found.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/mouse_event_failed.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/javascript_error.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/browser_error.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/status_fail_error.js");
-phantom.injectJs("" + phantom.libraryPath + "/Errors/no_such_window_error.js");
-
-//web server to control the commands
-phantom.injectJs("" + phantom.libraryPath + "/Server/server.js");
-
-phantom.injectJs("" + phantom.libraryPath + "/web_page.js");
-phantom.injectJs("" + phantom.libraryPath + "/node.js");
-phantom.injectJs("" + phantom.libraryPath + "/browser.js");
-
-system = require('system');
-
-new Poltergeist(system.args[1], system.args[2], system.args[3], system.args[4] === 'false' ? false : true);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/node.js b/vendor/jcalderonzumba/gastonjs/src/Client/node.js
deleted file mode 100644
index bdf5baf..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/node.js
+++ /dev/null
@@ -1,161 +0,0 @@
-var __slice = [].slice;
-
-Poltergeist.Node = (function () {
-  var name, _fn, _i, _len, _ref;
-  var xpathStringLiteral;
-
-  Node.DELEGATES = ['allText', 'visibleText', 'getAttribute', 'value', 'set', 'checked',
-    'setAttribute', 'isObsolete', 'removeAttribute', 'isMultiple',
-    'select', 'tagName', 'find', 'getAttributes', 'isVisible',
-    'position', 'trigger', 'input', 'parentId', 'parentIds', 'mouseEventTest',
-    'scrollIntoView', 'isDOMEqual', 'isDisabled', 'deleteText', 'selectRadioValue',
-    'containsSelection', 'allHTML', 'changed', 'getXPathForElement', 'deselectAllOptions'];
-
-  function Node(page, id) {
-    this.page = page;
-    this.id = id;
-  }
-
-  /**
-   * Returns the parent Node of this Node
-   * @return {Poltergeist.Node}
-   */
-  Node.prototype.parent = function () {
-    return new Poltergeist.Node(this.page, this.parentId());
-  };
-
-  _ref = Node.DELEGATES;
-
-  _fn = function (name) {
-    return Node.prototype[name] = function () {
-      var args = [];
-      if (arguments.length >= 1) {
-        args = __slice.call(arguments, 0)
-      }
-      return this.page.nodeCall(this.id, name, args);
-    };
-  };
-
-  //Adding all the delegates from the agent Node to this Node
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    name = _ref[_i];
-    _fn(name);
-  }
-
-  xpathStringLiteral = function (s) {
-    if (s.indexOf('"') === -1)
-      return '"' + s + '"';
-    if (s.indexOf("'") === -1)
-      return "'" + s + "'";
-    return 'concat("' + s.replace(/"/g, '",\'"\',"') + '")';
-  };
-
-  /**
-   *  Gets an x,y position tailored for mouse event actions
-   * @return {{x, y}}
-   */
-  Node.prototype.mouseEventPosition = function () {
-    var middle, pos, viewport;
-
-    viewport = this.page.viewportSize();
-    pos = this.position();
-    middle = function (start, end, size) {
-      return start + ((Math.min(end, size) - start) / 2);
-    };
-
-    return {
-      x: middle(pos.left, pos.right, viewport.width),
-      y: middle(pos.top, pos.bottom, viewport.height)
-    };
-  };
-
-  /**
-   * Executes a phantomjs native mouse event
-   * @param name
-   * @return {{x, y}}
-   */
-  Node.prototype.mouseEvent = function (name) {
-    var pos, test;
-
-    this.scrollIntoView();
-    pos = this.mouseEventPosition();
-    test = this.mouseEventTest(pos.x, pos.y);
-
-    if (test.status === 'success') {
-      if (name === 'rightclick') {
-        this.page.mouseEvent('click', pos.x, pos.y, 'right');
-        this.trigger('contextmenu');
-      } else {
-        this.page.mouseEvent(name, pos.x, pos.y);
-      }
-      return pos;
-    } else {
-      throw new Poltergeist.MouseEventFailed(name, test.selector, pos);
-    }
-  };
-
-  /**
-   * Executes a mouse based drag from one node to another
-   * @param other
-   * @return {{x, y}}
-   */
-  Node.prototype.dragTo = function (other) {
-    var otherPosition, position;
-
-    this.scrollIntoView();
-    position = this.mouseEventPosition();
-    otherPosition = other.mouseEventPosition();
-    this.page.mouseEvent('mousedown', position.x, position.y);
-    return this.page.mouseEvent('mouseup', otherPosition.x, otherPosition.y);
-  };
-
-  /**
-   * Checks if one node is equal to another
-   * @param other
-   * @return {boolean}
-   */
-  Node.prototype.isEqual = function (other) {
-    return this.page === other.page && this.isDOMEqual(other.id);
-  };
-
-
-  /**
-   * The value to select
-   * @param value
-   * @param multiple
-   */
-  Node.prototype.select_option = function (value, multiple) {
-    var tagName = this.tagName().toLowerCase();
-
-    if (tagName === "select") {
-      var escapedOption = xpathStringLiteral(value);
-      // The value of an option is the normalized version of its text when it has no value attribute
-      var optionQuery = ".//option[@value = " + escapedOption + " or (not(@value) and normalize-space(.) = " + escapedOption + ")]";
-      var ids = this.find("xpath", optionQuery);
-      var polterNode = this.page.get(ids[0]);
-
-      if (multiple || !this.getAttribute('multiple')) {
-        if (!polterNode.getAttribute('selected')) {
-          polterNode.select(value);
-          this.trigger('click');
-          this.input();
-        }
-        return true;
-      }
-
-      this.deselectAllOptions();
-      polterNode.select(value);
-      this.trigger('click');
-      this.input();
-      return true;
-    } else if (tagName === "input" && this.getAttribute("type").toLowerCase() === "radio") {
-      return this.selectRadioValue(value);
-    }
-
-    throw new Poltergeist.BrowserError("The element is not a select or radio input");
-
-  };
-
-  return Node;
-
-}).call(this);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js b/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js
deleted file mode 100644
index 4e86d08..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js
+++ /dev/null
@@ -1,78 +0,0 @@
-Poltergeist = (function () {
-
-  /**
-   * The MAIN class of the project
-   * @param port
-   * @param width
-   * @param height
-   * @param jsErrors
-   * @constructor
-   */
-  function Poltergeist(port, width, height, jsErrors) {
-    var self;
-    this.browser = new Poltergeist.Browser(this, width, height, jsErrors);
-
-    this.commandServer = new Poltergeist.Server(this, port);
-    this.commandServer.start();
-
-    self = this;
-
-    phantom.onError = function (message, stack) {
-      return self.onError(message, stack);
-    };
-
-    this.running = false;
-  }
-
-  /**
-   * Tries to execute a command send by a client and returns the command response
-   * or error if something happened
-   * @param command
-   * @param serverResponse
-   * @return {boolean}
-   */
-  Poltergeist.prototype.serverRunCommand = function (command, serverResponse) {
-    var error;
-    this.running = true;
-    try {
-      return this.browser.serverRunCommand(command, serverResponse);
-    } catch (_error) {
-      error = _error;
-      if (error instanceof Poltergeist.Error) {
-        return this.serverSendError(error, serverResponse);
-      }
-      return this.serverSendError(new Poltergeist.BrowserError(error.toString(), error.stack), serverResponse);
-    }
-  };
-
-  /**
-   * Sends error back to the client
-   * @param error
-   * @param serverResponse
-   * @return {boolean}
-   */
-  Poltergeist.prototype.serverSendError = function (error, serverResponse) {
-    var errorObject;
-    errorObject = {
-      error: {
-        name: error.name || 'Generic',
-        args: error.args && error.args() || [error.toString()]
-      }
-    };
-    return this.commandServer.sendError(serverResponse, 500, errorObject);
-  };
-
-  /**
-   * Send the response back to the client
-   * @param response        Data to send to the client
-   * @param serverResponse  Phantomjs response object associated to the client request
-   * @return {boolean}
-   */
-  Poltergeist.prototype.serverSendResponse = function (response, serverResponse) {
-    return this.commandServer.send(serverResponse, {response: response});
-  };
-
-  return Poltergeist;
-})();
-
-window.Poltergeist = Poltergeist;
diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/web_page.js b/vendor/jcalderonzumba/gastonjs/src/Client/web_page.js
deleted file mode 100644
index c275b03..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Client/web_page.js
+++ /dev/null
@@ -1,829 +0,0 @@
-var __slice = [].slice;
-var __indexOf = [].indexOf || function (item) {
-    for (var i = 0, l = this.length; i < l; i++) {
-      if (i in this && this[i] === item) return i;
-    }
-    return -1;
-  };
-
-Poltergeist.WebPage = (function () {
-  var command, delegate, commandFunctionBind, delegateFunctionBind, i, j, commandsLength, delegatesRefLength, commandsRef, delegatesRef,
-    _this = this;
-
-  //Native or not webpage callbacks
-  WebPage.CALLBACKS = ['onAlert', 'onConsoleMessage', 'onLoadFinished', 'onInitialized', 'onLoadStarted', 'onResourceRequested',
-    'onResourceReceived', 'onError', 'onNavigationRequested', 'onUrlChanged', 'onPageCreated', 'onClosing'];
-
-  // Delegates the execution to the phantomjs page native functions but directly available in the WebPage object
-  WebPage.DELEGATES = ['open', 'sendEvent', 'uploadFile', 'release', 'render', 'renderBase64', 'goBack', 'goForward', 'reload'];
-
-  //Commands to execute on behalf of the browser but on the current page
-  WebPage.COMMANDS = ['currentUrl', 'find', 'nodeCall', 'documentSize', 'beforeUpload', 'afterUpload', 'clearLocalStorage'];
-
-  WebPage.EXTENSIONS = [];
-
-  function WebPage(nativeWebPage) {
-    var callback, i, callBacksLength, callBacksRef;
-
-    //Lets create the native phantomjs webpage
-    if (nativeWebPage === null || typeof nativeWebPage == "undefined") {
-      this._native = require('webpage').create();
-    } else {
-      this._native = nativeWebPage;
-    }
-
-    this.id = 0;
-    this.source = null;
-    this.closed = false;
-    this.state = 'default';
-    this.urlBlacklist = [];
-    this.frames = [];
-    this.errors = [];
-    this._networkTraffic = {};
-    this._tempHeaders = {};
-    this._blockedUrls = [];
-
-    callBacksRef = WebPage.CALLBACKS;
-    for (i = 0, callBacksLength = callBacksRef.length; i < callBacksLength; i++) {
-      callback = callBacksRef[i];
-      this.bindCallback(callback);
-    }
-  }
-
-  //Bind the commands we can run from the browser to the current page
-  commandsRef = WebPage.COMMANDS;
-  commandFunctionBind = function (command) {
-    return WebPage.prototype[command] = function () {
-      var args;
-      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      return this.runCommand(command, args);
-    };
-  };
-  for (i = 0, commandsLength = commandsRef.length; i < commandsLength; i++) {
-    command = commandsRef[i];
-    commandFunctionBind(command);
-  }
-
-  //Delegates bind applications
-  delegatesRef = WebPage.DELEGATES;
-  delegateFunctionBind = function (delegate) {
-    return WebPage.prototype[delegate] = function () {
-      return this._native[delegate].apply(this._native, arguments);
-    };
-  };
-  for (j = 0, delegatesRefLength = delegatesRef.length; j < delegatesRefLength; j++) {
-    delegate = delegatesRef[j];
-    delegateFunctionBind(delegate);
-  }
-
-  /**
-   * This callback is invoked after the web page is created but before a URL is loaded.
-   * The callback may be used to change global objects.
-   * @return {*}
-   */
-  WebPage.prototype.onInitializedNative = function () {
-    this.id += 1;
-    this.source = null;
-    this.injectAgent();
-    this.removeTempHeaders();
-    return this.setScrollPosition({
-      left: 0,
-      top: 0
-    });
-  };
-
-  /**
-   * This callback is invoked when the WebPage object is being closed,
-   * either via page.close in the PhantomJS outer space or via window.close in the page's client-side.
-   * @return {boolean}
-   */
-  WebPage.prototype.onClosingNative = function () {
-    this.handle = null;
-    return this.closed = true;
-  };
-
-  /**
-   * This callback is invoked when there is a JavaScript console message on the web page.
-   * The callback may accept up to three arguments: the string for the message, the line number, and the source identifier.
-   * @param message
-   * @param line
-   * @param sourceId
-   * @return {boolean}
-   */
-  WebPage.prototype.onConsoleMessageNative = function (message, line, sourceId) {
-    if (message === '__DOMContentLoaded') {
-      this.source = this._native.content;
-      return false;
-    }
-    console.log(message);
-    return true;
-  };
-
-  /**
-   * This callback is invoked when the page starts the loading. There is no argument passed to the callback.
-   * @return {number}
-   */
-  WebPage.prototype.onLoadStartedNative = function () {
-    this.state = 'loading';
-    return this.requestId = this.lastRequestId;
-  };
-
-  /**
-   * This callback is invoked when the page finishes the loading.
-   * It may accept a single argument indicating the page's status: 'success' if no network errors occurred, otherwise 'fail'.
-   * @param status
-   * @return {string}
-   */
-  WebPage.prototype.onLoadFinishedNative = function (status) {
-    this.status = status;
-    this.state = 'default';
-
-    if (this.source === null || typeof this.source == "undefined") {
-      this.source = this._native.content;
-    } else {
-      this.source = this._native.content;
-    }
-
-    return this.source;
-  };
-
-  /**
-   * This callback is invoked when there is a JavaScript execution error.
-   * It is a good way to catch problems when evaluating a script in the web page context.
-   * The arguments passed to the callback are the error message and the stack trace [as an Array].
-   * @param message
-   * @param stack
-   * @return {Number}
-   */
-  WebPage.prototype.onErrorNative = function (message, stack) {
-    var stackString;
-
-    stackString = message;
-    stack.forEach(function (frame) {
-      stackString += "\n";
-      stackString += "    at " + frame.file + ":" + frame.line;
-      if (frame["function"] && frame["function"] !== '') {
-        return stackString += " in " + frame["function"];
-      }
-    });
-
-    return this.errors.push({
-      message: message,
-      stack: stackString
-    });
-  };
-
-  /**
-   * This callback is invoked when the page requests a resource.
-   * The first argument to the callback is the requestData metadata object.
-   * The second argument is the networkRequest object itself.
-   * @param requestData
-   * @param networkRequest
-   * @return {*}
-   */
-  WebPage.prototype.onResourceRequestedNative = function (requestData, networkRequest) {
-    var abort;
-
-    abort = this.urlBlacklist.some(function (blacklistedUrl) {
-      return requestData.url.indexOf(blacklistedUrl) !== -1;
-    });
-
-    if (abort) {
-      if (this._blockedUrls.indexOf(requestData.url) === -1) {
-        this._blockedUrls.push(requestData.url);
-      }
-      //TODO: check this, as it raises onResourceError
-      return networkRequest.abort();
-    }
-
-    this.lastRequestId = requestData.id;
-    if (requestData.url === this.redirectURL) {
-      this.redirectURL = null;
-      this.requestId = requestData.id;
-    }
-
-    return this._networkTraffic[requestData.id] = {
-      request: requestData,
-      responseParts: []
-    };
-  };
-
-  /**
-   * This callback is invoked when a resource requested by the page is received.
-   * The only argument to the callback is the response metadata object.
-   * @param response
-   * @return {*}
-   */
-  WebPage.prototype.onResourceReceivedNative = function (response) {
-    var networkTrafficElement;
-
-    if ((networkTrafficElement = this._networkTraffic[response.id]) != null) {
-      networkTrafficElement.responseParts.push(response);
-    }
-
-    if (this.requestId === response.id) {
-      if (response.redirectURL) {
-        return this.redirectURL = response.redirectURL;
-      }
-
-      this.statusCode = response.status;
-      return this._responseHeaders = response.headers;
-    }
-  };
-
-  /**
-   * Inject the poltergeist agent into the webpage
-   * @return {Array}
-   */
-  WebPage.prototype.injectAgent = function () {
-    var extension, isAgentInjected, i, extensionsRefLength, extensionsRef, injectionResults;
-
-    isAgentInjected = this["native"]().evaluate(function () {
-      return typeof window.__poltergeist;
-    });
-
-    if (isAgentInjected === "undefined") {
-      this["native"]().injectJs("" + phantom.libraryPath + "/agent.js");
-      extensionsRef = WebPage.EXTENSIONS;
-      injectionResults = [];
-      for (i = 0, extensionsRefLength = extensionsRef.length; i < extensionsRefLength; i++) {
-        extension = extensionsRef[i];
-        injectionResults.push(this["native"]().injectJs(extension));
-      }
-      return injectionResults;
-    }
-  };
-
-  /**
-   * Injects a Javascript file extension into the
-   * @param file
-   * @return {*}
-   */
-  WebPage.prototype.injectExtension = function (file) {
-    //TODO: add error control, for example, check if file already in the extensions array, check if the file exists, etc.
-    WebPage.EXTENSIONS.push(file);
-    return this["native"]().injectJs(file);
-  };
-
-  /**
-   * Returns the native phantomjs webpage object
-   * @return {*}
-   */
-  WebPage.prototype["native"] = function () {
-    if (this.closed) {
-      throw new Poltergeist.NoSuchWindowError;
-    }
-
-    return this._native;
-  };
-
-  /**
-   * Returns the current page window name
-   * @return {*}
-   */
-  WebPage.prototype.windowName = function () {
-    return this["native"]().windowName;
-  };
-
-  /**
-   * Returns the keyCode of a given key as set in the phantomjs values
-   * @param name
-   * @return {number}
-   */
-  WebPage.prototype.keyCode = function (name) {
-    return this["native"]().event.key[name];
-  };
-
-  /**
-   * Waits for the page to reach a certain state
-   * @param state
-   * @param callback
-   * @return {*}
-   */
-  WebPage.prototype.waitState = function (state, callback) {
-    var self = this;
-    if (this.state === state) {
-      return callback.call();
-    } else {
-      return setTimeout((function () {
-        return self.waitState(state, callback);
-      }), 100);
-    }
-  };
-
-  /**
-   * Sets the browser header related to basic authentication protocol
-   * @param user
-   * @param password
-   * @return {boolean}
-   */
-  WebPage.prototype.setHttpAuth = function (user, password) {
-    var allHeaders = this.getCustomHeaders();
-
-    if (user === false || password === false) {
-      if (allHeaders.hasOwnProperty("Authorization")) {
-        delete allHeaders["Authorization"];
-      }
-      this.setCustomHeaders(allHeaders);
-      return true;
-    }
-
-    var userName = user || "";
-    var userPassword = password || "";
-
-    allHeaders["Authorization"] = "Basic " + btoa(userName + ":" + userPassword);
-    this.setCustomHeaders(allHeaders);
-    return true;
-  };
-
-  /**
-   * Returns all the network traffic associated to the rendering of this page
-   * @return {{}}
-   */
-  WebPage.prototype.networkTraffic = function () {
-    return this._networkTraffic;
-  };
-
-  /**
-   * Clears all the recorded network traffic related to the current page
-   * @return {{}}
-   */
-  WebPage.prototype.clearNetworkTraffic = function () {
-    return this._networkTraffic = {};
-  };
-
-  /**
-   * Returns the blocked urls that the page will not load
-   * @return {Array}
-   */
-  WebPage.prototype.blockedUrls = function () {
-    return this._blockedUrls;
-  };
-
-  /**
-   * Clean all the urls that should not be loaded
-   * @return {Array}
-   */
-  WebPage.prototype.clearBlockedUrls = function () {
-    return this._blockedUrls = [];
-  };
-
-  /**
-   * This property stores the content of the web page's currently active frame
-   * (which may or may not be the main frame), enclosed in an HTML/XML element.
-   * @return {string}
-   */
-  WebPage.prototype.content = function () {
-    return this["native"]().frameContent;
-  };
-
-  /**
-   * Returns the current active frame title
-   * @return {string}
-   */
-  WebPage.prototype.title = function () {
-    return this["native"]().frameTitle;
-  };
-
-  /**
-   * Returns if possible the frame url of the frame given by name
-   * @param frameName
-   * @return {string}
-   */
-  WebPage.prototype.frameUrl = function (frameName) {
-    var query;
-
-    query = function (frameName) {
-      var iframeReference;
-      if ((iframeReference = document.querySelector("iframe[name='" + frameName + "']")) != null) {
-        return iframeReference.src;
-      }
-      return void 0;
-    };
-
-    return this.evaluate(query, frameName);
-  };
-
-  /**
-   * Remove the errors caught on the page
-   * @return {Array}
-   */
-  WebPage.prototype.clearErrors = function () {
-    return this.errors = [];
-  };
-
-  /**
-   * Returns the response headers associated to this page
-   * @return {{}}
-   */
-  WebPage.prototype.responseHeaders = function () {
-    var headers;
-    headers = {};
-    this._responseHeaders.forEach(function (item) {
-      return headers[item.name] = item.value;
-    });
-    return headers;
-  };
-
-  /**
-   * Get Cookies visible to the current URL (though, for setting, use of page.addCookie is preferred).
-   * This array will be pre-populated by any existing Cookie data visible to this URL that is stored in the CookieJar, if any.
-   * @return {*}
-   */
-  WebPage.prototype.cookies = function () {
-    return this["native"]().cookies;
-  };
-
-  /**
-   * Delete any Cookies visible to the current URL with a 'name' property matching cookieName.
-   * Returns true if successfully deleted, otherwise false.
-   * @param name
-   * @return {*}
-   */
-  WebPage.prototype.deleteCookie = function (name) {
-    return this["native"]().deleteCookie(name);
-  };
-
-  /**
-   * This property gets the size of the viewport for the layout process.
-   * @return {*}
-   */
-  WebPage.prototype.viewportSize = function () {
-    return this["native"]().viewportSize;
-  };
-
-  /**
-   * This property sets the size of the viewport for the layout process.
-   * @param size
-   * @return {*}
-   */
-  WebPage.prototype.setViewportSize = function (size) {
-    return this["native"]().viewportSize = size;
-  };
-
-  /**
-   * This property specifies the scaling factor for the page.render and page.renderBase64 functions.
-   * @param zoomFactor
-   * @return {*}
-   */
-  WebPage.prototype.setZoomFactor = function (zoomFactor) {
-    return this["native"]().zoomFactor = zoomFactor;
-  };
-
-  /**
-   * This property defines the size of the web page when rendered as a PDF.
-   * See: http://phantomjs.org/api/webpage/property/paper-size.html
-   * @param size
-   * @return {*}
-   */
-  WebPage.prototype.setPaperSize = function (size) {
-    return this["native"]().paperSize = size;
-  };
-
-  /**
-   * This property gets the scroll position of the web page.
-   * @return {*}
-   */
-  WebPage.prototype.scrollPosition = function () {
-    return this["native"]().scrollPosition;
-  };
-
-  /**
-   * This property defines the scroll position of the web page.
-   * @param pos
-   * @return {*}
-   */
-  WebPage.prototype.setScrollPosition = function (pos) {
-    return this["native"]().scrollPosition = pos;
-  };
-
-
-  /**
-   * This property defines the rectangular area of the web page to be rasterized when page.render is invoked.
-   * If no clipping rectangle is set, page.render will process the entire web page.
-   * @return {*}
-   */
-  WebPage.prototype.clipRect = function () {
-    return this["native"]().clipRect;
-  };
-
-  /**
-   * This property defines the rectangular area of the web page to be rasterized when page.render is invoked.
-   * If no clipping rectangle is set, page.render will process the entire web page.
-   * @param rect
-   * @return {*}
-   */
-  WebPage.prototype.setClipRect = function (rect) {
-    return this["native"]().clipRect = rect;
-  };
-
-  /**
-   * Returns the size of an element given by a selector and its position relative to the viewport.
-   * @param selector
-   * @return {Object}
-   */
-  WebPage.prototype.elementBounds = function (selector) {
-    return this["native"]().evaluate(function (selector) {
-      return document.querySelector(selector).getBoundingClientRect();
-    }, selector);
-  };
-
-  /**
-   * Defines the user agent sent to server when the web page requests resources.
-   * @param userAgent
-   * @return {*}
-   */
-  WebPage.prototype.setUserAgent = function (userAgent) {
-    return this["native"]().settings.userAgent = userAgent;
-  };
-
-  /**
-   * Returns the additional HTTP request headers that will be sent to the server for EVERY request.
-   * @return {{}}
-   */
-  WebPage.prototype.getCustomHeaders = function () {
-    return this["native"]().customHeaders;
-  };
-
-  /**
-   * Gets the additional HTTP request headers that will be sent to the server for EVERY request.
-   * @param headers
-   * @return {*}
-   */
-  WebPage.prototype.setCustomHeaders = function (headers) {
-    return this["native"]().customHeaders = headers;
-  };
-
-  /**
-   * Adds a one time only request header, after being used it will be deleted
-   * @param header
-   * @return {Array}
-   */
-  WebPage.prototype.addTempHeader = function (header) {
-    var name, value, tempHeaderResult;
-    tempHeaderResult = [];
-    for (name in header) {
-      if (header.hasOwnProperty(name)) {
-        value = header[name];
-        tempHeaderResult.push(this._tempHeaders[name] = value);
-      }
-    }
-    return tempHeaderResult;
-  };
-
-  /**
-   * Remove the temporary headers we have set via addTempHeader
-   * @return {*}
-   */
-  WebPage.prototype.removeTempHeaders = function () {
-    var allHeaders, name, value, tempHeadersRef;
-    allHeaders = this.getCustomHeaders();
-    tempHeadersRef = this._tempHeaders;
-    for (name in tempHeadersRef) {
-      if (tempHeadersRef.hasOwnProperty(name)) {
-        value = tempHeadersRef[name];
-        delete allHeaders[name];
-      }
-    }
-
-    return this.setCustomHeaders(allHeaders);
-  };
-
-  /**
-   * If possible switch to the frame given by name
-   * @param name
-   * @return {boolean}
-   */
-  WebPage.prototype.pushFrame = function (name) {
-    if (this["native"]().switchToFrame(name)) {
-      this.frames.push(name);
-      return true;
-    }
-    return false;
-  };
-
-  /**
-   * Switch to parent frame, use with caution:
-   * popFrame assumes you are in frame, pop frame not being in a frame
-   * leaves unexpected behaviour
-   * @return {*}
-   */
-  WebPage.prototype.popFrame = function () {
-    //TODO: add some error control here, some way to check we are in a frame or not
-    this.frames.pop();
-    return this["native"]().switchToParentFrame();
-  };
-
-  /**
-   * Returns the webpage dimensions
-   * @return {{top: *, bottom: *, left: *, right: *, viewport: *, document: {height: number, width: number}}}
-   */
-  WebPage.prototype.dimensions = function () {
-    var scroll, viewport;
-    scroll = this.scrollPosition();
-    viewport = this.viewportSize();
-    return {
-      top: scroll.top,
-      bottom: scroll.top + viewport.height,
-      left: scroll.left,
-      right: scroll.left + viewport.width,
-      viewport: viewport,
-      document: this.documentSize()
-    };
-  };
-
-  /**
-   * Returns webpage dimensions that are valid
-   * @return {{top: *, bottom: *, left: *, right: *, viewport: *, document: {height: number, width: number}}}
-   */
-  WebPage.prototype.validatedDimensions = function () {
-    var dimensions, documentDimensions;
-
-    dimensions = this.dimensions();
-    documentDimensions = dimensions.document;
-
-    if (dimensions.right > documentDimensions.width) {
-      dimensions.left = Math.max(0, dimensions.left - (dimensions.right - documentDimensions.width));
-      dimensions.right = documentDimensions.width;
-    }
-
-    if (dimensions.bottom > documentDimensions.height) {
-      dimensions.top = Math.max(0, dimensions.top - (dimensions.bottom - documentDimensions.height));
-      dimensions.bottom = documentDimensions.height;
-    }
-
-    this.setScrollPosition({
-      left: dimensions.left,
-      top: dimensions.top
-    });
-
-    return dimensions;
-  };
-
-  /**
-   * Returns a Poltergeist.Node given by an id
-   * @param id
-   * @return {Poltergeist.Node}
-   */
-  WebPage.prototype.get = function (id) {
-    return new Poltergeist.Node(this, id);
-  };
-
-  /**
-   * Executes a phantomjs mouse event, for more info check: http://phantomjs.org/api/webpage/method/send-event.html
-   * @param name
-   * @param x
-   * @param y
-   * @param button
-   * @return {*}
-   */
-  WebPage.prototype.mouseEvent = function (name, x, y, button) {
-    if (button == null) {
-      button = 'left';
-    }
-    this.sendEvent('mousemove', x, y);
-    return this.sendEvent(name, x, y, button);
-  };
-
-  /**
-   * Evaluates a javascript and returns the evaluation of such script
-   * @return {*}
-   */
-  WebPage.prototype.evaluate = function () {
-    var args, fn;
-    fn = arguments[0];
-    args = [];
-
-    if (2 <= arguments.length) {
-      args = __slice.call(arguments, 1);
-    }
-
-    this.injectAgent();
-    return JSON.parse(this.sanitize(this["native"]().evaluate("function() { return PoltergeistAgent.stringify(" + (this.stringifyCall(fn, args)) + ") }")));
-  };
-
-  /**
-   * Does some string sanitation prior parsing
-   * @param potentialString
-   * @return {*}
-   */
-  WebPage.prototype.sanitize = function (potentialString) {
-    if (typeof potentialString === "string") {
-      return potentialString.replace("\n", "\\n").replace("\r", "\\r");
-    }
-
-    return potentialString;
-  };
-
-  /**
-   * Executes a script into the current page scope
-   * @param script
-   * @return {*}
-   */
-  WebPage.prototype.executeScript = function (script) {
-    return this["native"]().evaluateJavaScript(script);
-  };
-
-  /**
-   * Executes a script via phantomjs evaluation
-   * @return {*}
-   */
-  WebPage.prototype.execute = function () {
-    var args, fn;
-
-    fn = arguments[0];
-    args = [];
-
-    if (2 <= arguments.length) {
-      args = __slice.call(arguments, 1);
-    }
-
-    return this["native"]().evaluate("function() { " + (this.stringifyCall(fn, args)) + " }");
-  };
-
-  /**
-   * Helper methods to do script evaluation and execution
-   * @param fn
-   * @param args
-   * @return {string}
-   */
-  WebPage.prototype.stringifyCall = function (fn, args) {
-    if (args.length === 0) {
-      return "(" + (fn.toString()) + ")()";
-    }
-
-    return "(" + (fn.toString()) + ").apply(this, JSON.parse(" + (JSON.stringify(JSON.stringify(args))) + "))";
-  };
-
-  /**
-   * Binds callbacks to their respective Native implementations
-   * @param name
-   * @return {Function}
-   */
-  WebPage.prototype.bindCallback = function (name) {
-    var self;
-    self = this;
-
-    return this["native"]()[name] = function () {
-      var result;
-      if (self[name + 'Native'] != null) {
-        result = self[name + 'Native'].apply(self, arguments);
-      }
-      if (result !== false && (self[name] != null)) {
-        return self[name].apply(self, arguments);
-      }
-    };
-  };
-
-  /**
-   * Runs a command delegating to the PoltergeistAgent
-   * @param name
-   * @param args
-   * @return {*}
-   */
-  WebPage.prototype.runCommand = function (name, args) {
-    var method, result, selector;
-
-    result = this.evaluate(function (name, args) {
-      return window.__poltergeist.externalCall(name, args);
-    }, name, args);
-
-    if (result !== null) {
-      if (result.error != null) {
-        switch (result.error.message) {
-          case 'PoltergeistAgent.ObsoleteNode':
-            throw new Poltergeist.ObsoleteNode;
-            break;
-          case 'PoltergeistAgent.InvalidSelector':
-            method = args[0];
-            selector = args[1];
-            throw new Poltergeist.InvalidSelector(method, selector);
-            break;
-          default:
-            throw new Poltergeist.BrowserError(result.error.message, result.error.stack);
-        }
-      } else {
-        return result.value;
-      }
-    }
-  };
-
-  /**
-   * Tells if we can go back or not
-   * @return {boolean}
-   */
-  WebPage.prototype.canGoBack = function () {
-    return this["native"]().canGoBack;
-  };
-
-  /**
-   * Tells if we can go forward or not in the browser history
-   * @return {boolean}
-   */
-  WebPage.prototype.canGoForward = function () {
-    return this["native"]().canGoForward;
-  };
-
-  return WebPage;
-
-}).call(this);
diff --git a/vendor/jcalderonzumba/gastonjs/src/Cookie.php b/vendor/jcalderonzumba/gastonjs/src/Cookie.php
deleted file mode 100644
index d59c0f6..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Cookie.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS;
-
-/**
- * Class Cookie
- * @package Zumba\GastonJS
- */
-class Cookie {
-  /** @var  array */
-  protected $attributes;
-
-  /**
-   * @param $attributes
-   */
-  public function __construct($attributes) {
-    $this->attributes = $attributes;
-  }
-
-  /**
-   * Returns the cookie name
-   * @return string
-   */
-  public function getName() {
-    return $this->attributes['name'];
-  }
-
-  /**
-   * Returns the cookie value
-   * @return string
-   */
-  public function getValue() {
-    return urldecode($this->attributes['value']);
-  }
-
-  /**
-   * Returns the cookie domain
-   * @return string
-   */
-  public function getDomain() {
-    return $this->attributes['domain'];
-  }
-
-  /**
-   * Returns the path were the cookie is valid
-   * @return string
-   */
-  public function getPath() {
-    return $this->attributes['path'];
-  }
-
-  /**
-   * Is a secure cookie?
-   * @return bool
-   */
-  public function isSecure() {
-    return isset($this->attributes['secure']);
-  }
-
-  /**
-   * Is http only cookie?
-   * @return bool
-   */
-  public function isHttpOnly() {
-    return isset($this->attributes['httponly']);
-  }
-
-  /**
-   * Returns cookie expiration time
-   * @return mixed
-   */
-  public function getExpirationTime() {
-    //TODO: return a \DateTime object
-    if (isset($this->attributes['expiry'])) {
-      return $this->attributes['expiry'];
-    }
-    return null;
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/BrowserError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/BrowserError.php
deleted file mode 100644
index a1c4f4b..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/BrowserError.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-
-/**
- * Class BrowserError
- * @package Zumba\GastonJS\Exception
- */
-class BrowserError extends ClientError {
-
-  /**
-   * @param array $response
-   */
-  public function __construct($response) {
-    parent::__construct($response);
-    $this->message = $this->message();
-  }
-
-  /**
-   * Gets the name of the browser error
-   * @return string
-   */
-  public function getName() {
-    return $this->response["error"]["name"];
-  }
-
-  /**
-   * @return JSErrorItem
-   */
-  public function javascriptError() {
-    //TODO: this need to be check, i don't know yet what comes in response
-    return new JSErrorItem($this->response["error"]["args"][0], $this->response["error"]["args"][1]);
-  }
-
-  /**
-   * Returns error message
-   * TODO: check how to proper implement if we have exceptions
-   * @return string
-   */
-  public function message() {
-    return "There was an error inside the PhantomJS portion of GastonJS.\nThis is probably a bug, so please report it:\n" . $this->javascriptError();
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/ClientError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/ClientError.php
deleted file mode 100644
index 06be87b..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/ClientError.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class ClientError
- * @package Zumba\GastonJS\Exception
- */
-class ClientError extends \Exception {
-
-  /** @var mixed */
-  protected $response;
-
-  /**
-   * @param mixed $response
-   */
-  public function __construct($response) {
-    $this->response = $response;
-  }
-
-  /**
-   * @return mixed
-   */
-  public function getResponse() {
-    return $this->response;
-  }
-
-  /**
-   * @param mixed $response
-   */
-  public function setResponse($response) {
-    $this->response = $response;
-  }
-
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/DeadClient.php b/vendor/jcalderonzumba/gastonjs/src/Exception/DeadClient.php
deleted file mode 100644
index f4af193..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/DeadClient.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-
-/**
- * Class DeadClient
- * @package Zumba\GastonJS\Exception
- */
-class DeadClient extends \Exception {
-
-  /**
-   * @param string     $message
-   * @param int        $code
-   * @param \Exception $previous
-   */
-  public function __construct($message = "", $code = 0, \Exception $previous = null) {
-    $errorMsg = $message."\nPhantomjs browser server is not taking connections, most probably it has crashed\n";
-    parent::__construct($errorMsg, $code, $previous);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/FrameNotFound.php b/vendor/jcalderonzumba/gastonjs/src/Exception/FrameNotFound.php
deleted file mode 100644
index 56a6f91..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/FrameNotFound.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class FrameNotFound
- * @package Zumba\GastonJS\Exception
- */
-class FrameNotFound extends ClientError {
-
-  /**
-   * @return string
-   */
-  public function getName() {
-    //TODO: check stuff here
-    return current(reset($this->response["args"]));
-  }
-
-  /**
-   * @return string
-   */
-  public function message() {
-    //TODO: check the exception message stuff
-    return "The frame " . $this->getName() . " was not not found";
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/InvalidSelector.php b/vendor/jcalderonzumba/gastonjs/src/Exception/InvalidSelector.php
deleted file mode 100644
index 44fad4b..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/InvalidSelector.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class InvalidSelector
- * @package Zumba\GastonJS\Exception
- */
-class InvalidSelector extends ClientError {
-  /**
-   * Gets the method of selection
-   * @return string
-   */
-  public function getMethod() {
-    return $this->response["error"]["args"][0];
-  }
-
-  /**
-   * Gets the selector related to the method
-   * @return string
-   */
-  public function getSelector() {
-    return $this->response["error"]["args"][1];
-  }
-
-  /**
-   * @return string
-   */
-  public function message() {
-    return "The browser raised a syntax error while trying to evaluate" . $this->getMethod() . " selector " . $this->getSelector();
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/JSErrorItem.php b/vendor/jcalderonzumba/gastonjs/src/Exception/JSErrorItem.php
deleted file mode 100644
index 2fa205a..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/JSErrorItem.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class JSErrorItem
- * @package Zumba\GastonJS\Exception
- */
-class JSErrorItem {
-  /** @var  mixed */
-  protected $message;
-  /** @var  mixed */
-  protected $stack;
-
-  /**
-   * @param $message
-   * @param $stack
-   */
-  public function __construct($message, $stack) {
-    $this->message = $message;
-    $this->stack = $stack;
-  }
-
-  /**
-   * String representation of the class
-   * @return string
-   */
-  public function __toString() {
-    return sprintf("%s\n%s", $this->message, $this->stack);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/JavascriptError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/JavascriptError.php
deleted file mode 100644
index 309adfb..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/JavascriptError.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-
-/**
- * Class JavascriptError
- * @package Zumba\GastonJS\Exception
- */
-class JavascriptError extends ClientError {
-
-  /**
-   * @param array $response
-   */
-  public function __construct($response) {
-    parent::__construct($response);
-    $this->message = $this->message();
-  }
-
-  /**
-   * Get the javascript errors found during the use of the phantomjs
-   * @return array
-   */
-  public function javascriptErrors() {
-    $jsErrors = array();
-    $errors = $this->response["error"]["args"][0];
-    foreach ($errors as $error) {
-      $jsErrors[] = new JSErrorItem($error["message"], $error["stack"]);
-    }
-    return $jsErrors;
-  }
-
-  /**
-   * Returns the javascript errors found
-   * @return string
-   */
-  public function message() {
-    $error = "One or more errors were raised in the Javascript code on the page.
-            If you don't care about these errors, you can ignore them by
-            setting js_errors: false in your Poltergeist configuration (see documentation for details).";
-    //TODO: add javascript errors
-    $jsErrors = $this->javascriptErrors();
-    foreach($jsErrors as $jsError){
-      $error = "$error\n$jsError";
-    }
-    return $error;
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/MouseEventFailed.php b/vendor/jcalderonzumba/gastonjs/src/Exception/MouseEventFailed.php
deleted file mode 100644
index abd72d3..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/MouseEventFailed.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class MouseEventFailed
- * @package Zumba\GastonJS\Exception
- */
-class MouseEventFailed extends NodeError {
-
-  /**
-   * Gets the name of the event
-   * @return string
-   */
-  public function getName() {
-    return $this->response["args"][0];
-  }
-
-  /**
-   * Selector of the element to act with the mouse
-   * @return string
-   */
-  public function getSelector() {
-    return $this->response["args"][1];
-  }
-
-  /**
-   * Returns the position where the click was done
-   * @return array
-   */
-  public function getPosition() {
-    $position = array();
-    $position[0] = $this->response["args"][1]['x'];
-    $position[1] = $this->response["args"][2]['y'];
-    return $position;
-  }
-
-  /**
-   * @return string
-   */
-  public function message() {
-    $name = $this->getName();
-    $position = implode(",", $this->getPosition());
-    return "Firing a $name at co-ordinates [$position] failed. Poltergeist detected
-            another element with CSS selector '#{selector}' at this position.
-            It may be overlapping the element you are trying to interact with.
-            If you don't care about overlapping elements, try using node.trigger('$name').";
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/NoSuchWindowError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/NoSuchWindowError.php
deleted file mode 100644
index 45388d1..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/NoSuchWindowError.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Zumba\GastonJS\Exception;
-
-
-/**
- * Class NoSuchWindowError
- * @package Zumba\GastonJS\Exception
- */
-class NoSuchWindowError extends ClientError {
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/NodeError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/NodeError.php
deleted file mode 100644
index 4b399cf..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/NodeError.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class NodeError
- * @package Zumba\GastonJS\Exception
- */
-class NodeError extends ClientError {
-  protected $node;
-
-  /**
-   * @param mixed $node
-   * @param mixed $response
-   */
-  public function __construct($node, $response) {
-    $this->node = $node;
-    parent::__construct($response);
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/ObsoleteNode.php b/vendor/jcalderonzumba/gastonjs/src/Exception/ObsoleteNode.php
deleted file mode 100644
index a0cdb17..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/ObsoleteNode.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class ObsoleteNode
- * @package Zumba\GastonJS\Exception
- */
-class ObsoleteNode extends ClientError {
-
-  /**
-   * @param array $response
-   */
-  public function __construct($response) {
-    parent::__construct($response);
-    $this->message = $this->message();
-  }
-
-  /**
-   * @return string
-   */
-  public function message() {
-    return "The element you are trying to interact with is either not part of the DOM, or is
-    not currently visible on the page (perhaps display: none is set).
-    It's possible the element has been replaced by another element and you meant to interact with
-    the new element. If so you need to do a new 'find' in order to get a reference to the
-    new element.";
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/StatusFailError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/StatusFailError.php
deleted file mode 100644
index fd90eef..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/StatusFailError.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-
-/**
- * Class StatusFailError
- * @package Zumba\GastonJS\Exception
- */
-class StatusFailError extends ClientError {
-  /**
-   * @return string
-   */
-  public function message() {
-    return "Request failed to reach server, check DNS and/or server status";
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/Exception/TimeoutError.php b/vendor/jcalderonzumba/gastonjs/src/Exception/TimeoutError.php
deleted file mode 100644
index 6366ffa..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/Exception/TimeoutError.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\Exception;
-
-/**
- * Class TimeoutError
- * @package Zumba\GastonJS\Exception
- */
-class TimeoutError extends \Exception {
-
-  /**
-   * @param string $message
-   */
-  public function __construct($message) {
-    $errorMessage = "Timed out waiting for response to {$message}. It's possible that this happened
-            because something took a very long time(for example a page load was slow).
-            If so, setting the Poltergeist :timeout option to a higher value will help
-            (see the docs for details). If increasing the timeout does not help, this is
-            probably a bug in Poltergeist - please report it to the issue tracker.";
-    parent::__construct($errorMessage);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Request.php b/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Request.php
deleted file mode 100644
index e6f9893..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Request.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Zumba\GastonJS\NetworkTraffic;
-
-/**
- * Class Request
- * @package Zumba\GastonJS\NetworkTraffic
- */
-class Request {
-  /** @var array */
-  protected $data;
-  /** @var array */
-  protected $responseParts;
-
-
-  /**
-   * @param array $data
-   * @param array $responseParts
-   */
-  public function __construct($data, $responseParts = null) {
-    $this->data = $data;
-    $this->responseParts = $this->createResponseParts($responseParts);
-  }
-
-  /**
-   * Creates an array of Response objects from a given response array
-   * @param $responseParts
-   * @return array
-   */
-  protected function createResponseParts($responseParts) {
-    if ($responseParts === null) {
-      return array();
-    }
-    $responses = array();
-    foreach ($responseParts as $responsePart) {
-      $responses[] = new Response($responsePart);
-    }
-    return $responses;
-  }
-
-  /**
-   * @return array
-   */
-  public function getResponseParts() {
-    return $this->responseParts;
-  }
-
-  /**
-   * @param array $responseParts
-   */
-  public function setResponseParts($responseParts) {
-    $this->responseParts = $responseParts;
-  }
-
-  /**
-   * Returns the url where the request is going to be made
-   * @return string
-   */
-  public function getUrl() {
-    //TODO: add isset maybe?
-    return $this->data['url'];
-  }
-
-  /**
-   * Returns the request method
-   * @return string
-   */
-  public function getMethod() {
-    return $this->data['method'];
-  }
-
-  /**
-   * Gets the request headers
-   * @return array
-   */
-  public function getHeaders() {
-    //TODO: Check if the data is actually an array, else make it array and see implications
-    return $this->data['headers'];
-  }
-
-  /**
-   * Returns if exists the request time
-   * @return \DateTime
-   */
-  public function getTime() {
-    if (isset($this->data['time'])) {
-      $requestTime = new \DateTime();
-      //TODO: fix the microseconds to miliseconds
-      $requestTime->createFromFormat("Y-m-dTH:i:s.uZ", $this->data["time"]);
-      return $requestTime;
-    }
-    return null;
-  }
-
-}
diff --git a/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Response.php b/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Response.php
deleted file mode 100644
index 37edc42..0000000
--- a/vendor/jcalderonzumba/gastonjs/src/NetworkTraffic/Response.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-namespace Zumba\GastonJS\NetworkTraffic;
-
-/**
- * Class Response
- * @package Zumba\GastonJS\NetworkTraffic
- */
-class Response {
-  /** @var  array */
-  protected $data;
-
-  /**
-   * @param $data
-   */
-  public function __construct($data) {
-    $this->data = $data;
-  }
-
-  /**
-   * Gets Response url
-   * @return string
-   */
-  public function getUrl() {
-    return $this->data['url'];
-  }
-
-  /**
-   * Gets the response status code
-   * @return int
-   */
-  public function getStatus() {
-    return intval($this->data['status']);
-  }
-
-  /**
-   * Gets the status text of the response
-   * @return string
-   */
-  public function getStatusText() {
-    return $this->data['statusText'];
-  }
-
-  /**
-   * Gets the response headers
-   * @return array
-   */
-  public function getHeaders() {
-    return $this->data['headers'];
-  }
-
-  /**
-   * Get redirect url if response is a redirect
-   * @return string
-   */
-  public function getRedirectUrl() {
-    if (isset($this->data['redirectUrl']) && !empty($this->data['redirectUrl'])) {
-      return $this->data['redirectUrl'];
-    }
-    return null;
-  }
-
-  /**
-   * Returns the size of the response body
-   * @return int
-   */
-  public function getBodySize() {
-    if (isset($this->data['bodySize'])) {
-      return intval($this->data['bodySize']);
-    }
-    return 0;
-  }
-
-  /**
-   * Returns the content type of the response
-   * @return string
-   */
-  public function getContentType() {
-    if (isset($this->data['contentType'])) {
-      return $this->data['contentType'];
-    }
-    return null;
-  }
-
-  /**
-   * Returns if exists the response time
-   * @return \DateTime
-   */
-  public function getTime() {
-    if (isset($this->data['time'])) {
-      $requestTime = new \DateTime();
-      //TODO: fix the microseconds to miliseconds
-      $requestTime->createFromFormat("Y-m-dTH:i:s.uZ", $this->data["time"]);
-      return $requestTime;
-    }
-    return null;
-  }
-}
diff --git a/vendor/jcalderonzumba/gastonjs/unit_tests.xml b/vendor/jcalderonzumba/gastonjs/unit_tests.xml
deleted file mode 100644
index 5473787..0000000
--- a/vendor/jcalderonzumba/gastonjs/unit_tests.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/unit/bootstrap.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="true"
-         syntaxCheck="false">
-    <testsuites>
-        <testsuite>
-            <directory>tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix="Trait.php">src/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore b/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore
deleted file mode 100644
index 7df1a0b..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.idea/*
-vendor/*
-bin/behat
-bin/phantomjs
-bin/phpunit
-composer.lock
-tmp/*
-tests/integration/ScreenShotContext.php
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/.travis.yml b/vendor/jcalderonzumba/mink-phantomjs-driver/.travis.yml
deleted file mode 100644
index 0dd8e58..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/.travis.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-matrix:
-  fast_finish: true
-  include:
-    - php: 5.4
-      env: COMPOSER_FLAGS='--prefer-lowest --prefer-stable' SYMFONY_DEPRECATIONS_HELPER=weak
-    - php: 5.6
-      env: DEPENDENCIES=dev
-  allow_failures:
-    - php: 7.0
-    - php: hhvm
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-before_install:
-  - composer self-update
-  - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-
-install:
-  - composer update $COMPOSER_FLAGS
-
-before_script:
-  - mkdir -p /tmp/jcalderonzumba/phantomjs
-
-script:
-  - bin/run-tests.sh
-
-after_script:
-  - ps axo pid,command | grep phantomjs | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
-  - ps axo pid,command | grep php | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/CHANGELOG-0.2.md b/vendor/jcalderonzumba/mink-phantomjs-driver/CHANGELOG-0.2.md
deleted file mode 100644
index e7482b2..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/CHANGELOG-0.2.md
+++ /dev/null
@@ -1,7 +0,0 @@
-CHANGELOG for 0.2.x
-===================
-This changelog references the relevant changes (bug and security fixes) done in 0.2 minor versions.
-
-* 0.2.3
-
-  * bug #1 set_url_blacklist was not working properly (thanks to reporter)
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/LICENSE b/vendor/jcalderonzumba/mink-phantomjs-driver/LICENSE
deleted file mode 100644
index 7ba018a..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Juan Francisco Calderón Zumba
-
-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/vendor/jcalderonzumba/mink-phantomjs-driver/README.md b/vendor/jcalderonzumba/mink-phantomjs-driver/README.md
deleted file mode 100644
index 54a433b..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Mink PhantomJS Driver
-===========================
-[![Build Status](https://travis-ci.org/jcalderonzumba/MinkPhantomJSDriver.svg?branch=master)](https://travis-ci.org/jcalderonzumba/MinkPhantomJSDriver)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jcalderonzumba/MinkPhantomJSDriver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jcalderonzumba/MinkPhantomJSDriver/?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/jcalderonzumba/mink-phantomjs-driver/v/stable)](https://packagist.org/packages/jcalderonzumba/mink-phantomjs-driver)
-[![Total Downloads](https://poser.pugx.org/jcalderonzumba/mink-phantomjs-driver/downloads)](https://packagist.org/packages/jcalderonzumba/mink-phantomjs-driver)
-
-Installation & Compatibility
-----------------------------
-You need a working installation of [PhantomJS](http://phantomjs.org/download.html)
-
-This driver is tested using PhantomJS 1.9.8 but it should work with 1.9.X or latest 2.0.X versions
-
-This driver supports **PHP 5.4 or greater**, there is NO support for PHP 5.3
-
-Use [Composer](https://getcomposer.org/) to install all required PHP dependencies:
-
-```bash
-$ composer require --dev behat/mink jcalderonzumba/mink-phantomjs-driver
-```
-
-How to use
--------------
-Extension configuration (for the moment NONE).
-```yml
-default:
-  extensions:
-    Zumba\PhantomJSExtension:
-```
-Driver specific configuration:
-```yml
-Behat\MinkExtension:
-phantomjs:
-    phantom_server: "http://localhost:8510/api"
-    template_cache: "/tmp/pjsdrivercache/phantomjs"
-```
-PhantomJS browser start:
-```bash
-phantomjs --ssl-protocol=any --ignore-ssl-errors=true vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768 2>&1 >> /tmp/gastonjs.log &
-```
-
-FAQ
----------
-
-1. Is this a selenium based driver?:
-
-  **NO**, it has nothing to do with Selenium it's inspired on [Poltergeist](https://github.com/teampoltergeist/poltergeist)
-
-2. What features does this driver implements?
-  
-  **ALL** of the features defined in Mink DriverInterface. maximizeWindow is the only one not implemented since is a headless browser it does not make sense to implement it.
-
-3. Do i need to modify my selenium based tests?
-
-  If you only use the standard behat driver defined methods then NO, you just have to change your default javascript driver.
-  
-
-Copyright
----------
-
-Copyright (c) 2015 Juan Francisco Calderon Zumba <juanfcz@gmail.com>
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/bin/run-tests.sh b/vendor/jcalderonzumba/mink-phantomjs-driver/bin/run-tests.sh
deleted file mode 100755
index 60bd219..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/bin/run-tests.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e
-
-start_browser_api(){
-  CURRENT_DIR=$(pwd)
-  LOCAL_PHANTOMJS="${CURRENT_DIR}/bin/phantomjs"
-  if [ -f ${LOCAL_PHANTOMJS} ]; then
-    ${LOCAL_PHANTOMJS} --ssl-protocol=any --ignore-ssl-errors=true vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768 2>&1 &
-  else
-    phantomjs --ssl-protocol=any --ignore-ssl-errors=true vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768 2>&1 >> /dev/null &
-  fi
-  sleep 2
-}
-
-stop_services(){
-  ps axo pid,command | grep phantomjs | grep -v grep | awk '{print $1}' | xargs -I {} kill {}
-  ps axo pid,command | grep php | grep -v grep | grep -v phpstorm | awk '{print $1}' | xargs -I {} kill {}
-  sleep 2
-}
-
-star_local_browser(){
-  CURRENT_DIR=$(pwd)
-  cd ${CURRENT_DIR}/vendor/behat/mink/driver-testsuite/web-fixtures
-  if [ "$TRAVIS" = true ]; then
-    echo "Starting webserver fox fixtures...."
-    ~/.phpenv/versions/5.6/bin/php -S 127.0.0.1:6789 > /dev/null 2>&1 &
-  else
-    php -S 127.0.0.1:6789 2>&1 >> /dev/null &
-  fi
-  sleep 2
-}
-
-mkdir -p /tmp/jcalderonzumba/phantomjs
-stop_services
-start_browser_api
-star_local_browser
-cd ${CURRENT_DIR}
-${CURRENT_DIR}/bin/phpunit --configuration integration_tests.xml
-stop_services
-start_browser_api
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json b/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json
deleted file mode 100644
index e5cbde8..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "jcalderonzumba/mink-phantomjs-driver",
-  "description": "PhantomJS driver for Mink framework",
-  "keywords": [
-    "phantomjs",
-    "headless",
-    "javascript",
-    "ajax",
-    "testing",
-    "browser"
-  ],
-  "homepage": "http://mink.behat.org/",
-  "type": "mink-driver",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Juan Francisco Calderón Zumba",
-      "email": "juanfcz@gmail.com",
-      "homepage": "http://github.com/jcalderonzumba"
-    }
-  ],
-  "require": {
-    "php": ">=5.4",
-    "behat/mink": "~1.6",
-    "twig/twig": "~1.20|~2.0",
-    "jcalderonzumba/gastonjs": "~1.0"
-  },
-  "require-dev": {
-    "symfony/process": "~2.3",
-    "symfony/phpunit-bridge": "~2.7",
-    "symfony/css-selector": "~2.1",
-    "phpunit/phpunit": "~4.6",
-    "silex/silex": "~1.2"
-  },
-  "config": {
-    "bin-dir": "bin"
-  },
-  "autoload": {
-    "psr-4": {
-      "Zumba\\Mink\\Driver\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "Behat\\Mink\\Tests\\Driver\\": "tests/integration"
-    }
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "0.4.x-dev"
-    }
-  }
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/integration_tests.xml b/vendor/jcalderonzumba/mink-phantomjs-driver/integration_tests.xml
deleted file mode 100644
index 739fc36..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/integration_tests.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit colors="true" bootstrap="./tests/integration/bootstrap.php" stopOnFailure="true">
-    <testsuites>
-        <testsuite name="PhantomJS Driver test suite">
-            <directory>tests/integration</directory>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/BasicAuthTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/ContentTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/CookieTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/ErrorHandlingTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/IFrameTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/ScreenshotTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/TraversingTest.php</file>
-            <file>vendor/behat/mink/driver-testsuite/tests/Basic/VisibilityTest.php</file>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Form</directory>
-            <directory>vendor/behat/mink/driver-testsuite/tests/Js</directory>
-            <!-- The following have been disabled and their respective equals added to Custom driver tests -->
-            <!--<directory>vendor/behat/mink/driver-testsuite/tests/Css</directory>-->
-            <!--<file>vendor/behat/mink/driver-testsuite/tests/Basic/StatusCodeTest.php</file>-->
-            <!--<file>vendor/behat/mink/driver-testsuite/tests/Basic/HeaderTest.php</file>-->
-            <!--<file>vendor/behat/mink/driver-testsuite/tests/Basic/NavigationTest.php</file>-->
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <var name="driver_config_factory" value="Behat\Mink\Tests\Driver\PhantomJSConfig::getInstance"/>
-        <server name="WEB_FIXTURES_HOST" value="http://127.0.0.1:6789"/>
-        <!-- where driver will connect to -->
-        <server name="DRIVER_URL" value="http://127.0.0.1:8510/"/>
-        <server name="TEMPLATE_CACHE_DIR" value="/tmp/jcalderonzumba/phantomjs"/>
-    </php>
-
-    <filter>
-        <whitelist>
-            <directory>./src/Behat/Mink/Driver</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/BasePhantomJSDriver.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/BasePhantomJSDriver.php
deleted file mode 100644
index d962ff5..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/BasePhantomJSDriver.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Driver\CoreDriver;
-use Behat\Mink\Exception\DriverException;
-use Behat\Mink\Session;
-use Zumba\GastonJS\Browser\Browser;
-
-/**
- * Class BasePhantomJSDriver
- * @package Zumba\Mink\Driver
- */
-class BasePhantomJSDriver extends CoreDriver {
-
-  /** @var  Session */
-  protected $session;
-  /** @var  Browser */
-  protected $browser;
-  /** @var  string */
-  protected $phantomHost;
-  /** @var  \Twig_Loader_Filesystem */
-  protected $templateLoader;
-  /** @var  \Twig_Environment */
-  protected $templateEnv;
-
-  /**
-   * Instantiates the driver
-   * @param string $phantomHost browser "api" oriented host
-   * @param string $templateCache where we are going to store the templates cache
-   */
-  public function __construct($phantomHost, $templateCache = null) {
-    $this->phantomHost = $phantomHost;
-    $this->browser = new Browser($phantomHost);
-    $this->templateLoader = new \Twig_Loader_Filesystem(realpath(__DIR__ . '/Resources/Script'));
-    $this->templateEnv = new \Twig_Environment($this->templateLoader, array('cache' => $this->templateCacheSetup($templateCache), 'strict_variables' => true));
-  }
-
-  /**
-   * Sets up the cache template location for the scripts we are going to create with the driver
-   * @param $templateCache
-   * @return string
-   * @throws DriverException
-   */
-  protected function templateCacheSetup($templateCache) {
-    $cacheDir = $templateCache;
-    if ($templateCache === null) {
-      $cacheDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . "jcalderonzumba" . DIRECTORY_SEPARATOR . "phantomjs";
-      if (!file_exists($cacheDir)) {
-        mkdir($cacheDir, 0777, true);
-      }
-    }
-
-    if (!file_exists($cacheDir)) {
-      throw new DriverException("Template cache $cacheDir directory does not exist");
-    }
-    return $cacheDir;
-  }
-
-  /**
-   * Helper to find a node element given an xpath
-   * @param string $xpath
-   * @param int    $max
-   * @returns int
-   * @throws DriverException
-   */
-  protected function findElement($xpath, $max = 1) {
-    $elements = $this->browser->find("xpath", $xpath);
-    if (!isset($elements["page_id"]) || !isset($elements["ids"]) || count($elements["ids"]) !== $max) {
-      throw new DriverException("Failed to get elements with given $xpath");
-    }
-    return $elements;
-  }
-
-  /**
-   * {@inheritdoc}
-   * @param Session $session
-   */
-  public function setSession(Session $session) {
-    $this->session = $session;
-  }
-
-  /**
-   * @return Browser
-   */
-  public function getBrowser() {
-    return $this->browser;
-  }
-
-  /**
-   * @return \Twig_Environment
-   */
-  public function getTemplateEnv() {
-    return $this->templateEnv;
-  }
-
-  /**
-   * Returns a javascript script via twig template engine
-   * @param $templateName
-   * @param $viewData
-   * @return string
-   */
-  public function javascriptTemplateRender($templateName, $viewData) {
-    /** @var $templateEngine \Twig_Environment */
-    $templateEngine = $this->getTemplateEnv();
-    return $templateEngine->render($templateName, $viewData);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/CookieTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/CookieTrait.php
deleted file mode 100644
index 327b948..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/CookieTrait.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Zumba\GastonJS\Cookie;
-
-/**
- * Trait CookieTrait
- * @package Zumba\Mink\Driver
- */
-trait CookieTrait {
-
-  /**
-   * Sets a cookie on the browser, if null value then delete it
-   * @param string $name
-   * @param string $value
-   */
-  public function setCookie($name, $value = null) {
-    if ($value === null) {
-      $this->browser->removeCookie($name);
-    }
-    //TODO: set the cookie with domain, not with url, meaning www.aaa.com or .aaa.com
-    if ($value !== null) {
-      $urlData = parse_url($this->getCurrentUrl());
-      $cookie = array("name" => $name, "value" => $value, "domain" => $urlData["host"]);
-      $this->browser->setCookie($cookie);
-    }
-  }
-
-  /**
-   * Gets a cookie by its name if exists, else it will return null
-   * @param string $name
-   * @return string
-   */
-  public function getCookie($name) {
-    $cookies = $this->browser->cookies();
-    foreach ($cookies as $cookie) {
-      if ($cookie instanceof Cookie && strcmp($cookie->getName(), $name) === 0) {
-        return $cookie->getValue();
-      }
-    }
-    return null;
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/FormManipulationTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/FormManipulationTrait.php
deleted file mode 100644
index 5a94fc7..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/FormManipulationTrait.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Trait FormManipulationTrait
- * @package Zumba\Mink\Driver
- */
-trait FormManipulationTrait {
-
-
-  /**
-   * Returns the value of a given xpath element
-   * @param string $xpath
-   * @return string
-   * @throws DriverException
-   */
-  public function getValue($xpath) {
-    $this->findElement($xpath, 1);
-    $javascript = $this->javascriptTemplateRender("get_value.js.twig", array("xpath" => $xpath));
-    return $this->browser->evaluate($javascript);
-  }
-
-  /**
-   * @param string $xpath
-   * @param string $value
-   * @throws DriverException
-   */
-  public function setValue($xpath, $value) {
-    $this->findElement($xpath, 1);
-    //This stuff is BECAUSE the way the driver works for setting values when being checkboxes, radios, etc.
-    if (is_bool($value)) {
-      $value = $this->boolToString($value);
-    }
-
-    $javascript = $this->javascriptTemplateRender("set_value.js.twig", array("xpath" => $xpath, "value" => json_encode($value)));
-    $this->browser->evaluate($javascript);
-  }
-
-
-  /**
-   * Submits a form given an xpath selector
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function submitForm($xpath) {
-    $element = $this->findElement($xpath, 1);
-    $tagName = $this->browser->tagName($element["page_id"], $element["ids"][0]);
-    if (strcmp(strtolower($tagName), "form") !== 0) {
-      throw new DriverException("Can not submit something that is not a form");
-    }
-    $this->browser->trigger($element["page_id"], $element["ids"][0], "submit");
-  }
-
-  /**
-   * Helper method needed for twig and javascript stuff
-   * @param $boolValue
-   * @return string
-   */
-  protected function boolToString($boolValue) {
-    if ($boolValue === true) {
-      return "1";
-    }
-    return "0";
-  }
-
-  /**
-   * Selects an option
-   * @param string $xpath
-   * @param string $value
-   * @param bool   $multiple
-   * @return bool
-   * @throws DriverException
-   */
-  public function selectOption($xpath, $value, $multiple = false) {
-    $element = $this->findElement($xpath, 1);
-    $tagName = strtolower($this->browser->tagName($element["page_id"], $element["ids"][0]));
-    $attributes = $this->browser->attributes($element["page_id"], $element["ids"][0]);
-
-    if (!in_array($tagName, array("input", "select"))) {
-      throw new DriverException(sprintf('Impossible to select an option on the element with XPath "%s" as it is not a select or radio input', $xpath));
-    }
-
-    if ($tagName === "input" && $attributes["type"] != "radio") {
-      throw new DriverException(sprintf('Impossible to select an option on the element with XPath "%s" as it is not a select or radio input', $xpath));
-    }
-
-    return $this->browser->selectOption($element["page_id"], $element["ids"][0], $value, $multiple);
-  }
-
-  /**
-   * Check control over an input element of radio or checkbox type
-   * @param $xpath
-   * @return bool
-   * @throws DriverException
-   */
-  protected function inputCheckableControl($xpath) {
-    $element = $this->findElement($xpath, 1);
-    $tagName = strtolower($this->browser->tagName($element["page_id"], $element["ids"][0]));
-    $attributes = $this->browser->attributes($element["page_id"], $element["ids"][0]);
-    if ($tagName != "input") {
-      throw new DriverException("Can not check when the element is not of the input type");
-    }
-    if (!in_array($attributes["type"], array("checkbox", "radio"))) {
-      throw new DriverException("Can not check when the element is not checkbox or radio");
-    }
-    return true;
-  }
-
-  /**
-   * We click on the checkbox or radio when possible and needed
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function check($xpath) {
-    $this->inputCheckableControl($xpath);
-    $javascript = $this->javascriptTemplateRender("check_element.js.twig", array("xpath" => $xpath, "check" => "true"));
-    $this->browser->evaluate($javascript);
-  }
-
-  /**
-   * We click on the checkbox or radio when possible and needed
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function uncheck($xpath) {
-    $this->inputCheckableControl($xpath);
-    $javascript = $this->javascriptTemplateRender("check_element.js.twig", array("xpath" => $xpath, "check" => "false"));
-    $this->browser->evaluate($javascript);
-  }
-
-  /**
-   * Checks if the radio or checkbox is checked
-   * @param string $xpath
-   * @return bool
-   * @throws DriverException
-   */
-  public function isChecked($xpath) {
-    $this->findElement($xpath, 1);
-    $javascript = $this->javascriptTemplateRender("is_checked.js.twig", array("xpath" => $xpath));
-    $checked = $this->browser->evaluate($javascript);
-
-    if ($checked === null) {
-      throw new DriverException("Can not check when the element is not checkbox or radio");
-    }
-
-    return $checked;
-  }
-
-  /**
-   * Checks if the option is selected or not
-   * @param string $xpath
-   * @return bool
-   * @throws DriverException
-   */
-  public function isSelected($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    $javascript = $this->javascriptTemplateRender("is_selected.js.twig", array("xpath" => $xpath));
-    $tagName = $this->browser->tagName($elements["page_id"], $elements["ids"][0]);
-    if (strcmp(strtolower($tagName), "option") !== 0) {
-      throw new DriverException("Can not assert on element that is not an option");
-    }
-
-    return $this->browser->evaluate($javascript);
-  }
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/HeadersTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/HeadersTrait.php
deleted file mode 100644
index 1d6865a..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/HeadersTrait.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-/**
- * Class HeadersTrait
- * @package Zumba\Mink\Driver
- */
-trait HeadersTrait {
-
-  /**
-   * Gets the current request response headers
-   * Should be called only after a request, other calls are undefined behaviour
-   * @return array
-   */
-  public function getResponseHeaders() {
-    return $this->browser->responseHeaders();
-  }
-
-  /**
-   * Current request status code response
-   * @return int
-   */
-  public function getStatusCode() {
-    return $this->browser->getStatusCode();
-  }
-
-  /**
-   * The name say its all
-   * @param string $name
-   * @param string $value
-   */
-  public function setRequestHeader($name, $value) {
-    $header = array();
-    $header[$name] = $value;
-    //TODO: as a limitation of the driver it self, we will send permanent for the moment
-    $this->browser->addHeader($header, true);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/JavascriptTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/JavascriptTrait.php
deleted file mode 100644
index c5b7d63..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/JavascriptTrait.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class JavascriptTrait
- * @package Zumba\Mink\Driver
- */
-trait JavascriptTrait {
-
-  /**
-   * Executes a script on the browser
-   * @param string $script
-   */
-  public function executeScript($script) {
-    $this->browser->execute($script);
-  }
-
-  /**
-   * Evaluates a script and returns the result
-   * @param string $script
-   * @return mixed
-   */
-  public function evaluateScript($script) {
-    return $this->browser->evaluate($script);
-  }
-
-  /**
-   * Waits some time or until JS condition turns true.
-   *
-   * @param integer $timeout timeout in milliseconds
-   * @param string  $condition JS condition
-   * @return boolean
-   * @throws DriverException                  When the operation cannot be done
-   */
-  public function wait($timeout, $condition) {
-    $start = microtime(true);
-    $end = $start + $timeout / 1000.0;
-    do {
-      $result = $this->browser->evaluate($condition);
-      usleep(100000);
-    } while (microtime(true) < $end && !$result);
-
-    return (bool)$result;
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/KeyboardTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/KeyboardTrait.php
deleted file mode 100644
index 2b0c96d..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/KeyboardTrait.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class KeyboardTrait
- * @package Zumba\Mink\Driver
- */
-trait KeyboardTrait {
-
-  /**
-   * Does some normalization for the char we want to do keyboard events with.
-   * @param $char
-   * @throws DriverException
-   * @return string
-   */
-  protected function normalizeCharForKeyEvent($char) {
-    if (!is_int($char) && !is_string($char)) {
-      throw new DriverException("Unsupported key type, can only be integer or string");
-    }
-
-    if (is_string($char) && strlen($char) !== 1) {
-      throw new DriverException("Key can only have ONE character");
-    }
-
-    $key = $char;
-    if (is_int($char)) {
-      $key = chr($char);
-    }
-    return $key;
-  }
-
-  /**
-   * Does some control and normalization for the key event modifier
-   * @param $modifier
-   * @return string
-   * @throws DriverException
-   */
-  protected function keyEventModifierControl($modifier) {
-    if ($modifier === null) {
-      $modifier = "none";
-    }
-
-    if (!in_array($modifier, array("none", "alt", "ctrl", "shift", "meta"))) {
-      throw new DriverException("Unsupported key modifier $modifier");
-    }
-    return $modifier;
-  }
-
-  /**
-   * Send a key-down event to the browser element
-   * @param        $xpath
-   * @param        $char
-   * @param string $modifier
-   * @throws DriverException
-   */
-  public function keyDown($xpath, $char, $modifier = null) {
-    $element = $this->findElement($xpath, 1);
-    $key = $this->normalizeCharForKeyEvent($char);
-    $modifier = $this->keyEventModifierControl($modifier);
-    return $this->browser->keyEvent($element["page_id"], $element["ids"][0], "keydown", $key, $modifier);
-  }
-
-  /**
-   * @param string $xpath
-   * @param string $char
-   * @param string $modifier
-   * @throws DriverException
-   */
-  public function keyPress($xpath, $char, $modifier = null) {
-    $element = $this->findElement($xpath, 1);
-    $key = $this->normalizeCharForKeyEvent($char);
-    $modifier = $this->keyEventModifierControl($modifier);
-    return $this->browser->keyEvent($element["page_id"], $element["ids"][0], "keypress", $key, $modifier);
-  }
-
-  /**
-   * Pressed up specific keyboard key.
-   *
-   * @param string         $xpath
-   * @param string|integer $char could be either char ('b') or char-code (98)
-   * @param string         $modifier keyboard modifier (could be 'ctrl', 'alt', 'shift' or 'meta')
-   *
-   * @throws DriverException                  When the operation cannot be done
-   */
-  public function keyUp($xpath, $char, $modifier = null) {
-    $this->findElement($xpath, 1);
-    $element = $this->findElement($xpath, 1);
-    $key = $this->normalizeCharForKeyEvent($char);
-    $modifier = $this->keyEventModifierControl($modifier);
-    return $this->browser->keyEvent($element["page_id"], $element["ids"][0], "keyup", $key, $modifier);
-  }
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/MouseTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/MouseTrait.php
deleted file mode 100644
index c7cd2eb..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/MouseTrait.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class MouseTrait
- * @package Zumba\Mink\Driver
- */
-trait MouseTrait {
-
-  /**
-   * Generates a mouseover event on the given element by xpath
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function mouseOver($xpath) {
-    $element = $this->findElement($xpath, 1);
-    $this->browser->hover($element["page_id"], $element["ids"][0]);
-  }
-
-  /**
-   * Clicks if possible on an element given by xpath
-   * @param string $xpath
-   * @return mixed
-   * @throws DriverException
-   */
-  public function click($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    $this->browser->click($elements["page_id"], $elements["ids"][0]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  /**
-   * Double click on element found via xpath
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function doubleClick($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    $this->browser->doubleClick($elements["page_id"], $elements["ids"][0]);
-  }
-
-  /**
-   * Right click on element found via xpath
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function rightClick($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    $this->browser->rightClick($elements["page_id"], $elements["ids"][0]);
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/NavigationTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/NavigationTrait.php
deleted file mode 100644
index 88ca429..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/NavigationTrait.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-/**
- * Trait NavigationTrait
- * @package Zumba\Mink\Driver
- */
-trait NavigationTrait {
-  /**
-   * Visits a given url
-   * @param string $url
-   */
-  public function visit($url) {
-    $this->browser->visit($url);
-  }
-
-  /**
-   * Gets the current url if any
-   * @return string
-   */
-  public function getCurrentUrl() {
-    return $this->browser->currentUrl();
-  }
-
-
-  /**
-   * Reloads the page if possible
-   */
-  public function reload() {
-    $this->browser->reload();
-  }
-
-  /**
-   * Goes forward if possible
-   */
-  public function forward() {
-    $this->browser->goForward();
-  }
-
-  /**
-   * Goes back if possible
-   */
-  public function back() {
-    $this->browser->goBack();
-  }
-
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/PageContentTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/PageContentTrait.php
deleted file mode 100644
index 7759a0f..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/PageContentTrait.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class PageContentTrait
- * @package Zumba\Mink\Driver
- */
-trait PageContentTrait {
-
-  /**
-   * @return string
-   */
-  public function getContent() {
-    return $this->browser->getBody();
-  }
-
-  /**
-   * Given xpath, will try to get ALL the text, visible and not visible from such xpath
-   * @param string $xpath
-   * @return string
-   * @throws DriverException
-   */
-  public function getText($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    //allText works only with ONE element so it will be the first one and also returns new lines that we will remove
-    $text = $this->browser->allText($elements["page_id"], $elements["ids"][0]);
-    $text = trim(str_replace(array("\r", "\r\n", "\n"), ' ', $text));
-    $text = preg_replace('/ {2,}/', ' ', $text);
-    return $text;
-  }
-
-  /**
-   * Returns the inner html of a given xpath
-   * @param string $xpath
-   * @return string
-   * @throws DriverException
-   */
-  public function getHtml($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    //allText works only with ONE element so it will be the first one
-    return $this->browser->allHtml($elements["page_id"], $elements["ids"][0], "inner");
-  }
-
-  /**
-   * Gets the outer html of a given xpath
-   * @param string $xpath
-   * @return string
-   * @throws DriverException
-   */
-  public function getOuterHtml($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    //allText works only with ONE element so it will be the first one
-    return $this->browser->allHtml($elements["page_id"], $elements["ids"][0], "outer");
-  }
-
-  /**
-   * Returns the binary representation of the current page we are in
-   * @throws DriverException
-   * @return string
-   */
-  public function getScreenshot() {
-    $options = array("full" => true, "selector" => null);
-    $b64ScreenShot = $this->browser->renderBase64("JPEG", $options);
-    if (($binaryScreenShot = base64_decode($b64ScreenShot, true)) === false) {
-      throw new DriverException("There was a problem while doing the screenshot of the current page");
-    }
-    return $binaryScreenShot;
-  }
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/PhantomJSDriver.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/PhantomJSDriver.php
deleted file mode 100644
index ac25170..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/PhantomJSDriver.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Element\NodeElement;
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class PhantomJSDriver
- * @package Behat\Mink\Driver
- */
-class PhantomJSDriver extends BasePhantomJSDriver {
-
-  use SessionTrait;
-  use NavigationTrait;
-  use CookieTrait;
-  use HeadersTrait;
-  use JavascriptTrait;
-  use MouseTrait;
-  use PageContentTrait;
-  use KeyboardTrait;
-  use FormManipulationTrait;
-  use WindowTrait;
-
-  /**
-   * Sets the basic auth user and password
-   * @param string $user
-   * @param string $password
-   */
-  public function setBasicAuth($user, $password) {
-    $this->browser->setHttpAuth($user, $password);
-  }
-
-  /**
-   * Gets the tag name of a given xpath
-   * @param string $xpath
-   * @return string
-   * @throws DriverException
-   */
-  public function getTagName($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    return $this->browser->tagName($elements["page_id"], $elements["ids"][0]);
-  }
-
-  /**
-   * Gets the attribute value of a given element and name
-   * @param string $xpath
-   * @param string $name
-   * @return string
-   * @throws DriverException
-   */
-  public function getAttribute($xpath, $name) {
-    $elements = $this->findElement($xpath, 1);
-    return $this->browser->attribute($elements["page_id"], $elements["ids"][0], $name);
-  }
-
-  /**
-   * Check if element given by xpath is visible or not
-   * @param string $xpath
-   * @return bool
-   * @throws DriverException
-   */
-  public function isVisible($xpath) {
-    $elements = $this->findElement($xpath, 1);
-    return $this->browser->isVisible($elements["page_id"], $elements["ids"][0]);
-  }
-
-  /**
-   * Drags one element to another
-   * @param string $sourceXpath
-   * @param string $destinationXpath
-   * @throws DriverException
-   */
-  public function dragTo($sourceXpath, $destinationXpath) {
-    $sourceElement = $this->findElement($sourceXpath, 1);
-    $destinationElement = $this->findElement($destinationXpath, 1);
-    $this->browser->drag($sourceElement["page_id"], $sourceElement["ids"][0], $destinationElement["ids"][0]);
-  }
-
-  /**
-   * Upload a file to the browser
-   * @param string $xpath
-   * @param string $path
-   * @throws DriverException
-   */
-  public function attachFile($xpath, $path) {
-    if (!file_exists($path)) {
-      throw new DriverException("Wow there the file does not exist, you can not upload it");
-    }
-
-    if (($realPath = realpath($path)) === false) {
-      throw new DriverException("Wow there the file does not exist, you can not upload it");
-    }
-
-    $element = $this->findElement($xpath, 1);
-    $tagName = $this->getTagName($xpath);
-    if ($tagName != "input") {
-      throw new DriverException("The element is not an input element, you can not attach a file to it");
-    }
-
-    $attributes = $this->getBrowser()->attributes($element["page_id"], $element["ids"][0]);
-    if (!isset($attributes["type"]) || $attributes["type"] != "file") {
-      throw new DriverException("The element is not an input file type element, you can not attach a file to it");
-    }
-
-    $this->browser->selectFile($element["page_id"], $element["ids"][0], $realPath);
-  }
-
-  /**
-   * Puts the browser control inside the IFRAME
-   * You own the control, make sure to go back to the parent calling this method with null
-   * @param string $name
-   */
-  public function switchToIFrame($name = null) {
-    //TODO: check response of the calls
-    if ($name === null) {
-      $this->browser->popFrame();
-      return;
-    } else {
-      $this->browser->pushFrame($name);
-    }
-  }
-
-  /**
-   * Focus on an element
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function focus($xpath) {
-    $element = $this->findElement($xpath, 1);
-    $this->browser->trigger($element["page_id"], $element["ids"][0], "focus");
-  }
-
-  /**
-   * Blur on element
-   * @param string $xpath
-   * @throws DriverException
-   */
-  public function blur($xpath) {
-    $element = $this->findElement($xpath, 1);
-    $this->browser->trigger($element["page_id"], $element["ids"][0], "blur");
-  }
-
-  /**
-   * Finds elements with specified XPath query.
-   * @param string $xpath
-   * @return NodeElement[]
-   * @throws DriverException                  When the operation cannot be done
-   */
-  public function find($xpath) {
-    $elements = $this->browser->find("xpath", $xpath);
-    $nodeElements = array();
-
-    if (!isset($elements["ids"])) {
-      return null;
-    }
-
-    foreach ($elements["ids"] as $i => $elementId) {
-      $nodeElements[] = new NodeElement(sprintf('(%s)[%d]', $xpath, $i + 1), $this->session);
-    }
-    return $nodeElements;
-  }
-
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/check_element.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/check_element.js.twig
deleted file mode 100644
index f3372ba..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/check_element.js.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% autoescape 'js' %}
-(function (xpath, check) {
-  function getPolterNode(xpath) {
-    var polterAgent = window.__poltergeist;
-    var ids = polterAgent.find("xpath", xpath, document);
-    return polterAgent.get(ids[0]);
-  }
-
-  var pNode = getPolterNode(xpath);
-
-  if (check && pNode.element.checked) {
-    //requested to check the element and is already check, do nothing.
-    return true;
-  }
-
-  if (!check && pNode.element.checked == false) {
-    //move along nothing to be done
-    return true;
-  }
-
-  if (check && pNode.element.checked == false) {
-    //we have to check the element, we will do so by triggering a click event so all change listeners are aware.
-    pNode.trigger("click");
-    pNode.element.checked = true;
-  }
-
-  if (!check && pNode.element.checked) {
-    //move along nothing to be done
-    pNode.trigger("click");
-    pNode.element.checked = false;
-    return true;
-  }
-  return false;
-}('{{xpath}}', {{check}}));
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/execute_script.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/execute_script.js.twig
deleted file mode 100644
index 791276c..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/execute_script.js.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% autoescape false %}
-  {{ script }};
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/get_value.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/get_value.js.twig
deleted file mode 100644
index 8e040f8..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/get_value.js.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% autoescape 'js' %}
-(function (xpath) {
-  function getElement(xpath) {
-    var polterAgent = window.__poltergeist;
-    var ids = polterAgent.find("xpath", xpath, document);
-    var polterNode = polterAgent.get(ids[0]);
-    return polterNode.element;
-  }
-
-  function inputRadioGetValue(element){
-    var value = null;
-    var name = element.getAttribute('name');
-    if (!name){
-      return null;
-    }
-    var fields = window.document.getElementsByName(name);
-    var i;
-    var l = fields.length;
-    for (i = 0; i < l; i++) {
-      var field = fields.item(i);
-      if (field.form === element.form && field.checked) {
-        return field.value;
-      }
-    }
-    return null;
-  }
-
-  var node = getElement(xpath);
-  var tagName = node.tagName.toLowerCase();
-  var value = null;
-  if (tagName == "input") {
-    var type = node.type.toLowerCase();
-    if (type == "checkbox") {
-      value = node.checked ? node.value : null;
-    } else if (type == "radio") {
-      value = inputRadioGetValue(node);
-    } else {
-      value = node.value;
-    }
-  } else if (tagName == "textarea") {
-    value = node.value;
-  } else if (tagName == "select") {
-    if (node.multiple) {
-      value = [];
-      for (var i = 0; i < node.options.length; i++) {
-        if (node.options[i].selected) {
-          value.push(node.options[i].value);
-        }
-      }
-    } else {
-      var idx = node.selectedIndex;
-      if (idx >= 0) {
-        value = node.options.item(idx).value;
-      } else {
-        value = null;
-      }
-    }
-  } else {
-    value = node.value;
-  }
-  return value;
-}('{{ xpath }}'));
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_checked.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_checked.js.twig
deleted file mode 100644
index 6b14cad..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_checked.js.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{% autoescape 'js' %}
-(function (xpath) {
-  function getElement(xpath, within) {
-    var result;
-    if (within === null || within === undefined) {
-      within = document;
-    }
-    result = document.evaluate(xpath, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    if (result.snapshotLength !== 1) {
-      return null;
-    }
-    return result.snapshotItem(0);
-  }
-
-  var node = getElement(xpath);
-
-  if (node === null) {
-    return null;
-  }
-
-  if(node.tagName.toLowerCase() != "input"){
-    return null;
-  }
-
-  if(node.type.toLowerCase() != "checkbox" && node.type.toLowerCase() != "radio"){
-    return null;
-  }
-
-  return node.checked;
-}('{{ xpath }}'));
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_selected.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_selected.js.twig
deleted file mode 100644
index a3a18d3..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/is_selected.js.twig
+++ /dev/null
@@ -1,16 +0,0 @@
-{% autoescape 'js' %}
-(function (xpath) {
-  function getElement(xpath) {
-    var polterAgent = window.__poltergeist;
-    var ids = polterAgent.find("xpath", xpath, document);
-    var polterNode = polterAgent.get(ids[0]);
-    return polterNode.element;
-  }
-
-  var node = getElement(xpath);
-  if(typeof node.selected == "undefined"){
-    return null;
-  }
-  return node.selected;
-}('{{xpath}}'));
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/set_value.js.twig b/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/set_value.js.twig
deleted file mode 100644
index 605aec3..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/Resources/Script/set_value.js.twig
+++ /dev/null
@@ -1,213 +0,0 @@
-{% autoescape 'js' %}
-(function (xpath, value) {
-  function getElement(xpath, within) {
-    var result;
-    if (within === null || within === undefined) {
-      within = document;
-    }
-    result = document.evaluate(xpath, within, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    if (result.snapshotLength !== 1) {
-      return null;
-    }
-    return result.snapshotItem(0);
-  }
-
-  function isInput(element) {
-    if (element === null || element === undefined) {
-      return false;
-    }
-    return (element.tagName.toLowerCase() == "input");
-  }
-
-  function isTextArea(element) {
-    if (element === null || element === undefined) {
-      return false;
-    }
-    return (element.tagName.toLowerCase() == "textarea");
-  }
-
-  function isSelect(element) {
-    if (element === null || element === undefined) {
-      return false;
-    }
-    return (element.tagName.toLowerCase() == "select");
-  }
-
-  function deselectAllOptions(element) {
-    var i, l = element.options.length;
-    for (i = 0; i < l; i++) {
-      element.options[i].selected = false;
-    }
-  }
-
-  function xpathStringLiteral(s) {
-    if (s.indexOf('"') === -1)
-      return '"' + s + '"';
-    if (s.indexOf("'") === -1)
-      return "'" + s + "'";
-    return 'concat("' + s.replace(/"/g, '",\'"\',"') + '")';
-  }
-
-  function clickOnElement(element) {
-    // create a mouse click event
-    var event = document.createEvent('MouseEvents');
-    event.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-
-    // send click to element
-    element.dispatchEvent(event);
-
-    //After dispatching the event let's wait for 2 seconds at least...
-    return setTimeout(function () {
-    }, 2);
-  }
-
-  function dispatchChange(element) {
-    var tagName =element.tagName.toLowerCase();
-    var elementType = element.getAttribute("type");
-    if (tagName != "option" || (tagName == "input" && elementType == "radio")){
-      return true;
-    }
-    //Force the change when element is option
-    var event;
-    event = document.createEvent('HTMLEvents');
-    event.initEvent('change', true, false);
-    element.dispatchEvent(event);
-    return true;
-  }
-
-  function selectOptionOnElement(element, option, multiple) {
-    var polterAgent = window.__poltergeist;
-    var escapedOption = xpathStringLiteral(option);
-    // The value of an option is the normalized version of its text when it has no value attribute
-    var optionQuery = ".//option[@value = " + escapedOption + " or (not(@value) and normalize-space(.) = " + escapedOption + ")]";
-    var ids = polterAgent.find("xpath", optionQuery, element);
-    var polterNode = polterAgent.get(ids[0]);
-    var optionElement = polterNode.element;
-
-    if (multiple || !element.multiple) {
-      if (!optionElement.selected) {
-        clickOnElement(optionElement);
-        optionElement.selected = true;
-      }
-      return dispatchChange(optionElement);
-    }
-
-    deselectAllOptions(element);
-    clickOnElement(optionElement);
-    optionElement.selected = true;
-    return dispatchChange(optionElement);
-  }
-
-  function selectSetValue(element, value) {
-    var option;
-    if ((Array.isArray && Array.isArray(value)) || (value instanceof Array)) {
-      deselectAllOptions(element);
-      for (option in value) {
-        if (value.hasOwnProperty(option)) {
-          selectOptionOnElement(element, value[option], true);
-        }
-      }
-      return true;
-    }
-
-    selectOptionOnElement(element, value, false);
-    return true;
-  }
-
-  function selectRadioValue(element, value) {
-    if (element.value === value) {
-      clickOnElement(element);
-      element.checked=true;
-      dispatchChange(element);
-      return true;
-    }
-
-    var formElements = element.form.elements;
-    var name = element.getAttribute("name");
-    var radioElement, i;
-
-    if (!name) {
-      return null;
-    }
-
-    for (i = 0; i < formElements.length; i++) {
-      radioElement = formElements[i];
-      if (radioElement.tagName.toLowerCase() == 'input' && radioElement.type.toLowerCase() == 'radio' && radioElement.name === name) {
-        if (value === radioElement.value) {
-          clickOnElement(radioElement);
-          radioElement.checked=true;
-          dispatchChange(radioElement);
-          return true;
-        }
-      }
-    }
-
-    return null;
-  }
-
-  function inputSetValue(element, value, elementXpath) {
-    var allowedTypes = ['submit', 'image', 'button', 'reset'];
-    var elementType = element.type.toLowerCase();
-    var textLikeInputType = ['file', 'text', 'password', 'url', 'email', 'search', 'number', 'tel', 'range', 'date', 'month', 'week', 'time', 'datetime', 'color', 'datetime-local'];
-
-    if (allowedTypes.indexOf(elementType) !== -1) {
-      return null;
-    }
-
-    if (elementType == "checkbox") {
-      var booleanValue = false;
-      if (value == "1" || value == 1) {
-        booleanValue = true;
-      } else if (value == "0" || value == 0) {
-        booleanValue = false;
-      }
-      if ((element.checked && !booleanValue) || (!element.checked && booleanValue)) {
-        clickOnElement(element);
-        dispatchChange(element);
-      }
-      return true;
-    }
-
-    if (elementType == "radio") {
-      return selectRadioValue(element, value);
-    }
-
-    if (textLikeInputType.indexOf(elementType) !== -1) {
-      return textAreaSetValue(elementXpath, value);
-    }
-
-    //No support for the moment for file stuff or other input types
-    return null;
-
-  }
-
-  function textAreaSetValue(elementXpath, value) {
-    var polterAgent = window.__poltergeist;
-    var ids = polterAgent.find("xpath", elementXpath, document);
-    var polterNode = polterAgent.get(ids[0]);
-    polterNode.set(value);
-    return true;
-  }
-
-  var node = getElement(xpath);
-  if (node === null) {
-    return null;
-  }
-
-  if (isSelect(node)) {
-    return selectSetValue(node, value);
-  }
-
-  if (isInput(node)) {
-    return inputSetValue(node, value, xpath);
-  }
-
-  if (isTextArea(node)) {
-    return textAreaSetValue(xpath, value);
-  }
-
-  //for the moment everything else also to textArea stuff
-  return textAreaSetValue(xpath, value);
-
-}('{{xpath}}', JSON.parse('{{ value }}')));
-{% endautoescape %}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/SessionTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/SessionTrait.php
deleted file mode 100644
index 6443dff..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/SessionTrait.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-
-namespace Zumba\Mink\Driver;
-
-/**
- * Trait SessionTrait
- * @package Zumba\Mink\Driver
- */
-trait SessionTrait {
-
-  /** @var  bool */
-  protected $started;
-
-  /**
-   * Starts a session to be used by the driver client
-   */
-  public function start() {
-    $this->started = true;
-  }
-
-  /**
-   * Tells if the session is started or not
-   * @return bool
-   */
-  public function isStarted() {
-    return $this->started;
-  }
-
-  /**
-   * Stops the session completely, clean slate for the browser
-   * @return bool
-   */
-  public function stop() {
-    //Since we are using a remote browser "API", stopping is just like resetting, say good bye to cookies
-    //TODO: In the future we may want to control a start / stop of the remove browser
-    return $this->reset();
-  }
-
-  /**
-   * Clears the cookies in the browser, all of them
-   * @return bool
-   */
-  public function reset() {
-    $this->getBrowser()->clearCookies();
-    $this->getBrowser()->reset();
-    $this->started = false;
-    return true;
-  }
-}
diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/src/WindowTrait.php b/vendor/jcalderonzumba/mink-phantomjs-driver/src/WindowTrait.php
deleted file mode 100644
index 92fc6ee..0000000
--- a/vendor/jcalderonzumba/mink-phantomjs-driver/src/WindowTrait.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Zumba\Mink\Driver;
-
-use Behat\Mink\Exception\DriverException;
-
-/**
- * Class WindowTrait
- * @package Zumba\Mink\Driver
- */
-trait WindowTrait {
-  /**
-   * Returns the current page window name
-   * @return string
-   */
-  public function getWindowName() {
-    return $this->browser->windowName();
-  }
-
-  /**
-   * Return all the window handles currently present in phantomjs
-   * @return array
-   */
-  public function getWindowNames() {
-    return $this->browser->windowHandles();
-  }
-
-  /**
-   * Switches to window by name if possible
-   * @param $name
-   * @throws DriverException
-   */
-  public function switchToWindow($name = null) {
-    $handles = $this->browser->windowHandles();
-    if ($name === null) {
-      //null means back to the main window
-      return $this->browser->switchToWindow($handles[0]);
-    }
-
-    $windowHandle = $this->browser->windowHandle($name);
-    if (!empty($windowHandle)) {
-      $this->browser->switchToWindow($windowHandle);
-    } else {
-      throw new DriverException("Could not find window handle by a given window name: $name");
-    }
-
-  }
-
-  /**
-   * Resizing a window with specified size
-   * @param int    $width
-   * @param int    $height
-   * @param string $name
-   * @throws DriverException
-   */
-  public function resizeWindow($width, $height, $name = null) {
-    if ($name !== null) {
-      //TODO: add this on the phantomjs stuff
-      throw new DriverException("Resizing other window than the main one is not supported yet");
-    }
-    $this->browser->resize($width, $height);
-  }
-
-}
diff --git a/vendor/masterminds/html5/.gitignore b/vendor/masterminds/html5/.gitignore
deleted file mode 100644
index f9ead4a..0000000
--- a/vendor/masterminds/html5/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-scratch.php
-composer.lock
-build/
\ No newline at end of file
diff --git a/vendor/masterminds/html5/.travis.yml b/vendor/masterminds/html5/.travis.yml
deleted file mode 100644
index 2ccb563..0000000
--- a/vendor/masterminds/html5/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: php
-
-# Setting sudo access to false will let Travis CI use containers rather than
-# VMs to run the tests. For more details see:
-# - http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-# - http://docs.travis-ci.com/user/workers/standard-infrastructure/
-sudo: false
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-  - nightly
-
-notifications:
-  irc: "irc.freenode.net#masterminds"
-
-before_script:
-  - composer self-update
-  - composer install
-
-script:
-  - mkdir -p build/logs
-  - ./vendor/bin/phpunit -c phpunit.xml.dist
-
-after_script:
-  - php vendor/bin/coveralls -v
diff --git a/vendor/masterminds/html5/CREDITS b/vendor/masterminds/html5/CREDITS
deleted file mode 100644
index c2dbc4b..0000000
--- a/vendor/masterminds/html5/CREDITS
+++ /dev/null
@@ -1,11 +0,0 @@
-Matt Butcher [technosophos] <technosophos@gmail.com> (lead)
-Matt Farina  [mattfarina] <matt@mattfarina.com> (lead)
-Asmir Mustafic [goetas] <goetas@lignano.it> (contributor)
-Edward Z. Yang [ezyang] <ezyang@mit.edu> (contributor)
-Geoffrey Sneddon [gsnedders] <geoffers@gmail.com> (contributor)
-Kukhar Vasily [ngreduce] <ngreduce@gmail.com> (contributor)
-Rune Christensen [MrElectronic] <mrelectronic@example.com> (contributor)
-Mišo Belica [miso-belica] <miso-belica@example.com> (contributor)
-Asmir Mustafic [goetas] <goetas@example.com> (contributor)
-KITAITI Makoto [KitaitiMakoto] <KitaitiMakoto@example.com> (contributor) 
-Jacob Floyd [cognifloyd] <cognifloyd@gmail.com> (contributor)
diff --git a/vendor/masterminds/html5/LICENSE.txt b/vendor/masterminds/html5/LICENSE.txt
deleted file mode 100644
index 3c275b5..0000000
--- a/vendor/masterminds/html5/LICENSE.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-## HTML5-PHP License
-
-Copyright (c) 2013 The Authors of HTML5-PHP
-
-Matt Butcher - mattbutcher@google.com
-Matt Farina - matt@mattfarina.com
-Asmir Mustafic - goetas@gmail.com
-
-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.
-
-## HTML5Lib License
-
-Portions of this are based on html5lib's PHP version, which was a
-sub-project of html5lib. The following is the list of contributors from
-html5lib:
-
-html5lib:
-
-Copyright (c) 2006-2009 The Authors
-
-Contributors:
-James Graham - jg307@cam.ac.uk
-Anne van Kesteren - annevankesteren@gmail.com
-Lachlan Hunt - lachlan.hunt@lachy.id.au
-Matt McDonald - kanashii@kanashii.ca
-Sam Ruby - rubys@intertwingly.net
-Ian Hickson (Google) - ian@hixie.ch
-Thomas Broyer - t.broyer@ltgt.net
-Jacques Distler - distler@golem.ph.utexas.edu
-Henri Sivonen - hsivonen@iki.fi
-Adam Barth - abarth@webkit.org
-Eric Seidel - eric@webkit.org
-The Mozilla Foundation (contributions from Henri Sivonen since 2008)
-David Flanagan (Mozilla) - dflanagan@mozilla.com
-
-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/vendor/masterminds/html5/README.md b/vendor/masterminds/html5/README.md
deleted file mode 100644
index bbe003f..0000000
--- a/vendor/masterminds/html5/README.md
+++ /dev/null
@@ -1,253 +0,0 @@
-# HTML5-PHP
-
-The need for an HTML5 parser in PHP is clear. This project initially
-began with the seemingly abandoned `html5lib` project [original source](https://code.google.com/p/html5lib/source/checkout).
-But after some initial refactoring work, we began a new parser.
-
-- An HTML5 serializer
-- Support for PHP namespaces
-- Composer support
-- Event-based (SAX-like) parser
-- DOM tree builder
-- Interoperability with QueryPath [[in progress](https://github.com/technosophos/querypath/issues/114)]
-- Runs on **PHP** 5.3.0 or newer and **HHVM** 3.2 or newer
-
-[![Build Status](https://travis-ci.org/Masterminds/html5-php.png?branch=master)](https://travis-ci.org/Masterminds/html5-php) [![Latest Stable Version](https://poser.pugx.org/masterminds/html5/v/stable.png)](https://packagist.org/packages/masterminds/html5) [![Coverage Status](https://coveralls.io/repos/Masterminds/html5-php/badge.png?branch=master)](https://coveralls.io/r/Masterminds/html5-php?branch=master)
-
-## Installation
-
-Install HTML5-PHP using [composer](http://getcomposer.org/).
-
-To install, add `masterminds/html5` to your `composer.json` file:
-
-```
-{
-  "require" : {
-    "masterminds/html5": "2.*"
-  },
-}
-```
-
-(You may substitute `2.*` for a more specific release tag, of
-course.)
-
-From there, use the `composer install` or `composer update` commands to
-install.
-
-## Basic Usage
-
-HTML5-PHP has a high-level API and a low-level API. 
-
-Here is how you use the high-level `HTML5` library API:
-
-```php
-<?php
-// Assuming you installed from Composer:
-require "vendor/autoload.php";
-use Masterminds\HTML5;
-
-
-// An example HTML document:
-$html = <<< 'HERE'
-  <html>
-  <head>
-    <title>TEST</title>
-  </head>
-  <body id='foo'>
-    <h1>Hello World</h1>
-    <p>This is a test of the HTML5 parser.</p>
-  </body>
-  </html>
-HERE;
-
-// Parse the document. $dom is a DOMDocument.
-$html5 = new HTML5();
-$dom = $html5->loadHTML($html);
-
-// Render it as HTML5:
-print $html5->saveHTML($dom);
-
-// Or save it to a file:
-$html5->save($dom, 'out.html');
-
-?>
-```
-
-The `$dom` created by the parser is a full `DOMDocument` object. And the
-`save()` and `saveHTML()` methods will take any DOMDocument.
-
-### Options
-
-It is possible to pass in an array of configuration options when loading
-an HTML5 document.
-
-```php
-// An associative array of options
-$options = array(
-  'option_name' => 'option_value',
-);
-
-// Provide the options to the constructor
-$html5 = new HTML5($options);
-
-$dom = $html5->loadHTML($html);
-```
-
-The following options are supported:
-
-* `encode_entities` (boolean): Indicates that the serializer should aggressively
-  encode characters as entities. Without this, it only encodes the bare
-  minimum.
-* `disable_html_ns` (boolean): Prevents the parser from automatically
-  assigning the HTML5 namespace to the DOM document. This is for
-  non-namespace aware DOM tools.
-* `target_document` (\DOMDocument): A DOM document that will be used as the
-  destination for the parsed nodes.
-* `implicit_namespaces` (array): An assoc array of namespaces that should be
-  used by the parser. Name is tag prefix, value is NS URI.
-
-## The Low-Level API
-
-This library provides the following low-level APIs that you can use to
-create more customized HTML5 tools:
-
-- An `InputStream` abstraction that can work with different kinds of
-input source (not just files and strings).
-- A SAX-like event-based parser that you can hook into for special kinds
-of parsing.
-- A flexible error-reporting mechanism that can be tuned to document
-syntax checking.
-- A DOM implementation that uses PHP's built-in DOM library.
-
-The unit tests exercise each piece of the API, and every public function
-is well-documented.
-
-### Parser Design
-
-The parser is designed as follows:
-
-- The `InputStream` portion handles direct I/O.
-- The `Scanner` handles scanning on behalf of the parser.
-- The `Tokenizer` requests data off of the scanner, parses it, clasifies
-it, and sends it to an `EventHandler`. It is a *recursive descent parser.*
-- The `EventHandler` receives notifications and data for each specific
-semantic event that occurs during tokenization.
-- The `DOMBuilder` is an `EventHandler` that listens for tokenizing
-events and builds a document tree (`DOMDocument`) based on the events.
-
-### Serializer Design
-
-The serializer takes a data structure (the `DOMDocument`) and transforms
-it into a character representation -- an HTML5 document.
-
-The serializer is broken into three parts:
-
-- The `OutputRules` contain the rules to turn DOM elements into strings. The
-rules are an implementation of the interface `RulesInterface` allowing for
-different rule sets to be used. 
-- The `Traverser`, which is a special-purpose tree walker. It visits
-each node node in the tree and uses the `OutputRules` to transform the node
-into a string.
-- `HTML5` manages the `Traverser` and stores the resultant data
-in the correct place.
-
-The serializer (`save()`, `saveHTML()`) follows the 
-[section 8.9 of the HTML 5.0 spec](http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#serializing-html-fragments).
-So tags are serialized according to these rules:
-
-- A tag with children: &lt;foo&gt;CHILDREN&lt;/foo&gt;
-- A tag that cannot have content: &lt;foo&gt; (no closing tag)
-- A tag that could have content, but doesn't: &lt;foo&gt;&lt;/foo&gt;
-
-## Known Issues (Or, Things We Designed Against the Spec)
-
-Please check the issue queue for a full list, but the following are
-issues known issues that are not presently on the roadmap:
-
-- Namespaces: HTML5 only [supports a selected list of namespaces](http://www.w3.org/TR/html5/infrastructure.html#namespaces)
-  and they do not operate in the same way as XML namespaces. A `:` has no special
-  meaning. 
-  By default the parser does not support XML style namespaces via `:`; 
-  to enable the XML namespaces see the  [XML Namespaces section](#xml-namespaces)
-- Scripts: This parser does not contain a JavaScript or a CSS
-  interpreter. While one may be supplied, not all features will be
-  supported.
-- Rentrance: The current parser is not re-entrant. (Thus you can't pause
-  the parser to modify the HTML string mid-parse.)
-- Validation: The current tree builder is **not** a validating parser.
-  While it will correct some HTML, it does not check that the HTML
-  conforms to the standard. (Should you wish, you can build a validating
-  parser by extending DOMTree or building your own EventHandler
-  implementation.)
-  * There is limited support for insertion modes.
-  * Some autocorrection is done automatically.
-  * Per the spec, many legacy tags are admitted and correctly handled,
-    even though they are technically not part of HTML5.
-- Attribute names and values: Due to the implementation details of the
-  PHP implementation of DOM, attribute names that do not follow the 
-  XML 1.0 standard are not inserted into the DOM. (Effectively, they
-  are ignored.) If you've got a clever fix for this, jump in!
-- Processor Instructions: The HTML5 spec does not allow processor
-  instructions. We do. Since this is a server-side library, we think
-  this is useful. And that means, dear reader, that in some cases you
-  can parse the HTML from a mixed PHP/HTML document. This, however, 
-  is an incidental feature, not a core feature.
-- HTML manifests: Unsupported.
-- PLAINTEXT: Unsupported.
-- Adoption Agency Algorithm: Not yet implemented. (8.2.5.4.7)
-
-##XML Namespaces
-
-To use XML style namespaces you have to configure well the main `HTML5` instance.
-
-```php
-use Masterminds\HTML5;
-$html = new HTML5(array(
-    "xmlNamespaces" => true
-));
-
-$dom = $html->loadHTML('<t:tag xmlns:t="http://www.example.com"/>');
-
-$dom->documentElement->namespaceURI; // http://www.example.com
-
-```
-
-You can also add some default prefixes that will not require the namespace declaration,
-but it's elements will be namespaced.
-
-```php
-use Masterminds\HTML5;
-$html = new HTML5(array(
-    "implicitNamespaces"=>array(
-        "t"=>"http://www.example.com"
-    )
-));
-
-$dom = $html->loadHTML('<t:tag/>');
-
-$dom->documentElement->namespaceURI; // http://www.example.com
-
-```
-
-## Thanks to...
-
-The dedicated (and patient) contributors of patches small and large,
-who have already made this library better.See the CREDITS file for
-a list of contributors.
-
-We owe a huge debt of gratitude to the original authors of html5lib.
-
-While not much of the orignal parser remains, we learned a lot from
-reading the html5lib library. And some pieces remain here. In
-particular, much of the UTF-8 and Unicode handling is derived from the
-html5lib project.
-
-## License
-
-This software is released under the MIT license. The original html5lib
-library was also released under the MIT license.
-
-See LICENSE.txt
-
-Certain files contain copyright assertions by specific individuals
-involved with html5lib. Those have been retained where appropriate.
diff --git a/vendor/masterminds/html5/RELEASE.md b/vendor/masterminds/html5/RELEASE.md
deleted file mode 100644
index e3d70d3..0000000
--- a/vendor/masterminds/html5/RELEASE.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Release Notes
-2.1.2 (2015-06-07)
-- #82: Support for PHP7
-- #84: Improved boolean attribute handling 
-
-2.1.1 (2015-03-23)
-- #78: Fixes bug where unmatched entity like string drops everything after &.
-
-2.1.0 (2015-02-01)
-- #74: Added `disable_html_ns` and `target_doc` dom parsing options
-- Unified option names
-- #73: Fixed alphabet, &szlig; now can be detected
-- #75 and #76: Allow whitespace in RCDATA tags
-- #77: Fixed parsing blunder for json embeds
-- #72: Add options to HTML methods
-
-2.0.2 (2014-12-17)
-- #50: empty document handling
-- #63: tags with strange capitalization
-- #65: dashes and underscores as allowed characters in tag names
-- #68: Fixed issue with non-inline elements inside inline containers
-
-2.0.1 (2014-09-23)
-- #59: Fixed issue parsing some fragments.
-- #56: Incorrectly saw 0 as empty string
-- Sami as new documentation generator
-
-2.0.0 (2014-07-28)
-- #53: Improved boolean attributes handling
-- #52: Facebook HHVM compatibility
-- #48: Adopted PSR-2 as coding standard
-- #47: Moved everything to Masterminds namespace
-- #45: Added custom namespaces
-- #44: Added support to XML-style namespaces
-- #37: Refactored HTML5 class removing static methods
-
-1.0.5 (2014-06-10)
-- #38: Set the dev-master branch as the 1.0.x branch for composer (goetas)
-- #34: Tests use PSR-4 for autoloading. (goetas)
-- #40, #41: Fix entity handling in RCDATA sections. (KitaitiMakoto)
-- #32: Fixed issue where wharacter references were being incorrectly encoded in style tags.
-
-1.0.4 (2014-04-29)
-- #30/#31 Don't throw an exception for invalid tag names.
-
-1.0.3 (2014-02-28)
-- #23 and #29: Ignore attributes with illegal chars in name for the PHP DOM.
-
-1.0.2 (2014-02-12)
-- #23: Handle missing tag close in attribute list.
-- #25: Fixed text escaping in the serializer (HTML% 8.3).
-- #27: Fixed tests on Windows: changed "\n" -> PHP_EOL.
-- #28: Fixed infinite loop for char "&" in unquoted attribute in parser.
-- #26: Updated tag name case handling to deal with uppercase usage.
-- #24: Newlines and tabs are allowed inside quoted attributes (HTML5 8.2.4).
-- Fixed Travis CI testing.
-
-1.0.1 (2013-11-07)
-- CDATA encoding is improved. (Non-standard; Issue #19)
-- Some parser rules were not returning the new current element. (Issue #20)
-- Added, to the README, details on code test coverage and to packagist version.
-- Fixed processor instructions.
-- Improved test coverage and documentation coverage.
-
-1.0.0 (2013-10-02)
-- Initial release.
diff --git a/vendor/masterminds/html5/UPGRADING.md b/vendor/masterminds/html5/UPGRADING.md
deleted file mode 100644
index 76e3a19..0000000
--- a/vendor/masterminds/html5/UPGRADING.md
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1.x to 2.x
-=================
-
-- All classes uses `Masterminds` namespace.
-- All public static methods has been removed from `HTML5` class and the general API to access the HTML5 functionalities has changed. 
-
-    Before:
-    
-        $dom = \HTML5::loadHTML('<html>....');
-        \HTML5::saveHTML($dom);
-        
-    After:
-
-        use Masterminds\HTML5;
-        
-        $html5 = new HTML5();
-        
-        $dom = $html5->loadHTML('<html>....');
-        echo $html5->saveHTML($dom);
-
-
diff --git a/vendor/masterminds/html5/bin/entities.php b/vendor/masterminds/html5/bin/entities.php
deleted file mode 100644
index 0fbd6ec..0000000
--- a/vendor/masterminds/html5/bin/entities.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Fetch the entities.json file and convert to PHP datastructure.
- */
-
-// The URL to the official entities JSON file.
-$ENTITIES_URL = 'http://www.w3.org/TR/2012/CR-html5-20121217/entities.json';
-
-$payload = file_get_contents($ENTITIES_URL);
-$json = json_decode($payload);
-
-$table = array();
-foreach ($json as $name => $obj) {
-  $sname = substr($name, 1, -1);
-  $table[$sname] = $obj->characters;
-}
-
-print '<?php
-namespace Masterminds\\HTML5;
-/** Entity lookup tables. This class is automatically generated. */
-class Entities {
-  public static $byName = ';
-var_export($table);
-print ';
-}' . PHP_EOL;
-//print serialize($table);
diff --git a/vendor/masterminds/html5/composer.json b/vendor/masterminds/html5/composer.json
deleted file mode 100644
index 9101239..0000000
--- a/vendor/masterminds/html5/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "masterminds/html5",
-    "description": "An HTML5 parser and serializer.",
-    "type": "library",
-    "homepage": "http://masterminds.github.io/html5-php",
-    "license": "MIT",
-    "keywords": ["xml", "html", "html5", "dom", "parser", "serializer", "querypath"],
-    "authors": [
-        {
-            "name": "Matt Butcher",
-            "email": "technosophos@gmail.com"
-        },
-        {
-            "name": "Matt Farina",
-            "email": "matt@mattfarina.com"
-        },
-        {
-            "name": "Asmir Mustafic",
-            "email": "goetas@gmail.com"
-        }
-    ],
-    "require" : {
-        "ext-libxml" : "*",
-        "php" : ">=5.3.0"
-    },
-    "require-dev": {
-        "satooshi/php-coveralls": "0.6.*",
-        "phpunit/phpunit" : "4.*",
-        "sami/sami": "~2.0"
-    },
-    "autoload": {
-        "psr-4": {"Masterminds\\": "src"}
-    },
-    "autoload-dev": {
-        "psr-4": {"Masterminds\\HTML5\\Tests\\": "test/HTML5"}
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    }
-}
diff --git a/vendor/masterminds/html5/example.php b/vendor/masterminds/html5/example.php
deleted file mode 100644
index 5e3b25f..0000000
--- a/vendor/masterminds/html5/example.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-require "vendor/autoload.php";
-use Masterminds\HTML5;
-
-
-$html = <<< 'HERE'
-  <html>
-  <head>
-  <title>TEST</title>
-  <script language="javascript">
-  if (2 > 1) { alert("Math wins."); }
-  </script>
-  </head>
-  <body id='foo'>
-  <!-- This space intentionally left blank. -->
-  <section class="section-a pretty" id="bar1">
-  <h1>Hello World</h1><p>This is a test of the HTML5 parser.</p>
-  <hr>
-  &amp; Nobody nowhere.
-  </section>
-  <test xmlns:foo="http://example.com/foo">TEST</test>
-  <![CDATA[Because we can.]]>
-  &copy;
-  </body></html>
-HERE;
-
-$html5 = new HTML5();
-$dom = $html5->loadHTML($html);
-
-print "Converting to HTML 5\n";
-
-$html5->save($dom, fopen("php://stdin", 'w'));
diff --git a/vendor/masterminds/html5/phpunit.xml.dist b/vendor/masterminds/html5/phpunit.xml.dist
deleted file mode 100644
index c344880..0000000
--- a/vendor/masterminds/html5/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="PHPUnit">
-          <directory>test/HTML5/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <blacklist>
-            <file>systemlib.phpreflection_hni</file>
-            <file>src/HTML5/Parser/InputStream.php</file>
-            <file>src/HTML5/Serializer/RulesInterface.php</file>
-            <file>src/HTML5/Entities.php</file>
-            <file>src/HTML5/Serializer/HTML5Entities.php</file> 
-        </blacklist>
-    </filter>
-    <logging>
-        <log
-            type="coverage-html"
-            target="build/coverage"
-            charset="UTF-8"
-            yui="true"
-            highlight="true"
-            lowUpperBound="35"
-            highLowerBound="70"
-            showUncoveredFiles="true"
-            />
-          <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
-</phpunit>
diff --git a/vendor/masterminds/html5/sami.php b/vendor/masterminds/html5/sami.php
deleted file mode 100644
index d0dd80b..0000000
--- a/vendor/masterminds/html5/sami.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use Sami\Sami;
-
-return new Sami(__DIR__ . '/src' , array(
-    'title'                => 'HTML5-PHP API',
-    'build_dir'            => __DIR__.'/build/apidoc',
-    'cache_dir'            => __DIR__.'/build/sami-cache',
-    'default_opened_level' => 1,
-));
\ No newline at end of file
diff --git a/vendor/masterminds/html5/src/HTML5.php b/vendor/masterminds/html5/src/HTML5.php
deleted file mode 100644
index 1c46c2b..0000000
--- a/vendor/masterminds/html5/src/HTML5.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-namespace Masterminds;
-
-use Masterminds\HTML5\Parser\FileInputStream;
-use Masterminds\HTML5\Parser\StringInputStream;
-use Masterminds\HTML5\Parser\DOMTreeBuilder;
-use Masterminds\HTML5\Parser\Scanner;
-use Masterminds\HTML5\Parser\Tokenizer;
-use Masterminds\HTML5\Serializer\OutputRules;
-use Masterminds\HTML5\Serializer\Traverser;
-
-/**
- * This class offers convenience methods for parsing and serializing HTML5.
- * It is roughly designed to mirror the \DOMDocument class that is
- * provided with most versions of PHP.
- *
- * EXPERIMENTAL. This may change or be completely replaced.
- */
-class HTML5
-{
-
-    /**
-     * Global options for the parser and serializer.
-     *
-     * @var array
-     */
-    protected $options = array(
-        // If the serializer should encode all entities.
-        'encode_entities' => false
-    );
-
-    protected $errors = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-    /**
-     * Get the default options.
-     *
-     * @return array The default options.
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Load and parse an HTML file.
-     *
-     * This will apply the HTML5 parser, which is tolerant of many
-     * varieties of HTML, including XHTML 1, HTML 4, and well-formed HTML
-     * 3. Note that in these cases, not all of the old data will be
-     * preserved. For example, XHTML's XML declaration will be removed.
-     *
-     * The rules governing parsing are set out in the HTML 5 spec.
-     *
-     * @param string $file
-     *            The path to the file to parse. If this is a resource, it is
-     *            assumed to be an open stream whose pointer is set to the first
-     *            byte of input.
-     * @param array $options
-     *            Configuration options when parsing the HTML
-     * @return \DOMDocument A DOM document. These object type is defined by the libxml
-     *         library, and should have been included with your version of PHP.
-     */
-    public function load($file, array $options = array())
-    {
-        // Handle the case where file is a resource.
-        if (is_resource($file)) {
-            // FIXME: We need a StreamInputStream class.
-            return $this->loadHTML(stream_get_contents($file), $options);
-        }
-
-        $input = new FileInputStream($file);
-
-        return $this->parse($input, $options);
-    }
-
-    /**
-     * Parse a HTML Document from a string.
-     *
-     * Take a string of HTML 5 (or earlier) and parse it into a
-     * DOMDocument.
-     *
-     * @param string $string
-     *            A html5 document as a string.
-     * @param array $options
-     *            Configuration options when parsing the HTML
-     * @return \DOMDocument A DOM document. DOM is part of libxml, which is included with
-     *         almost all distribtions of PHP.
-     */
-    public function loadHTML($string, array $options = array())
-    {
-        $input = new StringInputStream($string);
-
-        return $this->parse($input, $options);
-    }
-
-    /**
-     * Convenience function to load an HTML file.
-     *
-     * This is here to provide backwards compatibility with the
-     * PHP DOM implementation. It simply calls load().
-     *
-     * @param string $file
-     *            The path to the file to parse. If this is a resource, it is
-     *            assumed to be an open stream whose pointer is set to the first
-     *            byte of input.
-     * @param array $options
-     *            Configuration options when parsing the HTML
-     *
-     * @return \DOMDocument A DOM document. These object type is defined by the libxml
-     *         library, and should have been included with your version of PHP.
-     */
-    public function loadHTMLFile($file, array $options = array())
-    {
-        return $this->load($file, $options);
-    }
-
-    /**
-     * Parse a HTML fragment from a string.
-     *
-     * @param string $string
-     *            The html5 fragment as a string.
-     * @param array $options
-     *            Configuration options when parsing the HTML
-     *
-     * @return \DOMDocumentFragment A DOM fragment. The DOM is part of libxml, which is included with
-     *         almost all distributions of PHP.
-     */
-    public function loadHTMLFragment($string, array $options = array())
-    {
-        $input = new StringInputStream($string);
-
-        return $this->parseFragment($input, $options);
-    }
-
-    /**
-     * Return all errors encountered into parsing phase
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Return true it some errors were encountered into parsing phase
-     *
-     * @return bool
-     */
-    public function hasErrors()
-    {
-        return count($this->errors) > 0;
-    }
-
-    /**
-     * Parse an input stream.
-     *
-     * Lower-level loading function. This requires an input stream instead
-     * of a string, file, or resource.
-     */
-    public function parse(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
-    {
-        $this->errors = array();
-        $events = new DOMTreeBuilder(false, array_merge($this->getOptions(), $options));
-        $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
-
-        $parser->parse();
-        $this->errors = $events->getErrors();
-
-        return $events->document();
-    }
-
-    /**
-     * Parse an input stream where the stream is a fragment.
-     *
-     * Lower-level loading function. This requires an input stream instead
-     * of a string, file, or resource.
-     */
-    public function parseFragment(\Masterminds\HTML5\Parser\InputStream $input, array $options = array())
-    {
-        $events = new DOMTreeBuilder(true, array_merge($this->getOptions(), $options));
-        $scanner = new Scanner($input);
-        $parser = new Tokenizer($scanner, $events);
-
-        $parser->parse();
-        $this->errors = $events->getErrors();
-
-        return $events->fragment();
-    }
-
-    /**
-     * Save a DOM into a given file as HTML5.
-     *
-     * @param mixed $dom
-     *            The DOM to be serialized.
-     * @param string $file
-     *            The filename to be written.
-     * @param array $options
-     *            Configuration options when serializing the DOM. These include:
-     *            - encode_entities: Text written to the output is escaped by default and not all
-     *            entities are encoded. If this is set to true all entities will be encoded.
-     *            Defaults to false.
-     */
-    public function save($dom, $file, $options = array())
-    {
-        $close = true;
-        if (is_resource($file)) {
-            $stream = $file;
-            $close = false;
-        } else {
-            $stream = fopen($file, 'w');
-        }
-        $options = array_merge($this->getOptions(), $options);
-        $rules = new OutputRules($stream, $options);
-        $trav = new Traverser($dom, $stream, $rules, $options);
-
-        $trav->walk();
-
-        if ($close) {
-            fclose($stream);
-        }
-    }
-
-    /**
-     * Convert a DOM into an HTML5 string.
-     *
-     * @param mixed $dom
-     *            The DOM to be serialized.
-     * @param array $options
-     *            Configuration options when serializing the DOM. These include:
-     *            - encode_entities: Text written to the output is escaped by default and not all
-     *            entities are encoded. If this is set to true all entities will be encoded.
-     *            Defaults to false.
-     *
-     * @return string A HTML5 documented generated from the DOM.
-     */
-    public function saveHTML($dom, $options = array())
-    {
-        $stream = fopen('php://temp', 'w');
-        $this->save($dom, $stream, array_merge($this->getOptions(), $options));
-
-        return stream_get_contents($stream, - 1, 0);
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Elements.php b/vendor/masterminds/html5/src/HTML5/Elements.php
deleted file mode 100644
index 6cf72aa..0000000
--- a/vendor/masterminds/html5/src/HTML5/Elements.php
+++ /dev/null
@@ -1,634 +0,0 @@
-<?php
-/**
- * Provide general element functions.
- */
-namespace Masterminds\HTML5;
-
-/**
- * This class provides general information about HTML5 elements,
- * including syntactic and semantic issues.
- * Parsers and serializers can
- * use this class as a reference point for information about the rules
- * of various HTML5 elements.
- *
- * @todo consider using a bitmask table lookup. There is enough overlap in
- *       naming that this could significantly shrink the size and maybe make it
- *       faster. See the Go teams implementation at https://code.google.com/p/go/source/browse/html/atom.
- */
-class Elements
-{
-
-    /**
-     * Indicates an element is described in the specification.
-     */
-    const KNOWN_ELEMENT = 1;
-
-    // From section 8.1.2: "script", "style"
-    // From 8.2.5.4.7 ("in body" insertion mode): "noembed", "noscript"
-    // From 8.4 "style", "xmp", "iframe", "noembed", "noframes"
-    /**
-     * Indicates the contained text should be processed as raw text.
-     */
-    const TEXT_RAW = 2;
-
-    // From section 8.1.2: "textarea", "title"
-    /**
-     * Indicates the contained text should be processed as RCDATA.
-     */
-    const TEXT_RCDATA = 4;
-
-    /**
-     * Indicates the tag cannot have content.
-     */
-    const VOID_TAG = 8;
-
-    // "address", "article", "aside", "blockquote", "center", "details", "dialog", "dir", "div", "dl",
-    // "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "menu",
-    // "nav", "ol", "p", "section", "summary", "ul"
-    // "h1", "h2", "h3", "h4", "h5", "h6"
-    // "pre", "listing"
-    // "form"
-    // "plaintext"
-    /**
-     * Indicates that if a previous event is for a P tag, that element
-     * should be considered closed.
-     */
-    const AUTOCLOSE_P = 16;
-
-    /**
-     * Indicates that the text inside is plaintext (pre).
-     */
-    const TEXT_PLAINTEXT = 32;
-
-    // See https://developer.mozilla.org/en-US/docs/HTML/Block-level_elements
-    /**
-     * Indicates that the tag is a block.
-     */
-    const BLOCK_TAG = 64;
-
-    /**
-     * Indicates that the tag allows only inline elements as child nodes.
-     */
-    const BLOCK_ONLY_INLINE = 128;
-
-    /**
-     * The HTML5 elements as defined in http://dev.w3.org/html5/markup/elements.html.
-     *
-     * @var array
-     */
-    public static $html5 = array(
-        "a" => 1,
-        "abbr" => 1,
-        "address" => 89, // NORMAL | VOID_TAG | AUTOCLOSE_P | BLOCK_TAG
-        "area" => 9, // NORMAL | VOID_TAG
-        "article" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "aside" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "audio" => 65, // NORMAL | BLOCK_TAG
-        "b" => 1,
-        "base" => 9, // NORMAL | VOID_TAG
-        "bdi" => 1,
-        "bdo" => 1,
-        "blockquote" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "body" => 1,
-        "br" => 9, // NORMAL | VOID_TAG
-        "button" => 1,
-        "canvas" => 65, // NORMAL | BLOCK_TAG
-        "caption" => 1,
-        "cite" => 1,
-        "code" => 1,
-        "col" => 9, // NORMAL | VOID_TAG
-        "colgroup" => 1,
-        "command" => 9, // NORMAL | VOID_TAG
-                        // "data" => 1, // This is highly experimental and only part of the whatwg spec (not w3c). See https://developer.mozilla.org/en-US/docs/HTML/Element/data
-        "datalist" => 1,
-        "dd" => 65, // NORMAL | BLOCK_TAG
-        "del" => 1,
-        "details" => 17, // NORMAL | AUTOCLOSE_P,
-        "dfn" => 1,
-        "dialog" => 17, // NORMAL | AUTOCLOSE_P,
-        "div" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "dl" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "dt" => 1,
-        "em" => 1,
-        "embed" => 9, // NORMAL | VOID_TAG
-        "fieldset" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "figcaption" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "figure" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "footer" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "form" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h1" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h2" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h3" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h4" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h5" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "h6" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "head" => 1,
-        "header" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "hgroup" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "hr" => 73, // NORMAL | VOID_TAG
-        "html" => 1,
-        "i" => 1,
-        "iframe" => 3, // NORMAL | TEXT_RAW
-        "img" => 9, // NORMAL | VOID_TAG
-        "input" => 9, // NORMAL | VOID_TAG
-        "kbd" => 1,
-        "ins" => 1,
-        "keygen" => 9, // NORMAL | VOID_TAG
-        "label" => 1,
-        "legend" => 1,
-        "li" => 1,
-        "link" => 9, // NORMAL | VOID_TAG
-        "map" => 1,
-        "mark" => 1,
-        "menu" => 17, // NORMAL | AUTOCLOSE_P,
-        "meta" => 9, // NORMAL | VOID_TAG
-        "meter" => 1,
-        "nav" => 17, // NORMAL | AUTOCLOSE_P,
-        "noscript" => 67, // NORMAL | TEXT_RAW | BLOCK_TAG
-        "object" => 1,
-        "ol" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "optgroup" => 1,
-        "option" => 1,
-        "output" => 65, // NORMAL | BLOCK_TAG
-        "p" => 209, // NORMAL | AUTOCLOSE_P | BLOCK_TAG | BLOCK_ONLY_INLINE
-        "param" => 9, // NORMAL | VOID_TAG
-        "pre" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "progress" => 1,
-        "q" => 1,
-        "rp" => 1,
-        "rt" => 1,
-        "ruby" => 1,
-        "s" => 1,
-        "samp" => 1,
-        "script" => 3, // NORMAL | TEXT_RAW
-        "section" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "select" => 1,
-        "small" => 1,
-        "source" => 9, // NORMAL | VOID_TAG
-        "span" => 1,
-        "strong" => 1,
-        "style" => 3, // NORMAL | TEXT_RAW
-        "sub" => 1,
-        "summary" => 17, // NORMAL | AUTOCLOSE_P,
-        "sup" => 1,
-        "table" => 65, // NORMAL | BLOCK_TAG
-        "tbody" => 1,
-        "td" => 1,
-        "textarea" => 5, // NORMAL | TEXT_RCDATA
-        "tfoot" => 65, // NORMAL | BLOCK_TAG
-        "th" => 1,
-        "thead" => 1,
-        "time" => 1,
-        "title" => 5, // NORMAL | TEXT_RCDATA
-        "tr" => 1,
-        "track" => 9, // NORMAL | VOID_TAG
-        "u" => 1,
-        "ul" => 81, // NORMAL | AUTOCLOSE_P | BLOCK_TAG
-        "var" => 1,
-        "video" => 65, // NORMAL | BLOCK_TAG
-        "wbr" => 9, // NORMAL | VOID_TAG
-
-        // Legacy?
-        'basefont' => 8, // VOID_TAG
-        'bgsound' => 8, // VOID_TAG
-        'noframes' => 2, // RAW_TEXT
-        'frame' => 9, // NORMAL | VOID_TAG
-        'frameset' => 1,
-        'center' => 16,
-        'dir' => 16,
-        'listing' => 16, // AUTOCLOSE_P
-        'plaintext' => 48, // AUTOCLOSE_P | TEXT_PLAINTEXT
-        'applet' => 0,
-        'marquee' => 0,
-        'isindex' => 8, // VOID_TAG
-        'xmp' => 20, // AUTOCLOSE_P | VOID_TAG | RAW_TEXT
-        'noembed' => 2 // RAW_TEXT
-        );
-
-    /**
-     * The MathML elements.
-     * See http://www.w3.org/wiki/MathML/Elements.
-     *
-     * In our case we are only concerned with presentation MathML and not content
-     * MathML. There is a nice list of this subset at https://developer.mozilla.org/en-US/docs/MathML/Element.
-     *
-     * @var array
-     */
-    public static $mathml = array(
-        "maction" => 1,
-        "maligngroup" => 1,
-        "malignmark" => 1,
-        "math" => 1,
-        "menclose" => 1,
-        "merror" => 1,
-        "mfenced" => 1,
-        "mfrac" => 1,
-        "mglyph" => 1,
-        "mi" => 1,
-        "mlabeledtr" => 1,
-        "mlongdiv" => 1,
-        "mmultiscripts" => 1,
-        "mn" => 1,
-        "mo" => 1,
-        "mover" => 1,
-        "mpadded" => 1,
-        "mphantom" => 1,
-        "mroot" => 1,
-        "mrow" => 1,
-        "ms" => 1,
-        "mscarries" => 1,
-        "mscarry" => 1,
-        "msgroup" => 1,
-        "msline" => 1,
-        "mspace" => 1,
-        "msqrt" => 1,
-        "msrow" => 1,
-        "mstack" => 1,
-        "mstyle" => 1,
-        "msub" => 1,
-        "msup" => 1,
-        "msubsup" => 1,
-        "mtable" => 1,
-        "mtd" => 1,
-        "mtext" => 1,
-        "mtr" => 1,
-        "munder" => 1,
-        "munderover" => 1
-    );
-
-    /**
-     * The svg elements.
-     *
-     * The Mozilla documentation has a good list at https://developer.mozilla.org/en-US/docs/SVG/Element.
-     * The w3c list appears to be lacking in some areas like filter effect elements.
-     * That list can be found at http://www.w3.org/wiki/SVG/Elements.
-     *
-     * Note, FireFox appears to do a better job rendering filter effects than chrome.
-     * While they are in the spec I'm not sure how widely implemented they are.
-     *
-     * @var array
-     */
-    public static $svg = array(
-        "a" => 1,
-        "altGlyph" => 1,
-        "altGlyphDef" => 1,
-        "altGlyphItem" => 1,
-        "animate" => 1,
-        "animateColor" => 1,
-        "animateMotion" => 1,
-        "animateTransform" => 1,
-        "circle" => 1,
-        "clipPath" => 1,
-        "color-profile" => 1,
-        "cursor" => 1,
-        "defs" => 1,
-        "desc" => 1,
-        "ellipse" => 1,
-        "feBlend" => 1,
-        "feColorMatrix" => 1,
-        "feComponentTransfer" => 1,
-        "feComposite" => 1,
-        "feConvolveMatrix" => 1,
-        "feDiffuseLighting" => 1,
-        "feDisplacementMap" => 1,
-        "feDistantLight" => 1,
-        "feFlood" => 1,
-        "feFuncA" => 1,
-        "feFuncB" => 1,
-        "feFuncG" => 1,
-        "feFuncR" => 1,
-        "feGaussianBlur" => 1,
-        "feImage" => 1,
-        "feMerge" => 1,
-        "feMergeNode" => 1,
-        "feMorphology" => 1,
-        "feOffset" => 1,
-        "fePointLight" => 1,
-        "feSpecularLighting" => 1,
-        "feSpotLight" => 1,
-        "feTile" => 1,
-        "feTurbulence" => 1,
-        "filter" => 1,
-        "font" => 1,
-        "font-face" => 1,
-        "font-face-format" => 1,
-        "font-face-name" => 1,
-        "font-face-src" => 1,
-        "font-face-uri" => 1,
-        "foreignObject" => 1,
-        "g" => 1,
-        "glyph" => 1,
-        "glyphRef" => 1,
-        "hkern" => 1,
-        "image" => 1,
-        "line" => 1,
-        "linearGradient" => 1,
-        "marker" => 1,
-        "mask" => 1,
-        "metadata" => 1,
-        "missing-glyph" => 1,
-        "mpath" => 1,
-        "path" => 1,
-        "pattern" => 1,
-        "polygon" => 1,
-        "polyline" => 1,
-        "radialGradient" => 1,
-        "rect" => 1,
-        "script" => 3, // NORMAL | RAW_TEXT
-        "set" => 1,
-        "stop" => 1,
-        "style" => 3, // NORMAL | RAW_TEXT
-        "svg" => 1,
-        "switch" => 1,
-        "symbol" => 1,
-        "text" => 1,
-        "textPath" => 1,
-        "title" => 1,
-        "tref" => 1,
-        "tspan" => 1,
-        "use" => 1,
-        "view" => 1,
-        "vkern" => 1
-    );
-
-    /**
-     * Some attributes in SVG are case sensetitive.
-     *
-     * This map contains key/value pairs with the key as the lowercase attribute
-     * name and the value with the correct casing.
-     */
-    public static $svgCaseSensitiveAttributeMap = array(
-        'attributename' => 'attributeName',
-        'attributetype' => 'attributeType',
-        'basefrequency' => 'baseFrequency',
-        'baseprofile' => 'baseProfile',
-        'calcmode' => 'calcMode',
-        'clippathunits' => 'clipPathUnits',
-        'contentscripttype' => 'contentScriptType',
-        'contentstyletype' => 'contentStyleType',
-        'diffuseconstant' => 'diffuseConstant',
-        'edgemode' => 'edgeMode',
-        'externalresourcesrequired' => 'externalResourcesRequired',
-        'filterres' => 'filterRes',
-        'filterunits' => 'filterUnits',
-        'glyphref' => 'glyphRef',
-        'gradienttransform' => 'gradientTransform',
-        'gradientunits' => 'gradientUnits',
-        'kernelmatrix' => 'kernelMatrix',
-        'kernelunitlength' => 'kernelUnitLength',
-        'keypoints' => 'keyPoints',
-        'keysplines' => 'keySplines',
-        'keytimes' => 'keyTimes',
-        'lengthadjust' => 'lengthAdjust',
-        'limitingconeangle' => 'limitingConeAngle',
-        'markerheight' => 'markerHeight',
-        'markerunits' => 'markerUnits',
-        'markerwidth' => 'markerWidth',
-        'maskcontentunits' => 'maskContentUnits',
-        'maskunits' => 'maskUnits',
-        'numoctaves' => 'numOctaves',
-        'pathlength' => 'pathLength',
-        'patterncontentunits' => 'patternContentUnits',
-        'patterntransform' => 'patternTransform',
-        'patternunits' => 'patternUnits',
-        'pointsatx' => 'pointsAtX',
-        'pointsaty' => 'pointsAtY',
-        'pointsatz' => 'pointsAtZ',
-        'preservealpha' => 'preserveAlpha',
-        'preserveaspectratio' => 'preserveAspectRatio',
-        'primitiveunits' => 'primitiveUnits',
-        'refx' => 'refX',
-        'refy' => 'refY',
-        'repeatcount' => 'repeatCount',
-        'repeatdur' => 'repeatDur',
-        'requiredextensions' => 'requiredExtensions',
-        'requiredfeatures' => 'requiredFeatures',
-        'specularconstant' => 'specularConstant',
-        'specularexponent' => 'specularExponent',
-        'spreadmethod' => 'spreadMethod',
-        'startoffset' => 'startOffset',
-        'stddeviation' => 'stdDeviation',
-        'stitchtiles' => 'stitchTiles',
-        'surfacescale' => 'surfaceScale',
-        'systemlanguage' => 'systemLanguage',
-        'tablevalues' => 'tableValues',
-        'targetx' => 'targetX',
-        'targety' => 'targetY',
-        'textlength' => 'textLength',
-        'viewbox' => 'viewBox',
-        'viewtarget' => 'viewTarget',
-        'xchannelselector' => 'xChannelSelector',
-        'ychannelselector' => 'yChannelSelector',
-        'zoomandpan' => 'zoomAndPan'
-    );
-
-    /**
-     * Some SVG elements are case sensetitive.
-     * This map contains these.
-     *
-     * The map contains key/value store of the name is lowercase as the keys and
-     * the correct casing as the value.
-     */
-    public static $svgCaseSensitiveElementMap = array(
-        'altglyph' => 'altGlyph',
-        'altglyphdef' => 'altGlyphDef',
-        'altglyphitem' => 'altGlyphItem',
-        'animatecolor' => 'animateColor',
-        'animatemotion' => 'animateMotion',
-        'animatetransform' => 'animateTransform',
-        'clippath' => 'clipPath',
-        'feblend' => 'feBlend',
-        'fecolormatrix' => 'feColorMatrix',
-        'fecomponenttransfer' => 'feComponentTransfer',
-        'fecomposite' => 'feComposite',
-        'feconvolvematrix' => 'feConvolveMatrix',
-        'fediffuselighting' => 'feDiffuseLighting',
-        'fedisplacementmap' => 'feDisplacementMap',
-        'fedistantlight' => 'feDistantLight',
-        'feflood' => 'feFlood',
-        'fefunca' => 'feFuncA',
-        'fefuncb' => 'feFuncB',
-        'fefuncg' => 'feFuncG',
-        'fefuncr' => 'feFuncR',
-        'fegaussianblur' => 'feGaussianBlur',
-        'feimage' => 'feImage',
-        'femerge' => 'feMerge',
-        'femergenode' => 'feMergeNode',
-        'femorphology' => 'feMorphology',
-        'feoffset' => 'feOffset',
-        'fepointlight' => 'fePointLight',
-        'fespecularlighting' => 'feSpecularLighting',
-        'fespotlight' => 'feSpotLight',
-        'fetile' => 'feTile',
-        'feturbulence' => 'feTurbulence',
-        'foreignobject' => 'foreignObject',
-        'glyphref' => 'glyphRef',
-        'lineargradient' => 'linearGradient',
-        'radialgradient' => 'radialGradient',
-        'textpath' => 'textPath'
-    );
-
-    /**
-     * Check whether the given element meets the given criterion.
-     *
-     * Example:
-     *
-     * Elements::isA('script', Elements::TEXT_RAW); // Returns true.
-     *
-     * Elements::isA('script', Elements::TEXT_RCDATA); // Returns false.
-     *
-     * @param string $name
-     *            The element name.
-     * @param int $mask
-     *            One of the constants on this class.
-     * @return boolean true if the element matches the mask, false otherwise.
-     */
-    public static function isA($name, $mask)
-    {
-        if (! static::isElement($name)) {
-            return false;
-        }
-
-        return (static::element($name) & $mask) == $mask;
-    }
-
-    /**
-     * Test if an element is a valid html5 element.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return bool True if a html5 element and false otherwise.
-     */
-    public static function isHtml5Element($name)
-    {
-        // html5 element names are case insensetitive. Forcing lowercase for the check.
-        // Do we need this check or will all data passed here already be lowercase?
-        return isset(static::$html5[strtolower($name)]);
-    }
-
-    /**
-     * Test if an element name is a valid MathML presentation element.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return bool True if a MathML name and false otherwise.
-     */
-    public static function isMathMLElement($name)
-    {
-        // MathML is case-sensetitive unlike html5 elements.
-        return isset(static::$mathml[$name]);
-    }
-
-    /**
-     * Test if an element is a valid SVG element.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return boolean True if a SVG element and false otherise.
-     */
-    public static function isSvgElement($name)
-    {
-        // SVG is case-sensetitive unlike html5 elements.
-        return isset(static::$svg[$name]);
-    }
-
-    /**
-     * Is an element name valid in an html5 document.
-     *
-     * This includes html5 elements along with other allowed embedded content
-     * such as svg and mathml.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return bool True if valid and false otherwise.
-     */
-    public static function isElement($name)
-    {
-        return static::isHtml5Element($name) || static::isMathMLElement($name) || static::isSvgElement($name);
-    }
-
-    /**
-     * Get the element mask for the given element name.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return int The element mask.
-     */
-    public static function element($name)
-    {
-        if (isset(static::$html5[$name])) {
-            return static::$html5[$name];
-        }
-        if (isset(static::$svg[$name])) {
-            return static::$svg[$name];
-        }
-        if (isset(static::$mathml[$name])) {
-            return static::$mathml[$name];
-        }
-
-        return false;
-    }
-
-    /**
-     * Normalize a SVG element name to its proper case and form.
-     *
-     * @param string $name
-     *            The name of the element.
-     *
-     * @return string The normalized form of the element name.
-     */
-    public static function normalizeSvgElement($name)
-    {
-        $name = strtolower($name);
-        if (isset(static::$svgCaseSensitiveElementMap[$name])) {
-            $name = static::$svgCaseSensitiveElementMap[$name];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Normalize a SVG attribute name to its proper case and form.
-     *
-     * @param string $name
-     *            The name of the attribute.
-     *
-     * @return string The normalized form of the attribute name.
-     */
-    public static function normalizeSvgAttribute($name)
-    {
-        $name = strtolower($name);
-        if (isset(static::$svgCaseSensitiveAttributeMap[$name])) {
-            $name = static::$svgCaseSensitiveAttributeMap[$name];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Normalize a MathML attribute name to its proper case and form.
-     *
-     * Note, all MathML element names are lowercase.
-     *
-     * @param string $name
-     *            The name of the attribute.
-     *
-     * @return string The normalized form of the attribute name.
-     */
-    public static function normalizeMathMlAttribute($name)
-    {
-        $name = strtolower($name);
-
-        // Only one attribute has a mixed case form for MathML.
-        if ($name == 'definitionurl') {
-            $name = 'definitionURL';
-        }
-
-        return $name;
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Entities.php b/vendor/masterminds/html5/src/HTML5/Entities.php
deleted file mode 100644
index 2e605d6..0000000
--- a/vendor/masterminds/html5/src/HTML5/Entities.php
+++ /dev/null
@@ -1,2236 +0,0 @@
-<?php
-namespace Masterminds\HTML5;
-
-/**
- * Entity lookup tables.
- * This class is automatically generated.
- */
-class Entities
-{
-
-    public static $byName = array(
-        'Aacute' => 'Á',
-        'Aacut' => 'Á',
-        'aacute' => 'á',
-        'aacut' => 'á',
-        'Abreve' => 'Ă',
-        'abreve' => 'ă',
-        'ac' => '∾',
-        'acd' => '∿',
-        'acE' => '∾̳',
-        'Acirc' => 'Â',
-        'Acir' => 'Â',
-        'acirc' => 'â',
-        'acir' => 'â',
-        'acute' => '´',
-        'acut' => '´',
-        'Acy' => 'А',
-        'acy' => 'а',
-        'AElig' => 'Æ',
-        'AEli' => 'Æ',
-        'aelig' => 'æ',
-        'aeli' => 'æ',
-        'af' => '⁡',
-        'Afr' => '𝔄',
-        'afr' => '𝔞',
-        'Agrave' => 'À',
-        'Agrav' => 'À',
-        'agrave' => 'à',
-        'agrav' => 'à',
-        'alefsym' => 'ℵ',
-        'aleph' => 'ℵ',
-        'Alpha' => 'Α',
-        'alpha' => 'α',
-        'Amacr' => 'Ā',
-        'amacr' => 'ā',
-        'amalg' => '⨿',
-        'AMP' => '&',
-        'AM' => '&',
-        'amp' => '&',
-        'am' => '&',
-        'And' => '⩓',
-        'and' => '∧',
-        'andand' => '⩕',
-        'andd' => '⩜',
-        'andslope' => '⩘',
-        'andv' => '⩚',
-        'ang' => '∠',
-        'ange' => '⦤',
-        'angle' => '∠',
-        'angmsd' => '∡',
-        'angmsdaa' => '⦨',
-        'angmsdab' => '⦩',
-        'angmsdac' => '⦪',
-        'angmsdad' => '⦫',
-        'angmsdae' => '⦬',
-        'angmsdaf' => '⦭',
-        'angmsdag' => '⦮',
-        'angmsdah' => '⦯',
-        'angrt' => '∟',
-        'angrtvb' => '⊾',
-        'angrtvbd' => '⦝',
-        'angsph' => '∢',
-        'angst' => 'Å',
-        'angzarr' => '⍼',
-        'Aogon' => 'Ą',
-        'aogon' => 'ą',
-        'Aopf' => '𝔸',
-        'aopf' => '𝕒',
-        'ap' => '≈',
-        'apacir' => '⩯',
-        'apE' => '⩰',
-        'ape' => '≊',
-        'apid' => '≋',
-        'apos' => '\'',
-        'ApplyFunction' => '⁡',
-        'approx' => '≈',
-        'approxeq' => '≊',
-        'Aring' => 'Å',
-        'Arin' => 'Å',
-        'aring' => 'å',
-        'arin' => 'å',
-        'Ascr' => '𝒜',
-        'ascr' => '𝒶',
-        'Assign' => '≔',
-        'ast' => '*',
-        'asymp' => '≈',
-        'asympeq' => '≍',
-        'Atilde' => 'Ã',
-        'Atild' => 'Ã',
-        'atilde' => 'ã',
-        'atild' => 'ã',
-        'Auml' => 'Ä',
-        'Aum' => 'Ä',
-        'auml' => 'ä',
-        'aum' => 'ä',
-        'awconint' => '∳',
-        'awint' => '⨑',
-        'backcong' => '≌',
-        'backepsilon' => '϶',
-        'backprime' => '‵',
-        'backsim' => '∽',
-        'backsimeq' => '⋍',
-        'Backslash' => '∖',
-        'Barv' => '⫧',
-        'barvee' => '⊽',
-        'Barwed' => '⌆',
-        'barwed' => '⌅',
-        'barwedge' => '⌅',
-        'bbrk' => '⎵',
-        'bbrktbrk' => '⎶',
-        'bcong' => '≌',
-        'Bcy' => 'Б',
-        'bcy' => 'б',
-        'bdquo' => '„',
-        'becaus' => '∵',
-        'Because' => '∵',
-        'because' => '∵',
-        'bemptyv' => '⦰',
-        'bepsi' => '϶',
-        'bernou' => 'ℬ',
-        'Bernoullis' => 'ℬ',
-        'Beta' => 'Β',
-        'beta' => 'β',
-        'beth' => 'ℶ',
-        'between' => '≬',
-        'Bfr' => '𝔅',
-        'bfr' => '𝔟',
-        'bigcap' => '⋂',
-        'bigcirc' => '◯',
-        'bigcup' => '⋃',
-        'bigodot' => '⨀',
-        'bigoplus' => '⨁',
-        'bigotimes' => '⨂',
-        'bigsqcup' => '⨆',
-        'bigstar' => '★',
-        'bigtriangledown' => '▽',
-        'bigtriangleup' => '△',
-        'biguplus' => '⨄',
-        'bigvee' => '⋁',
-        'bigwedge' => '⋀',
-        'bkarow' => '⤍',
-        'blacklozenge' => '⧫',
-        'blacksquare' => '▪',
-        'blacktriangle' => '▴',
-        'blacktriangledown' => '▾',
-        'blacktriangleleft' => '◂',
-        'blacktriangleright' => '▸',
-        'blank' => '␣',
-        'blk12' => '▒',
-        'blk14' => '░',
-        'blk34' => '▓',
-        'block' => '█',
-        'bne' => '=⃥',
-        'bnequiv' => '≡⃥',
-        'bNot' => '⫭',
-        'bnot' => '⌐',
-        'Bopf' => '𝔹',
-        'bopf' => '𝕓',
-        'bot' => '⊥',
-        'bottom' => '⊥',
-        'bowtie' => '⋈',
-        'boxbox' => '⧉',
-        'boxDL' => '╗',
-        'boxDl' => '╖',
-        'boxdL' => '╕',
-        'boxdl' => '┐',
-        'boxDR' => '╔',
-        'boxDr' => '╓',
-        'boxdR' => '╒',
-        'boxdr' => '┌',
-        'boxH' => '═',
-        'boxh' => '─',
-        'boxHD' => '╦',
-        'boxHd' => '╤',
-        'boxhD' => '╥',
-        'boxhd' => '┬',
-        'boxHU' => '╩',
-        'boxHu' => '╧',
-        'boxhU' => '╨',
-        'boxhu' => '┴',
-        'boxminus' => '⊟',
-        'boxplus' => '⊞',
-        'boxtimes' => '⊠',
-        'boxUL' => '╝',
-        'boxUl' => '╜',
-        'boxuL' => '╛',
-        'boxul' => '┘',
-        'boxUR' => '╚',
-        'boxUr' => '╙',
-        'boxuR' => '╘',
-        'boxur' => '└',
-        'boxV' => '║',
-        'boxv' => '│',
-        'boxVH' => '╬',
-        'boxVh' => '╫',
-        'boxvH' => '╪',
-        'boxvh' => '┼',
-        'boxVL' => '╣',
-        'boxVl' => '╢',
-        'boxvL' => '╡',
-        'boxvl' => '┤',
-        'boxVR' => '╠',
-        'boxVr' => '╟',
-        'boxvR' => '╞',
-        'boxvr' => '├',
-        'bprime' => '‵',
-        'Breve' => '˘',
-        'breve' => '˘',
-        'brvbar' => '¦',
-        'brvba' => '¦',
-        'Bscr' => 'ℬ',
-        'bscr' => '𝒷',
-        'bsemi' => '⁏',
-        'bsim' => '∽',
-        'bsime' => '⋍',
-        'bsol' => '\\',
-        'bsolb' => '⧅',
-        'bsolhsub' => '⟈',
-        'bull' => '•',
-        'bullet' => '•',
-        'bump' => '≎',
-        'bumpE' => '⪮',
-        'bumpe' => '≏',
-        'Bumpeq' => '≎',
-        'bumpeq' => '≏',
-        'Cacute' => 'Ć',
-        'cacute' => 'ć',
-        'Cap' => '⋒',
-        'cap' => '∩',
-        'capand' => '⩄',
-        'capbrcup' => '⩉',
-        'capcap' => '⩋',
-        'capcup' => '⩇',
-        'capdot' => '⩀',
-        'CapitalDifferentialD' => 'ⅅ',
-        'caps' => '∩︀',
-        'caret' => '⁁',
-        'caron' => 'ˇ',
-        'Cayleys' => 'ℭ',
-        'ccaps' => '⩍',
-        'Ccaron' => 'Č',
-        'ccaron' => 'č',
-        'Ccedil' => 'Ç',
-        'Ccedi' => 'Ç',
-        'ccedil' => 'ç',
-        'ccedi' => 'ç',
-        'Ccirc' => 'Ĉ',
-        'ccirc' => 'ĉ',
-        'Cconint' => '∰',
-        'ccups' => '⩌',
-        'ccupssm' => '⩐',
-        'Cdot' => 'Ċ',
-        'cdot' => 'ċ',
-        'cedil' => '¸',
-        'cedi' => '¸',
-        'Cedilla' => '¸',
-        'cemptyv' => '⦲',
-        'cent' => '¢',
-        'cen' => '¢',
-        'CenterDot' => '·',
-        'centerdot' => '·',
-        'Cfr' => 'ℭ',
-        'cfr' => '𝔠',
-        'CHcy' => 'Ч',
-        'chcy' => 'ч',
-        'check' => '✓',
-        'checkmark' => '✓',
-        'Chi' => 'Χ',
-        'chi' => 'χ',
-        'cir' => '○',
-        'circ' => 'ˆ',
-        'circeq' => '≗',
-        'circlearrowleft' => '↺',
-        'circlearrowright' => '↻',
-        'circledast' => '⊛',
-        'circledcirc' => '⊚',
-        'circleddash' => '⊝',
-        'CircleDot' => '⊙',
-        'circledR' => '®',
-        'circledS' => 'Ⓢ',
-        'CircleMinus' => '⊖',
-        'CirclePlus' => '⊕',
-        'CircleTimes' => '⊗',
-        'cirE' => '⧃',
-        'cire' => '≗',
-        'cirfnint' => '⨐',
-        'cirmid' => '⫯',
-        'cirscir' => '⧂',
-        'ClockwiseContourIntegral' => '∲',
-        'CloseCurlyDoubleQuote' => '”',
-        'CloseCurlyQuote' => '’',
-        'clubs' => '♣',
-        'clubsuit' => '♣',
-        'Colon' => '∷',
-        'colon' => ':',
-        'Colone' => '⩴',
-        'colone' => '≔',
-        'coloneq' => '≔',
-        'comma' => ',',
-        'commat' => '@',
-        'comp' => '∁',
-        'compfn' => '∘',
-        'complement' => '∁',
-        'complexes' => 'ℂ',
-        'cong' => '≅',
-        'congdot' => '⩭',
-        'Congruent' => '≡',
-        'Conint' => '∯',
-        'conint' => '∮',
-        'ContourIntegral' => '∮',
-        'Copf' => 'ℂ',
-        'copf' => '𝕔',
-        'coprod' => '∐',
-        'Coproduct' => '∐',
-        'COPY' => '©',
-        'COP' => '©',
-        'copy' => '©',
-        'cop' => '©',
-        'copysr' => '℗',
-        'CounterClockwiseContourIntegral' => '∳',
-        'crarr' => '↵',
-        'Cross' => '⨯',
-        'cross' => '✗',
-        'Cscr' => '𝒞',
-        'cscr' => '𝒸',
-        'csub' => '⫏',
-        'csube' => '⫑',
-        'csup' => '⫐',
-        'csupe' => '⫒',
-        'ctdot' => '⋯',
-        'cudarrl' => '⤸',
-        'cudarrr' => '⤵',
-        'cuepr' => '⋞',
-        'cuesc' => '⋟',
-        'cularr' => '↶',
-        'cularrp' => '⤽',
-        'Cup' => '⋓',
-        'cup' => '∪',
-        'cupbrcap' => '⩈',
-        'CupCap' => '≍',
-        'cupcap' => '⩆',
-        'cupcup' => '⩊',
-        'cupdot' => '⊍',
-        'cupor' => '⩅',
-        'cups' => '∪︀',
-        'curarr' => '↷',
-        'curarrm' => '⤼',
-        'curlyeqprec' => '⋞',
-        'curlyeqsucc' => '⋟',
-        'curlyvee' => '⋎',
-        'curlywedge' => '⋏',
-        'curren' => '¤',
-        'curre' => '¤',
-        'curvearrowleft' => '↶',
-        'curvearrowright' => '↷',
-        'cuvee' => '⋎',
-        'cuwed' => '⋏',
-        'cwconint' => '∲',
-        'cwint' => '∱',
-        'cylcty' => '⌭',
-        'Dagger' => '‡',
-        'dagger' => '†',
-        'daleth' => 'ℸ',
-        'Darr' => '↡',
-        'dArr' => '⇓',
-        'darr' => '↓',
-        'dash' => '‐',
-        'Dashv' => '⫤',
-        'dashv' => '⊣',
-        'dbkarow' => '⤏',
-        'dblac' => '˝',
-        'Dcaron' => 'Ď',
-        'dcaron' => 'ď',
-        'Dcy' => 'Д',
-        'dcy' => 'д',
-        'DD' => 'ⅅ',
-        'dd' => 'ⅆ',
-        'ddagger' => '‡',
-        'ddarr' => '⇊',
-        'DDotrahd' => '⤑',
-        'ddotseq' => '⩷',
-        'deg' => '°',
-        'de' => '°',
-        'Del' => '∇',
-        'Delta' => 'Δ',
-        'delta' => 'δ',
-        'demptyv' => '⦱',
-        'dfisht' => '⥿',
-        'Dfr' => '𝔇',
-        'dfr' => '𝔡',
-        'dHar' => '⥥',
-        'dharl' => '⇃',
-        'dharr' => '⇂',
-        'DiacriticalAcute' => '´',
-        'DiacriticalDot' => '˙',
-        'DiacriticalDoubleAcute' => '˝',
-        'DiacriticalGrave' => '`',
-        'DiacriticalTilde' => '˜',
-        'diam' => '⋄',
-        'Diamond' => '⋄',
-        'diamond' => '⋄',
-        'diamondsuit' => '♦',
-        'diams' => '♦',
-        'die' => '¨',
-        'DifferentialD' => 'ⅆ',
-        'digamma' => 'ϝ',
-        'disin' => '⋲',
-        'div' => '÷',
-        'divide' => '÷',
-        'divid' => '÷',
-        'divideontimes' => '⋇',
-        'divonx' => '⋇',
-        'DJcy' => 'Ђ',
-        'djcy' => 'ђ',
-        'dlcorn' => '⌞',
-        'dlcrop' => '⌍',
-        'dollar' => '$',
-        'Dopf' => '𝔻',
-        'dopf' => '𝕕',
-        'Dot' => '¨',
-        'dot' => '˙',
-        'DotDot' => '⃜',
-        'doteq' => '≐',
-        'doteqdot' => '≑',
-        'DotEqual' => '≐',
-        'dotminus' => '∸',
-        'dotplus' => '∔',
-        'dotsquare' => '⊡',
-        'doublebarwedge' => '⌆',
-        'DoubleContourIntegral' => '∯',
-        'DoubleDot' => '¨',
-        'DoubleDownArrow' => '⇓',
-        'DoubleLeftArrow' => '⇐',
-        'DoubleLeftRightArrow' => '⇔',
-        'DoubleLeftTee' => '⫤',
-        'DoubleLongLeftArrow' => '⟸',
-        'DoubleLongLeftRightArrow' => '⟺',
-        'DoubleLongRightArrow' => '⟹',
-        'DoubleRightArrow' => '⇒',
-        'DoubleRightTee' => '⊨',
-        'DoubleUpArrow' => '⇑',
-        'DoubleUpDownArrow' => '⇕',
-        'DoubleVerticalBar' => '∥',
-        'DownArrow' => '↓',
-        'Downarrow' => '⇓',
-        'downarrow' => '↓',
-        'DownArrowBar' => '⤓',
-        'DownArrowUpArrow' => '⇵',
-        'DownBreve' => '̑',
-        'downdownarrows' => '⇊',
-        'downharpoonleft' => '⇃',
-        'downharpoonright' => '⇂',
-        'DownLeftRightVector' => '⥐',
-        'DownLeftTeeVector' => '⥞',
-        'DownLeftVector' => '↽',
-        'DownLeftVectorBar' => '⥖',
-        'DownRightTeeVector' => '⥟',
-        'DownRightVector' => '⇁',
-        'DownRightVectorBar' => '⥗',
-        'DownTee' => '⊤',
-        'DownTeeArrow' => '↧',
-        'drbkarow' => '⤐',
-        'drcorn' => '⌟',
-        'drcrop' => '⌌',
-        'Dscr' => '𝒟',
-        'dscr' => '𝒹',
-        'DScy' => 'Ѕ',
-        'dscy' => 'ѕ',
-        'dsol' => '⧶',
-        'Dstrok' => 'Đ',
-        'dstrok' => 'đ',
-        'dtdot' => '⋱',
-        'dtri' => '▿',
-        'dtrif' => '▾',
-        'duarr' => '⇵',
-        'duhar' => '⥯',
-        'dwangle' => '⦦',
-        'DZcy' => 'Џ',
-        'dzcy' => 'џ',
-        'dzigrarr' => '⟿',
-        'Eacute' => 'É',
-        'Eacut' => 'É',
-        'eacute' => 'é',
-        'eacut' => 'é',
-        'easter' => '⩮',
-        'Ecaron' => 'Ě',
-        'ecaron' => 'ě',
-        'ecir' => 'ê',
-        'Ecirc' => 'Ê',
-        'Ecir' => 'Ê',
-        'ecirc' => 'ê',
-        'ecolon' => '≕',
-        'Ecy' => 'Э',
-        'ecy' => 'э',
-        'eDDot' => '⩷',
-        'Edot' => 'Ė',
-        'eDot' => '≑',
-        'edot' => 'ė',
-        'ee' => 'ⅇ',
-        'efDot' => '≒',
-        'Efr' => '𝔈',
-        'efr' => '𝔢',
-        'eg' => '⪚',
-        'Egrave' => 'È',
-        'Egrav' => 'È',
-        'egrave' => 'è',
-        'egrav' => 'è',
-        'egs' => '⪖',
-        'egsdot' => '⪘',
-        'el' => '⪙',
-        'Element' => '∈',
-        'elinters' => '⏧',
-        'ell' => 'ℓ',
-        'els' => '⪕',
-        'elsdot' => '⪗',
-        'Emacr' => 'Ē',
-        'emacr' => 'ē',
-        'empty' => '∅',
-        'emptyset' => '∅',
-        'EmptySmallSquare' => '◻',
-        'emptyv' => '∅',
-        'EmptyVerySmallSquare' => '▫',
-        'emsp' => ' ',
-        'emsp13' => ' ',
-        'emsp14' => ' ',
-        'ENG' => 'Ŋ',
-        'eng' => 'ŋ',
-        'ensp' => ' ',
-        'Eogon' => 'Ę',
-        'eogon' => 'ę',
-        'Eopf' => '𝔼',
-        'eopf' => '𝕖',
-        'epar' => '⋕',
-        'eparsl' => '⧣',
-        'eplus' => '⩱',
-        'epsi' => 'ε',
-        'Epsilon' => 'Ε',
-        'epsilon' => 'ε',
-        'epsiv' => 'ϵ',
-        'eqcirc' => '≖',
-        'eqcolon' => '≕',
-        'eqsim' => '≂',
-        'eqslantgtr' => '⪖',
-        'eqslantless' => '⪕',
-        'Equal' => '⩵',
-        'equals' => '=',
-        'EqualTilde' => '≂',
-        'equest' => '≟',
-        'Equilibrium' => '⇌',
-        'equiv' => '≡',
-        'equivDD' => '⩸',
-        'eqvparsl' => '⧥',
-        'erarr' => '⥱',
-        'erDot' => '≓',
-        'Escr' => 'ℰ',
-        'escr' => 'ℯ',
-        'esdot' => '≐',
-        'Esim' => '⩳',
-        'esim' => '≂',
-        'Eta' => 'Η',
-        'eta' => 'η',
-        'ETH' => 'Ð',
-        'ET' => 'Ð',
-        'eth' => 'ð',
-        'et' => 'ð',
-        'Euml' => 'Ë',
-        'Eum' => 'Ë',
-        'euml' => 'ë',
-        'eum' => 'ë',
-        'euro' => '€',
-        'excl' => '!',
-        'exist' => '∃',
-        'Exists' => '∃',
-        'expectation' => 'ℰ',
-        'ExponentialE' => 'ⅇ',
-        'exponentiale' => 'ⅇ',
-        'fallingdotseq' => '≒',
-        'Fcy' => 'Ф',
-        'fcy' => 'ф',
-        'female' => '♀',
-        'ffilig' => 'ffi',
-        'fflig' => 'ff',
-        'ffllig' => 'ffl',
-        'Ffr' => '𝔉',
-        'ffr' => '𝔣',
-        'filig' => 'fi',
-        'FilledSmallSquare' => '◼',
-        'FilledVerySmallSquare' => '▪',
-        'fjlig' => 'fj',
-        'flat' => '♭',
-        'fllig' => 'fl',
-        'fltns' => '▱',
-        'fnof' => 'ƒ',
-        'Fopf' => '𝔽',
-        'fopf' => '𝕗',
-        'ForAll' => '∀',
-        'forall' => '∀',
-        'fork' => '⋔',
-        'forkv' => '⫙',
-        'Fouriertrf' => 'ℱ',
-        'fpartint' => '⨍',
-        'frac12' => '½',
-        'frac1' => '¼',
-        'frac13' => '⅓',
-        'frac14' => '¼',
-        'frac15' => '⅕',
-        'frac16' => '⅙',
-        'frac18' => '⅛',
-        'frac23' => '⅔',
-        'frac25' => '⅖',
-        'frac34' => '¾',
-        'frac3' => '¾',
-        'frac35' => '⅗',
-        'frac38' => '⅜',
-        'frac45' => '⅘',
-        'frac56' => '⅚',
-        'frac58' => '⅝',
-        'frac78' => '⅞',
-        'frasl' => '⁄',
-        'frown' => '⌢',
-        'Fscr' => 'ℱ',
-        'fscr' => '𝒻',
-        'gacute' => 'ǵ',
-        'Gamma' => 'Γ',
-        'gamma' => 'γ',
-        'Gammad' => 'Ϝ',
-        'gammad' => 'ϝ',
-        'gap' => '⪆',
-        'Gbreve' => 'Ğ',
-        'gbreve' => 'ğ',
-        'Gcedil' => 'Ģ',
-        'Gcirc' => 'Ĝ',
-        'gcirc' => 'ĝ',
-        'Gcy' => 'Г',
-        'gcy' => 'г',
-        'Gdot' => 'Ġ',
-        'gdot' => 'ġ',
-        'gE' => '≧',
-        'ge' => '≥',
-        'gEl' => '⪌',
-        'gel' => '⋛',
-        'geq' => '≥',
-        'geqq' => '≧',
-        'geqslant' => '⩾',
-        'ges' => '⩾',
-        'gescc' => '⪩',
-        'gesdot' => '⪀',
-        'gesdoto' => '⪂',
-        'gesdotol' => '⪄',
-        'gesl' => '⋛︀',
-        'gesles' => '⪔',
-        'Gfr' => '𝔊',
-        'gfr' => '𝔤',
-        'Gg' => '⋙',
-        'gg' => '≫',
-        'ggg' => '⋙',
-        'gimel' => 'ℷ',
-        'GJcy' => 'Ѓ',
-        'gjcy' => 'ѓ',
-        'gl' => '≷',
-        'gla' => '⪥',
-        'glE' => '⪒',
-        'glj' => '⪤',
-        'gnap' => '⪊',
-        'gnapprox' => '⪊',
-        'gnE' => '≩',
-        'gne' => '⪈',
-        'gneq' => '⪈',
-        'gneqq' => '≩',
-        'gnsim' => '⋧',
-        'Gopf' => '𝔾',
-        'gopf' => '𝕘',
-        'grave' => '`',
-        'GreaterEqual' => '≥',
-        'GreaterEqualLess' => '⋛',
-        'GreaterFullEqual' => '≧',
-        'GreaterGreater' => '⪢',
-        'GreaterLess' => '≷',
-        'GreaterSlantEqual' => '⩾',
-        'GreaterTilde' => '≳',
-        'Gscr' => '𝒢',
-        'gscr' => 'ℊ',
-        'gsim' => '≳',
-        'gsime' => '⪎',
-        'gsiml' => '⪐',
-        'GT' => '>',
-        'G' => '>',
-        'Gt' => '≫',
-        'gt' => '>',
-        'g' => '>',
-        'gtcc' => '⪧',
-        'gtcir' => '⩺',
-        'gtdot' => '⋗',
-        'gtlPar' => '⦕',
-        'gtquest' => '⩼',
-        'gtrapprox' => '⪆',
-        'gtrarr' => '⥸',
-        'gtrdot' => '⋗',
-        'gtreqless' => '⋛',
-        'gtreqqless' => '⪌',
-        'gtrless' => '≷',
-        'gtrsim' => '≳',
-        'gvertneqq' => '≩︀',
-        'gvnE' => '≩︀',
-        'Hacek' => 'ˇ',
-        'hairsp' => ' ',
-        'half' => '½',
-        'hamilt' => 'ℋ',
-        'HARDcy' => 'Ъ',
-        'hardcy' => 'ъ',
-        'hArr' => '⇔',
-        'harr' => '↔',
-        'harrcir' => '⥈',
-        'harrw' => '↭',
-        'Hat' => '^',
-        'hbar' => 'ℏ',
-        'Hcirc' => 'Ĥ',
-        'hcirc' => 'ĥ',
-        'hearts' => '♥',
-        'heartsuit' => '♥',
-        'hellip' => '…',
-        'hercon' => '⊹',
-        'Hfr' => 'ℌ',
-        'hfr' => '𝔥',
-        'HilbertSpace' => 'ℋ',
-        'hksearow' => '⤥',
-        'hkswarow' => '⤦',
-        'hoarr' => '⇿',
-        'homtht' => '∻',
-        'hookleftarrow' => '↩',
-        'hookrightarrow' => '↪',
-        'Hopf' => 'ℍ',
-        'hopf' => '𝕙',
-        'horbar' => '―',
-        'HorizontalLine' => '─',
-        'Hscr' => 'ℋ',
-        'hscr' => '𝒽',
-        'hslash' => 'ℏ',
-        'Hstrok' => 'Ħ',
-        'hstrok' => 'ħ',
-        'HumpDownHump' => '≎',
-        'HumpEqual' => '≏',
-        'hybull' => '⁃',
-        'hyphen' => '‐',
-        'Iacute' => 'Í',
-        'Iacut' => 'Í',
-        'iacute' => 'í',
-        'iacut' => 'í',
-        'ic' => '⁣',
-        'Icirc' => 'Î',
-        'Icir' => 'Î',
-        'icirc' => 'î',
-        'icir' => 'î',
-        'Icy' => 'И',
-        'icy' => 'и',
-        'Idot' => 'İ',
-        'IEcy' => 'Е',
-        'iecy' => 'е',
-        'iexcl' => '¡',
-        'iexc' => '¡',
-        'iff' => '⇔',
-        'Ifr' => 'ℑ',
-        'ifr' => '𝔦',
-        'Igrave' => 'Ì',
-        'Igrav' => 'Ì',
-        'igrave' => 'ì',
-        'igrav' => 'ì',
-        'ii' => 'ⅈ',
-        'iiiint' => '⨌',
-        'iiint' => '∭',
-        'iinfin' => '⧜',
-        'iiota' => '℩',
-        'IJlig' => 'IJ',
-        'ijlig' => 'ij',
-        'Im' => 'ℑ',
-        'Imacr' => 'Ī',
-        'imacr' => 'ī',
-        'image' => 'ℑ',
-        'ImaginaryI' => 'ⅈ',
-        'imagline' => 'ℐ',
-        'imagpart' => 'ℑ',
-        'imath' => 'ı',
-        'imof' => '⊷',
-        'imped' => 'Ƶ',
-        'Implies' => '⇒',
-        'in' => '∈',
-        'incare' => '℅',
-        'infin' => '∞',
-        'infintie' => '⧝',
-        'inodot' => 'ı',
-        'Int' => '∬',
-        'int' => '∫',
-        'intcal' => '⊺',
-        'integers' => 'ℤ',
-        'Integral' => '∫',
-        'intercal' => '⊺',
-        'Intersection' => '⋂',
-        'intlarhk' => '⨗',
-        'intprod' => '⨼',
-        'InvisibleComma' => '⁣',
-        'InvisibleTimes' => '⁢',
-        'IOcy' => 'Ё',
-        'iocy' => 'ё',
-        'Iogon' => 'Į',
-        'iogon' => 'į',
-        'Iopf' => '𝕀',
-        'iopf' => '𝕚',
-        'Iota' => 'Ι',
-        'iota' => 'ι',
-        'iprod' => '⨼',
-        'iquest' => '¿',
-        'iques' => '¿',
-        'Iscr' => 'ℐ',
-        'iscr' => '𝒾',
-        'isin' => '∈',
-        'isindot' => '⋵',
-        'isinE' => '⋹',
-        'isins' => '⋴',
-        'isinsv' => '⋳',
-        'isinv' => '∈',
-        'it' => '⁢',
-        'Itilde' => 'Ĩ',
-        'itilde' => 'ĩ',
-        'Iukcy' => 'І',
-        'iukcy' => 'і',
-        'Iuml' => 'Ï',
-        'Ium' => 'Ï',
-        'iuml' => 'ï',
-        'ium' => 'ï',
-        'Jcirc' => 'Ĵ',
-        'jcirc' => 'ĵ',
-        'Jcy' => 'Й',
-        'jcy' => 'й',
-        'Jfr' => '𝔍',
-        'jfr' => '𝔧',
-        'jmath' => 'ȷ',
-        'Jopf' => '𝕁',
-        'jopf' => '𝕛',
-        'Jscr' => '𝒥',
-        'jscr' => '𝒿',
-        'Jsercy' => 'Ј',
-        'jsercy' => 'ј',
-        'Jukcy' => 'Є',
-        'jukcy' => 'є',
-        'Kappa' => 'Κ',
-        'kappa' => 'κ',
-        'kappav' => 'ϰ',
-        'Kcedil' => 'Ķ',
-        'kcedil' => 'ķ',
-        'Kcy' => 'К',
-        'kcy' => 'к',
-        'Kfr' => '𝔎',
-        'kfr' => '𝔨',
-        'kgreen' => 'ĸ',
-        'KHcy' => 'Х',
-        'khcy' => 'х',
-        'KJcy' => 'Ќ',
-        'kjcy' => 'ќ',
-        'Kopf' => '𝕂',
-        'kopf' => '𝕜',
-        'Kscr' => '𝒦',
-        'kscr' => '𝓀',
-        'lAarr' => '⇚',
-        'Lacute' => 'Ĺ',
-        'lacute' => 'ĺ',
-        'laemptyv' => '⦴',
-        'lagran' => 'ℒ',
-        'Lambda' => 'Λ',
-        'lambda' => 'λ',
-        'Lang' => '⟪',
-        'lang' => '⟨',
-        'langd' => '⦑',
-        'langle' => '⟨',
-        'lap' => '⪅',
-        'Laplacetrf' => 'ℒ',
-        'laquo' => '«',
-        'laqu' => '«',
-        'Larr' => '↞',
-        'lArr' => '⇐',
-        'larr' => '←',
-        'larrb' => '⇤',
-        'larrbfs' => '⤟',
-        'larrfs' => '⤝',
-        'larrhk' => '↩',
-        'larrlp' => '↫',
-        'larrpl' => '⤹',
-        'larrsim' => '⥳',
-        'larrtl' => '↢',
-        'lat' => '⪫',
-        'lAtail' => '⤛',
-        'latail' => '⤙',
-        'late' => '⪭',
-        'lates' => '⪭︀',
-        'lBarr' => '⤎',
-        'lbarr' => '⤌',
-        'lbbrk' => '❲',
-        'lbrace' => '{',
-        'lbrack' => '[',
-        'lbrke' => '⦋',
-        'lbrksld' => '⦏',
-        'lbrkslu' => '⦍',
-        'Lcaron' => 'Ľ',
-        'lcaron' => 'ľ',
-        'Lcedil' => 'Ļ',
-        'lcedil' => 'ļ',
-        'lceil' => '⌈',
-        'lcub' => '{',
-        'Lcy' => 'Л',
-        'lcy' => 'л',
-        'ldca' => '⤶',
-        'ldquo' => '“',
-        'ldquor' => '„',
-        'ldrdhar' => '⥧',
-        'ldrushar' => '⥋',
-        'ldsh' => '↲',
-        'lE' => '≦',
-        'le' => '≤',
-        'LeftAngleBracket' => '⟨',
-        'LeftArrow' => '←',
-        'Leftarrow' => '⇐',
-        'leftarrow' => '←',
-        'LeftArrowBar' => '⇤',
-        'LeftArrowRightArrow' => '⇆',
-        'leftarrowtail' => '↢',
-        'LeftCeiling' => '⌈',
-        'LeftDoubleBracket' => '⟦',
-        'LeftDownTeeVector' => '⥡',
-        'LeftDownVector' => '⇃',
-        'LeftDownVectorBar' => '⥙',
-        'LeftFloor' => '⌊',
-        'leftharpoondown' => '↽',
-        'leftharpoonup' => '↼',
-        'leftleftarrows' => '⇇',
-        'LeftRightArrow' => '↔',
-        'Leftrightarrow' => '⇔',
-        'leftrightarrow' => '↔',
-        'leftrightarrows' => '⇆',
-        'leftrightharpoons' => '⇋',
-        'leftrightsquigarrow' => '↭',
-        'LeftRightVector' => '⥎',
-        'LeftTee' => '⊣',
-        'LeftTeeArrow' => '↤',
-        'LeftTeeVector' => '⥚',
-        'leftthreetimes' => '⋋',
-        'LeftTriangle' => '⊲',
-        'LeftTriangleBar' => '⧏',
-        'LeftTriangleEqual' => '⊴',
-        'LeftUpDownVector' => '⥑',
-        'LeftUpTeeVector' => '⥠',
-        'LeftUpVector' => '↿',
-        'LeftUpVectorBar' => '⥘',
-        'LeftVector' => '↼',
-        'LeftVectorBar' => '⥒',
-        'lEg' => '⪋',
-        'leg' => '⋚',
-        'leq' => '≤',
-        'leqq' => '≦',
-        'leqslant' => '⩽',
-        'les' => '⩽',
-        'lescc' => '⪨',
-        'lesdot' => '⩿',
-        'lesdoto' => '⪁',
-        'lesdotor' => '⪃',
-        'lesg' => '⋚︀',
-        'lesges' => '⪓',
-        'lessapprox' => '⪅',
-        'lessdot' => '⋖',
-        'lesseqgtr' => '⋚',
-        'lesseqqgtr' => '⪋',
-        'LessEqualGreater' => '⋚',
-        'LessFullEqual' => '≦',
-        'LessGreater' => '≶',
-        'lessgtr' => '≶',
-        'LessLess' => '⪡',
-        'lesssim' => '≲',
-        'LessSlantEqual' => '⩽',
-        'LessTilde' => '≲',
-        'lfisht' => '⥼',
-        'lfloor' => '⌊',
-        'Lfr' => '𝔏',
-        'lfr' => '𝔩',
-        'lg' => '≶',
-        'lgE' => '⪑',
-        'lHar' => '⥢',
-        'lhard' => '↽',
-        'lharu' => '↼',
-        'lharul' => '⥪',
-        'lhblk' => '▄',
-        'LJcy' => 'Љ',
-        'ljcy' => 'љ',
-        'Ll' => '⋘',
-        'll' => '≪',
-        'llarr' => '⇇',
-        'llcorner' => '⌞',
-        'Lleftarrow' => '⇚',
-        'llhard' => '⥫',
-        'lltri' => '◺',
-        'Lmidot' => 'Ŀ',
-        'lmidot' => 'ŀ',
-        'lmoust' => '⎰',
-        'lmoustache' => '⎰',
-        'lnap' => '⪉',
-        'lnapprox' => '⪉',
-        'lnE' => '≨',
-        'lne' => '⪇',
-        'lneq' => '⪇',
-        'lneqq' => '≨',
-        'lnsim' => '⋦',
-        'loang' => '⟬',
-        'loarr' => '⇽',
-        'lobrk' => '⟦',
-        'LongLeftArrow' => '⟵',
-        'Longleftarrow' => '⟸',
-        'longleftarrow' => '⟵',
-        'LongLeftRightArrow' => '⟷',
-        'Longleftrightarrow' => '⟺',
-        'longleftrightarrow' => '⟷',
-        'longmapsto' => '⟼',
-        'LongRightArrow' => '⟶',
-        'Longrightarrow' => '⟹',
-        'longrightarrow' => '⟶',
-        'looparrowleft' => '↫',
-        'looparrowright' => '↬',
-        'lopar' => '⦅',
-        'Lopf' => '𝕃',
-        'lopf' => '𝕝',
-        'loplus' => '⨭',
-        'lotimes' => '⨴',
-        'lowast' => '∗',
-        'lowbar' => '_',
-        'LowerLeftArrow' => '↙',
-        'LowerRightArrow' => '↘',
-        'loz' => '◊',
-        'lozenge' => '◊',
-        'lozf' => '⧫',
-        'lpar' => '(',
-        'lparlt' => '⦓',
-        'lrarr' => '⇆',
-        'lrcorner' => '⌟',
-        'lrhar' => '⇋',
-        'lrhard' => '⥭',
-        'lrm' => '‎',
-        'lrtri' => '⊿',
-        'lsaquo' => '‹',
-        'Lscr' => 'ℒ',
-        'lscr' => '𝓁',
-        'Lsh' => '↰',
-        'lsh' => '↰',
-        'lsim' => '≲',
-        'lsime' => '⪍',
-        'lsimg' => '⪏',
-        'lsqb' => '[',
-        'lsquo' => '‘',
-        'lsquor' => '‚',
-        'Lstrok' => 'Ł',
-        'lstrok' => 'ł',
-        'LT' => '<',
-        'L' => '<',
-        'Lt' => '≪',
-        'lt' => '<',
-        'l' => '<',
-        'ltcc' => '⪦',
-        'ltcir' => '⩹',
-        'ltdot' => '⋖',
-        'lthree' => '⋋',
-        'ltimes' => '⋉',
-        'ltlarr' => '⥶',
-        'ltquest' => '⩻',
-        'ltri' => '◃',
-        'ltrie' => '⊴',
-        'ltrif' => '◂',
-        'ltrPar' => '⦖',
-        'lurdshar' => '⥊',
-        'luruhar' => '⥦',
-        'lvertneqq' => '≨︀',
-        'lvnE' => '≨︀',
-        'macr' => '¯',
-        'mac' => '¯',
-        'male' => '♂',
-        'malt' => '✠',
-        'maltese' => '✠',
-        'Map' => '⤅',
-        'map' => '↦',
-        'mapsto' => '↦',
-        'mapstodown' => '↧',
-        'mapstoleft' => '↤',
-        'mapstoup' => '↥',
-        'marker' => '▮',
-        'mcomma' => '⨩',
-        'Mcy' => 'М',
-        'mcy' => 'м',
-        'mdash' => '—',
-        'mDDot' => '∺',
-        'measuredangle' => '∡',
-        'MediumSpace' => ' ',
-        'Mellintrf' => 'ℳ',
-        'Mfr' => '𝔐',
-        'mfr' => '𝔪',
-        'mho' => '℧',
-        'micro' => 'µ',
-        'micr' => 'µ',
-        'mid' => '∣',
-        'midast' => '*',
-        'midcir' => '⫰',
-        'middot' => '·',
-        'middo' => '·',
-        'minus' => '−',
-        'minusb' => '⊟',
-        'minusd' => '∸',
-        'minusdu' => '⨪',
-        'MinusPlus' => '∓',
-        'mlcp' => '⫛',
-        'mldr' => '…',
-        'mnplus' => '∓',
-        'models' => '⊧',
-        'Mopf' => '𝕄',
-        'mopf' => '𝕞',
-        'mp' => '∓',
-        'Mscr' => 'ℳ',
-        'mscr' => '𝓂',
-        'mstpos' => '∾',
-        'Mu' => 'Μ',
-        'mu' => 'μ',
-        'multimap' => '⊸',
-        'mumap' => '⊸',
-        'nabla' => '∇',
-        'Nacute' => 'Ń',
-        'nacute' => 'ń',
-        'nang' => '∠⃒',
-        'nap' => '≉',
-        'napE' => '⩰̸',
-        'napid' => '≋̸',
-        'napos' => 'ʼn',
-        'napprox' => '≉',
-        'natur' => '♮',
-        'natural' => '♮',
-        'naturals' => 'ℕ',
-        'nbsp' => ' ',
-        'nbs' => ' ',
-        'nbump' => '≎̸',
-        'nbumpe' => '≏̸',
-        'ncap' => '⩃',
-        'Ncaron' => 'Ň',
-        'ncaron' => 'ň',
-        'Ncedil' => 'Ņ',
-        'ncedil' => 'ņ',
-        'ncong' => '≇',
-        'ncongdot' => '⩭̸',
-        'ncup' => '⩂',
-        'Ncy' => 'Н',
-        'ncy' => 'н',
-        'ndash' => '–',
-        'ne' => '≠',
-        'nearhk' => '⤤',
-        'neArr' => '⇗',
-        'nearr' => '↗',
-        'nearrow' => '↗',
-        'nedot' => '≐̸',
-        'NegativeMediumSpace' => '​',
-        'NegativeThickSpace' => '​',
-        'NegativeThinSpace' => '​',
-        'NegativeVeryThinSpace' => '​',
-        'nequiv' => '≢',
-        'nesear' => '⤨',
-        'nesim' => '≂̸',
-        'NestedGreaterGreater' => '≫',
-        'NestedLessLess' => '≪',
-        'NewLine' => '
-',
-        'nexist' => '∄',
-        'nexists' => '∄',
-        'Nfr' => '𝔑',
-        'nfr' => '𝔫',
-        'ngE' => '≧̸',
-        'nge' => '≱',
-        'ngeq' => '≱',
-        'ngeqq' => '≧̸',
-        'ngeqslant' => '⩾̸',
-        'nges' => '⩾̸',
-        'nGg' => '⋙̸',
-        'ngsim' => '≵',
-        'nGt' => '≫⃒',
-        'ngt' => '≯',
-        'ngtr' => '≯',
-        'nGtv' => '≫̸',
-        'nhArr' => '⇎',
-        'nharr' => '↮',
-        'nhpar' => '⫲',
-        'ni' => '∋',
-        'nis' => '⋼',
-        'nisd' => '⋺',
-        'niv' => '∋',
-        'NJcy' => 'Њ',
-        'njcy' => 'њ',
-        'nlArr' => '⇍',
-        'nlarr' => '↚',
-        'nldr' => '‥',
-        'nlE' => '≦̸',
-        'nle' => '≰',
-        'nLeftarrow' => '⇍',
-        'nleftarrow' => '↚',
-        'nLeftrightarrow' => '⇎',
-        'nleftrightarrow' => '↮',
-        'nleq' => '≰',
-        'nleqq' => '≦̸',
-        'nleqslant' => '⩽̸',
-        'nles' => '⩽̸',
-        'nless' => '≮',
-        'nLl' => '⋘̸',
-        'nlsim' => '≴',
-        'nLt' => '≪⃒',
-        'nlt' => '≮',
-        'nltri' => '⋪',
-        'nltrie' => '⋬',
-        'nLtv' => '≪̸',
-        'nmid' => '∤',
-        'NoBreak' => '⁠',
-        'NonBreakingSpace' => ' ',
-        'Nopf' => 'ℕ',
-        'nopf' => '𝕟',
-        'Not' => '⫬',
-        'not' => '¬',
-        'no' => '¬',
-        'NotCongruent' => '≢',
-        'NotCupCap' => '≭',
-        'NotDoubleVerticalBar' => '∦',
-        'NotElement' => '∉',
-        'NotEqual' => '≠',
-        'NotEqualTilde' => '≂̸',
-        'NotExists' => '∄',
-        'NotGreater' => '≯',
-        'NotGreaterEqual' => '≱',
-        'NotGreaterFullEqual' => '≧̸',
-        'NotGreaterGreater' => '≫̸',
-        'NotGreaterLess' => '≹',
-        'NotGreaterSlantEqual' => '⩾̸',
-        'NotGreaterTilde' => '≵',
-        'NotHumpDownHump' => '≎̸',
-        'NotHumpEqual' => '≏̸',
-        'notin' => '∉',
-        'notindot' => '⋵̸',
-        'notinE' => '⋹̸',
-        'notinva' => '∉',
-        'notinvb' => '⋷',
-        'notinvc' => '⋶',
-        'NotLeftTriangle' => '⋪',
-        'NotLeftTriangleBar' => '⧏̸',
-        'NotLeftTriangleEqual' => '⋬',
-        'NotLess' => '≮',
-        'NotLessEqual' => '≰',
-        'NotLessGreater' => '≸',
-        'NotLessLess' => '≪̸',
-        'NotLessSlantEqual' => '⩽̸',
-        'NotLessTilde' => '≴',
-        'NotNestedGreaterGreater' => '⪢̸',
-        'NotNestedLessLess' => '⪡̸',
-        'notni' => '∌',
-        'notniva' => '∌',
-        'notnivb' => '⋾',
-        'notnivc' => '⋽',
-        'NotPrecedes' => '⊀',
-        'NotPrecedesEqual' => '⪯̸',
-        'NotPrecedesSlantEqual' => '⋠',
-        'NotReverseElement' => '∌',
-        'NotRightTriangle' => '⋫',
-        'NotRightTriangleBar' => '⧐̸',
-        'NotRightTriangleEqual' => '⋭',
-        'NotSquareSubset' => '⊏̸',
-        'NotSquareSubsetEqual' => '⋢',
-        'NotSquareSuperset' => '⊐̸',
-        'NotSquareSupersetEqual' => '⋣',
-        'NotSubset' => '⊂⃒',
-        'NotSubsetEqual' => '⊈',
-        'NotSucceeds' => '⊁',
-        'NotSucceedsEqual' => '⪰̸',
-        'NotSucceedsSlantEqual' => '⋡',
-        'NotSucceedsTilde' => '≿̸',
-        'NotSuperset' => '⊃⃒',
-        'NotSupersetEqual' => '⊉',
-        'NotTilde' => '≁',
-        'NotTildeEqual' => '≄',
-        'NotTildeFullEqual' => '≇',
-        'NotTildeTilde' => '≉',
-        'NotVerticalBar' => '∤',
-        'npar' => '∦',
-        'nparallel' => '∦',
-        'nparsl' => '⫽⃥',
-        'npart' => '∂̸',
-        'npolint' => '⨔',
-        'npr' => '⊀',
-        'nprcue' => '⋠',
-        'npre' => '⪯̸',
-        'nprec' => '⊀',
-        'npreceq' => '⪯̸',
-        'nrArr' => '⇏',
-        'nrarr' => '↛',
-        'nrarrc' => '⤳̸',
-        'nrarrw' => '↝̸',
-        'nRightarrow' => '⇏',
-        'nrightarrow' => '↛',
-        'nrtri' => '⋫',
-        'nrtrie' => '⋭',
-        'nsc' => '⊁',
-        'nsccue' => '⋡',
-        'nsce' => '⪰̸',
-        'Nscr' => '𝒩',
-        'nscr' => '𝓃',
-        'nshortmid' => '∤',
-        'nshortparallel' => '∦',
-        'nsim' => '≁',
-        'nsime' => '≄',
-        'nsimeq' => '≄',
-        'nsmid' => '∤',
-        'nspar' => '∦',
-        'nsqsube' => '⋢',
-        'nsqsupe' => '⋣',
-        'nsub' => '⊄',
-        'nsubE' => '⫅̸',
-        'nsube' => '⊈',
-        'nsubset' => '⊂⃒',
-        'nsubseteq' => '⊈',
-        'nsubseteqq' => '⫅̸',
-        'nsucc' => '⊁',
-        'nsucceq' => '⪰̸',
-        'nsup' => '⊅',
-        'nsupE' => '⫆̸',
-        'nsupe' => '⊉',
-        'nsupset' => '⊃⃒',
-        'nsupseteq' => '⊉',
-        'nsupseteqq' => '⫆̸',
-        'ntgl' => '≹',
-        'Ntilde' => 'Ñ',
-        'Ntild' => 'Ñ',
-        'ntilde' => 'ñ',
-        'ntild' => 'ñ',
-        'ntlg' => '≸',
-        'ntriangleleft' => '⋪',
-        'ntrianglelefteq' => '⋬',
-        'ntriangleright' => '⋫',
-        'ntrianglerighteq' => '⋭',
-        'Nu' => 'Ν',
-        'nu' => 'ν',
-        'num' => '#',
-        'numero' => '№',
-        'numsp' => ' ',
-        'nvap' => '≍⃒',
-        'nVDash' => '⊯',
-        'nVdash' => '⊮',
-        'nvDash' => '⊭',
-        'nvdash' => '⊬',
-        'nvge' => '≥⃒',
-        'nvgt' => '>⃒',
-        'nvHarr' => '⤄',
-        'nvinfin' => '⧞',
-        'nvlArr' => '⤂',
-        'nvle' => '≤⃒',
-        'nvlt' => '<⃒',
-        'nvltrie' => '⊴⃒',
-        'nvrArr' => '⤃',
-        'nvrtrie' => '⊵⃒',
-        'nvsim' => '∼⃒',
-        'nwarhk' => '⤣',
-        'nwArr' => '⇖',
-        'nwarr' => '↖',
-        'nwarrow' => '↖',
-        'nwnear' => '⤧',
-        'Oacute' => 'Ó',
-        'Oacut' => 'Ó',
-        'oacute' => 'ó',
-        'oacut' => 'ó',
-        'oast' => '⊛',
-        'ocir' => 'ô',
-        'Ocirc' => 'Ô',
-        'Ocir' => 'Ô',
-        'ocirc' => 'ô',
-        'Ocy' => 'О',
-        'ocy' => 'о',
-        'odash' => '⊝',
-        'Odblac' => 'Ő',
-        'odblac' => 'ő',
-        'odiv' => '⨸',
-        'odot' => '⊙',
-        'odsold' => '⦼',
-        'OElig' => 'Œ',
-        'oelig' => 'œ',
-        'ofcir' => '⦿',
-        'Ofr' => '𝔒',
-        'ofr' => '𝔬',
-        'ogon' => '˛',
-        'Ograve' => 'Ò',
-        'Ograv' => 'Ò',
-        'ograve' => 'ò',
-        'ograv' => 'ò',
-        'ogt' => '⧁',
-        'ohbar' => '⦵',
-        'ohm' => 'Ω',
-        'oint' => '∮',
-        'olarr' => '↺',
-        'olcir' => '⦾',
-        'olcross' => '⦻',
-        'oline' => '‾',
-        'olt' => '⧀',
-        'Omacr' => 'Ō',
-        'omacr' => 'ō',
-        'Omega' => 'Ω',
-        'omega' => 'ω',
-        'Omicron' => 'Ο',
-        'omicron' => 'ο',
-        'omid' => '⦶',
-        'ominus' => '⊖',
-        'Oopf' => '𝕆',
-        'oopf' => '𝕠',
-        'opar' => '⦷',
-        'OpenCurlyDoubleQuote' => '“',
-        'OpenCurlyQuote' => '‘',
-        'operp' => '⦹',
-        'oplus' => '⊕',
-        'Or' => '⩔',
-        'or' => '∨',
-        'orarr' => '↻',
-        'ord' => 'º',
-        'order' => 'ℴ',
-        'orderof' => 'ℴ',
-        'ordf' => 'ª',
-        'ordm' => 'º',
-        'origof' => '⊶',
-        'oror' => '⩖',
-        'orslope' => '⩗',
-        'orv' => '⩛',
-        'oS' => 'Ⓢ',
-        'Oscr' => '𝒪',
-        'oscr' => 'ℴ',
-        'Oslash' => 'Ø',
-        'Oslas' => 'Ø',
-        'oslash' => 'ø',
-        'oslas' => 'ø',
-        'osol' => '⊘',
-        'Otilde' => 'Õ',
-        'Otild' => 'Õ',
-        'otilde' => 'õ',
-        'otild' => 'õ',
-        'Otimes' => '⨷',
-        'otimes' => '⊗',
-        'otimesas' => '⨶',
-        'Ouml' => 'Ö',
-        'Oum' => 'Ö',
-        'ouml' => 'ö',
-        'oum' => 'ö',
-        'ovbar' => '⌽',
-        'OverBar' => '‾',
-        'OverBrace' => '⏞',
-        'OverBracket' => '⎴',
-        'OverParenthesis' => '⏜',
-        'par' => '¶',
-        'para' => '¶',
-        'parallel' => '∥',
-        'parsim' => '⫳',
-        'parsl' => '⫽',
-        'part' => '∂',
-        'PartialD' => '∂',
-        'Pcy' => 'П',
-        'pcy' => 'п',
-        'percnt' => '%',
-        'period' => '.',
-        'permil' => '‰',
-        'perp' => '⊥',
-        'pertenk' => '‱',
-        'Pfr' => '𝔓',
-        'pfr' => '𝔭',
-        'Phi' => 'Φ',
-        'phi' => 'φ',
-        'phiv' => 'ϕ',
-        'phmmat' => 'ℳ',
-        'phone' => '☎',
-        'Pi' => 'Π',
-        'pi' => 'π',
-        'pitchfork' => '⋔',
-        'piv' => 'ϖ',
-        'planck' => 'ℏ',
-        'planckh' => 'ℎ',
-        'plankv' => 'ℏ',
-        'plus' => '+',
-        'plusacir' => '⨣',
-        'plusb' => '⊞',
-        'pluscir' => '⨢',
-        'plusdo' => '∔',
-        'plusdu' => '⨥',
-        'pluse' => '⩲',
-        'PlusMinus' => '±',
-        'plusmn' => '±',
-        'plusm' => '±',
-        'plussim' => '⨦',
-        'plustwo' => '⨧',
-        'pm' => '±',
-        'Poincareplane' => 'ℌ',
-        'pointint' => '⨕',
-        'Popf' => 'ℙ',
-        'popf' => '𝕡',
-        'pound' => '£',
-        'poun' => '£',
-        'Pr' => '⪻',
-        'pr' => '≺',
-        'prap' => '⪷',
-        'prcue' => '≼',
-        'prE' => '⪳',
-        'pre' => '⪯',
-        'prec' => '≺',
-        'precapprox' => '⪷',
-        'preccurlyeq' => '≼',
-        'Precedes' => '≺',
-        'PrecedesEqual' => '⪯',
-        'PrecedesSlantEqual' => '≼',
-        'PrecedesTilde' => '≾',
-        'preceq' => '⪯',
-        'precnapprox' => '⪹',
-        'precneqq' => '⪵',
-        'precnsim' => '⋨',
-        'precsim' => '≾',
-        'Prime' => '″',
-        'prime' => '′',
-        'primes' => 'ℙ',
-        'prnap' => '⪹',
-        'prnE' => '⪵',
-        'prnsim' => '⋨',
-        'prod' => '∏',
-        'Product' => '∏',
-        'profalar' => '⌮',
-        'profline' => '⌒',
-        'profsurf' => '⌓',
-        'prop' => '∝',
-        'Proportion' => '∷',
-        'Proportional' => '∝',
-        'propto' => '∝',
-        'prsim' => '≾',
-        'prurel' => '⊰',
-        'Pscr' => '𝒫',
-        'pscr' => '𝓅',
-        'Psi' => 'Ψ',
-        'psi' => 'ψ',
-        'puncsp' => ' ',
-        'Qfr' => '𝔔',
-        'qfr' => '𝔮',
-        'qint' => '⨌',
-        'Qopf' => 'ℚ',
-        'qopf' => '𝕢',
-        'qprime' => '⁗',
-        'Qscr' => '𝒬',
-        'qscr' => '𝓆',
-        'quaternions' => 'ℍ',
-        'quatint' => '⨖',
-        'quest' => '?',
-        'questeq' => '≟',
-        'QUOT' => '"',
-        'QUO' => '"',
-        'quot' => '"',
-        'quo' => '"',
-        'rAarr' => '⇛',
-        'race' => '∽̱',
-        'Racute' => 'Ŕ',
-        'racute' => 'ŕ',
-        'radic' => '√',
-        'raemptyv' => '⦳',
-        'Rang' => '⟫',
-        'rang' => '⟩',
-        'rangd' => '⦒',
-        'range' => '⦥',
-        'rangle' => '⟩',
-        'raquo' => '»',
-        'raqu' => '»',
-        'Rarr' => '↠',
-        'rArr' => '⇒',
-        'rarr' => '→',
-        'rarrap' => '⥵',
-        'rarrb' => '⇥',
-        'rarrbfs' => '⤠',
-        'rarrc' => '⤳',
-        'rarrfs' => '⤞',
-        'rarrhk' => '↪',
-        'rarrlp' => '↬',
-        'rarrpl' => '⥅',
-        'rarrsim' => '⥴',
-        'Rarrtl' => '⤖',
-        'rarrtl' => '↣',
-        'rarrw' => '↝',
-        'rAtail' => '⤜',
-        'ratail' => '⤚',
-        'ratio' => '∶',
-        'rationals' => 'ℚ',
-        'RBarr' => '⤐',
-        'rBarr' => '⤏',
-        'rbarr' => '⤍',
-        'rbbrk' => '❳',
-        'rbrace' => '}',
-        'rbrack' => ']',
-        'rbrke' => '⦌',
-        'rbrksld' => '⦎',
-        'rbrkslu' => '⦐',
-        'Rcaron' => 'Ř',
-        'rcaron' => 'ř',
-        'Rcedil' => 'Ŗ',
-        'rcedil' => 'ŗ',
-        'rceil' => '⌉',
-        'rcub' => '}',
-        'Rcy' => 'Р',
-        'rcy' => 'р',
-        'rdca' => '⤷',
-        'rdldhar' => '⥩',
-        'rdquo' => '”',
-        'rdquor' => '”',
-        'rdsh' => '↳',
-        'Re' => 'ℜ',
-        'real' => 'ℜ',
-        'realine' => 'ℛ',
-        'realpart' => 'ℜ',
-        'reals' => 'ℝ',
-        'rect' => '▭',
-        'REG' => '®',
-        'RE' => '®',
-        'reg' => '®',
-        're' => '®',
-        'ReverseElement' => '∋',
-        'ReverseEquilibrium' => '⇋',
-        'ReverseUpEquilibrium' => '⥯',
-        'rfisht' => '⥽',
-        'rfloor' => '⌋',
-        'Rfr' => 'ℜ',
-        'rfr' => '𝔯',
-        'rHar' => '⥤',
-        'rhard' => '⇁',
-        'rharu' => '⇀',
-        'rharul' => '⥬',
-        'Rho' => 'Ρ',
-        'rho' => 'ρ',
-        'rhov' => 'ϱ',
-        'RightAngleBracket' => '⟩',
-        'RightArrow' => '→',
-        'Rightarrow' => '⇒',
-        'rightarrow' => '→',
-        'RightArrowBar' => '⇥',
-        'RightArrowLeftArrow' => '⇄',
-        'rightarrowtail' => '↣',
-        'RightCeiling' => '⌉',
-        'RightDoubleBracket' => '⟧',
-        'RightDownTeeVector' => '⥝',
-        'RightDownVector' => '⇂',
-        'RightDownVectorBar' => '⥕',
-        'RightFloor' => '⌋',
-        'rightharpoondown' => '⇁',
-        'rightharpoonup' => '⇀',
-        'rightleftarrows' => '⇄',
-        'rightleftharpoons' => '⇌',
-        'rightrightarrows' => '⇉',
-        'rightsquigarrow' => '↝',
-        'RightTee' => '⊢',
-        'RightTeeArrow' => '↦',
-        'RightTeeVector' => '⥛',
-        'rightthreetimes' => '⋌',
-        'RightTriangle' => '⊳',
-        'RightTriangleBar' => '⧐',
-        'RightTriangleEqual' => '⊵',
-        'RightUpDownVector' => '⥏',
-        'RightUpTeeVector' => '⥜',
-        'RightUpVector' => '↾',
-        'RightUpVectorBar' => '⥔',
-        'RightVector' => '⇀',
-        'RightVectorBar' => '⥓',
-        'ring' => '˚',
-        'risingdotseq' => '≓',
-        'rlarr' => '⇄',
-        'rlhar' => '⇌',
-        'rlm' => '‏',
-        'rmoust' => '⎱',
-        'rmoustache' => '⎱',
-        'rnmid' => '⫮',
-        'roang' => '⟭',
-        'roarr' => '⇾',
-        'robrk' => '⟧',
-        'ropar' => '⦆',
-        'Ropf' => 'ℝ',
-        'ropf' => '𝕣',
-        'roplus' => '⨮',
-        'rotimes' => '⨵',
-        'RoundImplies' => '⥰',
-        'rpar' => ')',
-        'rpargt' => '⦔',
-        'rppolint' => '⨒',
-        'rrarr' => '⇉',
-        'Rrightarrow' => '⇛',
-        'rsaquo' => '›',
-        'Rscr' => 'ℛ',
-        'rscr' => '𝓇',
-        'Rsh' => '↱',
-        'rsh' => '↱',
-        'rsqb' => ']',
-        'rsquo' => '’',
-        'rsquor' => '’',
-        'rthree' => '⋌',
-        'rtimes' => '⋊',
-        'rtri' => '▹',
-        'rtrie' => '⊵',
-        'rtrif' => '▸',
-        'rtriltri' => '⧎',
-        'RuleDelayed' => '⧴',
-        'ruluhar' => '⥨',
-        'rx' => '℞',
-        'Sacute' => 'Ś',
-        'sacute' => 'ś',
-        'sbquo' => '‚',
-        'Sc' => '⪼',
-        'sc' => '≻',
-        'scap' => '⪸',
-        'Scaron' => 'Š',
-        'scaron' => 'š',
-        'sccue' => '≽',
-        'scE' => '⪴',
-        'sce' => '⪰',
-        'Scedil' => 'Ş',
-        'scedil' => 'ş',
-        'Scirc' => 'Ŝ',
-        'scirc' => 'ŝ',
-        'scnap' => '⪺',
-        'scnE' => '⪶',
-        'scnsim' => '⋩',
-        'scpolint' => '⨓',
-        'scsim' => '≿',
-        'Scy' => 'С',
-        'scy' => 'с',
-        'sdot' => '⋅',
-        'sdotb' => '⊡',
-        'sdote' => '⩦',
-        'searhk' => '⤥',
-        'seArr' => '⇘',
-        'searr' => '↘',
-        'searrow' => '↘',
-        'sect' => '§',
-        'sec' => '§',
-        'semi' => ';',
-        'seswar' => '⤩',
-        'setminus' => '∖',
-        'setmn' => '∖',
-        'sext' => '✶',
-        'Sfr' => '𝔖',
-        'sfr' => '𝔰',
-        'sfrown' => '⌢',
-        'sharp' => '♯',
-        'SHCHcy' => 'Щ',
-        'shchcy' => 'щ',
-        'SHcy' => 'Ш',
-        'shcy' => 'ш',
-        'ShortDownArrow' => '↓',
-        'ShortLeftArrow' => '←',
-        'shortmid' => '∣',
-        'shortparallel' => '∥',
-        'ShortRightArrow' => '→',
-        'ShortUpArrow' => '↑',
-        'shy' => '­',
-        'sh' => '­',
-        'Sigma' => 'Σ',
-        'sigma' => 'σ',
-        'sigmaf' => 'ς',
-        'sigmav' => 'ς',
-        'sim' => '∼',
-        'simdot' => '⩪',
-        'sime' => '≃',
-        'simeq' => '≃',
-        'simg' => '⪞',
-        'simgE' => '⪠',
-        'siml' => '⪝',
-        'simlE' => '⪟',
-        'simne' => '≆',
-        'simplus' => '⨤',
-        'simrarr' => '⥲',
-        'slarr' => '←',
-        'SmallCircle' => '∘',
-        'smallsetminus' => '∖',
-        'smashp' => '⨳',
-        'smeparsl' => '⧤',
-        'smid' => '∣',
-        'smile' => '⌣',
-        'smt' => '⪪',
-        'smte' => '⪬',
-        'smtes' => '⪬︀',
-        'SOFTcy' => 'Ь',
-        'softcy' => 'ь',
-        'sol' => '/',
-        'solb' => '⧄',
-        'solbar' => '⌿',
-        'Sopf' => '𝕊',
-        'sopf' => '𝕤',
-        'spades' => '♠',
-        'spadesuit' => '♠',
-        'spar' => '∥',
-        'sqcap' => '⊓',
-        'sqcaps' => '⊓︀',
-        'sqcup' => '⊔',
-        'sqcups' => '⊔︀',
-        'Sqrt' => '√',
-        'sqsub' => '⊏',
-        'sqsube' => '⊑',
-        'sqsubset' => '⊏',
-        'sqsubseteq' => '⊑',
-        'sqsup' => '⊐',
-        'sqsupe' => '⊒',
-        'sqsupset' => '⊐',
-        'sqsupseteq' => '⊒',
-        'squ' => '□',
-        'Square' => '□',
-        'square' => '□',
-        'SquareIntersection' => '⊓',
-        'SquareSubset' => '⊏',
-        'SquareSubsetEqual' => '⊑',
-        'SquareSuperset' => '⊐',
-        'SquareSupersetEqual' => '⊒',
-        'SquareUnion' => '⊔',
-        'squarf' => '▪',
-        'squf' => '▪',
-        'srarr' => '→',
-        'Sscr' => '𝒮',
-        'sscr' => '𝓈',
-        'ssetmn' => '∖',
-        'ssmile' => '⌣',
-        'sstarf' => '⋆',
-        'Star' => '⋆',
-        'star' => '☆',
-        'starf' => '★',
-        'straightepsilon' => 'ϵ',
-        'straightphi' => 'ϕ',
-        'strns' => '¯',
-        'Sub' => '⋐',
-        'sub' => '⊂',
-        'subdot' => '⪽',
-        'subE' => '⫅',
-        'sube' => '⊆',
-        'subedot' => '⫃',
-        'submult' => '⫁',
-        'subnE' => '⫋',
-        'subne' => '⊊',
-        'subplus' => '⪿',
-        'subrarr' => '⥹',
-        'Subset' => '⋐',
-        'subset' => '⊂',
-        'subseteq' => '⊆',
-        'subseteqq' => '⫅',
-        'SubsetEqual' => '⊆',
-        'subsetneq' => '⊊',
-        'subsetneqq' => '⫋',
-        'subsim' => '⫇',
-        'subsub' => '⫕',
-        'subsup' => '⫓',
-        'succ' => '≻',
-        'succapprox' => '⪸',
-        'succcurlyeq' => '≽',
-        'Succeeds' => '≻',
-        'SucceedsEqual' => '⪰',
-        'SucceedsSlantEqual' => '≽',
-        'SucceedsTilde' => '≿',
-        'succeq' => '⪰',
-        'succnapprox' => '⪺',
-        'succneqq' => '⪶',
-        'succnsim' => '⋩',
-        'succsim' => '≿',
-        'SuchThat' => '∋',
-        'Sum' => '∑',
-        'sum' => '∑',
-        'sung' => '♪',
-        'Sup' => '⋑',
-        'sup' => '³',
-        'sup1' => '¹',
-        'sup2' => '²',
-        'sup3' => '³',
-        'supdot' => '⪾',
-        'supdsub' => '⫘',
-        'supE' => '⫆',
-        'supe' => '⊇',
-        'supedot' => '⫄',
-        'Superset' => '⊃',
-        'SupersetEqual' => '⊇',
-        'suphsol' => '⟉',
-        'suphsub' => '⫗',
-        'suplarr' => '⥻',
-        'supmult' => '⫂',
-        'supnE' => '⫌',
-        'supne' => '⊋',
-        'supplus' => '⫀',
-        'Supset' => '⋑',
-        'supset' => '⊃',
-        'supseteq' => '⊇',
-        'supseteqq' => '⫆',
-        'supsetneq' => '⊋',
-        'supsetneqq' => '⫌',
-        'supsim' => '⫈',
-        'supsub' => '⫔',
-        'supsup' => '⫖',
-        'swarhk' => '⤦',
-        'swArr' => '⇙',
-        'swarr' => '↙',
-        'swarrow' => '↙',
-        'swnwar' => '⤪',
-        'szlig' => 'ß',
-        'szli' => 'ß',
-        'Tab' => '	',
-        'target' => '⌖',
-        'Tau' => 'Τ',
-        'tau' => 'τ',
-        'tbrk' => '⎴',
-        'Tcaron' => 'Ť',
-        'tcaron' => 'ť',
-        'Tcedil' => 'Ţ',
-        'tcedil' => 'ţ',
-        'Tcy' => 'Т',
-        'tcy' => 'т',
-        'tdot' => '⃛',
-        'telrec' => '⌕',
-        'Tfr' => '𝔗',
-        'tfr' => '𝔱',
-        'there4' => '∴',
-        'Therefore' => '∴',
-        'therefore' => '∴',
-        'Theta' => 'Θ',
-        'theta' => 'θ',
-        'thetasym' => 'ϑ',
-        'thetav' => 'ϑ',
-        'thickapprox' => '≈',
-        'thicksim' => '∼',
-        'ThickSpace' => '  ',
-        'thinsp' => ' ',
-        'ThinSpace' => ' ',
-        'thkap' => '≈',
-        'thksim' => '∼',
-        'THORN' => 'Þ',
-        'THOR' => 'Þ',
-        'thorn' => 'þ',
-        'thor' => 'þ',
-        'Tilde' => '∼',
-        'tilde' => '˜',
-        'TildeEqual' => '≃',
-        'TildeFullEqual' => '≅',
-        'TildeTilde' => '≈',
-        'times' => '×',
-        'time' => '×',
-        'timesb' => '⊠',
-        'timesbar' => '⨱',
-        'timesd' => '⨰',
-        'tint' => '∭',
-        'toea' => '⤨',
-        'top' => '⊤',
-        'topbot' => '⌶',
-        'topcir' => '⫱',
-        'Topf' => '𝕋',
-        'topf' => '𝕥',
-        'topfork' => '⫚',
-        'tosa' => '⤩',
-        'tprime' => '‴',
-        'TRADE' => '™',
-        'trade' => '™',
-        'triangle' => '▵',
-        'triangledown' => '▿',
-        'triangleleft' => '◃',
-        'trianglelefteq' => '⊴',
-        'triangleq' => '≜',
-        'triangleright' => '▹',
-        'trianglerighteq' => '⊵',
-        'tridot' => '◬',
-        'trie' => '≜',
-        'triminus' => '⨺',
-        'TripleDot' => '⃛',
-        'triplus' => '⨹',
-        'trisb' => '⧍',
-        'tritime' => '⨻',
-        'trpezium' => '⏢',
-        'Tscr' => '𝒯',
-        'tscr' => '𝓉',
-        'TScy' => 'Ц',
-        'tscy' => 'ц',
-        'TSHcy' => 'Ћ',
-        'tshcy' => 'ћ',
-        'Tstrok' => 'Ŧ',
-        'tstrok' => 'ŧ',
-        'twixt' => '≬',
-        'twoheadleftarrow' => '↞',
-        'twoheadrightarrow' => '↠',
-        'Uacute' => 'Ú',
-        'Uacut' => 'Ú',
-        'uacute' => 'ú',
-        'uacut' => 'ú',
-        'Uarr' => '↟',
-        'uArr' => '⇑',
-        'uarr' => '↑',
-        'Uarrocir' => '⥉',
-        'Ubrcy' => 'Ў',
-        'ubrcy' => 'ў',
-        'Ubreve' => 'Ŭ',
-        'ubreve' => 'ŭ',
-        'Ucirc' => 'Û',
-        'Ucir' => 'Û',
-        'ucirc' => 'û',
-        'ucir' => 'û',
-        'Ucy' => 'У',
-        'ucy' => 'у',
-        'udarr' => '⇅',
-        'Udblac' => 'Ű',
-        'udblac' => 'ű',
-        'udhar' => '⥮',
-        'ufisht' => '⥾',
-        'Ufr' => '𝔘',
-        'ufr' => '𝔲',
-        'Ugrave' => 'Ù',
-        'Ugrav' => 'Ù',
-        'ugrave' => 'ù',
-        'ugrav' => 'ù',
-        'uHar' => '⥣',
-        'uharl' => '↿',
-        'uharr' => '↾',
-        'uhblk' => '▀',
-        'ulcorn' => '⌜',
-        'ulcorner' => '⌜',
-        'ulcrop' => '⌏',
-        'ultri' => '◸',
-        'Umacr' => 'Ū',
-        'umacr' => 'ū',
-        'uml' => '¨',
-        'um' => '¨',
-        'UnderBar' => '_',
-        'UnderBrace' => '⏟',
-        'UnderBracket' => '⎵',
-        'UnderParenthesis' => '⏝',
-        'Union' => '⋃',
-        'UnionPlus' => '⊎',
-        'Uogon' => 'Ų',
-        'uogon' => 'ų',
-        'Uopf' => '𝕌',
-        'uopf' => '𝕦',
-        'UpArrow' => '↑',
-        'Uparrow' => '⇑',
-        'uparrow' => '↑',
-        'UpArrowBar' => '⤒',
-        'UpArrowDownArrow' => '⇅',
-        'UpDownArrow' => '↕',
-        'Updownarrow' => '⇕',
-        'updownarrow' => '↕',
-        'UpEquilibrium' => '⥮',
-        'upharpoonleft' => '↿',
-        'upharpoonright' => '↾',
-        'uplus' => '⊎',
-        'UpperLeftArrow' => '↖',
-        'UpperRightArrow' => '↗',
-        'Upsi' => 'ϒ',
-        'upsi' => 'υ',
-        'upsih' => 'ϒ',
-        'Upsilon' => 'Υ',
-        'upsilon' => 'υ',
-        'UpTee' => '⊥',
-        'UpTeeArrow' => '↥',
-        'upuparrows' => '⇈',
-        'urcorn' => '⌝',
-        'urcorner' => '⌝',
-        'urcrop' => '⌎',
-        'Uring' => 'Ů',
-        'uring' => 'ů',
-        'urtri' => '◹',
-        'Uscr' => '𝒰',
-        'uscr' => '𝓊',
-        'utdot' => '⋰',
-        'Utilde' => 'Ũ',
-        'utilde' => 'ũ',
-        'utri' => '▵',
-        'utrif' => '▴',
-        'uuarr' => '⇈',
-        'Uuml' => 'Ü',
-        'Uum' => 'Ü',
-        'uuml' => 'ü',
-        'uum' => 'ü',
-        'uwangle' => '⦧',
-        'vangrt' => '⦜',
-        'varepsilon' => 'ϵ',
-        'varkappa' => 'ϰ',
-        'varnothing' => '∅',
-        'varphi' => 'ϕ',
-        'varpi' => 'ϖ',
-        'varpropto' => '∝',
-        'vArr' => '⇕',
-        'varr' => '↕',
-        'varrho' => 'ϱ',
-        'varsigma' => 'ς',
-        'varsubsetneq' => '⊊︀',
-        'varsubsetneqq' => '⫋︀',
-        'varsupsetneq' => '⊋︀',
-        'varsupsetneqq' => '⫌︀',
-        'vartheta' => 'ϑ',
-        'vartriangleleft' => '⊲',
-        'vartriangleright' => '⊳',
-        'Vbar' => '⫫',
-        'vBar' => '⫨',
-        'vBarv' => '⫩',
-        'Vcy' => 'В',
-        'vcy' => 'в',
-        'VDash' => '⊫',
-        'Vdash' => '⊩',
-        'vDash' => '⊨',
-        'vdash' => '⊢',
-        'Vdashl' => '⫦',
-        'Vee' => '⋁',
-        'vee' => '∨',
-        'veebar' => '⊻',
-        'veeeq' => '≚',
-        'vellip' => '⋮',
-        'Verbar' => '‖',
-        'verbar' => '|',
-        'Vert' => '‖',
-        'vert' => '|',
-        'VerticalBar' => '∣',
-        'VerticalLine' => '|',
-        'VerticalSeparator' => '❘',
-        'VerticalTilde' => '≀',
-        'VeryThinSpace' => ' ',
-        'Vfr' => '𝔙',
-        'vfr' => '𝔳',
-        'vltri' => '⊲',
-        'vnsub' => '⊂⃒',
-        'vnsup' => '⊃⃒',
-        'Vopf' => '𝕍',
-        'vopf' => '𝕧',
-        'vprop' => '∝',
-        'vrtri' => '⊳',
-        'Vscr' => '𝒱',
-        'vscr' => '𝓋',
-        'vsubnE' => '⫋︀',
-        'vsubne' => '⊊︀',
-        'vsupnE' => '⫌︀',
-        'vsupne' => '⊋︀',
-        'Vvdash' => '⊪',
-        'vzigzag' => '⦚',
-        'Wcirc' => 'Ŵ',
-        'wcirc' => 'ŵ',
-        'wedbar' => '⩟',
-        'Wedge' => '⋀',
-        'wedge' => '∧',
-        'wedgeq' => '≙',
-        'weierp' => '℘',
-        'Wfr' => '𝔚',
-        'wfr' => '𝔴',
-        'Wopf' => '𝕎',
-        'wopf' => '𝕨',
-        'wp' => '℘',
-        'wr' => '≀',
-        'wreath' => '≀',
-        'Wscr' => '𝒲',
-        'wscr' => '𝓌',
-        'xcap' => '⋂',
-        'xcirc' => '◯',
-        'xcup' => '⋃',
-        'xdtri' => '▽',
-        'Xfr' => '𝔛',
-        'xfr' => '𝔵',
-        'xhArr' => '⟺',
-        'xharr' => '⟷',
-        'Xi' => 'Ξ',
-        'xi' => 'ξ',
-        'xlArr' => '⟸',
-        'xlarr' => '⟵',
-        'xmap' => '⟼',
-        'xnis' => '⋻',
-        'xodot' => '⨀',
-        'Xopf' => '𝕏',
-        'xopf' => '𝕩',
-        'xoplus' => '⨁',
-        'xotime' => '⨂',
-        'xrArr' => '⟹',
-        'xrarr' => '⟶',
-        'Xscr' => '𝒳',
-        'xscr' => '𝓍',
-        'xsqcup' => '⨆',
-        'xuplus' => '⨄',
-        'xutri' => '△',
-        'xvee' => '⋁',
-        'xwedge' => '⋀',
-        'Yacute' => 'Ý',
-        'Yacut' => 'Ý',
-        'yacute' => 'ý',
-        'yacut' => 'ý',
-        'YAcy' => 'Я',
-        'yacy' => 'я',
-        'Ycirc' => 'Ŷ',
-        'ycirc' => 'ŷ',
-        'Ycy' => 'Ы',
-        'ycy' => 'ы',
-        'yen' => '¥',
-        'ye' => '¥',
-        'Yfr' => '𝔜',
-        'yfr' => '𝔶',
-        'YIcy' => 'Ї',
-        'yicy' => 'ї',
-        'Yopf' => '𝕐',
-        'yopf' => '𝕪',
-        'Yscr' => '𝒴',
-        'yscr' => '𝓎',
-        'YUcy' => 'Ю',
-        'yucy' => 'ю',
-        'Yuml' => 'Ÿ',
-        'yuml' => 'ÿ',
-        'yum' => 'ÿ',
-        'Zacute' => 'Ź',
-        'zacute' => 'ź',
-        'Zcaron' => 'Ž',
-        'zcaron' => 'ž',
-        'Zcy' => 'З',
-        'zcy' => 'з',
-        'Zdot' => 'Ż',
-        'zdot' => 'ż',
-        'zeetrf' => 'ℨ',
-        'ZeroWidthSpace' => '​',
-        'Zeta' => 'Ζ',
-        'zeta' => 'ζ',
-        'Zfr' => 'ℨ',
-        'zfr' => '𝔷',
-        'ZHcy' => 'Ж',
-        'zhcy' => 'ж',
-        'zigrarr' => '⇝',
-        'Zopf' => 'ℤ',
-        'zopf' => '𝕫',
-        'Zscr' => '𝒵',
-        'zscr' => '𝓏',
-        'zwj' => '‍',
-        'zwnj' => '‌'
-    );
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Exception.php b/vendor/masterminds/html5/src/HTML5/Exception.php
deleted file mode 100644
index 8f33126..0000000
--- a/vendor/masterminds/html5/src/HTML5/Exception.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Masterminds\HTML5;
-
-/**
- * The base exception for the HTML5 project.
- */
-class Exception extends \Exception
-{
-}
diff --git a/vendor/masterminds/html5/src/HTML5/InstructionProcessor.php b/vendor/masterminds/html5/src/HTML5/InstructionProcessor.php
deleted file mode 100644
index ac6a23c..0000000
--- a/vendor/masterminds/html5/src/HTML5/InstructionProcessor.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * A handler for processor instructions.
- */
-namespace Masterminds\HTML5;
-
-/**
- * Provide an processor to handle embedded instructions.
- *
- * XML defines a mechanism for inserting instructions (like PHP) into a
- * document. These are called "Processor Instructions." The HTML5 parser
- * provides an opportunity to handle these processor instructions during
- * the tree-building phase (before the DOM is constructed), which makes
- * it possible to alter the document as it is being created.
- *
- * One could, for example, use this mechanism to execute well-formed PHP
- * code embedded inside of an HTML5 document.
- */
-interface InstructionProcessor
-{
-
-    /**
-     * Process an individual processing instruction.
-     *
-     * The process() function is responsible for doing the following:
-     * - Determining whether $name is an instruction type it can handle.
-     * - Determining what to do with the data passed in.
-     * - Making any subsequent modifications to the DOM by modifying the
-     * DOMElement or its attached DOM tree.
-     *
-     * @param DOMElement $element
-     *            The parent element for the current processing instruction.
-     * @param string $name
-     *            The instruction's name. E.g. `&lt;?php` has the name `php`.
-     * @param string $data
-     *            All of the data between the opening and closing PI marks.
-     * @return DOMElement The element that should be considered "Current". This may just be
-     *         the element passed in, but if the processor added more elements,
-     *         it may choose to reset the current element to one of the elements
-     *         it created. (When in doubt, return the element passed in.)
-     */
-    public function process(\DOMElement $element, $name, $data);
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/CharacterReference.php b/vendor/masterminds/html5/src/HTML5/Parser/CharacterReference.php
deleted file mode 100644
index c1617e7..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/CharacterReference.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-use Masterminds\HTML5\Entities;
-
-/**
- * Manage entity references.
- *
- * This is a simple resolver for HTML5 character reference entitites.
- * See \Masterminds\HTML5\Entities for the list of supported entities.
- */
-class CharacterReference
-{
-
-    protected static $numeric_mask = array(
-        0x0,
-        0x2FFFF,
-        0,
-        0xFFFF
-    );
-
-    /**
-     * Given a name (e.g.
-     * 'amp'), lookup the UTF-8 character ('&')
-     *
-     * @param string $name
-     *            The name to look up.
-     * @return string The character sequence. In UTF-8 this may be more than one byte.
-     */
-    public static function lookupName($name)
-    {
-        // Do we really want to return NULL here? or FFFD
-        return isset(Entities::$byName[$name]) ? Entities::$byName[$name] : null;
-    }
-
-    /**
-     * Given a Unicode codepoint, return the UTF-8 character.
-     *
-     * (NOT USED ANYWHERE)
-     */
-    /*
-     * public static function lookupCode($codePoint) { return 'POINT'; }
-     */
-
-    /**
-     * Given a decimal number, return the UTF-8 character.
-     */
-    public static function lookupDecimal($int)
-    {
-        $entity = '&#' . $int . ';';
-        // UNTESTED: This may fail on some planes. Couldn't find full documentation
-        // on the value of the mask array.
-        return mb_decode_numericentity($entity, static::$numeric_mask, 'utf-8');
-    }
-
-    /**
-     * Given a hexidecimal number, return the UTF-8 character.
-     */
-    public static function lookupHex($hexdec)
-    {
-        return static::lookupDecimal(hexdec($hexdec));
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php b/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php
deleted file mode 100644
index ccad229..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/DOMTreeBuilder.php
+++ /dev/null
@@ -1,684 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-use Masterminds\HTML5\Elements;
-
-/**
- * Create an HTML5 DOM tree from events.
- *
- * This attempts to create a DOM from events emitted by a parser. This
- * attempts (but does not guarantee) to up-convert older HTML documents
- * to HTML5. It does this by applying HTML5's rules, but it will not
- * change the architecture of the document itself.
- *
- * Many of the error correction and quirks features suggested in the specification
- * are implemented herein; however, not all of them are. Since we do not
- * assume a graphical user agent, no presentation-specific logic is conducted
- * during tree building.
- *
- * FIXME: The present tree builder does not exactly follow the state machine rules
- * for insert modes as outlined in the HTML5 spec. The processor needs to be
- * re-written to accomodate this. See, for example, the Go language HTML5
- * parser.
- */
-class DOMTreeBuilder implements EventHandler
-{
-    /**
-     * Defined in http://www.w3.org/TR/html51/infrastructure.html#html-namespace-0
-     */
-    const NAMESPACE_HTML = 'http://www.w3.org/1999/xhtml';
-
-    const NAMESPACE_MATHML = 'http://www.w3.org/1998/Math/MathML';
-
-    const NAMESPACE_SVG = 'http://www.w3.org/2000/svg';
-
-    const NAMESPACE_XLINK = 'http://www.w3.org/1999/xlink';
-
-    const NAMESPACE_XML = 'http://www.w3.org/XML/1998/namespace';
-
-    const NAMESPACE_XMLNS = 'http://www.w3.org/2000/xmlns/';
-
-    const OPT_DISABLE_HTML_NS = 'disable_html_ns';
-
-    const OPT_TARGET_DOC = 'target_document';
-
-    const OPT_IMPLICIT_NS = 'implicit_namespaces';
-
-    /**
-     * Holds the HTML5 element names that causes a namespace switch
-     *
-     * @var array
-     */
-    protected $nsRoots = array(
-        'html' => self::NAMESPACE_HTML,
-        'svg' => self::NAMESPACE_SVG,
-        'math' => self::NAMESPACE_MATHML
-    );
-
-    /**
-     * Holds the always available namespaces (which does not require the XMLNS declaration).
-     *
-     * @var array
-     */
-    protected $implicitNamespaces = array(
-        'xml' => self::NAMESPACE_XML,
-        'xmlns' => self::NAMESPACE_XMLNS,
-        'xlink' => self::NAMESPACE_XLINK
-    );
-
-    /**
-     * Holds a stack of currently active namespaces.
-     *
-     * @var array
-     */
-    protected $nsStack = array();
-
-    /**
-     * Holds the number of namespaces declared by a node.
-     *
-     * @var array
-     */
-    protected $pushes = array();
-
-    /**
-     * Defined in 8.2.5.
-     */
-    const IM_INITIAL = 0;
-
-    const IM_BEFORE_HTML = 1;
-
-    const IM_BEFORE_HEAD = 2;
-
-    const IM_IN_HEAD = 3;
-
-    const IM_IN_HEAD_NOSCRIPT = 4;
-
-    const IM_AFTER_HEAD = 5;
-
-    const IM_IN_BODY = 6;
-
-    const IM_TEXT = 7;
-
-    const IM_IN_TABLE = 8;
-
-    const IM_IN_TABLE_TEXT = 9;
-
-    const IM_IN_CAPTION = 10;
-
-    const IM_IN_COLUMN_GROUP = 11;
-
-    const IM_IN_TABLE_BODY = 12;
-
-    const IM_IN_ROW = 13;
-
-    const IM_IN_CELL = 14;
-
-    const IM_IN_SELECT = 15;
-
-    const IM_IN_SELECT_IN_TABLE = 16;
-
-    const IM_AFTER_BODY = 17;
-
-    const IM_IN_FRAMESET = 18;
-
-    const IM_AFTER_FRAMESET = 19;
-
-    const IM_AFTER_AFTER_BODY = 20;
-
-    const IM_AFTER_AFTER_FRAMESET = 21;
-
-    const IM_IN_SVG = 22;
-
-    const IM_IN_MATHML = 23;
-
-    protected $options = array();
-
-    protected $stack = array();
-
-    protected $current; // Pointer in the tag hierarchy.
-    protected $doc;
-
-    protected $frag;
-
-    protected $processor;
-
-    protected $insertMode = 0;
-
-    /**
-     * Track if we are in an element that allows only inline child nodes
-     * @var string|null
-     */
-    protected $onlyInline;
-
-    /**
-     * Quirks mode is enabled by default.
-     * Any document that is missing the
-     * DT will be considered to be in quirks mode.
-     */
-    protected $quirks = true;
-
-    protected $errors = array();
-
-    public function __construct($isFragment = false, array $options = array())
-    {
-        $this->options = $options;
-
-        if (isset($options[self::OPT_TARGET_DOC])) {
-            $this->doc = $options[self::OPT_TARGET_DOC];
-        } else {
-            $impl = new \DOMImplementation();
-            // XXX:
-            // Create the doctype. For now, we are always creating HTML5
-            // documents, and attempting to up-convert any older DTDs to HTML5.
-            $dt = $impl->createDocumentType('html');
-            // $this->doc = \DOMImplementation::createDocument(NULL, 'html', $dt);
-            $this->doc = $impl->createDocument(null, null, $dt);
-        }
-        $this->errors = array();
-
-        $this->current = $this->doc; // ->documentElement;
-
-        // Create a rules engine for tags.
-        $this->rules = new TreeBuildingRules($this->doc);
-
-        $implicitNS = array();
-        if (isset($this->options[self::OPT_IMPLICIT_NS])) {
-            $implicitNS = $this->options[self::OPT_IMPLICIT_NS];
-        } elseif (isset($this->options["implicitNamespaces"])) {
-            $implicitNS = $this->options["implicitNamespaces"];
-        }
-
-        // Fill $nsStack with the defalut HTML5 namespaces, plus the "implicitNamespaces" array taken form $options
-        array_unshift($this->nsStack, $implicitNS + array(
-            '' => self::NAMESPACE_HTML
-        ) + $this->implicitNamespaces);
-
-        if ($isFragment) {
-            $this->insertMode = static::IM_IN_BODY;
-            $this->frag = $this->doc->createDocumentFragment();
-            $this->current = $this->frag;
-        }
-    }
-
-    /**
-     * Get the document.
-     */
-    public function document()
-    {
-        return $this->doc;
-    }
-
-    /**
-     * Get the DOM fragment for the body.
-     *
-     * This returns a DOMNodeList because a fragment may have zero or more
-     * DOMNodes at its root.
-     *
-     * @see http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#concept-frag-parse-context
-     *
-     * @return \DOMFragmentDocumentFragment
-     */
-    public function fragment()
-    {
-        return $this->frag;
-    }
-
-    /**
-     * Provide an instruction processor.
-     *
-     * This is used for handling Processor Instructions as they are
-     * inserted. If omitted, PI's are inserted directly into the DOM tree.
-     */
-    public function setInstructionProcessor(\Masterminds\HTML5\InstructionProcessor $proc)
-    {
-        $this->processor = $proc;
-    }
-
-    public function doctype($name, $idType = 0, $id = null, $quirks = false)
-    {
-        // This is used solely for setting quirks mode. Currently we don't
-        // try to preserve the inbound DT. We convert it to HTML5.
-        $this->quirks = $quirks;
-
-        if ($this->insertMode > static::IM_INITIAL) {
-            $this->parseError("Illegal placement of DOCTYPE tag. Ignoring: " . $name);
-
-            return;
-        }
-
-        $this->insertMode = static::IM_BEFORE_HTML;
-    }
-
-    /**
-     * Process the start tag.
-     *
-     * @todo - XMLNS namespace handling (we need to parse, even if it's not valid)
-     *       - XLink, MathML and SVG namespace handling
-     *       - Omission rules: 8.1.2.4 Optional tags
-     */
-    public function startTag($name, $attributes = array(), $selfClosing = false)
-    {
-        // fprintf(STDOUT, $name);
-        $lname = $this->normalizeTagName($name);
-
-        // Make sure we have an html element.
-        if (! $this->doc->documentElement && $name !== 'html' && ! $this->frag) {
-            $this->startTag('html');
-        }
-
-        // Set quirks mode if we're at IM_INITIAL with no doctype.
-        if ($this->insertMode == static::IM_INITIAL) {
-            $this->quirks = true;
-            $this->parseError("No DOCTYPE specified.");
-        }
-
-        // SPECIAL TAG HANDLING:
-        // Spec says do this, and "don't ask."
-        if ($name == 'image') {
-            $name = 'img';
-        }
-
-        // Autoclose p tags where appropriate.
-        if ($this->insertMode >= static::IM_IN_BODY && Elements::isA($name, Elements::AUTOCLOSE_P)) {
-            $this->autoclose('p');
-        }
-
-        // Set insert mode:
-        switch ($name) {
-            case 'html':
-                $this->insertMode = static::IM_BEFORE_HEAD;
-                break;
-            case 'head':
-                if ($this->insertMode > static::IM_BEFORE_HEAD) {
-                    $this->parseError("Unexpected head tag outside of head context.");
-                } else {
-                    $this->insertMode = static::IM_IN_HEAD;
-                }
-                break;
-            case 'body':
-                $this->insertMode = static::IM_IN_BODY;
-                break;
-            case 'svg':
-                $this->insertMode = static::IM_IN_SVG;
-                break;
-            case 'math':
-                $this->insertMode = static::IM_IN_MATHML;
-                break;
-            case 'noscript':
-                if ($this->insertMode == static::IM_IN_HEAD) {
-                    $this->insertMode = static::IM_IN_HEAD_NOSCRIPT;
-                }
-                break;
-        }
-
-        // Special case handling for SVG.
-        if ($this->insertMode == static::IM_IN_SVG) {
-            $lname = Elements::normalizeSvgElement($lname);
-        }
-
-        $pushes = 0;
-        // when we found a tag thats appears inside $nsRoots, we have to switch the defalut namespace
-        if (isset($this->nsRoots[$lname]) && $this->nsStack[0][''] !== $this->nsRoots[$lname]) {
-            array_unshift($this->nsStack, array(
-                '' => $this->nsRoots[$lname]
-            ) + $this->nsStack[0]);
-            $pushes ++;
-        }
-        $needsWorkaround = false;
-        if (isset($this->options["xmlNamespaces"]) && $this->options["xmlNamespaces"]) {
-            // when xmlNamespaces is true a and we found a 'xmlns' or 'xmlns:*' attribute, we should add a new item to the $nsStack
-            foreach ($attributes as $aName => $aVal) {
-                if ($aName === 'xmlns') {
-                    $needsWorkaround = $aVal;
-                    array_unshift($this->nsStack, array(
-                        '' => $aVal
-                    ) + $this->nsStack[0]);
-                    $pushes ++;
-                } elseif ((($pos = strpos($aName, ':')) ? substr($aName, 0, $pos) : '') === 'xmlns') {
-                    array_unshift($this->nsStack, array(
-                        substr($aName, $pos + 1) => $aVal
-                    ) + $this->nsStack[0]);
-                    $pushes ++;
-                }
-            }
-        }
-
-        if ($this->onlyInline && Elements::isA($lname, Elements::BLOCK_TAG)) {
-        	$this->autoclose($this->onlyInline);
-        	$this->onlyInline = null;
-        }
-
-        try {
-            $prefix = ($pos = strpos($lname, ':')) ? substr($lname, 0, $pos) : '';
-
-
-            if ($needsWorkaround!==false) {
-
-                $xml = "<$lname xmlns=\"$needsWorkaround\" ".(strlen($prefix) && isset($this->nsStack[0][$prefix])?("xmlns:$prefix=\"".$this->nsStack[0][$prefix]."\""):"")."/>";
-
-                $frag = new \DOMDocument('1.0', 'UTF-8');
-                $frag->loadXML($xml);
-
-                $ele = $this->doc->importNode($frag->documentElement, true);
-
-            } else {
-                if (!isset($this->nsStack[0][$prefix]) || ($prefix === "" && isset($this->options[self::OPT_DISABLE_HTML_NS]) && $this->options[self::OPT_DISABLE_HTML_NS])) {
-                    $ele = $this->doc->createElement($lname);
-                } else {
-                    $ele = $this->doc->createElementNS($this->nsStack[0][$prefix], $lname);
-                }
-            }
-
-        } catch (\DOMException $e) {
-            $this->parseError("Illegal tag name: <$lname>. Replaced with <invalid>.");
-            $ele = $this->doc->createElement('invalid');
-        }
-
-        if (Elements::isA($lname, Elements::BLOCK_ONLY_INLINE)) {
-        	$this->onlyInline = $lname;
-        }
-
-        // When we add some namespacess, we have to track them. Later, when "endElement" is invoked, we have to remove them.
-        // When we are on a void tag, we do not need to care about namesapce nesting.
-        if ($pushes > 0 && !Elements::isA($name, Elements::VOID_TAG)) {
-            // PHP tends to free the memory used by DOM,
-            // to avoid spl_object_hash collisions whe have to avoid garbage collection of $ele storing it into $pushes
-            // see https://bugs.php.net/bug.php?id=67459
-            $this->pushes[spl_object_hash($ele)] = array($pushes, $ele);
-
-            // SEE https://github.com/facebook/hhvm/issues/2962
-            if (defined('HHVM_VERSION')) {
-                $ele->setAttribute('html5-php-fake-id-attribute', spl_object_hash($ele));
-            }
-        }
-
-        foreach ($attributes as $aName => $aVal) {
-            // xmlns attributes can't be set
-            if ($aName === 'xmlns') {
-                continue;
-            }
-
-            if ($this->insertMode == static::IM_IN_SVG) {
-                $aName = Elements::normalizeSvgAttribute($aName);
-            } elseif ($this->insertMode == static::IM_IN_MATHML) {
-                $aName = Elements::normalizeMathMlAttribute($aName);
-            }
-
-            try {
-                $prefix = ($pos = strpos($aName, ':')) ? substr($aName, 0, $pos) : false;
-
-                if ($prefix==='xmlns') {
-                    $ele->setAttributeNs(self::NAMESPACE_XMLNS, $aName, $aVal);
-                } elseif ($prefix!==false && isset($this->nsStack[0][$prefix])) {
-                    $ele->setAttributeNs($this->nsStack[0][$prefix], $aName, $aVal);
-                } else {
-                    $ele->setAttribute($aName, $aVal);
-                }
-            } catch (\DOMException $e) {
-                $this->parseError("Illegal attribute name for tag $name. Ignoring: $aName");
-                continue;
-            }
-
-            // This is necessary on a non-DTD schema, like HTML5.
-            if ($aName == 'id') {
-                $ele->setIdAttribute('id', true);
-            }
-        }
-
-        // Some elements have special processing rules. Handle those separately.
-        if ($this->rules->hasRules($name) && $this->frag !== $this->current) {
-            $this->current = $this->rules->evaluate($ele, $this->current);
-        }         // Otherwise, it's a standard element.
-        else {
-            $this->current->appendChild($ele);
-
-            // XXX: Need to handle self-closing tags and unary tags.
-            if (! Elements::isA($name, Elements::VOID_TAG)) {
-                $this->current = $ele;
-            }
-        }
-
-        // This is sort of a last-ditch attempt to correct for cases where no head/body
-        // elements are provided.
-        if ($this->insertMode <= static::IM_BEFORE_HEAD && $name != 'head' && $name != 'html') {
-            $this->insertMode = static::IM_IN_BODY;
-        }
-
-        // When we are on a void tag, we do not need to care about namesapce nesting,
-        // but we have to remove the namespaces pushed to $nsStack.
-        if ($pushes > 0 && Elements::isA($name, Elements::VOID_TAG)) {
-            // remove the namespaced definded by current node
-            for ($i = 0; $i < $pushes; $i ++) {
-                array_shift($this->nsStack);
-            }
-        }
-        // Return the element mask, which the tokenizer can then use to set
-        // various processing rules.
-        return Elements::element($name);
-    }
-
-    public function endTag($name)
-    {
-        $lname = $this->normalizeTagName($name);
-
-        // Ignore closing tags for unary elements.
-        if (Elements::isA($name, Elements::VOID_TAG)) {
-            return;
-        }
-
-        if ($this->insertMode <= static::IM_BEFORE_HTML) {
-            // 8.2.5.4.2
-            if (in_array($name, array(
-                'html',
-                'br',
-                'head',
-                'title'
-            ))) {
-                $this->startTag('html');
-                $this->endTag($name);
-                $this->insertMode = static::IM_BEFORE_HEAD;
-
-                return;
-            }
-
-            // Ignore the tag.
-            $this->parseError("Illegal closing tag at global scope.");
-
-            return;
-        }
-
-        // Special case handling for SVG.
-        if ($this->insertMode == static::IM_IN_SVG) {
-            $lname = Elements::normalizeSvgElement($lname);
-        }
-
-        // See https://github.com/facebook/hhvm/issues/2962
-        if (defined('HHVM_VERSION') && ($cid = $this->current->getAttribute('html5-php-fake-id-attribute'))) {
-            $this->current->removeAttribute('html5-php-fake-id-attribute');
-        } else {
-            $cid = spl_object_hash($this->current);
-        }
-
-        // XXX: Not sure whether we need this anymore.
-        // if ($name != $lname) {
-        // return $this->quirksTreeResolver($lname);
-        // }
-
-        // XXX: HTML has no parent. What do we do, though,
-        // if this element appears in the wrong place?
-        if ($lname == 'html') {
-            return;
-        }
-
-        // remove the namespaced definded by current node
-        if (isset($this->pushes[$cid])) {
-            for ($i = 0; $i < $this->pushes[$cid][0]; $i ++) {
-                array_shift($this->nsStack);
-            }
-            unset($this->pushes[$cid]);
-        }
-
-        if (! $this->autoclose($lname)) {
-            $this->parseError('Could not find closing tag for ' . $lname);
-        }
-
-        // switch ($this->insertMode) {
-        switch ($lname) {
-            case "head":
-                $this->insertMode = static::IM_AFTER_HEAD;
-                break;
-            case "body":
-                $this->insertMode = static::IM_AFTER_BODY;
-                break;
-            case "svg":
-            case "mathml":
-                $this->insertMode = static::IM_IN_BODY;
-                break;
-        }
-    }
-
-    public function comment($cdata)
-    {
-        // TODO: Need to handle case where comment appears outside of the HTML tag.
-        $node = $this->doc->createComment($cdata);
-        $this->current->appendChild($node);
-    }
-
-    public function text($data)
-    {
-        // XXX: Hmmm.... should we really be this strict?
-        if ($this->insertMode < static::IM_IN_HEAD) {
-            // Per '8.2.5.4.3 The "before head" insertion mode' the characters
-            // " \t\n\r\f" should be ignored but no mention of a parse error. This is
-            // practical as most documents contain these characters. Other text is not
-            // expected here so recording a parse error is necessary.
-            $dataTmp = trim($data, " \t\n\r\f");
-            if (! empty($dataTmp)) {
-                // fprintf(STDOUT, "Unexpected insert mode: %d", $this->insertMode);
-                $this->parseError("Unexpected text. Ignoring: " . $dataTmp);
-            }
-
-            return;
-        }
-        // fprintf(STDOUT, "Appending text %s.", $data);
-        $node = $this->doc->createTextNode($data);
-        $this->current->appendChild($node);
-    }
-
-    public function eof()
-    {
-        // If the $current isn't the $root, do we need to do anything?
-    }
-
-    public function parseError($msg, $line = 0, $col = 0)
-    {
-        $this->errors[] = sprintf("Line %d, Col %d: %s", $line, $col, $msg);
-    }
-
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    public function cdata($data)
-    {
-        $node = $this->doc->createCDATASection($data);
-        $this->current->appendChild($node);
-    }
-
-    public function processingInstruction($name, $data = null)
-    {
-        // XXX: Ignore initial XML declaration, per the spec.
-        if ($this->insertMode == static::IM_INITIAL && 'xml' == strtolower($name)) {
-            return;
-        }
-
-        // Important: The processor may modify the current DOM tree however
-        // it sees fit.
-        if (isset($this->processor)) {
-            $res = $this->processor->process($this->current, $name, $data);
-            if (! empty($res)) {
-                $this->current = $res;
-            }
-
-            return;
-        }
-
-        // Otherwise, this is just a dumb PI element.
-        $node = $this->doc->createProcessingInstruction($name, $data);
-
-        $this->current->appendChild($node);
-    }
-
-    // ==========================================================================
-    // UTILITIES
-    // ==========================================================================
-
-    /**
-     * Apply normalization rules to a tag name.
-     *
-     * See sections 2.9 and 8.1.2.
-     *
-     * @param string $name
-     *            The tag name.
-     * @return string The normalized tag name.
-     */
-    protected function normalizeTagName($name)
-    {
-        /*
-         * Section 2.9 suggests that we should not do this. if (strpos($name, ':') !== false) { // We know from the grammar that there must be at least one other // char besides :, since : is not a legal tag start. $parts = explode(':', $name); return array_pop($parts); }
-         */
-        return $name;
-    }
-
-    protected function quirksTreeResolver($name)
-    {
-        throw new \Exception("Not implemented.");
-    }
-
-    /**
-     * Automatically climb the tree and close the closest node with the matching $tag.
-     */
-    protected function autoclose($tag)
-    {
-        $working = $this->current;
-        do {
-            if ($working->nodeType != XML_ELEMENT_NODE) {
-                return false;
-            }
-            if ($working->tagName == $tag) {
-                $this->current = $working->parentNode;
-
-                return true;
-            }
-        } while ($working = $working->parentNode);
-        return false;
-    }
-
-    /**
-     * Checks if the given tagname is an ancestor of the present candidate.
-     *
-     * If $this->current or anything above $this->current matches the given tag
-     * name, this returns true.
-     */
-    protected function isAncestor($tagname)
-    {
-        $candidate = $this->current;
-        while ($candidate->nodeType === XML_ELEMENT_NODE) {
-            if ($candidate->tagName == $tagname) {
-                return true;
-            }
-            $candidate = $candidate->parentNode;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns true if the immediate parent element is of the given tagname.
-     */
-    protected function isParent($tagname)
-    {
-        return $this->current->tagName == $tagname;
-    }
-}
\ No newline at end of file
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php b/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
deleted file mode 100644
index 2d55347..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/EventHandler.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * Standard events for HTML5.
- *
- * This is roughly analogous to a SAX2 or expat-style interface.
- * However, it is tuned specifically for HTML5, according to section 8
- * of the HTML5 specification.
- *
- * An event handler receives parser events. For a concrete
- * implementation, see DOMTreeBuilder.
- *
- * Quirks support in the parser is limited to close-in syntax (malformed
- * tags or attributes). Higher order syntax and semantic issues with a
- * document (e.g. mismatched tags, illegal nesting, etc.) are the
- * responsibility of the event handler implementation.
- *
- * See HTML5 spec section 8.2.4
- */
-interface EventHandler
-{
-
-    const DOCTYPE_NONE = 0;
-
-    const DOCTYPE_PUBLIC = 1;
-
-    const DOCTYPE_SYSTEM = 2;
-
-    /**
-     * A doctype declaration.
-     *
-     * @param string $name
-     *            The name of the root element.
-     * @param int $idType
-     *            One of DOCTYPE_NONE, DOCTYPE_PUBLIC, or DOCTYPE_SYSTEM.
-     * @param string $id
-     *            The identifier. For DOCTYPE_PUBLIC, this is the public ID. If DOCTYPE_SYSTEM,
-     *            then this is a system ID.
-     * @param boolean $quirks
-     *            Indicates whether the builder should enter quirks mode.
-     */
-    public function doctype($name, $idType = 0, $id = null, $quirks = false);
-
-    /**
-     * A start tag.
-     *
-     * IMPORTANT: The parser watches the return value of this event. If this returns
-     * an integer, the parser will switch TEXTMODE patters according to the int.
-     *
-     * This is how the Tree Builder can tell the Tokenizer when a certain tag should
-     * cause the parser to go into RAW text mode.
-     *
-     * The HTML5 standard requires that the builder is the one that initiates this
-     * step, and this is the only way short of a circular reference that we can
-     * do that.
-     *
-     * Example: if a startTag even for a `script` name is fired, and the startTag()
-     * implementation returns Tokenizer::TEXTMODE_RAW, then the tokenizer will
-     * switch into RAW text mode and consume data until it reaches a closing
-     * `script` tag.
-     *
-     * The textmode is automatically reset to Tokenizer::TEXTMODE_NORMAL when the
-     * closing tag is encounter. **This behavior may change.**
-     *
-     * @param string $name
-     *            The tag name.
-     * @param array $attributes
-     *            An array with all of the tag's attributes.
-     * @param boolean $selfClosing
-     *            An indicator of whether or not this tag is self-closing (<foo/>)
-     * @return numeric One of the Tokenizer::TEXTMODE_* constants.
-     */
-    public function startTag($name, $attributes = array(), $selfClosing = false);
-
-    /**
-     * An end-tag.
-     */
-    public function endTag($name);
-
-    /**
-     * A comment section (unparsed character data).
-     */
-    public function comment($cdata);
-
-    /**
-     * A unit of parsed character data.
-     *
-     * Entities in this text are *already decoded*.
-     */
-    public function text($cdata);
-
-    /**
-     * Indicates that the document has been entirely processed.
-     */
-    public function eof();
-
-    /**
-     * Emitted when the parser encounters an error condition.
-     */
-    public function parseError($msg, $line, $col);
-
-    /**
-     * A CDATA section.
-     *
-     * @param string $data
-     *            The unparsed character data.
-     */
-    public function cdata($data);
-
-    /**
-     * This is a holdover from the XML spec.
-     *
-     * While user agents don't get PIs, server-side does.
-     *
-     * @param string $name
-     *            The name of the processor (e.g. 'php').
-     * @param string $data
-     *            The unparsed data.
-     */
-    public function processingInstruction($name, $data = null);
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/FileInputStream.php b/vendor/masterminds/html5/src/HTML5/Parser/FileInputStream.php
deleted file mode 100644
index e58006a..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/FileInputStream.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * The FileInputStream loads a file to be parsed.
- *
- * So right now we read files into strings and then process the
- * string. We chose to do this largely for the sake of expediency of
- * development, and also because we could optimize toward processing
- * arbitrarily large chunks of the input. But in the future, we'd
- * really like to rewrite this class to efficiently handle lower level
- * stream reads (and thus efficiently handle large documents).
- *
- * @todo A buffered input stream would be useful.
- */
-class FileInputStream extends StringInputStream implements InputStream
-{
-
-    /**
-     * Load a file input stream.
-     *
-     * @param string $data
-     *            The file or url path to load.
-     */
-    public function __construct($data, $encoding = 'UTF-8', $debug = '')
-    {
-        // Get the contents of the file.
-        $content = file_get_contents($data);
-
-        parent::__construct($content, $encoding, $debug);
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/InputStream.php b/vendor/masterminds/html5/src/HTML5/Parser/InputStream.php
deleted file mode 100644
index 0bdc803..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/InputStream.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * Interface for stream readers.
- *
- * The parser only reads from streams. Various input sources can write
- * an adapater to this InputStream.
- *
- * Currently provided InputStream implementations include
- * FileInputStream and StringInputStream.
- */
-interface InputStream extends \Iterator
-{
-
-    /**
-     * Returns the current line that is being consumed.
-     *
-     * TODO: Move this to the scanner.
-     */
-    public function currentLine();
-
-    /**
-     * Returns the current column of the current line that the tokenizer is at.
-     *
-     * Newlines are column 0. The first char after a newline is column 1.
-     *
-     * @TODO Move this to the scanner.
-     *
-     * @return int The column number.
-     */
-    public function columnOffset();
-
-    /**
-     * Get all characters until EOF.
-     *
-     * This consumes characters until the EOF.
-     */
-    public function remainingChars();
-
-    /**
-     * Read to a particular match (or until $max bytes are consumed).
-     *
-     * This operates on byte sequences, not characters.
-     *
-     * Matches as far as possible until we reach a certain set of bytes
-     * and returns the matched substring.
-     *
-     * @see strcspn
-     * @param string $bytes
-     *            Bytes to match.
-     * @param int $max
-     *            Maximum number of bytes to scan.
-     * @return mixed Index or false if no match is found. You should use strong
-     *         equality when checking the result, since index could be 0.
-     */
-    public function charsUntil($bytes, $max = null);
-
-    /**
-     * Returns the string so long as $bytes matches.
-     *
-     * Matches as far as possible with a certain set of bytes
-     * and returns the matched substring.
-     *
-     * @see strspn
-     * @param string $bytes
-     *            A mask of bytes to match. If ANY byte in this mask matches the
-     *            current char, the pointer advances and the char is part of the
-     *            substring.
-     * @param int $max
-     *            The max number of chars to read.
-     */
-    public function charsWhile($bytes, $max = null);
-
-    /**
-     * Unconsume one character.
-     *
-     * @param int $howMany
-     *            The number of characters to move the pointer back.
-     */
-    public function unconsume($howMany = 1);
-
-    /**
-     * Retrieve the next character without advancing the pointer.
-     */
-    public function peek();
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/ParseError.php b/vendor/masterminds/html5/src/HTML5/Parser/ParseError.php
deleted file mode 100644
index 86498a1..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/ParseError.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * Emit when the parser has an error.
- */
-class ParseError extends \Exception
-{
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/README.md b/vendor/masterminds/html5/src/HTML5/Parser/README.md
deleted file mode 100644
index 9f92957..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# The Parser Model
-
-The parser model here follows the model in section
-[8.2.1](http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#parsing)
-of the HTML5 specification, though we do not assume a networking layer.
-
-     [ InputStream ]    // Generic support for reading input.
-           ||
-      [ Scanner ]       // Breaks down the stream into characters.
-           ||
-     [ Tokenizer ]      // Groups characters into syntactic
-           ||
-    [ Tree Builder ]    // Organizes units into a tree of objects
-           ||
-     [ DOM Document ]     // The final state of the parsed document.
-
-
-## InputStream
-
-This is an interface with at least two concrete implementations:
-
-- StringInputStream: Reads an HTML5 string.
-- FileInputStream: Reads an HTML5 file.
-
-## Scanner
-
-This is a mechanical piece of the parser.
-
-## Tokenizer
-
-This follows section 8.4 of the HTML5 spec. It is (roughly) a recursive
-descent parser. (Though there are plenty of optimizations that are less
-than purely functional.
-
-## EventHandler and DOMTree
-
-EventHandler is the interface for tree builders. Since not all
-implementations will necessarily build trees, we've chosen a more
-generic name.
-
-The event handler emits tokens during tokenization.
-
-The DOMTree is an event handler that builds a DOM tree. The output of
-the DOMTree builder is a DOMDocument.
-
-## DOMDocument
-
-PHP has a DOMDocument class built-in (technically, it's part of libxml.)
-We use that, thus rendering the output of this process compatible with
-SimpleXML, QueryPath, and many other XML/HTML processing tools.
-
-For cases where the HTML5 is a fragment of a HTML5 document a
-DOMDocumentFragment is returned instead. This is another built-in class.
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/Scanner.php b/vendor/masterminds/html5/src/HTML5/Parser/Scanner.php
deleted file mode 100644
index f605c69..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/Scanner.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * The scanner.
- *
- * This scans over an input stream.
- */
-class Scanner
-{
-
-    const CHARS_HEX = 'abcdefABCDEF01234567890';
-
-    const CHARS_ALNUM = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890';
-
-    const CHARS_ALPHA = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-    protected $is;
-
-    // Flipping this to true will give minisculely more debugging info.
-    public $debug = false;
-
-    /**
-     * Create a new Scanner.
-     *
-     * @param \Masterminds\HTML5\Parser\InputStream $input
-     *            An InputStream to be scanned.
-     */
-    public function __construct($input)
-    {
-        $this->is = $input;
-    }
-
-    /**
-     * Get the current position.
-     *
-     * @return int The current intiger byte position.
-     */
-    public function position()
-    {
-        return $this->is->key();
-    }
-
-    /**
-     * Take a peek at the next character in the data.
-     *
-     * @return string The next character.
-     */
-    public function peek()
-    {
-        return $this->is->peek();
-    }
-
-    /**
-     * Get the next character.
-     *
-     * Note: This advances the pointer.
-     *
-     * @return string The next character.
-     */
-    public function next()
-    {
-        $this->is->next();
-        if ($this->is->valid()) {
-            if ($this->debug)
-                fprintf(STDOUT, "> %s\n", $this->is->current());
-            return $this->is->current();
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the current character.
-     *
-     * Note, this does not advance the pointer.
-     *
-     * @return string The current character.
-     */
-    public function current()
-    {
-        if ($this->is->valid()) {
-            return $this->is->current();
-        }
-
-        return false;
-    }
-
-    /**
-     * Silently consume N chars.
-     */
-    public function consume($count = 1)
-    {
-        for ($i = 0; $i < $count; ++ $i) {
-            $this->next();
-        }
-    }
-
-    /**
-     * Unconsume some of the data.
-     * This moves the data pointer backwards.
-     *
-     * @param int $howMany
-     *            The number of characters to move the pointer back.
-     */
-    public function unconsume($howMany = 1)
-    {
-        $this->is->unconsume($howMany);
-    }
-
-    /**
-     * Get the next group of that contains hex characters.
-     *
-     * Note, along with getting the characters the pointer in the data will be
-     * moved as well.
-     *
-     * @return string The next group that is hex characters.
-     */
-    public function getHex()
-    {
-        return $this->is->charsWhile(static::CHARS_HEX);
-    }
-
-    /**
-     * Get the next group of characters that are ASCII Alpha characters.
-     *
-     * Note, along with getting the characters the pointer in the data will be
-     * moved as well.
-     *
-     * @return string The next group of ASCII alpha characters.
-     */
-    public function getAsciiAlpha()
-    {
-        return $this->is->charsWhile(static::CHARS_ALPHA);
-    }
-
-    /**
-     * Get the next group of characters that are ASCII Alpha characters and numbers.
-     *
-     * Note, along with getting the characters the pointer in the data will be
-     * moved as well.
-     *
-     * @return string The next group of ASCII alpha characters and numbers.
-     */
-    public function getAsciiAlphaNum()
-    {
-        return $this->is->charsWhile(static::CHARS_ALNUM);
-    }
-
-    /**
-     * Get the next group of numbers.
-     *
-     * Note, along with getting the characters the pointer in the data will be
-     * moved as well.
-     *
-     * @return string The next group of numbers.
-     */
-    public function getNumeric()
-    {
-        return $this->is->charsWhile('0123456789');
-    }
-
-    /**
-     * Consume whitespace.
-     *
-     * Whitespace in HTML5 is: formfeed, tab, newline, space.
-     */
-    public function whitespace()
-    {
-        return $this->is->charsWhile("\n\t\f ");
-    }
-
-    /**
-     * Returns the current line that is being consumed.
-     *
-     * @return int The current line number.
-     */
-    public function currentLine()
-    {
-        return $this->is->currentLine();
-    }
-
-    /**
-     * Read chars until something in the mask is encountered.
-     */
-    public function charsUntil($mask)
-    {
-        return $this->is->charsUntil($mask);
-    }
-
-    /**
-     * Read chars as long as the mask matches.
-     */
-    public function charsWhile($mask)
-    {
-        return $this->is->charsWhile($mask);
-    }
-
-    /**
-     * Returns the current column of the current line that the tokenizer is at.
-     *
-     * Newlines are column 0. The first char after a newline is column 1.
-     *
-     * @return int The column number.
-     */
-    public function columnOffset()
-    {
-        return $this->is->columnOffset();
-    }
-
-    /**
-     * Get all characters until EOF.
-     *
-     * This consumes characters until the EOF.
-     *
-     * @return int The number of characters remaining.
-     */
-    public function remainingChars()
-    {
-        return $this->is->remainingChars();
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php b/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
deleted file mode 100644
index 4cac3c2..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/StringInputStream.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/**
- * Loads a string to be parsed.
- */
-namespace Masterminds\HTML5\Parser;
-
-/*
- *
-* Based on code from html5lib:
-
-Copyright 2009 Geoffrey Sneddon <http://gsnedders.com/>
-
-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.
-
-*/
-
-// Some conventions:
-// - /* */ indicates verbatim text from the HTML 5 specification
-//   MPB: Not sure which version of the spec. Moving from HTML5lib to
-//   HTML5-PHP, I have been using this version:
-//   http://www.w3.org/TR/2012/CR-html5-20121217/Overview.html#contents
-//
-// - // indicates regular comments
-
-class StringInputStream implements InputStream
-{
-
-    /**
-     * The string data we're parsing.
-     */
-    private $data;
-
-    /**
-     * The current integer byte position we are in $data
-     */
-    private $char;
-
-    /**
-     * Length of $data; when $char === $data, we are at the end-of-file.
-     */
-    private $EOF;
-
-    /**
-     * Parse errors.
-     */
-    public $errors = array();
-
-    /**
-     * Create a new InputStream wrapper.
-     *
-     * @param $data Data
-     *            to parse
-     */
-    public function __construct($data, $encoding = 'UTF-8', $debug = '')
-    {
-        $data = UTF8Utils::convertToUTF8($data, $encoding);
-        if ($debug)
-            fprintf(STDOUT, $debug, $data, strlen($data));
-
-            // There is good reason to question whether it makes sense to
-            // do this here, since most of these checks are done during
-            // parsing, and since this check doesn't actually *do* anything.
-        $this->errors = UTF8Utils::checkForIllegalCodepoints($data);
-        // if (!empty($e)) {
-        // throw new ParseError("UTF-8 encoding issues: " . implode(', ', $e));
-        // }
-
-        $data = $this->replaceLinefeeds($data);
-
-        $this->data = $data;
-        $this->char = 0;
-        $this->EOF = strlen($data);
-    }
-
-    /**
-     * Replace linefeed characters according to the spec.
-     */
-    protected function replaceLinefeeds($data)
-    {
-        /*
-         * U+000D CARRIAGE RETURN (CR) characters and U+000A LINE FEED (LF) characters are treated specially. Any CR characters that are followed by LF characters must be removed, and any CR characters not followed by LF characters must be converted to LF characters. Thus, newlines in HTML DOMs are represented by LF characters, and there are never any CR characters in the input to the tokenization stage.
-         */
-        $crlfTable = array(
-            "\0" => "\xEF\xBF\xBD",
-            "\r\n" => "\n",
-            "\r" => "\n"
-        );
-
-        return strtr($data, $crlfTable);
-    }
-
-    /**
-     * Returns the current line that the tokenizer is at.
-     */
-    public function currentLine()
-    {
-        if (empty($this->EOF) || $this->char == 0) {
-            return 1;
-        }
-        // Add one to $this->char because we want the number for the next
-        // byte to be processed.
-        return substr_count($this->data, "\n", 0, min($this->char, $this->EOF)) + 1;
-    }
-
-    /**
-     *
-     * @deprecated
-     *
-     */
-    public function getCurrentLine()
-    {
-        return currentLine();
-    }
-
-    /**
-     * Returns the current column of the current line that the tokenizer is at.
-     *
-     * Newlines are column 0. The first char after a newline is column 1.
-     *
-     * @return int The column number.
-     */
-    public function columnOffset()
-    {
-        // Short circuit for the first char.
-        if ($this->char == 0) {
-            return 0;
-        }
-        // strrpos is weird, and the offset needs to be negative for what we
-        // want (i.e., the last \n before $this->char). This needs to not have
-        // one (to make it point to the next character, the one we want the
-        // position of) added to it because strrpos's behaviour includes the
-        // final offset byte.
-        $backwardFrom = $this->char - 1 - strlen($this->data);
-        $lastLine = strrpos($this->data, "\n", $backwardFrom);
-
-        // However, for here we want the length up until the next byte to be
-        // processed, so add one to the current byte ($this->char).
-        if ($lastLine !== false) {
-            $findLengthOf = substr($this->data, $lastLine + 1, $this->char - 1 - $lastLine);
-        } else {
-            // After a newline.
-            $findLengthOf = substr($this->data, 0, $this->char);
-        }
-
-        return UTF8Utils::countChars($findLengthOf);
-    }
-
-    /**
-     *
-     * @deprecated
-     *
-     */
-    public function getColumnOffset()
-    {
-        return $this->columnOffset();
-    }
-
-    /**
-     * Get the current character.
-     *
-     * @return string The current character.
-     */
-    public function current()
-    {
-        return $this->data[$this->char];
-    }
-
-    /**
-     * Advance the pointer.
-     * This is part of the Iterator interface.
-     */
-    public function next()
-    {
-        $this->char ++;
-    }
-
-    /**
-     * Rewind to the start of the string.
-     */
-    public function rewind()
-    {
-        $this->char = 0;
-    }
-
-    /**
-     * Is the current pointer location valid.
-     *
-     * @return bool Is the current pointer location valid.
-     */
-    public function valid()
-    {
-        if ($this->char < $this->EOF) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get all characters until EOF.
-     *
-     * This reads to the end of the file, and sets the read marker at the
-     * end of the file.
-     *
-     * @note This performs bounds checking
-     *
-     * @return string Returns the remaining text. If called when the InputStream is
-     *         already exhausted, it returns an empty string.
-     */
-    public function remainingChars()
-    {
-        if ($this->char < $this->EOF) {
-            $data = substr($this->data, $this->char);
-            $this->char = $this->EOF;
-
-            return $data;
-        }
-
-        return ''; // false;
-    }
-
-    /**
-     * Read to a particular match (or until $max bytes are consumed).
-     *
-     * This operates on byte sequences, not characters.
-     *
-     * Matches as far as possible until we reach a certain set of bytes
-     * and returns the matched substring.
-     *
-     * @param string $bytes
-     *            Bytes to match.
-     * @param int $max
-     *            Maximum number of bytes to scan.
-     * @return mixed Index or false if no match is found. You should use strong
-     *         equality when checking the result, since index could be 0.
-     */
-    public function charsUntil($bytes, $max = null)
-    {
-        if ($this->char >= $this->EOF) {
-            return false;
-        }
-
-        if ($max === 0 || $max) {
-            $len = strcspn($this->data, $bytes, $this->char, $max);
-        } else {
-            $len = strcspn($this->data, $bytes, $this->char);
-        }
-
-        $string = (string) substr($this->data, $this->char, $len);
-        $this->char += $len;
-
-        return $string;
-    }
-
-    /**
-     * Returns the string so long as $bytes matches.
-     *
-     * Matches as far as possible with a certain set of bytes
-     * and returns the matched substring.
-     *
-     * @param string $bytes
-     *            A mask of bytes to match. If ANY byte in this mask matches the
-     *            current char, the pointer advances and the char is part of the
-     *            substring.
-     * @param int $max
-     *            The max number of chars to read.
-     */
-    public function charsWhile($bytes, $max = null)
-    {
-        if ($this->char >= $this->EOF) {
-            return false;
-        }
-
-        if ($max === 0 || $max) {
-            $len = strspn($this->data, $bytes, $this->char, $max);
-        } else {
-            $len = strspn($this->data, $bytes, $this->char);
-        }
-        $string = (string) substr($this->data, $this->char, $len);
-        $this->char += $len;
-
-        return $string;
-    }
-
-    /**
-     * Unconsume characters.
-     *
-     * @param int $howMany
-     *            The number of characters to unconsume.
-     */
-    public function unconsume($howMany = 1)
-    {
-        if (($this->char - $howMany) >= 0) {
-            $this->char = $this->char - $howMany;
-        }
-    }
-
-    /**
-     * Look ahead without moving cursor.
-     */
-    public function peek()
-    {
-        if (($this->char + 1) <= $this->EOF) {
-            return $this->data[$this->char + 1];
-        }
-
-        return false;
-    }
-
-    public function key()
-    {
-        return $this->char;
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php b/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
deleted file mode 100644
index a779191..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/Tokenizer.php
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-use Masterminds\HTML5\Elements;
-
-/**
- * The HTML5 tokenizer.
- *
- * The tokenizer's role is reading data from the scanner and gathering it into
- * semantic units. From the tokenizer, data is emitted to an event handler,
- * which may (for example) create a DOM tree.
- *
- * The HTML5 specification has a detailed explanation of tokenizing HTML5. We
- * follow that specification to the maximum extent that we can. If you find
- * a discrepancy that is not documented, please file a bug and/or submit a
- * patch.
- *
- * This tokenizer is implemented as a recursive descent parser.
- *
- * Within the API documentation, you may see references to the specific section
- * of the HTML5 spec that the code attempts to reproduce. Example: 8.2.4.1.
- * This refers to section 8.2.4.1 of the HTML5 CR specification.
- *
- * @see http://www.w3.org/TR/2012/CR-html5-20121217/
- */
-class Tokenizer
-{
-
-    protected $scanner;
-
-    protected $events;
-
-    protected $tok;
-
-    /**
-     * Buffer for text.
-     */
-    protected $text = '';
-
-    // When this goes to false, the parser stops.
-    protected $carryOn = true;
-
-    protected $textMode = 0; // TEXTMODE_NORMAL;
-    protected $untilTag = null;
-
-    const WHITE = "\t\n\f ";
-
-    /**
-     * Create a new tokenizer.
-     *
-     * Typically, parsing a document involves creating a new tokenizer, giving
-     * it a scanner (input) and an event handler (output), and then calling
-     * the Tokenizer::parse() method.`
-     *
-     * @param \Masterminds\HTML5\Parser\Scanner $scanner
-     *            A scanner initialized with an input stream.
-     * @param \Masterminds\HTML5\Parser\EventHandler $eventHandler
-     *            An event handler, initialized and ready to receive
-     *            events.
-     */
-    public function __construct($scanner, $eventHandler)
-    {
-        $this->scanner = $scanner;
-        $this->events = $eventHandler;
-    }
-
-    /**
-     * Begin parsing.
-     *
-     * This will begin scanning the document, tokenizing as it goes.
-     * Tokens are emitted into the event handler.
-     *
-     * Tokenizing will continue until the document is completely
-     * read. Errors are emitted into the event handler, but
-     * the parser will attempt to continue parsing until the
-     * entire input stream is read.
-     */
-    public function parse()
-    {
-        $p = 0;
-        do {
-            $p = $this->scanner->position();
-            $this->consumeData();
-
-            // FIXME: Add infinite loop protection.
-        } while ($this->carryOn);
-    }
-
-    /**
-     * Set the text mode for the character data reader.
-     *
-     * HTML5 defines three different modes for reading text:
-     * - Normal: Read until a tag is encountered.
-     * - RCDATA: Read until a tag is encountered, but skip a few otherwise-
-     * special characters.
-     * - Raw: Read until a special closing tag is encountered (viz. pre, script)
-     *
-     * This allows those modes to be set.
-     *
-     * Normally, setting is done by the event handler via a special return code on
-     * startTag(), but it can also be set manually using this function.
-     *
-     * @param integer $textmode
-     *            One of Elements::TEXT_*
-     * @param string $untilTag
-     *            The tag that should stop RAW or RCDATA mode. Normal mode does not
-     *            use this indicator.
-     */
-    public function setTextMode($textmode, $untilTag = null)
-    {
-        $this->textMode = $textmode & (Elements::TEXT_RAW | Elements::TEXT_RCDATA);
-        $this->untilTag = $untilTag;
-    }
-
-    /**
-     * Consume a character and make a move.
-     * HTML5 8.2.4.1
-     */
-    protected function consumeData()
-    {
-        // Character Ref
-        /*
-         * $this->characterReference() || $this->tagOpen() || $this->eof() || $this->characterData();
-         */
-        $this->characterReference();
-        $this->tagOpen();
-        $this->eof();
-        $this->characterData();
-
-        return $this->carryOn;
-    }
-
-    /**
-     * Parse anything that looks like character data.
-     *
-     * Different rules apply based on the current text mode.
-     *
-     * @see Elements::TEXT_RAW Elements::TEXT_RCDATA.
-     */
-    protected function characterData()
-    {
-        if ($this->scanner->current() === false) {
-            return false;
-        }
-        switch ($this->textMode) {
-            case Elements::TEXT_RAW:
-                return $this->rawText();
-            case Elements::TEXT_RCDATA:
-                return $this->rcdata();
-            default:
-                $tok = $this->scanner->current();
-                if (strspn($tok, "<&")) {
-                    return false;
-                }
-                return $this->text();
-        }
-    }
-
-    /**
-     * This buffers the current token as character data.
-     */
-    protected function text()
-    {
-        $tok = $this->scanner->current();
-
-        // This should never happen...
-        if ($tok === false) {
-            return false;
-        }
-        // Null
-        if ($tok === "\00") {
-            $this->parseError("Received null character.");
-        }
-        // fprintf(STDOUT, "Writing '%s'", $tok);
-        $this->buffer($tok);
-        $this->scanner->next();
-        return true;
-    }
-
-    /**
-     * Read text in RAW mode.
-     */
-    protected function rawText()
-    {
-        if (is_null($this->untilTag)) {
-            return $this->text();
-        }
-        $sequence = '</' . $this->untilTag . '>';
-        $txt = $this->readUntilSequence($sequence);
-        $this->events->text($txt);
-        $this->setTextMode(0);
-        return $this->endTag();
-    }
-
-    /**
-     * Read text in RCDATA mode.
-     */
-    protected function rcdata()
-    {
-        if (is_null($this->untilTag)) {
-            return $this->text();
-        }
-        $sequence = '</' . $this->untilTag;
-        $txt = '';
-        $tok = $this->scanner->current();
-
-        $caseSensitive = !Elements::isHtml5Element($this->untilTag);
-        while ($tok !== false && ! ($tok == '<' && ($this->sequenceMatches($sequence, $caseSensitive)))) {
-            if ($tok == '&') {
-                $txt .= $this->decodeCharacterReference();
-                $tok = $this->scanner->current();
-            } else {
-                $txt .= $tok;
-                $tok = $this->scanner->next();
-            }
-        }
-        $len = strlen($sequence);
-        $this->scanner->consume($len);
-        $len += strlen($this->scanner->whitespace());
-        if ($this->scanner->current() !== '>') {
-            $this->parseError("Unclosed RCDATA end tag");
-        }
-        $this->scanner->unconsume($len);
-        $this->events->text($txt);
-        $this->setTextMode(0);
-        return $this->endTag();
-    }
-
-    /**
-     * If the document is read, emit an EOF event.
-     */
-    protected function eof()
-    {
-        if ($this->scanner->current() === false) {
-            // fprintf(STDOUT, "EOF");
-            $this->flushBuffer();
-            $this->events->eof();
-            $this->carryOn = false;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Handle character references (aka entities).
-     *
-     * This version is specific to PCDATA, as it buffers data into the
-     * text buffer. For a generic version, see decodeCharacterReference().
-     *
-     * HTML5 8.2.4.2
-     */
-    protected function characterReference()
-    {
-        $ref = $this->decodeCharacterReference();
-        if ($ref !== false) {
-            $this->buffer($ref);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Emit a tagStart event on encountering a tag.
-     *
-     * 8.2.4.8
-     */
-    protected function tagOpen()
-    {
-        if ($this->scanner->current() != '<') {
-            return false;
-        }
-
-        // Any buffered text data can go out now.
-        $this->flushBuffer();
-
-        $this->scanner->next();
-
-        return $this->markupDeclaration() || $this->endTag() || $this->processingInstruction() || $this->tagName() ||
-          /*  This always returns false. */
-          $this->parseError("Illegal tag opening") || $this->characterData();
-    }
-
-    /**
-     * Look for markup.
-     */
-    protected function markupDeclaration()
-    {
-        if ($this->scanner->current() != '!') {
-            return false;
-        }
-
-        $tok = $this->scanner->next();
-
-        // Comment:
-        if ($tok == '-' && $this->scanner->peek() == '-') {
-            $this->scanner->next(); // Consume the other '-'
-            $this->scanner->next(); // Next char.
-            return $this->comment();
-        }
-
-        elseif ($tok == 'D' || $tok == 'd') { // Doctype
-            return $this->doctype('');
-        }
-
-        elseif ($tok == '[') { // CDATA section
-            return $this->cdataSection();
-        }
-
-        // FINISH
-        $this->parseError("Expected <!--, <![CDATA[, or <!DOCTYPE. Got <!%s", $tok);
-        $this->bogusComment('<!');
-        return true;
-    }
-
-    /**
-     * Consume an end tag.
-     * 8.2.4.9
-     */
-    protected function endTag()
-    {
-        if ($this->scanner->current() != '/') {
-            return false;
-        }
-        $tok = $this->scanner->next();
-
-        // a-zA-Z -> tagname
-        // > -> parse error
-        // EOF -> parse error
-        // -> parse error
-        if (! ctype_alpha($tok)) {
-            $this->parseError("Expected tag name, got '%s'", $tok);
-            if ($tok == "\0" || $tok === false) {
-                return false;
-            }
-            return $this->bogusComment('</');
-        }
-
-        $name = strtolower($this->scanner->charsUntil("\n\f \t>"));
-        // Trash whitespace.
-        $this->scanner->whitespace();
-
-        if ($this->scanner->current() != '>') {
-            $this->parseError("Expected >, got '%s'", $this->scanner->current());
-            // We just trash stuff until we get to the next tag close.
-            $this->scanner->charsUntil('>');
-        }
-
-        $this->events->endTag($name);
-        $this->scanner->next();
-        return true;
-    }
-
-    /**
-     * Consume a tag name and body.
-     * 8.2.4.10
-     */
-    protected function tagName()
-    {
-        $tok = $this->scanner->current();
-        if (! ctype_alpha($tok)) {
-            return false;
-        }
-
-        // We know this is at least one char.
-        $name = strtolower($this->scanner->charsWhile(":_-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-        $attributes = array();
-        $selfClose = false;
-
-        // Handle attribute parse exceptions here so that we can
-        // react by trying to build a sensible parse tree.
-        try {
-            do {
-                $this->scanner->whitespace();
-                $this->attribute($attributes);
-            } while (! $this->isTagEnd($selfClose));
-        } catch (ParseError $e) {
-            $selfClose = false;
-        }
-
-        $mode = $this->events->startTag($name, $attributes, $selfClose);
-        // Should we do this? What does this buy that selfClose doesn't?
-        if ($selfClose) {
-            $this->events->endTag($name);
-        } elseif (is_int($mode)) {
-            // fprintf(STDOUT, "Event response says move into mode %d for tag %s", $mode, $name);
-            $this->setTextMode($mode, $name);
-        }
-
-        $this->scanner->next();
-
-        return true;
-    }
-
-    /**
-     * Check if the scanner has reached the end of a tag.
-     */
-    protected function isTagEnd(&$selfClose)
-    {
-        $tok = $this->scanner->current();
-        if ($tok == '/') {
-            $this->scanner->next();
-            $this->scanner->whitespace();
-            if ($this->scanner->current() == '>') {
-                $selfClose = true;
-                return true;
-            }
-            if ($this->scanner->current() === false) {
-                $this->parseError("Unexpected EOF inside of tag.");
-                return true;
-            }
-            // Basically, we skip the / token and go on.
-            // See 8.2.4.43.
-            $this->parseError("Unexpected '%s' inside of a tag.", $this->scanner->current());
-            return false;
-        }
-
-        if ($this->scanner->current() == '>') {
-            return true;
-        }
-        if ($this->scanner->current() === false) {
-            $this->parseError("Unexpected EOF inside of tag.");
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parse attributes from inside of a tag.
-     */
-    protected function attribute(&$attributes)
-    {
-        $tok = $this->scanner->current();
-        if ($tok == '/' || $tok == '>' || $tok === false) {
-            return false;
-        }
-
-        if ($tok == '<') {
-            $this->parseError("Unexepcted '<' inside of attributes list.");
-            // Push the < back onto the stack.
-            $this->scanner->unconsume();
-            // Let the caller figure out how to handle this.
-            throw new ParseError("Start tag inside of attribute.");
-        }
-
-        $name = strtolower($this->scanner->charsUntil("/>=\n\f\t "));
-
-        if (strlen($name) == 0) {
-            $this->parseError("Expected an attribute name, got %s.", $this->scanner->current());
-            // Really, only '=' can be the char here. Everything else gets absorbed
-            // under one rule or another.
-            $name = $this->scanner->current();
-            $this->scanner->next();
-        }
-
-        $isValidAttribute = true;
-        // Attribute names can contain most Unicode characters for HTML5.
-        // But method "DOMElement::setAttribute" is throwing exception
-        // because of it's own internal restriction so these have to be filtered.
-        // see issue #23: https://github.com/Masterminds/html5-php/issues/23
-        // and http://www.w3.org/TR/2011/WD-html5-20110525/syntax.html#syntax-attribute-name
-        if (preg_match("/[\x1-\x2C\\/\x3B-\x40\x5B-\x5E\x60\x7B-\x7F]/u", $name)) {
-            $this->parseError("Unexpected characters in attribute name: %s", $name);
-            $isValidAttribute = false;
-        }         // There is no limitation for 1st character in HTML5.
-        // But method "DOMElement::setAttribute" is throwing exception for the
-        // characters below so they have to be filtered.
-        // see issue #23: https://github.com/Masterminds/html5-php/issues/23
-        // and http://www.w3.org/TR/2011/WD-html5-20110525/syntax.html#syntax-attribute-name
-        else
-            if (preg_match("/^[0-9.-]/u", $name)) {
-                $this->parseError("Unexpected character at the begining of attribute name: %s", $name);
-                $isValidAttribute = false;
-            }
-        // 8.1.2.3
-        $this->scanner->whitespace();
-
-        $val = $this->attributeValue();
-        if ($isValidAttribute) {
-            $attributes[$name] = $val;
-        }
-        return true;
-    }
-
-    /**
-     * Consume an attribute value.
-     * 8.2.4.37 and after.
-     */
-    protected function attributeValue()
-    {
-        if ($this->scanner->current() != '=') {
-            return null;
-        }
-        $this->scanner->next();
-        // 8.1.2.3
-        $this->scanner->whitespace();
-
-        $tok = $this->scanner->current();
-        switch ($tok) {
-            case "\n":
-            case "\f":
-            case " ":
-            case "\t":
-                // Whitespace here indicates an empty value.
-                return null;
-            case '"':
-            case "'":
-                $this->scanner->next();
-                return $this->quotedAttributeValue($tok);
-            case '>':
-                // case '/': // 8.2.4.37 seems to allow foo=/ as a valid attr.
-                $this->parseError("Expected attribute value, got tag end.");
-                return null;
-            case '=':
-            case '`':
-                $this->parseError("Expecting quotes, got %s.", $tok);
-                return $this->unquotedAttributeValue();
-            default:
-                return $this->unquotedAttributeValue();
-        }
-    }
-
-    /**
-     * Get an attribute value string.
-     *
-     * @param string $quote
-     *            IMPORTANT: This is a series of chars! Any one of which will be considered
-     *            termination of an attribute's value. E.g. "\"'" will stop at either
-     *            ' or ".
-     * @return string The attribute value.
-     */
-    protected function quotedAttributeValue($quote)
-    {
-        $stoplist = "\f" . $quote;
-        $val = '';
-        $tok = $this->scanner->current();
-        while (strspn($tok, $stoplist) == 0 && $tok !== false) {
-            if ($tok == '&') {
-                $val .= $this->decodeCharacterReference(true);
-                $tok = $this->scanner->current();
-            } else {
-                $val .= $tok;
-                $tok = $this->scanner->next();
-            }
-        }
-        $this->scanner->next();
-        return $val;
-    }
-
-    protected function unquotedAttributeValue()
-    {
-        $stoplist = "\t\n\f >";
-        $val = '';
-        $tok = $this->scanner->current();
-        while (strspn($tok, $stoplist) == 0 && $tok !== false) {
-            if ($tok == '&') {
-                $val .= $this->decodeCharacterReference(true);
-                $tok = $this->scanner->current();
-            } else {
-                if (strspn($tok, "\"'<=`") > 0) {
-                    $this->parseError("Unexpected chars in unquoted attribute value %s", $tok);
-                }
-                $val .= $tok;
-                $tok = $this->scanner->next();
-            }
-        }
-        return $val;
-    }
-
-    /**
-     * Consume malformed markup as if it were a comment.
-     * 8.2.4.44
-     *
-     * The spec requires that the ENTIRE tag-like thing be enclosed inside of
-     * the comment. So this will generate comments like:
-     *
-     * &lt;!--&lt/+foo&gt;--&gt;
-     *
-     * @param string $leading
-     *            Prepend any leading characters. This essentially
-     *            negates the need to backtrack, but it's sort of
-     *            a hack.
-     */
-    protected function bogusComment($leading = '')
-    {
-
-        // TODO: This can be done more efficiently when the
-        // scanner exposes a readUntil() method.
-        $comment = $leading;
-        $tok = $this->scanner->current();
-        do {
-            $comment .= $tok;
-            $tok = $this->scanner->next();
-        } while ($tok !== false && $tok != '>');
-
-        $this->flushBuffer();
-        $this->events->comment($comment . $tok);
-        $this->scanner->next();
-
-        return true;
-    }
-
-    /**
-     * Read a comment.
-     *
-     * Expects the first tok to be inside of the comment.
-     */
-    protected function comment()
-    {
-        $tok = $this->scanner->current();
-        $comment = '';
-
-        // <!-->. Emit an empty comment because 8.2.4.46 says to.
-        if ($tok == '>') {
-            // Parse error. Emit the comment token.
-            $this->parseError("Expected comment data, got '>'");
-            $this->events->comment('');
-            $this->scanner->next();
-            return true;
-        }
-
-        // Replace NULL with the replacement char.
-        if ($tok == "\0") {
-            $tok = UTF8Utils::FFFD;
-        }
-        while (! $this->isCommentEnd()) {
-            $comment .= $tok;
-            $tok = $this->scanner->next();
-        }
-
-        $this->events->comment($comment);
-        $this->scanner->next();
-        return true;
-    }
-
-    /**
-     * Check if the scanner has reached the end of a comment.
-     */
-    protected function isCommentEnd()
-    {
-        // EOF
-        if ($this->scanner->current() === false) {
-            // Hit the end.
-            $this->parseError("Unexpected EOF in a comment.");
-            return true;
-        }
-
-        // If it doesn't start with -, not the end.
-        if ($this->scanner->current() != '-') {
-            return false;
-        }
-
-        // Advance one, and test for '->'
-        if ($this->scanner->next() == '-' && $this->scanner->peek() == '>') {
-            $this->scanner->next(); // Consume the last '>'
-            return true;
-        }
-        // Unread '-';
-        $this->scanner->unconsume(1);
-        return false;
-    }
-
-    /**
-     * Parse a DOCTYPE.
-     *
-     * Parse a DOCTYPE declaration. This method has strong bearing on whether or
-     * not Quirksmode is enabled on the event handler.
-     *
-     * @todo This method is a little long. Should probably refactor.
-     */
-    protected function doctype()
-    {
-        if (strcasecmp($this->scanner->current(), 'D')) {
-            return false;
-        }
-        // Check that string is DOCTYPE.
-        $chars = $this->scanner->charsWhile("DOCTYPEdoctype");
-        if (strcasecmp($chars, 'DOCTYPE')) {
-            $this->parseError('Expected DOCTYPE, got %s', $chars);
-            return $this->bogusComment('<!' . $chars);
-        }
-
-        $this->scanner->whitespace();
-        $tok = $this->scanner->current();
-
-        // EOF: die.
-        if ($tok === false) {
-            $this->events->doctype('html5', EventHandler::DOCTYPE_NONE, '', true);
-            return $this->eof();
-        }
-
-        $doctypeName = '';
-
-        // NULL char: convert.
-        if ($tok === "\0") {
-            $this->parseError("Unexpected null character in DOCTYPE.");
-            $doctypeName .= UTF8::FFFD;
-            $tok = $this->scanner->next();
-        }
-
-        $stop = " \n\f>";
-        $doctypeName = $this->scanner->charsUntil($stop);
-        // Lowercase ASCII, replace \0 with FFFD
-        $doctypeName = strtolower(strtr($doctypeName, "\0", UTF8Utils::FFFD));
-
-        $tok = $this->scanner->current();
-
-        // If false, emit a parse error, DOCTYPE, and return.
-        if ($tok === false) {
-            $this->parseError('Unexpected EOF in DOCTYPE declaration.');
-            $this->events->doctype($doctypeName, EventHandler::DOCTYPE_NONE, null, true);
-            return true;
-        }
-
-        // Short DOCTYPE, like <!DOCTYPE html>
-        if ($tok == '>') {
-            // DOCTYPE without a name.
-            if (strlen($doctypeName) == 0) {
-                $this->parseError("Expected a DOCTYPE name. Got nothing.");
-                $this->events->doctype($doctypeName, 0, null, true);
-                $this->scanner->next();
-                return true;
-            }
-            $this->events->doctype($doctypeName);
-            $this->scanner->next();
-            return true;
-        }
-        $this->scanner->whitespace();
-
-        $pub = strtoupper($this->scanner->getAsciiAlpha());
-        $white = strlen($this->scanner->whitespace());
-        $tok = $this->scanner->current();
-
-        // Get ID, and flag it as pub or system.
-        if (($pub == 'PUBLIC' || $pub == 'SYSTEM') && $white > 0) {
-            // Get the sys ID.
-            $type = $pub == 'PUBLIC' ? EventHandler::DOCTYPE_PUBLIC : EventHandler::DOCTYPE_SYSTEM;
-            $id = $this->quotedString("\0>");
-            if ($id === false) {
-                $this->events->doctype($doctypeName, $type, $pub, false);
-                return false;
-            }
-
-            // Premature EOF.
-            if ($this->scanner->current() === false) {
-                $this->parseError("Unexpected EOF in DOCTYPE");
-                $this->events->doctype($doctypeName, $type, $id, true);
-                return true;
-            }
-
-            // Well-formed complete DOCTYPE.
-            $this->scanner->whitespace();
-            if ($this->scanner->current() == '>') {
-                $this->events->doctype($doctypeName, $type, $id, false);
-                $this->scanner->next();
-                return true;
-            }
-
-            // If we get here, we have <!DOCTYPE foo PUBLIC "bar" SOME_JUNK
-            // Throw away the junk, parse error, quirks mode, return true.
-            $this->scanner->charsUntil(">");
-            $this->parseError("Malformed DOCTYPE.");
-            $this->events->doctype($doctypeName, $type, $id, true);
-            $this->scanner->next();
-            return true;
-        }
-
-        // Else it's a bogus DOCTYPE.
-        // Consume to > and trash.
-        $this->scanner->charsUntil('>');
-
-        $this->parseError("Expected PUBLIC or SYSTEM. Got %s.", $pub);
-        $this->events->doctype($doctypeName, 0, null, true);
-        $this->scanner->next();
-        return true;
-    }
-
-    /**
-     * Utility for reading a quoted string.
-     *
-     * @param string $stopchars
-     *            Characters (in addition to a close-quote) that should stop the string.
-     *            E.g. sometimes '>' is higher precedence than '"' or "'".
-     * @return mixed String if one is found (quotations omitted)
-     */
-    protected function quotedString($stopchars)
-    {
-        $tok = $this->scanner->current();
-        if ($tok == '"' || $tok == "'") {
-            $this->scanner->next();
-            $ret = $this->scanner->charsUntil($tok . $stopchars);
-            if ($this->scanner->current() == $tok) {
-                $this->scanner->next();
-            } else {
-                // Parse error because no close quote.
-                $this->parseError("Expected %s, got %s", $tok, $this->scanner->current());
-            }
-            return $ret;
-        }
-        return false;
-    }
-
-    /**
-     * Handle a CDATA section.
-     */
-    protected function cdataSection()
-    {
-        if ($this->scanner->current() != '[') {
-            return false;
-        }
-        $cdata = '';
-        $this->scanner->next();
-
-        $chars = $this->scanner->charsWhile('CDAT');
-        if ($chars != 'CDATA' || $this->scanner->current() != '[') {
-            $this->parseError('Expected [CDATA[, got %s', $chars);
-            return $this->bogusComment('<![' . $chars);
-        }
-
-        $tok = $this->scanner->next();
-        do {
-            if ($tok === false) {
-                $this->parseError('Unexpected EOF inside CDATA.');
-                $this->bogusComment('<![CDATA[' . $cdata);
-                return true;
-            }
-            $cdata .= $tok;
-            $tok = $this->scanner->next();
-        } while (! $this->sequenceMatches(']]>'));
-
-        // Consume ]]>
-        $this->scanner->consume(3);
-
-        $this->events->cdata($cdata);
-        return true;
-    }
-
-    // ================================================================
-    // Non-HTML5
-    // ================================================================
-    /**
-     * Handle a processing instruction.
-     *
-     * XML processing instructions are supposed to be ignored in HTML5,
-     * treated as "bogus comments". However, since we're not a user
-     * agent, we allow them. We consume until ?> and then issue a
-     * EventListener::processingInstruction() event.
-     */
-    protected function processingInstruction()
-    {
-        if ($this->scanner->current() != '?') {
-            return false;
-        }
-
-        $tok = $this->scanner->next();
-        $procName = $this->scanner->getAsciiAlpha();
-        $white = strlen($this->scanner->whitespace());
-
-        // If not a PI, send to bogusComment.
-        if (strlen($procName) == 0 || $white == 0 || $this->scanner->current() == false) {
-            $this->parseError("Expected processing instruction name, got $tok");
-            $this->bogusComment('<?' . $tok . $procName);
-            return true;
-        }
-
-        $data = '';
-        // As long as it's not the case that the next two chars are ? and >.
-        while (! ($this->scanner->current() == '?' && $this->scanner->peek() == '>')) {
-            $data .= $this->scanner->current();
-
-            $tok = $this->scanner->next();
-            if ($tok === false) {
-                $this->parseError("Unexpected EOF in processing instruction.");
-                $this->events->processingInstruction($procName, $data);
-                return true;
-            }
-        }
-
-        $this->scanner->next(); // >
-        $this->scanner->next(); // Next token.
-        $this->events->processingInstruction($procName, $data);
-        return true;
-    }
-
-    // ================================================================
-    // UTILITY FUNCTIONS
-    // ================================================================
-
-    /**
-     * Read from the input stream until we get to the desired sequene
-     * or hit the end of the input stream.
-     */
-    protected function readUntilSequence($sequence)
-    {
-        $buffer = '';
-
-        // Optimization for reading larger blocks faster.
-        $first = substr($sequence, 0, 1);
-        while ($this->scanner->current() !== false) {
-            $buffer .= $this->scanner->charsUntil($first);
-
-            // Stop as soon as we hit the stopping condition.
-            if ($this->sequenceMatches($sequence, false)) {
-                return $buffer;
-            }
-            $buffer .= $this->scanner->current();
-            $this->scanner->next();
-        }
-
-        // If we get here, we hit the EOF.
-        $this->parseError("Unexpected EOF during text read.");
-        return $buffer;
-    }
-
-    /**
-     * Check if upcomming chars match the given sequence.
-     *
-     * This will read the stream for the $sequence. If it's
-     * found, this will return true. If not, return false.
-     * Since this unconsumes any chars it reads, the caller
-     * will still need to read the next sequence, even if
-     * this returns true.
-     *
-     * Example: $this->sequenceMatches('</script>') will
-     * see if the input stream is at the start of a
-     * '</script>' string.
-     */
-    protected function sequenceMatches($sequence, $caseSensitive = true)
-    {
-        $len = strlen($sequence);
-        $buffer = '';
-        for ($i = 0; $i < $len; ++ $i) {
-            $buffer .= $this->scanner->current();
-
-            // EOF. Rewind and let the caller handle it.
-            if ($this->scanner->current() === false) {
-                $this->scanner->unconsume($i);
-                return false;
-            }
-            $this->scanner->next();
-        }
-
-        $this->scanner->unconsume($len);
-        return $caseSensitive ? $buffer == $sequence : strcasecmp($buffer, $sequence) === 0;
-    }
-
-    /**
-     * Send a TEXT event with the contents of the text buffer.
-     *
-     * This emits an EventHandler::text() event with the current contents of the
-     * temporary text buffer. (The buffer is used to group as much PCDATA
-     * as we can instead of emitting lots and lots of TEXT events.)
-     */
-    protected function flushBuffer()
-    {
-        if ($this->text === '') {
-            return;
-        }
-        $this->events->text($this->text);
-        $this->text = '';
-    }
-
-    /**
-     * Add text to the temporary buffer.
-     *
-     * @see flushBuffer()
-     */
-    protected function buffer($str)
-    {
-        $this->text .= $str;
-    }
-
-    /**
-     * Emit a parse error.
-     *
-     * A parse error always returns false because it never consumes any
-     * characters.
-     */
-    protected function parseError($msg)
-    {
-        $args = func_get_args();
-
-        if (count($args) > 1) {
-            array_shift($args);
-            $msg = vsprintf($msg, $args);
-        }
-
-        $line = $this->scanner->currentLine();
-        $col = $this->scanner->columnOffset();
-        $this->events->parseError($msg, $line, $col);
-        return false;
-    }
-
-    /**
-     * Decode a character reference and return the string.
-     *
-     * Returns false if the entity could not be found. If $inAttribute is set
-     * to true, a bare & will be returned as-is.
-     *
-     * @param boolean $inAttribute
-     *            Set to true if the text is inside of an attribute value.
-     *            false otherwise.
-     */
-    protected function decodeCharacterReference($inAttribute = false)
-    {
-
-        // If it fails this, it's definitely not an entity.
-        if ($this->scanner->current() != '&') {
-            return false;
-        }
-
-        // Next char after &.
-        $tok = $this->scanner->next();
-        $entity = '';
-        $start = $this->scanner->position();
-
-        if ($tok == false) {
-            return '&';
-        }
-
-        // These indicate not an entity. We return just
-        // the &.
-        if (strspn($tok, static::WHITE . "&<") == 1) {
-            // $this->scanner->next();
-            return '&';
-        }
-
-        // Numeric entity
-        if ($tok == '#') {
-            $tok = $this->scanner->next();
-
-            // Hexidecimal encoding.
-            // X[0-9a-fA-F]+;
-            // x[0-9a-fA-F]+;
-            if ($tok == 'x' || $tok == 'X') {
-                $tok = $this->scanner->next(); // Consume x
-
-                // Convert from hex code to char.
-                $hex = $this->scanner->getHex();
-                if (empty($hex)) {
-                    $this->parseError("Expected &#xHEX;, got &#x%s", $tok);
-                    // We unconsume because we don't know what parser rules might
-                    // be in effect for the remaining chars. For example. '&#>'
-                    // might result in a specific parsing rule inside of tag
-                    // contexts, while not inside of pcdata context.
-                    $this->scanner->unconsume(2);
-                    return '&';
-                }
-                $entity = CharacterReference::lookupHex($hex);
-            }             // Decimal encoding.
-            // [0-9]+;
-            else {
-                // Convert from decimal to char.
-                $numeric = $this->scanner->getNumeric();
-                if ($numeric === false) {
-                    $this->parseError("Expected &#DIGITS;, got &#%s", $tok);
-                    $this->scanner->unconsume(2);
-                    return '&';
-                }
-                $entity = CharacterReference::lookupDecimal($numeric);
-            }
-        }         // String entity.
-        else {
-            // Attempt to consume a string up to a ';'.
-            // [a-zA-Z0-9]+;
-            $cname = $this->scanner->getAsciiAlpha();
-            $entity = CharacterReference::lookupName($cname);
-
-            // When no entity is found provide the name of the unmatched string
-            // and continue on as the & is not part of an entity. The & will
-            // be converted to &amp; elsewhere.
-            if ($entity == null) {
-                $this->parseError("No match in entity table for '%s'", $cname);
-                $this->scanner->unconsume($this->scanner->position() - $start);
-                return '&';
-            }
-        }
-
-        // The scanner has advanced the cursor for us.
-        $tok = $this->scanner->current();
-
-        // We have an entity. We're done here.
-        if ($tok == ';') {
-            $this->scanner->next();
-            return $entity;
-        }
-
-        // If in an attribute, then failing to match ; means unconsume the
-        // entire string. Otherwise, failure to match is an error.
-        if ($inAttribute) {
-            $this->scanner->unconsume($this->scanner->position() - $start);
-            return '&';
-        }
-
-        $this->parseError("Expected &ENTITY;, got &ENTITY%s (no trailing ;) ", $tok);
-        return '&' . $entity;
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php b/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
deleted file mode 100644
index 2af3c66..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/TreeBuildingRules.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-
-/**
- * Handles special-case rules for the DOM tree builder.
- *
- * Many tags have special rules that need to be accomodated on an
- * individual basis. This class handles those rules.
- *
- * See section 8.1.2.4 of the spec.
- *
- * @todo - colgroup and col special behaviors
- *       - body and head special behaviors
- */
-class TreeBuildingRules
-{
-
-    protected static $tags = array(
-        'li' => 1,
-        'dd' => 1,
-        'dt' => 1,
-        'rt' => 1,
-        'rp' => 1,
-        'tr' => 1,
-        'th' => 1,
-        'td' => 1,
-        'thead' => 1,
-        'tfoot' => 1,
-        'tbody' => 1,
-        'table' => 1,
-        'optgroup' => 1,
-        'option' => 1
-    );
-
-    /**
-     * Build a new rules engine.
-     *
-     * @param \DOMDocument $doc
-     *            The DOM document to use for evaluation and modification.
-     */
-    public function __construct($doc)
-    {
-        $this->doc = $doc;
-    }
-
-    /**
-     * Returns true if the given tagname has special processing rules.
-     */
-    public function hasRules($tagname)
-    {
-        return isset(static::$tags[$tagname]);
-    }
-
-    /**
-     * Evaluate the rule for the current tag name.
-     *
-     * This may modify the existing DOM.
-     *
-     * @return \DOMElement The new Current DOM element.
-     */
-    public function evaluate($new, $current)
-    {
-        switch ($new->tagName) {
-            case 'li':
-                return $this->handleLI($new, $current);
-            case 'dt':
-            case 'dd':
-                return $this->handleDT($new, $current);
-            case 'rt':
-            case 'rp':
-                return $this->handleRT($new, $current);
-            case 'optgroup':
-                return $this->closeIfCurrentMatches($new, $current, array(
-                    'optgroup'
-                ));
-            case 'option':
-                return $this->closeIfCurrentMatches($new, $current, array(
-                    'option',
-                    'optgroup'
-                ));
-            case 'tr':
-                return $this->closeIfCurrentMatches($new, $current, array(
-                    'tr'
-                ));
-            case 'td':
-            case 'th':
-                return $this->closeIfCurrentMatches($new, $current, array(
-                    'th',
-                    'td'
-                ));
-            case 'tbody':
-            case 'thead':
-            case 'tfoot':
-            case 'table': // Spec isn't explicit about this, but it's necessary.
-
-                return $this->closeIfCurrentMatches($new, $current, array(
-                    'thead',
-                    'tfoot',
-                    'tbody'
-                ));
-        }
-
-        return $current;
-    }
-
-    protected function handleLI($ele, $current)
-    {
-        return $this->closeIfCurrentMatches($ele, $current, array(
-            'li'
-        ));
-    }
-
-    protected function handleDT($ele, $current)
-    {
-        return $this->closeIfCurrentMatches($ele, $current, array(
-            'dt',
-            'dd'
-        ));
-    }
-
-    protected function handleRT($ele, $current)
-    {
-        return $this->closeIfCurrentMatches($ele, $current, array(
-            'rt',
-            'rp'
-        ));
-    }
-
-    protected function closeIfCurrentMatches($ele, $current, $match)
-    {
-        $tname = $current->tagName;
-        if (in_array($current->tagName, $match)) {
-            $current->parentNode->appendChild($ele);
-        } else {
-            $current->appendChild($ele);
-        }
-
-        return $ele;
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php b/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
deleted file mode 100644
index d319252..0000000
--- a/vendor/masterminds/html5/src/HTML5/Parser/UTF8Utils.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Parser;
-/*
- *
-* Portions based on code from html5lib files with the following copyright:
-
-Copyright 2009 Geoffrey Sneddon <http://gsnedders.com/>
-
-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.
-
-*/
-/**
- * UTF-8 Utilities
- */
-class UTF8Utils
-{
-
-    /**
-     * The Unicode replacement character..
-     */
-    const FFFD = "\xEF\xBF\xBD";
-
-    /**
-     * Count the number of characters in a string.
-     *
-     * UTF-8 aware. This will try (in order) iconv,
-     * MB, libxml, and finally a custom counter.
-     *
-     * @todo Move this to a general utility class.
-     */
-    public static function countChars($string)
-    {
-        // Get the length for the string we need.
-        if (function_exists('iconv_strlen')) {
-            return iconv_strlen($string, 'utf-8');
-        } elseif (function_exists('mb_strlen')) {
-            return mb_strlen($string, 'utf-8');
-        } elseif (function_exists('utf8_decode')) {
-            // MPB: Will this work? Won't certain decodes lead to two chars
-            // extrapolated out of 2-byte chars?
-            return strlen(utf8_decode($string));
-        }
-        $count = count_chars($string);
-        // 0x80 = 0x7F - 0 + 1 (one added to get inclusive range)
-        // 0x33 = 0xF4 - 0x2C + 1 (one added to get inclusive range)
-        return array_sum(array_slice($count, 0, 0x80)) + array_sum(array_slice($count, 0xC2, 0x33));
-    }
-
-    /**
-     * Convert data from the given encoding to UTF-8.
-     *
-     * This has not yet been tested with charactersets other than UTF-8.
-     * It should work with ISO-8859-1/-13 and standard Latin Win charsets.
-     *
-     * @param string $data
-     *            The data to convert.
-     * @param string $encoding
-     *            A valid encoding. Examples: http://www.php.net/manual/en/mbstring.supported-encodings.php
-     */
-    public static function convertToUTF8($data, $encoding = 'UTF-8')
-    {
-        /*
-         * From the HTML5 spec: Given an encoding, the bytes in the input stream must be converted to Unicode characters for the tokeniser, as described by the rules for that encoding, except that the leading U+FEFF BYTE ORDER MARK character, if any, must not be stripped by the encoding layer (it is stripped by the rule below). Bytes or sequences of bytes in the original byte stream that could not be converted to Unicode characters must be converted to U+FFFD REPLACEMENT CHARACTER code points.
-         */
-
-        // mb_convert_encoding is chosen over iconv because of a bug. The best
-        // details for the bug are on http://us1.php.net/manual/en/function.iconv.php#108643
-        // which contains links to the actual but reports as well as work around
-        // details.
-        if (function_exists('mb_convert_encoding')) {
-            // mb library has the following behaviors:
-            // - UTF-16 surrogates result in false.
-            // - Overlongs and outside Plane 16 result in empty strings.
-
-            // Before we run mb_convert_encoding we need to tell it what to do with
-            // characters it does not know. This could be different than the parent
-            // application executing this library so we store the value, change it
-            // to our needs, and then change it back when we are done. This feels
-            // a little excessive and it would be great if there was a better way.
-            $save = ini_get('mbstring.substitute_character');
-            ini_set('mbstring.substitute_character', "none");
-            $data = mb_convert_encoding($data, 'UTF-8', $encoding);
-            ini_set('mbstring.substitute_character', $save);
-        }        // @todo Get iconv running in at least some environments if that is possible.
-        elseif (function_exists('iconv') && $encoding != 'auto') {
-            // fprintf(STDOUT, "iconv found\n");
-            // iconv has the following behaviors:
-            // - Overlong representations are ignored.
-            // - Beyond Plane 16 is replaced with a lower char.
-            // - Incomplete sequences generate a warning.
-            $data = @iconv($encoding, 'UTF-8//IGNORE', $data);
-        } else {
-            // we can make a conforming native implementation
-            throw new Exception('Not implemented, please install mbstring or iconv');
-        }
-
-        /*
-         * One leading U+FEFF BYTE ORDER MARK character must be ignored if any are present.
-         */
-        if (substr($data, 0, 3) === "\xEF\xBB\xBF") {
-            $data = substr($data, 3);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Checks for Unicode code points that are not valid in a document.
-     *
-     * @param string $data
-     *            A string to analyze.
-     * @return array An array of (string) error messages produced by the scanning.
-     */
-    public static function checkForIllegalCodepoints($data)
-    {
-        if (! function_exists('preg_match_all')) {
-            throw\Exception('The PCRE library is not loaded or is not available.');
-        }
-
-        // Vestigal error handling.
-        $errors = array();
-
-        /*
-         * All U+0000 null characters in the input must be replaced by U+FFFD REPLACEMENT CHARACTERs. Any occurrences of such characters is a parse error.
-         */
-        for ($i = 0, $count = substr_count($data, "\0"); $i < $count; $i ++) {
-            $errors[] = 'null-character';
-        }
-
-        /*
-         * Any occurrences of any characters in the ranges U+0001 to U+0008, U+000B, U+000E to U+001F, U+007F to U+009F, U+D800 to U+DFFF , U+FDD0 to U+FDEF, and characters U+FFFE, U+FFFF, U+1FFFE, U+1FFFF, U+2FFFE, U+2FFFF, U+3FFFE, U+3FFFF, U+4FFFE, U+4FFFF, U+5FFFE, U+5FFFF, U+6FFFE, U+6FFFF, U+7FFFE, U+7FFFF, U+8FFFE, U+8FFFF, U+9FFFE, U+9FFFF, U+AFFFE, U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE, U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE, and U+10FFFF are parse errors. (These are all control characters or permanently undefined Unicode characters.)
-         */
-        // Check PCRE is loaded.
-        $count = preg_match_all(
-            '/(?:
-        [\x01-\x08\x0B\x0E-\x1F\x7F] # U+0001 to U+0008, U+000B,  U+000E to U+001F and U+007F
-      |
-        \xC2[\x80-\x9F] # U+0080 to U+009F
-      |
-        \xED(?:\xA0[\x80-\xFF]|[\xA1-\xBE][\x00-\xFF]|\xBF[\x00-\xBF]) # U+D800 to U+DFFFF
-      |
-        \xEF\xB7[\x90-\xAF] # U+FDD0 to U+FDEF
-      |
-        \xEF\xBF[\xBE\xBF] # U+FFFE and U+FFFF
-      |
-        [\xF0-\xF4][\x8F-\xBF]\xBF[\xBE\xBF] # U+nFFFE and U+nFFFF (1 <= n <= 10_{16})
-      )/x', $data, $matches);
-        for ($i = 0; $i < $count; $i ++) {
-            $errors[] = 'invalid-codepoint';
-        }
-
-        return $errors;
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/HTML5Entities.php b/vendor/masterminds/html5/src/HTML5/Serializer/HTML5Entities.php
deleted file mode 100644
index 4f90f84..0000000
--- a/vendor/masterminds/html5/src/HTML5/Serializer/HTML5Entities.php
+++ /dev/null
@@ -1,1533 +0,0 @@
-<?php
-/**
- * @file
- * This contains HTML5 entities to use with serializing.
- *
- * The list here is mildly different from the list at \Masterminds\HTML5\Entities because
- * that list was generated from the w3c. It contains some entities that are
- * not entirely proper such as &am; which maps to &. This list is meant to be
- * a fallback for PHP versions prior to PHP 5.4 when dealing with encoding.
- */
-namespace Masterminds\HTML5\Serializer;
-
-/**
- * A mapping of entities to their html5 representation.
- * Used for older PHP
- * versions that don't have the mapping.
- */
-class HTML5Entities
-{
-
-    public static $map = array(
-        '	' => '&Tab;',
-        "\n" => '&NewLine;',
-        '!' => '&excl;',
-        '"' => '&quot;',
-        '#' => '&num;',
-        '$' => '&dollar;',
-        '%' => '&percnt;',
-        '&' => '&amp;',
-        '\'' => '&apos;',
-        '(' => '&lpar;',
-        ')' => '&rpar;',
-        '*' => '&ast;',
-        '+' => '&plus;',
-        ',' => '&comma;',
-        '.' => '&period;',
-        '/' => '&sol;',
-        ':' => '&colon;',
-        ';' => '&semi;',
-        '<' => '&lt;',
-        '<⃒' => '&nvlt',
-        '=' => '&equals;',
-        '=⃥' => '&bne',
-        '>' => '&gt;',
-        '>⃒' => '&nvgt',
-        '?' => '&quest;',
-        '@' => '&commat;',
-        '[' => '&lbrack;',
-        '\\' => '&bsol;',
-        ']' => '&rsqb;',
-        '^' => '&Hat;',
-        '_' => '&lowbar;',
-        '`' => '&grave;',
-        'fj' => '&fjlig',
-        '{' => '&lbrace;',
-        '|' => '&vert;',
-        '}' => '&rcub;',
-        ' ' => '&nbsp;',
-        '¡' => '&iexcl;',
-        '¢' => '&cent;',
-        '£' => '&pound;',
-        '¤' => '&curren;',
-        '¥' => '&yen;',
-        '¦' => '&brvbar;',
-        '§' => '&sect;',
-        '¨' => '&DoubleDot;',
-        '©' => '&copy;',
-        'ª' => '&ordf;',
-        '«' => '&laquo;',
-        '¬' => '&not;',
-        '­' => '&shy;',
-        '®' => '&reg;',
-        '¯' => '&macr;',
-        '°' => '&deg;',
-        '±' => '&plusmn;',
-        '²' => '&sup2;',
-        '³' => '&sup3;',
-        '´' => '&DiacriticalAcute;',
-        'µ' => '&micro;',
-        '¶' => '&para;',
-        '·' => '&CenterDot;',
-        '¸' => '&Cedilla;',
-        '¹' => '&sup1;',
-        'º' => '&ordm;',
-        '»' => '&raquo;',
-        '¼' => '&frac14;',
-        '½' => '&half;',
-        '¾' => '&frac34;',
-        '¿' => '&iquest;',
-        'À' => '&Agrave;',
-        'Á' => '&Aacute;',
-        'Â' => '&Acirc;',
-        'Ã' => '&Atilde;',
-        'Ä' => '&Auml;',
-        'Å' => '&Aring;',
-        'Æ' => '&AElig;',
-        'Ç' => '&Ccedil;',
-        'È' => '&Egrave;',
-        'É' => '&Eacute;',
-        'Ê' => '&Ecirc;',
-        'Ë' => '&Euml;',
-        'Ì' => '&Igrave;',
-        'Í' => '&Iacute;',
-        'Î' => '&Icirc;',
-        'Ï' => '&Iuml;',
-        'Ð' => '&ETH;',
-        'Ñ' => '&Ntilde;',
-        'Ò' => '&Ograve;',
-        'Ó' => '&Oacute;',
-        'Ô' => '&Ocirc;',
-        'Õ' => '&Otilde;',
-        'Ö' => '&Ouml;',
-        '×' => '&times;',
-        'Ø' => '&Oslash;',
-        'Ù' => '&Ugrave;',
-        'Ú' => '&Uacute;',
-        'Û' => '&Ucirc;',
-        'Ü' => '&Uuml;',
-        'Ý' => '&Yacute;',
-        'Þ' => '&THORN;',
-        'ß' => '&szlig;',
-        'à' => '&agrave;',
-        'á' => '&aacute;',
-        'â' => '&acirc;',
-        'ã' => '&atilde;',
-        'ä' => '&auml;',
-        'å' => '&aring;',
-        'æ' => '&aelig;',
-        'ç' => '&ccedil;',
-        'è' => '&egrave;',
-        'é' => '&eacute;',
-        'ê' => '&ecirc;',
-        'ë' => '&euml;',
-        'ì' => '&igrave;',
-        'í' => '&iacute;',
-        'î' => '&icirc;',
-        'ï' => '&iuml;',
-        'ð' => '&eth;',
-        'ñ' => '&ntilde;',
-        'ò' => '&ograve;',
-        'ó' => '&oacute;',
-        'ô' => '&ocirc;',
-        'õ' => '&otilde;',
-        'ö' => '&ouml;',
-        '÷' => '&divide;',
-        'ø' => '&oslash;',
-        'ù' => '&ugrave;',
-        'ú' => '&uacute;',
-        'û' => '&ucirc;',
-        'ü' => '&uuml;',
-        'ý' => '&yacute;',
-        'þ' => '&thorn;',
-        'ÿ' => '&yuml;',
-        'Ā' => '&Amacr;',
-        'ā' => '&amacr;',
-        'Ă' => '&Abreve;',
-        'ă' => '&abreve;',
-        'Ą' => '&Aogon;',
-        'ą' => '&aogon;',
-        'Ć' => '&Cacute;',
-        'ć' => '&cacute;',
-        'Ĉ' => '&Ccirc;',
-        'ĉ' => '&ccirc;',
-        'Ċ' => '&Cdot;',
-        'ċ' => '&cdot;',
-        'Č' => '&Ccaron;',
-        'č' => '&ccaron;',
-        'Ď' => '&Dcaron;',
-        'ď' => '&dcaron;',
-        'Đ' => '&Dstrok;',
-        'đ' => '&dstrok;',
-        'Ē' => '&Emacr;',
-        'ē' => '&emacr;',
-        'Ė' => '&Edot;',
-        'ė' => '&edot;',
-        'Ę' => '&Eogon;',
-        'ę' => '&eogon;',
-        'Ě' => '&Ecaron;',
-        'ě' => '&ecaron;',
-        'Ĝ' => '&Gcirc;',
-        'ĝ' => '&gcirc;',
-        'Ğ' => '&Gbreve;',
-        'ğ' => '&gbreve;',
-        'Ġ' => '&Gdot;',
-        'ġ' => '&gdot;',
-        'Ģ' => '&Gcedil;',
-        'Ĥ' => '&Hcirc;',
-        'ĥ' => '&hcirc;',
-        'Ħ' => '&Hstrok;',
-        'ħ' => '&hstrok;',
-        'Ĩ' => '&Itilde;',
-        'ĩ' => '&itilde;',
-        'Ī' => '&Imacr;',
-        'ī' => '&imacr;',
-        'Į' => '&Iogon;',
-        'į' => '&iogon;',
-        'İ' => '&Idot;',
-        'ı' => '&inodot;',
-        'IJ' => '&IJlig;',
-        'ij' => '&ijlig;',
-        'Ĵ' => '&Jcirc;',
-        'ĵ' => '&jcirc;',
-        'Ķ' => '&Kcedil;',
-        'ķ' => '&kcedil;',
-        'ĸ' => '&kgreen;',
-        'Ĺ' => '&Lacute;',
-        'ĺ' => '&lacute;',
-        'Ļ' => '&Lcedil;',
-        'ļ' => '&lcedil;',
-        'Ľ' => '&Lcaron;',
-        'ľ' => '&lcaron;',
-        'Ŀ' => '&Lmidot;',
-        'ŀ' => '&lmidot;',
-        'Ł' => '&Lstrok;',
-        'ł' => '&lstrok;',
-        'Ń' => '&Nacute;',
-        'ń' => '&nacute;',
-        'Ņ' => '&Ncedil;',
-        'ņ' => '&ncedil;',
-        'Ň' => '&Ncaron;',
-        'ň' => '&ncaron;',
-        'ʼn' => '&napos;',
-        'Ŋ' => '&ENG;',
-        'ŋ' => '&eng;',
-        'Ō' => '&Omacr;',
-        'ō' => '&omacr;',
-        'Ő' => '&Odblac;',
-        'ő' => '&odblac;',
-        'Œ' => '&OElig;',
-        'œ' => '&oelig;',
-        'Ŕ' => '&Racute;',
-        'ŕ' => '&racute;',
-        'Ŗ' => '&Rcedil;',
-        'ŗ' => '&rcedil;',
-        'Ř' => '&Rcaron;',
-        'ř' => '&rcaron;',
-        'Ś' => '&Sacute;',
-        'ś' => '&sacute;',
-        'Ŝ' => '&Scirc;',
-        'ŝ' => '&scirc;',
-        'Ş' => '&Scedil;',
-        'ş' => '&scedil;',
-        'Š' => '&Scaron;',
-        'š' => '&scaron;',
-        'Ţ' => '&Tcedil;',
-        'ţ' => '&tcedil;',
-        'Ť' => '&Tcaron;',
-        'ť' => '&tcaron;',
-        'Ŧ' => '&Tstrok;',
-        'ŧ' => '&tstrok;',
-        'Ũ' => '&Utilde;',
-        'ũ' => '&utilde;',
-        'Ū' => '&Umacr;',
-        'ū' => '&umacr;',
-        'Ŭ' => '&Ubreve;',
-        'ŭ' => '&ubreve;',
-        'Ů' => '&Uring;',
-        'ů' => '&uring;',
-        'Ű' => '&Udblac;',
-        'ű' => '&udblac;',
-        'Ų' => '&Uogon;',
-        'ų' => '&uogon;',
-        'Ŵ' => '&Wcirc;',
-        'ŵ' => '&wcirc;',
-        'Ŷ' => '&Ycirc;',
-        'ŷ' => '&ycirc;',
-        'Ÿ' => '&Yuml;',
-        'Ź' => '&Zacute;',
-        'ź' => '&zacute;',
-        'Ż' => '&Zdot;',
-        'ż' => '&zdot;',
-        'Ž' => '&Zcaron;',
-        'ž' => '&zcaron;',
-        'ƒ' => '&fnof;',
-        'Ƶ' => '&imped;',
-        'ǵ' => '&gacute;',
-        'ȷ' => '&jmath;',
-        'ˆ' => '&circ;',
-        'ˇ' => '&Hacek;',
-        '˘' => '&Breve;',
-        '˙' => '&dot;',
-        '˚' => '&ring;',
-        '˛' => '&ogon;',
-        '˜' => '&DiacriticalTilde;',
-        '˝' => '&DiacriticalDoubleAcute;',
-        '̑' => '&DownBreve;',
-        'Α' => '&Alpha;',
-        'Β' => '&Beta;',
-        'Γ' => '&Gamma;',
-        'Δ' => '&Delta;',
-        'Ε' => '&Epsilon;',
-        'Ζ' => '&Zeta;',
-        'Η' => '&Eta;',
-        'Θ' => '&Theta;',
-        'Ι' => '&Iota;',
-        'Κ' => '&Kappa;',
-        'Λ' => '&Lambda;',
-        'Μ' => '&Mu;',
-        'Ν' => '&Nu;',
-        'Ξ' => '&Xi;',
-        'Ο' => '&Omicron;',
-        'Π' => '&Pi;',
-        'Ρ' => '&Rho;',
-        'Σ' => '&Sigma;',
-        'Τ' => '&Tau;',
-        'Υ' => '&Upsilon;',
-        'Φ' => '&Phi;',
-        'Χ' => '&Chi;',
-        'Ψ' => '&Psi;',
-        'Ω' => '&Omega;',
-        'α' => '&alpha;',
-        'β' => '&beta;',
-        'γ' => '&gamma;',
-        'δ' => '&delta;',
-        'ε' => '&epsi;',
-        'ζ' => '&zeta;',
-        'η' => '&eta;',
-        'θ' => '&theta;',
-        'ι' => '&iota;',
-        'κ' => '&kappa;',
-        'λ' => '&lambda;',
-        'μ' => '&mu;',
-        'ν' => '&nu;',
-        'ξ' => '&xi;',
-        'ο' => '&omicron;',
-        'π' => '&pi;',
-        'ρ' => '&rho;',
-        'ς' => '&sigmav;',
-        'σ' => '&sigma;',
-        'τ' => '&tau;',
-        'υ' => '&upsi;',
-        'φ' => '&phi;',
-        'χ' => '&chi;',
-        'ψ' => '&psi;',
-        'ω' => '&omega;',
-        'ϑ' => '&thetasym;',
-        'ϒ' => '&upsih;',
-        'ϕ' => '&straightphi;',
-        'ϖ' => '&piv;',
-        'Ϝ' => '&Gammad;',
-        'ϝ' => '&gammad;',
-        'ϰ' => '&varkappa;',
-        'ϱ' => '&rhov;',
-        'ϵ' => '&straightepsilon;',
-        '϶' => '&backepsilon;',
-        'Ё' => '&IOcy;',
-        'Ђ' => '&DJcy;',
-        'Ѓ' => '&GJcy;',
-        'Є' => '&Jukcy;',
-        'Ѕ' => '&DScy;',
-        'І' => '&Iukcy;',
-        'Ї' => '&YIcy;',
-        'Ј' => '&Jsercy;',
-        'Љ' => '&LJcy;',
-        'Њ' => '&NJcy;',
-        'Ћ' => '&TSHcy;',
-        'Ќ' => '&KJcy;',
-        'Ў' => '&Ubrcy;',
-        'Џ' => '&DZcy;',
-        'А' => '&Acy;',
-        'Б' => '&Bcy;',
-        'В' => '&Vcy;',
-        'Г' => '&Gcy;',
-        'Д' => '&Dcy;',
-        'Е' => '&IEcy;',
-        'Ж' => '&ZHcy;',
-        'З' => '&Zcy;',
-        'И' => '&Icy;',
-        'Й' => '&Jcy;',
-        'К' => '&Kcy;',
-        'Л' => '&Lcy;',
-        'М' => '&Mcy;',
-        'Н' => '&Ncy;',
-        'О' => '&Ocy;',
-        'П' => '&Pcy;',
-        'Р' => '&Rcy;',
-        'С' => '&Scy;',
-        'Т' => '&Tcy;',
-        'У' => '&Ucy;',
-        'Ф' => '&Fcy;',
-        'Х' => '&KHcy;',
-        'Ц' => '&TScy;',
-        'Ч' => '&CHcy;',
-        'Ш' => '&SHcy;',
-        'Щ' => '&SHCHcy;',
-        'Ъ' => '&HARDcy;',
-        'Ы' => '&Ycy;',
-        'Ь' => '&SOFTcy;',
-        'Э' => '&Ecy;',
-        'Ю' => '&YUcy;',
-        'Я' => '&YAcy;',
-        'а' => '&acy;',
-        'б' => '&bcy;',
-        'в' => '&vcy;',
-        'г' => '&gcy;',
-        'д' => '&dcy;',
-        'е' => '&iecy;',
-        'ж' => '&zhcy;',
-        'з' => '&zcy;',
-        'и' => '&icy;',
-        'й' => '&jcy;',
-        'к' => '&kcy;',
-        'л' => '&lcy;',
-        'м' => '&mcy;',
-        'н' => '&ncy;',
-        'о' => '&ocy;',
-        'п' => '&pcy;',
-        'р' => '&rcy;',
-        'с' => '&scy;',
-        'т' => '&tcy;',
-        'у' => '&ucy;',
-        'ф' => '&fcy;',
-        'х' => '&khcy;',
-        'ц' => '&tscy;',
-        'ч' => '&chcy;',
-        'ш' => '&shcy;',
-        'щ' => '&shchcy;',
-        'ъ' => '&hardcy;',
-        'ы' => '&ycy;',
-        'ь' => '&softcy;',
-        'э' => '&ecy;',
-        'ю' => '&yucy;',
-        'я' => '&yacy;',
-        'ё' => '&iocy;',
-        'ђ' => '&djcy;',
-        'ѓ' => '&gjcy;',
-        'є' => '&jukcy;',
-        'ѕ' => '&dscy;',
-        'і' => '&iukcy;',
-        'ї' => '&yicy;',
-        'ј' => '&jsercy;',
-        'љ' => '&ljcy;',
-        'њ' => '&njcy;',
-        'ћ' => '&tshcy;',
-        'ќ' => '&kjcy;',
-        'ў' => '&ubrcy;',
-        'џ' => '&dzcy;',
-        ' ' => '&ensp;',
-        ' ' => '&emsp;',
-        ' ' => '&emsp13;',
-        ' ' => '&emsp14;',
-        ' ' => '&numsp;',
-        ' ' => '&puncsp;',
-        ' ' => '&ThinSpace;',
-        ' ' => '&hairsp;',
-        '​' => '&ZeroWidthSpace;',
-        '‌' => '&zwnj;',
-        '‍' => '&zwj;',
-        '‎' => '&lrm;',
-        '‏' => '&rlm;',
-        '‐' => '&hyphen;',
-        '–' => '&ndash;',
-        '—' => '&mdash;',
-        '―' => '&horbar;',
-        '‖' => '&Verbar;',
-        '‘' => '&OpenCurlyQuote;',
-        '’' => '&rsquo;',
-        '‚' => '&sbquo;',
-        '“' => '&OpenCurlyDoubleQuote;',
-        '”' => '&rdquo;',
-        '„' => '&bdquo;',
-        '†' => '&dagger;',
-        '‡' => '&Dagger;',
-        '•' => '&bull;',
-        '‥' => '&nldr;',
-        '…' => '&hellip;',
-        '‰' => '&permil;',
-        '‱' => '&pertenk;',
-        '′' => '&prime;',
-        '″' => '&Prime;',
-        '‴' => '&tprime;',
-        '‵' => '&backprime;',
-        '‹' => '&lsaquo;',
-        '›' => '&rsaquo;',
-        '‾' => '&oline;',
-        '⁁' => '&caret;',
-        '⁃' => '&hybull;',
-        '⁄' => '&frasl;',
-        '⁏' => '&bsemi;',
-        '⁗' => '&qprime;',
-        ' ' => '&MediumSpace;',
-        '  ' => '&ThickSpace',
-        '⁠' => '&NoBreak;',
-        '⁡' => '&af;',
-        '⁢' => '&InvisibleTimes;',
-        '⁣' => '&ic;',
-        '€' => '&euro;',
-        '⃛' => '&TripleDot;',
-        '⃜' => '&DotDot;',
-        'ℂ' => '&complexes;',
-        '℅' => '&incare;',
-        'ℊ' => '&gscr;',
-        'ℋ' => '&HilbertSpace;',
-        'ℌ' => '&Hfr;',
-        'ℍ' => '&Hopf;',
-        'ℎ' => '&planckh;',
-        'ℏ' => '&planck;',
-        'ℐ' => '&imagline;',
-        'ℑ' => '&Ifr;',
-        'ℒ' => '&lagran;',
-        'ℓ' => '&ell;',
-        'ℕ' => '&naturals;',
-        '№' => '&numero;',
-        '℗' => '&copysr;',
-        '℘' => '&wp;',
-        'ℙ' => '&primes;',
-        'ℚ' => '&rationals;',
-        'ℛ' => '&realine;',
-        'ℜ' => '&Rfr;',
-        'ℝ' => '&Ropf;',
-        '℞' => '&rx;',
-        '™' => '&trade;',
-        'ℤ' => '&Zopf;',
-        '℧' => '&mho;',
-        'ℨ' => '&Zfr;',
-        '℩' => '&iiota;',
-        'ℬ' => '&Bscr;',
-        'ℭ' => '&Cfr;',
-        'ℯ' => '&escr;',
-        'ℰ' => '&expectation;',
-        'ℱ' => '&Fouriertrf;',
-        'ℳ' => '&Mellintrf;',
-        'ℴ' => '&orderof;',
-        'ℵ' => '&aleph;',
-        'ℶ' => '&beth;',
-        'ℷ' => '&gimel;',
-        'ℸ' => '&daleth;',
-        'ⅅ' => '&CapitalDifferentialD;',
-        'ⅆ' => '&DifferentialD;',
-        'ⅇ' => '&exponentiale;',
-        'ⅈ' => '&ImaginaryI;',
-        '⅓' => '&frac13;',
-        '⅔' => '&frac23;',
-        '⅕' => '&frac15;',
-        '⅖' => '&frac25;',
-        '⅗' => '&frac35;',
-        '⅘' => '&frac45;',
-        '⅙' => '&frac16;',
-        '⅚' => '&frac56;',
-        '⅛' => '&frac18;',
-        '⅜' => '&frac38;',
-        '⅝' => '&frac58;',
-        '⅞' => '&frac78;',
-        '←' => '&larr;',
-        '↑' => '&uarr;',
-        '→' => '&srarr;',
-        '↓' => '&darr;',
-        '↔' => '&harr;',
-        '↕' => '&UpDownArrow;',
-        '↖' => '&nwarrow;',
-        '↗' => '&UpperRightArrow;',
-        '↘' => '&LowerRightArrow;',
-        '↙' => '&swarr;',
-        '↚' => '&nleftarrow;',
-        '↛' => '&nrarr;',
-        '↝' => '&rarrw;',
-        '↝̸' => '&nrarrw',
-        '↞' => '&Larr;',
-        '↟' => '&Uarr;',
-        '↠' => '&twoheadrightarrow;',
-        '↡' => '&Darr;',
-        '↢' => '&larrtl;',
-        '↣' => '&rarrtl;',
-        '↤' => '&LeftTeeArrow;',
-        '↥' => '&UpTeeArrow;',
-        '↦' => '&map;',
-        '↧' => '&DownTeeArrow;',
-        '↩' => '&larrhk;',
-        '↪' => '&rarrhk;',
-        '↫' => '&larrlp;',
-        '↬' => '&looparrowright;',
-        '↭' => '&harrw;',
-        '↮' => '&nleftrightarrow;',
-        '↰' => '&Lsh;',
-        '↱' => '&rsh;',
-        '↲' => '&ldsh;',
-        '↳' => '&rdsh;',
-        '↵' => '&crarr;',
-        '↶' => '&curvearrowleft;',
-        '↷' => '&curarr;',
-        '↺' => '&olarr;',
-        '↻' => '&orarr;',
-        '↼' => '&leftharpoonup;',
-        '↽' => '&leftharpoondown;',
-        '↾' => '&RightUpVector;',
-        '↿' => '&uharl;',
-        '⇀' => '&rharu;',
-        '⇁' => '&rhard;',
-        '⇂' => '&RightDownVector;',
-        '⇃' => '&dharl;',
-        '⇄' => '&rightleftarrows;',
-        '⇅' => '&udarr;',
-        '⇆' => '&lrarr;',
-        '⇇' => '&llarr;',
-        '⇈' => '&upuparrows;',
-        '⇉' => '&rrarr;',
-        '⇊' => '&downdownarrows;',
-        '⇋' => '&leftrightharpoons;',
-        '⇌' => '&rightleftharpoons;',
-        '⇍' => '&nLeftarrow;',
-        '⇎' => '&nhArr;',
-        '⇏' => '&nrArr;',
-        '⇐' => '&DoubleLeftArrow;',
-        '⇑' => '&DoubleUpArrow;',
-        '⇒' => '&Implies;',
-        '⇓' => '&Downarrow;',
-        '⇔' => '&hArr;',
-        '⇕' => '&Updownarrow;',
-        '⇖' => '&nwArr;',
-        '⇗' => '&neArr;',
-        '⇘' => '&seArr;',
-        '⇙' => '&swArr;',
-        '⇚' => '&lAarr;',
-        '⇛' => '&rAarr;',
-        '⇝' => '&zigrarr;',
-        '⇤' => '&LeftArrowBar;',
-        '⇥' => '&RightArrowBar;',
-        '⇵' => '&DownArrowUpArrow;',
-        '⇽' => '&loarr;',
-        '⇾' => '&roarr;',
-        '⇿' => '&hoarr;',
-        '∀' => '&forall;',
-        '∁' => '&comp;',
-        '∂' => '&part;',
-        '∂̸' => '&npart',
-        '∃' => '&Exists;',
-        '∄' => '&nexist;',
-        '∅' => '&empty;',
-        '∇' => '&nabla;',
-        '∈' => '&isinv;',
-        '∉' => '&notin;',
-        '∋' => '&ReverseElement;',
-        '∌' => '&notniva;',
-        '∏' => '&prod;',
-        '∐' => '&Coproduct;',
-        '∑' => '&sum;',
-        '−' => '&minus;',
-        '∓' => '&MinusPlus;',
-        '∔' => '&plusdo;',
-        '∖' => '&ssetmn;',
-        '∗' => '&lowast;',
-        '∘' => '&compfn;',
-        '√' => '&Sqrt;',
-        '∝' => '&prop;',
-        '∞' => '&infin;',
-        '∟' => '&angrt;',
-        '∠' => '&angle;',
-        '∠⃒' => '&nang',
-        '∡' => '&angmsd;',
-        '∢' => '&angsph;',
-        '∣' => '&mid;',
-        '∤' => '&nshortmid;',
-        '∥' => '&shortparallel;',
-        '∦' => '&nparallel;',
-        '∧' => '&and;',
-        '∨' => '&or;',
-        '∩' => '&cap;',
-        '∩︀' => '&caps',
-        '∪' => '&cup;',
-        '∪︀' => '&cups',
-        '∫' => '&Integral;',
-        '∬' => '&Int;',
-        '∭' => '&tint;',
-        '∮' => '&ContourIntegral;',
-        '∯' => '&DoubleContourIntegral;',
-        '∰' => '&Cconint;',
-        '∱' => '&cwint;',
-        '∲' => '&cwconint;',
-        '∳' => '&awconint;',
-        '∴' => '&there4;',
-        '∵' => '&Because;',
-        '∶' => '&ratio;',
-        '∷' => '&Colon;',
-        '∸' => '&minusd;',
-        '∺' => '&mDDot;',
-        '∻' => '&homtht;',
-        '∼' => '&sim;',
-        '∼⃒' => '&nvsim',
-        '∽' => '&bsim;',
-        '∽̱' => '&race',
-        '∾' => '&ac;',
-        '∾̳' => '&acE',
-        '∿' => '&acd;',
-        '≀' => '&wr;',
-        '≁' => '&NotTilde;',
-        '≂' => '&esim;',
-        '≂̸' => '&nesim',
-        '≃' => '&simeq;',
-        '≄' => '&nsime;',
-        '≅' => '&TildeFullEqual;',
-        '≆' => '&simne;',
-        '≇' => '&ncong;',
-        '≈' => '&approx;',
-        '≉' => '&napprox;',
-        '≊' => '&ape;',
-        '≋' => '&apid;',
-        '≋̸' => '&napid',
-        '≌' => '&bcong;',
-        '≍' => '&CupCap;',
-        '≍⃒' => '&nvap',
-        '≎' => '&bump;',
-        '≎̸' => '&nbump',
-        '≏' => '&HumpEqual;',
-        '≏̸' => '&nbumpe',
-        '≐' => '&esdot;',
-        '≐̸' => '&nedot',
-        '≑' => '&doteqdot;',
-        '≒' => '&fallingdotseq;',
-        '≓' => '&risingdotseq;',
-        '≔' => '&coloneq;',
-        '≕' => '&eqcolon;',
-        '≖' => '&ecir;',
-        '≗' => '&circeq;',
-        '≙' => '&wedgeq;',
-        '≚' => '&veeeq;',
-        '≜' => '&triangleq;',
-        '≟' => '&equest;',
-        '≠' => '&NotEqual;',
-        '≡' => '&Congruent;',
-        '≡⃥' => '&bnequiv',
-        '≢' => '&NotCongruent;',
-        '≤' => '&leq;',
-        '≤⃒' => '&nvle',
-        '≥' => '&ge;',
-        '≥⃒' => '&nvge',
-        '≦' => '&lE;',
-        '≦̸' => '&nlE',
-        '≧' => '&geqq;',
-        '≧̸' => '&NotGreaterFullEqual',
-        '≨' => '&lneqq;',
-        '≨︀' => '&lvertneqq',
-        '≩' => '&gneqq;',
-        '≩︀' => '&gvertneqq',
-        '≪' => '&ll;',
-        '≪̸' => '&nLtv',
-        '≪⃒' => '&nLt',
-        '≫' => '&gg;',
-        '≫̸' => '&NotGreaterGreater',
-        '≫⃒' => '&nGt',
-        '≬' => '&between;',
-        '≭' => '&NotCupCap;',
-        '≮' => '&NotLess;',
-        '≯' => '&ngtr;',
-        '≰' => '&NotLessEqual;',
-        '≱' => '&ngeq;',
-        '≲' => '&LessTilde;',
-        '≳' => '&GreaterTilde;',
-        '≴' => '&nlsim;',
-        '≵' => '&ngsim;',
-        '≶' => '&lessgtr;',
-        '≷' => '&gl;',
-        '≸' => '&ntlg;',
-        '≹' => '&NotGreaterLess;',
-        '≺' => '&prec;',
-        '≻' => '&succ;',
-        '≼' => '&PrecedesSlantEqual;',
-        '≽' => '&succcurlyeq;',
-        '≾' => '&precsim;',
-        '≿' => '&SucceedsTilde;',
-        '≿̸' => '&NotSucceedsTilde',
-        '⊀' => '&npr;',
-        '⊁' => '&NotSucceeds;',
-        '⊂' => '&sub;',
-        '⊂⃒' => '&vnsub',
-        '⊃' => '&sup;',
-        '⊃⃒' => '&nsupset',
-        '⊄' => '&nsub;',
-        '⊅' => '&nsup;',
-        '⊆' => '&SubsetEqual;',
-        '⊇' => '&supe;',
-        '⊈' => '&NotSubsetEqual;',
-        '⊉' => '&NotSupersetEqual;',
-        '⊊' => '&subsetneq;',
-        '⊊︀' => '&vsubne',
-        '⊋' => '&supsetneq;',
-        '⊋︀' => '&vsupne',
-        '⊍' => '&cupdot;',
-        '⊎' => '&UnionPlus;',
-        '⊏' => '&sqsub;',
-        '⊏̸' => '&NotSquareSubset',
-        '⊐' => '&sqsupset;',
-        '⊐̸' => '&NotSquareSuperset',
-        '⊑' => '&SquareSubsetEqual;',
-        '⊒' => '&SquareSupersetEqual;',
-        '⊓' => '&sqcap;',
-        '⊓︀' => '&sqcaps',
-        '⊔' => '&sqcup;',
-        '⊔︀' => '&sqcups',
-        '⊕' => '&CirclePlus;',
-        '⊖' => '&ominus;',
-        '⊗' => '&CircleTimes;',
-        '⊘' => '&osol;',
-        '⊙' => '&CircleDot;',
-        '⊚' => '&ocir;',
-        '⊛' => '&oast;',
-        '⊝' => '&odash;',
-        '⊞' => '&boxplus;',
-        '⊟' => '&boxminus;',
-        '⊠' => '&timesb;',
-        '⊡' => '&sdotb;',
-        '⊢' => '&vdash;',
-        '⊣' => '&dashv;',
-        '⊤' => '&DownTee;',
-        '⊥' => '&perp;',
-        '⊧' => '&models;',
-        '⊨' => '&DoubleRightTee;',
-        '⊩' => '&Vdash;',
-        '⊪' => '&Vvdash;',
-        '⊫' => '&VDash;',
-        '⊬' => '&nvdash;',
-        '⊭' => '&nvDash;',
-        '⊮' => '&nVdash;',
-        '⊯' => '&nVDash;',
-        '⊰' => '&prurel;',
-        '⊲' => '&vartriangleleft;',
-        '⊳' => '&vrtri;',
-        '⊴' => '&LeftTriangleEqual;',
-        '⊴⃒' => '&nvltrie',
-        '⊵' => '&RightTriangleEqual;',
-        '⊵⃒' => '&nvrtrie',
-        '⊶' => '&origof;',
-        '⊷' => '&imof;',
-        '⊸' => '&mumap;',
-        '⊹' => '&hercon;',
-        '⊺' => '&intcal;',
-        '⊻' => '&veebar;',
-        '⊽' => '&barvee;',
-        '⊾' => '&angrtvb;',
-        '⊿' => '&lrtri;',
-        '⋀' => '&xwedge;',
-        '⋁' => '&xvee;',
-        '⋂' => '&bigcap;',
-        '⋃' => '&bigcup;',
-        '⋄' => '&diamond;',
-        '⋅' => '&sdot;',
-        '⋆' => '&Star;',
-        '⋇' => '&divonx;',
-        '⋈' => '&bowtie;',
-        '⋉' => '&ltimes;',
-        '⋊' => '&rtimes;',
-        '⋋' => '&lthree;',
-        '⋌' => '&rthree;',
-        '⋍' => '&backsimeq;',
-        '⋎' => '&curlyvee;',
-        '⋏' => '&curlywedge;',
-        '⋐' => '&Sub;',
-        '⋑' => '&Supset;',
-        '⋒' => '&Cap;',
-        '⋓' => '&Cup;',
-        '⋔' => '&pitchfork;',
-        '⋕' => '&epar;',
-        '⋖' => '&lessdot;',
-        '⋗' => '&gtrdot;',
-        '⋘' => '&Ll;',
-        '⋘̸' => '&nLl',
-        '⋙' => '&Gg;',
-        '⋙̸' => '&nGg',
-        '⋚' => '&lesseqgtr;',
-        '⋚︀' => '&lesg',
-        '⋛' => '&gtreqless;',
-        '⋛︀' => '&gesl',
-        '⋞' => '&curlyeqprec;',
-        '⋟' => '&cuesc;',
-        '⋠' => '&NotPrecedesSlantEqual;',
-        '⋡' => '&NotSucceedsSlantEqual;',
-        '⋢' => '&NotSquareSubsetEqual;',
-        '⋣' => '&NotSquareSupersetEqual;',
-        '⋦' => '&lnsim;',
-        '⋧' => '&gnsim;',
-        '⋨' => '&precnsim;',
-        '⋩' => '&scnsim;',
-        '⋪' => '&nltri;',
-        '⋫' => '&ntriangleright;',
-        '⋬' => '&nltrie;',
-        '⋭' => '&NotRightTriangleEqual;',
-        '⋮' => '&vellip;',
-        '⋯' => '&ctdot;',
-        '⋰' => '&utdot;',
-        '⋱' => '&dtdot;',
-        '⋲' => '&disin;',
-        '⋳' => '&isinsv;',
-        '⋴' => '&isins;',
-        '⋵' => '&isindot;',
-        '⋵̸' => '&notindot',
-        '⋶' => '&notinvc;',
-        '⋷' => '&notinvb;',
-        '⋹' => '&isinE;',
-        '⋹̸' => '&notinE',
-        '⋺' => '&nisd;',
-        '⋻' => '&xnis;',
-        '⋼' => '&nis;',
-        '⋽' => '&notnivc;',
-        '⋾' => '&notnivb;',
-        '⌅' => '&barwed;',
-        '⌆' => '&doublebarwedge;',
-        '⌈' => '&lceil;',
-        '⌉' => '&RightCeiling;',
-        '⌊' => '&LeftFloor;',
-        '⌋' => '&RightFloor;',
-        '⌌' => '&drcrop;',
-        '⌍' => '&dlcrop;',
-        '⌎' => '&urcrop;',
-        '⌏' => '&ulcrop;',
-        '⌐' => '&bnot;',
-        '⌒' => '&profline;',
-        '⌓' => '&profsurf;',
-        '⌕' => '&telrec;',
-        '⌖' => '&target;',
-        '⌜' => '&ulcorner;',
-        '⌝' => '&urcorner;',
-        '⌞' => '&llcorner;',
-        '⌟' => '&drcorn;',
-        '⌢' => '&frown;',
-        '⌣' => '&smile;',
-        '⌭' => '&cylcty;',
-        '⌮' => '&profalar;',
-        '⌶' => '&topbot;',
-        '⌽' => '&ovbar;',
-        '⌿' => '&solbar;',
-        '⍼' => '&angzarr;',
-        '⎰' => '&lmoust;',
-        '⎱' => '&rmoust;',
-        '⎴' => '&OverBracket;',
-        '⎵' => '&bbrk;',
-        '⎶' => '&bbrktbrk;',
-        '⏜' => '&OverParenthesis;',
-        '⏝' => '&UnderParenthesis;',
-        '⏞' => '&OverBrace;',
-        '⏟' => '&UnderBrace;',
-        '⏢' => '&trpezium;',
-        '⏧' => '&elinters;',
-        '␣' => '&blank;',
-        'Ⓢ' => '&oS;',
-        '─' => '&HorizontalLine;',
-        '│' => '&boxv;',
-        '┌' => '&boxdr;',
-        '┐' => '&boxdl;',
-        '└' => '&boxur;',
-        '┘' => '&boxul;',
-        '├' => '&boxvr;',
-        '┤' => '&boxvl;',
-        '┬' => '&boxhd;',
-        '┴' => '&boxhu;',
-        '┼' => '&boxvh;',
-        '═' => '&boxH;',
-        '║' => '&boxV;',
-        '╒' => '&boxdR;',
-        '╓' => '&boxDr;',
-        '╔' => '&boxDR;',
-        '╕' => '&boxdL;',
-        '╖' => '&boxDl;',
-        '╗' => '&boxDL;',
-        '╘' => '&boxuR;',
-        '╙' => '&boxUr;',
-        '╚' => '&boxUR;',
-        '╛' => '&boxuL;',
-        '╜' => '&boxUl;',
-        '╝' => '&boxUL;',
-        '╞' => '&boxvR;',
-        '╟' => '&boxVr;',
-        '╠' => '&boxVR;',
-        '╡' => '&boxvL;',
-        '╢' => '&boxVl;',
-        '╣' => '&boxVL;',
-        '╤' => '&boxHd;',
-        '╥' => '&boxhD;',
-        '╦' => '&boxHD;',
-        '╧' => '&boxHu;',
-        '╨' => '&boxhU;',
-        '╩' => '&boxHU;',
-        '╪' => '&boxvH;',
-        '╫' => '&boxVh;',
-        '╬' => '&boxVH;',
-        '▀' => '&uhblk;',
-        '▄' => '&lhblk;',
-        '█' => '&block;',
-        '░' => '&blk14;',
-        '▒' => '&blk12;',
-        '▓' => '&blk34;',
-        '□' => '&Square;',
-        '▪' => '&squarf;',
-        '▫' => '&EmptyVerySmallSquare;',
-        '▭' => '&rect;',
-        '▮' => '&marker;',
-        '▱' => '&fltns;',
-        '△' => '&bigtriangleup;',
-        '▴' => '&blacktriangle;',
-        '▵' => '&triangle;',
-        '▸' => '&blacktriangleright;',
-        '▹' => '&rtri;',
-        '▽' => '&bigtriangledown;',
-        '▾' => '&blacktriangledown;',
-        '▿' => '&triangledown;',
-        '◂' => '&blacktriangleleft;',
-        '◃' => '&ltri;',
-        '◊' => '&lozenge;',
-        '○' => '&cir;',
-        '◬' => '&tridot;',
-        '◯' => '&bigcirc;',
-        '◸' => '&ultri;',
-        '◹' => '&urtri;',
-        '◺' => '&lltri;',
-        '◻' => '&EmptySmallSquare;',
-        '◼' => '&FilledSmallSquare;',
-        '★' => '&starf;',
-        '☆' => '&star;',
-        '☎' => '&phone;',
-        '♀' => '&female;',
-        '♂' => '&male;',
-        '♠' => '&spadesuit;',
-        '♣' => '&clubs;',
-        '♥' => '&hearts;',
-        '♦' => '&diamondsuit;',
-        '♪' => '&sung;',
-        '♭' => '&flat;',
-        '♮' => '&natur;',
-        '♯' => '&sharp;',
-        '✓' => '&check;',
-        '✗' => '&cross;',
-        '✠' => '&maltese;',
-        '✶' => '&sext;',
-        '❘' => '&VerticalSeparator;',
-        '❲' => '&lbbrk;',
-        '❳' => '&rbbrk;',
-        '⟈' => '&bsolhsub;',
-        '⟉' => '&suphsol;',
-        '⟦' => '&LeftDoubleBracket;',
-        '⟧' => '&RightDoubleBracket;',
-        '⟨' => '&langle;',
-        '⟩' => '&RightAngleBracket;',
-        '⟪' => '&Lang;',
-        '⟫' => '&Rang;',
-        '⟬' => '&loang;',
-        '⟭' => '&roang;',
-        '⟵' => '&longleftarrow;',
-        '⟶' => '&LongRightArrow;',
-        '⟷' => '&LongLeftRightArrow;',
-        '⟸' => '&xlArr;',
-        '⟹' => '&DoubleLongRightArrow;',
-        '⟺' => '&xhArr;',
-        '⟼' => '&xmap;',
-        '⟿' => '&dzigrarr;',
-        '⤂' => '&nvlArr;',
-        '⤃' => '&nvrArr;',
-        '⤄' => '&nvHarr;',
-        '⤅' => '&Map;',
-        '⤌' => '&lbarr;',
-        '⤍' => '&bkarow;',
-        '⤎' => '&lBarr;',
-        '⤏' => '&dbkarow;',
-        '⤐' => '&drbkarow;',
-        '⤑' => '&DDotrahd;',
-        '⤒' => '&UpArrowBar;',
-        '⤓' => '&DownArrowBar;',
-        '⤖' => '&Rarrtl;',
-        '⤙' => '&latail;',
-        '⤚' => '&ratail;',
-        '⤛' => '&lAtail;',
-        '⤜' => '&rAtail;',
-        '⤝' => '&larrfs;',
-        '⤞' => '&rarrfs;',
-        '⤟' => '&larrbfs;',
-        '⤠' => '&rarrbfs;',
-        '⤣' => '&nwarhk;',
-        '⤤' => '&nearhk;',
-        '⤥' => '&searhk;',
-        '⤦' => '&swarhk;',
-        '⤧' => '&nwnear;',
-        '⤨' => '&toea;',
-        '⤩' => '&seswar;',
-        '⤪' => '&swnwar;',
-        '⤳' => '&rarrc;',
-        '⤳̸' => '&nrarrc',
-        '⤵' => '&cudarrr;',
-        '⤶' => '&ldca;',
-        '⤷' => '&rdca;',
-        '⤸' => '&cudarrl;',
-        '⤹' => '&larrpl;',
-        '⤼' => '&curarrm;',
-        '⤽' => '&cularrp;',
-        '⥅' => '&rarrpl;',
-        '⥈' => '&harrcir;',
-        '⥉' => '&Uarrocir;',
-        '⥊' => '&lurdshar;',
-        '⥋' => '&ldrushar;',
-        '⥎' => '&LeftRightVector;',
-        '⥏' => '&RightUpDownVector;',
-        '⥐' => '&DownLeftRightVector;',
-        '⥑' => '&LeftUpDownVector;',
-        '⥒' => '&LeftVectorBar;',
-        '⥓' => '&RightVectorBar;',
-        '⥔' => '&RightUpVectorBar;',
-        '⥕' => '&RightDownVectorBar;',
-        '⥖' => '&DownLeftVectorBar;',
-        '⥗' => '&DownRightVectorBar;',
-        '⥘' => '&LeftUpVectorBar;',
-        '⥙' => '&LeftDownVectorBar;',
-        '⥚' => '&LeftTeeVector;',
-        '⥛' => '&RightTeeVector;',
-        '⥜' => '&RightUpTeeVector;',
-        '⥝' => '&RightDownTeeVector;',
-        '⥞' => '&DownLeftTeeVector;',
-        '⥟' => '&DownRightTeeVector;',
-        '⥠' => '&LeftUpTeeVector;',
-        '⥡' => '&LeftDownTeeVector;',
-        '⥢' => '&lHar;',
-        '⥣' => '&uHar;',
-        '⥤' => '&rHar;',
-        '⥥' => '&dHar;',
-        '⥦' => '&luruhar;',
-        '⥧' => '&ldrdhar;',
-        '⥨' => '&ruluhar;',
-        '⥩' => '&rdldhar;',
-        '⥪' => '&lharul;',
-        '⥫' => '&llhard;',
-        '⥬' => '&rharul;',
-        '⥭' => '&lrhard;',
-        '⥮' => '&udhar;',
-        '⥯' => '&ReverseUpEquilibrium;',
-        '⥰' => '&RoundImplies;',
-        '⥱' => '&erarr;',
-        '⥲' => '&simrarr;',
-        '⥳' => '&larrsim;',
-        '⥴' => '&rarrsim;',
-        '⥵' => '&rarrap;',
-        '⥶' => '&ltlarr;',
-        '⥸' => '&gtrarr;',
-        '⥹' => '&subrarr;',
-        '⥻' => '&suplarr;',
-        '⥼' => '&lfisht;',
-        '⥽' => '&rfisht;',
-        '⥾' => '&ufisht;',
-        '⥿' => '&dfisht;',
-        '⦅' => '&lopar;',
-        '⦆' => '&ropar;',
-        '⦋' => '&lbrke;',
-        '⦌' => '&rbrke;',
-        '⦍' => '&lbrkslu;',
-        '⦎' => '&rbrksld;',
-        '⦏' => '&lbrksld;',
-        '⦐' => '&rbrkslu;',
-        '⦑' => '&langd;',
-        '⦒' => '&rangd;',
-        '⦓' => '&lparlt;',
-        '⦔' => '&rpargt;',
-        '⦕' => '&gtlPar;',
-        '⦖' => '&ltrPar;',
-        '⦚' => '&vzigzag;',
-        '⦜' => '&vangrt;',
-        '⦝' => '&angrtvbd;',
-        '⦤' => '&ange;',
-        '⦥' => '&range;',
-        '⦦' => '&dwangle;',
-        '⦧' => '&uwangle;',
-        '⦨' => '&angmsdaa;',
-        '⦩' => '&angmsdab;',
-        '⦪' => '&angmsdac;',
-        '⦫' => '&angmsdad;',
-        '⦬' => '&angmsdae;',
-        '⦭' => '&angmsdaf;',
-        '⦮' => '&angmsdag;',
-        '⦯' => '&angmsdah;',
-        '⦰' => '&bemptyv;',
-        '⦱' => '&demptyv;',
-        '⦲' => '&cemptyv;',
-        '⦳' => '&raemptyv;',
-        '⦴' => '&laemptyv;',
-        '⦵' => '&ohbar;',
-        '⦶' => '&omid;',
-        '⦷' => '&opar;',
-        '⦹' => '&operp;',
-        '⦻' => '&olcross;',
-        '⦼' => '&odsold;',
-        '⦾' => '&olcir;',
-        '⦿' => '&ofcir;',
-        '⧀' => '&olt;',
-        '⧁' => '&ogt;',
-        '⧂' => '&cirscir;',
-        '⧃' => '&cirE;',
-        '⧄' => '&solb;',
-        '⧅' => '&bsolb;',
-        '⧉' => '&boxbox;',
-        '⧍' => '&trisb;',
-        '⧎' => '&rtriltri;',
-        '⧏' => '&LeftTriangleBar;',
-        '⧏̸' => '&NotLeftTriangleBar',
-        '⧐' => '&RightTriangleBar;',
-        '⧐̸' => '&NotRightTriangleBar',
-        '⧜' => '&iinfin;',
-        '⧝' => '&infintie;',
-        '⧞' => '&nvinfin;',
-        '⧣' => '&eparsl;',
-        '⧤' => '&smeparsl;',
-        '⧥' => '&eqvparsl;',
-        '⧫' => '&lozf;',
-        '⧴' => '&RuleDelayed;',
-        '⧶' => '&dsol;',
-        '⨀' => '&xodot;',
-        '⨁' => '&bigoplus;',
-        '⨂' => '&bigotimes;',
-        '⨄' => '&biguplus;',
-        '⨆' => '&bigsqcup;',
-        '⨌' => '&iiiint;',
-        '⨍' => '&fpartint;',
-        '⨐' => '&cirfnint;',
-        '⨑' => '&awint;',
-        '⨒' => '&rppolint;',
-        '⨓' => '&scpolint;',
-        '⨔' => '&npolint;',
-        '⨕' => '&pointint;',
-        '⨖' => '&quatint;',
-        '⨗' => '&intlarhk;',
-        '⨢' => '&pluscir;',
-        '⨣' => '&plusacir;',
-        '⨤' => '&simplus;',
-        '⨥' => '&plusdu;',
-        '⨦' => '&plussim;',
-        '⨧' => '&plustwo;',
-        '⨩' => '&mcomma;',
-        '⨪' => '&minusdu;',
-        '⨭' => '&loplus;',
-        '⨮' => '&roplus;',
-        '⨯' => '&Cross;',
-        '⨰' => '&timesd;',
-        '⨱' => '&timesbar;',
-        '⨳' => '&smashp;',
-        '⨴' => '&lotimes;',
-        '⨵' => '&rotimes;',
-        '⨶' => '&otimesas;',
-        '⨷' => '&Otimes;',
-        '⨸' => '&odiv;',
-        '⨹' => '&triplus;',
-        '⨺' => '&triminus;',
-        '⨻' => '&tritime;',
-        '⨼' => '&iprod;',
-        '⨿' => '&amalg;',
-        '⩀' => '&capdot;',
-        '⩂' => '&ncup;',
-        '⩃' => '&ncap;',
-        '⩄' => '&capand;',
-        '⩅' => '&cupor;',
-        '⩆' => '&cupcap;',
-        '⩇' => '&capcup;',
-        '⩈' => '&cupbrcap;',
-        '⩉' => '&capbrcup;',
-        '⩊' => '&cupcup;',
-        '⩋' => '&capcap;',
-        '⩌' => '&ccups;',
-        '⩍' => '&ccaps;',
-        '⩐' => '&ccupssm;',
-        '⩓' => '&And;',
-        '⩔' => '&Or;',
-        '⩕' => '&andand;',
-        '⩖' => '&oror;',
-        '⩗' => '&orslope;',
-        '⩘' => '&andslope;',
-        '⩚' => '&andv;',
-        '⩛' => '&orv;',
-        '⩜' => '&andd;',
-        '⩝' => '&ord;',
-        '⩟' => '&wedbar;',
-        '⩦' => '&sdote;',
-        '⩪' => '&simdot;',
-        '⩭' => '&congdot;',
-        '⩭̸' => '&ncongdot',
-        '⩮' => '&easter;',
-        '⩯' => '&apacir;',
-        '⩰' => '&apE;',
-        '⩰̸' => '&napE',
-        '⩱' => '&eplus;',
-        '⩲' => '&pluse;',
-        '⩳' => '&Esim;',
-        '⩴' => '&Colone;',
-        '⩵' => '&Equal;',
-        '⩷' => '&ddotseq;',
-        '⩸' => '&equivDD;',
-        '⩹' => '&ltcir;',
-        '⩺' => '&gtcir;',
-        '⩻' => '&ltquest;',
-        '⩼' => '&gtquest;',
-        '⩽' => '&les;',
-        '⩽̸' => '&nles',
-        '⩾' => '&ges;',
-        '⩾̸' => '&nges',
-        '⩿' => '&lesdot;',
-        '⪀' => '&gesdot;',
-        '⪁' => '&lesdoto;',
-        '⪂' => '&gesdoto;',
-        '⪃' => '&lesdotor;',
-        '⪄' => '&gesdotol;',
-        '⪅' => '&lap;',
-        '⪆' => '&gap;',
-        '⪇' => '&lne;',
-        '⪈' => '&gne;',
-        '⪉' => '&lnap;',
-        '⪊' => '&gnap;',
-        '⪋' => '&lesseqqgtr;',
-        '⪌' => '&gEl;',
-        '⪍' => '&lsime;',
-        '⪎' => '&gsime;',
-        '⪏' => '&lsimg;',
-        '⪐' => '&gsiml;',
-        '⪑' => '&lgE;',
-        '⪒' => '&glE;',
-        '⪓' => '&lesges;',
-        '⪔' => '&gesles;',
-        '⪕' => '&els;',
-        '⪖' => '&egs;',
-        '⪗' => '&elsdot;',
-        '⪘' => '&egsdot;',
-        '⪙' => '&el;',
-        '⪚' => '&eg;',
-        '⪝' => '&siml;',
-        '⪞' => '&simg;',
-        '⪟' => '&simlE;',
-        '⪠' => '&simgE;',
-        '⪡' => '&LessLess;',
-        '⪡̸' => '&NotNestedLessLess',
-        '⪢' => '&GreaterGreater;',
-        '⪢̸' => '&NotNestedGreaterGreater',
-        '⪤' => '&glj;',
-        '⪥' => '&gla;',
-        '⪦' => '&ltcc;',
-        '⪧' => '&gtcc;',
-        '⪨' => '&lescc;',
-        '⪩' => '&gescc;',
-        '⪪' => '&smt;',
-        '⪫' => '&lat;',
-        '⪬' => '&smte;',
-        '⪬︀' => '&smtes',
-        '⪭' => '&late;',
-        '⪭︀' => '&lates',
-        '⪮' => '&bumpE;',
-        '⪯' => '&preceq;',
-        '⪯̸' => '&NotPrecedesEqual',
-        '⪰' => '&SucceedsEqual;',
-        '⪰̸' => '&NotSucceedsEqual',
-        '⪳' => '&prE;',
-        '⪴' => '&scE;',
-        '⪵' => '&precneqq;',
-        '⪶' => '&scnE;',
-        '⪷' => '&precapprox;',
-        '⪸' => '&succapprox;',
-        '⪹' => '&precnapprox;',
-        '⪺' => '&succnapprox;',
-        '⪻' => '&Pr;',
-        '⪼' => '&Sc;',
-        '⪽' => '&subdot;',
-        '⪾' => '&supdot;',
-        '⪿' => '&subplus;',
-        '⫀' => '&supplus;',
-        '⫁' => '&submult;',
-        '⫂' => '&supmult;',
-        '⫃' => '&subedot;',
-        '⫄' => '&supedot;',
-        '⫅' => '&subE;',
-        '⫅̸' => '&nsubE',
-        '⫆' => '&supseteqq;',
-        '⫆̸' => '&nsupseteqq',
-        '⫇' => '&subsim;',
-        '⫈' => '&supsim;',
-        '⫋' => '&subsetneqq;',
-        '⫋︀' => '&vsubnE',
-        '⫌' => '&supnE;',
-        '⫌︀' => '&varsupsetneqq',
-        '⫏' => '&csub;',
-        '⫐' => '&csup;',
-        '⫑' => '&csube;',
-        '⫒' => '&csupe;',
-        '⫓' => '&subsup;',
-        '⫔' => '&supsub;',
-        '⫕' => '&subsub;',
-        '⫖' => '&supsup;',
-        '⫗' => '&suphsub;',
-        '⫘' => '&supdsub;',
-        '⫙' => '&forkv;',
-        '⫚' => '&topfork;',
-        '⫛' => '&mlcp;',
-        '⫤' => '&Dashv;',
-        '⫦' => '&Vdashl;',
-        '⫧' => '&Barv;',
-        '⫨' => '&vBar;',
-        '⫩' => '&vBarv;',
-        '⫫' => '&Vbar;',
-        '⫬' => '&Not;',
-        '⫭' => '&bNot;',
-        '⫮' => '&rnmid;',
-        '⫯' => '&cirmid;',
-        '⫰' => '&midcir;',
-        '⫱' => '&topcir;',
-        '⫲' => '&nhpar;',
-        '⫳' => '&parsim;',
-        '⫽︀' => '&varsupsetneqq',
-        'ff' => '&fflig;',
-        'fi' => '&filig;',
-        'fl' => '&fllig;',
-        'ffi' => '&ffilig;',
-        'ffl' => '&ffllig;',
-        '𝒜' => '&Ascr;',
-        '𝒞' => '&Cscr;',
-        '𝒟' => '&Dscr;',
-        '𝒢' => '&Gscr;',
-        '𝒥' => '&Jscr;',
-        '𝒦' => '&Kscr;',
-        '𝒩' => '&Nscr;',
-        '𝒪' => '&Oscr;',
-        '𝒫' => '&Pscr;',
-        '𝒬' => '&Qscr;',
-        '𝒮' => '&Sscr;',
-        '𝒯' => '&Tscr;',
-        '𝒰' => '&Uscr;',
-        '𝒱' => '&Vscr;',
-        '𝒲' => '&Wscr;',
-        '𝒳' => '&Xscr;',
-        '𝒴' => '&Yscr;',
-        '𝒵' => '&Zscr;',
-        '𝒶' => '&ascr;',
-        '𝒷' => '&bscr;',
-        '𝒸' => '&cscr;',
-        '𝒹' => '&dscr;',
-        '𝒻' => '&fscr;',
-        '𝒽' => '&hscr;',
-        '𝒾' => '&iscr;',
-        '𝒿' => '&jscr;',
-        '𝓀' => '&kscr;',
-        '𝓁' => '&lscr;',
-        '𝓂' => '&mscr;',
-        '𝓃' => '&nscr;',
-        '𝓅' => '&pscr;',
-        '𝓆' => '&qscr;',
-        '𝓇' => '&rscr;',
-        '𝓈' => '&sscr;',
-        '𝓉' => '&tscr;',
-        '𝓊' => '&uscr;',
-        '𝓋' => '&vscr;',
-        '𝓌' => '&wscr;',
-        '𝓍' => '&xscr;',
-        '𝓎' => '&yscr;',
-        '𝓏' => '&zscr;',
-        '𝔄' => '&Afr;',
-        '𝔅' => '&Bfr;',
-        '𝔇' => '&Dfr;',
-        '𝔈' => '&Efr;',
-        '𝔉' => '&Ffr;',
-        '𝔊' => '&Gfr;',
-        '𝔍' => '&Jfr;',
-        '𝔎' => '&Kfr;',
-        '𝔏' => '&Lfr;',
-        '𝔐' => '&Mfr;',
-        '𝔑' => '&Nfr;',
-        '𝔒' => '&Ofr;',
-        '𝔓' => '&Pfr;',
-        '𝔔' => '&Qfr;',
-        '𝔖' => '&Sfr;',
-        '𝔗' => '&Tfr;',
-        '𝔘' => '&Ufr;',
-        '𝔙' => '&Vfr;',
-        '𝔚' => '&Wfr;',
-        '𝔛' => '&Xfr;',
-        '𝔜' => '&Yfr;',
-        '𝔞' => '&afr;',
-        '𝔟' => '&bfr;',
-        '𝔠' => '&cfr;',
-        '𝔡' => '&dfr;',
-        '𝔢' => '&efr;',
-        '𝔣' => '&ffr;',
-        '𝔤' => '&gfr;',
-        '𝔥' => '&hfr;',
-        '𝔦' => '&ifr;',
-        '𝔧' => '&jfr;',
-        '𝔨' => '&kfr;',
-        '𝔩' => '&lfr;',
-        '𝔪' => '&mfr;',
-        '𝔫' => '&nfr;',
-        '𝔬' => '&ofr;',
-        '𝔭' => '&pfr;',
-        '𝔮' => '&qfr;',
-        '𝔯' => '&rfr;',
-        '𝔰' => '&sfr;',
-        '𝔱' => '&tfr;',
-        '𝔲' => '&ufr;',
-        '𝔳' => '&vfr;',
-        '𝔴' => '&wfr;',
-        '𝔵' => '&xfr;',
-        '𝔶' => '&yfr;',
-        '𝔷' => '&zfr;',
-        '𝔸' => '&Aopf;',
-        '𝔹' => '&Bopf;',
-        '𝔻' => '&Dopf;',
-        '𝔼' => '&Eopf;',
-        '𝔽' => '&Fopf;',
-        '𝔾' => '&Gopf;',
-        '𝕀' => '&Iopf;',
-        '𝕁' => '&Jopf;',
-        '𝕂' => '&Kopf;',
-        '𝕃' => '&Lopf;',
-        '𝕄' => '&Mopf;',
-        '𝕆' => '&Oopf;',
-        '𝕊' => '&Sopf;',
-        '𝕋' => '&Topf;',
-        '𝕌' => '&Uopf;',
-        '𝕍' => '&Vopf;',
-        '𝕎' => '&Wopf;',
-        '𝕏' => '&Xopf;',
-        '𝕐' => '&Yopf;',
-        '𝕒' => '&aopf;',
-        '𝕓' => '&bopf;',
-        '𝕔' => '&copf;',
-        '𝕕' => '&dopf;',
-        '𝕖' => '&eopf;',
-        '𝕗' => '&fopf;',
-        '𝕘' => '&gopf;',
-        '𝕙' => '&hopf;',
-        '𝕚' => '&iopf;',
-        '𝕛' => '&jopf;',
-        '𝕜' => '&kopf;',
-        '𝕝' => '&lopf;',
-        '𝕞' => '&mopf;',
-        '𝕟' => '&nopf;',
-        '𝕠' => '&oopf;',
-        '𝕡' => '&popf;',
-        '𝕢' => '&qopf;',
-        '𝕣' => '&ropf;',
-        '𝕤' => '&sopf;',
-        '𝕥' => '&topf;',
-        '𝕦' => '&uopf;',
-        '𝕧' => '&vopf;',
-        '𝕨' => '&wopf;',
-        '𝕩' => '&xopf;',
-        '𝕪' => '&yopf;',
-        '𝕫' => '&zopf;'
-    );
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php b/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
deleted file mode 100644
index 4ad74f6..0000000
--- a/vendor/masterminds/html5/src/HTML5/Serializer/OutputRules.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-/**
- * @file
- * The rules for generating output in the serializer.
- *
- * These output rules are likely to generate output similar to the document that
- * was parsed. It is not intended to output exactly the document that was parsed.
- */
-namespace Masterminds\HTML5\Serializer;
-
-use Masterminds\HTML5\Elements;
-
-/**
- * Generate the output html5 based on element rules.
- */
-class OutputRules implements \Masterminds\HTML5\Serializer\RulesInterface
-{
-    /**
-     * Defined in http://www.w3.org/TR/html51/infrastructure.html#html-namespace-0
-     */
-    const NAMESPACE_HTML = 'http://www.w3.org/1999/xhtml';
-
-    const NAMESPACE_MATHML = 'http://www.w3.org/1998/Math/MathML';
-
-    const NAMESPACE_SVG = 'http://www.w3.org/2000/svg';
-
-    const NAMESPACE_XLINK = 'http://www.w3.org/1999/xlink';
-
-    const NAMESPACE_XML = 'http://www.w3.org/XML/1998/namespace';
-
-    const NAMESPACE_XMLNS = 'http://www.w3.org/2000/xmlns/';
-
-    /**
-     * Holds the HTML5 element names that causes a namespace switch
-     *
-     * @var array
-     */
-    protected $implicitNamespaces = array(
-        self::NAMESPACE_HTML,
-        self::NAMESPACE_SVG,
-        self::NAMESPACE_MATHML,
-        self::NAMESPACE_XML,
-        self::NAMESPACE_XMLNS,
-    );
-
-    const IM_IN_HTML = 1;
-
-    const IM_IN_SVG = 2;
-
-    const IM_IN_MATHML = 3;
-
-    /**
-     * Used as cache to detect if is available ENT_HTML5
-     * @var boolean
-     */
-    private $hasHTML5 = false;
-
-    protected $traverser;
-
-    protected $encode = false;
-
-    protected $out;
-
-    protected $outputMode;
-
-    private $xpath;
-
-    protected $nonBooleanAttributes = array(
-        /*
-        array(
-            'nodeNamespace'=>'http://www.w3.org/1999/xhtml',
-            'attrNamespace'=>'http://www.w3.org/1999/xhtml',
-
-            'nodeName'=>'img', 'nodeName'=>array('img', 'a'),
-            'attrName'=>'alt', 'attrName'=>array('title', 'alt'),
-        ),
-        */
-        array(
-            'nodeNamespace' => 'http://www.w3.org/1999/xhtml',
-            'attrName' => array('href',
-                'hreflang',
-                'http-equiv',
-                'icon',
-                'id',
-                'keytype',
-                'kind',
-                'label',
-                'lang',
-                'language',
-                'list',
-                'maxlength',
-                'media',
-                'method',
-                'name',
-                'placeholder',
-                'rel',
-                'rows',
-                'rowspan',
-                'sandbox',
-                'spellcheck',
-                'scope',
-                'seamless',
-                'shape',
-                'size',
-                'sizes',
-                'span',
-                'src',
-                'srcdoc',
-                'srclang',
-                'srcset',
-                'start',
-                'step',
-                'style',
-                'summary',
-                'tabindex',
-                'target',
-                'title',
-                'type',
-                'value',
-                'width',
-                'border',
-                'charset',
-                'cite',
-                'class',
-                'code',
-                'codebase',
-                'color',
-                'cols',
-                'colspan',
-                'content',
-                'coords',
-                'data',
-                'datetime',
-                'default',
-                'dir',
-                'dirname',
-                'enctype',
-                'for',
-                'form',
-                'formaction',
-                'headers',
-                'height',
-                'accept',
-                'accept-charset',
-                'accesskey',
-                'action',
-                'align',
-                'alt',
-                'bgcolor',
-            ),
-        ),
-        array(
-            'nodeNamespace' => 'http://www.w3.org/1999/xhtml',
-            'xpath' => 'starts-with(local-name(), \'data-\')',
-        ),
-    );
-
-    const DOCTYPE = '<!DOCTYPE html>';
-
-    public function __construct($output, $options = array())
-    {
-        if (isset($options['encode_entities'])) {
-            $this->encode = $options['encode_entities'];
-        }
-
-        $this->outputMode = static::IM_IN_HTML;
-        $this->out = $output;
-
-        // If HHVM, see https://github.com/facebook/hhvm/issues/2727
-        $this->hasHTML5 = defined('ENT_HTML5') && !defined('HHVM_VERSION');
-    }
-    public function addRule(array $rule)
-    {
-        $this->nonBooleanAttributes[] = $rule;
-    }
-
-    public function setTraverser(\Masterminds\HTML5\Serializer\Traverser $traverser)
-    {
-        $this->traverser = $traverser;
-
-        return $this;
-    }
-
-    public function document($dom)
-    {
-        $this->doctype();
-        if ($dom->documentElement) {
-            $this->traverser->node($dom->documentElement);
-            $this->nl();
-        }
-    }
-
-    protected function doctype()
-    {
-        $this->wr(static::DOCTYPE);
-        $this->nl();
-    }
-
-    public function element($ele)
-    {
-        $name = $ele->tagName;
-
-        // Per spec:
-        // If the element has a declared namespace in the HTML, MathML or
-        // SVG namespaces, we use the lname instead of the tagName.
-        if ($this->traverser->isLocalElement($ele)) {
-            $name = $ele->localName;
-        }
-
-        // If we are in SVG or MathML there is special handling.
-        // Using if/elseif instead of switch because it's faster in PHP.
-        if ($name == 'svg') {
-            $this->outputMode = static::IM_IN_SVG;
-            $name = Elements::normalizeSvgElement($name);
-        } elseif ($name == 'math') {
-            $this->outputMode = static::IM_IN_MATHML;
-        }
-
-        $this->openTag($ele);
-        if (Elements::isA($name, Elements::TEXT_RAW)) {
-            foreach ($ele->childNodes as $child) {
-                $this->wr($child->data);
-            }
-        } else {
-            // Handle children.
-            if ($ele->hasChildNodes()) {
-                $this->traverser->children($ele->childNodes);
-            }
-
-            // Close out the SVG or MathML special handling.
-            if ($name == 'svg' || $name == 'math') {
-                $this->outputMode = static::IM_IN_HTML;
-            }
-        }
-
-        // If not unary, add a closing tag.
-        if (! Elements::isA($name, Elements::VOID_TAG)) {
-            $this->closeTag($ele);
-        }
-    }
-
-    /**
-     * Write a text node.
-     *
-     * @param \DOMText $ele
-     *            The text node to write.
-     */
-    public function text($ele)
-    {
-        if (isset($ele->parentNode) && isset($ele->parentNode->tagName) && Elements::isA($ele->parentNode->localName, Elements::TEXT_RAW)) {
-            $this->wr($ele->data);
-            return;
-        }
-
-        // FIXME: This probably needs some flags set.
-        $this->wr($this->enc($ele->data));
-    }
-
-    public function cdata($ele)
-    {
-        // This encodes CDATA.
-        $this->wr($ele->ownerDocument->saveXML($ele));
-    }
-
-    public function comment($ele)
-    {
-        // These produce identical output.
-        // $this->wr('<!--')->wr($ele->data)->wr('-->');
-        $this->wr($ele->ownerDocument->saveXML($ele));
-    }
-
-    public function processorInstruction($ele)
-    {
-        $this->wr('<?')
-            ->wr($ele->target)
-            ->wr(' ')
-            ->wr($ele->data)
-            ->wr('?>');
-    }
-    /**
-     * Write the namespace attributes
-     *
-     *
-     * @param \DOMNode $ele
-     *            The element being written.
-     */
-    protected function namespaceAttrs($ele)
-    {
-        if (!$this->xpath || $this->xpath->document !== $ele->ownerDocument){
-            $this->xpath = new \DOMXPath($ele->ownerDocument);
-        }
-
-        foreach( $this->xpath->query('namespace::*[not(.=../../namespace::*)]', $ele ) as $nsNode ) {
-            if (!in_array($nsNode->nodeValue, $this->implicitNamespaces)) {
-                $this->wr(' ')->wr($nsNode->nodeName)->wr('="')->wr($nsNode->nodeValue)->wr('"');
-            }
-        }
-    }
-
-    /**
-     * Write the opening tag.
-     *
-     * Tags for HTML, MathML, and SVG are in the local name. Otherwise, use the
-     * qualified name (8.3).
-     *
-     * @param \DOMNode $ele
-     *            The element being written.
-     */
-    protected function openTag($ele)
-    {
-        $this->wr('<')->wr($this->traverser->isLocalElement($ele) ? $ele->localName : $ele->tagName);
-
-
-        $this->attrs($ele);
-        $this->namespaceAttrs($ele);
-
-
-        if ($this->outputMode == static::IM_IN_HTML) {
-            $this->wr('>');
-        }         // If we are not in html mode we are in SVG, MathML, or XML embedded content.
-        else {
-            if ($ele->hasChildNodes()) {
-                $this->wr('>');
-            }             // If there are no children this is self closing.
-            else {
-                $this->wr(' />');
-            }
-        }
-    }
-
-    protected function attrs($ele)
-    {
-        // FIXME: Needs support for xml, xmlns, xlink, and namespaced elements.
-        if (! $ele->hasAttributes()) {
-            return $this;
-        }
-
-        // TODO: Currently, this always writes name="value", and does not do
-        // value-less attributes.
-        $map = $ele->attributes;
-        $len = $map->length;
-        for ($i = 0; $i < $len; ++ $i) {
-            $node = $map->item($i);
-            $val = $this->enc($node->value, true);
-
-            // XXX: The spec says that we need to ensure that anything in
-            // the XML, XMLNS, or XLink NS's should use the canonical
-            // prefix. It seems that DOM does this for us already, but there
-            // may be exceptions.
-            $name = $node->name;
-
-            // Special handling for attributes in SVG and MathML.
-            // Using if/elseif instead of switch because it's faster in PHP.
-            if ($this->outputMode == static::IM_IN_SVG) {
-                $name = Elements::normalizeSvgAttribute($name);
-            } elseif ($this->outputMode == static::IM_IN_MATHML) {
-                $name = Elements::normalizeMathMlAttribute($name);
-            }
-
-            $this->wr(' ')->wr($name);
-
-            if ((isset($val) && $val !== '') || $this->nonBooleanAttribute($node)) {
-                $this->wr('="')->wr($val)->wr('"');
-            }
-        }
-    }
-
-
-    protected function nonBooleanAttribute(\DOMAttr $attr)
-    {
-        $ele = $attr->ownerElement;
-        foreach($this->nonBooleanAttributes as $rule){
-
-            if(isset($rule['nodeNamespace']) && $rule['nodeNamespace']!==$ele->namespaceURI){
-                continue;
-            }
-            if(isset($rule['attNamespace']) && $rule['attNamespace']!==$attr->namespaceURI){
-                continue;
-            }
-            if(isset($rule['nodeName']) && !is_array($rule['nodeName']) && $rule['nodeName']!==$ele->localName){
-                continue;
-            }
-            if(isset($rule['nodeName']) && is_array($rule['nodeName']) && !in_array($ele->localName, $rule['nodeName'], true)){
-                continue;
-            }
-            if(isset($rule['attrName']) && !is_array($rule['attrName']) && $rule['attrName']!==$attr->localName){
-                continue;
-            }
-            if(isset($rule['attrName']) && is_array($rule['attrName']) && !in_array($attr->localName, $rule['attrName'], true)){
-                continue;
-            }
-            if(isset($rule['xpath'])){
-
-                $xp = $this->getXPath($attr);
-                if(isset($rule['prefixes'])){
-                    foreach($rule['prefixes'] as $nsPrefix => $ns){
-                        $xp->registerNamespace($nsPrefix, $ns);
-                    }
-                }
-                if(!$xp->evaluate($rule['xpath'], $attr)){
-                    continue;
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    private function getXPath(\DOMNode $node){
-        if(!$this->xpath){
-            $this->xpath = new \DOMXPath($node->ownerDocument);
-        }
-        return $this->xpath;
-    }
-
-    /**
-     * Write the closing tag.
-     *
-     * Tags for HTML, MathML, and SVG are in the local name. Otherwise, use the
-     * qualified name (8.3).
-     *
-     * @param \DOMNode $ele
-     *            The element being written.
-     */
-    protected function closeTag($ele)
-    {
-        if ($this->outputMode == static::IM_IN_HTML || $ele->hasChildNodes()) {
-            $this->wr('</')->wr($this->traverser->isLocalElement($ele) ? $ele->localName : $ele->tagName)->wr('>');
-        }
-    }
-
-    /**
-     * Write to the output.
-     *
-     * @param string $text
-     *            The string to put into the output.
-     *
-     * @return \Masterminds\HTML5\Serializer\Traverser $this so it can be used in chaining.
-     */
-    protected function wr($text)
-    {
-        fwrite($this->out, $text);
-        return $this;
-    }
-
-    /**
-     * Write a new line character.
-     *
-     * @return \Masterminds\HTML5\Serializer\Traverser $this so it can be used in chaining.
-     */
-    protected function nl()
-    {
-        fwrite($this->out, PHP_EOL);
-        return $this;
-    }
-
-    /**
-     * Encode text.
-     *
-     * When encode is set to false, the default value, the text passed in is
-     * escaped per section 8.3 of the html5 spec. For details on how text is
-     * escaped see the escape() method.
-     *
-     * When encoding is set to true the text is converted to named character
-     * references where appropriate. Section 8.1.4 Character references of the
-     * html5 spec refers to using named character references. This is useful for
-     * characters that can't otherwise legally be used in the text.
-     *
-     * The named character references are listed in section 8.5.
-     *
-     * @see http://www.w3.org/TR/2013/CR-html5-20130806/syntax.html#named-character-references True encoding will turn all named character references into their entities.
-     *      This includes such characters as +.# and many other common ones. By default
-     *      encoding here will just escape &'<>".
-     *
-     *      Note, PHP 5.4+ has better html5 encoding.
-     *
-     * @todo Use the Entities class in php 5.3 to have html5 entities.
-     *
-     * @param string $text
-     *            text to encode.
-     * @param boolean $attribute
-     *            True if we are encoding an attrubute, false otherwise
-     *
-     * @return string The encoded text.
-     */
-    protected function enc($text, $attribute = false)
-    {
-
-        // Escape the text rather than convert to named character references.
-        if (! $this->encode) {
-            return $this->escape($text, $attribute);
-        }
-
-        // If we are in PHP 5.4+ we can use the native html5 entity functionality to
-        // convert the named character references.
-
-        if ($this->hasHTML5) {
-            return htmlentities($text, ENT_HTML5 | ENT_SUBSTITUTE | ENT_QUOTES, 'UTF-8', false);
-        }         // If a version earlier than 5.4 html5 entities are not entirely handled.
-        // This manually handles them.
-        else {
-            return strtr($text, \Masterminds\HTML5\Serializer\HTML5Entities::$map);
-        }
-    }
-
-    /**
-     * Escape test.
-     *
-     * According to the html5 spec section 8.3 Serializing HTML fragments, text
-     * within tags that are not style, script, xmp, iframe, noembed, and noframes
-     * need to be properly escaped.
-     *
-     * The & should be converted to &amp;, no breaking space unicode characters
-     * converted to &nbsp;, when in attribute mode the " should be converted to
-     * &quot;, and when not in attribute mode the < and > should be converted to
-     * &lt; and &gt;.
-     *
-     * @see http://www.w3.org/TR/2013/CR-html5-20130806/syntax.html#escapingString
-     *
-     * @param string $text
-     *            text to escape.
-     * @param boolean $attribute
-     *            True if we are escaping an attrubute, false otherwise
-     */
-    protected function escape($text, $attribute = false)
-    {
-
-        // Not using htmlspecialchars because, while it does escaping, it doesn't
-        // match the requirements of section 8.5. For example, it doesn't handle
-        // non-breaking spaces.
-        if ($attribute) {
-            $replace = array(
-                '"' => '&quot;',
-                '&' => '&amp;',
-                "\xc2\xa0" => '&nbsp;'
-            );
-        } else {
-            $replace = array(
-                '<' => '&lt;',
-                '>' => '&gt;',
-                '&' => '&amp;',
-                "\xc2\xa0" => '&nbsp;'
-            );
-        }
-
-        return strtr($text, $replace);
-    }
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/README.md b/vendor/masterminds/html5/src/HTML5/Serializer/README.md
deleted file mode 100644
index 849a47f..0000000
--- a/vendor/masterminds/html5/src/HTML5/Serializer/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# The Serializer (Writer) Model
-
-The serializer roughly follows sections _8.1 Writing HTML documents_ and section
-_8.3 Serializing HTML fragments_ by converting DOMDocument, DOMDocumentFragment,
-and DOMNodeList into HTML5.
-
-       [ HTML5 ]   // Interface for saving.
-          ||
-     [ Traverser ]   // Walk the DOM
-          ||
-       [ Rules ]     // Convert DOM elements into strings.
-          ||
-       [ HTML5 ]     // HTML5 document or fragment in text.
-
-
-## HTML5 Class
-
-Provides the top level interface for saving.
-
-## The Traverser
-
-Walks the DOM finding each element and passing it off to the output rules to
-convert to HTML5.
-
-## Output Rules
-
-The output rules are defined in the RulesInterface which can have multiple
-implementations. Currently, the OutputRules is the default implementation that
-converts a DOM as is into HTML5.
-
-## HTML5 String
-
-The output of the process it HTML5 as a string or saved to a file.
\ No newline at end of file
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/RulesInterface.php b/vendor/masterminds/html5/src/HTML5/Serializer/RulesInterface.php
deleted file mode 100644
index 6ef5e5e..0000000
--- a/vendor/masterminds/html5/src/HTML5/Serializer/RulesInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * @file
- * The interface definition for Rules to generate output.
- */
-namespace Masterminds\HTML5\Serializer;
-
-/**
- * To create a new rule set for writing output the RulesInterface needs to be
- * implemented.
- * The resulting class can be specified in the options with the
- * key of rules.
- *
- * For an example implementation see \Masterminds\HTML5\Serializer\OutputRules.
- */
-interface RulesInterface
-{
-
-    /**
-     * The class constructor.
-     *
-     * Note, before the rules can be used a traverser must be registered.
-     *
-     * @param mixed $output
-     *            The output stream to write output to.
-     * @param array $options
-     *            An array of options.
-     */
-    public function __construct($output, $options = array());
-
-    /**
-     * Register the traverser used in but the rules.
-     *
-     * Note, only one traverser can be used by the rules.
-     *
-     * @param \Masterminds\HTML5\Serializer\Traverser $traverser
-     *            The traverser used in the rules.
-     * @return \Masterminds\HTML5\Serializer\RulesInterface $this for the current object.
-     */
-    public function setTraverser(\Masterminds\HTML5\Serializer\Traverser $traverser);
-
-    /**
-     * Write a document element (\DOMDocument).
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param \DOMDocument $dom
-     */
-    public function document($dom);
-
-    /**
-     * Write an element.
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param mixed $ele
-     */
-    public function element($ele);
-
-    /**
-     * Write a text node.
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param mixed $ele
-     */
-    public function text($ele);
-
-    /**
-     * Write a CDATA node.
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param mixed $ele
-     */
-    public function cdata($ele);
-
-    /**
-     * Write a comment node.
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param mixed $ele
-     */
-    public function comment($ele);
-
-    /**
-     * Write a processor instruction.
-     *
-     * To learn about processor instructions see \Masterminds\HTML5\InstructionProcessor
-     *
-     * Instead of returning the result write it to the output stream ($output)
-     * that was passed into the constructor.
-     *
-     * @param mixed $ele
-     */
-    public function processorInstruction($ele);
-}
diff --git a/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php b/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
deleted file mode 100644
index 9c700da..0000000
--- a/vendor/masterminds/html5/src/HTML5/Serializer/Traverser.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-namespace Masterminds\HTML5\Serializer;
-
-/**
- * Traverser for walking a DOM tree.
- *
- * This is a concrete traverser designed to convert a DOM tree into an
- * HTML5 document. It is not intended to be a generic DOMTreeWalker
- * implementation.
- *
- * @see http://www.w3.org/TR/2012/CR-html5-20121217/syntax.html#serializing-html-fragments
- */
-class Traverser
-{
-
-    /**
-     * Namespaces that should be treated as "local" to HTML5.
-     */
-    static $local_ns = array(
-        'http://www.w3.org/1999/xhtml' => 'html',
-        'http://www.w3.org/1998/Math/MathML' => 'math',
-        'http://www.w3.org/2000/svg' => 'svg'
-    );
-
-    protected $dom;
-
-    protected $options;
-
-    protected $encode = false;
-
-    protected $rules;
-
-    protected $out;
-
-    /**
-     * Create a traverser.
-     *
-     * @param DOMNode|DOMNodeList $dom
-     *            The document or node to traverse.
-     * @param resource $out
-     *            A stream that allows writing. The traverser will output into this
-     *            stream.
-     * @param array $options
-     *            An array or options for the traverser as key/value pairs. These include:
-     *            - encode_entities: A bool to specify if full encding should happen for all named
-     *            charachter references. Defaults to false which escapes &'<>".
-     *            - output_rules: The path to the class handling the output rules.
-     */
-    public function __construct($dom, $out, RulesInterface $rules, $options = array())
-    {
-        $this->dom = $dom;
-        $this->out = $out;
-        $this->rules = $rules;
-        $this->options = $options;
-
-        $this->rules->setTraverser($this);
-    }
-
-    /**
-     * Tell the traverser to walk the DOM.
-     *
-     * @return resource $out
-     *         Returns the output stream.
-     */
-    public function walk()
-    {
-        if ($this->dom instanceof \DOMDocument) {
-            $this->rules->document($this->dom);
-        } elseif ($this->dom instanceof \DOMDocumentFragment) {
-            // Document fragments are a special case. Only the children need to
-            // be serialized.
-            if ($this->dom->hasChildNodes()) {
-                $this->children($this->dom->childNodes);
-            }
-        }        // If NodeList, loop
-        elseif ($this->dom instanceof \DOMNodeList) {
-            // If this is a NodeList of DOMDocuments this will not work.
-            $this->children($this->dom);
-        }         // Else assume this is a DOMNode-like datastructure.
-        else {
-            $this->node($this->dom);
-        }
-
-        return $this->out;
-    }
-
-    /**
-     * Process a node in the DOM.
-     *
-     * @param mixed $node
-     *            A node implementing \DOMNode.
-     */
-    public function node($node)
-    {
-        // A listing of types is at http://php.net/manual/en/dom.constants.php
-        switch ($node->nodeType) {
-            case XML_ELEMENT_NODE:
-                $this->rules->element($node);
-                break;
-            case XML_TEXT_NODE:
-                $this->rules->text($node);
-                break;
-            case XML_CDATA_SECTION_NODE:
-                $this->rules->cdata($node);
-                break;
-            // FIXME: It appears that the parser doesn't do PI's.
-            case XML_PI_NODE:
-                $this->rules->processorInstruction($node);
-                break;
-            case XML_COMMENT_NODE:
-                $this->rules->comment($node);
-                break;
-            // Currently we don't support embedding DTDs.
-            default:
-                //print '<!-- Skipped -->';
-                break;
-        }
-    }
-
-    /**
-     * Walk through all the nodes on a node list.
-     *
-     * @param \DOMNodeList $nl
-     *            A list of child elements to walk through.
-     */
-    public function children($nl)
-    {
-        foreach ($nl as $node) {
-            $this->node($node);
-        }
-    }
-
-    /**
-     * Is an element local?
-     *
-     * @param mixed $ele
-     *            An element that implement \DOMNode.
-     *
-     * @return bool True if local and false otherwise.
-     */
-    public function isLocalElement($ele)
-    {
-        $uri = $ele->namespaceURI;
-        if (empty($uri)) {
-            return false;
-        }
-
-        return isset(static::$local_ns[$uri]);
-    }
-}
diff --git a/vendor/mikey179/vfsStream/CHANGELOG.md b/vendor/mikey179/vfsStream/CHANGELOG.md
deleted file mode 100644
index 126c5ff..0000000
--- a/vendor/mikey179/vfsStream/CHANGELOG.md
+++ /dev/null
@@ -1,199 +0,0 @@
-1.6.0 (2015-10-06)
-------------------
-
-   * added `vfsStreamWrapper::unregister()`, provided by @malkusch with #114
-   * fixed #115: incorrect handling of `..` in root directory on PHP 5.5, fix provided by @acoulton with #116
-
-
-1.5.0 (2015-03-29)
-------------------
-
-   * implemented #91: `vfsStream::copyFromFileSystem()` should create large file instances
-   * implemented #92: `vfsStream::copyFromFileSystem()` should respect block devices
-   * fixed #107: `touch()` does not respect file permissions
-   * fixed #105: vfs directory structure is not reset after each test
-   * fixed #104: vfsStream can't handle url encoded pathes
-
-
-1.4.0 (2014-09-14)
-------------------
-
-   * implemented #85: Added support for emulating block devices in the virtual filesystem, feature provided by Harris Borawski
-   * fixed #68: Unlink a non-existing file now triggers a PHP warning
-
-
-1.3.0 (2014-07-21)
-------------------
-
-   * implemented #79: possibility to mock large files without large memory footprint, see https://github.com/mikey179/vfsStream/wiki/MockingLargeFiles
-   * implemented #67: added partial support for text-mode translation flag (i.e., no actual translation of line endings takes place) so it no longer throws an exception (provided by Anthon Pang)
-   * fixed issue #74: issue with trailing windows path separators (provided by Sebastian Krüger)
-   * fixed issue #50: difference between real file system and vfs with `RecursiveDirectoryIterator`
-   * fixed issue #80: touch with no arguments for modification and access time behave incorrect
-   * deprecated `org\bovigo\vfs\vfsStreamFile::readUntilEnd()`
-   * deprecated `org\bovigo\vfs\vfsStreamFile::getBytesRead()`
-
-
-1.2.0 (2013-04-01)
-------------------
-
-   * implemented issue #34: provide `url()` method on all `vfsStreamContent` instances
-     * added `org\bovigo\vfs\vfsStreamContent::url()`
-     * added `org\bovigo\vfs\vfsStreamContent::path()`
-   * fixed issue #40: flock implementation doesn't work correctly, patch provided by Kamil Dziedzic
-   * fixed issue #49: call to member function on a non-object when trying to delete a file one above root where a file with same name in root exists
-   * fixed issue #51: `unlink()` must consider permissions of directory where file is inside, not of the file to unlink itself
-   * fixed issue #52: `chmod()`, `chown()` and `chgrp()` must consider permissions of directory where file/directory is inside
-   * fixed issue #53: `chmod()`, `chown()` and `chgrp()` must consider current user and current owner of file/directoy to change
-
-
-1.1.0 (2012-08-25)
-------------------
-
-   * implemented issue #11: add support for `streamWrapper::stream_metadata()` vfsStream now supports `touch()`, `chown()`, `chgrp()` and `chmod()`
-   * implemented issue #33: add support for `stream_truncate()` (provided by https://github.com/nikcorg)
-   * implemented issue #35: size limit (quota) for VFS
-
-
-1.0.0 (2012-05-15)
-------------------
-
-   * raised requirement for PHP version to 5.3.0
-   * migrated codebase to use namespaces
-   * changed distribution from PEAR to Composer
-   * implemented issue #30: support "c" mode for `fopen()`
-   * fixed issue #31: prohibit aquiring locks when already locked / release lock on `fclose()`
-   * fixed issue #32: problems when subfolder has same name as folder
-   * fixed issue #36: `vfsStreamWrapper::stream_open()` should return false while trying to open existing non-writable file, patch provided by Alexander Peresypkin
-
-
-0.11.2 (2012-01-14)
--------------------
-
-   * fixed issue #29: set permissions properly when using `vfsStream::copyFromFileSystem()`, patch provided by predakanga
-   * fixed failing tests under PHP > 5.3.2
-
-
-0.11.1 (2011-12-04)
--------------------
-
-   * fixed issue #28: `mkdir()` overwrites existing directories/files
-
-
-0.11.0 (2011-11-29)
--------------------
-
-   * implemented issue #20: `vfsStream::create()` removes old structure
-   * implemented issue #4: possibility to copy structure from existing file system
-   * fixed issue #23: `unlink()` should not remove any directory
-   * fixed issue #25: `vfsStreamDirectory::hasChild()` gives false positives for nested paths, patch provided by Andrew Coulton
-   * fixed issue #26: opening a file for reading only should not update its modification time, reported and initial patch provided by Ludovic Chabant
-
-
-0.10.1 (2011-08-22)
--------------------
-
-   * fixed issue #16: replace `vfsStreamContent` to `vfsStreamContainer` for autocompletion
-   * fixed issue #17: `vfsStream::create()` has issues with numeric directories, patch provided by mathieuk
-
-
-0.10.0 (2011-07-22)
--------------------
-
-   * added new method `vfsStreamContainer::hasChildren()` and `vfsStreamDirectory::hasChildren()`
-   * implemented issue #14: less verbose way to initialize vfsStream
-   * implemented issue #13: remove deprecated method `vfsStreamContent::setFilemtime()`
-   * implemented issue #6: locking meachanism for files
-   * ensured that `stream_set_blocking()`, `stream_set_timeout()` and `stream_set_write_buffer()` on vfsStream urls have the same behaviour with PHP 5.2 and 5.3
-   * implemented issue #10: method to print directory structure
-
-
-0.9.0 (2011-07-13)
-------------------
-
-   * implemented feature request issue #7: add support for `fileatime()` and `filectime()`
-   * fixed issue #3: add support for `streamWrapper::stream_cast()`
-   * fixed issue #9: resolve path not called everywhere its needed
-   * deprecated `vfsStreamAbstractContent::setFilemtime()`, use `vfsStreamAbstractContent::lastModified()` instead, will be removed with 0.10.0
-
-
-0.8.0 (2010-10-08)
-------------------
-
-   * implemented enhancement #6: use `vfsStream::umask()` to influence initial file mode for files and directories
-   * implemented enhancement #19: support of .. in the url, patch provided by Guislain Duthieuw
-   * fixed issue #18: `getChild()` returns NULL when child's name contains parent name
-   * fixed bug with incomplete error message when accessing non-existing files on root level
-
-
-0.7.0 (2010-06-08)
-------------------
-
-   * added new `vfsStream::setup()` method to simplify vfsStream usage
-   * fixed issue #15: `mkdir()` creates a subfolder in a folder without permissions
-
-
-0.6.0 (2010-02-15)
-------------------
-
-   * added support for `$mode` param when opening files, implements enhancement #7 and fixes issue #13
-   * `vfsStreamWrapper::stream_open()` now evaluates `$options` for `STREAM_REPORT_ERRORS`
-
-
-0.5.0 (2010-01-25)
-------------------
-
-   * added support for `rename()`, patch provided by Benoit Aubuchon
-   * added support for . as directory alias so that `vfs://foo/.` resolves to `vfs://foo`, can be used as workaround for bug #8
-
-
-0.4.0 (2009-07-13)
-------------------
-
-   * added support for file modes, users and groups (with restrictions, see http://code.google.com/p/bovigo/wiki/vfsStreamDocsKnownIssues)
-   * fixed bug #5: `vfsStreamDirectory::addChild()` does not replace child with same name
-   * fixed bug with `is_writable()` because of missing `stat()` fields, patch provided by Sergey Galkin
-
-
-0.3.2 (2009-02-16)
-------------------
-
-   * support trailing slashes on directories in vfsStream urls, patch provided by Gabriel Birke
-   * fixed bug #4: vfsstream can only be read once, reported by Christoph Bloemer
-   * enabled multiple iterations at the same time over the same directory
-
-
-0.3.1 (2008-02-18)
-------------------
-
-   * fixed path/directory separator issues under linux systems
-   * fixed uid/gid issues under linux systems
-
-
-0.3.0 (2008-01-02)
-------------------
-
-   * added support for `rmdir()`
-   * added `vfsStream::newDirectory()`, dropped `vfsStreamDirectory::ceate()`
-   * added new interface `vfsStreamContainer`
-   * added `vfsStreamContent::at()` which allows code like `$file = vfsStream::newFile('file.txt.')->withContent('foo')->at($otherDir);`
-   * added `vfsStreamContent::lastModified()`, made `vfsStreamContent::setFilemtime()` an alias for this
-   * moved from Stubbles development environment to bovigo
-   * refactorings to reduce crap index of various methods
-
-
-0.2.0 (2007-12-29)
-------------------
-
-   * moved `vfsStreamWrapper::PROTOCOL` to `vfsStream::SCHEME`
-   * added new `vfsStream::url()` method to assist in creating correct vfsStream urls
-   * added `vfsStream::path()` method as opposite to `vfsStream::url()`
-   * a call to `vfsStreamWrapper::register()` will now reset the root to null, implemented on request from David Zuelke
-   * added support for `is_readable()`, `is_dir()`, `is_file()`
-   * added `vfsStream::newFile()` to be able to do `$file = vfsStream::newFile("foo.txt")->withContent("bar");`
-
-
-0.1.0 (2007-12-14)
-------------------
-
-   * Initial release.
diff --git a/vendor/mikey179/vfsStream/LICENSE b/vendor/mikey179/vfsStream/LICENSE
deleted file mode 100644
index 1d41ab9..0000000
--- a/vendor/mikey179/vfsStream/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2007-2015, Frank Kleine
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-* 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.
-* Neither the name of Stubbles 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 OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/mikey179/vfsStream/README.md b/vendor/mikey179/vfsStream/README.md
deleted file mode 100644
index 74554bf..0000000
--- a/vendor/mikey179/vfsStream/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-You can find documentation in the [wiki](https://github.com/mikey179/vfsStream/wiki).
-
-Also you might want to check [vfsStream examples](https://github.com/mikey179/vfsStream-examples).
-
-
-[![Build Status](https://secure.travis-ci.org/mikey179/vfsStream.png)](http://travis-ci.org/mikey179/vfsStream) [![Coverage Status](https://coveralls.io/repos/mikey179/vfsStream/badge.png?branch=master)](https://coveralls.io/r/mikey179/vfsStream?branch=master)
-
-[![Latest Stable Version](https://poser.pugx.org/mikey179/vfsStream/version.png)](https://packagist.org/packages/mikey179/vfsStream) [![Latest Unstable Version](https://poser.pugx.org/mikey179/vfsStream/v/unstable.png)](//packagist.org/packages/mikey179/vfsStream)
diff --git a/vendor/mikey179/vfsStream/composer.json b/vendor/mikey179/vfsStream/composer.json
deleted file mode 100644
index c18e37d..0000000
--- a/vendor/mikey179/vfsStream/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "mikey179/vfsStream",
-    "type": "library",
-    "homepage": "http://vfs.bovigo.org/",
-    "description": "Virtual file system to mock the real file system in unit tests.",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Frank Kleine",
-            "homepage": "http://frankkleine.de/",
-            "role": "Developer"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/mikey179/vfsStream/issues",
-        "source": "https://github.com/mikey179/vfsStream/tree/master",
-        "wiki": "https://github.com/mikey179/vfsStream/wiki"
-    },
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5"
-    },
-    "autoload": {
-        "psr-0": { "org\\bovigo\\vfs\\": "src/main/php" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.6.x-dev"
-        }
-    }
-}
diff --git a/vendor/mikey179/vfsStream/composer.lock b/vendor/mikey179/vfsStream/composer.lock
deleted file mode 100644
index 99e1130..0000000
--- a/vendor/mikey179/vfsStream/composer.lock
+++ /dev/null
@@ -1,972 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "e3c2dd0d4b4daf3d2c9e0bedd344592a",
-    "content-hash": "59c3102c5db7e3c4d78a920d4712790d",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2015-02-03 12:10:50"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
-                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2015-08-13 10:07:40"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
-                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-09-14 06:51:16"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2015-06-21 13:08:43"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2015-06-21 08:01:12"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-09-15 10:49:45"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
-                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": ">=1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-01 09:14:30"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02 06:51:40"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-02-22 15:13:53"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
-                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2015-08-03 06:14:51"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2015-06-21 07:55:53"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2014-10-06 09:23:50"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
-                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-06-21 08:04:50"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.7.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
-                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-09-14 14:14:09"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.3.0"
-    },
-    "platform-dev": []
-}
diff --git a/vendor/mikey179/vfsStream/phpunit.xml.dist b/vendor/mikey179/vfsStream/phpunit.xml.dist
deleted file mode 100644
index f5e0556..0000000
--- a/vendor/mikey179/vfsStream/phpunit.xml.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         verbose="true">
-  <testsuites>
-    <testsuite>
-      <directory suffix="TestCase.php">./src/test/php</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory>src/main/php</directory>
-    </whitelist>
-  </filter>
-
-  <logging>
-    <log type="coverage-html" target="docs/coverage" charset="UTF-8"
-         yui="true" highlight="false"
-         lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="docs/phpunit/clover.xml"/>
-    <log type="junit" target="docs/phpunit/junit.xml" logIncompleteSkipped="false"/>
-    <log type="testdox-html" target="docs/phpunit/testdox.html"/>
-  </logging>
-
-  <php>
-    <ini name="memory_limit" value="-1"/>
-    <ini name="error_reporting" value="30719"/> <!-- E_ALL | E_STRICT -->
-  </php>
-</phpunit>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php
deleted file mode 100644
index e9bc215..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/DotDirectory.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Directory container.
- */
-class DotDirectory extends vfsStreamDirectory
-{
-    /**
-     * returns iterator for the children
-     *
-     * @return  vfsStreamContainerIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator(array());
-    }
-
-    /**
-     * checks whether dir is a dot dir
-     *
-     * @return  bool
-     */
-    public function isDot()
-    {
-        return true;
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php
deleted file mode 100644
index b86ad8c..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/Quota.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Represents a quota for disk space.
- *
- * @since     1.1.0
- * @internal
- */
-class Quota
-{
-    /**
-     * unlimited quota
-     */
-    const UNLIMITED   = -1;
-    /**
-     * quota in bytes
-     *
-     * A value of -1 is treated as unlimited.
-     *
-     * @type  int
-     */
-    private $amount;
-
-    /**
-     * constructor
-     *
-     * @param  int  $amount  quota in bytes
-     */
-    public function __construct($amount)
-    {
-        $this->amount = $amount;
-    }
-
-    /**
-     * create with unlimited space
-     *
-     * @return  Quota
-     */
-    public static function unlimited()
-    {
-        return new self(self::UNLIMITED);
-    }
-
-    /**
-     * checks if a quota is set
-     *
-     * @return  bool
-     */
-    public function isLimited()
-    {
-        return self::UNLIMITED < $this->amount;
-    }
-
-    /**
-     * checks if given used space exceeda quota limit
-     *
-     *
-     * @param     int   $usedSpace
-     * @return    int
-     */
-    public function spaceLeft($usedSpace)
-    {
-        if (self::UNLIMITED === $this->amount) {
-            return $usedSpace;
-        }
-
-        if ($usedSpace >= $this->amount) {
-            return 0;
-        }
-
-        $spaceLeft = $this->amount - $usedSpace;
-        if (0 >= $spaceLeft) {
-            return 0;
-        }
-
-        return $spaceLeft;
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php
deleted file mode 100644
index de649a8..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/FileContent.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\content;
-/**
- * Interface for actual file contents.
- *
- * @since  1.3.0
- */
-interface FileContent
-{
-    /**
-     * returns actual content
-     *
-     * @return  string
-     */
-    public function content();
-
-    /**
-     * returns size of content
-     *
-     * @return  int
-     */
-    public function size();
-
-    /**
-     * reads the given amount of bytes from content
-     *
-     * @param   int     $count
-     * @return  string
-     */
-    public function read($count);
-
-    /**
-     * seeks to the given offset
-     *
-     * @param   int   $offset
-     * @param   int   $whence
-     * @return  bool
-     */
-    public function seek($offset, $whence);
-
-    /**
-     * checks whether pointer is at end of file
-     *
-     * @return  bool
-     */
-    public function eof();
-
-    /**
-     * writes an amount of data
-     *
-     * @param   string  $data
-     * @return  amount of written bytes
-     */
-    public function write($data);
-
-    /**
-     * Truncates a file to a given length
-     *
-     * @param   int  $size length to truncate file to
-     * @return  bool
-     */
-    public function truncate($size);
-}
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/LargeFileContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/LargeFileContent.php
deleted file mode 100644
index 6bc0afc..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/LargeFileContent.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\content;
-/**
- * File content implementation to mock large files.
- *
- * When content is written via write() the data will be written into the
- * positions according to the current offset.
- * When content is read via read() it will use the already written data. If no
- * data is written at the offsets to read those offsets will be filled with
- * spaces.
- * Please note that accessing the whole content via content() will deliver a
- * string with the length of the originally defined size. It is not advisable to
- * do so with large sizes, except you have enough memory and time. :-)
- *
- * @since  1.3.0
- */
-class LargeFileContent extends SeekableFileContent implements FileContent
-{
-    /**
-     * byte array of written content
-     *
-     * @type  char[]
-     */
-    private $content = array();
-    /**
-     * file size in bytes
-     *
-     * @type  int
-     */
-    private $size;
-
-    /**
-     * constructor
-     *
-     * @param  int  $size  file size in bytes
-     */
-    public function __construct($size)
-    {
-        $this->size = $size;
-    }
-
-    /**
-     * create large file with given size in kilobyte
-     *
-     * @param   int  $kilobyte
-     * @return  LargeFileContent
-     */
-    public static function withKilobytes($kilobyte)
-    {
-        return new self($kilobyte * 1024);
-    }
-
-    /**
-     * create large file with given size in megabyte
-     *
-     * @param   int  $megabyte
-     * @return  LargeFileContent
-     */
-    public static function withMegabytes($megabyte)
-    {
-        return self::withKilobytes($megabyte * 1024);
-    }
-
-    /**
-     * create large file with given size in gigabyte
-     *
-     * @param   int  $gigabyte
-     * @return  LargeFileContent
-     */
-    public static function withGigabytes($gigabyte)
-    {
-        return self::withMegabytes($gigabyte * 1024);
-    }
-
-    /**
-     * returns actual content
-     *
-     * @return  string
-     */
-    public function content()
-    {
-        return $this->doRead(0, $this->size);
-    }
-
-    /**
-     * returns size of content
-     *
-     * @return  int
-     */
-    public function size()
-    {
-        return $this->size;
-    }
-
-    /**
-     * actual reading of given byte count starting at given offset
-     *
-     * @param  int  $offset
-     * @param  int  $count
-     */
-    protected function doRead($offset, $count)
-    {
-        if (($offset + $count) > $this->size) {
-            $count = $this->size - $offset;
-        }
-
-        $result = '';
-        for ($i = 0; $i < $count; $i++) {
-            if (isset($this->content[$i + $offset])) {
-                $result .= $this->content[$i + $offset];
-            } else {
-                $result .= ' ';
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * actual writing of data with specified length at given offset
-     *
-     * @param   string  $data
-     * @param   int     $offset
-     * @param   int     $length
-     */
-    protected function doWrite($data, $offset, $length)
-    {
-        for ($i = 0; $i < $length; $i++) {
-            $this->content[$i + $offset] = $data{$i};
-        }
-
-        if ($offset >= $this->size) {
-            $this->size += $length;
-        } elseif (($offset + $length) > $this->size) {
-            $this->size = $offset + $length;
-        }
-    }
-
-    /**
-     * Truncates a file to a given length
-     *
-     * @param   int  $size length to truncate file to
-     * @return  bool
-     */
-    public function truncate($size)
-    {
-        $this->size = $size;
-        foreach (array_filter(array_keys($this->content),
-                              function($pos) use ($size)
-                              {
-                                  return $pos >= $size;
-                              }
-                ) as $removePos) {
-            unset($this->content[$removePos]);
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/SeekableFileContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/SeekableFileContent.php
deleted file mode 100644
index e748000..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/SeekableFileContent.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\content;
-/**
- * Default implementation for file contents based on simple strings.
- *
- * @since  1.3.0
- */
-abstract class SeekableFileContent implements FileContent
-{
-    /**
-     * current position within content
-     *
-     * @type  int
-     */
-    private $offset = 0;
-
-    /**
-     * reads the given amount of bytes from content
-     *
-     * @param   int     $count
-     * @return  string
-     */
-    public function read($count)
-    {
-        $data = $this->doRead($this->offset, $count);
-        $this->offset += $count;
-        return $data;
-    }
-
-    /**
-     * actual reading of given byte count starting at given offset
-     *
-     * @param  int  $offset
-     * @param  int  $count
-     */
-    protected abstract function doRead($offset, $count);
-
-    /**
-     * seeks to the given offset
-     *
-     * @param   int   $offset
-     * @param   int   $whence
-     * @return  bool
-     */
-    public function seek($offset, $whence)
-    {
-        switch ($whence) {
-            case SEEK_CUR:
-                $this->offset += $offset;
-                return true;
-
-            case SEEK_END:
-                $this->offset = $this->size() + $offset;
-                return true;
-
-            case SEEK_SET:
-                $this->offset = $offset;
-                return true;
-
-            default:
-                return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * checks whether pointer is at end of file
-     *
-     * @return  bool
-     */
-    public function eof()
-    {
-        return $this->size() <= $this->offset;
-    }
-
-    /**
-     * writes an amount of data
-     *
-     * @param   string  $data
-     * @return  amount of written bytes
-     */
-    public function write($data)
-    {
-        $dataLength    = strlen($data);
-        $this->doWrite($data, $this->offset, $dataLength);
-        $this->offset += $dataLength;
-        return $dataLength;
-    }
-
-    /**
-     * actual writing of data with specified length at given offset
-     *
-     * @param   string  $data
-     * @param   int     $offset
-     * @param   int     $length
-     */
-    protected abstract function doWrite($data, $offset, $length);
-
-    /**
-     * for backwards compatibility with vfsStreamFile::bytesRead()
-     *
-     * @return  int
-     * @deprecated
-     */
-    public function bytesRead()
-    {
-        return $this->offset;
-    }
-
-    /**
-     * for backwards compatibility with vfsStreamFile::readUntilEnd()
-     *
-     * @return  string
-     * @deprecated
-     */
-    public function readUntilEnd()
-    {
-        return substr($this->content(), $this->offset);
-    }
-}
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php
deleted file mode 100644
index 58bd214..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/content/StringBasedFileContent.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\content;
-/**
- * Default implementation for file contents based on simple strings.
- *
- * @since  1.3.0
- */
-class StringBasedFileContent extends SeekableFileContent implements FileContent
-{
-    /**
-     * actual content
-     *
-     * @type  string
-     */
-    private $content;
-
-    /**
-     * constructor
-     *
-     * @param  string  $content
-     */
-    public function __construct($content)
-    {
-        $this->content = $content;
-    }
-
-    /**
-     * returns actual content
-     *
-     * @return  string
-     */
-    public function content()
-    {
-        return $this->content;
-    }
-
-    /**
-     * returns size of content
-     *
-     * @return  int
-     */
-    public function size()
-    {
-        return strlen($this->content);
-    }
-
-    /**
-     * actual reading of length starting at given offset
-     *
-     * @param  int  $offset
-     * @param  int  $count
-     */
-    protected function doRead($offset, $count)
-    {
-        return substr($this->content, $offset, $count);
-    }
-
-    /**
-     * actual writing of data with specified length at given offset
-     *
-     * @param   string  $data
-     * @param   int     $offset
-     * @param   int     $length
-     */
-    protected function doWrite($data, $offset, $length)
-    {
-        $this->content = substr($this->content, 0, $offset)
-                       . $data
-                       . substr($this->content, $offset + $length);
-    }
-
-    /**
-     * Truncates a file to a given length
-     *
-     * @param   int  $size length to truncate file to
-     * @return  bool
-     */
-    public function truncate($size)
-    {
-        if ($size > $this->size()) {
-            // Pad with null-chars if we're "truncating up"
-            $this->content .= str_repeat("\0", $size - $this->size());
-        } else {
-            $this->content = substr($this->content, 0, $size);
-        }
-
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStream.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStream.php
deleted file mode 100644
index f7f13cb..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStream.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-use org\bovigo\vfs\content\LargeFileContent;
-use org\bovigo\vfs\visitor\vfsStreamVisitor;
-/**
- * Some utility methods for vfsStream.
- *
- * @api
- */
-class vfsStream
-{
-    /**
-     * url scheme
-     */
-    const SCHEME            = 'vfs';
-    /**
-     * owner: root
-     */
-    const OWNER_ROOT        = 0;
-    /**
-     * owner: user 1
-     */
-    const OWNER_USER_1       = 1;
-    /**
-     * owner: user 2
-     */
-    const OWNER_USER_2       = 2;
-    /**
-     * group: root
-     */
-    const GROUP_ROOT         = 0;
-    /**
-     * group: user 1
-     */
-    const GROUP_USER_1       = 1;
-    /**
-     * group: user 2
-     */
-    const GROUP_USER_2       = 2;
-    /**
-     * initial umask setting
-     *
-     * @type  int
-     */
-    protected static $umask  = 0000;
-    /**
-     * switch whether dotfiles are enabled in directory listings
-     *
-     * @type  bool
-     */
-    private static $dotFiles = true;
-
-    /**
-     * prepends the scheme to the given URL
-     *
-     * @param   string  $path  path to translate to vfsStream url
-     * @return  string
-     */
-    public static function url($path)
-    {
-        return self::SCHEME . '://' . str_replace('\\', '/', $path);
-    }
-
-    /**
-     * restores the path from the url
-     *
-     * @param   string  $url  vfsStream url to translate into path
-     * @return  string
-     */
-    public static function path($url)
-    {
-        // remove line feeds and trailing whitespaces and path separators
-        $path = trim($url, " \t\r\n\0\x0B/\\");
-        $path = substr($path, strlen(self::SCHEME . '://'));
-        $path = str_replace('\\', '/', $path);
-        // replace double slashes with single slashes
-        $path = str_replace('//', '/', $path);
-        return urldecode($path);
-    }
-
-    /**
-     * sets new umask setting and returns previous umask setting
-     *
-     * If no value is given only the current umask setting is returned.
-     *
-     * @param   int  $umask  new umask setting
-     * @return  int
-     * @since   0.8.0
-     */
-    public static function umask($umask = null)
-    {
-        $oldUmask = self::$umask;
-        if (null !== $umask) {
-            self::$umask = $umask;
-        }
-
-        return $oldUmask;
-    }
-
-    /**
-     * helper method for setting up vfsStream in unit tests
-     *
-     * Instead of
-     * vfsStreamWrapper::register();
-     * vfsStreamWrapper::setRoot(vfsStream::newDirectory('root'));
-     * you can simply do
-     * vfsStream::setup()
-     * which yields the same result. Additionally, the method returns the
-     * freshly created root directory which you can use to make further
-     * adjustments to it.
-     *
-     * Assumed $structure contains an array like this:
-     * <code>
-     * array('Core' = array('AbstractFactory' => array('test.php'    => 'some text content',
-     *                                                 'other.php'   => 'Some more text content',
-     *                                                 'Invalid.csv' => 'Something else',
-     *                                           ),
-     *                      'AnEmptyFolder'   => array(),
-     *                      'badlocation.php' => 'some bad content',
-     *                )
-     * )
-     * </code>
-     * the resulting directory tree will look like this:
-     * <pre>
-     * root
-     * \- Core
-     *  |- badlocation.php
-     *  |- AbstractFactory
-     *  | |- test.php
-     *  | |- other.php
-     *  | \- Invalid.csv
-     *  \- AnEmptyFolder
-     * </pre>
-     * Arrays will become directories with their key as directory name, and
-     * strings becomes files with their key as file name and their value as file
-     * content.
-     *
-     * @param   string  $rootDirName  name of root directory
-     * @param   int     $permissions  file permissions of root directory
-     * @param   array   $structure    directory structure to add under root directory
-     * @return  \org\bovigo\vfs\vfsStreamDirectory
-     * @since   0.7.0
-     * @see     https://github.com/mikey179/vfsStream/issues/14
-     * @see     https://github.com/mikey179/vfsStream/issues/20
-     */
-    public static function setup($rootDirName = 'root', $permissions = null, array $structure = array())
-    {
-        vfsStreamWrapper::register();
-        return self::create($structure, vfsStreamWrapper::setRoot(self::newDirectory($rootDirName, $permissions)));
-    }
-
-    /**
-     * creates vfsStream directory structure from an array and adds it to given base dir
-     *
-     * Assumed $structure contains an array like this:
-     * <code>
-     * array('Core' = array('AbstractFactory' => array('test.php'    => 'some text content',
-     *                                                 'other.php'   => 'Some more text content',
-     *                                                 'Invalid.csv' => 'Something else',
-     *                                           ),
-     *                      'AnEmptyFolder'   => array(),
-     *                      'badlocation.php' => 'some bad content',
-     *                )
-     * )
-     * </code>
-     * the resulting directory tree will look like this:
-     * <pre>
-     * baseDir
-     * \- Core
-     *  |- badlocation.php
-     *  |- AbstractFactory
-     *  | |- test.php
-     *  | |- other.php
-     *  | \- Invalid.csv
-     *  \- AnEmptyFolder
-     * </pre>
-     * Arrays will become directories with their key as directory name, and
-     * strings becomes files with their key as file name and their value as file
-     * content.
-     *
-     * If no baseDir is given it will try to add the structure to the existing
-     * root directory without replacing existing childs except those with equal
-     * names.
-     *
-     * @param   array               $structure  directory structure to add under root directory
-     * @param   vfsStreamDirectory  $baseDir    base directory to add structure to
-     * @return  vfsStreamDirectory
-     * @throws  \InvalidArgumentException
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/14
-     * @see     https://github.com/mikey179/vfsStream/issues/20
-     */
-    public static function create(array $structure, vfsStreamDirectory $baseDir = null)
-    {
-        if (null === $baseDir) {
-            $baseDir = vfsStreamWrapper::getRoot();
-        }
-
-        if (null === $baseDir) {
-            throw new \InvalidArgumentException('No baseDir given and no root directory set.');
-        }
-
-        return self::addStructure($structure, $baseDir);
-    }
-
-    /**
-     * helper method to create subdirectories recursively
-     *
-     * @param   array               $structure  subdirectory structure to add
-     * @param   vfsStreamDirectory  $baseDir    directory to add the structure to
-     * @return  vfsStreamDirectory
-     */
-    protected static function addStructure(array $structure, vfsStreamDirectory $baseDir)
-    {
-        foreach ($structure as $name => $data) {
-            $name = (string) $name;
-            if (is_array($data) === true) {
-                self::addStructure($data, self::newDirectory($name)->at($baseDir));
-            } elseif (is_string($data) === true) {
-                $matches = null;
-                preg_match('/^\[(.*)\]$/', $name, $matches);
-                if ($matches !== array()) {
-                    self::newBlock($matches[1])->withContent($data)->at($baseDir);
-                } else {
-                    self::newFile($name)->withContent($data)->at($baseDir);
-                }
-            }
-        }
-
-        return $baseDir;
-    }
-
-    /**
-     * copies the file system structure from given path into the base dir
-     *
-     * If no baseDir is given it will try to add the structure to the existing
-     * root directory without replacing existing childs except those with equal
-     * names.
-     * File permissions are copied as well.
-     * Please note that file contents will only be copied if their file size
-     * does not exceed the given $maxFileSize which defaults to 1024 KB. In case
-     * the file is larger file content will be mocked, see
-     * https://github.com/mikey179/vfsStream/wiki/MockingLargeFiles.
-     *
-     * @param   string              $path         path to copy the structure from
-     * @param   vfsStreamDirectory  $baseDir      directory to add the structure to
-     * @param   int                 $maxFileSize  maximum file size of files to copy content from
-     * @return  vfsStreamDirectory
-     * @throws  \InvalidArgumentException
-     * @since   0.11.0
-     * @see     https://github.com/mikey179/vfsStream/issues/4
-     */
-    public static function copyFromFileSystem($path, vfsStreamDirectory $baseDir = null, $maxFileSize = 1048576)
-    {
-        if (null === $baseDir) {
-            $baseDir = vfsStreamWrapper::getRoot();
-        }
-
-        if (null === $baseDir) {
-            throw new \InvalidArgumentException('No baseDir given and no root directory set.');
-        }
-
-        $dir = new \DirectoryIterator($path);
-        foreach ($dir as $fileinfo) {
-            switch (filetype($fileinfo->getPathname())) {
-                case 'file':
-                    if ($fileinfo->getSize() <= $maxFileSize) {
-                        $content = file_get_contents($fileinfo->getPathname());
-                    } else {
-                        $content = new LargeFileContent($fileinfo->getSize());
-                    }
-
-                    self::newFile(
-                            $fileinfo->getFilename(),
-                            octdec(substr(sprintf('%o', $fileinfo->getPerms()), -4))
-                        )
-                        ->withContent($content)
-                        ->at($baseDir);
-                    break;
-
-                case 'dir':
-                    if (!$fileinfo->isDot()) {
-                        self::copyFromFileSystem(
-                                $fileinfo->getPathname(),
-                                self::newDirectory(
-                                        $fileinfo->getFilename(),
-                                        octdec(substr(sprintf('%o', $fileinfo->getPerms()), -4))
-                                )->at($baseDir),
-                                $maxFileSize
-                        );
-                    }
-
-                    break;
-
-                case 'block':
-                    self::newBlock(
-                            $fileinfo->getFilename(),
-                            octdec(substr(sprintf('%o', $fileinfo->getPerms()), -4))
-                        )->at($baseDir);
-                    break;
-            }
-        }
-
-        return $baseDir;
-    }
-
-    /**
-     * returns a new file with given name
-     *
-     * @param   string  $name         name of file to create
-     * @param   int     $permissions  permissions of file to create
-     * @return  vfsStreamFile
-     */
-    public static function newFile($name, $permissions = null)
-    {
-        return new vfsStreamFile($name, $permissions);
-    }
-
-    /**
-     * returns a new directory with given name
-     *
-     * If the name contains slashes, a new directory structure will be created.
-     * The returned directory will always be the parent directory of this
-     * directory structure.
-     *
-     * @param   string  $name         name of directory to create
-     * @param   int     $permissions  permissions of directory to create
-     * @return  vfsStreamDirectory
-     */
-    public static function newDirectory($name, $permissions = null)
-    {
-        if ('/' === $name{0}) {
-            $name = substr($name, 1);
-        }
-
-        $firstSlash = strpos($name, '/');
-        if (false === $firstSlash) {
-            return new vfsStreamDirectory($name, $permissions);
-        }
-
-        $ownName   = substr($name, 0, $firstSlash);
-        $subDirs   = substr($name, $firstSlash + 1);
-        $directory = new vfsStreamDirectory($ownName, $permissions);
-        self::newDirectory($subDirs, $permissions)->at($directory);
-        return $directory;
-    }
-
-    /**
-     * returns a new block with the given name
-     *
-     * @param   string  $name           name of the block device
-     * @param   int     $permissions    permissions of block to create
-     * @return vfsStreamBlock
-     */
-    public static function newBlock($name, $permissions = null)
-    {
-        return new vfsStreamBlock($name, $permissions);
-    }
-
-    /**
-     * returns current user
-     *
-     * If the system does not support posix_getuid() the current user will be root (0).
-     *
-     * @return  int
-     */
-    public static function getCurrentUser()
-    {
-        return function_exists('posix_getuid') ? posix_getuid() : self::OWNER_ROOT;
-    }
-
-    /**
-     * returns current group
-     *
-     * If the system does not support posix_getgid() the current group will be root (0).
-     *
-     * @return  int
-     */
-    public static function getCurrentGroup()
-    {
-        return function_exists('posix_getgid') ? posix_getgid() : self::GROUP_ROOT;
-    }
-
-    /**
-     * use visitor to inspect a content structure
-     *
-     * If the given content is null it will fall back to use the current root
-     * directory of the stream wrapper.
-     *
-     * Returns given visitor for method chaining comfort.
-     *
-     * @param   vfsStreamVisitor  $visitor  the visitor who inspects
-     * @param   vfsStreamContent  $content  directory structure to inspect
-     * @return  vfsStreamVisitor
-     * @throws  \InvalidArgumentException
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/10
-     */
-    public static function inspect(vfsStreamVisitor $visitor, vfsStreamContent $content = null)
-    {
-        if (null !== $content) {
-            return $visitor->visit($content);
-        }
-
-        $root = vfsStreamWrapper::getRoot();
-        if (null === $root) {
-            throw new \InvalidArgumentException('No content given and no root directory set.');
-        }
-
-        return $visitor->visitDirectory($root);
-    }
-
-    /**
-     * sets quota to given amount of bytes
-     *
-     * @param  int  $bytes
-     * @since  1.1.0
-     */
-    public static function setQuota($bytes)
-    {
-        vfsStreamWrapper::setQuota(new Quota($bytes));
-    }
-
-    /**
-     * checks if vfsStream lists dotfiles in directory listings
-     *
-     * @return  bool
-     * @since   1.3.0
-     */
-    public static function useDotfiles()
-    {
-        return self::$dotFiles;
-    }
-
-    /**
-     * disable dotfiles in directory listings
-     *
-     * @since  1.3.0
-     */
-    public static function disableDotfiles()
-    {
-        self::$dotFiles = false;
-    }
-
-    /**
-     * enable dotfiles in directory listings
-     *
-     * @since  1.3.0
-     */
-    public static function enableDotfiles()
-    {
-        self::$dotFiles = true;
-    }
-}
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php
deleted file mode 100644
index 0467451..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamAbstractContent.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Base stream contents container.
- */
-abstract class vfsStreamAbstractContent implements vfsStreamContent
-{
-    /**
-     * name of the container
-     *
-     * @type  string
-     */
-    protected $name;
-    /**
-     * type of the container
-     *
-     * @type  string
-     */
-    protected $type;
-    /**
-     * timestamp of last access
-     *
-     * @type  int
-     */
-    protected $lastAccessed;
-    /**
-     * timestamp of last attribute modification
-     *
-     * @type  int
-     */
-    protected $lastAttributeModified;
-    /**
-     * timestamp of last modification
-     *
-     * @type  int
-     */
-    protected $lastModified;
-    /**
-     * permissions for content
-     *
-     * @type  int
-     */
-    protected $permissions;
-    /**
-     * owner of the file
-     *
-     * @type  int
-     */
-    protected $user;
-    /**
-     * owner group of the file
-     *
-     * @type  int
-     */
-    protected $group;
-    /**
-     * path to to this content
-     *
-     * @type  string
-     */
-    private $parentPath;
-
-    /**
-     * constructor
-     *
-     * @param  string  $name
-     * @param  int     $permissions  optional
-     */
-    public function __construct($name, $permissions = null)
-    {
-        $this->name = $name;
-        $time       = time();
-        if (null === $permissions) {
-            $permissions = $this->getDefaultPermissions() & ~vfsStream::umask();
-        }
-
-        $this->lastAccessed          = $time;
-        $this->lastAttributeModified = $time;
-        $this->lastModified          = $time;
-        $this->permissions           = $permissions;
-        $this->user                  = vfsStream::getCurrentUser();
-        $this->group                 = vfsStream::getCurrentGroup();
-    }
-
-    /**
-     * returns default permissions for concrete implementation
-     *
-     * @return  int
-     * @since   0.8.0
-     */
-    protected abstract function getDefaultPermissions();
-
-    /**
-     * returns the file name of the content
-     *
-     * @return  string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * renames the content
-     *
-     * @param  string  $newName
-     */
-    public function rename($newName)
-    {
-        $this->name = $newName;
-    }
-
-    /**
-     * checks whether the container can be applied to given name
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function appliesTo($name)
-    {
-        if ($name === $this->name) {
-            return true;
-        }
-
-        $segment_name = $this->name.'/';
-        return (strncmp($segment_name, $name, strlen($segment_name)) == 0);
-    }
-
-    /**
-     * returns the type of the container
-     *
-     * @return  int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * sets the last modification time of the stream content
-     *
-     * @param   int  $filemtime
-     * @return  $this
-     */
-    public function lastModified($filemtime)
-    {
-        $this->lastModified = $filemtime;
-        return $this;
-    }
-
-    /**
-     * returns the last modification time of the stream content
-     *
-     * @return  int
-     */
-    public function filemtime()
-    {
-        return $this->lastModified;
-    }
-
-    /**
-     * sets last access time of the stream content
-     *
-     * @param   int  $fileatime
-     * @return  $this
-     * @since   0.9
-     */
-    public function lastAccessed($fileatime)
-    {
-        $this->lastAccessed = $fileatime;
-        return $this;
-    }
-
-    /**
-     * returns the last access time of the stream content
-     *
-     * @return  int
-     * @since   0.9
-     */
-    public function fileatime()
-    {
-        return $this->lastAccessed;
-    }
-
-    /**
-     * sets the last attribute modification time of the stream content
-     *
-     * @param   int  $filectime
-     * @return  $this
-     * @since   0.9
-     */
-    public function lastAttributeModified($filectime)
-    {
-        $this->lastAttributeModified = $filectime;
-        return $this;
-    }
-
-    /**
-     * returns the last attribute modification time of the stream content
-     *
-     * @return  int
-     * @since   0.9
-     */
-    public function filectime()
-    {
-        return $this->lastAttributeModified;
-    }
-
-    /**
-     * adds content to given container
-     *
-     * @param   vfsStreamContainer  $container
-     * @return  $this
-     */
-    public function at(vfsStreamContainer $container)
-    {
-        $container->addChild($this);
-        return $this;
-    }
-
-    /**
-     * change file mode to given permissions
-     *
-     * @param   int  $permissions
-     * @return  $this
-     */
-    public function chmod($permissions)
-    {
-        $this->permissions           = $permissions;
-        $this->lastAttributeModified = time();
-        clearstatcache();
-        return $this;
-    }
-
-    /**
-     * returns permissions
-     *
-     * @return  int
-     */
-    public function getPermissions()
-    {
-        return $this->permissions;
-    }
-
-    /**
-     * checks whether content is readable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isReadable($user, $group)
-    {
-        if ($this->user === $user) {
-            $check = 0400;
-        } elseif ($this->group === $group) {
-            $check = 0040;
-        } else {
-            $check = 0004;
-        }
-
-        return (bool) ($this->permissions & $check);
-    }
-
-    /**
-     * checks whether content is writable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isWritable($user, $group)
-    {
-        if ($this->user === $user) {
-            $check = 0200;
-        } elseif ($this->group === $group) {
-            $check = 0020;
-        } else {
-            $check = 0002;
-        }
-
-        return (bool) ($this->permissions & $check);
-    }
-
-    /**
-     * checks whether content is executable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isExecutable($user, $group)
-    {
-        if ($this->user === $user) {
-            $check = 0100;
-        } elseif ($this->group === $group) {
-            $check = 0010;
-        } else {
-            $check = 0001;
-        }
-
-        return (bool) ($this->permissions & $check);
-    }
-
-    /**
-     * change owner of file to given user
-     *
-     * @param   int  $user
-     * @return  $this
-     */
-    public function chown($user)
-    {
-        $this->user                  = $user;
-        $this->lastAttributeModified = time();
-        return $this;
-    }
-
-    /**
-     * checks whether file is owned by given user
-     *
-     * @param   int  $user
-     * @return  bool
-     */
-    public function isOwnedByUser($user)
-    {
-        return $this->user === $user;
-    }
-
-    /**
-     * returns owner of file
-     *
-     * @return  int
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
-
-    /**
-     * change owner group of file to given group
-     *
-     * @param   int  $group
-     * @return  $this
-     */
-    public function chgrp($group)
-    {
-        $this->group                 = $group;
-        $this->lastAttributeModified = time();
-        return $this;
-    }
-
-    /**
-     * checks whether file is owned by group
-     *
-     * @param   int   $group
-     * @return  bool
-     */
-    public function isOwnedByGroup($group)
-    {
-        return $this->group === $group;
-    }
-
-    /**
-     * returns owner group of file
-     *
-     * @return  int
-     */
-    public function getGroup()
-    {
-        return $this->group;
-    }
-
-    /**
-     * sets parent path
-     *
-     * @param  string  $parentPath
-     * @internal  only to be set by parent
-     * @since   1.2.0
-     */
-    public function setParentPath($parentPath)
-    {
-        $this->parentPath = $parentPath;
-    }
-
-    /**
-     * returns path to this content
-     *
-     * @return  string
-     * @since   1.2.0
-     */
-    public function path()
-    {
-        if (null === $this->parentPath) {
-            return $this->name;
-        }
-
-        return $this->parentPath . '/' . $this->name;
-    }
-
-    /**
-     * returns complete vfsStream url for this content
-     *
-     * @return  string
-     * @since   1.2.0
-     */
-    public function url()
-    {
-        return vfsStream::url($this->path());
-    }
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamBlock.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamBlock.php
deleted file mode 100644
index 128a96a..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamBlock.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-
-/**
- * Block container.
- *
- * @api
- */
-class vfsStreamBlock extends vfsStreamFile
-{
-    /**
-     * constructor
-     *
-     * @param  string  $name
-     * @param  int     $permissions  optional
-     */
-    public function __construct($name, $permissions = null)
-    {
-        if (empty($name)) {
-            throw new vfsStreamException('Name of Block device was empty');
-        }
-        parent::__construct($name, $permissions);
-
-        $this->type = vfsStreamContent::TYPE_BLOCK;
-    }
-}
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php
deleted file mode 100644
index e27a581..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainer.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Interface for stream contents that are able to store other stream contents.
- */
-interface vfsStreamContainer extends \IteratorAggregate
-{
-    /**
-     * adds child to the directory
-     *
-     * @param  vfsStreamContent  $child
-     */
-    public function addChild(vfsStreamContent $child);
-
-    /**
-     * removes child from the directory
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function removeChild($name);
-
-    /**
-     * checks whether the container contains a child with the given name
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function hasChild($name);
-
-    /**
-     * returns the child with the given name
-     *
-     * @param   string  $name
-     * @return  vfsStreamContent
-     */
-    public function getChild($name);
-
-    /**
-     * checks whether directory contains any children
-     *
-     * @return  bool
-     * @since   0.10.0
-     */
-    public function hasChildren();
-
-    /**
-     * returns a list of children for this directory
-     *
-     * @return  vfsStreamContent[]
-     */
-    public function getChildren();
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php
deleted file mode 100644
index 83943dc..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContainerIterator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Iterator for children of a directory container.
- */
-class vfsStreamContainerIterator implements \Iterator
-{
-    /**
-     * list of children from container to iterate over
-     *
-     * @type  vfsStreamContent[]
-     */
-    protected $children;
-
-    /**
-     * constructor
-     *
-     * @param  vfsStreamContent[]  $children
-     */
-    public function __construct(array $children)
-    {
-        $this->children = $children;
-        if (vfsStream::useDotfiles()) {
-            array_unshift($this->children, new DotDirectory('.'), new DotDirectory('..'));
-        }
-
-        reset($this->children);
-    }
-
-    /**
-     * resets children pointer
-     */
-    public function rewind()
-    {
-        reset($this->children);
-    }
-
-    /**
-     * returns the current child
-     *
-     * @return  vfsStreamContent
-     */
-    public function current()
-    {
-        $child = current($this->children);
-        if (false === $child) {
-            return null;
-        }
-
-        return $child;
-    }
-
-    /**
-     * returns the name of the current child
-     *
-     * @return  string
-     */
-    public function key()
-    {
-        $child = current($this->children);
-        if (false === $child) {
-            return null;
-        }
-
-        return $child->getName();
-    }
-
-    /**
-     * iterates to next child
-     */
-    public function next()
-    {
-        next($this->children);
-    }
-
-    /**
-     * checks if the current value is valid
-     *
-     * @return  bool
-     */
-    public function valid()
-    {
-        return (false !== current($this->children));
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContent.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContent.php
deleted file mode 100644
index efcccce..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamContent.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Interface for stream contents.
- */
-interface vfsStreamContent
-{
-    /**
-     * stream content type: file
-     *
-     * @see  getType()
-     */
-    const TYPE_FILE = 0100000;
-    /**
-     * stream content type: directory
-     *
-     * @see  getType()
-     */
-    const TYPE_DIR  = 0040000;
-    /**
-     * stream content type: symbolic link
-     *
-     * @see  getType();
-     */
-    #const TYPE_LINK = 0120000;
-
-    /**
-     * stream content type: block
-     *
-     * @see getType()
-     */
-    const TYPE_BLOCK = 0060000;
-
-    /**
-     * returns the file name of the content
-     *
-     * @return  string
-     */
-    public function getName();
-
-    /**
-     * renames the content
-     *
-     * @param  string  $newName
-     */
-    public function rename($newName);
-
-    /**
-     * checks whether the container can be applied to given name
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function appliesTo($name);
-
-    /**
-     * returns the type of the container
-     *
-     * @return  int
-     */
-    public function getType();
-
-    /**
-     * returns size of content
-     *
-     * @return  int
-     */
-    public function size();
-
-    /**
-     * sets the last modification time of the stream content
-     *
-     * @param   int  $filemtime
-     * @return  vfsStreamContent
-     */
-    public function lastModified($filemtime);
-
-    /**
-     * returns the last modification time of the stream content
-     *
-     * @return  int
-     */
-    public function filemtime();
-
-    /**
-     * adds content to given container
-     *
-     * @param   vfsStreamContainer  $container
-     * @return  vfsStreamContent
-     */
-    public function at(vfsStreamContainer $container);
-
-    /**
-     * change file mode to given permissions
-     *
-     * @param   int  $permissions
-     * @return  vfsStreamContent
-     */
-    public function chmod($permissions);
-
-    /**
-     * returns permissions
-     *
-     * @return  int
-     */
-    public function getPermissions();
-
-    /**
-     * checks whether content is readable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isReadable($user, $group);
-
-    /**
-     * checks whether content is writable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isWritable($user, $group);
-
-    /**
-     * checks whether content is executable
-     *
-     * @param   int   $user   id of user to check for
-     * @param   int   $group  id of group to check for
-     * @return  bool
-     */
-    public function isExecutable($user, $group);
-
-    /**
-     * change owner of file to given user
-     *
-     * @param   int  $user
-     * @return  vfsStreamContent
-     */
-    public function chown($user);
-
-    /**
-     * checks whether file is owned by given user
-     *
-     * @param   int  $user
-     * @return  bool
-     */
-    public function isOwnedByUser($user);
-
-    /**
-     * returns owner of file
-     *
-     * @return  int
-     */
-    public function getUser();
-
-    /**
-     * change owner group of file to given group
-     *
-     * @param   int  $group
-     * @return  vfsStreamContent
-     */
-    public function chgrp($group);
-
-    /**
-     * checks whether file is owned by group
-     *
-     * @param   int   $group
-     * @return  bool
-     */
-    public function isOwnedByGroup($group);
-
-    /**
-     * returns owner group of file
-     *
-     * @return  int
-     */
-    public function getGroup();
-
-    /**
-     * sets parent path
-     *
-     * @param  string  $parentPath
-     * @internal  only to be set by parent
-     * @since   1.2.0
-     */
-    public function setParentPath($parentPath);
-
-    /**
-     * returns path to this content
-     *
-     * @return  string
-     * @since   1.2.0
-     */
-    public function path();
-
-    /**
-     * returns complete vfsStream url for this content
-     *
-     * @return  string
-     * @since   1.2.0
-     */
-    public function url();
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php
deleted file mode 100644
index e17c835..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamDirectory.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Directory container.
- *
- * @api
- */
-class vfsStreamDirectory extends vfsStreamAbstractContent implements vfsStreamContainer
-{
-    /**
-     * list of directory children
-     *
-     * @type  vfsStreamContent[]
-     */
-    protected $children = array();
-
-    /**
-     * constructor
-     *
-     * @param   string  $name
-     * @param   int     $permissions  optional
-     * @throws  vfsStreamException
-     */
-    public function __construct($name, $permissions = null)
-    {
-        if (strstr($name, '/') !== false) {
-            throw new vfsStreamException('Directory name can not contain /.');
-        }
-
-        $this->type = vfsStreamContent::TYPE_DIR;
-        parent::__construct($name, $permissions);
-    }
-
-    /**
-     * returns default permissions for concrete implementation
-     *
-     * @return  int
-     * @since   0.8.0
-     */
-    protected function getDefaultPermissions()
-    {
-        return 0777;
-    }
-
-    /**
-     * returns size of directory
-     *
-     * The size of a directory is always 0 bytes. To calculate the summarized
-     * size of all children in the directory use sizeSummarized().
-     *
-     * @return  int
-     */
-    public function size()
-    {
-        return 0;
-    }
-
-    /**
-     * returns summarized size of directory and its children
-     *
-     * @return  int
-     */
-    public function sizeSummarized()
-    {
-        $size = 0;
-        foreach ($this->children as $child) {
-            if ($child->getType() === vfsStreamContent::TYPE_DIR) {
-                $size += $child->sizeSummarized();
-            } else {
-                $size += $child->size();
-            }
-        }
-
-        return $size;
-    }
-
-    /**
-     * renames the content
-     *
-     * @param   string  $newName
-     * @throws  vfsStreamException
-     */
-    public function rename($newName)
-    {
-        if (strstr($newName, '/') !== false) {
-            throw new vfsStreamException('Directory name can not contain /.');
-        }
-
-        parent::rename($newName);
-    }
-
-
-    /**
-     * sets parent path
-     *
-     * @param  string  $parentPath
-     * @internal  only to be set by parent
-     * @since   1.2.0
-     */
-    public function setParentPath($parentPath)
-    {
-        parent::setParentPath($parentPath);
-        foreach ($this->children as $child) {
-            $child->setParentPath($this->path());
-        }
-    }
-
-    /**
-     * adds child to the directory
-     *
-     * @param  vfsStreamContent  $child
-     */
-    public function addChild(vfsStreamContent $child)
-    {
-        $child->setParentPath($this->path());
-        $this->children[$child->getName()] = $child;
-        $this->updateModifications();
-    }
-
-    /**
-     * removes child from the directory
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function removeChild($name)
-    {
-        foreach ($this->children as $key => $child) {
-            if ($child->appliesTo($name)) {
-                $child->setParentPath(null);
-                unset($this->children[$key]);
-                $this->updateModifications();
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * updates internal timestamps
-     */
-    protected function updateModifications()
-    {
-        $time = time();
-        $this->lastAttributeModified = $time;
-        $this->lastModified          = $time;
-    }
-
-    /**
-     * checks whether the container contains a child with the given name
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function hasChild($name)
-    {
-        return ($this->getChild($name) !== null);
-    }
-
-    /**
-     * returns the child with the given name
-     *
-     * @param   string  $name
-     * @return  vfsStreamContent
-     */
-    public function getChild($name)
-    {
-        $childName = $this->getRealChildName($name);
-        foreach ($this->children as $child) {
-            if ($child->getName() === $childName) {
-                return $child;
-            }
-
-            if ($child->appliesTo($childName) === true && $child->hasChild($childName) === true) {
-                return $child->getChild($childName);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * helper method to detect the real child name
-     *
-     * @param   string  $name
-     * @return  string
-     */
-    protected function getRealChildName($name)
-    {
-        if ($this->appliesTo($name) === true) {
-            return self::getChildName($name, $this->name);
-        }
-
-        return $name;
-    }
-
-    /**
-     * helper method to calculate the child name
-     *
-     * @param   string  $name
-     * @param   string  $ownName
-     * @return  string
-     */
-    protected static function getChildName($name, $ownName)
-    {
-        if ($name === $ownName) {
-            return $name;
-        }
-
-        return substr($name, strlen($ownName) + 1);
-    }
-
-    /**
-     * checks whether directory contains any children
-     *
-     * @return  bool
-     * @since   0.10.0
-     */
-    public function hasChildren()
-    {
-        return (count($this->children) > 0);
-    }
-
-    /**
-     * returns a list of children for this directory
-     *
-     * @return  vfsStreamContent[]
-     */
-    public function getChildren()
-    {
-        return array_values($this->children);
-    }
-
-    /**
-     * returns iterator for the children
-     *
-     * @return  vfsStreamContainerIterator
-     */
-    public function getIterator()
-    {
-        return new vfsStreamContainerIterator($this->children);
-    }
-
-    /**
-     * checks whether dir is a dot dir
-     *
-     * @return  bool
-     */
-    public function isDot()
-    {
-        if ('.' === $this->name || '..' === $this->name) {
-            return true;
-        }
-
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php
deleted file mode 100644
index aa79d64..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Exception for vfsStream errors.
- *
- * @api
- */
-class vfsStreamException extends \Exception
-{
-    // intentionally empty
-}
-?>
\ No newline at end of file
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamFile.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamFile.php
deleted file mode 100644
index 7e5f065..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamFile.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-use org\bovigo\vfs\content\FileContent;
-use org\bovigo\vfs\content\StringBasedFileContent;
-/**
- * File container.
- *
- * @api
- */
-class vfsStreamFile extends vfsStreamAbstractContent
-{
-    /**
-     * content of the file
-     *
-     * @type  FileContent
-     */
-    private $content;
-    /**
-     * Resource id which exclusively locked this file
-     *
-     * @type  string
-     */
-    protected $exclusiveLock;
-    /**
-     * Resources ids which currently holds shared lock to this file
-     *
-     * @type  bool[string]
-     */
-    protected $sharedLock = array();
-
-    /**
-     * constructor
-     *
-     * @param  string  $name
-     * @param  int     $permissions  optional
-     */
-    public function __construct($name, $permissions = null)
-    {
-        $this->content = new StringBasedFileContent(null);
-        $this->type    = vfsStreamContent::TYPE_FILE;
-        parent::__construct($name, $permissions);
-    }
-
-    /**
-     * returns default permissions for concrete implementation
-     *
-     * @return  int
-     * @since   0.8.0
-     */
-    protected function getDefaultPermissions()
-    {
-        return 0666;
-    }
-
-    /**
-     * checks whether the container can be applied to given name
-     *
-     * @param   string  $name
-     * @return  bool
-     */
-    public function appliesTo($name)
-    {
-        return ($name === $this->name);
-    }
-
-    /**
-     * alias for withContent()
-     *
-     * @param   string  $content
-     * @return  vfsStreamFile
-     * @see     withContent()
-     */
-    public function setContent($content)
-    {
-        return $this->withContent($content);
-    }
-
-    /**
-     * sets the contents of the file
-     *
-     * Setting content with this method does not change the time when the file
-     * was last modified.
-     *
-     * @param   string]FileContent  $content
-     * @return  vfsStreamFile
-     * @throws  \InvalidArgumentException
-     */
-    public function withContent($content)
-    {
-        if (is_string($content)) {
-            $this->content = new StringBasedFileContent($content);
-        } elseif ($content instanceof FileContent) {
-            $this->content = $content;
-        } else {
-            throw new \InvalidArgumentException('Given content must either be a string or an instance of org\bovigo\vfs\content\FileContent');
-        }
-
-        return $this;
-    }
-
-    /**
-     * returns the contents of the file
-     *
-     * Getting content does not change the time when the file
-     * was last accessed.
-     *
-     * @return  string
-     */
-    public function getContent()
-    {
-        return $this->content->content();
-    }
-
-    /**
-     * simply open the file
-     *
-     * @since  0.9
-     */
-    public function open()
-    {
-        $this->content->seek(0, SEEK_SET);
-        $this->lastAccessed = time();
-    }
-
-    /**
-     * open file and set pointer to end of file
-     *
-     * @since  0.9
-     */
-    public function openForAppend()
-    {
-        $this->content->seek(0, SEEK_END);
-        $this->lastAccessed = time();
-    }
-
-    /**
-     * open file and truncate content
-     *
-     * @since  0.9
-     */
-    public function openWithTruncate()
-    {
-        $this->open();
-        $this->content->truncate(0);
-        $time               = time();
-        $this->lastAccessed = $time;
-        $this->lastModified = $time;
-    }
-
-    /**
-     * reads the given amount of bytes from content
-     *
-     * Using this method changes the time when the file was last accessed.
-     *
-     * @param   int     $count
-     * @return  string
-     */
-    public function read($count)
-    {
-        $this->lastAccessed = time();
-        return $this->content->read($count);
-    }
-
-    /**
-     * returns the content until its end from current offset
-     *
-     * Using this method changes the time when the file was last accessed.
-     *
-     * @return  string
-     * @deprecated  since 1.3.0
-     */
-    public function readUntilEnd()
-    {
-        $this->lastAccessed = time();
-        return $this->content->readUntilEnd();
-    }
-
-    /**
-     * writes an amount of data
-     *
-     * Using this method changes the time when the file was last modified.
-     *
-     * @param   string  $data
-     * @return  amount of written bytes
-     */
-    public function write($data)
-    {
-        $this->lastModified = time();
-        return $this->content->write($data);
-    }
-
-    /**
-     * Truncates a file to a given length
-     *
-     * @param   int  $size length to truncate file to
-     * @return  bool
-     * @since   1.1.0
-     */
-    public function truncate($size)
-    {
-        $this->content->truncate($size);
-        $this->lastModified = time();
-        return true;
-    }
-
-    /**
-     * checks whether pointer is at end of file
-     *
-     * @return  bool
-     */
-    public function eof()
-    {
-        return $this->content->eof();
-    }
-
-    /**
-     * returns the current position within the file
-     *
-     * @return  int
-     * @deprecated  since 1.3.0
-     */
-    public function getBytesRead()
-    {
-        return $this->content->bytesRead();
-    }
-
-    /**
-     * seeks to the given offset
-     *
-     * @param   int   $offset
-     * @param   int   $whence
-     * @return  bool
-     */
-    public function seek($offset, $whence)
-    {
-        return $this->content->seek($offset, $whence);
-    }
-
-    /**
-     * returns size of content
-     *
-     * @return  int
-     */
-    public function size()
-    {
-        return $this->content->size();
-    }
-
-
-    /**
-     * locks file for
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @param   int  $operation
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/6
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function lock($resource, $operation)
-    {
-        if ((LOCK_NB & $operation) == LOCK_NB) {
-            $operation = $operation - LOCK_NB;
-        }
-
-        // call to lock file on the same file handler firstly releases the lock
-        $this->unlock($resource);
-
-        if (LOCK_EX === $operation) {
-            if ($this->isLocked()) {
-                return false;
-            }
-
-            $this->setExclusiveLock($resource);
-        } elseif(LOCK_SH === $operation) {
-            if ($this->hasExclusiveLock()) {
-                return false;
-            }
-
-            $this->addSharedLock($resource);
-        }
-
-        return true;
-    }
-
-    /**
-     * Removes lock from file acquired by given resource
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function unlock($resource) {
-        if ($this->hasExclusiveLock($resource)) {
-            $this->exclusiveLock = null;
-        }
-        if ($this->hasSharedLock($resource)) {
-            unset($this->sharedLock[$this->getResourceId($resource)]);
-        }
-    }
-
-    /**
-     * Set exlusive lock on file by given resource
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    protected function setExclusiveLock($resource) {
-        $this->exclusiveLock = $this->getResourceId($resource);
-    }
-
-    /**
-     * Add shared lock on file by given resource
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    protected function addSharedLock($resource) {
-        $this->sharedLock[$this->getResourceId($resource)] = true;
-    }
-
-    /**
-     * checks whether file is locked
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/6
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function isLocked($resource = null)
-    {
-        return $this->hasSharedLock($resource) || $this->hasExclusiveLock($resource);
-    }
-
-    /**
-     * checks whether file is locked in shared mode
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/6
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function hasSharedLock($resource = null)
-    {
-        if (null !== $resource) {
-            return isset($this->sharedLock[$this->getResourceId($resource)]);
-        }
-
-        return !empty($this->sharedLock);
-    }
-
-    /**
-     * Returns unique resource id
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @return  string
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function getResourceId($resource) {
-        if (is_resource($resource)) {
-            $data = stream_get_meta_data($resource);
-            $resource = $data['wrapper_data'];
-        }
-
-        return spl_object_hash($resource);
-    }
-
-    /**
-     * checks whether file is locked in exclusive mode
-     *
-     * @param   resource|vfsStreamWrapper $resource
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/6
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function hasExclusiveLock($resource = null)
-    {
-        if (null !== $resource) {
-            return $this->exclusiveLock === $this->getResourceId($resource);
-        }
-
-        return null !== $this->exclusiveLock;
-    }
-}
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamWrapper.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamWrapper.php
deleted file mode 100644
index 911334a..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/vfsStreamWrapper.php
+++ /dev/null
@@ -1,1013 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs;
-/**
- * Stream wrapper to mock file system requests.
- */
-class vfsStreamWrapper
-{
-    /**
-     * open file for reading
-     */
-    const READ                   = 'r';
-    /**
-     * truncate file
-     */
-    const TRUNCATE               = 'w';
-    /**
-     * set file pointer to end, append new data
-     */
-    const APPEND                 = 'a';
-    /**
-     * set file pointer to start, overwrite existing data
-     */
-    const WRITE                  = 'x';
-    /**
-     * set file pointer to start, overwrite existing data; or create file if
-     * does not exist
-     */
-    const WRITE_NEW              = 'c';
-    /**
-     * file mode: read only
-     */
-    const READONLY               = 0;
-    /**
-     * file mode: write only
-     */
-    const WRITEONLY              = 1;
-    /**
-     * file mode: read and write
-     */
-    const ALL                    = 2;
-    /**
-     * switch whether class has already been registered as stream wrapper or not
-     *
-     * @type  bool
-     */
-    protected static $registered = false;
-    /**
-     * root content
-     *
-     * @type  vfsStreamContent
-     */
-    protected static $root;
-    /**
-     * disk space quota
-     *
-     * @type  Quota
-     */
-    private static $quota;
-    /**
-     * file mode: read only, write only, all
-     *
-     * @type  int
-     */
-    protected $mode;
-    /**
-     * shortcut to file container
-     *
-     * @type  vfsStreamFile
-     */
-    protected $content;
-    /**
-     * shortcut to directory container
-     *
-     * @type  vfsStreamDirectory
-     */
-    protected $dir;
-    /**
-     * shortcut to directory container iterator
-     *
-     * @type  vfsStreamDirectory
-     */
-    protected $dirIterator;
-
-    /**
-     * method to register the stream wrapper
-     *
-     * Please be aware that a call to this method will reset the root element
-     * to null.
-     * If the stream is already registered the method returns silently. If there
-     * is already another stream wrapper registered for the scheme used by
-     * vfsStream a vfsStreamException will be thrown.
-     *
-     * @throws  vfsStreamException
-     */
-    public static function register()
-    {
-        self::$root  = null;
-        self::$quota = Quota::unlimited();
-        if (true === self::$registered) {
-            return;
-        }
-
-        if (@stream_wrapper_register(vfsStream::SCHEME, __CLASS__) === false) {
-            throw new vfsStreamException('A handler has already been registered for the ' . vfsStream::SCHEME . ' protocol.');
-        }
-
-        self::$registered = true;
-    }
-
-    /**
-     * Unregisters a previously registered URL wrapper for the vfs scheme.
-     * 
-     * If this stream wrapper wasn't registered, the method returns silently.
-     *
-     * If unregistering fails, or if the URL wrapper for vfs:// was not
-     * registered with this class, a vfsStreamException will be thrown.
-     * 
-     * @throws vfsStreamException
-     * @since  1.6.0
-     */
-    public static function unregister()
-    {
-        if (!self::$registered) {
-            if (in_array(vfsStream::SCHEME, stream_get_wrappers())) {
-                throw new vfsStreamException('The URL wrapper for the protocol ' . vfsStream::SCHEME . ' was not registered with this version of vfsStream.');
-            }
-            return;
-        }
-
-        if (!@stream_wrapper_unregister(vfsStream::SCHEME)) {
-            throw new vfsStreamException('Failed to unregister the URL wrapper for the ' . vfsStream::SCHEME . ' protocol.');
-        }
-
-        self::$registered = false;
-    }
-
-    /**
-     * sets the root content
-     *
-     * @param   vfsStreamContainer  $root
-     * @return  vfsStreamContainer
-     */
-    public static function setRoot(vfsStreamContainer $root)
-    {
-        self::$root = $root;
-        clearstatcache();
-        return self::$root;
-    }
-
-    /**
-     * returns the root content
-     *
-     * @return  vfsStreamContainer
-     */
-    public static function getRoot()
-    {
-        return self::$root;
-    }
-
-    /**
-     * sets quota for disk space
-     *
-     * @param  Quota  $quota
-     * @since  1.1.0
-     */
-    public static function setQuota(Quota $quota)
-    {
-        self::$quota = $quota;
-    }
-
-    /**
-     * returns content for given path
-     *
-     * @param   string  $path
-     * @return  vfsStreamContent
-     */
-    protected function getContent($path)
-    {
-        if (null === self::$root) {
-            return null;
-        }
-
-        if (self::$root->getName() === $path) {
-            return self::$root;
-        }
-
-        if ($this->isInRoot($path) && self::$root->hasChild($path) === true) {
-            return self::$root->getChild($path);
-        }
-
-        return null;
-    }
-
-    /**
-     * helper method to detect whether given path is in root path
-     *
-     * @param   string  $path
-     * @return  bool
-     */
-    private function isInRoot($path)
-    {
-        return substr($path, 0, strlen(self::$root->getName())) === self::$root->getName();
-    }
-
-    /**
-     * returns content for given path but only when it is of given type
-     *
-     * @param   string  $path
-     * @param   int     $type
-     * @return  vfsStreamContent
-     */
-    protected function getContentOfType($path, $type)
-    {
-        $content = $this->getContent($path);
-        if (null !== $content && $content->getType() === $type) {
-            return $content;
-        }
-
-        return null;
-    }
-
-    /**
-     * splits path into its dirname and the basename
-     *
-     * @param   string  $path
-     * @return  string[]
-     */
-    protected function splitPath($path)
-    {
-        $lastSlashPos = strrpos($path, '/');
-        if (false === $lastSlashPos) {
-            return array('dirname' => '', 'basename' => $path);
-        }
-
-        return array('dirname'  => substr($path, 0, $lastSlashPos),
-                     'basename' => substr($path, $lastSlashPos + 1)
-               );
-    }
-
-    /**
-     * helper method to resolve a path from /foo/bar/. to /foo/bar
-     *
-     * @param   string  $path
-     * @return  string
-     */
-    protected function resolvePath($path)
-    {
-        $newPath  = array();
-        foreach (explode('/', $path) as $pathPart) {
-            if ('.' !== $pathPart) {
-                if ('..' !== $pathPart) {
-                    $newPath[] = $pathPart;
-                } elseif (count($newPath) > 1) {
-                    array_pop($newPath);
-                }
-            }
-        }
-
-        return implode('/', $newPath);
-    }
-
-    /**
-     * open the stream
-     *
-     * @param   string  $path         the path to open
-     * @param   string  $mode         mode for opening
-     * @param   string  $options      options for opening
-     * @param   string  $opened_path  full path that was actually opened
-     * @return  bool
-     */
-    public function stream_open($path, $mode, $options, $opened_path)
-    {
-        $extended = ((strstr($mode, '+') !== false) ? (true) : (false));
-        $mode     = str_replace(array('t', 'b', '+'), '', $mode);
-        if (in_array($mode, array('r', 'w', 'a', 'x', 'c')) === false) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('Illegal mode ' . $mode . ', use r, w, a, x  or c, flavoured with t, b and/or +', E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        $this->mode    = $this->calculateMode($mode, $extended);
-        $path          = $this->resolvePath(vfsStream::path($path));
-        $this->content = $this->getContentOfType($path, vfsStreamContent::TYPE_FILE);
-        if (null !== $this->content) {
-            if (self::WRITE === $mode) {
-                if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                    trigger_error('File ' . $path . ' already exists, can not open with mode x', E_USER_WARNING);
-                }
-
-                return false;
-            }
-
-            if (
-                (self::TRUNCATE === $mode || self::APPEND === $mode) &&
-                $this->content->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false
-            ) {
-                return false;
-            }
-
-            if (self::TRUNCATE === $mode) {
-                $this->content->openWithTruncate();
-            } elseif (self::APPEND === $mode) {
-                $this->content->openForAppend();
-            } else {
-                if (!$this->content->isReadable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup())) {
-                    if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                        trigger_error('Permission denied', E_USER_WARNING);
-                    }
-                    return false;
-                }
-                $this->content->open();
-            }
-
-            return true;
-        }
-
-        $content = $this->createFile($path, $mode, $options);
-        if (false === $content) {
-            return false;
-        }
-
-        $this->content = $content;
-        return true;
-    }
-
-    /**
-     * creates a file at given path
-     *
-     * @param   string  $path     the path to open
-     * @param   string  $mode     mode for opening
-     * @param   string  $options  options for opening
-     * @return  bool
-     */
-    private function createFile($path, $mode = null, $options = null)
-    {
-        $names = $this->splitPath($path);
-        if (empty($names['dirname']) === true) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('File ' . $names['basename'] . ' does not exist', E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        $dir = $this->getContentOfType($names['dirname'], vfsStreamContent::TYPE_DIR);
-        if (null === $dir) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('Directory ' . $names['dirname'] . ' does not exist', E_USER_WARNING);
-            }
-
-            return false;
-        } elseif ($dir->hasChild($names['basename']) === true) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('Directory ' . $names['dirname'] . ' already contains a director named ' . $names['basename'], E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        if (self::READ === $mode) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('Can not open non-existing file ' . $path . ' for reading', E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        if ($dir->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            if (($options & STREAM_REPORT_ERRORS) === STREAM_REPORT_ERRORS) {
-                trigger_error('Can not create new file in non-writable path ' . $names['dirname'], E_USER_WARNING);
-            }
-
-            return false;
-        }
-
-        return vfsStream::newFile($names['basename'])->at($dir);
-    }
-
-    /**
-     * calculates the file mode
-     *
-     * @param   string  $mode      opening mode: r, w, a or x
-     * @param   bool    $extended  true if + was set with opening mode
-     * @return  int
-     */
-    protected function calculateMode($mode, $extended)
-    {
-        if (true === $extended) {
-            return self::ALL;
-        }
-
-        if (self::READ === $mode) {
-            return self::READONLY;
-        }
-
-        return self::WRITEONLY;
-    }
-
-    /**
-     * closes the stream
-     *
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function stream_close()
-    {
-        $this->content->lock($this, LOCK_UN);
-    }
-
-    /**
-     * read the stream up to $count bytes
-     *
-     * @param   int     $count  amount of bytes to read
-     * @return  string
-     */
-    public function stream_read($count)
-    {
-        if (self::WRITEONLY === $this->mode) {
-            return '';
-        }
-
-        if ($this->content->isReadable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return '';
-        }
-
-        return $this->content->read($count);
-    }
-
-    /**
-     * writes data into the stream
-     *
-     * @param   string  $data
-     * @return  int     amount of bytes written
-     */
-    public function stream_write($data)
-    {
-        if (self::READONLY === $this->mode) {
-            return 0;
-        }
-
-        if ($this->content->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return 0;
-        }
-
-        if (self::$quota->isLimited()) {
-            $data = substr($data, 0, self::$quota->spaceLeft(self::$root->sizeSummarized()));
-        }
-
-        return $this->content->write($data);
-    }
-
-    /**
-     * truncates a file to a given length
-     *
-     * @param   int  $size  length to truncate file to
-     * @return  bool
-     * @since   1.1.0
-     */
-    public function stream_truncate($size)
-    {
-        if (self::READONLY === $this->mode) {
-            return false;
-        }
-
-        if ($this->content->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return false;
-        }
-
-        if ($this->content->getType() !== vfsStreamContent::TYPE_FILE) {
-            return false;
-        }
-
-        if (self::$quota->isLimited() && $this->content->size() < $size) {
-            $maxSize = self::$quota->spaceLeft(self::$root->sizeSummarized());
-            if (0 === $maxSize) {
-                return false;
-            }
-
-            if ($size > $maxSize) {
-                $size = $maxSize;
-            }
-        }
-
-        return $this->content->truncate($size);
-    }
-
-    /**
-     * sets metadata like owner, user or permissions
-     *
-     * @param   string  $path
-     * @param   int     $option
-     * @param   mixed   $var
-     * @return  bool
-     * @since   1.1.0
-     */
-    public function stream_metadata($path, $option, $var)
-    {
-        $path    = $this->resolvePath(vfsStream::path($path));
-        $content = $this->getContent($path);
-        switch ($option) {
-            case STREAM_META_TOUCH:
-                if (null === $content) {
-                    $content = $this->createFile($path, null, STREAM_REPORT_ERRORS);
-                    // file creation may not be allowed at provided path
-                    if (false === $content) {
-                        return false;
-                    }
-                }
-
-                $currentTime = time();
-                $content->lastModified(((isset($var[0])) ? ($var[0]) : ($currentTime)))
-                        ->lastAccessed(((isset($var[1])) ? ($var[1]) : ($currentTime)));
-                return true;
-
-            case STREAM_META_OWNER_NAME:
-                return false;
-
-            case STREAM_META_OWNER:
-                if (null === $content) {
-                    return false;
-                }
-
-                return $this->doPermChange($path,
-                                           $content,
-                                           function() use ($content, $var)
-                                           {
-                                               $content->chown($var);
-                                           }
-                );
-
-            case STREAM_META_GROUP_NAME:
-                return false;
-
-            case STREAM_META_GROUP:
-                if (null === $content) {
-                    return false;
-                }
-
-                return $this->doPermChange($path,
-                                           $content,
-                                           function() use ($content, $var)
-                                           {
-                                               $content->chgrp($var);
-                                           }
-                );
-
-            case STREAM_META_ACCESS:
-                if (null === $content) {
-                    return false;
-                }
-
-                return $this->doPermChange($path,
-                                           $content,
-                                           function() use ($content, $var)
-                                           {
-                                               $content->chmod($var);
-                                           }
-                );
-
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * executes given permission change when necessary rights allow such a change
-     *
-     * @param   string                    $path
-     * @param   vfsStreamAbstractContent  $content
-     * @param   \Closure                  $change
-     * @return  bool
-     */
-    private function doPermChange($path, vfsStreamAbstractContent $content, \Closure $change)
-    {
-        if (!$content->isOwnedByUser(vfsStream::getCurrentUser())) {
-            return false;
-        }
-
-        if (self::$root->getName() !== $path) {
-            $names   = $this->splitPath($path);
-            $parent = $this->getContent($names['dirname']);
-            if (!$parent->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup())) {
-                return false;
-            }
-        }
-
-        $change();
-        return true;
-    }
-
-    /**
-     * checks whether stream is at end of file
-     *
-     * @return  bool
-     */
-    public function stream_eof()
-    {
-        return $this->content->eof();
-    }
-
-    /**
-     * returns the current position of the stream
-     *
-     * @return  int
-     */
-    public function stream_tell()
-    {
-        return $this->content->getBytesRead();
-    }
-
-    /**
-     * seeks to the given offset
-     *
-     * @param   int   $offset
-     * @param   int   $whence
-     * @return  bool
-     */
-    public function stream_seek($offset, $whence)
-    {
-        return $this->content->seek($offset, $whence);
-    }
-
-    /**
-     * flushes unstored data into storage
-     *
-     * @return  bool
-     */
-    public function stream_flush()
-    {
-        return true;
-    }
-
-    /**
-     * returns status of stream
-     *
-     * @return  array
-     */
-    public function stream_stat()
-    {
-        $fileStat = array('dev'     => 0,
-                          'ino'     => 0,
-                          'mode'    => $this->content->getType() | $this->content->getPermissions(),
-                          'nlink'   => 0,
-                          'uid'     => $this->content->getUser(),
-                          'gid'     => $this->content->getGroup(),
-                          'rdev'    => 0,
-                          'size'    => $this->content->size(),
-                          'atime'   => $this->content->fileatime(),
-                          'mtime'   => $this->content->filemtime(),
-                          'ctime'   => $this->content->filectime(),
-                          'blksize' => -1,
-                          'blocks'  => -1
-                    );
-        return array_merge(array_values($fileStat), $fileStat);
-    }
-
-    /**
-     * retrieve the underlaying resource
-     *
-     * Please note that this method always returns false as there is no
-     * underlaying resource to return.
-     *
-     * @param   int  $cast_as
-     * @since   0.9.0
-     * @see     https://github.com/mikey179/vfsStream/issues/3
-     * @return  bool
-     */
-    public function stream_cast($cast_as)
-    {
-        return false;
-    }
-
-    /**
-     * set lock status for stream
-     *
-     * @param   int   $operation
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/6
-     * @see     https://github.com/mikey179/vfsStream/issues/31
-     * @see     https://github.com/mikey179/vfsStream/issues/40
-     */
-    public function stream_lock($operation)
-    {
-        if ((LOCK_NB & $operation) == LOCK_NB) {
-            $operation = $operation - LOCK_NB;
-        }
-
-        return $this->content->lock($this, $operation);
-    }
-
-    /**
-     * sets options on the stream
-     *
-     * @param   int   $option  key of option to set
-     * @param   int   $arg1
-     * @param   int   $arg2
-     * @return  bool
-     * @since   0.10.0
-     * @see     https://github.com/mikey179/vfsStream/issues/15
-     * @see     http://www.php.net/manual/streamwrapper.stream-set-option.php
-     */
-    public function stream_set_option($option, $arg1, $arg2)
-    {
-        switch ($option) {
-            case STREAM_OPTION_BLOCKING:
-                // break omitted
-
-            case STREAM_OPTION_READ_TIMEOUT:
-                // break omitted
-
-            case STREAM_OPTION_WRITE_BUFFER:
-                // break omitted
-
-            default:
-                // nothing to do here
-        }
-
-        return false;
-    }
-
-    /**
-     * remove the data under the given path
-     *
-     * @param   string  $path
-     * @return  bool
-     */
-    public function unlink($path)
-    {
-        $realPath = $this->resolvePath(vfsStream::path($path));
-        $content  = $this->getContent($realPath);
-        if (null === $content) {
-            trigger_error('unlink(' . $path . '): No such file or directory', E_USER_WARNING);
-            return false;
-        }
-
-        if ($content->getType() !== vfsStreamContent::TYPE_FILE) {
-            trigger_error('unlink(' . $path . '): Operation not permitted', E_USER_WARNING);
-            return false;
-        }
-
-        return $this->doUnlink($realPath);
-    }
-
-    /**
-     * removes a path
-     *
-     * @param   string  $path
-     * @return  bool
-     */
-    protected function doUnlink($path)
-    {
-        if (self::$root->getName() === $path) {
-            // delete root? very brave. :)
-            self::$root = null;
-            clearstatcache();
-            return true;
-        }
-
-        $names   = $this->splitPath($path);
-        $content = $this->getContent($names['dirname']);
-        if (!$content->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup())) {
-            return false;
-        }
-
-        clearstatcache();
-        return $content->removeChild($names['basename']);
-    }
-
-    /**
-     * rename from one path to another
-     *
-     * @param   string  $path_from
-     * @param   string  $path_to
-     * @return  bool
-     * @author  Benoit Aubuchon
-     */
-    public function rename($path_from, $path_to)
-    {
-        $srcRealPath = $this->resolvePath(vfsStream::path($path_from));
-        $dstRealPath = $this->resolvePath(vfsStream::path($path_to));
-        $srcContent  = $this->getContent($srcRealPath);
-        if (null == $srcContent) {
-            trigger_error(' No such file or directory', E_USER_WARNING);
-            return false;
-        }
-        $dstNames = $this->splitPath($dstRealPath);
-        $dstParentContent = $this->getContent($dstNames['dirname']);
-        if (null == $dstParentContent) {
-            trigger_error('No such file or directory', E_USER_WARNING);
-            return false;
-        }
-        if (!$dstParentContent->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup())) {
-            trigger_error('Permission denied', E_USER_WARNING);
-            return false;
-        }
-        if ($dstParentContent->getType() !== vfsStreamContent::TYPE_DIR) {
-            trigger_error('Target is not a directory', E_USER_WARNING);
-            return false;
-        }
-
-        // remove old source first, so we can rename later
-        // (renaming first would lead to not being able to remove the old path)
-        if (!$this->doUnlink($srcRealPath)) {
-            return false;
-        }
-
-        $dstContent = $srcContent;
-        // Renaming the filename
-        $dstContent->rename($dstNames['basename']);
-        // Copying to the destination
-        $dstParentContent->addChild($dstContent);
-        return true;
-    }
-
-    /**
-     * creates a new directory
-     *
-     * @param   string  $path
-     * @param   int     $mode
-     * @param   int     $options
-     * @return  bool
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        $umask = vfsStream::umask();
-        if (0 < $umask) {
-            $permissions = $mode & ~$umask;
-        } else {
-            $permissions = $mode;
-        }
-
-        $path = $this->resolvePath(vfsStream::path($path));
-        if (null !== $this->getContent($path)) {
-            trigger_error('mkdir(): Path vfs://' . $path . ' exists', E_USER_WARNING);
-            return false;
-        }
-
-        if (null === self::$root) {
-            self::$root = vfsStream::newDirectory($path, $permissions);
-            return true;
-        }
-
-        $maxDepth = count(explode('/', $path));
-        $names    = $this->splitPath($path);
-        $newDirs  = $names['basename'];
-        $dir      = null;
-        $i        = 0;
-        while ($dir === null && $i < $maxDepth) {
-            $dir     = $this->getContent($names['dirname']);
-            $names   = $this->splitPath($names['dirname']);
-            if (null == $dir) {
-                $newDirs = $names['basename'] . '/' . $newDirs;
-            }
-
-            $i++;
-        }
-
-        if (null === $dir
-          || $dir->getType() !== vfsStreamContent::TYPE_DIR
-          || $dir->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return false;
-        }
-
-        $recursive = ((STREAM_MKDIR_RECURSIVE & $options) !== 0) ? (true) : (false);
-        if (strpos($newDirs, '/') !== false && false === $recursive) {
-            return false;
-        }
-
-        vfsStream::newDirectory($newDirs, $permissions)->at($dir);
-        return true;
-    }
-
-    /**
-     * removes a directory
-     *
-     * @param   string  $path
-     * @param   int     $options
-     * @return  bool
-     * @todo    consider $options with STREAM_MKDIR_RECURSIVE
-     */
-    public function rmdir($path, $options)
-    {
-        $path  = $this->resolvePath(vfsStream::path($path));
-        $child = $this->getContentOfType($path, vfsStreamContent::TYPE_DIR);
-        if (null === $child) {
-            return false;
-        }
-
-        // can only remove empty directories
-        if (count($child->getChildren()) > 0) {
-            return false;
-        }
-
-        if (self::$root->getName() === $path) {
-            // delete root? very brave. :)
-            self::$root = null;
-            clearstatcache();
-            return true;
-        }
-
-        $names = $this->splitPath($path);
-        $dir   = $this->getContentOfType($names['dirname'], vfsStreamContent::TYPE_DIR);
-        if ($dir->isWritable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return false;
-        }
-
-        clearstatcache();
-        return $dir->removeChild($child->getName());
-    }
-
-    /**
-     * opens a directory
-     *
-     * @param   string  $path
-     * @param   int     $options
-     * @return  bool
-     */
-    public function dir_opendir($path, $options)
-    {
-        $path      = $this->resolvePath(vfsStream::path($path));
-        $this->dir = $this->getContentOfType($path, vfsStreamContent::TYPE_DIR);
-        if (null === $this->dir || $this->dir->isReadable(vfsStream::getCurrentUser(), vfsStream::getCurrentGroup()) === false) {
-            return false;
-        }
-
-        $this->dirIterator = $this->dir->getIterator();
-        return true;
-    }
-
-    /**
-     * reads directory contents
-     *
-     * @return  string
-     */
-    public function dir_readdir()
-    {
-        $dir = $this->dirIterator->current();
-        if (null === $dir) {
-            return false;
-        }
-
-        $this->dirIterator->next();
-        return $dir->getName();
-    }
-
-    /**
-     * reset directory iteration
-     *
-     * @return  bool
-     */
-    public function dir_rewinddir()
-    {
-        return $this->dirIterator->rewind();
-    }
-
-    /**
-     * closes directory
-     *
-     * @return  bool
-     */
-    public function dir_closedir()
-    {
-        $this->dirIterator = null;
-        return true;
-    }
-
-    /**
-     * returns status of url
-     *
-     * @param   string  $path   path of url to return status for
-     * @param   int     $flags  flags set by the stream API
-     * @return  array
-     */
-    public function url_stat($path, $flags)
-    {
-        $content = $this->getContent($this->resolvePath(vfsStream::path($path)));
-        if (null === $content) {
-            if (($flags & STREAM_URL_STAT_QUIET) != STREAM_URL_STAT_QUIET) {
-                trigger_error(' No such file or directory: ' . $path, E_USER_WARNING);
-            }
-
-            return false;
-
-        }
-
-        $fileStat = array('dev'     => 0,
-                          'ino'     => 0,
-                          'mode'    => $content->getType() | $content->getPermissions(),
-                          'nlink'   => 0,
-                          'uid'     => $content->getUser(),
-                          'gid'     => $content->getGroup(),
-                          'rdev'    => 0,
-                          'size'    => $content->size(),
-                          'atime'   => $content->fileatime(),
-                          'mtime'   => $content->filemtime(),
-                          'ctime'   => $content->filectime(),
-                          'blksize' => -1,
-                          'blocks'  => -1
-                    );
-        return array_merge(array_values($fileStat), $fileStat);
-    }
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamAbstractVisitor.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamAbstractVisitor.php
deleted file mode 100644
index 4f8c286..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamAbstractVisitor.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\visitor;
-use org\bovigo\vfs\vfsStreamContent;
-use org\bovigo\vfs\vfsStreamBlock;
-
-/**
- * Abstract base class providing an implementation for the visit() method.
- *
- * @since  0.10.0
- * @see    https://github.com/mikey179/vfsStream/issues/10
- */
-abstract class vfsStreamAbstractVisitor implements vfsStreamVisitor
-{
-    /**
-     * visit a content and process it
-     *
-     * @param   vfsStreamContent  $content
-     * @return  vfsStreamVisitor
-     * @throws  \InvalidArgumentException
-     */
-    public function visit(vfsStreamContent $content)
-    {
-        switch ($content->getType()) {
-            case vfsStreamContent::TYPE_BLOCK:
-                $this->visitBlockDevice($content);
-                break;
-
-            case vfsStreamContent::TYPE_FILE:
-                $this->visitFile($content);
-                break;
-
-            case vfsStreamContent::TYPE_DIR:
-                if (!$content->isDot()) {
-                    $this->visitDirectory($content);
-                }
-
-                break;
-
-            default:
-                throw new \InvalidArgumentException('Unknown content type ' . $content->getType() . ' for ' . $content->getName());
-        }
-
-        return $this;
-    }
-
-    /**
-     * visit a block device and process it
-     *
-     * @param   vfsStreamBlock $block
-     * @return  vfsStreamVisitor
-     */
-    public function visitBlockDevice(vfsStreamBlock $block)
-    {
-        return $this->visitFile($block);
-    }
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamPrintVisitor.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamPrintVisitor.php
deleted file mode 100644
index 4175485..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamPrintVisitor.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\visitor;
-use org\bovigo\vfs\vfsStreamContent;
-use org\bovigo\vfs\vfsStreamDirectory;
-use org\bovigo\vfs\vfsStreamFile;
-use org\bovigo\vfs\vfsStreamBlock;
-
-/**
- * Visitor which traverses a content structure recursively to print it to an output stream.
- *
- * @since  0.10.0
- * @see    https://github.com/mikey179/vfsStream/issues/10
- */
-class vfsStreamPrintVisitor extends vfsStreamAbstractVisitor
-{
-    /**
-     * target to write output to
-     *
-     * @type  resource
-     */
-    protected $out;
-    /**
-     * current depth in directory tree
-     *
-     * @type  int
-     */
-    protected $depth;
-
-    /**
-     * constructor
-     *
-     * If no file pointer given it will fall back to STDOUT.
-     *
-     * @param   resource  $out  optional
-     * @throws  \InvalidArgumentException
-     * @api
-     */
-    public function __construct($out = STDOUT)
-    {
-        if (is_resource($out) === false || get_resource_type($out) !== 'stream') {
-            throw new \InvalidArgumentException('Given filepointer is not a resource of type stream');
-        }
-
-        $this->out = $out;
-    }
-
-    /**
-     * visit a file and process it
-     *
-     * @param   vfsStreamFile  $file
-     * @return  vfsStreamPrintVisitor
-     */
-    public function visitFile(vfsStreamFile $file)
-    {
-        $this->printContent($file->getName());
-        return $this;
-    }
-
-    /**
-     * visit a block device and process it
-     *
-     * @param   vfsStreamBlock  $block
-     * @return  vfsStreamPrintVisitor
-     */
-    public function visitBlockDevice(vfsStreamBlock $block)
-    {
-        $name = '[' . $block->getName() . ']';
-        $this->printContent($name);
-        return $this;
-    }
-
-    /**
-     * visit a directory and process it
-     *
-     * @param   vfsStreamDirectory  $dir
-     * @return  vfsStreamPrintVisitor
-     */
-    public function visitDirectory(vfsStreamDirectory $dir)
-    {
-        $this->printContent($dir->getName());
-        $this->depth++;
-        foreach ($dir as $child) {
-            $this->visit($child);
-        }
-
-        $this->depth--;
-        return $this;
-    }
-
-    /**
-     * helper method to print the content
-     *
-     * @param  string   $name
-     */
-    protected function printContent($name)
-    {
-        fwrite($this->out, str_repeat('  ', $this->depth) . '- ' . $name . "\n");
-    }
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamStructureVisitor.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamStructureVisitor.php
deleted file mode 100644
index 957e5df..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamStructureVisitor.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\visitor;
-use org\bovigo\vfs\vfsStreamDirectory;
-use org\bovigo\vfs\vfsStreamFile;
-use org\bovigo\vfs\vfsStreamBlock;
-
-/**
- * Visitor which traverses a content structure recursively to create an array structure from it.
- *
- * @since  0.10.0
- * @see    https://github.com/mikey179/vfsStream/issues/10
- */
-class vfsStreamStructureVisitor extends vfsStreamAbstractVisitor
-{
-    /**
-     * collected structure
-     *
-     * @type  array
-     */
-    protected $structure = array();
-    /**
-     * poiting to currently iterated directory
-     *
-     * @type  array
-     */
-    protected $current;
-
-    /**
-     * constructor
-     *
-     * @api
-     */
-    public function __construct()
-    {
-        $this->reset();
-    }
-
-    /**
-     * visit a file and process it
-     *
-     * @param   vfsStreamFile  $file
-     * @return  vfsStreamStructureVisitor
-     */
-    public function visitFile(vfsStreamFile $file)
-    {
-        $this->current[$file->getName()] = $file->getContent();
-        return $this;
-    }
-
-    /**
-     * visit a block device and process it
-     *
-     * @param   vfsStreamBlock $block
-     * @return  vfsStreamStructureVisitor
-     */
-    public function visitBlockDevice(vfsStreamBlock $block)
-    {
-        $this->current['[' . $block->getName() . ']'] = $block->getContent();
-        return $this;
-    }
-
-    /**
-     * visit a directory and process it
-     *
-     * @param   vfsStreamDirectory  $dir
-     * @return  vfsStreamStructureVisitor
-     */
-    public function visitDirectory(vfsStreamDirectory $dir)
-    {
-        $this->current[$dir->getName()] = array();
-        $tmp           =& $this->current;
-        $this->current =& $tmp[$dir->getName()];
-        foreach ($dir as $child) {
-            $this->visit($child);
-        }
-
-        $this->current =& $tmp;
-        return $this;
-    }
-
-    /**
-     * returns structure of visited contents
-     *
-     * @return  array
-     * @api
-     */
-    public function getStructure()
-    {
-        return $this->structure;
-    }
-
-    /**
-     * resets structure so visitor could be reused
-     *
-     * @return  vfsStreamStructureVisitor
-     */
-    public function reset()
-    {
-        $this->structure = array();
-        $this->current   =& $this->structure;
-        return $this;
-    }
-}
-?>
diff --git a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamVisitor.php b/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamVisitor.php
deleted file mode 100644
index 89e4374..0000000
--- a/vendor/mikey179/vfsStream/src/main/php/org/bovigo/vfs/visitor/vfsStreamVisitor.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * This file is part of vfsStream.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package  org\bovigo\vfs
- */
-namespace org\bovigo\vfs\visitor;
-use org\bovigo\vfs\vfsStreamContent;
-use org\bovigo\vfs\vfsStreamDirectory;
-use org\bovigo\vfs\vfsStreamFile;
-use org\bovigo\vfs\vfsStreamBlock;
-
-/**
- * Interface for a visitor to work on a vfsStream content structure.
- *
- * @since  0.10.0
- * @see    https://github.com/mikey179/vfsStream/issues/10
- */
-interface vfsStreamVisitor
-{
-    /**
-     * visit a content and process it
-     *
-     * @param   vfsStreamContent  $content
-     * @return  vfsStreamVisitor
-     */
-    public function visit(vfsStreamContent $content);
-
-    /**
-     * visit a file and process it
-     *
-     * @param   vfsStreamFile  $file
-     * @return  vfsStreamVisitor
-     */
-    public function visitFile(vfsStreamFile $file);
-
-    /**
-     * visit a directory and process it
-     *
-     * @param   vfsStreamDirectory  $dir
-     * @return  vfsStreamVisitor
-     */
-    public function visitDirectory(vfsStreamDirectory $dir);
-
-    /**
-     * visit a block device and process it
-     *
-     * @param   vfsStreamBlock  $block
-     * @return  vfsStreamVisitor
-     */
-    public function visitBlockDevice(vfsStreamBlock $block);
-}
-?>
diff --git a/vendor/phpdocumentor/reflection-docblock/.gitignore b/vendor/phpdocumentor/reflection-docblock/.gitignore
deleted file mode 100644
index 3ce5adb..0000000
--- a/vendor/phpdocumentor/reflection-docblock/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea
-vendor
diff --git a/vendor/phpdocumentor/reflection-docblock/.travis.yml b/vendor/phpdocumentor/reflection-docblock/.travis.yml
deleted file mode 100644
index eef782c..0000000
--- a/vendor/phpdocumentor/reflection-docblock/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-language: php
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-  - hhvm-nightly
-
-matrix:
-    allow_failures:
-        - php: hhvm
-        - php: hhvm-nightly
-
-script:
- - vendor/bin/phpunit
-
-before_script:
- - sudo apt-get -qq update > /dev/null
- - phpenv rehash > /dev/null
- - composer selfupdate --quiet
- - composer install --no-interaction --prefer-source --dev
- - vendor/bin/phpunit
- - composer update --no-interaction --prefer-source --dev
-
-notifications:
-  irc: "irc.freenode.org#phpdocumentor"
-  email:
-    - mike.vanriel@naenius.com
-    - ashnazg@php.net
-    - boen.robot@gmail.com
diff --git a/vendor/phpdocumentor/reflection-docblock/LICENSE b/vendor/phpdocumentor/reflection-docblock/LICENSE
deleted file mode 100644
index 792e404..0000000
--- a/vendor/phpdocumentor/reflection-docblock/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2010 Mike van Riel
-
-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/vendor/phpdocumentor/reflection-docblock/README.md b/vendor/phpdocumentor/reflection-docblock/README.md
deleted file mode 100644
index 6405d1a..0000000
--- a/vendor/phpdocumentor/reflection-docblock/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-The ReflectionDocBlock Component [![Build Status](https://secure.travis-ci.org/phpDocumentor/ReflectionDocBlock.png)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock)
-================================
-
-Introduction
-------------
-
-The ReflectionDocBlock component of phpDocumentor provides a DocBlock parser
-that is 100% compatible with the [PHPDoc standard](http://phpdoc.org/docs/latest).
-
-With this component, a library can provide support for annotations via DocBlocks
-or otherwise retrieve information that is embedded in a DocBlock.
-
-> **Note**: *this is a core component of phpDocumentor and is constantly being
-> optimized for performance.*
-
-Installation
-------------
-
-You can install the component in the following ways:
-
-* Use the official Github repository (https://github.com/phpDocumentor/ReflectionDocBlock)
-* Via Composer (http://packagist.org/packages/phpdocumentor/reflection-docblock)
-
-Usage
------
-
-The ReflectionDocBlock component is designed to work in an identical fashion to
-PHP's own Reflection extension (http://php.net/manual/en/book.reflection.php).
-
-Parsing can be initiated by instantiating the
-`\phpDocumentor\Reflection\DocBlock()` class and passing it a string containing
-a DocBlock (including asterisks) or by passing an object supporting the
-`getDocComment()` method.
-
-> *Examples of objects having the `getDocComment()` method are the
-> `ReflectionClass` and the `ReflectionMethod` classes of the PHP
-> Reflection extension*
-
-Example:
-
-    $class = new ReflectionClass('MyClass');
-    $phpdoc = new \phpDocumentor\Reflection\DocBlock($class);
-
-or
-
-    $docblock = <<<DOCBLOCK
-    /**
-     * This is a short description.
-     *
-     * This is a *long* description.
-     *
-     * @return void
-     */
-    DOCBLOCK;
-
-    $phpdoc = new \phpDocumentor\Reflection\DocBlock($docblock);
-
diff --git a/vendor/phpdocumentor/reflection-docblock/composer.json b/vendor/phpdocumentor/reflection-docblock/composer.json
deleted file mode 100644
index 4dffa22..0000000
--- a/vendor/phpdocumentor/reflection-docblock/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name":    "phpdocumentor/reflection-docblock",
-    "type":    "library",
-    "license": "MIT",
-    "authors": [
-        {"name": "Mike van Riel", "email": "mike.vanriel@naenius.com"}
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "autoload": {
-        "psr-0": {"phpDocumentor": ["src/"]}
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "suggest": {
-        "dflydev/markdown": "~1.0",
-        "erusev/parsedown": "~1.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/composer.lock b/vendor/phpdocumentor/reflection-docblock/composer.lock
deleted file mode 100644
index 4c6a8bb..0000000
--- a/vendor/phpdocumentor/reflection-docblock/composer.lock
+++ /dev/null
@@ -1,827 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "ea1734d11b8c878445c2c6e58de8b85f",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "ocramius/instantiator",
-            "version": "1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/Instantiator.git",
-                "reference": "a7abbb5fc9df6e7126af741dd6c140d1a7369435"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/Instantiator/zipball/a7abbb5fc9df6e7126af741dd6c140d1a7369435",
-                "reference": "a7abbb5fc9df6e7126af741dd6c140d1a7369435",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/lazy-map": "1.0.*",
-                "php": "~5.3"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Instantiator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/Ocramius/Instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2014-08-14 15:10:55"
-        },
-        {
-            "name": "ocramius/lazy-map",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/LazyMap.git",
-                "reference": "7fe3d347f5e618bcea7d39345ff83f3651d8b752"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/LazyMap/zipball/7fe3d347f5e618bcea7d39345ff83f3651d8b752",
-                "reference": "7fe3d347f5e618bcea7d39345ff83f3651d8b752",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.6",
-                "phpmd/phpmd": "1.5.*",
-                "phpunit/phpunit": ">=3.7",
-                "satooshi/php-coveralls": "~0.6",
-                "squizlabs/php_codesniffer": "1.4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "LazyMap\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A library that provides lazy instantiation logic for a map of objects",
-            "homepage": "https://github.com/Ocramius/LazyMap",
-            "keywords": [
-                "lazy",
-                "lazy instantiation",
-                "lazy loading",
-                "map",
-                "service location"
-            ],
-            "time": "2013-11-09 22:30:54"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.0.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6d196af48e8c100a3ae881940123e693da5a9217"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6d196af48e8c100a3ae881940123e693da5a9217",
-                "reference": "6d196af48e8c100a3ae881940123e693da5a9217",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3.1",
-                "phpunit/php-text-template": "~1.2.0",
-                "phpunit/php-token-stream": "~1.2.2",
-                "sebastian/environment": "~1.0.0",
-                "sebastian/version": "~1.0.3"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4.0.14"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2014-08-06 06:39:42"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2013-10-10 15:34:57"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2014-01-30 17:20:04"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2013-08-02 07:42:54"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
-                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2014-03-03 05:10:30"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a33fa68ece9f8c68589bfc2da8d2794e27b820bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a33fa68ece9f8c68589bfc2da8d2794e27b820bc",
-                "reference": "a33fa68ece9f8c68589bfc2da8d2794e27b820bc",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpunit/php-code-coverage": "~2.0",
-                "phpunit/php-file-iterator": "~1.3.1",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
-                "phpunit/phpunit-mock-objects": "~2.2",
-                "sebastian/comparator": "~1.0",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.0",
-                "sebastian/exporter": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2014-08-18 05:12:30"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "42e589e08bc86e3e9bdf20d385e948347788505b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/42e589e08bc86e3e9bdf20d385e948347788505b",
-                "reference": "42e589e08bc86e3e9bdf20d385e948347788505b",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/instantiator": "~1.0",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.2.*@dev"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2014-08-02 13:50:58"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
-                "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.1",
-                "sebastian/exporter": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2014-05-02 07:05:58"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2013-08-03 16:46:33"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a",
-                "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.0.*@dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2014-02-18 16:17:19"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
-                "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.0.*@dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net",
-                    "role": "Lead"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2014-02-16 08:26:31"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-03-07 15:35:33"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.5.3",
-            "target-dir": "Symfony/Component/Yaml",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
-                "reference": "5a75366ae9ca8b4792cd0083e4ca4dff9fe96f1f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-08-05 09:00:40"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "platform": {
-        "php": ">=5.3.3"
-    },
-    "platform-dev": []
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/phpunit.xml.dist b/vendor/phpdocumentor/reflection-docblock/phpunit.xml.dist
deleted file mode 100644
index f67ad2a..0000000
--- a/vendor/phpdocumentor/reflection-docblock/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<phpunit colors="true" strict="true" bootstrap="vendor/autoload.php">
-  <testsuites>
-    <testsuite name="phpDocumentor\Reflection\DocBlock">
-      <directory>./tests/</directory>
-    </testsuite>
-  </testsuites>
-  <filter>
-    <whitelist>
-        <directory suffix=".php">./src/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock.php
deleted file mode 100644
index 02968b1..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock.php
+++ /dev/null
@@ -1,468 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Context;
-use phpDocumentor\Reflection\DocBlock\Location;
-
-/**
- * Parses the DocBlock for any structure.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class DocBlock implements \Reflector
-{
-    /** @var string The opening line for this docblock. */
-    protected $short_description = '';
-
-    /**
-     * @var DocBlock\Description The actual
-     *     description for this docblock.
-     */
-    protected $long_description = null;
-
-    /**
-     * @var Tag[] An array containing all
-     *     the tags in this docblock; except inline.
-     */
-    protected $tags = array();
-
-    /** @var Context Information about the context of this DocBlock. */
-    protected $context = null;
-
-    /** @var Location Information about the location of this DocBlock. */
-    protected $location = null;
-
-    /** @var bool Is this DocBlock (the start of) a template? */
-    protected $isTemplateStart = false;
-
-    /** @var bool Does this DocBlock signify the end of a DocBlock template? */
-    protected $isTemplateEnd = false;
-
-    /**
-     * Parses the given docblock and populates the member fields.
-     *
-     * The constructor may also receive namespace information such as the
-     * current namespace and aliases. This information is used by some tags
-     * (e.g. @return, @param, etc.) to turn a relative Type into a FQCN.
-     *
-     * @param \Reflector|string $docblock A docblock comment (including
-     *     asterisks) or reflector supporting the getDocComment method.
-     * @param Context           $context  The context in which the DocBlock
-     *     occurs.
-     * @param Location          $location The location within the file that this
-     *     DocBlock occurs in.
-     *
-     * @throws \InvalidArgumentException if the given argument does not have the
-     *     getDocComment method.
-     */
-    public function __construct(
-        $docblock,
-        Context $context = null,
-        Location $location = null
-    ) {
-        if (is_object($docblock)) {
-            if (!method_exists($docblock, 'getDocComment')) {
-                throw new \InvalidArgumentException(
-                    'Invalid object passed; the given reflector must support '
-                    . 'the getDocComment method'
-                );
-            }
-
-            $docblock = $docblock->getDocComment();
-        }
-
-        $docblock = $this->cleanInput($docblock);
-
-        list($templateMarker, $short, $long, $tags) = $this->splitDocBlock($docblock);
-        $this->isTemplateStart = $templateMarker === '#@+';
-        $this->isTemplateEnd = $templateMarker === '#@-';
-        $this->short_description = $short;
-        $this->long_description = new DocBlock\Description($long, $this);
-        $this->parseTags($tags);
-
-        $this->context  = $context;
-        $this->location = $location;
-    }
-
-    /**
-     * Strips the asterisks from the DocBlock comment.
-     *
-     * @param string $comment String containing the comment text.
-     *
-     * @return string
-     */
-    protected function cleanInput($comment)
-    {
-        $comment = trim(
-            preg_replace(
-                '#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]{0,1}(.*)?#u',
-                '$1',
-                $comment
-            )
-        );
-
-        // reg ex above is not able to remove */ from a single line docblock
-        if (substr($comment, -2) == '*/') {
-            $comment = trim(substr($comment, 0, -2));
-        }
-
-        // normalize strings
-        $comment = str_replace(array("\r\n", "\r"), "\n", $comment);
-
-        return $comment;
-    }
-
-    /**
-     * Splits the DocBlock into a template marker, summary, description and block of tags.
-     *
-     * @param string $comment Comment to split into the sub-parts.
-     *
-     * @author Richard van Velzen (@_richardJ) Special thanks to Richard for the regex responsible for the split.
-     * @author Mike van Riel <me@mikevanriel.com> for extending the regex with template marker support.
-     *
-     * @return string[] containing the template marker (if any), summary, description and a string containing the tags.
-     */
-    protected function splitDocBlock($comment)
-    {
-        // Performance improvement cheat: if the first character is an @ then only tags are in this DocBlock. This
-        // method does not split tags so we return this verbatim as the fourth result (tags). This saves us the
-        // performance impact of running a regular expression
-        if (strpos($comment, '@') === 0) {
-            return array('', '', '', $comment);
-        }
-
-        // clears all extra horizontal whitespace from the line endings to prevent parsing issues
-        $comment = preg_replace('/\h*$/Sum', '', $comment);
-
-        /*
-         * Splits the docblock into a template marker, short description, long description and tags section
-         *
-         * - The template marker is empty, #@+ or #@- if the DocBlock starts with either of those (a newline may
-         *   occur after it and will be stripped).
-         * - The short description is started from the first character until a dot is encountered followed by a
-         *   newline OR two consecutive newlines (horizontal whitespace is taken into account to consider spacing
-         *   errors). This is optional.
-         * - The long description, any character until a new line is encountered followed by an @ and word
-         *   characters (a tag). This is optional.
-         * - Tags; the remaining characters
-         *
-         * Big thanks to RichardJ for contributing this Regular Expression
-         */
-        preg_match(
-            '/
-            \A
-            # 1. Extract the template marker
-            (?:(\#\@\+|\#\@\-)\n?)?
-
-            # 2. Extract the summary
-            (?:
-              (?! @\pL ) # The summary may not start with an @
-              (
-                [^\n.]+
-                (?:
-                  (?! \. \n | \n{2} )     # End summary upon a dot followed by newline or two newlines
-                  [\n.] (?! [ \t]* @\pL ) # End summary when an @ is found as first character on a new line
-                  [^\n.]+                 # Include anything else
-                )*
-                \.?
-              )?
-            )
-
-            # 3. Extract the description
-            (?:
-              \s*        # Some form of whitespace _must_ precede a description because a summary must be there
-              (?! @\pL ) # The description may not start with an @
-              (
-                [^\n]+
-                (?: \n+
-                  (?! [ \t]* @\pL ) # End description when an @ is found as first character on a new line
-                  [^\n]+            # Include anything else
-                )*
-              )
-            )?
-
-            # 4. Extract the tags (anything that follows)
-            (\s+ [\s\S]*)? # everything that follows
-            /ux',
-            $comment,
-            $matches
-        );
-        array_shift($matches);
-
-        while (count($matches) < 4) {
-            $matches[] = '';
-        }
-
-        return $matches;
-    }
-
-    /**
-     * Creates the tag objects.
-     *
-     * @param string $tags Tag block to parse.
-     *
-     * @return void
-     */
-    protected function parseTags($tags)
-    {
-        $result = array();
-        $tags = trim($tags);
-        if ('' !== $tags) {
-            if ('@' !== $tags[0]) {
-                throw new \LogicException(
-                    'A tag block started with text instead of an actual tag,'
-                    . ' this makes the tag block invalid: ' . $tags
-                );
-            }
-            foreach (explode("\n", $tags) as $tag_line) {
-                if (isset($tag_line[0]) && ($tag_line[0] === '@')) {
-                    $result[] = $tag_line;
-                } else {
-                    $result[count($result) - 1] .= "\n" . $tag_line;
-                }
-            }
-
-            // create proper Tag objects
-            foreach ($result as $key => $tag_line) {
-                $result[$key] = Tag::createInstance(trim($tag_line), $this);
-            }
-        }
-
-        $this->tags = $result;
-    }
-
-    /**
-     * Gets the text portion of the doc block.
-     * 
-     * Gets the text portion (short and long description combined) of the doc
-     * block.
-     * 
-     * @return string The text portion of the doc block.
-     */
-    public function getText()
-    {
-        $short = $this->getShortDescription();
-        $long = $this->getLongDescription()->getContents();
-
-        if ($long) {
-            return "{$short}\n\n{$long}";
-        } else {
-            return $short;
-        }
-    }
-
-    /**
-     * Set the text portion of the doc block.
-     * 
-     * Sets the text portion (short and long description combined) of the doc
-     * block.
-     *
-     * @param string $docblock The new text portion of the doc block.
-     * 
-     * @return $this This doc block.
-     */
-    public function setText($comment)
-    {
-        list(,$short, $long) = $this->splitDocBlock($comment);
-        $this->short_description = $short;
-        $this->long_description = new DocBlock\Description($long, $this);
-        return $this;
-    }
-    /**
-     * Returns the opening line or also known as short description.
-     *
-     * @return string
-     */
-    public function getShortDescription()
-    {
-        return $this->short_description;
-    }
-
-    /**
-     * Returns the full description or also known as long description.
-     *
-     * @return DocBlock\Description
-     */
-    public function getLongDescription()
-    {
-        return $this->long_description;
-    }
-
-    /**
-     * Returns whether this DocBlock is the start of a Template section.
-     *
-     * A Docblock may serve as template for a series of subsequent DocBlocks. This is indicated by a special marker
-     * (`#@+`) that is appended directly after the opening `/**` of a DocBlock.
-     *
-     * An example of such an opening is:
-     *
-     * ```
-     * /**#@+
-     *  * My DocBlock
-     *  * /
-     * ```
-     *
-     * The description and tags (not the summary!) are copied onto all subsequent DocBlocks and also applied to all
-     * elements that follow until another DocBlock is found that contains the closing marker (`#@-`).
-     *
-     * @see self::isTemplateEnd() for the check whether a closing marker was provided.
-     *
-     * @return boolean
-     */
-    public function isTemplateStart()
-    {
-        return $this->isTemplateStart;
-    }
-
-    /**
-     * Returns whether this DocBlock is the end of a Template section.
-     *
-     * @see self::isTemplateStart() for a more complete description of the Docblock Template functionality.
-     *
-     * @return boolean
-     */
-    public function isTemplateEnd()
-    {
-        return $this->isTemplateEnd;
-    }
-
-    /**
-     * Returns the current context.
-     *
-     * @return Context
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * Returns the current location.
-     *
-     * @return Location
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-
-    /**
-     * Returns the tags for this DocBlock.
-     *
-     * @return Tag[]
-     */
-    public function getTags()
-    {
-        return $this->tags;
-    }
-
-    /**
-     * Returns an array of tags matching the given name. If no tags are found
-     * an empty array is returned.
-     *
-     * @param string $name String to search by.
-     *
-     * @return Tag[]
-     */
-    public function getTagsByName($name)
-    {
-        $result = array();
-
-        /** @var Tag $tag */
-        foreach ($this->getTags() as $tag) {
-            if ($tag->getName() != $name) {
-                continue;
-            }
-
-            $result[] = $tag;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Checks if a tag of a certain type is present in this DocBlock.
-     *
-     * @param string $name Tag name to check for.
-     *
-     * @return bool
-     */
-    public function hasTag($name)
-    {
-        /** @var Tag $tag */
-        foreach ($this->getTags() as $tag) {
-            if ($tag->getName() == $name) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Appends a tag at the end of the list of tags.
-     *
-     * @param Tag $tag The tag to add.
-     *
-     * @return Tag The newly added tag.
-     *
-     * @throws \LogicException When the tag belongs to a different DocBlock.
-     */
-    public function appendTag(Tag $tag)
-    {
-        if (null === $tag->getDocBlock()) {
-            $tag->setDocBlock($this);
-        }
-
-        if ($tag->getDocBlock() === $this) {
-            $this->tags[] = $tag;
-        } else {
-            throw new \LogicException(
-                'This tag belongs to a different DocBlock object.'
-            );
-        }
-
-        return $tag;
-    }
-
-
-    /**
-     * Builds a string representation of this object.
-     *
-     * @todo determine the exact format as used by PHP Reflection and
-     *     implement it.
-     *
-     * @return string
-     * @codeCoverageIgnore Not yet implemented
-     */
-    public static function export()
-    {
-        throw new \Exception('Not yet implemented');
-    }
-
-    /**
-     * Returns the exported information (we should use the export static method
-     * BUT this throws an exception at this point).
-     *
-     * @return string
-     * @codeCoverageIgnore Not yet implemented
-     */
-    public function __toString()
-    {
-        return 'Not yet implemented';
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Context.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Context.php
deleted file mode 100644
index 81aa83c..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Context.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-/**
- * The context in which a DocBlock occurs.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class Context
-{
-    /** @var string The current namespace. */
-    protected $namespace = '';
-
-    /** @var array List of namespace aliases => Fully Qualified Namespace. */
-    protected $namespace_aliases = array();
-    
-    /** @var string Name of the structural element, within the namespace. */
-    protected $lsen = '';
-    
-    /**
-     * Cteates a new context.
-     * @param string $namespace         The namespace where this DocBlock
-     *     resides in.
-     * @param array  $namespace_aliases List of namespace aliases => Fully
-     *     Qualified Namespace.
-     * @param string $lsen              Name of the structural element, within
-     *     the namespace.
-     */
-    public function __construct(
-        $namespace = '',
-        array $namespace_aliases = array(),
-        $lsen = ''
-    ) {
-        if (!empty($namespace)) {
-            $this->setNamespace($namespace);
-        }
-        $this->setNamespaceAliases($namespace_aliases);
-        $this->setLSEN($lsen);
-    }
-
-    /**
-     * @return string The namespace where this DocBlock resides in.
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * @return array List of namespace aliases => Fully Qualified Namespace.
-     */
-    public function getNamespaceAliases()
-    {
-        return $this->namespace_aliases;
-    }
-    
-    /**
-     * Returns the Local Structural Element Name.
-     * 
-     * @return string Name of the structural element, within the namespace.
-     */
-    public function getLSEN()
-    {
-        return $this->lsen;
-    }
-    
-    /**
-     * Sets a new namespace.
-     * 
-     * Sets a new namespace for the context. Leading and trailing slashes are
-     * trimmed, and the keywords "global" and "default" are treated as aliases
-     * to no namespace.
-     * 
-     * @param string $namespace The new namespace to set.
-     * 
-     * @return $this
-     */
-    public function setNamespace($namespace)
-    {
-        if ('global' !== $namespace
-            && 'default' !== $namespace
-        ) {
-            // Srip leading and trailing slash
-            $this->namespace = trim((string)$namespace, '\\');
-        } else {
-            $this->namespace = '';
-        }
-        return $this;
-    }
-    
-    /**
-     * Sets the namespace aliases, replacing all previous ones.
-     * 
-     * @param array $namespace_aliases List of namespace aliases => Fully
-     *     Qualified Namespace.
-     * 
-     * @return $this
-     */
-    public function setNamespaceAliases(array $namespace_aliases)
-    {
-        $this->namespace_aliases = array();
-        foreach ($namespace_aliases as $alias => $fqnn) {
-            $this->setNamespaceAlias($alias, $fqnn);
-        }
-        return $this;
-    }
-    
-    /**
-     * Adds a namespace alias to the context.
-     * 
-     * @param string $alias The alias name (the part after "as", or the last
-     *     part of the Fully Qualified Namespace Name) to add.
-     * @param string $fqnn  The Fully Qualified Namespace Name for this alias.
-     *     Any form of leading/trailing slashes are accepted, but what will be
-     *     stored is a name, prefixed with a slash, and no trailing slash.
-     * 
-     * @return $this
-     */
-    public function setNamespaceAlias($alias, $fqnn)
-    {
-        $this->namespace_aliases[$alias] = '\\' . trim((string)$fqnn, '\\');
-        return $this;
-    }
-    
-    /**
-     * Sets a new Local Structural Element Name.
-     * 
-     * Sets a new Local Structural Element Name. A local name also contains
-     * punctuation determining the kind of structural element (e.g. trailing "("
-     * and ")" for functions and methods).
-     * 
-     * @param string $lsen The new local name of a structural element.
-     * 
-     * @return $this
-     */
-    public function setLSEN($lsen)
-    {
-        $this->lsen = (string)$lsen;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Description.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Description.php
deleted file mode 100644
index d41142e..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Description.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock;
-
-/**
- * Parses a Description of a DocBlock or tag.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class Description implements \Reflector
-{
-    /** @var string */
-    protected $contents = '';
-
-    /** @var array The contents, as an array of strings and Tag objects. */
-    protected $parsedContents = null;
-
-    /** @var DocBlock The DocBlock which this description belongs to. */
-    protected $docblock = null;
-
-    /**
-     * Populates the fields of a description.
-     *
-     * @param string   $content  The description's conetnts.
-     * @param DocBlock $docblock The DocBlock which this description belongs to.
-     */
-    public function __construct($content, DocBlock $docblock = null)
-    {
-        $this->setContent($content)->setDocBlock($docblock);
-    }
-
-    /**
-     * Gets the text of this description.
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        return $this->contents;
-    }
-
-    /**
-     * Sets the text of this description.
-     *
-     * @param string $content The new text of this description.
-     *
-     * @return $this
-     */
-    public function setContent($content)
-    {
-        $this->contents = trim($content);
-
-        $this->parsedContents = null;
-        return $this;
-    }
-
-    /**
-     * Returns the parsed text of this description.
-     *
-     * @return array An array of strings and tag objects, in the order they
-     *     occur within the description.
-     */
-    public function getParsedContents()
-    {
-        if (null === $this->parsedContents) {
-            $this->parsedContents = preg_split(
-                '/\{
-                    # "{@}" is not a valid inline tag. This ensures that
-                    # we do not treat it as one, but treat it literally.
-                    (?!@\})
-                    # We want to capture the whole tag line, but without the
-                    # inline tag delimiters.
-                    (\@
-                        # Match everything up to the next delimiter.
-                        [^{}]*
-                        # Nested inline tag content should not be captured, or
-                        # it will appear in the result separately.
-                        (?:
-                            # Match nested inline tags.
-                            (?:
-                                # Because we did not catch the tag delimiters
-                                # earlier, we must be explicit with them here.
-                                # Notice that this also matches "{}", as a way
-                                # to later introduce it as an escape sequence.
-                                \{(?1)?\}
-                                |
-                                # Make sure we match hanging "{".
-                                \{
-                            )
-                            # Match content after the nested inline tag.
-                            [^{}]*
-                        )* # If there are more inline tags, match them as well.
-                           # We use "*" since there may not be any nested inline
-                           # tags.
-                    )
-                \}/Sux',
-                $this->contents,
-                null,
-                PREG_SPLIT_DELIM_CAPTURE
-            );
-
-            $count = count($this->parsedContents);
-            for ($i=1; $i<$count; $i += 2) {
-                $this->parsedContents[$i] = Tag::createInstance(
-                    $this->parsedContents[$i],
-                    $this->docblock
-                );
-            }
-
-            //In order to allow "literal" inline tags, the otherwise invalid
-            //sequence "{@}" is changed to "@", and "{}" is changed to "}".
-            //See unit tests for examples.
-            for ($i=0; $i<$count; $i += 2) {
-                $this->parsedContents[$i] = str_replace(
-                    array('{@}', '{}'),
-                    array('@', '}'),
-                    $this->parsedContents[$i]
-                );
-            }
-        }
-        return $this->parsedContents;
-    }
-
-    /**
-     * Return a formatted variant of the Long Description using MarkDown.
-     *
-     * @todo this should become a more intelligent piece of code where the
-     *     configuration contains a setting what format long descriptions are.
-     *
-     * @codeCoverageIgnore Will be removed soon, in favor of adapters at
-     *     PhpDocumentor itself that will process text in various formats.
-     *
-     * @return string
-     */
-    public function getFormattedContents()
-    {
-        $result = $this->contents;
-
-        // if the long description contains a plain HTML <code> element, surround
-        // it with a pre element. Please note that we explicitly used str_replace
-        // and not preg_replace to gain performance
-        if (strpos($result, '<code>') !== false) {
-            $result = str_replace(
-                array('<code>', "<code>\r\n", "<code>\n", "<code>\r", '</code>'),
-                array('<pre><code>', '<code>', '<code>', '<code>', '</code></pre>'),
-                $result
-            );
-        }
-
-        if (class_exists('Parsedown')) {
-            $markdown = \Parsedown::instance();
-            $result = $markdown->parse($result);
-        } elseif (class_exists('dflydev\markdown\MarkdownExtraParser')) {
-            $markdown = new \dflydev\markdown\MarkdownExtraParser();
-            $result = $markdown->transformMarkdown($result);
-        }
-
-        return trim($result);
-    }
-
-    /**
-     * Gets the docblock this tag belongs to.
-     *
-     * @return DocBlock The docblock this description belongs to.
-     */
-    public function getDocBlock()
-    {
-        return $this->docblock;
-    }
-
-    /**
-     * Sets the docblock this tag belongs to.
-     *
-     * @param DocBlock $docblock The new docblock this description belongs to.
-     *     Setting NULL removes any association.
-     *
-     * @return $this
-     */
-    public function setDocBlock(DocBlock $docblock = null)
-    {
-        $this->docblock = $docblock;
-
-        return $this;
-    }
-
-    /**
-     * Builds a string representation of this object.
-     *
-     * @todo determine the exact format as used by PHP Reflection
-     *     and implement it.
-     *
-     * @return void
-     * @codeCoverageIgnore Not yet implemented
-     */
-    public static function export()
-    {
-        throw new \Exception('Not yet implemented');
-    }
-
-    /**
-     * Returns the long description as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getContents();
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Location.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Location.php
deleted file mode 100644
index 966ed44..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Location.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-/**
- * The location a DocBlock occurs within a file.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class Location
-{
-    /** @var int Line where the DocBlock text starts. */
-    protected $lineNumber = 0;
-
-    /** @var int Column where the DocBlock text starts. */
-    protected $columnNumber = 0;
-    
-    public function __construct(
-        $lineNumber = 0,
-        $columnNumber = 0
-    ) {
-        $this->setLineNumber($lineNumber)->setColumnNumber($columnNumber);
-    }
-
-    /**
-     * @return int Line where the DocBlock text starts.
-     */
-    public function getLineNumber()
-    {
-        return $this->lineNumber;
-    }
-
-    /**
-     * 
-     * @param type $lineNumber
-     * @return $this
-     */
-    public function setLineNumber($lineNumber)
-    {
-        $this->lineNumber = (int)$lineNumber;
-
-        return $this;
-    }
-
-    /**
-     * @return int Column where the DocBlock text starts.
-     */
-    public function getColumnNumber()
-    {
-        return $this->columnNumber;
-    }
-
-    /**
-     * 
-     * @param int $columnNumber
-     * @return $this
-     */
-    public function setColumnNumber($columnNumber)
-    {
-        $this->columnNumber = (int)$columnNumber;
-
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Serializer.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Serializer.php
deleted file mode 100644
index c161785..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Serializer.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Barry vd. Heuvel <barryvdh@gmail.com>
- * @copyright 2013 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock;
-
-/**
- * Serializes a DocBlock instance.
- *
- * @author  Barry vd. Heuvel <barryvdh@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class Serializer
-{
-
-    /** @var string The string to indent the comment with. */
-    protected $indentString = ' ';
-
-    /** @var int The number of times the indent string is repeated. */
-    protected $indent = 0;
-
-    /** @var bool Whether to indent the first line. */
-    protected $isFirstLineIndented = true;
-
-    /** @var int|null The max length of a line. */
-    protected $lineLength = null;
-
-    /**
-     * Create a Serializer instance.
-     *
-     * @param int      $indent          The number of times the indent string is
-     *     repeated.
-     * @param string   $indentString    The string to indent the comment with.
-     * @param bool     $indentFirstLine Whether to indent the first line.
-     * @param int|null $lineLength      The max length of a line or NULL to
-     *     disable line wrapping.
-     */
-    public function __construct(
-        $indent = 0,
-        $indentString = ' ',
-        $indentFirstLine = true,
-        $lineLength = null
-    ) {
-        $this->setIndentationString($indentString);
-        $this->setIndent($indent);
-        $this->setIsFirstLineIndented($indentFirstLine);
-        $this->setLineLength($lineLength);
-    }
-
-    /**
-     * Sets the string to indent comments with.
-     * 
-     * @param string $indentationString The string to indent comments with.
-     * 
-     * @return $this This serializer object.
-     */
-    public function setIndentationString($indentString)
-    {
-        $this->indentString = (string)$indentString;
-        return $this;
-    }
-
-    /**
-     * Gets the string to indent comments with.
-     * 
-     * @return string The indent string.
-     */
-    public function getIndentationString()
-    {
-        return $this->indentString;
-    }
-
-    /**
-     * Sets the number of indents.
-     * 
-     * @param int $indent The number of times the indent string is repeated.
-     * 
-     * @return $this This serializer object.
-     */
-    public function setIndent($indent)
-    {
-        $this->indent = (int)$indent;
-        return $this;
-    }
-
-    /**
-     * Gets the number of indents.
-     * 
-     * @return int The number of times the indent string is repeated.
-     */
-    public function getIndent()
-    {
-        return $this->indent;
-    }
-
-    /**
-     * Sets whether or not the first line should be indented.
-     * 
-     * Sets whether or not the first line (the one with the "/**") should be
-     * indented.
-     * 
-     * @param bool $indentFirstLine The new value for this setting.
-     * 
-     * @return $this This serializer object.
-     */
-    public function setIsFirstLineIndented($indentFirstLine)
-    {
-        $this->isFirstLineIndented = (bool)$indentFirstLine;
-        return $this;
-    }
-
-    /**
-     * Gets whether or not the first line should be indented.
-     * 
-     * @return bool Whether or not the first line should be indented.
-     */
-    public function isFirstLineIndented()
-    {
-        return $this->isFirstLineIndented;
-    }
-
-    /**
-     * Sets the line length.
-     * 
-     * Sets the length of each line in the serialization. Content will be
-     * wrapped within this limit.
-     * 
-     * @param int|null $lineLength The length of each line. NULL to disable line
-     *     wrapping altogether.
-     * 
-     * @return $this This serializer object.
-     */
-    public function setLineLength($lineLength)
-    {
-        $this->lineLength = null === $lineLength ? null : (int)$lineLength;
-        return $this;
-    }
-
-    /**
-     * Gets the line length.
-     * 
-     * @return int|null The length of each line or NULL if line wrapping is
-     *     disabled.
-     */
-    public function getLineLength()
-    {
-        return $this->lineLength;
-    }
-
-    /**
-     * Generate a DocBlock comment.
-     *
-     * @param DocBlock The DocBlock to serialize.
-     * 
-     * @return string The serialized doc block.
-     */
-    public function getDocComment(DocBlock $docblock)
-    {
-        $indent = str_repeat($this->indentString, $this->indent);
-        $firstIndent = $this->isFirstLineIndented ? $indent : '';
-
-        $text = $docblock->getText();
-        if ($this->lineLength) {
-            //3 === strlen(' * ')
-            $wrapLength = $this->lineLength - strlen($indent) - 3;
-            $text = wordwrap($text, $wrapLength);
-        }
-        $text = str_replace("\n", "\n{$indent} * ", $text);
-
-        $comment = "{$firstIndent}/**\n{$indent} * {$text}\n{$indent} *\n";
-
-        /** @var Tag $tag */
-        foreach ($docblock->getTags() as $tag) {
-            $tagText = (string) $tag;
-            if ($this->lineLength) {
-                $tagText = wordwrap($tagText, $wrapLength);
-            }
-            $tagText = str_replace("\n", "\n{$indent} * ", $tagText);
-
-            $comment .= "{$indent} * {$tagText}\n";
-        }
-
-        $comment .= $indent . ' */';
-
-        return $comment;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag.php
deleted file mode 100644
index a96db09..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag.php
+++ /dev/null
@@ -1,377 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock;
-
-use phpDocumentor\Reflection\DocBlock;
-
-/**
- * Parses a tag definition for a DocBlock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class Tag implements \Reflector
-{
-    /**
-     * PCRE regular expression matching a tag name.
-     */
-    const REGEX_TAGNAME = '[\w\-\_\\\\]+';
-
-    /** @var string Name of the tag */
-    protected $tag = '';
-
-    /**
-     * @var string|null Content of the tag.
-     *     When set to NULL, it means it needs to be regenerated.
-     */
-    protected $content = '';
-
-    /** @var string Description of the content of this tag */
-    protected $description = '';
-
-    /**
-     * @var array|null The description, as an array of strings and Tag objects.
-     *     When set to NULL, it means it needs to be regenerated.
-     */
-    protected $parsedDescription = null;
-
-    /** @var Location Location of the tag. */
-    protected $location = null;
-
-    /** @var DocBlock The DocBlock which this tag belongs to. */
-    protected $docblock = null;
-    
-    /**
-     * @var array An array with a tag as a key, and an FQCN to a class that
-     *     handles it as an array value. The class is expected to inherit this
-     *     class.
-     */
-    private static $tagHandlerMappings = array(
-        'author'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\AuthorTag',
-        'covers'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\CoversTag',
-        'deprecated'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\DeprecatedTag',
-        'example'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ExampleTag',
-        'link'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\LinkTag',
-        'method'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\MethodTag',
-        'param'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ParamTag',
-        'property-read'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyReadTag',
-        'property'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyTag',
-        'property-write'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyWriteTag',
-        'return'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ReturnTag',
-        'see'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SeeTag',
-        'since'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SinceTag',
-        'source'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SourceTag',
-        'throw'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
-        'throws'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
-        'uses'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\UsesTag',
-        'var'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\VarTag',
-        'version'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\VersionTag'
-    );
-
-    /**
-     * Factory method responsible for instantiating the correct sub type.
-     *
-     * @param string   $tag_line The text for this tag, including description.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
-     *
-     * @throws \InvalidArgumentException if an invalid tag line was presented.
-     *
-     * @return static A new tag object.
-     */
-    final public static function createInstance(
-        $tag_line,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        if (!preg_match(
-            '/^@(' . self::REGEX_TAGNAME . ')(?:\s*([^\s].*)|$)?/us',
-            $tag_line,
-            $matches
-        )) {
-            throw new \InvalidArgumentException(
-                'Invalid tag_line detected: ' . $tag_line
-            );
-        }
-
-        $handler = __CLASS__;
-        if (isset(self::$tagHandlerMappings[$matches[1]])) {
-            $handler = self::$tagHandlerMappings[$matches[1]];
-        } elseif (isset($docblock)) {
-            $tagName = (string)new Type\Collection(
-                array($matches[1]),
-                $docblock->getContext()
-            );
-
-            if (isset(self::$tagHandlerMappings[$tagName])) {
-                $handler = self::$tagHandlerMappings[$tagName];
-            }
-        }
-
-        return new $handler(
-            $matches[1],
-            isset($matches[2]) ? $matches[2] : '',
-            $docblock,
-            $location
-        );
-    }
-
-    /**
-     * Registers a handler for tags.
-     * 
-     * Registers a handler for tags. The class specified is autoloaded if it's
-     * not available. It must inherit from this class.
-     * 
-     * @param string      $tag     Name of tag to regiser a handler for. When
-     *     registering a namespaced tag, the full name, along with a prefixing
-     *     slash MUST be provided.
-     * @param string|null $handler FQCN of handler. Specifing NULL removes the
-     *     handler for the specified tag, if any.
-     * 
-     * @return bool TRUE on success, FALSE on failure.
-     */
-    final public static function registerTagHandler($tag, $handler)
-    {
-        $tag = trim((string)$tag);
-
-        if (null === $handler) {
-            unset(self::$tagHandlerMappings[$tag]);
-            return true;
-        }
-
-        if ('' !== $tag
-            && class_exists($handler, true)
-            && is_subclass_of($handler, __CLASS__)
-            && !strpos($tag, '\\') //Accept no slash, and 1st slash at offset 0.
-        ) {
-            self::$tagHandlerMappings[$tag] = $handler;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $name     Name of the tag.
-     * @param string   $content  The contents of the given tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
-     */
-    public function __construct(
-        $name,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        $this
-            ->setName($name)
-            ->setContent($content)
-            ->setDocBlock($docblock)
-            ->setLocation($location);
-    }
-
-    /**
-     * Gets the name of this tag.
-     *
-     * @return string The name of this tag.
-     */
-    public function getName()
-    {
-        return $this->tag;
-    }
-
-    /**
-     * Sets the name of this tag.
-     * 
-     * @param string $name The new name of this tag.
-     * 
-     * @return $this
-     * @throws \InvalidArgumentException When an invalid tag name is provided.
-     */
-    public function setName($name)
-    {
-        if (!preg_match('/^' . self::REGEX_TAGNAME . '$/u', $name)) {
-            throw new \InvalidArgumentException(
-                'Invalid tag name supplied: ' . $name
-            );
-        }
-
-        $this->tag = $name;
-
-        return $this;
-    }
-
-    /**
-     * Gets the content of this tag.
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = $this->description;
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * Sets the content of this tag.
-     * 
-     * @param string $content The new content of this tag.
-     * 
-     * @return $this
-     */
-    public function setContent($content)
-    {
-        $this->setDescription($content);
-        $this->content = $content;
-
-        return $this;
-    }
-
-    /**
-     * Gets the description component of this tag.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Sets the description component of this tag.
-     * 
-     * @param string $description The new description component of this tag.
-     * 
-     * @return $this
-     */
-    public function setDescription($description)
-    {
-        $this->content = null;
-        $this->parsedDescription = null;
-        $this->description = trim($description);
-
-        return $this;
-    }
-
-    /**
-     * Gets the parsed text of this description.
-     * 
-     * @return array An array of strings and tag objects, in the order they
-     *     occur within the description.
-     */
-    public function getParsedDescription()
-    {
-        if (null === $this->parsedDescription) {
-            $description = new Description($this->description, $this->docblock);
-            $this->parsedDescription = $description->getParsedContents();
-        }
-        return $this->parsedDescription;
-    }
-
-    /**
-     * Gets the docblock this tag belongs to.
-     * 
-     * @return DocBlock The docblock this tag belongs to.
-     */
-    public function getDocBlock()
-    {
-        return $this->docblock;
-    }
-
-    /**
-     * Sets the docblock this tag belongs to.
-     * 
-     * @param DocBlock $docblock The new docblock this tag belongs to. Setting
-     *     NULL removes any association.
-     * 
-     * @return $this
-     */
-    public function setDocBlock(DocBlock $docblock = null)
-    {
-        $this->docblock = $docblock;
-
-        return $this;
-    }
-
-    /**
-     * Gets the location of the tag.
-     *
-     * @return Location The tag's location.
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-    
-    /**
-     * Sets the location of the tag.
-     * 
-     * @param Location $location The new location of the tag.
-     * 
-     * @return $this
-     */
-    public function setLocation(Location $location = null)
-    {
-        $this->location = $location;
-
-        return $this;
-    }
-
-    /**
-     * Builds a string representation of this object.
-     *
-     * @todo determine the exact format as used by PHP Reflection and implement it.
-     *
-     * @return void
-     * @codeCoverageIgnore Not yet implemented
-     */
-    public static function export()
-    {
-        throw new \Exception('Not yet implemented');
-    }
-
-    /**
-     * Returns the tag as a serialized string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return "@{$this->getName()} {$this->getContent()}";
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php
deleted file mode 100644
index bacf52e..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/AuthorTag.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for an @author tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class AuthorTag extends Tag
-{
-    /**
-     * PCRE regular expression matching any valid value for the name component.
-     */
-    const REGEX_AUTHOR_NAME = '[^\<]*';
-
-    /**
-     * PCRE regular expression matching any valid value for the email component.
-     */
-    const REGEX_AUTHOR_EMAIL = '[^\>]*';
-
-    /** @var string The name of the author */
-    protected $authorName = '';
-
-    /** @var string The email of the author */
-    protected $authorEmail = '';
-    
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = $this->authorName;
-            if ('' != $this->authorEmail) {
-                $this->content .= "<{$this->authorEmail}>";
-            }
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-        if (preg_match(
-            '/^(' . self::REGEX_AUTHOR_NAME .
-            ')(\<(' . self::REGEX_AUTHOR_EMAIL .
-            ')\>)?$/u',
-            $this->description,
-            $matches
-        )) {
-            $this->authorName = trim($matches[1]);
-            if (isset($matches[3])) {
-                $this->authorEmail = trim($matches[3]);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the author's name.
-     * 
-     * @return string The author's name.
-     */
-    public function getAuthorName()
-    {
-        return $this->authorName;
-    }
-    
-    /**
-     * Sets the author's name.
-     * 
-     * @param string $authorName The new author name.
-     *     An invalid value will set an empty string.
-     * 
-     * @return $this
-     */
-    public function setAuthorName($authorName)
-    {
-        $this->content = null;
-        $this->authorName
-            = preg_match('/^' . self::REGEX_AUTHOR_NAME . '$/u', $authorName)
-            ? $authorName : '';
-
-        return $this;
-    }
-
-    /**
-     * Gets the author's email.
-     * 
-     * @return string The author's email.
-     */
-    public function getAuthorEmail()
-    {
-        return $this->authorEmail;
-    }
-    
-    /**
-     * Sets the author's email.
-     * 
-     * @param string $authorEmail The new author email.
-     *     An invalid value will set an empty string.
-     * 
-     * @return $this
-     */
-    public function setAuthorEmail($authorEmail)
-    {
-        $this->authorEmail
-            = preg_match('/^' . self::REGEX_AUTHOR_EMAIL . '$/u', $authorEmail)
-            ? $authorEmail : '';
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/CoversTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/CoversTag.php
deleted file mode 100644
index bd31b56..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/CoversTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @covers tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class CoversTag extends SeeTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/DeprecatedTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/DeprecatedTag.php
deleted file mode 100644
index 7226316..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/DeprecatedTag.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
-
-/**
- * Reflection class for a @deprecated tag in a Docblock.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class DeprecatedTag extends VersionTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ExampleTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ExampleTag.php
deleted file mode 100644
index 0e163ea..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ExampleTag.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @example tag in a Docblock.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class ExampleTag extends SourceTag
-{
-    /** 
-     * @var string Path to a file to use as an example.
-     *     May also be an absolute URI.
-     */
-    protected $filePath = '';
-
-    /**
-     * @var bool Whether the file path component represents an URI.
-     *     This determines how the file portion appears at {@link getContent()}.
-     */
-    protected $isURI = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $filePath = '';
-            if ($this->isURI) {
-                if (false === strpos($this->filePath, ':')) {
-                    $filePath = str_replace(
-                        '%2F',
-                        '/',
-                        rawurlencode($this->filePath)
-                    );
-                } else {
-                    $filePath = $this->filePath;
-                }
-            } else {
-                $filePath = '"' . $this->filePath . '"';
-            }
-
-            $this->content = $filePath . ' ' . parent::getContent();
-        }
-
-        return $this->content;
-    }
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        Tag::setContent($content);
-        if (preg_match(
-            '/^
-                # File component
-                (?:
-                    # File path in quotes
-                    \"([^\"]+)\"
-                    |
-                    # File URI
-                    (\S+)
-                )
-                # Remaining content (parsed by SourceTag)
-                (?:\s+(.*))?
-            $/sux',
-            $this->description,
-            $matches
-        )) {
-            if ('' !== $matches[1]) {
-                $this->setFilePath($matches[1]);
-            } else {
-                $this->setFileURI($matches[2]);
-            }
-
-            if (isset($matches[3])) {
-                parent::setContent($matches[3]);
-            } else {
-                $this->setDescription('');
-            }
-            $this->content = $content;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the file path.
-     *
-     * @return string Path to a file to use as an example.
-     *     May also be an absolute URI.
-     */
-    public function getFilePath()
-    {
-        return $this->filePath;
-    }
-    
-    /**
-     * Sets the file path.
-     * 
-     * @param string $filePath The new file path to use for the example.
-     * 
-     * @return $this
-     */
-    public function setFilePath($filePath)
-    {
-        $this->isURI = false;
-        $this->filePath = trim($filePath);
-
-        $this->content = null;
-        return $this;
-    }
-    
-    /**
-     * Sets the file path as an URI.
-     * 
-     * This function is equivalent to {@link setFilePath()}, except that it
-     * convers an URI to a file path before that.
-     * 
-     * There is no getFileURI(), as {@link getFilePath()} is compatible.
-     * 
-     * @param type $uri The new file URI to use as an example.
-     */
-    public function setFileURI($uri)
-    {
-        $this->isURI = true;
-        if (false === strpos($uri, ':')) {
-            //Relative URL
-            $this->filePath = rawurldecode(
-                str_replace(array('/', '\\'), '%2F', $uri)
-            );
-        } else {
-            //Absolute URL or URI.
-            $this->filePath = $uri;
-        }
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php
deleted file mode 100644
index f79f25d..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/LinkTag.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Ben Selby <benmatselby@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @link tag in a Docblock.
- *
- * @author  Ben Selby <benmatselby@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class LinkTag extends Tag
-{
-    /** @var string */
-    protected $link = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = "{$this->link} {$this->description}";
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-        $parts = preg_split('/\s+/Su', $this->description, 2);
-
-        $this->link = $parts[0];
-
-        $this->setDescription(isset($parts[1]) ? $parts[1] : $parts[0]);
-
-        $this->content = $content;
-        return $this;
-    }
-
-    /**
-    * Gets the link
-    *
-    * @return string
-    */
-    public function getLink()
-    {
-        return $this->link;
-    }
-
-    /**
-    * Sets the link
-    *
-    * @param string $link The link
-    *
-    * @return $this
-    */
-    public function setLink($link)
-    {
-        $this->link = $link;
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php
deleted file mode 100644
index 7a5ce79..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/MethodTag.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @method in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class MethodTag extends ReturnTag
-{
-
-    /** @var string */
-    protected $method_name = '';
-
-    /** @var string */
-    protected $arguments = '';
-    
-    /** @var bool */
-    protected $isStatic = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = '';
-            if ($this->isStatic) {
-                $this->content .= 'static ';
-            }
-            $this->content .= $this->type .
-                " {$this->method_name}({$this->arguments}) " .
-                $this->description;
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        Tag::setContent($content);
-        // 1. none or more whitespace
-        // 2. optionally the keyword "static" followed by whitespace
-        // 3. optionally a word with underscores followed by whitespace : as
-        //    type for the return value
-        // 4. then optionally a word with underscores followed by () and
-        //    whitespace : as method name as used by phpDocumentor
-        // 5. then a word with underscores, followed by ( and any character
-        //    until a ) and whitespace : as method name with signature
-        // 6. any remaining text : as description
-        if (preg_match(
-            '/^
-                # Static keyword
-                # Declates a static method ONLY if type is also present
-                (?:
-                    (static)
-                    \s+
-                )?
-                # Return type
-                (?:
-                    ([\w\|_\\\\]+)
-                    \s+
-                )?
-                # Legacy method name (not captured)
-                (?:
-                    [\w_]+\(\)\s+
-                )?
-                # Method name
-                ([\w\|_\\\\]+)
-                # Arguments
-                \(([^\)]*)\)
-                \s*
-                # Description
-                (.*)
-            $/sux',
-            $this->description,
-            $matches
-        )) {
-            list(
-                ,
-                $static,
-                $this->type,
-                $this->method_name,
-                $this->arguments,
-                $this->description
-            ) = $matches;
-            if ($static) {
-                if (!$this->type) {
-                    $this->type = 'static';
-                } else {
-                    $this->isStatic = true;
-                }
-            } else {
-                if (!$this->type) {
-                    $this->type = 'void';
-                }
-            }
-            $this->parsedDescription = null;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the name of this method.
-     *
-     * @param string $method_name The name of the method.
-     *
-     * @return $this
-     */
-    public function setMethodName($method_name)
-    {
-        $this->method_name = $method_name;
-
-        $this->content = null;
-        return $this;
-    }
-
-    /**
-     * Retrieves the method name.
-     *
-     * @return string
-     */
-    public function getMethodName()
-    {
-        return $this->method_name;
-    }
-
-    /**
-     * Sets the arguments for this method.
-     *
-     * @param string $arguments A comma-separated arguments line.
-     *
-     * @return void
-     */
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-
-        $this->content = null;
-        return $this;
-    }
-
-    /**
-     * Returns an array containing each argument as array of type and name.
-     *
-     * Please note that the argument sub-array may only contain 1 element if no
-     * type was specified.
-     *
-     * @return string[]
-     */
-    public function getArguments()
-    {
-        if (empty($this->arguments)) {
-            return array();
-        }
-
-        $arguments = explode(',', $this->arguments);
-        foreach ($arguments as $key => $value) {
-            $arguments[$key] = explode(' ', trim($value));
-        }
-
-        return $arguments;
-    }
-    
-    /**
-     * Checks whether the method tag describes a static method or not.
-     * 
-     * @return bool TRUE if the method declaration is for a static method, FALSE
-     *     otherwise.
-     */
-    public function isStatic()
-    {
-        return $this->isStatic;
-    }
-    
-    /**
-     * Sets a new value for whether the method is static or not.
-     * 
-     * @param bool $isStatic The new value to set.
-     * 
-     * @return $this
-     */
-    public function setIsStatic($isStatic)
-    {
-        $this->isStatic = $isStatic;
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php
deleted file mode 100644
index 9bc0270..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ParamTag.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @param tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class ParamTag extends ReturnTag
-{
-    /** @var string */
-    protected $variableName = '';
-
-    /** @var bool determines whether this is a variadic argument */
-    protected $isVariadic = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content
-                = "{$this->type} {$this->variableName} {$this->description}";
-        }
-        return $this->content;
-    }
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        Tag::setContent($content);
-        $parts = preg_split(
-            '/(\s+)/Su',
-            $this->description,
-            3,
-            PREG_SPLIT_DELIM_CAPTURE
-        );
-
-        // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0])
-            && (strlen($parts[0]) > 0)
-            && ($parts[0][0] !== '$')
-        ) {
-            $this->type = array_shift($parts);
-            array_shift($parts);
-        }
-
-        // if the next item starts with a $ or ...$ it must be the variable name
-        if (isset($parts[0])
-            && (strlen($parts[0]) > 0)
-            && ($parts[0][0] == '$' || substr($parts[0], 0, 4) === '...$')
-        ) {
-            $this->variableName = array_shift($parts);
-            array_shift($parts);
-
-            if (substr($this->variableName, 0, 3) === '...') {
-                $this->isVariadic = true;
-                $this->variableName = substr($this->variableName, 3);
-            }
-        }
-
-        $this->setDescription(implode('', $parts));
-
-        $this->content = $content;
-        return $this;
-    }
-
-    /**
-     * Returns the variable's name.
-     *
-     * @return string
-     */
-    public function getVariableName()
-    {
-        return $this->variableName;
-    }
-
-    /**
-     * Sets the variable's name.
-     *
-     * @param string $name The new name for this variable.
-     *
-     * @return $this
-     */
-    public function setVariableName($name)
-    {
-        $this->variableName = $name;
-
-        $this->content = null;
-        return $this;
-    }
-
-    /**
-     * Returns whether this tag is variadic.
-     *
-     * @return boolean
-     */
-    public function isVariadic()
-    {
-        return $this->isVariadic;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php
deleted file mode 100644
index 3340602..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyReadTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @property-read tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class PropertyReadTag extends PropertyTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php
deleted file mode 100644
index 288ecff..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @property tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class PropertyTag extends ParamTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php
deleted file mode 100644
index ec4e866..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/PropertyWriteTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @property-write tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class PropertyWriteTag extends PropertyTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
deleted file mode 100644
index 9293db9..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ReturnTag.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Type\Collection;
-
-/**
- * Reflection class for a @return tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class ReturnTag extends Tag
-{
-    /** @var string The raw type component. */
-    protected $type = '';
-    
-    /** @var Collection The parsed type component. */
-    protected $types = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = "{$this->type} {$this->description}";
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-
-        $parts = preg_split('/\s+/Su', $this->description, 2);
-
-        // any output is considered a type
-        $this->type = $parts[0];
-        $this->types = null;
-
-        $this->setDescription(isset($parts[1]) ? $parts[1] : '');
-
-        $this->content = $content;
-        return $this;
-    }
-
-    /**
-     * Returns the unique types of the variable.
-     *
-     * @return string[]
-     */
-    public function getTypes()
-    {
-        return $this->getTypesCollection()->getArrayCopy();
-    }
-
-    /**
-     * Returns the type section of the variable.
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return (string) $this->getTypesCollection();
-    }
-
-    /**
-     * Returns the type collection.
-     * 
-     * @return void
-     */
-    protected function getTypesCollection()
-    {
-        if (null === $this->types) {
-            $this->types = new Collection(
-                array($this->type),
-                $this->docblock ? $this->docblock->getContext() : null
-            );
-        }
-        return $this->types;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php
deleted file mode 100644
index 4f5f22c..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SeeTag.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @see tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class SeeTag extends Tag
-{
-    /** @var string */
-    protected $refers = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = "{$this->refers} {$this->description}";
-        }
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-        $parts = preg_split('/\s+/Su', $this->description, 2);
-
-        // any output is considered a type
-        $this->refers = $parts[0];
-
-        $this->setDescription(isset($parts[1]) ? $parts[1] : '');
-
-        $this->content = $content;
-        return $this;
-    }
-
-    /**
-     * Gets the structural element this tag refers to.
-     *
-     * @return string
-     */
-    public function getReference()
-    {
-        return $this->refers;
-    }
-
-    /**
-     * Sets the structural element this tag refers to.
-     * 
-     * @param string $refers The new type this tag refers to.
-     * 
-     * @return $this
-     */
-    public function setReference($refers)
-    {
-        $this->refers = $refers;
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SinceTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SinceTag.php
deleted file mode 100644
index ba009c4..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SinceTag.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
-
-/**
- * Reflection class for a @since tag in a Docblock.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class SinceTag extends VersionTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SourceTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SourceTag.php
deleted file mode 100644
index 3400220..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/SourceTag.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @source tag in a Docblock.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class SourceTag extends Tag
-{
-    /**
-     * @var int The starting line, relative to the structural element's
-     *     location.
-     */
-    protected $startingLine = 1;
-
-    /** 
-     * @var int|null The number of lines, relative to the starting line. NULL
-     *     means "to the end".
-     */
-    protected $lineCount = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content
-                = "{$this->startingLine} {$this->lineCount} {$this->description}";
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-        if (preg_match(
-            '/^
-                # Starting line
-                ([1-9]\d*)
-                \s*
-                # Number of lines
-                (?:
-                    ((?1))
-                    \s+
-                )?
-                # Description
-                (.*)
-            $/sux',
-            $this->description,
-            $matches
-        )) {
-            $this->startingLine = (int)$matches[1];
-            if (isset($matches[2]) && '' !== $matches[2]) {
-                $this->lineCount = (int)$matches[2];
-            }
-            $this->setDescription($matches[3]);
-            $this->content = $content;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the starting line.
-     *
-     * @return int The starting line, relative to the structural element's
-     *     location.
-     */
-    public function getStartingLine()
-    {
-        return $this->startingLine;
-    }
-
-    /**
-     * Sets the starting line.
-     * 
-     * @param int $startingLine The new starting line, relative to the
-     *     structural element's location.
-     * 
-     * @return $this
-     */
-    public function setStartingLine($startingLine)
-    {
-        $this->startingLine = $startingLine;
-
-        $this->content = null;
-        return $this;
-    }
-
-    /**
-     * Returns the number of lines.
-     *
-     * @return int|null The number of lines, relative to the starting line. NULL
-     *     means "to the end".
-     */
-    public function getLineCount()
-    {
-        return $this->lineCount;
-    }
-
-    /**
-     * Sets the number of lines.
-     * 
-     * @param int|null $lineCount The new number of lines, relative to the
-     *     starting line. NULL means "to the end".
-     * 
-     * @return $this
-     */
-    public function setLineCount($lineCount)
-    {
-        $this->lineCount = $lineCount;
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php
deleted file mode 100644
index 58ee44a..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/ThrowsTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @throws tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class ThrowsTag extends ReturnTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php
deleted file mode 100644
index da0d663..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/UsesTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @uses tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class UsesTag extends SeeTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php
deleted file mode 100644
index 236b2c8..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VarTag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @var tag in a Docblock.
- *
- * @author  Mike van Riel <mike.vanriel@naenius.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class VarTag extends ParamTag
-{
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VersionTag.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VersionTag.php
deleted file mode 100644
index 260f698..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Tag/VersionTag.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Vasil Rangelov <boen.robot@gmail.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tag;
-
-use phpDocumentor\Reflection\DocBlock\Tag;
-
-/**
- * Reflection class for a @version tag in a Docblock.
- *
- * @author  Vasil Rangelov <boen.robot@gmail.com>
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link    http://phpdoc.org
- */
-class VersionTag extends Tag
-{
-    /**
-     * PCRE regular expression matching a version vector.
-     * Assumes the "x" modifier.
-     */
-    const REGEX_VECTOR = '(?:
-        # Normal release vectors.
-        \d\S*
-        |
-        # VCS version vectors. Per PHPCS, they are expected to
-        # follow the form of the VCS name, followed by ":", followed
-        # by the version vector itself.
-        # By convention, popular VCSes like CVS, SVN and GIT use "$"
-        # around the actual version vector.
-        [^\s\:]+\:\s*\$[^\$]+\$
-    )';
-
-    /** @var string The version vector. */
-    protected $version = '';
-    
-    public function getContent()
-    {
-        if (null === $this->content) {
-            $this->content = "{$this->version} {$this->description}";
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContent($content)
-    {
-        parent::setContent($content);
-
-        if (preg_match(
-            '/^
-                # The version vector
-                (' . self::REGEX_VECTOR . ')
-                \s*
-                # The description
-                (.+)?
-            $/sux',
-            $this->description,
-            $matches
-        )) {
-            $this->version = $matches[1];
-            $this->setDescription(isset($matches[2]) ? $matches[2] : '');
-            $this->content = $content;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the version section of the tag.
-     *
-     * @return string The version section of the tag.
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-    
-    /**
-     * Sets the version section of the tag.
-     * 
-     * @param string $version The new version section of the tag.
-     *     An invalid value will set an empty string.
-     * 
-     * @return $this
-     */
-    public function setVersion($version)
-    {
-        $this->version
-            = preg_match('/^' . self::REGEX_VECTOR . '$/ux', $version)
-            ? $version
-            : '';
-
-        $this->content = null;
-        return $this;
-    }
-}
diff --git a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Type/Collection.php b/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Type/Collection.php
deleted file mode 100644
index 90ead3f..0000000
--- a/vendor/phpdocumentor/reflection-docblock/src/phpDocumentor/Reflection/DocBlock/Type/Collection.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-/**
- * phpDocumentor
- *
- * PHP Version 5.3
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Type;
-
-use phpDocumentor\Reflection\DocBlock\Context;
-
-/**
- * Collection
- *
- * @author    Mike van Riel <mike.vanriel@naenius.com>
- * @copyright 2010-2011 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-class Collection extends \ArrayObject
-{
-    /** @var string Definition of the OR operator for types */
-    const OPERATOR_OR = '|';
-
-    /** @var string Definition of the ARRAY operator for types */
-    const OPERATOR_ARRAY = '[]';
-
-    /** @var string Definition of the NAMESPACE operator in PHP */
-    const OPERATOR_NAMESPACE = '\\';
-
-    /** @var string[] List of recognized keywords */
-    protected static $keywords = array(
-        'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double',
-        'object', 'mixed', 'array', 'resource', 'void', 'null', 'scalar',
-        'callback', 'callable', 'false', 'true', 'self', '$this', 'static'
-    );
-
-    /**
-     * Current invoking location.
-     *
-     * This is used to prepend to type with a relative location.
-     * May also be 'default' or 'global', in which case they are ignored.
-     *
-     * @var Context
-     */
-    protected $context = null;
-
-    /**
-     * Registers the namespace and aliases; uses that to add and expand the
-     * given types.
-     *
-     * @param string[] $types    Array containing a list of types to add to this
-     *     container.
-     * @param Context  $location The current invoking location.
-     */
-    public function __construct(
-        array $types = array(),
-        Context $context = null
-    ) {
-        $this->context = null === $context ? new Context() : $context;
-
-        foreach ($types as $type) {
-            $this->add($type);
-        }
-    }
-
-    /**
-     * Returns the current invoking location.
-     *
-     * @return Context
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * Adds a new type to the collection and expands it if it contains a
-     * relative namespace.
-     *
-     * If a class in the type contains a relative namespace than this collection
-     * will try to expand that into a FQCN.
-     *
-     * @param string $type A 'Type' as defined in the phpDocumentor
-     *     documentation.
-     *
-     * @throws \InvalidArgumentException if a non-string argument is passed.
-     *
-     * @see http://phpdoc.org/docs/latest/for-users/types.html for the
-     *     definition of a type.
-     *
-     * @return void
-     */
-    public function add($type)
-    {
-        if (!is_string($type)) {
-            throw new \InvalidArgumentException(
-                'A type should be represented by a string, received: '
-                .var_export($type, true)
-            );
-        }
-
-        // separate the type by the OR operator
-        $type_parts = explode(self::OPERATOR_OR, $type);
-        foreach ($type_parts as $part) {
-            $expanded_type = $this->expand($part);
-            if ($expanded_type) {
-                $this[] = $expanded_type;
-            }
-        }
-    }
-    
-    /**
-     * Returns a string representation of the collection.
-     * 
-     * @return string The resolved types across the collection, separated with
-     *     {@link self::OPERATOR_OR}.
-     */
-    public function __toString()
-    {
-        return implode(self::OPERATOR_OR, $this->getArrayCopy());
-    }
-
-    /**
-     * Analyzes the given type and returns the FQCN variant.
-     *
-     * When a type is provided this method checks whether it is not a keyword or
-     * Fully Qualified Class Name. If so it will use the given namespace and
-     * aliases to expand the type to a FQCN representation.
-     *
-     * This method only works as expected if the namespace and aliases are set;
-     * no dynamic reflection is being performed here.
-     *
-     * @param string $type The relative or absolute type.
-     *
-     * @uses getNamespace to determine with what to prefix the type name.
-     * @uses getNamespaceAliases to check whether the first part of the relative
-     *     type name should not be replaced with another namespace.
-     *
-     * @return string
-     */
-    protected function expand($type)
-    {
-        $type = trim($type);
-        if (!$type) {
-            return '';
-        }
-
-        if ($this->isTypeAnArray($type)) {
-            return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
-        }
-
-        if ($this->isRelativeType($type) && !$this->isTypeAKeyword($type)) {
-            $type_parts = explode(self::OPERATOR_NAMESPACE, $type, 2);
-
-            $namespace_aliases = $this->context->getNamespaceAliases();
-            // if the first segment is not an alias; prepend namespace name and
-            // return
-            if (!isset($namespace_aliases[$type_parts[0]])) {
-                $namespace = $this->context->getNamespace();
-                if ('' !== $namespace) {
-                    $namespace .= self::OPERATOR_NAMESPACE;
-                }
-                return self::OPERATOR_NAMESPACE . $namespace . $type;
-            }
-
-            $type_parts[0] = $namespace_aliases[$type_parts[0]];
-            $type = implode(self::OPERATOR_NAMESPACE, $type_parts);
-        }
-
-        return $type;
-    }
-
-    /**
-     * Detects whether the given type represents an array.
-     *
-     * @param string $type A relative or absolute type as defined in the
-     *     phpDocumentor documentation.
-     *
-     * @return bool
-     */
-    protected function isTypeAnArray($type)
-    {
-        return substr($type, -2) === self::OPERATOR_ARRAY;
-    }
-
-    /**
-     * Detects whether the given type represents a PHPDoc keyword.
-     *
-     * @param string $type A relative or absolute type as defined in the
-     *     phpDocumentor documentation.
-     *
-     * @return bool
-     */
-    protected function isTypeAKeyword($type)
-    {
-        return in_array(strtolower($type), static::$keywords, true);
-    }
-
-    /**
-     * Detects whether the given type represents a relative or absolute path.
-     *
-     * This method will detect keywords as being absolute; even though they are
-     * not preceeded by a namespace separator.
-     *
-     * @param string $type A relative or absolute type as defined in the
-     *     phpDocumentor documentation.
-     *
-     * @return bool
-     */
-    protected function isRelativeType($type)
-    {
-        return ($type[0] !== self::OPERATOR_NAMESPACE)
-            || $this->isTypeAKeyword($type);
-    }
-}
diff --git a/vendor/phpspec/prophecy/.gitignore b/vendor/phpspec/prophecy/.gitignore
deleted file mode 100644
index c50c8c4..0000000
--- a/vendor/phpspec/prophecy/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tgz
-*.phar
-bin
-vendor
diff --git a/vendor/phpspec/prophecy/.travis.yml b/vendor/phpspec/prophecy/.travis.yml
deleted file mode 100644
index 004e612..0000000
--- a/vendor/phpspec/prophecy/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: php
-
-php: [5.3, 5.4, 5.5, 5.6, 7, hhvm]
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-branches:
-  except:
-    - /^bugfix\/.*$/
-    - /^feature\/.*$/
-    - /^optimization\/.*$/
-
-before_script: travis_retry composer install --no-interaction
-
-script: vendor/bin/phpspec run -fpretty -v
diff --git a/vendor/phpspec/prophecy/CHANGES.md b/vendor/phpspec/prophecy/CHANGES.md
deleted file mode 100644
index c293f0d..0000000
--- a/vendor/phpspec/prophecy/CHANGES.md
+++ /dev/null
@@ -1,122 +0,0 @@
-1.5.0 / 2015-04-27
-==================
-
-  * Add support for PHP7 scalar type hints (thanks @trowski)
-  * Add support for PHP7 return types (thanks @trowski)
-  * Update internal test suite to support PHP7
-
-1.4.1 / 2015-04-27
-==================
-
-  * Fixed bug in closure-based argument tokens (#181)
-
-1.4.0 / 2015-03-27
-==================
-
-  * Fixed errors in return type phpdocs (thanks @sobit)
-  * Fixed stringifying of hash containing one value (thanks @avant1)
-  * Improved clarity of method call expectation exception (thanks @dantleech)
-  * Add ability to specify which argument is returned in willReturnArgument (thanks @coderbyheart)
-  * Add more information to MethodNotFound exceptions (thanks @ciaranmcnulty)
-  * Support for mocking classes with methods that return references (thanks @edsonmedina)
-  * Improved object comparison (thanks @whatthejeff)
-  * Adopted '^' in composer dependencies (thanks @GrahamCampbell)
-  * Fixed non-typehinted arguments being treated as optional (thanks @whatthejeff)
-  * Magic methods are now filtered for keywords (thanks @seagoj)
-  * More readable errors for failure when expecting single calls (thanks @dantleech)
-
-1.3.1 / 2014-11-17
-==================
-
-  * Fix the edge case when failed predictions weren't recorded for `getCheckedPredictions()`
-
-1.3.0 / 2014-11-14
-==================
-
-  * Add a way to get checked predictions with `MethodProphecy::getCheckedPredictions()`
-  * Fix HHVM compatibility
-  * Remove dead code (thanks @stof)
-  * Add support for DirectoryIterators (thanks @shanethehat)
-
-1.2.0 / 2014-07-18
-==================
-
-  * Added support for doubling magic methods documented in the class phpdoc (thanks @armetiz)
-  * Fixed a segfault appearing in some cases (thanks @dmoreaulf)
-  * Fixed the doubling of methods with typehints on non-existent classes (thanks @gquemener)
-  * Added support for internal classes using keywords as method names (thanks @milan)
-  * Added IdenticalValueToken and Argument::is (thanks @florianv)
-  * Removed the usage of scalar typehints in HHVM as HHVM 3 does not support them anymore in PHP code (thanks @whatthejeff)
-
-1.1.2 / 2014-01-24
-==================
-
-  * Spy automatically promotes spied method call to an expected one
-
-1.1.1 / 2014-01-15
-==================
-
-  * Added support for HHVM
-
-1.1.0 / 2014-01-01
-==================
-
-  * Changed the generated class names to use a static counter instead of a random number
-  * Added a clss patch for ReflectionClass::newInstance to make its argument optional consistently (thanks @docteurklein)
-  * Fixed mirroring of classes with typehints on non-existent classes (thanks @docteurklein)
-  * Fixed the support of array callables in CallbackPromise and CallbackPrediction (thanks @ciaranmcnulty)
-  * Added support for properties in ObjectStateToken (thanks @adrienbrault)
-  * Added support for mocking classes with a final constructor (thanks @ciaranmcnulty)
-  * Added ArrayEveryEntryToken and Argument::withEveryEntry() (thanks @adrienbrault)
-  * Added an exception when trying to prophesize on a final method instead of ignoring silently (thanks @docteurklein)
-  * Added StringContainToken and Argument::containingString() (thanks @peterjmit)
-  * Added ``shouldNotHaveBeenCalled`` on the MethodProphecy (thanks @ciaranmcnulty)
-  * Fixed the comparison of objects in ExactValuetoken (thanks @sstok)
-  * Deprecated ``shouldNotBeenCalled`` in favor of ``shouldNotHaveBeenCalled``
-
-1.0.4 / 2013-08-10
-==================
-
-  * Better randomness for generated class names (thanks @sstok)
-  * Add support for interfaces into TypeToken and Argument::type() (thanks @sstok)
-  * Add support for old-style (method name === class name) constructors (thanks @l310 for report)
-
-1.0.3 / 2013-07-04
-==================
-
-  * Support callable typehints (thanks @stof)
-  * Do not attempt to autoload arrays when generating code (thanks @MarcoDeBortoli)
-  * New ArrayEntryToken (thanks @kagux)
-
-1.0.2 / 2013-05-19
-==================
-
-  * Logical `AND` token added (thanks @kagux)
-  * Logical `NOT` token added (thanks @kagux)
-  * Add support for setting custom constructor arguments
-  * Properly stringify hashes
-  * Record calls that throw exceptions
-  * Migrate spec suite to PhpSpec 2.0
-
-1.0.1 / 2013-04-30
-==================
-
-  * Fix broken UnexpectedCallException message
-  * Trim AggregateException message
-
-1.0.0 / 2013-04-29
-==================
-
-  * Improve exception messages
-
-1.0.0-BETA2 / 2013-04-03
-========================
-
-  * Add more debug information to CallTimes and Call prediction exception messages
-  * Fix MethodNotFoundException wrong namespace (thanks @gunnarlium)
-  * Fix some typos in the exception messages (thanks @pborreli)
-
-1.0.0-BETA1 / 2013-03-25
-========================
-
-  * Initial release
diff --git a/vendor/phpspec/prophecy/CONTRIBUTING.md b/vendor/phpspec/prophecy/CONTRIBUTING.md
deleted file mode 100644
index 3674aac..0000000
--- a/vendor/phpspec/prophecy/CONTRIBUTING.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Contributing
-------------
-
-Prophecy is an open source, community-driven project. If you'd like to contribute,
-feel free to do this, but remember to follow this few simple rules:
-
-- Make your feature addition or bug fix,
-- Add either specs or examples for any changes you're making (bugfixes or additions)
-  (please look into `spec/` folder for some examples). This is important so we don't break
-  it in a future version unintentionally,
-- Commit your code, but do not mess with `CHANGES.md`,
-
-Running tests
--------------
-
-Make sure that you don't break anything with your changes by running:
-
-```bash
-$> composer install --dev --prefer-dist
-$> vendor/bin/phpspec run
-```
diff --git a/vendor/phpspec/prophecy/LICENSE b/vendor/phpspec/prophecy/LICENSE
deleted file mode 100644
index c8b3647..0000000
--- a/vendor/phpspec/prophecy/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2013 Konstantin Kudryashov <ever.zet@gmail.com>
-                   Marcello Duarte <marcello.duarte@gmail.com>
-
-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/vendor/phpspec/prophecy/README.md b/vendor/phpspec/prophecy/README.md
deleted file mode 100644
index 17e57c3..0000000
--- a/vendor/phpspec/prophecy/README.md
+++ /dev/null
@@ -1,390 +0,0 @@
-# Prophecy
-
-[![Build Status](https://travis-ci.org/phpspec/prophecy.svg?branch=master)](https://travis-ci.org/phpspec/prophecy)
-
-Prophecy is a highly opinionated yet very powerful and flexible PHP object mocking
-framework. Though initially it was created to fulfil phpspec2 needs, it is flexible
-enough to be used inside any testing framework out there with minimal effort.
-
-## A simple example
-
-```php
-<?php
-
-class UserTest extends PHPUnit_Framework_TestCase
-{
-    private $prophet;
-
-    public function testPasswordHashing()
-    {
-        $hasher = $this->prophet->prophesize('App\Security\Hasher');
-        $user   = new App\Entity\User($hasher->reveal());
-
-        $hasher->generateHash($user, 'qwerty')->willReturn('hashed_pass');
-
-        $user->setPassword('qwerty');
-
-        $this->assertEquals('hashed_pass', $user->getPassword());
-    }
-
-    protected function setup()
-    {
-        $this->prophet = new \Prophecy\Prophet;
-    }
-
-    protected function tearDown()
-    {
-        $this->prophet->checkPredictions();
-    }
-}
-```
-
-## Installation
-
-### Prerequisites
-
-Prophecy requires PHP 5.3.3 or greater.
-
-### Setup through composer
-
-First, add Prophecy to the list of dependencies inside your `composer.json`:
-
-```json
-{
-    "require-dev": {
-        "phpspec/prophecy": "~1.0"
-    }
-}
-```
-
-Then simply install it with composer:
-
-```bash
-$> composer install --prefer-dist
-```
-
-You can read more about Composer on its [official webpage](http://getcomposer.org).
-
-## How to use it
-
-First of all, in Prophecy every word has a logical meaning, even the name of the library
-itself (Prophecy). When you start feeling that, you'll become very fluid with this
-tool.
-
-For example, Prophecy has been named that way because it concentrates on describing the future
-behavior of objects with very limited knowledge about them. But as with any other prophecy,
-those object prophecies can't create themselves - there should be a Prophet:
-
-```php
-$prophet = new Prophecy\Prophet;
-```
-
-The Prophet creates prophecies by *prophesizing* them:
-
-```php
-$prophecy = $prophet->prophesize();
-```
-
-The result of the `prophesize()` method call is a new object of class `ObjectProphecy`. Yes,
-that's your specific object prophecy, which describes how your object would behave
-in the near future. But first, you need to specify which object you're talking about,
-right?
-
-```php
-$prophecy->willExtend('stdClass');
-$prophecy->willImplement('SessionHandlerInterface');
-```
-
-There are 2 interesting calls - `willExtend` and `willImplement`. The first one tells
-object prophecy that our object should extend specific class, the second one says that
-it should implement some interface. Obviously, objects in PHP can implement multiple
-interfaces, but extend only one parent class.
-
-### Dummies
-
-Ok, now we have our object prophecy. What can we do with it? First of all, we can get
-our object *dummy* by revealing its prophecy:
-
-```php
-$dummy = $prophecy->reveal();
-```
-
-The `$dummy` variable now holds a special dummy object. Dummy objects are objects that extend
-and/or implement preset classes/interfaces by overriding all their public methods. The key
-point about dummies is that they do not hold any logic - they just do nothing. Any method
-of the dummy will always return `null` and the dummy will never throw any exceptions.
-Dummy is your friend if you don't care about the actual behavior of this double and just need
-a token object to satisfy a method typehint.
-
-You need to understand one thing - a dummy is not a prophecy. Your object prophecy is still
-assigned to `$prophecy` variable and in order to manipulate with your expectations, you
-should work with it. `$dummy` is a dummy - a simple php object that tries to fulfil your
-prophecy.
-
-### Stubs
-
-Ok, now we know how to create basic prophecies and reveal dummies from them. That's
-awesome if we don't care about our _doubles_ (objects that reflect originals)
-interactions. If we do, we need to use *stubs* or *mocks*.
-
-A stub is an object double, which doesn't have any expectations about the object behavior,
-but when put in specific environment, behaves in specific way. Ok, I know, it's cryptic,
-but bear with me for a minute. Simply put, a stub is a dummy, which depending on the called
-method signature does different things (has logic). To create stubs in Prophecy:
-
-```php
-$prophecy->read('123')->willReturn('value');
-```
-
-Oh wow. We've just made an arbitrary call on the object prophecy? Yes, we did. And this
-call returned us a new object instance of class `MethodProphecy`. Yep, that's a specific
-method with arguments prophecy. Method prophecies give you the ability to create method
-promises or predictions. We'll talk about method predictions later in the _Mocks_ section.
-
-#### Promises
-
-Promises are logical blocks, that represent your fictional methods in prophecy terms
-and they are handled by the `MethodProphecy::will(PromiseInterface $promise)` method.
-As a matter of fact, the call that we made earlier (`willReturn('value')`) is a simple
-shortcut to:
-
-```php
-$prophecy->read('123')->will(new Prophecy\Promise\ReturnPromise(array('value')));
-```
-
-This promise will cause any call to our double's `read()` method with exactly one
-argument - `'123'` to always return `'value'`. But that's only for this
-promise, there's plenty others you can use:
-
-- `ReturnPromise` or `->willReturn(1)` - returns a value from a method call
-- `ReturnArgumentPromise` or `->willReturnArgument($index)` - returns the nth method argument from call
-- `ThrowPromise` or `->willThrow` - causes the method to throw specific exception
-- `CallbackPromise` or `->will($callback)` - gives you a quick way to define your own custom logic
-
-Keep in mind, that you can always add even more promises by implementing
-`Prophecy\Promise\PromiseInterface`.
-
-#### Method prophecies idempotency
-
-Prophecy enforces same method prophecies and, as a consequence, same promises and
-predictions for the same method calls with the same arguments. This means:
-
-```php
-$methodProphecy1 = $prophecy->read('123');
-$methodProphecy2 = $prophecy->read('123');
-$methodProphecy3 = $prophecy->read('321');
-
-$methodProphecy1 === $methodProphecy2;
-$methodProphecy1 !== $methodProphecy3;
-```
-
-That's interesting, right? Now you might ask me how would you define more complex
-behaviors where some method call changes behavior of others. In PHPUnit or Mockery
-you do that by predicting how many times your method will be called. In Prophecy,
-you'll use promises for that:
-
-```php
-$user->getName()->willReturn(null);
-
-// For PHP 5.4
-$user->setName('everzet')->will(function () {
-    $this->getName()->willReturn('everzet');
-});
-
-// For PHP 5.3
-$user->setName('everzet')->will(function ($args, $user) {
-    $user->getName()->willReturn('everzet');
-});
-
-// Or
-$user->setName('everzet')->will(function ($args) use ($user) {
-    $user->getName()->willReturn('everzet');
-});
-```
-
-And now it doesn't matter how many times or in which order your methods are called.
-What matters is their behaviors and how well you faked it.
-
-#### Arguments wildcarding
-
-The previous example is awesome (at least I hope it is for you), but that's not
-optimal enough. We hardcoded `'everzet'` in our expectation. Isn't there a better
-way? In fact there is, but it involves understanding what this `'everzet'`
-actually is.
-
-You see, even if method arguments used during method prophecy creation look
-like simple method arguments, in reality they are not. They are argument token
-wildcards.  As a matter of fact, `->setName('everzet')` looks like a simple call just
-because Prophecy automatically transforms it under the hood into:
-
-```php
-$user->setName(new Prophecy\Argument\Token\ExactValueToken('everzet'));
-```
-
-Those argument tokens are simple PHP classes, that implement
-`Prophecy\Argument\Token\TokenInterface` and tell Prophecy how to compare real arguments
-with your expectations. And yes, those classnames are damn big. That's why there's a
-shortcut class `Prophecy\Argument`, which you can use to create tokens like that:
-
-```php
-use Prophecy\Argument;
-
-$user->setName(Argument::exact('everzet'));
-```
-
-`ExactValueToken` is not very useful in our case as it forced us to hardcode the username.
-That's why Prophecy comes bundled with a bunch of other tokens:
-
-- `IdenticalValueToken` or `Argument::is($value)` - checks that the argument is identical to a specific value
-- `ExactValueToken` or `Argument::exact($value)` - checks that the argument matches a specific value
-- `TypeToken` or `Argument::type($typeOrClass)` - checks that the argument matches a specific type or
-  classname
-- `ObjectStateToken` or `Argument::which($method, $value)` - checks that the argument method returns
-  a specific value
-- `CallbackToken` or `Argument::that(callback)` - checks that the argument matches a custom callback
-- `AnyValueToken` or `Argument::any()` - matches any argument
-- `AnyValuesToken` or `Argument::cetera()` - matches any arguments to the rest of the signature
-- `StringContainsToken` or `Argument::containingString($value)` - checks that the argument contains a specific string value
-
-And you can add even more by implementing `TokenInterface` with your own custom classes.
-
-So, let's refactor our initial `{set,get}Name()` logic with argument tokens:
-
-```php
-use Prophecy\Argument;
-
-$user->getName()->willReturn(null);
-
-// For PHP 5.4
-$user->setName(Argument::type('string'))->will(function ($args) {
-    $this->getName()->willReturn($args[0]);
-});
-
-// For PHP 5.3
-$user->setName(Argument::type('string'))->will(function ($args, $user) {
-    $user->getName()->willReturn($args[0]);
-});
-
-// Or
-$user->setName(Argument::type('string'))->will(function ($args) use ($user) {
-    $user->getName()->willReturn($args[0]);
-});
-```
-
-That's it. Now our `{set,get}Name()` prophecy will work with any string argument provided to it.
-We've just described how our stub object should behave, even though the original object could have
-no behavior whatsoever.
-
-One last bit about arguments now. You might ask, what happens in case of:
-
-```php
-use Prophecy\Argument;
-
-$user->getName()->willReturn(null);
-
-// For PHP 5.4
-$user->setName(Argument::type('string'))->will(function ($args) {
-    $this->getName()->willReturn($args[0]);
-});
-
-// For PHP 5.3
-$user->setName(Argument::type('string'))->will(function ($args, $user) {
-    $user->getName()->willReturn($args[0]);
-});
-
-// Or
-$user->setName(Argument::type('string'))->will(function ($args) use ($user) {
-    $user->getName()->willReturn($args[0]);
-});
-
-$user->setName(Argument::any())->will(function () {
-});
-```
-
-Nothing. Your stub will continue behaving the way it did before. That's because of how
-arguments wildcarding works. Every argument token type has a different score level, which
-wildcard then uses to calculate the final arguments match score and use the method prophecy
-promise that has the highest score. In this case, `Argument::type()` in case of success
-scores `5` and `Argument::any()` scores `3`. So the type token wins, as does the first
-`setName()` method prophecy and its promise. The simple rule of thumb - more precise token
-always wins.
-
-#### Getting stub objects
-
-Ok, now we know how to define our prophecy method promises, let's get our stub from
-it:
-
-```php
-$stub = $prophecy->reveal();
-```
-
-As you might see, the only difference between how we get dummies and stubs is that with
-stubs we describe every object conversation instead of just agreeing with `null` returns
-(object being *dummy*). As a matter of fact, after you define your first promise
-(method call), Prophecy will force you to define all the communications - it throws
-the `UnexpectedCallException` for any call you didn't describe with object prophecy before
-calling it on a stub.
-
-### Mocks
-
-Now we know how to define doubles without behavior (dummies) and doubles with behavior, but
-no expectations (stubs). What's left is doubles for which we have some expectations. These
-are called mocks and in Prophecy they look almost exactly the same as stubs, except that
-they define *predictions* instead of *promises* on method prophecies:
-
-```php
-$entityManager->flush()->shouldBeCalled();
-```
-
-#### Predictions
-
-The `shouldBeCalled()` method here assigns `CallPrediction` to our method prophecy.
-Predictions are a delayed behavior check for your prophecies. You see, during the entire lifetime
-of your doubles, Prophecy records every single call you're making against it inside your
-code. After that, Prophecy can use this collected information to check if it matches defined
-predictions. You can assign predictions to method prophecies using the
-`MethodProphecy::should(PredictionInterface $prediction)` method. As a matter of fact,
-the `shouldBeCalled()` method we used earlier is just a shortcut to:
-
-```php
-$entityManager->flush()->should(new Prophecy\Prediction\CallPrediction());
-```
-
-It checks if your method of interest (that matches both the method name and the arguments wildcard)
-was called 1 or more times. If the prediction failed then it throws an exception. When does this
-check happen? Whenever you call `checkPredictions()` on the main Prophet object:
-
-```php
-$prophet->checkPredictions();
-```
-
-In PHPUnit, you would want to put this call into the `tearDown()` method. If no predictions
-are defined, it would do nothing. So it won't harm to call it after every test.
-
-There are plenty more predictions you can play with:
-
-- `CallPrediction` or `shouldBeCalled()` - checks that the method has been called 1 or more times
-- `NoCallsPrediction` or `shouldNotBeCalled()` - checks that the method has not been called
-- `CallTimesPrediction` or `shouldBeCalledTimes($count)` - checks that the method has been called
-  `$count` times
-- `CallbackPrediction` or `should($callback)` - checks the method against your own custom callback
-
-Of course, you can always create your own custom prediction any time by implementing
-`PredictionInterface`.
-
-### Spies
-
-The last bit of awesomeness in Prophecy is out-of-the-box spies support. As I said in the previous
-section, Prophecy records every call made during the double's entire lifetime. This means
-you don't need to record predictions in order to check them. You can also do it
-manually by using the `MethodProphecy::shouldHave(PredictionInterface $prediction)` method:
-
-```php
-$em = $prophet->prophesize('Doctrine\ORM\EntityManager');
-
-$controller->createUser($em->reveal());
-
-$em->flush()->shouldHaveBeenCalled();
-```
-
-Such manipulation with doubles is called spying. And with Prophecy it just works.
diff --git a/vendor/phpspec/prophecy/composer.json b/vendor/phpspec/prophecy/composer.json
deleted file mode 100644
index 654aaad..0000000
--- a/vendor/phpspec/prophecy/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name":         "phpspec/prophecy",
-    "description":  "Highly opinionated mocking framework for PHP 5.3+",
-    "keywords":     ["Mock", "Stub", "Dummy", "Double", "Fake", "Spy"],
-    "homepage":     "https://github.com/phpspec/prophecy",
-    "type":         "library",
-    "license":      "MIT",
-    "authors":      [
-        {
-            "name":      "Konstantin Kudryashov",
-            "email":     "ever.zet@gmail.com",
-            "homepage":  "http://everzet.com"
-        },
-        {
-            "name":      "Marcello Duarte",
-            "email":     "marcello.duarte@gmail.com"
-        }
-    ],
-    "require": {
-        "phpdocumentor/reflection-docblock": "~2.0",
-        "sebastian/comparator":              "~1.1",
-        "doctrine/instantiator":             "^1.0.2"
-    },
-
-    "require-dev": {
-        "phpspec/phpspec": "~2.0"
-    },
-
-    "autoload": {
-        "psr-0": {
-            "Prophecy\\": "src/"
-        }
-    },
-
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4.x-dev"
-        }
-    }
-}
diff --git a/vendor/phpspec/prophecy/composer.lock b/vendor/phpspec/prophecy/composer.lock
deleted file mode 100644
index 0c5521a..0000000
--- a/vendor/phpspec/prophecy/composer.lock
+++ /dev/null
@@ -1,731 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "642fa332c5fa99e1d5086035641b5a74",
-    "packages": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2015-02-03 12:10:50"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-02-22 15:13:53"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2015-06-21 07:55:53"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
-                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-06-21 08:04:50"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "phpspec/php-diff",
-            "version": "v1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/php-diff.git",
-                "reference": "30e103d19519fe678ae64a60d77884ef3d71b28a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/30e103d19519fe678ae64a60d77884ef3d71b28a",
-                "reference": "30e103d19519fe678ae64a60d77884ef3d71b28a",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Diff": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Boulton",
-                    "homepage": "http://github.com/chrisboulton",
-                    "role": "Original developer"
-                }
-            ],
-            "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
-            "time": "2013-11-01 13:02:21"
-        },
-        {
-            "name": "phpspec/phpspec",
-            "version": "2.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/phpspec.git",
-                "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/phpspec/zipball/e9a40577323e67f1de2e214abf32976a0352d8f8",
-                "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.1",
-                "php": ">=5.3.3",
-                "phpspec/php-diff": "~1.0.0",
-                "phpspec/prophecy": "~1.4",
-                "sebastian/exporter": "~1.0",
-                "symfony/console": "~2.3",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/finder": "~2.1",
-                "symfony/process": "~2.1",
-                "symfony/yaml": "~2.1"
-            },
-            "require-dev": {
-                "behat/behat": "^3.0.11",
-                "bossa/phpspec2-expect": "~1.0",
-                "phpunit/phpunit": "~4.4",
-                "symfony/filesystem": "~2.1",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "phpspec/nyan-formatters": "~1.0 – Adds Nyan formatters"
-            },
-            "bin": [
-                "bin/phpspec"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PhpSpec": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "homepage": "http://marcelloduarte.net/"
-                }
-            ],
-            "description": "Specification-oriented BDD framework for PHP 5.3+",
-            "homepage": "http://phpspec.net/",
-            "keywords": [
-                "BDD",
-                "SpecBDD",
-                "TDD",
-                "spec",
-                "specification",
-                "testing",
-                "tests"
-            ],
-            "time": "2015-05-30 15:21:40"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e",
-                "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-07-28 15:18:12"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
-                "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.0,>=2.0.5",
-                "symfony/dependency-injection": "~2.6",
-                "symfony/expression-language": "~2.6",
-                "symfony/phpunit-bridge": "~2.7",
-                "symfony/stopwatch": "~2.3"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-06-18 19:21:56"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "ae0f363277485094edc04c9f3cbe595b183b78e4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/ae0f363277485094edc04c9f3cbe595b183b78e4",
-                "reference": "ae0f363277485094edc04c9f3cbe595b183b78e4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-07-09 16:07:40"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Process.git",
-                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/48aeb0e48600321c272955132d7606ab0a49adb3",
-                "reference": "48aeb0e48600321c272955132d7606ab0a49adb3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-07-01 11:25:50"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff",
-                "reference": "71340e996171474a53f3d29111d046be4ad8a0ff",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2015-07-28 14:07:07"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/ArgumentsWildcardSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/ArgumentsWildcardSpec.php
deleted file mode 100644
index 5d6a2da..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/ArgumentsWildcardSpec.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument\Token\TokenInterface;
-
-class ArgumentsWildcardSpec extends ObjectBehavior
-{
-    /**
-     * @param \stdClass $object
-     */
-    function it_wraps_non_token_arguments_into_ExactValueToken($object)
-    {
-        $this->beConstructedWith(array(42, 'zet', $object));
-
-        $class = get_class($object->getWrappedObject());
-        $hash  = spl_object_hash($object->getWrappedObject());
-
-        $this->__toString()->shouldReturn("exact(42), exact(\"zet\"), exact($class:$hash Object (\n    'objectProphecy' => Prophecy\Prophecy\ObjectProphecy Object (*Prophecy*)\n))");
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_generates_string_representation_from_all_tokens_imploded($token1, $token2, $token3)
-    {
-        $token1->__toString()->willReturn('token_1');
-        $token2->__toString()->willReturn('token_2');
-        $token3->__toString()->willReturn('token_3');
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->__toString()->shouldReturn('token_1, token_2, token_3');
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token
-     */
-    function it_exposes_list_of_tokens($token)
-    {
-        $this->beConstructedWith(array($token));
-
-        $this->getTokens()->shouldReturn(array($token));
-    }
-
-    function it_returns_score_of_1_if_there_are_no_tokens_and_arguments()
-    {
-        $this->beConstructedWith(array());
-
-        $this->scoreArguments(array())->shouldReturn(1);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_should_return_match_score_based_on_all_tokens_score($token1, $token2, $token3)
-    {
-        $token1->scoreArgument('one')->willReturn(3);
-        $token1->isLast()->willReturn(false);
-        $token2->scoreArgument(2)->willReturn(5);
-        $token2->isLast()->willReturn(false);
-        $token3->scoreArgument($obj = new \stdClass())->willReturn(10);
-        $token3->isLast()->willReturn(false);
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->scoreArguments(array('one', 2, $obj))->shouldReturn(18);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_returns_false_if_there_is_less_arguments_than_tokens($token1, $token2, $token3)
-    {
-        $token1->scoreArgument('one')->willReturn(3);
-        $token1->isLast()->willReturn(false);
-        $token2->scoreArgument(2)->willReturn(5);
-        $token2->isLast()->willReturn(false);
-        $token3->scoreArgument(null)->willReturn(false);
-        $token3->isLast()->willReturn(false);
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->scoreArguments(array('one', 2))->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_returns_false_if_there_is_less_tokens_than_arguments($token1, $token2, $token3)
-    {
-        $token1->scoreArgument('one')->willReturn(3);
-        $token1->isLast()->willReturn(false);
-        $token2->scoreArgument(2)->willReturn(5);
-        $token2->isLast()->willReturn(false);
-        $token3->scoreArgument($obj = new \stdClass())->willReturn(10);
-        $token3->isLast()->willReturn(false);
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->scoreArguments(array('one', 2, $obj, 4))->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_should_return_false_if_one_of_the_tokens_returns_false($token1, $token2, $token3)
-    {
-        $token1->scoreArgument('one')->willReturn(3);
-        $token1->isLast()->willReturn(false);
-        $token2->scoreArgument(2)->willReturn(false);
-        $token2->isLast()->willReturn(false);
-        $token3->scoreArgument($obj = new \stdClass())->willReturn(10);
-        $token3->isLast()->willReturn(false);
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->scoreArguments(array('one', 2, $obj))->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_should_calculate_score_until_last_token($token1, $token2, $token3)
-    {
-        $token1->scoreArgument('one')->willReturn(3);
-        $token1->isLast()->willReturn(false);
-
-        $token2->scoreArgument(2)->willReturn(7);
-        $token2->isLast()->willReturn(true);
-
-        $token3->scoreArgument($obj = new \stdClass())->willReturn(10);
-        $token3->isLast()->willReturn(false);
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->scoreArguments(array('one', 2, $obj))->shouldReturn(10);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValueTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValueTokenSpec.php
deleted file mode 100644
index a43e923..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValueTokenSpec.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class AnyValueTokenSpec extends ObjectBehavior
-{
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function its_string_representation_is_star()
-    {
-        $this->__toString()->shouldReturn('*');
-    }
-
-    function it_scores_any_argument_as_3()
-    {
-        $this->scoreArgument(42)->shouldReturn(3);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValuesTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValuesTokenSpec.php
deleted file mode 100644
index c29076f..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/AnyValuesTokenSpec.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class AnyValuesTokenSpec extends ObjectBehavior
-{
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_last()
-    {
-        $this->shouldBeLast();
-    }
-
-    function its_string_representation_is_star_with_followup()
-    {
-        $this->__toString()->shouldReturn('* [, ...]');
-    }
-
-    function it_scores_any_argument_as_2()
-    {
-        $this->scoreArgument(42)->shouldReturn(2);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayCountTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayCountTokenSpec.php
deleted file mode 100644
index 5d040d5..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayCountTokenSpec.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class ArrayCountTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(2);
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_scores_6_if_argument_array_has_proper_count()
-    {
-        $this->scoreArgument(array(1,2))->shouldReturn(6);
-    }
-
-    /**
-     * @param \Countable $countable
-     */
-    function it_scores_6_if_argument_countable_object_has_proper_count($countable)
-    {
-        $countable->count()->willReturn(2);
-        $this->scoreArgument($countable)->shouldReturn(6);
-    }
-
-    function it_does_not_score_if_argument_is_neither_array_nor_countable_object()
-    {
-        $this->scoreArgument('string')->shouldBe(false);
-        $this->scoreArgument(5)->shouldBe(false);
-        $this->scoreArgument(new \stdClass)->shouldBe(false);
-    }
-
-    function it_does_not_score_if_argument_array_has_wrong_count()
-    {
-        $this->scoreArgument(array(1))->shouldReturn(false);
-    }
-
-    /**
-     * @param \Countable $countable
-     */
-    function it_does_not_score_if_argument_countable_object_has_wrong_count($countable)
-    {
-        $countable->count()->willReturn(3);
-        $this->scoreArgument($countable)->shouldReturn(false);
-    }
-
-    function it_has_simple_string_representation()
-    {
-        $this->__toString()->shouldBe('count(2)');
-    }
-
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEntryTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEntryTokenSpec.php
deleted file mode 100644
index 8ff0f15..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEntryTokenSpec.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Prophecy\Exception\InvalidArgumentException;
-
-class ArrayEntryTokenSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $key
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     */
-    function let($key, $value)
-    {
-        $this->beConstructedWith($key, $value);
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_holds_key_and_value($key, $value)
-    {
-        $this->getKey()->shouldBe($key);
-        $this->getValue()->shouldBe($value);
-    }
-
-    function its_string_representation_tells_that_its_an_array_containing_the_key_value_pair($key, $value)
-    {
-        $key->__toString()->willReturn('key');
-        $value->__toString()->willReturn('value');
-        $this->__toString()->shouldBe('[..., key => value, ...]');
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $key
-     * @param \stdClass                               $object
-     */
-    function it_wraps_non_token_value_into_ExactValueToken($key, $object)
-    {
-        $this->beConstructedWith($key, $object);
-        $this->getValue()->shouldHaveType('\Prophecy\Argument\Token\ExactValueToken');
-    }
-
-    /**
-     * @param \stdClass                               $object
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     */
-    function it_wraps_non_token_key_into_ExactValueToken($object, $value)
-    {
-        $this->beConstructedWith($object, $value);
-        $this->getKey()->shouldHaveType('\Prophecy\Argument\Token\ExactValueToken');
-    }
-
-    function it_scores_array_half_of_combined_scores_from_key_and_value_tokens($key, $value)
-    {
-        $key->scoreArgument('key')->willReturn(4);
-        $value->scoreArgument('value')->willReturn(6);
-        $this->scoreArgument(array('key'=>'value'))->shouldBe(5);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $key
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     * @param \Iterator                               $object
-     */
-    function it_scores_traversable_object_half_of_combined_scores_from_key_and_value_tokens($key, $value, $object)
-    {
-        $object->current()->will(function () use ($object) {
-            $object->valid()->willReturn(false);
-
-            return 'value';
-        });
-        $object->key()->willReturn('key');
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(true);
-        $key->scoreArgument('key')->willReturn(6);
-        $value->scoreArgument('value')->willReturn(2);
-        $this->scoreArgument($object)->shouldBe(4);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\AnyValuesToken $key
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     * @param \ArrayAccess                            $object
-     */
-    function it_throws_exception_during_scoring_of_array_accessible_object_if_key_is_not_ExactValueToken($key, $value, $object)
-    {
-        $key->__toString()->willReturn('any_token');
-        $this->beConstructedWith($key,$value);
-        $errorMessage = 'You can only use exact value tokens to match key of ArrayAccess object'.PHP_EOL.
-                        'But you used `any_token`.';
-        $this->shouldThrow(new InvalidArgumentException($errorMessage))->duringScoreArgument($object);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\ExactValueToken $key
-     * @param \Prophecy\Argument\Token\TokenInterface  $value
-     * @param \ArrayAccess                             $object
-     */
-    function it_scores_array_accessible_object_half_of_combined_scores_from_key_and_value_tokens($key, $value, $object)
-    {
-        $object->offsetExists('key')->willReturn(true);
-        $object->offsetGet('key')->willReturn('value');
-        $key->getValue()->willReturn('key');
-        $key->scoreArgument('key')->willReturn(3);
-        $value->scoreArgument('value')->willReturn(1);
-        $this->scoreArgument($object)->shouldBe(2);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\AnyValuesToken $key
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     * @param \ArrayIterator                          $object
-     */
-    function it_accepts_any_key_token_type_to_score_object_that_is_both_traversable_and_array_accessible($key, $value, $object)
-    {
-        $this->beConstructedWith($key, $value);
-        $object->current()->will(function () use ($object) {
-            $object->valid()->willReturn(false);
-
-            return 'value';
-        });
-        $object->key()->willReturn('key');
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(true);
-        $this->shouldNotThrow(new InvalidArgumentException)->duringScoreArgument($object);
-    }
-
-    function it_does_not_score_if_argument_is_neither_array_nor_traversable_nor_array_accessible()
-    {
-        $this->scoreArgument('string')->shouldBe(false);
-        $this->scoreArgument(new \stdClass)->shouldBe(false);
-    }
-
-    function it_does_not_score_empty_array()
-    {
-        $this->scoreArgument(array())->shouldBe(false);
-    }
-
-    function it_does_not_score_array_if_key_and_value_tokens_do_not_score_same_entry($key, $value)
-    {
-        $argument = array(1 => 'foo', 2 => 'bar');
-        $key->scoreArgument(1)->willReturn(true);
-        $key->scoreArgument(2)->willReturn(false);
-        $value->scoreArgument('foo')->willReturn(false);
-        $value->scoreArgument('bar')->willReturn(true);
-        $this->scoreArgument($argument)->shouldBe(false);
-    }
-
-    /**
-     * @param \Iterator $object
-     */
-    function it_does_not_score_traversable_object_without_entries($object)
-    {
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(false);
-        $this->scoreArgument($object)->shouldBe(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $key
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     * @param \Iterator                               $object
-     */
-    function it_does_not_score_traversable_object_if_key_and_value_tokens_do_not_score_same_entry($key, $value, $object)
-    {
-        $object->current()->willReturn('foo');
-        $object->current()->will(function () use ($object) {
-            $object->valid()->willReturn(false);
-
-            return 'bar';
-        });
-        $object->key()->willReturn(1);
-        $object->key()->willReturn(2);
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(true);
-        $key->scoreArgument(1)->willReturn(true);
-        $key->scoreArgument(2)->willReturn(false);
-        $value->scoreArgument('foo')->willReturn(false);
-        $value->scoreArgument('bar')->willReturn(true);
-        $this->scoreArgument($object)->shouldBe(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\ExactValueToken $key
-     * @param \ArrayAccess                             $object
-     */
-    function it_does_not_score_array_accessible_object_if_it_has_no_offset_with_key_token_value($key, $object)
-    {
-        $object->offsetExists('key')->willReturn(false);
-        $key->getValue()->willReturn('key');
-        $this->scoreArgument($object)->shouldBe(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\ExactValueToken $key
-     * @param \Prophecy\Argument\Token\TokenInterface  $value
-     * @param \ArrayAccess                             $object
-     */
-    function it_does_not_score_array_accessible_object_if_key_and_value_tokens_do_not_score_same_entry($key, $value, $object)
-    {
-        $object->offsetExists('key')->willReturn(true);
-        $object->offsetGet('key')->willReturn('value');
-        $key->getValue()->willReturn('key');
-        $value->scoreArgument('value')->willReturn(false);
-        $key->scoreArgument('key')->willReturn(true);
-        $this->scoreArgument($object)->shouldBe(false);
-    }
-
-    function its_score_is_capped_at_8($key, $value)
-    {
-        $key->scoreArgument('key')->willReturn(10);
-        $value->scoreArgument('value')->willReturn(10);
-        $this->scoreArgument(array('key'=>'value'))->shouldBe(8);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEveryEntryTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEveryEntryTokenSpec.php
deleted file mode 100644
index 8662e7d..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ArrayEveryEntryTokenSpec.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ArrayEveryEntryTokenSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     */
-    function let($value)
-    {
-        $this->beConstructedWith($value);
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_holds_value($value)
-    {
-        $this->getValue()->shouldBe($value);
-    }
-
-    function its_string_representation_tells_that_its_an_array_containing_only_value($value)
-    {
-        $value->__toString()->willReturn('value');
-        $this->__toString()->shouldBe('[value, ..., value]');
-    }
-
-    /**
-     * @param \stdClass $stdClass
-     */
-    function it_wraps_non_token_value_into_ExactValueToken($stdClass)
-    {
-        $this->beConstructedWith($stdClass);
-        $this->getValue()->shouldHaveType('Prophecy\Argument\Token\ExactValueToken');
-    }
-
-    function it_does_not_score_if_argument_is_neither_array_nor_traversable()
-    {
-        $this->scoreArgument('string')->shouldBe(false);
-        $this->scoreArgument(new \stdClass)->shouldBe(false);
-    }
-
-    function it_does_not_score_empty_array()
-    {
-        $this->scoreArgument(array())->shouldBe(false);
-    }
-
-    /**
-     * @param \Iterator $object
-     */
-    function it_does_not_score_traversable_object_without_entries($object)
-    {
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(false);
-        $this->scoreArgument($object)->shouldBe(false);
-    }
-
-    function it_scores_avg_of_scores_from_value_tokens($value)
-    {
-        $value->scoreArgument('value1')->willReturn(6);
-        $value->scoreArgument('value2')->willReturn(3);
-        $this->scoreArgument(array('value1', 'value2'))->shouldBe(4.5);
-    }
-
-    function it_scores_false_if_entry_scores_false($value)
-    {
-        $value->scoreArgument('value1')->willReturn(6);
-        $value->scoreArgument('value2')->willReturn(false);
-        $this->scoreArgument(array('value1', 'value2'))->shouldBe(false);
-    }
-
-    function it_does_not_score_array_keys($value)
-    {
-        $value->scoreArgument('value')->willReturn(6);
-        $value->scoreArgument('key')->shouldNotBeCalled(0);
-        $this->scoreArgument(array('key' => 'value'))->shouldBe(6);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $value
-     * @param \Iterator                               $object
-     */
-    function it_scores_traversable_object_from_value_token($value, $object)
-    {
-        $object->current()->will(function ($args, $object) {
-            $object->valid()->willReturn(false);
-
-            return 'value';
-        });
-        $object->key()->willReturn('key');
-        $object->rewind()->willReturn(null);
-        $object->next()->willReturn(null);
-        $object->valid()->willReturn(true);
-        $value->scoreArgument('value')->willReturn(2);
-        $this->scoreArgument($object)->shouldBe(2);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/CallbackTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/CallbackTokenSpec.php
deleted file mode 100644
index 4395bf0..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/CallbackTokenSpec.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class CallbackTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('get_class');
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_scores_7_if_argument_matches_callback()
-    {
-        $this->beConstructedWith(function ($argument) { return 2 === $argument; });
-
-        $this->scoreArgument(2)->shouldReturn(7);
-    }
-
-    function it_does_not_scores_if_argument_does_not_match_callback()
-    {
-        $this->beConstructedWith(function ($argument) { return 2 === $argument; });
-
-        $this->scoreArgument(5)->shouldReturn(false);
-    }
-
-    function its_string_representation_should_tell_that_its_callback()
-    {
-        $this->__toString()->shouldReturn('callback()');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ExactValueTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ExactValueTokenSpec.php
deleted file mode 100644
index 9e46e02..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ExactValueTokenSpec.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class ExactValueTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(42);
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_holds_value()
-    {
-        $this->getValue()->shouldReturn(42);
-    }
-
-    function it_scores_10_if_value_is_equal_to_argument()
-    {
-        $this->scoreArgument(42)->shouldReturn(10);
-        $this->scoreArgument('42')->shouldReturn(10);
-    }
-
-    function it_scores_10_if_value_is_an_object_and_equal_to_argument()
-    {
-        $value = new \DateTime();
-        $value2 = clone $value;
-
-        $this->beConstructedWith($value);
-        $this->scoreArgument($value2)->shouldReturn(10);
-    }
-
-    function it_does_not_scores_if_value_is_not_equal_to_argument()
-    {
-        $this->scoreArgument(50)->shouldReturn(false);
-        $this->scoreArgument(new \stdClass())->shouldReturn(false);
-    }
-
-    function it_does_not_scores_if_value_an_object_and_is_not_equal_to_argument()
-    {
-        $value = new ExactValueTokenFixtureB('ABC');
-        $value2 = new ExactValueTokenFixtureB('CBA');
-
-        $this->beConstructedWith($value);
-        $this->scoreArgument($value2)->shouldReturn(false);
-    }
-
-    function it_does_not_scores_if_value_type_and_is_not_equal_to_argument()
-    {
-        $this->beConstructedWith(false);
-        $this->scoreArgument(0)->shouldReturn(false);
-    }
-
-    function it_generates_proper_string_representation_for_integer()
-    {
-        $this->beConstructedWith(42);
-        $this->__toString()->shouldReturn('exact(42)');
-    }
-
-    function it_generates_proper_string_representation_for_string()
-    {
-        $this->beConstructedWith('some string');
-        $this->__toString()->shouldReturn('exact("some string")');
-    }
-
-    function it_generates_single_line_representation_for_multiline_string()
-    {
-        $this->beConstructedWith("some\nstring");
-        $this->__toString()->shouldReturn('exact("some\\nstring")');
-    }
-
-    function it_generates_proper_string_representation_for_double()
-    {
-        $this->beConstructedWith(42.3);
-        $this->__toString()->shouldReturn('exact(42.3)');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_true()
-    {
-        $this->beConstructedWith(true);
-        $this->__toString()->shouldReturn('exact(true)');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_false()
-    {
-        $this->beConstructedWith(false);
-        $this->__toString()->shouldReturn('exact(false)');
-    }
-
-    function it_generates_proper_string_representation_for_null()
-    {
-        $this->beConstructedWith(null);
-        $this->__toString()->shouldReturn('exact(null)');
-    }
-
-    function it_generates_proper_string_representation_for_empty_array()
-    {
-        $this->beConstructedWith(array());
-        $this->__toString()->shouldReturn('exact([])');
-    }
-
-    function it_generates_proper_string_representation_for_array()
-    {
-        $this->beConstructedWith(array('zet', 42));
-        $this->__toString()->shouldReturn('exact(["zet", 42])');
-    }
-
-    function it_generates_proper_string_representation_for_resource()
-    {
-        $resource = fopen(__FILE__, 'r');
-        $this->beConstructedWith($resource);
-        $this->__toString()->shouldReturn('exact(stream:'.$resource.')');
-    }
-
-    /**
-     * @param \stdClass $object
-     */
-    function it_generates_proper_string_representation_for_object($object)
-    {
-        $objHash = sprintf('%s:%s',
-            get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        );
-
-        $this->beConstructedWith($object);
-        $this->__toString()->shouldReturn("exact($objHash Object (\n    'objectProphecy' => Prophecy\Prophecy\ObjectProphecy Object (*Prophecy*)\n))");
-    }
-}
-
-class ExactValueTokenFixtureA
-{
-    public $errors;
-}
-
-class ExactValueTokenFixtureB extends ExactValueTokenFixtureA
-{
-    public $errors;
-    public $value = null;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/IdenticalValueTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/IdenticalValueTokenSpec.php
deleted file mode 100644
index 00c3a21..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/IdenticalValueTokenSpec.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class IdenticalValueTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(42);
-    }
-
-    function it_is_initializable()
-    {
-        $this->shouldHaveType('Prophecy\Argument\Token\IdenticalValueToken');
-    }
-
-    function it_scores_11_if_string_value_is_identical_to_argument()
-    {
-        $this->beConstructedWith('foo');
-        $this->scoreArgument('foo')->shouldReturn(11);
-    }
-
-    function it_scores_11_if_boolean_value_is_identical_to_argument()
-    {
-        $this->beConstructedWith(false);
-        $this->scoreArgument(false)->shouldReturn(11);
-    }
-
-    function it_scores_11_if_integer_value_is_identical_to_argument()
-    {
-        $this->beConstructedWith(31);
-        $this->scoreArgument(31)->shouldReturn(11);
-    }
-
-    function it_scores_11_if_float_value_is_identical_to_argument()
-    {
-        $this->beConstructedWith(31.12);
-        $this->scoreArgument(31.12)->shouldReturn(11);
-    }
-
-    function it_scores_11_if_array_value_is_identical_to_argument()
-    {
-        $this->beConstructedWith(array('foo' => 'bar'));
-        $this->scoreArgument(array('foo' => 'bar'))->shouldReturn(11);
-    }
-
-    function it_scores_11_if_object_value_is_identical_to_argument()
-    {
-        $object = new \stdClass();
-
-        $this->beConstructedWith($object);
-        $this->scoreArgument($object)->shouldReturn(11);
-    }
-
-    function it_scores_false_if_value_is_not_identical_to_argument()
-    {
-        $this->beConstructedWith(new \stdClass());
-        $this->scoreArgument('foo')->shouldReturn(false);
-    }
-
-    function it_scores_false_if_object_value_is_not_the_same_instance_than_argument()
-    {
-        $this->beConstructedWith(new \stdClass());
-        $this->scoreArgument(new \stdClass())->shouldReturn(false);
-    }
-
-    function it_scores_false_if_integer_value_is_not_identical_to_boolean_argument()
-    {
-        $this->beConstructedWith(1);
-        $this->scoreArgument(true)->shouldReturn(false);
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_generates_proper_string_representation_for_integer()
-    {
-        $this->beConstructedWith(42);
-        $this->__toString()->shouldReturn('identical(42)');
-    }
-
-    function it_generates_proper_string_representation_for_string()
-    {
-        $this->beConstructedWith('some string');
-        $this->__toString()->shouldReturn('identical("some string")');
-    }
-
-    function it_generates_single_line_representation_for_multiline_string()
-    {
-        $this->beConstructedWith("some\nstring");
-        $this->__toString()->shouldReturn('identical("some\\nstring")');
-    }
-
-    function it_generates_proper_string_representation_for_double()
-    {
-        $this->beConstructedWith(42.3);
-        $this->__toString()->shouldReturn('identical(42.3)');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_true()
-    {
-        $this->beConstructedWith(true);
-        $this->__toString()->shouldReturn('identical(true)');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_false()
-    {
-        $this->beConstructedWith(false);
-        $this->__toString()->shouldReturn('identical(false)');
-    }
-
-    function it_generates_proper_string_representation_for_null()
-    {
-        $this->beConstructedWith(null);
-        $this->__toString()->shouldReturn('identical(null)');
-    }
-
-    function it_generates_proper_string_representation_for_empty_array()
-    {
-        $this->beConstructedWith(array());
-        $this->__toString()->shouldReturn('identical([])');
-    }
-
-    function it_generates_proper_string_representation_for_array()
-    {
-        $this->beConstructedWith(array('zet', 42));
-        $this->__toString()->shouldReturn('identical(["zet", 42])');
-    }
-
-    function it_generates_proper_string_representation_for_resource()
-    {
-        $resource = fopen(__FILE__, 'r');
-        $this->beConstructedWith($resource);
-        $this->__toString()->shouldReturn('identical(stream:'.$resource.')');
-    }
-
-    function it_generates_proper_string_representation_for_object($object)
-    {
-        $objHash = sprintf('%s:%s',
-            get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        );
-
-        $this->beConstructedWith($object);
-        $this->__toString()->shouldReturn("identical($objHash Object (\n    'objectProphecy' => Prophecy\Prophecy\ObjectProphecy Object (*Prophecy*)\n))");
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalAndTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalAndTokenSpec.php
deleted file mode 100644
index bb5e384..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalAndTokenSpec.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class LogicalAndTokenSpec extends ObjectBehavior
-{
-    function it_implements_TokenInterface()
-    {
-        $this->beConstructedWith(array());
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->beConstructedWith(array());
-        $this->shouldNotBeLast();
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     * @param \Prophecy\Argument\Token\TokenInterface $token3
-     */
-    function it_generates_string_representation_from_all_tokens_imploded($token1, $token2, $token3)
-    {
-        $token1->__toString()->willReturn('token_1');
-        $token2->__toString()->willReturn('token_2');
-        $token3->__toString()->willReturn('token_3');
-
-        $this->beConstructedWith(array($token1, $token2, $token3));
-        $this->__toString()->shouldReturn('bool(token_1 AND token_2 AND token_3)');
-    }
-
-    function it_wraps_non_token_arguments_into_ExactValueToken()
-    {
-        $this->beConstructedWith(array(15, '1985'));
-        $this->__toString()->shouldReturn("bool(exact(15) AND exact(\"1985\"))");
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     */
-    function it_scores_the_maximum_score_from_all_scores_returned_by_tokens($token1, $token2)
-    {
-        $token1->scoreArgument(1)->willReturn(10);
-        $token2->scoreArgument(1)->willReturn(5);
-        $this->beConstructedWith(array($token1, $token2));
-        $this->scoreArgument(1)->shouldReturn(10);
-    }
-
-    function it_does_not_score_if_there_are_no_arguments_or_tokens()
-    {
-        $this->beConstructedWith(array());
-        $this->scoreArgument('any')->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token1
-     * @param \Prophecy\Argument\Token\TokenInterface $token2
-     */
-    function it_does_not_score_if_either_of_tokens_does_not_score($token1, $token2)
-    {
-        $token1->scoreArgument(1)->willReturn(10);
-        $token1->scoreArgument(2)->willReturn(false);
-
-        $token2->scoreArgument(1)->willReturn(false);
-        $token2->scoreArgument(2)->willReturn(10);
-
-        $this->beConstructedWith(array($token1, $token2));
-
-        $this->scoreArgument(1)->shouldReturn(false);
-        $this->scoreArgument(2)->shouldReturn(false);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalNotTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalNotTokenSpec.php
deleted file mode 100644
index 7ce7f3d..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/LogicalNotTokenSpec.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument\Token\TokenInterface;
-
-class LogicalNotTokenSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $token
-     */
-    function let($token)
-    {
-        $this->beConstructedWith($token);
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_holds_originating_token($token)
-    {
-        $this->getOriginatingToken()->shouldReturn($token);
-    }
-
-    function it_has_simple_string_representation($token)
-    {
-        $token->__toString()->willReturn('value');
-        $this->__toString()->shouldBe('not(value)');
-    }
-
-    function it_wraps_non_token_argument_into_ExactValueToken()
-    {
-        $this->beConstructedWith(5);
-        $token = $this->getOriginatingToken();
-        $token->shouldhaveType('Prophecy\Argument\Token\ExactValueToken');
-        $token->getValue()->shouldBe(5);
-    }
-
-    function it_scores_4_if_preset_token_does_not_match_the_argument($token)
-    {
-        $token->scoreArgument('argument')->willReturn(false);
-        $this->scoreArgument('argument')->shouldBe(4);
-    }
-
-    function it_does_not_score_if_preset_token_matches_argument($token)
-    {
-        $token->scoreArgument('argument')->willReturn(5);
-        $this->scoreArgument('argument')->shouldBe(false);
-    }
-
-    function it_is_last_if_preset_token_is_last($token)
-    {
-        $token->isLast()->willReturn(true);
-        $this->shouldBeLast();
-    }
-
-    function it_is_not_last_if_preset_token_is_not_last($token)
-    {
-        $token->isLast()->willReturn(false);
-        $this->shouldNotBeLast();
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ObjectStateTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ObjectStateTokenSpec.php
deleted file mode 100644
index a783a15..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/ObjectStateTokenSpec.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class ObjectStateTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('getName', 'stdClass');
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    /**
-     * @param \ReflectionClass $reflection
-     */
-    function it_scores_8_if_argument_object_has_specific_method_state($reflection)
-    {
-        $reflection->getName()->willReturn('stdClass');
-
-        $this->scoreArgument($reflection)->shouldReturn(8);
-    }
-
-    /**
-     * @param \stdClass $class
-     */
-    function it_scores_8_if_argument_object_has_specific_property_state($class)
-    {
-        $class->getName = 'stdClass';
-
-        $this->scoreArgument($class)->shouldReturn(8);
-    }
-
-    function it_does_not_score_if_argument_method_state_does_not_match()
-    {
-        $value = new ObjectStateTokenFixtureB('ABC');
-        $value2 = new ObjectStateTokenFixtureB('CBA');
-
-        $this->beConstructedWith('getSelf', $value);
-        $this->scoreArgument($value2)->shouldReturn(false);
-    }
-
-    /**
-     * @param \stdClass $class
-     */
-    function it_does_not_score_if_argument_property_state_does_not_match($class)
-    {
-        $class->getName = 'SplFileInfo';
-
-        $this->scoreArgument($class)->shouldReturn(false);
-    }
-
-    /**
-     * @param \spec\Prophecy\Argument\Token\ObjectStateTokenFixtureA $class
-     */
-    function it_does_not_score_if_argument_object_does_not_have_method_or_property($class)
-    {
-        $this->scoreArgument($class)->shouldReturn(false);
-    }
-
-    function it_does_not_score_if_argument_is_not_object()
-    {
-        $this->scoreArgument(42)->shouldReturn(false);
-    }
-
-    function it_has_simple_string_representation()
-    {
-        $this->__toString()->shouldReturn('state(getName(), "stdClass")');
-    }
-}
-
-class ObjectStateTokenFixtureA
-{
-    public $errors;
-}
-
-class ObjectStateTokenFixtureB extends ObjectStateTokenFixtureA
-{
-    public $errors;
-    public $value = null;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function getSelf()
-    {
-        return $this;
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/StringContainsTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/StringContainsTokenSpec.php
deleted file mode 100644
index c7fd265..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/StringContainsTokenSpec.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class StringContainsTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('a substring');
-    }
-
-    function it_is_initializable()
-    {
-        $this->shouldHaveType('Prophecy\Argument\Token\StringContainsToken');
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_holds_value()
-    {
-        $this->getValue()->shouldReturn('a substring');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_scores_6_if_the_argument_contains_the_value()
-    {
-        $this->scoreArgument('Argument containing a substring')->shouldReturn(6);
-    }
-
-    function it_does_not_score_if_the_argument_does_not_contain_the_value()
-    {
-        $this->scoreArgument('Argument will not match')->shouldReturn(false);
-    }
-
-    function its_string_representation_shows_substring()
-    {
-        $this->__toString()->shouldReturn('contains("a substring")');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/TypeTokenSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/TypeTokenSpec.php
deleted file mode 100644
index ae3e26e..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Argument/Token/TypeTokenSpec.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Argument\Token;
-
-use PhpSpec\ObjectBehavior;
-
-class TypeTokenSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('integer');
-    }
-
-    function it_implements_TokenInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Argument\Token\TokenInterface');
-    }
-
-    function it_is_not_last()
-    {
-        $this->shouldNotBeLast();
-    }
-
-    function it_scores_5_if_argument_matches_simple_type()
-    {
-        $this->beConstructedWith('integer');
-
-        $this->scoreArgument(42)->shouldReturn(5);
-    }
-
-    function it_does_not_scores_if_argument_does_not_match_simple_type()
-    {
-        $this->beConstructedWith('integer');
-
-        $this->scoreArgument(42.0)->shouldReturn(false);
-    }
-
-    /**
-     * @param \ReflectionObject $object
-     */
-    function it_scores_5_if_argument_is_an_instance_of_specified_class($object)
-    {
-        $this->beConstructedWith('ReflectionClass');
-
-        $this->scoreArgument($object)->shouldReturn(5);
-    }
-
-    function it_has_simple_string_representation()
-    {
-        $this->__toString()->shouldReturn('type(integer)');
-    }
-
-    /**
-     * @param \Prophecy\Argument\Token\TokenInterface $interface
-     */
-    function it_scores_5_if_argument_is_an_instance_of_specified_interface($interface)
-    {
-        $this->beConstructedWith('Prophecy\Argument\Token\TokenInterface');
-
-        $this->scoreArgument($interface)->shouldReturn(5);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/ArgumentSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/ArgumentSpec.php
deleted file mode 100644
index 990aa80..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/ArgumentSpec.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace spec\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-
-class ArgumentSpec extends ObjectBehavior
-{
-    function it_has_a_shortcut_for_exact_argument_token()
-    {
-        $token = $this->exact(42);
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ExactValueToken');
-        $token->getValue()->shouldReturn(42);
-    }
-
-    function it_has_a_shortcut_for_any_argument_token()
-    {
-        $token = $this->any();
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\AnyValueToken');
-    }
-
-    function it_has_a_shortcut_for_multiple_arguments_token()
-    {
-        $token = $this->cetera();
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\AnyValuesToken');
-    }
-
-    function it_has_a_shortcut_for_type_token()
-    {
-        $token = $this->type('integer');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\TypeToken');
-    }
-
-    function it_has_a_shortcut_for_callback_token()
-    {
-        $token = $this->that('get_class');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\CallbackToken');
-    }
-
-    function it_has_a_shortcut_for_object_state_token()
-    {
-        $token = $this->which('getName', 'everzet');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ObjectStateToken');
-    }
-
-    function it_has_a_shortcut_for_logical_and_token()
-    {
-        $token = $this->allOf('integer', 5);
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\LogicalAndToken');
-    }
-
-    function it_has_a_shortcut_for_array_count_token()
-    {
-        $token = $this->size(5);
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ArrayCountToken');
-    }
-
-    function it_has_a_shortcut_for_array_entry_token()
-    {
-        $token = $this->withEntry('key', 'value');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ArrayEntryToken');
-    }
-
-    function it_has_a_shortcut_for_array_every_entry_token()
-    {
-        $token = $this->withEveryEntry('value');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ArrayEveryEntryToken');
-    }
-
-    function it_has_a_shortcut_for_identical_value_token()
-    {
-        $token = $this->is('value');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\IdenticalValueToken');
-    }
-
-    function it_has_a_shortcut_for_array_entry_token_matching_any_key()
-    {
-        $token = $this->containing('value');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ArrayEntryToken');
-        $token->getKey()->shouldHaveType('Prophecy\Argument\Token\AnyValueToken');
-    }
-
-    function it_has_a_shortcut_for_array_entry_token_matching_any_value()
-    {
-        $token = $this->withKey('key');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\ArrayEntryToken');
-        $token->getValue()->shouldHaveType('Prophecy\Argument\Token\AnyValueToken');
-    }
-
-    function it_has_a_shortcut_for_logical_not_token()
-    {
-        $token = $this->not('kagux');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\LogicalNotToken');
-    }
-
-    function it_has_a_shortcut_for_string_contains_token()
-    {
-        $token = $this->containingString('string');
-        $token->shouldBeAnInstanceOf('Prophecy\Argument\Token\StringContainsToken');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Call/CallCenterSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Call/CallCenterSpec.php
deleted file mode 100644
index acf8d78..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Call/CallCenterSpec.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Call;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Argument\ArgumentsWildcard;
-
-class CallCenterSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     */
-    function let($objectProphecy)
-    {
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy    $objectProphecy
-     * @param \Prophecy\Argument\ArgumentsWildcard $wildcard
-     */
-    function it_records_calls_made_through_makeCall_method($objectProphecy, $wildcard)
-    {
-        $wildcard->scoreArguments(array(5, 2, 3))->willReturn(10);
-        $objectProphecy->getMethodProphecies()->willReturn(array());
-
-        $this->makeCall($objectProphecy, 'setValues', array(5, 2, 3));
-
-        $calls = $this->findCalls('setValues', $wildcard);
-        $calls->shouldHaveCount(1);
-
-        $calls[0]->shouldBeAnInstanceOf('Prophecy\Call\Call');
-        $calls[0]->getMethodName()->shouldReturn('setValues');
-        $calls[0]->getArguments()->shouldReturn(array(5, 2, 3));
-        $calls[0]->getReturnValue()->shouldReturn(null);
-    }
-
-    function it_returns_null_for_any_call_through_makeCall_if_no_method_prophecies_added(
-        $objectProphecy
-    )
-    {
-        $objectProphecy->getMethodProphecies()->willReturn(array());
-
-        $this->makeCall($objectProphecy, 'setValues', array(5, 2, 3))->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method1
-     * @param \Prophecy\Prophecy\MethodProphecy    $method2
-     * @param \Prophecy\Prophecy\MethodProphecy    $method3
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments1
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments2
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments3
-     * @param \Prophecy\Promise\PromiseInterface   $promise
-     */
-    function it_executes_promise_of_method_prophecy_that_matches_signature_passed_to_makeCall(
-        $objectProphecy, $method1, $method2, $method3, $arguments1, $arguments2, $arguments3,
-        $promise
-    )
-    {
-        $method1->getMethodName()->willReturn('getName');
-        $method1->getArgumentsWildcard()->willReturn($arguments1);
-        $arguments1->scoreArguments(array('world', 'everything'))->willReturn(false);
-
-        $method2->getMethodName()->willReturn('setTitle');
-        $method2->getArgumentsWildcard()->willReturn($arguments2);
-        $arguments2->scoreArguments(array('world', 'everything'))->willReturn(false);
-
-        $method3->getMethodName()->willReturn('getName');
-        $method3->getArgumentsWildcard()->willReturn($arguments3);
-        $method3->getPromise()->willReturn($promise);
-        $arguments3->scoreArguments(array('world', 'everything'))->willReturn(200);
-
-        $objectProphecy->getMethodProphecies()->willReturn(array(
-            'method1' => array($method1),
-            'method2' => array($method2, $method3)
-        ));
-        $objectProphecy->getMethodProphecies('getName')->willReturn(array($method1, $method3));
-        $objectProphecy->reveal()->willReturn(new \stdClass());
-
-        $promise->execute(array('world', 'everything'), $objectProphecy->getWrappedObject(), $method3)->willReturn(42);
-
-        $this->makeCall($objectProphecy, 'getName', array('world', 'everything'))->shouldReturn(42);
-
-        $calls = $this->findCalls('getName', $arguments3);
-        $calls->shouldHaveCount(1);
-        $calls[0]->getReturnValue()->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method1
-     * @param \Prophecy\Prophecy\MethodProphecy    $method2
-     * @param \Prophecy\Prophecy\MethodProphecy    $method3
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments1
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments2
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments3
-     * @param \Prophecy\Promise\PromiseInterface   $promise
-     */
-    function it_executes_promise_of_method_prophecy_that_matches_with_highest_score_to_makeCall(
-        $objectProphecy, $method1, $method2, $method3, $arguments1, $arguments2, $arguments3,
-        $promise
-    )
-    {
-        $method1->getMethodName()->willReturn('getName');
-        $method1->getArgumentsWildcard()->willReturn($arguments1);
-        $arguments1->scoreArguments(array('world', 'everything'))->willReturn(50);
-
-        $method2->getMethodName()->willReturn('getName');
-        $method2->getArgumentsWildcard()->willReturn($arguments2);
-        $method2->getPromise()->willReturn($promise);
-        $arguments2->scoreArguments(array('world', 'everything'))->willReturn(300);
-
-        $method3->getMethodName()->willReturn('getName');
-        $method3->getArgumentsWildcard()->willReturn($arguments3);
-        $arguments3->scoreArguments(array('world', 'everything'))->willReturn(200);
-
-        $objectProphecy->getMethodProphecies()->willReturn(array(
-            'method1' => array($method1),
-            'method2' => array($method2, $method3)
-        ));
-        $objectProphecy->getMethodProphecies('getName')->willReturn(array(
-            $method1, $method2, $method3
-        ));
-        $objectProphecy->reveal()->willReturn(new \stdClass());
-
-        $promise->execute(array('world', 'everything'), $objectProphecy->getWrappedObject(), $method2)
-            ->willReturn('second');
-
-        $this->makeCall($objectProphecy, 'getName', array('world', 'everything'))
-            ->shouldReturn('second');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_throws_exception_if_call_does_not_match_any_of_defined_method_prophecies(
-        $objectProphecy, $method, $arguments
-    )
-    {
-        $method->getMethodName()->willReturn('getName');
-        $method->getArgumentsWildcard()->willReturn($arguments);
-        $arguments->scoreArguments(array('world', 'everything'))->willReturn(false);
-        $arguments->__toString()->willReturn('arg1, arg2');
-
-        $objectProphecy->getMethodProphecies()->willReturn(array('method1' => array($method)));
-        $objectProphecy->getMethodProphecies('getName')->willReturn(array($method));
-
-        $this->shouldThrow('Prophecy\Exception\Call\UnexpectedCallException')
-            ->duringMakeCall($objectProphecy, 'getName', array('world', 'everything'));
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_returns_null_if_method_prophecy_that_matches_makeCall_arguments_has_no_promise(
-        $objectProphecy, $method, $arguments
-    )
-    {
-        $method->getMethodName()->willReturn('getName');
-        $method->getArgumentsWildcard()->willReturn($arguments);
-        $method->getPromise()->willReturn(null);
-        $arguments->scoreArguments(array('world', 'everything'))->willReturn(100);
-
-        $objectProphecy->getMethodProphecies()->willReturn(array($method));
-        $objectProphecy->getMethodProphecies('getName')->willReturn(array($method));
-
-        $this->makeCall($objectProphecy, 'getName', array('world', 'everything'))
-            ->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard $wildcard
-     */
-    function it_finds_recorded_calls_by_a_method_name_and_arguments_wildcard(
-        $objectProphecy, $wildcard
-    )
-    {
-        $objectProphecy->getMethodProphecies()->willReturn(array());
-
-        $this->makeCall($objectProphecy, 'getName', array('world'));
-        $this->makeCall($objectProphecy, 'getName', array('everything'));
-        $this->makeCall($objectProphecy, 'setName', array(42));
-
-        $wildcard->scoreArguments(array('world'))->willReturn(false);
-        $wildcard->scoreArguments(array('everything'))->willReturn(10);
-
-        $calls = $this->findCalls('getName', $wildcard);
-
-        $calls->shouldHaveCount(1);
-        $calls[0]->getMethodName()->shouldReturn('getName');
-        $calls[0]->getArguments()->shouldReturn(array('everything'));
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Call/CallSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Call/CallSpec.php
deleted file mode 100644
index d1a8539..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Call/CallSpec.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Call;
-
-use PhpSpec\ObjectBehavior;
-
-class CallSpec extends ObjectBehavior
-{
-    /**
-     * @param \Exception $exception
-     */
-    function let($exception)
-    {
-        $this->beConstructedWith('setValues', array(5, 2), 42, $exception, 'some_file.php', 23);
-    }
-
-    function it_exposes_method_name_through_getter()
-    {
-        $this->getMethodName()->shouldReturn('setValues');
-    }
-
-    function it_exposes_arguments_through_getter()
-    {
-        $this->getArguments()->shouldReturn(array(5, 2));
-    }
-
-    function it_exposes_return_value_through_getter()
-    {
-        $this->getReturnValue()->shouldReturn(42);
-    }
-
-    function it_exposes_exception_through_getter($exception)
-    {
-        $this->getException()->shouldReturn($exception);
-    }
-
-    function it_exposes_file_and_line_through_getter()
-    {
-        $this->getFile()->shouldReturn('some_file.php');
-        $this->getLine()->shouldReturn(23);
-    }
-
-    function it_returns_shortpath_to_callPlace()
-    {
-        $this->getCallPlace()->shouldReturn('some_file.php:23');
-    }
-
-    function it_returns_unknown_as_callPlace_if_no_file_or_line_provided()
-    {
-        $this->beConstructedWith('setValues', array(), 0, null, null, null);
-
-        $this->getCallPlace()->shouldReturn('unknown');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Comparator/ClosureComparatorSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Comparator/ClosureComparatorSpec.php
deleted file mode 100644
index c174e73..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Comparator/ClosureComparatorSpec.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Comparator;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ClosureComparatorSpec extends ObjectBehavior
-{
-    function it_is_comparator()
-    {
-        $this->shouldHaveType('SebastianBergmann\Comparator\Comparator');
-    }
-
-    function it_accepts_only_closures()
-    {
-        $this->accepts(123, 321)->shouldReturn(false);
-        $this->accepts('string', 'string')->shouldReturn(false);
-        $this->accepts(false, true)->shouldReturn(false);
-        $this->accepts(true, false)->shouldReturn(false);
-        $this->accepts((object)array(), (object)array())->shouldReturn(false);
-        $this->accepts(function(){}, (object)array())->shouldReturn(false);
-        $this->accepts(function(){}, (object)array())->shouldReturn(false);
-
-        $this->accepts(function(){}, function(){})->shouldReturn(true);
-    }
-
-    function it_asserts_that_all_closures_are_different()
-    {
-        $this->shouldThrow()->duringAssertEquals(function(){}, function(){});
-    }
-
-    function it_asserts_that_all_closures_are_different_even_if_its_the_same_closure()
-    {
-        $closure = function(){};
-
-        $this->shouldThrow()->duringAssertEquals($closure, $closure);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Comparator/FactorySpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Comparator/FactorySpec.php
deleted file mode 100644
index 6b13336..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Comparator/FactorySpec.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Comparator;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class FactorySpec extends ObjectBehavior
-{
-    function it_extends_Sebastian_Comparator_Factory()
-    {
-        $this->shouldHaveType('SebastianBergmann\Comparator\Factory');
-    }
-
-    function it_should_have_ClosureComparator_registered()
-    {
-        $comparator = $this->getInstance()->getComparatorFor(function(){}, function(){});
-        $comparator->shouldHaveType('Prophecy\Comparator\ClosureComparator');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/DisableConstructorPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/DisableConstructorPatchSpec.php
deleted file mode 100644
index 2d7d934..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/DisableConstructorPatchSpec.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class DisableConstructorPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function its_priority_is_100()
-    {
-        $this->getPriority()->shouldReturn(100);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_anything($node)
-    {
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode    $class
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $arg1
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $arg2
-     */
-    function it_makes_all_constructor_arguments_optional($class, $method, $arg1, $arg2)
-    {
-        $class->hasMethod('__construct')->willReturn(true);
-        $class->getMethod('__construct')->willReturn($method);
-        $method->getArguments()->willReturn(array($arg1, $arg2));
-
-        $arg1->setDefault(null)->shouldBeCalled();
-        $arg2->setDefault(null)->shouldBeCalled();
-
-        $method->setCode(Argument::type('string'))->shouldBeCalled();
-
-        $this->apply($class);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $class
-     */
-    function it_creates_new_constructor_if_object_has_none($class)
-    {
-        $class->hasMethod('__construct')->willReturn(false);
-        $class->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))
-            ->shouldBeCalled();
-
-        $this->apply($class);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/HhvmExceptionPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/HhvmExceptionPatchSpec.php
deleted file mode 100644
index 8c348b8..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/HhvmExceptionPatchSpec.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class HhvmExceptionPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function its_priority_is_minus_50()
-    {
-        $this->getPriority()->shouldReturn(-50);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode  $node
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $getterMethod
-     */
-    function it_uses_parent_code_for_setTraceOptions($node, $method, $getterMethod)
-    {
-        $node->hasMethod('setTraceOptions')->willReturn(true);
-        $node->getMethod('setTraceOptions')->willReturn($method);
-        $node->hasMethod('getTraceOptions')->willReturn(true);
-        $node->getMethod('getTraceOptions')->willReturn($getterMethod);
-
-        $method->useParentCode()->shouldBeCalled();
-        $getterMethod->useParentCode()->shouldBeCalled();
-
-        $this->apply($node);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/KeywordPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/KeywordPatchSpec.php
deleted file mode 100644
index 200d961..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/KeywordPatchSpec.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-class KeywordPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function its_priority_is_49()
-    {
-        $this->getPriority()->shouldReturn(49);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method1
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method2
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method3
-     */
-    function it_will_remove_echo_and_eval_methods($node, $method1, $method2, $method3)
-    {
-        $node->removeMethod('eval')->shouldBeCalled();
-        $node->removeMethod('echo')->shouldBeCalled();
-
-        $method1->getName()->willReturn('echo');
-        $method2->getName()->willReturn('eval');
-        $method3->getName()->willReturn('notKeyword');
-
-        $node->getMethods()->willReturn(array(
-            'echo' => $method1,
-            'eval' => $method2,
-            'notKeyword' => $method3,
-        ));
-
-        $this->apply($node);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php
deleted file mode 100644
index cb1d0f0..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/MagicCallPatchSpec.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-class MagicCallPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_anything($node)
-    {
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_discovers_api_using_phpdoc($node)
-    {
-        $node->getParentClass()->willReturn('spec\Prophecy\Doubler\ClassPatch\MagicalApi');
-
-        $node->addMethod(new MethodNode('undefinedMethod'))->shouldBeCalled();
-
-        $this->apply($node);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_ignores_existing_methods($node)
-    {
-        $node->getParentClass()->willReturn('spec\Prophecy\Doubler\ClassPatch\MagicalApiExtended');
-
-        $node->addMethod(new MethodNode('undefinedMethod'))->shouldBeCalled();
-        $node->addMethod(new MethodNode('definedMethod'))->shouldNotBeCalled();
-
-        $this->apply($node);
-    }
-
-    function it_has_50_priority()
-    {
-        $this->getPriority()->shouldReturn(50);
-    }
-}
-
-/**
- * @method void undefinedMethod()
- */
-class MagicalApi
-{
-    /**
-     * @return void
-     */
-    public function definedMethod()
-    {
-
-    }
-}
-
-/**
- * @method void undefinedMethod()
- * @method void definedMethod()
- */
-class MagicalApiExtended extends MagicalApi
-{
-
-}
\ No newline at end of file
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ProphecySubjectPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ProphecySubjectPatchSpec.php
deleted file mode 100644
index c460814..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ProphecySubjectPatchSpec.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ProphecySubjectPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function it_has_priority_of_0()
-    {
-        $this->getPriority()->shouldReturn(0);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_any_class($node)
-    {
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_forces_class_to_implement_ProphecySubjectInterface($node)
-    {
-        $node->addInterface('Prophecy\Prophecy\ProphecySubjectInterface')->shouldBeCalled();
-
-        $node->addProperty('objectProphecy', 'private')->willReturn(null);
-        $node->getMethods()->willReturn(array());
-        $node->hasMethod(Argument::any())->willReturn(false);
-        $node->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))->willReturn(null);
-        $node->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))->willReturn(null);
-
-        $this->apply($node);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode  $node
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $constructor
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method1
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method2
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method3
-     */
-    function it_forces_all_class_methods_except_constructor_to_proxy_calls_into_prophecy_makeCall(
-        $node, $constructor, $method1, $method2, $method3
-    )
-    {
-        $node->addInterface('Prophecy\Prophecy\ProphecySubjectInterface')->willReturn(null);
-        $node->addProperty('objectProphecy', 'private')->willReturn(null);
-        $node->hasMethod(Argument::any())->willReturn(false);
-        $node->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))->willReturn(null);
-        $node->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))->willReturn(null);
-
-        $constructor->getName()->willReturn('__construct');
-        $method1->getName()->willReturn('method1');
-        $method2->getName()->willReturn('method2');
-        $method3->getName()->willReturn('method3');
-
-        $node->getMethods()->willReturn(array(
-            'method1' => $method1,
-            'method2' => $method2,
-            'method3' => $method3,
-        ));
-
-        $constructor->setCode(Argument::any())->shouldNotBeCalled();
-
-        $method1->setCode('return $this->getProphecy()->makeProphecyMethodCall(__FUNCTION__, func_get_args());')
-            ->shouldBeCalled();
-        $method2->setCode('return $this->getProphecy()->makeProphecyMethodCall(__FUNCTION__, func_get_args());')
-            ->shouldBeCalled();
-        $method3->setCode('return $this->getProphecy()->makeProphecyMethodCall(__FUNCTION__, func_get_args());')
-            ->shouldBeCalled();
-
-        $this->apply($node);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatchSpec.php
deleted file mode 100644
index 4116e4d..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatchSpec.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ReflectionClassNewInstancePatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function its_priority_is_50()
-    {
-        $this->getPriority()->shouldReturn(50);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $reflectionClassNode
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $anotherClassNode
-     */
-    function it_supports_ReflectionClass_only($reflectionClassNode, $anotherClassNode)
-    {
-        $reflectionClassNode->getParentClass()->willReturn('ReflectionClass');
-        $anotherClassNode->getParentClass()->willReturn('stdClass');
-
-        $this->supports($reflectionClassNode)->shouldReturn(true);
-        $this->supports($anotherClassNode)->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode    $class
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $arg1
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $arg2
-     */
-    function it_makes_all_newInstance_arguments_optional($class, $method, $arg1, $arg2)
-    {
-        $class->getMethod('newInstance')->willReturn($method);
-        $method->getArguments()->willReturn(array($arg1));
-        $arg1->setDefault(null)->shouldBeCalled();
-
-        $this->apply($class);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/SplFileInfoPatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/SplFileInfoPatchSpec.php
deleted file mode 100644
index 37fe82f..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/SplFileInfoPatchSpec.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class SplFileInfoPatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    function its_priority_is_50()
-    {
-        $this->getPriority()->shouldReturn(50);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_does_not_support_nodes_without_parent_class($node)
-    {
-        $node->getParentClass()->willReturn('stdClass');
-        $this->supports($node)->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_nodes_with_SplFileInfo_as_parent_class($node)
-    {
-        $node->getParentClass()->willReturn('SplFileInfo');
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_nodes_with_derivative_of_SplFileInfo_as_parent_class($node)
-    {
-        $node->getParentClass()->willReturn('SplFileInfo');
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_adds_a_method_to_node_if_not_exists($node)
-    {
-        $node->hasMethod('__construct')->willReturn(false);
-        $node->addMethod(Argument::any())->shouldBeCalled();
-        $node->getParentClass()->shouldBeCalled();
-
-        $this->apply($node);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode  $node
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     */
-    function it_updates_existing_method_if_found($node, $method)
-    {
-        $node->hasMethod('__construct')->willReturn(true);
-        $node->getMethod('__construct')->willReturn($method);
-        $node->getParentClass()->shouldBeCalled();
-
-        $method->useParentCode()->shouldBeCalled();
-
-        $this->apply($node);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode  $node
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     */
-    function it_should_not_supply_a_file_for_a_directory_iterator($node, $method)
-    {
-        $node->hasMethod('__construct')->willReturn(true);
-        $node->getMethod('__construct')->willReturn($method);
-        $node->getParentClass()->willReturn('DirectoryIterator');
-
-        $method->setCode(Argument::that(function($value) {
-            return strpos($value, '.php') === false;
-        }))->shouldBeCalled();
-
-        $this->apply($node);
-    }
-
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/TraversablePatchSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/TraversablePatchSpec.php
deleted file mode 100644
index 2279b72..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/ClassPatch/TraversablePatchSpec.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\ClassPatch;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class TraversablePatchSpec extends ObjectBehavior
-{
-    function it_is_a_patch()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Doubler\ClassPatch\ClassPatchInterface');
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_supports_class_that_implements_only_Traversable($node)
-    {
-        $node->getInterfaces()->willReturn(array('Traversable'));
-
-        $this->supports($node)->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_does_not_support_class_that_implements_Iterator($node)
-    {
-        $node->getInterfaces()->willReturn(array('Traversable', 'Iterator'));
-
-        $this->supports($node)->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_does_not_support_class_that_implements_IteratorAggregate($node)
-    {
-        $node->getInterfaces()->willReturn(array('Traversable', 'IteratorAggregate'));
-
-        $this->supports($node)->shouldReturn(false);
-    }
-
-    function it_has_100_priority()
-    {
-        $this->getPriority()->shouldReturn(100);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_forces_node_to_implement_IteratorAggregate($node)
-    {
-        $node->addInterface('Iterator')->shouldBeCalled();
-
-        $node->addMethod(Argument::type('Prophecy\Doubler\Generator\Node\MethodNode'))->willReturn(null);
-
-        $this->apply($node);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/DoublerSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/DoublerSpec.php
deleted file mode 100644
index a39fa87..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/DoublerSpec.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class DoublerSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Generator\ClassMirror  $mirror
-     * @param \Prophecy\Doubler\Generator\ClassCreator $creator
-     * @param \Prophecy\Doubler\NameGenerator          $namer
-     */
-    function let($mirror, $creator, $namer)
-    {
-        $this->beConstructedWith($mirror, $creator, $namer);
-    }
-
-    function it_does_not_have_patches_by_default()
-    {
-        $this->getClassPatches()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $patch
-     */
-    function its_registerClassPatch_adds_a_patch_to_the_doubler($patch)
-    {
-        $this->registerClassPatch($patch);
-        $this->getClassPatches()->shouldReturn(array($patch));
-    }
-
-    /**
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt1
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt2
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt3
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt4
-     */
-    function its_getClassPatches_sorts_patches_by_priority($alt1, $alt2, $alt3, $alt4)
-    {
-        $alt1->getPriority()->willReturn(2);
-        $alt2->getPriority()->willReturn(50);
-        $alt3->getPriority()->willReturn(10);
-        $alt4->getPriority()->willReturn(0);
-
-        $this->registerClassPatch($alt1);
-        $this->registerClassPatch($alt2);
-        $this->registerClassPatch($alt3);
-        $this->registerClassPatch($alt4);
-
-        $this->getClassPatches()->shouldReturn(array($alt2, $alt3, $alt1, $alt4));
-    }
-
-    /**
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt1
-     * @param \Prophecy\Doubler\ClassPatch\ClassPatchInterface $alt2
-     * @param \ReflectionClass                                 $class
-     * @param \ReflectionClass                                 $interface1
-     * @param \ReflectionClass                                 $interface2
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode       $node
-     */
-    function its_double_mirrors_alterates_and_instantiates_provided_class(
-        $mirror, $creator, $namer, $alt1, $alt2, $class, $interface1, $interface2, $node
-    )
-    {
-        $mirror->reflect($class, array($interface1, $interface2))->willReturn($node);
-        $alt1->supports($node)->willReturn(true);
-        $alt2->supports($node)->willReturn(false);
-        $alt1->getPriority()->willReturn(1);
-        $alt2->getPriority()->willReturn(2);
-        $namer->name($class, array($interface1, $interface2))->willReturn('SplStack');
-        $class->getName()->willReturn('stdClass');
-        $interface1->getName()->willReturn('ArrayAccess');
-        $interface2->getName()->willReturn('Iterator');
-
-        $alt1->apply($node)->shouldBeCalled();
-        $alt2->apply($node)->shouldNotBeCalled();
-        $creator->create('SplStack', $node)->shouldBeCalled();
-
-        $this->registerClassPatch($alt1);
-        $this->registerClassPatch($alt2);
-
-        $this->double($class, array($interface1, $interface2))
-            ->shouldReturnAnInstanceOf('SplStack');
-    }
-
-    /**
-     * @param \ReflectionClass                           $class
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_double_instantiates_a_class_with_constructor_argument($mirror, $class, $node, $namer)
-    {
-        $class->getName()->willReturn('ReflectionClass');
-        $mirror->reflect($class, array())->willReturn($node);
-        $namer->name($class, array())->willReturn('ReflectionClass');
-
-        $double = $this->double($class, array(), array('stdClass'));
-        $double->shouldBeAnInstanceOf('ReflectionClass');
-        $double->getName()->shouldReturn('stdClass');
-    }
-
-    /**
-     * @param \ReflectionClass                           $class
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function it_can_instantiate_class_with_final_constructor($mirror, $class, $node, $namer)
-    {
-        $class->getName()->willReturn('spec\Prophecy\Doubler\WithFinalConstructor');
-        $mirror->reflect($class, array())->willReturn($node);
-        $namer->name($class, array())->willReturn('spec\Prophecy\Doubler\WithFinalConstructor');
-
-        $double = $this->double($class, array());
-
-        $double->shouldBeAnInstanceOf('spec\Prophecy\Doubler\WithFinalConstructor');
-    }
-}
-
-class WithFinalConstructor
-{
-    final public function __construct() {}
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCodeGeneratorSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCodeGeneratorSpec.php
deleted file mode 100644
index fa65bc1..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCodeGeneratorSpec.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator;
-
-use PhpSpec\ObjectBehavior;
-
-class ClassCodeGeneratorSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode    $class
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method1
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method2
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method3
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument11
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument12
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument21
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument31
-     */
-    function it_generates_proper_php_code_for_specific_ClassNode(
-        $class, $method1, $method2, $method3, $argument11, $argument12, $argument21, $argument31
-    )
-    {
-        $class->getParentClass()->willReturn('RuntimeException');
-        $class->getInterfaces()->willReturn(array(
-            'Prophecy\Doubler\Generator\MirroredInterface', 'ArrayAccess', 'ArrayIterator'
-        ));
-        $class->getProperties()->willReturn(array('name' => 'public', 'email' => 'private'));
-        $class->getMethods()->willReturn(array($method1, $method2, $method3));
-
-        $method1->getName()->willReturn('getName');
-        $method1->getVisibility()->willReturn('public');
-        $method1->returnsReference()->willReturn(false);
-        $method1->isStatic()->willReturn(true);
-        $method1->getArguments()->willReturn(array($argument11, $argument12));
-        $method1->hasReturnType()->willReturn(true);
-        $method1->getReturnType()->willReturn('string');
-        $method1->getCode()->willReturn('return $this->name;');
-
-        $method2->getName()->willReturn('getEmail');
-        $method2->getVisibility()->willReturn('protected');
-        $method2->returnsReference()->willReturn(false);
-        $method2->isStatic()->willReturn(false);
-        $method2->getArguments()->willReturn(array($argument21));
-        $method2->hasReturnType()->willReturn(false);
-        $method2->getCode()->willReturn('return $this->email;');
-
-        $method3->getName()->willReturn('getRefValue');
-        $method3->getVisibility()->willReturn('public');
-        $method3->returnsReference()->willReturn(true);
-        $method3->isStatic()->willReturn(false);
-        $method3->getArguments()->willReturn(array($argument31));
-        $method3->hasReturnType()->willReturn(false);
-        $method3->getCode()->willReturn('return $this->refValue;');
-
-        $argument11->getName()->willReturn('fullname');
-        $argument11->getTypeHint()->willReturn('array');
-        $argument11->isOptional()->willReturn(true);
-        $argument11->getDefault()->willReturn(null);
-        $argument11->isPassedByReference()->willReturn(false);
-
-        $argument12->getName()->willReturn('class');
-        $argument12->getTypeHint()->willReturn('ReflectionClass');
-        $argument12->isOptional()->willReturn(false);
-        $argument12->isPassedByReference()->willReturn(false);
-
-        $argument21->getName()->willReturn('default');
-        $argument21->getTypeHint()->willReturn(null);
-        $argument21->isOptional()->willReturn(true);
-        $argument21->getDefault()->willReturn('ever.zet@gmail.com');
-        $argument21->isPassedByReference()->willReturn(false);
-
-        $argument31->getName()->willReturn('refValue');
-        $argument31->getTypeHint()->willReturn(null);
-        $argument31->isOptional()->willReturn(false);
-        $argument31->getDefault()->willReturn();
-        $argument31->isPassedByReference()->willReturn(false);
-
-        $code = $this->generate('CustomClass', $class);
-        $expected = <<<'PHP'
-namespace  {
-class CustomClass extends \RuntimeException implements \Prophecy\Doubler\Generator\MirroredInterface, \ArrayAccess, \ArrayIterator {
-public $name;
-private $email;
-
-public static function getName(array $fullname = NULL, \ReflectionClass $class): string {
-return $this->name;
-}
-protected  function getEmail( $default = 'ever.zet@gmail.com') {
-return $this->email;
-}
-public  function &getRefValue( $refValue) {
-return $this->refValue;
-}
-
-}
-}
-PHP;
-        $expected = strtr($expected, array("\r\n" => "\n", "\r" => "\n"));
-        $code->shouldBe($expected);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode    $class
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode   $method
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument
-     */
-    function it_overrides_properly_methods_with_args_passed_by_reference(
-        $class, $method, $argument
-    )
-    {
-        $class->getParentClass()->willReturn('RuntimeException');
-        $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
-        $class->getProperties()->willReturn(array());
-        $class->getMethods()->willReturn(array($method));
-
-        $method->getName()->willReturn('getName');
-        $method->getVisibility()->willReturn('public');
-        $method->isStatic()->willReturn(false);
-        $method->getArguments()->willReturn(array($argument));
-        $method->hasReturnType()->willReturn(false);
-        $method->returnsReference()->willReturn(false);
-        $method->getCode()->willReturn('return $this->name;');
-
-        $argument->getName()->willReturn('fullname');
-        $argument->getTypeHint()->willReturn('array');
-        $argument->isOptional()->willReturn(true);
-        $argument->getDefault()->willReturn(null);
-        $argument->isPassedByReference()->willReturn(true);
-
-        $code = $this->generate('CustomClass', $class);
-        $expected =<<<'PHP'
-namespace  {
-class CustomClass extends \RuntimeException implements \Prophecy\Doubler\Generator\MirroredInterface {
-
-public  function getName(array &$fullname = NULL) {
-return $this->name;
-}
-
-}
-}
-PHP;
-        $expected = strtr($expected, array("\r\n" => "\n", "\r" => "\n"));
-        $code->shouldBe($expected);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $class
-     */
-    function it_generates_empty_class_for_empty_ClassNode($class)
-    {
-        $class->getParentClass()->willReturn('stdClass');
-        $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
-        $class->getProperties()->willReturn(array());
-        $class->getMethods()->willReturn(array());
-
-        $code = $this->generate('CustomClass', $class);
-        $expected =<<<'PHP'
-namespace  {
-class CustomClass extends \stdClass implements \Prophecy\Doubler\Generator\MirroredInterface {
-
-
-}
-}
-PHP;
-        $expected = strtr($expected, array("\r\n" => "\n", "\r" => "\n"));
-        $code->shouldBe($expected);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $class
-     */
-    function it_wraps_class_in_namespace_if_it_is_namespaced($class)
-    {
-        $class->getParentClass()->willReturn('stdClass');
-        $class->getInterfaces()->willReturn(array('Prophecy\Doubler\Generator\MirroredInterface'));
-        $class->getProperties()->willReturn(array());
-        $class->getMethods()->willReturn(array());
-
-        $code = $this->generate('My\Awesome\CustomClass', $class);
-        $expected =<<<'PHP'
-namespace My\Awesome {
-class CustomClass extends \stdClass implements \Prophecy\Doubler\Generator\MirroredInterface {
-
-
-}
-}
-PHP;
-        $expected = strtr($expected, array("\r\n" => "\n", "\r" => "\n"));
-        $code->shouldBe($expected);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCreatorSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCreatorSpec.php
deleted file mode 100644
index c7b5700..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassCreatorSpec.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator;
-
-use PhpSpec\ObjectBehavior;
-
-class ClassCreatorSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Generator\ClassCodeGenerator $generator
-     */
-    function let($generator)
-    {
-        $this->beConstructedWith($generator);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $class
-     */
-    function it_evaluates_code_generated_by_ClassCodeGenerator($generator, $class)
-    {
-        $generator->generate('stdClass', $class)->shouldBeCalled()->willReturn(
-            'return 42;'
-        );
-
-        $this->create('stdClass', $class)->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $class
-     */
-    function it_throws_an_exception_if_class_does_not_exist_after_evaluation($generator, $class)
-    {
-        $generator->generate('CustomClass', $class)->shouldBeCalled()->willReturn(
-            'return 42;'
-        );
-
-        $class->getParentClass()->willReturn('stdClass');
-        $class->getInterfaces()->willReturn(array('Interface1', 'Interface2'));
-
-        $this->shouldThrow('Prophecy\Exception\Doubler\ClassCreatorException')
-            ->duringCreate('CustomClass', $class);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassMirrorSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassMirrorSpec.php
deleted file mode 100644
index 161f850..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/ClassMirrorSpec.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator;
-
-use PhpSpec\ObjectBehavior;
-use I\Simply;
-
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionParameter;
-
-class ClassMirrorSpec extends ObjectBehavior
-{
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method1
-     * @param ReflectionMethod $method2
-     * @param ReflectionMethod $method3
-     */
-    function it_reflects_a_class_by_mirroring_all_its_public_methods(
-        $class, $method1, $method2, $method3
-    )
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array(
-            $method1, $method2, $method3
-        ));
-
-        $method1->getName()->willReturn('getName');
-        $method2->getName()->willReturn('isPublic');
-        $method3->getName()->willReturn('isAbstract');
-
-        $method1->isFinal()->willReturn(false);
-        $method2->isFinal()->willReturn(false);
-        $method3->isFinal()->willReturn(false);
-
-        $method1->isProtected()->willReturn(false);
-        $method2->isProtected()->willReturn(false);
-        $method3->isProtected()->willReturn(false);
-
-        $method1->isStatic()->willReturn(false);
-        $method2->isStatic()->willReturn(false);
-        $method3->isStatic()->willReturn(false);
-
-        $method1->returnsReference()->willReturn(false);
-        $method2->returnsReference()->willReturn(false);
-        $method3->returnsReference()->willReturn(false);
-
-        $method1->getParameters()->willReturn(array());
-        $method2->getParameters()->willReturn(array());
-        $method3->getParameters()->willReturn(array());
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method1->hasReturnType()->willReturn(false);
-            $method2->hasReturnType()->willReturn(false);
-            $method3->hasReturnType()->willReturn(false);
-        }
-
-        $classNode   = $this->reflect($class, array());
-        $classNode->shouldBeAnInstanceOf('Prophecy\Doubler\Generator\Node\ClassNode');
-        $classNode->getParentClass()->shouldReturn('Custom\ClassName');
-
-        $methodNodes = $classNode->getMethods();
-        $methodNodes->shouldHaveCount(3);
-
-        $classNode->hasMethod('getName')->shouldReturn(true);
-        $classNode->hasMethod('isPublic')->shouldReturn(true);
-        $classNode->hasMethod('isAbstract')->shouldReturn(true);
-    }
-
-    /**
-     * @param ReflectionClass     $class
-     * @param ReflectionMethod    $method
-     * @param ReflectionParameter $parameter
-     */
-    function it_changes_argument_names_if_they_are_varying($class, $method, $parameter)
-    {
-
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-
-        $method->getParameters()->willReturn(array($parameter));
-        $method->getName()->willReturn('methodName');
-        $method->isFinal()->willReturn(false);
-        $method->isProtected()->willReturn(false);
-        $method->isStatic()->willReturn(false);
-        $method->returnsReference()->willReturn(false);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $parameter->getName()->willReturn('...');
-        $parameter->isDefaultValueAvailable()->willReturn(true);
-        $parameter->getDefaultValue()->willReturn(null);
-        $parameter->isPassedByReference()->willReturn(false);
-        $parameter->getClass()->willReturn($class);
-
-        $classNode = $this->reflect($class, array());
-
-        $methodNodes = $classNode->getMethods();
-
-        $argumentNodes = $methodNodes['methodName']->getArguments();
-        $argumentNode = $argumentNodes[0];
-
-        $argumentNode->getName()->shouldReturn('__dot_dot_dot__');
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method
-     */
-    function it_reflects_protected_abstract_methods($class, $method)
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array($method));
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array());
-
-        $method->isProtected()->willReturn(true);
-        $method->isStatic()->willReturn(false);
-        $method->getParameters()->willReturn(array());
-        $method->getName()->willReturn('innerDetail');
-        $method->returnsReference()->willReturn(false);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $classNode   = $this->reflect($class, array());
-        $classNode->shouldBeAnInstanceOf('Prophecy\Doubler\Generator\Node\ClassNode');
-        $classNode->getParentClass()->shouldReturn('Custom\ClassName');
-
-        $methodNodes = $classNode->getMethods();
-        $methodNodes->shouldHaveCount(1);
-
-        $methodNodes['innerDetail']->getVisibility()->shouldReturn('protected');
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method
-     */
-    function it_reflects_public_static_methods($class, $method)
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array($method));
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array());
-
-        $method->isProtected()->willReturn(true);
-        $method->isStatic()->willReturn(true);
-        $method->getParameters()->willReturn(array());
-        $method->getName()->willReturn('innerDetail');
-        $method->returnsReference()->willReturn(false);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $classNode   = $this->reflect($class, array());
-        $classNode->shouldBeAnInstanceOf('Prophecy\Doubler\Generator\Node\ClassNode');
-        $classNode->getParentClass()->shouldReturn('Custom\ClassName');
-
-        $methodNodes = $classNode->getMethods();
-        $methodNodes->shouldHaveCount(1);
-
-        $methodNodes['innerDetail']->getVisibility()->shouldReturn('protected');
-        $methodNodes['innerDetail']->isStatic()->shouldReturn(true);
-    }
-
-    /**
-     * @param ReflectionClass     $class
-     * @param ReflectionMethod    $method
-     * @param ReflectionParameter $param1
-     * @param ReflectionParameter $param2
-     * @param ReflectionClass     $typeHint
-     * @param ReflectionParameter $param3
-     */
-    function it_properly_reads_methods_arguments_with_types(
-        $class, $method, $param1, $param2, $typeHint, $param3
-    )
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-
-        $method->getName()->willReturn('methodWithArgs');
-        $method->isFinal()->willReturn(false);
-        $method->isProtected()->willReturn(true);
-        $method->isStatic()->willReturn(false);
-        $method->returnsReference()->willReturn(false);
-        $method->getParameters()->willReturn(array($param1, $param2, $param3));
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $param1->getName()->willReturn('arg_1');
-        $param1->isArray()->willReturn(true);
-        $param1->getClass()->willReturn(null);
-        $param1->isDefaultValueAvailable()->willReturn(true);
-        $param1->isPassedByReference()->willReturn(false);
-        $param1->allowsNull()->willReturn(false);
-        $param1->getDefaultValue()->willReturn(array());
-
-        $param2->getName()->willReturn('arg2');
-        $param2->isArray()->willReturn(false);
-        $param2->getClass()->willReturn($typeHint);
-        $param2->isDefaultValueAvailable()->willReturn(false);
-        $param2->isOptional()->willReturn(false);
-        $param2->isPassedByReference()->willReturn(false);
-        $param2->allowsNull()->willReturn(false);
-        $typeHint->getName()->willReturn('ArrayAccess');
-
-        $param3->getName()->willReturn('arg_3');
-        $param3->isArray()->willReturn(false);
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            $param3->isCallable()->willReturn(true);
-        }
-        $param3->getClass()->willReturn(null);
-        $param3->isOptional()->willReturn(false);
-        $param3->isDefaultValueAvailable()->willReturn(false);
-        $param3->isPassedByReference()->willReturn(false);
-        $param3->allowsNull()->willReturn(true);
-
-        $classNode   = $this->reflect($class, array());
-        $methodNodes = $classNode->getMethods();
-        $argNodes    = $methodNodes['methodWithArgs']->getArguments();
-
-        $argNodes[0]->getName()->shouldReturn('arg_1');
-        $argNodes[0]->getTypeHint()->shouldReturn('array');
-        $argNodes[0]->isOptional()->shouldReturn(true);
-        $argNodes[0]->getDefault()->shouldReturn(array());
-
-        $argNodes[1]->getName()->shouldReturn('arg2');
-        $argNodes[1]->getTypeHint()->shouldReturn('ArrayAccess');
-        $argNodes[1]->isOptional()->shouldReturn(false);
-
-        $argNodes[2]->getName()->shouldReturn('arg_3');
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            $argNodes[2]->getTypeHint()->shouldReturn('callable');
-            $argNodes[2]->isOptional()->shouldReturn(true);
-            $argNodes[2]->getDefault()->shouldReturn(null);
-        } else {
-            $argNodes[2]->isOptional()->shouldReturn(false);
-        }
-    }
-
-    /**
-     * @param ReflectionClass     $class
-     * @param ReflectionMethod    $method
-     * @param ReflectionParameter $param1
-     */
-    function it_marks_required_args_without_types_as_not_optional(
-        $class, $method, $param1
-    )
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-
-        $method->getName()->willReturn('methodWithArgs');
-        $method->isFinal()->willReturn(false);
-        $method->isProtected()->willReturn(false);
-        $method->isStatic()->willReturn(false);
-        $method->returnsReference()->willReturn(false);
-        $method->getParameters()->willReturn(array($param1));
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $param1->getName()->willReturn('arg_1');
-        $param1->isArray()->willReturn(false);
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            $param1->isCallable()->willReturn(false);
-        }
-        $param1->getClass()->willReturn(null);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $param1->hasType()->willReturn(false);
-        }
-
-        $param1->isDefaultValueAvailable()->willReturn(false);
-        $param1->isOptional()->willReturn(false);
-        $param1->isPassedByReference()->willReturn(false);
-        $param1->allowsNull()->willReturn(true);
-        if (defined('HHVM_VERSION')) {
-            $param1->getTypehintText()->willReturn(null);
-        }
-
-        $classNode   = $this->reflect($class, array());
-        $methodNodes = $classNode->getMethods();
-        $argNodes    = $methodNodes['methodWithArgs']->getArguments();
-
-        $argNodes[0]->isOptional()->shouldReturn(false);
-    }
-
-    /**
-     * @param ReflectionClass     $class
-     * @param ReflectionMethod    $method
-     * @param ReflectionParameter $param1
-     * @param ReflectionParameter $param2
-     * @param ReflectionClass     $typeHint
-     */
-    function it_marks_passed_by_reference_args_as_passed_by_reference(
-        $class, $method, $param1, $param2, $typeHint
-    )
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-
-        $method->getName()->willReturn('methodWithArgs');
-        $method->isFinal()->willReturn(false);
-        $method->isProtected()->willReturn(false);
-        $method->isStatic()->willReturn(false);
-        $method->returnsReference()->willReturn(false);
-        $method->getParameters()->willReturn(array($param1, $param2));
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method->hasReturnType()->willReturn(false);
-        }
-
-        $param1->getName()->willReturn('arg_1');
-        $param1->isArray()->willReturn(false);
-        if (version_compare(PHP_VERSION, '5.4', '>=')) {
-            $param1->isCallable()->willReturn(false);
-        }
-        $param1->getClass()->willReturn(null);
-        $param1->isDefaultValueAvailable()->willReturn(false);
-        $param1->isOptional()->willReturn(true);
-        $param1->isPassedByReference()->willReturn(true);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $param1->hasType()->willReturn(false);
-        }
-
-        $param1->allowsNull()->willReturn(false);
-        if (defined('HHVM_VERSION')) {
-            $param1->getTypehintText()->willReturn(null);
-        }
-
-        $param2->getName()->willReturn('arg2');
-        $param2->isArray()->willReturn(false);
-        $param2->getClass()->willReturn($typeHint);
-        $param2->isDefaultValueAvailable()->willReturn(false);
-        $param2->isOptional()->willReturn(false);
-        $param2->isPassedByReference()->willReturn(false);
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $param2->hasType()->willReturn(false);
-        }
-
-        $param2->allowsNull()->willReturn(false);
-        $typeHint->getName()->willReturn('ArrayAccess');
-
-        $classNode   = $this->reflect($class, array());
-        $methodNodes = $classNode->getMethods();
-        $argNodes    = $methodNodes['methodWithArgs']->getArguments();
-
-        $argNodes[0]->isPassedByReference()->shouldReturn(true);
-        $argNodes[1]->isPassedByReference()->shouldReturn(false);
-    }
-
-    /**
-     * @param ReflectionClass $class
-     */
-    function it_throws_an_exception_if_class_is_final($class)
-    {
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(true);
-        $class->getName()->willReturn('Custom\ClassName');
-
-        $this->shouldThrow('Prophecy\Exception\Doubler\ClassMirrorException')
-             ->duringReflect($class, array());
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method
-     */
-    function it_ignores_final_methods($class, $method)
-    {
-        $class->getName()->willReturn('Custom\ClassName');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-
-        $method->isFinal()->willReturn(true);
-        $method->getName()->willReturn('finalImplementation');
-
-        $classNode = $this->reflect($class, array());
-        $classNode->getMethods()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param ReflectionClass $interface
-     */
-    function it_throws_an_exception_if_interface_provided_instead_of_class($interface)
-    {
-        $interface->isInterface()->willReturn(true);
-        $interface->getName()->willReturn('Custom\ClassName');
-
-        $this->shouldThrow('Prophecy\Exception\InvalidArgumentException')
-             ->duringReflect($interface, array());
-    }
-
-    /**
-     * @param ReflectionClass  $interface1
-     * @param ReflectionClass  $interface2
-     * @param ReflectionMethod $method1
-     * @param ReflectionMethod $method2
-     * @param ReflectionMethod $method3
-     */
-    function it_reflects_all_interfaces_methods(
-        $interface1, $interface2, $method1, $method2, $method3
-    )
-    {
-        $interface1->getName()->willReturn('MyInterface1');
-        $interface2->getName()->willReturn('MyInterface2');
-
-        $interface1->isInterface()->willReturn(true);
-        $interface2->isInterface()->willReturn(true);
-
-        $interface1->getMethods()->willReturn(array($method1));
-        $interface2->getMethods()->willReturn(array($method2, $method3));
-
-        $method1->getName()->willReturn('getName');
-        $method2->getName()->willReturn('isPublic');
-        $method3->getName()->willReturn('isAbstract');
-
-        $method1->isProtected()->willReturn(false);
-        $method2->isProtected()->willReturn(false);
-        $method3->isProtected()->willReturn(false);
-
-        $method1->returnsReference()->willReturn(false);
-        $method2->returnsReference()->willReturn(false);
-        $method3->returnsReference()->willReturn(false);
-
-        $method1->isStatic()->willReturn(false);
-        $method2->isStatic()->willReturn(false);
-        $method3->isStatic()->willReturn(false);
-
-        $method1->getParameters()->willReturn(array());
-        $method2->getParameters()->willReturn(array());
-        $method3->getParameters()->willReturn(array());
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method1->hasReturnType()->willReturn(false);
-            $method2->hasReturnType()->willReturn(false);
-            $method3->hasReturnType()->willReturn(false);
-        }
-
-        $classNode = $this->reflect(null, array($interface1, $interface2));
-
-        $classNode->shouldBeAnInstanceOf('Prophecy\Doubler\Generator\Node\ClassNode');
-        $classNode->getParentClass()->shouldReturn('stdClass');
-        $classNode->getInterfaces()->shouldReturn(array(
-            'Prophecy\Doubler\Generator\ReflectionInterface', 'MyInterface2', 'MyInterface1',
-        ));
-
-        $methodNodes = $classNode->getMethods();
-        $methodNodes->shouldHaveCount(3);
-
-        $classNode->hasMethod('getName')->shouldReturn(true);
-        $classNode->hasMethod('isPublic')->shouldReturn(true);
-        $classNode->hasMethod('isAbstract')->shouldReturn(true);
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method1
-     * @param ReflectionMethod $method2
-     * @param ReflectionMethod $method3
-     */
-    function it_ignores_virtually_private_methods($class, $method1, $method2, $method3)
-    {
-        $class->getName()->willReturn('SomeClass');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method1, $method2, $method3));
-
-        $method1->getName()->willReturn('_getName');
-        $method2->getName()->willReturn('__toString');
-        $method3->getName()->willReturn('isAbstract');
-
-        $method1->isFinal()->willReturn(false);
-        $method2->isFinal()->willReturn(false);
-        $method3->isFinal()->willReturn(false);
-
-        $method1->isProtected()->willReturn(false);
-        $method2->isProtected()->willReturn(false);
-        $method3->isProtected()->willReturn(false);
-
-        $method1->isStatic()->willReturn(false);
-        $method2->isStatic()->willReturn(false);
-        $method3->isStatic()->willReturn(false);
-
-        $method1->returnsReference()->willReturn(false);
-        $method2->returnsReference()->willReturn(false);
-        $method3->returnsReference()->willReturn(false);
-
-        $method1->getParameters()->willReturn(array());
-        $method2->getParameters()->willReturn(array());
-        $method3->getParameters()->willReturn(array());
-
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            $method1->hasReturnType()->willReturn(false);
-            $method2->hasReturnType()->willReturn(false);
-            $method3->hasReturnType()->willReturn(false);
-        }
-
-        $classNode = $this->reflect($class, array());
-        $methodNodes = $classNode->getMethods();
-        $methodNodes->shouldHaveCount(2);
-
-        $classNode->hasMethod('isAbstract')->shouldReturn(true);
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method
-     */
-    function it_does_not_throw_exception_for_virtually_private_finals($class, $method)
-    {
-        $class->getName()->willReturn('SomeClass');
-        $class->isInterface()->willReturn(false);
-        $class->isFinal()->willReturn(false);
-        $class->getMethods(ReflectionMethod::IS_ABSTRACT)->willReturn(array());
-        $class->getMethods(ReflectionMethod::IS_PUBLIC)->willReturn(array($method));
-
-        $method->getName()->willReturn('__toString');
-        $method->isFinal()->willReturn(true);
-
-        $this->shouldNotThrow()->duringReflect($class, array());
-    }
-
-    /**
-     * @param ReflectionClass $class
-     */
-    function it_throws_an_exception_if_class_provided_in_interfaces_list($class)
-    {
-        $class->getName()->willReturn('MyClass');
-        $class->isInterface()->willReturn(false);
-
-        $this->shouldThrow('InvalidArgumentException')
-             ->duringReflect(null, array($class));
-    }
-
-    function it_throws_an_exception_if_not_reflection_provided_as_interface()
-    {
-        $this->shouldThrow('InvalidArgumentException')
-             ->duringReflect(null, array(null));
-    }
-
-    function it_doesnt_fail_to_typehint_nonexistent_FQCN()
-    {
-        $classNode = $this->reflect(new ReflectionClass('spec\Prophecy\Doubler\Generator\OptionalDepsClass'), array());
-        $method = $classNode->getMethod('iHaveAStrangeTypeHintedArg');
-        $arguments = $method->getArguments();
-        $arguments[0]->getTypeHint()->shouldBe('I\Simply\Am\Nonexistent');
-    }
-
-    function it_doesnt_fail_to_typehint_nonexistent_RQCN()
-    {
-        $classNode = $this->reflect(new ReflectionClass('spec\Prophecy\Doubler\Generator\OptionalDepsClass'), array());
-        $method = $classNode->getMethod('iHaveAnEvenStrangerTypeHintedArg');
-        $arguments = $method->getArguments();
-        $arguments[0]->getTypeHint()->shouldBe('I\Simply\Am\Not');
-    }
-
-    function it_doesnt_use_scalar_typehints()
-    {
-        $classNode = $this->reflect(new ReflectionClass('ReflectionMethod'), array());
-        $method = $classNode->getMethod('export');
-        $arguments = $method->getArguments();
-        $arguments[0]->getTypeHint()->shouldReturn(null);
-        $arguments[1]->getTypeHint()->shouldReturn(null);
-        $arguments[2]->getTypeHint()->shouldReturn(null);
-    }
-}
-
-class OptionalDepsClass
-{
-    public function iHaveAStrangeTypeHintedArg(\I\Simply\Am\Nonexistent $class)
-    {
-    }
-
-    public function iHaveAnEvenStrangerTypeHintedArg(Simply\Am\Not $class)
-    {
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ArgumentNodeSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ArgumentNodeSpec.php
deleted file mode 100644
index cea578f..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ArgumentNodeSpec.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator\Node;
-
-use PhpSpec\ObjectBehavior;
-
-class ArgumentNodeSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('name');
-    }
-
-    function it_is_not_be_passed_by_reference_by_default()
-    {
-        $this->shouldNotBePassedByReference();
-    }
-
-    function it_is_passed_by_reference_if_marked()
-    {
-        $this->setAsPassedByReference();
-        $this->shouldBePassedByReference();
-    }
-
-    function it_has_name_with_which_it_was_been_constructed()
-    {
-        $this->getName()->shouldReturn('name');
-    }
-
-    function it_has_no_typehint_by_default()
-    {
-        $this->getTypeHint()->shouldReturn(null);
-    }
-
-    function its_typeHint_is_mutable()
-    {
-        $this->setTypeHint('array');
-        $this->getTypeHint()->shouldReturn('array');
-    }
-
-    function it_does_not_have_default_value_by_default()
-    {
-        $this->getDefault()->shouldReturn(null);
-    }
-
-    function it_is_not_optional_by_default()
-    {
-        $this->isOptional()->shouldReturn(false);
-    }
-
-    function its_default_is_mutable()
-    {
-        $this->setDefault(array());
-        $this->getDefault()->shouldReturn(array());
-    }
-
-    function it_is_marked_as_optional_when_default_is_set()
-    {
-        $this->setDefault(null);
-        $this->isOptional()->shouldReturn(true);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ClassNodeSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ClassNodeSpec.php
deleted file mode 100644
index 18f0e1c..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/ClassNodeSpec.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator\Node;
-
-use PhpSpec\ObjectBehavior;
-
-class ClassNodeSpec extends ObjectBehavior
-{
-    function its_parentClass_is_a_stdClass_by_default()
-    {
-        $this->getParentClass()->shouldReturn('stdClass');
-    }
-
-    function its_parentClass_is_mutable()
-    {
-        $this->setParentClass('Exception');
-        $this->getParentClass()->shouldReturn('Exception');
-    }
-
-    function its_parentClass_is_set_to_stdClass_if_user_set_null()
-    {
-        $this->setParentClass(null);
-        $this->getParentClass()->shouldReturn('stdClass');
-    }
-
-    function it_does_not_implement_any_interface_by_default()
-    {
-        $this->getInterfaces()->shouldHaveCount(0);
-    }
-
-    function its_addInterface_adds_item_to_the_list_of_implemented_interfaces()
-    {
-        $this->addInterface('MyInterface');
-        $this->getInterfaces()->shouldHaveCount(1);
-    }
-
-    function its_hasInterface_returns_true_if_class_implements_interface()
-    {
-        $this->addInterface('MyInterface');
-        $this->hasInterface('MyInterface')->shouldReturn(true);
-    }
-
-    function its_hasInterface_returns_false_if_class_does_not_implements_interface()
-    {
-        $this->hasInterface('MyInterface')->shouldReturn(false);
-    }
-
-    function it_supports_implementation_of_multiple_interfaces()
-    {
-        $this->addInterface('MyInterface');
-        $this->addInterface('MySecondInterface');
-        $this->getInterfaces()->shouldHaveCount(2);
-    }
-
-    function it_ignores_same_interfaces_added_twice()
-    {
-        $this->addInterface('MyInterface');
-        $this->addInterface('MyInterface');
-
-        $this->getInterfaces()->shouldHaveCount(1);
-        $this->getInterfaces()->shouldReturn(array('MyInterface'));
-    }
-
-    function it_does_not_have_methods_by_default()
-    {
-        $this->getMethods()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method1
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method2
-     */
-    function it_can_has_methods($method1, $method2)
-    {
-        $method1->getName()->willReturn('__construct');
-        $method2->getName()->willReturn('getName');
-
-        $this->addMethod($method1);
-        $this->addMethod($method2);
-
-        $this->getMethods()->shouldReturn(array(
-            '__construct' => $method1,
-            'getName'     => $method2
-        ));
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     */
-    function its_hasMethod_returns_true_if_method_exists($method)
-    {
-        $method->getName()->willReturn('getName');
-
-        $this->addMethod($method);
-
-        $this->hasMethod('getName')->shouldReturn(true);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     */
-    function its_getMethod_returns_method_by_name($method)
-    {
-        $method->getName()->willReturn('getName');
-
-        $this->addMethod($method);
-
-        $this->getMethod('getName')->shouldReturn($method);
-    }
-
-    function its_hasMethod_returns_false_if_method_does_not_exists()
-    {
-        $this->hasMethod('getName')->shouldReturn(false);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\MethodNode $method
-     */
-    function its_hasMethod_returns_false_if_method_has_been_removed($method)
-    {
-        $method->getName()->willReturn('getName');
-        $this->addMethod($method);
-        $this->removeMethod('getName');
-
-        $this->hasMethod('getName')->shouldReturn(false);
-    }
-
-
-    function it_does_not_have_properties_by_default()
-    {
-        $this->getProperties()->shouldHaveCount(0);
-    }
-
-    function it_is_able_to_have_properties()
-    {
-        $this->addProperty('title');
-        $this->addProperty('text', 'private');
-        $this->getProperties()->shouldReturn(array(
-            'title' => 'public',
-            'text'  => 'private'
-        ));
-    }
-
-    function its_addProperty_does_not_accept_unsupported_visibility()
-    {
-        $this->shouldThrow('InvalidArgumentException')->duringAddProperty('title', 'town');
-    }
-
-    function its_addProperty_lowercases_visibility_before_setting()
-    {
-        $this->addProperty('text', 'PRIVATE');
-        $this->getProperties()->shouldReturn(array('text' => 'private'));
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/MethodNodeSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/MethodNodeSpec.php
deleted file mode 100644
index d67646d..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/Generator/Node/MethodNodeSpec.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler\Generator\Node;
-
-use PhpSpec\ObjectBehavior;
-
-class MethodNodeSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('getTitle');
-    }
-
-    function it_has_a_name()
-    {
-        $this->getName()->shouldReturn('getTitle');
-    }
-
-    function it_has_public_visibility_by_default()
-    {
-        $this->getVisibility()->shouldReturn('public');
-    }
-
-    function its_visibility_is_mutable()
-    {
-        $this->setVisibility('private');
-        $this->getVisibility()->shouldReturn('private');
-    }
-
-    function it_is_not_static_by_default()
-    {
-        $this->shouldNotBeStatic();
-    }
-
-    function it_does_not_return_a_reference_by_default()
-    {
-        $this->returnsReference()->shouldReturn(false);
-    }
-
-    function it_should_be_settable_as_returning_a_reference_through_setter()
-    {
-        $this->setReturnsReference();
-        $this->returnsReference()->shouldReturn(true);
-    } 
-
-    function it_should_be_settable_as_static_through_setter()
-    {
-        $this->setStatic();
-        $this->shouldBeStatic();
-    }
-
-    function it_accepts_only_supported_visibilities()
-    {
-        $this->shouldThrow('InvalidArgumentException')->duringSetVisibility('stealth');
-    }
-
-    function it_lowercases_visibility_before_setting_it()
-    {
-        $this->setVisibility('Public');
-        $this->getVisibility()->shouldReturn('public');
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument1
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument2
-     */
-    function its_useParentCode_causes_method_to_call_parent($argument1, $argument2)
-    {
-        $argument1->getName()->willReturn('objectName');
-        $argument2->getName()->willReturn('default');
-
-        $this->addArgument($argument1);
-        $this->addArgument($argument2);
-
-        $this->useParentCode();
-
-        $this->getCode()->shouldReturn(
-            'return parent::getTitle($objectName, $default);'
-        );
-    }
-
-    function its_code_is_mutable()
-    {
-        $this->setCode('echo "code";');
-        $this->getCode()->shouldReturn('echo "code";');
-    }
-
-    function its_reference_returning_methods_will_generate_exceptions()
-    {
-        $this->setCode('echo "code";');
-        $this->setReturnsReference();
-        $this->getCode()->shouldReturn("throw new \Prophecy\Exception\Doubler\ReturnByReferenceException('Returning by reference not supported', get_class(\$this), 'getTitle');");
-    }
-
-    function its_setCode_provided_with_null_cleans_method_body()
-    {
-        $this->setCode(null);
-        $this->getCode()->shouldReturn('');
-    }
-
-    function it_is_constructable_with_code()
-    {
-        $this->beConstructedWith('getTitle', 'die();');
-        $this->getCode()->shouldReturn('die();');
-    }
-
-    function it_does_not_have_arguments_by_default()
-    {
-        $this->getArguments()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument1
-     * @param \Prophecy\Doubler\Generator\Node\ArgumentNode $argument2
-     */
-    function it_supports_adding_arguments($argument1, $argument2)
-    {
-        $this->addArgument($argument1);
-        $this->addArgument($argument2);
-
-        $this->getArguments()->shouldReturn(array($argument1, $argument2));
-    }
-
-    function it_does_not_have_return_type_by_default()
-    {
-        $this->hasReturnType()->shouldReturn(false);
-    }
-
-    function it_setReturnType_sets_return_type()
-    {
-        $returnType = 'string';
-
-        $this->setReturnType($returnType);
-
-        $this->hasReturnType()->shouldReturn(true);
-        $this->getReturnType()->shouldReturn($returnType);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/LazyDoubleSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/LazyDoubleSpec.php
deleted file mode 100644
index 7026126..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/LazyDoubleSpec.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler;
-
-use PhpSpec\ObjectBehavior;
-
-class LazyDoubleSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Doubler $doubler
-     */
-    function let($doubler)
-    {
-        $this->beConstructedWith($doubler);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     */
-    function it_returns_anonymous_double_instance_by_default($doubler, $double)
-    {
-        $doubler->double(null, array())->willReturn($double);
-
-        $this->getInstance()->shouldReturn($double);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     * @param \ReflectionClass                            $class
-     */
-    function it_returns_class_double_instance_if_set($doubler, $double, $class)
-    {
-        $doubler->double($class, array())->willReturn($double);
-
-        $this->setParentClass($class);
-
-        $this->getInstance()->shouldReturn($double);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double1
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double2
-     */
-    function it_returns_same_double_instance_if_called_2_times(
-        $doubler, $double1, $double2
-    )
-    {
-        $doubler->double(null, array())->willReturn($double1);
-        $doubler->double(null, array())->willReturn($double2);
-
-        $this->getInstance()->shouldReturn($double2);
-        $this->getInstance()->shouldReturn($double2);
-    }
-
-    function its_setParentClass_throws_ClassNotFoundException_if_class_not_found()
-    {
-        $this->shouldThrow('Prophecy\Exception\Doubler\ClassNotFoundException')
-            ->duringSetParentClass('SomeUnexistingClass');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     */
-    function its_setParentClass_throws_exception_if_prophecy_is_already_created(
-        $doubler, $double
-    )
-    {
-        $doubler->double(null, array())->willReturn($double);
-
-        $this->getInstance();
-
-        $this->shouldThrow('Prophecy\Exception\Doubler\DoubleException')
-            ->duringSetParentClass('stdClass');
-    }
-
-    function its_addInterface_throws_InterfaceNotFoundException_if_no_interface_found()
-    {
-        $this->shouldThrow('Prophecy\Exception\Doubler\InterfaceNotFoundException')
-            ->duringAddInterface('SomeUnexistingInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     */
-    function its_addInterface_throws_exception_if_prophecy_is_already_created(
-        $doubler, $double
-    )
-    {
-        $doubler->double(null, array())->willReturn($double);
-
-        $this->getInstance();
-
-        $this->shouldThrow('Prophecy\Exception\Doubler\DoubleException')
-            ->duringAddInterface('ArrayAccess');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/NameGeneratorSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Doubler/NameGeneratorSpec.php
deleted file mode 100644
index a3e7491..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Doubler/NameGeneratorSpec.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Doubler;
-
-use PhpSpec\ObjectBehavior;
-
-class NameGeneratorSpec extends ObjectBehavior
-{
-    /**
-     * @param \ReflectionClass $class
-     */
-    function its_name_generates_name_based_on_simple_class_reflection($class)
-    {
-        $class->getName()->willReturn('stdClass');
-        $this->name($class, array())->shouldStartWith('Double\stdClass\\');
-    }
-
-    /**
-     * @param \ReflectionClass $class
-     */
-    function its_name_generates_name_based_on_namespaced_class_reflection($class)
-    {
-        $class->getName()->willReturn('Some\Custom\Class');
-        $this->name($class, array())->shouldStartWith('Double\Some\Custom\Class\P');
-    }
-
-    /**
-     * @param \ReflectionClass $interface1
-     * @param \ReflectionClass $interface2
-     */
-    function its_name_generates_name_based_on_interface_shortnames($interface1, $interface2)
-    {
-        $interface1->getShortName()->willReturn('HandlerInterface');
-        $interface2->getShortName()->willReturn('LoaderInterface');
-
-        $this->name(null, array($interface1, $interface2))->shouldStartWith(
-            'Double\HandlerInterface\LoaderInterface\P'
-        );
-    }
-
-    function it_generates_proper_name_for_no_class_and_interfaces_list()
-    {
-        $this->name(null, array())->shouldStartWith('Double\stdClass\P');
-    }
-
-    /**
-     * @param \ReflectionClass $class
-     * @param \ReflectionClass $interface1
-     * @param \ReflectionClass $interface2
-     */
-    function its_name_generates_name_based_only_on_class_if_its_available(
-        $class, $interface1, $interface2
-    )
-    {
-        $class->getName()->willReturn('Some\Custom\Class');
-        $interface1->getShortName()->willReturn('HandlerInterface');
-        $interface2->getShortName()->willReturn('LoaderInterface');
-
-        $this->name($class, array($interface1, $interface2))->shouldStartWith(
-            'Double\Some\Custom\Class\P'
-        );
-    }
-
-    public function getMatchers()
-    {
-        return array(
-            'startWith' => function ($subject, $string) {
-                return 0 === strpos($subject, $string);
-            },
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Call/UnexpectedCallExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Call/UnexpectedCallExceptionSpec.php
deleted file mode 100644
index 6fd1a5c..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Call/UnexpectedCallExceptionSpec.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Call;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy\Prophecy;
-
-class UnexpectedCallExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     */
-    function let($objectProphecy)
-    {
-        $this->beConstructedWith('msg', $objectProphecy, 'getName', array('arg1', 'arg2'));
-    }
-
-    function it_is_prophecy_exception()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Prophecy\ObjectProphecyException');
-    }
-
-    function it_exposes_method_name_through_getter()
-    {
-        $this->getMethodName()->shouldReturn('getName');
-    }
-
-    function it_exposes_arguments_through_getter()
-    {
-        $this->getArguments()->shouldReturn(array('arg1', 'arg2'));
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassCreatorExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassCreatorExceptionSpec.php
deleted file mode 100644
index 5824138..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassCreatorExceptionSpec.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class ClassCreatorExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Generator\Node\ClassNode $node
-     */
-    function let($node)
-    {
-        $this->beConstructedWith('', $node);
-    }
-
-    function it_is_a_prophecy_exception()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Exception');
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Doubler\DoublerException');
-    }
-
-    function it_contains_a_reflected_node($node)
-    {
-        $this->getClassNode()->shouldReturn($node);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassMirrorExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassMirrorExceptionSpec.php
deleted file mode 100644
index 21e31a3..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassMirrorExceptionSpec.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-
-class ClassMirrorExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \ReflectionClass $class
-     */
-    function let($class)
-    {
-        $this->beConstructedWith('', $class);
-    }
-
-    function it_is_a_prophecy_exception()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Exception');
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Doubler\DoublerException');
-    }
-
-    function it_contains_a_reflected_class_link($class)
-    {
-        $this->getReflectedClass()->shouldReturn($class);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassNotFoundExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassNotFoundExceptionSpec.php
deleted file mode 100644
index 251512b..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/ClassNotFoundExceptionSpec.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class ClassNotFoundExceptionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('msg', 'CustomClass');
-    }
-
-    function it_is_a_prophecy_exception()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Exception');
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Doubler\DoubleException');
-    }
-
-    function its_getClassname_returns_classname()
-    {
-        $this->getClassname()->shouldReturn('CustomClass');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/DoubleExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/DoubleExceptionSpec.php
deleted file mode 100644
index 6fe5a19..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/DoubleExceptionSpec.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-
-class DoubleExceptionSpec extends ObjectBehavior
-{
-    function it_is_a_double_exception()
-    {
-        $this->shouldBeAnInstanceOf('RuntimeException');
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Doubler\DoublerException');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/InterfaceNotFoundExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/InterfaceNotFoundExceptionSpec.php
deleted file mode 100644
index ad1a439..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/InterfaceNotFoundExceptionSpec.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class InterfaceNotFoundExceptionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('msg', 'CustomInterface');
-    }
-
-    function it_extends_ClassNotFoundException()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Doubler\ClassNotFoundException');
-    }
-
-    function its_getClassname_returns_classname()
-    {
-        $this->getClassname()->shouldReturn('CustomInterface');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/MethodNotFoundExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/MethodNotFoundExceptionSpec.php
deleted file mode 100644
index a889dd7..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Doubler/MethodNotFoundExceptionSpec.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Doubler;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class MethodNotFoundExceptionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('', 'User', 'getName', array(1, 2, 3));
-    }
-
-    function it_is_DoubleException()
-    {
-        $this->shouldHaveType('Prophecy\Exception\Doubler\DoubleException');
-    }
-
-    function it_has_MethodName()
-    {
-        $this->getMethodName()->shouldReturn('getName');
-    }
-
-    function it_has_classnamej()
-    {
-        $this->getClassname()->shouldReturn('User');
-    }
-
-    function it_has_an_arguments_list()
-    {
-        $this->getArguments()->shouldReturn(array(1, 2, 3));
-    }
-
-    function it_has_a_default_null_argument_list()
-    {
-        $this->beConstructedWith('', 'User', 'getName');
-        $this->getArguments()->shouldReturn(null);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/AggregateExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/AggregateExceptionSpec.php
deleted file mode 100644
index 22a5ebd..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/AggregateExceptionSpec.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class AggregateExceptionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(null);
-    }
-
-    function it_is_prediction_exception()
-    {
-        $this->shouldBeAnInstanceOf('RuntimeException');
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Prediction\PredictionException');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     */
-    function it_can_store_objectProphecy_link($object)
-    {
-        $this->setObjectProphecy($object);
-        $this->getObjectProphecy()->shouldReturn($object);
-    }
-
-    function it_should_not_have_exceptions_at_the_beginning()
-    {
-        $this->getExceptions()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Exception\Prediction\PredictionException $exception
-     */
-    function it_should_append_exception_through_append_method($exception)
-    {
-        $exception->getMessage()->willReturn('Exception #1');
-
-        $this->append($exception);
-
-        $this->getExceptions()->shouldReturn(array($exception));
-    }
-
-    /**
-     * @param \Prophecy\Exception\Prediction\PredictionException $exception
-     */
-    function it_should_update_message_during_append($exception)
-    {
-        $exception->getMessage()->willReturn('Exception #1');
-
-        $this->append($exception);
-
-        $this->getMessage()->shouldReturn("  Exception #1");
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/NoCallsExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/NoCallsExceptionSpec.php
deleted file mode 100644
index 473f1a2..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/NoCallsExceptionSpec.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class NoCallsExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     * @param \Prophecy\Prophecy\MethodProphecy $methodProphecy
-     */
-    function let($objectProphecy, $methodProphecy)
-    {
-        $methodProphecy->getObjectProphecy()->willReturn($objectProphecy);
-
-        $this->beConstructedWith('message', $methodProphecy);
-    }
-
-    function it_is_PredictionException()
-    {
-        $this->shouldHaveType('Prophecy\Exception\Prediction\PredictionException');
-    }
-
-    function it_extends_MethodProphecyException()
-    {
-        $this->shouldHaveType('Prophecy\Exception\Prophecy\MethodProphecyException');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsCountExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsCountExceptionSpec.php
deleted file mode 100644
index adad975..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsCountExceptionSpec.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class UnexpectedCallsCountExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     * @param \Prophecy\Prophecy\MethodProphecy $methodProphecy
-     * @param \Prophecy\Call\Call               $call1
-     * @param \Prophecy\Call\Call               $call2
-     */
-    function let($objectProphecy, $methodProphecy, $call1, $call2)
-    {
-        $methodProphecy->getObjectProphecy()->willReturn($objectProphecy);
-
-        $this->beConstructedWith('message', $methodProphecy, 5, array($call1, $call2));
-    }
-
-    function it_extends_UnexpectedCallsException()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Prediction\UnexpectedCallsException');
-    }
-
-    function it_should_expose_expectedCount_through_getter()
-    {
-        $this->getExpectedCount()->shouldReturn(5);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsExceptionSpec.php
deleted file mode 100644
index c0fe24d..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prediction/UnexpectedCallsExceptionSpec.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class UnexpectedCallsExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     * @param \Prophecy\Prophecy\MethodProphecy $methodProphecy
-     * @param \Prophecy\Call\Call               $call1
-     * @param \Prophecy\Call\Call               $call2
-     */
-    function let($objectProphecy, $methodProphecy, $call1, $call2)
-    {
-        $methodProphecy->getObjectProphecy()->willReturn($objectProphecy);
-
-        $this->beConstructedWith('message', $methodProphecy, array($call1, $call2));
-    }
-
-    function it_is_PredictionException()
-    {
-        $this->shouldHaveType('Prophecy\Exception\Prediction\PredictionException');
-    }
-
-    function it_extends_MethodProphecyException()
-    {
-        $this->shouldHaveType('Prophecy\Exception\Prophecy\MethodProphecyException');
-    }
-
-    function it_should_expose_calls_list_through_getter($call1, $call2)
-    {
-        $this->getCalls()->shouldReturn(array($call1, $call2));
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/MethodProphecyExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/MethodProphecyExceptionSpec.php
deleted file mode 100644
index 97cf9e1..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/MethodProphecyExceptionSpec.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class MethodProphecyExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     * @param \Prophecy\Prophecy\MethodProphecy $methodProphecy
-     */
-    function let($objectProphecy, $methodProphecy)
-    {
-        $methodProphecy->getObjectProphecy()->willReturn($objectProphecy);
-
-        $this->beConstructedWith('message', $methodProphecy);
-    }
-
-    function it_extends_DoubleException()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Prophecy\ObjectProphecyException');
-    }
-
-    function it_holds_a_stub_reference($methodProphecy)
-    {
-        $this->getMethodProphecy()->shouldReturn($methodProphecy);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/ObjectProphecyExceptionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/ObjectProphecyExceptionSpec.php
deleted file mode 100644
index bcacfed..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Exception/Prophecy/ObjectProphecyExceptionSpec.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Exception\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-use spec\Prophecy\Exception\Prophecy;
-
-class ObjectProphecyExceptionSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     */
-    function let($objectProphecy)
-    {
-        $this->beConstructedWith('message', $objectProphecy);
-    }
-
-    function it_should_be_a_prophecy_exception()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Exception\Prophecy\ProphecyException');
-    }
-
-    function it_holds_double_reference($objectProphecy)
-    {
-        $this->getObjectProphecy()->shouldReturn($objectProphecy);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallPredictionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallPredictionSpec.php
deleted file mode 100644
index 3da8c59..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallPredictionSpec.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prediction;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class CallPredictionSpec extends ObjectBehavior
-{
-    function it_is_prediction()
-    {
-        $this->shouldHaveType('Prophecy\Prediction\PredictionInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     * @param \Prophecy\Call\Call               $call
-     */
-    function it_does_nothing_if_there_is_more_than_one_call_been_made($object, $method, $call)
-    {
-        $this->check(array($call), $object, $method)->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy    $object
-     * @param \Prophecy\Prophecy\MethodProphecy    $method
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_throws_NoCallsException_if_no_calls_found($object, $method, $arguments)
-    {
-        $method->getObjectProphecy()->willReturn($object);
-        $method->getMethodName()->willReturn('getName');
-        $method->getArgumentsWildcard()->willReturn($arguments);
-        $arguments->__toString()->willReturn('123');
-        $object->reveal()->willReturn(new \stdClass());
-        $object->findProphecyMethodCalls('getName', Argument::any())->willReturn(array());
-
-        $this->shouldThrow('Prophecy\Exception\Prediction\NoCallsException')
-            ->duringCheck(array(), $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallTimesPredictionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallTimesPredictionSpec.php
deleted file mode 100644
index c670892..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallTimesPredictionSpec.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class CallTimesPredictionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(2);
-    }
-
-    function it_is_prediction()
-    {
-        $this->shouldHaveType('Prophecy\Prediction\PredictionInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     * @param \Prophecy\Call\Call               $call1
-     * @param \Prophecy\Call\Call               $call2
-     */
-    function it_does_nothing_if_there_were_exact_amount_of_calls_being_made(
-        $object, $method, $call1, $call2
-    )
-    {
-        $this->check(array($call1, $call2), $object, $method)->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy    $object
-     * @param \Prophecy\Prophecy\MethodProphecy    $method
-     * @param \Prophecy\Call\Call                  $call
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_throws_UnexpectedCallsCountException_if_calls_found(
-        $object, $method, $call, $arguments
-    )
-    {
-        $method->getObjectProphecy()->willReturn($object);
-        $method->getMethodName()->willReturn('getName');
-        $method->getArgumentsWildcard()->willReturn($arguments);
-        $arguments->__toString()->willReturn('123');
-
-        $call->getMethodName()->willReturn('getName');
-        $call->getArguments()->willReturn(array(5, 4, 'three'));
-        $call->getCallPlace()->willReturn('unknown');
-
-        $this->shouldThrow('Prophecy\Exception\Prediction\UnexpectedCallsCountException')
-            ->duringCheck(array($call), $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallbackPredictionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallbackPredictionSpec.php
deleted file mode 100644
index 7fe475e..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/CallbackPredictionSpec.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-use RuntimeException;
-
-class CallbackPredictionSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('get_class');
-    }
-
-    function it_is_prediction()
-    {
-        $this->shouldHaveType('Prophecy\Prediction\PredictionInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     * @param \Prophecy\Call\Call               $call
-     */
-    function it_proxies_call_to_callback($object, $method, $call)
-    {
-        $returnFirstCallCallback = function ($calls, $object, $method) {
-            throw new RuntimeException;
-        };
-
-        $this->beConstructedWith($returnFirstCallCallback);
-
-        $this->shouldThrow('RuntimeException')->duringCheck(array($call), $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/NoCallsPredictionSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prediction/NoCallsPredictionSpec.php
deleted file mode 100644
index a3ef9bc..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prediction/NoCallsPredictionSpec.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prediction;
-
-use PhpSpec\ObjectBehavior;
-
-class NoCallsPredictionSpec extends ObjectBehavior
-{
-    function it_is_prediction()
-    {
-        $this->shouldHaveType('Prophecy\Prediction\PredictionInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_does_nothing_if_there_is_no_calls_made($object, $method)
-    {
-        $this->check(array(), $object, $method)->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy    $object
-     * @param \Prophecy\Prophecy\MethodProphecy    $method
-     * @param \Prophecy\Call\Call                  $call
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_throws_UnexpectedCallsException_if_calls_found($object, $method, $call, $arguments)
-    {
-        $method->getObjectProphecy()->willReturn($object);
-        $method->getMethodName()->willReturn('getName');
-        $method->getArgumentsWildcard()->willReturn($arguments);
-        $arguments->__toString()->willReturn('123');
-
-        $call->getMethodName()->willReturn('getName');
-        $call->getArguments()->willReturn(array(5, 4, 'three'));
-        $call->getCallPlace()->willReturn('unknown');
-
-        $this->shouldThrow('Prophecy\Exception\Prediction\UnexpectedCallsException')
-            ->duringCheck(array($call), $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Promise/CallbackPromiseSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Promise/CallbackPromiseSpec.php
deleted file mode 100644
index 5d99b1b..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Promise/CallbackPromiseSpec.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Promise;
-
-use PhpSpec\ObjectBehavior;
-
-class CallbackPromiseSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('get_class');
-    }
-
-    function it_is_promise()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Promise\PromiseInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_execute_closure_callback($object, $method)
-    {
-        $firstArgumentCallback = function ($args) {
-            return $args[0];
-        };
-
-        $this->beConstructedWith($firstArgumentCallback);
-
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('one');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_execute_static_array_callback($object, $method)
-    {
-        $firstArgumentCallback = array('spec\Prophecy\Promise\ClassCallback', 'staticCallbackMethod');
-
-        $this->beConstructedWith($firstArgumentCallback);
-
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('one');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_execute_instance_array_callback($object, $method)
-    {
-        $class = new ClassCallback();
-        $firstArgumentCallback = array($class, 'callbackMethod');
-
-        $this->beConstructedWith($firstArgumentCallback);
-
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('one');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_execute_string_function_callback($object, $method)
-    {
-        $firstArgumentCallback = 'spec\Prophecy\Promise\functionCallbackFirstArgument';
-
-        $this->beConstructedWith($firstArgumentCallback);
-
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('one');
-    }
-
-}
-
-/**
- * Class used to test callbackpromise
- *
- * @param array
- * @return string
- */
-class ClassCallback
-{
-    /**
-     * @param array $args
-     */
-    function callbackMethod($args)
-    {
-        return $args[0];
-    }
-
-    /**
-     * @param array $args
-     */
-    static function staticCallbackMethod($args)
-    {
-        return $args[0];
-    }
-}
-
-/**
- * Callback function used to test callbackpromise
- *
- * @param array
- * @return string
- */
-function functionCallbackFirstArgument($args)
-{
-    return $args[0];
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnArgumentPromiseSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnArgumentPromiseSpec.php
deleted file mode 100644
index 4acb7bb..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnArgumentPromiseSpec.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Promise;
-
-use PhpSpec\ObjectBehavior;
-
-class ReturnArgumentPromiseSpec extends ObjectBehavior
-{
-    function it_is_promise()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Promise\PromiseInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_return_first_argument_if_provided($object, $method)
-    {
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('one');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_return_null_if_no_arguments_provided($object, $method)
-    {
-        $this->execute(array(), $object, $method)->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_should_return_nth_argument_if_provided($object, $method)
-    {
-        $this->beConstructedWith(1);
-        $this->execute(array('one', 'two'), $object, $method)->shouldReturn('two');
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnPromiseSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnPromiseSpec.php
deleted file mode 100644
index 18bfd87..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ReturnPromiseSpec.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Promise;
-
-use PhpSpec\ObjectBehavior;
-
-class ReturnPromiseSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith(array(42));
-    }
-
-    function it_is_promise()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Promise\PromiseInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_returns_value_it_was_constructed_with($object, $method)
-    {
-        $this->execute(array(), $object, $method)->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_always_returns_last_value_left_in_the_return_values($object, $method)
-    {
-        $this->execute(array(), $object, $method)->shouldReturn(42);
-        $this->execute(array(), $object, $method)->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_consequently_returns_multiple_values_it_was_constructed_with($object, $method)
-    {
-        $this->beConstructedWith(array(42, 24, 12));
-
-        $this->execute(array(), $object, $method)->shouldReturn(42);
-        $this->execute(array(), $object, $method)->shouldReturn(24);
-        $this->execute(array(), $object, $method)->shouldReturn(12);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_returns_null_if_constructed_with_empty_array($object, $method)
-    {
-        $this->beConstructedWith(array());
-
-        $this->execute(array(), $object, $method)->shouldReturn(null);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ThrowPromiseSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Promise/ThrowPromiseSpec.php
deleted file mode 100644
index 5f44897..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Promise/ThrowPromiseSpec.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Promise;
-
-use PhpSpec\ObjectBehavior;
-
-class ThrowPromiseSpec extends ObjectBehavior
-{
-    function let()
-    {
-        $this->beConstructedWith('RuntimeException');
-    }
-
-    function it_is_promise()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Promise\PromiseInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_instantiates_and_throws_exception_from_provided_classname($object, $method)
-    {
-        $this->beConstructedWith('InvalidArgumentException');
-
-        $this->shouldThrow('InvalidArgumentException')
-            ->duringExecute(array(), $object, $method);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_instantiates_exceptions_with_required_arguments($object, $method)
-    {
-        $this->beConstructedWith('spec\Prophecy\Promise\RequiredArgumentException');
-
-        $this->shouldThrow('spec\Prophecy\Promise\RequiredArgumentException')
-            ->duringExecute(array(), $object, $method);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $object
-     * @param \Prophecy\Prophecy\MethodProphecy $method
-     */
-    function it_throws_provided_exception($object, $method)
-    {
-        $this->beConstructedWith($exc = new \RuntimeException('Some exception'));
-
-        $this->shouldThrow($exc)->duringExecute(array(), $object, $method);
-    }
-}
-
-class RequiredArgumentException extends \Exception
-{
-    final public function __construct($message, $code) {}
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/MethodProphecySpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/MethodProphecySpec.php
deleted file mode 100644
index 41ee8cd..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/MethodProphecySpec.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-
-class ClassWithFinalMethod
-{
-    final public function finalMethod() {}
-}
-
-class MethodProphecySpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Prophecy\ObjectProphecy $objectProphecy
-     * @param \ReflectionClass                  $reflection
-     */
-    function let($objectProphecy, $reflection)
-    {
-        $objectProphecy->reveal()->willReturn($reflection);
-
-        $this->beConstructedWith($objectProphecy, 'getName', null);
-    }
-
-    function it_is_initializable()
-    {
-        $this->shouldHaveType('Prophecy\Prophecy\MethodProphecy');
-    }
-
-    function its_constructor_throws_MethodNotFoundException_for_unexisting_method($objectProphecy)
-    {
-        $this->shouldThrow('Prophecy\Exception\Doubler\MethodNotFoundException')->during(
-            '__construct', array($objectProphecy, 'getUnexisting', null)
-        );
-    }
-
-    /**
-     * @param ClassWithFinalMethod $subject
-     */
-    function its_constructor_throws_MethodProphecyException_for_final_methods($objectProphecy, $subject)
-    {
-        $objectProphecy->reveal()->willReturn($subject);
-
-        $this->shouldThrow('Prophecy\Exception\Prophecy\MethodProphecyException')->during(
-            '__construct', array($objectProphecy, 'finalMethod', null)
-        );
-    }
-
-    function its_constructor_transforms_array_passed_as_3rd_argument_to_ArgumentsWildcard(
-        $objectProphecy
-    )
-    {
-        $this->beConstructedWith($objectProphecy, 'getName', array(42, 33));
-
-        $wildcard = $this->getArgumentsWildcard();
-        $wildcard->shouldNotBe(null);
-        $wildcard->__toString()->shouldReturn('exact(42), exact(33)');
-    }
-
-    function its_constructor_does_not_touch_third_argument_if_it_is_null($objectProphecy)
-    {
-        $this->beConstructedWith($objectProphecy, 'getName', null);
-
-        $wildcard = $this->getArgumentsWildcard();
-        $wildcard->shouldBe(null);
-    }
-
-    /**
-     * @param \Prophecy\Promise\PromiseInterface $promise
-     */
-    function it_records_promise_through_will_method($promise, $objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->will($promise);
-        $this->getPromise()->shouldReturn($promise);
-    }
-
-    /**
-     * @param \Prophecy\Promise\PromiseInterface $promise
-     */
-    function it_adds_itself_to_ObjectProphecy_during_call_to_will($objectProphecy, $promise)
-    {
-        $objectProphecy->addMethodProphecy($this)->shouldBeCalled();
-
-        $this->will($promise);
-    }
-
-    function it_adds_ReturnPromise_during_willReturn_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->willReturn(42);
-        $this->getPromise()->shouldBeAnInstanceOf('Prophecy\Promise\ReturnPromise');
-    }
-
-    function it_adds_ThrowPromise_during_willThrow_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->willThrow('RuntimeException');
-        $this->getPromise()->shouldBeAnInstanceOf('Prophecy\Promise\ThrowPromise');
-    }
-
-    function it_adds_ReturnArgumentPromise_during_willReturnArgument_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->willReturnArgument();
-        $this->getPromise()->shouldBeAnInstanceOf('Prophecy\Promise\ReturnArgumentPromise');
-    }
-
-    function it_adds_ReturnArgumentPromise_during_willReturnArgument_call_with_index_argument($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->willReturnArgument(1);
-        $promise = $this->getPromise();
-        $promise->shouldBeAnInstanceOf('Prophecy\Promise\ReturnArgumentPromise');
-        $promise->execute(array('one', 'two'), $objectProphecy, $this)->shouldReturn('two');
-    }
-
-    function it_adds_CallbackPromise_during_will_call_with_callback_argument($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $callback = function () {};
-
-        $this->will($callback);
-        $this->getPromise()->shouldBeAnInstanceOf('Prophecy\Promise\CallbackPromise');
-    }
-
-    /**
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     */
-    function it_records_prediction_through_should_method($prediction, $objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->callOnWrappedObject('should', array($prediction));
-        $this->getPrediction()->shouldReturn($prediction);
-    }
-
-    function it_adds_CallbackPrediction_during_should_call_with_callback_argument($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $callback = function () {};
-
-        $this->callOnWrappedObject('should', array($callback));
-        $this->getPrediction()->shouldBeAnInstanceOf('Prophecy\Prediction\CallbackPrediction');
-    }
-
-    /**
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     */
-    function it_adds_itself_to_ObjectProphecy_during_call_to_should($objectProphecy, $prediction)
-    {
-        $objectProphecy->addMethodProphecy($this)->shouldBeCalled();
-
-        $this->callOnWrappedObject('should', array($prediction));
-    }
-
-    function it_adds_CallPrediction_during_shouldBeCalled_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->callOnWrappedObject('shouldBeCalled', array());
-        $this->getPrediction()->shouldBeAnInstanceOf('Prophecy\Prediction\CallPrediction');
-    }
-
-    function it_adds_NoCallsPrediction_during_shouldNotBeCalled_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->callOnWrappedObject('shouldNotBeCalled', array());
-        $this->getPrediction()->shouldBeAnInstanceOf('Prophecy\Prediction\NoCallsPrediction');
-    }
-
-    function it_adds_CallTimesPrediction_during_shouldBeCalledTimes_call($objectProphecy)
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->callOnWrappedObject('shouldBeCalledTimes', array(5));
-        $this->getPrediction()->shouldBeAnInstanceOf('Prophecy\Prediction\CallTimesPrediction');
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     */
-    function it_checks_prediction_via_shouldHave_method_call(
-        $objectProphecy, $arguments, $prediction, $call1, $call2
-    )
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-        $prediction->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->shouldBeCalled();
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->withArguments($arguments);
-        $this->callOnWrappedObject('shouldHave', array($prediction));
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     */
-    function it_sets_return_promise_during_shouldHave_call_if_none_was_set_before(
-        $objectProphecy, $arguments, $prediction, $call1, $call2
-    )
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-        $prediction->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->shouldBeCalled();
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->withArguments($arguments);
-        $this->callOnWrappedObject('shouldHave', array($prediction));
-
-        $this->getPromise()->shouldReturnAnInstanceOf('Prophecy\Promise\ReturnPromise');
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     * @param \Prophecy\Promise\PromiseInterface       $promise
-     */
-    function it_does_not_set_return_promise_during_shouldHave_call_if_it_was_set_before(
-        $objectProphecy, $arguments, $prediction, $call1, $call2, $promise
-    )
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-        $prediction->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->shouldBeCalled();
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->will($promise);
-        $this->withArguments($arguments);
-        $this->callOnWrappedObject('shouldHave', array($prediction));
-
-        $this->getPromise()->shouldReturn($promise);
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction1
-     * @param \Prophecy\Prediction\PredictionInterface $prediction2
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     * @param \Prophecy\Promise\PromiseInterface       $promise
-     */
-    function it_records_checked_predictions(
-        $objectProphecy, $arguments, $prediction1, $prediction2, $call1, $call2, $promise
-    )
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-        $prediction1->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->willReturn();
-        $prediction2->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->willReturn();
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->will($promise);
-        $this->withArguments($arguments);
-        $this->callOnWrappedObject('shouldHave', array($prediction1));
-        $this->callOnWrappedObject('shouldHave', array($prediction2));
-
-        $this->getCheckedPredictions()->shouldReturn(array($prediction1, $prediction2));
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     * @param \Prophecy\Promise\PromiseInterface       $promise
-     */
-    function it_records_even_failed_checked_predictions(
-        $objectProphecy, $arguments, $prediction, $call1, $call2, $promise
-    )
-    {
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-        $prediction->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->willThrow(new \RuntimeException());
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->will($promise);
-        $this->withArguments($arguments);
-
-        try {
-          $this->callOnWrappedObject('shouldHave', array($prediction));
-        } catch (\Exception $e) {}
-
-        $this->getCheckedPredictions()->shouldReturn(array($prediction));
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     */
-    function it_checks_prediction_via_shouldHave_method_call_with_callback(
-        $objectProphecy, $arguments, $prediction, $call1, $call2
-    )
-    {
-        $callback = function ($calls, $object, $method) {
-            throw new \RuntimeException;
-        };
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-
-        $this->withArguments($arguments);
-        $this->shouldThrow('RuntimeException')->duringShouldHave($callback);
-    }
-
-    function it_does_nothing_during_checkPrediction_if_no_prediction_set()
-    {
-        $this->checkPrediction()->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard     $arguments
-     * @param \Prophecy\Prediction\PredictionInterface $prediction
-     * @param \Prophecy\Call\Call                      $call1
-     * @param \Prophecy\Call\Call                      $call2
-     */
-    function it_checks_set_prediction_during_checkPrediction(
-        $objectProphecy, $arguments, $prediction, $call1, $call2
-    )
-    {
-        $prediction->check(array($call1, $call2), $objectProphecy->getWrappedObject(), $this)->shouldBeCalled();
-        $objectProphecy->findProphecyMethodCalls('getName', $arguments)->willReturn(array($call1, $call2));
-        $objectProphecy->addMethodProphecy($this)->willReturn(null);
-
-        $this->withArguments($arguments);
-        $this->callOnWrappedObject('should', array($prediction));
-        $this->checkPrediction();
-    }
-
-    function it_links_back_to_ObjectProphecy_through_getter($objectProphecy)
-    {
-        $this->getObjectProphecy()->shouldReturn($objectProphecy);
-    }
-
-    function it_has_MethodName()
-    {
-        $this->getMethodName()->shouldReturn('getName');
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard $wildcard
-     */
-    function it_contains_ArgumentsWildcard_it_was_constructed_with($objectProphecy, $wildcard)
-    {
-        $this->beConstructedWith($objectProphecy, 'getName', $wildcard);
-
-        $this->getArgumentsWildcard()->shouldReturn($wildcard);
-    }
-
-    /**
-     * @param \Prophecy\Argument\ArgumentsWildcard $wildcard
-     */
-    function its_ArgumentWildcard_is_mutable_through_setter($wildcard)
-    {
-        $this->withArguments($wildcard);
-
-        $this->getArgumentsWildcard()->shouldReturn($wildcard);
-    }
-
-    function its_withArguments_transforms_passed_array_into_ArgumentsWildcard()
-    {
-        $this->withArguments(array(42, 33));
-
-        $wildcard = $this->getArgumentsWildcard();
-        $wildcard->shouldNotBe(null);
-        $wildcard->__toString()->shouldReturn('exact(42), exact(33)');
-    }
-
-    function its_withArguments_throws_exception_if_wrong_arguments_provided()
-    {
-        $this->shouldThrow('Prophecy\Exception\InvalidArgumentException')->duringWithArguments(42);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/ObjectProphecySpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/ObjectProphecySpec.php
deleted file mode 100644
index 7e249d9..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/ObjectProphecySpec.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ObjectProphecySpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\LazyDouble                $lazyDouble
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     */
-    function let($lazyDouble, $double)
-    {
-        $this->beConstructedWith($lazyDouble);
-
-        $lazyDouble->getInstance()->willReturn($double);
-    }
-
-    function it_implements_ProphecyInterface()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Prophecy\ProphecyInterface');
-    }
-
-    function it_sets_parentClass_during_willExtend_call($lazyDouble)
-    {
-        $lazyDouble->setParentClass('123')->shouldBeCalled();
-
-        $this->willExtend('123');
-    }
-
-    function it_adds_interface_during_willImplement_call($lazyDouble)
-    {
-        $lazyDouble->addInterface('222')->shouldBeCalled();
-
-        $this->willImplement('222');
-    }
-
-    function it_sets_constructor_arguments_during_willBeConstructedWith_call($lazyDouble)
-    {
-        $lazyDouble->setArguments(array(1, 2, 5))->shouldBeCalled();
-
-        $this->willBeConstructedWith(array(1, 2, 5));
-    }
-
-    function it_does_not_have_method_prophecies_by_default()
-    {
-        $this->getMethodProphecies()->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method1
-     * @param \Prophecy\Prophecy\MethodProphecy    $method2
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments
-     */
-    function it_should_get_method_prophecies_by_method_name($method1, $method2, $arguments)
-    {
-        $method1->getMethodName()->willReturn('getName');
-        $method1->getArgumentsWildcard()->willReturn($arguments);
-        $method2->getMethodName()->willReturn('setName');
-        $method2->getArgumentsWildcard()->willReturn($arguments);
-
-        $this->addMethodProphecy($method1);
-        $this->addMethodProphecy($method2);
-
-        $methods = $this->getMethodProphecies('setName');
-        $methods->shouldHaveCount(1);
-        $methods[0]->getMethodName()->shouldReturn('setName');
-    }
-
-    function it_should_return_empty_array_if_no_method_prophecies_found()
-    {
-        $methods = $this->getMethodProphecies('setName');
-        $methods->shouldHaveCount(0);
-    }
-
-    /**
-     * @param \Prophecy\Call\CallCenter $callCenter
-     */
-    function it_should_proxy_makeProphecyMethodCall_to_CallCenter($lazyDouble, $callCenter)
-    {
-        $this->beConstructedWith($lazyDouble, $callCenter);
-
-        $callCenter->makeCall($this->getWrappedObject(), 'setName', array('everzet'))->willReturn(42);
-
-        $this->makeProphecyMethodCall('setName', array('everzet'))->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Call\CallCenter            $callCenter
-     * @param \Prophecy\Prophecy\RevealerInterface $revealer
-     */
-    function it_should_reveal_arguments_and_return_values_from_callCenter(
-        $lazyDouble, $callCenter, $revealer
-    )
-    {
-        $this->beConstructedWith($lazyDouble, $callCenter, $revealer);
-
-        $revealer->reveal(array('question'))->willReturn(array('life'));
-        $revealer->reveal('answer')->willReturn(42);
-
-        $callCenter->makeCall($this->getWrappedObject(), 'setName', array('life'))->willReturn('answer');
-
-        $this->makeProphecyMethodCall('setName', array('question'))->shouldReturn(42);
-    }
-
-    /**
-     * @param \Prophecy\Call\CallCenter            $callCenter
-     * @param \Prophecy\Argument\ArgumentsWildcard $wildcard
-     * @param \Prophecy\Call\Call                  $call
-     */
-    function it_should_proxy_getProphecyMethodCalls_to_CallCenter(
-        $lazyDouble, $callCenter, $wildcard, $call
-    )
-    {
-        $this->beConstructedWith($lazyDouble, $callCenter);
-
-        $callCenter->findCalls('setName', $wildcard)->willReturn(array($call));
-
-        $this->findProphecyMethodCalls('setName', $wildcard)->shouldReturn(array($call));
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard
-     */
-    function its_addMethodProphecy_adds_method_prophecy(
-        $methodProphecy, $argumentsWildcard
-    )
-    {
-        $methodProphecy->getArgumentsWildcard()->willReturn($argumentsWildcard);
-        $methodProphecy->getMethodName()->willReturn('getUsername');
-
-        $this->addMethodProphecy($methodProphecy);
-
-        $this->getMethodProphecies()->shouldReturn(array(
-            'getUsername' => array($methodProphecy)
-        ));
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy1
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy2
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard1
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard2
-     */
-    function its_addMethodProphecy_handles_prophecies_with_different_arguments(
-        $methodProphecy1, $methodProphecy2, $argumentsWildcard1, $argumentsWildcard2
-    )
-    {
-        $methodProphecy1->getArgumentsWildcard()->willReturn($argumentsWildcard1);
-        $methodProphecy1->getMethodName()->willReturn('getUsername');
-
-        $methodProphecy2->getArgumentsWildcard()->willReturn($argumentsWildcard2);
-        $methodProphecy2->getMethodName()->willReturn('getUsername');
-
-        $this->addMethodProphecy($methodProphecy1);
-        $this->addMethodProphecy($methodProphecy2);
-
-        $this->getMethodProphecies()->shouldReturn(array(
-            'getUsername' => array(
-                $methodProphecy1,
-                $methodProphecy2,
-            )
-        ));
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy1
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy2
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard1
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard2
-     */
-    function its_addMethodProphecy_handles_prophecies_for_different_methods(
-        $methodProphecy1, $methodProphecy2, $argumentsWildcard1, $argumentsWildcard2
-    )
-    {
-        $methodProphecy1->getArgumentsWildcard()->willReturn($argumentsWildcard1);
-        $methodProphecy1->getMethodName()->willReturn('getUsername');
-
-        $methodProphecy2->getArgumentsWildcard()->willReturn($argumentsWildcard2);
-        $methodProphecy2->getMethodName()->willReturn('isUsername');
-
-        $this->addMethodProphecy($methodProphecy1);
-        $this->addMethodProphecy($methodProphecy2);
-
-        $this->getMethodProphecies()->shouldReturn(array(
-            'getUsername' => array(
-                $methodProphecy1
-            ),
-            'isUsername' => array(
-                $methodProphecy2
-            )
-        ));
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy $methodProphecy
-     */
-    function its_addMethodProphecy_throws_exception_when_method_has_no_ArgumentsWildcard(
-        $methodProphecy
-    )
-    {
-        $methodProphecy->getArgumentsWildcard()->willReturn(null);
-        $methodProphecy->getObjectProphecy()->willReturn($this);
-        $methodProphecy->getMethodName()->willReturn('getTitle');
-
-        $this->shouldThrow('Prophecy\Exception\Prophecy\MethodProphecyException')->duringAddMethodProphecy(
-            $methodProphecy
-        );
-    }
-
-    function it_returns_null_after_checkPredictions_call_if_there_is_no_method_prophecies()
-    {
-        $this->checkProphecyMethodsPredictions()->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy1
-     * @param \Prophecy\Prophecy\MethodProphecy    $methodProphecy2
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard1
-     * @param \Prophecy\Argument\ArgumentsWildcard $argumentsWildcard2
-     */
-    function it_throws_AggregateException_during_checkPredictions_if_predictions_fail(
-        $methodProphecy1, $methodProphecy2, $argumentsWildcard1, $argumentsWildcard2
-    )
-    {
-        $methodProphecy1->getMethodName()->willReturn('getName');
-        $methodProphecy1->getArgumentsWildcard()->willReturn($argumentsWildcard1);
-        $methodProphecy1->checkPrediction()
-            ->willThrow('Prophecy\Exception\Prediction\AggregateException');
-
-        $methodProphecy2->getMethodName()->willReturn('setName');
-        $methodProphecy2->getArgumentsWildcard()->willReturn($argumentsWildcard2);
-        $methodProphecy2->checkPrediction()
-            ->willThrow('Prophecy\Exception\Prediction\AggregateException');
-
-        $this->addMethodProphecy($methodProphecy1);
-        $this->addMethodProphecy($methodProphecy2);
-
-        $this->shouldThrow('Prophecy\Exception\Prediction\AggregateException')
-            ->duringCheckProphecyMethodsPredictions();
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Doubler                   $doubler
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $reflection
-     */
-    function it_returns_new_MethodProphecy_instance_for_arbitrary_call($doubler, $reflection)
-    {
-        $doubler->double(Argument::any())->willReturn($reflection);
-
-        $return = $this->getProphecy();
-        $return->shouldBeAnInstanceOf('Prophecy\Prophecy\MethodProphecy');
-        $return->getMethodName()->shouldReturn('getProphecy');
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Doubler                   $doubler
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $reflection
-     */
-    function it_returns_same_MethodProphecy_for_same_registered_signature($doubler, $reflection)
-    {
-        $doubler->double(Argument::any())->willReturn($reflection);
-
-        $this->addMethodProphecy($methodProphecy1 = $this->getProphecy(1, 2, 3));
-        $methodProphecy2 = $this->getProphecy(1, 2, 3);
-
-        $methodProphecy2->shouldBe($methodProphecy1);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Doubler                   $doubler
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $reflection
-     */
-    function it_returns_new_MethodProphecy_for_different_signatures($doubler, $reflection)
-    {
-        $doubler->double(Argument::any())->willReturn($reflection);
-
-        $value = new ObjectProphecySpecFixtureB('ABC');
-        $value2 = new ObjectProphecySpecFixtureB('CBA');
-
-        $this->addMethodProphecy($methodProphecy1 = $this->getProphecy(1, 2, 3, $value));
-        $methodProphecy2 = $this->getProphecy(1, 2, 3, $value2);
-
-        $methodProphecy2->shouldNotBe($methodProphecy1);
-    }
-
-    /**
-     * @param \Prophecy\Doubler\Doubler                   $doubler
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $reflection
-     */
-    function it_returns_new_MethodProphecy_for_all_callback_signatures($doubler, $reflection)
-    {
-        $doubler->double(Argument::any())->willReturn($reflection);
-
-        $this->addMethodProphecy($methodProphecy1 = $this->getProphecy(function(){}));
-        $methodProphecy2 = $this->getProphecy(function(){});
-
-        $methodProphecy2->shouldNotBe($methodProphecy1);
-    }
-}
-
-class ObjectProphecySpecFixtureA
-{
-	public $errors;
-}
-
-class ObjectProphecySpecFixtureB extends ObjectProphecySpecFixtureA
-{
-    public $errors;
-    public $value = null;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/RevealerSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/RevealerSpec.php
deleted file mode 100644
index 4d83d73..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Prophecy/RevealerSpec.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-
-class RevealerSpec extends ObjectBehavior
-{
-    function it_is_revealer()
-    {
-        $this->shouldBeAnInstanceOf('Prophecy\Prophecy\RevealerInterface');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecyInterface $prophecy
-     * @param \stdClass                            $object
-     */
-    function it_reveals_single_instance_of_ProphecyInterface($prophecy, $object)
-    {
-        $prophecy->reveal()->willReturn($object);
-
-        $this->reveal($prophecy)->shouldReturn($object);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecyInterface $prophecy1
-     * @param \Prophecy\Prophecy\ProphecyInterface $prophecy2
-     * @param \stdClass                            $object1
-     * @param \stdClass                            $object2
-     */
-    function it_reveals_instances_of_ProphecyInterface_inside_array(
-        $prophecy1, $prophecy2, $object1, $object2
-    )
-    {
-        $prophecy1->reveal()->willReturn($object1);
-        $prophecy2->reveal()->willReturn($object2);
-
-        $this->reveal(array(
-            array('item' => $prophecy2),
-            $prophecy1
-        ))->shouldReturn(array(
-            array('item' => $object2),
-            $object1
-        ));
-    }
-
-    function it_does_not_touch_non_prophecy_interface()
-    {
-        $this->reveal(42)->shouldReturn(42);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/ProphetSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/ProphetSpec.php
deleted file mode 100644
index 74d5976..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/ProphetSpec.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace spec\Prophecy;
-
-use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
-
-class ProphetSpec extends ObjectBehavior
-{
-    /**
-     * @param \Prophecy\Doubler\Doubler                   $doubler
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $double
-     */
-    function let($doubler, $double)
-    {
-        $doubler->double(null, array())->willReturn($double);
-
-        $this->beConstructedWith($doubler);
-    }
-
-    function it_constructs_new_prophecy_on_prophesize_call()
-    {
-        $prophecy = $this->prophesize();
-        $prophecy->shouldBeAnInstanceOf('Prophecy\Prophecy\ObjectProphecy');
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $newDouble
-     */
-    function it_constructs_new_prophecy_with_parent_class_if_specified($doubler, $newDouble)
-    {
-        $doubler->double(Argument::any(), array())->willReturn($newDouble);
-
-        $this->prophesize('Prophecy\Prophet')->reveal()->shouldReturn($newDouble);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\ProphecySubjectInterface $newDouble
-     */
-    function it_constructs_new_prophecy_with_interface_if_specified($doubler, $newDouble)
-    {
-        $doubler->double(null, Argument::any())->willReturn($newDouble);
-
-        $this->prophesize('ArrayAccess')->reveal()->shouldReturn($newDouble);
-    }
-
-    function it_exposes_all_created_prophecies_through_getter()
-    {
-        $prophecy1 = $this->prophesize();
-        $prophecy2 = $this->prophesize();
-
-        $this->getProphecies()->shouldReturn(array($prophecy1, $prophecy2));
-    }
-
-    function it_does_nothing_during_checkPredictions_call_if_no_predictions_defined()
-    {
-        $this->checkPredictions()->shouldReturn(null);
-    }
-
-    /**
-     * @param \Prophecy\Prophecy\MethodProphecy    $method1
-     * @param \Prophecy\Prophecy\MethodProphecy    $method2
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments1
-     * @param \Prophecy\Argument\ArgumentsWildcard $arguments2
-     */
-    function it_throws_AggregateException_if_defined_predictions_fail(
-        $method1, $method2, $arguments1, $arguments2
-    )
-    {
-        $method1->getMethodName()->willReturn('getName');
-        $method1->getArgumentsWildcard()->willReturn($arguments1);
-        $method1->checkPrediction()->willReturn(null);
-
-        $method2->getMethodName()->willReturn('isSet');
-        $method2->getArgumentsWildcard()->willReturn($arguments2);
-        $method2->checkPrediction()->willThrow(
-            'Prophecy\Exception\Prediction\AggregateException'
-        );
-
-        $this->prophesize()->addMethodProphecy($method1);
-        $this->prophesize()->addMethodProphecy($method2);
-
-        $this->shouldThrow('Prophecy\Exception\Prediction\AggregateException')
-            ->duringCheckPredictions();
-    }
-
-    function it_exposes_doubler_through_getter($doubler)
-    {
-        $this->getDoubler()->shouldReturn($doubler);
-    }
-}
diff --git a/vendor/phpspec/prophecy/spec/Prophecy/Util/StringUtilSpec.php b/vendor/phpspec/prophecy/spec/Prophecy/Util/StringUtilSpec.php
deleted file mode 100644
index a4eef59..0000000
--- a/vendor/phpspec/prophecy/spec/Prophecy/Util/StringUtilSpec.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace spec\Prophecy\Util;
-
-use PhpSpec\ObjectBehavior;
-
-class StringUtilSpec extends ObjectBehavior
-{
-    function it_generates_proper_string_representation_for_integer()
-    {
-        $this->stringify(42)->shouldReturn('42');
-    }
-
-    function it_generates_proper_string_representation_for_string()
-    {
-        $this->stringify('some string')->shouldReturn('"some string"');
-    }
-
-    function it_generates_single_line_representation_for_multiline_string()
-    {
-        $this->stringify("some\nstring")->shouldReturn('"some\\nstring"');
-    }
-
-    function it_generates_proper_string_representation_for_double()
-    {
-        $this->stringify(42.3)->shouldReturn('42.3');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_true()
-    {
-        $this->stringify(true)->shouldReturn('true');
-    }
-
-    function it_generates_proper_string_representation_for_boolean_false()
-    {
-        $this->stringify(false)->shouldReturn('false');
-    }
-
-    function it_generates_proper_string_representation_for_null()
-    {
-        $this->stringify(null)->shouldReturn('null');
-    }
-
-    function it_generates_proper_string_representation_for_empty_array()
-    {
-        $this->stringify(array())->shouldReturn('[]');
-    }
-
-    function it_generates_proper_string_representation_for_array()
-    {
-        $this->stringify(array('zet', 42))->shouldReturn('["zet", 42]');
-    }
-
-    function it_generates_proper_string_representation_for_hash_containing_one_value()
-    {
-        $this->stringify(array('ever' => 'zet'))->shouldReturn('["ever" => "zet"]');
-    }
-
-    function it_generates_proper_string_representation_for_hash()
-    {
-        $this->stringify(array('ever' => 'zet', 52 => 'hey', 'num' => 42))->shouldReturn(
-            '["ever" => "zet", 52 => "hey", "num" => 42]'
-        );
-    }
-
-    function it_generates_proper_string_representation_for_resource()
-    {
-        $resource = fopen(__FILE__, 'r');
-        $this->stringify($resource)->shouldReturn('stream:'.$resource);
-    }
-
-    /**
-     * @param \stdClass $object
-     */
-    function it_generates_proper_string_representation_for_object($object)
-    {
-        $objHash = sprintf('%s:%s',
-            get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        ) . " Object (\n    'objectProphecy' => Prophecy\Prophecy\ObjectProphecy Object (*Prophecy*)\n)";
-
-        $this->stringify($object)->shouldReturn("$objHash");
-    }
-
-    /**
-     * @param stdClass $object
-     */
-    function it_generates_proper_string_representation_for_object_without_exporting($object)
-    {
-        $objHash = sprintf('%s:%s',
-            get_class($object->getWrappedObject()),
-            spl_object_hash($object->getWrappedObject())
-        );
-
-        $this->stringify($object, false)->shouldReturn("$objHash");
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument.php b/vendor/phpspec/prophecy/src/Prophecy/Argument.php
deleted file mode 100644
index f2b3364..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy;
-
-use Prophecy\Argument\Token;
-
-/**
- * Argument tokens shortcuts.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Argument
-{
-    /**
-     * Checks that argument is exact value or object.
-     *
-     * @param mixed $value
-     *
-     * @return Token\ExactValueToken
-     */
-    public static function exact($value)
-    {
-        return new Token\ExactValueToken($value);
-    }
-
-    /**
-     * Checks that argument is of specific type or instance of specific class.
-     *
-     * @param string $type Type name (`integer`, `string`) or full class name
-     *
-     * @return Token\TypeToken
-     */
-    public static function type($type)
-    {
-        return new Token\TypeToken($type);
-    }
-
-    /**
-     * Checks that argument object has specific state.
-     *
-     * @param string $methodName
-     * @param mixed  $value
-     *
-     * @return Token\ObjectStateToken
-     */
-    public static function which($methodName, $value)
-    {
-        return new Token\ObjectStateToken($methodName, $value);
-    }
-
-    /**
-     * Checks that argument matches provided callback.
-     *
-     * @param callable $callback
-     *
-     * @return Token\CallbackToken
-     */
-    public static function that($callback)
-    {
-        return new Token\CallbackToken($callback);
-    }
-
-    /**
-     * Matches any single value.
-     *
-     * @return Token\AnyValueToken
-     */
-    public static function any()
-    {
-        return new Token\AnyValueToken;
-    }
-
-    /**
-     * Matches all values to the rest of the signature.
-     *
-     * @return Token\AnyValuesToken
-     */
-    public static function cetera()
-    {
-        return new Token\AnyValuesToken;
-    }
-
-    /**
-     * Checks that argument matches all tokens
-     *
-     * @param mixed ... a list of tokens
-     *
-     * @return Token\LogicalAndToken
-     */
-    public static function allOf()
-    {
-        return new Token\LogicalAndToken(func_get_args());
-    }
-
-    /**
-     * Checks that argument array or countable object has exact number of elements.
-     *
-     * @param integer $value array elements count
-     *
-     * @return Token\ArrayCountToken
-     */
-    public static function size($value)
-    {
-        return new Token\ArrayCountToken($value);
-    }
-
-    /**
-     * Checks that argument array contains (key, value) pair
-     *
-     * @param mixed $key   exact value or token
-     * @param mixed $value exact value or token
-     *
-     * @return Token\ArrayEntryToken
-     */
-    public static function withEntry($key, $value)
-    {
-        return new Token\ArrayEntryToken($key, $value);
-    }
-
-    /**
-     * Checks that arguments array entries all match value
-     *
-     * @param mixed $value
-     *
-     * @return Token\ArrayEveryEntryToken
-     */
-    public static function withEveryEntry($value)
-    {
-        return new Token\ArrayEveryEntryToken($value);
-    }
-
-    /**
-     * Checks that argument array contains value
-     *
-     * @param mixed $value
-     *
-     * @return Token\ArrayEntryToken
-     */
-    public static function containing($value)
-    {
-        return new Token\ArrayEntryToken(self::any(), $value);
-    }
-
-    /**
-     * Checks that argument array has key
-     *
-     * @param mixed $key exact value or token
-     *
-     * @return Token\ArrayEntryToken
-     */
-    public static function withKey($key)
-    {
-        return new Token\ArrayEntryToken($key, self::any());
-    }
-
-    /**
-     * Checks that argument does not match the value|token.
-     *
-     * @param mixed $value either exact value or argument token
-     *
-     * @return Token\LogicalNotToken
-     */
-    public static function not($value)
-    {
-        return new Token\LogicalNotToken($value);
-    }
-
-    /**
-     * @param string $value
-     *
-     * @return Token\StringContainsToken
-     */
-    public static function containingString($value)
-    {
-        return new Token\StringContainsToken($value);
-    }
-
-    /**
-     * Checks that argument is identical value.
-     *
-     * @param mixed $value
-     *
-     * @return Token\IdenticalValueToken
-     */
-    public static function is($value)
-    {
-        return new Token\IdenticalValueToken($value);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php
deleted file mode 100644
index a088f21..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/ArgumentsWildcard.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument;
-
-/**
- * Arguments wildcarding.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ArgumentsWildcard
-{
-    /**
-     * @var Token\TokenInterface[]
-     */
-    private $tokens = array();
-    private $string;
-
-    /**
-     * Initializes wildcard.
-     *
-     * @param array $arguments Array of argument tokens or values
-     */
-    public function __construct(array $arguments)
-    {
-        foreach ($arguments as $argument) {
-            if (!$argument instanceof Token\TokenInterface) {
-                $argument = new Token\ExactValueToken($argument);
-            }
-
-            $this->tokens[] = $argument;
-        }
-    }
-
-    /**
-     * Calculates wildcard match score for provided arguments.
-     *
-     * @param array $arguments
-     *
-     * @return false|int False OR integer score (higher - better)
-     */
-    public function scoreArguments(array $arguments)
-    {
-        if (0 == count($arguments) && 0 == count($this->tokens)) {
-            return 1;
-        }
-
-        $arguments  = array_values($arguments);
-        $totalScore = 0;
-        foreach ($this->tokens as $i => $token) {
-            $argument = isset($arguments[$i]) ? $arguments[$i] : null;
-            if (1 >= $score = $token->scoreArgument($argument)) {
-                return false;
-            }
-
-            $totalScore += $score;
-
-            if (true === $token->isLast()) {
-                return $totalScore;
-            }
-        }
-
-        if (count($arguments) > count($this->tokens)) {
-            return false;
-        }
-
-        return $totalScore;
-    }
-
-    /**
-     * Returns string representation for wildcard.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (null === $this->string) {
-            $this->string = implode(', ', array_map(function ($token) {
-                return (string) $token;
-            }, $this->tokens));
-        }
-
-        return $this->string;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php
deleted file mode 100644
index 5098811..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValueToken.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Any single value token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class AnyValueToken implements TokenInterface
-{
-    /**
-     * Always scores 3 for any argument.
-     *
-     * @param $argument
-     *
-     * @return int
-     */
-    public function scoreArgument($argument)
-    {
-        return 3;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '*';
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValuesToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValuesToken.php
deleted file mode 100644
index f76b17b..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/AnyValuesToken.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Any values token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class AnyValuesToken implements TokenInterface
-{
-    /**
-     * Always scores 2 for any argument.
-     *
-     * @param $argument
-     *
-     * @return int
-     */
-    public function scoreArgument($argument)
-    {
-        return 2;
-    }
-
-    /**
-     * Returns true to stop wildcard from processing other tokens.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return true;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return '* [, ...]';
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayCountToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayCountToken.php
deleted file mode 100644
index 96b4bef..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayCountToken.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Array elements count token.
- *
- * @author Boris Mikhaylov <kaguxmail@gmail.com>
- */
-
-class ArrayCountToken implements TokenInterface
-{
-    private $count;
-
-    /**
-     * @param integer $value
-     */
-    public function __construct($value)
-    {
-        $this->count = $value;
-    }
-
-    /**
-     * Scores 6 when argument has preset number of elements.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        return $this->isCountable($argument) && $this->hasProperCount($argument) ? 6 : false;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return boolean
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('count(%s)', $this->count);
-    }
-
-    /**
-     * Returns true if object is either array or instance of \Countable
-     *
-     * @param $argument
-     * @return bool
-     */
-    private function isCountable($argument)
-    {
-        return (is_array($argument) || $argument instanceof \Countable);
-    }
-
-    /**
-     * Returns true if $argument has expected number of elements
-     *
-     * @param array|\Countable $argument
-     *
-     * @return bool
-     */
-    private function hasProperCount($argument)
-    {
-        return $this->count === count($argument);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEntryToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEntryToken.php
deleted file mode 100644
index 0305fc7..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEntryToken.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use Prophecy\Exception\InvalidArgumentException;
-
-/**
- * Array entry token.
- *
- * @author Boris Mikhaylov <kaguxmail@gmail.com>
- */
-class ArrayEntryToken implements TokenInterface
-{
-    /** @var \Prophecy\Argument\Token\TokenInterface */
-    private $key;
-    /** @var \Prophecy\Argument\Token\TokenInterface */
-    private $value;
-
-    /**
-     * @param mixed $key   exact value or token
-     * @param mixed $value exact value or token
-     */
-    public function __construct($key, $value)
-    {
-        $this->key = $this->wrapIntoExactValueToken($key);
-        $this->value = $this->wrapIntoExactValueToken($value);
-    }
-
-    /**
-     * Scores half of combined scores from key and value tokens for same entry. Capped at 8.
-     * If argument implements \ArrayAccess without \Traversable, then key token is restricted to ExactValueToken.
-     *
-     * @param array|\ArrayAccess|\Traversable $argument
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        if ($argument instanceof \Traversable) {
-            $argument = iterator_to_array($argument);
-        }
-
-        if ($argument instanceof \ArrayAccess) {
-            $argument = $this->convertArrayAccessToEntry($argument);
-        }
-
-        if (!is_array($argument) || empty($argument)) {
-            return false;
-        }
-
-        $keyScores = array_map(array($this->key,'scoreArgument'), array_keys($argument));
-        $valueScores = array_map(array($this->value,'scoreArgument'), $argument);
-        $scoreEntry = function ($value, $key) {
-            return $value && $key ? min(8, ($key + $value) / 2) : false;
-        };
-
-        return max(array_map($scoreEntry, $valueScores, $keyScores));
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return boolean
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('[..., %s => %s, ...]', $this->key, $this->value);
-    }
-
-    /**
-     * Returns key
-     *
-     * @return TokenInterface
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * Returns value
-     *
-     * @return TokenInterface
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Wraps non token $value into ExactValueToken
-     *
-     * @param $value
-     * @return TokenInterface
-     */
-    private function wrapIntoExactValueToken($value)
-    {
-        return $value instanceof TokenInterface ? $value : new ExactValueToken($value);
-    }
-
-    /**
-     * Converts instance of \ArrayAccess to key => value array entry
-     *
-     * @param \ArrayAccess $object
-     *
-     * @return array|null
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    private function convertArrayAccessToEntry(\ArrayAccess $object)
-    {
-        if (!$this->key instanceof ExactValueToken) {
-            throw new InvalidArgumentException(sprintf(
-                'You can only use exact value tokens to match key of ArrayAccess object'.PHP_EOL.
-                'But you used `%s`.',
-                $this->key
-            ));
-        }
-
-        $key = $this->key->getValue();
-
-        return $object->offsetExists($key) ? array($key => $object[$key]) : array();
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEveryEntryToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEveryEntryToken.php
deleted file mode 100644
index 5d41fa4..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ArrayEveryEntryToken.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Array every entry token.
- *
- * @author Adrien Brault <adrien.brault@gmail.com>
- */
-class ArrayEveryEntryToken implements TokenInterface
-{
-    /**
-     * @var TokenInterface
-     */
-    private $value;
-
-    /**
-     * @param mixed $value exact value or token
-     */
-    public function __construct($value)
-    {
-        if (!$value instanceof TokenInterface) {
-            $value = new ExactValueToken($value);
-        }
-
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function scoreArgument($argument)
-    {
-        if (!$argument instanceof \Traversable && !is_array($argument)) {
-            return false;
-        }
-
-        $scores = array();
-        foreach ($argument as $key => $argumentEntry) {
-            $scores[] = $this->value->scoreArgument($argumentEntry);
-        }
-
-        if (empty($scores) || in_array(false, $scores, true)) {
-            return false;
-        }
-
-        return array_sum($scores) / count($scores);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('[%s, ..., %s]', $this->value, $this->value);
-    }
-
-    /**
-     * @return TokenInterface
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/CallbackToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/CallbackToken.php
deleted file mode 100644
index f45ba20..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/CallbackToken.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use Prophecy\Exception\InvalidArgumentException;
-
-/**
- * Callback-verified token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallbackToken implements TokenInterface
-{
-    private $callback;
-
-    /**
-     * Initializes token.
-     *
-     * @param callable $callback
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function __construct($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new InvalidArgumentException(sprintf(
-                'Callable expected as an argument to CallbackToken, but got %s.',
-                gettype($callback)
-            ));
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Scores 7 if callback returns true, false otherwise.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        return call_user_func($this->callback, $argument) ? 7 : false;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return 'callback()';
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ExactValueToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ExactValueToken.php
deleted file mode 100644
index aa960f3..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ExactValueToken.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use SebastianBergmann\Comparator\ComparisonFailure;
-use Prophecy\Comparator\Factory as ComparatorFactory;
-use Prophecy\Util\StringUtil;
-
-/**
- * Exact value token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ExactValueToken implements TokenInterface
-{
-    private $value;
-    private $string;
-    private $util;
-    private $comparatorFactory;
-
-    /**
-     * Initializes token.
-     *
-     * @param mixed             $value
-     * @param StringUtil        $util
-     * @param ComparatorFactory $comparatorFactory
-     */
-    public function __construct($value, StringUtil $util = null, ComparatorFactory $comparatorFactory = null)
-    {
-        $this->value = $value;
-        $this->util  = $util ?: new StringUtil();
-
-        $this->comparatorFactory = $comparatorFactory ?: ComparatorFactory::getInstance();
-    }
-
-    /**
-     * Scores 10 if argument matches preset value.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        if (is_object($argument) && is_object($this->value)) {
-            $comparator = $this->comparatorFactory->getComparatorFor(
-                $argument, $this->value
-            );
-
-            try {
-                $comparator->assertEquals($argument, $this->value);
-                return 10;
-            } catch (ComparisonFailure $failure) {}
-        }
-
-        // If either one is an object it should be castable to a string
-        if (is_object($argument) xor is_object($this->value)) {
-            if (is_object($argument) && !method_exists($argument, '__toString')) {
-                return false;
-            }
-
-            if (is_object($this->value) && !method_exists($this->value, '__toString')) {
-                return false;
-            }
-        } elseif (is_numeric($argument) && is_numeric($this->value)) {
-            // noop
-        } elseif (gettype($argument) !== gettype($this->value)) {
-            return false;
-        }
-
-        return $argument == $this->value ? 10 : false;
-    }
-
-    /**
-     * Returns preset value against which token checks arguments.
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (null === $this->string) {
-            $this->string = sprintf('exact(%s)', $this->util->stringify($this->value));
-        }
-
-        return $this->string;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/IdenticalValueToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/IdenticalValueToken.php
deleted file mode 100644
index 0b6d23a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/IdenticalValueToken.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use Prophecy\Util\StringUtil;
-
-/**
- * Identical value token.
- *
- * @author Florian Voutzinos <florian@voutzinos.com>
- */
-class IdenticalValueToken implements TokenInterface
-{
-    private $value;
-    private $string;
-    private $util;
-
-    /**
-     * Initializes token.
-     *
-     * @param mixed      $value
-     * @param StringUtil $util
-     */
-    public function __construct($value, StringUtil $util = null)
-    {
-        $this->value = $value;
-        $this->util  = $util ?: new StringUtil();
-    }
-
-    /**
-     * Scores 11 if argument matches preset value.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        return $argument === $this->value ? 11 : false;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (null === $this->string) {
-            $this->string = sprintf('identical(%s)', $this->util->stringify($this->value));
-        }
-
-        return $this->string;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalAndToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalAndToken.php
deleted file mode 100644
index 4ee1b25..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalAndToken.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Logical AND token.
- *
- * @author Boris Mikhaylov <kaguxmail@gmail.com>
- */
-class LogicalAndToken implements TokenInterface
-{
-    private $tokens = array();
-
-    /**
-     * @param array $arguments exact values or tokens
-     */
-    public function __construct(array $arguments)
-    {
-        foreach ($arguments as $argument) {
-            if (!$argument instanceof TokenInterface) {
-                $argument = new ExactValueToken($argument);
-            }
-            $this->tokens[] = $argument;
-        }
-    }
-
-    /**
-     * Scores maximum score from scores returned by tokens for this argument if all of them score.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        if (0 === count($this->tokens)) {
-            return false;
-        }
-
-        $maxScore = 0;
-        foreach ($this->tokens as $token) {
-            $score = $token->scoreArgument($argument);
-            if (false === $score) {
-                return false;
-            }
-            $maxScore = max($score, $maxScore);
-        }
-
-        return $maxScore;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return boolean
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('bool(%s)', implode(' AND ', $this->tokens));
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalNotToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalNotToken.php
deleted file mode 100644
index 623efa5..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/LogicalNotToken.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Logical NOT token.
- *
- * @author Boris Mikhaylov <kaguxmail@gmail.com>
- */
-class LogicalNotToken implements TokenInterface
-{
-    /** @var \Prophecy\Argument\Token\TokenInterface  */
-    private $token;
-
-    /**
-     * @param mixed $value exact value or token
-     */
-    public function __construct($value)
-    {
-        $this->token = $value instanceof TokenInterface? $value : new ExactValueToken($value);
-    }
-
-    /**
-     * Scores 4 when preset token does not match the argument.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        return false === $this->token->scoreArgument($argument) ? 4 : false;
-    }
-
-    /**
-     * Returns true if preset token is last.
-     *
-     * @return bool|int
-     */
-    public function isLast()
-    {
-        return $this->token->isLast();
-    }
-
-    /**
-     * Returns originating token.
-     *
-     * @return TokenInterface
-     */
-    public function getOriginatingToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('not(%s)', $this->token);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ObjectStateToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ObjectStateToken.php
deleted file mode 100644
index 8d93bfd..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/ObjectStateToken.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use SebastianBergmann\Comparator\ComparisonFailure;
-use Prophecy\Comparator\Factory as ComparatorFactory;
-use Prophecy\Util\StringUtil;
-
-/**
- * Object state-checker token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ObjectStateToken implements TokenInterface
-{
-    private $name;
-    private $value;
-    private $util;
-    private $comparatorFactory;
-
-    /**
-     * Initializes token.
-     *
-     * @param string            $methodName
-     * @param mixed             $value             Expected return value
-     * @param null|StringUtil   $util
-     * @param ComparatorFactory $comparatorFactory
-     */
-    public function __construct(
-        $methodName,
-        $value,
-        StringUtil $util = null,
-        ComparatorFactory $comparatorFactory = null
-    ) {
-        $this->name  = $methodName;
-        $this->value = $value;
-        $this->util  = $util ?: new StringUtil;
-
-        $this->comparatorFactory = $comparatorFactory ?: ComparatorFactory::getInstance();
-    }
-
-    /**
-     * Scores 8 if argument is an object, which method returns expected value.
-     *
-     * @param mixed $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        if (is_object($argument) && method_exists($argument, $this->name)) {
-            $actual = call_user_func(array($argument, $this->name));
-
-            $comparator = $this->comparatorFactory->getComparatorFor(
-                $actual, $this->value
-            );
-
-            try {
-                $comparator->assertEquals($actual, $this->value);
-                return 8;
-            } catch (ComparisonFailure $failure) {
-                return false;
-            }
-        }
-
-        if (is_object($argument) && property_exists($argument, $this->name)) {
-            return $argument->{$this->name} === $this->value ? 8 : false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('state(%s(), %s)',
-            $this->name,
-            $this->util->stringify($this->value)
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php
deleted file mode 100644
index 24ff8c2..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/StringContainsToken.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * String contains token.
- *
- * @author Peter Mitchell <pete@peterjmit.com>
- */
-class StringContainsToken implements TokenInterface
-{
-    private $value;
-
-    /**
-     * Initializes token.
-     *
-     * @param string $value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function scoreArgument($argument)
-    {
-        return strpos($argument, $this->value) !== false ? 6 : false;
-    }
-
-    /**
-     * Returns preset value against which token checks arguments.
-     *
-     * @return mixed
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('contains("%s")', $this->value);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TokenInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TokenInterface.php
deleted file mode 100644
index 625d3ba..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TokenInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-/**
- * Argument token interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface TokenInterface
-{
-    /**
-     * Calculates token match score for provided argument.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument);
-
-    /**
-     * Returns true if this token prevents check of other tokens (is last one).
-     *
-     * @return bool|int
-     */
-    public function isLast();
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TypeToken.php b/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TypeToken.php
deleted file mode 100644
index cb65132..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Argument/Token/TypeToken.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Argument\Token;
-
-use Prophecy\Exception\InvalidArgumentException;
-
-/**
- * Value type token.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class TypeToken implements TokenInterface
-{
-    private $type;
-
-    /**
-     * @param string $type
-     */
-    public function __construct($type)
-    {
-        $checker = "is_{$type}";
-        if (!function_exists($checker) && !interface_exists($type) && !class_exists($type)) {
-            throw new InvalidArgumentException(sprintf(
-                'Type or class name expected as an argument to TypeToken, but got %s.', $type
-            ));
-        }
-
-        $this->type = $type;
-    }
-
-    /**
-     * Scores 5 if argument has the same type this token was constructed with.
-     *
-     * @param $argument
-     *
-     * @return bool|int
-     */
-    public function scoreArgument($argument)
-    {
-        $checker = "is_{$this->type}";
-        if (function_exists($checker)) {
-            return call_user_func($checker, $argument) ? 5 : false;
-        }
-
-        return $argument instanceof $this->type ? 5 : false;
-    }
-
-    /**
-     * Returns false.
-     *
-     * @return bool
-     */
-    public function isLast()
-    {
-        return false;
-    }
-
-    /**
-     * Returns string representation for token.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return sprintf('type(%s)', $this->type);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php b/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php
deleted file mode 100644
index 2f3fbad..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Call/Call.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Call;
-
-use Exception;
-
-/**
- * Call object.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Call
-{
-    private $methodName;
-    private $arguments;
-    private $returnValue;
-    private $exception;
-    private $file;
-    private $line;
-
-    /**
-     * Initializes call.
-     *
-     * @param string      $methodName
-     * @param array       $arguments
-     * @param mixed       $returnValue
-     * @param Exception   $exception
-     * @param null|string $file
-     * @param null|int    $line
-     */
-    public function __construct($methodName, array $arguments, $returnValue,
-                                Exception $exception = null, $file, $line)
-    {
-        $this->methodName  = $methodName;
-        $this->arguments   = $arguments;
-        $this->returnValue = $returnValue;
-        $this->exception   = $exception;
-
-        if ($file) {
-            $this->file = $file;
-            $this->line = intval($line);
-        }
-    }
-
-    /**
-     * Returns called method name.
-     *
-     * @return string
-     */
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-
-    /**
-     * Returns called method arguments.
-     *
-     * @return array
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * Returns called method return value.
-     *
-     * @return null|mixed
-     */
-    public function getReturnValue()
-    {
-        return $this->returnValue;
-    }
-
-    /**
-     * Returns exception that call thrown.
-     *
-     * @return null|Exception
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
-
-    /**
-     * Returns callee filename.
-     *
-     * @return string
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Returns callee line number.
-     *
-     * @return int
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
-
-    /**
-     * Returns short notation for callee place.
-     *
-     * @return string
-     */
-    public function getCallPlace()
-    {
-        if (null === $this->file) {
-            return 'unknown';
-        }
-
-        return sprintf('%s:%d', $this->file, $this->line);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php b/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php
deleted file mode 100644
index 7495855..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Call;
-
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Argument\ArgumentsWildcard;
-use Prophecy\Util\StringUtil;
-use Prophecy\Exception\Call\UnexpectedCallException;
-
-/**
- * Calls receiver & manager.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallCenter
-{
-    private $util;
-
-    /**
-     * @var Call[]
-     */
-    private $recordedCalls = array();
-
-    /**
-     * Initializes call center.
-     *
-     * @param StringUtil $util
-     */
-    public function __construct(StringUtil $util = null)
-    {
-        $this->util = $util ?: new StringUtil;
-    }
-
-    /**
-     * Makes and records specific method call for object prophecy.
-     *
-     * @param ObjectProphecy $prophecy
-     * @param string         $methodName
-     * @param array          $arguments
-     *
-     * @return mixed Returns null if no promise for prophecy found or promise return value.
-     *
-     * @throws \Prophecy\Exception\Call\UnexpectedCallException If no appropriate method prophecy found
-     */
-    public function makeCall(ObjectProphecy $prophecy, $methodName, array $arguments)
-    {
-        $backtrace = debug_backtrace();
-
-        $file = $line = null;
-        if (isset($backtrace[2]) && isset($backtrace[2]['file'])) {
-            $file = $backtrace[2]['file'];
-            $line = $backtrace[2]['line'];
-        }
-
-        // If no method prophecies defined, then it's a dummy, so we'll just return null
-        if ('__destruct' === $methodName || 0 == count($prophecy->getMethodProphecies())) {
-            $this->recordedCalls[] = new Call($methodName, $arguments, null, null, $file, $line);
-
-            return null;
-        }
-
-        // There are method prophecies, so it's a fake/stub. Searching prophecy for this call
-        $matches = array();
-        foreach ($prophecy->getMethodProphecies($methodName) as $methodProphecy) {
-            if (0 < $score = $methodProphecy->getArgumentsWildcard()->scoreArguments($arguments)) {
-                $matches[] = array($score, $methodProphecy);
-            }
-        }
-
-        // If fake/stub doesn't have method prophecy for this call - throw exception
-        if (!count($matches)) {
-            throw $this->createUnexpectedCallException($prophecy, $methodName, $arguments);
-        }
-
-        // Sort matches by their score value
-        @usort($matches, function ($match1, $match2) { return $match2[0] - $match1[0]; });
-
-        // If Highest rated method prophecy has a promise - execute it or return null instead
-        $returnValue = null;
-        $exception   = null;
-        if ($promise = $matches[0][1]->getPromise()) {
-            try {
-                $returnValue = $promise->execute($arguments, $prophecy, $matches[0][1]);
-            } catch (\Exception $e) {
-                $exception = $e;
-            }
-        }
-
-        $this->recordedCalls[] = new Call(
-            $methodName, $arguments, $returnValue, $exception, $file, $line
-        );
-
-        if (null !== $exception) {
-            throw $exception;
-        }
-
-        return $returnValue;
-    }
-
-    /**
-     * Searches for calls by method name & arguments wildcard.
-     *
-     * @param string            $methodName
-     * @param ArgumentsWildcard $wildcard
-     *
-     * @return Call[]
-     */
-    public function findCalls($methodName, ArgumentsWildcard $wildcard)
-    {
-        return array_values(
-            array_filter($this->recordedCalls, function (Call $call) use ($methodName, $wildcard) {
-                return $methodName === $call->getMethodName()
-                    && 0 < $wildcard->scoreArguments($call->getArguments())
-                ;
-            })
-        );
-    }
-
-    private function createUnexpectedCallException(ObjectProphecy $prophecy, $methodName,
-                                                   array $arguments)
-    {
-        $classname = get_class($prophecy->reveal());
-        $argstring = implode(', ', array_map(array($this->util, 'stringify'), $arguments));
-        $expected  = implode("\n", array_map(function (MethodProphecy $methodProphecy) {
-            return sprintf('  - %s(%s)',
-                $methodProphecy->getMethodName(),
-                $methodProphecy->getArgumentsWildcard()
-            );
-        }, call_user_func_array('array_merge', $prophecy->getMethodProphecies())));
-
-        return new UnexpectedCallException(
-            sprintf(
-                "Method call:\n".
-                "  - %s(%s)\n".
-                "on %s was not expected, expected calls were:\n%s",
-
-                $methodName, $argstring, $classname, $expected
-            ),
-            $prophecy, $methodName, $arguments
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Comparator/ClosureComparator.php b/vendor/phpspec/prophecy/src/Prophecy/Comparator/ClosureComparator.php
deleted file mode 100644
index 874e474..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Comparator/ClosureComparator.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Comparator;
-
-use SebastianBergmann\Comparator\Comparator;
-use SebastianBergmann\Comparator\ComparisonFailure;
-
-/**
- * Closure comparator.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-final class ClosureComparator extends Comparator
-{
-    public function accepts($expected, $actual)
-    {
-        return is_object($expected) && $expected instanceof \Closure
-            && is_object($actual) && $actual instanceof \Closure;
-    }
-
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        throw new ComparisonFailure(
-            $expected,
-            $actual,
-            // we don't need a diff
-            '',
-            '',
-            false,
-            'all closures are born different'
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Comparator/Factory.php b/vendor/phpspec/prophecy/src/Prophecy/Comparator/Factory.php
deleted file mode 100644
index a7a1200..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Comparator/Factory.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Comparator;
-
-use SebastianBergmann\Comparator\Factory as BaseFactory;
-
-/**
- * Prophecy comparator factory.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-final class Factory extends BaseFactory
-{
-    /**
-     * @var Factory
-     */
-    private static $instance;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->register(new ClosureComparator());
-    }
-
-    /**
-     * @return Factory
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new Factory;
-        }
-
-        return self::$instance;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/CachedDoubler.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/CachedDoubler.php
deleted file mode 100644
index d6b6b1a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/CachedDoubler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler;
-
-use ReflectionClass;
-
-/**
- * Cached class doubler.
- * Prevents mirroring/creation of the same structure twice.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CachedDoubler extends Doubler
-{
-    private $classes = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerClassPatch(ClassPatch\ClassPatchInterface $patch)
-    {
-        $this->classes[] = array();
-
-        parent::registerClassPatch($patch);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function createDoubleClass(ReflectionClass $class = null, array $interfaces)
-    {
-        $classId = $this->generateClassId($class, $interfaces);
-        if (isset($this->classes[$classId])) {
-            return $this->classes[$classId];
-        }
-
-        return $this->classes[$classId] = parent::createDoubleClass($class, $interfaces);
-    }
-
-    /**
-     * @param ReflectionClass   $class
-     * @param ReflectionClass[] $interfaces
-     *
-     * @return string
-     */
-    private function generateClassId(ReflectionClass $class = null, array $interfaces)
-    {
-        $parts = array();
-        if (null !== $class) {
-            $parts[] = $class->getName();
-        }
-        foreach ($interfaces as $interface) {
-            $parts[] = $interface->getName();
-        }
-        sort($parts);
-
-        return md5(implode('', $parts));
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ClassPatchInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ClassPatchInterface.php
deleted file mode 100644
index d6d1968..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ClassPatchInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-
-/**
- * Class patch interface.
- * Class patches extend doubles functionality or help
- * Prophecy to avoid some internal PHP bugs.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface ClassPatchInterface
-{
-    /**
-     * Checks if patch supports specific class node.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node);
-
-    /**
-     * Applies patch to the specific class node.
-     *
-     * @param ClassNode $node
-     * @return void
-     */
-    public function apply(ClassNode $node);
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority();
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/DisableConstructorPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/DisableConstructorPatch.php
deleted file mode 100644
index 61998fc..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/DisableConstructorPatch.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-/**
- * Disable constructor.
- * Makes all constructor arguments optional.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class DisableConstructorPatch implements ClassPatchInterface
-{
-    /**
-     * Checks if class has `__construct` method.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        return true;
-    }
-
-    /**
-     * Makes all class constructor arguments optional.
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        if (!$node->hasMethod('__construct')) {
-            $node->addMethod(new MethodNode('__construct', ''));
-
-            return;
-        }
-
-        $constructor = $node->getMethod('__construct');
-        foreach ($constructor->getArguments() as $argument) {
-            $argument->setDefault(null);
-        }
-
-        $constructor->setCode(<<<PHP
-if (0 < func_num_args()) {
-    call_user_func_array(array('parent', '__construct'), func_get_args());
-}
-PHP
-        );
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority()
-    {
-        return 100;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/HhvmExceptionPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/HhvmExceptionPatch.php
deleted file mode 100644
index fa38fc0..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/HhvmExceptionPatch.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-
-/**
- * Exception patch for HHVM to remove the stubs from special methods
- *
- * @author Christophe Coevoet <stof@notk.org>
- */
-class HhvmExceptionPatch implements ClassPatchInterface
-{
-    /**
-     * Supports exceptions on HHVM.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        if (!defined('HHVM_VERSION')) {
-            return false;
-        }
-
-        return 'Exception' === $node->getParentClass() || is_subclass_of($node->getParentClass(), 'Exception');
-    }
-
-    /**
-     * Removes special exception static methods from the doubled methods.
-     *
-     * @param ClassNode $node
-     *
-     * @return void
-     */
-    public function apply(ClassNode $node)
-    {
-        if ($node->hasMethod('setTraceOptions')) {
-            $node->getMethod('setTraceOptions')->useParentCode();
-        }
-        if ($node->hasMethod('getTraceOptions')) {
-            $node->getMethod('getTraceOptions')->useParentCode();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return -50;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/KeywordPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/KeywordPatch.php
deleted file mode 100644
index b0d9793..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/KeywordPatch.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-
-/**
- * Remove method functionality from the double which will clash with php keywords.
- *
- * @author Milan Magudia <milan@magudia.com>
- */
-class KeywordPatch implements ClassPatchInterface
-{
-    /**
-     * Support any class
-     *
-     * @param ClassNode $node
-     *
-     * @return boolean
-     */
-    public function supports(ClassNode $node)
-    {
-        return true;
-    }
-
-    /**
-     * Remove methods that clash with php keywords
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        $methodNames = array_keys($node->getMethods());
-        $methodsToRemove = array_intersect($methodNames, $this->getKeywords());
-        foreach ($methodsToRemove as $methodName) {
-            $node->removeMethod($methodName);
-        }
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority() {
-        return 49;
-    }
-
-    /**
-     * Returns array of php keywords.
-     *
-     * @return array
-     */
-    private function getKeywords() {
-
-        return array(
-            '__halt_compiler',
-            'abstract',
-            'and',
-            'array',
-            'as',
-            'break',
-            'callable',
-            'case',
-            'catch',
-            'class',
-            'clone',
-            'const',
-            'continue',
-            'declare',
-            'default',
-            'die',
-            'do',
-            'echo',
-            'else',
-            'elseif',
-            'empty',
-            'enddeclare',
-            'endfor',
-            'endforeach',
-            'endif',
-            'endswitch',
-            'endwhile',
-            'eval',
-            'exit',
-            'extends',
-            'final',
-            'finally',
-            'for',
-            'foreach',
-            'function',
-            'global',
-            'goto',
-            'if',
-            'implements',
-            'include',
-            'include_once',
-            'instanceof',
-            'insteadof',
-            'interface',
-            'isset',
-            'list',
-            'namespace',
-            'new',
-            'or',
-            'print',
-            'private',
-            'protected',
-            'public',
-            'require',
-            'require_once',
-            'return',
-            'static',
-            'switch',
-            'throw',
-            'trait',
-            'try',
-            'unset',
-            'use',
-            'var',
-            'while',
-            'xor',
-            'yield',
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php
deleted file mode 100644
index da45450..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/MagicCallPatch.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use phpDocumentor\Reflection\DocBlock;
-use Prophecy\Doubler\Generator\Node\ClassNode;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-/**
- * Discover Magical API using "@method" PHPDoc format.
- *
- * @author Thomas Tourlourat <thomas@tourlourat.com>
- */
-class MagicCallPatch implements ClassPatchInterface
-{
-    /**
-     * Support any class
-     *
-     * @param ClassNode $node
-     *
-     * @return boolean
-     */
-    public function supports(ClassNode $node)
-    {
-        return true;
-    }
-
-    /**
-     * Discover Magical API
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        $parentClass = $node->getParentClass();
-        $reflectionClass = new \ReflectionClass($parentClass);
-
-        $phpdoc = new DocBlock($reflectionClass->getDocComment());
-
-        $tagList = $phpdoc->getTagsByName('method');
-
-        foreach($tagList as $tag) {
-            $methodName = $tag->getMethodName();
-
-            if (!$reflectionClass->hasMethod($methodName)) {
-                $methodNode = new MethodNode($tag->getMethodName());
-                $methodNode->setStatic($tag->isStatic());
-
-                $node->addMethod($methodNode);
-            }
-        }
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return integer Priority number (higher - earlier)
-     */
-    public function getPriority()
-    {
-        return 50;
-    }
-}
-
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php
deleted file mode 100644
index ab0bb7c..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ProphecySubjectPatch.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-use Prophecy\Doubler\Generator\Node\ArgumentNode;
-
-/**
- * Add Prophecy functionality to the double.
- * This is a core class patch for Prophecy.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ProphecySubjectPatch implements ClassPatchInterface
-{
-    /**
-     * Always returns true.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        return true;
-    }
-
-    /**
-     * Apply Prophecy functionality to class node.
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        $node->addInterface('Prophecy\Prophecy\ProphecySubjectInterface');
-        $node->addProperty('objectProphecy', 'private');
-
-        foreach ($node->getMethods() as $name => $method) {
-            if ('__construct' === strtolower($name)) {
-                continue;
-            }
-
-            $method->setCode(
-                'return $this->getProphecy()->makeProphecyMethodCall(__FUNCTION__, func_get_args());'
-            );
-        }
-
-        $prophecySetter = new MethodNode('setProphecy');
-        $prophecyArgument = new ArgumentNode('prophecy');
-        $prophecyArgument->setTypeHint('Prophecy\Prophecy\ProphecyInterface');
-        $prophecySetter->addArgument($prophecyArgument);
-        $prophecySetter->setCode('$this->objectProphecy = $prophecy;');
-
-        $prophecyGetter = new MethodNode('getProphecy');
-        $prophecyGetter->setCode('return $this->objectProphecy;');
-
-        if ($node->hasMethod('__call')) {
-            $__call = $node->getMethod('__call');
-        } else {
-            $__call = new MethodNode('__call');
-            $__call->addArgument(new ArgumentNode('name'));
-            $__call->addArgument(new ArgumentNode('arguments'));
-
-            $node->addMethod($__call);
-        }
-
-        $__call->setCode(<<<PHP
-throw new \Prophecy\Exception\Doubler\MethodNotFoundException(
-    sprintf('Method `%s::%s()` not found.', get_class(\$this), func_get_arg(0)),
-    \$this->getProphecy(), func_get_arg(0)
-);
-PHP
-        );
-
-        $node->addMethod($prophecySetter);
-        $node->addMethod($prophecyGetter);
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatch.php
deleted file mode 100644
index 9166aee..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/ReflectionClassNewInstancePatch.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-
-/**
- * ReflectionClass::newInstance patch.
- * Makes first argument of newInstance optional, since it works but signature is misleading
- *
- * @author Florian Klein <florian.klein@free.fr>
- */
-class ReflectionClassNewInstancePatch implements ClassPatchInterface
-{
-    /**
-     * Supports ReflectionClass
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        return 'ReflectionClass' === $node->getParentClass();
-    }
-
-    /**
-     * Updates newInstance's first argument to make it optional
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        foreach ($node->getMethod('newInstance')->getArguments() as $argument) {
-            $argument->setDefault(null);
-        }
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher = earlier)
-     */
-    public function getPriority()
-    {
-        return 50;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/SplFileInfoPatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/SplFileInfoPatch.php
deleted file mode 100644
index 8401159..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/SplFileInfoPatch.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-/**
- * SplFileInfo patch.
- * Makes SplFileInfo and derivative classes usable with Prophecy.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class SplFileInfoPatch implements ClassPatchInterface
-{
-    /**
-     * Supports everything that extends SplFileInfo.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        if (null === $node->getParentClass()) {
-            return false;
-        }
-
-        return 'SplFileInfo' === $node->getParentClass()
-            || is_subclass_of($node->getParentClass(), 'SplFileInfo')
-        ;
-    }
-
-    /**
-     * Updated constructor code to call parent one with dummy file argument.
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        if ($node->hasMethod('__construct')) {
-            $constructor = $node->getMethod('__construct');
-        } else {
-            $constructor = new MethodNode('__construct');
-            $node->addMethod($constructor);
-        }
-
-        if ($this->nodeIsDirectoryIterator($node)) {
-            $constructor->setCode('return parent::__construct("' . __DIR__ . '");');
-            return;
-        }
-
-        $constructor->useParentCode();
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority()
-    {
-        return 50;
-    }
-
-    /**
-     * @param ClassNode $node
-     * @return boolean
-     */
-    private function nodeIsDirectoryIterator(ClassNode $node)
-    {
-        $parent = $node->getParentClass();
-        return 'DirectoryIterator' === $parent
-            || is_subclass_of($parent, 'DirectoryIterator');
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/TraversablePatch.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/TraversablePatch.php
deleted file mode 100644
index eea0202..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/TraversablePatch.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\ClassPatch;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-use Prophecy\Doubler\Generator\Node\MethodNode;
-
-/**
- * Traversable interface patch.
- * Forces classes that implement interfaces, that extend Traversable to also implement Iterator.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class TraversablePatch implements ClassPatchInterface
-{
-    /**
-     * Supports nodetree, that implement Traversable, but not Iterator or IteratorAggregate.
-     *
-     * @param ClassNode $node
-     *
-     * @return bool
-     */
-    public function supports(ClassNode $node)
-    {
-        if (in_array('Iterator', $node->getInterfaces())) {
-            return false;
-        }
-        if (in_array('IteratorAggregate', $node->getInterfaces())) {
-            return false;
-        }
-
-        foreach ($node->getInterfaces() as $interface) {
-            if ('Traversable' !== $interface && !is_subclass_of($interface, 'Traversable')) {
-                continue;
-            }
-            if ('Iterator' === $interface || is_subclass_of($interface, 'Iterator')) {
-                continue;
-            }
-            if ('IteratorAggregate' === $interface || is_subclass_of($interface, 'IteratorAggregate')) {
-                continue;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Forces class to implement Iterator interface.
-     *
-     * @param ClassNode $node
-     */
-    public function apply(ClassNode $node)
-    {
-        $node->addInterface('Iterator');
-
-        $node->addMethod(new MethodNode('current'));
-        $node->addMethod(new MethodNode('key'));
-        $node->addMethod(new MethodNode('next'));
-        $node->addMethod(new MethodNode('rewind'));
-        $node->addMethod(new MethodNode('valid'));
-    }
-
-    /**
-     * Returns patch priority, which determines when patch will be applied.
-     *
-     * @return int Priority number (higher - earlier)
-     */
-    public function getPriority()
-    {
-        return 100;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/DoubleInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/DoubleInterface.php
deleted file mode 100644
index 699be3a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/DoubleInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler;
-
-/**
- * Core double interface.
- * All doubled classes will implement this one.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface DoubleInterface
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Doubler.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Doubler.php
deleted file mode 100644
index a378ae2..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Doubler.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler;
-
-use Doctrine\Instantiator\Instantiator;
-use Prophecy\Doubler\ClassPatch\ClassPatchInterface;
-use Prophecy\Doubler\Generator\ClassMirror;
-use Prophecy\Doubler\Generator\ClassCreator;
-use Prophecy\Exception\InvalidArgumentException;
-use ReflectionClass;
-
-/**
- * Cached class doubler.
- * Prevents mirroring/creation of the same structure twice.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Doubler
-{
-    private $mirror;
-    private $creator;
-    private $namer;
-
-    /**
-     * @var ClassPatchInterface[]
-     */
-    private $patches = array();
-
-    /**
-     * @var \Doctrine\Instantiator\Instantiator
-     */
-    private $instantiator;
-
-    /**
-     * Initializes doubler.
-     *
-     * @param ClassMirror   $mirror
-     * @param ClassCreator  $creator
-     * @param NameGenerator $namer
-     */
-    public function __construct(ClassMirror $mirror = null, ClassCreator $creator = null,
-                                NameGenerator $namer = null)
-    {
-        $this->mirror  = $mirror  ?: new ClassMirror;
-        $this->creator = $creator ?: new ClassCreator;
-        $this->namer   = $namer   ?: new NameGenerator;
-    }
-
-    /**
-     * Returns list of registered class patches.
-     *
-     * @return ClassPatchInterface[]
-     */
-    public function getClassPatches()
-    {
-        return $this->patches;
-    }
-
-    /**
-     * Registers new class patch.
-     *
-     * @param ClassPatchInterface $patch
-     */
-    public function registerClassPatch(ClassPatchInterface $patch)
-    {
-        $this->patches[] = $patch;
-
-        @usort($this->patches, function (ClassPatchInterface $patch1, ClassPatchInterface $patch2) {
-            return $patch2->getPriority() - $patch1->getPriority();
-        });
-    }
-
-    /**
-     * Creates double from specific class or/and list of interfaces.
-     *
-     * @param ReflectionClass   $class
-     * @param ReflectionClass[] $interfaces Array of ReflectionClass instances
-     * @param array             $args       Constructor arguments
-     *
-     * @return DoubleInterface
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function double(ReflectionClass $class = null, array $interfaces, array $args = null)
-    {
-        foreach ($interfaces as $interface) {
-            if (!$interface instanceof ReflectionClass) {
-                throw new InvalidArgumentException(sprintf(
-                    "[ReflectionClass \$interface1 [, ReflectionClass \$interface2]] array expected as\n".
-                    "a second argument to `Doubler::double(...)`, but got %s.",
-                    is_object($interface) ? get_class($interface).' class' : gettype($interface)
-                ));
-            }
-        }
-
-        $classname  = $this->createDoubleClass($class, $interfaces);
-        $reflection = new ReflectionClass($classname);
-
-        if (null !== $args) {
-            return $reflection->newInstanceArgs($args);
-        }
-        if ((null === $constructor = $reflection->getConstructor())
-            || ($constructor->isPublic() && !$constructor->isFinal())) {
-            return $reflection->newInstance();
-        }
-
-        if (!$this->instantiator) {
-            $this->instantiator = new Instantiator();
-        }
-
-        return $this->instantiator->instantiate($classname);
-    }
-
-    /**
-     * Creates double class and returns its FQN.
-     *
-     * @param ReflectionClass   $class
-     * @param ReflectionClass[] $interfaces
-     *
-     * @return string
-     */
-    protected function createDoubleClass(ReflectionClass $class = null, array $interfaces)
-    {
-        $name = $this->namer->name($class, $interfaces);
-        $node = $this->mirror->reflect($class, $interfaces);
-
-        foreach ($this->patches as $patch) {
-            if ($patch->supports($node)) {
-                $patch->apply($node);
-            }
-        }
-
-        $this->creator->create($name, $node);
-
-        return $name;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php
deleted file mode 100644
index 4d474e5..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCodeGenerator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator;
-
-/**
- * Class code creator.
- * Generates PHP code for specific class node tree.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ClassCodeGenerator
-{
-    /**
-     * Generates PHP code for class node.
-     *
-     * @param string         $classname
-     * @param Node\ClassNode $class
-     *
-     * @return string
-     */
-    public function generate($classname, Node\ClassNode $class)
-    {
-        $parts     = explode('\\', $classname);
-        $classname = array_pop($parts);
-        $namespace = implode('\\', $parts);
-
-        $code = sprintf("class %s extends \%s implements %s {\n",
-            $classname, $class->getParentClass(), implode(', ',
-                array_map(function ($interface) {return '\\'.$interface;}, $class->getInterfaces())
-            )
-        );
-
-        foreach ($class->getProperties() as $name => $visibility) {
-            $code .= sprintf("%s \$%s;\n", $visibility, $name);
-        }
-        $code .= "\n";
-
-        foreach ($class->getMethods() as $method) {
-            $code .= $this->generateMethod($method)."\n";
-        }
-        $code .= "\n}";
-
-        return sprintf("namespace %s {\n%s\n}", $namespace, $code);
-    }
-
-    private function generateMethod(Node\MethodNode $method)
-    {
-        $php = sprintf("%s %s function %s%s(%s)%s {\n",
-            $method->getVisibility(),
-            $method->isStatic() ? 'static' : '',
-            $method->returnsReference() ? '&':'',
-            $method->getName(),
-            implode(', ', $this->generateArguments($method->getArguments())),
-            $method->hasReturnType() ? sprintf(': %s', $method->getReturnType()) : ''
-        );
-        $php .= $method->getCode()."\n";
-
-        return $php.'}';
-    }
-
-    private function generateArguments(array $arguments)
-    {
-        return array_map(function (Node\ArgumentNode $argument) {
-            $php = '';
-
-            if ($hint = $argument->getTypeHint()) {
-                if ('array' === $hint || 'callable' === $hint) {
-                    $php .= $hint;
-                } else {
-                    $php .= '\\'.$hint;
-                }
-            }
-
-            $php .= ' '.($argument->isPassedByReference() ? '&' : '').'$'.$argument->getName();
-
-            if ($argument->isOptional()) {
-                $php .= ' = '.var_export($argument->getDefault(), true);
-            }
-
-            return $php;
-        }, $arguments);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCreator.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCreator.php
deleted file mode 100644
index 882a4a4..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassCreator.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator;
-
-use Prophecy\Exception\Doubler\ClassCreatorException;
-
-/**
- * Class creator.
- * Creates specific class in current environment.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ClassCreator
-{
-    private $generator;
-
-    /**
-     * Initializes creator.
-     *
-     * @param ClassCodeGenerator $generator
-     */
-    public function __construct(ClassCodeGenerator $generator = null)
-    {
-        $this->generator = $generator ?: new ClassCodeGenerator;
-    }
-
-    /**
-     * Creates class.
-     *
-     * @param string         $classname
-     * @param Node\ClassNode $class
-     *
-     * @return mixed
-     *
-     * @throws \Prophecy\Exception\Doubler\ClassCreatorException
-     */
-    public function create($classname, Node\ClassNode $class)
-    {
-        $code = $this->generator->generate($classname, $class);
-        $return = eval($code);
-
-        if (!class_exists($classname, false)) {
-            if (count($class->getInterfaces())) {
-                throw new ClassCreatorException(sprintf(
-                    'Could not double `%s` and implement interfaces: [%s].',
-                    $class->getParentClass(), implode(', ', $class->getInterfaces())
-                ), $class);
-            }
-
-            throw new ClassCreatorException(
-                sprintf('Could not double `%s`.', $class->getParentClass()),
-                $class
-            );
-        }
-
-        return $return;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php
deleted file mode 100644
index 6a4ebde..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator;
-
-use Prophecy\Exception\InvalidArgumentException;
-use Prophecy\Exception\Doubler\ClassMirrorException;
-use ReflectionClass;
-use ReflectionMethod;
-use ReflectionParameter;
-
-/**
- * Class mirror.
- * Core doubler class. Mirrors specific class and/or interfaces into class node tree.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ClassMirror
-{
-    private static $reflectableMethods = array(
-        '__construct',
-        '__destruct',
-        '__sleep',
-        '__wakeup',
-        '__toString',
-        '__call',
-    );
-
-    /**
-     * Reflects provided arguments into class node.
-     *
-     * @param ReflectionClass   $class
-     * @param ReflectionClass[] $interfaces
-     *
-     * @return Node\ClassNode
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function reflect(ReflectionClass $class = null, array $interfaces)
-    {
-        $node = new Node\ClassNode;
-
-        if (null !== $class) {
-            if (true === $class->isInterface()) {
-                throw new InvalidArgumentException(sprintf(
-                    "Could not reflect %s as a class, because it\n".
-                    "is interface - use the second argument instead.",
-                    $class->getName()
-                ));
-            }
-
-            $this->reflectClassToNode($class, $node);
-        }
-
-        foreach ($interfaces as $interface) {
-            if (!$interface instanceof ReflectionClass) {
-                throw new InvalidArgumentException(sprintf(
-                    "[ReflectionClass \$interface1 [, ReflectionClass \$interface2]] array expected as\n".
-                    "a second argument to `ClassMirror::reflect(...)`, but got %s.",
-                    is_object($interface) ? get_class($interface).' class' : gettype($interface)
-                ));
-            }
-            if (false === $interface->isInterface()) {
-                throw new InvalidArgumentException(sprintf(
-                    "Could not reflect %s as an interface, because it\n".
-                    "is class - use the first argument instead.",
-                    $interface->getName()
-                ));
-            }
-
-            $this->reflectInterfaceToNode($interface, $node);
-        }
-
-        $node->addInterface('Prophecy\Doubler\Generator\ReflectionInterface');
-
-        return $node;
-    }
-
-    private function reflectClassToNode(ReflectionClass $class, Node\ClassNode $node)
-    {
-        if (true === $class->isFinal()) {
-            throw new ClassMirrorException(sprintf(
-                'Could not reflect class %s as it is marked final.', $class->getName()
-            ), $class);
-        }
-
-        $node->setParentClass($class->getName());
-
-        foreach ($class->getMethods(ReflectionMethod::IS_ABSTRACT) as $method) {
-            if (false === $method->isProtected()) {
-                continue;
-            }
-
-            $this->reflectMethodToNode($method, $node);
-        }
-
-        foreach ($class->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            if (0 === strpos($method->getName(), '_')
-                && !in_array($method->getName(), self::$reflectableMethods)) {
-                continue;
-            }
-
-            if (true === $method->isFinal()) {
-                continue;
-            }
-
-            $this->reflectMethodToNode($method, $node);
-        }
-    }
-
-    private function reflectInterfaceToNode(ReflectionClass $interface, Node\ClassNode $node)
-    {
-        $node->addInterface($interface->getName());
-
-        foreach ($interface->getMethods() as $method) {
-            $this->reflectMethodToNode($method, $node);
-        }
-    }
-
-    private function reflectMethodToNode(ReflectionMethod $method, Node\ClassNode $classNode)
-    {
-        $node = new Node\MethodNode($method->getName());
-
-        if (true === $method->isProtected()) {
-            $node->setVisibility('protected');
-        }
-
-        if (true === $method->isStatic()) {
-            $node->setStatic();
-        }
-
-        if (true === $method->returnsReference()) {
-            $node->setReturnsReference();
-        }
-
-        if (version_compare(PHP_VERSION, '7.0', '>=') && true === $method->hasReturnType()) {
-            $node->setReturnType((string) $method->getReturnType());
-        }
-
-        if (is_array($params = $method->getParameters()) && count($params)) {
-            foreach ($params as $param) {
-                $this->reflectArgumentToNode($param, $node);
-            }
-        }
-
-        $classNode->addMethod($node);
-    }
-
-    private function reflectArgumentToNode(ReflectionParameter $parameter, Node\MethodNode $methodNode)
-    {
-        $name = $parameter->getName() == '...' ? '__dot_dot_dot__' : $parameter->getName();
-        $node = new Node\ArgumentNode($name);
-
-        $typeHint = $this->getTypeHint($parameter);
-        $node->setTypeHint($typeHint);
-
-        if (true === $parameter->isDefaultValueAvailable()) {
-            $node->setDefault($parameter->getDefaultValue());
-        } elseif (true === $parameter->isOptional()
-              || (true === $parameter->allowsNull() && $typeHint)) {
-            $node->setDefault(null);
-        }
-
-        if (true === $parameter->isPassedByReference()) {
-            $node->setAsPassedByReference();
-        }
-
-        $methodNode->addArgument($node);
-    }
-
-    private function getTypeHint(ReflectionParameter $parameter)
-    {
-        if (null !== $className = $this->getParameterClassName($parameter)) {
-            return $className;
-        }
-
-        if (true === $parameter->isArray()) {
-            return 'array';
-        }
-
-        if (version_compare(PHP_VERSION, '5.4', '>=') && true === $parameter->isCallable()) {
-            return 'callable';
-        }
-
-        if (version_compare(PHP_VERSION, '7.0', '>=') && true === $parameter->hasType()) {
-            return (string) $parameter->getType();
-        }
-
-        return null;
-    }
-
-    private function getParameterClassName(ReflectionParameter $parameter)
-    {
-        try {
-            return $parameter->getClass() ? $parameter->getClass()->getName() : null;
-        } catch (\ReflectionException $e) {
-            preg_match('/\[\s\<\w+?>\s([\w,\\\]+)/s', $parameter, $matches);
-
-            return isset($matches[1]) ? $matches[1] : null;
-        }
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ArgumentNode.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ArgumentNode.php
deleted file mode 100644
index a6c42a3..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ArgumentNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator\Node;
-
-/**
- * Argument node.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ArgumentNode
-{
-    private $name;
-    private $typeHint;
-    private $default;
-    private $optional    = false;
-    private $byReference = false;
-
-    /**
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getTypeHint()
-    {
-        return $this->typeHint;
-    }
-
-    public function setTypeHint($typeHint = null)
-    {
-        $this->typeHint = $typeHint;
-    }
-
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    public function setDefault($default = null)
-    {
-        $this->optional = true;
-        $this->default  = $default;
-    }
-
-    public function isOptional()
-    {
-        return $this->optional;
-    }
-
-    public function setAsPassedByReference($byReference = true)
-    {
-        $this->byReference = $byReference;
-    }
-
-    public function isPassedByReference()
-    {
-        return $this->byReference;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php
deleted file mode 100644
index b38cb4e..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/ClassNode.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator\Node;
-
-use Prophecy\Exception\InvalidArgumentException;
-
-/**
- * Class node.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ClassNode
-{
-    private $parentClass = 'stdClass';
-    private $interfaces  = array();
-    private $properties  = array();
-
-    /**
-     * @var MethodNode[]
-     */
-    private $methods     = array();
-
-    public function getParentClass()
-    {
-        return $this->parentClass;
-    }
-
-    /**
-     * @param string $class
-     */
-    public function setParentClass($class)
-    {
-        $this->parentClass = $class ?: 'stdClass';
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getInterfaces()
-    {
-        return $this->interfaces;
-    }
-
-    /**
-     * @param string $interface
-     */
-    public function addInterface($interface)
-    {
-        if ($this->hasInterface($interface)) {
-            return;
-        }
-
-        array_unshift($this->interfaces, $interface);
-    }
-
-    /**
-     * @param string $interface
-     *
-     * @return bool
-     */
-    public function hasInterface($interface)
-    {
-        return in_array($interface, $this->interfaces);
-    }
-
-    public function getProperties()
-    {
-        return $this->properties;
-    }
-
-    public function addProperty($name, $visibility = 'public')
-    {
-        $visibility = strtolower($visibility);
-
-        if (!in_array($visibility, array('public', 'private', 'protected'))) {
-            throw new InvalidArgumentException(sprintf(
-                '`%s` property visibility is not supported.', $visibility
-            ));
-        }
-
-        $this->properties[$name] = $visibility;
-    }
-
-    /**
-     * @return MethodNode[]
-     */
-    public function getMethods()
-    {
-        return $this->methods;
-    }
-
-    public function addMethod(MethodNode $method)
-    {
-        $this->methods[$method->getName()] = $method;
-    }
-
-    public function removeMethod($name)
-    {
-        unset($this->methods[$name]);
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return MethodNode|null
-     */
-    public function getMethod($name)
-    {
-        return $this->hasMethod($name) ? $this->methods[$name] : null;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasMethod($name)
-    {
-        return isset($this->methods[$name]);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php
deleted file mode 100644
index eb95352..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/Node/MethodNode.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator\Node;
-
-use Prophecy\Exception\InvalidArgumentException;
-
-/**
- * Method node.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class MethodNode
-{
-    private $name;
-    private $code;
-    private $visibility = 'public';
-    private $static = false;
-    private $returnsReference = false;
-    private $returnType;
-
-    /**
-     * @var ArgumentNode[]
-     */
-    private $arguments = array();
-
-    /**
-     * @param string $name
-     * @param string $code
-     */
-    public function __construct($name, $code = null)
-    {
-        $this->name = $name;
-        $this->code = $code;
-    }
-
-    public function getVisibility()
-    {
-        return $this->visibility;
-    }
-
-    /**
-     * @param string $visibility
-     */
-    public function setVisibility($visibility)
-    {
-        $visibility = strtolower($visibility);
-
-        if (!in_array($visibility, array('public', 'private', 'protected'))) {
-            throw new InvalidArgumentException(sprintf(
-                '`%s` method visibility is not supported.', $visibility
-            ));
-        }
-
-        $this->visibility = $visibility;
-    }
-
-    public function isStatic()
-    {
-        return $this->static;
-    }
-
-    public function setStatic($static = true)
-    {
-        $this->static = (bool) $static;
-    }
-
-    public function returnsReference()
-    {
-        return $this->returnsReference;
-    }
-
-    public function setReturnsReference()
-    {
-        $this->returnsReference = true;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function addArgument(ArgumentNode $argument)
-    {
-        $this->arguments[] = $argument;
-    }
-
-    /**
-     * @return ArgumentNode[]
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function hasReturnType()
-    {
-        return null !== $this->returnType;
-    }
-
-    /**
-     * @param string $type
-     */
-    public function setReturnType($type = null)
-    {
-        switch ($type) {
-            case '':
-                $this->returnType = null;
-                break;
-
-            case 'string';
-            case 'float':
-            case 'int':
-            case 'bool':
-            case 'array':
-            case 'callable':
-                $this->returnType = $type;
-                break;
-
-            case 'double':
-            case 'real':
-                $this->returnType = 'float';
-                break;
-
-            case 'boolean':
-                $this->returnType = 'bool';
-                break;
-
-            case 'integer':
-                $this->returnType = 'int';
-                break;
-
-            default:
-                $this->returnType = '\\' . ltrim($type, '\\');
-        }
-    }
-
-    public function getReturnType()
-    {
-        return $this->returnType;
-    }
-
-    /**
-     * @param string $code
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-    }
-
-    public function getCode()
-    {
-        if ($this->returnsReference)
-        {
-            return "throw new \Prophecy\Exception\Doubler\ReturnByReferenceException('Returning by reference not supported', get_class(\$this), '{$this->name}');";
-        }
-
-        return (string) $this->code;
-    }
-
-    public function useParentCode()
-    {
-        $this->code = sprintf(
-            'return parent::%s(%s);', $this->getName(), implode(', ',
-                array_map(function (ArgumentNode $arg) { return '$'.$arg->getName(); }, $this->arguments)
-            )
-        );
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ReflectionInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ReflectionInterface.php
deleted file mode 100644
index d720b15..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ReflectionInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler\Generator;
-
-/**
- * Reflection interface.
- * All reflected classes implement this interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface ReflectionInterface
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/LazyDouble.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/LazyDouble.php
deleted file mode 100644
index 8a99c4c..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/LazyDouble.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler;
-
-use Prophecy\Exception\Doubler\DoubleException;
-use Prophecy\Exception\Doubler\ClassNotFoundException;
-use Prophecy\Exception\Doubler\InterfaceNotFoundException;
-use ReflectionClass;
-
-/**
- * Lazy double.
- * Gives simple interface to describe double before creating it.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class LazyDouble
-{
-    private $doubler;
-    private $class;
-    private $interfaces = array();
-    private $arguments  = null;
-    private $double;
-
-    /**
-     * Initializes lazy double.
-     *
-     * @param Doubler $doubler
-     */
-    public function __construct(Doubler $doubler)
-    {
-        $this->doubler = $doubler;
-    }
-
-    /**
-     * Tells doubler to use specific class as parent one for double.
-     *
-     * @param string|ReflectionClass $class
-     *
-     * @throws \Prophecy\Exception\Doubler\ClassNotFoundException
-     * @throws \Prophecy\Exception\Doubler\DoubleException
-     */
-    public function setParentClass($class)
-    {
-        if (null !== $this->double) {
-            throw new DoubleException('Can not extend class with already instantiated double.');
-        }
-
-        if (!$class instanceof ReflectionClass) {
-            if (!class_exists($class)) {
-                throw new ClassNotFoundException(sprintf('Class %s not found.', $class), $class);
-            }
-
-            $class = new ReflectionClass($class);
-        }
-
-        $this->class = $class;
-    }
-
-    /**
-     * Tells doubler to implement specific interface with double.
-     *
-     * @param string|ReflectionClass $interface
-     *
-     * @throws \Prophecy\Exception\Doubler\InterfaceNotFoundException
-     * @throws \Prophecy\Exception\Doubler\DoubleException
-     */
-    public function addInterface($interface)
-    {
-        if (null !== $this->double) {
-            throw new DoubleException(
-                'Can not implement interface with already instantiated double.'
-            );
-        }
-
-        if (!$interface instanceof ReflectionClass) {
-            if (!interface_exists($interface)) {
-                throw new InterfaceNotFoundException(
-                    sprintf('Interface %s not found.', $interface),
-                    $interface
-                );
-            }
-
-            $interface = new ReflectionClass($interface);
-        }
-
-        $this->interfaces[] = $interface;
-    }
-
-    /**
-     * Sets constructor arguments.
-     *
-     * @param array $arguments
-     */
-    public function setArguments(array $arguments = null)
-    {
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Creates double instance or returns already created one.
-     *
-     * @return DoubleInterface
-     */
-    public function getInstance()
-    {
-        if (null === $this->double) {
-            if (null !== $this->arguments) {
-                return $this->double = $this->doubler->double(
-                    $this->class, $this->interfaces, $this->arguments
-                );
-            }
-
-            $this->double = $this->doubler->double($this->class, $this->interfaces);
-        }
-
-        return $this->double;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Doubler/NameGenerator.php b/vendor/phpspec/prophecy/src/Prophecy/Doubler/NameGenerator.php
deleted file mode 100644
index d67ec6a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Doubler/NameGenerator.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Doubler;
-
-use ReflectionClass;
-
-/**
- * Name generator.
- * Generates classname for double.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class NameGenerator
-{
-    private static $counter = 1;
-
-    /**
-     * Generates name.
-     *
-     * @param ReflectionClass   $class
-     * @param ReflectionClass[] $interfaces
-     *
-     * @return string
-     */
-    public function name(ReflectionClass $class = null, array $interfaces)
-    {
-        $parts = array();
-
-        if (null !== $class) {
-            $parts[] = $class->getName();
-        } else {
-            foreach ($interfaces as $interface) {
-                $parts[] = $interface->getShortName();
-            }
-        }
-
-        if (!count($parts)) {
-            $parts[] = 'stdClass';
-        }
-
-        return sprintf('Double\%s\P%d', implode('\\', $parts), self::$counter++);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Call/UnexpectedCallException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Call/UnexpectedCallException.php
deleted file mode 100644
index 48ed225..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Call/UnexpectedCallException.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Call;
-
-use Prophecy\Exception\Prophecy\ObjectProphecyException;
-use Prophecy\Prophecy\ObjectProphecy;
-
-class UnexpectedCallException extends ObjectProphecyException
-{
-    private $methodName;
-    private $arguments;
-
-    public function __construct($message, ObjectProphecy $objectProphecy,
-                                $methodName, array $arguments)
-    {
-        parent::__construct($message, $objectProphecy);
-
-        $this->methodName = $methodName;
-        $this->arguments = $arguments;
-    }
-
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassCreatorException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassCreatorException.php
deleted file mode 100644
index 822918a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassCreatorException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-use Prophecy\Doubler\Generator\Node\ClassNode;
-
-class ClassCreatorException extends \RuntimeException implements DoublerException
-{
-    private $node;
-
-    public function __construct($message, ClassNode $node)
-    {
-        parent::__construct($message);
-
-        $this->node = $node;
-    }
-
-    public function getClassNode()
-    {
-        return $this->node;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassMirrorException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassMirrorException.php
deleted file mode 100644
index 8fc53b8..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassMirrorException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-use ReflectionClass;
-
-class ClassMirrorException extends \RuntimeException implements DoublerException
-{
-    private $class;
-
-    public function __construct($message, ReflectionClass $class)
-    {
-        parent::__construct($message);
-
-        $this->class = $class;
-    }
-
-    public function getReflectedClass()
-    {
-        return $this->class;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassNotFoundException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassNotFoundException.php
deleted file mode 100644
index 5bc826d..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ClassNotFoundException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-class ClassNotFoundException extends DoubleException
-{
-    private $classname;
-
-    /**
-     * @param string $message
-     * @param string $classname
-     */
-    public function __construct($message, $classname)
-    {
-        parent::__construct($message);
-
-        $this->classname = $classname;
-    }
-
-    public function getClassname()
-    {
-        return $this->classname;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoubleException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoubleException.php
deleted file mode 100644
index 6642a58..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoubleException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-use RuntimeException;
-
-class DoubleException extends RuntimeException implements DoublerException
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoublerException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoublerException.php
deleted file mode 100644
index 9d6be17..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/DoublerException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-use Prophecy\Exception\Exception;
-
-interface DoublerException extends Exception
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/InterfaceNotFoundException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/InterfaceNotFoundException.php
deleted file mode 100644
index e344dea..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/InterfaceNotFoundException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-class InterfaceNotFoundException extends ClassNotFoundException
-{
-    public function getInterfaceName()
-    {
-        return $this->getClassname();
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php
deleted file mode 100644
index b113941..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/MethodNotFoundException.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-class MethodNotFoundException extends DoubleException
-{
-    /**
-     * @var string
-     */
-    private $classname;
-
-    /**
-     * @var string
-     */
-    private $methodName;
-
-    /**
-     * @var array
-     */
-    private $arguments;
-
-    /**
-     * @param string $message
-     * @param string $classname
-     * @param string $methodName
-     * @param null|Argument\ArgumentsWildcard|array $arguments
-     */
-    public function __construct($message, $classname, $methodName, $arguments = null)
-    {
-        parent::__construct($message);
-
-        $this->classname  = $classname;
-        $this->methodName = $methodName;
-        $this->arguments = $arguments;
-    }
-
-    public function getClassname()
-    {
-        return $this->classname;
-    }
-
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ReturnByReferenceException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ReturnByReferenceException.php
deleted file mode 100644
index 6303049..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Doubler/ReturnByReferenceException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Doubler;
-
-class ReturnByReferenceException extends DoubleException
-{
-    private $classname;
-    private $methodName;
-
-    /**
-     * @param string $message
-     * @param string $classname
-     * @param string $methodName
-     */
-    public function __construct($message, $classname, $methodName)
-    {
-        parent::__construct($message);
-
-        $this->classname  = $classname;
-        $this->methodName = $methodName;
-    }
-
-    public function getClassname()
-    {
-        return $this->classname;
-    }
-
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Exception.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Exception.php
deleted file mode 100644
index ac9fe4d..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Exception.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception;
-
-/**
- * Core Prophecy exception interface.
- * All Prophecy exceptions implement it.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface Exception
-{
-    /**
-     * @return string
-     */
-    public function getMessage();
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/InvalidArgumentException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/InvalidArgumentException.php
deleted file mode 100644
index bc91c69..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception;
-
-class InvalidArgumentException extends \InvalidArgumentException implements Exception
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php
deleted file mode 100644
index 44b598a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/AggregateException.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use Prophecy\Prophecy\ObjectProphecy;
-
-class AggregateException extends \RuntimeException implements PredictionException
-{
-    private $exceptions = array();
-    private $objectProphecy;
-
-    public function append(PredictionException $exception)
-    {
-        $message = $exception->getMessage();
-        $message = '  '.strtr($message, array("\n" => "\n  "))."\n";
-
-        $this->message      = rtrim($this->message.$message);
-        $this->exceptions[] = $exception;
-    }
-
-    /**
-     * @return PredictionException[]
-     */
-    public function getExceptions()
-    {
-        return $this->exceptions;
-    }
-
-    public function setObjectProphecy(ObjectProphecy $objectProphecy)
-    {
-        $this->objectProphecy = $objectProphecy;
-    }
-
-    /**
-     * @return ObjectProphecy
-     */
-    public function getObjectProphecy()
-    {
-        return $this->objectProphecy;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/FailedPredictionException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/FailedPredictionException.php
deleted file mode 100644
index bbbbc3d..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/FailedPredictionException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use RuntimeException;
-
-/**
- * Basic failed prediction exception.
- * Use it for custom prediction failures.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class FailedPredictionException extends RuntimeException implements PredictionException
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/NoCallsException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/NoCallsException.php
deleted file mode 100644
index 05ea4aa..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/NoCallsException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use Prophecy\Exception\Prophecy\MethodProphecyException;
-
-class NoCallsException extends MethodProphecyException implements PredictionException
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/PredictionException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/PredictionException.php
deleted file mode 100644
index 2596b1e..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/PredictionException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use Prophecy\Exception\Exception;
-
-interface PredictionException extends Exception
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsCountException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsCountException.php
deleted file mode 100644
index 9d90543..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsCountException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use Prophecy\Prophecy\MethodProphecy;
-
-class UnexpectedCallsCountException extends UnexpectedCallsException
-{
-    private $expectedCount;
-
-    public function __construct($message, MethodProphecy $methodProphecy, $count, array $calls)
-    {
-        parent::__construct($message, $methodProphecy, $calls);
-
-        $this->expectedCount = intval($count);
-    }
-
-    public function getExpectedCount()
-    {
-        return $this->expectedCount;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsException.php
deleted file mode 100644
index 7a99c2d..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prediction/UnexpectedCallsException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prediction;
-
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Exception\Prophecy\MethodProphecyException;
-
-class UnexpectedCallsException extends MethodProphecyException implements PredictionException
-{
-    private $calls = array();
-
-    public function __construct($message, MethodProphecy $methodProphecy, array $calls)
-    {
-        parent::__construct($message, $methodProphecy);
-
-        $this->calls = $calls;
-    }
-
-    public function getCalls()
-    {
-        return $this->calls;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/MethodProphecyException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/MethodProphecyException.php
deleted file mode 100644
index 1b03eaf..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/MethodProphecyException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prophecy;
-
-use Prophecy\Prophecy\MethodProphecy;
-
-class MethodProphecyException extends ObjectProphecyException
-{
-    private $methodProphecy;
-
-    public function __construct($message, MethodProphecy $methodProphecy)
-    {
-        parent::__construct($message, $methodProphecy->getObjectProphecy());
-
-        $this->methodProphecy = $methodProphecy;
-    }
-
-    /**
-     * @return MethodProphecy
-     */
-    public function getMethodProphecy()
-    {
-        return $this->methodProphecy;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ObjectProphecyException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ObjectProphecyException.php
deleted file mode 100644
index e345402..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ObjectProphecyException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prophecy;
-
-use Prophecy\Prophecy\ObjectProphecy;
-
-class ObjectProphecyException extends \RuntimeException implements ProphecyException
-{
-    private $objectProphecy;
-
-    public function __construct($message, ObjectProphecy $objectProphecy)
-    {
-        parent::__construct($message);
-
-        $this->objectProphecy = $objectProphecy;
-    }
-
-    /**
-     * @return ObjectProphecy
-     */
-    public function getObjectProphecy()
-    {
-        return $this->objectProphecy;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ProphecyException.php b/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ProphecyException.php
deleted file mode 100644
index 9157332..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Exception/Prophecy/ProphecyException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Exception\Prophecy;
-
-use Prophecy\Exception\Exception;
-
-interface ProphecyException extends Exception
-{
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallPrediction.php b/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallPrediction.php
deleted file mode 100644
index b478736..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallPrediction.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prediction;
-
-use Prophecy\Call\Call;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Argument\ArgumentsWildcard;
-use Prophecy\Argument\Token\AnyValuesToken;
-use Prophecy\Util\StringUtil;
-use Prophecy\Exception\Prediction\NoCallsException;
-
-/**
- * Call prediction.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallPrediction implements PredictionInterface
-{
-    private $util;
-
-    /**
-     * Initializes prediction.
-     *
-     * @param StringUtil $util
-     */
-    public function __construct(StringUtil $util = null)
-    {
-        $this->util = $util ?: new StringUtil;
-    }
-
-    /**
-     * Tests that there was at least one call.
-     *
-     * @param Call[]         $calls
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @throws \Prophecy\Exception\Prediction\NoCallsException
-     */
-    public function check(array $calls, ObjectProphecy $object, MethodProphecy $method)
-    {
-        if (count($calls)) {
-            return;
-        }
-
-        $methodCalls = $object->findProphecyMethodCalls(
-            $method->getMethodName(),
-            new ArgumentsWildcard(array(new AnyValuesToken))
-        );
-
-        if (count($methodCalls)) {
-            throw new NoCallsException(sprintf(
-                "No calls have been made that match:\n".
-                "  %s->%s(%s)\n".
-                "but expected at least one.\n".
-                "Recorded `%s(...)` calls:\n%s",
-
-                get_class($object->reveal()),
-                $method->getMethodName(),
-                $method->getArgumentsWildcard(),
-                $method->getMethodName(),
-                $this->util->stringifyCalls($methodCalls)
-            ), $method);
-        }
-
-        throw new NoCallsException(sprintf(
-            "No calls have been made that match:\n".
-            "  %s->%s(%s)\n".
-            "but expected at least one.",
-
-            get_class($object->reveal()),
-            $method->getMethodName(),
-            $method->getArgumentsWildcard()
-        ), $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallTimesPrediction.php b/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallTimesPrediction.php
deleted file mode 100644
index 31c6c57..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallTimesPrediction.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prediction;
-
-use Prophecy\Call\Call;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Argument\ArgumentsWildcard;
-use Prophecy\Argument\Token\AnyValuesToken;
-use Prophecy\Util\StringUtil;
-use Prophecy\Exception\Prediction\UnexpectedCallsCountException;
-
-/**
- * Prediction interface.
- * Predictions are logical test blocks, tied to `should...` keyword.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallTimesPrediction implements PredictionInterface
-{
-    private $times;
-    private $util;
-
-    /**
-     * Initializes prediction.
-     *
-     * @param int        $times
-     * @param StringUtil $util
-     */
-    public function __construct($times, StringUtil $util = null)
-    {
-        $this->times = intval($times);
-        $this->util  = $util ?: new StringUtil;
-    }
-
-    /**
-     * Tests that there was exact amount of calls made.
-     *
-     * @param Call[]         $calls
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @throws \Prophecy\Exception\Prediction\UnexpectedCallsCountException
-     */
-    public function check(array $calls, ObjectProphecy $object, MethodProphecy $method)
-    {
-        if ($this->times == count($calls)) {
-            return;
-        }
-
-        $methodCalls = $object->findProphecyMethodCalls(
-            $method->getMethodName(),
-            new ArgumentsWildcard(array(new AnyValuesToken))
-        );
-
-        if (count($calls)) {
-            $message = sprintf(
-                "Expected exactly %d calls that match:\n".
-                "  %s->%s(%s)\n".
-                "but %d were made:\n%s",
-
-                $this->times,
-                get_class($object->reveal()),
-                $method->getMethodName(),
-                $method->getArgumentsWildcard(),
-                count($calls),
-                $this->util->stringifyCalls($calls)
-            );
-        } elseif (count($methodCalls)) {
-            $message = sprintf(
-                "Expected exactly %d calls that match:\n".
-                "  %s->%s(%s)\n".
-                "but none were made.\n".
-                "Recorded `%s(...)` calls:\n%s",
-
-                $this->times,
-                get_class($object->reveal()),
-                $method->getMethodName(),
-                $method->getArgumentsWildcard(),
-                $method->getMethodName(),
-                $this->util->stringifyCalls($methodCalls)
-            );
-        } else {
-            $message = sprintf(
-                "Expected exactly %d calls that match:\n".
-                "  %s->%s(%s)\n".
-                "but none were made.",
-
-                $this->times,
-                get_class($object->reveal()),
-                $method->getMethodName(),
-                $method->getArgumentsWildcard()
-            );
-        }
-
-        throw new UnexpectedCallsCountException($message, $method, $this->times, $calls);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallbackPrediction.php b/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallbackPrediction.php
deleted file mode 100644
index 44bc782..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prediction/CallbackPrediction.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prediction;
-
-use Prophecy\Call\Call;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Exception\InvalidArgumentException;
-use Closure;
-
-/**
- * Callback prediction.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallbackPrediction implements PredictionInterface
-{
-    private $callback;
-
-    /**
-     * Initializes callback prediction.
-     *
-     * @param callable $callback Custom callback
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function __construct($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new InvalidArgumentException(sprintf(
-                'Callable expected as an argument to CallbackPrediction, but got %s.',
-                gettype($callback)
-            ));
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Executes preset callback.
-     *
-     * @param Call[]         $calls
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     */
-    public function check(array $calls, ObjectProphecy $object, MethodProphecy $method)
-    {
-        $callback = $this->callback;
-
-        if ($callback instanceof Closure && method_exists('Closure', 'bind')) {
-            $callback = Closure::bind($callback, $object);
-        }
-
-        call_user_func($callback, $calls, $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prediction/NoCallsPrediction.php b/vendor/phpspec/prophecy/src/Prophecy/Prediction/NoCallsPrediction.php
deleted file mode 100644
index 46ac5bf..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prediction/NoCallsPrediction.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prediction;
-
-use Prophecy\Call\Call;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Util\StringUtil;
-use Prophecy\Exception\Prediction\UnexpectedCallsException;
-
-/**
- * No calls prediction.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class NoCallsPrediction implements PredictionInterface
-{
-    private $util;
-
-    /**
-     * Initializes prediction.
-     *
-     * @param null|StringUtil $util
-     */
-    public function __construct(StringUtil $util = null)
-    {
-        $this->util = $util ?: new StringUtil;
-    }
-
-    /**
-     * Tests that there were no calls made.
-     *
-     * @param Call[]         $calls
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @throws \Prophecy\Exception\Prediction\UnexpectedCallsException
-     */
-    public function check(array $calls, ObjectProphecy $object, MethodProphecy $method)
-    {
-        if (!count($calls)) {
-            return;
-        }
-
-        $verb = count($calls) === 1 ? 'was' : 'were';
-
-        throw new UnexpectedCallsException(sprintf(
-            "No calls expected that match:\n".
-            "  %s->%s(%s)\n".
-            "but %d %s made:\n%s",
-            get_class($object->reveal()),
-            $method->getMethodName(),
-            $method->getArgumentsWildcard(),
-            count($calls),
-            $verb,
-            $this->util->stringifyCalls($calls)
-        ), $method, $calls);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prediction/PredictionInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Prediction/PredictionInterface.php
deleted file mode 100644
index f7fb06a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prediction/PredictionInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prediction;
-
-use Prophecy\Call\Call;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-
-/**
- * Prediction interface.
- * Predictions are logical test blocks, tied to `should...` keyword.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface PredictionInterface
-{
-    /**
-     * Tests that double fulfilled prediction.
-     *
-     * @param Call[]        $calls
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @throws object
-     * @return void
-     */
-    public function check(array $calls, ObjectProphecy $object, MethodProphecy $method);
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Promise/CallbackPromise.php b/vendor/phpspec/prophecy/src/Prophecy/Promise/CallbackPromise.php
deleted file mode 100644
index 5f406bf..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Promise/CallbackPromise.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Promise;
-
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Exception\InvalidArgumentException;
-use Closure;
-
-/**
- * Callback promise.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class CallbackPromise implements PromiseInterface
-{
-    private $callback;
-
-    /**
-     * Initializes callback promise.
-     *
-     * @param callable $callback Custom callback
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function __construct($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new InvalidArgumentException(sprintf(
-                'Callable expected as an argument to CallbackPromise, but got %s.',
-                gettype($callback)
-            ));
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Evaluates promise callback.
-     *
-     * @param array          $args
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @return mixed
-     */
-    public function execute(array $args, ObjectProphecy $object, MethodProphecy $method)
-    {
-        $callback = $this->callback;
-
-        if ($callback instanceof Closure && method_exists('Closure', 'bind')) {
-            $callback = Closure::bind($callback, $object);
-        }
-
-        return call_user_func($callback, $args, $object, $method);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Promise/PromiseInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Promise/PromiseInterface.php
deleted file mode 100644
index 382537b..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Promise/PromiseInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Promise;
-
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-
-/**
- * Promise interface.
- * Promises are logical blocks, tied to `will...` keyword.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface PromiseInterface
-{
-    /**
-     * Evaluates promise.
-     *
-     * @param array          $args
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @return mixed
-     */
-    public function execute(array $args, ObjectProphecy $object, MethodProphecy $method);
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnArgumentPromise.php b/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnArgumentPromise.php
deleted file mode 100644
index a06724b..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnArgumentPromise.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Promise;
-
-use Prophecy\Exception\InvalidArgumentException;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-
-/**
- * Return argument promise.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ReturnArgumentPromise implements PromiseInterface
-{
-    /**
-     * @var int
-     */
-    private $index;
-
-    /**
-     * Initializes callback promise.
-     *
-     * @param int $index The zero-indexed number of the argument to return
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function __construct($index = 0)
-    {
-        if (!is_int($index) || $index < 0) {
-            throw new InvalidArgumentException(
-                'Zero-based index expected as argument to ReturnArgumentPromise, but got %s.',
-                $index
-            );
-        }
-        $this->index = $index;
-    }
-
-    /**
-     * Returns nth argument if has one, null otherwise.
-     *
-     * @param array          $args
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @return null|mixed
-     */
-    public function execute(array $args, ObjectProphecy $object, MethodProphecy $method)
-    {
-        return count($args) > $this->index ? $args[$this->index] : null;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnPromise.php b/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnPromise.php
deleted file mode 100644
index c7d5ac5..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Promise/ReturnPromise.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Promise;
-
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-
-/**
- * Return promise.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ReturnPromise implements PromiseInterface
-{
-    private $returnValues = array();
-
-    /**
-     * Initializes promise.
-     *
-     * @param array $returnValues Array of values
-     */
-    public function __construct(array $returnValues)
-    {
-        $this->returnValues = $returnValues;
-    }
-
-    /**
-     * Returns saved values one by one until last one, then continuously returns last value.
-     *
-     * @param array          $args
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @return mixed
-     */
-    public function execute(array $args, ObjectProphecy $object, MethodProphecy $method)
-    {
-        $value = array_shift($this->returnValues);
-
-        if (!count($this->returnValues)) {
-            $this->returnValues[] = $value;
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Promise/ThrowPromise.php b/vendor/phpspec/prophecy/src/Prophecy/Promise/ThrowPromise.php
deleted file mode 100644
index 8007330..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Promise/ThrowPromise.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Promise;
-
-use Doctrine\Instantiator\Instantiator;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\MethodProphecy;
-use Prophecy\Exception\InvalidArgumentException;
-use ReflectionClass;
-
-/**
- * Throw promise.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ThrowPromise implements PromiseInterface
-{
-    private $exception;
-
-    /**
-     * @var \Doctrine\Instantiator\Instantiator
-     */
-    private $instantiator;
-
-    /**
-     * Initializes promise.
-     *
-     * @param string|\Exception $exception Exception class name or instance
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function __construct($exception)
-    {
-        if (is_string($exception)) {
-            if (!class_exists($exception)
-             && 'Exception' !== $exception
-             && !is_subclass_of($exception, 'Exception')) {
-                throw new InvalidArgumentException(sprintf(
-                    'Exception class or instance expected as argument to ThrowPromise, but got %s.',
-                    gettype($exception)
-                ));
-            }
-        } elseif (!$exception instanceof \Exception) {
-            throw new InvalidArgumentException(sprintf(
-                'Exception class or instance expected as argument to ThrowPromise, but got %s.',
-                gettype($exception)
-            ));
-        }
-
-        $this->exception = $exception;
-    }
-
-    /**
-     * Throws predefined exception.
-     *
-     * @param array          $args
-     * @param ObjectProphecy $object
-     * @param MethodProphecy $method
-     *
-     * @throws object
-     */
-    public function execute(array $args, ObjectProphecy $object, MethodProphecy $method)
-    {
-        if (is_string($this->exception)) {
-            $classname   = $this->exception;
-            $reflection  = new ReflectionClass($classname);
-            $constructor = $reflection->getConstructor();
-
-            if ($constructor->isPublic() && 0 == $constructor->getNumberOfRequiredParameters()) {
-                throw $reflection->newInstance();
-            }
-
-            if (!$this->instantiator) {
-                $this->instantiator = new Instantiator();
-            }
-
-            throw $this->instantiator->instantiate($classname);
-        }
-
-        throw $this->exception;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php
deleted file mode 100644
index 426df32..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-use Prophecy\Argument;
-use Prophecy\Prophet;
-use Prophecy\Promise;
-use Prophecy\Prediction;
-use Prophecy\Exception\Doubler\MethodNotFoundException;
-use Prophecy\Exception\InvalidArgumentException;
-use Prophecy\Exception\Prophecy\MethodProphecyException;
-
-/**
- * Method prophecy.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class MethodProphecy
-{
-    private $objectProphecy;
-    private $methodName;
-    private $argumentsWildcard;
-    private $promise;
-    private $prediction;
-    private $checkedPredictions = array();
-    private $bound = false;
-
-    /**
-     * Initializes method prophecy.
-     *
-     * @param ObjectProphecy                        $objectProphecy
-     * @param string                                $methodName
-     * @param null|Argument\ArgumentsWildcard|array $arguments
-     *
-     * @throws \Prophecy\Exception\Doubler\MethodNotFoundException If method not found
-     */
-    public function __construct(ObjectProphecy $objectProphecy, $methodName, $arguments = null)
-    {
-        $double = $objectProphecy->reveal();
-        if (!method_exists($double, $methodName)) {
-            throw new MethodNotFoundException(sprintf(
-                'Method `%s::%s()` is not defined.', get_class($double), $methodName
-            ), get_class($double), $methodName, $arguments);
-        }
-
-        $this->objectProphecy = $objectProphecy;
-        $this->methodName     = $methodName;
-
-        $reflectedMethod = new \ReflectionMethod($double, $methodName);
-        if ($reflectedMethod->isFinal()) {
-            throw new MethodProphecyException(sprintf(
-                "Can not add prophecy for a method `%s::%s()`\n".
-                "as it is a final method.",
-                get_class($double),
-                $methodName
-            ), $this);
-        }
-
-        if (null !== $arguments) {
-            $this->withArguments($arguments);
-        }
-
-        if (version_compare(PHP_VERSION, '7.0', '>=') && true === $reflectedMethod->hasReturnType()) {
-            $type = (string) $reflectedMethod->getReturnType();
-            $this->will(function () use ($type) {
-                switch ($type) {
-                    case 'string': return '';
-                    case 'float':  return 0.0;
-                    case 'int':    return 0;
-                    case 'bool':   return false;
-                    case 'array':  return array();
-
-                    case 'callable':
-                    case 'Closure':
-                        return function () {};
-
-                    case 'Traversable':
-                    case 'Generator':
-                        // Remove eval() when minimum version >=5.5
-                        $generator = eval('return function () { yield; };');
-                        return $generator();
-
-                    default:
-                        $prophet = new Prophet;
-                        return $prophet->prophesize($type)->reveal();
-                }
-            });
-        }
-    }
-
-    /**
-     * Sets argument wildcard.
-     *
-     * @param array|Argument\ArgumentsWildcard $arguments
-     *
-     * @return $this
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function withArguments($arguments)
-    {
-        if (is_array($arguments)) {
-            $arguments = new Argument\ArgumentsWildcard($arguments);
-        }
-
-        if (!$arguments instanceof Argument\ArgumentsWildcard) {
-            throw new InvalidArgumentException(sprintf(
-                "Either an array or an instance of ArgumentsWildcard expected as\n".
-                'a `MethodProphecy::withArguments()` argument, but got %s.',
-                gettype($arguments)
-            ));
-        }
-
-        $this->argumentsWildcard = $arguments;
-
-        return $this;
-    }
-
-    /**
-     * Sets custom promise to the prophecy.
-     *
-     * @param callable|Promise\PromiseInterface $promise
-     *
-     * @return $this
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function will($promise)
-    {
-        if (is_callable($promise)) {
-            $promise = new Promise\CallbackPromise($promise);
-        }
-
-        if (!$promise instanceof Promise\PromiseInterface) {
-            throw new InvalidArgumentException(sprintf(
-                'Expected callable or instance of PromiseInterface, but got %s.',
-                gettype($promise)
-            ));
-        }
-
-        $this->bindToObjectProphecy();
-        $this->promise = $promise;
-
-        return $this;
-    }
-
-    /**
-     * Sets return promise to the prophecy.
-     *
-     * @see Prophecy\Promise\ReturnPromise
-     *
-     * @return $this
-     */
-    public function willReturn()
-    {
-        return $this->will(new Promise\ReturnPromise(func_get_args()));
-    }
-
-    /**
-     * Sets return argument promise to the prophecy.
-     *
-     * @param int $index The zero-indexed number of the argument to return
-     *
-     * @see Prophecy\Promise\ReturnArgumentPromise
-     *
-     * @return $this
-     */
-    public function willReturnArgument($index = 0)
-    {
-        return $this->will(new Promise\ReturnArgumentPromise($index));
-    }
-
-    /**
-     * Sets throw promise to the prophecy.
-     *
-     * @see Prophecy\Promise\ThrowPromise
-     *
-     * @param string|\Exception $exception Exception class or instance
-     *
-     * @return $this
-     */
-    public function willThrow($exception)
-    {
-        return $this->will(new Promise\ThrowPromise($exception));
-    }
-
-    /**
-     * Sets custom prediction to the prophecy.
-     *
-     * @param callable|Prediction\PredictionInterface $prediction
-     *
-     * @return $this
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function should($prediction)
-    {
-        if (is_callable($prediction)) {
-            $prediction = new Prediction\CallbackPrediction($prediction);
-        }
-
-        if (!$prediction instanceof Prediction\PredictionInterface) {
-            throw new InvalidArgumentException(sprintf(
-                'Expected callable or instance of PredictionInterface, but got %s.',
-                gettype($prediction)
-            ));
-        }
-
-        $this->bindToObjectProphecy();
-        $this->prediction = $prediction;
-
-        return $this;
-    }
-
-    /**
-     * Sets call prediction to the prophecy.
-     *
-     * @see Prophecy\Prediction\CallPrediction
-     *
-     * @return $this
-     */
-    public function shouldBeCalled()
-    {
-        return $this->should(new Prediction\CallPrediction);
-    }
-
-    /**
-     * Sets no calls prediction to the prophecy.
-     *
-     * @see Prophecy\Prediction\NoCallsPrediction
-     *
-     * @return $this
-     */
-    public function shouldNotBeCalled()
-    {
-        return $this->should(new Prediction\NoCallsPrediction);
-    }
-
-    /**
-     * Sets call times prediction to the prophecy.
-     *
-     * @see Prophecy\Prediction\CallTimesPrediction
-     *
-     * @param $count
-     *
-     * @return $this
-     */
-    public function shouldBeCalledTimes($count)
-    {
-        return $this->should(new Prediction\CallTimesPrediction($count));
-    }
-
-    /**
-     * Checks provided prediction immediately.
-     *
-     * @param callable|Prediction\PredictionInterface $prediction
-     *
-     * @return $this
-     *
-     * @throws \Prophecy\Exception\InvalidArgumentException
-     */
-    public function shouldHave($prediction)
-    {
-        if (is_callable($prediction)) {
-            $prediction = new Prediction\CallbackPrediction($prediction);
-        }
-
-        if (!$prediction instanceof Prediction\PredictionInterface) {
-            throw new InvalidArgumentException(sprintf(
-                'Expected callable or instance of PredictionInterface, but got %s.',
-                gettype($prediction)
-            ));
-        }
-
-        if (null === $this->promise) {
-            $this->willReturn();
-        }
-
-        $calls = $this->getObjectProphecy()->findProphecyMethodCalls(
-            $this->getMethodName(),
-            $this->getArgumentsWildcard()
-        );
-
-        try {
-            $prediction->check($calls, $this->getObjectProphecy(), $this);
-            $this->checkedPredictions[] = $prediction;
-        } catch (\Exception $e) {
-            $this->checkedPredictions[] = $prediction;
-
-            throw $e;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Checks call prediction.
-     *
-     * @see Prophecy\Prediction\CallPrediction
-     *
-     * @return $this
-     */
-    public function shouldHaveBeenCalled()
-    {
-        return $this->shouldHave(new Prediction\CallPrediction);
-    }
-
-    /**
-     * Checks no calls prediction.
-     *
-     * @see Prophecy\Prediction\NoCallsPrediction
-     *
-     * @return $this
-     */
-    public function shouldNotHaveBeenCalled()
-    {
-        return $this->shouldHave(new Prediction\NoCallsPrediction);
-    }
-
-    /**
-     * Checks no calls prediction.
-     *
-     * @see Prophecy\Prediction\NoCallsPrediction
-     * @deprecated
-     *
-     * @return $this
-     */
-    public function shouldNotBeenCalled()
-    {
-        return $this->shouldNotHaveBeenCalled();
-    }
-
-    /**
-     * Checks call times prediction.
-     *
-     * @see Prophecy\Prediction\CallTimesPrediction
-     *
-     * @param int $count
-     *
-     * @return $this
-     */
-    public function shouldHaveBeenCalledTimes($count)
-    {
-        return $this->shouldHave(new Prediction\CallTimesPrediction($count));
-    }
-
-    /**
-     * Checks currently registered [with should(...)] prediction.
-     */
-    public function checkPrediction()
-    {
-        if (null === $this->prediction) {
-            return;
-        }
-
-        $this->shouldHave($this->prediction);
-    }
-
-    /**
-     * Returns currently registered promise.
-     *
-     * @return null|Promise\PromiseInterface
-     */
-    public function getPromise()
-    {
-        return $this->promise;
-    }
-
-    /**
-     * Returns currently registered prediction.
-     *
-     * @return null|Prediction\PredictionInterface
-     */
-    public function getPrediction()
-    {
-        return $this->prediction;
-    }
-
-    /**
-     * Returns predictions that were checked on this object.
-     *
-     * @return Prediction\PredictionInterface[]
-     */
-    public function getCheckedPredictions()
-    {
-        return $this->checkedPredictions;
-    }
-
-    /**
-     * Returns object prophecy this method prophecy is tied to.
-     *
-     * @return ObjectProphecy
-     */
-    public function getObjectProphecy()
-    {
-        return $this->objectProphecy;
-    }
-
-    /**
-     * Returns method name.
-     *
-     * @return string
-     */
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-
-    /**
-     * Returns arguments wildcard.
-     *
-     * @return Argument\ArgumentsWildcard
-     */
-    public function getArgumentsWildcard()
-    {
-        return $this->argumentsWildcard;
-    }
-
-    private function bindToObjectProphecy()
-    {
-        if ($this->bound) {
-            return;
-        }
-
-        $this->getObjectProphecy()->addMethodProphecy($this);
-        $this->bound = true;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ObjectProphecy.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ObjectProphecy.php
deleted file mode 100644
index 43dba46..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ObjectProphecy.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-use SebastianBergmann\Comparator\ComparisonFailure;
-use Prophecy\Comparator\Factory as ComparatorFactory;
-use Prophecy\Call\Call;
-use Prophecy\Doubler\LazyDouble;
-use Prophecy\Argument\ArgumentsWildcard;
-use Prophecy\Call\CallCenter;
-use Prophecy\Exception\Prophecy\ObjectProphecyException;
-use Prophecy\Exception\Prophecy\MethodProphecyException;
-use Prophecy\Exception\Prediction\AggregateException;
-use Prophecy\Exception\Prediction\PredictionException;
-
-/**
- * Object prophecy.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class ObjectProphecy implements ProphecyInterface
-{
-    private $lazyDouble;
-    private $callCenter;
-    private $revealer;
-    private $comparatorFactory;
-
-    /**
-     * @var MethodProphecy[][]
-     */
-    private $methodProphecies = array();
-
-    /**
-     * Initializes object prophecy.
-     *
-     * @param LazyDouble        $lazyDouble
-     * @param CallCenter        $callCenter
-     * @param RevealerInterface $revealer
-     * @param ComparatorFactory $comparatorFactory
-     */
-    public function __construct(
-        LazyDouble $lazyDouble,
-        CallCenter $callCenter = null,
-        RevealerInterface $revealer = null,
-        ComparatorFactory $comparatorFactory = null
-    ) {
-        $this->lazyDouble = $lazyDouble;
-        $this->callCenter = $callCenter ?: new CallCenter;
-        $this->revealer   = $revealer ?: new Revealer;
-
-        $this->comparatorFactory = $comparatorFactory ?: ComparatorFactory::getInstance();
-    }
-
-    /**
-     * Forces double to extend specific class.
-     *
-     * @param string $class
-     *
-     * @return $this
-     */
-    public function willExtend($class)
-    {
-        $this->lazyDouble->setParentClass($class);
-
-        return $this;
-    }
-
-    /**
-     * Forces double to implement specific interface.
-     *
-     * @param string $interface
-     *
-     * @return $this
-     */
-    public function willImplement($interface)
-    {
-        $this->lazyDouble->addInterface($interface);
-
-        return $this;
-    }
-
-    /**
-     * Sets constructor arguments.
-     *
-     * @param array $arguments
-     *
-     * @return $this
-     */
-    public function willBeConstructedWith(array $arguments = null)
-    {
-        $this->lazyDouble->setArguments($arguments);
-
-        return $this;
-    }
-
-    /**
-     * Reveals double.
-     *
-     * @return object
-     *
-     * @throws \Prophecy\Exception\Prophecy\ObjectProphecyException If double doesn't implement needed interface
-     */
-    public function reveal()
-    {
-        $double = $this->lazyDouble->getInstance();
-
-        if (null === $double || !$double instanceof ProphecySubjectInterface) {
-            throw new ObjectProphecyException(
-                "Generated double must implement ProphecySubjectInterface, but it does not.\n".
-                'It seems you have wrongly configured doubler without required ClassPatch.',
-                $this
-            );
-        }
-
-        $double->setProphecy($this);
-
-        return $double;
-    }
-
-    /**
-     * Adds method prophecy to object prophecy.
-     *
-     * @param MethodProphecy $methodProphecy
-     *
-     * @throws \Prophecy\Exception\Prophecy\MethodProphecyException If method prophecy doesn't
-     *                                                              have arguments wildcard
-     */
-    public function addMethodProphecy(MethodProphecy $methodProphecy)
-    {
-        $argumentsWildcard = $methodProphecy->getArgumentsWildcard();
-        if (null === $argumentsWildcard) {
-            throw new MethodProphecyException(sprintf(
-                "Can not add prophecy for a method `%s::%s()`\n".
-                "as you did not specify arguments wildcard for it.",
-                get_class($this->reveal()),
-                $methodProphecy->getMethodName()
-            ), $methodProphecy);
-        }
-
-        $methodName = $methodProphecy->getMethodName();
-
-        if (!isset($this->methodProphecies[$methodName])) {
-            $this->methodProphecies[$methodName] = array();
-        }
-
-        $this->methodProphecies[$methodName][] = $methodProphecy;
-    }
-
-    /**
-     * Returns either all or related to single method prophecies.
-     *
-     * @param null|string $methodName
-     *
-     * @return MethodProphecy[]
-     */
-    public function getMethodProphecies($methodName = null)
-    {
-        if (null === $methodName) {
-            return $this->methodProphecies;
-        }
-
-        if (!isset($this->methodProphecies[$methodName])) {
-            return array();
-        }
-
-        return $this->methodProphecies[$methodName];
-    }
-
-    /**
-     * Makes specific method call.
-     *
-     * @param string $methodName
-     * @param array  $arguments
-     *
-     * @return mixed
-     */
-    public function makeProphecyMethodCall($methodName, array $arguments)
-    {
-        $arguments = $this->revealer->reveal($arguments);
-        $return    = $this->callCenter->makeCall($this, $methodName, $arguments);
-
-        return $this->revealer->reveal($return);
-    }
-
-    /**
-     * Finds calls by method name & arguments wildcard.
-     *
-     * @param string            $methodName
-     * @param ArgumentsWildcard $wildcard
-     *
-     * @return Call[]
-     */
-    public function findProphecyMethodCalls($methodName, ArgumentsWildcard $wildcard)
-    {
-        return $this->callCenter->findCalls($methodName, $wildcard);
-    }
-
-    /**
-     * Checks that registered method predictions do not fail.
-     *
-     * @throws \Prophecy\Exception\Prediction\AggregateException If any of registered predictions fail
-     */
-    public function checkProphecyMethodsPredictions()
-    {
-        $exception = new AggregateException(sprintf("%s:\n", get_class($this->reveal())));
-        $exception->setObjectProphecy($this);
-
-        foreach ($this->methodProphecies as $prophecies) {
-            foreach ($prophecies as $prophecy) {
-                try {
-                    $prophecy->checkPrediction();
-                } catch (PredictionException $e) {
-                    $exception->append($e);
-                }
-            }
-        }
-
-        if (count($exception->getExceptions())) {
-            throw $exception;
-        }
-    }
-
-    /**
-     * Creates new method prophecy using specified method name and arguments.
-     *
-     * @param string $methodName
-     * @param array  $arguments
-     *
-     * @return MethodProphecy
-     */
-    public function __call($methodName, array $arguments)
-    {
-        $arguments = new ArgumentsWildcard($this->revealer->reveal($arguments));
-
-        foreach ($this->getMethodProphecies($methodName) as $prophecy) {
-            $argumentsWildcard = $prophecy->getArgumentsWildcard();
-            $comparator = $this->comparatorFactory->getComparatorFor(
-                $argumentsWildcard, $arguments
-            );
-
-            try {
-                $comparator->assertEquals($argumentsWildcard, $arguments);
-                return $prophecy;
-            } catch (ComparisonFailure $failure) {}
-        }
-
-        return new MethodProphecy($this, $methodName, $arguments);
-    }
-
-    /**
-     * Tries to get property value from double.
-     *
-     * @param string $name
-     */
-    public function __get($name)
-    {
-        return $this->reveal()->$name;
-    }
-
-    /**
-     * Tries to set property value to double.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __set($name, $value)
-    {
-        $this->reveal()->$name = $this->revealer->reveal($value);
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecyInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecyInterface.php
deleted file mode 100644
index 462f15a..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecyInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-/**
- * Core Prophecy interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface ProphecyInterface
-{
-    /**
-     * Reveals prophecy object (double) .
-     *
-     * @return object
-     */
-    public function reveal();
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecySubjectInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecySubjectInterface.php
deleted file mode 100644
index 2d83958..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/ProphecySubjectInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-/**
- * Controllable doubles interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface ProphecySubjectInterface
-{
-    /**
-     * Sets subject prophecy.
-     *
-     * @param ProphecyInterface $prophecy
-     */
-    public function setProphecy(ProphecyInterface $prophecy);
-
-    /**
-     * Returns subject prophecy.
-     *
-     * @return ProphecyInterface
-     */
-    public function getProphecy();
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/Revealer.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/Revealer.php
deleted file mode 100644
index 60ecdac..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/Revealer.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-/**
- * Basic prophecies revealer.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Revealer implements RevealerInterface
-{
-    /**
-     * Unwraps value(s).
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public function reveal($value)
-    {
-        if (is_array($value)) {
-            return array_map(array($this, __FUNCTION__), $value);
-        }
-
-        if (!is_object($value)) {
-            return $value;
-        }
-
-        if ($value instanceof ProphecyInterface) {
-            $value = $value->reveal();
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/RevealerInterface.php b/vendor/phpspec/prophecy/src/Prophecy/Prophecy/RevealerInterface.php
deleted file mode 100644
index ffc82bb..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophecy/RevealerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Prophecy;
-
-/**
- * Prophecies revealer interface.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface RevealerInterface
-{
-    /**
-     * Unwraps value(s).
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public function reveal($value);
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Prophet.php b/vendor/phpspec/prophecy/src/Prophecy/Prophet.php
deleted file mode 100644
index ac64923..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Prophet.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy;
-
-use Prophecy\Doubler\Doubler;
-use Prophecy\Doubler\LazyDouble;
-use Prophecy\Doubler\ClassPatch;
-use Prophecy\Prophecy\ObjectProphecy;
-use Prophecy\Prophecy\RevealerInterface;
-use Prophecy\Prophecy\Revealer;
-use Prophecy\Call\CallCenter;
-use Prophecy\Util\StringUtil;
-use Prophecy\Exception\Prediction\PredictionException;
-use Prophecy\Exception\Prediction\AggregateException;
-
-/**
- * Prophet creates prophecies.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class Prophet
-{
-    private $doubler;
-    private $revealer;
-    private $util;
-
-    /**
-     * @var ObjectProphecy[]
-     */
-    private $prophecies = array();
-
-    /**
-     * Initializes Prophet.
-     *
-     * @param null|Doubler           $doubler
-     * @param null|RevealerInterface $revealer
-     * @param null|StringUtil        $util
-     */
-    public function __construct(Doubler $doubler = null, RevealerInterface $revealer = null,
-                                StringUtil $util = null)
-    {
-        if (null === $doubler) {
-            $doubler = new Doubler;
-            $doubler->registerClassPatch(new ClassPatch\SplFileInfoPatch);
-            $doubler->registerClassPatch(new ClassPatch\TraversablePatch);
-            $doubler->registerClassPatch(new ClassPatch\DisableConstructorPatch);
-            $doubler->registerClassPatch(new ClassPatch\ProphecySubjectPatch);
-            $doubler->registerClassPatch(new ClassPatch\ReflectionClassNewInstancePatch);
-            $doubler->registerClassPatch(new ClassPatch\HhvmExceptionPatch());
-            $doubler->registerClassPatch(new ClassPatch\MagicCallPatch);
-            $doubler->registerClassPatch(new ClassPatch\KeywordPatch);
-        }
-
-        $this->doubler  = $doubler;
-        $this->revealer = $revealer ?: new Revealer;
-        $this->util     = $util ?: new StringUtil;
-    }
-
-    /**
-     * Creates new object prophecy.
-     *
-     * @param null|string $classOrInterface Class or interface name
-     *
-     * @return ObjectProphecy
-     */
-    public function prophesize($classOrInterface = null)
-    {
-        $this->prophecies[] = $prophecy = new ObjectProphecy(
-            new LazyDouble($this->doubler),
-            new CallCenter($this->util),
-            $this->revealer
-        );
-
-        if ($classOrInterface && class_exists($classOrInterface)) {
-            return $prophecy->willExtend($classOrInterface);
-        }
-
-        if ($classOrInterface && interface_exists($classOrInterface)) {
-            return $prophecy->willImplement($classOrInterface);
-        }
-
-        return $prophecy;
-    }
-
-    /**
-     * Returns all created object prophecies.
-     *
-     * @return ObjectProphecy[]
-     */
-    public function getProphecies()
-    {
-        return $this->prophecies;
-    }
-
-    /**
-     * Returns Doubler instance assigned to this Prophet.
-     *
-     * @return Doubler
-     */
-    public function getDoubler()
-    {
-        return $this->doubler;
-    }
-
-    /**
-     * Checks all predictions defined by prophecies of this Prophet.
-     *
-     * @throws Exception\Prediction\AggregateException If any prediction fails
-     */
-    public function checkPredictions()
-    {
-        $exception = new AggregateException("Some predictions failed:\n");
-        foreach ($this->prophecies as $prophecy) {
-            try {
-                $prophecy->checkProphecyMethodsPredictions();
-            } catch (PredictionException $e) {
-                $exception->append($e);
-            }
-        }
-
-        if (count($exception->getExceptions())) {
-            throw $exception;
-        }
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Util/ExportUtil.php b/vendor/phpspec/prophecy/src/Prophecy/Util/ExportUtil.php
deleted file mode 100644
index 54d3832..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Util/ExportUtil.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-namespace Prophecy\Util;
-
-use Prophecy\Prophecy\ProphecyInterface;
-use SplObjectStorage;
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exporting utility.
- *
- * This class is derived from the PHPUnit testing framework.
- *
- * @author  Sebastiaan Stok <s.stok@rollerscapes.net
- * @author  Sebastian Bergmann <sebastian@phpunit.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License>
- */
-class ExportUtil
-{
-    /**
-     * Exports a value into a string.
-     *
-     * The output of this method is similar to the output of print_r(), but
-     * improved in various aspects:
-     *
-     *  - NULL is rendered as "null" (instead of "")
-     *  - true is rendered as "true" (instead of "1")
-     *  - FALSE is rendered as "false" (instead of "")
-     *  - Strings are always quoted with single quotes
-     *  - Carriage returns and newlines are normalized to \n
-     *  - Recursion and repeated rendering is treated properly
-     *
-     * @param  mixed   $value       The value to export
-     * @param  integer $indentation The indentation level of the 2nd+ line
-     *
-     * @return string
-     */
-    public static function export($value, $indentation = 0)
-    {
-        return static::recursiveExport($value, $indentation);
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     *
-     * @return array
-     */
-    public static function toArray($object)
-    {
-        $array = array();
-
-        foreach ((array) $object as $key => $value) {
-            // properties are transformed to keys in the following way:
-
-            // private   $property => "\0Classname\0property"
-            // protected $property => "\0*\0property"
-            // public    $property => "property"
-
-            if (preg_match('/^\0.+\0(.+)$/', $key, $matches)) {
-                $key = $matches[1];
-            }
-
-            $array[$key] = $value;
-        }
-
-        // Some internal classes like SplObjectStorage don't work with the
-        // above (fast) mechanism nor with reflection
-        // Format the output similarly to print_r() in this case
-        if ($object instanceof SplObjectStorage) {
-            foreach ($object as $key => $value) {
-                $array[spl_object_hash($value)] = array(
-                    'obj' => $value,
-                    'inf' => $object->getInfo(),
-                );
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * Recursive implementation of export.
-     *
-     * @param  mixed   $value            The value to export
-     * @param  integer $indentation      The indentation level of the 2nd+ line
-     * @param  array   $processedObjects Contains all objects that were already
-     *                                   rendered
-     *
-     * @return string
-     */
-    protected static function recursiveExport($value, $indentation, &$processedObjects = array())
-    {
-        if ($value === null) {
-            return 'null';
-        }
-
-        if ($value === true) {
-            return 'true';
-        }
-
-        if ($value === false) {
-            return 'false';
-        }
-
-        if (is_string($value)) {
-            // Match for most non printable chars somewhat taking multibyte chars into account
-            if (preg_match('/[^\x09-\x0d\x20-\xff]/', $value)) {
-                return 'Binary String: 0x' . bin2hex($value);
-            }
-
-            return "'" . str_replace(array("\r\n", "\n\r", "\r"), array("\n", "\n", "\n"), $value) . "'";
-        }
-
-        $origValue = $value;
-
-        if (is_object($value)) {
-            if ($value instanceof ProphecyInterface) {
-                return sprintf('%s Object (*Prophecy*)', get_class($value));
-            } elseif (in_array($value, $processedObjects, true)) {
-                return sprintf('%s Object (*RECURSION*)', get_class($value));
-            }
-
-            $processedObjects[] = $value;
-
-            // Convert object to array
-            $value = self::toArray($value);
-        }
-
-        if (is_array($value)) {
-            $whitespace = str_repeat('    ', $indentation);
-
-            // There seems to be no other way to check arrays for recursion
-            // http://www.php.net/manual/en/language.types.array.php#73936
-            preg_match_all('/\n            \[(\w+)\] => Array\s+\*RECURSION\*/', print_r($value, true), $matches);
-            $recursiveKeys = array_unique($matches[1]);
-
-            // Convert to valid array keys
-            // Numeric integer strings are automatically converted to integers
-            // by PHP
-            foreach ($recursiveKeys as $key => $recursiveKey) {
-                if ((string) (integer) $recursiveKey === $recursiveKey) {
-                    $recursiveKeys[$key] = (integer) $recursiveKey;
-                }
-            }
-
-            $content = '';
-
-            foreach ($value as $key => $val) {
-                if (in_array($key, $recursiveKeys, true)) {
-                    $val = 'Array (*RECURSION*)';
-                } else {
-                    $val = self::recursiveExport($val, $indentation + 1, $processedObjects);
-                }
-
-                $content .= $whitespace . '    ' . self::export($key) . ' => ' . $val . "\n";
-            }
-
-            if (strlen($content) > 0) {
-                $content = "\n" . $content . $whitespace;
-            }
-
-            return sprintf(
-                "%s (%s)",
-                is_object($origValue) ? sprintf('%s:%s', get_class($origValue), spl_object_hash($origValue)) . ' Object' : 'Array', $content
-            );
-        }
-
-        if (is_double($value) && (double)(integer) $value === $value) {
-            return $value . '.0';
-        }
-
-        return (string) $value;
-    }
-}
diff --git a/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php b/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php
deleted file mode 100644
index bb90156..0000000
--- a/vendor/phpspec/prophecy/src/Prophecy/Util/StringUtil.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of the Prophecy.
- * (c) Konstantin Kudryashov <ever.zet@gmail.com>
- *     Marcello Duarte <marcello.duarte@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Prophecy\Util;
-
-use Prophecy\Call\Call;
-
-/**
- * String utility.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class StringUtil
-{
-    /**
-     * Stringifies any provided value.
-     *
-     * @param mixed   $value
-     * @param boolean $exportObject
-     *
-     * @return string
-     */
-    public function stringify($value, $exportObject = true)
-    {
-        if (is_array($value)) {
-            if (range(0, count($value) - 1) === array_keys($value)) {
-                return '['.implode(', ', array_map(array($this, __FUNCTION__), $value)).']';
-            }
-
-            $stringify = array($this, __FUNCTION__);
-
-            return '['.implode(', ', array_map(function ($item, $key) use ($stringify) {
-                return (is_integer($key) ? $key : '"'.$key.'"').
-                    ' => '.call_user_func($stringify, $item);
-            }, $value, array_keys($value))).']';
-        }
-        if (is_resource($value)) {
-            return get_resource_type($value).':'.$value;
-        }
-        if (is_object($value)) {
-            return $exportObject ? ExportUtil::export($value) : sprintf('%s:%s', get_class($value), spl_object_hash($value));
-        }
-        if (true === $value || false === $value) {
-            return $value ? 'true' : 'false';
-        }
-        if (is_string($value)) {
-            $str = sprintf('"%s"', str_replace("\n", '\\n', $value));
-
-            if (50 <= strlen($str)) {
-                return substr($str, 0, 50).'"...';
-            }
-
-            return $str;
-        }
-        if (null === $value) {
-            return 'null';
-        }
-
-        return (string) $value;
-    }
-
-    /**
-     * Stringifies provided array of calls.
-     *
-     * @param Call[] $calls Array of Call instances
-     *
-     * @return string
-     */
-    public function stringifyCalls(array $calls)
-    {
-        $self = $this;
-
-        return implode(PHP_EOL, array_map(function (Call $call) use ($self) {
-            return sprintf('  - %s(%s) @ %s',
-                $call->getMethodName(),
-                implode(', ', array_map(array($self, 'stringify'), $call->getArguments())),
-                str_replace(GETCWD().DIRECTORY_SEPARATOR, '', $call->getCallPlace())
-            );
-        }, $calls));
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/.gitattributes b/vendor/phpunit/php-code-coverage/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/php-code-coverage/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/php-code-coverage/.gitignore b/vendor/phpunit/php-code-coverage/.gitignore
deleted file mode 100644
index b386531..0000000
--- a/vendor/phpunit/php-code-coverage/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
-phpunit.xml
-/vendor
-/composer.lock
-/composer.phar
-/.idea
diff --git a/vendor/phpunit/php-code-coverage/.travis.yml b/vendor/phpunit/php-code-coverage/.travis.yml
deleted file mode 100644
index ad88a08..0000000
--- a/vendor/phpunit/php-code-coverage/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: php
-
-php:
-    - 5.3.3
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-
-before_script:
-    - COMPOSER_ROOT_VERSION=dev-master composer install --prefer-source
-
-script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - "irc.freenode.org#phpunit"
-    use_notice: true
diff --git a/vendor/phpunit/php-code-coverage/CONTRIBUTING.md b/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
deleted file mode 100644
index 40dbc25..0000000
--- a/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Pull Requests for bug fixes should be made against the current release branch (2.0).
-
-Pull Requests for new features should be made against master.
-
-For further notes please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md)
diff --git a/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md b/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md
deleted file mode 100644
index 353b6f6..0000000
--- a/vendor/phpunit/php-code-coverage/ChangeLog-2.2.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Changes in PHP_CodeCoverage 2.2
-
-All notable changes of the PHP_CodeCoverage 2.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [2.2.4] - 2015-10-06
-
-### Fixed
-
-* Fixed [#391](https://github.com/sebastianbergmann/php-code-coverage/pull/391): Missing `</abbr>` tag
-
-## [2.2.3] - 2015-09-14
-
-### Fixed
-
-* Fixed [#368](https://github.com/sebastianbergmann/php-code-coverage/pull/368): Blacklists and whitelists are not merged when merging data sets
-* Fixed [#370](https://github.com/sebastianbergmann/php-code-coverage/issues/370): Confusing statistics for source file that declares a class without methods
-* Fixed [#372](https://github.com/sebastianbergmann/php-code-coverage/pull/372): Nested classes and functions are not handled correctly
-* Fixed [#382](https://github.com/sebastianbergmann/php-code-coverage/issues/382): Crap4J report generates incorrect XML logfile
-
-## [2.2.2] - 2015-08-04
-
-### Added
-
-* Reintroduced the `PHP_CodeCoverage_Driver_HHVM` driver as an extension of `PHP_CodeCoverage_Driver_Xdebug` that does not use `xdebug_start_code_coverage()` with options not supported by HHVM
-
-### Changed
-
-* Bumped required version of `sebastian/environment` to 1.3.2 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
-
-## [2.2.1] - 2015-08-02
-
-### Changed
-
-* Bumped required version of `sebastian/environment` to 1.3.1 for [#365](https://github.com/sebastianbergmann/php-code-coverage/issues/365)
-
-## [2.2.0] - 2015-08-01
-
-### Added
-
-* Added a driver for PHPDBG (requires PHP 7)
-* Added `PHP_CodeCoverage::setDisableIgnoredLines()` to disable the ignoring of lines using annotations such as `@codeCoverageIgnore`
-
-### Changed
-
-* Annotating a method with `@deprecated` now has the same effect as annotating it with `@codeCoverageIgnore`
-
-### Removed
-
-* The dedicated driver for HHVM, `PHP_CodeCoverage_Driver_HHVM` has been removed
-
-[2.2.4]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.3...2.2.4
-[2.2.3]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.2...2.2.3
-[2.2.2]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.1...2.2.2
-[2.2.1]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.2.0...2.2.1
-[2.2.0]: https://github.com/sebastianbergmann/php-code-coverage/compare/2.1...2.2.0
-
diff --git a/vendor/phpunit/php-code-coverage/LICENSE b/vendor/phpunit/php-code-coverage/LICENSE
deleted file mode 100644
index fcfa37e..0000000
--- a/vendor/phpunit/php-code-coverage/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-PHP_CodeCoverage
-
-Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-code-coverage/README.md b/vendor/phpunit/php-code-coverage/README.md
deleted file mode 100644
index 4411d7f..0000000
--- a/vendor/phpunit/php-code-coverage/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-[![Latest Stable Version](https://poser.pugx.org/phpunit/php-code-coverage/v/stable.png)](https://packagist.org/packages/phpunit/php-code-coverage)
-[![Build Status](https://travis-ci.org/sebastianbergmann/php-code-coverage.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-code-coverage)
-
-# PHP_CodeCoverage
-
-**PHP_CodeCoverage** is a library that provides collection, processing, and rendering functionality for PHP code coverage information.
-
-## Requirements
-
-PHP 5.3.3 is required but using the latest version of PHP is highly recommended
-
-### PHP 5
-
-[Xdebug](http://xdebug.org/) is the only source of raw code coverage data supported for PHP 5. Version 2.1.3 of Xdebug is required but using the latest version is highly recommended.
-
-### PHP 7
-
-[phpdbg](http://phpdbg.com/docs) is currently the only source of raw code coverage data supported for PHP 7. Once Xdebug has been updated for PHP 7 it, too, will be supported.
-
-### HHVM
-
-A version of HHVM that implements the Xdebug API for code coverage (`xdebug_*_code_coverage()`) is required.
-
-## Installation
-
-To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 2.0:
-
-    {
-        "require": {
-            "phpunit/php-code-coverage": "^2"
-        }
-    }
-
-## Using the PHP_CodeCoverage API
-
-```php
-<?php
-$coverage = new PHP_CodeCoverage;
-$coverage->start('<name of test>');
-
-// ...
-
-$coverage->stop();
-
-$writer = new PHP_CodeCoverage_Report_Clover;
-$writer->process($coverage, '/tmp/clover.xml');
-
-$writer = new PHP_CodeCoverage_Report_HTML;
-$writer->process($coverage, '/tmp/code-coverage-report');
-```
diff --git a/vendor/phpunit/php-code-coverage/build.xml b/vendor/phpunit/php-code-coverage/build.xml
deleted file mode 100644
index c335d15..0000000
--- a/vendor/phpunit/php-code-coverage/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="PHP_CodeCoverage">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
-
-  <delete>
-   <fileset dir="${basedir}/build">
-    <include name="**/*.phar" />
-   </fileset>
-  </delete>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs">
-   <arg value="--standard=PSR2" />
-   <arg value="--extensions=php" />
-   <arg path="${basedir}/src" />
-   <arg path="${basedir}/tests" />
-  </exec>
- </target>
-</project>
diff --git a/vendor/phpunit/php-code-coverage/build/travis-ci.xml b/vendor/phpunit/php-code-coverage/build/travis-ci.xml
deleted file mode 100644
index 15e879fa..0000000
--- a/vendor/phpunit/php-code-coverage/build/travis-ci.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true">
-  <testsuites>
-    <testsuite name="PHP_CodeCoverage">
-      <directory suffix="Test.php">../tests/PHP</directory>
-    </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-text" target="php://stdout"/>
-  </logging>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/phpunit/php-code-coverage/composer.json b/vendor/phpunit/php-code-coverage/composer.json
deleted file mode 100644
index 55f9fd0..0000000
--- a/vendor/phpunit/php-code-coverage/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name": "phpunit/php-code-coverage",
-    "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-    "type": "library",
-    "keywords": [
-        "coverage",
-        "testing",
-        "xunit"
-    ],
-    "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sb@sebastian-bergmann.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "require": {
-        "php": ">=5.3.3",
-        "phpunit/php-file-iterator": "~1.3",
-        "phpunit/php-token-stream": "~1.3",
-        "phpunit/php-text-template": "~1.2",
-        "sebastian/environment": "^1.3.2",
-        "sebastian/version": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4",
-        "ext-xdebug": ">=2.1.4"
-    },
-    "suggest": {
-        "ext-dom": "*",
-        "ext-xdebug": ">=2.2.1",
-        "ext-xmlwriter": "*"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.2.x-dev"
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/phpunit.xml.dist b/vendor/phpunit/php-code-coverage/phpunit.xml.dist
deleted file mode 100644
index f5fa606..0000000
--- a/vendor/phpunit/php-code-coverage/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php">
-  <testsuites>
-    <testsuite name="PHP_CodeCoverage">
-      <directory suffix="Test.php">tests/PHP</directory>
-    </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-html" target="build/coverage"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-  </logging>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/phpunit/php-code-coverage/scripts/auto_append.php b/vendor/phpunit/php-code-coverage/scripts/auto_append.php
deleted file mode 100644
index 6cd768d..0000000
--- a/vendor/phpunit/php-code-coverage/scripts/auto_append.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$coverage->stop();
-
-$writer = new PHP_CodeCoverage_Report_HTML;
-$writer->process($coverage, '/tmp/coverage');
diff --git a/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php b/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php
deleted file mode 100644
index 7a8887a..0000000
--- a/vendor/phpunit/php-code-coverage/scripts/auto_prepend.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-require_once 'PHP/CodeCoverage/Autoload.php';
-
-$coverage = new PHP_CodeCoverage;
-$filter   = $coverage->filter();
-
-$filter->addFileToBlacklist(__FILE__);
-$filter->addFileToBlacklist(dirname(__FILE__) . '/auto_append.php');
-
-$coverage->start($_SERVER['SCRIPT_FILENAME']);
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
deleted file mode 100644
index 88326f0..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
+++ /dev/null
@@ -1,920 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Runtime;
-
-/**
- * Provides collection functionality for PHP code coverage information.
- *
- * @since Class available since Release 1.0.0
- */
-class PHP_CodeCoverage
-{
-    /**
-     * @var PHP_CodeCoverage_Driver
-     */
-    private $driver;
-
-    /**
-     * @var PHP_CodeCoverage_Filter
-     */
-    private $filter;
-
-    /**
-     * @var bool
-     */
-    private $cacheTokens = false;
-
-    /**
-     * @var bool
-     */
-    private $checkForUnintentionallyCoveredCode = false;
-
-    /**
-     * @var bool
-     */
-    private $forceCoversAnnotation = false;
-
-    /**
-     * @var bool
-     */
-    private $mapTestClassNameToCoveredClassName = false;
-
-    /**
-     * @var bool
-     */
-    private $addUncoveredFilesFromWhitelist = true;
-
-    /**
-     * @var bool
-     */
-    private $processUncoveredFilesFromWhitelist = false;
-
-    /**
-     * @var mixed
-     */
-    private $currentId;
-
-    /**
-     * Code coverage data.
-     *
-     * @var array
-     */
-    private $data = array();
-
-    /**
-     * @var array
-     */
-    private $ignoredLines = array();
-
-    /**
-     * @var bool
-     */
-    private $disableIgnoredLines = false;
-
-    /**
-     * Test data.
-     *
-     * @var array
-     */
-    private $tests = array();
-
-    /**
-     * Constructor.
-     *
-     * @param  PHP_CodeCoverage_Driver    $driver
-     * @param  PHP_CodeCoverage_Filter    $filter
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function __construct(PHP_CodeCoverage_Driver $driver = null, PHP_CodeCoverage_Filter $filter = null)
-    {
-        if ($driver === null) {
-            $driver = $this->selectDriver();
-        }
-
-        if ($filter === null) {
-            $filter = new PHP_CodeCoverage_Filter;
-        }
-
-        $this->driver = $driver;
-        $this->filter = $filter;
-    }
-
-    /**
-     * Returns the PHP_CodeCoverage_Report_Node_* object graph
-     * for this PHP_CodeCoverage object.
-     *
-     * @return PHP_CodeCoverage_Report_Node_Directory
-     * @since  Method available since Release 1.1.0
-     */
-    public function getReport()
-    {
-        $factory = new PHP_CodeCoverage_Report_Factory;
-
-        return $factory->create($this);
-    }
-
-    /**
-     * Clears collected code coverage data.
-     */
-    public function clear()
-    {
-        $this->currentId = null;
-        $this->data      = array();
-        $this->tests     = array();
-    }
-
-    /**
-     * Returns the PHP_CodeCoverage_Filter used.
-     *
-     * @return PHP_CodeCoverage_Filter
-     */
-    public function filter()
-    {
-        return $this->filter;
-    }
-
-    /**
-     * Returns the collected code coverage data.
-     * Set $raw = true to bypass all filters.
-     *
-     * @param  bool  $raw
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getData($raw = false)
-    {
-        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
-            $this->addUncoveredFilesFromWhitelist();
-        }
-
-        // We need to apply the blacklist filter a second time
-        // when no whitelist is used.
-        if (!$raw && !$this->filter->hasWhitelist()) {
-            $this->applyListsFilter($this->data);
-        }
-
-        return $this->data;
-    }
-
-    /**
-     * Sets the coverage data.
-     *
-     * @param array $data
-     * @since Method available since Release 2.0.0
-     */
-    public function setData(array $data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Returns the test data.
-     *
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getTests()
-    {
-        return $this->tests;
-    }
-
-    /**
-     * Sets the test data.
-     *
-     * @param array $tests
-     * @since Method available since Release 2.0.0
-     */
-    public function setTests(array $tests)
-    {
-        $this->tests = $tests;
-    }
-
-    /**
-     * Start collection of code coverage information.
-     *
-     * @param  mixed                      $id
-     * @param  bool                       $clear
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function start($id, $clear = false)
-    {
-        if (!is_bool($clear)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        if ($clear) {
-            $this->clear();
-        }
-
-        $this->currentId = $id;
-
-        $this->driver->start();
-    }
-
-    /**
-     * Stop collection of code coverage information.
-     *
-     * @param  bool                       $append
-     * @param  mixed                      $linesToBeCovered
-     * @param  array                      $linesToBeUsed
-     * @return array
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function stop($append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
-    {
-        if (!is_bool($append)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        if (!is_array($linesToBeCovered) && $linesToBeCovered !== false) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or false'
-            );
-        }
-
-        $data = $this->driver->stop();
-        $this->append($data, null, $append, $linesToBeCovered, $linesToBeUsed);
-
-        $this->currentId = null;
-
-        return $data;
-    }
-
-    /**
-     * Appends code coverage data.
-     *
-     * @param  array                      $data
-     * @param  mixed                      $id
-     * @param  bool                       $append
-     * @param  mixed                      $linesToBeCovered
-     * @param  array                      $linesToBeUsed
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function append(array $data, $id = null, $append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
-    {
-        if ($id === null) {
-            $id = $this->currentId;
-        }
-
-        if ($id === null) {
-            throw new PHP_CodeCoverage_Exception;
-        }
-
-        $this->applyListsFilter($data);
-        $this->applyIgnoredLinesFilter($data);
-        $this->initializeFilesThatAreSeenTheFirstTime($data);
-
-        if (!$append) {
-            return;
-        }
-
-        if ($id != 'UNCOVERED_FILES_FROM_WHITELIST') {
-            $this->applyCoversAnnotationFilter(
-                $data,
-                $linesToBeCovered,
-                $linesToBeUsed
-            );
-        }
-
-        if (empty($data)) {
-            return;
-        }
-
-        $size   = 'unknown';
-        $status = null;
-
-        if ($id instanceof PHPUnit_Framework_TestCase) {
-            $_size = $id->getSize();
-
-            if ($_size == PHPUnit_Util_Test::SMALL) {
-                $size = 'small';
-            } elseif ($_size == PHPUnit_Util_Test::MEDIUM) {
-                $size = 'medium';
-            } elseif ($_size == PHPUnit_Util_Test::LARGE) {
-                $size = 'large';
-            }
-
-            $status = $id->getStatus();
-            $id     = get_class($id) . '::' . $id->getName();
-        } elseif ($id instanceof PHPUnit_Extensions_PhptTestCase) {
-            $size = 'large';
-            $id   = $id->getName();
-        }
-
-        $this->tests[$id] = array('size' => $size, 'status' => $status);
-
-        foreach ($data as $file => $lines) {
-            if (!$this->filter->isFile($file)) {
-                continue;
-            }
-
-            foreach ($lines as $k => $v) {
-                if ($v == PHP_CodeCoverage_Driver::LINE_EXECUTED) {
-                    if (empty($this->data[$file][$k]) || !in_array($id, $this->data[$file][$k])) {
-                        $this->data[$file][$k][] = $id;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Merges the data from another instance of PHP_CodeCoverage.
-     *
-     * @param PHP_CodeCoverage $that
-     */
-    public function merge(PHP_CodeCoverage $that)
-    {
-        $this->filter->setBlacklistedFiles(
-            array_merge($this->filter->getBlacklistedFiles(), $that->filter()->getBlacklistedFiles())
-        );
-
-        $this->filter->setWhitelistedFiles(
-            array_merge($this->filter->getWhitelistedFiles(), $that->filter()->getWhitelistedFiles())
-        );
-
-        foreach ($that->data as $file => $lines) {
-            if (!isset($this->data[$file])) {
-                if (!$this->filter->isFiltered($file)) {
-                    $this->data[$file] = $lines;
-                }
-
-                continue;
-            }
-
-            foreach ($lines as $line => $data) {
-                if ($data !== null) {
-                    if (!isset($this->data[$file][$line])) {
-                        $this->data[$file][$line] = $data;
-                    } else {
-                        $this->data[$file][$line] = array_unique(
-                            array_merge($this->data[$file][$line], $data)
-                        );
-                    }
-                }
-            }
-        }
-
-        $this->tests = array_merge($this->tests, $that->getTests());
-
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     * @since  Method available since Release 1.1.0
-     */
-    public function setCacheTokens($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->cacheTokens = $flag;
-    }
-
-    /**
-     * @since Method available since Release 1.1.0
-     */
-    public function getCacheTokens()
-    {
-        return $this->cacheTokens;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     * @since  Method available since Release 2.0.0
-     */
-    public function setCheckForUnintentionallyCoveredCode($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->checkForUnintentionallyCoveredCode = $flag;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setForceCoversAnnotation($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->forceCoversAnnotation = $flag;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setMapTestClassNameToCoveredClassName($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->mapTestClassNameToCoveredClassName = $flag;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setAddUncoveredFilesFromWhitelist($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->addUncoveredFilesFromWhitelist = $flag;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setProcessUncoveredFilesFromWhitelist($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->processUncoveredFilesFromWhitelist = $flag;
-    }
-
-    /**
-     * @param  bool                       $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setDisableIgnoredLines($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        $this->disableIgnoredLines = $flag;
-    }
-
-    /**
-     * Applies the @covers annotation filtering.
-     *
-     * @param  array                                                 $data
-     * @param  mixed                                                 $linesToBeCovered
-     * @param  array                                                 $linesToBeUsed
-     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
-     */
-    private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, array $linesToBeUsed)
-    {
-        if ($linesToBeCovered === false ||
-            ($this->forceCoversAnnotation && empty($linesToBeCovered))) {
-            $data = array();
-
-            return;
-        }
-
-        if (empty($linesToBeCovered)) {
-            return;
-        }
-
-        if ($this->checkForUnintentionallyCoveredCode) {
-            $this->performUnintentionallyCoveredCodeCheck(
-                $data,
-                $linesToBeCovered,
-                $linesToBeUsed
-            );
-        }
-
-        $data = array_intersect_key($data, $linesToBeCovered);
-
-        foreach (array_keys($data) as $filename) {
-            $_linesToBeCovered = array_flip($linesToBeCovered[$filename]);
-
-            $data[$filename] = array_intersect_key(
-                $data[$filename],
-                $_linesToBeCovered
-            );
-        }
-    }
-
-    /**
-     * Applies the blacklist/whitelist filtering.
-     *
-     * @param array $data
-     */
-    private function applyListsFilter(array &$data)
-    {
-        foreach (array_keys($data) as $filename) {
-            if ($this->filter->isFiltered($filename)) {
-                unset($data[$filename]);
-            }
-        }
-    }
-
-    /**
-     * Applies the "ignored lines" filtering.
-     *
-     * @param array $data
-     */
-    private function applyIgnoredLinesFilter(array &$data)
-    {
-        foreach (array_keys($data) as $filename) {
-            if (!$this->filter->isFile($filename)) {
-                continue;
-            }
-
-            foreach ($this->getLinesToBeIgnored($filename) as $line) {
-                unset($data[$filename][$line]);
-            }
-        }
-    }
-
-    /**
-     * @param array $data
-     * @since Method available since Release 1.1.0
-     */
-    private function initializeFilesThatAreSeenTheFirstTime(array $data)
-    {
-        foreach ($data as $file => $lines) {
-            if ($this->filter->isFile($file) && !isset($this->data[$file])) {
-                $this->data[$file] = array();
-
-                foreach ($lines as $k => $v) {
-                    $this->data[$file][$k] = $v == -2 ? null : array();
-                }
-            }
-        }
-    }
-
-    /**
-     * Processes whitelisted files that are not covered.
-     */
-    private function addUncoveredFilesFromWhitelist()
-    {
-        $data           = array();
-        $uncoveredFiles = array_diff(
-            $this->filter->getWhitelist(),
-            array_keys($this->data)
-        );
-
-        foreach ($uncoveredFiles as $uncoveredFile) {
-            if (!file_exists($uncoveredFile)) {
-                continue;
-            }
-
-            if ($this->processUncoveredFilesFromWhitelist) {
-                $this->processUncoveredFileFromWhitelist(
-                    $uncoveredFile,
-                    $data,
-                    $uncoveredFiles
-                );
-            } else {
-                $data[$uncoveredFile] = array();
-
-                $lines = count(file($uncoveredFile));
-
-                for ($i = 1; $i <= $lines; $i++) {
-                    $data[$uncoveredFile][$i] = PHP_CodeCoverage_Driver::LINE_NOT_EXECUTED;
-                }
-            }
-        }
-
-        $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
-    }
-
-    /**
-     * @param string $uncoveredFile
-     * @param array  $data
-     * @param array  $uncoveredFiles
-     */
-    private function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
-    {
-        $this->driver->start();
-        include_once $uncoveredFile;
-        $coverage = $this->driver->stop();
-
-        foreach ($coverage as $file => $fileCoverage) {
-            if (!isset($data[$file]) &&
-                in_array($file, $uncoveredFiles)) {
-                foreach (array_keys($fileCoverage) as $key) {
-                    if ($fileCoverage[$key] == PHP_CodeCoverage_Driver::LINE_EXECUTED) {
-                        $fileCoverage[$key] = PHP_CodeCoverage_Driver::LINE_NOT_EXECUTED;
-                    }
-                }
-
-                $data[$file] = $fileCoverage;
-            }
-        }
-    }
-
-    /**
-     * Returns the lines of a source file that should be ignored.
-     *
-     * @param  string                     $filename
-     * @return array
-     * @throws PHP_CodeCoverage_Exception
-     * @since  Method available since Release 2.0.0
-     */
-    private function getLinesToBeIgnored($filename)
-    {
-        if (!is_string($filename)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'string'
-            );
-        }
-
-        if (!isset($this->ignoredLines[$filename])) {
-            $this->ignoredLines[$filename] = array();
-
-            if ($this->disableIgnoredLines) {
-                return $this->ignoredLines[$filename];
-            }
-
-            $ignore   = false;
-            $stop     = false;
-            $lines    = file($filename);
-            $numLines = count($lines);
-
-            foreach ($lines as $index => $line) {
-                if (!trim($line)) {
-                    $this->ignoredLines[$filename][] = $index + 1;
-                }
-            }
-
-            if ($this->cacheTokens) {
-                $tokens = PHP_Token_Stream_CachingFactory::get($filename);
-            } else {
-                $tokens = new PHP_Token_Stream($filename);
-            }
-
-            $classes = array_merge($tokens->getClasses(), $tokens->getTraits());
-            $tokens  = $tokens->tokens();
-
-            foreach ($tokens as $token) {
-                switch (get_class($token)) {
-                    case 'PHP_Token_COMMENT':
-                    case 'PHP_Token_DOC_COMMENT':
-                        $_token = trim($token);
-                        $_line  = trim($lines[$token->getLine() - 1]);
-
-                        if ($_token == '// @codeCoverageIgnore' ||
-                            $_token == '//@codeCoverageIgnore') {
-                            $ignore = true;
-                            $stop   = true;
-                        } elseif ($_token == '// @codeCoverageIgnoreStart' ||
-                            $_token == '//@codeCoverageIgnoreStart') {
-                            $ignore = true;
-                        } elseif ($_token == '// @codeCoverageIgnoreEnd' ||
-                            $_token == '//@codeCoverageIgnoreEnd') {
-                            $stop = true;
-                        }
-
-                        if (!$ignore) {
-                            $start = $token->getLine();
-                            $end   = $start + substr_count($token, "\n");
-
-                            // Do not ignore the first line when there is a token
-                            // before the comment
-                            if (0 !== strpos($_token, $_line)) {
-                                $start++;
-                            }
-
-                            for ($i = $start; $i < $end; $i++) {
-                                $this->ignoredLines[$filename][] = $i;
-                            }
-
-                            // A DOC_COMMENT token or a COMMENT token starting with "/*"
-                            // does not contain the final \n character in its text
-                            if (isset($lines[$i-1]) && 0 === strpos($_token, '/*') && '*/' === substr(trim($lines[$i-1]), -2)) {
-                                $this->ignoredLines[$filename][] = $i;
-                            }
-                        }
-                        break;
-
-                    case 'PHP_Token_INTERFACE':
-                    case 'PHP_Token_TRAIT':
-                    case 'PHP_Token_CLASS':
-                    case 'PHP_Token_FUNCTION':
-                        $docblock = $token->getDocblock();
-
-                        $this->ignoredLines[$filename][] = $token->getLine();
-
-                        if (strpos($docblock, '@codeCoverageIgnore') || strpos($docblock, '@deprecated')) {
-                            $endLine = $token->getEndLine();
-
-                            for ($i = $token->getLine(); $i <= $endLine; $i++) {
-                                $this->ignoredLines[$filename][] = $i;
-                            }
-                        } elseif ($token instanceof PHP_Token_INTERFACE ||
-                            $token instanceof PHP_Token_TRAIT ||
-                            $token instanceof PHP_Token_CLASS) {
-                            if (empty($classes[$token->getName()]['methods'])) {
-                                for ($i = $token->getLine();
-                                     $i <= $token->getEndLine();
-                                     $i++) {
-                                    $this->ignoredLines[$filename][] = $i;
-                                }
-                            } else {
-                                $firstMethod = array_shift(
-                                    $classes[$token->getName()]['methods']
-                                );
-
-                                do {
-                                    $lastMethod = array_pop(
-                                        $classes[$token->getName()]['methods']
-                                    );
-                                } while ($lastMethod !== null &&
-                                    substr($lastMethod['signature'], 0, 18) == 'anonymous function');
-
-                                if ($lastMethod === null) {
-                                    $lastMethod = $firstMethod;
-                                }
-
-                                for ($i = $token->getLine();
-                                     $i < $firstMethod['startLine'];
-                                     $i++) {
-                                    $this->ignoredLines[$filename][] = $i;
-                                }
-
-                                for ($i = $token->getEndLine();
-                                     $i > $lastMethod['endLine'];
-                                     $i--) {
-                                    $this->ignoredLines[$filename][] = $i;
-                                }
-                            }
-                        }
-                        break;
-
-                    case 'PHP_Token_NAMESPACE':
-                        $this->ignoredLines[$filename][] = $token->getEndLine();
-
-                    // Intentional fallthrough
-                    case 'PHP_Token_OPEN_TAG':
-                    case 'PHP_Token_CLOSE_TAG':
-                    case 'PHP_Token_USE':
-                        $this->ignoredLines[$filename][] = $token->getLine();
-                        break;
-                }
-
-                if ($ignore) {
-                    $this->ignoredLines[$filename][] = $token->getLine();
-
-                    if ($stop) {
-                        $ignore = false;
-                        $stop   = false;
-                    }
-                }
-            }
-
-            $this->ignoredLines[$filename][] = $numLines + 1;
-
-            $this->ignoredLines[$filename] = array_unique(
-                $this->ignoredLines[$filename]
-            );
-
-            sort($this->ignoredLines[$filename]);
-        }
-
-        return $this->ignoredLines[$filename];
-    }
-
-    /**
-     * @param  array                                                 $data
-     * @param  array                                                 $linesToBeCovered
-     * @param  array                                                 $linesToBeUsed
-     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
-     * @since Method available since Release 2.0.0
-     */
-    private function performUnintentionallyCoveredCodeCheck(array &$data, array $linesToBeCovered, array $linesToBeUsed)
-    {
-        $allowedLines = $this->getAllowedLines(
-            $linesToBeCovered,
-            $linesToBeUsed
-        );
-
-        $message = '';
-
-        foreach ($data as $file => $_data) {
-            foreach ($_data as $line => $flag) {
-                if ($flag == 1 &&
-                    (!isset($allowedLines[$file]) ||
-                        !isset($allowedLines[$file][$line]))) {
-                    $message .= sprintf(
-                        '- %s:%d' . PHP_EOL,
-                        $file,
-                        $line
-                    );
-                }
-            }
-        }
-
-        if (!empty($message)) {
-            throw new PHP_CodeCoverage_Exception_UnintentionallyCoveredCode(
-                $message
-            );
-        }
-    }
-
-    /**
-     * @param  array $linesToBeCovered
-     * @param  array $linesToBeUsed
-     * @return array
-     * @since Method available since Release 2.0.0
-     */
-    private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
-    {
-        $allowedLines = array();
-
-        foreach (array_keys($linesToBeCovered) as $file) {
-            if (!isset($allowedLines[$file])) {
-                $allowedLines[$file] = array();
-            }
-
-            $allowedLines[$file] = array_merge(
-                $allowedLines[$file],
-                $linesToBeCovered[$file]
-            );
-        }
-
-        foreach (array_keys($linesToBeUsed) as $file) {
-            if (!isset($allowedLines[$file])) {
-                $allowedLines[$file] = array();
-            }
-
-            $allowedLines[$file] = array_merge(
-                $allowedLines[$file],
-                $linesToBeUsed[$file]
-            );
-        }
-
-        foreach (array_keys($allowedLines) as $file) {
-            $allowedLines[$file] = array_flip(
-                array_unique($allowedLines[$file])
-            );
-        }
-
-        return $allowedLines;
-    }
-
-    /**
-     * @return PHP_CodeCoverage_Driver
-     * @throws PHP_CodeCoverage_Exception
-     */
-    private function selectDriver()
-    {
-        $runtime = new Runtime;
-
-        if (!$runtime->canCollectCodeCoverage()) {
-            throw new PHP_CodeCoverage_Exception('No code coverage driver available');
-        }
-
-        if ($runtime->isHHVM()) {
-            return new PHP_CodeCoverage_Driver_HHVM;
-        } elseif ($runtime->isPHPDBG()) {
-            return new PHP_CodeCoverage_Driver_PHPDBG;
-        } else {
-            return new PHP_CodeCoverage_Driver_Xdebug;
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
deleted file mode 100644
index 8635ace..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for code coverage drivers.
- *
- * @since Class available since Release 1.0.0
- */
-interface PHP_CodeCoverage_Driver
-{
-    /**
-     * @var int
-     * @see http://xdebug.org/docs/code_coverage
-     */
-    const LINE_EXECUTED = 1;
-
-    /**
-     * @var int
-     * @see http://xdebug.org/docs/code_coverage
-     */
-    const LINE_NOT_EXECUTED = -1;
-
-    /**
-     * @var int
-     * @see http://xdebug.org/docs/code_coverage
-     */
-    const LINE_NOT_EXECUTABLE = -2;
-
-    /**
-     * Start collection of code coverage information.
-     */
-    public function start();
-
-    /**
-     * Stop collection of code coverage information.
-     *
-     * @return array
-     */
-    public function stop();
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
deleted file mode 100644
index a9d8f0c..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Driver for HHVM's code coverage functionality.
- *
- * @since Class available since Release 2.2.2
- * @codeCoverageIgnore
- */
-class PHP_CodeCoverage_Driver_HHVM extends PHP_CodeCoverage_Driver_Xdebug
-{
-    /**
-     * Start collection of code coverage information.
-     */
-    public function start()
-    {
-        xdebug_start_code_coverage();
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php
deleted file mode 100644
index f3eb621..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Driver for PHPDBG's code coverage functionality.
- *
- * @since Class available since Release 2.2.0
- * @codeCoverageIgnore
- */
-class PHP_CodeCoverage_Driver_PHPDBG implements PHP_CodeCoverage_Driver
-{
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        if (PHP_SAPI !== 'phpdbg') {
-            throw new PHP_CodeCoverage_Exception(
-                'This driver requires the PHPDBG SAPI'
-            );
-        }
-
-        if (!function_exists('phpdbg_start_oplog')) {
-            throw new PHP_CodeCoverage_Exception(
-                'This build of PHPDBG does not support code coverage'
-            );
-        }
-    }
-
-    /**
-     * Start collection of code coverage information.
-     */
-    public function start()
-    {
-        phpdbg_start_oplog();
-    }
-
-    /**
-     * Stop collection of code coverage information.
-     *
-     * @return array
-     */
-    public function stop()
-    {
-        static $fetchedLines = array();
-
-        $dbgData = phpdbg_end_oplog();
-
-        if ($fetchedLines == array()) {
-            $sourceLines = phpdbg_get_executable();
-        } else {
-            $newFiles = array_diff(
-                get_included_files(),
-                array_keys($fetchedLines)
-            );
-
-            if ($newFiles) {
-                $sourceLines = phpdbg_get_executable(
-                    array('files' => $newFiles)
-                );
-            } else {
-                $sourceLines = array();
-            }
-        }
-
-        foreach ($sourceLines as $file => $lines) {
-            foreach ($lines as $lineNo => $numExecuted) {
-                $sourceLines[$file][$lineNo] = self::LINE_NOT_EXECUTED;
-            }
-        }
-
-        $fetchedLines = array_merge($fetchedLines, $sourceLines);
-
-        return $this->detectExecutedLines($fetchedLines, $dbgData);
-    }
-
-    /**
-     * Convert phpdbg based data into the format CodeCoverage expects
-     *
-     * @param  array $sourceLines
-     * @param  array $dbgData
-     * @return array
-     */
-    private function detectExecutedLines(array $sourceLines, array $dbgData)
-    {
-        foreach ($dbgData as $file => $coveredLines) {
-            foreach ($coveredLines as $lineNo => $numExecuted) {
-                // phpdbg also reports $lineNo=0 when e.g. exceptions get thrown.
-                // make sure we only mark lines executed which are actually executable.
-                if (isset($sourceLines[$file][$lineNo])) {
-                    $sourceLines[$file][$lineNo] = self::LINE_EXECUTED;
-                }
-            }
-        }
-
-        return $sourceLines;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
deleted file mode 100644
index 0cd7b9a..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Driver for Xdebug's code coverage functionality.
- *
- * @since Class available since Release 1.0.0
- * @codeCoverageIgnore
- */
-class PHP_CodeCoverage_Driver_Xdebug implements PHP_CodeCoverage_Driver
-{
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('xdebug')) {
-            throw new PHP_CodeCoverage_Exception('This driver requires Xdebug');
-        }
-
-        if (version_compare(phpversion('xdebug'), '2.2.0-dev', '>=') &&
-            !ini_get('xdebug.coverage_enable')) {
-            throw new PHP_CodeCoverage_Exception(
-                'xdebug.coverage_enable=On has to be set in php.ini'
-            );
-        }
-    }
-
-    /**
-     * Start collection of code coverage information.
-     */
-    public function start()
-    {
-        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
-    }
-
-    /**
-     * Stop collection of code coverage information.
-     *
-     * @return array
-     */
-    public function stop()
-    {
-        $data = xdebug_get_code_coverage();
-        xdebug_stop_code_coverage();
-
-        return $this->cleanup($data);
-    }
-
-    /**
-     * @param  array $data
-     * @return array
-     * @since Method available since Release 2.0.0
-     */
-    private function cleanup(array $data)
-    {
-        foreach (array_keys($data) as $file) {
-            unset($data[$file][0]);
-
-            if ($file != 'xdebug://debug-eval' && file_exists($file)) {
-                $numLines = $this->getNumberOfLinesInFile($file);
-
-                foreach (array_keys($data[$file]) as $line) {
-                    if (isset($data[$file][$line]) && $line > $numLines) {
-                        unset($data[$file][$line]);
-                    }
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param  string $file
-     * @return int
-     * @since Method available since Release 2.0.0
-     */
-    private function getNumberOfLinesInFile($file)
-    {
-        $buffer = file_get_contents($file);
-        $lines  = substr_count($buffer, "\n");
-
-        if (substr($buffer, -1) !== "\n") {
-            $lines++;
-        }
-
-        return $lines;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
deleted file mode 100644
index bded3c0..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception class for PHP_CodeCoverage component.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Exception extends RuntimeException
-{
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
deleted file mode 100644
index 463785e..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception that is raised when code is unintentionally covered.
- *
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Exception_UnintentionallyCoveredCode extends PHP_CodeCoverage_Exception
-{
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
deleted file mode 100644
index bb4a251..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Filter for blacklisting and whitelisting of code coverage information.
- *
- * @since Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_Filter
-{
-    /**
-     * Source files that are blacklisted.
-     *
-     * @var array
-     */
-    private $blacklistedFiles = array();
-
-    /**
-     * Source files that are whitelisted.
-     *
-     * @var array
-     */
-    private $whitelistedFiles = array();
-
-    /**
-     * Adds a directory to the blacklist (recursively).
-     *
-     * @param string $directory
-     * @param string $suffix
-     * @param string $prefix
-     */
-    public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
-    {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
-            $this->addFileToBlacklist($file);
-        }
-    }
-
-    /**
-     * Adds a file to the blacklist.
-     *
-     * @param string $filename
-     */
-    public function addFileToBlacklist($filename)
-    {
-        $this->blacklistedFiles[realpath($filename)] = true;
-    }
-
-    /**
-     * Adds files to the blacklist.
-     *
-     * @param array $files
-     */
-    public function addFilesToBlacklist(array $files)
-    {
-        foreach ($files as $file) {
-            $this->addFileToBlacklist($file);
-        }
-    }
-
-    /**
-     * Removes a directory from the blacklist (recursively).
-     *
-     * @param string $directory
-     * @param string $suffix
-     * @param string $prefix
-     */
-    public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
-    {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
-            $this->removeFileFromBlacklist($file);
-        }
-    }
-
-    /**
-     * Removes a file from the blacklist.
-     *
-     * @param string $filename
-     */
-    public function removeFileFromBlacklist($filename)
-    {
-        $filename = realpath($filename);
-
-        if (isset($this->blacklistedFiles[$filename])) {
-            unset($this->blacklistedFiles[$filename]);
-        }
-    }
-
-    /**
-     * Adds a directory to the whitelist (recursively).
-     *
-     * @param string $directory
-     * @param string $suffix
-     * @param string $prefix
-     */
-    public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
-    {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
-            $this->addFileToWhitelist($file);
-        }
-    }
-
-    /**
-     * Adds a file to the whitelist.
-     *
-     * @param string $filename
-     */
-    public function addFileToWhitelist($filename)
-    {
-        $this->whitelistedFiles[realpath($filename)] = true;
-    }
-
-    /**
-     * Adds files to the whitelist.
-     *
-     * @param array $files
-     */
-    public function addFilesToWhitelist(array $files)
-    {
-        foreach ($files as $file) {
-            $this->addFileToWhitelist($file);
-        }
-    }
-
-    /**
-     * Removes a directory from the whitelist (recursively).
-     *
-     * @param string $directory
-     * @param string $suffix
-     * @param string $prefix
-     */
-    public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
-    {
-        $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
-
-        foreach ($files as $file) {
-            $this->removeFileFromWhitelist($file);
-        }
-    }
-
-    /**
-     * Removes a file from the whitelist.
-     *
-     * @param string $filename
-     */
-    public function removeFileFromWhitelist($filename)
-    {
-        $filename = realpath($filename);
-
-        if (isset($this->whitelistedFiles[$filename])) {
-            unset($this->whitelistedFiles[$filename]);
-        }
-    }
-
-    /**
-     * Checks whether a filename is a real filename.
-     *
-     * @param  string $filename
-     * @return bool
-     */
-    public function isFile($filename)
-    {
-        if ($filename == '-' ||
-            strpos($filename, 'vfs://') === 0 ||
-            strpos($filename, 'xdebug://debug-eval') !== false ||
-            strpos($filename, 'eval()\'d code') !== false ||
-            strpos($filename, 'runtime-created function') !== false ||
-            strpos($filename, 'runkit created function') !== false ||
-            strpos($filename, 'assert code') !== false ||
-            strpos($filename, 'regexp code') !== false) {
-            return false;
-        }
-
-        return file_exists($filename);
-    }
-
-    /**
-     * Checks whether or not a file is filtered.
-     *
-     * When the whitelist is empty (default), blacklisting is used.
-     * When the whitelist is not empty, whitelisting is used.
-     *
-     * @param  string                     $filename
-     * @return bool
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function isFiltered($filename)
-    {
-        if (!$this->isFile($filename)) {
-            return true;
-        }
-
-        $filename = realpath($filename);
-
-        if (!empty($this->whitelistedFiles)) {
-            return !isset($this->whitelistedFiles[$filename]);
-        }
-
-        return isset($this->blacklistedFiles[$filename]);
-    }
-
-    /**
-     * Returns the list of blacklisted files.
-     *
-     * @return array
-     */
-    public function getBlacklist()
-    {
-        return array_keys($this->blacklistedFiles);
-    }
-
-    /**
-     * Returns the list of whitelisted files.
-     *
-     * @return array
-     */
-    public function getWhitelist()
-    {
-        return array_keys($this->whitelistedFiles);
-    }
-
-    /**
-     * Returns whether this filter has a whitelist.
-     *
-     * @return bool
-     * @since  Method available since Release 1.1.0
-     */
-    public function hasWhitelist()
-    {
-        return !empty($this->whitelistedFiles);
-    }
-
-    /**
-     * Returns the blacklisted files.
-     *
-     * @return array
-     * @since Method available since Release 2.0.0
-     */
-    public function getBlacklistedFiles()
-    {
-        return $this->blacklistedFiles;
-    }
-
-    /**
-     * Sets the blacklisted files.
-     *
-     * @param array $blacklistedFiles
-     * @since Method available since Release 2.0.0
-     */
-    public function setBlacklistedFiles($blacklistedFiles)
-    {
-        $this->blacklistedFiles = $blacklistedFiles;
-    }
-
-    /**
-     * Returns the whitelisted files.
-     *
-     * @return array
-     * @since Method available since Release 2.0.0
-     */
-    public function getWhitelistedFiles()
-    {
-        return $this->whitelistedFiles;
-    }
-
-    /**
-     * Sets the whitelisted files.
-     *
-     * @param array $whitelistedFiles
-     * @since Method available since Release 2.0.0
-     */
-    public function setWhitelistedFiles($whitelistedFiles)
-    {
-        $this->whitelistedFiles = $whitelistedFiles;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
deleted file mode 100644
index c0ea8d8..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Generates a Clover XML logfile from an PHP_CodeCoverage object.
- *
- * @since Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_Report_Clover
-{
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @param  string           $name
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
-    {
-        $xmlDocument               = new DOMDocument('1.0', 'UTF-8');
-        $xmlDocument->formatOutput = true;
-
-        $xmlCoverage = $xmlDocument->createElement('coverage');
-        $xmlCoverage->setAttribute('generated', (int) $_SERVER['REQUEST_TIME']);
-        $xmlDocument->appendChild($xmlCoverage);
-
-        $xmlProject = $xmlDocument->createElement('project');
-        $xmlProject->setAttribute('timestamp', (int) $_SERVER['REQUEST_TIME']);
-
-        if (is_string($name)) {
-            $xmlProject->setAttribute('name', $name);
-        }
-
-        $xmlCoverage->appendChild($xmlProject);
-
-        $packages = array();
-        $report   = $coverage->getReport();
-        unset($coverage);
-
-        foreach ($report as $item) {
-            $namespace = 'global';
-
-            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
-                continue;
-            }
-
-            $xmlFile = $xmlDocument->createElement('file');
-            $xmlFile->setAttribute('name', $item->getPath());
-
-            $classes  = $item->getClassesAndTraits();
-            $coverage = $item->getCoverageData();
-            $lines    = array();
-
-            foreach ($classes as $className => $class) {
-                $classStatements        = 0;
-                $coveredClassStatements = 0;
-                $coveredMethods         = 0;
-                $classMethods           = 0;
-
-                foreach ($class['methods'] as $methodName => $method) {
-                    if ($method['executableLines']  == 0) {
-                        continue;
-                    }
-
-                    $classMethods++;
-                    $classStatements        += $method['executableLines'];
-                    $coveredClassStatements += $method['executedLines'];
-                    if ($method['coverage'] == 100) {
-                        $coveredMethods++;
-                    }
-
-                    $methodCount = 0;
-                    for ($i  = $method['startLine'];
-                         $i <= $method['endLine'];
-                         $i++) {
-                        if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
-                            $methodCount = max($methodCount, count($coverage[$i]));
-                        }
-                    }
-
-                    $lines[$method['startLine']] = array(
-                        'count' => $methodCount,
-                        'crap'  => $method['crap'],
-                        'type'  => 'method',
-                        'name'  => $methodName
-                    );
-                }
-
-                if (!empty($class['package']['namespace'])) {
-                    $namespace = $class['package']['namespace'];
-                }
-
-                $xmlClass = $xmlDocument->createElement('class');
-                $xmlClass->setAttribute('name', $className);
-                $xmlClass->setAttribute('namespace', $namespace);
-
-                if (!empty($class['package']['fullPackage'])) {
-                    $xmlClass->setAttribute(
-                        'fullPackage',
-                        $class['package']['fullPackage']
-                    );
-                }
-
-                if (!empty($class['package']['category'])) {
-                    $xmlClass->setAttribute(
-                        'category',
-                        $class['package']['category']
-                    );
-                }
-
-                if (!empty($class['package']['package'])) {
-                    $xmlClass->setAttribute(
-                        'package',
-                        $class['package']['package']
-                    );
-                }
-
-                if (!empty($class['package']['subpackage'])) {
-                    $xmlClass->setAttribute(
-                        'subpackage',
-                        $class['package']['subpackage']
-                    );
-                }
-
-                $xmlFile->appendChild($xmlClass);
-
-                $xmlMetrics = $xmlDocument->createElement('metrics');
-                $xmlMetrics->setAttribute('methods', $classMethods);
-                $xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
-                $xmlMetrics->setAttribute('conditionals', 0);
-                $xmlMetrics->setAttribute('coveredconditionals', 0);
-                $xmlMetrics->setAttribute('statements', $classStatements);
-                $xmlMetrics->setAttribute(
-                    'coveredstatements',
-                    $coveredClassStatements
-                );
-                $xmlMetrics->setAttribute(
-                    'elements',
-                    $classMethods +
-                    $classStatements
-                    /* + conditionals */
-                );
-                $xmlMetrics->setAttribute(
-                    'coveredelements',
-                    $coveredMethods +
-                    $coveredClassStatements
-                    /* + coveredconditionals */
-                );
-                $xmlClass->appendChild($xmlMetrics);
-            }
-
-            foreach ($coverage as $line => $data) {
-                if ($data === null || isset($lines[$line])) {
-                    continue;
-                }
-
-                $lines[$line] = array(
-                    'count' => count($data), 'type' => 'stmt'
-                );
-            }
-
-            ksort($lines);
-
-            foreach ($lines as $line => $data) {
-                $xmlLine = $xmlDocument->createElement('line');
-                $xmlLine->setAttribute('num', $line);
-                $xmlLine->setAttribute('type', $data['type']);
-
-                if (isset($data['name'])) {
-                    $xmlLine->setAttribute('name', $data['name']);
-                }
-
-                if (isset($data['crap'])) {
-                    $xmlLine->setAttribute('crap', $data['crap']);
-                }
-
-                $xmlLine->setAttribute('count', $data['count']);
-                $xmlFile->appendChild($xmlLine);
-            }
-
-            $linesOfCode = $item->getLinesOfCode();
-
-            $xmlMetrics = $xmlDocument->createElement('metrics');
-            $xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
-            $xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
-            $xmlMetrics->setAttribute('classes', $item->getNumClassesAndTraits());
-            $xmlMetrics->setAttribute('methods', $item->getNumMethods());
-            $xmlMetrics->setAttribute(
-                'coveredmethods',
-                $item->getNumTestedMethods()
-            );
-            $xmlMetrics->setAttribute('conditionals', 0);
-            $xmlMetrics->setAttribute('coveredconditionals', 0);
-            $xmlMetrics->setAttribute(
-                'statements',
-                $item->getNumExecutableLines()
-            );
-            $xmlMetrics->setAttribute(
-                'coveredstatements',
-                $item->getNumExecutedLines()
-            );
-            $xmlMetrics->setAttribute(
-                'elements',
-                $item->getNumMethods() + $item->getNumExecutableLines()
-                /* + conditionals */
-            );
-            $xmlMetrics->setAttribute(
-                'coveredelements',
-                $item->getNumTestedMethods() + $item->getNumExecutedLines()
-                /* + coveredconditionals */
-            );
-            $xmlFile->appendChild($xmlMetrics);
-
-            if ($namespace == 'global') {
-                $xmlProject->appendChild($xmlFile);
-            } else {
-                if (!isset($packages[$namespace])) {
-                    $packages[$namespace] = $xmlDocument->createElement(
-                        'package'
-                    );
-
-                    $packages[$namespace]->setAttribute('name', $namespace);
-                    $xmlProject->appendChild($packages[$namespace]);
-                }
-
-                $packages[$namespace]->appendChild($xmlFile);
-            }
-        }
-
-        $linesOfCode = $report->getLinesOfCode();
-
-        $xmlMetrics = $xmlDocument->createElement('metrics');
-        $xmlMetrics->setAttribute('files', count($report));
-        $xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
-        $xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
-        $xmlMetrics->setAttribute(
-            'classes',
-            $report->getNumClassesAndTraits()
-        );
-        $xmlMetrics->setAttribute('methods', $report->getNumMethods());
-        $xmlMetrics->setAttribute(
-            'coveredmethods',
-            $report->getNumTestedMethods()
-        );
-        $xmlMetrics->setAttribute('conditionals', 0);
-        $xmlMetrics->setAttribute('coveredconditionals', 0);
-        $xmlMetrics->setAttribute(
-            'statements',
-            $report->getNumExecutableLines()
-        );
-        $xmlMetrics->setAttribute(
-            'coveredstatements',
-            $report->getNumExecutedLines()
-        );
-        $xmlMetrics->setAttribute(
-            'elements',
-            $report->getNumMethods() + $report->getNumExecutableLines()
-            /* + conditionals */
-        );
-        $xmlMetrics->setAttribute(
-            'coveredelements',
-            $report->getNumTestedMethods() + $report->getNumExecutedLines()
-            /* + coveredconditionals */
-        );
-
-        $xmlProject->appendChild($xmlMetrics);
-
-        if ($target !== null) {
-            if (!is_dir(dirname($target))) {
-                mkdir(dirname($target), 0777, true);
-            }
-
-            return $xmlDocument->save($target);
-        } else {
-            return $xmlDocument->saveXML();
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
deleted file mode 100644
index c006ea6..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_Crap4j
-{
-    /**
-     * @var int
-     */
-    private $threshold;
-
-    /**
-     * @param int $threshold
-     */
-    public function __construct($threshold = 30)
-    {
-        if (!is_int($threshold)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'integer'
-            );
-        }
-
-        $this->threshold = $threshold;
-    }
-
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @param  string           $name
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
-    {
-        $document               = new DOMDocument('1.0', 'UTF-8');
-        $document->formatOutput = true;
-
-        $root = $document->createElement('crap_result');
-        $document->appendChild($root);
-
-        $project = $document->createElement('project', is_string($name) ? $name : '');
-        $root->appendChild($project);
-        $root->appendChild($document->createElement('timestamp', date('Y-m-d H:i:s', (int) $_SERVER['REQUEST_TIME'])));
-
-        $stats       = $document->createElement('stats');
-        $methodsNode = $document->createElement('methods');
-
-        $report = $coverage->getReport();
-        unset($coverage);
-
-        $fullMethodCount     = 0;
-        $fullCrapMethodCount = 0;
-        $fullCrapLoad        = 0;
-        $fullCrap            = 0;
-
-        foreach ($report as $item) {
-            $namespace = 'global';
-
-            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
-                continue;
-            }
-
-            $file = $document->createElement('file');
-            $file->setAttribute('name', $item->getPath());
-
-            $classes = $item->getClassesAndTraits();
-
-            foreach ($classes as $className => $class) {
-                foreach ($class['methods'] as $methodName => $method) {
-                    $crapLoad = $this->getCrapLoad($method['crap'], $method['ccn'], $method['coverage']);
-
-                    $fullCrap     += $method['crap'];
-                    $fullCrapLoad += $crapLoad;
-                    $fullMethodCount++;
-
-                    if ($method['crap'] >= $this->threshold) {
-                        $fullCrapMethodCount++;
-                    }
-
-                    $methodNode = $document->createElement('method');
-
-                    if (!empty($class['package']['namespace'])) {
-                        $namespace = $class['package']['namespace'];
-                    }
-
-                    $methodNode->appendChild($document->createElement('package', $namespace));
-                    $methodNode->appendChild($document->createElement('className', $className));
-                    $methodNode->appendChild($document->createElement('methodName', $methodName));
-                    $methodNode->appendChild($document->createElement('methodSignature', htmlspecialchars($method['signature'])));
-                    $methodNode->appendChild($document->createElement('fullMethod', htmlspecialchars($method['signature'])));
-                    $methodNode->appendChild($document->createElement('crap', $this->roundValue($method['crap'])));
-                    $methodNode->appendChild($document->createElement('complexity', $method['ccn']));
-                    $methodNode->appendChild($document->createElement('coverage', $this->roundValue($method['coverage'])));
-                    $methodNode->appendChild($document->createElement('crapLoad', round($crapLoad)));
-
-                    $methodsNode->appendChild($methodNode);
-                }
-            }
-        }
-
-        $stats->appendChild($document->createElement('name', 'Method Crap Stats'));
-        $stats->appendChild($document->createElement('methodCount', $fullMethodCount));
-        $stats->appendChild($document->createElement('crapMethodCount', $fullCrapMethodCount));
-        $stats->appendChild($document->createElement('crapLoad', round($fullCrapLoad)));
-        $stats->appendChild($document->createElement('totalCrap', $fullCrap));
-
-        if ($fullMethodCount > 0) {
-            $crapMethodPercent = $this->roundValue((100 * $fullCrapMethodCount) / $fullMethodCount);
-        } else {
-            $crapMethodPercent = 0;
-        }
-
-        $stats->appendChild($document->createElement('crapMethodPercent', $crapMethodPercent));
-
-        $root->appendChild($stats);
-        $root->appendChild($methodsNode);
-
-        if ($target !== null) {
-            if (!is_dir(dirname($target))) {
-                mkdir(dirname($target), 0777, true);
-            }
-
-            return $document->save($target);
-        } else {
-            return $document->saveXML();
-        }
-    }
-
-    /**
-     * @param  float $crapValue
-     * @param  int   $cyclomaticComplexity
-     * @param  float $coveragePercent
-     * @return float
-     */
-    private function getCrapLoad($crapValue, $cyclomaticComplexity, $coveragePercent)
-    {
-        $crapLoad = 0;
-
-        if ($crapValue >= $this->threshold) {
-            $crapLoad += $cyclomaticComplexity * (1.0 - $coveragePercent / 100);
-            $crapLoad += $cyclomaticComplexity / $this->threshold;
-        }
-
-        return $crapLoad;
-    }
-
-    /**
-     * @param  float $value
-     * @return float
-     */
-    private function roundValue($value)
-    {
-        return round($value, 2);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
deleted file mode 100644
index b28964e..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Factory for PHP_CodeCoverage_Report_Node_* object graphs.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Factory
-{
-    /**
-     * @param  PHP_CodeCoverage                       $coverage
-     * @return PHP_CodeCoverage_Report_Node_Directory
-     */
-    public function create(PHP_CodeCoverage $coverage)
-    {
-        $files      = $coverage->getData();
-        $commonPath = $this->reducePaths($files);
-        $root       = new PHP_CodeCoverage_Report_Node_Directory(
-            $commonPath,
-            null
-        );
-
-        $this->addItems(
-            $root,
-            $this->buildDirectoryStructure($files),
-            $coverage->getTests(),
-            $coverage->getCacheTokens()
-        );
-
-        return $root;
-    }
-
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $root
-     * @param array                                  $items
-     * @param array                                  $tests
-     * @param bool                                   $cacheTokens
-     */
-    private function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
-    {
-        foreach ($items as $key => $value) {
-            if (substr($key, -2) == '/f') {
-                $key = substr($key, 0, -2);
-
-                if (file_exists($root->getPath() . DIRECTORY_SEPARATOR . $key)) {
-                    $root->addFile($key, $value, $tests, $cacheTokens);
-                }
-            } else {
-                $child = $root->addDirectory($key);
-                $this->addItems($child, $value, $tests, $cacheTokens);
-            }
-        }
-    }
-
-    /**
-     * Builds an array representation of the directory structure.
-     *
-     * For instance,
-     *
-     * <code>
-     * Array
-     * (
-     *     [Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * is transformed into
-     *
-     * <code>
-     * Array
-     * (
-     *     [.] => Array
-     *         (
-     *             [Money.php] => Array
-     *                 (
-     *                     ...
-     *                 )
-     *
-     *             [MoneyBag.php] => Array
-     *                 (
-     *                     ...
-     *                 )
-     *         )
-     * )
-     * </code>
-     *
-     * @param  array $files
-     * @return array
-     */
-    private function buildDirectoryStructure($files)
-    {
-        $result = array();
-
-        foreach ($files as $path => $file) {
-            $path    = explode('/', $path);
-            $pointer = &$result;
-            $max     = count($path);
-
-            for ($i = 0; $i < $max; $i++) {
-                if ($i == ($max - 1)) {
-                    $type = '/f';
-                } else {
-                    $type = '';
-                }
-
-                $pointer = &$pointer[$path[$i] . $type];
-            }
-
-            $pointer = $file;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Reduces the paths by cutting the longest common start path.
-     *
-     * For instance,
-     *
-     * <code>
-     * Array
-     * (
-     *     [/home/sb/Money/Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [/home/sb/Money/MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * is reduced to
-     *
-     * <code>
-     * Array
-     * (
-     *     [Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * @param  array  $files
-     * @return string
-     */
-    private function reducePaths(&$files)
-    {
-        if (empty($files)) {
-            return '.';
-        }
-
-        $commonPath = '';
-        $paths      = array_keys($files);
-
-        if (count($files) == 1) {
-            $commonPath                 = dirname($paths[0]) . '/';
-            $files[basename($paths[0])] = $files[$paths[0]];
-
-            unset($files[$paths[0]]);
-
-            return $commonPath;
-        }
-
-        $max = count($paths);
-
-        for ($i = 0; $i < $max; $i++) {
-            // strip phar:// prefixes
-            if (strpos($paths[$i], 'phar://') === 0) {
-                $paths[$i] = substr($paths[$i], 7);
-                $paths[$i] = strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
-            }
-            $paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
-
-            if (empty($paths[$i][0])) {
-                $paths[$i][0] = DIRECTORY_SEPARATOR;
-            }
-        }
-
-        $done = false;
-        $max  = count($paths);
-
-        while (!$done) {
-            for ($i = 0; $i < $max - 1; $i++) {
-                if (!isset($paths[$i][0]) ||
-                    !isset($paths[$i+1][0]) ||
-                    $paths[$i][0] != $paths[$i+1][0]) {
-                    $done = true;
-                    break;
-                }
-            }
-
-            if (!$done) {
-                $commonPath .= $paths[0][0];
-
-                if ($paths[0][0] != DIRECTORY_SEPARATOR) {
-                    $commonPath .= DIRECTORY_SEPARATOR;
-                }
-
-                for ($i = 0; $i < $max; $i++) {
-                    array_shift($paths[$i]);
-                }
-            }
-        }
-
-        $original = array_keys($files);
-        $max      = count($original);
-
-        for ($i = 0; $i < $max; $i++) {
-            $files[implode('/', $paths[$i])] = $files[$original[$i]];
-            unset($files[$original[$i]]);
-        }
-
-        ksort($files);
-
-        return substr($commonPath, 0, -1);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
deleted file mode 100644
index 80916ef..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Generates an HTML report from an PHP_CodeCoverage object.
- *
- * @since Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_Report_HTML
-{
-    /**
-     * @var string
-     */
-    private $templatePath;
-
-    /**
-     * @var string
-     */
-    private $generator;
-
-    /**
-     * @var int
-     */
-    private $lowUpperBound;
-
-    /**
-     * @var int
-     */
-    private $highLowerBound;
-
-    /**
-     * Constructor.
-     *
-     * @param int    $lowUpperBound
-     * @param int    $highLowerBound
-     * @param string $generator
-     */
-    public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generator = '')
-    {
-        $this->generator      = $generator;
-        $this->highLowerBound = $highLowerBound;
-        $this->lowUpperBound  = $lowUpperBound;
-
-        $this->templatePath = sprintf(
-            '%s%sHTML%sRenderer%sTemplate%s',
-            dirname(__FILE__),
-            DIRECTORY_SEPARATOR,
-            DIRECTORY_SEPARATOR,
-            DIRECTORY_SEPARATOR,
-            DIRECTORY_SEPARATOR
-        );
-    }
-
-    /**
-     * @param PHP_CodeCoverage $coverage
-     * @param string           $target
-     */
-    public function process(PHP_CodeCoverage $coverage, $target)
-    {
-        $target = $this->getDirectory($target);
-        $report = $coverage->getReport();
-        unset($coverage);
-
-        if (!isset($_SERVER['REQUEST_TIME'])) {
-            $_SERVER['REQUEST_TIME'] = time();
-        }
-
-        $date = date('D M j G:i:s T Y', $_SERVER['REQUEST_TIME']);
-
-        $dashboard = new PHP_CodeCoverage_Report_HTML_Renderer_Dashboard(
-            $this->templatePath,
-            $this->generator,
-            $date,
-            $this->lowUpperBound,
-            $this->highLowerBound
-        );
-
-        $directory = new PHP_CodeCoverage_Report_HTML_Renderer_Directory(
-            $this->templatePath,
-            $this->generator,
-            $date,
-            $this->lowUpperBound,
-            $this->highLowerBound
-        );
-
-        $file = new PHP_CodeCoverage_Report_HTML_Renderer_File(
-            $this->templatePath,
-            $this->generator,
-            $date,
-            $this->lowUpperBound,
-            $this->highLowerBound
-        );
-
-        $directory->render($report, $target . 'index.html');
-        $dashboard->render($report, $target . 'dashboard.html');
-
-        foreach ($report as $node) {
-            $id = $node->getId();
-
-            if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                if (!file_exists($target . $id)) {
-                    mkdir($target . $id, 0777, true);
-                }
-
-                $directory->render($node, $target . $id . '/index.html');
-                $dashboard->render($node, $target . $id . '/dashboard.html');
-            } else {
-                $dir = dirname($target . $id);
-
-                if (!file_exists($dir)) {
-                    mkdir($dir, 0777, true);
-                }
-
-                $file->render($node, $target . $id . '.html');
-            }
-        }
-
-        $this->copyFiles($target);
-    }
-
-    /**
-     * @param string $target
-     */
-    private function copyFiles($target)
-    {
-        $dir = $this->getDirectory($target . 'css');
-        copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
-        copy($this->templatePath . 'css/nv.d3.min.css', $dir . 'nv.d3.min.css');
-        copy($this->templatePath . 'css/style.css', $dir . 'style.css');
-
-        $dir = $this->getDirectory($target . 'fonts');
-        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.eot', $dir . 'glyphicons-halflings-regular.eot');
-        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.svg', $dir . 'glyphicons-halflings-regular.svg');
-        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.ttf', $dir . 'glyphicons-halflings-regular.ttf');
-        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff', $dir . 'glyphicons-halflings-regular.woff');
-        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff2', $dir . 'glyphicons-halflings-regular.woff2');
-
-        $dir = $this->getDirectory($target . 'js');
-        copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
-        copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
-        copy($this->templatePath . 'js/holder.min.js', $dir . 'holder.min.js');
-        copy($this->templatePath . 'js/html5shiv.min.js', $dir . 'html5shiv.min.js');
-        copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
-        copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
-        copy($this->templatePath . 'js/respond.min.js', $dir . 'respond.min.js');
-    }
-
-    /**
-     * @param  string                     $directory
-     * @return string
-     * @throws PHP_CodeCoverage_Exception
-     * @since  Method available since Release 1.2.0
-     */
-    private function getDirectory($directory)
-    {
-        if (substr($directory, -1, 1) != DIRECTORY_SEPARATOR) {
-            $directory .= DIRECTORY_SEPARATOR;
-        }
-
-        if (is_dir($directory)) {
-            return $directory;
-        }
-
-        if (@mkdir($directory, 0777, true)) {
-            return $directory;
-        }
-
-        throw new PHP_CodeCoverage_Exception(
-            sprintf(
-                'Directory "%s" does not exist.',
-                $directory
-            )
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
deleted file mode 100644
index 51aa15e..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Runtime;
-
-/**
- * Base class for PHP_CodeCoverage_Report_Node renderers.
- *
- * @since Class available since Release 1.1.0
- */
-abstract class PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @var string
-     */
-    protected $templatePath;
-
-    /**
-     * @var string
-     */
-    protected $generator;
-
-    /**
-     * @var string
-     */
-    protected $date;
-
-    /**
-     * @var int
-     */
-    protected $lowUpperBound;
-
-    /**
-     * @var int
-     */
-    protected $highLowerBound;
-
-    /**
-     * @var string
-     */
-    protected $version;
-
-    /**
-     * Constructor.
-     *
-     * @param string $templatePath
-     * @param string $generator
-     * @param string $date
-     * @param int    $lowUpperBound
-     * @param int    $highLowerBound
-     */
-    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
-    {
-        $version = new SebastianBergmann\Version('2.2.4', dirname(dirname(dirname(dirname(__DIR__)))));
-
-        $this->templatePath   = $templatePath;
-        $this->generator      = $generator;
-        $this->date           = $date;
-        $this->lowUpperBound  = $lowUpperBound;
-        $this->highLowerBound = $highLowerBound;
-        $this->version        = $version->getVersion();
-    }
-
-    /**
-     * @param  Text_Template $template
-     * @param  array         $data
-     * @return string
-     */
-    protected function renderItemTemplate(Text_Template $template, array $data)
-    {
-        $numSeparator  = '&nbsp;/&nbsp;';
-
-        if (isset($data['numClasses']) && $data['numClasses'] > 0) {
-            $classesLevel = $this->getColorLevel($data['testedClassesPercent']);
-
-            $classesNumber = $data['numTestedClasses'] . $numSeparator .
-                $data['numClasses'];
-
-            $classesBar = $this->getCoverageBar(
-                $data['testedClassesPercent']
-            );
-        } else {
-            $classesLevel  = 'success';
-            $classesNumber = '0' . $numSeparator . '0';
-            $classesBar    = $this->getCoverageBar(100);
-        }
-
-        if ($data['numMethods'] > 0) {
-            $methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
-
-            $methodsNumber = $data['numTestedMethods'] . $numSeparator .
-                $data['numMethods'];
-
-            $methodsBar = $this->getCoverageBar(
-                $data['testedMethodsPercent']
-            );
-        } else {
-            $methodsLevel                         = 'success';
-            $methodsNumber                        = '0' . $numSeparator . '0';
-            $methodsBar                           = $this->getCoverageBar(100);
-            $data['testedMethodsPercentAsString'] = '100.00%';
-        }
-
-        if ($data['numExecutableLines'] > 0) {
-            $linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
-
-            $linesNumber = $data['numExecutedLines'] . $numSeparator .
-                $data['numExecutableLines'];
-
-            $linesBar = $this->getCoverageBar(
-                $data['linesExecutedPercent']
-            );
-        } else {
-            $linesLevel                           = 'success';
-            $linesNumber                          = '0' . $numSeparator . '0';
-            $linesBar                             = $this->getCoverageBar(100);
-            $data['linesExecutedPercentAsString'] = '100.00%';
-        }
-
-        $template->setVar(
-            array(
-                'icon'                   => isset($data['icon']) ? $data['icon'] : '',
-                'crap'                   => isset($data['crap']) ? $data['crap'] : '',
-                'name'                   => $data['name'],
-                'lines_bar'              => $linesBar,
-                'lines_executed_percent' => $data['linesExecutedPercentAsString'],
-                'lines_level'            => $linesLevel,
-                'lines_number'           => $linesNumber,
-                'methods_bar'            => $methodsBar,
-                'methods_tested_percent' => $data['testedMethodsPercentAsString'],
-                'methods_level'          => $methodsLevel,
-                'methods_number'         => $methodsNumber,
-                'classes_bar'            => $classesBar,
-                'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
-                'classes_level'          => $classesLevel,
-                'classes_number'         => $classesNumber
-            )
-        );
-
-        return $template->render();
-    }
-
-    /**
-     * @param Text_Template                $template
-     * @param PHP_CodeCoverage_Report_Node $node
-     */
-    protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeCoverage_Report_Node $node)
-    {
-        $runtime = new Runtime;
-
-        $template->setVar(
-            array(
-                'id'               => $node->getId(),
-                'full_path'        => $node->getPath(),
-                'path_to_root'     => $this->getPathToRoot($node),
-                'breadcrumbs'      => $this->getBreadcrumbs($node),
-                'date'             => $this->date,
-                'version'          => $this->version,
-                'runtime_name'     => $runtime->getName(),
-                'runtime_version'  => $runtime->getVersion(),
-                'runtime_link'     => $runtime->getVendorUrl(),
-                'generator'        => $this->generator,
-                'low_upper_bound'  => $this->lowUpperBound,
-                'high_lower_bound' => $this->highLowerBound
-            )
-        );
-    }
-
-    protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node)
-    {
-        $breadcrumbs = '';
-        $path        = $node->getPathAsArray();
-        $pathToRoot  = array();
-        $max         = count($path);
-
-        if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
-            $max--;
-        }
-
-        for ($i = 0; $i < $max; $i++) {
-            $pathToRoot[] = str_repeat('../', $i);
-        }
-
-        foreach ($path as $step) {
-            if ($step !== $node) {
-                $breadcrumbs .= $this->getInactiveBreadcrumb(
-                    $step,
-                    array_pop($pathToRoot)
-                );
-            } else {
-                $breadcrumbs .= $this->getActiveBreadcrumb($step);
-            }
-        }
-
-        return $breadcrumbs;
-    }
-
-    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
-    {
-        $buffer = sprintf(
-            '        <li class="active">%s</li>' . "\n",
-            $node->getName()
-        );
-
-        if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
-            $buffer .= '        <li>(<a href="dashboard.html">Dashboard</a>)</li>' . "\n";
-        }
-
-        return $buffer;
-    }
-
-    protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pathToRoot)
-    {
-        return sprintf(
-            '        <li><a href="%sindex.html">%s</a></li>' . "\n",
-            $pathToRoot,
-            $node->getName()
-        );
-    }
-
-    protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node)
-    {
-        $id    = $node->getId();
-        $depth = substr_count($id, '/');
-
-        if ($id != 'index' &&
-            $node instanceof PHP_CodeCoverage_Report_Node_Directory) {
-            $depth++;
-        }
-
-        return str_repeat('../', $depth);
-    }
-
-    protected function getCoverageBar($percent)
-    {
-        $level = $this->getColorLevel($percent);
-
-        $template = new Text_Template(
-            $this->templatePath . 'coverage_bar.html',
-            '{{',
-            '}}'
-        );
-
-        $template->setVar(array('level' => $level, 'percent' => sprintf('%.2F', $percent)));
-
-        return $template->render();
-    }
-
-    /**
-     * @param  int    $percent
-     * @return string
-     */
-    protected function getColorLevel($percent)
-    {
-        if ($percent <= $this->lowUpperBound) {
-            return 'danger';
-        } elseif ($percent > $this->lowUpperBound &&
-            $percent <  $this->highLowerBound) {
-            return 'warning';
-        } else {
-            return 'success';
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
deleted file mode 100644
index f648097..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Renders the dashboard for a PHP_CodeCoverage_Report_Node_Directory node.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     * @param string                                 $file
-     */
-    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
-    {
-        $classes  = $node->getClassesAndTraits();
-        $template = new Text_Template(
-            $this->templatePath . 'dashboard.html',
-            '{{',
-            '}}'
-        );
-
-        $this->setCommonTemplateVariables($template, $node);
-
-        $baseLink             = $node->getId() . '/';
-        $complexity           = $this->complexity($classes, $baseLink);
-        $coverageDistribution = $this->coverageDistribution($classes);
-        $insufficientCoverage = $this->insufficientCoverage($classes, $baseLink);
-        $projectRisks         = $this->projectRisks($classes, $baseLink);
-
-        $template->setVar(
-            array(
-                'insufficient_coverage_classes' => $insufficientCoverage['class'],
-                'insufficient_coverage_methods' => $insufficientCoverage['method'],
-                'project_risks_classes'         => $projectRisks['class'],
-                'project_risks_methods'         => $projectRisks['method'],
-                'complexity_class'              => $complexity['class'],
-                'complexity_method'             => $complexity['method'],
-                'class_coverage_distribution'   => $coverageDistribution['class'],
-                'method_coverage_distribution'  => $coverageDistribution['method']
-            )
-        );
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * Returns the data for the Class/Method Complexity charts.
-     *
-     * @param  array  $classes
-     * @param  string $baseLink
-     * @return array
-     */
-    protected function complexity(array $classes, $baseLink)
-    {
-        $result = array('class' => array(), 'method' => array());
-
-        foreach ($classes as $className => $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($className != '*') {
-                    $methodName = $className . '::' . $methodName;
-                }
-
-                $result['method'][] = array(
-                    $method['coverage'],
-                    $method['ccn'],
-                    sprintf(
-                        '<a href="%s">%s</a>',
-                        str_replace($baseLink, '', $method['link']),
-                        $methodName
-                    )
-                );
-            }
-
-            $result['class'][] = array(
-                $class['coverage'],
-                $class['ccn'],
-                sprintf(
-                    '<a href="%s">%s</a>',
-                    str_replace($baseLink, '', $class['link']),
-                    $className
-                )
-            );
-        }
-
-        return array(
-            'class'  => json_encode($result['class']),
-            'method' => json_encode($result['method'])
-        );
-    }
-
-    /**
-     * Returns the data for the Class / Method Coverage Distribution chart.
-     *
-     * @param  array $classes
-     * @return array
-     */
-    protected function coverageDistribution(array $classes)
-    {
-        $result = array(
-            'class' => array(
-                '0%'      => 0,
-                '0-10%'   => 0,
-                '10-20%'  => 0,
-                '20-30%'  => 0,
-                '30-40%'  => 0,
-                '40-50%'  => 0,
-                '50-60%'  => 0,
-                '60-70%'  => 0,
-                '70-80%'  => 0,
-                '80-90%'  => 0,
-                '90-100%' => 0,
-                '100%'    => 0
-            ),
-            'method' => array(
-                '0%'      => 0,
-                '0-10%'   => 0,
-                '10-20%'  => 0,
-                '20-30%'  => 0,
-                '30-40%'  => 0,
-                '40-50%'  => 0,
-                '50-60%'  => 0,
-                '60-70%'  => 0,
-                '70-80%'  => 0,
-                '80-90%'  => 0,
-                '90-100%' => 0,
-                '100%'    => 0
-            )
-        );
-
-        foreach ($classes as $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($method['coverage'] == 0) {
-                    $result['method']['0%']++;
-                } elseif ($method['coverage'] == 100) {
-                    $result['method']['100%']++;
-                } else {
-                    $key = floor($method['coverage'] / 10) * 10;
-                    $key = $key . '-' . ($key + 10) . '%';
-                    $result['method'][$key]++;
-                }
-            }
-
-            if ($class['coverage'] == 0) {
-                $result['class']['0%']++;
-            } elseif ($class['coverage'] == 100) {
-                $result['class']['100%']++;
-            } else {
-                $key = floor($class['coverage'] / 10) * 10;
-                $key = $key . '-' . ($key + 10) . '%';
-                $result['class'][$key]++;
-            }
-        }
-
-        return array(
-            'class'  => json_encode(array_values($result['class'])),
-            'method' => json_encode(array_values($result['method']))
-        );
-    }
-
-    /**
-     * Returns the classes / methods with insufficient coverage.
-     *
-     * @param  array  $classes
-     * @param  string $baseLink
-     * @return array
-     */
-    protected function insufficientCoverage(array $classes, $baseLink)
-    {
-        $leastTestedClasses = array();
-        $leastTestedMethods = array();
-        $result             = array('class' => '', 'method' => '');
-
-        foreach ($classes as $className => $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($method['coverage'] < $this->highLowerBound) {
-                    if ($className != '*') {
-                        $key = $className . '::' . $methodName;
-                    } else {
-                        $key = $methodName;
-                    }
-
-                    $leastTestedMethods[$key] = $method['coverage'];
-                }
-            }
-
-            if ($class['coverage'] < $this->highLowerBound) {
-                $leastTestedClasses[$className] = $class['coverage'];
-            }
-        }
-
-        asort($leastTestedClasses);
-        asort($leastTestedMethods);
-
-        foreach ($leastTestedClasses as $className => $coverage) {
-            $result['class'] .= sprintf(
-                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                str_replace($baseLink, '', $classes[$className]['link']),
-                $className,
-                $coverage
-            );
-        }
-
-        foreach ($leastTestedMethods as $methodName => $coverage) {
-            list($class, $method) = explode('::', $methodName);
-
-            $result['method'] .= sprintf(
-                '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d%%</td></tr>' . "\n",
-                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
-                $methodName,
-                $method,
-                $coverage
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the project risks according to the CRAP index.
-     *
-     * @param  array  $classes
-     * @param  string $baseLink
-     * @return array
-     */
-    protected function projectRisks(array $classes, $baseLink)
-    {
-        $classRisks  = array();
-        $methodRisks = array();
-        $result      = array('class' => '', 'method' => '');
-
-        foreach ($classes as $className => $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($method['coverage'] < $this->highLowerBound &&
-                    $method['ccn'] > 1) {
-                    if ($className != '*') {
-                        $key = $className . '::' . $methodName;
-                    } else {
-                        $key = $methodName;
-                    }
-
-                    $methodRisks[$key] = $method['crap'];
-                }
-            }
-
-            if ($class['coverage'] < $this->highLowerBound &&
-                $class['ccn'] > count($class['methods'])) {
-                $classRisks[$className] = $class['crap'];
-            }
-        }
-
-        arsort($classRisks);
-        arsort($methodRisks);
-
-        foreach ($classRisks as $className => $crap) {
-            $result['class'] .= sprintf(
-                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
-                str_replace($baseLink, '', $classes[$className]['link']),
-                $className,
-                $crap
-            );
-        }
-
-        foreach ($methodRisks as $methodName => $crap) {
-            list($class, $method) = explode('::', $methodName);
-
-            $result['method'] .= sprintf(
-                '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
-                str_replace($baseLink, '', $classes[$class]['methods'][$method]['link']),
-                $methodName,
-                $method,
-                $crap
-            );
-        }
-
-        return $result;
-    }
-
-    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
-    {
-        return sprintf(
-            '        <li><a href="index.html">%s</a></li>' . "\n" .
-            '        <li class="active">(Dashboard)</li>' . "\n",
-            $node->getName()
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
deleted file mode 100644
index 4415c52..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Renders a PHP_CodeCoverage_Report_Node_Directory node.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     * @param string                                 $file
-     */
-    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
-    {
-        $template = new Text_Template($this->templatePath . 'directory.html', '{{', '}}');
-
-        $this->setCommonTemplateVariables($template, $node);
-
-        $items = $this->renderItem($node, true);
-
-        foreach ($node->getDirectories() as $item) {
-            $items .= $this->renderItem($item);
-        }
-
-        foreach ($node->getFiles() as $item) {
-            $items .= $this->renderItem($item);
-        }
-
-        $template->setVar(
-            array(
-                'id'    => $node->getId(),
-                'items' => $items
-            )
-        );
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node $item
-     * @param  bool                         $total
-     * @return string
-     */
-    protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = false)
-    {
-        $data = array(
-            'numClasses'                   => $item->getNumClassesAndTraits(),
-            'numTestedClasses'             => $item->getNumTestedClassesAndTraits(),
-            'numMethods'                   => $item->getNumMethods(),
-            'numTestedMethods'             => $item->getNumTestedMethods(),
-            'linesExecutedPercent'         => $item->getLineExecutedPercent(false),
-            'linesExecutedPercentAsString' => $item->getLineExecutedPercent(),
-            'numExecutedLines'             => $item->getNumExecutedLines(),
-            'numExecutableLines'           => $item->getNumExecutableLines(),
-            'testedMethodsPercent'         => $item->getTestedMethodsPercent(false),
-            'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
-            'testedClassesPercent'         => $item->getTestedClassesAndTraitsPercent(false),
-            'testedClassesPercentAsString' => $item->getTestedClassesAndTraitsPercent()
-        );
-
-        if ($total) {
-            $data['name'] = 'Total';
-        } else {
-            if ($item instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                $data['name'] = sprintf(
-                    '<a href="%s/index.html">%s</a>',
-                    $item->getName(),
-                    $item->getName()
-                );
-
-                $data['icon'] = '<span class="glyphicon glyphicon-folder-open"></span> ';
-            } else {
-                $data['name'] = sprintf(
-                    '<a href="%s.html">%s</a>',
-                    $item->getName(),
-                    $item->getName()
-                );
-
-                $data['icon'] = '<span class="glyphicon glyphicon-file"></span> ';
-            }
-        }
-
-        return $this->renderItemTemplate(
-            new Text_Template($this->templatePath . 'directory_item.html', '{{', '}}'),
-            $data
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
deleted file mode 100644
index d52345d..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
+++ /dev/null
@@ -1,556 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-// @codeCoverageIgnoreStart
-if (!defined('T_TRAIT')) {
-    define('T_TRAIT', 1001);
-}
-
-if (!defined('T_INSTEADOF')) {
-    define('T_INSTEADOF', 1002);
-}
-
-if (!defined('T_CALLABLE')) {
-    define('T_CALLABLE', 1003);
-}
-
-if (!defined('T_FINALLY')) {
-    define('T_FINALLY', 1004);
-}
-
-if (!defined('T_YIELD')) {
-    define('T_YIELD', 1005);
-}
-// @codeCoverageIgnoreEnd
-
-/**
- * Renders a PHP_CodeCoverage_Report_Node_File node.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @var int
-     */
-    private $htmlspecialcharsFlags;
-
-    /**
-     * Constructor.
-     *
-     * @param string $templatePath
-     * @param string $generator
-     * @param string $date
-     * @param int    $lowUpperBound
-     * @param int    $highLowerBound
-     */
-    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
-    {
-        parent::__construct(
-            $templatePath,
-            $generator,
-            $date,
-            $lowUpperBound,
-            $highLowerBound
-        );
-
-        $this->htmlspecialcharsFlags = ENT_COMPAT;
-
-        if (PHP_VERSION_ID >= 50400 && defined('ENT_SUBSTITUTE')) {
-            $this->htmlspecialcharsFlags = $this->htmlspecialcharsFlags | ENT_HTML401 | ENT_SUBSTITUTE;
-        }
-    }
-
-    /**
-     * @param PHP_CodeCoverage_Report_Node_File $node
-     * @param string                            $file
-     */
-    public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
-    {
-        $template = new Text_Template($this->templatePath . 'file.html', '{{', '}}');
-
-        $template->setVar(
-            array(
-                'items' => $this->renderItems($node),
-                'lines' => $this->renderSource($node)
-            )
-        );
-
-        $this->setCommonTemplateVariables($template, $node);
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node_File $node
-     * @return string
-     */
-    protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
-    {
-        $template = new Text_Template($this->templatePath . 'file_item.html', '{{', '}}');
-
-        $methodItemTemplate = new Text_Template(
-            $this->templatePath . 'method_item.html',
-            '{{',
-            '}}'
-        );
-
-        $items = $this->renderItemTemplate(
-            $template,
-            array(
-                'name'                         => 'Total',
-                'numClasses'                   => $node->getNumClassesAndTraits(),
-                'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
-                'numMethods'                   => $node->getNumMethods(),
-                'numTestedMethods'             => $node->getNumTestedMethods(),
-                'linesExecutedPercent'         => $node->getLineExecutedPercent(false),
-                'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
-                'numExecutedLines'             => $node->getNumExecutedLines(),
-                'numExecutableLines'           => $node->getNumExecutableLines(),
-                'testedMethodsPercent'         => $node->getTestedMethodsPercent(false),
-                'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
-                'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(false),
-                'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
-                'crap'                         => '<abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr>'
-            )
-        );
-
-        $items .= $this->renderFunctionItems(
-            $node->getFunctions(),
-            $methodItemTemplate
-        );
-
-        $items .= $this->renderTraitOrClassItems(
-            $node->getTraits(),
-            $template,
-            $methodItemTemplate
-        );
-
-        $items .= $this->renderTraitOrClassItems(
-            $node->getClasses(),
-            $template,
-            $methodItemTemplate
-        );
-
-        return $items;
-    }
-
-    /**
-     * @param  array         $items
-     * @param  Text_Template $template
-     * @param  Text_Template $methodItemTemplate
-     * @return string
-     */
-    protected function renderTraitOrClassItems(array $items, Text_Template $template, Text_Template $methodItemTemplate)
-    {
-        if (empty($items)) {
-            return '';
-        }
-
-        $buffer = '';
-
-        foreach ($items as $name => $item) {
-            $numMethods       = count($item['methods']);
-            $numTestedMethods = 0;
-
-            foreach ($item['methods'] as $method) {
-                if ($method['executedLines'] == $method['executableLines']) {
-                    $numTestedMethods++;
-                }
-            }
-
-            $buffer .= $this->renderItemTemplate(
-                $template,
-                array(
-                    'name'                         => $name,
-                    'numClasses'                   => 1,
-                    'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
-                    'numMethods'                   => $numMethods,
-                    'numTestedMethods'             => $numTestedMethods,
-                    'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                        $item['executedLines'],
-                        $item['executableLines'],
-                        false
-                    ),
-                    'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                        $item['executedLines'],
-                        $item['executableLines'],
-                        true
-                    ),
-                    'numExecutedLines'             => $item['executedLines'],
-                    'numExecutableLines'           => $item['executableLines'],
-                    'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                        $numTestedMethods,
-                        $numMethods,
-                        false
-                    ),
-                    'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                        $numTestedMethods,
-                        $numMethods,
-                        true
-                    ),
-                    'testedClassesPercent'         => PHP_CodeCoverage_Util::percent(
-                        $numTestedMethods == $numMethods ? 1 : 0,
-                        1,
-                        false
-                    ),
-                    'testedClassesPercentAsString' => PHP_CodeCoverage_Util::percent(
-                        $numTestedMethods == $numMethods ? 1 : 0,
-                        1,
-                        true
-                    ),
-                    'crap'                         => $item['crap']
-                )
-            );
-
-            foreach ($item['methods'] as $method) {
-                $buffer .= $this->renderFunctionOrMethodItem(
-                    $methodItemTemplate,
-                    $method,
-                    '&nbsp;'
-                );
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  array         $functions
-     * @param  Text_Template $template
-     * @return string
-     */
-    protected function renderFunctionItems(array $functions, Text_Template $template)
-    {
-        if (empty($functions)) {
-            return '';
-        }
-
-        $buffer = '';
-
-        foreach ($functions as $function) {
-            $buffer .= $this->renderFunctionOrMethodItem(
-                $template,
-                $function
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  Text_Template $template
-     * @return string
-     */
-    protected function renderFunctionOrMethodItem(Text_Template $template, array $item, $indent = '')
-    {
-        $numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0;
-
-        return $this->renderItemTemplate(
-            $template,
-            array(
-                'name'                         => sprintf(
-                    '%s<a href="#%d"><abbr title="%s">%s</abbr></a>',
-                    $indent,
-                    $item['startLine'],
-                    htmlspecialchars($item['signature']),
-                    isset($item['functionName']) ? $item['functionName'] : $item['methodName']
-                ),
-                'numMethods'                   => 1,
-                'numTestedMethods'             => $numTestedItems,
-                'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                    $item['executedLines'],
-                    $item['executableLines'],
-                    false
-                ),
-                'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                    $item['executedLines'],
-                    $item['executableLines'],
-                    true
-                ),
-                'numExecutedLines'             => $item['executedLines'],
-                'numExecutableLines'           => $item['executableLines'],
-                'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                    $numTestedItems,
-                    1,
-                    false
-                ),
-                'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                    $numTestedItems,
-                    1,
-                    true
-                ),
-                'crap'                         => $item['crap']
-            )
-        );
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node_File $node
-     * @return string
-     */
-    protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
-    {
-        $coverageData = $node->getCoverageData();
-        $testData     = $node->getTestData();
-        $codeLines    = $this->loadFile($node->getPath());
-        $lines        = '';
-        $i            = 1;
-
-        foreach ($codeLines as $line) {
-            $trClass        = '';
-            $popoverContent = '';
-            $popoverTitle   = '';
-
-            if (array_key_exists($i, $coverageData)) {
-                $numTests = count($coverageData[$i]);
-
-                if ($coverageData[$i] === null) {
-                    $trClass = ' class="warning"';
-                } elseif ($numTests == 0) {
-                    $trClass = ' class="danger"';
-                } else {
-                    $lineCss        = 'covered-by-large-tests';
-                    $popoverContent = '<ul>';
-
-                    if ($numTests > 1) {
-                        $popoverTitle = $numTests . ' tests cover line ' . $i;
-                    } else {
-                        $popoverTitle = '1 test covers line ' . $i;
-                    }
-
-                    foreach ($coverageData[$i] as $test) {
-                        if ($lineCss == 'covered-by-large-tests' && $testData[$test]['size'] == 'medium') {
-                            $lineCss = 'covered-by-medium-tests';
-                        } elseif ($testData[$test]['size'] == 'small') {
-                            $lineCss = 'covered-by-small-tests';
-                        }
-
-                        switch ($testData[$test]['status']) {
-                            case 0:
-                                switch ($testData[$test]['size']) {
-                                    case 'small':
-                                        $testCSS = ' class="covered-by-small-tests"';
-                                        break;
-
-                                    case 'medium':
-                                        $testCSS = ' class="covered-by-medium-tests"';
-                                        break;
-
-                                    default:
-                                        $testCSS = ' class="covered-by-large-tests"';
-                                        break;
-                                }
-                                break;
-
-                            case 1:
-                            case 2:
-                                $testCSS = ' class="warning"';
-                                break;
-
-                            case 3:
-                                $testCSS = ' class="danger"';
-                                break;
-
-                            case 4:
-                                $testCSS = ' class="danger"';
-                                break;
-
-                            default:
-                                $testCSS = '';
-                        }
-
-                        $popoverContent .= sprintf(
-                            '<li%s>%s</li>',
-                            $testCSS,
-                            htmlspecialchars($test)
-                        );
-                    }
-
-                    $popoverContent .= '</ul>';
-                    $trClass         = ' class="' . $lineCss . ' popin"';
-                }
-            }
-
-            if (!empty($popoverTitle)) {
-                $popover = sprintf(
-                    ' data-title="%s" data-content="%s" data-placement="bottom" data-html="true"',
-                    $popoverTitle,
-                    htmlspecialchars($popoverContent)
-                );
-            } else {
-                $popover = '';
-            }
-
-            $lines .= sprintf(
-                '     <tr%s%s><td><div align="right"><a name="%d"></a><a href="#%d">%d</a></div></td><td class="codeLine">%s</td></tr>' . "\n",
-                $trClass,
-                $popover,
-                $i,
-                $i,
-                $i,
-                $line
-            );
-
-            $i++;
-        }
-
-        return $lines;
-    }
-
-    /**
-     * @param  string $file
-     * @return array
-     */
-    protected function loadFile($file)
-    {
-        $buffer              = file_get_contents($file);
-        $tokens              = token_get_all($buffer);
-        $result              = array('');
-        $i                   = 0;
-        $stringFlag          = false;
-        $fileEndsWithNewLine = substr($buffer, -1) == "\n";
-
-        unset($buffer);
-
-        foreach ($tokens as $j => $token) {
-            if (is_string($token)) {
-                if ($token === '"' && $tokens[$j - 1] !== '\\') {
-                    $result[$i] .= sprintf(
-                        '<span class="string">%s</span>',
-                        htmlspecialchars($token)
-                    );
-
-                    $stringFlag = !$stringFlag;
-                } else {
-                    $result[$i] .= sprintf(
-                        '<span class="keyword">%s</span>',
-                        htmlspecialchars($token)
-                    );
-                }
-
-                continue;
-            }
-
-            list($token, $value) = $token;
-
-            $value = str_replace(
-                array("\t", ' '),
-                array('&nbsp;&nbsp;&nbsp;&nbsp;', '&nbsp;'),
-                htmlspecialchars($value, $this->htmlspecialcharsFlags)
-            );
-
-            if ($value === "\n") {
-                $result[++$i] = '';
-            } else {
-                $lines = explode("\n", $value);
-
-                foreach ($lines as $jj => $line) {
-                    $line = trim($line);
-
-                    if ($line !== '') {
-                        if ($stringFlag) {
-                            $colour = 'string';
-                        } else {
-                            switch ($token) {
-                                case T_INLINE_HTML:
-                                    $colour = 'html';
-                                    break;
-
-                                case T_COMMENT:
-                                case T_DOC_COMMENT:
-                                    $colour = 'comment';
-                                    break;
-
-                                case T_ABSTRACT:
-                                case T_ARRAY:
-                                case T_AS:
-                                case T_BREAK:
-                                case T_CALLABLE:
-                                case T_CASE:
-                                case T_CATCH:
-                                case T_CLASS:
-                                case T_CLONE:
-                                case T_CONTINUE:
-                                case T_DEFAULT:
-                                case T_ECHO:
-                                case T_ELSE:
-                                case T_ELSEIF:
-                                case T_EMPTY:
-                                case T_ENDDECLARE:
-                                case T_ENDFOR:
-                                case T_ENDFOREACH:
-                                case T_ENDIF:
-                                case T_ENDSWITCH:
-                                case T_ENDWHILE:
-                                case T_EXIT:
-                                case T_EXTENDS:
-                                case T_FINAL:
-                                case T_FINALLY:
-                                case T_FOREACH:
-                                case T_FUNCTION:
-                                case T_GLOBAL:
-                                case T_IF:
-                                case T_IMPLEMENTS:
-                                case T_INCLUDE:
-                                case T_INCLUDE_ONCE:
-                                case T_INSTANCEOF:
-                                case T_INSTEADOF:
-                                case T_INTERFACE:
-                                case T_ISSET:
-                                case T_LOGICAL_AND:
-                                case T_LOGICAL_OR:
-                                case T_LOGICAL_XOR:
-                                case T_NAMESPACE:
-                                case T_NEW:
-                                case T_PRIVATE:
-                                case T_PROTECTED:
-                                case T_PUBLIC:
-                                case T_REQUIRE:
-                                case T_REQUIRE_ONCE:
-                                case T_RETURN:
-                                case T_STATIC:
-                                case T_THROW:
-                                case T_TRAIT:
-                                case T_TRY:
-                                case T_UNSET:
-                                case T_USE:
-                                case T_VAR:
-                                case T_WHILE:
-                                case T_YIELD:
-                                    $colour = 'keyword';
-                                    break;
-
-                                default:
-                                    $colour = 'default';
-                            }
-                        }
-
-                        $result[$i] .= sprintf(
-                            '<span class="%s">%s</span>',
-                            $colour,
-                            $line
-                        );
-                    }
-
-                    if (isset($lines[$jj + 1])) {
-                        $result[++$i] = '';
-                    }
-                }
-            }
-        }
-
-        if ($fileEndsWithNewLine) {
-            unset($result[count($result)-1]);
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
deleted file mode 100644
index 5a09c35..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-       <div class="progress">
-         <div class="progress-bar progress-bar-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
-           <span class="sr-only">{{percent}}% covered ({{level}})</span>
-         </div>
-       </div>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
deleted file mode 100644
index cd1c616..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Bootstrap v3.3.4 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px \9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.form-group-sm .form-control{height:30px;line-height:30px}select[multiple].form-group-sm .form-control,textarea.form-group-sm .form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:5px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.form-group-lg .form-control{height:46px;line-height:46px}select[multiple].form-group-lg .form-control,textarea.form-group-lg .form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:10px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.active,.btn-default.focus,.btn-default:active,.btn-default:focus,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.active,.btn-primary.focus,.btn-primary:active,.btn-primary:focus,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.active,.btn-success.focus,.btn-success:active,.btn-success:focus,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.active,.btn-info.focus,.btn-info:active,.btn-info:focus,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.active,.btn-warning.focus,.btn-warning:active,.btn-warning:focus,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.active,.btn-danger.focus,.btn-danger:active,.btn-danger:focus,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px)and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px 15px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding:48px 0}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-weight:400;line-height:1.4;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.42857143;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000;perspective:1000}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;margin-top:-10px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px)and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px)and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px)and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px)and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css
deleted file mode 100644
index 7a6f7fe..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.nvd3 .nv-axis{pointer-events:none;opacity:1}.nvd3 .nv-axis path{fill:none;stroke:#000;stroke-opacity:.75;shape-rendering:crispEdges}.nvd3 .nv-axis path.domain{stroke-opacity:.75}.nvd3 .nv-axis.nv-x path.domain{stroke-opacity:0}.nvd3 .nv-axis line{fill:none;stroke:#e5e5e5;shape-rendering:crispEdges}.nvd3 .nv-axis .zero line,.nvd3 .nv-axis line.zero{stroke-opacity:.75}.nvd3 .nv-axis .nv-axisMaxMin text{font-weight:700}.nvd3 .x .nv-axis .nv-axisMaxMin text,.nvd3 .x2 .nv-axis .nv-axisMaxMin text,.nvd3 .x3 .nv-axis .nv-axisMaxMin text{text-anchor:middle}.nvd3 .nv-axis.nv-disabled{opacity:0}.nvd3 .nv-bars rect{fill-opacity:.75;transition:fill-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear}.nvd3 .nv-bars rect.hover{fill-opacity:1}.nvd3 .nv-bars .hover rect{fill:#add8e6}.nvd3 .nv-bars text{fill:rgba(0,0,0,0)}.nvd3 .nv-bars .hover text{fill:rgba(0,0,0,1)}.nvd3 .nv-multibar .nv-groups rect,.nvd3 .nv-multibarHorizontal .nv-groups rect,.nvd3 .nv-discretebar .nv-groups rect{stroke-opacity:0;transition:fill-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear}.nvd3 .nv-multibar .nv-groups rect:hover,.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,.nvd3 .nv-candlestickBar .nv-ticks rect:hover,.nvd3 .nv-discretebar .nv-groups rect:hover{fill-opacity:1}.nvd3 .nv-discretebar .nv-groups text,.nvd3 .nv-multibarHorizontal .nv-groups text{font-weight:700;fill:rgba(0,0,0,1);stroke:rgba(0,0,0,0)}.nvd3 .nv-boxplot circle{fill-opacity:.5}.nvd3 .nv-boxplot circle:hover{fill-opacity:1}.nvd3 .nv-boxplot rect:hover{fill-opacity:1}.nvd3 line.nv-boxplot-median{stroke:#000}.nv-boxplot-tick:hover{stroke-width:2.5px}.nvd3.nv-bullet{font:10px sans-serif}.nvd3.nv-bullet .nv-measure{fill-opacity:.8}.nvd3.nv-bullet .nv-measure:hover{fill-opacity:1}.nvd3.nv-bullet .nv-marker{stroke:#000;stroke-width:2px}.nvd3.nv-bullet .nv-markerTriangle{stroke:#000;fill:#fff;stroke-width:1.5px}.nvd3.nv-bullet .nv-tick line{stroke:#666;stroke-width:.5px}.nvd3.nv-bullet .nv-range.nv-s0{fill:#eee}.nvd3.nv-bullet .nv-range.nv-s1{fill:#ddd}.nvd3.nv-bullet .nv-range.nv-s2{fill:#ccc}.nvd3.nv-bullet .nv-title{font-size:14px;font-weight:700}.nvd3.nv-bullet .nv-subtitle{fill:#999}.nvd3.nv-bullet .nv-range{fill:#bababa;fill-opacity:.4}.nvd3.nv-bullet .nv-range:hover{fill-opacity:.7}.nvd3.nv-candlestickBar .nv-ticks .nv-tick{stroke-width:1px}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.hover{stroke-width:2px}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.positive rect{stroke:#2ca02c;fill:#2ca02c}.nvd3.nv-candlestickBar .nv-ticks .nv-tick.negative rect{stroke:#d62728;fill:#d62728}.with-transitions .nv-candlestickBar .nv-ticks .nv-tick{transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-candlestickBar .nv-ticks line{stroke:#333}.nvd3 .nv-legend .nv-disabled rect{}.nvd3 .nv-check-box .nv-box{fill-opacity:0;stroke-width:2}.nvd3 .nv-check-box .nv-check{fill-opacity:0;stroke-width:4}.nvd3 .nv-series.nv-disabled .nv-check-box .nv-check{fill-opacity:0;stroke-opacity:0}.nvd3 .nv-controlsWrap .nv-legend .nv-check-box .nv-check{opacity:0}.nvd3.nv-linePlusBar .nv-bar rect{fill-opacity:.75}.nvd3.nv-linePlusBar .nv-bar rect:hover{fill-opacity:1}.nvd3 .nv-groups path.nv-line{fill:none}.nvd3 .nv-groups path.nv-area{stroke:none}.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point{fill-opacity:0;stroke-opacity:0}.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point{fill-opacity:.5!important;stroke-opacity:.5!important}.with-transitions .nvd3 .nv-groups .nv-point{transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-scatter .nv-groups .nv-point.hover,.nvd3 .nv-groups .nv-point.hover{stroke-width:7px;fill-opacity:.95!important;stroke-opacity:.95!important}.nvd3 .nv-point-paths path{stroke:#aaa;stroke-opacity:0;fill:#eee;fill-opacity:0}.nvd3 .nv-indexLine{cursor:ew-resize}svg.nvd3-svg{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-ms-user-select:none;-moz-user-select:none;user-select:none;display:block;width:100%;height:100%}.nvtooltip.with-3d-shadow,.with-3d-shadow .nvtooltip{-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nvd3 text{font:400 12px Arial}.nvd3 .title{font:700 14px Arial}.nvd3 .nv-background{fill:#fff;fill-opacity:0}.nvd3.nv-noData{font-size:18px;font-weight:700}.nv-brush .extent{fill-opacity:.125;shape-rendering:crispEdges}.nv-brush .resize path{fill:#eee;stroke:#666}.nvd3 .nv-legend .nv-series{cursor:pointer}.nvd3 .nv-legend .nv-disabled circle{fill-opacity:0}.nvd3 .nv-brush .extent{fill-opacity:0!important}.nvd3 .nv-brushBackground rect{stroke:#000;stroke-width:.4;fill:#fff;fill-opacity:.7}.nvd3.nv-ohlcBar .nv-ticks .nv-tick{stroke-width:1px}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover{stroke-width:2px}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive{stroke:#2ca02c}.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative{stroke:#d62728}.nvd3 .background path{fill:none;stroke:#EEE;stroke-opacity:.4;shape-rendering:crispEdges}.nvd3 .foreground path{fill:none;stroke-opacity:.7}.nvd3 .nv-parallelCoordinates-brush .extent{fill:#fff;fill-opacity:.6;stroke:gray;shape-rendering:crispEdges}.nvd3 .nv-parallelCoordinates .hover{fill-opacity:1;stroke-width:3px}.nvd3 .missingValuesline line{fill:none;stroke:#000;stroke-width:1;stroke-opacity:1;stroke-dasharray:5,5}.nvd3.nv-pie path{stroke-opacity:0;transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear,stroke-width 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-pie .nv-pie-title{font-size:24px;fill:rgba(19,196,249,.59)}.nvd3.nv-pie .nv-slice text{stroke:#000;stroke-width:0}.nvd3.nv-pie path{stroke:#fff;stroke-width:1px;stroke-opacity:1}.nvd3.nv-pie .hover path{fill-opacity:.7}.nvd3.nv-pie .nv-label{pointer-events:none}.nvd3.nv-pie .nv-label rect{fill-opacity:0;stroke-opacity:0}.nvd3 .nv-groups .nv-point.hover{stroke-width:20px;stroke-opacity:.5}.nvd3 .nv-scatter .nv-point.hover{fill-opacity:1}.nv-noninteractive{pointer-events:none}.nv-distx,.nv-disty{pointer-events:none}.nvd3.nv-sparkline path{fill:none}.nvd3.nv-sparklineplus g.nv-hoverValue{pointer-events:none}.nvd3.nv-sparklineplus .nv-hoverValue line{stroke:#333;stroke-width:1.5px}.nvd3.nv-sparklineplus,.nvd3.nv-sparklineplus g{pointer-events:all}.nvd3 .nv-hoverArea{fill-opacity:0;stroke-opacity:0}.nvd3.nv-sparklineplus .nv-xValue,.nvd3.nv-sparklineplus .nv-yValue{stroke-width:0;font-size:.9em;font-weight:400}.nvd3.nv-sparklineplus .nv-yValue{stroke:#f66}.nvd3.nv-sparklineplus .nv-maxValue{stroke:#2ca02c;fill:#2ca02c}.nvd3.nv-sparklineplus .nv-minValue{stroke:#d62728;fill:#d62728}.nvd3.nv-sparklineplus .nv-currentValue{font-weight:700;font-size:1.1em}.nvd3.nv-stackedarea path.nv-area{fill-opacity:.7;stroke-opacity:0;transition:fill-opacity 250ms linear,stroke-opacity 250ms linear;-moz-transition:fill-opacity 250ms linear,stroke-opacity 250ms linear;-webkit-transition:fill-opacity 250ms linear,stroke-opacity 250ms linear}.nvd3.nv-stackedarea path.nv-area.hover{fill-opacity:.9}.nvd3.nv-stackedarea .nv-groups .nv-point{stroke-opacity:0;fill-opacity:0}.nvtooltip{position:absolute;background-color:rgba(255,255,255,1);color:rgba(0,0,0,1);padding:1px;border:1px solid rgba(0,0,0,.2);z-index:10000;display:block;font-family:Arial;font-size:13px;text-align:left;pointer-events:none;white-space:nowrap;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.nvtooltip{background:rgba(255,255,255,.8);border:1px solid rgba(0,0,0,.5);border-radius:4px}.nvtooltip.with-transitions,.with-transitions .nvtooltip{transition:opacity 50ms linear;-moz-transition:opacity 50ms linear;-webkit-transition:opacity 50ms linear;transition-delay:200ms;-moz-transition-delay:200ms;-webkit-transition-delay:200ms}.nvtooltip.x-nvtooltip,.nvtooltip.y-nvtooltip{padding:8px}.nvtooltip h3{margin:0;padding:4px 14px;line-height:18px;font-weight:400;background-color:rgba(247,247,247,.75);color:rgba(0,0,0,1);text-align:center;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.nvtooltip p{margin:0;padding:5px 14px;text-align:center}.nvtooltip span{display:inline-block;margin:2px 0}.nvtooltip table{margin:6px;border-spacing:0}.nvtooltip table td{padding:2px 9px 2px 0;vertical-align:middle}.nvtooltip table td.key{font-weight:400}.nvtooltip table td.value{text-align:right;font-weight:700}.nvtooltip table tr.highlight td{padding:1px 9px 1px 0;border-bottom-style:solid;border-bottom-width:1px;border-top-style:solid;border-top-width:1px}.nvtooltip table td.legend-color-guide div{width:8px;height:8px;vertical-align:middle}.nvtooltip table td.legend-color-guide div{width:12px;height:12px;border:1px solid #999}.nvtooltip .footer{padding:3px;text-align:center}.nvtooltip-pending-removal{pointer-events:none;display:none}.nvd3 .nv-interactiveGuideLine{pointer-events:none}.nvd3 line.nv-guideline{stroke:#ccc}
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
deleted file mode 100644
index 824fb31..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
+++ /dev/null
@@ -1,122 +0,0 @@
-body {
- padding-top: 10px;
-}
-
-.popover {
- max-width: none;
-}
-
-.glyphicon {
- margin-right:.25em;
-}
-
-.table-bordered>thead>tr>td {
- border-bottom-width: 1px;
-}
-
-.table tbody>tr>td, .table thead>tr>td {
- padding-top: 3px;
- padding-bottom: 3px;
-}
-
-.table-condensed tbody>tr>td {
- padding-top: 0;
- padding-bottom: 0;
-}
-
-.table .progress {
- margin-bottom: inherit;
-}
-
-.table-borderless th, .table-borderless td {
- border: 0 !important;
-}
-
-.table tbody tr.covered-by-large-tests, li.covered-by-large-tests, tr.success, td.success, li.success, span.success {
- background-color: #dff0d8;
-}
-
-.table tbody tr.covered-by-medium-tests, li.covered-by-medium-tests {
- background-color: #c3e3b5;
-}
-
-.table tbody tr.covered-by-small-tests, li.covered-by-small-tests {
- background-color: #99cb84;
-}
-
-.table tbody tr.danger, .table tbody td.danger, li.danger, span.danger {
- background-color: #f2dede;
-}
-
-.table tbody td.warning, li.warning, span.warning {
- background-color: #fcf8e3;
-}
-
-.table tbody td.info {
- background-color: #d9edf7;
-}
-
-td.big {
- width: 117px;
-}
-
-td.small {
-}
-
-td.codeLine {
- font-family: monospace;
- white-space: pre;
-}
-
-td span.comment {
- color: #888a85;
-}
-
-td span.default {
- color: #2e3436;
-}
-
-td span.html {
- color: #888a85;
-}
-
-td span.keyword {
- color: #2e3436;
- font-weight: bold;
-}
-
-pre span.string {
- color: #2e3436;
-}
-
-span.success, span.warning, span.danger {
- margin-right: 2px;
- padding-left: 10px;
- padding-right: 10px;
- text-align: center;
-}
-
-#classCoverageDistribution, #classComplexity {
- height: 200px;
- width: 475px;
-}
-
-#toplink {
- position: fixed;
- left: 5px;
- bottom: 5px;
- outline: 0;
-}
-
-svg text {
- font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #666;
- fill: #666;
-}
-
-.scrollbox {
- height:245px;
- overflow-x:hidden;
- overflow-y:scroll;
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
deleted file mode 100644
index ed18988..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
+++ /dev/null
@@ -1,284 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="UTF-8">
-  <title>Dashboard for {{full_path}}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
-  <link href="{{path_to_root}}css/nv.d3.min.css" rel="stylesheet">
-  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
-  <script src="{{path_to_root}}js/respond.min.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="col-md-12">
-      <ol class="breadcrumb">
-{{breadcrumbs}}
-      </ol>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <div class="row">
-    <div class="col-md-12">
-     <h2>Classes</h2>
-    </div>
-   </div>
-   <div class="row">
-    <div class="col-md-6">
-     <h3>Coverage Distribution</h3>
-     <div id="classCoverageDistribution" style="height: 300px;">
-       <svg></svg>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <h3>Complexity</h3>
-     <div id="classComplexity" style="height: 300px;">
-       <svg></svg>
-     </div>
-    </div>
-   </div>
-   <div class="row">
-    <div class="col-md-6">
-     <h3>Insufficient Coverage</h3>
-     <div class="scrollbox">
-      <table class="table">
-       <thead>
-        <tr>
-         <th>Class</th>
-         <th class="text-right">Coverage</th>
-        </tr>
-       </thead>
-       <tbody>
-{{insufficient_coverage_classes}}
-       </tbody>
-      </table>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <h3>Project Risks</h3>
-     <div class="scrollbox">
-      <table class="table">
-       <thead>
-        <tr>
-         <th>Class</th>
-         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
-        </tr>
-       </thead>
-       <tbody>
-{{project_risks_classes}}
-       </tbody>
-      </table>
-     </div>
-    </div>
-   </div>
-   <div class="row">
-    <div class="col-md-12">
-     <h2>Methods</h2>
-    </div>
-   </div>
-   <div class="row">
-    <div class="col-md-6">
-     <h3>Coverage Distribution</h3>
-     <div id="methodCoverageDistribution" style="height: 300px;">
-       <svg></svg>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <h3>Complexity</h3>
-     <div id="methodComplexity" style="height: 300px;">
-       <svg></svg>
-     </div>
-    </div>
-   </div>
-   <div class="row">
-    <div class="col-md-6">
-     <h3>Insufficient Coverage</h3>
-     <div class="scrollbox">
-      <table class="table">
-       <thead>
-        <tr>
-         <th>Method</th>
-         <th class="text-right">Coverage</th>
-        </tr>
-       </thead>
-       <tbody>
-{{insufficient_coverage_methods}}
-       </tbody>
-      </table>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <h3>Project Risks</h3>
-     <div class="scrollbox">
-      <table class="table">
-       <thead>
-        <tr>
-         <th>Method</th>
-         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
-        </tr>
-       </thead>
-       <tbody>
-{{project_risks_methods}}
-       </tbody>
-      </table>
-     </div>
-    </div>
-   </div>
-   <footer>
-    <hr/>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
-    </p>
-   </footer>
-  </div>
-  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/d3.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/nv.d3.min.js" type="text/javascript"></script>
-  <script type="text/javascript">
-$(document).ready(function() {
-  nv.addGraph(function() {
-    var chart = nv.models.multiBarChart();
-    chart.tooltips(false)
-      .showControls(false)
-      .showLegend(false)
-      .reduceXTicks(false)
-      .staggerLabels(true)
-      .yAxis.tickFormat(d3.format('d'));
-
-    d3.select('#classCoverageDistribution svg')
-      .datum(getCoverageDistributionData({{class_coverage_distribution}}, "Class Coverage"))
-      .transition().duration(500).call(chart);
-
-    nv.utils.windowResize(chart.update);
-
-    return chart;
-  });
-
-  nv.addGraph(function() {
-    var chart = nv.models.multiBarChart();
-    chart.tooltips(false)
-      .showControls(false)
-      .showLegend(false)
-      .reduceXTicks(false)
-      .staggerLabels(true)
-      .yAxis.tickFormat(d3.format('d'));
-
-    d3.select('#methodCoverageDistribution svg')
-      .datum(getCoverageDistributionData({{method_coverage_distribution}}, "Method Coverage"))
-      .transition().duration(500).call(chart);
-
-    nv.utils.windowResize(chart.update);
-
-    return chart;
-  });
-
-  function getCoverageDistributionData(data, label) {
-    var labels = [
-      '0%',
-      '0-10%',
-      '10-20%',
-      '20-30%',
-      '30-40%',
-      '40-50%',
-      '50-60%',
-      '60-70%',
-      '70-80%',
-      '80-90%',
-      '90-100%',
-      '100%'
-    ];
-    var values = [];
-    $.each(labels, function(key) {
-      values.push({x: labels[key], y: data[key]});
-    });
-
-    return [
-      {
-        key: label,
-        values: values,
-        color: "#4572A7"
-      }
-    ];
-  }
-  nv.addGraph(function() {
-    var chart = nv.models.scatterChart()
-      .showDistX(true)
-      .showDistY(true)
-      .showLegend(false)
-      .forceX([0, 100]);
-    chart.tooltipContent(function(key, y, e, graph) {
-      return '<p>' + graph.point.class + '</p>';
-    });
-
-    chart.xAxis.axisLabel('Code Coverage (in percent)');
-    chart.yAxis.axisLabel('Cyclomatic Complexity');
-
-    d3.select('#classComplexity svg')
-      .datum(getComplexityData({{complexity_class}}, 'Class Complexity'))
-      .transition()
-      .duration(500)
-      .call(chart);
-
-    nv.utils.windowResize(chart.update);
-
-    return chart;
-  });
-
-  nv.addGraph(function() {
-    var chart = nv.models.scatterChart()
-      .showDistX(true)
-      .showDistY(true)
-      .showLegend(false)
-      .forceX([0, 100]);
-    chart.tooltipContent(function(key, y, e, graph) {
-      return '<p>' + graph.point.class + '</p>';
-    });
-
-    chart.xAxis.axisLabel('Code Coverage (in percent)');
-    chart.yAxis.axisLabel('Method Complexity');
-
-    d3.select('#methodComplexity svg')
-      .datum(getComplexityData({{complexity_method}}, 'Method Complexity'))
-      .transition()
-      .duration(500)
-      .call(chart);
-
-    nv.utils.windowResize(chart.update);
-
-    return chart;
-  });
-
-  function getComplexityData(data, label) {
-    var values = [];
-    $.each(data, function(key) {
-      var value = Math.round(data[key][0]*100) / 100;
-      values.push({
-        x: value,
-        y: data[key][1],
-        class: data[key][2],
-        size: 0.05,
-        shape: 'diamond'
-      });
-    });
-
-    return [
-      {
-        key: label,
-        values: values,
-        color: "#4572A7"
-      }
-    ];
-  }
-});
-  </script>
- </body>
-</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
deleted file mode 100644
index efe743f..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="UTF-8">
-  <title>Code Coverage for {{full_path}}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
-  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
-  <script src="{{path_to_root}}js/respond.min.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="col-md-12">
-      <ol class="breadcrumb">
-{{breadcrumbs}}
-      </ol>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <table class="table table-bordered">
-    <thead>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="9"><div align="center"><strong>Code Coverage</strong></div></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Functions and Methods</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-     </tr>
-    </thead>
-    <tbody>
-{{items}}
-    </tbody>
-   </table>
-   <footer>
-    <hr/>
-    <h4>Legend</h4>
-    <p>
-     <span class="danger"><strong>Low</strong>: 0% to {{low_upper_bound}}%</span>
-     <span class="warning"><strong>Medium</strong>: {{low_upper_bound}}% to {{high_lower_bound}}%</span>
-     <span class="success"><strong>High</strong>: {{high_lower_bound}}% to 100%</span>
-    </p>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
-    </p>
-   </footer>
-  </div>
-  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
- </body>
-</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
deleted file mode 100644
index 78dbb35..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
+++ /dev/null
@@ -1,13 +0,0 @@
-     <tr>
-      <td class="{{lines_level}}">{{icon}}{{name}}</td>
-      <td class="{{lines_level}} big">{{lines_bar}}</td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
-      <td class="{{methods_level}} big">{{methods_bar}}</td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
-      <td class="{{classes_level}} big">{{classes_bar}}</td>
-      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
-      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
-     </tr>
-
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
deleted file mode 100644
index 59a0684..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="UTF-8">
-  <title>Code Coverage for {{full_path}}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
-  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="{{path_to_root}}js/html5shiv.min.js"></script>
-  <script src="{{path_to_root}}js/respond.min.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="col-md-12">
-      <ol class="breadcrumb">
-{{breadcrumbs}}
-      </ol>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <table class="table table-bordered">
-    <thead>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="10"><div align="center"><strong>Code Coverage</strong></div></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-      <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
-     </tr>
-    </thead>
-    <tbody>
-{{items}}
-    </tbody>
-   </table>
-   <table id="code" class="table table-borderless table-condensed">
-    <tbody>
-{{lines}}
-    </tbody>
-   </table>
-   <footer>
-    <hr/>
-    <h4>Legend</h4>
-    <p>
-     <span class="success"><strong>Executed</strong></span>
-     <span class="danger"><strong>Not Executed</strong></span>
-     <span class="warning"><strong>Dead Code</strong></span>
-    </p>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
-    </p>
-    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
-   </footer>
-  </div>
-  <script src="{{path_to_root}}js/jquery.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="{{path_to_root}}js/holder.min.js" type="text/javascript"></script>
-  <script type="text/javascript">
-  $(function() {
-   var $window   = $(window)
-     , $top_link = $('#toplink')
-     , $body     = $('body, html')
-     , offset    = $('#code').offset().top;
-
-   $top_link.hide().click(function(event) {
-    event.preventDefault();
-    $body.animate({scrollTop:0}, 800);
-   });
-
-   $window.scroll(function() {
-    if($window.scrollTop() > offset) {
-     $top_link.fadeIn();
-    } else {
-     $top_link.fadeOut();
-    }
-   }).scroll();
-
-   $('.popin').popover({trigger: 'hover'});
-  });
-  </script>
- </body>
-</html>
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
deleted file mode 100644
index 756fdd6..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-     <tr>
-      <td class="{{classes_level}}">{{name}}</td>
-      <td class="{{classes_level}} big">{{classes_bar}}</td>
-      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
-      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
-      <td class="{{methods_level}} big">{{methods_bar}}</td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
-      <td class="{{methods_level}} small">{{crap}}</td>
-      <td class="{{lines_level}} big">{{lines_bar}}</td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
-     </tr>
-
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index b93a495..0000000
Binary files a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 94fb549..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph horiz-adv-x="400" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
-<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#xa5;" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
-<glyph unicode="&#x2000;" horiz-adv-x="650" />
-<glyph unicode="&#x2001;" horiz-adv-x="1300" />
-<glyph unicode="&#x2002;" horiz-adv-x="650" />
-<glyph unicode="&#x2003;" horiz-adv-x="1300" />
-<glyph unicode="&#x2004;" horiz-adv-x="433" />
-<glyph unicode="&#x2005;" horiz-adv-x="325" />
-<glyph unicode="&#x2006;" horiz-adv-x="216" />
-<glyph unicode="&#x2007;" horiz-adv-x="216" />
-<glyph unicode="&#x2008;" horiz-adv-x="162" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="325" />
-<glyph unicode="&#x20ac;" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
-<glyph unicode="&#x20bd;" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
-<glyph unicode="&#x2212;" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#x231b;" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
-<glyph unicode="&#x26fa;" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
-<glyph unicode="&#x2709;" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
-<glyph unicode="&#x270f;" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
-<glyph unicode="&#xe001;" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
-<glyph unicode="&#xe002;" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
-<glyph unicode="&#xe003;" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
-<glyph unicode="&#xe005;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
-<glyph unicode="&#xe006;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
-<glyph unicode="&#xe007;" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
-<glyph unicode="&#xe008;" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
-<glyph unicode="&#xe009;" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
-<glyph unicode="&#xe010;" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe011;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
-<glyph unicode="&#xe012;" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe013;" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
-<glyph unicode="&#xe014;" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
-<glyph unicode="&#xe015;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe016;" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe017;" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
-<glyph unicode="&#xe018;" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe019;" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
-<glyph unicode="&#xe020;" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
-<glyph unicode="&#xe021;" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe022;" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
-<glyph unicode="&#xe023;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe024;" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe026;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
-<glyph unicode="&#xe027;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
-<glyph unicode="&#xe028;" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
-<glyph unicode="&#xe029;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe030;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
-<glyph unicode="&#xe031;" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
-<glyph unicode="&#xe032;" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe033;" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
-<glyph unicode="&#xe034;" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
-<glyph unicode="&#xe035;" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
-<glyph unicode="&#xe036;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
-<glyph unicode="&#xe037;" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
-<glyph unicode="&#xe038;" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
-<glyph unicode="&#xe039;" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
-<glyph unicode="&#xe040;" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
-<glyph unicode="&#xe041;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe042;" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
-<glyph unicode="&#xe043;" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
-<glyph unicode="&#xe044;" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe045;" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
-<glyph unicode="&#xe046;" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
-<glyph unicode="&#xe047;" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
-<glyph unicode="&#xe048;" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
-<glyph unicode="&#xe049;" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
-<glyph unicode="&#xe050;" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
-<glyph unicode="&#xe051;" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
-<glyph unicode="&#xe052;" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe053;" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe055;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe056;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe057;" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe058;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe059;" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
-<glyph unicode="&#xe062;" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
-<glyph unicode="&#xe063;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
-<glyph unicode="&#xe064;" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
-<glyph unicode="&#xe065;" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
-<glyph unicode="&#xe066;" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
-<glyph unicode="&#xe067;" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
-<glyph unicode="&#xe068;" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
-<glyph unicode="&#xe069;" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe070;" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe071;" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
-<glyph unicode="&#xe072;" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
-<glyph unicode="&#xe073;" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe074;" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe075;" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
-<glyph unicode="&#xe076;" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe077;" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe078;" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe079;" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
-<glyph unicode="&#xe080;" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
-<glyph unicode="&#xe081;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe082;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
-<glyph unicode="&#xe083;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
-<glyph unicode="&#xe084;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
-<glyph unicode="&#xe085;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe086;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe087;" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
-<glyph unicode="&#xe088;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe089;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe090;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
-<glyph unicode="&#xe091;" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
-<glyph unicode="&#xe092;" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe093;" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
-<glyph unicode="&#xe094;" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe095;" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
-<glyph unicode="&#xe096;" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
-<glyph unicode="&#xe097;" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
-<glyph unicode="&#xe101;" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe102;" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
-<glyph unicode="&#xe103;" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
-<glyph unicode="&#xe104;" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
-<glyph unicode="&#xe105;" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe106;" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
-<glyph unicode="&#xe107;" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
-<glyph unicode="&#xe108;" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
-<glyph unicode="&#xe109;" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
-<glyph unicode="&#xe110;" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
-<glyph unicode="&#xe111;" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
-<glyph unicode="&#xe112;" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
-<glyph unicode="&#xe113;" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
-<glyph unicode="&#xe114;" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
-<glyph unicode="&#xe115;" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe116;" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
-<glyph unicode="&#xe117;" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
-<glyph unicode="&#xe118;" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="&#xe119;" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe120;" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
-<glyph unicode="&#xe121;" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
-<glyph unicode="&#xe122;" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
-<glyph unicode="&#xe123;" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
-<glyph unicode="&#xe124;" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
-<glyph unicode="&#xe125;" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe126;" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
-<glyph unicode="&#xe127;" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe128;" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe129;" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe130;" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
-<glyph unicode="&#xe131;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
-<glyph unicode="&#xe132;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
-<glyph unicode="&#xe133;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
-<glyph unicode="&#xe134;" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe135;" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
-<glyph unicode="&#xe136;" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
-<glyph unicode="&#xe138;" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
-<glyph unicode="&#xe139;" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
-<glyph unicode="&#xe140;" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
-<glyph unicode="&#xe141;" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
-<glyph unicode="&#xe142;" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
-<glyph unicode="&#xe143;" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
-<glyph unicode="&#xe144;" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
-<glyph unicode="&#xe145;" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
-<glyph unicode="&#xe146;" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
-<glyph unicode="&#xe148;" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
-<glyph unicode="&#xe149;" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
-<glyph unicode="&#xe150;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe151;" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
-<glyph unicode="&#xe152;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
-<glyph unicode="&#xe153;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
-<glyph unicode="&#xe154;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
-<glyph unicode="&#xe155;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="&#xe156;" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="&#xe157;" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="&#xe158;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
-<glyph unicode="&#xe159;" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
-<glyph unicode="&#xe160;" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
-<glyph unicode="&#xe161;" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe162;" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
-<glyph unicode="&#xe163;" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
-<glyph unicode="&#xe164;" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
-<glyph unicode="&#xe165;" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="&#xe166;" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe167;" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe168;" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
-<glyph unicode="&#xe169;" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe170;" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
-<glyph unicode="&#xe171;" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
-<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
-<glyph unicode="&#xe173;" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
-<glyph unicode="&#xe174;" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
-<glyph unicode="&#xe175;" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe176;" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
-<glyph unicode="&#xe177;" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
-<glyph unicode="&#xe178;" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
-<glyph unicode="&#xe179;" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
-<glyph unicode="&#xe180;" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
-<glyph unicode="&#xe181;" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="&#xe182;" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
-<glyph unicode="&#xe183;" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
-<glyph unicode="&#xe184;" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe185;" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
-<glyph unicode="&#xe186;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe187;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
-<glyph unicode="&#xe188;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
-<glyph unicode="&#xe189;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
-<glyph unicode="&#xe190;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
-<glyph unicode="&#xe191;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe192;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
-<glyph unicode="&#xe193;" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
-<glyph unicode="&#xe194;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="&#xe195;" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
-<glyph unicode="&#xe197;" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe198;" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
-<glyph unicode="&#xe199;" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
-<glyph unicode="&#xe200;" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
-<glyph unicode="&#xe201;" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
-<glyph unicode="&#xe202;" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
-<glyph unicode="&#xe203;" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
-<glyph unicode="&#xe204;" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
-<glyph unicode="&#xe205;" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe206;" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
-<glyph unicode="&#xe209;" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
-<glyph unicode="&#xe210;" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe211;" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe212;" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe213;" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe214;" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe215;" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe216;" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
-<glyph unicode="&#xe218;" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
-<glyph unicode="&#xe219;" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
-<glyph unicode="&#xe221;" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe223;" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
-<glyph unicode="&#xe224;" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
-<glyph unicode="&#xe225;" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
-<glyph unicode="&#xe226;" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
-<glyph unicode="&#xe227;" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
-<glyph unicode="&#xe230;" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
-<glyph unicode="&#xe231;" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe232;" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
-<glyph unicode="&#xe233;" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
-<glyph unicode="&#xe234;" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe235;" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
-<glyph unicode="&#xe236;" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
-<glyph unicode="&#xe237;" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
-<glyph unicode="&#xe238;" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe239;" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
-<glyph unicode="&#xe240;" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
-<glyph unicode="&#xe241;" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
-<glyph unicode="&#xe242;" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe243;" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
-<glyph unicode="&#xe244;" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
-<glyph unicode="&#xe245;" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
-<glyph unicode="&#xe246;" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
-<glyph unicode="&#xe247;" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe248;" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
-<glyph unicode="&#xe249;" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe250;" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
-<glyph unicode="&#xe251;" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
-<glyph unicode="&#xe252;" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
-<glyph unicode="&#xe253;" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
-<glyph unicode="&#xe254;" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
-<glyph unicode="&#xe255;" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
-<glyph unicode="&#xe256;" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
-<glyph unicode="&#xe257;" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
-<glyph unicode="&#xe258;" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
-<glyph unicode="&#xe259;" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
-<glyph unicode="&#xe260;" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
-<glyph unicode="&#xf8ff;" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
-<glyph unicode="&#x1f511;" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
-<glyph unicode="&#x1f6aa;" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 1413fc6..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
+++ /dev/null
@@ -1,772 +0,0 @@
-
�pFFTMm*���GDEF
D
 OS/2g�k�
8`cmapڭ�
�rcvt (�gasp��glyf}]�o��headM/���6hhea
-D��$hmtx�� `�tlocao�����0maxp
j��� name�,�����post���5��
-�webf�TP�T
�=���v�u�vs�




�
��Z�
�2�UKWN@ ����{
 
,
-
�
h
,
-
�
�h@( +�� 
- / _ � �"#%�&
&�'	'��	��)�9�I�Y�`�i�y�����	��)�9�F�I�Y�i�y�����	���!�'�9�I�Y�`���� *��  / _ � �"#%�&
&�'	'�
��� �0�@�P�`�b�p�����
�� �0�@�H�P�`�p�����	���!�#�0�@�P�`���������f�b���ߵ�i�Y������!��     
- ������|vpjdc]WQKED����������
�5  *+����  
- / / _ _ � � � �""##%�%�&
&
&�&�'	'	''�
���	!��&� �)0�0�9:�@�ID�P�YN�`�`X�b�iY�p�ya����k����u�
�	}���� �)��0�9��@�F��H�I��P�Y��`�i��p�y��������������	�	��������!�!��#�'��0�9��@�I��P�Y
	�`�`
����

�
�

��
��

-




(�
��(
h .�
/<��2��<��2�/<��2�
�<�
�23!%3#(
@���� ��(�
ddLL[
2


7>


32

+


&/
#"&/
.
=

/
&6?
#"&'&546?
>
;
'.
?
6
54676X&
-�j��
-

-��j�
-)"&
-�j��
-

-��j�
-)L

-��j�
-)"&
-�j��
-

-��j�
-)"&
-�j��
-
LL#
32!2
#!+
"&5!"&=
463!46
��
^�����
^L�����
^�
^
p@LE
32
!2

+
!2

+
+
"&=
!"&?
>
;
5!"&?
>
;
&'
&6;
2
2?
69�
-��

-x
-}

-x
-}���
-x
-}��
-x
-v��
-���L
-���d����d�
l
-��
d��;
2#4.#"!!!!32>53#"'.
'#7367#73>
76��p<�#4@9+820
{d��
�d��	09B49@4#�bk��v$B�dp
�d�>u��hi-K0!.O2d22dJtB+"0J+�ku�0�wd/5dW�%�{L�>G
!2
+
!2

+
+
"&=
!"&?
>
;
5!"&?
>
;
4632654&#
�
^CjB0

0BjC�
 
-x
-�
-�
-��
-x
-u��
-x
-u��@--@�$?2O*$$*P2@%d��
-��d�
�
-���BVT@
�
�L�!2
#!"&=
46� ��������%A
+


32
!546;
5467.
=
#"&=



!54&'.
467>
=
�2cQQc2��2cQQc2�A7  7A
�A7  7A��d[�##�[����[�##�[d��d<c2<2c<��<c2<2c<d
1
��
,�A
2632#!"&5467&546
�n�,,.x��x�OqUB�Awa�xy�rPEk��d��


32
!546;

'&>

76!'� 	
-�
��P
ԇ
-	 $
-op	z
y���#��%**%�$	���pd�L#7!2
"'
&6

&546	
6'
&4
#!"&7
62
2?
62~
-����
��
-
-�

-
-��\
l
-��
-
l��L
-��7
-�����
-&
-��

-��
-
���
-
-
l��������	
2

'7
'	
�&�

c�_"���f���n�
�&\�`�t���f�jp
O
��
32
!546;

!����������22&&
L�
%6.
676.
67646
p�'0SFO�$WOHB��XAO�$WOHB��"��7Q)mr	���*`)nq&*	����)2

"'
#'".4>
"

2>
4&
�ȶ�N

N

;)��w�d��NN�
r��VV���VV�N��d�y��%:
M

N��ȶ�[V���VV���
dX�D
>.54>
�0{xuX6Cy��>>��xC8Zvxy�DH-Sv@9y��UU��y9@vS-H
��^{�
62!2'%&7%&63
���
����������� 
a����o��
����^{�"
62!2'%&7%&63#7'7#'
���
�����������
���J��J��N 
a����o��
��d�⋌��
��&
2
#

#!"&=
467%>
=
"&=
46X|�>&	
f	
-��
-	
f	&>���|�.hK
-�
-]
-
-]
-�
-Kh.�|�
�L#'+/37GKOSW!2#!"&54635)
"3!2654&33535!3535!35!"3!2654&35!3535!35~
-
-��
-Ud���
-
-&
-sd�d d�d d���
-
-&
-��d d�d dL
-��
-
-
-ddd
-��
-
-
^
-dd�dddd�ddddd
-��
-
-
^
-ddddd�ddddLL/?!2#!"&546)
2#!"&546
!2#!"&546)
2#!"&5462
��pm
��p��
��pm
��pL�p
��p
����p
��p
�	LL/?O_o�32
+
"&=
46!32
+
"&=
46!32
+
"&=
46
32
+
"&=
46!32
+
"&=
46!32
+
"&=
46
32
+
"&=
46!32
+
"&=
46!32
+
"&=
462��
���
�������
���
�������
���
���L�������p�������p�������L/?O_32
+
"&=
46)
2
#!"&=
46
32
+
"&=
46)
2
#!"&=
46
32
+
"&=
46)
2
#!"&=
462��
���D����
���D����
���DL�����p�����p����
&,� 	
62

"'
&4?
62
2
�;�������
�;���
���
nnBB#
	

"'	
"/
&47	
&4?
62	
62����
������
���

;������
���

���
����%I2

"'
#".4>
"

2>
4&32
32
+
+
"&=
#"&=
46;
546
�ij�MN
,m��w�b��MM�
o��XX���XX���
-K
-
-K
-�
-K
-
-K�M��b�y��l
+MM��ij�MX���XX���#
-K
-�
-K
-
-K
-�
-K
-����%52

"'
#".4>
"

2>
4&!2
#!"&=
46
�ij�MN
,m��w�b��MM�
o��XX���XX�X
^
-
-��
-�M��b�y��l
+MM��ij�MX���XX����
-�
-
-�
-��-
32+
"&5465".547

2>
54&&dd
��[���֛[ҧg|r���r|��p
��>�ٸu֛[[��u�
'>�7�xt�rr�tx�d��/?
32+
"&546
32+
"&546
32+
"&54632
+
"&=
46
�
-
-�
-�ޖ
-
-�
-�ޖ
-
-�
-�ޖ
-
-�
-�
-��
-
-~
-�p
-�
-
-�
-��
-�>
-
-
�
-�
-�
-
-�
-��GO
2
7
'#"/&/
&'7'&/&54?6?
'6776?6"264X!)&1-�=+P
��
P08�,2&+!)&1-�<,P
��
P/:�-1&+x�~~�~��
P09�,1&+"(&1,�=,Q��Q09�-0&* !(&0-�=,P
���~�~~�d�!%)-1
!2
!2
!5463!546!5
#!"&53333333
�
,);

-��
-
;)
,
,;)�D);dddddddd;)d
-KK
-d);ddd����);;) d�D��D��D��D�
�
62
+
+
"&5!+
"&5#"&l`
-�
-�
-��
-�
-�
-j`��
-��
-
-
w��
-
-?
-d��
3!#!"&5463
#"&=
X;)
,��R���p);�vL�p���02".4>
"

2>
4&3232
+
"&546
��֛[[���֛[[�
���rr���rr�|2
-�
-
-�
-�[���֛[[���֛;r���rr���

-��
-2
-
-
^
-���)
#!
333
3��)�)��
�������
��p���
,�p��
,d��/
3232
"'
&6;
46
32#!"&546;
2
!546&��
��
&
��
�T2
-
-��
-
-2
-���>�p
�
���
-��
-
-
^
-
-��
-��12".4>
"

2>
4&3232"'&6;
46
��֛[[���֛[[�
���rr���rr�|�
-�
-
�
&
�
-��[���֛[[���֛;r���rr���

-����


-��12".4>
"

2>
4&%+
+
"&5#"&762
��֛[[���֛[[�
���rr���rr���
-�
-�
-�
-
�
&�[���֛[[���֛;r���rr���
����
-
-

��9!2#!"&'&547>
!";
2

;
26?
>
;
26'.
��
-���
����
-W
-�
-&
-�
-&
-�
-W�
-�t�W

��
-��>
-�
-
-�
-
���'2".4>
"

2>
4&
&546
��֛[[���֛[[�
���rr���rr�����[���֛[[���֛;r���rr���]�$�
�
��(
76#!"&?
&#"

2>
53".4>32��
-���m�t�rr���r�[���֛[[��u�$���
-�Lr���rr�tu֛[[���֛[
��5
76#!"&?
&#"
#4>323#"'&5463!2
32>
�����n�t�r�[��u��[��u���
h
-�n�t�r$����Kr�tu֛[��u֛[v�
-
h�Lr�
-d��/?O_o��!2#!"&546!"3!2654&32
+
"&=
463!2
#!"&=
4632
+
"&=
463!2
#!"&=
4632
+
"&=
463!2
#!"&=
4632
+
"&=
463!2
#!"&=
46}
-
-��
-���
-
-R
-�2
-
-2
-�
�
-
-�>
-�2
-
-2
-�
�
-
-�>
-�2
-
-2
-�
�
-
-�>
-�2
-
-2
-�
�
-
-�>
-�
-��
-
-~
-�
-��
-
-R
-d
-2
-
-2
-
-2
-
-2
-�
-2
-
-2
-
-2
-
-2
-�
-2
-
-2
-
-2
-
-2
-�
-2
-
-2
-
-2
-
-2
-L�#
54&#!"
#"3!2654&#!546;
2
�uS��Rvd);;)�);;)��� �SuvR�;)��);;)X);��dLL	732#462#".
'.#"#"'&5>
763276}2
-d�!C@1?*'),GUKx;(.9)-EgPL
-��3
-0�[;P$

9
�7W
W��!1A2+
"&54.
 
+
"&54>
32+
"&546!32+
"&546
��ޣc
-2
-�����
-2
-c�*��`���c��t��
-
-
,�rr���
-
-
,tޣ���4
��4
��G�9
%6'%&+
"&546;
2762


"/
"/
&4?
'&4?
62
A
		���
-
-�Xx"xx"xx"ww".�
-�
-�
-
^
-�x"xx"ww"xx"�r�/
%6'%&+
"&546;
2%3
"/
.
7654'&6?
6
A
		���
-
-�
�
-`Z	HN.�
-�
-�
-
^
-d
	���	

g~�j�b�1K
3#"/
.
7654&'&6?
6%6'%&+
"&546;
2%3
"/
.
7654'&6?
6��D@
-	*o;7	*��
		���
-
-�
�
-`Z	HN�
	��i�T	
"��Z�G	!��
-�
-�
-
^
-d
	���	

g~�j
��	!%-;?CGKO
3#!#!
#3!##5!!!!#53#53
3!353
3##5#535#5!!#53#53
#53!5!
�dd�pd
�������dX��
,
�
,��dd�dd�D���d
��d�dd�
,�D
,ddd�dd�dd
���
,�dddX�d�
,
,�d��
,��
,�ddd��
�d��dddd�d���
,�ddd��ddd	��#7#3#3
#3#3
#3
!5!#53#53#53ddd�dd
����dd
,������
,�dd�dd
,�������������Pdd[[[[[
-��
	

"'
463&"26
���0�V

-
C;S;;S;��V�0�
�
-�;;T;;
-��
!	

"'
463!

"/
	
&"26
���0�V

-��08
��D��;S;;S;��V�0�
�
-�V�08
���;;T;;
d��&
!2
&54&#!"
3!2#!"&54?
6
,9K@
-
-�D@
-�
-
-��
-��K�|@
-�
-@
-
-�J
-
-��
���L�
-!2	
46� �>�>���
��C��EU
!"

3!26?
6'.

#"

#!"&/
.
+
";
26=
463!2
;
2654&
!"
3!26/
.
6�D
N9
-
�
->S

V�
-N
-��
-N
-�
-
-�
-
-�
-
-�
-���
-&
-X
-&�
-��l		l
-
-�p
	�	

	�	

-�v
-
-�
-
-�
-
-�
-��
-�
-
-�
-d�L!)1
32
32#!"&546;
>
35"264$2"&4
��8]4$�);;)�);;)�	'3]
�d�Ͼ������V<<V<L);;;)��);;)X);E5+��ddF�����<V<<V5�� #	


!526/
!3!567>
?

!�
�(%	
-�_5,R�y:"	*2��8
��
T���2*
BBW-ޑY".BB%

��Z
�d��'2;
#!5>
54.'52%32654.+
32654&+
�50;*7Xml0�);
!
�9uc>--���Ni*S>v�PR}^��
3:R.CuN7Y3(;	G
)IsC3[:+	1aJ);4��ePZ�
�o�

!56764.'&'5mSB�	,J���
�95(��1(aaR@	9���%/
#4.+

!52>5#"#!#3'3#72&�2�p"�&2���KK}}KK}� 
��
dd
	R
 
,��১ �!����%/
#4.+

!52>5#"#!5!'7!5L2&�2�p"�&2�C��১ � 
�v
dd
	�
 
,��}KK}}KK�L/?!2
#!"&=
46!2
#!"&=
46!2
#!"&=
46!2
#!"&=
462X���� ��L��Ldd��dd��dd��dd�L/?!2
#!"&=
46!2
#!"&=
46!2
#!"&=
46!2
#!"&=
46���D�L�����D�L��Ldd��dd��dd��dd�L/?
5463!2
#!"&
5463!2
#!"&5463!2
#!"&
5463!2
#!"&
�X���p��� ����L���dd��dd��dd��dd�L/?!2
#!"&=
46!2
#!"&=
46!2
#!"&=
46!2
#!"&=
462L��L��L��L��Ldd��dd��dd��dd�L/?O_o32
+
"&=
46)
2
#!"&=
46
32
+
"&=
46)
2
#!"&=
46
32
+
"&=
46)
2
#!"&=
46
32
+
"&=
46)
2
#!"&=
462dd
A ����dd
A ����dd
A ����dd
A ��Ldddd��dddd��dddd��dddd���L#*:J!#;2
+
"&=
46!2
#!"&=
465#535!2
#!"&=
46!2
#!"&=
46
�dd�dd
�������
�
,��X��Ldd��dd�}KdK�dd��ddL#*:J32
+
"&=
46
#3
!2
#!"&=
463#'7!2
#!"&=
46!2
#!"&=
462ddgdd��
��/�ȧ���
,��X��Ldd��L��dd�dK}}�dd��dd���!2#!"&546	K�,,�,,���
,�,�v,,�,�D
,
,�L!2#!"&5467'
2"&4,X��J�
*J
%���pNNpNL��d����
>��
�tNoOOo�6�
2


.'&54>"264�u�sFE�66	!^Xm)<Ds��������x�us�m�?>!fh�H�uX�yH������2".4>

"


��֛[[���֛[[�
Kt�rr��[���֛[[���֛�oVr���ru�5
.54>6?
6&'.'&76#&*IOWN>%3Vp}?T�|J$?LWPI�)(
!1		) H�uwsu�EG�^F&:c�YE�vsxv���!K�:%A'#"
-A)Y�
�l*/
7>

%!2!"3!26=
7#!"&546	
7
�l
-l�
�27���);;)
�);Ȼ��p���8���7
c�s
*
-s�
�;)�);;)��������
�������2�
c�L6
!#"3!2657#!"&546

&'5&>75>

^
i�4�);;)
�);ȹ��p���
S��
9dTX
-.9I@F*
L�6;)�);;)�g����
�������	�

0!;bA4
�
-�L5
!2!"3!26=
7#!"&546	
62

"/
&4?
62
2
^
^<C���);;)
�);ȹ��p���
�
�e���eoL�;)�);;)E�ۥ���
����3
�e���eo

-
-��;	
62
+
3546

&=
#32
"'
&6;
5#'
&47
6
35#"&
>


-��
-
��
-Ȫ
-����
-��
-��

-ȯ
-�
��
-ȭ
-����
-��
-��

-ȭ
-
	

-��
-
��L32
6'
+
"&546�d
��0dL�J
��
��J�
�L#32
6
6'
'
+
"&5462d
�
��0�0dL�J
��J
��
��J
��J�
��3
'
'
&47
6
6��0�
�
��
��J
�*
��J
�
�36

&546�.��2����d��32+
"&546!32+
"&546���
������ �� 
�dL�
#!"&5463!2L�� ��� 
3
46

&5
&546
�
���0d
�� *� 
��;�
���O#
72#"&5
&5
&546
46
46dd�1�2
�
�N
�

��:	
��9	�	�>
�	�=
�

,�L
32+
"&5
&546
46Rdd�0
�L�
��;��;
�d��H	
#!"&7
62
!2
#!"&=
46�
�	��	
�*����9���Hdd
���uJ		
u��
`���(������(&

;��(J	
'	
7(���
a���#���
a
a���32".4>
#"
#"
;
;
26=
326=
4&+
54&
��֛[[���֛[[�
}d��d���[���֛[[���֛��d��d���2".4>

!"
3!26=
4&
��֛[[���֛[[�E�
��[���֛[[���֛�~dd��32".4>
"
'&"


2?
2?
64/
764/

��֛[[���֛[[�
�	xx		�		xx		�		xx		�		xx		��[���֛[[���֛�	xx		�		xx		�		xx		�		xx		���$2".4>

'&"

27
64/
&"
��֛[[���֛[[�
T��
w��[���֛[[���֛�1U��
w���;K2".4>
";
7>
32";
2>54.#"
;
26=
4&
��֛[[���֛[[�
?<B2!�


�(#"3D<:�
-
-�
-�[���֛[[���֛�/O2*(8\6/H*	��
-�
-
-�
-��>2".4>
#"
;
26=
4&#"
;
#"
3!26=
4&+
4&
��֛[[���֛[[�
��
-
-�
-
-�
-
-KK
-
-
^
-
-K�[���֛[[���֛V
-�
-
-�
-��
-2
-�
-2
-
-2
-

-��/_
32

32
+

+
"&=
.
'#"&=
46;
>
7546+
"&=

32
+

546;
2
>
7#"&=
46;
.

�
-g��
-
-��g
-�
-g��
-
-��g�
-�
-Df�
-
-�fD
-�
-Df�
-
-�f�
-��g
-�
-g��
-
-��g
-�
-g��
-�ͨ
-
-�fD
-�
-Df�
-
-�fD
-�
-Df��?2".4>
"

2>
4&

"/
"/
&4?
'&4?
62
762
��֛[[���֛[[�
���rr���rr�@||@||@||@||�[���֛[[���֛;r���rr���Z@||@||@||@||��02".4>
"

2>
4&
"/
&4?
62
762
��֛[[���֛[[�
���rr���rr�j���jO��[���֛[[���֛;r���rr���}j���jO���!2".4>
"

&
32>
54
��֛[[���֛[[�
Kt�rAKi���hst�r�[���֛[[���֛;r�txiKA���>r�ts
S��
6!2
#!'
&4'
-&����F
�
-�����
-

�
&
S��	

&5!"&=
463!46
-����&��U
&
�U
-
#�
#
-
�]�	
#!+
"&5!"&7
62�
�
-�����
-

�
&�����&
-
�]�
32!2
"'
&63!46&�
#
-
�U
&
�U
-
#�����
-&
��]	

&5>746
-��^���$,[��~U�U
&
�U
-
#$DuMi��qF

-��+
!2/
"/
&4?
'&6
!"&546
762

R
,^�j�^�!��^�j�^���^�j�^�P
,^�j�^IIgg+

#!"&546
762
!2/
"/
&4?
'&6�j�^��^��
,^�j�^`j�^
,^�����^�j�^��/2".4>
#"
;
2676&#"
;
26=
4&
��֛[[���֛[[�
��:#6#:1�
-
-�
-�[���֛[[���֛���
.�
-�
-
-�
-��IUaho
2

76?
67632

;
2
+
"
!#!54&+
"&=
46;
2654?
67>;
26/
.
'&
;
26!"&5)
#!
	�&�0



-=
-
-2
-�p��p
-2
-
-=	��
-�
-
-3�5�3
-
-���
-
�X
-���
-
v
	
v
-!{,	
-2
-
-�
,�ԯ
-
-2
-0�y�
-
-�
-��
-�
-
-�r
-
w��
-
���+I
6.
'&&

&547>
7>
'.
>
7>&


67>7>7>
�-Bla�b�D8=3�*U 	:1'Ra\�{�%&�=>8\tYR-!�q[Fak[)����ȕX1

�"@&J<7_�?3J5%#/D	&/q!!6ROg58<'([@1%@_U2
]r�O

.>
7'&767>.
'&'.
'&>77>
.'&>�'
-'8GB 
-
-
	`�H 
>JS>H7
'+"	NA
-5M[`/Pg!;('2"&"IbY�C�e\D9$886#1%)*����J7gG: 
 8G\au9h�oK$�]54<<E"5cQ8	
.@AU!U�hQ)��j�F?Q2".4>&"&5476&
2>76&'&
6?
6&'&'.
��{nO9:On{���{nO:9On{���FZ
2Z_���_Z2Z��#		%8-#,-"F-I\b\I*I\b\I--I\b\I*I\b\I�9>|��|;7Es1$F^D10E^E$1u$/D0
"%,I����';L!#7.54>32737
7>
76&'&%
7.
5476&
6?'&'.
P�[�vY,9On{�R=A �&/l�'Pj�R.Mv&6�QFZ
*HLh5)k�|#		%8-,-"xatzbI\b\I-y�R�U�4Zrnc�1�?1FrEs1<QA9
��n;7p$/D0
V,I���('
6
#!"&%!546;
2
!
32

+
"&/
&6Z�8�%��%

-
Y
-�
-
Y�Ch�:#6#:d*!�� GD�K
-
-K����
d��(2


'%
/
&=
47&=
467
4L|X
k��d��d��
k�X>����1)
���]@	��	@]
�
)1
E
S>L�'+/37;?CGKOSW[_c
32
32
!546;
546;
2
!546
#!"&5353353353353353533533533533535335335335335Rd2��2d
�
�dddddddddd�|ddddddddd�|ddddddddd�2��222�p���dddddddddd�dddddddddd�ddddddddddw�%7

&=
#
!"&=
46;

3546
'#"&=
463!

&=
#'73546o��������X����z�
#���z���*����dX����zd�M�*����z�
�L!2#!
#"&546d�);;)����d);;L;)��);��
,;)X);dL�	?32
!546!32
!546
".5!
2>&54=
��������
(Lf���fL(
,
'6B6'
������p��)IjV\>((>\VjI)
,�	+'%!	!%'*�
���L�
	
'
L������'
��
a���'
�M�	7	
M�����
a
a��'���
a�Qd_�)
!232
"/
&6;
!%+
!!"&5#"&?
62
����*�������
�����*�����
����p�&�
��032
!2
#!!2+
"&=
!"&=
#"&/
#"&468^&�d,!��02*��*�6��%�%+�*2222	
-�*�L
!53463!2!!��P�;)
,);�D��P�dd);;)����L3463!2!
!
���;)
,*:
�
,���P
, �pX);;)�d�D�

Ek�
+
32
"/
&6;
#"&?
62{����*����*������Y�


D�k

&=
!/
&4?
6
!546�������X`�)�	��	�)�	��	��	!
.
#!"!"
3!26=
4&53353��$�`$�-�);;)�);;��ddd
��-(�d;)d);;)d);�dddd��d�L#12"&54%##"+
"&'=
454>
;
%
".=
4>7i**d�]&/T7���"L��R�����
Q�
����
)2(
Jf�,5
32

32#"./
.
46;
7>
7'&6327
"&)^Sz?vdj�O9t\U>/v?zS$24517F8�%M���)(
-()�
GM~ ��1==
��
7'''7'7'7'77 �N괴�N�-��-�N괴�N�-���N�-��-�N괴�N�-��-�N괴d��!-=
32
!2

+
"&/
#"&54?>

335!75
32+
"&546�2(<
H(<�,�F=-7�`
1d�d����>2�vdd�Q,�}Q,d-��!2$'
�$��(d����d
w}����
��L 0<
32
#!
+
"&/&546;
632+
"&546!#
35'!5X�,�<(��<(21
`�7-=|��dd_�d�d22
��L!��-d,Qv�,Q(��$
�'$dd�
�d���ԯ�}
wdO7G
%6


!2+

#!"&5467!>
;
26&#!*.'&?
'32+
"&546
d
kn

T
.TlnTj����:d
%���8
-	
�V�Oddi�p
&yL�N��(�

%
-H�	Y
S(22
�S��
���d�O6F
#!"&'#"&463!'&6?
6*#!32!7%32+
"&546
�
n
����jUmlT
.U

nJ�	
-
�%��
&j��PddO�
��
�(
SN�Ly&
p��
d(��Y
����
�aL7G2

#!"&/
&?
>

454&/
!7%.
!2
#!"&=
46
ސN
S(�
��%
-	�p
&y�22
�S�
�Y��(�
��nTj����
kn

T
.T���8
-	
�V��d
%��dd���-I
!26=
4&#!"

"&5&/
&7>3!2
766=
467%'
^
��
N�Ly&
p�


�(���S�
22(
SYLdd��jTnlT
.T

n
k���
���V�
	
-�8��
%d��%2".4>

%&
!"
3!7%64
��֛[[���֛[[������
-
-

�[���֛[[���֛�9�
-�
-�
-�
-
�
&��%2".4>


6=
!26=
4&#!54&
��֛[[���֛[[�
%��


-
-���[���֛[[���֛��
&
�
-�
-�
-�
-��%2".4>

&";
;
265326
��֛[[���֛[[�K�
&
�
-�
-�
-�
-�[���֛[[���֛�@
����
-
-
��%2".4>
#"#"276&+
4&
��֛[[���֛[[�
��
-�
-
�
&
�
-��[���֛[[���֛�
-����


-����2".4>
%&

2
7
7>7.
'.
'"'&65.
'6.
'&767
>'&>
7>7&72267.'4>&'
?
6.'
.'>
72>

��՛\\���՛\\�
d+:
-=?
1	"
"/?9
#hu!$
0E.(,3
)
(
	 	
-*!A
7,8
!?*
-
-�\���՛\\���՛	'"r"v	G
-	.&*
-r$> 

#
1

	


-
% 
*
-	'"
	

$g2(
	%
-
��
67
'
"/
&47
&6�������PM<�;��+oX"O�\e��~Y�+"��n+We�`��#'7;!2
#!"&=
46#3!2
#!"&=
46!!!2
#!"&=
46!!d�);;)�);;����);;)�);;�
���);;)�);;��
,�;)d);;)d);dd�;)d);;)d);dd�;)d);;)d);dddL�!2#!"&46

!���|;�����**�D���
�
�d��%
32
!2!5#!463!54635
#!"&=

��);
,);���;)
,;)�
�;)�);�;)d;)�pdd
�);d);ddd�D�);;)���+AW!2

"/
&546)
2/
"/
&4?
'&6

#!"&546
76276#!"&?
'&4?
622
,^�j�^5
,^�j�^�/j�^��^��^��^�j�^�j�^
,��^�j�^�&j�^
,^��^��^�j��#;CK2".4>
"

2>
4&$2"&4$2#"'"&546?&542"&4$2"&4
��ݟ__���ݠ^^�
��oo��oo�--  - 
L-  73H3)z
	��-  - -  - �_���ݠ^^���ݟWo��oo�� -!!-  -!
-�$33$ 1~
� -  -  -  -
��Z��[%
676&'&#"
327
6'.
#"

&477>
32
#"&'&67
67632


'.
"
�[v_"A0?! ��-
	Y7J3$$
��)
G"#A.,=
#(wn�kV8@Fv"0D
�G([kPHNg8B�*�
�[eb�2!��5(7>B3$$'��
)
M"#!
7)/c#*xn�fL@9N�D
�H7!$�W]�B�$&dX�DD
>.54>
"".#"2>767>54&�0{xuX6Cy��>>��xC8Zvxy
#!?2-*!')-?"CoA23:+1!
"3)@+)?j�DH-Sv@9y��UU��y9@vS-H-&65&&56&oM8J41<*.0(@	)*D*2Om9��w�.2

&/
7'
/
&47
7

"/
&4?


��B�B8"._��{�i�BB
i
-	�BB��B�B�BB7._�
��B�B^*k"5._��{�j�B�B
�Fi	�B�B��BB�B�B77/_�
����2#!"&54>
!"264��d:;)��);<f>X��V==V=�.2�G);;)�3-��D��=V==V
��	
"/

'

'!
'&462�
*$��������
3�
,
#*���*#��������

4�
$*
'	�2@K
#.'#5&'.
'3
'.54>75
>4.�&ER<,�
3'@"<P7(��d�W(�WJ.BN0 2Uh:**&	h)1"37�N,?iB$.,��
-<d>��MOW(kVMb
O/9X6FpH*M�
6&+���	 4C4%
df��J
2
#4.#"
3#>
36327#".


'>7>
'#53&'.>
761T�^�'<;%T)��-6"b �"S5268 jt&'V7	0$ݦ
--$a�P�N(?",9J0*	d2�>2
-
"�
"�

-7�Gd/9+DAL!X����
32
"/
&6;
3+
##"&?
62
���*�����Ȗ�*
,�����|������%
#5##!
32
"/
&6;
3353!57#5!�ddd
,����*���
�dc������
,�dd
��|���d����d��d����!%
32
"/
&6;
33!57#5!#5##!35
���*���X������
,ddd
,�d
,�����d��d�Pdd
�d����L�
32
"/
&6;
3
##53#5#!35
���*���Xdd�dd�
,�d
,����
�d�Pd
�d����L�
32
"/
&6;
3
#5#!35##53
���*����d�
,�d
dd�
,����d
�d����
�d����
32
"/
&6;
3#53!5!!5!!5!
���*���
���d��
,d�p
�d�
�
,���������������
32
"/
&6;
3!5!!5!!5!#53
���*��� �
�d�p
�d��
,d��
,�����������LL
!2#!"&546!"3!2654&
^
������p���g�);;)
�);;L���p����
����;)�);;)
�);LL+
!2#!"&546!"3!2654&
&546
^
������p���d�);;)
�);;�o��L���p����
����;)�);;)
�);��$�
�LL+
!2#!"&546!"3!2654&!2
"/
&6
^
������p���g�);;)
�);;�
��$�L���p����
����;)�);;)
�);���LL+
!2#!"&546!"3!2654&#!"&?
62
^
������p���g�);;)
�);;����p�$L���p����
����;)�);;)
�);���L5
!2#!"&=
463!2654&#!"&=
46

&=
#"&=
46;
546&
������p
�);;)�>�
D����L���p��d;)
�);d���&��
-���
-
���#
%2"
+
'&7>
?
!"'&766763	�
,
����			P''��
-K

�	�	
-�S
#����	�nnV
/��L5
!2
#!"3!2
#!"&546

&=
#"&=
46;
546
^
��>);;)
��p����
D����Ld;)�);d��
������&��
-���
-��1
!2/

"/
&47
'&6
#"3!26=
7#!"&5463!�
�m��)�
8m��);;)
�);Ȼ��p����
,��pm���)
8m��;)�);;)���֥���
�����#2".4>
"

2>
4&2"&4
��ٝ]]���ٝ]]�
���qq���qq�{�rr�r�]���ٝ]]���ٝGq���qq���sr�rr�L�#
3232
"'
&6;
46
!2
!54635
���
-��'
��
	������gd����V
�
^�|��d22L�#	
+
+
"&=
#"&7
>

!2
!54635G
z
-�"��
'�����gd��M ��!
����d22LK"	
62

"'
&4?
62!2
!54635
�
q����������gd�
q���
#�����d22L�	#'762
'&476
#"&?
'7
!2
!54635��*M�M�
����=���gd��M�L*����
��:��d22L�#'

/
'7'&6"/
&4?

!2
!54635
^W
Лԛ��L*�M�����gd�
��КԚ��PM�*M�X��d22����%	
!	

�����q��3�g
�q
�����dL�
+
!#"&546;
!3#53L��D��
�d�dd���
��p���
,��E��/

'&"
!#"&546;
!3#53

"/
&4?
62

62L��_		��Ȗ�
�d�dd
�j�\�jO
)���_		��p���
,����j�[�jO
)
�>
'.

!#"&546;
!3#53


"/
"/
&4?
'&4?
62
762Lg�%������
�d�dd
�F��F)��)F��F)��)���g����p���
,����F)��)F��F)��)F����/
!"
!#"&546;
!3#5332
32
"/
&6;
546L�����
�d�dd�d��*�������p���
,����������/
'&"
!#"&546;
!3#53+
+
"&=
#"&?
62L�*���n��
�d�dd���d��*��p����p���
,����������L	!2
!546
#!"&5!52L�P���d
�L������&����}��-1;

&=
!5!546
#"&=
46;
#53
76
!!/
&4#5;2
+
����p
��/22�dd���
��p��ddd33��*��Ȗ��d������Ȗ�*y�dd��Q
%6+
"&5.546%2

+
"&5.54>32
3<
>32
34>^
%�"%��

-�"

-
d	

d
	1t��
�
5
gD�
�>?1)�A
�..@
�

��
^

��
^

d�L3
"
!5265!3!52>54&/
5!"!4&#5�"2�pK�K�p"2
�K
�KL8

-��
88
%
��v%
88

-x
88
%�v
�%
8LL $(4
!2
#5'!7!!2#!"&546!5
5%!5#!!'!73�
wi����pd
w�%
,);;)��);;)
,��p
��
,���d��d
��i��bb�d�;)�);;)
�);d����������f�dd�
��&76


7>



".'.7�.�wf��w3��
.1LOefx;JwF2
��1v��ev�/�
 5Cc;J�|sU@�L#A2
/
.
=
& 
&=
>2



#!"&=
467
54>
���ud?,		����
1;ft�pR&


m��
m&L!(("
-
-�""��""�
'$+ ��
-
-2��2��2
/2
!��
'
!'3353353
!2+
!7#"&46!2
!546L��������������J��L�P���
�������*dd*��22d�L	
#"!4&
#"!4&
!46;
2�d);
,;
gd);
,;���;)d);L;)��);��;)�D�);��
�);;)���L%)!2#!"&546!#3!535#!#33��|��|�D|����������
,
�d��ddL�|�|��|
�|���D��d��dd
,d��d
�d��
,���L%)!2#!"&546!
#5##3353#33��|��|�D|����dddddd
�d��ddL�|�|��|
�|���D�����
���d��d
�d��
,���L#!2#!"&546!#3!!#3!!��|��|�D|��������
,
�����
,L�|�|��|
�|���D����d
�d��d
����L!2#!"&546!
-


��|��|�D|������
,
���L�|�|��|
�|���D������
,���L )!2#!"&546!!!#";

32654&#��|��|�D|���d�D�d�&96)���)69&L�|�|��|
�|���D���
�dVAAT
,��TAAV���L%)!2#!"&546!#3!535#!
##53#53��|��|�D|����������
,
�dd��ddL�|�|��|
�|���D��d��dd
,�
�d�d���L#'!2#!"&546!3!3
##5335
#53��|��|�D|����D���dXdd���d
,ddL�|�|��|
�|���D���p
��
�d�����d���L"&!2#!"&546!
#575#5!
##53#53��|��|�D|�����d��
,
�dd��ddL�|�|��|
�|���D��p�2Ȗd�
�d�d		��%2".4>
"

2>
4&!!!'57!
��۞^^���۞^^�
���qq���qql��
,��dd
,�^���۞^^���۞Lq���qq�����dd�d		��'+2".4>
"

2>
4&#'##!35
��۞^^���۞^^�
���qq���qql2ddd�d
,���^���۞^^���۞Lq���qq����d2d2dd
�ddd�����A 6
2632+
54&#!"
#"&5467&54>
3232
"/
&6;
46
�n�,,.x��x����PpVAb�z�
-�
-
�
&
�
-�Awa����sOEkd�b��
-����

-�����A3
2632
&"
#"&5467&54>
+
+
"&5#"&76762
�n�,+.y�
xZ��
%
��	OqVAb���
-�
-�
-�
-
�Awa�xc�
h��sOEkd�c�����
-
-
�
dLm%5!
3
3	
3
3
!#"
!54&#�
��������Ԫ����
�2
�dd
,
,
M������d22
y7�/
2
#"'2
!54635#"&547.
546324&546X^�Y{;2	iJ7-��-7Ji/9iJ��qY�Z=gJi�22�iJX5Jit�'��*BJb{

"&'&7>
2"

3276767>
/
&'&"

327>
7>
/
&'&&"267"


327>
76&/
&"

327>
76&/
&�oOOoS���SoOOoS����=y�"
$GF`
	Pu
"Q9	�c�cc�cVQ:	Pu
"�GF`
	y�"
$�o����oSWWSo
+
+oSWW
"�y	
`FG#
�uP
	
:Q#�cc�cc:Q#uP
	
$`FG#

"�y	
d��"
!#5!!463!
#53'353!"&5+
�
,�����
-?
,�d��Ԣd��u
-�
-� �����
-���������
-
���
-d��	!
!	
463!
#5##5#7!"&=
)
+
5�
,����
-?
,�>�d�Ԫ��
-
|
-� ��
^��G
-����|����d
-77
-P��
#3!#732!!34>
3!
!��dd�Ԣ���!
,���d!s����
,
� �d
,��+$d��
�$+�p�p
�LL29
32
32
#!"&=
46;
54652#!"'7
4633!26
5#535�d2��2
s);;)��
���;)X>
,>X�����L2dd2��;)��);�
F
D);�>XX��Ԣd�d�L6=
32
32
#!"&=
46;
54652#3#!"&54633!26
5#535
�d2��2
s);��!��);;)X>
,>X
����L2dd2��;)���$+;) );�>XX��Ԣd����	
#!"&7
62#"
;
2676&35�} ,�, }@D�:#6#:�����&77&P'�L��
.�dd	LL/?O_o�
32
+
"&=
4632
+
"&=
46!32
+
"&=
46
32
+
"&=
46!32
+
"&=
46!32
+
"&=
46
32
+
"&=
46!32
+
"&=
46!32
+
"&=
46
��
-
-�
-
-�
-
-�
-
��
-
-�
-���
-
-�
-
��
-
-�
-
��
-
-�
-���
-
-�
-
��
-
-�
-
��
-
-�
-L
-�
-
-�
-��
-�
-
-�
-
-�
-
-�
-��
-�
-
-�
-
-�
-
-�
-
-�
-
-�
-��
-�
-
-�
-
-�
-
-�
-
-�
-
-�
-�)3
3#!2
!&/
&63!5#5353
!2+
!7#"&46!2
!546�dd
^>1B)(��()B1>
^dd��>���J�
�L�P��dO7�S33S�7Od�d�|*dd*��22�+52#4!!2
!'&63!&54!2+
!%5#"&46!2
!5460P9�<
:
H)"��Z�"
-)
H���
�J
��L�P;))�%&!��!&��*����*��22��$.2"&432!65463
!2+
!7#"&46!2
!546
�jj�j�."+'��'+#���
��J��L�P�j�jj���9:LkkL:9�r*dd*��22�,6
2
"&5477'632!65463
!2+
!7#"&46!2
!546X/[3o�o"�o�"."+'��'+#���
��J��L�Pk�6NooN>Q�o��
-9:LkkL:9�r*dd*��22�",
!!.
54>7
!2+
!7#"&46!2
!546X
,��%??M��<=Bm�J���
��J��L�P���9fQ?HS�TT�vK�~*dd*��22��)2


!546754!2#3#3#3#!"&546/R;.6�p6.d
�6\������uS�pSuu;)N\6226\N)�G6.dddddSuuS
�Sud��LL/3!2#!"&546!2
#!"/
!"&4?
!"&=
46!'���|�
-
-���
%
X��W
&
���
-
�d
DdL�
��D
-2
-�
%
XX
%
�
-2
-ddd�L#-7!2
#4&+
"#4&+
"#546!2!46+
"&=
!+
"&=
� Sud;)�);d;)�);du�);�P;�d�dLuS�);;));;)�Su�;)��
,);�2222
��
	

!
&47
62	!2
!546
������  
'Y��
V
/��� �|��UY�Y
(�n��
0
U�22�!�/
.
#!"3!26=
326!546;
546;
332
32!�'�p'�q*}���20�/2�
������22
,��2��
"
!#!
5463!
#5
!#!"&5463!
#5�
,
-����
-
w
,���
,
-�v
-
-
w
,� ��
-O
,T
-������
-
-�
-�����dGFV
32676'&7>

+



+
"&?
+
"'
+
"&?
&/
.
=
46;
67'&6;
6#"
;
26=
4&
��K�jIC
-
-
-)V=>8'"d1*�)"dT,�|-o�t
E�
-
-�
-GAk�I
-! "%,=?W7|&�F@�Je5&2WO_e_
-2
-
-2
-����~	$4<Rb
%6

%32
!2
&'&#!"&=
46#"
;
2654&'&"264
7>


?

&/
&6%

?
6'.
'.
�
�. ��+jCHf7�"	*:��>XX�P*� 
�@--@-�� -?0
!3P/|)�(	
)f!%
=��&*
x�"6�2&�CX>�>X�83D�-@--@�ۂ
-# �=I+E(	/�/}X&+	5!H	d9�Q`o
32


2#+
"&=
#+
"&=
#"&=
46;
#"&=
46;
546;
2
3546!2>574.#
!2>574.#q�
-Oh

 ..40:*"6-@#
-�
-d
-�
-�
-
-KK
-
-�
-�
-d�
)

)��
k)

)�
-m!mJ.M-(2N-;]<*K
-
-KK
-
-K
-�
-X
-�
-K
-
-KK
-���
-"�p�
-"��),!2

#!"&'.546"
!7.#�Vz$�R��R�(z �}VG+�0� )IU!���zV�`3�BBWwvXZ�3
�Vz�&--%��,(1#��
��
32#!"&546
+
"&=

ۖg�T)�>)T�
H6�6�g�)TT)
�g���66���
33#!"&546
+
"&=

�`��T)�>)T�
H6�6���B)TT)
�g���66�	
%'5754&>?
'	
%5%����Nd��d


/��
\����
^
^���<��ǔ�Ȗ�

-(A
�b�����d
�� 2"&4$2"&4$2"&4�|XX|X
�|XX|X
�|XX|X X|XX|XX|XX|XX|XX|
��L2"&42"&42"&4
�|XX|XX|XX|XX|XX|XLX|XX|��X|XX|��X|XX|ddLL/!2
#!"&=
46!2
#!"&=
46!2
#!"&=
46}�
-
-�J
-
-�
-
-�J
-
-�
-
-�J
-L
-�
-
-�
-�p
-�
-
-�
-�p
-�
-
-�
-��/3
!2#!"&546!"3!2654&!2#!"&546!5
^
������������);;)X);;��
��G
���������
����;)��);;)X);d��
,d��
dd�L;!2+
32+
32+
32#!"&46;
5#"&46;
5#"&46;
5#"&46��222222�222222L*�*�*�**�*�*�*
,��
*

.
6
2"&%#46
2"&%#46"&=
32�W??WW??��|�|���|���|�|���|��*(�C��BB�����|�||�|��԰|�||�|��Ӑ�
�����B
76


+
2+
"47&"+
".543#"&'&67
6


/
!'.
6�E
*

'?)��
-T��0I'
*L
-#3�{�,#
-n��
6F82
 ��*<SC#

-
(#(��(#��%C
#4.+

!52>5#"#!
#4.+
3#525#"#5!�2&�2�p"�&2��D
-d
�2d
-
�� 
��
dd
	R
 
,�
-
�W

22
�

-�L� 0
5"'.
/

#


!5"&?
!#


#!"&=
463!2���E��	
1;E
%=
!'��y
���
,2 "
-��#	22+.��"A2
�
V����dd��GJ!2#!"&546#"

3!26=
4&#"'&?
!#"
3!26=
4&'"'&'#
&#2L��FF
��&	
7
-
-?

-9
9
���g���LR� 
22��22
$��
��#'
!5!!2#!"&546)
2#!"&546!��P���
��pm
��pG
,Ld��|��p
�d��
,��#'!2#!"&546
!2#!"&546!!5!2
��pm
��pG
,��P���|���p
�d��
,��dd��'+!235463!2
3##!"&=
##!"&546
!2
�d
�dd�pd�p�
,�����d���� ����
,��'3#3!2#!"&546!
!2#!"&546ddd�
��pG
,����|�d�p
�d��
,��p
�dL�'+
32+
!2#!"&5463!5#"&546;
53!X��
��|
^��d�
,L�pd�p
�d
�d���
,��'!#3!2#!"&546!
!2#!"&546�dd�v
��pG
,����|�d�p
�d��
,��p
�

,0o�	
#"&54632
a�
�5���*

A2�~	
6'
&4
O
�**�{
�)�)
�*
2
A~�!2
"'
&6d�)�*��*�
�*
2
,~o	
#!"&7
62{
�)�)
�*a�**
��(
-

5-
5
!5!��L
��c��� ����������d��1
#3!35#5!
34>;

!5".5323!�������
,�P2&d2
�"d&2���dd
,dd� 
��
dd
	&
 
,L�%1
#4.+

!52>5#"#!
#3!35#5! 2&d2�p"d&2 
,������
,� 
��
dd
	&
 
,��dd
,dd
�frJ
32	
+
"'
&47
6��
-�0
�
-�
-�)
�
-J�0�0	
�
�	

>f�J
32

+
"&7	
&6
S�
-
��)
-
�
-
��0
-J	�)�)	
�
�
f�Jr

"'
&=
46	
4	�)�)	
�
�w
-�
-�)
�
-
�
-�0
�
f
>J�	

'	
&=
47
62j
�	�0�0	
���)
-
�
-
��0
-�
-
����=�:
#4632
67>"&#""'./
.
>
'&6�|��Vd&O"(P3G*+
*3M,
:IG79_7&%*>7F1�
�|�|���
5KmCKG\JBktl$#?hI7 ����!2+
&5#"&546!5�X����
,��p��	�
�ddd�L�!2%!#46
75��'=�DX�Dd

d�Q,�[u�}�
4�]dd

Mo�__<���vs��vs��Q���
���Q���
�
�(
���d���p��
�
E���
H

E�d�{����
������������	�d������������&�n����d��d��d�����d�������d��d���������d�����5�d������!���������������u����
-����������������
,�d���
;�������������������I����]����������d����d������Q����
E�
�����J��������a�����������d��d9�
'd�ddd����������������		����dy'ddd���d
�����d��d
�dd
,��d
,
A22�
>ff���****���
N
N
N
N
N
N
N
N
N
N
N
N
N
N
�"~���Fn��2b��\�r� b�b�	6	�	�	�
-(
-L
-�
-�0��X
*
^
�h�(��T��*v�
-8|�t�*�<��6`��R�.j����(h����6h��^�2��Dl���.v�b� F �!2!v!�"@"�"�##"#8#z#�#�$$0$^$�$�%4%`%�&&~&�'P'�'�(4(p(�)�)�*&*J*�+
-+z,,h,�,�--�-�.(.f.�.�//F/~/�/�0>0�0�11`1�1�2$2^2�2�3"3>3h3�44`4�4�5,5�5�6>6|6�77N7�7�88B8�8�9
-9J9�9�::l:�:�;�;�<<P<�<�=2=�>:>�>�?(?n?�?�@H@�@�AA~BB�B�CCBCvC�C�DD`D�D�EZE�FFtF�F�G6GvG�G�HH2HNHjH�H�II8I^I�I�JJ.JR

�

@.�

	j
	
(|
	�
	L�
	8�
	x
6
	6
�
	
�
		
�
	$
	$4
	$X
	�|
	�0�
	��www.glyphicons.comCopyright � 2014 by Jan Kovarik. All rights reserved.GLYPHICONS HalflingsRegular1.009;UKWN;GLYPHICONSHalflings-RegularGLYPHICONS Halflings RegularVersion 1.009;PS 001.009;hotconv 1.0.70;makeotf.lib2.5.58329GLYPHICONSHalflings-RegularJan KovarikJan Kovarikwww.glyphicons.comwww.glyphicons.comwww.glyphicons.comWebfont 1.0Wed Oct 29 06:36:07 2014Font Squirrel��2




�




	

-









�












 
!
"
#
$
%
&
'
(
)
*
+
,
-
.
/
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
{
|
}
~

�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
	
-
glyph1glyph2uni00A0uni2000uni2001uni2002uni2003uni2004uni2005uni2006uni2007uni2008uni2009uni200Auni202Funi205FEurouni20BDuni231Buni25FCuni2601uni26FAuni2709uni270FuniE001uniE002uniE003uniE005uniE006uniE007uniE008uniE009uniE010uniE011uniE012uniE013uniE014uniE015uniE016uniE017uniE018uniE019uniE020uniE021uniE022uniE023uniE024uniE025uniE026uniE027uniE028uniE029uniE030uniE031uniE032uniE033uniE034uniE035uniE036uniE037uniE038uniE039uniE040uniE041uniE042uniE043uniE044uniE045uniE046uniE047uniE048uniE049uniE050uniE051uniE052uniE053uniE054uniE055uniE056uniE057uniE058uniE059uniE060uniE062uniE063uniE064uniE065uniE066uniE067uniE068uniE069uniE070uniE071uniE072uniE073uniE074uniE075uniE076uniE077uniE078uniE079uniE080uniE081uniE082uniE083uniE084uniE085uniE086uniE087uniE088uniE089uniE090uniE091uniE092uniE093uniE094uniE095uniE096uniE097uniE101uniE102uniE103uniE104uniE105uniE106uniE107uniE108uniE109uniE110uniE111uniE112uniE113uniE114uniE115uniE116uniE117uniE118uniE119uniE120uniE121uniE122uniE123uniE124uniE125uniE126uniE127uniE128uniE129uniE130uniE131uniE132uniE133uniE134uniE135uniE136uniE137uniE138uniE139uniE140uniE141uniE142uniE143uniE144uniE145uniE146uniE148uniE149uniE150uniE151uniE152uniE153uniE154uniE155uniE156uniE157uniE158uniE159uniE160uniE161uniE162uniE163uniE164uniE165uniE166uniE167uniE168uniE169uniE170uniE171uniE172uniE173uniE174uniE175uniE176uniE177uniE178uniE179uniE180uniE181uniE182uniE183uniE184uniE185uniE186uniE187uniE188uniE189uniE190uniE191uniE192uniE193uniE194uniE195uniE197uniE198uniE199uniE200uniE201uniE202uniE203uniE204uniE205uniE206uniE209uniE210uniE211uniE212uniE213uniE214uniE215uniE216uniE218uniE219uniE221uniE223uniE224uniE225uniE226uniE227uniE230uniE231uniE232uniE233uniE234uniE235uniE236uniE237uniE238uniE239uniE240uniE241uniE242uniE243uniE244uniE245uniE246uniE247uniE248uniE249uniE250uniE251uniE252uniE253uniE254uniE255uniE256uniE257uniE258uniE259uniE260uniF8FFu1F511u1F6AA
TP�
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 9e61285..0000000
Binary files a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2 b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2
deleted file mode 100644
index 64539b5..0000000
Binary files a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
deleted file mode 100644
index c8f82e5..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.3.4 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.4",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.4",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active"));a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.4",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=c(d),f={relatedTarget:this};e.hasClass("open")&&(e.trigger(b=a.Event("hide.bs.dropdown",f)),b.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f)))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.4",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="menu"]',g.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="listbox"]',g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.4",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in").attr("aria-hidden",!1),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a('<div class="modal-backdrop '+e+'" />').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport),this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c&&c.$tip&&c.$tip.is(":visible")?void(c.hoverState="in"):(c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.options.container?a(this.options.container):this.$element.parent(),p=this.getPosition(o);h="bottom"==h&&k.bottom+m>p.bottom?"top":"top"==h&&k.top-m<p.top?"bottom":"right"==h&&k.right+l>p.width?"left":"left"==h&&k.left-l<p.left?"right":h,f.removeClass(n).addClass(h)}var q=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(q,h);var r=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",r).emulateTransitionEnd(c.TRANSITION_DURATION):r()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top=b.top+g,b.left=b.left+h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type)})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.4",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.4",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.4",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){
-var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.4",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a(document.body).height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
deleted file mode 100644
index 34d5513..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-!function(){function n(n){return n&&(n.ownerDocument||n.document||n).documentElement}function t(n){return n&&(n.ownerDocument&&n.ownerDocument.defaultView||n.document&&n||n.defaultView)}function e(n,t){return t>n?-1:n>t?1:n>=t?0:0/0}function r(n){return null===n?0/0:+n}function u(n){return!isNaN(n)}function i(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)<0?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)>0?u=i:r=i+1}return r}}}function o(n){return n.length}function a(n){for(var t=1;n*t%1;)t*=10;return t}function c(n,t){for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}function l(){this._=Object.create(null)}function s(n){return(n+="")===pa||n[0]===va?va+n:n}function f(n){return(n+="")[0]===va?n.slice(1):n}function h(n){return s(n)in this._}function g(n){return(n=s(n))in this._&&delete this._[n]}function p(){var n=[];for(var t in this._)n.push(f(t));return n}function v(){var n=0;for(var t in this._)++n;return n}function d(){for(var n in this._)return!1;return!0}function m(){this._=Object.create(null)}function y(n){return n}function M(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function x(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var e=0,r=da.length;r>e;++e){var u=da[e]+t;if(u in n)return u}}function b(){}function _(){}function w(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new l;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function S(){ta.event.preventDefault()}function k(){for(var n,t=ta.event;n=t.sourceEvent;)t=n;return t}function E(n){for(var t=new _,e=0,r=arguments.length;++e<r;)t[arguments[e]]=w(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=ta.event;u.target=n,ta.event=u,t[u.type].apply(e,r)}finally{ta.event=i}}},t}function A(n){return ya(n,_a),n}function N(n){return"function"==typeof n?n:function(){return Ma(n,this)}}function C(n){return"function"==typeof n?n:function(){return xa(n,this)}}function z(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=ta.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function q(n){return n.trim().replace(/\s+/g," ")}function L(n){return new RegExp("(?:^|\\s+)"+ta.requote(n)+"(?:\\s+|$)","g")}function T(n){return(n+"").trim().split(/^|\s+/)}function R(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=T(n).map(D);var u=n.length;return"function"==typeof t?r:e}function D(n){var t=L(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",q(u+" "+n))):e.setAttribute("class",q(u.replace(t," ")))}}function P(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function U(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function j(n){function t(){var t=this.ownerDocument,e=this.namespaceURI;return e?t.createElementNS(e,n):t.createElement(n)}function e(){return this.ownerDocument.createElementNS(n.space,n.local)}return"function"==typeof n?n:(n=ta.ns.qualify(n)).local?e:t}function F(){var n=this.parentNode;n&&n.removeChild(this)}function H(n){return{__data__:n}}function O(n){return function(){return ba(this,n)}}function I(n){return arguments.length||(n=e),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function Y(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function Z(n){return ya(n,Sa),n}function V(n){var t,e;return function(r,u,i){var o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<c;);return o}}function X(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=c(t,ra(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+ta.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),c=$;a>0&&(n=n.slice(0,a));var l=ka.get(n);return l&&(n=l,c=B),a?t?u:r:t?b:i}function $(n,t){return function(e){var r=ta.event;ta.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{ta.event=r}}}function B(n,t){var e=$(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function W(e){var r=".dragsuppress-"+ ++Aa,u="click"+r,i=ta.select(t(e)).on("touchmove"+r,S).on("dragstart"+r,S).on("selectstart"+r,S);if(null==Ea&&(Ea="onselectstart"in e?!1:x(e.style,"userSelect")),Ea){var o=n(e).style,a=o[Ea];o[Ea]="none"}return function(n){if(i.on(r,null),Ea&&(o[Ea]=a),n){var t=function(){i.on(u,null)};i.on(u,function(){S(),t()},!0),setTimeout(t,0)}}}function J(n,e){e.changedTouches&&(e=e.changedTouches[0]);var r=n.ownerSVGElement||n;if(r.createSVGPoint){var u=r.createSVGPoint();if(0>Na){var i=t(n);if(i.scrollX||i.scrollY){r=ta.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var o=r[0][0].getScreenCTM();Na=!(o.f||o.e),r.remove()}}return Na?(u.x=e.pageX,u.y=e.pageY):(u.x=e.clientX,u.y=e.clientY),u=u.matrixTransform(n.getScreenCTM().inverse()),[u.x,u.y]}var a=n.getBoundingClientRect();return[e.clientX-a.left-n.clientLeft,e.clientY-a.top-n.clientTop]}function G(){return ta.event.changedTouches[0].identifier}function K(n){return n>0?1:0>n?-1:0}function Q(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function nt(n){return n>1?0:-1>n?qa:Math.acos(n)}function tt(n){return n>1?Ra:-1>n?-Ra:Math.asin(n)}function et(n){return((n=Math.exp(n))-1/n)/2}function rt(n){return((n=Math.exp(n))+1/n)/2}function ut(n){return((n=Math.exp(2*n))-1)/(n+1)}function it(n){return(n=Math.sin(n/2))*n}function ot(){}function at(n,t,e){return this instanceof at?(this.h=+n,this.s=+t,void(this.l=+e)):arguments.length<2?n instanceof at?new at(n.h,n.s,n.l):bt(""+n,_t,at):new at(n,t,e)}function ct(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,new mt(u(n+120),u(n),u(n-120))}function lt(n,t,e){return this instanceof lt?(this.h=+n,this.c=+t,void(this.l=+e)):arguments.length<2?n instanceof lt?new lt(n.h,n.c,n.l):n instanceof ft?gt(n.l,n.a,n.b):gt((n=wt((n=ta.rgb(n)).r,n.g,n.b)).l,n.a,n.b):new lt(n,t,e)}function st(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),new ft(e,Math.cos(n*=Da)*t,Math.sin(n)*t)}function ft(n,t,e){return this instanceof ft?(this.l=+n,this.a=+t,void(this.b=+e)):arguments.length<2?n instanceof ft?new ft(n.l,n.a,n.b):n instanceof lt?st(n.h,n.c,n.l):wt((n=mt(n)).r,n.g,n.b):new ft(n,t,e)}function ht(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=pt(u)*Xa,r=pt(r)*$a,i=pt(i)*Ba,new mt(dt(3.2404542*u-1.5371385*r-.4985314*i),dt(-.969266*u+1.8760108*r+.041556*i),dt(.0556434*u-.2040259*r+1.0572252*i))}function gt(n,t,e){return n>0?new lt(Math.atan2(e,t)*Pa,Math.sqrt(t*t+e*e),n):new lt(0/0,0/0,n)}function pt(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function vt(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function dt(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function mt(n,t,e){return this instanceof mt?(this.r=~~n,this.g=~~t,void(this.b=~~e)):arguments.length<2?n instanceof mt?new mt(n.r,n.g,n.b):bt(""+n,mt,ct):new mt(n,t,e)}function yt(n){return new mt(n>>16,n>>8&255,255&n)}function Mt(n){return yt(n)+""}function xt(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function bt(n,t,e){var r,u,i,o=0,a=0,c=0;if(r=/([a-z]+)\((.*)\)/i.exec(n))switch(u=r[2].split(","),r[1]){case"hsl":return e(parseFloat(u[0]),parseFloat(u[1])/100,parseFloat(u[2])/100);case"rgb":return t(kt(u[0]),kt(u[1]),kt(u[2]))}return(i=Ga.get(n.toLowerCase()))?t(i.r,i.g,i.b):(null==n||"#"!==n.charAt(0)||isNaN(i=parseInt(n.slice(1),16))||(4===n.length?(o=(3840&i)>>4,o=o>>4|o,a=240&i,a=a>>4|a,c=15&i,c=c<<4|c):7===n.length&&(o=(16711680&i)>>16,a=(65280&i)>>8,c=255&i)),t(o,a,c))}function _t(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,c=(o+i)/2;return a?(u=.5>c?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=0/0,u=c>0&&1>c?0:r),new at(r,u,c)}function wt(n,t,e){n=St(n),t=St(t),e=St(e);var r=vt((.4124564*n+.3575761*t+.1804375*e)/Xa),u=vt((.2126729*n+.7151522*t+.072175*e)/$a),i=vt((.0193339*n+.119192*t+.9503041*e)/Ba);return ft(116*u-16,500*(r-u),200*(u-i))}function St(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function kt(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function Et(n){return"function"==typeof n?n:function(){return n}}function At(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),Nt(t,e,n,r)}}function Nt(n,t,e,r){function u(){var n,t=c.status;if(!t&&zt(c)||t>=200&&300>t||304===t){try{n=e.call(i,c)}catch(r){return void o.error.call(i,r)}o.load.call(i,n)}else o.error.call(i,c)}var i={},o=ta.dispatch("beforesend","progress","load","error"),a={},c=new XMLHttpRequest,l=null;return!this.XDomainRequest||"withCredentials"in c||!/^(http(s)?:)?\/\//.test(n)||(c=new XDomainRequest),"onload"in c?c.onload=c.onerror=u:c.onreadystatechange=function(){c.readyState>3&&u()},c.onprogress=function(n){var t=ta.event;ta.event=n;try{o.progress.call(i,c)}finally{ta.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(l=n,i):l},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(ra(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),c.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),c.setRequestHeader)for(var s in a)c.setRequestHeader(s,a[s]);return null!=t&&c.overrideMimeType&&c.overrideMimeType(t),null!=l&&(c.responseType=l),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,c),c.send(null==r?null:r),i},i.abort=function(){return c.abort(),i},ta.rebind(i,o,"on"),null==r?i:i.get(Ct(r))}function Ct(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function zt(n){var t=n.responseType;return t&&"text"!==t?n.response:n.responseText}function qt(){var n=Lt(),t=Tt()-n;t>24?(isFinite(t)&&(clearTimeout(tc),tc=setTimeout(qt,t)),nc=0):(nc=1,rc(qt))}function Lt(){var n=Date.now();for(ec=Ka;ec;)n>=ec.t&&(ec.f=ec.c(n-ec.t)),ec=ec.n;return n}function Tt(){for(var n,t=Ka,e=1/0;t;)t.f?t=n?n.n=t.n:Ka=t.n:(t.t<e&&(e=t.t),t=(n=t).n);return Qa=n,e}function Rt(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Dt(n,t){var e=Math.pow(10,3*ga(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function Pt(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r&&e?function(n,t){for(var u=n.length,i=[],o=0,a=r[0],c=0;u>0&&a>0&&(c+a+1>t&&(a=Math.max(1,t-c)),i.push(n.substring(u-=a,u+a)),!((c+=a+1)>t));)a=r[o=(o+1)%r.length];return i.reverse().join(e)}:y;return function(n){var e=ic.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"-",c=e[4]||"",l=e[5],s=+e[6],f=e[7],h=e[8],g=e[9],p=1,v="",d="",m=!1,y=!0;switch(h&&(h=+h.substring(1)),(l||"0"===r&&"="===o)&&(l=r="0",o="="),g){case"n":f=!0,g="g";break;case"%":p=100,d="%",g="f";break;case"p":p=100,d="%",g="r";break;case"b":case"o":case"x":case"X":"#"===c&&(v="0"+g.toLowerCase());case"c":y=!1;case"d":m=!0,h=0;break;case"s":p=-1,g="r"}"$"===c&&(v=u[0],d=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):("e"==g||"f"==g)&&(h=Math.max(0,Math.min(20,h)))),g=oc.get(g)||Ut;var M=l&&f;return function(n){var e=d;if(m&&n%1)return"";var u=0>n||0===n&&0>1/n?(n=-n,"-"):"-"===a?"":a;if(0>p){var c=ta.formatPrefix(n,h);n=c.scale(n),e=c.symbol+d}else n*=p;n=g(n,h);var x,b,_=n.lastIndexOf(".");if(0>_){var w=y?n.lastIndexOf("e"):-1;0>w?(x=n,b=""):(x=n.substring(0,w),b=n.substring(w))}else x=n.substring(0,_),b=t+n.substring(_+1);!l&&f&&(x=i(x,1/0));var S=v.length+x.length+b.length+(M?0:u.length),k=s>S?new Array(S=s-S+1).join(r):"";return M&&(x=i(k+x,k.length?s-b.length:1/0)),u+=v,n=x+b,("<"===o?u+n+k:">"===o?k+u+n:"^"===o?k.substring(0,S>>=1)+u+n+k.substring(S):u+(M?n:k+n))+e}}}function Ut(n){return n+""}function jt(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Ft(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new cc(e-1)),1),e}function i(n,e){return t(n=new cc(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{cc=jt;var r=new jt;return r._=n,o(r,t,e)}finally{cc=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var c=n.utc=Ht(n);return c.floor=c,c.round=Ht(r),c.ceil=Ht(u),c.offset=Ht(i),c.range=a,n}function Ht(n){return function(t,e){try{cc=jt;var r=new jt;return r._=t,n(r,e)._}finally{cc=Date}}}function Ot(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,c=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.slice(c,a)),null!=(u=sc[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=N[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),c=a+1);return o.push(n.slice(c,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&cc!==jt,o=new(i?jt:cc);return"j"in r?o.setFullYear(r.y,0,r.j):"w"in r&&("W"in r||"U"in r)?(o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+(r.Z/100|0),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,c=t.length,l=e.length;c>a;){if(r>=l)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=C[o in sc?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){_.lastIndex=0;var r=_.exec(t.slice(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){x.lastIndex=0;var r=x.exec(t.slice(e));return r?(n.w=b.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){E.lastIndex=0;var r=E.exec(t.slice(e));return r?(n.m=A.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){S.lastIndex=0;var r=S.exec(t.slice(e));return r?(n.m=k.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,N.c.toString(),t,r)}function c(n,t,r){return e(n,N.x.toString(),t,r)}function l(n,t,r){return e(n,N.X.toString(),t,r)}function s(n,t,e){var r=M.get(t.slice(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var f=n.dateTime,h=n.date,g=n.time,p=n.periods,v=n.days,d=n.shortDays,m=n.months,y=n.shortMonths;t.utc=function(n){function e(n){try{cc=jt;var t=new cc;return t._=n,r(t)}finally{cc=Date}}var r=t(n);return e.parse=function(n){try{cc=jt;var t=r.parse(n);return t&&t._}finally{cc=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ae;var M=ta.map(),x=Yt(v),b=Zt(v),_=Yt(d),w=Zt(d),S=Yt(m),k=Zt(m),E=Yt(y),A=Zt(y);p.forEach(function(n,t){M.set(n.toLowerCase(),t)});var N={a:function(n){return d[n.getDay()]},A:function(n){return v[n.getDay()]},b:function(n){return y[n.getMonth()]},B:function(n){return m[n.getMonth()]},c:t(f),d:function(n,t){return It(n.getDate(),t,2)},e:function(n,t){return It(n.getDate(),t,2)},H:function(n,t){return It(n.getHours(),t,2)},I:function(n,t){return It(n.getHours()%12||12,t,2)},j:function(n,t){return It(1+ac.dayOfYear(n),t,3)},L:function(n,t){return It(n.getMilliseconds(),t,3)},m:function(n,t){return It(n.getMonth()+1,t,2)},M:function(n,t){return It(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return It(n.getSeconds(),t,2)},U:function(n,t){return It(ac.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return It(ac.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return It(n.getFullYear()%100,t,2)},Y:function(n,t){return It(n.getFullYear()%1e4,t,4)},Z:ie,"%":function(){return"%"}},C={a:r,A:u,b:i,B:o,c:a,d:Qt,e:Qt,H:te,I:te,j:ne,L:ue,m:Kt,M:ee,p:s,S:re,U:Xt,w:Vt,W:$t,x:c,X:l,y:Wt,Y:Bt,Z:Jt,"%":oe};return t}function It(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function Yt(n){return new RegExp("^(?:"+n.map(ta.requote).join("|")+")","i")}function Zt(n){for(var t=new l,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Vt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Xt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e));return r?(n.U=+r[0],e+r[0].length):-1}function $t(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e));return r?(n.W=+r[0],e+r[0].length):-1}function Bt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Wt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.y=Gt(+r[0]),e+r[0].length):-1}function Jt(n,t,e){return/^[+-]\d{4}$/.test(t=t.slice(e,e+5))?(n.Z=-t,e+5):-1}function Gt(n){return n+(n>68?1900:2e3)}function Kt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Qt(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function ne(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function te(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function ee(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function re(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function ue(n,t,e){fc.lastIndex=0;var r=fc.exec(t.slice(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ie(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=ga(t)/60|0,u=ga(t)%60;return e+It(r,"0",2)+It(u,"0",2)}function oe(n,t,e){hc.lastIndex=0;var r=hc.exec(t.slice(e,e+1));return r?e+r[0].length:-1}function ae(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function ce(){}function le(n,t,e){var r=e.s=n+t,u=r-n,i=r-u;e.t=n-i+(t-u)}function se(n,t){n&&dc.hasOwnProperty(n.type)&&dc[n.type](n,t)}function fe(n,t,e){var r,u=-1,i=n.length-e;for(t.lineStart();++u<i;)r=n[u],t.point(r[0],r[1],r[2]);t.lineEnd()}function he(n,t){var e=-1,r=n.length;for(t.polygonStart();++e<r;)fe(n[e],t,1);t.polygonEnd()}function ge(){function n(n,t){n*=Da,t=t*Da/2+qa/4;var e=n-r,o=e>=0?1:-1,a=o*e,c=Math.cos(t),l=Math.sin(t),s=i*l,f=u*c+s*Math.cos(a),h=s*o*Math.sin(a);yc.add(Math.atan2(h,f)),r=n,u=c,i=l}var t,e,r,u,i;Mc.point=function(o,a){Mc.point=n,r=(t=o)*Da,u=Math.cos(a=(e=a)*Da/2+qa/4),i=Math.sin(a)},Mc.lineEnd=function(){n(t,e)}}function pe(n){var t=n[0],e=n[1],r=Math.cos(e);return[r*Math.cos(t),r*Math.sin(t),Math.sin(e)]}function ve(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function de(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function me(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function ye(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function Me(n){var t=Math.sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}function xe(n){return[Math.atan2(n[1],n[0]),tt(n[2])]}function be(n,t){return ga(n[0]-t[0])<Ca&&ga(n[1]-t[1])<Ca}function _e(n,t){n*=Da;var e=Math.cos(t*=Da);we(e*Math.cos(n),e*Math.sin(n),Math.sin(t))}function we(n,t,e){++xc,_c+=(n-_c)/xc,wc+=(t-wc)/xc,Sc+=(e-Sc)/xc}function Se(){function n(n,u){n*=Da;var i=Math.cos(u*=Da),o=i*Math.cos(n),a=i*Math.sin(n),c=Math.sin(u),l=Math.atan2(Math.sqrt((l=e*c-r*a)*l+(l=r*o-t*c)*l+(l=t*a-e*o)*l),t*o+e*a+r*c);bc+=l,kc+=l*(t+(t=o)),Ec+=l*(e+(e=a)),Ac+=l*(r+(r=c)),we(t,e,r)}var t,e,r;qc.point=function(u,i){u*=Da;var o=Math.cos(i*=Da);t=o*Math.cos(u),e=o*Math.sin(u),r=Math.sin(i),qc.point=n,we(t,e,r)}}function ke(){qc.point=_e}function Ee(){function n(n,t){n*=Da;var e=Math.cos(t*=Da),o=e*Math.cos(n),a=e*Math.sin(n),c=Math.sin(t),l=u*c-i*a,s=i*o-r*c,f=r*a-u*o,h=Math.sqrt(l*l+s*s+f*f),g=r*o+u*a+i*c,p=h&&-nt(g)/h,v=Math.atan2(h,g);Nc+=p*l,Cc+=p*s,zc+=p*f,bc+=v,kc+=v*(r+(r=o)),Ec+=v*(u+(u=a)),Ac+=v*(i+(i=c)),we(r,u,i)}var t,e,r,u,i;qc.point=function(o,a){t=o,e=a,qc.point=n,o*=Da;var c=Math.cos(a*=Da);r=c*Math.cos(o),u=c*Math.sin(o),i=Math.sin(a),we(r,u,i)},qc.lineEnd=function(){n(t,e),qc.lineEnd=ke,qc.point=_e}}function Ae(n,t){function e(e,r){return e=n(e,r),t(e[0],e[1])}return n.invert&&t.invert&&(e.invert=function(e,r){return e=t.invert(e,r),e&&n.invert(e[0],e[1])}),e}function Ne(){return!0}function Ce(n,t,e,r,u){var i=[],o=[];if(n.forEach(function(n){if(!((t=n.length-1)<=0)){var t,e=n[0],r=n[t];if(be(e,r)){u.lineStart();for(var a=0;t>a;++a)u.point((e=n[a])[0],e[1]);return void u.lineEnd()}var c=new qe(e,n,null,!0),l=new qe(e,null,c,!1);c.o=l,i.push(c),o.push(l),c=new qe(r,n,null,!1),l=new qe(r,null,c,!0),c.o=l,i.push(c),o.push(l)}}),o.sort(t),ze(i),ze(o),i.length){for(var a=0,c=e,l=o.length;l>a;++a)o[a].e=c=!c;for(var s,f,h=i[0];;){for(var g=h,p=!0;g.v;)if((g=g.n)===h)return;s=g.z,u.lineStart();do{if(g.v=g.o.v=!0,g.e){if(p)for(var a=0,l=s.length;l>a;++a)u.point((f=s[a])[0],f[1]);else r(g.x,g.n.x,1,u);g=g.n}else{if(p){s=g.p.z;for(var a=s.length-1;a>=0;--a)u.point((f=s[a])[0],f[1])}else r(g.x,g.p.x,-1,u);g=g.p}g=g.o,s=g.z,p=!p}while(!g.v);u.lineEnd()}}}function ze(n){if(t=n.length){for(var t,e,r=0,u=n[0];++r<t;)u.n=e=n[r],e.p=u,u=e;u.n=e=n[0],e.p=u}}function qe(n,t,e,r){this.x=n,this.z=t,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Le(n,t,e,r){return function(u,i){function o(t,e){var r=u(t,e);n(t=r[0],e=r[1])&&i.point(t,e)}function a(n,t){var e=u(n,t);d.point(e[0],e[1])}function c(){y.point=a,d.lineStart()}function l(){y.point=o,d.lineEnd()}function s(n,t){v.push([n,t]);var e=u(n,t);x.point(e[0],e[1])}function f(){x.lineStart(),v=[]}function h(){s(v[0][0],v[0][1]),x.lineEnd();var n,t=x.clean(),e=M.buffer(),r=e.length;if(v.pop(),p.push(v),v=null,r)if(1&t){n=e[0];var u,r=n.length-1,o=-1;if(r>0){for(b||(i.polygonStart(),b=!0),i.lineStart();++o<r;)i.point((u=n[o])[0],u[1]);i.lineEnd()}}else r>1&&2&t&&e.push(e.pop().concat(e.shift())),g.push(e.filter(Te))}var g,p,v,d=t(i),m=u.invert(r[0],r[1]),y={point:o,lineStart:c,lineEnd:l,polygonStart:function(){y.point=s,y.lineStart=f,y.lineEnd=h,g=[],p=[]},polygonEnd:function(){y.point=o,y.lineStart=c,y.lineEnd=l,g=ta.merge(g);var n=Fe(m,p);g.length?(b||(i.polygonStart(),b=!0),Ce(g,De,n,e,i)):n&&(b||(i.polygonStart(),b=!0),i.lineStart(),e(null,null,1,i),i.lineEnd()),b&&(i.polygonEnd(),b=!1),g=p=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}},M=Re(),x=t(M),b=!1;return y}}function Te(n){return n.length>1}function Re(){var n,t=[];return{lineStart:function(){t.push(n=[])},point:function(t,e){n.push([t,e])},lineEnd:b,buffer:function(){var e=t;return t=[],n=null,e},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function De(n,t){return((n=n.x)[0]<0?n[1]-Ra-Ca:Ra-n[1])-((t=t.x)[0]<0?t[1]-Ra-Ca:Ra-t[1])}function Pe(n){var t,e=0/0,r=0/0,u=0/0;return{lineStart:function(){n.lineStart(),t=1},point:function(i,o){var a=i>0?qa:-qa,c=ga(i-e);ga(c-qa)<Ca?(n.point(e,r=(r+o)/2>0?Ra:-Ra),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),n.point(i,r),t=0):u!==a&&c>=qa&&(ga(e-u)<Ca&&(e-=u*Ca),ga(i-a)<Ca&&(i-=a*Ca),r=Ue(e,r,i,o),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),t=0),n.point(e=i,r=o),u=a},lineEnd:function(){n.lineEnd(),e=r=0/0},clean:function(){return 2-t}}}function Ue(n,t,e,r){var u,i,o=Math.sin(n-e);return ga(o)>Ca?Math.atan((Math.sin(t)*(i=Math.cos(r))*Math.sin(e)-Math.sin(r)*(u=Math.cos(t))*Math.sin(n))/(u*i*o)):(t+r)/2}function je(n,t,e,r){var u;if(null==n)u=e*Ra,r.point(-qa,u),r.point(0,u),r.point(qa,u),r.point(qa,0),r.point(qa,-u),r.point(0,-u),r.point(-qa,-u),r.point(-qa,0),r.point(-qa,u);else if(ga(n[0]-t[0])>Ca){var i=n[0]<t[0]?qa:-qa;u=e*i/2,r.point(-i,u),r.point(0,u),r.point(i,u)}else r.point(t[0],t[1])}function Fe(n,t){var e=n[0],r=n[1],u=[Math.sin(e),-Math.cos(e),0],i=0,o=0;yc.reset();for(var a=0,c=t.length;c>a;++a){var l=t[a],s=l.length;if(s)for(var f=l[0],h=f[0],g=f[1]/2+qa/4,p=Math.sin(g),v=Math.cos(g),d=1;;){d===s&&(d=0),n=l[d];var m=n[0],y=n[1]/2+qa/4,M=Math.sin(y),x=Math.cos(y),b=m-h,_=b>=0?1:-1,w=_*b,S=w>qa,k=p*M;if(yc.add(Math.atan2(k*_*Math.sin(w),v*x+k*Math.cos(w))),i+=S?b+_*La:b,S^h>=e^m>=e){var E=de(pe(f),pe(n));Me(E);var A=de(u,E);Me(A);var N=(S^b>=0?-1:1)*tt(A[2]);(r>N||r===N&&(E[0]||E[1]))&&(o+=S^b>=0?1:-1)}if(!d++)break;h=m,p=M,v=x,f=n}}return(-Ca>i||Ca>i&&0>yc)^1&o}function He(n){function t(n,t){return Math.cos(n)*Math.cos(t)>i}function e(n){var e,i,c,l,s;return{lineStart:function(){l=c=!1,s=1},point:function(f,h){var g,p=[f,h],v=t(f,h),d=o?v?0:u(f,h):v?u(f+(0>f?qa:-qa),h):0;if(!e&&(l=c=v)&&n.lineStart(),v!==c&&(g=r(e,p),(be(e,g)||be(p,g))&&(p[0]+=Ca,p[1]+=Ca,v=t(p[0],p[1]))),v!==c)s=0,v?(n.lineStart(),g=r(p,e),n.point(g[0],g[1])):(g=r(e,p),n.point(g[0],g[1]),n.lineEnd()),e=g;else if(a&&e&&o^v){var m;d&i||!(m=r(p,e,!0))||(s=0,o?(n.lineStart(),n.point(m[0][0],m[0][1]),n.point(m[1][0],m[1][1]),n.lineEnd()):(n.point(m[1][0],m[1][1]),n.lineEnd(),n.lineStart(),n.point(m[0][0],m[0][1])))}!v||e&&be(e,p)||n.point(p[0],p[1]),e=p,c=v,i=d},lineEnd:function(){c&&n.lineEnd(),e=null},clean:function(){return s|(l&&c)<<1}}}function r(n,t,e){var r=pe(n),u=pe(t),o=[1,0,0],a=de(r,u),c=ve(a,a),l=a[0],s=c-l*l;if(!s)return!e&&n;var f=i*c/s,h=-i*l/s,g=de(o,a),p=ye(o,f),v=ye(a,h);me(p,v);var d=g,m=ve(p,d),y=ve(d,d),M=m*m-y*(ve(p,p)-1);if(!(0>M)){var x=Math.sqrt(M),b=ye(d,(-m-x)/y);if(me(b,p),b=xe(b),!e)return b;var _,w=n[0],S=t[0],k=n[1],E=t[1];w>S&&(_=w,w=S,S=_);var A=S-w,N=ga(A-qa)<Ca,C=N||Ca>A;if(!N&&k>E&&(_=k,k=E,E=_),C?N?k+E>0^b[1]<(ga(b[0]-w)<Ca?k:E):k<=b[1]&&b[1]<=E:A>qa^(w<=b[0]&&b[0]<=S)){var z=ye(d,(-m+x)/y);return me(z,p),[b,xe(z)]}}}function u(t,e){var r=o?n:qa-n,u=0;return-r>t?u|=1:t>r&&(u|=2),-r>e?u|=4:e>r&&(u|=8),u}var i=Math.cos(n),o=i>0,a=ga(i)>Ca,c=gr(n,6*Da);return Le(t,e,c,o?[0,-n]:[-qa,n-qa])}function Oe(n,t,e,r){return function(u){var i,o=u.a,a=u.b,c=o.x,l=o.y,s=a.x,f=a.y,h=0,g=1,p=s-c,v=f-l;if(i=n-c,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-c,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-l,v||!(i>0)){if(i/=v,0>v){if(h>i)return;g>i&&(g=i)}else if(v>0){if(i>g)return;i>h&&(h=i)}if(i=r-l,v||!(0>i)){if(i/=v,0>v){if(i>g)return;i>h&&(h=i)}else if(v>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:c+h*p,y:l+h*v}),1>g&&(u.b={x:c+g*p,y:l+g*v}),u}}}}}}function Ie(n,t,e,r){function u(r,u){return ga(r[0]-n)<Ca?u>0?0:3:ga(r[0]-e)<Ca?u>0?2:1:ga(r[1]-t)<Ca?u>0?1:0:u>0?3:2}function i(n,t){return o(n.x,t.x)}function o(n,t){var e=u(n,1),r=u(t,1);return e!==r?e-r:0===e?t[1]-n[1]:1===e?n[0]-t[0]:2===e?n[1]-t[1]:t[0]-n[0]}return function(a){function c(n){for(var t=0,e=d.length,r=n[1],u=0;e>u;++u)for(var i,o=1,a=d[u],c=a.length,l=a[0];c>o;++o)i=a[o],l[1]<=r?i[1]>r&&Q(l,i,n)>0&&++t:i[1]<=r&&Q(l,i,n)<0&&--t,l=i;return 0!==t}function l(i,a,c,l){var s=0,f=0;if(null==i||(s=u(i,c))!==(f=u(a,c))||o(i,a)<0^c>0){do l.point(0===s||3===s?n:e,s>1?r:t);while((s=(s+c+4)%4)!==f)}else l.point(a[0],a[1])}function s(u,i){return u>=n&&e>=u&&i>=t&&r>=i}function f(n,t){s(n,t)&&a.point(n,t)}function h(){C.point=p,d&&d.push(m=[]),S=!0,w=!1,b=_=0/0}function g(){v&&(p(y,M),x&&w&&A.rejoin(),v.push(A.buffer())),C.point=f,w&&a.lineEnd()}function p(n,t){n=Math.max(-Tc,Math.min(Tc,n)),t=Math.max(-Tc,Math.min(Tc,t));var e=s(n,t);if(d&&m.push([n,t]),S)y=n,M=t,x=e,S=!1,e&&(a.lineStart(),a.point(n,t));else if(e&&w)a.point(n,t);else{var r={a:{x:b,y:_},b:{x:n,y:t}};N(r)?(w||(a.lineStart(),a.point(r.a.x,r.a.y)),a.point(r.b.x,r.b.y),e||a.lineEnd(),k=!1):e&&(a.lineStart(),a.point(n,t),k=!1)}b=n,_=t,w=e}var v,d,m,y,M,x,b,_,w,S,k,E=a,A=Re(),N=Oe(n,t,e,r),C={point:f,lineStart:h,lineEnd:g,polygonStart:function(){a=A,v=[],d=[],k=!0},polygonEnd:function(){a=E,v=ta.merge(v);var t=c([n,r]),e=k&&t,u=v.length;(e||u)&&(a.polygonStart(),e&&(a.lineStart(),l(null,null,1,a),a.lineEnd()),u&&Ce(v,i,t,l,a),a.polygonEnd()),v=d=m=null}};return C}}function Ye(n){var t=0,e=qa/3,r=ir(n),u=r(t,e);return u.parallels=function(n){return arguments.length?r(t=n[0]*qa/180,e=n[1]*qa/180):[t/qa*180,e/qa*180]},u}function Ze(n,t){function e(n,t){var e=Math.sqrt(i-2*u*Math.sin(t))/u;return[e*Math.sin(n*=u),o-e*Math.cos(n)]}var r=Math.sin(n),u=(r+Math.sin(t))/2,i=1+r*(2*u-r),o=Math.sqrt(i)/u;return e.invert=function(n,t){var e=o-t;return[Math.atan2(n,e)/u,tt((i-(n*n+e*e)*u*u)/(2*u))]},e}function Ve(){function n(n,t){Dc+=u*n-r*t,r=n,u=t}var t,e,r,u;Hc.point=function(i,o){Hc.point=n,t=r=i,e=u=o},Hc.lineEnd=function(){n(t,e)}}function Xe(n,t){Pc>n&&(Pc=n),n>jc&&(jc=n),Uc>t&&(Uc=t),t>Fc&&(Fc=t)}function $e(){function n(n,t){o.push("M",n,",",t,i)}function t(n,t){o.push("M",n,",",t),a.point=e}function e(n,t){o.push("L",n,",",t)}function r(){a.point=n}function u(){o.push("Z")}var i=Be(4.5),o=[],a={point:n,lineStart:function(){a.point=t},lineEnd:r,polygonStart:function(){a.lineEnd=u},polygonEnd:function(){a.lineEnd=r,a.point=n},pointRadius:function(n){return i=Be(n),a},result:function(){if(o.length){var n=o.join("");return o=[],n}}};return a}function Be(n){return"m0,"+n+"a"+n+","+n+" 0 1,1 0,"+-2*n+"a"+n+","+n+" 0 1,1 0,"+2*n+"z"}function We(n,t){_c+=n,wc+=t,++Sc}function Je(){function n(n,r){var u=n-t,i=r-e,o=Math.sqrt(u*u+i*i);kc+=o*(t+n)/2,Ec+=o*(e+r)/2,Ac+=o,We(t=n,e=r)}var t,e;Ic.point=function(r,u){Ic.point=n,We(t=r,e=u)}}function Ge(){Ic.point=We}function Ke(){function n(n,t){var e=n-r,i=t-u,o=Math.sqrt(e*e+i*i);kc+=o*(r+n)/2,Ec+=o*(u+t)/2,Ac+=o,o=u*n-r*t,Nc+=o*(r+n),Cc+=o*(u+t),zc+=3*o,We(r=n,u=t)}var t,e,r,u;Ic.point=function(i,o){Ic.point=n,We(t=r=i,e=u=o)},Ic.lineEnd=function(){n(t,e)}}function Qe(n){function t(t,e){n.moveTo(t+o,e),n.arc(t,e,o,0,La)}function e(t,e){n.moveTo(t,e),a.point=r}function r(t,e){n.lineTo(t,e)}function u(){a.point=t}function i(){n.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=e},lineEnd:u,polygonStart:function(){a.lineEnd=i},polygonEnd:function(){a.lineEnd=u,a.point=t},pointRadius:function(n){return o=n,a},result:b};return a}function nr(n){function t(n){return(a?r:e)(n)}function e(t){return rr(t,function(e,r){e=n(e,r),t.point(e[0],e[1])})}function r(t){function e(e,r){e=n(e,r),t.point(e[0],e[1])}function r(){M=0/0,S.point=i,t.lineStart()}function i(e,r){var i=pe([e,r]),o=n(e,r);u(M,x,y,b,_,w,M=o[0],x=o[1],y=e,b=i[0],_=i[1],w=i[2],a,t),t.point(M,x)}function o(){S.point=e,t.lineEnd()}function c(){r(),S.point=l,S.lineEnd=s}function l(n,t){i(f=n,h=t),g=M,p=x,v=b,d=_,m=w,S.point=i}function s(){u(M,x,y,b,_,w,g,p,f,v,d,m,a,t),S.lineEnd=o,o()}var f,h,g,p,v,d,m,y,M,x,b,_,w,S={point:e,lineStart:r,lineEnd:o,polygonStart:function(){t.polygonStart(),S.lineStart=c
-},polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,l,s,f,h,g,p,v,d,m){var y=s-t,M=f-e,x=y*y+M*M;if(x>4*i&&d--){var b=a+g,_=c+p,w=l+v,S=Math.sqrt(b*b+_*_+w*w),k=Math.asin(w/=S),E=ga(ga(w)-1)<Ca||ga(r-h)<Ca?(r+h)/2:Math.atan2(_,b),A=n(E,k),N=A[0],C=A[1],z=N-t,q=C-e,L=M*z-y*q;(L*L/x>i||ga((y*z+M*q)/x-.5)>.3||o>a*g+c*p+l*v)&&(u(t,e,r,a,c,l,N,C,E,b/=S,_/=S,w,d,m),m.point(N,C),u(N,C,E,b,_,w,s,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Da),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function tr(n){var t=nr(function(t,e){return n([t*Pa,e*Pa])});return function(n){return or(t(n))}}function er(n){this.stream=n}function rr(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function ur(n){return ir(function(){return n})()}function ir(n){function t(n){return n=a(n[0]*Da,n[1]*Da),[n[0]*h+c,l-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(l-n[1])/h),n&&[n[0]*Pa,n[1]*Pa]}function r(){a=Ae(o=lr(m,M,x),i);var n=i(v,d);return c=g-n[0]*h,l=p+n[1]*h,u()}function u(){return s&&(s.valid=!1,s=null),t}var i,o,a,c,l,s,f=nr(function(n,t){return n=i(n,t),[n[0]*h+c,l-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,M=0,x=0,b=Lc,_=y,w=null,S=null;return t.stream=function(n){return s&&(s.valid=!1),s=or(b(o,f(_(n)))),s.valid=!0,s},t.clipAngle=function(n){return arguments.length?(b=null==n?(w=n,Lc):He((w=+n)*Da),u()):w},t.clipExtent=function(n){return arguments.length?(S=n,_=n?Ie(n[0][0],n[0][1],n[1][0],n[1][1]):y,u()):S},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Da,d=n[1]%360*Da,r()):[v*Pa,d*Pa]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Da,M=n[1]%360*Da,x=n.length>2?n[2]%360*Da:0,r()):[m*Pa,M*Pa,x*Pa]},ta.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function or(n){return rr(n,function(t,e){n.point(t*Da,e*Da)})}function ar(n,t){return[n,t]}function cr(n,t){return[n>qa?n-La:-qa>n?n+La:n,t]}function lr(n,t,e){return n?t||e?Ae(fr(n),hr(t,e)):fr(n):t||e?hr(t,e):cr}function sr(n){return function(t,e){return t+=n,[t>qa?t-La:-qa>t?t+La:t,e]}}function fr(n){var t=sr(n);return t.invert=sr(-n),t}function hr(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*r+a*u;return[Math.atan2(c*i-s*o,a*r-l*u),tt(s*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,l=Math.sin(t),s=l*i-c*o;return[Math.atan2(c*i+l*o,a*r+s*u),tt(s*r-a*u)]},e}function gr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=pr(e,u),i=pr(e,i),(o>0?i>u:u>i)&&(u+=o*La)):(u=n+o*La,i=n-.5*c);for(var l,s=u;o>0?s>i:i>s;s-=c)a.point((l=xe([e,-r*Math.cos(s),-r*Math.sin(s)]))[0],l[1])}}function pr(n,t){var e=pe(t);e[0]-=n,Me(e);var r=nt(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Ca)%(2*Math.PI)}function vr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function dr(n,t,e){var r=ta.range(n,t-Ca,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function mr(n){return n.source}function yr(n){return n.target}function Mr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),l=u*Math.sin(n),s=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(it(r-t)+u*o*it(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*s,u=e*l+t*f,o=e*i+t*a;return[Math.atan2(u,r)*Pa,Math.atan2(o,Math.sqrt(r*r+u*u))*Pa]}:function(){return[n*Pa,t*Pa]};return p.distance=h,p}function xr(){function n(n,u){var i=Math.sin(u*=Da),o=Math.cos(u),a=ga((n*=Da)-t),c=Math.cos(a);Yc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;Zc.point=function(u,i){t=u*Da,e=Math.sin(i*=Da),r=Math.cos(i),Zc.point=n},Zc.lineEnd=function(){Zc.point=Zc.lineEnd=b}}function br(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function _r(n,t){function e(n,t){o>0?-Ra+Ca>t&&(t=-Ra+Ca):t>Ra-Ca&&(t=Ra-Ca);var e=o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(qa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=K(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ra]},e):Sr}function wr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return ga(u)<Ca?ar:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-K(u)*Math.sqrt(n*n+e*e)]},e)}function Sr(n,t){return[n,Math.log(Math.tan(qa/4+t/2))]}function kr(n){var t,e=ur(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=qa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function Er(n,t){return[Math.log(Math.tan(qa/4+t/2)),-n]}function Ar(n){return n[0]}function Nr(n){return n[1]}function Cr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Q(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function zr(n,t){return n[0]-t[0]||n[1]-t[1]}function qr(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Lr(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],l=e[1],s=t[1]-c,f=r[1]-l,h=(a*(c-l)-f*(u-i))/(f*o-a*s);return[u+h*o,c+h*s]}function Tr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Rr(){tu(this),this.edge=this.site=this.circle=null}function Dr(n){var t=el.pop()||new Rr;return t.site=n,t}function Pr(n){Xr(n),Qc.remove(n),el.push(n),tu(n)}function Ur(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];Pr(n);for(var c=i;c.circle&&ga(e-c.circle.x)<Ca&&ga(r-c.circle.cy)<Ca;)i=c.P,a.unshift(c),Pr(c),c=i;a.unshift(c),Xr(c);for(var l=o;l.circle&&ga(e-l.circle.x)<Ca&&ga(r-l.circle.cy)<Ca;)o=l.N,a.push(l),Pr(l),l=o;a.push(l),Xr(l);var s,f=a.length;for(s=1;f>s;++s)l=a[s],c=a[s-1],Kr(l.edge,c.site,l.site,u);c=a[0],l=a[f-1],l.edge=Jr(c.site,l.site,null,u),Vr(c),Vr(l)}function jr(n){for(var t,e,r,u,i=n.x,o=n.y,a=Qc._;a;)if(r=Fr(a,o)-i,r>Ca)a=a.L;else{if(u=i-Hr(a,o),!(u>Ca)){r>-Ca?(t=a.P,e=a):u>-Ca?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Dr(n);if(Qc.insert(t,c),t||e){if(t===e)return Xr(t),e=Dr(t.site),Qc.insert(c,e),c.edge=e.edge=Jr(t.site,c.site),Vr(t),void Vr(e);if(!e)return void(c.edge=Jr(t.site,c.site));Xr(t),Xr(e);var l=t.site,s=l.x,f=l.y,h=n.x-s,g=n.y-f,p=e.site,v=p.x-s,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,M=v*v+d*d,x={x:(d*y-g*M)/m+s,y:(h*M-v*y)/m+f};Kr(e.edge,l,p,x),c.edge=Jr(l,n,null,x),e.edge=Jr(n,p,null,x),Vr(t),Vr(e)}}function Fr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,l=c-t;if(!l)return a;var s=a-r,f=1/i-1/l,h=s/l;return f?(-h+Math.sqrt(h*h-2*f*(s*s/(-2*l)-c+l/2+u-i/2)))/f+r:(r+a)/2}function Hr(n,t){var e=n.N;if(e)return Fr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Or(n){this.site=n,this.edges=[]}function Ir(n){for(var t,e,r,u,i,o,a,c,l,s,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Kc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)s=a[o].end(),r=s.x,u=s.y,l=a[++o%c].start(),t=l.x,e=l.y,(ga(r-t)>Ca||ga(u-e)>Ca)&&(a.splice(o,0,new Qr(Gr(i.site,s,ga(r-f)<Ca&&p-u>Ca?{x:f,y:ga(t-f)<Ca?e:p}:ga(u-p)<Ca&&h-r>Ca?{x:ga(e-p)<Ca?t:h,y:p}:ga(r-h)<Ca&&u-g>Ca?{x:h,y:ga(t-h)<Ca?e:g}:ga(u-g)<Ca&&r-f>Ca?{x:ga(e-g)<Ca?t:f,y:g}:null),i.site,null)),++c)}function Yr(n,t){return t.angle-n.angle}function Zr(){tu(this),this.x=this.y=this.arc=this.site=this.cy=null}function Vr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,l=r.y-a,s=i.x-o,f=i.y-a,h=2*(c*f-l*s);if(!(h>=-za)){var g=c*c+l*l,p=s*s+f*f,v=(f*g-l*p)/h,d=(c*p-s*g)/h,f=d+a,m=rl.pop()||new Zr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,M=tl._;M;)if(m.y<M.y||m.y===M.y&&m.x<=M.x){if(!M.L){y=M.P;break}M=M.L}else{if(!M.R){y=M;break}M=M.R}tl.insert(y,m),y||(nl=m)}}}}function Xr(n){var t=n.circle;t&&(t.P||(nl=t.N),tl.remove(t),rl.push(t),tu(t),n.circle=null)}function $r(n){for(var t,e=Gc,r=Oe(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Br(t,n)||!r(t)||ga(t.a.x-t.b.x)<Ca&&ga(t.a.y-t.b.y)<Ca)&&(t.a=t.b=null,e.splice(u,1))}function Br(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],l=t[1][1],s=n.l,f=n.r,h=s.x,g=s.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=l)return}else i={x:d,y:c};e={x:d,y:l}}else{if(i){if(i.y<c)return}else i={x:d,y:l};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=l)return}else i={x:(c-u)/r,y:c};e={x:(l-u)/r,y:l}}else{if(i){if(i.y<c)return}else i={x:(l-u)/r,y:l};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Wr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Jr(n,t,e,r){var u=new Wr(n,t);return Gc.push(u),e&&Kr(u,n,t,e),r&&Kr(u,t,n,r),Kc[n.i].edges.push(new Qr(u,n,t)),Kc[t.i].edges.push(new Qr(u,t,n)),u}function Gr(n,t,e){var r=new Wr(n,null);return r.a=t,r.b=e,Gc.push(r),r}function Kr(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Qr(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function nu(){this._=null}function tu(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function eu(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function ru(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function uu(n){for(;n.L;)n=n.L;return n}function iu(n,t){var e,r,u,i=n.sort(ou).pop();for(Gc=[],Kc=new Array(n.length),Qc=new nu,tl=new nu;;)if(u=nl,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Kc[i.i]=new Or(i),jr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;Ur(u.arc)}t&&($r(t),Ir(t));var o={cells:Kc,edges:Gc};return Qc=tl=Gc=Kc=null,o}function ou(n,t){return t.y-n.y||t.x-n.x}function au(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function cu(n){return n.x}function lu(n){return n.y}function su(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function fu(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&fu(n,c[0],e,r,o,a),c[1]&&fu(n,c[1],o,r,u,a),c[2]&&fu(n,c[2],e,a,o,i),c[3]&&fu(n,c[3],o,a,u,i)}}function hu(n,t,e,r,u,i,o){var a,c=1/0;return function l(n,s,f,h,g){if(!(s>i||f>o||r>h||u>g)){if(p=n.point){var p,v=t-n.x,d=e-n.y,m=v*v+d*d;if(c>m){var y=Math.sqrt(c=m);r=t-y,u=e-y,i=t+y,o=e+y,a=p}}for(var M=n.nodes,x=.5*(s+h),b=.5*(f+g),_=t>=x,w=e>=b,S=w<<1|_,k=S+4;k>S;++S)if(n=M[3&S])switch(3&S){case 0:l(n,s,f,x,b);break;case 1:l(n,x,f,h,b);break;case 2:l(n,s,b,x,g);break;case 3:l(n,x,b,h,g)}}}(n,r,u,i,o),a}function gu(n,t){n=ta.rgb(n),t=ta.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+xt(Math.round(e+i*n))+xt(Math.round(r+o*n))+xt(Math.round(u+a*n))}}function pu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=mu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function vu(n,t){return n=+n,t=+t,function(e){return n*(1-e)+t*e}}function du(n,t){var e,r,u,i=il.lastIndex=ol.lastIndex=0,o=-1,a=[],c=[];for(n+="",t+="";(e=il.exec(n))&&(r=ol.exec(t));)(u=r.index)>i&&(u=t.slice(i,u),a[o]?a[o]+=u:a[++o]=u),(e=e[0])===(r=r[0])?a[o]?a[o]+=r:a[++o]=r:(a[++o]=null,c.push({i:o,x:vu(e,r)})),i=ol.lastIndex;return i<t.length&&(u=t.slice(i),a[o]?a[o]+=u:a[++o]=u),a.length<2?c[0]?(t=c[0].x,function(n){return t(n)+""}):function(){return t}:(t=c.length,function(n){for(var e,r=0;t>r;++r)a[(e=c[r]).i]=e.x(n);return a.join("")})}function mu(n,t){for(var e,r=ta.interpolators.length;--r>=0&&!(e=ta.interpolators[r](n,t)););return e}function yu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(mu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function Mu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function xu(n){return function(t){return 1-n(1-t)}}function bu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function _u(n){return n*n}function wu(n){return n*n*n}function Su(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function ku(n){return function(t){return Math.pow(t,n)}}function Eu(n){return 1-Math.cos(n*Ra)}function Au(n){return Math.pow(2,10*(n-1))}function Nu(n){return 1-Math.sqrt(1-n*n)}function Cu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/La*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*La/t)}}function zu(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function qu(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Lu(n,t){n=ta.hcl(n),t=ta.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return st(e+i*n,r+o*n,u+a*n)+""}}function Tu(n,t){n=ta.hsl(n),t=ta.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return ct(e+i*n,r+o*n,u+a*n)+""}}function Ru(n,t){n=ta.lab(n),t=ta.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ht(e+i*n,r+o*n,u+a*n)+""}}function Du(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Pu(n){var t=[n.a,n.b],e=[n.c,n.d],r=ju(t),u=Uu(t,e),i=ju(Fu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*Pa,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*Pa:0}function Uu(n,t){return n[0]*t[0]+n[1]*t[1]}function ju(n){var t=Math.sqrt(Uu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function Fu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Hu(n,t){var e,r=[],u=[],i=ta.transform(n),o=ta.transform(t),a=i.translate,c=o.translate,l=i.rotate,s=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:vu(a[0],c[0])},{i:3,x:vu(a[1],c[1])})):r.push(c[0]||c[1]?"translate("+c+")":""),l!=s?(l-s>180?s+=360:s-l>180&&(l+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:vu(l,s)})):s&&r.push(r.pop()+"rotate("+s+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:vu(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:vu(g[0],p[0])},{i:e-2,x:vu(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Ou(n,t){return t=(t-=n=+n)||1/t,function(e){return(e-n)/t}}function Iu(n,t){return t=(t-=n=+n)||1/t,function(e){return Math.max(0,Math.min(1,(e-n)/t))}}function Yu(n){for(var t=n.source,e=n.target,r=Vu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function Zu(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Vu(n,t){if(n===t)return n;for(var e=Zu(n),r=Zu(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Xu(n){n.fixed|=2}function $u(n){n.fixed&=-7}function Bu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Wu(n){n.fixed&=-5}function Ju(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Ju(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var l=t*e[n.point.index];n.charge+=n.pointCharge=l,r+=l*n.point.x,u+=l*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Gu(n,t){return ta.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=ri,n}function Ku(n,t){for(var e=[n];null!=(n=e.pop());)if(t(n),(u=n.children)&&(r=u.length))for(var r,u;--r>=0;)e.push(u[r])}function Qu(n,t){for(var e=[n],r=[];null!=(n=e.pop());)if(r.push(n),(i=n.children)&&(u=i.length))for(var u,i,o=-1;++o<u;)e.push(i[o]);for(;null!=(n=r.pop());)t(n)}function ni(n){return n.children}function ti(n){return n.value}function ei(n,t){return t.value-n.value}function ri(n){return ta.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function ui(n){return n.x}function ii(n){return n.y}function oi(n,t,e){n.y0=t,n.y=e}function ai(n){return ta.range(n.length)}function ci(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function li(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function si(n){return n.reduce(fi,0)}function fi(n,t){return n+t[1]}function hi(n,t){return gi(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function gi(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function pi(n){return[ta.min(n),ta.max(n)]}function vi(n,t){return n.value-t.value}function di(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function mi(n,t){n._pack_next=t,t._pack_prev=n}function yi(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function Mi(n){function t(n){s=Math.min(n.x-n.r,s),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(l=e.length)){var e,r,u,i,o,a,c,l,s=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(xi),r=e[0],r.x=-r.r,r.y=0,t(r),l>1&&(u=e[1],u.x=u.r,u.y=0,t(u),l>2))for(i=e[2],wi(r,u,i),t(i),di(r,i),r._pack_prev=i,di(i,u),u=r._pack_next,o=3;l>o;o++){wi(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(yi(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!yi(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?mi(r,u=a):mi(r=c,u),o--):(di(r,i),u=i,t(i))}var m=(s+f)/2,y=(h+g)/2,M=0;for(o=0;l>o;o++)i=e[o],i.x-=m,i.y-=y,M=Math.max(M,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=M,e.forEach(bi)}}function xi(n){n._pack_next=n._pack_prev=n}function bi(n){delete n._pack_next,delete n._pack_prev}function _i(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)_i(u[i],t,e,r)}function wi(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),l=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+l*i,e.y=n.y+c*i-l*u}else e.x=n.x+r,e.y=n.y}function Si(n,t){return n.parent==t.parent?1:2}function ki(n){var t=n.children;return t.length?t[0]:n.t}function Ei(n){var t,e=n.children;return(t=e.length)?e[t-1]:n.t}function Ai(n,t,e){var r=e/(t.i-n.i);t.c-=r,t.s+=e,n.c+=r,t.z+=e,t.m+=e}function Ni(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i],t.z+=e,t.m+=e,e+=t.s+(r+=t.c)}function Ci(n,t,e){return n.a.parent===t.parent?n.a:e}function zi(n){return 1+ta.max(n,function(n){return n.y})}function qi(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Li(n){var t=n.children;return t&&t.length?Li(t[0]):n}function Ti(n){var t,e=n.children;return e&&(t=e.length)?Ti(e[t-1]):n}function Ri(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function Di(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function Pi(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ui(n){return n.rangeExtent?n.rangeExtent():Pi(n.range())}function ji(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Fi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Hi(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ml}function Oi(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=ta.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Ii(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?Oi:ji,c=r?Iu:Ou;return o=u(n,t,c,e),a=u(t,n,c,mu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Du)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Xi(n,t)},i.tickFormat=function(t,e){return $i(n,t,e)},i.nice=function(t){return Zi(n,t),u()},i.copy=function(){return Ii(n,t,e,r)},u()}function Yi(n,t){return ta.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Zi(n,t){return Fi(n,Hi(Vi(n,t)[2]))}function Vi(n,t){null==t&&(t=10);var e=Pi(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Xi(n,t){return ta.range.apply(ta,Vi(n,t))}function $i(n,t,e){var r=Vi(n,t);if(e){var u=ic.exec(e);if(u.shift(),"s"===u[8]){var i=ta.formatPrefix(Math.max(ga(r[0]),ga(r[1])));return u[7]||(u[7]="."+Bi(i.scale(r[2]))),u[8]="f",e=ta.format(u.join("")),function(n){return e(i.scale(n))+i.symbol}}u[7]||(u[7]="."+Wi(u[8],r)),e=u.join("")}else e=",."+Bi(r[2])+"f";return ta.format(e)}function Bi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Wi(n,t){var e=Bi(t[2]);return n in yl?Math.abs(e-Bi(Math.max(ga(t[0]),ga(t[1]))))+ +("e"!==n):e-2*("%"===n)}function Ji(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Fi(r.map(u),e?Math:xl);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=Pi(r),o=[],a=n[0],c=n[1],l=Math.floor(u(a)),s=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(s-l)){if(e){for(;s>l;l++)for(var h=1;f>h;h++)o.push(i(l)*h);o.push(i(l))}else for(o.push(i(l));l++<s;)for(var h=f-1;h>0;h--)o.push(i(l)*h);for(l=0;o[l]<a;l++);for(s=o.length;o[s-1]>c;s--);o=o.slice(l,s)}return o},o.tickFormat=function(n,t){if(!arguments.length)return Ml;arguments.length<2?t=Ml:"function"!=typeof t&&(t=ta.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return Ji(n.copy(),t,e,r)},Yi(o,n)}function Gi(n,t,e){function r(t){return n(u(t))}var u=Ki(t),i=Ki(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Xi(e,n)},r.tickFormat=function(n,t){return $i(e,n,t)},r.nice=function(n){return r.domain(Zi(e,n))},r.exponent=function(o){return arguments.length?(u=Ki(t=o),i=Ki(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Gi(n.copy(),t,e)},Yi(r,n)}function Ki(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Qi(n,t){function e(e){return i[((u.get(e)||("range"===t.t?u.set(e,n.push(e)):0/0))-1)%i.length]}function r(t,e){return ta.range(n.length).map(function(n){return t+e*n})}var u,i,o;return e.domain=function(r){if(!arguments.length)return n;n=[],u=new l;for(var i,o=-1,a=r.length;++o<a;)u.has(i=r[o])||u.set(i,n.push(i));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(i=n,o=0,t={t:"range",a:arguments},e):i},e.rangePoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=(c+l)/2,0):(l-c)/(n.length-1+a);return i=r(c+s*a/2,s),o=0,t={t:"rangePoints",a:arguments},e},e.rangeRoundPoints=function(u,a){arguments.length<2&&(a=0);var c=u[0],l=u[1],s=n.length<2?(c=l=Math.round((c+l)/2),0):(l-c)/(n.length-1+a)|0;return i=r(c+Math.round(s*a/2+(l-c-(n.length-1+a)*s)/2),s),o=0,t={t:"rangeRoundPoints",a:arguments},e},e.rangeBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=(f-s)/(n.length-a+2*c);return i=r(s+h*c,h),l&&i.reverse(),o=h*(1-a),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,a,c){arguments.length<2&&(a=0),arguments.length<3&&(c=a);var l=u[1]<u[0],s=u[l-0],f=u[1-l],h=Math.floor((f-s)/(n.length-a+2*c));return i=r(s+Math.round((f-s-(n.length-a)*h)/2),h),l&&i.reverse(),o=Math.round(h*(1-a)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return o},e.rangeExtent=function(){return Pi(t.a[0])},e.copy=function(){return Qi(n,t)},e.domain(n)}function no(n,t){function i(){var e=0,r=t.length;for(a=[];++e<r;)a[e-1]=ta.quantile(n,e/r);return o}function o(n){return isNaN(n=+n)?void 0:t[ta.bisect(a,n)]}var a;return o.domain=function(t){return arguments.length?(n=t.map(r).filter(u).sort(e),i()):n},o.range=function(n){return arguments.length?(t=n,i()):t},o.quantiles=function(){return a},o.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?a[e-1]:n[0],e<a.length?a[e]:n[n.length-1]]},o.copy=function(){return no(n,t)},i()}function to(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return to(n,t,e)},u()}function eo(n,t){function e(e){return e>=e?t[ta.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return eo(n,t)},e}function ro(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Xi(n,t)},t.tickFormat=function(t,e){return $i(n,t,e)},t.copy=function(){return ro(n)},t}function uo(){return 0}function io(n){return n.innerRadius}function oo(n){return n.outerRadius}function ao(n){return n.startAngle}function co(n){return n.endAngle}function lo(n){return n&&n.padAngle}function so(n,t,e,r){return(n-e)*t-(t-r)*n>0?0:1}function fo(n,t,e,r,u){var i=n[0]-t[0],o=n[1]-t[1],a=(u?r:-r)/Math.sqrt(i*i+o*o),c=a*o,l=-a*i,s=n[0]+c,f=n[1]+l,h=t[0]+c,g=t[1]+l,p=(s+h)/2,v=(f+g)/2,d=h-s,m=g-f,y=d*d+m*m,M=e-r,x=s*g-h*f,b=(0>m?-1:1)*Math.sqrt(M*M*y-x*x),_=(x*m-d*b)/y,w=(-x*d-m*b)/y,S=(x*m+d*b)/y,k=(-x*d+m*b)/y,E=_-p,A=w-v,N=S-p,C=k-v;return E*E+A*A>N*N+C*C&&(_=S,w=k),[[_-c,w-l],[_*e/M,w*e/M]]}function ho(n){function t(t){function o(){l.push("M",i(n(s),a))}for(var c,l=[],s=[],f=-1,h=t.length,g=Et(e),p=Et(r);++f<h;)u.call(this,c=t[f],f)?s.push([+g.call(this,c,f),+p.call(this,c,f)]):s.length&&(o(),s=[]);return s.length&&o(),l.length?l.join(""):null}var e=Ar,r=Nr,u=Ne,i=go,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=El.get(n)||go).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function go(n){return n.join("L")}function po(n){return go(n)+"Z"}function vo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function mo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function yo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function Mo(n,t){return n.length<4?go(n):n[1]+_o(n.slice(1,-1),wo(n,t))}function xo(n,t){return n.length<3?go(n):n[0]+_o((n.push(n[0]),n),wo([n[n.length-2]].concat(n,[n[1]]),t))}function bo(n,t){return n.length<3?go(n):n[0]+_o(n,wo(n,t))}function _o(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return go(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var l=2;l<t.length;l++,c++)i=n[c],a=t[l],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var s=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+s[0]+","+s[1]}return r}function wo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function So(n){if(n.length<3)return go(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",No(Cl,o),",",No(Cl,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),Co(c,o,a);return n.pop(),c.push("L",r),c.join("")}function ko(n){if(n.length<4)return go(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(No(Cl,i)+","+No(Cl,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),Co(e,i,o);return e.join("")}function Eo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[No(Cl,o),",",No(Cl,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),Co(t,o,a);return t.join("")}function Ao(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,l=-1;++l<=e;)r=n[l],u=l/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return So(n)}function No(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function Co(n,t,e){n.push("C",No(Al,t),",",No(Al,e),",",No(Nl,t),",",No(Nl,e),",",No(Cl,t),",",No(Cl,e))}function zo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function qo(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=zo(u,i);++t<e;)r[t]=(o+(o=zo(u=i,i=n[t+1])))/2;return r[t]=o,r}function Lo(n){for(var t,e,r,u,i=[],o=qo(n),a=-1,c=n.length-1;++a<c;)t=zo(n[a],n[a+1]),ga(t)<Ca?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function To(n){return n.length<3?go(n):n[0]+_o(n,Lo(n))}function Ro(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]-Ra,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Do(n){function t(t){function c(){v.push("M",a(n(m),f),s,l(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,M=t.length,x=Et(e),b=Et(u),_=e===r?function(){return g}:Et(r),w=u===i?function(){return p}:Et(i);++y<M;)o.call(this,h=t[y],y)?(d.push([g=+x.call(this,h,y),p=+b.call(this,h,y)]),m.push([+_.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=Ar,r=Ar,u=0,i=Nr,o=Ne,a=go,c=a.key,l=a,s="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r
-},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=El.get(n)||go).key,l=a.reverse||a,s=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function Po(n){return n.radius}function Uo(n){return[n.x,n.y]}function jo(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]-Ra;return[e*Math.cos(r),e*Math.sin(r)]}}function Fo(){return 64}function Ho(){return"circle"}function Oo(n){var t=Math.sqrt(n/qa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Io(n){return function(){var t,e;(t=this[n])&&(e=t[t.active])&&(--t.count?delete t[t.active]:delete this[n],t.active+=.5,e.event&&e.event.interrupt.call(this,this.__data__,e.index))}}function Yo(n,t,e){return ya(n,Pl),n.namespace=t,n.id=e,n}function Zo(n,t,e,r){var u=n.id,i=n.namespace;return Y(n,"function"==typeof e?function(n,o,a){n[i][u].tween.set(t,r(e.call(n,n.__data__,o,a)))}:(e=r(e),function(n){n[i][u].tween.set(t,e)}))}function Vo(n){return null==n&&(n=""),function(){this.textContent=n}}function Xo(n){return null==n?"__transition__":"__transition_"+n+"__"}function $o(n,t,e,r,u){var i=n[e]||(n[e]={active:0,count:0}),o=i[r];if(!o){var a=u.time;o=i[r]={tween:new l,time:a,delay:u.delay,duration:u.duration,ease:u.ease,index:t},u=null,++i.count,ta.timer(function(u){function c(e){if(i.active>r)return s();var u=i[i.active];u&&(--i.count,delete i[i.active],u.event&&u.event.interrupt.call(n,n.__data__,u.index)),i.active=r,o.event&&o.event.start.call(n,n.__data__,t),o.tween.forEach(function(e,r){(r=r.call(n,n.__data__,t))&&v.push(r)}),h=o.ease,f=o.duration,ta.timer(function(){return p.c=l(e||1)?Ne:l,1},0,a)}function l(e){if(i.active!==r)return 1;for(var u=e/f,a=h(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,n.__data__,t),s()):void 0}function s(){return--i.count?delete i[r]:delete n[e],1}var f,h,g=o.delay,p=ec,v=[];return p.t=g+a,u>=g?c(u-g):void(p.c=c)},0,a)}}function Bo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate("+(isFinite(r)?r:e(n))+",0)"})}function Wo(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate(0,"+(isFinite(r)?r:e(n))+")"})}function Jo(n){return n.toISOString()}function Go(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=ta.bisect(Vl,u);return i==Vl.length?[t.year,Vi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/Vl[i-1]<Vl[i]/u?i-1:i]:[Bl,Vi(n,e)[2]]}return r.invert=function(t){return Ko(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Ko)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Ko(+e+1),t).length}var i=r.domain(),o=Pi(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Fi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Ko(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Ko(+t+1);return t}}:n))},r.ticks=function(n,t){var e=Pi(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Ko(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Go(n.copy(),t,e)},Yi(r,n)}function Ko(n){return new Date(n)}function Qo(n){return JSON.parse(n.responseText)}function na(n){var t=ua.createRange();return t.selectNode(ua.body),t.createContextualFragment(n.responseText)}var ta={version:"3.5.5"},ea=[].slice,ra=function(n){return ea.call(n)},ua=this.document;if(ua)try{ra(ua.documentElement.childNodes)[0].nodeType}catch(ia){ra=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}if(Date.now||(Date.now=function(){return+new Date}),ua)try{ua.createElement("DIV").style.setProperty("opacity",0,"")}catch(oa){var aa=this.Element.prototype,ca=aa.setAttribute,la=aa.setAttributeNS,sa=this.CSSStyleDeclaration.prototype,fa=sa.setProperty;aa.setAttribute=function(n,t){ca.call(this,n,t+"")},aa.setAttributeNS=function(n,t,e){la.call(this,n,t,e+"")},sa.setProperty=function(n,t,e){fa.call(this,n,t+"",e)}}ta.ascending=e,ta.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},ta.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},ta.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},ta.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o;)if(null!=(r=n[i])&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o;)if(null!=(r=t.call(n,n[i],i))&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},ta.sum=function(n,t){var e,r=0,i=n.length,o=-1;if(1===arguments.length)for(;++o<i;)u(e=+n[o])&&(r+=e);else for(;++o<i;)u(e=+t.call(n,n[o],o))&&(r+=e);return r},ta.mean=function(n,t){var e,i=0,o=n.length,a=-1,c=o;if(1===arguments.length)for(;++a<o;)u(e=r(n[a]))?i+=e:--c;else for(;++a<o;)u(e=r(t.call(n,n[a],a)))?i+=e:--c;return c?i/c:void 0},ta.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},ta.median=function(n,t){var i,o=[],a=n.length,c=-1;if(1===arguments.length)for(;++c<a;)u(i=r(n[c]))&&o.push(i);else for(;++c<a;)u(i=r(t.call(n,n[c],c)))&&o.push(i);return o.length?ta.quantile(o.sort(e),.5):void 0},ta.variance=function(n,t){var e,i,o=n.length,a=0,c=0,l=-1,s=0;if(1===arguments.length)for(;++l<o;)u(e=r(n[l]))&&(i=e-a,a+=i/++s,c+=i*(e-a));else for(;++l<o;)u(e=r(t.call(n,n[l],l)))&&(i=e-a,a+=i/++s,c+=i*(e-a));return s>1?c/(s-1):void 0},ta.deviation=function(){var n=ta.variance.apply(this,arguments);return n?Math.sqrt(n):n};var ha=i(e);ta.bisectLeft=ha.left,ta.bisect=ta.bisectRight=ha.right,ta.bisector=function(n){return i(1===n.length?function(t,r){return e(n(t),r)}:n)},ta.shuffle=function(n,t,e){(i=arguments.length)<3&&(e=n.length,2>i&&(t=0));for(var r,u,i=e-t;i;)u=Math.random()*i--|0,r=n[i+t],n[i+t]=n[u+t],n[u+t]=r;return n},ta.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},ta.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},ta.zip=function(){if(!(r=arguments.length))return[];for(var n=-1,t=ta.min(arguments,o),e=new Array(t);++n<t;)for(var r,u=-1,i=e[n]=new Array(r);++u<r;)i[u]=arguments[u][n];return e},ta.transpose=function(n){return ta.zip.apply(ta,n)},ta.keys=function(n){var t=[];for(var e in n)t.push(e);return t},ta.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},ta.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},ta.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var ga=Math.abs;ta.range=function(n,t,e){if(arguments.length<3&&(e=1,arguments.length<2&&(t=n,n=0)),(t-n)/e===1/0)throw new Error("infinite range");var r,u=[],i=a(ga(e)),o=-1;if(n*=i,t*=i,e*=i,0>e)for(;(r=n+e*++o)>t;)u.push(r/i);else for(;(r=n+e*++o)<t;)u.push(r/i);return u},ta.map=function(n,t){var e=new l;if(n instanceof l)n.forEach(function(n,t){e.set(n,t)});else if(Array.isArray(n)){var r,u=-1,i=n.length;if(1===arguments.length)for(;++u<i;)e.set(u,n[u]);else for(;++u<i;)e.set(t.call(n,r=n[u],u),r)}else for(var o in n)e.set(o,n[o]);return e};var pa="__proto__",va="\x00";c(l,{has:h,get:function(n){return this._[s(n)]},set:function(n,t){return this._[s(n)]=t},remove:g,keys:p,values:function(){var n=[];for(var t in this._)n.push(this._[t]);return n},entries:function(){var n=[];for(var t in this._)n.push({key:f(t),value:this._[t]});return n},size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t),this._[t])}}),ta.nest=function(){function n(t,o,a){if(a>=i.length)return r?r.call(u,o):e?o.sort(e):o;for(var c,s,f,h,g=-1,p=o.length,v=i[a++],d=new l;++g<p;)(h=d.get(c=v(s=o[g])))?h.push(s):d.set(c,[s]);return t?(s=t(),f=function(e,r){s.set(e,n(t,r,a))}):(s={},f=function(e,r){s[e]=n(t,r,a)}),d.forEach(f),s}function t(n,e){if(e>=i.length)return n;var r=[],u=o[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],o=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(ta.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return o[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},ta.set=function(n){var t=new m;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},c(m,{has:h,add:function(n){return this._[s(n+="")]=!0,n},remove:g,values:p,size:v,empty:d,forEach:function(n){for(var t in this._)n.call(this,f(t))}}),ta.behavior={},ta.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=M(n,t,t[e]);return n};var da=["webkit","ms","moz","Moz","o","O"];ta.dispatch=function(){for(var n=new _,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=w(n);return n},_.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},ta.event=null,ta.requote=function(n){return n.replace(ma,"\\$&")};var ma=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,ya={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},Ma=function(n,t){return t.querySelector(n)},xa=function(n,t){return t.querySelectorAll(n)},ba=function(n,t){var e=n.matches||n[x(n,"matchesSelector")];return(ba=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(Ma=function(n,t){return Sizzle(n,t)[0]||null},xa=Sizzle,ba=Sizzle.matchesSelector),ta.selection=function(){return ta.select(ua.documentElement)};var _a=ta.selection.prototype=[];_a.select=function(n){var t,e,r,u,i=[];n=N(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,l=r.length;++c<l;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return A(i)},_a.selectAll=function(n){var t,e,r=[];n=C(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=ra(n.call(e,e.__data__,a,u))),t.parentNode=e);return A(r)};var wa={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};ta.ns={prefix:wa,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.slice(0,t),n=n.slice(t+1)),wa.hasOwnProperty(e)?{space:wa[e],local:n}:n}},_a.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=ta.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(z(t,n[t]));return this}return this.each(z(n,t))},_a.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=T(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!L(n[u]).test(t))return!1;return!0}for(t in n)this.each(R(t,n[t]));return this}return this.each(R(n,t))},_a.style=function(n,e,r){var u=arguments.length;if(3>u){if("string"!=typeof n){2>u&&(e="");for(r in n)this.each(P(r,n[r],e));return this}if(2>u){var i=this.node();return t(i).getComputedStyle(i,null).getPropertyValue(n)}r=""}return this.each(P(n,e,r))},_a.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(U(t,n[t]));return this}return this.each(U(n,t))},_a.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},_a.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},_a.append=function(n){return n=j(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},_a.insert=function(n,t){return n=j(n),t=N(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},_a.remove=function(){return this.each(F)},_a.data=function(n,t){function e(n,e){var r,u,i,o=n.length,f=e.length,h=Math.min(o,f),g=new Array(f),p=new Array(f),v=new Array(o);if(t){var d,m=new l,y=new Array(o);for(r=-1;++r<o;)m.has(d=t.call(u=n[r],u.__data__,r))?v[r]=u:m.set(d,u),y[r]=d;for(r=-1;++r<f;)(u=m.get(d=t.call(e,i=e[r],r)))?u!==!0&&(g[r]=u,u.__data__=i):p[r]=H(i),m.set(d,!0);for(r=-1;++r<o;)m.get(y[r])!==!0&&(v[r]=n[r])}else{for(r=-1;++r<h;)u=n[r],i=e[r],u?(u.__data__=i,g[r]=u):p[r]=H(i);for(;f>r;++r)p[r]=H(e[r]);for(;o>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,a.push(p),c.push(g),s.push(v)}var r,u,i=-1,o=this.length;if(!arguments.length){for(n=new Array(o=(r=this[0]).length);++i<o;)(u=r[i])&&(n[i]=u.__data__);return n}var a=Z([]),c=A([]),s=A([]);if("function"==typeof n)for(;++i<o;)e(r=this[i],n.call(r,r.parentNode.__data__,i));else for(;++i<o;)e(r=this[i],n);return c.enter=function(){return a},c.exit=function(){return s},c},_a.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},_a.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return A(u)},_a.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},_a.sort=function(n){n=I.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},_a.each=function(n){return Y(this,function(t,e,r){n.call(t,t.__data__,e,r)})},_a.call=function(n){var t=ra(arguments);return n.apply(t[0]=this,t),this},_a.empty=function(){return!this.node()},_a.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},_a.size=function(){var n=0;return Y(this,function(){++n}),n};var Sa=[];ta.selection.enter=Z,ta.selection.enter.prototype=Sa,Sa.append=_a.append,Sa.empty=_a.empty,Sa.node=_a.node,Sa.call=_a.call,Sa.size=_a.size,Sa.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var l=-1,s=u.length;++l<s;)(i=u[l])?(t.push(r[l]=e=n.call(u.parentNode,i.__data__,l,a)),e.__data__=i.__data__):t.push(null)}return A(o)},Sa.insert=function(n,t){return arguments.length<2&&(t=V(this)),_a.insert.call(this,n,t)},ta.select=function(t){var e;return"string"==typeof t?(e=[Ma(t,ua)],e.parentNode=ua.documentElement):(e=[t],e.parentNode=n(t)),A([e])},ta.selectAll=function(n){var t;return"string"==typeof n?(t=ra(xa(n,ua)),t.parentNode=ua.documentElement):(t=n,t.parentNode=null),A([t])},_a.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(X(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(X(n,t,e))};var ka=ta.map({mouseenter:"mouseover",mouseleave:"mouseout"});ua&&ka.forEach(function(n){"on"+n in ua&&ka.remove(n)});var Ea,Aa=0;ta.mouse=function(n){return J(n,k())};var Na=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;ta.touch=function(n,t,e){if(arguments.length<3&&(e=t,t=k().changedTouches),t)for(var r,u=0,i=t.length;i>u;++u)if((r=t[u]).identifier===e)return J(n,r)},ta.behavior.drag=function(){function n(){this.on("mousedown.drag",i).on("touchstart.drag",o)}function e(n,t,e,i,o){return function(){function a(){var n,e,r=t(h,v);r&&(n=r[0]-M[0],e=r[1]-M[1],p|=n|e,M=r,g({type:"drag",x:r[0]+l[0],y:r[1]+l[1],dx:n,dy:e}))}function c(){t(h,v)&&(m.on(i+d,null).on(o+d,null),y(p&&ta.event.target===f),g({type:"dragend"}))}var l,s=this,f=ta.event.target,h=s.parentNode,g=r.of(s,arguments),p=0,v=n(),d=".drag"+(null==v?"":"-"+v),m=ta.select(e(f)).on(i+d,a).on(o+d,c),y=W(f),M=t(h,v);u?(l=u.apply(s,arguments),l=[l.x-M[0],l.y-M[1]]):l=[0,0],g({type:"dragstart"})}}var r=E(n,"drag","dragstart","dragend"),u=null,i=e(b,ta.mouse,t,"mousemove","mouseup"),o=e(G,ta.touch,y,"touchmove","touchend");return n.origin=function(t){return arguments.length?(u=t,n):u},ta.rebind(n,r,"on")},ta.touches=function(n,t){return arguments.length<2&&(t=k().touches),t?ra(t).map(function(t){var e=J(n,t);return e.identifier=t.identifier,e}):[]};var Ca=1e-6,za=Ca*Ca,qa=Math.PI,La=2*qa,Ta=La-Ca,Ra=qa/2,Da=qa/180,Pa=180/qa,Ua=Math.SQRT2,ja=2,Fa=4;ta.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=rt(v),o=i/(ja*h)*(e*ut(Ua*t+v)-et(v));return[r+o*l,u+o*s,i*e/rt(Ua*t+v)]}return[r+n*l,u+n*s,i*Math.exp(Ua*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],l=o-r,s=a-u,f=l*l+s*s,h=Math.sqrt(f),g=(c*c-i*i+Fa*f)/(2*i*ja*h),p=(c*c-i*i-Fa*f)/(2*c*ja*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/Ua;return e.duration=1e3*y,e},ta.behavior.zoom=function(){function n(n){n.on(q,f).on(Oa+".zoom",g).on("dblclick.zoom",p).on(R,h)}function e(n){return[(n[0]-k.x)/k.k,(n[1]-k.y)/k.k]}function r(n){return[n[0]*k.k+k.x,n[1]*k.k+k.y]}function u(n){k.k=Math.max(N[0],Math.min(N[1],n))}function i(n,t){t=r(t),k.x+=n[0]-t[0],k.y+=n[1]-t[1]}function o(t,e,r,o){t.__chart__={x:k.x,y:k.y,k:k.k},u(Math.pow(2,o)),i(d=e,r),t=ta.select(t),C>0&&(t=t.transition().duration(C)),t.call(n.event)}function a(){b&&b.domain(x.range().map(function(n){return(n-k.x)/k.k}).map(x.invert)),w&&w.domain(_.range().map(function(n){return(n-k.y)/k.k}).map(_.invert))}function c(n){z++||n({type:"zoomstart"})}function l(n){a(),n({type:"zoom",scale:k.k,translate:[k.x,k.y]})}function s(n){--z||n({type:"zoomend"}),d=null}function f(){function n(){f=1,i(ta.mouse(u),g),l(a)}function r(){h.on(L,null).on(T,null),p(f&&ta.event.target===o),s(a)}var u=this,o=ta.event.target,a=D.of(u,arguments),f=0,h=ta.select(t(u)).on(L,n).on(T,r),g=e(ta.mouse(u)),p=W(u);Dl.call(u),c(a)}function h(){function n(){var n=ta.touches(p);return g=k.k,n.forEach(function(n){n.identifier in d&&(d[n.identifier]=e(n))}),n}function t(){var t=ta.event.target;ta.select(t).on(x,r).on(b,a),_.push(t);for(var e=ta.event.changedTouches,u=0,i=e.length;i>u;++u)d[e[u].identifier]=null;var c=n(),l=Date.now();if(1===c.length){if(500>l-M){var s=c[0];o(p,s,d[s.identifier],Math.floor(Math.log(k.k)/Math.LN2)+1),S()}M=l}else if(c.length>1){var s=c[0],f=c[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function r(){var n,t,e,r,o=ta.touches(p);Dl.call(p);for(var a=0,c=o.length;c>a;++a,r=null)if(e=o[a],r=d[e.identifier]){if(t)break;n=e,t=r}if(r){var s=(s=e[0]-n[0])*s+(s=e[1]-n[1])*s,f=m&&Math.sqrt(s/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+r[0])/2,(t[1]+r[1])/2],u(f*g)}M=null,i(n,t),l(v)}function a(){if(ta.event.touches.length){for(var t=ta.event.changedTouches,e=0,r=t.length;r>e;++e)delete d[t[e].identifier];for(var u in d)return void n()}ta.selectAll(_).on(y,null),w.on(q,f).on(R,h),E(),s(v)}var g,p=this,v=D.of(p,arguments),d={},m=0,y=".zoom-"+ta.event.changedTouches[0].identifier,x="touchmove"+y,b="touchend"+y,_=[],w=ta.select(p),E=W(p);t(),c(v),w.on(q,null).on(R,t)}function g(){var n=D.of(this,arguments);y?clearTimeout(y):(v=e(d=m||ta.mouse(this)),Dl.call(this),c(n)),y=setTimeout(function(){y=null,s(n)},50),S(),u(Math.pow(2,.002*Ha())*k.k),i(d,v),l(n)}function p(){var n=ta.mouse(this),t=Math.log(k.k)/Math.LN2;o(this,n,e(n),ta.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var v,d,m,y,M,x,b,_,w,k={x:0,y:0,k:1},A=[960,500],N=Ia,C=250,z=0,q="mousedown.zoom",L="mousemove.zoom",T="mouseup.zoom",R="touchstart.zoom",D=E(n,"zoomstart","zoom","zoomend");return Oa||(Oa="onwheel"in ua?(Ha=function(){return-ta.event.deltaY*(ta.event.deltaMode?120:1)},"wheel"):"onmousewheel"in ua?(Ha=function(){return ta.event.wheelDelta},"mousewheel"):(Ha=function(){return-ta.event.detail},"MozMousePixelScroll")),n.event=function(n){n.each(function(){var n=D.of(this,arguments),t=k;Tl?ta.select(this).transition().each("start.zoom",function(){k=this.__chart__||{x:0,y:0,k:1},c(n)}).tween("zoom:zoom",function(){var e=A[0],r=A[1],u=d?d[0]:e/2,i=d?d[1]:r/2,o=ta.interpolateZoom([(u-k.x)/k.k,(i-k.y)/k.k,e/k.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),a=e/r[2];this.__chart__=k={x:u-r[0]*a,y:i-r[1]*a,k:a},l(n)}}).each("interrupt.zoom",function(){s(n)}).each("end.zoom",function(){s(n)}):(this.__chart__=k,c(n),l(n),s(n))})},n.translate=function(t){return arguments.length?(k={x:+t[0],y:+t[1],k:k.k},a(),n):[k.x,k.y]},n.scale=function(t){return arguments.length?(k={x:k.x,y:k.y,k:+t},a(),n):k.k},n.scaleExtent=function(t){return arguments.length?(N=null==t?Ia:[+t[0],+t[1]],n):N},n.center=function(t){return arguments.length?(m=t&&[+t[0],+t[1]],n):m},n.size=function(t){return arguments.length?(A=t&&[+t[0],+t[1]],n):A},n.duration=function(t){return arguments.length?(C=+t,n):C},n.x=function(t){return arguments.length?(b=t,x=t.copy(),k={x:0,y:0,k:1},n):b},n.y=function(t){return arguments.length?(w=t,_=t.copy(),k={x:0,y:0,k:1},n):w},ta.rebind(n,D,"on")};var Ha,Oa,Ia=[0,1/0];ta.color=ot,ot.prototype.toString=function(){return this.rgb()+""},ta.hsl=at;var Ya=at.prototype=new ot;Ya.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,this.l/n)},Ya.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new at(this.h,this.s,n*this.l)},Ya.rgb=function(){return ct(this.h,this.s,this.l)},ta.hcl=lt;var Za=lt.prototype=new ot;Za.brighter=function(n){return new lt(this.h,this.c,Math.min(100,this.l+Va*(arguments.length?n:1)))},Za.darker=function(n){return new lt(this.h,this.c,Math.max(0,this.l-Va*(arguments.length?n:1)))},Za.rgb=function(){return st(this.h,this.c,this.l).rgb()},ta.lab=ft;var Va=18,Xa=.95047,$a=1,Ba=1.08883,Wa=ft.prototype=new ot;Wa.brighter=function(n){return new ft(Math.min(100,this.l+Va*(arguments.length?n:1)),this.a,this.b)},Wa.darker=function(n){return new ft(Math.max(0,this.l-Va*(arguments.length?n:1)),this.a,this.b)},Wa.rgb=function(){return ht(this.l,this.a,this.b)},ta.rgb=mt;var Ja=mt.prototype=new ot;Ja.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),new mt(Math.min(255,t/n),Math.min(255,e/n),Math.min(255,r/n))):new mt(u,u,u)},Ja.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new mt(n*this.r,n*this.g,n*this.b)},Ja.hsl=function(){return _t(this.r,this.g,this.b)},Ja.toString=function(){return"#"+xt(this.r)+xt(this.g)+xt(this.b)};var Ga=ta.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Ga.forEach(function(n,t){Ga.set(n,yt(t))}),ta.functor=Et,ta.xhr=At(y),ta.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=Nt(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(s>=l)return o;if(u)return u=!1,i;var t=s;if(34===n.charCodeAt(t)){for(var e=t;e++<l;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}s=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++s):10===r&&(u=!0),n.slice(t+1,e).replace(/""/g,'"')}for(;l>s;){var r=n.charCodeAt(s++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(s)&&(++s,++a);else if(r!==c)continue;return n.slice(t,s-a)}return n.slice(t)}for(var r,u,i={},o={},a=[],l=n.length,s=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();t&&null==(h=t(h,f++))||a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new m,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},ta.csv=ta.dsv(",","text/csv"),ta.tsv=ta.dsv("	","text/tab-separated-values");var Ka,Qa,nc,tc,ec,rc=this[x(this,"requestAnimationFrame")]||function(n){setTimeout(n,17)};ta.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};Qa?Qa.n=i:Ka=i,Qa=i,nc||(tc=clearTimeout(tc),nc=1,rc(qt))},ta.timer.flush=function(){Lt(),Tt()},ta.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var uc=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Dt);ta.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=ta.round(n,Rt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((e-1)/3)))),uc[8+e/3]};var ic=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,oc=ta.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=ta.round(n,Rt(n,t))).toFixed(Math.max(0,Math.min(20,Rt(n*(1+1e-15),t))))}}),ac=ta.time={},cc=Date;jt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){lc.setUTCDate.apply(this._,arguments)},setDay:function(){lc.setUTCDay.apply(this._,arguments)},setFullYear:function(){lc.setUTCFullYear.apply(this._,arguments)},setHours:function(){lc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){lc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){lc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){lc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){lc.setUTCSeconds.apply(this._,arguments)},setTime:function(){lc.setTime.apply(this._,arguments)}};var lc=Date.prototype;ac.year=Ft(function(n){return n=ac.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),ac.years=ac.year.range,ac.years.utc=ac.year.utc.range,ac.day=Ft(function(n){var t=new cc(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),ac.days=ac.day.range,ac.days.utc=ac.day.utc.range,ac.dayOfYear=function(n){var t=ac.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=ac[n]=Ft(function(n){return(n=ac.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});ac[n+"s"]=e.range,ac[n+"s"].utc=e.utc.range,ac[n+"OfYear"]=function(n){var e=ac.year(n).getDay();return Math.floor((ac.dayOfYear(n)+(e+t)%7)/7)}}),ac.week=ac.sunday,ac.weeks=ac.sunday.range,ac.weeks.utc=ac.sunday.utc.range,ac.weekOfYear=ac.sundayOfYear;var sc={"-":"",_:" ",0:"0"},fc=/^\s*\d+/,hc=/^%/;ta.locale=function(n){return{numberFormat:Pt(n),timeFormat:Ot(n)}};var gc=ta.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});ta.format=gc.numberFormat,ta.geo={},ce.prototype={s:0,t:0,add:function(n){le(n,this.t,pc),le(pc.s,this.s,this),this.s?this.t+=pc.t:this.s=pc.t
-},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var pc=new ce;ta.geo.stream=function(n,t){n&&vc.hasOwnProperty(n.type)?vc[n.type](n,t):se(n,t)};var vc={Feature:function(n,t){se(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)se(e[r].geometry,t)}},dc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){fe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)fe(e[r],t,0)},Polygon:function(n,t){he(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)he(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)se(e[r],t)}};ta.geo.area=function(n){return mc=0,ta.geo.stream(n,Mc),mc};var mc,yc=new ce,Mc={sphere:function(){mc+=4*qa},point:b,lineStart:b,lineEnd:b,polygonStart:function(){yc.reset(),Mc.lineStart=ge},polygonEnd:function(){var n=2*yc;mc+=0>n?4*qa+n:n,Mc.lineStart=Mc.lineEnd=Mc.point=b}};ta.geo.bounds=function(){function n(n,t){M.push(x=[s=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=pe([t*Da,e*Da]);if(m){var u=de(m,r),i=[u[1],-u[0],0],o=de(i,u);Me(o),o=xe(o);var c=t-p,l=c>0?1:-1,v=o[0]*Pa*l,d=ga(c)>180;if(d^(v>l*p&&l*t>v)){var y=o[1]*Pa;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>l*p&&l*t>v)){var y=-o[1]*Pa;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t):h>=s?(s>t&&(s=t),t>h&&(h=t)):t>p?a(s,t)>a(s,h)&&(h=t):a(t,h)>a(s,h)&&(s=t)}else n(t,e);m=r,p=t}function e(){b.point=t}function r(){x[0]=s,x[1]=h,b.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=ga(r)>180?r+(r>0?360:-360):r}else v=n,d=e;Mc.point(n,e),t(n,e)}function i(){Mc.lineStart()}function o(){u(v,d),Mc.lineEnd(),ga(y)>Ca&&(s=-(h=180)),x[0]=s,x[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function l(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var s,f,h,g,p,v,d,m,y,M,x,b={point:n,lineStart:e,lineEnd:r,polygonStart:function(){b.point=u,b.lineStart=i,b.lineEnd=o,y=0,Mc.polygonStart()},polygonEnd:function(){Mc.polygonEnd(),b.point=n,b.lineStart=e,b.lineEnd=r,0>yc?(s=-(h=180),f=-(g=90)):y>Ca?g=90:-Ca>y&&(f=-90),x[0]=s,x[1]=h}};return function(n){g=h=-(s=f=1/0),M=[],ta.geo.stream(n,b);var t=M.length;if(t){M.sort(c);for(var e,r=1,u=M[0],i=[u];t>r;++r)e=M[r],l(e[0],u)||l(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,s=e[0],h=u[1])}return M=x=null,1/0===s||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[s,f],[h,g]]}}(),ta.geo.centroid=function(n){xc=bc=_c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,qc);var t=Nc,e=Cc,r=zc,u=t*t+e*e+r*r;return za>u&&(t=kc,e=Ec,r=Ac,Ca>bc&&(t=_c,e=wc,r=Sc),u=t*t+e*e+r*r,za>u)?[0/0,0/0]:[Math.atan2(e,t)*Pa,tt(r/Math.sqrt(u))*Pa]};var xc,bc,_c,wc,Sc,kc,Ec,Ac,Nc,Cc,zc,qc={sphere:b,point:_e,lineStart:Se,lineEnd:ke,polygonStart:function(){qc.lineStart=Ee},polygonEnd:function(){qc.lineStart=Se}},Lc=Le(Ne,Pe,je,[-qa,-qa/2]),Tc=1e9;ta.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Ie(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(ta.geo.conicEqualArea=function(){return Ye(Ze)}).raw=Ze,ta.geo.albers=function(){return ta.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},ta.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=ta.geo.albers(),o=ta.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=ta.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var l=i.scale(),s=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[s-.455*l,f-.238*l],[s+.455*l,f+.238*l]]).stream(c).point,r=o.translate([s-.307*l,f+.201*l]).clipExtent([[s-.425*l+Ca,f+.12*l+Ca],[s-.214*l-Ca,f+.234*l-Ca]]).stream(c).point,u=a.translate([s-.205*l,f+.212*l]).clipExtent([[s-.214*l+Ca,f+.166*l+Ca],[s-.115*l-Ca,f+.234*l-Ca]]).stream(c).point,n},n.scale(1070)};var Rc,Dc,Pc,Uc,jc,Fc,Hc={point:b,lineStart:b,lineEnd:b,polygonStart:function(){Dc=0,Hc.lineStart=Ve},polygonEnd:function(){Hc.lineStart=Hc.lineEnd=Hc.point=b,Rc+=ga(Dc/2)}},Oc={point:Xe,lineStart:b,lineEnd:b,polygonStart:b,polygonEnd:b},Ic={point:We,lineStart:Je,lineEnd:Ge,polygonStart:function(){Ic.lineStart=Ke},polygonEnd:function(){Ic.point=We,Ic.lineStart=Je,Ic.lineEnd=Ge}};ta.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),ta.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Rc=0,ta.geo.stream(n,u(Hc)),Rc},n.centroid=function(n){return _c=wc=Sc=kc=Ec=Ac=Nc=Cc=zc=0,ta.geo.stream(n,u(Ic)),zc?[Nc/zc,Cc/zc]:Ac?[kc/Ac,Ec/Ac]:Sc?[_c/Sc,wc/Sc]:[0/0,0/0]},n.bounds=function(n){return jc=Fc=-(Pc=Uc=1/0),ta.geo.stream(n,u(Oc)),[[Pc,Uc],[jc,Fc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||tr(n):y,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new $e:new Qe(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(ta.geo.albersUsa()).context(null)},ta.geo.transform=function(n){return{stream:function(t){var e=new er(t);for(var r in n)e[r]=n[r];return e}}},er.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},ta.geo.projection=ur,ta.geo.projectionMutator=ir,(ta.geo.equirectangular=function(){return ur(ar)}).raw=ar.invert=ar,ta.geo.rotation=function(n){function t(t){return t=n(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t}return n=lr(n[0]%360*Da,n[1]*Da,n.length>2?n[2]*Da:0),t.invert=function(t){return t=n.invert(t[0]*Da,t[1]*Da),t[0]*=Pa,t[1]*=Pa,t},t},cr.invert=ar,ta.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=lr(-n[0]*Da,-n[1]*Da,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=Pa,n[1]*=Pa}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=gr((t=+r)*Da,u*Da),n):t},n.precision=function(r){return arguments.length?(e=gr(t*Da,(u=+r)*Da),n):u},n.angle(90)},ta.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Da,u=n[1]*Da,i=t[1]*Da,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),l=Math.cos(u),s=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=l*s-c*f*a)*e),c*s+l*f*a)},ta.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return ta.range(Math.ceil(i/d)*d,u,d).map(h).concat(ta.range(Math.ceil(l/m)*m,c,m).map(g)).concat(ta.range(Math.ceil(r/p)*p,e,p).filter(function(n){return ga(n%d)>Ca}).map(s)).concat(ta.range(Math.ceil(a/v)*v,o,v).filter(function(n){return ga(n%m)>Ca}).map(f))}var e,r,u,i,o,a,c,l,s,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(l).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],l=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),l>c&&(t=l,l=c,c=t),n.precision(y)):[[i,l],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,s=vr(a,o,90),f=dr(r,e,y),h=vr(l,c,90),g=dr(i,u,y),n):y},n.majorExtent([[-180,-90+Ca],[180,90-Ca]]).minorExtent([[-180,-80-Ca],[180,80+Ca]])},ta.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=mr,u=yr;return n.distance=function(){return ta.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},ta.geo.interpolate=function(n,t){return Mr(n[0]*Da,n[1]*Da,t[0]*Da,t[1]*Da)},ta.geo.length=function(n){return Yc=0,ta.geo.stream(n,Zc),Yc};var Yc,Zc={sphere:b,point:b,lineStart:xr,lineEnd:b,polygonStart:b,polygonEnd:b},Vc=br(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(ta.geo.azimuthalEqualArea=function(){return ur(Vc)}).raw=Vc;var Xc=br(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},y);(ta.geo.azimuthalEquidistant=function(){return ur(Xc)}).raw=Xc,(ta.geo.conicConformal=function(){return Ye(_r)}).raw=_r,(ta.geo.conicEquidistant=function(){return Ye(wr)}).raw=wr;var $c=br(function(n){return 1/n},Math.atan);(ta.geo.gnomonic=function(){return ur($c)}).raw=$c,Sr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ra]},(ta.geo.mercator=function(){return kr(Sr)}).raw=Sr;var Bc=br(function(){return 1},Math.asin);(ta.geo.orthographic=function(){return ur(Bc)}).raw=Bc;var Wc=br(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(ta.geo.stereographic=function(){return ur(Wc)}).raw=Wc,Er.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ra]},(ta.geo.transverseMercator=function(){var n=kr(Er),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[n[1],-n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},e([0,0,90])}).raw=Er,ta.geom={},ta.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=Et(e),i=Et(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(zr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var l=Cr(a),s=Cr(c),f=s[0]===l[0],h=s[s.length-1]===l[l.length-1],g=[];for(t=l.length-1;t>=0;--t)g.push(n[a[l[t]][2]]);for(t=+f;t<s.length-h;++t)g.push(n[a[s[t]][2]]);return g}var e=Ar,r=Nr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},ta.geom.polygon=function(n){return ya(n,Jc),n};var Jc=ta.geom.polygon.prototype=[];Jc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Jc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Jc.clip=function(n){for(var t,e,r,u,i,o,a=Tr(n),c=-1,l=this.length-Tr(this),s=this[l-1];++c<l;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],qr(o,s,u)?(qr(i,s,u)||n.push(Lr(i,o,s,u)),n.push(o)):qr(i,s,u)&&n.push(Lr(i,o,s,u)),i=o;a&&n.push(n[0]),s=u}return n};var Gc,Kc,Qc,nl,tl,el=[],rl=[];Or.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(Yr),t.length},Qr.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},nu.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=uu(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(eu(this,e),n=e,e=n.U),e.C=!1,r.C=!0,ru(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(ru(this,e),n=e,e=n.U),e.C=!1,r.C=!0,eu(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?uu(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return void(n.C=!1);do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,eu(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,ru(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,eu(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,ru(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,eu(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,ru(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},ta.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return iu(e(n),a).cells.forEach(function(e,a){var c=e.edges,l=e.site,s=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):l.x>=r&&l.x<=i&&l.y>=u&&l.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];s.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Ca)*Ca,y:Math.round(o(n,t)/Ca)*Ca,i:t}})}var r=Ar,u=Nr,i=r,o=u,a=ul;return n?t(n):(t.links=function(n){return iu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return iu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(Yr),c=-1,l=a.length,s=a[l-1].edge,f=s.l===o?s.r:s.l;++c<l;)u=s,i=f,s=a[c].edge,f=s.l===o?s.r:s.l,r<i.i&&r<f.i&&au(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=Et(r=n),t):r},t.y=function(n){return arguments.length?(o=Et(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?ul:n,t):a===ul?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===ul?null:a&&a[1]},t)};var ul=[[-1e6,-1e6],[1e6,1e6]];ta.geom.delaunay=function(n){return ta.geom.voronoi().triangles(n)},ta.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,s=n.y;if(null!=c)if(ga(c-e)+ga(s-r)<.01)l(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,l(n,f,c,s,u,i,o,a),l(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else l(n,t,e,r,u,i,o,a)}function l(n,t,e,r,u,o,a,c){var l=.5*(u+a),s=.5*(o+c),f=e>=l,h=r>=s,g=h<<1|f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=su()),f?u=l:a=l,h?o=s:c=s,i(n,t,e,r,u,o,a,c)}var s,f,h,g,p,v,d,m,y,M=Et(a),x=Et(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)s=n[g],s.x<v&&(v=s.x),s.y<d&&(d=s.y),s.x>m&&(m=s.x),s.y>y&&(y=s.y),f.push(s.x),h.push(s.y);else for(g=0;p>g;++g){var b=+M(s=n[g],g),_=+x(s,g);v>b&&(v=b),d>_&&(d=_),b>m&&(m=b),_>y&&(y=_),f.push(b),h.push(_)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=su();if(k.add=function(n){i(k,n,+M(n,++g),+x(n,g),v,d,m,y)},k.visit=function(n){fu(n,k,v,d,m,y)},k.find=function(n){return hu(k,n[0],n[1],v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=s=null,k}var o,a=Ar,c=Nr;return(o=arguments.length)?(a=cu,c=lu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},ta.interpolateRgb=gu,ta.interpolateObject=pu,ta.interpolateNumber=vu,ta.interpolateString=du;var il=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,ol=new RegExp(il.source,"g");ta.interpolate=mu,ta.interpolators=[function(n,t){var e=typeof t;return("string"===e?Ga.has(t)||/^(#|rgb\(|hsl\()/.test(t)?gu:du:t instanceof ot?gu:Array.isArray(t)?yu:"object"===e&&isNaN(t)?pu:vu)(n,t)}],ta.interpolateArray=yu;var al=function(){return y},cl=ta.map({linear:al,poly:ku,quad:function(){return _u},cubic:function(){return wu},sin:function(){return Eu},exp:function(){return Au},circle:function(){return Nu},elastic:Cu,back:zu,bounce:function(){return qu}}),ll=ta.map({"in":y,out:xu,"in-out":bu,"out-in":function(n){return bu(xu(n))}});ta.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=cl.get(e)||al,r=ll.get(r)||y,Mu(r(e.apply(null,ea.call(arguments,1))))},ta.interpolateHcl=Lu,ta.interpolateHsl=Tu,ta.interpolateLab=Ru,ta.interpolateRound=Du,ta.transform=function(n){var t=ua.createElementNS(ta.ns.prefix.svg,"g");return(ta.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Pu(e?e.matrix:sl)})(n)},Pu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var sl={a:1,b:0,c:0,d:1,e:0,f:0};ta.interpolateTransform=Hu,ta.layout={},ta.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Yu(n[e]));return t}},ta.layout.chord=function(){function n(){var n,l,f,h,g,p={},v=[],d=ta.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(l=0,g=-1;++g<i;)l+=u[h][g];v.push(l),m.push(ta.range(i)),n+=l}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(La-s*i)/n,l=0,h=-1;++h<i;){for(f=l,g=-1;++g<i;){var y=d[h],M=m[y][g],x=u[y][M],b=l,_=l+=x*n;p[y+"-"+M]={index:y,subindex:M,startAngle:b,endAngle:_,value:x}}r[y]={index:y,startAngle:f,endAngle:l,value:(l-f)/n},l+=s}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,l={},s=0;return l.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,l):u},l.padding=function(n){return arguments.length?(s=n,e=r=null,l):s},l.sortGroups=function(n){return arguments.length?(o=n,e=r=null,l):o},l.sortSubgroups=function(n){return arguments.length?(a=n,e=null,l):a},l.sortChords=function(n){return arguments.length?(c=n,e&&t(),l):c},l.chords=function(){return e||n(),e},l.groups=function(){return r||n(),r},l},ta.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var l=t.charge/c;n.px-=i*l,n.py-=o*l}return!0}if(t.point&&c&&p>c){var l=t.pointCharge/c;n.px-=i*l,n.py-=o*l}}return!t.charge}}function t(n){n.px=ta.event.x,n.py=ta.event.y,a.resume()}var e,r,u,i,o,a={},c=ta.dispatch("start","tick","end"),l=[1,1],s=.9,f=fl,h=hl,g=-30,p=gl,v=.1,d=.64,m=[],M=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,y,x,b=m.length,_=M.length;for(e=0;_>e;++e)a=M[e],f=a.source,h=a.target,y=h.x-f.x,x=h.y-f.y,(p=y*y+x*x)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,y*=p,x*=p,h.x-=y*(d=f.weight/(h.weight+f.weight)),h.y-=x*d,f.x+=y*(d=1-d),f.y+=x*d);if((d=r*v)&&(y=l[0]/2,x=l[1]/2,e=-1,d))for(;++e<b;)a=m[e],a.x+=(y-a.x)*d,a.y+=(x-a.y)*d;if(g)for(Ju(t=ta.geom.quadtree(m),r,o),e=-1;++e<b;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<b;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*s,a.y-=(a.py-(a.py=a.y))*s);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(M=n,a):M},a.size=function(n){return arguments.length?(l=n,a):l},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(s=+n,a):s},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),ta.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=M[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,l=o.length;++a<l;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,s=M.length,p=l[0],v=l[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;s>t;++t)r=M[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;s>t;++t)u[t]=+f.call(this,M[t],t);else for(t=0;s>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;s>t;++t)i[t]=+h.call(this,M[t],t);else for(t=0;s>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=ta.behavior.drag().origin(y).on("dragstart.force",Xu).on("drag.force",t).on("dragend.force",$u)),arguments.length?void this.on("mouseover.force",Bu).on("mouseout.force",Wu).call(e):e},ta.rebind(a,c,"on")};var fl=20,hl=1,gl=1/0;ta.layout.hierarchy=function(){function n(u){var i,o=[u],a=[];for(u.depth=0;null!=(i=o.pop());)if(a.push(i),(l=e.call(n,i,i.depth))&&(c=l.length)){for(var c,l,s;--c>=0;)o.push(s=l[c]),s.parent=i,s.depth=i.depth+1;r&&(i.value=0),i.children=l}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return Qu(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),a}var t=ei,e=ni,r=ti;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(Ku(t,function(n){n.children&&(n.value=0)}),Qu(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},ta.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,l=-1;for(r=t.value?r/t.value:0;++l<o;)n(a=i[l],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=ta.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Gu(e,r)},ta.layout.pie=function(){function n(o){var a,c=o.length,l=o.map(function(e,r){return+t.call(n,e,r)}),s=+("function"==typeof r?r.apply(this,arguments):r),f=("function"==typeof u?u.apply(this,arguments):u)-s,h=Math.min(Math.abs(f)/c,+("function"==typeof i?i.apply(this,arguments):i)),g=h*(0>f?-1:1),p=(f-c*g)/ta.sum(l),v=ta.range(c),d=[];return null!=e&&v.sort(e===pl?function(n,t){return l[t]-l[n]}:function(n,t){return e(o[n],o[t])}),v.forEach(function(n){d[n]={data:o[n],value:a=l[n],startAngle:s,endAngle:s+=a*p+g,padAngle:h}}),d}var t=Number,e=pl,r=0,u=La,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var pl={};ta.layout.stack=function(){function n(a,c){if(!(h=a.length))return a;var l=a.map(function(e,r){return t.call(n,e,r)}),s=l.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,s,c);l=ta.permute(l,f),s=ta.permute(s,f);var h,g,p,v,d=r.call(n,s,c),m=l[0].length;for(p=0;m>p;++p)for(u.call(n,l[0][p],v=d[p],s[0][p][1]),g=1;h>g;++g)u.call(n,l[g][p],v+=s[g-1][p][1],s[g][p][1]);return a}var t=y,e=ai,r=ci,u=oi,i=ui,o=ii;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:vl.get(t)||ai,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:dl.get(t)||ci,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var vl=ta.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(li),i=n.map(si),o=ta.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,l=[],s=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],l.push(e)):(c+=i[e],s.push(e));return s.reverse().concat(l)},reverse:function(n){return ta.range(n.length).reverse()},"default":ai}),dl=ta.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,l,s=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=l=0,e=1;h>e;++e){for(t=0,u=0;s>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];s>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,l>c&&(l=c)}for(e=0;h>e;++e)g[e]-=l;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ci});ta.layout.histogram=function(){function n(n,i){for(var o,a,c=[],l=n.map(e,this),s=r.call(this,l,i),f=u.call(this,s,l,i),i=-1,h=l.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=l[i],a>=s[0]&&a<=s[1]&&(o=c[ta.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=pi,u=hi;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=Et(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return gi(n,t)}:Et(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},ta.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],l=u[1],s=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,Qu(a,function(n){n.r=+s(n.value)}),Qu(a,Mi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/l))/2;Qu(a,function(n){n.r+=f}),Qu(a,Mi),Qu(a,function(n){n.r-=f})}return _i(a,c/2,l/2,t?1:1/Math.max(2*a.r/c,2*a.r/l)),o}var t,e=ta.layout.hierarchy().sort(vi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Gu(n,e)},ta.layout.tree=function(){function n(n,u){var s=o.call(this,n,u),f=s[0],h=t(f);if(Qu(h,e),h.parent.m=-h.z,Ku(h,r),l)Ku(f,i);else{var g=f,p=f,v=f;Ku(f,function(n){n.x<g.x&&(g=n),n.x>p.x&&(p=n),n.depth>v.depth&&(v=n)});var d=a(g,p)/2-g.x,m=c[0]/(p.x+a(p,g)/2+d),y=c[1]/(v.depth||1);Ku(f,function(n){n.x=(n.x+d)*m,n.y=n.depth*y})}return s}function t(n){for(var t,e={A:null,children:[n]},r=[e];null!=(t=r.pop());)for(var u,i=t.children,o=0,a=i.length;a>o;++o)r.push((i[o]=u={_:i[o],parent:t,children:(u=i[o].children)&&u.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=u);return e.children[0]}function e(n){var t=n.children,e=n.parent.children,r=n.i?e[n.i-1]:null;if(t.length){Ni(n);var i=(t[0].z+t[t.length-1].z)/2;r?(n.z=r.z+a(n._,r._),n.m=n.z-i):n.z=i}else r&&(n.z=r.z+a(n._,r._));n.parent.A=u(n,r,n.parent.A||e[0])}function r(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function u(n,t,e){if(t){for(var r,u=n,i=n,o=t,c=u.parent.children[0],l=u.m,s=i.m,f=o.m,h=c.m;o=Ei(o),u=ki(u),o&&u;)c=ki(c),i=Ei(i),i.a=n,r=o.z+f-u.z-l+a(o._,u._),r>0&&(Ai(Ci(o,n,e),n,r),l+=r,s+=r),f+=o.m,l+=u.m,h+=c.m,s+=i.m;o&&!Ei(i)&&(i.t=o,i.m+=f-s),u&&!ki(c)&&(c.t=u,c.m+=l-h,e=n)}return e}function i(n){n.x*=c[0],n.y=n.depth*c[1]}var o=ta.layout.hierarchy().sort(null).value(null),a=Si,c=[1,1],l=null;return n.separation=function(t){return arguments.length?(a=t,n):a},n.size=function(t){return arguments.length?(l=null==(c=t)?i:null,n):l?null:c},n.nodeSize=function(t){return arguments.length?(l=null==(c=t)?null:i,n):l?c:null},Gu(n,o)},ta.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],l=0;Qu(c,function(n){var t=n.children;t&&t.length?(n.x=qi(t),n.y=zi(t)):(n.x=o?l+=e(n,o):0,n.y=0,o=n)});var s=Li(c),f=Ti(c),h=s.x-e(s,f)/2,g=f.x+e(f,s)/2;return Qu(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=ta.layout.hierarchy().sort(null).value(null),e=Si,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Gu(n,t)},ta.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,l=f(e),s=[],h=i.slice(),p=1/0,v="slice"===g?l.dx:"dice"===g?l.dy:"slice-dice"===g?1&e.depth?l.dy:l.dx:Math.min(l.dx,l.dy);for(n(h,l.dx*l.dy/e.value),s.area=0;(c=h.length)>0;)s.push(o=h[c-1]),s.area+=o.area,"squarify"!==g||(a=r(s,v))<=p?(h.pop(),p=a):(s.area-=s.pop().area,u(s,v,l,!1),v=Math.min(l.dx,l.dy),s.length=s.area=0,p=1/0);s.length&&(u(s,v,l,!0),s.length=s.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,l=e.y,s=t?c(n.area/t):0;if(t==e.dx){for((r||s>e.dy)&&(s=e.dy);++i<o;)u=n[i],u.x=a,u.y=l,u.dy=s,a+=u.dx=Math.min(e.x+e.dx-a,s?c(u.area/s):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=s,e.dy-=s}else{for((r||s>e.dx)&&(s=e.dx);++i<o;)u=n[i],u.x=a,u.y=l,u.dx=s,l+=u.dy=Math.min(e.y+e.dy-l,s?c(u.area/s):0);u.z=!1,u.dy+=e.y+e.dy-l,e.x+=s,e.dx-=s}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=l[0],i.dy=l[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=ta.layout.hierarchy(),c=Math.round,l=[1,1],s=null,f=Ri,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));
-return i.size=function(n){return arguments.length?(l=n,i):l},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Ri(t):Di(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return Di(t,n)}if(!arguments.length)return s;var r;return f=null==(s=n)?Ri:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Gu(i,a)},ta.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=ta.random.normal.apply(ta,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=ta.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},ta.scale={};var ml={floor:y,ceil:y};ta.scale.linear=function(){return Ii([0,1],[0,1],mu,!1)};var yl={s:1,g:1,p:1,r:1,e:1};ta.scale.log=function(){return Ji(ta.scale.linear().domain([0,1]),10,!0,[1,10])};var Ml=ta.format(".0e"),xl={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};ta.scale.pow=function(){return Gi(ta.scale.linear(),1,[0,1])},ta.scale.sqrt=function(){return ta.scale.pow().exponent(.5)},ta.scale.ordinal=function(){return Qi([],{t:"range",a:[[]]})},ta.scale.category10=function(){return ta.scale.ordinal().range(bl)},ta.scale.category20=function(){return ta.scale.ordinal().range(_l)},ta.scale.category20b=function(){return ta.scale.ordinal().range(wl)},ta.scale.category20c=function(){return ta.scale.ordinal().range(Sl)};var bl=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(Mt),_l=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(Mt),wl=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(Mt),Sl=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(Mt);ta.scale.quantile=function(){return no([],[])},ta.scale.quantize=function(){return to(0,1,[0,1])},ta.scale.threshold=function(){return eo([.5],[0,1])},ta.scale.identity=function(){return ro([0,1])},ta.svg={},ta.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),l=Math.max(0,+r.apply(this,arguments)),s=o.apply(this,arguments)-Ra,f=a.apply(this,arguments)-Ra,h=Math.abs(f-s),g=s>f?0:1;if(n>l&&(p=l,l=n,n=p),h>=Ta)return t(l,g)+(n?t(n,1-g):"")+"Z";var p,v,d,m,y,M,x,b,_,w,S,k,E=0,A=0,N=[];if((m=(+c.apply(this,arguments)||0)/2)&&(d=i===kl?Math.sqrt(n*n+l*l):+i.apply(this,arguments),g||(A*=-1),l&&(A=tt(d/l*Math.sin(m))),n&&(E=tt(d/n*Math.sin(m)))),l){y=l*Math.cos(s+A),M=l*Math.sin(s+A),x=l*Math.cos(f-A),b=l*Math.sin(f-A);var C=Math.abs(f-s-2*A)<=qa?0:1;if(A&&so(y,M,x,b)===g^C){var z=(s+f)/2;y=l*Math.cos(z),M=l*Math.sin(z),x=b=null}}else y=M=0;if(n){_=n*Math.cos(f-E),w=n*Math.sin(f-E),S=n*Math.cos(s+E),k=n*Math.sin(s+E);var q=Math.abs(s-f+2*E)<=qa?0:1;if(E&&so(_,w,S,k)===1-g^q){var L=(s+f)/2;_=n*Math.cos(L),w=n*Math.sin(L),S=k=null}}else _=w=0;if((p=Math.min(Math.abs(l-n)/2,+u.apply(this,arguments)))>.001){v=l>n^g?0:1;var T=null==S?[_,w]:null==x?[y,M]:Lr([y,M],[S,k],[x,b],[_,w]),R=y-T[0],D=M-T[1],P=x-T[0],U=b-T[1],j=1/Math.sin(Math.acos((R*P+D*U)/(Math.sqrt(R*R+D*D)*Math.sqrt(P*P+U*U)))/2),F=Math.sqrt(T[0]*T[0]+T[1]*T[1]);if(null!=x){var H=Math.min(p,(l-F)/(j+1)),O=fo(null==S?[_,w]:[S,k],[y,M],l,H,g),I=fo([x,b],[_,w],l,H,g);p===H?N.push("M",O[0],"A",H,",",H," 0 0,",v," ",O[1],"A",l,",",l," 0 ",1-g^so(O[1][0],O[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",H,",",H," 0 0,",v," ",I[0]):N.push("M",O[0],"A",H,",",H," 0 1,",v," ",I[0])}else N.push("M",y,",",M);if(null!=S){var Y=Math.min(p,(n-F)/(j-1)),Z=fo([y,M],[S,k],n,-Y,g),V=fo([_,w],null==x?[y,M]:[x,b],n,-Y,g);p===Y?N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",V[1],"A",n,",",n," 0 ",g^so(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",Y,",",Y," 0 0,",v," ",Z[0]):N.push("L",V[0],"A",Y,",",Y," 0 0,",v," ",Z[0])}else N.push("L",_,",",w)}else N.push("M",y,",",M),null!=x&&N.push("A",l,",",l," 0 ",C,",",g," ",x,",",b),N.push("L",_,",",w),null!=S&&N.push("A",n,",",n," 0 ",q,",",1-g," ",S,",",k);return N.push("Z"),N.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=io,r=oo,u=uo,i=kl,o=ao,a=co,c=lo;return n.innerRadius=function(t){return arguments.length?(e=Et(t),n):e},n.outerRadius=function(t){return arguments.length?(r=Et(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=Et(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==kl?kl:Et(t),n):i},n.startAngle=function(t){return arguments.length?(o=Et(t),n):o},n.endAngle=function(t){return arguments.length?(a=Et(t),n):a},n.padAngle=function(t){return arguments.length?(c=Et(t),n):c},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-Ra;return[Math.cos(t)*n,Math.sin(t)*n]},n};var kl="auto";ta.svg.line=function(){return ho(y)};var El=ta.map({linear:go,"linear-closed":po,step:vo,"step-before":mo,"step-after":yo,basis:So,"basis-open":ko,"basis-closed":Eo,bundle:Ao,cardinal:bo,"cardinal-open":Mo,"cardinal-closed":xo,monotone:To});El.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Al=[0,2/3,1/3,0],Nl=[0,1/3,2/3,0],Cl=[0,1/6,2/3,1/6];ta.svg.line.radial=function(){var n=ho(Ro);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},mo.reverse=yo,yo.reverse=mo,ta.svg.area=function(){return Do(y)},ta.svg.area.radial=function(){var n=Do(Ro);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},ta.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),l=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,l)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,l.r,l.p0)+r(l.r,l.p1,l.a1-l.a0)+u(l.r,l.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)-Ra,s=l.call(n,u,r)-Ra;return{r:i,a0:o,a1:s,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(s),i*Math.sin(s)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>qa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=mr,o=yr,a=Po,c=ao,l=co;return n.radius=function(t){return arguments.length?(a=Et(t),n):a},n.source=function(t){return arguments.length?(i=Et(t),n):i},n.target=function(t){return arguments.length?(o=Et(t),n):o},n.startAngle=function(t){return arguments.length?(c=Et(t),n):c},n.endAngle=function(t){return arguments.length?(l=Et(t),n):l},n},ta.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=mr,e=yr,r=Uo;return n.source=function(e){return arguments.length?(t=Et(e),n):t},n.target=function(t){return arguments.length?(e=Et(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},ta.svg.diagonal.radial=function(){var n=ta.svg.diagonal(),t=Uo,e=n.projection;return n.projection=function(n){return arguments.length?e(jo(t=n)):t},n},ta.svg.symbol=function(){function n(n,r){return(zl.get(t.call(this,n,r))||Oo)(e.call(this,n,r))}var t=Ho,e=Fo;return n.type=function(e){return arguments.length?(t=Et(e),n):t},n.size=function(t){return arguments.length?(e=Et(t),n):e},n};var zl=ta.map({circle:Oo,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ll)),e=t*Ll;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/ql),e=t*ql/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});ta.svg.symbolTypes=zl.keys();var ql=Math.sqrt(3),Ll=Math.tan(30*Da);_a.transition=function(n){for(var t,e,r=Tl||++Ul,u=Xo(n),i=[],o=Rl||{time:Date.now(),ease:Su,delay:0,duration:250},a=-1,c=this.length;++a<c;){i.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(e=l[s])&&$o(e,s,u,r,o),t.push(e)}return Yo(i,u,r)},_a.interrupt=function(n){return this.each(null==n?Dl:Io(Xo(n)))};var Tl,Rl,Dl=Io(Xo()),Pl=[],Ul=0;Pl.call=_a.call,Pl.empty=_a.empty,Pl.node=_a.node,Pl.size=_a.size,ta.transition=function(n,t){return n&&n.transition?Tl?n.transition(t):n:ta.selection().transition(n)},ta.transition.prototype=Pl,Pl.select=function(n){var t,e,r,u=this.id,i=this.namespace,o=[];n=N(n);for(var a=-1,c=this.length;++a<c;){o.push(t=[]);for(var l=this[a],s=-1,f=l.length;++s<f;)(r=l[s])&&(e=n.call(r,r.__data__,s,a))?("__data__"in r&&(e.__data__=r.__data__),$o(e,s,i,u,r[i][u]),t.push(e)):t.push(null)}return Yo(o,i,u)},Pl.selectAll=function(n){var t,e,r,u,i,o=this.id,a=this.namespace,c=[];n=C(n);for(var l=-1,s=this.length;++l<s;)for(var f=this[l],h=-1,g=f.length;++h<g;)if(r=f[h]){i=r[a][o],e=n.call(r,r.__data__,h,l),c.push(t=[]);for(var p=-1,v=e.length;++p<v;)(u=e[p])&&$o(u,p,a,o,i),t.push(u)}return Yo(c,a,o)},Pl.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Yo(u,this.namespace,this.id)},Pl.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):Y(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Pl.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Hu:mu,a=ta.ns.qualify(n);return Zo(this,"attr."+n,t,a.local?i:u)},Pl.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=ta.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Pl.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=mu(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return Zo(this,"style."+n,e,i)},Pl.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Pl.text=function(n){return Zo(this,"text",n,Vo)},Pl.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Pl.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=ta.ease.apply(ta,arguments)),Y(this,function(r){r[e][t].ease=n}))},Pl.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:Y(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Pl.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:Y(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Pl.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Rl,i=Tl;try{Tl=e,Y(this,function(t,u,i){Rl=t[r][e],n.call(t,t.__data__,u,i)})}finally{Rl=u,Tl=i}}else Y(this,function(u){var i=u[r][e];(i.event||(i.event=ta.dispatch("start","end","interrupt"))).on(n,t)});return this},Pl.transition=function(){for(var n,t,e,r,u=this.id,i=++Ul,o=this.namespace,a=[],c=0,l=this.length;l>c;c++){a.push(n=[]);for(var t=this[c],s=0,f=t.length;f>s;s++)(e=t[s])&&(r=e[o][u],$o(e,s,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Yo(a,o,i)},ta.svg.axis=function(){function n(n){n.each(function(){var n,l=ta.select(this),s=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):y:t,p=l.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Ca),d=ta.transition(p.exit()).style("opacity",Ca).remove(),m=ta.transition(p.order()).style("opacity",1),M=Math.max(u,0)+o,x=Ui(f),b=l.selectAll(".domain").data([0]),_=(b.enter().append("path").attr("class","domain"),ta.transition(b));v.append("line"),v.append("text");var w,S,k,E,A=v.select("line"),N=m.select("line"),C=p.select("text").text(g),z=v.select("text"),q=m.select("text"),L="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Bo,w="x",k="y",S="x2",E="y2",C.attr("dy",0>L?"0em":".71em").style("text-anchor","middle"),_.attr("d","M"+x[0]+","+L*i+"V0H"+x[1]+"V"+L*i)):(n=Wo,w="y",k="x",S="y2",E="x2",C.attr("dy",".32em").style("text-anchor",0>L?"end":"start"),_.attr("d","M"+L*i+","+x[0]+"H0V"+x[1]+"H"+L*i)),A.attr(E,L*u),z.attr(k,L*M),N.attr(S,0).attr(E,L*u),q.attr(w,0).attr(k,L*M),f.rangeBand){var T=f,R=T.rangeBand()/2;s=f=function(n){return T(n)+R}}else s.rangeBand?s=f:d.call(n,f,s);v.call(n,s,f),m.call(n,f,f)})}var t,e=ta.scale.linear(),r=jl,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Fl?t+"":jl,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var jl="bottom",Fl={top:1,right:1,bottom:1,left:1};ta.svg.brush=function(){function n(t){t.each(function(){var t=ta.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(v,y);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Hl[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var c,f=ta.transition(t),h=ta.transition(o);l&&(c=Ui(l),h.attr("x",c[0]).attr("width",c[1]-c[0]),r(f)),s&&(c=Ui(s),h.attr("y",c[0]).attr("height",c[1]-c[0]),u(f)),e(f)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+f[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",f[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",f[1]-f[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==ta.event.keyCode&&(C||(M=null,q[0]-=f[1],q[1]-=h[1],C=2),S())}function v(){32==ta.event.keyCode&&2==C&&(q[0]+=f[1],q[1]+=h[1],C=0,S())}function d(){var n=ta.mouse(b),t=!1;x&&(n[0]+=x[0],n[1]+=x[1]),C||(ta.event.altKey?(M||(M=[(f[0]+f[1])/2,(h[0]+h[1])/2]),q[0]=f[+(n[0]<M[0])],q[1]=h[+(n[1]<M[1])]):M=null),A&&m(n,l,0)&&(r(k),t=!0),N&&m(n,s,1)&&(u(k),t=!0),t&&(e(k),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,i=Ui(t),c=i[0],l=i[1],s=q[e],v=e?h:f,d=v[1]-v[0];return C&&(c-=s,l-=d+s),r=(e?p:g)?Math.max(c,Math.min(l,n[e])):n[e],C?u=(r+=s)+d:(M&&(s=Math.max(c,Math.min(l,2*M[e]-r))),r>s?(u=r,r=s):u=s),v[0]!=r||v[1]!=u?(e?a=null:o=null,v[0]=r,v[1]=u,!0):void 0}function y(){d(),k.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),ta.select("body").style("cursor",null),L.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),z(),w({type:"brushend"})}var M,x,b=this,_=ta.select(ta.event.target),w=c.of(b,arguments),k=ta.select(b),E=_.datum(),A=!/^(n|s)$/.test(E)&&l,N=!/^(e|w)$/.test(E)&&s,C=_.classed("extent"),z=W(b),q=ta.mouse(b),L=ta.select(t(b)).on("keydown.brush",i).on("keyup.brush",v);if(ta.event.changedTouches?L.on("touchmove.brush",d).on("touchend.brush",y):L.on("mousemove.brush",d).on("mouseup.brush",y),k.interrupt().selectAll("*").interrupt(),C)q[0]=f[0]-q[0],q[1]=h[0]-q[1];else if(E){var T=+/w$/.test(E),R=+/^n/.test(E);x=[f[1-T]-q[0],h[1-R]-q[1]],q[0]=f[T],q[1]=h[R]}else ta.event.altKey&&(M=q.slice());k.style("pointer-events","none").selectAll(".resize").style("display",null),ta.select("body").style("cursor",_.style("cursor")),w({type:"brushstart"}),d()}var o,a,c=E(n,"brushstart","brush","brushend"),l=null,s=null,f=[0,0],h=[0,0],g=!0,p=!0,v=Ol[0];return n.event=function(n){n.each(function(){var n=c.of(this,arguments),t={x:f,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Tl?ta.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,f=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=yu(f,t.x),r=yu(h,t.y);return o=a=null,function(u){f=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(l=t,v=Ol[!l<<1|!s],n):l},n.y=function(t){return arguments.length?(s=t,v=Ol[!l<<1|!s],n):s},n.clamp=function(t){return arguments.length?(l&&s?(g=!!t[0],p=!!t[1]):l?g=!!t:s&&(p=!!t),n):l&&s?[g,p]:l?g:s?p:null},n.extent=function(t){var e,r,u,i,c;return arguments.length?(l&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),o=[e,r],l.invert&&(e=l(e),r=l(r)),e>r&&(c=e,e=r,r=c),(e!=f[0]||r!=f[1])&&(f=[e,r])),s&&(u=t[0],i=t[1],l&&(u=u[1],i=i[1]),a=[u,i],s.invert&&(u=s(u),i=s(i)),u>i&&(c=u,u=i,i=c),(u!=h[0]||i!=h[1])&&(h=[u,i])),n):(l&&(o?(e=o[0],r=o[1]):(e=f[0],r=f[1],l.invert&&(e=l.invert(e),r=l.invert(r)),e>r&&(c=e,e=r,r=c))),s&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],s.invert&&(u=s.invert(u),i=s.invert(i)),u>i&&(c=u,u=i,i=c))),l&&s?[[e,u],[r,i]]:l?[e,r]:s&&[u,i])},n.clear=function(){return n.empty()||(f=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!l&&f[0]==f[1]||!!s&&h[0]==h[1]},ta.rebind(n,c,"on")};var Hl={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Ol=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Il=ac.format=gc.timeFormat,Yl=Il.utc,Zl=Yl("%Y-%m-%dT%H:%M:%S.%LZ");Il.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Jo:Zl,Jo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Jo.toString=Zl.toString,ac.second=Ft(function(n){return new cc(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),ac.seconds=ac.second.range,ac.seconds.utc=ac.second.utc.range,ac.minute=Ft(function(n){return new cc(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),ac.minutes=ac.minute.range,ac.minutes.utc=ac.minute.utc.range,ac.hour=Ft(function(n){var t=n.getTimezoneOffset()/60;return new cc(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),ac.hours=ac.hour.range,ac.hours.utc=ac.hour.utc.range,ac.month=Ft(function(n){return n=ac.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),ac.months=ac.month.range,ac.months.utc=ac.month.utc.range;var Vl=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Xl=[[ac.second,1],[ac.second,5],[ac.second,15],[ac.second,30],[ac.minute,1],[ac.minute,5],[ac.minute,15],[ac.minute,30],[ac.hour,1],[ac.hour,3],[ac.hour,6],[ac.hour,12],[ac.day,1],[ac.day,2],[ac.week,1],[ac.month,1],[ac.month,3],[ac.year,1]],$l=Il.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Ne]]),Bl={range:function(n,t,e){return ta.range(Math.ceil(n/e)*e,+t,e).map(Ko)},floor:y,ceil:y};Xl.year=ac.year,ac.scale=function(){return Go(ta.scale.linear(),Xl,$l)};var Wl=Xl.map(function(n){return[n[0].utc,n[1]]}),Jl=Yl.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Ne]]);Wl.year=ac.year.utc,ac.scale.utc=function(){return Go(ta.scale.linear(),Wl,Jl)},ta.text=At(function(n){return n.responseText}),ta.json=function(n,t){return Nt(n,"application/json",Qo,t)},ta.html=function(n,t){return Nt(n,"text/html",na,t)},ta.xml=At(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(ta):"object"==typeof module&&module.exports&&(module.exports=ta),this.d3=ta}();
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js
deleted file mode 100644
index 6bfc844..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
-
-Holder - client side image placeholders
-Version 2.7.1+6hydf
-© 2015 Ivan Malopinsky - http://imsky.co
-
-Site:     http://holderjs.com
-Issues:   https://github.com/imsky/holder/issues
-License:  http://opensource.org/licenses/MIT
-
-*/
-!function(a){if(a.document){var b=a.document;b.querySelectorAll||(b.querySelectorAll=function(c){var d,e=b.createElement("style"),f=[];for(b.documentElement.firstChild.appendChild(e),b._qsa=[],e.styleSheet.cssText=c+"{x-qsa:expression(document._qsa && document._qsa.push(this))}",a.scrollBy(0,0),e.parentNode.removeChild(e);b._qsa.length;)d=b._qsa.shift(),d.style.removeAttribute("x-qsa"),f.push(d);return b._qsa=null,f}),b.querySelector||(b.querySelector=function(a){var c=b.querySelectorAll(a);return c.length?c[0]:null}),b.getElementsByClassName||(b.getElementsByClassName=function(a){return a=String(a).replace(/^|\s+/g,"."),b.querySelectorAll(a)}),Object.keys||(Object.keys=function(a){if(a!==Object(a))throw TypeError("Object.keys called on non-object");var b,c=[];for(b in a)Object.prototype.hasOwnProperty.call(a,b)&&c.push(b);return c}),function(a){var b="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";a.atob=a.atob||function(a){a=String(a);var c,d=0,e=[],f=0,g=0;if(a=a.replace(/\s/g,""),a.length%4===0&&(a=a.replace(/=+$/,"")),a.length%4===1)throw Error("InvalidCharacterError");if(/[^+/0-9A-Za-z]/.test(a))throw Error("InvalidCharacterError");for(;d<a.length;)c=b.indexOf(a.charAt(d)),f=f<<6|c,g+=6,24===g&&(e.push(String.fromCharCode(f>>16&255)),e.push(String.fromCharCode(f>>8&255)),e.push(String.fromCharCode(255&f)),g=0,f=0),d+=1;return 12===g?(f>>=4,e.push(String.fromCharCode(255&f))):18===g&&(f>>=2,e.push(String.fromCharCode(f>>8&255)),e.push(String.fromCharCode(255&f))),e.join("")},a.btoa=a.btoa||function(a){a=String(a);var c,d,e,f,g,h,i,j=0,k=[];if(/[^\x00-\xFF]/.test(a))throw Error("InvalidCharacterError");for(;j<a.length;)c=a.charCodeAt(j++),d=a.charCodeAt(j++),e=a.charCodeAt(j++),f=c>>2,g=(3&c)<<4|d>>4,h=(15&d)<<2|e>>6,i=63&e,j===a.length+2?(h=64,i=64):j===a.length+1&&(i=64),k.push(b.charAt(f),b.charAt(g),b.charAt(h),b.charAt(i));return k.join("")}}(a),Object.prototype.hasOwnProperty||(Object.prototype.hasOwnProperty=function(a){var b=this.__proto__||this.constructor.prototype;return a in this&&(!(a in b)||b[a]!==this[a])}),function(){if("performance"in a==!1&&(a.performance={}),Date.now=Date.now||function(){return(new Date).getTime()},"now"in a.performance==!1){var b=Date.now();performance.timing&&performance.timing.navigationStart&&(b=performance.timing.navigationStart),a.performance.now=function(){return Date.now()-b}}}(),a.requestAnimationFrame||(a.webkitRequestAnimationFrame?!function(a){a.requestAnimationFrame=function(b){return webkitRequestAnimationFrame(function(){b(a.performance.now())})},a.cancelAnimationFrame=webkitCancelAnimationFrame}(a):a.mozRequestAnimationFrame?!function(a){a.requestAnimationFrame=function(b){return mozRequestAnimationFrame(function(){b(a.performance.now())})},a.cancelAnimationFrame=mozCancelAnimationFrame}(a):!function(a){a.requestAnimationFrame=function(b){return a.setTimeout(b,1e3/60)},a.cancelAnimationFrame=a.clearTimeout}(a))}}(this),function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):"object"==typeof exports?exports.Holder=b():a.Holder=b()}(this,function(){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){(function(b){function d(a,b,c,d){var f=e(c.substr(c.lastIndexOf(a.domain)),a);f&&h({mode:null,el:d,flags:f,engineSettings:b})}function e(a,b){var c={theme:B(J.settings.themes.gray,null),stylesheets:b.stylesheets,instanceOptions:b};return a.match(/([\d]+p?)x([\d]+p?)(?:\?|$)/)?f(a,c):g(a,c)}function f(a,b){var c=a.split("?"),d=c[0].split("/");b.holderURL=a;var e=d[1],f=e.match(/([\d]+p?)x([\d]+p?)/);if(!f)return!1;if(b.fluid=-1!==e.indexOf("p"),b.dimensions={width:f[1].replace("p","%"),height:f[2].replace("p","%")},2===c.length){var g=A.parse(c[1]);if(g.bg&&(b.theme.background=(-1===g.bg.indexOf("#")?"#":"")+g.bg),g.fg&&(b.theme.foreground=(-1===g.fg.indexOf("#")?"#":"")+g.fg),g.theme&&b.instanceOptions.themes.hasOwnProperty(g.theme)&&(b.theme=B(b.instanceOptions.themes[g.theme],null)),g.text&&(b.text=g.text),g.textmode&&(b.textmode=g.textmode),g.size&&(b.size=g.size),g.font&&(b.font=g.font),g.align&&(b.align=g.align),b.nowrap=z.truthy(g.nowrap),b.auto=z.truthy(g.auto),z.truthy(g.random)){J.vars.cache.themeKeys=J.vars.cache.themeKeys||Object.keys(b.instanceOptions.themes);var h=J.vars.cache.themeKeys[0|Math.random()*J.vars.cache.themeKeys.length];b.theme=B(b.instanceOptions.themes[h],null)}}return b}function g(a,b){var c=!1,d=String.fromCharCode(11),e=a.replace(/([^\\])\//g,"$1"+d).split(d),f=/%[0-9a-f]{2}/gi,g=b.instanceOptions;b.holderURL=[];for(var h=e.length,i=0;h>i;i++){var j=e[i];if(j.match(f))try{j=decodeURIComponent(j)}catch(k){j=e[i]}var l=!1;if(J.flags.dimensions.match(j))c=!0,b.dimensions=J.flags.dimensions.output(j),l=!0;else if(J.flags.fluid.match(j))c=!0,b.dimensions=J.flags.fluid.output(j),b.fluid=!0,l=!0;else if(J.flags.textmode.match(j))b.textmode=J.flags.textmode.output(j),l=!0;else if(J.flags.colors.match(j)){var m=J.flags.colors.output(j);b.theme=B(b.theme,m),l=!0}else if(g.themes[j])g.themes.hasOwnProperty(j)&&(b.theme=B(g.themes[j],null)),l=!0;else if(J.flags.font.match(j))b.font=J.flags.font.output(j),l=!0;else if(J.flags.auto.match(j))b.auto=!0,l=!0;else if(J.flags.text.match(j))b.text=J.flags.text.output(j),l=!0;else if(J.flags.size.match(j))b.size=J.flags.size.output(j),l=!0;else if(J.flags.random.match(j)){null==J.vars.cache.themeKeys&&(J.vars.cache.themeKeys=Object.keys(g.themes));var n=J.vars.cache.themeKeys[0|Math.random()*J.vars.cache.themeKeys.length];b.theme=B(g.themes[n],null),l=!0}l&&b.holderURL.push(j)}return b.holderURL.unshift(g.domain),b.holderURL=b.holderURL.join("/"),c?b:!1}function h(a){var b=a.mode,c=a.el,d=a.flags,e=a.engineSettings,f=d.dimensions,g=d.theme,h=f.width+"x"+f.height;if(b=null==b?d.fluid?"fluid":"image":b,null!=d.text&&(g.text=d.text,"object"===c.nodeName.toLowerCase())){for(var j=g.text.split("\\n"),k=0;k<j.length;k++)j[k]=z.encodeHtmlEntity(j[k]);g.text=j.join("\\n")}var n=d.holderURL,o=B(e,null);if(d.font&&(g.font=d.font,!o.noFontFallback&&"img"===c.nodeName.toLowerCase()&&J.setup.supportsCanvas&&"svg"===o.renderer&&(o=B(o,{renderer:"canvas"}))),d.font&&"canvas"==o.renderer&&(o.reRender=!0),"background"==b)null==c.getAttribute("data-background-src")&&r(c,{"data-background-src":n});else{var p={};p[J.vars.dataAttr]=n,r(c,p)}d.theme=g,c.holderData={flags:d,engineSettings:o},("image"==b||"fluid"==b)&&r(c,{alt:g.text?g.text+" ["+h+"]":h});var q={mode:b,el:c,holderSettings:{dimensions:f,theme:g,flags:d},engineSettings:o};"image"==b?("html"!=o.renderer&&d.auto||(c.style.width=f.width+"px",c.style.height=f.height+"px"),"html"==o.renderer?c.style.backgroundColor=g.background:(i(q),"exact"==d.textmode&&(c.holderData.resizeUpdate=!0,J.vars.resizableImages.push(c),l(c)))):"background"==b&&"html"!=o.renderer?i(q):"fluid"==b&&(c.holderData.resizeUpdate=!0,"%"==f.height.slice(-1)?c.style.height=f.height:null!=d.auto&&d.auto||(c.style.height=f.height+"px"),"%"==f.width.slice(-1)?c.style.width=f.width:null!=d.auto&&d.auto||(c.style.width=f.width+"px"),("inline"==c.style.display||""===c.style.display||"none"==c.style.display)&&(c.style.display="block"),m(c),"html"==o.renderer?c.style.backgroundColor=g.background:(J.vars.resizableImages.push(c),l(c)))}function i(a){function c(){var b=null;switch(h.renderer){case"canvas":b=L(k,a);break;case"svg":b=M(k,a);break;default:throw"Holder: invalid renderer: "+h.renderer}return b}var d=null,e=a.mode,f=a.holderSettings,g=a.el,h=a.engineSettings;switch(h.renderer){case"svg":if(!J.setup.supportsSVG)return;break;case"canvas":if(!J.setup.supportsCanvas)return;break;default:return}var i={width:f.dimensions.width,height:f.dimensions.height,theme:f.theme,flags:f.flags},k=j(i);if(d=c(),null==d)throw"Holder: couldn't render placeholder";"background"==e?(g.style.backgroundImage="url("+d+")",g.style.backgroundSize=i.width+"px "+i.height+"px"):("img"===g.nodeName.toLowerCase()?r(g,{src:d}):"object"===g.nodeName.toLowerCase()&&(r(g,{data:d}),r(g,{type:"image/svg+xml"})),h.reRender&&b.setTimeout(function(){var a=c();if(null==a)throw"Holder: couldn't render placeholder";"img"===g.nodeName.toLowerCase()?r(g,{src:a}):"object"===g.nodeName.toLowerCase()&&(r(g,{data:a}),r(g,{type:"image/svg+xml"}))},100)),r(g,{"data-holder-rendered":!0})}function j(a){function b(a,b,c,d){b.width=c,b.height=d,a.width=Math.max(a.width,b.width),a.height+=b.height}var c=J.defaults.size;switch(parseFloat(a.theme.size)?c=a.theme.size:parseFloat(a.flags.size)&&(c=a.flags.size),a.font={family:a.theme.font?a.theme.font:"Arial, Helvetica, Open Sans, sans-serif",size:k(a.width,a.height,c),units:a.theme.units?a.theme.units:J.defaults.units,weight:a.theme.fontweight?a.theme.fontweight:"bold"},a.text=a.theme.text||Math.floor(a.width)+"x"+Math.floor(a.height),a.noWrap=a.theme.nowrap||a.flags.nowrap,a.align=a.theme.align||a.flags.align||"center",a.flags.textmode){case"literal":a.text=a.flags.dimensions.width+"x"+a.flags.dimensions.height;break;case"exact":if(!a.flags.exactDimensions)break;a.text=Math.floor(a.flags.exactDimensions.width)+"x"+Math.floor(a.flags.exactDimensions.height)}var d=new y({width:a.width,height:a.height}),e=d.Shape,f=new e.Rect("holderBg",{fill:a.theme.background});f.resize(a.width,a.height),d.root.add(f);var g=new e.Group("holderTextGroup",{text:a.text,align:a.align,font:a.font,fill:a.theme.foreground});g.moveTo(null,null,1),d.root.add(g);var h=g.textPositionData=K(d);if(!h)throw"Holder: staging fallback not supported yet.";g.properties.leading=h.boundingBox.height;var i=null,j=null,l=a.width*J.setup.lineWrapRatio,m=l;if(h.lineCount>1){var n,o=0,p=0,q=0;j=new e.Group("line"+q),("left"===a.align||"right"===a.align)&&(m=a.width*(1-2*(1-J.setup.lineWrapRatio)));for(var r=0;r<h.words.length;r++){var s=h.words[r];i=new e.Text(s.text);var t="\\n"==s.text;!a.noWrap&&(o+s.width>=m||t===!0)&&(b(g,j,o,g.properties.leading),g.add(j),o=0,p+=g.properties.leading,q+=1,j=new e.Group("line"+q),j.y=p),t!==!0&&(i.moveTo(o,0),o+=h.spaceWidth+s.width,j.add(i))}if(b(g,j,o,g.properties.leading),g.add(j),"left"===a.align)g.moveTo(a.width-l,null,null);else if("right"===a.align){for(n in g.children)j=g.children[n],j.moveTo(a.width-j.width,null,null);g.moveTo(0-(a.width-l),null,null)}else{for(n in g.children)j=g.children[n],j.moveTo((g.width-j.width)/2,null,null);g.moveTo((a.width-g.width)/2,null,null)}g.moveTo(null,(a.height-g.height)/2,null),(a.height-g.height)/2<0&&g.moveTo(null,0,null)}else i=new e.Text(a.text),j=new e.Group("line0"),j.add(i),g.add(j),"left"===a.align?g.moveTo(a.width-l,null,null):"right"===a.align?g.moveTo(0-(a.width-l),null,null):g.moveTo((a.width-h.boundingBox.width)/2,null,null),g.moveTo(null,(a.height-h.boundingBox.height)/2,null);return d}function k(a,b,c){var d=parseInt(a,10),e=parseInt(b,10),f=Math.max(d,e),g=Math.min(d,e),h=.8*Math.min(g,f*J.defaults.scale);return Math.round(Math.max(c,h))}function l(a){var b;b=null==a||null==a.nodeType?J.vars.resizableImages:[a];for(var c=0,d=b.length;d>c;c++){var e=b[c];if(e.holderData){var f=e.holderData.flags,g=D(e);if(g){if(!e.holderData.resizeUpdate)continue;if(f.fluid&&f.auto){var h=e.holderData.fluidConfig;switch(h.mode){case"width":g.height=g.width/h.ratio;break;case"height":g.width=g.height*h.ratio}}var j={mode:"image",holderSettings:{dimensions:g,theme:f.theme,flags:f},el:e,engineSettings:e.holderData.engineSettings};"exact"==f.textmode&&(f.exactDimensions=g,j.holderSettings.dimensions=f.dimensions),i(j)}else p(e)}}}function m(a){if(a.holderData){var b=D(a);if(b){var c=a.holderData.flags,d={fluidHeight:"%"==c.dimensions.height.slice(-1),fluidWidth:"%"==c.dimensions.width.slice(-1),mode:null,initialDimensions:b};d.fluidWidth&&!d.fluidHeight?(d.mode="width",d.ratio=d.initialDimensions.width/parseFloat(c.dimensions.height)):!d.fluidWidth&&d.fluidHeight&&(d.mode="height",d.ratio=parseFloat(c.dimensions.width)/d.initialDimensions.height),a.holderData.fluidConfig=d}else p(a)}}function n(){for(var a,c=[],d=Object.keys(J.vars.invisibleImages),e=0,f=d.length;f>e;e++)a=J.vars.invisibleImages[d[e]],D(a)&&"img"==a.nodeName.toLowerCase()&&(c.push(a),delete J.vars.invisibleImages[d[e]]);c.length&&I.run({images:c}),b.requestAnimationFrame(n)}function o(){J.vars.visibilityCheckStarted||(b.requestAnimationFrame(n),J.vars.visibilityCheckStarted=!0)}function p(a){a.holderData.invisibleId||(J.vars.invisibleId+=1,J.vars.invisibleImages["i"+J.vars.invisibleId]=a,a.holderData.invisibleId=J.vars.invisibleId)}function q(a,b){return null==b?document.createElement(a):document.createElementNS(b,a)}function r(a,b){for(var c in b)a.setAttribute(c,b[c])}function s(a,b,c){var d,e;null==a?(a=q("svg",E),d=q("defs",E),e=q("style",E),r(e,{type:"text/css"}),d.appendChild(e),a.appendChild(d)):e=a.querySelector("style"),a.webkitMatchesSelector&&a.setAttribute("xmlns",E);for(var f=0;f<a.childNodes.length;f++)a.childNodes[f].nodeType===F&&a.removeChild(a.childNodes[f]);for(;e.childNodes.length;)e.removeChild(e.childNodes[0]);return r(a,{width:b,height:c,viewBox:"0 0 "+b+" "+c,preserveAspectRatio:"none"}),a}function t(a,c){if(b.XMLSerializer){var d=new XMLSerializer,e="",f=c.stylesheets;if(c.svgXMLStylesheet){for(var g=u(),h=f.length-1;h>=0;h--){var i=g.createProcessingInstruction("xml-stylesheet",'href="'+f[h]+'" rel="stylesheet"');g.insertBefore(i,g.firstChild)}g.removeChild(g.documentElement),e=d.serializeToString(g)}var j=d.serializeToString(a);return j=j.replace(/\&amp;(\#[0-9]{2,}\;)/g,"&$1"),e+j}}function u(){return b.DOMParser?(new DOMParser).parseFromString("<xml />","application/xml"):void 0}function v(a){J.vars.debounceTimer||a.call(this),J.vars.debounceTimer&&b.clearTimeout(J.vars.debounceTimer),J.vars.debounceTimer=b.setTimeout(function(){J.vars.debounceTimer=null,a.call(this)},J.setup.debounce)}function w(){v(function(){l(null)})}var x=c(1),y=c(2),z=c(3),A=c(4),B=z.extend,C=z.getNodeArray,D=z.dimensionCheck,E="http://www.w3.org/2000/svg",F=8,G="2.7.1",H="\nCreated with Holder.js "+G+".\nLearn more at http://holderjs.com\n(c) 2012-2015 Ivan Malopinsky - http://imsky.co\n",I={version:G,addTheme:function(a,b){return null!=a&&null!=b&&(J.settings.themes[a]=b),delete J.vars.cache.themeKeys,this},addImage:function(a,b){var c=document.querySelectorAll(b);if(c.length)for(var d=0,e=c.length;e>d;d++){var f=q("img"),g={};g[J.vars.dataAttr]=a,r(f,g),c[d].appendChild(f)}return this},setResizeUpdate:function(a,b){a.holderData&&(a.holderData.resizeUpdate=!!b,a.holderData.resizeUpdate&&l(a))},run:function(a){a=a||{};var c={},f=B(J.settings,a);J.vars.preempted=!0,J.vars.dataAttr=f.dataAttr||J.vars.dataAttr,c.renderer=f.renderer?f.renderer:J.setup.renderer,-1===J.setup.renderers.join(",").indexOf(c.renderer)&&(c.renderer=J.setup.supportsSVG?"svg":J.setup.supportsCanvas?"canvas":"html");var g=C(f.images),i=C(f.bgnodes),j=C(f.stylenodes),k=C(f.objects);c.stylesheets=[],c.svgXMLStylesheet=!0,c.noFontFallback=f.noFontFallback?f.noFontFallback:!1;for(var l=0;l<j.length;l++){var m=j[l];if(m.attributes.rel&&m.attributes.href&&"stylesheet"==m.attributes.rel.value){var n=m.attributes.href.value,o=q("a");o.href=n;var p=o.protocol+"//"+o.host+o.pathname+o.search;c.stylesheets.push(p)}}for(l=0;l<i.length;l++)if(b.getComputedStyle){var r=b.getComputedStyle(i[l],null).getPropertyValue("background-image"),s=i[l].getAttribute("data-background-src"),t=null;t=null==s?r:s;var u=null,v="?"+f.domain+"/";if(0===t.indexOf(v))u=t.slice(1);else if(-1!=t.indexOf(v)){var w=t.substr(t.indexOf(v)).slice(1),x=w.match(/([^\"]*)"?\)/);null!=x&&(u=x[1])}if(null!=u){var y=e(u,f);y&&h({mode:"background",el:i[l],flags:y,engineSettings:c})}}for(l=0;l<k.length;l++){var A=k[l],D={};try{D.data=A.getAttribute("data"),D.dataSrc=A.getAttribute(J.vars.dataAttr)}catch(E){}var F=null!=D.data&&0===D.data.indexOf(f.domain),G=null!=D.dataSrc&&0===D.dataSrc.indexOf(f.domain);F?d(f,c,D.data,A):G&&d(f,c,D.dataSrc,A)}for(l=0;l<g.length;l++){var H=g[l],I={};try{I.src=H.getAttribute("src"),I.dataSrc=H.getAttribute(J.vars.dataAttr),I.rendered=H.getAttribute("data-holder-rendered")}catch(E){}var K=null!=I.src,L=null!=I.dataSrc&&0===I.dataSrc.indexOf(f.domain),M=null!=I.rendered&&"true"==I.rendered;K?0===I.src.indexOf(f.domain)?d(f,c,I.src,H):L&&(M?d(f,c,I.dataSrc,H):!function(a,b,c,e,f){z.imageExists(a,function(a){a||d(b,c,e,f)})}(I.src,f,c,I.dataSrc,H)):L&&d(f,c,I.dataSrc,H)}return this}},J={settings:{domain:"holder.js",images:"img",objects:"object",bgnodes:"body .holderjs",stylenodes:"head link.holderjs",stylesheets:[],themes:{gray:{background:"#EEEEEE",foreground:"#AAAAAA"},social:{background:"#3a5a97",foreground:"#FFFFFF"},industrial:{background:"#434A52",foreground:"#C2F200"},sky:{background:"#0D8FDB",foreground:"#FFFFFF"},vine:{background:"#39DBAC",foreground:"#1E292C"},lava:{background:"#F8591A",foreground:"#1C2846"}}},defaults:{size:10,units:"pt",scale:1/16},flags:{dimensions:{regex:/^(\d+)x(\d+)$/,output:function(a){var b=this.regex.exec(a);return{width:+b[1],height:+b[2]}}},fluid:{regex:/^([0-9]+%?)x([0-9]+%?)$/,output:function(a){var b=this.regex.exec(a);return{width:b[1],height:b[2]}}},colors:{regex:/(?:#|\^)([0-9a-f]{3,})\:(?:#|\^)([0-9a-f]{3,})/i,output:function(a){var b=this.regex.exec(a);return{foreground:"#"+b[2],background:"#"+b[1]}}},text:{regex:/text\:(.*)/,output:function(a){return this.regex.exec(a)[1].replace("\\/","/")}},font:{regex:/font\:(.*)/,output:function(a){return this.regex.exec(a)[1]}},auto:{regex:/^auto$/},textmode:{regex:/textmode\:(.*)/,output:function(a){return this.regex.exec(a)[1]}},random:{regex:/^random$/},size:{regex:/size\:(\d+)/,output:function(a){return this.regex.exec(a)[1]}}}},K=function(){var a=null,b=null,c=null;return function(d){var e=d.root;if(J.setup.supportsSVG){var f=!1,g=function(a){return document.createTextNode(a)};(null==a||a.parentNode!==document.body)&&(f=!0),a=s(a,e.properties.width,e.properties.height),a.style.display="block",f&&(b=q("text",E),c=g(null),r(b,{x:0}),b.appendChild(c),a.appendChild(b),document.body.appendChild(a),a.style.visibility="hidden",a.style.position="absolute",a.style.top="-100%",a.style.left="-100%");var h=e.children.holderTextGroup,i=h.properties;r(b,{y:i.font.size,style:z.cssProps({"font-weight":i.font.weight,"font-size":i.font.size+i.font.units,"font-family":i.font.family})}),c.nodeValue=i.text;var j=b.getBBox(),k=Math.ceil(j.width/(e.properties.width*J.setup.lineWrapRatio)),l=i.text.split(" "),m=i.text.match(/\\n/g);k+=null==m?0:m.length,c.nodeValue=i.text.replace(/[ ]+/g,"");var n=b.getComputedTextLength(),o=j.width-n,p=Math.round(o/Math.max(1,l.length-1)),t=[];if(k>1){c.nodeValue="";for(var u=0;u<l.length;u++)if(0!==l[u].length){c.nodeValue=z.decodeHtmlEntity(l[u]);var v=b.getBBox();t.push({text:l[u],width:v.width})}}return a.style.display="none",{spaceWidth:p,lineCount:k,boundingBox:j,words:t}}return!1}}(),L=function(){var a=q("canvas"),b=null;return function(c){null==b&&(b=a.getContext("2d"));var d=c.root;a.width=J.dpr(d.properties.width),a.height=J.dpr(d.properties.height),b.textBaseline="middle",b.fillStyle=d.children.holderBg.properties.fill,b.fillRect(0,0,J.dpr(d.children.holderBg.width),J.dpr(d.children.holderBg.height));{var e=d.children.holderTextGroup;e.properties}b.font=e.properties.font.weight+" "+J.dpr(e.properties.font.size)+e.properties.font.units+" "+e.properties.font.family+", monospace",b.fillStyle=e.properties.fill;for(var f in e.children){var g=e.children[f];for(var h in g.children){var i=g.children[h],j=J.dpr(e.x+g.x+i.x),k=J.dpr(e.y+g.y+i.y+e.properties.leading/2);b.fillText(i.properties.text,j,k)}}return a.toDataURL("image/png")}}(),M=function(){if(b.XMLSerializer){var a=u(),c=s(null,0,0),d=q("rect",E);return c.appendChild(d),function(b,e){var f=b.root;s(c,f.properties.width,f.properties.height);for(var g=c.querySelectorAll("g"),h=0;h<g.length;h++)g[h].parentNode.removeChild(g[h]);var i=e.holderSettings.flags.holderURL,j="holder_"+(Number(new Date)+32768+(0|32768*Math.random())).toString(16),k=q("g",E),l=f.children.holderTextGroup,m=l.properties,n=q("g",E),o=l.textPositionData,p="#"+j+" text { "+z.cssProps({fill:m.fill,"font-weight":m.font.weight,"font-family":m.font.family+", monospace","font-size":m.font.size+m.font.units})+" } ",u=a.createComment("\nSource URL: "+i+H),v=a.createCDATASection(p),w=c.querySelector("style");r(k,{id:j}),c.insertBefore(u,c.firstChild),w.appendChild(v),k.appendChild(d),k.appendChild(n),c.appendChild(k),r(d,{width:f.children.holderBg.width,height:f.children.holderBg.height,fill:f.children.holderBg.properties.fill}),l.y+=.8*o.boundingBox.height;for(var x in l.children){var y=l.children[x];for(var A in y.children){var B=y.children[A],C=l.x+y.x+B.x,D=l.y+y.y+B.y,F=q("text",E),G=document.createTextNode(null);r(F,{x:C,y:D}),G.nodeValue=B.properties.text,F.appendChild(G),n.appendChild(F)}}var I=N(t(c,e.engineSettings),"background"===e.mode);return I}}}(),N=function(){var a="data:image/svg+xml;charset=UTF-8,",b="data:image/svg+xml;charset=UTF-8;base64,";return function(c,d){return d?b+btoa(unescape(encodeURIComponent(c))):a+encodeURIComponent(c)}}();for(var O in J.flags)J.flags.hasOwnProperty(O)&&(J.flags[O].match=function(a){return a.match(this.regex)});J.setup={renderer:"html",debounce:100,ratio:1,supportsCanvas:!1,supportsSVG:!1,lineWrapRatio:.9,renderers:["html","canvas","svg"]},J.dpr=function(a){return a*J.setup.ratio},J.vars={preempted:!1,resizableImages:[],invisibleImages:{},invisibleId:0,visibilityCheckStarted:!1,debounceTimer:null,cache:{},dataAttr:"data-src"},function(){var a=1,c=1,d=q("canvas"),e=null;d.getContext&&-1!=d.toDataURL("image/png").indexOf("data:image/png")&&(J.setup.renderer="canvas",e=d.getContext("2d"),J.setup.supportsCanvas=!0),J.setup.supportsCanvas&&(a=b.devicePixelRatio||1,c=e.webkitBackingStorePixelRatio||e.mozBackingStorePixelRatio||e.msBackingStorePixelRatio||e.oBackingStorePixelRatio||e.backingStorePixelRatio||1),J.setup.ratio=a/c,document.createElementNS&&document.createElementNS(E,"svg").createSVGRect&&(J.setup.renderer="svg",J.setup.supportsSVG=!0)}(),o(),x&&x(function(){J.vars.preempted||I.run(),b.addEventListener?(b.addEventListener("resize",w,!1),b.addEventListener("orientationchange",w,!1)):b.attachEvent("onresize",w),"object"==typeof b.Turbolinks&&b.document.addEventListener("page:change",function(){I.run()})}),a.exports=I}).call(b,function(){return this}())},function(a){function b(a){function b(a){if(!v){if(!g.body)return e(b);for(v=!0;a=w.shift();)e(a)}}function c(a){(t||a.type===i||g[m]===l)&&(d(),b())}function d(){t?(g[s](q,c,j),a[s](i,c,j)):(g[o](r,c),a[o](k,c))}function e(a,b){setTimeout(a,+b>=0?b:1)}function f(a){v?e(a):w.push(a)}null==document.readyState&&document.addEventListener&&(document.addEventListener("DOMContentLoaded",function y(){document.removeEventListener("DOMContentLoaded",y,!1),document.readyState="complete"},!1),document.readyState="loading");var g=a.document,h=g.documentElement,i="load",j=!1,k="on"+i,l="complete",m="readyState",n="attachEvent",o="detachEvent",p="addEventListener",q="DOMContentLoaded",r="onreadystatechange",s="removeEventListener",t=p in g,u=j,v=j,w=[];if(g[m]===l)e(b);else if(t)g[p](q,c,j),a[p](i,c,j);else{g[n](r,c),a[n](k,c);try{u=null==a.frameElement&&h}catch(x){}u&&u.doScroll&&!function z(){if(!v){try{u.doScroll("left")}catch(a){return e(z,50)}d(),b()}}()}return f.version="1.4.0",f.isReady=function(){return v},f}a.exports="undefined"!=typeof window&&b(window)},function(a,b,c){var d=c(5),e=function(a){function b(a,b){for(var c in b)a[c]=b[c];return a}var c=1,e=d.defclass({constructor:function(a){c++,this.parent=null,this.children={},this.id=c,this.name="n"+c,null!=a&&(this.name=a),this.x=0,this.y=0,this.z=0,this.width=0,this.height=0},resize:function(a,b){null!=a&&(this.width=a),null!=b&&(this.height=b)},moveTo:function(a,b,c){this.x=null!=a?a:this.x,this.y=null!=b?b:this.y,this.z=null!=c?c:this.z},add:function(a){var b=a.name;if(null!=this.children[b])throw"SceneGraph: child with that name already exists: "+b;this.children[b]=a,a.parent=this}}),f=d(e,function(b){this.constructor=function(){b.constructor.call(this,"root"),this.properties=a}}),g=d(e,function(a){function c(c,d){if(a.constructor.call(this,c),this.properties={fill:"#000"},null!=d)b(this.properties,d);else if(null!=c&&"string"!=typeof c)throw"SceneGraph: invalid node name"}this.Group=d.extend(this,{constructor:c,type:"group"}),this.Rect=d.extend(this,{constructor:c,type:"rect"}),this.Text=d.extend(this,{constructor:function(a){c.call(this),this.properties.text=a},type:"text"})}),h=new f;return this.Shape=g,this.root=h,this};a.exports=e},function(a,b){(function(a){b.extend=function(a,b){var c={};for(var d in a)a.hasOwnProperty(d)&&(c[d]=a[d]);if(null!=b)for(var e in b)b.hasOwnProperty(e)&&(c[e]=b[e]);return c},b.cssProps=function(a){var b=[];for(var c in a)a.hasOwnProperty(c)&&b.push(c+":"+a[c]);return b.join(";")},b.encodeHtmlEntity=function(a){for(var b=[],c=0,d=a.length-1;d>=0;d--)c=a.charCodeAt(d),b.unshift(c>128?["&#",c,";"].join(""):a[d]);return b.join("")},b.getNodeArray=function(b){var c=null;return"string"==typeof b?c=document.querySelectorAll(b):a.NodeList&&b instanceof a.NodeList?c=b:a.Node&&b instanceof a.Node?c=[b]:a.HTMLCollection&&b instanceof a.HTMLCollection?c=b:b instanceof Array?c=b:null===b&&(c=[]),c},b.imageExists=function(a,b){var c=new Image;c.onerror=function(){b.call(this,!1)},c.onload=function(){b.call(this,!0)},c.src=a},b.decodeHtmlEntity=function(a){return a.replace(/&#(\d+);/g,function(a,b){return String.fromCharCode(b)})},b.dimensionCheck=function(a){var b={height:a.clientHeight,width:a.clientWidth};return b.height&&b.width?b:!1},b.truthy=function(a){return"string"==typeof a?"true"===a||"yes"===a||"1"===a||"on"===a||"✓"===a:!!a}}).call(b,function(){return this}())},function(a,b,c){var d=encodeURIComponent,e=decodeURIComponent,f=c(6),g=c(7),h=/(\w+)\[(\d+)\]/,i=/\w+\.\w+/;b.parse=function(a){if("string"!=typeof a)return{};if(a=f(a),""===a)return{};"?"===a.charAt(0)&&(a=a.slice(1));for(var b={},c=a.split("&"),d=0;d<c.length;d++){var g,j,k,l=c[d].split("="),m=e(l[0]);if(g=h.exec(m))b[g[1]]=b[g[1]]||[],b[g[1]][g[2]]=e(l[1]);else if(g=i.test(m)){for(g=m.split("."),j=b;g.length;)if(k=g.shift(),k.length){if(j[k]){if(j[k]&&"object"!=typeof j[k])break}else j[k]={};g.length||(j[k]=e(l[1])),j=j[k]}}else b[l[0]]=null==l[1]?"":e(l[1])}return b},b.stringify=function(a){if(!a)return"";var b=[];for(var c in a){var e=a[c];if("array"!=g(e))b.push(d(c)+"="+d(a[c]));else for(var f=0;f<e.length;++f)b.push(d(c+"["+f+"]")+"="+d(e[f]))}return b.join("&")}},function(a){var b=function(){},c=Array.prototype.slice,d=function(a,d){var e=b.prototype="function"==typeof a?a.prototype:a,f=new b,g=d.apply(f,c.call(arguments,2).concat(e));if("object"==typeof g)for(var h in g)f[h]=g[h];if(!f.hasOwnProperty("constructor"))return f;var i=f.constructor;return i.prototype=f,i};d.defclass=function(a){var b=a.constructor;return b.prototype=a,b},d.extend=function(a,b){return d(a,function(a){return this.uber=a,b})},a.exports=d},function(a,b){function c(a){return a.replace(/^\s*|\s*$/g,"")}b=a.exports=c,b.left=function(a){return a.replace(/^\s*/,"")},b.right=function(a){return a.replace(/\s*$/,"")}},function(a){var b=Object.prototype.toString;a.exports=function(a){switch(b.call(a)){case"[object Date]":return"date";case"[object RegExp]":return"regexp";case"[object Arguments]":return"arguments";case"[object Array]":return"array";case"[object Error]":return"error"}return null===a?"null":void 0===a?"undefined":a!==a?"nan":a&&1===a.nodeType?"element":(a=a.valueOf?a.valueOf():Object.prototype.valueOf.apply(a),typeof a)}}])}),function(a,b){b&&(Holder=a.Holder)}(this,"undefined"!=typeof Meteor&&"undefined"!=typeof Package);
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js
deleted file mode 100644
index d4c731a..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
-* @preserve HTML5 Shiv 3.7.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.2",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b)}(this,document);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
deleted file mode 100644
index 0f60b7b..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
-
-return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ca()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ca()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?aa:ba):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=aa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=aa,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=aa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=ba;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=ba),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function da(a){var b=ea.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var ea="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fa=/ jQuery\d+="(?:null|\d+)"/g,ga=new RegExp("<(?:"+ea+")[\\s/>]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/<tbody/i,la=/<|&#?\w+;/,ma=/<(?:script|style|link)/i,na=/checked\s*(?:[^=]|=\s*.checked.)/i,oa=/^$|\/(?:java|ecma)script/i,pa=/^true\/(.*)/,qa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ra={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"<table>"!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ca[0].contentWindow||Ca[0].contentDocument).document,b.write(),b.close(),c=Ea(a,b),Ca.detach()),Da[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Ga=/^margin/,Ha=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ia,Ja,Ka=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ia=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Ha.test(g)&&Ga.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ia=function(a){return a.currentStyle},Ja=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ia(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ha.test(g)&&!Ka.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function La(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Ma=/alpha\([^)]*\)/i,Na=/opacity\s*=\s*([^)]*)/,Oa=/^(none|table(?!-c[ea]).+)/,Pa=new RegExp("^("+S+")(.*)$","i"),Qa=new RegExp("^([+-])=("+S+")","i"),Ra={position:"absolute",visibility:"hidden",display:"block"},Sa={letterSpacing:"0",fontWeight:"400"},Ta=["Webkit","O","Moz","ms"];function Ua(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ta.length;while(e--)if(b=Ta[e]+c,b in a)return b;return d}function Va(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fa(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wa(a,b,c){var d=Pa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Ya(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ia(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Ja(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ha.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xa(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ja(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ua(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qa.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ua(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Ja(a,b,d)),"normal"===f&&b in Sa&&(f=Sa[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Oa.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Ra,function(){return Ya(a,b,d)}):Ya(a,b,d):void 0},set:function(a,c,d){var e=d&&Ia(a);return Wa(a,c,d?Xa(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Na.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Ma,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Ma.test(f)?f.replace(Ma,e):f+" "+e)}}),m.cssHooks.marginRight=La(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Ja,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Ga.test(a)||(m.cssHooks[a+b].set=Wa)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ia(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Va(this,!0)},hide:function(){return Va(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Za(a,b,c,d,e){
-return new Za.prototype.init(a,b,c,d,e)}m.Tween=Za,Za.prototype={constructor:Za,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Za.propHooks[this.prop];return a&&a.get?a.get(this):Za.propHooks._default.get(this)},run:function(a){var b,c=Za.propHooks[this.prop];return this.options.duration?this.pos=b=m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Za.propHooks._default.set(this),this}},Za.prototype.init.prototype=Za.prototype,Za.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Za.propHooks.scrollTop=Za.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Za.prototype.init,m.fx.step={};var $a,_a,ab=/^(?:toggle|show|hide)$/,bb=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cb=/queueHooks$/,db=[ib],eb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bb.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bb.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fb(){return setTimeout(function(){$a=void 0}),$a=m.now()}function gb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hb(a,b,c){for(var d,e=(eb[b]||[]).concat(eb["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fa(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fa(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ab.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fa(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hb(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=db.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$a||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$a||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);g>f;f++)if(d=db[f].call(j,a,k,j.opts))return d;return m.map(k,hb,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kb,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],eb[c]=eb[c]||[],eb[c].unshift(b)},prefilter:function(a,b){b?db.unshift(a):db.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kb(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),m.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($a=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$a=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_a||(_a=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_a),_a=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lb=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lb,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mb,nb,ob=m.expr.attrHandle,pb=/^(?:checked|selected)$/i,qb=k.getSetAttribute,rb=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nb:mb)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rb&&qb||!pb.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qb?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nb={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rb&&qb||!pb.test(c)?a.setAttribute(!qb&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ob[b]||m.find.attr;ob[b]=rb&&qb||!pb.test(b)?function(a,b,d){var e,f;return d||(f=ob[b],ob[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,ob[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rb&&qb||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mb&&mb.set(a,b,c)}}),qb||(mb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},ob.id=ob.name=ob.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mb.set},m.attrHooks.contenteditable={set:function(a,b,c){mb.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sb=/^(?:input|select|textarea|button|object)$/i,tb=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sb.test(a.nodeName)||tb.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var ub=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ub," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ub," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vb=m.now(),wb=/\?/,xb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yb,zb,Ab=/#.*$/,Bb=/([?&])_=[^&]*/,Cb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Db=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Eb=/^(?:GET|HEAD)$/,Fb=/^\/\//,Gb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hb={},Ib={},Jb="*/".concat("*");try{zb=location.href}catch(Kb){zb=y.createElement("a"),zb.href="",zb=zb.href}yb=Gb.exec(zb.toLowerCase())||[];function Lb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mb(a,b,c,d){var e={},f=a===Ib;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nb(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Ob(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zb,type:"GET",isLocal:Db.test(yb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nb(Nb(a,m.ajaxSettings),b):Nb(m.ajaxSettings,a)},ajaxPrefilter:Lb(Hb),ajaxTransport:Lb(Ib),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cb.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zb)+"").replace(Ab,"").replace(Fb,yb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gb.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yb[1]&&c[2]===yb[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yb[3]||("http:"===yb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mb(Hb,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Eb.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wb.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bb.test(e)?e.replace(Bb,"$1_="+vb++):e+(wb.test(e)?"&":"?")+"_="+vb++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jb+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mb(Ib,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Ob(k,v,c)),u=Pb(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qb=/%20/g,Rb=/\[\]$/,Sb=/\r?\n/g,Tb=/^(?:submit|button|image|reset|file)$/i,Ub=/^(?:input|select|textarea|keygen)/i;function Vb(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rb.test(a)?d(a,e):Vb(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vb(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vb(c,a[c],b,e);return d.join("&").replace(Qb,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Ub.test(this.nodeName)&&!Tb.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sb,"\r\n")}}):{name:b.name,value:c.replace(Sb,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zb()||$b()}:Zb;var Wb=0,Xb={},Yb=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xb)Xb[a](void 0,!0)}),k.cors=!!Yb&&"withCredentials"in Yb,Yb=k.ajax=!!Yb,Yb&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xb[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xb[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zb(){try{return new a.XMLHttpRequest}catch(b){}}function $b(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _b=[],ac=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_b.pop()||m.expando+"_"+vb++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ac.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ac.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ac,"$1"+e):b.jsonp!==!1&&(b.url+=(wb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_b.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bc=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bc)return bc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
deleted file mode 100644
index 61d35d3..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* nvd3 version 1.8.1 (https://github.com/novus/nvd3) 2015-06-17 */
-!function(){var a={};a.dev=!1,a.tooltip=a.tooltip||{},a.utils=a.utils||{},a.models=a.models||{},a.charts={},a.logs={},a.dom={},a.dispatch=d3.dispatch("render_start","render_end"),Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),a.dev&&(a.dispatch.on("render_start",function(){a.logs.startTime=+new Date}),a.dispatch.on("render_end",function(){a.logs.endTime=+new Date,a.logs.totalTime=a.logs.endTime-a.logs.startTime,a.log("total",a.logs.totalTime)})),a.log=function(){if(a.dev&&window.console&&console.log&&console.log.apply)console.log.apply(console,arguments);else if(a.dev&&window.console&&"function"==typeof console.log&&Function.prototype.bind){var b=Function.prototype.bind.call(console.log,console);b.apply(console,arguments)}return arguments[arguments.length-1]},a.deprecated=function(a,b){console&&console.warn&&console.warn("nvd3 warning: `"+a+"` has been deprecated. ",b||"")},a.render=function(b){b=b||1,a.render.active=!0,a.dispatch.render_start();var c=function(){for(var d,e,f=0;b>f&&(e=a.render.queue[f]);f++)d=e.generate(),typeof e.callback==typeof Function&&e.callback(d);a.render.queue.splice(0,f),a.render.queue.length?setTimeout(c):(a.dispatch.render_end(),a.render.active=!1)};setTimeout(c)},a.render.active=!1,a.render.queue=[],a.addGraph=function(b){typeof arguments[0]==typeof Function&&(b={generate:arguments[0],callback:arguments[1]}),a.render.queue.push(b),a.render.active||a.render()},"undefined"!=typeof module&&"undefined"!=typeof exports&&(module.exports=a),"undefined"!=typeof window&&(window.nv=a),a.dom.write=function(a){return void 0!==window.fastdom?fastdom.write(a):a()},a.dom.read=function(a){return void 0!==window.fastdom?fastdom.read(a):a()},a.interactiveGuideline=function(){"use strict";function b(l){l.each(function(l){function m(){var a=d3.mouse(this),d=a[0],e=a[1],i=!0,j=!1;if(k&&(d=d3.event.offsetX,e=d3.event.offsetY,"svg"!==d3.event.target.tagName&&(i=!1),d3.event.target.className.baseVal.match("nv-legend")&&(j=!0)),i&&(d-=f.left,e-=f.top),0>d||0>e||d>o||e>p||d3.event.relatedTarget&&void 0===d3.event.relatedTarget.ownerSVGElement||j){if(k&&d3.event.relatedTarget&&void 0===d3.event.relatedTarget.ownerSVGElement&&(void 0===d3.event.relatedTarget.className||d3.event.relatedTarget.className.match(c.nvPointerEventsClass)))return;return h.elementMouseout({mouseX:d,mouseY:e}),b.renderGuideLine(null),void c.hidden(!0)}c.hidden(!1);var l=g.invert(d);h.elementMousemove({mouseX:d,mouseY:e,pointXValue:l}),"dblclick"===d3.event.type&&h.elementDblclick({mouseX:d,mouseY:e,pointXValue:l}),"click"===d3.event.type&&h.elementClick({mouseX:d,mouseY:e,pointXValue:l})}var n=d3.select(this),o=d||960,p=e||400,q=n.selectAll("g.nv-wrap.nv-interactiveLineLayer").data([l]),r=q.enter().append("g").attr("class"," nv-wrap nv-interactiveLineLayer");r.append("g").attr("class","nv-interactiveGuideLine"),j&&(j.on("touchmove",m).on("mousemove",m,!0).on("mouseout",m,!0).on("dblclick",m).on("click",m),b.guideLine=null,b.renderGuideLine=function(c){i&&(b.guideLine&&b.guideLine.attr("x1")===c||a.dom.write(function(){var b=q.select(".nv-interactiveGuideLine").selectAll("line").data(null!=c?[a.utils.NaNtoZero(c)]:[],String);b.enter().append("line").attr("class","nv-guideline").attr("x1",function(a){return a}).attr("x2",function(a){return a}).attr("y1",p).attr("y2",0),b.exit().remove()}))})})}var c=a.models.tooltip();c.duration(0).hideDelay(0)._isInteractiveLayer(!0).hidden(!1);var d=null,e=null,f={left:0,top:0},g=d3.scale.linear(),h=d3.dispatch("elementMousemove","elementMouseout","elementClick","elementDblclick"),i=!0,j=null,k="ActiveXObject"in window;return b.dispatch=h,b.tooltip=c,b.margin=function(a){return arguments.length?(f.top="undefined"!=typeof a.top?a.top:f.top,f.left="undefined"!=typeof a.left?a.left:f.left,b):f},b.width=function(a){return arguments.length?(d=a,b):d},b.height=function(a){return arguments.length?(e=a,b):e},b.xScale=function(a){return arguments.length?(g=a,b):g},b.showGuideLine=function(a){return arguments.length?(i=a,b):i},b.svgContainer=function(a){return arguments.length?(j=a,b):j},b},a.interactiveBisect=function(a,b,c){"use strict";if(!(a instanceof Array))return null;var d;d="function"!=typeof c?function(a){return a.x}:c;var e=function(a,b){return d(a)-b},f=d3.bisector(e).left,g=d3.max([0,f(a,b)-1]),h=d(a[g]);if("undefined"==typeof h&&(h=g),h===b)return g;var i=d3.min([g+1,a.length-1]),j=d(a[i]);return"undefined"==typeof j&&(j=i),Math.abs(j-b)>=Math.abs(h-b)?g:i},a.nearestValueIndex=function(a,b,c){"use strict";var d=1/0,e=null;return a.forEach(function(a,f){var g=Math.abs(b-a);null!=a&&d>=g&&c>g&&(d=g,e=f)}),e},function(){"use strict";a.models.tooltip=function(){function b(){if(k){var a=d3.select(k);"svg"!==a.node().tagName&&(a=a.select("svg"));var b=a.node()?a.attr("viewBox"):null;if(b){b=b.split(" ");var c=parseInt(a.style("width"),10)/b[2];p.left=p.left*c,p.top=p.top*c}}}function c(){if(!n){var a;a=k?k:document.body,n=d3.select(a).append("div").attr("class","nvtooltip "+(j?j:"xy-tooltip")).attr("id",v),n.style("top",0).style("left",0),n.style("opacity",0),n.selectAll("div, table, td, tr").classed(w,!0),n.classed(w,!0),o=n.node()}}function d(){if(r&&B(e)){b();var f=p.left,g=null!==i?i:p.top;return a.dom.write(function(){c();var b=A(e);b&&(o.innerHTML=b),k&&u?a.dom.read(function(){var a=k.getElementsByTagName("svg")[0],b={left:0,top:0};if(a){var c=a.getBoundingClientRect(),d=k.getBoundingClientRect(),e=c.top;if(0>e){var i=k.getBoundingClientRect();e=Math.abs(e)>i.height?0:e}b.top=Math.abs(e-d.top),b.left=Math.abs(c.left-d.left)}f+=k.offsetLeft+b.left-2*k.scrollLeft,g+=k.offsetTop+b.top-2*k.scrollTop,h&&h>0&&(g=Math.floor(g/h)*h),C([f,g])}):C([f,g])}),d}}var e=null,f="w",g=25,h=0,i=null,j=null,k=null,l=!0,m=400,n=null,o=null,p={left:null,top:null},q={left:0,top:0},r=!0,s=100,t=!0,u=!1,v="nvtooltip-"+Math.floor(1e5*Math.random()),w="nv-pointer-events-none",x=function(a){return a},y=function(a){return a},z=function(a){return a},A=function(a){if(null===a)return"";var b=d3.select(document.createElement("table"));if(t){var c=b.selectAll("thead").data([a]).enter().append("thead");c.append("tr").append("td").attr("colspan",3).append("strong").classed("x-value",!0).html(y(a.value))}var d=b.selectAll("tbody").data([a]).enter().append("tbody"),e=d.selectAll("tr").data(function(a){return a.series}).enter().append("tr").classed("highlight",function(a){return a.highlight});e.append("td").classed("legend-color-guide",!0).append("div").style("background-color",function(a){return a.color}),e.append("td").classed("key",!0).html(function(a,b){return z(a.key,b)}),e.append("td").classed("value",!0).html(function(a,b){return x(a.value,b)}),e.selectAll("td").each(function(a){if(a.highlight){var b=d3.scale.linear().domain([0,1]).range(["#fff",a.color]),c=.6;d3.select(this).style("border-bottom-color",b(c)).style("border-top-color",b(c))}});var f=b.node().outerHTML;return void 0!==a.footer&&(f+="<div class='footer'>"+a.footer+"</div>"),f},B=function(a){if(a&&a.series){if(a.series instanceof Array)return!!a.series.length;if(a.series instanceof Object)return a.series=[a.series],!0}return!1},C=function(b){o&&a.dom.read(function(){var c,d,e=parseInt(o.offsetHeight,10),h=parseInt(o.offsetWidth,10),i=a.utils.windowSize().width,j=a.utils.windowSize().height,k=window.pageYOffset,p=window.pageXOffset;j=window.innerWidth>=document.body.scrollWidth?j:j-16,i=window.innerHeight>=document.body.scrollHeight?i:i-16;var r,t,u=function(a){var b=d;do isNaN(a.offsetTop)||(b+=a.offsetTop),a=a.offsetParent;while(a);return b},v=function(a){var b=c;do isNaN(a.offsetLeft)||(b+=a.offsetLeft),a=a.offsetParent;while(a);return b};switch(f){case"e":c=b[0]-h-g,d=b[1]-e/2,r=v(o),t=u(o),p>r&&(c=b[0]+g>p?b[0]+g:p-r+c),k>t&&(d=k-t+d),t+e>k+j&&(d=k+j-t+d-e);break;case"w":c=b[0]+g,d=b[1]-e/2,r=v(o),t=u(o),r+h>i&&(c=b[0]-h-g),k>t&&(d=k+5),t+e>k+j&&(d=k+j-t+d-e);break;case"n":c=b[0]-h/2-5,d=b[1]+g,r=v(o),t=u(o),p>r&&(c=p+5),r+h>i&&(c=c-h/2+5),t+e>k+j&&(d=k+j-t+d-e);break;case"s":c=b[0]-h/2,d=b[1]-e-g,r=v(o),t=u(o),p>r&&(c=p+5),r+h>i&&(c=c-h/2+5),k>t&&(d=k);break;case"none":c=b[0],d=b[1]-g,r=v(o),t=u(o)}c-=q.left,d-=q.top;var w=o.getBoundingClientRect(),k=window.pageYOffset||document.documentElement.scrollTop,p=window.pageXOffset||document.documentElement.scrollLeft,x="translate("+(w.left+p)+"px, "+(w.top+k)+"px)",y="translate("+c+"px, "+d+"px)",z=d3.interpolateString(x,y),A=n.style("opacity")<.1;l?n.transition().delay(m).duration(0).style("opacity",0):n.interrupt().transition().duration(A?0:s).styleTween("transform",function(){return z},"important").style("-webkit-transform",y).style("opacity",1)})};return d.nvPointerEventsClass=w,d.options=a.utils.optionsFunc.bind(d),d._options=Object.create({},{duration:{get:function(){return s},set:function(a){s=a}},gravity:{get:function(){return f},set:function(a){f=a}},distance:{get:function(){return g},set:function(a){g=a}},snapDistance:{get:function(){return h},set:function(a){h=a}},classes:{get:function(){return j},set:function(a){j=a}},chartContainer:{get:function(){return k},set:function(a){k=a}},fixedTop:{get:function(){return i},set:function(a){i=a}},enabled:{get:function(){return r},set:function(a){r=a}},hideDelay:{get:function(){return m},set:function(a){m=a}},contentGenerator:{get:function(){return A},set:function(a){A=a}},valueFormatter:{get:function(){return x},set:function(a){x=a}},headerFormatter:{get:function(){return y},set:function(a){y=a}},keyFormatter:{get:function(){return z},set:function(a){z=a}},headerEnabled:{get:function(){return t},set:function(a){t=a}},_isInteractiveLayer:{get:function(){return u},set:function(a){u=!!a}},position:{get:function(){return p},set:function(a){p.left=void 0!==a.left?a.left:p.left,p.top=void 0!==a.top?a.top:p.top}},offset:{get:function(){return q},set:function(a){q.left=void 0!==a.left?a.left:q.left,q.top=void 0!==a.top?a.top:q.top}},hidden:{get:function(){return l},set:function(a){l!=a&&(l=!!a,d())}},data:{get:function(){return e},set:function(a){a.point&&(a.value=a.point.x,a.series=a.series||{},a.series.value=a.point.y,a.series.color=a.point.color||a.series.color),e=a}},tooltipElem:{get:function(){return o},set:function(){}},id:{get:function(){return v},set:function(){}}}),a.utils.initOptions(d),d}}(),a.utils.windowSize=function(){var a={width:640,height:480};return window.innerWidth&&window.innerHeight?(a.width=window.innerWidth,a.height=window.innerHeight,a):"CSS1Compat"==document.compatMode&&document.documentElement&&document.documentElement.offsetWidth?(a.width=document.documentElement.offsetWidth,a.height=document.documentElement.offsetHeight,a):document.body&&document.body.offsetWidth?(a.width=document.body.offsetWidth,a.height=document.body.offsetHeight,a):a},a.utils.windowResize=function(b){return window.addEventListener?window.addEventListener("resize",b):a.log("ERROR: Failed to bind to window.resize with: ",b),{callback:b,clear:function(){window.removeEventListener("resize",b)}}},a.utils.getColor=function(b){if(void 0===b)return a.utils.defaultColor();if(Array.isArray(b)){var c=d3.scale.ordinal().range(b);return function(a,b){var d=void 0===b?a:b;return a.color||c(d)}}return b},a.utils.defaultColor=function(){return a.utils.getColor(d3.scale.category20().range())},a.utils.customTheme=function(a,b,c){b=b||function(a){return a.key},c=c||d3.scale.category20().range();var d=c.length;return function(e){var f=b(e);return"function"==typeof a[f]?a[f]():void 0!==a[f]?a[f]:(d||(d=c.length),d-=1,c[d])}},a.utils.pjax=function(b,c){var d=function(d){d3.html(d,function(d){var e=d3.select(c).node();e.parentNode.replaceChild(d3.select(d).select(c).node(),e),a.utils.pjax(b,c)})};d3.selectAll(b).on("click",function(){history.pushState(this.href,this.textContent,this.href),d(this.href),d3.event.preventDefault()}),d3.select(window).on("popstate",function(){d3.event.state&&d(d3.event.state)})},a.utils.calcApproxTextWidth=function(a){if("function"==typeof a.style&&"function"==typeof a.text){var b=parseInt(a.style("font-size").replace("px",""),10),c=a.text().length;return c*b*.5}return 0},a.utils.NaNtoZero=function(a){return"number"!=typeof a||isNaN(a)||null===a||1/0===a||a===-1/0?0:a},d3.selection.prototype.watchTransition=function(a){var b=[this].concat([].slice.call(arguments,1));return a.transition.apply(a,b)},a.utils.renderWatch=function(b,c){if(!(this instanceof a.utils.renderWatch))return new a.utils.renderWatch(b,c);var d=void 0!==c?c:250,e=[],f=this;this.models=function(a){return a=[].slice.call(arguments,0),a.forEach(function(a){a.__rendered=!1,function(a){a.dispatch.on("renderEnd",function(){a.__rendered=!0,f.renderEnd("model")})}(a),e.indexOf(a)<0&&e.push(a)}),this},this.reset=function(a){void 0!==a&&(d=a),e=[]},this.transition=function(a,b,c){if(b=arguments.length>1?[].slice.call(arguments,1):[],c=b.length>1?b.pop():void 0!==d?d:250,a.__rendered=!1,e.indexOf(a)<0&&e.push(a),0===c)return a.__rendered=!0,a.delay=function(){return this},a.duration=function(){return this},a;a.__rendered=0===a.length?!0:a.every(function(a){return!a.length})?!0:!1;var g=0;return a.transition().duration(c).each(function(){++g}).each("end",function(){0===--g&&(a.__rendered=!0,f.renderEnd.apply(this,b))})},this.renderEnd=function(){e.every(function(a){return a.__rendered})&&(e.forEach(function(a){a.__rendered=!1}),b.renderEnd.apply(this,arguments))}},a.utils.deepExtend=function(b){var c=arguments.length>1?[].slice.call(arguments,1):[];c.forEach(function(c){for(var d in c){var e=b[d]instanceof Array,f="object"==typeof b[d],g="object"==typeof c[d];f&&!e&&g?a.utils.deepExtend(b[d],c[d]):b[d]=c[d]}})},a.utils.state=function(){if(!(this instanceof a.utils.state))return new a.utils.state;var b={},c=function(){},d=function(){return{}},e=null,f=null;this.dispatch=d3.dispatch("change","set"),this.dispatch.on("set",function(a){c(a,!0)}),this.getter=function(a){return d=a,this},this.setter=function(a,b){return b||(b=function(){}),c=function(c,d){a(c),d&&b()},this},this.init=function(b){e=e||{},a.utils.deepExtend(e,b)};var g=function(){var a=d();if(JSON.stringify(a)===JSON.stringify(b))return!1;for(var c in a)void 0===b[c]&&(b[c]={}),b[c]=a[c],f=!0;return!0};this.update=function(){e&&(c(e,!1),e=null),g.call(this)&&this.dispatch.change(b)}},a.utils.optionsFunc=function(a){return a&&d3.map(a).forEach(function(a,b){"function"==typeof this[a]&&this[a](b)}.bind(this)),this},a.utils.calcTicksX=function(b,c){var d=1,e=0;for(e;e<c.length;e+=1){var f=c[e]&&c[e].values?c[e].values.length:0;d=f>d?f:d}return a.log("Requested number of ticks: ",b),a.log("Calculated max values to be: ",d),b=b>d?b=d-1:b,b=1>b?1:b,b=Math.floor(b),a.log("Calculating tick count as: ",b),b},a.utils.calcTicksY=function(b,c){return a.utils.calcTicksX(b,c)},a.utils.initOption=function(a,b){a._calls&&a._calls[b]?a[b]=a._calls[b]:(a[b]=function(c){return arguments.length?(a._overrides[b]=!0,a._options[b]=c,a):a._options[b]},a["_"+b]=function(c){return arguments.length?(a._overrides[b]||(a._options[b]=c),a):a._options[b]})},a.utils.initOptions=function(b){b._overrides=b._overrides||{};var c=Object.getOwnPropertyNames(b._options||{}),d=Object.getOwnPropertyNames(b._calls||{});c=c.concat(d);for(var e in c)a.utils.initOption(b,c[e])},a.utils.inheritOptionsD3=function(a,b,c){a._d3options=c.concat(a._d3options||[]),c.unshift(b),c.unshift(a),d3.rebind.apply(this,c)},a.utils.arrayUnique=function(a){return a.sort().filter(function(b,c){return!c||b!=a[c-1]})},a.utils.symbolMap=d3.map(),a.utils.symbol=function(){function b(b,e){var f=c.call(this,b,e),g=d.call(this,b,e);return-1!==d3.svg.symbolTypes.indexOf(f)?d3.svg.symbol().type(f).size(g)():a.utils.symbolMap.get(f)(g)}var c,d=64;return b.type=function(a){return arguments.length?(c=d3.functor(a),b):c},b.size=function(a){return arguments.length?(d=d3.functor(a),b):d},b},a.utils.inheritOptions=function(b,c){var d=Object.getOwnPropertyNames(c._options||{}),e=Object.getOwnPropertyNames(c._calls||{}),f=c._inherited||[],g=c._d3options||[],h=d.concat(e).concat(f).concat(g);h.unshift(c),h.unshift(b),d3.rebind.apply(this,h),b._inherited=a.utils.arrayUnique(d.concat(e).concat(f).concat(d).concat(b._inherited||[])),b._d3options=a.utils.arrayUnique(g.concat(b._d3options||[]))},a.utils.initSVG=function(a){a.classed({"nvd3-svg":!0})},a.utils.sanitizeHeight=function(a,b){return a||parseInt(b.style("height"),10)||400},a.utils.sanitizeWidth=function(a,b){return a||parseInt(b.style("width"),10)||960},a.utils.availableHeight=function(b,c,d){return a.utils.sanitizeHeight(b,c)-d.top-d.bottom},a.utils.availableWidth=function(b,c,d){return a.utils.sanitizeWidth(b,c)-d.left-d.right},a.utils.noData=function(b,c){var d=b.options(),e=d.margin(),f=d.noData(),g=null==f?["No Data Available."]:[f],h=a.utils.availableHeight(d.height(),c,e),i=a.utils.availableWidth(d.width(),c,e),j=e.left+i/2,k=e.top+h/2;c.selectAll("g").remove();var l=c.selectAll(".nv-noData").data(g);l.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),l.attr("x",j).attr("y",k).text(function(a){return a})},a.models.axis=function(){"use strict";function b(g){return s.reset(),g.each(function(b){var g=d3.select(this);a.utils.initSVG(g);var p=g.selectAll("g.nv-wrap.nv-axis").data([b]),q=p.enter().append("g").attr("class","nvd3 nv-wrap nv-axis"),t=(q.append("g"),p.select("g"));null!==n?c.ticks(n):("top"==c.orient()||"bottom"==c.orient())&&c.ticks(Math.abs(d.range()[1]-d.range()[0])/100),t.watchTransition(s,"axis").call(c),r=r||c.scale();var u=c.tickFormat();null==u&&(u=r.tickFormat());var v=t.selectAll("text.nv-axislabel").data([h||null]);v.exit().remove();var w,x,y;switch(c.orient()){case"top":v.enter().append("text").attr("class","nv-axislabel"),y=d.range().length<2?0:2===d.range().length?d.range()[1]:d.range()[d.range().length-1]+(d.range()[1]-d.range()[0]),v.attr("text-anchor","middle").attr("y",0).attr("x",y/2),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-x",0==b?"nv-axisMin-x":"nv-axisMax-x"].join(" ")}).append("text"),x.exit().remove(),x.attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b))+",0)"}).select("text").attr("dy","-0.5em").attr("y",-c.tickPadding()).attr("text-anchor","middle").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max top").attr("transform",function(b,c){return"translate("+a.utils.NaNtoZero(d.range()[c])+",0)"}));break;case"bottom":w=o+36;var z=30,A=0,B=t.selectAll("g").select("text"),C="";if(j%360){B.each(function(){var a=this.getBoundingClientRect(),b=a.width;A=a.height,b>z&&(z=b)}),C="rotate("+j+" 0,"+(A/2+c.tickPadding())+")";var D=Math.abs(Math.sin(j*Math.PI/180));w=(D?D*z:z)+30,B.attr("transform",C).style("text-anchor",j%360>0?"start":"end")}v.enter().append("text").attr("class","nv-axislabel"),y=d.range().length<2?0:2===d.range().length?d.range()[1]:d.range()[d.range().length-1]+(d.range()[1]-d.range()[0]),v.attr("text-anchor","middle").attr("y",w).attr("x",y/2),i&&(x=p.selectAll("g.nv-axisMaxMin").data([d.domain()[0],d.domain()[d.domain().length-1]]),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-x",0==b?"nv-axisMin-x":"nv-axisMax-x"].join(" ")}).append("text"),x.exit().remove(),x.attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b)+(m?d.rangeBand()/2:0))+",0)"}).select("text").attr("dy",".71em").attr("y",c.tickPadding()).attr("transform",C).style("text-anchor",j?j%360>0?"start":"end":"middle").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max bottom").attr("transform",function(b){return"translate("+a.utils.NaNtoZero(d(b)+(m?d.rangeBand()/2:0))+",0)"})),l&&B.attr("transform",function(a,b){return"translate(0,"+(b%2==0?"0":"12")+")"});break;case"right":v.enter().append("text").attr("class","nv-axislabel"),v.style("text-anchor",k?"middle":"begin").attr("transform",k?"rotate(90)":"").attr("y",k?-Math.max(e.right,f)+12:-10).attr("x",k?d3.max(d.range())/2:c.tickPadding()),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-y",0==b?"nv-axisMin-y":"nv-axisMax-y"].join(" ")}).append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(b){return"translate(0,"+a.utils.NaNtoZero(d(b))+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",c.tickPadding()).style("text-anchor","start").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max right").attr("transform",function(b,c){return"translate(0,"+a.utils.NaNtoZero(d.range()[c])+")"}).select("text").style("opacity",1));break;case"left":v.enter().append("text").attr("class","nv-axislabel"),v.style("text-anchor",k?"middle":"end").attr("transform",k?"rotate(-90)":"").attr("y",k?-Math.max(e.left,f)+25-(o||0):-10).attr("x",k?-d3.max(d.range())/2:-c.tickPadding()),i&&(x=p.selectAll("g.nv-axisMaxMin").data(d.domain()),x.enter().append("g").attr("class",function(a,b){return["nv-axisMaxMin","nv-axisMaxMin-y",0==b?"nv-axisMin-y":"nv-axisMax-y"].join(" ")}).append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(b){return"translate(0,"+a.utils.NaNtoZero(r(b))+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",-c.tickPadding()).attr("text-anchor","end").text(function(a){var b=u(a);return(""+b).match("NaN")?"":b}),x.watchTransition(s,"min-max right").attr("transform",function(b,c){return"translate(0,"+a.utils.NaNtoZero(d.range()[c])+")"}).select("text").style("opacity",1))}if(v.text(function(a){return a}),!i||"left"!==c.orient()&&"right"!==c.orient()||(t.selectAll("g").each(function(a){d3.select(this).select("text").attr("opacity",1),(d(a)<d.range()[1]+10||d(a)>d.range()[0]-10)&&((a>1e-10||-1e-10>a)&&d3.select(this).attr("opacity",0),d3.select(this).select("text").attr("opacity",0))}),d.domain()[0]==d.domain()[1]&&0==d.domain()[0]&&p.selectAll("g.nv-axisMaxMin").style("opacity",function(a,b){return b?0:1})),i&&("top"===c.orient()||"bottom"===c.orient())){var E=[];p.selectAll("g.nv-axisMaxMin").each(function(a,b){try{E.push(b?d(a)-this.getBoundingClientRect().width-4:d(a)+this.getBoundingClientRect().width+4)}catch(c){E.push(b?d(a)-4:d(a)+4)}}),t.selectAll("g").each(function(a){(d(a)<E[0]||d(a)>E[1])&&(a>1e-10||-1e-10>a?d3.select(this).remove():d3.select(this).select("text").remove())})}t.selectAll(".tick").filter(function(a){return!parseFloat(Math.round(1e5*a)/1e6)&&void 0!==a}).classed("zero",!0),r=d.copy()}),s.renderEnd("axis immediate"),b}var c=d3.svg.axis(),d=d3.scale.linear(),e={top:0,right:0,bottom:0,left:0},f=75,g=60,h=null,i=!0,j=0,k=!0,l=!1,m=!1,n=null,o=0,p=250,q=d3.dispatch("renderEnd");c.scale(d).orient("bottom").tickFormat(function(a){return a});var r,s=a.utils.renderWatch(q,p);return b.axis=c,b.dispatch=q,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{axisLabelDistance:{get:function(){return o},set:function(a){o=a}},staggerLabels:{get:function(){return l},set:function(a){l=a}},rotateLabels:{get:function(){return j},set:function(a){j=a}},rotateYLabel:{get:function(){return k},set:function(a){k=a}},showMaxMin:{get:function(){return i},set:function(a){i=a}},axisLabel:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return g},set:function(a){g=a}},ticks:{get:function(){return n},set:function(a){n=a}},width:{get:function(){return f},set:function(a){f=a}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},duration:{get:function(){return p},set:function(a){p=a,s.reset(p)}},scale:{get:function(){return d},set:function(e){d=e,c.scale(d),m="function"==typeof d.rangeBands,a.utils.inheritOptionsD3(b,d,["domain","range","rangeBand","rangeBands"])}}}),a.utils.initOptions(b),a.utils.inheritOptionsD3(b,c,["orient","tickValues","tickSubdivide","tickSize","tickPadding","tickFormat"]),a.utils.inheritOptionsD3(b,d,["domain","range","rangeBand","rangeBands"]),b},a.models.boxPlot=function(){"use strict";function b(l){return v.reset(),l.each(function(b){var l=j-i.left-i.right,p=k-i.top-i.bottom;r=d3.select(this),a.utils.initSVG(r),m.domain(c||b.map(function(a,b){return o(a,b)})).rangeBands(e||[0,l],.1);var w=[];if(!d){var x=d3.min(b.map(function(a){var b=[];return b.push(a.values.Q1),a.values.hasOwnProperty("whisker_low")&&null!==a.values.whisker_low&&b.push(a.values.whisker_low),a.values.hasOwnProperty("outliers")&&null!==a.values.outliers&&(b=b.concat(a.values.outliers)),d3.min(b)})),y=d3.max(b.map(function(a){var b=[];return b.push(a.values.Q3),a.values.hasOwnProperty("whisker_high")&&null!==a.values.whisker_high&&b.push(a.values.whisker_high),a.values.hasOwnProperty("outliers")&&null!==a.values.outliers&&(b=b.concat(a.values.outliers)),d3.max(b)}));w=[x,y]}n.domain(d||w),n.range(f||[p,0]),g=g||m,h=h||n.copy().range([n(0),n(0)]);{var z=r.selectAll("g.nv-wrap").data([b]);z.enter().append("g").attr("class","nvd3 nv-wrap")}z.attr("transform","translate("+i.left+","+i.top+")");var A=z.selectAll(".nv-boxplot").data(function(a){return a}),B=A.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6);A.attr("class","nv-boxplot").attr("transform",function(a,b){return"translate("+(m(o(a,b))+.05*m.rangeBand())+", 0)"}).classed("hover",function(a){return a.hover}),A.watchTransition(v,"nv-boxplot: boxplots").style("stroke-opacity",1).style("fill-opacity",.75).delay(function(a,c){return c*t/b.length}).attr("transform",function(a,b){return"translate("+(m(o(a,b))+.05*m.rangeBand())+", 0)"}),A.exit().remove(),B.each(function(a,b){var c=d3.select(this);["low","high"].forEach(function(d){a.values.hasOwnProperty("whisker_"+d)&&null!==a.values["whisker_"+d]&&(c.append("line").style("stroke",a.color?a.color:q(a,b)).attr("class","nv-boxplot-whisker nv-boxplot-"+d),c.append("line").style("stroke",a.color?a.color:q(a,b)).attr("class","nv-boxplot-tick nv-boxplot-"+d))})});var C=A.selectAll(".nv-boxplot-outlier").data(function(a){return a.values.hasOwnProperty("outliers")&&null!==a.values.outliers?a.values.outliers:[]});C.enter().append("circle").style("fill",function(a,b,c){return q(a,c)}).style("stroke",function(a,b,c){return q(a,c)}).on("mouseover",function(a,b,c){d3.select(this).classed("hover",!0),s.elementMouseover({series:{key:a,color:q(a,c)},e:d3.event})}).on("mouseout",function(a,b,c){d3.select(this).classed("hover",!1),s.elementMouseout({series:{key:a,color:q(a,c)},e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})}),C.attr("class","nv-boxplot-outlier"),C.watchTransition(v,"nv-boxplot: nv-boxplot-outlier").attr("cx",.45*m.rangeBand()).attr("cy",function(a){return n(a)}).attr("r","3"),C.exit().remove();var D=function(){return null===u?.9*m.rangeBand():Math.min(75,.9*m.rangeBand())},E=function(){return.45*m.rangeBand()-D()/2},F=function(){return.45*m.rangeBand()+D()/2};["low","high"].forEach(function(a){var b="low"===a?"Q1":"Q3";A.select("line.nv-boxplot-whisker.nv-boxplot-"+a).watchTransition(v,"nv-boxplot: boxplots").attr("x1",.45*m.rangeBand()).attr("y1",function(b){return n(b.values["whisker_"+a])}).attr("x2",.45*m.rangeBand()).attr("y2",function(a){return n(a.values[b])}),A.select("line.nv-boxplot-tick.nv-boxplot-"+a).watchTransition(v,"nv-boxplot: boxplots").attr("x1",E).attr("y1",function(b){return n(b.values["whisker_"+a])}).attr("x2",F).attr("y2",function(b){return n(b.values["whisker_"+a])})}),["low","high"].forEach(function(a){B.selectAll(".nv-boxplot-"+a).on("mouseover",function(b,c,d){d3.select(this).classed("hover",!0),s.elementMouseover({series:{key:b.values["whisker_"+a],color:q(b,d)},e:d3.event})}).on("mouseout",function(b,c,d){d3.select(this).classed("hover",!1),s.elementMouseout({series:{key:b.values["whisker_"+a],color:q(b,d)},e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})})}),B.append("rect").attr("class","nv-boxplot-box").on("mouseover",function(a,b){d3.select(this).classed("hover",!0),s.elementMouseover({key:a.label,value:a.label,series:[{key:"Q3",value:a.values.Q3,color:a.color||q(a,b)},{key:"Q2",value:a.values.Q2,color:a.color||q(a,b)},{key:"Q1",value:a.values.Q1,color:a.color||q(a,b)}],data:a,index:b,e:d3.event})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),s.elementMouseout({key:a.label,value:a.label,series:[{key:"Q3",value:a.values.Q3,color:a.color||q(a,b)},{key:"Q2",value:a.values.Q2,color:a.color||q(a,b)},{key:"Q1",value:a.values.Q1,color:a.color||q(a,b)}],data:a,index:b,e:d3.event})}).on("mousemove",function(){s.elementMousemove({e:d3.event})}),A.select("rect.nv-boxplot-box").watchTransition(v,"nv-boxplot: boxes").attr("y",function(a){return n(a.values.Q3)}).attr("width",D).attr("x",E).attr("height",function(a){return Math.abs(n(a.values.Q3)-n(a.values.Q1))||1}).style("fill",function(a,b){return a.color||q(a,b)}).style("stroke",function(a,b){return a.color||q(a,b)}),B.append("line").attr("class","nv-boxplot-median"),A.select("line.nv-boxplot-median").watchTransition(v,"nv-boxplot: boxplots line").attr("x1",E).attr("y1",function(a){return n(a.values.Q2)}).attr("x2",F).attr("y2",function(a){return n(a.values.Q2)}),g=m.copy(),h=n.copy()}),v.renderEnd("nv-boxplot immediate"),b}var c,d,e,f,g,h,i={top:0,right:0,bottom:0,left:0},j=960,k=500,l=Math.floor(1e4*Math.random()),m=d3.scale.ordinal(),n=d3.scale.linear(),o=function(a){return a.x},p=function(a){return a.y},q=a.utils.defaultColor(),r=null,s=d3.dispatch("elementMouseover","elementMouseout","elementMousemove","renderEnd"),t=250,u=null,v=a.utils.renderWatch(s,t);return b.dispatch=s,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return j},set:function(a){j=a}},height:{get:function(){return k},set:function(a){k=a}},maxBoxWidth:{get:function(){return u},set:function(a){u=a}},x:{get:function(){return o},set:function(a){o=a}},y:{get:function(){return p},set:function(a){p=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},id:{get:function(){return l},set:function(a){l=a}},margin:{get:function(){return i},set:function(a){i.top=void 0!==a.top?a.top:i.top,i.right=void 0!==a.right?a.right:i.right,i.bottom=void 0!==a.bottom?a.bottom:i.bottom,i.left=void 0!==a.left?a.left:i.left}},color:{get:function(){return q},set:function(b){q=a.utils.getColor(b)}},duration:{get:function(){return t},set:function(a){t=a,v.reset(t)}}}),a.utils.initOptions(b),b},a.models.boxPlotChart=function(){"use strict";function b(k){return t.reset(),t.models(e),l&&t.models(f),m&&t.models(g),k.each(function(k){var p=d3.select(this);a.utils.initSVG(p);var t=(i||parseInt(p.style("width"))||960)-h.left-h.right,u=(j||parseInt(p.style("height"))||400)-h.top-h.bottom;if(b.update=function(){r.beforeUpdate(),p.transition().duration(s).call(b)},b.container=this,!(k&&k.length&&k.filter(function(a){return a.values.hasOwnProperty("Q1")&&a.values.hasOwnProperty("Q2")&&a.values.hasOwnProperty("Q3")}).length)){var v=p.selectAll(".nv-noData").data([q]);return v.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),v.attr("x",h.left+t/2).attr("y",h.top+u/2).text(function(a){return a}),b}p.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale().clamp(!0);var w=p.selectAll("g.nv-wrap.nv-boxPlotWithAxes").data([k]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-boxPlotWithAxes").append("g"),y=x.append("defs"),z=w.select("g");
-x.append("g").attr("class","nv-x nv-axis"),x.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),x.append("g").attr("class","nv-barsWrap"),z.attr("transform","translate("+h.left+","+h.top+")"),n&&z.select(".nv-y.nv-axis").attr("transform","translate("+t+",0)"),e.width(t).height(u);var A=z.select(".nv-barsWrap").datum(k.filter(function(a){return!a.disabled}));if(A.transition().call(e),y.append("clipPath").attr("id","nv-x-label-clip-"+e.id()).append("rect"),z.select("#nv-x-label-clip-"+e.id()+" rect").attr("width",c.rangeBand()*(o?2:1)).attr("height",16).attr("x",-c.rangeBand()/(o?1:2)),l){f.scale(c).ticks(a.utils.calcTicksX(t/100,k)).tickSize(-u,0),z.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),z.select(".nv-x.nv-axis").call(f);var B=z.select(".nv-x.nv-axis").selectAll("g");o&&B.selectAll("text").attr("transform",function(a,b,c){return"translate(0,"+(c%2==0?"5":"17")+")"})}m&&(g.scale(d).ticks(Math.floor(u/36)).tickSize(-t,0),z.select(".nv-y.nv-axis").call(g)),z.select(".nv-zeroLine line").attr("x1",0).attr("x2",t).attr("y1",d(0)).attr("y2",d(0))}),t.renderEnd("nv-boxplot chart immediate"),b}var c,d,e=a.models.boxPlot(),f=a.models.axis(),g=a.models.axis(),h={top:15,right:10,bottom:50,left:60},i=null,j=null,k=a.utils.getColor(),l=!0,m=!0,n=!1,o=!1,p=a.models.tooltip(),q="No Data Available.",r=d3.dispatch("tooltipShow","tooltipHide","beforeUpdate","renderEnd"),s=250;f.orient("bottom").showMaxMin(!1).tickFormat(function(a){return a}),g.orient(n?"right":"left").tickFormat(d3.format(",.1f")),p.duration(0);var t=a.utils.renderWatch(r,s);return e.dispatch.on("elementMouseover.tooltip",function(a){p.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(a){p.data(a).hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){p.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=r,b.boxplot=e,b.xAxis=f,b.yAxis=g,b.tooltip=p,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return i},set:function(a){i=a}},height:{get:function(){return j},set:function(a){j=a}},staggerLabels:{get:function(){return o},set:function(a){o=a}},showXAxis:{get:function(){return l},set:function(a){l=a}},showYAxis:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return tooltips},set:function(a){tooltips=a}},tooltipContent:{get:function(){return p},set:function(a){p=a}},noData:{get:function(){return q},set:function(a){q=a}},margin:{get:function(){return h},set:function(a){h.top=void 0!==a.top?a.top:h.top,h.right=void 0!==a.right?a.right:h.right,h.bottom=void 0!==a.bottom?a.bottom:h.bottom,h.left=void 0!==a.left?a.left:h.left}},duration:{get:function(){return s},set:function(a){s=a,t.reset(s),e.duration(s),f.duration(s),g.duration(s)}},color:{get:function(){return k},set:function(b){k=a.utils.getColor(b),e.color(k)}},rightAlignYAxis:{get:function(){return n},set:function(a){n=a,g.orient(a?"right":"left")}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.bullet=function(){"use strict";function b(d){return d.each(function(b,d){var p=m-c.left-c.right,s=n-c.top-c.bottom;o=d3.select(this),a.utils.initSVG(o);{var t=f.call(this,b,d).slice().sort(d3.descending),u=g.call(this,b,d).slice().sort(d3.descending),v=h.call(this,b,d).slice().sort(d3.descending),w=i.call(this,b,d).slice(),x=j.call(this,b,d).slice(),y=k.call(this,b,d).slice(),z=d3.scale.linear().domain(d3.extent(d3.merge([l,t]))).range(e?[p,0]:[0,p]);this.__chart__||d3.scale.linear().domain([0,1/0]).range(z.range())}this.__chart__=z;var A=d3.min(t),B=d3.max(t),C=t[1],D=o.selectAll("g.nv-wrap.nv-bullet").data([b]),E=D.enter().append("g").attr("class","nvd3 nv-wrap nv-bullet"),F=E.append("g"),G=D.select("g");F.append("rect").attr("class","nv-range nv-rangeMax"),F.append("rect").attr("class","nv-range nv-rangeAvg"),F.append("rect").attr("class","nv-range nv-rangeMin"),F.append("rect").attr("class","nv-measure"),D.attr("transform","translate("+c.left+","+c.top+")");var H=function(a){return Math.abs(z(a)-z(0))},I=function(a){return z(0>a?a:0)};G.select("rect.nv-rangeMax").attr("height",s).attr("width",H(B>0?B:A)).attr("x",I(B>0?B:A)).datum(B>0?B:A),G.select("rect.nv-rangeAvg").attr("height",s).attr("width",H(C)).attr("x",I(C)).datum(C),G.select("rect.nv-rangeMin").attr("height",s).attr("width",H(B)).attr("x",I(B)).attr("width",H(B>0?A:B)).attr("x",I(B>0?A:B)).datum(B>0?A:B),G.select("rect.nv-measure").style("fill",q).attr("height",s/3).attr("y",s/3).attr("width",0>v?z(0)-z(v[0]):z(v[0])-z(0)).attr("x",I(v)).on("mouseover",function(){r.elementMouseover({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})}).on("mousemove",function(){r.elementMousemove({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})}).on("mouseout",function(){r.elementMouseout({value:v[0],label:y[0]||"Current",color:d3.select(this).style("fill")})});var J=s/6,K=u.map(function(a,b){return{value:a,label:x[b]}});F.selectAll("path.nv-markerTriangle").data(K).enter().append("path").attr("class","nv-markerTriangle").attr("transform",function(a){return"translate("+z(a.value)+","+s/2+")"}).attr("d","M0,"+J+"L"+J+","+-J+" "+-J+","+-J+"Z").on("mouseover",function(a){r.elementMouseover({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill"),pos:[z(a.value),s/2]})}).on("mousemove",function(a){r.elementMousemove({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill")})}).on("mouseout",function(a){r.elementMouseout({value:a.value,label:a.label||"Previous",color:d3.select(this).style("fill")})}),D.selectAll(".nv-range").on("mouseover",function(a,b){var c=w[b]||(b?1==b?"Mean":"Minimum":"Maximum");r.elementMouseover({value:a,label:c,color:d3.select(this).style("fill")})}).on("mousemove",function(){r.elementMousemove({value:v[0],label:y[0]||"Previous",color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){var c=w[b]||(b?1==b?"Mean":"Minimum":"Maximum");r.elementMouseout({value:a,label:c,color:d3.select(this).style("fill")})})}),b}var c={top:0,right:0,bottom:0,left:0},d="left",e=!1,f=function(a){return a.ranges},g=function(a){return a.markers?a.markers:[0]},h=function(a){return a.measures},i=function(a){return a.rangeLabels?a.rangeLabels:[]},j=function(a){return a.markerLabels?a.markerLabels:[]},k=function(a){return a.measureLabels?a.measureLabels:[]},l=[0],m=380,n=30,o=null,p=null,q=a.utils.getColor(["#1f77b4"]),r=d3.dispatch("elementMouseover","elementMouseout","elementMousemove");return b.dispatch=r,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{ranges:{get:function(){return f},set:function(a){f=a}},markers:{get:function(){return g},set:function(a){g=a}},measures:{get:function(){return h},set:function(a){h=a}},forceX:{get:function(){return l},set:function(a){l=a}},width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},tickFormat:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},orient:{get:function(){return d},set:function(a){d=a,e="right"==d||"bottom"==d}},color:{get:function(){return q},set:function(b){q=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.bulletChart=function(){"use strict";function b(d){return d.each(function(e,o){var p=d3.select(this);a.utils.initSVG(p);var q=a.utils.availableWidth(k,p,g),r=l-g.top-g.bottom;if(b.update=function(){b(d)},b.container=this,!e||!h.call(this,e,o))return a.utils.noData(b,p),b;p.selectAll(".nv-noData").remove();var s=h.call(this,e,o).slice().sort(d3.descending),t=i.call(this,e,o).slice().sort(d3.descending),u=j.call(this,e,o).slice().sort(d3.descending),v=p.selectAll("g.nv-wrap.nv-bulletChart").data([e]),w=v.enter().append("g").attr("class","nvd3 nv-wrap nv-bulletChart"),x=w.append("g"),y=v.select("g");x.append("g").attr("class","nv-bulletWrap"),x.append("g").attr("class","nv-titles"),v.attr("transform","translate("+g.left+","+g.top+")");var z=d3.scale.linear().domain([0,Math.max(s[0],t[0],u[0])]).range(f?[q,0]:[0,q]),A=this.__chart__||d3.scale.linear().domain([0,1/0]).range(z.range());this.__chart__=z;var B=x.select(".nv-titles").append("g").attr("text-anchor","end").attr("transform","translate(-6,"+(l-g.top-g.bottom)/2+")");B.append("text").attr("class","nv-title").text(function(a){return a.title}),B.append("text").attr("class","nv-subtitle").attr("dy","1em").text(function(a){return a.subtitle}),c.width(q).height(r);var C=y.select(".nv-bulletWrap");d3.transition(C).call(c);var D=m||z.tickFormat(q/100),E=y.selectAll("g.nv-tick").data(z.ticks(n?n:q/50),function(a){return this.textContent||D(a)}),F=E.enter().append("g").attr("class","nv-tick").attr("transform",function(a){return"translate("+A(a)+",0)"}).style("opacity",1e-6);F.append("line").attr("y1",r).attr("y2",7*r/6),F.append("text").attr("text-anchor","middle").attr("dy","1em").attr("y",7*r/6).text(D);var G=d3.transition(E).attr("transform",function(a){return"translate("+z(a)+",0)"}).style("opacity",1);G.select("line").attr("y1",r).attr("y2",7*r/6),G.select("text").attr("y",7*r/6),d3.transition(E.exit()).attr("transform",function(a){return"translate("+z(a)+",0)"}).style("opacity",1e-6).remove()}),d3.timer.flush(),b}var c=a.models.bullet(),d=a.models.tooltip(),e="left",f=!1,g={top:5,right:40,bottom:20,left:120},h=function(a){return a.ranges},i=function(a){return a.markers?a.markers:[0]},j=function(a){return a.measures},k=null,l=55,m=null,n=null,o=null,p=d3.dispatch("tooltipShow","tooltipHide");return d.duration(0).headerEnabled(!1),c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:a.label,value:a.value,color:a.color},d.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){d.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){d.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.bullet=c,b.dispatch=p,b.tooltip=d,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{ranges:{get:function(){return h},set:function(a){h=a}},markers:{get:function(){return i},set:function(a){i=a}},measures:{get:function(){return j},set:function(a){j=a}},width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},tickFormat:{get:function(){return m},set:function(a){m=a}},ticks:{get:function(){return n},set:function(a){n=a}},noData:{get:function(){return o},set:function(a){o=a}},tooltips:{get:function(){return d.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),d.enabled(!!b)}},tooltipContent:{get:function(){return d.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),d.contentGenerator(b)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},orient:{get:function(){return e},set:function(a){e=a,f="right"==e||"bottom"==e}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.candlestickBar=function(){"use strict";function b(x){return x.each(function(b){c=d3.select(this);var x=a.utils.availableWidth(i,c,h),y=a.utils.availableHeight(j,c,h);a.utils.initSVG(c);var A=x/b[0].values.length*.45;l.domain(d||d3.extent(b[0].values.map(n).concat(t))),l.range(v?f||[.5*x/b[0].values.length,x*(b[0].values.length-.5)/b[0].values.length]:f||[5+A/2,x-A/2-5]),m.domain(e||[d3.min(b[0].values.map(s).concat(u)),d3.max(b[0].values.map(r).concat(u))]).range(g||[y,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var B=d3.select(this).selectAll("g.nv-wrap.nv-candlestickBar").data([b[0].values]),C=B.enter().append("g").attr("class","nvd3 nv-wrap nv-candlestickBar"),D=C.append("defs"),E=C.append("g"),F=B.select("g");E.append("g").attr("class","nv-ticks"),B.attr("transform","translate("+h.left+","+h.top+")"),c.on("click",function(a,b){z.chartClick({data:a,index:b,pos:d3.event,id:k})}),D.append("clipPath").attr("id","nv-chart-clip-path-"+k).append("rect"),B.select("#nv-chart-clip-path-"+k+" rect").attr("width",x).attr("height",y),F.attr("clip-path",w?"url(#nv-chart-clip-path-"+k+")":"");var G=B.select(".nv-ticks").selectAll(".nv-tick").data(function(a){return a});G.exit().remove();{var H=G.enter().append("g").attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b});H.append("line").attr("class","nv-candlestick-lines").attr("transform",function(a,b){return"translate("+l(n(a,b))+",0)"}).attr("x1",0).attr("y1",function(a,b){return m(r(a,b))}).attr("x2",0).attr("y2",function(a,b){return m(s(a,b))}),H.append("rect").attr("class","nv-candlestick-rects nv-bars").attr("transform",function(a,b){return"translate("+(l(n(a,b))-A/2)+","+(m(o(a,b))-(p(a,b)>q(a,b)?m(q(a,b))-m(p(a,b)):0))+")"}).attr("x",0).attr("y",0).attr("width",A).attr("height",function(a,b){var c=p(a,b),d=q(a,b);return c>d?m(d)-m(c):m(c)-m(d)})}c.selectAll(".nv-candlestick-lines").transition().attr("transform",function(a,b){return"translate("+l(n(a,b))+",0)"}).attr("x1",0).attr("y1",function(a,b){return m(r(a,b))}).attr("x2",0).attr("y2",function(a,b){return m(s(a,b))}),c.selectAll(".nv-candlestick-rects").transition().attr("transform",function(a,b){return"translate("+(l(n(a,b))-A/2)+","+(m(o(a,b))-(p(a,b)>q(a,b)?m(q(a,b))-m(p(a,b)):0))+")"}).attr("x",0).attr("y",0).attr("width",A).attr("height",function(a,b){var c=p(a,b),d=q(a,b);return c>d?m(d)-m(c):m(c)-m(d)})}),b}var c,d,e,f,g,h={top:0,right:0,bottom:0,left:0},i=null,j=null,k=Math.floor(1e4*Math.random()),l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=function(a){return a.open},q=function(a){return a.close},r=function(a){return a.high},s=function(a){return a.low},t=[],u=[],v=!1,w=!0,x=a.utils.defaultColor(),y=!1,z=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd","chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove");return b.highlightPoint=function(a,d){b.clearHighlights(),c.select(".nv-candlestickBar .nv-tick-0-"+a).classed("hover",d)},b.clearHighlights=function(){c.select(".nv-candlestickBar .nv-tick.hover").classed("hover",!1)},b.dispatch=z,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return i},set:function(a){i=a}},height:{get:function(){return j},set:function(a){j=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},padData:{get:function(){return v},set:function(a){v=a}},clipEdge:{get:function(){return w},set:function(a){w=a}},id:{get:function(){return k},set:function(a){k=a}},interactive:{get:function(){return y},set:function(a){y=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},open:{get:function(){return p()},set:function(a){p=a}},close:{get:function(){return q()},set:function(a){q=a}},high:{get:function(){return r},set:function(a){r=a}},low:{get:function(){return s},set:function(a){s=a}},margin:{get:function(){return h},set:function(a){h.top=void 0!=a.top?a.top:h.top,h.right=void 0!=a.right?a.right:h.right,h.bottom=void 0!=a.bottom?a.bottom:h.bottom,h.left=void 0!=a.left?a.left:h.left}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.cumulativeLineChart=function(){"use strict";function b(l){return H.reset(),H.models(f),r&&H.models(g),s&&H.models(h),l.each(function(l){function A(){d3.select(b.container).style("cursor","ew-resize")}function E(){G.x=d3.event.x,G.i=Math.round(F.invert(G.x)),K()}function H(){d3.select(b.container).style("cursor","auto"),y.index=G.i,C.stateChange(y)}function K(){bb.data([G]);var a=b.duration();b.duration(0),b.update(),b.duration(a)}var L=d3.select(this);a.utils.initSVG(L),L.classed("nv-chart-"+x,!0);var M=this,N=a.utils.availableWidth(o,L,m),O=a.utils.availableHeight(p,L,m);if(b.update=function(){0===D?L.call(b):L.transition().duration(D).call(b)},b.container=this,y.setter(J(l),b.update).getter(I(l)).update(),y.disabled=l.map(function(a){return!!a.disabled}),!z){var P;z={};for(P in y)z[P]=y[P]instanceof Array?y[P].slice(0):y[P]}var Q=d3.behavior.drag().on("dragstart",A).on("drag",E).on("dragend",H);if(!(l&&l.length&&l.filter(function(a){return a.values.length}).length))return a.utils.noData(b,L),b;if(L.selectAll(".nv-noData").remove(),d=f.xScale(),e=f.yScale(),w)f.yDomain(null);else{var R=l.filter(function(a){return!a.disabled}).map(function(a){var b=d3.extent(a.values,f.y());return b[0]<-.95&&(b[0]=-.95),[(b[0]-b[1])/(1+b[1]),(b[1]-b[0])/(1+b[0])]}),S=[d3.min(R,function(a){return a[0]}),d3.max(R,function(a){return a[1]})];f.yDomain(S)}F.domain([0,l[0].values.length-1]).range([0,N]).clamp(!0);var l=c(G.i,l),T=v?"none":"all",U=L.selectAll("g.nv-wrap.nv-cumulativeLine").data([l]),V=U.enter().append("g").attr("class","nvd3 nv-wrap nv-cumulativeLine").append("g"),W=U.select("g");if(V.append("g").attr("class","nv-interactive"),V.append("g").attr("class","nv-x nv-axis").style("pointer-events","none"),V.append("g").attr("class","nv-y nv-axis"),V.append("g").attr("class","nv-background"),V.append("g").attr("class","nv-linesWrap").style("pointer-events",T),V.append("g").attr("class","nv-avgLinesWrap").style("pointer-events","none"),V.append("g").attr("class","nv-legendWrap"),V.append("g").attr("class","nv-controlsWrap"),q&&(i.width(N),W.select(".nv-legendWrap").datum(l).call(i),m.top!=i.height()&&(m.top=i.height(),O=a.utils.availableHeight(p,L,m)),W.select(".nv-legendWrap").attr("transform","translate(0,"+-m.top+")")),u){var X=[{key:"Re-scale y-axis",disabled:!w}];j.width(140).color(["#444","#444","#444"]).rightAlign(!1).margin({top:5,right:0,bottom:5,left:20}),W.select(".nv-controlsWrap").datum(X).attr("transform","translate(0,"+-m.top+")").call(j)}U.attr("transform","translate("+m.left+","+m.top+")"),t&&W.select(".nv-y.nv-axis").attr("transform","translate("+N+",0)");var Y=l.filter(function(a){return a.tempDisabled});U.select(".tempDisabled").remove(),Y.length&&U.append("text").attr("class","tempDisabled").attr("x",N/2).attr("y","-.71em").style("text-anchor","end").text(Y.map(function(a){return a.key}).join(", ")+" values cannot be calculated for this time period."),v&&(k.width(N).height(O).margin({left:m.left,top:m.top}).svgContainer(L).xScale(d),U.select(".nv-interactive").call(k)),V.select(".nv-background").append("rect"),W.select(".nv-background rect").attr("width",N).attr("height",O),f.y(function(a){return a.display.y}).width(N).height(O).color(l.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!l[b].disabled&&!l[b].tempDisabled}));var Z=W.select(".nv-linesWrap").datum(l.filter(function(a){return!a.disabled&&!a.tempDisabled}));Z.call(f),l.forEach(function(a,b){a.seriesIndex=b});var $=l.filter(function(a){return!a.disabled&&!!B(a)}),_=W.select(".nv-avgLinesWrap").selectAll("line").data($,function(a){return a.key}),ab=function(a){var b=e(B(a));return 0>b?0:b>O?O:b};_.enter().append("line").style("stroke-width",2).style("stroke-dasharray","10,10").style("stroke",function(a){return f.color()(a,a.seriesIndex)}).attr("x1",0).attr("x2",N).attr("y1",ab).attr("y2",ab),_.style("stroke-opacity",function(a){var b=e(B(a));return 0>b||b>O?0:1}).attr("x1",0).attr("x2",N).attr("y1",ab).attr("y2",ab),_.exit().remove();var bb=Z.selectAll(".nv-indexLine").data([G]);bb.enter().append("rect").attr("class","nv-indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).style("pointer-events","all").call(Q),bb.attr("transform",function(a){return"translate("+F(a.i)+",0)"}).attr("height",O),r&&(g.scale(d)._ticks(a.utils.calcTicksX(N/70,l)).tickSize(-O,0),W.select(".nv-x.nv-axis").attr("transform","translate(0,"+e.range()[0]+")"),W.select(".nv-x.nv-axis").call(g)),s&&(h.scale(e)._ticks(a.utils.calcTicksY(O/36,l)).tickSize(-N,0),W.select(".nv-y.nv-axis").call(h)),W.select(".nv-background rect").on("click",function(){G.x=d3.mouse(this)[0],G.i=Math.round(F.invert(G.x)),y.index=G.i,C.stateChange(y),K()}),f.dispatch.on("elementClick",function(a){G.i=a.pointIndex,G.x=F(G.i),y.index=G.i,C.stateChange(y),K()}),j.dispatch.on("legendClick",function(a){a.disabled=!a.disabled,w=!a.disabled,y.rescaleY=w,C.stateChange(y),b.update()}),i.dispatch.on("stateChange",function(a){for(var c in a)y[c]=a[c];C.stateChange(y),b.update()}),k.dispatch.on("elementMousemove",function(c){f.clearHighlights();var d,e,i,j=[];if(l.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(g,h){e=a.interactiveBisect(g.values,c.pointXValue,b.x()),f.highlightPoint(h,e,!0);var k=g.values[e];"undefined"!=typeof k&&("undefined"==typeof d&&(d=k),"undefined"==typeof i&&(i=b.xScale()(b.x()(k,e))),j.push({key:g.key,value:b.y()(k,e),color:n(g,g.seriesIndex)}))}),j.length>2){var o=b.yScale().invert(c.mouseY),p=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),q=.03*p,r=a.nearestValueIndex(j.map(function(a){return a.value}),o,q);null!==r&&(j[r].highlight=!0)}var s=g.tickFormat()(b.x()(d,e),e);k.tooltip.position({left:i+m.left,top:c.mouseY+m.top}).chartContainer(M.parentNode).valueFormatter(function(a){return h.tickFormat()(a)}).data({value:s,series:j})(),k.renderGuideLine(i)}),k.dispatch.on("elementMouseout",function(){f.clearHighlights()}),C.on("changeState",function(a){"undefined"!=typeof a.disabled&&(l.forEach(function(b,c){b.disabled=a.disabled[c]}),y.disabled=a.disabled),"undefined"!=typeof a.index&&(G.i=a.index,G.x=F(G.i),y.index=a.index,bb.data([G])),"undefined"!=typeof a.rescaleY&&(w=a.rescaleY),b.update()})}),H.renderEnd("cumulativeLineChart immediate"),b}function c(a,b){return K||(K=f.y()),b.map(function(b){if(!b.values)return b;var c=b.values[a];if(null==c)return b;var d=K(c,a);return-.95>d&&!E?(b.tempDisabled=!0,b):(b.tempDisabled=!1,b.values=b.values.map(function(a,b){return a.display={y:(K(a,b)-d)/(1+d)},a}),b)})}var d,e,f=a.models.line(),g=a.models.axis(),h=a.models.axis(),i=a.models.legend(),j=a.models.legend(),k=a.interactiveGuideline(),l=a.models.tooltip(),m={top:30,right:30,bottom:50,left:60},n=a.utils.defaultColor(),o=null,p=null,q=!0,r=!0,s=!0,t=!1,u=!0,v=!1,w=!0,x=f.id(),y=a.utils.state(),z=null,A=null,B=function(a){return a.average},C=d3.dispatch("stateChange","changeState","renderEnd"),D=250,E=!1;y.index=0,y.rescaleY=w,g.orient("bottom").tickPadding(7),h.orient(t?"right":"left"),l.valueFormatter(function(a,b){return h.tickFormat()(a,b)}).headerFormatter(function(a,b){return g.tickFormat()(a,b)}),j.updateState(!1);var F=d3.scale.linear(),G={i:0,x:0},H=a.utils.renderWatch(C,D),I=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),index:G.i,rescaleY:w}}},J=function(a){return function(b){void 0!==b.index&&(G.i=b.index),void 0!==b.rescaleY&&(w=b.rescaleY),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};f.dispatch.on("elementMouseover.tooltip",function(a){var c={x:b.x()(a.point),y:b.y()(a.point),color:a.point.color};a.point=c,l.data(a).position(a.pos).hidden(!1)}),f.dispatch.on("elementMouseout.tooltip",function(){l.hidden(!0)});var K=null;return b.dispatch=C,b.lines=f,b.legend=i,b.controls=j,b.xAxis=g,b.yAxis=h,b.interactiveLayer=k,b.state=y,b.tooltip=l,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return o},set:function(a){o=a}},height:{get:function(){return p},set:function(a){p=a}},rescaleY:{get:function(){return w},set:function(a){w=a}},showControls:{get:function(){return u},set:function(a){u=a}},showLegend:{get:function(){return q},set:function(a){q=a}},average:{get:function(){return B},set:function(a){B=a}},defaultState:{get:function(){return z},set:function(a){z=a}},noData:{get:function(){return A},set:function(a){A=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},noErrorCheck:{get:function(){return E},set:function(a){E=a}},tooltips:{get:function(){return l.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),l.enabled(!!b)}},tooltipContent:{get:function(){return l.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),l.contentGenerator(b)}},margin:{get:function(){return m},set:function(a){m.top=void 0!==a.top?a.top:m.top,m.right=void 0!==a.right?a.right:m.right,m.bottom=void 0!==a.bottom?a.bottom:m.bottom,m.left=void 0!==a.left?a.left:m.left}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),i.color(n)}},useInteractiveGuideline:{get:function(){return v},set:function(a){v=a,a===!0&&(b.interactive(!1),b.useVoronoi(!1))}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,h.orient(a?"right":"left")}},duration:{get:function(){return D},set:function(a){D=a,f.duration(D),g.duration(D),h.duration(D),H.reset(D)}}}),a.utils.inheritOptions(b,f),a.utils.initOptions(b),b},a.models.discreteBar=function(){"use strict";function b(m){return y.reset(),m.each(function(b){var m=k-j.left-j.right,x=l-j.top-j.bottom;c=d3.select(this),a.utils.initSVG(c),b.forEach(function(a,b){a.values.forEach(function(a){a.series=b})});var z=d&&e?[]:b.map(function(a){return a.values.map(function(a,b){return{x:p(a,b),y:q(a,b),y0:a.y0}})});n.domain(d||d3.merge(z).map(function(a){return a.x})).rangeBands(f||[0,m],.1),o.domain(e||d3.extent(d3.merge(z).map(function(a){return a.y}).concat(r))),o.range(t?g||[x-(o.domain()[0]<0?12:0),o.domain()[1]>0?12:0]:g||[x,0]),h=h||n,i=i||o.copy().range([o(0),o(0)]);{var A=c.selectAll("g.nv-wrap.nv-discretebar").data([b]),B=A.enter().append("g").attr("class","nvd3 nv-wrap nv-discretebar"),C=B.append("g");A.select("g")}C.append("g").attr("class","nv-groups"),A.attr("transform","translate("+j.left+","+j.top+")");var D=A.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});D.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),D.exit().watchTransition(y,"discreteBar: exit groups").style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),D.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}),D.watchTransition(y,"discreteBar: groups").style("stroke-opacity",1).style("fill-opacity",.75);var E=D.selectAll("g.nv-bar").data(function(a){return a.values});E.exit().remove();var F=E.enter().append("g").attr("transform",function(a,b){return"translate("+(n(p(a,b))+.05*n.rangeBand())+", "+o(0)+")"}).on("mouseover",function(a,b){d3.select(this).classed("hover",!0),v.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),v.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){v.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){v.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){v.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()});F.append("rect").attr("height",0).attr("width",.9*n.rangeBand()/b.length),t?(F.append("text").attr("text-anchor","middle"),E.select("text").text(function(a,b){return u(q(a,b))}).watchTransition(y,"discreteBar: bars text").attr("x",.9*n.rangeBand()/2).attr("y",function(a,b){return q(a,b)<0?o(q(a,b))-o(0)+12:-4})):E.selectAll("text").remove(),E.attr("class",function(a,b){return q(a,b)<0?"nv-bar negative":"nv-bar positive"}).style("fill",function(a,b){return a.color||s(a,b)}).style("stroke",function(a,b){return a.color||s(a,b)}).select("rect").attr("class",w).watchTransition(y,"discreteBar: bars rect").attr("width",.9*n.rangeBand()/b.length),E.watchTransition(y,"discreteBar: bars").attr("transform",function(a,b){var c=n(p(a,b))+.05*n.rangeBand(),d=q(a,b)<0?o(0):o(0)-o(q(a,b))<1?o(0)-1:o(q(a,b));return"translate("+c+", "+d+")"}).select("rect").attr("height",function(a,b){return Math.max(Math.abs(o(q(a,b))-o(e&&e[0]||0))||1)}),h=n.copy(),i=o.copy()}),y.renderEnd("discreteBar immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=Math.floor(1e4*Math.random()),n=d3.scale.ordinal(),o=d3.scale.linear(),p=function(a){return a.x},q=function(a){return a.y},r=[0],s=a.utils.defaultColor(),t=!1,u=d3.format(",.2f"),v=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),w="discreteBar",x=250,y=a.utils.renderWatch(v,x);return b.dispatch=v,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},forceY:{get:function(){return r},set:function(a){r=a}},showValues:{get:function(){return t},set:function(a){t=a}},x:{get:function(){return p},set:function(a){p=a}},y:{get:function(){return q},set:function(a){q=a}},xScale:{get:function(){return n},set:function(a){n=a}},yScale:{get:function(){return o},set:function(a){o=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},valueFormat:{get:function(){return u},set:function(a){u=a}},id:{get:function(){return m},set:function(a){m=a}},rectClass:{get:function(){return w},set:function(a){w=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},color:{get:function(){return s},set:function(b){s=a.utils.getColor(b)}},duration:{get:function(){return x},set:function(a){x=a,y.reset(x)}}}),a.utils.initOptions(b),b},a.models.discreteBarChart=function(){"use strict";function b(h){return t.reset(),t.models(e),m&&t.models(f),n&&t.models(g),h.each(function(h){var l=d3.select(this);a.utils.initSVG(l);var q=a.utils.availableWidth(j,l,i),t=a.utils.availableHeight(k,l,i);if(b.update=function(){r.beforeUpdate(),l.transition().duration(s).call(b)},b.container=this,!(h&&h.length&&h.filter(function(a){return a.values.length}).length))return a.utils.noData(b,l),b;l.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale().clamp(!0);var u=l.selectAll("g.nv-wrap.nv-discreteBarWithAxes").data([h]),v=u.enter().append("g").attr("class","nvd3 nv-wrap nv-discreteBarWithAxes").append("g"),w=v.append("defs"),x=u.select("g");v.append("g").attr("class","nv-x nv-axis"),v.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),v.append("g").attr("class","nv-barsWrap"),x.attr("transform","translate("+i.left+","+i.top+")"),o&&x.select(".nv-y.nv-axis").attr("transform","translate("+q+",0)"),e.width(q).height(t);var y=x.select(".nv-barsWrap").datum(h.filter(function(a){return!a.disabled}));if(y.transition().call(e),w.append("clipPath").attr("id","nv-x-label-clip-"+e.id()).append("rect"),x.select("#nv-x-label-clip-"+e.id()+" rect").attr("width",c.rangeBand()*(p?2:1)).attr("height",16).attr("x",-c.rangeBand()/(p?1:2)),m){f.scale(c)._ticks(a.utils.calcTicksX(q/100,h)).tickSize(-t,0),x.select(".nv-x.nv-axis").attr("transform","translate(0,"+(d.range()[0]+(e.showValues()&&d.domain()[0]<0?16:0))+")"),x.select(".nv-x.nv-axis").call(f);
-var z=x.select(".nv-x.nv-axis").selectAll("g");p&&z.selectAll("text").attr("transform",function(a,b,c){return"translate(0,"+(c%2==0?"5":"17")+")"})}n&&(g.scale(d)._ticks(a.utils.calcTicksY(t/36,h)).tickSize(-q,0),x.select(".nv-y.nv-axis").call(g)),x.select(".nv-zeroLine line").attr("x1",0).attr("x2",q).attr("y1",d(0)).attr("y2",d(0))}),t.renderEnd("discreteBar chart immediate"),b}var c,d,e=a.models.discreteBar(),f=a.models.axis(),g=a.models.axis(),h=a.models.tooltip(),i={top:15,right:10,bottom:50,left:60},j=null,k=null,l=a.utils.getColor(),m=!0,n=!0,o=!1,p=!1,q=null,r=d3.dispatch("beforeUpdate","renderEnd"),s=250;f.orient("bottom").showMaxMin(!1).tickFormat(function(a){return a}),g.orient(o?"right":"left").tickFormat(d3.format(",.1f")),h.duration(0).headerEnabled(!1).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).keyFormatter(function(a,b){return f.tickFormat()(a,b)});var t=a.utils.renderWatch(r,s);return e.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:b.x()(a.data),value:b.y()(a.data),color:a.color},h.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){h.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){h.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=r,b.discretebar=e,b.xAxis=f,b.yAxis=g,b.tooltip=h,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return j},set:function(a){j=a}},height:{get:function(){return k},set:function(a){k=a}},staggerLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return m},set:function(a){m=a}},showYAxis:{get:function(){return n},set:function(a){n=a}},noData:{get:function(){return q},set:function(a){q=a}},tooltips:{get:function(){return h.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),h.enabled(!!b)}},tooltipContent:{get:function(){return h.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),h.contentGenerator(b)}},margin:{get:function(){return i},set:function(a){i.top=void 0!==a.top?a.top:i.top,i.right=void 0!==a.right?a.right:i.right,i.bottom=void 0!==a.bottom?a.bottom:i.bottom,i.left=void 0!==a.left?a.left:i.left}},duration:{get:function(){return s},set:function(a){s=a,t.reset(s),e.duration(s),f.duration(s),g.duration(s)}},color:{get:function(){return l},set:function(b){l=a.utils.getColor(b),e.color(l)}},rightAlignYAxis:{get:function(){return o},set:function(a){o=a,g.orient(a?"right":"left")}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.distribution=function(){"use strict";function b(k){return m.reset(),k.each(function(b){var k=(e-("x"===g?d.left+d.right:d.top+d.bottom),"x"==g?"y":"x"),l=d3.select(this);a.utils.initSVG(l),c=c||j;var n=l.selectAll("g.nv-distribution").data([b]),o=n.enter().append("g").attr("class","nvd3 nv-distribution"),p=(o.append("g"),n.select("g"));n.attr("transform","translate("+d.left+","+d.top+")");var q=p.selectAll("g.nv-dist").data(function(a){return a},function(a){return a.key});q.enter().append("g"),q.attr("class",function(a,b){return"nv-dist nv-series-"+b}).style("stroke",function(a,b){return i(a,b)});var r=q.selectAll("line.nv-dist"+g).data(function(a){return a.values});r.enter().append("line").attr(g+"1",function(a,b){return c(h(a,b))}).attr(g+"2",function(a,b){return c(h(a,b))}),m.transition(q.exit().selectAll("line.nv-dist"+g),"dist exit").attr(g+"1",function(a,b){return j(h(a,b))}).attr(g+"2",function(a,b){return j(h(a,b))}).style("stroke-opacity",0).remove(),r.attr("class",function(a,b){return"nv-dist"+g+" nv-dist"+g+"-"+b}).attr(k+"1",0).attr(k+"2",f),m.transition(r,"dist").attr(g+"1",function(a,b){return j(h(a,b))}).attr(g+"2",function(a,b){return j(h(a,b))}),c=j.copy()}),m.renderEnd("distribution immediate"),b}var c,d={top:0,right:0,bottom:0,left:0},e=400,f=8,g="x",h=function(a){return a[g]},i=a.utils.defaultColor(),j=d3.scale.linear(),k=250,l=d3.dispatch("renderEnd"),m=a.utils.renderWatch(l,k);return b.options=a.utils.optionsFunc.bind(b),b.dispatch=l,b.margin=function(a){return arguments.length?(d.top="undefined"!=typeof a.top?a.top:d.top,d.right="undefined"!=typeof a.right?a.right:d.right,d.bottom="undefined"!=typeof a.bottom?a.bottom:d.bottom,d.left="undefined"!=typeof a.left?a.left:d.left,b):d},b.width=function(a){return arguments.length?(e=a,b):e},b.axis=function(a){return arguments.length?(g=a,b):g},b.size=function(a){return arguments.length?(f=a,b):f},b.getData=function(a){return arguments.length?(h=d3.functor(a),b):h},b.scale=function(a){return arguments.length?(j=a,b):j},b.color=function(c){return arguments.length?(i=a.utils.getColor(c),b):i},b.duration=function(a){return arguments.length?(k=a,m.reset(k),b):k},b},a.models.furiousLegend=function(){"use strict";function b(p){function q(a,b){return"furious"!=o?"#000":m?a.disengaged?g(a,b):"#fff":m?void 0:a.disabled?g(a,b):"#fff"}function r(a,b){return m&&"furious"==o?a.disengaged?"#fff":g(a,b):a.disabled?"#fff":g(a,b)}return p.each(function(b){var p=d-c.left-c.right,s=d3.select(this);a.utils.initSVG(s);var t=s.selectAll("g.nv-legend").data([b]),u=(t.enter().append("g").attr("class","nvd3 nv-legend").append("g"),t.select("g"));t.attr("transform","translate("+c.left+","+c.top+")");var v,w=u.selectAll(".nv-series").data(function(a){return"furious"!=o?a:a.filter(function(a){return m?!0:!a.disengaged})}),x=w.enter().append("g").attr("class","nv-series");if("classic"==o)x.append("circle").style("stroke-width",2).attr("class","nv-legend-symbol").attr("r",5),v=w.select("circle");else if("furious"==o){x.append("rect").style("stroke-width",2).attr("class","nv-legend-symbol").attr("rx",3).attr("ry",3),v=w.select("rect"),x.append("g").attr("class","nv-check-box").property("innerHTML",'<path d="M0.5,5 L22.5,5 L22.5,26.5 L0.5,26.5 L0.5,5 Z" class="nv-box"></path><path d="M5.5,12.8618467 L11.9185089,19.2803556 L31,0.198864511" class="nv-check"></path>').attr("transform","translate(-10,-8)scale(0.5)");var y=w.select(".nv-check-box");y.each(function(a,b){d3.select(this).selectAll("path").attr("stroke",q(a,b))})}x.append("text").attr("text-anchor","start").attr("class","nv-legend-text").attr("dy",".32em").attr("dx","8");var z=w.select("text.nv-legend-text");w.on("mouseover",function(a,b){n.legendMouseover(a,b)}).on("mouseout",function(a,b){n.legendMouseout(a,b)}).on("click",function(a,b){n.legendClick(a,b);var c=w.data();if(k){if("classic"==o)l?(c.forEach(function(a){a.disabled=!0}),a.disabled=!1):(a.disabled=!a.disabled,c.every(function(a){return a.disabled})&&c.forEach(function(a){a.disabled=!1}));else if("furious"==o)if(m)a.disengaged=!a.disengaged,a.userDisabled=void 0==a.userDisabled?!!a.disabled:a.userDisabled,a.disabled=a.disengaged||a.userDisabled;else if(!m){a.disabled=!a.disabled,a.userDisabled=a.disabled;var d=c.filter(function(a){return!a.disengaged});d.every(function(a){return a.userDisabled})&&c.forEach(function(a){a.disabled=a.userDisabled=!1})}n.stateChange({disabled:c.map(function(a){return!!a.disabled}),disengaged:c.map(function(a){return!!a.disengaged})})}}).on("dblclick",function(a,b){if(("furious"!=o||!m)&&(n.legendDblclick(a,b),k)){var c=w.data();c.forEach(function(a){a.disabled=!0,"furious"==o&&(a.userDisabled=a.disabled)}),a.disabled=!1,"furious"==o&&(a.userDisabled=a.disabled),n.stateChange({disabled:c.map(function(a){return!!a.disabled})})}}),w.classed("nv-disabled",function(a){return a.userDisabled}),w.exit().remove(),z.attr("fill",q).text(f);var A;switch(o){case"furious":A=23;break;case"classic":A=20}if(h){var B=[];w.each(function(){var b,c=d3.select(this).select("text");try{if(b=c.node().getComputedTextLength(),0>=b)throw Error()}catch(d){b=a.utils.calcApproxTextWidth(c)}B.push(b+i)});for(var C=0,D=0,E=[];p>D&&C<B.length;)E[C]=B[C],D+=B[C++];for(0===C&&(C=1);D>p&&C>1;){E=[],C--;for(var F=0;F<B.length;F++)B[F]>(E[F%C]||0)&&(E[F%C]=B[F]);D=E.reduce(function(a,b){return a+b})}for(var G=[],H=0,I=0;C>H;H++)G[H]=I,I+=E[H];w.attr("transform",function(a,b){return"translate("+G[b%C]+","+(5+Math.floor(b/C)*A)+")"}),j?u.attr("transform","translate("+(d-c.right-D)+","+c.top+")"):u.attr("transform","translate(0,"+c.top+")"),e=c.top+c.bottom+Math.ceil(B.length/C)*A}else{var J,K=5,L=5,M=0;w.attr("transform",function(){var a=d3.select(this).select("text").node().getComputedTextLength()+i;return J=L,d<c.left+c.right+J+a&&(L=J=5,K+=A),L+=a,L>M&&(M=L),"translate("+J+","+K+")"}),u.attr("transform","translate("+(d-c.right-M)+","+c.top+")"),e=c.top+c.bottom+K+15}"furious"==o&&v.attr("width",function(a,b){return z[0][b].getComputedTextLength()+27}).attr("height",18).attr("y",-9).attr("x",-15),v.style("fill",r).style("stroke",function(a,b){return a.color||g(a,b)})}),b}var c={top:5,right:0,bottom:5,left:0},d=400,e=20,f=function(a){return a.key},g=a.utils.getColor(),h=!0,i=28,j=!0,k=!0,l=!1,m=!1,n=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout","stateChange"),o="classic";return b.dispatch=n,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},key:{get:function(){return f},set:function(a){f=a}},align:{get:function(){return h},set:function(a){h=a}},rightAlign:{get:function(){return j},set:function(a){j=a}},padding:{get:function(){return i},set:function(a){i=a}},updateState:{get:function(){return k},set:function(a){k=a}},radioButtonMode:{get:function(){return l},set:function(a){l=a}},expanded:{get:function(){return m},set:function(a){m=a}},vers:{get:function(){return o},set:function(a){o=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return g},set:function(b){g=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.historicalBar=function(){"use strict";function b(x){return x.each(function(b){w.reset(),k=d3.select(this);var x=a.utils.availableWidth(h,k,g),y=a.utils.availableHeight(i,k,g);a.utils.initSVG(k),l.domain(c||d3.extent(b[0].values.map(n).concat(p))),l.range(r?e||[.5*x/b[0].values.length,x*(b[0].values.length-.5)/b[0].values.length]:e||[0,x]),m.domain(d||d3.extent(b[0].values.map(o).concat(q))).range(f||[y,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var z=k.selectAll("g.nv-wrap.nv-historicalBar-"+j).data([b[0].values]),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBar-"+j),B=A.append("defs"),C=A.append("g"),D=z.select("g");C.append("g").attr("class","nv-bars"),z.attr("transform","translate("+g.left+","+g.top+")"),k.on("click",function(a,b){u.chartClick({data:a,index:b,pos:d3.event,id:j})}),B.append("clipPath").attr("id","nv-chart-clip-path-"+j).append("rect"),z.select("#nv-chart-clip-path-"+j+" rect").attr("width",x).attr("height",y),D.attr("clip-path",s?"url(#nv-chart-clip-path-"+j+")":"");var E=z.select(".nv-bars").selectAll(".nv-bar").data(function(a){return a},function(a,b){return n(a,b)});E.exit().remove(),E.enter().append("rect").attr("x",0).attr("y",function(b,c){return a.utils.NaNtoZero(m(Math.max(0,o(b,c))))}).attr("height",function(b,c){return a.utils.NaNtoZero(Math.abs(m(o(b,c))-m(0)))}).attr("transform",function(a,c){return"translate("+(l(n(a,c))-x/b[0].values.length*.45)+",0)"}).on("mouseover",function(a,b){v&&(d3.select(this).classed("hover",!0),u.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")}))}).on("mouseout",function(a,b){v&&(d3.select(this).classed("hover",!1),u.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")}))}).on("mousemove",function(a,b){v&&u.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){v&&(u.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation())}).on("dblclick",function(a,b){v&&(u.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation())}),E.attr("fill",function(a,b){return t(a,b)}).attr("class",function(a,b,c){return(o(a,b)<0?"nv-bar negative":"nv-bar positive")+" nv-bar-"+c+"-"+b}).watchTransition(w,"bars").attr("transform",function(a,c){return"translate("+(l(n(a,c))-x/b[0].values.length*.45)+",0)"}).attr("width",x/b[0].values.length*.9),E.watchTransition(w,"bars").attr("y",function(b,c){var d=o(b,c)<0?m(0):m(0)-m(o(b,c))<1?m(0)-1:m(o(b,c));return a.utils.NaNtoZero(d)}).attr("height",function(b,c){return a.utils.NaNtoZero(Math.max(Math.abs(m(o(b,c))-m(0)),1))})}),w.renderEnd("historicalBar immediate"),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=Math.floor(1e4*Math.random()),k=null,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=[],q=[0],r=!1,s=!0,t=a.utils.defaultColor(),u=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),v=!0,w=a.utils.renderWatch(u,0);return b.highlightPoint=function(a,b){k.select(".nv-bars .nv-bar-0-"+a).classed("hover",b)},b.clearHighlights=function(){k.select(".nv-bars .nv-bar.hover").classed("hover",!1)},b.dispatch=u,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},forceX:{get:function(){return p},set:function(a){p=a}},forceY:{get:function(){return q},set:function(a){q=a}},padData:{get:function(){return r},set:function(a){r=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},clipEdge:{get:function(){return s},set:function(a){s=a}},id:{get:function(){return j},set:function(a){j=a}},interactive:{get:function(){return v},set:function(a){v=a}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},color:{get:function(){return t},set:function(b){t=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.historicalBarChart=function(b){"use strict";function c(b){return b.each(function(k){z.reset(),z.models(f),q&&z.models(g),r&&z.models(h);var w=d3.select(this),A=this;a.utils.initSVG(w);var B=a.utils.availableWidth(n,w,l),C=a.utils.availableHeight(o,w,l);if(c.update=function(){w.transition().duration(y).call(c)},c.container=this,u.disabled=k.map(function(a){return!!a.disabled}),!v){var D;v={};for(D in u)v[D]=u[D]instanceof Array?u[D].slice(0):u[D]}if(!(k&&k.length&&k.filter(function(a){return a.values.length}).length))return a.utils.noData(c,w),c;w.selectAll(".nv-noData").remove(),d=f.xScale(),e=f.yScale();var E=w.selectAll("g.nv-wrap.nv-historicalBarChart").data([k]),F=E.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBarChart").append("g"),G=E.select("g");F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-barsWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-interactive"),p&&(i.width(B),G.select(".nv-legendWrap").datum(k).call(i),l.top!=i.height()&&(l.top=i.height(),C=a.utils.availableHeight(o,w,l)),E.select(".nv-legendWrap").attr("transform","translate(0,"+-l.top+")")),E.attr("transform","translate("+l.left+","+l.top+")"),s&&G.select(".nv-y.nv-axis").attr("transform","translate("+B+",0)"),t&&(j.width(B).height(C).margin({left:l.left,top:l.top}).svgContainer(w).xScale(d),E.select(".nv-interactive").call(j)),f.width(B).height(C).color(k.map(function(a,b){return a.color||m(a,b)}).filter(function(a,b){return!k[b].disabled}));var H=G.select(".nv-barsWrap").datum(k.filter(function(a){return!a.disabled}));H.transition().call(f),q&&(g.scale(d)._ticks(a.utils.calcTicksX(B/100,k)).tickSize(-C,0),G.select(".nv-x.nv-axis").attr("transform","translate(0,"+e.range()[0]+")"),G.select(".nv-x.nv-axis").transition().call(g)),r&&(h.scale(e)._ticks(a.utils.calcTicksY(C/36,k)).tickSize(-B,0),G.select(".nv-y.nv-axis").transition().call(h)),j.dispatch.on("elementMousemove",function(b){f.clearHighlights();var d,e,i,n=[];k.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(g){e=a.interactiveBisect(g.values,b.pointXValue,c.x()),f.highlightPoint(e,!0);var h=g.values[e];void 0!==h&&(void 0===d&&(d=h),void 0===i&&(i=c.xScale()(c.x()(h,e))),n.push({key:g.key,value:c.y()(h,e),color:m(g,g.seriesIndex),data:g.values[e]}))});var o=g.tickFormat()(c.x()(d,e));j.tooltip.position({left:i+l.left,top:b.mouseY+l.top}).chartContainer(A.parentNode).valueFormatter(function(a){return h.tickFormat()(a)}).data({value:o,index:e,series:n})(),j.renderGuideLine(i)}),j.dispatch.on("elementMouseout",function(){x.tooltipHide(),f.clearHighlights()}),i.dispatch.on("legendClick",function(a){a.disabled=!a.disabled,k.filter(function(a){return!a.disabled}).length||k.map(function(a){return a.disabled=!1,E.selectAll(".nv-series").classed("disabled",!1),a}),u.disabled=k.map(function(a){return!!a.disabled}),x.stateChange(u),b.transition().call(c)}),i.dispatch.on("legendDblclick",function(a){k.forEach(function(a){a.disabled=!0}),a.disabled=!1,u.disabled=k.map(function(a){return!!a.disabled}),x.stateChange(u),c.update()}),x.on("changeState",function(a){"undefined"!=typeof a.disabled&&(k.forEach(function(b,c){b.disabled=a.disabled[c]}),u.disabled=a.disabled),c.update()})}),z.renderEnd("historicalBarChart immediate"),c}var d,e,f=b||a.models.historicalBar(),g=a.models.axis(),h=a.models.axis(),i=a.models.legend(),j=a.interactiveGuideline(),k=a.models.tooltip(),l={top:30,right:90,bottom:50,left:90},m=a.utils.defaultColor(),n=null,o=null,p=!1,q=!0,r=!0,s=!1,t=!1,u={},v=null,w=null,x=d3.dispatch("tooltipHide","stateChange","changeState","renderEnd"),y=250;g.orient("bottom").tickPadding(7),h.orient(s?"right":"left"),k.duration(0).headerEnabled(!1).valueFormatter(function(a,b){return h.tickFormat()(a,b)}).headerFormatter(function(a,b){return g.tickFormat()(a,b)});var z=a.utils.renderWatch(x,0);return f.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:c.x()(a.data),value:c.y()(a.data),color:a.color},k.data(a).hidden(!1)}),f.dispatch.on("elementMouseout.tooltip",function(){k.hidden(!0)}),f.dispatch.on("elementMousemove.tooltip",function(){k.position({top:d3.event.pageY,left:d3.event.pageX})()}),c.dispatch=x,c.bars=f,c.legend=i,c.xAxis=g,c.yAxis=h,c.interactiveLayer=j,c.tooltip=k,c.options=a.utils.optionsFunc.bind(c),c._options=Object.create({},{width:{get:function(){return n},set:function(a){n=a}},height:{get:function(){return o},set:function(a){o=a}},showLegend:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return q},set:function(a){q=a}},showYAxis:{get:function(){return r},set:function(a){r=a}},defaultState:{get:function(){return v},set:function(a){v=a}},noData:{get:function(){return w},set:function(a){w=a}},tooltips:{get:function(){return k.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),k.enabled(!!b)}},tooltipContent:{get:function(){return k.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),k.contentGenerator(b)}},margin:{get:function(){return l},set:function(a){l.top=void 0!==a.top?a.top:l.top,l.right=void 0!==a.right?a.right:l.right,l.bottom=void 0!==a.bottom?a.bottom:l.bottom,l.left=void 0!==a.left?a.left:l.left}},color:{get:function(){return m},set:function(b){m=a.utils.getColor(b),i.color(m),f.color(m)}},duration:{get:function(){return y},set:function(a){y=a,z.reset(y),h.duration(y),g.duration(y)}},rightAlignYAxis:{get:function(){return s},set:function(a){s=a,h.orient(a?"right":"left")}},useInteractiveGuideline:{get:function(){return t},set:function(a){t=a,a===!0&&c.interactive(!1)}}}),a.utils.inheritOptions(c,f),a.utils.initOptions(c),c},a.models.ohlcBarChart=function(){var b=a.models.historicalBarChart(a.models.ohlcBar());return b.useInteractiveGuideline(!0),b.interactiveLayer.tooltip.contentGenerator(function(a){var c=a.series[0].data,d=c.open<c.close?"2ca02c":"d62728";return'<h3 style="color: #'+d+'">'+a.value+"</h3><table><tr><td>open:</td><td>"+b.yAxis.tickFormat()(c.open)+"</td></tr><tr><td>close:</td><td>"+b.yAxis.tickFormat()(c.close)+"</td></tr><tr><td>high</td><td>"+b.yAxis.tickFormat()(c.high)+"</td></tr><tr><td>low:</td><td>"+b.yAxis.tickFormat()(c.low)+"</td></tr></table>"}),b},a.models.candlestickBarChart=function(){var b=a.models.historicalBarChart(a.models.candlestickBar());return b.useInteractiveGuideline(!0),b.interactiveLayer.tooltip.contentGenerator(function(a){var c=a.series[0].data,d=c.open<c.close?"2ca02c":"d62728";return'<h3 style="color: #'+d+'">'+a.value+"</h3><table><tr><td>open:</td><td>"+b.yAxis.tickFormat()(c.open)+"</td></tr><tr><td>close:</td><td>"+b.yAxis.tickFormat()(c.close)+"</td></tr><tr><td>high</td><td>"+b.yAxis.tickFormat()(c.high)+"</td></tr><tr><td>low:</td><td>"+b.yAxis.tickFormat()(c.low)+"</td></tr></table>"}),b},a.models.legend=function(){"use strict";function b(p){function q(a,b){return"furious"!=o?"#000":m?a.disengaged?"#000":"#fff":m?void 0:(a.color||(a.color=g(a,b)),a.disabled?a.color:"#fff")}function r(a,b){return m&&"furious"==o&&a.disengaged?"#eee":a.color||g(a,b)}function s(a){return m&&"furious"==o?1:a.disabled?0:1}return p.each(function(b){var g=d-c.left-c.right,p=d3.select(this);a.utils.initSVG(p);var t=p.selectAll("g.nv-legend").data([b]),u=t.enter().append("g").attr("class","nvd3 nv-legend").append("g"),v=t.select("g");t.attr("transform","translate("+c.left+","+c.top+")");var w,x,y=v.selectAll(".nv-series").data(function(a){return"furious"!=o?a:a.filter(function(a){return m?!0:!a.disengaged})}),z=y.enter().append("g").attr("class","nv-series");switch(o){case"furious":x=23;break;case"classic":x=20}if("classic"==o)z.append("circle").style("stroke-width",2).attr("class","nv-legend-symbol").attr("r",5),w=y.select("circle");else if("furious"==o){z.append("rect").style("stroke-width",2).attr("class","nv-legend-symbol").attr("rx",3).attr("ry",3),w=y.select(".nv-legend-symbol"),z.append("g").attr("class","nv-check-box").property("innerHTML",'<path d="M0.5,5 L22.5,5 L22.5,26.5 L0.5,26.5 L0.5,5 Z" class="nv-box"></path><path d="M5.5,12.8618467 L11.9185089,19.2803556 L31,0.198864511" class="nv-check"></path>').attr("transform","translate(-10,-8)scale(0.5)");var A=y.select(".nv-check-box");A.each(function(a,b){d3.select(this).selectAll("path").attr("stroke",q(a,b))})}z.append("text").attr("text-anchor","start").attr("class","nv-legend-text").attr("dy",".32em").attr("dx","8");var B=y.select("text.nv-legend-text");y.on("mouseover",function(a,b){n.legendMouseover(a,b)}).on("mouseout",function(a,b){n.legendMouseout(a,b)}).on("click",function(a,b){n.legendClick(a,b);var c=y.data();if(k){if("classic"==o)l?(c.forEach(function(a){a.disabled=!0}),a.disabled=!1):(a.disabled=!a.disabled,c.every(function(a){return a.disabled})&&c.forEach(function(a){a.disabled=!1}));else if("furious"==o)if(m)a.disengaged=!a.disengaged,a.userDisabled=void 0==a.userDisabled?!!a.disabled:a.userDisabled,a.disabled=a.disengaged||a.userDisabled;else if(!m){a.disabled=!a.disabled,a.userDisabled=a.disabled;var d=c.filter(function(a){return!a.disengaged});d.every(function(a){return a.userDisabled})&&c.forEach(function(a){a.disabled=a.userDisabled=!1})}n.stateChange({disabled:c.map(function(a){return!!a.disabled}),disengaged:c.map(function(a){return!!a.disengaged})})}}).on("dblclick",function(a,b){if(("furious"!=o||!m)&&(n.legendDblclick(a,b),k)){var c=y.data();c.forEach(function(a){a.disabled=!0,"furious"==o&&(a.userDisabled=a.disabled)}),a.disabled=!1,"furious"==o&&(a.userDisabled=a.disabled),n.stateChange({disabled:c.map(function(a){return!!a.disabled})})}}),y.classed("nv-disabled",function(a){return a.userDisabled}),y.exit().remove(),B.attr("fill",q).text(f);var C=0;if(h){var D=[];y.each(function(){var b,c=d3.select(this).select("text");try{if(b=c.node().getComputedTextLength(),0>=b)throw Error()}catch(d){b=a.utils.calcApproxTextWidth(c)}D.push(b+i)});var E=0,F=[];for(C=0;g>C&&E<D.length;)F[E]=D[E],C+=D[E++];for(0===E&&(E=1);C>g&&E>1;){F=[],E--;for(var G=0;G<D.length;G++)D[G]>(F[G%E]||0)&&(F[G%E]=D[G]);C=F.reduce(function(a,b){return a+b})}for(var H=[],I=0,J=0;E>I;I++)H[I]=J,J+=F[I];y.attr("transform",function(a,b){return"translate("+H[b%E]+","+(5+Math.floor(b/E)*x)+")"}),j?v.attr("transform","translate("+(d-c.right-C)+","+c.top+")"):v.attr("transform","translate(0,"+c.top+")"),e=c.top+c.bottom+Math.ceil(D.length/E)*x}else{var K,L=5,M=5,N=0;y.attr("transform",function(){var a=d3.select(this).select("text").node().getComputedTextLength()+i;return K=M,d<c.left+c.right+K+a&&(M=K=5,L+=x),M+=a,M>N&&(N=M),K+N>C&&(C=K+N),"translate("+K+","+L+")"}),v.attr("transform","translate("+(d-c.right-N)+","+c.top+")"),e=c.top+c.bottom+L+15}if("furious"==o){w.attr("width",function(a,b){return B[0][b].getComputedTextLength()+27}).attr("height",18).attr("y",-9).attr("x",-15),u.insert("rect",":first-child").attr("class","nv-legend-bg").attr("fill","#eee").attr("opacity",0);var O=v.select(".nv-legend-bg");O.transition().duration(300).attr("x",-x).attr("width",C+x-12).attr("height",e+10).attr("y",-c.top-10).attr("opacity",m?1:0)}w.style("fill",r).style("fill-opacity",s).style("stroke",r)}),b}var c={top:5,right:0,bottom:5,left:0},d=400,e=20,f=function(a){return a.key},g=a.utils.getColor(),h=!0,i=32,j=!0,k=!0,l=!1,m=!1,n=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout","stateChange"),o="classic";return b.dispatch=n,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},key:{get:function(){return f},set:function(a){f=a}},align:{get:function(){return h},set:function(a){h=a}},rightAlign:{get:function(){return j},set:function(a){j=a}},padding:{get:function(){return i},set:function(a){i=a}},updateState:{get:function(){return k},set:function(a){k=a}},radioButtonMode:{get:function(){return l},set:function(a){l=a}},expanded:{get:function(){return m},set:function(a){m=a}},vers:{get:function(){return o},set:function(a){o=a}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return g},set:function(b){g=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.line=function(){"use strict";function b(r){return v.reset(),v.models(e),r.each(function(b){i=d3.select(this);var r=a.utils.availableWidth(g,i,f),s=a.utils.availableHeight(h,i,f);a.utils.initSVG(i),c=e.xScale(),d=e.yScale(),t=t||c,u=u||d;var w=i.selectAll("g.nv-wrap.nv-line").data([b]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-line"),y=x.append("defs"),z=x.append("g"),A=w.select("g");z.append("g").attr("class","nv-groups"),z.append("g").attr("class","nv-scatterWrap"),w.attr("transform","translate("+f.left+","+f.top+")"),e.width(r).height(s);var B=w.select(".nv-scatterWrap");B.call(e),y.append("clipPath").attr("id","nv-edge-clip-"+e.id()).append("rect"),w.select("#nv-edge-clip-"+e.id()+" rect").attr("width",r).attr("height",s>0?s:0),A.attr("clip-path",p?"url(#nv-edge-clip-"+e.id()+")":""),B.attr("clip-path",p?"url(#nv-edge-clip-"+e.id()+")":"");var C=w.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});C.enter().append("g").style("stroke-opacity",1e-6).style("stroke-width",function(a){return a.strokeWidth||j}).style("fill-opacity",1e-6),C.exit().remove(),C.attr("class",function(a,b){return(a.classed||"")+" nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return k(a,b)}).style("stroke",function(a,b){return k(a,b)}),C.watchTransition(v,"line: groups").style("stroke-opacity",1).style("fill-opacity",function(a){return a.fillOpacity||.5});var D=C.selectAll("path.nv-area").data(function(a){return o(a)?[a]:[]});D.enter().append("path").attr("class","nv-area").attr("d",function(b){return d3.svg.area().interpolate(q).defined(n).x(function(b,c){return a.utils.NaNtoZero(t(l(b,c)))}).y0(function(b,c){return a.utils.NaNtoZero(u(m(b,c)))}).y1(function(){return u(d.domain()[0]<=0?d.domain()[1]>=0?0:d.domain()[1]:d.domain()[0])}).apply(this,[b.values])}),C.exit().selectAll("path.nv-area").remove(),D.watchTransition(v,"line: areaPaths").attr("d",function(b){return d3.svg.area().interpolate(q).defined(n).x(function(b,d){return a.utils.NaNtoZero(c(l(b,d)))}).y0(function(b,c){return a.utils.NaNtoZero(d(m(b,c)))}).y1(function(){return d(d.domain()[0]<=0?d.domain()[1]>=0?0:d.domain()[1]:d.domain()[0])}).apply(this,[b.values])});var E=C.selectAll("path.nv-line").data(function(a){return[a.values]});E.enter().append("path").attr("class","nv-line").attr("d",d3.svg.line().interpolate(q).defined(n).x(function(b,c){return a.utils.NaNtoZero(t(l(b,c)))}).y(function(b,c){return a.utils.NaNtoZero(u(m(b,c)))})),E.watchTransition(v,"line: linePaths").attr("d",d3.svg.line().interpolate(q).defined(n).x(function(b,d){return a.utils.NaNtoZero(c(l(b,d)))}).y(function(b,c){return a.utils.NaNtoZero(d(m(b,c)))})),t=c.copy(),u=d.copy()}),v.renderEnd("line immediate"),b}var c,d,e=a.models.scatter(),f={top:0,right:0,bottom:0,left:0},g=960,h=500,i=null,j=1.5,k=a.utils.defaultColor(),l=function(a){return a.x},m=function(a){return a.y},n=function(a,b){return!isNaN(m(a,b))&&null!==m(a,b)},o=function(a){return a.area},p=!1,q="linear",r=250,s=d3.dispatch("elementClick","elementMouseover","elementMouseout","renderEnd");e.pointSize(16).pointDomain([16,256]);var t,u,v=a.utils.renderWatch(s,r);return b.dispatch=s,b.scatter=e,e.dispatch.on("elementClick",function(){s.elementClick.apply(this,arguments)}),e.dispatch.on("elementMouseover",function(){s.elementMouseover.apply(this,arguments)}),e.dispatch.on("elementMouseout",function(){s.elementMouseout.apply(this,arguments)}),b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},defined:{get:function(){return n},set:function(a){n=a}},interpolate:{get:function(){return q},set:function(a){q=a}},clipEdge:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}},duration:{get:function(){return r},set:function(a){r=a,v.reset(r),e.duration(r)}},isArea:{get:function(){return o},set:function(a){o=d3.functor(a)}},x:{get:function(){return l},set:function(a){l=a,e.x(a)}},y:{get:function(){return m},set:function(a){m=a,e.y(a)}},color:{get:function(){return k},set:function(b){k=a.utils.getColor(b),e.color(k)}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.lineChart=function(){"use strict";function b(j){return y.reset(),y.models(e),p&&y.models(f),q&&y.models(g),j.each(function(j){var v=d3.select(this),y=this;a.utils.initSVG(v);var B=a.utils.availableWidth(m,v,k),C=a.utils.availableHeight(n,v,k);if(b.update=function(){0===x?v.call(b):v.transition().duration(x).call(b)},b.container=this,t.setter(A(j),b.update).getter(z(j)).update(),t.disabled=j.map(function(a){return!!a.disabled}),!u){var D;u={};for(D in t)u[D]=t[D]instanceof Array?t[D].slice(0):t[D]
-}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,v),b;v.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var E=v.selectAll("g.nv-wrap.nv-lineChart").data([j]),F=E.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),G=E.select("g");F.append("rect").style("opacity",0),F.append("g").attr("class","nv-x nv-axis"),F.append("g").attr("class","nv-y nv-axis"),F.append("g").attr("class","nv-linesWrap"),F.append("g").attr("class","nv-legendWrap"),F.append("g").attr("class","nv-interactive"),G.select("rect").attr("width",B).attr("height",C>0?C:0),o&&(h.width(B),G.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),C=a.utils.availableHeight(n,v,k)),E.select(".nv-legendWrap").attr("transform","translate(0,"+-k.top+")")),E.attr("transform","translate("+k.left+","+k.top+")"),r&&G.select(".nv-y.nv-axis").attr("transform","translate("+B+",0)"),s&&(i.width(B).height(C).margin({left:k.left,top:k.top}).svgContainer(v).xScale(c),E.select(".nv-interactive").call(i)),e.width(B).height(C).color(j.map(function(a,b){return a.color||l(a,b)}).filter(function(a,b){return!j[b].disabled}));var H=G.select(".nv-linesWrap").datum(j.filter(function(a){return!a.disabled}));H.call(e),p&&(f.scale(c)._ticks(a.utils.calcTicksX(B/100,j)).tickSize(-C,0),G.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),G.select(".nv-x.nv-axis").call(f)),q&&(g.scale(d)._ticks(a.utils.calcTicksY(C/36,j)).tickSize(-B,0),G.select(".nv-y.nv-axis").call(g)),h.dispatch.on("stateChange",function(a){for(var c in a)t[c]=a[c];w.stateChange(t),b.update()}),i.dispatch.on("elementMousemove",function(c){e.clearHighlights();var d,h,m,n=[];if(j.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(f,g){h=a.interactiveBisect(f.values,c.pointXValue,b.x());var i=f.values[h],j=b.y()(i,h);null!=j&&e.highlightPoint(g,h,!0),void 0!==i&&(void 0===d&&(d=i),void 0===m&&(m=b.xScale()(b.x()(i,h))),n.push({key:f.key,value:j,color:l(f,f.seriesIndex)}))}),n.length>2){var o=b.yScale().invert(c.mouseY),p=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),q=.03*p,r=a.nearestValueIndex(n.map(function(a){return a.value}),o,q);null!==r&&(n[r].highlight=!0)}var s=f.tickFormat()(b.x()(d,h));i.tooltip.position({left:c.mouseX+k.left,top:c.mouseY+k.top}).chartContainer(y.parentNode).valueFormatter(function(a){return null==a?"N/A":g.tickFormat()(a)}).data({value:s,index:h,series:n})(),i.renderGuideLine(m)}),i.dispatch.on("elementClick",function(c){var d,f=[];j.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(e){var g=a.interactiveBisect(e.values,c.pointXValue,b.x()),h=e.values[g];if("undefined"!=typeof h){"undefined"==typeof d&&(d=b.xScale()(b.x()(h,g)));var i=b.yScale()(b.y()(h,g));f.push({point:h,pointIndex:g,pos:[d,i],seriesIndex:e.seriesIndex,series:e})}}),e.dispatch.elementClick(f)}),i.dispatch.on("elementMouseout",function(){e.clearHighlights()}),w.on("changeState",function(a){"undefined"!=typeof a.disabled&&j.length===a.disabled.length&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),t.disabled=a.disabled),b.update()})}),y.renderEnd("lineChart immediate"),b}var c,d,e=a.models.line(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.interactiveGuideline(),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=a.utils.defaultColor(),m=null,n=null,o=!0,p=!0,q=!0,r=!1,s=!1,t=a.utils.state(),u=null,v=null,w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd"),x=250;f.orient("bottom").tickPadding(7),g.orient(r?"right":"left"),j.valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)});var y=a.utils.renderWatch(w,x),z=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},A=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return e.dispatch.on("elementMouseover.tooltip",function(a){j.data(a).position(a.pos).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),b.dispatch=w,b.lines=e,b.legend=h,b.xAxis=f,b.yAxis=g,b.interactiveLayer=i,b.tooltip=j,b.dispatch=w,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return o},set:function(a){o=a}},showXAxis:{get:function(){return p},set:function(a){p=a}},showYAxis:{get:function(){return q},set:function(a){q=a}},defaultState:{get:function(){return u},set:function(a){u=a}},noData:{get:function(){return v},set:function(a){v=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return x},set:function(a){x=a,y.reset(x),e.duration(x),f.duration(x),g.duration(x)}},color:{get:function(){return l},set:function(b){l=a.utils.getColor(b),h.color(l),e.color(l)}},rightAlignYAxis:{get:function(){return r},set:function(a){r=a,g.orient(r?"right":"left")}},useInteractiveGuideline:{get:function(){return s},set:function(a){s=a,s&&(e.interactive(!1),e.useVoronoi(!1))}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.linePlusBarChart=function(){"use strict";function b(v){return v.each(function(v){function J(a){var b=+("e"==a),c=b?1:-1,d=X/3;return"M"+.5*c+","+d+"A6,6 0 0 "+b+" "+6.5*c+","+(d+6)+"V"+(2*d-6)+"A6,6 0 0 "+b+" "+.5*c+","+2*d+"ZM"+2.5*c+","+(d+8)+"V"+(2*d-8)+"M"+4.5*c+","+(d+8)+"V"+(2*d-8)}function S(){u.empty()||u.extent(I),kb.data([u.empty()?e.domain():I]).each(function(a){var b=e(a[0])-e.range()[0],c=e.range()[1]-e(a[1]);d3.select(this).select(".left").attr("width",0>b?0:b),d3.select(this).select(".right").attr("x",e(a[1])).attr("width",0>c?0:c)})}function T(){I=u.empty()?null:u.extent(),c=u.empty()?e.domain():u.extent(),K.brush({extent:c,brush:u}),S(),l.width(V).height(W).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&v[b].bar})),j.width(V).height(W).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&!v[b].bar}));var b=db.select(".nv-focus .nv-barsWrap").datum(Z.length?Z.map(function(a){return{key:a.key,values:a.values.filter(function(a,b){return l.x()(a,b)>=c[0]&&l.x()(a,b)<=c[1]})}}):[{values:[]}]),h=db.select(".nv-focus .nv-linesWrap").datum($[0].disabled?[{values:[]}]:$.map(function(a){return{area:a.area,fillOpacity:a.fillOpacity,key:a.key,values:a.values.filter(function(a,b){return j.x()(a,b)>=c[0]&&j.x()(a,b)<=c[1]})}}));d=Z.length?l.xScale():j.xScale(),n.scale(d)._ticks(a.utils.calcTicksX(V/100,v)).tickSize(-W,0),n.domain([Math.ceil(c[0]),Math.floor(c[1])]),db.select(".nv-x.nv-axis").transition().duration(L).call(n),b.transition().duration(L).call(l),h.transition().duration(L).call(j),db.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),p.scale(f)._ticks(a.utils.calcTicksY(W/36,v)).tickSize(-V,0),q.scale(g)._ticks(a.utils.calcTicksY(W/36,v)).tickSize(Z.length?0:-V,0),db.select(".nv-focus .nv-y1.nv-axis").style("opacity",Z.length?1:0),db.select(".nv-focus .nv-y2.nv-axis").style("opacity",$.length&&!$[0].disabled?1:0).attr("transform","translate("+d.range()[1]+",0)"),db.select(".nv-focus .nv-y1.nv-axis").transition().duration(L).call(p),db.select(".nv-focus .nv-y2.nv-axis").transition().duration(L).call(q)}var U=d3.select(this);a.utils.initSVG(U);var V=a.utils.availableWidth(y,U,w),W=a.utils.availableHeight(z,U,w)-(E?H:0),X=H-x.top-x.bottom;if(b.update=function(){U.transition().duration(L).call(b)},b.container=this,M.setter(R(v),b.update).getter(Q(v)).update(),M.disabled=v.map(function(a){return!!a.disabled}),!N){var Y;N={};for(Y in M)N[Y]=M[Y]instanceof Array?M[Y].slice(0):M[Y]}if(!(v&&v.length&&v.filter(function(a){return a.values.length}).length))return a.utils.noData(b,U),b;U.selectAll(".nv-noData").remove();var Z=v.filter(function(a){return!a.disabled&&a.bar}),$=v.filter(function(a){return!a.bar});d=l.xScale(),e=o.scale(),f=l.yScale(),g=j.yScale(),h=m.yScale(),i=k.yScale();var _=v.filter(function(a){return!a.disabled&&a.bar}).map(function(a){return a.values.map(function(a,b){return{x:A(a,b),y:B(a,b)}})}),ab=v.filter(function(a){return!a.disabled&&!a.bar}).map(function(a){return a.values.map(function(a,b){return{x:A(a,b),y:B(a,b)}})});d.range([0,V]),e.domain(d3.extent(d3.merge(_.concat(ab)),function(a){return a.x})).range([0,V]);var bb=U.selectAll("g.nv-wrap.nv-linePlusBar").data([v]),cb=bb.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),db=bb.select("g");cb.append("g").attr("class","nv-legendWrap");var eb=cb.append("g").attr("class","nv-focus");eb.append("g").attr("class","nv-x nv-axis"),eb.append("g").attr("class","nv-y1 nv-axis"),eb.append("g").attr("class","nv-y2 nv-axis"),eb.append("g").attr("class","nv-barsWrap"),eb.append("g").attr("class","nv-linesWrap");var fb=cb.append("g").attr("class","nv-context");if(fb.append("g").attr("class","nv-x nv-axis"),fb.append("g").attr("class","nv-y1 nv-axis"),fb.append("g").attr("class","nv-y2 nv-axis"),fb.append("g").attr("class","nv-barsWrap"),fb.append("g").attr("class","nv-linesWrap"),fb.append("g").attr("class","nv-brushBackground"),fb.append("g").attr("class","nv-x nv-brush"),D){var gb=t.align()?V/2:V,hb=t.align()?gb:0;t.width(gb),db.select(".nv-legendWrap").datum(v.map(function(a){return a.originalKey=void 0===a.originalKey?a.key:a.originalKey,a.key=a.originalKey+(a.bar?O:P),a})).call(t),w.top!=t.height()&&(w.top=t.height(),W=a.utils.availableHeight(z,U,w)-H),db.select(".nv-legendWrap").attr("transform","translate("+hb+","+-w.top+")")}bb.attr("transform","translate("+w.left+","+w.top+")"),db.select(".nv-context").style("display",E?"initial":"none"),m.width(V).height(X).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&v[b].bar})),k.width(V).height(X).color(v.map(function(a,b){return a.color||C(a,b)}).filter(function(a,b){return!v[b].disabled&&!v[b].bar}));var ib=db.select(".nv-context .nv-barsWrap").datum(Z.length?Z:[{values:[]}]),jb=db.select(".nv-context .nv-linesWrap").datum($[0].disabled?[{values:[]}]:$);db.select(".nv-context").attr("transform","translate(0,"+(W+w.bottom+x.top)+")"),ib.transition().call(m),jb.transition().call(k),G&&(o._ticks(a.utils.calcTicksX(V/100,v)).tickSize(-X,0),db.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+h.range()[0]+")"),db.select(".nv-context .nv-x.nv-axis").transition().call(o)),F&&(r.scale(h)._ticks(X/36).tickSize(-V,0),s.scale(i)._ticks(X/36).tickSize(Z.length?0:-V,0),db.select(".nv-context .nv-y3.nv-axis").style("opacity",Z.length?1:0).attr("transform","translate(0,"+e.range()[0]+")"),db.select(".nv-context .nv-y2.nv-axis").style("opacity",$.length?1:0).attr("transform","translate("+e.range()[1]+",0)"),db.select(".nv-context .nv-y1.nv-axis").transition().call(r),db.select(".nv-context .nv-y2.nv-axis").transition().call(s)),u.x(e).on("brush",T),I&&u.extent(I);var kb=db.select(".nv-brushBackground").selectAll("g").data([I||u.extent()]),lb=kb.enter().append("g");lb.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",X),lb.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",X);var mb=db.select(".nv-x.nv-brush").call(u);mb.selectAll("rect").attr("height",X),mb.selectAll(".resize").append("path").attr("d",J),t.dispatch.on("stateChange",function(a){for(var c in a)M[c]=a[c];K.stateChange(M),b.update()}),K.on("changeState",function(a){"undefined"!=typeof a.disabled&&(v.forEach(function(b,c){b.disabled=a.disabled[c]}),M.disabled=a.disabled),b.update()}),T()}),b}var c,d,e,f,g,h,i,j=a.models.line(),k=a.models.line(),l=a.models.historicalBar(),m=a.models.historicalBar(),n=a.models.axis(),o=a.models.axis(),p=a.models.axis(),q=a.models.axis(),r=a.models.axis(),s=a.models.axis(),t=a.models.legend(),u=d3.svg.brush(),v=a.models.tooltip(),w={top:30,right:30,bottom:30,left:60},x={top:0,right:30,bottom:20,left:60},y=null,z=null,A=function(a){return a.x},B=function(a){return a.y},C=a.utils.defaultColor(),D=!0,E=!0,F=!1,G=!0,H=50,I=null,J=null,K=d3.dispatch("brush","stateChange","changeState"),L=0,M=a.utils.state(),N=null,O=" (left axis)",P=" (right axis)";j.clipEdge(!0),k.interactive(!1),k.pointActive(function(){return!1}),n.orient("bottom").tickPadding(5),p.orient("left"),q.orient("right"),o.orient("bottom").tickPadding(5),r.orient("left"),s.orient("right"),v.headerEnabled(!0).headerFormatter(function(a,b){return n.tickFormat()(a,b)});var Q=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},R=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return j.dispatch.on("elementMouseover.tooltip",function(a){v.duration(100).valueFormatter(function(a,b){return q.tickFormat()(a,b)}).data(a).position(a.pos).hidden(!1)}),j.dispatch.on("elementMouseout.tooltip",function(){v.hidden(!0)}),l.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={value:b.y()(a.data),color:a.color},v.duration(0).valueFormatter(function(a,b){return p.tickFormat()(a,b)}).data(a).hidden(!1)}),l.dispatch.on("elementMouseout.tooltip",function(){v.hidden(!0)}),l.dispatch.on("elementMousemove.tooltip",function(){v.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=K,b.legend=t,b.lines=j,b.lines2=k,b.bars=l,b.bars2=m,b.xAxis=n,b.x2Axis=o,b.y1Axis=p,b.y2Axis=q,b.y3Axis=r,b.y4Axis=s,b.tooltip=v,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return y},set:function(a){y=a}},height:{get:function(){return z},set:function(a){z=a}},showLegend:{get:function(){return D},set:function(a){D=a}},brushExtent:{get:function(){return I},set:function(a){I=a}},noData:{get:function(){return J},set:function(a){J=a}},focusEnable:{get:function(){return E},set:function(a){E=a}},focusHeight:{get:function(){return H},set:function(a){H=a}},focusShowAxisX:{get:function(){return G},set:function(a){G=a}},focusShowAxisY:{get:function(){return F},set:function(a){F=a}},legendLeftAxisHint:{get:function(){return O},set:function(a){O=a}},legendRightAxisHint:{get:function(){return P},set:function(a){P=a}},tooltips:{get:function(){return v.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),v.enabled(!!b)}},tooltipContent:{get:function(){return v.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),v.contentGenerator(b)}},margin:{get:function(){return w},set:function(a){w.top=void 0!==a.top?a.top:w.top,w.right=void 0!==a.right?a.right:w.right,w.bottom=void 0!==a.bottom?a.bottom:w.bottom,w.left=void 0!==a.left?a.left:w.left}},focusMargin:{get:function(){return x},set:function(a){x.top=void 0!==a.top?a.top:x.top,x.right=void 0!==a.right?a.right:x.right,x.bottom=void 0!==a.bottom?a.bottom:x.bottom,x.left=void 0!==a.left?a.left:x.left}},duration:{get:function(){return L},set:function(a){L=a}},color:{get:function(){return C},set:function(b){C=a.utils.getColor(b),t.color(C)}},x:{get:function(){return A},set:function(a){A=a,j.x(a),k.x(a),l.x(a),m.x(a)}},y:{get:function(){return B},set:function(a){B=a,j.y(a),k.y(a),l.y(a),m.y(a)}}}),a.utils.inheritOptions(b,j),a.utils.initOptions(b),b},a.models.lineWithFocusChart=function(){"use strict";function b(o){return o.each(function(o){function z(a){var b=+("e"==a),c=b?1:-1,d=M/3;return"M"+.5*c+","+d+"A6,6 0 0 "+b+" "+6.5*c+","+(d+6)+"V"+(2*d-6)+"A6,6 0 0 "+b+" "+.5*c+","+2*d+"ZM"+2.5*c+","+(d+8)+"V"+(2*d-8)+"M"+4.5*c+","+(d+8)+"V"+(2*d-8)}function G(){n.empty()||n.extent(y),U.data([n.empty()?e.domain():y]).each(function(a){var b=e(a[0])-c.range()[0],d=K-e(a[1]);d3.select(this).select(".left").attr("width",0>b?0:b),d3.select(this).select(".right").attr("x",e(a[1])).attr("width",0>d?0:d)})}function H(){y=n.empty()?null:n.extent();var a=n.empty()?e.domain():n.extent();if(!(Math.abs(a[0]-a[1])<=1)){A.brush({extent:a,brush:n}),G();var b=Q.select(".nv-focus .nv-linesWrap").datum(o.filter(function(a){return!a.disabled}).map(function(b){return{key:b.key,area:b.area,values:b.values.filter(function(b,c){return g.x()(b,c)>=a[0]&&g.x()(b,c)<=a[1]})}}));b.transition().duration(B).call(g),Q.select(".nv-focus .nv-x.nv-axis").transition().duration(B).call(i),Q.select(".nv-focus .nv-y.nv-axis").transition().duration(B).call(j)}}var I=d3.select(this),J=this;a.utils.initSVG(I);var K=a.utils.availableWidth(t,I,q),L=a.utils.availableHeight(u,I,q)-v,M=v-r.top-r.bottom;if(b.update=function(){I.transition().duration(B).call(b)},b.container=this,C.setter(F(o),b.update).getter(E(o)).update(),C.disabled=o.map(function(a){return!!a.disabled}),!D){var N;D={};for(N in C)D[N]=C[N]instanceof Array?C[N].slice(0):C[N]}if(!(o&&o.length&&o.filter(function(a){return a.values.length}).length))return a.utils.noData(b,I),b;I.selectAll(".nv-noData").remove(),c=g.xScale(),d=g.yScale(),e=h.xScale(),f=h.yScale();var O=I.selectAll("g.nv-wrap.nv-lineWithFocusChart").data([o]),P=O.enter().append("g").attr("class","nvd3 nv-wrap nv-lineWithFocusChart").append("g"),Q=O.select("g");P.append("g").attr("class","nv-legendWrap");var R=P.append("g").attr("class","nv-focus");R.append("g").attr("class","nv-x nv-axis"),R.append("g").attr("class","nv-y nv-axis"),R.append("g").attr("class","nv-linesWrap"),R.append("g").attr("class","nv-interactive");var S=P.append("g").attr("class","nv-context");S.append("g").attr("class","nv-x nv-axis"),S.append("g").attr("class","nv-y nv-axis"),S.append("g").attr("class","nv-linesWrap"),S.append("g").attr("class","nv-brushBackground"),S.append("g").attr("class","nv-x nv-brush"),x&&(m.width(K),Q.select(".nv-legendWrap").datum(o).call(m),q.top!=m.height()&&(q.top=m.height(),L=a.utils.availableHeight(u,I,q)-v),Q.select(".nv-legendWrap").attr("transform","translate(0,"+-q.top+")")),O.attr("transform","translate("+q.left+","+q.top+")"),w&&(p.width(K).height(L).margin({left:q.left,top:q.top}).svgContainer(I).xScale(c),O.select(".nv-interactive").call(p)),g.width(K).height(L).color(o.map(function(a,b){return a.color||s(a,b)}).filter(function(a,b){return!o[b].disabled})),h.defined(g.defined()).width(K).height(M).color(o.map(function(a,b){return a.color||s(a,b)}).filter(function(a,b){return!o[b].disabled})),Q.select(".nv-context").attr("transform","translate(0,"+(L+q.bottom+r.top)+")");var T=Q.select(".nv-context .nv-linesWrap").datum(o.filter(function(a){return!a.disabled}));d3.transition(T).call(h),i.scale(c)._ticks(a.utils.calcTicksX(K/100,o)).tickSize(-L,0),j.scale(d)._ticks(a.utils.calcTicksY(L/36,o)).tickSize(-K,0),Q.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+L+")"),n.x(e).on("brush",function(){H()}),y&&n.extent(y);var U=Q.select(".nv-brushBackground").selectAll("g").data([y||n.extent()]),V=U.enter().append("g");V.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",M),V.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",M);var W=Q.select(".nv-x.nv-brush").call(n);W.selectAll("rect").attr("height",M),W.selectAll(".resize").append("path").attr("d",z),H(),k.scale(e)._ticks(a.utils.calcTicksX(K/100,o)).tickSize(-M,0),Q.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),d3.transition(Q.select(".nv-context .nv-x.nv-axis")).call(k),l.scale(f)._ticks(a.utils.calcTicksY(M/36,o)).tickSize(-K,0),d3.transition(Q.select(".nv-context .nv-y.nv-axis")).call(l),Q.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+f.range()[0]+")"),m.dispatch.on("stateChange",function(a){for(var c in a)C[c]=a[c];A.stateChange(C),b.update()}),p.dispatch.on("elementMousemove",function(c){g.clearHighlights();var d,f,h,k=[];if(o.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(i,j){var l=n.empty()?e.domain():n.extent(),m=i.values.filter(function(a,b){return g.x()(a,b)>=l[0]&&g.x()(a,b)<=l[1]});f=a.interactiveBisect(m,c.pointXValue,g.x());var o=m[f],p=b.y()(o,f);null!=p&&g.highlightPoint(j,f,!0),void 0!==o&&(void 0===d&&(d=o),void 0===h&&(h=b.xScale()(b.x()(o,f))),k.push({key:i.key,value:b.y()(o,f),color:s(i,i.seriesIndex)}))}),k.length>2){var l=b.yScale().invert(c.mouseY),m=Math.abs(b.yScale().domain()[0]-b.yScale().domain()[1]),r=.03*m,t=a.nearestValueIndex(k.map(function(a){return a.value}),l,r);null!==t&&(k[t].highlight=!0)}var u=i.tickFormat()(b.x()(d,f));p.tooltip.position({left:c.mouseX+q.left,top:c.mouseY+q.top}).chartContainer(J.parentNode).valueFormatter(function(a){return null==a?"N/A":j.tickFormat()(a)}).data({value:u,index:f,series:k})(),p.renderGuideLine(h)}),p.dispatch.on("elementMouseout",function(){g.clearHighlights()}),A.on("changeState",function(a){"undefined"!=typeof a.disabled&&o.forEach(function(b,c){b.disabled=a.disabled[c]}),b.update()})}),b}var c,d,e,f,g=a.models.line(),h=a.models.line(),i=a.models.axis(),j=a.models.axis(),k=a.models.axis(),l=a.models.axis(),m=a.models.legend(),n=d3.svg.brush(),o=a.models.tooltip(),p=a.interactiveGuideline(),q={top:30,right:30,bottom:30,left:60},r={top:0,right:30,bottom:20,left:60},s=a.utils.defaultColor(),t=null,u=null,v=50,w=!1,x=!0,y=null,z=null,A=d3.dispatch("brush","stateChange","changeState"),B=250,C=a.utils.state(),D=null;g.clipEdge(!0).duration(0),h.interactive(!1),h.pointActive(function(){return!1}),i.orient("bottom").tickPadding(5),j.orient("left"),k.orient("bottom").tickPadding(5),l.orient("left"),o.valueFormatter(function(a,b){return j.tickFormat()(a,b)}).headerFormatter(function(a,b){return i.tickFormat()(a,b)});var E=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},F=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return g.dispatch.on("elementMouseover.tooltip",function(a){o.data(a).position(a.pos).hidden(!1)}),g.dispatch.on("elementMouseout.tooltip",function(){o.hidden(!0)}),b.dispatch=A,b.legend=m,b.lines=g,b.lines2=h,b.xAxis=i,b.yAxis=j,b.x2Axis=k,b.y2Axis=l,b.interactiveLayer=p,b.tooltip=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return t},set:function(a){t=a}},height:{get:function(){return u},set:function(a){u=a}},focusHeight:{get:function(){return v},set:function(a){v=a}},showLegend:{get:function(){return x},set:function(a){x=a}},brushExtent:{get:function(){return y},set:function(a){y=a}},defaultState:{get:function(){return D},set:function(a){D=a}},noData:{get:function(){return z},set:function(a){z=a}},tooltips:{get:function(){return o.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),o.enabled(!!b)}},tooltipContent:{get:function(){return o.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),o.contentGenerator(b)}},margin:{get:function(){return q},set:function(a){q.top=void 0!==a.top?a.top:q.top,q.right=void 0!==a.right?a.right:q.right,q.bottom=void 0!==a.bottom?a.bottom:q.bottom,q.left=void 0!==a.left?a.left:q.left}},focusMargin:{get:function(){return r},set:function(a){r.top=void 0!==a.top?a.top:r.top,r.right=void 0!==a.right?a.right:r.right,r.bottom=void 0!==a.bottom?a.bottom:r.bottom,r.left=void 0!==a.left?a.left:r.left}},color:{get:function(){return s},set:function(b){s=a.utils.getColor(b),m.color(s)}},interpolate:{get:function(){return g.interpolate()},set:function(a){g.interpolate(a),h.interpolate(a)}},xTickFormat:{get:function(){return i.tickFormat()},set:function(a){i.tickFormat(a),k.tickFormat(a)}},yTickFormat:{get:function(){return j.tickFormat()},set:function(a){j.tickFormat(a),l.tickFormat(a)}},duration:{get:function(){return B},set:function(a){B=a,j.duration(B),l.duration(B),i.duration(B),k.duration(B)}},x:{get:function(){return g.x()},set:function(a){g.x(a),h.x(a)}},y:{get:function(){return g.y()},set:function(a){g.y(a),h.y(a)}},useInteractiveGuideline:{get:function(){return w},set:function(a){w=a,w&&(g.interactive(!1),g.useVoronoi(!1))}}}),a.utils.inheritOptions(b,g),a.utils.initOptions(b),b},a.models.multiBar=function(){"use strict";function b(G){return E.reset(),G.each(function(b){var G=k-j.left-j.right,H=l-j.top-j.bottom;p=d3.select(this),a.utils.initSVG(p);var I=0;if(z&&b.length&&(z=[{values:b[0].values.map(function(a){return{x:a.x,y:0,series:a.series,size:.01}})}]),v){var J=d3.layout.stack().offset(w).values(function(a){return a.values}).y(r)(!b.length&&z?z:b);J.forEach(function(a,c){a.nonStackable?(b[c].nonStackableSeries=I++,J[c]=b[c]):c>0&&J[c-1].nonStackable&&J[c].values.map(function(a,b){a.y0-=J[c-1].values[b].y,a.y1=a.y0+a.y})}),b=J}b.forEach(function(a,b){a.values.forEach(function(c){c.series=b,c.key=a.key})}),v&&b[0].values.map(function(a,c){var d=0,e=0;b.map(function(a,f){if(!b[f].nonStackable){var g=a.values[c];g.size=Math.abs(g.y),g.y<0?(g.y1=e,e-=g.size):(g.y1=g.size+d,d+=g.size)}})});var K=d&&e?[]:b.map(function(a,b){return a.values.map(function(a,c){return{x:q(a,c),y:r(a,c),y0:a.y0,y1:a.y1,idx:b,yErr:s(a,c)}})});m.domain(d||d3.merge(K).map(function(a){return a.x})).rangeBands(f||[0,G],C),n.domain(e||d3.extent(d3.merge(d3.merge(K).map(function(a){var c=a.y;v&&!b[a.idx].nonStackable&&(c=a.y>0?a.y1:a.y1+a.y);var d=a.yErr;return d?d.length?[c+d[0],c+d[1]]:(d=Math.abs(d),[c-d,c+d]):[c]})).concat(t))).range(g||[H,0]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]-.01*m.domain()[0],m.domain()[1]+.01*m.domain()[1]]:[-1,1]),n.domain()[0]===n.domain()[1]&&n.domain(n.domain()[0]?[n.domain()[0]+.01*n.domain()[0],n.domain()[1]-.01*n.domain()[1]]:[-1,1]),h=h||m,i=i||n;var L=p.selectAll("g.nv-wrap.nv-multibar").data([b]),M=L.enter().append("g").attr("class","nvd3 nv-wrap nv-multibar"),N=M.append("defs"),O=M.append("g"),P=L.select("g");O.append("g").attr("class","nv-groups"),L.attr("transform","translate("+j.left+","+j.top+")"),N.append("clipPath").attr("id","nv-edge-clip-"+o).append("rect"),L.select("#nv-edge-clip-"+o+" rect").attr("width",G).attr("height",H),P.attr("clip-path",u?"url(#nv-edge-clip-"+o+")":"");var Q=L.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a,b){return b});Q.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6);var R=E.transition(Q.exit().selectAll("g.nv-bar"),"multibarExit",Math.min(100,B)).attr("y",function(a){var c=i(0)||0;return v&&b[a.series]&&!b[a.series].nonStackable&&(c=i(a.y0)),c}).attr("height",0).remove();R.delay&&R.delay(function(a,b){var c=b*(B/(F+1))-b;return c}),Q.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return x(a,b)}).style("stroke",function(a,b){return x(a,b)}),Q.style("stroke-opacity",1).style("fill-opacity",.75);var S=Q.selectAll("g.nv-bar").data(function(a){return z&&!b.length?z.values:a.values});S.exit().remove();var T=S.enter().append("g").attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}).attr("transform",function(a,c,d){var e=v&&!b[d].nonStackable?0:d*m.rangeBand()/b.length,f=i(v&&!b[d].nonStackable?a.y0:0)||0;return"translate("+e+","+f+")"});T.append("rect").attr("height",0).attr("width",function(a,c,d){return m.rangeBand()/(v&&!b[d].nonStackable?1:b.length)}).style("fill",function(a,b,c){return x(a,c,b)}).style("stroke",function(a,b,c){return x(a,c,b)}),S.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),D.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),D.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){D.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){D.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){D.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}),s(b[0].values[0],0)&&(T.append("polyline"),S.select("polyline").attr("fill","none").attr("stroke",function(a,b,c){return y(a,c,b)}).attr("points",function(a,c){var d=s(a,c),e=.8*m.rangeBand()/(2*(v?1:b.length));d=d.length?d:[-Math.abs(d),Math.abs(d)],d=d.map(function(a){return n(a)-n(0)});var f=[[-e,d[0]],[e,d[0]],[0,d[0]],[0,d[1]],[-e,d[1]],[e,d[1]]];return f.map(function(a){return a.join(",")}).join(" ")}).attr("transform",function(a,c){var d=m.rangeBand()/(2*(v?1:b.length)),e=r(a,c)<0?n(r(a,c))-n(0):0;return"translate("+d+", "+e+")"})),S.attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}),A&&(c||(c=b.map(function(){return!0})),S.select("rect").style("fill",function(a,b,d){return d3.rgb(A(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}).style("stroke",function(a,b,d){return d3.rgb(A(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}));var U=S.watchTransition(E,"multibar",Math.min(250,B)).delay(function(a,c){return c*B/b[0].values.length});v?U.attr("transform",function(a,c,d){var e=0;e=b[d].nonStackable?r(a,c)<0?n(0):n(0)-n(r(a,c))<-1?n(0)-1:n(r(a,c))||0:n(a.y1);var f=0;b[d].nonStackable&&(f=a.series*m.rangeBand()/b.length,b.length!==I&&(f=b[d].nonStackableSeries*m.rangeBand()/(2*I)));var g=f+m(q(a,c));return"translate("+g+","+e+")"}).select("rect").attr("height",function(a,c,d){return b[d].nonStackable?Math.max(Math.abs(n(r(a,c))-n(0)),1)||0:Math.max(Math.abs(n(a.y+a.y0)-n(a.y0)),1)}).attr("width",function(a,c,d){if(b[d].nonStackable){var e=m.rangeBand()/I;return b.length!==I&&(e=m.rangeBand()/(2*I)),e}return m.rangeBand()}):U.attr("transform",function(a,c){var d=a.series*m.rangeBand()/b.length+m(q(a,c)),e=r(a,c)<0?n(0):n(0)-n(r(a,c))<1?n(0)-1:n(r(a,c))||0;return"translate("+d+","+e+")"}).select("rect").attr("width",m.rangeBand()/b.length).attr("height",function(a,b){return Math.max(Math.abs(n(r(a,b))-n(0)),1)||0}),h=m.copy(),i=n.copy(),b[0]&&b[0].values&&(F=b[0].values.length)}),E.renderEnd("multibar immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=d3.scale.ordinal(),n=d3.scale.linear(),o=Math.floor(1e4*Math.random()),p=null,q=function(a){return a.x},r=function(a){return a.y},s=function(a){return a.yErr},t=[0],u=!0,v=!1,w="zero",x=a.utils.defaultColor(),y=a.utils.defaultColor(),z=!1,A=null,B=500,C=.1,D=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),E=a.utils.renderWatch(D,B),F=0;return b.dispatch=D,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},x:{get:function(){return q},set:function(a){q=a}},y:{get:function(){return r},set:function(a){r=a}},yErr:{get:function(){return s},set:function(a){s=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceY:{get:function(){return t},set:function(a){t=a}},stacked:{get:function(){return v},set:function(a){v=a}},stackOffset:{get:function(){return w},set:function(a){w=a}},clipEdge:{get:function(){return u},set:function(a){u=a}},disabled:{get:function(){return c},set:function(a){c=a}},id:{get:function(){return o},set:function(a){o=a}},hideable:{get:function(){return z
-},set:function(a){z=a}},groupSpacing:{get:function(){return C},set:function(a){C=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},duration:{get:function(){return B},set:function(a){B=a,E.reset(B)}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}},barColor:{get:function(){return A},set:function(b){A=b?a.utils.getColor(b):null}},errorBarColor:{get:function(){return y},set:function(b){y=b?a.utils.getColor(b):null}}}),a.utils.initOptions(b),b},a.models.multiBarChart=function(){"use strict";function b(j){return D.reset(),D.models(e),r&&D.models(f),s&&D.models(g),j.each(function(j){var z=d3.select(this);a.utils.initSVG(z);var D=a.utils.availableWidth(l,z,k),H=a.utils.availableHeight(m,z,k);if(b.update=function(){0===C?z.call(b):z.transition().duration(C).call(b)},b.container=this,x.setter(G(j),b.update).getter(F(j)).update(),x.disabled=j.map(function(a){return!!a.disabled}),!y){var I;y={};for(I in x)y[I]=x[I]instanceof Array?x[I].slice(0):x[I]}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,z),b;z.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var J=z.selectAll("g.nv-wrap.nv-multiBarWithLegend").data([j]),K=J.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarWithLegend").append("g"),L=J.select("g");if(K.append("g").attr("class","nv-x nv-axis"),K.append("g").attr("class","nv-y nv-axis"),K.append("g").attr("class","nv-barsWrap"),K.append("g").attr("class","nv-legendWrap"),K.append("g").attr("class","nv-controlsWrap"),q&&(h.width(D-B()),L.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),H=a.utils.availableHeight(m,z,k)),L.select(".nv-legendWrap").attr("transform","translate("+B()+","+-k.top+")")),o){var M=[{key:p.grouped||"Grouped",disabled:e.stacked()},{key:p.stacked||"Stacked",disabled:!e.stacked()}];i.width(B()).color(["#444","#444","#444"]),L.select(".nv-controlsWrap").datum(M).attr("transform","translate(0,"+-k.top+")").call(i)}J.attr("transform","translate("+k.left+","+k.top+")"),t&&L.select(".nv-y.nv-axis").attr("transform","translate("+D+",0)"),e.disabled(j.map(function(a){return a.disabled})).width(D).height(H).color(j.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!j[b].disabled}));var N=L.select(".nv-barsWrap").datum(j.filter(function(a){return!a.disabled}));if(N.call(e),r){f.scale(c)._ticks(a.utils.calcTicksX(D/100,j)).tickSize(-H,0),L.select(".nv-x.nv-axis").attr("transform","translate(0,"+d.range()[0]+")"),L.select(".nv-x.nv-axis").call(f);var O=L.select(".nv-x.nv-axis > g").selectAll("g");if(O.selectAll("line, text").style("opacity",1),v){var P=function(a,b){return"translate("+a+","+b+")"},Q=5,R=17;O.selectAll("text").attr("transform",function(a,b,c){return P(0,c%2==0?Q:R)});var S=d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length;L.selectAll(".nv-x.nv-axis .nv-axisMaxMin text").attr("transform",function(a,b){return P(0,0===b||S%2!==0?R:Q)})}u&&O.filter(function(a,b){return b%Math.ceil(j[0].values.length/(D/100))!==0}).selectAll("text, line").style("opacity",0),w&&O.selectAll(".tick text").attr("transform","rotate("+w+" 0,0)").style("text-anchor",w>0?"start":"end"),L.select(".nv-x.nv-axis").selectAll("g.nv-axisMaxMin text").style("opacity",1)}s&&(g.scale(d)._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-D,0),L.select(".nv-y.nv-axis").call(g)),h.dispatch.on("stateChange",function(a){for(var c in a)x[c]=a[c];A.stateChange(x),b.update()}),i.dispatch.on("legendClick",function(a){if(a.disabled){switch(M=M.map(function(a){return a.disabled=!0,a}),a.disabled=!1,a.key){case"Grouped":case p.grouped:e.stacked(!1);break;case"Stacked":case p.stacked:e.stacked(!0)}x.stacked=e.stacked(),A.stateChange(x),b.update()}}),A.on("changeState",function(a){"undefined"!=typeof a.disabled&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),x.disabled=a.disabled),"undefined"!=typeof a.stacked&&(e.stacked(a.stacked),x.stacked=a.stacked,E=a.stacked),b.update()})}),D.renderEnd("multibarchart immediate"),b}var c,d,e=a.models.multiBar(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.models.legend(),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=null,m=null,n=a.utils.defaultColor(),o=!0,p={},q=!0,r=!0,s=!0,t=!1,u=!0,v=!1,w=0,x=a.utils.state(),y=null,z=null,A=d3.dispatch("stateChange","changeState","renderEnd"),B=function(){return o?180:0},C=250;x.stacked=!1,e.stacked(!1),f.orient("bottom").tickPadding(7).showMaxMin(!1).tickFormat(function(a){return a}),g.orient(t?"right":"left").tickFormat(d3.format(",.1f")),j.duration(0).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)}),i.updateState(!1);var D=a.utils.renderWatch(A),E=!1,F=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),stacked:E}}},G=function(a){return function(b){void 0!==b.stacked&&(E=b.stacked),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return e.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={key:a.data.key,value:b.y()(a.data),color:a.color},j.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){j.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=A,b.multibar=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.state=x,b.tooltip=j,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return l},set:function(a){l=a}},height:{get:function(){return m},set:function(a){m=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showControls:{get:function(){return o},set:function(a){o=a}},controlLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return y},set:function(a){y=a}},noData:{get:function(){return z},set:function(a){z=a}},reduceXTicks:{get:function(){return u},set:function(a){u=a}},rotateLabels:{get:function(){return w},set:function(a){w=a}},staggerLabels:{get:function(){return v},set:function(a){v=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return C},set:function(a){C=a,e.duration(C),f.duration(C),g.duration(C),D.reset(C)}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),h.color(n)}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,g.orient(t?"right":"left")}},barColor:{get:function(){return e.barColor},set:function(a){e.barColor(a),h.color(function(a,b){return d3.rgb("#ccc").darker(1.5*b).toString()})}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.multiBarHorizontal=function(){"use strict";function b(m){return F.reset(),m.each(function(b){var m=k-j.left-j.right,D=l-j.top-j.bottom;n=d3.select(this),a.utils.initSVG(n),x&&(b=d3.layout.stack().offset("zero").values(function(a){return a.values}).y(r)(b)),b.forEach(function(a,b){a.values.forEach(function(c){c.series=b,c.key=a.key})}),x&&b[0].values.map(function(a,c){var d=0,e=0;b.map(function(a){var b=a.values[c];b.size=Math.abs(b.y),b.y<0?(b.y1=e-b.size,e-=b.size):(b.y1=d,d+=b.size)})});var G=d&&e?[]:b.map(function(a){return a.values.map(function(a,b){return{x:q(a,b),y:r(a,b),y0:a.y0,y1:a.y1,yErr:s(a,b)}})});o.domain(d||d3.merge(G).map(function(a){return a.x})).rangeBands(f||[0,D],B),p.domain(e||d3.extent(d3.merge(d3.merge(G).map(function(a){var b=a.y;x&&(b=a.y>0?a.y1+a.y:a.y1);var c=a.yErr;return c?c.length?[b+c[0],b+c[1]]:(c=Math.abs(c),[b-c,b+c]):[b]})).concat(t))),p.range(y&&!x?g||[p.domain()[0]<0?A:0,m-(p.domain()[1]>0?A:0)]:g||[0,m]),h=h||o,i=i||d3.scale.linear().domain(p.domain()).range([p(0),p(0)]);{var H=d3.select(this).selectAll("g.nv-wrap.nv-multibarHorizontal").data([b]),I=H.enter().append("g").attr("class","nvd3 nv-wrap nv-multibarHorizontal"),J=(I.append("defs"),I.append("g"));H.select("g")}J.append("g").attr("class","nv-groups"),H.attr("transform","translate("+j.left+","+j.top+")");var K=H.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a,b){return b});K.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),K.exit().watchTransition(F,"multibarhorizontal: exit groups").style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),K.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return u(a,b)}).style("stroke",function(a,b){return u(a,b)}),K.watchTransition(F,"multibarhorizontal: groups").style("stroke-opacity",1).style("fill-opacity",.75);var L=K.selectAll("g.nv-bar").data(function(a){return a.values});L.exit().remove();var M=L.enter().append("g").attr("transform",function(a,c,d){return"translate("+i(x?a.y0:0)+","+(x?0:d*o.rangeBand()/b.length+o(q(a,c)))+")"});M.append("rect").attr("width",0).attr("height",o.rangeBand()/(x?1:b.length)),L.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),E.elementMouseover({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),E.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mouseout",function(a,b){E.elementMouseout({data:a,index:b,color:d3.select(this).style("fill")})}).on("mousemove",function(a,b){E.elementMousemove({data:a,index:b,color:d3.select(this).style("fill")})}).on("click",function(a,b){E.elementClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}).on("dblclick",function(a,b){E.elementDblClick({data:a,index:b,color:d3.select(this).style("fill")}),d3.event.stopPropagation()}),s(b[0].values[0],0)&&(M.append("polyline"),L.select("polyline").attr("fill","none").attr("stroke",function(a,b,c){return w(a,c,b)}).attr("points",function(a,c){var d=s(a,c),e=.8*o.rangeBand()/(2*(x?1:b.length));d=d.length?d:[-Math.abs(d),Math.abs(d)],d=d.map(function(a){return p(a)-p(0)});var f=[[d[0],-e],[d[0],e],[d[0],0],[d[1],0],[d[1],-e],[d[1],e]];return f.map(function(a){return a.join(",")}).join(" ")}).attr("transform",function(a,c){var d=o.rangeBand()/(2*(x?1:b.length));return"translate("+(r(a,c)<0?0:p(r(a,c))-p(0))+", "+d+")"})),M.append("text"),y&&!x?(L.select("text").attr("text-anchor",function(a,b){return r(a,b)<0?"end":"start"}).attr("y",o.rangeBand()/(2*b.length)).attr("dy",".32em").text(function(a,b){var c=C(r(a,b)),d=s(a,b);return void 0===d?c:d.length?c+"+"+C(Math.abs(d[1]))+"-"+C(Math.abs(d[0])):c+"±"+C(Math.abs(d))}),L.watchTransition(F,"multibarhorizontal: bars").select("text").attr("x",function(a,b){return r(a,b)<0?-4:p(r(a,b))-p(0)+4})):L.selectAll("text").text(""),z&&!x?(M.append("text").classed("nv-bar-label",!0),L.select("text.nv-bar-label").attr("text-anchor",function(a,b){return r(a,b)<0?"start":"end"}).attr("y",o.rangeBand()/(2*b.length)).attr("dy",".32em").text(function(a,b){return q(a,b)}),L.watchTransition(F,"multibarhorizontal: bars").select("text.nv-bar-label").attr("x",function(a,b){return r(a,b)<0?p(0)-p(r(a,b))+4:-4})):L.selectAll("text.nv-bar-label").text(""),L.attr("class",function(a,b){return r(a,b)<0?"nv-bar negative":"nv-bar positive"}),v&&(c||(c=b.map(function(){return!0})),L.style("fill",function(a,b,d){return d3.rgb(v(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()}).style("stroke",function(a,b,d){return d3.rgb(v(a,b)).darker(c.map(function(a,b){return b}).filter(function(a,b){return!c[b]})[d]).toString()})),x?L.watchTransition(F,"multibarhorizontal: bars").attr("transform",function(a,b){return"translate("+p(a.y1)+","+o(q(a,b))+")"}).select("rect").attr("width",function(a,b){return Math.abs(p(r(a,b)+a.y0)-p(a.y0))}).attr("height",o.rangeBand()):L.watchTransition(F,"multibarhorizontal: bars").attr("transform",function(a,c){return"translate("+p(r(a,c)<0?r(a,c):0)+","+(a.series*o.rangeBand()/b.length+o(q(a,c)))+")"}).select("rect").attr("height",o.rangeBand()/b.length).attr("width",function(a,b){return Math.max(Math.abs(p(r(a,b))-p(0)),1)}),h=o.copy(),i=p.copy()}),F.renderEnd("multibarHorizontal immediate"),b}var c,d,e,f,g,h,i,j={top:0,right:0,bottom:0,left:0},k=960,l=500,m=Math.floor(1e4*Math.random()),n=null,o=d3.scale.ordinal(),p=d3.scale.linear(),q=function(a){return a.x},r=function(a){return a.y},s=function(a){return a.yErr},t=[0],u=a.utils.defaultColor(),v=null,w=a.utils.defaultColor(),x=!1,y=!1,z=!1,A=60,B=.1,C=d3.format(",.2f"),D=250,E=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),F=a.utils.renderWatch(E,D);return b.dispatch=E,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},x:{get:function(){return q},set:function(a){q=a}},y:{get:function(){return r},set:function(a){r=a}},yErr:{get:function(){return s},set:function(a){s=a}},xScale:{get:function(){return o},set:function(a){o=a}},yScale:{get:function(){return p},set:function(a){p=a}},xDomain:{get:function(){return d},set:function(a){d=a}},yDomain:{get:function(){return e},set:function(a){e=a}},xRange:{get:function(){return f},set:function(a){f=a}},yRange:{get:function(){return g},set:function(a){g=a}},forceY:{get:function(){return t},set:function(a){t=a}},stacked:{get:function(){return x},set:function(a){x=a}},showValues:{get:function(){return y},set:function(a){y=a}},disabled:{get:function(){return c},set:function(a){c=a}},id:{get:function(){return m},set:function(a){m=a}},valueFormat:{get:function(){return C},set:function(a){C=a}},valuePadding:{get:function(){return A},set:function(a){A=a}},groupSpacing:{get:function(){return B},set:function(a){B=a}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},duration:{get:function(){return D},set:function(a){D=a,F.reset(D)}},color:{get:function(){return u},set:function(b){u=a.utils.getColor(b)}},barColor:{get:function(){return v},set:function(b){v=b?a.utils.getColor(b):null}},errorBarColor:{get:function(){return w},set:function(b){w=b?a.utils.getColor(b):null}}}),a.utils.initOptions(b),b},a.models.multiBarHorizontalChart=function(){"use strict";function b(j){return C.reset(),C.models(e),r&&C.models(f),s&&C.models(g),j.each(function(j){var w=d3.select(this);a.utils.initSVG(w);var C=a.utils.availableWidth(l,w,k),D=a.utils.availableHeight(m,w,k);if(b.update=function(){w.transition().duration(z).call(b)},b.container=this,t=e.stacked(),u.setter(B(j),b.update).getter(A(j)).update(),u.disabled=j.map(function(a){return!!a.disabled}),!v){var E;v={};for(E in u)v[E]=u[E]instanceof Array?u[E].slice(0):u[E]}if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,w),b;w.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var F=w.selectAll("g.nv-wrap.nv-multiBarHorizontalChart").data([j]),G=F.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarHorizontalChart").append("g"),H=F.select("g");if(G.append("g").attr("class","nv-x nv-axis"),G.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),G.append("g").attr("class","nv-barsWrap"),G.append("g").attr("class","nv-legendWrap"),G.append("g").attr("class","nv-controlsWrap"),q&&(h.width(C-y()),H.select(".nv-legendWrap").datum(j).call(h),k.top!=h.height()&&(k.top=h.height(),D=a.utils.availableHeight(m,w,k)),H.select(".nv-legendWrap").attr("transform","translate("+y()+","+-k.top+")")),o){var I=[{key:p.grouped||"Grouped",disabled:e.stacked()},{key:p.stacked||"Stacked",disabled:!e.stacked()}];i.width(y()).color(["#444","#444","#444"]),H.select(".nv-controlsWrap").datum(I).attr("transform","translate(0,"+-k.top+")").call(i)}F.attr("transform","translate("+k.left+","+k.top+")"),e.disabled(j.map(function(a){return a.disabled})).width(C).height(D).color(j.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!j[b].disabled}));var J=H.select(".nv-barsWrap").datum(j.filter(function(a){return!a.disabled}));if(J.transition().call(e),r){f.scale(c)._ticks(a.utils.calcTicksY(D/24,j)).tickSize(-C,0),H.select(".nv-x.nv-axis").call(f);var K=H.select(".nv-x.nv-axis").selectAll("g");K.selectAll("line, text")}s&&(g.scale(d)._ticks(a.utils.calcTicksX(C/100,j)).tickSize(-D,0),H.select(".nv-y.nv-axis").attr("transform","translate(0,"+D+")"),H.select(".nv-y.nv-axis").call(g)),H.select(".nv-zeroLine line").attr("x1",d(0)).attr("x2",d(0)).attr("y1",0).attr("y2",-D),h.dispatch.on("stateChange",function(a){for(var c in a)u[c]=a[c];x.stateChange(u),b.update()}),i.dispatch.on("legendClick",function(a){if(a.disabled){switch(I=I.map(function(a){return a.disabled=!0,a}),a.disabled=!1,a.key){case"Grouped":e.stacked(!1);break;case"Stacked":e.stacked(!0)}u.stacked=e.stacked(),x.stateChange(u),t=e.stacked(),b.update()}}),x.on("changeState",function(a){"undefined"!=typeof a.disabled&&(j.forEach(function(b,c){b.disabled=a.disabled[c]}),u.disabled=a.disabled),"undefined"!=typeof a.stacked&&(e.stacked(a.stacked),u.stacked=a.stacked,t=a.stacked),b.update()})}),C.renderEnd("multibar horizontal chart immediate"),b}var c,d,e=a.models.multiBarHorizontal(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend().height(30),i=a.models.legend().height(30),j=a.models.tooltip(),k={top:30,right:20,bottom:50,left:60},l=null,m=null,n=a.utils.defaultColor(),o=!0,p={},q=!0,r=!0,s=!0,t=!1,u=a.utils.state(),v=null,w=null,x=d3.dispatch("stateChange","changeState","renderEnd"),y=function(){return o?180:0},z=250;u.stacked=!1,e.stacked(t),f.orient("left").tickPadding(5).showMaxMin(!1).tickFormat(function(a){return a}),g.orient("bottom").tickFormat(d3.format(",.1f")),j.duration(0).valueFormatter(function(a,b){return g.tickFormat()(a,b)}).headerFormatter(function(a,b){return f.tickFormat()(a,b)}),i.updateState(!1);var A=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),stacked:t}}},B=function(a){return function(b){void 0!==b.stacked&&(t=b.stacked),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}},C=a.utils.renderWatch(x,z);return e.dispatch.on("elementMouseover.tooltip",function(a){a.value=b.x()(a.data),a.series={key:a.data.key,value:b.y()(a.data),color:a.color},j.data(a).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){j.hidden(!0)}),e.dispatch.on("elementMousemove.tooltip",function(){j.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=x,b.multibar=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.state=u,b.tooltip=j,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return l},set:function(a){l=a}},height:{get:function(){return m},set:function(a){m=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showControls:{get:function(){return o},set:function(a){o=a}},controlLabels:{get:function(){return p},set:function(a){p=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return v},set:function(a){v=a}},noData:{get:function(){return w},set:function(a){w=a}},tooltips:{get:function(){return j.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),j.enabled(!!b)}},tooltipContent:{get:function(){return j.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),j.contentGenerator(b)}},margin:{get:function(){return k},set:function(a){k.top=void 0!==a.top?a.top:k.top,k.right=void 0!==a.right?a.right:k.right,k.bottom=void 0!==a.bottom?a.bottom:k.bottom,k.left=void 0!==a.left?a.left:k.left}},duration:{get:function(){return z},set:function(a){z=a,C.reset(z),e.duration(z),f.duration(z),g.duration(z)}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),h.color(n)}},barColor:{get:function(){return e.barColor},set:function(a){e.barColor(a),h.color(function(a,b){return d3.rgb("#ccc").darker(1.5*b).toString()})}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.multiChart=function(){"use strict";function b(j){return j.each(function(j){function k(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.value=a.point.x,a.series={value:a.point.y,color:a.point.color},D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function l(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.value=a.point.x,a.series={value:a.point.y,color:a.point.color},D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function n(a){var b=2===j[a.seriesIndex].yAxis?B:A;a.point.x=x.x()(a.point),a.point.y=x.y()(a.point),D.duration(100).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).position(a.pos).hidden(!1)}function E(a){var b=2===j[a.data.series].yAxis?B:A;a.value=v.x()(a.data),a.series={value:v.y()(a.data),color:a.color},D.duration(0).valueFormatter(function(a,c){return b.tickFormat()(a,c)}).data(a).hidden(!1)}var F=d3.select(this);a.utils.initSVG(F),b.update=function(){F.transition().call(b)},b.container=this;var G=a.utils.availableWidth(g,F,e),H=a.utils.availableHeight(h,F,e),I=j.filter(function(a){return"line"==a.type&&1==a.yAxis}),J=j.filter(function(a){return"line"==a.type&&2==a.yAxis}),K=j.filter(function(a){return"scatter"==a.type&&1==a.yAxis}),L=j.filter(function(a){return"scatter"==a.type&&2==a.yAxis}),M=j.filter(function(a){return"bar"==a.type&&1==a.yAxis}),N=j.filter(function(a){return"bar"==a.type&&2==a.yAxis}),O=j.filter(function(a){return"area"==a.type&&1==a.yAxis}),P=j.filter(function(a){return"area"==a.type&&2==a.yAxis});if(!(j&&j.length&&j.filter(function(a){return a.values.length}).length))return a.utils.noData(b,F),b;F.selectAll(".nv-noData").remove();var Q=j.filter(function(a){return!a.disabled&&1==a.yAxis}).map(function(a){return a.values.map(function(a){return{x:a.x,y:a.y}})}),R=j.filter(function(a){return!a.disabled&&2==a.yAxis}).map(function(a){return a.values.map(function(a){return{x:a.x,y:a.y}})});o.domain(d3.extent(d3.merge(Q.concat(R)),function(a){return a.x})).range([0,G]);var S=F.selectAll("g.wrap.multiChart").data([j]),T=S.enter().append("g").attr("class","wrap nvd3 multiChart").append("g");T.append("g").attr("class","nv-x nv-axis"),T.append("g").attr("class","nv-y1 nv-axis"),T.append("g").attr("class","nv-y2 nv-axis"),T.append("g").attr("class","lines1Wrap"),T.append("g").attr("class","lines2Wrap"),T.append("g").attr("class","scatters1Wrap"),T.append("g").attr("class","scatters2Wrap"),T.append("g").attr("class","bars1Wrap"),T.append("g").attr("class","bars2Wrap"),T.append("g").attr("class","stack1Wrap"),T.append("g").attr("class","stack2Wrap"),T.append("g").attr("class","legendWrap");var U=S.select("g"),V=j.map(function(a,b){return j[b].color||f(a,b)});if(i){var W=C.align()?G/2:G,X=C.align()?W:0;C.width(W),C.color(V),U.select(".legendWrap").datum(j.map(function(a){return a.originalKey=void 0===a.originalKey?a.key:a.originalKey,a.key=a.originalKey+(1==a.yAxis?"":" (right axis)"),a})).call(C),e.top!=C.height()&&(e.top=C.height(),H=a.utils.availableHeight(h,F,e)),U.select(".legendWrap").attr("transform","translate("+X+","+-e.top+")")}r.width(G).height(H).interpolate(m).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"line"==j[b].type})),s.width(G).height(H).interpolate(m).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"line"==j[b].type})),t.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"scatter"==j[b].type})),u.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"scatter"==j[b].type})),v.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"bar"==j[b].type})),w.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"bar"==j[b].type})),x.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&1==j[b].yAxis&&"area"==j[b].type})),y.width(G).height(H).color(V.filter(function(a,b){return!j[b].disabled&&2==j[b].yAxis&&"area"==j[b].type})),U.attr("transform","translate("+e.left+","+e.top+")");var Y=U.select(".lines1Wrap").datum(I.filter(function(a){return!a.disabled})),Z=U.select(".scatters1Wrap").datum(K.filter(function(a){return!a.disabled})),$=U.select(".bars1Wrap").datum(M.filter(function(a){return!a.disabled})),_=U.select(".stack1Wrap").datum(O.filter(function(a){return!a.disabled})),ab=U.select(".lines2Wrap").datum(J.filter(function(a){return!a.disabled})),bb=U.select(".scatters2Wrap").datum(L.filter(function(a){return!a.disabled})),cb=U.select(".bars2Wrap").datum(N.filter(function(a){return!a.disabled})),db=U.select(".stack2Wrap").datum(P.filter(function(a){return!a.disabled})),eb=O.length?O.map(function(a){return a.values}).reduce(function(a,b){return a.map(function(a,c){return{x:a.x,y:a.y+b[c].y}})}).concat([{x:0,y:0}]):[],fb=P.length?P.map(function(a){return a.values}).reduce(function(a,b){return a.map(function(a,c){return{x:a.x,y:a.y+b[c].y}})}).concat([{x:0,y:0}]):[];p.domain(c||d3.extent(d3.merge(Q).concat(eb),function(a){return a.y})).range([0,H]),q.domain(d||d3.extent(d3.merge(R).concat(fb),function(a){return a.y})).range([0,H]),r.yDomain(p.domain()),t.yDomain(p.domain()),v.yDomain(p.domain()),x.yDomain(p.domain()),s.yDomain(q.domain()),u.yDomain(q.domain()),w.yDomain(q.domain()),y.yDomain(q.domain()),O.length&&d3.transition(_).call(x),P.length&&d3.transition(db).call(y),M.length&&d3.transition($).call(v),N.length&&d3.transition(cb).call(w),I.length&&d3.transition(Y).call(r),J.length&&d3.transition(ab).call(s),K.length&&d3.transition(Z).call(t),L.length&&d3.transition(bb).call(u),z._ticks(a.utils.calcTicksX(G/100,j)).tickSize(-H,0),U.select(".nv-x.nv-axis").attr("transform","translate(0,"+H+")"),d3.transition(U.select(".nv-x.nv-axis")).call(z),A._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-G,0),d3.transition(U.select(".nv-y1.nv-axis")).call(A),B._ticks(a.utils.calcTicksY(H/36,j)).tickSize(-G,0),d3.transition(U.select(".nv-y2.nv-axis")).call(B),U.select(".nv-y1.nv-axis").classed("nv-disabled",Q.length?!1:!0).attr("transform","translate("+o.range()[0]+",0)"),U.select(".nv-y2.nv-axis").classed("nv-disabled",R.length?!1:!0).attr("transform","translate("+o.range()[1]+",0)"),C.dispatch.on("stateChange",function(){b.update()}),r.dispatch.on("elementMouseover.tooltip",k),s.dispatch.on("elementMouseover.tooltip",k),r.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),s.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),t.dispatch.on("elementMouseover.tooltip",l),u.dispatch.on("elementMouseover.tooltip",l),t.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),u.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),x.dispatch.on("elementMouseover.tooltip",n),y.dispatch.on("elementMouseover.tooltip",n),x.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),y.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),v.dispatch.on("elementMouseover.tooltip",E),w.dispatch.on("elementMouseover.tooltip",E),v.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),w.dispatch.on("elementMouseout.tooltip",function(){D.hidden(!0)}),v.dispatch.on("elementMousemove.tooltip",function(){D.position({top:d3.event.pageY,left:d3.event.pageX})()}),w.dispatch.on("elementMousemove.tooltip",function(){D.position({top:d3.event.pageY,left:d3.event.pageX})()})}),b}var c,d,e={top:30,right:20,bottom:50,left:60},f=a.utils.defaultColor(),g=null,h=null,i=!0,j=null,k=function(a){return a.x},l=function(a){return a.y},m="monotone",n=!0,o=d3.scale.linear(),p=d3.scale.linear(),q=d3.scale.linear(),r=a.models.line().yScale(p),s=a.models.line().yScale(q),t=a.models.scatter().yScale(p),u=a.models.scatter().yScale(q),v=a.models.multiBar().stacked(!1).yScale(p),w=a.models.multiBar().stacked(!1).yScale(q),x=a.models.stackedArea().yScale(p),y=a.models.stackedArea().yScale(q),z=a.models.axis().scale(o).orient("bottom").tickPadding(5),A=a.models.axis().scale(p).orient("left"),B=a.models.axis().scale(q).orient("right"),C=a.models.legend().height(30),D=a.models.tooltip(),E=d3.dispatch();return b.dispatch=E,b.lines1=r,b.lines2=s,b.scatters1=t,b.scatters2=u,b.bars1=v,b.bars2=w,b.stack1=x,b.stack2=y,b.xAxis=z,b.yAxis1=A,b.yAxis2=B,b.tooltip=D,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},showLegend:{get:function(){return i},set:function(a){i=a}},yDomain1:{get:function(){return c},set:function(a){c=a}},yDomain2:{get:function(){return d},set:function(a){d=a}},noData:{get:function(){return j},set:function(a){j=a}},interpolate:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return D.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),D.enabled(!!b)}},tooltipContent:{get:function(){return D.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),D.contentGenerator(b)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},color:{get:function(){return f},set:function(b){f=a.utils.getColor(b)}},x:{get:function(){return k},set:function(a){k=a,r.x(a),s.x(a),t.x(a),u.x(a),v.x(a),w.x(a),x.x(a),y.x(a)}},y:{get:function(){return l},set:function(a){l=a,r.y(a),s.y(a),t.y(a),u.y(a),x.y(a),y.y(a),v.y(a),w.y(a)}},useVoronoi:{get:function(){return n},set:function(a){n=a,r.useVoronoi(a),s.useVoronoi(a),x.useVoronoi(a),y.useVoronoi(a)}}}),a.utils.initOptions(b),b},a.models.ohlcBar=function(){"use strict";function b(y){return y.each(function(b){k=d3.select(this);var y=a.utils.availableWidth(h,k,g),A=a.utils.availableHeight(i,k,g);a.utils.initSVG(k);var B=y/b[0].values.length*.9;l.domain(c||d3.extent(b[0].values.map(n).concat(t))),l.range(v?e||[.5*y/b[0].values.length,y*(b[0].values.length-.5)/b[0].values.length]:e||[5+B/2,y-B/2-5]),m.domain(d||[d3.min(b[0].values.map(s).concat(u)),d3.max(b[0].values.map(r).concat(u))]).range(f||[A,0]),l.domain()[0]===l.domain()[1]&&l.domain(l.domain()[0]?[l.domain()[0]-.01*l.domain()[0],l.domain()[1]+.01*l.domain()[1]]:[-1,1]),m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]+.01*m.domain()[0],m.domain()[1]-.01*m.domain()[1]]:[-1,1]);var C=d3.select(this).selectAll("g.nv-wrap.nv-ohlcBar").data([b[0].values]),D=C.enter().append("g").attr("class","nvd3 nv-wrap nv-ohlcBar"),E=D.append("defs"),F=D.append("g"),G=C.select("g");F.append("g").attr("class","nv-ticks"),C.attr("transform","translate("+g.left+","+g.top+")"),k.on("click",function(a,b){z.chartClick({data:a,index:b,pos:d3.event,id:j})}),E.append("clipPath").attr("id","nv-chart-clip-path-"+j).append("rect"),C.select("#nv-chart-clip-path-"+j+" rect").attr("width",y).attr("height",A),G.attr("clip-path",w?"url(#nv-chart-clip-path-"+j+")":"");var H=C.select(".nv-ticks").selectAll(".nv-tick").data(function(a){return a});H.exit().remove(),H.enter().append("path").attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b
-}).attr("d",function(a,b){return"m0,0l0,"+(m(p(a,b))-m(r(a,b)))+"l"+-B/2+",0l"+B/2+",0l0,"+(m(s(a,b))-m(p(a,b)))+"l0,"+(m(q(a,b))-m(s(a,b)))+"l"+B/2+",0l"+-B/2+",0z"}).attr("transform",function(a,b){return"translate("+l(n(a,b))+","+m(r(a,b))+")"}).attr("fill",function(){return x[0]}).attr("stroke",function(){return x[0]}).attr("x",0).attr("y",function(a,b){return m(Math.max(0,o(a,b)))}).attr("height",function(a,b){return Math.abs(m(o(a,b))-m(0))}),H.attr("class",function(a,b,c){return(p(a,b)>q(a,b)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+c+"-"+b}),d3.transition(H).attr("transform",function(a,b){return"translate("+l(n(a,b))+","+m(r(a,b))+")"}).attr("d",function(a,c){var d=y/b[0].values.length*.9;return"m0,0l0,"+(m(p(a,c))-m(r(a,c)))+"l"+-d/2+",0l"+d/2+",0l0,"+(m(s(a,c))-m(p(a,c)))+"l0,"+(m(q(a,c))-m(s(a,c)))+"l"+d/2+",0l"+-d/2+",0z"})}),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=Math.floor(1e4*Math.random()),k=null,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=function(a){return a.open},q=function(a){return a.close},r=function(a){return a.high},s=function(a){return a.low},t=[],u=[],v=!1,w=!0,x=a.utils.defaultColor(),y=!1,z=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd","chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove");return b.highlightPoint=function(a,c){b.clearHighlights(),k.select(".nv-ohlcBar .nv-tick-0-"+a).classed("hover",c)},b.clearHighlights=function(){k.select(".nv-ohlcBar .nv-tick.hover").classed("hover",!1)},b.dispatch=z,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},padData:{get:function(){return v},set:function(a){v=a}},clipEdge:{get:function(){return w},set:function(a){w=a}},id:{get:function(){return j},set:function(a){j=a}},interactive:{get:function(){return y},set:function(a){y=a}},x:{get:function(){return n},set:function(a){n=a}},y:{get:function(){return o},set:function(a){o=a}},open:{get:function(){return p()},set:function(a){p=a}},close:{get:function(){return q()},set:function(a){q=a}},high:{get:function(){return r},set:function(a){r=a}},low:{get:function(){return s},set:function(a){s=a}},margin:{get:function(){return g},set:function(a){g.top=void 0!=a.top?a.top:g.top,g.right=void 0!=a.right?a.right:g.right,g.bottom=void 0!=a.bottom?a.bottom:g.bottom,g.left=void 0!=a.left?a.left:g.left}},color:{get:function(){return x},set:function(b){x=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.parallelCoordinates=function(){"use strict";function b(p){return p.each(function(b){function p(a){return F(h.map(function(b){if(isNaN(a[b])||isNaN(parseFloat(a[b]))){var c=g[b].domain(),d=g[b].range(),e=c[0]-(c[1]-c[0])/9;if(J.indexOf(b)<0){var h=d3.scale.linear().domain([e,c[1]]).range([x-12,d[1]]);g[b].brush.y(h),J.push(b)}return[f(b),g[b](e)]}return J.length>0?(D.style("display","inline"),E.style("display","inline")):(D.style("display","none"),E.style("display","none")),[f(b),g[b](a[b])]}))}function q(){var a=h.filter(function(a){return!g[a].brush.empty()}),b=a.map(function(a){return g[a].brush.extent()});k=[],a.forEach(function(a,c){k[c]={dimension:a,extent:b[c]}}),l=[],M.style("display",function(c){var d=a.every(function(a,d){return isNaN(c[a])&&b[d][0]==g[a].brush.y().domain()[0]?!0:b[d][0]<=c[a]&&c[a]<=b[d][1]});return d&&l.push(c),d?null:"none"}),o.brush({filters:k,active:l})}function r(a){m[a]=this.parentNode.__origin__=f(a),L.attr("visibility","hidden")}function s(a){m[a]=Math.min(w,Math.max(0,this.parentNode.__origin__+=d3.event.x)),M.attr("d",p),h.sort(function(a,b){return u(a)-u(b)}),f.domain(h),N.attr("transform",function(a){return"translate("+u(a)+")"})}function t(a){delete this.parentNode.__origin__,delete m[a],d3.select(this.parentNode).attr("transform","translate("+f(a)+")"),M.attr("d",p),L.attr("d",p).attr("visibility",null)}function u(a){var b=m[a];return null==b?f(a):b}var v=d3.select(this),w=a.utils.availableWidth(d,v,c),x=a.utils.availableHeight(e,v,c);a.utils.initSVG(v),l=b,f.rangePoints([0,w],1).domain(h);var y={};h.forEach(function(a){var c=d3.extent(b,function(b){return+b[a]});return y[a]=!1,void 0===c[0]&&(y[a]=!0,c[0]=0,c[1]=0),c[0]===c[1]&&(c[0]=c[0]-1,c[1]=c[1]+1),g[a]=d3.scale.linear().domain(c).range([.9*(x-12),0]),g[a].brush=d3.svg.brush().y(g[a]).on("brush",q),"name"!=a});var z=v.selectAll("g.nv-wrap.nv-parallelCoordinates").data([b]),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-parallelCoordinates"),B=A.append("g"),C=z.select("g");B.append("g").attr("class","nv-parallelCoordinates background"),B.append("g").attr("class","nv-parallelCoordinates foreground"),B.append("g").attr("class","nv-parallelCoordinates missingValuesline"),z.attr("transform","translate("+c.left+","+c.top+")");var D,E,F=d3.svg.line().interpolate("cardinal").tension(n),G=d3.svg.axis().orient("left"),H=d3.behavior.drag().on("dragstart",r).on("drag",s).on("dragend",t),I=f.range()[1]-f.range()[0],J=[],K=[0+I/2,x-12,w-I/2,x-12];D=z.select(".missingValuesline").selectAll("line").data([K]),D.enter().append("line"),D.exit().remove(),D.attr("x1",function(a){return a[0]}).attr("y1",function(a){return a[1]}).attr("x2",function(a){return a[2]}).attr("y2",function(a){return a[3]}),E=z.select(".missingValuesline").selectAll("text").data(["undefined values"]),E.append("text").data(["undefined values"]),E.enter().append("text"),E.exit().remove(),E.attr("y",x).attr("x",w-92-I/2).text(function(a){return a});var L=z.select(".background").selectAll("path").data(b);L.enter().append("path"),L.exit().remove(),L.attr("d",p);var M=z.select(".foreground").selectAll("path").data(b);M.enter().append("path"),M.exit().remove(),M.attr("d",p).attr("stroke",j),M.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),o.elementMouseover({label:a.name,data:a.data,index:b,pos:[d3.mouse(this.parentNode)[0],d3.mouse(this.parentNode)[1]]})}),M.on("mouseout",function(a,b){d3.select(this).classed("hover",!1),o.elementMouseout({label:a.name,data:a.data,index:b})});var N=C.selectAll(".dimension").data(h),O=N.enter().append("g").attr("class","nv-parallelCoordinates dimension");O.append("g").attr("class","nv-parallelCoordinates nv-axis"),O.append("g").attr("class","nv-parallelCoordinates-brush"),O.append("text").attr("class","nv-parallelCoordinates nv-label"),N.attr("transform",function(a){return"translate("+f(a)+",0)"}),N.exit().remove(),N.select(".nv-label").style("cursor","move").attr("dy","-1em").attr("text-anchor","middle").text(String).on("mouseover",function(a){o.elementMouseover({dim:a,pos:[d3.mouse(this.parentNode.parentNode)[0],d3.mouse(this.parentNode.parentNode)[1]]})}).on("mouseout",function(a){o.elementMouseout({dim:a})}).call(H),N.select(".nv-axis").each(function(a,b){d3.select(this).call(G.scale(g[a]).tickFormat(d3.format(i[b])))}),N.select(".nv-parallelCoordinates-brush").each(function(a){d3.select(this).call(g[a].brush)}).selectAll("rect").attr("x",-8).attr("width",16)}),b}var c={top:30,right:0,bottom:10,left:0},d=null,e=null,f=d3.scale.ordinal(),g={},h=[],i=[],j=a.utils.defaultColor(),k=[],l=[],m=[],n=1,o=d3.dispatch("brush","elementMouseover","elementMouseout");return b.dispatch=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},dimensionNames:{get:function(){return h},set:function(a){h=a}},dimensionFormats:{get:function(){return i},set:function(a){i=a}},lineTension:{get:function(){return n},set:function(a){n=a}},dimensions:{get:function(){return h},set:function(b){a.deprecated("dimensions","use dimensionNames instead"),h=b}},margin:{get:function(){return c},set:function(a){c.top=void 0!==a.top?a.top:c.top,c.right=void 0!==a.right?a.right:c.right,c.bottom=void 0!==a.bottom?a.bottom:c.bottom,c.left=void 0!==a.left?a.left:c.left}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.pie=function(){"use strict";function b(E){return D.reset(),E.each(function(b){function E(a,b){a.endAngle=isNaN(a.endAngle)?0:a.endAngle,a.startAngle=isNaN(a.startAngle)?0:a.startAngle,p||(a.innerRadius=0);var c=d3.interpolate(this._current,a);return this._current=c(0),function(a){return B[b](c(a))}}var F=d-c.left-c.right,G=e-c.top-c.bottom,H=Math.min(F,G)/2,I=[],J=[];if(i=d3.select(this),0===z.length)for(var K=H-H/5,L=y*H,M=0;M<b[0].length;M++)I.push(K),J.push(L);else I=z.map(function(a){return(a.outer-a.outer/5)*H}),J=z.map(function(a){return(a.inner-a.inner/5)*H}),y=d3.min(z.map(function(a){return a.inner-a.inner/5}));a.utils.initSVG(i);var N=i.selectAll(".nv-wrap.nv-pie").data(b),O=N.enter().append("g").attr("class","nvd3 nv-wrap nv-pie nv-chart-"+h),P=O.append("g"),Q=N.select("g"),R=P.append("g").attr("class","nv-pie");P.append("g").attr("class","nv-pieLabels"),N.attr("transform","translate("+c.left+","+c.top+")"),Q.select(".nv-pie").attr("transform","translate("+F/2+","+G/2+")"),Q.select(".nv-pieLabels").attr("transform","translate("+F/2+","+G/2+")"),i.on("click",function(a,b){A.chartClick({data:a,index:b,pos:d3.event,id:h})}),B=[],C=[];for(var M=0;M<b[0].length;M++){var S=d3.svg.arc().outerRadius(I[M]),T=d3.svg.arc().outerRadius(I[M]+5);u!==!1&&(S.startAngle(u),T.startAngle(u)),w!==!1&&(S.endAngle(w),T.endAngle(w)),p&&(S.innerRadius(J[M]),T.innerRadius(J[M])),S.cornerRadius&&x&&(S.cornerRadius(x),T.cornerRadius(x)),B.push(S),C.push(T)}var U=d3.layout.pie().sort(null).value(function(a){return a.disabled?0:g(a)});U.padAngle&&v&&U.padAngle(v),p&&q&&(R.append("text").attr("class","nv-pie-title"),N.select(".nv-pie-title").style("text-anchor","middle").text(function(){return q}).style("font-size",Math.min(F,G)*y*2/(q.length+2)+"px").attr("dy","0.35em").attr("transform",function(){return"translate(0, "+s+")"}));var V=N.select(".nv-pie").selectAll(".nv-slice").data(U),W=N.select(".nv-pieLabels").selectAll(".nv-label").data(U);V.exit().remove(),W.exit().remove();var X=V.enter().append("g");X.attr("class","nv-slice"),X.on("mouseover",function(a,b){d3.select(this).classed("hover",!0),r&&d3.select(this).select("path").transition().duration(70).attr("d",C[b]),A.elementMouseover({data:a.data,index:b,color:d3.select(this).style("fill")})}),X.on("mouseout",function(a,b){d3.select(this).classed("hover",!1),r&&d3.select(this).select("path").transition().duration(50).attr("d",B[b]),A.elementMouseout({data:a.data,index:b})}),X.on("mousemove",function(a,b){A.elementMousemove({data:a.data,index:b})}),X.on("click",function(a,b){A.elementClick({data:a.data,index:b,color:d3.select(this).style("fill")})}),X.on("dblclick",function(a,b){A.elementDblClick({data:a.data,index:b,color:d3.select(this).style("fill")})}),V.attr("fill",function(a,b){return j(a.data,b)}),V.attr("stroke",function(a,b){return j(a.data,b)});X.append("path").each(function(a){this._current=a});if(V.select("path").transition().attr("d",function(a,b){return B[b](a)}).attrTween("d",E),l){for(var Y=[],M=0;M<b[0].length;M++)Y.push(B[M]),m?p&&(Y[M]=d3.svg.arc().outerRadius(B[M].outerRadius()),u!==!1&&Y[M].startAngle(u),w!==!1&&Y[M].endAngle(w)):p||Y[M].innerRadius(0);W.enter().append("g").classed("nv-label",!0).each(function(a){var b=d3.select(this);b.attr("transform",function(a,b){if(t){a.outerRadius=I[b]+10,a.innerRadius=I[b]+15;var c=(a.startAngle+a.endAngle)/2*(180/Math.PI);return(a.startAngle+a.endAngle)/2<Math.PI?c-=90:c+=90,"translate("+Y[b].centroid(a)+") rotate("+c+")"}return a.outerRadius=H+10,a.innerRadius=H+15,"translate("+Y[b].centroid(a)+")"}),b.append("rect").style("stroke","#fff").style("fill","#fff").attr("rx",3).attr("ry",3),b.append("text").style("text-anchor",t?(a.startAngle+a.endAngle)/2<Math.PI?"start":"end":"middle").style("fill","#000")});var Z={},$=14,_=140,ab=function(a){return Math.floor(a[0]/_)*_+","+Math.floor(a[1]/$)*$};W.watchTransition(D,"pie labels").attr("transform",function(a,b){if(t){a.outerRadius=I[b]+10,a.innerRadius=I[b]+15;var c=(a.startAngle+a.endAngle)/2*(180/Math.PI);return(a.startAngle+a.endAngle)/2<Math.PI?c-=90:c+=90,"translate("+Y[b].centroid(a)+") rotate("+c+")"}a.outerRadius=H+10,a.innerRadius=H+15;var d=Y[b].centroid(a);if(a.value){var e=ab(d);Z[e]&&(d[1]-=$),Z[ab(d)]=!0}return"translate("+d+")"}),W.select(".nv-label text").style("text-anchor",function(a){return t?(a.startAngle+a.endAngle)/2<Math.PI?"start":"end":"middle"}).text(function(a,b){var c=(a.endAngle-a.startAngle)/(2*Math.PI),d="";if(!a.value||o>c)return"";if("function"==typeof n)d=n(a,b,{key:f(a.data),value:g(a.data),percent:k(c)});else switch(n){case"key":d=f(a.data);break;case"value":d=k(g(a.data));break;case"percent":d=d3.format("%")(c)}return d})}}),D.renderEnd("pie immediate"),b}var c={top:0,right:0,bottom:0,left:0},d=500,e=500,f=function(a){return a.x},g=function(a){return a.y},h=Math.floor(1e4*Math.random()),i=null,j=a.utils.defaultColor(),k=d3.format(",.2f"),l=!0,m=!1,n="key",o=.02,p=!1,q=!1,r=!0,s=0,t=!1,u=!1,v=!1,w=!1,x=0,y=.5,z=[],A=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout","elementMousemove","renderEnd"),B=[],C=[],D=a.utils.renderWatch(A);return b.dispatch=A,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{arcsRadius:{get:function(){return z},set:function(a){z=a}},width:{get:function(){return d},set:function(a){d=a}},height:{get:function(){return e},set:function(a){e=a}},showLabels:{get:function(){return l},set:function(a){l=a}},title:{get:function(){return q},set:function(a){q=a}},titleOffset:{get:function(){return s},set:function(a){s=a}},labelThreshold:{get:function(){return o},set:function(a){o=a}},valueFormat:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return f},set:function(a){f=a}},id:{get:function(){return h},set:function(a){h=a}},endAngle:{get:function(){return w},set:function(a){w=a}},startAngle:{get:function(){return u},set:function(a){u=a}},padAngle:{get:function(){return v},set:function(a){v=a}},cornerRadius:{get:function(){return x},set:function(a){x=a}},donutRatio:{get:function(){return y},set:function(a){y=a}},labelsOutside:{get:function(){return m},set:function(a){m=a}},labelSunbeamLayout:{get:function(){return t},set:function(a){t=a}},donut:{get:function(){return p},set:function(a){p=a}},growOnHover:{get:function(){return r},set:function(a){r=a}},pieLabelsOutside:{get:function(){return m},set:function(b){m=b,a.deprecated("pieLabelsOutside","use labelsOutside instead")}},donutLabelsOutside:{get:function(){return m},set:function(b){m=b,a.deprecated("donutLabelsOutside","use labelsOutside instead")}},labelFormat:{get:function(){return k},set:function(b){k=b,a.deprecated("labelFormat","use valueFormat instead")}},margin:{get:function(){return c},set:function(a){c.top="undefined"!=typeof a.top?a.top:c.top,c.right="undefined"!=typeof a.right?a.right:c.right,c.bottom="undefined"!=typeof a.bottom?a.bottom:c.bottom,c.left="undefined"!=typeof a.left?a.left:c.left}},y:{get:function(){return g},set:function(a){g=d3.functor(a)}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}},labelType:{get:function(){return n},set:function(a){n=a||"key"}}}),a.utils.initOptions(b),b},a.models.pieChart=function(){"use strict";function b(e){return q.reset(),q.models(c),e.each(function(e){var k=d3.select(this);a.utils.initSVG(k);var n=a.utils.availableWidth(g,k,f),o=a.utils.availableHeight(h,k,f);if(b.update=function(){k.transition().call(b)},b.container=this,l.setter(s(e),b.update).getter(r(e)).update(),l.disabled=e.map(function(a){return!!a.disabled}),!m){var q;m={};for(q in l)m[q]=l[q]instanceof Array?l[q].slice(0):l[q]}if(!e||!e.length)return a.utils.noData(b,k),b;k.selectAll(".nv-noData").remove();var t=k.selectAll("g.nv-wrap.nv-pieChart").data([e]),u=t.enter().append("g").attr("class","nvd3 nv-wrap nv-pieChart").append("g"),v=t.select("g");if(u.append("g").attr("class","nv-pieWrap"),u.append("g").attr("class","nv-legendWrap"),i)if("top"===j)d.width(n).key(c.x()),t.select(".nv-legendWrap").datum(e).call(d),f.top!=d.height()&&(f.top=d.height(),o=a.utils.availableHeight(h,k,f)),t.select(".nv-legendWrap").attr("transform","translate(0,"+-f.top+")");else if("right"===j){var w=a.models.legend().width();w>n/2&&(w=n/2),d.height(o).key(c.x()),d.width(w),n-=d.width(),t.select(".nv-legendWrap").datum(e).call(d).attr("transform","translate("+n+",0)")}t.attr("transform","translate("+f.left+","+f.top+")"),c.width(n).height(o);var x=v.select(".nv-pieWrap").datum([e]);d3.transition(x).call(c),d.dispatch.on("stateChange",function(a){for(var c in a)l[c]=a[c];p.stateChange(l),b.update()}),p.on("changeState",function(a){"undefined"!=typeof a.disabled&&(e.forEach(function(b,c){b.disabled=a.disabled[c]}),l.disabled=a.disabled),b.update()})}),q.renderEnd("pieChart immediate"),b}var c=a.models.pie(),d=a.models.legend(),e=a.models.tooltip(),f={top:30,right:20,bottom:20,left:20},g=null,h=null,i=!0,j="top",k=a.utils.defaultColor(),l=a.utils.state(),m=null,n=null,o=250,p=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd");e.headerEnabled(!1).duration(0).valueFormatter(function(a,b){return c.valueFormat()(a,b)});var q=a.utils.renderWatch(p),r=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},s=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:b.x()(a.data),value:b.y()(a.data),color:a.color},e.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){e.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){e.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.legend=d,b.dispatch=p,b.pie=c,b.tooltip=e,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{noData:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return i},set:function(a){i=a}},legendPosition:{get:function(){return j},set:function(a){j=a}},defaultState:{get:function(){return m},set:function(a){m=a}},tooltips:{get:function(){return e.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),e.enabled(!!b)}},tooltipContent:{get:function(){return e.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),e.contentGenerator(b)}},color:{get:function(){return k},set:function(a){k=a,d.color(k),c.color(k)}},duration:{get:function(){return o},set:function(a){o=a,q.reset(o)}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.scatter=function(){"use strict";function b(N){return P.reset(),N.each(function(b){function N(){if(O=!1,!w)return!1;if(M===!0){var a=d3.merge(b.map(function(a,b){return a.values.map(function(a,c){var d=p(a,c),e=q(a,c);return[m(d)+1e-4*Math.random(),n(e)+1e-4*Math.random(),b,c,a]}).filter(function(a,b){return x(a[4],b)})}));if(0==a.length)return!1;a.length<3&&(a.push([m.range()[0]-20,n.range()[0]-20,null,null]),a.push([m.range()[1]+20,n.range()[1]+20,null,null]),a.push([m.range()[0]-20,n.range()[0]+20,null,null]),a.push([m.range()[1]+20,n.range()[1]-20,null,null]));var c=d3.geom.polygon([[-10,-10],[-10,i+10],[h+10,i+10],[h+10,-10]]),d=d3.geom.voronoi(a).map(function(b,d){return{data:c.clip(b),series:a[d][2],point:a[d][3]}});U.select(".nv-point-paths").selectAll("path").remove();var e=U.select(".nv-point-paths").selectAll("path").data(d),f=e.enter().append("svg:path").attr("d",function(a){return a&&a.data&&0!==a.data.length?"M"+a.data.join(",")+"Z":"M 0 0"}).attr("id",function(a,b){return"nv-path-"+b}).attr("clip-path",function(a,b){return"url(#nv-clip-"+k+"-"+b+")"});C&&f.style("fill",d3.rgb(230,230,230)).style("fill-opacity",.4).style("stroke-opacity",1).style("stroke",d3.rgb(200,200,200)),B&&(U.select(".nv-point-clips").selectAll("clipPath").remove(),U.select(".nv-point-clips").selectAll("clipPath").data(a).enter().append("svg:clipPath").attr("id",function(a,b){return"nv-clip-"+k+"-"+b}).append("svg:circle").attr("cx",function(a){return a[0]}).attr("cy",function(a){return a[1]}).attr("r",D));var o=function(a,c){if(O)return 0;var d=b[a.series];if(void 0!==d){var e=d.values[a.point];e.color=j(d,a.series),e.x=p(e),e.y=q(e);var f=l.node().getBoundingClientRect(),h=window.pageYOffset||document.documentElement.scrollTop,i=window.pageXOffset||document.documentElement.scrollLeft,k={left:m(p(e,a.point))+f.left+i+g.left+10,top:n(q(e,a.point))+f.top+h+g.top+10};c({point:e,series:d,pos:k,seriesIndex:a.series,pointIndex:a.point})}};e.on("click",function(a){o(a,L.elementClick)}).on("dblclick",function(a){o(a,L.elementDblClick)}).on("mouseover",function(a){o(a,L.elementMouseover)}).on("mouseout",function(a){o(a,L.elementMouseout)})}else U.select(".nv-groups").selectAll(".nv-group").selectAll(".nv-point").on("click",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementClick({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c})}).on("dblclick",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementDblClick({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c})}).on("mouseover",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementMouseover({point:e,series:d,pos:[m(p(e,c))+g.left,n(q(e,c))+g.top],seriesIndex:a.series,pointIndex:c,color:j(a,c)})}).on("mouseout",function(a,c){if(O||!b[a.series])return 0;var d=b[a.series],e=d.values[c];L.elementMouseout({point:e,series:d,seriesIndex:a.series,pointIndex:c,color:j(a,c)})})}l=d3.select(this);var R=a.utils.availableWidth(h,l,g),S=a.utils.availableHeight(i,l,g);a.utils.initSVG(l),b.forEach(function(a,b){a.values.forEach(function(a){a.series=b})});var T=E&&F&&I?[]:d3.merge(b.map(function(a){return a.values.map(function(a,b){return{x:p(a,b),y:q(a,b),size:r(a,b)}})}));m.domain(E||d3.extent(T.map(function(a){return a.x}).concat(t))),m.range(y&&b[0]?G||[(R*z+R)/(2*b[0].values.length),R-R*(1+z)/(2*b[0].values.length)]:G||[0,R]),n.domain(F||d3.extent(T.map(function(a){return a.y}).concat(u))).range(H||[S,0]),o.domain(I||d3.extent(T.map(function(a){return a.size}).concat(v))).range(J||Q),K=m.domain()[0]===m.domain()[1]||n.domain()[0]===n.domain()[1],m.domain()[0]===m.domain()[1]&&m.domain(m.domain()[0]?[m.domain()[0]-.01*m.domain()[0],m.domain()[1]+.01*m.domain()[1]]:[-1,1]),n.domain()[0]===n.domain()[1]&&n.domain(n.domain()[0]?[n.domain()[0]-.01*n.domain()[0],n.domain()[1]+.01*n.domain()[1]]:[-1,1]),isNaN(m.domain()[0])&&m.domain([-1,1]),isNaN(n.domain()[0])&&n.domain([-1,1]),c=c||m,d=d||n,e=e||o;var U=l.selectAll("g.nv-wrap.nv-scatter").data([b]),V=U.enter().append("g").attr("class","nvd3 nv-wrap nv-scatter nv-chart-"+k),W=V.append("defs"),X=V.append("g"),Y=U.select("g");U.classed("nv-single-point",K),X.append("g").attr("class","nv-groups"),X.append("g").attr("class","nv-point-paths"),V.append("g").attr("class","nv-point-clips"),U.attr("transform","translate("+g.left+","+g.top+")"),W.append("clipPath").attr("id","nv-edge-clip-"+k).append("rect"),U.select("#nv-edge-clip-"+k+" rect").attr("width",R).attr("height",S>0?S:0),Y.attr("clip-path",A?"url(#nv-edge-clip-"+k+")":""),O=!0;var Z=U.select(".nv-groups").selectAll(".nv-group").data(function(a){return a},function(a){return a.key});Z.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),Z.exit().remove(),Z.attr("class",function(a,b){return"nv-group nv-series-"+b}).classed("hover",function(a){return a.hover}),Z.watchTransition(P,"scatter: groups").style("fill",function(a,b){return j(a,b)}).style("stroke",function(a,b){return j(a,b)}).style("stroke-opacity",1).style("fill-opacity",.5);var $=Z.selectAll("path.nv-point").data(function(a){return a.values.map(function(a,b){return[a,b]}).filter(function(a,b){return x(a[0],b)})});$.enter().append("path").style("fill",function(a){return a.color}).style("stroke",function(a){return a.color}).attr("transform",function(a){return"translate("+c(p(a[0],a[1]))+","+d(q(a[0],a[1]))+")"}).attr("d",a.utils.symbol().type(function(a){return s(a[0])}).size(function(a){return o(r(a[0],a[1]))})),$.exit().remove(),Z.exit().selectAll("path.nv-point").watchTransition(P,"scatter exit").attr("transform",function(a){return"translate("+m(p(a[0],a[1]))+","+n(q(a[0],a[1]))+")"}).remove(),$.each(function(a){d3.select(this).classed("nv-point",!0).classed("nv-point-"+a[1],!0).classed("nv-noninteractive",!w).classed("hover",!1)}),$.watchTransition(P,"scatter points").attr("transform",function(a){return"translate("+m(p(a[0],a[1]))+","+n(q(a[0],a[1]))+")"}).attr("d",a.utils.symbol().type(function(a){return s(a[0])}).size(function(a){return o(r(a[0],a[1]))})),clearTimeout(f),f=setTimeout(N,300),c=m.copy(),d=n.copy(),e=o.copy()}),P.renderEnd("scatter immediate"),b}var c,d,e,f,g={top:0,right:0,bottom:0,left:0},h=null,i=null,j=a.utils.defaultColor(),k=Math.floor(1e5*Math.random()),l=null,m=d3.scale.linear(),n=d3.scale.linear(),o=d3.scale.linear(),p=function(a){return a.x},q=function(a){return a.y},r=function(a){return a.size||1},s=function(a){return a.shape||"circle"},t=[],u=[],v=[],w=!0,x=function(a){return!a.notActive},y=!1,z=.1,A=!1,B=!0,C=!1,D=function(){return 25},E=null,F=null,G=null,H=null,I=null,J=null,K=!1,L=d3.dispatch("elementClick","elementDblClick","elementMouseover","elementMouseout","renderEnd"),M=!0,N=250,O=!1,P=a.utils.renderWatch(L,N),Q=[16,256];return b.dispatch=L,b.options=a.utils.optionsFunc.bind(b),b._calls=new function(){this.clearHighlights=function(){return a.dom.write(function(){l.selectAll(".nv-point.hover").classed("hover",!1)}),null},this.highlightPoint=function(b,c,d){a.dom.write(function(){l.select(" .nv-series-"+b+" .nv-point-"+c).classed("hover",d)})}},L.on("elementMouseover.point",function(a){w&&b._calls.highlightPoint(a.seriesIndex,a.pointIndex,!0)}),L.on("elementMouseout.point",function(a){w&&b._calls.highlightPoint(a.seriesIndex,a.pointIndex,!1)}),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xScale:{get:function(){return m},set:function(a){m=a}},yScale:{get:function(){return n},set:function(a){n=a}},pointScale:{get:function(){return o},set:function(a){o=a}},xDomain:{get:function(){return E},set:function(a){E=a}},yDomain:{get:function(){return F},set:function(a){F=a}},pointDomain:{get:function(){return I},set:function(a){I=a}},xRange:{get:function(){return G},set:function(a){G=a}},yRange:{get:function(){return H},set:function(a){H=a}},pointRange:{get:function(){return J},set:function(a){J=a}},forceX:{get:function(){return t},set:function(a){t=a}},forceY:{get:function(){return u},set:function(a){u=a}},forcePoint:{get:function(){return v},set:function(a){v=a}},interactive:{get:function(){return w},set:function(a){w=a}},pointActive:{get:function(){return x},set:function(a){x=a}},padDataOuter:{get:function(){return z},set:function(a){z=a}},padData:{get:function(){return y},set:function(a){y=a}},clipEdge:{get:function(){return A},set:function(a){A=a}},clipVoronoi:{get:function(){return B},set:function(a){B=a}},clipRadius:{get:function(){return D},set:function(a){D=a}},showVoronoi:{get:function(){return C},set:function(a){C=a}},id:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return p},set:function(a){p=d3.functor(a)}},y:{get:function(){return q},set:function(a){q=d3.functor(a)}},pointSize:{get:function(){return r},set:function(a){r=d3.functor(a)}},pointShape:{get:function(){return s},set:function(a){s=d3.functor(a)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},duration:{get:function(){return N},set:function(a){N=a,P.reset(N)}},color:{get:function(){return j},set:function(b){j=a.utils.getColor(b)}},useVoronoi:{get:function(){return M},set:function(a){M=a,M===!1&&(B=!1)}}}),a.utils.initOptions(b),b},a.models.scatterChart=function(){"use strict";function b(z){return D.reset(),D.models(c),t&&D.models(d),u&&D.models(e),q&&D.models(g),r&&D.models(h),z.each(function(z){m=d3.select(this),a.utils.initSVG(m);var G=a.utils.availableWidth(k,m,j),H=a.utils.availableHeight(l,m,j);if(b.update=function(){0===A?m.call(b):m.transition().duration(A).call(b)},b.container=this,w.setter(F(z),b.update).getter(E(z)).update(),w.disabled=z.map(function(a){return!!a.disabled}),!x){var I;x={};for(I in w)x[I]=w[I]instanceof Array?w[I].slice(0):w[I]}if(!(z&&z.length&&z.filter(function(a){return a.values.length}).length))return a.utils.noData(b,m),D.renderEnd("scatter immediate"),b;m.selectAll(".nv-noData").remove(),o=c.xScale(),p=c.yScale();var J=m.selectAll("g.nv-wrap.nv-scatterChart").data([z]),K=J.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+c.id()),L=K.append("g"),M=J.select("g");if(L.append("rect").attr("class","nvd3 nv-background").style("pointer-events","none"),L.append("g").attr("class","nv-x nv-axis"),L.append("g").attr("class","nv-y nv-axis"),L.append("g").attr("class","nv-scatterWrap"),L.append("g").attr("class","nv-regressionLinesWrap"),L.append("g").attr("class","nv-distWrap"),L.append("g").attr("class","nv-legendWrap"),v&&M.select(".nv-y.nv-axis").attr("transform","translate("+G+",0)"),s){var N=G;f.width(N),J.select(".nv-legendWrap").datum(z).call(f),j.top!=f.height()&&(j.top=f.height(),H=a.utils.availableHeight(l,m,j)),J.select(".nv-legendWrap").attr("transform","translate(0,"+-j.top+")")}J.attr("transform","translate("+j.left+","+j.top+")"),c.width(G).height(H).color(z.map(function(a,b){return a.color=a.color||n(a,b),a.color}).filter(function(a,b){return!z[b].disabled})),J.select(".nv-scatterWrap").datum(z.filter(function(a){return!a.disabled})).call(c),J.select(".nv-regressionLinesWrap").attr("clip-path","url(#nv-edge-clip-"+c.id()+")");var O=J.select(".nv-regressionLinesWrap").selectAll(".nv-regLines").data(function(a){return a});O.enter().append("g").attr("class","nv-regLines");var P=O.selectAll(".nv-regLine").data(function(a){return[a]});P.enter().append("line").attr("class","nv-regLine").style("stroke-opacity",0),P.filter(function(a){return a.intercept&&a.slope}).watchTransition(D,"scatterPlusLineChart: regline").attr("x1",o.range()[0]).attr("x2",o.range()[1]).attr("y1",function(a){return p(o.domain()[0]*a.slope+a.intercept)}).attr("y2",function(a){return p(o.domain()[1]*a.slope+a.intercept)}).style("stroke",function(a,b,c){return n(a,c)}).style("stroke-opacity",function(a){return a.disabled||"undefined"==typeof a.slope||"undefined"==typeof a.intercept?0:1}),t&&(d.scale(o)._ticks(a.utils.calcTicksX(G/100,z)).tickSize(-H,0),M.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(d)),u&&(e.scale(p)._ticks(a.utils.calcTicksY(H/36,z)).tickSize(-G,0),M.select(".nv-y.nv-axis").call(e)),q&&(g.getData(c.x()).scale(o).width(G).color(z.map(function(a,b){return a.color||n(a,b)}).filter(function(a,b){return!z[b].disabled})),L.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),M.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(z.filter(function(a){return!a.disabled})).call(g)),r&&(h.getData(c.y()).scale(p).width(H).color(z.map(function(a,b){return a.color||n(a,b)
-}).filter(function(a,b){return!z[b].disabled})),L.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),M.select(".nv-distributionY").attr("transform","translate("+(v?G:-h.size())+",0)").datum(z.filter(function(a){return!a.disabled})).call(h)),f.dispatch.on("stateChange",function(a){for(var c in a)w[c]=a[c];y.stateChange(w),b.update()}),y.on("changeState",function(a){"undefined"!=typeof a.disabled&&(z.forEach(function(b,c){b.disabled=a.disabled[c]}),w.disabled=a.disabled),b.update()}),c.dispatch.on("elementMouseout.tooltip",function(a){i.hidden(!0),m.select(".nv-chart-"+c.id()+" .nv-series-"+a.seriesIndex+" .nv-distx-"+a.pointIndex).attr("y1",0),m.select(".nv-chart-"+c.id()+" .nv-series-"+a.seriesIndex+" .nv-disty-"+a.pointIndex).attr("x2",h.size())}),c.dispatch.on("elementMouseover.tooltip",function(a){m.select(".nv-series-"+a.seriesIndex+" .nv-distx-"+a.pointIndex).attr("y1",a.pos.top-H-j.top),m.select(".nv-series-"+a.seriesIndex+" .nv-disty-"+a.pointIndex).attr("x2",a.pos.left+g.size()-j.left),i.position(a.pos).data(a).hidden(!1)}),B=o.copy(),C=p.copy()}),D.renderEnd("scatter with line immediate"),b}var c=a.models.scatter(),d=a.models.axis(),e=a.models.axis(),f=a.models.legend(),g=a.models.distribution(),h=a.models.distribution(),i=a.models.tooltip(),j={top:30,right:20,bottom:50,left:75},k=null,l=null,m=null,n=a.utils.defaultColor(),o=c.xScale(),p=c.yScale(),q=!1,r=!1,s=!0,t=!0,u=!0,v=!1,w=a.utils.state(),x=null,y=d3.dispatch("stateChange","changeState","renderEnd"),z=null,A=250;c.xScale(o).yScale(p),d.orient("bottom").tickPadding(10),e.orient(v?"right":"left").tickPadding(10),g.axis("x"),h.axis("y"),i.headerFormatter(function(a,b){return d.tickFormat()(a,b)}).valueFormatter(function(a,b){return e.tickFormat()(a,b)});var B,C,D=a.utils.renderWatch(y,A),E=function(a){return function(){return{active:a.map(function(a){return!a.disabled})}}},F=function(a){return function(b){void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}};return b.dispatch=y,b.scatter=c,b.legend=f,b.xAxis=d,b.yAxis=e,b.distX=g,b.distY=h,b.tooltip=i,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return k},set:function(a){k=a}},height:{get:function(){return l},set:function(a){l=a}},container:{get:function(){return m},set:function(a){m=a}},showDistX:{get:function(){return q},set:function(a){q=a}},showDistY:{get:function(){return r},set:function(a){r=a}},showLegend:{get:function(){return s},set:function(a){s=a}},showXAxis:{get:function(){return t},set:function(a){t=a}},showYAxis:{get:function(){return u},set:function(a){u=a}},defaultState:{get:function(){return x},set:function(a){x=a}},noData:{get:function(){return z},set:function(a){z=a}},duration:{get:function(){return A},set:function(a){A=a}},tooltips:{get:function(){return i.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),i.enabled(!!b)}},tooltipContent:{get:function(){return i.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),i.contentGenerator(b)}},tooltipXContent:{get:function(){return i.contentGenerator()},set:function(){a.deprecated("tooltipContent","This option is removed, put values into main tooltip.")}},tooltipYContent:{get:function(){return i.contentGenerator()},set:function(){a.deprecated("tooltipContent","This option is removed, put values into main tooltip.")}},margin:{get:function(){return j},set:function(a){j.top=void 0!==a.top?a.top:j.top,j.right=void 0!==a.right?a.right:j.right,j.bottom=void 0!==a.bottom?a.bottom:j.bottom,j.left=void 0!==a.left?a.left:j.left}},rightAlignYAxis:{get:function(){return v},set:function(a){v=a,e.orient(a?"right":"left")}},color:{get:function(){return n},set:function(b){n=a.utils.getColor(b),f.color(n),g.color(n),h.color(n)}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.models.sparkline=function(){"use strict";function b(k){return k.each(function(b){var k=h-g.left-g.right,q=i-g.top-g.bottom;j=d3.select(this),a.utils.initSVG(j),l.domain(c||d3.extent(b,n)).range(e||[0,k]),m.domain(d||d3.extent(b,o)).range(f||[q,0]);{var r=j.selectAll("g.nv-wrap.nv-sparkline").data([b]),s=r.enter().append("g").attr("class","nvd3 nv-wrap nv-sparkline");s.append("g"),r.select("g")}r.attr("transform","translate("+g.left+","+g.top+")");var t=r.selectAll("path").data(function(a){return[a]});t.enter().append("path"),t.exit().remove(),t.style("stroke",function(a,b){return a.color||p(a,b)}).attr("d",d3.svg.line().x(function(a,b){return l(n(a,b))}).y(function(a,b){return m(o(a,b))}));var u=r.selectAll("circle.nv-point").data(function(a){function b(b){if(-1!=b){var c=a[b];return c.pointIndex=b,c}return null}var c=a.map(function(a,b){return o(a,b)}),d=b(c.lastIndexOf(m.domain()[1])),e=b(c.indexOf(m.domain()[0])),f=b(c.length-1);return[e,d,f].filter(function(a){return null!=a})});u.enter().append("circle"),u.exit().remove(),u.attr("cx",function(a){return l(n(a,a.pointIndex))}).attr("cy",function(a){return m(o(a,a.pointIndex))}).attr("r",2).attr("class",function(a){return n(a,a.pointIndex)==l.domain()[1]?"nv-point nv-currentValue":o(a,a.pointIndex)==m.domain()[0]?"nv-point nv-minValue":"nv-point nv-maxValue"})}),b}var c,d,e,f,g={top:2,right:0,bottom:2,left:0},h=400,i=32,j=null,k=!0,l=d3.scale.linear(),m=d3.scale.linear(),n=function(a){return a.x},o=function(a){return a.y},p=a.utils.getColor(["#000"]);return b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return h},set:function(a){h=a}},height:{get:function(){return i},set:function(a){i=a}},xDomain:{get:function(){return c},set:function(a){c=a}},yDomain:{get:function(){return d},set:function(a){d=a}},xRange:{get:function(){return e},set:function(a){e=a}},yRange:{get:function(){return f},set:function(a){f=a}},xScale:{get:function(){return l},set:function(a){l=a}},yScale:{get:function(){return m},set:function(a){m=a}},animate:{get:function(){return k},set:function(a){k=a}},x:{get:function(){return n},set:function(a){n=d3.functor(a)}},y:{get:function(){return o},set:function(a){o=d3.functor(a)}},margin:{get:function(){return g},set:function(a){g.top=void 0!==a.top?a.top:g.top,g.right=void 0!==a.right?a.right:g.right,g.bottom=void 0!==a.bottom?a.bottom:g.bottom,g.left=void 0!==a.left?a.left:g.left}},color:{get:function(){return p},set:function(b){p=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.sparklinePlus=function(){"use strict";function b(p){return p.each(function(p){function q(){if(!j){var a=z.selectAll(".nv-hoverValue").data(i),b=a.enter().append("g").attr("class","nv-hoverValue").style("stroke-opacity",0).style("fill-opacity",0);a.exit().transition().duration(250).style("stroke-opacity",0).style("fill-opacity",0).remove(),a.attr("transform",function(a){return"translate("+c(e.x()(p[a],a))+",0)"}).transition().duration(250).style("stroke-opacity",1).style("fill-opacity",1),i.length&&(b.append("line").attr("x1",0).attr("y1",-f.top).attr("x2",0).attr("y2",u),b.append("text").attr("class","nv-xValue").attr("x",-6).attr("y",-f.top).attr("text-anchor","end").attr("dy",".9em"),z.select(".nv-hoverValue .nv-xValue").text(k(e.x()(p[i[0]],i[0]))),b.append("text").attr("class","nv-yValue").attr("x",6).attr("y",-f.top).attr("text-anchor","start").attr("dy",".9em"),z.select(".nv-hoverValue .nv-yValue").text(l(e.y()(p[i[0]],i[0]))))}}function r(){function a(a,b){for(var c=Math.abs(e.x()(a[0],0)-b),d=0,f=0;f<a.length;f++)Math.abs(e.x()(a[f],f)-b)<c&&(c=Math.abs(e.x()(a[f],f)-b),d=f);return d}if(!j){var b=d3.mouse(this)[0]-f.left;i=[a(p,Math.round(c.invert(b)))],q()}}var s=d3.select(this);a.utils.initSVG(s);var t=a.utils.availableWidth(g,s,f),u=a.utils.availableHeight(h,s,f);if(b.update=function(){s.call(b)},b.container=this,!p||!p.length)return a.utils.noData(b,s),b;s.selectAll(".nv-noData").remove();var v=e.y()(p[p.length-1],p.length-1);c=e.xScale(),d=e.yScale();var w=s.selectAll("g.nv-wrap.nv-sparklineplus").data([p]),x=w.enter().append("g").attr("class","nvd3 nv-wrap nv-sparklineplus"),y=x.append("g"),z=w.select("g");y.append("g").attr("class","nv-sparklineWrap"),y.append("g").attr("class","nv-valueWrap"),y.append("g").attr("class","nv-hoverArea"),w.attr("transform","translate("+f.left+","+f.top+")");var A=z.select(".nv-sparklineWrap");if(e.width(t).height(u),A.call(e),m){var B=z.select(".nv-valueWrap"),C=B.selectAll(".nv-currentValue").data([v]);C.enter().append("text").attr("class","nv-currentValue").attr("dx",o?-8:8).attr("dy",".9em").style("text-anchor",o?"end":"start"),C.attr("x",t+(o?f.right:0)).attr("y",n?function(a){return d(a)}:0).style("fill",e.color()(p[p.length-1],p.length-1)).text(l(v))}y.select(".nv-hoverArea").append("rect").on("mousemove",r).on("click",function(){j=!j}).on("mouseout",function(){i=[],q()}),z.select(".nv-hoverArea rect").attr("transform",function(){return"translate("+-f.left+","+-f.top+")"}).attr("width",t+f.left+f.right).attr("height",u+f.top)}),b}var c,d,e=a.models.sparkline(),f={top:15,right:100,bottom:10,left:50},g=null,h=null,i=[],j=!1,k=d3.format(",r"),l=d3.format(",.2f"),m=!0,n=!0,o=!1,p=null;return b.sparkline=e,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},xTickFormat:{get:function(){return k},set:function(a){k=a}},yTickFormat:{get:function(){return l},set:function(a){l=a}},showLastValue:{get:function(){return m},set:function(a){m=a}},alignValue:{get:function(){return n},set:function(a){n=a}},rightAlignValue:{get:function(){return o},set:function(a){o=a}},noData:{get:function(){return p},set:function(a){p=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!==a.top?a.top:f.top,f.right=void 0!==a.right?a.right:f.right,f.bottom=void 0!==a.bottom?a.bottom:f.bottom,f.left=void 0!==a.left?a.left:f.left}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.stackedArea=function(){"use strict";function b(m){return u.reset(),u.models(r),m.each(function(m){var s=f-e.left-e.right,v=g-e.top-e.bottom;j=d3.select(this),a.utils.initSVG(j),c=r.xScale(),d=r.yScale();var w=m;m.forEach(function(a,b){a.seriesIndex=b,a.values=a.values.map(function(a,c){return a.index=c,a.seriesIndex=b,a})});var x=m.filter(function(a){return!a.disabled});m=d3.layout.stack().order(o).offset(n).values(function(a){return a.values}).x(k).y(l).out(function(a,b,c){a.display={y:c,y0:b}})(x);var y=j.selectAll("g.nv-wrap.nv-stackedarea").data([m]),z=y.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedarea"),A=z.append("defs"),B=z.append("g"),C=y.select("g");B.append("g").attr("class","nv-areaWrap"),B.append("g").attr("class","nv-scatterWrap"),y.attr("transform","translate("+e.left+","+e.top+")"),0==r.forceY().length&&r.forceY().push(0),r.width(s).height(v).x(k).y(function(a){return a.display.y+a.display.y0}).forceY([0]).color(m.map(function(a){return a.color||h(a,a.seriesIndex)}));var D=C.select(".nv-scatterWrap").datum(m);D.call(r),A.append("clipPath").attr("id","nv-edge-clip-"+i).append("rect"),y.select("#nv-edge-clip-"+i+" rect").attr("width",s).attr("height",v),C.attr("clip-path",q?"url(#nv-edge-clip-"+i+")":"");var E=d3.svg.area().x(function(a,b){return c(k(a,b))}).y0(function(a){return d(a.display.y0)}).y1(function(a){return d(a.display.y+a.display.y0)}).interpolate(p),F=d3.svg.area().x(function(a,b){return c(k(a,b))}).y0(function(a){return d(a.display.y0)}).y1(function(a){return d(a.display.y0)}),G=C.select(".nv-areaWrap").selectAll("path.nv-area").data(function(a){return a});G.enter().append("path").attr("class",function(a,b){return"nv-area nv-area-"+b}).attr("d",function(a){return F(a.values,a.seriesIndex)}).on("mouseover",function(a){d3.select(this).classed("hover",!0),t.areaMouseover({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}).on("mouseout",function(a){d3.select(this).classed("hover",!1),t.areaMouseout({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}).on("click",function(a){d3.select(this).classed("hover",!1),t.areaClick({point:a,series:a.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:a.seriesIndex})}),G.exit().remove(),G.style("fill",function(a){return a.color||h(a,a.seriesIndex)}).style("stroke",function(a){return a.color||h(a,a.seriesIndex)}),G.watchTransition(u,"stackedArea path").attr("d",function(a,b){return E(a.values,b)}),r.dispatch.on("elementMouseover.area",function(a){C.select(".nv-chart-"+i+" .nv-area-"+a.seriesIndex).classed("hover",!0)}),r.dispatch.on("elementMouseout.area",function(a){C.select(".nv-chart-"+i+" .nv-area-"+a.seriesIndex).classed("hover",!1)}),b.d3_stackedOffset_stackPercent=function(a){var b,c,d,e=a.length,f=a[0].length,g=[];for(c=0;f>c;++c){for(b=0,d=0;b<w.length;b++)d+=l(w[b].values[c]);if(d)for(b=0;e>b;b++)a[b][c][1]/=d;else for(b=0;e>b;b++)a[b][c][1]=0}for(c=0;f>c;++c)g[c]=0;return g}}),u.renderEnd("stackedArea immediate"),b}var c,d,e={top:0,right:0,bottom:0,left:0},f=960,g=500,h=a.utils.defaultColor(),i=Math.floor(1e5*Math.random()),j=null,k=function(a){return a.x},l=function(a){return a.y},m="stack",n="zero",o="default",p="linear",q=!1,r=a.models.scatter(),s=250,t=d3.dispatch("areaClick","areaMouseover","areaMouseout","renderEnd","elementClick","elementMouseover","elementMouseout");r.pointSize(2.2).pointDomain([2.2,2.2]);var u=a.utils.renderWatch(t,s);return b.dispatch=t,b.scatter=r,r.dispatch.on("elementClick",function(){t.elementClick.apply(this,arguments)}),r.dispatch.on("elementMouseover",function(){t.elementMouseover.apply(this,arguments)}),r.dispatch.on("elementMouseout",function(){t.elementMouseout.apply(this,arguments)}),b.interpolate=function(a){return arguments.length?(p=a,b):p},b.duration=function(a){return arguments.length?(s=a,u.reset(s),r.duration(s),b):s},b.dispatch=t,b.scatter=r,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return f},set:function(a){f=a}},height:{get:function(){return g},set:function(a){g=a}},clipEdge:{get:function(){return q},set:function(a){q=a}},offset:{get:function(){return n},set:function(a){n=a}},order:{get:function(){return o},set:function(a){o=a}},interpolate:{get:function(){return p},set:function(a){p=a}},x:{get:function(){return k},set:function(a){k=d3.functor(a)}},y:{get:function(){return l},set:function(a){l=d3.functor(a)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}},color:{get:function(){return h},set:function(b){h=a.utils.getColor(b)}},style:{get:function(){return m},set:function(a){switch(m=a){case"stack":b.offset("zero"),b.order("default");break;case"stream":b.offset("wiggle"),b.order("inside-out");break;case"stream-center":b.offset("silhouette"),b.order("inside-out");break;case"expand":b.offset("expand"),b.order("default");break;case"stack_percent":b.offset(b.d3_stackedOffset_stackPercent),b.order("default")}}},duration:{get:function(){return s},set:function(a){s=a,u.reset(s),r.duration(s)}}}),a.utils.inheritOptions(b,r),a.utils.initOptions(b),b},a.models.stackedAreaChart=function(){"use strict";function b(k){return F.reset(),F.models(e),r&&F.models(f),s&&F.models(g),k.each(function(k){var x=d3.select(this),F=this;a.utils.initSVG(x);var K=a.utils.availableWidth(m,x,l),L=a.utils.availableHeight(n,x,l);if(b.update=function(){x.transition().duration(C).call(b)},b.container=this,v.setter(I(k),b.update).getter(H(k)).update(),v.disabled=k.map(function(a){return!!a.disabled}),!w){var M;w={};for(M in v)w[M]=v[M]instanceof Array?v[M].slice(0):v[M]}if(!(k&&k.length&&k.filter(function(a){return a.values.length}).length))return a.utils.noData(b,x),b;x.selectAll(".nv-noData").remove(),c=e.xScale(),d=e.yScale();var N=x.selectAll("g.nv-wrap.nv-stackedAreaChart").data([k]),O=N.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedAreaChart").append("g"),P=N.select("g");if(O.append("rect").style("opacity",0),O.append("g").attr("class","nv-x nv-axis"),O.append("g").attr("class","nv-y nv-axis"),O.append("g").attr("class","nv-stackedWrap"),O.append("g").attr("class","nv-legendWrap"),O.append("g").attr("class","nv-controlsWrap"),O.append("g").attr("class","nv-interactive"),P.select("rect").attr("width",K).attr("height",L),q){var Q=p?K-z:K;h.width(Q),P.select(".nv-legendWrap").datum(k).call(h),l.top!=h.height()&&(l.top=h.height(),L=a.utils.availableHeight(n,x,l)),P.select(".nv-legendWrap").attr("transform","translate("+(K-Q)+","+-l.top+")")}if(p){var R=[{key:B.stacked||"Stacked",metaKey:"Stacked",disabled:"stack"!=e.style(),style:"stack"},{key:B.stream||"Stream",metaKey:"Stream",disabled:"stream"!=e.style(),style:"stream"},{key:B.expanded||"Expanded",metaKey:"Expanded",disabled:"expand"!=e.style(),style:"expand"},{key:B.stack_percent||"Stack %",metaKey:"Stack_Percent",disabled:"stack_percent"!=e.style(),style:"stack_percent"}];z=A.length/3*260,R=R.filter(function(a){return-1!==A.indexOf(a.metaKey)}),i.width(z).color(["#444","#444","#444"]),P.select(".nv-controlsWrap").datum(R).call(i),l.top!=Math.max(i.height(),h.height())&&(l.top=Math.max(i.height(),h.height()),L=a.utils.availableHeight(n,x,l)),P.select(".nv-controlsWrap").attr("transform","translate(0,"+-l.top+")")}N.attr("transform","translate("+l.left+","+l.top+")"),t&&P.select(".nv-y.nv-axis").attr("transform","translate("+K+",0)"),u&&(j.width(K).height(L).margin({left:l.left,top:l.top}).svgContainer(x).xScale(c),N.select(".nv-interactive").call(j)),e.width(K).height(L);var S=P.select(".nv-stackedWrap").datum(k);if(S.transition().call(e),r&&(f.scale(c)._ticks(a.utils.calcTicksX(K/100,k)).tickSize(-L,0),P.select(".nv-x.nv-axis").attr("transform","translate(0,"+L+")"),P.select(".nv-x.nv-axis").transition().duration(0).call(f)),s){var T;if(T="wiggle"===e.offset()?0:a.utils.calcTicksY(L/36,k),g.scale(d)._ticks(T).tickSize(-K,0),"expand"===e.style()||"stack_percent"===e.style()){var U=g.tickFormat();D&&U===J||(D=U),g.tickFormat(J)}else D&&(g.tickFormat(D),D=null);P.select(".nv-y.nv-axis").transition().duration(0).call(g)}e.dispatch.on("areaClick.toggle",function(a){k.forEach(1===k.filter(function(a){return!a.disabled}).length?function(a){a.disabled=!1}:function(b,c){b.disabled=c!=a.seriesIndex}),v.disabled=k.map(function(a){return!!a.disabled}),y.stateChange(v),b.update()}),h.dispatch.on("stateChange",function(a){for(var c in a)v[c]=a[c];y.stateChange(v),b.update()}),i.dispatch.on("legendClick",function(a){a.disabled&&(R=R.map(function(a){return a.disabled=!0,a}),a.disabled=!1,e.style(a.style),v.style=e.style(),y.stateChange(v),b.update())}),j.dispatch.on("elementMousemove",function(c){e.clearHighlights();var d,g,h,i=[];if(k.filter(function(a,b){return a.seriesIndex=b,!a.disabled}).forEach(function(f,j){g=a.interactiveBisect(f.values,c.pointXValue,b.x());var k=f.values[g],l=b.y()(k,g);if(null!=l&&e.highlightPoint(j,g,!0),"undefined"!=typeof k){"undefined"==typeof d&&(d=k),"undefined"==typeof h&&(h=b.xScale()(b.x()(k,g)));var m="expand"==e.style()?k.display.y:b.y()(k,g);i.push({key:f.key,value:m,color:o(f,f.seriesIndex),stackedValue:k.display})}}),i.reverse(),i.length>2){var m=b.yScale().invert(c.mouseY),n=null;i.forEach(function(a,b){m=Math.abs(m);var c=Math.abs(a.stackedValue.y0),d=Math.abs(a.stackedValue.y);return m>=c&&d+c>=m?void(n=b):void 0}),null!=n&&(i[n].highlight=!0)}var p=f.tickFormat()(b.x()(d,g)),q=j.tooltip.valueFormatter();"expand"===e.style()||"stack_percent"===e.style()?(E||(E=q),q=d3.format(".1%")):E&&(q=E,E=null),j.tooltip.position({left:h+l.left,top:c.mouseY+l.top}).chartContainer(F.parentNode).valueFormatter(q).data({value:p,series:i})(),j.renderGuideLine(h)}),j.dispatch.on("elementMouseout",function(){e.clearHighlights()}),y.on("changeState",function(a){"undefined"!=typeof a.disabled&&k.length===a.disabled.length&&(k.forEach(function(b,c){b.disabled=a.disabled[c]}),v.disabled=a.disabled),"undefined"!=typeof a.style&&(e.style(a.style),G=a.style),b.update()})}),F.renderEnd("stacked Area chart immediate"),b}var c,d,e=a.models.stackedArea(),f=a.models.axis(),g=a.models.axis(),h=a.models.legend(),i=a.models.legend(),j=a.interactiveGuideline(),k=a.models.tooltip(),l={top:30,right:25,bottom:50,left:60},m=null,n=null,o=a.utils.defaultColor(),p=!0,q=!0,r=!0,s=!0,t=!1,u=!1,v=a.utils.state(),w=null,x=null,y=d3.dispatch("stateChange","changeState","renderEnd"),z=250,A=["Stacked","Stream","Expanded"],B={},C=250;v.style=e.style(),f.orient("bottom").tickPadding(7),g.orient(t?"right":"left"),k.headerFormatter(function(a,b){return f.tickFormat()(a,b)}).valueFormatter(function(a,b){return g.tickFormat()(a,b)}),j.tooltip.headerFormatter(function(a,b){return f.tickFormat()(a,b)}).valueFormatter(function(a,b){return g.tickFormat()(a,b)});var D=null,E=null;i.updateState(!1);var F=a.utils.renderWatch(y),G=e.style(),H=function(a){return function(){return{active:a.map(function(a){return!a.disabled}),style:e.style()}}},I=function(a){return function(b){void 0!==b.style&&(G=b.style),void 0!==b.active&&a.forEach(function(a,c){a.disabled=!b.active[c]})}},J=d3.format("%");return e.dispatch.on("elementMouseover.tooltip",function(a){a.point.x=e.x()(a.point),a.point.y=e.y()(a.point),k.data(a).position(a.pos).hidden(!1)}),e.dispatch.on("elementMouseout.tooltip",function(){k.hidden(!0)}),b.dispatch=y,b.stacked=e,b.legend=h,b.controls=i,b.xAxis=f,b.yAxis=g,b.interactiveLayer=j,b.tooltip=k,b.dispatch=y,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return m},set:function(a){m=a}},height:{get:function(){return n},set:function(a){n=a}},showLegend:{get:function(){return q},set:function(a){q=a}},showXAxis:{get:function(){return r},set:function(a){r=a}},showYAxis:{get:function(){return s},set:function(a){s=a}},defaultState:{get:function(){return w},set:function(a){w=a}},noData:{get:function(){return x},set:function(a){x=a}},showControls:{get:function(){return p},set:function(a){p=a}},controlLabels:{get:function(){return B},set:function(a){B=a}},controlOptions:{get:function(){return A},set:function(a){A=a}},tooltips:{get:function(){return k.enabled()},set:function(b){a.deprecated("tooltips","use chart.tooltip.enabled() instead"),k.enabled(!!b)}},tooltipContent:{get:function(){return k.contentGenerator()},set:function(b){a.deprecated("tooltipContent","use chart.tooltip.contentGenerator() instead"),k.contentGenerator(b)}},margin:{get:function(){return l},set:function(a){l.top=void 0!==a.top?a.top:l.top,l.right=void 0!==a.right?a.right:l.right,l.bottom=void 0!==a.bottom?a.bottom:l.bottom,l.left=void 0!==a.left?a.left:l.left}},duration:{get:function(){return C},set:function(a){C=a,F.reset(C),e.duration(C),f.duration(C),g.duration(C)}},color:{get:function(){return o},set:function(b){o=a.utils.getColor(b),h.color(o),e.color(o)}},rightAlignYAxis:{get:function(){return t},set:function(a){t=a,g.orient(t?"right":"left")}},useInteractiveGuideline:{get:function(){return u},set:function(a){u=!!a,b.interactive(!a),b.useVoronoi(!a),e.scatter.interactive(!a)}}}),a.utils.inheritOptions(b,e),a.utils.initOptions(b),b},a.models.sunburst=function(){"use strict";function b(u){return t.reset(),u.each(function(b){function t(a){a.x0=a.x,a.dx0=a.dx}function u(a){var b=d3.interpolate(p.domain(),[a.x,a.x+a.dx]),c=d3.interpolate(q.domain(),[a.y,1]),d=d3.interpolate(q.range(),[a.y?20:0,y]);return function(a,e){return e?function(){return s(a)}:function(e){return p.domain(b(e)),q.domain(c(e)).range(d(e)),s(a)}}}l=d3.select(this);var v,w=a.utils.availableWidth(g,l,f),x=a.utils.availableHeight(h,l,f),y=Math.min(w,x)/2;a.utils.initSVG(l);var z=l.selectAll(".nv-wrap.nv-sunburst").data(b),A=z.enter().append("g").attr("class","nvd3 nv-wrap nv-sunburst nv-chart-"+k),B=A.selectAll("nv-sunburst");z.attr("transform","translate("+w/2+","+x/2+")"),l.on("click",function(a,b){o.chartClick({data:a,index:b,pos:d3.event,id:k})}),q.range([0,y]),c=c||b,e=b[0],r.value(j[i]||j.count),v=B.data(r.nodes).enter().append("path").attr("d",s).style("fill",function(a){return m((a.children?a:a.parent).name)}).style("stroke","#FFF").on("click",function(a){d!==c&&c!==a&&(d=c),c=a,v.transition().duration(n).attrTween("d",u(a))}).each(t).on("dblclick",function(a){d.parent==a&&v.transition().duration(n).attrTween("d",u(e))}).each(t).on("mouseover",function(a){d3.select(this).classed("hover",!0).style("opacity",.8),o.elementMouseover({data:a,color:d3.select(this).style("fill")})}).on("mouseout",function(a){d3.select(this).classed("hover",!1).style("opacity",1),o.elementMouseout({data:a})}).on("mousemove",function(a){o.elementMousemove({data:a})})}),t.renderEnd("sunburst immediate"),b}var c,d,e,f={top:0,right:0,bottom:0,left:0},g=null,h=null,i="count",j={count:function(){return 1},size:function(a){return a.size}},k=Math.floor(1e4*Math.random()),l=null,m=a.utils.defaultColor(),n=500,o=d3.dispatch("chartClick","elementClick","elementDblClick","elementMousemove","elementMouseover","elementMouseout","renderEnd"),p=d3.scale.linear().range([0,2*Math.PI]),q=d3.scale.sqrt(),r=d3.layout.partition().sort(null).value(function(){return 1}),s=d3.svg.arc().startAngle(function(a){return Math.max(0,Math.min(2*Math.PI,p(a.x)))}).endAngle(function(a){return Math.max(0,Math.min(2*Math.PI,p(a.x+a.dx)))}).innerRadius(function(a){return Math.max(0,q(a.y))}).outerRadius(function(a){return Math.max(0,q(a.y+a.dy))}),t=a.utils.renderWatch(o);return b.dispatch=o,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{width:{get:function(){return g},set:function(a){g=a}},height:{get:function(){return h},set:function(a){h=a}},mode:{get:function(){return i},set:function(a){i=a}},id:{get:function(){return k},set:function(a){k=a}},duration:{get:function(){return n},set:function(a){n=a}},margin:{get:function(){return f},set:function(a){f.top=void 0!=a.top?a.top:f.top,f.right=void 0!=a.right?a.right:f.right,f.bottom=void 0!=a.bottom?a.bottom:f.bottom,f.left=void 0!=a.left?a.left:f.left}},color:{get:function(){return m},set:function(b){m=a.utils.getColor(b)}}}),a.utils.initOptions(b),b},a.models.sunburstChart=function(){"use strict";function b(d){return m.reset(),m.models(c),d.each(function(d){var h=d3.select(this);a.utils.initSVG(h);var i=a.utils.availableWidth(f,h,e),j=a.utils.availableHeight(g,h,e);if(b.update=function(){0===k?h.call(b):h.transition().duration(k).call(b)},b.container=this,!d||!d.length)return a.utils.noData(b,h),b;h.selectAll(".nv-noData").remove();var l=h.selectAll("g.nv-wrap.nv-sunburstChart").data(d),m=l.enter().append("g").attr("class","nvd3 nv-wrap nv-sunburstChart").append("g"),n=l.select("g");m.append("g").attr("class","nv-sunburstWrap"),l.attr("transform","translate("+e.left+","+e.top+")"),c.width(i).height(j);var o=n.select(".nv-sunburstWrap").datum(d);d3.transition(o).call(c)}),m.renderEnd("sunburstChart immediate"),b}var c=a.models.sunburst(),d=a.models.tooltip(),e={top:30,right:20,bottom:20,left:20},f=null,g=null,h=a.utils.defaultColor(),i=(Math.round(1e5*Math.random()),null),j=null,k=250,l=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState","renderEnd"),m=a.utils.renderWatch(l);return d.headerEnabled(!1).duration(0).valueFormatter(function(a){return a}),c.dispatch.on("elementMouseover.tooltip",function(a){a.series={key:a.data.name,value:a.data.size,color:a.color},d.data(a).hidden(!1)}),c.dispatch.on("elementMouseout.tooltip",function(){d.hidden(!0)}),c.dispatch.on("elementMousemove.tooltip",function(){d.position({top:d3.event.pageY,left:d3.event.pageX})()}),b.dispatch=l,b.sunburst=c,b.tooltip=d,b.options=a.utils.optionsFunc.bind(b),b._options=Object.create({},{noData:{get:function(){return j},set:function(a){j=a}},defaultState:{get:function(){return i},set:function(a){i=a}},color:{get:function(){return h},set:function(a){h=a,c.color(h)}},duration:{get:function(){return k},set:function(a){k=a,m.reset(k),c.duration(k)}},margin:{get:function(){return e},set:function(a){e.top=void 0!==a.top?a.top:e.top,e.right=void 0!==a.right?a.right:e.right,e.bottom=void 0!==a.bottom?a.bottom:e.bottom,e.left=void 0!==a.left?a.left:e.left}}}),a.utils.inheritOptions(b,c),a.utils.initOptions(b),b},a.version="1.8.1"}();
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
deleted file mode 100644
index 80a7b69..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
- * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
- *  */
-
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
deleted file mode 100644
index 4bb0e42..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
+++ /dev/null
@@ -1,11 +0,0 @@
-     <tr>
-      <td class="{{methods_level}}" colspan="4">{{name}}</td>
-      <td class="{{methods_level}} big">{{methods_bar}}</td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
-      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
-      <td class="{{methods_level}} small">{{crap}}</td>
-      <td class="{{lines_level}} big">{{lines_bar}}</td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
-      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
-     </tr>
-
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
deleted file mode 100644
index c57f744..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for nodes in the code coverage information tree.
- *
- * @since Class available since Release 1.1.0
- */
-abstract class PHP_CodeCoverage_Report_Node implements Countable
-{
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * @var array
-     */
-    protected $pathArray;
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node
-     */
-    protected $parent;
-
-    /**
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * Constructor.
-     *
-     * @param string                       $name
-     * @param PHP_CodeCoverage_Report_Node $parent
-     */
-    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = null)
-    {
-        if (substr($name, -1) == '/') {
-            $name = substr($name, 0, -1);
-        }
-
-        $this->name   = $name;
-        $this->parent = $parent;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === null) {
-            $parent = $this->getParent();
-
-            if ($parent === null) {
-                $this->id = 'index';
-            } else {
-                $parentId = $parent->getId();
-
-                if ($parentId == 'index') {
-                    $this->id = str_replace(':', '_', $this->name);
-                } else {
-                    $this->id = $parentId . '/' . $this->name;
-                }
-            }
-        }
-
-        return $this->id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPath()
-    {
-        if ($this->path === null) {
-            if ($this->parent === null || $this->parent->getPath() === null || $this->parent->getPath() === false) {
-                $this->path = $this->name;
-            } else {
-                $this->path = $this->parent->getPath() . '/' . $this->name;
-            }
-        }
-
-        return $this->path;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPathAsArray()
-    {
-        if ($this->pathArray === null) {
-            if ($this->parent === null) {
-                $this->pathArray = array();
-            } else {
-                $this->pathArray = $this->parent->getPathAsArray();
-            }
-
-            $this->pathArray[] = $this;
-        }
-
-        return $this->pathArray;
-    }
-
-    /**
-     * @return PHP_CodeCoverage_Report_Node
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Returns the percentage of classes that has been tested.
-     *
-     * @param  bool $asString
-     * @return int
-     */
-    public function getTestedClassesPercent($asString = true)
-    {
-        return PHP_CodeCoverage_Util::percent(
-            $this->getNumTestedClasses(),
-            $this->getNumClasses(),
-            $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of traits that has been tested.
-     *
-     * @param  bool $asString
-     * @return int
-     */
-    public function getTestedTraitsPercent($asString = true)
-    {
-        return PHP_CodeCoverage_Util::percent(
-            $this->getNumTestedTraits(),
-            $this->getNumTraits(),
-            $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of traits that has been tested.
-     *
-     * @param  bool $asString
-     * @return int
-     * @since  Method available since Release 1.2.0
-     */
-    public function getTestedClassesAndTraitsPercent($asString = true)
-    {
-        return PHP_CodeCoverage_Util::percent(
-            $this->getNumTestedClassesAndTraits(),
-            $this->getNumClassesAndTraits(),
-            $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of methods that has been tested.
-     *
-     * @param  bool $asString
-     * @return int
-     */
-    public function getTestedMethodsPercent($asString = true)
-    {
-        return PHP_CodeCoverage_Util::percent(
-            $this->getNumTestedMethods(),
-            $this->getNumMethods(),
-            $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of executed lines.
-     *
-     * @param  bool $asString
-     * @return int
-     */
-    public function getLineExecutedPercent($asString = true)
-    {
-        return PHP_CodeCoverage_Util::percent(
-            $this->getNumExecutedLines(),
-            $this->getNumExecutableLines(),
-            $asString
-        );
-    }
-
-    /**
-     * Returns the number of classes and traits.
-     *
-     * @return int
-     * @since  Method available since Release 1.2.0
-     */
-    public function getNumClassesAndTraits()
-    {
-        return $this->getNumClasses() + $this->getNumTraits();
-    }
-
-    /**
-     * Returns the number of tested classes and traits.
-     *
-     * @return int
-     * @since  Method available since Release 1.2.0
-     */
-    public function getNumTestedClassesAndTraits()
-    {
-        return $this->getNumTestedClasses() + $this->getNumTestedTraits();
-    }
-
-    /**
-     * Returns the classes and traits of this node.
-     *
-     * @return array
-     * @since  Method available since Release 1.2.0
-     */
-    public function getClassesAndTraits()
-    {
-        return array_merge($this->getClasses(), $this->getTraits());
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    abstract public function getClasses();
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    abstract public function getTraits();
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    abstract public function getFunctions();
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    abstract public function getLinesOfCode();
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return int
-     */
-    abstract public function getNumExecutableLines();
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return int
-     */
-    abstract public function getNumExecutedLines();
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return int
-     */
-    abstract public function getNumClasses();
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return int
-     */
-    abstract public function getNumTestedClasses();
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return int
-     */
-    abstract public function getNumTraits();
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return int
-     */
-    abstract public function getNumTestedTraits();
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return int
-     */
-    abstract public function getNumMethods();
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return int
-     */
-    abstract public function getNumTestedMethods();
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return int
-     */
-    abstract public function getNumFunctions();
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return int
-     */
-    abstract public function getNumTestedFunctions();
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
deleted file mode 100644
index dd71ecb..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a directory in the code coverage information tree.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_Directory extends PHP_CodeCoverage_Report_Node implements IteratorAggregate
-{
-    /**
-     * @var PHP_CodeCoverage_Report_Node[]
-     */
-    protected $children = array();
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node_Directory[]
-     */
-    protected $directories = array();
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node_File[]
-     */
-    protected $files = array();
-
-    /**
-     * @var array
-     */
-    protected $classes;
-
-    /**
-     * @var array
-     */
-    protected $traits;
-
-    /**
-     * @var array
-     */
-    protected $functions;
-
-    /**
-     * @var array
-     */
-    protected $linesOfCode = null;
-
-    /**
-     * @var int
-     */
-    protected $numFiles = -1;
-
-    /**
-     * @var int
-     */
-    protected $numExecutableLines = -1;
-
-    /**
-     * @var int
-     */
-    protected $numExecutedLines = -1;
-
-    /**
-     * @var int
-     */
-    protected $numClasses = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTestedClasses = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTraits = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTestedTraits = -1;
-
-    /**
-     * @var int
-     */
-    protected $numMethods = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTestedMethods = -1;
-
-    /**
-     * @var int
-     */
-    protected $numFunctions = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTestedFunctions = -1;
-
-    /**
-     * Returns the number of files in/under this node.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        if ($this->numFiles == -1) {
-            $this->numFiles = 0;
-
-            foreach ($this->children as $child) {
-                $this->numFiles += count($child);
-            }
-        }
-
-        return $this->numFiles;
-    }
-
-    /**
-     * Returns an iterator for this node.
-     *
-     * @return RecursiveIteratorIterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(
-            new PHP_CodeCoverage_Report_Node_Iterator($this),
-            RecursiveIteratorIterator::SELF_FIRST
-        );
-    }
-
-    /**
-     * Adds a new directory.
-     *
-     * @param  string                                 $name
-     * @return PHP_CodeCoverage_Report_Node_Directory
-     */
-    public function addDirectory($name)
-    {
-        $directory = new self($name, $this);
-
-        $this->children[]    = $directory;
-        $this->directories[] = &$this->children[count($this->children) - 1];
-
-        return $directory;
-    }
-
-    /**
-     * Adds a new file.
-     *
-     * @param  string                            $name
-     * @param  array                             $coverageData
-     * @param  array                             $testData
-     * @param  bool                              $cacheTokens
-     * @return PHP_CodeCoverage_Report_Node_File
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function addFile($name, array $coverageData, array $testData, $cacheTokens)
-    {
-        $file = new PHP_CodeCoverage_Report_Node_File(
-            $name,
-            $this,
-            $coverageData,
-            $testData,
-            $cacheTokens
-        );
-
-        $this->children[] = $file;
-        $this->files[]    = &$this->children[count($this->children) - 1];
-
-        $this->numExecutableLines = -1;
-        $this->numExecutedLines   = -1;
-
-        return $file;
-    }
-
-    /**
-     * Returns the directories in this directory.
-     *
-     * @return array
-     */
-    public function getDirectories()
-    {
-        return $this->directories;
-    }
-
-    /**
-     * Returns the files in this directory.
-     *
-     * @return array
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    /**
-     * Returns the child nodes of this node.
-     *
-     * @return array
-     */
-    public function getChildNodes()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    public function getClasses()
-    {
-        if ($this->classes === null) {
-            $this->classes = array();
-
-            foreach ($this->children as $child) {
-                $this->classes = array_merge(
-                    $this->classes,
-                    $child->getClasses()
-                );
-            }
-        }
-
-        return $this->classes;
-    }
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    public function getTraits()
-    {
-        if ($this->traits === null) {
-            $this->traits = array();
-
-            foreach ($this->children as $child) {
-                $this->traits = array_merge(
-                    $this->traits,
-                    $child->getTraits()
-                );
-            }
-        }
-
-        return $this->traits;
-    }
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        if ($this->functions === null) {
-            $this->functions = array();
-
-            foreach ($this->children as $child) {
-                $this->functions = array_merge(
-                    $this->functions,
-                    $child->getFunctions()
-                );
-            }
-        }
-
-        return $this->functions;
-    }
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    public function getLinesOfCode()
-    {
-        if ($this->linesOfCode === null) {
-            $this->linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
-
-            foreach ($this->children as $child) {
-                $linesOfCode = $child->getLinesOfCode();
-
-                $this->linesOfCode['loc']   += $linesOfCode['loc'];
-                $this->linesOfCode['cloc']  += $linesOfCode['cloc'];
-                $this->linesOfCode['ncloc'] += $linesOfCode['ncloc'];
-            }
-        }
-
-        return $this->linesOfCode;
-    }
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return int
-     */
-    public function getNumExecutableLines()
-    {
-        if ($this->numExecutableLines == -1) {
-            $this->numExecutableLines = 0;
-
-            foreach ($this->children as $child) {
-                $this->numExecutableLines += $child->getNumExecutableLines();
-            }
-        }
-
-        return $this->numExecutableLines;
-    }
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return int
-     */
-    public function getNumExecutedLines()
-    {
-        if ($this->numExecutedLines == -1) {
-            $this->numExecutedLines = 0;
-
-            foreach ($this->children as $child) {
-                $this->numExecutedLines += $child->getNumExecutedLines();
-            }
-        }
-
-        return $this->numExecutedLines;
-    }
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return int
-     */
-    public function getNumClasses()
-    {
-        if ($this->numClasses == -1) {
-            $this->numClasses = 0;
-
-            foreach ($this->children as $child) {
-                $this->numClasses += $child->getNumClasses();
-            }
-        }
-
-        return $this->numClasses;
-    }
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return int
-     */
-    public function getNumTestedClasses()
-    {
-        if ($this->numTestedClasses == -1) {
-            $this->numTestedClasses = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedClasses += $child->getNumTestedClasses();
-            }
-        }
-
-        return $this->numTestedClasses;
-    }
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return int
-     */
-    public function getNumTraits()
-    {
-        if ($this->numTraits == -1) {
-            $this->numTraits = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTraits += $child->getNumTraits();
-            }
-        }
-
-        return $this->numTraits;
-    }
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return int
-     */
-    public function getNumTestedTraits()
-    {
-        if ($this->numTestedTraits == -1) {
-            $this->numTestedTraits = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedTraits += $child->getNumTestedTraits();
-            }
-        }
-
-        return $this->numTestedTraits;
-    }
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return int
-     */
-    public function getNumMethods()
-    {
-        if ($this->numMethods == -1) {
-            $this->numMethods = 0;
-
-            foreach ($this->children as $child) {
-                $this->numMethods += $child->getNumMethods();
-            }
-        }
-
-        return $this->numMethods;
-    }
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return int
-     */
-    public function getNumTestedMethods()
-    {
-        if ($this->numTestedMethods == -1) {
-            $this->numTestedMethods = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedMethods += $child->getNumTestedMethods();
-            }
-        }
-
-        return $this->numTestedMethods;
-    }
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return int
-     */
-    public function getNumFunctions()
-    {
-        if ($this->numFunctions == -1) {
-            $this->numFunctions = 0;
-
-            foreach ($this->children as $child) {
-                $this->numFunctions += $child->getNumFunctions();
-            }
-        }
-
-        return $this->numFunctions;
-    }
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return int
-     */
-    public function getNumTestedFunctions()
-    {
-        if ($this->numTestedFunctions == -1) {
-            $this->numTestedFunctions = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedFunctions += $child->getNumTestedFunctions();
-            }
-        }
-
-        return $this->numTestedFunctions;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
deleted file mode 100644
index 32e43a6..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
+++ /dev/null
@@ -1,679 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a file in the code coverage information tree.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
-{
-    /**
-     * @var array
-     */
-    protected $coverageData;
-
-    /**
-     * @var array
-     */
-    protected $testData;
-
-    /**
-     * @var int
-     */
-    protected $numExecutableLines = 0;
-
-    /**
-     * @var int
-     */
-    protected $numExecutedLines = 0;
-
-    /**
-     * @var array
-     */
-    protected $classes = array();
-
-    /**
-     * @var array
-     */
-    protected $traits = array();
-
-    /**
-     * @var array
-     */
-    protected $functions = array();
-
-    /**
-     * @var array
-     */
-    protected $linesOfCode = array();
-
-    /**
-     * @var int
-     */
-    protected $numTestedTraits = 0;
-
-    /**
-     * @var int
-     */
-    protected $numTestedClasses = 0;
-
-    /**
-     * @var int
-     */
-    protected $numMethods = null;
-
-    /**
-     * @var int
-     */
-    protected $numTestedMethods = null;
-
-    /**
-     * @var int
-     */
-    protected $numTestedFunctions = null;
-
-    /**
-     * @var array
-     */
-    protected $startLines = array();
-
-    /**
-     * @var array
-     */
-    protected $endLines = array();
-
-    /**
-     * @var bool
-     */
-    protected $cacheTokens;
-
-    /**
-     * Constructor.
-     *
-     * @param  string                       $name
-     * @param  PHP_CodeCoverage_Report_Node $parent
-     * @param  array                        $coverageData
-     * @param  array                        $testData
-     * @param  bool                         $cacheTokens
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $coverageData, array $testData, $cacheTokens)
-    {
-        if (!is_bool($cacheTokens)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-                1,
-                'boolean'
-            );
-        }
-
-        parent::__construct($name, $parent);
-
-        $this->coverageData = $coverageData;
-        $this->testData     = $testData;
-        $this->cacheTokens  = $cacheTokens;
-
-        $this->calculateStatistics();
-    }
-
-    /**
-     * Returns the number of files in/under this node.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the code coverage data of this node.
-     *
-     * @return array
-     */
-    public function getCoverageData()
-    {
-        return $this->coverageData;
-    }
-
-    /**
-     * Returns the test data of this node.
-     *
-     * @return array
-     */
-    public function getTestData()
-    {
-        return $this->testData;
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    public function getClasses()
-    {
-        return $this->classes;
-    }
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    public function getTraits()
-    {
-        return $this->traits;
-    }
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return $this->functions;
-    }
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    public function getLinesOfCode()
-    {
-        return $this->linesOfCode;
-    }
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return int
-     */
-    public function getNumExecutableLines()
-    {
-        return $this->numExecutableLines;
-    }
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return int
-     */
-    public function getNumExecutedLines()
-    {
-        return $this->numExecutedLines;
-    }
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return int
-     */
-    public function getNumClasses()
-    {
-        return count($this->classes);
-    }
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return int
-     */
-    public function getNumTestedClasses()
-    {
-        return $this->numTestedClasses;
-    }
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return int
-     */
-    public function getNumTraits()
-    {
-        return count($this->traits);
-    }
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return int
-     */
-    public function getNumTestedTraits()
-    {
-        return $this->numTestedTraits;
-    }
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return int
-     */
-    public function getNumMethods()
-    {
-        if ($this->numMethods === null) {
-            $this->numMethods = 0;
-
-            foreach ($this->classes as $class) {
-                foreach ($class['methods'] as $method) {
-                    if ($method['executableLines'] > 0) {
-                        $this->numMethods++;
-                    }
-                }
-            }
-
-            foreach ($this->traits as $trait) {
-                foreach ($trait['methods'] as $method) {
-                    if ($method['executableLines'] > 0) {
-                        $this->numMethods++;
-                    }
-                }
-            }
-        }
-
-        return $this->numMethods;
-    }
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return int
-     */
-    public function getNumTestedMethods()
-    {
-        if ($this->numTestedMethods === null) {
-            $this->numTestedMethods = 0;
-
-            foreach ($this->classes as $class) {
-                foreach ($class['methods'] as $method) {
-                    if ($method['executableLines'] > 0 &&
-                        $method['coverage'] == 100) {
-                        $this->numTestedMethods++;
-                    }
-                }
-            }
-
-            foreach ($this->traits as $trait) {
-                foreach ($trait['methods'] as $method) {
-                    if ($method['executableLines'] > 0 &&
-                        $method['coverage'] == 100) {
-                        $this->numTestedMethods++;
-                    }
-                }
-            }
-        }
-
-        return $this->numTestedMethods;
-    }
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return int
-     */
-    public function getNumFunctions()
-    {
-        return count($this->functions);
-    }
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return int
-     */
-    public function getNumTestedFunctions()
-    {
-        if ($this->numTestedFunctions === null) {
-            $this->numTestedFunctions = 0;
-
-            foreach ($this->functions as $function) {
-                if ($function['executableLines'] > 0 &&
-                    $function['coverage'] == 100) {
-                    $this->numTestedFunctions++;
-                }
-            }
-        }
-
-        return $this->numTestedFunctions;
-    }
-
-    /**
-     * Calculates coverage statistics for the file.
-     */
-    protected function calculateStatistics()
-    {
-        $classStack = $functionStack = array();
-
-        if ($this->cacheTokens) {
-            $tokens = PHP_Token_Stream_CachingFactory::get($this->getPath());
-        } else {
-            $tokens = new PHP_Token_Stream($this->getPath());
-        }
-
-        $this->processClasses($tokens);
-        $this->processTraits($tokens);
-        $this->processFunctions($tokens);
-        $this->linesOfCode = $tokens->getLinesOfCode();
-        unset($tokens);
-
-        for ($lineNumber = 1; $lineNumber <= $this->linesOfCode['loc']; $lineNumber++) {
-            if (isset($this->startLines[$lineNumber])) {
-                // Start line of a class.
-                if (isset($this->startLines[$lineNumber]['className'])) {
-                    if (isset($currentClass)) {
-                        $classStack[] = &$currentClass;
-                    }
-
-                    $currentClass = &$this->startLines[$lineNumber];
-                } // Start line of a trait.
-                elseif (isset($this->startLines[$lineNumber]['traitName'])) {
-                    $currentTrait = &$this->startLines[$lineNumber];
-                } // Start line of a method.
-                elseif (isset($this->startLines[$lineNumber]['methodName'])) {
-                    $currentMethod = &$this->startLines[$lineNumber];
-                } // Start line of a function.
-                elseif (isset($this->startLines[$lineNumber]['functionName'])) {
-                    if (isset($currentFunction)) {
-                        $functionStack[] = &$currentFunction;
-                    }
-
-                    $currentFunction = &$this->startLines[$lineNumber];
-                }
-            }
-
-            if (isset($this->coverageData[$lineNumber])) {
-                if (isset($currentClass)) {
-                    $currentClass['executableLines']++;
-                }
-
-                if (isset($currentTrait)) {
-                    $currentTrait['executableLines']++;
-                }
-
-                if (isset($currentMethod)) {
-                    $currentMethod['executableLines']++;
-                }
-
-                if (isset($currentFunction)) {
-                    $currentFunction['executableLines']++;
-                }
-
-                $this->numExecutableLines++;
-
-                if (count($this->coverageData[$lineNumber]) > 0) {
-                    if (isset($currentClass)) {
-                        $currentClass['executedLines']++;
-                    }
-
-                    if (isset($currentTrait)) {
-                        $currentTrait['executedLines']++;
-                    }
-
-                    if (isset($currentMethod)) {
-                        $currentMethod['executedLines']++;
-                    }
-
-                    if (isset($currentFunction)) {
-                        $currentFunction['executedLines']++;
-                    }
-
-                    $this->numExecutedLines++;
-                }
-            }
-
-            if (isset($this->endLines[$lineNumber])) {
-                // End line of a class.
-                if (isset($this->endLines[$lineNumber]['className'])) {
-                    unset($currentClass);
-
-                    if ($classStack) {
-                        end($classStack);
-                        $key          = key($classStack);
-                        $currentClass = &$classStack[$key];
-                        unset($classStack[$key]);
-                    }
-                } // End line of a trait.
-                elseif (isset($this->endLines[$lineNumber]['traitName'])) {
-                    unset($currentTrait);
-                } // End line of a method.
-                elseif (isset($this->endLines[$lineNumber]['methodName'])) {
-                    unset($currentMethod);
-                } // End line of a function.
-                elseif (isset($this->endLines[$lineNumber]['functionName'])) {
-                    unset($currentFunction);
-
-                    if ($functionStack) {
-                        end($functionStack);
-                        $key             = key($functionStack);
-                        $currentFunction = &$functionStack[$key];
-                        unset($functionStack[$key]);
-                    }
-                }
-            }
-        }
-
-        foreach ($this->traits as &$trait) {
-            foreach ($trait['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                            $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
-
-                $method['crap'] = $this->crap(
-                    $method['ccn'],
-                    $method['coverage']
-                );
-
-                $trait['ccn'] += $method['ccn'];
-            }
-
-            if ($trait['executableLines'] > 0) {
-                $trait['coverage'] = ($trait['executedLines'] /
-                        $trait['executableLines']) * 100;
-            } else {
-                $trait['coverage'] = 100;
-            }
-
-            if ($trait['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
-            $trait['crap'] = $this->crap(
-                $trait['ccn'],
-                $trait['coverage']
-            );
-        }
-
-        foreach ($this->classes as &$class) {
-            foreach ($class['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                            $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
-
-                $method['crap'] = $this->crap(
-                    $method['ccn'],
-                    $method['coverage']
-                );
-
-                $class['ccn'] += $method['ccn'];
-            }
-
-            if ($class['executableLines'] > 0) {
-                $class['coverage'] = ($class['executedLines'] /
-                        $class['executableLines']) * 100;
-            } else {
-                $class['coverage'] = 100;
-            }
-
-            if ($class['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
-            $class['crap'] = $this->crap(
-                $class['ccn'],
-                $class['coverage']
-            );
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processClasses(PHP_Token_Stream $tokens)
-    {
-        $classes = $tokens->getClasses();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($classes as $className => $class) {
-            $this->classes[$className] = array(
-                'className'       => $className,
-                'methods'         => array(),
-                'startLine'       => $class['startLine'],
-                'executableLines' => 0,
-                'executedLines'   => 0,
-                'ccn'             => 0,
-                'coverage'        => 0,
-                'crap'            => 0,
-                'package'         => $class['package'],
-                'link'            => $link . $class['startLine']
-            );
-
-            $this->startLines[$class['startLine']] = &$this->classes[$className];
-            $this->endLines[$class['endLine']]     = &$this->classes[$className];
-
-            foreach ($class['methods'] as $methodName => $method) {
-                $this->classes[$className]['methods'][$methodName] = array(
-                    'methodName'      => $methodName,
-                    'signature'       => $method['signature'],
-                    'startLine'       => $method['startLine'],
-                    'endLine'         => $method['endLine'],
-                    'executableLines' => 0,
-                    'executedLines'   => 0,
-                    'ccn'             => $method['ccn'],
-                    'coverage'        => 0,
-                    'crap'            => 0,
-                    'link'            => $link . $method['startLine']
-                );
-
-                $this->startLines[$method['startLine']] = &$this->classes[$className]['methods'][$methodName];
-                $this->endLines[$method['endLine']]     = &$this->classes[$className]['methods'][$methodName];
-            }
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processTraits(PHP_Token_Stream $tokens)
-    {
-        $traits = $tokens->getTraits();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($traits as $traitName => $trait) {
-            $this->traits[$traitName] = array(
-                'traitName'       => $traitName,
-                'methods'         => array(),
-                'startLine'       => $trait['startLine'],
-                'executableLines' => 0,
-                'executedLines'   => 0,
-                'ccn'             => 0,
-                'coverage'        => 0,
-                'crap'            => 0,
-                'package'         => $trait['package'],
-                'link'            => $link . $trait['startLine']
-            );
-
-            $this->startLines[$trait['startLine']] = &$this->traits[$traitName];
-            $this->endLines[$trait['endLine']]     = &$this->traits[$traitName];
-
-            foreach ($trait['methods'] as $methodName => $method) {
-                $this->traits[$traitName]['methods'][$methodName] = array(
-                    'methodName'      => $methodName,
-                    'signature'       => $method['signature'],
-                    'startLine'       => $method['startLine'],
-                    'endLine'         => $method['endLine'],
-                    'executableLines' => 0,
-                    'executedLines'   => 0,
-                    'ccn'             => $method['ccn'],
-                    'coverage'        => 0,
-                    'crap'            => 0,
-                    'link'            => $link . $method['startLine']
-                );
-
-                $this->startLines[$method['startLine']] = &$this->traits[$traitName]['methods'][$methodName];
-                $this->endLines[$method['endLine']]     = &$this->traits[$traitName]['methods'][$methodName];
-            }
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processFunctions(PHP_Token_Stream $tokens)
-    {
-        $functions = $tokens->getFunctions();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($functions as $functionName => $function) {
-            $this->functions[$functionName] = array(
-                'functionName'    => $functionName,
-                'signature'       => $function['signature'],
-                'startLine'       => $function['startLine'],
-                'executableLines' => 0,
-                'executedLines'   => 0,
-                'ccn'             => $function['ccn'],
-                'coverage'        => 0,
-                'crap'            => 0,
-                'link'            => $link . $function['startLine']
-            );
-
-            $this->startLines[$function['startLine']] = &$this->functions[$functionName];
-            $this->endLines[$function['endLine']]     = &$this->functions[$functionName];
-        }
-    }
-
-    /**
-     * Calculates the Change Risk Anti-Patterns (CRAP) index for a unit of code
-     * based on its cyclomatic complexity and percentage of code coverage.
-     *
-     * @param  int    $ccn
-     * @param  float  $coverage
-     * @return string
-     * @since  Method available since Release 1.2.0
-     */
-    protected function crap($ccn, $coverage)
-    {
-        if ($coverage == 0) {
-            return (string) (pow($ccn, 2) + $ccn);
-        }
-
-        if ($coverage >= 95) {
-            return (string) $ccn;
-        }
-
-        return sprintf(
-            '%01.2F',
-            pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
deleted file mode 100644
index f468b6b..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Recursive iterator for PHP_CodeCoverage_Report_Node object graphs.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_Iterator implements RecursiveIterator
-{
-    /**
-     * @var int
-     */
-    protected $position;
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node[]
-     */
-    protected $nodes;
-
-    /**
-     * Constructor.
-     *
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     */
-    public function __construct(PHP_CodeCoverage_Report_Node_Directory $node)
-    {
-        $this->nodes = $node->getChildNodes();
-    }
-
-    /**
-     * Rewinds the Iterator to the first element.
-     */
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * Checks if there is a current element after calls to rewind() or next().
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return $this->position < count($this->nodes);
-    }
-
-    /**
-     * Returns the key of the current element.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Returns the current element.
-     *
-     * @return PHPUnit_Framework_Test
-     */
-    public function current()
-    {
-        return $this->valid() ? $this->nodes[$this->position] : null;
-    }
-
-    /**
-     * Moves forward to next element.
-     */
-    public function next()
-    {
-        $this->position++;
-    }
-
-    /**
-     * Returns the sub iterator for the current element.
-     *
-     * @return PHP_CodeCoverage_Report_Node_Iterator
-     */
-    public function getChildren()
-    {
-        return new self(
-            $this->nodes[$this->position]
-        );
-    }
-
-    /**
-     * Checks whether the current element has children.
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->nodes[$this->position] instanceof PHP_CodeCoverage_Report_Node_Directory;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
deleted file mode 100644
index f4e5a0f..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Uses var_export() to write a PHP_CodeCoverage object to a file.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_PHP
-{
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $target = null)
-    {
-        $filter = $coverage->filter();
-
-        $output = sprintf(
-            '<?php
-$coverage = new PHP_CodeCoverage;
-$coverage->setData(%s);
-$coverage->setTests(%s);
-
-$filter = $coverage->filter();
-$filter->setBlacklistedFiles(%s);
-$filter->setWhitelistedFiles(%s);
-
-return $coverage;',
-            var_export($coverage->getData(true), 1),
-            var_export($coverage->getTests(), 1),
-            var_export($filter->getBlacklistedFiles(), 1),
-            var_export($filter->getWhitelistedFiles(), 1)
-        );
-
-        if ($target !== null) {
-            return file_put_contents($target, $output);
-        } else {
-            return $output;
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
deleted file mode 100644
index 7dc2545..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Generates human readable output from an PHP_CodeCoverage object.
- *
- * The output gets put into a text file our written to the CLI.
- *
- * @since Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Text
-{
-    protected $lowUpperBound;
-    protected $highLowerBound;
-    protected $showUncoveredFiles;
-    protected $showOnlySummary;
-
-    protected $colors = array(
-        'green'  => "\x1b[30;42m",
-        'yellow' => "\x1b[30;43m",
-        'red'    => "\x1b[37;41m",
-        'header' => "\x1b[1;37;40m",
-        'reset'  => "\x1b[0m",
-        'eol'    => "\x1b[2K",
-    );
-
-    public function __construct($lowUpperBound, $highLowerBound, $showUncoveredFiles, $showOnlySummary)
-    {
-        $this->lowUpperBound      = $lowUpperBound;
-        $this->highLowerBound     = $highLowerBound;
-        $this->showUncoveredFiles = $showUncoveredFiles;
-        $this->showOnlySummary    = $showOnlySummary;
-    }
-
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  bool             $showColors
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $showColors = false)
-    {
-        $output = PHP_EOL . PHP_EOL;
-        $report = $coverage->getReport();
-        unset($coverage);
-
-        $colors = array(
-            'header'  => '',
-            'classes' => '',
-            'methods' => '',
-            'lines'   => '',
-            'reset'   => '',
-            'eol'     => ''
-        );
-
-        if ($showColors) {
-            $colors['classes'] = $this->getCoverageColor(
-                $report->getNumTestedClassesAndTraits(),
-                $report->getNumClassesAndTraits()
-            );
-            $colors['methods'] = $this->getCoverageColor(
-                $report->getNumTestedMethods(),
-                $report->getNumMethods()
-            );
-            $colors['lines']   = $this->getCoverageColor(
-                $report->getNumExecutedLines(),
-                $report->getNumExecutableLines()
-            );
-            $colors['reset']   = $this->colors['reset'];
-            $colors['header']  = $this->colors['header'];
-            $colors['eol']     = $this->colors['eol'];
-        }
-
-        $classes = sprintf(
-            '  Classes: %6s (%d/%d)',
-            PHP_CodeCoverage_Util::percent(
-                $report->getNumTestedClassesAndTraits(),
-                $report->getNumClassesAndTraits(),
-                true
-            ),
-            $report->getNumTestedClassesAndTraits(),
-            $report->getNumClassesAndTraits()
-        );
-
-        $methods = sprintf(
-            '  Methods: %6s (%d/%d)',
-            PHP_CodeCoverage_Util::percent(
-                $report->getNumTestedMethods(),
-                $report->getNumMethods(),
-                true
-            ),
-            $report->getNumTestedMethods(),
-            $report->getNumMethods()
-        );
-
-        $lines = sprintf(
-            '  Lines:   %6s (%d/%d)',
-            PHP_CodeCoverage_Util::percent(
-                $report->getNumExecutedLines(),
-                $report->getNumExecutableLines(),
-                true
-            ),
-            $report->getNumExecutedLines(),
-            $report->getNumExecutableLines()
-        );
-
-        $padding = max(array_map('strlen', array($classes, $methods, $lines)));
-
-        if ($this->showOnlySummary) {
-            $title   = 'Code Coverage Report Summary:';
-            $padding = max($padding, strlen($title));
-
-            $output .= $this->format($colors['header'], $padding, $title);
-        } else {
-            $date  = date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']);
-            $title = 'Code Coverage Report:';
-
-            $output .= $this->format($colors['header'], $padding, $title);
-            $output .= $this->format($colors['header'], $padding, $date);
-            $output .= $this->format($colors['header'], $padding, '');
-            $output .= $this->format($colors['header'], $padding, ' Summary:');
-        }
-
-        $output .= $this->format($colors['classes'], $padding, $classes);
-        $output .= $this->format($colors['methods'], $padding, $methods);
-        $output .= $this->format($colors['lines'], $padding, $lines);
-
-        if ($this->showOnlySummary) {
-            return $output . PHP_EOL;
-        }
-
-        $classCoverage = array();
-
-        foreach ($report as $item) {
-            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
-                continue;
-            }
-
-            $classes  = $item->getClassesAndTraits();
-
-            foreach ($classes as $className => $class) {
-                $classStatements        = 0;
-                $coveredClassStatements = 0;
-                $coveredMethods         = 0;
-                $classMethods           = 0;
-
-                foreach ($class['methods'] as $method) {
-                    if ($method['executableLines'] == 0) {
-                        continue;
-                    }
-
-                    $classMethods++;
-                    $classStatements        += $method['executableLines'];
-                    $coveredClassStatements += $method['executedLines'];
-                    if ($method['coverage'] == 100) {
-                        $coveredMethods++;
-                    }
-                }
-
-                if (!empty($class['package']['namespace'])) {
-                    $namespace = '\\' . $class['package']['namespace'] . '::';
-                } elseif (!empty($class['package']['fullPackage'])) {
-                    $namespace = '@' . $class['package']['fullPackage'] . '::';
-                } else {
-                    $namespace = '';
-                }
-
-                $classCoverage[$namespace . $className] = array(
-                    'namespace'         => $namespace,
-                    'className '        => $className,
-                    'methodsCovered'    => $coveredMethods,
-                    'methodCount'       => $classMethods,
-                    'statementsCovered' => $coveredClassStatements,
-                    'statementCount'    => $classStatements,
-                );
-            }
-        }
-
-        ksort($classCoverage);
-
-        $methodColor = '';
-        $linesColor  = '';
-        $resetColor  = '';
-
-        foreach ($classCoverage as $fullQualifiedPath => $classInfo) {
-            if ($classInfo['statementsCovered'] != 0 ||
-                $this->showUncoveredFiles) {
-                if ($showColors) {
-                    $methodColor = $this->getCoverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
-                    $linesColor  = $this->getCoverageColor($classInfo['statementsCovered'], $classInfo['statementCount']);
-                    $resetColor  = $colors['reset'];
-                }
-
-                $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
-                    . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
-                    . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
-                ;
-            }
-        }
-
-        return $output . PHP_EOL;
-    }
-
-    protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
-    {
-        $coverage = PHP_CodeCoverage_Util::percent(
-            $numberOfCoveredElements,
-            $totalNumberOfElements
-        );
-
-        if ($coverage >= $this->highLowerBound) {
-            return $this->colors['green'];
-        } elseif ($coverage > $this->lowUpperBound) {
-            return $this->colors['yellow'];
-        }
-
-        return $this->colors['red'];
-    }
-
-    protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $presicion)
-    {
-        $format = '%' . $presicion . 's';
-
-        return PHP_CodeCoverage_Util::percent(
-            $numberOfCoveredElements,
-            $totalNumberOfElements,
-            true,
-            true
-        ) .
-        ' (' . sprintf($format, $numberOfCoveredElements) . '/' .
-        sprintf($format, $totalNumberOfElements) . ')';
-    }
-
-    private function format($color, $padding, $string)
-    {
-        $reset = $color ? $this->colors['reset'] : '';
-
-        return $color . str_pad($string, $padding) . $reset . PHP_EOL;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
deleted file mode 100644
index 5177b2b..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML
-{
-    /**
-     * @var string
-     */
-    private $target;
-
-    /**
-     * @var PHP_CodeCoverage_Report_XML_Project
-     */
-    private $project;
-
-    public function process(PHP_CodeCoverage $coverage, $target)
-    {
-        if (substr($target, -1, 1) != DIRECTORY_SEPARATOR) {
-            $target .= DIRECTORY_SEPARATOR;
-        }
-
-        $this->target = $target;
-        $this->initTargetDirectory($target);
-
-        $report = $coverage->getReport();
-
-        $this->project = new PHP_CodeCoverage_Report_XML_Project(
-            $coverage->getReport()->getName()
-        );
-
-        $this->processTests($coverage->getTests());
-        $this->processDirectory($report, $this->project);
-
-        $index                     = $this->project->asDom();
-        $index->formatOutput       = true;
-        $index->preserveWhiteSpace = false;
-        $index->save($target . '/index.xml');
-    }
-
-    private function initTargetDirectory($dir)
-    {
-        if (file_exists($dir)) {
-            if (!is_dir($dir)) {
-                throw new PHP_CodeCoverage_Exception(
-                    "'$dir' exists but is not a directory."
-                );
-            }
-
-            if (!is_writable($dir)) {
-                throw new PHP_CodeCoverage_Exception(
-                    "'$dir' exists but is not writable."
-                );
-            }
-        } elseif (!@mkdir($dir, 0777, true)) {
-            throw new PHP_CodeCoverage_Exception(
-                "'$dir' could not be created."
-            );
-        }
-    }
-
-    private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $directory, PHP_CodeCoverage_Report_XML_Node $context)
-    {
-        $dirObject = $context->addDirectory($directory->getName());
-
-        $this->setTotals($directory, $dirObject->getTotals());
-
-        foreach ($directory as $node) {
-            if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                $this->processDirectory($node, $dirObject);
-                continue;
-            }
-
-            if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
-                $this->processFile($node, $dirObject);
-                continue;
-            }
-
-            throw new PHP_CodeCoverage_Exception(
-                'Unknown node type for XML report'
-            );
-        }
-    }
-
-    private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCoverage_Report_XML_Directory $context)
-    {
-        $fileObject = $context->addFile(
-            $file->getName(),
-            $file->getId() . '.xml'
-        );
-
-        $this->setTotals($file, $fileObject->getTotals());
-
-        $fileReport = new PHP_CodeCoverage_Report_XML_File_Report(
-            $file->getName()
-        );
-
-        $this->setTotals($file, $fileReport->getTotals());
-
-        foreach ($file->getClassesAndTraits() as $unit) {
-            $this->processUnit($unit, $fileReport);
-        }
-
-        foreach ($file->getFunctions() as $function) {
-            $this->processFunction($function, $fileReport);
-        }
-
-        foreach ($file->getCoverageData() as $line => $tests) {
-            if (!is_array($tests) || count($tests) == 0) {
-                continue;
-            }
-
-            $coverage = $fileReport->getLineCoverage($line);
-
-            foreach ($tests as $test) {
-                $coverage->addTest($test);
-            }
-
-            $coverage->finalize();
-        }
-
-        $this->initTargetDirectory(
-            $this->target . dirname($file->getId()) . '/'
-        );
-
-        $fileDom                     = $fileReport->asDom();
-        $fileDom->formatOutput       = true;
-        $fileDom->preserveWhiteSpace = false;
-        $fileDom->save($this->target . $file->getId() . '.xml');
-    }
-
-    private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $report)
-    {
-        if (isset($unit['className'])) {
-            $unitObject = $report->getClassObject($unit['className']);
-        } else {
-            $unitObject = $report->getTraitObject($unit['traitName']);
-        }
-
-        $unitObject->setLines(
-            $unit['startLine'],
-            $unit['executableLines'],
-            $unit['executedLines']
-        );
-
-        $unitObject->setCrap($unit['crap']);
-
-        $unitObject->setPackage(
-            $unit['package']['fullPackage'],
-            $unit['package']['package'],
-            $unit['package']['subpackage'],
-            $unit['package']['category']
-        );
-
-        $unitObject->setNamespace($unit['package']['namespace']);
-
-        foreach ($unit['methods'] as $method) {
-            $methodObject = $unitObject->addMethod($method['methodName']);
-            $methodObject->setSignature($method['signature']);
-            $methodObject->setLines($method['startLine'], $method['endLine']);
-            $methodObject->setCrap($method['crap']);
-            $methodObject->setTotals(
-                $method['executableLines'],
-                $method['executedLines'],
-                $method['coverage']
-            );
-        }
-    }
-
-    private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Report $report)
-    {
-        $functionObject = $report->getFunctionObject($function['functionName']);
-
-        $functionObject->setSignature($function['signature']);
-        $functionObject->setLines($function['startLine']);
-        $functionObject->setCrap($function['crap']);
-        $functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage']);
-    }
-
-    private function processTests(array $tests)
-    {
-        $testsObject = $this->project->getTests();
-
-        foreach ($tests as $test => $result) {
-            if ($test == 'UNCOVERED_FILES_FROM_WHITELIST') {
-                continue;
-            }
-
-            $testsObject->addTest($test, $result);
-        }
-    }
-
-    private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_Report_XML_Totals $totals)
-    {
-        $loc = $node->getLinesOfCode();
-
-        $totals->setNumLines(
-            $loc['loc'],
-            $loc['cloc'],
-            $loc['ncloc'],
-            $node->getNumExecutableLines(),
-            $node->getNumExecutedLines()
-        );
-
-        $totals->setNumClasses(
-            $node->getNumClasses(),
-            $node->getNumTestedClasses()
-        );
-
-        $totals->setNumTraits(
-            $node->getNumTraits(),
-            $node->getNumTestedTraits()
-        );
-
-        $totals->setNumMethods(
-            $node->getNumMethods(),
-            $node->getNumTestedMethods()
-        );
-
-        $totals->setNumFunctions(
-            $node->getNumFunctions(),
-            $node->getNumTestedFunctions()
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
deleted file mode 100644
index 8e292b5..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_Directory extends PHP_CodeCoverage_Report_XML_Node
-{
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
deleted file mode 100644
index 3c72bab..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_File
-{
-    /**
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * @var DOMElement
-     */
-    protected $contextNode;
-
-    public function __construct(DOMElement $context)
-    {
-        $this->dom         = $context->ownerDocument;
-        $this->contextNode = $context;
-    }
-
-    public function getTotals()
-    {
-        $totalsContainer = $this->contextNode->firstChild;
-
-        if (!$totalsContainer) {
-            $totalsContainer = $this->contextNode->appendChild(
-                $this->dom->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'totals'
-                )
-            );
-        }
-
-        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
-    }
-
-    public function getLineCoverage($line)
-    {
-        $coverage = $this->contextNode->getElementsByTagNameNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'coverage'
-        )->item(0);
-
-        if (!$coverage) {
-            $coverage = $this->contextNode->appendChild(
-                $this->dom->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'coverage'
-                )
-            );
-        }
-
-        $lineNode = $coverage->appendChild(
-            $this->dom->createElementNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                'line'
-            )
-        );
-
-        return new PHP_CodeCoverage_Report_XML_File_Coverage($lineNode, $line);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
deleted file mode 100644
index 29a4e2b..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_File_Coverage
-{
-    /**
-     * @var XMLWriter
-     */
-    private $writer;
-
-    /**
-     * @var DOMElement
-     */
-    private $contextNode;
-
-    /**
-     * @var bool
-     */
-    private $finalized = false;
-
-    public function __construct(DOMElement $context, $line)
-    {
-        $this->contextNode = $context;
-
-        $this->writer = new XMLWriter();
-        $this->writer->openMemory();
-        $this->writer->startElementNs(null, $context->nodeName, 'http://schema.phpunit.de/coverage/1.0');
-        $this->writer->writeAttribute('nr', $line);
-    }
-
-    public function addTest($test)
-    {
-        if ($this->finalized) {
-            throw new PHP_CodeCoverage_Exception('Coverage Report already finalized');
-        }
-
-        $this->writer->startElement('covered');
-        $this->writer->writeAttribute('by', $test);
-        $this->writer->endElement();
-    }
-
-    public function finalize()
-    {
-        $this->writer->endElement();
-
-        $fragment = $this->contextNode->ownerDocument->createDocumentFragment();
-        $fragment->appendXML($this->writer->outputMemory());
-
-        $this->contextNode->parentNode->replaceChild(
-            $fragment,
-            $this->contextNode
-        );
-
-        $this->finalized = true;
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
deleted file mode 100644
index 917628f..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_File_Method
-{
-    /**
-     * @var DOMElement
-     */
-    private $contextNode;
-
-    public function __construct(DOMElement $context, $name)
-    {
-        $this->contextNode = $context;
-
-        $this->setName($name);
-    }
-
-    private function setName($name)
-    {
-        $this->contextNode->setAttribute('name', $name);
-    }
-
-    public function setSignature($signature)
-    {
-        $this->contextNode->setAttribute('signature', $signature);
-    }
-
-    public function setLines($start, $end = null)
-    {
-        $this->contextNode->setAttribute('start', $start);
-
-        if ($end !== null) {
-            $this->contextNode->setAttribute('end', $end);
-        }
-    }
-
-    public function setTotals($executable, $executed, $coverage)
-    {
-        $this->contextNode->setAttribute('executable', $executable);
-        $this->contextNode->setAttribute('executed', $executed);
-        $this->contextNode->setAttribute('coverage', $coverage);
-    }
-
-    public function setCrap($crap)
-    {
-        $this->contextNode->setAttribute('crap', $crap);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
deleted file mode 100644
index a6fe7ec..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_File_Report extends PHP_CodeCoverage_Report_XML_File
-{
-    public function __construct($name)
-    {
-        $this->dom = new DOMDocument;
-        $this->dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
-
-        $this->contextNode = $this->dom->getElementsByTagNameNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'file'
-        )->item(0);
-
-        $this->setName($name);
-    }
-
-    private function setName($name)
-    {
-        $this->contextNode->setAttribute('name', $name);
-    }
-
-    public function asDom()
-    {
-        return $this->dom;
-    }
-
-    public function getFunctionObject($name)
-    {
-        $node = $this->contextNode->appendChild(
-            $this->dom->createElementNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                'function'
-            )
-        );
-
-        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
-    }
-
-    public function getClassObject($name)
-    {
-        return $this->getUnitObject('class', $name);
-    }
-
-    public function getTraitObject($name)
-    {
-        return $this->getUnitObject('trait', $name);
-    }
-
-    private function getUnitObject($tagName, $name)
-    {
-        $node = $this->contextNode->appendChild(
-            $this->dom->createElementNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                $tagName
-            )
-        );
-
-        return new PHP_CodeCoverage_Report_XML_File_Unit($node, $name);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
deleted file mode 100644
index 769d9da..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_File_Unit
-{
-    /**
-     * @var DOMElement
-     */
-    private $contextNode;
-
-    public function __construct(DOMElement $context, $name)
-    {
-        $this->contextNode = $context;
-
-        $this->setName($name);
-    }
-
-    private function setName($name)
-    {
-        $this->contextNode->setAttribute('name', $name);
-    }
-
-    public function setLines($start, $executable, $executed)
-    {
-        $this->contextNode->setAttribute('start', $start);
-        $this->contextNode->setAttribute('executable', $executable);
-        $this->contextNode->setAttribute('executed', $executed);
-    }
-
-    public function setCrap($crap)
-    {
-        $this->contextNode->setAttribute('crap', $crap);
-    }
-
-    public function setPackage($full, $package, $sub, $category)
-    {
-        $node = $this->contextNode->getElementsByTagNameNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'package'
-        )->item(0);
-
-        if (!$node) {
-            $node = $this->contextNode->appendChild(
-                $this->contextNode->ownerDocument->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'package'
-                )
-            );
-        }
-
-        $node->setAttribute('full', $full);
-        $node->setAttribute('name', $package);
-        $node->setAttribute('sub', $sub);
-        $node->setAttribute('category', $category);
-    }
-
-    public function setNamespace($namespace)
-    {
-        $node = $this->contextNode->getElementsByTagNameNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'namespace'
-        )->item(0);
-
-        if (!$node) {
-            $node = $this->contextNode->appendChild(
-                $this->contextNode->ownerDocument->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'namespace'
-                )
-            );
-        }
-
-        $node->setAttribute('name', $namespace);
-    }
-
-    public function addMethod($name)
-    {
-        $node = $this->contextNode->appendChild(
-            $this->contextNode->ownerDocument->createElementNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                'method'
-            )
-        );
-
-        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
deleted file mode 100644
index 43dda57..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_Node
-{
-    /**
-     * @var DOMDocument
-     */
-    private $dom;
-
-    /**
-     * @var DOMElement
-     */
-    private $contextNode;
-
-    public function __construct(DOMElement $context)
-    {
-        $this->setContextNode($context);
-    }
-
-    protected function setContextNode(DOMElement $context)
-    {
-        $this->dom         = $context->ownerDocument;
-        $this->contextNode = $context;
-    }
-
-    public function getDom()
-    {
-        return $this->dom;
-    }
-
-    protected function getContextNode()
-    {
-        return $this->contextNode;
-    }
-
-    public function getTotals()
-    {
-        $totalsContainer = $this->getContextNode()->firstChild;
-
-        if (!$totalsContainer) {
-            $totalsContainer = $this->getContextNode()->appendChild(
-                $this->dom->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'totals'
-                )
-            );
-        }
-
-        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
-    }
-
-    public function addDirectory($name)
-    {
-        $dirNode = $this->getDom()->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'directory'
-        );
-
-        $dirNode->setAttribute('name', $name);
-        $this->getContextNode()->appendChild($dirNode);
-
-        return new PHP_CodeCoverage_Report_XML_Directory($dirNode);
-    }
-
-    public function addFile($name, $href)
-    {
-        $fileNode = $this->getDom()->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'file'
-        );
-
-        $fileNode->setAttribute('name', $name);
-        $fileNode->setAttribute('href', $href);
-        $this->getContextNode()->appendChild($fileNode);
-
-        return new PHP_CodeCoverage_Report_XML_File($fileNode);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
deleted file mode 100644
index b8dae04..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_Project extends PHP_CodeCoverage_Report_XML_Node
-{
-    public function __construct($name)
-    {
-        $this->init();
-        $this->setProjectName($name);
-    }
-
-    private function init()
-    {
-        $dom = new DOMDocument;
-        $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><project/></phpunit>');
-
-        $this->setContextNode(
-            $dom->getElementsByTagNameNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                'project'
-            )->item(0)
-        );
-    }
-
-    private function setProjectName($name)
-    {
-        $this->getContextNode()->setAttribute('name', $name);
-    }
-
-    public function getTests()
-    {
-        $testsNode = $this->getContextNode()->getElementsByTagNameNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'tests'
-        )->item(0);
-
-        if (!$testsNode) {
-            $testsNode = $this->getContextNode()->appendChild(
-                $this->getDom()->createElementNS(
-                    'http://schema.phpunit.de/coverage/1.0',
-                    'tests'
-                )
-            );
-        }
-
-        return new PHP_CodeCoverage_Report_XML_Tests($testsNode);
-    }
-
-    public function asDom()
-    {
-        return $this->getDom();
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
deleted file mode 100644
index 4621467..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_Tests
-{
-    private $contextNode;
-
-    private $codeMap = array(
-        0 => 'PASSED',     // PHPUnit_Runner_BaseTestRunner::STATUS_PASSED
-        1 => 'SKIPPED',    // PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
-        2 => 'INCOMPLETE', // PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE
-        3 => 'FAILURE',    // PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE
-        4 => 'ERROR',      // PHPUnit_Runner_BaseTestRunner::STATUS_ERROR
-        5 => 'RISKY'       // PHPUnit_Runner_BaseTestRunner::STATUS_RISKY
-    );
-
-    public function __construct(DOMElement $context)
-    {
-        $this->contextNode = $context;
-    }
-
-    public function addTest($test, array $result)
-    {
-        $node = $this->contextNode->appendChild(
-            $this->contextNode->ownerDocument->createElementNS(
-                'http://schema.phpunit.de/coverage/1.0',
-                'test'
-            )
-        );
-        $node->setAttribute('name', $test);
-        $node->setAttribute('size', $result['size']);
-        $node->setAttribute('result', (int) $result['status']);
-        $node->setAttribute('status', $this->codeMap[(int) $result['status']]);
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
deleted file mode 100644
index d6073d9..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.0
- */
-class PHP_CodeCoverage_Report_XML_Totals
-{
-    /**
-     * @var DOMNode
-     */
-    private $container;
-
-    /**
-     * @var DOMElement
-     */
-    private $linesNode;
-
-    /**
-     * @var DOMElement
-     */
-    private $methodsNode;
-
-    /**
-     * @var DOMElement
-     */
-    private $functionsNode;
-
-    /**
-     * @var DOMElement
-     */
-    private $classesNode;
-
-    /**
-     * @var DOMElement
-     */
-    private $traitsNode;
-
-    public function __construct(DOMElement $container)
-    {
-        $this->container = $container;
-        $dom             = $container->ownerDocument;
-
-        $this->linesNode = $dom->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'lines'
-        );
-
-        $this->methodsNode = $dom->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'methods'
-        );
-
-        $this->functionsNode = $dom->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'functions'
-        );
-
-        $this->classesNode = $dom->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'classes'
-        );
-
-        $this->traitsNode = $dom->createElementNS(
-            'http://schema.phpunit.de/coverage/1.0',
-            'traits'
-        );
-
-        $container->appendChild($this->linesNode);
-        $container->appendChild($this->methodsNode);
-        $container->appendChild($this->functionsNode);
-        $container->appendChild($this->classesNode);
-        $container->appendChild($this->traitsNode);
-    }
-
-    public function getContainer()
-    {
-        return $this->container;
-    }
-
-    public function setNumLines($loc, $cloc, $ncloc, $executable, $executed)
-    {
-        $this->linesNode->setAttribute('total', $loc);
-        $this->linesNode->setAttribute('comments', $cloc);
-        $this->linesNode->setAttribute('code', $ncloc);
-        $this->linesNode->setAttribute('executable', $executable);
-        $this->linesNode->setAttribute('executed', $executed);
-        $this->linesNode->setAttribute(
-            'percent',
-            PHP_CodeCoverage_Util::percent($executed, $executable, true)
-        );
-    }
-
-    public function setNumClasses($count, $tested)
-    {
-        $this->classesNode->setAttribute('count', $count);
-        $this->classesNode->setAttribute('tested', $tested);
-        $this->classesNode->setAttribute(
-            'percent',
-            PHP_CodeCoverage_Util::percent($tested, $count, true)
-        );
-    }
-
-    public function setNumTraits($count, $tested)
-    {
-        $this->traitsNode->setAttribute('count', $count);
-        $this->traitsNode->setAttribute('tested', $tested);
-        $this->traitsNode->setAttribute(
-            'percent',
-            PHP_CodeCoverage_Util::percent($tested, $count, true)
-        );
-    }
-
-    public function setNumMethods($count, $tested)
-    {
-        $this->methodsNode->setAttribute('count', $count);
-        $this->methodsNode->setAttribute('tested', $tested);
-        $this->methodsNode->setAttribute(
-            'percent',
-            PHP_CodeCoverage_Util::percent($tested, $count, true)
-        );
-    }
-
-    public function setNumFunctions($count, $tested)
-    {
-        $this->functionsNode->setAttribute('count', $count);
-        $this->functionsNode->setAttribute('tested', $tested);
-        $this->functionsNode->setAttribute(
-            'percent',
-            PHP_CodeCoverage_Util::percent($tested, $count, true)
-        );
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
deleted file mode 100644
index eadb3c9..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility methods.
- *
- * @since Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_Util
-{
-    /**
-     * @param  float $a
-     * @param  float $b
-     * @return float ($a / $b) * 100
-     */
-    public static function percent($a, $b, $asString = false, $fixedWidth = false)
-    {
-        if ($asString && $b == 0) {
-            return '';
-        }
-
-        if ($b > 0) {
-            $percent = ($a / $b) * 100;
-        } else {
-            $percent = 100;
-        }
-
-        if ($asString) {
-            if ($fixedWidth) {
-                return sprintf('%6.2F%%', $percent);
-            }
-
-            return sprintf('%01.2F%%', $percent);
-        } else {
-            return $percent;
-        }
-    }
-}
diff --git a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php b/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
deleted file mode 100644
index d66e499..0000000
--- a/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_CodeCoverage package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Factory for PHP_CodeCoverage_Exception objects that are used to describe
- * invalid arguments passed to a function or method.
- *
- * @since Class available since Release 1.2.0
- */
-class PHP_CodeCoverage_Util_InvalidArgumentHelper
-{
-    /**
-     * @param int    $argument
-     * @param string $type
-     * @param mixed  $value
-     */
-    public static function factory($argument, $type, $value = null)
-    {
-        $stack = debug_backtrace(false);
-
-        return new PHP_CodeCoverage_Exception(
-            sprintf(
-                'Argument #%d%sof %s::%s() must be a %s',
-                $argument,
-                $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
-                $stack[1]['class'],
-                $stack[1]['function'],
-                $type
-            )
-        );
-    }
-}
diff --git a/vendor/phpunit/php-file-iterator/.gitattributes b/vendor/phpunit/php-file-iterator/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/php-file-iterator/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/php-file-iterator/.gitignore b/vendor/phpunit/php-file-iterator/.gitignore
deleted file mode 100644
index a741983..0000000
--- a/vendor/phpunit/php-file-iterator/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
-phpunit.xml
diff --git a/vendor/phpunit/php-file-iterator/ChangeLog.md b/vendor/phpunit/php-file-iterator/ChangeLog.md
deleted file mode 100644
index fa77ced..0000000
--- a/vendor/phpunit/php-file-iterator/ChangeLog.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [1.4.0] - 2015-04-02
-
-### Added
-
-* [Added support for wildcards (glob) in exclude](https://github.com/sebastianbergmann/php-file-iterator/pull/23)
-
diff --git a/vendor/phpunit/php-file-iterator/LICENSE b/vendor/phpunit/php-file-iterator/LICENSE
deleted file mode 100644
index 6cccbbb..0000000
--- a/vendor/phpunit/php-file-iterator/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-File_Iterator
-
-Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-file-iterator/README.md b/vendor/phpunit/php-file-iterator/README.md
deleted file mode 100644
index ef28388..0000000
--- a/vendor/phpunit/php-file-iterator/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# File_Iterator
-
-## Installation
-
-To add File_Iterator as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-file-iterator` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on File_Iterator 1.4:
-
-    {
-        "require": {
-            "phpunit/php-file-iterator": "~1.4"
-        }
-    }
-
diff --git a/vendor/phpunit/php-file-iterator/composer.json b/vendor/phpunit/php-file-iterator/composer.json
deleted file mode 100644
index c652794..0000000
--- a/vendor/phpunit/php-file-iterator/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "phpunit/php-file-iterator",
-    "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-    "type": "library",
-    "keywords": [
-        "iterator",
-        "filesystem"
-    ],
-    "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sb@sebastian-bergmann.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/phpunit/php-file-iterator/src/Facade.php b/vendor/phpunit/php-file-iterator/src/Facade.php
deleted file mode 100644
index 902a0af..0000000
--- a/vendor/phpunit/php-file-iterator/src/Facade.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/*
- * This file is part of the File_Iterator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Façade implementation that uses File_Iterator_Factory to create a
- * File_Iterator that operates on an AppendIterator that contains an
- * RecursiveDirectoryIterator for each given path. The list of unique
- * files is returned as an array.
- *
- * @since     Class available since Release 1.3.0
- */
-class File_Iterator_Facade
-{
-    /**
-     * @param  array|string $paths
-     * @param  array|string $suffixes
-     * @param  array|string $prefixes
-     * @param  array        $exclude
-     * @param  bool         $commonPath
-     * @return array
-     */
-    public function getFilesAsArray($paths, $suffixes = '', $prefixes = '', array $exclude = array(), $commonPath = FALSE)
-    {
-        if (is_string($paths)) {
-            $paths = array($paths);
-        }
-
-        $factory  = new File_Iterator_Factory;
-        $iterator = $factory->getFileIterator(
-          $paths, $suffixes, $prefixes, $exclude
-        );
-
-        $files = array();
-
-        foreach ($iterator as $file) {
-            $file = $file->getRealPath();
-
-            if ($file) {
-                $files[] = $file;
-            }
-        }
-
-        foreach ($paths as $path) {
-            if (is_file($path)) {
-                $files[] = realpath($path);
-            }
-        }
-
-        $files = array_unique($files);
-        sort($files);
-
-        if ($commonPath) {
-            return array(
-              'commonPath' => $this->getCommonPath($files),
-              'files'      => $files
-            );
-        } else {
-            return $files;
-        }
-    }
-
-    /**
-     * Returns the common path of a set of files.
-     *
-     * @param  array  $files
-     * @return string
-     */
-    protected function getCommonPath(array $files)
-    {
-        $count = count($files);
-
-        if ($count == 0) {
-            return '';
-        }
-
-        if ($count == 1) {
-            return dirname($files[0]) . DIRECTORY_SEPARATOR;
-        }
-
-        $_files = array();
-
-        foreach ($files as $file) {
-            $_files[] = $_fileParts = explode(DIRECTORY_SEPARATOR, $file);
-
-            if (empty($_fileParts[0])) {
-                $_fileParts[0] = DIRECTORY_SEPARATOR;
-            }
-        }
-
-        $common = '';
-        $done   = FALSE;
-        $j      = 0;
-        $count--;
-
-        while (!$done) {
-            for ($i = 0; $i < $count; $i++) {
-                if ($_files[$i][$j] != $_files[$i+1][$j]) {
-                    $done = TRUE;
-                    break;
-                }
-            }
-
-            if (!$done) {
-                $common .= $_files[0][$j];
-
-                if ($j > 0) {
-                    $common .= DIRECTORY_SEPARATOR;
-                }
-            }
-
-            $j++;
-        }
-
-        return DIRECTORY_SEPARATOR . $common;
-    }
-}
diff --git a/vendor/phpunit/php-file-iterator/src/Factory.php b/vendor/phpunit/php-file-iterator/src/Factory.php
deleted file mode 100644
index 19c93ad..0000000
--- a/vendor/phpunit/php-file-iterator/src/Factory.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- * This file is part of the File_Iterator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Factory Method implementation that creates a File_Iterator that operates on
- * an AppendIterator that contains an RecursiveDirectoryIterator for each given
- * path.
- *
- * @since     Class available since Release 1.1.0
- */
-class File_Iterator_Factory
-{
-    /**
-     * @param  array|string   $paths
-     * @param  array|string   $suffixes
-     * @param  array|string   $prefixes
-     * @param  array          $exclude
-     * @return AppendIterator
-     */
-    public function getFileIterator($paths, $suffixes = '', $prefixes = '', array $exclude = array())
-    {
-        if (is_string($paths)) {
-            $paths = array($paths);
-        }
-
-        $paths   = $this->getPathsAfterResolvingWildcards($paths);
-        $exclude = $this->getPathsAfterResolvingWildcards($exclude);
-
-        if (is_string($prefixes)) {
-            if ($prefixes != '') {
-                $prefixes = array($prefixes);
-            } else {
-                $prefixes = array();
-            }
-        }
-
-        if (is_string($suffixes)) {
-            if ($suffixes != '') {
-                $suffixes = array($suffixes);
-            } else {
-                $suffixes = array();
-            }
-        }
-
-        $iterator = new AppendIterator;
-
-        foreach ($paths as $path) {
-            if (is_dir($path)) {
-                $iterator->append(
-                  new File_Iterator(
-                    new RecursiveIteratorIterator(
-                      new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::FOLLOW_SYMLINKS)
-                    ),
-                    $suffixes,
-                    $prefixes,
-                    $exclude,
-                    $path
-                  )
-                );
-            }
-        }
-
-        return $iterator;
-    }
-
-    /**
-     * @param  array $paths
-     * @return array
-     */
-    protected function getPathsAfterResolvingWildcards(array $paths)
-    {
-        $_paths = array();
-
-        foreach ($paths as $path) {
-            if ($locals = glob($path, GLOB_ONLYDIR)) {
-                $_paths = array_merge($_paths, $locals);
-            } else {
-                $_paths[] = $path;
-            }
-        }
-
-        return $_paths;
-    }
-}
diff --git a/vendor/phpunit/php-file-iterator/src/Iterator.php b/vendor/phpunit/php-file-iterator/src/Iterator.php
deleted file mode 100644
index 1607c06..0000000
--- a/vendor/phpunit/php-file-iterator/src/Iterator.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/*
- * This file is part of the File_Iterator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * FilterIterator implementation that filters files based on prefix(es) and/or
- * suffix(es). Hidden files and files from hidden directories are also filtered.
- *
- * @since     Class available since Release 1.0.0
- */
-class File_Iterator extends FilterIterator
-{
-    const PREFIX = 0;
-    const SUFFIX = 1;
-
-    /**
-     * @var array
-     */
-    protected $suffixes = array();
-
-    /**
-     * @var array
-     */
-    protected $prefixes = array();
-
-    /**
-     * @var array
-     */
-    protected $exclude = array();
-
-    /**
-     * @var string
-     */
-    protected $basepath;
-
-    /**
-     * @param Iterator $iterator
-     * @param array    $suffixes
-     * @param array    $prefixes
-     * @param array    $exclude
-     * @param string   $basepath
-     */
-    public function __construct(Iterator $iterator, array $suffixes = array(), array $prefixes = array(), array $exclude = array(), $basepath = NULL)
-    {
-        $exclude = array_filter(array_map('realpath', $exclude));
-
-        if ($basepath !== NULL) {
-            $basepath = realpath($basepath);
-        }
-
-        if ($basepath === FALSE) {
-            $basepath = NULL;
-        } else {
-            foreach ($exclude as &$_exclude) {
-                $_exclude = str_replace($basepath, '', $_exclude);
-            }
-        }
-
-        $this->prefixes = $prefixes;
-        $this->suffixes = $suffixes;
-        $this->exclude  = $exclude;
-        $this->basepath = $basepath;
-
-        parent::__construct($iterator);
-    }
-
-    /**
-     * @return bool
-     */
-    public function accept()
-    {
-        $current  = $this->getInnerIterator()->current();
-        $filename = $current->getFilename();
-        $realpath = $current->getRealPath();
-
-        if ($this->basepath !== NULL) {
-            $realpath = str_replace($this->basepath, '', $realpath);
-        }
-
-        // Filter files in hidden directories.
-        if (preg_match('=/\.[^/]*/=', $realpath)) {
-            return FALSE;
-        }
-
-        return $this->acceptPath($realpath) &&
-               $this->acceptPrefix($filename) &&
-               $this->acceptSuffix($filename);
-    }
-
-    /**
-     * @param  string $path
-     * @return bool
-     * @since  Method available since Release 1.1.0
-     */
-    protected function acceptPath($path)
-    {
-        foreach ($this->exclude as $exclude) {
-            if (strpos($path, $exclude) === 0) {
-                return FALSE;
-            }
-        }
-
-        return TRUE;
-    }
-
-    /**
-     * @param  string $filename
-     * @return bool
-     * @since  Method available since Release 1.1.0
-     */
-    protected function acceptPrefix($filename)
-    {
-        return $this->acceptSubString($filename, $this->prefixes, self::PREFIX);
-    }
-
-    /**
-     * @param  string $filename
-     * @return bool
-     * @since  Method available since Release 1.1.0
-     */
-    protected function acceptSuffix($filename)
-    {
-        return $this->acceptSubString($filename, $this->suffixes, self::SUFFIX);
-    }
-
-    /**
-     * @param  string $filename
-     * @param  array  $subString
-     * @param  int    $type
-     * @return bool
-     * @since  Method available since Release 1.1.0
-     */
-    protected function acceptSubString($filename, array $subStrings, $type)
-    {
-        if (empty($subStrings)) {
-            return TRUE;
-        }
-
-        $matched = FALSE;
-
-        foreach ($subStrings as $string) {
-            if (($type == self::PREFIX && strpos($filename, $string) === 0) ||
-                ($type == self::SUFFIX &&
-                 substr($filename, -1 * strlen($string)) == $string)) {
-                $matched = TRUE;
-                break;
-            }
-        }
-
-        return $matched;
-    }
-}
diff --git a/vendor/phpunit/php-text-template/.gitattributes b/vendor/phpunit/php-text-template/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/php-text-template/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/php-text-template/.gitignore b/vendor/phpunit/php-text-template/.gitignore
deleted file mode 100644
index c599212..0000000
--- a/vendor/phpunit/php-text-template/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/composer.lock
-/composer.phar
-/.idea
-/vendor
-
diff --git a/vendor/phpunit/php-text-template/LICENSE b/vendor/phpunit/php-text-template/LICENSE
deleted file mode 100644
index 9f9a32d..0000000
--- a/vendor/phpunit/php-text-template/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Text_Template
-
-Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-text-template/README.md b/vendor/phpunit/php-text-template/README.md
deleted file mode 100644
index ec8f593..0000000
--- a/vendor/phpunit/php-text-template/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Text_Template
-
-## Installation
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-text-template` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Text_Template:
-
-    {
-        "require": {
-            "phpunit/php-text-template": "~1.2"
-        }
-    }
-
diff --git a/vendor/phpunit/php-text-template/composer.json b/vendor/phpunit/php-text-template/composer.json
deleted file mode 100644
index a5779c8..0000000
--- a/vendor/phpunit/php-text-template/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "phpunit/php-text-template",
-    "description": "Simple template engine.",
-    "type": "library",
-    "keywords": [
-        "template"
-    ],
-    "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-text-template/issues"
-    },
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    }
-}
-
diff --git a/vendor/phpunit/php-text-template/src/Template.php b/vendor/phpunit/php-text-template/src/Template.php
deleted file mode 100644
index 9eb39ad..0000000
--- a/vendor/phpunit/php-text-template/src/Template.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*
- * This file is part of the Text_Template package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A simple template engine.
- *
- * @since Class available since Release 1.0.0
- */
-class Text_Template
-{
-    /**
-     * @var string
-     */
-    protected $template = '';
-
-    /**
-     * @var string
-     */
-    protected $openDelimiter = '{';
-
-    /**
-     * @var string
-     */
-    protected $closeDelimiter = '}';
-
-    /**
-     * @var array
-     */
-    protected $values = array();
-
-    /**
-     * Constructor.
-     *
-     * @param  string                   $file
-     * @throws InvalidArgumentException
-     */
-    public function __construct($file = '', $openDelimiter = '{', $closeDelimiter = '}')
-    {
-        $this->setFile($file);
-        $this->openDelimiter  = $openDelimiter;
-        $this->closeDelimiter = $closeDelimiter;
-    }
-
-    /**
-     * Sets the template file.
-     *
-     * @param  string                   $file
-     * @throws InvalidArgumentException
-     */
-    public function setFile($file)
-    {
-        $distFile = $file . '.dist';
-
-        if (file_exists($file)) {
-            $this->template = file_get_contents($file);
-        }
-
-        else if (file_exists($distFile)) {
-            $this->template = file_get_contents($distFile);
-        }
-
-        else {
-            throw new InvalidArgumentException(
-              'Template file could not be loaded.'
-            );
-        }
-    }
-
-    /**
-     * Sets one or more template variables.
-     *
-     * @param array $values
-     * @param bool  $merge
-     */
-    public function setVar(array $values, $merge = TRUE)
-    {
-        if (!$merge || empty($this->values)) {
-            $this->values = $values;
-        } else {
-            $this->values = array_merge($this->values, $values);
-        }
-    }
-
-    /**
-     * Renders the template and returns the result.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $keys = array();
-
-        foreach ($this->values as $key => $value) {
-            $keys[] = $this->openDelimiter . $key . $this->closeDelimiter;
-        }
-
-        return str_replace($keys, $this->values, $this->template);
-    }
-
-    /**
-     * Renders the template and writes the result to a file.
-     *
-     * @param string $target
-     */
-    public function renderTo($target)
-    {
-        $fp = @fopen($target, 'wt');
-
-        if ($fp) {
-            fwrite($fp, $this->render());
-            fclose($fp);
-        } else {
-            $error = error_get_last();
-
-            throw new RuntimeException(
-              sprintf(
-                'Could not write to %s: %s',
-                $target,
-                substr(
-                  $error['message'],
-                  strpos($error['message'], ':') + 2
-                )
-              )
-            );
-        }
-    }
-}
-
diff --git a/vendor/phpunit/php-timer/.gitattributes b/vendor/phpunit/php-timer/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/php-timer/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/php-timer/.gitignore b/vendor/phpunit/php-timer/.gitignore
deleted file mode 100644
index a741983..0000000
--- a/vendor/phpunit/php-timer/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-cache.properties
-phpunit.xml
diff --git a/vendor/phpunit/php-timer/.travis.yml b/vendor/phpunit/php-timer/.travis.yml
deleted file mode 100644
index 1563ea3..0000000
--- a/vendor/phpunit/php-timer/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-script:
-  - phpunit --bootstrap src/Timer.php tests
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/phpunit/php-timer/LICENSE b/vendor/phpunit/php-timer/LICENSE
deleted file mode 100644
index 16c4599..0000000
--- a/vendor/phpunit/php-timer/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-PHP_Timer
-
-Copyright (c) 2010-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-timer/README.md b/vendor/phpunit/php-timer/README.md
deleted file mode 100644
index 61e2cca..0000000
--- a/vendor/phpunit/php-timer/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-[![Build Status](https://travis-ci.org/sebastianbergmann/php-timer.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-timer)
-
-# PHP_Timer
-
-Utility class for timing things, factored out of PHPUnit into a stand-alone component.
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-timer` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_Timer:
-
-    {
-        "require": {
-            "phpunit/php-timer": "~1.0"
-        }
-    }
-
-## Usage
-
-### Basic Timing
-
-```php
-PHP_Timer::start();
-
-$timer->start();
-
-// ...
-
-$time = PHP_Timer::stop();
-var_dump($time);
-
-print PHP_Timer::secondsToTimeString($time);
-```
-
-The code above yields the output below:
-
-    double(1.0967254638672E-5)
-    0 ms
-
-### Resource Consumption Since PHP Startup
-
-```php
-print PHP_Timer::resourceUsage();
-```
-
-The code above yields the output below:
-
-    Time: 0 ms, Memory: 0.50Mb
diff --git a/vendor/phpunit/php-timer/composer.json b/vendor/phpunit/php-timer/composer.json
deleted file mode 100644
index 4adc8db..0000000
--- a/vendor/phpunit/php-timer/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "phpunit/php-timer",
-    "description": "Utility class for timing",
-    "type": "library",
-    "keywords": [
-        "timer"
-    ],
-    "homepage": "https://github.com/sebastianbergmann/php-timer/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sb@sebastian-bergmann.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    }
-}
diff --git a/vendor/phpunit/php-timer/src/Timer.php b/vendor/phpunit/php-timer/src/Timer.php
deleted file mode 100644
index 19fec73..0000000
--- a/vendor/phpunit/php-timer/src/Timer.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_Timer package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility class for timing.
- *
- * @since      Class available since Release 1.0.0
- */
-class PHP_Timer
-{
-    /**
-     * @var array
-     */
-    private static $times = array(
-      'hour'   => 3600000,
-      'minute' => 60000,
-      'second' => 1000
-    );
-
-    /**
-     * @var array
-     */
-    private static $startTimes = array();
-
-    /**
-     * @var float
-     */
-    public static $requestTime;
-
-    /**
-     * Starts the timer.
-     */
-    public static function start()
-    {
-        array_push(self::$startTimes, microtime(true));
-    }
-
-    /**
-     * Stops the timer and returns the elapsed time.
-     *
-     * @return float
-     */
-    public static function stop()
-    {
-        return microtime(true) - array_pop(self::$startTimes);
-    }
-
-    /**
-     * Formats the elapsed time as a string.
-     *
-     * @param  float  $time
-     * @return string
-     */
-    public static function secondsToTimeString($time)
-    {
-        $ms = round($time * 1000);
-
-        foreach (self::$times as $unit => $value) {
-            if ($ms >= $value) {
-                $time = floor($ms / $value * 100.0) / 100.0;
-
-                return $time . ' ' . ($time == 1 ? $unit : $unit . 's');
-            }
-        }
-
-        return $ms . ' ms';
-    }
-
-    /**
-     * Formats the elapsed time since the start of the request as a string.
-     *
-     * @return string
-     */
-    public static function timeSinceStartOfRequest()
-    {
-        return self::secondsToTimeString(microtime(true) - self::$requestTime);
-    }
-
-    /**
-     * Returns the resources (time, memory) of the request as a string.
-     *
-     * @return string
-     */
-    public static function resourceUsage()
-    {
-        return sprintf(
-            'Time: %s, Memory: %4.2fMb',
-            self::timeSinceStartOfRequest(),
-            memory_get_peak_usage(true) / 1048576
-        );
-    }
-}
-
-if (isset($_SERVER['REQUEST_TIME_FLOAT'])) {
-    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME_FLOAT'];
-} elseif (isset($_SERVER['REQUEST_TIME'])) {
-    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME'];
-} else {
-    PHP_Timer::$requestTime = microtime(true);
-}
diff --git a/vendor/phpunit/php-token-stream/.gitattributes b/vendor/phpunit/php-token-stream/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/php-token-stream/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/php-token-stream/.gitignore b/vendor/phpunit/php-token-stream/.gitignore
deleted file mode 100644
index 103eecf..0000000
--- a/vendor/phpunit/php-token-stream/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.idea
-/composer.lock
-/composer.phar
-/vendor
diff --git a/vendor/phpunit/php-token-stream/.travis.yml b/vendor/phpunit/php-token-stream/.travis.yml
deleted file mode 100644
index 11dedef..0000000
--- a/vendor/phpunit/php-token-stream/.travis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: hhvm
-
-sudo: false
-
-before_install:
-  - composer self-update
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script:
-  - ./vendor/bin/phpunit --configuration ./build/phpunit.xml
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/phpunit/php-token-stream/LICENSE b/vendor/phpunit/php-token-stream/LICENSE
deleted file mode 100644
index 6a176fa..0000000
--- a/vendor/phpunit/php-token-stream/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-PHP_TokenStream
-
-Copyright (c) 2009-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/php-token-stream/README.md b/vendor/phpunit/php-token-stream/README.md
deleted file mode 100644
index 31d4b24..0000000
--- a/vendor/phpunit/php-token-stream/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-[![Build Status](https://travis-ci.org/sebastianbergmann/php-token-stream.svg?branch=master)](https://travis-ci.org/sebastianbergmann/php-token-stream)
-
-# PHP_TokenStream
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-token-stream` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_TokenStream:
-
-    {
-        "require": {
-            "phpunit/php-token-stream": "~1.2"
-        }
-    }
diff --git a/vendor/phpunit/php-token-stream/build.xml b/vendor/phpunit/php-token-stream/build.xml
deleted file mode 100644
index f02f4b5..0000000
--- a/vendor/phpunit/php-token-stream/build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="php-token-stream">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpunit" description="Run unit tests with PHPUnit">
-  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-   <arg value="--configuration"/>
-   <arg path="${basedir}/build/phpunit.xml"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/phpunit/php-token-stream/build/phpunit.xml b/vendor/phpunit/php-token-stream/build/phpunit.xml
deleted file mode 100644
index 139586d..0000000
--- a/vendor/phpunit/php-token-stream/build/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="../tests/bootstrap.php"
-         verbode="true">
-  <testsuites>
-    <testsuite name="php-token-stream">
-      <directory suffix="Test.php">../tests</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/phpunit/php-token-stream/composer.json b/vendor/phpunit/php-token-stream/composer.json
deleted file mode 100644
index dfde729..0000000
--- a/vendor/phpunit/php-token-stream/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "phpunit/php-token-stream",
-    "description": "Wrapper around PHP's tokenizer extension.",
-    "type": "library",
-    "keywords": ["tokenizer"],
-    "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-token-stream/issues"
-    },
-    "require": {
-        "php": ">=5.3.3",
-        "ext-tokenizer": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.2"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4-dev"
-        }
-    }
-}
diff --git a/vendor/phpunit/php-token-stream/src/Token.php b/vendor/phpunit/php-token-stream/src/Token.php
deleted file mode 100644
index 85c1846..0000000
--- a/vendor/phpunit/php-token-stream/src/Token.php
+++ /dev/null
@@ -1,846 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_TokenStream package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A PHP token.
- *
- * @author    Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright Sebastian Bergmann <sebastian@phpunit.de>
- * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     Class available since Release 1.0.0
- */
-abstract class PHP_Token
-{
-    /**
-     * @var string
-     */
-    protected $text;
-
-    /**
-     * @var integer
-     */
-    protected $line;
-
-    /**
-     * @var PHP_Token_Stream
-     */
-    protected $tokenStream;
-
-    /**
-     * @var integer
-     */
-    protected $id;
-
-    /**
-     * Constructor.
-     *
-     * @param string           $text
-     * @param integer          $line
-     * @param PHP_Token_Stream $tokenStream
-     * @param integer          $id
-     */
-    public function __construct($text, $line, PHP_Token_Stream $tokenStream, $id)
-    {
-        $this->text        = $text;
-        $this->line        = $line;
-        $this->tokenStream = $tokenStream;
-        $this->id          = $id;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->text;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getLine()
-    {
-        return $this->line;
-    }
-}
-
-abstract class PHP_TokenWithScope extends PHP_Token
-{
-    /**
-     * @var integer
-     */
-    protected $endTokenId;
-
-    /**
-     * Get the docblock for this token
-     *
-     * This method will fetch the docblock belonging to the current token. The
-     * docblock must be placed on the line directly above the token to be
-     * recognized.
-     *
-     * @return string|null Returns the docblock as a string if found
-     */
-    public function getDocblock()
-    {
-        $tokens            = $this->tokenStream->tokens();
-        $currentLineNumber = $tokens[$this->id]->getLine();
-        $prevLineNumber    = $currentLineNumber - 1;
-
-        for ($i = $this->id - 1; $i; $i--) {
-            if (!isset($tokens[$i])) {
-                return;
-            }
-
-            if ($tokens[$i] instanceof PHP_Token_FUNCTION ||
-                $tokens[$i] instanceof PHP_Token_CLASS ||
-                $tokens[$i] instanceof PHP_Token_TRAIT) {
-                // Some other trait, class or function, no docblock can be
-                // used for the current token
-                break;
-            }
-
-            $line = $tokens[$i]->getLine();
-
-            if ($line == $currentLineNumber ||
-                ($line == $prevLineNumber &&
-                 $tokens[$i] instanceof PHP_Token_WHITESPACE)) {
-                continue;
-            }
-
-            if ($line < $currentLineNumber &&
-                !$tokens[$i] instanceof PHP_Token_DOC_COMMENT) {
-                break;
-            }
-
-            return (string)$tokens[$i];
-        }
-    }
-
-    /**
-     * @return integer
-     */
-    public function getEndTokenId()
-    {
-        $block  = 0;
-        $i      = $this->id;
-        $tokens = $this->tokenStream->tokens();
-
-        while ($this->endTokenId === null && isset($tokens[$i])) {
-            if ($tokens[$i] instanceof PHP_Token_OPEN_CURLY ||
-                $tokens[$i] instanceof PHP_Token_CURLY_OPEN) {
-                $block++;
-            } elseif ($tokens[$i] instanceof PHP_Token_CLOSE_CURLY) {
-                $block--;
-
-                if ($block === 0) {
-                    $this->endTokenId = $i;
-                }
-            } elseif (($this instanceof PHP_Token_FUNCTION ||
-                $this instanceof PHP_Token_NAMESPACE) &&
-                $tokens[$i] instanceof PHP_Token_SEMICOLON) {
-                if ($block === 0) {
-                    $this->endTokenId = $i;
-                }
-            }
-
-            $i++;
-        }
-
-        if ($this->endTokenId === null) {
-            $this->endTokenId = $this->id;
-        }
-
-        return $this->endTokenId;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getEndLine()
-    {
-        return $this->tokenStream[$this->getEndTokenId()]->getLine();
-    }
-}
-
-abstract class PHP_TokenWithScopeAndVisibility extends PHP_TokenWithScope
-{
-    /**
-     * @return string
-     */
-    public function getVisibility()
-    {
-        $tokens = $this->tokenStream->tokens();
-
-        for ($i = $this->id - 2; $i > $this->id - 7; $i -= 2) {
-            if (isset($tokens[$i]) &&
-               ($tokens[$i] instanceof PHP_Token_PRIVATE ||
-                $tokens[$i] instanceof PHP_Token_PROTECTED ||
-                $tokens[$i] instanceof PHP_Token_PUBLIC)) {
-                return strtolower(
-                    str_replace('PHP_Token_', '', get_class($tokens[$i]))
-                );
-            }
-            if (isset($tokens[$i]) &&
-              !($tokens[$i] instanceof PHP_Token_STATIC ||
-                $tokens[$i] instanceof PHP_Token_FINAL ||
-                $tokens[$i] instanceof PHP_Token_ABSTRACT)) {
-                // no keywords; stop visibility search
-                break;
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getKeywords()
-    {
-        $keywords = array();
-        $tokens   = $this->tokenStream->tokens();
-
-        for ($i = $this->id - 2; $i > $this->id - 7; $i -= 2) {
-            if (isset($tokens[$i]) &&
-               ($tokens[$i] instanceof PHP_Token_PRIVATE ||
-                $tokens[$i] instanceof PHP_Token_PROTECTED ||
-                $tokens[$i] instanceof PHP_Token_PUBLIC)) {
-                continue;
-            }
-
-            if (isset($tokens[$i]) &&
-               ($tokens[$i] instanceof PHP_Token_STATIC ||
-                $tokens[$i] instanceof PHP_Token_FINAL ||
-                $tokens[$i] instanceof PHP_Token_ABSTRACT)) {
-                $keywords[] = strtolower(
-                    str_replace('PHP_Token_', '', get_class($tokens[$i]))
-                );
-            }
-        }
-
-        return implode(',', $keywords);
-    }
-}
-
-abstract class PHP_Token_Includes extends PHP_Token
-{
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $type;
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->name === null) {
-            $this->process();
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        if ($this->type === null) {
-            $this->process();
-        }
-
-        return $this->type;
-    }
-
-    private function process()
-    {
-        $tokens = $this->tokenStream->tokens();
-
-        if ($tokens[$this->id+2] instanceof PHP_Token_CONSTANT_ENCAPSED_STRING) {
-            $this->name = trim($tokens[$this->id+2], "'\"");
-            $this->type = strtolower(
-                str_replace('PHP_Token_', '', get_class($tokens[$this->id]))
-            );
-        }
-    }
-}
-
-
-class PHP_Token_FUNCTION extends PHP_TokenWithScopeAndVisibility
-{
-    /**
-     * @var array
-     */
-    protected $arguments;
-
-    /**
-     * @var integer
-     */
-    protected $ccn;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $signature;
-
-    /**
-     * @return array
-     */
-    public function getArguments()
-    {
-        if ($this->arguments !== null) {
-            return $this->arguments;
-        }
-
-        $this->arguments = array();
-        $tokens          = $this->tokenStream->tokens();
-        $typeDeclaration = null;
-
-        // Search for first token inside brackets
-        $i = $this->id + 2;
-
-        while (!$tokens[$i-1] instanceof PHP_Token_OPEN_BRACKET) {
-            $i++;
-        }
-
-        while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) {
-            if ($tokens[$i] instanceof PHP_Token_STRING) {
-                $typeDeclaration = (string)$tokens[$i];
-            } elseif ($tokens[$i] instanceof PHP_Token_VARIABLE) {
-                $this->arguments[(string)$tokens[$i]] = $typeDeclaration;
-                $typeDeclaration                      = null;
-            }
-
-            $i++;
-        }
-
-        return $this->arguments;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->name !== null) {
-            return $this->name;
-        }
-
-        $tokens = $this->tokenStream->tokens();
-
-        for ($i = $this->id + 1; $i < count($tokens); $i++) {
-            if ($tokens[$i] instanceof PHP_Token_STRING) {
-                $this->name = (string)$tokens[$i];
-                break;
-            } elseif ($tokens[$i] instanceof PHP_Token_AMPERSAND &&
-                     $tokens[$i+1] instanceof PHP_Token_STRING) {
-                $this->name = (string)$tokens[$i+1];
-                break;
-            } elseif ($tokens[$i] instanceof PHP_Token_OPEN_BRACKET) {
-                $this->name = 'anonymous function';
-                break;
-            }
-        }
-
-        if ($this->name != 'anonymous function') {
-            for ($i = $this->id; $i; --$i) {
-                if ($tokens[$i] instanceof PHP_Token_NAMESPACE) {
-                    $this->name = $tokens[$i]->getName() . '\\' . $this->name;
-                    break;
-                }
-
-                if ($tokens[$i] instanceof PHP_Token_INTERFACE) {
-                    break;
-                }
-            }
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * @return integer
-     */
-    public function getCCN()
-    {
-        if ($this->ccn !== null) {
-            return $this->ccn;
-        }
-
-        $this->ccn = 1;
-        $end       = $this->getEndTokenId();
-        $tokens    = $this->tokenStream->tokens();
-
-        for ($i = $this->id; $i <= $end; $i++) {
-            switch (get_class($tokens[$i])) {
-                case 'PHP_Token_IF':
-                case 'PHP_Token_ELSEIF':
-                case 'PHP_Token_FOR':
-                case 'PHP_Token_FOREACH':
-                case 'PHP_Token_WHILE':
-                case 'PHP_Token_CASE':
-                case 'PHP_Token_CATCH':
-                case 'PHP_Token_BOOLEAN_AND':
-                case 'PHP_Token_LOGICAL_AND':
-                case 'PHP_Token_BOOLEAN_OR':
-                case 'PHP_Token_LOGICAL_OR':
-                case 'PHP_Token_QUESTION_MARK':
-                    $this->ccn++;
-                    break;
-            }
-        }
-
-        return $this->ccn;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSignature()
-    {
-        if ($this->signature !== null) {
-            return $this->signature;
-        }
-
-        if ($this->getName() == 'anonymous function') {
-            $this->signature = 'anonymous function';
-            $i               = $this->id + 1;
-        } else {
-            $this->signature = '';
-            $i               = $this->id + 2;
-        }
-
-        $tokens = $this->tokenStream->tokens();
-
-        while (isset($tokens[$i]) &&
-               !$tokens[$i] instanceof PHP_Token_OPEN_CURLY &&
-               !$tokens[$i] instanceof PHP_Token_SEMICOLON) {
-            $this->signature .= $tokens[$i++];
-        }
-
-        $this->signature = trim($this->signature);
-
-        return $this->signature;
-    }
-}
-
-class PHP_Token_INTERFACE extends PHP_TokenWithScopeAndVisibility
-{
-    /**
-     * @var array
-     */
-    protected $interfaces;
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return (string)$this->tokenStream[$this->id + 2];
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasParent()
-    {
-        return $this->tokenStream[$this->id + 4] instanceof PHP_Token_EXTENDS;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPackage()
-    {
-        $className  = $this->getName();
-        $docComment = $this->getDocblock();
-
-        $result = array(
-            'namespace'   => '',
-            'fullPackage' => '',
-            'category'    => '',
-            'package'     => '',
-            'subpackage'  => ''
-        );
-
-        for ($i = $this->id; $i; --$i) {
-            if ($this->tokenStream[$i] instanceof PHP_Token_NAMESPACE) {
-                $result['namespace'] = $this->tokenStream[$i]->getName();
-                break;
-            }
-        }
-
-        if (preg_match('/@category[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['category'] = $matches[1];
-        }
-
-        if (preg_match('/@package[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['package']     = $matches[1];
-            $result['fullPackage'] = $matches[1];
-        }
-
-        if (preg_match('/@subpackage[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['subpackage']   = $matches[1];
-            $result['fullPackage'] .= '.' . $matches[1];
-        }
-
-        if (empty($result['fullPackage'])) {
-            $result['fullPackage'] = $this->arrayToName(
-                explode('_', str_replace('\\', '_', $className)),
-                '.'
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param  array  $parts
-     * @param  string $join
-     * @return string
-     */
-    protected function arrayToName(array $parts, $join = '\\')
-    {
-        $result = '';
-
-        if (count($parts) > 1) {
-            array_pop($parts);
-
-            $result = join($join, $parts);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return boolean|string
-     */
-    public function getParent()
-    {
-        if (!$this->hasParent()) {
-            return false;
-        }
-
-        $i         = $this->id + 6;
-        $tokens    = $this->tokenStream->tokens();
-        $className = (string)$tokens[$i];
-
-        while (isset($tokens[$i+1]) &&
-               !$tokens[$i+1] instanceof PHP_Token_WHITESPACE) {
-            $className .= (string)$tokens[++$i];
-        }
-
-        return $className;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasInterfaces()
-    {
-        return (isset($this->tokenStream[$this->id + 4]) &&
-                $this->tokenStream[$this->id + 4] instanceof PHP_Token_IMPLEMENTS) ||
-               (isset($this->tokenStream[$this->id + 8]) &&
-                $this->tokenStream[$this->id + 8] instanceof PHP_Token_IMPLEMENTS);
-    }
-
-    /**
-     * @return array|boolean
-     */
-    public function getInterfaces()
-    {
-        if ($this->interfaces !== null) {
-            return $this->interfaces;
-        }
-
-        if (!$this->hasInterfaces()) {
-            return ($this->interfaces = false);
-        }
-
-        if ($this->tokenStream[$this->id + 4] instanceof PHP_Token_IMPLEMENTS) {
-            $i = $this->id + 3;
-        } else {
-            $i = $this->id + 7;
-        }
-
-        $tokens = $this->tokenStream->tokens();
-
-        while (!$tokens[$i+1] instanceof PHP_Token_OPEN_CURLY) {
-            $i++;
-
-            if ($tokens[$i] instanceof PHP_Token_STRING) {
-                $this->interfaces[] = (string)$tokens[$i];
-            }
-        }
-
-        return $this->interfaces;
-    }
-}
-
-class PHP_Token_ABSTRACT extends PHP_Token {}
-class PHP_Token_AMPERSAND extends PHP_Token {}
-class PHP_Token_AND_EQUAL extends PHP_Token {}
-class PHP_Token_ARRAY extends PHP_Token {}
-class PHP_Token_ARRAY_CAST extends PHP_Token {}
-class PHP_Token_AS extends PHP_Token {}
-class PHP_Token_AT extends PHP_Token {}
-class PHP_Token_BACKTICK extends PHP_Token {}
-class PHP_Token_BAD_CHARACTER extends PHP_Token {}
-class PHP_Token_BOOLEAN_AND extends PHP_Token {}
-class PHP_Token_BOOLEAN_OR extends PHP_Token {}
-class PHP_Token_BOOL_CAST extends PHP_Token {}
-class PHP_Token_BREAK extends PHP_Token {}
-class PHP_Token_CARET extends PHP_Token {}
-class PHP_Token_CASE extends PHP_Token {}
-class PHP_Token_CATCH extends PHP_Token {}
-class PHP_Token_CHARACTER extends PHP_Token {}
-
-class PHP_Token_CLASS extends PHP_Token_INTERFACE
-{
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $next = $this->tokenStream[$this->id + 1];
-
-        if ($next instanceof PHP_Token_WHITESPACE) {
-            $next = $this->tokenStream[$this->id + 2];
-        }
-
-        if ($next instanceof PHP_Token_STRING) {
-            return (string) $next;
-        }
-
-        if ($next instanceof PHP_Token_OPEN_CURLY ||
-            $next instanceof PHP_Token_EXTENDS ||
-            $next instanceof PHP_Token_IMPLEMENTS) {
-            return 'anonymous class';
-        }
-    }
-}
-
-class PHP_Token_CLASS_C extends PHP_Token {}
-class PHP_Token_CLASS_NAME_CONSTANT extends PHP_Token {}
-class PHP_Token_CLONE extends PHP_Token {}
-class PHP_Token_CLOSE_BRACKET extends PHP_Token {}
-class PHP_Token_CLOSE_CURLY extends PHP_Token {}
-class PHP_Token_CLOSE_SQUARE extends PHP_Token {}
-class PHP_Token_CLOSE_TAG extends PHP_Token {}
-class PHP_Token_COLON extends PHP_Token {}
-class PHP_Token_COMMA extends PHP_Token {}
-class PHP_Token_COMMENT extends PHP_Token {}
-class PHP_Token_CONCAT_EQUAL extends PHP_Token {}
-class PHP_Token_CONST extends PHP_Token {}
-class PHP_Token_CONSTANT_ENCAPSED_STRING extends PHP_Token {}
-class PHP_Token_CONTINUE extends PHP_Token {}
-class PHP_Token_CURLY_OPEN extends PHP_Token {}
-class PHP_Token_DEC extends PHP_Token {}
-class PHP_Token_DECLARE extends PHP_Token {}
-class PHP_Token_DEFAULT extends PHP_Token {}
-class PHP_Token_DIV extends PHP_Token {}
-class PHP_Token_DIV_EQUAL extends PHP_Token {}
-class PHP_Token_DNUMBER extends PHP_Token {}
-class PHP_Token_DO extends PHP_Token {}
-class PHP_Token_DOC_COMMENT extends PHP_Token {}
-class PHP_Token_DOLLAR extends PHP_Token {}
-class PHP_Token_DOLLAR_OPEN_CURLY_BRACES extends PHP_Token {}
-class PHP_Token_DOT extends PHP_Token {}
-class PHP_Token_DOUBLE_ARROW extends PHP_Token {}
-class PHP_Token_DOUBLE_CAST extends PHP_Token {}
-class PHP_Token_DOUBLE_COLON extends PHP_Token {}
-class PHP_Token_DOUBLE_QUOTES extends PHP_Token {}
-class PHP_Token_ECHO extends PHP_Token {}
-class PHP_Token_ELSE extends PHP_Token {}
-class PHP_Token_ELSEIF extends PHP_Token {}
-class PHP_Token_EMPTY extends PHP_Token {}
-class PHP_Token_ENCAPSED_AND_WHITESPACE extends PHP_Token {}
-class PHP_Token_ENDDECLARE extends PHP_Token {}
-class PHP_Token_ENDFOR extends PHP_Token {}
-class PHP_Token_ENDFOREACH extends PHP_Token {}
-class PHP_Token_ENDIF extends PHP_Token {}
-class PHP_Token_ENDSWITCH extends PHP_Token {}
-class PHP_Token_ENDWHILE extends PHP_Token {}
-class PHP_Token_END_HEREDOC extends PHP_Token {}
-class PHP_Token_EQUAL extends PHP_Token {}
-class PHP_Token_EVAL extends PHP_Token {}
-class PHP_Token_EXCLAMATION_MARK extends PHP_Token {}
-class PHP_Token_EXIT extends PHP_Token {}
-class PHP_Token_EXTENDS extends PHP_Token {}
-class PHP_Token_FILE extends PHP_Token {}
-class PHP_Token_FINAL extends PHP_Token {}
-class PHP_Token_FOR extends PHP_Token {}
-class PHP_Token_FOREACH extends PHP_Token {}
-class PHP_Token_FUNC_C extends PHP_Token {}
-class PHP_Token_GLOBAL extends PHP_Token {}
-class PHP_Token_GT extends PHP_Token {}
-class PHP_Token_IF extends PHP_Token {}
-class PHP_Token_IMPLEMENTS extends PHP_Token {}
-class PHP_Token_INC extends PHP_Token {}
-class PHP_Token_INCLUDE extends PHP_Token_Includes {}
-class PHP_Token_INCLUDE_ONCE extends PHP_Token_Includes {}
-class PHP_Token_INLINE_HTML extends PHP_Token {}
-class PHP_Token_INSTANCEOF extends PHP_Token {}
-class PHP_Token_INT_CAST extends PHP_Token {}
-class PHP_Token_ISSET extends PHP_Token {}
-class PHP_Token_IS_EQUAL extends PHP_Token {}
-class PHP_Token_IS_GREATER_OR_EQUAL extends PHP_Token {}
-class PHP_Token_IS_IDENTICAL extends PHP_Token {}
-class PHP_Token_IS_NOT_EQUAL extends PHP_Token {}
-class PHP_Token_IS_NOT_IDENTICAL extends PHP_Token {}
-class PHP_Token_IS_SMALLER_OR_EQUAL extends PHP_Token {}
-class PHP_Token_LINE extends PHP_Token {}
-class PHP_Token_LIST extends PHP_Token {}
-class PHP_Token_LNUMBER extends PHP_Token {}
-class PHP_Token_LOGICAL_AND extends PHP_Token {}
-class PHP_Token_LOGICAL_OR extends PHP_Token {}
-class PHP_Token_LOGICAL_XOR extends PHP_Token {}
-class PHP_Token_LT extends PHP_Token {}
-class PHP_Token_METHOD_C extends PHP_Token {}
-class PHP_Token_MINUS extends PHP_Token {}
-class PHP_Token_MINUS_EQUAL extends PHP_Token {}
-class PHP_Token_MOD_EQUAL extends PHP_Token {}
-class PHP_Token_MULT extends PHP_Token {}
-class PHP_Token_MUL_EQUAL extends PHP_Token {}
-class PHP_Token_NEW extends PHP_Token {}
-class PHP_Token_NUM_STRING extends PHP_Token {}
-class PHP_Token_OBJECT_CAST extends PHP_Token {}
-class PHP_Token_OBJECT_OPERATOR extends PHP_Token {}
-class PHP_Token_OPEN_BRACKET extends PHP_Token {}
-class PHP_Token_OPEN_CURLY extends PHP_Token {}
-class PHP_Token_OPEN_SQUARE extends PHP_Token {}
-class PHP_Token_OPEN_TAG extends PHP_Token {}
-class PHP_Token_OPEN_TAG_WITH_ECHO extends PHP_Token {}
-class PHP_Token_OR_EQUAL extends PHP_Token {}
-class PHP_Token_PAAMAYIM_NEKUDOTAYIM extends PHP_Token {}
-class PHP_Token_PERCENT extends PHP_Token {}
-class PHP_Token_PIPE extends PHP_Token {}
-class PHP_Token_PLUS extends PHP_Token {}
-class PHP_Token_PLUS_EQUAL extends PHP_Token {}
-class PHP_Token_PRINT extends PHP_Token {}
-class PHP_Token_PRIVATE extends PHP_Token {}
-class PHP_Token_PROTECTED extends PHP_Token {}
-class PHP_Token_PUBLIC extends PHP_Token {}
-class PHP_Token_QUESTION_MARK extends PHP_Token {}
-class PHP_Token_REQUIRE extends PHP_Token_Includes {}
-class PHP_Token_REQUIRE_ONCE extends PHP_Token_Includes {}
-class PHP_Token_RETURN extends PHP_Token {}
-class PHP_Token_SEMICOLON extends PHP_Token {}
-class PHP_Token_SL extends PHP_Token {}
-class PHP_Token_SL_EQUAL extends PHP_Token {}
-class PHP_Token_SR extends PHP_Token {}
-class PHP_Token_SR_EQUAL extends PHP_Token {}
-class PHP_Token_START_HEREDOC extends PHP_Token {}
-class PHP_Token_STATIC extends PHP_Token {}
-class PHP_Token_STRING extends PHP_Token {}
-class PHP_Token_STRING_CAST extends PHP_Token {}
-class PHP_Token_STRING_VARNAME extends PHP_Token {}
-class PHP_Token_SWITCH extends PHP_Token {}
-class PHP_Token_THROW extends PHP_Token {}
-class PHP_Token_TILDE extends PHP_Token {}
-class PHP_Token_TRY extends PHP_Token {}
-class PHP_Token_UNSET extends PHP_Token {}
-class PHP_Token_UNSET_CAST extends PHP_Token {}
-class PHP_Token_USE extends PHP_Token {}
-class PHP_Token_VAR extends PHP_Token {}
-class PHP_Token_VARIABLE extends PHP_Token {}
-class PHP_Token_WHILE extends PHP_Token {}
-class PHP_Token_WHITESPACE extends PHP_Token {}
-class PHP_Token_XOR_EQUAL extends PHP_Token {}
-
-// Tokens introduced in PHP 5.1
-class PHP_Token_HALT_COMPILER extends PHP_Token {}
-
-// Tokens introduced in PHP 5.3
-class PHP_Token_DIR extends PHP_Token {}
-class PHP_Token_GOTO extends PHP_Token {}
-
-class PHP_Token_NAMESPACE extends PHP_TokenWithScope
-{
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $tokens    = $this->tokenStream->tokens();
-        $namespace = (string)$tokens[$this->id+2];
-
-        for ($i = $this->id + 3;; $i += 2) {
-            if (isset($tokens[$i]) &&
-                $tokens[$i] instanceof PHP_Token_NS_SEPARATOR) {
-                $namespace .= '\\' . $tokens[$i+1];
-            } else {
-                break;
-            }
-        }
-
-        return $namespace;
-    }
-}
-
-class PHP_Token_NS_C extends PHP_Token {}
-class PHP_Token_NS_SEPARATOR extends PHP_Token {}
-
-// Tokens introduced in PHP 5.4
-class PHP_Token_CALLABLE extends PHP_Token {}
-class PHP_Token_INSTEADOF extends PHP_Token {}
-class PHP_Token_TRAIT extends PHP_Token_INTERFACE {}
-class PHP_Token_TRAIT_C extends PHP_Token {}
-
-// Tokens introduced in PHP 5.5
-class PHP_Token_FINALLY extends PHP_Token {}
-class PHP_Token_YIELD extends PHP_Token {}
-
-// Tokens introduced in PHP 5.6
-class PHP_Token_ELLIPSIS extends PHP_Token {}
-class PHP_Token_POW extends PHP_Token {}
-class PHP_Token_POW_EQUAL extends PHP_Token {}
-
-// Tokens introduced in PHP 7.0
-class PHP_Token_COALESCE extends PHP_Token {}
-class PHP_Token_SPACESHIP extends PHP_Token {}
-class PHP_Token_YIELD_FROM extends PHP_Token {}
-
-// Tokens introduced in HackLang / HHVM
-class PHP_Token_ASYNC extends PHP_Token {}
-class PHP_Token_AWAIT extends PHP_Token {}
-class PHP_Token_COMPILER_HALT_OFFSET extends PHP_Token {}
-class PHP_Token_ENUM extends PHP_Token {}
-class PHP_Token_EQUALS extends PHP_Token {}
-class PHP_Token_IN extends PHP_Token {}
-class PHP_Token_JOIN extends PHP_Token {}
-class PHP_Token_LAMBDA_ARROW extends PHP_Token {}
-class PHP_Token_LAMBDA_CP extends PHP_Token {}
-class PHP_Token_LAMBDA_OP extends PHP_Token {}
-class PHP_Token_ONUMBER extends PHP_Token {}
-class PHP_Token_SHAPE extends PHP_Token {}
-class PHP_Token_TYPE extends PHP_Token {}
-class PHP_Token_TYPELIST_GT extends PHP_Token {}
-class PHP_Token_TYPELIST_LT extends PHP_Token {}
-class PHP_Token_WHERE extends PHP_Token {}
-class PHP_Token_XHP_ATTRIBUTE extends PHP_Token {}
-class PHP_Token_XHP_CATEGORY extends PHP_Token {}
-class PHP_Token_XHP_CATEGORY_LABEL extends PHP_Token {}
-class PHP_Token_XHP_CHILDREN extends PHP_Token {}
-class PHP_Token_XHP_LABEL extends PHP_Token {}
-class PHP_Token_XHP_REQUIRED extends PHP_Token {}
-class PHP_Token_XHP_TAG_GT extends PHP_Token {}
-class PHP_Token_XHP_TAG_LT extends PHP_Token {}
-class PHP_Token_XHP_TEXT extends PHP_Token {}
diff --git a/vendor/phpunit/php-token-stream/src/Token/Stream.php b/vendor/phpunit/php-token-stream/src/Token/Stream.php
deleted file mode 100644
index 59a9c29..0000000
--- a/vendor/phpunit/php-token-stream/src/Token/Stream.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_TokenStream package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A stream of PHP tokens.
- *
- * @author    Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright Sebastian Bergmann <sebastian@phpunit.de>
- * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     Class available since Release 1.0.0
- */
-class PHP_Token_Stream implements ArrayAccess, Countable, SeekableIterator
-{
-    /**
-     * @var array
-     */
-    protected static $customTokens = array(
-        '(' => 'PHP_Token_OPEN_BRACKET',
-        ')' => 'PHP_Token_CLOSE_BRACKET',
-        '[' => 'PHP_Token_OPEN_SQUARE',
-        ']' => 'PHP_Token_CLOSE_SQUARE',
-        '{' => 'PHP_Token_OPEN_CURLY',
-        '}' => 'PHP_Token_CLOSE_CURLY',
-        ';' => 'PHP_Token_SEMICOLON',
-        '.' => 'PHP_Token_DOT',
-        ',' => 'PHP_Token_COMMA',
-        '=' => 'PHP_Token_EQUAL',
-        '<' => 'PHP_Token_LT',
-        '>' => 'PHP_Token_GT',
-        '+' => 'PHP_Token_PLUS',
-        '-' => 'PHP_Token_MINUS',
-        '*' => 'PHP_Token_MULT',
-        '/' => 'PHP_Token_DIV',
-        '?' => 'PHP_Token_QUESTION_MARK',
-        '!' => 'PHP_Token_EXCLAMATION_MARK',
-        ':' => 'PHP_Token_COLON',
-        '"' => 'PHP_Token_DOUBLE_QUOTES',
-        '@' => 'PHP_Token_AT',
-        '&' => 'PHP_Token_AMPERSAND',
-        '%' => 'PHP_Token_PERCENT',
-        '|' => 'PHP_Token_PIPE',
-        '$' => 'PHP_Token_DOLLAR',
-        '^' => 'PHP_Token_CARET',
-        '~' => 'PHP_Token_TILDE',
-        '`' => 'PHP_Token_BACKTICK'
-    );
-
-    /**
-     * @var string
-     */
-    protected $filename;
-
-    /**
-     * @var array
-     */
-    protected $tokens = array();
-
-    /**
-     * @var integer
-     */
-    protected $position = 0;
-
-    /**
-     * @var array
-     */
-    protected $linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
-
-    /**
-     * @var array
-     */
-    protected $classes;
-
-    /**
-     * @var array
-     */
-    protected $functions;
-
-    /**
-     * @var array
-     */
-    protected $includes;
-
-    /**
-     * @var array
-     */
-    protected $interfaces;
-
-    /**
-     * @var array
-     */
-    protected $traits;
-
-    /**
-     * @var array
-     */
-    protected $lineToFunctionMap = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $sourceCode
-     */
-    public function __construct($sourceCode)
-    {
-        if (is_file($sourceCode)) {
-            $this->filename = $sourceCode;
-            $sourceCode     = file_get_contents($sourceCode);
-        }
-
-        $this->scan($sourceCode);
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        $this->tokens = array();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $buffer = '';
-
-        foreach ($this as $token) {
-            $buffer .= $token;
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @return string
-     * @since  Method available since Release 1.1.0
-     */
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Scans the source for sequences of characters and converts them into a
-     * stream of tokens.
-     *
-     * @param string $sourceCode
-     */
-    protected function scan($sourceCode)
-    {
-        $line      = 1;
-        $tokens    = token_get_all($sourceCode);
-        $numTokens = count($tokens);
-
-        $lastNonWhitespaceTokenWasDoubleColon = false;
-
-        for ($i = 0; $i < $numTokens; ++$i) {
-            $token = $tokens[$i];
-            unset($tokens[$i]);
-
-            if (is_array($token)) {
-                $name = substr(token_name($token[0]), 2);
-                $text = $token[1];
-
-                if ($lastNonWhitespaceTokenWasDoubleColon && $name == 'CLASS') {
-                    $name = 'CLASS_NAME_CONSTANT';
-                }
-
-                $tokenClass = 'PHP_Token_' . $name;
-            } else {
-                $text       = $token;
-                $tokenClass = self::$customTokens[$token];
-            }
-
-            $this->tokens[] = new $tokenClass($text, $line, $this, $i);
-            $lines          = substr_count($text, "\n");
-            $line          += $lines;
-
-            if ($tokenClass == 'PHP_Token_HALT_COMPILER') {
-                break;
-            } elseif ($tokenClass == 'PHP_Token_COMMENT' ||
-                $tokenClass == 'PHP_Token_DOC_COMMENT') {
-                $this->linesOfCode['cloc'] += $lines + 1;
-            }
-
-            if ($name == 'DOUBLE_COLON') {
-                $lastNonWhitespaceTokenWasDoubleColon = true;
-            } elseif ($name != 'WHITESPACE') {
-                $lastNonWhitespaceTokenWasDoubleColon = false;
-            }
-        }
-
-        $this->linesOfCode['loc']   = substr_count($sourceCode, "\n");
-        $this->linesOfCode['ncloc'] = $this->linesOfCode['loc'] -
-                                      $this->linesOfCode['cloc'];
-    }
-
-    /**
-     * @return integer
-     */
-    public function count()
-    {
-        return count($this->tokens);
-    }
-
-    /**
-     * @return PHP_Token[]
-     */
-    public function tokens()
-    {
-        return $this->tokens;
-    }
-
-    /**
-     * @return array
-     */
-    public function getClasses()
-    {
-        if ($this->classes !== null) {
-            return $this->classes;
-        }
-
-        $this->parse();
-
-        return $this->classes;
-    }
-
-    /**
-     * @return array
-     */
-    public function getFunctions()
-    {
-        if ($this->functions !== null) {
-            return $this->functions;
-        }
-
-        $this->parse();
-
-        return $this->functions;
-    }
-
-    /**
-     * @return array
-     */
-    public function getInterfaces()
-    {
-        if ($this->interfaces !== null) {
-            return $this->interfaces;
-        }
-
-        $this->parse();
-
-        return $this->interfaces;
-    }
-
-    /**
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getTraits()
-    {
-        if ($this->traits !== null) {
-            return $this->traits;
-        }
-
-        $this->parse();
-
-        return $this->traits;
-    }
-
-    /**
-     * Gets the names of all files that have been included
-     * using include(), include_once(), require() or require_once().
-     *
-     * Parameter $categorize set to TRUE causing this function to return a
-     * multi-dimensional array with categories in the keys of the first dimension
-     * and constants and their values in the second dimension.
-     *
-     * Parameter $category allow to filter following specific inclusion type
-     *
-     * @param bool   $categorize OPTIONAL
-     * @param string $category   OPTIONAL Either 'require_once', 'require',
-     *                                           'include_once', 'include'.
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getIncludes($categorize = false, $category = null)
-    {
-        if ($this->includes === null) {
-            $this->includes = array(
-              'require_once' => array(),
-              'require'      => array(),
-              'include_once' => array(),
-              'include'      => array()
-            );
-
-            foreach ($this->tokens as $token) {
-                switch (get_class($token)) {
-                    case 'PHP_Token_REQUIRE_ONCE':
-                    case 'PHP_Token_REQUIRE':
-                    case 'PHP_Token_INCLUDE_ONCE':
-                    case 'PHP_Token_INCLUDE':
-                        $this->includes[$token->getType()][] = $token->getName();
-                        break;
-                }
-            }
-        }
-
-        if (isset($this->includes[$category])) {
-            $includes = $this->includes[$category];
-        } elseif ($categorize === false) {
-            $includes = array_merge(
-                $this->includes['require_once'],
-                $this->includes['require'],
-                $this->includes['include_once'],
-                $this->includes['include']
-            );
-        } else {
-            $includes = $this->includes;
-        }
-
-        return $includes;
-    }
-
-    /**
-     * Returns the name of the function or method a line belongs to.
-     *
-     * @return string or null if the line is not in a function or method
-     * @since  Method available since Release 1.2.0
-     */
-    public function getFunctionForLine($line)
-    {
-        $this->parse();
-
-        if (isset($this->lineToFunctionMap[$line])) {
-            return $this->lineToFunctionMap[$line];
-        }
-    }
-
-    protected function parse()
-    {
-        $this->interfaces = array();
-        $this->classes    = array();
-        $this->traits     = array();
-        $this->functions  = array();
-        $class            = array();
-        $classEndLine     = array();
-        $trait            = false;
-        $traitEndLine     = false;
-        $interface        = false;
-        $interfaceEndLine = false;
-
-        foreach ($this->tokens as $token) {
-            switch (get_class($token)) {
-                case 'PHP_Token_HALT_COMPILER':
-                    return;
-
-                case 'PHP_Token_INTERFACE':
-                    $interface        = $token->getName();
-                    $interfaceEndLine = $token->getEndLine();
-
-                    $this->interfaces[$interface] = array(
-                      'methods'   => array(),
-                      'parent'    => $token->getParent(),
-                      'keywords'  => $token->getKeywords(),
-                      'docblock'  => $token->getDocblock(),
-                      'startLine' => $token->getLine(),
-                      'endLine'   => $interfaceEndLine,
-                      'package'   => $token->getPackage(),
-                      'file'      => $this->filename
-                    );
-                    break;
-
-                case 'PHP_Token_CLASS':
-                case 'PHP_Token_TRAIT':
-                    $tmp = array(
-                      'methods'   => array(),
-                      'parent'    => $token->getParent(),
-                      'interfaces'=> $token->getInterfaces(),
-                      'keywords'  => $token->getKeywords(),
-                      'docblock'  => $token->getDocblock(),
-                      'startLine' => $token->getLine(),
-                      'endLine'   => $token->getEndLine(),
-                      'package'   => $token->getPackage(),
-                      'file'      => $this->filename
-                    );
-
-                    if ($token instanceof PHP_Token_CLASS) {
-                        $class[]        = $token->getName();
-                        $classEndLine[] = $token->getEndLine();
-
-                        if ($class[count($class)-1] != 'anonymous class') {
-                            $this->classes[$class[count($class)-1]] = $tmp;
-                        }
-                    } else {
-                        $trait                = $token->getName();
-                        $traitEndLine         = $token->getEndLine();
-                        $this->traits[$trait] = $tmp;
-                    }
-                    break;
-
-                case 'PHP_Token_FUNCTION':
-                    $name = $token->getName();
-                    $tmp  = array(
-                      'docblock'  => $token->getDocblock(),
-                      'keywords'  => $token->getKeywords(),
-                      'visibility'=> $token->getVisibility(),
-                      'signature' => $token->getSignature(),
-                      'startLine' => $token->getLine(),
-                      'endLine'   => $token->getEndLine(),
-                      'ccn'       => $token->getCCN(),
-                      'file'      => $this->filename
-                    );
-
-                    if (empty($class) &&
-                        $trait === false &&
-                        $interface === false) {
-                        $this->functions[$name] = $tmp;
-
-                        $this->addFunctionToMap(
-                            $name,
-                            $tmp['startLine'],
-                            $tmp['endLine']
-                        );
-                    } elseif (!empty($class) && $class[count($class)-1] != 'anonymous class') {
-                        $this->classes[$class[count($class)-1]]['methods'][$name] = $tmp;
-
-                        $this->addFunctionToMap(
-                            $class[count($class)-1] . '::' . $name,
-                            $tmp['startLine'],
-                            $tmp['endLine']
-                        );
-                    } elseif ($trait !== false) {
-                        $this->traits[$trait]['methods'][$name] = $tmp;
-
-                        $this->addFunctionToMap(
-                            $trait . '::' . $name,
-                            $tmp['startLine'],
-                            $tmp['endLine']
-                        );
-                    } else {
-                        $this->interfaces[$interface]['methods'][$name] = $tmp;
-                    }
-                    break;
-
-                case 'PHP_Token_CLOSE_CURLY':
-                    if (!empty($classEndLine) &&
-                        $classEndLine[count($classEndLine)-1] == $token->getLine()) {
-                        array_pop($classEndLine);
-                        array_pop($class);
-                    } elseif ($traitEndLine !== false &&
-                        $traitEndLine == $token->getLine()) {
-                        $trait        = false;
-                        $traitEndLine = false;
-                    } elseif ($interfaceEndLine !== false &&
-                        $interfaceEndLine == $token->getLine()) {
-                        $interface        = false;
-                        $interfaceEndLine = false;
-                    }
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getLinesOfCode()
-    {
-        return $this->linesOfCode;
-    }
-
-    /**
-     */
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function valid()
-    {
-        return isset($this->tokens[$this->position]);
-    }
-
-    /**
-     * @return integer
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /**
-     * @return PHP_Token
-     */
-    public function current()
-    {
-        return $this->tokens[$this->position];
-    }
-
-    /**
-     */
-    public function next()
-    {
-        $this->position++;
-    }
-
-    /**
-     * @param  integer $offset
-     * @return boolean
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->tokens[$offset]);
-    }
-
-    /**
-     * @param  integer $offset
-     * @return mixed
-     * @throws OutOfBoundsException
-     */
-    public function offsetGet($offset)
-    {
-        if (!$this->offsetExists($offset)) {
-            throw new OutOfBoundsException(
-                sprintf(
-                    'No token at position "%s"',
-                    $offset
-                )
-            );
-        }
-
-        return $this->tokens[$offset];
-    }
-
-    /**
-     * @param integer $offset
-     * @param mixed   $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->tokens[$offset] = $value;
-    }
-
-    /**
-     * @param  integer $offset
-     * @throws OutOfBoundsException
-     */
-    public function offsetUnset($offset)
-    {
-        if (!$this->offsetExists($offset)) {
-            throw new OutOfBoundsException(
-                sprintf(
-                    'No token at position "%s"',
-                    $offset
-                )
-            );
-        }
-
-        unset($this->tokens[$offset]);
-    }
-
-    /**
-     * Seek to an absolute position.
-     *
-     * @param  integer $position
-     * @throws OutOfBoundsException
-     */
-    public function seek($position)
-    {
-        $this->position = $position;
-
-        if (!$this->valid()) {
-            throw new OutOfBoundsException(
-                sprintf(
-                    'No token at position "%s"',
-                    $this->position
-                )
-            );
-        }
-    }
-
-    /**
-     * @param string  $name
-     * @param integer $startLine
-     * @param integer $endLine
-     */
-    private function addFunctionToMap($name, $startLine, $endLine)
-    {
-        for ($line = $startLine; $line <= $endLine; $line++) {
-            $this->lineToFunctionMap[$line] = $name;
-        }
-    }
-}
diff --git a/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php b/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php
deleted file mode 100644
index b41b25f..0000000
--- a/vendor/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * This file is part of the PHP_TokenStream package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A caching factory for token stream objects.
- *
- * @author    Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright Sebastian Bergmann <sebastian@phpunit.de>
- * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     Class available since Release 1.0.0
- */
-class PHP_Token_Stream_CachingFactory
-{
-    /**
-     * @var array
-     */
-    protected static $cache = array();
-
-    /**
-     * @param  string $filename
-     * @return PHP_Token_Stream
-     */
-    public static function get($filename)
-    {
-        if (!isset(self::$cache[$filename])) {
-            self::$cache[$filename] = new PHP_Token_Stream($filename);
-        }
-
-        return self::$cache[$filename];
-    }
-
-    /**
-     * @param string $filename
-     */
-    public static function clear($filename = null)
-    {
-        if (is_string($filename)) {
-            unset(self::$cache[$filename]);
-        } else {
-            self::$cache = array();
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/.gitattributes b/vendor/phpunit/phpunit-mock-objects/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/phpunit/phpunit-mock-objects/.gitignore b/vendor/phpunit/phpunit-mock-objects/.gitignore
deleted file mode 100644
index b17f73f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-build/coverage
-build/logs
-cache.properties
-phpunit.xml
-/vendor
-/composer.lock
-/composer.phar
-/.idea
diff --git a/vendor/phpunit/phpunit-mock-objects/.travis.yml b/vendor/phpunit/phpunit-mock-objects/.travis.yml
deleted file mode 100644
index 127bb65..0000000
--- a/vendor/phpunit/phpunit-mock-objects/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md b/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
deleted file mode 100644
index b290539..0000000
--- a/vendor/phpunit/phpunit-mock-objects/CONTRIBUTING.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Pull Requests for bug fixes should be made against the current release branch (1.2). 
-
-Pull Requests for new features should be made against master.
-
-For further notes please refer to [https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md)
diff --git a/vendor/phpunit/phpunit-mock-objects/LICENSE b/vendor/phpunit/phpunit-mock-objects/LICENSE
deleted file mode 100644
index 3705d2b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-PHPUnit_MockObject
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/phpunit-mock-objects/README.md b/vendor/phpunit/phpunit-mock-objects/README.md
deleted file mode 100644
index 5222da7..0000000
--- a/vendor/phpunit/phpunit-mock-objects/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-[![Build Status](https://img.shields.io/travis/sebastianbergmann/phpunit-mock-objects/2.3.svg?style=flat-square)](https://travis-ci.org/sebastianbergmann/phpunit-mock-objects)
-[![Latest Stable Version](https://img.shields.io/packagist/v/phpunit/phpunit-mock-objects.svg?style=flat-square)](https://packagist.org/packages/phpunit/phpunit-mock-objects)
-
-# PHPUnit_MockObject
-
-**PHPUnit_MockObject** is the default mock object library for PHPUnit.
-
-## Requirements
-
-* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
-
-## Installation
-
-To add PHPUnit_MockObject as a local, per-project dependency to your project, simply add a dependency on `phpunit/phpunit-mock-objects` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHPUnit_MockObject 2.3:
-
-    {
-        "require": {
-            "phpunit/phpunit-mock-objects": "2.3.*"
-        }
-    }
-
diff --git a/vendor/phpunit/phpunit-mock-objects/build.xml b/vendor/phpunit/phpunit-mock-objects/build.xml
deleted file mode 100644
index c93503e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="PHPUnit_MockObjects">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
-
-  <delete>
-   <fileset dir="${basedir}/build">
-    <include name="**/*.phar" />
-   </fileset>
-  </delete>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs">
-   <arg value="--standard=PSR2" />
-   <arg value="--extensions=php" />
-   <arg path="${basedir}/src" />
-   <arg path="${basedir}/tests" />
-  </exec>
- </target>
-</project>
-
diff --git a/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml b/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
deleted file mode 100644
index b8498fb..0000000
--- a/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="PHPUnit Mock Objects">
-    <directory suffix="Test.php">../tests</directory>
-    <directory suffix=".phpt">../tests</directory>
-  </testsuite>
-</phpunit>
-
diff --git a/vendor/phpunit/phpunit-mock-objects/composer.json b/vendor/phpunit/phpunit-mock-objects/composer.json
deleted file mode 100644
index 12fb934..0000000
--- a/vendor/phpunit/phpunit-mock-objects/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name": "phpunit/phpunit-mock-objects",
-    "description": "Mock Object library for PHPUnit",
-    "type": "library",
-    "keywords": [
-        "xunit",
-        "mock"
-    ],
-    "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sb@sebastian-bergmann.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "require": {
-        "php": ">=5.3.3",
-        "phpunit/php-text-template": "~1.2",
-        "doctrine/instantiator": "^1.0.2",
-        "sebastian/exporter": "~1.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "suggest": {
-        "ext-soap": "*"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "autoload-dev": {
-        "classmap": [
-            "tests/_fixture/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.3.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist b/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
deleted file mode 100644
index e2186ea..0000000
--- a/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="PHPUnit Mock Objects">
-    <directory suffix="Test.php">tests</directory>
-    <directory suffix=".phpt">tests</directory>
-  </testsuite>
-
-  <logging>
-    <log type="coverage-html" target="build/coverage"/>
-  </logging>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
deleted file mode 100644
index 6f369a1..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder interface for unique identifiers.
- *
- * Defines the interface for recording unique identifiers. The identifiers
- * can be used to define the invocation order of expectations. The expectation
- * is recorded using id() and then defined in order using
- * PHPUnit_Framework_MockObject_Builder_Match::after().
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_Identity
-{
-    /**
-     * Sets the identification of the expectation to $id.
-     *
-     * @note The identifier is unique per mock object.
-     * @param string $id Unique identifiation of expectation.
-     */
-    public function id($id);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
deleted file mode 100644
index 865c6b2..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder for mocked or stubbed invocations.
- *
- * Provides methods for building expectations without having to resort to
- * instantiating the various matchers manually. These methods also form a
- * more natural way of reading the expectation. This class should be together
- * with the test case PHPUnit_Framework_MockObject_TestCase.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Builder_InvocationMocker implements PHPUnit_Framework_MockObject_Builder_MethodNameMatch
-{
-    /**
-     * @var PHPUnit_Framework_MockObject_Stub_MatcherCollection
-     */
-    protected $collection;
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Matcher
-     */
-    protected $matcher;
-
-    /**
-     * @param PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection
-     * @param PHPUnit_Framework_MockObject_Matcher_Invocation     $invocationMatcher
-     */
-    public function __construct(PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection, PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
-    {
-        $this->collection = $collection;
-        $this->matcher    = new PHPUnit_Framework_MockObject_Matcher(
-            $invocationMatcher
-        );
-
-        $this->collection->addMatcher($this->matcher);
-    }
-
-    /**
-     * @return PHPUnit_Framework_MockObject_Matcher
-     */
-    public function getMatcher()
-    {
-        return $this->matcher;
-    }
-
-    /**
-     * @param  mixed                                                 $id
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function id($id)
-    {
-        $this->collection->registerId($id, $this);
-
-        return $this;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Stub                     $stub
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function will(PHPUnit_Framework_MockObject_Stub $stub)
-    {
-        $this->matcher->stub = $stub;
-
-        return $this;
-    }
-
-    /**
-     * @param  mixed                                                 $value
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturn($value)
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_Return(
-            $value
-        );
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  array                                                 $valueMap
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturnMap(array $valueMap)
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnValueMap(
-            $valueMap
-        );
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  mixed                                                 $argumentIndex
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturnArgument($argumentIndex)
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
-            $argumentIndex
-        );
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  callable                                              $callback
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturnCallback($callback)
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnCallback(
-            $callback
-        );
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturnSelf()
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnSelf();
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  mixed                                                 $value, ...
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willReturnOnConsecutiveCalls()
-    {
-        $args = func_get_args();
-
-        $stub = new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  Exception                                             $exception
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function willThrowException(Exception $exception)
-    {
-        $stub = new PHPUnit_Framework_MockObject_Stub_Exception($exception);
-
-        return $this->will($stub);
-    }
-
-    /**
-     * @param  mixed                                                 $id
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function after($id)
-    {
-        $this->matcher->afterMatchBuilderId = $id;
-
-        return $this;
-    }
-
-    /**
-     * Validate that a parameters matcher can be defined, throw exceptions otherwise.
-     *
-     * @throws PHPUnit_Framework_Exception
-     */
-    private function canDefineParameters()
-    {
-        if ($this->matcher->methodNameMatcher === null) {
-            throw new PHPUnit_Framework_Exception(
-                'Method name matcher is not defined, cannot define parameter ' .
-                ' matcher without one'
-            );
-        }
-
-        if ($this->matcher->parametersMatcher !== null) {
-            throw new PHPUnit_Framework_Exception(
-                'Parameter matcher is already defined, cannot redefine'
-            );
-        }
-    }
-
-    /**
-     * @param  mixed                                                 $argument, ...
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function with()
-    {
-        $args = func_get_args();
-
-        $this->canDefineParameters();
-
-        $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_Parameters($args);
-
-        return $this;
-    }
-
-    /**
-     * @param  mixed ...$argument
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function withConsecutive()
-    {
-
-        $args = func_get_args();
-
-        $this->canDefineParameters();
-
-        $this->matcher->parametersMatcher =
-          new PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters($args);
-
-        return $this;
-    }
-
-    /**
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function withAnyParameters()
-    {
-        $this->canDefineParameters();
-
-        $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_AnyParameters;
-
-        return $this;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_Constraint|string                   $constraint
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function method($constraint)
-    {
-        if ($this->matcher->methodNameMatcher !== null) {
-            throw new PHPUnit_Framework_Exception(
-                'Method name matcher is already defined, cannot redefine'
-            );
-        }
-
-        $this->matcher->methodNameMatcher = new PHPUnit_Framework_MockObject_Matcher_MethodName($constraint);
-
-        return $this;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
deleted file mode 100644
index 1cbd040..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder interface for invocation order matches.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_Match extends PHPUnit_Framework_MockObject_Builder_Stub
-{
-    /**
-     * Defines the expectation which must occur before the current is valid.
-     *
-     * @param  string                                    $id The identification of the expectation that should
-     *                                                       occur before this one.
-     * @return PHPUnit_Framework_MockObject_Builder_Stub
-     */
-    public function after($id);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
deleted file mode 100644
index 96bfb1e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder interface for matcher of method names.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_MethodNameMatch extends PHPUnit_Framework_MockObject_Builder_ParametersMatch
-{
-    /**
-     * Adds a new method name match and returns the parameter match object for
-     * further matching possibilities.
-     *
-     * @param  PHPUnit_Framework_Constraint                         $name
-     *                                                                    Constraint for matching method, if a string is passed it will use
-     *                                                                    the PHPUnit_Framework_Constraint_IsEqual.
-     * @return PHPUnit_Framework_MockObject_Builder_ParametersMatch
-     */
-    public function method($name);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
deleted file mode 100644
index 831156b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for builders which can register builders with a given identification.
- *
- * This interface relates to PHPUnit_Framework_MockObject_Builder_Identity.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_Namespace
-{
-    /**
-     * Looks up the match builder with identification $id and returns it.
-     *
-     * @param  string                                     $id The identifiction of the match builder.
-     * @return PHPUnit_Framework_MockObject_Builder_Match
-     */
-    public function lookupId($id);
-
-    /**
-     * Registers the match builder $builder with the identification $id. The
-     * builder can later be looked up using lookupId() to figure out if it
-     * has been invoked.
-     *
-     * @param string                                     $id
-     *                                                            The identification of the match builder.
-     * @param PHPUnit_Framework_MockObject_Builder_Match $builder
-     *                                                            The builder which is being registered.
-     */
-    public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $builder);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
deleted file mode 100644
index 79d96f2..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder interface for parameter matchers.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_ParametersMatch extends PHPUnit_Framework_MockObject_Builder_Match
-{
-    /**
-     * Sets the parameters to match for, each parameter to this funtion will
-     * be part of match. To perform specific matches or constraints create a
-     * new PHPUnit_Framework_Constraint and use it for the parameter.
-     * If the parameter value is not a constraint it will use the
-     * PHPUnit_Framework_Constraint_IsEqual for the value.
-     *
-     * Some examples:
-     * <code>
-     * // match first parameter with value 2
-     * $b->with(2);
-     * // match first parameter with value 'smock' and second identical to 42
-     * $b->with('smock', new PHPUnit_Framework_Constraint_IsEqual(42));
-     * </code>
-     *
-     * @return PHPUnit_Framework_MockObject_Builder_ParametersMatch
-     */
-    public function with();
-
-    /**
-     * Sets a matcher which allows any kind of parameters.
-     *
-     * Some examples:
-     * <code>
-     * // match any number of parameters
-     * $b->withAnyParamers();
-     * </code>
-     *
-     * @return PHPUnit_Framework_MockObject_Matcher_AnyParameters
-     */
-    public function withAnyParameters();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
deleted file mode 100644
index cc96bac..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Builder interface for stubs which are actions replacing an invocation.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Builder_Stub extends PHPUnit_Framework_MockObject_Builder_Identity
-{
-    /**
-     * Stubs the matching method with the stub object $stub. Any invocations of
-     * the matched method will now be handled by the stub instead.
-     *
-     * @param  PHPUnit_Framework_MockObject_Stub             $stub The stub object.
-     * @return PHPUnit_Framework_MockObject_Builder_Identity
-     */
-    public function will(PHPUnit_Framework_MockObject_Stub $stub);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
deleted file mode 100644
index 736784b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.6
- */
-class PHPUnit_Framework_MockObject_BadMethodCallException extends BadMethodCallException implements PHPUnit_Framework_MockObject_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
deleted file mode 100644
index bc8c81d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for exceptions used by PHPUnit_MockObject.
- *
- * @since Interface available since Release 2.0.6
- */
-interface PHPUnit_Framework_MockObject_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
deleted file mode 100644
index 1e9b6f1..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 2.0.6
- */
-class PHPUnit_Framework_MockObject_RuntimeException extends RuntimeException implements PHPUnit_Framework_MockObject_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
deleted file mode 100644
index 3df3abb..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
+++ /dev/null
@@ -1,1120 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Doctrine\Instantiator\Instantiator;
-use Doctrine\Instantiator\Exception\InvalidArgumentException as InstantiatorInvalidArgumentException;
-use Doctrine\Instantiator\Exception\UnexpectedValueException as InstantiatorUnexpectedValueException;
-
-if (!function_exists('trait_exists')) {
-    function trait_exists($traitname, $autoload = true)
-    {
-        return false;
-    }
-}
-
-/**
- * Mock Object Code Generator
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Generator
-{
-    /**
-     * @var array
-     */
-    private static $cache = array();
-
-    /**
-     * @var array
-     */
-    protected $blacklistedMethodNames = array(
-      '__CLASS__'       => true,
-      '__DIR__'         => true,
-      '__FILE__'        => true,
-      '__FUNCTION__'    => true,
-      '__LINE__'        => true,
-      '__METHOD__'      => true,
-      '__NAMESPACE__'   => true,
-      '__TRAIT__'       => true,
-      '__clone'         => true,
-      '__halt_compiler' => true,
-      'abstract'        => true,
-      'and'             => true,
-      'array'           => true,
-      'as'              => true,
-      'break'           => true,
-      'callable'        => true,
-      'case'            => true,
-      'catch'           => true,
-      'class'           => true,
-      'clone'           => true,
-      'const'           => true,
-      'continue'        => true,
-      'declare'         => true,
-      'default'         => true,
-      'die'             => true,
-      'do'              => true,
-      'echo'            => true,
-      'else'            => true,
-      'elseif'          => true,
-      'empty'           => true,
-      'enddeclare'      => true,
-      'endfor'          => true,
-      'endforeach'      => true,
-      'endif'           => true,
-      'endswitch'       => true,
-      'endwhile'        => true,
-      'eval'            => true,
-      'exit'            => true,
-      'expects'         => true,
-      'extends'         => true,
-      'final'           => true,
-      'for'             => true,
-      'foreach'         => true,
-      'function'        => true,
-      'global'          => true,
-      'goto'            => true,
-      'if'              => true,
-      'implements'      => true,
-      'include'         => true,
-      'include_once'    => true,
-      'instanceof'      => true,
-      'insteadof'       => true,
-      'interface'       => true,
-      'isset'           => true,
-      'list'            => true,
-      'namespace'       => true,
-      'new'             => true,
-      'or'              => true,
-      'print'           => true,
-      'private'         => true,
-      'protected'       => true,
-      'public'          => true,
-      'require'         => true,
-      'require_once'    => true,
-      'return'          => true,
-      'static'          => true,
-      'switch'          => true,
-      'throw'           => true,
-      'trait'           => true,
-      'try'             => true,
-      'unset'           => true,
-      'use'             => true,
-      'var'             => true,
-      'while'           => true,
-      'xor'             => true
-    );
-
-    /**
-     * Returns a mock object for the specified class.
-     *
-     * @param  array|string                                  $type
-     * @param  array                                         $methods
-     * @param  array                                         $arguments
-     * @param  string                                        $mockClassName
-     * @param  bool                                          $callOriginalConstructor
-     * @param  bool                                          $callOriginalClone
-     * @param  bool                                          $callAutoload
-     * @param  bool                                          $cloneArguments
-     * @param  bool                                          $callOriginalMethods
-     * @param  object                                        $proxyTarget
-     * @return object
-     * @throws InvalidArgumentException
-     * @throws PHPUnit_Framework_Exception
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     * @since  Method available since Release 1.0.0
-     */
-    public function getMock($type, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = true, $callOriginalMethods = false, $proxyTarget = null)
-    {
-        if (!is_array($type) && !is_string($type)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'array or string');
-        }
-
-        if (!is_string($mockClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'string');
-        }
-
-        if (!is_array($methods) && !is_null($methods)) {
-            throw new InvalidArgumentException;
-        }
-
-        if ($type === 'Traversable' || $type === '\\Traversable') {
-            $type = 'Iterator';
-        }
-
-        if (is_array($type)) {
-            $type = array_unique(array_map(
-                function ($type) {
-                    if ($type === 'Traversable' ||
-                      $type === '\\Traversable' ||
-                      $type === '\\Iterator') {
-                        return 'Iterator';
-                    }
-
-                    return $type;
-                },
-                $type
-            ));
-        }
-
-        if (null !== $methods) {
-            foreach ($methods as $method) {
-                if (!preg_match('~[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*~', $method)) {
-                    throw new PHPUnit_Framework_Exception(
-                        sprintf(
-                            'Cannot stub or mock method with invalid name "%s"',
-                            $method
-                        )
-                    );
-                }
-            }
-
-            if ($methods != array_unique($methods)) {
-                throw new PHPUnit_Framework_MockObject_RuntimeException(
-                    sprintf(
-                        'Cannot stub or mock using a method list that contains duplicates: "%s"',
-                        implode(', ', $methods)
-                    )
-                );
-            }
-        }
-
-        if ($mockClassName != '' && class_exists($mockClassName, false)) {
-            $reflect = new ReflectionClass($mockClassName);
-
-            if (!$reflect->implementsInterface('PHPUnit_Framework_MockObject_MockObject')) {
-                throw new PHPUnit_Framework_MockObject_RuntimeException(
-                    sprintf(
-                        'Class "%s" already exists.',
-                        $mockClassName
-                    )
-                );
-            }
-        }
-
-        $mock = $this->generate(
-            $type,
-            $methods,
-            $mockClassName,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments,
-            $callOriginalMethods
-        );
-
-        return $this->getObject(
-            $mock['code'],
-            $mock['mockClassName'],
-            $type,
-            $callOriginalConstructor,
-            $callAutoload,
-            $arguments,
-            $callOriginalMethods,
-            $proxyTarget
-        );
-    }
-
-    /**
-     * @param  string       $code
-     * @param  string       $className
-     * @param  array|string $type
-     * @param  bool         $callOriginalConstructor
-     * @param  bool         $callAutoload
-     * @param  array        $arguments
-     * @param  bool         $callOriginalMethods
-     * @param  object       $proxyTarget
-     * @return object
-     */
-    protected function getObject($code, $className, $type = '', $callOriginalConstructor = false, $callAutoload = false, array $arguments = array(), $callOriginalMethods = false, $proxyTarget = null)
-    {
-        $this->evalClass($code, $className);
-
-        if ($callOriginalConstructor &&
-            is_string($type) &&
-            !interface_exists($type, $callAutoload)) {
-            if (count($arguments) == 0) {
-                $object = new $className;
-            } else {
-                $class  = new ReflectionClass($className);
-                $object = $class->newInstanceArgs($arguments);
-            }
-        } else {
-            try {
-                $instantiator = new Instantiator;
-                $object       = $instantiator->instantiate($className);
-            } catch (InstantiatorUnexpectedValueException $exception) {
-                if ($exception->getPrevious()) {
-                    $exception = $exception->getPrevious();
-                }
-
-                throw new PHPUnit_Framework_MockObject_RuntimeException(
-                    $exception->getMessage()
-                );
-            } catch (InstantiatorInvalidArgumentException $exception) {
-                throw new PHPUnit_Framework_MockObject_RuntimeException(
-                    $exception->getMessage()
-                );
-            }
-        }
-
-        if ($callOriginalMethods) {
-            if (!is_object($proxyTarget)) {
-                if (count($arguments) == 0) {
-                    $proxyTarget = new $type;
-                } else {
-                    $class       = new ReflectionClass($type);
-                    $proxyTarget = $class->newInstanceArgs($arguments);
-                }
-            }
-
-            $object->__phpunit_setOriginalObject($proxyTarget);
-        }
-
-        return $object;
-    }
-
-    /**
-     * @param string $code
-     * @param string $className
-     */
-    protected function evalClass($code, $className)
-    {
-        if (!class_exists($className, false)) {
-            eval($code);
-        }
-    }
-
-    /**
-     * Returns a mock object for the specified abstract class with all abstract
-     * methods of the class mocked. Concrete methods to mock can be specified with
-     * the last parameter
-     *
-     * @param  string $originalClassName
-     * @param  array  $arguments
-     * @param  string $mockClassName
-     * @param  bool   $callOriginalConstructor
-     * @param  bool   $callOriginalClone
-     * @param  bool   $callAutoload
-     * @param  array  $mockedMethods
-     * @param  bool   $cloneArguments
-     * @return object
-     * @since  Method available since Release 1.0.0
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = true)
-    {
-        if (!is_string($originalClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($mockClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
-        }
-
-        if (class_exists($originalClassName, $callAutoload) ||
-            interface_exists($originalClassName, $callAutoload)) {
-            $reflector = new ReflectionClass($originalClassName);
-            $methods   = $mockedMethods;
-
-            foreach ($reflector->getMethods() as $method) {
-                if ($method->isAbstract() && !in_array($method->getName(), $methods)) {
-                    $methods[] = $method->getName();
-                }
-            }
-
-            if (empty($methods)) {
-                $methods = null;
-            }
-
-            return $this->getMock(
-                $originalClassName,
-                $methods,
-                $arguments,
-                $mockClassName,
-                $callOriginalConstructor,
-                $callOriginalClone,
-                $callAutoload,
-                $cloneArguments
-            );
-        } else {
-            throw new PHPUnit_Framework_MockObject_RuntimeException(
-                sprintf('Class "%s" does not exist.', $originalClassName)
-            );
-        }
-    }
-
-    /**
-     * Returns a mock object for the specified trait with all abstract methods
-     * of the trait mocked. Concrete methods to mock can be specified with the
-     * `$mockedMethods` parameter.
-     *
-     * @param  string $traitName
-     * @param  array  $arguments
-     * @param  string $mockClassName
-     * @param  bool   $callOriginalConstructor
-     * @param  bool   $callOriginalClone
-     * @param  bool   $callAutoload
-     * @param  array  $mockedMethods
-     * @param  bool   $cloneArguments
-     * @return object
-     * @since  Method available since Release 1.2.3
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = true)
-    {
-        if (!is_string($traitName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($mockClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
-        }
-
-        if (!trait_exists($traitName, $callAutoload)) {
-            throw new PHPUnit_Framework_MockObject_RuntimeException(
-                sprintf(
-                    'Trait "%s" does not exist.',
-                    $traitName
-                )
-            );
-        }
-
-        $className = $this->generateClassName(
-            $traitName,
-            '',
-            'Trait_'
-        );
-
-        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
-                         DIRECTORY_SEPARATOR;
-        $classTemplate = new Text_Template(
-            $templateDir . 'trait_class.tpl'
-        );
-
-        $classTemplate->setVar(
-            array(
-            'prologue'   => 'abstract ',
-            'class_name' => $className['className'],
-            'trait_name' => $traitName
-            )
-        );
-
-        $this->evalClass(
-            $classTemplate->render(),
-            $className['className']
-        );
-
-        return $this->getMockForAbstractClass($className['className'], $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $mockedMethods, $cloneArguments);
-    }
-
-    /**
-     * Returns an object for the specified trait.
-     *
-     * @param  string $traitName
-     * @param  array  $arguments
-     * @param  string $traitClassName
-     * @param  bool   $callOriginalConstructor
-     * @param  bool   $callOriginalClone
-     * @param  bool   $callAutoload
-     * @return object
-     * @since  Method available since Release 1.1.0
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true)
-    {
-        if (!is_string($traitName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($traitClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
-        }
-
-        if (!trait_exists($traitName, $callAutoload)) {
-            throw new PHPUnit_Framework_MockObject_RuntimeException(
-                sprintf(
-                    'Trait "%s" does not exist.',
-                    $traitName
-                )
-            );
-        }
-
-        $className = $this->generateClassName(
-            $traitName,
-            $traitClassName,
-            'Trait_'
-        );
-
-        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
-                         DIRECTORY_SEPARATOR;
-        $classTemplate = new Text_Template(
-            $templateDir . 'trait_class.tpl'
-        );
-
-        $classTemplate->setVar(
-            array(
-            'prologue'   => '',
-            'class_name' => $className['className'],
-            'trait_name' => $traitName
-            )
-        );
-
-        return $this->getObject(
-            $classTemplate->render(),
-            $className['className']
-        );
-    }
-
-    /**
-     * @param  array|string $type
-     * @param  array        $methods
-     * @param  string       $mockClassName
-     * @param  bool         $callOriginalClone
-     * @param  bool         $callAutoload
-     * @param  bool         $cloneArguments
-     * @param  bool         $callOriginalMethods
-     * @return array
-     */
-    public function generate($type, array $methods = null, $mockClassName = '', $callOriginalClone = true, $callAutoload = true, $cloneArguments = true, $callOriginalMethods = false)
-    {
-        if (is_array($type)) {
-            sort($type);
-        }
-
-        if ($mockClassName == '') {
-            $key = md5(
-                is_array($type) ? implode('_', $type) : $type .
-                serialize($methods) .
-                serialize($callOriginalClone) .
-                serialize($cloneArguments) .
-                serialize($callOriginalMethods)
-            );
-
-            if (isset(self::$cache[$key])) {
-                return self::$cache[$key];
-            }
-        }
-
-        $mock = $this->generateMock(
-            $type,
-            $methods,
-            $mockClassName,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments,
-            $callOriginalMethods
-        );
-
-        if (isset($key)) {
-            self::$cache[$key] = $mock;
-        }
-
-        return $mock;
-    }
-
-    /**
-     * @param  string                                        $wsdlFile
-     * @param  string                                        $className
-     * @param  array                                         $methods
-     * @param  array                                         $options
-     * @return string
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     */
-    public function generateClassFromWsdl($wsdlFile, $className, array $methods = array(), array $options = array())
-    {
-        if (!extension_loaded('soap')) {
-            throw new PHPUnit_Framework_MockObject_RuntimeException(
-                'The SOAP extension is required to generate a mock object from WSDL.'
-            );
-        }
-
-        $options  = array_merge($options, array('cache_wsdl' => WSDL_CACHE_NONE));
-        $client   = new SoapClient($wsdlFile, $options);
-        $_methods = array_unique($client->__getFunctions());
-        unset($client);
-
-        sort($_methods);
-
-        $templateDir    = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' . DIRECTORY_SEPARATOR;
-        $methodTemplate = new Text_Template($templateDir . 'wsdl_method.tpl');
-        $methodsBuffer  = '';
-
-        foreach ($_methods as $method) {
-            $nameStart = strpos($method, ' ') + 1;
-            $nameEnd   = strpos($method, '(');
-            $name      = substr($method, $nameStart, $nameEnd - $nameStart);
-
-            if (empty($methods) || in_array($name, $methods)) {
-                $args    = explode(
-                    ',',
-                    substr(
-                        $method,
-                        $nameEnd + 1,
-                        strpos($method, ')') - $nameEnd - 1
-                    )
-                );
-                $numArgs = count($args);
-
-                for ($i = 0; $i < $numArgs; $i++) {
-                    $args[$i] = substr($args[$i], strpos($args[$i], '$'));
-                }
-
-                $methodTemplate->setVar(
-                    array(
-                        'method_name' => $name,
-                        'arguments'   => implode(', ', $args)
-                    )
-                );
-
-                $methodsBuffer .= $methodTemplate->render();
-            }
-        }
-
-        $optionsBuffer = 'array(';
-
-        foreach ($options as $key => $value) {
-            $optionsBuffer .= $key . ' => ' . $value;
-        }
-
-        $optionsBuffer .= ')';
-
-        $classTemplate = new Text_Template($templateDir . 'wsdl_class.tpl');
-        $namespace     = '';
-
-        if (strpos($className, '\\') !== false) {
-            $parts     = explode('\\', $className);
-            $className = array_pop($parts);
-            $namespace = 'namespace ' . implode('\\', $parts) . ';' . "\n\n";
-        }
-
-        $classTemplate->setVar(
-            array(
-                'namespace'  => $namespace,
-                'class_name' => $className,
-                'wsdl'       => $wsdlFile,
-                'options'    => $optionsBuffer,
-                'methods'    => $methodsBuffer
-            )
-        );
-
-        return $classTemplate->render();
-    }
-
-    /**
-     * @param  array|string                $type
-     * @param  array|null                  $methods
-     * @param  string                      $mockClassName
-     * @param  bool                        $callOriginalClone
-     * @param  bool                        $callAutoload
-     * @param  bool                        $cloneArguments
-     * @param  bool                        $callOriginalMethods
-     * @return array
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function generateMock($type, $methods, $mockClassName, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods)
-    {
-        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
-                         DIRECTORY_SEPARATOR;
-        $classTemplate = new Text_Template(
-            $templateDir . 'mocked_class.tpl'
-        );
-
-        $additionalInterfaces = array();
-        $cloneTemplate        = '';
-        $isClass              = false;
-        $isInterface          = false;
-
-        $mockClassName = $this->generateClassName(
-            $type,
-            $mockClassName,
-            'Mock_'
-        );
-
-        if (is_array($type)) {
-            foreach ($type as $_type) {
-                if (!interface_exists($_type, $callAutoload)) {
-                    throw new PHPUnit_Framework_Exception(
-                        sprintf(
-                            'Interface "%s" does not exist.',
-                            $_type
-                        )
-                    );
-                }
-
-                $additionalInterfaces[] = $_type;
-
-                foreach ($this->getClassMethods($_type) as $method) {
-                    if (in_array($method, $methods)) {
-                        throw new PHPUnit_Framework_Exception(
-                            sprintf(
-                                'Duplicate method "%s" not allowed.',
-                                $method
-                            )
-                        );
-                    }
-
-                    $methods[] = $method;
-                }
-            }
-        }
-
-        if (class_exists($mockClassName['fullClassName'], $callAutoload)) {
-            $isClass = true;
-        } else {
-            if (interface_exists($mockClassName['fullClassName'], $callAutoload)) {
-                $isInterface = true;
-            }
-        }
-
-        if (!class_exists($mockClassName['fullClassName'], $callAutoload) &&
-            !interface_exists($mockClassName['fullClassName'], $callAutoload)) {
-            $prologue = 'class ' . $mockClassName['originalClassName'] . "\n{\n}\n\n";
-
-            if (!empty($mockClassName['namespaceName'])) {
-                $prologue = 'namespace ' . $mockClassName['namespaceName'] .
-                            " {\n\n" . $prologue . "}\n\n" .
-                            "namespace {\n\n";
-
-                $epilogue = "\n\n}";
-            }
-
-            $cloneTemplate = new Text_Template(
-                $templateDir . 'mocked_clone.tpl'
-            );
-        } else {
-            $class = new ReflectionClass($mockClassName['fullClassName']);
-
-            if ($class->isFinal()) {
-                throw new PHPUnit_Framework_Exception(
-                    sprintf(
-                        'Class "%s" is declared "final" and cannot be mocked.',
-                        $mockClassName['fullClassName']
-                    )
-                );
-            }
-
-            if ($class->hasMethod('__clone')) {
-                $cloneMethod = $class->getMethod('__clone');
-
-                if (!$cloneMethod->isFinal()) {
-                    if ($callOriginalClone && !$isInterface) {
-                        $cloneTemplate = new Text_Template(
-                            $templateDir . 'unmocked_clone.tpl'
-                        );
-                    } else {
-                        $cloneTemplate = new Text_Template(
-                            $templateDir . 'mocked_clone.tpl'
-                        );
-                    }
-                }
-            } else {
-                $cloneTemplate = new Text_Template(
-                    $templateDir . 'mocked_clone.tpl'
-                );
-            }
-        }
-
-        if (is_object($cloneTemplate)) {
-            $cloneTemplate = $cloneTemplate->render();
-        }
-
-        if (is_array($methods) && empty($methods) &&
-            ($isClass || $isInterface)) {
-            $methods = $this->getClassMethods($mockClassName['fullClassName']);
-        }
-
-        if (!is_array($methods)) {
-            $methods = array();
-        }
-
-        $mockedMethods = '';
-
-        if (isset($class)) {
-            // https://github.com/sebastianbergmann/phpunit-mock-objects/issues/103
-            if ($isInterface && $class->implementsInterface('Traversable') &&
-                !$class->implementsInterface('Iterator') &&
-                !$class->implementsInterface('IteratorAggregate')) {
-                $additionalInterfaces[] = 'Iterator';
-                $methods                = array_merge($methods, $this->getClassMethods('Iterator'));
-            }
-
-            foreach ($methods as $methodName) {
-                try {
-                    $method = $class->getMethod($methodName);
-
-                    if ($this->canMockMethod($method)) {
-                        $mockedMethods .= $this->generateMockedMethodDefinitionFromExisting(
-                            $templateDir,
-                            $method,
-                            $cloneArguments,
-                            $callOriginalMethods
-                        );
-                    }
-                } catch (ReflectionException $e) {
-                    $mockedMethods .= $this->generateMockedMethodDefinition(
-                        $templateDir,
-                        $mockClassName['fullClassName'],
-                        $methodName,
-                        $cloneArguments
-                    );
-                }
-            }
-        } else {
-            foreach ($methods as $methodName) {
-                $mockedMethods .= $this->generateMockedMethodDefinition(
-                    $templateDir,
-                    $mockClassName['fullClassName'],
-                    $methodName,
-                    $cloneArguments
-                );
-            }
-        }
-
-        $method = '';
-
-        if (!in_array('method', $methods)) {
-            $methodTemplate = new Text_Template(
-                $templateDir . 'mocked_class_method.tpl'
-            );
-
-            $method = $methodTemplate->render();
-        }
-
-        $classTemplate->setVar(
-            array(
-            'prologue'          => isset($prologue) ? $prologue : '',
-            'epilogue'          => isset($epilogue) ? $epilogue : '',
-            'class_declaration' => $this->generateMockClassDeclaration(
-                $mockClassName,
-                $isInterface,
-                $additionalInterfaces
-            ),
-            'clone'             => $cloneTemplate,
-            'mock_class_name'   => $mockClassName['className'],
-            'mocked_methods'    => $mockedMethods,
-            'method'            => $method
-            )
-        );
-
-        return array(
-          'code'          => $classTemplate->render(),
-          'mockClassName' => $mockClassName['className']
-        );
-    }
-
-    /**
-     * @param  array|string $type
-     * @param  string       $className
-     * @param  string       $prefix
-     * @return array
-     */
-    protected function generateClassName($type, $className, $prefix)
-    {
-        if (is_array($type)) {
-            $type = implode('_', $type);
-        }
-
-        if ($type[0] == '\\') {
-            $type = substr($type, 1);
-        }
-
-        $classNameParts = explode('\\', $type);
-
-        if (count($classNameParts) > 1) {
-            $type          = array_pop($classNameParts);
-            $namespaceName = implode('\\', $classNameParts);
-            $fullClassName = $namespaceName . '\\' . $type;
-        } else {
-            $namespaceName = '';
-            $fullClassName = $type;
-        }
-
-        if ($className == '') {
-            do {
-                $className = $prefix . $type . '_' .
-                             substr(md5(microtime()), 0, 8);
-            } while (class_exists($className, false));
-        }
-
-        return array(
-          'className'         => $className,
-          'originalClassName' => $type,
-          'fullClassName'     => $fullClassName,
-          'namespaceName'     => $namespaceName
-        );
-    }
-
-    /**
-     * @param  array $mockClassName
-     * @param  bool  $isInterface
-     * @param  array $additionalInterfaces
-     * @return array
-     */
-    protected function generateMockClassDeclaration(array $mockClassName, $isInterface, array $additionalInterfaces = array())
-    {
-        $buffer = 'class ';
-
-        $additionalInterfaces[] = 'PHPUnit_Framework_MockObject_MockObject';
-        $interfaces             = implode(', ', $additionalInterfaces);
-
-        if ($isInterface) {
-            $buffer .= sprintf(
-                '%s implements %s',
-                $mockClassName['className'],
-                $interfaces
-            );
-
-            if (!in_array($mockClassName['originalClassName'], $additionalInterfaces)) {
-                $buffer .= ', ';
-
-                if (!empty($mockClassName['namespaceName'])) {
-                    $buffer .= $mockClassName['namespaceName'] . '\\';
-                }
-
-                $buffer .= $mockClassName['originalClassName'];
-            }
-        } else {
-            $buffer .= sprintf(
-                '%s extends %s%s implements %s',
-                $mockClassName['className'],
-                !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
-                $mockClassName['originalClassName'],
-                $interfaces
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  string           $templateDir
-     * @param  ReflectionMethod $method
-     * @param  bool             $cloneArguments
-     * @param  bool             $callOriginalMethods
-     * @return string
-     */
-    protected function generateMockedMethodDefinitionFromExisting($templateDir, ReflectionMethod $method, $cloneArguments, $callOriginalMethods)
-    {
-        if ($method->isPrivate()) {
-            $modifier = 'private';
-        } elseif ($method->isProtected()) {
-            $modifier = 'protected';
-        } else {
-            $modifier = 'public';
-        }
-
-        if ($method->isStatic()) {
-            $modifier .= ' static';
-        }
-
-        if ($method->returnsReference()) {
-            $reference = '&';
-        } else {
-            $reference = '';
-        }
-
-        return $this->generateMockedMethodDefinition(
-            $templateDir,
-            $method->getDeclaringClass()->getName(),
-            $method->getName(),
-            $cloneArguments,
-            $modifier,
-            $this->getMethodParameters($method),
-            $this->getMethodParameters($method, true),
-            $reference,
-            $callOriginalMethods,
-            $method->isStatic()
-        );
-    }
-
-    /**
-     * @param  string $templateDir
-     * @param  string $className
-     * @param  string $methodName
-     * @param  bool   $cloneArguments
-     * @param  string $modifier
-     * @param  string $arguments_decl
-     * @param  string $arguments_call
-     * @param  string $reference
-     * @param  bool   $callOriginalMethods
-     * @param  bool   $static
-     * @return string
-     */
-    protected function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = true, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $callOriginalMethods = false, $static = false)
-    {
-        if ($static) {
-            $templateFile = 'mocked_static_method.tpl';
-        } else {
-            $templateFile = sprintf(
-                '%s_method.tpl',
-                $callOriginalMethods ? 'proxied' : 'mocked'
-            );
-        }
-
-        $template = new Text_Template($templateDir . $templateFile);
-
-        $template->setVar(
-            array(
-            'arguments_decl'  => $arguments_decl,
-            'arguments_call'  => $arguments_call,
-            'arguments_count' => !empty($arguments_call) ? count(explode(',', $arguments_call)) : 0,
-            'class_name'      => $className,
-            'method_name'     => $methodName,
-            'modifier'        => $modifier,
-            'reference'       => $reference,
-            'clone_arguments' => $cloneArguments ? 'TRUE' : 'FALSE'
-            )
-        );
-
-        return $template->render();
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     */
-    protected function canMockMethod(ReflectionMethod $method)
-    {
-        if ($method->isConstructor() ||
-            $method->isFinal() ||
-            $method->isPrivate() ||
-            isset($this->blacklistedMethodNames[$method->getName()])) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the parameters of a function or method.
-     *
-     * @param  ReflectionMethod                              $method
-     * @param  bool                                          $forCall
-     * @return string
-     * @throws PHPUnit_Framework_MockObject_RuntimeException
-     * @since  Method available since Release 2.0.0
-     */
-    protected function getMethodParameters(ReflectionMethod $method, $forCall = false)
-    {
-        $parameters = array();
-
-        foreach ($method->getParameters() as $i => $parameter) {
-            $name = '$' . $parameter->getName();
-
-            /* Note: PHP extensions may use empty names for reference arguments
-             * or "..." for methods taking a variable number of arguments.
-             */
-            if ($name === '$' || $name === '$...') {
-                $name = '$arg' . $i;
-            }
-
-            if ($this->isVariadic($parameter)) {
-                if ($forCall) {
-                    continue;
-                } else {
-                    $name = '...' . $name;
-                }
-            }
-
-            $default         = '';
-            $reference       = '';
-            $typeDeclaration = '';
-
-            if (!$forCall) {
-                if ($this->hasType($parameter)) {
-                    $typeDeclaration = (string) $parameter->getType() . ' ';
-                } elseif ($parameter->isArray()) {
-                    $typeDeclaration = 'array ';
-                } elseif ((defined('HHVM_VERSION') || version_compare(PHP_VERSION, '5.4.0', '>='))
-                          && $parameter->isCallable()) {
-                    $typeDeclaration = 'callable ';
-                } else {
-                    try {
-                        $class = $parameter->getClass();
-                    } catch (ReflectionException $e) {
-                        throw new PHPUnit_Framework_MockObject_RuntimeException(
-                            sprintf(
-                                'Cannot mock %s::%s() because a class or ' .
-                                'interface used in the signature is not loaded',
-                                $method->getDeclaringClass()->getName(),
-                                $method->getName()
-                            ),
-                            0,
-                            $e
-                        );
-                    }
-
-                    if ($class !== null) {
-                        $typeDeclaration = $class->getName() . ' ';
-                    }
-                }
-
-                if (!$this->isVariadic($parameter)) {
-                    if ($parameter->isDefaultValueAvailable()) {
-                        $value   = $parameter->getDefaultValue();
-                        $default = ' = ' . var_export($value, true);
-                    } elseif ($parameter->isOptional()) {
-                        $default = ' = null';
-                    }
-                }
-            }
-
-            if ($parameter->isPassedByReference()) {
-                $reference = '&';
-            }
-
-            $parameters[] = $typeDeclaration . $reference . $name . $default;
-        }
-
-        return implode(', ', $parameters);
-    }
-
-    /**
-     * @param  ReflectionParameter $parameter
-     * @return bool
-     * @since  Method available since Release 2.2.1
-     */
-    private function isVariadic(ReflectionParameter $parameter)
-    {
-        return method_exists('ReflectionParameter', 'isVariadic') && $parameter->isVariadic();
-    }
-
-    /**
-     * @param  ReflectionParameter $parameter
-     * @return bool
-     * @since  Method available since Release 2.3.4
-     */
-    private function hasType(ReflectionParameter $parameter)
-    {
-        return method_exists('ReflectionParameter', 'hasType') && $parameter->hasType();
-    }
-
-    /**
-     * @param  string $className
-     * @return array
-     * @since  Method available since Release 2.3.2
-     */
-    private function getClassMethods($className)
-    {
-        $class   = new ReflectionClass($className);
-        $methods = array();
-
-        foreach ($class->getMethods() as $method) {
-            if (($method->isPublic() || $method->isAbstract()) && !in_array($method->getName(), $methods)) {
-                $methods[] = $method->getName();
-            }
-        }
-
-        return $methods;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
deleted file mode 100644
index a9a94cd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
+++ /dev/null
@@ -1,36 +0,0 @@
-{prologue}{class_declaration}
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-{clone}{mocked_methods}
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-{method}
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}{epilogue}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
deleted file mode 100644
index 9e29c0d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
deleted file mode 100644
index bd846de..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
deleted file mode 100644
index e2f55d9..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-    {modifier} function {reference}{method_name}({arguments_decl})
-    {
-        $arguments = array({arguments_call});
-        $count     = func_num_args();
-
-        if ($count > {arguments_count}) {
-            $_arguments = func_get_args();
-
-            for ($i = {arguments_count}; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            '{class_name}', '{method_name}', $arguments, $this, {clone_arguments}
-          )
-        );
-
-        return $result;
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
deleted file mode 100644
index 5454b2f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-
-    {modifier} function {reference}{method_name}({arguments_decl})
-    {
-        throw new PHPUnit_Framework_MockObject_BadMethodCallException;
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
deleted file mode 100644
index 15e89bd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-    {modifier} function {reference}{method_name}({arguments_decl})
-    {
-        $arguments = array({arguments_call});
-        $count     = func_num_args();
-
-        if ($count > {arguments_count}) {
-            $_arguments = func_get_args();
-
-            for ($i = {arguments_count}; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            '{class_name}', '{method_name}', $arguments, $this, {clone_arguments}
-          )
-        );
-
-        return call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $arguments);
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
deleted file mode 100644
index 4143b0f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-{prologue}class {class_name}
-{
-    use {trait_name};
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
deleted file mode 100644
index fa0e70a..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
+++ /dev/null
@@ -1,5 +0,0 @@
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        parent::__clone();
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
deleted file mode 100644
index cc69fd3..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
+++ /dev/null
@@ -1,7 +0,0 @@
-{namespace}class {class_name} extends \SoapClient
-{
-    public function __construct($wsdl, array $options)
-    {
-        parent::__construct('{wsdl}', $options);
-    }
-{methods}}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
deleted file mode 100644
index bb16e76..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-
-    public function {method_name}({arguments})
-    {
-    }
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
deleted file mode 100644
index 055707d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for invocations.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Invocation
-{
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
deleted file mode 100644
index 575c13c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a non-static invocation.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Invocation_Object extends PHPUnit_Framework_MockObject_Invocation_Static
-{
-    /**
-     * @var object
-     */
-    public $object;
-
-    /**
-     * @param string $className
-     * @param string $methodname
-     * @param array  $parameters
-     * @param object $object
-     * @param object $cloneObjects
-     */
-    public function __construct($className, $methodName, array $parameters, $object, $cloneObjects = false)
-    {
-        parent::__construct($className, $methodName, $parameters, $cloneObjects);
-        $this->object = $object;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
deleted file mode 100644
index 3d295e5..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Represents a static invocation.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Invocation_Static implements PHPUnit_Framework_MockObject_Invocation, PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * @var array
-     */
-    protected static $uncloneableExtensions = array(
-      'mysqli'    => true,
-      'SQLite'    => true,
-      'sqlite3'   => true,
-      'tidy'      => true,
-      'xmlwriter' => true,
-      'xsl'       => true
-    );
-
-    /**
-     * @var array
-     */
-    protected static $uncloneableClasses = array(
-      'Closure',
-      'COMPersistHelper',
-      'IteratorIterator',
-      'RecursiveIteratorIterator',
-      'SplFileObject',
-      'PDORow',
-      'ZipArchive'
-    );
-
-    /**
-     * @var string
-     */
-    public $className;
-
-    /**
-     * @var string
-     */
-    public $methodName;
-
-    /**
-     * @var array
-     */
-    public $parameters;
-
-    /**
-     * @param string $className
-     * @param string $methodname
-     * @param array  $parameters
-     * @param bool   $cloneObjects
-     */
-    public function __construct($className, $methodName, array $parameters, $cloneObjects = false)
-    {
-        $this->className  = $className;
-        $this->methodName = $methodName;
-        $this->parameters = $parameters;
-
-        if (!$cloneObjects) {
-            return;
-        }
-
-        foreach ($this->parameters as $key => $value) {
-            if (is_object($value)) {
-                $this->parameters[$key] = $this->cloneObject($value);
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $exporter = new Exporter;
-
-        return sprintf(
-            '%s::%s(%s)',
-            $this->className,
-            $this->methodName,
-            implode(
-                ', ',
-                array_map(
-                    array($exporter, 'shortenedExport'),
-                    $this->parameters
-                )
-            )
-        );
-    }
-
-    /**
-     * @param  object $original
-     * @return object
-     */
-    protected function cloneObject($original)
-    {
-        $cloneable = null;
-        $object    = new ReflectionObject($original);
-
-        // Check the blacklist before asking PHP reflection to work around
-        // https://bugs.php.net/bug.php?id=53967
-        if ($object->isInternal() &&
-            isset(self::$uncloneableExtensions[$object->getExtensionName()])) {
-            $cloneable = false;
-        }
-
-        if ($cloneable === null) {
-            foreach (self::$uncloneableClasses as $class) {
-                if ($original instanceof $class) {
-                    $cloneable = false;
-                    break;
-                }
-            }
-        }
-
-        if ($cloneable === null && method_exists($object, 'isCloneable')) {
-            $cloneable = $object->isCloneable();
-        }
-
-        if ($cloneable === null && $object->hasMethod('__clone')) {
-            $method    = $object->getMethod('__clone');
-            $cloneable = $method->isPublic();
-        }
-
-        if ($cloneable === null) {
-            $cloneable = true;
-        }
-
-        if ($cloneable) {
-            try {
-                return clone $original;
-            } catch (Exception $e) {
-                return $original;
-            }
-        } else {
-            return $original;
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
deleted file mode 100644
index 4bec5d6..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Mocker for invocations which are sent from
- * PHPUnit_Framework_MockObject_MockObject objects.
- *
- * Keeps track of all expectations and stubs as well as registering
- * identifications for builders.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_InvocationMocker implements PHPUnit_Framework_MockObject_Stub_MatcherCollection, PHPUnit_Framework_MockObject_Invokable, PHPUnit_Framework_MockObject_Builder_Namespace
-{
-    /**
-     * @var PHPUnit_Framework_MockObject_Matcher_Invocation[]
-     */
-    protected $matchers = array();
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Builder_Match[]
-     */
-    protected $builderMap = array();
-
-    /**
-     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
-     */
-    public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        $this->matchers[] = $matcher;
-    }
-
-    /**
-     * @since Method available since Release 1.1.0
-     */
-    public function hasMatchers()
-    {
-        foreach ($this->matchers as $matcher) {
-            if ($matcher->hasMatchers()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param  mixed     $id
-     * @return bool|null
-     */
-    public function lookupId($id)
-    {
-        if (isset($this->builderMap[$id])) {
-            return $this->builderMap[$id];
-        }
-
-        return;
-    }
-
-    /**
-     * @param  mixed                                      $id
-     * @param  PHPUnit_Framework_MockObject_Builder_Match $builder
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $builder)
-    {
-        if (isset($this->builderMap[$id])) {
-            throw new PHPUnit_Framework_Exception(
-                'Match builder with id <' . $id . '> is already registered.'
-            );
-        }
-
-        $this->builderMap[$id] = $builder;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return new PHPUnit_Framework_MockObject_Builder_InvocationMocker(
-            $this,
-            $matcher
-        );
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return mixed
-     */
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $exception      = null;
-        $hasReturnValue = false;
-
-        if (strtolower($invocation->methodName) == '__tostring') {
-            $returnValue = '';
-        } else {
-            $returnValue = null;
-        }
-
-        foreach ($this->matchers as $match) {
-            try {
-                if ($match->matches($invocation)) {
-                    $value = $match->invoked($invocation);
-
-                    if (!$hasReturnValue) {
-                        $returnValue    = $value;
-                        $hasReturnValue = true;
-                    }
-                }
-            } catch (Exception $e) {
-                $exception = $e;
-            }
-        }
-
-        if ($exception !== null) {
-            throw $exception;
-        }
-
-        return $returnValue;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        foreach ($this->matchers as $matcher) {
-            if (!$matcher->matches($invocation)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function verify()
-    {
-        foreach ($this->matchers as $matcher) {
-            $matcher->verify();
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
deleted file mode 100644
index b5699a0..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for classes which can be invoked.
- *
- * The invocation will be taken from a mock object and passed to an object
- * of this class.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Invokable extends PHPUnit_Framework_MockObject_Verifiable
-{
-    /**
-     * Invokes the invocation object $invocation so that it can be checked for
-     * expectations or matched against stubs.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             The invocation object passed from mock object.
-     * @return object
-     */
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
-
-    /**
-     * Checks if the invocation matches.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             The invocation object passed from mock object.
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
deleted file mode 100644
index da3bcde..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Main matcher which defines a full expectation using method, parameter and
- * invocation matchers.
- * This matcher encapsulates all the other matchers and allows the builder to
- * set the specific matchers when the appropriate methods are called (once(),
- * where() etc.).
- *
- * All properties are public so that they can easily be accessed by the builder.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher implements PHPUnit_Framework_MockObject_Matcher_Invocation
-{
-    /**
-     * @var PHPUnit_Framework_MockObject_Matcher_Invocation
-     */
-    public $invocationMatcher;
-
-    /**
-     * @var mixed
-     */
-    public $afterMatchBuilderId = null;
-
-    /**
-     * @var bool
-     */
-    public $afterMatchBuilderIsInvoked = false;
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Matcher_MethodName
-     */
-    public $methodNameMatcher = null;
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Matcher_Parameters
-     */
-    public $parametersMatcher = null;
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Stub
-     */
-    public $stub = null;
-
-    /**
-     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
-     */
-    public function __construct(PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
-    {
-        $this->invocationMatcher = $invocationMatcher;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $list = array();
-
-        if ($this->invocationMatcher !== null) {
-            $list[] = $this->invocationMatcher->toString();
-        }
-
-        if ($this->methodNameMatcher !== null) {
-            $list[] = 'where ' . $this->methodNameMatcher->toString();
-        }
-
-        if ($this->parametersMatcher !== null) {
-            $list[] = 'and ' . $this->parametersMatcher->toString();
-        }
-
-        if ($this->afterMatchBuilderId !== null) {
-            $list[] = 'after ' . $this->afterMatchBuilderId;
-        }
-
-        if ($this->stub !== null) {
-            $list[] = 'will ' . $this->stub->toString();
-        }
-
-        return implode(' ', $list);
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return mixed
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        if ($this->invocationMatcher === null) {
-            throw new PHPUnit_Framework_Exception(
-                'No invocation matcher is set'
-            );
-        }
-
-        if ($this->methodNameMatcher === null) {
-            throw new PHPUnit_Framework_Exception('No method matcher is set');
-        }
-
-        if ($this->afterMatchBuilderId !== null) {
-            $builder = $invocation->object
-                                  ->__phpunit_getInvocationMocker()
-                                  ->lookupId($this->afterMatchBuilderId);
-
-            if (!$builder) {
-                throw new PHPUnit_Framework_Exception(
-                    sprintf(
-                        'No builder found for match builder identification <%s>',
-                        $this->afterMatchBuilderId
-                    )
-                );
-            }
-
-            $matcher = $builder->getMatcher();
-
-            if ($matcher && $matcher->invocationMatcher->hasBeenInvoked()) {
-                $this->afterMatchBuilderIsInvoked = true;
-            }
-        }
-
-        $this->invocationMatcher->invoked($invocation);
-
-        try {
-            if ($this->parametersMatcher !== null &&
-                !$this->parametersMatcher->matches($invocation)) {
-                $this->parametersMatcher->verify();
-            }
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    "Expectation failed for %s when %s\n%s",
-                    $this->methodNameMatcher->toString(),
-                    $this->invocationMatcher->toString(),
-                    $e->getMessage()
-                ),
-                $e->getComparisonFailure()
-            );
-        }
-
-        if ($this->stub) {
-            return $this->stub->invoke($invocation);
-        }
-
-        return;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        if ($this->afterMatchBuilderId !== null) {
-            $builder = $invocation->object
-                                  ->__phpunit_getInvocationMocker()
-                                  ->lookupId($this->afterMatchBuilderId);
-
-            if (!$builder) {
-                throw new PHPUnit_Framework_Exception(
-                    sprintf(
-                        'No builder found for match builder identification <%s>',
-                        $this->afterMatchBuilderId
-                    )
-                );
-            }
-
-            $matcher = $builder->getMatcher();
-
-            if (!$matcher) {
-                return false;
-            }
-
-            if (!$matcher->invocationMatcher->hasBeenInvoked()) {
-                return false;
-            }
-        }
-
-        if ($this->invocationMatcher === null) {
-            throw new PHPUnit_Framework_Exception(
-                'No invocation matcher is set'
-            );
-        }
-
-        if ($this->methodNameMatcher === null) {
-            throw new PHPUnit_Framework_Exception('No method matcher is set');
-        }
-
-        if (!$this->invocationMatcher->matches($invocation)) {
-            return false;
-        }
-
-        try {
-            if (!$this->methodNameMatcher->matches($invocation)) {
-                return false;
-            }
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    "Expectation failed for %s when %s\n%s",
-                    $this->methodNameMatcher->toString(),
-                    $this->invocationMatcher->toString(),
-                    $e->getMessage()
-                ),
-                $e->getComparisonFailure()
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * @throws PHPUnit_Framework_Exception
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        if ($this->invocationMatcher === null) {
-            throw new PHPUnit_Framework_Exception(
-                'No invocation matcher is set'
-            );
-        }
-
-        if ($this->methodNameMatcher === null) {
-            throw new PHPUnit_Framework_Exception('No method matcher is set');
-        }
-
-        try {
-            $this->invocationMatcher->verify();
-
-            if ($this->parametersMatcher === null) {
-                $this->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_AnyParameters;
-            }
-
-            $invocationIsAny   = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount';
-            $invocationIsNever = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_InvokedCount' && $this->invocationMatcher->isNever();
-            if (!$invocationIsAny && !$invocationIsNever) {
-                $this->parametersMatcher->verify();
-            }
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    "Expectation failed for %s when %s.\n%s",
-                    $this->methodNameMatcher->toString(),
-                    $this->invocationMatcher->toString(),
-                    PHPUnit_Framework_TestFailure::exceptionToString($e)
-                )
-            );
-        }
-    }
-
-    /**
-     * @since Method available since Release 1.2.4
-     */
-    public function hasMatchers()
-    {
-        if ($this->invocationMatcher !== null &&
-            !$this->invocationMatcher instanceof PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
deleted file mode 100644
index 480f1fd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method has been invoked zero or more
- * times. This matcher will always match.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
-{
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked zero or more times';
-    }
-
-    /**
-     */
-    public function verify()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
deleted file mode 100644
index 482a14f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which allows any parameters to a method.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_AnyParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
-{
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'with any parameters';
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        return true;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
deleted file mode 100644
index adf74bb..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which looks for sets of specific parameters in the invocations.
- *
- * Checks the parameters of the incoming invocations, the parameter list is
- * checked against the defined constraints in $parameters. If the constraint
- * is met it will return true in matches().
- *
- * It takes a list of match groups and and increases a call index after each invocation.
- * So the first invocation uses the first group of constraints, the second the next and so on.
- */
-class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
-{
-    /**
-     * @var array
-     */
-    private $_parameterGroups = array();
-
-    /**
-     * @var array
-     */
-    private $_invocations = array();
-
-    /**
-     * @param array $parameterGroups
-     */
-    public function __construct(array $parameterGroups)
-    {
-        foreach ($parameterGroups as $index => $parameters) {
-            foreach ($parameters as $parameter) {
-                if (!($parameter instanceof \PHPUnit_Framework_Constraint)) {
-                    $parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter);
-                }
-                $this->_parameterGroups[$index][] = $parameter;
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $text = 'with consecutive parameters';
-
-        return $text;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $this->_invocations[] = $invocation;
-        $callIndex            = count($this->_invocations) - 1;
-        $this->verifyInvocation($invocation, $callIndex);
-
-        return false;
-    }
-
-    public function verify()
-    {
-        foreach ($this->_invocations as $callIndex => $invocation) {
-            $this->verifyInvocation($invocation, $callIndex);
-        }
-    }
-
-    /**
-     * Verify a single invocation
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
-     * @param  int                                          $callIndex
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex)
-    {
-
-        if (isset($this->_parameterGroups[$callIndex])) {
-            $parameters = $this->_parameterGroups[$callIndex];
-        } else {
-          // no parameter assertion for this call index
-            return;
-        }
-
-        if ($invocation === null) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                'Mocked method does not exist.'
-            );
-        }
-
-        if (count($invocation->parameters) < count($parameters)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    'Parameter count for invocation %s is too low.',
-                    $invocation->toString()
-                )
-            );
-        }
-
-        foreach ($parameters as $i => $parameter) {
-            $parameter->evaluate(
-                $invocation->parameters[$i],
-                sprintf(
-                    'Parameter %s for invocation #%d %s does not match expected ' .
-                    'value.',
-                    $i,
-                    $callIndex,
-                    $invocation->toString()
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
deleted file mode 100644
index cbe428c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for classes which matches an invocation based on its
- * method name, argument, order or call count.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Matcher_Invocation extends PHPUnit_Framework_SelfDescribing, PHPUnit_Framework_MockObject_Verifiable
-{
-    /**
-     * Registers the invocation $invocation in the object as being invoked.
-     * This will only occur after matches() returns true which means the
-     * current invocation is the correct one.
-     *
-     * The matcher can store information from the invocation which can later
-     * be checked in verify(), or it can check the values directly and throw
-     * and exception if an expectation is not met.
-     *
-     * If the matcher is a stub it will also have a return value.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             Object containing information on a mocked or stubbed method which
-     *                                                             was invoked.
-     * @return mixed
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation);
-
-    /**
-     * Checks if the invocation $invocation matches the current rules. If it does
-     * the matcher will get the invoked() method called which should check if an
-     * expectation is met.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             Object containing information on a mocked or stubbed method which
-     *                                                             was invoked.
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
deleted file mode 100644
index 1b17089..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method was invoked at a certain index.
- *
- * If the expected index number does not match the current invocation index it
- * will not match which means it skips all method and parameter matching. Only
- * once the index is reached will the method and parameter start matching and
- * verifying.
- *
- * If the index is never reached it will throw an exception in index.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex implements PHPUnit_Framework_MockObject_Matcher_Invocation
-{
-    /**
-     * @var int
-     */
-    protected $sequenceIndex;
-
-    /**
-     * @var int
-     */
-    protected $currentIndex = -1;
-
-    /**
-     * @param int $sequenceIndex
-     */
-    public function __construct($sequenceIndex)
-    {
-        $this->sequenceIndex = $sequenceIndex;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked at sequence index ' . $this->sequenceIndex;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $this->currentIndex++;
-
-        return $this->currentIndex == $this->sequenceIndex;
-    }
-
-    /**
-     * @param PHPUnit_Framework_MockObject_Invocation $invocation
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-    }
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        if ($this->currentIndex < $this->sequenceIndex) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    'The expected invocation at index %s was never reached.',
-                    $this->sequenceIndex
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php
deleted file mode 100644
index 23bf05b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method has been invoked at least
- * N times.
- *
- * @since Class available since Release 2.2.0
- */
-class PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
-{
-    /**
-     * @var int
-     */
-    private $requiredInvocations;
-
-    /**
-     * @param int $requiredInvocations
-     */
-    public function __construct($requiredInvocations)
-    {
-        $this->requiredInvocations = $requiredInvocations;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked at least ' . $this->requiredInvocations . ' times';
-    }
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        $count = $this->getInvocationCount();
-
-        if ($count < $this->requiredInvocations) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                'Expected invocation at least ' . $this->requiredInvocations .
-                ' times but it occured ' . $count . ' time(s).'
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
deleted file mode 100644
index 4df2dd1..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method has been invoked at least one
- * time.
- *
- * If the number of invocations is 0 it will throw an exception in verify.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
-{
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked at least once';
-    }
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        $count = $this->getInvocationCount();
-
-        if ($count < 1) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                'Expected invocation at least once but it never occured.'
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php
deleted file mode 100644
index df9f124..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method has been invoked at least
- * N times.
- *
- * @since Class available since Release 2.2.0
- */
-class PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
-{
-    /**
-     * @var int
-     */
-    private $allowedInvocations;
-
-    /**
-     * @param int $allowedInvocations
-     */
-    public function __construct($allowedInvocations)
-    {
-        $this->allowedInvocations = $allowedInvocations;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked at most ' . $this->allowedInvocations . ' times';
-    }
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        $count = $this->getInvocationCount();
-
-        if ($count > $this->allowedInvocations) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                'Expected invocation at most ' . $this->allowedInvocations .
-                ' times but it occured ' . $count . ' time(s).'
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
deleted file mode 100644
index d87dd35..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which checks if a method has been invoked a certain amount
- * of times.
- * If the number of invocations exceeds the value it will immediately throw an
- * exception,
- * If the number is less it will later be checked in verify() and also throw an
- * exception.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_InvokedCount extends PHPUnit_Framework_MockObject_Matcher_InvokedRecorder
-{
-    /**
-     * @var int
-     */
-    protected $expectedCount;
-
-    /**
-     * @param int $expectedCount
-     */
-    public function __construct($expectedCount)
-    {
-        $this->expectedCount = $expectedCount;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNever()
-    {
-        return $this->expectedCount == 0;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'invoked ' . $this->expectedCount . ' time(s)';
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        parent::invoked($invocation);
-
-        $count = $this->getInvocationCount();
-
-        if ($count > $this->expectedCount) {
-            $message = $invocation->toString() . ' ';
-
-            switch ($this->expectedCount) {
-                case 0: {
-                    $message .= 'was not expected to be called.';
-                }
-                break;
-
-                case 1: {
-                    $message .= 'was not expected to be called more than once.';
-                }
-                break;
-
-                default: {
-                    $message .= sprintf(
-                        'was not expected to be called more than %d times.',
-                        $this->expectedCount
-                    );
-                    }
-            }
-
-            throw new PHPUnit_Framework_ExpectationFailedException($message);
-        }
-    }
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        $count = $this->getInvocationCount();
-
-        if ($count !== $this->expectedCount) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf(
-                    'Method was expected to be called %d times, ' .
-                    'actually called %d times.',
-                    $this->expectedCount,
-                    $count
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
deleted file mode 100644
index d652f2d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Records invocations and provides convenience methods for checking them later
- * on.
- * This abstract class can be implemented by matchers which needs to check the
- * number of times an invocation has occured.
- *
- * @since Class available since Release 1.0.0
- * @abstract
- */
-abstract class PHPUnit_Framework_MockObject_Matcher_InvokedRecorder implements PHPUnit_Framework_MockObject_Matcher_Invocation
-{
-    /**
-     * @var PHPUnit_Framework_MockObject_Invocation[]
-     */
-    protected $invocations = array();
-
-    /**
-     * @return int
-     */
-    public function getInvocationCount()
-    {
-        return count($this->invocations);
-    }
-
-    /**
-     * @return PHPUnit_Framework_MockObject_Invocation[]
-     */
-    public function getInvocations()
-    {
-        return $this->invocations;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasBeenInvoked()
-    {
-        return count($this->invocations) > 0;
-    }
-
-    /**
-     * @param PHPUnit_Framework_MockObject_Invocation $invocation
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $this->invocations[] = $invocation;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        return true;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
deleted file mode 100644
index 1e32c7b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which looks for a specific method name in the invocations.
- *
- * Checks the method name all incoming invocations, the name is checked against
- * the defined constraint $constraint. If the constraint is met it will return
- * true in matches().
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_MethodName extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
-{
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $constraint;
-
-    /**
-     * @param  PHPUnit_Framework_Constraint|string
-     * @throws PHPUnit_Framework_Constraint
-     */
-    public function __construct($constraint)
-    {
-        if (!$constraint instanceof PHPUnit_Framework_Constraint) {
-            if (!is_string($constraint)) {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-            }
-
-            $constraint = new PHPUnit_Framework_Constraint_IsEqual(
-                $constraint,
-                0,
-                10,
-                false,
-                true
-            );
-        }
-
-        $this->constraint = $constraint;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'method name ' . $this->constraint->toString();
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        return $this->constraint->evaluate($invocation->methodName, '', true);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
deleted file mode 100644
index cd8aa85..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which looks for specific parameters in the invocations.
- *
- * Checks the parameters of all incoming invocations, the parameter list is
- * checked against the defined constraints in $parameters. If the constraint
- * is met it will return true in matches().
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Matcher_Parameters extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
-{
-    /**
-     * @var PHPUnit_Framework_Constraint[]
-     */
-    protected $parameters = array();
-
-    /**
-     * @var PHPUnit_Framework_MockObject_Invocation
-     */
-    protected $invocation;
-
-    /**
-     * @param array $parameters
-     */
-    public function __construct(array $parameters)
-    {
-        foreach ($parameters as $parameter) {
-            if (!($parameter instanceof PHPUnit_Framework_Constraint)) {
-                $parameter = new PHPUnit_Framework_Constraint_IsEqual(
-                    $parameter
-                );
-            }
-
-            $this->parameters[] = $parameter;
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $text = 'with parameter';
-
-        foreach ($this->parameters as $index => $parameter) {
-            if ($index > 0) {
-                $text .= ' and';
-            }
-
-            $text .= ' ' . $index . ' ' . $parameter->toString();
-        }
-
-        return $text;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     * @return bool
-     */
-    public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $this->invocation = $invocation;
-
-        return $this->verify();
-    }
-
-    /**
-     * Checks if the invocation $invocation matches the current rules. If it
-     * does the matcher will get the invoked() method called which should check
-     * if an expectation is met.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
-     *                                                                  Object containing information on a mocked or stubbed method which
-     *                                                                  was invoked.
-     * @return bool
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify()
-    {
-        if ($this->invocation === null) {
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                'Mocked method does not exist.'
-            );
-        }
-
-        if (count($this->invocation->parameters) < count($this->parameters)) {
-            $message = 'Parameter count for invocation %s is too low.';
-
-            // The user called `->with($this->anything())`, but may have meant
-            // `->withAnyParameters()`.
-            //
-            // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/199
-            if (count($this->parameters) === 1 &&
-                get_class($this->parameters[0]) === 'PHPUnit_Framework_Constraint_IsAnything') {
-                $message .= "\nTo allow 0 or more parameters with any value, omit ->with() or use ->withAnyParameters() instead.";
-            }
-
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                sprintf($message, $this->invocation->toString())
-            );
-        }
-
-        foreach ($this->parameters as $i => $parameter) {
-            $parameter->evaluate(
-                $this->invocation->parameters[$i],
-                sprintf(
-                    'Parameter %s for invocation %s does not match expected ' .
-                    'value.',
-                    $i,
-                    $this->invocation->toString()
-                )
-            );
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
deleted file mode 100644
index c2e263a..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Invocation matcher which does not care about previous state from earlier
- * invocations.
- *
- * This abstract class can be implemented by matchers which does not care about
- * state but only the current run-time value of the invocation itself.
- *
- * @since Class available since Release 1.0.0
- * @abstract
- */
-abstract class PHPUnit_Framework_MockObject_Matcher_StatelessInvocation implements PHPUnit_Framework_MockObject_Matcher_Invocation
-{
-    /**
-     * Registers the invocation $invocation in the object as being invoked.
-     * This will only occur after matches() returns true which means the
-     * current invocation is the correct one.
-     *
-     * The matcher can store information from the invocation which can later
-     * be checked in verify(), or it can check the values directly and throw
-     * and exception if an expectation is not met.
-     *
-     * If the matcher is a stub it will also have a return value.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             Object containing information on a mocked or stubbed method which
-     *                                                             was invoked.
-     * @return mixed
-     */
-    public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-    }
-
-    /**
-     * Checks if the invocation $invocation matches the current rules. If it does
-     * the matcher will get the invoked() method called which should check if an
-     * expectation is met.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             Object containing information on a mocked or stubbed method which
-     *                                                             was invoked.
-     * @return bool
-     */
-    public function verify()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
deleted file mode 100644
index 9f8a380..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Implementation of the Builder pattern for Mock objects.
- *
- * @since      File available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_MockBuilder
-{
-    /**
-     * @var PHPUnit_Framework_TestCase
-     */
-    private $testCase;
-
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var array
-     */
-    private $methods = array();
-
-    /**
-     * @var string
-     */
-    private $mockClassName = '';
-
-    /**
-     * @var array
-     */
-    private $constructorArgs = array();
-
-    /**
-     * @var bool
-     */
-    private $originalConstructor = true;
-
-    /**
-     * @var bool
-     */
-    private $originalClone = true;
-
-    /**
-     * @var bool
-     */
-    private $autoload = true;
-
-    /**
-     * @var bool
-     */
-    private $cloneArguments = false;
-
-    /**
-     * @var bool
-     */
-    private $callOriginalMethods = false;
-
-    /**
-     * @var object
-     */
-    private $proxyTarget = null;
-
-    /**
-     * @param PHPUnit_Framework_TestCase $testCase
-     * @param array|string               $type
-     */
-    public function __construct(PHPUnit_Framework_TestCase $testCase, $type)
-    {
-        $this->testCase = $testCase;
-        $this->type     = $type;
-    }
-
-    /**
-     * Creates a mock object using a fluent interface.
-     *
-     * @return PHPUnit_Framework_MockObject_MockObject
-     */
-    public function getMock()
-    {
-        return $this->testCase->getMock(
-            $this->type,
-            $this->methods,
-            $this->constructorArgs,
-            $this->mockClassName,
-            $this->originalConstructor,
-            $this->originalClone,
-            $this->autoload,
-            $this->cloneArguments,
-            $this->callOriginalMethods,
-            $this->proxyTarget
-        );
-    }
-
-    /**
-     * Creates a mock object for an abstract class using a fluent interface.
-     *
-     * @return PHPUnit_Framework_MockObject_MockObject
-     */
-    public function getMockForAbstractClass()
-    {
-        return $this->testCase->getMockForAbstractClass(
-            $this->type,
-            $this->constructorArgs,
-            $this->mockClassName,
-            $this->originalConstructor,
-            $this->originalClone,
-            $this->autoload,
-            $this->methods,
-            $this->cloneArguments
-        );
-    }
-
-    /**
-     * Creates a mock object for a trait using a fluent interface.
-     *
-     * @return PHPUnit_Framework_MockObject_MockObject
-     */
-    public function getMockForTrait()
-    {
-        return $this->testCase->getMockForTrait(
-            $this->type,
-            $this->constructorArgs,
-            $this->mockClassName,
-            $this->originalConstructor,
-            $this->originalClone,
-            $this->autoload,
-            $this->methods,
-            $this->cloneArguments
-        );
-    }
-
-    /**
-     * Specifies the subset of methods to mock. Default is to mock all of them.
-     *
-     * @param  array|null                               $methods
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function setMethods($methods)
-    {
-        $this->methods = $methods;
-
-        return $this;
-    }
-
-    /**
-     * Specifies the arguments for the constructor.
-     *
-     * @param  array                                    $args
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function setConstructorArgs(array $args)
-    {
-        $this->constructorArgs = $args;
-
-        return $this;
-    }
-
-    /**
-     * Specifies the name for the mock class.
-     *
-     * @param  string                                   $name
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function setMockClassName($name)
-    {
-        $this->mockClassName = $name;
-
-        return $this;
-    }
-
-    /**
-     * Disables the invocation of the original constructor.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function disableOriginalConstructor()
-    {
-        $this->originalConstructor = false;
-
-        return $this;
-    }
-
-    /**
-     * Enables the invocation of the original constructor.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 1.2.0
-     */
-    public function enableOriginalConstructor()
-    {
-        $this->originalConstructor = true;
-
-        return $this;
-    }
-
-    /**
-     * Disables the invocation of the original clone constructor.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function disableOriginalClone()
-    {
-        $this->originalClone = false;
-
-        return $this;
-    }
-
-    /**
-     * Enables the invocation of the original clone constructor.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 1.2.0
-     */
-    public function enableOriginalClone()
-    {
-        $this->originalClone = true;
-
-        return $this;
-    }
-
-    /**
-     * Disables the use of class autoloading while creating the mock object.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     */
-    public function disableAutoload()
-    {
-        $this->autoload = false;
-
-        return $this;
-    }
-
-    /**
-     * Enables the use of class autoloading while creating the mock object.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 1.2.0
-     */
-    public function enableAutoload()
-    {
-        $this->autoload = true;
-
-        return $this;
-    }
-
-    /**
-     * Disables the cloning of arguments passed to mocked methods.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 1.2.0
-     */
-    public function disableArgumentCloning()
-    {
-        $this->cloneArguments = false;
-
-        return $this;
-    }
-
-    /**
-     * Enables the cloning of arguments passed to mocked methods.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 1.2.0
-     */
-    public function enableArgumentCloning()
-    {
-        $this->cloneArguments = true;
-
-        return $this;
-    }
-
-    /**
-     * Enables the invocation of the original methods.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 2.0.0
-     */
-    public function enableProxyingToOriginalMethods()
-    {
-        $this->callOriginalMethods = true;
-
-        return $this;
-    }
-
-    /**
-     * Disables the invocation of the original methods.
-     *
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 2.0.0
-     */
-    public function disableProxyingToOriginalMethods()
-    {
-        $this->callOriginalMethods = false;
-        $this->proxyTarget         = null;
-
-        return $this;
-    }
-
-    /**
-     * Sets the proxy target.
-     *
-     * @param  object                                   $object
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 2.0.0
-     */
-    public function setProxyTarget($object)
-    {
-        $this->proxyTarget = $object;
-
-        return $this;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
deleted file mode 100644
index 4f1dc0d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for all mock objects which are generated by
- * PHPUnit_Framework_MockObject_MockBuilder.
- *
- * @method PHPUnit_Framework_MockObject_Builder_InvocationMocker method($constraint)
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_MockObject /*extends PHPUnit_Framework_MockObject_Verifiable*/
-{
-    /**
-     * Registers a new expectation in the mock object and returns the match
-     * object which can be infused with further details.
-     *
-     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
-
-    /**
-     * @return PHPUnit_Framework_MockObject_InvocationMocker
-     * @since  Method available since Release 2.0.0
-     */
-    public function __phpunit_setOriginalObject($originalObject);
-
-    /**
-     * @return PHPUnit_Framework_MockObject_InvocationMocker
-     */
-    public function __phpunit_getInvocationMocker();
-
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function __phpunit_verify();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
deleted file mode 100644
index 1414bcc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An object that stubs the process of a normal method for a mock object.
- *
- * The stub object will replace the code for the stubbed method and return a
- * specific value instead of the original value.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Stub extends PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * Fakes the processing of the invocation $invocation by returning a
-     * specific value.
-     *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *                                                             The invocation which was mocked and matched by the current method
-     *                                                             and argument matchers.
-     * @return mixed
-     */
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
deleted file mode 100644
index afc353d..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Stubs a method by returning a user-defined stack of values.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $stack;
-    protected $value;
-
-    public function __construct($stack)
-    {
-        $this->stack = $stack;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $this->value = array_shift($this->stack);
-
-        if ($this->value instanceof PHPUnit_Framework_MockObject_Stub) {
-            $this->value = $this->value->invoke($invocation);
-        }
-
-        return $this->value;
-    }
-
-    public function toString()
-    {
-        $exporter = new Exporter;
-
-        return sprintf(
-            'return user-specified value %s',
-            $exporter->export($this->value)
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
deleted file mode 100644
index 7f9359c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Stubs a method by raising a user-defined exception.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Stub_Exception implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $exception;
-
-    public function __construct(Exception $exception)
-    {
-        $this->exception = $exception;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        throw $this->exception;
-    }
-
-    public function toString()
-    {
-        $exporter = new Exporter;
-
-        return sprintf(
-            'raise user-specified exception %s',
-            $exporter->export($this->exception)
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
deleted file mode 100644
index 07a2877..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stubs a method by returning a user-defined value.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Stub_MatcherCollection
-{
-    /**
-     * Adds a new matcher to the collection which can be used as an expectation
-     * or a stub.
-     *
-     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
-     *                                                                 Matcher for invocations to mock objects.
-     */
-    public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
deleted file mode 100644
index 630504f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Stubs a method by returning a user-defined value.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Stub_Return implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $value;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        return $this->value;
-    }
-
-    public function toString()
-    {
-        $exporter = new Exporter;
-
-        return sprintf(
-            'return user-specified value %s',
-            $exporter->export($this->value)
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
deleted file mode 100644
index fb79f4e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stubs a method by returning an argument that was passed to the mocked method.
- *
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnArgument extends PHPUnit_Framework_MockObject_Stub_Return
-{
-    protected $argumentIndex;
-
-    public function __construct($argumentIndex)
-    {
-        $this->argumentIndex = $argumentIndex;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        if (isset($invocation->parameters[$this->argumentIndex])) {
-            return $invocation->parameters[$this->argumentIndex];
-        } else {
-            return;
-        }
-    }
-
-    public function toString()
-    {
-        return sprintf('return argument #%d', $this->argumentIndex);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
deleted file mode 100644
index 601b354..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnCallback implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $callback;
-
-    public function __construct($callback)
-    {
-        $this->callback = $callback;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        return call_user_func_array($this->callback, $invocation->parameters);
-    }
-
-    public function toString()
-    {
-        if (is_array($this->callback)) {
-            if (is_object($this->callback[0])) {
-                $class = get_class($this->callback[0]);
-                $type  = '->';
-            } else {
-                $class = $this->callback[0];
-                $type  = '::';
-            }
-
-            return sprintf(
-                'return result of user defined callback %s%s%s() with the ' .
-                'passed arguments',
-                $class,
-                $type,
-                $this->callback[1]
-            );
-        } else {
-            return 'return result of user defined callback ' . $this->callback .
-                   ' with the passed arguments';
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
deleted file mode 100644
index 582ab16..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stubs a method by returning the current object.
- *
- * @since Class available since Release 1.1.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnSelf implements PHPUnit_Framework_MockObject_Stub
-{
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        if (!$invocation instanceof PHPUnit_Framework_MockObject_Invocation_Object) {
-            throw new PHPUnit_Framework_Exception(
-                'The current object can only be returned when mocking an ' .
-                'object, not a static class.'
-            );
-        }
-
-        return $invocation->object;
-    }
-
-    public function toString()
-    {
-        return 'return the current object';
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
deleted file mode 100644
index 25ba4d1..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stubs a method by returning a value from a map.
- *
- * @since Class available since Release 1.1.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnValueMap implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $valueMap;
-
-    public function __construct(array $valueMap)
-    {
-        $this->valueMap = $valueMap;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $parameterCount = count($invocation->parameters);
-
-        foreach ($this->valueMap as $map) {
-            if (!is_array($map) || $parameterCount != count($map) - 1) {
-                continue;
-            }
-
-            $return = array_pop($map);
-            if ($invocation->parameters === $map) {
-                return $return;
-            }
-        }
-
-        return;
-    }
-
-    public function toString()
-    {
-        return 'return value from a map';
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php b/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
deleted file mode 100644
index c19dfb3..0000000
--- a/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for classes which must verify a given expectation.
- *
- * @since Interface available since Release 1.0.0
- */
-interface PHPUnit_Framework_MockObject_Verifiable
-{
-    /**
-     * Verifies that the current expectation is valid. If everything is OK the
-     * code should just return, if not it must throw an exception.
-     *
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function verify();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php b/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
deleted file mode 100644
index 51bd20c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-class Framework_MockObject_GeneratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var PHPUnit_Framework_MockObject_Generator
-     */
-    protected $generator;
-
-    protected function setUp()
-    {
-        $this->generator = new PHPUnit_Framework_MockObject_Generator;
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testGetMockFailsWhenInvalidFunctionNameIsPassedInAsAFunctionToMock()
-    {
-        $this->generator->getMock('StdClass', array(0));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     */
-    public function testGetMockCanCreateNonExistingFunctions()
-    {
-        $mock = $this->generator->getMock('StdClass', array('testFunction'));
-        $this->assertTrue(method_exists($mock, 'testFunction'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
-     * @expectedExceptionMessage duplicates: "foo, foo"
-     */
-    public function testGetMockGeneratorFails()
-    {
-        $mock = $this->generator->getMock('StdClass', array('foo', 'foo'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassDoesNotFailWhenFakingInterfaces()
-    {
-        $mock = $this->generator->getMockForAbstractClass('Countable');
-        $this->assertTrue(method_exists($mock, 'count'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassStubbingAbstractClass()
-    {
-        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
-        $this->assertTrue(method_exists($mock, 'doSomething'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassWithNonExistentMethods()
-    {
-        $mock = $this->generator->getMockForAbstractClass(
-            'AbstractMockTestClass',
-            array(),
-            '',
-            true,
-            true,
-            true,
-            array('nonexistentMethod')
-        );
-
-        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
-        $this->assertTrue(method_exists($mock, 'doSomething'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassShouldCreateStubsOnlyForAbstractMethodWhenNoMethodsWereInformed()
-    {
-        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
-
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturn('testing');
-
-        $this->assertEquals('testing', $mock->doSomething());
-        $this->assertEquals(1, $mock->returnAnything());
-    }
-
-    /**
-     * @dataProvider getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testGetMockForAbstractClassExpectingInvalidArgumentException($className, $mockClassName)
-    {
-        $mock = $this->generator->getMockForAbstractClass($className, array(), $mockClassName);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
-     */
-    public function testGetMockForAbstractClassAbstractClassDoesNotExist()
-    {
-        $mock = $this->generator->getMockForAbstractClass('Tux');
-    }
-
-    /**
-     * Dataprovider for test "testGetMockForAbstractClassExpectingInvalidArgumentException"
-     */
-    public static function getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider()
-    {
-        return array(
-            'className not a string' => array(array(), ''),
-            'mockClassName not a string' => array('Countable', new StdClass),
-        );
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
-     * @requires PHP 5.4.0
-     */
-    public function testGetMockForTraitWithNonExistentMethodsAndNonAbstractMethods()
-    {
-        $mock = $this->generator->getMockForTrait(
-            'AbstractTrait',
-            array(),
-            '',
-            true,
-            true,
-            true,
-            array('nonexistentMethod')
-        );
-
-        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
-        $this->assertTrue(method_exists($mock, 'doSomething'));
-        $this->assertTrue($mock->mockableMethod());
-        $this->assertTrue($mock->anotherMockableMethod());
-    }
-
-    /**
-     * @covers   PHPUnit_Framework_MockObject_Generator::getMockForTrait
-     * @requires PHP 5.4.0
-     */
-    public function testGetMockForTraitStubbingAbstractMethod()
-    {
-        $mock = $this->generator->getMockForTrait('AbstractTrait');
-        $this->assertTrue(method_exists($mock, 'doSomething'));
-    }
-
-    /**
-     * @requires PHP 5.4.0
-     */
-    public function testGetMockForSingletonWithReflectionSuccess()
-    {
-        // Probably, this should be moved to tests/autoload.php
-        require_once __DIR__ . '/_fixture/SingletonClass.php';
-
-        $mock = $this->generator->getMock('SingletonClass', array('doSomething'), array(), '', false);
-        $this->assertInstanceOf('SingletonClass', $mock);
-    }
-
-    /**
-     * Same as "testGetMockForSingletonWithReflectionSuccess", but we expect
-     * warning for PHP < 5.4.0 since PHPUnit will try to execute private __wakeup
-     * on unserialize
-     */
-    public function testGetMockForSingletonWithUnserializeFail()
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            $this->markTestSkipped('Only for PHP < 5.4.0');
-        }
-
-        $this->setExpectedException('PHPUnit_Framework_MockObject_RuntimeException');
-
-        // Probably, this should be moved to tests/autoload.php
-        require_once __DIR__ . '/_fixture/SingletonClass.php';
-
-        $mock = $this->generator->getMock('SingletonClass', array('doSomething'), array(), '', false);
-    }
-
-    /**
-     * ReflectionClass::getMethods for SoapClient on PHP 5.3 produces PHP Fatal Error
-     * @runInSeparateProcess
-     */
-    public function testGetMockForSoapClientReflectionMethodsDuplication()
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            $this->markTestSkipped('Only for PHP < 5.4.0');
-        }
-
-        $mock = $this->generator->getMock('SoapClient', array(), array(), '', false);
-        $this->assertInstanceOf('SoapClient', $mock);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
deleted file mode 100644
index ef4a0cc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since      File available since Release 1.0.0
- */
-class Framework_MockBuilderTest extends PHPUnit_Framework_TestCase
-{
-    public function testMockBuilderRequiresClassName()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $mock = $spec->getMock();
-        $this->assertTrue($mock instanceof Mockable);
-    }
-
-    public function testByDefaultMocksAllMethods()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $mock = $spec->getMock();
-        $this->assertNull($mock->mockableMethod());
-        $this->assertNull($mock->anotherMockableMethod());
-    }
-
-    public function testMethodsToMockCanBeSpecified()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $spec->setMethods(array('mockableMethod'));
-        $mock = $spec->getMock();
-        $this->assertNull($mock->mockableMethod());
-        $this->assertTrue($mock->anotherMockableMethod());
-    }
-
-    public function testByDefaultDoesNotPassArgumentsToTheConstructor()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $mock = $spec->getMock();
-        $this->assertEquals(array(null, null), $mock->constructorArgs);
-    }
-
-    public function testMockClassNameCanBeSpecified()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $spec->setMockClassName('ACustomClassName');
-        $mock = $spec->getMock();
-        $this->assertTrue($mock instanceof ACustomClassName);
-    }
-
-    public function testConstructorArgumentsCanBeSpecified()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $spec->setConstructorArgs($expected = array(23, 42));
-        $mock = $spec->getMock();
-        $this->assertEquals($expected, $mock->constructorArgs);
-    }
-
-    public function testOriginalConstructorCanBeDisabled()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $spec->disableOriginalConstructor();
-        $mock = $spec->getMock();
-        $this->assertNull($mock->constructorArgs);
-    }
-
-    public function testByDefaultOriginalCloneIsPreserved()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $mock = $spec->getMock();
-        $cloned = clone $mock;
-        $this->assertTrue($cloned->cloned);
-    }
-
-    public function testOriginalCloneCanBeDisabled()
-    {
-        $spec = $this->getMockBuilder('Mockable');
-        $spec->disableOriginalClone();
-        $mock = $spec->getMock();
-        $mock->cloned = false;
-        $cloned = clone $mock;
-        $this->assertFalse($cloned->cloned);
-    }
-
-    public function testCallingAutoloadCanBeDisabled()
-    {
-        // it is not clear to me how to test this nor the difference
-        // between calling it or not
-        $this->markTestIncomplete();
-    }
-
-    public function testProvidesAFluentInterface()
-    {
-        $spec = $this->getMockBuilder('Mockable')
-                     ->setMethods(array('mockableMethod'))
-                     ->setConstructorArgs(array())
-                     ->setMockClassName('DummyClassName')
-                     ->disableOriginalConstructor()
-                     ->disableOriginalClone()
-                     ->disableAutoload();
-        $this->assertTrue($spec instanceof PHPUnit_Framework_MockObject_MockBuilder);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/232.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/232.phpt
deleted file mode 100644
index 3426e89..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/232.phpt
+++ /dev/null
@@ -1,129 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---SKIPIF--
-<?php
-if (version_compare(PHP_VERSION, '5.4.0', '<')) print 'skip: PHP >= 5.4.0 required';
-?>
---FILE--
-<?php
-trait BaseTrait
-{
-    protected function hello()
-    {
-        return 'hello';
-    }
-}
-
-trait ChildTrait
-{
-    use BaseTrait
-    {
-        hello as private hi;
-    }
-
-    protected function hello()
-    {
-        return 'hi';
-    }
-
-    protected function world()
-    {
-        return $this->hi();
-    }
-}
-
-class Foo
-{
-    use ChildTrait;
-
-    public function speak()
-    {
-        return $this->world();
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function speak()
-    {
-        $arguments = array();
-        $count     = func_num_args();
-
-        if ($count > 0) {
-            $_arguments = func_get_args();
-
-            for ($i = 0; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'speak', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
-
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
deleted file mode 100644
index a957491..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class Framework_MockObject_Invocation_ObjectTest extends PHPUnit_Framework_TestCase
-{
-    public function testConstructorRequiresClassAndMethodAndParametersAndObject()
-    {
-        new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            array('an_argument'),
-        new StdClass
-        );
-    }
-
-    public function testAllowToGetClassNameSetInConstructor()
-    {
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            array('an_argument'),
-            new StdClass
-        );
-
-        $this->assertSame('FooClass', $invocation->className);
-    }
-
-    public function testAllowToGetMethodNameSetInConstructor()
-    {
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            array('an_argument'),
-            new StdClass
-        );
-
-        $this->assertSame('FooMethod', $invocation->methodName);
-    }
-
-    public function testAllowToGetObjectSetInConstructor()
-    {
-        $expectedObject = new StdClass;
-
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            array('an_argument'),
-            $expectedObject
-        );
-
-        $this->assertSame($expectedObject, $invocation->object);
-    }
-
-    public function testAllowToGetMethodParametersSetInConstructor()
-    {
-        $expectedParameters = array(
-          'foo', 5, array('a', 'b'), new StdClass, null, false
-        );
-
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            $expectedParameters,
-            new StdClass
-        );
-
-        $this->assertSame($expectedParameters, $invocation->parameters);
-    }
-
-    public function testConstructorAllowToSetFlagCloneObjectsInParameters()
-    {
-        $parameters   = array(new StdClass);
-        $cloneObjects = true;
-
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Object(
-            'FooClass',
-            'FooMethod',
-            $parameters,
-            new StdClass,
-            $cloneObjects
-        );
-
-        $this->assertEquals($parameters, $invocation->parameters);
-        $this->assertNotSame($parameters, $invocation->parameters);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
deleted file mode 100644
index b965da1..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-class Framework_MockObject_Invocation_StaticTest extends PHPUnit_Framework_TestCase
-{
-    public function testConstructorRequiresClassAndMethodAndParameters()
-    {
-        new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
-    }
-
-    public function testAllowToGetClassNameSetInConstructor()
-    {
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
-
-        $this->assertSame('FooClass', $invocation->className);
-    }
-
-    public function testAllowToGetMethodNameSetInConstructor()
-    {
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static('FooClass', 'FooMethod', array('an_argument'));
-
-        $this->assertSame('FooMethod', $invocation->methodName);
-    }
-
-    public function testAllowToGetMethodParametersSetInConstructor()
-    {
-        $expectedParameters = array(
-          'foo', 5, array('a', 'b'), new StdClass, null, false
-        );
-
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static(
-            'FooClass',
-            'FooMethod',
-            $expectedParameters
-        );
-
-        $this->assertSame($expectedParameters, $invocation->parameters);
-    }
-
-    public function testConstructorAllowToSetFlagCloneObjectsInParameters()
-    {
-        $parameters = array(new StdClass);
-        $cloneObjects = true;
-
-        $invocation = new PHPUnit_Framework_MockObject_Invocation_Static(
-            'FooClass',
-            'FooMethod',
-            $parameters,
-            $cloneObjects
-        );
-
-        $this->assertEquals($parameters, $invocation->parameters);
-        $this->assertNotSame($parameters, $invocation->parameters);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
deleted file mode 100644
index ae26b76..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-class Framework_MockObject_Matcher_ConsecutiveParametersTest extends PHPUnit_Framework_TestCase
-{
-    public function testIntegration()
-    {
-        $mock = $this->getMock('stdClass', array('foo'));
-        $mock
-            ->expects($this->any())
-            ->method('foo')
-            ->withConsecutive(
-                array('bar'),
-                array(21, 42)
-            );
-        $mock->foo('bar');
-        $mock->foo(21, 42);
-    }
-
-    public function testIntegrationWithLessAssertionsThenMethodCalls()
-    {
-        $mock = $this->getMock('stdClass', array('foo'));
-        $mock
-            ->expects($this->any())
-            ->method('foo')
-            ->withConsecutive(
-                array('bar')
-            );
-        $mock->foo('bar');
-        $mock->foo(21, 42);
-    }
-
-    public function testIntegrationExpectingException()
-    {
-        $mock = $this->getMock('stdClass', array('foo'));
-        $mock
-            ->expects($this->any())
-            ->method('foo')
-            ->withConsecutive(
-                array('bar'),
-                array(21, 42)
-            );
-        $mock->foo('bar');
-        $this->setExpectedException('PHPUnit_Framework_ExpectationFailedException');
-        $mock->foo('invalid');
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/abstract_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/abstract_class.phpt
deleted file mode 100644
index 72450c5..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/abstract_class.phpt
+++ /dev/null
@@ -1,143 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-abstract class Foo
-{
-    public function one()
-    {
-    }
-
-    abstract public function two();
-
-    abstract protected function three();
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function one()
-    {
-        $arguments = array();
-        $count     = func_num_args();
-
-        if ($count > 0) {
-            $_arguments = func_get_args();
-
-            for ($i = 0; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'one', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function two()
-    {
-        $arguments = array();
-        $count     = func_num_args();
-
-        if ($count > 0) {
-            $_arguments = func_get_args();
-
-            for ($i = 0; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'two', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    protected function three()
-    {
-        $arguments = array();
-        $count     = func_num_args();
-
-        if ($count > 0) {
-            $_arguments = func_get_args();
-
-            for ($i = 0; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'three', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
deleted file mode 100644
index 2e40328..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
+++ /dev/null
@@ -1,121 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function baz(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'baz', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
deleted file mode 100644
index 0f91a98..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
+++ /dev/null
@@ -1,73 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function __clone()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        parent::__clone();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
deleted file mode 100644
index 6f037ee..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function __construct()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
deleted file mode 100644
index dc82938..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', FALSE)
---FILE--
-<?php
-class Foo
-{
-    public function __clone()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  FALSE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
deleted file mode 100644
index 6f037ee..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
+++ /dev/null
@@ -1,72 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function __construct()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
deleted file mode 100644
index cfc43d8..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
+++ /dev/null
@@ -1,77 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-interface IFoo
-{
-    public function __construct($bar);
-}
-
-class Foo implements IFoo
-{
-    public function __construct($bar)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
deleted file mode 100644
index cfc43d8..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
+++ /dev/null
@@ -1,77 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-interface IFoo
-{
-    public function __construct($bar);
-}
-
-class Foo implements IFoo
-{
-    public function __construct($bar)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
deleted file mode 100644
index b8332ae..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
+++ /dev/null
@@ -1,99 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array('bar'), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array('bar'),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
deleted file mode 100644
index 6e1ddf6..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
+++ /dev/null
@@ -1,88 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function method()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function method()
-    {
-        $arguments = array();
-        $count     = func_num_args();
-
-        if ($count > 0) {
-            $_arguments = func_get_args();
-
-            for ($i = 0; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'method', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_with_variadic_arguments.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_with_variadic_arguments.phpt
deleted file mode 100644
index 8fb9a3c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_with_variadic_arguments.phpt
+++ /dev/null
@@ -1,99 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('ClassWithMethodWithVariadicArguments', array(), 'MockFoo', TRUE, TRUE)
---SKIPIF--
-<?php
-if (version_compare(PHP_VERSION, '5.6.0', '<')) print 'skip: PHP >= 5.6.0 required';
-?>
---FILE--
-<?php
-class ClassWithMethodWithVariadicArguments
-{
-    public function methodWithVariadicArguments($a, ...$parameters)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'ClassWithMethodWithVariadicArguments',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends ClassWithMethodWithVariadicArguments implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function methodWithVariadicArguments($a, ...$parameters)
-    {
-        $arguments = array($a);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'ClassWithMethodWithVariadicArguments', 'methodWithVariadicArguments', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
deleted file mode 100644
index 2d38209..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
+++ /dev/null
@@ -1,93 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-interface Foo
-{
-    public function bar(Foo $foo);
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
deleted file mode 100644
index 87a979e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
+++ /dev/null
@@ -1,122 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function baz(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'baz', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
deleted file mode 100644
index e30bddc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
+++ /dev/null
@@ -1,123 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(NS\Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'NS\Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function baz(NS\Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'NS\Foo', 'baz', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
deleted file mode 100644
index 3dee9c9..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
+++ /dev/null
@@ -1,75 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function __clone()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-        parent::__clone();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
deleted file mode 100644
index 105a372..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
+++ /dev/null
@@ -1,74 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function __construct()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
deleted file mode 100644
index 1de9253..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
+++ /dev/null
@@ -1,74 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', FALSE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function __clone()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  FALSE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
deleted file mode 100644
index 105a372..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
+++ /dev/null
@@ -1,74 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function __construct()
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
deleted file mode 100644
index 6b9f6bc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
+++ /dev/null
@@ -1,79 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-namespace NS;
-
-interface IFoo
-{
-    public function __construct($bar);
-}
-
-class Foo implements IFoo
-{
-    public function __construct($bar)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
deleted file mode 100644
index 6b9f6bc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
+++ /dev/null
@@ -1,79 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE)
---FILE--
-<?php
-namespace NS;
-
-interface IFoo
-{
-    public function __construct($bar);
-}
-
-class Foo implements IFoo
-{
-    public function __construct($bar)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
deleted file mode 100644
index 86fee1c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
+++ /dev/null
@@ -1,101 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array('bar'), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-namespace NS;
-
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array('bar'),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(NS\Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'NS\Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
deleted file mode 100644
index 8048646..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
+++ /dev/null
@@ -1,95 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NS\Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-namespace NS;
-
-interface Foo
-{
-    public function bar(Foo $foo);
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new \PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(NS\Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'NS\Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
deleted file mode 100644
index 8c01de0..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('NonExistentClass', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NonExistentClass',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class NonExistentClass
-{
-}
-
-class MockFoo extends NonExistentClass implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
deleted file mode 100644
index 7868977..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
+++ /dev/null
@@ -1,78 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-namespace NS {
-
-class Foo
-{
-}
-
-}
-
-namespace {
-
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
-
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
deleted file mode 100644
index b59d1dd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
+++ /dev/null
@@ -1,78 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  '\NS\Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-namespace NS {
-
-class Foo
-{
-}
-
-}
-
-namespace {
-
-class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
-
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
deleted file mode 100644
index f31bf3f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
+++ /dev/null
@@ -1,117 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', NULL, 'ProxyFoo', TRUE, TRUE, TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public function bar(Foo $foo)
-    {
-    }
-
-    public function baz(Foo $foo)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo', array(), 'ProxyFoo', TRUE, TRUE, TRUE, TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class ProxyFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $arguments);
-    }
-
-    public function baz(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'baz', $arguments, $this, TRUE
-          )
-        );
-
-        return call_user_func_array(array($this->__phpunit_originalObject, "baz"), $arguments);
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/scalar_type_declarations.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/scalar_type_declarations.phpt
deleted file mode 100644
index 3ad84db..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/scalar_type_declarations.phpt
+++ /dev/null
@@ -1,99 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
---SKIPIF--
-<?php
-if (!method_exists('ReflectionParameter', 'hasType')) print 'skip: PHP >= 7.0.0 required';
-?>
---FILE--
-<?php
-class Foo
-{
-    public function bar(string $baz)
-    {
-    }
-}
-
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-$mock = $generator->generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private $__phpunit_invocationMocker;
-    private $__phpunit_originalObject;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public function bar(string $baz)
-    {
-        $arguments = array($baz);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = $this->__phpunit_getInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Object(
-            'Foo', 'bar', $arguments, $this, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public function method()
-    {
-        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-        $expects = $this->expects($any);
-        return call_user_func_array(array($expects, 'method'), func_get_args());
-    }
-
-    public function __phpunit_setOriginalObject($originalObject)
-    {
-        $this->__phpunit_originalObject = $originalObject;
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        $this->__phpunit_getInvocationMocker()->verify();
-        $this->__phpunit_invocationMocker = NULL;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
deleted file mode 100644
index 06b255f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
+++ /dev/null
@@ -1,37 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch')
---SKIPIF--
-<?php
-if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
-?>
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-print $generator->generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
-  'GoogleSearch'
-);
-?>
---EXPECTF--
-class GoogleSearch extends \SoapClient
-{
-    public function __construct($wsdl, array $options)
-    {
-        parent::__construct('%s/GoogleSearch.wsdl', $options);
-    }
-
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
-    {
-    }
-
-    public function doGetCachedPage($key, $url)
-    {
-    }
-
-    public function doSpellingSuggestion($key, $phrase)
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
deleted file mode 100644
index 9460e6b..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch')
---SKIPIF--
-<?php
-if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
-?>
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-print $generator->generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
-  'My\\Space\\GoogleSearch'
-);
-?>
---EXPECTF--
-namespace My\Space;
-
-class GoogleSearch extends \SoapClient
-{
-    public function __construct($wsdl, array $options)
-    {
-        parent::__construct('%s/GoogleSearch.wsdl', $options);
-    }
-
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
-    {
-    }
-
-    public function doGetCachedPage($key, $url)
-    {
-    }
-
-    public function doSpellingSuggestion($key, $phrase)
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt b/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
deleted file mode 100644
index fc814bd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl('GoogleSearch.wsdl', 'GoogleSearch', array('doGoogleSearch'))
---SKIPIF--
-<?php
-if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
-?>
---FILE--
-<?php
-require __DIR__ . '/../../vendor/autoload.php';
-
-$generator = new PHPUnit_Framework_MockObject_Generator;
-
-print $generator->generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
-  'GoogleSearch',
-  array('doGoogleSearch')
-);
-?>
---EXPECTF--
-class GoogleSearch extends \SoapClient
-{
-    public function __construct($wsdl, array $options)
-    {
-        parent::__construct('%s/GoogleSearch.wsdl', $options);
-    }
-
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
deleted file mode 100644
index 802c133..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
+++ /dev/null
@@ -1,842 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- *
- *
- * @since      Class available since Release 3.0.0
- */
-class Framework_MockObjectTest extends PHPUnit_Framework_TestCase
-{
-    public function testMockedMethodIsNeverCalled()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->never())
-             ->method('doSomething');
-    }
-
-    public function testMockedMethodIsNeverCalledWithParameter()
-    {
-        $mock = $this->getMock('SomeClass');
-        $mock->expects($this->never())
-            ->method('doSomething')
-            ->with('someArg');
-    }
-
-    public function testMockedMethodIsNotCalledWhenExpectsAnyWithParameter()
-    {
-        $mock = $this->getMock('SomeClass');
-        $mock->expects($this->any())
-             ->method('doSomethingElse')
-             ->with('someArg');
-    }
-
-    public function testMockedMethodIsNotCalledWhenMethodSpecifiedDirectlyWithParameter()
-    {
-        $mock = $this->getMock('SomeClass');
-        $mock->method('doSomethingElse')
-            ->with('someArg');
-    }
-
-    public function testMockedMethodIsCalledAtLeastOnce()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atLeastOnce())
-             ->method('doSomething');
-
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledAtLeastOnce2()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atLeastOnce())
-             ->method('doSomething');
-
-        $mock->doSomething();
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledAtLeastTwice()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atLeast(2))
-             ->method('doSomething');
-
-        $mock->doSomething();
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledAtLeastTwice2()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atLeast(2))
-             ->method('doSomething');
-
-        $mock->doSomething();
-        $mock->doSomething();
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledAtMostTwice()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atMost(2))
-             ->method('doSomething');
-
-        $mock->doSomething();
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledAtMosttTwice2()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->atMost(2))
-             ->method('doSomething');
-
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledOnce()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->once())
-             ->method('doSomething');
-
-        $mock->doSomething();
-    }
-
-    public function testMockedMethodIsCalledOnceWithParameter()
-    {
-        $mock = $this->getMock('SomeClass');
-        $mock->expects($this->once())
-             ->method('doSomethingElse')
-             ->with($this->equalTo('something'));
-
-        $mock->doSomethingElse('something');
-    }
-
-    public function testMockedMethodIsCalledExactly()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->exactly(2))
-             ->method('doSomething');
-
-        $mock->doSomething();
-        $mock->doSomething();
-    }
-
-    public function testStubbedException()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->throwException(new Exception));
-
-        try {
-            $mock->doSomething();
-        } catch (Exception $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    public function testStubbedWillThrowException()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willThrowException(new Exception);
-
-        try {
-            $mock->doSomething();
-        } catch (Exception $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    public function testStubbedReturnValue()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->returnValue('something'));
-
-        $this->assertEquals('something', $mock->doSomething());
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturn('something');
-
-        $this->assertEquals('something', $mock->doSomething());
-    }
-
-    public function testStubbedReturnValueMap()
-    {
-        $map = array(
-            array('a', 'b', 'c', 'd'),
-            array('e', 'f', 'g', 'h')
-        );
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->returnValueMap($map));
-
-        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
-        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
-        $this->assertEquals(null, $mock->doSomething('foo', 'bar'));
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturnMap($map);
-
-        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
-        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
-        $this->assertEquals(null, $mock->doSomething('foo', 'bar'));
-    }
-
-    public function testStubbedReturnArgument()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->returnArgument(1));
-
-        $this->assertEquals('b', $mock->doSomething('a', 'b'));
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturnArgument(1);
-
-        $this->assertEquals('b', $mock->doSomething('a', 'b'));
-    }
-
-    public function testFunctionCallback()
-    {
-        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', false);
-        $mock->expects($this->once())
-             ->method('doSomething')
-             ->will($this->returnCallback('functionCallback'));
-
-        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
-
-        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', false);
-        $mock->expects($this->once())
-             ->method('doSomething')
-             ->willReturnCallback('functionCallback');
-
-        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
-    }
-
-    public function testStubbedReturnSelf()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->returnSelf());
-
-        $this->assertEquals($mock, $mock->doSomething());
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturnSelf();
-
-        $this->assertEquals($mock, $mock->doSomething());
-    }
-
-    public function testStubbedReturnOnConsecutiveCalls()
-    {
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->will($this->onConsecutiveCalls('a', 'b', 'c'));
-
-        $this->assertEquals('a', $mock->doSomething());
-        $this->assertEquals('b', $mock->doSomething());
-        $this->assertEquals('c', $mock->doSomething());
-
-        $mock = $this->getMock('AnInterface');
-        $mock->expects($this->any())
-             ->method('doSomething')
-             ->willReturnOnConsecutiveCalls('a', 'b', 'c');
-
-        $this->assertEquals('a', $mock->doSomething());
-        $this->assertEquals('b', $mock->doSomething());
-        $this->assertEquals('c', $mock->doSomething());
-    }
-
-    public function testStaticMethodCallback()
-    {
-        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', false);
-        $mock->expects($this->once())
-             ->method('doSomething')
-             ->will($this->returnCallback(array('MethodCallback', 'staticCallback')));
-
-        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
-    }
-
-    public function testPublicMethodCallback()
-    {
-        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', false);
-        $mock->expects($this->once())
-             ->method('doSomething')
-             ->will($this->returnCallback(array(new MethodCallback, 'nonStaticCallback')));
-
-        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
-    }
-
-    public function testMockClassOnlyGeneratedOnce()
-    {
-        $mock1 = $this->getMock('AnInterface');
-        $mock2 = $this->getMock('AnInterface');
-
-        $this->assertEquals(get_class($mock1), get_class($mock2));
-    }
-
-    public function testMockClassDifferentForPartialMocks()
-    {
-        $mock1 = $this->getMock('PartialMockTestClass');
-        $mock2 = $this->getMock('PartialMockTestClass', array('doSomething'));
-        $mock3 = $this->getMock('PartialMockTestClass', array('doSomething'));
-        $mock4 = $this->getMock('PartialMockTestClass', array('doAnotherThing'));
-        $mock5 = $this->getMock('PartialMockTestClass', array('doAnotherThing'));
-
-        $this->assertNotEquals(get_class($mock1), get_class($mock2));
-        $this->assertNotEquals(get_class($mock1), get_class($mock3));
-        $this->assertNotEquals(get_class($mock1), get_class($mock4));
-        $this->assertNotEquals(get_class($mock1), get_class($mock5));
-        $this->assertEquals(get_class($mock2), get_class($mock3));
-        $this->assertNotEquals(get_class($mock2), get_class($mock4));
-        $this->assertNotEquals(get_class($mock2), get_class($mock5));
-        $this->assertEquals(get_class($mock4), get_class($mock5));
-    }
-
-    public function testMockClassStoreOverrulable()
-    {
-        $mock1 = $this->getMock('PartialMockTestClass');
-        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass1');
-        $mock3 = $this->getMock('PartialMockTestClass');
-        $mock4 = $this->getMock('PartialMockTestClass', array('doSomething'), array(), 'AnotherMockClassNameForPartialMockTestClass');
-        $mock5 = $this->getMock('PartialMockTestClass', array(), array(), 'MyMockClassNameForPartialMockTestClass2');
-
-        $this->assertNotEquals(get_class($mock1), get_class($mock2));
-        $this->assertEquals(get_class($mock1), get_class($mock3));
-        $this->assertNotEquals(get_class($mock1), get_class($mock4));
-        $this->assertNotEquals(get_class($mock2), get_class($mock3));
-        $this->assertNotEquals(get_class($mock2), get_class($mock4));
-        $this->assertNotEquals(get_class($mock2), get_class($mock5));
-        $this->assertNotEquals(get_class($mock3), get_class($mock4));
-        $this->assertNotEquals(get_class($mock3), get_class($mock5));
-        $this->assertNotEquals(get_class($mock4), get_class($mock5));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     */
-    public function testGetMockWithFixedClassNameCanProduceTheSameMockTwice()
-    {
-        $mock = $this->getMockBuilder('StdClass')->setMockClassName('FixedName')->getMock();
-        $mock = $this->getMockBuilder('StdClass')->setMockClassName('FixedName')->getMock();
-        $this->assertInstanceOf('StdClass', $mock);
-    }
-
-    public function testOriginalConstructorSettingConsidered()
-    {
-        $mock1 = $this->getMock('PartialMockTestClass');
-        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), '', false);
-
-        $this->assertTrue($mock1->constructorCalled);
-        $this->assertFalse($mock2->constructorCalled);
-    }
-
-    public function testOriginalCloneSettingConsidered()
-    {
-        $mock1 = $this->getMock('PartialMockTestClass');
-        $mock2 = $this->getMock('PartialMockTestClass', array(), array(), '', true, false);
-
-        $this->assertNotEquals(get_class($mock1), get_class($mock2));
-    }
-
-    public function testGetMockForAbstractClass()
-    {
-        $mock = $this->getMock('AbstractMockTestClass');
-        $mock->expects($this->never())
-             ->method('doSomething');
-    }
-
-    public function traversableProvider()
-    {
-        return array(
-          array('Traversable'),
-          array('\Traversable'),
-          array('TraversableMockTestInterface'),
-          array(array('Traversable')),
-          array(array('Iterator','Traversable')),
-          array(array('\Iterator','\Traversable'))
-        );
-    }
-
-    /**
-     * @dataProvider traversableProvider
-     */
-    public function testGetMockForTraversable($type)
-    {
-        $mock = $this->getMock($type);
-        $this->assertInstanceOf('Traversable', $mock);
-    }
-
-    public function testMultipleInterfacesCanBeMockedInSingleObject()
-    {
-        $mock = $this->getMock(array('AnInterface', 'AnotherInterface'));
-        $this->assertInstanceOf('AnInterface', $mock);
-        $this->assertInstanceOf('AnotherInterface', $mock);
-    }
-
-    /**
-     * @requires PHP 5.4.0
-     */
-    public function testGetMockForTrait()
-    {
-        $mock = $this->getMockForTrait('AbstractTrait');
-        $mock->expects($this->never())->method('doSomething');
-
-        $parent = get_parent_class($mock);
-        $traits = class_uses($parent, false);
-
-        $this->assertContains('AbstractTrait', $traits);
-    }
-
-    public function testClonedMockObjectShouldStillEqualTheOriginal()
-    {
-        $a = $this->getMock('stdClass');
-        $b = clone $a;
-        $this->assertEquals($a, $b);
-    }
-
-    public function testMockObjectsConstructedIndepentantlyShouldBeEqual()
-    {
-        $a = $this->getMock('stdClass');
-        $b = $this->getMock('stdClass');
-        $this->assertEquals($a, $b);
-    }
-
-    public function testMockObjectsConstructedIndepentantlyShouldNotBeTheSame()
-    {
-        $a = $this->getMock('stdClass');
-        $b = $this->getMock('stdClass');
-        $this->assertNotSame($a, $b);
-    }
-
-    public function testClonedMockObjectCanBeUsedInPlaceOfOriginalOne()
-    {
-        $x = $this->getMock('stdClass');
-        $y = clone $x;
-
-        $mock = $this->getMock('stdClass', array('foo'));
-        $mock->expects($this->once())->method('foo')->with($this->equalTo($x));
-        $mock->foo($y);
-    }
-
-    public function testClonedMockObjectIsNotIdenticalToOriginalOne()
-    {
-        $x = $this->getMock('stdClass');
-        $y = clone $x;
-
-        $mock = $this->getMock('stdClass', array('foo'));
-        $mock->expects($this->once())->method('foo')->with($this->logicalNot($this->identicalTo($x)));
-        $mock->foo($y);
-    }
-
-    public function testObjectMethodCallWithArgumentCloningEnabled()
-    {
-        $expectedObject = new StdClass;
-
-        $mock = $this->getMockBuilder('SomeClass')
-                     ->setMethods(array('doSomethingElse'))
-                     ->enableArgumentCloning()
-                     ->getMock();
-
-        $actualArguments = array();
-
-        $mock->expects($this->any())
-        ->method('doSomethingElse')
-        ->will($this->returnCallback(function () use (&$actualArguments) {
-            $actualArguments = func_get_args();
-        }));
-
-        $mock->doSomethingElse($expectedObject);
-
-        $this->assertEquals(1, count($actualArguments));
-        $this->assertEquals($expectedObject, $actualArguments[0]);
-        $this->assertNotSame($expectedObject, $actualArguments[0]);
-    }
-
-    public function testObjectMethodCallWithArgumentCloningDisabled()
-    {
-        $expectedObject = new StdClass;
-
-        $mock = $this->getMockBuilder('SomeClass')
-                     ->setMethods(array('doSomethingElse'))
-                     ->disableArgumentCloning()
-                     ->getMock();
-
-        $actualArguments = array();
-
-        $mock->expects($this->any())
-        ->method('doSomethingElse')
-        ->will($this->returnCallback(function () use (&$actualArguments) {
-            $actualArguments = func_get_args();
-        }));
-
-        $mock->doSomethingElse($expectedObject);
-
-        $this->assertEquals(1, count($actualArguments));
-        $this->assertSame($expectedObject, $actualArguments[0]);
-    }
-
-    public function testArgumentCloningOptionGeneratesUniqueMock()
-    {
-        $mockWithCloning = $this->getMockBuilder('SomeClass')
-                                ->setMethods(array('doSomethingElse'))
-                                ->enableArgumentCloning()
-                                ->getMock();
-
-        $mockWithoutCloning = $this->getMockBuilder('SomeClass')
-                                   ->setMethods(array('doSomethingElse'))
-                                   ->disableArgumentCloning()
-                                   ->getMock();
-
-        $this->assertNotEquals($mockWithCloning, $mockWithoutCloning);
-    }
-
-    public function testVerificationOfMethodNameFailsWithoutParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', true, true, true);
-        $mock->expects($this->once())
-             ->method('right');
-
-        $mock->wrong();
-        try {
-            $mock->__phpunit_verify();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
-                . "Method was expected to be called 1 times, actually called 0 times.\n",
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    public function testVerificationOfMethodNameFailsWithParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', true, true, true);
-        $mock->expects($this->once())
-             ->method('right');
-
-        $mock->wrong();
-        try {
-            $mock->__phpunit_verify();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
-                . "Method was expected to be called 1 times, actually called 0 times.\n",
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    public function testVerificationOfMethodNameFailsWithWrongParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', true, true, true);
-        $mock->expects($this->once())
-             ->method('right')
-             ->with(array('first', 'second'));
-
-        try {
-            $mock->right(array('second'));
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s)\n"
-                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
-                . "Failed asserting that two arrays are equal.",
-                $e->getMessage()
-            );
-        }
-
-        try {
-            $mock->__phpunit_verify();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
-                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
-                . "Failed asserting that two arrays are equal.\n"
-                . "--- Expected\n"
-                . "+++ Actual\n"
-                . "@@ @@\n"
-                . " Array (\n"
-                . "-    0 => 'first'\n"
-                . "-    1 => 'second'\n"
-                . "+    0 => 'second'\n"
-                . " )\n",
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    public function testVerificationOfNeverFailsWithEmptyParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', true, true, true);
-        $mock->expects($this->never())
-             ->method('right')
-             ->with();
-
-        try {
-            $mock->right();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                'SomeClass::right() was not expected to be called.',
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    public function testVerificationOfNeverFailsWithAnyParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', true, true, true);
-        $mock->expects($this->never())
-             ->method('right')
-             ->withAnyParameters();
-
-        try {
-            $mock->right();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                'SomeClass::right() was not expected to be called.',
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    /**
-     * @ticket 199
-     */
-    public function testWithAnythingInsteadOfWithAnyParameters()
-    {
-        $mock = $this->getMock('SomeClass', array('right'), array(), '', true, true, true);
-        $mock->expects($this->once())
-             ->method('right')
-             ->with($this->anything());
-
-        try {
-            $mock->right();
-            $this->fail('Expected exception');
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertSame(
-                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s)\n" .
-                "Parameter count for invocation SomeClass::right() is too low.\n" .
-                "To allow 0 or more parameters with any value, omit ->with() or use ->withAnyParameters() instead.",
-                $e->getMessage()
-            );
-        }
-
-        $this->resetMockObjects();
-    }
-
-    /**
-     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
-     */
-    public function testMockArgumentsPassedByReference()
-    {
-        $foo = $this->getMockBuilder('MethodCallbackByReference')
-                    ->setMethods(array('bar'))
-                    ->disableOriginalConstructor()
-                    ->disableArgumentCloning()
-                    ->getMock();
-
-        $foo->expects($this->any())
-            ->method('bar')
-            ->will($this->returnCallback(array($foo, 'callback')));
-
-        $a = $b = $c = 0;
-
-        $foo->bar($a, $b, $c);
-
-        $this->assertEquals(1, $b);
-    }
-
-    /**
-     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
-     */
-    public function testMockArgumentsPassedByReference2()
-    {
-        $foo = $this->getMockBuilder('MethodCallbackByReference')
-                    ->disableOriginalConstructor()
-                    ->disableArgumentCloning()
-                    ->getMock();
-
-        $foo->expects($this->any())
-            ->method('bar')
-            ->will($this->returnCallback(
-                function (&$a, &$b, $c) {
-                    $b = 1;
-                }
-            ));
-
-        $a = $b = $c = 0;
-
-        $foo->bar($a, $b, $c);
-
-        $this->assertEquals(1, $b);
-    }
-
-    /**
-     * https://github.com/sebastianbergmann/phpunit-mock-objects/issues/116
-     */
-    public function testMockArgumentsPassedByReference3()
-    {
-        $foo = $this->getMockBuilder('MethodCallbackByReference')
-                    ->setMethods(array('bar'))
-                    ->disableOriginalConstructor()
-                    ->disableArgumentCloning()
-                    ->getMock();
-
-        $a = new stdClass();
-        $b = $c = 0;
-
-        $foo->expects($this->any())
-            ->method('bar')
-            ->with($a, $b, $c)
-            ->will($this->returnCallback(array($foo, 'callback')));
-
-        $foo->bar($a, $b, $c);
-    }
-
-    /**
-     * https://github.com/sebastianbergmann/phpunit/issues/796
-     */
-    public function testMockArgumentsPassedByReference4()
-    {
-        $foo = $this->getMockBuilder('MethodCallbackByReference')
-                    ->setMethods(array('bar'))
-                    ->disableOriginalConstructor()
-                    ->disableArgumentCloning()
-                    ->getMock();
-
-        $a = new stdClass();
-        $b = $c = 0;
-
-        $foo->expects($this->any())
-            ->method('bar')
-            ->with($this->isInstanceOf("stdClass"), $b, $c)
-            ->will($this->returnCallback(array($foo, 'callback')));
-
-        $foo->bar($a, $b, $c);
-    }
-
-    /**
-     * @requires extension soap
-     */
-    public function testCreateMockFromWsdl()
-    {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'WsdlMock');
-        $this->assertStringStartsWith(
-            'Mock_WsdlMock_',
-            get_class($mock)
-        );
-    }
-
-    /**
-     * @requires extension soap
-     */
-    public function testCreateNamespacedMockFromWsdl()
-    {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
-        $this->assertStringStartsWith(
-            'Mock_WsdlMock_',
-            get_class($mock)
-        );
-    }
-
-    /**
-     * @requires extension soap
-     */
-    public function testCreateTwoMocksOfOneWsdlFile()
-    {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
-    }
-
-    /**
-     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/156
-     * @ticket 156
-     */
-    public function testInterfaceWithStaticMethodCanBeStubbed()
-    {
-        $this->assertInstanceOf(
-            'InterfaceWithStaticMethod',
-            $this->getMock('InterfaceWithStaticMethod')
-        );
-    }
-
-    /**
-     * @expectedException PHPUnit_Framework_MockObject_BadMethodCallException
-     */
-    public function testInvokingStubbedStaticMethodRaisesException()
-    {
-        $mock = $this->getMock('ClassWithStaticMethod');
-        $mock->staticMethod();
-    }
-
-    /**
-     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171
-     * @ticket 171
-     */
-    public function testStubForClassThatImplementsSerializableCanBeCreatedWithoutInvokingTheConstructor()
-    {
-        $this->assertInstanceOf(
-            'ClassThatImplementsSerializable',
-            $this->getMockBuilder('ClassThatImplementsSerializable')
-                 ->disableOriginalConstructor()
-                 ->getMock()
-        );
-    }
-
-    private function resetMockObjects()
-    {
-        $refl = new ReflectionObject($this);
-        $refl = $refl->getParentClass();
-        $prop = $refl->getProperty('mockObjects');
-        $prop->setAccessible(true);
-        $prop->setValue($this, array());
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php b/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
deleted file mode 100644
index 2dde7e4..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * This file is part of the PHPUnit_MockObject package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since      Class available since Release 2.0.0
- */
-class Framework_ProxyObjectTest extends PHPUnit_Framework_TestCase
-{
-    public function testMockedMethodIsProxiedToOriginalMethod()
-    {
-        $proxy = $this->getMockBuilder('Bar')
-                      ->enableProxyingToOriginalMethods()
-                      ->getMock();
-
-        $proxy->expects($this->once())
-              ->method('doSomethingElse');
-
-        $foo = new Foo;
-        $this->assertEquals('result', $foo->doSomething($proxy));
-    }
-
-    public function testMockedMethodWithReferenceIsProxiedToOriginalMethod()
-    {
-        $proxy = $this->getMockBuilder('MethodCallbackByReference')
-                      ->enableProxyingToOriginalMethods()
-                      ->getMock();
-        $a = $b = $c = 0;
-
-        $proxy->callback($a, $b, $c);
-
-        $this->assertEquals(1, $b);
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
deleted file mode 100644
index 1f2640c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-abstract class AbstractMockTestClass implements MockTestInterface
-{
-    abstract public function doSomething();
-
-    public function returnAnything()
-    {
-        return 1;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
deleted file mode 100644
index 52aac64..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-trait AbstractTrait
-{
-    abstract public function doSomething();
-
-    public function mockableMethod()
-    {
-        return true;
-    }
-
-    public function anotherMockableMethod()
-    {
-        return true;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
deleted file mode 100644
index 5b7d4cc..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-interface AnInterface
-{
-    public function doSomething();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
deleted file mode 100644
index 62bff0a..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-interface AnotherInterface
-{
-    public function doSomethingElse();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
deleted file mode 100644
index 4a4d165..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-class Bar
-{
-    public function doSomethingElse()
-    {
-        return 'result';
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassThatImplementsSerializable.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassThatImplementsSerializable.php
deleted file mode 100644
index 87576ca..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassThatImplementsSerializable.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-class ClassThatImplementsSerializable implements Serializable
-{
-    public function serialize()
-    {
-        return get_object_vars($this);
-    }
-
-    public function unserialize($serialized)
-    {
-        foreach (unserialize($serialized) as $key => $value) {
-            $this->{$key} = $value;
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassWithStaticMethod.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassWithStaticMethod.php
deleted file mode 100644
index 0c13c12..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/ClassWithStaticMethod.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-class ClassWithStaticMethod
-{
-    public static function staticMethod()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
deleted file mode 100644
index 16a9ed7..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-class Foo
-{
-    public function doSomething(Bar $bar)
-    {
-        return $bar->doSomethingElse();
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
deleted file mode 100644
index c12ac6c..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-function functionCallback()
-{
-    $args = func_get_args();
-
-    if ($args == array('foo', 'bar')) {
-        return 'pass';
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
deleted file mode 100644
index e448501..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- WSDL description of the Google Web APIs.
-     The Google Web APIs are in beta release. All interfaces are subject to
-     change as we refine and extend our APIs. Please see the terms of use
-     for more information. -->
-
-<!-- Revision 2002-08-16 -->
-
-<definitions name="GoogleSearch"
-             targetNamespace="urn:GoogleSearch"
-             xmlns:typens="urn:GoogleSearch"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-             xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-             xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-  <!-- Types for search - result elements, directory categories -->
-
-  <types>
-    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-                targetNamespace="urn:GoogleSearch">
-
-      <xsd:complexType name="GoogleSearchResult">
-        <xsd:all>
-          <xsd:element name="documentFiltering"           type="xsd:boolean"/>
-          <xsd:element name="searchComments"              type="xsd:string"/>
-          <xsd:element name="estimatedTotalResultsCount"  type="xsd:int"/>
-          <xsd:element name="estimateIsExact"             type="xsd:boolean"/>
-          <xsd:element name="resultElements"              type="typens:ResultElementArray"/>
-          <xsd:element name="searchQuery"                 type="xsd:string"/>
-          <xsd:element name="startIndex"                  type="xsd:int"/>
-          <xsd:element name="endIndex"                    type="xsd:int"/>
-          <xsd:element name="searchTips"                  type="xsd:string"/>
-          <xsd:element name="directoryCategories"         type="typens:DirectoryCategoryArray"/>
-          <xsd:element name="searchTime"                  type="xsd:double"/>
-        </xsd:all>
-      </xsd:complexType>
-
-      <xsd:complexType name="ResultElement">
-        <xsd:all>
-          <xsd:element name="summary" type="xsd:string"/>
-          <xsd:element name="URL" type="xsd:string"/>
-          <xsd:element name="snippet" type="xsd:string"/>
-          <xsd:element name="title" type="xsd:string"/>
-          <xsd:element name="cachedSize" type="xsd:string"/>
-          <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
-          <xsd:element name="hostName" type="xsd:string"/>
-          <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
-          <xsd:element name="directoryTitle" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-
-      <xsd:complexType name="ResultElementArray">
-        <xsd:complexContent>
-          <xsd:restriction base="soapenc:Array">
-             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
-          </xsd:restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-
-      <xsd:complexType name="DirectoryCategoryArray">
-        <xsd:complexContent>
-          <xsd:restriction base="soapenc:Array">
-             <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
-          </xsd:restriction>
-        </xsd:complexContent>
-      </xsd:complexType>
-
-      <xsd:complexType name="DirectoryCategory">
-        <xsd:all>
-          <xsd:element name="fullViewableName" type="xsd:string"/>
-          <xsd:element name="specialEncoding" type="xsd:string"/>
-        </xsd:all>
-      </xsd:complexType>
-
-    </xsd:schema>
-  </types>
-
-  <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
-  <message name="doGetCachedPage">
-    <part name="key"            type="xsd:string"/>
-    <part name="url"            type="xsd:string"/>
-  </message>
-
-  <message name="doGetCachedPageResponse">
-    <part name="return"         type="xsd:base64Binary"/>
-  </message>
-
-  <message name="doSpellingSuggestion">
-    <part name="key"            type="xsd:string"/>
-    <part name="phrase"         type="xsd:string"/>
-  </message>
-
-  <message name="doSpellingSuggestionResponse">
-    <part name="return"         type="xsd:string"/>
-  </message>
-
-  <!-- note, ie and oe are ignored by server; all traffic is UTF-8. -->
-
-  <message name="doGoogleSearch">
-    <part name="key"            type="xsd:string"/>
-    <part name="q"              type="xsd:string"/>
-    <part name="start"          type="xsd:int"/>
-    <part name="maxResults"     type="xsd:int"/>
-    <part name="filter"         type="xsd:boolean"/>
-    <part name="restrict"       type="xsd:string"/>
-    <part name="safeSearch"     type="xsd:boolean"/>
-    <part name="lr"             type="xsd:string"/>
-    <part name="ie"             type="xsd:string"/>
-    <part name="oe"             type="xsd:string"/>
-  </message>
-
-  <message name="doGoogleSearchResponse">
-    <part name="return"         type="typens:GoogleSearchResult"/>
-  </message>
-
-  <!-- Port for Google Web APIs, "GoogleSearch" -->
-
-  <portType name="GoogleSearchPort">
-
-    <operation name="doGetCachedPage">
-      <input message="typens:doGetCachedPage"/>
-      <output message="typens:doGetCachedPageResponse"/>
-    </operation>
-
-    <operation name="doSpellingSuggestion">
-      <input message="typens:doSpellingSuggestion"/>
-      <output message="typens:doSpellingSuggestionResponse"/>
-    </operation>
-
-    <operation name="doGoogleSearch">
-      <input message="typens:doGoogleSearch"/>
-      <output message="typens:doGoogleSearchResponse"/>
-    </operation>
-
-  </portType>
-
-
-  <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
-  <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
-    <soap:binding style="rpc"
-                  transport="http://schemas.xmlsoap.org/soap/http"/>
-
-    <operation name="doGetCachedPage">
-      <soap:operation soapAction="urn:GoogleSearchAction"/>
-      <input>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-
-    <operation name="doSpellingSuggestion">
-      <soap:operation soapAction="urn:GoogleSearchAction"/>
-      <input>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-
-    <operation name="doGoogleSearch">
-      <soap:operation soapAction="urn:GoogleSearchAction"/>
-      <input>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </input>
-      <output>
-        <soap:body use="encoded"
-                   namespace="urn:GoogleSearch"
-                   encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
-      </output>
-    </operation>
-  </binding>
-
-  <!-- Endpoint for Google Web APIs -->
-  <service name="GoogleSearchService">
-    <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
-      <soap:address location="http://api.google.com/search/beta2"/>
-    </port>
-  </service>
-
-</definitions>
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
deleted file mode 100644
index dee5f4f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-interface InterfaceWithStaticMethod
-{
-    public static function staticMethod();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
deleted file mode 100644
index f8db62e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-class MethodCallback
-{
-    public static function staticCallback()
-    {
-        $args = func_get_args();
-
-        if ($args == array('foo', 'bar')) {
-            return 'pass';
-        }
-    }
-
-    public function nonStaticCallback()
-    {
-        $args = func_get_args();
-
-        if ($args == array('foo', 'bar')) {
-            return 'pass';
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
deleted file mode 100644
index ef26f3e..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-class MethodCallbackByReference
-{
-    public function bar(&$a, &$b, $c)
-    {
-        Legacy::bar($a, $b, $c);
-    }
-
-    public function callback(&$a, &$b, $c)
-    {
-        $b = 1;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MockTestInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MockTestInterface.php
deleted file mode 100644
index a5f8f5f..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MockTestInterface.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-interface MockTestInterface
-{
-    public function returnAnything();
-    public function returnAnythingElse();
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
deleted file mode 100644
index 3d826dd..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-class Mockable
-{
-    public $constructorArgs;
-    public $cloned;
-
-    public function __construct($arg1 = null, $arg2 = null)
-    {
-        $this->constructorArgs = array($arg1, $arg2);
-    }
-
-    public function mockableMethod()
-    {
-        // something different from NULL
-        return true;
-    }
-
-    public function anotherMockableMethod()
-    {
-        // something different from NULL
-        return true;
-    }
-
-    public function __clone()
-    {
-        $this->cloned = true;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
deleted file mode 100644
index 0609993..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-class PartialMockTestClass
-{
-    public $constructorCalled = false;
-
-    public function __construct()
-    {
-        $this->constructorCalled = true;
-    }
-
-    public function doSomething()
-    {
-    }
-
-    public function doAnotherThing()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SingletonClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SingletonClass.php
deleted file mode 100644
index e000266..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SingletonClass.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-class SingletonClass
-{
-    public static function getInstance()
-    {
-    }
-
-    public function doSomething()
-    {
-    }
-
-    protected function __construct()
-    {
-    }
-
-    final private function __sleep()
-    {
-    }
-
-    final private function __wakeup()
-    {
-    }
-
-    final private function __clone()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
deleted file mode 100644
index ba83b28..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-class SomeClass
-{
-    public function doSomething($a, $b)
-    {
-        return null;
-    }
-
-    public function doSomethingElse($c)
-    {
-        return null;
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
deleted file mode 100644
index ac467c9..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-class StaticMockTestClass
-{
-    public static function doSomething()
-    {
-    }
-
-    public static function doSomethingElse()
-    {
-        return static::doSomething();
-    }
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php b/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
deleted file mode 100644
index 3467cce..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-interface TraversableMockTestInterface extends Traversable
-{
-}
diff --git a/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php b/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
deleted file mode 100644
index 6575b39..0000000
--- a/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require __DIR__ . '/_fixture/FunctionCallback.php';
-require __DIR__ . '/../vendor/autoload.php';
diff --git a/vendor/phpunit/phpunit/.gitattributes b/vendor/phpunit/phpunit/.gitattributes
deleted file mode 100644
index 821227a..0000000
--- a/vendor/phpunit/phpunit/.gitattributes
+++ /dev/null
@@ -1,3 +0,0 @@
-*.php diff=php
-composer.json merge=ours
-src/Runner/Version.php merge=ours
diff --git a/vendor/phpunit/phpunit/.gitignore b/vendor/phpunit/phpunit/.gitignore
deleted file mode 100644
index 65a2321..0000000
--- a/vendor/phpunit/phpunit/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-build/api
-build/code-browser
-build/coverage
-build/logs
-build/pdepend
-build/phar
-build/phpdox
-build/*.phar
-build/*.phar.asc
-tests/TextUI/*.diff
-tests/TextUI/*.exp
-tests/TextUI/*.log
-tests/TextUI/*.out
-tests/TextUI/*.php
-/bin
-/vendor
-/composer.lock
-/composer.phar
-phpunit.xml
-cache.properties
-.idea
-.ant_targets
diff --git a/vendor/phpunit/phpunit/.php_cs b/vendor/phpunit/phpunit/.php_cs
deleted file mode 100644
index 5b353d2..0000000
--- a/vendor/phpunit/phpunit/.php_cs
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->files()
-    ->in('build')
-    ->in('src')
-    ->in('tests')
-    ->name('*.php')
-    ->name('*.phpt');
-
-return Symfony\CS\Config\Config::create()
-    ->level(\Symfony\CS\FixerInterface::NONE_LEVEL)
-    ->fixers(
-        array(
-            'duplicate_semicolon',
-            'empty_return',
-            'extra_empty_lines',
-            'join_function',
-            'list_commas',
-            'no_blank_lines_after_class_opening',
-            'no_empty_lines_after_phpdocs',
-            'phpdoc_indent',
-            'phpdoc_no_access',
-            'phpdoc_no_empty_return',
-            'phpdoc_no_package',
-            'phpdoc_params',
-            'phpdoc_scalar',
-            'phpdoc_to_comment',
-            'phpdoc_trim',
-            'return',
-            'self_accessor',
-            'single_quote',
-            'spaces_before_semicolon',
-            'spaces_cast',
-            'ternary_spaces',
-            'trim_array_spaces',
-            'unused_use',
-            'whitespacy_lines',
-            'align_double_arrow',
-            'align_equals',
-            'concat_with_spaces'
-        )
-    )
-    ->finder($finder);
-
diff --git a/vendor/phpunit/phpunit/.travis.yml b/vendor/phpunit/phpunit/.travis.yml
deleted file mode 100644
index 3be518e..0000000
--- a/vendor/phpunit/phpunit/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-matrix:
-  allow_failures:
-    - php: 7.0
-    - php: hhvm
-
-sudo: false
-
-before_install:
-  - composer self-update
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script:
-  - ./phpunit
-  - ./phpunit --configuration ./build/travis-ci-fail.xml > /dev/null; if [ $? -eq 0 ]; then echo "SHOULD FAIL"; false; else echo "fail checked"; fi;
-  - xmllint --noout --schema phpunit.xsd phpunit.xml.dist
-  - xmllint --noout --schema phpunit.xsd tests/_files/configuration.xml
-  - xmllint --noout --schema phpunit.xsd tests/_files/configuration_empty.xml
-  - xmllint --noout --schema phpunit.xsd tests/_files/configuration_xinclude.xml -xinclude
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/phpunit/phpunit/CODE_OF_CONDUCT.md b/vendor/phpunit/phpunit/CODE_OF_CONDUCT.md
deleted file mode 100644
index a4abb84..0000000
--- a/vendor/phpunit/phpunit/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-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. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org/), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
-
diff --git a/vendor/phpunit/phpunit/CONTRIBUTING.md b/vendor/phpunit/phpunit/CONTRIBUTING.md
deleted file mode 100644
index aee139f..0000000
--- a/vendor/phpunit/phpunit/CONTRIBUTING.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributing to PHPUnit
-
-## Contributor Code of Conduct
-
-Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
-
-## Workflow
-
-* Fork the project.
-* Make your bug fix or feature addition.
-* Add tests for it. This is important so we don't break it in a future version unintentionally.
-* Send a pull request. Bonus points for topic branches.
-
-Please make sure that you have [set up your user name and email address](http://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name <root@localhost>` look really stupid in the commit history of a project.
-
-Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on the current alpha branch (when `5.0` is the current stable branch, then `5.1` is the current beta branch and `5.2` is the current alpha branch).
-
-We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.
-
-Due to time constraints, we are not always able to respond as quickly as we would like. Please do not take delays personal and feel free to remind us if you feel that we forgot to respond.
-
-## Coding Guidelines
-
-This project comes with a configuration file for [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) (`.php_cs`) that you can use to (re)format your sourcecode for compliance with this project's coding guidelines:
-
-```bash
-$ wget http://get.sensiolabs.org/php-cs-fixer.phar
-
-$ php php-cs-fixer.phar fix
-```
-
-## Using PHPUnit from a Git checkout
-
-The following commands can be used to perform the initial checkout of PHPUnit:
-
-```bash
-$ git clone git://github.com/sebastianbergmann/phpunit.git
-
-$ cd phpunit
-```
-
-Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
-
-```bash
-$ wget http://getcomposer.org/composer.phar
-
-$ php composer.phar install
-```
-
-The `phpunit` script can be used to invoke the PHPUnit test runner:
-
-```bash
-$ ./phpunit --version
-```
-
-## Reporting issues
-
-Please use the most specific issue tracker to search for existing tickets and to open new tickets:
-
-* [General problems](https://github.com/sebastianbergmann/phpunit/issues)
-* [Code Coverage](https://github.com/sebastianbergmann/php-code-coverage/issues)
-* [Stub and Mock Objects](https://github.com/sebastianbergmann/phpunit-mock-objects/issues)
-* [DbUnit](https://github.com/sebastianbergmann/dbunit/issues)
-* [PHPUnit_Selenium](https://github.com/sebastianbergmann/phpunit-selenium/issues)
-* [Documentation](https://github.com/sebastianbergmann/phpunit-documentation/issues)
-* [Website](https://github.com/sebastianbergmann/phpunit-website/issues)
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.0.md b/vendor/phpunit/phpunit/ChangeLog-4.0.md
deleted file mode 100644
index dc71b01..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.0.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# Changes in PHPUnit 4.0
-
-All notable changes of the PHPUnit 4.0 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.0.20] - 2014-05-02
-
-### Fixed
-
-* Fixed [#1242](https://github.com/sebastianbergmann/phpunit/issues/1242): `--self-update` uses OpenSSL API that is deprecated in PHP 5.6
-
-## [4.0.19] - 2014-04-30
-
-### Fixed
-
-* Fixed [#1193](https://github.com/sebastianbergmann/phpunit/issues/1193): Process isolation does not work correctly when PHPUnit is used from PHAR
-* Fixed a BC break related to comparing `DOMNode` objects that was introduced in PHPUnit 4.0.18
-
-## [4.0.18] - 2014-04-29
-
-### Fixed
-
-* Fixed [#1218](https://github.com/sebastianbergmann/phpunit/issues/1218): `--self-update` destroys symlink
-
-## [4.0.17] - 2014-04-21
-
-### Changed
-
-* [Display a message that the PEAR installation method is no longer supported when PHPUnit was installed using the PEAR Installer](https://github.com/sebastianbergmann/phpunit/commit/70b02c6be0176ab8ad3d3c9ec97480556c5dd63b)
-
-## [4.0.16] - 2014-04-20
-
-### Fixed
-
-* [Fixed handling of the `--report-useless-tests`, `--strict-coverage`, `--disallow-test-output`, and `--enforce-time-limit` options](https://github.com/sebastianbergmann/phpunit/commit/38baa9670711adedfe44ef24a33b568f61f3f045)
-
-## [4.0.15] - 2014-04-16
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.14] - 2014-03-28
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.13] - 2014-03-26
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.12] - 2014-03-20
-
-### Changed
-
-* [Use blacklist from PHP_CodeCoverage](https://github.com/sebastianbergmann/phpunit/commit/16152ba4b8d0104ce34f60cb71b2b982ba84c898)
-
-## [4.0.11] - 2014-03-18
-
-### Fixed
-
-* [Fixed unintended autoloader invokation triggered by the `@beforeClass` and `@afterClass` annotations](https://github.com/sebastianbergmann/phpunit/commit/f12e10fddc3ccbddb652a04d9036aeb5a6d54bff)
-
-## [4.0.10] - 2014-03-18
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies (most notably a [fix](https://github.com/sebastianbergmann/phpunit-mock-objects/commit/c5e6274b8f2bf983cf883bb375cf44f99aff200e) in the mock object generator that caused a [performance regression](https://github.com/sebastianbergmann/phpunit/issues/1187))
-
-## [4.0.9] - 2014-03-17
-
-### Changed
-
-* Optimized the search for the `@before`, `@after`, `@beforeClass` and `@afterClass` annotations
-* Optimized the usage of `SebastianBergmann\Environment\Runtime::canCollectCodeCoverage()`
-
-### Fixed
-
-* The "No code coverage will be generated." message was displayed even when code coverage reporting was not requested
-
-## [4.0.8] - 2014-03-17
-
-### Fixed
-
-* Fixed [#1186](https://github.com/sebastianbergmann/phpunit/issues/1186): `@before` and `@after` methods are not called in `@dataProvider` methods
-
-## [4.0.7] - 2014-03-12
-
-### Fixed
-
-* Removed dependency on `phpunit/dbunit` in `composer.json` that was unintentionally added in PHPUnit 4.0.6
-
-## [4.0.6] - 2014-03-11
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.5] - 2014-03-10
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.4] - 2014-03-08
-
-### Fixed
-
-* Fixed stacktrace filtering when PHPUnit is used from a PHAR
-
-## [4.0.3] - 2014-03-07
-
-New release of PHPUnit as PHAR and PEAR package with updated dependencies
-
-## [4.0.2] - 2014-03-07
-
-### Fixed
-
-* Fixed an issue related to displaying PHPUnit's version number
-
-## [4.0.1] - 2014-03-07
-
-### Fixed
-
-* Fixed collection of code coverage data for tests that use a data provider
-
-## [4.0.0] - 2014-03-07
-
-### Added
-
-* Implemented #382: Added the `$options` parameter to `PHPUnit_Framework_TestCase::getMockFromWsdl()` for configuring the `SoapClient`
-* Implemented #628: Added `PHPUnit_Framework_Assert::countOf(), a shortcut to get a `PHPUnit_Framework_Constraint_Count` instance
-* Implemented #711: `coverage-text` now has an XML `showOnlySummary` option
-* Implemented #719: The `--stderr` switch now respects `--colors` and `--debug`
-* Implemented #746: Allow identity checking for non-object types in all asserts that depend on `TraversableContains`
-* Implemented #758: Show a proper stack trace when @expectedException fails due to a unexpected exception being thrown
-* Implemented #773: Recursive and repeated arrays are more gracefully when comparison differences are exported
-* Implemented #813: Added `@before`, `@after`, `@beforeClass` and `@afterClass` annotations
-* Implemented #834: Added the `@requires OS` annotation
-* Implemented #835: Printers that extend `PHPUnit_TextUI_ResultPrinter` should have similar construction
-* Implemented #838: Added a base test listener
-* Implemented #859: Added PHP label validation to attribute assertions
-* Implemented #869: Added support for the adjacent sibling selector (+) to `PHPUnit_Util_XML::findNodes()`
-* Implemented #871: Add Comparator for DateTime objects
-* Implemented #877: Added new HTML5 tags to `PHPUnit_Util_XML::findNodes()`
-* Added `--coverage-crap4j` switch to generate code coverage report in Crap4J XML format
-* `assertCount()`, `assertNotCount()`, `assertSameSize()`, and `assertNotSameSize()` now support all objects that implement the `Traversable` interface
-
-### Changed
-
-* A test will now fail in strict mode when it uses the `@covers` annotation and code that is not expected to be covered is executed
-* All relative paths in a configuration file are now resolved relative to that configuration file
-
-### Fixed
-
-* Fixed #240: XML strings are escaped by removing invalid characters
-* Fixed #261: `setUp()` and `setUpBeforeClass()` are run before filters are applied
-* Fixed #541: Excluded groups are counted towards total number of tests being executed
-* Fixed #789: PHP INI settings would not be passed to child processes
-* Fixed #806: Array references are now properly displayed in error output
-* Fixed #808: Resources are now reported as `resource(13) of type (stream)` instead of `NULL`
-* Fixed #873: PHPUnit suppresses exceptions thrown outside of test case function
-* Fixed: `phpt` test cases now use the correct php binary when executed through wrapper scripts
-
-[4.0.20]: https://github.com/sebastianbergmann/phpunit/compare/4.0.19...4.0.20
-[4.0.19]: https://github.com/sebastianbergmann/phpunit/compare/4.0.18...4.0.19
-[4.0.18]: https://github.com/sebastianbergmann/phpunit/compare/4.0.17...4.0.18
-[4.0.17]: https://github.com/sebastianbergmann/phpunit/compare/4.0.16...4.0.17
-[4.0.16]: https://github.com/sebastianbergmann/phpunit/compare/4.0.15...4.0.16
-[4.0.15]: https://github.com/sebastianbergmann/phpunit/compare/4.0.14...4.0.15
-[4.0.14]: https://github.com/sebastianbergmann/phpunit/compare/4.0.13...4.0.14
-[4.0.13]: https://github.com/sebastianbergmann/phpunit/compare/4.0.12...4.0.13
-[4.0.12]: https://github.com/sebastianbergmann/phpunit/compare/4.0.11...4.0.12
-[4.0.11]: https://github.com/sebastianbergmann/phpunit/compare/4.0.10...4.0.11
-[4.0.10]: https://github.com/sebastianbergmann/phpunit/compare/4.0.9...4.0.10
-[4.0.9]: https://github.com/sebastianbergmann/phpunit/compare/4.0.8...4.0.9
-[4.0.8]: https://github.com/sebastianbergmann/phpunit/compare/4.0.7...4.0.8
-[4.0.7]: https://github.com/sebastianbergmann/phpunit/compare/4.0.6...4.0.7
-[4.0.6]: https://github.com/sebastianbergmann/phpunit/compare/4.0.5...4.0.6
-[4.0.5]: https://github.com/sebastianbergmann/phpunit/compare/4.0.4...4.0.5
-[4.0.4]: https://github.com/sebastianbergmann/phpunit/compare/4.0.3...4.0.4
-[4.0.3]: https://github.com/sebastianbergmann/phpunit/compare/4.0.2...4.0.3
-[4.0.2]: https://github.com/sebastianbergmann/phpunit/compare/4.0.1...4.0.2
-[4.0.1]: https://github.com/sebastianbergmann/phpunit/compare/4.0.0...4.0.1
-[4.0.0]: https://github.com/sebastianbergmann/phpunit/compare/3.7...4.0.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.1.md b/vendor/phpunit/phpunit/ChangeLog-4.1.md
deleted file mode 100644
index d7f10a7..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.1.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Changes in PHPUnit 4.1
-
-All notable changes of the PHPUnit 4.1 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.1.6] - 2014-08-17
-
-### Fixed
-
-* Fixed [#1380](https://github.com/sebastianbergmann/phpunit/issues/1380): `assertMatch()` returns `Unexpected end tag : hr`
-* Fixed [#1390](https://github.com/sebastianbergmann/phpunit/issues/1390): Licensing issue with third-party components bundled in PHAR distribution
-
-## [4.1.5] - 2014-08-07
-
-### Changed
-
-* Implemented [#1330](https://github.com/sebastianbergmann/phpunit/issues/1330): Allow non-ambiguous shortened long options
-
-### Fixed
-
-* Fixed [#529](https://github.com/sebastianbergmann/phpunit/issues/529): Tests missed in execution when another test extends from it 
-* Fixed [#1149](https://github.com/sebastianbergmann/phpunit/issues/1149): Test swallows output buffer when run in a separate process
-* Fixed [#1336](https://github.com/sebastianbergmann/phpunit/issues/1336): Problem in process isolation with global variables that contain an object which contains a string which contains multiple backslashes
-* Fixed [#1337](https://github.com/sebastianbergmann/phpunit/issues/1337): Data Provider with `\` at the end of the name breaks with process isolation
-* Fixed [#1345](https://github.com/sebastianbergmann/phpunit/issues/1345): Process isolation blocks infinitely upon fatal error in child process
-* Fixed [#1354](https://github.com/sebastianbergmann/phpunit/issues/1354): PHPUnit test suite fails on Windows
-* Fixed [#1369](https://github.com/sebastianbergmann/phpunit/issues/1369): Performance of `TestSuite::addTestFile()` and missing documentation
-* Fixed [#1374](https://github.com/sebastianbergmann/phpunit/issues/1374): `tearDown()` is called despite unmet requirements
-
-## [4.1.4] - 2014-07-18
-
-### Fixed
-
-* Fixed [#1265](https://github.com/sebastianbergmann/phpunit/issues/1265): `PHPUnit_Runner_StandardTestSuiteLoader` could not be configured as loader
-* Fixed [#1311](https://github.com/sebastianbergmann/phpunit/issues/1311): Incomplete XML Schema for PHPUnit XML configuration file
-* Fixed [#1314](https://github.com/sebastianbergmann/phpunit/issues/1314): Bug in configuration parser
-
-## [4.1.3] - 2014-06-11
-
-New release of PHPUnit as PHP Archive (PHAR) with updated dependencies
-
-## [4.1.2] - 2014-06-07
-
-New release of PHPUnit as PHP Archive (PHAR) with updated dependencies
-
-## [4.1.1] - 2014-05-24
-
-### Added
-
-* Added `--selfupdate` alias for `--self-update`
-
-### Changed
-
-* Improved the fix for [#1133](https://github.com/sebastianbergmann/phpunit/issues/1133)
-
-### Fixed
-
-* Fixed the constructor argument for `SebastianBergmann\Version`
-
-## [4.1.0] - 2014-05-02
-
-### Changed
-
-* The code to compare PHP values for equality (in `assertEquals()`, for instance) has been factored out into a [separate component](https://github.com/sebastianbergmann/comparator)
-* [The mock object generator is now created lazily](https://github.com/sebastianbergmann/phpunit/pull/1165)
-
-[4.1.6]: https://github.com/sebastianbergmann/phpunit/compare/4.1.5...4.1.6
-[4.1.5]: https://github.com/sebastianbergmann/phpunit/compare/4.1.4...4.1.5
-[4.1.4]: https://github.com/sebastianbergmann/phpunit/compare/4.1.3...4.1.4
-[4.1.3]: https://github.com/sebastianbergmann/phpunit/compare/4.1.2...4.1.3
-[4.1.2]: https://github.com/sebastianbergmann/phpunit/compare/4.1.1...4.1.2
-[4.1.1]: https://github.com/sebastianbergmann/phpunit/compare/4.1.0...4.1.1
-[4.1.0]: https://github.com/sebastianbergmann/phpunit/compare/4.0...4.1.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.2.md b/vendor/phpunit/phpunit/ChangeLog-4.2.md
deleted file mode 100644
index 0d902b7..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.2.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Changes in PHPUnit 4.2
-
-All notable changes of the PHPUnit 4.2 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.2.5] - 2014-09-06
-
-New release of PHPUnit as PHP Archive (PHAR) with updated dependencies
-
-## [4.2.4] - 2014-08-31
-
-### Fixed
-
-* Fixed [#1413](https://github.com/sebastianbergmann/phpunit/issues/1413): `assertCount()` hangs in infinite loop on HHVM
-
-## [4.2.3] - 2014-08-28
-
-### Fixed
-
-* Fixed [#1403](https://github.com/sebastianbergmann/phpunit/issues/1403): `phpunit --self-update` does not work
-
-## [4.2.2] - 2014-08-18
-
-### Fixed
-
-* Fixed [#1399](https://github.com/sebastianbergmann/phpunit/issues/1399): `enforceTimeLimit` configuration option is not handled
-
-## [4.2.1] - 2014-08-17
-
-### Fixed
-
-* Fixed [#1380](https://github.com/sebastianbergmann/phpunit/issues/1380): `assertMatch()` returns `Unexpected end tag : hr`
-* Fixed [#1390](https://github.com/sebastianbergmann/phpunit/issues/1390): Licensing issue with third-party components bundled in PHAR distribution
-
-## [4.2.0] - 2014-08-08
-
-### Added
-
-* Tests annotated with `@todo` will now be reported as risky when the `--disallow-todo-tests` option is used or `beStrictAboutTodoAnnotatedTests=true` is set in the configuration file
-* The `atLeast()` and `atMost()` invocation count matchers were added
-
-### Changed
-
-* `trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);` is used now to indicate that a PHPUnit API method is deprecated; the old "system" for deprecating methods has been removed
-* The PHP Archive (PHAR) distribution of PHPUnit can now be used as a library; `include()`ing or `require()`ing it will not execute the CLI test runner
-
-### Deprecated
-
-* The `assertTag()` and `assertSelect*()` assertion methods have been deprecated in favor of the [phpunit-dom-assertions](https://github.com/phpunit/phpunit-dom-assertions) extension; these methods will be removed in PHPUnit 5.0
-
-[4.2.5]: https://github.com/sebastianbergmann/phpunit/compare/4.2.4...4.2.5
-[4.2.4]: https://github.com/sebastianbergmann/phpunit/compare/4.2.3...4.2.4
-[4.2.3]: https://github.com/sebastianbergmann/phpunit/compare/4.2.2...4.2.3
-[4.2.2]: https://github.com/sebastianbergmann/phpunit/compare/4.2.1...4.2.2
-[4.2.1]: https://github.com/sebastianbergmann/phpunit/compare/4.2.0...4.2.1
-[4.2.0]: https://github.com/sebastianbergmann/phpunit/compare/4.1...4.2.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.3.md b/vendor/phpunit/phpunit/ChangeLog-4.3.md
deleted file mode 100644
index 99c2826..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.3.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Changes in PHPUnit 4.3
-
-All notable changes of the PHPUnit 4.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.3.5] - 2014-11-11
-
-### Changed
-
-* Merged [#1484](https://github.com/sebastianbergmann/phpunit/issues/1484): Removed `lazymap` from blacklist as it is not longer used
-* Merged [#1489](https://github.com/sebastianbergmann/phpunit/issues/1489): Do not send output from tests in process isolation when testing output
-
-## [4.3.4] - 2014-10-22
-
-### Fixed
-
-* Fixed [#1428](https://github.com/sebastianbergmann/phpunit/issues/1428): Issue with Composer dependencies
-* Fixed [#1447](https://github.com/sebastianbergmann/phpunit/issues/1447): PHPT tests treat line endings inconsistently
-
-## [4.3.3] - 2014-10-16
-
-### Fixed
-
-* Fixed [#1471](https://github.com/sebastianbergmann/phpunit/issues/1471): Output made while test is running is printed although `expectOutputString()` is used when an assertion fails
-
-## [4.3.2] - 2014-10-16
-
-### Fixed
-
-* Fixed [#1468](https://github.com/sebastianbergmann/phpunit/issues/1468): Incomplete and `@todo` annotated tests are counted twice
-
-## [4.3.1] - 2014-10-06
-
-New release of PHPUnit as PHP Archive (PHAR) with updated dependencies
-
-## [4.3.0] - 2014-10-03
-
-### Added
-
-* Merged [#1358](https://github.com/sebastianbergmann/phpunit/issues/1358): Implement `@expectedExceptionMessageRegExp` annotation
-* Merged [#1360](https://github.com/sebastianbergmann/phpunit/issues/1360): Allow a test to identify whether it runs in isolation
-
-### Fixed
-
-* Fixed [#1216](https://github.com/sebastianbergmann/phpunit/issues/1216): Bootstrap does not have global variables set when `--bootstrap` is specified on commandline
-* Fixed [#1351](https://github.com/sebastianbergmann/phpunit/issues/1351): `TestResult` object contains serialized test class upon test failure/exception in process isolation
-* Fixed [#1437](https://github.com/sebastianbergmann/phpunit/issues/1437): Risky test messages mask failures 
-
-[4.3.5]: https://github.com/sebastianbergmann/phpunit/compare/4.3.4...4.3.5
-[4.3.4]: https://github.com/sebastianbergmann/phpunit/compare/4.3.3...4.3.4
-[4.3.3]: https://github.com/sebastianbergmann/phpunit/compare/4.3.2...4.3.3
-[4.3.2]: https://github.com/sebastianbergmann/phpunit/compare/4.3.1...4.3.2
-[4.3.1]: https://github.com/sebastianbergmann/phpunit/compare/4.3.0...4.3.1
-[4.3.0]: https://github.com/sebastianbergmann/phpunit/compare/4.2...4.3.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.4.md b/vendor/phpunit/phpunit/ChangeLog-4.4.md
deleted file mode 100644
index 312af5a..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.4.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Changes in PHPUnit 4.4
-
-All notable changes of the PHPUnit 4.4 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.4.5] - 2015-01-27
-
-### Fixed
-
-* Fixed [#1592](https://github.com/sebastianbergmann/phpunit/issues/1592): Incorrect dependency information
-
-## [4.4.4] - 2015-01-24
-
-### Fixed
-
-* Fixed [#1587](https://github.com/sebastianbergmann/phpunit/issues/1587): Class `SebastianBergmann\Exporter\Context` not found
-
-## [4.4.3] - 2015-01-24
-
-New PHAR release due to updated dependencies
-
-## [4.4.2] - 2015-01-17
-
-### Changed
-
-* Merged [#1573](https://github.com/sebastianbergmann/phpunit/issues/1573): Updates for the XSD for PHPUnit XML configuration
-
-### Fixed
-
-* Merged [#1567](https://github.com/sebastianbergmann/phpunit/issues/1567): `coverage-crap4j` missing in XSD for PHPUnit XML configuration
-* Fixed [#1570](https://github.com/sebastianbergmann/phpunit/issues/1570): Test that prints output is marked as failure and not as risky when `--disallow-test-output` is used
-* Fixed `--stderr` with `--tap` or `--testdox` options
-
-## [4.4.1] - 2014-12-28
-
-### Changed
-
-* Merged [#1528](https://github.com/sebastianbergmann/phpunit/issues/1528): Add `expectedCount()` to `toString()` return value
-
-## [4.4.0] - 2014-12-05
-
-### Added
-
-* Merged [#1371](https://github.com/sebastianbergmann/phpunit/issues/1371): Implement `assertArraySubset()` assertion
-* Merged [#1439](https://github.com/sebastianbergmann/phpunit/issues/1439): Add support for `double` to `assertInternalType()`
-
-### Changed
-
-* Merged [#1427](https://github.com/sebastianbergmann/phpunit/issues/1427): Improve failure output for tests when provided data is binary
-* Merged [#1458](https://github.com/sebastianbergmann/phpunit/issues/1458): Only enable colors when PHPUnit is run on a console (and output is not sent to a file)
-
-[4.4.5]: https://github.com/sebastianbergmann/phpunit/compare/4.4.4...4.4.5
-[4.4.4]: https://github.com/sebastianbergmann/phpunit/compare/4.4.3...4.4.4
-[4.4.3]: https://github.com/sebastianbergmann/phpunit/compare/4.4.2...4.4.3
-[4.4.2]: https://github.com/sebastianbergmann/phpunit/compare/4.4.1...4.4.2
-[4.4.1]: https://github.com/sebastianbergmann/phpunit/compare/4.4.0...4.4.1
-[4.4.0]: https://github.com/sebastianbergmann/phpunit/compare/4.3...4.4.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.5.md b/vendor/phpunit/phpunit/ChangeLog-4.5.md
deleted file mode 100644
index 2313de1..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.5.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Changes in PHPUnit 4.5
-
-All notable changes of the PHPUnit 4.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.5.1] - 2015-03-29
-
-## [4.5.0] - 2015-02-05
-
-### Added
-
-* Added out-of-the-box support for [Prophecy](https://github.com/phpspec/prophecy)
-* Implemented [#137](https://github.com/sebastianbergmann/phpunit/issues/137): Add support for variable number of tests shown per line in default result printer
-
-### Changed
-
-* Merged [#1478](https://github.com/sebastianbergmann/phpunit/issues/1478): Improve the performance of `PHPUnit_Framework_Constraint_IsEqual` (which is used by `assertEquals()`, for instance) for the most common case
-
-### Deprecated
-
-* [Deprecated](https://github.com/sebastianbergmann/phpunit/commit/7abe7796f77b13fdf3cfc506fb987d6c2ab477f5) the `--strict` commandline option and the XML configuration's `strict` attribute
-
-### Fixed
-
-* Fixed [#1474](https://github.com/sebastianbergmann/phpunit/issues/1474): Allow the registration of custom comparators for `assertEquals()` et al. (again)
-
-[4.5.1]: https://github.com/sebastianbergmann/phpunit/compare/4.5.0...4.5.1
-[4.5.0]: https://github.com/sebastianbergmann/phpunit/compare/4.4...4.5.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.6.md b/vendor/phpunit/phpunit/ChangeLog-4.6.md
deleted file mode 100644
index 3571634..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.6.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Changes in PHPUnit 4.6
-
-All notable changes of the PHPUnit 4.6 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.6.10] - 2015-06-03
-
-### Changed
-
-* Merged [#1693](https://github.com/sebastianbergmann/phpunit/pull/1693): Improved API documentation
-* Merged [#1706](https://github.com/sebastianbergmann/phpunit/pull/1706): Avoid hard-coded URI to `phpunit.xsd`
-* Merged [#1725](https://github.com/sebastianbergmann/phpunit/pull/1725): Update phpDox XSD URI
-* Merged [#1735](https://github.com/sebastianbergmann/phpunit/pull/1735): Mute `chdir()` failures in XInclude handling of XML configuration file
-* Merged [#1736](https://github.com/sebastianbergmann/phpunit/pull/1736): Verify that phar file can be overwritten before attempting self update
-
-### Fixed
-
-* Fixed [#1737](https://github.com/sebastianbergmann/phpunit/issues/1737): Confusing output from `--testdox` for empty test class
-
-## [4.6.9] - 2015-05-29
-
-### Fixed
-
-* Fixed [#1731](https://github.com/sebastianbergmann/phpunit/issues/1731): `.` after failure count has no background color when `--colors` is used
-
-## [4.6.8] - 2015-05-28
-
-New PHAR release due to updated dependencies
-
-## [4.6.7] - 2015-05-25
-
-New PHAR release due to updated dependencies
-
-## [4.6.6] - 2015-04-29
-
-### Fixed
-
-* Fixed [#1684](https://github.com/sebastianbergmann/phpunit/issues/1684): PHAR does not work on HHVM
-
-## [4.6.5] - 2015-04-29
-
-* Fixed [#1677](https://github.com/sebastianbergmann/phpunit/issues/1677): Number of risky tests not printed when there are failing tests
-* Fixed [#1688](https://github.com/sebastianbergmann/phpunit/issues/1688): Self-Update operation does not work due to outdated SSL certificate
-
-## [4.6.4] - 2015-04-11
-
-### Changed
-
-* The default list of blacklisted classes is now always passed to PHP_CodeCoverage
-
-## [4.6.3] - 2015-04-11
-
-### Changed
-
-* Updated the default list of blacklisted classes
-
-## [4.6.2] - 2015-04-07
-
-### Fixed
-
-* Fixed [#1667](https://github.com/sebastianbergmann/phpunit/issues/1667): Loading `src/Framework/Assert/Functions.php` by default causes collisions
-
-## [4.6.1] - 2015-04-03
-
-### Fixed
-
-* Fixed [#1665](https://github.com/sebastianbergmann/phpunit/issues/1665): PHPUnit 4.6.0 PHAR does not work when renamed to `phpunit`
-
-## [4.6.0] - 2015-04-03
-
-### Added
-
-* Added the `--strict-global-state` command-line option and the `beStrictAboutChangesToGlobalState` configuration setting for enabling a check that global variabes, super-global variables, and static attributes in user-defined classes are not modified during a test
-* Merged [#1527](https://github.com/sebastianbergmann/phpunit/issues/1527) and [#1529](https://github.com/sebastianbergmann/phpunit/issues/1529): Allow to define options for displaying colors
-
-### Changed
-
-* Merged [#1528](https://github.com/sebastianbergmann/phpunit/issues/1528): Improve message when `PHPUnit_Framework_Constraint_Count` is used with logical operators
-
-### Fixed
-
-* Merged [#1537](https://github.com/sebastianbergmann/phpunit/issues/1537): Fix problem of `--stderr` with `--tap` and `--testdox`
-* Fixed [#1599](https://github.com/sebastianbergmann/phpunit/issues/1599): The PHAR build of PHPUnit no longer uses an autoloader to load PHPUnit's own classes and instead statically loads all classes on startup
-
-[4.6.10]: https://github.com/sebastianbergmann/phpunit/compare/4.6.9...4.6.10
-[4.6.9]: https://github.com/sebastianbergmann/phpunit/compare/4.6.8...4.6.9
-[4.6.8]: https://github.com/sebastianbergmann/phpunit/compare/4.6.7...4.6.8
-[4.6.7]: https://github.com/sebastianbergmann/phpunit/compare/4.6.6...4.6.7
-[4.6.6]: https://github.com/sebastianbergmann/phpunit/compare/4.6.5...4.6.6
-[4.6.5]: https://github.com/sebastianbergmann/phpunit/compare/4.6.4...4.6.5
-[4.6.4]: https://github.com/sebastianbergmann/phpunit/compare/4.6.3...4.6.4
-[4.6.3]: https://github.com/sebastianbergmann/phpunit/compare/4.6.2...4.6.3
-[4.6.2]: https://github.com/sebastianbergmann/phpunit/compare/4.6.1...4.6.2
-[4.6.1]: https://github.com/sebastianbergmann/phpunit/compare/4.6.0...4.6.1
-[4.6.0]: https://github.com/sebastianbergmann/phpunit/compare/4.5...4.6.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.7.md b/vendor/phpunit/phpunit/ChangeLog-4.7.md
deleted file mode 100644
index 948c127..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.7.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Changes in PHPUnit 4.7
-
-All notable changes of the PHPUnit 4.7 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.7.7] - 2015-07-13
-
-New PHAR release due to updated dependencies
-
-## [4.7.6] - 2015-06-30
-
-### Fixed
-
-* Fixed [#1681](https://github.com/sebastianbergmann/phpunit/issues/1681): Code Coverage filter configuration is not passed to child processes
-* Fixed [#1692](https://github.com/sebastianbergmann/phpunit/issues/1692): Clean up `PHPUnit_Extensions_RepeatedTest` after refactoring
-* Fixed [#1763](https://github.com/sebastianbergmann/phpunit/issues/1763): `@before` and `@after` annotations do not work when inherited
-
-## [4.7.5] - 2015-06-21
-
-### Fixed
-
-* Fixed [#490](https://github.com/sebastianbergmann/phpunit/issues/490): Ensure that a test can only be one of `@small`, `@medium`, or `@large`.
-* Fixed [#1704](https://github.com/sebastianbergmann/phpunit/issues/1704): Output printed during test missing when using TAP
-
-## [4.7.4] - 2015-06-18
-
-### Changed
-
-* The `PHPUnit_Framework_Constraint_IsType` constraint now knows about the `real` type (which is an alias for `float`)
-* Various work on compatibility with PHP 7
-
-### Fixed
-
-* Fixed [#1749](https://github.com/sebastianbergmann/phpunit/issues/1749): `stopOnError` configuration setting does not work
-
-## [4.7.3] - 2015-06-11
-
-### Fixed
-
-* Fixed [#1317](https://github.com/sebastianbergmann/phpunit/issues/1317): JUnit XML logfiles does not contain warnings
-* Fixed an [issue](https://github.com/sebastianbergmann/php-code-coverage/issues/347) where the warning that no whitelist is used is displayed when it should not
-
-## [4.7.2] - 2015-06-06
-
-New PHAR release due to updated dependencies
-
-## [4.7.1] - 2015-06-05
-
-New PHAR release due to updated dependencies
-
-## [4.7.0] - 2015-06-05
-
-### Added
-
-* Merged [#1718](https://github.com/sebastianbergmann/phpunit/issues/1718): Support for `--INI--` section in PHPT tests
-
-### Changed
-
-* Tests not annotated with `@small`, `@medium`, or `@large` are no longer treated as being annotated with `@small`
-* In verbose mode, the test runner now prints information about the PHP runtime
-* To be consistent with the printing of PHP runtime information, the configuration file used is only printed in verbose mode
-* A warning is now printed when code coverage data is collected but no whitelist is configured
-
-[4.7.7]: https://github.com/sebastianbergmann/phpunit/compare/4.7.6...4.7.7
-[4.7.6]: https://github.com/sebastianbergmann/phpunit/compare/4.7.5...4.7.6
-[4.7.5]: https://github.com/sebastianbergmann/phpunit/compare/4.7.4...4.7.5
-[4.7.4]: https://github.com/sebastianbergmann/phpunit/compare/4.7.3...4.7.4
-[4.7.3]: https://github.com/sebastianbergmann/phpunit/compare/4.7.2...4.7.3
-[4.7.2]: https://github.com/sebastianbergmann/phpunit/compare/4.7.1...4.7.2
-[4.7.1]: https://github.com/sebastianbergmann/phpunit/compare/4.7.0...4.7.1
-[4.7.0]: https://github.com/sebastianbergmann/phpunit/compare/4.6...4.7.0
-
diff --git a/vendor/phpunit/phpunit/ChangeLog-4.8.md b/vendor/phpunit/phpunit/ChangeLog-4.8.md
deleted file mode 100644
index 9fc5845..0000000
--- a/vendor/phpunit/phpunit/ChangeLog-4.8.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Changes in PHPUnit 4.8
-
-All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
-
-## [4.8.11] - 2015-10-07
-
-### Fixed
-
-* Merged [#1885](https://github.com/sebastianbergmann/phpunit/issues/1885): Fixed handling of PHP configuration settings for process isolation
-* Fixed [#1857](https://github.com/sebastianbergmann/phpunit/issues/1857): `@covers` and `@uses` should only take a single word
-* Fixed [#1879](https://github.com/sebastianbergmann/phpunit/issues/1879): `assertEqualXMLStructure()` cannot compare nodes with an ID
-* Fixed [#1898](https://github.com/sebastianbergmann/phpunit/issues/1898): `@covers` and `@uses` cannot be used for namespaced functions
-* Fixed [#1901](https://github.com/sebastianbergmann/phpunit/issues/1901): `--self-update` updates to PHPUnit 5, even on PHP < 5.6
-
-## [4.8.10] - 2015-10-01
-
-### Fixed
-
-* Merged [#1884](https://github.com/sebastianbergmann/phpunit/issues/1884): Avoid passing `Error` to `onNotSuccessfulTest()` on PHP 7
-
-## [4.8.9] - 2015-09-20
-
-### Fixed
-
-* Fixed regression introduced in PHPUnit 4.8.8
-
-## [4.8.8] - 2015-09-19
-
-### Fixed
-
-* Fixed [#1860](https://github.com/sebastianbergmann/phpunit/issues/1860): Not well-formed XML strings are always considered equal by `PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString()`
-
-## [4.8.7] - 2015-09-14
-
-New PHAR release due to updated dependencies
-
-## [4.8.6] - 2015-08-24
-
-### Fixed
-
-* Fixed [#1835](https://github.com/sebastianbergmann/phpunit/issues/1835): Skipped test reported as errored since PHPUnit 4.7.4
-
-## [4.8.5] - 2015-08-19
-
-### Fixed
-
-* Fixed [#1831](https://github.com/sebastianbergmann/phpunit/issues/1831): PHAR manifest is missing
-
-## [4.8.4] - 2015-08-15
-
-### Fixed
-
-* Fixed [#1823](https://github.com/sebastianbergmann/phpunit/issues/1823): Columns attribute in XML configuration file is ignored
-
-## [4.8.3] - 2015-08-10
-
-### Changed
-
-* PHPUnit now exits early during bootstrap when an unsupported version of PHP is used
-
-## [4.8.2] - 2015-08-07
-
-### Fixed
-
-* Fixed [#1816](https://github.com/sebastianbergmann/phpunit/issues/1816): PHPUnit 4.8.1 shows "4.8.0" as version number
-
-## [4.8.1] - 2015-08-07
-
-### Fixed
-
-* Fixed [#1815](https://github.com/sebastianbergmann/phpunit/issues/1815): `phpunit --self-update` does not work in PHPUnit 4.8.0
-
-## [4.8.0] - 2015-08-07
-
-### Added
-
-* Added `--check-version` commandline switch to check whether the current version of PHPUnit is used (PHAR only)
-* Added `--no-coverage` commandline switch to ignore code coverage configuration from the configuration file
-* Implemented [#1663](https://github.com/sebastianbergmann/phpunit/issues/1663): The Crap4J report's threshold is now configurable
-* Merged [#1728](https://github.com/sebastianbergmann/phpunit/issues/1728): Implemented the `@testWith` annotation as "syntactic sugar" for data providers
-* Merged [#1739](https://github.com/sebastianbergmann/phpunit/issues/1739): Added support to the commandline test runner for using options after arguments
-
-### Changed
-
-* Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
-* Changed the name of the default group from `__nogroup__` to `default`
-
-[4.8.11]: https://github.com/sebastianbergmann/phpunit/compare/4.8.10...4.8.11
-[4.8.10]: https://github.com/sebastianbergmann/phpunit/compare/4.8.9...4.8.10
-[4.8.9]: https://github.com/sebastianbergmann/phpunit/compare/4.8.8...4.8.9
-[4.8.8]: https://github.com/sebastianbergmann/phpunit/compare/4.8.7...4.8.8
-[4.8.7]: https://github.com/sebastianbergmann/phpunit/compare/4.8.6...4.8.7
-[4.8.6]: https://github.com/sebastianbergmann/phpunit/compare/4.8.5...4.8.6
-[4.8.5]: https://github.com/sebastianbergmann/phpunit/compare/4.8.4...4.8.5
-[4.8.4]: https://github.com/sebastianbergmann/phpunit/compare/4.8.3...4.8.4
-[4.8.3]: https://github.com/sebastianbergmann/phpunit/compare/4.8.2...4.8.3
-[4.8.2]: https://github.com/sebastianbergmann/phpunit/compare/4.8.1...4.8.2
-[4.8.1]: https://github.com/sebastianbergmann/phpunit/compare/4.8.0...4.8.1
-[4.8.0]: https://github.com/sebastianbergmann/phpunit/compare/4.7...4.8.0
-
diff --git a/vendor/phpunit/phpunit/LICENSE b/vendor/phpunit/phpunit/LICENSE
deleted file mode 100644
index 32ddc8e..0000000
--- a/vendor/phpunit/phpunit/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-PHPUnit
-
-Copyright (c) 2001-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/phpunit/phpunit/README.md b/vendor/phpunit/phpunit/README.md
deleted file mode 100644
index d1b5f30..0000000
--- a/vendor/phpunit/phpunit/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# PHPUnit
-
-PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of the xUnit architecture for unit testing frameworks.
-
-[![Latest Stable Version](https://img.shields.io/packagist/v/phpunit/phpunit.svg?style=flat-square)](https://packagist.org/packages/phpunit/phpunit)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.3.3-8892BF.svg?style=flat-square)](https://php.net/)
-[![Build Status](https://img.shields.io/travis/sebastianbergmann/phpunit/4.8.svg?style=flat-square)](https://travis-ci.org/sebastianbergmann/phpunit)
-
-## Installation
-
-We distribute a [PHP Archive (PHAR)](https://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
-
-```bash
-$ wget https://phar.phpunit.de/phpunit.phar
-
-$ chmod +x phpunit.phar
-
-$ mv phpunit.phar /usr/local/bin/phpunit
-```
-
-You can also immediately use the PHAR after you have downloaded it, of course:
-
-```bash
-$ wget https://phar.phpunit.de/phpunit.phar
-
-$ php phpunit.phar
-```
-
-Alternatively, you may use [Composer](https://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](https://phpunit.de/documentation.html) for details on how to do this.
-
-## Contribute
-
-Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
-
-## List of Contributors
-
-Thanks to everyone who has contributed to PHPUnit! You can find a detailed list of contributors on every PHPUnit related package on GitHub. This list shows only the major components:
-
-* [PHPUnit](https://github.com/sebastianbergmann/phpunit/graphs/contributors)
-* [PHP_CodeCoverage](https://github.com/sebastianbergmann/php-code-coverage/graphs/contributors)
-* [PHPUnit_MockObject](https://github.com/sebastianbergmann/phpunit-mock-objects/graphs/contributors)
-
-A very special thanks to everyone who has contributed to the documentation and helps maintain the translations:
-
-* [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
-
diff --git a/vendor/phpunit/phpunit/build.xml b/vendor/phpunit/phpunit/build.xml
deleted file mode 100644
index ef816e6..0000000
--- a/vendor/phpunit/phpunit/build.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="phpunit" default="setup">
-    <target name="setup" depends="clean,composer"/>
-
-    <target name="clean" description="Cleanup build artifacts">
-        <delete dir="${basedir}/bin"/>
-        <delete dir="${basedir}/vendor"/>
-        <delete file="${basedir}/composer.lock"/>
-        <delete dir="${basedir}/build/phar"/>
-        <delete>
-            <fileset dir="${basedir}/build">
-                <include name="**/*.phar" />
-                <include name="**/*.phar.asc" />
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="composer" description="Install dependencies with Composer">
-        <tstamp>
-            <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-        </tstamp>
-        <delete>
-            <fileset dir="${basedir}">
-                <include name="composer.phar" />
-                <date datetime="${thirty.days.ago}" when="before"/>
-            </fileset>
-        </delete>
-
-        <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-        <exec executable="php">
-            <arg value="composer.phar"/>
-            <arg value="install"/>
-        </exec>
-    </target>
-
-    <target name="signed-phar"
-            description="Create signed PHAR archive of PHPUnit and all its dependencies (release)"
-            depends="phar">
-        <exec executable="bash" outputproperty="version">
-            <arg value="-c" />
-            <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
-        </exec>
-
-        <exec executable="gpg" failonerror="true">
-            <arg value="--armor" />
-            <arg value="--detach-sign" />
-            <arg path="${basedir}/build/phpunit-${version}.phar" />
-        </exec>
-    </target>
-
-    <target name="phar"
-            description="Create PHAR archive of PHPUnit and all its dependencies (release)"
-            depends="phar-prepare">
-        <exec executable="bash" outputproperty="version">
-            <arg value="-c" />
-            <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
-        </exec>
-
-        <antcall target="phar-build">
-            <param name="version" value="${version}"/>
-        </antcall>
-    </target>
-
-    <target name="phar-alpha"
-            description="Create PHAR archive of PHPUnit and all its dependencies (alpha)"
-            depends="phar-prepare">
-        <antcall target="phar-build">
-            <param name="version" value="alpha"/>
-        </antcall>
-    </target>
-
-    <target name="phar-beta"
-            description="Create PHAR archive of PHPUnit and all its dependencies (beta)"
-            depends="phar-prepare">
-        <antcall target="phar-build">
-            <param name="version" value="beta"/>
-        </antcall>
-    </target>
-
-    <target name="phar-prepare" depends="clean,composer">
-        <mkdir dir="${basedir}/build/phar"/>
-        <copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>
-
-        <exec executable="php">
-            <arg value="composer.phar"/>
-            <arg value="require"/>
-            <arg value="phpunit/dbunit:~1.4"/>
-            <arg value="phpunit/phpunit-selenium:~1.4"/>
-            <arg value="phpunit/php-invoker:~1.1"/>
-        </exec>
-
-        <move file="${basedir}/composer.json.bak" tofile="${basedir}/composer.json"/>
-
-        <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
-        <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
-
-        <copy file="${basedir}/vendor/phpunit/php-code-coverage/LICENSE" tofile="${basedir}/build/phar/php-code-coverage/LICENSE"/>
-        <copy todir="${basedir}/build/phar/php-code-coverage">
-            <fileset dir="${basedir}/vendor/phpunit/php-code-coverage/src">
-                <include name="**/*" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpunit/php-file-iterator/LICENSE" tofile="${basedir}/build/phar/php-file-iterator/LICENSE"/>
-        <copy todir="${basedir}/build/phar/php-file-iterator">
-            <fileset dir="${basedir}/vendor/phpunit/php-file-iterator/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpunit/php-text-template/LICENSE" tofile="${basedir}/build/phar/php-text-template/LICENSE"/>
-        <copy todir="${basedir}/build/phar/php-text-template">
-            <fileset dir="${basedir}/vendor/phpunit/php-text-template/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpunit/php-timer/LICENSE" tofile="${basedir}/build/phar/php-timer/LICENSE"/>
-        <copy todir="${basedir}/build/phar/php-timer">
-            <fileset dir="${basedir}/vendor/phpunit/php-timer/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpunit/php-token-stream/LICENSE" tofile="${basedir}/build/phar/php-token-stream/LICENSE"/>
-        <copy todir="${basedir}/build/phar/php-token-stream">
-            <fileset dir="${basedir}/vendor/phpunit/php-token-stream/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpunit/phpunit-mock-objects/LICENSE" tofile="${basedir}/build/phar/phpunit-mock-objects/LICENSE"/>
-        <copy todir="${basedir}/build/phar/phpunit-mock-objects">
-            <fileset dir="${basedir}/vendor/phpunit/phpunit-mock-objects/src">
-                <include name="**/*" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/comparator/LICENSE" tofile="${basedir}/build/phar/sebastian-comparator/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-comparator">
-            <fileset dir="${basedir}/vendor/sebastian/comparator/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/diff/LICENSE" tofile="${basedir}/build/phar/sebastian-diff/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-diff">
-            <fileset dir="${basedir}/vendor/sebastian/diff/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/environment/LICENSE" tofile="${basedir}/build/phar/sebastian-environment/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-environment">
-            <fileset dir="${basedir}/vendor/sebastian/environment/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/exporter/LICENSE" tofile="${basedir}/build/phar/sebastian-exporter/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-exporter">
-            <fileset dir="${basedir}/vendor/sebastian/exporter/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/recursion-context/LICENSE" tofile="${basedir}/build/phar/sebastian-recursion-context/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-recursion-context">
-            <fileset dir="${basedir}/vendor/sebastian/recursion-context/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/global-state/LICENSE" tofile="${basedir}/build/phar/sebastian-global-state/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-global-state">
-            <fileset dir="${basedir}/vendor/sebastian/global-state/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/sebastian/version/LICENSE" tofile="${basedir}/build/phar/sebastian-version/LICENSE"/>
-        <copy todir="${basedir}/build/phar/sebastian-version">
-            <fileset dir="${basedir}/vendor/sebastian/version/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/doctrine/instantiator/LICENSE" tofile="${basedir}/build/phar/doctrine-instantiator/LICENSE"/>
-        <copy todir="${basedir}/build/phar/doctrine-instantiator">
-            <fileset dir="${basedir}/vendor/doctrine/instantiator/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/symfony/yaml/LICENSE" tofile="${basedir}/build/phar/symfony/LICENSE"/>
-        <copy todir="${basedir}/build/phar/symfony">
-            <fileset dir="${basedir}/vendor/symfony">
-                <include name="**/*.php" />
-                <exclude name="**/Tests/**" />
-            </fileset>
-        </copy>
-
-        <copy todir="${basedir}/build/phar/dbunit">
-            <fileset dir="${basedir}/vendor/phpunit/dbunit/PHPUnit">
-                <include name="**/*.php" />
-                <exclude name="**/Autoload.*" />
-            </fileset>
-        </copy>
-
-        <copy todir="${basedir}/build/phar/php-invoker">
-            <fileset dir="${basedir}/vendor/phpunit/php-invoker/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy todir="${basedir}/build/phar/phpunit-selenium">
-            <fileset dir="${basedir}/vendor/phpunit/phpunit-selenium/PHPUnit">
-                <include name="**/*.php" />
-                <exclude name="**/Autoload.*" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpdocumentor/reflection-docblock/LICENSE" tofile="${basedir}/build/phar/phpdocumentor-reflection-docblock/LICENSE"/>
-        <copy todir="${basedir}/build/phar/phpdocumentor-reflection-docblock">
-            <fileset dir="${basedir}/vendor/phpdocumentor/reflection-docblock/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-
-        <copy file="${basedir}/vendor/phpspec/prophecy/LICENSE" tofile="${basedir}/build/phar/phpspec-prophecy/LICENSE"/>
-        <copy todir="${basedir}/build/phar/phpspec-prophecy">
-            <fileset dir="${basedir}/vendor/phpspec/prophecy/src">
-                <include name="**/*.php" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="phar-build">
-        <copy todir="${basedir}/build/phar/phpunit">
-            <fileset dir="${basedir}/src">
-                <include name="**/*.php" />
-                <include name="**/*.tpl*" />
-            </fileset>
-        </copy>
-
-        <exec executable="${basedir}/build/phar-version.php" outputproperty="_version">
-            <arg value="${version}" />
-        </exec>
-
-        <exec executable="phpab">
-            <arg value="--all" />
-            <arg value="--static" />
-            <arg value="--phar" />
-            <arg value="--output" />
-            <arg path="${basedir}/build/phpunit-${_version}.phar" />
-            <arg value="--template" />
-            <arg path="${basedir}/build/phar-autoload.php.in" />
-            <arg path="${basedir}/build/phar" />
-        </exec>
-
-        <chmod file="${basedir}/build/phpunit-${_version}.phar" perm="ugo+rx"/>
-    </target>
-</project>
-
diff --git a/vendor/phpunit/phpunit/build/ca.pem b/vendor/phpunit/phpunit/build/ca.pem
deleted file mode 100644
index 20585f1..0000000
--- a/vendor/phpunit/phpunit/build/ca.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
diff --git a/vendor/phpunit/phpunit/build/phar-autoload.php.in b/vendor/phpunit/phpunit/build/phar-autoload.php.in
deleted file mode 100644
index 165f9ba..0000000
--- a/vendor/phpunit/phpunit/build/phar-autoload.php.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env php
-<?php
-if (__FILE__ == realpath($GLOBALS['_SERVER']['SCRIPT_NAME'])) {
-    $phar    = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
-    $execute = true;
-} else {
-    $files   = get_included_files();
-    $phar    = $files[0];
-    $execute = false;
-}
-
-define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', $phar));
-define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
-
-Phar::mapPhar('___PHAR___');
-
-___FILELIST___
-
-if ($execute) {
-    if (version_compare('5.3.3', PHP_VERSION, '>')) {
-        fwrite(
-            STDERR,
-            'This version of PHPUnit requires PHP 5.3.3; using the latest version of PHP is highly recommended.' . PHP_EOL
-        );
-
-        die(1);
-    }
-
-    if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
-        print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/phar/manifest.txt');
-        exit;
-    }
-
-    PHPUnit_TextUI_Command::main();
-}
-
-__HALT_COMPILER();
diff --git a/vendor/phpunit/phpunit/build/phar-manifest.php b/vendor/phpunit/phpunit/build/phar-manifest.php
deleted file mode 100755
index 474686b..0000000
--- a/vendor/phpunit/phpunit/build/phar-manifest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env php
-<?php
-print 'phpunit/phpunit: ';
-
-$tag = @exec('git describe --tags 2>&1');
-
-if (strpos($tag, '-') === false && strpos($tag, 'No names found') === false) {
-    print $tag;
-} else {
-    $branch = @exec('git rev-parse --abbrev-ref HEAD');
-    $hash   = @exec('git log -1 --format="%H"');
-    print $branch . '@' . $hash;
-}
-
-print "\n";
-
-$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
-
-foreach ($lock->packages as $package) {
-    print $package->name . ': ' . $package->version;
-
-    if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
-        print '@' . $package->source->reference;
-    }
-
-    print "\n";
-}
diff --git a/vendor/phpunit/phpunit/build/phar-version.php b/vendor/phpunit/phpunit/build/phar-version.php
deleted file mode 100755
index 83b8746..0000000
--- a/vendor/phpunit/phpunit/build/phar-version.php
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env php
-<?php
-if (!isset($argv[1])) {
-    exit(1);
-}
-
-if ($argv[1] == 'alpha' || $argv[1] == 'beta') {
-    $version = sprintf('%s-%s', $argv[1], date('Y-m-d'));
-} else {
-    $version = $argv[1];
-}
-
-file_put_contents(
-    __DIR__ . '/phar/phpunit/Runner/Version.php',
-    str_replace(
-        'private static $pharVersion;',
-        'private static $pharVersion = "' . $version . '";',
-        file_get_contents(__DIR__ . '/phar/phpunit/Runner/Version.php')
-    )
-);
-
-print $version;
diff --git a/vendor/phpunit/phpunit/build/travis-ci-fail.xml b/vendor/phpunit/phpunit/build/travis-ci-fail.xml
deleted file mode 100644
index 4586989..0000000
--- a/vendor/phpunit/phpunit/build/travis-ci-fail.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.4/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuites>
-    <testsuite name="small">
-      <directory suffix=".phpt">../tests/Fail</directory>
-    </testsuite>
-  </testsuites>
-
-  <php>
-    <const name="PHPUNIT_TESTSUITE" value="true"/>
-  </php>
-</phpunit>
diff --git a/vendor/phpunit/phpunit/composer.json b/vendor/phpunit/phpunit/composer.json
deleted file mode 100644
index 8bff2d1..0000000
--- a/vendor/phpunit/phpunit/composer.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "name": "phpunit/phpunit",
-    "description": "The PHP Unit Testing framework.",
-    "type": "library",
-    "keywords": [
-        "phpunit",
-        "xunit",
-        "testing"
-    ],
-    "homepage": "https://phpunit.de/",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "require": {
-        "php": ">=5.3.3",
-        "phpunit/php-file-iterator": "~1.4",
-        "phpunit/php-text-template": "~1.2",
-        "phpunit/php-code-coverage": "~2.1",
-        "phpunit/php-timer": ">=1.0.6",
-        "phpunit/phpunit-mock-objects": "~2.3",
-        "phpspec/prophecy": "^1.3.1",
-        "symfony/yaml": "~2.1|~3.0",
-        "sebastian/comparator": "~1.1",
-        "sebastian/diff": "~1.2",
-        "sebastian/environment": "~1.3",
-        "sebastian/exporter": "~1.2",
-        "sebastian/global-state": "~1.0",
-        "sebastian/version": "~1.0",
-        "ext-dom": "*",
-        "ext-json": "*",
-        "ext-pcre": "*",
-        "ext-reflection": "*",
-        "ext-spl": "*"
-    },
-    "suggest": {
-        "phpunit/php-invoker": "~1.1"
-    },
-    "bin": [
-        "phpunit"
-    ],
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "autoload-dev": {
-        "classmap": [
-            "tests/"
-        ],
-        "files": [
-            "src/Framework/Assert/Functions.php",
-            "tests/_files/CoveredFunction.php"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.8.x-dev"
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/phpdox.xml.dist b/vendor/phpunit/phpunit/phpdox.xml.dist
deleted file mode 100644
index b32db69..0000000
--- a/vendor/phpunit/phpunit/phpdox.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpdox xmlns="http://xml.phpdox.net/config">
- <project name="PHPUnit" source="src" workdir="build/phpdox">
-  <collector publiconly="false">
-   <include mask="*.php" />
-  </collector>
-
-  <generator output="build">
-   <enrich base="${basedir}/build/logs">
-    <source type="build" />
-    <source type="git" />
-    <source type="phploc" />
-    <source type="checkstyle" />
-    <source type="pmd" />
-   </enrich>
-
-   <build engine="html" enabled="true" output="api">
-    <file extension="html" />
-   </build>
-  </generator>
- </project>
-</phpdox>
-
diff --git a/vendor/phpunit/phpunit/phpunit b/vendor/phpunit/phpunit/phpunit
deleted file mode 100755
index 8948f6e..0000000
--- a/vendor/phpunit/phpunit/phpunit
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (version_compare('5.3.3', PHP_VERSION, '>')) {
-    fwrite(
-        STDERR,
-        'This version of PHPUnit requires PHP 5.3.3; using the latest version of PHP is highly recommended.' . PHP_EOL
-    );
-
-    die(1);
-}
-
-if (!ini_get('date.timezone')) {
-    ini_set('date.timezone', 'UTC');
-}
-
-foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
-    if (file_exists($file)) {
-        define('PHPUNIT_COMPOSER_INSTALL', $file);
-
-        break;
-    }
-}
-
-unset($file);
-
-if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
-    fwrite(STDERR,
-        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
-        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
-        'php composer.phar install' . PHP_EOL
-    );
-
-    die(1);
-}
-
-require PHPUNIT_COMPOSER_INSTALL;
-
-PHPUnit_TextUI_Command::main();
diff --git a/vendor/phpunit/phpunit/phpunit.xml.dist b/vendor/phpunit/phpunit/phpunit.xml.dist
deleted file mode 100644
index ad6baa8..0000000
--- a/vendor/phpunit/phpunit/phpunit.xml.dist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuites>
-    <testsuite name="small">
-      <directory suffix="Test.php">tests/Framework</directory>
-      <directory suffix="Test.php">tests/Extensions</directory>
-      <directory suffix="Test.php">tests/Runner</directory>
-      <directory suffix="Test.php">tests/Util</directory>
-    </testsuite>
-
-    <testsuite name="large">
-      <directory suffix=".phpt">tests/TextUI</directory>
-      <directory suffix=".phpt">tests/Regression</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-      <exclude>
-       <file>src/Framework/Assert/Functions.php</file>
-      </exclude>
-    </whitelist>
-  </filter>
-
-  <php>
-    <const name="PHPUNIT_TESTSUITE" value="true"/>
-  </php>
-</phpunit>
-
diff --git a/vendor/phpunit/phpunit/phpunit.xsd b/vendor/phpunit/phpunit/phpunit.xsd
deleted file mode 100644
index 19e9743..0000000
--- a/vendor/phpunit/phpunit/phpunit.xsd
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <xs:annotation>
-    <xs:documentation source="https://phpunit.de/manual/4.8/en/appendixes.configuration.html">
-      This Schema file defines the rules by which the XML configuration file of PHPUnit 4.8 may be structured.
-    </xs:documentation>
-    <xs:appinfo source="http://www.phpunit.de/manual/current/en/appendixes.configuration.html"/>
-  </xs:annotation>
-  <xs:element name="phpunit" type="phpUnitType">
-    <xs:annotation>
-      <xs:documentation>Root Element</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  <xs:complexType name="filtersType">
-    <xs:choice>
-      <xs:sequence>
-        <xs:element name="blacklist" type="filterType"/>
-        <xs:element name="whitelist" type="whiteListType" minOccurs="0"/>
-      </xs:sequence>
-      <xs:sequence>
-        <xs:element name="whitelist" type="whiteListType"/>
-      </xs:sequence>
-    </xs:choice>
-  </xs:complexType>
-  <xs:complexType name="filterType">
-    <xs:sequence>
-      <xs:group ref="pathGroup"/>
-      <xs:element name="exclude" maxOccurs="unbounded" minOccurs="0">
-        <xs:complexType>
-          <xs:group ref="pathGroup"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="whiteListType">
-    <xs:complexContent>
-      <xs:extension base="filterType">
-        <xs:attribute name="addUncoveredFilesFromWhitelist" default="false" type="xs:boolean"/>
-        <xs:attribute name="processUncoveredFilesFromWhitelist" default="true" type="xs:boolean"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="groupsType">
-    <xs:choice>
-      <xs:sequence>
-        <xs:element name="include" type="groupType"/>
-        <xs:element name="exclude" type="groupType" minOccurs="0"/>
-      </xs:sequence>
-      <xs:sequence>
-        <xs:element name="exclude" type="groupType"/>
-      </xs:sequence>
-    </xs:choice>
-  </xs:complexType>
-  <xs:complexType name="groupType">
-    <xs:sequence>
-      <xs:element name="group" type="xs:string" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="listenersType">
-    <xs:sequence>
-      <xs:element name="listener" type="objectType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="objectType">
-    <xs:sequence>
-      <xs:element name="arguments" minOccurs="0">
-        <xs:complexType>
-          <xs:group ref="argumentsGroup"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute name="class" type="xs:string" use="required"/>
-    <xs:attribute name="file" type="xs:anyURI"/>
-  </xs:complexType>
-  <xs:complexType name="arrayType">
-    <xs:sequence>
-      <xs:element name="element" type="argumentType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="argumentType">
-    <xs:group ref="argumentChoice"/>
-    <xs:attribute name="key" use="required"/>
-  </xs:complexType>
-  <xs:group name="argumentsGroup">
-    <xs:sequence>
-      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:group name="argumentChoice">
-    <xs:choice>
-      <xs:element name="array" type="arrayType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="integer" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="string" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="double" type="xs:double" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="null" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="directory" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:choice>
-  </xs:group>
-  <xs:complexType name="loggersType">
-    <xs:sequence>
-      <xs:element name="log" type="loggerType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="loggerType">
-    <xs:attribute name="type">
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value="coverage-html"/>
-          <xs:enumeration value="coverage-text"/>
-          <xs:enumeration value="coverage-clover"/>
-          <xs:enumeration value="coverage-crap4j"/>
-          <xs:enumeration value="json"/>
-          <xs:enumeration value="plain"/>
-          <xs:enumeration value="tap"/>
-          <xs:enumeration value="junit"/>
-          <xs:enumeration value="testdox-html"/>
-          <xs:enumeration value="testdox-text"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="target" type="xs:anyURI"/>
-    <xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
-    <xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
-    <xs:attribute name="logIncompleteSkipped" type="xs:boolean" default="false"/>
-    <xs:attribute name="showUncoveredFiles" type="xs:boolean" default="false"/>
-    <xs:attribute name="threshold" type="xs:nonNegativeInteger" default="30"/>
-  </xs:complexType>
-  <xs:group name="pathGroup">
-    <xs:sequence>
-      <xs:element name="directory" type="directoryFilterType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="file" type="fileFilterType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:group>
-  <xs:complexType name="directoryFilterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attribute type="xs:string" name="suffix" default="Test.php"/>
-        <xs:attributeGroup ref="phpVersionGroup"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="fileFilterType">
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI">
-        <xs:attributeGroup ref="phpVersionGroup"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  <xs:attributeGroup name="phpVersionGroup">
-    <xs:attribute name="phpVersion" type="xs:string" default="5.3.0"/>
-    <xs:attribute name="phpVersionOperator" type="xs:string" default="&gt;="/>
-  </xs:attributeGroup>
-  <xs:complexType name="phpType">
-    <xs:sequence>
-      <xs:element name="includePath" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="ini" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="const" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="var" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="env" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="post" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="get" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="cookie" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="server" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="files" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="request" type="namedValueType" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="namedValueType">
-    <xs:attribute name="name" use="required" type="xs:string"/>
-    <xs:attribute name="value" use="required" type="xs:anySimpleType"/>
-  </xs:complexType>
-  <xs:complexType name="phpUnitType">
-    <xs:annotation>
-      <xs:documentation>The main type specifying the document structure</xs:documentation>
-    </xs:annotation>
-    <xs:group ref="configGroup"/>
-    <xs:attributeGroup ref="configAttributeGroup"/>
-  </xs:complexType>
-  <xs:attributeGroup name="configAttributeGroup">
-    <xs:attribute name="backupGlobals" type="xs:boolean" default="true"/>
-    <xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
-    <xs:attribute name="bootstrap" type="xs:anyURI"/>
-    <xs:attribute name="cacheTokens" type="xs:boolean"/>
-    <xs:attribute name="colors" type="xs:boolean" default="false"/>
-    <xs:attribute name="columns" type="xs:integer" default="80"/>
-    <xs:attribute name="convertErrorsToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="convertNoticesToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="convertWarningsToExceptions" type="xs:boolean" default="true"/>
-    <xs:attribute name="forceCoversAnnotation" type="xs:boolean" default="false"/>
-    <xs:attribute name="mapTestClassNameToCoveredClassName" type="xs:boolean" default="false"/>
-    <xs:attribute name="printerClass" type="xs:string" default="PHPUnit_TextUI_ResultPrinter"/>
-    <xs:attribute name="printerFile" type="xs:anyURI"/>
-    <xs:attribute name="processIsolation" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnError" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnFailure" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
-    <xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutTestSize" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutTodoAnnotatedTests" type="xs:boolean" default="false"/>
-    <xs:attribute name="beStrictAboutChangesToGlobalState" type="xs:boolean" default="false"/>
-    <xs:attribute name="checkForUnintentionallyCoveredCode" type="xs:boolean" default="false"/>
-    <xs:attribute name="strict" type="xs:boolean" default="false"/>
-    <xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
-    <xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
-    <xs:attribute name="timeoutForSmallTests" type="xs:integer" default="1"/>
-    <xs:attribute name="timeoutForMediumTests" type="xs:integer" default="10"/>
-    <xs:attribute name="timeoutForLargeTests" type="xs:integer" default="60"/>
-    <xs:attribute name="verbose" type="xs:boolean" default="false"/>
-    <xs:attribute name="stderr" type="xs:boolean" default="false"/>
-  </xs:attributeGroup>
-  <xs:group name="configGroup">
-    <xs:all>
-      <xs:element ref="testSuiteFacet" minOccurs="0"/>
-      <xs:element name="groups" type="groupsType" minOccurs="0"/>
-      <xs:element name="filter" type="filtersType" minOccurs="0"/>
-      <xs:element name="logging" type="loggersType" minOccurs="0"/>
-      <xs:element name="listeners" type="listenersType" minOccurs="0"/>
-      <xs:element name="php" type="phpType" minOccurs="0"/>
-      <xs:element name="selenium" type="seleniumType" minOccurs="0"/>
-    </xs:all>
-  </xs:group>
-  <xs:complexType name="seleniumType">
-    <xs:sequence>
-      <xs:element name="browser" type="browserType"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="browserType">
-    <xs:attribute name="name" type="xs:string"/>
-    <xs:attribute name="browser" type="xs:string"/>
-    <xs:attribute name="host" type="xs:anyURI"/>
-    <xs:attribute name="port" type="xs:nonNegativeInteger"/>
-    <xs:attribute name="timeout" type="xs:nonNegativeInteger"/>
-  </xs:complexType>
-  <xs:element name="testSuiteFacet" abstract="true"/>
-  <xs:element name="testsuite" type="testSuiteType" substitutionGroup="testSuiteFacet"/>
-  <xs:element name="testsuites" type="testSuitesType" substitutionGroup="testSuiteFacet"/>
-  <xs:complexType name="testSuitesType">
-    <xs:sequence>
-      <xs:element name="testsuite" type="testSuiteType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="testSuiteType">
-    <xs:sequence>
-      <xs:group ref="pathGroup"/>
-      <xs:element name="exclude" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:string" use="required"/>
-  </xs:complexType>
-</xs:schema>
diff --git a/vendor/phpunit/phpunit/src/Exception.php b/vendor/phpunit/phpunit/src/Exception.php
deleted file mode 100644
index 480ec93..0000000
--- a/vendor/phpunit/phpunit/src/Exception.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marker interface for PHPUnit exceptions.
- *
- * @since      Interface available since Release 4.0.0
- */
-interface PHPUnit_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php b/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
deleted file mode 100644
index 1bd4f14..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * We have a TestSuite object A.
- * In TestSuite object A we have Tests tagged with @group.
- * We want a TestSuite object B that contains TestSuite objects C, D, ...
- * for the Tests tagged with @group C, @group D, ...
- * Running the Tests from TestSuite object B results in Tests tagged with both
- * @group C and @group D in TestSuite object A to be run twice .
- *
- * <code>
- * $suite = new PHPUnit_Extensions_GroupTestSuite($A, array('C', 'D'));
- * </code>
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Extensions_GroupTestSuite extends PHPUnit_Framework_TestSuite
-{
-    public function __construct(PHPUnit_Framework_TestSuite $suite, array $groups)
-    {
-        $groupSuites = array();
-        $name        = $suite->getName();
-
-        foreach ($groups as $group) {
-            $groupSuites[$group] = new PHPUnit_Framework_TestSuite($name . ' - ' . $group);
-            $this->addTest($groupSuites[$group]);
-        }
-
-        $tests = new RecursiveIteratorIterator(
-            new PHPUnit_Util_TestSuiteIterator($suite),
-            RecursiveIteratorIterator::LEAVES_ONLY
-        );
-
-        foreach ($tests as $test) {
-            if ($test instanceof PHPUnit_Framework_TestCase) {
-                $testGroups = PHPUnit_Util_Test::getGroups(
-                    get_class($test),
-                    $test->getName(false)
-                );
-
-                foreach ($groups as $group) {
-                    foreach ($testGroups as $testGroup) {
-                        if ($group == $testGroup) {
-                            $groupSuites[$group]->addTest($test);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
deleted file mode 100644
index 8ebb908..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Runner for PHPT test cases.
- *
- * @since Class available since Release 3.1.4
- */
-class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * @var string
-     */
-    private $filename;
-
-    /**
-     * @var array
-     */
-    private $settings = array(
-        'allow_url_fopen=1',
-        'auto_append_file=',
-        'auto_prepend_file=',
-        'disable_functions=',
-        'display_errors=1',
-        'docref_root=',
-        'docref_ext=.html',
-        'error_append_string=',
-        'error_prepend_string=',
-        'error_reporting=-1',
-        'html_errors=0',
-        'log_errors=0',
-        'magic_quotes_runtime=0',
-        'output_handler=',
-        'open_basedir=',
-        'output_buffering=Off',
-        'report_memleaks=0',
-        'report_zend_debug=0',
-        'safe_mode=0',
-        'track_errors=1',
-        'xdebug.default_enable=0'
-    );
-
-    /**
-     * Constructs a test case with the given filename.
-     *
-     * @param  string                      $filename
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($filename)
-    {
-        if (!is_string($filename)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_file($filename)) {
-            throw new PHPUnit_Framework_Exception(
-                sprintf(
-                    'File "%s" does not exist.',
-                    $filename
-                )
-            );
-        }
-
-        $this->filename = $filename;
-    }
-
-    /**
-     * Counts the number of test cases executed by run(TestResult result).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Runs a test and collects its result in a TestResult instance.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null)
-    {
-        $sections = $this->parse();
-        $code     = $this->render($sections['FILE']);
-
-        if ($result === null) {
-            $result = new PHPUnit_Framework_TestResult;
-        }
-
-        $php      = PHPUnit_Util_PHP::factory();
-        $skip     = false;
-        $time     = 0;
-        $settings = $this->settings;
-
-        $result->startTest($this);
-
-        if (isset($sections['INI'])) {
-            $settings = array_merge($settings, $this->parseIniSection($sections['INI']));
-        }
-
-        if (isset($sections['SKIPIF'])) {
-            $jobResult = $php->runJob($sections['SKIPIF'], $settings);
-
-            if (!strncasecmp('skip', ltrim($jobResult['stdout']), 4)) {
-                if (preg_match('/^\s*skip\s*(.+)\s*/i', $jobResult['stdout'], $message)) {
-                    $message = substr($message[1], 2);
-                } else {
-                    $message = '';
-                }
-
-                $result->addFailure($this, new PHPUnit_Framework_SkippedTestError($message), 0);
-
-                $skip = true;
-            }
-        }
-
-        if (!$skip) {
-            PHP_Timer::start();
-            $jobResult = $php->runJob($code, $settings);
-            $time      = PHP_Timer::stop();
-
-            if (isset($sections['EXPECT'])) {
-                $assertion = 'assertEquals';
-                $expected  = $sections['EXPECT'];
-            } else {
-                $assertion = 'assertStringMatchesFormat';
-                $expected  = $sections['EXPECTF'];
-            }
-
-            $output   = preg_replace('/\r\n/', "\n", trim($jobResult['stdout']));
-            $expected = preg_replace('/\r\n/', "\n", trim($expected));
-
-            try {
-                PHPUnit_Framework_Assert::$assertion($expected, $output);
-            } catch (PHPUnit_Framework_AssertionFailedError $e) {
-                $result->addFailure($this, $e, $time);
-            } catch (Throwable $t) {
-                $result->addError($this, $t, $time);
-            } catch (Exception $e) {
-                $result->addError($this, $e, $time);
-            }
-        }
-
-        $result->endTest($this, $time);
-
-        return $result;
-    }
-
-    /**
-     * Returns the name of the test case.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * @return array
-     * @throws PHPUnit_Framework_Exception
-     */
-    private function parse()
-    {
-        $sections = array();
-        $section  = '';
-
-        foreach (file($this->filename) as $line) {
-            if (preg_match('/^--([_A-Z]+)--/', $line, $result)) {
-                $section            = $result[1];
-                $sections[$section] = '';
-                continue;
-            } elseif (empty($section)) {
-                throw new PHPUnit_Framework_Exception('Invalid PHPT file');
-            }
-
-            $sections[$section] .= $line;
-        }
-
-        if (!isset($sections['FILE']) ||
-            (!isset($sections['EXPECT']) && !isset($sections['EXPECTF']))) {
-            throw new PHPUnit_Framework_Exception('Invalid PHPT file');
-        }
-
-        return $sections;
-    }
-
-    /**
-     * @param  string $code
-     * @return string
-     */
-    private function render($code)
-    {
-        return str_replace(
-            array(
-            '__DIR__',
-            '__FILE__'
-            ),
-            array(
-            "'" . dirname($this->filename) . "'",
-            "'" . $this->filename . "'"
-            ),
-            $code
-        );
-    }
-
-    /**
-     * Parse --INI-- section key value pairs and return as array.
-     *
-     * @param string
-     * @return array
-     */
-    protected function parseIniSection($content)
-    {
-        return preg_split('/\n|\r/', $content, -1, PREG_SPLIT_NO_EMPTY);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php b/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
deleted file mode 100644
index 8959cfc..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Suite for .phpt test cases.
- *
- * @since Class available since Release 3.1.4
- */
-class PHPUnit_Extensions_PhptTestSuite extends PHPUnit_Framework_TestSuite
-{
-    /**
-     * Constructs a new TestSuite for .phpt test cases.
-     *
-     * @param  string                      $directory
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($directory)
-    {
-        if (is_string($directory) && is_dir($directory)) {
-            $this->setName($directory);
-
-            $facade = new File_Iterator_Facade;
-            $files  = $facade->getFilesAsArray($directory, '.phpt');
-
-            foreach ($files as $file) {
-                $this->addTestFile($file);
-            }
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'directory name');
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php b/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
deleted file mode 100644
index d98afd0..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Decorator that runs a test repeatedly.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
-{
-    /**
-     * @var bool
-     */
-    protected $processIsolation = false;
-
-    /**
-     * @var int
-     */
-    protected $timesRepeat = 1;
-
-    /**
-     * @param  PHPUnit_Framework_Test      $test
-     * @param  int                         $timesRepeat
-     * @param  bool                        $processIsolation
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $processIsolation = false)
-    {
-        parent::__construct($test);
-
-        if (is_integer($timesRepeat) &&
-            $timesRepeat >= 0) {
-            $this->timesRepeat = $timesRepeat;
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'positive integer'
-            );
-        }
-
-        $this->processIsolation = $processIsolation;
-    }
-
-    /**
-     * Counts the number of test cases that
-     * will be run by this test.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->timesRepeat * count($this->test);
-    }
-
-    /**
-     * Runs the decorated test and collects the
-     * result in a TestResult.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null)
-    {
-        if ($result === null) {
-            $result = $this->createResult();
-        }
-
-        //@codingStandardsIgnoreStart
-        for ($i = 0; $i < $this->timesRepeat && !$result->shouldStop(); $i++) {
-            //@codingStandardsIgnoreEnd
-            if ($this->test instanceof PHPUnit_Framework_TestSuite) {
-                $this->test->setRunTestInSeparateProcess($this->processIsolation);
-            }
-            $this->test->run($result);
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php b/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
deleted file mode 100644
index 3a50988..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Decorator for Tests.
- *
- * Use TestDecorator as the base class for defining new
- * test decorators. Test decorator subclasses can be introduced
- * to add behaviour before or after a test is run.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Extensions_TestDecorator extends PHPUnit_Framework_Assert implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * The Test to be decorated.
-     *
-     * @var object
-     */
-    protected $test = null;
-
-    /**
-     * Constructor.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function __construct(PHPUnit_Framework_Test $test)
-    {
-        $this->test = $test;
-    }
-
-    /**
-     * Returns a string representation of the test.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->test->toString();
-    }
-
-    /**
-     * Runs the test and collects the
-     * result in a TestResult.
-     *
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    public function basicRun(PHPUnit_Framework_TestResult $result)
-    {
-        $this->test->run($result);
-    }
-
-    /**
-     * Counts the number of test cases that
-     * will be run by this test.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->test);
-    }
-
-    /**
-     * Creates a default TestResult object.
-     *
-     * @return PHPUnit_Framework_TestResult
-     */
-    protected function createResult()
-    {
-        return new PHPUnit_Framework_TestResult;
-    }
-
-    /**
-     * Returns the test to be run.
-     *
-     * @return PHPUnit_Framework_Test
-     */
-    public function getTest()
-    {
-        return $this->test;
-    }
-
-    /**
-     * Runs the decorated test and collects the
-     * result in a TestResult.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null)
-    {
-        if ($result === null) {
-            $result = $this->createResult();
-        }
-
-        $this->basicRun($result);
-
-        return $result;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Extensions/TicketListener.php b/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
deleted file mode 100644
index 5148306..0000000
--- a/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for test listeners that interact with an issue tracker.
- *
- * @since Class available since Release 3.4.0
- */
-abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_TestListener
-{
-    /**
-     * @var array
-     */
-    protected $ticketCounts = array();
-
-    /**
-     * @var bool
-     */
-    protected $ran = false;
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    /**
-     * A test suite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    /**
-     * A test suite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        if (!$test instanceof PHPUnit_Framework_Warning) {
-            if ($this->ran) {
-                return;
-            }
-
-            $name    = $test->getName(false);
-            $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
-
-            foreach ($tickets as $ticket) {
-                $this->ticketCounts[$ticket][$name] = 1;
-            }
-
-            $this->ran = true;
-        }
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if (!$test instanceof PHPUnit_Framework_Warning) {
-            if ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
-                $ifStatus   = array('assigned', 'new', 'reopened');
-                $newStatus  = 'closed';
-                $message    = 'Automatically closed by PHPUnit (test passed).';
-                $resolution = 'fixed';
-                $cumulative = true;
-            } elseif ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE) {
-                $ifStatus   = array('closed');
-                $newStatus  = 'reopened';
-                $message    = 'Automatically reopened by PHPUnit (test failed).';
-                $resolution = '';
-                $cumulative = false;
-            } else {
-                return;
-            }
-
-            $name    = $test->getName(false);
-            $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
-
-            foreach ($tickets as $ticket) {
-                // Remove this test from the totals (if it passed).
-                if ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
-                    unset($this->ticketCounts[$ticket][$name]);
-                }
-
-                // Only close tickets if ALL referenced cases pass
-                // but reopen tickets if a single test fails.
-                if ($cumulative) {
-                    // Determine number of to-pass tests:
-                    if (count($this->ticketCounts[$ticket]) > 0) {
-                        // There exist remaining test cases with this reference.
-                        $adjustTicket = false;
-                    } else {
-                        // No remaining tickets, go ahead and adjust.
-                        $adjustTicket = true;
-                    }
-                } else {
-                    $adjustTicket = true;
-                }
-
-                $ticketInfo = $this->getTicketInfo($ticket);
-
-                if ($adjustTicket && in_array($ticketInfo['status'], $ifStatus)) {
-                    $this->updateTicket($ticket, $newStatus, $message, $resolution);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param  mixed $ticketId
-     * @return mixed
-     */
-    abstract protected function getTicketInfo($ticketId = null);
-
-    /**
-     * @param string $ticketId
-     * @param string $newStatus
-     * @param string $message
-     * @param string $resolution
-     */
-    abstract protected function updateTicket($ticketId, $newStatus, $message, $resolution);
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Assert.php b/vendor/phpunit/phpunit/src/Framework/Assert.php
deleted file mode 100644
index 4da7cff..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Assert.php
+++ /dev/null
@@ -1,3021 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A set of assert methods.
- *
- * @since Class available since Release 2.0.0
- */
-abstract class PHPUnit_Framework_Assert
-{
-    /**
-     * @var int
-     */
-    private static $count = 0;
-
-    /**
-     * Asserts that an array has a specified key.
-     *
-     * @param mixed             $key
-     * @param array|ArrayAccess $array
-     * @param string            $message
-     * @since Method available since Release 3.0.0
-     */
-    public static function assertArrayHasKey($key, $array, $message = '')
-    {
-        if (!(is_integer($key) || is_string($key))) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'integer or string'
-            );
-        }
-
-        if (!(is_array($array) || $array instanceof ArrayAccess)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or ArrayAccess'
-            );
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_ArrayHasKey($key);
-
-        self::assertThat($array, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an array has a specified subset.
-     *
-     * @param array|ArrayAccess $subset
-     * @param array|ArrayAccess $array
-     * @param bool              $strict  Check for object identity
-     * @param string            $message
-     * @since Method available since Release 4.4.0
-     */
-    public static function assertArraySubset($subset, $array, $strict = false, $message = '')
-    {
-        if (!is_array($subset)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'array or ArrayAccess'
-            );
-        }
-
-        if (!is_array($array)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or ArrayAccess'
-            );
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_ArraySubset($subset, $strict);
-
-        self::assertThat($array, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an array does not have a specified key.
-     *
-     * @param mixed             $key
-     * @param array|ArrayAccess $array
-     * @param string            $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertArrayNotHasKey($key, $array, $message = '')
-    {
-        if (!(is_integer($key) || is_string($key))) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'integer or string'
-            );
-        }
-
-        if (!(is_array($array) || $array instanceof ArrayAccess)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or ArrayAccess'
-            );
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_ArrayHasKey($key)
-        );
-
-        self::assertThat($array, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a haystack contains a needle.
-     *
-     * @param mixed  $needle
-     * @param mixed  $haystack
-     * @param string $message
-     * @param bool   $ignoreCase
-     * @param bool   $checkForObjectIdentity
-     * @param bool   $checkForNonObjectIdentity
-     * @since  Method available since Release 2.1.0
-     */
-    public static function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        if (is_array($haystack) ||
-            is_object($haystack) && $haystack instanceof Traversable) {
-            $constraint = new PHPUnit_Framework_Constraint_TraversableContains(
-                $needle,
-                $checkForObjectIdentity,
-                $checkForNonObjectIdentity
-            );
-        } elseif (is_string($haystack)) {
-            if (!is_string($needle)) {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                    1,
-                    'string'
-                );
-            }
-
-            $constraint = new PHPUnit_Framework_Constraint_StringContains(
-                $needle,
-                $ignoreCase
-            );
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array, traversable or string'
-            );
-        }
-
-        self::assertThat($haystack, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a haystack that is stored in a static attribute of a class
-     * or an attribute of an object contains a needle.
-     *
-     * @param mixed  $needle
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @param bool   $ignoreCase
-     * @param bool   $checkForObjectIdentity
-     * @param bool   $checkForNonObjectIdentity
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        self::assertContains(
-            $needle,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message,
-            $ignoreCase,
-            $checkForObjectIdentity,
-            $checkForNonObjectIdentity
-        );
-    }
-
-    /**
-     * Asserts that a haystack does not contain a needle.
-     *
-     * @param mixed  $needle
-     * @param mixed  $haystack
-     * @param string $message
-     * @param bool   $ignoreCase
-     * @param bool   $checkForObjectIdentity
-     * @param bool   $checkForNonObjectIdentity
-     * @since  Method available since Release 2.1.0
-     */
-    public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        if (is_array($haystack) ||
-            is_object($haystack) && $haystack instanceof Traversable) {
-            $constraint = new PHPUnit_Framework_Constraint_Not(
-                new PHPUnit_Framework_Constraint_TraversableContains(
-                    $needle,
-                    $checkForObjectIdentity,
-                    $checkForNonObjectIdentity
-                )
-            );
-        } elseif (is_string($haystack)) {
-            if (!is_string($needle)) {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                    1,
-                    'string'
-                );
-            }
-
-            $constraint = new PHPUnit_Framework_Constraint_Not(
-                new PHPUnit_Framework_Constraint_StringContains(
-                    $needle,
-                    $ignoreCase
-                )
-            );
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array, traversable or string'
-            );
-        }
-
-        self::assertThat($haystack, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a haystack that is stored in a static attribute of a class
-     * or an attribute of an object does not contain a needle.
-     *
-     * @param mixed  $needle
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @param bool   $ignoreCase
-     * @param bool   $checkForObjectIdentity
-     * @param bool   $checkForNonObjectIdentity
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        self::assertNotContains(
-            $needle,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message,
-            $ignoreCase,
-            $checkForObjectIdentity,
-            $checkForNonObjectIdentity
-        );
-    }
-
-    /**
-     * Asserts that a haystack contains only values of a given type.
-     *
-     * @param string $type
-     * @param mixed  $haystack
-     * @param bool   $isNativeType
-     * @param string $message
-     * @since  Method available since Release 3.1.4
-     */
-    public static function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
-    {
-        if (!(is_array($haystack) ||
-            is_object($haystack) && $haystack instanceof Traversable)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or traversable'
-            );
-        }
-
-        if ($isNativeType == null) {
-            $isNativeType = PHPUnit_Util_Type::isType($type);
-        }
-
-        self::assertThat(
-            $haystack,
-            new PHPUnit_Framework_Constraint_TraversableContainsOnly(
-                $type,
-                $isNativeType
-            ),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a haystack contains only instances of a given classname
-     *
-     * @param string            $classname
-     * @param array|Traversable $haystack
-     * @param string            $message
-     */
-    public static function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
-    {
-        if (!(is_array($haystack) ||
-            is_object($haystack) && $haystack instanceof Traversable)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or traversable'
-            );
-        }
-
-        self::assertThat(
-            $haystack,
-            new PHPUnit_Framework_Constraint_TraversableContainsOnly(
-                $classname,
-                false
-            ),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a haystack that is stored in a static attribute of a class
-     * or an attribute of an object contains only values of a given type.
-     *
-     * @param string $type
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param bool   $isNativeType
-     * @param string $message
-     * @since  Method available since Release 3.1.4
-     */
-    public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
-    {
-        self::assertContainsOnly(
-            $type,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $isNativeType,
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a haystack does not contain only values of a given type.
-     *
-     * @param string $type
-     * @param mixed  $haystack
-     * @param bool   $isNativeType
-     * @param string $message
-     * @since  Method available since Release 3.1.4
-     */
-    public static function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
-    {
-        if (!(is_array($haystack) ||
-            is_object($haystack) && $haystack instanceof Traversable)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                2,
-                'array or traversable'
-            );
-        }
-
-        if ($isNativeType == null) {
-            $isNativeType = PHPUnit_Util_Type::isType($type);
-        }
-
-        self::assertThat(
-            $haystack,
-            new PHPUnit_Framework_Constraint_Not(
-                new PHPUnit_Framework_Constraint_TraversableContainsOnly(
-                    $type,
-                    $isNativeType
-                )
-            ),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a haystack that is stored in a static attribute of a class
-     * or an attribute of an object does not contain only values of a given
-     * type.
-     *
-     * @param string $type
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param bool   $isNativeType
-     * @param string $message
-     * @since  Method available since Release 3.1.4
-     */
-    public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
-    {
-        self::assertNotContainsOnly(
-            $type,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $isNativeType,
-            $message
-        );
-    }
-
-    /**
-     * Asserts the number of elements of an array, Countable or Traversable.
-     *
-     * @param int    $expectedCount
-     * @param mixed  $haystack
-     * @param string $message
-     */
-    public static function assertCount($expectedCount, $haystack, $message = '')
-    {
-        if (!is_int($expectedCount)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
-        }
-
-        if (!$haystack instanceof Countable &&
-            !$haystack instanceof Traversable &&
-            !is_array($haystack)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
-        }
-
-        self::assertThat(
-            $haystack,
-            new PHPUnit_Framework_Constraint_Count($expectedCount),
-            $message
-        );
-    }
-
-    /**
-     * Asserts the number of elements of an array, Countable or Traversable
-     * that is stored in an attribute.
-     *
-     * @param int    $expectedCount
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @since Method available since Release 3.6.0
-     */
-    public static function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
-    {
-        self::assertCount(
-            $expectedCount,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts the number of elements of an array, Countable or Traversable.
-     *
-     * @param int    $expectedCount
-     * @param mixed  $haystack
-     * @param string $message
-     */
-    public static function assertNotCount($expectedCount, $haystack, $message = '')
-    {
-        if (!is_int($expectedCount)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
-        }
-
-        if (!$haystack instanceof Countable &&
-            !$haystack instanceof Traversable &&
-            !is_array($haystack)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_Count($expectedCount)
-        );
-
-        self::assertThat($haystack, $constraint, $message);
-    }
-
-    /**
-     * Asserts the number of elements of an array, Countable or Traversable
-     * that is stored in an attribute.
-     *
-     * @param int    $expectedCount
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @since Method available since Release 3.6.0
-     */
-    public static function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
-    {
-        self::assertNotCount(
-            $expectedCount,
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that two variables are equal.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @param float  $delta
-     * @param int    $maxDepth
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     */
-    public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        $constraint = new PHPUnit_Framework_Constraint_IsEqual(
-            $expected,
-            $delta,
-            $maxDepth,
-            $canonicalize,
-            $ignoreCase
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a variable is equal to an attribute of an object.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @param float  $delta
-     * @param int    $maxDepth
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     */
-    public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertEquals(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message,
-            $delta,
-            $maxDepth,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that two variables are not equal.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @param float  $delta
-     * @param int    $maxDepth
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     * @since  Method available since Release 2.3.0
-     */
-    public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_IsEqual(
-                $expected,
-                $delta,
-                $maxDepth,
-                $canonicalize,
-                $ignoreCase
-            )
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a variable is not equal to an attribute of an object.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @param float  $delta
-     * @param int    $maxDepth
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     */
-    public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertNotEquals(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message,
-            $delta,
-            $maxDepth,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that a variable is empty.
-     *
-     * @param  mixed                                  $actual
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertEmpty($actual, $message = '')
-    {
-        self::assertThat($actual, self::isEmpty(), $message);
-    }
-
-    /**
-     * Asserts that a static attribute of a class or an attribute of an object
-     * is empty.
-     *
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
-    {
-        self::assertEmpty(
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a variable is not empty.
-     *
-     * @param  mixed                                  $actual
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertNotEmpty($actual, $message = '')
-    {
-        self::assertThat($actual, self::logicalNot(self::isEmpty()), $message);
-    }
-
-    /**
-     * Asserts that a static attribute of a class or an attribute of an object
-     * is not empty.
-     *
-     * @param string $haystackAttributeName
-     * @param mixed  $haystackClassOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
-    {
-        self::assertNotEmpty(
-            self::readAttribute($haystackClassOrObject, $haystackAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a value is greater than another value.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertGreaterThan($expected, $actual, $message = '')
-    {
-        self::assertThat($actual, self::greaterThan($expected), $message);
-    }
-
-    /**
-     * Asserts that an attribute is greater than another value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertGreaterThan(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a value is greater than or equal to another value.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertGreaterThanOrEqual($expected, $actual, $message = '')
-    {
-        self::assertThat(
-            $actual,
-            self::greaterThanOrEqual($expected),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that an attribute is greater than or equal to another value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertGreaterThanOrEqual(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a value is smaller than another value.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertLessThan($expected, $actual, $message = '')
-    {
-        self::assertThat($actual, self::lessThan($expected), $message);
-    }
-
-    /**
-     * Asserts that an attribute is smaller than another value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertLessThan(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a value is smaller than or equal to another value.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertLessThanOrEqual($expected, $actual, $message = '')
-    {
-        self::assertThat($actual, self::lessThanOrEqual($expected), $message);
-    }
-
-    /**
-     * Asserts that an attribute is smaller than or equal to another value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param string $actualClassOrObject
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertLessThanOrEqual(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that the contents of one file is equal to the contents of another
-     * file.
-     *
-     * @param string $expected
-     * @param string $actual
-     * @param string $message
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     * @since  Method available since Release 3.2.14
-     */
-    public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertFileExists($expected, $message);
-        self::assertFileExists($actual, $message);
-
-        self::assertEquals(
-            file_get_contents($expected),
-            file_get_contents($actual),
-            $message,
-            0,
-            10,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that the contents of one file is not equal to the contents of
-     * another file.
-     *
-     * @param string $expected
-     * @param string $actual
-     * @param string $message
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     * @since  Method available since Release 3.2.14
-     */
-    public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertFileExists($expected, $message);
-        self::assertFileExists($actual, $message);
-
-        self::assertNotEquals(
-            file_get_contents($expected),
-            file_get_contents($actual),
-            $message,
-            0,
-            10,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that the contents of a string is equal
-     * to the contents of a file.
-     *
-     * @param string $expectedFile
-     * @param string $actualString
-     * @param string $message
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertFileExists($expectedFile, $message);
-
-        self::assertEquals(
-            file_get_contents($expectedFile),
-            $actualString,
-            $message,
-            0,
-            10,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that the contents of a string is not equal
-     * to the contents of a file.
-     *
-     * @param string $expectedFile
-     * @param string $actualString
-     * @param string $message
-     * @param bool   $canonicalize
-     * @param bool   $ignoreCase
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
-    {
-        self::assertFileExists($expectedFile, $message);
-
-        self::assertNotEquals(
-            file_get_contents($expectedFile),
-            $actualString,
-            $message,
-            0,
-            10,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Asserts that a file exists.
-     *
-     * @param string $filename
-     * @param string $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertFileExists($filename, $message = '')
-    {
-        if (!is_string($filename)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_FileExists;
-
-        self::assertThat($filename, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a file does not exist.
-     *
-     * @param string $filename
-     * @param string $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertFileNotExists($filename, $message = '')
-    {
-        if (!is_string($filename)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_FileExists
-        );
-
-        self::assertThat($filename, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a condition is true.
-     *
-     * @param  bool                                   $condition
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertTrue($condition, $message = '')
-    {
-        self::assertThat($condition, self::isTrue(), $message);
-    }
-
-    /**
-     * Asserts that a condition is not true.
-     *
-     * @param  bool                                   $condition
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertNotTrue($condition, $message = '')
-    {
-        self::assertThat($condition, self::logicalNot(self::isTrue()), $message);
-    }
-
-    /**
-     * Asserts that a condition is false.
-     *
-     * @param  bool                                   $condition
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertFalse($condition, $message = '')
-    {
-        self::assertThat($condition, self::isFalse(), $message);
-    }
-
-    /**
-     * Asserts that a condition is not false.
-     *
-     * @param  bool                                   $condition
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function assertNotFalse($condition, $message = '')
-    {
-        self::assertThat($condition, self::logicalNot(self::isFalse()), $message);
-    }
-
-    /**
-     * Asserts that a variable is not null.
-     *
-     * @param mixed  $actual
-     * @param string $message
-     */
-    public static function assertNotNull($actual, $message = '')
-    {
-        self::assertThat($actual, self::logicalNot(self::isNull()), $message);
-    }
-
-    /**
-     * Asserts that a variable is null.
-     *
-     * @param mixed  $actual
-     * @param string $message
-     */
-    public static function assertNull($actual, $message = '')
-    {
-        self::assertThat($actual, self::isNull(), $message);
-    }
-
-    /**
-     * Asserts that a class has a specified attribute.
-     *
-     * @param string $attributeName
-     * @param string $className
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertClassHasAttribute($attributeName, $className, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_string($className) || !class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name', $className);
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_ClassHasAttribute(
-            $attributeName
-        );
-
-        self::assertThat($className, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a class does not have a specified attribute.
-     *
-     * @param string $attributeName
-     * @param string $className
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertClassNotHasAttribute($attributeName, $className, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_string($className) || !class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name', $className);
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_ClassHasAttribute($attributeName)
-        );
-
-        self::assertThat($className, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a class has a specified static attribute.
-     *
-     * @param string $attributeName
-     * @param string $className
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertClassHasStaticAttribute($attributeName, $className, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_string($className) || !class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name', $className);
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
-            $attributeName
-        );
-
-        self::assertThat($className, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a class does not have a specified static attribute.
-     *
-     * @param string $attributeName
-     * @param string $className
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_string($className) || !class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name', $className);
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
-                $attributeName
-            )
-        );
-
-        self::assertThat($className, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an object has a specified attribute.
-     *
-     * @param string $attributeName
-     * @param object $object
-     * @param string $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertObjectHasAttribute($attributeName, $object, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_object($object)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_ObjectHasAttribute(
-            $attributeName
-        );
-
-        self::assertThat($object, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an object does not have a specified attribute.
-     *
-     * @param string $attributeName
-     * @param object $object
-     * @param string $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertObjectNotHasAttribute($attributeName, $object, $message = '')
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
-        }
-
-        if (!is_object($object)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_ObjectHasAttribute($attributeName)
-        );
-
-        self::assertThat($object, $constraint, $message);
-    }
-
-    /**
-     * Asserts that two variables have the same type and value.
-     * Used on objects, it asserts that two variables reference
-     * the same object.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     */
-    public static function assertSame($expected, $actual, $message = '')
-    {
-        if (is_bool($expected) && is_bool($actual)) {
-            self::assertEquals($expected, $actual, $message);
-        } else {
-            $constraint = new PHPUnit_Framework_Constraint_IsIdentical(
-                $expected
-            );
-
-            self::assertThat($actual, $constraint, $message);
-        }
-    }
-
-    /**
-     * Asserts that a variable and an attribute of an object have the same type
-     * and value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param object $actualClassOrObject
-     * @param string $message
-     */
-    public static function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertSame(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that two variables do not have the same type and value.
-     * Used on objects, it asserts that two variables do not reference
-     * the same object.
-     *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     */
-    public static function assertNotSame($expected, $actual, $message = '')
-    {
-        if (is_bool($expected) && is_bool($actual)) {
-            self::assertNotEquals($expected, $actual, $message);
-        } else {
-            $constraint = new PHPUnit_Framework_Constraint_Not(
-                new PHPUnit_Framework_Constraint_IsIdentical($expected)
-            );
-
-            self::assertThat($actual, $constraint, $message);
-        }
-    }
-
-    /**
-     * Asserts that a variable and an attribute of an object do not have the
-     * same type and value.
-     *
-     * @param mixed  $expected
-     * @param string $actualAttributeName
-     * @param object $actualClassOrObject
-     * @param string $message
-     */
-    public static function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-    {
-        self::assertNotSame(
-            $expected,
-            self::readAttribute($actualClassOrObject, $actualAttributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a variable is of a given type.
-     *
-     * @param string $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertInstanceOf($expected, $actual, $message = '')
-    {
-        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
-            $expected
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an attribute is of a given type.
-     *
-     * @param string $expected
-     * @param string $attributeName
-     * @param mixed  $classOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
-    {
-        self::assertInstanceOf(
-            $expected,
-            self::readAttribute($classOrObject, $attributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a variable is not of a given type.
-     *
-     * @param string $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertNotInstanceOf($expected, $actual, $message = '')
-    {
-        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_IsInstanceOf($expected)
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an attribute is of a given type.
-     *
-     * @param string $expected
-     * @param string $attributeName
-     * @param mixed  $classOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
-    {
-        self::assertNotInstanceOf(
-            $expected,
-            self::readAttribute($classOrObject, $attributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a variable is of a given type.
-     *
-     * @param string $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertInternalType($expected, $actual, $message = '')
-    {
-        if (!is_string($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_IsType(
-            $expected
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an attribute is of a given type.
-     *
-     * @param string $expected
-     * @param string $attributeName
-     * @param mixed  $classOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
-    {
-        self::assertInternalType(
-            $expected,
-            self::readAttribute($classOrObject, $attributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a variable is not of a given type.
-     *
-     * @param string $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertNotInternalType($expected, $actual, $message = '')
-    {
-        if (!is_string($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_IsType($expected)
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that an attribute is of a given type.
-     *
-     * @param string $expected
-     * @param string $attributeName
-     * @param mixed  $classOrObject
-     * @param string $message
-     * @since Method available since Release 3.5.0
-     */
-    public static function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
-    {
-        self::assertNotInternalType(
-            $expected,
-            self::readAttribute($classOrObject, $attributeName),
-            $message
-        );
-    }
-
-    /**
-     * Asserts that a string matches a given regular expression.
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     */
-    public static function assertRegExp($pattern, $string, $message = '')
-    {
-        if (!is_string($pattern)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_PCREMatch($pattern);
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string does not match a given regular expression.
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 2.1.0
-     */
-    public static function assertNotRegExp($pattern, $string, $message = '')
-    {
-        if (!is_string($pattern)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_PCREMatch($pattern)
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
-     * is the same.
-     *
-     * @param array|Countable|Traversable $expected
-     * @param array|Countable|Traversable $actual
-     * @param string                      $message
-     */
-    public static function assertSameSize($expected, $actual, $message = '')
-    {
-        if (!$expected instanceof Countable &&
-            !$expected instanceof Traversable &&
-            !is_array($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
-        }
-
-        if (!$actual instanceof Countable &&
-            !$actual instanceof Traversable &&
-            !is_array($actual)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
-        }
-
-        self::assertThat(
-            $actual,
-            new PHPUnit_Framework_Constraint_SameSize($expected),
-            $message
-        );
-    }
-
-    /**
-     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
-     * is not the same.
-     *
-     * @param array|Countable|Traversable $expected
-     * @param array|Countable|Traversable $actual
-     * @param string                      $message
-     */
-    public static function assertNotSameSize($expected, $actual, $message = '')
-    {
-        if (!$expected instanceof Countable &&
-            !$expected instanceof Traversable &&
-            !is_array($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
-        }
-
-        if (!$actual instanceof Countable &&
-            !$actual instanceof Traversable &&
-            !is_array($actual)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_SameSize($expected)
-        );
-
-        self::assertThat($actual, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string matches a given format string.
-     *
-     * @param string $format
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.5.0
-     */
-    public static function assertStringMatchesFormat($format, $string, $message = '')
-    {
-        if (!is_string($format)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_StringMatches($format);
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @param string $format
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.5.0
-     */
-    public static function assertStringNotMatchesFormat($format, $string, $message = '')
-    {
-        if (!is_string($format)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_StringMatches($format)
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string matches a given format file.
-     *
-     * @param string $formatFile
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.5.0
-     */
-    public static function assertStringMatchesFormatFile($formatFile, $string, $message = '')
-    {
-        self::assertFileExists($formatFile, $message);
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_StringMatches(
-            file_get_contents($formatFile)
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string does not match a given format string.
-     *
-     * @param string $formatFile
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.5.0
-     */
-    public static function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
-    {
-        self::assertFileExists($formatFile, $message);
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_StringMatches(
-                file_get_contents($formatFile)
-            )
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string starts with a given prefix.
-     *
-     * @param string $prefix
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.4.0
-     */
-    public static function assertStringStartsWith($prefix, $string, $message = '')
-    {
-        if (!is_string($prefix)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_StringStartsWith(
-            $prefix
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string starts not with a given prefix.
-     *
-     * @param string $prefix
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.4.0
-     */
-    public static function assertStringStartsNotWith($prefix, $string, $message = '')
-    {
-        if (!is_string($prefix)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_StringStartsWith($prefix)
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string ends with a given suffix.
-     *
-     * @param string $suffix
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.4.0
-     */
-    public static function assertStringEndsWith($suffix, $string, $message = '')
-    {
-        if (!is_string($suffix)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_StringEndsWith($suffix);
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that a string ends not with a given suffix.
-     *
-     * @param string $suffix
-     * @param string $string
-     * @param string $message
-     * @since  Method available since Release 3.4.0
-     */
-    public static function assertStringEndsNotWith($suffix, $string, $message = '')
-    {
-        if (!is_string($suffix)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($string)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $constraint = new PHPUnit_Framework_Constraint_Not(
-            new PHPUnit_Framework_Constraint_StringEndsWith($suffix)
-        );
-
-        self::assertThat($string, $constraint, $message);
-    }
-
-    /**
-     * Asserts that two XML files are equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualFile
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::loadFile($expectedFile);
-        $actual   = PHPUnit_Util_XML::loadFile($actualFile);
-
-        self::assertEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two XML files are not equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualFile
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::loadFile($expectedFile);
-        $actual   = PHPUnit_Util_XML::loadFile($actualFile);
-
-        self::assertNotEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two XML documents are equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualXml
-     * @param string $message
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::loadFile($expectedFile);
-        $actual   = PHPUnit_Util_XML::load($actualXml);
-
-        self::assertEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two XML documents are not equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualXml
-     * @param string $message
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::loadFile($expectedFile);
-        $actual   = PHPUnit_Util_XML::load($actualXml);
-
-        self::assertNotEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two XML documents are equal.
-     *
-     * @param string $expectedXml
-     * @param string $actualXml
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::load($expectedXml);
-        $actual   = PHPUnit_Util_XML::load($actualXml);
-
-        self::assertEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two XML documents are not equal.
-     *
-     * @param string $expectedXml
-     * @param string $actualXml
-     * @param string $message
-     * @since  Method available since Release 3.1.0
-     */
-    public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
-    {
-        $expected = PHPUnit_Util_XML::load($expectedXml);
-        $actual   = PHPUnit_Util_XML::load($actualXml);
-
-        self::assertNotEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that a hierarchy of DOMElements matches.
-     *
-     * @param DOMElement $expectedElement
-     * @param DOMElement $actualElement
-     * @param bool       $checkAttributes
-     * @param string     $message
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
-    {
-        $tmp = new DOMDocument;
-        $expectedElement = $tmp->importNode($expectedElement, true);
-
-        $tmp = new DOMDocument;
-        $actualElement= $tmp->importNode($actualElement, true);
-
-        unset($tmp);
-
-        self::assertEquals(
-            $expectedElement->tagName,
-            $actualElement->tagName,
-            $message
-        );
-
-        if ($checkAttributes) {
-            self::assertEquals(
-                $expectedElement->attributes->length,
-                $actualElement->attributes->length,
-                sprintf(
-                    '%s%sNumber of attributes on node "%s" does not match',
-                    $message,
-                    !empty($message) ? "\n" : '',
-                    $expectedElement->tagName
-                )
-            );
-
-            for ($i = 0; $i < $expectedElement->attributes->length; $i++) {
-                $expectedAttribute = $expectedElement->attributes->item($i);
-                $actualAttribute   = $actualElement->attributes->getNamedItem(
-                    $expectedAttribute->name
-                );
-
-                if (!$actualAttribute) {
-                    self::fail(
-                        sprintf(
-                            '%s%sCould not find attribute "%s" on node "%s"',
-                            $message,
-                            !empty($message) ? "\n" : '',
-                            $expectedAttribute->name,
-                            $expectedElement->tagName
-                        )
-                    );
-                }
-            }
-        }
-
-        PHPUnit_Util_XML::removeCharacterDataNodes($expectedElement);
-        PHPUnit_Util_XML::removeCharacterDataNodes($actualElement);
-
-        self::assertEquals(
-            $expectedElement->childNodes->length,
-            $actualElement->childNodes->length,
-            sprintf(
-                '%s%sNumber of child nodes of "%s" differs',
-                $message,
-                !empty($message) ? "\n" : '',
-                $expectedElement->tagName
-            )
-        );
-
-        for ($i = 0; $i < $expectedElement->childNodes->length; $i++) {
-            self::assertEqualXMLStructure(
-                $expectedElement->childNodes->item($i),
-                $actualElement->childNodes->item($i),
-                $checkAttributes,
-                $message
-            );
-        }
-    }
-
-    /**
-     * Assert the presence, absence, or count of elements in a document matching
-     * the CSS $selector, regardless of the contents of those elements.
-     *
-     * The first argument, $selector, is the CSS selector used to match
-     * the elements in the $actual document.
-     *
-     * The second argument, $count, can be either boolean or numeric.
-     * When boolean, it asserts for presence of elements matching the selector
-     * (true) or absence of elements (false).
-     * When numeric, it asserts the count of elements.
-     *
-     * assertSelectCount("#binder", true, $xml);  // any?
-     * assertSelectCount(".binder", 3, $xml);     // exactly 3?
-     *
-     * @param array          $selector
-     * @param int|bool|array $count
-     * @param mixed          $actual
-     * @param string         $message
-     * @param bool           $isHtml
-     * @since  Method available since Release 3.3.0
-     * @deprecated
-     * @codeCoverageIgnore
-     */
-    public static function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
-    {
-        trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);
-
-        self::assertSelectEquals(
-            $selector,
-            true,
-            $count,
-            $actual,
-            $message,
-            $isHtml
-        );
-    }
-
-    /**
-     * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any?
-     * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml);    // 3?
-     *
-     * @param array          $selector
-     * @param string         $pattern
-     * @param int|bool|array $count
-     * @param mixed          $actual
-     * @param string         $message
-     * @param bool           $isHtml
-     * @since  Method available since Release 3.3.0
-     * @deprecated
-     * @codeCoverageIgnore
-     */
-    public static function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
-    {
-        trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);
-
-        self::assertSelectEquals(
-            $selector,
-            "regexp:$pattern",
-            $count,
-            $actual,
-            $message,
-            $isHtml
-        );
-    }
-
-    /**
-     * assertSelectEquals("#binder .name", "Chuck", true,  $xml);  // any?
-     * assertSelectEquals("#binder .name", "Chuck", false, $xml);  // none?
-     *
-     * @param array          $selector
-     * @param string         $content
-     * @param int|bool|array $count
-     * @param mixed          $actual
-     * @param string         $message
-     * @param bool           $isHtml
-     * @since  Method available since Release 3.3.0
-     * @deprecated
-     * @codeCoverageIgnore
-     */
-    public static function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
-    {
-        trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);
-
-        $tags = PHPUnit_Util_XML::cssSelect(
-            $selector,
-            $content,
-            $actual,
-            $isHtml
-        );
-
-        // assert specific number of elements
-        if (is_numeric($count)) {
-            $counted = $tags ? count($tags) : 0;
-            self::assertEquals($count, $counted, $message);
-        } // assert any elements exist if true, assert no elements exist if false
-        elseif (is_bool($count)) {
-            $any = count($tags) > 0 && $tags[0] instanceof DOMNode;
-
-            if ($count) {
-                self::assertTrue($any, $message);
-            } else {
-                self::assertFalse($any, $message);
-            }
-        } // check for range number of elements
-        elseif (is_array($count) &&
-                (isset($count['>']) || isset($count['<']) ||
-                isset($count['>=']) || isset($count['<=']))) {
-            $counted = $tags ? count($tags) : 0;
-
-            if (isset($count['>'])) {
-                self::assertTrue($counted > $count['>'], $message);
-            }
-
-            if (isset($count['>='])) {
-                self::assertTrue($counted >= $count['>='], $message);
-            }
-
-            if (isset($count['<'])) {
-                self::assertTrue($counted < $count['<'], $message);
-            }
-
-            if (isset($count['<='])) {
-                self::assertTrue($counted <= $count['<='], $message);
-            }
-        } else {
-            throw new PHPUnit_Framework_Exception;
-        }
-    }
-
-    /**
-     * Evaluate an HTML or XML string and assert its structure and/or contents.
-     *
-     * The first argument ($matcher) is an associative array that specifies the
-     * match criteria for the assertion:
-     *
-     *  - `id`           : the node with the given id attribute must match the
-     *                     corresponding value.
-     *  - `tag`          : the node type must match the corresponding value.
-     *  - `attributes`   : a hash. The node's attributes must match the
-     *                     corresponding values in the hash.
-     *  - `content`      : The text content must match the given value.
-     *  - `parent`       : a hash. The node's parent must match the
-     *                     corresponding hash.
-     *  - `child`        : a hash. At least one of the node's immediate children
-     *                     must meet the criteria described by the hash.
-     *  - `ancestor`     : a hash. At least one of the node's ancestors must
-     *                     meet the criteria described by the hash.
-     *  - `descendant`   : a hash. At least one of the node's descendants must
-     *                     meet the criteria described by the hash.
-     *  - `children`     : a hash, for counting children of a node.
-     *                     Accepts the keys:
-     *    - `count`        : a number which must equal the number of children
-     *                       that match
-     *    - `less_than`    : the number of matching children must be greater
-     *                       than this number
-     *    - `greater_than` : the number of matching children must be less than
-     *                       this number
-     *    - `only`         : another hash consisting of the keys to use to match
-     *                       on the children, and only matching children will be
-     *                       counted
-     *
-     * <code>
-     * // Matcher that asserts that there is an element with an id="my_id".
-     * $matcher = array('id' => 'my_id');
-     *
-     * // Matcher that asserts that there is a "span" tag.
-     * $matcher = array('tag' => 'span');
-     *
-     * // Matcher that asserts that there is a "span" tag with the content
-     * // "Hello World".
-     * $matcher = array('tag' => 'span', 'content' => 'Hello World');
-     *
-     * // Matcher that asserts that there is a "span" tag with content matching
-     * // the regular expression pattern.
-     * $matcher = array('tag' => 'span', 'content' => 'regexp:/Try P(HP|ython)/');
-     *
-     * // Matcher that asserts that there is a "span" with an "list" class
-     * // attribute.
-     * $matcher = array(
-     *   'tag'        => 'span',
-     *   'attributes' => array('class' => 'list')
-     * );
-     *
-     * // Matcher that asserts that there is a "span" inside of a "div".
-     * $matcher = array(
-     *   'tag'    => 'span',
-     *   'parent' => array('tag' => 'div')
-     * );
-     *
-     * // Matcher that asserts that there is a "span" somewhere inside a
-     * // "table".
-     * $matcher = array(
-     *   'tag'      => 'span',
-     *   'ancestor' => array('tag' => 'table')
-     * );
-     *
-     * // Matcher that asserts that there is a "span" with at least one "em"
-     * // child.
-     * $matcher = array(
-     *   'tag'   => 'span',
-     *   'child' => array('tag' => 'em')
-     * );
-     *
-     * // Matcher that asserts that there is a "span" containing a (possibly
-     * // nested) "strong" tag.
-     * $matcher = array(
-     *   'tag'        => 'span',
-     *   'descendant' => array('tag' => 'strong')
-     * );
-     *
-     * // Matcher that asserts that there is a "span" containing 5-10 "em" tags
-     * // as immediate children.
-     * $matcher = array(
-     *   'tag'      => 'span',
-     *   'children' => array(
-     *     'less_than'    => 11,
-     *     'greater_than' => 4,
-     *     'only'         => array('tag' => 'em')
-     *   )
-     * );
-     *
-     * // Matcher that asserts that there is a "div", with an "ul" ancestor and
-     * // a "li" parent (with class="enum"), and containing a "span" descendant
-     * // that contains an element with id="my_test" and the text "Hello World".
-     * $matcher = array(
-     *   'tag'        => 'div',
-     *   'ancestor'   => array('tag' => 'ul'),
-     *   'parent'     => array(
-     *     'tag'        => 'li',
-     *     'attributes' => array('class' => 'enum')
-     *   ),
-     *   'descendant' => array(
-     *     'tag'   => 'span',
-     *     'child' => array(
-     *       'id'      => 'my_test',
-     *       'content' => 'Hello World'
-     *     )
-     *   )
-     * );
-     *
-     * // Use assertTag() to apply a $matcher to a piece of $html.
-     * $this->assertTag($matcher, $html);
-     *
-     * // Use assertTag() to apply a $matcher to a piece of $xml.
-     * $this->assertTag($matcher, $xml, '', false);
-     * </code>
-     *
-     * The second argument ($actual) is a string containing either HTML or
-     * XML text to be tested.
-     *
-     * The third argument ($message) is an optional message that will be
-     * used if the assertion fails.
-     *
-     * The fourth argument ($html) is an optional flag specifying whether
-     * to load the $actual string into a DOMDocument using the HTML or
-     * XML load strategy.  It is true by default, which assumes the HTML
-     * load strategy.  In many cases, this will be acceptable for XML as well.
-     *
-     * @param array  $matcher
-     * @param string $actual
-     * @param string $message
-     * @param bool   $isHtml
-     * @since  Method available since Release 3.3.0
-     * @deprecated
-     * @codeCoverageIgnore
-     */
-    public static function assertTag($matcher, $actual, $message = '', $isHtml = true)
-    {
-        trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);
-
-        $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
-        $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
-        $matched = count($tags) > 0 && $tags[0] instanceof DOMNode;
-
-        self::assertTrue($matched, $message);
-    }
-
-    /**
-     * This assertion is the exact opposite of assertTag().
-     *
-     * Rather than asserting that $matcher results in a match, it asserts that
-     * $matcher does not match.
-     *
-     * @param array  $matcher
-     * @param string $actual
-     * @param string $message
-     * @param bool   $isHtml
-     * @since  Method available since Release 3.3.0
-     * @deprecated
-     * @codeCoverageIgnore
-     */
-    public static function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
-    {
-        trigger_error(__METHOD__ . ' is deprecated', E_USER_DEPRECATED);
-
-        $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
-        $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
-        $matched = count($tags) > 0 && $tags[0] instanceof DOMNode;
-
-        self::assertFalse($matched, $message);
-    }
-
-    /**
-     * Evaluates a PHPUnit_Framework_Constraint matcher object.
-     *
-     * @param mixed                        $value
-     * @param PHPUnit_Framework_Constraint $constraint
-     * @param string                       $message
-     * @since  Method available since Release 3.0.0
-     */
-    public static function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
-    {
-        self::$count += count($constraint);
-
-        $constraint->evaluate($value, $message);
-    }
-
-    /**
-     * Asserts that a string is a valid JSON string.
-     *
-     * @param string $actualJson
-     * @param string $message
-     * @since  Method available since Release 3.7.20
-     */
-    public static function assertJson($actualJson, $message = '')
-    {
-        if (!is_string($actualJson)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        self::assertThat($actualJson, self::isJson(), $message);
-    }
-
-    /**
-     * Asserts that two given JSON encoded objects or arrays are equal.
-     *
-     * @param string $expectedJson
-     * @param string $actualJson
-     * @param string $message
-     */
-    public static function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = '')
-    {
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        $expected = json_decode($expectedJson);
-        $actual   = json_decode($actualJson);
-
-        self::assertEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that two given JSON encoded objects or arrays are not equal.
-     *
-     * @param string $expectedJson
-     * @param string $actualJson
-     * @param string $message
-     */
-    public static function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $message = '')
-    {
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        $expected = json_decode($expectedJson);
-        $actual   = json_decode($actualJson);
-
-        self::assertNotEquals($expected, $actual, $message);
-    }
-
-    /**
-     * Asserts that the generated JSON encoded object and the content of the given file are equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualJson
-     * @param string $message
-     */
-    public static function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = '')
-    {
-        self::assertFileExists($expectedFile, $message);
-        $expectedJson = file_get_contents($expectedFile);
-
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        // call constraint
-        $constraint = new PHPUnit_Framework_Constraint_JsonMatches(
-            $expectedJson
-        );
-
-        self::assertThat($actualJson, $constraint, $message);
-    }
-
-    /**
-     * Asserts that the generated JSON encoded object and the content of the given file are not equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualJson
-     * @param string $message
-     */
-    public static function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message = '')
-    {
-        self::assertFileExists($expectedFile, $message);
-        $expectedJson = file_get_contents($expectedFile);
-
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        // call constraint
-        $constraint = new PHPUnit_Framework_Constraint_JsonMatches(
-            $expectedJson
-        );
-
-        self::assertThat($actualJson, new PHPUnit_Framework_Constraint_Not($constraint), $message);
-    }
-
-    /**
-     * Asserts that two JSON files are not equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualFile
-     * @param string $message
-     */
-    public static function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '')
-    {
-        self::assertFileExists($expectedFile, $message);
-        self::assertFileExists($actualFile, $message);
-
-        $actualJson   = file_get_contents($actualFile);
-        $expectedJson = file_get_contents($expectedFile);
-
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        // call constraint
-        $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches(
-            $expectedJson
-        );
-
-        $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson);
-
-        self::assertThat($expectedJson, new PHPUnit_Framework_Constraint_Not($constraintActual), $message);
-        self::assertThat($actualJson, new PHPUnit_Framework_Constraint_Not($constraintExpected), $message);
-    }
-
-    /**
-     * Asserts that two JSON files are equal.
-     *
-     * @param string $expectedFile
-     * @param string $actualFile
-     * @param string $message
-     */
-    public static function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '')
-    {
-        self::assertFileExists($expectedFile, $message);
-        self::assertFileExists($actualFile, $message);
-
-        $actualJson   = file_get_contents($actualFile);
-        $expectedJson = file_get_contents($expectedFile);
-
-        self::assertJson($expectedJson, $message);
-        self::assertJson($actualJson, $message);
-
-        // call constraint
-        $constraintExpected = new PHPUnit_Framework_Constraint_JsonMatches(
-            $expectedJson
-        );
-
-        $constraintActual = new PHPUnit_Framework_Constraint_JsonMatches($actualJson);
-
-        self::assertThat($expectedJson, $constraintActual, $message);
-        self::assertThat($actualJson, $constraintExpected, $message);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_And matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_And
-     * @since  Method available since Release 3.0.0
-     */
-    public static function logicalAnd()
-    {
-        $constraints = func_get_args();
-
-        $constraint = new PHPUnit_Framework_Constraint_And;
-        $constraint->setConstraints($constraints);
-
-        return $constraint;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Or matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_Or
-     * @since  Method available since Release 3.0.0
-     */
-    public static function logicalOr()
-    {
-        $constraints = func_get_args();
-
-        $constraint = new PHPUnit_Framework_Constraint_Or;
-        $constraint->setConstraints($constraints);
-
-        return $constraint;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Not matcher object.
-     *
-     * @param  PHPUnit_Framework_Constraint     $constraint
-     * @return PHPUnit_Framework_Constraint_Not
-     * @since  Method available since Release 3.0.0
-     */
-    public static function logicalNot(PHPUnit_Framework_Constraint $constraint)
-    {
-        return new PHPUnit_Framework_Constraint_Not($constraint);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Xor matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_Xor
-     * @since  Method available since Release 3.0.0
-     */
-    public static function logicalXor()
-    {
-        $constraints = func_get_args();
-
-        $constraint = new PHPUnit_Framework_Constraint_Xor;
-        $constraint->setConstraints($constraints);
-
-        return $constraint;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsAnything
-     * @since  Method available since Release 3.0.0
-     */
-    public static function anything()
-    {
-        return new PHPUnit_Framework_Constraint_IsAnything;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsTrue
-     * @since  Method available since Release 3.3.0
-     */
-    public static function isTrue()
-    {
-        return new PHPUnit_Framework_Constraint_IsTrue;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Callback matcher object.
-     *
-     * @param  callable                              $callback
-     * @return PHPUnit_Framework_Constraint_Callback
-     */
-    public static function callback($callback)
-    {
-        return new PHPUnit_Framework_Constraint_Callback($callback);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsFalse
-     * @since  Method available since Release 3.3.0
-     */
-    public static function isFalse()
-    {
-        return new PHPUnit_Framework_Constraint_IsFalse;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsJson matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsJson
-     * @since  Method available since Release 3.7.20
-     */
-    public static function isJson()
-    {
-        return new PHPUnit_Framework_Constraint_IsJson;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsNull
-     * @since  Method available since Release 3.3.0
-     */
-    public static function isNull()
-    {
-        return new PHPUnit_Framework_Constraint_IsNull;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
-     *
-     * @param  PHPUnit_Framework_Constraint           $constraint
-     * @param  string                                 $attributeName
-     * @return PHPUnit_Framework_Constraint_Attribute
-     * @since  Method available since Release 3.1.0
-     */
-    public static function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
-    {
-        return new PHPUnit_Framework_Constraint_Attribute(
-            $constraint,
-            $attributeName
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
-     * object.
-     *
-     * @param  mixed                                            $value
-     * @param  bool                                             $checkForObjectIdentity
-     * @param  bool                                             $checkForNonObjectIdentity
-     * @return PHPUnit_Framework_Constraint_TraversableContains
-     * @since  Method available since Release 3.0.0
-     */
-    public static function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        return new PHPUnit_Framework_Constraint_TraversableContains($value, $checkForObjectIdentity, $checkForNonObjectIdentity);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
-     * object.
-     *
-     * @param  string                                               $type
-     * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
-     * @since  Method available since Release 3.1.4
-     */
-    public static function containsOnly($type)
-    {
-        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($type);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
-     * object.
-     *
-     * @param  string                                               $classname
-     * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
-     */
-    public static function containsOnlyInstancesOf($classname)
-    {
-        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($classname, false);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
-     *
-     * @param  mixed                                    $key
-     * @return PHPUnit_Framework_Constraint_ArrayHasKey
-     * @since  Method available since Release 3.0.0
-     */
-    public static function arrayHasKey($key)
-    {
-        return new PHPUnit_Framework_Constraint_ArrayHasKey($key);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
-     *
-     * @param  mixed                                $value
-     * @param  float                                $delta
-     * @param  int                                  $maxDepth
-     * @param  bool                                 $canonicalize
-     * @param  bool                                 $ignoreCase
-     * @return PHPUnit_Framework_Constraint_IsEqual
-     * @since  Method available since Release 3.0.0
-     */
-    public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        return new PHPUnit_Framework_Constraint_IsEqual(
-            $value,
-            $delta,
-            $maxDepth,
-            $canonicalize,
-            $ignoreCase
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object
-     * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
-     * object.
-     *
-     * @param  string                                 $attributeName
-     * @param  mixed                                  $value
-     * @param  float                                  $delta
-     * @param  int                                    $maxDepth
-     * @param  bool                                   $canonicalize
-     * @param  bool                                   $ignoreCase
-     * @return PHPUnit_Framework_Constraint_Attribute
-     * @since  Method available since Release 3.1.0
-     */
-    public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        return self::attribute(
-            self::equalTo(
-                $value,
-                $delta,
-                $maxDepth,
-                $canonicalize,
-                $ignoreCase
-            ),
-            $attributeName
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_IsEmpty
-     * @since  Method available since Release 3.5.0
-     */
-    public static function isEmpty()
-    {
-        return new PHPUnit_Framework_Constraint_IsEmpty;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
-     *
-     * @return PHPUnit_Framework_Constraint_FileExists
-     * @since  Method available since Release 3.0.0
-     */
-    public static function fileExists()
-    {
-        return new PHPUnit_Framework_Constraint_FileExists;
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
-     *
-     * @param  mixed                                    $value
-     * @return PHPUnit_Framework_Constraint_GreaterThan
-     * @since  Method available since Release 3.0.0
-     */
-    public static function greaterThan($value)
-    {
-        return new PHPUnit_Framework_Constraint_GreaterThan($value);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
-     * a PHPUnit_Framework_Constraint_IsEqual and a
-     * PHPUnit_Framework_Constraint_GreaterThan matcher object.
-     *
-     * @param  mixed                           $value
-     * @return PHPUnit_Framework_Constraint_Or
-     * @since  Method available since Release 3.1.0
-     */
-    public static function greaterThanOrEqual($value)
-    {
-        return self::logicalOr(
-            new PHPUnit_Framework_Constraint_IsEqual($value),
-            new PHPUnit_Framework_Constraint_GreaterThan($value)
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
-     *
-     * @param  string                                         $attributeName
-     * @return PHPUnit_Framework_Constraint_ClassHasAttribute
-     * @since  Method available since Release 3.1.0
-     */
-    public static function classHasAttribute($attributeName)
-    {
-        return new PHPUnit_Framework_Constraint_ClassHasAttribute(
-            $attributeName
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
-     * object.
-     *
-     * @param  string                                               $attributeName
-     * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
-     * @since  Method available since Release 3.1.0
-     */
-    public static function classHasStaticAttribute($attributeName)
-    {
-        return new PHPUnit_Framework_Constraint_ClassHasStaticAttribute(
-            $attributeName
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
-     *
-     * @param  string                                          $attributeName
-     * @return PHPUnit_Framework_Constraint_ObjectHasAttribute
-     * @since  Method available since Release 3.0.0
-     */
-    public static function objectHasAttribute($attributeName)
-    {
-        return new PHPUnit_Framework_Constraint_ObjectHasAttribute(
-            $attributeName
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
-     *
-     * @param  mixed                                    $value
-     * @return PHPUnit_Framework_Constraint_IsIdentical
-     * @since  Method available since Release 3.0.0
-     */
-    public static function identicalTo($value)
-    {
-        return new PHPUnit_Framework_Constraint_IsIdentical($value);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
-     *
-     * @param  string                                    $className
-     * @return PHPUnit_Framework_Constraint_IsInstanceOf
-     * @since  Method available since Release 3.0.0
-     */
-    public static function isInstanceOf($className)
-    {
-        return new PHPUnit_Framework_Constraint_IsInstanceOf($className);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_IsType matcher object.
-     *
-     * @param  string                              $type
-     * @return PHPUnit_Framework_Constraint_IsType
-     * @since  Method available since Release 3.0.0
-     */
-    public static function isType($type)
-    {
-        return new PHPUnit_Framework_Constraint_IsType($type);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
-     *
-     * @param  mixed                                 $value
-     * @return PHPUnit_Framework_Constraint_LessThan
-     * @since  Method available since Release 3.0.0
-     */
-    public static function lessThan($value)
-    {
-        return new PHPUnit_Framework_Constraint_LessThan($value);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
-     * a PHPUnit_Framework_Constraint_IsEqual and a
-     * PHPUnit_Framework_Constraint_LessThan matcher object.
-     *
-     * @param  mixed                           $value
-     * @return PHPUnit_Framework_Constraint_Or
-     * @since  Method available since Release 3.1.0
-     */
-    public static function lessThanOrEqual($value)
-    {
-        return self::logicalOr(
-            new PHPUnit_Framework_Constraint_IsEqual($value),
-            new PHPUnit_Framework_Constraint_LessThan($value)
-        );
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
-     *
-     * @param  string                                 $pattern
-     * @return PHPUnit_Framework_Constraint_PCREMatch
-     * @since  Method available since Release 3.0.0
-     */
-    public static function matchesRegularExpression($pattern)
-    {
-        return new PHPUnit_Framework_Constraint_PCREMatch($pattern);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
-     *
-     * @param  string                                     $string
-     * @return PHPUnit_Framework_Constraint_StringMatches
-     * @since  Method available since Release 3.5.0
-     */
-    public static function matches($string)
-    {
-        return new PHPUnit_Framework_Constraint_StringMatches($string);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
-     *
-     * @param  mixed                                         $prefix
-     * @return PHPUnit_Framework_Constraint_StringStartsWith
-     * @since  Method available since Release 3.4.0
-     */
-    public static function stringStartsWith($prefix)
-    {
-        return new PHPUnit_Framework_Constraint_StringStartsWith($prefix);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
-     *
-     * @param  string                                      $string
-     * @param  bool                                        $case
-     * @return PHPUnit_Framework_Constraint_StringContains
-     * @since  Method available since Release 3.0.0
-     */
-    public static function stringContains($string, $case = true)
-    {
-        return new PHPUnit_Framework_Constraint_StringContains($string, $case);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
-     *
-     * @param  mixed                                       $suffix
-     * @return PHPUnit_Framework_Constraint_StringEndsWith
-     * @since  Method available since Release 3.4.0
-     */
-    public static function stringEndsWith($suffix)
-    {
-        return new PHPUnit_Framework_Constraint_StringEndsWith($suffix);
-    }
-
-    /**
-     * Returns a PHPUnit_Framework_Constraint_Count matcher object.
-     *
-     * @param  int                                $count
-     * @return PHPUnit_Framework_Constraint_Count
-     */
-    public static function countOf($count)
-    {
-        return new PHPUnit_Framework_Constraint_Count($count);
-    }
-    /**
-     * Fails a test with the given message.
-     *
-     * @param  string                                 $message
-     * @throws PHPUnit_Framework_AssertionFailedError
-     */
-    public static function fail($message = '')
-    {
-        throw new PHPUnit_Framework_AssertionFailedError($message);
-    }
-
-    /**
-     * Returns the value of an attribute of a class or an object.
-     * This also works for attributes that are declared protected or private.
-     *
-     * @param  mixed                       $classOrObject
-     * @param  string                      $attributeName
-     * @return mixed
-     * @throws PHPUnit_Framework_Exception
-     */
-    public static function readAttribute($classOrObject, $attributeName)
-    {
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
-        }
-
-        if (is_string($classOrObject)) {
-            if (!class_exists($classOrObject)) {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                    1,
-                    'class name'
-                );
-            }
-
-            return self::getStaticAttribute(
-                $classOrObject,
-                $attributeName
-            );
-        } elseif (is_object($classOrObject)) {
-            return self::getObjectAttribute(
-                $classOrObject,
-                $attributeName
-            );
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'class name or object'
-            );
-        }
-    }
-
-    /**
-     * Returns the value of a static attribute.
-     * This also works for attributes that are declared protected or private.
-     *
-     * @param  string                      $className
-     * @param  string                      $attributeName
-     * @return mixed
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public static function getStaticAttribute($className, $attributeName)
-    {
-        if (!is_string($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class name');
-        }
-
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
-        }
-
-        $class = new ReflectionClass($className);
-
-        while ($class) {
-            $attributes = $class->getStaticProperties();
-
-            if (array_key_exists($attributeName, $attributes)) {
-                return $attributes[$attributeName];
-            }
-
-            $class = $class->getParentClass();
-        }
-
-        throw new PHPUnit_Framework_Exception(
-            sprintf(
-                'Attribute "%s" not found in class.',
-                $attributeName
-            )
-        );
-    }
-
-    /**
-     * Returns the value of an object's attribute.
-     * This also works for attributes that are declared protected or private.
-     *
-     * @param  object                      $object
-     * @param  string                      $attributeName
-     * @return mixed
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public static function getObjectAttribute($object, $attributeName)
-    {
-        if (!is_object($object)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'object');
-        }
-
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
-        }
-
-        try {
-            $attribute = new ReflectionProperty($object, $attributeName);
-        } catch (ReflectionException $e) {
-            $reflector = new ReflectionObject($object);
-
-            while ($reflector = $reflector->getParentClass()) {
-                try {
-                    $attribute = $reflector->getProperty($attributeName);
-                    break;
-                } catch (ReflectionException $e) {
-                }
-            }
-        }
-
-        if (isset($attribute)) {
-            if (!$attribute || $attribute->isPublic()) {
-                return $object->$attributeName;
-            }
-
-            $attribute->setAccessible(true);
-            $value = $attribute->getValue($object);
-            $attribute->setAccessible(false);
-
-            return $value;
-        }
-
-        throw new PHPUnit_Framework_Exception(
-            sprintf(
-                'Attribute "%s" not found in object.',
-                $attributeName
-            )
-        );
-    }
-
-    /**
-     * Mark the test as incomplete.
-     *
-     * @param  string                                $message
-     * @throws PHPUnit_Framework_IncompleteTestError
-     * @since  Method available since Release 3.0.0
-     */
-    public static function markTestIncomplete($message = '')
-    {
-        throw new PHPUnit_Framework_IncompleteTestError($message);
-    }
-
-    /**
-     * Mark the test as skipped.
-     *
-     * @param  string                             $message
-     * @throws PHPUnit_Framework_SkippedTestError
-     * @since  Method available since Release 3.0.0
-     */
-    public static function markTestSkipped($message = '')
-    {
-        throw new PHPUnit_Framework_SkippedTestError($message);
-    }
-
-    /**
-     * Return the current assertion count.
-     *
-     * @return int
-     * @since  Method available since Release 3.3.3
-     */
-    public static function getCount()
-    {
-        return self::$count;
-    }
-
-    /**
-     * Reset the assertion counter.
-     *
-     * @since  Method available since Release 3.3.3
-     */
-    public static function resetCount()
-    {
-        self::$count = 0;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php b/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
deleted file mode 100644
index 1f49e5d..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
+++ /dev/null
@@ -1,2419 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Returns a matcher that matches when the method is executed
- * zero or more times.
- *
- * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
- * @since  Method available since Release 3.0.0
- */
-function any()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::any',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsAnything matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsAnything
- * @since  Method available since Release 3.0.0
- */
-function anything()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::anything',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
- *
- * @param  mixed                                    $key
- * @return PHPUnit_Framework_Constraint_ArrayHasKey
- * @since  Method available since Release 3.0.0
- */
-function arrayHasKey($key)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::arrayHasKey',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an array has a specified key.
- *
- * @param mixed             $key
- * @param array|ArrayAccess $array
- * @param string            $message
- * @since  Method available since Release 3.0.0
- */
-function assertArrayHasKey($key, $array, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertArrayHasKey',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an array has a specified subset.
- *
- * @param array|ArrayAccess $subset
- * @param array|ArrayAccess $array
- * @param bool              $strict  Check for object identity
- * @param string            $message
- * @since Method available since Release 4.4.0
- */
-function assertArraySubset($subset, $array, $strict = false, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertArraySubset',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an array does not have a specified key.
- *
- * @param mixed             $key
- * @param array|ArrayAccess $array
- * @param string            $message
- * @since  Method available since Release 3.0.0
- */
-function assertArrayNotHasKey($key, $array, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertArrayNotHasKey',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack that is stored in a static attribute of a class
- * or an attribute of an object contains a needle.
- *
- * @param mixed  $needle
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @param bool   $ignoreCase
- * @param bool   $checkForObjectIdentity
- * @param bool   $checkForNonObjectIdentity
- * @since  Method available since Release 3.0.0
- */
-function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeContains',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack that is stored in a static attribute of a class
- * or an attribute of an object contains only values of a given type.
- *
- * @param string $type
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param bool   $isNativeType
- * @param string $message
- * @since  Method available since Release 3.1.4
- */
-function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeContainsOnly',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts the number of elements of an array, Countable or Traversable
- * that is stored in an attribute.
- *
- * @param int    $expectedCount
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @since Method available since Release 3.6.0
- */
-function assertAttributeCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeCount',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a static attribute of a class or an attribute of an object
- * is empty.
- *
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeEmpty',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is equal to an attribute of an object.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @param float  $delta
- * @param int    $maxDepth
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- */
-function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is greater than another value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeGreaterThan',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is greater than or equal to another value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeGreaterThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is of a given type.
- *
- * @param string $expected
- * @param string $attributeName
- * @param mixed  $classOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeInstanceOf($expected, $attributeName, $classOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeInstanceOf',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is of a given type.
- *
- * @param string $expected
- * @param string $attributeName
- * @param mixed  $classOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeInternalType($expected, $attributeName, $classOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeInternalType',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is smaller than another value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeLessThan',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is smaller than or equal to another value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeLessThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack that is stored in a static attribute of a class
- * or an attribute of an object does not contain a needle.
- *
- * @param mixed  $needle
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @param bool   $ignoreCase
- * @param bool   $checkForObjectIdentity
- * @param bool   $checkForNonObjectIdentity
- * @since  Method available since Release 3.0.0
- */
-function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotContains',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack that is stored in a static attribute of a class
- * or an attribute of an object does not contain only values of a given
- * type.
- *
- * @param string $type
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param bool   $isNativeType
- * @param string $message
- * @since  Method available since Release 3.1.4
- */
-function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotContainsOnly',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts the number of elements of an array, Countable or Traversable
- * that is stored in an attribute.
- *
- * @param int    $expectedCount
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @since Method available since Release 3.6.0
- */
-function assertAttributeNotCount($expectedCount, $haystackAttributeName, $haystackClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotCount',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a static attribute of a class or an attribute of an object
- * is not empty.
- *
- * @param string $haystackAttributeName
- * @param mixed  $haystackClassOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotEmpty',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is not equal to an attribute of an object.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param string $actualClassOrObject
- * @param string $message
- * @param float  $delta
- * @param int    $maxDepth
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- */
-function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is of a given type.
- *
- * @param string $expected
- * @param string $attributeName
- * @param mixed  $classOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeNotInstanceOf($expected, $attributeName, $classOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotInstanceOf',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an attribute is of a given type.
- *
- * @param string $expected
- * @param string $attributeName
- * @param mixed  $classOrObject
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertAttributeNotInternalType($expected, $attributeName, $classOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotInternalType',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable and an attribute of an object do not have the
- * same type and value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param object $actualClassOrObject
- * @param string $message
- */
-function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeNotSame',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable and an attribute of an object have the same type
- * and value.
- *
- * @param mixed  $expected
- * @param string $actualAttributeName
- * @param object $actualClassOrObject
- * @param string $message
- */
-function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertAttributeSame',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a class has a specified attribute.
- *
- * @param string $attributeName
- * @param string $className
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertClassHasAttribute($attributeName, $className, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertClassHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a class has a specified static attribute.
- *
- * @param string $attributeName
- * @param string $className
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertClassHasStaticAttribute($attributeName, $className, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertClassHasStaticAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a class does not have a specified attribute.
- *
- * @param string $attributeName
- * @param string $className
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertClassNotHasAttribute($attributeName, $className, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertClassNotHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a class does not have a specified static attribute.
- *
- * @param string $attributeName
- * @param string $className
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack contains a needle.
- *
- * @param mixed  $needle
- * @param mixed  $haystack
- * @param string $message
- * @param bool   $ignoreCase
- * @param bool   $checkForObjectIdentity
- * @param bool   $checkForNonObjectIdentity
- * @since  Method available since Release 2.1.0
- */
-function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertContains',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack contains only values of a given type.
- *
- * @param string $type
- * @param mixed  $haystack
- * @param bool   $isNativeType
- * @param string $message
- * @since  Method available since Release 3.1.4
- */
-function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertContainsOnly',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack contains only instances of a given classname
- *
- * @param string            $classname
- * @param array|Traversable $haystack
- * @param string            $message
- */
-function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts the number of elements of an array, Countable or Traversable.
- *
- * @param int    $expectedCount
- * @param mixed  $haystack
- * @param string $message
- */
-function assertCount($expectedCount, $haystack, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertCount',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is empty.
- *
- * @param  mixed                                  $actual
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertEmpty($actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertEmpty',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a hierarchy of DOMElements matches.
- *
- * @param DOMElement $expectedElement
- * @param DOMElement $actualElement
- * @param bool       $checkAttributes
- * @param string     $message
- * @since  Method available since Release 3.3.0
- */
-function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertEqualXMLStructure',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two variables are equal.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @param float  $delta
- * @param int    $maxDepth
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- */
-function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a condition is not true.
- *
- * @param  bool                                   $condition
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertNotTrue($condition, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotTrue',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a condition is false.
- *
- * @param  bool                                   $condition
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertFalse($condition, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertFalse',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the contents of one file is equal to the contents of another
- * file.
- *
- * @param string $expected
- * @param string $actual
- * @param string $message
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- * @since  Method available since Release 3.2.14
- */
-function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertFileEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a file exists.
- *
- * @param string $filename
- * @param string $message
- * @since  Method available since Release 3.0.0
- */
-function assertFileExists($filename, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertFileExists',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the contents of one file is not equal to the contents of
- * another file.
- *
- * @param string $expected
- * @param string $actual
- * @param string $message
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- * @since  Method available since Release 3.2.14
- */
-function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertFileNotEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a file does not exist.
- *
- * @param string $filename
- * @param string $message
- * @since  Method available since Release 3.0.0
- */
-function assertFileNotExists($filename, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertFileNotExists',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a value is greater than another value.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertGreaterThan($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertGreaterThan',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a value is greater than or equal to another value.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertGreaterThanOrEqual($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertGreaterThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is of a given type.
- *
- * @param string $expected
- * @param mixed  $actual
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertInstanceOf($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertInstanceOf',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is of a given type.
- *
- * @param string $expected
- * @param mixed  $actual
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertInternalType($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertInternalType',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string is a valid JSON string.
- *
- * @param string $actualJson
- * @param string $message
- * @since  Method available since Release 3.7.20
- */
-function assertJson($actualJson, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJson',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two JSON files are equal.
- *
- * @param string $expectedFile
- * @param string $actualFile
- * @param string $message
- */
-function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonFileEqualsJsonFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two JSON files are not equal.
- *
- * @param string $expectedFile
- * @param string $actualFile
- * @param string $message
- */
-function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonFileNotEqualsJsonFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the generated JSON encoded object and the content of the given file are equal.
- *
- * @param string $expectedFile
- * @param string $actualJson
- * @param string $message
- */
-function assertJsonStringEqualsJsonFile($expectedFile, $actualJson, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two given JSON encoded objects or arrays are equal.
- *
- * @param string $expectedJson
- * @param string $actualJson
- * @param string $message
- */
-function assertJsonStringEqualsJsonString($expectedJson, $actualJson, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the generated JSON encoded object and the content of the given file are not equal.
- *
- * @param string $expectedFile
- * @param string $actualJson
- * @param string $message
- */
-function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJson, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two given JSON encoded objects or arrays are not equal.
- *
- * @param string $expectedJson
- * @param string $actualJson
- * @param string $message
- */
-function assertJsonStringNotEqualsJsonString($expectedJson, $actualJson, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertJsonStringNotEqualsJsonString',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a value is smaller than another value.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertLessThan($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertLessThan',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a value is smaller than or equal to another value.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertLessThanOrEqual($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertLessThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack does not contain a needle.
- *
- * @param mixed  $needle
- * @param mixed  $haystack
- * @param string $message
- * @param bool   $ignoreCase
- * @param bool   $checkForObjectIdentity
- * @param bool   $checkForNonObjectIdentity
- * @since  Method available since Release 2.1.0
- */
-function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotContains',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a haystack does not contain only values of a given type.
- *
- * @param string $type
- * @param mixed  $haystack
- * @param bool   $isNativeType
- * @param string $message
- * @since  Method available since Release 3.1.4
- */
-function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotContainsOnly',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts the number of elements of an array, Countable or Traversable.
- *
- * @param int    $expectedCount
- * @param mixed  $haystack
- * @param string $message
- */
-function assertNotCount($expectedCount, $haystack, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotCount',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is not empty.
- *
- * @param  mixed                                  $actual
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertNotEmpty($actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotEmpty',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two variables are not equal.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- * @param float  $delta
- * @param int    $maxDepth
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- * @since  Method available since Release 2.3.0
- */
-function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotEquals',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is not of a given type.
- *
- * @param string $expected
- * @param mixed  $actual
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertNotInstanceOf($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotInstanceOf',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is not of a given type.
- *
- * @param string $expected
- * @param mixed  $actual
- * @param string $message
- * @since Method available since Release 3.5.0
- */
-function assertNotInternalType($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotInternalType',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a condition is not false.
- *
- * @param  bool                                   $condition
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertNotFalse($condition, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotFalse',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is not null.
- *
- * @param mixed  $actual
- * @param string $message
- */
-function assertNotNull($actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotNull',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string does not match a given regular expression.
- *
- * @param string $pattern
- * @param string $string
- * @param string $message
- * @since  Method available since Release 2.1.0
- */
-function assertNotRegExp($pattern, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotRegExp',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two variables do not have the same type and value.
- * Used on objects, it asserts that two variables do not reference
- * the same object.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- */
-function assertNotSame($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotSame',
-        func_get_args()
-    );
-}
-
-/**
- * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
- * is not the same.
- *
- * @param array|Countable|Traversable $expected
- * @param array|Countable|Traversable $actual
- * @param string                      $message
- */
-function assertNotSameSize($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotSameSize',
-        func_get_args()
-    );
-}
-
-/**
- * This assertion is the exact opposite of assertTag().
- *
- * Rather than asserting that $matcher results in a match, it asserts that
- * $matcher does not match.
- *
- * @param array  $matcher
- * @param string $actual
- * @param string $message
- * @param bool   $isHtml
- * @since  Method available since Release 3.3.0
- */
-function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNotTag',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a variable is null.
- *
- * @param mixed  $actual
- * @param string $message
- */
-function assertNull($actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertNull',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an object has a specified attribute.
- *
- * @param string $attributeName
- * @param object $object
- * @param string $message
- * @since  Method available since Release 3.0.0
- */
-function assertObjectHasAttribute($attributeName, $object, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertObjectHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that an object does not have a specified attribute.
- *
- * @param string $attributeName
- * @param object $object
- * @param string $message
- * @since  Method available since Release 3.0.0
- */
-function assertObjectNotHasAttribute($attributeName, $object, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertObjectNotHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string matches a given regular expression.
- *
- * @param string $pattern
- * @param string $string
- * @param string $message
- */
-function assertRegExp($pattern, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertRegExp',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two variables have the same type and value.
- * Used on objects, it asserts that two variables reference
- * the same object.
- *
- * @param mixed  $expected
- * @param mixed  $actual
- * @param string $message
- */
-function assertSame($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertSame',
-        func_get_args()
-    );
-}
-
-/**
- * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
- * is the same.
- *
- * @param array|Countable|Traversable $expected
- * @param array|Countable|Traversable $actual
- * @param string                      $message
- */
-function assertSameSize($expected, $actual, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertSameSize',
-        func_get_args()
-    );
-}
-
-/**
- * Assert the presence, absence, or count of elements in a document matching
- * the CSS $selector, regardless of the contents of those elements.
- *
- * The first argument, $selector, is the CSS selector used to match
- * the elements in the $actual document.
- *
- * The second argument, $count, can be either boolean or numeric.
- * When boolean, it asserts for presence of elements matching the selector
- * (true) or absence of elements (false).
- * When numeric, it asserts the count of elements.
- *
- * assertSelectCount("#binder", true, $xml);  // any?
- * assertSelectCount(".binder", 3, $xml); // exactly 3?
- *
- * @param array  $selector
- * @param int    $count
- * @param mixed  $actual
- * @param string $message
- * @param bool   $isHtml
- * @since  Method available since Release 3.3.0
- */
-function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertSelectCount',
-        func_get_args()
-    );
-}
-
-/**
- * assertSelectEquals("#binder .name", "Chuck", true,  $xml);  // any?
- * assertSelectEquals("#binder .name", "Chuck", false, $xml);  // none?
- *
- * @param array  $selector
- * @param string $content
- * @param int    $count
- * @param mixed  $actual
- * @param string $message
- * @param bool   $isHtml
- * @since  Method available since Release 3.3.0
- */
-function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertSelectEquals',
-        func_get_args()
-    );
-}
-
-/**
- * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any?
- * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml);// 3?
- *
- * @param array  $selector
- * @param string $pattern
- * @param int    $count
- * @param mixed  $actual
- * @param string $message
- * @param bool   $isHtml
- * @since  Method available since Release 3.3.0
- */
-function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertSelectRegExp',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string ends not with a given prefix.
- *
- * @param string $suffix
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.4.0
- */
-function assertStringEndsNotWith($suffix, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringEndsNotWith',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string ends with a given prefix.
- *
- * @param string $suffix
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.4.0
- */
-function assertStringEndsWith($suffix, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringEndsWith',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the contents of a string is equal
- * to the contents of a file.
- *
- * @param string $expectedFile
- * @param string $actualString
- * @param string $message
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- * @since  Method available since Release 3.3.0
- */
-function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringEqualsFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string matches a given format string.
- *
- * @param string $format
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.5.0
- */
-function assertStringMatchesFormat($format, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringMatchesFormat',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string matches a given format file.
- *
- * @param string $formatFile
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.5.0
- */
-function assertStringMatchesFormatFile($formatFile, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringMatchesFormatFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that the contents of a string is not equal
- * to the contents of a file.
- *
- * @param string $expectedFile
- * @param string $actualString
- * @param string $message
- * @param bool   $canonicalize
- * @param bool   $ignoreCase
- * @since  Method available since Release 3.3.0
- */
-function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringNotEqualsFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string does not match a given format string.
- *
- * @param string $format
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.5.0
- */
-function assertStringNotMatchesFormat($format, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringNotMatchesFormat',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string does not match a given format string.
- *
- * @param string $formatFile
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.5.0
- */
-function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringNotMatchesFormatFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string starts not with a given prefix.
- *
- * @param string $prefix
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.4.0
- */
-function assertStringStartsNotWith($prefix, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringStartsNotWith',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a string starts with a given prefix.
- *
- * @param string $prefix
- * @param string $string
- * @param string $message
- * @since  Method available since Release 3.4.0
- */
-function assertStringStartsWith($prefix, $string, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertStringStartsWith',
-        func_get_args()
-    );
-}
-
-/**
- * Evaluate an HTML or XML string and assert its structure and/or contents.
- *
- * The first argument ($matcher) is an associative array that specifies the
- * match criteria for the assertion:
- *
- *  - `id`   : the node with the given id attribute must match the
- * corresponding value.
- *  - `tag`  : the node type must match the corresponding value.
- *  - `attributes`   : a hash. The node's attributes must match the
- * corresponding values in the hash.
- *  - `content`  : The text content must match the given value.
- *  - `parent`   : a hash. The node's parent must match the
- * corresponding hash.
- *  - `child`: a hash. At least one of the node's immediate children
- * must meet the criteria described by the hash.
- *  - `ancestor` : a hash. At least one of the node's ancestors must
- * meet the criteria described by the hash.
- *  - `descendant`   : a hash. At least one of the node's descendants must
- * meet the criteria described by the hash.
- *  - `children` : a hash, for counting children of a node.
- * Accepts the keys:
- *- `count`: a number which must equal the number of children
- *   that match
- *- `less_than`: the number of matching children must be greater
- *   than this number
- *- `greater_than` : the number of matching children must be less than
- *   this number
- *- `only` : another hash consisting of the keys to use to match
- *   on the children, and only matching children will be
- *   counted
- *
- * <code>
- * // Matcher that asserts that there is an element with an id="my_id".
- * $matcher = array('id' => 'my_id');
- *
- * // Matcher that asserts that there is a "span" tag.
- * $matcher = array('tag' => 'span');
- *
- * // Matcher that asserts that there is a "span" tag with the content
- * // "Hello World".
- * $matcher = array('tag' => 'span', 'content' => 'Hello World');
- *
- * // Matcher that asserts that there is a "span" tag with content matching
- * // the regular expression pattern.
- * $matcher = array('tag' => 'span', 'content' => 'regexp:/Try P(HP|ython)/');
- *
- * // Matcher that asserts that there is a "span" with an "list" class
- * // attribute.
- * $matcher = array(
- *   'tag'=> 'span',
- *   'attributes' => array('class' => 'list')
- * );
- *
- * // Matcher that asserts that there is a "span" inside of a "div".
- * $matcher = array(
- *   'tag'=> 'span',
- *   'parent' => array('tag' => 'div')
- * );
- *
- * // Matcher that asserts that there is a "span" somewhere inside a
- * // "table".
- * $matcher = array(
- *   'tag'  => 'span',
- *   'ancestor' => array('tag' => 'table')
- * );
- *
- * // Matcher that asserts that there is a "span" with at least one "em"
- * // child.
- * $matcher = array(
- *   'tag'   => 'span',
- *   'child' => array('tag' => 'em')
- * );
- *
- * // Matcher that asserts that there is a "span" containing a (possibly
- * // nested) "strong" tag.
- * $matcher = array(
- *   'tag'=> 'span',
- *   'descendant' => array('tag' => 'strong')
- * );
- *
- * // Matcher that asserts that there is a "span" containing 5-10 "em" tags
- * // as immediate children.
- * $matcher = array(
- *   'tag'  => 'span',
- *   'children' => array(
- * 'less_than'=> 11,
- * 'greater_than' => 4,
- * 'only' => array('tag' => 'em')
- *   )
- * );
- *
- * // Matcher that asserts that there is a "div", with an "ul" ancestor and
- * // a "li" parent (with class="enum"), and containing a "span" descendant
- * // that contains an element with id="my_test" and the text "Hello World".
- * $matcher = array(
- *   'tag'=> 'div',
- *   'ancestor'   => array('tag' => 'ul'),
- *   'parent' => array(
- * 'tag'=> 'li',
- * 'attributes' => array('class' => 'enum')
- *   ),
- *   'descendant' => array(
- * 'tag'   => 'span',
- * 'child' => array(
- *   'id'  => 'my_test',
- *   'content' => 'Hello World'
- * )
- *   )
- * );
- *
- * // Use assertTag() to apply a $matcher to a piece of $html.
- * $this->assertTag($matcher, $html);
- *
- * // Use assertTag() to apply a $matcher to a piece of $xml.
- * $this->assertTag($matcher, $xml, '', false);
- * </code>
- *
- * The second argument ($actual) is a string containing either HTML or
- * XML text to be tested.
- *
- * The third argument ($message) is an optional message that will be
- * used if the assertion fails.
- *
- * The fourth argument ($html) is an optional flag specifying whether
- * to load the $actual string into a DOMDocument using the HTML or
- * XML load strategy.  It is true by default, which assumes the HTML
- * load strategy.  In many cases, this will be acceptable for XML as well.
- *
- * @param array  $matcher
- * @param string $actual
- * @param string $message
- * @param bool   $isHtml
- * @since  Method available since Release 3.3.0
- */
-function assertTag($matcher, $actual, $message = '', $isHtml = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertTag',
-        func_get_args()
-    );
-}
-
-/**
- * Evaluates a PHPUnit_Framework_Constraint matcher object.
- *
- * @param  mixed$value
- * @param PHPUnit_Framework_Constraint $constraint
- * @param string                       $message
- * @since  Method available since Release 3.0.0
- */
-function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertThat',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that a condition is true.
- *
- * @param  bool                                   $condition
- * @param  string                                 $message
- * @throws PHPUnit_Framework_AssertionFailedError
- */
-function assertTrue($condition, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertTrue',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML files are equal.
- *
- * @param string $expectedFile
- * @param string $actualFile
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlFileEqualsXmlFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML files are not equal.
- *
- * @param string $expectedFile
- * @param string $actualFile
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlFileNotEqualsXmlFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML documents are equal.
- *
- * @param string $expectedFile
- * @param string $actualXml
- * @param string $message
- * @since  Method available since Release 3.3.0
- */
-function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML documents are equal.
- *
- * @param string $expectedXml
- * @param string $actualXml
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlStringEqualsXmlString',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML documents are not equal.
- *
- * @param string $expectedFile
- * @param string $actualXml
- * @param string $message
- * @since  Method available since Release 3.3.0
- */
-function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlFile',
-        func_get_args()
-    );
-}
-
-/**
- * Asserts that two XML documents are not equal.
- *
- * @param string $expectedXml
- * @param string $actualXml
- * @param string $message
- * @since  Method available since Release 3.1.0
- */
-function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::assertXmlStringNotEqualsXmlString',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a matcher that matches when the method is executed
- * at the given $index.
- *
- * @param  int                                                 $index
- * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
- * @since  Method available since Release 3.0.0
- */
-function at($index)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::at',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a matcher that matches when the method is executed at least once.
- *
- * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
- * @since  Method available since Release 3.0.0
- */
-function atLeastOnce()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::atLeastOnce',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
- *
- * @param  PHPUnit_Framework_Constraint           $constraint
- * @param  string                                 $attributeName
- * @return PHPUnit_Framework_Constraint_Attribute
- * @since  Method available since Release 3.1.0
- */
-function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::attribute',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object
- * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
- * object.
- *
- * @param  string                                 $attributeName
- * @param  mixed                                  $value
- * @param  float                                  $delta
- * @param  int                                    $maxDepth
- * @param  bool                                   $canonicalize
- * @param  bool                                   $ignoreCase
- * @return PHPUnit_Framework_Constraint_Attribute
- * @since  Method available since Release 3.1.0
- */
-function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::attributeEqualTo',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Callback matcher object.
- *
- * @param  callable                              $callback
- * @return PHPUnit_Framework_Constraint_Callback
- */
-function callback($callback)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::callback',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
- *
- * @param  string                                         $attributeName
- * @return PHPUnit_Framework_Constraint_ClassHasAttribute
- * @since  Method available since Release 3.1.0
- */
-function classHasAttribute($attributeName)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::classHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
- * object.
- *
- * @param  string                                               $attributeName
- * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
- * @since  Method available since Release 3.1.0
- */
-function classHasStaticAttribute($attributeName)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::classHasStaticAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
- * object.
- *
- * @param  mixed                                            $value
- * @param  bool                                             $checkForObjectIdentity
- * @param  bool                                             $checkForNonObjectIdentity
- * @return PHPUnit_Framework_Constraint_TraversableContains
- * @since  Method available since Release 3.0.0
- */
-function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::contains',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
- * object.
- *
- * @param  string                                               $type
- * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
- * @since  Method available since Release 3.1.4
- */
-function containsOnly($type)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::containsOnly',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
- * object.
- *
- * @param  string                                               $classname
- * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
- */
-function containsOnlyInstancesOf($classname)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::containsOnlyInstancesOf',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
- *
- * @param  mixed                                $value
- * @param  float                                $delta
- * @param  int                                  $maxDepth
- * @param  bool                                 $canonicalize
- * @param  bool                                 $ignoreCase
- * @return PHPUnit_Framework_Constraint_IsEqual
- * @since  Method available since Release 3.0.0
- */
-function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::equalTo',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a matcher that matches when the method is executed
- * exactly $count times.
- *
- * @param  int                                               $count
- * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
- * @since  Method available since Release 3.0.0
- */
-function exactly($count)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::exactly',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_FileExists matcher object.
- *
- * @return PHPUnit_Framework_Constraint_FileExists
- * @since  Method available since Release 3.0.0
- */
-function fileExists()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::fileExists',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
- *
- * @param  mixed                                    $value
- * @return PHPUnit_Framework_Constraint_GreaterThan
- * @since  Method available since Release 3.0.0
- */
-function greaterThan($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::greaterThan',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
- * a PHPUnit_Framework_Constraint_IsEqual and a
- * PHPUnit_Framework_Constraint_GreaterThan matcher object.
- *
- * @param  mixed                           $value
- * @return PHPUnit_Framework_Constraint_Or
- * @since  Method available since Release 3.1.0
- */
-function greaterThanOrEqual($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::greaterThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
- *
- * @param  mixed                                    $value
- * @return PHPUnit_Framework_Constraint_IsIdentical
- * @since  Method available since Release 3.0.0
- */
-function identicalTo($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::identicalTo',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsEmpty matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsEmpty
- * @since  Method available since Release 3.5.0
- */
-function isEmpty()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isEmpty',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsFalse matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsFalse
- * @since  Method available since Release 3.3.0
- */
-function isFalse()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isFalse',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
- *
- * @param  string                                    $className
- * @return PHPUnit_Framework_Constraint_IsInstanceOf
- * @since  Method available since Release 3.0.0
- */
-function isInstanceOf($className)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isInstanceOf',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsJson matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsJson
- * @since  Method available since Release 3.7.20
- */
-function isJson()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isJson',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsNull matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsNull
- * @since  Method available since Release 3.3.0
- */
-function isNull()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isNull',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsTrue matcher object.
- *
- * @return PHPUnit_Framework_Constraint_IsTrue
- * @since  Method available since Release 3.3.0
- */
-function isTrue()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isTrue',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_IsType matcher object.
- *
- * @param  string                              $type
- * @return PHPUnit_Framework_Constraint_IsType
- * @since  Method available since Release 3.0.0
- */
-function isType($type)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::isType',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
- *
- * @param  mixed                                 $value
- * @return PHPUnit_Framework_Constraint_LessThan
- * @since  Method available since Release 3.0.0
- */
-function lessThan($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::lessThan',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Or matcher object that wraps
- * a PHPUnit_Framework_Constraint_IsEqual and a
- * PHPUnit_Framework_Constraint_LessThan matcher object.
- *
- * @param  mixed                           $value
- * @return PHPUnit_Framework_Constraint_Or
- * @since  Method available since Release 3.1.0
- */
-function lessThanOrEqual($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::lessThanOrEqual',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_And matcher object.
- *
- * @return PHPUnit_Framework_Constraint_And
- * @since  Method available since Release 3.0.0
- */
-function logicalAnd()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::logicalAnd',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Not matcher object.
- *
- * @param  PHPUnit_Framework_Constraint     $constraint
- * @return PHPUnit_Framework_Constraint_Not
- * @since  Method available since Release 3.0.0
- */
-function logicalNot(PHPUnit_Framework_Constraint $constraint)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::logicalNot',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Or matcher object.
- *
- * @return PHPUnit_Framework_Constraint_Or
- * @since  Method available since Release 3.0.0
- */
-function logicalOr()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::logicalOr',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_Xor matcher object.
- *
- * @return PHPUnit_Framework_Constraint_Xor
- * @since  Method available since Release 3.0.0
- */
-function logicalXor()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::logicalXor',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
- *
- * @param  string                                     $string
- * @return PHPUnit_Framework_Constraint_StringMatches
- * @since  Method available since Release 3.5.0
- */
-function matches($string)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::matches',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
- *
- * @param  string                                 $pattern
- * @return PHPUnit_Framework_Constraint_PCREMatch
- * @since  Method available since Release 3.0.0
- */
-function matchesRegularExpression($pattern)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::matchesRegularExpression',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a matcher that matches when the method is never executed.
- *
- * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
- * @since  Method available since Release 3.0.0
- */
-function never()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::never',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
- *
- * @param  string                                          $attributeName
- * @return PHPUnit_Framework_Constraint_ObjectHasAttribute
- * @since  Method available since Release 3.0.0
- */
-function objectHasAttribute($attributeName)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::objectHasAttribute',
-        func_get_args()
-    );
-}
-
-/**
- * @param  mixed                                              $value, ...
- * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
- * @since  Method available since Release 3.0.0
- */
-function onConsecutiveCalls()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::onConsecutiveCalls',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a matcher that matches when the method is executed exactly once.
- *
- * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
- * @since  Method available since Release 3.0.0
- */
-function once()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::once',
-        func_get_args()
-    );
-}
-
-/**
- * @param  int                                              $argumentIndex
- * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
- * @since  Method available since Release 3.3.0
- */
-function returnArgument($argumentIndex)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::returnArgument',
-        func_get_args()
-    );
-}
-
-/**
- * @param  mixed                                            $callback
- * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
- * @since  Method available since Release 3.3.0
- */
-function returnCallback($callback)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::returnCallback',
-        func_get_args()
-    );
-}
-
-/**
- * Returns the current object.
- *
- * This method is useful when mocking a fluent interface.
- *
- * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf
- * @since  Method available since Release 3.6.0
- */
-function returnSelf()
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::returnSelf',
-        func_get_args()
-    );
-}
-
-/**
- * @param  mixed                                    $value
- * @return PHPUnit_Framework_MockObject_Stub_Return
- * @since  Method available since Release 3.0.0
- */
-function returnValue($value)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::returnValue',
-        func_get_args()
-    );
-}
-
-/**
- * @param  array                                            $valueMap
- * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
- * @since  Method available since Release 3.6.0
- */
-function returnValueMap(array $valueMap)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::returnValueMap',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
- *
- * @param  string                                      $string
- * @param  bool                                        $case
- * @return PHPUnit_Framework_Constraint_StringContains
- * @since  Method available since Release 3.0.0
- */
-function stringContains($string, $case = true)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::stringContains',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
- *
- * @param  mixed                                       $suffix
- * @return PHPUnit_Framework_Constraint_StringEndsWith
- * @since  Method available since Release 3.4.0
- */
-function stringEndsWith($suffix)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::stringEndsWith',
-        func_get_args()
-    );
-}
-
-/**
- * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
- *
- * @param  mixed                                         $prefix
- * @return PHPUnit_Framework_Constraint_StringStartsWith
- * @since  Method available since Release 3.4.0
- */
-function stringStartsWith($prefix)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_Assert::stringStartsWith',
-        func_get_args()
-    );
-}
-
-/**
- * @param  Exception                                   $exception
- * @return PHPUnit_Framework_MockObject_Stub_Exception
- * @since  Method available since Release 3.1.0
- */
-function throwException(Exception $exception)
-{
-    return call_user_func_array(
-        'PHPUnit_Framework_TestCase::throwException',
-        func_get_args()
-    );
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php b/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
deleted file mode 100644
index b554e6c..0000000
--- a/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Thrown when an assertion failed.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_AssertionFailedError extends PHPUnit_Framework_Exception implements PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * Wrapper for getMessage() which is declared as final.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getMessage();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
deleted file mode 100644
index bf8d062..0000000
--- a/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An empty Listener that can be extended to implement TestListener
- * with just a few lines of code.
- * @see PHPUnit_Framework_TestListener for documentation on the API methods.
- *
- * @since Class available since Release 4.0.0
- */
-abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener
-{
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-    }
-
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-    }
-
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-    }
-
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php b/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
deleted file mode 100644
index b75edd7..0000000
--- a/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Framework_CodeCoverageException extends PHPUnit_Framework_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint.php b/vendor/phpunit/phpunit/src/Framework/Constraint.php
deleted file mode 100644
index 327e1a9..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Abstract base class for constraints. which are placed upon any value.
- *
- * @since      Interface available since Release 3.0.0
- */
-abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framework_SelfDescribing
-{
-    protected $exporter;
-
-    public function __construct()
-    {
-        $this->exporter = new Exporter;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success = false;
-
-        if ($this->matches($other)) {
-            $success = true;
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * This method can be overridden to implement the evaluation algorithm.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return false;
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.4.0
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Throws an exception for the given compared value and test description
-     *
-     * @param  mixed                                          $other             Evaluated value or object.
-     * @param  string                                         $description       Additional information about the test
-     * @param  SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null)
-    {
-        $failureDescription = sprintf(
-            'Failed asserting that %s.',
-            $this->failureDescription($other)
-        );
-
-        $additionalFailureDescription = $this->additionalFailureDescription($other);
-
-        if ($additionalFailureDescription) {
-            $failureDescription .= "\n" . $additionalFailureDescription;
-        }
-
-        if (!empty($description)) {
-            $failureDescription = $description . "\n" . $failureDescription;
-        }
-
-        throw new PHPUnit_Framework_ExpectationFailedException(
-            $failureDescription,
-            $comparisonFailure
-        );
-    }
-
-    /**
-     * Return additional failure description where needed
-     *
-     * The function can be overridden to provide additional failure
-     * information like a diff
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function additionalFailureDescription($other)
-    {
-        return '';
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * To provide additional failure information additionalFailureDescription
-     * can be used.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return $this->exporter->export($other) . ' ' . $this->toString();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/And.php b/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
deleted file mode 100644
index fa38aa5..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Logical AND.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint[]
-     */
-    protected $constraints = array();
-
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $lastConstraint = null;
-
-    /**
-     * @param  PHPUnit_Framework_Constraint[] $constraints
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function setConstraints(array $constraints)
-    {
-        $this->constraints = array();
-
-        foreach ($constraints as $constraint) {
-            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
-                throw new PHPUnit_Framework_Exception(
-                    'All parameters to ' . __CLASS__ .
-                    ' must be a constraint object.'
-                );
-            }
-
-            $this->constraints[] = $constraint;
-        }
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success    = true;
-        $constraint = null;
-
-        foreach ($this->constraints as $constraint) {
-            if (!$constraint->evaluate($other, $description, true)) {
-                $success = false;
-                break;
-            }
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $text = '';
-
-        foreach ($this->constraints as $key => $constraint) {
-            if ($key > 0) {
-                $text .= ' and ';
-            }
-
-            $text .= $constraint->toString();
-        }
-
-        return $text;
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.4.0
-     */
-    public function count()
-    {
-        $count = 0;
-
-        foreach ($this->constraints as $constraint) {
-            $count += count($constraint);
-        }
-
-        return $count;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
deleted file mode 100644
index 84da6fb..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the array it is evaluated for has a given key.
- *
- * Uses array_key_exists() to check if the key is found in the input array, if
- * not found the evaluation fails.
- *
- * The array key is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_ArrayHasKey extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var int|string
-     */
-    protected $key;
-
-    /**
-     * @param int|string $key
-     */
-    public function __construct($key)
-    {
-        parent::__construct();
-        $this->key = $key;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        if (is_array($other)) {
-            return array_key_exists($this->key, $other);
-        }
-
-        if ($other instanceof ArrayAccess) {
-            return $other->offsetExists($this->key);
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'has the key ' . $this->exporter->export($this->key);
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return 'an array ' . $this->toString();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
deleted file mode 100644
index 35dbd30..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the array it is evaluated for has a specified subset.
- *
- * Uses array_replace_recursive() to check if a key value subset is part of the
- * subject array.
- *
- * @since Class available since Release 4.4.0
- */
-class PHPUnit_Framework_Constraint_ArraySubset extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var array|ArrayAccess
-     */
-    protected $subset;
-
-    /**
-     * @var bool
-     */
-    protected $strict;
-
-    /**
-     * @param array|ArrayAccess $subset
-     * @param bool              $strict Check for object identity
-     */
-    public function __construct($subset, $strict = false)
-    {
-        parent::__construct();
-        $this->strict = $strict;
-        $this->subset = $subset;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  array|ArrayAccess $other Array or ArrayAccess object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $patched = array_replace_recursive($other, $this->subset);
-
-        if ($this->strict) {
-            return $other === $patched;
-        } else {
-            return $other == $patched;
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'has the subset ' . $this->exporter->export($this->subset);
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return 'an array ' . $this->toString();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
deleted file mode 100644
index 1252665..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.1.0
- */
-class PHPUnit_Framework_Constraint_Attribute extends PHPUnit_Framework_Constraint_Composite
-{
-    /**
-     * @var string
-     */
-    protected $attributeName;
-
-    /**
-     * @param PHPUnit_Framework_Constraint $constraint
-     * @param string                       $attributeName
-     */
-    public function __construct(PHPUnit_Framework_Constraint $constraint, $attributeName)
-    {
-        parent::__construct($constraint);
-
-        $this->attributeName = $attributeName;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        return parent::evaluate(
-            PHPUnit_Framework_Assert::readAttribute(
-                $other,
-                $this->attributeName
-            ),
-            $description,
-            $returnResult
-        );
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'attribute "' . $this->attributeName . '" ' .
-               $this->innerConstraint->toString();
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return $this->toString();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
deleted file mode 100644
index 280d6b1..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that evaluates against a specified closure.
- */
-class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint
-{
-    private $callback;
-
-    /**
-     * @param  callable                    $callback
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($callback)
-    {
-        if (!is_callable($callback)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'callable'
-            );
-        }
-
-        parent::__construct();
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $value. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return call_user_func($this->callback, $other);
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is accepted by specified callback';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
deleted file mode 100644
index 53007a0..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the class it is evaluated for has a given
- * attribute.
- *
- * The attribute name is passed in the constructor.
- *
- * @since Class available since Release 3.1.0
- */
-class PHPUnit_Framework_Constraint_ClassHasAttribute extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $attributeName;
-
-    /**
-     * @param string $attributeName
-     */
-    public function __construct($attributeName)
-    {
-        parent::__construct();
-        $this->attributeName = $attributeName;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $class = new ReflectionClass($other);
-
-        return $class->hasProperty($this->attributeName);
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'has attribute "%s"',
-            $this->attributeName
-        );
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            '%sclass "%s" %s',
-            is_object($other) ? 'object of ' : '',
-            is_object($other) ? get_class($other) : $other,
-            $this->toString()
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
deleted file mode 100644
index b8c7c18..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the class it is evaluated for has a given
- * static attribute.
- *
- * The attribute name is passed in the constructor.
- *
- * @since Class available since Release 3.1.0
- */
-class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $class = new ReflectionClass($other);
-
-        if ($class->hasProperty($this->attributeName)) {
-            $attribute = $class->getProperty($this->attributeName);
-
-            return $attribute->isStatic();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     * @since  Method available since Release 3.3.0
-     */
-    public function toString()
-    {
-        return sprintf(
-            'has static attribute "%s"',
-            $this->attributeName
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
deleted file mode 100644
index 0da9431..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.1.0
- */
-abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $innerConstraint;
-
-    /**
-     * @param PHPUnit_Framework_Constraint $innerConstraint
-     */
-    public function __construct(PHPUnit_Framework_Constraint $innerConstraint)
-    {
-        parent::__construct();
-        $this->innerConstraint = $innerConstraint;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        try {
-            return $this->innerConstraint->evaluate(
-                $other,
-                $description,
-                $returnResult
-            );
-        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->innerConstraint);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
deleted file mode 100644
index a388da9..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var int
-     */
-    protected $expectedCount = 0;
-
-    /**
-     * @param int $expected
-     */
-    public function __construct($expected)
-    {
-        parent::__construct();
-        $this->expectedCount = $expected;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $this->expectedCount === $this->getCountOf($other);
-    }
-
-    /**
-     * @param  mixed $other
-     * @return bool
-     */
-    protected function getCountOf($other)
-    {
-        if ($other instanceof Countable || is_array($other)) {
-            return count($other);
-        } elseif ($other instanceof Traversable) {
-            if ($other instanceof IteratorAggregate) {
-                $iterator = $other->getIterator();
-            } else {
-                $iterator = $other;
-            }
-
-            $key   = $iterator->key();
-            $count = iterator_count($iterator);
-
-            // manually rewind $iterator to previous key, since iterator_count
-            // moves pointer
-            if ($key !== null) {
-                $iterator->rewind();
-                while ($iterator->valid() && $key !== $iterator->key()) {
-                    $iterator->next();
-                }
-            }
-
-            return $count;
-        }
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            'actual size %d matches expected size %d',
-            $this->getCountOf($other),
-            $this->expectedCount
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'count matches %d',
-            $this->expectedCount
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
deleted file mode 100644
index ab3c136..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.6.6
- */
-class PHPUnit_Framework_Constraint_Exception extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $className;
-
-    /**
-     * @param string $className
-     */
-    public function __construct($className)
-    {
-        parent::__construct();
-        $this->className = $className;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $other instanceof $this->className;
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        if ($other !== null) {
-            $message = '';
-            if ($other instanceof Exception) {
-                $message = '. Message was: "' . $other->getMessage() . '" at'
-                        . "\n" . $other->getTraceAsString();
-            }
-
-            return sprintf(
-                'exception of type "%s" matches expected exception "%s"%s',
-                get_class($other),
-                $this->className,
-                $message
-            );
-        }
-
-        return sprintf(
-            'exception of type "%s" is thrown',
-            $this->className
-        );
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'exception of type "%s"',
-            $this->className
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
deleted file mode 100644
index 100d5f5..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.6.6
- */
-class PHPUnit_Framework_Constraint_ExceptionCode extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var int
-     */
-    protected $expectedCode;
-
-    /**
-     * @param int $expected
-     */
-    public function __construct($expected)
-    {
-        parent::__construct();
-        $this->expectedCode = $expected;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  Exception $other
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return (string) $other->getCode() == (string) $this->expectedCode;
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            '%s is equal to expected exception code %s',
-            $this->exporter->export($other->getCode()),
-            $this->exporter->export($this->expectedCode)
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'exception code is ';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
deleted file mode 100644
index c6d955c..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.6.6
- */
-class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var int
-     */
-    protected $expectedMessage;
-
-    /**
-     * @param string $expected
-     */
-    public function __construct($expected)
-    {
-        parent::__construct();
-        $this->expectedMessage = $expected;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  Exception $other
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return strpos($other->getMessage(), $this->expectedMessage) !== false;
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            "exception message '%s' contains '%s'",
-            $other->getMessage(),
-            $this->expectedMessage
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'exception message contains ';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php
deleted file mode 100644
index 34b15f4..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.3.0
- */
-class PHPUnit_Framework_Constraint_ExceptionMessageRegExp extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var int
-     */
-    protected $expectedMessageRegExp;
-
-    /**
-     * @param string $expected
-     */
-    public function __construct($expected)
-    {
-        parent::__construct();
-        $this->expectedMessageRegExp = $expected;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  Exception $other
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $match = PHPUnit_Util_Regex::pregMatchSafe($this->expectedMessageRegExp, $other->getMessage());
-
-        if (false === $match) {
-            throw new PHPUnit_Framework_Exception(
-                "Invalid expected exception message regex given: '{$this->expectedMessageRegExp}'"
-            );
-        }
-
-        return 1 === $match;
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            "exception message '%s' matches '%s'",
-            $other->getMessage(),
-            $this->expectedMessageRegExp
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'exception message matches ';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php b/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
deleted file mode 100644
index 58d2a18..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that checks if the file(name) that it is evaluated for exists.
- *
- * The file path to check is passed as $other in evaluate().
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return file_exists($other);
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            'file "%s" exists',
-            $other
-        );
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'file exists';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
deleted file mode 100644
index 557df5d..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the value it is evaluated for is greater
- * than a given value.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_GreaterThan extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var numeric
-     */
-    protected $value;
-
-    /**
-     * @param numeric $value
-     */
-    public function __construct($value)
-    {
-        parent::__construct();
-        $this->value = $value;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $this->value < $other;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is greater than ' . $this->exporter->export($this->value);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
deleted file mode 100644
index e624abb..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that accepts any input value.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        return $returnResult ? true : null;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is anything';
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.5.0
-     */
-    public function count()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
deleted file mode 100644
index f0323a6..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that checks whether a variable is empty().
- *
- * @since Class available since Release 3.5.0
- */
-class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        if ($other instanceof Countable) {
-            return count($other) === 0;
-        }
-
-        return empty($other);
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is empty';
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        $type = gettype($other);
-
-        return sprintf(
-            '%s %s %s',
-            $type[0] == 'a' || $type[0] == 'o' ? 'an' : 'a',
-            $type,
-            $this->toString()
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
deleted file mode 100644
index 2cf9c69..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that checks if one value is equal to another.
- *
- * Equality is checked with PHP's == operator, the operator is explained in
- * detail at {@url http://www.php.net/manual/en/types.comparisons.php}.
- * Two values are equal if they have the same value disregarding type.
- *
- * The expected value is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var mixed
-     */
-    protected $value;
-
-    /**
-     * @var float
-     */
-    protected $delta = 0.0;
-
-    /**
-     * @var int
-     */
-    protected $maxDepth = 10;
-
-    /**
-     * @var bool
-     */
-    protected $canonicalize = false;
-
-    /**
-     * @var bool
-     */
-    protected $ignoreCase = false;
-
-    /**
-     * @var SebastianBergmann\Comparator\ComparisonFailure
-     */
-    protected $lastFailure;
-
-    /**
-     * @param  mixed                       $value
-     * @param  float                       $delta
-     * @param  int                         $maxDepth
-     * @param  bool                        $canonicalize
-     * @param  bool                        $ignoreCase
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
-    {
-        parent::__construct();
-
-        if (!is_numeric($delta)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'numeric');
-        }
-
-        if (!is_int($maxDepth)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'integer');
-        }
-
-        if (!is_bool($canonicalize)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'boolean');
-        }
-
-        if (!is_bool($ignoreCase)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(5, 'boolean');
-        }
-
-        $this->value        = $value;
-        $this->delta        = $delta;
-        $this->maxDepth     = $maxDepth;
-        $this->canonicalize = $canonicalize;
-        $this->ignoreCase   = $ignoreCase;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        // If $this->value and $other are identical, they are also equal.
-        // This is the most common path and will allow us to skip
-        // initialization of all the comparators.
-        if ($this->value === $other) {
-            return true;
-        }
-
-        $comparatorFactory = SebastianBergmann\Comparator\Factory::getInstance();
-
-        try {
-            $comparator = $comparatorFactory->getComparatorFor(
-                $this->value,
-                $other
-            );
-
-            $comparator->assertEquals(
-                $this->value,
-                $other,
-                $this->delta,
-                $this->canonicalize,
-                $this->ignoreCase
-            );
-        } catch (SebastianBergmann\Comparator\ComparisonFailure $f) {
-            if ($returnResult) {
-                return false;
-            }
-
-            throw new PHPUnit_Framework_ExpectationFailedException(
-                trim($description . "\n" . $f->getMessage()),
-                $f
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $delta = '';
-
-        if (is_string($this->value)) {
-            if (strpos($this->value, "\n") !== false) {
-                return 'is equal to <text>';
-            } else {
-                return sprintf(
-                    'is equal to <string:%s>',
-                    $this->value
-                );
-            }
-        } else {
-            if ($this->delta != 0) {
-                $delta = sprintf(
-                    ' with delta <%F>',
-                    $this->delta
-                );
-            }
-
-            return sprintf(
-                'is equal to %s%s',
-                $this->exporter->export($this->value),
-                $delta
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
deleted file mode 100644
index 9dee329..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that accepts false.
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Constraint_IsFalse extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $other === false;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is false';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
deleted file mode 100644
index 981f36c..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that one value is identical to another.
- *
- * Identical check is performed with PHP's === operator, the operator is
- * explained in detail at
- * {@url http://www.php.net/manual/en/types.comparisons.php}.
- * Two values are identical if they have the same value and are of the same
- * type.
- *
- * The expected value is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var float
-     */
-    const EPSILON = 0.0000000001;
-
-    /**
-     * @var mixed
-     */
-    protected $value;
-
-    /**
-     * @param mixed $value
-     */
-    public function __construct($value)
-    {
-        parent::__construct();
-        $this->value = $value;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        if (is_double($this->value) && is_double($other) &&
-            !is_infinite($this->value) && !is_infinite($other) &&
-            !is_nan($this->value) && !is_nan($other)) {
-            $success = abs($this->value - $other) < self::EPSILON;
-        } else {
-            $success = $this->value === $other;
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $f = null;
-
-            // if both values are strings, make sure a diff is generated
-            if (is_string($this->value) && is_string($other)) {
-                $f = new SebastianBergmann\Comparator\ComparisonFailure(
-                    $this->value,
-                    $other,
-                    $this->value,
-                    $other
-                );
-            }
-
-            $this->fail($other, $description, $f);
-        }
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        if (is_object($this->value) && is_object($other)) {
-            return 'two variables reference the same object';
-        }
-
-        if (is_string($this->value) && is_string($other)) {
-            return 'two strings are identical';
-        }
-
-        return parent::failureDescription($other);
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (is_object($this->value)) {
-            return 'is identical to an object of class "' .
-                   get_class($this->value) . '"';
-        } else {
-            return 'is identical to ' .
-                   $this->exporter->export($this->value);
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
deleted file mode 100644
index 3c70cc5..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the object it is evaluated for is an instance
- * of a given class.
- *
- * The expected class name is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_IsInstanceOf extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $className;
-
-    /**
-     * @param string $className
-     */
-    public function __construct($className)
-    {
-        parent::__construct();
-        $this->className = $className;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return ($other instanceof $this->className);
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            '%s is an instance of %s "%s"',
-            $this->exporter->shortenedExport($other),
-            $this->getType(),
-            $this->className
-        );
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'is instance of %s "%s"',
-            $this->getType(),
-            $this->className
-        );
-    }
-
-    private function getType()
-    {
-        try {
-            $reflection = new ReflectionClass($this->className);
-            if ($reflection->isInterface()) {
-                return 'interface';
-            }
-        } catch (ReflectionException $e) {
-        }
-
-        return 'class';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
deleted file mode 100644
index 34cda56..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that a string is valid JSON.
- *
- * @since Class available since Release 3.7.20
- */
-class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        json_decode($other);
-        if (json_last_error()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        json_decode($other);
-        $error = PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::determineJsonError(
-            json_last_error()
-        );
-
-        return sprintf(
-            '%s is valid JSON (%s)',
-            $this->exporter->shortenedExport($other),
-            $error
-        );
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is valid JSON';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
deleted file mode 100644
index dd300c2..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that accepts null.
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Constraint_IsNull extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $other === null;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is null';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
deleted file mode 100644
index 273adf4..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that accepts true.
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Constraint_IsTrue extends PHPUnit_Framework_Constraint
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $other === true;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is true';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php b/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
deleted file mode 100644
index b93b336..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the value it is evaluated for is of a
- * specified type.
- *
- * The expected value is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
-{
-    const TYPE_ARRAY    = 'array';
-    const TYPE_BOOL     = 'bool';
-    const TYPE_FLOAT    = 'float';
-    const TYPE_INT      = 'int';
-    const TYPE_NULL     = 'null';
-    const TYPE_NUMERIC  = 'numeric';
-    const TYPE_OBJECT   = 'object';
-    const TYPE_RESOURCE = 'resource';
-    const TYPE_STRING   = 'string';
-    const TYPE_SCALAR   = 'scalar';
-    const TYPE_CALLABLE = 'callable';
-
-    /**
-     * @var array
-     */
-    protected $types = array(
-        'array'    => true,
-        'boolean'  => true,
-        'bool'     => true,
-        'double'   => true,
-        'float'    => true,
-        'integer'  => true,
-        'int'      => true,
-        'null'     => true,
-        'numeric'  => true,
-        'object'   => true,
-        'real'     => true,
-        'resource' => true,
-        'string'   => true,
-        'scalar'   => true,
-        'callable' => true
-    );
-
-    /**
-     * @var string
-     */
-    protected $type;
-
-    /**
-     * @param  string                      $type
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($type)
-    {
-        parent::__construct();
-
-        if (!isset($this->types[$type])) {
-            throw new PHPUnit_Framework_Exception(
-                sprintf(
-                    'Type specified for PHPUnit_Framework_Constraint_IsType <%s> ' .
-                    'is not a valid type.',
-                    $type
-                )
-            );
-        }
-
-        $this->type = $type;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        switch ($this->type) {
-            case 'numeric':
-                return is_numeric($other);
-
-            case 'integer':
-            case 'int':
-                return is_integer($other);
-
-            case 'double':
-            case 'float':
-            case 'real':
-                return is_float($other);
-
-            case 'string':
-                return is_string($other);
-
-            case 'boolean':
-            case 'bool':
-                return is_bool($other);
-
-            case 'null':
-                return is_null($other);
-
-            case 'array':
-                return is_array($other);
-
-            case 'object':
-                return is_object($other);
-
-            case 'resource':
-                return is_resource($other) || is_string(@get_resource_type($other));
-
-            case 'scalar':
-                return is_scalar($other);
-
-            case 'callable':
-                return is_callable($other);
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'is of type "%s"',
-            $this->type
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
deleted file mode 100644
index 5428986..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Asserts whether or not two JSON objects are equal.
- *
- * @since Class available since Release 3.7.0
- */
-class PHPUnit_Framework_Constraint_JsonMatches extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Creates a new constraint.
-     *
-     * @param string $value
-     */
-    public function __construct($value)
-    {
-        parent::__construct();
-        $this->value = $value;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * This method can be overridden to implement the evaluation algorithm.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $decodedOther = json_decode($other);
-        if (json_last_error()) {
-            return false;
-        }
-
-        $decodedValue = json_decode($this->value);
-        if (json_last_error()) {
-            return false;
-        }
-
-        return $decodedOther == $decodedValue;
-    }
-
-    /**
-     * Returns a string representation of the object.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'matches JSON string "%s"',
-            $this->value
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php b/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
deleted file mode 100644
index e8fb1fb..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Provides human readable messages for each JSON error.
- *
- * @since Class available since Release 3.7.0
- */
-class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider
-{
-    /**
-     * Translates JSON error to a human readable string.
-     *
-     * @param  string $error
-     * @param  string $prefix
-     * @return string
-     */
-    public static function determineJsonError($error, $prefix = '')
-    {
-        switch ($error) {
-            case JSON_ERROR_NONE:
-                return;
-            case JSON_ERROR_DEPTH:
-                return $prefix . 'Maximum stack depth exceeded';
-            case JSON_ERROR_STATE_MISMATCH:
-                return $prefix . 'Underflow or the modes mismatch';
-            case JSON_ERROR_CTRL_CHAR:
-                return $prefix . 'Unexpected control character found';
-            case JSON_ERROR_SYNTAX:
-                return $prefix . 'Syntax error, malformed JSON';
-            case JSON_ERROR_UTF8:
-                return $prefix . 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            default:
-                return $prefix . 'Unknown error';
-        }
-    }
-
-    /**
-     * Translates a given type to a human readable message prefix.
-     *
-     * @param  string $type
-     * @return string
-     */
-    public static function translateTypeToPrefix($type)
-    {
-        switch (strtolower($type)) {
-            case 'expected':
-                $prefix = 'Expected value JSON decode error - ';
-                break;
-            case 'actual':
-                $prefix = 'Actual value JSON decode error - ';
-                break;
-            default:
-                $prefix = '';
-                break;
-        }
-
-        return $prefix;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php b/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
deleted file mode 100644
index a4fffe3..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the value it is evaluated for is less than
- * a given value.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_LessThan extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var numeric
-     */
-    protected $value;
-
-    /**
-     * @param numeric $value
-     */
-    public function __construct($value)
-    {
-        parent::__construct();
-        $this->value = $value;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return $this->value > $other;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'is less than ' . $this->exporter->export($this->value);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
deleted file mode 100644
index 21bb14a..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Logical NOT.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $constraint;
-
-    /**
-     * @param PHPUnit_Framework_Constraint $constraint
-     */
-    public function __construct($constraint)
-    {
-        parent::__construct();
-
-        if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
-            $constraint = new PHPUnit_Framework_Constraint_IsEqual($constraint);
-        }
-
-        $this->constraint = $constraint;
-    }
-
-    /**
-     * @param  string $string
-     * @return string
-     */
-    public static function negate($string)
-    {
-        return str_replace(
-            array(
-            'contains ',
-            'exists',
-            'has ',
-            'is ',
-            'are ',
-            'matches ',
-            'starts with ',
-            'ends with ',
-            'reference ',
-            'not not '
-            ),
-            array(
-            'does not contain ',
-            'does not exist',
-            'does not have ',
-            'is not ',
-            'are not ',
-            'does not match ',
-            'starts not with ',
-            'ends not with ',
-            'don\'t reference ',
-            'not '
-            ),
-            $string
-        );
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success = !$this->constraint->evaluate($other, $description, true);
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        switch (get_class($this->constraint)) {
-            case 'PHPUnit_Framework_Constraint_And':
-            case 'PHPUnit_Framework_Constraint_Not':
-            case 'PHPUnit_Framework_Constraint_Or':
-                return 'not( ' . $this->constraint->failureDescription($other) . ' )';
-
-            default:
-                return self::negate(
-                    $this->constraint->failureDescription($other)
-                );
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        switch (get_class($this->constraint)) {
-            case 'PHPUnit_Framework_Constraint_And':
-            case 'PHPUnit_Framework_Constraint_Not':
-            case 'PHPUnit_Framework_Constraint_Or':
-                return 'not( ' . $this->constraint->toString() . ' )';
-
-            default:
-                return self::negate(
-                    $this->constraint->toString()
-                );
-        }
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.4.0
-     */
-    public function count()
-    {
-        return count($this->constraint);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php b/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
deleted file mode 100644
index 7c6453a..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the object it is evaluated for has a given
- * attribute.
- *
- * The attribute name is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_ObjectHasAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
-{
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        $object = new ReflectionObject($other);
-
-        return $object->hasProperty($this->attributeName);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
deleted file mode 100644
index 4a9e71a..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Logical OR.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_Or extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint[]
-     */
-    protected $constraints = array();
-
-    /**
-     * @param PHPUnit_Framework_Constraint[] $constraints
-     */
-    public function setConstraints(array $constraints)
-    {
-        $this->constraints = array();
-
-        foreach ($constraints as $constraint) {
-            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
-                $constraint = new PHPUnit_Framework_Constraint_IsEqual(
-                    $constraint
-                );
-            }
-
-            $this->constraints[] = $constraint;
-        }
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success    = false;
-        $constraint = null;
-
-        foreach ($this->constraints as $constraint) {
-            if ($constraint->evaluate($other, $description, true)) {
-                $success = true;
-                break;
-            }
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $text = '';
-
-        foreach ($this->constraints as $key => $constraint) {
-            if ($key > 0) {
-                $text .= ' or ';
-            }
-
-            $text .= $constraint->toString();
-        }
-
-        return $text;
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.4.0
-     */
-    public function count()
-    {
-        $count = 0;
-
-        foreach ($this->constraints as $constraint) {
-            $count += count($constraint);
-        }
-
-        return $count;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php b/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
deleted file mode 100644
index 9465b10..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the string it is evaluated for matches
- * a regular expression.
- *
- * Checks a given value using the Perl Compatible Regular Expression extension
- * in PHP. The pattern is matched by executing preg_match().
- *
- * The pattern string passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_PCREMatch extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $pattern;
-
-    /**
-     * @param string $pattern
-     */
-    public function __construct($pattern)
-    {
-        parent::__construct();
-        $this->pattern = $pattern;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return preg_match($this->pattern, $other) > 0;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            'matches PCRE pattern "%s"',
-            $this->pattern
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php b/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
deleted file mode 100644
index e372c1a..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Constraint_SameSize extends PHPUnit_Framework_Constraint_Count
-{
-    /**
-     * @var int
-     */
-    protected $expectedCount;
-
-    /**
-     * @param int $expected
-     */
-    public function __construct($expected)
-    {
-        parent::__construct($this->getCountOf($expected));
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
deleted file mode 100644
index 0d3d7b5..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the string it is evaluated for contains
- * a given string.
- *
- * Uses strpos() to find the position of the string in the input, if not found
- * the evaluation fails.
- *
- * The sub-string is passed in the constructor.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_StringContains extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $string;
-
-    /**
-     * @var bool
-     */
-    protected $ignoreCase;
-
-    /**
-     * @param string $string
-     * @param bool   $ignoreCase
-     */
-    public function __construct($string, $ignoreCase = false)
-    {
-        parent::__construct();
-
-        $this->string     = $string;
-        $this->ignoreCase = $ignoreCase;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        if ($this->ignoreCase) {
-            return stripos($other, $this->string) !== false;
-        } else {
-            return strpos($other, $this->string) !== false;
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if ($this->ignoreCase) {
-            $string = strtolower($this->string);
-        } else {
-            $string = $this->string;
-        }
-
-        return sprintf(
-            'contains "%s"',
-            $string
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
deleted file mode 100644
index 1df062c..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the string it is evaluated for ends with a given
- * suffix.
- *
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Framework_Constraint_StringEndsWith extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $suffix;
-
-    /**
-     * @param string $suffix
-     */
-    public function __construct($suffix)
-    {
-        parent::__construct();
-        $this->suffix = $suffix;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return substr($other, 0 - strlen($this->suffix)) == $this->suffix;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'ends with "' . $this->suffix . '"';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
deleted file mode 100644
index af42fc1..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Diff\Differ;
-
-/**
- * ...
- *
- * @since Class available since Release 3.5.0
- */
-class PHPUnit_Framework_Constraint_StringMatches extends PHPUnit_Framework_Constraint_PCREMatch
-{
-    /**
-     * @var string
-     */
-    protected $string;
-
-    /**
-     * @param string $string
-     */
-    public function __construct($string)
-    {
-        parent::__construct($string);
-
-        $this->pattern = $this->createPatternFromFormat(
-            preg_replace('/\r\n/', "\n", $string)
-        );
-
-        $this->string = $string;
-    }
-
-    protected function failureDescription($other)
-    {
-        return 'format description matches text';
-    }
-
-    protected function additionalFailureDescription($other)
-    {
-        $from = preg_split('(\r\n|\r|\n)', $this->string);
-        $to   = preg_split('(\r\n|\r|\n)', $other);
-
-        foreach ($from as $index => $line) {
-            if (isset($to[$index]) && $line !== $to[$index]) {
-                $line = $this->createPatternFromFormat($line);
-
-                if (preg_match($line, $to[$index]) > 0) {
-                    $from[$index] = $to[$index];
-                }
-            }
-        }
-
-        $this->string = implode("\n", $from);
-        $other        = implode("\n", $to);
-
-        $differ = new Differ("--- Expected\n+++ Actual\n");
-
-        return $differ->diff($this->string, $other);
-    }
-
-    protected function createPatternFromFormat($string)
-    {
-        $string = str_replace(
-            array(
-            '%e',
-            '%s',
-            '%S',
-            '%a',
-            '%A',
-            '%w',
-            '%i',
-            '%d',
-            '%x',
-            '%f',
-            '%c'
-            ),
-            array(
-            '\\' . DIRECTORY_SEPARATOR,
-            '[^\r\n]+',
-            '[^\r\n]*',
-            '.+',
-            '.*',
-            '\s*',
-            '[+-]?\d+',
-            '\d+',
-            '[0-9a-fA-F]+',
-            '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
-            '.'
-            ),
-            preg_quote($string, '/')
-        );
-
-        return '/^' . $string . '$/s';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php b/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
deleted file mode 100644
index b373855..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the string it is evaluated for begins with a
- * given prefix.
- *
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Framework_Constraint_StringStartsWith extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var string
-     */
-    protected $prefix;
-
-    /**
-     * @param string $prefix
-     */
-    public function __construct($prefix)
-    {
-        parent::__construct();
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        return strpos($other, $this->prefix) === 0;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'starts with "' . $this->prefix . '"';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
deleted file mode 100644
index 39b98d9..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the Traversable it is applied to contains
- * a given value.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var bool
-     */
-    protected $checkForObjectIdentity;
-
-    /**
-     * @var bool
-     */
-    protected $checkForNonObjectIdentity;
-
-    /**
-     * @var mixed
-     */
-    protected $value;
-
-    /**
-     * @param  mixed                       $value
-     * @param  bool                        $checkForObjectIdentity
-     * @param  bool                        $checkForNonObjectIdentity
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
-    {
-        parent::__construct();
-
-        if (!is_bool($checkForObjectIdentity)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'boolean');
-        }
-
-        if (!is_bool($checkForNonObjectIdentity)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
-        }
-
-        $this->checkForObjectIdentity    = $checkForObjectIdentity;
-        $this->checkForNonObjectIdentity = $checkForNonObjectIdentity;
-        $this->value                     = $value;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns true if the
-     * constraint is met, false otherwise.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @return bool
-     */
-    protected function matches($other)
-    {
-        if ($other instanceof SplObjectStorage) {
-            return $other->contains($this->value);
-        }
-
-        if (is_object($this->value)) {
-            foreach ($other as $element) {
-                if (($this->checkForObjectIdentity &&
-                     $element === $this->value) ||
-                    (!$this->checkForObjectIdentity &&
-                     $element == $this->value)) {
-                    return true;
-                }
-            }
-        } else {
-            foreach ($other as $element) {
-                if (($this->checkForNonObjectIdentity &&
-                     $element === $this->value) ||
-                    (!$this->checkForNonObjectIdentity &&
-                     $element == $this->value)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (is_string($this->value) && strpos($this->value, "\n") !== false) {
-            return 'contains "' . $this->value . '"';
-        } else {
-            return 'contains ' . $this->exporter->export($this->value);
-        }
-    }
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed  $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-            '%s %s',
-            is_array($other) ? 'an array' : 'a traversable',
-            $this->toString()
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php b/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
deleted file mode 100644
index f2f76c4..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Constraint that asserts that the Traversable it is applied to contains
- * only values of a given type.
- *
- * @since Class available since Release 3.1.4
- */
-class PHPUnit_Framework_Constraint_TraversableContainsOnly extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $constraint;
-
-    /**
-     * @var string
-     */
-    protected $type;
-
-    /**
-     * @param string $type
-     * @param bool   $isNativeType
-     */
-    public function __construct($type, $isNativeType = true)
-    {
-        parent::__construct();
-
-        if ($isNativeType) {
-            $this->constraint = new PHPUnit_Framework_Constraint_IsType($type);
-        } else {
-            $this->constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
-                $type
-            );
-        }
-
-        $this->type = $type;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success = true;
-
-        foreach ($other as $item) {
-            if (!$this->constraint->evaluate($item, '', true)) {
-                $success = false;
-                break;
-            }
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return 'contains only values of type "' . $this->type . '"';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php b/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
deleted file mode 100644
index 9ce4d06..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Logical XOR.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_Constraint_Xor extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint[]
-     */
-    protected $constraints = array();
-
-    /**
-     * @param PHPUnit_Framework_Constraint[] $constraints
-     */
-    public function setConstraints(array $constraints)
-    {
-        $this->constraints = array();
-
-        foreach ($constraints as $constraint) {
-            if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
-                $constraint = new PHPUnit_Framework_Constraint_IsEqual(
-                    $constraint
-                );
-            }
-
-            $this->constraints[] = $constraint;
-        }
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to false (the default), an exception is thrown
-     * in case of a failure. null is returned otherwise.
-     *
-     * If $returnResult is true, the result of the evaluation is returned as
-     * a boolean value instead: true in case of success, false in case of a
-     * failure.
-     *
-     * @param  mixed                                        $other        Value or object to evaluate.
-     * @param  string                                       $description  Additional information about the test
-     * @param  bool                                         $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = false)
-    {
-        $success    = true;
-        $lastResult = null;
-        $constraint = null;
-
-        foreach ($this->constraints as $constraint) {
-            $result = $constraint->evaluate($other, $description, true);
-
-            if ($result === $lastResult) {
-                $success = false;
-                break;
-            }
-
-            $lastResult = $result;
-        }
-
-        if ($returnResult) {
-            return $success;
-        }
-
-        if (!$success) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Returns a string representation of the constraint.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $text = '';
-
-        foreach ($this->constraints as $key => $constraint) {
-            if ($key > 0) {
-                $text .= ' xor ';
-            }
-
-            $text .= $constraint->toString();
-        }
-
-        return $text;
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return int
-     * @since  Method available since Release 3.4.0
-     */
-    public function count()
-    {
-        $count = 0;
-
-        foreach ($this->constraints as $constraint) {
-            $count += count($constraint);
-        }
-
-        return $count;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error.php b/vendor/phpunit/phpunit/src/Framework/Error.php
deleted file mode 100644
index 9e793fd..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Error.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wrapper for PHP errors.
- *
- * @since Class available since Release 2.2.0
- */
-class PHPUnit_Framework_Error extends PHPUnit_Framework_Exception
-{
-    /**
-     * Constructor.
-     *
-     * @param string    $message
-     * @param int       $code
-     * @param string    $file
-     * @param int       $line
-     * @param Exception $previous
-     */
-    public function __construct($message, $code, $file, $line, Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-
-        $this->file  = $file;
-        $this->line  = $line;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php b/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
deleted file mode 100644
index 2ab5598..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wrapper for PHP deprecated errors.
- * You can disable deprecated-to-exception conversion by setting
- *
- * <code>
- * PHPUnit_Framework_Error_Deprecated::$enabled = false;
- * </code>
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Error_Deprecated extends PHPUnit_Framework_Error
-{
-    public static $enabled = true;
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Notice.php b/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
deleted file mode 100644
index 477ad93..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wrapper for PHP notices.
- * You can disable notice-to-exception conversion by setting
- *
- * <code>
- * PHPUnit_Framework_Error_Notice::$enabled = false;
- * </code>
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Error_Notice extends PHPUnit_Framework_Error
-{
-    public static $enabled = true;
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Error/Warning.php b/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
deleted file mode 100644
index 9240bcb..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wrapper for PHP warnings.
- * You can disable notice-to-exception conversion by setting
- *
- * <code>
- * PHPUnit_Framework_Error_Warning::$enabled = false;
- * </code>
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Error_Warning extends PHPUnit_Framework_Error
-{
-    public static $enabled = true;
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Exception.php b/vendor/phpunit/phpunit/src/Framework/Exception.php
deleted file mode 100644
index 4274c12..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Exception.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all PHPUnit Framework exceptions.
- *
- * Ensures that exceptions thrown during a test run do not leave stray
- * references behind.
- *
- * Every Exception contains a stack trace. Each stack frame contains the 'args'
- * of the called function. The function arguments can contain references to
- * instantiated objects. The references prevent the objects from being
- * destructed (until test results are eventually printed), so memory cannot be
- * freed up.
- *
- * With enabled process isolation, test results are serialized in the child
- * process and unserialized in the parent process. The stack trace of Exceptions
- * may contain objects that cannot be serialized or unserialized (e.g., PDO
- * connections). Unserializing user-space objects from the child process into
- * the parent would break the intended encapsulation of process isolation.
- *
- * @see http://fabien.potencier.org/article/9/php-serialization-stack-traces-and-exceptions
- *
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception
-{
-    /**
-     * @var array
-     */
-    protected $serializableTrace;
-
-    public function __construct($message = '', $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-
-        $this->serializableTrace = $this->getTrace();
-        foreach ($this->serializableTrace as $i => $call) {
-            unset($this->serializableTrace[$i]['args']);
-        }
-    }
-
-    /**
-     * Returns the serializable trace (without 'args').
-     *
-     * @return array
-     */
-    public function getSerializableTrace()
-    {
-        return $this->serializableTrace;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $string = PHPUnit_Framework_TestFailure::exceptionToString($this);
-
-        if ($trace = PHPUnit_Util_Filter::getFilteredStacktrace($this)) {
-            $string .= "\n" . $trace;
-        }
-
-        return $string;
-    }
-
-    public function __sleep()
-    {
-        return array_keys(get_object_vars($this));
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php b/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php
deleted file mode 100644
index fa3e9ee..0000000
--- a/vendor/phpunit/phpunit/src/Framework/ExceptionWrapper.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wraps Exceptions thrown by code under test.
- *
- * Re-instantiates Exceptions thrown by user-space code to retain their original
- * class names, properties, and stack traces (but without arguments).
- *
- * Unlike PHPUnit_Framework_Exception, the complete stack of previous Exceptions
- * is processed.
- *
- * @since Class available since Release 4.3.0
- */
-class PHPUnit_Framework_ExceptionWrapper extends PHPUnit_Framework_Exception
-{
-    /**
-     * @var string
-     */
-    protected $classname;
-
-    /**
-     * @var PHPUnit_Framework_ExceptionWrapper|null
-     */
-    protected $previous;
-
-    /**
-     * @param Throwable|Exception $e
-     */
-    public function __construct($e)
-    {
-        // PDOException::getCode() is a string.
-        // @see http://php.net/manual/en/class.pdoexception.php#95812
-        parent::__construct($e->getMessage(), (int) $e->getCode());
-
-        $this->classname = get_class($e);
-        $this->file      = $e->getFile();
-        $this->line      = $e->getLine();
-
-        $this->serializableTrace = $e->getTrace();
-
-        foreach ($this->serializableTrace as $i => $call) {
-            unset($this->serializableTrace[$i]['args']);
-        }
-
-        if ($e->getPrevious()) {
-            $this->previous = new self($e->getPrevious());
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassname()
-    {
-        return $this->classname;
-    }
-
-    /**
-     * @return PHPUnit_Framework_ExceptionWrapper
-     */
-    public function getPreviousWrapped()
-    {
-        return $this->previous;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $string = PHPUnit_Framework_TestFailure::exceptionToString($this);
-
-        if ($trace = PHPUnit_Util_Filter::getFilteredStacktrace($this)) {
-            $string .= "\n" . $trace;
-        }
-
-        if ($this->previous) {
-            $string .= "\nCaused by\n" . $this->previous;
-        }
-
-        return $string;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php b/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
deleted file mode 100644
index 60229a9..0000000
--- a/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception for expectations which failed their check.
- *
- * The exception contains the error message and optionally a
- * SebastianBergmann\Comparator\ComparisonFailure which is used to
- * generate diff output of the failed expectations.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_ExpectationFailedException extends PHPUnit_Framework_AssertionFailedError
-{
-    /**
-     * @var SebastianBergmann\Comparator\ComparisonFailure
-     */
-    protected $comparisonFailure;
-
-    public function __construct($message, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null, Exception $previous = null)
-    {
-        $this->comparisonFailure = $comparisonFailure;
-
-        parent::__construct($message, 0, $previous);
-    }
-
-    /**
-     * @return SebastianBergmann\Comparator\ComparisonFailure
-     */
-    public function getComparisonFailure()
-    {
-        return $this->comparisonFailure;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php b/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
deleted file mode 100644
index 5735c4f..0000000
--- a/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A marker interface for marking any exception/error as result of an unit
- * test as incomplete implementation or currently not implemented.
- *
- * @since      Interface available since Release 2.0.0
- */
-interface PHPUnit_Framework_IncompleteTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php b/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
deleted file mode 100644
index b2f393e..0000000
--- a/vendor/phpunit/phpunit/src/Framework/IncompleteTestCase.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An incomplete test case
- *
- * @since Class available since Release 4.3.0
- */
-class PHPUnit_Framework_IncompleteTestCase extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var string
-     */
-    protected $message = '';
-
-    /**
-     * @var bool
-     */
-    protected $backupGlobals = false;
-
-    /**
-     * @var bool
-     */
-    protected $backupStaticAttributes = false;
-
-    /**
-     * @var bool
-     */
-    protected $runTestInSeparateProcess = false;
-
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
-    /**
-     * @var bool
-     */
-    protected $useOutputBuffering = false;
-
-    /**
-     * @param string $className
-     * @param string $methodName
-     * @param string $message
-     */
-    public function __construct($className, $methodName, $message = '')
-    {
-        $this->message = $message;
-        parent::__construct($className . '::' . $methodName);
-    }
-
-    /**
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function runTest()
-    {
-        $this->markTestIncomplete($this->message);
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getName();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php b/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
deleted file mode 100644
index 03ffd2f..0000000
--- a/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of an incomplete test.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_IncompleteTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_IncompleteTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
deleted file mode 100644
index a363ce1..0000000
--- a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a test that is skipped because of an invalid @covers annotation.
- *
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Framework_InvalidCoversTargetError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php b/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
deleted file mode 100644
index 324c76d..0000000
--- a/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Framework_InvalidCoversTargetException extends PHPUnit_Framework_CodeCoverageException
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/OutputError.php b/vendor/phpunit/phpunit/src/Framework/OutputError.php
deleted file mode 100644
index c3f5dcc..0000000
--- a/vendor/phpunit/phpunit/src/Framework/OutputError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a test that printed output.
- *
- * @since Class available since Release 3.6.0
- */
-class PHPUnit_Framework_OutputError extends PHPUnit_Framework_AssertionFailedError
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/RiskyTest.php b/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
deleted file mode 100644
index 9d98b5f..0000000
--- a/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A marker interface for marking any exception/error as result of an unit
- * test as risky.
- *
- * @since      Interface available since Release 4.0.0
- */
-interface PHPUnit_Framework_RiskyTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php b/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
deleted file mode 100644
index 781a50c..0000000
--- a/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a risky test.
- *
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Framework_RiskyTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_RiskyTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php b/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
deleted file mode 100644
index efc3c47..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for classes that can return a description of itself.
- *
- * @since      Interface available since Release 3.0.0
- */
-interface PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * Returns a string representation of the object.
-     *
-     * @return string
-     */
-    public function toString();
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTest.php b/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
deleted file mode 100644
index 51910a9..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A marker interface for marking a unit test as being skipped.
- *
- * @since      Interface available since Release 3.0.0
- */
-interface PHPUnit_Framework_SkippedTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php b/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
deleted file mode 100644
index 8a841df..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SkippedTestCase.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A skipped test case
- *
- * @since Class available since Release 4.3.0
- */
-class PHPUnit_Framework_SkippedTestCase extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var string
-     */
-    protected $message = '';
-
-    /**
-     * @var bool
-     */
-    protected $backupGlobals = false;
-
-    /**
-     * @var bool
-     */
-    protected $backupStaticAttributes = false;
-
-    /**
-     * @var bool
-     */
-    protected $runTestInSeparateProcess = false;
-
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
-    /**
-     * @var bool
-     */
-    protected $useOutputBuffering = false;
-
-    /**
-     * @param string $message
-     */
-    public function __construct($className, $methodName, $message = '')
-    {
-        $this->message = $message;
-        parent::__construct($className . '::' . $methodName);
-    }
-
-    /**
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function runTest()
-    {
-        $this->markTestSkipped($this->message);
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getName();
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php b/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
deleted file mode 100644
index d8df860..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a skipped test.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Framework_SkippedTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php b/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
deleted file mode 100644
index a57620b..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a skipped test suite.
- *
- * @since Class available since Release 3.1.0
- */
-class PHPUnit_Framework_SkippedTestSuiteError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/SyntheticError.php b/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
deleted file mode 100644
index 235b046..0000000
--- a/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Creates a synthetic failed assertion.
- *
- * @since Class available since Release 3.5.0
- */
-class PHPUnit_Framework_SyntheticError extends PHPUnit_Framework_AssertionFailedError
-{
-    /**
-     * The synthetic file.
-     *
-     * @var string
-     */
-    protected $syntheticFile = '';
-
-    /**
-     * The synthetic line number.
-     *
-     * @var int
-     */
-    protected $syntheticLine = 0;
-
-    /**
-     * The synthetic trace.
-     *
-     * @var array
-     */
-    protected $syntheticTrace = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $message
-     * @param int    $code
-     * @param string $file
-     * @param int    $line
-     * @param array  $trace
-     */
-    public function __construct($message, $code, $file, $line, $trace)
-    {
-        parent::__construct($message, $code);
-
-        $this->syntheticFile  = $file;
-        $this->syntheticLine  = $line;
-        $this->syntheticTrace = $trace;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSyntheticFile()
-    {
-        return $this->syntheticFile;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSyntheticLine()
-    {
-        return $this->syntheticLine;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSyntheticTrace()
-    {
-        return $this->syntheticTrace;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Test.php b/vendor/phpunit/phpunit/src/Framework/Test.php
deleted file mode 100644
index 77a25b5..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Test.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Test can be run and collect its results.
- *
- * @since      Interface available since Release 2.0.0
- */
-interface PHPUnit_Framework_Test extends Countable
-{
-    /**
-     * Runs a test and collects its result in a TestResult instance.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null);
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestCase.php b/vendor/phpunit/phpunit/src/Framework/TestCase.php
deleted file mode 100644
index ea65fbc..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestCase.php
+++ /dev/null
@@ -1,2094 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\GlobalState\Snapshot;
-use SebastianBergmann\GlobalState\Restorer;
-use SebastianBergmann\GlobalState\Blacklist;
-use SebastianBergmann\Diff\Differ;
-use SebastianBergmann\Exporter\Exporter;
-use Prophecy\Exception\Prediction\PredictionException;
-use Prophecy\Prophet;
-
-/**
- * A TestCase defines the fixture to run multiple tests.
- *
- * To define a TestCase
- *
- *   1) Implement a subclass of PHPUnit_Framework_TestCase.
- *   2) Define instance variables that store the state of the fixture.
- *   3) Initialize the fixture state by overriding setUp().
- *   4) Clean-up after a test by overriding tearDown().
- *
- * Each test runs in its own fixture so there can be no side effects
- * among test runs.
- *
- * Here is an example:
- *
- * <code>
- * <?php
- * class MathTest extends PHPUnit_Framework_TestCase
- * {
- *     public $value1;
- *     public $value2;
- *
- *     protected function setUp()
- *     {
- *         $this->value1 = 2;
- *         $this->value2 = 3;
- *     }
- * }
- * ?>
- * </code>
- *
- * For each test implement a method which interacts with the fixture.
- * Verify the expected results with assertions specified by calling
- * assert with a boolean.
- *
- * <code>
- * <?php
- * public function testPass()
- * {
- *     $this->assertTrue($this->value1 + $this->value2 == 5);
- * }
- * ?>
- * </code>
- *
- * @since Class available since Release 2.0.0
- */
-abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * Enable or disable the backup and restoration of the $GLOBALS array.
-     * Overwrite this attribute in a child class of TestCase.
-     * Setting this attribute in setUp() has no effect!
-     *
-     * @var bool
-     */
-    protected $backupGlobals = null;
-
-    /**
-     * @var array
-     */
-    protected $backupGlobalsBlacklist = array();
-
-    /**
-     * Enable or disable the backup and restoration of static attributes.
-     * Overwrite this attribute in a child class of TestCase.
-     * Setting this attribute in setUp() has no effect!
-     *
-     * @var bool
-     */
-    protected $backupStaticAttributes = null;
-
-    /**
-     * @var array
-     */
-    protected $backupStaticAttributesBlacklist = array();
-
-    /**
-     * Whether or not this test is to be run in a separate PHP process.
-     *
-     * @var bool
-     */
-    protected $runTestInSeparateProcess = null;
-
-    /**
-     * Whether or not this test should preserve the global state when
-     * running in a separate PHP process.
-     *
-     * @var bool
-     */
-    protected $preserveGlobalState = true;
-
-    /**
-     * Whether or not this test is running in a separate PHP process.
-     *
-     * @var bool
-     */
-    private $inIsolation = false;
-
-    /**
-     * @var array
-     */
-    private $data = array();
-
-    /**
-     * @var string
-     */
-    private $dataName = '';
-
-    /**
-     * @var bool
-     */
-    private $useErrorHandler = null;
-
-    /**
-     * The name of the expected Exception.
-     *
-     * @var mixed
-     */
-    private $expectedException = null;
-
-    /**
-     * The message of the expected Exception.
-     *
-     * @var string
-     */
-    private $expectedExceptionMessage = '';
-
-    /**
-     * The regex pattern to validate the expected Exception message.
-     *
-     * @var string
-     */
-    private $expectedExceptionMessageRegExp = '';
-
-    /**
-     * The code of the expected Exception.
-     *
-     * @var int
-     */
-    private $expectedExceptionCode;
-
-    /**
-     * The name of the test case.
-     *
-     * @var string
-     */
-    private $name = null;
-
-    /**
-     * @var array
-     */
-    private $dependencies = array();
-
-    /**
-     * @var array
-     */
-    private $dependencyInput = array();
-
-    /**
-     * @var array
-     */
-    private $iniSettings = array();
-
-    /**
-     * @var array
-     */
-    private $locale = array();
-
-    /**
-     * @var array
-     */
-    private $mockObjects = array();
-
-    /**
-     * @var array
-     */
-    private $mockObjectGenerator = null;
-
-    /**
-     * @var int
-     */
-    private $status;
-
-    /**
-     * @var string
-     */
-    private $statusMessage = '';
-
-    /**
-     * @var int
-     */
-    private $numAssertions = 0;
-
-    /**
-     * @var PHPUnit_Framework_TestResult
-     */
-    private $result;
-
-    /**
-     * @var mixed
-     */
-    private $testResult;
-
-    /**
-     * @var string
-     */
-    private $output = '';
-
-    /**
-     * @var string
-     */
-    private $outputExpectedRegex = null;
-
-    /**
-     * @var string
-     */
-    private $outputExpectedString = null;
-
-    /**
-     * @var mixed
-     */
-    private $outputCallback = false;
-
-    /**
-     * @var bool
-     */
-    private $outputBufferingActive = false;
-
-    /**
-     * @var int
-     */
-    private $outputBufferingLevel;
-
-    /**
-     * @var SebastianBergmann\GlobalState\Snapshot
-     */
-    private $snapshot;
-
-    /**
-     * @var Prophecy\Prophet
-     */
-    private $prophet;
-
-    /**
-     * @var bool
-     */
-    private $disallowChangesToGlobalState = false;
-
-    /**
-     * Constructs a test case with the given name.
-     *
-     * @param string $name
-     * @param array  $data
-     * @param string $dataName
-     */
-    public function __construct($name = null, array $data = array(), $dataName = '')
-    {
-        if ($name !== null) {
-            $this->setName($name);
-        }
-
-        $this->data                = $data;
-        $this->dataName            = $dataName;
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $class = new ReflectionClass($this);
-
-        $buffer = sprintf(
-            '%s::%s',
-            $class->name,
-            $this->getName(false)
-        );
-
-        return $buffer . $this->getDataSetAsString();
-    }
-
-    /**
-     * Counts the number of test cases executed by run(TestResult result).
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the annotations for this test.
-     *
-     * @return array
-     * @since Method available since Release 3.4.0
-     */
-    public function getAnnotations()
-    {
-        return PHPUnit_Util_Test::parseTestMethodAnnotations(
-            get_class($this),
-            $this->name
-        );
-    }
-
-    /**
-     * Gets the name of a TestCase.
-     *
-     * @param  bool   $withDataSet
-     * @return string
-     */
-    public function getName($withDataSet = true)
-    {
-        if ($withDataSet) {
-            return $this->name . $this->getDataSetAsString(false);
-        } else {
-            return $this->name;
-        }
-    }
-
-    /**
-     * Returns the size of the test.
-     *
-     * @return int
-     * @since  Method available since Release 3.6.0
-     */
-    public function getSize()
-    {
-        return PHPUnit_Util_Test::getSize(
-            get_class($this),
-            $this->getName(false)
-        );
-    }
-
-    /**
-     * @return string
-     * @since  Method available since Release 3.6.0
-     */
-    public function getActualOutput()
-    {
-        if (!$this->outputBufferingActive) {
-            return $this->output;
-        } else {
-            return ob_get_contents();
-        }
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 3.6.0
-     */
-    public function hasOutput()
-    {
-        if (strlen($this->output) === 0) {
-            return false;
-        }
-
-        if ($this->hasExpectationOnOutput()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $expectedRegex
-     * @since Method available since Release 3.6.0
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function expectOutputRegex($expectedRegex)
-    {
-        if ($this->outputExpectedString !== null) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        if (is_string($expectedRegex) || is_null($expectedRegex)) {
-            $this->outputExpectedRegex = $expectedRegex;
-        }
-    }
-
-    /**
-     * @param string $expectedString
-     * @since Method available since Release 3.6.0
-     */
-    public function expectOutputString($expectedString)
-    {
-        if ($this->outputExpectedRegex !== null) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        if (is_string($expectedString) || is_null($expectedString)) {
-            $this->outputExpectedString = $expectedString;
-        }
-    }
-
-    /**
-     * @return bool
-     * @since Method available since Release 3.6.5
-     * @deprecated
-     */
-    public function hasPerformedExpectationsOnOutput()
-    {
-        return $this->hasExpectationOnOutput();
-    }
-
-    /**
-     * @return bool
-     * @since Method available since Release 4.3.3
-     */
-    public function hasExpectationOnOutput()
-    {
-        return is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex);
-    }
-
-    /**
-     * @return string
-     * @since  Method available since Release 3.2.0
-     */
-    public function getExpectedException()
-    {
-        return $this->expectedException;
-    }
-
-    /**
-     * @param mixed  $exceptionName
-     * @param string $exceptionMessage
-     * @param int    $exceptionCode
-     * @since  Method available since Release 3.2.0
-     */
-    public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
-    {
-        $this->expectedException        = $exceptionName;
-        $this->expectedExceptionMessage = $exceptionMessage;
-        $this->expectedExceptionCode    = $exceptionCode;
-    }
-
-    /**
-     * @param mixed  $exceptionName
-     * @param string $exceptionMessageRegExp
-     * @param int    $exceptionCode
-     * @since Method available since Release 4.3.0
-     */
-    public function setExpectedExceptionRegExp($exceptionName, $exceptionMessageRegExp = '', $exceptionCode = null)
-    {
-        $this->expectedException              = $exceptionName;
-        $this->expectedExceptionMessageRegExp = $exceptionMessageRegExp;
-        $this->expectedExceptionCode          = $exceptionCode;
-    }
-
-    /**
-     * @since  Method available since Release 3.4.0
-     */
-    protected function setExpectedExceptionFromAnnotation()
-    {
-        try {
-            $expectedException = PHPUnit_Util_Test::getExpectedException(
-                get_class($this),
-                $this->name
-            );
-
-            if ($expectedException !== false) {
-                $this->setExpectedException(
-                    $expectedException['class'],
-                    $expectedException['message'],
-                    $expectedException['code']
-                );
-
-                if (!empty($expectedException['message_regex'])) {
-                    $this->setExpectedExceptionRegExp(
-                        $expectedException['class'],
-                        $expectedException['message_regex'],
-                        $expectedException['code']
-                    );
-                }
-            }
-        } catch (ReflectionException $e) {
-        }
-    }
-
-    /**
-     * @param bool $useErrorHandler
-     * @since Method available since Release 3.4.0
-     */
-    public function setUseErrorHandler($useErrorHandler)
-    {
-        $this->useErrorHandler = $useErrorHandler;
-    }
-
-    /**
-     * @since Method available since Release 3.4.0
-     */
-    protected function setUseErrorHandlerFromAnnotation()
-    {
-        try {
-            $useErrorHandler = PHPUnit_Util_Test::getErrorHandlerSettings(
-                get_class($this),
-                $this->name
-            );
-
-            if ($useErrorHandler !== null) {
-                $this->setUseErrorHandler($useErrorHandler);
-            }
-        } catch (ReflectionException $e) {
-        }
-    }
-
-    /**
-     * @since Method available since Release 3.6.0
-     */
-    protected function checkRequirements()
-    {
-        if (!$this->name || !method_exists($this, $this->name)) {
-            return;
-        }
-
-        $missingRequirements = PHPUnit_Util_Test::getMissingRequirements(
-            get_class($this),
-            $this->name
-        );
-
-        if (!empty($missingRequirements)) {
-            $this->markTestSkipped(implode(PHP_EOL, $missingRequirements));
-        }
-    }
-
-    /**
-     * Returns the status of this test.
-     *
-     * @return int
-     * @since  Method available since Release 3.1.0
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Returns the status message of this test.
-     *
-     * @return string
-     * @since  Method available since Release 3.3.0
-     */
-    public function getStatusMessage()
-    {
-        return $this->statusMessage;
-    }
-
-    /**
-     * Returns whether or not this test has failed.
-     *
-     * @return bool
-     * @since  Method available since Release 3.0.0
-     */
-    public function hasFailed()
-    {
-        $status = $this->getStatus();
-
-        return $status == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE ||
-               $status == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-    }
-
-    /**
-     * Runs the test case and collects the results in a TestResult object.
-     * If no TestResult object is passed a new one will be created.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null)
-    {
-        if ($result === null) {
-            $result = $this->createResult();
-        }
-
-        if (!$this instanceof PHPUnit_Framework_Warning) {
-            $this->setTestResultObject($result);
-            $this->setUseErrorHandlerFromAnnotation();
-        }
-
-        if ($this->useErrorHandler !== null) {
-            $oldErrorHandlerSetting = $result->getConvertErrorsToExceptions();
-            $result->convertErrorsToExceptions($this->useErrorHandler);
-        }
-
-        if (!$this instanceof PHPUnit_Framework_Warning && !$this->handleDependencies()) {
-            return;
-        }
-
-        if ($this->runTestInSeparateProcess === true &&
-            $this->inIsolation !== true &&
-            !$this instanceof PHPUnit_Extensions_SeleniumTestCase &&
-            !$this instanceof PHPUnit_Extensions_PhptTestCase) {
-            $class = new ReflectionClass($this);
-
-            $template = new Text_Template(
-                __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl'
-            );
-
-            if ($this->preserveGlobalState) {
-                $constants     = PHPUnit_Util_GlobalState::getConstantsAsString();
-                $globals       = PHPUnit_Util_GlobalState::getGlobalsAsString();
-                $includedFiles = PHPUnit_Util_GlobalState::getIncludedFilesAsString();
-                $iniSettings   = PHPUnit_Util_GlobalState::getIniSettingsAsString();
-            } else {
-                $constants     = '';
-                if (!empty($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
-                    $globals     = '$GLOBALS[\'__PHPUNIT_BOOTSTRAP\'] = ' . var_export($GLOBALS['__PHPUNIT_BOOTSTRAP'], true) . ";\n";
-                } else {
-                    $globals     = '';
-                }
-                $includedFiles = '';
-                $iniSettings   = '';
-            }
-
-            $coverage                                = $result->getCollectCodeCoverageInformation()       ? 'true' : 'false';
-            $isStrictAboutTestsThatDoNotTestAnything = $result->isStrictAboutTestsThatDoNotTestAnything() ? 'true' : 'false';
-            $isStrictAboutOutputDuringTests          = $result->isStrictAboutOutputDuringTests()          ? 'true' : 'false';
-            $isStrictAboutTestSize                   = $result->isStrictAboutTestSize()                   ? 'true' : 'false';
-            $isStrictAboutTodoAnnotatedTests         = $result->isStrictAboutTodoAnnotatedTests()         ? 'true' : 'false';
-
-            if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-                $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, true);
-            } else {
-                $composerAutoload = '\'\'';
-            }
-
-            if (defined('__PHPUNIT_PHAR__')) {
-                $phar = var_export(__PHPUNIT_PHAR__, true);
-            } else {
-                $phar = '\'\'';
-            }
-
-            if ($result->getCodeCoverage()) {
-                $codeCoverageFilter = $result->getCodeCoverage()->filter();
-            } else {
-                $codeCoverageFilter = null;
-            }
-
-            $data               = var_export(serialize($this->data), true);
-            $dataName           = var_export($this->dataName, true);
-            $dependencyInput    = var_export(serialize($this->dependencyInput), true);
-            $includePath        = var_export(get_include_path(), true);
-            $codeCoverageFilter = var_export(serialize($codeCoverageFilter), true);
-            // must do these fixes because TestCaseMethod.tpl has unserialize('{data}') in it, and we can't break BC
-            // the lines above used to use addcslashes() rather than var_export(), which breaks null byte escape sequences
-            $data               = "'." . $data . ".'";
-            $dataName           = "'.(" . $dataName . ").'";
-            $dependencyInput    = "'." . $dependencyInput . ".'";
-            $includePath        = "'." . $includePath . ".'";
-            $codeCoverageFilter = "'." . $codeCoverageFilter . ".'";
-
-            $configurationFilePath = (isset($GLOBALS['__PHPUNIT_CONFIGURATION_FILE']) ? $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] : '');
-
-            $template->setVar(
-                array(
-                    'composerAutoload'                        => $composerAutoload,
-                    'phar'                                    => $phar,
-                    'filename'                                => $class->getFileName(),
-                    'className'                               => $class->getName(),
-                    'methodName'                              => $this->name,
-                    'collectCodeCoverageInformation'          => $coverage,
-                    'data'                                    => $data,
-                    'dataName'                                => $dataName,
-                    'dependencyInput'                         => $dependencyInput,
-                    'constants'                               => $constants,
-                    'globals'                                 => $globals,
-                    'include_path'                            => $includePath,
-                    'included_files'                          => $includedFiles,
-                    'iniSettings'                             => $iniSettings,
-                    'isStrictAboutTestsThatDoNotTestAnything' => $isStrictAboutTestsThatDoNotTestAnything,
-                    'isStrictAboutOutputDuringTests'          => $isStrictAboutOutputDuringTests,
-                    'isStrictAboutTestSize'                   => $isStrictAboutTestSize,
-                    'isStrictAboutTodoAnnotatedTests'         => $isStrictAboutTodoAnnotatedTests,
-                    'codeCoverageFilter'                      => $codeCoverageFilter,
-                    'configurationFilePath'                   => $configurationFilePath
-                )
-            );
-
-            $this->prepareTemplate($template);
-
-            $php = PHPUnit_Util_PHP::factory();
-            $php->runTestJob($template->render(), $this, $result);
-        } else {
-            $result->run($this);
-        }
-
-        if ($this->useErrorHandler !== null) {
-            $result->convertErrorsToExceptions($oldErrorHandlerSetting);
-        }
-
-        $this->result = null;
-
-        return $result;
-    }
-
-    /**
-     * Runs the bare test sequence.
-     */
-    public function runBare()
-    {
-        $this->numAssertions = 0;
-
-        $this->snapshotGlobalState();
-        $this->startOutputBuffering();
-        clearstatcache();
-        $currentWorkingDirectory = getcwd();
-
-        $hookMethods = PHPUnit_Util_Test::getHookMethods(get_class($this));
-
-        try {
-            $hasMetRequirements = false;
-            $this->checkRequirements();
-            $hasMetRequirements = true;
-
-            if ($this->inIsolation) {
-                foreach ($hookMethods['beforeClass'] as $method) {
-                    $this->$method();
-                }
-            }
-
-            $this->setExpectedExceptionFromAnnotation();
-
-            foreach ($hookMethods['before'] as $method) {
-                $this->$method();
-            }
-
-            $this->assertPreConditions();
-            $this->testResult = $this->runTest();
-            $this->verifyMockObjects();
-            $this->assertPostConditions();
-
-            $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
-        } catch (PHPUnit_Framework_IncompleteTest $e) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
-            $this->statusMessage = $e->getMessage();
-        } catch (PHPUnit_Framework_SkippedTest $e) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
-            $this->statusMessage = $e->getMessage();
-        } catch (PHPUnit_Framework_AssertionFailedError $e) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
-            $this->statusMessage = $e->getMessage();
-        } catch (PredictionException $e) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
-            $this->statusMessage = $e->getMessage();
-        } catch (Throwable $_e) {
-            $e = $_e;
-        } catch (Exception $_e) {
-            $e = $_e;
-        }
-
-        if (isset($_e)) {
-            $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-            $this->statusMessage = $_e->getMessage();
-        }
-
-        // Clean up the mock objects.
-        $this->mockObjects = array();
-        $this->prophet     = null;
-
-        // Tear down the fixture. An exception raised in tearDown() will be
-        // caught and passed on when no exception was raised before.
-        try {
-            if ($hasMetRequirements) {
-                foreach ($hookMethods['after'] as $method) {
-                    $this->$method();
-                }
-
-                if ($this->inIsolation) {
-                    foreach ($hookMethods['afterClass'] as $method) {
-                        $this->$method();
-                    }
-                }
-            }
-        } catch (Throwable $_e) {
-            if (!isset($e)) {
-                $e = $_e;
-            }
-        } catch (Exception $_e) {
-            if (!isset($e)) {
-                $e = $_e;
-            }
-        }
-
-        try {
-            $this->stopOutputBuffering();
-        } catch (PHPUnit_Framework_RiskyTestError $_e) {
-            if (!isset($e)) {
-                $e = $_e;
-            }
-        }
-
-        clearstatcache();
-
-        if ($currentWorkingDirectory != getcwd()) {
-            chdir($currentWorkingDirectory);
-        }
-
-        $this->restoreGlobalState();
-
-        // Clean up INI settings.
-        foreach ($this->iniSettings as $varName => $oldValue) {
-            ini_set($varName, $oldValue);
-        }
-
-        $this->iniSettings = array();
-
-        // Clean up locale settings.
-        foreach ($this->locale as $category => $locale) {
-            setlocale($category, $locale);
-        }
-
-        // Perform assertion on output.
-        if (!isset($e)) {
-            try {
-                if ($this->outputExpectedRegex !== null) {
-                    $this->assertRegExp($this->outputExpectedRegex, $this->output);
-                } elseif ($this->outputExpectedString !== null) {
-                    $this->assertEquals($this->outputExpectedString, $this->output);
-                }
-            } catch (Throwable $_e) {
-                $e = $_e;
-            } catch (Exception $_e) {
-                $e = $_e;
-            }
-        }
-
-        // Workaround for missing "finally".
-        if (isset($e)) {
-            if ($e instanceof PredictionException) {
-                $e = new PHPUnit_Framework_AssertionFailedError($e->getMessage());
-            }
-
-            if (!$e instanceof Exception) {
-                // Rethrow Error directly on PHP 7 as onNotSuccessfulTest does not support it
-                throw $e;
-            }
-
-            $this->onNotSuccessfulTest($e);
-        }
-    }
-
-    /**
-     * Override to run the test and assert its state.
-     *
-     * @return mixed
-     * @throws Exception|PHPUnit_Framework_Exception
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function runTest()
-    {
-        if ($this->name === null) {
-            throw new PHPUnit_Framework_Exception(
-                'PHPUnit_Framework_TestCase::$name must not be null.'
-            );
-        }
-
-        try {
-            $class  = new ReflectionClass($this);
-            $method = $class->getMethod($this->name);
-        } catch (ReflectionException $e) {
-            $this->fail($e->getMessage());
-        }
-
-        try {
-            $testResult = $method->invokeArgs(
-                $this,
-                array_merge($this->data, $this->dependencyInput)
-            );
-        } catch (Throwable $_e) {
-            $e = $_e;
-        } catch (Exception $_e) {
-            $e = $_e;
-        }
-
-        if (isset($e)) {
-            $checkException = false;
-
-            if (is_string($this->expectedException)) {
-                $checkException = true;
-
-                if ($e instanceof PHPUnit_Framework_Exception) {
-                    $checkException = false;
-                }
-
-                $reflector = new ReflectionClass($this->expectedException);
-
-                if ($this->expectedException == 'PHPUnit_Framework_Exception' ||
-                    $reflector->isSubclassOf('PHPUnit_Framework_Exception')) {
-                    $checkException = true;
-                }
-            }
-
-            if ($checkException) {
-                $this->assertThat(
-                    $e,
-                    new PHPUnit_Framework_Constraint_Exception(
-                        $this->expectedException
-                    )
-                );
-
-                if (is_string($this->expectedExceptionMessage) &&
-                    !empty($this->expectedExceptionMessage)) {
-                    $this->assertThat(
-                        $e,
-                        new PHPUnit_Framework_Constraint_ExceptionMessage(
-                            $this->expectedExceptionMessage
-                        )
-                    );
-                }
-
-                if (is_string($this->expectedExceptionMessageRegExp) &&
-                    !empty($this->expectedExceptionMessageRegExp)) {
-                    $this->assertThat(
-                        $e,
-                        new PHPUnit_Framework_Constraint_ExceptionMessageRegExp(
-                            $this->expectedExceptionMessageRegExp
-                        )
-                    );
-                }
-
-                if ($this->expectedExceptionCode !== null) {
-                    $this->assertThat(
-                        $e,
-                        new PHPUnit_Framework_Constraint_ExceptionCode(
-                            $this->expectedExceptionCode
-                        )
-                    );
-                }
-
-                return;
-            } else {
-                throw $e;
-            }
-        }
-
-        if ($this->expectedException !== null) {
-            $this->assertThat(
-                null,
-                new PHPUnit_Framework_Constraint_Exception(
-                    $this->expectedException
-                )
-            );
-        }
-
-        return $testResult;
-    }
-
-    /**
-     * Verifies the mock object expectations.
-     *
-     * @since Method available since Release 3.5.0
-     */
-    protected function verifyMockObjects()
-    {
-        foreach ($this->mockObjects as $mockObject) {
-            if ($mockObject->__phpunit_hasMatchers()) {
-                $this->numAssertions++;
-            }
-
-            $mockObject->__phpunit_verify();
-        }
-
-        if ($this->prophet !== null) {
-            try {
-                $this->prophet->checkPredictions();
-            } catch (Throwable $t) {
-                /* Intentionally left empty */
-            } catch (Exception $e) {
-                /* Intentionally left empty */
-            }
-
-            foreach ($this->prophet->getProphecies() as $objectProphecy) {
-                foreach ($objectProphecy->getMethodProphecies() as $methodProphecies) {
-                    foreach ($methodProphecies as $methodProphecy) {
-                        $this->numAssertions += count($methodProphecy->getCheckedPredictions());
-                    }
-                }
-            }
-
-            if (isset($e)) {
-                throw $e;
-            }
-        }
-    }
-
-    /**
-     * Sets the name of a TestCase.
-     *
-     * @param  string
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Sets the dependencies of a TestCase.
-     *
-     * @param array $dependencies
-     * @since  Method available since Release 3.4.0
-     */
-    public function setDependencies(array $dependencies)
-    {
-        $this->dependencies = $dependencies;
-    }
-
-    /**
-     * Returns true if the tests has dependencies
-     *
-     * @return bool
-     * @since Method available since Release 4.0.0
-     */
-    public function hasDependencies()
-    {
-        return count($this->dependencies) > 0;
-    }
-
-    /**
-     * Sets
-     *
-     * @param array $dependencyInput
-     * @since  Method available since Release 3.4.0
-     */
-    public function setDependencyInput(array $dependencyInput)
-    {
-        $this->dependencyInput = $dependencyInput;
-    }
-
-    /**
-     * @param bool $disallowChangesToGlobalState
-     * @since Method available since Release 4.6.0
-     */
-    public function setDisallowChangesToGlobalState($disallowChangesToGlobalState)
-    {
-        $this->disallowChangesToGlobalState = $disallowChangesToGlobalState;
-    }
-
-    /**
-     * Calling this method in setUp() has no effect!
-     *
-     * @param bool $backupGlobals
-     * @since  Method available since Release 3.3.0
-     */
-    public function setBackupGlobals($backupGlobals)
-    {
-        if (is_null($this->backupGlobals) && is_bool($backupGlobals)) {
-            $this->backupGlobals = $backupGlobals;
-        }
-    }
-
-    /**
-     * Calling this method in setUp() has no effect!
-     *
-     * @param bool $backupStaticAttributes
-     * @since  Method available since Release 3.4.0
-     */
-    public function setBackupStaticAttributes($backupStaticAttributes)
-    {
-        if (is_null($this->backupStaticAttributes) &&
-            is_bool($backupStaticAttributes)) {
-            $this->backupStaticAttributes = $backupStaticAttributes;
-        }
-    }
-
-    /**
-     * @param  bool                        $runTestInSeparateProcess
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.4.0
-     */
-    public function setRunTestInSeparateProcess($runTestInSeparateProcess)
-    {
-        if (is_bool($runTestInSeparateProcess)) {
-            if ($this->runTestInSeparateProcess === null) {
-                $this->runTestInSeparateProcess = $runTestInSeparateProcess;
-            }
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-    }
-
-    /**
-     * @param  bool                        $preserveGlobalState
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.4.0
-     */
-    public function setPreserveGlobalState($preserveGlobalState)
-    {
-        if (is_bool($preserveGlobalState)) {
-            $this->preserveGlobalState = $preserveGlobalState;
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-    }
-
-    /**
-     * @param  bool                        $inIsolation
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.4.0
-     */
-    public function setInIsolation($inIsolation)
-    {
-        if (is_bool($inIsolation)) {
-            $this->inIsolation = $inIsolation;
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 4.3.0
-     */
-    public function isInIsolation()
-    {
-        return $this->inIsolation;
-    }
-
-    /**
-     * @return mixed
-     * @since  Method available since Release 3.4.0
-     */
-    public function getResult()
-    {
-        return $this->testResult;
-    }
-
-    /**
-     * @param mixed $result
-     * @since  Method available since Release 3.4.0
-     */
-    public function setResult($result)
-    {
-        $this->testResult = $result;
-    }
-
-    /**
-     * @param  callable                    $callback
-     * @throws PHPUnit_Framework_Exception
-     * @since Method available since Release 3.6.0
-     */
-    public function setOutputCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'callback');
-        }
-
-        $this->outputCallback = $callback;
-    }
-
-    /**
-     * @return PHPUnit_Framework_TestResult
-     * @since  Method available since Release 3.5.7
-     */
-    public function getTestResultObject()
-    {
-        return $this->result;
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     * @since Method available since Release 3.6.0
-     */
-    public function setTestResultObject(PHPUnit_Framework_TestResult $result)
-    {
-        $this->result = $result;
-    }
-
-    /**
-     * This method is a wrapper for the ini_set() function that automatically
-     * resets the modified php.ini setting to its original value after the
-     * test is run.
-     *
-     * @param  string                      $varName
-     * @param  string                      $newValue
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.0.0
-     */
-    protected function iniSet($varName, $newValue)
-    {
-        if (!is_string($varName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        $currentValue = ini_set($varName, $newValue);
-
-        if ($currentValue !== false) {
-            $this->iniSettings[$varName] = $currentValue;
-        } else {
-            throw new PHPUnit_Framework_Exception(
-                sprintf(
-                    'INI setting "%s" could not be set to "%s".',
-                    $varName,
-                    $newValue
-                )
-            );
-        }
-    }
-
-    /**
-     * This method is a wrapper for the setlocale() function that automatically
-     * resets the locale to its original value after the test is run.
-     *
-     * @param  int                         $category
-     * @param  string                      $locale
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.1.0
-     */
-    protected function setLocale()
-    {
-        $args = func_get_args();
-
-        if (count($args) < 2) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        $category = $args[0];
-        $locale   = $args[1];
-
-        $categories = array(
-            LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY, LC_NUMERIC, LC_TIME
-        );
-
-        if (defined('LC_MESSAGES')) {
-            $categories[] = LC_MESSAGES;
-        }
-
-        if (!in_array($category, $categories)) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        if (!is_array($locale) && !is_string($locale)) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        $this->locale[$category] = setlocale($category, null);
-
-        $result = call_user_func_array('setlocale', $args);
-
-        if ($result === false) {
-            throw new PHPUnit_Framework_Exception(
-                'The locale functionality is not implemented on your platform, ' .
-                'the specified locale does not exist or the category name is ' .
-                'invalid.'
-            );
-        }
-    }
-
-    /**
-     * Returns a mock object for the specified class.
-     *
-     * @param  string                                  $originalClassName       Name of the class to mock.
-     * @param  array|null                              $methods                 When provided, only methods whose names are in the array
-     *                                                                          are replaced with a configurable test double. The behavior
-     *                                                                          of the other methods is not changed.
-     *                                                                          Providing null means that no methods will be replaced.
-     * @param  array                                   $arguments               Parameters to pass to the original class' constructor.
-     * @param  string                                  $mockClassName           Class name for the generated test double class.
-     * @param  bool                                    $callOriginalConstructor Can be used to disable the call to the original class' constructor.
-     * @param  bool                                    $callOriginalClone       Can be used to disable the call to the original class' clone constructor.
-     * @param  bool                                    $callAutoload            Can be used to disable __autoload() during the generation of the test double class.
-     * @param  bool                                    $cloneArguments
-     * @param  bool                                    $callOriginalMethods
-     * @return PHPUnit_Framework_MockObject_MockObject
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.0.0
-     */
-    public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false)
-    {
-        $mockObject = $this->getMockObjectGenerator()->getMock(
-            $originalClassName,
-            $methods,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments,
-            $callOriginalMethods
-        );
-
-        $this->mockObjects[] = $mockObject;
-
-        return $mockObject;
-    }
-
-    /**
-     * Returns a builder object to create mock objects using a fluent interface.
-     *
-     * @param  string                                   $className
-     * @return PHPUnit_Framework_MockObject_MockBuilder
-     * @since  Method available since Release 3.5.0
-     */
-    public function getMockBuilder($className)
-    {
-        return new PHPUnit_Framework_MockObject_MockBuilder($this, $className);
-    }
-
-    /**
-     * Mocks the specified class and returns the name of the mocked class.
-     *
-     * @param  string                      $originalClassName
-     * @param  array                       $methods
-     * @param  array                       $arguments
-     * @param  string                      $mockClassName
-     * @param  bool                        $callOriginalConstructor
-     * @param  bool                        $callOriginalClone
-     * @param  bool                        $callAutoload
-     * @param  bool                        $cloneArguments
-     * @return string
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.5.0
-     */
-    protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
-    {
-        $mock = $this->getMock(
-            $originalClassName,
-            $methods,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments
-        );
-
-        return get_class($mock);
-    }
-
-    /**
-     * Returns a mock object for the specified abstract class with all abstract
-     * methods of the class mocked. Concrete methods are not mocked by default.
-     * To mock concrete methods, use the 7th parameter ($mockedMethods).
-     *
-     * @param  string                                  $originalClassName
-     * @param  array                                   $arguments
-     * @param  string                                  $mockClassName
-     * @param  bool                                    $callOriginalConstructor
-     * @param  bool                                    $callOriginalClone
-     * @param  bool                                    $callAutoload
-     * @param  array                                   $mockedMethods
-     * @param  bool                                    $cloneArguments
-     * @return PHPUnit_Framework_MockObject_MockObject
-     * @since  Method available since Release 3.4.0
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
-    {
-        $mockObject = $this->getMockObjectGenerator()->getMockForAbstractClass(
-            $originalClassName,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $mockedMethods,
-            $cloneArguments
-        );
-
-        $this->mockObjects[] = $mockObject;
-
-        return $mockObject;
-    }
-
-    /**
-     * Returns a mock object based on the given WSDL file.
-     *
-     * @param  string                                  $wsdlFile
-     * @param  string                                  $originalClassName
-     * @param  string                                  $mockClassName
-     * @param  array                                   $methods
-     * @param  bool                                    $callOriginalConstructor
-     * @param  array                                   $options                 An array of options passed to SOAPClient::_construct
-     * @return PHPUnit_Framework_MockObject_MockObject
-     * @since  Method available since Release 3.4.0
-     */
-    protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array())
-    {
-        if ($originalClassName === '') {
-            $originalClassName = str_replace('.wsdl', '', basename($wsdlFile));
-        }
-
-        if (!class_exists($originalClassName)) {
-            eval(
-            $this->getMockObjectGenerator()->generateClassFromWsdl(
-                $wsdlFile,
-                $originalClassName,
-                $methods,
-                $options
-            )
-            );
-        }
-
-        return $this->getMock(
-            $originalClassName,
-            $methods,
-            array('', $options),
-            $mockClassName,
-            $callOriginalConstructor,
-            false,
-            false
-        );
-    }
-
-    /**
-     * Returns a mock object for the specified trait with all abstract methods
-     * of the trait mocked. Concrete methods to mock can be specified with the
-     * `$mockedMethods` parameter.
-     *
-     * @param  string                                  $traitName
-     * @param  array                                   $arguments
-     * @param  string                                  $mockClassName
-     * @param  bool                                    $callOriginalConstructor
-     * @param  bool                                    $callOriginalClone
-     * @param  bool                                    $callAutoload
-     * @param  array                                   $mockedMethods
-     * @param  bool                                    $cloneArguments
-     * @return PHPUnit_Framework_MockObject_MockObject
-     * @since  Method available since Release 4.0.0
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
-    {
-        $mockObject = $this->getMockObjectGenerator()->getMockForTrait(
-            $traitName,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $mockedMethods,
-            $cloneArguments
-        );
-
-        $this->mockObjects[] = $mockObject;
-
-        return $mockObject;
-    }
-
-    /**
-     * Returns an object for the specified trait.
-     *
-     * @param  string $traitName
-     * @param  array  $arguments
-     * @param  string $traitClassName
-     * @param  bool   $callOriginalConstructor
-     * @param  bool   $callOriginalClone
-     * @param  bool   $callAutoload
-     * @param  bool   $cloneArguments
-     * @return object
-     * @since  Method available since Release 3.6.0
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
-    {
-        return $this->getMockObjectGenerator()->getObjectForTrait(
-            $traitName,
-            $arguments,
-            $traitClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments
-        );
-    }
-
-    /**
-     * @param  string|null                       $classOrInterface
-     * @return \Prophecy\Prophecy\ObjectProphecy
-     * @throws \LogicException
-     * @since  Method available since Release 4.5.0
-     */
-    protected function prophesize($classOrInterface = null)
-    {
-        return $this->getProphet()->prophesize($classOrInterface);
-    }
-
-    /**
-     * Adds a value to the assertion counter.
-     *
-     * @param int $count
-     * @since Method available since Release 3.3.3
-     */
-    public function addToAssertionCount($count)
-    {
-        $this->numAssertions += $count;
-    }
-
-    /**
-     * Returns the number of assertions performed by this test.
-     *
-     * @return int
-     * @since  Method available since Release 3.3.0
-     */
-    public function getNumAssertions()
-    {
-        return $this->numAssertions;
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed
-     * zero or more times.
-     *
-     * @return PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount
-     * @since  Method available since Release 3.0.0
-     */
-    public static function any()
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
-    }
-
-    /**
-     * Returns a matcher that matches when the method is never executed.
-     *
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
-     * @since  Method available since Release 3.0.0
-     */
-    public static function never()
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount(0);
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed
-     * at least N times.
-     *
-     * @param  int                                                      $requiredInvocations
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount
-     * @since  Method available since Release 4.2.0
-     */
-    public static function atLeast($requiredInvocations)
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount(
-            $requiredInvocations
-        );
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed at least once.
-     *
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce
-     * @since  Method available since Release 3.0.0
-     */
-    public static function atLeastOnce()
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce;
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed exactly once.
-     *
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
-     * @since  Method available since Release 3.0.0
-     */
-    public static function once()
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount(1);
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed
-     * exactly $count times.
-     *
-     * @param  int                                               $count
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
-     * @since  Method available since Release 3.0.0
-     */
-    public static function exactly($count)
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedCount($count);
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed
-     * at most N times.
-     *
-     * @param  int                                                     $allowedInvocations
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount
-     * @since  Method available since Release 4.2.0
-     */
-    public static function atMost($allowedInvocations)
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount(
-            $allowedInvocations
-        );
-    }
-
-    /**
-     * Returns a matcher that matches when the method is executed
-     * at the given index.
-     *
-     * @param  int                                                 $index
-     * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
-     * @since  Method available since Release 3.0.0
-     */
-    public static function at($index)
-    {
-        return new PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex($index);
-    }
-
-    /**
-     * @param  mixed                                    $value
-     * @return PHPUnit_Framework_MockObject_Stub_Return
-     * @since  Method available since Release 3.0.0
-     */
-    public static function returnValue($value)
-    {
-        return new PHPUnit_Framework_MockObject_Stub_Return($value);
-    }
-
-    /**
-     * @param  array                                            $valueMap
-     * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
-     * @since  Method available since Release 3.6.0
-     */
-    public static function returnValueMap(array $valueMap)
-    {
-        return new PHPUnit_Framework_MockObject_Stub_ReturnValueMap($valueMap);
-    }
-
-    /**
-     * @param  int                                              $argumentIndex
-     * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
-     * @since  Method available since Release 3.3.0
-     */
-    public static function returnArgument($argumentIndex)
-    {
-        return new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
-            $argumentIndex
-        );
-    }
-
-    /**
-     * @param  mixed                                            $callback
-     * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
-     * @since  Method available since Release 3.3.0
-     */
-    public static function returnCallback($callback)
-    {
-        return new PHPUnit_Framework_MockObject_Stub_ReturnCallback($callback);
-    }
-
-    /**
-     * Returns the current object.
-     *
-     * This method is useful when mocking a fluent interface.
-     *
-     * @return PHPUnit_Framework_MockObject_Stub_ReturnSelf
-     * @since  Method available since Release 3.6.0
-     */
-    public static function returnSelf()
-    {
-        return new PHPUnit_Framework_MockObject_Stub_ReturnSelf();
-    }
-
-    /**
-     * @param  Exception                                   $exception
-     * @return PHPUnit_Framework_MockObject_Stub_Exception
-     * @since  Method available since Release 3.1.0
-     */
-    public static function throwException(Exception $exception)
-    {
-        return new PHPUnit_Framework_MockObject_Stub_Exception($exception);
-    }
-
-    /**
-     * @param  mixed                                              $value, ...
-     * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
-     * @since  Method available since Release 3.0.0
-     */
-    public static function onConsecutiveCalls()
-    {
-        $args = func_get_args();
-
-        return new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
-    }
-
-    /**
-     * Gets the data set description of a TestCase.
-     *
-     * @param  bool   $includeData
-     * @return string
-     * @since  Method available since Release 3.3.0
-     */
-    protected function getDataSetAsString($includeData = true)
-    {
-        $buffer = '';
-
-        if (!empty($this->data)) {
-            if (is_int($this->dataName)) {
-                $buffer .= sprintf(' with data set #%d', $this->dataName);
-            } else {
-                $buffer .= sprintf(' with data set "%s"', $this->dataName);
-            }
-
-            $exporter = new Exporter;
-
-            if ($includeData) {
-                $buffer .= sprintf(' (%s)', $exporter->shortenedRecursiveExport($this->data));
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Creates a default TestResult object.
-     *
-     * @return PHPUnit_Framework_TestResult
-     */
-    protected function createResult()
-    {
-        return new PHPUnit_Framework_TestResult;
-    }
-
-    /**
-     * @since Method available since Release 3.5.4
-     */
-    protected function handleDependencies()
-    {
-        if (!empty($this->dependencies) && !$this->inIsolation) {
-            $className  = get_class($this);
-            $passed     = $this->result->passed();
-            $passedKeys = array_keys($passed);
-            $numKeys    = count($passedKeys);
-
-            for ($i = 0; $i < $numKeys; $i++) {
-                $pos = strpos($passedKeys[$i], ' with data set');
-
-                if ($pos !== false) {
-                    $passedKeys[$i] = substr($passedKeys[$i], 0, $pos);
-                }
-            }
-
-            $passedKeys = array_flip(array_unique($passedKeys));
-
-            foreach ($this->dependencies as $dependency) {
-                if (strpos($dependency, '::') === false) {
-                    $dependency = $className . '::' . $dependency;
-                }
-
-                if (!isset($passedKeys[$dependency])) {
-                    $this->result->addError(
-                        $this,
-                        new PHPUnit_Framework_SkippedTestError(
-                            sprintf(
-                                'This test depends on "%s" to pass.',
-                                $dependency
-                            )
-                        ),
-                        0
-                    );
-
-                    return false;
-                }
-
-                if (isset($passed[$dependency])) {
-                    if ($passed[$dependency]['size'] != PHPUnit_Util_Test::UNKNOWN &&
-                        $this->getSize() != PHPUnit_Util_Test::UNKNOWN &&
-                        $passed[$dependency]['size'] > $this->getSize()) {
-                        $this->result->addError(
-                            $this,
-                            new PHPUnit_Framework_SkippedTestError(
-                                'This test depends on a test that is larger than itself.'
-                            ),
-                            0
-                        );
-
-                        return false;
-                    }
-
-                    $this->dependencyInput[$dependency] = $passed[$dependency]['result'];
-                } else {
-                    $this->dependencyInput[$dependency] = null;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * This method is called before the first test of this test class is run.
-     *
-     * @since Method available since Release 3.4.0
-     */
-    public static function setUpBeforeClass()
-    {
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-    }
-
-    /**
-     * Performs assertions shared by all tests of a test case.
-     *
-     * This method is called before the execution of a test starts
-     * and after setUp() is called.
-     *
-     * @since  Method available since Release 3.2.8
-     */
-    protected function assertPreConditions()
-    {
-    }
-
-    /**
-     * Performs assertions shared by all tests of a test case.
-     *
-     * This method is called before the execution of a test ends
-     * and before tearDown() is called.
-     *
-     * @since  Method available since Release 3.2.8
-     */
-    protected function assertPostConditions()
-    {
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
-    /**
-     * This method is called after the last test of this test class is run.
-     *
-     * @since Method available since Release 3.4.0
-     */
-    public static function tearDownAfterClass()
-    {
-    }
-
-    /**
-     * This method is called when a test method did not execute successfully.
-     *
-     * @param Exception $e
-     * @since Method available since Release 3.4.0
-     * @throws Exception
-     */
-    protected function onNotSuccessfulTest(Exception $e)
-    {
-        throw $e;
-    }
-
-    /**
-     * Performs custom preparations on the process isolation template.
-     *
-     * @param Text_Template $template
-     * @since Method available since Release 3.4.0
-     */
-    protected function prepareTemplate(Text_Template $template)
-    {
-    }
-
-    /**
-     * Get the mock object generator, creating it if it doesn't exist.
-     *
-     * @return PHPUnit_Framework_MockObject_Generator
-     */
-    protected function getMockObjectGenerator()
-    {
-        if (null === $this->mockObjectGenerator) {
-            $this->mockObjectGenerator = new PHPUnit_Framework_MockObject_Generator;
-        }
-
-        return $this->mockObjectGenerator;
-    }
-
-    /**
-     * @since Method available since Release 4.2.0
-     */
-    private function startOutputBuffering()
-    {
-        while (!defined('PHPUNIT_TESTSUITE') && ob_get_level() > 0) {
-            ob_end_clean();
-        }
-
-        ob_start();
-
-        $this->outputBufferingActive = true;
-        $this->outputBufferingLevel  = ob_get_level();
-    }
-
-    /**
-     * @since Method available since Release 4.2.0
-     */
-    private function stopOutputBuffering()
-    {
-        if (ob_get_level() != $this->outputBufferingLevel) {
-            while (ob_get_level() > 0) {
-                ob_end_clean();
-            }
-
-            throw new PHPUnit_Framework_RiskyTestError(
-                'Test code or tested code did not (only) close its own output buffers'
-            );
-        }
-
-        $output = ob_get_contents();
-
-        if ($this->outputCallback === false) {
-            $this->output = $output;
-        } else {
-            $this->output = call_user_func_array(
-                $this->outputCallback,
-                array($output)
-            );
-        }
-
-        ob_end_clean();
-
-        $this->outputBufferingActive = false;
-        $this->outputBufferingLevel  = ob_get_level();
-    }
-
-    private function snapshotGlobalState()
-    {
-        $backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true;
-
-        if ($this->runTestInSeparateProcess || $this->inIsolation ||
-            (!$backupGlobals && !$this->backupStaticAttributes)) {
-            return;
-        }
-
-        $this->snapshot = $this->createGlobalStateSnapshot($backupGlobals);
-    }
-
-    private function restoreGlobalState()
-    {
-        if (!$this->snapshot instanceof Snapshot) {
-            return;
-        }
-
-        $backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true;
-
-        if ($this->disallowChangesToGlobalState) {
-            $this->compareGlobalStateSnapshots(
-                $this->snapshot,
-                $this->createGlobalStateSnapshot($backupGlobals)
-            );
-        }
-
-        $restorer = new Restorer;
-
-        if ($backupGlobals) {
-            $restorer->restoreGlobalVariables($this->snapshot);
-        }
-
-        if ($this->backupStaticAttributes) {
-            $restorer->restoreStaticAttributes($this->snapshot);
-        }
-
-        $this->snapshot = null;
-    }
-
-    /**
-     * @param  bool     $backupGlobals
-     * @return Snapshot
-     */
-    private function createGlobalStateSnapshot($backupGlobals)
-    {
-        $blacklist = new Blacklist;
-
-        foreach ($this->backupGlobalsBlacklist as $globalVariable) {
-            $blacklist->addGlobalVariable($globalVariable);
-        }
-
-        if (!defined('PHPUNIT_TESTSUITE')) {
-            $blacklist->addClassNamePrefix('PHPUnit');
-            $blacklist->addClassNamePrefix('File_Iterator');
-            $blacklist->addClassNamePrefix('PHP_CodeCoverage');
-            $blacklist->addClassNamePrefix('PHP_Invoker');
-            $blacklist->addClassNamePrefix('PHP_Timer');
-            $blacklist->addClassNamePrefix('PHP_Token');
-            $blacklist->addClassNamePrefix('Symfony');
-            $blacklist->addClassNamePrefix('Text_Template');
-            $blacklist->addClassNamePrefix('Doctrine\Instantiator');
-
-            foreach ($this->backupStaticAttributesBlacklist as $class => $attributes) {
-                foreach ($attributes as $attribute) {
-                    $blacklist->addStaticAttribute($class, $attribute);
-                }
-            }
-        }
-
-        return new Snapshot(
-            $blacklist,
-            $backupGlobals,
-            $this->backupStaticAttributes,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            false
-        );
-    }
-
-    /**
-     * @param  Snapshot                         $before
-     * @param  Snapshot                         $after
-     * @throws PHPUnit_Framework_RiskyTestError
-     */
-    private function compareGlobalStateSnapshots(Snapshot $before, Snapshot $after)
-    {
-        $backupGlobals = $this->backupGlobals === null || $this->backupGlobals === true;
-
-        if ($backupGlobals) {
-            $this->compareGlobalStateSnapshotPart(
-                $before->globalVariables(),
-                $after->globalVariables(),
-                "--- Global variables before the test\n+++ Global variables after the test\n"
-            );
-
-            $this->compareGlobalStateSnapshotPart(
-                $before->superGlobalVariables(),
-                $after->superGlobalVariables(),
-                "--- Super-global variables before the test\n+++ Super-global variables after the test\n"
-            );
-        }
-
-        if ($this->backupStaticAttributes) {
-            $this->compareGlobalStateSnapshotPart(
-                $before->staticAttributes(),
-                $after->staticAttributes(),
-                "--- Static attributes before the test\n+++ Static attributes after the test\n"
-            );
-        }
-    }
-
-    /**
-     * @param  array                            $before
-     * @param  array                            $after
-     * @param  string                           $header
-     * @throws PHPUnit_Framework_RiskyTestError
-     */
-    private function compareGlobalStateSnapshotPart(array $before, array $after, $header)
-    {
-        if ($before != $after) {
-            $differ   = new Differ($header);
-            $exporter = new Exporter;
-
-            $diff = $differ->diff(
-                $exporter->export($before),
-                $exporter->export($after)
-            );
-
-            throw new PHPUnit_Framework_RiskyTestError(
-                $diff
-            );
-        }
-    }
-
-    /**
-     * @return Prophecy\Prophet
-     * @since Method available since Release 4.5.0
-     */
-    private function getProphet()
-    {
-        if ($this->prophet === null) {
-            $this->prophet = new Prophet;
-        }
-
-        return $this->prophet;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestFailure.php b/vendor/phpunit/phpunit/src/Framework/TestFailure.php
deleted file mode 100644
index df1d5ef..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestFailure.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestFailure collects a failed test together with the caught exception.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_TestFailure
-{
-    /**
-     * @var string
-     */
-    private $testName;
-
-    /**
-     * @var PHPUnit_Framework_Test|null
-     */
-    protected $failedTest;
-
-    /**
-     * @var Exception
-     */
-    protected $thrownException;
-
-    /**
-     * Constructs a TestFailure with the given test and exception.
-     *
-     * @param PHPUnit_Framework_Test $failedTest
-     * @param Exception              $thrownException
-     */
-    public function __construct(PHPUnit_Framework_Test $failedTest, Exception $thrownException)
-    {
-        if ($failedTest instanceof PHPUnit_Framework_SelfDescribing) {
-            $this->testName = $failedTest->toString();
-        } else {
-            $this->testName = get_class($failedTest);
-        }
-        if (!$failedTest instanceof PHPUnit_Framework_TestCase || !$failedTest->isInIsolation()) {
-            $this->failedTest = $failedTest;
-        }
-        $this->thrownException = $thrownException;
-    }
-
-    /**
-     * Returns a short description of the failure.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return sprintf(
-            '%s: %s',
-            $this->testName,
-            $this->thrownException->getMessage()
-        );
-    }
-
-    /**
-     * Returns a description for the thrown exception.
-     *
-     * @return string
-     * @since  Method available since Release 3.4.0
-     */
-    public function getExceptionAsString()
-    {
-        return self::exceptionToString($this->thrownException);
-    }
-
-    /**
-     * Returns a description for an exception.
-     *
-     * @param  Exception $e
-     * @return string
-     * @since  Method available since Release 3.2.0
-     */
-    public static function exceptionToString(Exception $e)
-    {
-        if ($e instanceof PHPUnit_Framework_SelfDescribing) {
-            $buffer = $e->toString();
-
-            if ($e instanceof PHPUnit_Framework_ExpectationFailedException && $e->getComparisonFailure()) {
-                $buffer = $buffer . $e->getComparisonFailure()->getDiff();
-            }
-
-            if (!empty($buffer)) {
-                $buffer = trim($buffer) . "\n";
-            }
-        } elseif ($e instanceof PHPUnit_Framework_Error) {
-            $buffer = $e->getMessage() . "\n";
-        } elseif ($e instanceof PHPUnit_Framework_ExceptionWrapper) {
-            $buffer = $e->getClassname() . ': ' . $e->getMessage() . "\n";
-        } else {
-            $buffer = get_class($e) . ': ' . $e->getMessage() . "\n";
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the name of the failing test (including data set, if any).
-     *
-     * @return string
-     * @since  Method available since Release 4.3.0
-     */
-    public function getTestName()
-    {
-        return $this->testName;
-    }
-
-    /**
-     * Returns the failing test.
-     *
-     * Note: The test object is not set when the test is executed in process
-     * isolation.
-     *
-     * @see PHPUnit_Framework_Exception
-     *
-     * @return PHPUnit_Framework_Test|null
-     */
-    public function failedTest()
-    {
-        return $this->failedTest;
-    }
-
-    /**
-     * Gets the thrown exception.
-     *
-     * @return Exception
-     */
-    public function thrownException()
-    {
-        return $this->thrownException;
-    }
-
-    /**
-     * Returns the exception's message.
-     *
-     * @return string
-     */
-    public function exceptionMessage()
-    {
-        return $this->thrownException()->getMessage();
-    }
-
-    /**
-     * Returns true if the thrown exception
-     * is of type AssertionFailedError.
-     *
-     * @return bool
-     */
-    public function isFailure()
-    {
-        return ($this->thrownException() instanceof PHPUnit_Framework_AssertionFailedError);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestListener.php b/vendor/phpunit/phpunit/src/Framework/TestListener.php
deleted file mode 100644
index 056cab3..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestListener.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Listener for test progress.
- *
- * @since      Interface available since Release 2.0.0
- */
-interface PHPUnit_Framework_TestListener
-{
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time);
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time);
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time);
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time);
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time);
-
-    /**
-     * A test suite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite);
-
-    /**
-     * A test suite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite);
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test);
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time);
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestResult.php b/vendor/phpunit/phpunit/src/Framework/TestResult.php
deleted file mode 100644
index 41c5d0a..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestResult.php
+++ /dev/null
@@ -1,1083 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestResult collects the results of executing a test case.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_TestResult implements Countable
-{
-    /**
-     * @var array
-     */
-    protected $passed = array();
-
-    /**
-     * @var array
-     */
-    protected $errors = array();
-
-    /**
-     * @var array
-     */
-    protected $failures = array();
-
-    /**
-     * @var array
-     */
-    protected $notImplemented = array();
-
-    /**
-     * @var array
-     */
-    protected $risky = array();
-
-    /**
-     * @var array
-     */
-    protected $skipped = array();
-
-    /**
-     * @var array
-     */
-    protected $listeners = array();
-
-    /**
-     * @var int
-     */
-    protected $runTests = 0;
-
-    /**
-     * @var float
-     */
-    protected $time = 0;
-
-    /**
-     * @var PHPUnit_Framework_TestSuite
-     */
-    protected $topTestSuite = null;
-
-    /**
-     * Code Coverage information.
-     *
-     * @var PHP_CodeCoverage
-     */
-    protected $codeCoverage;
-
-    /**
-     * @var bool
-     */
-    protected $convertErrorsToExceptions = true;
-
-    /**
-     * @var bool
-     */
-    protected $stop = false;
-
-    /**
-     * @var bool
-     */
-    protected $stopOnError = false;
-
-    /**
-     * @var bool
-     */
-    protected $stopOnFailure = false;
-
-    /**
-     * @var bool
-     */
-    protected $beStrictAboutTestsThatDoNotTestAnything = false;
-
-    /**
-     * @var bool
-     */
-    protected $beStrictAboutOutputDuringTests = false;
-
-    /**
-     * @var bool
-     */
-    protected $beStrictAboutTestSize = false;
-
-    /**
-     * @var bool
-     */
-    protected $beStrictAboutTodoAnnotatedTests = false;
-
-    /**
-     * @var bool
-     */
-    protected $stopOnRisky = false;
-
-    /**
-     * @var bool
-     */
-    protected $stopOnIncomplete = false;
-
-    /**
-     * @var bool
-     */
-    protected $stopOnSkipped = false;
-
-    /**
-     * @var bool
-     */
-    protected $lastTestFailed = false;
-
-    /**
-     * @var int
-     */
-    protected $timeoutForSmallTests = 1;
-
-    /**
-     * @var int
-     */
-    protected $timeoutForMediumTests = 10;
-
-    /**
-     * @var int
-     */
-    protected $timeoutForLargeTests = 60;
-
-    /**
-     * Registers a TestListener.
-     *
-     * @param  PHPUnit_Framework_TestListener
-     */
-    public function addListener(PHPUnit_Framework_TestListener $listener)
-    {
-        $this->listeners[] = $listener;
-    }
-
-    /**
-     * Unregisters a TestListener.
-     *
-     * @param PHPUnit_Framework_TestListener $listener
-     */
-    public function removeListener(PHPUnit_Framework_TestListener $listener)
-    {
-        foreach ($this->listeners as $key => $_listener) {
-            if ($listener === $_listener) {
-                unset($this->listeners[$key]);
-            }
-        }
-    }
-
-    /**
-     * Flushes all flushable TestListeners.
-     *
-     * @since  Method available since Release 3.0.0
-     */
-    public function flushListeners()
-    {
-        foreach ($this->listeners as $listener) {
-            if ($listener instanceof PHPUnit_Util_Printer) {
-                $listener->flush();
-            }
-        }
-    }
-
-    /**
-     * Adds an error to the list of errors.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if ($e instanceof PHPUnit_Framework_RiskyTest) {
-            $this->risky[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod  = 'addRiskyTest';
-
-            if ($this->stopOnRisky) {
-                $this->stop();
-            }
-        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
-            $this->notImplemented[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod           = 'addIncompleteTest';
-
-            if ($this->stopOnIncomplete) {
-                $this->stop();
-            }
-        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
-            $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod    = 'addSkippedTest';
-
-            if ($this->stopOnSkipped) {
-                $this->stop();
-            }
-        } else {
-            $this->errors[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod   = 'addError';
-
-            if ($this->stopOnError || $this->stopOnFailure) {
-                $this->stop();
-            }
-        }
-
-        foreach ($this->listeners as $listener) {
-            $listener->$notifyMethod($test, $e, $time);
-        }
-
-        $this->lastTestFailed = true;
-        $this->time          += $time;
-    }
-
-    /**
-     * Adds a failure to the list of failures.
-     * The passed in exception caused the failure.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        if ($e instanceof PHPUnit_Framework_RiskyTest ||
-            $e instanceof PHPUnit_Framework_OutputError) {
-            $this->risky[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod  = 'addRiskyTest';
-
-            if ($this->stopOnRisky) {
-                $this->stop();
-            }
-        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
-            $this->notImplemented[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod           = 'addIncompleteTest';
-
-            if ($this->stopOnIncomplete) {
-                $this->stop();
-            }
-        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
-            $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod    = 'addSkippedTest';
-
-            if ($this->stopOnSkipped) {
-                $this->stop();
-            }
-        } else {
-            $this->failures[] = new PHPUnit_Framework_TestFailure($test, $e);
-            $notifyMethod     = 'addFailure';
-
-            if ($this->stopOnFailure) {
-                $this->stop();
-            }
-        }
-
-        foreach ($this->listeners as $listener) {
-            $listener->$notifyMethod($test, $e, $time);
-        }
-
-        $this->lastTestFailed = true;
-        $this->time          += $time;
-    }
-
-    /**
-     * Informs the result that a testsuite will be started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        if ($this->topTestSuite === null) {
-            $this->topTestSuite = $suite;
-        }
-
-        foreach ($this->listeners as $listener) {
-            $listener->startTestSuite($suite);
-        }
-    }
-
-    /**
-     * Informs the result that a testsuite was completed.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        foreach ($this->listeners as $listener) {
-            $listener->endTestSuite($suite);
-        }
-    }
-
-    /**
-     * Informs the result that a test will be started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        $this->lastTestFailed = false;
-        $this->runTests      += count($test);
-
-        foreach ($this->listeners as $listener) {
-            $listener->startTest($test);
-        }
-    }
-
-    /**
-     * Informs the result that a test was completed.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        foreach ($this->listeners as $listener) {
-            $listener->endTest($test, $time);
-        }
-
-        if (!$this->lastTestFailed && $test instanceof PHPUnit_Framework_TestCase) {
-            $class  = get_class($test);
-            $key    = $class . '::' . $test->getName();
-
-            $this->passed[$key] = array(
-                'result' => $test->getResult(),
-                'size'   => PHPUnit_Util_Test::getSize(
-                    $class,
-                    $test->getName(false)
-                )
-            );
-
-            $this->time += $time;
-        }
-    }
-
-    /**
-     * Returns true if no risky test occurred.
-     *
-     * @return bool
-     * @since  Method available since Release 4.0.0
-     */
-    public function allHarmless()
-    {
-        return $this->riskyCount() == 0;
-    }
-
-    /**
-     * Gets the number of risky tests.
-     *
-     * @return int
-     * @since  Method available since Release 4.0.0
-     */
-    public function riskyCount()
-    {
-        return count($this->risky);
-    }
-
-    /**
-     * Returns true if no incomplete test occurred.
-     *
-     * @return bool
-     */
-    public function allCompletelyImplemented()
-    {
-        return $this->notImplementedCount() == 0;
-    }
-
-    /**
-     * Gets the number of incomplete tests.
-     *
-     * @return int
-     */
-    public function notImplementedCount()
-    {
-        return count($this->notImplemented);
-    }
-
-    /**
-     * Returns an Enumeration for the risky tests.
-     *
-     * @return array
-     * @since  Method available since Release 4.0.0
-     */
-    public function risky()
-    {
-        return $this->risky;
-    }
-
-    /**
-     * Returns an Enumeration for the incomplete tests.
-     *
-     * @return array
-     */
-    public function notImplemented()
-    {
-        return $this->notImplemented;
-    }
-
-    /**
-     * Returns true if no test has been skipped.
-     *
-     * @return bool
-     * @since  Method available since Release 3.0.0
-     */
-    public function noneSkipped()
-    {
-        return $this->skippedCount() == 0;
-    }
-
-    /**
-     * Gets the number of skipped tests.
-     *
-     * @return int
-     * @since  Method available since Release 3.0.0
-     */
-    public function skippedCount()
-    {
-        return count($this->skipped);
-    }
-
-    /**
-     * Returns an Enumeration for the skipped tests.
-     *
-     * @return array
-     * @since  Method available since Release 3.0.0
-     */
-    public function skipped()
-    {
-        return $this->skipped;
-    }
-
-    /**
-     * Gets the number of detected errors.
-     *
-     * @return int
-     */
-    public function errorCount()
-    {
-        return count($this->errors);
-    }
-
-    /**
-     * Returns an Enumeration for the errors.
-     *
-     * @return array
-     */
-    public function errors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Gets the number of detected failures.
-     *
-     * @return int
-     */
-    public function failureCount()
-    {
-        return count($this->failures);
-    }
-
-    /**
-     * Returns an Enumeration for the failures.
-     *
-     * @return array
-     */
-    public function failures()
-    {
-        return $this->failures;
-    }
-
-    /**
-     * Returns the names of the tests that have passed.
-     *
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    public function passed()
-    {
-        return $this->passed;
-    }
-
-    /**
-     * Returns the (top) test suite.
-     *
-     * @return PHPUnit_Framework_TestSuite
-     * @since  Method available since Release 3.0.0
-     */
-    public function topTestSuite()
-    {
-        return $this->topTestSuite;
-    }
-
-    /**
-     * Returns whether code coverage information should be collected.
-     *
-     * @return bool If code coverage should be collected
-     * @since  Method available since Release 3.2.0
-     */
-    public function getCollectCodeCoverageInformation()
-    {
-        return $this->codeCoverage !== null;
-    }
-
-    /**
-     * Runs a TestCase.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function run(PHPUnit_Framework_Test $test)
-    {
-        PHPUnit_Framework_Assert::resetCount();
-
-        $error      = false;
-        $failure    = false;
-        $incomplete = false;
-        $risky      = false;
-        $skipped    = false;
-
-        $this->startTest($test);
-
-        $errorHandlerSet = false;
-
-        if ($this->convertErrorsToExceptions) {
-            $oldErrorHandler = set_error_handler(
-                array('PHPUnit_Util_ErrorHandler', 'handleError'),
-                E_ALL | E_STRICT
-            );
-
-            if ($oldErrorHandler === null) {
-                $errorHandlerSet = true;
-            } else {
-                restore_error_handler();
-            }
-        }
-
-        $collectCodeCoverage = $this->codeCoverage !== null &&
-                               !$test instanceof PHPUnit_Extensions_SeleniumTestCase &&
-                               !$test instanceof PHPUnit_Framework_Warning;
-
-        if ($collectCodeCoverage) {
-            // We need to blacklist test source files when no whitelist is used.
-            if (!$this->codeCoverage->filter()->hasWhitelist()) {
-                $classes = $this->getHierarchy(get_class($test), true);
-
-                foreach ($classes as $class) {
-                    $this->codeCoverage->filter()->addFileToBlacklist(
-                        $class->getFileName()
-                    );
-                }
-            }
-
-            $this->codeCoverage->start($test);
-        }
-
-        PHP_Timer::start();
-
-        try {
-            if (!$test instanceof PHPUnit_Framework_Warning &&
-                $test->getSize() != PHPUnit_Util_Test::UNKNOWN &&
-                $this->beStrictAboutTestSize &&
-                extension_loaded('pcntl') && class_exists('PHP_Invoker')) {
-                switch ($test->getSize()) {
-                    case PHPUnit_Util_Test::SMALL:
-                        $_timeout = $this->timeoutForSmallTests;
-                        break;
-
-                    case PHPUnit_Util_Test::MEDIUM:
-                        $_timeout = $this->timeoutForMediumTests;
-                        break;
-
-                    case PHPUnit_Util_Test::LARGE:
-                        $_timeout = $this->timeoutForLargeTests;
-                        break;
-                }
-
-                $invoker = new PHP_Invoker;
-                $invoker->invoke(array($test, 'runBare'), array(), $_timeout);
-            } else {
-                $test->runBare();
-            }
-        } catch (PHPUnit_Framework_AssertionFailedError $e) {
-            $failure = true;
-
-            if ($e instanceof PHPUnit_Framework_RiskyTestError) {
-                $risky = true;
-            } elseif ($e instanceof PHPUnit_Framework_IncompleteTestError) {
-                $incomplete = true;
-            } elseif ($e instanceof PHPUnit_Framework_SkippedTestError) {
-                $skipped = true;
-            }
-        } catch (PHPUnit_Framework_Exception $e) {
-            $error = true;
-        } catch (Throwable $e) {
-            $e     = new PHPUnit_Framework_ExceptionWrapper($e);
-            $error = true;
-        } catch (Exception $e) {
-            $e     = new PHPUnit_Framework_ExceptionWrapper($e);
-            $error = true;
-        }
-
-        $time = PHP_Timer::stop();
-        $test->addToAssertionCount(PHPUnit_Framework_Assert::getCount());
-
-        if ($this->beStrictAboutTestsThatDoNotTestAnything &&
-            $test->getNumAssertions() == 0) {
-            $risky = true;
-        }
-
-        if ($collectCodeCoverage) {
-            $append           = !$risky && !$incomplete && !$skipped;
-            $linesToBeCovered = array();
-            $linesToBeUsed    = array();
-
-            if ($append && $test instanceof PHPUnit_Framework_TestCase) {
-                $linesToBeCovered = PHPUnit_Util_Test::getLinesToBeCovered(
-                    get_class($test),
-                    $test->getName(false)
-                );
-
-                $linesToBeUsed = PHPUnit_Util_Test::getLinesToBeUsed(
-                    get_class($test),
-                    $test->getName(false)
-                );
-            }
-
-            try {
-                $this->codeCoverage->stop(
-                    $append,
-                    $linesToBeCovered,
-                    $linesToBeUsed
-                );
-            } catch (PHP_CodeCoverage_Exception_UnintentionallyCoveredCode $cce) {
-                $this->addFailure(
-                    $test,
-                    new PHPUnit_Framework_UnintentionallyCoveredCodeError(
-                        'This test executed code that is not listed as code to be covered or used:' .
-                        PHP_EOL . $cce->getMessage()
-                    ),
-                    $time
-                );
-            } catch (PHPUnit_Framework_InvalidCoversTargetException $cce) {
-                $this->addFailure(
-                    $test,
-                    new PHPUnit_Framework_InvalidCoversTargetError(
-                        $cce->getMessage()
-                    ),
-                    $time
-                );
-            } catch (PHP_CodeCoverage_Exception $cce) {
-                $error = true;
-
-                if (!isset($e)) {
-                    $e = $cce;
-                }
-            }
-        }
-
-        if ($errorHandlerSet === true) {
-            restore_error_handler();
-        }
-
-        if ($error === true) {
-            $this->addError($test, $e, $time);
-        } elseif ($failure === true) {
-            $this->addFailure($test, $e, $time);
-        } elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
-                 $test->getNumAssertions() == 0) {
-            $this->addFailure(
-                $test,
-                new PHPUnit_Framework_RiskyTestError(
-                    'This test did not perform any assertions'
-                ),
-                $time
-            );
-        } elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) {
-            $this->addFailure(
-                $test,
-                new PHPUnit_Framework_OutputError(
-                    sprintf(
-                        'This test printed output: %s',
-                        $test->getActualOutput()
-                    )
-                ),
-                $time
-            );
-        } elseif ($this->beStrictAboutTodoAnnotatedTests && $test instanceof PHPUnit_Framework_TestCase) {
-            $annotations = $test->getAnnotations();
-
-            if (isset($annotations['method']['todo'])) {
-                $this->addFailure(
-                    $test,
-                    new PHPUnit_Framework_RiskyTestError(
-                        'Test method is annotated with @todo'
-                    ),
-                    $time
-                );
-            }
-        }
-
-        $this->endTest($test, $time);
-    }
-
-    /**
-     * Gets the number of run tests.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return $this->runTests;
-    }
-
-    /**
-     * Checks whether the test run should stop.
-     *
-     * @return bool
-     */
-    public function shouldStop()
-    {
-        return $this->stop;
-    }
-
-    /**
-     * Marks that the test run should stop.
-     */
-    public function stop()
-    {
-        $this->stop = true;
-    }
-
-    /**
-     * Returns the PHP_CodeCoverage object.
-     *
-     * @return PHP_CodeCoverage
-     * @since  Method available since Release 3.5.0
-     */
-    public function getCodeCoverage()
-    {
-        return $this->codeCoverage;
-    }
-
-    /**
-     * Sets the PHP_CodeCoverage object.
-     *
-     * @param PHP_CodeCoverage $codeCoverage
-     * @since Method available since Release 3.6.0
-     */
-    public function setCodeCoverage(PHP_CodeCoverage $codeCoverage)
-    {
-        $this->codeCoverage = $codeCoverage;
-    }
-
-    /**
-     * Enables or disables the error-to-exception conversion.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.2.14
-     */
-    public function convertErrorsToExceptions($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->convertErrorsToExceptions = $flag;
-    }
-
-    /**
-     * Returns the error-to-exception conversion setting.
-     *
-     * @return bool
-     * @since  Method available since Release 3.4.0
-     */
-    public function getConvertErrorsToExceptions()
-    {
-        return $this->convertErrorsToExceptions;
-    }
-
-    /**
-     * Enables or disables the stopping when an error occurs.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.5.0
-     */
-    public function stopOnError($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->stopOnError = $flag;
-    }
-
-    /**
-     * Enables or disables the stopping when a failure occurs.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.1.0
-     */
-    public function stopOnFailure($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->stopOnFailure = $flag;
-    }
-
-    /**
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public function beStrictAboutTestsThatDoNotTestAnything($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->beStrictAboutTestsThatDoNotTestAnything = $flag;
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 4.0.0
-     */
-    public function isStrictAboutTestsThatDoNotTestAnything()
-    {
-        return $this->beStrictAboutTestsThatDoNotTestAnything;
-    }
-
-    /**
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public function beStrictAboutOutputDuringTests($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->beStrictAboutOutputDuringTests = $flag;
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 4.0.0
-     */
-    public function isStrictAboutOutputDuringTests()
-    {
-        return $this->beStrictAboutOutputDuringTests;
-    }
-
-    /**
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public function beStrictAboutTestSize($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->beStrictAboutTestSize = $flag;
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 4.0.0
-     */
-    public function isStrictAboutTestSize()
-    {
-        return $this->beStrictAboutTestSize;
-    }
-
-    /**
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.2.0
-     */
-    public function beStrictAboutTodoAnnotatedTests($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->beStrictAboutTodoAnnotatedTests = $flag;
-    }
-
-    /**
-     * @return bool
-     * @since  Method available since Release 4.2.0
-     */
-    public function isStrictAboutTodoAnnotatedTests()
-    {
-        return $this->beStrictAboutTodoAnnotatedTests;
-    }
-
-    /**
-     * Enables or disables the stopping for risky tests.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 4.0.0
-     */
-    public function stopOnRisky($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->stopOnRisky = $flag;
-    }
-
-    /**
-     * Enables or disables the stopping for incomplete tests.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.5.0
-     */
-    public function stopOnIncomplete($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->stopOnIncomplete = $flag;
-    }
-
-    /**
-     * Enables or disables the stopping for skipped tests.
-     *
-     * @param  bool                        $flag
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.1.0
-     */
-    public function stopOnSkipped($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-
-        $this->stopOnSkipped = $flag;
-    }
-
-    /**
-     * Returns the time spent running the tests.
-     *
-     * @return float
-     */
-    public function time()
-    {
-        return $this->time;
-    }
-
-    /**
-     * Returns whether the entire test was successful or not.
-     *
-     * @return bool
-     */
-    public function wasSuccessful()
-    {
-        return empty($this->errors) && empty($this->failures);
-    }
-
-    /**
-     * Sets the timeout for small tests.
-     *
-     * @param  int                         $timeout
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.6.0
-     */
-    public function setTimeoutForSmallTests($timeout)
-    {
-        if (!is_integer($timeout)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
-        }
-
-        $this->timeoutForSmallTests = $timeout;
-    }
-
-    /**
-     * Sets the timeout for medium tests.
-     *
-     * @param  int                         $timeout
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.6.0
-     */
-    public function setTimeoutForMediumTests($timeout)
-    {
-        if (!is_integer($timeout)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
-        }
-
-        $this->timeoutForMediumTests = $timeout;
-    }
-
-    /**
-     * Sets the timeout for large tests.
-     *
-     * @param  int                         $timeout
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.6.0
-     */
-    public function setTimeoutForLargeTests($timeout)
-    {
-        if (!is_integer($timeout)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
-        }
-
-        $this->timeoutForLargeTests = $timeout;
-    }
-
-    /**
-     * Returns the class hierarchy for a given class.
-     *
-     * @param  string $className
-     * @param  bool   $asReflectionObjects
-     * @return array
-     */
-    protected function getHierarchy($className, $asReflectionObjects = false)
-    {
-        if ($asReflectionObjects) {
-            $classes = array(new ReflectionClass($className));
-        } else {
-            $classes = array($className);
-        }
-
-        $done = false;
-
-        while (!$done) {
-            if ($asReflectionObjects) {
-                $class = new ReflectionClass(
-                    $classes[count($classes) - 1]->getName()
-                );
-            } else {
-                $class = new ReflectionClass($classes[count($classes) - 1]);
-            }
-
-            $parent = $class->getParentClass();
-
-            if ($parent !== false) {
-                if ($asReflectionObjects) {
-                    $classes[] = $parent;
-                } else {
-                    $classes[] = $parent->getName();
-                }
-            } else {
-                $done = true;
-            }
-        }
-
-        return $classes;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite.php b/vendor/phpunit/phpunit/src/Framework/TestSuite.php
deleted file mode 100644
index 7674f2d..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestSuite.php
+++ /dev/null
@@ -1,1007 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestSuite is a composite of Tests. It runs a collection of test cases.
- *
- * Here is an example using the dynamic test definition.
- *
- * <code>
- * <?php
- * $suite = new PHPUnit_Framework_TestSuite;
- * $suite->addTest(new MathTest('testPass'));
- * ?>
- * </code>
- *
- * Alternatively, a TestSuite can extract the tests to be run automatically.
- * To do so you pass a ReflectionClass instance for your
- * PHPUnit_Framework_TestCase class to the PHPUnit_Framework_TestSuite
- * constructor.
- *
- * <code>
- * <?php
- * $suite = new PHPUnit_Framework_TestSuite(
- *   new ReflectionClass('MathTest')
- * );
- * ?>
- * </code>
- *
- * This constructor creates a suite with all the methods starting with
- * "test" that take no arguments.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing, IteratorAggregate
-{
-    /**
-     * Last count of tests in this suite.
-     *
-     * @var int|null
-     */
-    private $cachedNumTests;
-
-    /**
-     * Enable or disable the backup and restoration of the $GLOBALS array.
-     *
-     * @var bool
-     */
-    protected $backupGlobals = null;
-
-    /**
-     * Enable or disable the backup and restoration of static attributes.
-     *
-     * @var bool
-     */
-    protected $backupStaticAttributes = null;
-
-    /**
-     * @var bool
-     */
-    private $disallowChangesToGlobalState = null;
-
-    /**
-     * @var bool
-     */
-    protected $runTestInSeparateProcess = false;
-
-    /**
-     * The name of the test suite.
-     *
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * The test groups of the test suite.
-     *
-     * @var array
-     */
-    protected $groups = array();
-
-    /**
-     * The tests in the test suite.
-     *
-     * @var array
-     */
-    protected $tests = array();
-
-    /**
-     * The number of tests in the test suite.
-     *
-     * @var int
-     */
-    protected $numTests = -1;
-
-    /**
-     * @var bool
-     */
-    protected $testCase = false;
-
-    /**
-     * @var array
-     */
-    protected $foundClasses = array();
-
-    /**
-     * @var PHPUnit_Runner_Filter_Factory
-     */
-    private $iteratorFilter = null;
-
-    /**
-     * Constructs a new TestSuite:
-     *
-     *   - PHPUnit_Framework_TestSuite() constructs an empty TestSuite.
-     *
-     *   - PHPUnit_Framework_TestSuite(ReflectionClass) constructs a
-     *     TestSuite from the given class.
-     *
-     *   - PHPUnit_Framework_TestSuite(ReflectionClass, String)
-     *     constructs a TestSuite from the given class with the given
-     *     name.
-     *
-     *   - PHPUnit_Framework_TestSuite(String) either constructs a
-     *     TestSuite from the given class (if the passed string is the
-     *     name of an existing class) or constructs an empty TestSuite
-     *     with the given name.
-     *
-     * @param  mixed                       $theClass
-     * @param  string                      $name
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($theClass = '', $name = '')
-    {
-        $argumentsValid = false;
-
-        if (is_object($theClass) &&
-            $theClass instanceof ReflectionClass) {
-            $argumentsValid = true;
-        } elseif (is_string($theClass) &&
-                 $theClass !== '' &&
-                 class_exists($theClass, false)) {
-            $argumentsValid = true;
-
-            if ($name == '') {
-                $name = $theClass;
-            }
-
-            $theClass = new ReflectionClass($theClass);
-        } elseif (is_string($theClass)) {
-            $this->setName($theClass);
-
-            return;
-        }
-
-        if (!$argumentsValid) {
-            throw new PHPUnit_Framework_Exception;
-        }
-
-        if (!$theClass->isSubclassOf('PHPUnit_Framework_TestCase')) {
-            throw new PHPUnit_Framework_Exception(
-                'Class "' . $theClass->name . '" does not extend PHPUnit_Framework_TestCase.'
-            );
-        }
-
-        if ($name != '') {
-            $this->setName($name);
-        } else {
-            $this->setName($theClass->getName());
-        }
-
-        $constructor = $theClass->getConstructor();
-
-        if ($constructor !== null &&
-            !$constructor->isPublic()) {
-            $this->addTest(
-                self::warning(
-                    sprintf(
-                        'Class "%s" has no public constructor.',
-                        $theClass->getName()
-                    )
-                )
-            );
-
-            return;
-        }
-
-        foreach ($theClass->getMethods() as $method) {
-            $this->addTestMethod($theClass, $method);
-        }
-
-        if (empty($this->tests)) {
-            $this->addTest(
-                self::warning(
-                    sprintf(
-                        'No tests found in class "%s".',
-                        $theClass->getName()
-                    )
-                )
-            );
-        }
-
-        $this->testCase = true;
-    }
-
-    /**
-     * Returns a string representation of the test suite.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Adds a test to the suite.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param array                  $groups
-     */
-    public function addTest(PHPUnit_Framework_Test $test, $groups = array())
-    {
-        $class = new ReflectionClass($test);
-
-        if (!$class->isAbstract()) {
-            $this->tests[]  = $test;
-            $this->numTests = -1;
-
-            if ($test instanceof self &&
-                empty($groups)) {
-                $groups = $test->getGroups();
-            }
-
-            if (empty($groups)) {
-                $groups = array('default');
-            }
-
-            foreach ($groups as $group) {
-                if (!isset($this->groups[$group])) {
-                    $this->groups[$group] = array($test);
-                } else {
-                    $this->groups[$group][] = $test;
-                }
-            }
-        }
-    }
-
-    /**
-     * Adds the tests from the given class to the suite.
-     *
-     * @param  mixed                       $testClass
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function addTestSuite($testClass)
-    {
-        if (is_string($testClass) && class_exists($testClass)) {
-            $testClass = new ReflectionClass($testClass);
-        }
-
-        if (!is_object($testClass)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'class name or object'
-            );
-        }
-
-        if ($testClass instanceof self) {
-            $this->addTest($testClass);
-        } elseif ($testClass instanceof ReflectionClass) {
-            $suiteMethod = false;
-
-            if (!$testClass->isAbstract()) {
-                if ($testClass->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) {
-                    $method = $testClass->getMethod(
-                        PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME
-                    );
-
-                    if ($method->isStatic()) {
-                        $this->addTest(
-                            $method->invoke(null, $testClass->getName())
-                        );
-
-                        $suiteMethod = true;
-                    }
-                }
-            }
-
-            if (!$suiteMethod && !$testClass->isAbstract()) {
-                $this->addTest(new self($testClass));
-            }
-        } else {
-            throw new PHPUnit_Framework_Exception;
-        }
-    }
-
-    /**
-     * Wraps both <code>addTest()</code> and <code>addTestSuite</code>
-     * as well as the separate import statements for the user's convenience.
-     *
-     * If the named file cannot be read or there are no new tests that can be
-     * added, a <code>PHPUnit_Framework_Warning</code> will be created instead,
-     * leaving the current test run untouched.
-     *
-     * @param  string                      $filename
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 2.3.0
-     */
-    public function addTestFile($filename)
-    {
-        if (!is_string($filename)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (file_exists($filename) && substr($filename, -5) == '.phpt') {
-            $this->addTest(
-                new PHPUnit_Extensions_PhptTestCase($filename)
-            );
-
-            return;
-        }
-
-        // The given file may contain further stub classes in addition to the
-        // test class itself. Figure out the actual test class.
-        $classes    = get_declared_classes();
-        $filename   = PHPUnit_Util_Fileloader::checkAndLoad($filename);
-        $newClasses = array_diff(get_declared_classes(), $classes);
-
-        // The diff is empty in case a parent class (with test methods) is added
-        // AFTER a child class that inherited from it. To account for that case,
-        // cumulate all discovered classes, so the parent class may be found in
-        // a later invocation.
-        if ($newClasses) {
-            // On the assumption that test classes are defined first in files,
-            // process discovered classes in approximate LIFO order, so as to
-            // avoid unnecessary reflection.
-            $this->foundClasses = array_merge($newClasses, $this->foundClasses);
-        }
-
-        // The test class's name must match the filename, either in full, or as
-        // a PEAR/PSR-0 prefixed shortname ('NameSpace_ShortName'), or as a
-        // PSR-1 local shortname ('NameSpace\ShortName'). The comparison must be
-        // anchored to prevent false-positive matches (e.g., 'OtherShortName').
-        $shortname      = basename($filename, '.php');
-        $shortnameRegEx = '/(?:^|_|\\\\)' . preg_quote($shortname, '/') . '$/';
-
-        foreach ($this->foundClasses as $i => $className) {
-            if (preg_match($shortnameRegEx, $className)) {
-                $class = new ReflectionClass($className);
-
-                if ($class->getFileName() == $filename) {
-                    $newClasses = array($className);
-                    unset($this->foundClasses[$i]);
-                    break;
-                }
-            }
-        }
-
-        foreach ($newClasses as $className) {
-            $class = new ReflectionClass($className);
-
-            if (!$class->isAbstract()) {
-                if ($class->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) {
-                    $method = $class->getMethod(
-                        PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME
-                    );
-
-                    if ($method->isStatic()) {
-                        $this->addTest($method->invoke(null, $className));
-                    }
-                } elseif ($class->implementsInterface('PHPUnit_Framework_Test')) {
-                    $this->addTestSuite($class);
-                }
-            }
-        }
-
-        $this->numTests = -1;
-    }
-
-    /**
-     * Wrapper for addTestFile() that adds multiple test files.
-     *
-     * @param  array|Iterator              $filenames
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 2.3.0
-     */
-    public function addTestFiles($filenames)
-    {
-        if (!(is_array($filenames) ||
-             (is_object($filenames) && $filenames instanceof Iterator))) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                1,
-                'array or iterator'
-            );
-        }
-
-        foreach ($filenames as $filename) {
-            $this->addTestFile((string) $filename);
-        }
-    }
-
-    /**
-     * Counts the number of test cases that will be run by this test.
-     *
-     * @param  bool $preferCache Indicates if cache is preferred.
-     * @return int
-     */
-    public function count($preferCache = false)
-    {
-        if ($preferCache && $this->cachedNumTests != null) {
-            $numTests = $this->cachedNumTests;
-        } else {
-            $numTests = 0;
-            foreach ($this as $test) {
-                $numTests += count($test);
-            }
-            $this->cachedNumTests = $numTests;
-        }
-
-        return $numTests;
-    }
-
-    /**
-     * @param  ReflectionClass             $theClass
-     * @param  string                      $name
-     * @return PHPUnit_Framework_Test
-     * @throws PHPUnit_Framework_Exception
-     */
-    public static function createTest(ReflectionClass $theClass, $name)
-    {
-        $className = $theClass->getName();
-
-        if (!$theClass->isInstantiable()) {
-            return self::warning(
-                sprintf('Cannot instantiate class "%s".', $className)
-            );
-        }
-
-        $backupSettings = PHPUnit_Util_Test::getBackupSettings(
-            $className,
-            $name
-        );
-
-        $preserveGlobalState = PHPUnit_Util_Test::getPreserveGlobalStateSettings(
-            $className,
-            $name
-        );
-
-        $runTestInSeparateProcess = PHPUnit_Util_Test::getProcessIsolationSettings(
-            $className,
-            $name
-        );
-
-        $constructor = $theClass->getConstructor();
-
-        if ($constructor !== null) {
-            $parameters = $constructor->getParameters();
-
-            // TestCase() or TestCase($name)
-            if (count($parameters) < 2) {
-                $test = new $className;
-            } // TestCase($name, $data)
-            else {
-                try {
-                    $data = PHPUnit_Util_Test::getProvidedData(
-                        $className,
-                        $name
-                    );
-                } catch (PHPUnit_Framework_IncompleteTestError $e) {
-                    $message = sprintf(
-                        'Test for %s::%s marked incomplete by data provider',
-                        $className,
-                        $name
-                    );
-
-                    $_message = $e->getMessage();
-
-                    if (!empty($_message)) {
-                        $message .= "\n" . $_message;
-                    }
-
-                    $data = self::incompleteTest($className, $name, $message);
-                } catch (PHPUnit_Framework_SkippedTestError $e) {
-                    $message = sprintf(
-                        'Test for %s::%s skipped by data provider',
-                        $className,
-                        $name
-                    );
-
-                    $_message = $e->getMessage();
-
-                    if (!empty($_message)) {
-                        $message .= "\n" . $_message;
-                    }
-
-                    $data = self::skipTest($className, $name, $message);
-                } catch (Throwable $_t) {
-                    $t = $_t;
-                } catch (Exception $_t) {
-                    $t = $_t;
-                }
-
-                if (isset($t)) {
-                    $message = sprintf(
-                        'The data provider specified for %s::%s is invalid.',
-                        $className,
-                        $name
-                    );
-
-                    $_message = $t->getMessage();
-
-                    if (!empty($_message)) {
-                        $message .= "\n" . $_message;
-                    }
-
-                    $data = self::warning($message);
-                }
-
-                // Test method with @dataProvider.
-                if (isset($data)) {
-                    $test = new PHPUnit_Framework_TestSuite_DataProvider(
-                        $className . '::' . $name
-                    );
-
-                    if (empty($data)) {
-                        $data = self::warning(
-                            sprintf(
-                                'No tests found in suite "%s".',
-                                $test->getName()
-                            )
-                        );
-                    }
-
-                    $groups = PHPUnit_Util_Test::getGroups($className, $name);
-
-                    if ($data instanceof PHPUnit_Framework_Warning ||
-                        $data instanceof PHPUnit_Framework_SkippedTestCase ||
-                        $data instanceof PHPUnit_Framework_IncompleteTestCase) {
-                        $test->addTest($data, $groups);
-                    } else {
-                        foreach ($data as $_dataName => $_data) {
-                            $_test = new $className($name, $_data, $_dataName);
-
-                            if ($runTestInSeparateProcess) {
-                                $_test->setRunTestInSeparateProcess(true);
-
-                                if ($preserveGlobalState !== null) {
-                                    $_test->setPreserveGlobalState($preserveGlobalState);
-                                }
-                            }
-
-                            if ($backupSettings['backupGlobals'] !== null) {
-                                $_test->setBackupGlobals(
-                                    $backupSettings['backupGlobals']
-                                );
-                            }
-
-                            if ($backupSettings['backupStaticAttributes'] !== null) {
-                                $_test->setBackupStaticAttributes(
-                                    $backupSettings['backupStaticAttributes']
-                                );
-                            }
-
-                            $test->addTest($_test, $groups);
-                        }
-                    }
-                } else {
-                    $test = new $className;
-                }
-            }
-        }
-
-        if (!isset($test)) {
-            throw new PHPUnit_Framework_Exception('No valid test provided.');
-        }
-
-        if ($test instanceof PHPUnit_Framework_TestCase) {
-            $test->setName($name);
-
-            if ($runTestInSeparateProcess) {
-                $test->setRunTestInSeparateProcess(true);
-
-                if ($preserveGlobalState !== null) {
-                    $test->setPreserveGlobalState($preserveGlobalState);
-                }
-            }
-
-            if ($backupSettings['backupGlobals'] !== null) {
-                $test->setBackupGlobals($backupSettings['backupGlobals']);
-            }
-
-            if ($backupSettings['backupStaticAttributes'] !== null) {
-                $test->setBackupStaticAttributes(
-                    $backupSettings['backupStaticAttributes']
-                );
-            }
-        }
-
-        return $test;
-    }
-
-    /**
-     * Creates a default TestResult object.
-     *
-     * @return PHPUnit_Framework_TestResult
-     */
-    protected function createResult()
-    {
-        return new PHPUnit_Framework_TestResult;
-    }
-
-    /**
-     * Returns the name of the suite.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the test groups of the suite.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.0
-     */
-    public function getGroups()
-    {
-        return array_keys($this->groups);
-    }
-
-    public function getGroupDetails()
-    {
-        return $this->groups;
-    }
-
-    /**
-     * Set tests groups of the test case
-     *
-     * @param array $groups
-     * @since Method available since Release 4.0.0
-     */
-    public function setGroupDetails(array $groups)
-    {
-        $this->groups = $groups;
-    }
-
-    /**
-     * Runs the tests and collects their result in a TestResult.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function run(PHPUnit_Framework_TestResult $result = null)
-    {
-        if ($result === null) {
-            $result = $this->createResult();
-        }
-
-        if (count($this) == 0) {
-            return $result;
-        }
-
-        $hookMethods = PHPUnit_Util_Test::getHookMethods($this->name);
-
-        $result->startTestSuite($this);
-
-        try {
-            $this->setUp();
-
-            foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
-                if ($this->testCase === true &&
-                    class_exists($this->name, false) &&
-                    method_exists($this->name, $beforeClassMethod)) {
-                    if ($missingRequirements = PHPUnit_Util_Test::getMissingRequirements($this->name, $beforeClassMethod)) {
-                        $this->markTestSuiteSkipped(implode(PHP_EOL, $missingRequirements));
-                    }
-
-                    call_user_func(array($this->name, $beforeClassMethod));
-                }
-            }
-        } catch (PHPUnit_Framework_SkippedTestSuiteError $e) {
-            $numTests = count($this);
-
-            for ($i = 0; $i < $numTests; $i++) {
-                $result->startTest($this);
-                $result->addFailure($this, $e, 0);
-                $result->endTest($this, 0);
-            }
-
-            $this->tearDown();
-            $result->endTestSuite($this);
-
-            return $result;
-        } catch (Throwable $_t) {
-            $t = $_t;
-        } catch (Exception $_t) {
-            $t = $_t;
-        }
-
-        if (isset($t)) {
-            $numTests = count($this);
-
-            for ($i = 0; $i < $numTests; $i++) {
-                $result->startTest($this);
-                $result->addError($this, $t, 0);
-                $result->endTest($this, 0);
-            }
-
-            $this->tearDown();
-            $result->endTestSuite($this);
-
-            return $result;
-        }
-
-        foreach ($this as $test) {
-            if ($result->shouldStop()) {
-                break;
-            }
-
-            if ($test instanceof PHPUnit_Framework_TestCase ||
-                $test instanceof self) {
-                $test->setDisallowChangesToGlobalState($this->disallowChangesToGlobalState);
-                $test->setBackupGlobals($this->backupGlobals);
-                $test->setBackupStaticAttributes($this->backupStaticAttributes);
-                $test->setRunTestInSeparateProcess($this->runTestInSeparateProcess);
-            }
-
-            $test->run($result);
-        }
-
-        foreach ($hookMethods['afterClass'] as $afterClassMethod) {
-            if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $afterClassMethod)) {
-                call_user_func(array($this->name, $afterClassMethod));
-            }
-        }
-
-        $this->tearDown();
-
-        $result->endTestSuite($this);
-
-        return $result;
-    }
-
-    /**
-     * @param  bool                        $runTestInSeparateProcess
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.7.0
-     */
-    public function setRunTestInSeparateProcess($runTestInSeparateProcess)
-    {
-        if (is_bool($runTestInSeparateProcess)) {
-            $this->runTestInSeparateProcess = $runTestInSeparateProcess;
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-    }
-
-    /**
-     * Runs a test.
-     *
-     * @deprecated
-     * @param PHPUnit_Framework_Test       $test
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    public function runTest(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
-    {
-        $test->run($result);
-    }
-
-    /**
-     * Sets the name of the suite.
-     *
-     * @param  string
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Returns the test at the given index.
-     *
-     * @param  int
-     * @return PHPUnit_Framework_Test
-     */
-    public function testAt($index)
-    {
-        if (isset($this->tests[$index])) {
-            return $this->tests[$index];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the tests as an enumeration.
-     *
-     * @return array
-     */
-    public function tests()
-    {
-        return $this->tests;
-    }
-
-    /**
-     * Set tests of the test suite
-     *
-     * @param array $tests
-     * @since Method available since Release 4.0.0
-     */
-    public function setTests(array $tests)
-    {
-        $this->tests = $tests;
-    }
-
-    /**
-     * Mark the test suite as skipped.
-     *
-     * @param  string                                  $message
-     * @throws PHPUnit_Framework_SkippedTestSuiteError
-     * @since  Method available since Release 3.0.0
-     */
-    public function markTestSuiteSkipped($message = '')
-    {
-        throw new PHPUnit_Framework_SkippedTestSuiteError($message);
-    }
-
-    /**
-     * @param ReflectionClass  $class
-     * @param ReflectionMethod $method
-     */
-    protected function addTestMethod(ReflectionClass $class, ReflectionMethod $method)
-    {
-        if (!$this->isTestMethod($method)) {
-            return;
-        }
-
-        $name = $method->getName();
-
-        if (!$method->isPublic()) {
-            $this->addTest(
-                self::warning(
-                    sprintf(
-                        'Test method "%s" in test class "%s" is not public.',
-                        $name,
-                        $class->getName()
-                    )
-                )
-            );
-
-            return;
-        }
-
-        $test = self::createTest($class, $name);
-
-        if ($test instanceof PHPUnit_Framework_TestCase ||
-            $test instanceof PHPUnit_Framework_TestSuite_DataProvider) {
-            $test->setDependencies(
-                PHPUnit_Util_Test::getDependencies($class->getName(), $name)
-            );
-        }
-
-        $this->addTest(
-            $test,
-            PHPUnit_Util_Test::getGroups($class->getName(), $name)
-        );
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     */
-    public static function isTestMethod(ReflectionMethod $method)
-    {
-        if (strpos($method->name, 'test') === 0) {
-            return true;
-        }
-
-        // @scenario on TestCase::testMethod()
-        // @test     on TestCase::testMethod()
-        $doc_comment = $method->getDocComment();
-
-        return strpos($doc_comment, '@test')     !== false ||
-               strpos($doc_comment, '@scenario') !== false;
-    }
-
-    /**
-     * @param  string                    $message
-     * @return PHPUnit_Framework_Warning
-     */
-    protected static function warning($message)
-    {
-        return new PHPUnit_Framework_Warning($message);
-    }
-
-    /**
-     * @param  string                            $class
-     * @param  string                            $methodName
-     * @param  string                            $message
-     * @return PHPUnit_Framework_SkippedTestCase
-     * @since  Method available since Release 4.3.0
-     */
-    protected static function skipTest($class, $methodName, $message)
-    {
-        return new PHPUnit_Framework_SkippedTestCase($class, $methodName, $message);
-    }
-
-    /**
-     * @param  string                               $class
-     * @param  string                               $methodName
-     * @param  string                               $message
-     * @return PHPUnit_Framework_IncompleteTestCase
-     * @since  Method available since Release 4.3.0
-     */
-    protected static function incompleteTest($class, $methodName, $message)
-    {
-        return new PHPUnit_Framework_IncompleteTestCase($class, $methodName, $message);
-    }
-
-    /**
-     * @param bool $disallowChangesToGlobalState
-     * @since  Method available since Release 4.6.0
-     */
-    public function setDisallowChangesToGlobalState($disallowChangesToGlobalState)
-    {
-        if (is_null($this->disallowChangesToGlobalState) && is_bool($disallowChangesToGlobalState)) {
-            $this->disallowChangesToGlobalState = $disallowChangesToGlobalState;
-        }
-    }
-
-    /**
-     * @param bool $backupGlobals
-     * @since  Method available since Release 3.3.0
-     */
-    public function setBackupGlobals($backupGlobals)
-    {
-        if (is_null($this->backupGlobals) && is_bool($backupGlobals)) {
-            $this->backupGlobals = $backupGlobals;
-        }
-    }
-
-    /**
-     * @param bool $backupStaticAttributes
-     * @since  Method available since Release 3.4.0
-     */
-    public function setBackupStaticAttributes($backupStaticAttributes)
-    {
-        if (is_null($this->backupStaticAttributes) &&
-            is_bool($backupStaticAttributes)) {
-            $this->backupStaticAttributes = $backupStaticAttributes;
-        }
-    }
-
-    /**
-     * Returns an iterator for this test suite.
-     *
-     * @return RecursiveIteratorIterator
-     * @since  Method available since Release 3.1.0
-     */
-    public function getIterator()
-    {
-        $iterator = new PHPUnit_Util_TestSuiteIterator($this);
-
-        if ($this->iteratorFilter !== null) {
-            $iterator = $this->iteratorFilter->factory($iterator, $this);
-        }
-
-        return $iterator;
-    }
-
-    public function injectFilter(PHPUnit_Runner_Filter_Factory $filter)
-    {
-        $this->iteratorFilter = $filter;
-        foreach ($this as $test) {
-            if ($test instanceof self) {
-                $test->injectFilter($filter);
-            }
-        }
-    }
-
-    /**
-     * Template Method that is called before the tests
-     * of this test suite are run.
-     *
-     * @since  Method available since Release 3.1.0
-     */
-    protected function setUp()
-    {
-    }
-
-    /**
-     * Template Method that is called after the tests
-     * of this test suite have finished running.
-     *
-     * @since  Method available since Release 3.1.0
-     */
-    protected function tearDown()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php b/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
deleted file mode 100644
index 6106203..0000000
--- a/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Framework_TestSuite_DataProvider extends PHPUnit_Framework_TestSuite
-{
-    /**
-     * Sets the dependencies of a TestCase.
-     *
-     * @param array $dependencies
-     */
-    public function setDependencies(array $dependencies)
-    {
-        foreach ($this->tests as $test) {
-            $test->setDependencies($dependencies);
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php b/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
deleted file mode 100644
index b24c041..0000000
--- a/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a test test that unintentionally covers code.
- *
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Framework_UnintentionallyCoveredCodeError extends PHPUnit_Framework_RiskyTestError
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Framework/Warning.php b/vendor/phpunit/phpunit/src/Framework/Warning.php
deleted file mode 100644
index 6ac3cdc..0000000
--- a/vendor/phpunit/phpunit/src/Framework/Warning.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A warning.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Framework_Warning extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var string
-     */
-    protected $message = '';
-
-    /**
-     * @var bool
-     */
-    protected $backupGlobals = false;
-
-    /**
-     * @var bool
-     */
-    protected $backupStaticAttributes = false;
-
-    /**
-     * @var bool
-     */
-    protected $runTestInSeparateProcess = false;
-
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
-    /**
-     * @param string $message
-     */
-    public function __construct($message = '')
-    {
-        $this->message = $message;
-        parent::__construct('Warning');
-    }
-
-    /**
-     * @throws PHPUnit_Framework_Exception
-     */
-    protected function runTest()
-    {
-        $this->fail($this->message);
-    }
-
-    /**
-     * @return string
-     * @since  Method available since Release 3.0.0
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     * @since  Method available since Release 3.4.0
-     */
-    public function toString()
-    {
-        return 'Warning';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php b/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
deleted file mode 100644
index f839cd0..0000000
--- a/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all test runners.
- *
- * @since Class available since Release 2.0.0
- */
-abstract class PHPUnit_Runner_BaseTestRunner
-{
-    const STATUS_PASSED     = 0;
-    const STATUS_SKIPPED    = 1;
-    const STATUS_INCOMPLETE = 2;
-    const STATUS_FAILURE    = 3;
-    const STATUS_ERROR      = 4;
-    const STATUS_RISKY      = 5;
-    const SUITE_METHODNAME  = 'suite';
-
-    /**
-     * Returns the loader to be used.
-     *
-     * @return PHPUnit_Runner_TestSuiteLoader
-     */
-    public function getLoader()
-    {
-        return new PHPUnit_Runner_StandardTestSuiteLoader;
-    }
-
-    /**
-     * Returns the Test corresponding to the given suite.
-     * This is a template method, subclasses override
-     * the runFailed() and clearStatus() methods.
-     *
-     * @param  string                 $suiteClassName
-     * @param  string                 $suiteClassFile
-     * @param  mixed                  $suffixes
-     * @return PHPUnit_Framework_Test
-     */
-    public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
-    {
-        if (is_dir($suiteClassName) &&
-            !is_file($suiteClassName . '.php') && empty($suiteClassFile)) {
-            $facade = new File_Iterator_Facade;
-            $files  = $facade->getFilesAsArray(
-                $suiteClassName,
-                $suffixes
-            );
-
-            $suite = new PHPUnit_Framework_TestSuite($suiteClassName);
-            $suite->addTestFiles($files);
-
-            return $suite;
-        }
-
-        try {
-            $testClass = $this->loadSuiteClass(
-                $suiteClassName,
-                $suiteClassFile
-            );
-        } catch (PHPUnit_Framework_Exception $e) {
-            $this->runFailed($e->getMessage());
-
-            return;
-        }
-
-        try {
-            $suiteMethod = $testClass->getMethod(self::SUITE_METHODNAME);
-
-            if (!$suiteMethod->isStatic()) {
-                $this->runFailed(
-                    'suite() method must be static.'
-                );
-
-                return;
-            }
-
-            try {
-                $test = $suiteMethod->invoke(null, $testClass->getName());
-            } catch (ReflectionException $e) {
-                $this->runFailed(
-                    sprintf(
-                        "Failed to invoke suite() method.\n%s",
-                        $e->getMessage()
-                    )
-                );
-
-                return;
-            }
-        } catch (ReflectionException $e) {
-            try {
-                $test = new PHPUnit_Framework_TestSuite($testClass);
-            } catch (PHPUnit_Framework_Exception $e) {
-                $test = new PHPUnit_Framework_TestSuite;
-                $test->setName($suiteClassName);
-            }
-        }
-
-        $this->clearStatus();
-
-        return $test;
-    }
-
-    /**
-     * Returns the loaded ReflectionClass for a suite name.
-     *
-     * @param  string          $suiteClassName
-     * @param  string          $suiteClassFile
-     * @return ReflectionClass
-     */
-    protected function loadSuiteClass($suiteClassName, $suiteClassFile = '')
-    {
-        $loader = $this->getLoader();
-
-        return $loader->load($suiteClassName, $suiteClassFile);
-    }
-
-    /**
-     * Clears the status message.
-     */
-    protected function clearStatus()
-    {
-    }
-
-    /**
-     * Override to define how to handle a failed loading of
-     * a test suite.
-     *
-     * @param string $message
-     */
-    abstract protected function runFailed($message);
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Exception.php b/vendor/phpunit/phpunit/src/Runner/Exception.php
deleted file mode 100644
index 4b239af..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Exception.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Runner_Exception extends RuntimeException implements PHPUnit_Exception
-{
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
deleted file mode 100644
index f4fa9d9..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Runner_Filter_Factory
-{
-    /**
-     * @var array
-     */
-    private $filters = array();
-
-    /**
-     * @param ReflectionClass $filter
-     * @param mixed           $args
-     */
-    public function addFilter(ReflectionClass $filter, $args)
-    {
-        if (!$filter->isSubclassOf('RecursiveFilterIterator')) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    'Class "%s" does not extend RecursiveFilterIterator',
-                    $filter->name
-                )
-            );
-        }
-
-        $this->filters[] = array($filter, $args);
-    }
-
-    /**
-     * @return FilterIterator
-     */
-    public function factory(Iterator $iterator, PHPUnit_Framework_TestSuite $suite)
-    {
-        foreach ($this->filters as $filter) {
-            list($class, $args) = $filter;
-            $iterator           = $class->newInstance($iterator, $args, $suite);
-        }
-
-        return $iterator;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
deleted file mode 100644
index 9257b3b..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-abstract class PHPUnit_Runner_Filter_GroupFilterIterator extends RecursiveFilterIterator
-{
-    /**
-     * @var array
-     */
-    protected $groupTests = array();
-
-    /**
-     * @param RecursiveIterator           $iterator
-     * @param array                       $groups
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function __construct(RecursiveIterator $iterator, array $groups, PHPUnit_Framework_TestSuite $suite)
-    {
-        parent::__construct($iterator);
-
-        foreach ($suite->getGroupDetails() as $group => $tests) {
-            if (in_array($group, $groups)) {
-                $testHashes = array_map(
-                    function ($test) {
-                        return spl_object_hash($test);
-                    },
-                    $tests
-                );
-
-                $this->groupTests = array_merge($this->groupTests, $testHashes);
-            }
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function accept()
-    {
-        $test = $this->getInnerIterator()->current();
-
-        if ($test instanceof PHPUnit_Framework_TestSuite) {
-            return true;
-        }
-
-        return $this->doAccept(spl_object_hash($test));
-    }
-
-    abstract protected function doAccept($hash);
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
deleted file mode 100644
index 9fe4b69..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Runner_Filter_Group_Exclude extends PHPUnit_Runner_Filter_GroupFilterIterator
-{
-    protected function doAccept($hash)
-    {
-        return !in_array($hash, $this->groupTests);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php b/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
deleted file mode 100644
index 49d2506..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Runner_Filter_Group_Include extends PHPUnit_Runner_Filter_GroupFilterIterator
-{
-    protected function doAccept($hash)
-    {
-        return in_array($hash, $this->groupTests);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Filter/Test.php b/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
deleted file mode 100644
index cbd28b3..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Runner_Filter_Test extends RecursiveFilterIterator
-{
-    /**
-     * @var string
-     */
-    protected $filter = null;
-
-    /**
-     * @var int
-     */
-    protected $filterMin;
-    /**
-     * @var int
-     */
-    protected $filterMax;
-
-    /**
-     * @param RecursiveIterator $iterator
-     * @param string            $filter
-     */
-    public function __construct(RecursiveIterator $iterator, $filter)
-    {
-        parent::__construct($iterator);
-        $this->setFilter($filter);
-    }
-
-    /**
-     * @param string $filter
-     */
-    protected function setFilter($filter)
-    {
-        if (PHPUnit_Util_Regex::pregMatchSafe($filter, '') === false) {
-            // Handles:
-            //  * testAssertEqualsSucceeds#4
-            //  * testAssertEqualsSucceeds#4-8
-            if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
-                if (isset($matches[3]) && $matches[2] < $matches[3]) {
-                    $filter = sprintf(
-                        '%s.*with data set #(\d+)$',
-                        $matches[1]
-                    );
-
-                    $this->filterMin = $matches[2];
-                    $this->filterMax = $matches[3];
-                } else {
-                    $filter = sprintf(
-                        '%s.*with data set #%s$',
-                        $matches[1],
-                        $matches[2]
-                    );
-                }
-            } // Handles:
-            //  * testDetermineJsonError@JSON_ERROR_NONE
-            //  * testDetermineJsonError@JSON.*
-            elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
-                $filter = sprintf(
-                    '%s.*with data set "%s"$',
-                    $matches[1],
-                    $matches[2]
-                );
-            }
-
-            // Escape delimiters in regular expression. Do NOT use preg_quote,
-            // to keep magic characters.
-            $filter = sprintf('/%s/', str_replace(
-                '/',
-                '\\/',
-                $filter
-            ));
-        }
-
-        $this->filter = $filter;
-    }
-
-    /**
-     * @return bool
-     */
-    public function accept()
-    {
-        $test = $this->getInnerIterator()->current();
-
-        if ($test instanceof PHPUnit_Framework_TestSuite) {
-            return true;
-        }
-
-        $tmp = PHPUnit_Util_Test::describe($test, false);
-
-        if ($tmp[0] != '') {
-            $name = implode('::', $tmp);
-        } else {
-            $name = $tmp[1];
-        }
-
-        $accepted = preg_match($this->filter, $name, $matches);
-
-        if ($accepted && isset($this->filterMax)) {
-            $set      = end($matches);
-            $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
-        }
-
-        return $accepted;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
deleted file mode 100644
index e7b802a..0000000
--- a/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * The standard test suite loader.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Runner_StandardTestSuiteLoader implements PHPUnit_Runner_TestSuiteLoader
-{
-    /**
-     * @param  string                      $suiteClassName
-     * @param  string                      $suiteClassFile
-     * @return ReflectionClass
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function load($suiteClassName, $suiteClassFile = '')
-    {
-        $suiteClassName = str_replace('.php', '', $suiteClassName);
-
-        if (empty($suiteClassFile)) {
-            $suiteClassFile = PHPUnit_Util_Filesystem::classNameToFilename(
-                $suiteClassName
-            );
-        }
-
-        if (!class_exists($suiteClassName, false)) {
-            $loadedClasses = get_declared_classes();
-
-            $filename = PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile);
-
-            $loadedClasses = array_values(
-                array_diff(get_declared_classes(), $loadedClasses)
-            );
-        }
-
-        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
-            $offset = 0 - strlen($suiteClassName);
-
-            foreach ($loadedClasses as $loadedClass) {
-                $class = new ReflectionClass($loadedClass);
-                if (substr($loadedClass, $offset) === $suiteClassName &&
-                    $class->getFileName() == $filename) {
-                    $suiteClassName = $loadedClass;
-                    break;
-                }
-            }
-        }
-
-        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
-            $testCaseClass = 'PHPUnit_Framework_TestCase';
-
-            foreach ($loadedClasses as $loadedClass) {
-                $class     = new ReflectionClass($loadedClass);
-                $classFile = $class->getFileName();
-
-                if ($class->isSubclassOf($testCaseClass) &&
-                    !$class->isAbstract()) {
-                    $suiteClassName = $loadedClass;
-                    $testCaseClass  = $loadedClass;
-
-                    if ($classFile == realpath($suiteClassFile)) {
-                        break;
-                    }
-                }
-
-                if ($class->hasMethod('suite')) {
-                    $method = $class->getMethod('suite');
-
-                    if (!$method->isAbstract() &&
-                        $method->isPublic() &&
-                        $method->isStatic()) {
-                        $suiteClassName = $loadedClass;
-
-                        if ($classFile == realpath($suiteClassFile)) {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (class_exists($suiteClassName, false)) {
-            $class = new ReflectionClass($suiteClassName);
-
-            if ($class->getFileName() == realpath($suiteClassFile)) {
-                return $class;
-            }
-        }
-
-        throw new PHPUnit_Framework_Exception(
-            sprintf(
-                "Class '%s' could not be found in '%s'.",
-                $suiteClassName,
-                $suiteClassFile
-            )
-        );
-    }
-
-    /**
-     * @param  ReflectionClass $aClass
-     * @return ReflectionClass
-     */
-    public function reload(ReflectionClass $aClass)
-    {
-        return $aClass;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php b/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
deleted file mode 100644
index 572153a..0000000
--- a/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An interface to define how a test suite should be loaded.
- *
- * @since      Interface available since Release 2.0.0
- */
-interface PHPUnit_Runner_TestSuiteLoader
-{
-    /**
-     * @param  string          $suiteClassName
-     * @param  string          $suiteClassFile
-     * @return ReflectionClass
-     */
-    public function load($suiteClassName, $suiteClassFile = '');
-
-    /**
-     * @param  ReflectionClass $aClass
-     * @return ReflectionClass
-     */
-    public function reload(ReflectionClass $aClass);
-}
diff --git a/vendor/phpunit/phpunit/src/Runner/Version.php b/vendor/phpunit/phpunit/src/Runner/Version.php
deleted file mode 100644
index 58e3390..0000000
--- a/vendor/phpunit/phpunit/src/Runner/Version.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This class defines the current version of PHPUnit.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Runner_Version
-{
-    private static $pharVersion;
-    private static $version;
-
-    /**
-     * Returns the current version of PHPUnit.
-     *
-     * @return string
-     */
-    public static function id()
-    {
-        if (self::$pharVersion !== null) {
-            return self::$pharVersion;
-        }
-
-        if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.11', dirname(dirname(__DIR__)));
-            self::$version = $version->getVersion();
-        }
-
-        return self::$version;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getVersionString()
-    {
-        return 'PHPUnit ' . self::id() . ' by Sebastian Bergmann and contributors.';
-    }
-
-    /**
-     * @return string
-     * @since  Method available since Release 4.0.0
-     */
-    public static function getReleaseChannel()
-    {
-        if (strpos(self::$pharVersion, 'alpha') !== false) {
-            return '-alpha';
-        }
-
-        if (strpos(self::$pharVersion, 'beta') !== false) {
-            return '-beta';
-        }
-
-        return '';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/TextUI/Command.php b/vendor/phpunit/phpunit/src/TextUI/Command.php
deleted file mode 100644
index 6a73409..0000000
--- a/vendor/phpunit/phpunit/src/TextUI/Command.php
+++ /dev/null
@@ -1,989 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestRunner for the Command Line Interface (CLI)
- * PHP SAPI Module.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_TextUI_Command
-{
-    /**
-     * @var array
-     */
-    protected $arguments = array(
-        'listGroups'              => false,
-        'loader'                  => null,
-        'useDefaultConfiguration' => true
-    );
-
-    /**
-     * @var array
-     */
-    protected $options = array();
-
-    /**
-     * @var array
-     */
-    protected $longOptions = array(
-        'colors=='             => null,
-        'bootstrap='           => null,
-        'columns='             => null,
-        'configuration='       => null,
-        'coverage-clover='     => null,
-        'coverage-crap4j='     => null,
-        'coverage-html='       => null,
-        'coverage-php='        => null,
-        'coverage-text=='      => null,
-        'coverage-xml='        => null,
-        'debug'                => null,
-        'exclude-group='       => null,
-        'filter='              => null,
-        'testsuite='           => null,
-        'group='               => null,
-        'help'                 => null,
-        'include-path='        => null,
-        'list-groups'          => null,
-        'loader='              => null,
-        'log-json='            => null,
-        'log-junit='           => null,
-        'log-tap='             => null,
-        'process-isolation'    => null,
-        'repeat='              => null,
-        'stderr'               => null,
-        'stop-on-error'        => null,
-        'stop-on-failure'      => null,
-        'stop-on-incomplete'   => null,
-        'stop-on-risky'        => null,
-        'stop-on-skipped'      => null,
-        'report-useless-tests' => null,
-        'strict-coverage'      => null,
-        'disallow-test-output' => null,
-        'enforce-time-limit'   => null,
-        'disallow-todo-tests'  => null,
-        'strict-global-state'  => null,
-        'strict'               => null,
-        'tap'                  => null,
-        'testdox'              => null,
-        'testdox-html='        => null,
-        'testdox-text='        => null,
-        'test-suffix='         => null,
-        'no-configuration'     => null,
-        'no-coverage'          => null,
-        'no-globals-backup'    => null,
-        'printer='             => null,
-        'static-backup'        => null,
-        'verbose'              => null,
-        'version'              => null
-    );
-
-    /**
-     * @var bool
-     */
-    private $versionStringPrinted = false;
-
-    /**
-     * @param bool $exit
-     */
-    public static function main($exit = true)
-    {
-        $command = new static;
-
-        return $command->run($_SERVER['argv'], $exit);
-    }
-
-    /**
-     * @param  array $argv
-     * @param  bool  $exit
-     * @return int
-     */
-    public function run(array $argv, $exit = true)
-    {
-        $this->handleArguments($argv);
-
-        $runner = $this->createRunner();
-
-        if (is_object($this->arguments['test']) &&
-            $this->arguments['test'] instanceof PHPUnit_Framework_Test) {
-            $suite = $this->arguments['test'];
-        } else {
-            $suite = $runner->getTest(
-                $this->arguments['test'],
-                $this->arguments['testFile'],
-                $this->arguments['testSuffixes']
-            );
-        }
-
-        if ($this->arguments['listGroups']) {
-            $this->printVersionString();
-
-            print "Available test group(s):\n";
-
-            $groups = $suite->getGroups();
-            sort($groups);
-
-            foreach ($groups as $group) {
-                print " - $group\n";
-            }
-
-            if ($exit) {
-                exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-            } else {
-                return PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
-            }
-        }
-
-        unset($this->arguments['test']);
-        unset($this->arguments['testFile']);
-
-        try {
-            $result = $runner->doRun($suite, $this->arguments);
-        } catch (PHPUnit_Framework_Exception $e) {
-            print $e->getMessage() . "\n";
-        }
-
-        $ret = PHPUnit_TextUI_TestRunner::FAILURE_EXIT;
-
-        if (isset($result) && $result->wasSuccessful()) {
-            $ret = PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
-        } elseif (!isset($result) || $result->errorCount() > 0) {
-            $ret = PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT;
-        }
-
-        if ($exit) {
-            exit($ret);
-        } else {
-            return $ret;
-        }
-    }
-
-    /**
-     * Create a TestRunner, override in subclasses.
-     *
-     * @return PHPUnit_TextUI_TestRunner
-     * @since  Method available since Release 3.6.0
-     */
-    protected function createRunner()
-    {
-        return new PHPUnit_TextUI_TestRunner($this->arguments['loader']);
-    }
-
-    /**
-     * Handles the command-line arguments.
-     *
-     * A child class of PHPUnit_TextUI_Command can hook into the argument
-     * parsing by adding the switch(es) to the $longOptions array and point to a
-     * callback method that handles the switch(es) in the child class like this
-     *
-     * <code>
-     * <?php
-     * class MyCommand extends PHPUnit_TextUI_Command
-     * {
-     *     public function __construct()
-     *     {
-     *         // my-switch won't accept a value, it's an on/off
-     *         $this->longOptions['my-switch'] = 'myHandler';
-     *         // my-secondswitch will accept a value - note the equals sign
-     *         $this->longOptions['my-secondswitch='] = 'myOtherHandler';
-     *     }
-     *
-     *     // --my-switch  -> myHandler()
-     *     protected function myHandler()
-     *     {
-     *     }
-     *
-     *     // --my-secondswitch foo -> myOtherHandler('foo')
-     *     protected function myOtherHandler ($value)
-     *     {
-     *     }
-     *
-     *     // You will also need this - the static keyword in the
-     *     // PHPUnit_TextUI_Command will mean that it'll be
-     *     // PHPUnit_TextUI_Command that gets instantiated,
-     *     // not MyCommand
-     *     public static function main($exit = true)
-     *     {
-     *         $command = new static;
-     *
-     *         return $command->run($_SERVER['argv'], $exit);
-     *     }
-     *
-     * }
-     * </code>
-     *
-     * @param array $argv
-     */
-    protected function handleArguments(array $argv)
-    {
-        if (defined('__PHPUNIT_PHAR__')) {
-            $this->longOptions['check-version'] = null;
-            $this->longOptions['selfupdate']    = null;
-            $this->longOptions['self-update']   = null;
-        }
-
-        try {
-            $this->options = PHPUnit_Util_Getopt::getopt(
-                $argv,
-                'd:c:hv',
-                array_keys($this->longOptions)
-            );
-        } catch (PHPUnit_Framework_Exception $e) {
-            $this->showError($e->getMessage());
-        }
-
-        foreach ($this->options[0] as $option) {
-            switch ($option[0]) {
-                case '--colors':
-                    $this->arguments['colors'] = $option[1] ?: PHPUnit_TextUI_ResultPrinter::COLOR_AUTO;
-                    break;
-
-                case '--bootstrap':
-                    $this->arguments['bootstrap'] = $option[1];
-                    break;
-
-                case '--columns':
-                    if (is_numeric($option[1])) {
-                        $this->arguments['columns'] = (int) $option[1];
-                    } elseif ($option[1] == 'max') {
-                        $this->arguments['columns'] = 'max';
-                    }
-                    break;
-
-                case 'c':
-                case '--configuration':
-                    $this->arguments['configuration'] = $option[1];
-                    break;
-
-                case '--coverage-clover':
-                    $this->arguments['coverageClover'] = $option[1];
-                    break;
-
-                case '--coverage-crap4j':
-                    $this->arguments['coverageCrap4J'] = $option[1];
-                    break;
-
-                case '--coverage-html':
-                    $this->arguments['coverageHtml'] = $option[1];
-                    break;
-
-                case '--coverage-php':
-                    $this->arguments['coveragePHP'] = $option[1];
-                    break;
-
-                case '--coverage-text':
-                    if ($option[1] === null) {
-                        $option[1] = 'php://stdout';
-                    }
-
-                    $this->arguments['coverageText']                   = $option[1];
-                    $this->arguments['coverageTextShowUncoveredFiles'] = false;
-                    $this->arguments['coverageTextShowOnlySummary']    = false;
-                    break;
-
-                case '--coverage-xml':
-                    $this->arguments['coverageXml'] = $option[1];
-                    break;
-
-                case 'd':
-                    $ini = explode('=', $option[1]);
-
-                    if (isset($ini[0])) {
-                        if (isset($ini[1])) {
-                            ini_set($ini[0], $ini[1]);
-                        } else {
-                            ini_set($ini[0], true);
-                        }
-                    }
-                    break;
-
-                case '--debug':
-                    $this->arguments['debug'] = true;
-                    break;
-
-                case 'h':
-                case '--help':
-                    $this->showHelp();
-                    exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-                    break;
-
-                case '--filter':
-                    $this->arguments['filter'] = $option[1];
-                    break;
-
-                case '--testsuite':
-                    $this->arguments['testsuite'] = $option[1];
-                    break;
-
-                case '--group':
-                    $this->arguments['groups'] = explode(',', $option[1]);
-                    break;
-
-                case '--exclude-group':
-                    $this->arguments['excludeGroups'] = explode(
-                        ',',
-                        $option[1]
-                    );
-                    break;
-
-                case '--test-suffix':
-                    $this->arguments['testSuffixes'] = explode(
-                        ',',
-                        $option[1]
-                    );
-                    break;
-
-                case '--include-path':
-                    $includePath = $option[1];
-                    break;
-
-                case '--list-groups':
-                    $this->arguments['listGroups'] = true;
-                    break;
-
-                case '--printer':
-                    $this->arguments['printer'] = $option[1];
-                    break;
-
-                case '--loader':
-                    $this->arguments['loader'] = $option[1];
-                    break;
-
-                case '--log-json':
-                    $this->arguments['jsonLogfile'] = $option[1];
-                    break;
-
-                case '--log-junit':
-                    $this->arguments['junitLogfile'] = $option[1];
-                    break;
-
-                case '--log-tap':
-                    $this->arguments['tapLogfile'] = $option[1];
-                    break;
-
-                case '--process-isolation':
-                    $this->arguments['processIsolation'] = true;
-                    break;
-
-                case '--repeat':
-                    $this->arguments['repeat'] = (int) $option[1];
-                    break;
-
-                case '--stderr':
-                    $this->arguments['stderr'] = true;
-                    break;
-
-                case '--stop-on-error':
-                    $this->arguments['stopOnError'] = true;
-                    break;
-
-                case '--stop-on-failure':
-                    $this->arguments['stopOnFailure'] = true;
-                    break;
-
-                case '--stop-on-incomplete':
-                    $this->arguments['stopOnIncomplete'] = true;
-                    break;
-
-                case '--stop-on-risky':
-                    $this->arguments['stopOnRisky'] = true;
-                    break;
-
-                case '--stop-on-skipped':
-                    $this->arguments['stopOnSkipped'] = true;
-                    break;
-
-                case '--tap':
-                    $this->arguments['printer'] = 'PHPUnit_Util_Log_TAP';
-                    break;
-
-                case '--testdox':
-                    $this->arguments['printer'] = 'PHPUnit_Util_TestDox_ResultPrinter_Text';
-                    break;
-
-                case '--testdox-html':
-                    $this->arguments['testdoxHTMLFile'] = $option[1];
-                    break;
-
-                case '--testdox-text':
-                    $this->arguments['testdoxTextFile'] = $option[1];
-                    break;
-
-                case '--no-configuration':
-                    $this->arguments['useDefaultConfiguration'] = false;
-                    break;
-
-                case '--no-coverage':
-                    $this->arguments['noCoverage'] = true;
-                    break;
-
-                case '--no-globals-backup':
-                    $this->arguments['backupGlobals'] = false;
-                    break;
-
-                case '--static-backup':
-                    $this->arguments['backupStaticAttributes'] = true;
-                    break;
-
-                case 'v':
-                case '--verbose':
-                    $this->arguments['verbose'] = true;
-                    break;
-
-                case '--version':
-                    $this->printVersionString();
-                    exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-                    break;
-
-                case '--report-useless-tests':
-                    $this->arguments['reportUselessTests'] = true;
-                    break;
-
-                case '--strict-coverage':
-                    $this->arguments['strictCoverage'] = true;
-                    break;
-
-                case '--strict-global-state':
-                    $this->arguments['disallowChangesToGlobalState'] = true;
-                    break;
-
-                case '--disallow-test-output':
-                    $this->arguments['disallowTestOutput'] = true;
-                    break;
-
-                case '--enforce-time-limit':
-                    $this->arguments['enforceTimeLimit'] = true;
-                    break;
-
-                case '--disallow-todo-tests':
-                    $this->arguments['disallowTodoAnnotatedTests'] = true;
-                    break;
-
-                case '--strict':
-                    $this->arguments['reportUselessTests']         = true;
-                    $this->arguments['strictCoverage']             = true;
-                    $this->arguments['disallowTestOutput']         = true;
-                    $this->arguments['enforceTimeLimit']           = true;
-                    $this->arguments['disallowTodoAnnotatedTests'] = true;
-                    $this->arguments['deprecatedStrictModeOption'] = true;
-                    break;
-
-                case '--check-version':
-                    $this->handleVersionCheck();
-                    break;
-
-                case '--selfupdate':
-                case '--self-update':
-                    $this->handleSelfUpdate();
-                    break;
-
-                default:
-                    $optionName = str_replace('--', '', $option[0]);
-
-                    if (isset($this->longOptions[$optionName])) {
-                        $handler = $this->longOptions[$optionName];
-                    } elseif (isset($this->longOptions[$optionName . '='])) {
-                        $handler = $this->longOptions[$optionName . '='];
-                    }
-
-                    if (isset($handler) && is_callable(array($this, $handler))) {
-                        $this->$handler($option[1]);
-                    }
-            }
-        }
-
-        $this->handleCustomTestSuite();
-
-        if (!isset($this->arguments['test'])) {
-            if (isset($this->options[1][0])) {
-                $this->arguments['test'] = $this->options[1][0];
-            }
-
-            if (isset($this->options[1][1])) {
-                $this->arguments['testFile'] = realpath($this->options[1][1]);
-            } else {
-                $this->arguments['testFile'] = '';
-            }
-
-            if (isset($this->arguments['test']) &&
-                is_file($this->arguments['test']) &&
-                substr($this->arguments['test'], -5, 5) != '.phpt') {
-                $this->arguments['testFile'] = realpath($this->arguments['test']);
-                $this->arguments['test']     = substr($this->arguments['test'], 0, strrpos($this->arguments['test'], '.'));
-            }
-        }
-
-        if (!isset($this->arguments['testSuffixes'])) {
-            $this->arguments['testSuffixes'] = array('Test.php', '.phpt');
-        }
-
-        if (isset($includePath)) {
-            ini_set(
-                'include_path',
-                $includePath . PATH_SEPARATOR . ini_get('include_path')
-            );
-        }
-
-        if ($this->arguments['loader'] !== null) {
-            $this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
-        }
-
-        if (isset($this->arguments['configuration']) &&
-            is_dir($this->arguments['configuration'])) {
-            $configurationFile = $this->arguments['configuration'] . '/phpunit.xml';
-
-            if (file_exists($configurationFile)) {
-                $this->arguments['configuration'] = realpath(
-                    $configurationFile
-                );
-            } elseif (file_exists($configurationFile . '.dist')) {
-                $this->arguments['configuration'] = realpath(
-                    $configurationFile . '.dist'
-                );
-            }
-        } elseif (!isset($this->arguments['configuration']) &&
-                  $this->arguments['useDefaultConfiguration']) {
-            if (file_exists('phpunit.xml')) {
-                $this->arguments['configuration'] = realpath('phpunit.xml');
-            } elseif (file_exists('phpunit.xml.dist')) {
-                $this->arguments['configuration'] = realpath(
-                    'phpunit.xml.dist'
-                );
-            }
-        }
-
-        if (isset($this->arguments['configuration'])) {
-            try {
-                $configuration = PHPUnit_Util_Configuration::getInstance(
-                    $this->arguments['configuration']
-                );
-            } catch (Throwable $e) {
-                print $e->getMessage() . "\n";
-                exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
-            } catch (Exception $e) {
-                print $e->getMessage() . "\n";
-                exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
-            }
-
-            $phpunit = $configuration->getPHPUnitConfiguration();
-
-            $configuration->handlePHPConfiguration();
-
-            /*
-             * Issue #1216
-             */
-            if (isset($this->arguments['bootstrap'])) {
-                $this->handleBootstrap($this->arguments['bootstrap']);
-            } elseif (isset($phpunit['bootstrap'])) {
-                $this->handleBootstrap($phpunit['bootstrap']);
-            }
-
-            /*
-             * Issue #657
-             */
-            if (isset($phpunit['stderr']) && ! isset($this->arguments['stderr'])) {
-                $this->arguments['stderr'] = $phpunit['stderr'];
-            }
-
-            if (isset($phpunit['columns']) && ! isset($this->arguments['columns'])) {
-                $this->arguments['columns'] = $phpunit['columns'];
-            }
-
-            if (isset($phpunit['printerClass'])) {
-                if (isset($phpunit['printerFile'])) {
-                    $file = $phpunit['printerFile'];
-                } else {
-                    $file = '';
-                }
-
-                $this->arguments['printer'] = $this->handlePrinter(
-                    $phpunit['printerClass'],
-                    $file
-                );
-            }
-
-            if (isset($phpunit['testSuiteLoaderClass'])) {
-                if (isset($phpunit['testSuiteLoaderFile'])) {
-                    $file = $phpunit['testSuiteLoaderFile'];
-                } else {
-                    $file = '';
-                }
-
-                $this->arguments['loader'] = $this->handleLoader(
-                    $phpunit['testSuiteLoaderClass'],
-                    $file
-                );
-            }
-
-            $browsers = $configuration->getSeleniumBrowserConfiguration();
-
-            if (!empty($browsers)) {
-                $this->arguments['deprecatedSeleniumConfiguration'] = true;
-
-                if (class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
-                    PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
-                }
-            }
-
-            if (!isset($this->arguments['test'])) {
-                $testSuite = $configuration->getTestSuiteConfiguration(isset($this->arguments['testsuite']) ? $this->arguments['testsuite'] : null);
-
-                if ($testSuite !== null) {
-                    $this->arguments['test'] = $testSuite;
-                }
-            }
-        } elseif (isset($this->arguments['bootstrap'])) {
-            $this->handleBootstrap($this->arguments['bootstrap']);
-        }
-
-        if (isset($this->arguments['printer']) &&
-            is_string($this->arguments['printer'])) {
-            $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
-        }
-
-        if (isset($this->arguments['test']) && is_string($this->arguments['test']) && substr($this->arguments['test'], -5, 5) == '.phpt') {
-            $test = new PHPUnit_Extensions_PhptTestCase($this->arguments['test']);
-
-            $this->arguments['test'] = new PHPUnit_Framework_TestSuite;
-            $this->arguments['test']->addTest($test);
-        }
-
-        if (!isset($this->arguments['test']) ||
-            (isset($this->arguments['testDatabaseLogRevision']) && !isset($this->arguments['testDatabaseDSN']))) {
-            $this->showHelp();
-            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
-        }
-    }
-
-    /**
-     * Handles the loading of the PHPUnit_Runner_TestSuiteLoader implementation.
-     *
-     * @param  string                         $loaderClass
-     * @param  string                         $loaderFile
-     * @return PHPUnit_Runner_TestSuiteLoader
-     */
-    protected function handleLoader($loaderClass, $loaderFile = '')
-    {
-        if (!class_exists($loaderClass, false)) {
-            if ($loaderFile == '') {
-                $loaderFile = PHPUnit_Util_Filesystem::classNameToFilename(
-                    $loaderClass
-                );
-            }
-
-            $loaderFile = stream_resolve_include_path($loaderFile);
-
-            if ($loaderFile) {
-                require $loaderFile;
-            }
-        }
-
-        if (class_exists($loaderClass, false)) {
-            $class = new ReflectionClass($loaderClass);
-
-            if ($class->implementsInterface('PHPUnit_Runner_TestSuiteLoader') &&
-                $class->isInstantiable()) {
-                return $class->newInstance();
-            }
-        }
-
-        if ($loaderClass == 'PHPUnit_Runner_StandardTestSuiteLoader') {
-            return;
-        }
-
-        $this->showError(
-            sprintf(
-                'Could not use "%s" as loader.',
-                $loaderClass
-            )
-        );
-    }
-
-    /**
-     * Handles the loading of the PHPUnit_Util_Printer implementation.
-     *
-     * @param  string               $printerClass
-     * @param  string               $printerFile
-     * @return PHPUnit_Util_Printer
-     */
-    protected function handlePrinter($printerClass, $printerFile = '')
-    {
-        if (!class_exists($printerClass, false)) {
-            if ($printerFile == '') {
-                $printerFile = PHPUnit_Util_Filesystem::classNameToFilename(
-                    $printerClass
-                );
-            }
-
-            $printerFile = stream_resolve_include_path($printerFile);
-
-            if ($printerFile) {
-                require $printerFile;
-            }
-        }
-
-        if (class_exists($printerClass)) {
-            $class = new ReflectionClass($printerClass);
-
-            if ($class->implementsInterface('PHPUnit_Framework_TestListener') &&
-                $class->isSubclassOf('PHPUnit_Util_Printer') &&
-                $class->isInstantiable()) {
-                if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
-                    return $printerClass;
-                }
-
-                $outputStream = isset($this->arguments['stderr']) ? 'php://stderr' : null;
-
-                return $class->newInstance($outputStream);
-            }
-        }
-
-        $this->showError(
-            sprintf(
-                'Could not use "%s" as printer.',
-                $printerClass
-            )
-        );
-    }
-
-    /**
-     * Loads a bootstrap file.
-     *
-     * @param string $filename
-     */
-    protected function handleBootstrap($filename)
-    {
-        try {
-            PHPUnit_Util_Fileloader::checkAndLoad($filename);
-        } catch (PHPUnit_Framework_Exception $e) {
-            $this->showError($e->getMessage());
-        }
-    }
-
-    /**
-     * @since Method available since Release 4.0.0
-     */
-    protected function handleSelfUpdate()
-    {
-        $this->printVersionString();
-
-        $localFilename = realpath($_SERVER['argv'][0]);
-
-        if (!is_writable($localFilename)) {
-            print 'No write permission to update ' . $localFilename . "\n";
-            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
-        }
-
-        if (!extension_loaded('openssl')) {
-            print "The OpenSSL extension is not loaded.\n";
-            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
-        }
-
-        if (PHP_VERSION_ID < 50600) {
-            $remoteFilename = sprintf('https://phar.phpunit.de/phpunit-old.phar');
-        } else {
-            $remoteFilename = sprintf('https://phar.phpunit.de/phpunit.phar');
-        }
-
-        $tempFilename = tempnam(sys_get_temp_dir(), 'phpunit') . '.phar';
-
-        // Workaround for https://bugs.php.net/bug.php?id=65538
-        $caFile = dirname($tempFilename) . '/ca.pem';
-        copy(__PHPUNIT_PHAR_ROOT__ . '/phar/ca.pem', $caFile);
-
-        print 'Updating the PHPUnit PHAR ... ';
-
-        $options = array(
-            'ssl' => array(
-                'allow_self_signed' => false,
-                'cafile'            => $caFile,
-                'verify_peer'       => true
-            )
-        );
-
-        if (PHP_VERSION_ID < 50600) {
-            $options['ssl']['CN_match']        = 'phar.phpunit.de';
-            $options['ssl']['SNI_server_name'] = 'phar.phpunit.de';
-        }
-
-        file_put_contents(
-            $tempFilename,
-            file_get_contents(
-                $remoteFilename,
-                false,
-                stream_context_create($options)
-            )
-        );
-
-        chmod($tempFilename, 0777 & ~umask());
-
-        try {
-            $phar = new Phar($tempFilename);
-            unset($phar);
-            rename($tempFilename, $localFilename);
-            unlink($caFile);
-        } catch (Throwable $_e) {
-            $e = $_e;
-        } catch (Exception $_e) {
-            $e = $_e;
-        }
-
-        if (isset($e)) {
-            unlink($caFile);
-            unlink($tempFilename);
-            print " done\n\n" . $e->getMessage() . "\n";
-            exit(2);
-        }
-
-        print " done\n";
-        exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-    }
-
-    /**
-     * @since Method available since Release 4.8.0
-     */
-    protected function handleVersionCheck()
-    {
-        $this->printVersionString();
-
-        $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit');
-        $isOutdated    = version_compare($latestVersion, PHPUnit_Runner_Version::id(), '>');
-
-        if ($isOutdated) {
-            print "You are not using the latest version of PHPUnit.\n";
-            print 'Use "phpunit --self-update" to install PHPUnit ' . $latestVersion . "\n";
-        } else {
-            print "You are using the latest version of PHPUnit.\n";
-        }
-
-        exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-    }
-
-    /**
-     * Show the help message.
-     */
-    protected function showHelp()
-    {
-        $this->printVersionString();
-
-        print <<<EOT
-Usage: phpunit [options] UnitTest [UnitTest.php]
-       phpunit [options] <directory>
-
-Code Coverage Options:
-
-  --coverage-clover <file>  Generate code coverage report in Clover XML format.
-  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
-  --coverage-html <dir>     Generate code coverage report in HTML format.
-  --coverage-php <file>     Export PHP_CodeCoverage object to file.
-  --coverage-text=<file>    Generate code coverage report in text format.
-                            Default: Standard output.
-  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
-
-Logging Options:
-
-  --log-junit <file>        Log test execution in JUnit XML format to file.
-  --log-tap <file>          Log test execution in TAP format to file.
-  --log-json <file>         Log test execution in JSON format.
-  --testdox-html <file>     Write agile documentation in HTML format to file.
-  --testdox-text <file>     Write agile documentation in Text format to file.
-
-Test Selection Options:
-
-  --filter <pattern>        Filter which tests to run.
-  --testsuite <pattern>     Filter which testsuite to run.
-  --group ...               Only runs tests from the specified group(s).
-  --exclude-group ...       Exclude tests from the specified group(s).
-  --list-groups             List available test groups.
-  --test-suffix ...         Only search for test in files with specified
-                            suffix(es). Default: Test.php,.phpt
-
-Test Execution Options:
-
-  --report-useless-tests    Be strict about tests that do not test anything.
-  --strict-coverage         Be strict about unintentionally covered code.
-  --strict-global-state     Be strict about changes to global state
-  --disallow-test-output    Be strict about output during tests.
-  --enforce-time-limit      Enforce time limit based on test size.
-  --disallow-todo-tests     Disallow @todo-annotated tests.
-
-  --process-isolation       Run each test in a separate PHP process.
-  --no-globals-backup       Do not backup and restore \$GLOBALS for each test.
-  --static-backup           Backup and restore static attributes for each test.
-
-  --colors=<flag>           Use colors in output ("never", "auto" or "always").
-  --columns <n>             Number of columns to use for progress output.
-  --columns max             Use maximum number of columns for progress output.
-  --stderr                  Write to STDERR instead of STDOUT.
-  --stop-on-error           Stop execution upon first error.
-  --stop-on-failure         Stop execution upon first error or failure.
-  --stop-on-risky           Stop execution upon first risky test.
-  --stop-on-skipped         Stop execution upon first skipped test.
-  --stop-on-incomplete      Stop execution upon first incomplete test.
-  -v|--verbose              Output more verbose information.
-  --debug                   Display debugging information during test execution.
-
-  --loader <loader>         TestSuiteLoader implementation to use.
-  --repeat <times>          Runs the test(s) repeatedly.
-  --tap                     Report test execution progress in TAP format.
-  --testdox                 Report test execution progress in TestDox format.
-  --printer <printer>       TestListener implementation to use.
-
-Configuration Options:
-
-  --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
-  -c|--configuration <file> Read configuration from XML file.
-  --no-configuration        Ignore default configuration file (phpunit.xml).
-  --no-coverage             Ignore code coverage configuration.
-  --include-path <path(s)>  Prepend PHP's include_path with given path(s).
-  -d key[=value]            Sets a php.ini value.
-
-Miscellaneous Options:
-
-  -h|--help                 Prints this usage information.
-  --version                 Prints the version and exits.
-
-EOT;
-
-        if (defined('__PHPUNIT_PHAR__')) {
-            print "\n  --check-version           Check whether PHPUnit is the latest version.";
-            print "\n  --self-update             Update PHPUnit to the latest version.\n";
-        }
-    }
-
-    /**
-     * Custom callback for test suite discovery.
-     */
-    protected function handleCustomTestSuite()
-    {
-    }
-
-    private function printVersionString()
-    {
-        if ($this->versionStringPrinted) {
-            return;
-        }
-
-        print PHPUnit_Runner_Version::getVersionString() . "\n\n";
-
-        $this->versionStringPrinted = true;
-    }
-
-    /**
-     */
-    private function showError($message)
-    {
-        $this->printVersionString();
-
-        print $message . "\n";
-
-        exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php b/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
deleted file mode 100644
index 3fc8cbe..0000000
--- a/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Console;
-
-/**
- * Prints the result of a TextUI TestRunner run.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-    const EVENT_TEST_START      = 0;
-    const EVENT_TEST_END        = 1;
-    const EVENT_TESTSUITE_START = 2;
-    const EVENT_TESTSUITE_END   = 3;
-
-    const COLOR_NEVER   = 'never';
-    const COLOR_AUTO    = 'auto';
-    const COLOR_ALWAYS  = 'always';
-    const COLOR_DEFAULT = self::COLOR_NEVER;
-
-    /**
-     * @var array
-     */
-    private static $ansiCodes = array(
-      'bold'       => 1,
-      'fg-black'   => 30,
-      'fg-red'     => 31,
-      'fg-green'   => 32,
-      'fg-yellow'  => 33,
-      'fg-blue'    => 34,
-      'fg-magenta' => 35,
-      'fg-cyan'    => 36,
-      'fg-white'   => 37,
-      'bg-black'   => 40,
-      'bg-red'     => 41,
-      'bg-green'   => 42,
-      'bg-yellow'  => 43,
-      'bg-blue'    => 44,
-      'bg-magenta' => 45,
-      'bg-cyan'    => 46,
-      'bg-white'   => 47
-    );
-
-    /**
-     * @var int
-     */
-    protected $column = 0;
-
-    /**
-     * @var int
-     */
-    protected $maxColumn;
-
-    /**
-     * @var bool
-     */
-    protected $lastTestFailed = false;
-
-    /**
-     * @var int
-     */
-    protected $numAssertions = 0;
-
-    /**
-     * @var int
-     */
-    protected $numTests = -1;
-
-    /**
-     * @var int
-     */
-    protected $numTestsRun = 0;
-
-    /**
-     * @var int
-     */
-    protected $numTestsWidth;
-
-    /**
-     * @var bool
-     */
-    protected $colors = false;
-
-    /**
-     * @var bool
-     */
-    protected $debug = false;
-
-    /**
-     * @var bool
-     */
-    protected $verbose = false;
-
-    /**
-     * @var int
-     */
-    private $numberOfColumns;
-
-    /**
-     * Constructor.
-     *
-     * @param  mixed                       $out
-     * @param  bool                        $verbose
-     * @param  string                      $colors
-     * @param  bool                        $debug
-     * @param  int|string                  $numberOfColumns
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.0.0
-     */
-    public function __construct($out = null, $verbose = false, $colors = self::COLOR_DEFAULT, $debug = false, $numberOfColumns = 80)
-    {
-        parent::__construct($out);
-
-        if (!is_bool($verbose)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'boolean');
-        }
-
-        $availableColors = array(self::COLOR_NEVER, self::COLOR_AUTO, self::COLOR_ALWAYS);
-
-        if (!in_array($colors, $availableColors)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                3,
-                vsprintf('value from "%s", "%s" or "%s"', $availableColors)
-            );
-        }
-
-        if (!is_bool($debug)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'boolean');
-        }
-
-        if (!is_int($numberOfColumns) && $numberOfColumns != 'max') {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(5, 'integer or "max"');
-        }
-
-        $console            = new Console;
-        $maxNumberOfColumns = $console->getNumberOfColumns();
-
-        if ($numberOfColumns == 'max' || $numberOfColumns > $maxNumberOfColumns) {
-            $numberOfColumns = $maxNumberOfColumns;
-        }
-
-        $this->numberOfColumns = $numberOfColumns;
-        $this->verbose         = $verbose;
-        $this->debug           = $debug;
-
-        if ($colors === self::COLOR_AUTO && $console->hasColorSupport()) {
-            $this->colors = true;
-        } else {
-            $this->colors = (self::COLOR_ALWAYS === $colors);
-        }
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    public function printResult(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printHeader();
-
-        $this->printErrors($result);
-        $printSeparator = $result->errorCount() > 0;
-
-        if ($printSeparator && $result->failureCount() > 0) {
-            $this->write("\n--\n\n");
-        }
-
-        $printSeparator = $printSeparator || $result->failureCount() > 0;
-        $this->printFailures($result);
-
-        if ($this->verbose) {
-            if ($printSeparator && $result->riskyCount() > 0) {
-                $this->write("\n--\n\n");
-            }
-
-            $printSeparator = $printSeparator ||
-                              $result->riskyCount() > 0;
-
-            $this->printRisky($result);
-
-            if ($printSeparator && $result->notImplementedCount() > 0) {
-                $this->write("\n--\n\n");
-            }
-
-            $printSeparator = $printSeparator ||
-                              $result->notImplementedCount() > 0;
-
-            $this->printIncompletes($result);
-
-            if ($printSeparator && $result->skippedCount() > 0) {
-                $this->write("\n--\n\n");
-            }
-
-            $this->printSkipped($result);
-        }
-
-        $this->printFooter($result);
-    }
-
-    /**
-     * @param array  $defects
-     * @param string $type
-     */
-    protected function printDefects(array $defects, $type)
-    {
-        $count = count($defects);
-
-        if ($count == 0) {
-            return;
-        }
-
-        $this->write(
-            sprintf(
-                "There %s %d %s%s:\n",
-                ($count == 1) ? 'was' : 'were',
-                $count,
-                $type,
-                ($count == 1) ? '' : 's'
-            )
-        );
-
-        $i = 1;
-
-        foreach ($defects as $defect) {
-            $this->printDefect($defect, $i++);
-        }
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestFailure $defect
-     * @param int                           $count
-     */
-    protected function printDefect(PHPUnit_Framework_TestFailure $defect, $count)
-    {
-        $this->printDefectHeader($defect, $count);
-        $this->printDefectTrace($defect);
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestFailure $defect
-     * @param int                           $count
-     */
-    protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $count)
-    {
-        $this->write(
-            sprintf(
-                "\n%d) %s\n",
-                $count,
-                $defect->getTestName()
-            )
-        );
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestFailure $defect
-     */
-    protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect)
-    {
-        $e = $defect->thrownException();
-        $this->write((string) $e);
-
-        while ($e = $e->getPrevious()) {
-            $this->write("\nCaused by\n" . $e);
-        }
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    protected function printErrors(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printDefects($result->errors(), 'error');
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    protected function printFailures(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printDefects($result->failures(), 'failure');
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    protected function printIncompletes(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printDefects($result->notImplemented(), 'incomplete test');
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     * @since  Method available since Release 4.0.0
-     */
-    protected function printRisky(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printDefects($result->risky(), 'risky test');
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     * @since  Method available since Release 3.0.0
-     */
-    protected function printSkipped(PHPUnit_Framework_TestResult $result)
-    {
-        $this->printDefects($result->skipped(), 'skipped test');
-    }
-
-    protected function printHeader()
-    {
-        $this->write("\n\n" . PHP_Timer::resourceUsage() . "\n\n");
-    }
-
-    /**
-     * @param PHPUnit_Framework_TestResult $result
-     */
-    protected function printFooter(PHPUnit_Framework_TestResult $result)
-    {
-        if (count($result) === 0) {
-            $this->writeWithColor(
-                'fg-black, bg-yellow',
-                'No tests executed!'
-            );
-        } elseif ($result->wasSuccessful() &&
-                 $result->allHarmless() &&
-                 $result->allCompletelyImplemented() &&
-                 $result->noneSkipped()) {
-            $this->writeWithColor(
-                'fg-black, bg-green',
-                sprintf(
-                    'OK (%d test%s, %d assertion%s)',
-                    count($result),
-                    (count($result) == 1) ? '' : 's',
-                    $this->numAssertions,
-                    ($this->numAssertions == 1) ? '' : 's'
-                )
-            );
-        } else {
-            if ($result->wasSuccessful()) {
-                $color = 'fg-black, bg-yellow';
-
-                if ($this->verbose) {
-                    $this->write("\n");
-                }
-
-                $this->writeWithColor(
-                    $color,
-                    'OK, but incomplete, skipped, or risky tests!'
-                );
-            } else {
-                $color = 'fg-white, bg-red';
-
-                $this->write("\n");
-                $this->writeWithColor($color, 'FAILURES!');
-            }
-
-            $this->writeCountString(count($result), 'Tests', $color, true);
-            $this->writeCountString($this->numAssertions, 'Assertions', $color, true);
-            $this->writeCountString($result->errorCount(), 'Errors', $color);
-            $this->writeCountString($result->failureCount(), 'Failures', $color);
-            $this->writeCountString($result->skippedCount(), 'Skipped', $color);
-            $this->writeCountString($result->notImplementedCount(), 'Incomplete', $color);
-            $this->writeCountString($result->riskyCount(), 'Risky', $color);
-            $this->writeWithColor($color, '.', true);
-        }
-    }
-
-    /**
-     */
-    public function printWaitPrompt()
-    {
-        $this->write("\n<RETURN> to continue\n");
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeProgressWithColor('fg-red, bold', 'E');
-        $this->lastTestFailed = true;
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        $this->writeProgressWithColor('bg-red, fg-white', 'F');
-        $this->lastTestFailed = true;
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeProgressWithColor('fg-yellow, bold', 'I');
-        $this->lastTestFailed = true;
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeProgressWithColor('fg-yellow, bold', 'R');
-        $this->lastTestFailed = true;
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeProgressWithColor('fg-cyan, bold', 'S');
-        $this->lastTestFailed = true;
-    }
-
-    /**
-     * A testsuite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        if ($this->numTests == -1) {
-            $this->numTests      = count($suite);
-            $this->numTestsWidth = strlen((string) $this->numTests);
-            $this->maxColumn     = $this->numberOfColumns - strlen('  /  (XXX%)') - (2 * $this->numTestsWidth);
-        }
-    }
-
-    /**
-     * A testsuite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        if ($this->debug) {
-            $this->write(
-                sprintf(
-                    "\nStarting test '%s'.\n",
-                    PHPUnit_Util_Test::describe($test)
-                )
-            );
-        }
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if (!$this->lastTestFailed) {
-            $this->writeProgress('.');
-        }
-
-        if ($test instanceof PHPUnit_Framework_TestCase) {
-            $this->numAssertions += $test->getNumAssertions();
-        } elseif ($test instanceof PHPUnit_Extensions_PhptTestCase) {
-            $this->numAssertions++;
-        }
-
-        $this->lastTestFailed = false;
-
-        if ($test instanceof PHPUnit_Framework_TestCase) {
-            if (!$test->hasExpectationOnOutput()) {
-                $this->write($test->getActualOutput());
-            }
-        }
-    }
-
-    /**
-     * @param string $progress
-     */
-    protected function writeProgress($progress)
-    {
-        $this->write($progress);
-        $this->column++;
-        $this->numTestsRun++;
-
-        if ($this->column == $this->maxColumn) {
-            $this->write(
-                sprintf(
-                    ' %' . $this->numTestsWidth . 'd / %' .
-                    $this->numTestsWidth . 'd (%3s%%)',
-                    $this->numTestsRun,
-                    $this->numTests,
-                    floor(($this->numTestsRun / $this->numTests) * 100)
-                )
-            );
-
-            $this->writeNewLine();
-        }
-    }
-
-    protected function writeNewLine()
-    {
-        $this->column = 0;
-        $this->write("\n");
-    }
-
-    /**
-     * Formats a buffer with a specified ANSI color sequence if colors are
-     * enabled.
-     *
-     * @param  string $color
-     * @param  string $buffer
-     * @return string
-     * @since  Method available since Release 4.0.0
-     */
-    protected function formatWithColor($color, $buffer)
-    {
-        if (!$this->colors) {
-            return $buffer;
-        }
-
-        $codes   = array_map('trim', explode(',', $color));
-        $lines   = explode("\n", $buffer);
-        $padding = max(array_map('strlen', $lines));
-        $styles  = array();
-
-        foreach ($codes as $code) {
-            $styles[] = self::$ansiCodes[$code];
-        }
-
-        $style = sprintf("\x1b[%sm", implode(';', $styles));
-
-        $styledLines = array();
-
-        foreach ($lines as $line) {
-            $styledLines[] = $style . str_pad($line, $padding) . "\x1b[0m";
-        }
-
-        return implode("\n", $styledLines);
-    }
-
-    /**
-     * Writes a buffer out with a color sequence if colors are enabled.
-     *
-     * @param string $color
-     * @param string $buffer
-     * @param bool   $lf
-     * @since  Method available since Release 4.0.0
-     */
-    protected function writeWithColor($color, $buffer, $lf = true)
-    {
-        $this->write($this->formatWithColor($color, $buffer));
-
-        if ($lf) {
-            $this->write("\n");
-        }
-    }
-
-    /**
-     * Writes progress with a color sequence if colors are enabled.
-     *
-     * @param string $color
-     * @param string $buffer
-     * @since  Method available since Release 4.0.0
-     */
-    protected function writeProgressWithColor($color, $buffer)
-    {
-        $buffer = $this->formatWithColor($color, $buffer);
-        $this->writeProgress($buffer);
-    }
-
-    /**
-     * @param int    $count
-     * @param string $name
-     * @param string $color
-     * @param bool   $always
-     * @since  Method available since Release 4.6.5
-     */
-    private function writeCountString($count, $name, $color, $always = false)
-    {
-        static $first = true;
-
-        if ($always || $count > 0) {
-            $this->writeWithColor(
-                $color,
-                sprintf(
-                    '%s%s: %d',
-                    !$first ? ', ' : '',
-                    $name,
-                    $count
-                ),
-                false
-            );
-
-            $first = false;
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php b/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
deleted file mode 100644
index 94909d9..0000000
--- a/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
+++ /dev/null
@@ -1,1023 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Runtime;
-
-/**
- * A TestRunner for the Command Line Interface (CLI)
- * PHP SAPI Module.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
-{
-    const SUCCESS_EXIT   = 0;
-    const FAILURE_EXIT   = 1;
-    const EXCEPTION_EXIT = 2;
-
-    /**
-     * @var PHP_CodeCoverage_Filter
-     */
-    protected $codeCoverageFilter;
-
-    /**
-     * @var PHPUnit_Runner_TestSuiteLoader
-     */
-    protected $loader = null;
-
-    /**
-     * @var PHPUnit_TextUI_ResultPrinter
-     */
-    protected $printer = null;
-
-    /**
-     * @var bool
-     */
-    protected static $versionStringPrinted = false;
-
-    /**
-     * @var array
-     */
-    private $missingExtensions = array();
-
-    /**
-     * @var Runtime
-     */
-    private $runtime;
-
-    /**
-     * @param PHPUnit_Runner_TestSuiteLoader $loader
-     * @param PHP_CodeCoverage_Filter        $filter
-     * @since Method available since Release 3.4.0
-     */
-    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_CodeCoverage_Filter $filter = null)
-    {
-        if ($filter === null) {
-            $filter = $this->getCodeCoverageFilter();
-        }
-
-        $this->codeCoverageFilter = $filter;
-        $this->loader             = $loader;
-        $this->runtime            = new Runtime;
-    }
-
-    /**
-     * @param  PHPUnit_Framework_Test|ReflectionClass $test
-     * @param  array                                  $arguments
-     * @return PHPUnit_Framework_TestResult
-     * @throws PHPUnit_Framework_Exception
-     */
-    public static function run($test, array $arguments = array())
-    {
-        if ($test instanceof ReflectionClass) {
-            $test = new PHPUnit_Framework_TestSuite($test);
-        }
-
-        if ($test instanceof PHPUnit_Framework_Test) {
-            $aTestRunner = new self;
-
-            return $aTestRunner->doRun(
-                $test,
-                $arguments
-            );
-        } else {
-            throw new PHPUnit_Framework_Exception(
-                'No test case or test suite found.'
-            );
-        }
-    }
-
-    /**
-     * @return PHPUnit_Framework_TestResult
-     */
-    protected function createTestResult()
-    {
-        return new PHPUnit_Framework_TestResult;
-    }
-
-    private function processSuiteFilters(PHPUnit_Framework_TestSuite $suite, array $arguments)
-    {
-        if (!$arguments['filter'] &&
-            empty($arguments['groups']) &&
-            empty($arguments['excludeGroups'])) {
-            return;
-        }
-
-        $filterFactory = new PHPUnit_Runner_Filter_Factory();
-
-        if (!empty($arguments['excludeGroups'])) {
-            $filterFactory->addFilter(
-                new ReflectionClass('PHPUnit_Runner_Filter_Group_Exclude'),
-                $arguments['excludeGroups']
-            );
-        }
-
-        if (!empty($arguments['groups'])) {
-            $filterFactory->addFilter(
-                new ReflectionClass('PHPUnit_Runner_Filter_Group_Include'),
-                $arguments['groups']
-            );
-        }
-
-        if ($arguments['filter']) {
-            $filterFactory->addFilter(
-                new ReflectionClass('PHPUnit_Runner_Filter_Test'),
-                $arguments['filter']
-            );
-        }
-        $suite->injectFilter($filterFactory);
-    }
-
-    /**
-     * @param  PHPUnit_Framework_Test       $suite
-     * @param  array                        $arguments
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
-    {
-        if (isset($arguments['configuration'])) {
-            $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] = $arguments['configuration'];
-        }
-
-        $this->handleConfiguration($arguments);
-
-        $this->processSuiteFilters($suite, $arguments);
-
-        if (isset($arguments['bootstrap'])) {
-            $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $arguments['bootstrap'];
-        }
-
-        if ($arguments['backupGlobals'] === false) {
-            $suite->setBackupGlobals(false);
-        }
-
-        if ($arguments['backupStaticAttributes'] === true) {
-            $suite->setBackupStaticAttributes(true);
-        }
-
-        if ($arguments['disallowChangesToGlobalState'] === true) {
-            $suite->setDisallowChangesToGlobalState(true);
-        }
-
-        if (is_integer($arguments['repeat'])) {
-            $test = new PHPUnit_Extensions_RepeatedTest(
-                $suite,
-                $arguments['repeat'],
-                $arguments['processIsolation']
-            );
-
-            $suite = new PHPUnit_Framework_TestSuite();
-            $suite->addTest($test);
-        }
-
-        $result = $this->createTestResult();
-
-        if (!$arguments['convertErrorsToExceptions']) {
-            $result->convertErrorsToExceptions(false);
-        }
-
-        if (!$arguments['convertNoticesToExceptions']) {
-            PHPUnit_Framework_Error_Notice::$enabled = false;
-        }
-
-        if (!$arguments['convertWarningsToExceptions']) {
-            PHPUnit_Framework_Error_Warning::$enabled = false;
-        }
-
-        if ($arguments['stopOnError']) {
-            $result->stopOnError(true);
-        }
-
-        if ($arguments['stopOnFailure']) {
-            $result->stopOnFailure(true);
-        }
-
-        if ($arguments['stopOnIncomplete']) {
-            $result->stopOnIncomplete(true);
-        }
-
-        if ($arguments['stopOnRisky']) {
-            $result->stopOnRisky(true);
-        }
-
-        if ($arguments['stopOnSkipped']) {
-            $result->stopOnSkipped(true);
-        }
-
-        if ($this->printer === null) {
-            if (isset($arguments['printer']) &&
-                $arguments['printer'] instanceof PHPUnit_Util_Printer) {
-                $this->printer = $arguments['printer'];
-            } else {
-                $printerClass = 'PHPUnit_TextUI_ResultPrinter';
-
-                if (isset($arguments['printer']) &&
-                    is_string($arguments['printer']) &&
-                    class_exists($arguments['printer'], false)) {
-                    $class = new ReflectionClass($arguments['printer']);
-
-                    if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
-                        $printerClass = $arguments['printer'];
-                    }
-                }
-
-                $this->printer = new $printerClass(
-                  isset($arguments['stderr']) ? 'php://stderr' : null,
-                  $arguments['verbose'],
-                  $arguments['colors'],
-                  $arguments['debug'],
-                  $arguments['columns']
-                );
-            }
-        }
-
-        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
-            $this->printer->write(
-                PHPUnit_Runner_Version::getVersionString() . "\n"
-            );
-
-            self::$versionStringPrinted = true;
-
-            if ($arguments['verbose']) {
-                $this->printer->write(
-                    sprintf(
-                        "\nRuntime:\t%s",
-                        $this->runtime->getNameWithVersion()
-                    )
-                );
-
-                if ($this->runtime->hasXdebug()) {
-                    $this->printer->write(
-                        sprintf(
-                            ' with Xdebug %s',
-                            phpversion('xdebug')
-                        )
-                    );
-                }
-
-                if (isset($arguments['configuration'])) {
-                    $this->printer->write(
-                        sprintf(
-                            "\nConfiguration:\t%s",
-                            $arguments['configuration']->getFilename()
-                        )
-                    );
-                }
-
-                $this->printer->write("\n");
-            }
-
-            if (isset($arguments['deprecatedStrictModeOption'])) {
-                print "Warning:\tDeprecated option \"--strict\" used\n";
-            } elseif (isset($arguments['deprecatedStrictModeSetting'])) {
-                print "Warning:\tDeprecated configuration setting \"strict\" used\n";
-            }
-
-            if (isset($arguments['deprecatedSeleniumConfiguration'])) {
-                print "Warning:\tDeprecated configuration setting \"selenium\" used\n";
-            }
-        }
-
-        foreach ($arguments['listeners'] as $listener) {
-            $result->addListener($listener);
-        }
-
-        $result->addListener($this->printer);
-
-        if (isset($arguments['testdoxHTMLFile'])) {
-            $result->addListener(
-                new PHPUnit_Util_TestDox_ResultPrinter_HTML(
-                    $arguments['testdoxHTMLFile']
-                )
-            );
-        }
-
-        if (isset($arguments['testdoxTextFile'])) {
-            $result->addListener(
-                new PHPUnit_Util_TestDox_ResultPrinter_Text(
-                    $arguments['testdoxTextFile']
-                )
-            );
-        }
-
-        $codeCoverageReports = 0;
-
-        if (isset($arguments['coverageClover'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['coverageCrap4J'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['coverageHtml'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['coveragePHP'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['coverageText'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['coverageXml'])) {
-            $codeCoverageReports++;
-        }
-
-        if (isset($arguments['noCoverage'])) {
-            $codeCoverageReports = 0;
-        }
-
-        if ($codeCoverageReports > 0 && (!extension_loaded('tokenizer') || !$this->runtime->canCollectCodeCoverage())) {
-            if (!extension_loaded('tokenizer')) {
-                $this->showExtensionNotLoadedWarning(
-                    'tokenizer',
-                    'No code coverage will be generated.'
-                );
-            } elseif (!extension_loaded('Xdebug')) {
-                $this->showExtensionNotLoadedWarning(
-                    'Xdebug',
-                    'No code coverage will be generated.'
-                );
-            }
-
-            $codeCoverageReports = 0;
-        }
-
-        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
-            if ($codeCoverageReports > 0 && !$this->codeCoverageFilter->hasWhitelist()) {
-                $this->printer->write("Warning:\tNo whitelist configured for code coverage\n");
-            }
-
-            $this->printer->write("\n");
-        }
-
-        if ($codeCoverageReports > 0) {
-            $codeCoverage = new PHP_CodeCoverage(
-                null,
-                $this->codeCoverageFilter
-            );
-
-            $codeCoverage->setAddUncoveredFilesFromWhitelist(
-                $arguments['addUncoveredFilesFromWhitelist']
-            );
-
-            $codeCoverage->setCheckForUnintentionallyCoveredCode(
-                $arguments['strictCoverage']
-            );
-
-            $codeCoverage->setProcessUncoveredFilesFromWhitelist(
-                $arguments['processUncoveredFilesFromWhitelist']
-            );
-
-            if (isset($arguments['forceCoversAnnotation'])) {
-                $codeCoverage->setForceCoversAnnotation(
-                    $arguments['forceCoversAnnotation']
-                );
-            }
-
-            if (isset($arguments['mapTestClassNameToCoveredClassName'])) {
-                $codeCoverage->setMapTestClassNameToCoveredClassName(
-                    $arguments['mapTestClassNameToCoveredClassName']
-                );
-            }
-
-            $result->setCodeCoverage($codeCoverage);
-        }
-
-        if ($codeCoverageReports > 1) {
-            if (isset($arguments['cacheTokens'])) {
-                $codeCoverage->setCacheTokens($arguments['cacheTokens']);
-            }
-        }
-
-        if (isset($arguments['jsonLogfile'])) {
-            $result->addListener(
-                new PHPUnit_Util_Log_JSON($arguments['jsonLogfile'])
-            );
-        }
-
-        if (isset($arguments['tapLogfile'])) {
-            $result->addListener(
-                new PHPUnit_Util_Log_TAP($arguments['tapLogfile'])
-            );
-        }
-
-        if (isset($arguments['junitLogfile'])) {
-            $result->addListener(
-                new PHPUnit_Util_Log_JUnit(
-                    $arguments['junitLogfile'],
-                    $arguments['logIncompleteSkipped']
-                )
-            );
-        }
-
-        $result->beStrictAboutTestsThatDoNotTestAnything($arguments['reportUselessTests']);
-        $result->beStrictAboutOutputDuringTests($arguments['disallowTestOutput']);
-        $result->beStrictAboutTodoAnnotatedTests($arguments['disallowTodoAnnotatedTests']);
-        $result->beStrictAboutTestSize($arguments['enforceTimeLimit']);
-        $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']);
-        $result->setTimeoutForMediumTests($arguments['timeoutForMediumTests']);
-        $result->setTimeoutForLargeTests($arguments['timeoutForLargeTests']);
-
-        if ($suite instanceof PHPUnit_Framework_TestSuite) {
-            $suite->setRunTestInSeparateProcess($arguments['processIsolation']);
-        }
-
-        $suite->run($result);
-
-        unset($suite);
-        $result->flushListeners();
-
-        if ($this->printer instanceof PHPUnit_TextUI_ResultPrinter) {
-            $this->printer->printResult($result);
-        }
-
-        if (isset($codeCoverage)) {
-            if (isset($arguments['coverageClover'])) {
-                $this->printer->write(
-                    "\nGenerating code coverage report in Clover XML format ..."
-                );
-
-                $writer = new PHP_CodeCoverage_Report_Clover;
-                $writer->process($codeCoverage, $arguments['coverageClover']);
-
-                $this->printer->write(" done\n");
-                unset($writer);
-            }
-
-            if (isset($arguments['coverageCrap4J'])) {
-                $this->printer->write(
-                    "\nGenerating Crap4J report XML file ..."
-                );
-
-                $writer = new PHP_CodeCoverage_Report_Crap4j($arguments['crap4jThreshold']);
-                $writer->process($codeCoverage, $arguments['coverageCrap4J']);
-
-                $this->printer->write(" done\n");
-                unset($writer);
-            }
-
-            if (isset($arguments['coverageHtml'])) {
-                $this->printer->write(
-                    "\nGenerating code coverage report in HTML format ..."
-                );
-
-                $writer = new PHP_CodeCoverage_Report_HTML(
-                    $arguments['reportLowUpperBound'],
-                    $arguments['reportHighLowerBound'],
-                    sprintf(
-                        ' and <a href="http://phpunit.de/">PHPUnit %s</a>',
-                        PHPUnit_Runner_Version::id()
-                    )
-                );
-
-                $writer->process($codeCoverage, $arguments['coverageHtml']);
-
-                $this->printer->write(" done\n");
-                unset($writer);
-            }
-
-            if (isset($arguments['coveragePHP'])) {
-                $this->printer->write(
-                    "\nGenerating code coverage report in PHP format ..."
-                );
-
-                $writer = new PHP_CodeCoverage_Report_PHP;
-                $writer->process($codeCoverage, $arguments['coveragePHP']);
-
-                $this->printer->write(" done\n");
-                unset($writer);
-            }
-
-            if (isset($arguments['coverageText'])) {
-                if ($arguments['coverageText'] == 'php://stdout') {
-                    $outputStream = $this->printer;
-                    $colors       = $arguments['colors'];
-                } else {
-                    $outputStream = new PHPUnit_Util_Printer($arguments['coverageText']);
-                    $colors       = false;
-                }
-
-                $processor = new PHP_CodeCoverage_Report_Text(
-                    $arguments['reportLowUpperBound'],
-                    $arguments['reportHighLowerBound'],
-                    $arguments['coverageTextShowUncoveredFiles'],
-                    $arguments['coverageTextShowOnlySummary']
-                );
-
-                $outputStream->write(
-                    $processor->process($codeCoverage, $colors)
-                );
-            }
-
-            if (isset($arguments['coverageXml'])) {
-                $this->printer->write(
-                    "\nGenerating code coverage report in PHPUnit XML format ..."
-                );
-
-                $writer = new PHP_CodeCoverage_Report_XML;
-                $writer->process($codeCoverage, $arguments['coverageXml']);
-
-                $this->printer->write(" done\n");
-                unset($writer);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param PHPUnit_TextUI_ResultPrinter $resultPrinter
-     */
-    public function setPrinter(PHPUnit_TextUI_ResultPrinter $resultPrinter)
-    {
-        $this->printer = $resultPrinter;
-    }
-
-    /**
-     * Override to define how to handle a failed loading of
-     * a test suite.
-     *
-     * @param string $message
-     */
-    protected function runFailed($message)
-    {
-        $this->write($message . PHP_EOL);
-        exit(self::FAILURE_EXIT);
-    }
-
-    /**
-     * @param string $buffer
-     * @since  Method available since Release 3.1.0
-     */
-    protected function write($buffer)
-    {
-        if (PHP_SAPI != 'cli') {
-            $buffer = htmlspecialchars($buffer);
-        }
-
-        if ($this->printer !== null) {
-            $this->printer->write($buffer);
-        } else {
-            print $buffer;
-        }
-    }
-
-    /**
-     * Returns the loader to be used.
-     *
-     * @return PHPUnit_Runner_TestSuiteLoader
-     * @since  Method available since Release 2.2.0
-     */
-    public function getLoader()
-    {
-        if ($this->loader === null) {
-            $this->loader = new PHPUnit_Runner_StandardTestSuiteLoader;
-        }
-
-        return $this->loader;
-    }
-
-    /**
-     * @param array $arguments
-     * @since  Method available since Release 3.2.1
-     */
-    protected function handleConfiguration(array &$arguments)
-    {
-        if (isset($arguments['configuration']) &&
-            !$arguments['configuration'] instanceof PHPUnit_Util_Configuration) {
-            $arguments['configuration'] = PHPUnit_Util_Configuration::getInstance(
-                $arguments['configuration']
-            );
-        }
-
-        $arguments['debug']     = isset($arguments['debug'])     ? $arguments['debug']     : false;
-        $arguments['filter']    = isset($arguments['filter'])    ? $arguments['filter']    : false;
-        $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
-
-        if (isset($arguments['configuration'])) {
-            $arguments['configuration']->handlePHPConfiguration();
-
-            $phpunitConfiguration = $arguments['configuration']->getPHPUnitConfiguration();
-
-            if (isset($phpunitConfiguration['deprecatedStrictModeSetting'])) {
-                $arguments['deprecatedStrictModeSetting'] = true;
-            }
-
-            if (isset($phpunitConfiguration['backupGlobals']) &&
-                !isset($arguments['backupGlobals'])) {
-                $arguments['backupGlobals'] = $phpunitConfiguration['backupGlobals'];
-            }
-
-            if (isset($phpunitConfiguration['backupStaticAttributes']) &&
-                !isset($arguments['backupStaticAttributes'])) {
-                $arguments['backupStaticAttributes'] = $phpunitConfiguration['backupStaticAttributes'];
-            }
-
-            if (isset($phpunitConfiguration['disallowChangesToGlobalState']) &&
-                !isset($arguments['disallowChangesToGlobalState'])) {
-                $arguments['disallowChangesToGlobalState'] = $phpunitConfiguration['disallowChangesToGlobalState'];
-            }
-
-            if (isset($phpunitConfiguration['bootstrap']) &&
-                !isset($arguments['bootstrap'])) {
-                $arguments['bootstrap'] = $phpunitConfiguration['bootstrap'];
-            }
-
-            if (isset($phpunitConfiguration['cacheTokens']) &&
-                !isset($arguments['cacheTokens'])) {
-                $arguments['cacheTokens'] = $phpunitConfiguration['cacheTokens'];
-            }
-
-            if (isset($phpunitConfiguration['colors']) &&
-                !isset($arguments['colors'])) {
-                $arguments['colors'] = $phpunitConfiguration['colors'];
-            }
-
-            if (isset($phpunitConfiguration['convertErrorsToExceptions']) &&
-                !isset($arguments['convertErrorsToExceptions'])) {
-                $arguments['convertErrorsToExceptions'] = $phpunitConfiguration['convertErrorsToExceptions'];
-            }
-
-            if (isset($phpunitConfiguration['convertNoticesToExceptions']) &&
-                !isset($arguments['convertNoticesToExceptions'])) {
-                $arguments['convertNoticesToExceptions'] = $phpunitConfiguration['convertNoticesToExceptions'];
-            }
-
-            if (isset($phpunitConfiguration['convertWarningsToExceptions']) &&
-                !isset($arguments['convertWarningsToExceptions'])) {
-                $arguments['convertWarningsToExceptions'] = $phpunitConfiguration['convertWarningsToExceptions'];
-            }
-
-            if (isset($phpunitConfiguration['processIsolation']) &&
-                !isset($arguments['processIsolation'])) {
-                $arguments['processIsolation'] = $phpunitConfiguration['processIsolation'];
-            }
-
-            if (isset($phpunitConfiguration['stopOnError']) &&
-                !isset($arguments['stopOnError'])) {
-                $arguments['stopOnError'] = $phpunitConfiguration['stopOnError'];
-            }
-
-            if (isset($phpunitConfiguration['stopOnFailure']) &&
-                !isset($arguments['stopOnFailure'])) {
-                $arguments['stopOnFailure'] = $phpunitConfiguration['stopOnFailure'];
-            }
-
-            if (isset($phpunitConfiguration['stopOnIncomplete']) &&
-                !isset($arguments['stopOnIncomplete'])) {
-                $arguments['stopOnIncomplete'] = $phpunitConfiguration['stopOnIncomplete'];
-            }
-
-            if (isset($phpunitConfiguration['stopOnRisky']) &&
-                !isset($arguments['stopOnRisky'])) {
-                $arguments['stopOnRisky'] = $phpunitConfiguration['stopOnRisky'];
-            }
-
-            if (isset($phpunitConfiguration['stopOnSkipped']) &&
-                !isset($arguments['stopOnSkipped'])) {
-                $arguments['stopOnSkipped'] = $phpunitConfiguration['stopOnSkipped'];
-            }
-
-            if (isset($phpunitConfiguration['timeoutForSmallTests']) &&
-                !isset($arguments['timeoutForSmallTests'])) {
-                $arguments['timeoutForSmallTests'] = $phpunitConfiguration['timeoutForSmallTests'];
-            }
-
-            if (isset($phpunitConfiguration['timeoutForMediumTests']) &&
-                !isset($arguments['timeoutForMediumTests'])) {
-                $arguments['timeoutForMediumTests'] = $phpunitConfiguration['timeoutForMediumTests'];
-            }
-
-            if (isset($phpunitConfiguration['timeoutForLargeTests']) &&
-                !isset($arguments['timeoutForLargeTests'])) {
-                $arguments['timeoutForLargeTests'] = $phpunitConfiguration['timeoutForLargeTests'];
-            }
-
-            if (isset($phpunitConfiguration['reportUselessTests']) &&
-                !isset($arguments['reportUselessTests'])) {
-                $arguments['reportUselessTests'] = $phpunitConfiguration['reportUselessTests'];
-            }
-
-            if (isset($phpunitConfiguration['strictCoverage']) &&
-                !isset($arguments['strictCoverage'])) {
-                $arguments['strictCoverage'] = $phpunitConfiguration['strictCoverage'];
-            }
-
-            if (isset($phpunitConfiguration['disallowTestOutput']) &&
-                !isset($arguments['disallowTestOutput'])) {
-                $arguments['disallowTestOutput'] = $phpunitConfiguration['disallowTestOutput'];
-            }
-
-            if (isset($phpunitConfiguration['enforceTimeLimit']) &&
-                !isset($arguments['enforceTimeLimit'])) {
-                $arguments['enforceTimeLimit'] = $phpunitConfiguration['enforceTimeLimit'];
-            }
-
-            if (isset($phpunitConfiguration['disallowTodoAnnotatedTests']) &&
-                !isset($arguments['disallowTodoAnnotatedTests'])) {
-                $arguments['disallowTodoAnnotatedTests'] = $phpunitConfiguration['disallowTodoAnnotatedTests'];
-            }
-
-            if (isset($phpunitConfiguration['verbose']) &&
-                !isset($arguments['verbose'])) {
-                $arguments['verbose'] = $phpunitConfiguration['verbose'];
-            }
-
-            if (isset($phpunitConfiguration['forceCoversAnnotation']) &&
-                !isset($arguments['forceCoversAnnotation'])) {
-                $arguments['forceCoversAnnotation'] = $phpunitConfiguration['forceCoversAnnotation'];
-            }
-
-            if (isset($phpunitConfiguration['mapTestClassNameToCoveredClassName']) &&
-                !isset($arguments['mapTestClassNameToCoveredClassName'])) {
-                $arguments['mapTestClassNameToCoveredClassName'] = $phpunitConfiguration['mapTestClassNameToCoveredClassName'];
-            }
-
-            $groupCliArgs = array();
-
-            if (!empty($arguments['groups'])) {
-                $groupCliArgs = $arguments['groups'];
-            }
-
-            $groupConfiguration = $arguments['configuration']->getGroupConfiguration();
-
-            if (!empty($groupConfiguration['include']) &&
-                !isset($arguments['groups'])) {
-                $arguments['groups'] = $groupConfiguration['include'];
-            }
-
-            if (!empty($groupConfiguration['exclude']) &&
-                !isset($arguments['excludeGroups'])) {
-                $arguments['excludeGroups'] = array_diff($groupConfiguration['exclude'], $groupCliArgs);
-            }
-
-            foreach ($arguments['configuration']->getListenerConfiguration() as $listener) {
-                if (!class_exists($listener['class'], false) &&
-                    $listener['file'] !== '') {
-                    require_once $listener['file'];
-                }
-
-                if (class_exists($listener['class'])) {
-                    if (count($listener['arguments']) == 0) {
-                        $listener = new $listener['class'];
-                    } else {
-                        $listenerClass = new ReflectionClass(
-                            $listener['class']
-                        );
-                        $listener      = $listenerClass->newInstanceArgs(
-                            $listener['arguments']
-                        );
-                    }
-
-                    if ($listener instanceof PHPUnit_Framework_TestListener) {
-                        $arguments['listeners'][] = $listener;
-                    }
-                }
-            }
-
-            $loggingConfiguration = $arguments['configuration']->getLoggingConfiguration();
-
-            if (isset($loggingConfiguration['coverage-clover']) &&
-                !isset($arguments['coverageClover'])) {
-                $arguments['coverageClover'] = $loggingConfiguration['coverage-clover'];
-            }
-
-            if (isset($loggingConfiguration['coverage-crap4j']) &&
-                !isset($arguments['coverageCrap4J'])) {
-                $arguments['coverageCrap4J'] = $loggingConfiguration['coverage-crap4j'];
-
-                if (isset($loggingConfiguration['crap4jThreshold']) &&
-                    !isset($arguments['crap4jThreshold'])) {
-                    $arguments['crap4jThreshold'] = $loggingConfiguration['crap4jThreshold'];
-                }
-            }
-
-            if (isset($loggingConfiguration['coverage-html']) &&
-                !isset($arguments['coverageHtml'])) {
-                if (isset($loggingConfiguration['lowUpperBound']) &&
-                    !isset($arguments['reportLowUpperBound'])) {
-                    $arguments['reportLowUpperBound'] = $loggingConfiguration['lowUpperBound'];
-                }
-
-                if (isset($loggingConfiguration['highLowerBound']) &&
-                    !isset($arguments['reportHighLowerBound'])) {
-                    $arguments['reportHighLowerBound'] = $loggingConfiguration['highLowerBound'];
-                }
-
-                $arguments['coverageHtml'] = $loggingConfiguration['coverage-html'];
-            }
-
-            if (isset($loggingConfiguration['coverage-php']) &&
-                !isset($arguments['coveragePHP'])) {
-                $arguments['coveragePHP'] = $loggingConfiguration['coverage-php'];
-            }
-
-            if (isset($loggingConfiguration['coverage-text']) &&
-                !isset($arguments['coverageText'])) {
-                $arguments['coverageText'] = $loggingConfiguration['coverage-text'];
-                if (isset($loggingConfiguration['coverageTextShowUncoveredFiles'])) {
-                    $arguments['coverageTextShowUncoveredFiles'] = $loggingConfiguration['coverageTextShowUncoveredFiles'];
-                } else {
-                    $arguments['coverageTextShowUncoveredFiles'] = false;
-                }
-                if (isset($loggingConfiguration['coverageTextShowOnlySummary'])) {
-                    $arguments['coverageTextShowOnlySummary'] = $loggingConfiguration['coverageTextShowOnlySummary'];
-                } else {
-                    $arguments['coverageTextShowOnlySummary'] = false;
-                }
-            }
-
-            if (isset($loggingConfiguration['coverage-xml']) &&
-                !isset($arguments['coverageXml'])) {
-                $arguments['coverageXml'] = $loggingConfiguration['coverage-xml'];
-            }
-
-            if (isset($loggingConfiguration['json']) &&
-                !isset($arguments['jsonLogfile'])) {
-                $arguments['jsonLogfile'] = $loggingConfiguration['json'];
-            }
-
-            if (isset($loggingConfiguration['plain'])) {
-                $arguments['listeners'][] = new PHPUnit_TextUI_ResultPrinter(
-                    $loggingConfiguration['plain'],
-                    true
-                );
-            }
-
-            if (isset($loggingConfiguration['tap']) &&
-                !isset($arguments['tapLogfile'])) {
-                $arguments['tapLogfile'] = $loggingConfiguration['tap'];
-            }
-
-            if (isset($loggingConfiguration['junit']) &&
-                !isset($arguments['junitLogfile'])) {
-                $arguments['junitLogfile'] = $loggingConfiguration['junit'];
-
-                if (isset($loggingConfiguration['logIncompleteSkipped']) &&
-                    !isset($arguments['logIncompleteSkipped'])) {
-                    $arguments['logIncompleteSkipped'] = $loggingConfiguration['logIncompleteSkipped'];
-                }
-            }
-
-            if (isset($loggingConfiguration['testdox-html']) &&
-                !isset($arguments['testdoxHTMLFile'])) {
-                $arguments['testdoxHTMLFile'] = $loggingConfiguration['testdox-html'];
-            }
-
-            if (isset($loggingConfiguration['testdox-text']) &&
-                !isset($arguments['testdoxTextFile'])) {
-                $arguments['testdoxTextFile'] = $loggingConfiguration['testdox-text'];
-            }
-
-            if ((isset($arguments['coverageClover']) ||
-                isset($arguments['coverageCrap4J']) ||
-                isset($arguments['coverageHtml']) ||
-                isset($arguments['coveragePHP']) ||
-                isset($arguments['coverageText']) ||
-                isset($arguments['coverageXml'])) &&
-                $this->runtime->canCollectCodeCoverage()) {
-                $filterConfiguration                             = $arguments['configuration']->getFilterConfiguration();
-                $arguments['addUncoveredFilesFromWhitelist']     = $filterConfiguration['whitelist']['addUncoveredFilesFromWhitelist'];
-                $arguments['processUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['processUncoveredFilesFromWhitelist'];
-
-                if (empty($filterConfiguration['whitelist']['include']['directory']) &&
-                    empty($filterConfiguration['whitelist']['include']['file'])) {
-                    foreach ($filterConfiguration['blacklist']['include']['directory'] as $dir) {
-                        $this->codeCoverageFilter->addDirectoryToBlacklist(
-                            $dir['path'],
-                            $dir['suffix'],
-                            $dir['prefix'],
-                            $dir['group']
-                        );
-                    }
-
-                    foreach ($filterConfiguration['blacklist']['include']['file'] as $file) {
-                        $this->codeCoverageFilter->addFileToBlacklist($file);
-                    }
-
-                    foreach ($filterConfiguration['blacklist']['exclude']['directory'] as $dir) {
-                        $this->codeCoverageFilter->removeDirectoryFromBlacklist(
-                            $dir['path'],
-                            $dir['suffix'],
-                            $dir['prefix'],
-                            $dir['group']
-                        );
-                    }
-
-                    foreach ($filterConfiguration['blacklist']['exclude']['file'] as $file) {
-                        $this->codeCoverageFilter->removeFileFromBlacklist($file);
-                    }
-                }
-
-                foreach ($filterConfiguration['whitelist']['include']['directory'] as $dir) {
-                    $this->codeCoverageFilter->addDirectoryToWhitelist(
-                        $dir['path'],
-                        $dir['suffix'],
-                        $dir['prefix']
-                    );
-                }
-
-                foreach ($filterConfiguration['whitelist']['include']['file'] as $file) {
-                    $this->codeCoverageFilter->addFileToWhitelist($file);
-                }
-
-                foreach ($filterConfiguration['whitelist']['exclude']['directory'] as $dir) {
-                    $this->codeCoverageFilter->removeDirectoryFromWhitelist(
-                        $dir['path'],
-                        $dir['suffix'],
-                        $dir['prefix']
-                    );
-                }
-
-                foreach ($filterConfiguration['whitelist']['exclude']['file'] as $file) {
-                    $this->codeCoverageFilter->removeFileFromWhitelist($file);
-                }
-            }
-        }
-
-        $arguments['addUncoveredFilesFromWhitelist']     = isset($arguments['addUncoveredFilesFromWhitelist'])     ? $arguments['addUncoveredFilesFromWhitelist']     : true;
-        $arguments['processUncoveredFilesFromWhitelist'] = isset($arguments['processUncoveredFilesFromWhitelist']) ? $arguments['processUncoveredFilesFromWhitelist'] : false;
-        $arguments['backupGlobals']                      = isset($arguments['backupGlobals'])                      ? $arguments['backupGlobals']                      : null;
-        $arguments['backupStaticAttributes']             = isset($arguments['backupStaticAttributes'])             ? $arguments['backupStaticAttributes']             : null;
-        $arguments['disallowChangesToGlobalState']       = isset($arguments['disallowChangesToGlobalState'])       ? $arguments['disallowChangesToGlobalState']       : null;
-        $arguments['cacheTokens']                        = isset($arguments['cacheTokens'])                        ? $arguments['cacheTokens']                        : false;
-        $arguments['columns']                            = isset($arguments['columns'])                            ? $arguments['columns']                            : 80;
-        $arguments['colors']                             = isset($arguments['colors'])                             ? $arguments['colors']                             : PHPUnit_TextUI_ResultPrinter::COLOR_DEFAULT;
-        $arguments['convertErrorsToExceptions']          = isset($arguments['convertErrorsToExceptions'])          ? $arguments['convertErrorsToExceptions']          : true;
-        $arguments['convertNoticesToExceptions']         = isset($arguments['convertNoticesToExceptions'])         ? $arguments['convertNoticesToExceptions']         : true;
-        $arguments['convertWarningsToExceptions']        = isset($arguments['convertWarningsToExceptions'])        ? $arguments['convertWarningsToExceptions']        : true;
-        $arguments['excludeGroups']                      = isset($arguments['excludeGroups'])                      ? $arguments['excludeGroups']                      : array();
-        $arguments['groups']                             = isset($arguments['groups'])                             ? $arguments['groups']                             : array();
-        $arguments['logIncompleteSkipped']               = isset($arguments['logIncompleteSkipped'])               ? $arguments['logIncompleteSkipped']               : false;
-        $arguments['processIsolation']                   = isset($arguments['processIsolation'])                   ? $arguments['processIsolation']                   : false;
-        $arguments['repeat']                             = isset($arguments['repeat'])                             ? $arguments['repeat']                             : false;
-        $arguments['reportHighLowerBound']               = isset($arguments['reportHighLowerBound'])               ? $arguments['reportHighLowerBound']               : 90;
-        $arguments['reportLowUpperBound']                = isset($arguments['reportLowUpperBound'])                ? $arguments['reportLowUpperBound']                : 50;
-        $arguments['crap4jThreshold']                    = isset($arguments['crap4jThreshold'])                    ? $arguments['crap4jThreshold']                    : 30;
-        $arguments['stopOnError']                        = isset($arguments['stopOnError'])                        ? $arguments['stopOnError']                        : false;
-        $arguments['stopOnFailure']                      = isset($arguments['stopOnFailure'])                      ? $arguments['stopOnFailure']                      : false;
-        $arguments['stopOnIncomplete']                   = isset($arguments['stopOnIncomplete'])                   ? $arguments['stopOnIncomplete']                   : false;
-        $arguments['stopOnRisky']                        = isset($arguments['stopOnRisky'])                        ? $arguments['stopOnRisky']                        : false;
-        $arguments['stopOnSkipped']                      = isset($arguments['stopOnSkipped'])                      ? $arguments['stopOnSkipped']                      : false;
-        $arguments['timeoutForSmallTests']               = isset($arguments['timeoutForSmallTests'])               ? $arguments['timeoutForSmallTests']               : 1;
-        $arguments['timeoutForMediumTests']              = isset($arguments['timeoutForMediumTests'])              ? $arguments['timeoutForMediumTests']              : 10;
-        $arguments['timeoutForLargeTests']               = isset($arguments['timeoutForLargeTests'])               ? $arguments['timeoutForLargeTests']               : 60;
-        $arguments['reportUselessTests']                 = isset($arguments['reportUselessTests'])                 ? $arguments['reportUselessTests']                 : false;
-        $arguments['strictCoverage']                     = isset($arguments['strictCoverage'])                     ? $arguments['strictCoverage']                     : false;
-        $arguments['disallowTestOutput']                 = isset($arguments['disallowTestOutput'])                 ? $arguments['disallowTestOutput']                 : false;
-        $arguments['enforceTimeLimit']                   = isset($arguments['enforceTimeLimit'])                   ? $arguments['enforceTimeLimit']                   : false;
-        $arguments['disallowTodoAnnotatedTests']         = isset($arguments['disallowTodoAnnotatedTests'])         ? $arguments['disallowTodoAnnotatedTests']         : false;
-        $arguments['verbose']                            = isset($arguments['verbose'])                            ? $arguments['verbose']                            : false;
-    }
-
-    /**
-     * @param $extension
-     * @param string $message
-     * @since Method available since Release 4.7.3
-     */
-    private function showExtensionNotLoadedWarning($extension, $message = '')
-    {
-        if (isset($this->missingExtensions[$extension])) {
-            return;
-        }
-
-        $this->write("Warning:\t" . 'The ' . $extension . ' extension is not loaded' . "\n");
-
-        if (!empty($message)) {
-            $this->write("\t\t" . $message . "\n");
-        }
-
-        $this->missingExtensions[$extension] = true;
-    }
-
-    /**
-     * @return PHP_CodeCoverage_Filter
-     */
-    private function getCodeCoverageFilter()
-    {
-        $filter = new PHP_CodeCoverage_Filter;
-
-        if (defined('__PHPUNIT_PHAR__')) {
-            $filter->addFileToBlacklist(__PHPUNIT_PHAR__);
-        }
-
-        $blacklist = new PHPUnit_Util_Blacklist;
-
-        foreach ($blacklist->getBlacklistedDirectories() as $directory) {
-            $filter->addDirectoryToBlacklist($directory);
-        }
-
-        return $filter;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Blacklist.php b/vendor/phpunit/phpunit/src/Util/Blacklist.php
deleted file mode 100644
index 35a053e..0000000
--- a/vendor/phpunit/phpunit/src/Util/Blacklist.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility class for blacklisting PHPUnit's own source code files.
- *
- * @since Class available since Release 4.0.0
- */
-class PHPUnit_Util_Blacklist
-{
-    /**
-     * @var array
-     */
-    public static $blacklistedClassNames = array(
-        'File_Iterator'                              => 1,
-        'PHP_CodeCoverage'                           => 1,
-        'PHP_Invoker'                                => 1,
-        'PHP_Timer'                                  => 1,
-        'PHP_Token'                                  => 1,
-        'PHPUnit_Framework_TestCase'                 => 2,
-        'PHPUnit_Extensions_Database_TestCase'       => 2,
-        'PHPUnit_Framework_MockObject_Generator'     => 2,
-        'PHPUnit_Extensions_SeleniumTestCase'        => 2,
-        'Text_Template'                              => 1,
-        'Symfony\Component\Yaml\Yaml'                => 1,
-        'SebastianBergmann\Diff\Diff'                => 1,
-        'SebastianBergmann\Environment\Runtime'      => 1,
-        'SebastianBergmann\Comparator\Comparator'    => 1,
-        'SebastianBergmann\Exporter\Exporter'        => 1,
-        'SebastianBergmann\GlobalState\Snapshot'     => 1,
-        'SebastianBergmann\RecursionContext\Context' => 1,
-        'SebastianBergmann\Version'                  => 1,
-        'Composer\Autoload\ClassLoader'              => 1,
-        'Doctrine\Instantiator\Instantiator'         => 1,
-        'phpDocumentor\Reflection\DocBlock'          => 1,
-        'Prophecy\Prophet'                           => 1
-    );
-
-    /**
-     * @var array
-     */
-    private static $directories;
-
-    /**
-     * @return array
-     * @since  Method available since Release 4.1.0
-     */
-    public function getBlacklistedDirectories()
-    {
-        $this->initialize();
-
-        return self::$directories;
-    }
-
-    /**
-     * @param  string $file
-     * @return bool
-     */
-    public function isBlacklisted($file)
-    {
-        if (defined('PHPUNIT_TESTSUITE')) {
-            return false;
-        }
-
-        $this->initialize();
-
-        foreach (self::$directories as $directory) {
-            if (strpos($file, $directory) === 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private function initialize()
-    {
-        if (self::$directories === null) {
-            self::$directories = array();
-
-            foreach (self::$blacklistedClassNames as $className => $parent) {
-                if (!class_exists($className)) {
-                    continue;
-                }
-
-                $reflector = new ReflectionClass($className);
-                $directory = $reflector->getFileName();
-
-                for ($i = 0; $i < $parent; $i++) {
-                    $directory = dirname($directory);
-                }
-
-                self::$directories[] = $directory;
-            }
-
-            // Hide process isolation workaround on Windows.
-            // @see PHPUnit_Util_PHP::factory()
-            // @see PHPUnit_Util_PHP_Windows::process()
-            if (DIRECTORY_SEPARATOR === '\\') {
-                // tempnam() prefix is limited to first 3 chars.
-                // @see http://php.net/manual/en/function.tempnam.php
-                self::$directories[] = sys_get_temp_dir() . '\\PHP';
-            }
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Configuration.php b/vendor/phpunit/phpunit/src/Util/Configuration.php
deleted file mode 100644
index eab3b65..0000000
--- a/vendor/phpunit/phpunit/src/Util/Configuration.php
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wrapper for the PHPUnit XML configuration file.
- *
- * Example XML configuration file:
- * <code>
- * <?xml version="1.0" encoding="utf-8" ?>
- *
- * <phpunit backupGlobals="true"
- *          backupStaticAttributes="false"
- *          bootstrap="/path/to/bootstrap.php"
- *          cacheTokens="false"
- *          columns="80"
- *          colors="false"
- *          stderr="false"
- *          convertErrorsToExceptions="true"
- *          convertNoticesToExceptions="true"
- *          convertWarningsToExceptions="true"
- *          forceCoversAnnotation="false"
- *          mapTestClassNameToCoveredClassName="false"
- *          printerClass="PHPUnit_TextUI_ResultPrinter"
- *          processIsolation="false"
- *          stopOnError="false"
- *          stopOnFailure="false"
- *          stopOnIncomplete="false"
- *          stopOnRisky="false"
- *          stopOnSkipped="false"
- *          testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
- *          timeoutForSmallTests="1"
- *          timeoutForMediumTests="10"
- *          timeoutForLargeTests="60"
- *          beStrictAboutTestsThatDoNotTestAnything="false"
- *          beStrictAboutOutputDuringTests="false"
- *          beStrictAboutTestSize="false"
- *          beStrictAboutTodoAnnotatedTests="false"
- *          checkForUnintentionallyCoveredCode="false"
- *          disallowChangesToGlobalState="false"
- *          verbose="false">
- *   <testsuites>
- *     <testsuite name="My Test Suite">
- *       <directory suffix="Test.php" phpVersion="5.3.0" phpVersionOperator=">=">/path/to/files</directory>
- *       <file phpVersion="5.3.0" phpVersionOperator=">=">/path/to/MyTest.php</file>
- *       <exclude>/path/to/files/exclude</exclude>
- *     </testsuite>
- *   </testsuites>
- *
- *   <groups>
- *     <include>
- *       <group>name</group>
- *     </include>
- *     <exclude>
- *       <group>name</group>
- *     </exclude>
- *   </groups>
- *
- *   <filter>
- *     <blacklist>
- *       <directory suffix=".php">/path/to/files</directory>
- *       <file>/path/to/file</file>
- *       <exclude>
- *         <directory suffix=".php">/path/to/files</directory>
- *         <file>/path/to/file</file>
- *       </exclude>
- *     </blacklist>
- *     <whitelist addUncoveredFilesFromWhitelist="true"
- *                processUncoveredFilesFromWhitelist="false">
- *       <directory suffix=".php">/path/to/files</directory>
- *       <file>/path/to/file</file>
- *       <exclude>
- *         <directory suffix=".php">/path/to/files</directory>
- *         <file>/path/to/file</file>
- *       </exclude>
- *     </whitelist>
- *   </filter>
- *
- *   <listeners>
- *     <listener class="MyListener" file="/optional/path/to/MyListener.php">
- *       <arguments>
- *         <array>
- *           <element key="0">
- *             <string>Sebastian</string>
- *           </element>
- *         </array>
- *         <integer>22</integer>
- *         <string>April</string>
- *         <double>19.78</double>
- *         <null/>
- *         <object class="stdClass"/>
- *         <file>MyRelativeFile.php</file>
- *         <directory>MyRelativeDir</directory>
- *       </arguments>
- *     </listener>
- *   </listeners>
- *
- *   <logging>
- *     <log type="coverage-html" target="/tmp/report" lowUpperBound="50" highLowerBound="90"/>
- *     <log type="coverage-clover" target="/tmp/clover.xml"/>
- *     <log type="coverage-crap4j" target="/tmp/crap.xml" threshold="30"/>
- *     <log type="json" target="/tmp/logfile.json"/>
- *     <log type="plain" target="/tmp/logfile.txt"/>
- *     <log type="tap" target="/tmp/logfile.tap"/>
- *     <log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>
- *     <log type="testdox-html" target="/tmp/testdox.html"/>
- *     <log type="testdox-text" target="/tmp/testdox.txt"/>
- *   </logging>
- *
- *   <php>
- *     <includePath>.</includePath>
- *     <ini name="foo" value="bar"/>
- *     <const name="foo" value="bar"/>
- *     <var name="foo" value="bar"/>
- *     <env name="foo" value="bar"/>
- *     <post name="foo" value="bar"/>
- *     <get name="foo" value="bar"/>
- *     <cookie name="foo" value="bar"/>
- *     <server name="foo" value="bar"/>
- *     <files name="foo" value="bar"/>
- *     <request name="foo" value="bar"/>
- *   </php>
- *
- *   <selenium>
- *     <browser name="Firefox on Linux"
- *              browser="*firefox /usr/lib/firefox/firefox-bin"
- *              host="my.linux.box"
- *              port="4444"
- *              timeout="30000"/>
- *   </selenium>
- * </phpunit>
- * </code>
- *
- * @since Class available since Release 3.2.0
- */
-class PHPUnit_Util_Configuration
-{
-    private static $instances = array();
-
-    protected $document;
-    protected $xpath;
-    protected $filename;
-
-    /**
-     * Loads a PHPUnit configuration file.
-     *
-     * @param string $filename
-     */
-    protected function __construct($filename)
-    {
-        $this->filename = $filename;
-        $this->document = PHPUnit_Util_XML::loadFile($filename, false, true, true);
-        $this->xpath    = new DOMXPath($this->document);
-    }
-
-    /**
-     * @since  Method available since Release 3.4.0
-     */
-    final private function __clone()
-    {
-    }
-
-    /**
-     * Returns a PHPUnit configuration object.
-     *
-     * @param  string                     $filename
-     * @return PHPUnit_Util_Configuration
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getInstance($filename)
-    {
-        $realpath = realpath($filename);
-
-        if ($realpath === false) {
-            throw new PHPUnit_Framework_Exception(
-                sprintf(
-                    'Could not read "%s".',
-                    $filename
-                )
-            );
-        }
-
-        if (!isset(self::$instances[$realpath])) {
-            self::$instances[$realpath] = new self($realpath);
-        }
-
-        return self::$instances[$realpath];
-    }
-
-    /**
-     * Returns the realpath to the configuration file.
-     *
-     * @return string
-     * @since  Method available since Release 3.6.0
-     */
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Returns the configuration for SUT filtering.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.1
-     */
-    public function getFilterConfiguration()
-    {
-        $addUncoveredFilesFromWhitelist     = true;
-        $processUncoveredFilesFromWhitelist = false;
-
-        $tmp = $this->xpath->query('filter/whitelist');
-
-        if ($tmp->length == 1) {
-            if ($tmp->item(0)->hasAttribute('addUncoveredFilesFromWhitelist')) {
-                $addUncoveredFilesFromWhitelist = $this->getBoolean(
-                    (string) $tmp->item(0)->getAttribute(
-                        'addUncoveredFilesFromWhitelist'
-                    ),
-                    true
-                );
-            }
-
-            if ($tmp->item(0)->hasAttribute('processUncoveredFilesFromWhitelist')) {
-                $processUncoveredFilesFromWhitelist = $this->getBoolean(
-                    (string) $tmp->item(0)->getAttribute(
-                        'processUncoveredFilesFromWhitelist'
-                    ),
-                    false
-                );
-            }
-        }
-
-        return array(
-          'blacklist' => array(
-            'include' => array(
-              'directory' => $this->readFilterDirectories(
-                  'filter/blacklist/directory'
-              ),
-              'file' => $this->readFilterFiles(
-                  'filter/blacklist/file'
-              )
-            ),
-            'exclude' => array(
-              'directory' => $this->readFilterDirectories(
-                  'filter/blacklist/exclude/directory'
-              ),
-              'file' => $this->readFilterFiles(
-                  'filter/blacklist/exclude/file'
-              )
-            )
-          ),
-          'whitelist' => array(
-            'addUncoveredFilesFromWhitelist'     => $addUncoveredFilesFromWhitelist,
-            'processUncoveredFilesFromWhitelist' => $processUncoveredFilesFromWhitelist,
-            'include'                            => array(
-              'directory' => $this->readFilterDirectories(
-                  'filter/whitelist/directory'
-              ),
-              'file' => $this->readFilterFiles(
-                  'filter/whitelist/file'
-              )
-            ),
-            'exclude' => array(
-              'directory' => $this->readFilterDirectories(
-                  'filter/whitelist/exclude/directory'
-              ),
-              'file' => $this->readFilterFiles(
-                  'filter/whitelist/exclude/file'
-              )
-            )
-          )
-        );
-    }
-
-    /**
-     * Returns the configuration for groups.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.1
-     */
-    public function getGroupConfiguration()
-    {
-        $groups = array(
-          'include' => array(),
-          'exclude' => array()
-        );
-
-        foreach ($this->xpath->query('groups/include/group') as $group) {
-            $groups['include'][] = (string) $group->textContent;
-        }
-
-        foreach ($this->xpath->query('groups/exclude/group') as $group) {
-            $groups['exclude'][] = (string) $group->textContent;
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Returns the configuration for listeners.
-     *
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    public function getListenerConfiguration()
-    {
-        $result = array();
-
-        foreach ($this->xpath->query('listeners/listener') as $listener) {
-            $class     = (string) $listener->getAttribute('class');
-            $file      = '';
-            $arguments = array();
-
-            if ($listener->getAttribute('file')) {
-                $file = $this->toAbsolutePath(
-                    (string) $listener->getAttribute('file'),
-                    true
-                );
-            }
-
-            foreach ($listener->childNodes as $node) {
-                if ($node instanceof DOMElement && $node->tagName == 'arguments') {
-                    foreach ($node->childNodes as $argument) {
-                        if ($argument instanceof DOMElement) {
-                            if ($argument->tagName == 'file' ||
-                            $argument->tagName == 'directory') {
-                                $arguments[] = $this->toAbsolutePath((string) $argument->textContent);
-                            } else {
-                                $arguments[] = PHPUnit_Util_XML::xmlToVariable($argument);
-                            }
-                        }
-                    }
-                }
-            }
-
-            $result[] = array(
-              'class'     => $class,
-              'file'      => $file,
-              'arguments' => $arguments
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the logging configuration.
-     *
-     * @return array
-     */
-    public function getLoggingConfiguration()
-    {
-        $result = array();
-
-        foreach ($this->xpath->query('logging/log') as $log) {
-            $type   = (string) $log->getAttribute('type');
-            $target = (string) $log->getAttribute('target');
-
-            if (!$target) {
-                continue;
-            }
-
-            $target = $this->toAbsolutePath($target);
-
-            if ($type == 'coverage-html') {
-                if ($log->hasAttribute('lowUpperBound')) {
-                    $result['lowUpperBound'] = $this->getInteger(
-                        (string) $log->getAttribute('lowUpperBound'),
-                        50
-                    );
-                }
-
-                if ($log->hasAttribute('highLowerBound')) {
-                    $result['highLowerBound'] = $this->getInteger(
-                        (string) $log->getAttribute('highLowerBound'),
-                        90
-                    );
-                }
-            } elseif ($type == 'coverage-crap4j') {
-                if ($log->hasAttribute('threshold')) {
-                    $result['crap4jThreshold'] = $this->getInteger(
-                        (string) $log->getAttribute('threshold'),
-                        30
-                    );
-                }
-            } elseif ($type == 'junit') {
-                if ($log->hasAttribute('logIncompleteSkipped')) {
-                    $result['logIncompleteSkipped'] = $this->getBoolean(
-                        (string) $log->getAttribute('logIncompleteSkipped'),
-                        false
-                    );
-                }
-            } elseif ($type == 'coverage-text') {
-                if ($log->hasAttribute('showUncoveredFiles')) {
-                    $result['coverageTextShowUncoveredFiles'] = $this->getBoolean(
-                        (string) $log->getAttribute('showUncoveredFiles'),
-                        false
-                    );
-                }
-                if ($log->hasAttribute('showOnlySummary')) {
-                    $result['coverageTextShowOnlySummary'] = $this->getBoolean(
-                        (string) $log->getAttribute('showOnlySummary'),
-                        false
-                    );
-                }
-            }
-
-            $result[$type] = $target;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the PHP configuration.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.1
-     */
-    public function getPHPConfiguration()
-    {
-        $result = array(
-          'include_path' => array(),
-          'ini'          => array(),
-          'const'        => array(),
-          'var'          => array(),
-          'env'          => array(),
-          'post'         => array(),
-          'get'          => array(),
-          'cookie'       => array(),
-          'server'       => array(),
-          'files'        => array(),
-          'request'      => array()
-        );
-
-        foreach ($this->xpath->query('php/includePath') as $includePath) {
-            $path = (string) $includePath->textContent;
-            if ($path) {
-                $result['include_path'][] = $this->toAbsolutePath($path);
-            }
-        }
-
-        foreach ($this->xpath->query('php/ini') as $ini) {
-            $name  = (string) $ini->getAttribute('name');
-            $value = (string) $ini->getAttribute('value');
-
-            $result['ini'][$name] = $value;
-        }
-
-        foreach ($this->xpath->query('php/const') as $const) {
-            $name  = (string) $const->getAttribute('name');
-            $value = (string) $const->getAttribute('value');
-
-            $result['const'][$name] = $this->getBoolean($value, $value);
-        }
-
-        foreach (array('var', 'env', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
-            foreach ($this->xpath->query('php/' . $array) as $var) {
-                $name  = (string) $var->getAttribute('name');
-                $value = (string) $var->getAttribute('value');
-
-                $result[$array][$name] = $this->getBoolean($value, $value);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Handles the PHP configuration.
-     *
-     * @since  Method available since Release 3.2.20
-     */
-    public function handlePHPConfiguration()
-    {
-        $configuration = $this->getPHPConfiguration();
-
-        if (! empty($configuration['include_path'])) {
-            ini_set(
-                'include_path',
-                implode(PATH_SEPARATOR, $configuration['include_path']) .
-                PATH_SEPARATOR .
-                ini_get('include_path')
-            );
-        }
-
-        foreach ($configuration['ini'] as $name => $value) {
-            if (defined($value)) {
-                $value = constant($value);
-            }
-
-            ini_set($name, $value);
-        }
-
-        foreach ($configuration['const'] as $name => $value) {
-            if (!defined($name)) {
-                define($name, $value);
-            }
-        }
-
-        foreach (array('var', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
-            // See https://github.com/sebastianbergmann/phpunit/issues/277
-            switch ($array) {
-                case 'var':
-                    $target = &$GLOBALS;
-                    break;
-
-                case 'server':
-                    $target = &$_SERVER;
-                    break;
-
-                default:
-                    $target = &$GLOBALS['_' . strtoupper($array)];
-                    break;
-            }
-
-            foreach ($configuration[$array] as $name => $value) {
-                $target[$name] = $value;
-            }
-        }
-
-        foreach ($configuration['env'] as $name => $value) {
-            if (false === getenv($name)) {
-                putenv("{$name}={$value}");
-            }
-            if (!isset($_ENV[$name])) {
-                $_ENV[$name] = $value;
-            }
-        }
-    }
-
-    /**
-     * Returns the PHPUnit configuration.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.14
-     */
-    public function getPHPUnitConfiguration()
-    {
-        $result = array();
-        $root   = $this->document->documentElement;
-
-        if ($root->hasAttribute('cacheTokens')) {
-            $result['cacheTokens'] = $this->getBoolean(
-                (string) $root->getAttribute('cacheTokens'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('columns')) {
-            $columns = (string) $root->getAttribute('columns');
-
-            if ($columns == 'max') {
-                $result['columns'] = 'max';
-            } else {
-                $result['columns'] = $this->getInteger($columns, 80);
-            }
-        }
-
-        if ($root->hasAttribute('colors')) {
-            /* only allow boolean for compatibility with previous versions
-              'always' only allowed from command line */
-            if ($this->getBoolean($root->getAttribute('colors'), false)) {
-                $result['colors'] = PHPUnit_TextUI_ResultPrinter::COLOR_AUTO;
-            } else {
-                $result['colors'] = PHPUnit_TextUI_ResultPrinter::COLOR_NEVER;
-            }
-        }
-
-        /*
-         * Issue #657
-         */
-        if ($root->hasAttribute('stderr')) {
-            $result['stderr'] = $this->getBoolean(
-                (string) $root->getAttribute('stderr'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('backupGlobals')) {
-            $result['backupGlobals'] = $this->getBoolean(
-                (string) $root->getAttribute('backupGlobals'),
-                true
-            );
-        }
-
-        if ($root->hasAttribute('backupStaticAttributes')) {
-            $result['backupStaticAttributes'] = $this->getBoolean(
-                (string) $root->getAttribute('backupStaticAttributes'),
-                false
-            );
-        }
-
-        if ($root->getAttribute('bootstrap')) {
-            $result['bootstrap'] = $this->toAbsolutePath(
-                (string) $root->getAttribute('bootstrap')
-            );
-        }
-
-        if ($root->hasAttribute('convertErrorsToExceptions')) {
-            $result['convertErrorsToExceptions'] = $this->getBoolean(
-                (string) $root->getAttribute('convertErrorsToExceptions'),
-                true
-            );
-        }
-
-        if ($root->hasAttribute('convertNoticesToExceptions')) {
-            $result['convertNoticesToExceptions'] = $this->getBoolean(
-                (string) $root->getAttribute('convertNoticesToExceptions'),
-                true
-            );
-        }
-
-        if ($root->hasAttribute('convertWarningsToExceptions')) {
-            $result['convertWarningsToExceptions'] = $this->getBoolean(
-                (string) $root->getAttribute('convertWarningsToExceptions'),
-                true
-            );
-        }
-
-        if ($root->hasAttribute('forceCoversAnnotation')) {
-            $result['forceCoversAnnotation'] = $this->getBoolean(
-                (string) $root->getAttribute('forceCoversAnnotation'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('mapTestClassNameToCoveredClassName')) {
-            $result['mapTestClassNameToCoveredClassName'] = $this->getBoolean(
-                (string) $root->getAttribute('mapTestClassNameToCoveredClassName'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('processIsolation')) {
-            $result['processIsolation'] = $this->getBoolean(
-                (string) $root->getAttribute('processIsolation'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('stopOnError')) {
-            $result['stopOnError'] = $this->getBoolean(
-                (string) $root->getAttribute('stopOnError'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('stopOnFailure')) {
-            $result['stopOnFailure'] = $this->getBoolean(
-                (string) $root->getAttribute('stopOnFailure'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('stopOnIncomplete')) {
-            $result['stopOnIncomplete'] = $this->getBoolean(
-                (string) $root->getAttribute('stopOnIncomplete'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('stopOnRisky')) {
-            $result['stopOnRisky'] = $this->getBoolean(
-                (string) $root->getAttribute('stopOnRisky'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('stopOnSkipped')) {
-            $result['stopOnSkipped'] = $this->getBoolean(
-                (string) $root->getAttribute('stopOnSkipped'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('testSuiteLoaderClass')) {
-            $result['testSuiteLoaderClass'] = (string) $root->getAttribute(
-                'testSuiteLoaderClass'
-            );
-        }
-
-        if ($root->getAttribute('testSuiteLoaderFile')) {
-            $result['testSuiteLoaderFile'] = $this->toAbsolutePath(
-                (string) $root->getAttribute('testSuiteLoaderFile')
-            );
-        }
-
-        if ($root->hasAttribute('printerClass')) {
-            $result['printerClass'] = (string) $root->getAttribute(
-                'printerClass'
-            );
-        }
-
-        if ($root->getAttribute('printerFile')) {
-            $result['printerFile'] = $this->toAbsolutePath(
-                (string) $root->getAttribute('printerFile')
-            );
-        }
-
-        if ($root->hasAttribute('timeoutForSmallTests')) {
-            $result['timeoutForSmallTests'] = $this->getInteger(
-                (string) $root->getAttribute('timeoutForSmallTests'),
-                1
-            );
-        }
-
-        if ($root->hasAttribute('timeoutForMediumTests')) {
-            $result['timeoutForMediumTests'] = $this->getInteger(
-                (string) $root->getAttribute('timeoutForMediumTests'),
-                10
-            );
-        }
-
-        if ($root->hasAttribute('timeoutForLargeTests')) {
-            $result['timeoutForLargeTests'] = $this->getInteger(
-                (string) $root->getAttribute('timeoutForLargeTests'),
-                60
-            );
-        }
-
-        if ($root->hasAttribute('beStrictAboutTestsThatDoNotTestAnything')) {
-            $result['reportUselessTests'] = $this->getBoolean(
-                (string) $root->getAttribute('beStrictAboutTestsThatDoNotTestAnything'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('checkForUnintentionallyCoveredCode')) {
-            $result['strictCoverage'] = $this->getBoolean(
-                (string) $root->getAttribute('checkForUnintentionallyCoveredCode'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('beStrictAboutOutputDuringTests')) {
-            $result['disallowTestOutput'] = $this->getBoolean(
-                (string) $root->getAttribute('beStrictAboutOutputDuringTests'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('beStrictAboutChangesToGlobalState')) {
-            $result['disallowChangesToGlobalState'] = $this->getBoolean(
-                (string) $root->getAttribute('beStrictAboutChangesToGlobalState'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('beStrictAboutTestSize')) {
-            $result['enforceTimeLimit'] = $this->getBoolean(
-                (string) $root->getAttribute('beStrictAboutTestSize'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('beStrictAboutTodoAnnotatedTests')) {
-            $result['disallowTodoAnnotatedTests'] = $this->getBoolean(
-                (string) $root->getAttribute('beStrictAboutTodoAnnotatedTests'),
-                false
-            );
-        }
-
-        if ($root->hasAttribute('strict')) {
-            $flag = $this->getBoolean(
-                (string) $root->getAttribute('strict'),
-                false
-            );
-
-            $result['reportUselessTests']          = $flag;
-            $result['strictCoverage']              = $flag;
-            $result['disallowTestOutput']          = $flag;
-            $result['enforceTimeLimit']            = $flag;
-            $result['disallowTodoAnnotatedTests']  = $flag;
-            $result['deprecatedStrictModeSetting'] = true;
-        }
-
-        if ($root->hasAttribute('verbose')) {
-            $result['verbose'] = $this->getBoolean(
-                (string) $root->getAttribute('verbose'),
-                false
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the SeleniumTestCase browser configuration.
-     *
-     * @return array
-     * @since  Method available since Release 3.2.9
-     */
-    public function getSeleniumBrowserConfiguration()
-    {
-        $result = array();
-
-        foreach ($this->xpath->query('selenium/browser') as $config) {
-            $name    = (string) $config->getAttribute('name');
-            $browser = (string) $config->getAttribute('browser');
-
-            if ($config->hasAttribute('host')) {
-                $host = (string) $config->getAttribute('host');
-            } else {
-                $host = 'localhost';
-            }
-
-            if ($config->hasAttribute('port')) {
-                $port = $this->getInteger(
-                    (string) $config->getAttribute('port'),
-                    4444
-                );
-            } else {
-                $port = 4444;
-            }
-
-            if ($config->hasAttribute('timeout')) {
-                $timeout = $this->getInteger(
-                    (string) $config->getAttribute('timeout'),
-                    30000
-                );
-            } else {
-                $timeout = 30000;
-            }
-
-            $result[] = array(
-              'name'    => $name,
-              'browser' => $browser,
-              'host'    => $host,
-              'port'    => $port,
-              'timeout' => $timeout
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the test suite configuration.
-     *
-     * @return PHPUnit_Framework_TestSuite
-     * @since  Method available since Release 3.2.1
-     */
-    public function getTestSuiteConfiguration($testSuiteFilter = null)
-    {
-        $testSuiteNodes = $this->xpath->query('testsuites/testsuite');
-
-        if ($testSuiteNodes->length == 0) {
-            $testSuiteNodes = $this->xpath->query('testsuite');
-        }
-
-        if ($testSuiteNodes->length == 1) {
-            return $this->getTestSuite($testSuiteNodes->item(0), $testSuiteFilter);
-        }
-
-        if ($testSuiteNodes->length > 1) {
-            $suite = new PHPUnit_Framework_TestSuite;
-
-            foreach ($testSuiteNodes as $testSuiteNode) {
-                $suite->addTestSuite(
-                    $this->getTestSuite($testSuiteNode, $testSuiteFilter)
-                );
-            }
-
-            return $suite;
-        }
-    }
-
-    /**
-     * @param  DOMElement                  $testSuiteNode
-     * @return PHPUnit_Framework_TestSuite
-     * @since  Method available since Release 3.4.0
-     */
-    protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter = null)
-    {
-        if ($testSuiteNode->hasAttribute('name')) {
-            $suite = new PHPUnit_Framework_TestSuite(
-                (string) $testSuiteNode->getAttribute('name')
-            );
-        } else {
-            $suite = new PHPUnit_Framework_TestSuite;
-        }
-
-        $exclude = array();
-
-        foreach ($testSuiteNode->getElementsByTagName('exclude') as $excludeNode) {
-            $excludeFile = (string) $excludeNode->textContent;
-            if ($excludeFile) {
-                $exclude[] = $this->toAbsolutePath($excludeFile);
-            }
-        }
-
-        $fileIteratorFacade = new File_Iterator_Facade;
-
-        foreach ($testSuiteNode->getElementsByTagName('directory') as $directoryNode) {
-            if ($testSuiteFilter && $directoryNode->parentNode->getAttribute('name') != $testSuiteFilter) {
-                continue;
-            }
-
-            $directory = (string) $directoryNode->textContent;
-
-            if (empty($directory)) {
-                continue;
-            }
-
-            if ($directoryNode->hasAttribute('phpVersion')) {
-                $phpVersion = (string) $directoryNode->getAttribute('phpVersion');
-            } else {
-                $phpVersion = PHP_VERSION;
-            }
-
-            if ($directoryNode->hasAttribute('phpVersionOperator')) {
-                $phpVersionOperator = (string) $directoryNode->getAttribute('phpVersionOperator');
-            } else {
-                $phpVersionOperator = '>=';
-            }
-
-            if (!version_compare(PHP_VERSION, $phpVersion, $phpVersionOperator)) {
-                continue;
-            }
-
-            if ($directoryNode->hasAttribute('prefix')) {
-                $prefix = (string) $directoryNode->getAttribute('prefix');
-            } else {
-                $prefix = '';
-            }
-
-            if ($directoryNode->hasAttribute('suffix')) {
-                $suffix = (string) $directoryNode->getAttribute('suffix');
-            } else {
-                $suffix = 'Test.php';
-            }
-
-            $files = $fileIteratorFacade->getFilesAsArray(
-                $this->toAbsolutePath($directory),
-                $suffix,
-                $prefix,
-                $exclude
-            );
-            $suite->addTestFiles($files);
-        }
-
-        foreach ($testSuiteNode->getElementsByTagName('file') as $fileNode) {
-            if ($testSuiteFilter && $fileNode->parentNode->getAttribute('name') != $testSuiteFilter) {
-                continue;
-            }
-
-            $file = (string) $fileNode->textContent;
-
-            if (empty($file)) {
-                continue;
-            }
-
-            // Get the absolute path to the file
-            $file = $fileIteratorFacade->getFilesAsArray(
-                $this->toAbsolutePath($file)
-            );
-
-            if (!isset($file[0])) {
-                continue;
-            }
-
-            $file = $file[0];
-
-            if ($fileNode->hasAttribute('phpVersion')) {
-                $phpVersion = (string) $fileNode->getAttribute('phpVersion');
-            } else {
-                $phpVersion = PHP_VERSION;
-            }
-
-            if ($fileNode->hasAttribute('phpVersionOperator')) {
-                $phpVersionOperator = (string) $fileNode->getAttribute('phpVersionOperator');
-            } else {
-                $phpVersionOperator = '>=';
-            }
-
-            if (!version_compare(PHP_VERSION, $phpVersion, $phpVersionOperator)) {
-                continue;
-            }
-
-            $suite->addTestFile($file);
-        }
-
-        return $suite;
-    }
-
-    /**
-     * @param  string $value
-     * @param  bool   $default
-     * @return bool
-     * @since  Method available since Release 3.2.3
-     */
-    protected function getBoolean($value, $default)
-    {
-        if (strtolower($value) == 'false') {
-            return false;
-        } elseif (strtolower($value) == 'true') {
-            return true;
-        }
-
-        return $default;
-    }
-
-    /**
-     * @param  string $value
-     * @param  bool   $default
-     * @return bool
-     * @since  Method available since Release 3.6.0
-     */
-    protected function getInteger($value, $default)
-    {
-        if (is_numeric($value)) {
-            return (int) $value;
-        }
-
-        return $default;
-    }
-
-    /**
-     * @param  string $query
-     * @return array
-     * @since  Method available since Release 3.2.3
-     */
-    protected function readFilterDirectories($query)
-    {
-        $directories = array();
-
-        foreach ($this->xpath->query($query) as $directory) {
-            $directoryPath = (string) $directory->textContent;
-
-            if (!$directoryPath) {
-                continue;
-            }
-
-            if ($directory->hasAttribute('prefix')) {
-                $prefix = (string) $directory->getAttribute('prefix');
-            } else {
-                $prefix = '';
-            }
-
-            if ($directory->hasAttribute('suffix')) {
-                $suffix = (string) $directory->getAttribute('suffix');
-            } else {
-                $suffix = '.php';
-            }
-
-            if ($directory->hasAttribute('group')) {
-                $group = (string) $directory->getAttribute('group');
-            } else {
-                $group = 'DEFAULT';
-            }
-
-            $directories[] = array(
-              'path'   => $this->toAbsolutePath($directoryPath),
-              'prefix' => $prefix,
-              'suffix' => $suffix,
-              'group'  => $group
-            );
-        }
-
-        return $directories;
-    }
-
-    /**
-     * @param  string $query
-     * @return array
-     * @since  Method available since Release 3.2.3
-     */
-    protected function readFilterFiles($query)
-    {
-        $files = array();
-
-        foreach ($this->xpath->query($query) as $file) {
-            $filePath = (string) $file->textContent;
-            if ($filePath) {
-                $files[] = $this->toAbsolutePath($filePath);
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * @param  string $path
-     * @param  bool   $useIncludePath
-     * @return string
-     * @since  Method available since Release 3.5.0
-     */
-    protected function toAbsolutePath($path, $useIncludePath = false)
-    {
-        if ($path[0] === '/') {
-            return $path;
-        }
-
-        // Matches the following on Windows:
-        //  - \\NetworkComputer\Path
-        //  - \\.\D:
-        //  - \\.\c:
-        //  - C:\Windows
-        //  - C:\windows
-        //  - C:/windows
-        //  - c:/windows
-        if (defined('PHP_WINDOWS_VERSION_BUILD') &&
-            ($path[0] === '\\' ||
-            (strlen($path) >= 3 && preg_match('#^[A-Z]\:[/\\\]#i', substr($path, 0, 3))))) {
-            return $path;
-        }
-
-        // Stream
-        if (strpos($path, '://') !== false) {
-            return $path;
-        }
-
-        $file = dirname($this->filename) . DIRECTORY_SEPARATOR . $path;
-
-        if ($useIncludePath && !file_exists($file)) {
-            $includePathFile = stream_resolve_include_path($path);
-
-            if ($includePathFile) {
-                $file = $includePathFile;
-            }
-        }
-
-        return $file;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/ErrorHandler.php b/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
deleted file mode 100644
index 59f274d..0000000
--- a/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-// Workaround for http://bugs.php.net/bug.php?id=47987,
-// see https://github.com/sebastianbergmann/phpunit/issues#issue/125 for details
-// Use dirname(__DIR__) instead of using /../ because of https://github.com/facebook/hhvm/issues/5215
-require_once dirname(__DIR__) . '/Framework/Error.php';
-require_once dirname(__DIR__) . '/Framework/Error/Notice.php';
-require_once dirname(__DIR__) . '/Framework/Error/Warning.php';
-require_once dirname(__DIR__) . '/Framework/Error/Deprecated.php';
-
-/**
- * Error handler that converts PHP errors and warnings to exceptions.
- *
- * @since Class available since Release 3.3.0
- */
-class PHPUnit_Util_ErrorHandler
-{
-    protected static $errorStack = array();
-
-    /**
-     * Returns the error stack.
-     *
-     * @return array
-     */
-    public static function getErrorStack()
-    {
-        return self::$errorStack;
-    }
-
-    /**
-     * @param  int                     $errno
-     * @param  string                  $errstr
-     * @param  string                  $errfile
-     * @param  int                     $errline
-     * @throws PHPUnit_Framework_Error
-     */
-    public static function handleError($errno, $errstr, $errfile, $errline)
-    {
-        if (!($errno & error_reporting())) {
-            return false;
-        }
-
-        self::$errorStack[] = array($errno, $errstr, $errfile, $errline);
-
-        $trace = debug_backtrace(false);
-        array_shift($trace);
-
-        foreach ($trace as $frame) {
-            if ($frame['function'] == '__toString') {
-                return false;
-            }
-        }
-
-        if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) {
-            if (PHPUnit_Framework_Error_Notice::$enabled !== true) {
-                return false;
-            }
-
-            $exception = 'PHPUnit_Framework_Error_Notice';
-        } elseif ($errno == E_WARNING || $errno == E_USER_WARNING) {
-            if (PHPUnit_Framework_Error_Warning::$enabled !== true) {
-                return false;
-            }
-
-            $exception = 'PHPUnit_Framework_Error_Warning';
-        } elseif ($errno == E_DEPRECATED || $errno == E_USER_DEPRECATED) {
-            if (PHPUnit_Framework_Error_Deprecated::$enabled !== true) {
-                return false;
-            }
-
-            $exception = 'PHPUnit_Framework_Error_Deprecated';
-        } else {
-            $exception = 'PHPUnit_Framework_Error';
-        }
-
-        throw new $exception($errstr, $errno, $errfile, $errline);
-    }
-
-    /**
-     * Registers an error handler and returns a function that will restore
-     * the previous handler when invoked
-     * @param  int       $severity PHP predefined error constant
-     * @throws Exception if event of specified severity is emitted
-     */
-    public static function handleErrorOnce($severity = E_WARNING)
-    {
-        $terminator = function () {
-            static $expired = false;
-            if (!$expired) {
-                $expired = true;
-                // cleans temporary error handler
-                return restore_error_handler();
-            }
-        };
-
-        set_error_handler(function ($errno, $errstr) use ($severity) {
-            if ($errno === $severity) {
-                return;
-            }
-
-            return false;
-        });
-
-        return $terminator;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Fileloader.php b/vendor/phpunit/phpunit/src/Util/Fileloader.php
deleted file mode 100644
index adabc9c..0000000
--- a/vendor/phpunit/phpunit/src/Util/Fileloader.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility methods to load PHP sourcefiles.
- *
- * @since Class available since Release 2.3.0
- */
-class PHPUnit_Util_Fileloader
-{
-    /**
-     * Checks if a PHP sourcefile is readable.
-     * The sourcefile is loaded through the load() method.
-     *
-     * @param  string                      $filename
-     * @return string
-     * @throws PHPUnit_Framework_Exception
-     */
-    public static function checkAndLoad($filename)
-    {
-        $includePathFilename = stream_resolve_include_path($filename);
-
-        if (!$includePathFilename || !is_readable($includePathFilename)) {
-            throw new PHPUnit_Framework_Exception(
-                sprintf('Cannot open file "%s".' . "\n", $filename)
-            );
-        }
-
-        self::load($includePathFilename);
-
-        return $includePathFilename;
-    }
-
-    /**
-     * Loads a PHP sourcefile.
-     *
-     * @param  string $filename
-     * @return mixed
-     * @since  Method available since Release 3.0.0
-     */
-    public static function load($filename)
-    {
-        $oldVariableNames = array_keys(get_defined_vars());
-
-        include_once $filename;
-
-        $newVariables     = get_defined_vars();
-        $newVariableNames = array_diff(
-            array_keys($newVariables),
-            $oldVariableNames
-        );
-
-        foreach ($newVariableNames as $variableName) {
-            if ($variableName != 'oldVariableNames') {
-                $GLOBALS[$variableName] = $newVariables[$variableName];
-            }
-        }
-
-        return $filename;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Filesystem.php b/vendor/phpunit/phpunit/src/Util/Filesystem.php
deleted file mode 100644
index 3caa5e9..0000000
--- a/vendor/phpunit/phpunit/src/Util/Filesystem.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Filesystem helpers.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Filesystem
-{
-    /**
-     * @var array
-     */
-    protected static $buffer = array();
-
-    /**
-     * Maps class names to source file names:
-     *   - PEAR CS:   Foo_Bar_Baz -> Foo/Bar/Baz.php
-     *   - Namespace: Foo\Bar\Baz -> Foo/Bar/Baz.php
-     *
-     * @param  string $className
-     * @return string
-     * @since  Method available since Release 3.4.0
-     */
-    public static function classNameToFilename($className)
-    {
-        return str_replace(
-            array('_', '\\'),
-            DIRECTORY_SEPARATOR,
-            $className
-        ) . '.php';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Filter.php b/vendor/phpunit/phpunit/src/Util/Filter.php
deleted file mode 100644
index faf7a5b..0000000
--- a/vendor/phpunit/phpunit/src/Util/Filter.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility class for code filtering.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Util_Filter
-{
-    /**
-     * Filters stack frames from PHPUnit classes.
-     *
-     * @param  Exception $e
-     * @param  bool      $asString
-     * @return string
-     */
-    public static function getFilteredStacktrace(Exception $e, $asString = true)
-    {
-        $prefix = false;
-        $script = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
-
-        if (defined('__PHPUNIT_PHAR_ROOT__')) {
-            $prefix = __PHPUNIT_PHAR_ROOT__;
-        }
-
-        if ($asString === true) {
-            $filteredStacktrace = '';
-        } else {
-            $filteredStacktrace = array();
-        }
-
-        if ($e instanceof PHPUnit_Framework_SyntheticError) {
-            $eTrace = $e->getSyntheticTrace();
-            $eFile  = $e->getSyntheticFile();
-            $eLine  = $e->getSyntheticLine();
-        } elseif ($e instanceof PHPUnit_Framework_Exception) {
-            $eTrace = $e->getSerializableTrace();
-            $eFile  = $e->getFile();
-            $eLine  = $e->getLine();
-        } else {
-            if ($e->getPrevious()) {
-                $e = $e->getPrevious();
-            }
-            $eTrace = $e->getTrace();
-            $eFile  = $e->getFile();
-            $eLine  = $e->getLine();
-        }
-
-        if (!self::frameExists($eTrace, $eFile, $eLine)) {
-            array_unshift(
-                $eTrace,
-                array('file' => $eFile, 'line' => $eLine)
-            );
-        }
-
-        $blacklist = new PHPUnit_Util_Blacklist;
-
-        foreach ($eTrace as $frame) {
-            if (isset($frame['file']) && is_file($frame['file']) &&
-                !$blacklist->isBlacklisted($frame['file']) &&
-                ($prefix === false || strpos($frame['file'], $prefix) !== 0) &&
-                $frame['file'] !== $script) {
-                if ($asString === true) {
-                    $filteredStacktrace .= sprintf(
-                        "%s:%s\n",
-                        $frame['file'],
-                        isset($frame['line']) ? $frame['line'] : '?'
-                    );
-                } else {
-                    $filteredStacktrace[] = $frame;
-                }
-            }
-        }
-
-        return $filteredStacktrace;
-    }
-
-    /**
-     * @param  array  $trace
-     * @param  string $file
-     * @param  int    $line
-     * @return bool
-     * @since  Method available since Release 3.3.2
-     */
-    private static function frameExists(array $trace, $file, $line)
-    {
-        foreach ($trace as $frame) {
-            if (isset($frame['file']) && $frame['file'] == $file &&
-                isset($frame['line']) && $frame['line'] == $line) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Getopt.php b/vendor/phpunit/phpunit/src/Util/Getopt.php
deleted file mode 100644
index ba21be3..0000000
--- a/vendor/phpunit/phpunit/src/Util/Getopt.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Command-line options parsing class.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Getopt
-{
-    public static function getopt(array $args, $short_options, $long_options = null)
-    {
-        if (empty($args)) {
-            return array(array(), array());
-        }
-
-        $opts     = array();
-        $non_opts = array();
-
-        if ($long_options) {
-            sort($long_options);
-        }
-
-        if (isset($args[0][0]) && $args[0][0] != '-') {
-            array_shift($args);
-        }
-
-        reset($args);
-        array_map('trim', $args);
-
-        while (list($i, $arg) = each($args)) {
-            if ($arg == '') {
-                continue;
-            }
-
-            if ($arg == '--') {
-                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
-                break;
-            }
-
-            if ($arg[0] != '-' ||
-                (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
-                $non_opts[] = $args[$i];
-                continue;
-            } elseif (strlen($arg) > 1 && $arg[1] == '-') {
-                self::parseLongOption(
-                    substr($arg, 2),
-                    $long_options,
-                    $opts,
-                    $args
-                );
-            } else {
-                self::parseShortOption(
-                    substr($arg, 1),
-                    $short_options,
-                    $opts,
-                    $args
-                );
-            }
-        }
-
-        return array($opts, $non_opts);
-    }
-
-    protected static function parseShortOption($arg, $short_options, &$opts, &$args)
-    {
-        $argLen = strlen($arg);
-
-        for ($i = 0; $i < $argLen; $i++) {
-            $opt     = $arg[$i];
-            $opt_arg = null;
-
-            if (($spec = strstr($short_options, $opt)) === false ||
-                $arg[$i] == ':') {
-                throw new PHPUnit_Framework_Exception(
-                    "unrecognized option -- $opt"
-                );
-            }
-
-            if (strlen($spec) > 1 && $spec[1] == ':') {
-                if (strlen($spec) > 2 && $spec[2] == ':') {
-                    if ($i + 1 < $argLen) {
-                        $opts[] = array($opt, substr($arg, $i + 1));
-                        break;
-                    }
-                } else {
-                    if ($i + 1 < $argLen) {
-                        $opts[] = array($opt, substr($arg, $i + 1));
-                        break;
-                    } elseif (list(, $opt_arg) = each($args)) {
-                    } else {
-                        throw new PHPUnit_Framework_Exception(
-                            "option requires an argument -- $opt"
-                        );
-                    }
-                }
-            }
-
-            $opts[] = array($opt, $opt_arg);
-        }
-    }
-
-    protected static function parseLongOption($arg, $long_options, &$opts, &$args)
-    {
-        $count   = count($long_options);
-        $list    = explode('=', $arg);
-        $opt     = $list[0];
-        $opt_arg = null;
-
-        if (count($list) > 1) {
-            $opt_arg = $list[1];
-        }
-
-        $opt_len = strlen($opt);
-
-        for ($i = 0; $i < $count; $i++) {
-            $long_opt  = $long_options[$i];
-            $opt_start = substr($long_opt, 0, $opt_len);
-
-            if ($opt_start != $opt) {
-                continue;
-            }
-
-            $opt_rest = substr($long_opt, $opt_len);
-
-            if ($opt_rest != '' && $opt[0] != '=' && $i + 1 < $count &&
-                $opt == substr($long_options[$i+1], 0, $opt_len)) {
-                throw new PHPUnit_Framework_Exception(
-                    "option --$opt is ambiguous"
-                );
-            }
-
-            if (substr($long_opt, -1) == '=') {
-                if (substr($long_opt, -2) != '==') {
-                    if (!strlen($opt_arg) &&
-                        !(list(, $opt_arg) = each($args))) {
-                        throw new PHPUnit_Framework_Exception(
-                            "option --$opt requires an argument"
-                        );
-                    }
-                }
-            } elseif ($opt_arg) {
-                throw new PHPUnit_Framework_Exception(
-                    "option --$opt doesn't allow an argument"
-                );
-            }
-
-            $full_option = '--' . preg_replace('/={1,2}$/', '', $long_opt);
-            $opts[]      = array($full_option, $opt_arg);
-
-            return;
-        }
-
-        throw new PHPUnit_Framework_Exception("unrecognized option --$opt");
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/GlobalState.php b/vendor/phpunit/phpunit/src/Util/GlobalState.php
deleted file mode 100644
index 35af703..0000000
--- a/vendor/phpunit/phpunit/src/Util/GlobalState.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Util_GlobalState
-{
-    /**
-     * @var array
-     */
-    protected static $superGlobalArrays = array(
-      '_ENV',
-      '_POST',
-      '_GET',
-      '_COOKIE',
-      '_SERVER',
-      '_FILES',
-      '_REQUEST'
-    );
-
-    /**
-     * @var array
-     */
-    protected static $superGlobalArraysLong = array(
-      'HTTP_ENV_VARS',
-      'HTTP_POST_VARS',
-      'HTTP_GET_VARS',
-      'HTTP_COOKIE_VARS',
-      'HTTP_SERVER_VARS',
-      'HTTP_POST_FILES'
-    );
-
-    public static function getIncludedFilesAsString()
-    {
-        return static::processIncludedFilesAsString(get_included_files());
-    }
-
-    public static function processIncludedFilesAsString(array $files)
-    {
-        $blacklist = new PHPUnit_Util_Blacklist;
-        $prefix    = false;
-        $result    = '';
-
-        if (defined('__PHPUNIT_PHAR__')) {
-            $prefix = 'phar://' . __PHPUNIT_PHAR__ . '/';
-        }
-
-        for ($i = count($files) - 1; $i > 0; $i--) {
-            $file = $files[$i];
-
-            if ($prefix !== false && strpos($file, $prefix) === 0) {
-                continue;
-            }
-
-            // Skip virtual file system protocols
-            if (preg_match('/^(vfs|phpvfs[a-z0-9]+):/', $file)) {
-                continue;
-            }
-
-            if (!$blacklist->isBlacklisted($file) && is_file($file)) {
-                $result = 'require_once \'' . $file . "';\n" . $result;
-            }
-        }
-
-        return $result;
-    }
-
-    public static function getIniSettingsAsString()
-    {
-        $result      = '';
-        $iniSettings = ini_get_all(null, false);
-
-        foreach ($iniSettings as $key => $value) {
-            $result .= sprintf(
-                '@ini_set(%s, %s);' . "\n",
-                self::exportVariable($key),
-                self::exportVariable($value)
-            );
-        }
-
-        return $result;
-    }
-
-    public static function getConstantsAsString()
-    {
-        $constants = get_defined_constants(true);
-        $result    = '';
-
-        if (isset($constants['user'])) {
-            foreach ($constants['user'] as $name => $value) {
-                $result .= sprintf(
-                    'if (!defined(\'%s\')) define(\'%s\', %s);' . "\n",
-                    $name,
-                    $name,
-                    self::exportVariable($value)
-                );
-            }
-        }
-
-        return $result;
-    }
-
-    public static function getGlobalsAsString()
-    {
-        $result            = '';
-        $superGlobalArrays = self::getSuperGlobalArrays();
-
-        foreach ($superGlobalArrays as $superGlobalArray) {
-            if (isset($GLOBALS[$superGlobalArray]) &&
-                is_array($GLOBALS[$superGlobalArray])) {
-                foreach (array_keys($GLOBALS[$superGlobalArray]) as $key) {
-                    if ($GLOBALS[$superGlobalArray][$key] instanceof Closure) {
-                        continue;
-                    }
-
-                    $result .= sprintf(
-                        '$GLOBALS[\'%s\'][\'%s\'] = %s;' . "\n",
-                        $superGlobalArray,
-                        $key,
-                        self::exportVariable($GLOBALS[$superGlobalArray][$key])
-                    );
-                }
-            }
-        }
-
-        $blacklist   = $superGlobalArrays;
-        $blacklist[] = 'GLOBALS';
-
-        foreach (array_keys($GLOBALS) as $key) {
-            if (!in_array($key, $blacklist) && !$GLOBALS[$key] instanceof Closure) {
-                $result .= sprintf(
-                    '$GLOBALS[\'%s\'] = %s;' . "\n",
-                    $key,
-                    self::exportVariable($GLOBALS[$key])
-                );
-            }
-        }
-
-        return $result;
-    }
-
-    protected static function getSuperGlobalArrays()
-    {
-        if (ini_get('register_long_arrays') == '1') {
-            return array_merge(
-                self::$superGlobalArrays,
-                self::$superGlobalArraysLong
-            );
-        } else {
-            return self::$superGlobalArrays;
-        }
-    }
-
-    protected static function exportVariable($variable)
-    {
-        if (is_scalar($variable) || is_null($variable) ||
-           (is_array($variable) && self::arrayOnlyContainsScalars($variable))) {
-            return var_export($variable, true);
-        }
-
-        return 'unserialize(' .
-                var_export(serialize($variable), true) .
-                ')';
-    }
-
-    protected static function arrayOnlyContainsScalars(array $array)
-    {
-        $result = true;
-
-        foreach ($array as $element) {
-            if (is_array($element)) {
-                $result = self::arrayOnlyContainsScalars($element);
-            } elseif (!is_scalar($element) && !is_null($element)) {
-                $result = false;
-            }
-
-            if ($result === false) {
-                break;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php b/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
deleted file mode 100644
index 0a675fd..0000000
--- a/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Factory for PHPUnit_Framework_Exception objects that are used to describe
- * invalid arguments passed to a function or method.
- *
- * @since Class available since Release 3.4.0
- */
-class PHPUnit_Util_InvalidArgumentHelper
-{
-    /**
-     * @param  int                         $argument
-     * @param  string                      $type
-     * @param  mixed                       $value
-     * @return PHPUnit_Framework_Exception
-     */
-    public static function factory($argument, $type, $value = null)
-    {
-        $stack = debug_backtrace(false);
-
-        return new PHPUnit_Framework_Exception(
-            sprintf(
-                'Argument #%d%sof %s::%s() must be a %s',
-                $argument,
-                $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
-                $stack[1]['class'],
-                $stack[1]['function'],
-                $type
-            )
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/JSON.php b/vendor/phpunit/phpunit/src/Util/Log/JSON.php
deleted file mode 100644
index 67f66a8..0000000
--- a/vendor/phpunit/phpunit/src/Util/Log/JSON.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestListener that generates JSON messages.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Log_JSON extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-    /**
-     * @var string
-     */
-    protected $currentTestSuiteName = '';
-
-    /**
-     * @var string
-     */
-    protected $currentTestName = '';
-
-    /**
-     * @var bool
-     */
-    protected $currentTestPass = true;
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeCase(
-            'error',
-            $time,
-            PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
-            $e->getMessage(),
-            $test
-        );
-
-        $this->currentTestPass = false;
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        $this->writeCase(
-            'fail',
-            $time,
-            PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
-            $e->getMessage(),
-            $test
-        );
-
-        $this->currentTestPass = false;
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeCase(
-            'error',
-            $time,
-            PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
-            'Incomplete Test: ' . $e->getMessage(),
-            $test
-        );
-
-        $this->currentTestPass = false;
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeCase(
-            'error',
-            $time,
-            PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
-            'Risky Test: ' . $e->getMessage(),
-            $test
-        );
-
-        $this->currentTestPass = false;
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeCase(
-            'error',
-            $time,
-            PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
-            'Skipped Test: ' . $e->getMessage(),
-            $test
-        );
-
-        $this->currentTestPass = false;
-    }
-
-    /**
-     * A testsuite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->currentTestSuiteName = $suite->getName();
-        $this->currentTestName      = '';
-
-        $this->write(
-            array(
-            'event' => 'suiteStart',
-            'suite' => $this->currentTestSuiteName,
-            'tests' => count($suite)
-            )
-        );
-    }
-
-    /**
-     * A testsuite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->currentTestSuiteName = '';
-        $this->currentTestName      = '';
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        $this->currentTestName = PHPUnit_Util_Test::describe($test);
-        $this->currentTestPass = true;
-
-        $this->write(
-            array(
-            'event' => 'testStart',
-            'suite' => $this->currentTestSuiteName,
-            'test'  => $this->currentTestName
-            )
-        );
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if ($this->currentTestPass) {
-            $this->writeCase('pass', $time, array(), '', $test);
-        }
-    }
-
-    /**
-     * @param string                          $status
-     * @param float                           $time
-     * @param array                           $trace
-     * @param string                          $message
-     * @param PHPUnit_Framework_TestCase|null $test
-     */
-    protected function writeCase($status, $time, array $trace = array(), $message = '', $test = null)
-    {
-        $output = '';
-        // take care of TestSuite producing error (e.g. by running into exception) as TestSuite doesn't have hasOutput
-        if ($test !== null && method_exists($test, 'hasOutput') && $test->hasOutput()) {
-            $output = $test->getActualOutput();
-        }
-        $this->write(
-            array(
-            'event'   => 'test',
-            'suite'   => $this->currentTestSuiteName,
-            'test'    => $this->currentTestName,
-            'status'  => $status,
-            'time'    => $time,
-            'trace'   => $trace,
-            'message' => PHPUnit_Util_String::convertToUtf8($message),
-            'output'  => $output,
-            )
-        );
-    }
-
-    /**
-     * @param string $buffer
-     */
-    public function write($buffer)
-    {
-        array_walk_recursive($buffer, function (&$input) {
-            if (is_string($input)) {
-                $input = PHPUnit_Util_String::convertToUtf8($input);
-            }
-        });
-
-        $flags = 0;
-
-        if (defined('JSON_PRETTY_PRINT')) {
-            $flags |= JSON_PRETTY_PRINT;
-        }
-
-        parent::write(json_encode($buffer, $flags));
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php b/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
deleted file mode 100644
index 745be7d..0000000
--- a/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestListener that generates a logfile of the test execution in XML markup.
- *
- * The XML markup used is the same as the one that is used by the JUnit Ant task.
- *
- * @since Class available since Release 2.1.0
- */
-class PHPUnit_Util_Log_JUnit extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-    /**
-     * @var DOMDocument
-     */
-    protected $document;
-
-    /**
-     * @var DOMElement
-     */
-    protected $root;
-
-    /**
-     * @var bool
-     */
-    protected $logIncompleteSkipped = false;
-
-    /**
-     * @var bool
-     */
-    protected $writeDocument = true;
-
-    /**
-     * @var DOMElement[]
-     */
-    protected $testSuites = array();
-
-    /**
-     * @var integer[]
-     */
-    protected $testSuiteTests = array(0);
-
-    /**
-     * @var integer[]
-     */
-    protected $testSuiteAssertions = array(0);
-
-    /**
-     * @var integer[]
-     */
-    protected $testSuiteErrors = array(0);
-
-    /**
-     * @var integer[]
-     */
-    protected $testSuiteFailures = array(0);
-
-    /**
-     * @var integer[]
-     */
-    protected $testSuiteTimes = array(0);
-
-    /**
-     * @var int
-     */
-    protected $testSuiteLevel = 0;
-
-    /**
-     * @var DOMElement
-     */
-    protected $currentTestCase = null;
-
-    /**
-     * @var bool
-     */
-    protected $attachCurrentTestCase = true;
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $out
-     * @param bool  $logIncompleteSkipped
-     */
-    public function __construct($out = null, $logIncompleteSkipped = false)
-    {
-        $this->document               = new DOMDocument('1.0', 'UTF-8');
-        $this->document->formatOutput = true;
-
-        $this->root = $this->document->createElement('testsuites');
-        $this->document->appendChild($this->root);
-
-        parent::__construct($out);
-
-        $this->logIncompleteSkipped = $logIncompleteSkipped;
-    }
-
-    /**
-     * Flush buffer and close output.
-     */
-    public function flush()
-    {
-        if ($this->writeDocument === true) {
-            $this->write($this->getXML());
-        }
-
-        parent::flush();
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if ($this->currentTestCase === null) {
-            return;
-        }
-
-        if ($test instanceof PHPUnit_Framework_SelfDescribing) {
-            $buffer = $test->toString() . "\n";
-        } else {
-            $buffer = '';
-        }
-
-        $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) .
-                   "\n" .
-                   PHPUnit_Util_Filter::getFilteredStacktrace($e);
-
-        $error = $this->document->createElement(
-            'error',
-            PHPUnit_Util_XML::prepareString($buffer)
-        );
-
-        $error->setAttribute('type', get_class($e));
-
-        $this->currentTestCase->appendChild($error);
-
-        $this->testSuiteErrors[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        if ($this->currentTestCase === null) {
-            return;
-        }
-
-        if ($test instanceof PHPUnit_Framework_SelfDescribing) {
-            $buffer = $test->toString() . "\n";
-        } else {
-            $buffer = '';
-        }
-
-        $buffer .= PHPUnit_Framework_TestFailure::exceptionToString($e) .
-                   "\n" .
-                   PHPUnit_Util_Filter::getFilteredStacktrace($e);
-
-        $failure = $this->document->createElement(
-            'failure',
-            PHPUnit_Util_XML::prepareString($buffer)
-        );
-
-        $failure->setAttribute('type', get_class($e));
-
-        $this->currentTestCase->appendChild($failure);
-
-        $this->testSuiteFailures[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
-            $error = $this->document->createElement(
-                'error',
-                PHPUnit_Util_XML::prepareString(
-                    "Incomplete Test\n" .
-                    PHPUnit_Util_Filter::getFilteredStacktrace($e)
-                )
-            );
-
-            $error->setAttribute('type', get_class($e));
-
-            $this->currentTestCase->appendChild($error);
-
-            $this->testSuiteErrors[$this->testSuiteLevel]++;
-        } else {
-            $this->attachCurrentTestCase = false;
-        }
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
-            $error = $this->document->createElement(
-                'error',
-                PHPUnit_Util_XML::prepareString(
-                    "Risky Test\n" .
-                    PHPUnit_Util_Filter::getFilteredStacktrace($e)
-                )
-            );
-
-            $error->setAttribute('type', get_class($e));
-
-            $this->currentTestCase->appendChild($error);
-
-            $this->testSuiteErrors[$this->testSuiteLevel]++;
-        } else {
-            $this->attachCurrentTestCase = false;
-        }
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
-            $error = $this->document->createElement(
-                'error',
-                PHPUnit_Util_XML::prepareString(
-                    "Skipped Test\n" .
-                    PHPUnit_Util_Filter::getFilteredStacktrace($e)
-                )
-            );
-
-            $error->setAttribute('type', get_class($e));
-
-            $this->currentTestCase->appendChild($error);
-
-            $this->testSuiteErrors[$this->testSuiteLevel]++;
-        } else {
-            $this->attachCurrentTestCase = false;
-        }
-    }
-
-    /**
-     * A testsuite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $testSuite = $this->document->createElement('testsuite');
-        $testSuite->setAttribute('name', $suite->getName());
-
-        if (class_exists($suite->getName(), false)) {
-            try {
-                $class = new ReflectionClass($suite->getName());
-
-                $testSuite->setAttribute('file', $class->getFileName());
-            } catch (ReflectionException $e) {
-            }
-        }
-
-        if ($this->testSuiteLevel > 0) {
-            $this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
-        } else {
-            $this->root->appendChild($testSuite);
-        }
-
-        $this->testSuiteLevel++;
-        $this->testSuites[$this->testSuiteLevel]          = $testSuite;
-        $this->testSuiteTests[$this->testSuiteLevel]      = 0;
-        $this->testSuiteAssertions[$this->testSuiteLevel] = 0;
-        $this->testSuiteErrors[$this->testSuiteLevel]     = 0;
-        $this->testSuiteFailures[$this->testSuiteLevel]   = 0;
-        $this->testSuiteTimes[$this->testSuiteLevel]      = 0;
-    }
-
-    /**
-     * A testsuite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'tests',
-            $this->testSuiteTests[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'assertions',
-            $this->testSuiteAssertions[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'failures',
-            $this->testSuiteFailures[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'errors',
-            $this->testSuiteErrors[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'time',
-            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel])
-        );
-
-        if ($this->testSuiteLevel > 1) {
-            $this->testSuiteTests[$this->testSuiteLevel - 1]      += $this->testSuiteTests[$this->testSuiteLevel];
-            $this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
-            $this->testSuiteErrors[$this->testSuiteLevel - 1]     += $this->testSuiteErrors[$this->testSuiteLevel];
-            $this->testSuiteFailures[$this->testSuiteLevel - 1]   += $this->testSuiteFailures[$this->testSuiteLevel];
-            $this->testSuiteTimes[$this->testSuiteLevel - 1]      += $this->testSuiteTimes[$this->testSuiteLevel];
-        }
-
-        $this->testSuiteLevel--;
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        $testCase = $this->document->createElement('testcase');
-        $testCase->setAttribute('name', $test->getName());
-
-        if ($test instanceof PHPUnit_Framework_TestCase) {
-            $class      = new ReflectionClass($test);
-            $methodName = $test->getName();
-
-            if ($class->hasMethod($methodName)) {
-                $method = $class->getMethod($test->getName());
-
-                $testCase->setAttribute('class', $class->getName());
-                $testCase->setAttribute('file', $class->getFileName());
-                $testCase->setAttribute('line', $method->getStartLine());
-            }
-        }
-
-        $this->currentTestCase = $testCase;
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if ($this->attachCurrentTestCase) {
-            if ($test instanceof PHPUnit_Framework_TestCase) {
-                $numAssertions = $test->getNumAssertions();
-                $this->testSuiteAssertions[$this->testSuiteLevel] += $numAssertions;
-
-                $this->currentTestCase->setAttribute(
-                    'assertions',
-                    $numAssertions
-                );
-            }
-
-            $this->currentTestCase->setAttribute(
-                'time',
-                sprintf('%F', $time)
-            );
-
-            $this->testSuites[$this->testSuiteLevel]->appendChild(
-                $this->currentTestCase
-            );
-
-            $this->testSuiteTests[$this->testSuiteLevel]++;
-            $this->testSuiteTimes[$this->testSuiteLevel] += $time;
-
-            if (method_exists($test, 'hasOutput') && $test->hasOutput()) {
-                $systemOut = $this->document->createElement('system-out');
-                $systemOut->appendChild(
-                    $this->document->createTextNode($test->getActualOutput())
-                );
-                $this->currentTestCase->appendChild($systemOut);
-            }
-        }
-
-        $this->attachCurrentTestCase = true;
-        $this->currentTestCase       = null;
-    }
-
-    /**
-     * Returns the XML as a string.
-     *
-     * @return string
-     * @since  Method available since Release 2.2.0
-     */
-    public function getXML()
-    {
-        return $this->document->saveXML();
-    }
-
-    /**
-     * Enables or disables the writing of the document
-     * in flush().
-     *
-     * This is a "hack" needed for the integration of
-     * PHPUnit with Phing.
-     *
-     * @return string
-     * @since  Method available since Release 2.2.0
-     */
-    public function setWriteDocument($flag)
-    {
-        if (is_bool($flag)) {
-            $this->writeDocument = $flag;
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Log/TAP.php b/vendor/phpunit/phpunit/src/Util/Log/TAP.php
deleted file mode 100644
index 2067bec..0000000
--- a/vendor/phpunit/phpunit/src/Util/Log/TAP.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A TestListener that generates a logfile of the
- * test execution using the Test Anything Protocol (TAP).
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Log_TAP extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-    /**
-     * @var int
-     */
-    protected $testNumber = 0;
-
-    /**
-     * @var int
-     */
-    protected $testSuiteLevel = 0;
-
-    /**
-     * @var bool
-     */
-    protected $testSuccessful = true;
-
-    /**
-     * Constructor.
-     *
-     * @param  mixed                       $out
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.3.4
-     */
-    public function __construct($out = null)
-    {
-        parent::__construct($out);
-        $this->write("TAP version 13\n");
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeNotOk($test, 'Error');
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        $this->writeNotOk($test, 'Failure');
-
-        $message = explode(
-            "\n",
-            PHPUnit_Framework_TestFailure::exceptionToString($e)
-        );
-
-        $diagnostic = array(
-          'message'  => $message[0],
-          'severity' => 'fail'
-        );
-
-        if ($e instanceof PHPUnit_Framework_ExpectationFailedException) {
-            $cf = $e->getComparisonFailure();
-
-            if ($cf !== null) {
-                $diagnostic['data'] = array(
-                  'got'      => $cf->getActual(),
-                  'expected' => $cf->getExpected()
-                );
-            }
-        }
-
-        $yaml = new Symfony\Component\Yaml\Dumper;
-
-        $this->write(
-            sprintf(
-                "  ---\n%s  ...\n",
-                $yaml->dump($diagnostic, 2, 2)
-            )
-        );
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->writeNotOk($test, '', 'TODO Incomplete Test');
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->write(
-            sprintf(
-                "ok %d - # RISKY%s\n",
-                $this->testNumber,
-                $e->getMessage() != '' ? ' ' . $e->getMessage() : ''
-            )
-        );
-
-        $this->testSuccessful = false;
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        $this->write(
-            sprintf(
-                "ok %d - # SKIP%s\n",
-                $this->testNumber,
-                $e->getMessage() != '' ? ' ' . $e->getMessage() : ''
-            )
-        );
-
-        $this->testSuccessful = false;
-    }
-
-    /**
-     * A testsuite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->testSuiteLevel++;
-    }
-
-    /**
-     * A testsuite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-        $this->testSuiteLevel--;
-
-        if ($this->testSuiteLevel == 0) {
-            $this->write(sprintf("1..%d\n", $this->testNumber));
-        }
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        $this->testNumber++;
-        $this->testSuccessful = true;
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if ($this->testSuccessful === true) {
-            $this->write(
-                sprintf(
-                    "ok %d - %s\n",
-                    $this->testNumber,
-                    PHPUnit_Util_Test::describe($test)
-                )
-            );
-        }
-
-        $this->writeDiagnostics($test);
-    }
-
-    /**
-     * @param PHPUnit_Framework_Test $test
-     * @param string                 $prefix
-     * @param string                 $directive
-     */
-    protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
-    {
-        $this->write(
-            sprintf(
-                "not ok %d - %s%s%s\n",
-                $this->testNumber,
-                $prefix != '' ? $prefix . ': ' : '',
-                PHPUnit_Util_Test::describe($test),
-                $directive != '' ? ' # ' . $directive : ''
-            )
-        );
-
-        $this->testSuccessful = false;
-    }
-
-    /**
-     * @param PHPUnit_Framework_Test $test
-     */
-    private function writeDiagnostics(PHPUnit_Framework_Test $test)
-    {
-        if (!$test instanceof PHPUnit_Framework_TestCase) {
-            return;
-        }
-
-        if (!$test->hasOutput()) {
-            return;
-        }
-
-        foreach (explode("\n", trim($test->getActualOutput())) as $line) {
-            $this->write(
-                sprintf(
-                    "# %s\n",
-                    $line
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP.php b/vendor/phpunit/phpunit/src/Util/PHP.php
deleted file mode 100644
index 0439b3e..0000000
--- a/vendor/phpunit/phpunit/src/Util/PHP.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility methods for PHP sub-processes.
- *
- * @since Class available since Release 3.4.0
- */
-abstract class PHPUnit_Util_PHP
-{
-    /**
-     * @return PHPUnit_Util_PHP
-     * @since  Method available since Release 3.5.12
-     */
-    public static function factory()
-    {
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return new PHPUnit_Util_PHP_Windows;
-        }
-
-        return new PHPUnit_Util_PHP_Default;
-    }
-
-    /**
-     * Runs a single test in a separate PHP process.
-     *
-     * @param  string                       $job
-     * @param  PHPUnit_Framework_Test       $test
-     * @param  PHPUnit_Framework_TestResult $result
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
-    {
-        $result->startTest($test);
-
-        $_result = $this->runJob($job);
-
-        $this->processChildResult(
-            $test,
-            $result,
-            $_result['stdout'],
-            $_result['stderr']
-        );
-    }
-
-    /**
-     * Runs a single job (PHP code) using a separate PHP process.
-     *
-     * @param  string                      $job
-     * @param  array                       $settings
-     * @return array
-     * @throws PHPUnit_Framework_Exception
-     */
-    abstract public function runJob($job, array $settings = array());
-
-    /**
-     * @param  array  $settings
-     * @return string
-     * @since Method available since Release 4.0.0
-     */
-    protected function settingsToParameters(array $settings)
-    {
-        $buffer = '';
-
-        foreach ($settings as $setting) {
-            $buffer .= ' -d ' . $setting;
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Processes the TestResult object from an isolated process.
-     *
-     * @param PHPUnit_Framework_Test       $test
-     * @param PHPUnit_Framework_TestResult $result
-     * @param string                       $stdout
-     * @param string                       $stderr
-     * @since Method available since Release 3.5.0
-     */
-    private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result, $stdout, $stderr)
-    {
-        $time = 0;
-
-        if (!empty($stderr)) {
-            $result->addError(
-                $test,
-                new PHPUnit_Framework_Exception(trim($stderr)),
-                $time
-            );
-        } else {
-            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
-                throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
-            });
-            try {
-                if (strpos($stdout, "#!/usr/bin/env php\n") === 0) {
-                    $stdout = substr($stdout, 19);
-                }
-
-                $childResult = unserialize(str_replace("#!/usr/bin/env php\n", '', $stdout));
-                restore_error_handler();
-            } catch (ErrorException $e) {
-                restore_error_handler();
-                $childResult = false;
-
-                $result->addError(
-                    $test,
-                    new PHPUnit_Framework_Exception(trim($stdout), 0, $e),
-                    $time
-                );
-            }
-
-            if ($childResult !== false) {
-                if (!empty($childResult['output'])) {
-                    $output = $childResult['output'];
-                }
-
-                $test->setResult($childResult['testResult']);
-                $test->addToAssertionCount($childResult['numAssertions']);
-
-                $childResult = $childResult['result'];
-
-                if ($result->getCollectCodeCoverageInformation()) {
-                    $result->getCodeCoverage()->merge(
-                        $childResult->getCodeCoverage()
-                    );
-                }
-
-                $time           = $childResult->time();
-                $notImplemented = $childResult->notImplemented();
-                $risky          = $childResult->risky();
-                $skipped        = $childResult->skipped();
-                $errors         = $childResult->errors();
-                $failures       = $childResult->failures();
-
-                if (!empty($notImplemented)) {
-                    $result->addError(
-                        $test,
-                        $this->getException($notImplemented[0]),
-                        $time
-                    );
-                } elseif (!empty($risky)) {
-                    $result->addError(
-                        $test,
-                        $this->getException($risky[0]),
-                        $time
-                    );
-                } elseif (!empty($skipped)) {
-                    $result->addError(
-                        $test,
-                        $this->getException($skipped[0]),
-                        $time
-                    );
-                } elseif (!empty($errors)) {
-                    $result->addError(
-                        $test,
-                        $this->getException($errors[0]),
-                        $time
-                    );
-                } elseif (!empty($failures)) {
-                    $result->addFailure(
-                        $test,
-                        $this->getException($failures[0]),
-                        $time
-                    );
-                }
-            }
-        }
-
-        $result->endTest($test, $time);
-
-        if (!empty($output)) {
-            print $output;
-        }
-    }
-
-    /**
-     * Gets the thrown exception from a PHPUnit_Framework_TestFailure.
-     *
-     * @param  PHPUnit_Framework_TestFailure $error
-     * @return Exception
-     * @since  Method available since Release 3.6.0
-     * @see    https://github.com/sebastianbergmann/phpunit/issues/74
-     */
-    private function getException(PHPUnit_Framework_TestFailure $error)
-    {
-        $exception = $error->thrownException();
-
-        if ($exception instanceof __PHP_Incomplete_Class) {
-            $exceptionArray = array();
-            foreach ((array) $exception as $key => $value) {
-                $key                  = substr($key, strrpos($key, "\0") + 1);
-                $exceptionArray[$key] = $value;
-            }
-
-            $exception = new PHPUnit_Framework_SyntheticError(
-                sprintf(
-                    '%s: %s',
-                    $exceptionArray['_PHP_Incomplete_Class_Name'],
-                    $exceptionArray['message']
-                ),
-                $exceptionArray['code'],
-                $exceptionArray['file'],
-                $exceptionArray['line'],
-                $exceptionArray['trace']
-            );
-        }
-
-        return $exception;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Default.php b/vendor/phpunit/phpunit/src/Util/PHP/Default.php
deleted file mode 100644
index b8da4c8..0000000
--- a/vendor/phpunit/phpunit/src/Util/PHP/Default.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Runtime;
-
-/**
- * Default utility for PHP sub-processes.
- *
- * @since Class available since Release 3.5.12
- */
-class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
-{
-    /**
-     * Runs a single job (PHP code) using a separate PHP process.
-     *
-     * @param  string                      $job
-     * @param  array                       $settings
-     * @return array
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function runJob($job, array $settings = array())
-    {
-        $runtime = new Runtime;
-
-        $process = proc_open(
-            $runtime->getBinary() . $this->settingsToParameters($settings),
-            array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w')
-            ),
-            $pipes
-        );
-
-        if (!is_resource($process)) {
-            throw new PHPUnit_Framework_Exception(
-                'Unable to spawn worker process'
-            );
-        }
-
-        $this->process($pipes[0], $job);
-        fclose($pipes[0]);
-
-        $stdout = stream_get_contents($pipes[1]);
-        fclose($pipes[1]);
-
-        $stderr = stream_get_contents($pipes[2]);
-        fclose($pipes[2]);
-
-        proc_close($process);
-        $this->cleanup();
-
-        return array('stdout' => $stdout, 'stderr' => $stderr);
-    }
-
-    /**
-     * @param  resource                    $pipe
-     * @param  string                      $job
-     * @throws PHPUnit_Framework_Exception
-     * @since Method available since Release 3.5.12
-     */
-    protected function process($pipe, $job)
-    {
-        fwrite($pipe, $job);
-    }
-
-    /**
-     * @since Method available since Release 3.5.12
-     */
-    protected function cleanup()
-    {
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist b/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
deleted file mode 100644
index e595099..0000000
--- a/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-if (!defined('STDOUT')) {
-    // php://stdout does not obey output buffering. Any output would break
-    // unserialization of child process results in the parent process.
-    define('STDOUT', fopen('php://temp', 'w+b'));
-    define('STDERR', fopen('php://stderr', 'wb'));
-}
-
-{iniSettings}
-ini_set('display_errors', 'stderr');
-set_include_path('{include_path}');
-
-$composerAutoload = {composerAutoload};
-$phar             = {phar};
-
-ob_start();
-
-if ($composerAutoload) {
-    require_once $composerAutoload;
-    define('PHPUNIT_COMPOSER_INSTALL', $composerAutoload);
-} else if ($phar) {
-    require $phar;
-}
-
-function __phpunit_run_isolated_test()
-{
-    if (!class_exists('{className}')) {
-        require_once '{filename}';
-    }
-
-    $result = new PHPUnit_Framework_TestResult;
-
-    if ({collectCodeCoverageInformation}) {
-        $result->setCodeCoverage(
-            new PHP_CodeCoverage(
-                null,
-                unserialize('{codeCoverageFilter}')
-            )
-        );
-    }
-
-    $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything});
-    $result->beStrictAboutOutputDuringTests({isStrictAboutOutputDuringTests});
-    $result->beStrictAboutTestSize({isStrictAboutTestSize});
-    $result->beStrictAboutTodoAnnotatedTests({isStrictAboutTodoAnnotatedTests});
-
-    $test = new {className}('{methodName}', unserialize('{data}'), '{dataName}');
-    $test->setDependencyInput(unserialize('{dependencyInput}'));
-    $test->setInIsolation(TRUE);
-
-    ob_end_clean();
-    $test->run($result);
-    $output = '';
-    if (!$test->hasExpectationOnOutput()) {
-        $output = $test->getActualOutput();
-    }
-
-    rewind(STDOUT);
-    if ($stdout = stream_get_contents(STDOUT)) {
-        $output = $stdout . $output;
-    }
-
-    print serialize(
-      array(
-        'testResult'    => $test->getResult(),
-        'numAssertions' => $test->getNumAssertions(),
-        'result'        => $result,
-        'output'        => $output
-      )
-    );
-}
-
-$configurationFilePath = '{configurationFilePath}';
-
-if ('' !== $configurationFilePath) {
-    $configuration = PHPUnit_Util_Configuration::getInstance($configurationFilePath);
-    $configuration->handlePHPConfiguration();
-}
-
-{constants}
-{included_files}
-{globals}
-
-if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
-    require_once $GLOBALS['__PHPUNIT_BOOTSTRAP'];
-    unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
-}
-
-__phpunit_run_isolated_test();
diff --git a/vendor/phpunit/phpunit/src/Util/PHP/Windows.php b/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
deleted file mode 100644
index 3b1f34a..0000000
--- a/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use SebastianBergmann\Environment\Runtime;
-
-/**
- * Windows utility for PHP sub-processes.
- *
- * @since Class available since Release 3.5.12
- */
-class PHPUnit_Util_PHP_Windows extends PHPUnit_Util_PHP_Default
-{
-    /**
-     * @var string
-     */
-    private $tempFile;
-
-    /**
-     * {@inheritdoc}
-     *
-     * Reading from STDOUT or STDERR hangs forever on Windows if the output is
-     * too large.
-     *
-     * @see https://bugs.php.net/bug.php?id=51800
-     */
-    public function runJob($job, array $settings = array())
-    {
-        $runtime = new Runtime;
-
-        if (false === $stdout_handle = tmpfile()) {
-            throw new PHPUnit_Framework_Exception(
-                'A temporary file could not be created; verify that your TEMP environment variable is writable'
-            );
-        }
-
-        $process = proc_open(
-            $runtime->getBinary() . $this->settingsToParameters($settings),
-            array(
-            0 => array('pipe', 'r'),
-            1 => $stdout_handle,
-            2 => array('pipe', 'w')
-            ),
-            $pipes
-        );
-
-        if (!is_resource($process)) {
-            throw new PHPUnit_Framework_Exception(
-                'Unable to spawn worker process'
-            );
-        }
-
-        $this->process($pipes[0], $job);
-        fclose($pipes[0]);
-
-        $stderr = stream_get_contents($pipes[2]);
-        fclose($pipes[2]);
-
-        proc_close($process);
-
-        rewind($stdout_handle);
-        $stdout = stream_get_contents($stdout_handle);
-        fclose($stdout_handle);
-
-        $this->cleanup();
-
-        return array('stdout' => $stdout, 'stderr' => $stderr);
-    }
-
-    /**
-     * @param  resource                    $pipe
-     * @param  string                      $job
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.5.12
-     */
-    protected function process($pipe, $job)
-    {
-        if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit')) ||
-            file_put_contents($this->tempFile, $job) === false) {
-            throw new PHPUnit_Framework_Exception(
-                'Unable to write temporary file'
-            );
-        }
-
-        fwrite(
-            $pipe,
-            '<?php require_once ' . var_export($this->tempFile, true) .  '; ?>'
-        );
-    }
-
-    /**
-     * @since Method available since Release 3.5.12
-     */
-    protected function cleanup()
-    {
-        unlink($this->tempFile);
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Printer.php b/vendor/phpunit/phpunit/src/Util/Printer.php
deleted file mode 100644
index 5db309e..0000000
--- a/vendor/phpunit/phpunit/src/Util/Printer.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility class that can print to STDOUT or write to a file.
- *
- * @since Class available since Release 2.0.0
- */
-class PHPUnit_Util_Printer
-{
-    /**
-     * If true, flush output after every write.
-     *
-     * @var bool
-     */
-    protected $autoFlush = false;
-
-    /**
-     * @var resource
-     */
-    protected $out;
-
-    /**
-     * @var string
-     */
-    protected $outTarget;
-
-    /**
-     * @var bool
-     */
-    protected $printsHTML = false;
-
-    /**
-     * Constructor.
-     *
-     * @param  mixed                       $out
-     * @throws PHPUnit_Framework_Exception
-     */
-    public function __construct($out = null)
-    {
-        if ($out !== null) {
-            if (is_string($out)) {
-                if (strpos($out, 'socket://') === 0) {
-                    $out = explode(':', str_replace('socket://', '', $out));
-
-                    if (sizeof($out) != 2) {
-                        throw new PHPUnit_Framework_Exception;
-                    }
-
-                    $this->out = fsockopen($out[0], $out[1]);
-                } else {
-                    if (strpos($out, 'php://') === false &&
-                        !is_dir(dirname($out))) {
-                        mkdir(dirname($out), 0777, true);
-                    }
-
-                    $this->out = fopen($out, 'wt');
-                }
-
-                $this->outTarget = $out;
-            } else {
-                $this->out = $out;
-            }
-        }
-    }
-
-    /**
-     * Flush buffer, optionally tidy up HTML, and close output if it's not to a php stream
-     */
-    public function flush()
-    {
-        if ($this->out && strncmp($this->outTarget, 'php://', 6) !== 0) {
-            fclose($this->out);
-        }
-
-        if ($this->printsHTML === true &&
-            $this->outTarget !== null &&
-            strpos($this->outTarget, 'php://') !== 0 &&
-            strpos($this->outTarget, 'socket://') !== 0 &&
-            extension_loaded('tidy')) {
-            file_put_contents(
-                $this->outTarget,
-                tidy_repair_file(
-                    $this->outTarget,
-                    array('indent' => true, 'wrap' => 0),
-                    'utf8'
-                )
-            );
-        }
-    }
-
-    /**
-     * Performs a safe, incremental flush.
-     *
-     * Do not confuse this function with the flush() function of this class,
-     * since the flush() function may close the file being written to, rendering
-     * the current object no longer usable.
-     *
-     * @since  Method available since Release 3.3.0
-     */
-    public function incrementalFlush()
-    {
-        if ($this->out) {
-            fflush($this->out);
-        } else {
-            flush();
-        }
-    }
-
-    /**
-     * @param string $buffer
-     */
-    public function write($buffer)
-    {
-        if ($this->out) {
-            fwrite($this->out, $buffer);
-
-            if ($this->autoFlush) {
-                $this->incrementalFlush();
-            }
-        } else {
-            if (PHP_SAPI != 'cli') {
-                $buffer = htmlspecialchars($buffer);
-            }
-
-            print $buffer;
-
-            if ($this->autoFlush) {
-                $this->incrementalFlush();
-            }
-        }
-    }
-
-    /**
-     * Check auto-flush mode.
-     *
-     * @return bool
-     * @since  Method available since Release 3.3.0
-     */
-    public function getAutoFlush()
-    {
-        return $this->autoFlush;
-    }
-
-    /**
-     * Set auto-flushing mode.
-     *
-     * If set, *incremental* flushes will be done after each write. This should
-     * not be confused with the different effects of this class' flush() method.
-     *
-     * @param bool $autoFlush
-     * @since  Method available since Release 3.3.0
-     */
-    public function setAutoFlush($autoFlush)
-    {
-        if (is_bool($autoFlush)) {
-            $this->autoFlush = $autoFlush;
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
-        }
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Regex.php b/vendor/phpunit/phpunit/src/Util/Regex.php
deleted file mode 100644
index 3624de1..0000000
--- a/vendor/phpunit/phpunit/src/Util/Regex.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Error handler that converts PHP errors and warnings to exceptions.
- *
- * @since Class available since Release 4.2.0
- */
-class PHPUnit_Util_Regex
-{
-    public static function pregMatchSafe($pattern, $subject, $matches = null, $flags = 0, $offset = 0)
-    {
-        $handler_terminator = PHPUnit_Util_ErrorHandler::handleErrorOnce(E_WARNING);
-        $match              = preg_match($pattern, $subject, $matches, $flags, $offset);
-        $handler_terminator(); // cleaning
-
-        return $match;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/String.php b/vendor/phpunit/phpunit/src/Util/String.php
deleted file mode 100644
index ed952ab..0000000
--- a/vendor/phpunit/phpunit/src/Util/String.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * String helpers.
- *
- * @since Class available since Release 3.6.0
- */
-class PHPUnit_Util_String
-{
-    /**
-     * Converts a string to UTF-8 encoding.
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function convertToUtf8($string)
-    {
-        if (!self::isUtf8($string)) {
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, 'UTF-8');
-            } else {
-                $string = utf8_encode($string);
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * Checks a string for UTF-8 encoding.
-     *
-     * @param  string $string
-     * @return bool
-     */
-    protected static function isUtf8($string)
-    {
-        $length = strlen($string);
-
-        for ($i = 0; $i < $length; $i++) {
-            if (ord($string[$i]) < 0x80) {
-                $n = 0;
-            } elseif ((ord($string[$i]) & 0xE0) == 0xC0) {
-                $n = 1;
-            } elseif ((ord($string[$i]) & 0xF0) == 0xE0) {
-                $n = 2;
-            } elseif ((ord($string[$i]) & 0xF0) == 0xF0) {
-                $n = 3;
-            } else {
-                return false;
-            }
-
-            for ($j = 0; $j < $n; $j++) {
-                if ((++$i == $length) || ((ord($string[$i]) & 0xC0) != 0x80)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Test.php b/vendor/phpunit/phpunit/src/Util/Test.php
deleted file mode 100644
index 583bab9..0000000
--- a/vendor/phpunit/phpunit/src/Util/Test.php
+++ /dev/null
@@ -1,1023 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (!function_exists('trait_exists')) {
-    function trait_exists($traitname, $autoload = true)
-    {
-        return false;
-    }
-}
-
-/**
- * Test helpers.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Test
-{
-    const REGEX_DATA_PROVIDER      = '/@dataProvider\s+([a-zA-Z0-9._:-\\\\x7f-\xff]+)/';
-    const REGEX_TEST_WITH          = '/@testWith\s+/';
-    const REGEX_EXPECTED_EXCEPTION = '(@expectedException\s+([:.\w\\\\x7f-\xff]+)(?:[\t ]+(\S*))?(?:[\t ]+(\S*))?\s*$)m';
-    const REGEX_REQUIRES_VERSION   = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<value>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m';
-    const REGEX_REQUIRES_OS        = '/@requires\s+OS\s+(?P<value>.+?)[ \t]*\r?$/m';
-    const REGEX_REQUIRES           = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^ ]+?))[ \t]*\r?$/m';
-
-    const UNKNOWN = -1;
-    const SMALL   = 0;
-    const MEDIUM  = 1;
-    const LARGE   = 2;
-
-    private static $annotationCache = array();
-
-    private static $hookMethods = array();
-
-    /**
-     * @param  PHPUnit_Framework_Test $test
-     * @param  bool                   $asString
-     * @return mixed
-     */
-    public static function describe(PHPUnit_Framework_Test $test, $asString = true)
-    {
-        if ($asString) {
-            if ($test instanceof PHPUnit_Framework_SelfDescribing) {
-                return $test->toString();
-            } else {
-                return get_class($test);
-            }
-        } else {
-            if ($test instanceof PHPUnit_Framework_TestCase) {
-                return array(
-                  get_class($test), $test->getName()
-                );
-            } elseif ($test instanceof PHPUnit_Framework_SelfDescribing) {
-                return array('', $test->toString());
-            } else {
-                return array('', get_class($test));
-            }
-        }
-    }
-
-    /**
-     * @param  string                                  $className
-     * @param  string                                  $methodName
-     * @return array|bool
-     * @throws PHPUnit_Framework_CodeCoverageException
-     * @since  Method available since Release 4.0.0
-     */
-    public static function getLinesToBeCovered($className, $methodName)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        if (isset($annotations['class']['coversNothing']) || isset($annotations['method']['coversNothing'])) {
-            return false;
-        }
-
-        return self::getLinesToBeCoveredOrUsed($className, $methodName, 'covers');
-    }
-
-    /**
-     * Returns lines of code specified with the @uses annotation.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 4.0.0
-     */
-    public static function getLinesToBeUsed($className, $methodName)
-    {
-        return self::getLinesToBeCoveredOrUsed($className, $methodName, 'uses');
-    }
-
-    /**
-     * @param  string                                  $className
-     * @param  string                                  $methodName
-     * @param  string                                  $mode
-     * @return array
-     * @throws PHPUnit_Framework_CodeCoverageException
-     * @since  Method available since Release 4.2.0
-     */
-    private static function getLinesToBeCoveredOrUsed($className, $methodName, $mode)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        $classShortcut = null;
-
-        if (!empty($annotations['class'][$mode . 'DefaultClass'])) {
-            if (count($annotations['class'][$mode . 'DefaultClass']) > 1) {
-                throw new PHPUnit_Framework_CodeCoverageException(
-                    sprintf(
-                        'More than one @%sClass annotation in class or interface "%s".',
-                        $mode,
-                        $className
-                    )
-                );
-            }
-
-            $classShortcut = $annotations['class'][$mode . 'DefaultClass'][0];
-        }
-
-        $list = array();
-
-        if (isset($annotations['class'][$mode])) {
-            $list = $annotations['class'][$mode];
-        }
-
-        if (isset($annotations['method'][$mode])) {
-            $list = array_merge($list, $annotations['method'][$mode]);
-        }
-
-        $codeList = array();
-
-        foreach (array_unique($list) as $element) {
-            if ($classShortcut && strncmp($element, '::', 2) === 0) {
-                $element = $classShortcut . $element;
-            }
-
-            $element = preg_replace('/[\s()]+$/', '', $element);
-            $element = explode(' ', $element);
-            $element = $element[0];
-
-            $codeList = array_merge(
-                $codeList,
-                self::resolveElementToReflectionObjects($element)
-            );
-        }
-
-        return self::resolveReflectionObjectsToLines($codeList);
-    }
-
-    /**
-     * Returns the requirements for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.6.0
-     */
-    public static function getRequirements($className, $methodName)
-    {
-        $reflector  = new ReflectionClass($className);
-        $docComment = $reflector->getDocComment();
-        $reflector  = new ReflectionMethod($className, $methodName);
-        $docComment .= "\n" . $reflector->getDocComment();
-        $requires   = array();
-
-        if ($count = preg_match_all(self::REGEX_REQUIRES_OS, $docComment, $matches)) {
-            $requires['OS'] = sprintf(
-                '/%s/i',
-                addcslashes($matches['value'][$count - 1], '/')
-            );
-        }
-        if ($count = preg_match_all(self::REGEX_REQUIRES_VERSION, $docComment, $matches)) {
-            for ($i = 0; $i < $count; $i++) {
-                $requires[$matches['name'][$i]] = $matches['value'][$i];
-            }
-        }
-
-        // https://bugs.php.net/bug.php?id=63055
-        $matches = array();
-
-        if ($count = preg_match_all(self::REGEX_REQUIRES, $docComment, $matches)) {
-            for ($i = 0; $i < $count; $i++) {
-                $name = $matches['name'][$i] . 's';
-                if (!isset($requires[$name])) {
-                    $requires[$name] = array();
-                }
-                $requires[$name][] = $matches['value'][$i];
-            }
-        }
-
-        return $requires;
-    }
-
-    /**
-     * Returns the missing requirements for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 4.3.0
-     */
-    public static function getMissingRequirements($className, $methodName)
-    {
-        $required = static::getRequirements($className, $methodName);
-        $missing  = array();
-
-        if (!empty($required['PHP']) && version_compare(PHP_VERSION, $required['PHP'], '<')) {
-            $missing[] = sprintf('PHP %s (or later) is required.', $required['PHP']);
-        }
-
-        if (!empty($required['PHPUnit'])) {
-            $phpunitVersion = PHPUnit_Runner_Version::id();
-            if (version_compare($phpunitVersion, $required['PHPUnit'], '<')) {
-                $missing[] = sprintf('PHPUnit %s (or later) is required.', $required['PHPUnit']);
-            }
-        }
-
-        if (!empty($required['OS']) && !preg_match($required['OS'], PHP_OS)) {
-            $missing[] = sprintf('Operating system matching %s is required.', $required['OS']);
-        }
-
-        if (!empty($required['functions'])) {
-            foreach ($required['functions'] as $function) {
-                $pieces = explode('::', $function);
-                if (2 === count($pieces) && method_exists($pieces[0], $pieces[1])) {
-                    continue;
-                }
-                if (function_exists($function)) {
-                    continue;
-                }
-                $missing[] = sprintf('Function %s is required.', $function);
-            }
-        }
-
-        if (!empty($required['extensions'])) {
-            foreach ($required['extensions'] as $extension) {
-                if (!extension_loaded($extension)) {
-                    $missing[] = sprintf('Extension %s is required.', $extension);
-                }
-            }
-        }
-
-        return $missing;
-    }
-
-    /**
-     * Returns the expected exception for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.3.6
-     */
-    public static function getExpectedException($className, $methodName)
-    {
-        $reflector  = new ReflectionMethod($className, $methodName);
-        $docComment = $reflector->getDocComment();
-        $docComment = substr($docComment, 3, -2);
-
-        if (preg_match(self::REGEX_EXPECTED_EXCEPTION, $docComment, $matches)) {
-            $annotations = self::parseTestMethodAnnotations(
-                $className,
-                $methodName
-            );
-
-            $class         = $matches[1];
-            $code          = null;
-            $message       = '';
-            $messageRegExp = '';
-
-            if (isset($matches[2])) {
-                $message = trim($matches[2]);
-            } elseif (isset($annotations['method']['expectedExceptionMessage'])) {
-                $message = self::parseAnnotationContent(
-                    $annotations['method']['expectedExceptionMessage'][0]
-                );
-            }
-
-            if (isset($annotations['method']['expectedExceptionMessageRegExp'])) {
-                $messageRegExp = self::parseAnnotationContent(
-                    $annotations['method']['expectedExceptionMessageRegExp'][0]
-                );
-            }
-
-            if (isset($matches[3])) {
-                $code = $matches[3];
-            } elseif (isset($annotations['method']['expectedExceptionCode'])) {
-                $code = self::parseAnnotationContent(
-                    $annotations['method']['expectedExceptionCode'][0]
-                );
-            }
-
-            if (is_numeric($code)) {
-                $code = (int) $code;
-            } elseif (is_string($code) && defined($code)) {
-                $code = (int) constant($code);
-            }
-
-            return array(
-              'class' => $class, 'code' => $code, 'message' => $message, 'message_regex' => $messageRegExp
-            );
-        }
-
-        return false;
-    }
-
-    /**
-     * Parse annotation content to use constant/class constant values
-     *
-     * Constants are specified using a starting '@'. For example: @ClassName::CONST_NAME
-     *
-     * If the constant is not found the string is used as is to ensure maximum BC.
-     *
-     * @param  string $message
-     * @return string
-     */
-    private static function parseAnnotationContent($message)
-    {
-        if (strpos($message, '::') !== false && count(explode('::', $message) == 2)) {
-            if (defined($message)) {
-                $message = constant($message);
-            }
-        }
-
-        return $message;
-    }
-
-    /**
-     * Returns the provided data for a method.
-     *
-     * @param  string                      $className
-     * @param  string                      $methodName
-     * @return array|Iterator              when a data provider is specified and exists
-     *                                                null           when no data provider is specified
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.2.0
-     */
-    public static function getProvidedData($className, $methodName)
-    {
-        $reflector  = new ReflectionMethod($className, $methodName);
-        $docComment = $reflector->getDocComment();
-        $data       = null;
-
-        if ($dataProviderData = self::getDataFromDataProviderAnnotation($docComment, $className, $methodName)) {
-            $data = $dataProviderData;
-        }
-
-        if ($testWithData = self::getDataFromTestWithAnnotation($docComment)) {
-            $data = $testWithData;
-        }
-
-        if ($data !== null) {
-            if (is_object($data)) {
-                $data = iterator_to_array($data);
-            }
-
-            foreach ($data as $key => $value) {
-                if (!is_array($value)) {
-                    throw new PHPUnit_Framework_Exception(
-                        sprintf(
-                            'Data set %s is invalid.',
-                            is_int($key) ? '#' . $key : '"' . $key . '"'
-                        )
-                    );
-                }
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Returns the provided data for a method.
-     *
-     * @param  string                      $docComment
-     * @param  string                      $className
-     * @param  string                      $methodName
-     * @return array|Iterator              when a data provider is specified and exists
-     *                                                null           when no data provider is specified
-     * @throws PHPUnit_Framework_Exception
-     */
-    private static function getDataFromDataProviderAnnotation($docComment, $className, $methodName)
-    {
-        if (preg_match(self::REGEX_DATA_PROVIDER, $docComment, $matches)) {
-            $dataProviderMethodNameNamespace = explode('\\', $matches[1]);
-            $leaf                            = explode('::', array_pop($dataProviderMethodNameNamespace));
-            $dataProviderMethodName          = array_pop($leaf);
-
-            if (!empty($dataProviderMethodNameNamespace)) {
-                $dataProviderMethodNameNamespace = implode('\\', $dataProviderMethodNameNamespace) . '\\';
-            } else {
-                $dataProviderMethodNameNamespace = '';
-            }
-
-            if (!empty($leaf)) {
-                $dataProviderClassName = $dataProviderMethodNameNamespace . array_pop($leaf);
-            } else {
-                $dataProviderClassName = $className;
-            }
-
-            $dataProviderClass  = new ReflectionClass($dataProviderClassName);
-            $dataProviderMethod = $dataProviderClass->getMethod(
-                $dataProviderMethodName
-            );
-
-            if ($dataProviderMethod->isStatic()) {
-                $object = null;
-            } else {
-                $object = $dataProviderClass->newInstance();
-            }
-
-            if ($dataProviderMethod->getNumberOfParameters() == 0) {
-                $data = $dataProviderMethod->invoke($object);
-            } else {
-                $data = $dataProviderMethod->invoke($object, $methodName);
-            }
-
-            return $data;
-        }
-    }
-
-    /**
-     * @param  string                      $docComment full docComment string
-     * @return array                       when @testWith annotation is defined
-     *                                                null  when @testWith annotation is omitted
-     * @throws PHPUnit_Framework_Exception when @testWith annotation is defined but cannot be parsed
-     */
-    public static function getDataFromTestWithAnnotation($docComment)
-    {
-        $docComment = self::cleanUpMultiLineAnnotation($docComment);
-        if (preg_match(self::REGEX_TEST_WITH, $docComment, $matches, PREG_OFFSET_CAPTURE)) {
-            $offset            = strlen($matches[0][0]) + $matches[0][1];
-            $annotationContent = substr($docComment, $offset);
-            $data              = array();
-            foreach (explode("\n", $annotationContent) as $candidateRow) {
-                $candidateRow = trim($candidateRow);
-                $dataSet      = json_decode($candidateRow, true);
-                if (json_last_error() != JSON_ERROR_NONE) {
-                    break;
-                }
-                $data[] = $dataSet;
-            }
-
-            if (!$data) {
-                throw new PHPUnit_Framework_Exception('The dataset for the @testWith annotation cannot be parsed.');
-            }
-
-            return $data;
-        }
-    }
-
-    private static function cleanUpMultiLineAnnotation($docComment)
-    {
-        //removing initial '   * ' for docComment
-        $docComment = preg_replace('/' . '\n' . '\s*' . '\*' . '\s?' . '/', "\n", $docComment);
-        $docComment = substr($docComment, 0, -1);
-        $docComment = rtrim($docComment, "\n");
-
-        return $docComment;
-    }
-
-    /**
-     * @param  string              $className
-     * @param  string              $methodName
-     * @return array
-     * @throws ReflectionException
-     * @since  Method available since Release 3.4.0
-     */
-    public static function parseTestMethodAnnotations($className, $methodName = '')
-    {
-        if (!isset(self::$annotationCache[$className])) {
-            $class                             = new ReflectionClass($className);
-            self::$annotationCache[$className] = self::parseAnnotations($class->getDocComment());
-        }
-
-        if (!empty($methodName) && !isset(self::$annotationCache[$className . '::' . $methodName])) {
-            try {
-                $method      = new ReflectionMethod($className, $methodName);
-                $annotations = self::parseAnnotations($method->getDocComment());
-            } catch (ReflectionException $e) {
-                $annotations = array();
-            }
-            self::$annotationCache[$className . '::' . $methodName] = $annotations;
-        }
-
-        return array(
-          'class'  => self::$annotationCache[$className],
-          'method' => !empty($methodName) ? self::$annotationCache[$className . '::' . $methodName] : array()
-        );
-    }
-
-    /**
-     * @param  string $docblock
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    private static function parseAnnotations($docblock)
-    {
-        $annotations = array();
-        // Strip away the docblock header and footer to ease parsing of one line annotations
-        $docblock = substr($docblock, 3, -2);
-
-        if (preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docblock, $matches)) {
-            $numMatches = count($matches[0]);
-
-            for ($i = 0; $i < $numMatches; ++$i) {
-                $annotations[$matches['name'][$i]][] = $matches['value'][$i];
-            }
-        }
-
-        return $annotations;
-    }
-
-    /**
-     * Returns the backup settings for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getBackupSettings($className, $methodName)
-    {
-        return array(
-          'backupGlobals' => self::getBooleanAnnotationSetting(
-              $className,
-              $methodName,
-              'backupGlobals'
-          ),
-          'backupStaticAttributes' => self::getBooleanAnnotationSetting(
-              $className,
-              $methodName,
-              'backupStaticAttributes'
-          )
-        );
-    }
-
-    /**
-     * Returns the dependencies for a test class or method.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getDependencies($className, $methodName)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        $dependencies = array();
-
-        if (isset($annotations['class']['depends'])) {
-            $dependencies = $annotations['class']['depends'];
-        }
-
-        if (isset($annotations['method']['depends'])) {
-            $dependencies = array_merge(
-                $dependencies,
-                $annotations['method']['depends']
-            );
-        }
-
-        return array_unique($dependencies);
-    }
-
-    /**
-     * Returns the error handler settings for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return bool
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getErrorHandlerSettings($className, $methodName)
-    {
-        return self::getBooleanAnnotationSetting(
-            $className,
-            $methodName,
-            'errorHandler'
-        );
-    }
-
-    /**
-     * Returns the groups for a test class or method.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.2.0
-     */
-    public static function getGroups($className, $methodName = '')
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        $groups = array();
-
-        if (isset($annotations['method']['author'])) {
-            $groups = $annotations['method']['author'];
-        } elseif (isset($annotations['class']['author'])) {
-            $groups = $annotations['class']['author'];
-        }
-
-        if (isset($annotations['class']['group'])) {
-            $groups = array_merge($groups, $annotations['class']['group']);
-        }
-
-        if (isset($annotations['method']['group'])) {
-            $groups = array_merge($groups, $annotations['method']['group']);
-        }
-
-        if (isset($annotations['class']['ticket'])) {
-            $groups = array_merge($groups, $annotations['class']['ticket']);
-        }
-
-        if (isset($annotations['method']['ticket'])) {
-            $groups = array_merge($groups, $annotations['method']['ticket']);
-        }
-
-        foreach (array('method', 'class') as $element) {
-            foreach (array('small', 'medium', 'large') as $size) {
-                if (isset($annotations[$element][$size])) {
-                    $groups[] = $size;
-                    break 2;
-                }
-
-                if (isset($annotations[$element][$size])) {
-                    $groups[] = $size;
-                    break 2;
-                }
-            }
-        }
-
-        return array_unique($groups);
-    }
-
-    /**
-     * Returns the size of the test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return int
-     * @since  Method available since Release 3.6.0
-     */
-    public static function getSize($className, $methodName)
-    {
-        $groups = array_flip(self::getGroups($className, $methodName));
-        $size   = self::UNKNOWN;
-        $class  = new ReflectionClass($className);
-
-        if (isset($groups['large']) ||
-            (class_exists('PHPUnit_Extensions_Database_TestCase', false) &&
-             $class->isSubclassOf('PHPUnit_Extensions_Database_TestCase')) ||
-            (class_exists('PHPUnit_Extensions_SeleniumTestCase', false) &&
-             $class->isSubclassOf('PHPUnit_Extensions_SeleniumTestCase'))) {
-            $size = self::LARGE;
-        } elseif (isset($groups['medium'])) {
-            $size = self::MEDIUM;
-        } elseif (isset($groups['small'])) {
-            $size = self::SMALL;
-        }
-
-        return $size;
-    }
-
-    /**
-     * Returns the tickets for a test class or method.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getTickets($className, $methodName)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        $tickets = array();
-
-        if (isset($annotations['class']['ticket'])) {
-            $tickets = $annotations['class']['ticket'];
-        }
-
-        if (isset($annotations['method']['ticket'])) {
-            $tickets = array_merge($tickets, $annotations['method']['ticket']);
-        }
-
-        return array_unique($tickets);
-    }
-
-    /**
-     * Returns the process isolation settings for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return bool
-     * @since  Method available since Release 3.4.1
-     */
-    public static function getProcessIsolationSettings($className, $methodName)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        if (isset($annotations['class']['runTestsInSeparateProcesses']) ||
-            isset($annotations['method']['runInSeparateProcess'])) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the preserve global state settings for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return bool
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getPreserveGlobalStateSettings($className, $methodName)
-    {
-        return self::getBooleanAnnotationSetting(
-            $className,
-            $methodName,
-            'preserveGlobalState'
-        );
-    }
-
-    /**
-     * @param  string $className
-     * @return array
-     * @since  Method available since Release 4.0.8
-     */
-    public static function getHookMethods($className)
-    {
-        if (!class_exists($className, false)) {
-            return self::emptyHookMethodsArray();
-        }
-
-        if (!isset(self::$hookMethods[$className])) {
-            self::$hookMethods[$className] = self::emptyHookMethodsArray();
-
-            try {
-                $class = new ReflectionClass($className);
-
-                foreach ($class->getMethods() as $method) {
-                    if (self::isBeforeClassMethod($method)) {
-                        self::$hookMethods[$className]['beforeClass'][] = $method->getName();
-                    }
-
-                    if (self::isBeforeMethod($method)) {
-                        self::$hookMethods[$className]['before'][] = $method->getName();
-                    }
-
-                    if (self::isAfterMethod($method)) {
-                        self::$hookMethods[$className]['after'][] = $method->getName();
-                    }
-
-                    if (self::isAfterClassMethod($method)) {
-                        self::$hookMethods[$className]['afterClass'][] = $method->getName();
-                    }
-                }
-            } catch (ReflectionException $e) {
-            }
-        }
-
-        return self::$hookMethods[$className];
-    }
-
-    /**
-     * @return array
-     * @since  Method available since Release 4.0.9
-     */
-    private static function emptyHookMethodsArray()
-    {
-        return array(
-            'beforeClass' => array('setUpBeforeClass'),
-            'before'      => array('setUp'),
-            'after'       => array('tearDown'),
-            'afterClass'  => array('tearDownAfterClass')
-        );
-    }
-
-    /**
-     * @param  string $className
-     * @param  string $methodName
-     * @param  string $settingName
-     * @return bool
-     * @since  Method available since Release 3.4.0
-     */
-    private static function getBooleanAnnotationSetting($className, $methodName, $settingName)
-    {
-        $annotations = self::parseTestMethodAnnotations(
-            $className,
-            $methodName
-        );
-
-        $result = null;
-
-        if (isset($annotations['class'][$settingName])) {
-            if ($annotations['class'][$settingName][0] == 'enabled') {
-                $result = true;
-            } elseif ($annotations['class'][$settingName][0] == 'disabled') {
-                $result = false;
-            }
-        }
-
-        if (isset($annotations['method'][$settingName])) {
-            if ($annotations['method'][$settingName][0] == 'enabled') {
-                $result = true;
-            } elseif ($annotations['method'][$settingName][0] == 'disabled') {
-                $result = false;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param  string                                         $element
-     * @return array
-     * @throws PHPUnit_Framework_InvalidCoversTargetException
-     * @since  Method available since Release 4.0.0
-     */
-    private static function resolveElementToReflectionObjects($element)
-    {
-        $codeToCoverList = array();
-
-        if (strpos($element, '\\') !== false && function_exists($element)) {
-            $codeToCoverList[] = new ReflectionFunction($element);
-        } else if (strpos($element, '::') !== false) {
-            list($className, $methodName) = explode('::', $element);
-
-            if (isset($methodName[0]) && $methodName[0] == '<') {
-                $classes = array($className);
-
-                foreach ($classes as $className) {
-                    if (!class_exists($className) &&
-                        !interface_exists($className)) {
-                        throw new PHPUnit_Framework_InvalidCoversTargetException(
-                            sprintf(
-                                'Trying to @cover or @use not existing class or ' .
-                                'interface "%s".',
-                                $className
-                            )
-                        );
-                    }
-
-                    $class   = new ReflectionClass($className);
-                    $methods = $class->getMethods();
-                    $inverse = isset($methodName[1]) && $methodName[1] == '!';
-
-                    if (strpos($methodName, 'protected')) {
-                        $visibility = 'isProtected';
-                    } elseif (strpos($methodName, 'private')) {
-                        $visibility = 'isPrivate';
-                    } elseif (strpos($methodName, 'public')) {
-                        $visibility = 'isPublic';
-                    }
-
-                    foreach ($methods as $method) {
-                        if ($inverse && !$method->$visibility()) {
-                            $codeToCoverList[] = $method;
-                        } elseif (!$inverse && $method->$visibility()) {
-                            $codeToCoverList[] = $method;
-                        }
-                    }
-                }
-            } else {
-                $classes = array($className);
-
-                foreach ($classes as $className) {
-                    if ($className == '' && function_exists($methodName)) {
-                        $codeToCoverList[] = new ReflectionFunction(
-                            $methodName
-                        );
-                    } else {
-                        if (!((class_exists($className) ||
-                               interface_exists($className) ||
-                               trait_exists($className)) &&
-                              method_exists($className, $methodName))) {
-                            throw new PHPUnit_Framework_InvalidCoversTargetException(
-                                sprintf(
-                                    'Trying to @cover or @use not existing method "%s::%s".',
-                                    $className,
-                                    $methodName
-                                )
-                            );
-                        }
-
-                        $codeToCoverList[] = new ReflectionMethod(
-                            $className,
-                            $methodName
-                        );
-                    }
-                }
-            }
-        } else {
-            $extended = false;
-
-            if (strpos($element, '<extended>') !== false) {
-                $element  = str_replace('<extended>', '', $element);
-                $extended = true;
-            }
-
-            $classes = array($element);
-
-            if ($extended) {
-                $classes = array_merge(
-                    $classes,
-                    class_implements($element),
-                    class_parents($element)
-                );
-            }
-
-            foreach ($classes as $className) {
-                if (!class_exists($className) &&
-                    !interface_exists($className) &&
-                    !trait_exists($className)) {
-                    throw new PHPUnit_Framework_InvalidCoversTargetException(
-                        sprintf(
-                            'Trying to @cover or @use not existing class or ' .
-                            'interface "%s".',
-                            $className
-                        )
-                    );
-                }
-
-                $codeToCoverList[] = new ReflectionClass($className);
-            }
-        }
-
-        return $codeToCoverList;
-    }
-
-    /**
-     * @param  array $reflectors
-     * @return array
-     */
-    private static function resolveReflectionObjectsToLines(array $reflectors)
-    {
-        $result = array();
-
-        foreach ($reflectors as $reflector) {
-            $filename = $reflector->getFileName();
-
-            if (!isset($result[$filename])) {
-                $result[$filename] = array();
-            }
-
-            $result[$filename] = array_unique(
-                array_merge(
-                    $result[$filename],
-                    range($reflector->getStartLine(), $reflector->getEndLine())
-                )
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     * @since  Method available since Release 4.0.8
-     */
-    private static function isBeforeClassMethod(ReflectionMethod $method)
-    {
-        return $method->isStatic() && strpos($method->getDocComment(), '@beforeClass') !== false;
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     * @since  Method available since Release 4.0.8
-     */
-    private static function isBeforeMethod(ReflectionMethod $method)
-    {
-        return preg_match('/@before\b/', $method->getDocComment());
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     * @since  Method available since Release 4.0.8
-     */
-    private static function isAfterClassMethod(ReflectionMethod $method)
-    {
-        return $method->isStatic() && strpos($method->getDocComment(), '@afterClass') !== false;
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return bool
-     * @since  Method available since Release 4.0.8
-     */
-    private static function isAfterMethod(ReflectionMethod $method)
-    {
-        return preg_match('/@after\b/', $method->getDocComment());
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php b/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
deleted file mode 100644
index 45fa898..0000000
--- a/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Prettifies class and method names for use in TestDox documentation.
- *
- * @since Class available since Release 2.1.0
- */
-class PHPUnit_Util_TestDox_NamePrettifier
-{
-    /**
-     * @var string
-     */
-    protected $prefix = 'Test';
-
-    /**
-     * @var string
-     */
-    protected $suffix = 'Test';
-
-    /**
-     * @var array
-     */
-    protected $strings = array();
-
-    /**
-     * Prettifies the name of a test class.
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function prettifyTestClass($name)
-    {
-        $title = $name;
-
-        if ($this->suffix !== null &&
-            $this->suffix == substr($name, -1 * strlen($this->suffix))) {
-            $title = substr($title, 0, strripos($title, $this->suffix));
-        }
-
-        if ($this->prefix !== null &&
-            $this->prefix == substr($name, 0, strlen($this->prefix))) {
-            $title = substr($title, strlen($this->prefix));
-        }
-
-        if (substr($title, 0, 1) == '\\') {
-            $title = substr($title, 1);
-        }
-
-        return $title;
-    }
-
-    /**
-     * Prettifies the name of a test method.
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function prettifyTestMethod($name)
-    {
-        $buffer = '';
-
-        if (!is_string($name) || strlen($name) == 0) {
-            return $buffer;
-        }
-
-        $string = preg_replace('#\d+$#', '', $name, -1, $count);
-
-        if (in_array($string, $this->strings)) {
-            $name = $string;
-        } elseif ($count == 0) {
-            $this->strings[] = $string;
-        }
-
-        if (strpos($name, '_') !== false) {
-            return str_replace('_', ' ', $name);
-        }
-
-        $max = strlen($name);
-
-        if (substr($name, 0, 4) == 'test') {
-            $offset = 4;
-        } else {
-            $offset  = 0;
-            $name[0] = strtoupper($name[0]);
-        }
-
-        $wasNumeric = false;
-
-        for ($i = $offset; $i < $max; $i++) {
-            if ($i > $offset &&
-                ord($name[$i]) >= 65 &&
-                ord($name[$i]) <= 90) {
-                $buffer .= ' ' . strtolower($name[$i]);
-            } else {
-                $isNumeric = is_numeric($name[$i]);
-
-                if (!$wasNumeric && $isNumeric) {
-                    $buffer    .= ' ';
-                    $wasNumeric = true;
-                }
-
-                if ($wasNumeric && !$isNumeric) {
-                    $wasNumeric = false;
-                }
-
-                $buffer .= $name[$i];
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Sets the prefix of test names.
-     *
-     * @param string $prefix
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Sets the suffix of test names.
-     *
-     * @param string $suffix
-     */
-    public function setSuffix($suffix)
-    {
-        $this->suffix = $suffix;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
deleted file mode 100644
index fbd7d84..0000000
--- a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for printers of TestDox documentation.
- *
- * @since Class available since Release 2.1.0
- */
-abstract class PHPUnit_Util_TestDox_ResultPrinter extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-    /**
-     * @var PHPUnit_Util_TestDox_NamePrettifier
-     */
-    protected $prettifier;
-
-    /**
-     * @var string
-     */
-    protected $testClass = '';
-
-    /**
-     * @var int
-     */
-    protected $testStatus = false;
-
-    /**
-     * @var array
-     */
-    protected $tests = array();
-
-    /**
-     * @var int
-     */
-    protected $successful = 0;
-
-    /**
-     * @var int
-     */
-    protected $failed = 0;
-
-    /**
-     * @var int
-     */
-    protected $risky = 0;
-
-    /**
-     * @var int
-     */
-    protected $skipped = 0;
-
-    /**
-     * @var int
-     */
-    protected $incomplete = 0;
-
-    /**
-     * @var string
-     */
-    protected $currentTestClassPrettified;
-
-    /**
-     * @var string
-     */
-    protected $currentTestMethodPrettified;
-
-    /**
-     * Constructor.
-     *
-     * @param resource $out
-     */
-    public function __construct($out = null)
-    {
-        parent::__construct($out);
-
-        $this->prettifier = new PHPUnit_Util_TestDox_NamePrettifier;
-        $this->startRun();
-    }
-
-    /**
-     * Flush buffer and close output.
-     */
-    public function flush()
-    {
-        $this->doEndClass();
-        $this->endRun();
-
-        parent::flush();
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
-        $this->failed++;
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param PHPUnit_Framework_Test                 $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
-     * @param float                                  $time
-     */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
-        $this->failed++;
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
-        $this->incomplete++;
-    }
-
-    /**
-     * Risky test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 4.0.0
-     */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_RISKY;
-        $this->risky++;
-    }
-
-    /**
-     * Skipped test.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param Exception              $e
-     * @param float                  $time
-     * @since  Method available since Release 3.0.0
-     */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
-        $this->skipped++;
-    }
-
-    /**
-     * A testsuite started.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    /**
-     * A testsuite ended.
-     *
-     * @param PHPUnit_Framework_TestSuite $suite
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-    {
-    }
-
-    /**
-     * A test started.
-     *
-     * @param PHPUnit_Framework_Test $test
-     */
-    public function startTest(PHPUnit_Framework_Test $test)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        $class = get_class($test);
-
-        if ($this->testClass != $class) {
-            if ($this->testClass != '') {
-                $this->doEndClass();
-            }
-
-            $this->currentTestClassPrettified = $this->prettifier->prettifyTestClass($class);
-            $this->startClass($class);
-
-            $this->testClass = $class;
-            $this->tests     = array();
-        }
-
-        $prettified = false;
-
-        $annotations = $test->getAnnotations();
-
-        if (isset($annotations['method']['testdox'][0])) {
-            $this->currentTestMethodPrettified = $annotations['method']['testdox'][0];
-            $prettified                        = true;
-        }
-
-        if (!$prettified) {
-            $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName(false));
-        }
-
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param PHPUnit_Framework_Test $test
-     * @param float                  $time
-     */
-    public function endTest(PHPUnit_Framework_Test $test, $time)
-    {
-        if (!$this->isOfInterest($test)) {
-            return;
-        }
-
-        if (!isset($this->tests[$this->currentTestMethodPrettified])) {
-            if ($this->testStatus == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
-                $this->tests[$this->currentTestMethodPrettified]['success'] = 1;
-                $this->tests[$this->currentTestMethodPrettified]['failure'] = 0;
-            } else {
-                $this->tests[$this->currentTestMethodPrettified]['success'] = 0;
-                $this->tests[$this->currentTestMethodPrettified]['failure'] = 1;
-            }
-        } else {
-            if ($this->testStatus == PHPUnit_Runner_BaseTestRunner::STATUS_PASSED) {
-                $this->tests[$this->currentTestMethodPrettified]['success']++;
-            } else {
-                $this->tests[$this->currentTestMethodPrettified]['failure']++;
-            }
-        }
-
-        $this->currentTestClassPrettified  = null;
-        $this->currentTestMethodPrettified = null;
-    }
-
-    /**
-     * @since  Method available since Release 2.3.0
-     */
-    protected function doEndClass()
-    {
-        foreach ($this->tests as $name => $data) {
-            $this->onTest($name, $data['failure'] == 0);
-        }
-
-        $this->endClass($this->testClass);
-    }
-
-    /**
-     * Handler for 'start run' event.
-     */
-    protected function startRun()
-    {
-    }
-
-    /**
-     * Handler for 'start class' event.
-     *
-     * @param string $name
-     */
-    protected function startClass($name)
-    {
-    }
-
-    /**
-     * Handler for 'on test' event.
-     *
-     * @param string $name
-     * @param bool   $success
-     */
-    protected function onTest($name, $success = true)
-    {
-    }
-
-    /**
-     * Handler for 'end class' event.
-     *
-     * @param string $name
-     */
-    protected function endClass($name)
-    {
-    }
-
-    /**
-     * Handler for 'end run' event.
-     */
-    protected function endRun()
-    {
-    }
-
-    private function isOfInterest(PHPUnit_Framework_Test $test)
-    {
-        return $test instanceof PHPUnit_Framework_TestCase && get_class($test) != 'PHPUnit_Framework_Warning';
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
deleted file mode 100644
index 6919eaf..0000000
--- a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Prints TestDox documentation in HTML format.
- *
- * @since Class available since Release 2.1.0
- */
-class PHPUnit_Util_TestDox_ResultPrinter_HTML extends PHPUnit_Util_TestDox_ResultPrinter
-{
-    /**
-     * @var bool
-     */
-    protected $printsHTML = true;
-
-    /**
-     * Handler for 'start run' event.
-     */
-    protected function startRun()
-    {
-        $this->write('<html><body>');
-    }
-
-    /**
-     * Handler for 'start class' event.
-     *
-     * @param string $name
-     */
-    protected function startClass($name)
-    {
-        $this->write(
-            '<h2 id="' . $name . '">' . $this->currentTestClassPrettified .
-            '</h2><ul>'
-        );
-    }
-
-    /**
-     * Handler for 'on test' event.
-     *
-     * @param string $name
-     * @param bool   $success
-     */
-    protected function onTest($name, $success = true)
-    {
-        if (!$success) {
-            $strikeOpen  = '<span style="text-decoration:line-through;">';
-            $strikeClose = '</span>';
-        } else {
-            $strikeOpen  = '';
-            $strikeClose = '';
-        }
-
-        $this->write('<li>' . $strikeOpen . $name . $strikeClose . '</li>');
-    }
-
-    /**
-     * Handler for 'end class' event.
-     *
-     * @param string $name
-     */
-    protected function endClass($name)
-    {
-        $this->write('</ul>');
-    }
-
-    /**
-     * Handler for 'end run' event.
-     */
-    protected function endRun()
-    {
-        $this->write('</body></html>');
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php b/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
deleted file mode 100644
index 0ea48b1..0000000
--- a/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Prints TestDox documentation in text format.
- *
- * @since Class available since Release 2.1.0
- */
-class PHPUnit_Util_TestDox_ResultPrinter_Text extends PHPUnit_Util_TestDox_ResultPrinter
-{
-    /**
-     * Handler for 'start class' event.
-     *
-     * @param string $name
-     */
-    protected function startClass($name)
-    {
-        $this->write($this->currentTestClassPrettified . "\n");
-    }
-
-    /**
-     * Handler for 'on test' event.
-     *
-     * @param string $name
-     * @param bool   $success
-     */
-    protected function onTest($name, $success = true)
-    {
-        if ($success) {
-            $this->write(' [x] ');
-        } else {
-            $this->write(' [ ] ');
-        }
-
-        $this->write($name . "\n");
-    }
-
-    /**
-     * Handler for 'end class' event.
-     *
-     * @param string $name
-     */
-    protected function endClass($name)
-    {
-        $this->write("\n");
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php b/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
deleted file mode 100644
index edf7b95..0000000
--- a/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Iterator for test suites.
- *
- * @since Class available since Release 3.1.0
- */
-class PHPUnit_Util_TestSuiteIterator implements RecursiveIterator
-{
-    /**
-     * @var int
-     */
-    protected $position;
-
-    /**
-     * @var PHPUnit_Framework_Test[]
-     */
-    protected $tests;
-
-    /**
-     * @param PHPUnit_Framework_TestSuite $testSuite
-     */
-    public function __construct(PHPUnit_Framework_TestSuite $testSuite)
-    {
-        $this->tests = $testSuite->tests();
-    }
-
-    /**
-     * Rewinds the Iterator to the first element.
-     */
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * Checks if there is a current element after calls to rewind() or next().
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return $this->position < count($this->tests);
-    }
-
-    /**
-     * Returns the key of the current element.
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Returns the current element.
-     *
-     * @return PHPUnit_Framework_Test
-     */
-    public function current()
-    {
-        return $this->valid() ? $this->tests[$this->position] : null;
-    }
-
-    /**
-     * Moves forward to next element.
-     */
-    public function next()
-    {
-        $this->position++;
-    }
-
-    /**
-     * Returns the sub iterator for the current element.
-     *
-     * @return PHPUnit_Util_TestSuiteIterator
-     */
-    public function getChildren()
-    {
-        return new self(
-            $this->tests[$this->position]
-        );
-    }
-
-    /**
-     * Checks whether the current element has children.
-     *
-     * @return bool
-     */
-    public function hasChildren()
-    {
-        return $this->tests[$this->position] instanceof PHPUnit_Framework_TestSuite;
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/Type.php b/vendor/phpunit/phpunit/src/Util/Type.php
deleted file mode 100644
index 1eb851a..0000000
--- a/vendor/phpunit/phpunit/src/Util/Type.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility class for textual type (and value) representation.
- *
- * @since Class available since Release 3.0.0
- */
-class PHPUnit_Util_Type
-{
-    public static function isType($type)
-    {
-        return in_array(
-            $type,
-            array(
-            'numeric',
-            'integer',
-            'int',
-            'float',
-            'string',
-            'boolean',
-            'bool',
-            'null',
-            'array',
-            'object',
-            'resource',
-            'scalar'
-            )
-        );
-    }
-}
diff --git a/vendor/phpunit/phpunit/src/Util/XML.php b/vendor/phpunit/phpunit/src/Util/XML.php
deleted file mode 100644
index 552efe2..0000000
--- a/vendor/phpunit/phpunit/src/Util/XML.php
+++ /dev/null
@@ -1,906 +0,0 @@
-<?php
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * XML helpers.
- *
- * @since Class available since Release 3.2.0
- */
-class PHPUnit_Util_XML
-{
-    /**
-     * Escapes a string for the use in XML documents
-     * Any Unicode character is allowed, excluding the surrogate blocks, FFFE,
-     * and FFFF (not even as character reference).
-     * See http://www.w3.org/TR/xml/#charsets
-     *
-     * @param  string $string
-     * @return string
-     * @since  Method available since Release 3.4.6
-     */
-    public static function prepareString($string)
-    {
-        return preg_replace(
-            '/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]/',
-            '',
-            htmlspecialchars(
-                PHPUnit_Util_String::convertToUtf8($string),
-                ENT_QUOTES,
-                'UTF-8'
-            )
-        );
-    }
-
-    /**
-     * Loads an XML (or HTML) file into a DOMDocument object.
-     *
-     * @param  string      $filename
-     * @param  bool        $isHtml
-     * @param  bool        $xinclude
-     * @param  bool        $strict
-     * @return DOMDocument
-     * @since  Method available since Release 3.3.0
-     */
-    public static function loadFile($filename, $isHtml = false, $xinclude = false, $strict = false)
-    {
-        $reporting = error_reporting(0);
-        $contents  = file_get_contents($filename);
-        error_reporting($reporting);
-
-        if ($contents === false) {
-            throw new PHPUnit_Framework_Exception(
-                sprintf(
-                    'Could not read "%s".',
-                    $filename
-                )
-            );
-        }
-
-        return self::load($contents, $isHtml, $filename, $xinclude, $strict);
-    }
-
-    /**
-     * Load an $actual document into a DOMDocument.  This is called
-     * from the selector assertions.
-     *
-     * If $actual is already a DOMDocument, it is returned with
-     * no changes.  Otherwise, $actual is loaded into a new DOMDocument
-     * as either HTML or XML, depending on the value of $isHtml. If $isHtml is
-     * false and $xinclude is true, xinclude is performed on the loaded
-     * DOMDocument.
-     *
-     * Note: prior to PHPUnit 3.3.0, this method loaded a file and
-     * not a string as it currently does.  To load a file into a
-     * DOMDocument, use loadFile() instead.
-     *
-     * @param  string|DOMDocument $actual
-     * @param  bool               $isHtml
-     * @param  string             $filename
-     * @param  bool               $xinclude
-     * @param  bool               $strict
-     * @return DOMDocument
-     * @since  Method available since Release 3.3.0
-     */
-    public static function load($actual, $isHtml = false, $filename = '', $xinclude = false, $strict = false)
-    {
-        if ($actual instanceof DOMDocument) {
-            return $actual;
-        }
-
-        // Required for XInclude on Windows.
-        if ($xinclude) {
-            $cwd = getcwd();
-            @chdir(dirname($filename));
-        }
-
-        $document                     = new DOMDocument;
-        $document->preserveWhiteSpace = false;
-
-        $internal  = libxml_use_internal_errors(true);
-        $message   = '';
-        $reporting = error_reporting(0);
-
-        if ('' !== $filename) {
-            // Necessary for xinclude
-            $document->documentURI = $filename;
-        }
-
-        if ($isHtml) {
-            $loaded = $document->loadHTML($actual);
-        } else {
-            $loaded = $document->loadXML($actual);
-        }
-
-        if (!$isHtml && $xinclude) {
-            $document->xinclude();
-        }
-
-        foreach (libxml_get_errors() as $error) {
-            $message .= "\n" . $error->message;
-        }
-
-        libxml_use_internal_errors($internal);
-        error_reporting($reporting);
-
-        if ($xinclude) {
-            @chdir($cwd);
-        }
-
-        if ($loaded === false || ($strict && $message !== '')) {
-            if ($filename !== '') {
-                throw new PHPUnit_Framework_Exception(
-                    sprintf(
-                        'Could not load "%s".%s',
-                        $filename,
-                        $message != '' ? "\n" . $message : ''
-                    )
-                );
-            } else {
-                throw new PHPUnit_Framework_Exception($message);
-            }
-        }
-
-        return $document;
-    }
-
-    /**
-     * @param  DOMNode $node
-     * @return string
-     * @since  Method available since Release 3.4.0
-     */
-    public static function nodeToText(DOMNode $node)
-    {
-        if ($node->childNodes->length == 1) {
-            return $node->textContent;
-        }
-
-        $result = '';
-
-        foreach ($node->childNodes as $childNode) {
-            $result .= $node->ownerDocument->saveXML($childNode);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param DOMNode $node
-     * @since  Method available since Release 3.3.0
-     */
-    public static function removeCharacterDataNodes(DOMNode $node)
-    {
-        if ($node->hasChildNodes()) {
-            for ($i = $node->childNodes->length - 1; $i >= 0; $i--) {
-                if (($child = $node->childNodes->item($i)) instanceof DOMCharacterData) {
-                    $node->removeChild($child);
-                }
-            }
-        }
-    }
-
-    /**
-     * "Convert" a DOMElement object into a PHP variable.
-     *
-     * @param  DOMElement $element
-     * @return mixed
-     * @since  Method available since Release 3.4.0
-     */
-    public static function xmlToVariable(DOMElement $element)
-    {
-        $variable = null;
-
-        switch ($element->tagName) {
-            case 'array':
-                $variable = array();
-
-                foreach ($element->getElementsByTagName('element') as $element) {
-                    $item = $element->childNodes->item(0);
-
-                    if ($item instanceof DOMText) {
-                        $item = $element->childNodes->item(1);
-                    }
-
-                    $value = self::xmlToVariable($item);
-
-                    if ($element->hasAttribute('key')) {
-                        $variable[(string) $element->getAttribute('key')] = $value;
-                    } else {
-                        $variable[] = $value;
-                    }
-                }
-                break;
-
-            case 'object':
-                $className = $element->getAttribute('class');
-
-                if ($element->hasChildNodes()) {
-                    $arguments       = $element->childNodes->item(1)->childNodes;
-                    $constructorArgs = array();
-
-                    foreach ($arguments as $argument) {
-                        if ($argument instanceof DOMElement) {
-                            $constructorArgs[] = self::xmlToVariable($argument);
-                        }
-                    }
-
-                    $class    = new ReflectionClass($className);
-                    $variable = $class->newInstanceArgs($constructorArgs);
-                } else {
-                    $variable = new $className;
-                }
-                break;
-
-            case 'boolean':
-                $variable = $element->textContent == 'true' ? true : false;
-                break;
-
-            case 'integer':
-            case 'double':
-            case 'string':
-                $variable = $element->textContent;
-
-                settype($variable, $element->tagName);
-                break;
-        }
-
-        return $variable;
-    }
-
-    /**
-     * Validate list of keys in the associative array.
-     *
-     * @param  array                       $hash
-     * @param  array                       $validKeys
-     * @return array
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.3.0
-     */
-    public static function assertValidKeys(array $hash, array $validKeys)
-    {
-        $valids = array();
-
-        // Normalize validation keys so that we can use both indexed and
-        // associative arrays.
-        foreach ($validKeys as $key => $val) {
-            is_int($key) ? $valids[$val] = null : $valids[$key] = $val;
-        }
-
-        $validKeys = array_keys($valids);
-
-        // Check for invalid keys.
-        foreach ($hash as $key => $value) {
-            if (!in_array($key, $validKeys)) {
-                $unknown[] = $key;
-            }
-        }
-
-        if (!empty($unknown)) {
-            throw new PHPUnit_Framework_Exception(
-                'Unknown key(s): ' . implode(', ', $unknown)
-            );
-        }
-
-        // Add default values for any valid keys that are empty.
-        foreach ($valids as $key => $value) {
-            if (!isset($hash[$key])) {
-                $hash[$key] = $value;
-            }
-        }
-
-        return $hash;
-    }
-
-    /**
-     * Parse a CSS selector into an associative array suitable for
-     * use with findNodes().
-     *
-     * @param  string $selector
-     * @param  mixed  $content
-     * @return array
-     * @since  Method available since Release 3.3.0
-     */
-    public static function convertSelectToTag($selector, $content = true)
-    {
-        $selector = trim(preg_replace("/\s+/", ' ', $selector));
-
-        // substitute spaces within attribute value
-        while (preg_match('/\[[^\]]+"[^"]+\s[^"]+"\]/', $selector)) {
-            $selector = preg_replace(
-                '/(\[[^\]]+"[^"]+)\s([^"]+"\])/',
-                '$1__SPACE__$2',
-                $selector
-            );
-        }
-
-        if (strstr($selector, ' ')) {
-            $elements = explode(' ', $selector);
-        } else {
-            $elements = array($selector);
-        }
-
-        $previousTag = array();
-
-        foreach (array_reverse($elements) as $element) {
-            $element = str_replace('__SPACE__', ' ', $element);
-
-            // child selector
-            if ($element == '>') {
-                $previousTag = array('child' => $previousTag['descendant']);
-                continue;
-            }
-
-            // adjacent-sibling selector
-            if ($element == '+') {
-                $previousTag = array('adjacent-sibling' => $previousTag['descendant']);
-                continue;
-            }
-
-            $tag = array();
-
-            // match element tag
-            preg_match("/^([^\.#\[]*)/", $element, $eltMatches);
-
-            if (!empty($eltMatches[1])) {
-                $tag['tag'] = $eltMatches[1];
-            }
-
-            // match attributes (\[[^\]]*\]*), ids (#[^\.#\[]*),
-            // and classes (\.[^\.#\[]*))
-            preg_match_all(
-                "/(\[[^\]]*\]*|#[^\.#\[]*|\.[^\.#\[]*)/",
-                $element,
-                $matches
-            );
-
-            if (!empty($matches[1])) {
-                $classes = array();
-                $attrs   = array();
-
-                foreach ($matches[1] as $match) {
-                    // id matched
-                    if (substr($match, 0, 1) == '#') {
-                        $tag['id'] = substr($match, 1);
-                    } // class matched
-                    elseif (substr($match, 0, 1) == '.') {
-                        $classes[] = substr($match, 1);
-                    } // attribute matched
-                    elseif (substr($match, 0, 1) == '[' &&
-                             substr($match, -1, 1) == ']') {
-                        $attribute = substr($match, 1, strlen($match) - 2);
-                        $attribute = str_replace('"', '', $attribute);
-
-                        // match single word
-                        if (strstr($attribute, '~=')) {
-                            list($key, $value) = explode('~=', $attribute);
-                            $value             = "regexp:/.*\b$value\b.*/";
-                        } // match substring
-                        elseif (strstr($attribute, '*=')) {
-                            list($key, $value) = explode('*=', $attribute);
-                            $value             = "regexp:/.*$value.*/";
-                        } // exact match
-                        else {
-                            list($key, $value) = explode('=', $attribute);
-                        }
-
-                        $attrs[$key] = $value;
-                    }
-                }
-
-                if (!empty($classes)) {
-                    $tag['class'] = implode(' ', $classes);
-                }
-
-                if (!empty($attrs)) {
-                    $tag['attributes'] = $attrs;
-                }
-            }
-
-            // tag content
-            if (is_string($content)) {
-                $tag['content'] = $content;
-            }
-
-            // determine previous child/descendants
-            if (!empty($previousTag['descendant'])) {
-                $tag['descendant'] = $previousTag['descendant'];
-            } elseif (!empty($previousTag['child'])) {
-                $tag['child'] = $previousTag['child'];
-            } elseif (!empty($previousTag['adjacent-sibling'])) {
-                $tag['adjacent-sibling'] = $previousTag['adjacent-sibling'];
-                unset($tag['content']);
-            }
-
-            $previousTag = array('descendant' => $tag);
-        }
-
-        return $tag;
-    }
-
-    /**
-     * Parse an $actual document and return an array of DOMNodes
-     * matching the CSS $selector.  If an error occurs, it will
-     * return false.
-     *
-     * To only return nodes containing a certain content, give
-     * the $content to match as a string.  Otherwise, setting
-     * $content to true will return all nodes matching $selector.
-     *
-     * The $actual document may be a DOMDocument or a string
-     * containing XML or HTML, identified by $isHtml.
-     *
-     * @param  array      $selector
-     * @param  string     $content
-     * @param  mixed      $actual
-     * @param  bool       $isHtml
-     * @return bool|array
-     * @since  Method available since Release 3.3.0
-     */
-    public static function cssSelect($selector, $content, $actual, $isHtml = true)
-    {
-        $matcher = self::convertSelectToTag($selector, $content);
-        $dom     = self::load($actual, $isHtml);
-        $tags    = self::findNodes($dom, $matcher, $isHtml);
-
-        return $tags;
-    }
-
-    /**
-     * Parse out the options from the tag using DOM object tree.
-     *
-     * @param  DOMDocument $dom
-     * @param  array       $options
-     * @param  bool        $isHtml
-     * @return array
-     * @since  Method available since Release 3.3.0
-     */
-    public static function findNodes(DOMDocument $dom, array $options, $isHtml = true)
-    {
-        $valid = array(
-          'id', 'class', 'tag', 'content', 'attributes', 'parent',
-          'child', 'ancestor', 'descendant', 'children', 'adjacent-sibling'
-        );
-
-        $filtered = array();
-        $options  = self::assertValidKeys($options, $valid);
-
-        // find the element by id
-        if ($options['id']) {
-            $options['attributes']['id'] = $options['id'];
-        }
-
-        if ($options['class']) {
-            $options['attributes']['class'] = $options['class'];
-        }
-
-        $nodes = array();
-
-        // find the element by a tag type
-        if ($options['tag']) {
-            if ($isHtml) {
-                $elements = self::getElementsByCaseInsensitiveTagName(
-                    $dom,
-                    $options['tag']
-                );
-            } else {
-                $elements = $dom->getElementsByTagName($options['tag']);
-            }
-
-            foreach ($elements as $element) {
-                $nodes[] = $element;
-            }
-
-            if (empty($nodes)) {
-                return false;
-            }
-        } // no tag selected, get them all
-        else {
-            $tags = array(
-              'a', 'abbr', 'acronym', 'address', 'area', 'b', 'base', 'bdo',
-              'big', 'blockquote', 'body', 'br', 'button', 'caption', 'cite',
-              'code', 'col', 'colgroup', 'dd', 'del', 'div', 'dfn', 'dl',
-              'dt', 'em', 'fieldset', 'form', 'frame', 'frameset', 'h1', 'h2',
-              'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'iframe',
-              'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'link',
-              'map', 'meta', 'noframes', 'noscript', 'object', 'ol', 'optgroup',
-              'option', 'p', 'param', 'pre', 'q', 'samp', 'script', 'select',
-              'small', 'span', 'strong', 'style', 'sub', 'sup', 'table',
-              'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title',
-              'tr', 'tt', 'ul', 'var',
-              // HTML5
-              'article', 'aside', 'audio', 'bdi', 'canvas', 'command',
-              'datalist', 'details', 'dialog', 'embed', 'figure', 'figcaption',
-              'footer', 'header', 'hgroup', 'keygen', 'mark', 'meter', 'nav',
-              'output', 'progress', 'ruby', 'rt', 'rp', 'track', 'section',
-              'source', 'summary', 'time', 'video', 'wbr'
-            );
-
-            foreach ($tags as $tag) {
-                if ($isHtml) {
-                    $elements = self::getElementsByCaseInsensitiveTagName(
-                        $dom,
-                        $tag
-                    );
-                } else {
-                    $elements = $dom->getElementsByTagName($tag);
-                }
-
-                foreach ($elements as $element) {
-                    $nodes[] = $element;
-                }
-            }
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by attributes
-        if ($options['attributes']) {
-            foreach ($nodes as $node) {
-                $invalid = false;
-
-                foreach ($options['attributes'] as $name => $value) {
-                    // match by regexp if like "regexp:/foo/i"
-                    if (preg_match('/^regexp\s*:\s*(.*)/i', $value, $matches)) {
-                        if (!preg_match($matches[1], $node->getAttribute($name))) {
-                            $invalid = true;
-                        }
-                    } // class can match only a part
-                    elseif ($name == 'class') {
-                        // split to individual classes
-                        $findClasses = explode(
-                            ' ',
-                            preg_replace("/\s+/", ' ', $value)
-                        );
-
-                        $allClasses = explode(
-                            ' ',
-                            preg_replace("/\s+/", ' ', $node->getAttribute($name))
-                        );
-
-                        // make sure each class given is in the actual node
-                        foreach ($findClasses as $findClass) {
-                            if (!in_array($findClass, $allClasses)) {
-                                $invalid = true;
-                            }
-                        }
-                    } // match by exact string
-                    else {
-                        if ($node->getAttribute($name) != $value) {
-                            $invalid = true;
-                        }
-                    }
-                }
-
-                // if every attribute given matched
-                if (!$invalid) {
-                    $filtered[] = $node;
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by content
-        if ($options['content'] !== null) {
-            foreach ($nodes as $node) {
-                $invalid = false;
-
-                // match by regexp if like "regexp:/foo/i"
-                if (preg_match('/^regexp\s*:\s*(.*)/i', $options['content'], $matches)) {
-                    if (!preg_match($matches[1], self::getNodeText($node))) {
-                        $invalid = true;
-                    }
-                } // match empty string
-                elseif ($options['content'] === '') {
-                    if (self::getNodeText($node) !== '') {
-                        $invalid = true;
-                    }
-                } // match by exact string
-                elseif (strstr(self::getNodeText($node), $options['content']) === false) {
-                    $invalid = true;
-                }
-
-                if (!$invalid) {
-                    $filtered[] = $node;
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by parent node
-        if ($options['parent']) {
-            $parentNodes = self::findNodes($dom, $options['parent'], $isHtml);
-            $parentNode  = isset($parentNodes[0]) ? $parentNodes[0] : null;
-
-            foreach ($nodes as $node) {
-                if ($parentNode !== $node->parentNode) {
-                    continue;
-                }
-
-                $filtered[] = $node;
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by child node
-        if ($options['child']) {
-            $childNodes = self::findNodes($dom, $options['child'], $isHtml);
-            $childNodes = !empty($childNodes) ? $childNodes : array();
-
-            foreach ($nodes as $node) {
-                foreach ($node->childNodes as $child) {
-                    foreach ($childNodes as $childNode) {
-                        if ($childNode === $child) {
-                            $filtered[] = $node;
-                        }
-                    }
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by adjacent-sibling
-        if ($options['adjacent-sibling']) {
-            $adjacentSiblingNodes = self::findNodes($dom, $options['adjacent-sibling'], $isHtml);
-            $adjacentSiblingNodes = !empty($adjacentSiblingNodes) ? $adjacentSiblingNodes : array();
-
-            foreach ($nodes as $node) {
-                $sibling = $node;
-
-                while ($sibling = $sibling->nextSibling) {
-                    if ($sibling->nodeType !== XML_ELEMENT_NODE) {
-                        continue;
-                    }
-
-                    foreach ($adjacentSiblingNodes as $adjacentSiblingNode) {
-                        if ($sibling === $adjacentSiblingNode) {
-                            $filtered[] = $node;
-                            break;
-                        }
-                    }
-
-                    break;
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by ancestor
-        if ($options['ancestor']) {
-            $ancestorNodes = self::findNodes($dom, $options['ancestor'], $isHtml);
-            $ancestorNode  = isset($ancestorNodes[0]) ? $ancestorNodes[0] : null;
-
-            foreach ($nodes as $node) {
-                $parent = $node->parentNode;
-
-                while ($parent && $parent->nodeType != XML_HTML_DOCUMENT_NODE) {
-                    if ($parent === $ancestorNode) {
-                        $filtered[] = $node;
-                    }
-
-                    $parent = $parent->parentNode;
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by descendant
-        if ($options['descendant']) {
-            $descendantNodes = self::findNodes($dom, $options['descendant'], $isHtml);
-            $descendantNodes = !empty($descendantNodes) ? $descendantNodes : array();
-
-            foreach ($nodes as $node) {
-                foreach (self::getDescendants($node) as $descendant) {
-                    foreach ($descendantNodes as $descendantNode) {
-                        if ($descendantNode === $descendant) {
-                            $filtered[] = $node;
-                        }
-                    }
-                }
-            }
-
-            $nodes    = $filtered;
-            $filtered = array();
-
-            if (empty($nodes)) {
-                return false;
-            }
-        }
-
-        // filter by children
-        if ($options['children']) {
-            $validChild   = array('count', 'greater_than', 'less_than', 'only');
-            $childOptions = self::assertValidKeys(
-                $options['children'],
-                $validChild
-            );
-
-            foreach ($nodes as $node) {
-                $childNodes = $node->childNodes;
-
-                foreach ($childNodes as $childNode) {
-                    if ($childNode->nodeType !== XML_CDATA_SECTION_NODE &&
-                        $childNode->nodeType !== XML_TEXT_NODE) {
-                        $children[] = $childNode;
-                    }
-                }
-
-                // we must have children to pass this filter
-                if (!empty($children)) {
-                    // exact count of children
-                    if ($childOptions['count'] !== null) {
-                        if (count($children) !== $childOptions['count']) {
-                            break;
-                        }
-                    } // range count of children
-                    elseif ($childOptions['less_than']    !== null &&
-                            $childOptions['greater_than'] !== null) {
-                        if (count($children) >= $childOptions['less_than'] ||
-                            count($children) <= $childOptions['greater_than']) {
-                            break;
-                        }
-                    } // less than a given count
-                    elseif ($childOptions['less_than'] !== null) {
-                        if (count($children) >= $childOptions['less_than']) {
-                            break;
-                        }
-                    } // more than a given count
-                    elseif ($childOptions['greater_than'] !== null) {
-                        if (count($children) <= $childOptions['greater_than']) {
-                            break;
-                        }
-                    }
-
-                    // match each child against a specific tag
-                    if ($childOptions['only']) {
-                        $onlyNodes = self::findNodes(
-                            $dom,
-                            $childOptions['only'],
-                            $isHtml
-                        );
-
-                        // try to match each child to one of the 'only' nodes
-                        foreach ($children as $child) {
-                            $matched = false;
-
-                            foreach ($onlyNodes as $onlyNode) {
-                                if ($onlyNode === $child) {
-                                    $matched = true;
-                                }
-                            }
-
-                            if (!$matched) {
-                                break 2;
-                            }
-                        }
-                    }
-
-                    $filtered[] = $node;
-                }
-            }
-
-            $nodes = $filtered;
-
-            if (empty($nodes)) {
-                return;
-            }
-        }
-
-        // return the first node that matches all criteria
-        return !empty($nodes) ? $nodes : array();
-    }
-
-    /**
-     * Recursively get flat array of all descendants of this node.
-     *
-     * @param  DOMNode $node
-     * @return array
-     * @since  Method available since Release 3.3.0
-     */
-    protected static function getDescendants(DOMNode $node)
-    {
-        $allChildren = array();
-        $childNodes  = $node->childNodes ? $node->childNodes : array();
-
-        foreach ($childNodes as $child) {
-            if ($child->nodeType === XML_CDATA_SECTION_NODE ||
-                $child->nodeType === XML_TEXT_NODE) {
-                continue;
-            }
-
-            $children    = self::getDescendants($child);
-            $allChildren = array_merge($allChildren, $children, array($child));
-        }
-
-        return isset($allChildren) ? $allChildren : array();
-    }
-
-    /**
-     * Gets elements by case insensitive tagname.
-     *
-     * @param  DOMDocument $dom
-     * @param  string      $tag
-     * @return DOMNodeList
-     * @since  Method available since Release 3.4.0
-     */
-    protected static function getElementsByCaseInsensitiveTagName(DOMDocument $dom, $tag)
-    {
-        $elements = $dom->getElementsByTagName(strtolower($tag));
-
-        if ($elements->length == 0) {
-            $elements = $dom->getElementsByTagName(strtoupper($tag));
-        }
-
-        return $elements;
-    }
-
-    /**
-     * Get the text value of this node's child text node.
-     *
-     * @param  DOMNode $node
-     * @return string
-     * @since  Method available since Release 3.3.0
-     */
-    protected static function getNodeText(DOMNode $node)
-    {
-        if (!$node->childNodes instanceof DOMNodeList) {
-            return '';
-        }
-
-        $result = '';
-
-        foreach ($node->childNodes as $childNode) {
-            if ($childNode->nodeType === XML_TEXT_NODE ||
-                $childNode->nodeType === XML_CDATA_SECTION_NODE) {
-                $result .= trim($childNode->data) . ' ';
-            } else {
-                $result .= self::getNodeText($childNode);
-            }
-        }
-
-        return str_replace('  ', ' ', $result);
-    }
-}
diff --git a/vendor/psr/http-message/LICENSE b/vendor/psr/http-message/LICENSE
deleted file mode 100644
index c2d8e45..0000000
--- a/vendor/psr/http-message/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 PHP Framework Interoperability Group
-
-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/vendor/psr/http-message/README.md b/vendor/psr/http-message/README.md
deleted file mode 100644
index 2818533..0000000
--- a/vendor/psr/http-message/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-PSR Http Message
-================
-
-This repository holds all interfaces/classes/traits related to
-[PSR-7](http://www.php-fig.org/psr/psr-7/).
-
-Note that this is not a HTTP message implementation of its own. It is merely an
-interface that describes a HTTP message. See the specification for more details.
-
-Usage
------
-
-We'll certainly need some stuff in here.
\ No newline at end of file
diff --git a/vendor/psr/http-message/composer.json b/vendor/psr/http-message/composer.json
deleted file mode 100644
index 4774b61..0000000
--- a/vendor/psr/http-message/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "psr/http-message",
-    "description": "Common interface for HTTP messages",
-    "keywords": ["psr", "psr-7", "http", "http-message", "request", "response"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Http\\Message\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/psr/http-message/src/MessageInterface.php b/vendor/psr/http-message/src/MessageInterface.php
deleted file mode 100644
index 8f67a05..0000000
--- a/vendor/psr/http-message/src/MessageInterface.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * HTTP messages consist of requests from a client to a server and responses
- * from a server to a client. This interface defines the methods common to
- * each.
- *
- * Messages are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- *
- * @link http://www.ietf.org/rfc/rfc7230.txt
- * @link http://www.ietf.org/rfc/rfc7231.txt
- */
-interface MessageInterface
-{
-    /**
-     * Retrieves the HTTP protocol version as a string.
-     *
-     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-     *
-     * @return string HTTP protocol version.
-     */
-    public function getProtocolVersion();
-
-    /**
-     * Return an instance with the specified HTTP protocol version.
-     *
-     * The version string MUST contain only the HTTP version number (e.g.,
-     * "1.1", "1.0").
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new protocol version.
-     *
-     * @param string $version HTTP protocol version
-     * @return self
-     */
-    public function withProtocolVersion($version);
-
-    /**
-     * Retrieves all message header values.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return array Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getHeaders();
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($name);
-
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader($name);
-
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine($name);
-
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return self
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($name, $value);
-
-    /**
-     * Return an instance with the specified header appended with the given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return self
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader($name, $value);
-
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $name Case-insensitive header field name to remove.
-     * @return self
-     */
-    public function withoutHeader($name);
-
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody();
-
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return self
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body);
-}
diff --git a/vendor/psr/http-message/src/RequestInterface.php b/vendor/psr/http-message/src/RequestInterface.php
deleted file mode 100644
index 75c802e..0000000
--- a/vendor/psr/http-message/src/RequestInterface.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an outgoing, client-side request.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - HTTP method
- * - URI
- * - Headers
- * - Message body
- *
- * During construction, implementations MUST attempt to set the Host header from
- * a provided URI if no Host header is provided.
- *
- * Requests are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface RequestInterface extends MessageInterface
-{
-    /**
-     * Retrieves the message's request target.
-     *
-     * Retrieves the message's request-target either as it will appear (for
-     * clients), as it appeared at request (for servers), or as it was
-     * specified for the instance (see withRequestTarget()).
-     *
-     * In most cases, this will be the origin-form of the composed URI,
-     * unless a value was provided to the concrete implementation (see
-     * withRequestTarget() below).
-     *
-     * If no URI is available, and no request-target has been specifically
-     * provided, this method MUST return the string "/".
-     *
-     * @return string
-     */
-    public function getRequestTarget();
-
-    /**
-     * Return an instance with the specific request-target.
-     *
-     * If the request needs a non-origin-form request-target — e.g., for
-     * specifying an absolute-form, authority-form, or asterisk-form —
-     * this method may be used to create an instance with the specified
-     * request-target, verbatim.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request target.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
-     *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
-     * @return self
-     */
-    public function withRequestTarget($requestTarget);
-
-    /**
-     * Retrieves the HTTP method of the request.
-     *
-     * @return string Returns the request method.
-     */
-    public function getMethod();
-
-    /**
-     * Return an instance with the provided HTTP method.
-     *
-     * While HTTP method names are typically all uppercase characters, HTTP
-     * method names are case-sensitive and thus implementations SHOULD NOT
-     * modify the given string.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request method.
-     *
-     * @param string $method Case-sensitive method.
-     * @return self
-     * @throws \InvalidArgumentException for invalid HTTP methods.
-     */
-    public function withMethod($method);
-
-    /**
-     * Retrieves the URI instance.
-     *
-     * This method MUST return a UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @return UriInterface Returns a UriInterface instance
-     *     representing the URI of the request.
-     */
-    public function getUri();
-
-    /**
-     * Returns an instance with the provided URI.
-     *
-     * This method MUST update the Host header of the returned request by
-     * default if the URI contains a host component. If the URI does not
-     * contain a host component, any pre-existing Host header MUST be carried
-     * over to the returned request.
-     *
-     * You can opt-in to preserving the original state of the Host header by
-     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
-     * `true`, this method interacts with the Host header in the following ways:
-     *
-     * - If the the Host header is missing or empty, and the new URI contains
-     *   a host component, this method MUST update the Host header in the returned
-     *   request.
-     * - If the Host header is missing or empty, and the new URI does not contain a
-     *   host component, this method MUST NOT update the Host header in the returned
-     *   request.
-     * - If a Host header is present and non-empty, this method MUST NOT update
-     *   the Host header in the returned request.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @param UriInterface $uri New request URI to use.
-     * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return self
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false);
-}
diff --git a/vendor/psr/http-message/src/ResponseInterface.php b/vendor/psr/http-message/src/ResponseInterface.php
deleted file mode 100644
index 6724809..0000000
--- a/vendor/psr/http-message/src/ResponseInterface.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an outgoing, server-side response.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - Status code and reason phrase
- * - Headers
- * - Message body
- *
- * Responses are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface ResponseInterface extends MessageInterface
-{
-    /**
-     * Gets the response status code.
-     *
-     * The status code is a 3-digit integer result code of the server's attempt
-     * to understand and satisfy the request.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode();
-
-    /**
-     * Return an instance with the specified status code and, optionally, reason phrase.
-     *
-     * If no reason phrase is specified, implementations MAY choose to default
-     * to the RFC 7231 or IANA recommended reason phrase for the response's
-     * status code.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated status and reason phrase.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @param int $code The 3-digit integer result code to set.
-     * @param string $reasonPhrase The reason phrase to use with the
-     *     provided status code; if none is provided, implementations MAY
-     *     use the defaults as suggested in the HTTP specification.
-     * @return self
-     * @throws \InvalidArgumentException For invalid status code arguments.
-     */
-    public function withStatus($code, $reasonPhrase = '');
-
-    /**
-     * Gets the response reason phrase associated with the status code.
-     *
-     * Because a reason phrase is not a required element in a response
-     * status line, the reason phrase value MAY be null. Implementations MAY
-     * choose to return the default RFC 7231 recommended reason phrase (or those
-     * listed in the IANA HTTP Status Code Registry) for the response's
-     * status code.
-     *
-     * @link http://tools.ietf.org/html/rfc7231#section-6
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     * @return string Reason phrase; must return an empty string if none present.
-     */
-    public function getReasonPhrase();
-}
diff --git a/vendor/psr/http-message/src/ServerRequestInterface.php b/vendor/psr/http-message/src/ServerRequestInterface.php
deleted file mode 100644
index 916e065..0000000
--- a/vendor/psr/http-message/src/ServerRequestInterface.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Representation of an incoming, server-side HTTP request.
- *
- * Per the HTTP specification, this interface includes properties for
- * each of the following:
- *
- * - Protocol version
- * - HTTP method
- * - URI
- * - Headers
- * - Message body
- *
- * Additionally, it encapsulates all data as it has arrived to the
- * application from the CGI and/or PHP environment, including:
- *
- * - The values represented in $_SERVER.
- * - Any cookies provided (generally via $_COOKIE)
- * - Query string arguments (generally via $_GET, or as parsed via parse_str())
- * - Upload files, if any (as represented by $_FILES)
- * - Deserialized body parameters (generally from $_POST)
- *
- * $_SERVER values MUST be treated as immutable, as they represent application
- * state at the time of request; as such, no methods are provided to allow
- * modification of those values. The other values provide such methods, as they
- * can be restored from $_SERVER or the request body, and may need treatment
- * during the application (e.g., body parameters may be deserialized based on
- * content type).
- *
- * Additionally, this interface recognizes the utility of introspecting a
- * request to derive and match additional parameters (e.g., via URI path
- * matching, decrypting cookie values, deserializing non-form-encoded body
- * content, matching authorization headers to users, etc). These parameters
- * are stored in an "attributes" property.
- *
- * Requests are considered immutable; all methods that might change state MUST
- * be implemented such that they retain the internal state of the current
- * message and return an instance that contains the changed state.
- */
-interface ServerRequestInterface extends RequestInterface
-{
-    /**
-     * Retrieve server parameters.
-     *
-     * Retrieves data related to the incoming request environment,
-     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
-     * REQUIRED to originate from $_SERVER.
-     *
-     * @return array
-     */
-    public function getServerParams();
-
-    /**
-     * Retrieve cookies.
-     *
-     * Retrieves cookies sent by the client to the server.
-     *
-     * The data MUST be compatible with the structure of the $_COOKIE
-     * superglobal.
-     *
-     * @return array
-     */
-    public function getCookieParams();
-
-    /**
-     * Return an instance with the specified cookies.
-     *
-     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
-     * be compatible with the structure of $_COOKIE. Typically, this data will
-     * be injected at instantiation.
-     *
-     * This method MUST NOT update the related Cookie header of the request
-     * instance, nor related values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated cookie values.
-     *
-     * @param array $cookies Array of key/value pairs representing cookies.
-     * @return self
-     */
-    public function withCookieParams(array $cookies);
-
-    /**
-     * Retrieve query string arguments.
-     *
-     * Retrieves the deserialized query string arguments, if any.
-     *
-     * Note: the query params might not be in sync with the URI or server
-     * params. If you need to ensure you are only getting the original
-     * values, you may need to parse the query string from `getUri()->getQuery()`
-     * or from the `QUERY_STRING` server param.
-     *
-     * @return array
-     */
-    public function getQueryParams();
-
-    /**
-     * Return an instance with the specified query string arguments.
-     *
-     * These values SHOULD remain immutable over the course of the incoming
-     * request. They MAY be injected during instantiation, such as from PHP's
-     * $_GET superglobal, or MAY be derived from some other value such as the
-     * URI. In cases where the arguments are parsed from the URI, the data
-     * MUST be compatible with what PHP's parse_str() would return for
-     * purposes of how duplicate query parameters are handled, and how nested
-     * sets are handled.
-     *
-     * Setting query string arguments MUST NOT change the URI stored by the
-     * request, nor the values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated query string arguments.
-     *
-     * @param array $query Array of query string arguments, typically from
-     *     $_GET.
-     * @return self
-     */
-    public function withQueryParams(array $query);
-
-    /**
-     * Retrieve normalized file upload data.
-     *
-     * This method returns upload metadata in a normalized tree, with each leaf
-     * an instance of Psr\Http\Message\UploadedFileInterface.
-     *
-     * These values MAY be prepared from $_FILES or the message body during
-     * instantiation, or MAY be injected via withUploadedFiles().
-     *
-     * @return array An array tree of UploadedFileInterface instances; an empty
-     *     array MUST be returned if no data is present.
-     */
-    public function getUploadedFiles();
-
-    /**
-     * Create a new instance with the specified uploaded files.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param array An array tree of UploadedFileInterface instances.
-     * @return self
-     * @throws \InvalidArgumentException if an invalid structure is provided.
-     */
-    public function withUploadedFiles(array $uploadedFiles);
-
-    /**
-     * Retrieve any parameters provided in the request body.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, this method MUST
-     * return the contents of $_POST.
-     *
-     * Otherwise, this method may return any results of deserializing
-     * the request body content; as parsing returns structured content, the
-     * potential types MUST be arrays or objects only. A null value indicates
-     * the absence of body content.
-     *
-     * @return null|array|object The deserialized body parameters, if any.
-     *     These will typically be an array or object.
-     */
-    public function getParsedBody();
-
-    /**
-     * Return an instance with the specified body parameters.
-     *
-     * These MAY be injected during instantiation.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, use this method
-     * ONLY to inject the contents of $_POST.
-     *
-     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
-     * deserializing the request body content. Deserialization/parsing returns
-     * structured data, and, as such, this method ONLY accepts arrays or objects,
-     * or a null value if nothing was available to parse.
-     *
-     * As an example, if content negotiation determines that the request data
-     * is a JSON payload, this method could be used to create a request
-     * instance with the deserialized parameters.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param null|array|object $data The deserialized body data. This will
-     *     typically be in an array or object.
-     * @return self
-     * @throws \InvalidArgumentException if an unsupported argument type is
-     *     provided.
-     */
-    public function withParsedBody($data);
-
-    /**
-     * Retrieve attributes derived from the request.
-     *
-     * The request "attributes" may be used to allow injection of any
-     * parameters derived from the request: e.g., the results of path
-     * match operations; the results of decrypting cookies; the results of
-     * deserializing non-form-encoded message bodies; etc. Attributes
-     * will be application and request specific, and CAN be mutable.
-     *
-     * @return array Attributes derived from the request.
-     */
-    public function getAttributes();
-
-    /**
-     * Retrieve a single derived request attribute.
-     *
-     * Retrieves a single derived request attribute as described in
-     * getAttributes(). If the attribute has not been previously set, returns
-     * the default value as provided.
-     *
-     * This method obviates the need for a hasAttribute() method, as it allows
-     * specifying a default value to return if the attribute is not found.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $default Default value to return if the attribute does not exist.
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null);
-
-    /**
-     * Return an instance with the specified derived request attribute.
-     *
-     * This method allows setting a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $value The value of the attribute.
-     * @return self
-     */
-    public function withAttribute($name, $value);
-
-    /**
-     * Return an instance that removes the specified derived request attribute.
-     *
-     * This method allows removing a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @return self
-     */
-    public function withoutAttribute($name);
-}
diff --git a/vendor/psr/http-message/src/StreamInterface.php b/vendor/psr/http-message/src/StreamInterface.php
deleted file mode 100644
index f68f391..0000000
--- a/vendor/psr/http-message/src/StreamInterface.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Describes a data stream.
- *
- * Typically, an instance will wrap a PHP stream; this interface provides
- * a wrapper around the most common operations, including serialization of
- * the entire stream to a string.
- */
-interface StreamInterface
-{
-    /**
-     * Reads all data from the stream into a string, from the beginning to end.
-     *
-     * This method MUST attempt to seek to the beginning of the stream before
-     * reading data and read the stream until the end is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * This method MUST NOT raise an exception in order to conform with PHP's
-     * string casting operations.
-     *
-     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Closes the stream and any underlying resources.
-     *
-     * @return void
-     */
-    public function close();
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the stream has been detached, the stream is in an unusable state.
-     *
-     * @return resource|null Underlying PHP stream, if any
-     */
-    public function detach();
-
-    /**
-     * Get the size of the stream if known.
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown.
-     */
-    public function getSize();
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int Position of the file pointer
-     * @throws \RuntimeException on error.
-     */
-    public function tell();
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof();
-
-    /**
-     * Returns whether or not the stream is seekable.
-     *
-     * @return bool
-     */
-    public function isSeekable();
-
-    /**
-     * Seek to a position in the stream.
-     *
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *     based on the seek offset. Valid values are identical to the built-in
-     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
-     *     offset bytes SEEK_CUR: Set position to current location plus offset
-     *     SEEK_END: Set position to end-of-stream plus offset.
-     * @throws \RuntimeException on failure.
-     */
-    public function seek($offset, $whence = SEEK_SET);
-
-    /**
-     * Seek to the beginning of the stream.
-     *
-     * If the stream is not seekable, this method will raise an exception;
-     * otherwise, it will perform a seek(0).
-     *
-     * @see seek()
-     * @link http://www.php.net/manual/en/function.fseek.php
-     * @throws \RuntimeException on failure.
-     */
-    public function rewind();
-
-    /**
-     * Returns whether or not the stream is writable.
-     *
-     * @return bool
-     */
-    public function isWritable();
-
-    /**
-     * Write data to the stream.
-     *
-     * @param string $string The string that is to be written.
-     * @return int Returns the number of bytes written to the stream.
-     * @throws \RuntimeException on failure.
-     */
-    public function write($string);
-
-    /**
-     * Returns whether or not the stream is readable.
-     *
-     * @return bool
-     */
-    public function isReadable();
-
-    /**
-     * Read data from the stream.
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *     them. Fewer than $length bytes may be returned if underlying stream
-     *     call returns fewer bytes.
-     * @return string Returns the data read from the stream, or an empty string
-     *     if no bytes are available.
-     * @throws \RuntimeException if an error occurs.
-     */
-    public function read($length);
-
-    /**
-     * Returns the remaining contents in a string
-     *
-     * @return string
-     * @throws \RuntimeException if unable to read or an error occurs while
-     *     reading.
-     */
-    public function getContents();
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
-     * @return array|mixed|null Returns an associative array if no key is
-     *     provided. Returns a specific key value if a key is provided and the
-     *     value is found, or null if the key is not found.
-     */
-    public function getMetadata($key = null);
-}
diff --git a/vendor/psr/http-message/src/UploadedFileInterface.php b/vendor/psr/http-message/src/UploadedFileInterface.php
deleted file mode 100644
index 5ad288d..0000000
--- a/vendor/psr/http-message/src/UploadedFileInterface.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-/**
- * Value object representing a file uploaded through an HTTP request.
- *
- * Instances of this interface are considered immutable; all methods that
- * might change state MUST be implemented such that they retain the internal
- * state of the current instance and return an instance that contains the
- * changed state.
- */
-interface UploadedFileInterface
-{
-    /**
-     * Retrieve a stream representing the uploaded file.
-     *
-     * This method MUST return a StreamInterface instance, representing the
-     * uploaded file. The purpose of this method is to allow utilizing native PHP
-     * stream functionality to manipulate the file upload, such as
-     * stream_copy_to_stream() (though the result will need to be decorated in a
-     * native PHP stream wrapper to work with such functions).
-     *
-     * If the moveTo() method has been called previously, this method MUST raise
-     * an exception.
-     *
-     * @return StreamInterface Stream representation of the uploaded file.
-     * @throws \RuntimeException in cases when no stream is available or can be
-     *     created.
-     */
-    public function getStream();
-
-    /**
-     * Move the uploaded file to a new location.
-     *
-     * Use this method as an alternative to move_uploaded_file(). This method is
-     * guaranteed to work in both SAPI and non-SAPI environments.
-     * Implementations must determine which environment they are in, and use the
-     * appropriate method (move_uploaded_file(), rename(), or a stream
-     * operation) to perform the operation.
-     *
-     * $targetPath may be an absolute path, or a relative path. If it is a
-     * relative path, resolution should be the same as used by PHP's rename()
-     * function.
-     *
-     * The original file or stream MUST be removed on completion.
-     *
-     * If this method is called more than once, any subsequent calls MUST raise
-     * an exception.
-     *
-     * When used in an SAPI environment where $_FILES is populated, when writing
-     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
-     * used to ensure permissions and upload status are verified correctly.
-     *
-     * If you wish to move to a stream, use getStream(), as SAPI operations
-     * cannot guarantee writing to stream destinations.
-     *
-     * @see http://php.net/is_uploaded_file
-     * @see http://php.net/move_uploaded_file
-     * @param string $targetPath Path to which to move the uploaded file.
-     * @throws \InvalidArgumentException if the $path specified is invalid.
-     * @throws \RuntimeException on any error during the move operation, or on
-     *     the second or subsequent call to the method.
-     */
-    public function moveTo($targetPath);
-    
-    /**
-     * Retrieve the file size.
-     *
-     * Implementations SHOULD return the value stored in the "size" key of
-     * the file in the $_FILES array if available, as PHP calculates this based
-     * on the actual size transmitted.
-     *
-     * @return int|null The file size in bytes or null if unknown.
-     */
-    public function getSize();
-    
-    /**
-     * Retrieve the error associated with the uploaded file.
-     *
-     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
-     *
-     * If the file was uploaded successfully, this method MUST return
-     * UPLOAD_ERR_OK.
-     *
-     * Implementations SHOULD return the value stored in the "error" key of
-     * the file in the $_FILES array.
-     *
-     * @see http://php.net/manual/en/features.file-upload.errors.php
-     * @return int One of PHP's UPLOAD_ERR_XXX constants.
-     */
-    public function getError();
-    
-    /**
-     * Retrieve the filename sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious filename with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "name" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The filename sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientFilename();
-    
-    /**
-     * Retrieve the media type sent by the client.
-     *
-     * Do not trust the value returned by this method. A client could send
-     * a malicious media type with the intention to corrupt or hack your
-     * application.
-     *
-     * Implementations SHOULD return the value stored in the "type" key of
-     * the file in the $_FILES array.
-     *
-     * @return string|null The media type sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientMediaType();
-}
diff --git a/vendor/psr/http-message/src/UriInterface.php b/vendor/psr/http-message/src/UriInterface.php
deleted file mode 100644
index 1ff5bf0..0000000
--- a/vendor/psr/http-message/src/UriInterface.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-namespace Psr\Http\Message;
-
-/**
- * Value object representing a URI.
- *
- * This interface is meant to represent URIs according to RFC 3986 and to
- * provide methods for most common operations. Additional functionality for
- * working with URIs can be provided on top of the interface or externally.
- * Its primary use is for HTTP requests, but may also be used in other
- * contexts.
- *
- * Instances of this interface are considered immutable; all methods that
- * might change state MUST be implemented such that they retain the internal
- * state of the current instance and return an instance that contains the
- * changed state.
- *
- * Typically the Host header will be also be present in the request message.
- * For server-side requests, the scheme will typically be discoverable in the
- * server parameters.
- *
- * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
- */
-interface UriInterface
-{
-    /**
-     * Retrieve the scheme component of the URI.
-     *
-     * If no scheme is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.1.
-     *
-     * The trailing ":" character is not part of the scheme and MUST NOT be
-     * added.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.1
-     * @return string The URI scheme.
-     */
-    public function getScheme();
-
-    /**
-     * Retrieve the authority component of the URI.
-     *
-     * If no authority information is present, this method MUST return an empty
-     * string.
-     *
-     * The authority syntax of the URI is:
-     *
-     * <pre>
-     * [user-info@]host[:port]
-     * </pre>
-     *
-     * If the port component is not set or is the standard port for the current
-     * scheme, it SHOULD NOT be included.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.2
-     * @return string The URI authority, in "[user-info@]host[:port]" format.
-     */
-    public function getAuthority();
-
-    /**
-     * Retrieve the user information component of the URI.
-     *
-     * If no user information is present, this method MUST return an empty
-     * string.
-     *
-     * If a user is present in the URI, this will return that value;
-     * additionally, if the password is also present, it will be appended to the
-     * user value, with a colon (":") separating the values.
-     *
-     * The trailing "@" character is not part of the user information and MUST
-     * NOT be added.
-     *
-     * @return string The URI user information, in "username[:password]" format.
-     */
-    public function getUserInfo();
-
-    /**
-     * Retrieve the host component of the URI.
-     *
-     * If no host is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.2.2.
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-     * @return string The URI host.
-     */
-    public function getHost();
-
-    /**
-     * Retrieve the port component of the URI.
-     *
-     * If a port is present, and it is non-standard for the current scheme,
-     * this method MUST return it as an integer. If the port is the standard port
-     * used with the current scheme, this method SHOULD return null.
-     *
-     * If no port is present, and no scheme is present, this method MUST return
-     * a null value.
-     *
-     * If no port is present, but a scheme is present, this method MAY return
-     * the standard port for that scheme, but SHOULD return null.
-     *
-     * @return null|int The URI port.
-     */
-    public function getPort();
-
-    /**
-     * Retrieve the path component of the URI.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * Normally, the empty path "" and absolute path "/" are considered equal as
-     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-     * do this normalization because in contexts with a trimmed base path, e.g.
-     * the front controller, this difference becomes significant. It's the task
-     * of the user to handle both "" and "/".
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.3.
-     *
-     * As an example, if the value should include a slash ("/") not intended as
-     * delimiter between path segments, that value MUST be passed in encoded
-     * form (e.g., "%2F") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.3
-     * @return string The URI path.
-     */
-    public function getPath();
-
-    /**
-     * Retrieve the query string of the URI.
-     *
-     * If no query string is present, this method MUST return an empty string.
-     *
-     * The leading "?" character is not part of the query and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.4.
-     *
-     * As an example, if a value in a key/value pair of the query string should
-     * include an ampersand ("&") not intended as a delimiter between values,
-     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.4
-     * @return string The URI query string.
-     */
-    public function getQuery();
-
-    /**
-     * Retrieve the fragment component of the URI.
-     *
-     * If no fragment is present, this method MUST return an empty string.
-     *
-     * The leading "#" character is not part of the fragment and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.5.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.5
-     * @return string The URI fragment.
-     */
-    public function getFragment();
-
-    /**
-     * Return an instance with the specified scheme.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified scheme.
-     *
-     * Implementations MUST support the schemes "http" and "https" case
-     * insensitively, and MAY accommodate other schemes if required.
-     *
-     * An empty scheme is equivalent to removing the scheme.
-     *
-     * @param string $scheme The scheme to use with the new instance.
-     * @return self A new instance with the specified scheme.
-     * @throws \InvalidArgumentException for invalid or unsupported schemes.
-     */
-    public function withScheme($scheme);
-
-    /**
-     * Return an instance with the specified user information.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified user information.
-     *
-     * Password is optional, but the user information MUST include the
-     * user; an empty string for the user is equivalent to removing user
-     * information.
-     *
-     * @param string $user The user name to use for authority.
-     * @param null|string $password The password associated with $user.
-     * @return self A new instance with the specified user information.
-     */
-    public function withUserInfo($user, $password = null);
-
-    /**
-     * Return an instance with the specified host.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified host.
-     *
-     * An empty host value is equivalent to removing the host.
-     *
-     * @param string $host The hostname to use with the new instance.
-     * @return self A new instance with the specified host.
-     * @throws \InvalidArgumentException for invalid hostnames.
-     */
-    public function withHost($host);
-
-    /**
-     * Return an instance with the specified port.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified port.
-     *
-     * Implementations MUST raise an exception for ports outside the
-     * established TCP and UDP port ranges.
-     *
-     * A null value provided for the port is equivalent to removing the port
-     * information.
-     *
-     * @param null|int $port The port to use with the new instance; a null value
-     *     removes the port information.
-     * @return self A new instance with the specified port.
-     * @throws \InvalidArgumentException for invalid ports.
-     */
-    public function withPort($port);
-
-    /**
-     * Return an instance with the specified path.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified path.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * If the path is intended to be domain-relative rather than path relative then
-     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-     * are assumed to be relative to some base path known to the application or
-     * consumer.
-     *
-     * Users can provide both encoded and decoded path characters.
-     * Implementations ensure the correct encoding as outlined in getPath().
-     *
-     * @param string $path The path to use with the new instance.
-     * @return self A new instance with the specified path.
-     * @throws \InvalidArgumentException for invalid paths.
-     */
-    public function withPath($path);
-
-    /**
-     * Return an instance with the specified query string.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified query string.
-     *
-     * Users can provide both encoded and decoded query characters.
-     * Implementations ensure the correct encoding as outlined in getQuery().
-     *
-     * An empty query string value is equivalent to removing the query string.
-     *
-     * @param string $query The query string to use with the new instance.
-     * @return self A new instance with the specified query string.
-     * @throws \InvalidArgumentException for invalid query strings.
-     */
-    public function withQuery($query);
-
-    /**
-     * Return an instance with the specified URI fragment.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified URI fragment.
-     *
-     * Users can provide both encoded and decoded fragment characters.
-     * Implementations ensure the correct encoding as outlined in getFragment().
-     *
-     * An empty fragment value is equivalent to removing the fragment.
-     *
-     * @param string $fragment The fragment to use with the new instance.
-     * @return self A new instance with the specified fragment.
-     */
-    public function withFragment($fragment);
-
-    /**
-     * Return the string representation as a URI reference.
-     *
-     * Depending on which components of the URI are present, the resulting
-     * string is either a full URI or relative reference according to RFC 3986,
-     * Section 4.1. The method concatenates the various components of the URI,
-     * using the appropriate delimiters:
-     *
-     * - If a scheme is present, it MUST be suffixed by ":".
-     * - If an authority is present, it MUST be prefixed by "//".
-     * - The path can be concatenated without delimiters. But there are two
-     *   cases where the path has to be adjusted to make the URI reference
-     *   valid as PHP does not allow to throw an exception in __toString():
-     *     - If the path is rootless and an authority is present, the path MUST
-     *       be prefixed by "/".
-     *     - If the path is starting with more than one "/" and no authority is
-     *       present, the starting slashes MUST be reduced to one.
-     * - If a query is present, it MUST be prefixed by "?".
-     * - If a fragment is present, it MUST be prefixed by "#".
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-4.1
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/vendor/psr/log/.gitignore b/vendor/psr/log/.gitignore
deleted file mode 100644
index 22d0d82..0000000
--- a/vendor/psr/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/vendor/psr/log/LICENSE b/vendor/psr/log/LICENSE
deleted file mode 100644
index 474c952..0000000
--- a/vendor/psr/log/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 PHP Framework Interoperability Group
-
-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/vendor/psr/log/Psr/Log/AbstractLogger.php b/vendor/psr/log/Psr/Log/AbstractLogger.php
deleted file mode 100644
index 00f9034..0000000
--- a/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * This is a simple Logger implementation that other Loggers can inherit from.
- *
- * It simply delegates all log-level-specific methods to the `log` method to
- * reduce boilerplate code that a simple Logger that does the same thing with
- * messages regardless of the error level has to implement.
- */
-abstract class AbstractLogger implements LoggerInterface
-{
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function emergency($message, array $context = array())
-    {
-        $this->log(LogLevel::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function alert($message, array $context = array())
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function critical($message, array $context = array())
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function error($message, array $context = array())
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function warning($message, array $context = array())
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function notice($message, array $context = array())
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function info($message, array $context = array())
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function debug($message, array $context = array())
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
-}
diff --git a/vendor/psr/log/Psr/Log/InvalidArgumentException.php b/vendor/psr/log/Psr/Log/InvalidArgumentException.php
deleted file mode 100644
index 67f852d..0000000
--- a/vendor/psr/log/Psr/Log/InvalidArgumentException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-class InvalidArgumentException extends \InvalidArgumentException
-{
-}
diff --git a/vendor/psr/log/Psr/Log/LogLevel.php b/vendor/psr/log/Psr/Log/LogLevel.php
deleted file mode 100644
index e32c151..0000000
--- a/vendor/psr/log/Psr/Log/LogLevel.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * Describes log levels
- */
-class LogLevel
-{
-    const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
deleted file mode 100644
index 2eebc4e..0000000
--- a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * Describes a logger-aware instance
- */
-interface LoggerAwareInterface
-{
-    /**
-     * Sets a logger instance on the object
-     *
-     * @param LoggerInterface $logger
-     * @return null
-     */
-    public function setLogger(LoggerInterface $logger);
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
deleted file mode 100644
index f087a3d..0000000
--- a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * Basic Implementation of LoggerAwareInterface.
- */
-trait LoggerAwareTrait
-{
-    /** @var LoggerInterface */
-    protected $logger;
-
-    /**
-     * Sets a logger.
-     * 
-     * @param LoggerInterface $logger
-     */
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/Psr/Log/LoggerInterface.php
deleted file mode 100644
index 476bb96..0000000
--- a/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * Describes a logger instance
- *
- * The message MUST be a string or object implementing __toString().
- *
- * The message MAY contain placeholders in the form: {foo} where foo
- * will be replaced by the context data in key "foo".
- *
- * The context array can contain arbitrary data, the only assumption that
- * can be made by implementors is that if an Exception instance is given
- * to produce a stack trace, it MUST be in a key named "exception".
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
- * for the full interface specification.
- */
-interface LoggerInterface
-{
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function emergency($message, array $context = array());
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function alert($message, array $context = array());
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function critical($message, array $context = array());
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function error($message, array $context = array());
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function warning($message, array $context = array());
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function notice($message, array $context = array());
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function info($message, array $context = array());
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function debug($message, array $context = array());
-
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function log($level, $message, array $context = array());
-}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php
deleted file mode 100644
index 5912496..0000000
--- a/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * This is a simple Logger trait that classes unable to extend AbstractLogger
- * (because they extend another class, etc) can include.
- *
- * It simply delegates all log-level-specific methods to the `log` method to 
- * reduce boilerplate code that a simple Logger that does the same thing with 
- * messages regardless of the error level has to implement.
- */
-trait LoggerTrait
-{
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function emergency($message, array $context = array())
-    {
-        $this->log(LogLevel::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function alert($message, array $context = array())
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function critical($message, array $context = array())
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function error($message, array $context = array())
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function warning($message, array $context = array())
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function notice($message, array $context = array())
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function info($message, array $context = array())
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function debug($message, array $context = array())
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
-
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    abstract public function log($level, $message, array $context = array());
-}
diff --git a/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/Psr/Log/NullLogger.php
deleted file mode 100644
index 553a3c5..0000000
--- a/vendor/psr/log/Psr/Log/NullLogger.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Psr\Log;
-
-/**
- * This Logger can be used to avoid conditional log calls
- *
- * Logging should always be optional, and if no logger is provided to your
- * library creating a NullLogger instance to have something to throw logs at
- * is a good way to avoid littering your code with `if ($this->logger) { }`
- * blocks.
- */
-class NullLogger extends AbstractLogger
-{
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     * @return null
-     */
-    public function log($level, $message, array $context = array())
-    {
-        // noop
-    }
-}
diff --git a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
deleted file mode 100644
index a932815..0000000
--- a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Psr\Log\Test;
-
-use Psr\Log\LogLevel;
-
-/**
- * Provides a base test class for ensuring compliance with the LoggerInterface
- *
- * Implementors can extend the class and implement abstract methods to run this as part of their test suite
- */
-abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @return LoggerInterface
-     */
-    abstract function getLogger();
-
-    /**
-     * This must return the log messages in order with a simple formatting: "<LOG LEVEL> <MESSAGE>"
-     *
-     * Example ->error('Foo') would yield "error Foo"
-     *
-     * @return string[]
-     */
-    abstract function getLogs();
-
-    public function testImplements()
-    {
-        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
-    }
-
-    /**
-     * @dataProvider provideLevelsAndMessages
-     */
-    public function testLogsAtAllLevels($level, $message)
-    {
-        $logger = $this->getLogger();
-        $logger->{$level}($message, array('user' => 'Bob'));
-        $logger->log($level, $message, array('user' => 'Bob'));
-
-        $expected = array(
-            $level.' message of level '.$level.' with context: Bob',
-            $level.' message of level '.$level.' with context: Bob',
-        );
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function provideLevelsAndMessages()
-    {
-        return array(
-            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
-            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
-            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
-            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
-            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
-            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
-            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
-            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
-        );
-    }
-
-    /**
-     * @expectedException Psr\Log\InvalidArgumentException
-     */
-    public function testThrowsOnInvalidLevel()
-    {
-        $logger = $this->getLogger();
-        $logger->log('invalid level', 'Foo');
-    }
-
-    public function testContextReplacement()
-    {
-        $logger = $this->getLogger();
-        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
-
-        $expected = array('info {Message {nothing} Bob Bar a}');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testObjectCastToString()
-    {
-        $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
-        $dummy->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('DUMMY'));
-
-        $this->getLogger()->warning($dummy);
-    }
-
-    public function testContextCanContainAnything()
-    {
-        $context = array(
-            'bool' => true,
-            'null' => null,
-            'string' => 'Foo',
-            'int' => 0,
-            'float' => 0.5,
-            'nested' => array('with object' => new DummyTest),
-            'object' => new \DateTime,
-            'resource' => fopen('php://memory', 'r'),
-        );
-
-        $this->getLogger()->warning('Crazy context data', $context);
-    }
-
-    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
-    {
-        $this->getLogger()->warning('Random message', array('exception' => 'oops'));
-        $this->getLogger()->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
-    }
-}
-
-class DummyTest
-{
-}
\ No newline at end of file
diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md
deleted file mode 100644
index 574bc1c..0000000
--- a/vendor/psr/log/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-PSR Log
-=======
-
-This repository holds all interfaces/classes/traits related to
-[PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md).
-
-Note that this is not a logger of its own. It is merely an interface that
-describes a logger. See the specification for more details.
-
-Usage
------
-
-If you need a logger, you can use the interface like this:
-
-```php
-<?php
-
-use Psr\Log\LoggerInterface;
-
-class Foo
-{
-    private $logger;
-
-    public function __construct(LoggerInterface $logger = null)
-    {
-        $this->logger = $logger;
-    }
-
-    public function doSomething()
-    {
-        if ($this->logger) {
-            $this->logger->info('Doing work');
-        }
-
-        // do something useful
-    }
-}
-```
-
-You can then pick one of the implementations of the interface to get a logger.
-
-If you want to implement the interface, you can require this package and
-implement `Psr\Log\LoggerInterface` in your code. Please read the
-[specification text](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-for details.
diff --git a/vendor/psr/log/composer.json b/vendor/psr/log/composer.json
deleted file mode 100644
index 6bdcc21..0000000
--- a/vendor/psr/log/composer.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "psr/log",
-    "description": "Common interface for logging libraries",
-    "keywords": ["psr", "psr-3", "log"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "autoload": {
-        "psr-0": {
-            "Psr\\Log\\": ""
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/.gitignore b/vendor/sebastian/comparator/.gitignore
deleted file mode 100644
index c2990fc..0000000
--- a/vendor/sebastian/comparator/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/build/coverage
-/composer.lock
-/composer.phar
-/phpunit.xml
-/.idea
-/vendor
diff --git a/vendor/sebastian/comparator/.travis.yml b/vendor/sebastian/comparator/.travis.yml
deleted file mode 100644
index 082370f..0000000
--- a/vendor/sebastian/comparator/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: php
-
-sudo: false
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
diff --git a/vendor/sebastian/comparator/LICENSE b/vendor/sebastian/comparator/LICENSE
deleted file mode 100644
index 334b637..0000000
--- a/vendor/sebastian/comparator/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Comparator
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/comparator/README.md b/vendor/sebastian/comparator/README.md
deleted file mode 100644
index faea412..0000000
--- a/vendor/sebastian/comparator/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-[![Build Status](https://travis-ci.org/sebastianbergmann/comparator.svg?branch=master)](https://travis-ci.org/sebastianbergmann/comparator)
-
-# Comparator
-
-This component provides the functionality to compare PHP values for equality.
-
-## Installation
-
-To add Comparator as a local, per-project dependency to your project, simply add a dependency on `sebastian/comparator` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Comparator 1.2:
-
-```JSON
-{
-    "require": {
-        "sebastian/comparator": "~1.2"
-    }
-}
-```
-
-## Usage
-
-```php
-<?php
-use SebastianBergmann\Comparator\Factory;
-use SebastianBergmann\Comparator\ComparisonFailure;
-
-$date1 = new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'));
-$date2 = new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'));
-
-$factory = new Factory;
-$comparator = $factory->getComparatorFor($date1, $date2);
-
-try {
-    $comparator->assertEquals($date1, $date2);
-    print "Dates match";
-}
-
-catch (ComparisonFailure $failure) {
-    print "Dates don't match";
-}
-```
-
diff --git a/vendor/sebastian/comparator/build.xml b/vendor/sebastian/comparator/build.xml
deleted file mode 100644
index 552ebce..0000000
--- a/vendor/sebastian/comparator/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="comparator">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpab" description="Generate autoloader script">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="tests/autoload.php" />
-   <arg path="tests" />
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/comparator/build/travis-ci.xml b/vendor/sebastian/comparator/build/travis-ci.xml
deleted file mode 100644
index 751a3bc..0000000
--- a/vendor/sebastian/comparator/build/travis-ci.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="../tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Comparator">
-    <directory suffix="Test.php">../tests</directory>
-  </testsuite>
-</phpunit>
-
diff --git a/vendor/sebastian/comparator/composer.json b/vendor/sebastian/comparator/composer.json
deleted file mode 100644
index 79f0803..0000000
--- a/vendor/sebastian/comparator/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "sebastian/comparator",
-    "description": "Provides the functionality to compare PHP values for equality",
-    "keywords": ["comparator","compare","equality"],
-    "homepage": "http://www.github.com/sebastianbergmann/comparator",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Volker Dusch",
-            "email": "github@wallbash.com"
-        },
-        {
-            "name": "Bernhard Schussek",
-            "email": "bschussek@2bepublished.at"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "sebastian/diff": "~1.2",
-        "sebastian/exporter": "~1.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/sebastian/comparator/phpunit.xml.dist b/vendor/sebastian/comparator/phpunit.xml.dist
deleted file mode 100644
index e1eaf2c..0000000
--- a/vendor/sebastian/comparator/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Comparator">
-    <directory suffix="Test.php">tests</directory>
-  </testsuite>
-
-  <logging>
-    <log type="coverage-html" target="build/coverage"/>
-  </logging>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/comparator/src/ArrayComparator.php b/vendor/sebastian/comparator/src/ArrayComparator.php
deleted file mode 100644
index 80f1cdc..0000000
--- a/vendor/sebastian/comparator/src/ArrayComparator.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares arrays for equality.
- */
-class ArrayComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_array($expected) && is_array($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @param  array             $processed
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
-    {
-        if ($canonicalize) {
-            sort($expected);
-            sort($actual);
-        }
-
-        $remaining = $actual;
-        $expString = $actString = "Array (\n";
-        $equal     = true;
-
-        foreach ($expected as $key => $value) {
-            unset($remaining[$key]);
-
-            if (!array_key_exists($key, $actual)) {
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($value)
-                );
-
-                $equal = false;
-
-                continue;
-            }
-
-            try {
-                $comparator = $this->factory->getComparatorFor($value, $actual[$key]);
-                $comparator->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
-
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($value)
-                );
-                $actString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $this->exporter->shortenedExport($actual[$key])
-                );
-            } catch (ComparisonFailure $e) {
-                $expString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $e->getExpectedAsString()
-                    ? $this->indent($e->getExpectedAsString())
-                    : $this->exporter->shortenedExport($e->getExpected())
-                );
-
-                $actString .= sprintf(
-                    "    %s => %s\n",
-                    $this->exporter->export($key),
-                    $e->getActualAsString()
-                    ? $this->indent($e->getActualAsString())
-                    : $this->exporter->shortenedExport($e->getActual())
-                );
-
-                $equal = false;
-            }
-        }
-
-        foreach ($remaining as $key => $value) {
-            $actString .= sprintf(
-                "    %s => %s\n",
-                $this->exporter->export($key),
-                $this->exporter->shortenedExport($value)
-            );
-
-            $equal = false;
-        }
-
-        $expString .= ')';
-        $actString .= ')';
-
-        if (!$equal) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $expString,
-                $actString,
-                false,
-                'Failed asserting that two arrays are equal.'
-            );
-        }
-    }
-
-    protected function indent($lines)
-    {
-        return trim(str_replace("\n", "\n    ", $lines));
-    }
-}
diff --git a/vendor/sebastian/comparator/src/Comparator.php b/vendor/sebastian/comparator/src/Comparator.php
deleted file mode 100644
index ef126a4..0000000
--- a/vendor/sebastian/comparator/src/Comparator.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * Abstract base class for comparators which compare values for equality.
- */
-abstract class Comparator
-{
-    /**
-     * @var Factory
-     */
-    protected $factory;
-
-    /**
-     * @var Exporter
-     */
-    protected $exporter;
-
-    public function __construct()
-    {
-        $this->exporter = new Exporter;
-    }
-
-    /**
-     * @param Factory $factory
-     */
-    public function setFactory(Factory $factory)
-    {
-        $this->factory = $factory;
-    }
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    abstract public function accepts($expected, $actual);
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    abstract public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false);
-}
diff --git a/vendor/sebastian/comparator/src/ComparisonFailure.php b/vendor/sebastian/comparator/src/ComparisonFailure.php
deleted file mode 100644
index 2c25453..0000000
--- a/vendor/sebastian/comparator/src/ComparisonFailure.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use SebastianBergmann\Diff\Differ;
-
-/**
- * Thrown when an assertion for string equality failed.
- */
-class ComparisonFailure extends \RuntimeException
-{
-    /**
-     * Expected value of the retrieval which does not match $actual.
-     * @var mixed
-     */
-    protected $expected;
-
-    /**
-     * Actually retrieved value which does not match $expected.
-     * @var mixed
-     */
-    protected $actual;
-
-    /**
-     * The string representation of the expected value
-     * @var string
-     */
-    protected $expectedAsString;
-
-    /**
-     * The string representation of the actual value
-     * @var string
-     */
-    protected $actualAsString;
-
-    /**
-     * @var bool
-     */
-    protected $identical;
-
-    /**
-     * Optional message which is placed in front of the first line
-     * returned by toString().
-     * @var string
-     */
-    protected $message;
-
-    /**
-     * Initialises with the expected value and the actual value.
-     *
-     * @param mixed  $expected         Expected value retrieved.
-     * @param mixed  $actual           Actual value retrieved.
-     * @param string $expectedAsString
-     * @param string $actualAsString
-     * @param bool   $identical
-     * @param string $message          A string which is prefixed on all returned lines
-     *                                 in the difference output.
-     */
-    public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = false, $message = '')
-    {
-        $this->expected         = $expected;
-        $this->actual           = $actual;
-        $this->expectedAsString = $expectedAsString;
-        $this->actualAsString   = $actualAsString;
-        $this->message          = $message;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getActual()
-    {
-        return $this->actual;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getExpected()
-    {
-        return $this->expected;
-    }
-
-    /**
-     * @return string
-     */
-    public function getActualAsString()
-    {
-        return $this->actualAsString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getExpectedAsString()
-    {
-        return $this->expectedAsString;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDiff()
-    {
-        if (!$this->actualAsString && !$this->expectedAsString) {
-            return '';
-        }
-
-        $differ = new Differ("\n--- Expected\n+++ Actual\n");
-
-        return $differ->diff($this->expectedAsString, $this->actualAsString);
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->message . $this->getDiff();
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DOMNodeComparator.php b/vendor/sebastian/comparator/src/DOMNodeComparator.php
deleted file mode 100644
index 4c8a39d..0000000
--- a/vendor/sebastian/comparator/src/DOMNodeComparator.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-use DOMDocument;
-use DOMNode;
-
-/**
- * Compares DOMNode instances for equality.
- */
-class DOMNodeComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof DOMNode && $actual instanceof DOMNode;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $expectedAsString = $this->nodeToText($expected, true, $ignoreCase);
-        $actualAsString   = $this->nodeToText($actual, true, $ignoreCase);
-
-        if ($expectedAsString !== $actualAsString) {
-            if ($expected instanceof DOMDocument) {
-                $type = 'documents';
-            } else {
-                $type = 'nodes';
-            }
-
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $expectedAsString,
-                $actualAsString,
-                false,
-                sprintf("Failed asserting that two DOM %s are equal.\n", $type)
-            );
-        }
-    }
-
-    /**
-     * Returns the normalized, whitespace-cleaned, and indented textual
-     * representation of a DOMNode.
-     *
-     * @param  DOMNode $node
-     * @param  bool    $canonicalize
-     * @param  bool    $ignoreCase
-     * @return string
-     */
-    private function nodeToText(DOMNode $node, $canonicalize, $ignoreCase)
-    {
-        if ($canonicalize) {
-            $document = new DOMDocument;
-            $document->loadXML($node->C14N());
-
-            $node = $document;
-        }
-
-        if ($node instanceof DOMDocument) {
-            $document = $node;
-        } else {
-            $document = $node->ownerDocument;
-        }
-
-        $document->formatOutput = true;
-        $document->normalizeDocument();
-
-        if ($node instanceof DOMDocument) {
-            $text = $node->saveXML();
-        } else {
-            $text = $document->saveXML($node);
-        }
-
-        if ($ignoreCase) {
-            $text = strtolower($text);
-        }
-
-        return $text;
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DateTimeComparator.php b/vendor/sebastian/comparator/src/DateTimeComparator.php
deleted file mode 100644
index f7bcd23..0000000
--- a/vendor/sebastian/comparator/src/DateTimeComparator.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares DateTimeInterface instances for equality.
- */
-class DateTimeComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return ($expected instanceof \DateTime || $expected instanceof \DateTimeInterface) &&
-            ($actual instanceof \DateTime || $actual instanceof \DateTimeInterface);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $delta = new \DateInterval(sprintf('PT%sS', abs($delta)));
-
-        $expectedLower = clone $expected;
-        $expectedUpper = clone $expected;
-
-        if ($actual < $expectedLower->sub($delta) ||
-            $actual > $expectedUpper->add($delta)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->dateTimeToString($expected),
-                $this->dateTimeToString($actual),
-                false,
-                'Failed asserting that two DateTime objects are equal.'
-            );
-        }
-    }
-
-    /**
-     * Returns an ISO 8601 formatted string representation of a datetime or
-     * 'Invalid DateTimeInterface object' if the provided DateTimeInterface was not properly
-     * initialized.
-     *
-     * @param  \DateTimeInterface $datetime
-     * @return string
-     */
-    protected function dateTimeToString($datetime)
-    {
-        $string = $datetime->format(\DateTime::ISO8601);
-
-        return $string ? $string : 'Invalid DateTimeInterface object';
-    }
-}
diff --git a/vendor/sebastian/comparator/src/DoubleComparator.php b/vendor/sebastian/comparator/src/DoubleComparator.php
deleted file mode 100644
index 051f668..0000000
--- a/vendor/sebastian/comparator/src/DoubleComparator.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares doubles for equality.
- */
-class DoubleComparator extends NumericComparator
-{
-    /**
-     * Smallest value available in PHP.
-     *
-     * @var float
-     */
-    const EPSILON = 0.0000000001;
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return (is_double($expected) || is_double($actual)) && is_numeric($expected) && is_numeric($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if ($delta == 0) {
-            $delta = self::EPSILON;
-        }
-
-        parent::assertEquals($expected, $actual, $delta, $canonicalize, $ignoreCase);
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ExceptionComparator.php b/vendor/sebastian/comparator/src/ExceptionComparator.php
deleted file mode 100644
index 5233646..0000000
--- a/vendor/sebastian/comparator/src/ExceptionComparator.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares Exception instances for equality.
- */
-class ExceptionComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \Exception && $actual instanceof \Exception;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset(
-            $array['file'],
-            $array['line'],
-            $array['trace'],
-            $array['string'],
-            $array['xdebug_message']
-        );
-
-        return $array;
-    }
-}
diff --git a/vendor/sebastian/comparator/src/Factory.php b/vendor/sebastian/comparator/src/Factory.php
deleted file mode 100644
index ed3d5e1..0000000
--- a/vendor/sebastian/comparator/src/Factory.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Factory for comparators which compare values for equality.
- */
-class Factory
-{
-    /**
-     * @var Comparator[]
-     */
-    private $comparators = array();
-
-    /**
-     * @var Factory
-     */
-    private static $instance;
-
-    /**
-     * Constructs a new factory.
-     */
-    public function __construct()
-    {
-        $this->register(new TypeComparator);
-        $this->register(new ScalarComparator);
-        $this->register(new NumericComparator);
-        $this->register(new DoubleComparator);
-        $this->register(new ArrayComparator);
-        $this->register(new ResourceComparator);
-        $this->register(new ObjectComparator);
-        $this->register(new ExceptionComparator);
-        $this->register(new SplObjectStorageComparator);
-        $this->register(new DOMNodeComparator);
-        $this->register(new MockObjectComparator);
-        $this->register(new DateTimeComparator);
-    }
-
-    /**
-     * @return Factory
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new self;
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Returns the correct comparator for comparing two values.
-     *
-     * @param  mixed      $expected The first value to compare
-     * @param  mixed      $actual   The second value to compare
-     * @return Comparator
-     */
-    public function getComparatorFor($expected, $actual)
-    {
-        foreach ($this->comparators as $comparator) {
-            if ($comparator->accepts($expected, $actual)) {
-                return $comparator;
-            }
-        }
-    }
-
-    /**
-     * Registers a new comparator.
-     *
-     * This comparator will be returned by getInstance() if its accept() method
-     * returns TRUE for the compared values. It has higher priority than the
-     * existing comparators, meaning that its accept() method will be tested
-     * before those of the other comparators.
-     *
-     * @param Comparator $comparator The registered comparator
-     */
-    public function register(Comparator $comparator)
-    {
-        array_unshift($this->comparators, $comparator);
-
-        $comparator->setFactory($this);
-    }
-
-    /**
-     * Unregisters a comparator.
-     *
-     * This comparator will no longer be returned by getInstance().
-     *
-     * @param Comparator $comparator The unregistered comparator
-     */
-    public function unregister(Comparator $comparator)
-    {
-        foreach ($this->comparators as $key => $_comparator) {
-            if ($comparator === $_comparator) {
-                unset($this->comparators[$key]);
-            }
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/MockObjectComparator.php b/vendor/sebastian/comparator/src/MockObjectComparator.php
deleted file mode 100644
index a16903c..0000000
--- a/vendor/sebastian/comparator/src/MockObjectComparator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares PHPUnit_Framework_MockObject_MockObject instances for equality.
- */
-class MockObjectComparator extends ObjectComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \PHPUnit_Framework_MockObject_MockObject && $actual instanceof \PHPUnit_Framework_MockObject_MockObject;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset($array['__phpunit_invocationMocker']);
-
-        return $array;
-    }
-}
\ No newline at end of file
diff --git a/vendor/sebastian/comparator/src/NumericComparator.php b/vendor/sebastian/comparator/src/NumericComparator.php
deleted file mode 100644
index 90890c0..0000000
--- a/vendor/sebastian/comparator/src/NumericComparator.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares numerical values for equality.
- */
-class NumericComparator extends ScalarComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        // all numerical values, but not if one of them is a double
-        // or both of them are strings
-        return is_numeric($expected) && is_numeric($actual) &&
-               !(is_double($expected) || is_double($actual)) &&
-               !(is_string($expected) && is_string($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if (is_infinite($actual) && is_infinite($expected)) {
-            return;
-        }
-
-        if ((is_infinite($actual) xor is_infinite($expected)) ||
-            (is_nan($actual) or is_nan($expected)) ||
-            abs($actual - $expected) > $delta) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                '',
-                '',
-                false,
-                sprintf(
-                    'Failed asserting that %s matches expected %s.',
-                    $this->exporter->export($actual),
-                    $this->exporter->export($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ObjectComparator.php b/vendor/sebastian/comparator/src/ObjectComparator.php
deleted file mode 100644
index 08ffb67..0000000
--- a/vendor/sebastian/comparator/src/ObjectComparator.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares objects for equality.
- */
-class ObjectComparator extends ArrayComparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_object($expected) && is_object($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @param  array             $processed
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
-    {
-        if (get_class($actual) !== get_class($expected)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->exporter->export($expected),
-                $this->exporter->export($actual),
-                false,
-                sprintf(
-                    '%s is not instance of expected class "%s".',
-                    $this->exporter->export($actual),
-                    get_class($expected)
-                )
-            );
-        }
-
-        // don't compare twice to allow for cyclic dependencies
-        if (in_array(array($actual, $expected), $processed, true) ||
-            in_array(array($expected, $actual), $processed, true)) {
-            return;
-        }
-
-        $processed[] = array($actual, $expected);
-
-        // don't compare objects if they are identical
-        // this helps to avoid the error "maximum function nesting level reached"
-        // CAUTION: this conditional clause is not tested
-        if ($actual !== $expected) {
-            try {
-                parent::assertEquals(
-                    $this->toArray($expected),
-                    $this->toArray($actual),
-                    $delta,
-                    $canonicalize,
-                    $ignoreCase,
-                    $processed
-                );
-            } catch (ComparisonFailure $e) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    // replace "Array" with "MyClass object"
-                    substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5),
-                    substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        return $this->exporter->toArray($object);
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ResourceComparator.php b/vendor/sebastian/comparator/src/ResourceComparator.php
deleted file mode 100644
index 877cc7d..0000000
--- a/vendor/sebastian/comparator/src/ResourceComparator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares resources for equality.
- */
-class ResourceComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_resource($expected) && is_resource($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if ($actual != $expected) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                $this->exporter->export($expected),
-                $this->exporter->export($actual)
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/ScalarComparator.php b/vendor/sebastian/comparator/src/ScalarComparator.php
deleted file mode 100644
index df5a746..0000000
--- a/vendor/sebastian/comparator/src/ScalarComparator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares scalar or NULL values for equality.
- */
-class ScalarComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     * @since  Method available since Release 3.6.0
-     */
-    public function accepts($expected, $actual)
-    {
-        return ((is_scalar($expected) xor null === $expected) &&
-               (is_scalar($actual) xor null === $actual))
-               // allow comparison between strings and objects featuring __toString()
-               || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
-               || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        $expectedToCompare = $expected;
-        $actualToCompare   = $actual;
-
-        // always compare as strings to avoid strange behaviour
-        // otherwise 0 == 'Foobar'
-        if (is_string($expected) || is_string($actual)) {
-            $expectedToCompare = (string) $expectedToCompare;
-            $actualToCompare   = (string) $actualToCompare;
-
-            if ($ignoreCase) {
-                $expectedToCompare = strtolower($expectedToCompare);
-                $actualToCompare   = strtolower($actualToCompare);
-            }
-        }
-
-        if ($expectedToCompare != $actualToCompare) {
-            if (is_string($expected) && is_string($actual)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two strings are equal.'
-                );
-            }
-
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                // no diff is required
-                '',
-                '',
-                false,
-                sprintf(
-                    'Failed asserting that %s matches expected %s.',
-                    $this->exporter->export($actual),
-                    $this->exporter->export($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/SplObjectStorageComparator.php b/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
deleted file mode 100644
index a1ec119..0000000
--- a/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares \SplObjectStorage instances for equality.
- */
-class SplObjectStorageComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof \SplObjectStorage && $actual instanceof \SplObjectStorage;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        foreach ($actual as $object) {
-            if (!$expected->contains($object)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-
-        foreach ($expected as $object) {
-            if (!$actual->contains($object)) {
-                throw new ComparisonFailure(
-                    $expected,
-                    $actual,
-                    $this->exporter->export($expected),
-                    $this->exporter->export($actual),
-                    false,
-                    'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-}
diff --git a/vendor/sebastian/comparator/src/TypeComparator.php b/vendor/sebastian/comparator/src/TypeComparator.php
deleted file mode 100644
index 6fe2077..0000000
--- a/vendor/sebastian/comparator/src/TypeComparator.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * This file is part of the Comparator package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Comparator;
-
-/**
- * Compares values for type equality.
- */
-class TypeComparator extends Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual   The second value to compare
-     * @return bool
-     */
-    public function accepts($expected, $actual)
-    {
-        return true;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed             $expected     The first value to compare
-     * @param  mixed             $actual       The second value to compare
-     * @param  float             $delta        The allowed numerical distance between two values to
-     *                                         consider them equal
-     * @param  bool              $canonicalize If set to TRUE, arrays are sorted before
-     *                                         comparison
-     * @param  bool              $ignoreCase   If set to TRUE, upper- and lowercasing is
-     *                                         ignored when comparing string values
-     * @throws ComparisonFailure Thrown when the comparison
-     *                                        fails. Contains information about the
-     *                                        specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
-    {
-        if (gettype($expected) != gettype($actual)) {
-            throw new ComparisonFailure(
-                $expected,
-                $actual,
-                // we don't need a diff
-                '',
-                '',
-                false,
-                sprintf(
-                    '%s does not match expected type "%s".',
-                    $this->exporter->shortenedExport($actual),
-                    gettype($expected)
-                )
-            );
-        }
-    }
-}
diff --git a/vendor/sebastian/diff/.gitignore b/vendor/sebastian/diff/.gitignore
deleted file mode 100644
index d571f24..0000000
--- a/vendor/sebastian/diff/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/SebastianBergmann
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/diff/.travis.yml b/vendor/sebastian/diff/.travis.yml
deleted file mode 100644
index c5ea677..0000000
--- a/vendor/sebastian/diff/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: php
-
-install:
-  - travis_retry composer install --no-interaction --prefer-source
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/diff/LICENSE b/vendor/sebastian/diff/LICENSE
deleted file mode 100644
index 0941c06..0000000
--- a/vendor/sebastian/diff/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Diff
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/diff/README.md b/vendor/sebastian/diff/README.md
deleted file mode 100644
index 921957b..0000000
--- a/vendor/sebastian/diff/README.md
+++ /dev/null
@@ -1,126 +0,0 @@
-# Diff
-
-Diff implementation for PHP, factored out of PHPUnit into a stand-alone component.
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff:
-
-    {
-        "require": {
-            "sebastian/diff": "*"
-        }
-    }
-
-### Usage
-
-The `Differ` class can be used to generate a textual representation of the difference between two strings:
-
-```php
-use SebastianBergmann\Diff\Differ;
-
-$differ = new Differ;
-print $differ->diff('foo', 'bar');
-```
-
-The code above yields the output below:
-
-    --- Original
-    +++ New
-    @@ @@
-    -foo
-    +bar
-
-The `Parser` class can be used to parse a unified diff into an object graph:
-
-```php
-use SebastianBergmann\Diff\Parser;
-use SebastianBergmann\Git;
-
-$git = new Git('/usr/local/src/money');
-
-$diff = $git->getDiff(
-  '948a1a07768d8edd10dcefa8315c1cbeffb31833',
-  'c07a373d2399f3e686234c4f7f088d635eb9641b'
-);
-
-$parser = new Parser;
-
-print_r($parser->parse($diff));
-```
-
-The code above yields the output below:
-
-    Array
-    (
-        [0] => SebastianBergmann\Diff\Diff Object
-            (
-                [from:SebastianBergmann\Diff\Diff:private] => a/tests/MoneyTest.php
-                [to:SebastianBergmann\Diff\Diff:private] => b/tests/MoneyTest.php
-                [chunks:SebastianBergmann\Diff\Diff:private] => Array
-                    (
-                        [0] => SebastianBergmann\Diff\Chunk Object
-                            (
-                                [start:SebastianBergmann\Diff\Chunk:private] => 87
-                                [startRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [end:SebastianBergmann\Diff\Chunk:private] => 87
-                                [endRange:SebastianBergmann\Diff\Chunk:private] => 7
-                                [lines:SebastianBergmann\Diff\Chunk:private] => Array
-                                    (
-                                        [0] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::add
-                                            )
-
-                                        [1] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::newMoney
-                                            )
-
-                                        [2] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>      */
-                                            )
-
-                                        [3] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 2
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyWithSameCurrencyObjectCanBeAdded()
-                                            )
-
-                                        [4] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 1
-                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyObjectWithSameCurrencyCanBeAdded()
-                                            )
-
-                                        [5] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>     {
-                                            )
-
-                                        [6] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $a = new Money(1, new Currency('EUR'));
-                                            )
-
-                                        [7] => SebastianBergmann\Diff\Line Object
-                                            (
-                                                [type:SebastianBergmann\Diff\Line:private] => 3
-                                                [content:SebastianBergmann\Diff\Line:private] =>         $b = new Money(2, new Currency('EUR'));
-                                            )
-
-                                    )
-
-                            )
-
-                    )
-
-            )
-
-    )
diff --git a/vendor/sebastian/diff/build.xml b/vendor/sebastian/diff/build.xml
deleted file mode 100644
index 7366087..0000000
--- a/vendor/sebastian/diff/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="diff">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/diff/composer.json b/vendor/sebastian/diff/composer.json
deleted file mode 100644
index 3c04952..0000000
--- a/vendor/sebastian/diff/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "sebastian/diff",
-    "description": "Diff implementation",
-    "keywords": ["diff"],
-    "homepage": "http://www.github.com/sebastianbergmann/diff",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Kore Nordmann",
-            "email": "mail@kore-nordmann.de"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.2"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/diff/phpunit.xml.dist b/vendor/sebastian/diff/phpunit.xml.dist
deleted file mode 100644
index 387a9b3..0000000
--- a/vendor/sebastian/diff/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="Diff">
-    <directory suffix="Test.php">tests</directory>
-  </testsuite>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/diff/src/Chunk.php b/vendor/sebastian/diff/src/Chunk.php
deleted file mode 100644
index 79d13fc..0000000
--- a/vendor/sebastian/diff/src/Chunk.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Chunk
-{
-    /**
-     * @var int
-     */
-    private $start;
-
-    /**
-     * @var int
-     */
-    private $startRange;
-
-    /**
-     * @var int
-     */
-    private $end;
-    /**
-     * @var int
-     */
-    private $endRange;
-
-    /**
-     * @var array
-     */
-    private $lines;
-
-    /**
-     * @param int   $start
-     * @param int   $startRange
-     * @param int   $end
-     * @param int   $endRange
-     * @param array $lines
-     */
-    public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = array())
-    {
-        $this->start      = (int) $start;
-        $this->startRange = (int) $startRange;
-        $this->end        = (int) $end;
-        $this->endRange   = (int) $endRange;
-        $this->lines      = $lines;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStart()
-    {
-        return $this->start;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStartRange()
-    {
-        return $this->startRange;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEnd()
-    {
-        return $this->end;
-    }
-
-    /**
-     * @return int
-     */
-    public function getEndRange()
-    {
-        return $this->endRange;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLines()
-    {
-        return $this->lines;
-    }
-
-    /**
-     * @param array $lines
-     */
-    public function setLines(array $lines)
-    {
-        $this->lines = $lines;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Diff.php b/vendor/sebastian/diff/src/Diff.php
deleted file mode 100644
index 45aaae6..0000000
--- a/vendor/sebastian/diff/src/Diff.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Diff
-{
-    /**
-     * @var string
-     */
-    private $from;
-
-    /**
-     * @var string
-     */
-    private $to;
-
-    /**
-     * @var Chunk[]
-     */
-    private $chunks;
-
-    /**
-     * @param string  $from
-     * @param string  $to
-     * @param Chunk[] $chunks
-     */
-    public function __construct($from, $to, array $chunks = array())
-    {
-        $this->from   = $from;
-        $this->to     = $to;
-        $this->chunks = $chunks;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFrom()
-    {
-        return $this->from;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTo()
-    {
-        return $this->to;
-    }
-
-    /**
-     * @return Chunk[]
-     */
-    public function getChunks()
-    {
-        return $this->chunks;
-    }
-
-    /**
-     * @param Chunk[] $chunks
-     */
-    public function setChunks(array $chunks)
-    {
-        $this->chunks = $chunks;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Differ.php b/vendor/sebastian/diff/src/Differ.php
deleted file mode 100644
index 76630ed..0000000
--- a/vendor/sebastian/diff/src/Differ.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-use SebastianBergmann\Diff\LCS\LongestCommonSubsequence;
-use SebastianBergmann\Diff\LCS\TimeEfficientImplementation;
-use SebastianBergmann\Diff\LCS\MemoryEfficientImplementation;
-
-/**
- * Diff implementation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Differ
-{
-    /**
-     * @var string
-     */
-    private $header;
-
-    /**
-     * @param string $header
-     */
-    public function __construct($header = "--- Original\n+++ New\n")
-    {
-        $this->header = $header;
-    }
-
-    /**
-     * Returns the diff between two arrays or strings as string.
-     *
-     * @param  array|string             $from
-     * @param  array|string             $to
-     * @param  LongestCommonSubsequence $lcs
-     * @return string
-     */
-    public function diff($from, $to, LongestCommonSubsequence $lcs = null)
-    {
-        if (!is_array($from) && !is_string($from)) {
-            $from = (string) $from;
-        }
-
-        if (!is_array($to) && !is_string($to)) {
-            $to = (string) $to;
-        }
-
-        $buffer = $this->header;
-        $diff   = $this->diffToArray($from, $to, $lcs);
-
-        $inOld = false;
-        $i     = 0;
-        $old   = array();
-
-        foreach ($diff as $line) {
-            if ($line[1] ===  0 /* OLD */) {
-                if ($inOld === false) {
-                    $inOld = $i;
-                }
-            } elseif ($inOld !== false) {
-                if (($i - $inOld) > 5) {
-                    $old[$inOld] = $i - 1;
-                }
-
-                $inOld = false;
-            }
-
-            ++$i;
-        }
-
-        $start = isset($old[0]) ? $old[0] : 0;
-        $end   = count($diff);
-
-        if ($tmp = array_search($end, $old)) {
-            $end = $tmp;
-        }
-
-        $newChunk = true;
-
-        for ($i = $start; $i < $end; $i++) {
-            if (isset($old[$i])) {
-                $buffer  .= "\n";
-                $newChunk = true;
-                $i        = $old[$i];
-            }
-
-            if ($newChunk) {
-                $buffer  .= "@@ @@\n";
-                $newChunk = false;
-            }
-
-            if ($diff[$i][1] === 1 /* ADDED */) {
-                $buffer .= '+' . $diff[$i][0] . "\n";
-            } elseif ($diff[$i][1] === 2 /* REMOVED */) {
-                $buffer .= '-' . $diff[$i][0] . "\n";
-            } else {
-                $buffer .= ' ' . $diff[$i][0] . "\n";
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the diff between two arrays or strings as array.
-     *
-     * Each array element contains two elements:
-     *   - [0] => string $token
-     *   - [1] => 2|1|0
-     *
-     * - 2: REMOVED: $token was removed from $from
-     * - 1: ADDED: $token was added to $from
-     * - 0: OLD: $token is not changed in $to
-     *
-     * @param  array|string             $from
-     * @param  array|string             $to
-     * @param  LongestCommonSubsequence $lcs
-     * @return array
-     */
-    public function diffToArray($from, $to, LongestCommonSubsequence $lcs = null)
-    {
-        preg_match_all('(\r\n|\r|\n)', $from, $fromMatches);
-        preg_match_all('(\r\n|\r|\n)', $to, $toMatches);
-
-        if (is_string($from)) {
-            $from = preg_split('(\r\n|\r|\n)', $from);
-        }
-
-        if (is_string($to)) {
-            $to = preg_split('(\r\n|\r|\n)', $to);
-        }
-
-        $start      = array();
-        $end        = array();
-        $fromLength = count($from);
-        $toLength   = count($to);
-        $length     = min($fromLength, $toLength);
-
-        for ($i = 0; $i < $length; ++$i) {
-            if ($from[$i] === $to[$i]) {
-                $start[] = $from[$i];
-                unset($from[$i], $to[$i]);
-            } else {
-                break;
-            }
-        }
-
-        $length -= $i;
-
-        for ($i = 1; $i < $length; ++$i) {
-            if ($from[$fromLength - $i] === $to[$toLength - $i]) {
-                array_unshift($end, $from[$fromLength - $i]);
-                unset($from[$fromLength - $i], $to[$toLength - $i]);
-            } else {
-                break;
-            }
-        }
-
-        if ($lcs === null) {
-            $lcs = $this->selectLcsImplementation($from, $to);
-        }
-
-        $common = $lcs->calculate(array_values($from), array_values($to));
-        $diff   = array();
-
-        if (isset($fromMatches[0]) && $toMatches[0] &&
-            count($fromMatches[0]) === count($toMatches[0]) &&
-            $fromMatches[0] !== $toMatches[0]) {
-            $diff[] = array(
-              '#Warning: Strings contain different line endings!', 0
-            );
-        }
-
-        foreach ($start as $token) {
-            $diff[] = array($token, 0 /* OLD */);
-        }
-
-        reset($from);
-        reset($to);
-
-        foreach ($common as $token) {
-            while ((($fromToken = reset($from)) !== $token)) {
-                $diff[] = array(array_shift($from), 2 /* REMOVED */);
-            }
-
-            while ((($toToken = reset($to)) !== $token)) {
-                $diff[] = array(array_shift($to), 1 /* ADDED */);
-            }
-
-            $diff[] = array($token, 0 /* OLD */);
-
-            array_shift($from);
-            array_shift($to);
-        }
-
-        while (($token = array_shift($from)) !== null) {
-            $diff[] = array($token, 2 /* REMOVED */);
-        }
-
-        while (($token = array_shift($to)) !== null) {
-            $diff[] = array($token, 1 /* ADDED */);
-        }
-
-        foreach ($end as $token) {
-            $diff[] = array($token, 0 /* OLD */);
-        }
-
-        return $diff;
-    }
-
-    /**
-     * @param  array $from
-     * @param  array $to
-     * @return LongestCommonSubsequence
-     */
-    private function selectLcsImplementation(array $from, array $to)
-    {
-        // We do not want to use the time-efficient implementation if its memory
-        // footprint will probably exceed this value. Note that the footprint
-        // calculation is only an estimation for the matrix and the LCS method
-        // will typically allocate a bit more memory than this.
-        $memoryLimit = 100 * 1024 * 1024;
-
-        if ($this->calculateEstimatedFootprint($from, $to) > $memoryLimit) {
-            return new MemoryEfficientImplementation;
-        }
-
-        return new TimeEfficientImplementation;
-    }
-
-    /**
-     * Calculates the estimated memory footprint for the DP-based method.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return integer
-     */
-    private function calculateEstimatedFootprint(array $from, array $to)
-    {
-        $itemSize = PHP_INT_SIZE == 4 ? 76 : 144;
-
-        return $itemSize * pow(min(count($from), count($to)), 2);
-    }
-}
diff --git a/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php b/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
deleted file mode 100644
index 8036474..0000000
--- a/vendor/sebastian/diff/src/LCS/LongestCommonSubsequence.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Interface for implementations of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-interface LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to);
-}
diff --git a/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
deleted file mode 100644
index 6213607..0000000
--- a/vendor/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Memory-efficient implementation of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Denes Lados <lados.denes@gmail.com>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class MemoryEfficientImplementation implements LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to)
-    {
-        $cFrom = count($from);
-        $cTo   = count($to);
-
-        if ($cFrom == 0) {
-            return array();
-        } elseif ($cFrom == 1) {
-            if (in_array($from[0], $to)) {
-                return array($from[0]);
-            } else {
-                return array();
-            }
-        } else {
-            $i         = intval($cFrom / 2);
-            $fromStart = array_slice($from, 0, $i);
-            $fromEnd   = array_slice($from, $i);
-            $llB       = $this->length($fromStart, $to);
-            $llE       = $this->length(array_reverse($fromEnd), array_reverse($to));
-            $jMax      = 0;
-            $max       = 0;
-
-            for ($j = 0; $j <= $cTo; $j++) {
-                $m = $llB[$j] + $llE[$cTo - $j];
-
-                if ($m >= $max) {
-                    $max  = $m;
-                    $jMax = $j;
-                }
-            }
-
-            $toStart = array_slice($to, 0, $jMax);
-            $toEnd   = array_slice($to, $jMax);
-
-            return array_merge(
-                $this->calculate($fromStart, $toStart),
-                $this->calculate($fromEnd, $toEnd)
-            );
-        }
-    }
-
-    /**
-     * @param array $from
-     * @param array $to
-     * @return array
-     */
-    private function length(array $from, array $to)
-    {
-        $current = array_fill(0, count($to) + 1, 0);
-        $cFrom   = count($from);
-        $cTo     = count($to);
-
-        for ($i = 0; $i < $cFrom; $i++) {
-            $prev = $current;
-
-            for ($j = 0; $j < $cTo; $j++) {
-                if ($from[$i] == $to[$j]) {
-                    $current[$j + 1] = $prev[$j] + 1;
-                } else {
-                    $current[$j + 1] = max($current[$j], $prev[$j + 1]);
-                }
-            }
-        }
-
-        return $current;
-    }
-}
diff --git a/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php b/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
deleted file mode 100644
index b569586..0000000
--- a/vendor/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff\LCS;
-
-/**
- * Time-efficient implementation of longest common subsequence calculation.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class TimeEfficientImplementation implements LongestCommonSubsequence
-{
-    /**
-     * Calculates the longest common subsequence of two arrays.
-     *
-     * @param  array $from
-     * @param  array $to
-     * @return array
-     */
-    public function calculate(array $from, array $to)
-    {
-        $common     = array();
-        $fromLength = count($from);
-        $toLength   = count($to);
-        $width      = $fromLength + 1;
-        $matrix     = new \SplFixedArray($width * ($toLength + 1));
-
-        for ($i = 0; $i <= $fromLength; ++$i) {
-            $matrix[$i] = 0;
-        }
-
-        for ($j = 0; $j <= $toLength; ++$j) {
-            $matrix[$j * $width] = 0;
-        }
-
-        for ($i = 1; $i <= $fromLength; ++$i) {
-            for ($j = 1; $j <= $toLength; ++$j) {
-                $o = ($j * $width) + $i;
-                $matrix[$o] = max(
-                    $matrix[$o - 1],
-                    $matrix[$o - $width],
-                    $from[$i - 1] === $to[$j - 1] ? $matrix[$o - $width - 1] + 1 : 0
-                );
-            }
-        }
-
-        $i = $fromLength;
-        $j = $toLength;
-
-        while ($i > 0 && $j > 0) {
-            if ($from[$i-1] === $to[$j-1]) {
-                $common[] = $from[$i-1];
-                --$i;
-                --$j;
-            } else {
-                $o = ($j * $width) + $i;
-                if ($matrix[$o - $width] > $matrix[$o - 1]) {
-                    --$j;
-                } else {
-                    --$i;
-                }
-            }
-        }
-
-        return array_reverse($common);
-    }
-}
diff --git a/vendor/sebastian/diff/src/Line.php b/vendor/sebastian/diff/src/Line.php
deleted file mode 100644
index 28c66aa..0000000
--- a/vendor/sebastian/diff/src/Line.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Line
-{
-    const ADDED = 1;
-    const REMOVED = 2;
-    const UNCHANGED = 3;
-
-    /**
-     * @var int
-     */
-    private $type;
-
-    /**
-     * @var string
-     */
-    private $content;
-
-    /**
-     * @param int    $type
-     * @param string $content
-     */
-    public function __construct($type = self::UNCHANGED, $content = '')
-    {
-        $this->type    = $type;
-        $this->content = $content;
-    }
-
-    /**
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-}
diff --git a/vendor/sebastian/diff/src/Parser.php b/vendor/sebastian/diff/src/Parser.php
deleted file mode 100644
index 79e2413..0000000
--- a/vendor/sebastian/diff/src/Parser.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * This file is part of the Diff package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Diff;
-
-/**
- * Unified diff parser.
- *
- * @package    Diff
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Kore Nordmann <mail@kore-nordmann.de>
- * @copyright  Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/diff
- */
-class Parser
-{
-    /**
-     * @param  string $string
-     * @return Diff[]
-     */
-    public function parse($string)
-    {
-        $lines     = preg_split('(\r\n|\r|\n)', $string);
-        $lineCount = count($lines);
-        $diffs     = array();
-        $diff      = null;
-        $collected = array();
-
-        for ($i = 0; $i < $lineCount; ++$i) {
-            if (preg_match('(^---\\s+(?P<file>\\S+))', $lines[$i], $fromMatch) &&
-                preg_match('(^\\+\\+\\+\\s+(?P<file>\\S+))', $lines[$i + 1], $toMatch)) {
-                if ($diff !== null) {
-                    $this->parseFileDiff($diff, $collected);
-                    $diffs[]   = $diff;
-                    $collected = array();
-                }
-
-                $diff = new Diff($fromMatch['file'], $toMatch['file']);
-                ++$i;
-            } else {
-                if (preg_match('/^(?:diff --git |index [\da-f\.]+|[+-]{3} [ab])/', $lines[$i])) {
-                    continue;
-                }
-                $collected[] = $lines[$i];
-            }
-        }
-
-        if (count($collected) && ($diff !== null)) {
-            $this->parseFileDiff($diff, $collected);
-            $diffs[] = $diff;
-        }
-
-        return $diffs;
-    }
-
-    /**
-     * @param Diff  $diff
-     * @param array $lines
-     */
-    private function parseFileDiff(Diff $diff, array $lines)
-    {
-        $chunks = array();
-
-        foreach ($lines as $line) {
-            if (preg_match('/^@@\s+-(?P<start>\d+)(?:,\s*(?P<startrange>\d+))?\s+\+(?P<end>\d+)(?:,\s*(?P<endrange>\d+))?\s+@@/', $line, $match)) {
-                $chunk = new Chunk(
-                    $match['start'],
-                    isset($match['startrange']) ? max(1, $match['startrange']) : 1,
-                    $match['end'],
-                    isset($match['endrange']) ? max(1, $match['endrange']) : 1
-                );
-
-                $chunks[] = $chunk;
-                $diffLines = array();
-                continue;
-            }
-
-            if (preg_match('/^(?P<type>[+ -])?(?P<line>.*)/', $line, $match)) {
-                $type = Line::UNCHANGED;
-
-                if ($match['type'] == '+') {
-                    $type = Line::ADDED;
-                } elseif ($match['type'] == '-') {
-                    $type = Line::REMOVED;
-                }
-
-                $diffLines[] = new Line($type, $match['line']);
-
-                if (isset($chunk)) {
-                    $chunk->setLines($diffLines);
-                }
-            }
-        }
-
-        $diff->setChunks($chunks);
-    }
-}
diff --git a/vendor/sebastian/environment/.gitignore b/vendor/sebastian/environment/.gitignore
deleted file mode 100644
index 5794854..0000000
--- a/vendor/sebastian/environment/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.idea
-/vendor
-/composer.lock
-/composer.phar
-/phpunit.xml
diff --git a/vendor/sebastian/environment/.travis.yml b/vendor/sebastian/environment/.travis.yml
deleted file mode 100644
index 76a9bde..0000000
--- a/vendor/sebastian/environment/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
diff --git a/vendor/sebastian/environment/LICENSE b/vendor/sebastian/environment/LICENSE
deleted file mode 100644
index 08539af..0000000
--- a/vendor/sebastian/environment/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Environment
-
-Copyright (c) 2014-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/environment/README.md b/vendor/sebastian/environment/README.md
deleted file mode 100644
index 5f3cb3b..0000000
--- a/vendor/sebastian/environment/README.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Environment
-
-This component provides functionality that helps writing PHP code that has runtime-specific (PHP / HHVM) execution paths.
-
-[![Latest Stable Version](https://poser.pugx.org/sebastian/environment/v/stable.png)](https://packagist.org/packages/sebastian/environment)
-[![Build Status](https://travis-ci.org/sebastianbergmann/environment.png?branch=master)](https://travis-ci.org/sebastianbergmann/environment)
-
-## Installation
-
-To add Environment as a local, per-project dependency to your project, simply add a dependency on `sebastian/environment` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Environment 1.0:
-
-    {
-        "require": {
-            "sebastian/environment": "1.0.*"
-        }
-    }
-
-## Usage
-
-```php
-<?php
-use SebastianBergmann\Environment\Runtime;
-
-$runtime = new Runtime;
-
-var_dump($runtime->getNameWithVersion());
-var_dump($runtime->getName());
-var_dump($runtime->getVersion());
-var_dump($runtime->getBinary());
-var_dump($runtime->isHHVM());
-var_dump($runtime->isPHP());
-var_dump($runtime->hasXdebug());
-var_dump($runtime->canCollectCodeCoverage());
-```
-
-### Output on PHP
-
-    $ php --version
-    PHP 5.5.8 (cli) (built: Jan  9 2014 08:33:30)
-    Copyright (c) 1997-2013 The PHP Group
-    Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
-        with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
-
-
-    $ php example.php
-    string(9) "PHP 5.5.8"
-    string(3) "PHP"
-    string(5) "5.5.8"
-    string(14) "'/usr/bin/php'"
-    bool(false)
-    bool(true)
-    bool(true)
-    bool(true)
-
-### Output on HHVM
-
-    $ hhvm --version
-    HipHop VM 2.4.0-dev (rel)
-    Compiler: heads/master-0-ga98e57cabee7e7f0d14493ab17d5c7ab0157eb98
-    Repo schema: 8d6e69287c41c1f09bb4d327421720d1922cfc67
-
-
-    $ hhvm example.php
-    string(14) "HHVM 2.4.0-dev"
-    string(4) "HHVM"
-    string(9) "2.4.0-dev"
-    string(42) "'/usr/local/src/hhvm/hphp/hhvm/hhvm' --php"
-    bool(true)
-    bool(false)
-    bool(false)
-    bool(true)
-
diff --git a/vendor/sebastian/environment/build.xml b/vendor/sebastian/environment/build.xml
deleted file mode 100644
index 92fb1c5..0000000
--- a/vendor/sebastian/environment/build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="environment">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/environment/composer.json b/vendor/sebastian/environment/composer.json
deleted file mode 100644
index fd3ec7d..0000000
--- a/vendor/sebastian/environment/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "sebastian/environment",
-    "description": "Provides functionality to handle HHVM/PHP environments",
-    "keywords": ["environment","hhvm","xdebug"],
-    "homepage": "http://www.github.com/sebastianbergmann/environment",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3.x-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/environment/phpunit.xml.dist b/vendor/sebastian/environment/phpunit.xml.dist
deleted file mode 100644
index 75148fd..0000000
--- a/vendor/sebastian/environment/phpunit.xml.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         verbose="true">
- <testsuites>
-  <testsuite name="Environment">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/sebastian/environment/src/Console.php b/vendor/sebastian/environment/src/Console.php
deleted file mode 100644
index 9f15d54..0000000
--- a/vendor/sebastian/environment/src/Console.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-/**
- */
-class Console
-{
-    const STDIN  = 0;
-    const STDOUT = 1;
-    const STDERR = 2;
-
-    /**
-     * Returns true if STDOUT supports colorization.
-     *
-     * This code has been copied and adapted from
-     * Symfony\Component\Console\Output\OutputStream.
-     *
-     * @return bool
-     */
-    public function hasColorSupport()
-    {
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
-        }
-
-        if (!defined('STDOUT')) {
-            return false;
-        }
-
-        return $this->isInteractive(STDOUT);
-    }
-
-    /**
-     * Returns the number of columns of the terminal.
-     *
-     * @return int
-     */
-    public function getNumberOfColumns()
-    {
-        // Windows terminals have a fixed size of 80
-        // but one column is used for the cursor.
-        if (DIRECTORY_SEPARATOR == '\\') {
-            return 79;
-        }
-
-        if (!$this->isInteractive(self::STDIN)) {
-            return 80;
-        }
-
-        if (preg_match('#\d+ (\d+)#', shell_exec('stty size'), $match) === 1) {
-            return (int) $match[1];
-        }
-
-        if (preg_match('#columns = (\d+);#', shell_exec('stty'), $match) === 1) {
-            return (int) $match[1];
-        }
-
-        return 80;
-    }
-
-    /**
-     * Returns if the file descriptor is an interactive terminal or not.
-     *
-     * @param int|resource $fileDescriptor
-     *
-     * @return bool
-     */
-    public function isInteractive($fileDescriptor = self::STDOUT)
-    {
-        return function_exists('posix_isatty') && @posix_isatty($fileDescriptor);
-    }
-}
diff --git a/vendor/sebastian/environment/src/Runtime.php b/vendor/sebastian/environment/src/Runtime.php
deleted file mode 100644
index f12071a..0000000
--- a/vendor/sebastian/environment/src/Runtime.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- * This file is part of the Environment package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Environment;
-
-/**
- * Utility class for HHVM/PHP environment handling.
- */
-class Runtime
-{
-    /**
-     * @var string
-     */
-    private static $binary;
-
-    /**
-     * Returns true when Xdebug is supported or
-     * the runtime used is PHPDBG (PHP >= 7.0).
-     *
-     * @return bool
-     */
-    public function canCollectCodeCoverage()
-    {
-        return $this->hasXdebug() || $this->hasPHPDBGCodeCoverage();
-    }
-
-    /**
-     * Returns the path to the binary of the current runtime.
-     * Appends ' --php' to the path when the runtime is HHVM.
-     *
-     * @return string
-     */
-    public function getBinary()
-    {
-        // HHVM
-        if (self::$binary === null && $this->isHHVM()) {
-            if ((self::$binary = getenv('PHP_BINARY')) === false) {
-                self::$binary = PHP_BINARY;
-            }
-
-            self::$binary = escapeshellarg(self::$binary) . ' --php';
-        }
-
-        // PHP >= 5.4.0
-        if (self::$binary === null && defined('PHP_BINARY')) {
-            self::$binary = escapeshellarg(PHP_BINARY);
-        }
-
-        // PHP < 5.4.0
-        if (self::$binary === null) {
-            if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
-                if (strpos($_SERVER['_'], 'phpunit') !== false) {
-                    $file = file($_SERVER['_']);
-
-                    if (strpos($file[0], ' ') !== false) {
-                        $tmp          = explode(' ', $file[0]);
-                        self::$binary = escapeshellarg(trim($tmp[1]));
-                    } else {
-                        self::$binary = escapeshellarg(ltrim(trim($file[0]), '#!'));
-                    }
-                } elseif (strpos(basename($_SERVER['_']), 'php') !== false) {
-                    self::$binary = escapeshellarg($_SERVER['_']);
-                }
-            }
-        }
-
-        if (self::$binary === null) {
-            $possibleBinaryLocations = array(
-                PHP_BINDIR . '/php',
-                PHP_BINDIR . '/php-cli.exe',
-                PHP_BINDIR . '/php.exe'
-            );
-
-            foreach ($possibleBinaryLocations as $binary) {
-                if (is_readable($binary)) {
-                    self::$binary = escapeshellarg($binary);
-                    break;
-                }
-            }
-        }
-
-        if (self::$binary === null) {
-            self::$binary = 'php';
-        }
-
-        return self::$binary;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNameWithVersion()
-    {
-        return $this->getName() . ' ' . $this->getVersion();
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        if ($this->isHHVM()) {
-            return 'HHVM';
-        } elseif ($this->isPHPDBG()) {
-            return 'PHPDBG';
-        } else {
-            return 'PHP';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getVendorUrl()
-    {
-        if ($this->isHHVM()) {
-            return 'http://hhvm.com/';
-        } else {
-            return 'http://php.net/';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion()
-    {
-        if ($this->isHHVM()) {
-            return HHVM_VERSION;
-        } else {
-            return PHP_VERSION;
-        }
-    }
-
-    /**
-     * Returns true when the runtime used is PHP and Xdebug is loaded.
-     *
-     * @return bool
-     */
-    public function hasXdebug()
-    {
-        return ($this->isPHP() || $this->isHHVM()) && extension_loaded('xdebug');
-    }
-
-    /**
-     * Returns true when the runtime used is HHVM.
-     *
-     * @return bool
-     */
-    public function isHHVM()
-    {
-        return defined('HHVM_VERSION');
-    }
-
-    /**
-     * Returns true when the runtime used is PHP without the PHPDBG SAPI.
-     *
-     * @return bool
-     */
-    public function isPHP()
-    {
-        return !$this->isHHVM() && !$this->isPHPDBG();
-    }
-
-    /**
-     * Returns true when the runtime used is PHP with the PHPDBG SAPI.
-     *
-     * @return bool
-     */
-    public function isPHPDBG()
-    {
-        return PHP_SAPI === 'phpdbg' && !$this->isHHVM();
-    }
-
-    /**
-     * Returns true when the runtime used is PHP with the PHPDBG SAPI
-     * and the phpdbg_*_oplog() functions are available (PHP >= 7.0).
-     *
-     * @return bool
-     */
-    public function hasPHPDBGCodeCoverage()
-    {
-        return $this->isPHPDBG() && function_exists('phpdbg_start_oplog');
-    }
-}
diff --git a/vendor/sebastian/exporter/.gitignore b/vendor/sebastian/exporter/.gitignore
deleted file mode 100644
index 3beb10f..0000000
--- a/vendor/sebastian/exporter/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/exporter/.travis.yml b/vendor/sebastian/exporter/.travis.yml
deleted file mode 100644
index 657519b..0000000
--- a/vendor/sebastian/exporter/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
-    on_success: always
-    on_failure: always
-    on_start: false
-
diff --git a/vendor/sebastian/exporter/LICENSE b/vendor/sebastian/exporter/LICENSE
deleted file mode 100644
index 55a13d4..0000000
--- a/vendor/sebastian/exporter/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Exporter
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/exporter/README.md b/vendor/sebastian/exporter/README.md
deleted file mode 100644
index 9a40a77..0000000
--- a/vendor/sebastian/exporter/README.md
+++ /dev/null
@@ -1,171 +0,0 @@
-Exporter
-========
-
-[![Build Status](https://secure.travis-ci.org/sebastianbergmann/exporter.png?branch=master)](https://travis-ci.org/sebastianbergmann/exporter)
-
-This component provides the functionality to export PHP variables for visualization.
-
-## Usage
-
-Exporting:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-/*
-Exception Object &0000000078de0f0d000000002003a261 (
-    'message' => ''
-    'string' => ''
-    'code' => 0
-    'file' => '/home/sebastianbergmann/test.php'
-    'line' => 34
-    'trace' => Array &0 ()
-    'previous' => null
-)
-*/
-
-print $exporter->export(new Exception);
-```
-
-## Data Types
-
-Exporting simple types:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-// 46
-print $exporter->export(46);
-
-// 4.0
-print $exporter->export(4.0);
-
-// 'hello, world!'
-print $exporter->export('hello, world!');
-
-// false
-print $exporter->export(false);
-
-// NAN
-print $exporter->export(acos(8));
-
-// -INF
-print $exporter->export(log(0));
-
-// null
-print $exporter->export(null);
-
-// resource(13) of type (stream)
-print $exporter->export(fopen('php://stderr', 'w'));
-
-// Binary String: 0x000102030405
-print $exporter->export(chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5));
-```
-
-Exporting complex types:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-/*
-Array &0 (
-    0 => Array &1 (
-        0 => 1
-        1 => 2
-        2 => 3
-    )
-    1 => Array &2 (
-        0 => ''
-        1 => 0
-        2 => false
-    )
-)
-*/
-
-print $exporter->export(array(array(1,2,3), array("",0,FALSE)));
-
-/*
-Array &0 (
-    'self' => Array &1 (
-        'self' => Array &1
-    )
-)
-*/
-
-$array = array();
-$array['self'] = &$array;
-print $exporter->export($array);
-
-/*
-stdClass Object &0000000003a66dcc0000000025e723e2 (
-    'self' => stdClass Object &0000000003a66dcc0000000025e723e2
-)
-*/
-
-$obj = new stdClass();
-$obj->self = $obj;
-print $exporter->export($obj);
-```
-
-Compact exports:
-
-```php
-<?php
-use SebastianBergmann\Exporter\Exporter;
-
-$exporter = new Exporter;
-
-// Array ()
-print $exporter->shortenedExport(array());
-
-// Array (...)
-print $exporter->shortenedExport(array(1,2,3,4,5));
-
-// stdClass Object ()
-print $exporter->shortenedExport(new stdClass);
-
-// Exception Object (...)
-print $exporter->shortenedExport(new Exception);
-
-// this\nis\na\nsuper\nlong\nstring\nt...\nspace
-print $exporter->shortenedExport(
-<<<LONG_STRING
-this
-is
-a
-super
-long
-string
-that
-wraps
-a
-lot
-and
-eats
-up
-a
-lot
-of
-space
-LONG_STRING
-);
-```
-
-## Installation
-
-To add Exporter as a local, per-project dependency to your project, simply add a dependency on `sebastian/exporter` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Exporter 1.0:
-
-    {
-        "require": {
-            "sebastian/exporter": "1.0.*"
-        }
-    }
diff --git a/vendor/sebastian/exporter/build.xml b/vendor/sebastian/exporter/build.xml
deleted file mode 100644
index e66a71a..0000000
--- a/vendor/sebastian/exporter/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="exporter">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
-
diff --git a/vendor/sebastian/exporter/composer.json b/vendor/sebastian/exporter/composer.json
deleted file mode 100644
index 723596e..0000000
--- a/vendor/sebastian/exporter/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "sebastian/exporter",
-    "description": "Provides the functionality to export PHP variables for visualization",
-    "keywords": ["exporter","export"],
-    "homepage": "http://www.github.com/sebastianbergmann/exporter",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Volker Dusch",
-            "email": "github@wallbash.com"
-        },
-        {
-            "name": "Adam Harvey",
-            "email": "aharvey@php.net"
-        },
-        {
-            "name": "Bernhard Schussek",
-            "email": "bschussek@2bepublished.at"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "sebastian/recursion-context": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.2.x-dev"
-        }
-    }
-}
-
diff --git a/vendor/sebastian/exporter/phpunit.xml.dist b/vendor/sebastian/exporter/phpunit.xml.dist
deleted file mode 100644
index 8d85af6..0000000
--- a/vendor/sebastian/exporter/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         forceCoversAnnotation="true"
-         verbose="true">
- <testsuites>
-  <testsuite name="exporter">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
-
diff --git a/vendor/sebastian/exporter/src/Exporter.php b/vendor/sebastian/exporter/src/Exporter.php
deleted file mode 100644
index a9f5157..0000000
--- a/vendor/sebastian/exporter/src/Exporter.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-/*
- * This file is part of the Exporter package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\Exporter;
-
-use SebastianBergmann\RecursionContext\Context;
-
-/**
- * A nifty utility for visualizing PHP variables.
- *
- * <code>
- * <?php
- * use SebastianBergmann\Exporter\Exporter;
- *
- * $exporter = new Exporter;
- * print $exporter->export(new Exception);
- * </code>
- */
-class Exporter
-{
-    /**
-     * Exports a value as a string
-     *
-     * The output of this method is similar to the output of print_r(), but
-     * improved in various aspects:
-     *
-     *  - NULL is rendered as "null" (instead of "")
-     *  - TRUE is rendered as "true" (instead of "1")
-     *  - FALSE is rendered as "false" (instead of "")
-     *  - Strings are always quoted with single quotes
-     *  - Carriage returns and newlines are normalized to \n
-     *  - Recursion and repeated rendering is treated properly
-     *
-     * @param  mixed  $value
-     * @param  int    $indentation The indentation level of the 2nd+ line
-     * @return string
-     */
-    public function export($value, $indentation = 0)
-    {
-        return $this->recursiveExport($value, $indentation);
-    }
-
-    /**
-     * @param  mixed   $data
-     * @param  Context $context
-     * @return string
-     */
-    public function shortenedRecursiveExport(&$data, Context $context = null)
-    {
-        $result   = array();
-        $exporter = new self();
-
-        if (!$context) {
-            $context = new Context;
-        }
-
-        $context->add($data);
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                if ($context->contains($data[$key]) !== false) {
-                    $result[] = '*RECURSION*';
-                }
-
-                else {
-                    $result[] = sprintf(
-                        'array(%s)',
-                        $this->shortenedRecursiveExport($data[$key], $context)
-                    );
-                }
-            }
-
-            else {
-                $result[] = $exporter->shortenedExport($value);
-            }
-        }
-
-        return implode(', ', $result);
-    }
-
-    /**
-     * Exports a value into a single-line string
-     *
-     * The output of this method is similar to the output of
-     * SebastianBergmann\Exporter\Exporter::export. This method guarantees
-     * thought that the result contains now newlines.
-     *
-     * Newlines are replaced by the visible string '\n'. Contents of arrays
-     * and objects (if any) are replaced by '...'.
-     *
-     * @param  mixed  $value
-     * @return string
-     * @see    SebastianBergmann\Exporter\Exporter::export
-     */
-    public function shortenedExport($value)
-    {
-        if (is_string($value)) {
-            $string = $this->export($value);
-
-            if (strlen($string) > 40) {
-                $string = substr($string, 0, 30) . '...' . substr($string, -7);
-            }
-
-            return str_replace("\n", '\n', $string);
-        }
-
-        if (is_object($value)) {
-            return sprintf(
-                '%s Object (%s)',
-                get_class($value),
-                count($this->toArray($value)) > 0 ? '...' : ''
-            );
-        }
-
-        if (is_array($value)) {
-            return sprintf(
-                'Array (%s)',
-                count($value) > 0 ? '...' : ''
-            );
-        }
-
-        return $this->export($value);
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  mixed $value
-     * @return array
-     */
-    public function toArray($value)
-    {
-        if (!is_object($value)) {
-            return (array) $value;
-        }
-
-        $array = array();
-
-        foreach ((array) $value as $key => $val) {
-            // properties are transformed to keys in the following way:
-            // private   $property => "\0Classname\0property"
-            // protected $property => "\0*\0property"
-            // public    $property => "property"
-            if (preg_match('/^\0.+\0(.+)$/', $key, $matches)) {
-                $key = $matches[1];
-            }
-
-            // See https://github.com/php/php-src/commit/5721132
-            if ($key === "\0gcdata") {
-                continue;
-            }
-
-            $array[$key] = $val;
-        }
-
-        // Some internal classes like SplObjectStorage don't work with the
-        // above (fast) mechanism nor with reflection in Zend.
-        // Format the output similarly to print_r() in this case
-        if ($value instanceof \SplObjectStorage) {
-            // However, the fast method does work in HHVM, and exposes the
-            // internal implementation. Hide it again.
-            if (property_exists('\SplObjectStorage', '__storage')) {
-                unset($array['__storage']);
-            } elseif (property_exists('\SplObjectStorage', 'storage')) {
-                unset($array['storage']);
-            }
-
-            if (property_exists('\SplObjectStorage', '__key')) {
-                unset($array['__key']);
-            }
-
-            foreach ($value as $key => $val) {
-                $array[spl_object_hash($val)] = array(
-                    'obj' => $val,
-                    'inf' => $value->getInfo(),
-                );
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * Recursive implementation of export
-     *
-     * @param  mixed                                       $value       The value to export
-     * @param  int                                         $indentation The indentation level of the 2nd+ line
-     * @param  \SebastianBergmann\RecursionContext\Context $processed   Previously processed objects
-     * @return string
-     * @see    SebastianBergmann\Exporter\Exporter::export
-     */
-    protected function recursiveExport(&$value, $indentation, $processed = null)
-    {
-        if ($value === null) {
-            return 'null';
-        }
-
-        if ($value === true) {
-            return 'true';
-        }
-
-        if ($value === false) {
-            return 'false';
-        }
-
-        if (is_float($value) && floatval(intval($value)) === $value) {
-            return "$value.0";
-        }
-
-        if (is_resource($value)) {
-            return sprintf(
-                'resource(%d) of type (%s)',
-                $value,
-                get_resource_type($value)
-            );
-        }
-
-        if (is_string($value)) {
-            // Match for most non printable chars somewhat taking multibyte chars into account
-            if (preg_match('/[^\x09-\x0d\x20-\xff]/', $value)) {
-                return 'Binary String: 0x' . bin2hex($value);
-            }
-
-            return "'" .
-            str_replace(array("\r\n", "\n\r", "\r"), array("\n", "\n", "\n"), $value) .
-            "'";
-        }
-
-        $whitespace = str_repeat(' ', 4 * $indentation);
-
-        if (!$processed) {
-            $processed = new Context;
-        }
-
-        if (is_array($value)) {
-            if (($key = $processed->contains($value)) !== false) {
-                return 'Array &' . $key;
-            }
-
-            $key    = $processed->add($value);
-            $values = '';
-
-            if (count($value) > 0) {
-                foreach ($value as $k => $v) {
-                    $values .= sprintf(
-                        '%s    %s => %s' . "\n",
-                        $whitespace,
-                        $this->recursiveExport($k, $indentation),
-                        $this->recursiveExport($value[$k], $indentation + 1, $processed)
-                    );
-                }
-
-                $values = "\n" . $values . $whitespace;
-            }
-
-            return sprintf('Array &%s (%s)', $key, $values);
-        }
-
-        if (is_object($value)) {
-            $class = get_class($value);
-
-            if ($hash = $processed->contains($value)) {
-                return sprintf('%s Object &%s', $class, $hash);
-            }
-
-            $hash   = $processed->add($value);
-            $values = '';
-            $array  = $this->toArray($value);
-
-            if (count($array) > 0) {
-                foreach ($array as $k => $v) {
-                    $values .= sprintf(
-                        '%s    %s => %s' . "\n",
-                        $whitespace,
-                        $this->recursiveExport($k, $indentation),
-                        $this->recursiveExport($v, $indentation + 1, $processed)
-                    );
-                }
-
-                $values = "\n" . $values . $whitespace;
-            }
-
-            return sprintf('%s Object &%s (%s)', $class, $hash, $values);
-        }
-
-        return var_export($value, true);
-    }
-}
diff --git a/vendor/sebastian/global-state/.gitignore b/vendor/sebastian/global-state/.gitignore
deleted file mode 100644
index a288f68..0000000
--- a/vendor/sebastian/global-state/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.idea
-composer.lock
-composer.phar
-vendor/
-cache.properties
diff --git a/vendor/sebastian/global-state/.travis.yml b/vendor/sebastian/global-state/.travis.yml
deleted file mode 100644
index 41edae3..0000000
--- a/vendor/sebastian/global-state/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-language: php
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-script: ./vendor/bin/phpunit --configuration ./build/phpunit.xml
-
-notifications:
-  email: false
-  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/global-state/LICENSE b/vendor/sebastian/global-state/LICENSE
deleted file mode 100644
index b6176e0..0000000
--- a/vendor/sebastian/global-state/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-GlobalState
-
-Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/global-state/README.md b/vendor/sebastian/global-state/README.md
deleted file mode 100644
index 78fd117..0000000
--- a/vendor/sebastian/global-state/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# GlobalState
-
-Snapshotting of global state, factored out of PHPUnit into a stand-alone component.
-
-## Installation
-
-To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/global-state` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on GlobalState:
-
-    {
-        "require": {
-            "sebastian/global-state": "1.0.*"
-        }
-    }
diff --git a/vendor/sebastian/global-state/build.xml b/vendor/sebastian/global-state/build.xml
deleted file mode 100644
index 63c5445..0000000
--- a/vendor/sebastian/global-state/build.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="global-state">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-
- <target name="phpunit" description="Run unit tests with PHPUnit">
-  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
-   <arg value="--configuration"/>
-   <arg path="${basedir}/build/phpunit.xml"/>
-  </exec>
- </target>
-</project>
diff --git a/vendor/sebastian/global-state/build/phpunit.xml b/vendor/sebastian/global-state/build/phpunit.xml
deleted file mode 100644
index 9fef0a0..0000000
--- a/vendor/sebastian/global-state/build/phpunit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.2/phpunit.xsd"
-         bootstrap="../vendor/autoload.php"
-         backupGlobals="false"
-         verbose="true">
-  <testsuite name="GlobalState">
-    <directory suffix="Test.php">../tests</directory>
-  </testsuite>
-
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../src</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/sebastian/global-state/composer.json b/vendor/sebastian/global-state/composer.json
deleted file mode 100644
index 7e8849b..0000000
--- a/vendor/sebastian/global-state/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "sebastian/global-state",
-    "description": "Snapshotting of global state",
-    "keywords": ["global state"],
-    "homepage": "http://www.github.com/sebastianbergmann/global-state",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.2"
-    },
-    "suggest": {
-        "ext-uopz": "*"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "autoload-dev": {
-        "classmap": [
-            "tests/_fixture/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/global-state/src/Blacklist.php b/vendor/sebastian/global-state/src/Blacklist.php
deleted file mode 100644
index 12d900f..0000000
--- a/vendor/sebastian/global-state/src/Blacklist.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * GlobalState
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * 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.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-
-namespace SebastianBergmann\GlobalState;
-
-use ReflectionClass;
-
-/**
- * A blacklist for global state elements that should not be snapshotted.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-class Blacklist
-{
-    /**
-     * @var array
-     */
-    private $globalVariables = array();
-
-    /**
-     * @var array
-     */
-    private $classes = array();
-
-    /**
-     * @var array
-     */
-    private $classNamePrefixes = array();
-
-    /**
-     * @var array
-     */
-    private $parentClasses = array();
-
-    /**
-     * @var array
-     */
-    private $interfaces = array();
-
-    /**
-     * @var array
-     */
-    private $staticAttributes = array();
-
-    /**
-     * @param string $variableName
-     */
-    public function addGlobalVariable($variableName)
-    {
-        $this->globalVariables[$variableName] = true;
-    }
-
-    /**
-     * @param string $className
-     */
-    public function addClass($className)
-    {
-        $this->classes[] = $className;
-    }
-
-    /**
-     * @param string $className
-     */
-    public function addSubclassesOf($className)
-    {
-        $this->parentClasses[] = $className;
-    }
-
-    /**
-     * @param string $interfaceName
-     */
-    public function addImplementorsOf($interfaceName)
-    {
-        $this->interfaces[] = $interfaceName;
-    }
-
-    /**
-     * @param string $classNamePrefix
-     */
-    public function addClassNamePrefix($classNamePrefix)
-    {
-        $this->classNamePrefixes[] = $classNamePrefix;
-    }
-
-    /**
-     * @param string $className
-     * @param string $attributeName
-     */
-    public function addStaticAttribute($className, $attributeName)
-    {
-        if (!isset($this->staticAttributes[$className])) {
-            $this->staticAttributes[$className] = array();
-        }
-
-        $this->staticAttributes[$className][$attributeName] = true;
-    }
-
-    /**
-     * @param  string $variableName
-     * @return boolean
-     */
-    public function isGlobalVariableBlacklisted($variableName)
-    {
-        return isset($this->globalVariables[$variableName]);
-    }
-
-    /**
-     * @param  string $className
-     * @param  string $attributeName
-     * @return boolean
-     */
-    public function isStaticAttributeBlacklisted($className, $attributeName)
-    {
-        if (in_array($className, $this->classes)) {
-            return true;
-        }
-
-        foreach ($this->classNamePrefixes as $prefix) {
-            if (strpos($className, $prefix) === 0) {
-                return true;
-            }
-        }
-
-        $class = new ReflectionClass($className);
-
-        foreach ($this->parentClasses as $type) {
-            if ($class->isSubclassOf($type)) {
-                return true;
-            }
-        }
-
-        foreach ($this->interfaces as $type) {
-            if ($class->implementsInterface($type)) {
-                return true;
-            }
-        }
-
-        if (isset($this->staticAttributes[$className][$attributeName])) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/sebastian/global-state/src/Exception.php b/vendor/sebastian/global-state/src/Exception.php
deleted file mode 100644
index 0436886..0000000
--- a/vendor/sebastian/global-state/src/Exception.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * GlobalState
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * 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.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-
-namespace SebastianBergmann\GlobalState;
-
-/**
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-interface Exception
-{
-}
diff --git a/vendor/sebastian/global-state/src/Restorer.php b/vendor/sebastian/global-state/src/Restorer.php
deleted file mode 100644
index a5f0e55..0000000
--- a/vendor/sebastian/global-state/src/Restorer.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * GlobalState
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * 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.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-
-namespace SebastianBergmann\GlobalState;
-
-use ReflectionProperty;
-
-/**
- * Restorer of snapshots of global state.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-class Restorer
-{
-    /**
-     * Deletes function definitions that are not defined in a snapshot.
-     *
-     * @param  Snapshot $snapshot
-     * @throws RuntimeException when the uopz_delete() function is not available
-     * @see    https://github.com/krakjoe/uopz
-     */
-    public function restoreFunctions(Snapshot $snapshot)
-    {
-        if (!function_exists('uopz_delete')) {
-            throw new RuntimeException('The uopz_delete() function is required for this operation');
-        }
-
-        $functions = get_defined_functions();
-
-        foreach (array_diff($functions['user'], $snapshot->functions()) as $function) {
-            uopz_delete($function);
-        }
-    }
-
-    /**
-     * Restores all global and super-global variables from a snapshot.
-     *
-     * @param Snapshot $snapshot
-     */
-    public function restoreGlobalVariables(Snapshot $snapshot)
-    {
-        $superGlobalArrays = $snapshot->superGlobalArrays();
-
-        foreach ($superGlobalArrays as $superGlobalArray) {
-            $this->restoreSuperGlobalArray($snapshot, $superGlobalArray);
-        }
-
-        $globalVariables = $snapshot->globalVariables();
-
-        foreach (array_keys($GLOBALS) as $key) {
-            if ($key != 'GLOBALS' &&
-                !in_array($key, $superGlobalArrays) &&
-                !$snapshot->blacklist()->isGlobalVariableBlacklisted($key)) {
-                if (isset($globalVariables[$key])) {
-                    $GLOBALS[$key] = $globalVariables[$key];
-                } else {
-                    unset($GLOBALS[$key]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Restores all static attributes in user-defined classes from this snapshot.
-     *
-     * @param Snapshot $snapshot
-     */
-    public function restoreStaticAttributes(Snapshot $snapshot)
-    {
-        foreach ($snapshot->staticAttributes() as $className => $staticAttributes) {
-            foreach ($staticAttributes as $name => $value) {
-                $reflector = new ReflectionProperty($className, $name);
-                $reflector->setAccessible(true);
-                $reflector->setValue($value);
-            }
-        }
-    }
-
-    /**
-     * Restores a super-global variable array from this snapshot.
-     *
-     * @param Snapshot $snapshot
-     * @param $superGlobalArray
-     */
-    private function restoreSuperGlobalArray(Snapshot $snapshot, $superGlobalArray)
-    {
-        $superGlobalVariables = $snapshot->superGlobalVariables();
-
-        if (isset($GLOBALS[$superGlobalArray]) &&
-            is_array($GLOBALS[$superGlobalArray]) &&
-            isset($superGlobalVariables[$superGlobalArray])) {
-            $keys = array_keys(
-                array_merge(
-                    $GLOBALS[$superGlobalArray],
-                    $superGlobalVariables[$superGlobalArray]
-                )
-            );
-
-            foreach ($keys as $key) {
-                if (isset($superGlobalVariables[$superGlobalArray][$key])) {
-                    $GLOBALS[$superGlobalArray][$key] = $superGlobalVariables[$superGlobalArray][$key];
-                } else {
-                    unset($GLOBALS[$superGlobalArray][$key]);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/sebastian/global-state/src/RuntimeException.php b/vendor/sebastian/global-state/src/RuntimeException.php
deleted file mode 100644
index e25e208..0000000
--- a/vendor/sebastian/global-state/src/RuntimeException.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * GlobalState
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * 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.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-
-namespace SebastianBergmann\GlobalState;
-
-/**
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-class RuntimeException extends \RuntimeException implements Exception
-{
-}
diff --git a/vendor/sebastian/global-state/src/Snapshot.php b/vendor/sebastian/global-state/src/Snapshot.php
deleted file mode 100644
index 5fb08be..0000000
--- a/vendor/sebastian/global-state/src/Snapshot.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-/**
- * GlobalState
- *
- * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * 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.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-
-namespace SebastianBergmann\GlobalState;
-
-use Closure;
-use ReflectionClass;
-
-/**
- * A snapshot of global state.
- *
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.github.com/sebastianbergmann/global-state
- */
-class Snapshot
-{
-    /**
-     * @var Blacklist
-     */
-    private $blacklist;
-
-    /**
-     * @var array
-     */
-    private $globalVariables = array();
-
-    /**
-     * @var array
-     */
-    private $superGlobalArrays = array();
-
-    /**
-     * @var array
-     */
-    private $superGlobalVariables = array();
-
-    /**
-     * @var array
-     */
-    private $staticAttributes = array();
-
-    /**
-     * @var array
-     */
-    private $iniSettings = array();
-
-    /**
-     * @var array
-     */
-    private $includedFiles = array();
-
-    /**
-     * @var array
-     */
-    private $constants = array();
-
-    /**
-     * @var array
-     */
-    private $functions = array();
-
-    /**
-     * @var array
-     */
-    private $interfaces = array();
-
-    /**
-     * @var array
-     */
-    private $classes = array();
-
-    /**
-     * @var array
-     */
-    private $traits = array();
-
-    /**
-     * Creates a snapshot of the current global state.
-     *
-     * @param Blacklist $blacklist
-     * @param boolean   $includeGlobalVariables
-     * @param boolean   $includeStaticAttributes
-     * @param boolean   $includeConstants
-     * @param boolean   $includeFunctions
-     * @param boolean   $includeClasses
-     * @param boolean   $includeInterfaces
-     * @param boolean   $includeTraits
-     * @param boolean   $includeIniSettings
-     * @param boolean   $includeIncludedFiles
-     */
-    public function __construct(Blacklist $blacklist = null, $includeGlobalVariables = true, $includeStaticAttributes = true, $includeConstants = true, $includeFunctions = true, $includeClasses = true, $includeInterfaces = true, $includeTraits = true, $includeIniSettings = true, $includeIncludedFiles = true)
-    {
-        if ($blacklist === null) {
-            $blacklist = new Blacklist;
-        }
-
-        $this->blacklist = $blacklist;
-
-        if ($includeConstants) {
-            $this->snapshotConstants();
-        }
-
-        if ($includeFunctions) {
-            $this->snapshotFunctions();
-        }
-
-        if ($includeClasses || $includeStaticAttributes) {
-            $this->snapshotClasses();
-        }
-
-        if ($includeInterfaces) {
-            $this->snapshotInterfaces();
-        }
-
-        if ($includeGlobalVariables) {
-            $this->setupSuperGlobalArrays();
-            $this->snapshotGlobals();
-        }
-
-        if ($includeStaticAttributes) {
-            $this->snapshotStaticAttributes();
-        }
-
-        if ($includeIniSettings) {
-            $this->iniSettings = ini_get_all(null, false);
-        }
-
-        if ($includeIncludedFiles) {
-            $this->includedFiles = get_included_files();
-        }
-
-        if (function_exists('get_declared_traits')) {
-            $this->traits = get_declared_traits();
-        }
-    }
-
-    /**
-     * @return Blacklist
-     */
-    public function blacklist()
-    {
-        return $this->blacklist;
-    }
-
-    /**
-     * @return array
-     */
-    public function globalVariables()
-    {
-        return $this->globalVariables;
-    }
-
-    /**
-     * @return array
-     */
-    public function superGlobalVariables()
-    {
-        return $this->superGlobalVariables;
-    }
-
-    /**
-     * Returns a list of all super-global variable arrays.
-     *
-     * @return array
-     */
-    public function superGlobalArrays()
-    {
-        return $this->superGlobalArrays;
-    }
-
-    /**
-     * @return array
-     */
-    public function staticAttributes()
-    {
-        return $this->staticAttributes;
-    }
-
-    /**
-     * @return array
-     */
-    public function iniSettings()
-    {
-        return $this->iniSettings;
-    }
-
-    /**
-     * @return array
-     */
-    public function includedFiles()
-    {
-        return $this->includedFiles;
-    }
-
-    /**
-     * @return array
-     */
-    public function constants()
-    {
-        return $this->constants;
-    }
-
-    /**
-     * @return array
-     */
-    public function functions()
-    {
-        return $this->functions;
-    }
-
-    /**
-     * @return array
-     */
-    public function interfaces()
-    {
-        return $this->interfaces;
-    }
-
-    /**
-     * @return array
-     */
-    public function classes()
-    {
-        return $this->classes;
-    }
-
-    /**
-     * @return array
-     */
-    public function traits()
-    {
-        return $this->traits;
-    }
-
-    /**
-     * Creates a snapshot user-defined constants.
-     */
-    private function snapshotConstants()
-    {
-        $constants = get_defined_constants(true);
-
-        if (isset($constants['user'])) {
-            $this->constants = $constants['user'];
-        }
-    }
-
-    /**
-     * Creates a snapshot user-defined functions.
-     */
-    private function snapshotFunctions()
-    {
-        $functions = get_defined_functions();
-
-        $this->functions = $functions['user'];
-    }
-
-    /**
-     * Creates a snapshot user-defined classes.
-     */
-    private function snapshotClasses()
-    {
-        foreach (array_reverse(get_declared_classes()) as $className) {
-            $class = new ReflectionClass($className);
-
-            if (!$class->isUserDefined()) {
-                break;
-            }
-
-            $this->classes[] = $className;
-        }
-
-        $this->classes = array_reverse($this->classes);
-    }
-
-    /**
-     * Creates a snapshot user-defined interfaces.
-     */
-    private function snapshotInterfaces()
-    {
-        foreach (array_reverse(get_declared_interfaces()) as $interfaceName) {
-            $class = new ReflectionClass($interfaceName);
-
-            if (!$class->isUserDefined()) {
-                break;
-            }
-
-            $this->interfaces[] = $interfaceName;
-        }
-
-        $this->interfaces = array_reverse($this->interfaces);
-    }
-
-    /**
-     * Creates a snapshot of all global and super-global variables.
-     */
-    private function snapshotGlobals()
-    {
-        $superGlobalArrays = $this->superGlobalArrays();
-
-        foreach ($superGlobalArrays as $superGlobalArray) {
-            $this->snapshotSuperGlobalArray($superGlobalArray);
-        }
-
-        foreach (array_keys($GLOBALS) as $key) {
-            if ($key != 'GLOBALS' &&
-                !in_array($key, $superGlobalArrays) &&
-                $this->canBeSerialized($GLOBALS[$key]) &&
-                !$this->blacklist->isGlobalVariableBlacklisted($key)) {
-                $this->globalVariables[$key] = unserialize(serialize($GLOBALS[$key]));
-            }
-        }
-    }
-
-    /**
-     * Creates a snapshot a super-global variable array.
-     *
-     * @param $superGlobalArray
-     */
-    private function snapshotSuperGlobalArray($superGlobalArray)
-    {
-        $this->superGlobalVariables[$superGlobalArray] = array();
-
-        if (isset($GLOBALS[$superGlobalArray]) && is_array($GLOBALS[$superGlobalArray])) {
-            foreach ($GLOBALS[$superGlobalArray] as $key => $value) {
-                $this->superGlobalVariables[$superGlobalArray][$key] = unserialize(serialize($value));
-            }
-        }
-    }
-
-    /**
-     * Creates a snapshot of all static attributes in user-defined classes.
-     */
-    private function snapshotStaticAttributes()
-    {
-        foreach ($this->classes as $className) {
-            $class    = new ReflectionClass($className);
-            $snapshot = array();
-
-            foreach ($class->getProperties() as $attribute) {
-                if ($attribute->isStatic()) {
-                    $name = $attribute->getName();
-
-                    if ($this->blacklist->isStaticAttributeBlacklisted($className, $name)) {
-                        continue;
-                    }
-
-                    $attribute->setAccessible(true);
-                    $value = $attribute->getValue();
-
-                    if ($this->canBeSerialized($value)) {
-                        $snapshot[$name] = unserialize(serialize($value));
-                    }
-                }
-            }
-
-            if (!empty($snapshot)) {
-                $this->staticAttributes[$className] = $snapshot;
-            }
-        }
-    }
-
-    /**
-     * Returns a list of all super-global variable arrays.
-     *
-     * @return array
-     */
-    private function setupSuperGlobalArrays()
-    {
-        $this->superGlobalArrays = array(
-            '_ENV',
-            '_POST',
-            '_GET',
-            '_COOKIE',
-            '_SERVER',
-            '_FILES',
-            '_REQUEST'
-        );
-
-        if (ini_get('register_long_arrays') == '1') {
-            $this->superGlobalArrays = array_merge(
-                $this->superGlobalArrays,
-                array(
-                    'HTTP_ENV_VARS',
-                    'HTTP_POST_VARS',
-                    'HTTP_GET_VARS',
-                    'HTTP_COOKIE_VARS',
-                    'HTTP_SERVER_VARS',
-                    'HTTP_POST_FILES'
-                )
-            );
-        }
-    }
-
-    /**
-     * @param  mixed $variable
-     * @return boolean
-     * @todo   Implement this properly
-     */
-    private function canBeSerialized($variable) {
-        return !$variable instanceof Closure;
-    }
-}
diff --git a/vendor/sebastian/recursion-context/.gitignore b/vendor/sebastian/recursion-context/.gitignore
deleted file mode 100644
index 3beb10f..0000000
--- a/vendor/sebastian/recursion-context/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.idea
-phpunit.xml
-composer.lock
-composer.phar
-vendor/
-cache.properties
-build/LICENSE
-build/README.md
-build/*.tgz
diff --git a/vendor/sebastian/recursion-context/.travis.yml b/vendor/sebastian/recursion-context/.travis.yml
deleted file mode 100644
index c5952a1..0000000
--- a/vendor/sebastian/recursion-context/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-sudo: false
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: ./vendor/bin/phpunit
-
-notifications:
-  email: false
-  irc: "irc.freenode.org#phpunit"
diff --git a/vendor/sebastian/recursion-context/LICENSE b/vendor/sebastian/recursion-context/LICENSE
deleted file mode 100644
index f8c30c2..0000000
--- a/vendor/sebastian/recursion-context/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Recursion Context
-
-Copyright (c) 2002-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/recursion-context/README.md b/vendor/sebastian/recursion-context/README.md
deleted file mode 100644
index bd43985..0000000
--- a/vendor/sebastian/recursion-context/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Recursion Context
-
-...
-
-## Installation
-
-To add Recursion Context as a local, per-project dependency to your project, simply add a dependency on `sebastian/recursion-context` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Recursion Context 1.0:
-
-    {
-        "require": {
-            "sebastian/recursion-context": "~1.0"
-        }
-    }
diff --git a/vendor/sebastian/recursion-context/build.xml b/vendor/sebastian/recursion-context/build.xml
deleted file mode 100644
index b4fd193..0000000
--- a/vendor/sebastian/recursion-context/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="recursion-context">
- <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/vendor"/>
-  <delete file="${basedir}/composer.lock"/>
- </target>
-
- <target name="composer" depends="clean" description="Install dependencies with Composer">
-  <tstamp>
-   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
-  </tstamp>
-  <delete>
-   <fileset dir="${basedir}">
-    <include name="composer.phar" />
-    <date datetime="${thirty.days.ago}" when="before"/>
-   </fileset>
-  </delete>
-
-  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
-
-  <exec executable="php">
-   <arg value="composer.phar"/>
-   <arg value="install"/>
-  </exec>
- </target>
-</project>
-
diff --git a/vendor/sebastian/recursion-context/composer.json b/vendor/sebastian/recursion-context/composer.json
deleted file mode 100644
index fed033d..0000000
--- a/vendor/sebastian/recursion-context/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "sebastian/recursion-context",
-    "description": "Provides functionality to recursively process PHP variables",
-    "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de"
-        },
-        {
-            "name": "Jeff Welch",
-            "email": "whatthejeff@gmail.com"
-        },
-        {
-            "name": "Adam Harvey",
-            "email": "aharvey@php.net"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.4"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/vendor/sebastian/recursion-context/phpunit.xml.dist b/vendor/sebastian/recursion-context/phpunit.xml.dist
deleted file mode 100644
index 757e3e6..0000000
--- a/vendor/sebastian/recursion-context/phpunit.xml.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         checkForUnintentionallyCoveredCode="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-<testsuites>
-  <testsuite name="recursion-context">
-   <directory>tests</directory>
-  </testsuite>
- </testsuites>
- <filter>
-  <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
-   <directory>src</directory>
-  </whitelist>
- </filter>
-</phpunit>
diff --git a/vendor/sebastian/recursion-context/src/Context.php b/vendor/sebastian/recursion-context/src/Context.php
deleted file mode 100644
index 06bf6ce..0000000
--- a/vendor/sebastian/recursion-context/src/Context.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- * A context containing previously processed arrays and objects
- * when recursively processing a value.
- */
-final class Context
-{
-    /**
-     * @var array[]
-     */
-    private $arrays;
-
-    /**
-     * @var \SplObjectStorage
-     */
-    private $objects;
-
-    /**
-     * Initialises the context
-     */
-    public function __construct()
-    {
-        $this->arrays  = array();
-        $this->objects = new \SplObjectStorage;
-    }
-
-    /**
-     * Adds a value to the context.
-     *
-     * @param  array|object             $value The value to add.
-     * @return int|string               The ID of the stored value, either as
-     *                                        a string or integer.
-     * @throws InvalidArgumentException Thrown if $value is not an array or
-     *                                        object
-     */
-    public function add(&$value)
-    {
-        if (is_array($value)) {
-            return $this->addArray($value);
-        }
-
-        else if (is_object($value)) {
-            return $this->addObject($value);
-        }
-
-        throw new InvalidArgumentException(
-            'Only arrays and objects are supported'
-        );
-    }
-
-    /**
-     * Checks if the given value exists within the context.
-     *
-     * @param  array|object             $value The value to check.
-     * @return int|string|false         The string or integer ID of the stored
-     *                                        value if it has already been seen, or
-     *                                        false if the value is not stored.
-     * @throws InvalidArgumentException Thrown if $value is not an array or
-     *                                        object
-     */
-    public function contains(&$value)
-    {
-        if (is_array($value)) {
-            return $this->containsArray($value);
-        }
-
-        else if (is_object($value)) {
-            return $this->containsObject($value);
-        }
-
-        throw new InvalidArgumentException(
-            'Only arrays and objects are supported'
-        );
-    }
-
-    /**
-     * @param  array    $array
-     * @return bool|int
-     */
-    private function addArray(array &$array)
-    {
-        $key = $this->containsArray($array);
-
-        if ($key !== false) {
-            return $key;
-        }
-
-        $this->arrays[] = &$array;
-
-        return count($this->arrays) - 1;
-    }
-
-    /**
-     * @param  object $object
-     * @return string
-     */
-    private function addObject($object)
-    {
-        if (!$this->objects->contains($object)) {
-            $this->objects->attach($object);
-        }
-
-        return spl_object_hash($object);
-    }
-
-    /**
-     * @param  array     $array
-     * @return int|false
-     */
-    private function containsArray(array &$array)
-    {
-        $keys = array_keys($this->arrays, $array, true);
-        $hash = '_Key_' . hash('sha512', microtime(true));
-
-        foreach ($keys as $key) {
-            $this->arrays[$key][$hash] = $hash;
-
-            if (isset($array[$hash]) && $array[$hash] === $hash) {
-                unset($this->arrays[$key][$hash]);
-
-                return $key;
-            }
-
-            unset($this->arrays[$key][$hash]);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param  object       $value
-     * @return string|false
-     */
-    private function containsObject($value)
-    {
-        if ($this->objects->contains($value)) {
-            return spl_object_hash($value);
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/sebastian/recursion-context/src/Exception.php b/vendor/sebastian/recursion-context/src/Exception.php
deleted file mode 100644
index 4a1557b..0000000
--- a/vendor/sebastian/recursion-context/src/Exception.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- */
-interface Exception
-{
-}
diff --git a/vendor/sebastian/recursion-context/src/InvalidArgumentException.php b/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
deleted file mode 100644
index 032c504..0000000
--- a/vendor/sebastian/recursion-context/src/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/*
- * This file is part of the Recursion Context package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\RecursionContext;
-
-/**
- */
-final class InvalidArgumentException extends \InvalidArgumentException implements Exception
-{
-}
diff --git a/vendor/sebastian/version/.gitattributes b/vendor/sebastian/version/.gitattributes
deleted file mode 100644
index 461090b..0000000
--- a/vendor/sebastian/version/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.php diff=php
diff --git a/vendor/sebastian/version/.gitignore b/vendor/sebastian/version/.gitignore
deleted file mode 100644
index a09c56d..0000000
--- a/vendor/sebastian/version/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/.idea
diff --git a/vendor/sebastian/version/LICENSE b/vendor/sebastian/version/LICENSE
deleted file mode 100644
index 5b79c41..0000000
--- a/vendor/sebastian/version/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Version
-
-Copyright (c) 2013-2015, Sebastian Bergmann <sebastian@phpunit.de>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
- * 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.
-
- * Neither the name of Sebastian Bergmann nor the names of his
-   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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/sebastian/version/README.md b/vendor/sebastian/version/README.md
deleted file mode 100644
index be6b687..0000000
--- a/vendor/sebastian/version/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Version
-
-**Version** is a library that helps with managing the version number of Git-hosted PHP projects.
-
-## Installation
-
-Simply add a dependency on `sebastian/version` to your project's `composer.json` file if you use [Composer](http://getcomposer.org/) to manage the dependencies of your project.
-
-## Usage
-
-The constructor of the `SebastianBergmann\Version` class expects two parameters:
-
-* `$release` is the version number of the latest release (`X.Y.Z`, for instance) or the name of the release series (`X.Y`) when no release has been made from that branch / for that release series yet.
-* `$path` is the path to the directory (or a subdirectory thereof) where the sourcecode of the project can be found. Simply passing `__DIR__` here usually suffices.
-
-Apart from the constructor, the `SebastianBergmann\Version` class has a single public method: `getVersion()`.
-
-Here is a contrived example that shows the basic usage:
-
-    <?php
-    $version = new SebastianBergmann\Version(
-      '3.7.10', '/usr/local/src/phpunit'
-    );
-
-    var_dump($version->getVersion());
-    ?>
-
-    string(18) "3.7.10-17-g00f3408"
-
-When a new release is prepared, the string that is passed to the constructor as the first argument needs to be updated.
-
-### How SebastianBergmann\Version::getVersion() works
-
-* If `$path` is not (part of) a Git repository and `$release` is in `X.Y.Z` format then `$release` is returned as-is.
-* If `$path` is not (part of) a Git repository and `$release` is in `X.Y` format then `$release` is returned suffixed with `-dev`.
-* If `$path` is (part of) a Git repository and `$release` is in `X.Y.Z` format then the output of `git describe --tags` is returned as-is.
-* If `$path` is (part of) a Git repository and `$release` is in `X.Y` format then a string is returned that begins with `X.Y` and ends with information from `git describe --tags`.
diff --git a/vendor/sebastian/version/composer.json b/vendor/sebastian/version/composer.json
deleted file mode 100644
index 39d6569..0000000
--- a/vendor/sebastian/version/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "sebastian/version",
-    "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-    "homepage": "https://github.com/sebastianbergmann/version",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Sebastian Bergmann",
-            "email": "sebastian@phpunit.de",
-            "role": "lead"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/version/issues"
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ]
-    }
-}
diff --git a/vendor/sebastian/version/src/Version.php b/vendor/sebastian/version/src/Version.php
deleted file mode 100644
index 3cb3e09..0000000
--- a/vendor/sebastian/version/src/Version.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * This file is part of the Version package.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann;
-
-/**
- * @since Class available since Release 1.0.0
- */
-class Version
-{
-    private $path;
-    private $release;
-    private $version;
-
-    /**
-     * @param string $release
-     * @param string $path
-     */
-    public function __construct($release, $path)
-    {
-        $this->release = $release;
-        $this->path    = $path;
-    }
-
-    /**
-     * @return string
-     */
-    public function getVersion()
-    {
-        if ($this->version === null) {
-            if (count(explode('.', $this->release)) == 3) {
-                $this->version = $this->release;
-            } else {
-                $this->version = $this->release . '-dev';
-            }
-
-            $git = $this->getGitInformation($this->path);
-
-            if ($git) {
-                if (count(explode('.', $this->release)) == 3) {
-                    $this->version = $git;
-                } else {
-                    $git = explode('-', $git);
-
-                    $this->version = $this->release . '-' . end($git);
-                }
-            }
-        }
-
-        return $this->version;
-    }
-
-    /**
-     * @param  string      $path
-     * @return bool|string
-     */
-    private function getGitInformation($path)
-    {
-        if (!is_dir($path . DIRECTORY_SEPARATOR . '.git')) {
-            return false;
-        }
-
-        $dir = getcwd();
-        chdir($path);
-        $returnCode = 1;
-        $result     = @exec('git describe --tags 2>&1', $output, $returnCode);
-        chdir($dir);
-
-        if ($returnCode !== 0) {
-            return false;
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/stack/builder/.gitignore b/vendor/stack/builder/.gitignore
deleted file mode 100644
index 22d0d82..0000000
--- a/vendor/stack/builder/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/vendor/stack/builder/.travis.yml b/vendor/stack/builder/.travis.yml
deleted file mode 100644
index 525cf96..0000000
--- a/vendor/stack/builder/.travis.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source
-
-script: phpunit --coverage-text
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/vendor/stack/builder/CHANGELOG.md b/vendor/stack/builder/CHANGELOG.md
deleted file mode 100644
index d44fa88..0000000
--- a/vendor/stack/builder/CHANGELOG.md
+++ /dev/null
@@ -1,18 +0,0 @@
-CHANGELOG
-=========
-
-* 1.0.3 (2014-11-23)
-
-  * Only call Terminable middlewares once.
-
-* 1.0.2 (2014-05-18)
-
-  * Validate missing arguments (@bajbnet).
-
-* 1.0.1 (2013-10-25)
-
-  * Lower PHP requirement to 5.3.
-
-* 1.0.0 (2013-08-02)
-
-  * Initial release.
diff --git a/vendor/stack/builder/LICENSE b/vendor/stack/builder/LICENSE
deleted file mode 100644
index ceac72c..0000000
--- a/vendor/stack/builder/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013 Igor Wiedler
-
-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/vendor/stack/builder/README.md b/vendor/stack/builder/README.md
deleted file mode 100644
index 812406c..0000000
--- a/vendor/stack/builder/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Stack/Builder
-
-Builder for stack middlewares based on HttpKernelInterface.
-
-Stack/Builder is a small library that helps you construct a nested
-HttpKernelInterface decorator tree. It models it as a stack of middlewares.
-
-## Example
-
-If you want to decorate a [silex](https://github.com/fabpot/Silex) app with
-session and cache middlewares, you'll have to do something like this:
-
-    use Symfony\Component\HttpKernel\HttpCache\Store;
-
-    $app = new Silex\Application();
-
-    $app->get('/', function () {
-        return 'Hello World!';
-    });
-
-    $app = new Stack\Session(
-        new Symfony\Component\HttpKernel\HttpCache\HttpCache(
-            $app,
-            new Store(__DIR__.'/cache')
-        )
-    );
-
-This can get quite annoying indeed. Stack/Builder simplifies that:
-
-    $stack = (new Stack\Builder())
-        ->push('Stack\Session')
-        ->push('Symfony\Component\HttpKernel\HttpCache\HttpCache', new Store(__DIR__.'/cache'));
-
-    $app = $stack->resolve($app);
-
-As you can see, by arranging the layers as a stack, they become a lot easier
-to work with.
-
-In the front controller, you need to serve the request:
-
-    use Symfony\Component\HttpFoundation\Request;
-
-    $request = Request::createFromGlobals();
-    $response = $app->handle($request)->send();
-    $app->terminate($request, $response);
-
-Stack/Builder also supports pushing a `callable` on to the stack, for situations
-where instantiating middlewares might be more complicated. The `callable` should
-accept a `HttpKernelInterface` as the first argument and should also return a
-`HttpKernelInterface`. The example above could be rewritten as:
-
-    $stack = (new Stack\Builder())
-        ->push('Stack\Session')
-        ->push(function ($app) {
-            $cache = new HttpCache($app, new Store(__DIR__.'/cache'));
-            return $cache;
-        });
-
-## Inspiration
-
-* [Rack::Builder](http://rack.rubyforge.org/doc/Rack/Builder.html)
-* [HttpKernel middlewares](https://igor.io/2013/02/02/http-kernel-middlewares.html)
diff --git a/vendor/stack/builder/composer.json b/vendor/stack/builder/composer.json
deleted file mode 100644
index e9f164c..0000000
--- a/vendor/stack/builder/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "stack/builder",
-    "description": "Builder for stack middlewares based on HttpKernelInterface.",
-    "keywords": ["stack"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Igor Wiedler",
-            "email": "igor@wiedler.ch"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "symfony/http-foundation": "~2.1",
-        "symfony/http-kernel": "~2.1"
-    },
-    "require-dev": {
-        "silex/silex": "~1.0"
-    },
-    "autoload": {
-        "psr-0": { "Stack": "src" }
-    },
-    "extra": {
-        "branch-alias": { "dev-master": "1.0-dev" }
-    }
-}
diff --git a/vendor/stack/builder/composer.lock b/vendor/stack/builder/composer.lock
deleted file mode 100644
index 26c6a99..0000000
--- a/vendor/stack/builder/composer.lock
+++ /dev/null
@@ -1,488 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
-    ],
-    "hash": "78698481679eca710495d5aca028baaa",
-    "packages": [
-        {
-            "name": "psr/log",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Psr\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2012-12-21 11:40:51"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v2.4.1",
-            "target-dir": "Symfony/Component/Debug",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Debug.git",
-                "reference": "74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f",
-                "reference": "74110be5ec681a83fc5bd66dd5fd29fe85fe9c1f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/http-foundation": "~2.1",
-                "symfony/http-kernel": "~2.1"
-            },
-            "suggest": {
-                "symfony/http-foundation": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Debug\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-01-01 09:02:49"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v2.4.1",
-            "target-dir": "Symfony/Component/EventDispatcher",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601",
-                "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/dependency-injection": "~2.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2013-12-28 08:12:03"
-        },
-        {
-            "name": "symfony/http-foundation",
-            "version": "v2.4.1",
-            "target-dir": "Symfony/Component/HttpFoundation",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
-                "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\HttpFoundation\\": ""
-                },
-                "classmap": [
-                    "Symfony/Component/HttpFoundation/Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony HttpFoundation Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-01-05 02:10:50"
-        },
-        {
-            "name": "symfony/http-kernel",
-            "version": "v2.4.1",
-            "target-dir": "Symfony/Component/HttpKernel",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0605eedeb52c4d3a3144128d8336395a57be60d4",
-                "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "psr/log": "~1.0",
-                "symfony/debug": "~2.3",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/http-foundation": "~2.4"
-            },
-            "require-dev": {
-                "symfony/browser-kit": "~2.2",
-                "symfony/class-loader": "~2.1",
-                "symfony/config": "~2.0",
-                "symfony/console": "~2.2",
-                "symfony/dependency-injection": "~2.0",
-                "symfony/finder": "~2.0",
-                "symfony/process": "~2.0",
-                "symfony/routing": "~2.2",
-                "symfony/stopwatch": "~2.2",
-                "symfony/templating": "~2.2"
-            },
-            "suggest": {
-                "symfony/browser-kit": "",
-                "symfony/class-loader": "",
-                "symfony/config": "",
-                "symfony/console": "",
-                "symfony/dependency-injection": "",
-                "symfony/finder": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\HttpKernel\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony HttpKernel Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-01-05 02:12:11"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "pimple/pimple",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fabpot/Pimple.git",
-                "reference": "471c7d7c52ad6594e17b8ec33efdd1be592b5d83"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/471c7d7c52ad6594e17b8ec33efdd1be592b5d83",
-                "reference": "471c7d7c52ad6594e17b8ec33efdd1be592b5d83",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2013-09-19 04:53:08"
-        },
-        {
-            "name": "silex/silex",
-            "version": "v1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Silex.git",
-                "reference": "47cc7d6545450ef8a91f50c04e8c7b3b04fceae9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Silex/zipball/47cc7d6545450ef8a91f50c04e8c7b3b04fceae9",
-                "reference": "47cc7d6545450ef8a91f50c04e8c7b3b04fceae9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "pimple/pimple": "~1.0",
-                "symfony/event-dispatcher": ">=2.3,<2.5-dev",
-                "symfony/http-foundation": ">=2.3,<2.5-dev",
-                "symfony/http-kernel": ">=2.3,<2.5-dev",
-                "symfony/routing": ">=2.3,<2.5-dev"
-            },
-            "require-dev": {
-                "doctrine/dbal": ">=2.2.0,<2.4.0-dev",
-                "monolog/monolog": "~1.4,>=1.4.1",
-                "phpunit/phpunit": "~3.7",
-                "swiftmailer/swiftmailer": "5.*",
-                "symfony/browser-kit": ">=2.3,<2.5-dev",
-                "symfony/config": ">=2.3,<2.5-dev",
-                "symfony/css-selector": ">=2.3,<2.5-dev",
-                "symfony/debug": ">=2.3,<2.5-dev",
-                "symfony/dom-crawler": ">=2.3,<2.5-dev",
-                "symfony/finder": ">=2.3,<2.5-dev",
-                "symfony/form": ">=2.3,<2.5-dev",
-                "symfony/locale": ">=2.3,<2.5-dev",
-                "symfony/monolog-bridge": ">=2.3,<2.5-dev",
-                "symfony/options-resolver": ">=2.3,<2.5-dev",
-                "symfony/process": ">=2.3,<2.5-dev",
-                "symfony/security": ">=2.3,<2.5-dev",
-                "symfony/serializer": ">=2.3,<2.5-dev",
-                "symfony/translation": ">=2.3,<2.5-dev",
-                "symfony/twig-bridge": ">=2.3,<2.5-dev",
-                "symfony/validator": ">=2.3,<2.5-dev",
-                "twig/twig": ">=1.8.0,<2.0-dev"
-            },
-            "suggest": {
-                "symfony/browser-kit": ">=2.3,<2.5-dev",
-                "symfony/css-selector": ">=2.3,<2.5-dev",
-                "symfony/dom-crawler": ">=2.3,<2.5-dev",
-                "symfony/form": ">=2.3,<2.5-dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Silex": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch",
-                    "homepage": "http://wiedler.ch/igor/"
-                }
-            ],
-            "description": "The PHP micro-framework based on the Symfony2 Components",
-            "homepage": "http://silex.sensiolabs.org",
-            "keywords": [
-                "microframework"
-            ],
-            "time": "2013-10-30 08:53:26"
-        },
-        {
-            "name": "symfony/routing",
-            "version": "v2.4.1",
-            "target-dir": "Symfony/Component/Routing",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Routing.git",
-                "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/4abfb500aab8be458c9e3a227ea56b190584f78a",
-                "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "psr/log": "~1.0",
-                "symfony/config": "~2.2",
-                "symfony/expression-language": "~2.4",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "For using the annotation loader",
-                "symfony/config": "For using the all-in-one router or any loader",
-                "symfony/expression-language": "For using expression matching",
-                "symfony/yaml": "For using the YAML loader"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Routing\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Routing Component",
-            "homepage": "http://symfony.com",
-            "keywords": [
-                "router",
-                "routing",
-                "uri",
-                "url"
-            ],
-            "time": "2014-01-05 02:10:50"
-        }
-    ],
-    "aliases": [
-
-    ],
-    "minimum-stability": "stable",
-    "stability-flags": [
-
-    ],
-    "platform": {
-        "php": ">=5.3.0"
-    },
-    "platform-dev": [
-
-    ]
-}
diff --git a/vendor/stack/builder/phpunit.xml.dist b/vendor/stack/builder/phpunit.xml.dist
deleted file mode 100644
index a2437ec..0000000
--- a/vendor/stack/builder/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <testsuites>
-        <testsuite name="unit">
-            <directory>./tests/unit/</directory>
-        </testsuite>
-    </testsuites>
-
-    <testsuites>
-        <testsuite name="integration">
-            <directory>./tests/integration/</directory>
-        </testsuite>
-    </testsuites>
-
-    <testsuites>
-        <testsuite name="functional">
-            <directory>./tests/functional/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/stack/builder/src/Stack/Builder.php b/vendor/stack/builder/src/Stack/Builder.php
deleted file mode 100644
index c7ee05a..0000000
--- a/vendor/stack/builder/src/Stack/Builder.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Stack;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-class Builder
-{
-    private $specs;
-
-    public function __construct()
-    {
-        $this->specs = new \SplStack();
-    }
-
-    public function unshift(/*$kernelClass, $args...*/)
-    {
-        if (func_num_args() === 0) {
-            throw new \InvalidArgumentException("Missing argument(s) when calling unshift");
-        }
-
-        $spec = func_get_args();
-        $this->specs->unshift($spec);
-
-        return $this;
-    }
-
-    public function push(/*$kernelClass, $args...*/)
-    {
-        if (func_num_args() === 0) {
-            throw new \InvalidArgumentException("Missing argument(s) when calling push");
-        }
-
-        $spec = func_get_args();
-        $this->specs->push($spec);
-
-        return $this;
-    }
-
-    public function resolve(HttpKernelInterface $app)
-    {
-        $middlewares = array($app);
-
-        foreach ($this->specs as $spec) {
-            $args = $spec;
-            $firstArg = array_shift($args);
-
-            if (is_callable($firstArg)) {
-                $app = $firstArg($app);
-            } else {
-                $kernelClass = $firstArg;
-                array_unshift($args, $app);
-
-                $reflection = new \ReflectionClass($kernelClass);
-                $app = $reflection->newInstanceArgs($args);
-            }
-
-            array_unshift($middlewares, $app);
-        }
-
-        return new StackedHttpKernel($app, $middlewares);
-    }
-}
diff --git a/vendor/stack/builder/src/Stack/StackedHttpKernel.php b/vendor/stack/builder/src/Stack/StackedHttpKernel.php
deleted file mode 100644
index f89a4db..0000000
--- a/vendor/stack/builder/src/Stack/StackedHttpKernel.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Stack;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\TerminableInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class StackedHttpKernel implements HttpKernelInterface, TerminableInterface
-{
-    private $app;
-    private $middlewares = array();
-
-    public function __construct(HttpKernelInterface $app, array $middlewares)
-    {
-        $this->app = $app;
-        $this->middlewares = $middlewares;
-    }
-
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        return $this->app->handle($request, $type, $catch);
-    }
-
-    public function terminate(Request $request, Response $response)
-    {
-        $prevKernel = null;
-        foreach ($this->middlewares as $kernel) {
-            // if prev kernel was terminable we can assume this middleware has already been called
-            if (!$prevKernel instanceof TerminableInterface && $kernel instanceof TerminableInterface) {
-                $kernel->terminate($request, $response);
-            }
-            $prevKernel = $kernel;
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/.travis.yml b/vendor/symfony-cmf/routing/.travis.yml
deleted file mode 100644
index c0eae5c..0000000
--- a/vendor/symfony-cmf/routing/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-env: 
-  - SYMFONY_VERSION=2.5.*
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  include:
-    - php: 5.5
-      env: SYMFONY_VERSION=2.3.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.4.*
-    - php: 5.5
-      env: SYMFONY_VERSION=2.*
-
-before_install:
-  - composer require symfony/routing:${SYMFONY_VERSION} --prefer-source
-
-script: phpunit --coverage-text
-
-notifications:
-  irc: "irc.freenode.org#symfony-cmf"
-  email: "symfony-cmf-devs@googlegroups.com"
diff --git a/vendor/symfony-cmf/routing/CHANGELOG.md b/vendor/symfony-cmf/routing/CHANGELOG.md
deleted file mode 100644
index e8e8542..0000000
--- a/vendor/symfony-cmf/routing/CHANGELOG.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Changelog
-=========
-
-* **2014-09-29**: ChainRouter does not require a RouterInterface, as a
-  RequestMatcher and UrlGenerator is fine too. Fixed chain router interface to
-  not force a RouterInterface.
-* **2014-09-29**: Deprecated DynamicRouter::match in favor of matchRequest.
-
-1.3.0-RC1
----------
-
-* **2014-08-20**: Added an interface for the ChainRouter
-* **2014-06-06**: Updated to PSR-4 autoloading
-
-1.2.0
------
-
-Release 1.2.0
-
-1.2.0-RC1
----------
-
-* **2013-12-23**: add support for ChainRouter::getRouteCollection()
-* **2013-01-07**: Removed the deprecated $parameters argument in
-  RouteProviderInterface::getRouteByName and getRoutesByNames.
-
-1.1.0
------
-
-Release 1.1.0
-
-1.1.0-RC1
----------
-
-* **2013-07-31**: DynamicRouter now accepts an EventDispatcher to trigger a
-  RouteMatchEvent right before the matching starts
-* **2013-07-29**: Renamed RouteAwareInterface to RouteReferrersReadInterface
-  for naming consistency and added RouteReferrersInterface for write access.
-* **2013-07-13**: NestedMatcher now expects a FinalMatcherInterface as second
-  argument of the constructor
-
-1.1.0-alpha1
-------------
-
-* **2013-04-30**: Dropped Symfony 2.1 support and got rid of
-  ConfigurableUrlMatcher class
-* **2013-04-05**: [ContentAwareGenerator] Fix locale handling to always respect
-  locale but never have unnecessary ?locale=
diff --git a/vendor/symfony-cmf/routing/CONTRIBUTING.md b/vendor/symfony-cmf/routing/CONTRIBUTING.md
deleted file mode 100644
index 0e4efab..0000000
--- a/vendor/symfony-cmf/routing/CONTRIBUTING.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Contributing
-------------
-
-Symfony2 CMF is an open source, community-driven project. We follow the same
-guidelines as core Symfony2. If you'd like to contribute, please read the
-[Contributing Code][1] part of the documentation. If you're submitting a pull
-request, please follow the guidelines in the [Submitting a Patch][2] section
-and use the [Pull Request Template][3].
-
-[1]: http://symfony.com/doc/current/contributing/code/index.html
-[2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
-[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
diff --git a/vendor/symfony-cmf/routing/Candidates/Candidates.php b/vendor/symfony-cmf/routing/Candidates/Candidates.php
deleted file mode 100644
index 84584f9..0000000
--- a/vendor/symfony-cmf/routing/Candidates/Candidates.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Candidates;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * A straightforward strategy that splits the URL on "/".
- *
- * If locales is set, additionally generates candidates removing the locale if
- * it is one of the configured locales, for non-locale specific URLs.
- *
- * @author David Buchmann <mail@davidbu.ch>
- */
-class Candidates implements CandidatesInterface
-{
-    /**
-     * @var array
-     */
-    protected $locales;
-
-    /**
-     * A limit to apply to the number of candidates generated.
-     *
-     * This is to prevent abusive requests with a lot of "/". The limit is per
-     * batch, that is if a locale matches you could get as many as 2 * $limit
-     * candidates if the URL has that many slashes.
-     *
-     * @var int
-     */
-    protected $limit;
-
-    /**
-     * @param array $locales The locales to support.
-     * @param int   $limit   A limit to apply to the candidates generated.
-     */
-    public function __construct(array $locales = array(), $limit = 20)
-    {
-        $this->setLocales($locales);
-        $this->limit = $limit;
-    }
-
-    /**
-     * Set the locales to support by this strategy.
-     *
-     * @param array $locales The locales to support.
-     */
-    public function setLocales(array $locales)
-    {
-        $this->locales = $locales;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Always returns true.
-     */
-    public function isCandidate($name)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Does nothing.
-     */
-    public function restrictQuery($queryBuilder)
-    {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getCandidates(Request $request)
-    {
-        $url = $request->getPathInfo();
-        $candidates = $this->getCandidatesFor($url);
-
-        $locale = $this->determineLocale($url);
-        if ($locale) {
-            $candidates = array_unique(array_merge($candidates, $this->getCandidatesFor(substr($url, strlen($locale) + 1))));
-        }
-
-        return $candidates;
-    }
-
-    /**
-     * Determine the locale of this URL.
-     *
-     * @param string $url The url to determine the locale from.
-     *
-     * @return string|boolean The locale if $url starts with one of the allowed locales.
-     */
-    protected function determineLocale($url)
-    {
-        if (!count($this->locales)) {
-            return false;
-        }
-
-        $matches = array();
-        if (preg_match('#(' . implode('|', $this->locales) . ')(/|$)#', $url, $matches)) {
-            return $matches[1];
-        }
-
-        return false;
-    }
-
-    /**
-     * Handle a possible format extension and split the $url on "/".
-     *
-     * $prefix is prepended to every candidate generated.
-     *
-     * @param string $url    The URL to split.
-     * @param string $prefix A prefix to prepend to every pattern.
-     *
-     * @return array Paths that could represent routes that match $url and are
-     *               child of $prefix.
-     */
-    protected function getCandidatesFor($url, $prefix = '')
-    {
-        $candidates = array();
-        if ('/' !== $url) {
-            // handle format extension, like .html or .json
-            if (preg_match('/(.+)\.[a-z]+$/i', $url, $matches)) {
-                $candidates[] = $prefix . $url;
-                $url = $matches[1];
-            }
-
-            $part = $url;
-            $count = 0;
-            while (false !== ($pos = strrpos($part, '/'))) {
-                if (++$count > $this->limit) {
-                    return $candidates;
-                }
-                $candidates[] = $prefix . $part;
-                $part = substr($url, 0, $pos);
-            }
-        }
-
-        $candidates[] = $prefix ?: '/';
-
-        return $candidates;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Candidates/CandidatesInterface.php b/vendor/symfony-cmf/routing/Candidates/CandidatesInterface.php
deleted file mode 100644
index 9ce22a9..0000000
--- a/vendor/symfony-cmf/routing/Candidates/CandidatesInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Candidates;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Candidates is a subsystem useful for the route provider. It separates the
- * logic for determining possible static prefixes from the route provider.
- *
- * @author David Buchmann <mail@davidbu.ch>
- */
-interface CandidatesInterface
-{
-    /**
-     * @param Request $request
-     *
-     * @return array a list of paths
-     */
-    public function getCandidates(Request $request);
-
-    /**
-     * Determine if $name is a valid candidate, e.g. in getRouteByName.
-     *
-     * @param string $name
-     *
-     * @return boolean
-     */
-    public function isCandidate($name);
-
-    /**
-     * Provide a best effort query restriction to limit a query to only find
-     * routes that are supported.
-     *
-     * @param object $queryBuilder A query builder suited for the storage backend.
-     */
-    public function restrictQuery($queryBuilder);
-}
diff --git a/vendor/symfony-cmf/routing/ChainRouteCollection.php b/vendor/symfony-cmf/routing/ChainRouteCollection.php
deleted file mode 100644
index 16c4859..0000000
--- a/vendor/symfony-cmf/routing/ChainRouteCollection.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-class ChainRouteCollection extends RouteCollection
-{
-    /**
-     * @var RouteCollection[]
-     */
-    private $routeCollections = array();
-
-    /**
-     * @var RouteCollection
-     */
-    private $routeCollection;
-
-    public function __clone()
-    {
-        foreach ($this->routeCollections as $routeCollection) {
-            $this->routeCollections[] = clone $routeCollection;
-        }
-    }
-
-    /**
-     * Gets the current RouteCollection as an Iterator that includes all routes.
-     *
-     * It implements \IteratorAggregate.
-     *
-     * @see all()
-     *
-     * @return \ArrayIterator An \ArrayIterator object for iterating over routes
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->all());
-    }
-
-    /**
-     * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
-     */
-    public function count()
-    {
-        $count = 0;
-        foreach ($this->routeCollections as $routeCollection) {
-            $count+= $routeCollection->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Adds a route.
-     *
-     * @param string $name  The route name
-     * @param Route  $route A Route instance
-     */
-    public function add($name, Route $route)
-    {
-        $this->createInternalCollection();
-        $this->routeCollection->add($name, $route);
-    }
-
-    /**
-     * Returns all routes in this collection.
-     *
-     * @return Route[] An array of routes
-     */
-    public function all()
-    {
-        $routeCollectionAll = new RouteCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollectionAll->addCollection($routeCollection);
-        }
-
-        return $routeCollectionAll->all();
-    }
-
-    /**
-     * Gets a route by name.
-     *
-     * @param string $name The route name
-     *
-     * @return Route|null A Route instance or null when not found
-     */
-    public function get($name)
-    {
-        foreach ($this->routeCollections as $routeCollection) {
-            $route = $routeCollection->get($name);
-            if (null !== $route) {
-                return $route;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Removes a route or an array of routes by name from the collection
-     *
-     * @param string|array $name The route name or an array of route names
-     */
-    public function remove($name)
-    {
-        foreach ($this->routeCollections as $routeCollection) {
-            $route = $routeCollection->get($name);
-            if (null !== $route) {
-                $routeCollection->remove($name);
-            }
-        }
-    }
-
-    /**
-     * Adds a route collection at the end of the current set by appending all
-     * routes of the added collection.
-     *
-     * @param RouteCollection $collection A RouteCollection instance
-     */
-    public function addCollection(RouteCollection $collection)
-    {
-        $this->routeCollections[] = $collection;
-    }
-
-    /**
-     * Adds a prefix to the path of all child routes.
-     *
-     * @param string $prefix       An optional prefix to add before each pattern of the route collection
-     * @param array  $defaults     An array of default values
-     * @param array  $requirements An array of requirements
-     */
-    public function addPrefix($prefix, array $defaults = array(), array $requirements = array())
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->addPrefix($prefix, $defaults, $requirements);
-        }
-    }
-
-    /**
-     * Sets the host pattern on all routes.
-     *
-     * @param string $pattern      The pattern
-     * @param array  $defaults     An array of default values
-     * @param array  $requirements An array of requirements
-     */
-    public function setHost($pattern, array $defaults = array(), array $requirements = array())
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->setHost($pattern, $defaults, $requirements);
-        }
-    }
-
-    /**
-     * Adds defaults to all routes.
-     *
-     * An existing default value under the same name in a route will be overridden.
-     *
-     * @param array $defaults An array of default values
-     */
-    public function addDefaults(array $defaults)
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->addDefaults($defaults);
-        }
-    }
-
-    /**
-     * Adds requirements to all routes.
-     *
-     * An existing requirement under the same name in a route will be overridden.
-     *
-     * @param array $requirements An array of requirements
-     */
-    public function addRequirements(array $requirements)
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->addRequirements($requirements);
-        }
-    }
-
-    /**
-     * Adds options to all routes.
-     *
-     * An existing option value under the same name in a route will be overridden.
-     *
-     * @param array $options An array of options
-     */
-    public function addOptions(array $options)
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->addOptions($options);
-        }
-    }
-
-    /**
-     * Sets the schemes (e.g. 'https') all child routes are restricted to.
-     *
-     * @param string|array $schemes The scheme or an array of schemes
-     */
-    public function setSchemes($schemes)
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->setSchemes($schemes);
-        }
-    }
-
-    /**
-     * Sets the HTTP methods (e.g. 'POST') all child routes are restricted to.
-     *
-     * @param string|array $methods The method or an array of methods
-     */
-    public function setMethods($methods)
-    {
-        $this->createInternalCollection();
-        foreach ($this->routeCollections as $routeCollection) {
-            $routeCollection->setMethods($methods);
-        }
-    }
-
-    /**
-     * Returns an array of resources loaded to build this collection.
-     *
-     * @return ResourceInterface[] An array of resources
-     */
-    public function getResources()
-    {
-        $resources = array();
-        foreach ($this->routeCollections as $routeCollection) {
-            $resources = array_merge($resources, $routeCollection->getResources());
-        }
-
-        return array_unique($resources);
-    }
-
-    /**
-     * Adds a resource for this collection.
-     *
-     * @param ResourceInterface $resource A resource instance
-     */
-    public function addResource(ResourceInterface $resource)
-    {
-        $this->createInternalCollection();
-        $this->routeCollection->addResource($resource);
-    }
-
-    private function createInternalCollection()
-    {
-        if (!$this->routeCollection instanceof RouteCollection) {
-            $this->routeCollection = new RouteCollection();
-            $this->routeCollections[] = $this->routeCollection;
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/ChainRouter.php b/vendor/symfony-cmf/routing/ChainRouter.php
deleted file mode 100644
index 89c2c15..0000000
--- a/vendor/symfony-cmf/routing/ChainRouter.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * The ChainRouter allows to combine several routers to try in a defined order.
- *
- * @author Henrik Bjornskov <henrik@bjrnskov.dk>
- * @author Magnus Nordlander <magnus@e-butik.se>
- */
-class ChainRouter implements ChainRouterInterface, WarmableInterface
-{
-    /**
-     * @var RequestContext
-     */
-    private $context;
-
-    /**
-     * Array of arrays of routers grouped by priority
-     * @var array
-     */
-    private $routers = array();
-
-    /**
-     * @var RouterInterface[] Array of routers, sorted by priority
-     */
-    private $sortedRouters;
-
-    /**
-     * @var RouteCollection
-     */
-    private $routeCollection;
-
-    /**
-     * @var null|LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function __construct(LoggerInterface $logger = null)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * @return RequestContext
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($router, $priority = 0)
-    {
-        if (!$router instanceof RouterInterface
-            && !($router instanceof RequestMatcherInterface && $router instanceof UrlGeneratorInterface)
-        ) {
-            throw new \InvalidArgumentException(sprintf('%s is not a valid router.', get_class($router)));
-        }
-        if (empty($this->routers[$priority])) {
-            $this->routers[$priority] = array();
-        }
-
-        $this->routers[$priority][] = $router;
-        $this->sortedRouters = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        if (empty($this->sortedRouters)) {
-            $this->sortedRouters = $this->sortRouters();
-
-            // setContext() is done here instead of in add() to avoid fatal errors when clearing and warming up caches
-            // See https://github.com/symfony-cmf/Routing/pull/18
-            $context = $this->getContext();
-            if (null !== $context) {
-                foreach ($this->sortedRouters as $router) {
-                    if ($router instanceof RequestContextAwareInterface) {
-                        $router->setContext($context);
-                    }
-                }
-            }
-        }
-
-        return $this->sortedRouters;
-    }
-
-    /**
-     * Sort routers by priority.
-     * The highest priority number is the highest priority (reverse sorting)
-     *
-     * @return RouterInterface[]
-     */
-    protected function sortRouters()
-    {
-        $sortedRouters = array();
-        krsort($this->routers);
-
-        foreach ($this->routers as $routers) {
-            $sortedRouters = array_merge($sortedRouters, $routers);
-        }
-
-        return $sortedRouters;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Loops through all routes and tries to match the passed url.
-     *
-     * Note: You should use matchRequest if you can.
-     */
-    public function match($url)
-    {
-        return $this->doMatch($url);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Loops through all routes and tries to match the passed request.
-     */
-    public function matchRequest(Request $request)
-    {
-        return $this->doMatch($request->getPathInfo(), $request);
-    }
-
-    /**
-     * Loops through all routers and tries to match the passed request or url.
-     *
-     * At least the  url must be provided, if a request is additionally provided
-     * the request takes precedence.
-     *
-     * @param string  $url
-     * @param Request $request
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If no router matched.
-     */
-    private function doMatch($url, Request $request = null)
-    {
-        $methodNotAllowed = null;
-
-        $requestForMatching = $request;
-        foreach ($this->all() as $router) {
-            try {
-                // the request/url match logic is the same as in Symfony/Component/HttpKernel/EventListener/RouterListener.php
-                // matching requests is more powerful than matching URLs only, so try that first
-                if ($router instanceof RequestMatcherInterface) {
-                    if (empty($requestForMatching)) {
-                        $requestForMatching = Request::create($url);
-                    }
-
-                    return $router->matchRequest($requestForMatching);
-                }
-                // every router implements the match method
-                return $router->match($url);
-            } catch (ResourceNotFoundException $e) {
-                if ($this->logger) {
-                    $this->logger->debug('Router '.get_class($router).' was not able to match, message "'.$e->getMessage().'"');
-                }
-                // Needs special care
-            } catch (MethodNotAllowedException $e) {
-                if ($this->logger) {
-                    $this->logger->debug('Router '.get_class($router).' throws MethodNotAllowedException with message "'.$e->getMessage().'"');
-                }
-                $methodNotAllowed = $e;
-            }
-        }
-
-        $info = $request
-            ? "this request\n$request"
-            : "url '$url'";
-        throw $methodNotAllowed ?: new ResourceNotFoundException("None of the routers in the chain matched $info");
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Loops through all registered routers and returns a router if one is found.
-     * It will always return the first route generated.
-     */
-    public function generate($name, $parameters = array(), $absolute = false)
-    {
-        $debug = array();
-
-        foreach ($this->all() as $router) {
-            // if $router does not announce it is capable of handling
-            // non-string routes and $name is not a string, continue
-            if ($name && !is_string($name) && !$router instanceof VersatileGeneratorInterface) {
-                continue;
-            }
-
-            // If $router is versatile and doesn't support this route name, continue
-            if ($router instanceof VersatileGeneratorInterface && !$router->supports($name)) {
-                continue;
-            }
-
-            try {
-                return $router->generate($name, $parameters, $absolute);
-            } catch (RouteNotFoundException $e) {
-                $hint = $this->getErrorMessage($name, $router, $parameters);
-                $debug[] = $hint;
-                if ($this->logger) {
-                    $this->logger->debug('Router '.get_class($router)." was unable to generate route. Reason: '$hint': ".$e->getMessage());
-                }
-            }
-        }
-
-        if ($debug) {
-            $debug = array_unique($debug);
-            $info = implode(', ', $debug);
-        } else {
-            $info = $this->getErrorMessage($name);
-        }
-
-        throw new RouteNotFoundException(sprintf('None of the chained routers were able to generate route: %s', $info));
-    }
-
-    private function getErrorMessage($name, $router = null, $parameters = null)
-    {
-        if ($router instanceof VersatileGeneratorInterface) {
-            $displayName = $router->getRouteDebugMessage($name, $parameters);
-        } elseif (is_object($name)) {
-            $displayName = method_exists($name, '__toString')
-                ? (string) $name
-                : get_class($name)
-            ;
-        } else {
-            $displayName = (string) $name;
-        }
-
-        return "Route '$displayName' not found";
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContext(RequestContext $context)
-    {
-        foreach ($this->all() as $router) {
-            if ($router instanceof RequestContextAwareInterface) {
-                $router->setContext($context);
-            }
-        }
-
-        $this->context = $context;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * check for each contained router if it can warmup
-     */
-    public function warmUp($cacheDir)
-    {
-        foreach ($this->all() as $router) {
-            if ($router instanceof WarmableInterface) {
-                $router->warmUp($cacheDir);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRouteCollection()
-    {
-        if (!$this->routeCollection instanceof RouteCollection) {
-            $this->routeCollection = new ChainRouteCollection();
-            foreach ($this->all() as $router) {
-                $this->routeCollection->addCollection($router->getRouteCollection());
-            }
-        }
-
-        return $this->routeCollection;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/ChainRouterInterface.php b/vendor/symfony-cmf/routing/ChainRouterInterface.php
deleted file mode 100644
index 9a7a003..0000000
--- a/vendor/symfony-cmf/routing/ChainRouterInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-
-/**
- * Interface for a router that proxies routing to other routers.
- *
- * @author Daniel Wehner <dawehner@googlemail.com>
- */
-interface ChainRouterInterface extends RouterInterface, RequestMatcherInterface
-{
-    /**
-     * Add a Router to the index.
-     *
-     * @param RouterInterface $router   The router instance. Instead of RouterInterface, may also
-     *                                  be RequestMatcherInterface and UrlGeneratorInterface.
-     * @param integer         $priority The priority
-     */
-    public function add($router, $priority = 0);
-
-    /**
-     * Sorts the routers and flattens them.
-     *
-     * @return RouterInterface[] or RequestMatcherInterface and UrlGeneratorInterface.
-     */
-    public function all();
-}
diff --git a/vendor/symfony-cmf/routing/ChainedRouterInterface.php b/vendor/symfony-cmf/routing/ChainedRouterInterface.php
deleted file mode 100644
index a4ece6c..0000000
--- a/vendor/symfony-cmf/routing/ChainedRouterInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\RouterInterface;
-
-/**
- * Interface to combine the VersatileGeneratorInterface with the RouterInterface.
- */
-interface ChainedRouterInterface extends RouterInterface, VersatileGeneratorInterface
-{
-}
diff --git a/vendor/symfony-cmf/routing/ContentAwareGenerator.php b/vendor/symfony-cmf/routing/ContentAwareGenerator.php
deleted file mode 100644
index 91643eb..0000000
--- a/vendor/symfony-cmf/routing/ContentAwareGenerator.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Doctrine\Common\Collections\Collection;
-use Symfony\Component\Routing\Route as SymfonyRoute;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * A generator that tries to generate routes from object, route names or
- * content objects or names.
- *
- * @author Philippo de Santis
- * @author David Buchmann
- * @author Uwe Jäger
- */
-class ContentAwareGenerator extends ProviderBasedGenerator
-{
-    /**
-     * The locale to use when neither the parameters nor the request context
-     * indicate the locale to use.
-     *
-     * @var string
-     */
-    protected $defaultLocale = null;
-
-    /**
-     * The content repository used to find content by it's id
-     * This can be used to specify a parameter content_id when generating urls
-     *
-     * This is optional and might not be initialized.
-     *
-     * @var  ContentRepositoryInterface
-     */
-    protected $contentRepository;
-
-    /**
-     * Set an optional content repository to find content by ids
-     *
-     * @param ContentRepositoryInterface $contentRepository
-     */
-    public function setContentRepository(ContentRepositoryInterface $contentRepository)
-    {
-        $this->contentRepository = $contentRepository;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param string $name       ignored.
-     * @param array  $parameters must either contain the field 'route' with a
-     *                           RouteObjectInterface or the field 'content_id'
-     *                           with the id of a document implementing
-     *                           RouteReferrersReadInterface.
-     *
-     * @throws RouteNotFoundException If there is no such route in the database
-     */
-    public function generate($name, $parameters = array(), $absolute = false)
-    {
-        if ($name instanceof SymfonyRoute) {
-            $route = $this->getBestLocaleRoute($name, $parameters);
-        } elseif (is_string($name) && $name) {
-            $route = $this->getRouteByName($name, $parameters);
-        } else {
-            $route = $this->getRouteByContent($name, $parameters);
-        }
-
-        if (! $route instanceof SymfonyRoute) {
-            $hint = is_object($route) ? get_class($route) : gettype($route);
-            throw new RouteNotFoundException('Route of this document is not an instance of Symfony\Component\Routing\Route but: '.$hint);
-        }
-
-        $this->unsetLocaleIfNotNeeded($route, $parameters);
-
-        return parent::generate($route, $parameters, $absolute);
-    }
-
-    /**
-     * Get the route by a string name
-     *
-     * @param string $route
-     * @param array  $parameters
-     *
-     * @return SymfonyRoute
-     *
-     * @throws RouteNotFoundException if there is no route found for the provided name
-     */
-    protected function getRouteByName($name, array $parameters)
-    {
-        $route = $this->provider->getRouteByName($name);
-        if (empty($route)) {
-            throw new RouteNotFoundException('No route found for name: ' . $name);
-        }
-
-        return $this->getBestLocaleRoute($route, $parameters);
-    }
-
-    /**
-     * Determine if there is a route with matching locale associated with the
-     * given route via associated content.
-     *
-     * @param SymfonyRoute $route
-     * @param array        $parameters
-     *
-     * @return SymfonyRoute either the passed route or an alternative with better locale
-     */
-    protected function getBestLocaleRoute(SymfonyRoute $route, $parameters)
-    {
-        if (! $route instanceof RouteObjectInterface) {
-            // this route has no content, we can't get the alternatives
-            return $route;
-        }
-        $locale = $this->getLocale($parameters);
-        if (! $this->checkLocaleRequirement($route, $locale)) {
-            $content = $route->getContent();
-            if ($content instanceof RouteReferrersReadInterface) {
-                $routes = $content->getRoutes();
-                $contentRoute = $this->getRouteByLocale($routes, $locale);
-                if ($contentRoute) {
-                    return $contentRoute;
-                }
-            }
-        }
-
-        return $route;
-    }
-
-    /**
-     * Get the route based on the $name that is an object implementing
-     * RouteReferrersReadInterface or a content found in the content repository
-     * with the content_id specified in parameters that is an instance of
-     * RouteReferrersReadInterface.
-     *
-     * Called in generate when there is no route given in the parameters.
-     *
-     * If there is more than one route for the content, tries to find the
-     * first one that matches the _locale (provided in $parameters or otherwise
-     * defaulting to the request locale).
-     *
-     * If no route with matching locale is found, falls back to just return the
-     * first route.
-     *
-     * @param mixed $name
-     * @param array $parameters which should contain a content field containing
-     *                          a RouteReferrersReadInterface object
-     *
-     * @return SymfonyRoute the route instance
-     *
-     * @throws RouteNotFoundException if no route can be determined
-     */
-    protected function getRouteByContent($name, &$parameters)
-    {
-        if ($name instanceof RouteReferrersReadInterface) {
-            $content = $name;
-        } elseif (isset($parameters['content_id'])
-            && null !== $this->contentRepository
-        ) {
-            $content = $this->contentRepository->findById($parameters['content_id']);
-            if (empty($content)) {
-                throw new RouteNotFoundException('The content repository found nothing at id ' . $parameters['content_id']);
-            }
-            if (!$content instanceof RouteReferrersReadInterface) {
-                throw new RouteNotFoundException('Content repository did not return a RouteReferrersReadInterface instance for id ' . $parameters['content_id']);
-            }
-        } else {
-            $hint = is_object($name) ? get_class($name) : gettype($name);
-            throw new RouteNotFoundException("The route name argument '$hint' is not RouteReferrersReadInterface instance and there is no 'content_id' parameter");
-        }
-
-        $routes = $content->getRoutes();
-        if (empty($routes)) {
-            $hint = ($this->contentRepository && $this->contentRepository->getContentId($content))
-                ? $this->contentRepository->getContentId($content)
-                : get_class($content);
-            throw new RouteNotFoundException('Content document has no route: ' . $hint);
-        }
-
-        unset($parameters['content_id']);
-
-        $route = $this->getRouteByLocale($routes, $this->getLocale($parameters));
-        if ($route) {
-            return $route;
-        }
-
-        // if none matched, randomly return the first one
-        if ($routes instanceof Collection) {
-            return $routes->first();
-        }
-
-        return reset($routes);
-    }
-
-    /**
-     * @param RouteCollection $routes
-     * @param string          $locale
-     *
-     * @return bool|SymfonyRoute false if no route requirement matches the provided locale
-     */
-    protected function getRouteByLocale($routes, $locale)
-    {
-        foreach ($routes as $route) {
-            if (! $route instanceof SymfonyRoute) {
-                continue;
-            }
-
-            if ($this->checkLocaleRequirement($route, $locale)) {
-                return $route;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param SymfonyRoute $route
-     * @param string       $locale
-     *
-     * @return bool true if there is either no $locale, no _locale requirement
-     *              on the route or if the requirement and the passed $locale
-     *              match.
-     */
-    private function checkLocaleRequirement(SymfonyRoute $route, $locale)
-    {
-        return empty($locale)
-            || !$route->getRequirement('_locale')
-            || preg_match('/'.$route->getRequirement('_locale').'/', $locale)
-        ;
-    }
-
-    /**
-     * Determine the locale to be used with this request
-     *
-     * @param array $parameters the parameters determined by the route
-     *
-     * @return string the locale following of the parameters or any other
-     *                information the router has available. defaultLocale if no
-     *                other locale can be determined.
-     */
-    protected function getLocale($parameters)
-    {
-        if (isset($parameters['_locale'])) {
-            return $parameters['_locale'];
-        }
-
-        if ($this->getContext()->hasParameter('_locale')) {
-            return $this->getContext()->getParameter('_locale');
-        }
-
-        return $this->defaultLocale;
-    }
-
-    /**
-     * Overwrite the locale to be used by default if there is neither one in
-     * the parameters when building the route nor a request available (i.e. CLI).
-     *
-     * @param string $locale
-     */
-    public function setDefaultLocale($locale)
-    {
-        $this->defaultLocale = $locale;
-    }
-
-    /**
-     * We additionally support empty name and data in parameters and RouteAware content
-     */
-    public function supports($name)
-    {
-        return ! $name || parent::supports($name) || $name instanceof RouteReferrersReadInterface;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getRouteDebugMessage($name, array $parameters = array())
-    {
-        if (empty($name) && isset($parameters['content_id'])) {
-            return 'Content id ' . $parameters['content_id'];
-        }
-
-        if ($name instanceof RouteReferrersReadInterface) {
-            return 'Route aware content ' . parent::getRouteDebugMessage($name, $parameters);
-        }
-
-        return parent::getRouteDebugMessage($name, $parameters);
-    }
-
-    /**
-     * If the _locale parameter is allowed by the requirements of the route
-     * and it is the default locale, remove it from the parameters so that we
-     * do not get an unneeded ?_locale= query string.
-     *
-     * @param SymfonyRoute $route      The route being generated.
-     * @param array        $parameters The parameters used, will be modified to
-     *                                 remove the _locale field if needed.
-     */
-    protected function unsetLocaleIfNotNeeded(SymfonyRoute $route, array &$parameters)
-    {
-        $locale = $this->getLocale($parameters);
-        if (null !== $locale) {
-            if (preg_match('/'.$route->getRequirement('_locale').'/', $locale)
-                && $locale == $route->getDefault('_locale')
-            ) {
-                $compiledRoute = $route->compile();
-                if (!in_array('_locale', $compiledRoute->getVariables())) {
-                    unset($parameters['_locale']);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/ContentRepositoryInterface.php b/vendor/symfony-cmf/routing/ContentRepositoryInterface.php
deleted file mode 100644
index 31aea58..0000000
--- a/vendor/symfony-cmf/routing/ContentRepositoryInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-/**
- * Interface used by the DynamicRouter to retrieve content by it's id when
- * generating routes from content-id.
- *
- * This can be easily implemented using i.e. the Doctrine PHPCR-ODM
- * DocumentManager.
- *
- * @author Uwe Jäger
- */
-interface ContentRepositoryInterface
-{
-    /**
-     * Return a content object by it's id or null if there is none.
-     *
-     * If the returned content implements RouteReferrersReadInterface, it will
-     * be used to get the route from it to generate an URL.
-     *
-     * @param string $id id of the content object
-     *
-     * @return object A content that matches this id.
-     */
-    public function findById($id);
-
-    /**
-     * Return the content identifier for the provided content object for
-     * debugging purposes.
-     *
-     * @param object $content A content instance
-     *
-     * @return string|null $id id of the content object or null if unable to determine an id
-     */
-    public function getContentId($content);
-}
diff --git a/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRouteEnhancersPass.php b/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRouteEnhancersPass.php
deleted file mode 100644
index 0c24224..0000000
--- a/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRouteEnhancersPass.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * This compiler pass adds additional route enhancers
- * to the dynamic router.
- *
- * @author Daniel Leech <dan.t.leech@gmail.com>
- * @author Nathaniel Catchpole (catch)
- */
-class RegisterRouteEnhancersPass implements CompilerPassInterface
-{
-    /**
-     * @var string
-     */
-    protected $dynamicRouterService;
-
-    protected $enhancerTag;
-
-    public function __construct($dynamicRouterService = 'cmf_routing.dynamic_router', $enhancerTag = 'dynamic_router_route_enhancer')
-    {
-        $this->dynamicRouterService = $dynamicRouterService;
-        $this->enhancerTag = $enhancerTag;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->dynamicRouterService)) {
-            return;
-        }
-
-        $router = $container->getDefinition($this->dynamicRouterService);
-
-        foreach ($container->findTaggedServiceIds($this->enhancerTag) as $id => $attributes) {
-            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
-            $router->addMethodCall('addRouteEnhancer', array(new Reference($id), $priority));
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRoutersPass.php b/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRoutersPass.php
deleted file mode 100644
index 2d83765..0000000
--- a/vendor/symfony-cmf/routing/DependencyInjection/Compiler/RegisterRoutersPass.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Compiler pass to register routers to the ChainRouter.
- *
- * @author Wouter J <waldio.webdesign@gmail.com>
- * @author Henrik Bjornskov <henrik@bjrnskov.dk>
- * @author Magnus Nordlander <magnus@e-butik.se>
- */
-class RegisterRoutersPass implements CompilerPassInterface
-{
-    /**
-     * @var string
-     */
-    protected $chainRouterService;
-
-    protected $routerTag;
-
-    public function __construct($chainRouterService = 'cmf_routing.router', $routerTag = 'router')
-    {
-        $this->chainRouterService = $chainRouterService;
-        $this->routerTag = $routerTag;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->chainRouterService)) {
-            return;
-        }
-
-        $definition = $container->getDefinition($this->chainRouterService);
-
-        foreach ($container->findTaggedServiceIds($this->routerTag) as $id => $attributes) {
-            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
-
-            $definition->addMethodCall('add', array(new Reference($id), $priority));
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/DynamicRouter.php b/vendor/symfony-cmf/routing/DynamicRouter.php
deleted file mode 100644
index 944a94b..0000000
--- a/vendor/symfony-cmf/routing/DynamicRouter.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
-use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Cmf\Component\Routing\Event\Events;
-use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
-
-/**
- * A flexible router accepting matcher and generator through injection and
- * using the RouteEnhancer concept to generate additional data on the routes.
- *
- * @author Larry Garfield
- * @author David Buchmann
- */
-class DynamicRouter implements RouterInterface, RequestMatcherInterface, ChainedRouterInterface
-{
-    /**
-     * @var RequestMatcherInterface|UrlMatcherInterface
-     */
-    protected $matcher;
-
-    /**
-     * @var UrlGeneratorInterface
-     */
-    protected $generator;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var RouteEnhancerInterface[]
-     */
-    protected $enhancers = array();
-
-    /**
-     * Cached sorted list of enhancers
-     *
-     * @var RouteEnhancerInterface[]
-     */
-    protected $sortedEnhancers = array();
-
-    /**
-     * The regexp pattern that needs to be matched before a dynamic lookup is made
-     *
-     * @var string
-     */
-    protected $uriFilterRegexp;
-
-    /**
-     * @var RequestContext
-     */
-    protected $context;
-
-    /**
-     * @var RouteCollection
-     */
-    private $routeCollection;
-
-    /**
-     * @param RequestContext                              $context
-     * @param RequestMatcherInterface|UrlMatcherInterface $matcher
-     * @param UrlGeneratorInterface                       $generator
-     * @param string                                      $uriFilterRegexp
-     * @param EventDispatcherInterface|null               $eventDispatcher
-     * @param RouteProviderInterface                      $provider
-     */
-    public function __construct(RequestContext $context,
-                                $matcher,
-                                UrlGeneratorInterface $generator,
-                                $uriFilterRegexp = '',
-                                EventDispatcherInterface $eventDispatcher = null,
-                                RouteProviderInterface $provider = null
-    ) {
-        $this->context = $context;
-        if (! $matcher instanceof RequestMatcherInterface && ! $matcher instanceof UrlMatcherInterface) {
-            throw new \InvalidArgumentException('Matcher must implement either Symfony\Component\Routing\Matcher\RequestMatcherInterface or Symfony\Component\Routing\Matcher\UrlMatcherInterface');
-        }
-        $this->matcher = $matcher;
-        $this->generator = $generator;
-        $this->eventDispatcher = $eventDispatcher;
-        $this->uriFilterRegexp = $uriFilterRegexp;
-        $this->provider = $provider;
-
-        $this->generator->setContext($context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getRouteCollection()
-    {
-        if (!$this->routeCollection instanceof RouteCollection) {
-            $this->routeCollection = $this->provider
-                ? new LazyRouteCollection($this->provider) : new RouteCollection();
-        }
-
-        return $this->routeCollection;
-    }
-
-    /**
-     * @return RequestMatcherInterface|UrlMatcherInterface
-     */
-    public function getMatcher()
-    {
-        /* we may not set the context in DynamicRouter::setContext as this
-         * would lead to symfony cache warmup problems.
-         * a request matcher does not need the request context separately as it
-         * can get it from the request.
-         */
-        if ($this->matcher instanceof RequestContextAwareInterface) {
-            $this->matcher->setContext($this->getContext());
-        }
-
-        return $this->matcher;
-    }
-
-    /**
-     * @return UrlGeneratorInterface
-     */
-    public function getGenerator()
-    {
-        $this->generator->setContext($this->getContext());
-
-        return $this->generator;
-    }
-
-    /**
-     * Generates a URL from the given parameters.
-     *
-     * If the generator is not able to generate the url, it must throw the
-     * RouteNotFoundException as documented below.
-     *
-     * @param string  $name       The name of the route
-     * @param mixed   $parameters An array of parameters
-     * @param Boolean $absolute   Whether to generate an absolute URL
-     *
-     * @return string The generated URL
-     *
-     * @throws RouteNotFoundException if route doesn't exist
-     *
-     * @api
-     */
-    public function generate($name, $parameters = array(), $absolute = false)
-    {
-        return $this->getGenerator()->generate($name, $parameters, $absolute);
-    }
-
-    /**
-     * Delegate to our generator
-     *
-     * {@inheritDoc}
-     */
-    public function supports($name)
-    {
-        if ($this->generator instanceof VersatileGeneratorInterface) {
-            return $this->generator->supports($name);
-        }
-
-        return is_string($name);
-    }
-
-    /**
-     * Tries to match a URL path with a set of routes.
-     *
-     * If the matcher can not find information, it must throw one of the
-     * exceptions documented below.
-     *
-     * @param string $pathinfo The path info to be parsed (raw format, i.e. not
-     *                         urldecoded)
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If the resource could not be found
-     * @throws MethodNotAllowedException If the resource was found but the
-     *                                   request method is not allowed
-     *
-     * @deprecated Use matchRequest exclusively to avoid problems. This method will be removed in version 2.0
-     * @api
-     */
-    public function match($pathinfo)
-    {
-        $request = Request::create($pathinfo);
-        if ($this->eventDispatcher) {
-            $event = new RouterMatchEvent();
-            $this->eventDispatcher->dispatch(Events::PRE_DYNAMIC_MATCH, $event);
-        }
-
-        if (! empty($this->uriFilterRegexp) && ! preg_match($this->uriFilterRegexp, $pathinfo)) {
-            throw new ResourceNotFoundException("$pathinfo does not match the '{$this->uriFilterRegexp}' pattern");
-        }
-
-        $matcher = $this->getMatcher();
-        if (! $matcher instanceof UrlMatcherInterface) {
-            throw new \InvalidArgumentException('Wrong matcher type, you need to call matchRequest');
-        }
-
-        $defaults = $matcher->match($pathinfo);
-
-        return $this->applyRouteEnhancers($defaults, $request);
-    }
-
-    /**
-     * Tries to match a request with a set of routes and returns the array of
-     * information for that route.
-     *
-     * If the matcher can not find information, it must throw one of the
-     * exceptions documented below.
-     *
-     * @param Request $request The request to match
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If no matching resource could be found
-     * @throws MethodNotAllowedException If a matching resource was found but
-     *                                   the request method is not allowed
-     */
-    public function matchRequest(Request $request)
-    {
-        if ($this->eventDispatcher) {
-            $event = new RouterMatchEvent($request);
-            $this->eventDispatcher->dispatch(Events::PRE_DYNAMIC_MATCH_REQUEST, $event);
-        }
-
-        if (! empty($this->uriFilterRegexp)
-            && ! preg_match($this->uriFilterRegexp, $request->getPathInfo())
-        ) {
-            throw new ResourceNotFoundException("{$request->getPathInfo()} does not match the '{$this->uriFilterRegexp}' pattern");
-        }
-
-        $matcher = $this->getMatcher();
-        if ($matcher instanceof UrlMatcherInterface) {
-            $defaults = $matcher->match($request->getPathInfo());
-        } else {
-            $defaults = $matcher->matchRequest($request);
-        }
-
-        return $this->applyRouteEnhancers($defaults, $request);
-    }
-
-    /**
-     * Apply the route enhancers to the defaults, according to priorities
-     *
-     * @param array   $defaults
-     * @param Request $request
-     *
-     * @return array
-     */
-    protected function applyRouteEnhancers($defaults, Request $request)
-    {
-        foreach ($this->getRouteEnhancers() as $enhancer) {
-            $defaults = $enhancer->enhance($defaults, $request);
-        }
-
-        return $defaults;
-    }
-
-    /**
-     * Add route enhancers to the router to let them generate information on
-     * matched routes.
-     *
-     * The order of the enhancers is determined by the priority, the higher the
-     * value, the earlier the enhancer is run.
-     *
-     * @param RouteEnhancerInterface $enhancer
-     * @param int                    $priority
-     */
-    public function addRouteEnhancer(RouteEnhancerInterface $enhancer, $priority = 0)
-    {
-        if (empty($this->enhancers[$priority])) {
-            $this->enhancers[$priority] = array();
-        }
-
-        $this->enhancers[$priority][] = $enhancer;
-        $this->sortedEnhancers = array();
-
-        return $this;
-    }
-
-    /**
-     * Sorts the enhancers and flattens them.
-     *
-     * @return RouteEnhancerInterface[] the enhancers ordered by priority
-     */
-    public function getRouteEnhancers()
-    {
-        if (empty($this->sortedEnhancers)) {
-            $this->sortedEnhancers = $this->sortRouteEnhancers();
-        }
-
-        return $this->sortedEnhancers;
-    }
-
-    /**
-     * Sort enhancers by priority.
-     *
-     * The highest priority number is the highest priority (reverse sorting).
-     *
-     * @return RouteEnhancerInterface[] the sorted enhancers
-     */
-    protected function sortRouteEnhancers()
-    {
-        $sortedEnhancers = array();
-        krsort($this->enhancers);
-
-        foreach ($this->enhancers as $enhancers) {
-            $sortedEnhancers = array_merge($sortedEnhancers, $enhancers);
-        }
-
-        return $sortedEnhancers;
-    }
-
-    /**
-     * Sets the request context.
-     *
-     * @param RequestContext $context The context
-     *
-     * @api
-     */
-    public function setContext(RequestContext $context)
-    {
-        $this->context = $context;
-    }
-
-    /**
-     * Gets the request context.
-     *
-     * @return RequestContext The context
-     *
-     * @api
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Forwards to the generator.
-     */
-    public function getRouteDebugMessage($name, array $parameters = array())
-    {
-        if ($this->generator instanceof VersatileGeneratorInterface) {
-            return $this->generator->getRouteDebugMessage($name, $parameters);
-        }
-
-        return "Route '$name' not found";
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Enhancer/FieldByClassEnhancer.php b/vendor/symfony-cmf/routing/Enhancer/FieldByClassEnhancer.php
deleted file mode 100644
index f88b348..0000000
--- a/vendor/symfony-cmf/routing/Enhancer/FieldByClassEnhancer.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Enhancer;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * This enhancer sets a field if not yet existing from the class of an object
- * in another field.
- *
- * The comparison is done with instanceof to support proxy classes and such.
- *
- * Only works with RouteObjectInterface routes that can return a referenced
- * content.
- *
- * @author David Buchmann
- */
-class FieldByClassEnhancer implements RouteEnhancerInterface
-{
-    /**
-     * @var string field for the source class
-     */
-    protected $source;
-    /**
-     * @var string field to write hashmap lookup result into
-     */
-    protected $target;
-    /**
-     * @var array containing the mapping between a class name and the target value
-     */
-    protected $map;
-
-    /**
-     * @param string $source the field name of the class
-     * @param string $target the field name to set from the map
-     * @param array  $map    the map of class names to field values
-     */
-    public function __construct($source, $target, $map)
-    {
-        $this->source = $source;
-        $this->target = $target;
-        $this->map = $map;
-    }
-
-    /**
-     * If the source field is instance of one of the entries in the map,
-     * target is set to the value of that map entry.
-     *
-     * {@inheritDoc}
-     */
-    public function enhance(array $defaults, Request $request)
-    {
-        if (isset($defaults[$this->target])) {
-            // no need to do anything
-            return $defaults;
-        }
-
-        if (! isset($defaults[$this->source])) {
-            return $defaults;
-        }
-
-        // we need to loop over the array and do instanceof in case the content
-        // class extends the specified class
-        // i.e. phpcr-odm generates proxy class for the content.
-        foreach ($this->map as $class => $value) {
-            if ($defaults[$this->source] instanceof $class) {
-                // found a matching entry in the map
-                $defaults[$this->target] = $value;
-
-                return $defaults;
-            }
-        }
-
-        return $defaults;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Enhancer/FieldMapEnhancer.php b/vendor/symfony-cmf/routing/Enhancer/FieldMapEnhancer.php
deleted file mode 100644
index 91adc66..0000000
--- a/vendor/symfony-cmf/routing/Enhancer/FieldMapEnhancer.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Enhancer;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * This enhancer can fill one field with the result of a hashmap lookup of
- * another field. If the target field is already set, it does nothing.
- *
- * @author David Buchmann
- */
-class FieldMapEnhancer implements RouteEnhancerInterface
-{
-    /**
-     * @var string field for key in hashmap lookup
-     */
-    protected $source;
-    /**
-     * @var string field to write hashmap lookup result into
-     */
-    protected $target;
-    /**
-     * @var array containing the mapping between the source field value and target field value
-     */
-    protected $hashmap;
-
-    /**
-     * @param string $source  the field to read
-     * @param string $target  the field to write the result of the lookup into
-     * @param array  $hashmap for looking up value from source and get value for target
-     */
-    public function __construct($source, $target, array $hashmap)
-    {
-        $this->source = $source;
-        $this->target = $target;
-        $this->hashmap = $hashmap;
-    }
-
-    /**
-     * If the target field is not set but the source field is, map the field
-     *
-     * {@inheritDoc}
-     */
-    public function enhance(array $defaults, Request $request)
-    {
-        if (isset($defaults[$this->target])) {
-            return $defaults;
-        }
-        if (! isset($defaults[$this->source])) {
-            return $defaults;
-        }
-        if (! isset($this->hashmap[$defaults[$this->source]])) {
-            return $defaults;
-        }
-
-        $defaults[$this->target] = $this->hashmap[$defaults[$this->source]];
-
-        return $defaults;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Enhancer/FieldPresenceEnhancer.php b/vendor/symfony-cmf/routing/Enhancer/FieldPresenceEnhancer.php
deleted file mode 100644
index d2e35ad..0000000
--- a/vendor/symfony-cmf/routing/Enhancer/FieldPresenceEnhancer.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Enhancer;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * This enhancer sets a field to a fixed value. You can specify a source field
- * name to only set the target field if the source is present.
- *
- * @author David Buchmann
- */
-class FieldPresenceEnhancer implements RouteEnhancerInterface
-{
-    /**
-     * Field name for the source field that must exist. If null, the target
-     * field is always set if not already present.
-     *
-     * @var string|null
-     */
-    protected $source;
-
-    /**
-     * Field name to write the value into.
-     *
-     * @var string
-     */
-    protected $target;
-
-    /**
-     * Value to set the target field to.
-     *
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @param null|string $source the field name of the class, null to disable the check
-     * @param string      $target the field name to set from the map
-     * @param string      $value  value to set target field to if source field exists
-     */
-    public function __construct($source, $target, $value)
-    {
-        $this->source = $source;
-        $this->target = $target;
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function enhance(array $defaults, Request $request)
-    {
-        if (isset($defaults[$this->target])) {
-            // no need to do anything
-            return $defaults;
-        }
-
-        if (null !== $this->source && !isset($defaults[$this->source])) {
-            return $defaults;
-        }
-
-        $defaults[$this->target] = $this->value;
-
-        return $defaults;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Enhancer/RouteContentEnhancer.php b/vendor/symfony-cmf/routing/Enhancer/RouteContentEnhancer.php
deleted file mode 100644
index af63dfc..0000000
--- a/vendor/symfony-cmf/routing/Enhancer/RouteContentEnhancer.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Enhancer;
-
-use Symfony\Component\HttpFoundation\Request;
-
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-
-/**
- * This enhancer sets the content to target field if the route provides content.
- *
- * Only works with RouteObjectInterface routes that can return a referenced
- * content.
- *
- * @author David Buchmann
- */
-class RouteContentEnhancer implements RouteEnhancerInterface
-{
-    /**
-     * @var string field for the route class
-     */
-    protected $routefield;
-    /**
-     * @var string field to write hashmap lookup result into
-     */
-    protected $target;
-
-    /**
-     * @param string $routefield the field name of the route class
-     * @param string $target     the field name to set from the map
-     * @param array  $hashmap    the map of class names to field values
-     */
-    public function __construct($routefield, $target)
-    {
-        $this->routefield = $routefield;
-        $this->target = $target;
-    }
-
-    /**
-     * If the route has a non-null content and if that content class is in the
-     * injected map, returns that controller.
-     *
-     * {@inheritDoc}
-     */
-    public function enhance(array $defaults, Request $request)
-    {
-        if (isset($defaults[$this->target])) {
-            // no need to do anything
-            return $defaults;
-        }
-
-        if (! isset($defaults[$this->routefield])
-            || ! $defaults[$this->routefield] instanceof RouteObjectInterface
-        ) {
-            // we can't determine the content
-            return $defaults;
-        }
-        /** @var $route RouteObjectInterface */
-        $route = $defaults[$this->routefield];
-
-        $content = $route->getContent();
-        if (! $content) {
-            // we have no content
-            return $defaults;
-        }
-        $defaults[$this->target] = $content;
-
-        return $defaults;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/Enhancer/RouteEnhancerInterface.php b/vendor/symfony-cmf/routing/Enhancer/RouteEnhancerInterface.php
deleted file mode 100644
index 85a77c5..0000000
--- a/vendor/symfony-cmf/routing/Enhancer/RouteEnhancerInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Enhancer;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * A route enhancer can change the values in the route data arrays
- *
- * This is useful to provide information to the rest of the routing system
- * that can be inferred from other parameters rather than hardcode that
- * information in every route.
- *
- * @author David Buchmann
- */
-interface RouteEnhancerInterface
-{
-    /**
-     * Update the defaults based on its own data and the request.
-     *
-     * @param array   $defaults the getRouteDefaults array.
-     * @param Request $request  the Request instance.
-     *
-     * @return array the modified defaults. Each enhancer MUST return the
-     *               $defaults but may add or remove values.
-     */
-    public function enhance(array $defaults, Request $request);
-}
diff --git a/vendor/symfony-cmf/routing/Event/Events.php b/vendor/symfony-cmf/routing/Event/Events.php
deleted file mode 100644
index 95c0326..0000000
--- a/vendor/symfony-cmf/routing/Event/Events.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Event;
-
-final class Events
-{
-    /**
-     * Fired before a path is matched in \Symfony\Cmf\Component\Routing\DynamicRouter#match
-     *
-     * The event object is RouteMatchEvent.
-     */
-    const PRE_DYNAMIC_MATCH = 'cmf_routing.pre_dynamic_match';
-
-    /**
-     * Fired before a Request is matched in \Symfony\Cmf\Component\Routing\DynamicRouter#match
-     *
-     * The event object is RouteMatchEvent.
-     */
-    const PRE_DYNAMIC_MATCH_REQUEST = 'cmf_routing.pre_dynamic_match_request';
-}
diff --git a/vendor/symfony-cmf/routing/Event/RouterMatchEvent.php b/vendor/symfony-cmf/routing/Event/RouterMatchEvent.php
deleted file mode 100644
index 7125972..0000000
--- a/vendor/symfony-cmf/routing/Event/RouterMatchEvent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\Event;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpFoundation\Request;
-
-class RouterMatchEvent extends Event
-{
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @param Request $request
-     */
-    public function __construct(Request $request = null)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * @return Request | null
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/LICENSE b/vendor/symfony-cmf/routing/LICENSE
deleted file mode 100644
index b068dfb..0000000
--- a/vendor/symfony-cmf/routing/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Routing
-
-    The MIT License
-
-    Copyright (c) 2011-2014 Symfony2 CMF
-
-    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/vendor/symfony-cmf/routing/LazyRouteCollection.php b/vendor/symfony-cmf/routing/LazyRouteCollection.php
deleted file mode 100644
index 4011f9a..0000000
--- a/vendor/symfony-cmf/routing/LazyRouteCollection.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-
-class LazyRouteCollection extends RouteCollection
-{
-    /**
-     * The route provider for this generator.
-     *
-     * @var RouteProviderInterface
-     */
-    protected $provider;
-
-    public function __construct(RouteProviderInterface $provider)
-    {
-        $this->provider = $provider;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->all());
-    }
-
-    /**
-     * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
-     */
-    public function count()
-    {
-        return count($this->all());
-    }
-
-    /**
-     * Returns all routes in this collection.
-     *
-     * @return Route[] An array of routes
-     */
-    public function all()
-    {
-        return $this->provider->getRoutesByNames(null);
-    }
-
-    /**
-     * Gets a route by name.
-     *
-     * @param string $name The route name
-     *
-     * @return Route|null A Route instance or null when not found
-     */
-    public function get($name)
-    {
-        try {
-            return $this->provider->getRouteByName($name);
-        } catch (RouteNotFoundException $e) {
-            return null;
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/NestedMatcher/FinalMatcherInterface.php b/vendor/symfony-cmf/routing/NestedMatcher/FinalMatcherInterface.php
deleted file mode 100644
index 77cd649..0000000
--- a/vendor/symfony-cmf/routing/NestedMatcher/FinalMatcherInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\NestedMatcher;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-
-/**
- * A FinalMatcher returns only one route from a collection of candidate routes.
- *
- * @author Larry Garfield
- * @author David Buchmann
- */
-interface FinalMatcherInterface
-{
-    /**
-    * Matches a request against a route collection and returns exactly one result.
-    *
-    * @param RouteCollection $collection The collection against which to match.
-    * @param Request $request The request to match.
-    *
-    * @return array An array of parameters
-    *
-    * @throws ResourceNotFoundException if none of the routes in $collection
-    *    matches $request
-    */
-    public function finalMatch(RouteCollection $collection, Request $request);
-}
diff --git a/vendor/symfony-cmf/routing/NestedMatcher/NestedMatcher.php b/vendor/symfony-cmf/routing/NestedMatcher/NestedMatcher.php
deleted file mode 100644
index c136e1f..0000000
--- a/vendor/symfony-cmf/routing/NestedMatcher/NestedMatcher.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\NestedMatcher;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Cmf\Component\Routing\RouteProviderInterface;
-
-/**
- * A more flexible approach to matching. The route collection to match against
- * can be dynamically determined based on the request and users can inject
- * their own filters or use a custom final matching strategy.
- *
- * The nested matcher splits matching into three configurable steps:
- *
- * 1) Get potential matches from a RouteProviderInterface
- * 2) Apply any RouteFilterInterface to reduce the route collection
- * 3) Have FinalMatcherInterface select the best match of the remaining routes
- *
- * @author Larry Garfield
- * @author David Buchmann
- */
-class NestedMatcher implements RequestMatcherInterface
-{
-    /**
-     * The route provider responsible for the first-pass match.
-     *
-     * @var RouteProviderInterface
-     */
-    protected $routeProvider;
-
-    /**
-     * The final matcher.
-     *
-     * @var FinalMatcherInterface
-     */
-    protected $finalMatcher;
-
-    /**
-     * An array of RouteFilterInterface objects.
-     *
-     * @var RouteFilterInterface[]
-     */
-    protected $filters = array();
-
-    /**
-     * Array of RouteFilterInterface objects, sorted.
-     *
-     * @var RouteFilterInterface[]
-     */
-    protected $sortedFilters = array();
-
-    /**
-     * Constructs a new NestedMatcher
-     *
-     * @param RouteProviderInterface $provider The route provider this matcher
-     *                                         should use
-     * @param FinalMatcherInterface  $final    The Final Matcher to match the
-     *                                         routes
-     */
-    public function __construct(
-        RouteProviderInterface $provider = null,
-        FinalMatcherInterface $final = null
-    ) {
-        if (null !== $provider) {
-            $this->setRouteProvider($provider);
-        }
-        if (null !== $final) {
-            $this->setFinalMatcher($final);
-        }
-    }
-
-    /**
-     * Sets the route provider for the matching plan.
-     *
-     * @param RouteProviderInterface $provider A source of routes.
-     *
-     * @return NestedMatcher this object to have a fluent interface
-     */
-    public function setRouteProvider(RouteProviderInterface $provider)
-    {
-        $this->routeProvider = $provider;
-
-        return $this;
-    }
-
-    /**
-     * Adds a partial matcher to the matching plan.
-     *
-     * Partial matchers will be run in the order in which they are added.
-     *
-     * @param RouteFilterInterface $filter
-     * @param int                  $priority (optional) The priority of the
-     *                                       filter. Higher number filters will
-     *                                       be used first. Defaults to 0.
-     *
-     * @return NestedMatcher this object to have a fluent interface
-     */
-    public function addRouteFilter(RouteFilterInterface $filter, $priority = 0)
-    {
-        if (empty($this->filters[$priority])) {
-            $this->filters[$priority] = array();
-        }
-
-        $this->filters[$priority][] = $filter;
-        $this->sortedFilters = array();
-
-        return $this;
-    }
-
-    /**
-     * Sets the final matcher for the matching plan.
-     *
-     * @param FinalMatcherInterface $final The final matcher that will have to
-     *                                     pick the route that will be used.
-     *
-     * @return NestedMatcher this object to have a fluent interface
-     */
-    public function setFinalMatcher(FinalMatcherInterface $final)
-    {
-        $this->finalMatcher = $final;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function matchRequest(Request $request)
-    {
-        $collection = $this->routeProvider->getRouteCollectionForRequest($request);
-        if (!count($collection)) {
-            throw new ResourceNotFoundException();
-        }
-
-        // Route filters are expected to throw an exception themselves if they
-        // end up filtering the list down to 0.
-        foreach ($this->getRouteFilters() as $filter) {
-            $collection = $filter->filter($collection, $request);
-        }
-
-        $attributes = $this->finalMatcher->finalMatch($collection, $request);
-
-        return $attributes;
-    }
-
-    /**
-     * Sorts the filters and flattens them.
-     *
-     * @return RouteFilterInterface[] the filters ordered by priority
-     */
-    public function getRouteFilters()
-    {
-        if (empty($this->sortedFilters)) {
-           $this->sortedFilters = $this->sortFilters();
-        }
-
-        return $this->sortedFilters;
-    }
-
-    /**
-     * Sort filters by priority.
-     *
-     * The highest priority number is the highest priority (reverse sorting).
-     *
-     * @return RouteFilterInterface[] the sorted filters
-     */
-    protected function sortFilters()
-    {
-        $sortedFilters = array();
-        krsort($this->filters);
-
-        foreach ($this->filters as $filters) {
-            $sortedFilters = array_merge($sortedFilters, $filters);
-        }
-
-        return $sortedFilters;
-    }
-}
diff --git a/vendor/symfony-cmf/routing/NestedMatcher/RouteFilterInterface.php b/vendor/symfony-cmf/routing/NestedMatcher/RouteFilterInterface.php
deleted file mode 100644
index 15ff74d..0000000
--- a/vendor/symfony-cmf/routing/NestedMatcher/RouteFilterInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\NestedMatcher;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * A RouteFilter takes a RouteCollection and returns a filtered subset.
- *
- * It is not implemented as a filter iterator because we want to allow
- * router filters to handle their own empty-case handling, usually by throwing
- * an appropriate exception if no routes match the object's rules.
- *
- * @author Larry Garfield
- * @author David Buchmann
- */
-interface RouteFilterInterface
-{
-    /**
-     * Filters the route collection against a request and returns all matching
-     * routes.
-     *
-     * @param RouteCollection $collection The collection against which to match.
-     * @param Request         $request    A Request object against which to match.
-     *
-     * @return RouteCollection A non-empty RouteCollection of matched routes.
-     *
-     * @throws ResourceNotFoundException if none of the routes in $collection
-     *                                   matches $request. This is a performance
-     *                                   optimization to not continue the match
-     *                                   process when a match will no longer be
-     *                                   possible.
-     */
-    public function filter(RouteCollection $collection, Request $request);
-}
diff --git a/vendor/symfony-cmf/routing/NestedMatcher/UrlMatcher.php b/vendor/symfony-cmf/routing/NestedMatcher/UrlMatcher.php
deleted file mode 100644
index 8986d5b..0000000
--- a/vendor/symfony-cmf/routing/NestedMatcher/UrlMatcher.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing\NestedMatcher;
-
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Matcher\UrlMatcher as SymfonyUrlMatcher;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RequestContext;
-
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
-
-/**
- * Extended UrlMatcher to provide an additional interface and enhanced features.
- *
- * This class requires Symfony 2.2 for a refactoring done to the symfony UrlMatcher
- *
- * @author Larry Garfield
- */
-class UrlMatcher extends SymfonyUrlMatcher implements FinalMatcherInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function finalMatch(RouteCollection $collection, Request $request)
-    {
-        $this->routes = $collection;
-        $context = new RequestContext();
-        $context->fromRequest($request);
-        $this->setContext($context);
-
-        return $this->match($request->getPathInfo());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getAttributes(Route $route, $name, array $attributes)
-    {
-        if ($route instanceof RouteObjectInterface && is_string($route->getRouteKey())) {
-            $name = $route->getRouteKey();
-        }
-        $attributes[RouteObjectInterface::ROUTE_NAME] = $name;
-        $attributes[RouteObjectInterface::ROUTE_OBJECT] = $route;
-
-        return $this->mergeDefaults($attributes, $route->getDefaults());
-    }
-}
diff --git a/vendor/symfony-cmf/routing/PagedRouteCollection.php b/vendor/symfony-cmf/routing/PagedRouteCollection.php
deleted file mode 100644
index dba573e..0000000
--- a/vendor/symfony-cmf/routing/PagedRouteCollection.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-/**
- * Provides a route collection which avoids having all routes in memory.
- *
- * Internally, this does load multiple routes over time using a
- * PagedRouteProviderInterface $route_provider.
- */
-class PagedRouteCollection implements \Iterator, \Countable
-{
-    /**
-     * @var PagedRouteProviderInterface
-     */
-    protected $provider;
-
-    /**
-     * Stores the amount of routes which are loaded in parallel and kept in
-     * memory.
-     *
-     * @var int
-     */
-    protected $routesBatchSize;
-
-    /**
-     * Contains the current item the iterator points to.
-     *
-     * @var int
-     */
-    protected $current = -1;
-
-    /**
-     * Stores the current loaded routes.
-     *
-     * @var \Symfony\Component\Routing\Route[]
-     */
-    protected $currentRoutes;
-
-    public function __construct(PagedRouteProviderInterface $pagedRouteProvider, $routesBatchSize = 50)
-    {
-        $this->provider = $pagedRouteProvider;
-        $this->routesBatchSize = $routesBatchSize;
-    }
-
-    /**
-     * Loads the next routes into the elements array.
-     *
-     * @param int $offset The offset used in the db query.
-     */
-    protected function loadNextElements($offset)
-    {
-        // If the last batch was smaller than the batch size, this means there
-        // are no more routes available.
-        if (isset($this->currentRoutes) && count($this->currentRoutes) < $this->routesBatchSize) {
-            $this->currentRoutes = array();
-        } else {
-            $this->currentRoutes = $this->provider->getRoutesPaged($offset, $this->routesBatchSize);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function current()
-    {
-        return current($this->currentRoutes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function next()
-    {
-        $result = next($this->currentRoutes);
-        if (false === $result) {
-            $this->loadNextElements($this->current + 1);
-        }
-        $this->current++;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function key()
-    {
-        return key($this->currentRoutes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function valid()
-    {
-        return key($this->currentRoutes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rewind()
-    {
-        $this->current = 0;
-        $this->currentRoutes = NULL;
-        $this->loadNextElements($this->current);
-    }
-
-    /**
-     * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
-     */
-    public function count()
-    {
-        return $this->provider->getRoutesCount();
-    }
-}
diff --git a/vendor/symfony-cmf/routing/PagedRouteProviderInterface.php b/vendor/symfony-cmf/routing/PagedRouteProviderInterface.php
deleted file mode 100644
index 970ec78..0000000
--- a/vendor/symfony-cmf/routing/PagedRouteProviderInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-/**
- * Interface for a provider which allows to retrieve a limited amount of routes.
- */
-interface PagedRouteProviderInterface extends RouteProviderInterface
-{
-    /**
-     * Find an amount of routes with an offset and possible a limit.
-     *
-     * In case you want to iterate over all routes, you want to avoid to load
-     * all routes at once.
-     *
-     * @param int $offset
-     *   The sequence will start with that offset in the list of all routes.
-     * @param int $length [optional]
-     *   The sequence will have that many routes in it. If no length is
-     *   specified all routes are returned.
-     *
-     * @return \Symfony\Component\Routing\Route[]
-     *   Routes keyed by the route name.
-     */
-    public function getRoutesPaged($offset, $length = null);
-
-    /**
-     * Determines the total amount of routes.
-     *
-     * @return int
-     */
-    public function getRoutesCount();
-}
diff --git a/vendor/symfony-cmf/routing/ProviderBasedGenerator.php b/vendor/symfony-cmf/routing/ProviderBasedGenerator.php
deleted file mode 100644
index 2696781..0000000
--- a/vendor/symfony-cmf/routing/ProviderBasedGenerator.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\Generator\UrlGenerator;
-use Symfony\Component\Routing\Route as SymfonyRoute;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-
-use Psr\Log\LoggerInterface;
-
-/**
- * A Generator that uses a RouteProvider rather than a RouteCollection
- *
- * @author Larry Garfield
- */
-class ProviderBasedGenerator extends UrlGenerator implements VersatileGeneratorInterface
-{
-    /**
-     * The route provider for this generator.
-     *
-     * @var RouteProviderInterface
-     */
-    protected $provider;
-
-    /**
-     * @param RouteProviderInterface $provider
-     * @param LoggerInterface        $logger
-     */
-    public function __construct(RouteProviderInterface $provider, LoggerInterface $logger = null)
-    {
-        $this->provider = $provider;
-        $this->logger = $logger;
-        $this->context = new RequestContext();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function generate($name, $parameters = array(), $absolute = false)
-    {
-        if ($name instanceof SymfonyRoute) {
-            $route = $name;
-        } elseif (null === $route = $this->provider->getRouteByName($name, $parameters)) {
-            throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name));
-        }
-
-        // the Route has a cache of its own and is not recompiled as long as it does not get modified
-        $compiledRoute = $route->compile();
-        $hostTokens = $compiledRoute->getHostTokens();
-
-        $debug_message = $this->getRouteDebugMessage($name);
-
-        return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $debug_message, $absolute, $hostTokens);
-    }
-
-    /**
-     * Support a route object and any string as route name
-     *
-     * {@inheritDoc}
-     */
-    public function supports($name)
-    {
-        return is_string($name) || $name instanceof SymfonyRoute;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getRouteDebugMessage($name, array $parameters = array())
-    {
-        if (is_scalar($name)) {
-            return $name;
-        }
-
-        if (is_array($name)) {
-            return serialize($name);
-        }
-
-        if ($name instanceof RouteObjectInterface) {
-            return 'Route with key ' . $name->getRouteKey();
-        }
-
-        if ($name instanceof SymfonyRoute) {
-            return 'Route with pattern ' . $name->getPattern();
-        }
-
-        return get_class($name);
-    }
-
-}
diff --git a/vendor/symfony-cmf/routing/README.md b/vendor/symfony-cmf/routing/README.md
deleted file mode 100644
index 2a18ed1..0000000
--- a/vendor/symfony-cmf/routing/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Symfony CMF Routing Component
-
-[![Build Status](https://secure.travis-ci.org/symfony-cmf/Routing.png?branch=master)](http://travis-ci.org/symfony-cmf/Routing)
-[![Latest Stable Version](https://poser.pugx.org/symfony-cmf/routing/version.png)](https://packagist.org/packages/symfony-cmf/routing)
-[![Total Downloads](https://poser.pugx.org/symfony-cmf/routing/d/total.png)](https://packagist.org/packages/symfony-cmf/routing)
-
-The Symfony CMF Routing component extends the Symfony2 core routing component.
-It provides:
-
- * A ChainRouter to run several routers in parallel
- * A DynamicRouter that can load routes from any database and can generate
-   additional information in the route match.
-
-Even though it has Symfony in its name, the Routing component does not need the
-full Symfony2 Framework and can be used in standalone projects.
-
-For Symfony 2 projects, an optional
-[RoutingBundle](https://github.com/symfony-cmf/RoutingBundle)
-is also available.
-
-This library is provided by the [Symfony Content Management Framework (CMF) project](http://cmf.symfony.com/)
-and licensed under the [MIT License](LICENSE).
-
-
-## Requirements
-
-* The Symfony Routing component (>= 2.2.0)
-* See also the `require` section of [composer.json](composer.json)
-
-
-## Documentation
-
-For the install guide and reference, see:
-
-* [Routing component documentation](http://symfony.com/doc/master/cmf/components/routing/index.html)
-
-See also:
-
-* [All Symfony CMF documentation](http://symfony.com/doc/master/cmf/index.html) - complete Symfony CMF reference
-* [Symfony CMF Website](http://cmf.symfony.com/) - introduction, live demo, support and community links
-
-
-## Contributing
-
-Pull requests are welcome. Please see our
-[CONTRIBUTING](https://github.com/symfony-cmf/symfony-cmf/blob/master/CONTRIBUTING.md)
-guide.
-
-Unit and/or functional tests exist for this component. See the
-[Testing documentation](http://symfony.com/doc/master/cmf/components/testing.html)
-for a guide to running the tests.
-
-Thanks to
-[everyone who has contributed](https://github.com/symfony-cmf/Routing/contributors) already.
diff --git a/vendor/symfony-cmf/routing/RedirectRouteInterface.php b/vendor/symfony-cmf/routing/RedirectRouteInterface.php
deleted file mode 100644
index daa45d0..0000000
--- a/vendor/symfony-cmf/routing/RedirectRouteInterface.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-/**
- * Document for redirection entries with the RedirectController.
- *
- * Defines additional methods needed by the RedirectController to redirect
- * based on the route.
- *
- * This document may define (in order of precedence - the others can be empty):
- *
- * - uri: an absolute uri
- * - routeName and routeParameters: to be used with the standard symfony router
- *   or a route entry in the routeParameters for the DynamicRouter. Precedency
- *   between these is determined by the order of the routers in the chain
- *   router.
- *
- * With standard Symfony routing, you can just use uri / routeName and a
- * hashmap of parameters.
- *
- * For the dynamic router, you can return a RouteInterface instance in the
- * field 'route' of the parameters.
- *
- * Note: getRedirectContent must return the redirect route itself for the
- * integration with DynamicRouter to work.
- *
- * @author David Buchmann <david@liip.ch>
- */
-interface RedirectRouteInterface extends RouteObjectInterface
-{
-    /**
-     * Get the absolute uri to redirect to external domains.
-     *
-     * If this is non-empty, the other methods won't be used.
-     *
-     * @return string target absolute uri
-     */
-    public function getUri();
-
-    /**
-     * Get the target route document this route redirects to.
-     *
-     * If non-null, it is added as route into the parameters, which will lead
-     * to have the generate call issued by the RedirectController to have
-     * the target route in the parameters.
-     *
-     * @return RouteObjectInterface the route this redirection points to
-     */
-    public function getRouteTarget();
-
-    /**
-     * Get the name of the target route for working with the symfony standard
-     * router.
-     *
-     * @return string target route name
-     */
-    public function getRouteName();
-
-    /**
-     * Whether this should be a permanent or temporary redirect
-     *
-     * @return boolean
-     */
-    public function isPermanent();
-
-    /**
-     * Get the parameters for the target route router::generate()
-     *
-     * Note that for the DynamicRouter, you return the target route
-     * document as field 'route' of the hashmap.
-     *
-     * @return array Information to build the route
-     */
-    public function getParameters();
-}
diff --git a/vendor/symfony-cmf/routing/RouteObjectInterface.php b/vendor/symfony-cmf/routing/RouteObjectInterface.php
deleted file mode 100644
index 2476dee..0000000
--- a/vendor/symfony-cmf/routing/RouteObjectInterface.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-/**
- * Classes for entries in the routing table may implement this interface in
- * addition to extending Symfony\Component\Routing\Route.
- *
- * If they do, the DynamicRouter will request the route content and put it into
- * the RouteObjectInterface::CONTENT_OBJECT field. The DynamicRouter will also
- * request getRouteKey and this will be used instead of the symfony core compatible
- * route name and can contain any characters.
- *
- * Some fields in defaults have a special meaning in the getDefaults(). In addition
- * to the constants defined in this class, _locale and _controller are also used.
- */
-interface RouteObjectInterface
-{
-    /**
-     * Field name that will hold the route name that was matched.
-     */
-    const ROUTE_NAME = '_route';
-
-    /**
-     * Field name of the route object that was matched.
-     */
-    const ROUTE_OBJECT = '_route_object';
-
-    /**
-     * Field name for an explicit controller name to be used with this route
-     */
-    const CONTROLLER_NAME = '_controller';
-
-    /**
-     * Field name for an explicit template to be used with this route.
-     * i.e. CmfContentBundle:StaticContent:index.html.twig
-     */
-    const TEMPLATE_NAME = '_template';
-
-    /**
-     * Field name for the content of the current route, if any.
-     */
-    const CONTENT_OBJECT = '_content';
-
-    /**
-     * Get the content document this route entry stands for. If non-null,
-     * the ControllerClassMapper uses it to identify a controller and
-     * the content is passed to the controller.
-     *
-     * If there is no specific content for this url (i.e. its an "application"
-     * page), may return null.
-     *
-     * @return object the document or entity this route entry points to
-     */
-    public function getContent();
-
-    /**
-     * Get the route key.
-     *
-     * This key will be used as route name instead of the symfony core compatible
-     * route name and can contain any characters.
-     *
-     * Return null if you want to use the default key.
-     *
-     * @return string the route name
-     */
-    public function getRouteKey();
-}
diff --git a/vendor/symfony-cmf/routing/RouteProviderInterface.php b/vendor/symfony-cmf/routing/RouteProviderInterface.php
deleted file mode 100644
index 6283e6f..0000000
--- a/vendor/symfony-cmf/routing/RouteProviderInterface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Interface for the route provider the DynamicRouter is using.
- *
- * Typically this could be a doctrine orm or odm repository, but you can
- * implement something else if you need to.
- */
-interface RouteProviderInterface
-{
-    /**
-     * Finds routes that may potentially match the request.
-     *
-     * This may return a mixed list of class instances, but all routes returned
-     * must extend the core symfony route. The classes may also implement
-     * RouteObjectInterface to link to a content document.
-     *
-     * This method may not throw an exception based on implementation specific
-     * restrictions on the url. That case is considered a not found - returning
-     * an empty array. Exceptions are only used to abort the whole request in
-     * case something is seriously broken, like the storage backend being down.
-     *
-     * Note that implementations may not implement an optimal matching
-     * algorithm, simply a reasonable first pass.  That allows for potentially
-     * very large route sets to be filtered down to likely candidates, which
-     * may then be filtered in memory more completely.
-     *
-     * @param Request $request A request against which to match.
-     *
-     * @return RouteCollection with all Routes that could potentially match
-     *                         $request. Empty collection if nothing can match.
-     */
-    public function getRouteCollectionForRequest(Request $request);
-
-    /**
-     * Find the route using the provided route name.
-     *
-     * @param string $name The route name to fetch.
-     *
-     * @return Route
-     *
-     * @throws RouteNotFoundException If there is no route with that name in
-     *                                this repository
-     */
-    public function getRouteByName($name);
-
-    /**
-     * Find many routes by their names using the provided list of names.
-     *
-     * Note that this method may not throw an exception if some of the routes
-     * are not found or are not actually Route instances. It will just return the
-     * list of those Route instances it found.
-     *
-     * This method exists in order to allow performance optimizations. The
-     * simple implementation could be to just repeatedly call
-     * $this->getRouteByName() while catching and ignoring eventual exceptions.
-     *
-     * If $names is null, this method SHOULD return a collection of all routes
-     * known to this provider. If there are many routes to be expected, usage of
-     * a lazy loading collection is recommended. A provider MAY only return a
-     * subset of routes to e.g. support paging or other concepts, but be aware
-     * that the DynamicRouter will only call this method once per
-     * DynamicRouter::getRouteCollection() call.
-     *
-     * @param array|null $names The list of names to retrieve, In case of null,
-     *                          the provider will determine what routes to return.
-     *
-     * @return Route[] Iterable list with the keys being the names from the
- *                     $names array.
-     */
-    public function getRoutesByNames($names);
-}
diff --git a/vendor/symfony-cmf/routing/RouteReferrersInterface.php b/vendor/symfony-cmf/routing/RouteReferrersInterface.php
deleted file mode 100644
index 1c13cb6..0000000
--- a/vendor/symfony-cmf/routing/RouteReferrersInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Interface to be implemented by content that exposes editable route
- * referrers.
- */
-interface RouteReferrersInterface extends RouteReferrersReadInterface
-{
-    /**
-     * Add a route to the collection.
-     *
-     * @param Route $route
-     */
-    public function addRoute($route);
-
-    /**
-     * Remove a route from the collection.
-     *
-     * @param Route $route
-     */
-    public function removeRoute($route);
-}
diff --git a/vendor/symfony-cmf/routing/RouteReferrersReadInterface.php b/vendor/symfony-cmf/routing/RouteReferrersReadInterface.php
deleted file mode 100644
index d81b435..0000000
--- a/vendor/symfony-cmf/routing/RouteReferrersReadInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Interface to be implemented by content that wants to be support route generation
- * from content with the DynamicRouter by providing the routes that point to it.
- */
-interface RouteReferrersReadInterface
-{
-    /**
-     * Get the routes that point to this content.
-     *
-     * @return Route[] Route instances that point to this content
-     */
-    public function getRoutes();
-}
diff --git a/vendor/symfony-cmf/routing/VersatileGeneratorInterface.php b/vendor/symfony-cmf/routing/VersatileGeneratorInterface.php
deleted file mode 100644
index d58ab7a..0000000
--- a/vendor/symfony-cmf/routing/VersatileGeneratorInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2014 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Cmf\Component\Routing;
-
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-
-/**
- * This generator is able to handle more than string route names as symfony
- * core supports them.
- */
-interface VersatileGeneratorInterface extends UrlGeneratorInterface
-{
-    /**
-     * Whether this generator supports the supplied $name.
-     *
-     * This check does not need to look if the specific instance can be
-     * resolved to a route, only whether the router can generate routes from
-     * objects of this class.
-     *
-     * @param mixed $name The route "name" which may also be an object or anything
-     *
-     * @return bool
-     */
-    public function supports($name);
-
-    /**
-     * Convert a route identifier (name, content object etc) into a string
-     * usable for logging and other debug/error messages
-     *
-     * @param mixed $name
-     * @param array $parameters which should contain a content field containing
-     *                          a RouteReferrersReadInterface object
-     *
-     * @return string
-     */
-    public function getRouteDebugMessage($name, array $parameters = array());
-}
diff --git a/vendor/symfony-cmf/routing/composer.json b/vendor/symfony-cmf/routing/composer.json
deleted file mode 100644
index 8594e38..0000000
--- a/vendor/symfony-cmf/routing/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "symfony-cmf/routing",
-    "type": "library",
-    "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
-    "keywords": ["routing", "database"],
-    "homepage": "http://cmf.symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Symfony CMF Community",
-            "homepage": "https://github.com/symfony-cmf/Routing/contributors"
-        }
-    ],
-    "minimum-stability": "dev",
-    "require": {
-        "php": ">=5.3.3",
-        "symfony/routing": "~2.2",
-        "symfony/http-kernel": "~2.2",
-        "psr/log": "~1.0"
-    },
-    "require-dev": {
-        "symfony/dependency-injection": "~2.0@stable",
-        "symfony/config": "~2.2",
-        "symfony/event-dispatcher": "~2.1"
-    },
-    "suggest": {
-        "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "Symfony\\Cmf\\Component\\Routing\\": ""
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev"
-        }
-    }
-}
diff --git a/vendor/symfony-cmf/routing/phpunit.xml.dist b/vendor/symfony-cmf/routing/phpunit.xml.dist
deleted file mode 100644
index 2564ef1..0000000
--- a/vendor/symfony-cmf/routing/phpunit.xml.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-    colors="true"
-    bootstrap="Tests/bootstrap.php"
->
-
-    <testsuites>
-        <testsuite name="Symfony Cmf Routing Test Suite">
-            <directory>./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>.</directory>
-            <exclude>
-                <directory>Test/</directory>
-                <directory>Tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/vendor/symfony/browser-kit/.gitignore b/vendor/symfony/browser-kit/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/browser-kit/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/browser-kit/CHANGELOG.md b/vendor/symfony/browser-kit/CHANGELOG.md
deleted file mode 100644
index d2b1074..0000000
--- a/vendor/symfony/browser-kit/CHANGELOG.md
+++ /dev/null
@@ -1,18 +0,0 @@
-CHANGELOG
-=========
-
-2.3.0
------
-
- * [BC BREAK] `Client::followRedirect()` won't redirect responses with
-   a non-3xx Status Code and `Location` header anymore, as per 
-   http://tools.ietf.org/html/rfc2616#section-14.30
-
- * added `Client::getInternalRequest()` and `Client::getInternalResponse()` to
-   have access to the BrowserKit internal request and response objects
-
-2.1.0
------
-
- * [BC BREAK] The CookieJar internals have changed to allow cookies with the
-   same name on different sub-domains/sub-paths
diff --git a/vendor/symfony/browser-kit/Client.php b/vendor/symfony/browser-kit/Client.php
deleted file mode 100644
index a7eaed8..0000000
--- a/vendor/symfony/browser-kit/Client.php
+++ /dev/null
@@ -1,578 +0,0 @@
-<?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\Component\BrowserKit;
-
-use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\DomCrawler\Link;
-use Symfony\Component\DomCrawler\Form;
-use Symfony\Component\Process\PhpProcess;
-
-/**
- * Client simulates a browser.
- *
- * To make the actual request, you need to implement the doRequest() method.
- *
- * If you want to be able to run requests in their own process (insulated flag),
- * you need to also implement the getScript() method.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Client
-{
-    protected $history;
-    protected $cookieJar;
-    protected $server = array();
-    protected $internalRequest;
-    protected $request;
-    protected $internalResponse;
-    protected $response;
-    protected $crawler;
-    protected $insulated = false;
-    protected $redirect;
-    protected $followRedirects = true;
-
-    private $maxRedirects = -1;
-    private $redirectCount = 0;
-    private $isMainRequest = true;
-
-    /**
-     * Constructor.
-     *
-     * @param array     $server    The server parameters (equivalent of $_SERVER)
-     * @param History   $history   A History instance to store the browser history
-     * @param CookieJar $cookieJar A CookieJar instance to store the cookies
-     */
-    public function __construct(array $server = array(), History $history = null, CookieJar $cookieJar = null)
-    {
-        $this->setServerParameters($server);
-        $this->history = $history ?: new History();
-        $this->cookieJar = $cookieJar ?: new CookieJar();
-    }
-
-    /**
-     * Sets whether to automatically follow redirects or not.
-     *
-     * @param bool $followRedirect Whether to follow redirects
-     */
-    public function followRedirects($followRedirect = true)
-    {
-        $this->followRedirects = (bool) $followRedirect;
-    }
-
-    /**
-     * Sets the maximum number of requests that crawler can follow.
-     *
-     * @param int $maxRedirects
-     */
-    public function setMaxRedirects($maxRedirects)
-    {
-        $this->maxRedirects = $maxRedirects < 0 ? -1 : $maxRedirects;
-        $this->followRedirects = -1 != $this->maxRedirects;
-    }
-
-    /**
-     * Sets the insulated flag.
-     *
-     * @param bool $insulated Whether to insulate the requests or not
-     *
-     * @throws \RuntimeException When Symfony Process Component is not installed
-     */
-    public function insulate($insulated = true)
-    {
-        if ($insulated && !class_exists('Symfony\\Component\\Process\\Process')) {
-            throw new \RuntimeException('Unable to isolate requests as the Symfony Process Component is not installed.');
-        }
-
-        $this->insulated = (bool) $insulated;
-    }
-
-    /**
-     * Sets server parameters.
-     *
-     * @param array $server An array of server parameters
-     */
-    public function setServerParameters(array $server)
-    {
-        $this->server = array_merge(array(
-            'HTTP_HOST' => 'localhost',
-            'HTTP_USER_AGENT' => 'Symfony2 BrowserKit',
-        ), $server);
-    }
-
-    /**
-     * Sets single server parameter.
-     *
-     * @param string $key   A key of the parameter
-     * @param string $value A value of the parameter
-     */
-    public function setServerParameter($key, $value)
-    {
-        $this->server[$key] = $value;
-    }
-
-    /**
-     * Gets single server parameter for specified key.
-     *
-     * @param string $key     A key of the parameter to get
-     * @param string $default A default value when key is undefined
-     *
-     * @return string A value of the parameter
-     */
-    public function getServerParameter($key, $default = '')
-    {
-        return (isset($this->server[$key])) ? $this->server[$key] : $default;
-    }
-
-    /**
-     * Returns the History instance.
-     *
-     * @return History A History instance
-     */
-    public function getHistory()
-    {
-        return $this->history;
-    }
-
-    /**
-     * Returns the CookieJar instance.
-     *
-     * @return CookieJar A CookieJar instance
-     */
-    public function getCookieJar()
-    {
-        return $this->cookieJar;
-    }
-
-    /**
-     * Returns the current Crawler instance.
-     *
-     * @return Crawler|null A Crawler instance
-     */
-    public function getCrawler()
-    {
-        return $this->crawler;
-    }
-
-    /**
-     * Returns the current BrowserKit Response instance.
-     *
-     * @return Response|null A BrowserKit Response instance
-     */
-    public function getInternalResponse()
-    {
-        return $this->internalResponse;
-    }
-
-    /**
-     * Returns the current origin response instance.
-     *
-     * The origin response is the response instance that is returned
-     * by the code that handles requests.
-     *
-     * @return object|null A response instance
-     *
-     * @see doRequest()
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Returns the current BrowserKit Request instance.
-     *
-     * @return Request|null A BrowserKit Request instance
-     */
-    public function getInternalRequest()
-    {
-        return $this->internalRequest;
-    }
-
-    /**
-     * Returns the current origin Request instance.
-     *
-     * The origin request is the request instance that is sent
-     * to the code that handles requests.
-     *
-     * @return object|null A Request instance
-     *
-     * @see doRequest()
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Clicks on a given link.
-     *
-     * @param Link $link A Link instance
-     *
-     * @return Crawler
-     */
-    public function click(Link $link)
-    {
-        if ($link instanceof Form) {
-            return $this->submit($link);
-        }
-
-        return $this->request($link->getMethod(), $link->getUri());
-    }
-
-    /**
-     * Submits a form.
-     *
-     * @param Form  $form   A Form instance
-     * @param array $values An array of form field values
-     *
-     * @return Crawler
-     */
-    public function submit(Form $form, array $values = array())
-    {
-        $form->setValues($values);
-
-        return $this->request($form->getMethod(), $form->getUri(), $form->getPhpValues(), $form->getPhpFiles());
-    }
-
-    /**
-     * Calls a URI.
-     *
-     * @param string $method        The request method
-     * @param string $uri           The URI to fetch
-     * @param array  $parameters    The Request parameters
-     * @param array  $files         The files
-     * @param array  $server        The server parameters (HTTP headers are referenced with a HTTP_ prefix as PHP does)
-     * @param string $content       The raw body data
-     * @param bool   $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
-     *
-     * @return Crawler
-     */
-    public function request($method, $uri, array $parameters = array(), array $files = array(), array $server = array(), $content = null, $changeHistory = true)
-    {
-        if ($this->isMainRequest) {
-            $this->redirectCount = 0;
-        } else {
-            ++$this->redirectCount;
-        }
-
-        $uri = $this->getAbsoluteUri($uri);
-
-        if (!empty($server['HTTP_HOST'])) {
-            $uri = preg_replace('{^(https?\://)'.preg_quote($this->extractHost($uri)).'}', '${1}'.$server['HTTP_HOST'], $uri);
-        }
-
-        if (isset($server['HTTPS'])) {
-            $uri = preg_replace('{^'.parse_url($uri, PHP_URL_SCHEME).'}', $server['HTTPS'] ? 'https' : 'http', $uri);
-        }
-
-        $server = array_merge($this->server, $server);
-
-        if (!$this->history->isEmpty()) {
-            $server['HTTP_REFERER'] = $this->history->current()->getUri();
-        }
-
-        $server['HTTP_HOST'] = $this->extractHost($uri);
-        $server['HTTPS'] = 'https' == parse_url($uri, PHP_URL_SCHEME);
-
-        $this->internalRequest = new Request($uri, $method, $parameters, $files, $this->cookieJar->allValues($uri), $server, $content);
-
-        $this->request = $this->filterRequest($this->internalRequest);
-
-        if (true === $changeHistory) {
-            $this->history->add($this->internalRequest);
-        }
-
-        if ($this->insulated) {
-            $this->response = $this->doRequestInProcess($this->request);
-        } else {
-            $this->response = $this->doRequest($this->request);
-        }
-
-        $this->internalResponse = $this->filterResponse($this->response);
-
-        $this->cookieJar->updateFromResponse($this->internalResponse, $uri);
-
-        $status = $this->internalResponse->getStatus();
-
-        if ($status >= 300 && $status < 400) {
-            $this->redirect = $this->internalResponse->getHeader('Location');
-        } else {
-            $this->redirect = null;
-        }
-
-        if ($this->followRedirects && $this->redirect) {
-            return $this->crawler = $this->followRedirect();
-        }
-
-        return $this->crawler = $this->createCrawlerFromContent($this->internalRequest->getUri(), $this->internalResponse->getContent(), $this->internalResponse->getHeader('Content-Type'));
-    }
-
-    /**
-     * Makes a request in another process.
-     *
-     * @param object $request An origin request instance
-     *
-     * @return object An origin response instance
-     *
-     * @throws \RuntimeException When processing returns exit code
-     */
-    protected function doRequestInProcess($request)
-    {
-        $process = new PhpProcess($this->getScript($request), null, null);
-        $process->run();
-
-        if (!$process->isSuccessful() || !preg_match('/^O\:\d+\:/', $process->getOutput())) {
-            throw new \RuntimeException(sprintf('OUTPUT: %s ERROR OUTPUT: %s', $process->getOutput(), $process->getErrorOutput()));
-        }
-
-        return unserialize($process->getOutput());
-    }
-
-    /**
-     * Makes a request.
-     *
-     * @param object $request An origin request instance
-     *
-     * @return object An origin response instance
-     */
-    abstract protected function doRequest($request);
-
-    /**
-     * Returns the script to execute when the request must be insulated.
-     *
-     * @param object $request An origin request instance
-     *
-     * @throws \LogicException When this abstract class is not implemented
-     */
-    protected function getScript($request)
-    {
-        throw new \LogicException('To insulate requests, you need to override the getScript() method.');
-    }
-
-    /**
-     * Filters the BrowserKit request to the origin one.
-     *
-     * @param Request $request The BrowserKit Request to filter
-     *
-     * @return object An origin request instance
-     */
-    protected function filterRequest(Request $request)
-    {
-        return $request;
-    }
-
-    /**
-     * Filters the origin response to the BrowserKit one.
-     *
-     * @param object $response The origin response to filter
-     *
-     * @return Response An BrowserKit Response instance
-     */
-    protected function filterResponse($response)
-    {
-        return $response;
-    }
-
-    /**
-     * Creates a crawler.
-     *
-     * This method returns null if the DomCrawler component is not available.
-     *
-     * @param string $uri     A URI
-     * @param string $content Content for the crawler to use
-     * @param string $type    Content type
-     *
-     * @return Crawler|null
-     */
-    protected function createCrawlerFromContent($uri, $content, $type)
-    {
-        if (!class_exists('Symfony\Component\DomCrawler\Crawler')) {
-            return;
-        }
-
-        $crawler = new Crawler(null, $uri);
-        $crawler->addContent($content, $type);
-
-        return $crawler;
-    }
-
-    /**
-     * Goes back in the browser history.
-     *
-     * @return Crawler
-     */
-    public function back()
-    {
-        return $this->requestFromRequest($this->history->back(), false);
-    }
-
-    /**
-     * Goes forward in the browser history.
-     *
-     * @return Crawler
-     */
-    public function forward()
-    {
-        return $this->requestFromRequest($this->history->forward(), false);
-    }
-
-    /**
-     * Reloads the current browser.
-     *
-     * @return Crawler
-     */
-    public function reload()
-    {
-        return $this->requestFromRequest($this->history->current(), false);
-    }
-
-    /**
-     * Follow redirects?
-     *
-     * @return Crawler
-     *
-     * @throws \LogicException If request was not a redirect
-     */
-    public function followRedirect()
-    {
-        if (empty($this->redirect)) {
-            throw new \LogicException('The request was not redirected.');
-        }
-
-        if (-1 !== $this->maxRedirects) {
-            if ($this->redirectCount > $this->maxRedirects) {
-                throw new \LogicException(sprintf('The maximum number (%d) of redirections was reached.', $this->maxRedirects));
-            }
-        }
-
-        $request = $this->internalRequest;
-
-        if (in_array($this->internalResponse->getStatus(), array(302, 303))) {
-            $method = 'get';
-            $files = array();
-            $content = null;
-        } else {
-            $method = $request->getMethod();
-            $files = $request->getFiles();
-            $content = $request->getContent();
-        }
-
-        if ('get' === strtolower($method)) {
-            // Don't forward parameters for GET request as it should reach the redirection URI
-            $parameters = array();
-        } else {
-            $parameters = $request->getParameters();
-        }
-
-        $server = $request->getServer();
-        $server = $this->updateServerFromUri($server, $this->redirect);
-
-        $this->isMainRequest = false;
-
-        $response = $this->request($method, $this->redirect, $parameters, $files, $server, $content);
-
-        $this->isMainRequest = true;
-
-        return $response;
-    }
-
-    /**
-     * Restarts the client.
-     *
-     * It flushes history and all cookies.
-     */
-    public function restart()
-    {
-        $this->cookieJar->clear();
-        $this->history->clear();
-    }
-
-    /**
-     * Takes a URI and converts it to absolute if it is not already absolute.
-     *
-     * @param string $uri A URI
-     *
-     * @return string An absolute URI
-     */
-    protected function getAbsoluteUri($uri)
-    {
-        // already absolute?
-        if (0 === strpos($uri, 'http://') || 0 === strpos($uri, 'https://')) {
-            return $uri;
-        }
-
-        if (!$this->history->isEmpty()) {
-            $currentUri = $this->history->current()->getUri();
-        } else {
-            $currentUri = sprintf('http%s://%s/',
-                isset($this->server['HTTPS']) ? 's' : '',
-                isset($this->server['HTTP_HOST']) ? $this->server['HTTP_HOST'] : 'localhost'
-            );
-        }
-
-        // protocol relative URL
-        if (0 === strpos($uri, '//')) {
-            return parse_url($currentUri, PHP_URL_SCHEME).':'.$uri;
-        }
-
-        // anchor?
-        if (!$uri || '#' == $uri[0]) {
-            return preg_replace('/#.*?$/', '', $currentUri).$uri;
-        }
-
-        if ('/' !== $uri[0]) {
-            $path = parse_url($currentUri, PHP_URL_PATH);
-
-            if ('/' !== substr($path, -1)) {
-                $path = substr($path, 0, strrpos($path, '/') + 1);
-            }
-
-            $uri = $path.$uri;
-        }
-
-        return preg_replace('#^(.*?//[^/]+)\/.*$#', '$1', $currentUri).$uri;
-    }
-
-    /**
-     * Makes a request from a Request object directly.
-     *
-     * @param Request $request       A Request instance
-     * @param bool    $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
-     *
-     * @return Crawler
-     */
-    protected function requestFromRequest(Request $request, $changeHistory = true)
-    {
-        return $this->request($request->getMethod(), $request->getUri(), $request->getParameters(), $request->getFiles(), $request->getServer(), $request->getContent(), $changeHistory);
-    }
-
-    private function updateServerFromUri($server, $uri)
-    {
-        $server['HTTP_HOST'] = $this->extractHost($uri);
-        $scheme = parse_url($uri, PHP_URL_SCHEME);
-        $server['HTTPS'] = null === $scheme ? $server['HTTPS'] : 'https' == $scheme;
-        unset($server['HTTP_IF_NONE_MATCH'], $server['HTTP_IF_MODIFIED_SINCE']);
-
-        return $server;
-    }
-
-    private function extractHost($uri)
-    {
-        $host = parse_url($uri, PHP_URL_HOST);
-
-        if ($port = parse_url($uri, PHP_URL_PORT)) {
-            return $host.':'.$port;
-        }
-
-        return $host;
-    }
-}
diff --git a/vendor/symfony/browser-kit/Cookie.php b/vendor/symfony/browser-kit/Cookie.php
deleted file mode 100644
index 604d12d..0000000
--- a/vendor/symfony/browser-kit/Cookie.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?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\Component\BrowserKit;
-
-/**
- * Cookie represents an HTTP cookie.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Cookie
-{
-    /**
-     * Handles dates as defined by RFC 2616 section 3.3.1, and also some other
-     * non-standard, but common formats.
-     *
-     * @var array
-     */
-    private static $dateFormats = array(
-        'D, d M Y H:i:s T',
-        'D, d-M-y H:i:s T',
-        'D, d-M-Y H:i:s T',
-        'D, d-m-y H:i:s T',
-        'D, d-m-Y H:i:s T',
-        'D M j G:i:s Y',
-        'D M d H:i:s Y T',
-    );
-
-    protected $name;
-    protected $value;
-    protected $expires;
-    protected $path;
-    protected $domain;
-    protected $secure;
-    protected $httponly;
-    protected $rawValue;
-
-    /**
-     * Sets a cookie.
-     *
-     * @param string $name         The cookie name
-     * @param string $value        The value of the cookie
-     * @param string $expires      The time the cookie expires
-     * @param string $path         The path on the server in which the cookie will be available on
-     * @param string $domain       The domain that the cookie is available
-     * @param bool   $secure       Indicates that the cookie should only be transmitted over a secure HTTPS connection from the client
-     * @param bool   $httponly     The cookie httponly flag
-     * @param bool   $encodedValue Whether the value is encoded or not
-     */
-    public function __construct($name, $value, $expires = null, $path = null, $domain = '', $secure = false, $httponly = true, $encodedValue = false)
-    {
-        if ($encodedValue) {
-            $this->value = urldecode($value);
-            $this->rawValue = $value;
-        } else {
-            $this->value = $value;
-            $this->rawValue = urlencode($value);
-        }
-        $this->name = $name;
-        $this->path = empty($path) ? '/' : $path;
-        $this->domain = $domain;
-        $this->secure = (bool) $secure;
-        $this->httponly = (bool) $httponly;
-
-        if (null !== $expires) {
-            $timestampAsDateTime = \DateTime::createFromFormat('U', $expires);
-            if (false === $timestampAsDateTime) {
-                throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires));
-            }
-
-            $this->expires = $timestampAsDateTime->getTimestamp();
-        }
-    }
-
-    /**
-     * Returns the HTTP representation of the Cookie.
-     *
-     * @return string The HTTP representation of the Cookie
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function __toString()
-    {
-        $cookie = sprintf('%s=%s', $this->name, $this->rawValue);
-
-        if (null !== $this->expires) {
-            $dateTime = \DateTime::createFromFormat('U', $this->expires, new \DateTimeZone('GMT'));
-            $cookie .= '; expires='.str_replace('+0000', '', $dateTime->format(self::$dateFormats[0]));
-        }
-
-        if ('' !== $this->domain) {
-            $cookie .= '; domain='.$this->domain;
-        }
-
-        if ($this->path) {
-            $cookie .= '; path='.$this->path;
-        }
-
-        if ($this->secure) {
-            $cookie .= '; secure';
-        }
-
-        if ($this->httponly) {
-            $cookie .= '; httponly';
-        }
-
-        return $cookie;
-    }
-
-    /**
-     * Creates a Cookie instance from a Set-Cookie header value.
-     *
-     * @param string $cookie A Set-Cookie header value
-     * @param string $url    The base URL
-     *
-     * @return Cookie A Cookie instance
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function fromString($cookie, $url = null)
-    {
-        $parts = explode(';', $cookie);
-
-        if (false === strpos($parts[0], '=')) {
-            throw new \InvalidArgumentException(sprintf('The cookie string "%s" is not valid.', $parts[0]));
-        }
-
-        list($name, $value) = explode('=', array_shift($parts), 2);
-
-        $values = array(
-            'name' => trim($name),
-            'value' => trim($value),
-            'expires' => null,
-            'path' => '/',
-            'domain' => '',
-            'secure' => false,
-            'httponly' => false,
-            'passedRawValue' => true,
-        );
-
-        if (null !== $url) {
-            if ((false === $urlParts = parse_url($url)) || !isset($urlParts['host'])) {
-                throw new \InvalidArgumentException(sprintf('The URL "%s" is not valid.', $url));
-            }
-
-            $values['domain'] = $urlParts['host'];
-            $values['path'] = isset($urlParts['path']) ? substr($urlParts['path'], 0, strrpos($urlParts['path'], '/')) : '';
-        }
-
-        foreach ($parts as $part) {
-            $part = trim($part);
-
-            if ('secure' === strtolower($part)) {
-                // Ignore the secure flag if the original URI is not given or is not HTTPS
-                if (!$url || !isset($urlParts['scheme']) || 'https' != $urlParts['scheme']) {
-                    continue;
-                }
-
-                $values['secure'] = true;
-
-                continue;
-            }
-
-            if ('httponly' === strtolower($part)) {
-                $values['httponly'] = true;
-
-                continue;
-            }
-
-            if (2 === count($elements = explode('=', $part, 2))) {
-                if ('expires' === strtolower($elements[0])) {
-                    $elements[1] = self::parseDate($elements[1]);
-                }
-
-                $values[strtolower($elements[0])] = $elements[1];
-            }
-        }
-
-        return new static(
-            $values['name'],
-            $values['value'],
-            $values['expires'],
-            $values['path'],
-            $values['domain'],
-            $values['secure'],
-            $values['httponly'],
-            $values['passedRawValue']
-        );
-    }
-
-    private static function parseDate($dateValue)
-    {
-        // trim single quotes around date if present
-        if (($length = strlen($dateValue)) > 1 && "'" === $dateValue[0] && "'" === $dateValue[$length - 1]) {
-            $dateValue = substr($dateValue, 1, -1);
-        }
-
-        foreach (self::$dateFormats as $dateFormat) {
-            if (false !== $date = \DateTime::createFromFormat($dateFormat, $dateValue, new \DateTimeZone('GMT'))) {
-                return $date->getTimestamp();
-            }
-        }
-
-        // attempt a fallback for unusual formatting
-        if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
-            return $date->getTimestamp();
-        }
-
-        throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));
-    }
-
-    /**
-     * Gets the name of the cookie.
-     *
-     * @return string The cookie name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the value of the cookie.
-     *
-     * @return string The cookie value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Gets the raw value of the cookie.
-     *
-     * @return string The cookie value
-     */
-    public function getRawValue()
-    {
-        return $this->rawValue;
-    }
-
-    /**
-     * Gets the expires time of the cookie.
-     *
-     * @return string The cookie expires time
-     */
-    public function getExpiresTime()
-    {
-        return $this->expires;
-    }
-
-    /**
-     * Gets the path of the cookie.
-     *
-     * @return string The cookie path
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Gets the domain of the cookie.
-     *
-     * @return string The cookie domain
-     */
-    public function getDomain()
-    {
-        return $this->domain;
-    }
-
-    /**
-     * Returns the secure flag of the cookie.
-     *
-     * @return bool The cookie secure flag
-     */
-    public function isSecure()
-    {
-        return $this->secure;
-    }
-
-    /**
-     * Returns the httponly flag of the cookie.
-     *
-     * @return bool The cookie httponly flag
-     */
-    public function isHttpOnly()
-    {
-        return $this->httponly;
-    }
-
-    /**
-     * Returns true if the cookie has expired.
-     *
-     * @return bool true if the cookie has expired, false otherwise
-     */
-    public function isExpired()
-    {
-        return null !== $this->expires && 0 !== $this->expires && $this->expires < time();
-    }
-}
diff --git a/vendor/symfony/browser-kit/CookieJar.php b/vendor/symfony/browser-kit/CookieJar.php
deleted file mode 100644
index 4b9661b..0000000
--- a/vendor/symfony/browser-kit/CookieJar.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?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\Component\BrowserKit;
-
-/**
- * CookieJar.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class CookieJar
-{
-    protected $cookieJar = array();
-
-    /**
-     * Sets a cookie.
-     *
-     * @param Cookie $cookie A Cookie instance
-     */
-    public function set(Cookie $cookie)
-    {
-        $this->cookieJar[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
-    }
-
-    /**
-     * Gets a cookie by name.
-     *
-     * You should never use an empty domain, but if you do so,
-     * this method returns the first cookie for the given name/path
-     * (this behavior ensures a BC behavior with previous versions of
-     * Symfony).
-     *
-     * @param string $name   The cookie name
-     * @param string $path   The cookie path
-     * @param string $domain The cookie domain
-     *
-     * @return Cookie|null A Cookie instance or null if the cookie does not exist
-     */
-    public function get($name, $path = '/', $domain = null)
-    {
-        $this->flushExpiredCookies();
-
-        if (!empty($domain)) {
-            foreach ($this->cookieJar as $cookieDomain => $pathCookies) {
-                if ($cookieDomain) {
-                    $cookieDomain = '.'.ltrim($cookieDomain, '.');
-                    if ($cookieDomain != substr('.'.$domain, -strlen($cookieDomain))) {
-                        continue;
-                    }
-                }
-
-                foreach ($pathCookies as $cookiePath => $namedCookies) {
-                    if ($cookiePath != substr($path, 0, strlen($cookiePath))) {
-                        continue;
-                    }
-                    if (isset($namedCookies[$name])) {
-                        return $namedCookies[$name];
-                    }
-                }
-            }
-
-            return;
-        }
-
-        // avoid relying on this behavior that is mainly here for BC reasons
-        foreach ($this->cookieJar as $cookies) {
-            if (isset($cookies[$path][$name])) {
-                return $cookies[$path][$name];
-            }
-        }
-    }
-
-    /**
-     * Removes a cookie by name.
-     *
-     * You should never use an empty domain, but if you do so,
-     * all cookies for the given name/path expire (this behavior
-     * ensures a BC behavior with previous versions of Symfony).
-     *
-     * @param string $name   The cookie name
-     * @param string $path   The cookie path
-     * @param string $domain The cookie domain
-     */
-    public function expire($name, $path = '/', $domain = null)
-    {
-        if (null === $path) {
-            $path = '/';
-        }
-
-        if (empty($domain)) {
-            // an empty domain means any domain
-            // this should never happen but it allows for a better BC
-            $domains = array_keys($this->cookieJar);
-        } else {
-            $domains = array($domain);
-        }
-
-        foreach ($domains as $domain) {
-            unset($this->cookieJar[$domain][$path][$name]);
-
-            if (empty($this->cookieJar[$domain][$path])) {
-                unset($this->cookieJar[$domain][$path]);
-
-                if (empty($this->cookieJar[$domain])) {
-                    unset($this->cookieJar[$domain]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Removes all the cookies from the jar.
-     */
-    public function clear()
-    {
-        $this->cookieJar = array();
-    }
-
-    /**
-     * Updates the cookie jar from a response Set-Cookie headers.
-     *
-     * @param array  $setCookies Set-Cookie headers from an HTTP response
-     * @param string $uri        The base URL
-     */
-    public function updateFromSetCookie(array $setCookies, $uri = null)
-    {
-        $cookies = array();
-
-        foreach ($setCookies as $cookie) {
-            foreach (explode(',', $cookie) as $i => $part) {
-                if (0 === $i || preg_match('/^(?P<token>\s*[0-9A-Za-z!#\$%\&\'\*\+\-\.^_`\|~]+)=/', $part)) {
-                    $cookies[] = ltrim($part);
-                } else {
-                    $cookies[count($cookies) - 1] .= ','.$part;
-                }
-            }
-        }
-
-        foreach ($cookies as $cookie) {
-            try {
-                $this->set(Cookie::fromString($cookie, $uri));
-            } catch (\InvalidArgumentException $e) {
-                // invalid cookies are just ignored
-            }
-        }
-    }
-
-    /**
-     * Updates the cookie jar from a Response object.
-     *
-     * @param Response $response A Response object
-     * @param string   $uri      The base URL
-     */
-    public function updateFromResponse(Response $response, $uri = null)
-    {
-        $this->updateFromSetCookie($response->getHeader('Set-Cookie', false), $uri);
-    }
-
-    /**
-     * Returns not yet expired cookies.
-     *
-     * @return Cookie[] An array of cookies
-     */
-    public function all()
-    {
-        $this->flushExpiredCookies();
-
-        $flattenedCookies = array();
-        foreach ($this->cookieJar as $path) {
-            foreach ($path as $cookies) {
-                foreach ($cookies as $cookie) {
-                    $flattenedCookies[] = $cookie;
-                }
-            }
-        }
-
-        return $flattenedCookies;
-    }
-
-    /**
-     * Returns not yet expired cookie values for the given URI.
-     *
-     * @param string $uri             A URI
-     * @param bool   $returnsRawValue Returns raw value or urldecoded value
-     *
-     * @return array An array of cookie values
-     */
-    public function allValues($uri, $returnsRawValue = false)
-    {
-        $this->flushExpiredCookies();
-
-        $parts = array_replace(array('path' => '/'), parse_url($uri));
-        $cookies = array();
-        foreach ($this->cookieJar as $domain => $pathCookies) {
-            if ($domain) {
-                $domain = '.'.ltrim($domain, '.');
-                if ($domain != substr('.'.$parts['host'], -strlen($domain))) {
-                    continue;
-                }
-            }
-
-            foreach ($pathCookies as $path => $namedCookies) {
-                if ($path != substr($parts['path'], 0, strlen($path))) {
-                    continue;
-                }
-
-                foreach ($namedCookies as $cookie) {
-                    if ($cookie->isSecure() && 'https' != $parts['scheme']) {
-                        continue;
-                    }
-
-                    $cookies[$cookie->getName()] = $returnsRawValue ? $cookie->getRawValue() : $cookie->getValue();
-                }
-            }
-        }
-
-        return $cookies;
-    }
-
-    /**
-     * Returns not yet expired raw cookie values for the given URI.
-     *
-     * @param string $uri A URI
-     *
-     * @return array An array of cookie values
-     */
-    public function allRawValues($uri)
-    {
-        return $this->allValues($uri, true);
-    }
-
-    /**
-     * Removes all expired cookies.
-     */
-    public function flushExpiredCookies()
-    {
-        foreach ($this->cookieJar as $domain => $pathCookies) {
-            foreach ($pathCookies as $path => $namedCookies) {
-                foreach ($namedCookies as $name => $cookie) {
-                    if ($cookie->isExpired()) {
-                        unset($this->cookieJar[$domain][$path][$name]);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/browser-kit/History.php b/vendor/symfony/browser-kit/History.php
deleted file mode 100644
index 8e38fe5..0000000
--- a/vendor/symfony/browser-kit/History.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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\Component\BrowserKit;
-
-/**
- * History.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class History
-{
-    protected $stack = array();
-    protected $position = -1;
-
-    /**
-     * Clears the history.
-     */
-    public function clear()
-    {
-        $this->stack = array();
-        $this->position = -1;
-    }
-
-    /**
-     * Adds a Request to the history.
-     *
-     * @param Request $request A Request instance
-     */
-    public function add(Request $request)
-    {
-        $this->stack = array_slice($this->stack, 0, $this->position + 1);
-        $this->stack[] = clone $request;
-        $this->position = count($this->stack) - 1;
-    }
-
-    /**
-     * Returns true if the history is empty.
-     *
-     * @return bool true if the history is empty, false otherwise
-     */
-    public function isEmpty()
-    {
-        return count($this->stack) == 0;
-    }
-
-    /**
-     * Goes back in the history.
-     *
-     * @return Request A Request instance
-     *
-     * @throws \LogicException if the stack is already on the first page
-     */
-    public function back()
-    {
-        if ($this->position < 1) {
-            throw new \LogicException('You are already on the first page.');
-        }
-
-        return clone $this->stack[--$this->position];
-    }
-
-    /**
-     * Goes forward in the history.
-     *
-     * @return Request A Request instance
-     *
-     * @throws \LogicException if the stack is already on the last page
-     */
-    public function forward()
-    {
-        if ($this->position > count($this->stack) - 2) {
-            throw new \LogicException('You are already on the last page.');
-        }
-
-        return clone $this->stack[++$this->position];
-    }
-
-    /**
-     * Returns the current element in the history.
-     *
-     * @return Request A Request instance
-     *
-     * @throws \LogicException if the stack is empty
-     */
-    public function current()
-    {
-        if (-1 == $this->position) {
-            throw new \LogicException('The page history is empty.');
-        }
-
-        return clone $this->stack[$this->position];
-    }
-}
diff --git a/vendor/symfony/browser-kit/LICENSE b/vendor/symfony/browser-kit/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/browser-kit/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/browser-kit/README.md b/vendor/symfony/browser-kit/README.md
deleted file mode 100644
index 5600fe2..0000000
--- a/vendor/symfony/browser-kit/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-BrowserKit Component
-====================
-
-BrowserKit simulates the behavior of a web browser.
-
-The component only provides an abstract client and does not provide any
-"default" backend for the HTTP layer.
-
-Resources
----------
-
-For a simple implementation of a browser based on an HTTP layer, have a look
-at [Goutte](https://github.com/FriendsOfPHP/Goutte).
-
-For an implementation based on HttpKernelInterface, have a look at the
-[Client](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Client.php)
-provided by the HttpKernel component.
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/BrowserKit/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/browser-kit/Request.php b/vendor/symfony/browser-kit/Request.php
deleted file mode 100644
index c79b341..0000000
--- a/vendor/symfony/browser-kit/Request.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Component\BrowserKit;
-
-/**
- * Request object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Request
-{
-    protected $uri;
-    protected $method;
-    protected $parameters;
-    protected $files;
-    protected $cookies;
-    protected $server;
-    protected $content;
-
-    /**
-     * Constructor.
-     *
-     * @param string $uri        The request URI
-     * @param string $method     The HTTP method request
-     * @param array  $parameters The request parameters
-     * @param array  $files      An array of uploaded files
-     * @param array  $cookies    An array of cookies
-     * @param array  $server     An array of server parameters
-     * @param string $content    The raw body data
-     */
-    public function __construct($uri, $method, array $parameters = array(), array $files = array(), array $cookies = array(), array $server = array(), $content = null)
-    {
-        $this->uri = $uri;
-        $this->method = $method;
-        $this->parameters = $parameters;
-        $this->files = $files;
-        $this->cookies = $cookies;
-        $this->server = $server;
-        $this->content = $content;
-    }
-
-    /**
-     * Gets the request URI.
-     *
-     * @return string The request URI
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Gets the request HTTP method.
-     *
-     * @return string The request HTTP method
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Gets the request parameters.
-     *
-     * @return array The request parameters
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Gets the request server files.
-     *
-     * @return array The request files
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    /**
-     * Gets the request cookies.
-     *
-     * @return array The request cookies
-     */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-
-    /**
-     * Gets the request server parameters.
-     *
-     * @return array The request server parameters
-     */
-    public function getServer()
-    {
-        return $this->server;
-    }
-
-    /**
-     * Gets the request raw body data.
-     *
-     * @return string The request raw body data.
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-}
diff --git a/vendor/symfony/browser-kit/Response.php b/vendor/symfony/browser-kit/Response.php
deleted file mode 100644
index 984442f..0000000
--- a/vendor/symfony/browser-kit/Response.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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\Component\BrowserKit;
-
-/**
- * Response object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Response
-{
-    protected $content;
-    protected $status;
-    protected $headers;
-
-    /**
-     * Constructor.
-     *
-     * The headers array is a set of key/value pairs. If a header is present multiple times
-     * then the value is an array of all the values.
-     *
-     * @param string $content The content of the response
-     * @param int    $status  The response status code
-     * @param array  $headers An array of headers
-     */
-    public function __construct($content = '', $status = 200, array $headers = array())
-    {
-        $this->content = $content;
-        $this->status = $status;
-        $this->headers = $headers;
-    }
-
-    /**
-     * Converts the response object to string containing all headers and the response content.
-     *
-     * @return string The response with headers and content
-     */
-    public function __toString()
-    {
-        $headers = '';
-        foreach ($this->headers as $name => $value) {
-            if (is_string($value)) {
-                $headers .= $this->buildHeader($name, $value);
-            } else {
-                foreach ($value as $headerValue) {
-                    $headers .= $this->buildHeader($name, $headerValue);
-                }
-            }
-        }
-
-        return $headers."\n".$this->content;
-    }
-
-    /**
-     * Returns the build header line.
-     *
-     * @param string $name  The header name
-     * @param string $value The header value
-     *
-     * @return string The built header line
-     */
-    protected function buildHeader($name, $value)
-    {
-        return sprintf("%s: %s\n", $name, $value);
-    }
-
-    /**
-     * Gets the response content.
-     *
-     * @return string The response content
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Gets the response status code.
-     *
-     * @return int The response status code
-     */
-    public function getStatus()
-    {
-        return $this->status;
-    }
-
-    /**
-     * Gets the response headers.
-     *
-     * @return array The response headers
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Gets a response header.
-     *
-     * @param string $header The header name
-     * @param bool   $first  Whether to return the first value or all header values
-     *
-     * @return string|array The first header value if $first is true, an array of values otherwise
-     */
-    public function getHeader($header, $first = true)
-    {
-        $normalizedHeader = str_replace('-', '_', strtolower($header));
-        foreach ($this->headers as $key => $value) {
-            if (str_replace('-', '_', strtolower($key)) === $normalizedHeader) {
-                if ($first) {
-                    return is_array($value) ? (count($value) ? $value[0] : '') : $value;
-                }
-
-                return is_array($value) ? $value : array($value);
-            }
-        }
-
-        return $first ? null : array();
-    }
-}
diff --git a/vendor/symfony/browser-kit/composer.json b/vendor/symfony/browser-kit/composer.json
deleted file mode 100644
index 2313c73..0000000
--- a/vendor/symfony/browser-kit/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "symfony/browser-kit",
-    "type": "library",
-    "description": "Symfony BrowserKit Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9",
-        "symfony/dom-crawler": "~2.0,>=2.0.5"
-    },
-    "require-dev": {
-        "symfony/process": "~2.3.34|~2.7,>=2.7.6",
-        "symfony/css-selector": "~2.0,>=2.0.5"
-    },
-    "suggest": {
-        "symfony/process": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\BrowserKit\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/browser-kit/phpunit.xml.dist b/vendor/symfony/browser-kit/phpunit.xml.dist
deleted file mode 100644
index d76b2b9..0000000
--- a/vendor/symfony/browser-kit/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony BrowserKit Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/class-loader/.gitignore b/vendor/symfony/class-loader/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/class-loader/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/class-loader/ApcClassLoader.php b/vendor/symfony/class-loader/ApcClassLoader.php
deleted file mode 100644
index 9170929..0000000
--- a/vendor/symfony/class-loader/ApcClassLoader.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * ApcClassLoader implements a wrapping autoloader cached in APC for PHP 5.3.
- *
- * It expects an object implementing a findFile method to find the file. This
- * allows using it as a wrapper around the other loaders of the component (the
- * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
- *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     $cachedLoader = new ApcClassLoader('my_prefix', $loader);
- *
- *     // activate the cached autoloader
- *     $cachedLoader->register();
- *
- *     // eventually deactivate the non-cached loader if it was registered previously
- *     // to be sure to use the cached one.
- *     $loader->unregister();
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class ApcClassLoader
-{
-    private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
-    protected $decorated;
-
-    /**
-     * Constructor.
-     *
-     * @param string $prefix    The APC namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
-     *
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($prefix, $decorated)
-    {
-        if (!extension_loaded('apc')) {
-            throw new \RuntimeException('Unable to use ApcClassLoader as APC is not enabled.');
-        }
-
-        if (!method_exists($decorated, 'findFile')) {
-            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
-        }
-
-        $this->prefix = $prefix;
-        $this->decorated = $decorated;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds a file by class name while caching lookups to APC.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null
-     */
-    public function findFile($class)
-    {
-        if (false === $file = apc_fetch($this->prefix.$class)) {
-            apc_store($this->prefix.$class, $file = $this->decorated->findFile($class));
-        }
-
-        return $file;
-    }
-
-    /**
-     * Passes through all unknown calls onto the decorated object.
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->decorated, $method), $args);
-    }
-}
diff --git a/vendor/symfony/class-loader/ApcUniversalClassLoader.php b/vendor/symfony/class-loader/ApcUniversalClassLoader.php
deleted file mode 100644
index ce73559..0000000
--- a/vendor/symfony/class-loader/ApcUniversalClassLoader.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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\Component\ClassLoader;
-
-@trigger_error('The '.__NAMESPACE__.'\ApcUniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ApcClassLoader class instead.', E_USER_DEPRECATED);
-
-/**
- * ApcUniversalClassLoader implements a "universal" autoloader cached in APC for PHP 5.3.
- *
- * It is able to load classes that use either:
- *
- *  * The technical interoperability standards for PHP 5.3 namespaces and
- *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
- *
- *  * The PEAR naming convention for classes (http://pear.php.net/).
- *
- * Classes from a sub-namespace or a sub-hierarchy of PEAR classes can be
- * looked for in a list of locations to ease the vendoring of a sub-set of
- * classes for large projects.
- *
- * Example usage:
- *
- *     require 'vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
- *     require 'vendor/symfony/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php';
- *
- *     use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
- *
- *     $loader = new ApcUniversalClassLoader('apc.prefix.');
- *
- *     // register classes with namespaces
- *     $loader->registerNamespaces(array(
- *         'Symfony\Component' => __DIR__.'/component',
- *         'Symfony' => __DIR__.'/framework',
- *         'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
- *     ));
- *
- *     // register a library using the PEAR naming convention
- *     $loader->registerPrefixes(array(
- *         'Swift_' => __DIR__.'/Swift',
- *     ));
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Kris Wallsmith <kris@symfony.com>
- *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link ClassLoader} class instead.
- */
-class ApcUniversalClassLoader extends UniversalClassLoader
-{
-    private $prefix;
-
-    /**
-     * Constructor.
-     *
-     * @param string $prefix A prefix to create a namespace in APC
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct($prefix)
-    {
-        if (!extension_loaded('apc')) {
-            throw new \RuntimeException('Unable to use ApcUniversalClassLoader as APC is not enabled.');
-        }
-
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Finds a file by class name while caching lookups to APC.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null The path, if found
-     */
-    public function findFile($class)
-    {
-        if (false === $file = apc_fetch($this->prefix.$class)) {
-            apc_store($this->prefix.$class, $file = parent::findFile($class));
-        }
-
-        return $file;
-    }
-}
diff --git a/vendor/symfony/class-loader/CHANGELOG.md b/vendor/symfony/class-loader/CHANGELOG.md
deleted file mode 100644
index 64660a8..0000000
--- a/vendor/symfony/class-loader/CHANGELOG.md
+++ /dev/null
@@ -1,28 +0,0 @@
-CHANGELOG
-=========
-
-2.4.0
------
-
- * deprecated the UniversalClassLoader in favor of the ClassLoader class instead
- * deprecated the ApcUniversalClassLoader in favor of the ApcClassLoader class instead
- * deprecated the DebugUniversalClassLoader in favor of the DebugClassLoader class from the Debug component
- * deprecated the DebugClassLoader as it has been moved to the Debug component instead
-
-2.3.0
------
-
- * added a WinCacheClassLoader for WinCache
-
-2.1.0
------
-
- * added a DebugClassLoader able to wrap any autoloader providing a findFile
-   method
- * added a new ApcClassLoader and XcacheClassLoader using composition to wrap
-   other loaders
- * added a new ClassLoader which does not distinguish between namespaced and
-   pear-like classes (as the PEAR convention is a subset of PSR-0) and
-   supports using Composer's namespace maps
- * added a class map generator
- * added support for loading globally-installed PEAR packages
diff --git a/vendor/symfony/class-loader/ClassCollectionLoader.php b/vendor/symfony/class-loader/ClassCollectionLoader.php
deleted file mode 100644
index c7dc3ae..0000000
--- a/vendor/symfony/class-loader/ClassCollectionLoader.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * ClassCollectionLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ClassCollectionLoader
-{
-    private static $loaded;
-    private static $seen;
-    private static $useTokenizer = true;
-
-    /**
-     * Loads a list of classes and caches them in one big file.
-     *
-     * @param array  $classes    An array of classes to load
-     * @param string $cacheDir   A cache directory
-     * @param string $name       The cache name prefix
-     * @param bool   $autoReload Whether to flush the cache when the cache is stale or not
-     * @param bool   $adaptive   Whether to remove already declared classes or not
-     * @param string $extension  File extension of the resulting file
-     *
-     * @throws \InvalidArgumentException When class can't be loaded
-     */
-    public static function load($classes, $cacheDir, $name, $autoReload, $adaptive = false, $extension = '.php')
-    {
-        // each $name can only be loaded once per PHP process
-        if (isset(self::$loaded[$name])) {
-            return;
-        }
-
-        self::$loaded[$name] = true;
-
-        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
-        if (function_exists('get_declared_traits')) {
-            $declared = array_merge($declared, get_declared_traits());
-        }
-
-        if ($adaptive) {
-            // don't include already declared classes
-            $classes = array_diff($classes, $declared);
-
-            // the cache is different depending on which classes are already declared
-            $name = $name.'-'.substr(hash('sha256', implode('|', $classes)), 0, 5);
-        }
-
-        $classes = array_unique($classes);
-
-        $cache = $cacheDir.'/'.$name.$extension;
-
-        // auto-reload
-        $reload = false;
-        if ($autoReload) {
-            $metadata = $cache.'.meta';
-            if (!is_file($metadata) || !is_file($cache)) {
-                $reload = true;
-            } else {
-                $time = filemtime($cache);
-                $meta = unserialize(file_get_contents($metadata));
-
-                sort($meta[1]);
-                sort($classes);
-
-                if ($meta[1] != $classes) {
-                    $reload = true;
-                } else {
-                    foreach ($meta[0] as $resource) {
-                        if (!is_file($resource) || filemtime($resource) > $time) {
-                            $reload = true;
-
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$reload && is_file($cache)) {
-            require_once $cache;
-
-            return;
-        }
-
-        $files = array();
-        $content = '';
-        foreach (self::getOrderedClasses($classes) as $class) {
-            if (in_array($class->getName(), $declared)) {
-                continue;
-            }
-
-            $files[] = $class->getFileName();
-
-            $c = preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($class->getFileName()));
-
-            // fakes namespace declaration for global code
-            if (!$class->inNamespace()) {
-                $c = "\nnamespace\n{\n".$c."\n}\n";
-            }
-
-            $c = self::fixNamespaceDeclarations('<?php '.$c);
-            $c = preg_replace('/^\s*<\?php/', '', $c);
-
-            $content .= $c;
-        }
-
-        // cache the core classes
-        if (!is_dir(dirname($cache))) {
-            mkdir(dirname($cache), 0777, true);
-        }
-        self::writeCacheFile($cache, '<?php '.$content);
-
-        if ($autoReload) {
-            // save the resources
-            self::writeCacheFile($metadata, serialize(array($files, $classes)));
-        }
-    }
-
-    /**
-     * Adds brackets around each namespace if it's not already the case.
-     *
-     * @param string $source Namespace string
-     *
-     * @return string Namespaces with brackets
-     */
-    public static function fixNamespaceDeclarations($source)
-    {
-        if (!function_exists('token_get_all') || !self::$useTokenizer) {
-            if (preg_match('/namespace(.*?)\s*;/', $source)) {
-                $source = preg_replace('/namespace(.*?)\s*;/', "namespace$1\n{", $source)."}\n";
-            }
-
-            return $source;
-        }
-
-        $rawChunk = '';
-        $output = '';
-        $inNamespace = false;
-        $tokens = token_get_all($source);
-
-        for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
-            if (is_string($token)) {
-                $rawChunk .= $token;
-            } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
-                // strip comments
-                continue;
-            } elseif (T_NAMESPACE === $token[0]) {
-                if ($inNamespace) {
-                    $rawChunk .= "}\n";
-                }
-                $rawChunk .= $token[1];
-
-                // namespace name and whitespaces
-                while (($t = next($tokens)) && is_array($t) && in_array($t[0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
-                    $rawChunk .= $t[1];
-                }
-                if ('{' === $t) {
-                    $inNamespace = false;
-                    prev($tokens);
-                } else {
-                    $rawChunk = rtrim($rawChunk)."\n{";
-                    $inNamespace = true;
-                }
-            } elseif (T_START_HEREDOC === $token[0]) {
-                $output .= self::compressCode($rawChunk).$token[1];
-                do {
-                    $token = next($tokens);
-                    $output .= is_string($token) ? $token : $token[1];
-                } while ($token[0] !== T_END_HEREDOC);
-                $output .= "\n";
-                $rawChunk = '';
-            } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0]) {
-                $output .= self::compressCode($rawChunk).$token[1];
-                $rawChunk = '';
-            } else {
-                $rawChunk .= $token[1];
-            }
-        }
-
-        if ($inNamespace) {
-            $rawChunk .= "}\n";
-        }
-
-        return $output.self::compressCode($rawChunk);
-    }
-
-    /**
-     * This method is only useful for testing.
-     */
-    public static function enableTokenizer($bool)
-    {
-        self::$useTokenizer = (bool) $bool;
-    }
-
-    /**
-     * Strips leading & trailing ws, multiple EOL, multiple ws.
-     *
-     * @param string $code Original PHP code
-     *
-     * @return string compressed code
-     */
-    private static function compressCode($code)
-    {
-        return preg_replace(
-            array('/^\s+/m', '/\s+$/m', '/([\n\r]+ *[\n\r]+)+/', '/[ \t]+/'),
-            array('', '', "\n", ' '),
-            $code
-        );
-    }
-
-    /**
-     * Writes a cache file.
-     *
-     * @param string $file    Filename
-     * @param string $content Temporary file content
-     *
-     * @throws \RuntimeException when a cache file cannot be written
-     */
-    private static function writeCacheFile($file, $content)
-    {
-        $tmpFile = tempnam(dirname($file), basename($file));
-        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
-            @chmod($file, 0666 & ~umask());
-
-            return;
-        }
-
-        throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
-    }
-
-    /**
-     * Gets an ordered array of passed classes including all their dependencies.
-     *
-     * @param array $classes
-     *
-     * @return \ReflectionClass[] An array of sorted \ReflectionClass instances (dependencies added if needed)
-     *
-     * @throws \InvalidArgumentException When a class can't be loaded
-     */
-    private static function getOrderedClasses(array $classes)
-    {
-        $map = array();
-        self::$seen = array();
-        foreach ($classes as $class) {
-            try {
-                $reflectionClass = new \ReflectionClass($class);
-            } catch (\ReflectionException $e) {
-                throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
-            }
-
-            $map = array_merge($map, self::getClassHierarchy($reflectionClass));
-        }
-
-        return $map;
-    }
-
-    private static function getClassHierarchy(\ReflectionClass $class)
-    {
-        if (isset(self::$seen[$class->getName()])) {
-            return array();
-        }
-
-        self::$seen[$class->getName()] = true;
-
-        $classes = array($class);
-        $parent = $class;
-        while (($parent = $parent->getParentClass()) && $parent->isUserDefined() && !isset(self::$seen[$parent->getName()])) {
-            self::$seen[$parent->getName()] = true;
-
-            array_unshift($classes, $parent);
-        }
-
-        $traits = array();
-
-        if (method_exists('ReflectionClass', 'getTraits')) {
-            foreach ($classes as $c) {
-                foreach (self::resolveDependencies(self::computeTraitDeps($c), $c) as $trait) {
-                    if ($trait !== $c) {
-                        $traits[] = $trait;
-                    }
-                }
-            }
-        }
-
-        return array_merge(self::getInterfaces($class), $traits, $classes);
-    }
-
-    private static function getInterfaces(\ReflectionClass $class)
-    {
-        $classes = array();
-
-        foreach ($class->getInterfaces() as $interface) {
-            $classes = array_merge($classes, self::getInterfaces($interface));
-        }
-
-        if ($class->isUserDefined() && $class->isInterface() && !isset(self::$seen[$class->getName()])) {
-            self::$seen[$class->getName()] = true;
-
-            $classes[] = $class;
-        }
-
-        return $classes;
-    }
-
-    private static function computeTraitDeps(\ReflectionClass $class)
-    {
-        $traits = $class->getTraits();
-        $deps = array($class->getName() => $traits);
-        while ($trait = array_pop($traits)) {
-            if ($trait->isUserDefined() && !isset(self::$seen[$trait->getName()])) {
-                self::$seen[$trait->getName()] = true;
-                $traitDeps = $trait->getTraits();
-                $deps[$trait->getName()] = $traitDeps;
-                $traits = array_merge($traits, $traitDeps);
-            }
-        }
-
-        return $deps;
-    }
-
-    /**
-     * Dependencies resolution.
-     *
-     * This function does not check for circular dependencies as it should never
-     * occur with PHP traits.
-     *
-     * @param array            $tree       The dependency tree
-     * @param \ReflectionClass $node       The node
-     * @param \ArrayObject     $resolved   An array of already resolved dependencies
-     * @param \ArrayObject     $unresolved An array of dependencies to be resolved
-     *
-     * @return \ArrayObject The dependencies for the given node
-     *
-     * @throws \RuntimeException if a circular dependency is detected
-     */
-    private static function resolveDependencies(array $tree, $node, \ArrayObject $resolved = null, \ArrayObject $unresolved = null)
-    {
-        if (null === $resolved) {
-            $resolved = new \ArrayObject();
-        }
-        if (null === $unresolved) {
-            $unresolved = new \ArrayObject();
-        }
-        $nodeName = $node->getName();
-
-        if (isset($tree[$nodeName])) {
-            $unresolved[$nodeName] = $node;
-            foreach ($tree[$nodeName] as $dependency) {
-                if (!$resolved->offsetExists($dependency->getName())) {
-                    self::resolveDependencies($tree, $dependency, $resolved, $unresolved);
-                }
-            }
-            $resolved[$nodeName] = $node;
-            unset($unresolved[$nodeName]);
-        }
-
-        return $resolved;
-    }
-}
diff --git a/vendor/symfony/class-loader/ClassLoader.php b/vendor/symfony/class-loader/ClassLoader.php
deleted file mode 100644
index fc0a569..0000000
--- a/vendor/symfony/class-loader/ClassLoader.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * ClassLoader implements an PSR-0 class loader.
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
- *
- *     $loader = new ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (e.g. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class ClassLoader
-{
-    private $prefixes = array();
-    private $fallbackDirs = array();
-    private $useIncludePath = false;
-
-    /**
-     * Returns prefixes.
-     *
-     * @return array
-     */
-    public function getPrefixes()
-    {
-        return $this->prefixes;
-    }
-
-    /**
-     * Returns fallback directories.
-     *
-     * @return array
-     */
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirs;
-    }
-
-    /**
-     * Adds prefixes.
-     *
-     * @param array $prefixes Prefixes to add
-     */
-    public function addPrefixes(array $prefixes)
-    {
-        foreach ($prefixes as $prefix => $path) {
-            $this->addPrefix($prefix, $path);
-        }
-    }
-
-    /**
-     * Registers a set of classes.
-     *
-     * @param string       $prefix The classes prefix
-     * @param array|string $paths  The location(s) of the classes
-     */
-    public function addPrefix($prefix, $paths)
-    {
-        if (!$prefix) {
-            foreach ((array) $paths as $path) {
-                $this->fallbackDirs[] = $path;
-            }
-
-            return;
-        }
-        if (isset($this->prefixes[$prefix])) {
-            if (is_array($paths)) {
-                $this->prefixes[$prefix] = array_unique(array_merge(
-                    $this->prefixes[$prefix],
-                    $paths
-                ));
-            } elseif (!in_array($paths, $this->prefixes[$prefix])) {
-                 $this->prefixes[$prefix][] = $paths;
-            }
-        } else {
-            $this->prefixes[$prefix] = array_unique((array) $paths);
-        }
-    }
-
-    /**
-     * Turns on searching the include for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = (bool) $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|null The path, if found
-     */
-    public function findFile($class)
-    {
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)).DIRECTORY_SEPARATOR;
-            $className = substr($class, $pos + 1);
-        } else {
-            // PEAR-like class name
-            $classPath = null;
-            $className = $class;
-        }
-
-        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
-
-        foreach ($this->prefixes as $prefix => $dirs) {
-            if ($class === strstr($class, $prefix)) {
-                foreach ($dirs as $dir) {
-                    if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
-                        return $dir.DIRECTORY_SEPARATOR.$classPath;
-                    }
-                }
-            }
-        }
-
-        foreach ($this->fallbackDirs as $dir) {
-            if (file_exists($dir.DIRECTORY_SEPARATOR.$classPath)) {
-                return $dir.DIRECTORY_SEPARATOR.$classPath;
-            }
-        }
-
-        if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
-            return $file;
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/ClassMapGenerator.php b/vendor/symfony/class-loader/ClassMapGenerator.php
deleted file mode 100644
index d242acd..0000000
--- a/vendor/symfony/class-loader/ClassMapGenerator.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?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\Component\ClassLoader;
-
-if (!defined('SYMFONY_TRAIT')) {
-    if (PHP_VERSION_ID >= 50400) {
-        define('SYMFONY_TRAIT', T_TRAIT);
-    } else {
-        define('SYMFONY_TRAIT', 0);
-    }
-}
-
-/**
- * ClassMapGenerator.
- *
- * @author Gyula Sallai <salla016@gmail.com>
- */
-class ClassMapGenerator
-{
-    /**
-     * Generate a class map file.
-     *
-     * @param array|string $dirs Directories or a single path to search in
-     * @param string       $file The name of the class map file
-     */
-    public static function dump($dirs, $file)
-    {
-        $dirs = (array) $dirs;
-        $maps = array();
-
-        foreach ($dirs as $dir) {
-            $maps = array_merge($maps, static::createMap($dir));
-        }
-
-        file_put_contents($file, sprintf('<?php return %s;', var_export($maps, true)));
-    }
-
-    /**
-     * Iterate over all files in the given directory searching for classes.
-     *
-     * @param \Iterator|string $dir The directory to search in or an iterator
-     *
-     * @return array A class map array
-     */
-    public static function createMap($dir)
-    {
-        if (is_string($dir)) {
-            $dir = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir));
-        }
-
-        $map = array();
-
-        foreach ($dir as $file) {
-            if (!$file->isFile()) {
-                continue;
-            }
-
-            $path = $file->getRealPath();
-
-            if (pathinfo($path, PATHINFO_EXTENSION) !== 'php') {
-                continue;
-            }
-
-            $classes = self::findClasses($path);
-
-            foreach ($classes as $class) {
-                $map[$class] = $path;
-            }
-        }
-
-        return $map;
-    }
-
-    /**
-     * Extract the classes in the given file.
-     *
-     * @param string $path The file to check
-     *
-     * @return array The found classes
-     */
-    private static function findClasses($path)
-    {
-        $contents = file_get_contents($path);
-        $tokens = token_get_all($contents);
-
-        $classes = array();
-
-        $namespace = '';
-        for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
-            $token = $tokens[$i];
-
-            if (is_string($token)) {
-                continue;
-            }
-
-            $class = '';
-
-            switch ($token[0]) {
-                case T_NAMESPACE:
-                    $namespace = '';
-                    // If there is a namespace, extract it
-                    while (($t = $tokens[++$i]) && is_array($t)) {
-                        if (in_array($t[0], array(T_STRING, T_NS_SEPARATOR))) {
-                            $namespace .= $t[1];
-                        }
-                    }
-                    $namespace .= '\\';
-                    break;
-                case T_CLASS:
-                case T_INTERFACE:
-                case SYMFONY_TRAIT:
-                    // Skip usage of ::class constant
-                    $isClassConstant = false;
-                    for ($j = $i - 1; $j > 0; --$j) {
-                        if (is_string($tokens[$j])) {
-                            break;
-                        }
-
-                        if (T_DOUBLE_COLON === $tokens[$j][0]) {
-                            $isClassConstant = true;
-                            break;
-                        } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
-                            break;
-                        }
-                    }
-
-                    if ($isClassConstant) {
-                        continue;
-                    }
-
-                    // Find the classname
-                    while (($t = $tokens[++$i]) && is_array($t)) {
-                        if (T_STRING === $t[0]) {
-                            $class .= $t[1];
-                        } elseif ($class !== '' && T_WHITESPACE == $t[0]) {
-                            break;
-                        }
-                    }
-
-                    $classes[] = ltrim($namespace.$class, '\\');
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return $classes;
-    }
-}
diff --git a/vendor/symfony/class-loader/DebugClassLoader.php b/vendor/symfony/class-loader/DebugClassLoader.php
deleted file mode 100644
index 92cbcb0..0000000
--- a/vendor/symfony/class-loader/DebugClassLoader.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Component\ClassLoader;
-
-@trigger_error('The '.__NAMESPACE__.'\DebugClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
-
-/**
- * Autoloader checking if the class is really defined in the file found.
- *
- * The DebugClassLoader will wrap all registered autoloaders providing a
- * findFile method and will throw an exception if a file is found but does
- * not declare the class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christophe Coevoet <stof@notk.org>
- *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Debug\DebugClassLoader} instead.
- */
-class DebugClassLoader
-{
-    private $classFinder;
-
-    /**
-     * Constructor.
-     *
-     * @param object $classFinder
-     */
-    public function __construct($classFinder)
-    {
-        $this->classFinder = $classFinder;
-    }
-
-    /**
-     * Gets the wrapped class loader.
-     *
-     * @return object a class loader instance
-     */
-    public function getClassLoader()
-    {
-        return $this->classFinder;
-    }
-
-    /**
-     * Replaces all autoloaders implementing a findFile method by a DebugClassLoader wrapper.
-     */
-    public static function enable()
-    {
-        if (!is_array($functions = spl_autoload_functions())) {
-            return;
-        }
-
-        foreach ($functions as $function) {
-            spl_autoload_unregister($function);
-        }
-
-        foreach ($functions as $function) {
-            if (is_array($function) && !$function[0] instanceof self && method_exists($function[0], 'findFile')) {
-                $function = array(new static($function[0]), 'loadClass');
-            }
-
-            spl_autoload_register($function);
-        }
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Finds a file by class name.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null
-     */
-    public function findFile($class)
-    {
-        return $this->classFinder->findFile($class);
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     *
-     * @throws \RuntimeException
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->classFinder->findFile($class)) {
-            require $file;
-
-            if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
-                if (false !== strpos($class, '/')) {
-                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
-                }
-
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/DebugUniversalClassLoader.php b/vendor/symfony/class-loader/DebugUniversalClassLoader.php
deleted file mode 100644
index 807bcd1..0000000
--- a/vendor/symfony/class-loader/DebugUniversalClassLoader.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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\Component\ClassLoader;
-
-@trigger_error('The '.__NAMESPACE__.'\DebugUniversalClassLoader class is deprecated since version 2.4 and will be removed in 3.0. Use the Symfony\Component\Debug\DebugClassLoader class instead.', E_USER_DEPRECATED);
-
-/**
- * Checks that the class is actually declared in the included file.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link \Symfony\Component\Debug\DebugClassLoader} class instead.
- */
-class DebugUniversalClassLoader extends UniversalClassLoader
-{
-    /**
-     * Replaces all regular UniversalClassLoader instances by a DebugUniversalClassLoader ones.
-     */
-    public static function enable()
-    {
-        if (!is_array($functions = spl_autoload_functions())) {
-            return;
-        }
-
-        foreach ($functions as $function) {
-            spl_autoload_unregister($function);
-        }
-
-        foreach ($functions as $function) {
-            if (is_array($function) && $function[0] instanceof UniversalClassLoader) {
-                $loader = new static();
-                $loader->registerNamespaceFallbacks($function[0]->getNamespaceFallbacks());
-                $loader->registerPrefixFallbacks($function[0]->getPrefixFallbacks());
-                $loader->registerNamespaces($function[0]->getNamespaces());
-                $loader->registerPrefixes($function[0]->getPrefixes());
-                $loader->useIncludePath($function[0]->getUseIncludePath());
-
-                $function[0] = $loader;
-            }
-
-            spl_autoload_register($function);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            if (!class_exists($class, false) && !interface_exists($class, false) && (!function_exists('trait_exists') || !trait_exists($class, false))) {
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/LICENSE b/vendor/symfony/class-loader/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/class-loader/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/class-loader/MapClassLoader.php b/vendor/symfony/class-loader/MapClassLoader.php
deleted file mode 100644
index 1d8bcc2..0000000
--- a/vendor/symfony/class-loader/MapClassLoader.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * A class loader that uses a mapping file to look up paths.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class MapClassLoader
-{
-    private $map = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $map A map where keys are classes and values the absolute file path
-     */
-    public function __construct(array $map)
-    {
-        $this->map = $map;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     */
-    public function loadClass($class)
-    {
-        if (isset($this->map[$class])) {
-            require $this->map[$class];
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|null The path, if found
-     */
-    public function findFile($class)
-    {
-        if (isset($this->map[$class])) {
-            return $this->map[$class];
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/Psr4ClassLoader.php b/vendor/symfony/class-loader/Psr4ClassLoader.php
deleted file mode 100644
index a00cf7b..0000000
--- a/vendor/symfony/class-loader/Psr4ClassLoader.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * A PSR-4 compatible class loader.
- *
- * See http://www.php-fig.org/psr/psr-4/
- *
- * @author Alexander M. Turek <me@derrabus.de>
- */
-class Psr4ClassLoader
-{
-    /**
-     * @var array
-     */
-    private $prefixes = array();
-
-    /**
-     * @param string $prefix
-     * @param string $baseDir
-     */
-    public function addPrefix($prefix, $baseDir)
-    {
-        $prefix = trim($prefix, '\\').'\\';
-        $baseDir = rtrim($baseDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
-        $this->prefixes[] = array($prefix, $baseDir);
-    }
-
-    /**
-     * @param string $class
-     *
-     * @return string|null
-     */
-    public function findFile($class)
-    {
-        $class = ltrim($class, '\\');
-
-        foreach ($this->prefixes as $current) {
-            list($currentPrefix, $currentBaseDir) = $current;
-            if (0 === strpos($class, $currentPrefix)) {
-                $classWithoutPrefix = substr($class, strlen($currentPrefix));
-                $file = $currentBaseDir.str_replace('\\', DIRECTORY_SEPARATOR, $classWithoutPrefix).'.php';
-                if (file_exists($file)) {
-                    return $file;
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $class
-     *
-     * @return bool
-     */
-    public function loadClass($class)
-    {
-        $file = $this->findFile($class);
-        if (null !== $file) {
-            require $file;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Removes this instance from the registered autoloaders.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-}
diff --git a/vendor/symfony/class-loader/README.md b/vendor/symfony/class-loader/README.md
deleted file mode 100644
index 0d2955d..0000000
--- a/vendor/symfony/class-loader/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-ClassLoader Component
-=====================
-
-ClassLoader loads your project classes automatically if they follow some
-standard PHP conventions.
-
-The ClassLoader object is able to autoload classes that implement the PSR-0
-standard or the PEAR naming convention.
-
-First, register the autoloader:
-
-```php
-require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
-
-use Symfony\Component\ClassLoader\ClassLoader;
-
-$loader = new ClassLoader();
-$loader->register();
-```
-
-Then, register some namespaces with the `addPrefix()` method:
-
-```php
-$loader->addPrefix('Symfony', __DIR__.'/src');
-$loader->addPrefix('Monolog', __DIR__.'/vendor/monolog/src');
-```
-
-The `addPrefix()` method takes a namespace prefix and a path where to
-look for the classes as arguments.
-
-You can also register a sub-namespaces:
-
-```php
-$loader->addPrefix('Doctrine\\Common', __DIR__.'/vendor/doctrine-common/lib');
-```
-
-The order of registration is significant and the first registered namespace
-takes precedence over later registered one.
-
-You can also register more than one path for a given namespace:
-
-```php
-$loader->addPrefix('Symfony', array(__DIR__.'/src', __DIR__.'/symfony/src'));
-```
-
-Alternatively, you can use the `addPrefixes()` method to register more
-than one namespace at once:
-
-```php
-$loader->addPrefixes(array(
-    'Symfony' => array(__DIR__.'/src', __DIR__.'/symfony/src'),
-    'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
-    'Doctrine' => __DIR__.'/vendor/doctrine/lib',
-    'Monolog' => __DIR__.'/vendor/monolog/src',
-));
-```
-
-For better performance, you can use the APC class loader:
-
-```php
-require_once __DIR__.'/src/Symfony/Component/ClassLoader/ClassLoader.php';
-require_once __DIR__.'/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
-
-use Symfony\Component\ClassLoader\ClassLoader;
-use Symfony\Component\ClassLoader\ApcClassLoader;
-
-$loader = new ClassLoader();
-$loader->addPrefix('Symfony', __DIR__.'/src');
-
-$loader = new ApcClassLoader('apc.prefix.', $loader);
-$loader->register();
-```
-
-Furthermore, the component provides tools to aggregate classes into a single
-file, which is especially useful to improve performance on servers that do not
-provide byte caches.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/ClassLoader/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/class-loader/UniversalClassLoader.php b/vendor/symfony/class-loader/UniversalClassLoader.php
deleted file mode 100644
index 961c751..0000000
--- a/vendor/symfony/class-loader/UniversalClassLoader.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?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\Component\ClassLoader;
-
-@trigger_error('The '.__NAMESPACE__.'\UniversalClassLoader class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\ClassLoader\ClassLoader class instead.', E_USER_DEPRECATED);
-
-/**
- * UniversalClassLoader implements a "universal" autoloader for PHP 5.3.
- *
- * It is able to load classes that use either:
- *
- *  * The technical interoperability standards for PHP 5.3 namespaces and
- *    class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
- *
- *  * The PEAR naming convention for classes (http://pear.php.net/).
- *
- * Classes from a sub-namespace or a sub-hierarchy of PEAR classes can be
- * looked for in a list of locations to ease the vendoring of a sub-set of
- * classes for large projects.
- *
- * Example usage:
- *
- *     $loader = new UniversalClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->registerNamespaces(array(
- *         'Symfony\Component' => __DIR__.'/component',
- *         'Symfony' => __DIR__.'/framework',
- *         'Sensio' => array(__DIR__.'/src', __DIR__.'/vendor'),
- *     ));
- *
- *     // register a library using the PEAR naming convention
- *     $loader->registerPrefixes(array(
- *         'Swift_' => __DIR__.'/Swift',
- *     ));
- *
- *
- *     // to enable searching the include path (e.g. for PEAR packages)
- *     $loader->useIncludePath(true);
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.4, to be removed in 3.0.
- *             Use the {@link ClassLoader} class instead.
- */
-class UniversalClassLoader
-{
-    private $namespaces = array();
-    private $prefixes = array();
-    private $namespaceFallbacks = array();
-    private $prefixFallbacks = array();
-    private $useIncludePath = false;
-
-    /**
-     * Turns on searching the include for class files. Allows easy loading
-     * of installed PEAR packages.
-     *
-     * @param bool $useIncludePath
-     */
-    public function useIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = (bool) $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Gets the configured namespaces.
-     *
-     * @return array A hash with namespaces as keys and directories as values
-     */
-    public function getNamespaces()
-    {
-        return $this->namespaces;
-    }
-
-    /**
-     * Gets the configured class prefixes.
-     *
-     * @return array A hash with class prefixes as keys and directories as values
-     */
-    public function getPrefixes()
-    {
-        return $this->prefixes;
-    }
-
-    /**
-     * Gets the directory(ies) to use as a fallback for namespaces.
-     *
-     * @return array An array of directories
-     */
-    public function getNamespaceFallbacks()
-    {
-        return $this->namespaceFallbacks;
-    }
-
-    /**
-     * Gets the directory(ies) to use as a fallback for class prefixes.
-     *
-     * @return array An array of directories
-     */
-    public function getPrefixFallbacks()
-    {
-        return $this->prefixFallbacks;
-    }
-
-    /**
-     * Registers the directory to use as a fallback for namespaces.
-     *
-     * @param array $dirs An array of directories
-     */
-    public function registerNamespaceFallbacks(array $dirs)
-    {
-        $this->namespaceFallbacks = $dirs;
-    }
-
-    /**
-     * Registers a directory to use as a fallback for namespaces.
-     *
-     * @param string $dir A directory
-     */
-    public function registerNamespaceFallback($dir)
-    {
-        $this->namespaceFallbacks[] = $dir;
-    }
-
-    /**
-     * Registers directories to use as a fallback for class prefixes.
-     *
-     * @param array $dirs An array of directories
-     */
-    public function registerPrefixFallbacks(array $dirs)
-    {
-        $this->prefixFallbacks = $dirs;
-    }
-
-    /**
-     * Registers a directory to use as a fallback for class prefixes.
-     *
-     * @param string $dir A directory
-     */
-    public function registerPrefixFallback($dir)
-    {
-        $this->prefixFallbacks[] = $dir;
-    }
-
-    /**
-     * Registers an array of namespaces.
-     *
-     * @param array $namespaces An array of namespaces (namespaces as keys and locations as values)
-     */
-    public function registerNamespaces(array $namespaces)
-    {
-        foreach ($namespaces as $namespace => $locations) {
-            $this->namespaces[$namespace] = (array) $locations;
-        }
-    }
-
-    /**
-     * Registers a namespace.
-     *
-     * @param string       $namespace The namespace
-     * @param array|string $paths     The location(s) of the namespace
-     */
-    public function registerNamespace($namespace, $paths)
-    {
-        $this->namespaces[$namespace] = (array) $paths;
-    }
-
-    /**
-     * Registers an array of classes using the PEAR naming convention.
-     *
-     * @param array $classes An array of classes (prefixes as keys and locations as values)
-     */
-    public function registerPrefixes(array $classes)
-    {
-        foreach ($classes as $prefix => $locations) {
-            $this->prefixes[$prefix] = (array) $locations;
-        }
-    }
-
-    /**
-     * Registers a set of classes using the PEAR naming convention.
-     *
-     * @param string       $prefix The classes prefix
-     * @param array|string $paths  The location(s) of the classes
-     */
-    public function registerPrefix($prefix, $paths)
-    {
-        $this->prefixes[$prefix] = (array) $paths;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|null The path, if found
-     */
-    public function findFile($class)
-    {
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $namespace = substr($class, 0, $pos);
-            $className = substr($class, $pos + 1);
-            $normalizedClass = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
-            foreach ($this->namespaces as $ns => $dirs) {
-                if (0 !== strpos($namespace, $ns)) {
-                    continue;
-                }
-
-                foreach ($dirs as $dir) {
-                    $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
-                    if (is_file($file)) {
-                        return $file;
-                    }
-                }
-            }
-
-            foreach ($this->namespaceFallbacks as $dir) {
-                $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
-                if (is_file($file)) {
-                    return $file;
-                }
-            }
-        } else {
-            // PEAR-like class name
-            $normalizedClass = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
-            foreach ($this->prefixes as $prefix => $dirs) {
-                if (0 !== strpos($class, $prefix)) {
-                    continue;
-                }
-
-                foreach ($dirs as $dir) {
-                    $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
-                    if (is_file($file)) {
-                        return $file;
-                    }
-                }
-            }
-
-            foreach ($this->prefixFallbacks as $dir) {
-                $file = $dir.DIRECTORY_SEPARATOR.$normalizedClass;
-                if (is_file($file)) {
-                    return $file;
-                }
-            }
-        }
-
-        if ($this->useIncludePath && $file = stream_resolve_include_path($normalizedClass)) {
-            return $file;
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/WinCacheClassLoader.php b/vendor/symfony/class-loader/WinCacheClassLoader.php
deleted file mode 100644
index 0fc11d0..0000000
--- a/vendor/symfony/class-loader/WinCacheClassLoader.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * WinCacheClassLoader implements a wrapping autoloader cached in WinCache.
- *
- * It expects an object implementing a findFile method to find the file. This
- * allow using it as a wrapper around the other loaders of the component (the
- * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
- *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     $cachedLoader = new WinCacheClassLoader('my_prefix', $loader);
- *
- *     // activate the cached autoloader
- *     $cachedLoader->register();
- *
- *     // eventually deactivate the non-cached loader if it was registered previously
- *     // to be sure to use the cached one.
- *     $loader->unregister();
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Kris Wallsmith <kris@symfony.com>
- * @author Artem Ryzhkov <artem@smart-core.org>
- */
-class WinCacheClassLoader
-{
-    private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
-    protected $decorated;
-
-    /**
-     * Constructor.
-     *
-     * @param string $prefix    The WinCache namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
-     *
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($prefix, $decorated)
-    {
-        if (!extension_loaded('wincache')) {
-            throw new \RuntimeException('Unable to use WinCacheClassLoader as WinCache is not enabled.');
-        }
-
-        if (!method_exists($decorated, 'findFile')) {
-            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
-        }
-
-        $this->prefix = $prefix;
-        $this->decorated = $decorated;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds a file by class name while caching lookups to WinCache.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null
-     */
-    public function findFile($class)
-    {
-        if (false === $file = wincache_ucache_get($this->prefix.$class)) {
-            wincache_ucache_set($this->prefix.$class, $file = $this->decorated->findFile($class), 0);
-        }
-
-        return $file;
-    }
-
-    /**
-     * Passes through all unknown calls onto the decorated object.
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->decorated, $method), $args);
-    }
-}
diff --git a/vendor/symfony/class-loader/XcacheClassLoader.php b/vendor/symfony/class-loader/XcacheClassLoader.php
deleted file mode 100644
index bf51227..0000000
--- a/vendor/symfony/class-loader/XcacheClassLoader.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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\Component\ClassLoader;
-
-/**
- * XcacheClassLoader implements a wrapping autoloader cached in XCache for PHP 5.3.
- *
- * It expects an object implementing a findFile method to find the file. This
- * allows using it as a wrapper around the other loaders of the component (the
- * ClassLoader and the UniversalClassLoader for instance) but also around any
- * other autoloaders following this convention (the Composer one for instance).
- *
- *     // with a Symfony autoloader
- *     use Symfony\Component\ClassLoader\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->addPrefix('Symfony\Component', __DIR__.'/component');
- *     $loader->addPrefix('Symfony',           __DIR__.'/framework');
- *
- *     // or with a Composer autoloader
- *     use Composer\Autoload\ClassLoader;
- *
- *     $loader = new ClassLoader();
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     $cachedLoader = new XcacheClassLoader('my_prefix', $loader);
- *
- *     // activate the cached autoloader
- *     $cachedLoader->register();
- *
- *     // eventually deactivate the non-cached loader if it was registered previously
- *     // to be sure to use the cached one.
- *     $loader->unregister();
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Kris Wallsmith <kris@symfony.com>
- * @author Kim Hemsø Rasmussen <kimhemsoe@gmail.com>
- */
-class XcacheClassLoader
-{
-    private $prefix;
-
-    /**
-     * A class loader object that implements the findFile() method.
-     *
-     * @var object
-     */
-    private $decorated;
-
-    /**
-     * Constructor.
-     *
-     * @param string $prefix    The XCache namespace prefix to use.
-     * @param object $decorated A class loader object that implements the findFile() method.
-     *
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($prefix, $decorated)
-    {
-        if (!extension_loaded('xcache')) {
-            throw new \RuntimeException('Unable to use XcacheClassLoader as XCache is not enabled.');
-        }
-
-        if (!method_exists($decorated, 'findFile')) {
-            throw new \InvalidArgumentException('The class finder must implement a "findFile" method.');
-        }
-
-        $this->prefix = $prefix;
-        $this->decorated = $decorated;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            require $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds a file by class name while caching lookups to Xcache.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null
-     */
-    public function findFile($class)
-    {
-        if (xcache_isset($this->prefix.$class)) {
-            $file = xcache_get($this->prefix.$class);
-        } else {
-            $file = $this->decorated->findFile($class);
-            xcache_set($this->prefix.$class, $file);
-        }
-
-        return $file;
-    }
-
-    /**
-     * Passes through all unknown calls onto the decorated object.
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->decorated, $method), $args);
-    }
-}
diff --git a/vendor/symfony/class-loader/composer.json b/vendor/symfony/class-loader/composer.json
deleted file mode 100644
index 828e598..0000000
--- a/vendor/symfony/class-loader/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/class-loader",
-    "type": "library",
-    "description": "Symfony ClassLoader Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "minimum-stability": "dev",
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/finder": "~2.0,>=2.0.5"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\ClassLoader\\": "" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/class-loader/phpunit.xml.dist b/vendor/symfony/class-loader/phpunit.xml.dist
deleted file mode 100644
index 4856db5..0000000
--- a/vendor/symfony/class-loader/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony ClassLoader Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/console/.gitignore b/vendor/symfony/console/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/console/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php
deleted file mode 100644
index e386337..0000000
--- a/vendor/symfony/console/Application.php
+++ /dev/null
@@ -1,1139 +0,0 @@
-<?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\Component\Console;
-
-use Symfony\Component\Console\Descriptor\TextDescriptor;
-use Symfony\Component\Console\Descriptor\XmlDescriptor;
-use Symfony\Component\Console\Helper\DebugFormatterHelper;
-use Symfony\Component\Console\Helper\ProcessHelper;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputAwareInterface;
-use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Command\HelpCommand;
-use Symfony\Component\Console\Command\ListCommand;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Helper\FormatterHelper;
-use Symfony\Component\Console\Helper\DialogHelper;
-use Symfony\Component\Console\Helper\ProgressHelper;
-use Symfony\Component\Console\Helper\TableHelper;
-use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Event\ConsoleExceptionEvent;
-use Symfony\Component\Console\Event\ConsoleTerminateEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * An Application is the container for a collection of commands.
- *
- * It is the main entry point of a Console application.
- *
- * This class is optimized for a standard CLI environment.
- *
- * Usage:
- *
- *     $app = new Application('myapp', '1.0 (stable)');
- *     $app->add(new SimpleCommand());
- *     $app->run();
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Application
-{
-    private $commands = array();
-    private $wantHelps = false;
-    private $runningCommand;
-    private $name;
-    private $version;
-    private $catchExceptions = true;
-    private $autoExit = true;
-    private $definition;
-    private $helperSet;
-    private $dispatcher;
-    private $terminalDimensions;
-    private $defaultCommand;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name    The name of the application
-     * @param string $version The version of the application
-     */
-    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
-    {
-        $this->name = $name;
-        $this->version = $version;
-        $this->defaultCommand = 'list';
-        $this->helperSet = $this->getDefaultHelperSet();
-        $this->definition = $this->getDefaultInputDefinition();
-
-        foreach ($this->getDefaultCommands() as $command) {
-            $this->add($command);
-        }
-    }
-
-    public function setDispatcher(EventDispatcherInterface $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * Runs the current application.
-     *
-     * @param InputInterface  $input  An Input instance
-     * @param OutputInterface $output An Output instance
-     *
-     * @return int 0 if everything went fine, or an error code
-     *
-     * @throws \Exception When doRun returns Exception
-     */
-    public function run(InputInterface $input = null, OutputInterface $output = null)
-    {
-        if (null === $input) {
-            $input = new ArgvInput();
-        }
-
-        if (null === $output) {
-            $output = new ConsoleOutput();
-        }
-
-        $this->configureIO($input, $output);
-
-        try {
-            $exitCode = $this->doRun($input, $output);
-        } catch (\Exception $e) {
-            if (!$this->catchExceptions) {
-                throw $e;
-            }
-
-            if ($output instanceof ConsoleOutputInterface) {
-                $this->renderException($e, $output->getErrorOutput());
-            } else {
-                $this->renderException($e, $output);
-            }
-
-            $exitCode = $e->getCode();
-            if (is_numeric($exitCode)) {
-                $exitCode = (int) $exitCode;
-                if (0 === $exitCode) {
-                    $exitCode = 1;
-                }
-            } else {
-                $exitCode = 1;
-            }
-        }
-
-        if ($this->autoExit) {
-            if ($exitCode > 255) {
-                $exitCode = 255;
-            }
-
-            exit($exitCode);
-        }
-
-        return $exitCode;
-    }
-
-    /**
-     * Runs the current application.
-     *
-     * @param InputInterface  $input  An Input instance
-     * @param OutputInterface $output An Output instance
-     *
-     * @return int 0 if everything went fine, or an error code
-     */
-    public function doRun(InputInterface $input, OutputInterface $output)
-    {
-        if (true === $input->hasParameterOption(array('--version', '-V'))) {
-            $output->writeln($this->getLongVersion());
-
-            return 0;
-        }
-
-        $name = $this->getCommandName($input);
-        if (true === $input->hasParameterOption(array('--help', '-h'))) {
-            if (!$name) {
-                $name = 'help';
-                $input = new ArrayInput(array('command' => 'help'));
-            } else {
-                $this->wantHelps = true;
-            }
-        }
-
-        if (!$name) {
-            $name = $this->defaultCommand;
-            $input = new ArrayInput(array('command' => $this->defaultCommand));
-        }
-
-        // the command name MUST be the first element of the input
-        $command = $this->find($name);
-
-        $this->runningCommand = $command;
-        $exitCode = $this->doRunCommand($command, $input, $output);
-        $this->runningCommand = null;
-
-        return $exitCode;
-    }
-
-    /**
-     * Set a helper set to be used with the command.
-     *
-     * @param HelperSet $helperSet The helper set
-     */
-    public function setHelperSet(HelperSet $helperSet)
-    {
-        $this->helperSet = $helperSet;
-    }
-
-    /**
-     * Get the helper set associated with the command.
-     *
-     * @return HelperSet The HelperSet instance associated with this command
-     */
-    public function getHelperSet()
-    {
-        return $this->helperSet;
-    }
-
-    /**
-     * Set an input definition set to be used with this application.
-     *
-     * @param InputDefinition $definition The input definition
-     */
-    public function setDefinition(InputDefinition $definition)
-    {
-        $this->definition = $definition;
-    }
-
-    /**
-     * Gets the InputDefinition related to this Application.
-     *
-     * @return InputDefinition The InputDefinition instance
-     */
-    public function getDefinition()
-    {
-        return $this->definition;
-    }
-
-    /**
-     * Gets the help message.
-     *
-     * @return string A help message.
-     */
-    public function getHelp()
-    {
-        return $this->getLongVersion();
-    }
-
-    /**
-     * Sets whether to catch exceptions or not during commands execution.
-     *
-     * @param bool $boolean Whether to catch exceptions or not during commands execution
-     */
-    public function setCatchExceptions($boolean)
-    {
-        $this->catchExceptions = (bool) $boolean;
-    }
-
-    /**
-     * Sets whether to automatically exit after a command execution or not.
-     *
-     * @param bool $boolean Whether to automatically exit after a command execution or not
-     */
-    public function setAutoExit($boolean)
-    {
-        $this->autoExit = (bool) $boolean;
-    }
-
-    /**
-     * Gets the name of the application.
-     *
-     * @return string The application name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Sets the application name.
-     *
-     * @param string $name The application name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Gets the application version.
-     *
-     * @return string The application version
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Sets the application version.
-     *
-     * @param string $version The application version
-     */
-    public function setVersion($version)
-    {
-        $this->version = $version;
-    }
-
-    /**
-     * Returns the long version of the application.
-     *
-     * @return string The long application version
-     */
-    public function getLongVersion()
-    {
-        if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
-            return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
-        }
-
-        return '<info>Console Tool</info>';
-    }
-
-    /**
-     * Registers a new command.
-     *
-     * @param string $name The command name
-     *
-     * @return Command The newly created command
-     */
-    public function register($name)
-    {
-        return $this->add(new Command($name));
-    }
-
-    /**
-     * Adds an array of command objects.
-     *
-     * @param Command[] $commands An array of commands
-     */
-    public function addCommands(array $commands)
-    {
-        foreach ($commands as $command) {
-            $this->add($command);
-        }
-    }
-
-    /**
-     * Adds a command object.
-     *
-     * If a command with the same name already exists, it will be overridden.
-     *
-     * @param Command $command A Command object
-     *
-     * @return Command The registered command
-     */
-    public function add(Command $command)
-    {
-        $command->setApplication($this);
-
-        if (!$command->isEnabled()) {
-            $command->setApplication(null);
-
-            return;
-        }
-
-        if (null === $command->getDefinition()) {
-            throw new \LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command)));
-        }
-
-        $this->commands[$command->getName()] = $command;
-
-        foreach ($command->getAliases() as $alias) {
-            $this->commands[$alias] = $command;
-        }
-
-        return $command;
-    }
-
-    /**
-     * Returns a registered command by name or alias.
-     *
-     * @param string $name The command name or alias
-     *
-     * @return Command A Command object
-     *
-     * @throws \InvalidArgumentException When command name given does not exist
-     */
-    public function get($name)
-    {
-        if (!isset($this->commands[$name])) {
-            throw new \InvalidArgumentException(sprintf('The command "%s" does not exist.', $name));
-        }
-
-        $command = $this->commands[$name];
-
-        if ($this->wantHelps) {
-            $this->wantHelps = false;
-
-            $helpCommand = $this->get('help');
-            $helpCommand->setCommand($command);
-
-            return $helpCommand;
-        }
-
-        return $command;
-    }
-
-    /**
-     * Returns true if the command exists, false otherwise.
-     *
-     * @param string $name The command name or alias
-     *
-     * @return bool true if the command exists, false otherwise
-     */
-    public function has($name)
-    {
-        return isset($this->commands[$name]);
-    }
-
-    /**
-     * Returns an array of all unique namespaces used by currently registered commands.
-     *
-     * It does not returns the global namespace which always exists.
-     *
-     * @return array An array of namespaces
-     */
-    public function getNamespaces()
-    {
-        $namespaces = array();
-        foreach ($this->commands as $command) {
-            $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
-
-            foreach ($command->getAliases() as $alias) {
-                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias));
-            }
-        }
-
-        return array_values(array_unique(array_filter($namespaces)));
-    }
-
-    /**
-     * Finds a registered namespace by a name or an abbreviation.
-     *
-     * @param string $namespace A namespace or abbreviation to search for
-     *
-     * @return string A registered namespace
-     *
-     * @throws \InvalidArgumentException When namespace is incorrect or ambiguous
-     */
-    public function findNamespace($namespace)
-    {
-        $allNamespaces = $this->getNamespaces();
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $namespace);
-        $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
-
-        if (empty($namespaces)) {
-            $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
-
-            if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
-                if (1 == count($alternatives)) {
-                    $message .= "\n\nDid you mean this?\n    ";
-                } else {
-                    $message .= "\n\nDid you mean one of these?\n    ";
-                }
-
-                $message .= implode("\n    ", $alternatives);
-            }
-
-            throw new \InvalidArgumentException($message);
-        }
-
-        $exact = in_array($namespace, $namespaces, true);
-        if (count($namespaces) > 1 && !$exact) {
-            throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))));
-        }
-
-        return $exact ? $namespace : reset($namespaces);
-    }
-
-    /**
-     * Finds a command by name or alias.
-     *
-     * Contrary to get, this command tries to find the best
-     * match if you give it an abbreviation of a name or alias.
-     *
-     * @param string $name A command name or a command alias
-     *
-     * @return Command A Command instance
-     *
-     * @throws \InvalidArgumentException When command name is incorrect or ambiguous
-     */
-    public function find($name)
-    {
-        $allCommands = array_keys($this->commands);
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) { return preg_quote($matches[1]).'[^:]*'; }, $name);
-        $commands = preg_grep('{^'.$expr.'}', $allCommands);
-
-        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
-            if (false !== $pos = strrpos($name, ':')) {
-                // check if a namespace exists and contains commands
-                $this->findNamespace(substr($name, 0, $pos));
-            }
-
-            $message = sprintf('Command "%s" is not defined.', $name);
-
-            if ($alternatives = $this->findAlternatives($name, $allCommands)) {
-                if (1 == count($alternatives)) {
-                    $message .= "\n\nDid you mean this?\n    ";
-                } else {
-                    $message .= "\n\nDid you mean one of these?\n    ";
-                }
-                $message .= implode("\n    ", $alternatives);
-            }
-
-            throw new \InvalidArgumentException($message);
-        }
-
-        // filter out aliases for commands which are already on the list
-        if (count($commands) > 1) {
-            $commandList = $this->commands;
-            $commands = array_filter($commands, function ($nameOrAlias) use ($commandList, $commands) {
-                $commandName = $commandList[$nameOrAlias]->getName();
-
-                return $commandName === $nameOrAlias || !in_array($commandName, $commands);
-            });
-        }
-
-        $exact = in_array($name, $commands, true);
-        if (count($commands) > 1 && !$exact) {
-            $suggestions = $this->getAbbreviationSuggestions(array_values($commands));
-
-            throw new \InvalidArgumentException(sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions));
-        }
-
-        return $this->get($exact ? $name : reset($commands));
-    }
-
-    /**
-     * Gets the commands (registered in the given namespace if provided).
-     *
-     * The array keys are the full names and the values the command instances.
-     *
-     * @param string $namespace A namespace name
-     *
-     * @return Command[] An array of Command instances
-     */
-    public function all($namespace = null)
-    {
-        if (null === $namespace) {
-            return $this->commands;
-        }
-
-        $commands = array();
-        foreach ($this->commands as $name => $command) {
-            if ($namespace === $this->extractNamespace($name, substr_count($namespace, ':') + 1)) {
-                $commands[$name] = $command;
-            }
-        }
-
-        return $commands;
-    }
-
-    /**
-     * Returns an array of possible abbreviations given a set of names.
-     *
-     * @param array $names An array of names
-     *
-     * @return array An array of abbreviations
-     */
-    public static function getAbbreviations($names)
-    {
-        $abbrevs = array();
-        foreach ($names as $name) {
-            for ($len = strlen($name); $len > 0; --$len) {
-                $abbrev = substr($name, 0, $len);
-                $abbrevs[$abbrev][] = $name;
-            }
-        }
-
-        return $abbrevs;
-    }
-
-    /**
-     * Returns a text representation of the Application.
-     *
-     * @param string $namespace An optional namespace name
-     * @param bool   $raw       Whether to return raw command list
-     *
-     * @return string A string representing the Application
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asText($namespace = null, $raw = false)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new TextDescriptor();
-        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, !$raw);
-        $descriptor->describe($output, $this, array('namespace' => $namespace, 'raw_output' => true));
-
-        return $output->fetch();
-    }
-
-    /**
-     * Returns an XML representation of the Application.
-     *
-     * @param string $namespace An optional namespace name
-     * @param bool   $asDom     Whether to return a DOM or an XML string
-     *
-     * @return string|\DOMDocument An XML string representing the Application
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asXml($namespace = null, $asDom = false)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new XmlDescriptor();
-
-        if ($asDom) {
-            return $descriptor->getApplicationDocument($this, $namespace);
-        }
-
-        $output = new BufferedOutput();
-        $descriptor->describe($output, $this, array('namespace' => $namespace));
-
-        return $output->fetch();
-    }
-
-    /**
-     * Renders a caught exception.
-     *
-     * @param \Exception      $e      An exception instance
-     * @param OutputInterface $output An OutputInterface instance
-     */
-    public function renderException($e, $output)
-    {
-        do {
-            $title = sprintf('  [%s]  ', get_class($e));
-
-            $len = $this->stringWidth($title);
-
-            $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
-            // HHVM only accepts 32 bits integer in str_split, even when PHP_INT_MAX is a 64 bit integer: https://github.com/facebook/hhvm/issues/1327
-            if (defined('HHVM_VERSION') && $width > 1 << 31) {
-                $width = 1 << 31;
-            }
-            $formatter = $output->getFormatter();
-            $lines = array();
-            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
-                foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
-                    // pre-format lines to get the right string length
-                    $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;
-                    $lines[] = array($line, $lineLength);
-
-                    $len = max($lineLength, $len);
-                }
-            }
-
-            $messages = array('', '');
-            $messages[] = $emptyLine = $formatter->format(sprintf('<error>%s</error>', str_repeat(' ', $len)));
-            $messages[] = $formatter->format(sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title)))));
-            foreach ($lines as $line) {
-                $messages[] = $formatter->format(sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1])));
-            }
-            $messages[] = $emptyLine;
-            $messages[] = '';
-            $messages[] = '';
-
-            $output->writeln($messages, OutputInterface::OUTPUT_RAW);
-
-            if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $output->writeln('<comment>Exception trace:</comment>');
-
-                // exception related properties
-                $trace = $e->getTrace();
-                array_unshift($trace, array(
-                    'function' => '',
-                    'file' => $e->getFile() !== null ? $e->getFile() : 'n/a',
-                    'line' => $e->getLine() !== null ? $e->getLine() : 'n/a',
-                    'args' => array(),
-                ));
-
-                for ($i = 0, $count = count($trace); $i < $count; ++$i) {
-                    $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
-                    $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
-                    $function = $trace[$i]['function'];
-                    $file = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a';
-                    $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
-
-                    $output->writeln(sprintf(' %s%s%s() at <info>%s:%s</info>', $class, $type, $function, $file, $line));
-                }
-
-                $output->writeln('');
-                $output->writeln('');
-            }
-        } while ($e = $e->getPrevious());
-
-        if (null !== $this->runningCommand) {
-            $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())));
-            $output->writeln('');
-            $output->writeln('');
-        }
-    }
-
-    /**
-     * Tries to figure out the terminal width in which this application runs.
-     *
-     * @return int|null
-     */
-    protected function getTerminalWidth()
-    {
-        $dimensions = $this->getTerminalDimensions();
-
-        return $dimensions[0];
-    }
-
-    /**
-     * Tries to figure out the terminal height in which this application runs.
-     *
-     * @return int|null
-     */
-    protected function getTerminalHeight()
-    {
-        $dimensions = $this->getTerminalDimensions();
-
-        return $dimensions[1];
-    }
-
-    /**
-     * Tries to figure out the terminal dimensions based on the current environment.
-     *
-     * @return array Array containing width and height
-     */
-    public function getTerminalDimensions()
-    {
-        if ($this->terminalDimensions) {
-            return $this->terminalDimensions;
-        }
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            // extract [w, H] from "wxh (WxH)"
-            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
-                return array((int) $matches[1], (int) $matches[2]);
-            }
-            // extract [w, h] from "wxh"
-            if (preg_match('/^(\d+)x(\d+)$/', $this->getConsoleMode(), $matches)) {
-                return array((int) $matches[1], (int) $matches[2]);
-            }
-        }
-
-        if ($sttyString = $this->getSttyColumns()) {
-            // extract [w, h] from "rows h; columns w;"
-            if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
-                return array((int) $matches[2], (int) $matches[1]);
-            }
-            // extract [w, h] from "; h rows; w columns"
-            if (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
-                return array((int) $matches[2], (int) $matches[1]);
-            }
-        }
-
-        return array(null, null);
-    }
-
-    /**
-     * Sets terminal dimensions.
-     *
-     * Can be useful to force terminal dimensions for functional tests.
-     *
-     * @param int $width  The width
-     * @param int $height The height
-     *
-     * @return Application The current application
-     */
-    public function setTerminalDimensions($width, $height)
-    {
-        $this->terminalDimensions = array($width, $height);
-
-        return $this;
-    }
-
-    /**
-     * Configures the input and output instances based on the user arguments and options.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     */
-    protected function configureIO(InputInterface $input, OutputInterface $output)
-    {
-        if (true === $input->hasParameterOption(array('--ansi'))) {
-            $output->setDecorated(true);
-        } elseif (true === $input->hasParameterOption(array('--no-ansi'))) {
-            $output->setDecorated(false);
-        }
-
-        if (true === $input->hasParameterOption(array('--no-interaction', '-n'))) {
-            $input->setInteractive(false);
-        } elseif (function_exists('posix_isatty') && $this->getHelperSet()->has('question')) {
-            $inputStream = $this->getHelperSet()->get('question')->getInputStream();
-            if (!@posix_isatty($inputStream) && false === getenv('SHELL_INTERACTIVE')) {
-                $input->setInteractive(false);
-            }
-        }
-
-        if (true === $input->hasParameterOption(array('--quiet', '-q'))) {
-            $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-        } else {
-            if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || $input->getParameterOption('--verbose') === 3) {
-                $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
-            } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || $input->getParameterOption('--verbose') === 2) {
-                $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
-            } elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') || $input->hasParameterOption('--verbose') || $input->getParameterOption('--verbose')) {
-                $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
-            }
-        }
-    }
-
-    /**
-     * Runs the current command.
-     *
-     * If an event dispatcher has been attached to the application,
-     * events are also dispatched during the life-cycle of the command.
-     *
-     * @param Command         $command A Command instance
-     * @param InputInterface  $input   An Input instance
-     * @param OutputInterface $output  An Output instance
-     *
-     * @return int 0 if everything went fine, or an error code
-     *
-     * @throws \Exception when the command being run threw an exception
-     */
-    protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
-    {
-        foreach ($command->getHelperSet() as $helper) {
-            if ($helper instanceof InputAwareInterface) {
-                $helper->setInput($input);
-            }
-        }
-
-        if (null === $this->dispatcher) {
-            return $command->run($input, $output);
-        }
-
-        $event = new ConsoleCommandEvent($command, $input, $output);
-        $this->dispatcher->dispatch(ConsoleEvents::COMMAND, $event);
-
-        if ($event->commandShouldRun()) {
-            try {
-                $exitCode = $command->run($input, $output);
-            } catch (\Exception $e) {
-                $event = new ConsoleExceptionEvent($command, $input, $output, $e, $e->getCode());
-                $this->dispatcher->dispatch(ConsoleEvents::EXCEPTION, $event);
-
-                $e = $event->getException();
-
-                $event = new ConsoleTerminateEvent($command, $input, $output, $e->getCode());
-                $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
-
-                throw $e;
-            }
-        } else {
-            $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
-        }
-
-        $event = new ConsoleTerminateEvent($command, $input, $output, $exitCode);
-        $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
-
-        return $event->getExitCode();
-    }
-
-    /**
-     * Gets the name of the command based on input.
-     *
-     * @param InputInterface $input The input interface
-     *
-     * @return string The command name
-     */
-    protected function getCommandName(InputInterface $input)
-    {
-        return $input->getFirstArgument();
-    }
-
-    /**
-     * Gets the default input definition.
-     *
-     * @return InputDefinition An InputDefinition instance
-     */
-    protected function getDefaultInputDefinition()
-    {
-        return new InputDefinition(array(
-            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
-
-            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
-            new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
-            new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
-            new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
-            new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
-            new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
-            new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
-        ));
-    }
-
-    /**
-     * Gets the default commands that should always be available.
-     *
-     * @return Command[] An array of default Command instances
-     */
-    protected function getDefaultCommands()
-    {
-        return array(new HelpCommand(), new ListCommand());
-    }
-
-    /**
-     * Gets the default helper set with the helpers that should always be available.
-     *
-     * @return HelperSet A HelperSet instance
-     */
-    protected function getDefaultHelperSet()
-    {
-        return new HelperSet(array(
-            new FormatterHelper(),
-            new DialogHelper(false),
-            new ProgressHelper(false),
-            new TableHelper(false),
-            new DebugFormatterHelper(),
-            new ProcessHelper(),
-            new QuestionHelper(),
-        ));
-    }
-
-    /**
-     * Runs and parses stty -a if it's available, suppressing any error output.
-     *
-     * @return string
-     */
-    private function getSttyColumns()
-    {
-        if (!function_exists('proc_open')) {
-            return;
-        }
-
-        $descriptorspec = array(1 => array('pipe', 'w'), 2 => array('pipe', 'w'));
-        $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
-        if (is_resource($process)) {
-            $info = stream_get_contents($pipes[1]);
-            fclose($pipes[1]);
-            fclose($pipes[2]);
-            proc_close($process);
-
-            return $info;
-        }
-    }
-
-    /**
-     * Runs and parses mode CON if it's available, suppressing any error output.
-     *
-     * @return string <width>x<height> or null if it could not be parsed
-     */
-    private function getConsoleMode()
-    {
-        if (!function_exists('proc_open')) {
-            return;
-        }
-
-        $descriptorspec = array(1 => array('pipe', 'w'), 2 => array('pipe', 'w'));
-        $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, array('suppress_errors' => true));
-        if (is_resource($process)) {
-            $info = stream_get_contents($pipes[1]);
-            fclose($pipes[1]);
-            fclose($pipes[2]);
-            proc_close($process);
-
-            if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return $matches[2].'x'.$matches[1];
-            }
-        }
-    }
-
-    /**
-     * Returns abbreviated suggestions in string format.
-     *
-     * @param array $abbrevs Abbreviated suggestions to convert
-     *
-     * @return string A formatted string of abbreviated suggestions
-     */
-    private function getAbbreviationSuggestions($abbrevs)
-    {
-        return sprintf('%s, %s%s', $abbrevs[0], $abbrevs[1], count($abbrevs) > 2 ? sprintf(' and %d more', count($abbrevs) - 2) : '');
-    }
-
-    /**
-     * Returns the namespace part of the command name.
-     *
-     * This method is not part of public API and should not be used directly.
-     *
-     * @param string $name  The full name of the command
-     * @param string $limit The maximum number of parts of the namespace
-     *
-     * @return string The namespace of the command
-     */
-    public function extractNamespace($name, $limit = null)
-    {
-        $parts = explode(':', $name);
-        array_pop($parts);
-
-        return implode(':', null === $limit ? $parts : array_slice($parts, 0, $limit));
-    }
-
-    /**
-     * Finds alternative of $name among $collection,
-     * if nothing is found in $collection, try in $abbrevs.
-     *
-     * @param string             $name       The string
-     * @param array|\Traversable $collection The collection
-     *
-     * @return array A sorted array of similar string
-     */
-    private function findAlternatives($name, $collection)
-    {
-        $threshold = 1e3;
-        $alternatives = array();
-
-        $collectionParts = array();
-        foreach ($collection as $item) {
-            $collectionParts[$item] = explode(':', $item);
-        }
-
-        foreach (explode(':', $name) as $i => $subname) {
-            foreach ($collectionParts as $collectionName => $parts) {
-                $exists = isset($alternatives[$collectionName]);
-                if (!isset($parts[$i]) && $exists) {
-                    $alternatives[$collectionName] += $threshold;
-                    continue;
-                } elseif (!isset($parts[$i])) {
-                    continue;
-                }
-
-                $lev = levenshtein($subname, $parts[$i]);
-                if ($lev <= strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) {
-                    $alternatives[$collectionName] = $exists ? $alternatives[$collectionName] + $lev : $lev;
-                } elseif ($exists) {
-                    $alternatives[$collectionName] += $threshold;
-                }
-            }
-        }
-
-        foreach ($collection as $item) {
-            $lev = levenshtein($name, $item);
-            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
-                $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev;
-            }
-        }
-
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) { return $lev < 2 * $threshold; });
-        asort($alternatives);
-
-        return array_keys($alternatives);
-    }
-
-    /**
-     * Sets the default Command name.
-     *
-     * @param string $commandName The Command name
-     */
-    public function setDefaultCommand($commandName)
-    {
-        $this->defaultCommand = $commandName;
-    }
-
-    private function stringWidth($string)
-    {
-        if (!function_exists('mb_strwidth')) {
-            return strlen($string);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
-            return strlen($string);
-        }
-
-        return mb_strwidth($string, $encoding);
-    }
-
-    private function splitStringByWidth($string, $width)
-    {
-        // str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly.
-        // additionally, array_slice() is not enough as some character has doubled width.
-        // we need a function to split string not by character count but by string width
-
-        if (!function_exists('mb_strwidth')) {
-            return str_split($string, $width);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
-            return str_split($string, $width);
-        }
-
-        $utf8String = mb_convert_encoding($string, 'utf8', $encoding);
-        $lines = array();
-        $line = '';
-        foreach (preg_split('//u', $utf8String) as $char) {
-            // test if $char could be appended to current line
-            if (mb_strwidth($line.$char, 'utf8') <= $width) {
-                $line .= $char;
-                continue;
-            }
-            // if not, push current line to array and make new line
-            $lines[] = str_pad($line, $width);
-            $line = $char;
-        }
-        if ('' !== $line) {
-            $lines[] = count($lines) ? str_pad($line, $width) : $line;
-        }
-
-        mb_convert_variables($encoding, 'utf8', $lines);
-
-        return $lines;
-    }
-
-    /**
-     * Returns all namespaces of the command name.
-     *
-     * @param string $name The full name of the command
-     *
-     * @return array The namespaces of the command
-     */
-    private function extractAllNamespaces($name)
-    {
-        // -1 as third argument is needed to skip the command short name when exploding
-        $parts = explode(':', $name, -1);
-        $namespaces = array();
-
-        foreach ($parts as $part) {
-            if (count($namespaces)) {
-                $namespaces[] = end($namespaces).':'.$part;
-            } else {
-                $namespaces[] = $part;
-            }
-        }
-
-        return $namespaces;
-    }
-}
diff --git a/vendor/symfony/console/CHANGELOG.md b/vendor/symfony/console/CHANGELOG.md
deleted file mode 100644
index 07254c6..0000000
--- a/vendor/symfony/console/CHANGELOG.md
+++ /dev/null
@@ -1,62 +0,0 @@
-CHANGELOG
-=========
-
-2.6.0
------
-
- * added a Process helper
- * added a DebugFormatter helper
-
-2.5.0
------
-
- * deprecated the dialog helper (use the question helper instead)
- * deprecated TableHelper in favor of Table
- * deprecated ProgressHelper in favor of ProgressBar
- * added ConsoleLogger
- * added a question helper
- * added a way to set the process name of a command
- * added a way to set a default command instead of `ListCommand`
-
-2.4.0
------
-
- * added a way to force terminal dimensions
- * added a convenient method to detect verbosity level
- * [BC BREAK] made descriptors use output instead of returning a string
-
-2.3.0
------
-
- * added multiselect support to the select dialog helper
- * added Table Helper for tabular data rendering
- * added support for events in `Application`
- * added a way to normalize EOLs in `ApplicationTester::getDisplay()` and `CommandTester::getDisplay()`
- * added a way to set the progress bar progress via the `setCurrent` method
- * added support for multiple InputOption shortcuts, written as `'-a|-b|-c'`
- * added two additional verbosity levels, VERBOSITY_VERY_VERBOSE and VERBOSITY_DEBUG
-
-2.2.0
------
-
- * added support for colorization on Windows via ConEmu
- * add a method to Dialog Helper to ask for a question and hide the response
- * added support for interactive selections in console (DialogHelper::select())
- * added support for autocompletion as you type in Dialog Helper
-
-2.1.0
------
-
- * added ConsoleOutputInterface
- * added the possibility to disable a command (Command::isEnabled())
- * added suggestions when a command does not exist
- * added a --raw option to the list command
- * added support for STDERR in the console output class (errors are now sent
-   to STDERR)
- * made the defaults (helper set, commands, input definition) in Application
-   more easily customizable
- * added support for the shell even if readline is not available
- * added support for process isolation in Symfony shell via
-   `--process-isolation` switch
- * added support for `--`, which disables options parsing after that point
-   (tokens will be parsed as arguments)
diff --git a/vendor/symfony/console/Command/Command.php b/vendor/symfony/console/Command/Command.php
deleted file mode 100644
index 51a8a39..0000000
--- a/vendor/symfony/console/Command/Command.php
+++ /dev/null
@@ -1,666 +0,0 @@
-<?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\Component\Console\Command;
-
-use Symfony\Component\Console\Descriptor\TextDescriptor;
-use Symfony\Component\Console\Descriptor\XmlDescriptor;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Helper\HelperSet;
-
-/**
- * Base class for all commands.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Command
-{
-    private $application;
-    private $name;
-    private $processTitle;
-    private $aliases = array();
-    private $definition;
-    private $help;
-    private $description;
-    private $ignoreValidationErrors = false;
-    private $applicationDefinitionMerged = false;
-    private $applicationDefinitionMergedWithArgs = false;
-    private $code;
-    private $synopsis = array();
-    private $usages = array();
-    private $helperSet;
-
-    /**
-     * Constructor.
-     *
-     * @param string|null $name The name of the command; passing null means it must be set in configure()
-     *
-     * @throws \LogicException When the command name is empty
-     */
-    public function __construct($name = null)
-    {
-        $this->definition = new InputDefinition();
-
-        if (null !== $name) {
-            $this->setName($name);
-        }
-
-        $this->configure();
-
-        if (!$this->name) {
-            throw new \LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_class($this)));
-        }
-    }
-
-    /**
-     * Ignores validation errors.
-     *
-     * This is mainly useful for the help command.
-     */
-    public function ignoreValidationErrors()
-    {
-        $this->ignoreValidationErrors = true;
-    }
-
-    /**
-     * Sets the application instance for this command.
-     *
-     * @param Application $application An Application instance
-     */
-    public function setApplication(Application $application = null)
-    {
-        $this->application = $application;
-        if ($application) {
-            $this->setHelperSet($application->getHelperSet());
-        } else {
-            $this->helperSet = null;
-        }
-    }
-
-    /**
-     * Sets the helper set.
-     *
-     * @param HelperSet $helperSet A HelperSet instance
-     */
-    public function setHelperSet(HelperSet $helperSet)
-    {
-        $this->helperSet = $helperSet;
-    }
-
-    /**
-     * Gets the helper set.
-     *
-     * @return HelperSet A HelperSet instance
-     */
-    public function getHelperSet()
-    {
-        return $this->helperSet;
-    }
-
-    /**
-     * Gets the application instance for this command.
-     *
-     * @return Application An Application instance
-     */
-    public function getApplication()
-    {
-        return $this->application;
-    }
-
-    /**
-     * Checks whether the command is enabled or not in the current environment.
-     *
-     * Override this to check for x or y and return false if the command can not
-     * run properly under the current conditions.
-     *
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return true;
-    }
-
-    /**
-     * Configures the current command.
-     */
-    protected function configure()
-    {
-    }
-
-    /**
-     * Executes the current command.
-     *
-     * This method is not abstract because you can use this class
-     * as a concrete class. In this case, instead of defining the
-     * execute() method, you set the code to execute by passing
-     * a Closure to the setCode() method.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     *
-     * @return null|int null or 0 if everything went fine, or an error code
-     *
-     * @throws \LogicException When this abstract method is not implemented
-     *
-     * @see setCode()
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        throw new \LogicException('You must override the execute() method in the concrete command class.');
-    }
-
-    /**
-     * Interacts with the user.
-     *
-     * This method is executed before the InputDefinition is validated.
-     * This means that this is the only place where the command can
-     * interactively ask for values of missing required arguments.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     */
-    protected function interact(InputInterface $input, OutputInterface $output)
-    {
-    }
-
-    /**
-     * Initializes the command just after the input has been validated.
-     *
-     * This is mainly useful when a lot of commands extends one main command
-     * where some things need to be initialized based on the input arguments and options.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     */
-    protected function initialize(InputInterface $input, OutputInterface $output)
-    {
-    }
-
-    /**
-     * Runs the command.
-     *
-     * The code to execute is either defined directly with the
-     * setCode() method or by overriding the execute() method
-     * in a sub-class.
-     *
-     * @param InputInterface  $input  An InputInterface instance
-     * @param OutputInterface $output An OutputInterface instance
-     *
-     * @return int The command exit code
-     *
-     * @throws \Exception
-     *
-     * @see setCode()
-     * @see execute()
-     */
-    public function run(InputInterface $input, OutputInterface $output)
-    {
-        // force the creation of the synopsis before the merge with the app definition
-        $this->getSynopsis(true);
-        $this->getSynopsis(false);
-
-        // add the application arguments and options
-        $this->mergeApplicationDefinition();
-
-        // bind the input against the command specific arguments/options
-        try {
-            $input->bind($this->definition);
-        } catch (\Exception $e) {
-            if (!$this->ignoreValidationErrors) {
-                throw $e;
-            }
-        }
-
-        $this->initialize($input, $output);
-
-        if (null !== $this->processTitle) {
-            if (function_exists('cli_set_process_title')) {
-                cli_set_process_title($this->processTitle);
-            } elseif (function_exists('setproctitle')) {
-                setproctitle($this->processTitle);
-            } elseif (OutputInterface::VERBOSITY_VERY_VERBOSE === $output->getVerbosity()) {
-                $output->writeln('<comment>Install the proctitle PECL to be able to change the process title.</comment>');
-            }
-        }
-
-        if ($input->isInteractive()) {
-            $this->interact($input, $output);
-        }
-
-        // The command name argument is often omitted when a command is executed directly with its run() method.
-        // It would fail the validation if we didn't make sure the command argument is present,
-        // since it's required by the application.
-        if ($input->hasArgument('command') && null === $input->getArgument('command')) {
-            $input->setArgument('command', $this->getName());
-        }
-
-        $input->validate();
-
-        if ($this->code) {
-            $statusCode = call_user_func($this->code, $input, $output);
-        } else {
-            $statusCode = $this->execute($input, $output);
-        }
-
-        return is_numeric($statusCode) ? (int) $statusCode : 0;
-    }
-
-    /**
-     * Sets the code to execute when running this command.
-     *
-     * If this method is used, it overrides the code defined
-     * in the execute() method.
-     *
-     * @param callable $code A callable(InputInterface $input, OutputInterface $output)
-     *
-     * @return Command The current instance
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @see execute()
-     */
-    public function setCode($code)
-    {
-        if (!is_callable($code)) {
-            throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.');
-        }
-
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * Merges the application definition with the command definition.
-     *
-     * This method is not part of public API and should not be used directly.
-     *
-     * @param bool $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
-     */
-    public function mergeApplicationDefinition($mergeArgs = true)
-    {
-        if (null === $this->application || (true === $this->applicationDefinitionMerged && ($this->applicationDefinitionMergedWithArgs || !$mergeArgs))) {
-            return;
-        }
-
-        if ($mergeArgs) {
-            $currentArguments = $this->definition->getArguments();
-            $this->definition->setArguments($this->application->getDefinition()->getArguments());
-            $this->definition->addArguments($currentArguments);
-        }
-
-        $this->definition->addOptions($this->application->getDefinition()->getOptions());
-
-        $this->applicationDefinitionMerged = true;
-        if ($mergeArgs) {
-            $this->applicationDefinitionMergedWithArgs = true;
-        }
-    }
-
-    /**
-     * Sets an array of argument and option instances.
-     *
-     * @param array|InputDefinition $definition An array of argument and option instances or a definition instance
-     *
-     * @return Command The current instance
-     */
-    public function setDefinition($definition)
-    {
-        if ($definition instanceof InputDefinition) {
-            $this->definition = $definition;
-        } else {
-            $this->definition->setDefinition($definition);
-        }
-
-        $this->applicationDefinitionMerged = false;
-
-        return $this;
-    }
-
-    /**
-     * Gets the InputDefinition attached to this Command.
-     *
-     * @return InputDefinition An InputDefinition instance
-     */
-    public function getDefinition()
-    {
-        return $this->definition;
-    }
-
-    /**
-     * Gets the InputDefinition to be used to create XML and Text representations of this Command.
-     *
-     * Can be overridden to provide the original command representation when it would otherwise
-     * be changed by merging with the application InputDefinition.
-     *
-     * This method is not part of public API and should not be used directly.
-     *
-     * @return InputDefinition An InputDefinition instance
-     */
-    public function getNativeDefinition()
-    {
-        return $this->getDefinition();
-    }
-
-    /**
-     * Adds an argument.
-     *
-     * @param string $name        The argument name
-     * @param int    $mode        The argument mode: InputArgument::REQUIRED or InputArgument::OPTIONAL
-     * @param string $description A description text
-     * @param mixed  $default     The default value (for InputArgument::OPTIONAL mode only)
-     *
-     * @return Command The current instance
-     */
-    public function addArgument($name, $mode = null, $description = '', $default = null)
-    {
-        $this->definition->addArgument(new InputArgument($name, $mode, $description, $default));
-
-        return $this;
-    }
-
-    /**
-     * Adds an option.
-     *
-     * @param string $name        The option name
-     * @param string $shortcut    The shortcut (can be null)
-     * @param int    $mode        The option mode: One of the InputOption::VALUE_* constants
-     * @param string $description A description text
-     * @param mixed  $default     The default value (must be null for InputOption::VALUE_REQUIRED or InputOption::VALUE_NONE)
-     *
-     * @return Command The current instance
-     */
-    public function addOption($name, $shortcut = null, $mode = null, $description = '', $default = null)
-    {
-        $this->definition->addOption(new InputOption($name, $shortcut, $mode, $description, $default));
-
-        return $this;
-    }
-
-    /**
-     * Sets the name of the command.
-     *
-     * This method can set both the namespace and the name if
-     * you separate them by a colon (:)
-     *
-     *     $command->setName('foo:bar');
-     *
-     * @param string $name The command name
-     *
-     * @return Command The current instance
-     *
-     * @throws \InvalidArgumentException When the name is invalid
-     */
-    public function setName($name)
-    {
-        $this->validateName($name);
-
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Sets the process title of the command.
-     *
-     * This feature should be used only when creating a long process command,
-     * like a daemon.
-     *
-     * PHP 5.5+ or the proctitle PECL library is required
-     *
-     * @param string $title The process title
-     *
-     * @return Command The current instance
-     */
-    public function setProcessTitle($title)
-    {
-        $this->processTitle = $title;
-
-        return $this;
-    }
-
-    /**
-     * Returns the command name.
-     *
-     * @return string The command name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Sets the description for the command.
-     *
-     * @param string $description The description for the command
-     *
-     * @return Command The current instance
-     */
-    public function setDescription($description)
-    {
-        $this->description = $description;
-
-        return $this;
-    }
-
-    /**
-     * Returns the description for the command.
-     *
-     * @return string The description for the command
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Sets the help for the command.
-     *
-     * @param string $help The help for the command
-     *
-     * @return Command The current instance
-     */
-    public function setHelp($help)
-    {
-        $this->help = $help;
-
-        return $this;
-    }
-
-    /**
-     * Returns the help for the command.
-     *
-     * @return string The help for the command
-     */
-    public function getHelp()
-    {
-        return $this->help;
-    }
-
-    /**
-     * Returns the processed help for the command replacing the %command.name% and
-     * %command.full_name% patterns with the real values dynamically.
-     *
-     * @return string The processed help for the command
-     */
-    public function getProcessedHelp()
-    {
-        $name = $this->name;
-
-        $placeholders = array(
-            '%command.name%',
-            '%command.full_name%',
-        );
-        $replacements = array(
-            $name,
-            $_SERVER['PHP_SELF'].' '.$name,
-        );
-
-        return str_replace($placeholders, $replacements, $this->getHelp() ?: $this->getDescription());
-    }
-
-    /**
-     * Sets the aliases for the command.
-     *
-     * @param string[] $aliases An array of aliases for the command
-     *
-     * @return Command The current instance
-     *
-     * @throws \InvalidArgumentException When an alias is invalid
-     */
-    public function setAliases($aliases)
-    {
-        if (!is_array($aliases) && !$aliases instanceof \Traversable) {
-            throw new \InvalidArgumentException('$aliases must be an array or an instance of \Traversable');
-        }
-
-        foreach ($aliases as $alias) {
-            $this->validateName($alias);
-        }
-
-        $this->aliases = $aliases;
-
-        return $this;
-    }
-
-    /**
-     * Returns the aliases for the command.
-     *
-     * @return array An array of aliases for the command
-     */
-    public function getAliases()
-    {
-        return $this->aliases;
-    }
-
-    /**
-     * Returns the synopsis for the command.
-     *
-     * @param bool $short Whether to show the short version of the synopsis (with options folded) or not
-     *
-     * @return string The synopsis
-     */
-    public function getSynopsis($short = false)
-    {
-        $key = $short ? 'short' : 'long';
-
-        if (!isset($this->synopsis[$key])) {
-            $this->synopsis[$key] = trim(sprintf('%s %s', $this->name, $this->definition->getSynopsis($short)));
-        }
-
-        return $this->synopsis[$key];
-    }
-
-    /**
-     * Add a command usage example.
-     *
-     * @param string $usage The usage, it'll be prefixed with the command name
-     */
-    public function addUsage($usage)
-    {
-        if (0 !== strpos($usage, $this->name)) {
-            $usage = sprintf('%s %s', $this->name, $usage);
-        }
-
-        $this->usages[] = $usage;
-
-        return $this;
-    }
-
-    /**
-     * Returns alternative usages of the command.
-     *
-     * @return array
-     */
-    public function getUsages()
-    {
-        return $this->usages;
-    }
-
-    /**
-     * Gets a helper instance by name.
-     *
-     * @param string $name The helper name
-     *
-     * @return mixed The helper value
-     *
-     * @throws \InvalidArgumentException if the helper is not defined
-     */
-    public function getHelper($name)
-    {
-        return $this->helperSet->get($name);
-    }
-
-    /**
-     * Returns a text representation of the command.
-     *
-     * @return string A string representing the command
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asText()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new TextDescriptor();
-        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
-        $descriptor->describe($output, $this, array('raw_output' => true));
-
-        return $output->fetch();
-    }
-
-    /**
-     * Returns an XML representation of the command.
-     *
-     * @param bool $asDom Whether to return a DOM or an XML string
-     *
-     * @return string|\DOMDocument An XML string representing the command
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asXml($asDom = false)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new XmlDescriptor();
-
-        if ($asDom) {
-            return $descriptor->getCommandDocument($this);
-        }
-
-        $output = new BufferedOutput();
-        $descriptor->describe($output, $this);
-
-        return $output->fetch();
-    }
-
-    /**
-     * Validates a command name.
-     *
-     * It must be non-empty and parts can optionally be separated by ":".
-     *
-     * @param string $name
-     *
-     * @throws \InvalidArgumentException When the name is invalid
-     */
-    private function validateName($name)
-    {
-        if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
-            throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
-        }
-    }
-}
diff --git a/vendor/symfony/console/Command/HelpCommand.php b/vendor/symfony/console/Command/HelpCommand.php
deleted file mode 100644
index 8c20b57..0000000
--- a/vendor/symfony/console/Command/HelpCommand.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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\Component\Console\Command;
-
-use Symfony\Component\Console\Helper\DescriptorHelper;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * HelpCommand displays the help for a given command.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HelpCommand extends Command
-{
-    private $command;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->ignoreValidationErrors();
-
-        $this
-            ->setName('help')
-            ->setDefinition(array(
-                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
-                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
-                new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
-            ))
-            ->setDescription('Displays help for a command')
-            ->setHelp(<<<EOF
-The <info>%command.name%</info> command displays help for a given command:
-
-  <info>php %command.full_name% list</info>
-
-You can also output the help in other formats by using the <comment>--format</comment> option:
-
-  <info>php %command.full_name% --format=xml list</info>
-
-To display the list of available commands, please use the <info>list</info> command.
-EOF
-            )
-        ;
-    }
-
-    /**
-     * Sets the command.
-     *
-     * @param Command $command The command to set
-     */
-    public function setCommand(Command $command)
-    {
-        $this->command = $command;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        if (null === $this->command) {
-            $this->command = $this->getApplication()->find($input->getArgument('command_name'));
-        }
-
-        if ($input->getOption('xml')) {
-            @trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
-
-            $input->setOption('format', 'xml');
-        }
-
-        $helper = new DescriptorHelper();
-        $helper->describe($output, $this->command, array(
-            'format' => $input->getOption('format'),
-            'raw_text' => $input->getOption('raw'),
-        ));
-
-        $this->command = null;
-    }
-}
diff --git a/vendor/symfony/console/Command/ListCommand.php b/vendor/symfony/console/Command/ListCommand.php
deleted file mode 100644
index 5f970e8..0000000
--- a/vendor/symfony/console/Command/ListCommand.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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\Component\Console\Command;
-
-use Symfony\Component\Console\Helper\DescriptorHelper;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputDefinition;
-
-/**
- * ListCommand displays the list of all available commands for the application.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ListCommand extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-            ->setName('list')
-            ->setDefinition($this->createDefinition())
-            ->setDescription('Lists commands')
-            ->setHelp(<<<EOF
-The <info>%command.name%</info> command lists all commands:
-
-  <info>php %command.full_name%</info>
-
-You can also display the commands for a specific namespace:
-
-  <info>php %command.full_name% test</info>
-
-You can also output the information in other formats by using the <comment>--format</comment> option:
-
-  <info>php %command.full_name% --format=xml</info>
-
-It's also possible to get raw list of commands (useful for embedding command runner):
-
-  <info>php %command.full_name% --raw</info>
-EOF
-            )
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNativeDefinition()
-    {
-        return $this->createDefinition();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        if ($input->getOption('xml')) {
-            @trigger_error('The --xml option was deprecated in version 2.7 and will be removed in version 3.0. Use the --format option instead.', E_USER_DEPRECATED);
-
-            $input->setOption('format', 'xml');
-        }
-
-        $helper = new DescriptorHelper();
-        $helper->describe($output, $this->getApplication(), array(
-            'format' => $input->getOption('format'),
-            'raw_text' => $input->getOption('raw'),
-            'namespace' => $input->getArgument('namespace'),
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    private function createDefinition()
-    {
-        return new InputDefinition(array(
-            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
-            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
-            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
-        ));
-    }
-}
diff --git a/vendor/symfony/console/ConsoleEvents.php b/vendor/symfony/console/ConsoleEvents.php
deleted file mode 100644
index 1ed41b7..0000000
--- a/vendor/symfony/console/ConsoleEvents.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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\Component\Console;
-
-/**
- * Contains all events dispatched by an Application.
- *
- * @author Francesco Levorato <git@flevour.net>
- */
-final class ConsoleEvents
-{
-    /**
-     * The COMMAND event allows you to attach listeners before any command is
-     * executed by the console. It also allows you to modify the command, input and output
-     * before they are handled to the command.
-     *
-     * The event listener method receives a Symfony\Component\Console\Event\ConsoleCommandEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const COMMAND = 'console.command';
-
-    /**
-     * The TERMINATE event allows you to attach listeners after a command is
-     * executed by the console.
-     *
-     * The event listener method receives a Symfony\Component\Console\Event\ConsoleTerminateEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const TERMINATE = 'console.terminate';
-
-    /**
-     * The EXCEPTION event occurs when an uncaught exception appears.
-     *
-     * This event allows you to deal with the exception or
-     * to modify the thrown exception. The event listener method receives
-     * a Symfony\Component\Console\Event\ConsoleExceptionEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const EXCEPTION = 'console.exception';
-}
diff --git a/vendor/symfony/console/Descriptor/ApplicationDescription.php b/vendor/symfony/console/Descriptor/ApplicationDescription.php
deleted file mode 100644
index 0e87193..0000000
--- a/vendor/symfony/console/Descriptor/ApplicationDescription.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-
-/**
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- *
- * @internal
- */
-class ApplicationDescription
-{
-    const GLOBAL_NAMESPACE = '_global';
-
-    /**
-     * @var Application
-     */
-    private $application;
-
-    /**
-     * @var null|string
-     */
-    private $namespace;
-
-    /**
-     * @var array
-     */
-    private $namespaces;
-
-    /**
-     * @var Command[]
-     */
-    private $commands;
-
-    /**
-     * @var Command[]
-     */
-    private $aliases;
-
-    /**
-     * Constructor.
-     *
-     * @param Application $application
-     * @param string|null $namespace
-     */
-    public function __construct(Application $application, $namespace = null)
-    {
-        $this->application = $application;
-        $this->namespace = $namespace;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNamespaces()
-    {
-        if (null === $this->namespaces) {
-            $this->inspectApplication();
-        }
-
-        return $this->namespaces;
-    }
-
-    /**
-     * @return Command[]
-     */
-    public function getCommands()
-    {
-        if (null === $this->commands) {
-            $this->inspectApplication();
-        }
-
-        return $this->commands;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return Command
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function getCommand($name)
-    {
-        if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
-            throw new \InvalidArgumentException(sprintf('Command %s does not exist.', $name));
-        }
-
-        return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
-    }
-
-    private function inspectApplication()
-    {
-        $this->commands = array();
-        $this->namespaces = array();
-
-        $all = $this->application->all($this->namespace ? $this->application->findNamespace($this->namespace) : null);
-        foreach ($this->sortCommands($all) as $namespace => $commands) {
-            $names = array();
-
-            /** @var Command $command */
-            foreach ($commands as $name => $command) {
-                if (!$command->getName()) {
-                    continue;
-                }
-
-                if ($command->getName() === $name) {
-                    $this->commands[$name] = $command;
-                } else {
-                    $this->aliases[$name] = $command;
-                }
-
-                $names[] = $name;
-            }
-
-            $this->namespaces[$namespace] = array('id' => $namespace, 'commands' => $names);
-        }
-    }
-
-    /**
-     * @param array $commands
-     *
-     * @return array
-     */
-    private function sortCommands(array $commands)
-    {
-        $namespacedCommands = array();
-        $globalCommands = array();
-        foreach ($commands as $name => $command) {
-            $key = $this->application->extractNamespace($name, 1);
-            if (!$key) {
-                $globalCommands['_global'][$name] = $command;
-            } else {
-                $namespacedCommands[$key][$name] = $command;
-            }
-        }
-        ksort($namespacedCommands);
-        $namespacedCommands = array_merge($globalCommands, $namespacedCommands);
-
-        foreach ($namespacedCommands as &$commandsSet) {
-            ksort($commandsSet);
-        }
-        // unset reference to keep scope clear
-        unset($commandsSet);
-
-        return $namespacedCommands;
-    }
-}
diff --git a/vendor/symfony/console/Descriptor/Descriptor.php b/vendor/symfony/console/Descriptor/Descriptor.php
deleted file mode 100644
index 49e2193..0000000
--- a/vendor/symfony/console/Descriptor/Descriptor.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- *
- * @internal
- */
-abstract class Descriptor implements DescriptorInterface
-{
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describe(OutputInterface $output, $object, array $options = array())
-    {
-        $this->output = $output;
-
-        switch (true) {
-            case $object instanceof InputArgument:
-                $this->describeInputArgument($object, $options);
-                break;
-            case $object instanceof InputOption:
-                $this->describeInputOption($object, $options);
-                break;
-            case $object instanceof InputDefinition:
-                $this->describeInputDefinition($object, $options);
-                break;
-            case $object instanceof Command:
-                $this->describeCommand($object, $options);
-                break;
-            case $object instanceof Application:
-                $this->describeApplication($object, $options);
-                break;
-            default:
-                throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
-        }
-    }
-
-    /**
-     * Writes content to output.
-     *
-     * @param string $content
-     * @param bool   $decorated
-     */
-    protected function write($content, $decorated = false)
-    {
-        $this->output->write($content, false, $decorated ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW);
-    }
-
-    /**
-     * Describes an InputArgument instance.
-     *
-     * @param InputArgument $argument
-     * @param array         $options
-     *
-     * @return string|mixed
-     */
-    abstract protected function describeInputArgument(InputArgument $argument, array $options = array());
-
-    /**
-     * Describes an InputOption instance.
-     *
-     * @param InputOption $option
-     * @param array       $options
-     *
-     * @return string|mixed
-     */
-    abstract protected function describeInputOption(InputOption $option, array $options = array());
-
-    /**
-     * Describes an InputDefinition instance.
-     *
-     * @param InputDefinition $definition
-     * @param array           $options
-     *
-     * @return string|mixed
-     */
-    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = array());
-
-    /**
-     * Describes a Command instance.
-     *
-     * @param Command $command
-     * @param array   $options
-     *
-     * @return string|mixed
-     */
-    abstract protected function describeCommand(Command $command, array $options = array());
-
-    /**
-     * Describes an Application instance.
-     *
-     * @param Application $application
-     * @param array       $options
-     *
-     * @return string|mixed
-     */
-    abstract protected function describeApplication(Application $application, array $options = array());
-}
diff --git a/vendor/symfony/console/Descriptor/DescriptorInterface.php b/vendor/symfony/console/Descriptor/DescriptorInterface.php
deleted file mode 100644
index 3929b6d..0000000
--- a/vendor/symfony/console/Descriptor/DescriptorInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Descriptor interface.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-interface DescriptorInterface
-{
-    /**
-     * Describes an InputArgument instance.
-     *
-     * @param OutputInterface $output
-     * @param object          $object
-     * @param array           $options
-     */
-    public function describe(OutputInterface $output, $object, array $options = array());
-}
diff --git a/vendor/symfony/console/Descriptor/JsonDescriptor.php b/vendor/symfony/console/Descriptor/JsonDescriptor.php
deleted file mode 100644
index 87e38fd..0000000
--- a/vendor/symfony/console/Descriptor/JsonDescriptor.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * JSON descriptor.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- *
- * @internal
- */
-class JsonDescriptor extends Descriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
-    {
-        $this->writeData($this->getInputArgumentData($argument), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputOption(InputOption $option, array $options = array())
-    {
-        $this->writeData($this->getInputOptionData($option), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
-    {
-        $this->writeData($this->getInputDefinitionData($definition), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeCommand(Command $command, array $options = array())
-    {
-        $this->writeData($this->getCommandData($command), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeApplication(Application $application, array $options = array())
-    {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
-        $description = new ApplicationDescription($application, $describedNamespace);
-        $commands = array();
-
-        foreach ($description->getCommands() as $command) {
-            $commands[] = $this->getCommandData($command);
-        }
-
-        $data = $describedNamespace
-            ? array('commands' => $commands, 'namespace' => $describedNamespace)
-            : array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()));
-
-        $this->writeData($data, $options);
-    }
-
-    /**
-     * Writes data as json.
-     *
-     * @param array $data
-     * @param array $options
-     *
-     * @return array|string
-     */
-    private function writeData(array $data, array $options)
-    {
-        $this->write(json_encode($data, isset($options['json_encoding']) ? $options['json_encoding'] : 0));
-    }
-
-    /**
-     * @param InputArgument $argument
-     *
-     * @return array
-     */
-    private function getInputArgumentData(InputArgument $argument)
-    {
-        return array(
-            'name' => $argument->getName(),
-            'is_required' => $argument->isRequired(),
-            'is_array' => $argument->isArray(),
-            'description' => preg_replace('/\s*[\r\n]\s*/', ' ', $argument->getDescription()),
-            'default' => $argument->getDefault(),
-        );
-    }
-
-    /**
-     * @param InputOption $option
-     *
-     * @return array
-     */
-    private function getInputOptionData(InputOption $option)
-    {
-        return array(
-            'name' => '--'.$option->getName(),
-            'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '',
-            'accept_value' => $option->acceptValue(),
-            'is_value_required' => $option->isValueRequired(),
-            'is_multiple' => $option->isArray(),
-            'description' => preg_replace('/\s*[\r\n]\s*/', ' ', $option->getDescription()),
-            'default' => $option->getDefault(),
-        );
-    }
-
-    /**
-     * @param InputDefinition $definition
-     *
-     * @return array
-     */
-    private function getInputDefinitionData(InputDefinition $definition)
-    {
-        $inputArguments = array();
-        foreach ($definition->getArguments() as $name => $argument) {
-            $inputArguments[$name] = $this->getInputArgumentData($argument);
-        }
-
-        $inputOptions = array();
-        foreach ($definition->getOptions() as $name => $option) {
-            $inputOptions[$name] = $this->getInputOptionData($option);
-        }
-
-        return array('arguments' => $inputArguments, 'options' => $inputOptions);
-    }
-
-    /**
-     * @param Command $command
-     *
-     * @return array
-     */
-    private function getCommandData(Command $command)
-    {
-        $command->getSynopsis();
-        $command->mergeApplicationDefinition(false);
-
-        return array(
-            'name' => $command->getName(),
-            'usage' => array_merge(array($command->getSynopsis()), $command->getUsages(), $command->getAliases()),
-            'description' => $command->getDescription(),
-            'help' => $command->getProcessedHelp(),
-            'definition' => $this->getInputDefinitionData($command->getNativeDefinition()),
-        );
-    }
-}
diff --git a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php b/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
deleted file mode 100644
index d3d76a4..0000000
--- a/vendor/symfony/console/Descriptor/MarkdownDescriptor.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * Markdown descriptor.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- *
- * @internal
- */
-class MarkdownDescriptor extends Descriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
-    {
-        $this->write(
-            '**'.$argument->getName().':**'."\n\n"
-            .'* Name: '.($argument->getName() ?: '<none>')."\n"
-            .'* Is required: '.($argument->isRequired() ? 'yes' : 'no')."\n"
-            .'* Is array: '.($argument->isArray() ? 'yes' : 'no')."\n"
-            .'* Description: '.preg_replace('/\s*[\r\n]\s*/', "\n  ", $argument->getDescription() ?: '<none>')."\n"
-            .'* Default: `'.str_replace("\n", '', var_export($argument->getDefault(), true)).'`'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputOption(InputOption $option, array $options = array())
-    {
-        $this->write(
-            '**'.$option->getName().':**'."\n\n"
-            .'* Name: `--'.$option->getName().'`'."\n"
-            .'* Shortcut: '.($option->getShortcut() ? '`-'.implode('|-', explode('|', $option->getShortcut())).'`' : '<none>')."\n"
-            .'* Accept value: '.($option->acceptValue() ? 'yes' : 'no')."\n"
-            .'* Is value required: '.($option->isValueRequired() ? 'yes' : 'no')."\n"
-            .'* Is multiple: '.($option->isArray() ? 'yes' : 'no')."\n"
-            .'* Description: '.preg_replace('/\s*[\r\n]\s*/', "\n  ", $option->getDescription() ?: '<none>')."\n"
-            .'* Default: `'.str_replace("\n", '', var_export($option->getDefault(), true)).'`'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
-    {
-        if ($showArguments = count($definition->getArguments()) > 0) {
-            $this->write('### Arguments:');
-            foreach ($definition->getArguments() as $argument) {
-                $this->write("\n\n");
-                $this->write($this->describeInputArgument($argument));
-            }
-        }
-
-        if (count($definition->getOptions()) > 0) {
-            if ($showArguments) {
-                $this->write("\n\n");
-            }
-
-            $this->write('### Options:');
-            foreach ($definition->getOptions() as $option) {
-                $this->write("\n\n");
-                $this->write($this->describeInputOption($option));
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeCommand(Command $command, array $options = array())
-    {
-        $command->getSynopsis();
-        $command->mergeApplicationDefinition(false);
-
-        $this->write(
-            $command->getName()."\n"
-            .str_repeat('-', strlen($command->getName()))."\n\n"
-            .'* Description: '.($command->getDescription() ?: '<none>')."\n"
-            .'* Usage:'."\n\n"
-            .array_reduce(array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
-                return $carry .= '  * `'.$usage.'`'."\n";
-            })
-        );
-
-        if ($help = $command->getProcessedHelp()) {
-            $this->write("\n");
-            $this->write($help);
-        }
-
-        if ($command->getNativeDefinition()) {
-            $this->write("\n\n");
-            $this->describeInputDefinition($command->getNativeDefinition());
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeApplication(Application $application, array $options = array())
-    {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
-        $description = new ApplicationDescription($application, $describedNamespace);
-
-        $this->write($application->getName()."\n".str_repeat('=', strlen($application->getName())));
-
-        foreach ($description->getNamespaces() as $namespace) {
-            if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
-                $this->write("\n\n");
-                $this->write('**'.$namespace['id'].':**');
-            }
-
-            $this->write("\n\n");
-            $this->write(implode("\n", array_map(function ($commandName) {
-                return '* '.$commandName;
-            }, $namespace['commands'])));
-        }
-
-        foreach ($description->getCommands() as $command) {
-            $this->write("\n\n");
-            $this->write($this->describeCommand($command));
-        }
-    }
-}
diff --git a/vendor/symfony/console/Descriptor/TextDescriptor.php b/vendor/symfony/console/Descriptor/TextDescriptor.php
deleted file mode 100644
index 57e09e4..0000000
--- a/vendor/symfony/console/Descriptor/TextDescriptor.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * Text descriptor.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- *
- * @internal
- */
-class TextDescriptor extends Descriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
-    {
-        if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
-            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
-        } else {
-            $default = '';
-        }
-
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : strlen($argument->getName());
-        $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
-
-        $this->writeText(sprintf('  <info>%s</info>%s%s%s',
-            $argument->getName(),
-            str_repeat(' ', $spacingWidth),
-            // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 17), $argument->getDescription()),
-            $default
-        ), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputOption(InputOption $option, array $options = array())
-    {
-        if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
-            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
-        } else {
-            $default = '';
-        }
-
-        $value = '';
-        if ($option->acceptValue()) {
-            $value = '='.strtoupper($option->getName());
-
-            if ($option->isValueOptional()) {
-                $value = '['.$value.']';
-            }
-        }
-
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions(array($option));
-        $synopsis = sprintf('%s%s',
-            $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ',
-            sprintf('--%s%s', $option->getName(), $value)
-        );
-
-        $spacingWidth = $totalWidth - strlen($synopsis) + 2;
-
-        $this->writeText(sprintf('  <info>%s</info>%s%s%s%s',
-            $synopsis,
-            str_repeat(' ', $spacingWidth),
-            // + 17 = 2 spaces + <info> + </info> + 2 spaces
-            preg_replace('/\s*[\r\n]\s*/', "\n".str_repeat(' ', $totalWidth + 17), $option->getDescription()),
-            $default,
-            $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''
-        ), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
-    {
-        $totalWidth = $this->calculateTotalWidthForOptions($definition->getOptions());
-        foreach ($definition->getArguments() as $argument) {
-            $totalWidth = max($totalWidth, strlen($argument->getName()));
-        }
-
-        if ($definition->getArguments()) {
-            $this->writeText('<comment>Arguments:</comment>', $options);
-            $this->writeText("\n");
-            foreach ($definition->getArguments() as $argument) {
-                $this->describeInputArgument($argument, array_merge($options, array('total_width' => $totalWidth)));
-                $this->writeText("\n");
-            }
-        }
-
-        if ($definition->getArguments() && $definition->getOptions()) {
-            $this->writeText("\n");
-        }
-
-        if ($definition->getOptions()) {
-            $laterOptions = array();
-
-            $this->writeText('<comment>Options:</comment>', $options);
-            foreach ($definition->getOptions() as $option) {
-                if (strlen($option->getShortcut()) > 1) {
-                    $laterOptions[] = $option;
-                    continue;
-                }
-                $this->writeText("\n");
-                $this->describeInputOption($option, array_merge($options, array('total_width' => $totalWidth)));
-            }
-            foreach ($laterOptions as $option) {
-                $this->writeText("\n");
-                $this->describeInputOption($option, array_merge($options, array('total_width' => $totalWidth)));
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeCommand(Command $command, array $options = array())
-    {
-        $command->getSynopsis(true);
-        $command->getSynopsis(false);
-        $command->mergeApplicationDefinition(false);
-
-        $this->writeText('<comment>Usage:</comment>', $options);
-        foreach (array_merge(array($command->getSynopsis(true)), $command->getAliases(), $command->getUsages()) as $usage) {
-            $this->writeText("\n");
-            $this->writeText('  '.$usage, $options);
-        }
-        $this->writeText("\n");
-
-        $definition = $command->getNativeDefinition();
-        if ($definition->getOptions() || $definition->getArguments()) {
-            $this->writeText("\n");
-            $this->describeInputDefinition($definition, $options);
-            $this->writeText("\n");
-        }
-
-        if ($help = $command->getProcessedHelp()) {
-            $this->writeText("\n");
-            $this->writeText('<comment>Help:</comment>', $options);
-            $this->writeText("\n");
-            $this->writeText(' '.str_replace("\n", "\n ", $help), $options);
-            $this->writeText("\n");
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeApplication(Application $application, array $options = array())
-    {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
-        $description = new ApplicationDescription($application, $describedNamespace);
-
-        if (isset($options['raw_text']) && $options['raw_text']) {
-            $width = $this->getColumnWidth($description->getCommands());
-
-            foreach ($description->getCommands() as $command) {
-                $this->writeText(sprintf("%-${width}s %s", $command->getName(), $command->getDescription()), $options);
-                $this->writeText("\n");
-            }
-        } else {
-            if ('' != $help = $application->getHelp()) {
-                $this->writeText("$help\n\n", $options);
-            }
-
-            $this->writeText("<comment>Usage:</comment>\n", $options);
-            $this->writeText("  command [options] [arguments]\n\n", $options);
-
-            $this->describeInputDefinition(new InputDefinition($application->getDefinition()->getOptions()), $options);
-
-            $this->writeText("\n");
-            $this->writeText("\n");
-
-            $width = $this->getColumnWidth($description->getCommands());
-
-            if ($describedNamespace) {
-                $this->writeText(sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
-            } else {
-                $this->writeText('<comment>Available commands:</comment>', $options);
-            }
-
-            // add commands by namespace
-            foreach ($description->getNamespaces() as $namespace) {
-                if (!$describedNamespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
-                    $this->writeText("\n");
-                    $this->writeText(' <comment>'.$namespace['id'].'</comment>', $options);
-                }
-
-                foreach ($namespace['commands'] as $name) {
-                    $this->writeText("\n");
-                    $spacingWidth = $width - strlen($name);
-                    $this->writeText(sprintf('  <info>%s</info>%s%s', $name, str_repeat(' ', $spacingWidth), $description->getCommand($name)->getDescription()), $options);
-                }
-            }
-
-            $this->writeText("\n");
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    private function writeText($content, array $options = array())
-    {
-        $this->write(
-            isset($options['raw_text']) && $options['raw_text'] ? strip_tags($content) : $content,
-            isset($options['raw_output']) ? !$options['raw_output'] : true
-        );
-    }
-
-    /**
-     * Formats input option/argument default value.
-     *
-     * @param mixed $default
-     *
-     * @return string
-     */
-    private function formatDefaultValue($default)
-    {
-        if (PHP_VERSION_ID < 50400) {
-            return str_replace('\/', '/', json_encode($default));
-        }
-
-        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-    }
-
-    /**
-     * @param Command[] $commands
-     *
-     * @return int
-     */
-    private function getColumnWidth(array $commands)
-    {
-        $widths = array();
-
-        foreach ($commands as $command) {
-            $widths[] = strlen($command->getName());
-            foreach ($command->getAliases() as $alias) {
-                $widths[] = strlen($alias);
-            }
-        }
-
-        return max($widths) + 2;
-    }
-
-    /**
-     * @param InputOption[] $options
-     *
-     * @return int
-     */
-    private function calculateTotalWidthForOptions($options)
-    {
-        $totalWidth = 0;
-        foreach ($options as $option) {
-            // "-" + shortcut + ", --" + name
-            $nameLength = 1 + max(strlen($option->getShortcut()), 1) + 4 + strlen($option->getName());
-
-            if ($option->acceptValue()) {
-                $valueLength = 1 + strlen($option->getName()); // = + value
-                $valueLength += $option->isValueOptional() ? 2 : 0; // [ + ]
-
-                $nameLength += $valueLength;
-            }
-            $totalWidth = max($totalWidth, $nameLength);
-        }
-
-        return $totalWidth;
-    }
-}
diff --git a/vendor/symfony/console/Descriptor/XmlDescriptor.php b/vendor/symfony/console/Descriptor/XmlDescriptor.php
deleted file mode 100644
index b5676be..0000000
--- a/vendor/symfony/console/Descriptor/XmlDescriptor.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * XML descriptor.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- *
- * @internal
- */
-class XmlDescriptor extends Descriptor
-{
-    /**
-     * @param InputDefinition $definition
-     *
-     * @return \DOMDocument
-     */
-    public function getInputDefinitionDocument(InputDefinition $definition)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->appendChild($definitionXML = $dom->createElement('definition'));
-
-        $definitionXML->appendChild($argumentsXML = $dom->createElement('arguments'));
-        foreach ($definition->getArguments() as $argument) {
-            $this->appendDocument($argumentsXML, $this->getInputArgumentDocument($argument));
-        }
-
-        $definitionXML->appendChild($optionsXML = $dom->createElement('options'));
-        foreach ($definition->getOptions() as $option) {
-            $this->appendDocument($optionsXML, $this->getInputOptionDocument($option));
-        }
-
-        return $dom;
-    }
-
-    /**
-     * @param Command $command
-     *
-     * @return \DOMDocument
-     */
-    public function getCommandDocument(Command $command)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->appendChild($commandXML = $dom->createElement('command'));
-
-        $command->getSynopsis();
-        $command->mergeApplicationDefinition(false);
-
-        $commandXML->setAttribute('id', $command->getName());
-        $commandXML->setAttribute('name', $command->getName());
-
-        $commandXML->appendChild($usagesXML = $dom->createElement('usages'));
-
-        foreach (array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()) as $usage) {
-            $usagesXML->appendChild($dom->createElement('usage', $usage));
-        }
-
-        $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $command->getDescription())));
-
-        $commandXML->appendChild($helpXML = $dom->createElement('help'));
-        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $command->getProcessedHelp())));
-
-        $definitionXML = $this->getInputDefinitionDocument($command->getNativeDefinition());
-        $this->appendDocument($commandXML, $definitionXML->getElementsByTagName('definition')->item(0));
-
-        return $dom;
-    }
-
-    /**
-     * @param Application $application
-     * @param string|null $namespace
-     *
-     * @return \DOMDocument
-     */
-    public function getApplicationDocument(Application $application, $namespace = null)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->appendChild($rootXml = $dom->createElement('symfony'));
-
-        if ($application->getName() !== 'UNKNOWN') {
-            $rootXml->setAttribute('name', $application->getName());
-            if ($application->getVersion() !== 'UNKNOWN') {
-                $rootXml->setAttribute('version', $application->getVersion());
-            }
-        }
-
-        $rootXml->appendChild($commandsXML = $dom->createElement('commands'));
-
-        $description = new ApplicationDescription($application, $namespace);
-
-        if ($namespace) {
-            $commandsXML->setAttribute('namespace', $namespace);
-        }
-
-        foreach ($description->getCommands() as $command) {
-            $this->appendDocument($commandsXML, $this->getCommandDocument($command));
-        }
-
-        if (!$namespace) {
-            $rootXml->appendChild($namespacesXML = $dom->createElement('namespaces'));
-
-            foreach ($description->getNamespaces() as $namespaceDescription) {
-                $namespacesXML->appendChild($namespaceArrayXML = $dom->createElement('namespace'));
-                $namespaceArrayXML->setAttribute('id', $namespaceDescription['id']);
-
-                foreach ($namespaceDescription['commands'] as $name) {
-                    $namespaceArrayXML->appendChild($commandXML = $dom->createElement('command'));
-                    $commandXML->appendChild($dom->createTextNode($name));
-                }
-            }
-        }
-
-        return $dom;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputArgument(InputArgument $argument, array $options = array())
-    {
-        $this->writeDocument($this->getInputArgumentDocument($argument));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputOption(InputOption $option, array $options = array())
-    {
-        $this->writeDocument($this->getInputOptionDocument($option));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
-    {
-        $this->writeDocument($this->getInputDefinitionDocument($definition));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeCommand(Command $command, array $options = array())
-    {
-        $this->writeDocument($this->getCommandDocument($command));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function describeApplication(Application $application, array $options = array())
-    {
-        $this->writeDocument($this->getApplicationDocument($application, isset($options['namespace']) ? $options['namespace'] : null));
-    }
-
-    /**
-     * Appends document children to parent node.
-     *
-     * @param \DOMNode $parentNode
-     * @param \DOMNode $importedParent
-     */
-    private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
-    {
-        foreach ($importedParent->childNodes as $childNode) {
-            $parentNode->appendChild($parentNode->ownerDocument->importNode($childNode, true));
-        }
-    }
-
-    /**
-     * Writes DOM document.
-     *
-     * @param \DOMDocument $dom
-     *
-     * @return \DOMDocument|string
-     */
-    private function writeDocument(\DOMDocument $dom)
-    {
-        $dom->formatOutput = true;
-        $this->write($dom->saveXML());
-    }
-
-    /**
-     * @param InputArgument $argument
-     *
-     * @return \DOMDocument
-     */
-    private function getInputArgumentDocument(InputArgument $argument)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-
-        $dom->appendChild($objectXML = $dom->createElement('argument'));
-        $objectXML->setAttribute('name', $argument->getName());
-        $objectXML->setAttribute('is_required', $argument->isRequired() ? 1 : 0);
-        $objectXML->setAttribute('is_array', $argument->isArray() ? 1 : 0);
-        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode($argument->getDescription()));
-
-        $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-        $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : (is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
-        foreach ($defaults as $default) {
-            $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-            $defaultXML->appendChild($dom->createTextNode($default));
-        }
-
-        return $dom;
-    }
-
-    /**
-     * @param InputOption $option
-     *
-     * @return \DOMDocument
-     */
-    private function getInputOptionDocument(InputOption $option)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-
-        $dom->appendChild($objectXML = $dom->createElement('option'));
-        $objectXML->setAttribute('name', '--'.$option->getName());
-        $pos = strpos($option->getShortcut(), '|');
-        if (false !== $pos) {
-            $objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos));
-            $objectXML->setAttribute('shortcuts', '-'.implode('|-', explode('|', $option->getShortcut())));
-        } else {
-            $objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
-        }
-        $objectXML->setAttribute('accept_value', $option->acceptValue() ? 1 : 0);
-        $objectXML->setAttribute('is_value_required', $option->isValueRequired() ? 1 : 0);
-        $objectXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0);
-        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode($option->getDescription()));
-
-        if ($option->acceptValue()) {
-            $defaults = is_array($option->getDefault()) ? $option->getDefault() : (is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
-            $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-
-            if (!empty($defaults)) {
-                foreach ($defaults as $default) {
-                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-                    $defaultXML->appendChild($dom->createTextNode($default));
-                }
-            }
-        }
-
-        return $dom;
-    }
-}
diff --git a/vendor/symfony/console/Event/ConsoleCommandEvent.php b/vendor/symfony/console/Event/ConsoleCommandEvent.php
deleted file mode 100644
index 92adf1e..0000000
--- a/vendor/symfony/console/Event/ConsoleCommandEvent.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\Console\Event;
-
-/**
- * Allows to do things before the command is executed, like skipping the command or changing the input.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ConsoleCommandEvent extends ConsoleEvent
-{
-    /**
-     * The return code for skipped commands, this will also be passed into the terminate event.
-     */
-    const RETURN_CODE_DISABLED = 113;
-
-    /**
-     * Indicates if the command should be run or skipped.
-     *
-     * @var bool
-     */
-    private $commandShouldRun = true;
-
-    /**
-     * Disables the command, so it won't be run.
-     *
-     * @return bool
-     */
-    public function disableCommand()
-    {
-        return $this->commandShouldRun = false;
-    }
-
-    /**
-     * Enables the command.
-     *
-     * @return bool
-     */
-    public function enableCommand()
-    {
-        return $this->commandShouldRun = true;
-    }
-
-    /**
-     * Returns true if the command is runnable, false otherwise.
-     *
-     * @return bool
-     */
-    public function commandShouldRun()
-    {
-        return $this->commandShouldRun;
-    }
-}
diff --git a/vendor/symfony/console/Event/ConsoleEvent.php b/vendor/symfony/console/Event/ConsoleEvent.php
deleted file mode 100644
index ab620c4..0000000
--- a/vendor/symfony/console/Event/ConsoleEvent.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\Console\Event;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Allows to inspect input and output of a command.
- *
- * @author Francesco Levorato <git@flevour.net>
- */
-class ConsoleEvent extends Event
-{
-    protected $command;
-
-    private $input;
-    private $output;
-
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output)
-    {
-        $this->command = $command;
-        $this->input = $input;
-        $this->output = $output;
-    }
-
-    /**
-     * Gets the command that is executed.
-     *
-     * @return Command A Command instance
-     */
-    public function getCommand()
-    {
-        return $this->command;
-    }
-
-    /**
-     * Gets the input instance.
-     *
-     * @return InputInterface An InputInterface instance
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Gets the output instance.
-     *
-     * @return OutputInterface An OutputInterface instance
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-}
diff --git a/vendor/symfony/console/Event/ConsoleExceptionEvent.php b/vendor/symfony/console/Event/ConsoleExceptionEvent.php
deleted file mode 100644
index 603b7ee..0000000
--- a/vendor/symfony/console/Event/ConsoleExceptionEvent.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\Console\Event;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Allows to handle exception thrown in a command.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ConsoleExceptionEvent extends ConsoleEvent
-{
-    private $exception;
-    private $exitCode;
-
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output, \Exception $exception, $exitCode)
-    {
-        parent::__construct($command, $input, $output);
-
-        $this->setException($exception);
-        $this->exitCode = (int) $exitCode;
-    }
-
-    /**
-     * Returns the thrown exception.
-     *
-     * @return \Exception The thrown exception
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
-
-    /**
-     * Replaces the thrown exception.
-     *
-     * This exception will be thrown if no response is set in the event.
-     *
-     * @param \Exception $exception The thrown exception
-     */
-    public function setException(\Exception $exception)
-    {
-        $this->exception = $exception;
-    }
-
-    /**
-     * Gets the exit code.
-     *
-     * @return int The command exit code
-     */
-    public function getExitCode()
-    {
-        return $this->exitCode;
-    }
-}
diff --git a/vendor/symfony/console/Event/ConsoleTerminateEvent.php b/vendor/symfony/console/Event/ConsoleTerminateEvent.php
deleted file mode 100644
index b6a5d7c..0000000
--- a/vendor/symfony/console/Event/ConsoleTerminateEvent.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\Console\Event;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Allows to manipulate the exit code of a command after its execution.
- *
- * @author Francesco Levorato <git@flevour.net>
- */
-class ConsoleTerminateEvent extends ConsoleEvent
-{
-    /**
-     * The exit code of the command.
-     *
-     * @var int
-     */
-    private $exitCode;
-
-    public function __construct(Command $command, InputInterface $input, OutputInterface $output, $exitCode)
-    {
-        parent::__construct($command, $input, $output);
-
-        $this->setExitCode($exitCode);
-    }
-
-    /**
-     * Sets the exit code.
-     *
-     * @param int $exitCode The command exit code
-     */
-    public function setExitCode($exitCode)
-    {
-        $this->exitCode = (int) $exitCode;
-    }
-
-    /**
-     * Gets the exit code.
-     *
-     * @return int The command exit code
-     */
-    public function getExitCode()
-    {
-        return $this->exitCode;
-    }
-}
diff --git a/vendor/symfony/console/Formatter/OutputFormatter.php b/vendor/symfony/console/Formatter/OutputFormatter.php
deleted file mode 100644
index 7a78eb2..0000000
--- a/vendor/symfony/console/Formatter/OutputFormatter.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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\Component\Console\Formatter;
-
-/**
- * Formatter class for console output.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class OutputFormatter implements OutputFormatterInterface
-{
-    private $decorated;
-    private $styles = array();
-    private $styleStack;
-
-    /**
-     * Escapes "<" special char in given text.
-     *
-     * @param string $text Text to escape
-     *
-     * @return string Escaped text
-     */
-    public static function escape($text)
-    {
-        return preg_replace('/([^\\\\]?)</', '$1\\<', $text);
-    }
-
-    /**
-     * Initializes console output formatter.
-     *
-     * @param bool                            $decorated Whether this formatter should actually decorate strings
-     * @param OutputFormatterStyleInterface[] $styles    Array of "name => FormatterStyle" instances
-     */
-    public function __construct($decorated = false, array $styles = array())
-    {
-        $this->decorated = (bool) $decorated;
-
-        $this->setStyle('error', new OutputFormatterStyle('white', 'red'));
-        $this->setStyle('info', new OutputFormatterStyle('green'));
-        $this->setStyle('comment', new OutputFormatterStyle('yellow'));
-        $this->setStyle('question', new OutputFormatterStyle('black', 'cyan'));
-
-        foreach ($styles as $name => $style) {
-            $this->setStyle($name, $style);
-        }
-
-        $this->styleStack = new OutputFormatterStyleStack();
-    }
-
-    /**
-     * Sets the decorated flag.
-     *
-     * @param bool $decorated Whether to decorate the messages or not
-     */
-    public function setDecorated($decorated)
-    {
-        $this->decorated = (bool) $decorated;
-    }
-
-    /**
-     * Gets the decorated flag.
-     *
-     * @return bool true if the output will decorate messages, false otherwise
-     */
-    public function isDecorated()
-    {
-        return $this->decorated;
-    }
-
-    /**
-     * Sets a new style.
-     *
-     * @param string                        $name  The style name
-     * @param OutputFormatterStyleInterface $style The style instance
-     */
-    public function setStyle($name, OutputFormatterStyleInterface $style)
-    {
-        $this->styles[strtolower($name)] = $style;
-    }
-
-    /**
-     * Checks if output formatter has style with specified name.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasStyle($name)
-    {
-        return isset($this->styles[strtolower($name)]);
-    }
-
-    /**
-     * Gets style options from style with specified name.
-     *
-     * @param string $name
-     *
-     * @return OutputFormatterStyleInterface
-     *
-     * @throws \InvalidArgumentException When style isn't defined
-     */
-    public function getStyle($name)
-    {
-        if (!$this->hasStyle($name)) {
-            throw new \InvalidArgumentException(sprintf('Undefined style: %s', $name));
-        }
-
-        return $this->styles[strtolower($name)];
-    }
-
-    /**
-     * Formats a message according to the given styles.
-     *
-     * @param string $message The message to style
-     *
-     * @return string The styled message
-     */
-    public function format($message)
-    {
-        $message = (string) $message;
-        $offset = 0;
-        $output = '';
-        $tagRegex = '[a-z][a-z0-9_=;-]*';
-        preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#ix", $message, $matches, PREG_OFFSET_CAPTURE);
-        foreach ($matches[0] as $i => $match) {
-            $pos = $match[1];
-            $text = $match[0];
-
-            if (0 != $pos && '\\' == $message[$pos - 1]) {
-                continue;
-            }
-
-            // add the text up to the next tag
-            $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset));
-            $offset = $pos + strlen($text);
-
-            // opening tag?
-            if ($open = '/' != $text[1]) {
-                $tag = $matches[1][$i][0];
-            } else {
-                $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';
-            }
-
-            if (!$open && !$tag) {
-                // </>
-                $this->styleStack->pop();
-            } elseif (false === $style = $this->createStyleFromString(strtolower($tag))) {
-                $output .= $this->applyCurrentStyle($text);
-            } elseif ($open) {
-                $this->styleStack->push($style);
-            } else {
-                $this->styleStack->pop($style);
-            }
-        }
-
-        $output .= $this->applyCurrentStyle(substr($message, $offset));
-
-        return str_replace('\\<', '<', $output);
-    }
-
-    /**
-     * @return OutputFormatterStyleStack
-     */
-    public function getStyleStack()
-    {
-        return $this->styleStack;
-    }
-
-    /**
-     * Tries to create new style instance from string.
-     *
-     * @param string $string
-     *
-     * @return OutputFormatterStyle|bool false if string is not format string
-     */
-    private function createStyleFromString($string)
-    {
-        if (isset($this->styles[$string])) {
-            return $this->styles[$string];
-        }
-
-        if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', strtolower($string), $matches, PREG_SET_ORDER)) {
-            return false;
-        }
-
-        $style = new OutputFormatterStyle();
-        foreach ($matches as $match) {
-            array_shift($match);
-
-            if ('fg' == $match[0]) {
-                $style->setForeground($match[1]);
-            } elseif ('bg' == $match[0]) {
-                $style->setBackground($match[1]);
-            } else {
-                try {
-                    $style->setOption($match[1]);
-                } catch (\InvalidArgumentException $e) {
-                    return false;
-                }
-            }
-        }
-
-        return $style;
-    }
-
-    /**
-     * Applies current style from stack to text, if must be applied.
-     *
-     * @param string $text Input text
-     *
-     * @return string Styled text
-     */
-    private function applyCurrentStyle($text)
-    {
-        return $this->isDecorated() && strlen($text) > 0 ? $this->styleStack->getCurrent()->apply($text) : $text;
-    }
-}
diff --git a/vendor/symfony/console/Formatter/OutputFormatterInterface.php b/vendor/symfony/console/Formatter/OutputFormatterInterface.php
deleted file mode 100644
index 5a52ba0..0000000
--- a/vendor/symfony/console/Formatter/OutputFormatterInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Component\Console\Formatter;
-
-/**
- * Formatter interface for console output.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface OutputFormatterInterface
-{
-    /**
-     * Sets the decorated flag.
-     *
-     * @param bool $decorated Whether to decorate the messages or not
-     */
-    public function setDecorated($decorated);
-
-    /**
-     * Gets the decorated flag.
-     *
-     * @return bool true if the output will decorate messages, false otherwise
-     */
-    public function isDecorated();
-
-    /**
-     * Sets a new style.
-     *
-     * @param string                        $name  The style name
-     * @param OutputFormatterStyleInterface $style The style instance
-     */
-    public function setStyle($name, OutputFormatterStyleInterface $style);
-
-    /**
-     * Checks if output formatter has style with specified name.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasStyle($name);
-
-    /**
-     * Gets style options from style with specified name.
-     *
-     * @param string $name
-     *
-     * @return OutputFormatterStyleInterface
-     */
-    public function getStyle($name);
-
-    /**
-     * Formats a message according to the given styles.
-     *
-     * @param string $message The message to style
-     *
-     * @return string The styled message
-     */
-    public function format($message);
-}
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyle.php b/vendor/symfony/console/Formatter/OutputFormatterStyle.php
deleted file mode 100644
index 4d3eda3..0000000
--- a/vendor/symfony/console/Formatter/OutputFormatterStyle.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?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\Component\Console\Formatter;
-
-/**
- * Formatter style class for defining styles.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-class OutputFormatterStyle implements OutputFormatterStyleInterface
-{
-    private static $availableForegroundColors = array(
-        'black' => array('set' => 30, 'unset' => 39),
-        'red' => array('set' => 31, 'unset' => 39),
-        'green' => array('set' => 32, 'unset' => 39),
-        'yellow' => array('set' => 33, 'unset' => 39),
-        'blue' => array('set' => 34, 'unset' => 39),
-        'magenta' => array('set' => 35, 'unset' => 39),
-        'cyan' => array('set' => 36, 'unset' => 39),
-        'white' => array('set' => 37, 'unset' => 39),
-        'default' => array('set' => 39, 'unset' => 39),
-    );
-    private static $availableBackgroundColors = array(
-        'black' => array('set' => 40, 'unset' => 49),
-        'red' => array('set' => 41, 'unset' => 49),
-        'green' => array('set' => 42, 'unset' => 49),
-        'yellow' => array('set' => 43, 'unset' => 49),
-        'blue' => array('set' => 44, 'unset' => 49),
-        'magenta' => array('set' => 45, 'unset' => 49),
-        'cyan' => array('set' => 46, 'unset' => 49),
-        'white' => array('set' => 47, 'unset' => 49),
-        'default' => array('set' => 49, 'unset' => 49),
-    );
-    private static $availableOptions = array(
-        'bold' => array('set' => 1, 'unset' => 22),
-        'underscore' => array('set' => 4, 'unset' => 24),
-        'blink' => array('set' => 5, 'unset' => 25),
-        'reverse' => array('set' => 7, 'unset' => 27),
-        'conceal' => array('set' => 8, 'unset' => 28),
-    );
-
-    private $foreground;
-    private $background;
-    private $options = array();
-
-    /**
-     * Initializes output formatter style.
-     *
-     * @param string|null $foreground The style foreground color name
-     * @param string|null $background The style background color name
-     * @param array       $options    The style options
-     */
-    public function __construct($foreground = null, $background = null, array $options = array())
-    {
-        if (null !== $foreground) {
-            $this->setForeground($foreground);
-        }
-        if (null !== $background) {
-            $this->setBackground($background);
-        }
-        if (count($options)) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Sets style foreground color.
-     *
-     * @param string|null $color The color name
-     *
-     * @throws \InvalidArgumentException When the color name isn't defined
-     */
-    public function setForeground($color = null)
-    {
-        if (null === $color) {
-            $this->foreground = null;
-
-            return;
-        }
-
-        if (!isset(static::$availableForegroundColors[$color])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid foreground color specified: "%s". Expected one of (%s)',
-                $color,
-                implode(', ', array_keys(static::$availableForegroundColors))
-            ));
-        }
-
-        $this->foreground = static::$availableForegroundColors[$color];
-    }
-
-    /**
-     * Sets style background color.
-     *
-     * @param string|null $color The color name
-     *
-     * @throws \InvalidArgumentException When the color name isn't defined
-     */
-    public function setBackground($color = null)
-    {
-        if (null === $color) {
-            $this->background = null;
-
-            return;
-        }
-
-        if (!isset(static::$availableBackgroundColors[$color])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid background color specified: "%s". Expected one of (%s)',
-                $color,
-                implode(', ', array_keys(static::$availableBackgroundColors))
-            ));
-        }
-
-        $this->background = static::$availableBackgroundColors[$color];
-    }
-
-    /**
-     * Sets some specific style option.
-     *
-     * @param string $option The option name
-     *
-     * @throws \InvalidArgumentException When the option name isn't defined
-     */
-    public function setOption($option)
-    {
-        if (!isset(static::$availableOptions[$option])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid option specified: "%s". Expected one of (%s)',
-                $option,
-                implode(', ', array_keys(static::$availableOptions))
-            ));
-        }
-
-        if (!in_array(static::$availableOptions[$option], $this->options)) {
-            $this->options[] = static::$availableOptions[$option];
-        }
-    }
-
-    /**
-     * Unsets some specific style option.
-     *
-     * @param string $option The option name
-     *
-     * @throws \InvalidArgumentException When the option name isn't defined
-     */
-    public function unsetOption($option)
-    {
-        if (!isset(static::$availableOptions[$option])) {
-            throw new \InvalidArgumentException(sprintf(
-                'Invalid option specified: "%s". Expected one of (%s)',
-                $option,
-                implode(', ', array_keys(static::$availableOptions))
-            ));
-        }
-
-        $pos = array_search(static::$availableOptions[$option], $this->options);
-        if (false !== $pos) {
-            unset($this->options[$pos]);
-        }
-    }
-
-    /**
-     * Sets multiple style options at once.
-     *
-     * @param array $options
-     */
-    public function setOptions(array $options)
-    {
-        $this->options = array();
-
-        foreach ($options as $option) {
-            $this->setOption($option);
-        }
-    }
-
-    /**
-     * Applies the style to a given text.
-     *
-     * @param string $text The text to style
-     *
-     * @return string
-     */
-    public function apply($text)
-    {
-        $setCodes = array();
-        $unsetCodes = array();
-
-        if (null !== $this->foreground) {
-            $setCodes[] = $this->foreground['set'];
-            $unsetCodes[] = $this->foreground['unset'];
-        }
-        if (null !== $this->background) {
-            $setCodes[] = $this->background['set'];
-            $unsetCodes[] = $this->background['unset'];
-        }
-        if (count($this->options)) {
-            foreach ($this->options as $option) {
-                $setCodes[] = $option['set'];
-                $unsetCodes[] = $option['unset'];
-            }
-        }
-
-        if (0 === count($setCodes)) {
-            return $text;
-        }
-
-        return sprintf("\033[%sm%s\033[%sm", implode(';', $setCodes), $text, implode(';', $unsetCodes));
-    }
-}
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyleInterface.php b/vendor/symfony/console/Formatter/OutputFormatterStyleInterface.php
deleted file mode 100644
index c36fda8..0000000
--- a/vendor/symfony/console/Formatter/OutputFormatterStyleInterface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Component\Console\Formatter;
-
-/**
- * Formatter style interface for defining styles.
- *
- * @author Konstantin Kudryashov <ever.zet@gmail.com>
- */
-interface OutputFormatterStyleInterface
-{
-    /**
-     * Sets style foreground color.
-     *
-     * @param string $color The color name
-     */
-    public function setForeground($color = null);
-
-    /**
-     * Sets style background color.
-     *
-     * @param string $color The color name
-     */
-    public function setBackground($color = null);
-
-    /**
-     * Sets some specific style option.
-     *
-     * @param string $option The option name
-     */
-    public function setOption($option);
-
-    /**
-     * Unsets some specific style option.
-     *
-     * @param string $option The option name
-     */
-    public function unsetOption($option);
-
-    /**
-     * Sets multiple style options at once.
-     *
-     * @param array $options
-     */
-    public function setOptions(array $options);
-
-    /**
-     * Applies the style to a given text.
-     *
-     * @param string $text The text to style
-     *
-     * @return string
-     */
-    public function apply($text);
-}
diff --git a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php b/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
deleted file mode 100644
index b64c87f..0000000
--- a/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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\Component\Console\Formatter;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class OutputFormatterStyleStack
-{
-    /**
-     * @var OutputFormatterStyleInterface[]
-     */
-    private $styles;
-
-    /**
-     * @var OutputFormatterStyleInterface
-     */
-    private $emptyStyle;
-
-    /**
-     * Constructor.
-     *
-     * @param OutputFormatterStyleInterface|null $emptyStyle
-     */
-    public function __construct(OutputFormatterStyleInterface $emptyStyle = null)
-    {
-        $this->emptyStyle = $emptyStyle ?: new OutputFormatterStyle();
-        $this->reset();
-    }
-
-    /**
-     * Resets stack (ie. empty internal arrays).
-     */
-    public function reset()
-    {
-        $this->styles = array();
-    }
-
-    /**
-     * Pushes a style in the stack.
-     *
-     * @param OutputFormatterStyleInterface $style
-     */
-    public function push(OutputFormatterStyleInterface $style)
-    {
-        $this->styles[] = $style;
-    }
-
-    /**
-     * Pops a style from the stack.
-     *
-     * @param OutputFormatterStyleInterface|null $style
-     *
-     * @return OutputFormatterStyleInterface
-     *
-     * @throws \InvalidArgumentException When style tags incorrectly nested
-     */
-    public function pop(OutputFormatterStyleInterface $style = null)
-    {
-        if (empty($this->styles)) {
-            return $this->emptyStyle;
-        }
-
-        if (null === $style) {
-            return array_pop($this->styles);
-        }
-
-        foreach (array_reverse($this->styles, true) as $index => $stackedStyle) {
-            if ($style->apply('') === $stackedStyle->apply('')) {
-                $this->styles = array_slice($this->styles, 0, $index);
-
-                return $stackedStyle;
-            }
-        }
-
-        throw new \InvalidArgumentException('Incorrectly nested style tag found.');
-    }
-
-    /**
-     * Computes current style with stacks top codes.
-     *
-     * @return OutputFormatterStyle
-     */
-    public function getCurrent()
-    {
-        if (empty($this->styles)) {
-            return $this->emptyStyle;
-        }
-
-        return $this->styles[count($this->styles) - 1];
-    }
-
-    /**
-     * @param OutputFormatterStyleInterface $emptyStyle
-     *
-     * @return OutputFormatterStyleStack
-     */
-    public function setEmptyStyle(OutputFormatterStyleInterface $emptyStyle)
-    {
-        $this->emptyStyle = $emptyStyle;
-
-        return $this;
-    }
-
-    /**
-     * @return OutputFormatterStyleInterface
-     */
-    public function getEmptyStyle()
-    {
-        return $this->emptyStyle;
-    }
-}
diff --git a/vendor/symfony/console/Helper/DebugFormatterHelper.php b/vendor/symfony/console/Helper/DebugFormatterHelper.php
deleted file mode 100644
index 1119b79..0000000
--- a/vendor/symfony/console/Helper/DebugFormatterHelper.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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\Component\Console\Helper;
-
-/**
- * Helps outputting debug information when running an external program from a command.
- *
- * An external program can be a Process, an HTTP request, or anything else.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class DebugFormatterHelper extends Helper
-{
-    private $colors = array('black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white', 'default');
-    private $started = array();
-    private $count = -1;
-
-    /**
-     * Starts a debug formatting session.
-     *
-     * @param string $id      The id of the formatting session
-     * @param string $message The message to display
-     * @param string $prefix  The prefix to use
-     *
-     * @return string
-     */
-    public function start($id, $message, $prefix = 'RUN')
-    {
-        $this->started[$id] = array('border' => ++$this->count % count($this->colors));
-
-        return sprintf("%s<bg=blue;fg=white> %s </> <fg=blue>%s</>\n", $this->getBorder($id), $prefix, $message);
-    }
-
-    /**
-     * Adds progress to a formatting session.
-     *
-     * @param string $id          The id of the formatting session
-     * @param string $buffer      The message to display
-     * @param bool   $error       Whether to consider the buffer as error
-     * @param string $prefix      The prefix for output
-     * @param string $errorPrefix The prefix for error output
-     *
-     * @return string
-     */
-    public function progress($id, $buffer, $error = false, $prefix = 'OUT', $errorPrefix = 'ERR')
-    {
-        $message = '';
-
-        if ($error) {
-            if (isset($this->started[$id]['out'])) {
-                $message .= "\n";
-                unset($this->started[$id]['out']);
-            }
-            if (!isset($this->started[$id]['err'])) {
-                $message .= sprintf('%s<bg=red;fg=white> %s </> ', $this->getBorder($id), $errorPrefix);
-                $this->started[$id]['err'] = true;
-            }
-
-            $message .= str_replace("\n", sprintf("\n%s<bg=red;fg=white> %s </> ", $this->getBorder($id), $errorPrefix), $buffer);
-        } else {
-            if (isset($this->started[$id]['err'])) {
-                $message .= "\n";
-                unset($this->started[$id]['err']);
-            }
-            if (!isset($this->started[$id]['out'])) {
-                $message .= sprintf('%s<bg=green;fg=white> %s </> ', $this->getBorder($id), $prefix);
-                $this->started[$id]['out'] = true;
-            }
-
-            $message .= str_replace("\n", sprintf("\n%s<bg=green;fg=white> %s </> ", $this->getBorder($id), $prefix), $buffer);
-        }
-
-        return $message;
-    }
-
-    /**
-     * Stops a formatting session.
-     *
-     * @param string $id         The id of the formatting session
-     * @param string $message    The message to display
-     * @param bool   $successful Whether to consider the result as success
-     * @param string $prefix     The prefix for the end output
-     *
-     * @return string
-     */
-    public function stop($id, $message, $successful, $prefix = 'RES')
-    {
-        $trailingEOL = isset($this->started[$id]['out']) || isset($this->started[$id]['err']) ? "\n" : '';
-
-        if ($successful) {
-            return sprintf("%s%s<bg=green;fg=white> %s </> <fg=green>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
-        }
-
-        $message = sprintf("%s%s<bg=red;fg=white> %s </> <fg=red>%s</>\n", $trailingEOL, $this->getBorder($id), $prefix, $message);
-
-        unset($this->started[$id]['out'], $this->started[$id]['err']);
-
-        return $message;
-    }
-
-    /**
-     * @param string $id The id of the formatting session
-     *
-     * @return string
-     */
-    private function getBorder($id)
-    {
-        return sprintf('<bg=%s> </>', $this->colors[$this->started[$id]['border']]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'debug_formatter';
-    }
-}
diff --git a/vendor/symfony/console/Helper/DescriptorHelper.php b/vendor/symfony/console/Helper/DescriptorHelper.php
deleted file mode 100644
index c324c99..0000000
--- a/vendor/symfony/console/Helper/DescriptorHelper.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Descriptor\DescriptorInterface;
-use Symfony\Component\Console\Descriptor\JsonDescriptor;
-use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
-use Symfony\Component\Console\Descriptor\TextDescriptor;
-use Symfony\Component\Console\Descriptor\XmlDescriptor;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * This class adds helper method to describe objects in various formats.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class DescriptorHelper extends Helper
-{
-    /**
-     * @var DescriptorInterface[]
-     */
-    private $descriptors = array();
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this
-            ->register('txt', new TextDescriptor())
-            ->register('xml', new XmlDescriptor())
-            ->register('json', new JsonDescriptor())
-            ->register('md', new MarkdownDescriptor())
-        ;
-    }
-
-    /**
-     * Describes an object if supported.
-     *
-     * Available options are:
-     * * format: string, the output format name
-     * * raw_text: boolean, sets output type as raw
-     *
-     * @param OutputInterface $output
-     * @param object          $object
-     * @param array           $options
-     *
-     * @throws \InvalidArgumentException when the given format is not supported
-     */
-    public function describe(OutputInterface $output, $object, array $options = array())
-    {
-        $options = array_merge(array(
-            'raw_text' => false,
-            'format' => 'txt',
-        ), $options);
-
-        if (!isset($this->descriptors[$options['format']])) {
-            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
-        }
-
-        $descriptor = $this->descriptors[$options['format']];
-        $descriptor->describe($output, $object, $options);
-    }
-
-    /**
-     * Registers a descriptor.
-     *
-     * @param string              $format
-     * @param DescriptorInterface $descriptor
-     *
-     * @return DescriptorHelper
-     */
-    public function register($format, DescriptorInterface $descriptor)
-    {
-        $this->descriptors[$format] = $descriptor;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'descriptor';
-    }
-}
diff --git a/vendor/symfony/console/Helper/DialogHelper.php b/vendor/symfony/console/Helper/DialogHelper.php
deleted file mode 100644
index dbadac2..0000000
--- a/vendor/symfony/console/Helper/DialogHelper.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-
-/**
- * The Dialog class provides helpers to interact with the user.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Console\Helper\QuestionHelper} instead.
- */
-class DialogHelper extends InputAwareHelper
-{
-    private $inputStream;
-    private static $shell;
-    private static $stty;
-
-    public function __construct($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
-        }
-    }
-
-    /**
-     * Asks the user to select a value.
-     *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param array           $choices      List of choices to pick from
-     * @param bool|string     $default      The default answer if the user enters nothing
-     * @param bool|int        $attempts     Max number of times to ask before giving up (false by default, which means infinite)
-     * @param string          $errorMessage Message which will be shown if invalid value from choice list would be picked
-     * @param bool            $multiselect  Select more than one value separated by comma
-     *
-     * @return int|string|array The selected value or values (the key of the choices array)
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function select(OutputInterface $output, $question, $choices, $default = null, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false)
-    {
-        $width = max(array_map('strlen', array_keys($choices)));
-
-        $messages = (array) $question;
-        foreach ($choices as $key => $value) {
-            $messages[] = sprintf("  [<info>%-${width}s</info>] %s", $key, $value);
-        }
-
-        $output->writeln($messages);
-
-        $result = $this->askAndValidate($output, '> ', function ($picked) use ($choices, $errorMessage, $multiselect) {
-            // Collapse all spaces.
-            $selectedChoices = str_replace(' ', '', $picked);
-
-            if ($multiselect) {
-                // Check for a separated comma values
-                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
-                    throw new \InvalidArgumentException(sprintf($errorMessage, $picked));
-                }
-                $selectedChoices = explode(',', $selectedChoices);
-            } else {
-                $selectedChoices = array($picked);
-            }
-
-            $multiselectChoices = array();
-
-            foreach ($selectedChoices as $value) {
-                if (empty($choices[$value])) {
-                    throw new \InvalidArgumentException(sprintf($errorMessage, $value));
-                }
-                $multiselectChoices[] = $value;
-            }
-
-            if ($multiselect) {
-                return $multiselectChoices;
-            }
-
-            return $picked;
-        }, $attempts, $default);
-
-        return $result;
-    }
-
-    /**
-     * Asks a question to the user.
-     *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param string          $default      The default answer if none is given by the user
-     * @param array           $autocomplete List of values to autocomplete
-     *
-     * @return string The user answer
-     *
-     * @throws \RuntimeException If there is no data to read in the input stream
-     */
-    public function ask(OutputInterface $output, $question, $default = null, array $autocomplete = null)
-    {
-        if ($this->input && !$this->input->isInteractive()) {
-            return $default;
-        }
-
-        $output->write($question);
-
-        $inputStream = $this->inputStream ?: STDIN;
-
-        if (null === $autocomplete || !$this->hasSttyAvailable()) {
-            $ret = fgets($inputStream, 4096);
-            if (false === $ret) {
-                throw new \RuntimeException('Aborted');
-            }
-            $ret = trim($ret);
-        } else {
-            $ret = '';
-
-            $i = 0;
-            $ofs = -1;
-            $matches = $autocomplete;
-            $numMatches = count($matches);
-
-            $sttyMode = shell_exec('stty -g');
-
-            // Disable icanon (so we can fread each keypress) and echo (we'll do echoing here instead)
-            shell_exec('stty -icanon -echo');
-
-            // Add highlighted text style
-            $output->getFormatter()->setStyle('hl', new OutputFormatterStyle('black', 'white'));
-
-            // Read a keypress
-            while (!feof($inputStream)) {
-                $c = fread($inputStream, 1);
-
-                // Backspace Character
-                if ("\177" === $c) {
-                    if (0 === $numMatches && 0 !== $i) {
-                        --$i;
-                        // Move cursor backwards
-                        $output->write("\033[1D");
-                    }
-
-                    if ($i === 0) {
-                        $ofs = -1;
-                        $matches = $autocomplete;
-                        $numMatches = count($matches);
-                    } else {
-                        $numMatches = 0;
-                    }
-
-                    // Pop the last character off the end of our string
-                    $ret = substr($ret, 0, $i);
-                } elseif ("\033" === $c) {
-                    // Did we read an escape sequence?
-                    $c .= fread($inputStream, 2);
-
-                    // A = Up Arrow. B = Down Arrow
-                    if (isset($c[2]) && ('A' === $c[2] || 'B' === $c[2])) {
-                        if ('A' === $c[2] && -1 === $ofs) {
-                            $ofs = 0;
-                        }
-
-                        if (0 === $numMatches) {
-                            continue;
-                        }
-
-                        $ofs += ('A' === $c[2]) ? -1 : 1;
-                        $ofs = ($numMatches + $ofs) % $numMatches;
-                    }
-                } elseif (ord($c) < 32) {
-                    if ("\t" === $c || "\n" === $c) {
-                        if ($numMatches > 0 && -1 !== $ofs) {
-                            $ret = $matches[$ofs];
-                            // Echo out remaining chars for current match
-                            $output->write(substr($ret, $i));
-                            $i = strlen($ret);
-                        }
-
-                        if ("\n" === $c) {
-                            $output->write($c);
-                            break;
-                        }
-
-                        $numMatches = 0;
-                    }
-
-                    continue;
-                } else {
-                    $output->write($c);
-                    $ret .= $c;
-                    ++$i;
-
-                    $numMatches = 0;
-                    $ofs = 0;
-
-                    foreach ($autocomplete as $value) {
-                        // If typed characters match the beginning chunk of value (e.g. [AcmeDe]moBundle)
-                        if (0 === strpos($value, $ret) && $i !== strlen($value)) {
-                            $matches[$numMatches++] = $value;
-                        }
-                    }
-                }
-
-                // Erase characters from cursor to end of line
-                $output->write("\033[K");
-
-                if ($numMatches > 0 && -1 !== $ofs) {
-                    // Save cursor position
-                    $output->write("\0337");
-                    // Write highlighted text
-                    $output->write('<hl>'.substr($matches[$ofs], $i).'</hl>');
-                    // Restore cursor position
-                    $output->write("\0338");
-                }
-            }
-
-            // Reset stty so it behaves normally again
-            shell_exec(sprintf('stty %s', $sttyMode));
-        }
-
-        return strlen($ret) > 0 ? $ret : $default;
-    }
-
-    /**
-     * Asks a confirmation to the user.
-     *
-     * The question will be asked until the user answers by nothing, yes, or no.
-     *
-     * @param OutputInterface $output   An Output instance
-     * @param string|array    $question The question to ask
-     * @param bool            $default  The default answer if the user enters nothing
-     *
-     * @return bool true if the user has confirmed, false otherwise
-     */
-    public function askConfirmation(OutputInterface $output, $question, $default = true)
-    {
-        $answer = 'z';
-        while ($answer && !in_array(strtolower($answer[0]), array('y', 'n'))) {
-            $answer = $this->ask($output, $question);
-        }
-
-        if (false === $default) {
-            return $answer && 'y' == strtolower($answer[0]);
-        }
-
-        return !$answer || 'y' == strtolower($answer[0]);
-    }
-
-    /**
-     * Asks a question to the user, the response is hidden.
-     *
-     * @param OutputInterface $output   An Output instance
-     * @param string|array    $question The question
-     * @param bool            $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not
-     *
-     * @return string The answer
-     *
-     * @throws \RuntimeException In case the fallback is deactivated and the response can not be hidden
-     */
-    public function askHiddenResponse(OutputInterface $output, $question, $fallback = true)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $exe = __DIR__.'/../Resources/bin/hiddeninput.exe';
-
-            // handle code running from a phar
-            if ('phar:' === substr(__FILE__, 0, 5)) {
-                $tmpExe = sys_get_temp_dir().'/hiddeninput.exe';
-                copy($exe, $tmpExe);
-                $exe = $tmpExe;
-            }
-
-            $output->write($question);
-            $value = rtrim(shell_exec($exe));
-            $output->writeln('');
-
-            if (isset($tmpExe)) {
-                unlink($tmpExe);
-            }
-
-            return $value;
-        }
-
-        if ($this->hasSttyAvailable()) {
-            $output->write($question);
-
-            $sttyMode = shell_exec('stty -g');
-
-            shell_exec('stty -echo');
-            $value = fgets($this->inputStream ?: STDIN, 4096);
-            shell_exec(sprintf('stty %s', $sttyMode));
-
-            if (false === $value) {
-                throw new \RuntimeException('Aborted');
-            }
-
-            $value = trim($value);
-            $output->writeln('');
-
-            return $value;
-        }
-
-        if (false !== $shell = $this->getShell()) {
-            $output->write($question);
-            $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword';
-            $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
-            $value = rtrim(shell_exec($command));
-            $output->writeln('');
-
-            return $value;
-        }
-
-        if ($fallback) {
-            return $this->ask($output, $question);
-        }
-
-        throw new \RuntimeException('Unable to hide the response');
-    }
-
-    /**
-     * Asks for a value and validates the response.
-     *
-     * The validator receives the data to validate. It must return the
-     * validated data when the data is valid and throw an exception
-     * otherwise.
-     *
-     * @param OutputInterface $output       An Output instance
-     * @param string|array    $question     The question to ask
-     * @param callable        $validator    A PHP callback
-     * @param int|false       $attempts     Max number of times to ask before giving up (false by default, which means infinite)
-     * @param string          $default      The default answer if none is given by the user
-     * @param array           $autocomplete List of values to autocomplete
-     *
-     * @return mixed
-     *
-     * @throws \Exception When any of the validators return an error
-     */
-    public function askAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $default = null, array $autocomplete = null)
-    {
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $default, $autocomplete, $that) {
-            return $that->ask($output, $question, $default, $autocomplete);
-        };
-
-        return $this->validateAttempts($interviewer, $output, $validator, $attempts);
-    }
-
-    /**
-     * Asks for a value, hide and validates the response.
-     *
-     * The validator receives the data to validate. It must return the
-     * validated data when the data is valid and throw an exception
-     * otherwise.
-     *
-     * @param OutputInterface $output    An Output instance
-     * @param string|array    $question  The question to ask
-     * @param callable        $validator A PHP callback
-     * @param int|false       $attempts  Max number of times to ask before giving up (false by default, which means infinite)
-     * @param bool            $fallback  In case the response can not be hidden, whether to fallback on non-hidden question or not
-     *
-     * @return string The response
-     *
-     * @throws \Exception        When any of the validators return an error
-     * @throws \RuntimeException In case the fallback is deactivated and the response can not be hidden
-     */
-    public function askHiddenResponseAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $fallback = true)
-    {
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $fallback, $that) {
-            return $that->askHiddenResponse($output, $question, $fallback);
-        };
-
-        return $this->validateAttempts($interviewer, $output, $validator, $attempts);
-    }
-
-    /**
-     * Sets the input stream to read from when interacting with the user.
-     *
-     * This is mainly useful for testing purpose.
-     *
-     * @param resource $stream The input stream
-     */
-    public function setInputStream($stream)
-    {
-        $this->inputStream = $stream;
-    }
-
-    /**
-     * Returns the helper's input stream.
-     *
-     * @return resource|null The input stream or null if the default STDIN is used
-     */
-    public function getInputStream()
-    {
-        return $this->inputStream;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'dialog';
-    }
-
-    /**
-     * Return a valid Unix shell.
-     *
-     * @return string|bool The valid shell name, false in case no valid shell is found
-     */
-    private function getShell()
-    {
-        if (null !== self::$shell) {
-            return self::$shell;
-        }
-
-        self::$shell = false;
-
-        if (file_exists('/usr/bin/env')) {
-            // handle other OSs with bash/zsh/ksh/csh if available to hide the answer
-            $test = "/usr/bin/env %s -c 'echo OK' 2> /dev/null";
-            foreach (array('bash', 'zsh', 'ksh', 'csh') as $sh) {
-                if ('OK' === rtrim(shell_exec(sprintf($test, $sh)))) {
-                    self::$shell = $sh;
-                    break;
-                }
-            }
-        }
-
-        return self::$shell;
-    }
-
-    private function hasSttyAvailable()
-    {
-        if (null !== self::$stty) {
-            return self::$stty;
-        }
-
-        exec('stty 2>&1', $output, $exitcode);
-
-        return self::$stty = $exitcode === 0;
-    }
-
-    /**
-     * Validate an attempt.
-     *
-     * @param callable        $interviewer A callable that will ask for a question and return the result
-     * @param OutputInterface $output      An Output instance
-     * @param callable        $validator   A PHP callback
-     * @param int|false       $attempts    Max number of times to ask before giving up ; false will ask infinitely
-     *
-     * @return string The validated response
-     *
-     * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
-     */
-    private function validateAttempts($interviewer, OutputInterface $output, $validator, $attempts)
-    {
-        $e = null;
-        while (false === $attempts || $attempts--) {
-            if (null !== $e) {
-                $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($e->getMessage(), 'error'));
-            }
-
-            try {
-                return call_user_func($validator, $interviewer());
-            } catch (\Exception $e) {
-            }
-        }
-
-        throw $e;
-    }
-}
diff --git a/vendor/symfony/console/Helper/FormatterHelper.php b/vendor/symfony/console/Helper/FormatterHelper.php
deleted file mode 100644
index ac736f9..0000000
--- a/vendor/symfony/console/Helper/FormatterHelper.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Formatter\OutputFormatter;
-
-/**
- * The Formatter class provides helpers to format messages.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FormatterHelper extends Helper
-{
-    /**
-     * Formats a message within a section.
-     *
-     * @param string $section The section name
-     * @param string $message The message
-     * @param string $style   The style to apply to the section
-     *
-     * @return string The format section
-     */
-    public function formatSection($section, $message, $style = 'info')
-    {
-        return sprintf('<%s>[%s]</%s> %s', $style, $section, $style, $message);
-    }
-
-    /**
-     * Formats a message as a block of text.
-     *
-     * @param string|array $messages The message to write in the block
-     * @param string       $style    The style to apply to the whole block
-     * @param bool         $large    Whether to return a large block
-     *
-     * @return string The formatter message
-     */
-    public function formatBlock($messages, $style, $large = false)
-    {
-        if (!is_array($messages)) {
-            $messages = array($messages);
-        }
-
-        $len = 0;
-        $lines = array();
-        foreach ($messages as $message) {
-            $message = OutputFormatter::escape($message);
-            $lines[] = sprintf($large ? '  %s  ' : ' %s ', $message);
-            $len = max($this->strlen($message) + ($large ? 4 : 2), $len);
-        }
-
-        $messages = $large ? array(str_repeat(' ', $len)) : array();
-        for ($i = 0; isset($lines[$i]); ++$i) {
-            $messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
-        }
-        if ($large) {
-            $messages[] = str_repeat(' ', $len);
-        }
-
-        for ($i = 0; isset($messages[$i]); ++$i) {
-            $messages[$i] = sprintf('<%s>%s</%s>', $style, $messages[$i], $style);
-        }
-
-        return implode("\n", $messages);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'formatter';
-    }
-}
diff --git a/vendor/symfony/console/Helper/Helper.php b/vendor/symfony/console/Helper/Helper.php
deleted file mode 100644
index b288d44..0000000
--- a/vendor/symfony/console/Helper/Helper.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-
-/**
- * Helper is the base class for all helper classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Helper implements HelperInterface
-{
-    protected $helperSet = null;
-
-    /**
-     * Sets the helper set associated with this helper.
-     *
-     * @param HelperSet $helperSet A HelperSet instance
-     */
-    public function setHelperSet(HelperSet $helperSet = null)
-    {
-        $this->helperSet = $helperSet;
-    }
-
-    /**
-     * Gets the helper set associated with this helper.
-     *
-     * @return HelperSet A HelperSet instance
-     */
-    public function getHelperSet()
-    {
-        return $this->helperSet;
-    }
-
-    /**
-     * Returns the length of a string, using mb_strwidth if it is available.
-     *
-     * @param string $string The string to check its length
-     *
-     * @return int The length of the string
-     */
-    public static function strlen($string)
-    {
-        if (!function_exists('mb_strwidth')) {
-            return strlen($string);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
-            return strlen($string);
-        }
-
-        return mb_strwidth($string, $encoding);
-    }
-
-    public static function formatTime($secs)
-    {
-        static $timeFormats = array(
-            array(0, '< 1 sec'),
-            array(2, '1 sec'),
-            array(59, 'secs', 1),
-            array(60, '1 min'),
-            array(3600, 'mins', 60),
-            array(5400, '1 hr'),
-            array(86400, 'hrs', 3600),
-            array(129600, '1 day'),
-            array(604800, 'days', 86400),
-        );
-
-        foreach ($timeFormats as $format) {
-            if ($secs >= $format[0]) {
-                continue;
-            }
-
-            if (2 == count($format)) {
-                return $format[1];
-            }
-
-            return ceil($secs / $format[2]).' '.$format[1];
-        }
-    }
-
-    public static function formatMemory($memory)
-    {
-        if ($memory >= 1024 * 1024 * 1024) {
-            return sprintf('%.1f GiB', $memory / 1024 / 1024 / 1024);
-        }
-
-        if ($memory >= 1024 * 1024) {
-            return sprintf('%.1f MiB', $memory / 1024 / 1024);
-        }
-
-        if ($memory >= 1024) {
-            return sprintf('%d KiB', $memory / 1024);
-        }
-
-        return sprintf('%d B', $memory);
-    }
-
-    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, $string)
-    {
-        $isDecorated = $formatter->isDecorated();
-        $formatter->setDecorated(false);
-        // remove <...> formatting
-        $string = $formatter->format($string);
-        // remove already formatted characters
-        $string = preg_replace("/\033\[[^m]*m/", '', $string);
-        $formatter->setDecorated($isDecorated);
-
-        return self::strlen($string);
-    }
-}
diff --git a/vendor/symfony/console/Helper/HelperInterface.php b/vendor/symfony/console/Helper/HelperInterface.php
deleted file mode 100644
index 5a923e0..0000000
--- a/vendor/symfony/console/Helper/HelperInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\Console\Helper;
-
-/**
- * HelperInterface is the interface all helpers must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface HelperInterface
-{
-    /**
-     * Sets the helper set associated with this helper.
-     *
-     * @param HelperSet $helperSet A HelperSet instance
-     */
-    public function setHelperSet(HelperSet $helperSet = null);
-
-    /**
-     * Gets the helper set associated with this helper.
-     *
-     * @return HelperSet A HelperSet instance
-     */
-    public function getHelperSet();
-
-    /**
-     * Returns the canonical name of this helper.
-     *
-     * @return string The canonical name
-     */
-    public function getName();
-}
diff --git a/vendor/symfony/console/Helper/HelperSet.php b/vendor/symfony/console/Helper/HelperSet.php
deleted file mode 100644
index 00354dd..0000000
--- a/vendor/symfony/console/Helper/HelperSet.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * HelperSet represents a set of helpers to be used with a command.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HelperSet implements \IteratorAggregate
-{
-    private $helpers = array();
-    private $command;
-
-    /**
-     * Constructor.
-     *
-     * @param Helper[] $helpers An array of helper.
-     */
-    public function __construct(array $helpers = array())
-    {
-        foreach ($helpers as $alias => $helper) {
-            $this->set($helper, is_int($alias) ? null : $alias);
-        }
-    }
-
-    /**
-     * Sets a helper.
-     *
-     * @param HelperInterface $helper The helper instance
-     * @param string          $alias  An alias
-     */
-    public function set(HelperInterface $helper, $alias = null)
-    {
-        $this->helpers[$helper->getName()] = $helper;
-        if (null !== $alias) {
-            $this->helpers[$alias] = $helper;
-        }
-
-        $helper->setHelperSet($this);
-    }
-
-    /**
-     * Returns true if the helper if defined.
-     *
-     * @param string $name The helper name
-     *
-     * @return bool true if the helper is defined, false otherwise
-     */
-    public function has($name)
-    {
-        return isset($this->helpers[$name]);
-    }
-
-    /**
-     * Gets a helper value.
-     *
-     * @param string $name The helper name
-     *
-     * @return HelperInterface The helper instance
-     *
-     * @throws \InvalidArgumentException if the helper is not defined
-     */
-    public function get($name)
-    {
-        if (!$this->has($name)) {
-            throw new \InvalidArgumentException(sprintf('The helper "%s" is not defined.', $name));
-        }
-
-        if ('dialog' === $name && $this->helpers[$name] instanceof DialogHelper) {
-            @trigger_error('"Symfony\Component\Console\Helper\DialogHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\QuestionHelper" instead.', E_USER_DEPRECATED);
-        } elseif ('progress' === $name && $this->helpers[$name] instanceof ProgressHelper) {
-            @trigger_error('"Symfony\Component\Console\Helper\ProgressHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\ProgressBar" instead.', E_USER_DEPRECATED);
-        } elseif ('table' === $name && $this->helpers[$name] instanceof TableHelper) {
-            @trigger_error('"Symfony\Component\Console\Helper\TableHelper" is deprecated since version 2.5 and will be removed in 3.0. Use "Symfony\Component\Console\Helper\Table" instead.', E_USER_DEPRECATED);
-        }
-
-        return $this->helpers[$name];
-    }
-
-    /**
-     * Sets the command associated with this helper set.
-     *
-     * @param Command $command A Command instance
-     */
-    public function setCommand(Command $command = null)
-    {
-        $this->command = $command;
-    }
-
-    /**
-     * Gets the command associated with this helper set.
-     *
-     * @return Command A Command instance
-     */
-    public function getCommand()
-    {
-        return $this->command;
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->helpers);
-    }
-}
diff --git a/vendor/symfony/console/Helper/InputAwareHelper.php b/vendor/symfony/console/Helper/InputAwareHelper.php
deleted file mode 100644
index 4261767..0000000
--- a/vendor/symfony/console/Helper/InputAwareHelper.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputAwareInterface;
-
-/**
- * An implementation of InputAwareInterface for Helpers.
- *
- * @author Wouter J <waldio.webdesign@gmail.com>
- */
-abstract class InputAwareHelper extends Helper implements InputAwareInterface
-{
-    protected $input;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setInput(InputInterface $input)
-    {
-        $this->input = $input;
-    }
-}
diff --git a/vendor/symfony/console/Helper/ProcessHelper.php b/vendor/symfony/console/Helper/ProcessHelper.php
deleted file mode 100644
index a811eb4..0000000
--- a/vendor/symfony/console/Helper/ProcessHelper.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
-
-/**
- * The ProcessHelper class provides helpers to run external processes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ProcessHelper extends Helper
-{
-    /**
-     * Runs an external process.
-     *
-     * @param OutputInterface      $output    An OutputInterface instance
-     * @param string|array|Process $cmd       An instance of Process or an array of arguments to escape and run or a command to run
-     * @param string|null          $error     An error message that must be displayed if something went wrong
-     * @param callable|null        $callback  A PHP callback to run whenever there is some
-     *                                        output available on STDOUT or STDERR
-     * @param int                  $verbosity The threshold for verbosity
-     *
-     * @return Process The process that ran
-     */
-    public function run(OutputInterface $output, $cmd, $error = null, $callback = null, $verbosity = OutputInterface::VERBOSITY_VERY_VERBOSE)
-    {
-        if ($output instanceof ConsoleOutputInterface) {
-            $output = $output->getErrorOutput();
-        }
-
-        $formatter = $this->getHelperSet()->get('debug_formatter');
-
-        if (is_array($cmd)) {
-            $process = ProcessBuilder::create($cmd)->getProcess();
-        } elseif ($cmd instanceof Process) {
-            $process = $cmd;
-        } else {
-            $process = new Process($cmd);
-        }
-
-        if ($verbosity <= $output->getVerbosity()) {
-            $output->write($formatter->start(spl_object_hash($process), $this->escapeString($process->getCommandLine())));
-        }
-
-        if ($output->isDebug()) {
-            $callback = $this->wrapCallback($output, $process, $callback);
-        }
-
-        $process->run($callback);
-
-        if ($verbosity <= $output->getVerbosity()) {
-            $message = $process->isSuccessful() ? 'Command ran successfully' : sprintf('%s Command did not run successfully', $process->getExitCode());
-            $output->write($formatter->stop(spl_object_hash($process), $message, $process->isSuccessful()));
-        }
-
-        if (!$process->isSuccessful() && null !== $error) {
-            $output->writeln(sprintf('<error>%s</error>', $this->escapeString($error)));
-        }
-
-        return $process;
-    }
-
-    /**
-     * Runs the process.
-     *
-     * This is identical to run() except that an exception is thrown if the process
-     * exits with a non-zero exit code.
-     *
-     * @param OutputInterface $output   An OutputInterface instance
-     * @param string|Process  $cmd      An instance of Process or a command to run
-     * @param string|null     $error    An error message that must be displayed if something went wrong
-     * @param callable|null   $callback A PHP callback to run whenever there is some
-     *                                  output available on STDOUT or STDERR
-     *
-     * @return Process The process that ran
-     *
-     * @throws ProcessFailedException
-     *
-     * @see run()
-     */
-    public function mustRun(OutputInterface $output, $cmd, $error = null, $callback = null)
-    {
-        $process = $this->run($output, $cmd, $error, $callback);
-
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
-
-        return $process;
-    }
-
-    /**
-     * Wraps a Process callback to add debugging output.
-     *
-     * @param OutputInterface $output   An OutputInterface interface
-     * @param Process         $process  The Process
-     * @param callable|null   $callback A PHP callable
-     *
-     * @return callable
-     */
-    public function wrapCallback(OutputInterface $output, Process $process, $callback = null)
-    {
-        if ($output instanceof ConsoleOutputInterface) {
-            $output = $output->getErrorOutput();
-        }
-
-        $formatter = $this->getHelperSet()->get('debug_formatter');
-
-        $that = $this;
-
-        return function ($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
-            $output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
-
-            if (null !== $callback) {
-                call_user_func($callback, $type, $buffer);
-            }
-        };
-    }
-
-    /**
-     * This method is public for PHP 5.3 compatibility, it should be private.
-     *
-     * @internal
-     */
-    public function escapeString($str)
-    {
-        return str_replace('<', '\\<', $str);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'process';
-    }
-}
diff --git a/vendor/symfony/console/Helper/ProgressBar.php b/vendor/symfony/console/Helper/ProgressBar.php
deleted file mode 100644
index 0b64b18..0000000
--- a/vendor/symfony/console/Helper/ProgressBar.php
+++ /dev/null
@@ -1,638 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * The ProgressBar provides helpers to display progress output.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Chris Jones <leeked@gmail.com>
- */
-class ProgressBar
-{
-    // options
-    private $barWidth = 28;
-    private $barChar;
-    private $emptyBarChar = '-';
-    private $progressChar = '>';
-    private $format;
-    private $internalFormat;
-    private $redrawFreq = 1;
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-    private $step = 0;
-    private $max;
-    private $startTime;
-    private $stepWidth;
-    private $percent = 0.0;
-    private $lastMessagesLength = 0;
-    private $formatLineCount;
-    private $messages;
-    private $overwrite = true;
-
-    private static $formatters;
-    private static $formats;
-
-    /**
-     * Constructor.
-     *
-     * @param OutputInterface $output An OutputInterface instance
-     * @param int             $max    Maximum steps (0 if unknown)
-     */
-    public function __construct(OutputInterface $output, $max = 0)
-    {
-        if ($output instanceof ConsoleOutputInterface) {
-            $output = $output->getErrorOutput();
-        }
-
-        $this->output = $output;
-        $this->setMaxSteps($max);
-
-        if (!$this->output->isDecorated()) {
-            // disable overwrite when output does not support ANSI codes.
-            $this->overwrite = false;
-
-            if ($this->max > 10) {
-                // set a reasonable redraw frequency so output isn't flooded
-                $this->setRedrawFrequency($max / 10);
-            }
-        }
-
-        $this->startTime = time();
-    }
-
-    /**
-     * Sets a placeholder formatter for a given name.
-     *
-     * This method also allow you to override an existing placeholder.
-     *
-     * @param string   $name     The placeholder name (including the delimiter char like %)
-     * @param callable $callable A PHP callable
-     */
-    public static function setPlaceholderFormatterDefinition($name, $callable)
-    {
-        if (!self::$formatters) {
-            self::$formatters = self::initPlaceholderFormatters();
-        }
-
-        self::$formatters[$name] = $callable;
-    }
-
-    /**
-     * Gets the placeholder formatter for a given name.
-     *
-     * @param string $name The placeholder name (including the delimiter char like %)
-     *
-     * @return callable|null A PHP callable
-     */
-    public static function getPlaceholderFormatterDefinition($name)
-    {
-        if (!self::$formatters) {
-            self::$formatters = self::initPlaceholderFormatters();
-        }
-
-        return isset(self::$formatters[$name]) ? self::$formatters[$name] : null;
-    }
-
-    /**
-     * Sets a format for a given name.
-     *
-     * This method also allow you to override an existing format.
-     *
-     * @param string $name   The format name
-     * @param string $format A format string
-     */
-    public static function setFormatDefinition($name, $format)
-    {
-        if (!self::$formats) {
-            self::$formats = self::initFormats();
-        }
-
-        self::$formats[$name] = $format;
-    }
-
-    /**
-     * Gets the format for a given name.
-     *
-     * @param string $name The format name
-     *
-     * @return string|null A format string
-     */
-    public static function getFormatDefinition($name)
-    {
-        if (!self::$formats) {
-            self::$formats = self::initFormats();
-        }
-
-        return isset(self::$formats[$name]) ? self::$formats[$name] : null;
-    }
-
-    public function setMessage($message, $name = 'message')
-    {
-        $this->messages[$name] = $message;
-    }
-
-    public function getMessage($name = 'message')
-    {
-        return $this->messages[$name];
-    }
-
-    /**
-     * Gets the progress bar start time.
-     *
-     * @return int The progress bar start time
-     */
-    public function getStartTime()
-    {
-        return $this->startTime;
-    }
-
-    /**
-     * Gets the progress bar maximal steps.
-     *
-     * @return int The progress bar max steps
-     */
-    public function getMaxSteps()
-    {
-        return $this->max;
-    }
-
-    /**
-     * Gets the progress bar step.
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use {@link getProgress()} instead.
-     *
-     * @return int The progress bar step
-     */
-    public function getStep()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getProgress() method instead.', E_USER_DEPRECATED);
-
-        return $this->getProgress();
-    }
-
-    /**
-     * Gets the current step position.
-     *
-     * @return int The progress bar step
-     */
-    public function getProgress()
-    {
-        return $this->step;
-    }
-
-    /**
-     * Gets the progress bar step width.
-     *
-     * @internal This method is public for PHP 5.3 compatibility, it should not be used.
-     *
-     * @return int The progress bar step width
-     */
-    public function getStepWidth()
-    {
-        return $this->stepWidth;
-    }
-
-    /**
-     * Gets the current progress bar percent.
-     *
-     * @return float The current progress bar percent
-     */
-    public function getProgressPercent()
-    {
-        return $this->percent;
-    }
-
-    /**
-     * Sets the progress bar width.
-     *
-     * @param int $size The progress bar size
-     */
-    public function setBarWidth($size)
-    {
-        $this->barWidth = (int) $size;
-    }
-
-    /**
-     * Gets the progress bar width.
-     *
-     * @return int The progress bar size
-     */
-    public function getBarWidth()
-    {
-        return $this->barWidth;
-    }
-
-    /**
-     * Sets the bar character.
-     *
-     * @param string $char A character
-     */
-    public function setBarCharacter($char)
-    {
-        $this->barChar = $char;
-    }
-
-    /**
-     * Gets the bar character.
-     *
-     * @return string A character
-     */
-    public function getBarCharacter()
-    {
-        if (null === $this->barChar) {
-            return $this->max ? '=' : $this->emptyBarChar;
-        }
-
-        return $this->barChar;
-    }
-
-    /**
-     * Sets the empty bar character.
-     *
-     * @param string $char A character
-     */
-    public function setEmptyBarCharacter($char)
-    {
-        $this->emptyBarChar = $char;
-    }
-
-    /**
-     * Gets the empty bar character.
-     *
-     * @return string A character
-     */
-    public function getEmptyBarCharacter()
-    {
-        return $this->emptyBarChar;
-    }
-
-    /**
-     * Sets the progress bar character.
-     *
-     * @param string $char A character
-     */
-    public function setProgressCharacter($char)
-    {
-        $this->progressChar = $char;
-    }
-
-    /**
-     * Gets the progress bar character.
-     *
-     * @return string A character
-     */
-    public function getProgressCharacter()
-    {
-        return $this->progressChar;
-    }
-
-    /**
-     * Sets the progress bar format.
-     *
-     * @param string $format The format
-     */
-    public function setFormat($format)
-    {
-        $this->format = null;
-        $this->internalFormat = $format;
-    }
-
-    /**
-     * Sets the redraw frequency.
-     *
-     * @param int $freq The frequency in steps
-     */
-    public function setRedrawFrequency($freq)
-    {
-        $this->redrawFreq = (int) $freq;
-    }
-
-    /**
-     * Starts the progress output.
-     *
-     * @param int|null $max Number of steps to complete the bar (0 if indeterminate), null to leave unchanged
-     */
-    public function start($max = null)
-    {
-        $this->startTime = time();
-        $this->step = 0;
-        $this->percent = 0.0;
-
-        if (null !== $max) {
-            $this->setMaxSteps($max);
-        }
-
-        $this->display();
-    }
-
-    /**
-     * Advances the progress output X steps.
-     *
-     * @param int $step Number of steps to advance
-     *
-     * @throws \LogicException
-     */
-    public function advance($step = 1)
-    {
-        $this->setProgress($this->step + $step);
-    }
-
-    /**
-     * Sets the current progress.
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use {@link setProgress()} instead.
-     *
-     * @param int $step The current progress
-     *
-     * @throws \LogicException
-     */
-    public function setCurrent($step)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the setProgress() method instead.', E_USER_DEPRECATED);
-
-        $this->setProgress($step);
-    }
-
-    /**
-     * Sets whether to overwrite the progressbar, false for new line.
-     *
-     * @param bool $overwrite
-     */
-    public function setOverwrite($overwrite)
-    {
-        $this->overwrite = (bool) $overwrite;
-    }
-
-    /**
-     * Sets the current progress.
-     *
-     * @param int $step The current progress
-     *
-     * @throws \LogicException
-     */
-    public function setProgress($step)
-    {
-        $step = (int) $step;
-        if ($step < $this->step) {
-            throw new \LogicException('You can\'t regress the progress bar.');
-        }
-
-        if ($this->max && $step > $this->max) {
-            $this->max = $step;
-        }
-
-        $prevPeriod = (int) ($this->step / $this->redrawFreq);
-        $currPeriod = (int) ($step / $this->redrawFreq);
-        $this->step = $step;
-        $this->percent = $this->max ? (float) $this->step / $this->max : 0;
-        if ($prevPeriod !== $currPeriod || $this->max === $step) {
-            $this->display();
-        }
-    }
-
-    /**
-     * Finishes the progress output.
-     */
-    public function finish()
-    {
-        if (!$this->max) {
-            $this->max = $this->step;
-        }
-
-        if ($this->step === $this->max && !$this->overwrite) {
-            // prevent double 100% output
-            return;
-        }
-
-        $this->setProgress($this->max);
-    }
-
-    /**
-     * Outputs the current progress string.
-     */
-    public function display()
-    {
-        if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) {
-            return;
-        }
-
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
-        }
-
-        // these 3 variables can be removed in favor of using $this in the closure when support for PHP 5.3 will be dropped.
-        $self = $this;
-        $output = $this->output;
-        $messages = $this->messages;
-        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self, $output, $messages) {
-            if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = call_user_func($formatter, $self, $output);
-            } elseif (isset($messages[$matches[1]])) {
-                $text = $messages[$matches[1]];
-            } else {
-                return $matches[0];
-            }
-
-            if (isset($matches[2])) {
-                $text = sprintf('%'.$matches[2], $text);
-            }
-
-            return $text;
-        }, $this->format));
-    }
-
-    /**
-     * Removes the progress bar from the current line.
-     *
-     * This is useful if you wish to write some output
-     * while a progress bar is running.
-     * Call display() to show the progress bar again.
-     */
-    public function clear()
-    {
-        if (!$this->overwrite) {
-            return;
-        }
-
-        if (null === $this->format) {
-            $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
-        }
-
-        $this->overwrite(str_repeat("\n", $this->formatLineCount));
-    }
-
-    /**
-     * Sets the progress bar format.
-     *
-     * @param string $format The format
-     */
-    private function setRealFormat($format)
-    {
-        // try to use the _nomax variant if available
-        if (!$this->max && null !== self::getFormatDefinition($format.'_nomax')) {
-            $this->format = self::getFormatDefinition($format.'_nomax');
-        } elseif (null !== self::getFormatDefinition($format)) {
-            $this->format = self::getFormatDefinition($format);
-        } else {
-            $this->format = $format;
-        }
-
-        $this->formatLineCount = substr_count($this->format, "\n");
-    }
-
-    /**
-     * Sets the progress bar maximal steps.
-     *
-     * @param int $max The progress bar max steps
-     */
-    private function setMaxSteps($max)
-    {
-        $this->max = max(0, (int) $max);
-        $this->stepWidth = $this->max ? Helper::strlen($this->max) : 4;
-    }
-
-    /**
-     * Overwrites a previous message to the output.
-     *
-     * @param string $message The message
-     */
-    private function overwrite($message)
-    {
-        $lines = explode("\n", $message);
-
-        // append whitespace to match the line's length
-        if (null !== $this->lastMessagesLength) {
-            foreach ($lines as $i => $line) {
-                if ($this->lastMessagesLength > Helper::strlenWithoutDecoration($this->output->getFormatter(), $line)) {
-                    $lines[$i] = str_pad($line, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT);
-                }
-            }
-        }
-
-        if ($this->overwrite) {
-            // move back to the beginning of the progress bar before redrawing it
-            $this->output->write("\x0D");
-        } elseif ($this->step > 0) {
-            // move to new line
-            $this->output->writeln('');
-        }
-
-        if ($this->formatLineCount) {
-            $this->output->write(sprintf("\033[%dA", $this->formatLineCount));
-        }
-        $this->output->write(implode("\n", $lines));
-
-        $this->lastMessagesLength = 0;
-        foreach ($lines as $line) {
-            $len = Helper::strlenWithoutDecoration($this->output->getFormatter(), $line);
-            if ($len > $this->lastMessagesLength) {
-                $this->lastMessagesLength = $len;
-            }
-        }
-    }
-
-    private function determineBestFormat()
-    {
-        switch ($this->output->getVerbosity()) {
-            // OutputInterface::VERBOSITY_QUIET: display is disabled anyway
-            case OutputInterface::VERBOSITY_VERBOSE:
-                return $this->max ? 'verbose' : 'verbose_nomax';
-            case OutputInterface::VERBOSITY_VERY_VERBOSE:
-                return $this->max ? 'very_verbose' : 'very_verbose_nomax';
-            case OutputInterface::VERBOSITY_DEBUG:
-                return $this->max ? 'debug' : 'debug_nomax';
-            default:
-                return $this->max ? 'normal' : 'normal_nomax';
-        }
-    }
-
-    private static function initPlaceholderFormatters()
-    {
-        return array(
-            'bar' => function (ProgressBar $bar, OutputInterface $output) {
-                $completeBars = floor($bar->getMaxSteps() > 0 ? $bar->getProgressPercent() * $bar->getBarWidth() : $bar->getProgress() % $bar->getBarWidth());
-                $display = str_repeat($bar->getBarCharacter(), $completeBars);
-                if ($completeBars < $bar->getBarWidth()) {
-                    $emptyBars = $bar->getBarWidth() - $completeBars - Helper::strlenWithoutDecoration($output->getFormatter(), $bar->getProgressCharacter());
-                    $display .= $bar->getProgressCharacter().str_repeat($bar->getEmptyBarCharacter(), $emptyBars);
-                }
-
-                return $display;
-            },
-            'elapsed' => function (ProgressBar $bar) {
-                return Helper::formatTime(time() - $bar->getStartTime());
-            },
-            'remaining' => function (ProgressBar $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new \LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
-                }
-
-                if (!$bar->getProgress()) {
-                    $remaining = 0;
-                } else {
-                    $remaining = round((time() - $bar->getStartTime()) / $bar->getProgress() * ($bar->getMaxSteps() - $bar->getProgress()));
-                }
-
-                return Helper::formatTime($remaining);
-            },
-            'estimated' => function (ProgressBar $bar) {
-                if (!$bar->getMaxSteps()) {
-                    throw new \LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
-                }
-
-                if (!$bar->getProgress()) {
-                    $estimated = 0;
-                } else {
-                    $estimated = round((time() - $bar->getStartTime()) / $bar->getProgress() * $bar->getMaxSteps());
-                }
-
-                return Helper::formatTime($estimated);
-            },
-            'memory' => function (ProgressBar $bar) {
-                return Helper::formatMemory(memory_get_usage(true));
-            },
-            'current' => function (ProgressBar $bar) {
-                return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', STR_PAD_LEFT);
-            },
-            'max' => function (ProgressBar $bar) {
-                return $bar->getMaxSteps();
-            },
-            'percent' => function (ProgressBar $bar) {
-                return floor($bar->getProgressPercent() * 100);
-            },
-        );
-    }
-
-    private static function initFormats()
-    {
-        return array(
-            'normal' => ' %current%/%max% [%bar%] %percent:3s%%',
-            'normal_nomax' => ' %current% [%bar%]',
-
-            'verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%',
-            'verbose_nomax' => ' %current% [%bar%] %elapsed:6s%',
-
-            'very_verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%',
-            'very_verbose_nomax' => ' %current% [%bar%] %elapsed:6s%',
-
-            'debug' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%',
-            'debug_nomax' => ' %current% [%bar%] %elapsed:6s% %memory:6s%',
-        );
-    }
-}
diff --git a/vendor/symfony/console/Helper/ProgressHelper.php b/vendor/symfony/console/Helper/ProgressHelper.php
deleted file mode 100644
index bd88566..0000000
--- a/vendor/symfony/console/Helper/ProgressHelper.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * The Progress class provides helpers to display progress output.
- *
- * @author Chris Jones <leeked@gmail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0
- *             Use {@link ProgressBar} instead.
- */
-class ProgressHelper extends Helper
-{
-    const FORMAT_QUIET = ' %percent%%';
-    const FORMAT_NORMAL = ' %current%/%max% [%bar%] %percent%%';
-    const FORMAT_VERBOSE = ' %current%/%max% [%bar%] %percent%% Elapsed: %elapsed%';
-    const FORMAT_QUIET_NOMAX = ' %current%';
-    const FORMAT_NORMAL_NOMAX = ' %current% [%bar%]';
-    const FORMAT_VERBOSE_NOMAX = ' %current% [%bar%] Elapsed: %elapsed%';
-
-    // options
-    private $barWidth = 28;
-    private $barChar = '=';
-    private $emptyBarChar = '-';
-    private $progressChar = '>';
-    private $format = null;
-    private $redrawFreq = 1;
-
-    private $lastMessagesLength;
-    private $barCharOriginal;
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-
-    /**
-     * Current step.
-     *
-     * @var int
-     */
-    private $current;
-
-    /**
-     * Maximum number of steps.
-     *
-     * @var int
-     */
-    private $max;
-
-    /**
-     * Start time of the progress bar.
-     *
-     * @var int
-     */
-    private $startTime;
-
-    /**
-     * List of formatting variables.
-     *
-     * @var array
-     */
-    private $defaultFormatVars = array(
-        'current',
-        'max',
-        'bar',
-        'percent',
-        'elapsed',
-    );
-
-    /**
-     * Available formatting variables.
-     *
-     * @var array
-     */
-    private $formatVars;
-
-    /**
-     * Stored format part widths (used for padding).
-     *
-     * @var array
-     */
-    private $widths = array(
-        'current' => 4,
-        'max' => 4,
-        'percent' => 3,
-        'elapsed' => 6,
-    );
-
-    /**
-     * Various time formats.
-     *
-     * @var array
-     */
-    private $timeFormats = array(
-        array(0, '???'),
-        array(2, '1 sec'),
-        array(59, 'secs', 1),
-        array(60, '1 min'),
-        array(3600, 'mins', 60),
-        array(5400, '1 hr'),
-        array(86400, 'hrs', 3600),
-        array(129600, '1 day'),
-        array(604800, 'days', 86400),
-    );
-
-    public function __construct($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\ProgressBar class instead.', E_USER_DEPRECATED);
-        }
-    }
-
-    /**
-     * Sets the progress bar width.
-     *
-     * @param int $size The progress bar size
-     */
-    public function setBarWidth($size)
-    {
-        $this->barWidth = (int) $size;
-    }
-
-    /**
-     * Sets the bar character.
-     *
-     * @param string $char A character
-     */
-    public function setBarCharacter($char)
-    {
-        $this->barChar = $char;
-    }
-
-    /**
-     * Sets the empty bar character.
-     *
-     * @param string $char A character
-     */
-    public function setEmptyBarCharacter($char)
-    {
-        $this->emptyBarChar = $char;
-    }
-
-    /**
-     * Sets the progress bar character.
-     *
-     * @param string $char A character
-     */
-    public function setProgressCharacter($char)
-    {
-        $this->progressChar = $char;
-    }
-
-    /**
-     * Sets the progress bar format.
-     *
-     * @param string $format The format
-     */
-    public function setFormat($format)
-    {
-        $this->format = $format;
-    }
-
-    /**
-     * Sets the redraw frequency.
-     *
-     * @param int $freq The frequency in steps
-     */
-    public function setRedrawFrequency($freq)
-    {
-        $this->redrawFreq = (int) $freq;
-    }
-
-    /**
-     * Starts the progress output.
-     *
-     * @param OutputInterface $output An Output instance
-     * @param int|null        $max    Maximum steps
-     */
-    public function start(OutputInterface $output, $max = null)
-    {
-        $this->startTime = time();
-        $this->current = 0;
-        $this->max = (int) $max;
-
-        // Disabling output when it does not support ANSI codes as it would result in a broken display anyway.
-        $this->output = $output->isDecorated() ? $output : new NullOutput();
-        $this->lastMessagesLength = 0;
-        $this->barCharOriginal = '';
-
-        if (null === $this->format) {
-            switch ($output->getVerbosity()) {
-                case OutputInterface::VERBOSITY_QUIET:
-                    $this->format = self::FORMAT_QUIET_NOMAX;
-                    if ($this->max > 0) {
-                        $this->format = self::FORMAT_QUIET;
-                    }
-                    break;
-                case OutputInterface::VERBOSITY_VERBOSE:
-                case OutputInterface::VERBOSITY_VERY_VERBOSE:
-                case OutputInterface::VERBOSITY_DEBUG:
-                    $this->format = self::FORMAT_VERBOSE_NOMAX;
-                    if ($this->max > 0) {
-                        $this->format = self::FORMAT_VERBOSE;
-                    }
-                    break;
-                default:
-                    $this->format = self::FORMAT_NORMAL_NOMAX;
-                    if ($this->max > 0) {
-                        $this->format = self::FORMAT_NORMAL;
-                    }
-                    break;
-            }
-        }
-
-        $this->initialize();
-    }
-
-    /**
-     * Advances the progress output X steps.
-     *
-     * @param int  $step   Number of steps to advance
-     * @param bool $redraw Whether to redraw or not
-     *
-     * @throws \LogicException
-     */
-    public function advance($step = 1, $redraw = false)
-    {
-        $this->setCurrent($this->current + $step, $redraw);
-    }
-
-    /**
-     * Sets the current progress.
-     *
-     * @param int  $current The current progress
-     * @param bool $redraw  Whether to redraw or not
-     *
-     * @throws \LogicException
-     */
-    public function setCurrent($current, $redraw = false)
-    {
-        if (null === $this->startTime) {
-            throw new \LogicException('You must start the progress bar before calling setCurrent().');
-        }
-
-        $current = (int) $current;
-
-        if ($current < $this->current) {
-            throw new \LogicException('You can\'t regress the progress bar');
-        }
-
-        if (0 === $this->current) {
-            $redraw = true;
-        }
-
-        $prevPeriod = (int) ($this->current / $this->redrawFreq);
-
-        $this->current = $current;
-
-        $currPeriod = (int) ($this->current / $this->redrawFreq);
-        if ($redraw || $prevPeriod !== $currPeriod || $this->max === $this->current) {
-            $this->display();
-        }
-    }
-
-    /**
-     * Outputs the current progress string.
-     *
-     * @param bool $finish Forces the end result
-     *
-     * @throws \LogicException
-     */
-    public function display($finish = false)
-    {
-        if (null === $this->startTime) {
-            throw new \LogicException('You must start the progress bar before calling display().');
-        }
-
-        $message = $this->format;
-        foreach ($this->generate($finish) as $name => $value) {
-            $message = str_replace("%{$name}%", $value, $message);
-        }
-        $this->overwrite($this->output, $message);
-    }
-
-    /**
-     * Removes the progress bar from the current line.
-     *
-     * This is useful if you wish to write some output
-     * while a progress bar is running.
-     * Call display() to show the progress bar again.
-     */
-    public function clear()
-    {
-        $this->overwrite($this->output, '');
-    }
-
-    /**
-     * Finishes the progress output.
-     */
-    public function finish()
-    {
-        if (null === $this->startTime) {
-            throw new \LogicException('You must start the progress bar before calling finish().');
-        }
-
-        if (null !== $this->startTime) {
-            if (!$this->max) {
-                $this->barChar = $this->barCharOriginal;
-                $this->display(true);
-            }
-            $this->startTime = null;
-            $this->output->writeln('');
-            $this->output = null;
-        }
-    }
-
-    /**
-     * Initializes the progress helper.
-     */
-    private function initialize()
-    {
-        $this->formatVars = array();
-        foreach ($this->defaultFormatVars as $var) {
-            if (false !== strpos($this->format, "%{$var}%")) {
-                $this->formatVars[$var] = true;
-            }
-        }
-
-        if ($this->max > 0) {
-            $this->widths['max'] = $this->strlen($this->max);
-            $this->widths['current'] = $this->widths['max'];
-        } else {
-            $this->barCharOriginal = $this->barChar;
-            $this->barChar = $this->emptyBarChar;
-        }
-    }
-
-    /**
-     * Generates the array map of format variables to values.
-     *
-     * @param bool $finish Forces the end result
-     *
-     * @return array Array of format vars and values
-     */
-    private function generate($finish = false)
-    {
-        $vars = array();
-        $percent = 0;
-        if ($this->max > 0) {
-            $percent = (float) $this->current / $this->max;
-        }
-
-        if (isset($this->formatVars['bar'])) {
-            $completeBars = 0;
-
-            if ($this->max > 0) {
-                $completeBars = floor($percent * $this->barWidth);
-            } else {
-                if (!$finish) {
-                    $completeBars = floor($this->current % $this->barWidth);
-                } else {
-                    $completeBars = $this->barWidth;
-                }
-            }
-
-            $emptyBars = $this->barWidth - $completeBars - $this->strlen($this->progressChar);
-            $bar = str_repeat($this->barChar, $completeBars);
-            if ($completeBars < $this->barWidth) {
-                $bar .= $this->progressChar;
-                $bar .= str_repeat($this->emptyBarChar, $emptyBars);
-            }
-
-            $vars['bar'] = $bar;
-        }
-
-        if (isset($this->formatVars['elapsed'])) {
-            $elapsed = time() - $this->startTime;
-            $vars['elapsed'] = str_pad($this->humaneTime($elapsed), $this->widths['elapsed'], ' ', STR_PAD_LEFT);
-        }
-
-        if (isset($this->formatVars['current'])) {
-            $vars['current'] = str_pad($this->current, $this->widths['current'], ' ', STR_PAD_LEFT);
-        }
-
-        if (isset($this->formatVars['max'])) {
-            $vars['max'] = $this->max;
-        }
-
-        if (isset($this->formatVars['percent'])) {
-            $vars['percent'] = str_pad(floor($percent * 100), $this->widths['percent'], ' ', STR_PAD_LEFT);
-        }
-
-        return $vars;
-    }
-
-    /**
-     * Converts seconds into human-readable format.
-     *
-     * @param int $secs Number of seconds
-     *
-     * @return string Time in readable format
-     */
-    private function humaneTime($secs)
-    {
-        $text = '';
-        foreach ($this->timeFormats as $format) {
-            if ($secs < $format[0]) {
-                if (count($format) == 2) {
-                    $text = $format[1];
-                    break;
-                } else {
-                    $text = ceil($secs / $format[2]).' '.$format[1];
-                    break;
-                }
-            }
-        }
-
-        return $text;
-    }
-
-    /**
-     * Overwrites a previous message to the output.
-     *
-     * @param OutputInterface $output  An Output instance
-     * @param string          $message The message
-     */
-    private function overwrite(OutputInterface $output, $message)
-    {
-        $length = $this->strlen($message);
-
-        // append whitespace to match the last line's length
-        if (null !== $this->lastMessagesLength && $this->lastMessagesLength > $length) {
-            $message = str_pad($message, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT);
-        }
-
-        // carriage return
-        $output->write("\x0D");
-        $output->write($message);
-
-        $this->lastMessagesLength = $this->strlen($message);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'progress';
-    }
-}
diff --git a/vendor/symfony/console/Helper/QuestionHelper.php b/vendor/symfony/console/Helper/QuestionHelper.php
deleted file mode 100644
index a533f87..0000000
--- a/vendor/symfony/console/Helper/QuestionHelper.php
+++ /dev/null
@@ -1,446 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-
-/**
- * The QuestionHelper class provides helpers to interact with the user.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class QuestionHelper extends Helper
-{
-    private $inputStream;
-    private static $shell;
-    private static $stty;
-
-    /**
-     * Asks a question to the user.
-     *
-     * @param InputInterface  $input    An InputInterface instance
-     * @param OutputInterface $output   An OutputInterface instance
-     * @param Question        $question The question to ask
-     *
-     * @return string The user answer
-     *
-     * @throws \RuntimeException If there is no data to read in the input stream
-     */
-    public function ask(InputInterface $input, OutputInterface $output, Question $question)
-    {
-        if ($output instanceof ConsoleOutputInterface) {
-            $output = $output->getErrorOutput();
-        }
-
-        if (!$input->isInteractive()) {
-            return $question->getDefault();
-        }
-
-        if (!$question->getValidator()) {
-            return $this->doAsk($output, $question);
-        }
-
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $that) {
-            return $that->doAsk($output, $question);
-        };
-
-        return $this->validateAttempts($interviewer, $output, $question);
-    }
-
-    /**
-     * Sets the input stream to read from when interacting with the user.
-     *
-     * This is mainly useful for testing purpose.
-     *
-     * @param resource $stream The input stream
-     *
-     * @throws \InvalidArgumentException In case the stream is not a resource
-     */
-    public function setInputStream($stream)
-    {
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Input stream must be a valid resource.');
-        }
-
-        $this->inputStream = $stream;
-    }
-
-    /**
-     * Returns the helper's input stream.
-     *
-     * @return resource
-     */
-    public function getInputStream()
-    {
-        return $this->inputStream;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'question';
-    }
-
-    /**
-     * Asks the question to the user.
-     *
-     * This method is public for PHP 5.3 compatibility, it should be private.
-     *
-     * @param OutputInterface $output
-     * @param Question        $question
-     *
-     * @return bool|mixed|null|string
-     *
-     * @throws \Exception
-     * @throws \RuntimeException
-     */
-    public function doAsk(OutputInterface $output, Question $question)
-    {
-        $this->writePrompt($output, $question);
-
-        $inputStream = $this->inputStream ?: STDIN;
-        $autocomplete = $question->getAutocompleterValues();
-
-        if (null === $autocomplete || !$this->hasSttyAvailable()) {
-            $ret = false;
-            if ($question->isHidden()) {
-                try {
-                    $ret = trim($this->getHiddenResponse($output, $inputStream));
-                } catch (\RuntimeException $e) {
-                    if (!$question->isHiddenFallback()) {
-                        throw $e;
-                    }
-                }
-            }
-
-            if (false === $ret) {
-                $ret = fgets($inputStream, 4096);
-                if (false === $ret) {
-                    throw new \RuntimeException('Aborted');
-                }
-                $ret = trim($ret);
-            }
-        } else {
-            $ret = trim($this->autocomplete($output, $question, $inputStream));
-        }
-
-        $ret = strlen($ret) > 0 ? $ret : $question->getDefault();
-
-        if ($normalizer = $question->getNormalizer()) {
-            return $normalizer($ret);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Outputs the question prompt.
-     *
-     * @param OutputInterface $output
-     * @param Question        $question
-     */
-    protected function writePrompt(OutputInterface $output, Question $question)
-    {
-        $message = $question->getQuestion();
-
-        if ($question instanceof ChoiceQuestion) {
-            $width = max(array_map('strlen', array_keys($question->getChoices())));
-
-            $messages = (array) $question->getQuestion();
-            foreach ($question->getChoices() as $key => $value) {
-                $messages[] = sprintf("  [<info>%-${width}s</info>] %s", $key, $value);
-            }
-
-            $output->writeln($messages);
-
-            $message = $question->getPrompt();
-        }
-
-        $output->write($message);
-    }
-
-    /**
-     * Outputs an error message.
-     *
-     * @param OutputInterface $output
-     * @param \Exception      $error
-     */
-    protected function writeError(OutputInterface $output, \Exception $error)
-    {
-        if (null !== $this->getHelperSet() && $this->getHelperSet()->has('formatter')) {
-            $message = $this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error');
-        } else {
-            $message = '<error>'.$error->getMessage().'</error>';
-        }
-
-        $output->writeln($message);
-    }
-
-    /**
-     * Autocompletes a question.
-     *
-     * @param OutputInterface $output
-     * @param Question        $question
-     *
-     * @return string
-     */
-    private function autocomplete(OutputInterface $output, Question $question, $inputStream)
-    {
-        $autocomplete = $question->getAutocompleterValues();
-        $ret = '';
-
-        $i = 0;
-        $ofs = -1;
-        $matches = $autocomplete;
-        $numMatches = count($matches);
-
-        $sttyMode = shell_exec('stty -g');
-
-        // Disable icanon (so we can fread each keypress) and echo (we'll do echoing here instead)
-        shell_exec('stty -icanon -echo');
-
-        // Add highlighted text style
-        $output->getFormatter()->setStyle('hl', new OutputFormatterStyle('black', 'white'));
-
-        // Read a keypress
-        while (!feof($inputStream)) {
-            $c = fread($inputStream, 1);
-
-            // Backspace Character
-            if ("\177" === $c) {
-                if (0 === $numMatches && 0 !== $i) {
-                    --$i;
-                    // Move cursor backwards
-                    $output->write("\033[1D");
-                }
-
-                if ($i === 0) {
-                    $ofs = -1;
-                    $matches = $autocomplete;
-                    $numMatches = count($matches);
-                } else {
-                    $numMatches = 0;
-                }
-
-                // Pop the last character off the end of our string
-                $ret = substr($ret, 0, $i);
-            } elseif ("\033" === $c) {
-                // Did we read an escape sequence?
-                $c .= fread($inputStream, 2);
-
-                // A = Up Arrow. B = Down Arrow
-                if (isset($c[2]) && ('A' === $c[2] || 'B' === $c[2])) {
-                    if ('A' === $c[2] && -1 === $ofs) {
-                        $ofs = 0;
-                    }
-
-                    if (0 === $numMatches) {
-                        continue;
-                    }
-
-                    $ofs += ('A' === $c[2]) ? -1 : 1;
-                    $ofs = ($numMatches + $ofs) % $numMatches;
-                }
-            } elseif (ord($c) < 32) {
-                if ("\t" === $c || "\n" === $c) {
-                    if ($numMatches > 0 && -1 !== $ofs) {
-                        $ret = $matches[$ofs];
-                        // Echo out remaining chars for current match
-                        $output->write(substr($ret, $i));
-                        $i = strlen($ret);
-                    }
-
-                    if ("\n" === $c) {
-                        $output->write($c);
-                        break;
-                    }
-
-                    $numMatches = 0;
-                }
-
-                continue;
-            } else {
-                $output->write($c);
-                $ret .= $c;
-                ++$i;
-
-                $numMatches = 0;
-                $ofs = 0;
-
-                foreach ($autocomplete as $value) {
-                    // If typed characters match the beginning chunk of value (e.g. [AcmeDe]moBundle)
-                    if (0 === strpos($value, $ret) && $i !== strlen($value)) {
-                        $matches[$numMatches++] = $value;
-                    }
-                }
-            }
-
-            // Erase characters from cursor to end of line
-            $output->write("\033[K");
-
-            if ($numMatches > 0 && -1 !== $ofs) {
-                // Save cursor position
-                $output->write("\0337");
-                // Write highlighted text
-                $output->write('<hl>'.substr($matches[$ofs], $i).'</hl>');
-                // Restore cursor position
-                $output->write("\0338");
-            }
-        }
-
-        // Reset stty so it behaves normally again
-        shell_exec(sprintf('stty %s', $sttyMode));
-
-        return $ret;
-    }
-
-    /**
-     * Gets a hidden response from user.
-     *
-     * @param OutputInterface $output An Output instance
-     *
-     * @return string The answer
-     *
-     * @throws \RuntimeException In case the fallback is deactivated and the response cannot be hidden
-     */
-    private function getHiddenResponse(OutputInterface $output, $inputStream)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $exe = __DIR__.'/../Resources/bin/hiddeninput.exe';
-
-            // handle code running from a phar
-            if ('phar:' === substr(__FILE__, 0, 5)) {
-                $tmpExe = sys_get_temp_dir().'/hiddeninput.exe';
-                copy($exe, $tmpExe);
-                $exe = $tmpExe;
-            }
-
-            $value = rtrim(shell_exec($exe));
-            $output->writeln('');
-
-            if (isset($tmpExe)) {
-                unlink($tmpExe);
-            }
-
-            return $value;
-        }
-
-        if ($this->hasSttyAvailable()) {
-            $sttyMode = shell_exec('stty -g');
-
-            shell_exec('stty -echo');
-            $value = fgets($inputStream, 4096);
-            shell_exec(sprintf('stty %s', $sttyMode));
-
-            if (false === $value) {
-                throw new \RuntimeException('Aborted');
-            }
-
-            $value = trim($value);
-            $output->writeln('');
-
-            return $value;
-        }
-
-        if (false !== $shell = $this->getShell()) {
-            $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword';
-            $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
-            $value = rtrim(shell_exec($command));
-            $output->writeln('');
-
-            return $value;
-        }
-
-        throw new \RuntimeException('Unable to hide the response.');
-    }
-
-    /**
-     * Validates an attempt.
-     *
-     * @param callable        $interviewer A callable that will ask for a question and return the result
-     * @param OutputInterface $output      An Output instance
-     * @param Question        $question    A Question instance
-     *
-     * @return string The validated response
-     *
-     * @throws \Exception In case the max number of attempts has been reached and no valid response has been given
-     */
-    private function validateAttempts($interviewer, OutputInterface $output, Question $question)
-    {
-        $error = null;
-        $attempts = $question->getMaxAttempts();
-        while (null === $attempts || $attempts--) {
-            if (null !== $error) {
-                $this->writeError($output, $error);
-            }
-
-            try {
-                return call_user_func($question->getValidator(), $interviewer());
-            } catch (\Exception $error) {
-            }
-        }
-
-        throw $error;
-    }
-
-    /**
-     * Returns a valid unix shell.
-     *
-     * @return string|bool The valid shell name, false in case no valid shell is found
-     */
-    private function getShell()
-    {
-        if (null !== self::$shell) {
-            return self::$shell;
-        }
-
-        self::$shell = false;
-
-        if (file_exists('/usr/bin/env')) {
-            // handle other OSs with bash/zsh/ksh/csh if available to hide the answer
-            $test = "/usr/bin/env %s -c 'echo OK' 2> /dev/null";
-            foreach (array('bash', 'zsh', 'ksh', 'csh') as $sh) {
-                if ('OK' === rtrim(shell_exec(sprintf($test, $sh)))) {
-                    self::$shell = $sh;
-                    break;
-                }
-            }
-        }
-
-        return self::$shell;
-    }
-
-    /**
-     * Returns whether Stty is available or not.
-     *
-     * @return bool
-     */
-    private function hasSttyAvailable()
-    {
-        if (null !== self::$stty) {
-            return self::$stty;
-        }
-
-        exec('stty 2>&1', $output, $exitcode);
-
-        return self::$stty = $exitcode === 0;
-    }
-}
diff --git a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php b/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
deleted file mode 100644
index 77130f9..0000000
--- a/vendor/symfony/console/Helper/SymfonyQuestionHelper.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-/**
- * Symfony Style Guide compliant question helper.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-class SymfonyQuestionHelper extends QuestionHelper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function ask(InputInterface $input, OutputInterface $output, Question $question)
-    {
-        $validator = $question->getValidator();
-        $question->setValidator(function ($value) use ($validator) {
-            if (null !== $validator && is_callable($validator)) {
-                $value = $validator($value);
-            }
-
-            // make required
-            if (!is_array($value) && !is_bool($value) && 0 === strlen($value)) {
-                throw new \Exception('A value is required.');
-            }
-
-            return $value;
-        });
-
-        return parent::ask($input, $output, $question);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function writePrompt(OutputInterface $output, Question $question)
-    {
-        $text = $question->getQuestion();
-        $default = $question->getDefault();
-
-        switch (true) {
-            case null === $default:
-                $text = sprintf(' <info>%s</info>:', $text);
-
-                break;
-
-            case $question instanceof ConfirmationQuestion:
-                $text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
-
-                break;
-
-            case $question instanceof ChoiceQuestion:
-                $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, $choices[$default]);
-
-                break;
-
-            default:
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, $default);
-        }
-
-        $output->writeln($text);
-
-        if ($question instanceof ChoiceQuestion) {
-            $width = max(array_map('strlen', array_keys($question->getChoices())));
-
-            foreach ($question->getChoices() as $key => $value) {
-                $output->writeln(sprintf("  [<comment>%-${width}s</comment>] %s", $key, $value));
-            }
-        }
-
-        $output->write(' > ');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function writeError(OutputInterface $output, \Exception $error)
-    {
-        if ($output instanceof SymfonyStyle) {
-            $output->newLine();
-            $output->error($error->getMessage());
-
-            return;
-        }
-
-        parent::writeError($output, $error);
-    }
-}
diff --git a/vendor/symfony/console/Helper/Table.php b/vendor/symfony/console/Helper/Table.php
deleted file mode 100644
index 6f5fbd0..0000000
--- a/vendor/symfony/console/Helper/Table.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Provides helpers to display a table.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Саша Стаменковић <umpirsky@gmail.com>
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-class Table
-{
-    /**
-     * Table headers.
-     *
-     * @var array
-     */
-    private $headers = array();
-
-    /**
-     * Table rows.
-     *
-     * @var array
-     */
-    private $rows = array();
-
-    /**
-     * Column widths cache.
-     *
-     * @var array
-     */
-    private $columnWidths = array();
-
-    /**
-     * Number of columns cache.
-     *
-     * @var array
-     */
-    private $numberOfColumns;
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-
-    /**
-     * @var TableStyle
-     */
-    private $style;
-
-    private static $styles;
-
-    public function __construct(OutputInterface $output)
-    {
-        $this->output = $output;
-
-        if (!self::$styles) {
-            self::$styles = self::initStyles();
-        }
-
-        $this->setStyle('default');
-    }
-
-    /**
-     * Sets a style definition.
-     *
-     * @param string     $name  The style name
-     * @param TableStyle $style A TableStyle instance
-     */
-    public static function setStyleDefinition($name, TableStyle $style)
-    {
-        if (!self::$styles) {
-            self::$styles = self::initStyles();
-        }
-
-        self::$styles[$name] = $style;
-    }
-
-    /**
-     * Gets a style definition by name.
-     *
-     * @param string $name The style name
-     *
-     * @return TableStyle A TableStyle instance
-     */
-    public static function getStyleDefinition($name)
-    {
-        if (!self::$styles) {
-            self::$styles = self::initStyles();
-        }
-
-        if (!self::$styles[$name]) {
-            throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
-        }
-
-        return self::$styles[$name];
-    }
-
-    /**
-     * Sets table style.
-     *
-     * @param TableStyle|string $name The style name or a TableStyle instance
-     *
-     * @return Table
-     */
-    public function setStyle($name)
-    {
-        if ($name instanceof TableStyle) {
-            $this->style = $name;
-        } elseif (isset(self::$styles[$name])) {
-            $this->style = self::$styles[$name];
-        } else {
-            throw new \InvalidArgumentException(sprintf('Style "%s" is not defined.', $name));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the current table style.
-     *
-     * @return TableStyle
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $headers = array_values($headers);
-        if (!empty($headers) && !is_array($headers[0])) {
-            $headers = array($headers);
-        }
-
-        $this->headers = $headers;
-
-        return $this;
-    }
-
-    public function setRows(array $rows)
-    {
-        $this->rows = array();
-
-        return $this->addRows($rows);
-    }
-
-    public function addRows(array $rows)
-    {
-        foreach ($rows as $row) {
-            $this->addRow($row);
-        }
-
-        return $this;
-    }
-
-    public function addRow($row)
-    {
-        if ($row instanceof TableSeparator) {
-            $this->rows[] = $row;
-
-            return $this;
-        }
-
-        if (!is_array($row)) {
-            throw new \InvalidArgumentException('A row must be an array or a TableSeparator instance.');
-        }
-
-        $this->rows[] = array_values($row);
-
-        return $this;
-    }
-
-    public function setRow($column, array $row)
-    {
-        $this->rows[$column] = $row;
-
-        return $this;
-    }
-
-    /**
-     * Renders table to output.
-     *
-     * Example:
-     * +---------------+-----------------------+------------------+
-     * | ISBN          | Title                 | Author           |
-     * +---------------+-----------------------+------------------+
-     * | 99921-58-10-7 | Divine Comedy         | Dante Alighieri  |
-     * | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
-     * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
-     * +---------------+-----------------------+------------------+
-     */
-    public function render()
-    {
-        $this->calculateNumberOfColumns();
-        $this->rows = $this->buildTableRows($this->rows);
-        $this->headers = $this->buildTableRows($this->headers);
-
-        $this->renderRowSeparator();
-        if (!empty($this->headers)) {
-            foreach ($this->headers as $header) {
-                $this->renderRow($header, $this->style->getCellHeaderFormat());
-                $this->renderRowSeparator();
-            }
-        }
-        foreach ($this->rows as $row) {
-            if ($row instanceof TableSeparator) {
-                $this->renderRowSeparator();
-            } else {
-                $this->renderRow($row, $this->style->getCellRowFormat());
-            }
-        }
-        if (!empty($this->rows)) {
-            $this->renderRowSeparator();
-        }
-
-        $this->cleanup();
-    }
-
-    /**
-     * Renders horizontal header separator.
-     *
-     * Example: +-----+-----------+-------+
-     */
-    private function renderRowSeparator()
-    {
-        if (0 === $count = $this->numberOfColumns) {
-            return;
-        }
-
-        if (!$this->style->getHorizontalBorderChar() && !$this->style->getCrossingChar()) {
-            return;
-        }
-
-        $markup = $this->style->getCrossingChar();
-        for ($column = 0; $column < $count; ++$column) {
-            $markup .= str_repeat($this->style->getHorizontalBorderChar(), $this->getColumnWidth($column)).$this->style->getCrossingChar();
-        }
-
-        $this->output->writeln(sprintf($this->style->getBorderFormat(), $markup));
-    }
-
-    /**
-     * Renders vertical column separator.
-     */
-    private function renderColumnSeparator()
-    {
-        $this->output->write(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
-    }
-
-    /**
-     * Renders table row.
-     *
-     * Example: | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
-     *
-     * @param array  $row
-     * @param string $cellFormat
-     */
-    private function renderRow(array $row, $cellFormat)
-    {
-        if (empty($row)) {
-            return;
-        }
-
-        $this->renderColumnSeparator();
-        foreach ($this->getRowColumns($row) as $column) {
-            $this->renderCell($row, $column, $cellFormat);
-            $this->renderColumnSeparator();
-        }
-        $this->output->writeln('');
-    }
-
-    /**
-     * Renders table cell with padding.
-     *
-     * @param array  $row
-     * @param int    $column
-     * @param string $cellFormat
-     */
-    private function renderCell(array $row, $column, $cellFormat)
-    {
-        $cell = isset($row[$column]) ? $row[$column] : '';
-        $width = $this->getColumnWidth($column);
-        if ($cell instanceof TableCell && $cell->getColspan() > 1) {
-            // add the width of the following columns(numbers of colspan).
-            foreach (range($column + 1, $column + $cell->getColspan() - 1) as $nextColumn) {
-                $width += $this->getColumnSeparatorWidth() + $this->getColumnWidth($nextColumn);
-            }
-        }
-
-        // str_pad won't work properly with multi-byte strings, we need to fix the padding
-        if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) {
-            $width += strlen($cell) - mb_strwidth($cell, $encoding);
-        }
-
-        if ($cell instanceof TableSeparator) {
-            $this->output->write(sprintf($this->style->getBorderFormat(), str_repeat($this->style->getHorizontalBorderChar(), $width)));
-        } else {
-            $width += Helper::strlen($cell) - Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
-            $content = sprintf($this->style->getCellRowContentFormat(), $cell);
-            $this->output->write(sprintf($cellFormat, str_pad($content, $width, $this->style->getPaddingChar(), $this->style->getPadType())));
-        }
-    }
-
-    /**
-     * Calculate number of columns for this table.
-     */
-    private function calculateNumberOfColumns()
-    {
-        if (null !== $this->numberOfColumns) {
-            return;
-        }
-
-        $columns = array(0);
-        foreach (array_merge($this->headers, $this->rows) as $row) {
-            if ($row instanceof TableSeparator) {
-                continue;
-            }
-
-            $columns[] = $this->getNumberOfColumns($row);
-        }
-
-        return $this->numberOfColumns = max($columns);
-    }
-
-    private function buildTableRows($rows)
-    {
-        $unmergedRows = array();
-        for ($rowKey = 0; $rowKey < count($rows); ++$rowKey) {
-            $rows = $this->fillNextRows($rows, $rowKey);
-
-            // Remove any new line breaks and replace it with a new line
-            foreach ($rows[$rowKey] as $column => $cell) {
-                $rows[$rowKey] = $this->fillCells($rows[$rowKey], $column);
-                if (!strstr($cell, "\n")) {
-                    continue;
-                }
-                $lines = explode("\n", $cell);
-                foreach ($lines as $lineKey => $line) {
-                    if ($cell instanceof TableCell) {
-                        $line = new TableCell($line, array('colspan' => $cell->getColspan()));
-                    }
-                    if (0 === $lineKey) {
-                        $rows[$rowKey][$column] = $line;
-                    } else {
-                        $unmergedRows[$rowKey][$lineKey][$column] = $line;
-                    }
-                }
-            }
-        }
-
-        $tableRows = array();
-        foreach ($rows as $rowKey => $row) {
-            $tableRows[] = $row;
-            if (isset($unmergedRows[$rowKey])) {
-                $tableRows = array_merge($tableRows, $unmergedRows[$rowKey]);
-            }
-        }
-
-        return $tableRows;
-    }
-
-    /**
-     * fill rows that contains rowspan > 1.
-     *
-     * @param array $rows
-     * @param int   $line
-     *
-     * @return array
-     */
-    private function fillNextRows($rows, $line)
-    {
-        $unmergedRows = array();
-        foreach ($rows[$line] as $column => $cell) {
-            if ($cell instanceof TableCell && $cell->getRowspan() > 1) {
-                $nbLines = $cell->getRowspan() - 1;
-                $lines = array($cell);
-                if (strstr($cell, "\n")) {
-                    $lines = explode("\n", $cell);
-                    $nbLines = count($lines) > $nbLines ? substr_count($cell, "\n") : $nbLines;
-
-                    $rows[$line][$column] = new TableCell($lines[0], array('colspan' => $cell->getColspan()));
-                    unset($lines[0]);
-                }
-
-                // create a two dimensional array (rowspan x colspan)
-                $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, ''), $unmergedRows);
-                foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
-                    $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
-                    $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, array('colspan' => $cell->getColspan()));
-                }
-            }
-        }
-
-        foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
-            // we need to know if $unmergedRow will be merged or inserted into $rows
-            if (isset($rows[$unmergedRowKey]) && is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRows[$unmergedRowKey]) <= $this->numberOfColumns)) {
-                foreach ($unmergedRow as $cellKey => $cell) {
-                    // insert cell into row at cellKey position
-                    array_splice($rows[$unmergedRowKey], $cellKey, 0, array($cell));
-                }
-            } else {
-                $row = $this->copyRow($rows, $unmergedRowKey - 1);
-                foreach ($unmergedRow as $column => $cell) {
-                    if (!empty($cell)) {
-                        $row[$column] = $unmergedRow[$column];
-                    }
-                }
-                array_splice($rows, $unmergedRowKey, 0, array($row));
-            }
-        }
-
-        return $rows;
-    }
-
-    /**
-     * fill cells for a row that contains colspan > 1.
-     *
-     * @param array $row
-     * @param int   $column
-     *
-     * @return array
-     */
-    private function fillCells($row, $column)
-    {
-        $cell = $row[$column];
-        if ($cell instanceof TableCell && $cell->getColspan() > 1) {
-            foreach (range($column + 1, $column + $cell->getColspan() - 1) as $position) {
-                // insert empty value into rows at column position
-                array_splice($row, $position, 0, '');
-            }
-        }
-
-        return $row;
-    }
-
-    /**
-     * @param array $rows
-     * @param int   $line
-     *
-     * @return array
-     */
-    private function copyRow($rows, $line)
-    {
-        $row = $rows[$line];
-        foreach ($row as $cellKey => $cellValue) {
-            $row[$cellKey] = '';
-            if ($cellValue instanceof TableCell) {
-                $row[$cellKey] = new TableCell('', array('colspan' => $cellValue->getColspan()));
-            }
-        }
-
-        return $row;
-    }
-
-    /**
-     * Gets number of columns by row.
-     *
-     * @param array $row
-     *
-     * @return int
-     */
-    private function getNumberOfColumns(array $row)
-    {
-        $columns = count($row);
-        foreach ($row as $column) {
-            $columns += $column instanceof TableCell ? ($column->getColspan() - 1) : 0;
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Gets list of columns for the given row.
-     *
-     * @param array $row
-     *
-     * @return array()
-     */
-    private function getRowColumns($row)
-    {
-        $columns = range(0, $this->numberOfColumns - 1);
-        foreach ($row as $cellKey => $cell) {
-            if ($cell instanceof TableCell && $cell->getColspan() > 1) {
-                // exclude grouped columns.
-                $columns = array_diff($columns, range($cellKey + 1, $cellKey + $cell->getColspan() - 1));
-            }
-        }
-
-        return $columns;
-    }
-
-    /**
-     * Gets column width.
-     *
-     * @param int $column
-     *
-     * @return int
-     */
-    private function getColumnWidth($column)
-    {
-        if (isset($this->columnWidths[$column])) {
-            return $this->columnWidths[$column];
-        }
-
-        foreach (array_merge($this->headers, $this->rows) as $row) {
-            if ($row instanceof TableSeparator) {
-                continue;
-            }
-
-            $lengths[] = $this->getCellWidth($row, $column);
-        }
-
-        return $this->columnWidths[$column] = max($lengths) + strlen($this->style->getCellRowContentFormat()) - 2;
-    }
-
-    /**
-     * Gets column width.
-     *
-     * @param int $column
-     *
-     * @return int
-     */
-    private function getColumnSeparatorWidth()
-    {
-        return strlen(sprintf($this->style->getBorderFormat(), $this->style->getVerticalBorderChar()));
-    }
-
-    /**
-     * Gets cell width.
-     *
-     * @param array $row
-     * @param int   $column
-     *
-     * @return int
-     */
-    private function getCellWidth(array $row, $column)
-    {
-        if (isset($row[$column])) {
-            $cell = $row[$column];
-            $cellWidth = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
-            if ($cell instanceof TableCell && $cell->getColspan() > 1) {
-                // we assume that cell value will be across more than one column.
-                $cellWidth = $cellWidth / $cell->getColspan();
-            }
-
-            return $cellWidth;
-        }
-
-        return 0;
-    }
-
-    /**
-     * Called after rendering to cleanup cache data.
-     */
-    private function cleanup()
-    {
-        $this->columnWidths = array();
-        $this->numberOfColumns = null;
-    }
-
-    private static function initStyles()
-    {
-        $borderless = new TableStyle();
-        $borderless
-            ->setHorizontalBorderChar('=')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar(' ')
-        ;
-
-        $compact = new TableStyle();
-        $compact
-            ->setHorizontalBorderChar('')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar('')
-            ->setCellRowContentFormat('%s')
-        ;
-
-        $styleGuide = new TableStyle();
-        $styleGuide
-            ->setHorizontalBorderChar('-')
-            ->setVerticalBorderChar(' ')
-            ->setCrossingChar(' ')
-            ->setCellHeaderFormat('%s')
-        ;
-
-        return array(
-            'default' => new TableStyle(),
-            'borderless' => $borderless,
-            'compact' => $compact,
-            'symfony-style-guide' => $styleGuide,
-        );
-    }
-}
diff --git a/vendor/symfony/console/Helper/TableCell.php b/vendor/symfony/console/Helper/TableCell.php
deleted file mode 100644
index aa0d318..0000000
--- a/vendor/symfony/console/Helper/TableCell.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Console\Helper;
-
-/**
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-class TableCell
-{
-    /**
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @var array
-     */
-    private $options = array(
-        'rowspan' => 1,
-        'colspan' => 1,
-    );
-
-    /**
-     * @param string $value
-     * @param array  $options
-     */
-    public function __construct($value = '', array $options = array())
-    {
-        $this->value = $value;
-
-        // check option names
-        if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new \InvalidArgumentException(sprintf('The TableCell does not support the following options: \'%s\'.', implode('\', \'', $diff)));
-        }
-
-        $this->options = array_merge($this->options, $options);
-    }
-
-    /**
-     * Returns the cell value.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Gets number of colspan.
-     *
-     * @return int
-     */
-    public function getColspan()
-    {
-        return (int) $this->options['colspan'];
-    }
-
-    /**
-     * Gets number of rowspan.
-     *
-     * @return int
-     */
-    public function getRowspan()
-    {
-        return (int) $this->options['rowspan'];
-    }
-}
diff --git a/vendor/symfony/console/Helper/TableHelper.php b/vendor/symfony/console/Helper/TableHelper.php
deleted file mode 100644
index 2953522..0000000
--- a/vendor/symfony/console/Helper/TableHelper.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?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\Component\Console\Helper;
-
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\NullOutput;
-
-/**
- * Provides helpers to display table output.
- *
- * @author Саша Стаменковић <umpirsky@gmail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0
- *             Use {@link Table} instead.
- */
-class TableHelper extends Helper
-{
-    const LAYOUT_DEFAULT = 0;
-    const LAYOUT_BORDERLESS = 1;
-    const LAYOUT_COMPACT = 2;
-
-    /**
-     * @var Table
-     */
-    private $table;
-
-    public function __construct($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Console\Helper\Table class instead.', E_USER_DEPRECATED);
-        }
-
-        $this->table = new Table(new NullOutput());
-    }
-
-    /**
-     * Sets table layout type.
-     *
-     * @param int $layout self::LAYOUT_*
-     *
-     * @return TableHelper
-     *
-     * @throws \InvalidArgumentException when the table layout is not known
-     */
-    public function setLayout($layout)
-    {
-        switch ($layout) {
-            case self::LAYOUT_BORDERLESS:
-                $this->table->setStyle('borderless');
-                break;
-
-            case self::LAYOUT_COMPACT:
-                $this->table->setStyle('compact');
-                break;
-
-            case self::LAYOUT_DEFAULT:
-                $this->table->setStyle('default');
-                break;
-
-            default:
-                throw new \InvalidArgumentException(sprintf('Invalid table layout "%s".', $layout));
-        };
-
-        return $this;
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->table->setHeaders($headers);
-
-        return $this;
-    }
-
-    public function setRows(array $rows)
-    {
-        $this->table->setRows($rows);
-
-        return $this;
-    }
-
-    public function addRows(array $rows)
-    {
-        $this->table->addRows($rows);
-
-        return $this;
-    }
-
-    public function addRow(array $row)
-    {
-        $this->table->addRow($row);
-
-        return $this;
-    }
-
-    public function setRow($column, array $row)
-    {
-        $this->table->setRow($column, $row);
-
-        return $this;
-    }
-
-    /**
-     * Sets padding character, used for cell padding.
-     *
-     * @param string $paddingChar
-     *
-     * @return TableHelper
-     */
-    public function setPaddingChar($paddingChar)
-    {
-        $this->table->getStyle()->setPaddingChar($paddingChar);
-
-        return $this;
-    }
-
-    /**
-     * Sets horizontal border character.
-     *
-     * @param string $horizontalBorderChar
-     *
-     * @return TableHelper
-     */
-    public function setHorizontalBorderChar($horizontalBorderChar)
-    {
-        $this->table->getStyle()->setHorizontalBorderChar($horizontalBorderChar);
-
-        return $this;
-    }
-
-    /**
-     * Sets vertical border character.
-     *
-     * @param string $verticalBorderChar
-     *
-     * @return TableHelper
-     */
-    public function setVerticalBorderChar($verticalBorderChar)
-    {
-        $this->table->getStyle()->setVerticalBorderChar($verticalBorderChar);
-
-        return $this;
-    }
-
-    /**
-     * Sets crossing character.
-     *
-     * @param string $crossingChar
-     *
-     * @return TableHelper
-     */
-    public function setCrossingChar($crossingChar)
-    {
-        $this->table->getStyle()->setCrossingChar($crossingChar);
-
-        return $this;
-    }
-
-    /**
-     * Sets header cell format.
-     *
-     * @param string $cellHeaderFormat
-     *
-     * @return TableHelper
-     */
-    public function setCellHeaderFormat($cellHeaderFormat)
-    {
-        $this->table->getStyle()->setCellHeaderFormat($cellHeaderFormat);
-
-        return $this;
-    }
-
-    /**
-     * Sets row cell format.
-     *
-     * @param string $cellRowFormat
-     *
-     * @return TableHelper
-     */
-    public function setCellRowFormat($cellRowFormat)
-    {
-        $this->table->getStyle()->setCellHeaderFormat($cellRowFormat);
-
-        return $this;
-    }
-
-    /**
-     * Sets row cell content format.
-     *
-     * @param string $cellRowContentFormat
-     *
-     * @return TableHelper
-     */
-    public function setCellRowContentFormat($cellRowContentFormat)
-    {
-        $this->table->getStyle()->setCellRowContentFormat($cellRowContentFormat);
-
-        return $this;
-    }
-
-    /**
-     * Sets table border format.
-     *
-     * @param string $borderFormat
-     *
-     * @return TableHelper
-     */
-    public function setBorderFormat($borderFormat)
-    {
-        $this->table->getStyle()->setBorderFormat($borderFormat);
-
-        return $this;
-    }
-
-    /**
-     * Sets cell padding type.
-     *
-     * @param int $padType STR_PAD_*
-     *
-     * @return TableHelper
-     */
-    public function setPadType($padType)
-    {
-        $this->table->getStyle()->setPadType($padType);
-
-        return $this;
-    }
-
-    /**
-     * Renders table to output.
-     *
-     * Example:
-     * +---------------+-----------------------+------------------+
-     * | ISBN          | Title                 | Author           |
-     * +---------------+-----------------------+------------------+
-     * | 99921-58-10-7 | Divine Comedy         | Dante Alighieri  |
-     * | 9971-5-0210-0 | A Tale of Two Cities  | Charles Dickens  |
-     * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
-     * +---------------+-----------------------+------------------+
-     *
-     * @param OutputInterface $output
-     */
-    public function render(OutputInterface $output)
-    {
-        $p = new \ReflectionProperty($this->table, 'output');
-        $p->setAccessible(true);
-        $p->setValue($this->table, $output);
-
-        $this->table->render();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'table';
-    }
-}
diff --git a/vendor/symfony/console/Helper/TableSeparator.php b/vendor/symfony/console/Helper/TableSeparator.php
deleted file mode 100644
index 8cbbc66..0000000
--- a/vendor/symfony/console/Helper/TableSeparator.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Console\Helper;
-
-/**
- * Marks a row as being a separator.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TableSeparator extends TableCell
-{
-    /**
-     * @param string $value
-     * @param array  $options
-     */
-    public function __construct(array $options = array())
-    {
-        parent::__construct('', $options);
-    }
-}
diff --git a/vendor/symfony/console/Helper/TableStyle.php b/vendor/symfony/console/Helper/TableStyle.php
deleted file mode 100644
index f0f46c7..0000000
--- a/vendor/symfony/console/Helper/TableStyle.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?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\Component\Console\Helper;
-
-/**
- * Defines the styles for a Table.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Саша Стаменковић <umpirsky@gmail.com>
- */
-class TableStyle
-{
-    private $paddingChar = ' ';
-    private $horizontalBorderChar = '-';
-    private $verticalBorderChar = '|';
-    private $crossingChar = '+';
-    private $cellHeaderFormat = '<info>%s</info>';
-    private $cellRowFormat = '%s';
-    private $cellRowContentFormat = ' %s ';
-    private $borderFormat = '%s';
-    private $padType = STR_PAD_RIGHT;
-
-    /**
-     * Sets padding character, used for cell padding.
-     *
-     * @param string $paddingChar
-     *
-     * @return TableStyle
-     */
-    public function setPaddingChar($paddingChar)
-    {
-        if (!$paddingChar) {
-            throw new \LogicException('The padding char must not be empty');
-        }
-
-        $this->paddingChar = $paddingChar;
-
-        return $this;
-    }
-
-    /**
-     * Gets padding character, used for cell padding.
-     *
-     * @return string
-     */
-    public function getPaddingChar()
-    {
-        return $this->paddingChar;
-    }
-
-    /**
-     * Sets horizontal border character.
-     *
-     * @param string $horizontalBorderChar
-     *
-     * @return TableStyle
-     */
-    public function setHorizontalBorderChar($horizontalBorderChar)
-    {
-        $this->horizontalBorderChar = $horizontalBorderChar;
-
-        return $this;
-    }
-
-    /**
-     * Gets horizontal border character.
-     *
-     * @return string
-     */
-    public function getHorizontalBorderChar()
-    {
-        return $this->horizontalBorderChar;
-    }
-
-    /**
-     * Sets vertical border character.
-     *
-     * @param string $verticalBorderChar
-     *
-     * @return TableStyle
-     */
-    public function setVerticalBorderChar($verticalBorderChar)
-    {
-        $this->verticalBorderChar = $verticalBorderChar;
-
-        return $this;
-    }
-
-    /**
-     * Gets vertical border character.
-     *
-     * @return string
-     */
-    public function getVerticalBorderChar()
-    {
-        return $this->verticalBorderChar;
-    }
-
-    /**
-     * Sets crossing character.
-     *
-     * @param string $crossingChar
-     *
-     * @return TableStyle
-     */
-    public function setCrossingChar($crossingChar)
-    {
-        $this->crossingChar = $crossingChar;
-
-        return $this;
-    }
-
-    /**
-     * Gets crossing character.
-     *
-     * @return string $crossingChar
-     */
-    public function getCrossingChar()
-    {
-        return $this->crossingChar;
-    }
-
-    /**
-     * Sets header cell format.
-     *
-     * @param string $cellHeaderFormat
-     *
-     * @return TableStyle
-     */
-    public function setCellHeaderFormat($cellHeaderFormat)
-    {
-        $this->cellHeaderFormat = $cellHeaderFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets header cell format.
-     *
-     * @return string
-     */
-    public function getCellHeaderFormat()
-    {
-        return $this->cellHeaderFormat;
-    }
-
-    /**
-     * Sets row cell format.
-     *
-     * @param string $cellRowFormat
-     *
-     * @return TableStyle
-     */
-    public function setCellRowFormat($cellRowFormat)
-    {
-        $this->cellRowFormat = $cellRowFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets row cell format.
-     *
-     * @return string
-     */
-    public function getCellRowFormat()
-    {
-        return $this->cellRowFormat;
-    }
-
-    /**
-     * Sets row cell content format.
-     *
-     * @param string $cellRowContentFormat
-     *
-     * @return TableStyle
-     */
-    public function setCellRowContentFormat($cellRowContentFormat)
-    {
-        $this->cellRowContentFormat = $cellRowContentFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets row cell content format.
-     *
-     * @return string
-     */
-    public function getCellRowContentFormat()
-    {
-        return $this->cellRowContentFormat;
-    }
-
-    /**
-     * Sets table border format.
-     *
-     * @param string $borderFormat
-     *
-     * @return TableStyle
-     */
-    public function setBorderFormat($borderFormat)
-    {
-        $this->borderFormat = $borderFormat;
-
-        return $this;
-    }
-
-    /**
-     * Gets table border format.
-     *
-     * @return string
-     */
-    public function getBorderFormat()
-    {
-        return $this->borderFormat;
-    }
-
-    /**
-     * Sets cell padding type.
-     *
-     * @param int $padType STR_PAD_*
-     *
-     * @return TableStyle
-     */
-    public function setPadType($padType)
-    {
-        if (!in_array($padType, array(STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH), true)) {
-            throw new \InvalidArgumentException('Invalid padding type. Expected one of (STR_PAD_LEFT, STR_PAD_RIGHT, STR_PAD_BOTH).');
-        }
-
-        $this->padType = $padType;
-
-        return $this;
-    }
-
-    /**
-     * Gets cell padding type.
-     *
-     * @return int
-     */
-    public function getPadType()
-    {
-        return $this->padType;
-    }
-}
diff --git a/vendor/symfony/console/Input/ArgvInput.php b/vendor/symfony/console/Input/ArgvInput.php
deleted file mode 100644
index 43b28d5..0000000
--- a/vendor/symfony/console/Input/ArgvInput.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * ArgvInput represents an input coming from the CLI arguments.
- *
- * Usage:
- *
- *     $input = new ArgvInput();
- *
- * By default, the `$_SERVER['argv']` array is used for the input values.
- *
- * This can be overridden by explicitly passing the input values in the constructor:
- *
- *     $input = new ArgvInput($_SERVER['argv']);
- *
- * If you pass it yourself, don't forget that the first element of the array
- * is the name of the running application.
- *
- * When passing an argument to the constructor, be sure that it respects
- * the same rules as the argv one. It's almost always better to use the
- * `StringInput` when you want to provide your own input.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @see http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
- * @see http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html#tag_12_02
- */
-class ArgvInput extends Input
-{
-    private $tokens;
-    private $parsed;
-
-    /**
-     * Constructor.
-     *
-     * @param array           $argv       An array of parameters from the CLI (in the argv format)
-     * @param InputDefinition $definition A InputDefinition instance
-     */
-    public function __construct(array $argv = null, InputDefinition $definition = null)
-    {
-        if (null === $argv) {
-            $argv = $_SERVER['argv'];
-        }
-
-        // strip the application name
-        array_shift($argv);
-
-        $this->tokens = $argv;
-
-        parent::__construct($definition);
-    }
-
-    protected function setTokens(array $tokens)
-    {
-        $this->tokens = $tokens;
-    }
-
-    /**
-     * Processes command line arguments.
-     */
-    protected function parse()
-    {
-        $parseOptions = true;
-        $this->parsed = $this->tokens;
-        while (null !== $token = array_shift($this->parsed)) {
-            if ($parseOptions && '' == $token) {
-                $this->parseArgument($token);
-            } elseif ($parseOptions && '--' == $token) {
-                $parseOptions = false;
-            } elseif ($parseOptions && 0 === strpos($token, '--')) {
-                $this->parseLongOption($token);
-            } elseif ($parseOptions && '-' === $token[0] && '-' !== $token) {
-                $this->parseShortOption($token);
-            } else {
-                $this->parseArgument($token);
-            }
-        }
-    }
-
-    /**
-     * Parses a short option.
-     *
-     * @param string $token The current token.
-     */
-    private function parseShortOption($token)
-    {
-        $name = substr($token, 1);
-
-        if (strlen($name) > 1) {
-            if ($this->definition->hasShortcut($name[0]) && $this->definition->getOptionForShortcut($name[0])->acceptValue()) {
-                // an option with a value (with no space)
-                $this->addShortOption($name[0], substr($name, 1));
-            } else {
-                $this->parseShortOptionSet($name);
-            }
-        } else {
-            $this->addShortOption($name, null);
-        }
-    }
-
-    /**
-     * Parses a short option set.
-     *
-     * @param string $name The current token
-     *
-     * @throws \RuntimeException When option given doesn't exist
-     */
-    private function parseShortOptionSet($name)
-    {
-        $len = strlen($name);
-        for ($i = 0; $i < $len; ++$i) {
-            if (!$this->definition->hasShortcut($name[$i])) {
-                throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
-            }
-
-            $option = $this->definition->getOptionForShortcut($name[$i]);
-            if ($option->acceptValue()) {
-                $this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1));
-
-                break;
-            } else {
-                $this->addLongOption($option->getName(), null);
-            }
-        }
-    }
-
-    /**
-     * Parses a long option.
-     *
-     * @param string $token The current token
-     */
-    private function parseLongOption($token)
-    {
-        $name = substr($token, 2);
-
-        if (false !== $pos = strpos($name, '=')) {
-            $this->addLongOption(substr($name, 0, $pos), substr($name, $pos + 1));
-        } else {
-            $this->addLongOption($name, null);
-        }
-    }
-
-    /**
-     * Parses an argument.
-     *
-     * @param string $token The current token
-     *
-     * @throws \RuntimeException When too many arguments are given
-     */
-    private function parseArgument($token)
-    {
-        $c = count($this->arguments);
-
-        // if input is expecting another argument, add it
-        if ($this->definition->hasArgument($c)) {
-            $arg = $this->definition->getArgument($c);
-            $this->arguments[$arg->getName()] = $arg->isArray() ? array($token) : $token;
-
-        // if last argument isArray(), append token to last argument
-        } elseif ($this->definition->hasArgument($c - 1) && $this->definition->getArgument($c - 1)->isArray()) {
-            $arg = $this->definition->getArgument($c - 1);
-            $this->arguments[$arg->getName()][] = $token;
-
-        // unexpected argument
-        } else {
-            throw new \RuntimeException('Too many arguments.');
-        }
-    }
-
-    /**
-     * Adds a short option value.
-     *
-     * @param string $shortcut The short option key
-     * @param mixed  $value    The value for the option
-     *
-     * @throws \RuntimeException When option given doesn't exist
-     */
-    private function addShortOption($shortcut, $value)
-    {
-        if (!$this->definition->hasShortcut($shortcut)) {
-            throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut));
-        }
-
-        $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
-    }
-
-    /**
-     * Adds a long option value.
-     *
-     * @param string $name  The long option key
-     * @param mixed  $value The value for the option
-     *
-     * @throws \RuntimeException When option given doesn't exist
-     */
-    private function addLongOption($name, $value)
-    {
-        if (!$this->definition->hasOption($name)) {
-            throw new \RuntimeException(sprintf('The "--%s" option does not exist.', $name));
-        }
-
-        $option = $this->definition->getOption($name);
-
-        // Convert empty values to null
-        if (!isset($value[0])) {
-            $value = null;
-        }
-
-        if (null !== $value && !$option->acceptValue()) {
-            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name));
-        }
-
-        if (null === $value && $option->acceptValue() && count($this->parsed)) {
-            // if option accepts an optional or mandatory argument
-            // let's see if there is one provided
-            $next = array_shift($this->parsed);
-            if (isset($next[0]) && '-' !== $next[0]) {
-                $value = $next;
-            } elseif (empty($next)) {
-                $value = '';
-            } else {
-                array_unshift($this->parsed, $next);
-            }
-        }
-
-        if (null === $value) {
-            if ($option->isValueRequired()) {
-                throw new \RuntimeException(sprintf('The "--%s" option requires a value.', $name));
-            }
-
-            if (!$option->isArray()) {
-                $value = $option->isValueOptional() ? $option->getDefault() : true;
-            }
-        }
-
-        if ($option->isArray()) {
-            $this->options[$name][] = $value;
-        } else {
-            $this->options[$name] = $value;
-        }
-    }
-
-    /**
-     * Returns the first argument from the raw parameters (not parsed).
-     *
-     * @return string The value of the first argument or null otherwise
-     */
-    public function getFirstArgument()
-    {
-        foreach ($this->tokens as $token) {
-            if ($token && '-' === $token[0]) {
-                continue;
-            }
-
-            return $token;
-        }
-    }
-
-    /**
-     * Returns true if the raw parameters (not parsed) contain a value.
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values The value(s) to look for in the raw parameters (can be an array)
-     *
-     * @return bool true if the value is contained in the raw parameters
-     */
-    public function hasParameterOption($values)
-    {
-        $values = (array) $values;
-
-        foreach ($this->tokens as $token) {
-            foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the value of a raw option (not parsed).
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values  The value(s) to look for in the raw parameters (can be an array)
-     * @param mixed        $default The default value to return if no result is found
-     *
-     * @return mixed The option value
-     */
-    public function getParameterOption($values, $default = false)
-    {
-        $values = (array) $values;
-        $tokens = $this->tokens;
-
-        while (0 < count($tokens)) {
-            $token = array_shift($tokens);
-
-            foreach ($values as $value) {
-                if ($token === $value || 0 === strpos($token, $value.'=')) {
-                    if (false !== $pos = strpos($token, '=')) {
-                        return substr($token, $pos + 1);
-                    }
-
-                    return array_shift($tokens);
-                }
-            }
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns a stringified representation of the args passed to the command.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $self = $this;
-        $tokens = array_map(function ($token) use ($self) {
-            if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1].$self->escapeToken($match[2]);
-            }
-
-            if ($token && $token[0] !== '-') {
-                return $self->escapeToken($token);
-            }
-
-            return $token;
-        }, $this->tokens);
-
-        return implode(' ', $tokens);
-    }
-}
diff --git a/vendor/symfony/console/Input/ArrayInput.php b/vendor/symfony/console/Input/ArrayInput.php
deleted file mode 100644
index 99c9788..0000000
--- a/vendor/symfony/console/Input/ArrayInput.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * ArrayInput represents an input provided as an array.
- *
- * Usage:
- *
- *     $input = new ArrayInput(array('name' => 'foo', '--bar' => 'foobar'));
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ArrayInput extends Input
-{
-    private $parameters;
-
-    /**
-     * Constructor.
-     *
-     * @param array           $parameters An array of parameters
-     * @param InputDefinition $definition A InputDefinition instance
-     */
-    public function __construct(array $parameters, InputDefinition $definition = null)
-    {
-        $this->parameters = $parameters;
-
-        parent::__construct($definition);
-    }
-
-    /**
-     * Returns the first argument from the raw parameters (not parsed).
-     *
-     * @return string The value of the first argument or null otherwise
-     */
-    public function getFirstArgument()
-    {
-        foreach ($this->parameters as $key => $value) {
-            if ($key && '-' === $key[0]) {
-                continue;
-            }
-
-            return $value;
-        }
-    }
-
-    /**
-     * Returns true if the raw parameters (not parsed) contain a value.
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values The values to look for in the raw parameters (can be an array)
-     *
-     * @return bool true if the value is contained in the raw parameters
-     */
-    public function hasParameterOption($values)
-    {
-        $values = (array) $values;
-
-        foreach ($this->parameters as $k => $v) {
-            if (!is_int($k)) {
-                $v = $k;
-            }
-
-            if (in_array($v, $values)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the value of a raw option (not parsed).
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values  The value(s) to look for in the raw parameters (can be an array)
-     * @param mixed        $default The default value to return if no result is found
-     *
-     * @return mixed The option value
-     */
-    public function getParameterOption($values, $default = false)
-    {
-        $values = (array) $values;
-
-        foreach ($this->parameters as $k => $v) {
-            if (is_int($k)) {
-                if (in_array($v, $values)) {
-                    return true;
-                }
-            } elseif (in_array($k, $values)) {
-                return $v;
-            }
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns a stringified representation of the args passed to the command.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $params = array();
-        foreach ($this->parameters as $param => $val) {
-            if ($param && '-' === $param[0]) {
-                $params[] = $param.('' != $val ? '='.$this->escapeToken($val) : '');
-            } else {
-                $params[] = $this->escapeToken($val);
-            }
-        }
-
-        return implode(' ', $params);
-    }
-
-    /**
-     * Processes command line arguments.
-     */
-    protected function parse()
-    {
-        foreach ($this->parameters as $key => $value) {
-            if (0 === strpos($key, '--')) {
-                $this->addLongOption(substr($key, 2), $value);
-            } elseif ('-' === $key[0]) {
-                $this->addShortOption(substr($key, 1), $value);
-            } else {
-                $this->addArgument($key, $value);
-            }
-        }
-    }
-
-    /**
-     * Adds a short option value.
-     *
-     * @param string $shortcut The short option key
-     * @param mixed  $value    The value for the option
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     */
-    private function addShortOption($shortcut, $value)
-    {
-        if (!$this->definition->hasShortcut($shortcut)) {
-            throw new \InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut));
-        }
-
-        $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
-    }
-
-    /**
-     * Adds a long option value.
-     *
-     * @param string $name  The long option key
-     * @param mixed  $value The value for the option
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     * @throws \InvalidArgumentException When a required value is missing
-     */
-    private function addLongOption($name, $value)
-    {
-        if (!$this->definition->hasOption($name)) {
-            throw new \InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name));
-        }
-
-        $option = $this->definition->getOption($name);
-
-        if (null === $value) {
-            if ($option->isValueRequired()) {
-                throw new \InvalidArgumentException(sprintf('The "--%s" option requires a value.', $name));
-            }
-
-            $value = $option->isValueOptional() ? $option->getDefault() : true;
-        }
-
-        $this->options[$name] = $value;
-    }
-
-    /**
-     * Adds an argument value.
-     *
-     * @param string $name  The argument name
-     * @param mixed  $value The value for the argument
-     *
-     * @throws \InvalidArgumentException When argument given doesn't exist
-     */
-    private function addArgument($name, $value)
-    {
-        if (!$this->definition->hasArgument($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
-        }
-
-        $this->arguments[$name] = $value;
-    }
-}
diff --git a/vendor/symfony/console/Input/Input.php b/vendor/symfony/console/Input/Input.php
deleted file mode 100644
index e26fcc1..0000000
--- a/vendor/symfony/console/Input/Input.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * Input is the base class for all concrete Input classes.
- *
- * Three concrete classes are provided by default:
- *
- *  * `ArgvInput`: The input comes from the CLI arguments (argv)
- *  * `StringInput`: The input is provided as a string
- *  * `ArrayInput`: The input is provided as an array
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Input implements InputInterface
-{
-    /**
-     * @var InputDefinition
-     */
-    protected $definition;
-    protected $options = array();
-    protected $arguments = array();
-    protected $interactive = true;
-
-    /**
-     * Constructor.
-     *
-     * @param InputDefinition $definition A InputDefinition instance
-     */
-    public function __construct(InputDefinition $definition = null)
-    {
-        if (null === $definition) {
-            $this->definition = new InputDefinition();
-        } else {
-            $this->bind($definition);
-            $this->validate();
-        }
-    }
-
-    /**
-     * Binds the current Input instance with the given arguments and options.
-     *
-     * @param InputDefinition $definition A InputDefinition instance
-     */
-    public function bind(InputDefinition $definition)
-    {
-        $this->arguments = array();
-        $this->options = array();
-        $this->definition = $definition;
-
-        $this->parse();
-    }
-
-    /**
-     * Processes command line arguments.
-     */
-    abstract protected function parse();
-
-    /**
-     * Validates the input.
-     *
-     * @throws \RuntimeException When not enough arguments are given
-     */
-    public function validate()
-    {
-        $definition = $this->definition;
-        $givenArguments = $this->arguments;
-
-        $missingArguments = array_filter(array_keys($definition->getArguments()), function ($argument) use ($definition, $givenArguments) {
-            return !array_key_exists($argument, $givenArguments) && $definition->getArgument($argument)->isRequired();
-        });
-
-        if (count($missingArguments) > 0) {
-            throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArguments)));
-        }
-    }
-
-    /**
-     * Checks if the input is interactive.
-     *
-     * @return bool Returns true if the input is interactive
-     */
-    public function isInteractive()
-    {
-        return $this->interactive;
-    }
-
-    /**
-     * Sets the input interactivity.
-     *
-     * @param bool $interactive If the input should be interactive
-     */
-    public function setInteractive($interactive)
-    {
-        $this->interactive = (bool) $interactive;
-    }
-
-    /**
-     * Returns the argument values.
-     *
-     * @return array An array of argument values
-     */
-    public function getArguments()
-    {
-        return array_merge($this->definition->getArgumentDefaults(), $this->arguments);
-    }
-
-    /**
-     * Returns the argument value for a given argument name.
-     *
-     * @param string $name The argument name
-     *
-     * @return mixed The argument value
-     *
-     * @throws \InvalidArgumentException When argument given doesn't exist
-     */
-    public function getArgument($name)
-    {
-        if (!$this->definition->hasArgument($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
-        }
-
-        return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)->getDefault();
-    }
-
-    /**
-     * Sets an argument value by name.
-     *
-     * @param string $name  The argument name
-     * @param string $value The argument value
-     *
-     * @throws \InvalidArgumentException When argument given doesn't exist
-     */
-    public function setArgument($name, $value)
-    {
-        if (!$this->definition->hasArgument($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
-        }
-
-        $this->arguments[$name] = $value;
-    }
-
-    /**
-     * Returns true if an InputArgument object exists by name or position.
-     *
-     * @param string|int $name The InputArgument name or position
-     *
-     * @return bool true if the InputArgument object exists, false otherwise
-     */
-    public function hasArgument($name)
-    {
-        return $this->definition->hasArgument($name);
-    }
-
-    /**
-     * Returns the options values.
-     *
-     * @return array An array of option values
-     */
-    public function getOptions()
-    {
-        return array_merge($this->definition->getOptionDefaults(), $this->options);
-    }
-
-    /**
-     * Returns the option value for a given option name.
-     *
-     * @param string $name The option name
-     *
-     * @return mixed The option value
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     */
-    public function getOption($name)
-    {
-        if (!$this->definition->hasOption($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
-        }
-
-        return isset($this->options[$name]) ? $this->options[$name] : $this->definition->getOption($name)->getDefault();
-    }
-
-    /**
-     * Sets an option value by name.
-     *
-     * @param string      $name  The option name
-     * @param string|bool $value The option value
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     */
-    public function setOption($name, $value)
-    {
-        if (!$this->definition->hasOption($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
-        }
-
-        $this->options[$name] = $value;
-    }
-
-    /**
-     * Returns true if an InputOption object exists by name.
-     *
-     * @param string $name The InputOption name
-     *
-     * @return bool true if the InputOption object exists, false otherwise
-     */
-    public function hasOption($name)
-    {
-        return $this->definition->hasOption($name);
-    }
-
-    /**
-     * Escapes a token through escapeshellarg if it contains unsafe chars.
-     *
-     * @param string $token
-     *
-     * @return string
-     */
-    public function escapeToken($token)
-    {
-        return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
-    }
-}
diff --git a/vendor/symfony/console/Input/InputArgument.php b/vendor/symfony/console/Input/InputArgument.php
deleted file mode 100644
index 69edecb..0000000
--- a/vendor/symfony/console/Input/InputArgument.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * Represents a command line argument.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InputArgument
-{
-    const REQUIRED = 1;
-    const OPTIONAL = 2;
-    const IS_ARRAY = 4;
-
-    private $name;
-    private $mode;
-    private $default;
-    private $description;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name        The argument name
-     * @param int    $mode        The argument mode: self::REQUIRED or self::OPTIONAL
-     * @param string $description A description text
-     * @param mixed  $default     The default value (for self::OPTIONAL mode only)
-     *
-     * @throws \InvalidArgumentException When argument mode is not valid
-     */
-    public function __construct($name, $mode = null, $description = '', $default = null)
-    {
-        if (null === $mode) {
-            $mode = self::OPTIONAL;
-        } elseif (!is_int($mode) || $mode > 7 || $mode < 1) {
-            throw new \InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode));
-        }
-
-        $this->name = $name;
-        $this->mode = $mode;
-        $this->description = $description;
-
-        $this->setDefault($default);
-    }
-
-    /**
-     * Returns the argument name.
-     *
-     * @return string The argument name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns true if the argument is required.
-     *
-     * @return bool true if parameter mode is self::REQUIRED, false otherwise
-     */
-    public function isRequired()
-    {
-        return self::REQUIRED === (self::REQUIRED & $this->mode);
-    }
-
-    /**
-     * Returns true if the argument can take multiple values.
-     *
-     * @return bool true if mode is self::IS_ARRAY, false otherwise
-     */
-    public function isArray()
-    {
-        return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
-    }
-
-    /**
-     * Sets the default value.
-     *
-     * @param mixed $default The default value
-     *
-     * @throws \LogicException When incorrect default value is given
-     */
-    public function setDefault($default = null)
-    {
-        if (self::REQUIRED === $this->mode && null !== $default) {
-            throw new \LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.');
-        }
-
-        if ($this->isArray()) {
-            if (null === $default) {
-                $default = array();
-            } elseif (!is_array($default)) {
-                throw new \LogicException('A default value for an array argument must be an array.');
-            }
-        }
-
-        $this->default = $default;
-    }
-
-    /**
-     * Returns the default value.
-     *
-     * @return mixed The default value
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * Returns the description text.
-     *
-     * @return string The description text
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-}
diff --git a/vendor/symfony/console/Input/InputAwareInterface.php b/vendor/symfony/console/Input/InputAwareInterface.php
deleted file mode 100644
index d0f11e9..0000000
--- a/vendor/symfony/console/Input/InputAwareInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * InputAwareInterface should be implemented by classes that depends on the
- * Console Input.
- *
- * @author Wouter J <waldio.webdesign@gmail.com>
- */
-interface InputAwareInterface
-{
-    /**
-     * Sets the Console Input.
-     *
-     * @param InputInterface
-     */
-    public function setInput(InputInterface $input);
-}
diff --git a/vendor/symfony/console/Input/InputDefinition.php b/vendor/symfony/console/Input/InputDefinition.php
deleted file mode 100644
index 809baeb..0000000
--- a/vendor/symfony/console/Input/InputDefinition.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?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\Component\Console\Input;
-
-use Symfony\Component\Console\Descriptor\TextDescriptor;
-use Symfony\Component\Console\Descriptor\XmlDescriptor;
-use Symfony\Component\Console\Output\BufferedOutput;
-
-/**
- * A InputDefinition represents a set of valid command line arguments and options.
- *
- * Usage:
- *
- *     $definition = new InputDefinition(array(
- *       new InputArgument('name', InputArgument::REQUIRED),
- *       new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
- *     ));
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InputDefinition
-{
-    private $arguments;
-    private $requiredCount;
-    private $hasAnArrayArgument = false;
-    private $hasOptional;
-    private $options;
-    private $shortcuts;
-
-    /**
-     * Constructor.
-     *
-     * @param array $definition An array of InputArgument and InputOption instance
-     */
-    public function __construct(array $definition = array())
-    {
-        $this->setDefinition($definition);
-    }
-
-    /**
-     * Sets the definition of the input.
-     *
-     * @param array $definition The definition array
-     */
-    public function setDefinition(array $definition)
-    {
-        $arguments = array();
-        $options = array();
-        foreach ($definition as $item) {
-            if ($item instanceof InputOption) {
-                $options[] = $item;
-            } else {
-                $arguments[] = $item;
-            }
-        }
-
-        $this->setArguments($arguments);
-        $this->setOptions($options);
-    }
-
-    /**
-     * Sets the InputArgument objects.
-     *
-     * @param InputArgument[] $arguments An array of InputArgument objects
-     */
-    public function setArguments($arguments = array())
-    {
-        $this->arguments = array();
-        $this->requiredCount = 0;
-        $this->hasOptional = false;
-        $this->hasAnArrayArgument = false;
-        $this->addArguments($arguments);
-    }
-
-    /**
-     * Adds an array of InputArgument objects.
-     *
-     * @param InputArgument[] $arguments An array of InputArgument objects
-     */
-    public function addArguments($arguments = array())
-    {
-        if (null !== $arguments) {
-            foreach ($arguments as $argument) {
-                $this->addArgument($argument);
-            }
-        }
-    }
-
-    /**
-     * Adds an InputArgument object.
-     *
-     * @param InputArgument $argument An InputArgument object
-     *
-     * @throws \LogicException When incorrect argument is given
-     */
-    public function addArgument(InputArgument $argument)
-    {
-        if (isset($this->arguments[$argument->getName()])) {
-            throw new \LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName()));
-        }
-
-        if ($this->hasAnArrayArgument) {
-            throw new \LogicException('Cannot add an argument after an array argument.');
-        }
-
-        if ($argument->isRequired() && $this->hasOptional) {
-            throw new \LogicException('Cannot add a required argument after an optional one.');
-        }
-
-        if ($argument->isArray()) {
-            $this->hasAnArrayArgument = true;
-        }
-
-        if ($argument->isRequired()) {
-            ++$this->requiredCount;
-        } else {
-            $this->hasOptional = true;
-        }
-
-        $this->arguments[$argument->getName()] = $argument;
-    }
-
-    /**
-     * Returns an InputArgument by name or by position.
-     *
-     * @param string|int $name The InputArgument name or position
-     *
-     * @return InputArgument An InputArgument object
-     *
-     * @throws \InvalidArgumentException When argument given doesn't exist
-     */
-    public function getArgument($name)
-    {
-        if (!$this->hasArgument($name)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
-        }
-
-        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
-
-        return $arguments[$name];
-    }
-
-    /**
-     * Returns true if an InputArgument object exists by name or position.
-     *
-     * @param string|int $name The InputArgument name or position
-     *
-     * @return bool true if the InputArgument object exists, false otherwise
-     */
-    public function hasArgument($name)
-    {
-        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
-
-        return isset($arguments[$name]);
-    }
-
-    /**
-     * Gets the array of InputArgument objects.
-     *
-     * @return InputArgument[] An array of InputArgument objects
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * Returns the number of InputArguments.
-     *
-     * @return int The number of InputArguments
-     */
-    public function getArgumentCount()
-    {
-        return $this->hasAnArrayArgument ? PHP_INT_MAX : count($this->arguments);
-    }
-
-    /**
-     * Returns the number of required InputArguments.
-     *
-     * @return int The number of required InputArguments
-     */
-    public function getArgumentRequiredCount()
-    {
-        return $this->requiredCount;
-    }
-
-    /**
-     * Gets the default values.
-     *
-     * @return array An array of default values
-     */
-    public function getArgumentDefaults()
-    {
-        $values = array();
-        foreach ($this->arguments as $argument) {
-            $values[$argument->getName()] = $argument->getDefault();
-        }
-
-        return $values;
-    }
-
-    /**
-     * Sets the InputOption objects.
-     *
-     * @param InputOption[] $options An array of InputOption objects
-     */
-    public function setOptions($options = array())
-    {
-        $this->options = array();
-        $this->shortcuts = array();
-        $this->addOptions($options);
-    }
-
-    /**
-     * Adds an array of InputOption objects.
-     *
-     * @param InputOption[] $options An array of InputOption objects
-     */
-    public function addOptions($options = array())
-    {
-        foreach ($options as $option) {
-            $this->addOption($option);
-        }
-    }
-
-    /**
-     * Adds an InputOption object.
-     *
-     * @param InputOption $option An InputOption object
-     *
-     * @throws \LogicException When option given already exist
-     */
-    public function addOption(InputOption $option)
-    {
-        if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
-            throw new \LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
-        }
-
-        if ($option->getShortcut()) {
-            foreach (explode('|', $option->getShortcut()) as $shortcut) {
-                if (isset($this->shortcuts[$shortcut]) && !$option->equals($this->options[$this->shortcuts[$shortcut]])) {
-                    throw new \LogicException(sprintf('An option with shortcut "%s" already exists.', $shortcut));
-                }
-            }
-        }
-
-        $this->options[$option->getName()] = $option;
-        if ($option->getShortcut()) {
-            foreach (explode('|', $option->getShortcut()) as $shortcut) {
-                $this->shortcuts[$shortcut] = $option->getName();
-            }
-        }
-    }
-
-    /**
-     * Returns an InputOption by name.
-     *
-     * @param string $name The InputOption name
-     *
-     * @return InputOption A InputOption object
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     */
-    public function getOption($name)
-    {
-        if (!$this->hasOption($name)) {
-            throw new \InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name));
-        }
-
-        return $this->options[$name];
-    }
-
-    /**
-     * Returns true if an InputOption object exists by name.
-     *
-     * @param string $name The InputOption name
-     *
-     * @return bool true if the InputOption object exists, false otherwise
-     */
-    public function hasOption($name)
-    {
-        return isset($this->options[$name]);
-    }
-
-    /**
-     * Gets the array of InputOption objects.
-     *
-     * @return InputOption[] An array of InputOption objects
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Returns true if an InputOption object exists by shortcut.
-     *
-     * @param string $name The InputOption shortcut
-     *
-     * @return bool true if the InputOption object exists, false otherwise
-     */
-    public function hasShortcut($name)
-    {
-        return isset($this->shortcuts[$name]);
-    }
-
-    /**
-     * Gets an InputOption by shortcut.
-     *
-     * @param string $shortcut the Shortcut name
-     *
-     * @return InputOption An InputOption object
-     */
-    public function getOptionForShortcut($shortcut)
-    {
-        return $this->getOption($this->shortcutToName($shortcut));
-    }
-
-    /**
-     * Gets an array of default values.
-     *
-     * @return array An array of all default values
-     */
-    public function getOptionDefaults()
-    {
-        $values = array();
-        foreach ($this->options as $option) {
-            $values[$option->getName()] = $option->getDefault();
-        }
-
-        return $values;
-    }
-
-    /**
-     * Returns the InputOption name given a shortcut.
-     *
-     * @param string $shortcut The shortcut
-     *
-     * @return string The InputOption name
-     *
-     * @throws \InvalidArgumentException When option given does not exist
-     */
-    private function shortcutToName($shortcut)
-    {
-        if (!isset($this->shortcuts[$shortcut])) {
-            throw new \InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut));
-        }
-
-        return $this->shortcuts[$shortcut];
-    }
-
-    /**
-     * Gets the synopsis.
-     *
-     * @param bool $short Whether to return the short version (with options folded) or not
-     *
-     * @return string The synopsis
-     */
-    public function getSynopsis($short = false)
-    {
-        $elements = array();
-
-        if ($short && $this->getOptions()) {
-            $elements[] = '[options]';
-        } elseif (!$short) {
-            foreach ($this->getOptions() as $option) {
-                $value = '';
-                if ($option->acceptValue()) {
-                    $value = sprintf(
-                        ' %s%s%s',
-                        $option->isValueOptional() ? '[' : '',
-                        strtoupper($option->getName()),
-                        $option->isValueOptional() ? ']' : ''
-                    );
-                }
-
-                $shortcut = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : '';
-                $elements[] = sprintf('[%s--%s%s]', $shortcut, $option->getName(), $value);
-            }
-        }
-
-        if (count($elements) && $this->getArguments()) {
-            $elements[] = '[--]';
-        }
-
-        foreach ($this->getArguments() as $argument) {
-            $element = '<'.$argument->getName().'>';
-            if (!$argument->isRequired()) {
-                $element = '['.$element.']';
-            } elseif ($argument->isArray()) {
-                $element = $element.' ('.$element.')';
-            }
-
-            if ($argument->isArray()) {
-                $element .= '...';
-            }
-
-            $elements[] = $element;
-        }
-
-        return implode(' ', $elements);
-    }
-
-    /**
-     * Returns a textual representation of the InputDefinition.
-     *
-     * @return string A string representing the InputDefinition
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asText()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new TextDescriptor();
-        $output = new BufferedOutput(BufferedOutput::VERBOSITY_NORMAL, true);
-        $descriptor->describe($output, $this, array('raw_output' => true));
-
-        return $output->fetch();
-    }
-
-    /**
-     * Returns an XML representation of the InputDefinition.
-     *
-     * @param bool $asDom Whether to return a DOM or an XML string
-     *
-     * @return string|\DOMDocument An XML string representing the InputDefinition
-     *
-     * @deprecated since version 2.3, to be removed in 3.0.
-     */
-    public function asXml($asDom = false)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $descriptor = new XmlDescriptor();
-
-        if ($asDom) {
-            return $descriptor->getInputDefinitionDocument($this);
-        }
-
-        $output = new BufferedOutput();
-        $descriptor->describe($output, $this);
-
-        return $output->fetch();
-    }
-}
diff --git a/vendor/symfony/console/Input/InputInterface.php b/vendor/symfony/console/Input/InputInterface.php
deleted file mode 100644
index 6ef2f26..0000000
--- a/vendor/symfony/console/Input/InputInterface.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * InputInterface is the interface implemented by all input classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface InputInterface
-{
-    /**
-     * Returns the first argument from the raw parameters (not parsed).
-     *
-     * @return string The value of the first argument or null otherwise
-     */
-    public function getFirstArgument();
-
-    /**
-     * Returns true if the raw parameters (not parsed) contain a value.
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values The values to look for in the raw parameters (can be an array)
-     *
-     * @return bool true if the value is contained in the raw parameters
-     */
-    public function hasParameterOption($values);
-
-    /**
-     * Returns the value of a raw option (not parsed).
-     *
-     * This method is to be used to introspect the input parameters
-     * before they have been validated. It must be used carefully.
-     *
-     * @param string|array $values  The value(s) to look for in the raw parameters (can be an array)
-     * @param mixed        $default The default value to return if no result is found
-     *
-     * @return mixed The option value
-     */
-    public function getParameterOption($values, $default = false);
-
-    /**
-     * Binds the current Input instance with the given arguments and options.
-     *
-     * @param InputDefinition $definition A InputDefinition instance
-     */
-    public function bind(InputDefinition $definition);
-
-    /**
-     * Validates if arguments given are correct.
-     *
-     * Throws an exception when not enough arguments are given.
-     *
-     * @throws \RuntimeException
-     */
-    public function validate();
-
-    /**
-     * Returns all the given arguments merged with the default values.
-     *
-     * @return array
-     */
-    public function getArguments();
-
-    /**
-     * Gets argument by name.
-     *
-     * @param string $name The name of the argument
-     *
-     * @return mixed
-     */
-    public function getArgument($name);
-
-    /**
-     * Sets an argument value by name.
-     *
-     * @param string $name  The argument name
-     * @param string $value The argument value
-     *
-     * @throws \InvalidArgumentException When argument given doesn't exist
-     */
-    public function setArgument($name, $value);
-
-    /**
-     * Returns true if an InputArgument object exists by name or position.
-     *
-     * @param string|int $name The InputArgument name or position
-     *
-     * @return bool true if the InputArgument object exists, false otherwise
-     */
-    public function hasArgument($name);
-
-    /**
-     * Returns all the given options merged with the default values.
-     *
-     * @return array
-     */
-    public function getOptions();
-
-    /**
-     * Gets an option by name.
-     *
-     * @param string $name The name of the option
-     *
-     * @return mixed
-     */
-    public function getOption($name);
-
-    /**
-     * Sets an option value by name.
-     *
-     * @param string      $name  The option name
-     * @param string|bool $value The option value
-     *
-     * @throws \InvalidArgumentException When option given doesn't exist
-     */
-    public function setOption($name, $value);
-
-    /**
-     * Returns true if an InputOption object exists by name.
-     *
-     * @param string $name The InputOption name
-     *
-     * @return bool true if the InputOption object exists, false otherwise
-     */
-    public function hasOption($name);
-
-    /**
-     * Is this input means interactive?
-     *
-     * @return bool
-     */
-    public function isInteractive();
-
-    /**
-     * Sets the input interactivity.
-     *
-     * @param bool $interactive If the input should be interactive
-     */
-    public function setInteractive($interactive);
-}
diff --git a/vendor/symfony/console/Input/InputOption.php b/vendor/symfony/console/Input/InputOption.php
deleted file mode 100644
index 167f199..0000000
--- a/vendor/symfony/console/Input/InputOption.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * Represents a command line option.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InputOption
-{
-    const VALUE_NONE = 1;
-    const VALUE_REQUIRED = 2;
-    const VALUE_OPTIONAL = 4;
-    const VALUE_IS_ARRAY = 8;
-
-    private $name;
-    private $shortcut;
-    private $mode;
-    private $default;
-    private $description;
-
-    /**
-     * Constructor.
-     *
-     * @param string       $name        The option name
-     * @param string|array $shortcut    The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param int          $mode        The option mode: One of the VALUE_* constants
-     * @param string       $description A description text
-     * @param mixed        $default     The default value (must be null for self::VALUE_REQUIRED or self::VALUE_NONE)
-     *
-     * @throws \InvalidArgumentException If option mode is invalid or incompatible
-     */
-    public function __construct($name, $shortcut = null, $mode = null, $description = '', $default = null)
-    {
-        if (0 === strpos($name, '--')) {
-            $name = substr($name, 2);
-        }
-
-        if (empty($name)) {
-            throw new \InvalidArgumentException('An option name cannot be empty.');
-        }
-
-        if (empty($shortcut)) {
-            $shortcut = null;
-        }
-
-        if (null !== $shortcut) {
-            if (is_array($shortcut)) {
-                $shortcut = implode('|', $shortcut);
-            }
-            $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-'));
-            $shortcuts = array_filter($shortcuts);
-            $shortcut = implode('|', $shortcuts);
-
-            if (empty($shortcut)) {
-                throw new \InvalidArgumentException('An option shortcut cannot be empty.');
-            }
-        }
-
-        if (null === $mode) {
-            $mode = self::VALUE_NONE;
-        } elseif (!is_int($mode) || $mode > 15 || $mode < 1) {
-            throw new \InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode));
-        }
-
-        $this->name = $name;
-        $this->shortcut = $shortcut;
-        $this->mode = $mode;
-        $this->description = $description;
-
-        if ($this->isArray() && !$this->acceptValue()) {
-            throw new \InvalidArgumentException('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.');
-        }
-
-        $this->setDefault($default);
-    }
-
-    /**
-     * Returns the option shortcut.
-     *
-     * @return string The shortcut
-     */
-    public function getShortcut()
-    {
-        return $this->shortcut;
-    }
-
-    /**
-     * Returns the option name.
-     *
-     * @return string The name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns true if the option accepts a value.
-     *
-     * @return bool true if value mode is not self::VALUE_NONE, false otherwise
-     */
-    public function acceptValue()
-    {
-        return $this->isValueRequired() || $this->isValueOptional();
-    }
-
-    /**
-     * Returns true if the option requires a value.
-     *
-     * @return bool true if value mode is self::VALUE_REQUIRED, false otherwise
-     */
-    public function isValueRequired()
-    {
-        return self::VALUE_REQUIRED === (self::VALUE_REQUIRED & $this->mode);
-    }
-
-    /**
-     * Returns true if the option takes an optional value.
-     *
-     * @return bool true if value mode is self::VALUE_OPTIONAL, false otherwise
-     */
-    public function isValueOptional()
-    {
-        return self::VALUE_OPTIONAL === (self::VALUE_OPTIONAL & $this->mode);
-    }
-
-    /**
-     * Returns true if the option can take multiple values.
-     *
-     * @return bool true if mode is self::VALUE_IS_ARRAY, false otherwise
-     */
-    public function isArray()
-    {
-        return self::VALUE_IS_ARRAY === (self::VALUE_IS_ARRAY & $this->mode);
-    }
-
-    /**
-     * Sets the default value.
-     *
-     * @param mixed $default The default value
-     *
-     * @throws \LogicException When incorrect default value is given
-     */
-    public function setDefault($default = null)
-    {
-        if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) {
-            throw new \LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.');
-        }
-
-        if ($this->isArray()) {
-            if (null === $default) {
-                $default = array();
-            } elseif (!is_array($default)) {
-                throw new \LogicException('A default value for an array option must be an array.');
-            }
-        }
-
-        $this->default = $this->acceptValue() ? $default : false;
-    }
-
-    /**
-     * Returns the default value.
-     *
-     * @return mixed The default value
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * Returns the description text.
-     *
-     * @return string The description text
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Checks whether the given option equals this one.
-     *
-     * @param InputOption $option option to compare
-     *
-     * @return bool
-     */
-    public function equals(InputOption $option)
-    {
-        return $option->getName() === $this->getName()
-            && $option->getShortcut() === $this->getShortcut()
-            && $option->getDefault() === $this->getDefault()
-            && $option->isArray() === $this->isArray()
-            && $option->isValueRequired() === $this->isValueRequired()
-            && $option->isValueOptional() === $this->isValueOptional()
-        ;
-    }
-}
diff --git a/vendor/symfony/console/Input/StringInput.php b/vendor/symfony/console/Input/StringInput.php
deleted file mode 100644
index c518d5c..0000000
--- a/vendor/symfony/console/Input/StringInput.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Component\Console\Input;
-
-/**
- * StringInput represents an input provided as a string.
- *
- * Usage:
- *
- *     $input = new StringInput('foo --bar="foobar"');
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class StringInput extends ArgvInput
-{
-    const REGEX_STRING = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
-
-    /**
-     * Constructor.
-     *
-     * @param string          $input      An array of parameters from the CLI (in the argv format)
-     * @param InputDefinition $definition A InputDefinition instance
-     *
-     * @deprecated The second argument is deprecated as it does not work (will be removed in 3.0), use 'bind' method instead
-     */
-    public function __construct($input, InputDefinition $definition = null)
-    {
-        if ($definition) {
-            @trigger_error('The $definition argument of the '.__METHOD__.' method is deprecated and will be removed in 3.0. Set this parameter with the bind() method instead.', E_USER_DEPRECATED);
-        }
-
-        parent::__construct(array(), null);
-
-        $this->setTokens($this->tokenize($input));
-
-        if (null !== $definition) {
-            $this->bind($definition);
-        }
-    }
-
-    /**
-     * Tokenizes a string.
-     *
-     * @param string $input The input to tokenize
-     *
-     * @return array An array of tokens
-     *
-     * @throws \InvalidArgumentException When unable to parse input (should never happen)
-     */
-    private function tokenize($input)
-    {
-        $tokens = array();
-        $length = strlen($input);
-        $cursor = 0;
-        while ($cursor < $length) {
-            if (preg_match('/\s+/A', $input, $match, null, $cursor)) {
-            } elseif (preg_match('/([^="\'\s]+?)(=?)('.self::REGEX_QUOTED_STRING.'+)/A', $input, $match, null, $cursor)) {
-                $tokens[] = $match[1].$match[2].stripcslashes(str_replace(array('"\'', '\'"', '\'\'', '""'), '', substr($match[3], 1, strlen($match[3]) - 2)));
-            } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, null, $cursor)) {
-                $tokens[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
-            } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, null, $cursor)) {
-                $tokens[] = stripcslashes($match[1]);
-            } else {
-                // should never happen
-                throw new \InvalidArgumentException(sprintf('Unable to parse input near "... %s ..."', substr($input, $cursor, 10)));
-            }
-
-            $cursor += strlen($match[0]);
-        }
-
-        return $tokens;
-    }
-}
diff --git a/vendor/symfony/console/LICENSE b/vendor/symfony/console/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/console/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/console/Logger/ConsoleLogger.php b/vendor/symfony/console/Logger/ConsoleLogger.php
deleted file mode 100644
index 1f7417e..0000000
--- a/vendor/symfony/console/Logger/ConsoleLogger.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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\Component\Console\Logger;
-
-use Psr\Log\AbstractLogger;
-use Psr\Log\InvalidArgumentException;
-use Psr\Log\LogLevel;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-
-/**
- * PSR-3 compliant console logger.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- *
- * @link http://www.php-fig.org/psr/psr-3/
- */
-class ConsoleLogger extends AbstractLogger
-{
-    const INFO = 'info';
-    const ERROR = 'error';
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-    /**
-     * @var array
-     */
-    private $verbosityLevelMap = array(
-        LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::CRITICAL => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::ERROR => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::WARNING => OutputInterface::VERBOSITY_NORMAL,
-        LogLevel::NOTICE => OutputInterface::VERBOSITY_VERBOSE,
-        LogLevel::INFO => OutputInterface::VERBOSITY_VERY_VERBOSE,
-        LogLevel::DEBUG => OutputInterface::VERBOSITY_DEBUG,
-    );
-    /**
-     * @var array
-     */
-    private $formatLevelMap = array(
-        LogLevel::EMERGENCY => self::ERROR,
-        LogLevel::ALERT => self::ERROR,
-        LogLevel::CRITICAL => self::ERROR,
-        LogLevel::ERROR => self::ERROR,
-        LogLevel::WARNING => self::INFO,
-        LogLevel::NOTICE => self::INFO,
-        LogLevel::INFO => self::INFO,
-        LogLevel::DEBUG => self::INFO,
-    );
-
-    /**
-     * @param OutputInterface $output
-     * @param array           $verbosityLevelMap
-     * @param array           $formatLevelMap
-     */
-    public function __construct(OutputInterface $output, array $verbosityLevelMap = array(), array $formatLevelMap = array())
-    {
-        $this->output = $output;
-        $this->verbosityLevelMap = $verbosityLevelMap + $this->verbosityLevelMap;
-        $this->formatLevelMap = $formatLevelMap + $this->formatLevelMap;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function log($level, $message, array $context = array())
-    {
-        if (!isset($this->verbosityLevelMap[$level])) {
-            throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
-        }
-
-        // Write to the error output if necessary and available
-        if ($this->formatLevelMap[$level] === self::ERROR && $this->output instanceof ConsoleOutputInterface) {
-            $output = $this->output->getErrorOutput();
-        } else {
-            $output = $this->output;
-        }
-
-        if ($output->getVerbosity() >= $this->verbosityLevelMap[$level]) {
-            $output->writeln(sprintf('<%1$s>[%2$s] %3$s</%1$s>', $this->formatLevelMap[$level], $level, $this->interpolate($message, $context)));
-        }
-    }
-
-    /**
-     * Interpolates context values into the message placeholders.
-     *
-     * @author PHP Framework Interoperability Group
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return string
-     */
-    private function interpolate($message, array $context)
-    {
-        // build a replacement array with braces around the context keys
-        $replace = array();
-        foreach ($context as $key => $val) {
-            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-                $replace[sprintf('{%s}', $key)] = $val;
-            }
-        }
-
-        // interpolate replacement values into the message and return
-        return strtr($message, $replace);
-    }
-}
diff --git a/vendor/symfony/console/Output/BufferedOutput.php b/vendor/symfony/console/Output/BufferedOutput.php
deleted file mode 100644
index 5682fc2..0000000
--- a/vendor/symfony/console/Output/BufferedOutput.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Component\Console\Output;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class BufferedOutput extends Output
-{
-    /**
-     * @var string
-     */
-    private $buffer = '';
-
-    /**
-     * Empties buffer and returns its content.
-     *
-     * @return string
-     */
-    public function fetch()
-    {
-        $content = $this->buffer;
-        $this->buffer = '';
-
-        return $content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doWrite($message, $newline)
-    {
-        $this->buffer .= $message;
-
-        if ($newline) {
-            $this->buffer .= "\n";
-        }
-    }
-}
diff --git a/vendor/symfony/console/Output/ConsoleOutput.php b/vendor/symfony/console/Output/ConsoleOutput.php
deleted file mode 100644
index 8e1f360..0000000
--- a/vendor/symfony/console/Output/ConsoleOutput.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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\Component\Console\Output;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-
-/**
- * ConsoleOutput is the default class for all CLI output. It uses STDOUT.
- *
- * This class is a convenient wrapper around `StreamOutput`.
- *
- *     $output = new ConsoleOutput();
- *
- * This is equivalent to:
- *
- *     $output = new StreamOutput(fopen('php://stdout', 'w'));
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
-{
-    /**
-     * @var StreamOutput
-     */
-    private $stderr;
-
-    /**
-     * Constructor.
-     *
-     * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
-     * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
-     * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
-     */
-    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
-    {
-        parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
-
-        $actualDecorated = $this->isDecorated();
-        $this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());
-
-        if (null === $decorated) {
-            $this->setDecorated($actualDecorated && $this->stderr->isDecorated());
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecorated($decorated)
-    {
-        parent::setDecorated($decorated);
-        $this->stderr->setDecorated($decorated);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(OutputFormatterInterface $formatter)
-    {
-        parent::setFormatter($formatter);
-        $this->stderr->setFormatter($formatter);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setVerbosity($level)
-    {
-        parent::setVerbosity($level);
-        $this->stderr->setVerbosity($level);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getErrorOutput()
-    {
-        return $this->stderr;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setErrorOutput(OutputInterface $error)
-    {
-        $this->stderr = $error;
-    }
-
-    /**
-     * Returns true if current environment supports writing console output to
-     * STDOUT.
-     *
-     * @return bool
-     */
-    protected function hasStdoutSupport()
-    {
-        return false === $this->isRunningOS400();
-    }
-
-    /**
-     * Returns true if current environment supports writing console output to
-     * STDERR.
-     *
-     * @return bool
-     */
-    protected function hasStderrSupport()
-    {
-        return false === $this->isRunningOS400();
-    }
-
-    /**
-     * Checks if current executing environment is IBM iSeries (OS400), which
-     * doesn't properly convert character-encodings between ASCII to EBCDIC.
-     *
-     * @return bool
-     */
-    private function isRunningOS400()
-    {
-        $checks = array(
-            function_exists('php_uname') ? php_uname('s') : '',
-            getenv('OSTYPE'),
-            PHP_OS,
-        );
-
-        return false !== stristr(implode(';', $checks), 'OS400');
-    }
-
-    /**
-     * @return resource
-     */
-    private function openOutputStream()
-    {
-        $outputStream = $this->hasStdoutSupport() ? 'php://stdout' : 'php://output';
-
-        return @fopen($outputStream, 'w') ?: fopen('php://output', 'w');
-    }
-
-    /**
-     * @return resource
-     */
-    private function openErrorStream()
-    {
-        $errorStream = $this->hasStderrSupport() ? 'php://stderr' : 'php://output';
-
-        return fopen($errorStream, 'w');
-    }
-}
diff --git a/vendor/symfony/console/Output/ConsoleOutputInterface.php b/vendor/symfony/console/Output/ConsoleOutputInterface.php
deleted file mode 100644
index 5eb4fc7..0000000
--- a/vendor/symfony/console/Output/ConsoleOutputInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\Console\Output;
-
-/**
- * ConsoleOutputInterface is the interface implemented by ConsoleOutput class.
- * This adds information about stderr output stream.
- *
- * @author Dariusz Górecki <darek.krk@gmail.com>
- */
-interface ConsoleOutputInterface extends OutputInterface
-{
-    /**
-     * Gets the OutputInterface for errors.
-     *
-     * @return OutputInterface
-     */
-    public function getErrorOutput();
-
-    /**
-     * Sets the OutputInterface used for errors.
-     *
-     * @param OutputInterface $error
-     */
-    public function setErrorOutput(OutputInterface $error);
-}
diff --git a/vendor/symfony/console/Output/NullOutput.php b/vendor/symfony/console/Output/NullOutput.php
deleted file mode 100644
index a14ae74..0000000
--- a/vendor/symfony/console/Output/NullOutput.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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\Component\Console\Output;
-
-use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-
-/**
- * NullOutput suppresses all output.
- *
- *     $output = new NullOutput();
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class NullOutput implements OutputInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(OutputFormatterInterface $formatter)
-    {
-        // do nothing
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        // to comply with the interface we must return a OutputFormatterInterface
-        return new OutputFormatter();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecorated($decorated)
-    {
-        // do nothing
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isDecorated()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setVerbosity($level)
-    {
-        // do nothing
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVerbosity()
-    {
-        return self::VERBOSITY_QUIET;
-    }
-
-    public function isQuiet()
-    {
-        return true;
-    }
-
-    public function isVerbose()
-    {
-        return false;
-    }
-
-    public function isVeryVerbose()
-    {
-        return false;
-    }
-
-    public function isDebug()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL)
-    {
-        // do nothing
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
-    {
-        // do nothing
-    }
-}
diff --git a/vendor/symfony/console/Output/Output.php b/vendor/symfony/console/Output/Output.php
deleted file mode 100644
index 306dccf..0000000
--- a/vendor/symfony/console/Output/Output.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?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\Component\Console\Output;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-use Symfony\Component\Console\Formatter\OutputFormatter;
-
-/**
- * Base class for output classes.
- *
- * There are five levels of verbosity:
- *
- *  * normal: no option passed (normal output)
- *  * verbose: -v (more output)
- *  * very verbose: -vv (highly extended output)
- *  * debug: -vvv (all debug output)
- *  * quiet: -q (no output)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Output implements OutputInterface
-{
-    private $verbosity;
-    private $formatter;
-
-    /**
-     * Constructor.
-     *
-     * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
-     * @param bool                          $decorated Whether to decorate messages
-     * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
-     */
-    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = false, OutputFormatterInterface $formatter = null)
-    {
-        $this->verbosity = null === $verbosity ? self::VERBOSITY_NORMAL : $verbosity;
-        $this->formatter = $formatter ?: new OutputFormatter();
-        $this->formatter->setDecorated($decorated);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(OutputFormatterInterface $formatter)
-    {
-        $this->formatter = $formatter;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        return $this->formatter;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecorated($decorated)
-    {
-        $this->formatter->setDecorated($decorated);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isDecorated()
-    {
-        return $this->formatter->isDecorated();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setVerbosity($level)
-    {
-        $this->verbosity = (int) $level;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVerbosity()
-    {
-        return $this->verbosity;
-    }
-
-    public function isQuiet()
-    {
-        return self::VERBOSITY_QUIET === $this->verbosity;
-    }
-
-    public function isVerbose()
-    {
-        return self::VERBOSITY_VERBOSE <= $this->verbosity;
-    }
-
-    public function isVeryVerbose()
-    {
-        return self::VERBOSITY_VERY_VERBOSE <= $this->verbosity;
-    }
-
-    public function isDebug()
-    {
-        return self::VERBOSITY_DEBUG <= $this->verbosity;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL)
-    {
-        $this->write($messages, true, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
-    {
-        if (self::VERBOSITY_QUIET === $this->verbosity) {
-            return;
-        }
-
-        $messages = (array) $messages;
-
-        foreach ($messages as $message) {
-            switch ($type) {
-                case OutputInterface::OUTPUT_NORMAL:
-                    $message = $this->formatter->format($message);
-                    break;
-                case OutputInterface::OUTPUT_RAW:
-                    break;
-                case OutputInterface::OUTPUT_PLAIN:
-                    $message = strip_tags($this->formatter->format($message));
-                    break;
-                default:
-                    throw new \InvalidArgumentException(sprintf('Unknown output type given (%s)', $type));
-            }
-
-            $this->doWrite($message, $newline);
-        }
-    }
-
-    /**
-     * Writes a message to the output.
-     *
-     * @param string $message A message to write to the output
-     * @param bool   $newline Whether to add a newline or not
-     */
-    abstract protected function doWrite($message, $newline);
-}
diff --git a/vendor/symfony/console/Output/OutputInterface.php b/vendor/symfony/console/Output/OutputInterface.php
deleted file mode 100644
index 9a956e2..0000000
--- a/vendor/symfony/console/Output/OutputInterface.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\Console\Output;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-
-/**
- * OutputInterface is the interface implemented by all Output classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface OutputInterface
-{
-    const VERBOSITY_QUIET = 0;
-    const VERBOSITY_NORMAL = 1;
-    const VERBOSITY_VERBOSE = 2;
-    const VERBOSITY_VERY_VERBOSE = 3;
-    const VERBOSITY_DEBUG = 4;
-
-    const OUTPUT_NORMAL = 0;
-    const OUTPUT_RAW = 1;
-    const OUTPUT_PLAIN = 2;
-
-    /**
-     * Writes a message to the output.
-     *
-     * @param string|array $messages The message as an array of lines or a single string
-     * @param bool         $newline  Whether to add a newline
-     * @param int          $type     The type of output (one of the OUTPUT constants)
-     *
-     * @throws \InvalidArgumentException When unknown output type is given
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL);
-
-    /**
-     * Writes a message to the output and adds a newline at the end.
-     *
-     * @param string|array $messages The message as an array of lines or a single string
-     * @param int          $type     The type of output (one of the OUTPUT constants)
-     *
-     * @throws \InvalidArgumentException When unknown output type is given
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL);
-
-    /**
-     * Sets the verbosity of the output.
-     *
-     * @param int $level The level of verbosity (one of the VERBOSITY constants)
-     */
-    public function setVerbosity($level);
-
-    /**
-     * Gets the current verbosity of the output.
-     *
-     * @return int The current level of verbosity (one of the VERBOSITY constants)
-     */
-    public function getVerbosity();
-
-    /**
-     * Sets the decorated flag.
-     *
-     * @param bool $decorated Whether to decorate the messages
-     */
-    public function setDecorated($decorated);
-
-    /**
-     * Gets the decorated flag.
-     *
-     * @return bool true if the output will decorate messages, false otherwise
-     */
-    public function isDecorated();
-
-    /**
-     * Sets output formatter.
-     *
-     * @param OutputFormatterInterface $formatter
-     */
-    public function setFormatter(OutputFormatterInterface $formatter);
-
-    /**
-     * Returns current output formatter instance.
-     *
-     * @return OutputFormatterInterface
-     */
-    public function getFormatter();
-}
diff --git a/vendor/symfony/console/Output/StreamOutput.php b/vendor/symfony/console/Output/StreamOutput.php
deleted file mode 100644
index a1facda..0000000
--- a/vendor/symfony/console/Output/StreamOutput.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\Console\Output;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-
-/**
- * StreamOutput writes the output to a given stream.
- *
- * Usage:
- *
- * $output = new StreamOutput(fopen('php://stdout', 'w'));
- *
- * As `StreamOutput` can use any stream, you can also use a file:
- *
- * $output = new StreamOutput(fopen('/path/to/output.log', 'a', false));
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class StreamOutput extends Output
-{
-    private $stream;
-
-    /**
-     * Constructor.
-     *
-     * @param resource                      $stream    A stream resource
-     * @param int                           $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface)
-     * @param bool|null                     $decorated Whether to decorate messages (null for auto-guessing)
-     * @param OutputFormatterInterface|null $formatter Output formatter instance (null to use default OutputFormatter)
-     *
-     * @throws \InvalidArgumentException When first argument is not a real stream
-     */
-    public function __construct($stream, $verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
-    {
-        if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) {
-            throw new \InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');
-        }
-
-        $this->stream = $stream;
-
-        if (null === $decorated) {
-            $decorated = $this->hasColorSupport();
-        }
-
-        parent::__construct($verbosity, $decorated, $formatter);
-    }
-
-    /**
-     * Gets the stream attached to this StreamOutput instance.
-     *
-     * @return resource A stream resource
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doWrite($message, $newline)
-    {
-        if (false === @fwrite($this->stream, $message.($newline ? PHP_EOL : ''))) {
-            // should never happen
-            throw new \RuntimeException('Unable to write output.');
-        }
-
-        fflush($this->stream);
-    }
-
-    /**
-     * Returns true if the stream supports colorization.
-     *
-     * Colorization is disabled if not supported by the stream:
-     *
-     *  -  Windows without Ansicon, ConEmu or Mintty
-     *  -  non tty consoles
-     *
-     * @return bool true if the stream supports colorization, false otherwise
-     */
-    protected function hasColorSupport()
-    {
-        if (DIRECTORY_SEPARATOR === '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM');
-        }
-
-        return function_exists('posix_isatty') && @posix_isatty($this->stream);
-    }
-}
diff --git a/vendor/symfony/console/Question/ChoiceQuestion.php b/vendor/symfony/console/Question/ChoiceQuestion.php
deleted file mode 100644
index a36c739..0000000
--- a/vendor/symfony/console/Question/ChoiceQuestion.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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\Component\Console\Question;
-
-/**
- * Represents a choice question.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ChoiceQuestion extends Question
-{
-    private $choices;
-    private $multiselect = false;
-    private $prompt = ' > ';
-    private $errorMessage = 'Value "%s" is invalid';
-
-    /**
-     * Constructor.
-     *
-     * @param string $question The question to ask to the user
-     * @param array  $choices  The list of available choices
-     * @param mixed  $default  The default answer to return
-     */
-    public function __construct($question, array $choices, $default = null)
-    {
-        parent::__construct($question, $default);
-
-        $this->choices = $choices;
-        $this->setValidator($this->getDefaultValidator());
-        $this->setAutocompleterValues($choices);
-    }
-
-    /**
-     * Returns available choices.
-     *
-     * @return array
-     */
-    public function getChoices()
-    {
-        return $this->choices;
-    }
-
-    /**
-     * Sets multiselect option.
-     *
-     * When multiselect is set to true, multiple choices can be answered.
-     *
-     * @param bool $multiselect
-     *
-     * @return ChoiceQuestion The current instance
-     */
-    public function setMultiselect($multiselect)
-    {
-        $this->multiselect = $multiselect;
-        $this->setValidator($this->getDefaultValidator());
-
-        return $this;
-    }
-
-    /**
-     * Gets the prompt for choices.
-     *
-     * @return string
-     */
-    public function getPrompt()
-    {
-        return $this->prompt;
-    }
-
-    /**
-     * Sets the prompt for choices.
-     *
-     * @param string $prompt
-     *
-     * @return ChoiceQuestion The current instance
-     */
-    public function setPrompt($prompt)
-    {
-        $this->prompt = $prompt;
-
-        return $this;
-    }
-
-    /**
-     * Sets the error message for invalid values.
-     *
-     * The error message has a string placeholder (%s) for the invalid value.
-     *
-     * @param string $errorMessage
-     *
-     * @return ChoiceQuestion The current instance
-     */
-    public function setErrorMessage($errorMessage)
-    {
-        $this->errorMessage = $errorMessage;
-        $this->setValidator($this->getDefaultValidator());
-
-        return $this;
-    }
-
-    /**
-     * Returns the default answer validator.
-     *
-     * @return callable
-     */
-    private function getDefaultValidator()
-    {
-        $choices = $this->choices;
-        $errorMessage = $this->errorMessage;
-        $multiselect = $this->multiselect;
-        $isAssoc = $this->isAssoc($choices);
-
-        return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
-            // Collapse all spaces.
-            $selectedChoices = str_replace(' ', '', $selected);
-
-            if ($multiselect) {
-                // Check for a separated comma values
-                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
-                    throw new \InvalidArgumentException(sprintf($errorMessage, $selected));
-                }
-                $selectedChoices = explode(',', $selectedChoices);
-            } else {
-                $selectedChoices = array($selected);
-            }
-
-            $multiselectChoices = array();
-            foreach ($selectedChoices as $value) {
-                $results = array();
-                foreach ($choices as $key => $choice) {
-                    if ($choice === $value) {
-                        $results[] = $key;
-                    }
-                }
-
-                if (count($results) > 1) {
-                    throw new \InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results)));
-                }
-
-                $result = array_search($value, $choices);
-
-                if (!$isAssoc) {
-                    if (false !== $result) {
-                        $result = $choices[$result];
-                    } elseif (isset($choices[$value])) {
-                        $result = $choices[$value];
-                    }
-                } elseif (false === $result && isset($choices[$value])) {
-                    $result = $value;
-                }
-
-                if (false === $result) {
-                    throw new \InvalidArgumentException(sprintf($errorMessage, $value));
-                }
-
-                $multiselectChoices[] = (string) $result;
-            }
-
-            if ($multiselect) {
-                return $multiselectChoices;
-            }
-
-            return current($multiselectChoices);
-        };
-    }
-}
diff --git a/vendor/symfony/console/Question/ConfirmationQuestion.php b/vendor/symfony/console/Question/ConfirmationQuestion.php
deleted file mode 100644
index 29d9887..0000000
--- a/vendor/symfony/console/Question/ConfirmationQuestion.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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\Component\Console\Question;
-
-/**
- * Represents a yes/no question.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ConfirmationQuestion extends Question
-{
-    private $trueAnswerRegex;
-
-    /**
-     * Constructor.
-     *
-     * @param string $question        The question to ask to the user
-     * @param bool   $default         The default answer to return, true or false
-     * @param string $trueAnswerRegex A regex to match the "yes" answer
-     */
-    public function __construct($question, $default = true, $trueAnswerRegex = '/^y/i')
-    {
-        parent::__construct($question, (bool) $default);
-
-        $this->trueAnswerRegex = $trueAnswerRegex;
-        $this->setNormalizer($this->getDefaultNormalizer());
-    }
-
-    /**
-     * Returns the default answer normalizer.
-     *
-     * @return callable
-     */
-    private function getDefaultNormalizer()
-    {
-        $default = $this->getDefault();
-        $regex = $this->trueAnswerRegex;
-
-        return function ($answer) use ($default, $regex) {
-            if (is_bool($answer)) {
-                return $answer;
-            }
-
-            $answerIsTrue = (bool) preg_match($regex, $answer);
-            if (false === $default) {
-                return $answer && $answerIsTrue;
-            }
-
-            return !$answer || $answerIsTrue;
-        };
-    }
-}
diff --git a/vendor/symfony/console/Question/Question.php b/vendor/symfony/console/Question/Question.php
deleted file mode 100644
index ffe9417..0000000
--- a/vendor/symfony/console/Question/Question.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?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\Component\Console\Question;
-
-/**
- * Represents a Question.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Question
-{
-    private $question;
-    private $attempts;
-    private $hidden = false;
-    private $hiddenFallback = true;
-    private $autocompleterValues;
-    private $validator;
-    private $default;
-    private $normalizer;
-
-    /**
-     * Constructor.
-     *
-     * @param string $question The question to ask to the user
-     * @param mixed  $default  The default answer to return if the user enters nothing
-     */
-    public function __construct($question, $default = null)
-    {
-        $this->question = $question;
-        $this->default = $default;
-    }
-
-    /**
-     * Returns the question.
-     *
-     * @return string
-     */
-    public function getQuestion()
-    {
-        return $this->question;
-    }
-
-    /**
-     * Returns the default answer.
-     *
-     * @return mixed
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * Returns whether the user response must be hidden.
-     *
-     * @return bool
-     */
-    public function isHidden()
-    {
-        return $this->hidden;
-    }
-
-    /**
-     * Sets whether the user response must be hidden or not.
-     *
-     * @param bool $hidden
-     *
-     * @return Question The current instance
-     *
-     * @throws \LogicException In case the autocompleter is also used
-     */
-    public function setHidden($hidden)
-    {
-        if ($this->autocompleterValues) {
-            throw new \LogicException('A hidden question cannot use the autocompleter.');
-        }
-
-        $this->hidden = (bool) $hidden;
-
-        return $this;
-    }
-
-    /**
-     * In case the response can not be hidden, whether to fallback on non-hidden question or not.
-     *
-     * @return bool
-     */
-    public function isHiddenFallback()
-    {
-        return $this->hiddenFallback;
-    }
-
-    /**
-     * Sets whether to fallback on non-hidden question if the response can not be hidden.
-     *
-     * @param bool $fallback
-     *
-     * @return Question The current instance
-     */
-    public function setHiddenFallback($fallback)
-    {
-        $this->hiddenFallback = (bool) $fallback;
-
-        return $this;
-    }
-
-    /**
-     * Gets values for the autocompleter.
-     *
-     * @return null|array|\Traversable
-     */
-    public function getAutocompleterValues()
-    {
-        return $this->autocompleterValues;
-    }
-
-    /**
-     * Sets values for the autocompleter.
-     *
-     * @param null|array|\Traversable $values
-     *
-     * @return Question The current instance
-     *
-     * @throws \InvalidArgumentException
-     * @throws \LogicException
-     */
-    public function setAutocompleterValues($values)
-    {
-        if (is_array($values) && $this->isAssoc($values)) {
-            $values = array_merge(array_keys($values), array_values($values));
-        }
-
-        if (null !== $values && !is_array($values)) {
-            if (!$values instanceof \Traversable || $values instanceof \Countable) {
-                throw new \InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.');
-            }
-        }
-
-        if ($this->hidden) {
-            throw new \LogicException('A hidden question cannot use the autocompleter.');
-        }
-
-        $this->autocompleterValues = $values;
-
-        return $this;
-    }
-
-    /**
-     * Sets a validator for the question.
-     *
-     * @param null|callable $validator
-     *
-     * @return Question The current instance
-     */
-    public function setValidator($validator)
-    {
-        $this->validator = $validator;
-
-        return $this;
-    }
-
-    /**
-     * Gets the validator for the question.
-     *
-     * @return null|callable
-     */
-    public function getValidator()
-    {
-        return $this->validator;
-    }
-
-    /**
-     * Sets the maximum number of attempts.
-     *
-     * Null means an unlimited number of attempts.
-     *
-     * @param null|int $attempts
-     *
-     * @return Question The current instance
-     *
-     * @throws \InvalidArgumentException In case the number of attempts is invalid.
-     */
-    public function setMaxAttempts($attempts)
-    {
-        if (null !== $attempts && $attempts < 1) {
-            throw new \InvalidArgumentException('Maximum number of attempts must be a positive value.');
-        }
-
-        $this->attempts = $attempts;
-
-        return $this;
-    }
-
-    /**
-     * Gets the maximum number of attempts.
-     *
-     * Null means an unlimited number of attempts.
-     *
-     * @return null|int
-     */
-    public function getMaxAttempts()
-    {
-        return $this->attempts;
-    }
-
-    /**
-     * Sets a normalizer for the response.
-     *
-     * The normalizer can be a callable (a string), a closure or a class implementing __invoke.
-     *
-     * @param callable $normalizer
-     *
-     * @return Question The current instance
-     */
-    public function setNormalizer($normalizer)
-    {
-        $this->normalizer = $normalizer;
-
-        return $this;
-    }
-
-    /**
-     * Gets the normalizer for the response.
-     *
-     * The normalizer can ba a callable (a string), a closure or a class implementing __invoke.
-     *
-     * @return callable
-     */
-    public function getNormalizer()
-    {
-        return $this->normalizer;
-    }
-
-    protected function isAssoc($array)
-    {
-        return (bool) count(array_filter(array_keys($array), 'is_string'));
-    }
-}
diff --git a/vendor/symfony/console/README.md b/vendor/symfony/console/README.md
deleted file mode 100644
index 25f700c..0000000
--- a/vendor/symfony/console/README.md
+++ /dev/null
@@ -1,67 +0,0 @@
-Console Component
-=================
-
-Console eases the creation of beautiful and testable command line interfaces.
-
-The Application object manages the CLI application:
-
-```php
-use Symfony\Component\Console\Application;
-
-$console = new Application();
-$console->run();
-```
-
-The ``run()`` method parses the arguments and options passed on the command
-line and executes the right command.
-
-Registering a new command can easily be done via the ``register()`` method,
-which returns a ``Command`` instance:
-
-```php
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-$console
-    ->register('ls')
-    ->setDefinition(array(
-        new InputArgument('dir', InputArgument::REQUIRED, 'Directory name'),
-    ))
-    ->setDescription('Displays the files in the given directory')
-    ->setCode(function (InputInterface $input, OutputInterface $output) {
-        $dir = $input->getArgument('dir');
-
-        $output->writeln(sprintf('Dir listing for <info>%s</info>', $dir));
-    })
-;
-```
-
-You can also register new commands via classes.
-
-The component provides a lot of features like output coloring, input and
-output abstractions (so that you can easily unit-test your commands),
-validation, automatic help messages, ...
-
-Tests
------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Console/
-    $ composer install
-    $ phpunit
-
-Third Party
------------
-
-`Resources/bin/hiddeninput.exe` is a third party binary provided within this
-component. Find sources and license at https://github.com/Seldaek/hidden-input.
-
-Resources
----------
-
-[The Console Component](https://symfony.com/doc/current/components/console.html)
-
-[How to create a Console Command](https://symfony.com/doc/current/cookbook/console/console_command.html)
diff --git a/vendor/symfony/console/Resources/bin/hiddeninput.exe b/vendor/symfony/console/Resources/bin/hiddeninput.exe
deleted file mode 100644
index c8cf65e..0000000
--- a/vendor/symfony/console/Resources/bin/hiddeninput.exe
+++ /dev/null
@@ -1,21 +0,0 @@
-MZ����@���	�!�
L�!This program cannot be run in DOS mode.

-$�,�;�B�;�B�;�B�2�מ:�B�2���-�B�2�ƞ9�B�2�ў?�B�a9�8�B�;�C��B�2�Ȟ:�B�2�֞:�B�2�Ӟ:�B�Rich;�B�PEL
�MoO�

	
-8 @`?�@��"P@ Pp
!8!@ �.text	
- `.rdata�	 
-@@.data�0@�.rsrc @@@.reloc�
P"@Bj$��@�xj�� @�e����E�PV� @�EЃ��PV� @�M��X @�e��E�P�5H @�L @YY�5\ @�E�P�5` @�D @YY���P @�M���M��T @3��H�;
0@u���h�@��l3@�$40@�5h3@�40@h$0@h(0@h 0@�� @���00@��}j�Y�jh"@�3ۉ]�d��p�]俀3@SVW�0 @;�t;�u3�F�u��h��4 @��3�F�|3@;�u
-j�\Y�;�|3@��u,�5|3@h� @h� @�YY��t�E����������5<0@�|3@;�uh� @h� @�lYY�|3@9]�uSW�8 @9�3@th�3@�Y��t
-SjS��3@�$0@�
� @�
�5$0@�5(0@�5 0@�������80@9,0@u7P�� @�E��	�M�PQ�YYËe�E�80@3�9,0@uP�h @9<0@u�� @�E������80@��øMZf9@t3��M�<@��@�8PEu��H��
t��uՃ��v�3�9����xtv�3�9������j
�,0@�p @j��l @YY��3@��3@�� @�
t3@��� @�
p3@��� @��x3@�V��=0@uh�@�� @Y�g�=0@�u	j��� @Y3���{������U���(�H1@�
D1@�@1@�<1@�581@�=41@f�`1@f�
T1@f�01@f�,1@f�%(1@f�-$1@��X1@�E�L1@�E�P1@�E�\1@��������0@

�P1@�L0@�@0@	��D0@
�0@�������0@������� @��0@j
�?Yj�  @h!@�$ @�=�0@uj
�Yh	��( @P�, @��U��E��8csm�u*�xu$�@= �t=!�t="�t=@�
u��3�]�hH@�  @3���%� @jh("@�b�5�3@�5� @��Y�E���u�u�� @Y�gj�Y�e��5�3@�։E��5�3@��YY�E��E�P�E�P�u�5l @��YP�U�E��u��֣�3@�u��փ���3@�E������	�E���j�YË�U���u�N��������YH]Ë�V��!@��!@W��;�s���t�Ѓ�;�r�_^Ë�V�"@�"@W��;�s���t�Ѓ�;�r�_^��%� @���̋�U��M�MZf9
t3�]ËA<��8PEu�3ҹ
f9H�‹�]�����������̋�U��E�H<��ASV�q3�W�D��v�}�H;�r	�X�;�r
-B��(;�r�3�_^[]������������̋�U��j�hH"@he@d�P��SVW�0@1E�3�P�E�d��e��E�h@�*�������tU�E-@Ph@�P�������t;�@$���Ѓ�
�E������M�d�
Y_^[��]ËE��
3�=��‹�Ëe��E�����3��M�d�
Y_^[��]���%� @�%� @��he@d�5�D$�l$�l$+�SVW�0@1E�3�P�e��u��E��E������E��E�d�ËM�d�
Y__^[��]Q�U���u�u�u�uh�@h0@����]�Vhh
3�V������t
VVVVV����^�3��U����0@�e��e�SW�N�@����;�t
��t	�У0@�`V�E�P�< @�u�3u�� @3�� @3�� @3��E�P� @�E�3E�3�;�u�O�@����u������50@�։50@^_[���%t @�%x @�%| @�%� @�%� @�%� @�%� @�%� @�%� @Pd�5�D$+d$SVW�(��0@3�P�E��u��E������E�d�ËM�d�
Y__^[��]QËM�3�����������M��%T @�T$�B�J�3������J�3������l"@�s����#�#�#�)r)b)H)4))�(�(�(�(�(�(�)�#�$%�%&d&�&�$('�'�'�'�'(((6(�'H(Z(t(�('''�'�'l'^'R'F'>'>(0'�'�)�@W@�@�MoOl�!�@0@�0@bad allocationH0@�!@RSDSь���
J�!���LZ
c:\users\seld\documents\visual studio 2010\Projects\hiddeninp\Release\hiddeninp.pdbe�������������@@������������:@�������������@�@�����@"�
d"@
�"�# $#�&D H#(h �#�#�#�)r)b)H)4))�(�(�(�(�(�(�)�#�$%�%&d&�&�$('�'�'�'�'(((6(�'H(Z(t(�('''�'�'l'^'R'F'>'>(0'�'�)�
GetConsoleMode�SetConsoleMode;GetStdHandleKERNEL32.dll??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z�?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@AJ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A�??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z??6?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEAAV01@P6AAAV01@AAV01@@Z@Z_??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ{
??0?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ�?endl@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@AAV21@@ZMSVCP90.dll
_amsg_exit�__getmainargs,
_cexit|
_exitf_XcptFilter�exit�__initenv_initterm_initterm_e<
_configthreadlocale�__setusermatherr
_adjust_fdiv�__p__commode�__p__fmodej
_encode_pointer�__set_app_typeK
_crt_debugger_hookC?terminate@@YAXXZMSVCR90.dll�_unlock�__dllonexitv_lock_onexit`
_decode_pointers
_except_handler4_common_invoke_watson?
_controlfp_s�InterlockedExchange!Sleep�InterlockedCompareExchange-TerminateProcess�
GetCurrentProcess>UnhandledExceptionFilterSetUnhandledExceptionFilter�IsDebuggerPresentTQueryPerformanceCounterfGetTickCount�
GetCurrentThreadId�
GetCurrentProcessIdOGetSystemTimeAsFileTimes__CxxFrameHandler3N�@���D������������
$!@ �8�

P�

h�
	�
	��@(��CV�(4VS_VERSION_INFO���



�
StringFileInfob
040904b0�Q
FileDescriptionReads from stdin without leaking info to the terminal and outputs back to stdout6
FileVersion1, 0, 0, 08
InternalNamehiddeninputP
LegalCopyrightJordi Boggiano - 2012H
OriginalFilenamehiddeninput.exe:

ProductNameHidden Input:
ProductVersion1, 0, 0, 0D
VarFileInfo$Translation	�<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-</assembly>PAPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDINGPADDINGXXPADDING@
00!0/080F0L0T0^0d0n0{0�0�0�0�0�0�0�0�0�0�0�0�0�01#1-1@1J1O1T1v1{1�1�1�1�1�1�1�1�1�1�1�1�1�1�12"2*23292A2M2_2j2p2�2�2�2�2�2�2�2�2�2�2�2333%303N3T3Z3`3f3l3s3z3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�3�34444%4;4B4�4�4�4�4�4�4�4�4�4�45!5^5c5�5�5�5H6M6_6}6�6�677
7*7w7|7�7�7�7�78
88=8E8P8V8\8b8h8n8t8z8�8�8�89 $�0�0�01 1t1x12 2@2\2`2h2t200
\ No newline at end of file
diff --git a/vendor/symfony/console/Shell.php b/vendor/symfony/console/Shell.php
deleted file mode 100644
index eaaadfd..0000000
--- a/vendor/symfony/console/Shell.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?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\Component\Console;
-
-use Symfony\Component\Console\Input\StringInput;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Process\ProcessBuilder;
-use Symfony\Component\Process\PhpExecutableFinder;
-
-/**
- * A Shell wraps an Application to add shell capabilities to it.
- *
- * Support for history and completion only works with a PHP compiled
- * with readline support (either --with-readline or --with-libedit)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Shell
-{
-    private $application;
-    private $history;
-    private $output;
-    private $hasReadline;
-    private $processIsolation = false;
-
-    /**
-     * Constructor.
-     *
-     * If there is no readline support for the current PHP executable
-     * a \RuntimeException exception is thrown.
-     *
-     * @param Application $application An application instance
-     */
-    public function __construct(Application $application)
-    {
-        $this->hasReadline = function_exists('readline');
-        $this->application = $application;
-        $this->history = getenv('HOME').'/.history_'.$application->getName();
-        $this->output = new ConsoleOutput();
-    }
-
-    /**
-     * Runs the shell.
-     */
-    public function run()
-    {
-        $this->application->setAutoExit(false);
-        $this->application->setCatchExceptions(true);
-
-        if ($this->hasReadline) {
-            readline_read_history($this->history);
-            readline_completion_function(array($this, 'autocompleter'));
-        }
-
-        $this->output->writeln($this->getHeader());
-        $php = null;
-        if ($this->processIsolation) {
-            $finder = new PhpExecutableFinder();
-            $php = $finder->find();
-            $this->output->writeln(<<<EOF
-<info>Running with process isolation, you should consider this:</info>
-  * each command is executed as separate process,
-  * commands don't support interactivity, all params must be passed explicitly,
-  * commands output is not colorized.
-
-EOF
-            );
-        }
-
-        while (true) {
-            $command = $this->readline();
-
-            if (false === $command) {
-                $this->output->writeln("\n");
-
-                break;
-            }
-
-            if ($this->hasReadline) {
-                readline_add_history($command);
-                readline_write_history($this->history);
-            }
-
-            if ($this->processIsolation) {
-                $pb = new ProcessBuilder();
-
-                $process = $pb
-                    ->add($php)
-                    ->add($_SERVER['argv'][0])
-                    ->add($command)
-                    ->inheritEnvironmentVariables(true)
-                    ->getProcess()
-                ;
-
-                $output = $this->output;
-                $process->run(function ($type, $data) use ($output) {
-                    $output->writeln($data);
-                });
-
-                $ret = $process->getExitCode();
-            } else {
-                $ret = $this->application->run(new StringInput($command), $this->output);
-            }
-
-            if (0 !== $ret) {
-                $this->output->writeln(sprintf('<error>The command terminated with an error status (%s)</error>', $ret));
-            }
-        }
-    }
-
-    /**
-     * Returns the shell header.
-     *
-     * @return string The header string
-     */
-    protected function getHeader()
-    {
-        return <<<EOF
-
-Welcome to the <info>{$this->application->getName()}</info> shell (<comment>{$this->application->getVersion()}</comment>).
-
-At the prompt, type <comment>help</comment> for some help,
-or <comment>list</comment> to get a list of available commands.
-
-To exit the shell, type <comment>^D</comment>.
-
-EOF;
-    }
-
-    /**
-     * Renders a prompt.
-     *
-     * @return string The prompt
-     */
-    protected function getPrompt()
-    {
-        // using the formatter here is required when using readline
-        return $this->output->getFormatter()->format($this->application->getName().' > ');
-    }
-
-    protected function getOutput()
-    {
-        return $this->output;
-    }
-
-    protected function getApplication()
-    {
-        return $this->application;
-    }
-
-    /**
-     * Tries to return autocompletion for the current entered text.
-     *
-     * @param string $text The last segment of the entered text
-     *
-     * @return bool|array A list of guessed strings or true
-     */
-    private function autocompleter($text)
-    {
-        $info = readline_info();
-        $text = substr($info['line_buffer'], 0, $info['end']);
-
-        if ($info['point'] !== $info['end']) {
-            return true;
-        }
-
-        // task name?
-        if (false === strpos($text, ' ') || !$text) {
-            return array_keys($this->application->all());
-        }
-
-        // options and arguments?
-        try {
-            $command = $this->application->find(substr($text, 0, strpos($text, ' ')));
-        } catch (\Exception $e) {
-            return true;
-        }
-
-        $list = array('--help');
-        foreach ($command->getDefinition()->getOptions() as $option) {
-            $list[] = '--'.$option->getName();
-        }
-
-        return $list;
-    }
-
-    /**
-     * Reads a single line from standard input.
-     *
-     * @return string The single line from standard input
-     */
-    private function readline()
-    {
-        if ($this->hasReadline) {
-            $line = readline($this->getPrompt());
-        } else {
-            $this->output->write($this->getPrompt());
-            $line = fgets(STDIN, 1024);
-            $line = (false === $line || '' === $line) ? false : rtrim($line);
-        }
-
-        return $line;
-    }
-
-    public function getProcessIsolation()
-    {
-        return $this->processIsolation;
-    }
-
-    public function setProcessIsolation($processIsolation)
-    {
-        $this->processIsolation = (bool) $processIsolation;
-
-        if ($this->processIsolation && !class_exists('Symfony\\Component\\Process\\Process')) {
-            throw new \RuntimeException('Unable to isolate processes as the Symfony Process Component is not installed.');
-        }
-    }
-}
diff --git a/vendor/symfony/console/Style/OutputStyle.php b/vendor/symfony/console/Style/OutputStyle.php
deleted file mode 100644
index 8371bb5..0000000
--- a/vendor/symfony/console/Style/OutputStyle.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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\Component\Console\Style;
-
-use Symfony\Component\Console\Formatter\OutputFormatterInterface;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Decorates output to add console style guide helpers.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-abstract class OutputStyle implements OutputInterface, StyleInterface
-{
-    private $output;
-
-    /**
-     * @param OutputInterface $output
-     */
-    public function __construct(OutputInterface $output)
-    {
-        $this->output = $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function newLine($count = 1)
-    {
-        $this->output->write(str_repeat(PHP_EOL, $count));
-    }
-
-    /**
-     * @param int $max
-     *
-     * @return ProgressBar
-     */
-    public function createProgressBar($max = 0)
-    {
-        return new ProgressBar($this->output, $max);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
-    {
-        $this->output->write($messages, $newline, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL)
-    {
-        $this->output->writeln($messages, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setVerbosity($level)
-    {
-        $this->output->setVerbosity($level);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVerbosity()
-    {
-        return $this->output->getVerbosity();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecorated($decorated)
-    {
-        $this->output->setDecorated($decorated);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isDecorated()
-    {
-        return $this->output->isDecorated();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(OutputFormatterInterface $formatter)
-    {
-        $this->output->setFormatter($formatter);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        return $this->output->getFormatter();
-    }
-}
diff --git a/vendor/symfony/console/Style/StyleInterface.php b/vendor/symfony/console/Style/StyleInterface.php
deleted file mode 100644
index 2448547..0000000
--- a/vendor/symfony/console/Style/StyleInterface.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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\Component\Console\Style;
-
-/**
- * Output style helpers.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-interface StyleInterface
-{
-    /**
-     * Formats a command title.
-     *
-     * @param string $message
-     */
-    public function title($message);
-
-    /**
-     * Formats a section title.
-     *
-     * @param string $message
-     */
-    public function section($message);
-
-    /**
-     * Formats a list.
-     *
-     * @param array $elements
-     */
-    public function listing(array $elements);
-
-    /**
-     * Formats informational text.
-     *
-     * @param string|array $message
-     */
-    public function text($message);
-
-    /**
-     * Formats a success result bar.
-     *
-     * @param string|array $message
-     */
-    public function success($message);
-
-    /**
-     * Formats an error result bar.
-     *
-     * @param string|array $message
-     */
-    public function error($message);
-
-    /**
-     * Formats an warning result bar.
-     *
-     * @param string|array $message
-     */
-    public function warning($message);
-
-    /**
-     * Formats a note admonition.
-     *
-     * @param string|array $message
-     */
-    public function note($message);
-
-    /**
-     * Formats a caution admonition.
-     *
-     * @param string|array $message
-     */
-    public function caution($message);
-
-    /**
-     * Formats a table.
-     *
-     * @param array $headers
-     * @param array $rows
-     */
-    public function table(array $headers, array $rows);
-
-    /**
-     * Asks a question.
-     *
-     * @param string        $question
-     * @param string|null   $default
-     * @param callable|null $validator
-     *
-     * @return string
-     */
-    public function ask($question, $default = null, $validator = null);
-
-    /**
-     * Asks a question with the user input hidden.
-     *
-     * @param string        $question
-     * @param callable|null $validator
-     *
-     * @return string
-     */
-    public function askHidden($question, $validator = null);
-
-    /**
-     * Asks for confirmation.
-     *
-     * @param string $question
-     * @param bool   $default
-     *
-     * @return bool
-     */
-    public function confirm($question, $default = true);
-
-    /**
-     * Asks a choice question.
-     *
-     * @param string          $question
-     * @param array           $choices
-     * @param string|int|null $default
-     *
-     * @return string
-     */
-    public function choice($question, array $choices, $default = null);
-
-    /**
-     * Add newline(s).
-     *
-     * @param int $count The number of newlines
-     */
-    public function newLine($count = 1);
-
-    /**
-     * Starts the progress output.
-     *
-     * @param int $max Maximum steps (0 if unknown)
-     */
-    public function progressStart($max = 0);
-
-    /**
-     * Advances the progress output X steps.
-     *
-     * @param int $step Number of steps to advance
-     */
-    public function progressAdvance($step = 1);
-
-    /**
-     * Finishes the progress output.
-     */
-    public function progressFinish();
-}
diff --git a/vendor/symfony/console/Style/SymfonyStyle.php b/vendor/symfony/console/Style/SymfonyStyle.php
deleted file mode 100644
index 6e9c64f..0000000
--- a/vendor/symfony/console/Style/SymfonyStyle.php
+++ /dev/null
@@ -1,406 +0,0 @@
-<?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\Component\Console\Style;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Formatter\OutputFormatter;
-use Symfony\Component\Console\Helper\Helper;
-use Symfony\Component\Console\Helper\ProgressBar;
-use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Question\Question;
-
-/**
- * Output decorator helpers for the Symfony Style Guide.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-class SymfonyStyle extends OutputStyle
-{
-    const MAX_LINE_LENGTH = 120;
-
-    private $input;
-    private $questionHelper;
-    private $progressBar;
-    private $lineLength;
-    private $bufferedOutput;
-
-    /**
-     * @param InputInterface  $input
-     * @param OutputInterface $output
-     */
-    public function __construct(InputInterface $input, OutputInterface $output)
-    {
-        $this->input = $input;
-        $this->bufferedOutput = new BufferedOutput($output->getVerbosity(), false, clone $output->getFormatter());
-        // Windows cmd wraps lines as soon as the terminal width is reached, whether there are following chars or not.
-        $this->lineLength = min($this->getTerminalWidth() - (int) (DIRECTORY_SEPARATOR === '\\'), self::MAX_LINE_LENGTH);
-
-        parent::__construct($output);
-    }
-
-    /**
-     * Formats a message as a block of text.
-     *
-     * @param string|array $messages The message to write in the block
-     * @param string|null  $type     The block type (added in [] on first line)
-     * @param string|null  $style    The style to apply to the whole block
-     * @param string       $prefix   The prefix for the block
-     * @param bool         $padding  Whether to add vertical padding
-     */
-    public function block($messages, $type = null, $style = null, $prefix = ' ', $padding = false)
-    {
-        $this->autoPrependBlock();
-        $messages = is_array($messages) ? array_values($messages) : array($messages);
-        $lines = array();
-
-        // add type
-        if (null !== $type) {
-            $messages[0] = sprintf('[%s] %s', $type, $messages[0]);
-        }
-
-        // wrap and add newlines for each element
-        foreach ($messages as $key => $message) {
-            $message = OutputFormatter::escape($message);
-            $lines = array_merge($lines, explode(PHP_EOL, wordwrap($message, $this->lineLength - Helper::strlen($prefix), PHP_EOL, true)));
-
-            if (count($messages) > 1 && $key < count($messages) - 1) {
-                $lines[] = '';
-            }
-        }
-
-        if ($padding && $this->isDecorated()) {
-            array_unshift($lines, '');
-            $lines[] = '';
-        }
-
-        foreach ($lines as &$line) {
-            $line = sprintf('%s%s', $prefix, $line);
-            $line .= str_repeat(' ', $this->lineLength - Helper::strlenWithoutDecoration($this->getFormatter(), $line));
-
-            if ($style) {
-                $line = sprintf('<%s>%s</>', $style, $line);
-            }
-        }
-
-        $this->writeln($lines);
-        $this->newLine();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function title($message)
-    {
-        $this->autoPrependBlock();
-        $this->writeln(array(
-            sprintf('<comment>%s</>', $message),
-            sprintf('<comment>%s</>', str_repeat('=', strlen($message))),
-        ));
-        $this->newLine();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function section($message)
-    {
-        $this->autoPrependBlock();
-        $this->writeln(array(
-            sprintf('<comment>%s</>', $message),
-            sprintf('<comment>%s</>', str_repeat('-', strlen($message))),
-        ));
-        $this->newLine();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function listing(array $elements)
-    {
-        $this->autoPrependText();
-        $elements = array_map(function ($element) {
-            return sprintf(' * %s', $element);
-        }, $elements);
-
-        $this->writeln($elements);
-        $this->newLine();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function text($message)
-    {
-        $this->autoPrependText();
-
-        if (!is_array($message)) {
-            $this->writeln(sprintf(' // %s', $message));
-
-            return;
-        }
-
-        foreach ($message as $element) {
-            $this->text($element);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function success($message)
-    {
-        $this->block($message, 'OK', 'fg=black;bg=green', ' ', true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function error($message)
-    {
-        $this->block($message, 'ERROR', 'fg=white;bg=red', ' ', true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function warning($message)
-    {
-        $this->block($message, 'WARNING', 'fg=white;bg=red', ' ', true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function note($message)
-    {
-        $this->block($message, 'NOTE', 'fg=yellow', ' ! ');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function caution($message)
-    {
-        $this->block($message, 'CAUTION', 'fg=white;bg=red', ' ! ', true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function table(array $headers, array $rows)
-    {
-        $headers = array_map(function ($value) { return sprintf('<info>%s</>', $value); }, $headers);
-
-        $table = new Table($this);
-        $table->setHeaders($headers);
-        $table->setRows($rows);
-        $table->setStyle('symfony-style-guide');
-
-        $table->render();
-        $this->newLine();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function ask($question, $default = null, $validator = null)
-    {
-        $question = new Question($question, $default);
-        $question->setValidator($validator);
-
-        return $this->askQuestion($question);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function askHidden($question, $validator = null)
-    {
-        $question = new Question($question);
-
-        $question->setHidden(true);
-        $question->setValidator($validator);
-
-        return $this->askQuestion($question);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function confirm($question, $default = true)
-    {
-        return $this->askQuestion(new ConfirmationQuestion($question, $default));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function choice($question, array $choices, $default = null)
-    {
-        if (null !== $default) {
-            $values = array_flip($choices);
-            $default = $values[$default];
-        }
-
-        return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function progressStart($max = 0)
-    {
-        $this->progressBar = $this->createProgressBar($max);
-        $this->progressBar->start();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function progressAdvance($step = 1)
-    {
-        $this->getProgressBar()->advance($step);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function progressFinish()
-    {
-        $this->getProgressBar()->finish();
-        $this->newLine(2);
-        $this->progressBar = null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createProgressBar($max = 0)
-    {
-        $progressBar = parent::createProgressBar($max);
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
-            $progressBar->setProgressCharacter('');
-            $progressBar->setBarCharacter('▓'); // dark shade character \u2593
-        }
-
-        return $progressBar;
-    }
-
-    /**
-     * @param Question $question
-     *
-     * @return string
-     */
-    public function askQuestion(Question $question)
-    {
-        if ($this->input->isInteractive()) {
-            $this->autoPrependBlock();
-        }
-
-        if (!$this->questionHelper) {
-            $this->questionHelper = new SymfonyQuestionHelper();
-        }
-
-        $answer = $this->questionHelper->ask($this->input, $this, $question);
-
-        if ($this->input->isInteractive()) {
-            $this->newLine();
-            $this->bufferedOutput->write("\n");
-        }
-
-        return $answer;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeln($messages, $type = self::OUTPUT_NORMAL)
-    {
-        parent::writeln($messages, $type);
-        $this->bufferedOutput->writeln($this->reduceBuffer($messages), $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
-    {
-        parent::write($messages, $newline, $type);
-        $this->bufferedOutput->write($this->reduceBuffer($messages), $newline, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function newLine($count = 1)
-    {
-        parent::newLine($count);
-        $this->bufferedOutput->write(str_repeat("\n", $count));
-    }
-
-    /**
-     * @return ProgressBar
-     */
-    private function getProgressBar()
-    {
-        if (!$this->progressBar) {
-            throw new \RuntimeException('The ProgressBar is not started.');
-        }
-
-        return $this->progressBar;
-    }
-
-    private function getTerminalWidth()
-    {
-        $application = new Application();
-        $dimensions = $application->getTerminalDimensions();
-
-        return $dimensions[0] ?: self::MAX_LINE_LENGTH;
-    }
-
-    private function autoPrependBlock()
-    {
-        $chars = substr(str_replace(PHP_EOL, "\n", $this->bufferedOutput->fetch()), -2);
-
-        if (!isset($chars[0])) {
-            return $this->newLine(); //empty history, so we should start with a new line.
-        }
-        //Prepend new line for each non LF chars (This means no blank line was output before)
-        $this->newLine(2 - substr_count($chars, "\n"));
-    }
-
-    private function autoPrependText()
-    {
-        $fetched = $this->bufferedOutput->fetch();
-        //Prepend new line if last char isn't EOL:
-        if ("\n" !== substr($fetched, -1)) {
-            $this->newLine();
-        }
-    }
-
-    private function reduceBuffer($messages)
-    {
-        // We need to know if the two last chars are PHP_EOL
-        // Preserve the last 4 chars inserted (PHP_EOL on windows is two chars) in the history buffer
-        return array_map(function ($value) {
-            return substr($value, -4);
-        }, array_merge(array($this->bufferedOutput->fetch()), (array) $messages));
-    }
-}
diff --git a/vendor/symfony/console/Tester/ApplicationTester.php b/vendor/symfony/console/Tester/ApplicationTester.php
deleted file mode 100644
index da8a19c..0000000
--- a/vendor/symfony/console/Tester/ApplicationTester.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?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\Component\Console\Tester;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\StreamOutput;
-
-/**
- * Eases the testing of console applications.
- *
- * When testing an application, don't forget to disable the auto exit flag:
- *
- *     $application = new Application();
- *     $application->setAutoExit(false);
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ApplicationTester
-{
-    private $application;
-    private $input;
-    private $output;
-    private $statusCode;
-
-    /**
-     * Constructor.
-     *
-     * @param Application $application An Application instance to test.
-     */
-    public function __construct(Application $application)
-    {
-        $this->application = $application;
-    }
-
-    /**
-     * Executes the application.
-     *
-     * Available options:
-     *
-     *  * interactive: Sets the input interactive flag
-     *  * decorated:   Sets the output decorated flag
-     *  * verbosity:   Sets the output verbosity flag
-     *
-     * @param array $input   An array of arguments and options
-     * @param array $options An array of options
-     *
-     * @return int The command exit code
-     */
-    public function run(array $input, $options = array())
-    {
-        $this->input = new ArrayInput($input);
-        if (isset($options['interactive'])) {
-            $this->input->setInteractive($options['interactive']);
-        }
-
-        $this->output = new StreamOutput(fopen('php://memory', 'w', false));
-        if (isset($options['decorated'])) {
-            $this->output->setDecorated($options['decorated']);
-        }
-        if (isset($options['verbosity'])) {
-            $this->output->setVerbosity($options['verbosity']);
-        }
-
-        return $this->statusCode = $this->application->run($this->input, $this->output);
-    }
-
-    /**
-     * Gets the display returned by the last execution of the application.
-     *
-     * @param bool $normalize Whether to normalize end of lines to \n or not
-     *
-     * @return string The display
-     */
-    public function getDisplay($normalize = false)
-    {
-        rewind($this->output->getStream());
-
-        $display = stream_get_contents($this->output->getStream());
-
-        if ($normalize) {
-            $display = str_replace(PHP_EOL, "\n", $display);
-        }
-
-        return $display;
-    }
-
-    /**
-     * Gets the input instance used by the last execution of the application.
-     *
-     * @return InputInterface The current input instance
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Gets the output instance used by the last execution of the application.
-     *
-     * @return OutputInterface The current output instance
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-    /**
-     * Gets the status code returned by the last execution of the application.
-     *
-     * @return int The status code
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-}
diff --git a/vendor/symfony/console/Tester/CommandTester.php b/vendor/symfony/console/Tester/CommandTester.php
deleted file mode 100644
index 8d6486e..0000000
--- a/vendor/symfony/console/Tester/CommandTester.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?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\Component\Console\Tester;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\StreamOutput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Eases the testing of console commands.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class CommandTester
-{
-    private $command;
-    private $input;
-    private $output;
-    private $statusCode;
-
-    /**
-     * Constructor.
-     *
-     * @param Command $command A Command instance to test.
-     */
-    public function __construct(Command $command)
-    {
-        $this->command = $command;
-    }
-
-    /**
-     * Executes the command.
-     *
-     * Available execution options:
-     *
-     *  * interactive: Sets the input interactive flag
-     *  * decorated:   Sets the output decorated flag
-     *  * verbosity:   Sets the output verbosity flag
-     *
-     * @param array $input   An array of command arguments and options
-     * @param array $options An array of execution options
-     *
-     * @return int The command exit code
-     */
-    public function execute(array $input, array $options = array())
-    {
-        // set the command name automatically if the application requires
-        // this argument and no command name was passed
-        if (!isset($input['command'])
-            && (null !== $application = $this->command->getApplication())
-            && $application->getDefinition()->hasArgument('command')
-        ) {
-            $input = array_merge(array('command' => $this->command->getName()), $input);
-        }
-
-        $this->input = new ArrayInput($input);
-        if (isset($options['interactive'])) {
-            $this->input->setInteractive($options['interactive']);
-        }
-
-        $this->output = new StreamOutput(fopen('php://memory', 'w', false));
-        if (isset($options['decorated'])) {
-            $this->output->setDecorated($options['decorated']);
-        }
-        if (isset($options['verbosity'])) {
-            $this->output->setVerbosity($options['verbosity']);
-        }
-
-        return $this->statusCode = $this->command->run($this->input, $this->output);
-    }
-
-    /**
-     * Gets the display returned by the last execution of the command.
-     *
-     * @param bool $normalize Whether to normalize end of lines to \n or not
-     *
-     * @return string The display
-     */
-    public function getDisplay($normalize = false)
-    {
-        rewind($this->output->getStream());
-
-        $display = stream_get_contents($this->output->getStream());
-
-        if ($normalize) {
-            $display = str_replace(PHP_EOL, "\n", $display);
-        }
-
-        return $display;
-    }
-
-    /**
-     * Gets the input instance used by the last execution of the command.
-     *
-     * @return InputInterface The current input instance
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Gets the output instance used by the last execution of the command.
-     *
-     * @return OutputInterface The current output instance
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-    /**
-     * Gets the status code returned by the last execution of the application.
-     *
-     * @return int The status code
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-}
diff --git a/vendor/symfony/console/composer.json b/vendor/symfony/console/composer.json
deleted file mode 100644
index 38903ab..0000000
--- a/vendor/symfony/console/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "symfony/console",
-    "type": "library",
-    "description": "Symfony Console Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/event-dispatcher": "~2.1",
-        "symfony/process": "~2.1",
-        "psr/log": "~1.0"
-    },
-    "suggest": {
-        "symfony/event-dispatcher": "",
-        "symfony/process": "",
-        "psr/log": "For using the console logger"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Console\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/console/phpunit.xml.dist b/vendor/symfony/console/phpunit.xml.dist
deleted file mode 100644
index ae0dcbe..0000000
--- a/vendor/symfony/console/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Console Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/css-selector/.gitignore b/vendor/symfony/css-selector/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/css-selector/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/css-selector/CHANGELOG.md b/vendor/symfony/css-selector/CHANGELOG.md
deleted file mode 100644
index be10abe..0000000
--- a/vendor/symfony/css-selector/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-CHANGELOG
-=========
-
-2.1.0
------
-
- * none
diff --git a/vendor/symfony/css-selector/CssSelector.php b/vendor/symfony/css-selector/CssSelector.php
deleted file mode 100644
index 579700a..0000000
--- a/vendor/symfony/css-selector/CssSelector.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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\Component\CssSelector;
-
-use Symfony\Component\CssSelector\Parser\Shortcut\ClassParser;
-use Symfony\Component\CssSelector\Parser\Shortcut\ElementParser;
-use Symfony\Component\CssSelector\Parser\Shortcut\EmptyStringParser;
-use Symfony\Component\CssSelector\Parser\Shortcut\HashParser;
-use Symfony\Component\CssSelector\XPath\Extension\HtmlExtension;
-use Symfony\Component\CssSelector\XPath\Translator;
-
-/**
- * CssSelector is the main entry point of the component and can convert CSS
- * selectors to XPath expressions.
- *
- * $xpath = CssSelector::toXpath('h1.foo');
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS
- * for more details.
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 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.
- *
- * 3. Neither the name of Ian Bicking 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 IAN BICKING 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.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class CssSelector
-{
-    private static $html = true;
-
-    /**
-     * Translates a CSS expression to its XPath equivalent.
-     * Optionally, a prefix can be added to the resulting XPath
-     * expression with the $prefix parameter.
-     *
-     * @param mixed  $cssExpr The CSS expression.
-     * @param string $prefix  An optional prefix for the XPath expression.
-     *
-     * @return string
-     */
-    public static function toXPath($cssExpr, $prefix = 'descendant-or-self::')
-    {
-        $translator = new Translator();
-
-        if (self::$html) {
-            $translator->registerExtension(new HtmlExtension($translator));
-        }
-
-        $translator
-            ->registerParserShortcut(new EmptyStringParser())
-            ->registerParserShortcut(new ElementParser())
-            ->registerParserShortcut(new ClassParser())
-            ->registerParserShortcut(new HashParser())
-        ;
-
-        return $translator->cssToXPath($cssExpr, $prefix);
-    }
-
-    /**
-     * Enables the HTML extension.
-     */
-    public static function enableHtmlExtension()
-    {
-        self::$html = true;
-    }
-
-    /**
-     * Disables the HTML extension.
-     */
-    public static function disableHtmlExtension()
-    {
-        self::$html = false;
-    }
-}
diff --git a/vendor/symfony/css-selector/Exception/ExceptionInterface.php b/vendor/symfony/css-selector/Exception/ExceptionInterface.php
deleted file mode 100644
index e4c5ae1..0000000
--- a/vendor/symfony/css-selector/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\CssSelector\Exception;
-
-/**
- * Interface for exceptions.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/css-selector/Exception/ExpressionErrorException.php b/vendor/symfony/css-selector/Exception/ExpressionErrorException.php
deleted file mode 100644
index fd5deea..0000000
--- a/vendor/symfony/css-selector/Exception/ExpressionErrorException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\CssSelector\Exception;
-
-/**
- * ParseException is thrown when a CSS selector syntax is not valid.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class ExpressionErrorException extends ParseException
-{
-}
diff --git a/vendor/symfony/css-selector/Exception/InternalErrorException.php b/vendor/symfony/css-selector/Exception/InternalErrorException.php
deleted file mode 100644
index e60e5ed..0000000
--- a/vendor/symfony/css-selector/Exception/InternalErrorException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\CssSelector\Exception;
-
-/**
- * ParseException is thrown when a CSS selector syntax is not valid.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class InternalErrorException extends ParseException
-{
-}
diff --git a/vendor/symfony/css-selector/Exception/ParseException.php b/vendor/symfony/css-selector/Exception/ParseException.php
deleted file mode 100644
index 3b0b0ee..0000000
--- a/vendor/symfony/css-selector/Exception/ParseException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\CssSelector\Exception;
-
-/**
- * ParseException is thrown when a CSS selector syntax is not valid.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParseException extends \Exception implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/css-selector/Exception/SyntaxErrorException.php b/vendor/symfony/css-selector/Exception/SyntaxErrorException.php
deleted file mode 100644
index 418bc30..0000000
--- a/vendor/symfony/css-selector/Exception/SyntaxErrorException.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\CssSelector\Exception;
-
-use Symfony\Component\CssSelector\Parser\Token;
-
-/**
- * ParseException is thrown when a CSS selector syntax is not valid.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class SyntaxErrorException extends ParseException
-{
-    /**
-     * @param string $expectedValue
-     * @param Token  $foundToken
-     *
-     * @return SyntaxErrorException
-     */
-    public static function unexpectedToken($expectedValue, Token $foundToken)
-    {
-        return new self(sprintf('Expected %s, but %s found.', $expectedValue, $foundToken));
-    }
-
-    /**
-     * @param string $pseudoElement
-     * @param string $unexpectedLocation
-     *
-     * @return SyntaxErrorException
-     */
-    public static function pseudoElementFound($pseudoElement, $unexpectedLocation)
-    {
-        return new self(sprintf('Unexpected pseudo-element "::%s" found %s.', $pseudoElement, $unexpectedLocation));
-    }
-
-    /**
-     * @param int $position
-     *
-     * @return SyntaxErrorException
-     */
-    public static function unclosedString($position)
-    {
-        return new self(sprintf('Unclosed/invalid string at %s.', $position));
-    }
-
-    /**
-     * @return SyntaxErrorException
-     */
-    public static function nestedNot()
-    {
-        return new self('Got nested ::not().');
-    }
-
-    /**
-     * @return SyntaxErrorException
-     */
-    public static function stringAsFunctionArgument()
-    {
-        return new self('String not allowed as function argument.');
-    }
-}
diff --git a/vendor/symfony/css-selector/LICENSE b/vendor/symfony/css-selector/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/css-selector/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/css-selector/Node/AbstractNode.php b/vendor/symfony/css-selector/Node/AbstractNode.php
deleted file mode 100644
index b1c8e95..0000000
--- a/vendor/symfony/css-selector/Node/AbstractNode.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Abstract base node class.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-abstract class AbstractNode implements NodeInterface
-{
-    /**
-     * @var string
-     */
-    private $nodeName;
-
-    /**
-     * @return string
-     */
-    public function getNodeName()
-    {
-        if (null === $this->nodeName) {
-            $this->nodeName = preg_replace('~.*\\\\([^\\\\]+)Node$~', '$1', get_called_class());
-        }
-
-        return $this->nodeName;
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/AttributeNode.php b/vendor/symfony/css-selector/Node/AttributeNode.php
deleted file mode 100644
index b10a4dd..0000000
--- a/vendor/symfony/css-selector/Node/AttributeNode.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>[<namespace>|<attribute> <operator> <value>]" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class AttributeNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $namespace;
-
-    /**
-     * @var string
-     */
-    private $attribute;
-
-    /**
-     * @var string
-     */
-    private $operator;
-
-    /**
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $namespace
-     * @param string        $attribute
-     * @param string        $operator
-     * @param string        $value
-     */
-    public function __construct(NodeInterface $selector, $namespace, $attribute, $operator, $value)
-    {
-        $this->selector = $selector;
-        $this->namespace = $namespace;
-        $this->attribute = $attribute;
-        $this->operator = $operator;
-        $this->value = $value;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAttribute()
-    {
-        return $this->attribute;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOperator()
-    {
-        return $this->operator;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $attribute = $this->namespace ? $this->namespace.'|'.$this->attribute : $this->attribute;
-
-        return 'exists' === $this->operator
-            ? sprintf('%s[%s[%s]]', $this->getNodeName(), $this->selector, $attribute)
-            : sprintf("%s[%s[%s %s '%s']]", $this->getNodeName(), $this->selector, $attribute, $this->operator, $this->value);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/ClassNode.php b/vendor/symfony/css-selector/Node/ClassNode.php
deleted file mode 100644
index 544342f..0000000
--- a/vendor/symfony/css-selector/Node/ClassNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>.<name>" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class ClassNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $name
-     */
-    public function __construct(NodeInterface $selector, $name)
-    {
-        $this->selector = $selector;
-        $this->name = $name;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('%s[%s.%s]', $this->getNodeName(), $this->selector, $this->name);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/CombinedSelectorNode.php b/vendor/symfony/css-selector/Node/CombinedSelectorNode.php
deleted file mode 100644
index 6d00db4..0000000
--- a/vendor/symfony/css-selector/Node/CombinedSelectorNode.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a combined node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class CombinedSelectorNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $combinator;
-
-    /**
-     * @var NodeInterface
-     */
-    private $subSelector;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $combinator
-     * @param NodeInterface $subSelector
-     */
-    public function __construct(NodeInterface $selector, $combinator, NodeInterface $subSelector)
-    {
-        $this->selector = $selector;
-        $this->combinator = $combinator;
-        $this->subSelector = $subSelector;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCombinator()
-    {
-        return $this->combinator;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSubSelector()
-    {
-        return $this->subSelector;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $combinator = ' ' === $this->combinator ? '<followed>' : $this->combinator;
-
-        return sprintf('%s[%s %s %s]', $this->getNodeName(), $this->selector, $combinator, $this->subSelector);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/ElementNode.php b/vendor/symfony/css-selector/Node/ElementNode.php
deleted file mode 100644
index 71ef121..0000000
--- a/vendor/symfony/css-selector/Node/ElementNode.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<namespace>|<element>" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class ElementNode extends AbstractNode
-{
-    /**
-     * @var string|null
-     */
-    private $namespace;
-
-    /**
-     * @var string|null
-     */
-    private $element;
-
-    /**
-     * @param string|null $namespace
-     * @param string|null $element
-     */
-    public function __construct($namespace = null, $element = null)
-    {
-        $this->namespace = $namespace;
-        $this->element = $element;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getElement()
-    {
-        return $this->element;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return new Specificity(0, 0, $this->element ? 1 : 0);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $element = $this->element ?: '*';
-
-        return sprintf('%s[%s]', $this->getNodeName(), $this->namespace ? $this->namespace.'|'.$element : $element);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/FunctionNode.php b/vendor/symfony/css-selector/Node/FunctionNode.php
deleted file mode 100644
index f94af8d..0000000
--- a/vendor/symfony/css-selector/Node/FunctionNode.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-use Symfony\Component\CssSelector\Parser\Token;
-
-/**
- * Represents a "<selector>:<name>(<arguments>)" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class FunctionNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var Token[]
-     */
-    private $arguments;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $name
-     * @param Token[]       $arguments
-     */
-    public function __construct(NodeInterface $selector, $name, array $arguments = array())
-    {
-        $this->selector = $selector;
-        $this->name = strtolower($name);
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return Token[]
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $arguments = implode(', ', array_map(function (Token $token) {
-            return "'".$token->getValue()."'";
-        }, $this->arguments));
-
-        return sprintf('%s[%s:%s(%s)]', $this->getNodeName(), $this->selector, $this->name, $arguments ? '['.$arguments.']' : '');
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/HashNode.php b/vendor/symfony/css-selector/Node/HashNode.php
deleted file mode 100644
index ddbe764..0000000
--- a/vendor/symfony/css-selector/Node/HashNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>#<id>" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class HashNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $id;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $id
-     */
-    public function __construct(NodeInterface $selector, $id)
-    {
-        $this->selector = $selector;
-        $this->id = $id;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus(new Specificity(1, 0, 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('%s[%s#%s]', $this->getNodeName(), $this->selector, $this->id);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/NegationNode.php b/vendor/symfony/css-selector/Node/NegationNode.php
deleted file mode 100644
index 0fafb0a..0000000
--- a/vendor/symfony/css-selector/Node/NegationNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>:not(<identifier>)" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class NegationNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var NodeInterface
-     */
-    private $subSelector;
-
-    /**
-     * @param NodeInterface $selector
-     * @param NodeInterface $subSelector
-     */
-    public function __construct(NodeInterface $selector, NodeInterface $subSelector)
-    {
-        $this->selector = $selector;
-        $this->subSelector = $subSelector;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSubSelector()
-    {
-        return $this->subSelector;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus($this->subSelector->getSpecificity());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('%s[%s:not(%s)]', $this->getNodeName(), $this->selector, $this->subSelector);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/NodeInterface.php b/vendor/symfony/css-selector/Node/NodeInterface.php
deleted file mode 100644
index dd300e2..0000000
--- a/vendor/symfony/css-selector/Node/NodeInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Interface for nodes.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface NodeInterface
-{
-    /**
-     * Returns node's name.
-     *
-     * @return string
-     */
-    public function getNodeName();
-
-    /**
-     * Returns node's specificity.
-     *
-     * @return Specificity
-     */
-    public function getSpecificity();
-
-    /**
-     * Returns node's string representation.
-     *
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/vendor/symfony/css-selector/Node/PseudoNode.php b/vendor/symfony/css-selector/Node/PseudoNode.php
deleted file mode 100644
index 0e413ad..0000000
--- a/vendor/symfony/css-selector/Node/PseudoNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>:<identifier>" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class PseudoNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $identifier;
-
-    /**
-     * @param NodeInterface $selector
-     * @param string        $identifier
-     */
-    public function __construct(NodeInterface $selector, $identifier)
-    {
-        $this->selector = $selector;
-        $this->identifier = strtolower($identifier);
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getSelector()
-    {
-        return $this->selector;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIdentifier()
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->selector->getSpecificity()->plus(new Specificity(0, 1, 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('%s[%s:%s]', $this->getNodeName(), $this->selector, $this->identifier);
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/SelectorNode.php b/vendor/symfony/css-selector/Node/SelectorNode.php
deleted file mode 100644
index 4958da5..0000000
--- a/vendor/symfony/css-selector/Node/SelectorNode.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a "<selector>(::|:)<pseudoElement>" node.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class SelectorNode extends AbstractNode
-{
-    /**
-     * @var NodeInterface
-     */
-    private $tree;
-
-    /**
-     * @var null|string
-     */
-    private $pseudoElement;
-
-    /**
-     * @param NodeInterface $tree
-     * @param null|string   $pseudoElement
-     */
-    public function __construct(NodeInterface $tree, $pseudoElement = null)
-    {
-        $this->tree = $tree;
-        $this->pseudoElement = $pseudoElement ? strtolower($pseudoElement) : null;
-    }
-
-    /**
-     * @return NodeInterface
-     */
-    public function getTree()
-    {
-        return $this->tree;
-    }
-
-    /**
-     * @return null|string
-     */
-    public function getPseudoElement()
-    {
-        return $this->pseudoElement;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSpecificity()
-    {
-        return $this->tree->getSpecificity()->plus(new Specificity(0, 0, $this->pseudoElement ? 1 : 0));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return sprintf('%s[%s%s]', $this->getNodeName(), $this->tree, $this->pseudoElement ? '::'.$this->pseudoElement : '');
-    }
-}
diff --git a/vendor/symfony/css-selector/Node/Specificity.php b/vendor/symfony/css-selector/Node/Specificity.php
deleted file mode 100644
index 0ce0c3f..0000000
--- a/vendor/symfony/css-selector/Node/Specificity.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Component\CssSelector\Node;
-
-/**
- * Represents a node specificity.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @see http://www.w3.org/TR/selectors/#specificity
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Specificity
-{
-    const A_FACTOR = 100;
-    const B_FACTOR = 10;
-    const C_FACTOR = 1;
-
-    /**
-     * @var int
-     */
-    private $a;
-
-    /**
-     * @var int
-     */
-    private $b;
-
-    /**
-     * @var int
-     */
-    private $c;
-
-    /**
-     * Constructor.
-     *
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     */
-    public function __construct($a, $b, $c)
-    {
-        $this->a = $a;
-        $this->b = $b;
-        $this->c = $c;
-    }
-
-    /**
-     * @param Specificity $specificity
-     *
-     * @return Specificity
-     */
-    public function plus(Specificity $specificity)
-    {
-        return new self($this->a + $specificity->a, $this->b + $specificity->b, $this->c + $specificity->c);
-    }
-
-    /**
-     * Returns global specificity value.
-     *
-     * @return int
-     */
-    public function getValue()
-    {
-        return $this->a * self::A_FACTOR + $this->b * self::B_FACTOR + $this->c * self::C_FACTOR;
-    }
-
-    /**
-     * Returns -1 if the object specificity is lower than the argument,
-     * 0 if they are equal, and 1 if the argument is lower.
-     *
-     * @param Specificity $specificity
-     *
-     * @return int
-     */
-    public function compareTo(Specificity $specificity)
-    {
-        if ($this->a !== $specificity->a) {
-            return $this->a > $specificity->a ? 1 : -1;
-        }
-
-        if ($this->b !== $specificity->b) {
-            return $this->b > $specificity->b ? 1 : -1;
-        }
-
-        if ($this->c !== $specificity->c) {
-            return $this->c > $specificity->c ? 1 : -1;
-        }
-
-        return 0;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php b/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php
deleted file mode 100644
index f480776..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/CommentHandler.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-
-/**
- * CSS selector comment handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class CommentHandler implements HandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        if ('/*' !== $reader->getSubstring(2)) {
-            return false;
-        }
-
-        $offset = $reader->getOffset('*/');
-
-        if (false === $offset) {
-            $reader->moveToEnd();
-        } else {
-            $reader->moveForward($offset + 2);
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php b/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php
deleted file mode 100644
index 049ddd3..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/HandlerInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-
-/**
- * CSS selector handler interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface HandlerInterface
-{
-    /**
-     * @param Reader      $reader
-     * @param TokenStream $stream
-     *
-     * @return bool
-     */
-    public function handle(Reader $reader, TokenStream $stream);
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php b/vendor/symfony/css-selector/Parser/Handler/HashHandler.php
deleted file mode 100644
index b144223..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/HashHandler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
-
-/**
- * CSS selector comment handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class HashHandler implements HandlerInterface
-{
-    /**
-     * @var TokenizerPatterns
-     */
-    private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
-    private $escaping;
-
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        $match = $reader->findPattern($this->patterns->getHashPattern());
-
-        if (!$match) {
-            return false;
-        }
-
-        $value = $this->escaping->escapeUnicode($match[1]);
-        $stream->push(new Token(Token::TYPE_HASH, $value, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php b/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php
deleted file mode 100644
index 86739ea..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/IdentifierHandler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
-
-/**
- * CSS selector comment handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class IdentifierHandler implements HandlerInterface
-{
-    /**
-     * @var TokenizerPatterns
-     */
-    private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
-    private $escaping;
-
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        $match = $reader->findPattern($this->patterns->getIdentifierPattern());
-
-        if (!$match) {
-            return false;
-        }
-
-        $value = $this->escaping->escapeUnicode($match[0]);
-        $stream->push(new Token(Token::TYPE_IDENTIFIER, $value, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php b/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php
deleted file mode 100644
index 97a9387..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/NumberHandler.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
-
-/**
- * CSS selector comment handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class NumberHandler implements HandlerInterface
-{
-    /**
-     * @var TokenizerPatterns
-     */
-    private $patterns;
-
-    /**
-     * @param TokenizerPatterns $patterns
-     */
-    public function __construct(TokenizerPatterns $patterns)
-    {
-        $this->patterns = $patterns;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        $match = $reader->findPattern($this->patterns->getNumberPattern());
-
-        if (!$match) {
-            return false;
-        }
-
-        $stream->push(new Token(Token::TYPE_NUMBER, $match[0], $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php b/vendor/symfony/css-selector/Parser/Handler/StringHandler.php
deleted file mode 100644
index 9f7a594..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/StringHandler.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Exception\InternalErrorException;
-use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
-use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
-
-/**
- * CSS selector comment handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class StringHandler implements HandlerInterface
-{
-    /**
-     * @var TokenizerPatterns
-     */
-    private $patterns;
-
-    /**
-     * @var TokenizerEscaping
-     */
-    private $escaping;
-
-    /**
-     * @param TokenizerPatterns $patterns
-     * @param TokenizerEscaping $escaping
-     */
-    public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping)
-    {
-        $this->patterns = $patterns;
-        $this->escaping = $escaping;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        $quote = $reader->getSubstring(1);
-
-        if (!in_array($quote, array("'", '"'))) {
-            return false;
-        }
-
-        $reader->moveForward(1);
-        $match = $reader->findPattern($this->patterns->getQuotedStringPattern($quote));
-
-        if (!$match) {
-            throw new InternalErrorException(sprintf('Should have found at least an empty match at %s.', $reader->getPosition()));
-        }
-
-        // check unclosed strings
-        if (strlen($match[0]) === $reader->getRemainingLength()) {
-            throw SyntaxErrorException::unclosedString($reader->getPosition() - 1);
-        }
-
-        // check quotes pairs validity
-        if ($quote !== $reader->getSubstring(1, strlen($match[0]))) {
-            throw SyntaxErrorException::unclosedString($reader->getPosition() - 1);
-        }
-
-        $string = $this->escaping->escapeUnicodeAndNewLine($match[0]);
-        $stream->push(new Token(Token::TYPE_STRING, $string, $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]) + 1);
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php b/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php
deleted file mode 100644
index 234bbd8..0000000
--- a/vendor/symfony/css-selector/Parser/Handler/WhitespaceHandler.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\CssSelector\Parser\Handler;
-
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-
-/**
- * CSS selector whitespace handler.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class WhitespaceHandler implements HandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Reader $reader, TokenStream $stream)
-    {
-        $match = $reader->findPattern('~^[ \t\r\n\f]+~');
-
-        if (false === $match) {
-            return false;
-        }
-
-        $stream->push(new Token(Token::TYPE_WHITESPACE, $match[0], $reader->getPosition()));
-        $reader->moveForward(strlen($match[0]));
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Parser.php b/vendor/symfony/css-selector/Parser/Parser.php
deleted file mode 100644
index 9625e3e..0000000
--- a/vendor/symfony/css-selector/Parser/Parser.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?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\Component\CssSelector\Parser;
-
-use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
-use Symfony\Component\CssSelector\Node;
-use Symfony\Component\CssSelector\Parser\Tokenizer\Tokenizer;
-
-/**
- * CSS selector parser.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Parser implements ParserInterface
-{
-    /**
-     * @var Tokenizer
-     */
-    private $tokenizer;
-
-    /**
-     * Constructor.
-     *
-     * @param null|Tokenizer $tokenizer
-     */
-    public function __construct(Tokenizer $tokenizer = null)
-    {
-        $this->tokenizer = $tokenizer ?: new Tokenizer();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($source)
-    {
-        $reader = new Reader($source);
-        $stream = $this->tokenizer->tokenize($reader);
-
-        return $this->parseSelectorList($stream);
-    }
-
-    /**
-     * Parses the arguments for ":nth-child()" and friends.
-     *
-     * @param Token[] $tokens
-     *
-     * @throws SyntaxErrorException
-     *
-     * @return array
-     */
-    public static function parseSeries(array $tokens)
-    {
-        foreach ($tokens as $token) {
-            if ($token->isString()) {
-                throw SyntaxErrorException::stringAsFunctionArgument();
-            }
-        }
-
-        $joined = trim(implode('', array_map(function (Token $token) {
-            return $token->getValue();
-        }, $tokens)));
-
-        $int = function ($string) {
-            if (!is_numeric($string)) {
-                throw SyntaxErrorException::stringAsFunctionArgument();
-            }
-
-            return (int) $string;
-        };
-
-        switch (true) {
-            case 'odd' === $joined:
-                return array(2, 1);
-            case 'even' === $joined:
-                return array(2, 0);
-            case 'n' === $joined:
-                return array(1, 0);
-            case false === strpos($joined, 'n'):
-                return array(0, $int($joined));
-        }
-
-        $split = explode('n', $joined);
-        $first = isset($split[0]) ? $split[0] : null;
-
-        return array(
-            $first ? ('-' === $first || '+' === $first ? $int($first.'1') : $int($first)) : 1,
-            isset($split[1]) && $split[1] ? $int($split[1]) : 0,
-        );
-    }
-
-    /**
-     * Parses selector nodes.
-     *
-     * @param TokenStream $stream
-     *
-     * @return array
-     */
-    private function parseSelectorList(TokenStream $stream)
-    {
-        $stream->skipWhitespace();
-        $selectors = array();
-
-        while (true) {
-            $selectors[] = $this->parserSelectorNode($stream);
-
-            if ($stream->getPeek()->isDelimiter(array(','))) {
-                $stream->getNext();
-                $stream->skipWhitespace();
-            } else {
-                break;
-            }
-        }
-
-        return $selectors;
-    }
-
-    /**
-     * Parses next selector or combined node.
-     *
-     * @param TokenStream $stream
-     *
-     * @throws SyntaxErrorException
-     *
-     * @return Node\SelectorNode
-     */
-    private function parserSelectorNode(TokenStream $stream)
-    {
-        list($result, $pseudoElement) = $this->parseSimpleSelector($stream);
-
-        while (true) {
-            $stream->skipWhitespace();
-            $peek = $stream->getPeek();
-
-            if ($peek->isFileEnd() || $peek->isDelimiter(array(','))) {
-                break;
-            }
-
-            if (null !== $pseudoElement) {
-                throw SyntaxErrorException::pseudoElementFound($pseudoElement, 'not at the end of a selector');
-            }
-
-            if ($peek->isDelimiter(array('+', '>', '~'))) {
-                $combinator = $stream->getNext()->getValue();
-                $stream->skipWhitespace();
-            } else {
-                $combinator = ' ';
-            }
-
-            list($nextSelector, $pseudoElement) = $this->parseSimpleSelector($stream);
-            $result = new Node\CombinedSelectorNode($result, $combinator, $nextSelector);
-        }
-
-        return new Node\SelectorNode($result, $pseudoElement);
-    }
-
-    /**
-     * Parses next simple node (hash, class, pseudo, negation).
-     *
-     * @param TokenStream $stream
-     * @param bool        $insideNegation
-     *
-     * @throws SyntaxErrorException
-     *
-     * @return array
-     */
-    private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)
-    {
-        $stream->skipWhitespace();
-
-        $selectorStart = count($stream->getUsed());
-        $result = $this->parseElementNode($stream);
-        $pseudoElement = null;
-
-        while (true) {
-            $peek = $stream->getPeek();
-            if ($peek->isWhitespace()
-                || $peek->isFileEnd()
-                || $peek->isDelimiter(array(',', '+', '>', '~'))
-                || ($insideNegation && $peek->isDelimiter(array(')')))
-            ) {
-                break;
-            }
-
-            if (null !== $pseudoElement) {
-                throw SyntaxErrorException::pseudoElementFound($pseudoElement, 'not at the end of a selector');
-            }
-
-            if ($peek->isHash()) {
-                $result = new Node\HashNode($result, $stream->getNext()->getValue());
-            } elseif ($peek->isDelimiter(array('.'))) {
-                $stream->getNext();
-                $result = new Node\ClassNode($result, $stream->getNextIdentifier());
-            } elseif ($peek->isDelimiter(array('['))) {
-                $stream->getNext();
-                $result = $this->parseAttributeNode($result, $stream);
-            } elseif ($peek->isDelimiter(array(':'))) {
-                $stream->getNext();
-
-                if ($stream->getPeek()->isDelimiter(array(':'))) {
-                    $stream->getNext();
-                    $pseudoElement = $stream->getNextIdentifier();
-
-                    continue;
-                }
-
-                $identifier = $stream->getNextIdentifier();
-                if (in_array(strtolower($identifier), array('first-line', 'first-letter', 'before', 'after'))) {
-                    // Special case: CSS 2.1 pseudo-elements can have a single ':'.
-                    // Any new pseudo-element must have two.
-                    $pseudoElement = $identifier;
-
-                    continue;
-                }
-
-                if (!$stream->getPeek()->isDelimiter(array('('))) {
-                    $result = new Node\PseudoNode($result, $identifier);
-
-                    continue;
-                }
-
-                $stream->getNext();
-                $stream->skipWhitespace();
-
-                if ('not' === strtolower($identifier)) {
-                    if ($insideNegation) {
-                        throw SyntaxErrorException::nestedNot();
-                    }
-
-                    list($argument, $argumentPseudoElement) = $this->parseSimpleSelector($stream, true);
-                    $next = $stream->getNext();
-
-                    if (null !== $argumentPseudoElement) {
-                        throw SyntaxErrorException::pseudoElementFound($argumentPseudoElement, 'inside ::not()');
-                    }
-
-                    if (!$next->isDelimiter(array(')'))) {
-                        throw SyntaxErrorException::unexpectedToken('")"', $next);
-                    }
-
-                    $result = new Node\NegationNode($result, $argument);
-                } else {
-                    $arguments = array();
-                    $next = null;
-
-                    while (true) {
-                        $stream->skipWhitespace();
-                        $next = $stream->getNext();
-
-                        if ($next->isIdentifier()
-                            || $next->isString()
-                            || $next->isNumber()
-                            || $next->isDelimiter(array('+', '-'))
-                        ) {
-                            $arguments[] = $next;
-                        } elseif ($next->isDelimiter(array(')'))) {
-                            break;
-                        } else {
-                            throw SyntaxErrorException::unexpectedToken('an argument', $next);
-                        }
-                    }
-
-                    if (empty($arguments)) {
-                        throw SyntaxErrorException::unexpectedToken('at least one argument', $next);
-                    }
-
-                    $result = new Node\FunctionNode($result, $identifier, $arguments);
-                }
-            } else {
-                throw SyntaxErrorException::unexpectedToken('selector', $peek);
-            }
-        }
-
-        if (count($stream->getUsed()) === $selectorStart) {
-            throw SyntaxErrorException::unexpectedToken('selector', $stream->getPeek());
-        }
-
-        return array($result, $pseudoElement);
-    }
-
-    /**
-     * Parses next element node.
-     *
-     * @param TokenStream $stream
-     *
-     * @return Node\ElementNode
-     */
-    private function parseElementNode(TokenStream $stream)
-    {
-        $peek = $stream->getPeek();
-
-        if ($peek->isIdentifier() || $peek->isDelimiter(array('*'))) {
-            if ($peek->isIdentifier()) {
-                $namespace = $stream->getNext()->getValue();
-            } else {
-                $stream->getNext();
-                $namespace = null;
-            }
-
-            if ($stream->getPeek()->isDelimiter(array('|'))) {
-                $stream->getNext();
-                $element = $stream->getNextIdentifierOrStar();
-            } else {
-                $element = $namespace;
-                $namespace = null;
-            }
-        } else {
-            $element = $namespace = null;
-        }
-
-        return new Node\ElementNode($namespace, $element);
-    }
-
-    /**
-     * Parses next attribute node.
-     *
-     * @param Node\NodeInterface $selector
-     * @param TokenStream        $stream
-     *
-     * @throws SyntaxErrorException
-     *
-     * @return Node\AttributeNode
-     */
-    private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)
-    {
-        $stream->skipWhitespace();
-        $attribute = $stream->getNextIdentifierOrStar();
-
-        if (null === $attribute && !$stream->getPeek()->isDelimiter(array('|'))) {
-            throw SyntaxErrorException::unexpectedToken('"|"', $stream->getPeek());
-        }
-
-        if ($stream->getPeek()->isDelimiter(array('|'))) {
-            $stream->getNext();
-
-            if ($stream->getPeek()->isDelimiter(array('='))) {
-                $namespace = null;
-                $stream->getNext();
-                $operator = '|=';
-            } else {
-                $namespace = $attribute;
-                $attribute = $stream->getNextIdentifier();
-                $operator = null;
-            }
-        } else {
-            $namespace = $operator = null;
-        }
-
-        if (null === $operator) {
-            $stream->skipWhitespace();
-            $next = $stream->getNext();
-
-            if ($next->isDelimiter(array(']'))) {
-                return new Node\AttributeNode($selector, $namespace, $attribute, 'exists', null);
-            } elseif ($next->isDelimiter(array('='))) {
-                $operator = '=';
-            } elseif ($next->isDelimiter(array('^', '$', '*', '~', '|', '!'))
-                && $stream->getPeek()->isDelimiter(array('='))
-            ) {
-                $operator = $next->getValue().'=';
-                $stream->getNext();
-            } else {
-                throw SyntaxErrorException::unexpectedToken('operator', $next);
-            }
-        }
-
-        $stream->skipWhitespace();
-        $value = $stream->getNext();
-
-        if ($value->isNumber()) {
-            // if the value is a number, it's casted into a string
-            $value = new Token(Token::TYPE_STRING, (string) $value->getValue(), $value->getPosition());
-        }
-
-        if (!($value->isIdentifier() || $value->isString())) {
-            throw SyntaxErrorException::unexpectedToken('string or identifier', $value);
-        }
-
-        $stream->skipWhitespace();
-        $next = $stream->getNext();
-
-        if (!$next->isDelimiter(array(']'))) {
-            throw SyntaxErrorException::unexpectedToken('"]"', $next);
-        }
-
-        return new Node\AttributeNode($selector, $namespace, $attribute, $operator, $value->getValue());
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/ParserInterface.php b/vendor/symfony/css-selector/Parser/ParserInterface.php
deleted file mode 100644
index 3b43a52..0000000
--- a/vendor/symfony/css-selector/Parser/ParserInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\CssSelector\Parser;
-
-use Symfony\Component\CssSelector\Node\SelectorNode;
-
-/**
- * CSS selector parser interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface ParserInterface
-{
-    /**
-     * Parses given selector source into an array of tokens.
-     *
-     * @param string $source
-     *
-     * @return SelectorNode[]
-     */
-    public function parse($source);
-}
diff --git a/vendor/symfony/css-selector/Parser/Reader.php b/vendor/symfony/css-selector/Parser/Reader.php
deleted file mode 100644
index ba2a7f0..0000000
--- a/vendor/symfony/css-selector/Parser/Reader.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Component\CssSelector\Parser;
-
-/**
- * CSS selector reader.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Reader
-{
-    /**
-     * @var string
-     */
-    private $source;
-
-    /**
-     * @var int
-     */
-    private $length;
-
-    /**
-     * @var int
-     */
-    private $position = 0;
-
-    /**
-     * @param string $source
-     */
-    public function __construct($source)
-    {
-        $this->source = $source;
-        $this->length = strlen($source);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEOF()
-    {
-        return $this->position >= $this->length;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPosition()
-    {
-        return $this->position;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRemainingLength()
-    {
-        return $this->length - $this->position;
-    }
-
-    /**
-     * @param int $length
-     * @param int $offset
-     *
-     * @return string
-     */
-    public function getSubstring($length, $offset = 0)
-    {
-        return substr($this->source, $this->position + $offset, $length);
-    }
-
-    /**
-     * @param string $string
-     *
-     * @return int
-     */
-    public function getOffset($string)
-    {
-        $position = strpos($this->source, $string, $this->position);
-
-        return false === $position ? false : $position - $this->position;
-    }
-
-    /**
-     * @param string $pattern
-     *
-     * @return bool
-     */
-    public function findPattern($pattern)
-    {
-        $source = substr($this->source, $this->position);
-
-        if (preg_match($pattern, $source, $matches)) {
-            return $matches;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param int $length
-     */
-    public function moveForward($length)
-    {
-        $this->position += $length;
-    }
-
-    /**
-     */
-    public function moveToEnd()
-    {
-        $this->position = $this->length;
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php
deleted file mode 100644
index 83f8d13..0000000
--- a/vendor/symfony/css-selector/Parser/Shortcut/ClassParser.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\CssSelector\Parser\Shortcut;
-
-use Symfony\Component\CssSelector\Node\ClassNode;
-use Symfony\Component\CssSelector\Node\ElementNode;
-use Symfony\Component\CssSelector\Node\SelectorNode;
-use Symfony\Component\CssSelector\Parser\ParserInterface;
-
-/**
- * CSS selector class parser shortcut.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class ClassParser implements ParserInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($source)
-    {
-        // Matches an optional namespace, optional element, and required class
-        // $source = 'test|input.ab6bd_field';
-        // $matches = array (size=4)
-        //     0 => string 'test|input.ab6bd_field' (length=22)
-        //     1 => string 'test' (length=4)
-        //     2 => string 'input' (length=5)
-        //     3 => string 'ab6bd_field' (length=11)
-        if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+\.([\w-]++)$/i', trim($source), $matches)) {
-            return array(
-                new SelectorNode(new ClassNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
-            );
-        }
-
-        return array();
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php b/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php
deleted file mode 100644
index 00e4435..0000000
--- a/vendor/symfony/css-selector/Parser/Shortcut/ElementParser.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\CssSelector\Parser\Shortcut;
-
-use Symfony\Component\CssSelector\Node\ElementNode;
-use Symfony\Component\CssSelector\Node\SelectorNode;
-use Symfony\Component\CssSelector\Parser\ParserInterface;
-
-/**
- * CSS selector element parser shortcut.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class ElementParser implements ParserInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($source)
-    {
-        // Matches an optional namespace, required element or `*`
-        // $source = 'testns|testel';
-        // $matches = array (size=3)
-        //     0 => string 'testns|testel' (length=13)
-        //     1 => string 'testns' (length=6)
-        //     2 => string 'testel' (length=6)
-        if (preg_match('/^(?:([a-z]++)\|)?([\w-]++|\*)$/i', trim($source), $matches)) {
-            return array(new SelectorNode(new ElementNode($matches[1] ?: null, $matches[2])));
-        }
-
-        return array();
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php b/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php
deleted file mode 100644
index 98a08fd..0000000
--- a/vendor/symfony/css-selector/Parser/Shortcut/EmptyStringParser.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\CssSelector\Parser\Shortcut;
-
-use Symfony\Component\CssSelector\Node\ElementNode;
-use Symfony\Component\CssSelector\Node\SelectorNode;
-use Symfony\Component\CssSelector\Parser\ParserInterface;
-
-/**
- * CSS selector class parser shortcut.
- *
- * This shortcut ensure compatibility with previous version.
- * - The parser fails to parse an empty string.
- * - In the previous version, an empty string matches each tags.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class EmptyStringParser implements ParserInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($source)
-    {
-        // Matches an empty string
-        if ($source == '') {
-            return array(new SelectorNode(new ElementNode(null, '*')));
-        }
-
-        return array();
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php b/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php
deleted file mode 100644
index 3dbad79..0000000
--- a/vendor/symfony/css-selector/Parser/Shortcut/HashParser.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\CssSelector\Parser\Shortcut;
-
-use Symfony\Component\CssSelector\Node\ElementNode;
-use Symfony\Component\CssSelector\Node\HashNode;
-use Symfony\Component\CssSelector\Node\SelectorNode;
-use Symfony\Component\CssSelector\Parser\ParserInterface;
-
-/**
- * CSS selector hash parser shortcut.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class HashParser implements ParserInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function parse($source)
-    {
-        // Matches an optional namespace, optional element, and required id
-        // $source = 'test|input#ab6bd_field';
-        // $matches = array (size=4)
-        //     0 => string 'test|input#ab6bd_field' (length=22)
-        //     1 => string 'test' (length=4)
-        //     2 => string 'input' (length=5)
-        //     3 => string 'ab6bd_field' (length=11)
-        if (preg_match('/^(?:([a-z]++)\|)?+([\w-]++|\*)?+#([\w-]++)$/i', trim($source), $matches)) {
-            return array(
-                new SelectorNode(new HashNode(new ElementNode($matches[1] ?: null, $matches[2] ?: null), $matches[3])),
-            );
-        }
-
-        return array();
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Token.php b/vendor/symfony/css-selector/Parser/Token.php
deleted file mode 100644
index 6f7586f..0000000
--- a/vendor/symfony/css-selector/Parser/Token.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?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\Component\CssSelector\Parser;
-
-/**
- * CSS selector token.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Token
-{
-    const TYPE_FILE_END = 'eof';
-    const TYPE_DELIMITER = 'delimiter';
-    const TYPE_WHITESPACE = 'whitespace';
-    const TYPE_IDENTIFIER = 'identifier';
-    const TYPE_HASH = 'hash';
-    const TYPE_NUMBER = 'number';
-    const TYPE_STRING = 'string';
-
-    /**
-     * @var int
-     */
-    private $type;
-
-    /**
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @var int
-     */
-    private $position;
-
-    /**
-     * @param int    $type
-     * @param string $value
-     * @param int    $position
-     */
-    public function __construct($type, $value, $position)
-    {
-        $this->type = $type;
-        $this->value = $value;
-        $this->position = $position;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPosition()
-    {
-        return $this->position;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFileEnd()
-    {
-        return self::TYPE_FILE_END === $this->type;
-    }
-
-    /**
-     * @param array $values
-     *
-     * @return bool
-     */
-    public function isDelimiter(array $values = array())
-    {
-        if (self::TYPE_DELIMITER !== $this->type) {
-            return false;
-        }
-
-        if (empty($values)) {
-            return true;
-        }
-
-        return in_array($this->value, $values);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isWhitespace()
-    {
-        return self::TYPE_WHITESPACE === $this->type;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isIdentifier()
-    {
-        return self::TYPE_IDENTIFIER === $this->type;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isHash()
-    {
-        return self::TYPE_HASH === $this->type;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNumber()
-    {
-        return self::TYPE_NUMBER === $this->type;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isString()
-    {
-        return self::TYPE_STRING === $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        if ($this->value) {
-            return sprintf('<%s "%s" at %s>', $this->type, $this->value, $this->position);
-        }
-
-        return sprintf('<%s at %s>', $this->type, $this->position);
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/TokenStream.php b/vendor/symfony/css-selector/Parser/TokenStream.php
deleted file mode 100644
index c0525d7..0000000
--- a/vendor/symfony/css-selector/Parser/TokenStream.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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\Component\CssSelector\Parser;
-
-use Symfony\Component\CssSelector\Exception\InternalErrorException;
-use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
-
-/**
- * CSS selector token stream.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class TokenStream
-{
-    /**
-     * @var Token[]
-     */
-    private $tokens = array();
-
-    /**
-     * @var bool
-     */
-    private $frozen = false;
-
-    /**
-     * @var Token[]
-     */
-    private $used = array();
-
-    /**
-     * @var int
-     */
-    private $cursor = 0;
-
-    /**
-     * @var Token|null
-     */
-    private $peeked = null;
-
-    /**
-     * @var bool
-     */
-    private $peeking = false;
-
-    /**
-     * Pushes a token.
-     *
-     * @param Token $token
-     *
-     * @return TokenStream
-     */
-    public function push(Token $token)
-    {
-        $this->tokens[] = $token;
-
-        return $this;
-    }
-
-    /**
-     * Freezes stream.
-     *
-     * @return TokenStream
-     */
-    public function freeze()
-    {
-        $this->frozen = true;
-
-        return $this;
-    }
-
-    /**
-     * Returns next token.
-     *
-     * @throws InternalErrorException If there is no more token
-     *
-     * @return Token
-     */
-    public function getNext()
-    {
-        if ($this->peeking) {
-            $this->peeking = false;
-            $this->used[] = $this->peeked;
-
-            return $this->peeked;
-        }
-
-        if (!isset($this->tokens[$this->cursor])) {
-            throw new InternalErrorException('Unexpected token stream end.');
-        }
-
-        return $this->tokens[$this->cursor++];
-    }
-
-    /**
-     * Returns peeked token.
-     *
-     * @return Token
-     */
-    public function getPeek()
-    {
-        if (!$this->peeking) {
-            $this->peeked = $this->getNext();
-            $this->peeking = true;
-        }
-
-        return $this->peeked;
-    }
-
-    /**
-     * Returns used tokens.
-     *
-     * @return Token[]
-     */
-    public function getUsed()
-    {
-        return $this->used;
-    }
-
-    /**
-     * Returns nex identifier token.
-     *
-     * @throws SyntaxErrorException If next token is not an identifier
-     *
-     * @return string The identifier token value
-     */
-    public function getNextIdentifier()
-    {
-        $next = $this->getNext();
-
-        if (!$next->isIdentifier()) {
-            throw SyntaxErrorException::unexpectedToken('identifier', $next);
-        }
-
-        return $next->getValue();
-    }
-
-    /**
-     * Returns nex identifier or star delimiter token.
-     *
-     * @throws SyntaxErrorException If next token is not an identifier or a star delimiter
-     *
-     * @return null|string The identifier token value or null if star found
-     */
-    public function getNextIdentifierOrStar()
-    {
-        $next = $this->getNext();
-
-        if ($next->isIdentifier()) {
-            return $next->getValue();
-        }
-
-        if ($next->isDelimiter(array('*'))) {
-            return;
-        }
-
-        throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);
-    }
-
-    /**
-     * Skips next whitespace if any.
-     */
-    public function skipWhitespace()
-    {
-        $peek = $this->getPeek();
-
-        if ($peek->isWhitespace()) {
-            $this->getNext();
-        }
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/Tokenizer.php b/vendor/symfony/css-selector/Parser/Tokenizer/Tokenizer.php
deleted file mode 100644
index 79fa7b7..0000000
--- a/vendor/symfony/css-selector/Parser/Tokenizer/Tokenizer.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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\Component\CssSelector\Parser\Tokenizer;
-
-use Symfony\Component\CssSelector\Parser\Handler;
-use Symfony\Component\CssSelector\Parser\Reader;
-use Symfony\Component\CssSelector\Parser\Token;
-use Symfony\Component\CssSelector\Parser\TokenStream;
-
-/**
- * CSS selector tokenizer.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Tokenizer
-{
-    /**
-     * @var Handler\HandlerInterface[]
-     */
-    private $handlers;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $patterns = new TokenizerPatterns();
-        $escaping = new TokenizerEscaping($patterns);
-
-        $this->handlers = array(
-            new Handler\WhitespaceHandler(),
-            new Handler\IdentifierHandler($patterns, $escaping),
-            new Handler\HashHandler($patterns, $escaping),
-            new Handler\StringHandler($patterns, $escaping),
-            new Handler\NumberHandler($patterns),
-            new Handler\CommentHandler(),
-        );
-    }
-
-    /**
-     * Tokenize selector source code.
-     *
-     * @param Reader $reader
-     *
-     * @return TokenStream
-     */
-    public function tokenize(Reader $reader)
-    {
-        $stream = new TokenStream();
-
-        while (!$reader->isEOF()) {
-            foreach ($this->handlers as $handler) {
-                if ($handler->handle($reader, $stream)) {
-                    continue 2;
-                }
-            }
-
-            $stream->push(new Token(Token::TYPE_DELIMITER, $reader->getSubstring(1), $reader->getPosition()));
-            $reader->moveForward(1);
-        }
-
-        return $stream
-            ->push(new Token(Token::TYPE_FILE_END, null, $reader->getPosition()))
-            ->freeze();
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php
deleted file mode 100644
index bf5096b..0000000
--- a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerEscaping.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\CssSelector\Parser\Tokenizer;
-
-/**
- * CSS selector tokenizer escaping applier.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class TokenizerEscaping
-{
-    /**
-     * @var TokenizerPatterns
-     */
-    private $patterns;
-
-    /**
-     * @param TokenizerPatterns $patterns
-     */
-    public function __construct(TokenizerPatterns $patterns)
-    {
-        $this->patterns = $patterns;
-    }
-
-    /**
-     * @param string $value
-     *
-     * @return string
-     */
-    public function escapeUnicode($value)
-    {
-        $value = $this->replaceUnicodeSequences($value);
-
-        return preg_replace($this->patterns->getSimpleEscapePattern(), '$1', $value);
-    }
-
-    /**
-     * @param string $value
-     *
-     * @return string
-     */
-    public function escapeUnicodeAndNewLine($value)
-    {
-        $value = preg_replace($this->patterns->getNewLineEscapePattern(), '', $value);
-
-        return $this->escapeUnicode($value);
-    }
-
-    /**
-     * @param string $value
-     *
-     * @return string
-     */
-    private function replaceUnicodeSequences($value)
-    {
-        return preg_replace_callback($this->patterns->getUnicodeEscapePattern(), function ($match) {
-            $c = hexdec($match[1]);
-
-            if (0x80 > $c %= 0x200000) {
-                return chr($c);
-            }
-            if (0x800 > $c) {
-                return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-            }
-            if (0x10000 > $c) {
-                return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-            }
-        }, $value);
-    }
-}
diff --git a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php b/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php
deleted file mode 100644
index 326f020..0000000
--- a/vendor/symfony/css-selector/Parser/Tokenizer/TokenizerPatterns.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?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\Component\CssSelector\Parser\Tokenizer;
-
-/**
- * CSS selector tokenizer patterns builder.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class TokenizerPatterns
-{
-    /**
-     * @var string
-     */
-    private $unicodeEscapePattern;
-
-    /**
-     * @var string
-     */
-    private $simpleEscapePattern;
-
-    /**
-     * @var string
-     */
-    private $newLineEscapePattern;
-
-    /**
-     * @var string
-     */
-    private $escapePattern;
-
-    /**
-     * @var string
-     */
-    private $stringEscapePattern;
-
-    /**
-     * @var string
-     */
-    private $nonAsciiPattern;
-
-    /**
-     * @var string
-     */
-    private $nmCharPattern;
-
-    /**
-     * @var string
-     */
-    private $nmStartPattern;
-
-    /**
-     * @var string
-     */
-    private $identifierPattern;
-
-    /**
-     * @var string
-     */
-    private $hashPattern;
-
-    /**
-     * @var string
-     */
-    private $numberPattern;
-
-    /**
-     * @var string
-     */
-    private $quotedStringPattern;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->unicodeEscapePattern = '\\\\([0-9a-f]{1,6})(?:\r\n|[ \n\r\t\f])?';
-        $this->simpleEscapePattern = '\\\\(.)';
-        $this->newLineEscapePattern = '\\\\(?:\n|\r\n|\r|\f)';
-        $this->escapePattern = $this->unicodeEscapePattern.'|\\\\[^\n\r\f0-9a-f]';
-        $this->stringEscapePattern = $this->newLineEscapePattern.'|'.$this->escapePattern;
-        $this->nonAsciiPattern = '[^\x00-\x7F]';
-        $this->nmCharPattern = '[_a-z0-9-]|'.$this->escapePattern.'|'.$this->nonAsciiPattern;
-        $this->nmStartPattern = '[_a-z]|'.$this->escapePattern.'|'.$this->nonAsciiPattern;
-        $this->identifierPattern = '(?:'.$this->nmStartPattern.')(?:'.$this->nmCharPattern.')*';
-        $this->hashPattern = '#((?:'.$this->nmCharPattern.')+)';
-        $this->numberPattern = '[+-]?(?:[0-9]*\.[0-9]+|[0-9]+)';
-        $this->quotedStringPattern = '([^\n\r\f%s]|'.$this->stringEscapePattern.')*';
-    }
-
-    /**
-     * @return string
-     */
-    public function getNewLineEscapePattern()
-    {
-        return '~^'.$this->newLineEscapePattern.'~';
-    }
-
-    /**
-     * @return string
-     */
-    public function getSimpleEscapePattern()
-    {
-        return '~^'.$this->simpleEscapePattern.'~';
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnicodeEscapePattern()
-    {
-        return '~^'.$this->unicodeEscapePattern.'~i';
-    }
-
-    /**
-     * @return string
-     */
-    public function getIdentifierPattern()
-    {
-        return '~^'.$this->identifierPattern.'~i';
-    }
-
-    /**
-     * @return string
-     */
-    public function getHashPattern()
-    {
-        return '~^'.$this->hashPattern.'~i';
-    }
-
-    /**
-     * @return string
-     */
-    public function getNumberPattern()
-    {
-        return '~^'.$this->numberPattern.'~';
-    }
-
-    /**
-     * @param string $quote
-     *
-     * @return string
-     */
-    public function getQuotedStringPattern($quote)
-    {
-        return '~^'.sprintf($this->quotedStringPattern, $quote).'~i';
-    }
-}
diff --git a/vendor/symfony/css-selector/README.md b/vendor/symfony/css-selector/README.md
deleted file mode 100644
index ffe6c89..0000000
--- a/vendor/symfony/css-selector/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-CssSelector Component
-=====================
-
-CssSelector converts CSS selectors to XPath expressions.
-
-The component only goal is to convert CSS selectors to their XPath
-equivalents:
-
-```php
-use Symfony\Component\CssSelector\CssSelector;
-
-print CssSelector::toXPath('div.item > h4 > a');
-```
-
-HTML and XML are different
---------------------------
-
-The `CssSelector` component comes with an `HTML` extension which is enabled by
-default. If you need to use this component with `XML` documents, you have to
-disable this `HTML` extension. That's because, `HTML` tag & attribute names
-are always lower-cased, but case-sensitive in `XML`:
-
-```php
-// disable `HTML` extension:
-CssSelector::disableHtmlExtension();
-
-// re-enable `HTML` extension:
-CssSelector::enableHtmlExtension();
-```
-
-When the `HTML` extension is enabled, tag names are lower-cased, attribute
-names are lower-cased, the following extra pseudo-classes are supported:
-`checked`, `link`, `disabled`, `enabled`, `selected`, `invalid`, `hover`,
-`visited`, and the `lang()` function is also added.
-
-Resources
----------
-
-This component is a port of the Python cssselect library
-[v0.7.1](https://github.com/SimonSapin/cssselect/releases/tag/v0.7.1),
-which is distributed under the BSD license.
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/CssSelector/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/css-selector/XPath/Extension/AbstractExtension.php b/vendor/symfony/css-selector/XPath/Extension/AbstractExtension.php
deleted file mode 100644
index c70609c..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/AbstractExtension.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-/**
- * XPath expression translator abstract extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-abstract class AbstractExtension implements ExtensionInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getNodeTranslators()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCombinationTranslators()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctionTranslators()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPseudoClassTranslators()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributeMatchingTranslators()
-    {
-        return array();
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php b/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
deleted file mode 100644
index cbe48c5..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/AttributeMatchingExtension.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\XPath\Translator;
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator attribute extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class AttributeMatchingExtension extends AbstractExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributeMatchingTranslators()
-    {
-        return array(
-            'exists' => array($this, 'translateExists'),
-            '=' => array($this, 'translateEquals'),
-            '~=' => array($this, 'translateIncludes'),
-            '|=' => array($this, 'translateDashMatch'),
-            '^=' => array($this, 'translatePrefixMatch'),
-            '$=' => array($this, 'translateSuffixMatch'),
-            '*=' => array($this, 'translateSubstringMatch'),
-            '!=' => array($this, 'translateDifferent'),
-        );
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateExists(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition($attribute);
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateEquals(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition(sprintf('%s = %s', $attribute, Translator::getXpathLiteral($value)));
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateIncludes(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition($value ? sprintf(
-            '%1$s and contains(concat(\' \', normalize-space(%1$s), \' \'), %2$s)',
-            $attribute,
-            Translator::getXpathLiteral(' '.$value.' ')
-        ) : '0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateDashMatch(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition(sprintf(
-            '%1$s and (%1$s = %2$s or starts-with(%1$s, %3$s))',
-            $attribute,
-            Translator::getXpathLiteral($value),
-            Translator::getXpathLiteral($value.'-')
-        ));
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translatePrefixMatch(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition($value ? sprintf(
-            '%1$s and starts-with(%1$s, %2$s)',
-            $attribute,
-            Translator::getXpathLiteral($value)
-        ) : '0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateSuffixMatch(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition($value ? sprintf(
-            '%1$s and substring(%1$s, string-length(%1$s)-%2$s) = %3$s',
-            $attribute,
-            strlen($value) - 1,
-            Translator::getXpathLiteral($value)
-        ) : '0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateSubstringMatch(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition($value ? sprintf(
-            '%1$s and contains(%1$s, %2$s)',
-            $attribute,
-            Translator::getXpathLiteral($value)
-        ) : '0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @return XPathExpr
-     */
-    public function translateDifferent(XPathExpr $xpath, $attribute, $value)
-    {
-        return $xpath->addCondition(sprintf(
-            $value ? 'not(%1$s) or %1$s != %2$s' : '%s != %s',
-            $attribute,
-            Translator::getXpathLiteral($value)
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'attribute-matching';
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php b/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php
deleted file mode 100644
index 9ce018f..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/CombinationExtension.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator combination extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class CombinationExtension extends AbstractExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getCombinationTranslators()
-    {
-        return array(
-            ' ' => array($this, 'translateDescendant'),
-            '>' => array($this, 'translateChild'),
-            '+' => array($this, 'translateDirectAdjacent'),
-            '~' => array($this, 'translateIndirectAdjacent'),
-        );
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param XPathExpr $combinedXpath
-     *
-     * @return XPathExpr
-     */
-    public function translateDescendant(XPathExpr $xpath, XPathExpr $combinedXpath)
-    {
-        return $xpath->join('/descendant-or-self::*/', $combinedXpath);
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param XPathExpr $combinedXpath
-     *
-     * @return XPathExpr
-     */
-    public function translateChild(XPathExpr $xpath, XPathExpr $combinedXpath)
-    {
-        return $xpath->join('/', $combinedXpath);
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param XPathExpr $combinedXpath
-     *
-     * @return XPathExpr
-     */
-    public function translateDirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)
-    {
-        return $xpath
-            ->join('/following-sibling::', $combinedXpath)
-            ->addNameTest()
-            ->addCondition('position() = 1');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param XPathExpr $combinedXpath
-     *
-     * @return XPathExpr
-     */
-    public function translateIndirectAdjacent(XPathExpr $xpath, XPathExpr $combinedXpath)
-    {
-        return $xpath->join('/following-sibling::', $combinedXpath);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'combination';
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/ExtensionInterface.php b/vendor/symfony/css-selector/XPath/Extension/ExtensionInterface.php
deleted file mode 100644
index 9b47f24..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/ExtensionInterface.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-/**
- * XPath expression translator extension interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface ExtensionInterface
-{
-    /**
-     * Returns node translators.
-     *
-     * These callables will receive the node as first argument and the translator as second argument.
-     *
-     * @return callable[]
-     */
-    public function getNodeTranslators();
-
-    /**
-     * Returns combination translators.
-     *
-     * @return callable[]
-     */
-    public function getCombinationTranslators();
-
-    /**
-     * Returns function translators.
-     *
-     * @return callable[]
-     */
-    public function getFunctionTranslators();
-
-    /**
-     * Returns pseudo-class translators.
-     *
-     * @return callable[]
-     */
-    public function getPseudoClassTranslators();
-
-    /**
-     * Returns attribute operation translators.
-     *
-     * @return callable[]
-     */
-    public function getAttributeMatchingTranslators();
-
-    /**
-     * Returns extension name.
-     *
-     * @return string
-     */
-    public function getName();
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php b/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php
deleted file mode 100644
index 41ece8a..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/FunctionExtension.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
-use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
-use Symfony\Component\CssSelector\Node\FunctionNode;
-use Symfony\Component\CssSelector\Parser\Parser;
-use Symfony\Component\CssSelector\XPath\Translator;
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator function extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class FunctionExtension extends AbstractExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctionTranslators()
-    {
-        return array(
-            'nth-child' => array($this, 'translateNthChild'),
-            'nth-last-child' => array($this, 'translateNthLastChild'),
-            'nth-of-type' => array($this, 'translateNthOfType'),
-            'nth-last-of-type' => array($this, 'translateNthLastOfType'),
-            'contains' => array($this, 'translateContains'),
-            'lang' => array($this, 'translateLang'),
-        );
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     * @param bool         $last
-     * @param bool         $addNameTest
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateNthChild(XPathExpr $xpath, FunctionNode $function, $last = false, $addNameTest = true)
-    {
-        try {
-            list($a, $b) = Parser::parseSeries($function->getArguments());
-        } catch (SyntaxErrorException $e) {
-            throw new ExpressionErrorException(sprintf('Invalid series: %s', implode(', ', $function->getArguments())), 0, $e);
-        }
-
-        $xpath->addStarPrefix();
-        if ($addNameTest) {
-            $xpath->addNameTest();
-        }
-
-        if (0 === $a) {
-            return $xpath->addCondition('position() = '.($last ? 'last() - '.($b - 1) : $b));
-        }
-
-        if ($a < 0) {
-            if ($b < 1) {
-                return $xpath->addCondition('false()');
-            }
-
-            $sign = '<=';
-        } else {
-            $sign = '>=';
-        }
-
-        $expr = 'position()';
-
-        if ($last) {
-            $expr = 'last() - '.$expr;
-            --$b;
-        }
-
-        if (0 !== $b) {
-            $expr .= ' - '.$b;
-        }
-
-        $conditions = array(sprintf('%s %s 0', $expr, $sign));
-
-        if (1 !== $a && -1 !== $a) {
-            $conditions[] = sprintf('(%s) mod %d = 0', $expr, $a);
-        }
-
-        return $xpath->addCondition(implode(' and ', $conditions));
-
-        // todo: handle an+b, odd, even
-        // an+b means every-a, plus b, e.g., 2n+1 means odd
-        // 0n+b means b
-        // n+0 means a=1, i.e., all elements
-        // an means every a elements, i.e., 2n means even
-        // -n means -1n
-        // -1n+6 means elements 6 and previous
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     */
-    public function translateNthLastChild(XPathExpr $xpath, FunctionNode $function)
-    {
-        return $this->translateNthChild($xpath, $function, true);
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     */
-    public function translateNthOfType(XPathExpr $xpath, FunctionNode $function)
-    {
-        return $this->translateNthChild($xpath, $function, false, false);
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateNthLastOfType(XPathExpr $xpath, FunctionNode $function)
-    {
-        if ('*' === $xpath->getElement()) {
-            throw new ExpressionErrorException('"*:nth-of-type()" is not implemented.');
-        }
-
-        return $this->translateNthChild($xpath, $function, true, false);
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateContains(XPathExpr $xpath, FunctionNode $function)
-    {
-        $arguments = $function->getArguments();
-        foreach ($arguments as $token) {
-            if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :contains(), got '
-                    .implode(', ', $arguments)
-                );
-            }
-        }
-
-        return $xpath->addCondition(sprintf(
-            'contains(string(.), %s)',
-            Translator::getXpathLiteral($arguments[0]->getValue())
-        ));
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateLang(XPathExpr $xpath, FunctionNode $function)
-    {
-        $arguments = $function->getArguments();
-        foreach ($arguments as $token) {
-            if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
-            }
-        }
-
-        return $xpath->addCondition(sprintf(
-            'lang(%s)',
-            Translator::getXpathLiteral($arguments[0]->getValue())
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'function';
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php b/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php
deleted file mode 100644
index 0da74d4..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/HtmlExtension.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
-use Symfony\Component\CssSelector\Node\FunctionNode;
-use Symfony\Component\CssSelector\XPath\Translator;
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator HTML extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class HtmlExtension extends AbstractExtension
-{
-    /**
-     * Constructor.
-     *
-     * @param Translator $translator
-     */
-    public function __construct(Translator $translator)
-    {
-        $translator
-            ->getExtension('node')
-            ->setFlag(NodeExtension::ELEMENT_NAME_IN_LOWER_CASE, true)
-            ->setFlag(NodeExtension::ATTRIBUTE_NAME_IN_LOWER_CASE, true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPseudoClassTranslators()
-    {
-        return array(
-            'checked' => array($this, 'translateChecked'),
-            'link' => array($this, 'translateLink'),
-            'disabled' => array($this, 'translateDisabled'),
-            'enabled' => array($this, 'translateEnabled'),
-            'selected' => array($this, 'translateSelected'),
-            'invalid' => array($this, 'translateInvalid'),
-            'hover' => array($this, 'translateHover'),
-            'visited' => array($this, 'translateVisited'),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctionTranslators()
-    {
-        return array(
-            'lang' => array($this, 'translateLang'),
-        );
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateChecked(XPathExpr $xpath)
-    {
-        return $xpath->addCondition(
-            '(@checked '
-            ."and (name(.) = 'input' or name(.) = 'command')"
-            ."and (@type = 'checkbox' or @type = 'radio'))"
-        );
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateLink(XPathExpr $xpath)
-    {
-        return $xpath->addCondition("@href and (name(.) = 'a' or name(.) = 'link' or name(.) = 'area')");
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateDisabled(XPathExpr $xpath)
-    {
-        return $xpath->addCondition(
-            '('
-                .'@disabled and'
-                .'('
-                    ."(name(.) = 'input' and @type != 'hidden')"
-                    ." or name(.) = 'button'"
-                    ." or name(.) = 'select'"
-                    ." or name(.) = 'textarea'"
-                    ." or name(.) = 'command'"
-                    ." or name(.) = 'fieldset'"
-                    ." or name(.) = 'optgroup'"
-                    ." or name(.) = 'option'"
-                .')'
-            .') or ('
-                ."(name(.) = 'input' and @type != 'hidden')"
-                ." or name(.) = 'button'"
-                ." or name(.) = 'select'"
-                ." or name(.) = 'textarea'"
-            .')'
-            .' and ancestor::fieldset[@disabled]'
-        );
-        // todo: in the second half, add "and is not a descendant of that fieldset element's first legend element child, if any."
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateEnabled(XPathExpr $xpath)
-    {
-        return $xpath->addCondition(
-            '('
-                .'@href and ('
-                    ."name(.) = 'a'"
-                    ." or name(.) = 'link'"
-                    ." or name(.) = 'area'"
-                .')'
-            .') or ('
-                .'('
-                    ."name(.) = 'command'"
-                    ." or name(.) = 'fieldset'"
-                    ." or name(.) = 'optgroup'"
-                .')'
-                .' and not(@disabled)'
-            .') or ('
-                .'('
-                    ."(name(.) = 'input' and @type != 'hidden')"
-                    ." or name(.) = 'button'"
-                    ." or name(.) = 'select'"
-                    ." or name(.) = 'textarea'"
-                    ." or name(.) = 'keygen'"
-                .')'
-                .' and not (@disabled or ancestor::fieldset[@disabled])'
-            .') or ('
-                ."name(.) = 'option' and not("
-                    .'@disabled or ancestor::optgroup[@disabled]'
-                .')'
-            .')'
-        );
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateLang(XPathExpr $xpath, FunctionNode $function)
-    {
-        $arguments = $function->getArguments();
-        foreach ($arguments as $token) {
-            if (!($token->isString() || $token->isIdentifier())) {
-                throw new ExpressionErrorException(
-                    'Expected a single string or identifier for :lang(), got '
-                    .implode(', ', $arguments)
-                );
-            }
-        }
-
-        return $xpath->addCondition(sprintf(
-            'ancestor-or-self::*[@lang][1][starts-with(concat('
-            ."translate(@%s, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), '-')"
-            .', %s)]',
-            'lang',
-            Translator::getXpathLiteral(strtolower($arguments[0]->getValue()).'-')
-        ));
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateSelected(XPathExpr $xpath)
-    {
-        return $xpath->addCondition("(@selected and name(.) = 'option')");
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateInvalid(XPathExpr $xpath)
-    {
-        return $xpath->addCondition('0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateHover(XPathExpr $xpath)
-    {
-        return $xpath->addCondition('0');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateVisited(XPathExpr $xpath)
-    {
-        return $xpath->addCondition('0');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'html';
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php b/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php
deleted file mode 100644
index 2b8920f..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/NodeExtension.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\Node;
-use Symfony\Component\CssSelector\XPath\Translator;
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator node extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class NodeExtension extends AbstractExtension
-{
-    const ELEMENT_NAME_IN_LOWER_CASE = 1;
-    const ATTRIBUTE_NAME_IN_LOWER_CASE = 2;
-    const ATTRIBUTE_VALUE_IN_LOWER_CASE = 4;
-
-    /**
-     * @var int
-     */
-    private $flags;
-
-    /**
-     * Constructor.
-     *
-     * @param int $flags
-     */
-    public function __construct($flags = 0)
-    {
-        $this->flags = $flags;
-    }
-
-    /**
-     * @param int  $flag
-     * @param bool $on
-     *
-     * @return NodeExtension
-     */
-    public function setFlag($flag, $on)
-    {
-        if ($on && !$this->hasFlag($flag)) {
-            $this->flags += $flag;
-        }
-
-        if (!$on && $this->hasFlag($flag)) {
-            $this->flags -= $flag;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param int $flag
-     *
-     * @return bool
-     */
-    public function hasFlag($flag)
-    {
-        return $this->flags & $flag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNodeTranslators()
-    {
-        return array(
-            'Selector' => array($this, 'translateSelector'),
-            'CombinedSelector' => array($this, 'translateCombinedSelector'),
-            'Negation' => array($this, 'translateNegation'),
-            'Function' => array($this, 'translateFunction'),
-            'Pseudo' => array($this, 'translatePseudo'),
-            'Attribute' => array($this, 'translateAttribute'),
-            'Class' => array($this, 'translateClass'),
-            'Hash' => array($this, 'translateHash'),
-            'Element' => array($this, 'translateElement'),
-        );
-    }
-
-    /**
-     * @param Node\SelectorNode $node
-     * @param Translator        $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateSelector(Node\SelectorNode $node, Translator $translator)
-    {
-        return $translator->nodeToXPath($node->getTree());
-    }
-
-    /**
-     * @param Node\CombinedSelectorNode $node
-     * @param Translator                $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateCombinedSelector(Node\CombinedSelectorNode $node, Translator $translator)
-    {
-        return $translator->addCombination($node->getCombinator(), $node->getSelector(), $node->getSubSelector());
-    }
-
-    /**
-     * @param Node\NegationNode $node
-     * @param Translator        $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateNegation(Node\NegationNode $node, Translator $translator)
-    {
-        $xpath = $translator->nodeToXPath($node->getSelector());
-        $subXpath = $translator->nodeToXPath($node->getSubSelector());
-        $subXpath->addNameTest();
-
-        if ($subXpath->getCondition()) {
-            return $xpath->addCondition(sprintf('not(%s)', $subXpath->getCondition()));
-        }
-
-        return $xpath->addCondition('0');
-    }
-
-    /**
-     * @param Node\FunctionNode $node
-     * @param Translator        $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateFunction(Node\FunctionNode $node, Translator $translator)
-    {
-        $xpath = $translator->nodeToXPath($node->getSelector());
-
-        return $translator->addFunction($xpath, $node);
-    }
-
-    /**
-     * @param Node\PseudoNode $node
-     * @param Translator      $translator
-     *
-     * @return XPathExpr
-     */
-    public function translatePseudo(Node\PseudoNode $node, Translator $translator)
-    {
-        $xpath = $translator->nodeToXPath($node->getSelector());
-
-        return $translator->addPseudoClass($xpath, $node->getIdentifier());
-    }
-
-    /**
-     * @param Node\AttributeNode $node
-     * @param Translator         $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateAttribute(Node\AttributeNode $node, Translator $translator)
-    {
-        $name = $node->getAttribute();
-        $safe = $this->isSafeName($name);
-
-        if ($this->hasFlag(self::ATTRIBUTE_NAME_IN_LOWER_CASE)) {
-            $name = strtolower($name);
-        }
-
-        if ($node->getNamespace()) {
-            $name = sprintf('%s:%s', $node->getNamespace(), $name);
-            $safe = $safe && $this->isSafeName($node->getNamespace());
-        }
-
-        $attribute = $safe ? '@'.$name : sprintf('attribute::*[name() = %s]', Translator::getXpathLiteral($name));
-        $value = $node->getValue();
-        $xpath = $translator->nodeToXPath($node->getSelector());
-
-        if ($this->hasFlag(self::ATTRIBUTE_VALUE_IN_LOWER_CASE)) {
-            $value = strtolower($value);
-        }
-
-        return $translator->addAttributeMatching($xpath, $node->getOperator(), $attribute, $value);
-    }
-
-    /**
-     * @param Node\ClassNode $node
-     * @param Translator     $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateClass(Node\ClassNode $node, Translator $translator)
-    {
-        $xpath = $translator->nodeToXPath($node->getSelector());
-
-        return $translator->addAttributeMatching($xpath, '~=', '@class', $node->getName());
-    }
-
-    /**
-     * @param Node\HashNode $node
-     * @param Translator    $translator
-     *
-     * @return XPathExpr
-     */
-    public function translateHash(Node\HashNode $node, Translator $translator)
-    {
-        $xpath = $translator->nodeToXPath($node->getSelector());
-
-        return $translator->addAttributeMatching($xpath, '=', '@id', $node->getId());
-    }
-
-    /**
-     * @param Node\ElementNode $node
-     *
-     * @return XPathExpr
-     */
-    public function translateElement(Node\ElementNode $node)
-    {
-        $element = $node->getElement();
-
-        if ($this->hasFlag(self::ELEMENT_NAME_IN_LOWER_CASE)) {
-            $element = strtolower($element);
-        }
-
-        if ($element) {
-            $safe = $this->isSafeName($element);
-        } else {
-            $element = '*';
-            $safe = true;
-        }
-
-        if ($node->getNamespace()) {
-            $element = sprintf('%s:%s', $node->getNamespace(), $element);
-            $safe = $safe && $this->isSafeName($node->getNamespace());
-        }
-
-        $xpath = new XPathExpr('', $element);
-
-        if (!$safe) {
-            $xpath->addNameTest();
-        }
-
-        return $xpath;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'node';
-    }
-
-    /**
-     * Tests if given name is safe.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    private function isSafeName($name)
-    {
-        return 0 < preg_match('~^[a-zA-Z_][a-zA-Z0-9_.-]*$~', $name);
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Extension/PseudoClassExtension.php b/vendor/symfony/css-selector/XPath/Extension/PseudoClassExtension.php
deleted file mode 100644
index 008ec2b..0000000
--- a/vendor/symfony/css-selector/XPath/Extension/PseudoClassExtension.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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\Component\CssSelector\XPath\Extension;
-
-use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
-use Symfony\Component\CssSelector\XPath\XPathExpr;
-
-/**
- * XPath expression translator pseudo-class extension.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class PseudoClassExtension extends AbstractExtension
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getPseudoClassTranslators()
-    {
-        return array(
-            'root' => array($this, 'translateRoot'),
-            'first-child' => array($this, 'translateFirstChild'),
-            'last-child' => array($this, 'translateLastChild'),
-            'first-of-type' => array($this, 'translateFirstOfType'),
-            'last-of-type' => array($this, 'translateLastOfType'),
-            'only-child' => array($this, 'translateOnlyChild'),
-            'only-of-type' => array($this, 'translateOnlyOfType'),
-            'empty' => array($this, 'translateEmpty'),
-        );
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateRoot(XPathExpr $xpath)
-    {
-        return $xpath->addCondition('not(parent::*)');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateFirstChild(XPathExpr $xpath)
-    {
-        return $xpath
-            ->addStarPrefix()
-            ->addNameTest()
-            ->addCondition('position() = 1');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateLastChild(XPathExpr $xpath)
-    {
-        return $xpath
-            ->addStarPrefix()
-            ->addNameTest()
-            ->addCondition('position() = last()');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateFirstOfType(XPathExpr $xpath)
-    {
-        if ('*' === $xpath->getElement()) {
-            throw new ExpressionErrorException('"*:first-of-type" is not implemented.');
-        }
-
-        return $xpath
-            ->addStarPrefix()
-            ->addCondition('position() = 1');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateLastOfType(XPathExpr $xpath)
-    {
-        if ('*' === $xpath->getElement()) {
-            throw new ExpressionErrorException('"*:last-of-type" is not implemented.');
-        }
-
-        return $xpath
-            ->addStarPrefix()
-            ->addCondition('position() = last()');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateOnlyChild(XPathExpr $xpath)
-    {
-        return $xpath
-            ->addStarPrefix()
-            ->addNameTest()
-            ->addCondition('last() = 1');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function translateOnlyOfType(XPathExpr $xpath)
-    {
-        if ('*' === $xpath->getElement()) {
-            throw new ExpressionErrorException('"*:only-of-type" is not implemented.');
-        }
-
-        return $xpath->addCondition('last() = 1');
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     *
-     * @return XPathExpr
-     */
-    public function translateEmpty(XPathExpr $xpath)
-    {
-        return $xpath->addCondition('not(*) and not(string-length())');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'pseudo-class';
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/Translator.php b/vendor/symfony/css-selector/XPath/Translator.php
deleted file mode 100644
index 5053793..0000000
--- a/vendor/symfony/css-selector/XPath/Translator.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?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\Component\CssSelector\XPath;
-
-use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
-use Symfony\Component\CssSelector\Node\FunctionNode;
-use Symfony\Component\CssSelector\Node\NodeInterface;
-use Symfony\Component\CssSelector\Node\SelectorNode;
-use Symfony\Component\CssSelector\Parser\Parser;
-use Symfony\Component\CssSelector\Parser\ParserInterface;
-
-/**
- * XPath expression translator interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class Translator implements TranslatorInterface
-{
-    /**
-     * @var ParserInterface
-     */
-    private $mainParser;
-
-    /**
-     * @var ParserInterface[]
-     */
-    private $shortcutParsers = array();
-
-    /**
-     * @var Extension\ExtensionInterface
-     */
-    private $extensions = array();
-
-    /**
-     * @var array
-     */
-    private $nodeTranslators = array();
-
-    /**
-     * @var array
-     */
-    private $combinationTranslators = array();
-
-    /**
-     * @var array
-     */
-    private $functionTranslators = array();
-
-    /**
-     * @var array
-     */
-    private $pseudoClassTranslators = array();
-
-    /**
-     * @var array
-     */
-    private $attributeMatchingTranslators = array();
-
-    /**
-     * Constructor.
-     */
-    public function __construct(ParserInterface $parser = null)
-    {
-        $this->mainParser = $parser ?: new Parser();
-
-        $this
-            ->registerExtension(new Extension\NodeExtension())
-            ->registerExtension(new Extension\CombinationExtension())
-            ->registerExtension(new Extension\FunctionExtension())
-            ->registerExtension(new Extension\PseudoClassExtension())
-            ->registerExtension(new Extension\AttributeMatchingExtension())
-        ;
-    }
-
-    /**
-     * @param string $element
-     *
-     * @return string
-     */
-    public static function getXpathLiteral($element)
-    {
-        if (false === strpos($element, "'")) {
-            return "'".$element."'";
-        }
-
-        if (false === strpos($element, '"')) {
-            return '"'.$element.'"';
-        }
-
-        $string = $element;
-        $parts = array();
-        while (true) {
-            if (false !== $pos = strpos($string, "'")) {
-                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
-                $parts[] = "\"'\"";
-                $string = substr($string, $pos + 1);
-            } else {
-                $parts[] = "'$string'";
-                break;
-            }
-        }
-
-        return sprintf('concat(%s)', implode($parts, ', '));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::')
-    {
-        $selectors = $this->parseSelectors($cssExpr);
-
-        /** @var SelectorNode $selector */
-        foreach ($selectors as $index => $selector) {
-            if (null !== $selector->getPseudoElement()) {
-                throw new ExpressionErrorException('Pseudo-elements are not supported.');
-            }
-
-            $selectors[$index] = $this->selectorToXPath($selector, $prefix);
-        }
-
-        return implode(' | ', $selectors);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::')
-    {
-        return ($prefix ?: '').$this->nodeToXPath($selector);
-    }
-
-    /**
-     * Registers an extension.
-     *
-     * @param Extension\ExtensionInterface $extension
-     *
-     * @return Translator
-     */
-    public function registerExtension(Extension\ExtensionInterface $extension)
-    {
-        $this->extensions[$extension->getName()] = $extension;
-
-        $this->nodeTranslators = array_merge($this->nodeTranslators, $extension->getNodeTranslators());
-        $this->combinationTranslators = array_merge($this->combinationTranslators, $extension->getCombinationTranslators());
-        $this->functionTranslators = array_merge($this->functionTranslators, $extension->getFunctionTranslators());
-        $this->pseudoClassTranslators = array_merge($this->pseudoClassTranslators, $extension->getPseudoClassTranslators());
-        $this->attributeMatchingTranslators = array_merge($this->attributeMatchingTranslators, $extension->getAttributeMatchingTranslators());
-
-        return $this;
-    }
-
-    /**
-     * @param string $name
-     *
-     * @return Extension\ExtensionInterface
-     *
-     * @throws ExpressionErrorException
-     */
-    public function getExtension($name)
-    {
-        if (!isset($this->extensions[$name])) {
-            throw new ExpressionErrorException(sprintf('Extension "%s" not registered.', $name));
-        }
-
-        return $this->extensions[$name];
-    }
-
-    /**
-     * Registers a shortcut parser.
-     *
-     * @param ParserInterface $shortcut
-     *
-     * @return Translator
-     */
-    public function registerParserShortcut(ParserInterface $shortcut)
-    {
-        $this->shortcutParsers[] = $shortcut;
-
-        return $this;
-    }
-
-    /**
-     * @param NodeInterface $node
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function nodeToXPath(NodeInterface $node)
-    {
-        if (!isset($this->nodeTranslators[$node->getNodeName()])) {
-            throw new ExpressionErrorException(sprintf('Node "%s" not supported.', $node->getNodeName()));
-        }
-
-        return call_user_func($this->nodeTranslators[$node->getNodeName()], $node, $this);
-    }
-
-    /**
-     * @param string        $combiner
-     * @param NodeInterface $xpath
-     * @param NodeInterface $combinedXpath
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function addCombination($combiner, NodeInterface $xpath, NodeInterface $combinedXpath)
-    {
-        if (!isset($this->combinationTranslators[$combiner])) {
-            throw new ExpressionErrorException(sprintf('Combiner "%s" not supported.', $combiner));
-        }
-
-        return call_user_func($this->combinationTranslators[$combiner], $this->nodeToXPath($xpath), $this->nodeToXPath($combinedXpath));
-    }
-
-    /**
-     * @param XPathExpr    $xpath
-     * @param FunctionNode $function
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function addFunction(XPathExpr $xpath, FunctionNode $function)
-    {
-        if (!isset($this->functionTranslators[$function->getName()])) {
-            throw new ExpressionErrorException(sprintf('Function "%s" not supported.', $function->getName()));
-        }
-
-        return call_user_func($this->functionTranslators[$function->getName()], $xpath, $function);
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $pseudoClass
-     *
-     * @return XPathExpr
-     *
-     * @throws ExpressionErrorException
-     */
-    public function addPseudoClass(XPathExpr $xpath, $pseudoClass)
-    {
-        if (!isset($this->pseudoClassTranslators[$pseudoClass])) {
-            throw new ExpressionErrorException(sprintf('Pseudo-class "%s" not supported.', $pseudoClass));
-        }
-
-        return call_user_func($this->pseudoClassTranslators[$pseudoClass], $xpath);
-    }
-
-    /**
-     * @param XPathExpr $xpath
-     * @param string    $operator
-     * @param string    $attribute
-     * @param string    $value
-     *
-     * @throws ExpressionErrorException
-     *
-     * @return XPathExpr
-     */
-    public function addAttributeMatching(XPathExpr $xpath, $operator, $attribute, $value)
-    {
-        if (!isset($this->attributeMatchingTranslators[$operator])) {
-            throw new ExpressionErrorException(sprintf('Attribute matcher operator "%s" not supported.', $operator));
-        }
-
-        return call_user_func($this->attributeMatchingTranslators[$operator], $xpath, $attribute, $value);
-    }
-
-    /**
-     * @param string $css
-     *
-     * @return SelectorNode[]
-     */
-    private function parseSelectors($css)
-    {
-        foreach ($this->shortcutParsers as $shortcut) {
-            $tokens = $shortcut->parse($css);
-
-            if (!empty($tokens)) {
-                return $tokens;
-            }
-        }
-
-        return $this->mainParser->parse($css);
-    }
-}
diff --git a/vendor/symfony/css-selector/XPath/TranslatorInterface.php b/vendor/symfony/css-selector/XPath/TranslatorInterface.php
deleted file mode 100644
index bc19ae8..0000000
--- a/vendor/symfony/css-selector/XPath/TranslatorInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\CssSelector\XPath;
-
-use Symfony\Component\CssSelector\Node\SelectorNode;
-
-/**
- * XPath expression translator interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface TranslatorInterface
-{
-    /**
-     * Translates a CSS selector to an XPath expression.
-     *
-     * @param string $cssExpr
-     * @param string $prefix
-     *
-     * @return string
-     */
-    public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
-
-    /**
-     * Translates a parsed selector node to an XPath expression.
-     *
-     * @param SelectorNode $selector
-     * @param string       $prefix
-     *
-     * @return string
-     */
-    public function selectorToXPath(SelectorNode $selector, $prefix = 'descendant-or-self::');
-}
diff --git a/vendor/symfony/css-selector/XPath/XPathExpr.php b/vendor/symfony/css-selector/XPath/XPathExpr.php
deleted file mode 100644
index c7ef97c..0000000
--- a/vendor/symfony/css-selector/XPath/XPathExpr.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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\Component\CssSelector\XPath;
-
-/**
- * XPath expression translator interface.
- *
- * This component is a port of the Python cssselect library,
- * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class XPathExpr
-{
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var string
-     */
-    private $element;
-
-    /**
-     * @var string
-     */
-    private $condition;
-
-    /**
-     * @param string $path
-     * @param string $element
-     * @param string $condition
-     * @param bool   $starPrefix
-     */
-    public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
-    {
-        $this->path = $path;
-        $this->element = $element;
-        $this->condition = $condition;
-
-        if ($starPrefix) {
-            $this->addStarPrefix();
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getElement()
-    {
-        return $this->element;
-    }
-
-    /**
-     * @param $condition
-     *
-     * @return XPathExpr
-     */
-    public function addCondition($condition)
-    {
-        $this->condition = $this->condition ? sprintf('%s and (%s)', $this->condition, $condition) : $condition;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCondition()
-    {
-        return $this->condition;
-    }
-
-    /**
-     * @return XPathExpr
-     */
-    public function addNameTest()
-    {
-        if ('*' !== $this->element) {
-            $this->addCondition('name() = '.Translator::getXpathLiteral($this->element));
-            $this->element = '*';
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return XPathExpr
-     */
-    public function addStarPrefix()
-    {
-        $this->path .= '*/';
-
-        return $this;
-    }
-
-    /**
-     * Joins another XPathExpr with a combiner.
-     *
-     * @param string    $combiner
-     * @param XPathExpr $expr
-     *
-     * @return XPathExpr
-     */
-    public function join($combiner, XPathExpr $expr)
-    {
-        $path = $this->__toString().$combiner;
-
-        if ('*/' !== $expr->path) {
-            $path .= $expr->path;
-        }
-
-        $this->path = $path;
-        $this->element = $expr->element;
-        $this->condition = $expr->condition;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $path = $this->path.$this->element;
-        $condition = null === $this->condition || '' === $this->condition ? '' : '['.$this->condition.']';
-
-        return $path.$condition;
-    }
-}
diff --git a/vendor/symfony/css-selector/composer.json b/vendor/symfony/css-selector/composer.json
deleted file mode 100644
index 99eb4da..0000000
--- a/vendor/symfony/css-selector/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "symfony/css-selector",
-    "type": "library",
-    "description": "Symfony CssSelector Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Jean-François Simon",
-            "email": "jeanfrancois.simon@sensiolabs.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\CssSelector\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/css-selector/phpunit.xml.dist b/vendor/symfony/css-selector/phpunit.xml.dist
deleted file mode 100644
index 14a320c..0000000
--- a/vendor/symfony/css-selector/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony CssSelector Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/debug/.gitignore b/vendor/symfony/debug/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/debug/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/debug/CHANGELOG.md b/vendor/symfony/debug/CHANGELOG.md
deleted file mode 100644
index 31f0de9..0000000
--- a/vendor/symfony/debug/CHANGELOG.md
+++ /dev/null
@@ -1,35 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
-* added deprecations checking for parent interfaces/classes to DebugClassLoader
-* added ZTS support to symfony_debug extension
-* added symfony_debug_backtrace() to symfony_debug extension
-  to track the backtrace of fatal errors
-
-2.6.0
------
-
-* generalized ErrorHandler and ExceptionHandler,
-  with some new methods and others deprecated
-* enhanced error messages for uncaught exceptions
-
-2.5.0
------
-
-* added ExceptionHandler::setHandler()
-* added UndefinedMethodFatalErrorHandler
-* deprecated DummyException
-
-2.4.0
------
-
- * added a DebugClassLoader able to wrap any autoloader providing a findFile method
- * improved error messages for not found classes and functions
-
-2.3.0
------
-
- * added the component
diff --git a/vendor/symfony/debug/Debug.php b/vendor/symfony/debug/Debug.php
deleted file mode 100644
index 08b35f4..0000000
--- a/vendor/symfony/debug/Debug.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\Debug;
-
-/**
- * Registers all the debug tools.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Debug
-{
-    private static $enabled = false;
-
-    /**
-     * Enables the debug tools.
-     *
-     * This method registers an error handler and an exception handler.
-     *
-     * If the Symfony ClassLoader component is available, a special
-     * class loader is also registered.
-     *
-     * @param int  $errorReportingLevel The level of error reporting you want
-     * @param bool $displayErrors       Whether to display errors (for development) or just log them (for production)
-     */
-    public static function enable($errorReportingLevel = null, $displayErrors = true)
-    {
-        if (static::$enabled) {
-            return;
-        }
-
-        static::$enabled = true;
-
-        if (null !== $errorReportingLevel) {
-            error_reporting($errorReportingLevel);
-        } else {
-            error_reporting(-1);
-        }
-
-        if ('cli' !== php_sapi_name()) {
-            ini_set('display_errors', 0);
-            ExceptionHandler::register();
-        } elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {
-            // CLI - display errors only if they're not already logged to STDERR
-            ini_set('display_errors', 1);
-        }
-        $handler = ErrorHandler::register();
-        if (!$displayErrors) {
-            $handler->throwAt(0, true);
-        }
-
-        DebugClassLoader::enable();
-    }
-}
diff --git a/vendor/symfony/debug/DebugClassLoader.php b/vendor/symfony/debug/DebugClassLoader.php
deleted file mode 100644
index 8c79774..0000000
--- a/vendor/symfony/debug/DebugClassLoader.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?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\Component\Debug;
-
-/**
- * Autoloader checking if the class is really defined in the file found.
- *
- * The ClassLoader will wrap all registered autoloaders
- * and will throw an exception if a file is found but does
- * not declare the class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christophe Coevoet <stof@notk.org>
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DebugClassLoader
-{
-    private $classLoader;
-    private $isFinder;
-    private $wasFinder;
-    private static $caseCheck;
-    private static $deprecated = array();
-    private static $php7Reserved = array('int', 'float', 'bool', 'string', 'true', 'false', 'null');
-    private static $darwinCache = array('/' => array('/', array()));
-
-    /**
-     * Constructor.
-     *
-     * @param callable|object $classLoader Passing an object is @deprecated since version 2.5 and support for it will be removed in 3.0
-     */
-    public function __construct($classLoader)
-    {
-        $this->wasFinder = is_object($classLoader) && method_exists($classLoader, 'findFile');
-
-        if ($this->wasFinder) {
-            @trigger_error('The '.__METHOD__.' method will no longer support receiving an object into its $classLoader argument in 3.0.', E_USER_DEPRECATED);
-            $this->classLoader = array($classLoader, 'loadClass');
-            $this->isFinder = true;
-        } else {
-            $this->classLoader = $classLoader;
-            $this->isFinder = is_array($classLoader) && method_exists($classLoader[0], 'findFile');
-        }
-
-        if (!isset(self::$caseCheck)) {
-            self::$caseCheck = false !== stripos(PHP_OS, 'win') ? (false !== stripos(PHP_OS, 'darwin') ? 2 : 1) : 0;
-        }
-    }
-
-    /**
-     * Gets the wrapped class loader.
-     *
-     * @return callable|object A class loader. Since version 2.5, returning an object is @deprecated and support for it will be removed in 3.0
-     */
-    public function getClassLoader()
-    {
-        return $this->wasFinder ? $this->classLoader[0] : $this->classLoader;
-    }
-
-    /**
-     * Wraps all autoloaders.
-     */
-    public static function enable()
-    {
-        // Ensures we don't hit https://bugs.php.net/42098
-        class_exists('Symfony\Component\Debug\ErrorHandler');
-        class_exists('Psr\Log\LogLevel');
-
-        if (!is_array($functions = spl_autoload_functions())) {
-            return;
-        }
-
-        foreach ($functions as $function) {
-            spl_autoload_unregister($function);
-        }
-
-        foreach ($functions as $function) {
-            if (!is_array($function) || !$function[0] instanceof self) {
-                $function = array(new static($function), 'loadClass');
-            }
-
-            spl_autoload_register($function);
-        }
-    }
-
-    /**
-     * Disables the wrapping.
-     */
-    public static function disable()
-    {
-        if (!is_array($functions = spl_autoload_functions())) {
-            return;
-        }
-
-        foreach ($functions as $function) {
-            spl_autoload_unregister($function);
-        }
-
-        foreach ($functions as $function) {
-            if (is_array($function) && $function[0] instanceof self) {
-                $function = $function[0]->getClassLoader();
-            }
-
-            spl_autoload_register($function);
-        }
-    }
-
-    /**
-     * Finds a file by class name.
-     *
-     * @param string $class A class name to resolve to file
-     *
-     * @return string|null
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function findFile($class)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if ($this->wasFinder) {
-            return $this->classLoader[0]->findFile($class);
-        }
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param string $class The name of the class
-     *
-     * @return bool|null True, if loaded
-     *
-     * @throws \RuntimeException
-     */
-    public function loadClass($class)
-    {
-        ErrorHandler::stackErrors();
-
-        try {
-            if ($this->isFinder) {
-                if ($file = $this->classLoader[0]->findFile($class)) {
-                    require $file;
-                }
-            } else {
-                call_user_func($this->classLoader, $class);
-                $file = false;
-            }
-        } catch (\Exception $e) {
-            ErrorHandler::unstackErrors();
-
-            throw $e;
-        }
-
-        ErrorHandler::unstackErrors();
-
-        $exists = class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false));
-
-        if ('\\' === $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        if ($exists) {
-            $refl = new \ReflectionClass($class);
-            $name = $refl->getName();
-
-            if ($name !== $class && 0 === strcasecmp($name, $class)) {
-                throw new \RuntimeException(sprintf('Case mismatch between loaded and declared class names: %s vs %s', $class, $name));
-            }
-
-            if (in_array(strtolower($refl->getShortName()), self::$php7Reserved)) {
-                @trigger_error(sprintf('%s uses a reserved class name (%s) that will break on PHP 7 and higher', $name, $refl->getShortName()), E_USER_DEPRECATED);
-            } elseif (preg_match('#\n \* @deprecated (.*?)\r?\n \*(?: @|/$)#s', $refl->getDocComment(), $notice)) {
-                self::$deprecated[$name] = preg_replace('#\s*\r?\n \* +#', ' ', $notice[1]);
-            } else {
-                if (2 > $len = 1 + (strpos($name, '\\', 1 + strpos($name, '\\')) ?: strpos($name, '_'))) {
-                    $len = 0;
-                    $ns = '';
-                } else {
-                    switch ($ns = substr($name, 0, $len)) {
-                        case 'Symfony\Bridge\\':
-                        case 'Symfony\Bundle\\':
-                        case 'Symfony\Component\\':
-                            $ns = 'Symfony\\';
-                            $len = strlen($ns);
-                            break;
-                    }
-                }
-                $parent = $refl->getParentClass();
-
-                if (!$parent || strncmp($ns, $parent->name, $len)) {
-                    if ($parent && isset(self::$deprecated[$parent->name]) && strncmp($ns, $parent->name, $len)) {
-                        @trigger_error(sprintf('The %s class extends %s that is deprecated %s', $name, $parent->name, self::$deprecated[$parent->name]), E_USER_DEPRECATED);
-                    }
-
-                    foreach ($refl->getInterfaceNames() as $interface) {
-                        if (isset(self::$deprecated[$interface]) && strncmp($ns, $interface, $len) && !($parent && $parent->implementsInterface($interface))) {
-                            @trigger_error(sprintf('The %s %s %s that is deprecated %s', $name, $refl->isInterface() ? 'interface extends' : 'class implements', $interface, self::$deprecated[$interface]), E_USER_DEPRECATED);
-                        }
-                    }
-                }
-            }
-        }
-
-        if ($file) {
-            if (!$exists) {
-                if (false !== strpos($class, '/')) {
-                    throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
-                }
-
-                throw new \RuntimeException(sprintf('The autoloader expected class "%s" to be defined in file "%s". The file was found but the class was not in it, the class name or namespace probably has a typo.', $class, $file));
-            }
-            if (self::$caseCheck) {
-                $real = explode('\\', $class.strrchr($file, '.'));
-                $tail = explode(DIRECTORY_SEPARATOR, str_replace('/', DIRECTORY_SEPARATOR, $file));
-
-                $i = count($tail) - 1;
-                $j = count($real) - 1;
-
-                 while (isset($tail[$i], $real[$j]) && $tail[$i] === $real[$j]) {
-                    --$i;
-                    --$j;
-                }
-
-                array_splice($tail, 0, $i + 1);
-            }
-            if (self::$caseCheck && $tail) {
-                $tail = DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $tail);
-                $tailLen = strlen($tail);
-                $real = $refl->getFileName();
-
-                if (2 === self::$caseCheck) {
-                    // realpath() on MacOSX doesn't normalize the case of characters
-
-                    $i = 1 + strrpos($real, '/');
-                    $file = substr($real, $i);
-                    $real = substr($real, 0, $i);
-
-                    if (isset(self::$darwinCache[$real])) {
-                        $kDir = $real;
-                    } else {
-                        $kDir = strtolower($real);
-
-                        if (isset(self::$darwinCache[$kDir])) {
-                            $real = self::$darwinCache[$kDir][0];
-                        } else {
-                            $dir = getcwd();
-                            chdir($real);
-                            $real = getcwd().'/';
-                            chdir($dir);
-
-                            $dir = $real;
-                            $k = $kDir;
-                            $i = strlen($dir) - 1;
-                            while (!isset(self::$darwinCache[$k])) {
-                                self::$darwinCache[$k] = array($dir, array());
-                                self::$darwinCache[$dir] = &self::$darwinCache[$k];
-
-                                while ('/' !== $dir[--$i]) {
-                                }
-                                $k = substr($k, 0, ++$i);
-                                $dir = substr($dir, 0, $i--);
-                            }
-                        }
-                    }
-
-                    $dirFiles = self::$darwinCache[$kDir][1];
-
-                    if (isset($dirFiles[$file])) {
-                        $kFile = $file;
-                    } else {
-                        $kFile = strtolower($file);
-
-                        if (!isset($dirFiles[$kFile])) {
-                            foreach (scandir($real, 2) as $f) {
-                                if ('.' !== $f[0]) {
-                                    $dirFiles[$f] = $f;
-                                    if ($f === $file) {
-                                        $kFile = $k = $file;
-                                    } elseif ($f !== $k = strtolower($f)) {
-                                        $dirFiles[$k] = $f;
-                                    }
-                                }
-                            }
-                            self::$darwinCache[$kDir][1] = $dirFiles;
-                        }
-                    }
-
-                    $real .= $dirFiles[$kFile];
-                }
-
-                if (0 === substr_compare($real, $tail, -$tailLen, $tailLen, true)
-                  && 0 !== substr_compare($real, $tail, -$tailLen, $tailLen, false)
-                ) {
-                    throw new \RuntimeException(sprintf('Case mismatch between class and real file names: %s vs %s in %s', substr($tail, -$tailLen + 1), substr($real, -$tailLen + 1), substr($real, 0, -$tailLen + 1)));
-                }
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/vendor/symfony/debug/ErrorHandler.php b/vendor/symfony/debug/ErrorHandler.php
deleted file mode 100644
index cc698ee..0000000
--- a/vendor/symfony/debug/ErrorHandler.php
+++ /dev/null
@@ -1,741 +0,0 @@
-<?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\Component\Debug;
-
-use Psr\Log\LogLevel;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\Exception\ContextErrorException;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
-use Symfony\Component\Debug\Exception\OutOfMemoryException;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
-use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
-use Symfony\Component\Debug\FatalErrorHandler\FatalErrorHandlerInterface;
-
-/**
- * A generic ErrorHandler for the PHP engine.
- *
- * Provides five bit fields that control how errors are handled:
- * - thrownErrors: errors thrown as \ErrorException
- * - loggedErrors: logged errors, when not @-silenced
- * - scopedErrors: errors thrown or logged with their local context
- * - tracedErrors: errors logged with their stack trace, only once for repeated errors
- * - screamedErrors: never @-silenced errors
- *
- * Each error level can be logged by a dedicated PSR-3 logger object.
- * Screaming only applies to logging.
- * Throwing takes precedence over logging.
- * Uncaught exceptions are logged as E_ERROR.
- * E_DEPRECATED and E_USER_DEPRECATED levels never throw.
- * E_RECOVERABLE_ERROR and E_USER_ERROR levels always throw.
- * Non catchable errors that can be detected at shutdown time are logged when the scream bit field allows so.
- * As errors have a performance cost, repeated errors are all logged, so that the developer
- * can see them and weight them as more important to fix than others of the same level.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class ErrorHandler
-{
-    /**
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    const TYPE_DEPRECATION = -100;
-
-    private $levels = array(
-        E_DEPRECATED => 'Deprecated',
-        E_USER_DEPRECATED => 'User Deprecated',
-        E_NOTICE => 'Notice',
-        E_USER_NOTICE => 'User Notice',
-        E_STRICT => 'Runtime Notice',
-        E_WARNING => 'Warning',
-        E_USER_WARNING => 'User Warning',
-        E_COMPILE_WARNING => 'Compile Warning',
-        E_CORE_WARNING => 'Core Warning',
-        E_USER_ERROR => 'User Error',
-        E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
-        E_COMPILE_ERROR => 'Compile Error',
-        E_PARSE => 'Parse Error',
-        E_ERROR => 'Error',
-        E_CORE_ERROR => 'Core Error',
-    );
-
-    private $loggers = array(
-        E_DEPRECATED => array(null, LogLevel::INFO),
-        E_USER_DEPRECATED => array(null, LogLevel::INFO),
-        E_NOTICE => array(null, LogLevel::WARNING),
-        E_USER_NOTICE => array(null, LogLevel::WARNING),
-        E_STRICT => array(null, LogLevel::WARNING),
-        E_WARNING => array(null, LogLevel::WARNING),
-        E_USER_WARNING => array(null, LogLevel::WARNING),
-        E_COMPILE_WARNING => array(null, LogLevel::WARNING),
-        E_CORE_WARNING => array(null, LogLevel::WARNING),
-        E_USER_ERROR => array(null, LogLevel::CRITICAL),
-        E_RECOVERABLE_ERROR => array(null, LogLevel::CRITICAL),
-        E_COMPILE_ERROR => array(null, LogLevel::CRITICAL),
-        E_PARSE => array(null, LogLevel::CRITICAL),
-        E_ERROR => array(null, LogLevel::CRITICAL),
-        E_CORE_ERROR => array(null, LogLevel::CRITICAL),
-    );
-
-    private $thrownErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
-    private $scopedErrors = 0x1FFF; // E_ALL - E_DEPRECATED - E_USER_DEPRECATED
-    private $tracedErrors = 0x77FB; // E_ALL - E_STRICT - E_PARSE
-    private $screamedErrors = 0x55; // E_ERROR + E_CORE_ERROR + E_COMPILE_ERROR + E_PARSE
-    private $loggedErrors = 0;
-
-    private $loggedTraces = array();
-    private $isRecursive = 0;
-    private $exceptionHandler;
-
-    private static $reservedMemory;
-    private static $stackedErrors = array();
-    private static $stackedErrorLevels = array();
-
-    /**
-     * Same init value as thrownErrors.
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    private $displayErrors = 0x1FFF;
-
-    /**
-     * Registers the error handler.
-     *
-     * @param self|null|int $handler The handler to register, or @deprecated (since version 2.6, to be removed in 3.0) bit field of thrown levels
-     * @param bool          $replace Whether to replace or not any existing handler
-     *
-     * @return self The registered error handler
-     */
-    public static function register($handler = null, $replace = true)
-    {
-        if (null === self::$reservedMemory) {
-            self::$reservedMemory = str_repeat('x', 10240);
-            register_shutdown_function(__CLASS__.'::handleFatalError');
-        }
-
-        $levels = -1;
-
-        if ($handlerIsNew = !$handler instanceof self) {
-            // @deprecated polymorphism, to be removed in 3.0
-            if (null !== $handler) {
-                $levels = $replace ? $handler : 0;
-                $replace = true;
-            }
-            $handler = new static();
-        }
-
-        $prev = set_error_handler(array($handler, 'handleError'), $handler->thrownErrors | $handler->loggedErrors);
-
-        if ($handlerIsNew && is_array($prev) && $prev[0] instanceof self) {
-            $handler = $prev[0];
-            $replace = false;
-        }
-        if ($replace || !$prev) {
-            $handler->setExceptionHandler(set_exception_handler(array($handler, 'handleException')));
-        } else {
-            restore_error_handler();
-        }
-
-        $handler->throwAt($levels & $handler->thrownErrors, true);
-
-        return $handler;
-    }
-
-    /**
-     * Sets a logger to non assigned errors levels.
-     *
-     * @param LoggerInterface $logger  A PSR-3 logger to put as default for the given levels
-     * @param array|int       $levels  An array map of E_* to LogLevel::* or an integer bit field of E_* constants
-     * @param bool            $replace Whether to replace or not any existing logger
-     */
-    public function setDefaultLogger(LoggerInterface $logger, $levels = null, $replace = false)
-    {
-        $loggers = array();
-
-        if (is_array($levels)) {
-            foreach ($levels as $type => $logLevel) {
-                if (empty($this->loggers[$type][0]) || $replace) {
-                    $loggers[$type] = array($logger, $logLevel);
-                }
-            }
-        } else {
-            if (null === $levels) {
-                $levels = E_ALL | E_STRICT;
-            }
-            foreach ($this->loggers as $type => $log) {
-                if (($type & $levels) && (empty($log[0]) || $replace)) {
-                    $log[0] = $logger;
-                    $loggers[$type] = $log;
-                }
-            }
-        }
-
-        $this->setLoggers($loggers);
-    }
-
-    /**
-     * Sets a logger for each error level.
-     *
-     * @param array $loggers Error levels to [LoggerInterface|null, LogLevel::*] map
-     *
-     * @return array The previous map
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setLoggers(array $loggers)
-    {
-        $prevLogged = $this->loggedErrors;
-        $prev = $this->loggers;
-
-        foreach ($loggers as $type => $log) {
-            if (!isset($prev[$type])) {
-                throw new \InvalidArgumentException('Unknown error type: '.$type);
-            }
-            if (!is_array($log)) {
-                $log = array($log);
-            } elseif (!array_key_exists(0, $log)) {
-                throw new \InvalidArgumentException('No logger provided');
-            }
-            if (null === $log[0]) {
-                $this->loggedErrors &= ~$type;
-            } elseif ($log[0] instanceof LoggerInterface) {
-                $this->loggedErrors |= $type;
-            } else {
-                throw new \InvalidArgumentException('Invalid logger provided');
-            }
-            $this->loggers[$type] = $log + $prev[$type];
-        }
-        $this->reRegister($prevLogged | $this->thrownErrors);
-
-        return $prev;
-    }
-
-    /**
-     * Sets a user exception handler.
-     *
-     * @param callable $handler A handler that will be called on Exception
-     *
-     * @return callable|null The previous exception handler
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setExceptionHandler($handler)
-    {
-        if (null !== $handler && !is_callable($handler)) {
-            throw new \LogicException('The exception handler must be a valid PHP callable.');
-        }
-        $prev = $this->exceptionHandler;
-        $this->exceptionHandler = $handler;
-
-        return $prev;
-    }
-
-    /**
-     * Sets the PHP error levels that throw an exception when a PHP error occurs.
-     *
-     * @param int  $levels  A bit field of E_* constants for thrown errors
-     * @param bool $replace Replace or amend the previous value
-     *
-     * @return int The previous value
-     */
-    public function throwAt($levels, $replace = false)
-    {
-        $prev = $this->thrownErrors;
-        $this->thrownErrors = (E_ALL | E_STRICT) & ($levels | E_RECOVERABLE_ERROR | E_USER_ERROR) & ~E_USER_DEPRECATED & ~E_DEPRECATED;
-        if (!$replace) {
-            $this->thrownErrors |= $prev;
-        }
-        $this->reRegister($prev | $this->loggedErrors);
-
-        // $this->displayErrors is @deprecated since version 2.6
-        $this->displayErrors = $this->thrownErrors;
-
-        return $prev;
-    }
-
-    /**
-     * Sets the PHP error levels for which local variables are preserved.
-     *
-     * @param int  $levels  A bit field of E_* constants for scoped errors
-     * @param bool $replace Replace or amend the previous value
-     *
-     * @return int The previous value
-     */
-    public function scopeAt($levels, $replace = false)
-    {
-        $prev = $this->scopedErrors;
-        $this->scopedErrors = (int) $levels;
-        if (!$replace) {
-            $this->scopedErrors |= $prev;
-        }
-
-        return $prev;
-    }
-
-    /**
-     * Sets the PHP error levels for which the stack trace is preserved.
-     *
-     * @param int  $levels  A bit field of E_* constants for traced errors
-     * @param bool $replace Replace or amend the previous value
-     *
-     * @return int The previous value
-     */
-    public function traceAt($levels, $replace = false)
-    {
-        $prev = $this->tracedErrors;
-        $this->tracedErrors = (int) $levels;
-        if (!$replace) {
-            $this->tracedErrors |= $prev;
-        }
-
-        return $prev;
-    }
-
-    /**
-     * Sets the error levels where the @-operator is ignored.
-     *
-     * @param int  $levels  A bit field of E_* constants for screamed errors
-     * @param bool $replace Replace or amend the previous value
-     *
-     * @return int The previous value
-     */
-    public function screamAt($levels, $replace = false)
-    {
-        $prev = $this->screamedErrors;
-        $this->screamedErrors = (int) $levels;
-        if (!$replace) {
-            $this->screamedErrors |= $prev;
-        }
-
-        return $prev;
-    }
-
-    /**
-     * Re-registers as a PHP error handler if levels changed.
-     */
-    private function reRegister($prev)
-    {
-        if ($prev !== $this->thrownErrors | $this->loggedErrors) {
-            $handler = set_error_handler('var_dump', 0);
-            $handler = is_array($handler) ? $handler[0] : null;
-            restore_error_handler();
-            if ($handler === $this) {
-                restore_error_handler();
-                set_error_handler(array($this, 'handleError'), $this->thrownErrors | $this->loggedErrors);
-            }
-        }
-    }
-
-    /**
-     * Handles errors by filtering then logging them according to the configured bit fields.
-     *
-     * @param int    $type    One of the E_* constants
-     * @param string $file
-     * @param int    $line
-     * @param array  $context
-     *
-     * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself.
-     *
-     * @throws \ErrorException When $this->thrownErrors requests so
-     *
-     * @internal
-     */
-    public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
-    {
-        $level = error_reporting() | E_RECOVERABLE_ERROR | E_USER_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
-        $log = $this->loggedErrors & $type;
-        $throw = $this->thrownErrors & $type & $level;
-        $type &= $level | $this->screamedErrors;
-
-        if (!$type || (!$log && !$throw)) {
-            return $type && $log;
-        }
-
-        if (PHP_VERSION_ID < 50400 && isset($context['GLOBALS']) && ($this->scopedErrors & $type)) {
-            $e = $context;                  // Whatever the signature of the method,
-            unset($e['GLOBALS'], $context); // $context is always a reference in 5.3
-            $context = $e;
-        }
-
-        if (null !== $backtrace && $type & E_ERROR) {
-            // E_ERROR fatal errors are triggered on HHVM when
-            // hhvm.error_handling.call_user_handler_on_fatals=1
-            // which is the way to get their backtrace.
-            $this->handleFatalError(compact('type', 'message', 'file', 'line', 'backtrace'));
-
-            return true;
-        }
-
-        if ($throw) {
-            if (($this->scopedErrors & $type) && class_exists('Symfony\Component\Debug\Exception\ContextErrorException')) {
-                // Checking for class existence is a work around for https://bugs.php.net/42098
-                $throw = new ContextErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line, $context);
-            } else {
-                $throw = new \ErrorException($this->levels[$type].': '.$message, 0, $type, $file, $line);
-            }
-
-            if (PHP_VERSION_ID <= 50407 && (PHP_VERSION_ID >= 50400 || PHP_VERSION_ID <= 50317)) {
-                // Exceptions thrown from error handlers are sometimes not caught by the exception
-                // handler and shutdown handlers are bypassed before 5.4.8/5.3.18.
-                // We temporarily re-enable display_errors to prevent any blank page related to this bug.
-
-                $throw->errorHandlerCanary = new ErrorHandlerCanary();
-            }
-
-            throw $throw;
-        }
-
-        // For duplicated errors, log the trace only once
-        $e = md5("{$type}/{$line}/{$file}\x00{$message}", true);
-        $trace = true;
-
-        if (!($this->tracedErrors & $type) || isset($this->loggedTraces[$e])) {
-            $trace = false;
-        } else {
-            $this->loggedTraces[$e] = 1;
-        }
-
-        $e = compact('type', 'file', 'line', 'level');
-
-        if ($type & $level) {
-            if ($this->scopedErrors & $type) {
-                $e['scope_vars'] = $context;
-                if ($trace) {
-                    $e['stack'] = $backtrace ?: debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
-                }
-            } elseif ($trace) {
-                if (null === $backtrace) {
-                    $e['stack'] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                } else {
-                    foreach ($backtrace as &$frame) {
-                        unset($frame['args'], $frame);
-                    }
-                    $e['stack'] = $backtrace;
-                }
-            }
-        }
-
-        if ($this->isRecursive) {
-            $log = 0;
-        } elseif (self::$stackedErrorLevels) {
-            self::$stackedErrors[] = array($this->loggers[$type][0], ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, $message, $e);
-        } else {
-            try {
-                $this->isRecursive = true;
-                $this->loggers[$type][0]->log(($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, $message, $e);
-                $this->isRecursive = false;
-            } catch (\Exception $e) {
-                $this->isRecursive = false;
-
-                throw $e;
-            }
-        }
-
-        return $type && $log;
-    }
-
-    /**
-     * Handles an exception by logging then forwarding it to another handler.
-     *
-     * @param \Exception|\Throwable $exception An exception to handle
-     * @param array                 $error     An array as returned by error_get_last()
-     *
-     * @internal
-     */
-    public function handleException($exception, array $error = null)
-    {
-        if (!$exception instanceof \Exception) {
-            $exception = new FatalThrowableError($exception);
-        }
-        $type = $exception instanceof FatalErrorException ? $exception->getSeverity() : E_ERROR;
-
-        if ($this->loggedErrors & $type) {
-            $e = array(
-                'type' => $type,
-                'file' => $exception->getFile(),
-                'line' => $exception->getLine(),
-                'level' => error_reporting(),
-                'stack' => $exception->getTrace(),
-            );
-            if ($exception instanceof FatalErrorException) {
-                if ($exception instanceof FatalThrowableError) {
-                    $error = array(
-                        'type' => $type,
-                        'message' => $message = $exception->getMessage(),
-                        'file' => $e['file'],
-                        'line' => $e['line'],
-                    );
-                } else {
-                    $message = 'Fatal '.$exception->getMessage();
-                }
-            } elseif ($exception instanceof \ErrorException) {
-                $message = 'Uncaught '.$exception->getMessage();
-                if ($exception instanceof ContextErrorException) {
-                    $e['context'] = $exception->getContext();
-                }
-            } else {
-                $message = 'Uncaught Exception: '.$exception->getMessage();
-            }
-            if ($this->loggedErrors & $e['type']) {
-                $this->loggers[$e['type']][0]->log($this->loggers[$e['type']][1], $message, $e);
-            }
-        }
-        if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
-            foreach ($this->getFatalErrorHandlers() as $handler) {
-                if ($e = $handler->handleError($error, $exception)) {
-                    $exception = $e;
-                    break;
-                }
-            }
-        }
-        if (empty($this->exceptionHandler)) {
-            throw $exception; // Give back $exception to the native handler
-        }
-        try {
-            call_user_func($this->exceptionHandler, $exception);
-        } catch (\Exception $handlerException) {
-        } catch (\Throwable $handlerException) {
-        }
-        if (isset($handlerException)) {
-            $this->exceptionHandler = null;
-            $this->handleException($handlerException);
-        }
-    }
-
-    /**
-     * Shutdown registered function for handling PHP fatal errors.
-     *
-     * @param array $error An array as returned by error_get_last()
-     *
-     * @internal
-     */
-    public static function handleFatalError(array $error = null)
-    {
-        if (null === self::$reservedMemory) {
-            return;
-        }
-
-        self::$reservedMemory = null;
-
-        $handler = set_error_handler('var_dump', 0);
-        $handler = is_array($handler) ? $handler[0] : null;
-        restore_error_handler();
-
-        if (!$handler instanceof self) {
-            return;
-        }
-
-        if (null === $error) {
-            $error = error_get_last();
-        }
-
-        try {
-            while (self::$stackedErrorLevels) {
-                static::unstackErrors();
-            }
-        } catch (\Exception $exception) {
-            // Handled below
-        }
-
-        if ($error && $error['type'] &= E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR) {
-            // Let's not throw anymore but keep logging
-            $handler->throwAt(0, true);
-            $trace = isset($error['backtrace']) ? $error['backtrace'] : null;
-
-            if (0 === strpos($error['message'], 'Allowed memory') || 0 === strpos($error['message'], 'Out of memory')) {
-                $exception = new OutOfMemoryException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, false, $trace);
-            } else {
-                $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
-            }
-        } elseif (!isset($exception)) {
-            return;
-        }
-
-        try {
-            $handler->handleException($exception, $error);
-        } catch (FatalErrorException $e) {
-            // Ignore this re-throw
-        }
-    }
-
-    /**
-     * Configures the error handler for delayed handling.
-     * Ensures also that non-catchable fatal errors are never silenced.
-     *
-     * As shown by http://bugs.php.net/42098 and http://bugs.php.net/60724
-     * PHP has a compile stage where it behaves unusually. To workaround it,
-     * we plug an error handler that only stacks errors for later.
-     *
-     * The most important feature of this is to prevent
-     * autoloading until unstackErrors() is called.
-     */
-    public static function stackErrors()
-    {
-        self::$stackedErrorLevels[] = error_reporting(error_reporting() | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
-    }
-
-    /**
-     * Unstacks stacked errors and forwards to the logger.
-     */
-    public static function unstackErrors()
-    {
-        $level = array_pop(self::$stackedErrorLevels);
-
-        if (null !== $level) {
-            $e = error_reporting($level);
-            if ($e !== ($level | E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR)) {
-                // If the user changed the error level, do not overwrite it
-                error_reporting($e);
-            }
-        }
-
-        if (empty(self::$stackedErrorLevels)) {
-            $errors = self::$stackedErrors;
-            self::$stackedErrors = array();
-
-            foreach ($errors as $e) {
-                $e[0]->log($e[1], $e[2], $e[3]);
-            }
-        }
-    }
-
-    /**
-     * Gets the fatal error handlers.
-     *
-     * Override this method if you want to define more fatal error handlers.
-     *
-     * @return FatalErrorHandlerInterface[] An array of FatalErrorHandlerInterface
-     */
-    protected function getFatalErrorHandlers()
-    {
-        return array(
-            new UndefinedFunctionFatalErrorHandler(),
-            new UndefinedMethodFatalErrorHandler(),
-            new ClassNotFoundFatalErrorHandler(),
-        );
-    }
-
-    /**
-     * Sets the level at which the conversion to Exception is done.
-     *
-     * @param int|null $level The level (null to use the error_reporting() value and 0 to disable)
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
-     */
-    public function setLevel($level)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
-
-        $level = null === $level ? error_reporting() : $level;
-        $this->throwAt($level, true);
-    }
-
-    /**
-     * Sets the display_errors flag value.
-     *
-     * @param int $displayErrors The display_errors flag value
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use throwAt() instead.
-     */
-    public function setDisplayErrors($displayErrors)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the throwAt() method instead.', E_USER_DEPRECATED);
-
-        if ($displayErrors) {
-            $this->throwAt($this->displayErrors, true);
-        } else {
-            $displayErrors = $this->displayErrors;
-            $this->throwAt(0, true);
-            $this->displayErrors = $displayErrors;
-        }
-    }
-
-    /**
-     * Sets a logger for the given channel.
-     *
-     * @param LoggerInterface $logger  A logger interface
-     * @param string          $channel The channel associated with the logger (deprecation, emergency or scream)
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use setLoggers() or setDefaultLogger() instead.
-     */
-    public static function setLogger(LoggerInterface $logger, $channel = 'deprecation')
-    {
-        @trigger_error('The '.__METHOD__.' static method is deprecated since version 2.6 and will be removed in 3.0. Use the setLoggers() or setDefaultLogger() methods instead.', E_USER_DEPRECATED);
-
-        $handler = set_error_handler('var_dump', 0);
-        $handler = is_array($handler) ? $handler[0] : null;
-        restore_error_handler();
-        if (!$handler instanceof self) {
-            return;
-        }
-        if ('deprecation' === $channel) {
-            $handler->setDefaultLogger($logger, E_DEPRECATED | E_USER_DEPRECATED, true);
-            $handler->screamAt(E_DEPRECATED | E_USER_DEPRECATED);
-        } elseif ('scream' === $channel) {
-            $handler->setDefaultLogger($logger, E_ALL | E_STRICT, false);
-            $handler->screamAt(E_ALL | E_STRICT);
-        } elseif ('emergency' === $channel) {
-            $handler->setDefaultLogger($logger, E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR, true);
-            $handler->screamAt(E_PARSE | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
-        }
-    }
-
-    /**
-     * @deprecated since version 2.6, to be removed in 3.0. Use handleError() instead.
-     */
-    public function handle($level, $message, $file = 'unknown', $line = 0, $context = array())
-    {
-        $this->handleError(E_USER_DEPRECATED, 'The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleError() method instead.', __FILE__, __LINE__, array());
-
-        return $this->handleError($level, $message, $file, $line, (array) $context);
-    }
-
-    /**
-     * Handles PHP fatal errors.
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use handleFatalError() instead.
-     */
-    public function handleFatal()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the handleFatalError() method instead.', E_USER_DEPRECATED);
-
-        static::handleFatalError();
-    }
-}
-
-/**
- * Private class used to work around https://bugs.php.net/54275.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class ErrorHandlerCanary
-{
-    private static $displayErrors = null;
-
-    public function __construct()
-    {
-        if (null === self::$displayErrors) {
-            self::$displayErrors = ini_set('display_errors', 1);
-        }
-    }
-
-    public function __destruct()
-    {
-        if (null !== self::$displayErrors) {
-            ini_set('display_errors', self::$displayErrors);
-            self::$displayErrors = null;
-        }
-    }
-}
diff --git a/vendor/symfony/debug/Exception/ClassNotFoundException.php b/vendor/symfony/debug/Exception/ClassNotFoundException.php
deleted file mode 100644
index b91bf46..0000000
--- a/vendor/symfony/debug/Exception/ClassNotFoundException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Class (or Trait or Interface) Not Found Exception.
- *
- * @author Konstanton Myakshin <koc-dp@yandex.ru>
- */
-class ClassNotFoundException extends FatalErrorException
-{
-    public function __construct($message, \ErrorException $previous)
-    {
-        parent::__construct(
-            $message,
-            $previous->getCode(),
-            $previous->getSeverity(),
-            $previous->getFile(),
-            $previous->getLine(),
-            $previous->getPrevious()
-        );
-        $this->setTrace($previous->getTrace());
-    }
-}
diff --git a/vendor/symfony/debug/Exception/ContextErrorException.php b/vendor/symfony/debug/Exception/ContextErrorException.php
deleted file mode 100644
index 54f0198..0000000
--- a/vendor/symfony/debug/Exception/ContextErrorException.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Error Exception with Variable Context.
- *
- * @author Christian Sciberras <uuf6429@gmail.com>
- */
-class ContextErrorException extends \ErrorException
-{
-    private $context = array();
-
-    public function __construct($message, $code, $severity, $filename, $lineno, $context = array())
-    {
-        parent::__construct($message, $code, $severity, $filename, $lineno);
-        $this->context = $context;
-    }
-
-    /**
-     * @return array Array of variables that existed when the exception occurred
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-}
diff --git a/vendor/symfony/debug/Exception/DummyException.php b/vendor/symfony/debug/Exception/DummyException.php
deleted file mode 100644
index c836f87..0000000
--- a/vendor/symfony/debug/Exception/DummyException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Debug\Exception;
-
-@trigger_error('The '.__NAMESPACE__.'\DummyException class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class DummyException extends \ErrorException
-{
-}
diff --git a/vendor/symfony/debug/Exception/FatalErrorException.php b/vendor/symfony/debug/Exception/FatalErrorException.php
deleted file mode 100644
index db2fb43..0000000
--- a/vendor/symfony/debug/Exception/FatalErrorException.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * Fatal Error Exception.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Konstanton Myakshin <koc-dp@yandex.ru>
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class FatalErrorException extends \ErrorException
-{
-}
-
-namespace Symfony\Component\Debug\Exception;
-
-use Symfony\Component\HttpKernel\Exception\FatalErrorException as LegacyFatalErrorException;
-
-/**
- * Fatal Error Exception.
- *
- * @author Konstanton Myakshin <koc-dp@yandex.ru>
- */
-class FatalErrorException extends LegacyFatalErrorException
-{
-    public function __construct($message, $code, $severity, $filename, $lineno, $traceOffset = null, $traceArgs = true, array $trace = null)
-    {
-        parent::__construct($message, $code, $severity, $filename, $lineno);
-
-        if (null !== $trace) {
-            if (!$traceArgs) {
-                foreach ($trace as &$frame) {
-                    unset($frame['args'], $frame['this'], $frame);
-                }
-            }
-
-            $this->setTrace($trace);
-        } elseif (null !== $traceOffset) {
-            if (function_exists('xdebug_get_function_stack')) {
-                $trace = xdebug_get_function_stack();
-                if (0 < $traceOffset) {
-                    array_splice($trace, -$traceOffset);
-                }
-
-                foreach ($trace as &$frame) {
-                    if (!isset($frame['type'])) {
-                        // XDebug pre 2.1.1 doesn't currently set the call type key http://bugs.xdebug.org/view.php?id=695
-                        if (isset($frame['class'])) {
-                            $frame['type'] = '::';
-                        }
-                    } elseif ('dynamic' === $frame['type']) {
-                        $frame['type'] = '->';
-                    } elseif ('static' === $frame['type']) {
-                        $frame['type'] = '::';
-                    }
-
-                    // XDebug also has a different name for the parameters array
-                    if (!$traceArgs) {
-                        unset($frame['params'], $frame['args']);
-                    } elseif (isset($frame['params']) && !isset($frame['args'])) {
-                        $frame['args'] = $frame['params'];
-                        unset($frame['params']);
-                    }
-                }
-
-                unset($frame);
-                $trace = array_reverse($trace);
-            } elseif (function_exists('symfony_debug_backtrace')) {
-                $trace = symfony_debug_backtrace();
-                if (0 < $traceOffset) {
-                    array_splice($trace, 0, $traceOffset);
-                }
-            } else {
-                $trace = array();
-            }
-
-            $this->setTrace($trace);
-        }
-    }
-
-    protected function setTrace($trace)
-    {
-        $traceReflector = new \ReflectionProperty('Exception', 'trace');
-        $traceReflector->setAccessible(true);
-        $traceReflector->setValue($this, $trace);
-    }
-}
diff --git a/vendor/symfony/debug/Exception/FatalThrowableError.php b/vendor/symfony/debug/Exception/FatalThrowableError.php
deleted file mode 100644
index 6ff5ecd..0000000
--- a/vendor/symfony/debug/Exception/FatalThrowableError.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Fatal Throwable Error.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class FatalThrowableError extends FatalErrorException
-{
-    public function __construct(\Throwable $e)
-    {
-        if ($e instanceof \ParseError) {
-            $message = 'Parse error: '.$e->getMessage();
-            $severity = E_PARSE;
-        } elseif ($e instanceof \TypeError) {
-            $message = 'Type error: '.$e->getMessage();
-            $severity = E_RECOVERABLE_ERROR;
-        } else {
-            $message = 'Fatal error: '.$e->getMessage();
-            $severity = E_ERROR;
-        }
-
-        \ErrorException::__construct(
-            $message,
-            $e->getCode(),
-            $severity,
-            $e->getFile(),
-            $e->getLine()
-        );
-
-        $this->setTrace($e->getTrace());
-    }
-}
diff --git a/vendor/symfony/debug/Exception/FlattenException.php b/vendor/symfony/debug/Exception/FlattenException.php
deleted file mode 100644
index d8d5c5b..0000000
--- a/vendor/symfony/debug/Exception/FlattenException.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-use Symfony\Component\Debug\Exception\FlattenException as DebugFlattenException;
-
-/**
- * FlattenException wraps a PHP Exception to be able to serialize it.
- *
- * Basically, this class removes all objects from the trace.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated Deprecated in 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class FlattenException
-{
-    private $handler;
-
-    public static function __callStatic($method, $args)
-    {
-        if (!method_exists('Symfony\Component\Debug\Exception\FlattenException', $method)) {
-            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_called_class(), $method));
-        }
-
-        return call_user_func_array(array('Symfony\Component\Debug\Exception\FlattenException', $method), $args);
-    }
-
-    public function __call($method, $args)
-    {
-        if (!isset($this->handler)) {
-            $this->handler = new DebugFlattenException();
-        }
-
-        if (!method_exists($this->handler, $method)) {
-            throw new \BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_class($this), $method));
-        }
-
-        return call_user_func_array(array($this->handler, $method), $args);
-    }
-}
-
-namespace Symfony\Component\Debug\Exception;
-
-use Symfony\Component\HttpKernel\Exception\FlattenException as LegacyFlattenException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-
-/**
- * FlattenException wraps a PHP Exception to be able to serialize it.
- *
- * Basically, this class removes all objects from the trace.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FlattenException extends LegacyFlattenException
-{
-    private $message;
-    private $code;
-    private $previous;
-    private $trace;
-    private $class;
-    private $statusCode;
-    private $headers;
-    private $file;
-    private $line;
-
-    public static function create(\Exception $exception, $statusCode = null, array $headers = array())
-    {
-        $e = new static();
-        $e->setMessage($exception->getMessage());
-        $e->setCode($exception->getCode());
-
-        if ($exception instanceof HttpExceptionInterface) {
-            $statusCode = $exception->getStatusCode();
-            $headers = array_merge($headers, $exception->getHeaders());
-        }
-
-        if (null === $statusCode) {
-            $statusCode = 500;
-        }
-
-        $e->setStatusCode($statusCode);
-        $e->setHeaders($headers);
-        $e->setTraceFromException($exception);
-        $e->setClass(get_class($exception));
-        $e->setFile($exception->getFile());
-        $e->setLine($exception->getLine());
-        if ($exception->getPrevious()) {
-            $e->setPrevious(static::create($exception->getPrevious()));
-        }
-
-        return $e;
-    }
-
-    public function toArray()
-    {
-        $exceptions = array();
-        foreach (array_merge(array($this), $this->getAllPrevious()) as $exception) {
-            $exceptions[] = array(
-                'message' => $exception->getMessage(),
-                'class' => $exception->getClass(),
-                'trace' => $exception->getTrace(),
-            );
-        }
-
-        return $exceptions;
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function setStatusCode($code)
-    {
-        $this->statusCode = $code;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->headers = $headers;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function setClass($class)
-    {
-        $this->class = $class;
-    }
-
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    public function setFile($file)
-    {
-        $this->file = $file;
-    }
-
-    public function getLine()
-    {
-        return $this->line;
-    }
-
-    public function setLine($line)
-    {
-        $this->line = $line;
-    }
-
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    public function setMessage($message)
-    {
-        $this->message = $message;
-    }
-
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    public function setCode($code)
-    {
-        $this->code = $code;
-    }
-
-    public function getPrevious()
-    {
-        return $this->previous;
-    }
-
-    public function setPrevious(FlattenException $previous)
-    {
-        $this->previous = $previous;
-    }
-
-    public function getAllPrevious()
-    {
-        $exceptions = array();
-        $e = $this;
-        while ($e = $e->getPrevious()) {
-            $exceptions[] = $e;
-        }
-
-        return $exceptions;
-    }
-
-    public function getTrace()
-    {
-        return $this->trace;
-    }
-
-    public function setTraceFromException(\Exception $exception)
-    {
-        $this->setTrace($exception->getTrace(), $exception->getFile(), $exception->getLine());
-    }
-
-    public function setTrace($trace, $file, $line)
-    {
-        $this->trace = array();
-        $this->trace[] = array(
-            'namespace' => '',
-            'short_class' => '',
-            'class' => '',
-            'type' => '',
-            'function' => '',
-            'file' => $file,
-            'line' => $line,
-            'args' => array(),
-        );
-        foreach ($trace as $entry) {
-            $class = '';
-            $namespace = '';
-            if (isset($entry['class'])) {
-                $parts = explode('\\', $entry['class']);
-                $class = array_pop($parts);
-                $namespace = implode('\\', $parts);
-            }
-
-            $this->trace[] = array(
-                'namespace' => $namespace,
-                'short_class' => $class,
-                'class' => isset($entry['class']) ? $entry['class'] : '',
-                'type' => isset($entry['type']) ? $entry['type'] : '',
-                'function' => isset($entry['function']) ? $entry['function'] : null,
-                'file' => isset($entry['file']) ? $entry['file'] : null,
-                'line' => isset($entry['line']) ? $entry['line'] : null,
-                'args' => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),
-            );
-        }
-    }
-
-    private function flattenArgs($args, $level = 0, &$count = 0)
-    {
-        $result = array();
-        foreach ($args as $key => $value) {
-            if (++$count > 1e4) {
-                return array('array', '*SKIPPED over 10000 entries*');
-            }
-            if (is_object($value)) {
-                $result[$key] = array('object', get_class($value));
-            } elseif (is_array($value)) {
-                if ($level > 10) {
-                    $result[$key] = array('array', '*DEEP NESTED ARRAY*');
-                } else {
-                    $result[$key] = array('array', $this->flattenArgs($value, $level + 1, $count));
-                }
-            } elseif (null === $value) {
-                $result[$key] = array('null', null);
-            } elseif (is_bool($value)) {
-                $result[$key] = array('boolean', $value);
-            } elseif (is_resource($value)) {
-                $result[$key] = array('resource', get_resource_type($value));
-            } elseif ($value instanceof \__PHP_Incomplete_Class) {
-                // Special case of object, is_object will return false
-                $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value));
-            } else {
-                $result[$key] = array('string', (string) $value);
-            }
-        }
-
-        return $result;
-    }
-
-    private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value)
-    {
-        $array = new \ArrayObject($value);
-
-        return $array['__PHP_Incomplete_Class_Name'];
-    }
-}
diff --git a/vendor/symfony/debug/Exception/OutOfMemoryException.php b/vendor/symfony/debug/Exception/OutOfMemoryException.php
deleted file mode 100644
index fec1979..0000000
--- a/vendor/symfony/debug/Exception/OutOfMemoryException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Out of memory exception.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class OutOfMemoryException extends FatalErrorException
-{
-}
diff --git a/vendor/symfony/debug/Exception/UndefinedFunctionException.php b/vendor/symfony/debug/Exception/UndefinedFunctionException.php
deleted file mode 100644
index a66ae2a..0000000
--- a/vendor/symfony/debug/Exception/UndefinedFunctionException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Undefined Function Exception.
- *
- * @author Konstanton Myakshin <koc-dp@yandex.ru>
- */
-class UndefinedFunctionException extends FatalErrorException
-{
-    public function __construct($message, \ErrorException $previous)
-    {
-        parent::__construct(
-            $message,
-            $previous->getCode(),
-            $previous->getSeverity(),
-            $previous->getFile(),
-            $previous->getLine(),
-            $previous->getPrevious()
-        );
-        $this->setTrace($previous->getTrace());
-    }
-}
diff --git a/vendor/symfony/debug/Exception/UndefinedMethodException.php b/vendor/symfony/debug/Exception/UndefinedMethodException.php
deleted file mode 100644
index 350dc31..0000000
--- a/vendor/symfony/debug/Exception/UndefinedMethodException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Debug\Exception;
-
-/**
- * Undefined Method Exception.
- *
- * @author Grégoire Pineau <lyrixx@lyrixx.info>
- */
-class UndefinedMethodException extends FatalErrorException
-{
-    public function __construct($message, \ErrorException $previous)
-    {
-        parent::__construct(
-            $message,
-            $previous->getCode(),
-            $previous->getSeverity(),
-            $previous->getFile(),
-            $previous->getLine(),
-            $previous->getPrevious()
-        );
-        $this->setTrace($previous->getTrace());
-    }
-}
diff --git a/vendor/symfony/debug/ExceptionHandler.php b/vendor/symfony/debug/ExceptionHandler.php
deleted file mode 100644
index 027b66c..0000000
--- a/vendor/symfony/debug/ExceptionHandler.php
+++ /dev/null
@@ -1,472 +0,0 @@
-<?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\Component\Debug;
-
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\Debug\Exception\OutOfMemoryException;
-
-/**
- * ExceptionHandler converts an exception to a Response object.
- *
- * It is mostly useful in debug mode to replace the default PHP/XDebug
- * output with something prettier and more useful.
- *
- * As this class is mainly used during Kernel boot, where nothing is yet
- * available, the Response content is always HTML.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class ExceptionHandler
-{
-    private $debug;
-    private $charset;
-    private $handler;
-    private $caughtBuffer;
-    private $caughtLength;
-    private $fileLinkFormat;
-
-    public function __construct($debug = true, $charset = null, $fileLinkFormat = null)
-    {
-        if (false !== strpos($charset, '%')) {
-            // Swap $charset and $fileLinkFormat for BC reasons
-            $pivot = $fileLinkFormat;
-            $fileLinkFormat = $charset;
-            $charset = $pivot;
-        }
-        $this->debug = $debug;
-        $this->charset = $charset ?: ini_get('default_charset') ?: 'UTF-8';
-        $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-    }
-
-    /**
-     * Registers the exception handler.
-     *
-     * @param bool        $debug          Enable/disable debug mode, where the stack trace is displayed
-     * @param string|null $charset        The charset used by exception messages
-     * @param string|null $fileLinkFormat The IDE link template
-     *
-     * @return ExceptionHandler The registered exception handler
-     */
-    public static function register($debug = true, $charset = null, $fileLinkFormat = null)
-    {
-        $handler = new static($debug, $charset, $fileLinkFormat);
-
-        $prev = set_exception_handler(array($handler, 'handle'));
-        if (is_array($prev) && $prev[0] instanceof ErrorHandler) {
-            restore_exception_handler();
-            $prev[0]->setExceptionHandler(array($handler, 'handle'));
-        }
-
-        return $handler;
-    }
-
-    /**
-     * Sets a user exception handler.
-     *
-     * @param callable $handler An handler that will be called on Exception
-     *
-     * @return callable|null The previous exception handler if any
-     */
-    public function setHandler($handler)
-    {
-        if (null !== $handler && !is_callable($handler)) {
-            throw new \LogicException('The exception handler must be a valid PHP callable.');
-        }
-        $old = $this->handler;
-        $this->handler = $handler;
-
-        return $old;
-    }
-
-    /**
-     * Sets the format for links to source files.
-     *
-     * @param string $format The format for links to source files
-     *
-     * @return string The previous file link format.
-     */
-    public function setFileLinkFormat($format)
-    {
-        $old = $this->fileLinkFormat;
-        $this->fileLinkFormat = $format;
-
-        return $old;
-    }
-
-    /**
-     * Sends a response for the given Exception.
-     *
-     * To be as fail-safe as possible, the exception is first handled
-     * by our simple exception handler, then by the user exception handler.
-     * The latter takes precedence and any output from the former is cancelled,
-     * if and only if nothing bad happens in this handling path.
-     */
-    public function handle(\Exception $exception)
-    {
-        if (null === $this->handler || $exception instanceof OutOfMemoryException) {
-            $this->failSafeHandle($exception);
-
-            return;
-        }
-
-        $caughtLength = $this->caughtLength = 0;
-
-        ob_start(array($this, 'catchOutput'));
-        $this->failSafeHandle($exception);
-        while (null === $this->caughtBuffer && ob_end_flush()) {
-            // Empty loop, everything is in the condition
-        }
-        if (isset($this->caughtBuffer[0])) {
-            ob_start(array($this, 'cleanOutput'));
-            echo $this->caughtBuffer;
-            $caughtLength = ob_get_length();
-        }
-        $this->caughtBuffer = null;
-
-        try {
-            call_user_func($this->handler, $exception);
-            $this->caughtLength = $caughtLength;
-        } catch (\Exception $e) {
-            if (!$caughtLength) {
-                // All handlers failed. Let PHP handle that now.
-                throw $exception;
-            }
-        }
-    }
-
-    /**
-     * Sends a response for the given Exception.
-     *
-     * If you have the Symfony HttpFoundation component installed,
-     * this method will use it to create and send the response. If not,
-     * it will fallback to plain PHP functions.
-     *
-     * @param \Exception $exception An \Exception instance
-     */
-    private function failSafeHandle(\Exception $exception)
-    {
-        if (class_exists('Symfony\Component\HttpFoundation\Response', false)
-            && __CLASS__ !== get_class($this)
-            && ($reflector = new \ReflectionMethod($this, 'createResponse'))
-            && __CLASS__ !== $reflector->class
-        ) {
-            $response = $this->createResponse($exception);
-            $response->sendHeaders();
-            $response->sendContent();
-
-            return;
-        }
-
-        $this->sendPhpResponse($exception);
-    }
-
-    /**
-     * Sends the error associated with the given Exception as a plain PHP response.
-     *
-     * This method uses plain PHP functions like header() and echo to output
-     * the response.
-     *
-     * @param \Exception|FlattenException $exception An \Exception instance
-     */
-    public function sendPhpResponse($exception)
-    {
-        if (!$exception instanceof FlattenException) {
-            $exception = FlattenException::create($exception);
-        }
-
-        if (!headers_sent()) {
-            header(sprintf('HTTP/1.0 %s', $exception->getStatusCode()));
-            foreach ($exception->getHeaders() as $name => $value) {
-                header($name.': '.$value, false);
-            }
-            header('Content-Type: text/html; charset='.$this->charset);
-        }
-
-        echo $this->decorate($this->getContent($exception), $this->getStylesheet($exception));
-    }
-
-    /**
-     * Creates the error Response associated with the given Exception.
-     *
-     * @param \Exception|FlattenException $exception An \Exception instance
-     *
-     * @return Response A Response instance
-     */
-    public function createResponse($exception)
-    {
-        if (!$exception instanceof FlattenException) {
-            $exception = FlattenException::create($exception);
-        }
-
-        return Response::create($this->decorate($this->getContent($exception), $this->getStylesheet($exception)), $exception->getStatusCode(), $exception->getHeaders())->setCharset($this->charset);
-    }
-
-    /**
-     * Gets the HTML content associated with the given exception.
-     *
-     * @param FlattenException $exception A FlattenException instance
-     *
-     * @return string The content as a string
-     */
-    public function getContent(FlattenException $exception)
-    {
-        switch ($exception->getStatusCode()) {
-            case 404:
-                $title = 'Sorry, the page you are looking for could not be found.';
-                break;
-            default:
-                $title = 'Whoops, looks like something went wrong.';
-        }
-
-        $content = '';
-        if ($this->debug) {
-            try {
-                $count = count($exception->getAllPrevious());
-                $total = $count + 1;
-                foreach ($exception->toArray() as $position => $e) {
-                    $ind = $count - $position + 1;
-                    $class = $this->formatClass($e['class']);
-                    $message = nl2br($this->escapeHtml($e['message']));
-                    $content .= sprintf(<<<EOF
-                        <h2 class="block_exception clear_fix">
-                            <span class="exception_counter">%d/%d</span>
-                            <span class="exception_title">%s%s:</span>
-                            <span class="exception_message">%s</span>
-                        </h2>
-                        <div class="block">
-                            <ol class="traces list_exception">
-
-EOF
-                        , $ind, $total, $class, $this->formatPath($e['trace'][0]['file'], $e['trace'][0]['line']), $message);
-                    foreach ($e['trace'] as $trace) {
-                        $content .= '       <li>';
-                        if ($trace['function']) {
-                            $content .= sprintf('at %s%s%s(%s)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
-                        }
-                        if (isset($trace['file']) && isset($trace['line'])) {
-                            $content .= $this->formatPath($trace['file'], $trace['line']);
-                        }
-                        $content .= "</li>\n";
-                    }
-
-                    $content .= "    </ol>\n</div>\n";
-                }
-            } catch (\Exception $e) {
-                // something nasty happened and we cannot throw an exception anymore
-                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
-                } else {
-                    $title = 'Whoops, looks like something went wrong.';
-                }
-            }
-        }
-
-        return <<<EOF
-            <div id="sf-resetcontent" class="sf-reset">
-                <h1>$title</h1>
-                $content
-            </div>
-EOF;
-    }
-
-    /**
-     * Gets the stylesheet associated with the given exception.
-     *
-     * @param FlattenException $exception A FlattenException instance
-     *
-     * @return string The stylesheet as a string
-     */
-    public function getStylesheet(FlattenException $exception)
-    {
-        return <<<EOF
-            .sf-reset { font: 11px Verdana, Arial, sans-serif; color: #333 }
-            .sf-reset .clear { clear:both; height:0; font-size:0; line-height:0; }
-            .sf-reset .clear_fix:after { display:block; height:0; clear:both; visibility:hidden; }
-            .sf-reset .clear_fix { display:inline-block; }
-            .sf-reset * html .clear_fix { height:1%; }
-            .sf-reset .clear_fix { display:block; }
-            .sf-reset, .sf-reset .block { margin: auto }
-            .sf-reset abbr { border-bottom: 1px dotted #000; cursor: help; }
-            .sf-reset p { font-size:14px; line-height:20px; color:#868686; padding-bottom:20px }
-            .sf-reset strong { font-weight:bold; }
-            .sf-reset a { color:#6c6159; cursor: default; }
-            .sf-reset a img { border:none; }
-            .sf-reset a:hover { text-decoration:underline; }
-            .sf-reset em { font-style:italic; }
-            .sf-reset h1, .sf-reset h2 { font: 20px Georgia, "Times New Roman", Times, serif }
-            .sf-reset .exception_counter { background-color: #fff; color: #333; padding: 6px; float: left; margin-right: 10px; float: left; display: block; }
-            .sf-reset .exception_title { margin-left: 3em; margin-bottom: 0.7em; display: block; }
-            .sf-reset .exception_message { margin-left: 3em; display: block; }
-            .sf-reset .traces li { font-size:12px; padding: 2px 4px; list-style-type:decimal; margin-left:20px; }
-            .sf-reset .block { background-color:#FFFFFF; padding:10px 28px; margin-bottom:20px;
-                -webkit-border-bottom-right-radius: 16px;
-                -webkit-border-bottom-left-radius: 16px;
-                -moz-border-radius-bottomright: 16px;
-                -moz-border-radius-bottomleft: 16px;
-                border-bottom-right-radius: 16px;
-                border-bottom-left-radius: 16px;
-                border-bottom:1px solid #ccc;
-                border-right:1px solid #ccc;
-                border-left:1px solid #ccc;
-            }
-            .sf-reset .block_exception { background-color:#ddd; color: #333; padding:20px;
-                -webkit-border-top-left-radius: 16px;
-                -webkit-border-top-right-radius: 16px;
-                -moz-border-radius-topleft: 16px;
-                -moz-border-radius-topright: 16px;
-                border-top-left-radius: 16px;
-                border-top-right-radius: 16px;
-                border-top:1px solid #ccc;
-                border-right:1px solid #ccc;
-                border-left:1px solid #ccc;
-                overflow: hidden;
-                word-wrap: break-word;
-            }
-            .sf-reset a { background:none; color:#868686; text-decoration:none; }
-            .sf-reset a:hover { background:none; color:#313131; text-decoration:underline; }
-            .sf-reset ol { padding: 10px 0; }
-            .sf-reset h1 { background-color:#FFFFFF; padding: 15px 28px; margin-bottom: 20px;
-                -webkit-border-radius: 10px;
-                -moz-border-radius: 10px;
-                border-radius: 10px;
-                border: 1px solid #ccc;
-            }
-EOF;
-    }
-
-    private function decorate($content, $css)
-    {
-        return <<<EOF
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="{$this->charset}" />
-        <meta name="robots" content="noindex,nofollow" />
-        <style>
-            /* Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html */
-            html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
-
-            html { background: #eee; padding: 10px }
-            img { border: 0; }
-            #sf-resetcontent { width:970px; margin:0 auto; }
-            $css
-        </style>
-    </head>
-    <body>
-        $content
-    </body>
-</html>
-EOF;
-    }
-
-    private function formatClass($class)
-    {
-        $parts = explode('\\', $class);
-
-        return sprintf('<abbr title="%s">%s</abbr>', $class, array_pop($parts));
-    }
-
-    private function formatPath($path, $line)
-    {
-        $path = $this->escapeHtml($path);
-        $file = preg_match('#[^/\\\\]*$#', $path, $file) ? $file[0] : $path;
-
-        if ($linkFormat = $this->fileLinkFormat) {
-            $link = strtr($this->escapeHtml($linkFormat), array('%f' => $path, '%l' => (int) $line));
-
-            return sprintf(' in <a href="%s" title="Go to source">%s line %d</a>', $link, $file, $line);
-        }
-
-        return sprintf(' in <a title="%s line %3$d" ondblclick="var f=this.innerHTML;this.innerHTML=this.title;this.title=f;">%s line %d</a>', $path, $file, $line);
-    }
-
-    /**
-     * Formats an array as a string.
-     *
-     * @param array $args The argument array
-     *
-     * @return string
-     */
-    private function formatArgs(array $args)
-    {
-        $result = array();
-        foreach ($args as $key => $item) {
-            if ('object' === $item[0]) {
-                $formattedValue = sprintf('<em>object</em>(%s)', $this->formatClass($item[1]));
-            } elseif ('array' === $item[0]) {
-                $formattedValue = sprintf('<em>array</em>(%s)', is_array($item[1]) ? $this->formatArgs($item[1]) : $item[1]);
-            } elseif ('string' === $item[0]) {
-                $formattedValue = sprintf("'%s'", $this->escapeHtml($item[1]));
-            } elseif ('null' === $item[0]) {
-                $formattedValue = '<em>null</em>';
-            } elseif ('boolean' === $item[0]) {
-                $formattedValue = '<em>'.strtolower(var_export($item[1], true)).'</em>';
-            } elseif ('resource' === $item[0]) {
-                $formattedValue = '<em>resource</em>';
-            } else {
-                $formattedValue = str_replace("\n", '', var_export($this->escapeHtml((string) $item[1]), true));
-            }
-
-            $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", $key, $formattedValue);
-        }
-
-        return implode(', ', $result);
-    }
-
-    /**
-     * Returns an UTF-8 and HTML encoded string.
-     *
-     * @deprecated since version 2.7, to be removed in 3.0.
-     */
-    protected static function utf8Htmlize($str)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
-    }
-
-    /**
-     * HTML-encodes a string.
-     */
-    private function escapeHtml($str)
-    {
-        return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), $this->charset);
-    }
-
-    /**
-     * @internal
-     */
-    public function catchOutput($buffer)
-    {
-        $this->caughtBuffer = $buffer;
-
-        return '';
-    }
-
-    /**
-     * @internal
-     */
-    public function cleanOutput($buffer)
-    {
-        if ($this->caughtLength) {
-            // use substr_replace() instead of substr() for mbstring overloading resistance
-            $cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
-            if (isset($cleanBuffer[0])) {
-                $buffer = $cleanBuffer;
-            }
-        }
-
-        return $buffer;
-    }
-}
diff --git a/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
deleted file mode 100644
index abfe90d..0000000
--- a/vendor/symfony/debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?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\Component\Debug\FatalErrorHandler;
-
-use Symfony\Component\Debug\Exception\ClassNotFoundException;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\DebugClassLoader;
-use Composer\Autoload\ClassLoader as ComposerClassLoader;
-use Symfony\Component\ClassLoader\ClassLoader as SymfonyClassLoader;
-use Symfony\Component\ClassLoader\UniversalClassLoader as SymfonyUniversalClassLoader;
-
-/**
- * ErrorHandler for classes that do not exist.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handleError(array $error, FatalErrorException $exception)
-    {
-        $messageLen = strlen($error['message']);
-        $notFoundSuffix = '\' not found';
-        $notFoundSuffixLen = strlen($notFoundSuffix);
-        if ($notFoundSuffixLen > $messageLen) {
-            return;
-        }
-
-        if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
-            return;
-        }
-
-        foreach (array('class', 'interface', 'trait') as $typeName) {
-            $prefix = ucfirst($typeName).' \'';
-            $prefixLen = strlen($prefix);
-            if (0 !== strpos($error['message'], $prefix)) {
-                continue;
-            }
-
-            $fullyQualifiedClassName = substr($error['message'], $prefixLen, -$notFoundSuffixLen);
-            if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedClassName, '\\')) {
-                $className = substr($fullyQualifiedClassName, $namespaceSeparatorIndex + 1);
-                $namespacePrefix = substr($fullyQualifiedClassName, 0, $namespaceSeparatorIndex);
-                $message = sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
-                $tail = ' for another namespace?';
-            } else {
-                $className = $fullyQualifiedClassName;
-                $message = sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
-                $tail = '?';
-            }
-
-            if ($candidates = $this->getClassCandidates($className)) {
-                $tail = array_pop($candidates).'"?';
-                if ($candidates) {
-                    $tail = ' for e.g. "'.implode('", "', $candidates).'" or "'.$tail;
-                } else {
-                    $tail = ' for "'.$tail;
-                }
-            }
-            $message .= "\nDid you forget a \"use\" statement".$tail;
-
-            return new ClassNotFoundException($message, $exception);
-        }
-    }
-
-    /**
-     * Tries to guess the full namespace for a given class name.
-     *
-     * By default, it looks for PSR-0 and PSR-4 classes registered via a Symfony or a Composer
-     * autoloader (that should cover all common cases).
-     *
-     * @param string $class A class name (without its namespace)
-     *
-     * @return array An array of possible fully qualified class names
-     */
-    private function getClassCandidates($class)
-    {
-        if (!is_array($functions = spl_autoload_functions())) {
-            return array();
-        }
-
-        // find Symfony and Composer autoloaders
-        $classes = array();
-
-        foreach ($functions as $function) {
-            if (!is_array($function)) {
-                continue;
-            }
-            // get class loaders wrapped by DebugClassLoader
-            if ($function[0] instanceof DebugClassLoader) {
-                $function = $function[0]->getClassLoader();
-
-                // @deprecated since version 2.5. Returning an object from DebugClassLoader::getClassLoader() is deprecated.
-                if (is_object($function)) {
-                    $function = array($function);
-                }
-
-                if (!is_array($function)) {
-                    continue;
-                }
-            }
-
-            if ($function[0] instanceof ComposerClassLoader || $function[0] instanceof SymfonyClassLoader || $function[0] instanceof SymfonyUniversalClassLoader) {
-                foreach ($function[0]->getPrefixes() as $prefix => $paths) {
-                    foreach ($paths as $path) {
-                        $classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));
-                    }
-                }
-            }
-            if ($function[0] instanceof ComposerClassLoader) {
-                foreach ($function[0]->getPrefixesPsr4() as $prefix => $paths) {
-                    foreach ($paths as $path) {
-                        $classes = array_merge($classes, $this->findClassInPath($path, $class, $prefix));
-                    }
-                }
-            }
-        }
-
-        return array_unique($classes);
-    }
-
-    /**
-     * @param string $path
-     * @param string $class
-     * @param string $prefix
-     *
-     * @return array
-     */
-    private function findClassInPath($path, $class, $prefix)
-    {
-        if (!$path = realpath($path.'/'.strtr($prefix, '\\_', '//')) ?: realpath($path.'/'.dirname(strtr($prefix, '\\_', '//'))) ?: realpath($path)) {
-            return array();
-        }
-
-        $classes = array();
-        $filename = $class.'.php';
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if ($filename == $file->getFileName() && $class = $this->convertFileToClass($path, $file->getPathName(), $prefix)) {
-                $classes[] = $class;
-            }
-        }
-
-        return $classes;
-    }
-
-    /**
-     * @param string $path
-     * @param string $file
-     * @param string $prefix
-     *
-     * @return string|null
-     */
-    private function convertFileToClass($path, $file, $prefix)
-    {
-        $candidates = array(
-            // namespaced class
-            $namespacedClass = str_replace(array($path.DIRECTORY_SEPARATOR, '.php', '/'), array('', '', '\\'), $file),
-            // namespaced class (with target dir)
-            $prefix.$namespacedClass,
-            // namespaced class (with target dir and separator)
-            $prefix.'\\'.$namespacedClass,
-            // PEAR class
-            str_replace('\\', '_', $namespacedClass),
-            // PEAR class (with target dir)
-            str_replace('\\', '_', $prefix.$namespacedClass),
-            // PEAR class (with target dir and separator)
-            str_replace('\\', '_', $prefix.'\\'.$namespacedClass),
-        );
-
-        if ($prefix) {
-            $candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
-        }
-
-        // We cannot use the autoloader here as most of them use require; but if the class
-        // is not found, the new autoloader call will require the file again leading to a
-        // "cannot redeclare class" error.
-        foreach ($candidates as $candidate) {
-            if ($this->classExists($candidate)) {
-                return $candidate;
-            }
-        }
-
-        require_once $file;
-
-        foreach ($candidates as $candidate) {
-            if ($this->classExists($candidate)) {
-                return $candidate;
-            }
-        }
-    }
-
-    /**
-     * @param string $class
-     *
-     * @return bool
-     */
-    private function classExists($class)
-    {
-        return class_exists($class, false) || interface_exists($class, false) || (function_exists('trait_exists') && trait_exists($class, false));
-    }
-}
diff --git a/vendor/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php b/vendor/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php
deleted file mode 100644
index 6b87eb3..0000000
--- a/vendor/symfony/debug/FatalErrorHandler/FatalErrorHandlerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\Debug\FatalErrorHandler;
-
-use Symfony\Component\Debug\Exception\FatalErrorException;
-
-/**
- * Attempts to convert fatal errors to exceptions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface FatalErrorHandlerInterface
-{
-    /**
-     * Attempts to convert an error into an exception.
-     *
-     * @param array               $error     An array as returned by error_get_last()
-     * @param FatalErrorException $exception A FatalErrorException instance
-     *
-     * @return FatalErrorException|null A FatalErrorException instance if the class is able to convert the error, null otherwise
-     */
-    public function handleError(array $error, FatalErrorException $exception);
-}
diff --git a/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
deleted file mode 100644
index c6f391a..0000000
--- a/vendor/symfony/debug/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\Debug\FatalErrorHandler;
-
-use Symfony\Component\Debug\Exception\UndefinedFunctionException;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-
-/**
- * ErrorHandler for undefined functions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handleError(array $error, FatalErrorException $exception)
-    {
-        $messageLen = strlen($error['message']);
-        $notFoundSuffix = '()';
-        $notFoundSuffixLen = strlen($notFoundSuffix);
-        if ($notFoundSuffixLen > $messageLen) {
-            return;
-        }
-
-        if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
-            return;
-        }
-
-        $prefix = 'Call to undefined function ';
-        $prefixLen = strlen($prefix);
-        if (0 !== strpos($error['message'], $prefix)) {
-            return;
-        }
-
-        $fullyQualifiedFunctionName = substr($error['message'], $prefixLen, -$notFoundSuffixLen);
-        if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedFunctionName, '\\')) {
-            $functionName = substr($fullyQualifiedFunctionName, $namespaceSeparatorIndex + 1);
-            $namespacePrefix = substr($fullyQualifiedFunctionName, 0, $namespaceSeparatorIndex);
-            $message = sprintf('Attempted to call function "%s" from namespace "%s".', $functionName, $namespacePrefix);
-        } else {
-            $functionName = $fullyQualifiedFunctionName;
-            $message = sprintf('Attempted to call function "%s" from the global namespace.', $functionName);
-        }
-
-        $candidates = array();
-        foreach (get_defined_functions() as $type => $definedFunctionNames) {
-            foreach ($definedFunctionNames as $definedFunctionName) {
-                if (false !== $namespaceSeparatorIndex = strrpos($definedFunctionName, '\\')) {
-                    $definedFunctionNameBasename = substr($definedFunctionName, $namespaceSeparatorIndex + 1);
-                } else {
-                    $definedFunctionNameBasename = $definedFunctionName;
-                }
-
-                if ($definedFunctionNameBasename === $functionName) {
-                    $candidates[] = '\\'.$definedFunctionName;
-                }
-            }
-        }
-
-        if ($candidates) {
-            sort($candidates);
-            $last = array_pop($candidates).'"?';
-            if ($candidates) {
-                $candidates = 'e.g. "'.implode('", "', $candidates).'" or "'.$last;
-            } else {
-                $candidates = '"'.$last;
-            }
-            $message .= "\nDid you mean to call ".$candidates;
-        }
-
-        return new UndefinedFunctionException($message, $exception);
-    }
-}
diff --git a/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
deleted file mode 100644
index f734d6b..0000000
--- a/vendor/symfony/debug/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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\Component\Debug\FatalErrorHandler;
-
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\Exception\UndefinedMethodException;
-
-/**
- * ErrorHandler for undefined methods.
- *
- * @author Grégoire Pineau <lyrixx@lyrixx.info>
- */
-class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handleError(array $error, FatalErrorException $exception)
-    {
-        preg_match('/^Call to undefined method (.*)::(.*)\(\)$/', $error['message'], $matches);
-        if (!$matches) {
-            return;
-        }
-
-        $className = $matches[1];
-        $methodName = $matches[2];
-
-        $message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
-
-        $candidates = array();
-        foreach (get_class_methods($className) as $definedMethodName) {
-            $lev = levenshtein($methodName, $definedMethodName);
-            if ($lev <= strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
-                $candidates[] = $definedMethodName;
-            }
-        }
-
-        if ($candidates) {
-            sort($candidates);
-            $last = array_pop($candidates).'"?';
-            if ($candidates) {
-                $candidates = 'e.g. "'.implode('", "', $candidates).'" or "'.$last;
-            } else {
-                $candidates = '"'.$last;
-            }
-            $message .= "\nDid you mean to call ".$candidates;
-        }
-
-        return new UndefinedMethodException($message, $exception);
-    }
-}
diff --git a/vendor/symfony/debug/LICENSE b/vendor/symfony/debug/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/debug/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/debug/README.md b/vendor/symfony/debug/README.md
deleted file mode 100644
index 67e6d6c..0000000
--- a/vendor/symfony/debug/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Debug Component
-===============
-
-Debug provides tools to make debugging easier.
-
-Enabling all debug tools is as easy as calling the `enable()` method on the
-main `Debug` class:
-
-```php
-use Symfony\Component\Debug\Debug;
-
-Debug::enable();
-```
-
-You can also use the tools individually:
-
-```php
-use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\ExceptionHandler;
-
-if ('cli' !== php_sapi_name()) {
-    ini_set('display_errors', 0);
-    ExceptionHandler::register();
-} elseif (!ini_get('log_errors') || ini_get('error_log')) {
-    ini_set('display_errors', 1);
-}
-ErrorHandler::register();
-```
-
-Note that the `Debug::enable()` call also registers the debug class loader
-from the Symfony ClassLoader component when available.
-
-This component can optionally take advantage of the features of the HttpKernel
-and HttpFoundation components.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Debug/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/debug/Resources/ext/README.md b/vendor/symfony/debug/Resources/ext/README.md
deleted file mode 100644
index 0672ef8..0000000
--- a/vendor/symfony/debug/Resources/ext/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-Symfony Debug Extension
-=======================
-
-This extension publishes several functions to help building powerful debugging tools.
-
-symfony_zval_info()
--------------------
-
-- exposes zval_hash/refcounts, allowing e.g. efficient exploration of arbitrary structures in PHP,
-- does work with references, preventing memory copying.
-
-Its behavior is about the same as:
-
-```php
-<?php
-
-function symfony_zval_info($key, $array, $options = 0)
-{
-
-    // $options is currently not used, but could be in future version.
-
-    if (!array_key_exists($key, $array)) {
-        return null;
-    }
-
-    $info = array(
-        'type' => gettype($array[$key]),
-        'zval_hash' => /* hashed memory address of $array[$key] */,
-        'zval_refcount' => /* internal zval refcount of $array[$key] */,
-        'zval_isref' => /* is_ref status of $array[$key] */,
-    );
-
-    switch ($info['type']) {
-        case 'object':
-            $info += array(
-                'object_class' => get_class($array[$key]),
-                'object_refcount' => /* internal object refcount of $array[$key] */,
-                'object_hash' => spl_object_hash($array[$key]),
-                'object_handle' => /* internal object handle $array[$key] */,
-            );
-            break;
-
-        case 'resource':
-            $info += array(
-                'resource_handle' => (int) $array[$key],
-                'resource_type' => get_resource_type($array[$key]),
-                'resource_refcount' => /* internal resource refcount of $array[$key] */,
-            );
-            break;
-
-        case 'array':
-            $info += array(
-                'array_count' => count($array[$key]),
-            );
-            break;
-
-        case 'string':
-            $info += array(
-                'strlen' => strlen($array[$key]),
-            );
-            break;
-    }
-
-    return $info;
-}
-```
-
-symfony_debug_backtrace()
--------------------------
-
-This function works like debug_backtrace(), except that it can fetch the full backtrace in case of fatal errors:
-
-```php
-function foo() { fatal(); }
-function bar() { foo(); }
-
-function sd() { var_dump(symfony_debug_backtrace()); }
-
-register_shutdown_function('sd');
-
-bar();
-
-/* Will output
-Fatal error: Call to undefined function fatal() in foo.php on line 42
-array(3) {
-  [0]=>
-  array(2) {
-    ["function"]=>
-    string(2) "sd"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [1]=>
-  array(4) {
-    ["file"]=>
-    string(7) "foo.php"
-    ["line"]=>
-    int(1)
-    ["function"]=>
-    string(3) "foo"
-    ["args"]=>
-    array(0) {
-    }
-  }
-  [2]=>
-  array(4) {
-    ["file"]=>
-    string(102) "foo.php"
-    ["line"]=>
-    int(2)
-    ["function"]=>
-    string(3) "bar"
-    ["args"]=>
-    array(0) {
-    }
-  }
-}
-*/
-```
-
-Usage
------
-
-The extension is compatible with ZTS mode, and should be supported by PHP5.3, 5.4, 5.5 and 5.6.
-To enable the extension from source, run:
-
-```
-    phpize
-    ./configure
-    make
-    sudo make install
-```
diff --git a/vendor/symfony/debug/Resources/ext/config.m4 b/vendor/symfony/debug/Resources/ext/config.m4
deleted file mode 100644
index 3c56047..0000000
--- a/vendor/symfony/debug/Resources/ext/config.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension symfony_debug
-
-dnl Comments in this file start with the string 'dnl'.
-dnl Remove where necessary. This file will not work
-dnl without editing.
-
-dnl If your extension references something external, use with:
-
-dnl PHP_ARG_WITH(symfony_debug, for symfony_debug support,
-dnl Make sure that the comment is aligned:
-dnl [  --with-symfony_debug             Include symfony_debug support])
-
-dnl Otherwise use enable:
-
-PHP_ARG_ENABLE(symfony_debug, whether to enable symfony_debug support,
-dnl Make sure that the comment is aligned:
-[  --enable-symfony_debug           Enable symfony_debug support])
-
-if test "$PHP_SYMFONY_DEBUG" != "no"; then
-  dnl Write more examples of tests here...
-
-  dnl # --with-symfony_debug -> check with-path
-  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
-  dnl SEARCH_FOR="/include/symfony_debug.h"  # you most likely want to change this
-  dnl if test -r $PHP_SYMFONY_DEBUG/$SEARCH_FOR; then # path given as parameter
-  dnl   SYMFONY_DEBUG_DIR=$PHP_SYMFONY_DEBUG
-  dnl else # search default path list
-  dnl   AC_MSG_CHECKING([for symfony_debug files in default path])
-  dnl   for i in $SEARCH_PATH ; do
-  dnl     if test -r $i/$SEARCH_FOR; then
-  dnl       SYMFONY_DEBUG_DIR=$i
-  dnl       AC_MSG_RESULT(found in $i)
-  dnl     fi
-  dnl   done
-  dnl fi
-  dnl
-  dnl if test -z "$SYMFONY_DEBUG_DIR"; then
-  dnl   AC_MSG_RESULT([not found])
-  dnl   AC_MSG_ERROR([Please reinstall the symfony_debug distribution])
-  dnl fi
-
-  dnl # --with-symfony_debug -> add include path
-  dnl PHP_ADD_INCLUDE($SYMFONY_DEBUG_DIR/include)
-
-  dnl # --with-symfony_debug -> check for lib and symbol presence
-  dnl LIBNAME=symfony_debug # you may want to change this
-  dnl LIBSYMBOL=symfony_debug # you most likely want to change this 
-
-  dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-  dnl [
-  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SYMFONY_DEBUG_DIR/lib, SYMFONY_DEBUG_SHARED_LIBADD)
-  dnl   AC_DEFINE(HAVE_SYMFONY_DEBUGLIB,1,[ ])
-  dnl ],[
-  dnl   AC_MSG_ERROR([wrong symfony_debug lib version or lib not found])
-  dnl ],[
-  dnl   -L$SYMFONY_DEBUG_DIR/lib -lm
-  dnl ])
-  dnl
-  dnl PHP_SUBST(SYMFONY_DEBUG_SHARED_LIBADD)
-
-  PHP_NEW_EXTENSION(symfony_debug, symfony_debug.c, $ext_shared)
-fi
diff --git a/vendor/symfony/debug/Resources/ext/config.w32 b/vendor/symfony/debug/Resources/ext/config.w32
deleted file mode 100644
index 487e691..0000000
--- a/vendor/symfony/debug/Resources/ext/config.w32
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-// vim:ft=javascript
-
-// If your extension references something external, use ARG_WITH
-// ARG_WITH("symfony_debug", "for symfony_debug support", "no");
-
-// Otherwise, use ARG_ENABLE
-// ARG_ENABLE("symfony_debug", "enable symfony_debug support", "no");
-
-if (PHP_SYMFONY_DEBUG != "no") {
-	EXTENSION("symfony_debug", "symfony_debug.c");
-}
-
diff --git a/vendor/symfony/debug/Resources/ext/php_symfony_debug.h b/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
deleted file mode 100644
index 26d0e8c..0000000
--- a/vendor/symfony/debug/Resources/ext/php_symfony_debug.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef PHP_SYMFONY_DEBUG_H
-#define PHP_SYMFONY_DEBUG_H
-
-extern zend_module_entry symfony_debug_module_entry;
-#define phpext_symfony_debug_ptr &symfony_debug_module_entry
-
-#define PHP_SYMFONY_DEBUG_VERSION "2.7"
-
-#ifdef PHP_WIN32
-#	define PHP_SYMFONY_DEBUG_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define PHP_SYMFONY_DEBUG_API __attribute__ ((visibility("default")))
-#else
-#	define PHP_SYMFONY_DEBUG_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-ZEND_BEGIN_MODULE_GLOBALS(symfony_debug)
-	intptr_t req_rand_init;
-	void (*old_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-	zval *debug_bt;
-ZEND_END_MODULE_GLOBALS(symfony_debug)
-
-PHP_MINIT_FUNCTION(symfony_debug);
-PHP_MSHUTDOWN_FUNCTION(symfony_debug);
-PHP_RINIT_FUNCTION(symfony_debug);
-PHP_RSHUTDOWN_FUNCTION(symfony_debug);
-PHP_MINFO_FUNCTION(symfony_debug);
-PHP_GINIT_FUNCTION(symfony_debug);
-PHP_GSHUTDOWN_FUNCTION(symfony_debug);
-
-PHP_FUNCTION(symfony_zval_info);
-PHP_FUNCTION(symfony_debug_backtrace);
-
-static char *_symfony_debug_memory_address_hash(void * TSRMLS_DC);
-static const char *_symfony_debug_zval_type(zval *);
-static const char* _symfony_debug_get_resource_type(long TSRMLS_DC);
-static int _symfony_debug_get_resource_refcount(long TSRMLS_DC);
-
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-
-#ifdef ZTS
-#define SYMFONY_DEBUG_G(v) TSRMG(symfony_debug_globals_id, zend_symfony_debug_globals *, v)
-#else
-#define SYMFONY_DEBUG_G(v) (symfony_debug_globals.v)
-#endif
-
-#endif	/* PHP_SYMFONY_DEBUG_H */
diff --git a/vendor/symfony/debug/Resources/ext/symfony_debug.c b/vendor/symfony/debug/Resources/ext/symfony_debug.c
deleted file mode 100644
index 0d7cb60..0000000
--- a/vendor/symfony/debug/Resources/ext/symfony_debug.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-#include "php_ini.h"
-#include "ext/standard/info.h"
-#include "php_symfony_debug.h"
-#include "ext/standard/php_rand.h"
-#include "ext/standard/php_lcg.h"
-#include "ext/spl/php_spl.h"
-#include "Zend/zend_gc.h"
-#include "Zend/zend_builtin_functions.h"
-#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
-#include "ext/standard/php_array.h"
-#include "Zend/zend_interfaces.h"
-#include "SAPI.h"
-
-#define IS_PHP_53 ZEND_EXTENSION_API_NO == 220090626
-
-ZEND_DECLARE_MODULE_GLOBALS(symfony_debug)
-
-ZEND_BEGIN_ARG_INFO_EX(symfony_zval_arginfo, 0, 0, 2)
-	ZEND_ARG_INFO(0, key)
-	ZEND_ARG_ARRAY_INFO(0, array, 0)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-const zend_function_entry symfony_debug_functions[] = {
-	PHP_FE(symfony_zval_info,	symfony_zval_arginfo)
-	PHP_FE(symfony_debug_backtrace, NULL)
-	PHP_FE_END
-};
-
-PHP_FUNCTION(symfony_debug_backtrace)
-{
-	if (zend_parse_parameters_none() == FAILURE) {
-		return;
-	}
-#if IS_PHP_53
-	zend_fetch_debug_backtrace(return_value, 1, 0 TSRMLS_CC);
-#else
-	zend_fetch_debug_backtrace(return_value, 1, 0, 0 TSRMLS_CC);
-#endif
-
-	if (!SYMFONY_DEBUG_G(debug_bt)) {
-		return;
-	}
-
-	php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_P(SYMFONY_DEBUG_G(debug_bt)), 0 TSRMLS_CC);
-}
-
-PHP_FUNCTION(symfony_zval_info)
-{
-	zval *key = NULL, *arg = NULL;
-	zval **data = NULL;
-	HashTable *array = NULL;
-	long options = 0;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zh|l", &key, &array, &options) == FAILURE) {
-		return;
-	}
-
-	switch (Z_TYPE_P(key)) {
-		case IS_STRING:
-			if (zend_symtable_find(array, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&data) == FAILURE) {
-				return;
-			}
-		break;
-		case IS_LONG:
-			if (zend_hash_index_find(array, Z_LVAL_P(key), (void **)&data)) {
-				return;
-			}
-		break;
-	}
-
-	arg = *data;
-
-	array_init(return_value);
-
-	add_assoc_string(return_value, "type", (char *)_symfony_debug_zval_type(arg), 1);
-	add_assoc_stringl(return_value, "zval_hash", _symfony_debug_memory_address_hash((void *)arg TSRMLS_CC), 16, 0);
-	add_assoc_long(return_value, "zval_refcount", Z_REFCOUNT_P(arg));
-	add_assoc_bool(return_value, "zval_isref", (zend_bool)Z_ISREF_P(arg));
-
-	if (Z_TYPE_P(arg) == IS_OBJECT) {
-		char hash[33] = {0};
-
-		php_spl_object_hash(arg, (char *)hash TSRMLS_CC);
-		add_assoc_stringl(return_value, "object_class", (char *)Z_OBJCE_P(arg)->name, Z_OBJCE_P(arg)->name_length, 1);
-		add_assoc_long(return_value, "object_refcount", EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(arg)].bucket.obj.refcount);
-		add_assoc_string(return_value, "object_hash", hash, 1);
-		add_assoc_long(return_value, "object_handle", Z_OBJ_HANDLE_P(arg));
-	} else if (Z_TYPE_P(arg) == IS_ARRAY) {
-		add_assoc_long(return_value, "array_count", zend_hash_num_elements(Z_ARRVAL_P(arg)));
-	} else if(Z_TYPE_P(arg) == IS_RESOURCE) {
-		add_assoc_long(return_value, "resource_handle", Z_LVAL_P(arg));
-		add_assoc_string(return_value, "resource_type", (char *)_symfony_debug_get_resource_type(Z_LVAL_P(arg) TSRMLS_CC), 1);
-		add_assoc_long(return_value, "resource_refcount", _symfony_debug_get_resource_refcount(Z_LVAL_P(arg) TSRMLS_CC));
-	} else if (Z_TYPE_P(arg) == IS_STRING) {
-		add_assoc_long(return_value, "strlen", Z_STRLEN_P(arg));
-	}
-}
-
-void symfony_debug_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args)
-{
-	TSRMLS_FETCH();
-	zval *retval;
-
-	switch (type) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_CORE_WARNING:
-		case E_COMPILE_ERROR:
-		case E_COMPILE_WARNING:
-			ALLOC_INIT_ZVAL(retval);
-#if IS_PHP_53
-			zend_fetch_debug_backtrace(retval, 1, 0 TSRMLS_CC);
-#else
-			zend_fetch_debug_backtrace(retval, 1, 0, 0 TSRMLS_CC);
-#endif
-			SYMFONY_DEBUG_G(debug_bt) = retval;
-	}
-
-	SYMFONY_DEBUG_G(old_error_cb)(type, error_filename, error_lineno, format, args);
-}
-
-static const char* _symfony_debug_get_resource_type(long rsid TSRMLS_DC)
-{
-	const char *res_type;
-	res_type = zend_rsrc_list_get_rsrc_type(rsid TSRMLS_CC);
-
-	if (!res_type) {
-		return "Unknown";
-	}
-
-	return res_type;
-}
-
-static int _symfony_debug_get_resource_refcount(long rsid TSRMLS_DC)
-{
-	zend_rsrc_list_entry *le;
-
-	if (zend_hash_index_find(&EG(regular_list), rsid, (void **) &le)==SUCCESS) {
-		return le->refcount;
-	}
-
-	return 0;
-}
-
-static char *_symfony_debug_memory_address_hash(void *address TSRMLS_DC)
-{
-	char *result = NULL;
-	intptr_t address_rand;
-
-	if (!SYMFONY_DEBUG_G(req_rand_init)) {
-		if (!BG(mt_rand_is_seeded)) {
-			php_mt_srand(GENERATE_SEED() TSRMLS_CC);
-		}
-		SYMFONY_DEBUG_G(req_rand_init) = (intptr_t)php_mt_rand(TSRMLS_C);
-	}
-
-	address_rand = (intptr_t)address ^ SYMFONY_DEBUG_G(req_rand_init);
-
-	spprintf(&result, 17, "%016zx", address_rand);
-
-	return result;
-}
-
-static const char *_symfony_debug_zval_type(zval *zv)
-{
-	switch (Z_TYPE_P(zv)) {
-		case IS_NULL:
-			return "NULL";
-			break;
-
-		case IS_BOOL:
-			return "boolean";
-			break;
-
-		case IS_LONG:
-			return "integer";
-			break;
-
-		case IS_DOUBLE:
-			return "double";
-			break;
-
-		case IS_STRING:
-			return "string";
-			break;
-
-		case IS_ARRAY:
-			return "array";
-			break;
-
-		case IS_OBJECT:
-			return "object";
-
-		case IS_RESOURCE:
-			return "resource";
-
-		default:
-			return "unknown type";
-	}
-}
-
-zend_module_entry symfony_debug_module_entry = {
-	STANDARD_MODULE_HEADER,
-	"symfony_debug",
-	symfony_debug_functions,
-	PHP_MINIT(symfony_debug),
-	PHP_MSHUTDOWN(symfony_debug),
-	PHP_RINIT(symfony_debug),
-	PHP_RSHUTDOWN(symfony_debug),
-	PHP_MINFO(symfony_debug),
-	PHP_SYMFONY_DEBUG_VERSION,
-	PHP_MODULE_GLOBALS(symfony_debug),
-	PHP_GINIT(symfony_debug),
-	PHP_GSHUTDOWN(symfony_debug),
-	NULL,
-	STANDARD_MODULE_PROPERTIES_EX
-};
-
-#ifdef COMPILE_DL_SYMFONY_DEBUG
-ZEND_GET_MODULE(symfony_debug)
-#endif
-
-PHP_GINIT_FUNCTION(symfony_debug)
-{
-	memset(symfony_debug_globals, 0 , sizeof(*symfony_debug_globals));
-}
-
-PHP_GSHUTDOWN_FUNCTION(symfony_debug)
-{
-
-}
-
-PHP_MINIT_FUNCTION(symfony_debug)
-{
-	SYMFONY_DEBUG_G(old_error_cb) = zend_error_cb;
-	zend_error_cb                 = symfony_debug_error_cb;
-
-	return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(symfony_debug)
-{
-	zend_error_cb = SYMFONY_DEBUG_G(old_error_cb);
-
-	return SUCCESS;
-}
-
-PHP_RINIT_FUNCTION(symfony_debug)
-{
-	return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(symfony_debug)
-{
-	return SUCCESS;
-}
-
-PHP_MINFO_FUNCTION(symfony_debug)
-{
-	php_info_print_table_start();
-	php_info_print_table_header(2, "Symfony Debug support", "enabled");
-	php_info_print_table_header(2, "Symfony Debug version", PHP_SYMFONY_DEBUG_VERSION);
-	php_info_print_table_end();
-}
diff --git a/vendor/symfony/debug/Resources/ext/tests/001.phpt b/vendor/symfony/debug/Resources/ext/tests/001.phpt
deleted file mode 100644
index 4d41417..0000000
--- a/vendor/symfony/debug/Resources/ext/tests/001.phpt
+++ /dev/null
@@ -1,151 +0,0 @@
---TEST--
-Test symfony_zval_info API
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-$int = 42;
-$float = 42.42;
-$str = "foobar";
-$object = new StdClass;
-$array = array('foo', 'bar');
-$resource = tmpfile();
-$null = null;
-$bool = true;
-
-$anotherint = 42;
-$refcount2 = &$anotherint;
-
-$var = array('int' => $int,
-			 'float' => $float,
-			 'str' => $str,
-			 'object' => $object,
-			 'array' => $array,
-			 'resource' => $resource,
-			 'null' => $null,
-			 'bool' => $bool,
-			 'refcount' => &$refcount2);
-
-var_dump(symfony_zval_info('int', $var));
-var_dump(symfony_zval_info('float', $var));
-var_dump(symfony_zval_info('str', $var));
-var_dump(symfony_zval_info('object', $var));
-var_dump(symfony_zval_info('array', $var));
-var_dump(symfony_zval_info('resource', $var));
-var_dump(symfony_zval_info('null', $var));
-var_dump(symfony_zval_info('bool', $var));
-
-var_dump(symfony_zval_info('refcount', $var));
-var_dump(symfony_zval_info('not-exist', $var));
-?>
---EXPECTF--
-array(4) {
-  ["type"]=>
-  string(7) "integer"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(6) "double"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(5) {
-  ["type"]=>
-  string(6) "string"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["strlen"]=>
-  int(6)
-}
-array(8) {
-  ["type"]=>
-  string(6) "object"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["object_class"]=>
-  string(8) "stdClass"
-  ["object_refcount"]=>
-  int(1)
-  ["object_hash"]=>
-  string(32) "%s"
-  ["object_handle"]=>
-  int(%d)
-}
-array(5) {
-  ["type"]=>
-  string(5) "array"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["array_count"]=>
-  int(2)
-}
-array(7) {
-  ["type"]=>
-  string(8) "resource"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-  ["resource_handle"]=>
-  int(%d)
-  ["resource_type"]=>
-  string(6) "stream"
-  ["resource_refcount"]=>
-  int(1)
-}
-array(4) {
-  ["type"]=>
-  string(4) "NULL"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(7) "boolean"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(2)
-  ["zval_isref"]=>
-  bool(false)
-}
-array(4) {
-  ["type"]=>
-  string(7) "integer"
-  ["zval_hash"]=>
-  string(16) "%s"
-  ["zval_refcount"]=>
-  int(3)
-  ["zval_isref"]=>
-  bool(true)
-}
-NULL
diff --git a/vendor/symfony/debug/Resources/ext/tests/002.phpt b/vendor/symfony/debug/Resources/ext/tests/002.phpt
deleted file mode 100644
index ebe2f32..0000000
--- a/vendor/symfony/debug/Resources/ext/tests/002.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-
-}
-
-register_shutdown_function('bt');
-
-bar();
-
-?>
---EXPECTF--
-Fatal error: Call to undefined function notexist() in %s on line %d
-Array
-(
-    [0] => Array
-        (
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => foo
-            [args] => Array
-                (
-                )
-
-        )
-
-    [2] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)
diff --git a/vendor/symfony/debug/Resources/ext/tests/002_1.phpt b/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
deleted file mode 100644
index 4d52dbf..0000000
--- a/vendor/symfony/debug/Resources/ext/tests/002_1.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-Test symfony_debug_backtrace in case of non fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-function bar()
-{
-    bt();
-}
-
-function bt()
-{
-    print_r(symfony_debug_backtrace());
-
-}
-
-bar();
-
-?>
---EXPECTF--
-Array
-(
-    [0] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bt
-            [args] => Array
-                (
-                )
-
-        )
-
-    [1] => Array
-        (
-            [file] => %s
-            [line] => %d
-            [function] => bar
-            [args] => Array
-                (
-                )
-
-        )
-
-)
diff --git a/vendor/symfony/debug/Resources/ext/tests/003.phpt b/vendor/symfony/debug/Resources/ext/tests/003.phpt
deleted file mode 100644
index a363333..0000000
--- a/vendor/symfony/debug/Resources/ext/tests/003.phpt
+++ /dev/null
@@ -1,85 +0,0 @@
---TEST--
-Test ErrorHandler in case of fatal error
---SKIPIF--
-<?php if (!extension_loaded("symfony_debug")) print "skip"; ?>
---FILE--
-<?php
-
-namespace Psr\Log;
-
-class LogLevel
-{
-    const EMERGENCY = 'emergency';
-    const ALERT = 'alert';
-    const CRITICAL = 'critical';
-    const ERROR = 'error';
-    const WARNING = 'warning';
-    const NOTICE = 'notice';
-    const INFO = 'info';
-    const DEBUG = 'debug';
-}
-
-namespace Symfony\Component\Debug;
-
-$dir = __DIR__.'/../../../';
-require $dir.'ErrorHandler.php';
-require $dir.'Exception/FatalErrorException.php';
-require $dir.'Exception/UndefinedFunctionException.php';
-require $dir.'FatalErrorHandler/FatalErrorHandlerInterface.php';
-require $dir.'FatalErrorHandler/ClassNotFoundFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php';
-require $dir.'FatalErrorHandler/UndefinedMethodFatalErrorHandler.php';
-
-function bar()
-{
-    foo();
-}
-
-function foo()
-{
-    notexist();
-}
-
-$handler = ErrorHandler::register();
-$handler->setExceptionHandler('print_r');
-
-if (function_exists('xdebug_disable')) {
-    xdebug_disable();
-}
-
-bar();
-?>
---EXPECTF--
-Fatal error: Call to undefined function Symfony\Component\Debug\notexist() in %s on line %d
-Symfony\Component\Debug\Exception\UndefinedFunctionException Object
-(
-    [message:protected] => Attempted to call function "notexist" from namespace "Symfony\Component\Debug".
-    [string:Exception:private] => 
-    [code:protected] => 0
-    [file:protected] => %s
-    [line:protected] => %d
-    [trace:Exception:private] => Array
-        (
-            [0] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\foo
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-
-            [1] => Array
-                (
-%A                    [function] => Symfony\Component\Debug\bar
-%A                    [args] => Array
-                        (
-                        )
-
-                )
-%A
-        )
-
-    [previous:Exception:private] => 
-    [severity:protected] => 1
-)
diff --git a/vendor/symfony/debug/composer.json b/vendor/symfony/debug/composer.json
deleted file mode 100644
index c1b128a..0000000
--- a/vendor/symfony/debug/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "symfony/debug",
-    "type": "library",
-    "description": "Symfony Debug Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9",
-        "psr/log": "~1.0"
-    },
-    "conflict": {
-        "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-    },
-    "require-dev": {
-        "symfony/class-loader": "~2.2",
-        "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Debug\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/debug/phpunit.xml.dist b/vendor/symfony/debug/phpunit.xml.dist
deleted file mode 100644
index e99c4dd..0000000
--- a/vendor/symfony/debug/phpunit.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Debug Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-        <testsuite name="Symfony Debug Extension Test Suite">
-            <directory suffix=".phpt">./Resources/ext/tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/dependency-injection/.gitignore b/vendor/symfony/dependency-injection/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/dependency-injection/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/dependency-injection/Alias.php b/vendor/symfony/dependency-injection/Alias.php
deleted file mode 100644
index 5a6c2fe..0000000
--- a/vendor/symfony/dependency-injection/Alias.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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\Component\DependencyInjection;
-
-class Alias
-{
-    private $id;
-    private $public;
-
-    /**
-     * Constructor.
-     *
-     * @param string $id     Alias identifier
-     * @param bool   $public If this alias is public
-     */
-    public function __construct($id, $public = true)
-    {
-        $this->id = strtolower($id);
-        $this->public = $public;
-    }
-
-    /**
-     * Checks if this DI Alias should be public or not.
-     *
-     * @return bool
-     */
-    public function isPublic()
-    {
-        return $this->public;
-    }
-
-    /**
-     * Sets if this Alias is public.
-     *
-     * @param bool $boolean If this Alias should be public
-     */
-    public function setPublic($boolean)
-    {
-        $this->public = (bool) $boolean;
-    }
-
-    /**
-     * Returns the Id of this alias.
-     *
-     * @return string The alias id
-     */
-    public function __toString()
-    {
-        return $this->id;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/CHANGELOG.md b/vendor/symfony/dependency-injection/CHANGELOG.md
deleted file mode 100644
index 4272943..0000000
--- a/vendor/symfony/dependency-injection/CHANGELOG.md
+++ /dev/null
@@ -1,45 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
- * deprecated synchronized services
-
-2.6.0
------
-
- * added new factory syntax and deprecated the old one
-
-2.5.0
------
-
-* added DecoratorServicePass and a way to override a service definition (Definition::setDecoratedService())
-* deprecated SimpleXMLElement class.
-
-2.4.0
------
-
- * added support for expressions in service definitions
- * added ContainerAwareTrait to add default container aware behavior to a class
-
-2.2.0
------
-
- * added Extension::isConfigEnabled() to ease working with enableable configurations
- * added an Extension base class with sensible defaults to be used in conjunction
-   with the Config component.
- * added PrependExtensionInterface (to be able to allow extensions to prepend
-   application configuration settings for any Bundle)
-
-2.1.0
------
-
- * added IntrospectableContainerInterface (to be able to check if a service
-   has been initialized or not)
- * added ConfigurationExtensionInterface
- * added Definition::clearTag()
- * component exceptions that inherit base SPL classes are now used exclusively
-   (this includes dumped containers)
- * [BC BREAK] fixed unescaping of class arguments, method
-   ParameterBag::unescapeValue() was made public
diff --git a/vendor/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php b/vendor/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
deleted file mode 100644
index 5120eb6..0000000
--- a/vendor/symfony/dependency-injection/Compiler/AnalyzeServiceReferencesPass.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Run this pass before passes that need to know more about the relation of
- * your services.
- *
- * This class will populate the ServiceReferenceGraph with information. You can
- * retrieve the graph in other passes from the compiler.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class AnalyzeServiceReferencesPass implements RepeatablePassInterface
-{
-    private $graph;
-    private $container;
-    private $currentId;
-    private $currentDefinition;
-    private $repeatedPass;
-    private $onlyConstructorArguments;
-
-    /**
-     * Constructor.
-     *
-     * @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
-     */
-    public function __construct($onlyConstructorArguments = false)
-    {
-        $this->onlyConstructorArguments = (bool) $onlyConstructorArguments;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setRepeatedPass(RepeatedPass $repeatedPass)
-    {
-        $this->repeatedPass = $repeatedPass;
-    }
-
-    /**
-     * Processes a ContainerBuilder object to populate the service reference graph.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-        $this->graph = $container->getCompiler()->getServiceReferenceGraph();
-        $this->graph->clear();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isSynthetic() || $definition->isAbstract()) {
-                continue;
-            }
-
-            $this->currentId = $id;
-            $this->currentDefinition = $definition;
-
-            $this->processArguments($definition->getArguments());
-            if ($definition->getFactoryService(false)) {
-                $this->processArguments(array(new Reference($definition->getFactoryService(false))));
-            }
-            if (is_array($definition->getFactory())) {
-                $this->processArguments($definition->getFactory());
-            }
-
-            if (!$this->onlyConstructorArguments) {
-                $this->processArguments($definition->getMethodCalls());
-                $this->processArguments($definition->getProperties());
-                if ($definition->getConfigurator()) {
-                    $this->processArguments(array($definition->getConfigurator()));
-                }
-            }
-        }
-
-        foreach ($container->getAliases() as $id => $alias) {
-            $this->graph->connect($id, $alias, (string) $alias, $this->getDefinition((string) $alias), null);
-        }
-    }
-
-    /**
-     * Processes service definitions for arguments to find relationships for the service graph.
-     *
-     * @param array $arguments An array of Reference or Definition objects relating to service definitions
-     */
-    private function processArguments(array $arguments)
-    {
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $this->processArguments($argument);
-            } elseif ($argument instanceof Reference) {
-                $this->graph->connect(
-                    $this->currentId,
-                    $this->currentDefinition,
-                    $this->getDefinitionId((string) $argument),
-                    $this->getDefinition((string) $argument),
-                    $argument
-                );
-            } elseif ($argument instanceof Definition) {
-                $this->processArguments($argument->getArguments());
-                $this->processArguments($argument->getMethodCalls());
-                $this->processArguments($argument->getProperties());
-
-                if (is_array($argument->getFactory())) {
-                    $this->processArguments($argument->getFactory());
-                }
-                if ($argument->getFactoryService(false)) {
-                    $this->processArguments(array(new Reference($argument->getFactoryService(false))));
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a service definition given the full name or an alias.
-     *
-     * @param string $id A full id or alias for a service definition.
-     *
-     * @return Definition|null The definition related to the supplied id
-     */
-    private function getDefinition($id)
-    {
-        $id = $this->getDefinitionId($id);
-
-        return null === $id ? null : $this->container->getDefinition($id);
-    }
-
-    private function getDefinitionId($id)
-    {
-        while ($this->container->hasAlias($id)) {
-            $id = (string) $this->container->getAlias($id);
-        }
-
-        if (!$this->container->hasDefinition($id)) {
-            return;
-        }
-
-        return $id;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/AutoAliasServicePass.php b/vendor/symfony/dependency-injection/Compiler/AutoAliasServicePass.php
deleted file mode 100644
index c1f05e0..0000000
--- a/vendor/symfony/dependency-injection/Compiler/AutoAliasServicePass.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * Sets a service to be an alias of another one, given a format pattern.
- */
-class AutoAliasServicePass implements CompilerPassInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
-            foreach ($tags as $tag) {
-                if (!isset($tag['format'])) {
-                    throw new InvalidArgumentException(sprintf('Missing tag information "format" on auto_alias service "%s".', $serviceId));
-                }
-
-                $aliasId = $container->getParameterBag()->resolveValue($tag['format']);
-                if ($container->hasDefinition($aliasId) || $container->hasAlias($aliasId)) {
-                    $container->setAlias($serviceId, new Alias($aliasId));
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php b/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
deleted file mode 100644
index d7570dd..0000000
--- a/vendor/symfony/dependency-injection/Compiler/CheckCircularReferencesPass.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Checks your services for circular references.
- *
- * References from method calls are ignored since we might be able to resolve
- * these references depending on the order in which services are called.
- *
- * Circular reference from method calls will only be detected at run-time.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class CheckCircularReferencesPass implements CompilerPassInterface
-{
-    private $currentPath;
-    private $checkedNodes;
-
-    /**
-     * Checks the ContainerBuilder object for circular references.
-     *
-     * @param ContainerBuilder $container The ContainerBuilder instances
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $graph = $container->getCompiler()->getServiceReferenceGraph();
-
-        $this->checkedNodes = array();
-        foreach ($graph->getNodes() as $id => $node) {
-            $this->currentPath = array($id);
-
-            $this->checkOutEdges($node->getOutEdges());
-        }
-    }
-
-    /**
-     * Checks for circular references.
-     *
-     * @param ServiceReferenceGraphEdge[] $edges An array of Edges
-     *
-     * @throws ServiceCircularReferenceException When a circular reference is found.
-     */
-    private function checkOutEdges(array $edges)
-    {
-        foreach ($edges as $edge) {
-            $node = $edge->getDestNode();
-            $id = $node->getId();
-
-            if (empty($this->checkedNodes[$id])) {
-                $searchKey = array_search($id, $this->currentPath);
-                $this->currentPath[] = $id;
-
-                if (false !== $searchKey) {
-                    throw new ServiceCircularReferenceException($id, array_slice($this->currentPath, $searchKey));
-                }
-
-                $this->checkOutEdges($node->getOutEdges());
-
-                $this->checkedNodes[$id] = true;
-                array_pop($this->currentPath);
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php b/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
deleted file mode 100644
index 219e663..0000000
--- a/vendor/symfony/dependency-injection/Compiler/CheckDefinitionValidityPass.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-
-/**
- * This pass validates each definition individually only taking the information
- * into account which is contained in the definition itself.
- *
- * Later passes can rely on the following, and specifically do not need to
- * perform these checks themselves:
- *
- * - non synthetic, non abstract services always have a class set
- * - synthetic services are always public
- * - synthetic services are always of non-prototype scope
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class CheckDefinitionValidityPass implements CompilerPassInterface
-{
-    /**
-     * Processes the ContainerBuilder to validate the Definition.
-     *
-     * @param ContainerBuilder $container
-     *
-     * @throws RuntimeException When the Definition is invalid
-     */
-    public function process(ContainerBuilder $container)
-    {
-        foreach ($container->getDefinitions() as $id => $definition) {
-            // synthetic service is public
-            if ($definition->isSynthetic() && !$definition->isPublic()) {
-                throw new RuntimeException(sprintf('A synthetic service ("%s") must be public.', $id));
-            }
-
-            // synthetic service has non-prototype scope
-            if ($definition->isSynthetic() && ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) {
-                throw new RuntimeException(sprintf('A synthetic service ("%s") cannot be of scope "prototype".', $id));
-            }
-
-            if ($definition->getFactory() && ($definition->getFactoryClass(false) || $definition->getFactoryService(false) || $definition->getFactoryMethod(false))) {
-                throw new RuntimeException(sprintf('A service ("%s") can use either the old or the new factory syntax, not both.', $id));
-            }
-
-            // non-synthetic, non-abstract service has class
-            if (!$definition->isAbstract() && !$definition->isSynthetic() && !$definition->getClass()) {
-                if ($definition->getFactory() || $definition->getFactoryClass(false) || $definition->getFactoryService(false)) {
-                    throw new RuntimeException(sprintf('Please add the class to service "%s" even if it is constructed by a factory since we might need to add method calls based on compile-time checks.', $id));
-                }
-
-                throw new RuntimeException(sprintf(
-                    'The definition for "%s" has no class. If you intend to inject '
-                   .'this service dynamically at runtime, please mark it as synthetic=true. '
-                   .'If this is an abstract definition solely used by child definitions, '
-                   .'please add abstract=true, otherwise specify a class to get rid of this error.',
-                   $id
-                ));
-            }
-
-            // tag attribute values must be scalars
-            foreach ($definition->getTags() as $name => $tags) {
-                foreach ($tags as $attributes) {
-                    foreach ($attributes as $attribute => $value) {
-                        if (!is_scalar($value) && null !== $value) {
-                            throw new RuntimeException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s".', $id, $name, $attribute));
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/vendor/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
deleted file mode 100644
index 304f784..0000000
--- a/vendor/symfony/dependency-injection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Checks that all references are pointing to a valid service.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class CheckExceptionOnInvalidReferenceBehaviorPass implements CompilerPassInterface
-{
-    private $container;
-    private $sourceId;
-
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            $this->sourceId = $id;
-            $this->processDefinition($definition);
-        }
-    }
-
-    private function processDefinition(Definition $definition)
-    {
-        $this->processReferences($definition->getArguments());
-        $this->processReferences($definition->getMethodCalls());
-        $this->processReferences($definition->getProperties());
-    }
-
-    private function processReferences(array $arguments)
-    {
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $this->processReferences($argument);
-            } elseif ($argument instanceof Definition) {
-                $this->processDefinition($argument);
-            } elseif ($argument instanceof Reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $argument->getInvalidBehavior()) {
-                $destId = (string) $argument;
-
-                if (!$this->container->has($destId)) {
-                    throw new ServiceNotFoundException($destId, $this->sourceId);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php b/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php
deleted file mode 100644
index 82202a9..0000000
--- a/vendor/symfony/dependency-injection/Compiler/CheckReferenceValidityPass.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Exception\ScopeCrossingInjectionException;
-use Symfony\Component\DependencyInjection\Exception\ScopeWideningInjectionException;
-
-/**
- * Checks the validity of references.
- *
- * The following checks are performed by this pass:
- * - target definitions are not abstract
- * - target definitions are of equal or wider scope
- * - target definitions are in the same scope hierarchy
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class CheckReferenceValidityPass implements CompilerPassInterface
-{
-    private $container;
-    private $currentId;
-    private $currentScope;
-    private $currentScopeAncestors;
-    private $currentScopeChildren;
-
-    /**
-     * Processes the ContainerBuilder to validate References.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-
-        $children = $this->container->getScopeChildren();
-        $ancestors = array();
-
-        $scopes = $this->container->getScopes();
-        foreach ($scopes as $name => $parent) {
-            $ancestors[$name] = array($parent);
-
-            while (isset($scopes[$parent])) {
-                $ancestors[$name][] = $parent = $scopes[$parent];
-            }
-        }
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isSynthetic() || $definition->isAbstract()) {
-                continue;
-            }
-
-            $this->currentId = $id;
-            $this->currentScope = $scope = $definition->getScope();
-
-            if (ContainerInterface::SCOPE_CONTAINER === $scope) {
-                $this->currentScopeChildren = array_keys($scopes);
-                $this->currentScopeAncestors = array();
-            } elseif (ContainerInterface::SCOPE_PROTOTYPE !== $scope) {
-                $this->currentScopeChildren = isset($children[$scope]) ? $children[$scope] : array();
-                $this->currentScopeAncestors = isset($ancestors[$scope]) ? $ancestors[$scope] : array();
-            }
-
-            $this->validateReferences($definition->getArguments());
-            $this->validateReferences($definition->getMethodCalls());
-            $this->validateReferences($definition->getProperties());
-        }
-    }
-
-    /**
-     * Validates an array of References.
-     *
-     * @param array $arguments An array of Reference objects
-     *
-     * @throws RuntimeException when there is a reference to an abstract definition.
-     */
-    private function validateReferences(array $arguments)
-    {
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $this->validateReferences($argument);
-            } elseif ($argument instanceof Reference) {
-                $targetDefinition = $this->getDefinition((string) $argument);
-
-                if (null !== $targetDefinition && $targetDefinition->isAbstract()) {
-                    throw new RuntimeException(sprintf(
-                        'The definition "%s" has a reference to an abstract definition "%s". '
-                       .'Abstract definitions cannot be the target of references.',
-                       $this->currentId,
-                       $argument
-                    ));
-                }
-
-                $this->validateScope($argument, $targetDefinition);
-            }
-        }
-    }
-
-    /**
-     * Validates the scope of a single Reference.
-     *
-     * @param Reference  $reference
-     * @param Definition $definition
-     *
-     * @throws ScopeWideningInjectionException when the definition references a service of a narrower scope
-     * @throws ScopeCrossingInjectionException when the definition references a service of another scope hierarchy
-     */
-    private function validateScope(Reference $reference, Definition $definition = null)
-    {
-        if (ContainerInterface::SCOPE_PROTOTYPE === $this->currentScope) {
-            return;
-        }
-
-        if (!$reference->isStrict()) {
-            return;
-        }
-
-        if (null === $definition) {
-            return;
-        }
-
-        if ($this->currentScope === $scope = $definition->getScope()) {
-            return;
-        }
-
-        $id = (string) $reference;
-
-        if (in_array($scope, $this->currentScopeChildren, true)) {
-            throw new ScopeWideningInjectionException($this->currentId, $this->currentScope, $id, $scope);
-        }
-
-        if (!in_array($scope, $this->currentScopeAncestors, true)) {
-            throw new ScopeCrossingInjectionException($this->currentId, $this->currentScope, $id, $scope);
-        }
-    }
-
-    /**
-     * Returns the Definition given an id.
-     *
-     * @param string $id Definition identifier
-     *
-     * @return Definition
-     */
-    private function getDefinition($id)
-    {
-        if (!$this->container->hasDefinition($id)) {
-            return;
-        }
-
-        return $this->container->getDefinition($id);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/Compiler.php b/vendor/symfony/dependency-injection/Compiler/Compiler.php
deleted file mode 100644
index 4e4c2cd..0000000
--- a/vendor/symfony/dependency-injection/Compiler/Compiler.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * This class is used to remove circular dependencies between individual passes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Compiler
-{
-    private $passConfig;
-    private $log = array();
-    private $loggingFormatter;
-    private $serviceReferenceGraph;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->passConfig = new PassConfig();
-        $this->serviceReferenceGraph = new ServiceReferenceGraph();
-        $this->loggingFormatter = new LoggingFormatter();
-    }
-
-    /**
-     * Returns the PassConfig.
-     *
-     * @return PassConfig The PassConfig instance
-     */
-    public function getPassConfig()
-    {
-        return $this->passConfig;
-    }
-
-    /**
-     * Returns the ServiceReferenceGraph.
-     *
-     * @return ServiceReferenceGraph The ServiceReferenceGraph instance
-     */
-    public function getServiceReferenceGraph()
-    {
-        return $this->serviceReferenceGraph;
-    }
-
-    /**
-     * Returns the logging formatter which can be used by compilation passes.
-     *
-     * @return LoggingFormatter
-     */
-    public function getLoggingFormatter()
-    {
-        return $this->loggingFormatter;
-    }
-
-    /**
-     * Adds a pass to the PassConfig.
-     *
-     * @param CompilerPassInterface $pass A compiler pass
-     * @param string                $type The type of the pass
-     */
-    public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION)
-    {
-        $this->passConfig->addPass($pass, $type);
-    }
-
-    /**
-     * Adds a log message.
-     *
-     * @param string $string The log message
-     */
-    public function addLogMessage($string)
-    {
-        $this->log[] = $string;
-    }
-
-    /**
-     * Returns the log.
-     *
-     * @return array Log array
-     */
-    public function getLog()
-    {
-        return $this->log;
-    }
-
-    /**
-     * Run the Compiler and process all Passes.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function compile(ContainerBuilder $container)
-    {
-        foreach ($this->passConfig->getPasses() as $pass) {
-            $pass->process($container);
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/CompilerPassInterface.php b/vendor/symfony/dependency-injection/Compiler/CompilerPassInterface.php
deleted file mode 100644
index 30cb1d5..0000000
--- a/vendor/symfony/dependency-injection/Compiler/CompilerPassInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Interface that must be implemented by compilation passes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface CompilerPassInterface
-{
-    /**
-     * You can modify the container here before it is dumped to PHP code.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container);
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php b/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php
deleted file mode 100644
index ef0a19c..0000000
--- a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Alias;
-
-/**
- * Overwrites a service but keeps the overridden one.
- *
- * @author Christophe Coevoet <stof@notk.org>
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class DecoratorServicePass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if (!$decorated = $definition->getDecoratedService()) {
-                continue;
-            }
-            $definition->setDecoratedService(null);
-
-            list($inner, $renamedId) = $decorated;
-            if (!$renamedId) {
-                $renamedId = $id.'.inner';
-            }
-
-            // we create a new alias/service for the service we are replacing
-            // to be able to reference it in the new one
-            if ($container->hasAlias($inner)) {
-                $alias = $container->getAlias($inner);
-                $public = $alias->isPublic();
-                $container->setAlias($renamedId, new Alias((string) $alias, false));
-            } else {
-                $definition = $container->getDefinition($inner);
-                $public = $definition->isPublic();
-                $definition->setPublic(false);
-                $container->setDefinition($renamedId, $definition);
-            }
-
-            $container->setAlias($inner, new Alias($id, $public));
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php b/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php
deleted file mode 100644
index b06b497..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ExtensionCompilerPass.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * A pass to automatically process extensions if they implement 
- * CompilerPassInterface.
- *
- * @author Wouter J <wouter@wouterj.nl>
- */
-class ExtensionCompilerPass implements CompilerPassInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        foreach ($container->getExtensions() as $extension) {
-            if (!$extension instanceof CompilerPassInterface) {
-                continue;
-            }
-
-            $extension->process($container);
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php b/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php
deleted file mode 100644
index 026700d..0000000
--- a/vendor/symfony/dependency-injection/Compiler/InlineServiceDefinitionsPass.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Inline service definitions where this is possible.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class InlineServiceDefinitionsPass implements RepeatablePassInterface
-{
-    private $repeatedPass;
-    private $graph;
-    private $compiler;
-    private $formatter;
-    private $currentId;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setRepeatedPass(RepeatedPass $repeatedPass)
-    {
-        $this->repeatedPass = $repeatedPass;
-    }
-
-    /**
-     * Processes the ContainerBuilder for inline service definitions.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->compiler = $container->getCompiler();
-        $this->formatter = $this->compiler->getLoggingFormatter();
-        $this->graph = $this->compiler->getServiceReferenceGraph();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            $this->currentId = $id;
-
-            $definition->setArguments(
-                $this->inlineArguments($container, $definition->getArguments())
-            );
-
-            $definition->setMethodCalls(
-                $this->inlineArguments($container, $definition->getMethodCalls())
-            );
-
-            $definition->setProperties(
-                $this->inlineArguments($container, $definition->getProperties())
-            );
-
-            $configurator = $this->inlineArguments($container, array($definition->getConfigurator()));
-            $definition->setConfigurator($configurator[0]);
-
-            $factory = $this->inlineArguments($container, array($definition->getFactory()));
-            $definition->setFactory($factory[0]);
-        }
-    }
-
-    /**
-     * Processes inline arguments.
-     *
-     * @param ContainerBuilder $container The ContainerBuilder
-     * @param array            $arguments An array of arguments
-     *
-     * @return array
-     */
-    private function inlineArguments(ContainerBuilder $container, array $arguments)
-    {
-        foreach ($arguments as $k => $argument) {
-            if (is_array($argument)) {
-                $arguments[$k] = $this->inlineArguments($container, $argument);
-            } elseif ($argument instanceof Reference) {
-                if (!$container->hasDefinition($id = (string) $argument)) {
-                    continue;
-                }
-
-                if ($this->isInlineableDefinition($container, $id, $definition = $container->getDefinition($id))) {
-                    $this->compiler->addLogMessage($this->formatter->formatInlineService($this, $id, $this->currentId));
-
-                    if (ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope()) {
-                        $arguments[$k] = $definition;
-                    } else {
-                        $arguments[$k] = clone $definition;
-                    }
-                }
-            } elseif ($argument instanceof Definition) {
-                $argument->setArguments($this->inlineArguments($container, $argument->getArguments()));
-                $argument->setMethodCalls($this->inlineArguments($container, $argument->getMethodCalls()));
-                $argument->setProperties($this->inlineArguments($container, $argument->getProperties()));
-            }
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Checks if the definition is inlineable.
-     *
-     * @param ContainerBuilder $container
-     * @param string           $id
-     * @param Definition       $definition
-     *
-     * @return bool If the definition is inlineable
-     */
-    private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition)
-    {
-        if (ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) {
-            return true;
-        }
-
-        if ($definition->isPublic() || $definition->isLazy()) {
-            return false;
-        }
-
-        if (!$this->graph->hasNode($id)) {
-            return true;
-        }
-
-        if ($this->currentId == $id) {
-            return false;
-        }
-
-        $ids = array();
-        foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
-            $ids[] = $edge->getSourceNode()->getId();
-        }
-
-        if (count(array_unique($ids)) > 1) {
-            return false;
-        }
-
-        if (count($ids) > 1 && is_array($factory = $definition->getFactory()) && ($factory[0] instanceof Reference || $factory[0] instanceof Definition)) {
-            return false;
-        }
-
-        if (count($ids) > 1 && $definition->getFactoryService(false)) {
-            return false;
-        }
-
-        return $container->getDefinition(reset($ids))->getScope() === $definition->getScope();
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php b/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php
deleted file mode 100644
index 6bd6161..0000000
--- a/vendor/symfony/dependency-injection/Compiler/LoggingFormatter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-/**
- * Used to format logging messages during the compilation.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class LoggingFormatter
-{
-    public function formatRemoveService(CompilerPassInterface $pass, $id, $reason)
-    {
-        return $this->format($pass, sprintf('Removed service "%s"; reason: %s', $id, $reason));
-    }
-
-    public function formatInlineService(CompilerPassInterface $pass, $id, $target)
-    {
-        return $this->format($pass, sprintf('Inlined service "%s" to "%s".', $id, $target));
-    }
-
-    public function formatUpdateReference(CompilerPassInterface $pass, $serviceId, $oldDestId, $newDestId)
-    {
-        return $this->format($pass, sprintf('Changed reference of service "%s" previously pointing to "%s" to "%s".', $serviceId, $oldDestId, $newDestId));
-    }
-
-    public function formatResolveInheritance(CompilerPassInterface $pass, $childId, $parentId)
-    {
-        return $this->format($pass, sprintf('Resolving inheritance for "%s" (parent: %s).', $childId, $parentId));
-    }
-
-    public function format(CompilerPassInterface $pass, $message)
-    {
-        return sprintf('%s: %s', get_class($pass), $message);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php b/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
deleted file mode 100644
index f9e6024..0000000
--- a/vendor/symfony/dependency-injection/Compiler/MergeExtensionConfigurationPass.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-
-/**
- * Merges extension configs into the container builder.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class MergeExtensionConfigurationPass implements CompilerPassInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $parameters = $container->getParameterBag()->all();
-        $definitions = $container->getDefinitions();
-        $aliases = $container->getAliases();
-        $exprLangProviders = $container->getExpressionLanguageProviders();
-
-        foreach ($container->getExtensions() as $extension) {
-            if ($extension instanceof PrependExtensionInterface) {
-                $extension->prepend($container);
-            }
-        }
-
-        foreach ($container->getExtensions() as $name => $extension) {
-            if (!$config = $container->getExtensionConfig($name)) {
-                // this extension was not called
-                continue;
-            }
-            $config = $container->getParameterBag()->resolveValue($config);
-
-            $tmpContainer = new ContainerBuilder($container->getParameterBag());
-            $tmpContainer->setResourceTracking($container->isTrackingResources());
-            $tmpContainer->addObjectResource($extension);
-
-            foreach ($exprLangProviders as $provider) {
-                $tmpContainer->addExpressionLanguageProvider($provider);
-            }
-
-            $extension->load($config, $tmpContainer);
-
-            $container->merge($tmpContainer);
-            $container->getParameterBag()->add($parameters);
-        }
-
-        $container->addDefinitions($definitions);
-        $container->addAliases($aliases);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/PassConfig.php b/vendor/symfony/dependency-injection/Compiler/PassConfig.php
deleted file mode 100644
index 2849dfe..0000000
--- a/vendor/symfony/dependency-injection/Compiler/PassConfig.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * Compiler Pass Configuration.
- *
- * This class has a default configuration embedded.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class PassConfig
-{
-    const TYPE_AFTER_REMOVING = 'afterRemoving';
-    const TYPE_BEFORE_OPTIMIZATION = 'beforeOptimization';
-    const TYPE_BEFORE_REMOVING = 'beforeRemoving';
-    const TYPE_OPTIMIZE = 'optimization';
-    const TYPE_REMOVE = 'removing';
-
-    private $mergePass;
-    private $afterRemovingPasses = array();
-    private $beforeOptimizationPasses = array();
-    private $beforeRemovingPasses = array();
-    private $optimizationPasses;
-    private $removingPasses;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->mergePass = new MergeExtensionConfigurationPass();
-
-        $this->optimizationPasses = array(
-            new ExtensionCompilerPass(),
-            new ResolveDefinitionTemplatesPass(),
-            new DecoratorServicePass(),
-            new ResolveParameterPlaceHoldersPass(),
-            new CheckDefinitionValidityPass(),
-            new ResolveReferencesToAliasesPass(),
-            new ResolveInvalidReferencesPass(),
-            new AnalyzeServiceReferencesPass(true),
-            new CheckCircularReferencesPass(),
-            new CheckReferenceValidityPass(),
-        );
-
-        $this->removingPasses = array(
-            new RemovePrivateAliasesPass(),
-            new RemoveAbstractDefinitionsPass(),
-            new ReplaceAliasByActualDefinitionPass(),
-            new RepeatedPass(array(
-                new AnalyzeServiceReferencesPass(),
-                new InlineServiceDefinitionsPass(),
-                new AnalyzeServiceReferencesPass(),
-                new RemoveUnusedDefinitionsPass(),
-            )),
-            new CheckExceptionOnInvalidReferenceBehaviorPass(),
-        );
-    }
-
-    /**
-     * Returns all passes in order to be processed.
-     *
-     * @return array An array of all passes to process
-     */
-    public function getPasses()
-    {
-        return array_merge(
-            array($this->mergePass),
-            $this->beforeOptimizationPasses,
-            $this->optimizationPasses,
-            $this->beforeRemovingPasses,
-            $this->removingPasses,
-            $this->afterRemovingPasses
-        );
-    }
-
-    /**
-     * Adds a pass.
-     *
-     * @param CompilerPassInterface $pass A Compiler pass
-     * @param string                $type The pass type
-     *
-     * @throws InvalidArgumentException when a pass type doesn't exist
-     */
-    public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION)
-    {
-        $property = $type.'Passes';
-        if (!isset($this->$property)) {
-            throw new InvalidArgumentException(sprintf('Invalid type "%s".', $type));
-        }
-
-        $passes = &$this->$property;
-        $passes[] = $pass;
-    }
-
-    /**
-     * Gets all passes for the AfterRemoving pass.
-     *
-     * @return array An array of passes
-     */
-    public function getAfterRemovingPasses()
-    {
-        return $this->afterRemovingPasses;
-    }
-
-    /**
-     * Gets all passes for the BeforeOptimization pass.
-     *
-     * @return array An array of passes
-     */
-    public function getBeforeOptimizationPasses()
-    {
-        return $this->beforeOptimizationPasses;
-    }
-
-    /**
-     * Gets all passes for the BeforeRemoving pass.
-     *
-     * @return array An array of passes
-     */
-    public function getBeforeRemovingPasses()
-    {
-        return $this->beforeRemovingPasses;
-    }
-
-    /**
-     * Gets all passes for the Optimization pass.
-     *
-     * @return array An array of passes
-     */
-    public function getOptimizationPasses()
-    {
-        return $this->optimizationPasses;
-    }
-
-    /**
-     * Gets all passes for the Removing pass.
-     *
-     * @return array An array of passes
-     */
-    public function getRemovingPasses()
-    {
-        return $this->removingPasses;
-    }
-
-    /**
-     * Gets all passes for the Merge pass.
-     *
-     * @return array An array of passes
-     */
-    public function getMergePass()
-    {
-        return $this->mergePass;
-    }
-
-    /**
-     * Sets the Merge Pass.
-     *
-     * @param CompilerPassInterface $pass The merge pass
-     */
-    public function setMergePass(CompilerPassInterface $pass)
-    {
-        $this->mergePass = $pass;
-    }
-
-    /**
-     * Sets the AfterRemoving passes.
-     *
-     * @param array $passes An array of passes
-     */
-    public function setAfterRemovingPasses(array $passes)
-    {
-        $this->afterRemovingPasses = $passes;
-    }
-
-    /**
-     * Sets the BeforeOptimization passes.
-     *
-     * @param array $passes An array of passes
-     */
-    public function setBeforeOptimizationPasses(array $passes)
-    {
-        $this->beforeOptimizationPasses = $passes;
-    }
-
-    /**
-     * Sets the BeforeRemoving passes.
-     *
-     * @param array $passes An array of passes
-     */
-    public function setBeforeRemovingPasses(array $passes)
-    {
-        $this->beforeRemovingPasses = $passes;
-    }
-
-    /**
-     * Sets the Optimization passes.
-     *
-     * @param array $passes An array of passes
-     */
-    public function setOptimizationPasses(array $passes)
-    {
-        $this->optimizationPasses = $passes;
-    }
-
-    /**
-     * Sets the Removing passes.
-     *
-     * @param array $passes An array of passes
-     */
-    public function setRemovingPasses(array $passes)
-    {
-        $this->removingPasses = $passes;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php b/vendor/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php
deleted file mode 100644
index 0ef0af0..0000000
--- a/vendor/symfony/dependency-injection/Compiler/RemoveAbstractDefinitionsPass.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Removes abstract Definitions.
- */
-class RemoveAbstractDefinitionsPass implements CompilerPassInterface
-{
-    /**
-     * Removes abstract definitions from the ContainerBuilder.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $compiler = $container->getCompiler();
-        $formatter = $compiler->getLoggingFormatter();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isAbstract()) {
-                $container->removeDefinition($id);
-                $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'abstract'));
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php b/vendor/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php
deleted file mode 100644
index 5c53a33..0000000
--- a/vendor/symfony/dependency-injection/Compiler/RemovePrivateAliasesPass.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Remove private aliases from the container. They were only used to establish
- * dependencies between services, and these dependencies have been resolved in
- * one of the previous passes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RemovePrivateAliasesPass implements CompilerPassInterface
-{
-    /**
-     * Removes private aliases from the ContainerBuilder.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $compiler = $container->getCompiler();
-        $formatter = $compiler->getLoggingFormatter();
-
-        foreach ($container->getAliases() as $id => $alias) {
-            if ($alias->isPublic()) {
-                continue;
-            }
-
-            $container->removeAlias($id);
-            $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'private alias'));
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php b/vendor/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php
deleted file mode 100644
index 9e18a9e..0000000
--- a/vendor/symfony/dependency-injection/Compiler/RemoveUnusedDefinitionsPass.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Removes unused service definitions from the container.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RemoveUnusedDefinitionsPass implements RepeatablePassInterface
-{
-    private $repeatedPass;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setRepeatedPass(RepeatedPass $repeatedPass)
-    {
-        $this->repeatedPass = $repeatedPass;
-    }
-
-    /**
-     * Processes the ContainerBuilder to remove unused definitions.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $compiler = $container->getCompiler();
-        $formatter = $compiler->getLoggingFormatter();
-        $graph = $compiler->getServiceReferenceGraph();
-
-        $hasChanged = false;
-        foreach ($container->getDefinitions() as $id => $definition) {
-            if ($definition->isPublic()) {
-                continue;
-            }
-
-            if ($graph->hasNode($id)) {
-                $edges = $graph->getNode($id)->getInEdges();
-                $referencingAliases = array();
-                $sourceIds = array();
-                foreach ($edges as $edge) {
-                    $node = $edge->getSourceNode();
-                    $sourceIds[] = $node->getId();
-
-                    if ($node->isAlias()) {
-                        $referencingAliases[] = $node->getValue();
-                    }
-                }
-                $isReferenced = (count(array_unique($sourceIds)) - count($referencingAliases)) > 0;
-            } else {
-                $referencingAliases = array();
-                $isReferenced = false;
-            }
-
-            if (1 === count($referencingAliases) && false === $isReferenced) {
-                $container->setDefinition((string) reset($referencingAliases), $definition);
-                $definition->setPublic(true);
-                $container->removeDefinition($id);
-                $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'replaces alias '.reset($referencingAliases)));
-            } elseif (0 === count($referencingAliases) && false === $isReferenced) {
-                $container->removeDefinition($id);
-                $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'unused'));
-                $hasChanged = true;
-            }
-        }
-
-        if ($hasChanged) {
-            $this->repeatedPass->setRepeat();
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/RepeatablePassInterface.php b/vendor/symfony/dependency-injection/Compiler/RepeatablePassInterface.php
deleted file mode 100644
index d60ae35..0000000
--- a/vendor/symfony/dependency-injection/Compiler/RepeatablePassInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-/**
- * Interface that must be implemented by passes that are run as part of an
- * RepeatedPass.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface RepeatablePassInterface extends CompilerPassInterface
-{
-    /**
-     * Sets the RepeatedPass interface.
-     *
-     * @param RepeatedPass $repeatedPass
-     */
-    public function setRepeatedPass(RepeatedPass $repeatedPass);
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/RepeatedPass.php b/vendor/symfony/dependency-injection/Compiler/RepeatedPass.php
deleted file mode 100644
index e34b068..0000000
--- a/vendor/symfony/dependency-injection/Compiler/RepeatedPass.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * A pass that might be run repeatedly.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RepeatedPass implements CompilerPassInterface
-{
-    /**
-     * @var bool
-     */
-    private $repeat = false;
-
-    /**
-     * @var RepeatablePassInterface[]
-     */
-    private $passes;
-
-    /**
-     * Constructor.
-     *
-     * @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects
-     *
-     * @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface
-     */
-    public function __construct(array $passes)
-    {
-        foreach ($passes as $pass) {
-            if (!$pass instanceof RepeatablePassInterface) {
-                throw new InvalidArgumentException('$passes must be an array of RepeatablePassInterface.');
-            }
-
-            $pass->setRepeatedPass($this);
-        }
-
-        $this->passes = $passes;
-    }
-
-    /**
-     * Process the repeatable passes that run more than once.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->repeat = false;
-        foreach ($this->passes as $pass) {
-            $pass->process($container);
-        }
-
-        if ($this->repeat) {
-            $this->process($container);
-        }
-    }
-
-    /**
-     * Sets if the pass should repeat.
-     */
-    public function setRepeat()
-    {
-        $this->repeat = true;
-    }
-
-    /**
-     * Returns the passes.
-     *
-     * @return RepeatablePassInterface[] An array of RepeatablePassInterface objects
-     */
-    public function getPasses()
-    {
-        return $this->passes;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php b/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
deleted file mode 100644
index 972d708..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Replaces aliases with actual service definitions, effectively removing these
- * aliases.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ReplaceAliasByActualDefinitionPass implements CompilerPassInterface
-{
-    private $compiler;
-    private $formatter;
-    private $sourceId;
-
-    /**
-     * Process the Container to replace aliases with service definitions.
-     *
-     * @param ContainerBuilder $container
-     *
-     * @throws InvalidArgumentException if the service definition does not exist
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->compiler = $container->getCompiler();
-        $this->formatter = $this->compiler->getLoggingFormatter();
-
-        foreach ($container->getAliases() as $id => $alias) {
-            $aliasId = (string) $alias;
-
-            try {
-                $definition = $container->getDefinition($aliasId);
-            } catch (InvalidArgumentException $e) {
-                throw new InvalidArgumentException(sprintf('Unable to replace alias "%s" with "%s".', $alias, $id), null, $e);
-            }
-
-            if ($definition->isPublic()) {
-                continue;
-            }
-
-            $definition->setPublic(true);
-            $container->setDefinition($id, $definition);
-            $container->removeDefinition($aliasId);
-
-            $this->updateReferences($container, $aliasId, $id);
-
-            // we have to restart the process due to concurrent modification of
-            // the container
-            $this->process($container);
-
-            break;
-        }
-    }
-
-    /**
-     * Updates references to remove aliases.
-     *
-     * @param ContainerBuilder $container The container
-     * @param string           $currentId The alias identifier being replaced
-     * @param string           $newId     The id of the service the alias points to
-     */
-    private function updateReferences($container, $currentId, $newId)
-    {
-        foreach ($container->getAliases() as $id => $alias) {
-            if ($currentId === (string) $alias) {
-                $container->setAlias($id, $newId);
-            }
-        }
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            $this->sourceId = $id;
-
-            $definition->setArguments(
-                $this->updateArgumentReferences($definition->getArguments(), $currentId, $newId)
-            );
-
-            $definition->setMethodCalls(
-                $this->updateArgumentReferences($definition->getMethodCalls(), $currentId, $newId)
-            );
-
-            $definition->setProperties(
-                $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
-            );
-        }
-    }
-
-    /**
-     * Updates argument references.
-     *
-     * @param array  $arguments An array of Arguments
-     * @param string $currentId The alias identifier
-     * @param string $newId     The identifier the alias points to
-     *
-     * @return array
-     */
-    private function updateArgumentReferences(array $arguments, $currentId, $newId)
-    {
-        foreach ($arguments as $k => $argument) {
-            if (is_array($argument)) {
-                $arguments[$k] = $this->updateArgumentReferences($argument, $currentId, $newId);
-            } elseif ($argument instanceof Reference) {
-                if ($currentId === (string) $argument) {
-                    $arguments[$k] = new Reference($newId, $argument->getInvalidBehavior());
-                    $this->compiler->addLogMessage($this->formatter->formatUpdateReference($this, $this->sourceId, $currentId, $newId));
-                }
-            }
-        }
-
-        return $arguments;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php
deleted file mode 100644
index 3fc6a11..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-
-/**
- * This replaces all DefinitionDecorator instances with their equivalent fully
- * merged Definition instance.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ResolveDefinitionTemplatesPass implements CompilerPassInterface
-{
-    private $container;
-    private $compiler;
-    private $formatter;
-
-    /**
-     * Process the ContainerBuilder to replace DefinitionDecorator instances with their real Definition instances.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-        $this->compiler = $container->getCompiler();
-        $this->formatter = $this->compiler->getLoggingFormatter();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            // yes, we are specifically fetching the definition from the
-            // container to ensure we are not operating on stale data
-            $definition = $container->getDefinition($id);
-            if (!$definition instanceof DefinitionDecorator || $definition->isAbstract()) {
-                continue;
-            }
-
-            $this->resolveDefinition($id, $definition);
-        }
-    }
-
-    /**
-     * Resolves the definition.
-     *
-     * @param string              $id         The definition identifier
-     * @param DefinitionDecorator $definition
-     *
-     * @return Definition
-     *
-     * @throws \RuntimeException When the definition is invalid
-     */
-    private function resolveDefinition($id, DefinitionDecorator $definition)
-    {
-        if (!$this->container->hasDefinition($parent = $definition->getParent())) {
-            throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $id));
-        }
-
-        $parentDef = $this->container->getDefinition($parent);
-        if ($parentDef instanceof DefinitionDecorator) {
-            $parentDef = $this->resolveDefinition($parent, $parentDef);
-        }
-
-        $this->compiler->addLogMessage($this->formatter->formatResolveInheritance($this, $id, $parent));
-        $def = new Definition();
-
-        // merge in parent definition
-        // purposely ignored attributes: scope, abstract, tags
-        $def->setClass($parentDef->getClass());
-        $def->setArguments($parentDef->getArguments());
-        $def->setMethodCalls($parentDef->getMethodCalls());
-        $def->setProperties($parentDef->getProperties());
-        if ($parentDef->getFactoryClass(false)) {
-            $def->setFactoryClass($parentDef->getFactoryClass(false));
-        }
-        if ($parentDef->getFactoryMethod(false)) {
-            $def->setFactoryMethod($parentDef->getFactoryMethod(false));
-        }
-        if ($parentDef->getFactoryService(false)) {
-            $def->setFactoryService($parentDef->getFactoryService(false));
-        }
-        $def->setFactory($parentDef->getFactory());
-        $def->setConfigurator($parentDef->getConfigurator());
-        $def->setFile($parentDef->getFile());
-        $def->setPublic($parentDef->isPublic());
-        $def->setLazy($parentDef->isLazy());
-
-        // overwrite with values specified in the decorator
-        $changes = $definition->getChanges();
-        if (isset($changes['class'])) {
-            $def->setClass($definition->getClass());
-        }
-        if (isset($changes['factory_class'])) {
-            $def->setFactoryClass($definition->getFactoryClass(false));
-        }
-        if (isset($changes['factory_method'])) {
-            $def->setFactoryMethod($definition->getFactoryMethod(false));
-        }
-        if (isset($changes['factory_service'])) {
-            $def->setFactoryService($definition->getFactoryService(false));
-        }
-        if (isset($changes['factory'])) {
-            $def->setFactory($definition->getFactory());
-        }
-        if (isset($changes['configurator'])) {
-            $def->setConfigurator($definition->getConfigurator());
-        }
-        if (isset($changes['file'])) {
-            $def->setFile($definition->getFile());
-        }
-        if (isset($changes['public'])) {
-            $def->setPublic($definition->isPublic());
-        }
-        if (isset($changes['lazy'])) {
-            $def->setLazy($definition->isLazy());
-        }
-        if (isset($changes['decorated_service'])) {
-            $decoratedService = $definition->getDecoratedService();
-            if (null === $decoratedService) {
-                $def->setDecoratedService($decoratedService);
-            } else {
-                $def->setDecoratedService($decoratedService[0], $decoratedService[1]);
-            }
-        }
-
-        // merge arguments
-        foreach ($definition->getArguments() as $k => $v) {
-            if (is_numeric($k)) {
-                $def->addArgument($v);
-                continue;
-            }
-
-            if (0 !== strpos($k, 'index_')) {
-                throw new RuntimeException(sprintf('Invalid argument key "%s" found.', $k));
-            }
-
-            $index = (int) substr($k, strlen('index_'));
-            $def->replaceArgument($index, $v);
-        }
-
-        // merge properties
-        foreach ($definition->getProperties() as $k => $v) {
-            $def->setProperty($k, $v);
-        }
-
-        // append method calls
-        if (count($calls = $definition->getMethodCalls()) > 0) {
-            $def->setMethodCalls(array_merge($def->getMethodCalls(), $calls));
-        }
-
-        // these attributes are always taken from the child
-        $def->setAbstract($definition->isAbstract());
-        $def->setScope($definition->getScope());
-        $def->setTags($definition->getTags());
-
-        // set new definition on container
-        $this->container->setDefinition($id, $def);
-
-        return $def;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
deleted file mode 100644
index 85dbceb..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ResolveInvalidReferencesPass.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-
-/**
- * Emulates the invalid behavior if the reference is not found within the
- * container.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ResolveInvalidReferencesPass implements CompilerPassInterface
-{
-    private $container;
-
-    /**
-     * Process the ContainerBuilder to resolve invalid references.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-        foreach ($container->getDefinitions() as $definition) {
-            if ($definition->isSynthetic() || $definition->isAbstract()) {
-                continue;
-            }
-
-            $definition->setArguments(
-                $this->processArguments($definition->getArguments())
-            );
-
-            $calls = array();
-            foreach ($definition->getMethodCalls() as $call) {
-                try {
-                    $calls[] = array($call[0], $this->processArguments($call[1], true));
-                } catch (RuntimeException $e) {
-                    // this call is simply removed
-                }
-            }
-            $definition->setMethodCalls($calls);
-
-            $properties = array();
-            foreach ($definition->getProperties() as $name => $value) {
-                try {
-                    $value = $this->processArguments(array($value), true);
-                    $properties[$name] = reset($value);
-                } catch (RuntimeException $e) {
-                    // ignore property
-                }
-            }
-            $definition->setProperties($properties);
-        }
-    }
-
-    /**
-     * Processes arguments to determine invalid references.
-     *
-     * @param array $arguments    An array of Reference objects
-     * @param bool  $inMethodCall
-     *
-     * @return array
-     *
-     * @throws RuntimeException When the config is invalid
-     */
-    private function processArguments(array $arguments, $inMethodCall = false)
-    {
-        foreach ($arguments as $k => $argument) {
-            if (is_array($argument)) {
-                $arguments[$k] = $this->processArguments($argument, $inMethodCall);
-            } elseif ($argument instanceof Reference) {
-                $id = (string) $argument;
-
-                $invalidBehavior = $argument->getInvalidBehavior();
-                $exists = $this->container->has($id);
-
-                // resolve invalid behavior
-                if (!$exists && ContainerInterface::NULL_ON_INVALID_REFERENCE === $invalidBehavior) {
-                    $arguments[$k] = null;
-                } elseif (!$exists && ContainerInterface::IGNORE_ON_INVALID_REFERENCE === $invalidBehavior) {
-                    if ($inMethodCall) {
-                        throw new RuntimeException('Method shouldn\'t be called.');
-                    }
-
-                    $arguments[$k] = null;
-                }
-            }
-        }
-
-        return $arguments;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
deleted file mode 100644
index a35f84c..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-
-/**
- * Resolves all parameter placeholders "%somevalue%" to their real values.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ResolveParameterPlaceHoldersPass implements CompilerPassInterface
-{
-    /**
-     * Processes the ContainerBuilder to resolve parameter placeholders.
-     *
-     * @param ContainerBuilder $container
-     *
-     * @throws ParameterNotFoundException
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $parameterBag = $container->getParameterBag();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            try {
-                $definition->setClass($parameterBag->resolveValue($definition->getClass()));
-                $definition->setFile($parameterBag->resolveValue($definition->getFile()));
-                $definition->setArguments($parameterBag->resolveValue($definition->getArguments()));
-                if ($definition->getFactoryClass(false)) {
-                    $definition->setFactoryClass($parameterBag->resolveValue($definition->getFactoryClass(false)));
-                }
-
-                $factory = $definition->getFactory();
-
-                if (is_array($factory) && isset($factory[0])) {
-                    $factory[0] = $parameterBag->resolveValue($factory[0]);
-                    $definition->setFactory($factory);
-                }
-
-                $calls = array();
-                foreach ($definition->getMethodCalls() as $name => $arguments) {
-                    $calls[$parameterBag->resolveValue($name)] = $parameterBag->resolveValue($arguments);
-                }
-                $definition->setMethodCalls($calls);
-
-                $definition->setProperties($parameterBag->resolveValue($definition->getProperties()));
-            } catch (ParameterNotFoundException $e) {
-                $e->setSourceId($id);
-
-                throw $e;
-            }
-        }
-
-        $aliases = array();
-        foreach ($container->getAliases() as $name => $target) {
-            $aliases[$parameterBag->resolveValue($name)] = $parameterBag->resolveValue($target);
-        }
-        $container->setAliases($aliases);
-
-        $parameterBag->resolve();
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php b/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
deleted file mode 100644
index c90d76f..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ResolveReferencesToAliasesPass.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Replaces all references to aliases with references to the actual service.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ResolveReferencesToAliasesPass implements CompilerPassInterface
-{
-    private $container;
-
-    /**
-     * Processes the ContainerBuilder to replace references to aliases with actual service references.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $this->container = $container;
-
-        foreach ($container->getDefinitions() as $definition) {
-            if ($definition->isSynthetic() || $definition->isAbstract()) {
-                continue;
-            }
-
-            $definition->setArguments($this->processArguments($definition->getArguments()));
-            $definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
-            $definition->setProperties($this->processArguments($definition->getProperties()));
-        }
-
-        foreach ($container->getAliases() as $id => $alias) {
-            $aliasId = (string) $alias;
-            if ($aliasId !== $defId = $this->getDefinitionId($aliasId)) {
-                $container->setAlias($id, new Alias($defId, $alias->isPublic()));
-            }
-        }
-    }
-
-    /**
-     * Processes the arguments to replace aliases.
-     *
-     * @param array $arguments An array of References
-     *
-     * @return array An array of References
-     */
-    private function processArguments(array $arguments)
-    {
-        foreach ($arguments as $k => $argument) {
-            if (is_array($argument)) {
-                $arguments[$k] = $this->processArguments($argument);
-            } elseif ($argument instanceof Reference) {
-                $defId = $this->getDefinitionId($id = (string) $argument);
-
-                if ($defId !== $id) {
-                    $arguments[$k] = new Reference($defId, $argument->getInvalidBehavior(), $argument->isStrict());
-                }
-            }
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Resolves an alias into a definition id.
-     *
-     * @param string $id The definition or alias id to resolve
-     *
-     * @return string The definition id with aliases resolved
-     */
-    private function getDefinitionId($id)
-    {
-        $seen = array();
-        while ($this->container->hasAlias($id)) {
-            if (isset($seen[$id])) {
-                throw new ServiceCircularReferenceException($id, array_keys($seen));
-            }
-            $seen[$id] = true;
-            $id = (string) $this->container->getAlias($id);
-        }
-
-        return $id;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php b/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
deleted file mode 100644
index dc9a1a0..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraph.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * This is a directed graph of your services.
- *
- * This information can be used by your compiler passes instead of collecting
- * it themselves which improves performance quite a lot.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ServiceReferenceGraph
-{
-    /**
-     * @var ServiceReferenceGraphNode[]
-     */
-    private $nodes = array();
-
-    /**
-     * Checks if the graph has a specific node.
-     *
-     * @param string $id Id to check
-     *
-     * @return bool
-     */
-    public function hasNode($id)
-    {
-        return isset($this->nodes[$id]);
-    }
-
-    /**
-     * Gets a node by identifier.
-     *
-     * @param string $id The id to retrieve
-     *
-     * @return ServiceReferenceGraphNode The node matching the supplied identifier
-     *
-     * @throws InvalidArgumentException if no node matches the supplied identifier
-     */
-    public function getNode($id)
-    {
-        if (!isset($this->nodes[$id])) {
-            throw new InvalidArgumentException(sprintf('There is no node with id "%s".', $id));
-        }
-
-        return $this->nodes[$id];
-    }
-
-    /**
-     * Returns all nodes.
-     *
-     * @return ServiceReferenceGraphNode[] An array of all ServiceReferenceGraphNode objects
-     */
-    public function getNodes()
-    {
-        return $this->nodes;
-    }
-
-    /**
-     * Clears all nodes.
-     */
-    public function clear()
-    {
-        $this->nodes = array();
-    }
-
-    /**
-     * Connects 2 nodes together in the Graph.
-     *
-     * @param string $sourceId
-     * @param string $sourceValue
-     * @param string $destId
-     * @param string $destValue
-     * @param string $reference
-     */
-    public function connect($sourceId, $sourceValue, $destId, $destValue = null, $reference = null)
-    {
-        $sourceNode = $this->createNode($sourceId, $sourceValue);
-        $destNode = $this->createNode($destId, $destValue);
-        $edge = new ServiceReferenceGraphEdge($sourceNode, $destNode, $reference);
-
-        $sourceNode->addOutEdge($edge);
-        $destNode->addInEdge($edge);
-    }
-
-    /**
-     * Creates a graph node.
-     *
-     * @param string $id
-     * @param string $value
-     *
-     * @return ServiceReferenceGraphNode
-     */
-    private function createNode($id, $value)
-    {
-        if (isset($this->nodes[$id]) && $this->nodes[$id]->getValue() === $value) {
-            return $this->nodes[$id];
-        }
-
-        return $this->nodes[$id] = new ServiceReferenceGraphNode($id, $value);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php b/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
deleted file mode 100644
index 6a3e2ea..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphEdge.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-/**
- * Represents an edge in your service graph.
- *
- * Value is typically a reference.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ServiceReferenceGraphEdge
-{
-    private $sourceNode;
-    private $destNode;
-    private $value;
-
-    /**
-     * Constructor.
-     *
-     * @param ServiceReferenceGraphNode $sourceNode
-     * @param ServiceReferenceGraphNode $destNode
-     * @param string                    $value
-     */
-    public function __construct(ServiceReferenceGraphNode $sourceNode, ServiceReferenceGraphNode $destNode, $value = null)
-    {
-        $this->sourceNode = $sourceNode;
-        $this->destNode = $destNode;
-        $this->value = $value;
-    }
-
-    /**
-     * Returns the value of the edge.
-     *
-     * @return ServiceReferenceGraphNode
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the source node.
-     *
-     * @return ServiceReferenceGraphNode
-     */
-    public function getSourceNode()
-    {
-        return $this->sourceNode;
-    }
-
-    /**
-     * Returns the destination node.
-     *
-     * @return ServiceReferenceGraphNode
-     */
-    public function getDestNode()
-    {
-        return $this->destNode;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphNode.php b/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphNode.php
deleted file mode 100644
index c49c932..0000000
--- a/vendor/symfony/dependency-injection/Compiler/ServiceReferenceGraphNode.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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\Component\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Alias;
-
-/**
- * Represents a node in your service graph.
- *
- * Value is typically a definition, or an alias.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ServiceReferenceGraphNode
-{
-    private $id;
-    private $inEdges = array();
-    private $outEdges = array();
-    private $value;
-
-    /**
-     * Constructor.
-     *
-     * @param string $id    The node identifier
-     * @param mixed  $value The node value
-     */
-    public function __construct($id, $value)
-    {
-        $this->id = $id;
-        $this->value = $value;
-    }
-
-    /**
-     * Adds an in edge to this node.
-     *
-     * @param ServiceReferenceGraphEdge $edge
-     */
-    public function addInEdge(ServiceReferenceGraphEdge $edge)
-    {
-        $this->inEdges[] = $edge;
-    }
-
-    /**
-     * Adds an out edge to this node.
-     *
-     * @param ServiceReferenceGraphEdge $edge
-     */
-    public function addOutEdge(ServiceReferenceGraphEdge $edge)
-    {
-        $this->outEdges[] = $edge;
-    }
-
-    /**
-     * Checks if the value of this node is an Alias.
-     *
-     * @return bool True if the value is an Alias instance
-     */
-    public function isAlias()
-    {
-        return $this->value instanceof Alias;
-    }
-
-    /**
-     * Checks if the value of this node is a Definition.
-     *
-     * @return bool True if the value is a Definition instance
-     */
-    public function isDefinition()
-    {
-        return $this->value instanceof Definition;
-    }
-
-    /**
-     * Returns the identifier.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the in edges.
-     *
-     * @return array The in ServiceReferenceGraphEdge array
-     */
-    public function getInEdges()
-    {
-        return $this->inEdges;
-    }
-
-    /**
-     * Returns the out edges.
-     *
-     * @return array The out ServiceReferenceGraphEdge array
-     */
-    public function getOutEdges()
-    {
-        return $this->outEdges;
-    }
-
-    /**
-     * Returns the value of this Node.
-     *
-     * @return mixed The value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Container.php b/vendor/symfony/dependency-injection/Container.php
deleted file mode 100644
index 510d030..0000000
--- a/vendor/symfony/dependency-injection/Container.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
-
-/**
- * Container is a dependency injection container.
- *
- * It gives access to object instances (services).
- *
- * Services and parameters are simple key/pair stores.
- *
- * Parameter and service keys are case insensitive.
- *
- * A service id can contain lowercased letters, digits, underscores, and dots.
- * Underscores are used to separate words, and dots to group services
- * under namespaces:
- *
- * <ul>
- *   <li>request</li>
- *   <li>mysql_session_storage</li>
- *   <li>symfony.mysql_session_storage</li>
- * </ul>
- *
- * A service can also be defined by creating a method named
- * getXXXService(), where XXX is the camelized version of the id:
- *
- * <ul>
- *   <li>request -> getRequestService()</li>
- *   <li>mysql_session_storage -> getMysqlSessionStorageService()</li>
- *   <li>symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()</li>
- * </ul>
- *
- * The container can have three possible behaviors when a service does not exist:
- *
- *  * EXCEPTION_ON_INVALID_REFERENCE: Throws an exception (the default)
- *  * NULL_ON_INVALID_REFERENCE:      Returns null
- *  * IGNORE_ON_INVALID_REFERENCE:    Ignores the wrapping command asking for the reference
- *                                    (for instance, ignore a setter if the service does not exist)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Container implements IntrospectableContainerInterface
-{
-    /**
-     * @var ParameterBagInterface
-     */
-    protected $parameterBag;
-
-    protected $services = array();
-    protected $methodMap = array();
-    protected $aliases = array();
-    protected $scopes = array();
-    protected $scopeChildren = array();
-    protected $scopedServices = array();
-    protected $scopeStacks = array();
-    protected $loading = array();
-
-    private $underscoreMap = array('_' => '', '.' => '_', '\\' => '_');
-
-    /**
-     * Constructor.
-     *
-     * @param ParameterBagInterface $parameterBag A ParameterBagInterface instance
-     */
-    public function __construct(ParameterBagInterface $parameterBag = null)
-    {
-        $this->parameterBag = $parameterBag ?: new ParameterBag();
-    }
-
-    /**
-     * Compiles the container.
-     *
-     * This method does two things:
-     *
-     *  * Parameter values are resolved;
-     *  * The parameter bag is frozen.
-     */
-    public function compile()
-    {
-        $this->parameterBag->resolve();
-
-        $this->parameterBag = new FrozenParameterBag($this->parameterBag->all());
-    }
-
-    /**
-     * Returns true if the container parameter bag are frozen.
-     *
-     * @return bool true if the container parameter bag are frozen, false otherwise
-     */
-    public function isFrozen()
-    {
-        return $this->parameterBag instanceof FrozenParameterBag;
-    }
-
-    /**
-     * Gets the service container parameter bag.
-     *
-     * @return ParameterBagInterface A ParameterBagInterface instance
-     */
-    public function getParameterBag()
-    {
-        return $this->parameterBag;
-    }
-
-    /**
-     * Gets a parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
-     *
-     * @throws InvalidArgumentException if the parameter is not defined
-     */
-    public function getParameter($name)
-    {
-        return $this->parameterBag->get($name);
-    }
-
-    /**
-     * Checks if a parameter exists.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool The presence of parameter in container
-     */
-    public function hasParameter($name)
-    {
-        return $this->parameterBag->has($name);
-    }
-
-    /**
-     * Sets a parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
-     */
-    public function setParameter($name, $value)
-    {
-        $this->parameterBag->set($name, $value);
-    }
-
-    /**
-     * Sets a service.
-     *
-     * Setting a service to null resets the service: has() returns false and get()
-     * behaves in the same way as if the service was never created.
-     *
-     * @param string $id      The service identifier
-     * @param object $service The service instance
-     * @param string $scope   The scope of the service
-     *
-     * @throws RuntimeException         When trying to set a service in an inactive scope
-     * @throws InvalidArgumentException When trying to set a service in the prototype scope
-     */
-    public function set($id, $service, $scope = self::SCOPE_CONTAINER)
-    {
-        if (self::SCOPE_PROTOTYPE === $scope) {
-            throw new InvalidArgumentException(sprintf('You cannot set service "%s" of scope "prototype".', $id));
-        }
-
-        $id = strtolower($id);
-
-        if ('service_container' === $id) {
-            // BC: 'service_container' is no longer a self-reference but always
-            // $this, so ignore this call.
-            // @todo Throw InvalidArgumentException in next major release.
-            return;
-        }
-        if (self::SCOPE_CONTAINER !== $scope) {
-            if (!isset($this->scopedServices[$scope])) {
-                throw new RuntimeException(sprintf('You cannot set service "%s" of inactive scope.', $id));
-            }
-
-            $this->scopedServices[$scope][$id] = $service;
-        }
-
-        $this->services[$id] = $service;
-
-        if (method_exists($this, $method = 'synchronize'.strtr($id, $this->underscoreMap).'Service')) {
-            $this->$method();
-        }
-
-        if (null === $service) {
-            if (self::SCOPE_CONTAINER !== $scope) {
-                unset($this->scopedServices[$scope][$id]);
-            }
-
-            unset($this->services[$id]);
-        }
-    }
-
-    /**
-     * Returns true if the given service is defined.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service is defined, false otherwise
-     */
-    public function has($id)
-    {
-        for ($i = 2;;) {
-            if ('service_container' === $id
-                || isset($this->aliases[$id])
-                || isset($this->services[$id])
-                || array_key_exists($id, $this->services)
-            ) {
-                return true;
-            }
-            if (--$i && $id !== $lcId = strtolower($id)) {
-                $id = $lcId;
-            } else {
-                return method_exists($this, 'get'.strtr($id, $this->underscoreMap).'Service');
-            }
-        }
-    }
-
-    /**
-     * Gets a service.
-     *
-     * If a service is defined both through a set() method and
-     * with a get{$id}Service() method, the former has always precedence.
-     *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     *
-     * @return object The associated service
-     *
-     * @throws ServiceCircularReferenceException When a circular reference is detected
-     * @throws ServiceNotFoundException          When the service is not defined
-     * @throws \Exception                        if an exception has been thrown when the service has been resolved
-     *
-     * @see Reference
-     */
-    public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE)
-    {
-        // Attempt to retrieve the service by checking first aliases then
-        // available services. Service IDs are case insensitive, however since
-        // this method can be called thousands of times during a request, avoid
-        // calling strtolower() unless necessary.
-        for ($i = 2;;) {
-            if ('service_container' === $id) {
-                return $this;
-            }
-            if (isset($this->aliases[$id])) {
-                $id = $this->aliases[$id];
-            }
-            // Re-use shared service instance if it exists.
-            if (isset($this->services[$id]) || array_key_exists($id, $this->services)) {
-                return $this->services[$id];
-            }
-
-            if (isset($this->loading[$id])) {
-                throw new ServiceCircularReferenceException($id, array_keys($this->loading));
-            }
-
-            if (isset($this->methodMap[$id])) {
-                $method = $this->methodMap[$id];
-            } elseif (--$i && $id !== $lcId = strtolower($id)) {
-                $id = $lcId;
-                continue;
-            } elseif (method_exists($this, $method = 'get'.strtr($id, $this->underscoreMap).'Service')) {
-                // $method is set to the right value, proceed
-            } else {
-                if (self::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
-                    if (!$id) {
-                        throw new ServiceNotFoundException($id);
-                    }
-
-                    $alternatives = array();
-                    foreach ($this->services as $key => $associatedService) {
-                        $lev = levenshtein($id, $key);
-                        if ($lev <= strlen($id) / 3 || false !== strpos($key, $id)) {
-                            $alternatives[] = $key;
-                        }
-                    }
-
-                    throw new ServiceNotFoundException($id, null, null, $alternatives);
-                }
-
-                return;
-            }
-
-            $this->loading[$id] = true;
-
-            try {
-                $service = $this->$method();
-            } catch (\Exception $e) {
-                unset($this->loading[$id]);
-
-                if (array_key_exists($id, $this->services)) {
-                    unset($this->services[$id]);
-                }
-
-                if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                    return;
-                }
-
-                throw $e;
-            }
-
-            unset($this->loading[$id]);
-
-            return $service;
-        }
-    }
-
-    /**
-     * Returns true if the given service has actually been initialized.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if service has already been initialized, false otherwise
-     */
-    public function initialized($id)
-    {
-        $id = strtolower($id);
-
-        if ('service_container' === $id) {
-            // BC: 'service_container' was a synthetic service previously.
-            // @todo Change to false in next major release.
-            return true;
-        }
-
-        if (isset($this->aliases[$id])) {
-            $id = $this->aliases[$id];
-        }
-
-        return isset($this->services[$id]) || array_key_exists($id, $this->services);
-    }
-
-    /**
-     * Gets all service ids.
-     *
-     * @return array An array of all defined service ids
-     */
-    public function getServiceIds()
-    {
-        $ids = array();
-        $r = new \ReflectionClass($this);
-        foreach ($r->getMethods() as $method) {
-            if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
-                $ids[] = self::underscore($match[1]);
-            }
-        }
-        $ids[] = 'service_container';
-
-        return array_unique(array_merge($ids, array_keys($this->services)));
-    }
-
-    /**
-     * This is called when you enter a scope.
-     *
-     * @param string $name
-     *
-     * @throws RuntimeException         When the parent scope is inactive
-     * @throws InvalidArgumentException When the scope does not exist
-     */
-    public function enterScope($name)
-    {
-        if (!isset($this->scopes[$name])) {
-            throw new InvalidArgumentException(sprintf('The scope "%s" does not exist.', $name));
-        }
-
-        if (self::SCOPE_CONTAINER !== $this->scopes[$name] && !isset($this->scopedServices[$this->scopes[$name]])) {
-            throw new RuntimeException(sprintf('The parent scope "%s" must be active when entering this scope.', $this->scopes[$name]));
-        }
-
-        // check if a scope of this name is already active, if so we need to
-        // remove all services of this scope, and those of any of its child
-        // scopes from the global services map
-        if (isset($this->scopedServices[$name])) {
-            $services = array($this->services, $name => $this->scopedServices[$name]);
-            unset($this->scopedServices[$name]);
-
-            foreach ($this->scopeChildren[$name] as $child) {
-                if (isset($this->scopedServices[$child])) {
-                    $services[$child] = $this->scopedServices[$child];
-                    unset($this->scopedServices[$child]);
-                }
-            }
-
-            // update global map
-            $this->services = call_user_func_array('array_diff_key', $services);
-            array_shift($services);
-
-            // add stack entry for this scope so we can restore the removed services later
-            if (!isset($this->scopeStacks[$name])) {
-                $this->scopeStacks[$name] = new \SplStack();
-            }
-            $this->scopeStacks[$name]->push($services);
-        }
-
-        $this->scopedServices[$name] = array();
-    }
-
-    /**
-     * This is called to leave the current scope, and move back to the parent
-     * scope.
-     *
-     * @param string $name The name of the scope to leave
-     *
-     * @throws InvalidArgumentException if the scope is not active
-     */
-    public function leaveScope($name)
-    {
-        if (!isset($this->scopedServices[$name])) {
-            throw new InvalidArgumentException(sprintf('The scope "%s" is not active.', $name));
-        }
-
-        // remove all services of this scope, or any of its child scopes from
-        // the global service map
-        $services = array($this->services, $this->scopedServices[$name]);
-        unset($this->scopedServices[$name]);
-
-        foreach ($this->scopeChildren[$name] as $child) {
-            if (isset($this->scopedServices[$child])) {
-                $services[] = $this->scopedServices[$child];
-                unset($this->scopedServices[$child]);
-            }
-        }
-
-        // update global map
-        $this->services = call_user_func_array('array_diff_key', $services);
-
-        // check if we need to restore services of a previous scope of this type
-        if (isset($this->scopeStacks[$name]) && count($this->scopeStacks[$name]) > 0) {
-            $services = $this->scopeStacks[$name]->pop();
-            $this->scopedServices += $services;
-
-            if ($this->scopeStacks[$name]->isEmpty()) {
-                unset($this->scopeStacks[$name]);
-            }
-
-            foreach ($services as $array) {
-                foreach ($array as $id => $service) {
-                    $this->set($id, $service, $name);
-                }
-            }
-        }
-    }
-
-    /**
-     * Adds a scope to the container.
-     *
-     * @param ScopeInterface $scope
-     *
-     * @throws InvalidArgumentException
-     */
-    public function addScope(ScopeInterface $scope)
-    {
-        $name = $scope->getName();
-        $parentScope = $scope->getParentName();
-
-        if (self::SCOPE_CONTAINER === $name || self::SCOPE_PROTOTYPE === $name) {
-            throw new InvalidArgumentException(sprintf('The scope "%s" is reserved.', $name));
-        }
-        if (isset($this->scopes[$name])) {
-            throw new InvalidArgumentException(sprintf('A scope with name "%s" already exists.', $name));
-        }
-        if (self::SCOPE_CONTAINER !== $parentScope && !isset($this->scopes[$parentScope])) {
-            throw new InvalidArgumentException(sprintf('The parent scope "%s" does not exist, or is invalid.', $parentScope));
-        }
-
-        $this->scopes[$name] = $parentScope;
-        $this->scopeChildren[$name] = array();
-
-        // normalize the child relations
-        while ($parentScope !== self::SCOPE_CONTAINER) {
-            $this->scopeChildren[$parentScope][] = $name;
-            $parentScope = $this->scopes[$parentScope];
-        }
-    }
-
-    /**
-     * Returns whether this container has a certain scope.
-     *
-     * @param string $name The name of the scope
-     *
-     * @return bool
-     */
-    public function hasScope($name)
-    {
-        return isset($this->scopes[$name]);
-    }
-
-    /**
-     * Returns whether this scope is currently active.
-     *
-     * This does not actually check if the passed scope actually exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function isScopeActive($name)
-    {
-        return isset($this->scopedServices[$name]);
-    }
-
-    /**
-     * Camelizes a string.
-     *
-     * @param string $id A string to camelize
-     *
-     * @return string The camelized string
-     */
-    public static function camelize($id)
-    {
-        return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ ', '\\' => '_ '))), array(' ' => ''));
-    }
-
-    /**
-     * A string to underscore.
-     *
-     * @param string $id The string to underscore
-     *
-     * @return string The underscored string
-     */
-    public static function underscore($id)
-    {
-        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), strtr($id, '_', '.')));
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ContainerAware.php b/vendor/symfony/dependency-injection/ContainerAware.php
deleted file mode 100644
index af977fe..0000000
--- a/vendor/symfony/dependency-injection/ContainerAware.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * A simple implementation of ContainerAwareInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class ContainerAware implements ContainerAwareInterface
-{
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * Sets the Container associated with this Controller.
-     *
-     * @param ContainerInterface $container A ContainerInterface instance
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ContainerAwareInterface.php b/vendor/symfony/dependency-injection/ContainerAwareInterface.php
deleted file mode 100644
index 7007265..0000000
--- a/vendor/symfony/dependency-injection/ContainerAwareInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * ContainerAwareInterface should be implemented by classes that depends on a Container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ContainerAwareInterface
-{
-    /**
-     * Sets the Container.
-     *
-     * @param ContainerInterface|null $container A ContainerInterface instance or null
-     */
-    public function setContainer(ContainerInterface $container = null);
-}
diff --git a/vendor/symfony/dependency-injection/ContainerAwareTrait.php b/vendor/symfony/dependency-injection/ContainerAwareTrait.php
deleted file mode 100644
index 57280aa..0000000
--- a/vendor/symfony/dependency-injection/ContainerAwareTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * ContainerAware trait.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-trait ContainerAwareTrait
-{
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    /**
-     * Sets the Container associated with this Controller.
-     *
-     * @param ContainerInterface $container A ContainerInterface instance
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ContainerBuilder.php b/vendor/symfony/dependency-injection/ContainerBuilder.php
deleted file mode 100644
index d692873..0000000
--- a/vendor/symfony/dependency-injection/ContainerBuilder.php
+++ /dev/null
@@ -1,1129 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Compiler\Compiler;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
-use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
-use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Config\Resource\ResourceInterface;
-use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
-use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
-use Symfony\Component\ExpressionLanguage\Expression;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * ContainerBuilder is a DI container that provides an API to easily describe services.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ContainerBuilder extends Container implements TaggedContainerInterface
-{
-    /**
-     * @var ExtensionInterface[]
-     */
-    private $extensions = array();
-
-    /**
-     * @var ExtensionInterface[]
-     */
-    private $extensionsByNs = array();
-
-    /**
-     * @var Definition[]
-     */
-    private $definitions = array();
-
-    /**
-     * @var Definition[]
-     */
-    private $obsoleteDefinitions = array();
-
-    /**
-     * @var Alias[]
-     */
-    private $aliasDefinitions = array();
-
-    /**
-     * @var ResourceInterface[]
-     */
-    private $resources = array();
-
-    private $extensionConfigs = array();
-
-    /**
-     * @var Compiler
-     */
-    private $compiler;
-
-    private $trackResources = true;
-
-    /**
-     * @var InstantiatorInterface|null
-     */
-    private $proxyInstantiator;
-
-    /**
-     * @var ExpressionLanguage|null
-     */
-    private $expressionLanguage;
-
-    /**
-     * @var ExpressionFunctionProviderInterface[]
-     */
-    private $expressionLanguageProviders = array();
-
-    /**
-     * Sets the track resources flag.
-     *
-     * If you are not using the loaders and therefore don't want
-     * to depend on the Config component, set this flag to false.
-     *
-     * @param bool $track true if you want to track resources, false otherwise
-     */
-    public function setResourceTracking($track)
-    {
-        $this->trackResources = (bool) $track;
-    }
-
-    /**
-     * Checks if resources are tracked.
-     *
-     * @return bool true if resources are tracked, false otherwise
-     */
-    public function isTrackingResources()
-    {
-        return $this->trackResources;
-    }
-
-    /**
-     * Sets the instantiator to be used when fetching proxies.
-     *
-     * @param InstantiatorInterface $proxyInstantiator
-     */
-    public function setProxyInstantiator(InstantiatorInterface $proxyInstantiator)
-    {
-        $this->proxyInstantiator = $proxyInstantiator;
-    }
-
-    /**
-     * Registers an extension.
-     *
-     * @param ExtensionInterface $extension An extension instance
-     */
-    public function registerExtension(ExtensionInterface $extension)
-    {
-        $this->extensions[$extension->getAlias()] = $extension;
-
-        if (false !== $extension->getNamespace()) {
-            $this->extensionsByNs[$extension->getNamespace()] = $extension;
-        }
-    }
-
-    /**
-     * Returns an extension by alias or namespace.
-     *
-     * @param string $name An alias or a namespace
-     *
-     * @return ExtensionInterface An extension instance
-     *
-     * @throws LogicException if the extension is not registered
-     */
-    public function getExtension($name)
-    {
-        if (isset($this->extensions[$name])) {
-            return $this->extensions[$name];
-        }
-
-        if (isset($this->extensionsByNs[$name])) {
-            return $this->extensionsByNs[$name];
-        }
-
-        throw new LogicException(sprintf('Container extension "%s" is not registered', $name));
-    }
-
-    /**
-     * Returns all registered extensions.
-     *
-     * @return ExtensionInterface[] An array of ExtensionInterface
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Checks if we have an extension.
-     *
-     * @param string $name The name of the extension
-     *
-     * @return bool If the extension exists
-     */
-    public function hasExtension($name)
-    {
-        return isset($this->extensions[$name]) || isset($this->extensionsByNs[$name]);
-    }
-
-    /**
-     * Returns an array of resources loaded to build this configuration.
-     *
-     * @return ResourceInterface[] An array of resources
-     */
-    public function getResources()
-    {
-        return array_unique($this->resources);
-    }
-
-    /**
-     * Adds a resource for this configuration.
-     *
-     * @param ResourceInterface $resource A resource instance
-     *
-     * @return ContainerBuilder The current instance
-     */
-    public function addResource(ResourceInterface $resource)
-    {
-        if (!$this->trackResources) {
-            return $this;
-        }
-
-        $this->resources[] = $resource;
-
-        return $this;
-    }
-
-    /**
-     * Sets the resources for this configuration.
-     *
-     * @param ResourceInterface[] $resources An array of resources
-     *
-     * @return ContainerBuilder The current instance
-     */
-    public function setResources(array $resources)
-    {
-        if (!$this->trackResources) {
-            return $this;
-        }
-
-        $this->resources = $resources;
-
-        return $this;
-    }
-
-    /**
-     * Adds the object class hierarchy as resources.
-     *
-     * @param object $object An object instance
-     *
-     * @return ContainerBuilder The current instance
-     */
-    public function addObjectResource($object)
-    {
-        if ($this->trackResources) {
-            $this->addClassResource(new \ReflectionClass($object));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds the given class hierarchy as resources.
-     *
-     * @param \ReflectionClass $class
-     *
-     * @return ContainerBuilder The current instance
-     */
-    public function addClassResource(\ReflectionClass $class)
-    {
-        if (!$this->trackResources) {
-            return $this;
-        }
-
-        do {
-            $this->addResource(new FileResource($class->getFileName()));
-        } while ($class = $class->getParentClass());
-
-        return $this;
-    }
-
-    /**
-     * Loads the configuration for an extension.
-     *
-     * @param string $extension The extension alias or namespace
-     * @param array  $values    An array of values that customizes the extension
-     *
-     * @return ContainerBuilder The current instance
-     *
-     * @throws BadMethodCallException When this ContainerBuilder is frozen
-     * @throws \LogicException        if the container is frozen
-     */
-    public function loadFromExtension($extension, array $values = array())
-    {
-        if ($this->isFrozen()) {
-            throw new BadMethodCallException('Cannot load from an extension on a frozen container.');
-        }
-
-        $namespace = $this->getExtension($extension)->getAlias();
-
-        $this->extensionConfigs[$namespace][] = $values;
-
-        return $this;
-    }
-
-    /**
-     * Adds a compiler pass.
-     *
-     * @param CompilerPassInterface $pass A compiler pass
-     * @param string                $type The type of compiler pass
-     *
-     * @return ContainerBuilder The current instance
-     */
-    public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION)
-    {
-        $this->getCompiler()->addPass($pass, $type);
-
-        $this->addObjectResource($pass);
-
-        return $this;
-    }
-
-    /**
-     * Returns the compiler pass config which can then be modified.
-     *
-     * @return PassConfig The compiler pass config
-     */
-    public function getCompilerPassConfig()
-    {
-        return $this->getCompiler()->getPassConfig();
-    }
-
-    /**
-     * Returns the compiler.
-     *
-     * @return Compiler The compiler
-     */
-    public function getCompiler()
-    {
-        if (null === $this->compiler) {
-            $this->compiler = new Compiler();
-        }
-
-        return $this->compiler;
-    }
-
-    /**
-     * Returns all Scopes.
-     *
-     * @return array An array of scopes
-     */
-    public function getScopes()
-    {
-        return $this->scopes;
-    }
-
-    /**
-     * Returns all Scope children.
-     *
-     * @return array An array of scope children.
-     */
-    public function getScopeChildren()
-    {
-        return $this->scopeChildren;
-    }
-
-    /**
-     * Sets a service.
-     *
-     * @param string $id      The service identifier
-     * @param object $service The service instance
-     * @param string $scope   The scope
-     *
-     * @throws BadMethodCallException When this ContainerBuilder is frozen
-     */
-    public function set($id, $service, $scope = self::SCOPE_CONTAINER)
-    {
-        $id = strtolower($id);
-
-        if ($this->isFrozen()) {
-            // setting a synthetic service on a frozen container is alright
-            if (
-                (!isset($this->definitions[$id]) && !isset($this->obsoleteDefinitions[$id]))
-                    ||
-                (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())
-                    ||
-                (isset($this->obsoleteDefinitions[$id]) && !$this->obsoleteDefinitions[$id]->isSynthetic())
-            ) {
-                throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
-            }
-        }
-
-        if (isset($this->definitions[$id])) {
-            $this->obsoleteDefinitions[$id] = $this->definitions[$id];
-        }
-
-        unset($this->definitions[$id], $this->aliasDefinitions[$id]);
-
-        parent::set($id, $service, $scope);
-
-        if (isset($this->obsoleteDefinitions[$id]) && $this->obsoleteDefinitions[$id]->isSynchronized(false)) {
-            $this->synchronize($id);
-        }
-    }
-
-    /**
-     * Removes a service definition.
-     *
-     * @param string $id The service identifier
-     */
-    public function removeDefinition($id)
-    {
-        unset($this->definitions[strtolower($id)]);
-    }
-
-    /**
-     * Returns true if the given service is defined.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service is defined, false otherwise
-     */
-    public function has($id)
-    {
-        $id = strtolower($id);
-
-        return isset($this->definitions[$id]) || isset($this->aliasDefinitions[$id]) || parent::has($id);
-    }
-
-    /**
-     * Gets a service.
-     *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     *
-     * @return object The associated service
-     *
-     * @throws InvalidArgumentException when no definitions are available
-     * @throws InactiveScopeException   when the current scope is not active
-     * @throws LogicException           when a circular dependency is detected
-     * @throws \Exception
-     *
-     * @see Reference
-     */
-    public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
-    {
-        $id = strtolower($id);
-
-        if ($service = parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
-            return $service;
-        }
-
-        if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {
-            return $this->get($this->aliasDefinitions[$id]);
-        }
-
-        try {
-            $definition = $this->getDefinition($id);
-        } catch (InvalidArgumentException $e) {
-            if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                return;
-            }
-
-            throw $e;
-        }
-
-        $this->loading[$id] = true;
-
-        try {
-            $service = $this->createService($definition, $id);
-        } catch (\Exception $e) {
-            unset($this->loading[$id]);
-
-            if ($e instanceof InactiveScopeException && self::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                return;
-            }
-
-            throw $e;
-        }
-
-        unset($this->loading[$id]);
-
-        return $service;
-    }
-
-    /**
-     * Merges a ContainerBuilder with the current ContainerBuilder configuration.
-     *
-     * Service definitions overrides the current defined ones.
-     *
-     * But for parameters, they are overridden by the current ones. It allows
-     * the parameters passed to the container constructor to have precedence
-     * over the loaded ones.
-     *
-     * $container = new ContainerBuilder(array('foo' => 'bar'));
-     * $loader = new LoaderXXX($container);
-     * $loader->load('resource_name');
-     * $container->register('foo', new stdClass());
-     *
-     * In the above example, even if the loaded resource defines a foo
-     * parameter, the value will still be 'bar' as defined in the ContainerBuilder
-     * constructor.
-     *
-     * @param ContainerBuilder $container The ContainerBuilder instance to merge.
-     *
-     * @throws BadMethodCallException When this ContainerBuilder is frozen
-     */
-    public function merge(ContainerBuilder $container)
-    {
-        if ($this->isFrozen()) {
-            throw new BadMethodCallException('Cannot merge on a frozen container.');
-        }
-
-        $this->addDefinitions($container->getDefinitions());
-        $this->addAliases($container->getAliases());
-        $this->getParameterBag()->add($container->getParameterBag()->all());
-
-        if ($this->trackResources) {
-            foreach ($container->getResources() as $resource) {
-                $this->addResource($resource);
-            }
-        }
-
-        foreach ($this->extensions as $name => $extension) {
-            if (!isset($this->extensionConfigs[$name])) {
-                $this->extensionConfigs[$name] = array();
-            }
-
-            $this->extensionConfigs[$name] = array_merge($this->extensionConfigs[$name], $container->getExtensionConfig($name));
-        }
-    }
-
-    /**
-     * Returns the configuration array for the given extension.
-     *
-     * @param string $name The name of the extension
-     *
-     * @return array An array of configuration
-     */
-    public function getExtensionConfig($name)
-    {
-        if (!isset($this->extensionConfigs[$name])) {
-            $this->extensionConfigs[$name] = array();
-        }
-
-        return $this->extensionConfigs[$name];
-    }
-
-    /**
-     * Prepends a config array to the configs of the given extension.
-     *
-     * @param string $name   The name of the extension
-     * @param array  $config The config to set
-     */
-    public function prependExtensionConfig($name, array $config)
-    {
-        if (!isset($this->extensionConfigs[$name])) {
-            $this->extensionConfigs[$name] = array();
-        }
-
-        array_unshift($this->extensionConfigs[$name], $config);
-    }
-
-    /**
-     * Compiles the container.
-     *
-     * This method passes the container to compiler
-     * passes whose job is to manipulate and optimize
-     * the container.
-     *
-     * The main compiler passes roughly do four things:
-     *
-     *  * The extension configurations are merged;
-     *  * Parameter values are resolved;
-     *  * The parameter bag is frozen;
-     *  * Extension loading is disabled.
-     */
-    public function compile()
-    {
-        $compiler = $this->getCompiler();
-
-        if ($this->trackResources) {
-            foreach ($compiler->getPassConfig()->getPasses() as $pass) {
-                $this->addObjectResource($pass);
-            }
-        }
-
-        $compiler->compile($this);
-
-        if ($this->trackResources) {
-            foreach ($this->definitions as $definition) {
-                if ($definition->isLazy() && ($class = $definition->getClass()) && class_exists($class)) {
-                    $this->addClassResource(new \ReflectionClass($class));
-                }
-            }
-        }
-
-        $this->extensionConfigs = array();
-
-        parent::compile();
-    }
-
-    /**
-     * Gets all service ids.
-     *
-     * @return array An array of all defined service ids
-     */
-    public function getServiceIds()
-    {
-        return array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds()));
-    }
-
-    /**
-     * Adds the service aliases.
-     *
-     * @param array $aliases An array of aliases
-     */
-    public function addAliases(array $aliases)
-    {
-        foreach ($aliases as $alias => $id) {
-            $this->setAlias($alias, $id);
-        }
-    }
-
-    /**
-     * Sets the service aliases.
-     *
-     * @param array $aliases An array of aliases
-     */
-    public function setAliases(array $aliases)
-    {
-        $this->aliasDefinitions = array();
-        $this->addAliases($aliases);
-    }
-
-    /**
-     * Sets an alias for an existing service.
-     *
-     * @param string       $alias The alias to create
-     * @param string|Alias $id    The service to alias
-     *
-     * @throws InvalidArgumentException if the id is not a string or an Alias
-     * @throws InvalidArgumentException if the alias is for itself
-     */
-    public function setAlias($alias, $id)
-    {
-        $alias = strtolower($alias);
-
-        if (is_string($id)) {
-            $id = new Alias($id);
-        } elseif (!$id instanceof Alias) {
-            throw new InvalidArgumentException('$id must be a string, or an Alias object.');
-        }
-
-        if ($alias === (string) $id) {
-            throw new InvalidArgumentException(sprintf('An alias can not reference itself, got a circular reference on "%s".', $alias));
-        }
-
-        unset($this->definitions[$alias]);
-
-        $this->aliasDefinitions[$alias] = $id;
-    }
-
-    /**
-     * Removes an alias.
-     *
-     * @param string $alias The alias to remove
-     */
-    public function removeAlias($alias)
-    {
-        unset($this->aliasDefinitions[strtolower($alias)]);
-    }
-
-    /**
-     * Returns true if an alias exists under the given identifier.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the alias exists, false otherwise
-     */
-    public function hasAlias($id)
-    {
-        return isset($this->aliasDefinitions[strtolower($id)]);
-    }
-
-    /**
-     * Gets all defined aliases.
-     *
-     * @return Alias[] An array of aliases
-     */
-    public function getAliases()
-    {
-        return $this->aliasDefinitions;
-    }
-
-    /**
-     * Gets an alias.
-     *
-     * @param string $id The service identifier
-     *
-     * @return Alias An Alias instance
-     *
-     * @throws InvalidArgumentException if the alias does not exist
-     */
-    public function getAlias($id)
-    {
-        $id = strtolower($id);
-
-        if (!isset($this->aliasDefinitions[$id])) {
-            throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));
-        }
-
-        return $this->aliasDefinitions[$id];
-    }
-
-    /**
-     * Registers a service definition.
-     *
-     * This methods allows for simple registration of service definition
-     * with a fluid interface.
-     *
-     * @param string $id    The service identifier
-     * @param string $class The service class
-     *
-     * @return Definition A Definition instance
-     */
-    public function register($id, $class = null)
-    {
-        return $this->setDefinition($id, new Definition($class));
-    }
-
-    /**
-     * Adds the service definitions.
-     *
-     * @param Definition[] $definitions An array of service definitions
-     */
-    public function addDefinitions(array $definitions)
-    {
-        foreach ($definitions as $id => $definition) {
-            $this->setDefinition($id, $definition);
-        }
-    }
-
-    /**
-     * Sets the service definitions.
-     *
-     * @param Definition[] $definitions An array of service definitions
-     */
-    public function setDefinitions(array $definitions)
-    {
-        $this->definitions = array();
-        $this->addDefinitions($definitions);
-    }
-
-    /**
-     * Gets all service definitions.
-     *
-     * @return Definition[] An array of Definition instances
-     */
-    public function getDefinitions()
-    {
-        return $this->definitions;
-    }
-
-    /**
-     * Sets a service definition.
-     *
-     * @param string     $id         The service identifier
-     * @param Definition $definition A Definition instance
-     *
-     * @return Definition the service definition
-     *
-     * @throws BadMethodCallException When this ContainerBuilder is frozen
-     */
-    public function setDefinition($id, Definition $definition)
-    {
-        if ($this->isFrozen()) {
-            throw new BadMethodCallException('Adding definition to a frozen container is not allowed');
-        }
-
-        $id = strtolower($id);
-
-        unset($this->aliasDefinitions[$id]);
-
-        return $this->definitions[$id] = $definition;
-    }
-
-    /**
-     * Returns true if a service definition exists under the given identifier.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service definition exists, false otherwise
-     */
-    public function hasDefinition($id)
-    {
-        return array_key_exists(strtolower($id), $this->definitions);
-    }
-
-    /**
-     * Gets a service definition.
-     *
-     * @param string $id The service identifier
-     *
-     * @return Definition A Definition instance
-     *
-     * @throws InvalidArgumentException if the service definition does not exist
-     */
-    public function getDefinition($id)
-    {
-        $id = strtolower($id);
-
-        if (!array_key_exists($id, $this->definitions)) {
-            throw new InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
-        }
-
-        return $this->definitions[$id];
-    }
-
-    /**
-     * Gets a service definition by id or alias.
-     *
-     * The method "unaliases" recursively to return a Definition instance.
-     *
-     * @param string $id The service identifier or alias
-     *
-     * @return Definition A Definition instance
-     *
-     * @throws InvalidArgumentException if the service definition does not exist
-     */
-    public function findDefinition($id)
-    {
-        $id = strtolower($id);
-
-        while (isset($this->aliasDefinitions[$id])) {
-            $id = (string) $this->aliasDefinitions[$id];
-        }
-
-        return $this->getDefinition($id);
-    }
-
-    /**
-     * Creates a service for a service definition.
-     *
-     * @param Definition $definition A service definition instance
-     * @param string     $id         The service identifier
-     * @param bool       $tryProxy   Whether to try proxying the service with a lazy proxy
-     *
-     * @return object The service described by the service definition
-     *
-     * @throws RuntimeException         When the scope is inactive
-     * @throws RuntimeException         When the factory definition is incomplete
-     * @throws RuntimeException         When the service is a synthetic service
-     * @throws InvalidArgumentException When configure callable is not callable
-     *
-     * @internal this method is public because of PHP 5.3 limitations, do not use it explicitly in your code
-     */
-    public function createService(Definition $definition, $id, $tryProxy = true)
-    {
-        if ($definition->isSynthetic()) {
-            throw new RuntimeException(sprintf('You have requested a synthetic service ("%s"). The DIC does not know how to construct this service.', $id));
-        }
-
-        if ($tryProxy && $definition->isLazy()) {
-            $container = $this;
-
-            $proxy = $this
-                ->getProxyInstantiator()
-                ->instantiateProxy(
-                    $container,
-                    $definition,
-                    $id, function () use ($definition, $id, $container) {
-                        return $container->createService($definition, $id, false);
-                    }
-                );
-            $this->shareService($definition, $proxy, $id);
-
-            return $proxy;
-        }
-
-        $parameterBag = $this->getParameterBag();
-
-        if (null !== $definition->getFile()) {
-            require_once $parameterBag->resolveValue($definition->getFile());
-        }
-
-        $arguments = $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($definition->getArguments())));
-
-        if (null !== $factory = $definition->getFactory()) {
-            if (is_array($factory)) {
-                $factory = array($this->resolveServices($parameterBag->resolveValue($factory[0])), $factory[1]);
-            } elseif (!is_string($factory)) {
-                throw new RuntimeException(sprintf('Cannot create service "%s" because of invalid factory', $id));
-            }
-
-            $service = call_user_func_array($factory, $arguments);
-        } elseif (null !== $definition->getFactoryMethod(false)) {
-            if (null !== $definition->getFactoryClass(false)) {
-                $factory = $parameterBag->resolveValue($definition->getFactoryClass(false));
-            } elseif (null !== $definition->getFactoryService(false)) {
-                $factory = $this->get($parameterBag->resolveValue($definition->getFactoryService(false)));
-            } else {
-                throw new RuntimeException(sprintf('Cannot create service "%s" from factory method without a factory service or factory class.', $id));
-            }
-
-            $service = call_user_func_array(array($factory, $definition->getFactoryMethod(false)), $arguments);
-        } else {
-            $r = new \ReflectionClass($parameterBag->resolveValue($definition->getClass()));
-
-            $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
-        }
-
-        if ($tryProxy || !$definition->isLazy()) {
-            // share only if proxying failed, or if not a proxy
-            $this->shareService($definition, $service, $id);
-        }
-
-        foreach ($definition->getMethodCalls() as $call) {
-            $this->callMethod($service, $call);
-        }
-
-        $properties = $this->resolveServices($parameterBag->resolveValue($definition->getProperties()));
-        foreach ($properties as $name => $value) {
-            $service->$name = $value;
-        }
-
-        if ($callable = $definition->getConfigurator()) {
-            if (is_array($callable)) {
-                $callable[0] = $parameterBag->resolveValue($callable[0]);
-
-                if ($callable[0] instanceof Reference) {
-                    $callable[0] = $this->get((string) $callable[0], $callable[0]->getInvalidBehavior());
-                } elseif ($callable[0] instanceof Definition) {
-                    $callable[0] = $this->createService($callable[0], null);
-                }
-            }
-
-            if (!is_callable($callable)) {
-                throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
-            }
-
-            call_user_func($callable, $service);
-        }
-
-        return $service;
-    }
-
-    /**
-     * Replaces service references by the real service instance and evaluates expressions.
-     *
-     * @param mixed $value A value
-     *
-     * @return mixed The same value with all service references replaced by
-     *               the real service instances and all expressions evaluated
-     */
-    public function resolveServices($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $k => $v) {
-                $value[$k] = $this->resolveServices($v);
-            }
-        } elseif ($value instanceof Reference) {
-            $value = $this->get((string) $value, $value->getInvalidBehavior());
-        } elseif ($value instanceof Definition) {
-            $value = $this->createService($value, null);
-        } elseif ($value instanceof Expression) {
-            $value = $this->getExpressionLanguage()->evaluate($value, array('container' => $this));
-        }
-
-        return $value;
-    }
-
-    /**
-     * Returns service ids for a given tag.
-     *
-     * Example:
-     *
-     * $container->register('foo')->addTag('my.tag', array('hello' => 'world'));
-     *
-     * $serviceIds = $container->findTaggedServiceIds('my.tag');
-     * foreach ($serviceIds as $serviceId => $tags) {
-     *     foreach ($tags as $tag) {
-     *         echo $tag['hello'];
-     *     }
-     * }
-     *
-     * @param string $name The tag name
-     *
-     * @return array An array of tags with the tagged service as key, holding a list of attribute arrays.
-     */
-    public function findTaggedServiceIds($name)
-    {
-        $tags = array();
-        foreach ($this->getDefinitions() as $id => $definition) {
-            if ($definition->hasTag($name)) {
-                $tags[$id] = $definition->getTag($name);
-            }
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Returns all tags the defined services use.
-     *
-     * @return array An array of tags
-     */
-    public function findTags()
-    {
-        $tags = array();
-        foreach ($this->getDefinitions() as $id => $definition) {
-            $tags = array_merge(array_keys($definition->getTags()), $tags);
-        }
-
-        return array_unique($tags);
-    }
-
-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
-    {
-        $this->expressionLanguageProviders[] = $provider;
-    }
-
-    /**
-     * @return ExpressionFunctionProviderInterface[]
-     */
-    public function getExpressionLanguageProviders()
-    {
-        return $this->expressionLanguageProviders;
-    }
-
-    /**
-     * Returns the Service Conditionals.
-     *
-     * @param mixed $value An array of conditionals to return.
-     *
-     * @return array An array of Service conditionals
-     */
-    public static function getServiceConditionals($value)
-    {
-        $services = array();
-
-        if (is_array($value)) {
-            foreach ($value as $v) {
-                $services = array_unique(array_merge($services, self::getServiceConditionals($v)));
-            }
-        } elseif ($value instanceof Reference && $value->getInvalidBehavior() === ContainerInterface::IGNORE_ON_INVALID_REFERENCE) {
-            $services[] = (string) $value;
-        }
-
-        return $services;
-    }
-
-    /**
-     * Retrieves the currently set proxy instantiator or instantiates one.
-     *
-     * @return InstantiatorInterface
-     */
-    private function getProxyInstantiator()
-    {
-        if (!$this->proxyInstantiator) {
-            $this->proxyInstantiator = new RealServiceInstantiator();
-        }
-
-        return $this->proxyInstantiator;
-    }
-
-    /**
-     * Synchronizes a service change.
-     *
-     * This method updates all services that depend on the given
-     * service by calling all methods referencing it.
-     *
-     * @param string $id A service id
-     *
-     * @deprecated since version 2.7, will be removed in 3.0.
-     */
-    private function synchronize($id)
-    {
-        if ('request' !== $id) {
-            @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
-        }
-
-        foreach ($this->definitions as $definitionId => $definition) {
-            // only check initialized services
-            if (!$this->initialized($definitionId)) {
-                continue;
-            }
-
-            foreach ($definition->getMethodCalls() as $call) {
-                foreach ($call[1] as $argument) {
-                    if ($argument instanceof Reference && $id == (string) $argument) {
-                        $this->callMethod($this->get($definitionId), $call);
-                    }
-                }
-            }
-        }
-    }
-
-    private function callMethod($service, $call)
-    {
-        $services = self::getServiceConditionals($call[1]);
-
-        foreach ($services as $s) {
-            if (!$this->has($s)) {
-                return;
-            }
-        }
-
-        call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1])));
-    }
-
-    /**
-     * Shares a given service in the container.
-     *
-     * @param Definition $definition
-     * @param mixed      $service
-     * @param string     $id
-     *
-     * @throws InactiveScopeException
-     */
-    private function shareService(Definition $definition, $service, $id)
-    {
-        if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
-            if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {
-                throw new InactiveScopeException($id, $scope);
-            }
-
-            $this->services[$lowerId = strtolower($id)] = $service;
-
-            if (self::SCOPE_CONTAINER !== $scope) {
-                $this->scopedServices[$scope][$lowerId] = $service;
-            }
-        }
-    }
-
-    private function getExpressionLanguage()
-    {
-        if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
-            $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
-        }
-
-        return $this->expressionLanguage;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ContainerInterface.php b/vendor/symfony/dependency-injection/ContainerInterface.php
deleted file mode 100644
index 80d6414..0000000
--- a/vendor/symfony/dependency-injection/ContainerInterface.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-
-/**
- * ContainerInterface is the interface implemented by service container classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface ContainerInterface
-{
-    const EXCEPTION_ON_INVALID_REFERENCE = 1;
-    const NULL_ON_INVALID_REFERENCE = 2;
-    const IGNORE_ON_INVALID_REFERENCE = 3;
-    const SCOPE_CONTAINER = 'container';
-    const SCOPE_PROTOTYPE = 'prototype';
-
-    /**
-     * Sets a service.
-     *
-     * @param string $id      The service identifier
-     * @param object $service The service instance
-     * @param string $scope   The scope of the service
-     */
-    public function set($id, $service, $scope = self::SCOPE_CONTAINER);
-
-    /**
-     * Gets a service.
-     *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     *
-     * @return object The associated service
-     *
-     * @throws ServiceCircularReferenceException When a circular reference is detected
-     * @throws ServiceNotFoundException          When the service is not defined
-     *
-     * @see Reference
-     */
-    public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
-
-    /**
-     * Returns true if the given service is defined.
-     *
-     * @param string $id The service identifier
-     *
-     * @return bool true if the service is defined, false otherwise
-     */
-    public function has($id);
-
-    /**
-     * Gets a parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
-     *
-     * @throws InvalidArgumentException if the parameter is not defined
-     */
-    public function getParameter($name);
-
-    /**
-     * Checks if a parameter exists.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool The presence of parameter in container
-     */
-    public function hasParameter($name);
-
-    /**
-     * Sets a parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
-     */
-    public function setParameter($name, $value);
-
-    /**
-     * Enters the given scope.
-     *
-     * @param string $name
-     */
-    public function enterScope($name);
-
-    /**
-     * Leaves the current scope, and re-enters the parent scope.
-     *
-     * @param string $name
-     */
-    public function leaveScope($name);
-
-    /**
-     * Adds a scope to the container.
-     *
-     * @param ScopeInterface $scope
-     */
-    public function addScope(ScopeInterface $scope);
-
-    /**
-     * Whether this container has the given scope.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasScope($name);
-
-    /**
-     * Determines whether the given scope is currently active.
-     *
-     * It does however not check if the scope actually exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function isScopeActive($name);
-}
diff --git a/vendor/symfony/dependency-injection/Definition.php b/vendor/symfony/dependency-injection/Definition.php
deleted file mode 100644
index 777f4a6..0000000
--- a/vendor/symfony/dependency-injection/Definition.php
+++ /dev/null
@@ -1,724 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
-
-/**
- * Definition represents a service definition.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Definition
-{
-    private $class;
-    private $file;
-    private $factory;
-    private $factoryClass;
-    private $factoryMethod;
-    private $factoryService;
-    private $scope = ContainerInterface::SCOPE_CONTAINER;
-    private $properties = array();
-    private $calls = array();
-    private $configurator;
-    private $tags = array();
-    private $public = true;
-    private $synthetic = false;
-    private $abstract = false;
-    private $synchronized = false;
-    private $lazy = false;
-    private $decoratedService;
-
-    protected $arguments;
-
-    /**
-     * Constructor.
-     *
-     * @param string|null $class     The service class
-     * @param array       $arguments An array of arguments to pass to the service constructor
-     */
-    public function __construct($class = null, array $arguments = array())
-    {
-        $this->class = $class;
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Sets a factory.
-     *
-     * @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
-     *
-     * @return Definition The current instance
-     */
-    public function setFactory($factory)
-    {
-        if (is_string($factory) && strpos($factory, '::') !== false) {
-            $factory = explode('::', $factory, 2);
-        }
-
-        $this->factory = $factory;
-
-        return $this;
-    }
-
-    /**
-     * Gets the factory.
-     *
-     * @return string|array The PHP function or an array containing a class/Reference and a method to call
-     */
-    public function getFactory()
-    {
-        return $this->factory;
-    }
-
-    /**
-     * Sets the name of the class that acts as a factory using the factory method,
-     * which will be invoked statically.
-     *
-     * @param string $factoryClass The factory class name
-     *
-     * @return Definition The current instance
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function setFactoryClass($factoryClass)
-    {
-        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryClass), E_USER_DEPRECATED);
-
-        $this->factoryClass = $factoryClass;
-
-        return $this;
-    }
-
-    /**
-     * Gets the factory class.
-     *
-     * @return string|null The factory class name
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function getFactoryClass($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        return $this->factoryClass;
-    }
-
-    /**
-     * Sets the factory method able to create an instance of this class.
-     *
-     * @param string $factoryMethod The factory method name
-     *
-     * @return Definition The current instance
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function setFactoryMethod($factoryMethod)
-    {
-        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryMethod), E_USER_DEPRECATED);
-
-        $this->factoryMethod = $factoryMethod;
-
-        return $this;
-    }
-
-    /**
-     * Sets the service that this service is decorating.
-     *
-     * @param null|string $id        The decorated service id, use null to remove decoration
-     * @param null|string $renamedId The new decorated service id
-     *
-     * @return Definition The current instance
-     *
-     * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
-     */
-    public function setDecoratedService($id, $renamedId = null)
-    {
-        if ($renamedId && $id == $renamedId) {
-            throw new \InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
-        }
-
-        if (null === $id) {
-            $this->decoratedService = null;
-        } else {
-            $this->decoratedService = array($id, $renamedId);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the service that decorates this service.
-     *
-     * @return null|array An array composed of the decorated service id and the new id for it, null if no service is decorated
-     */
-    public function getDecoratedService()
-    {
-        return $this->decoratedService;
-    }
-
-    /**
-     * Gets the factory method.
-     *
-     * @return string|null The factory method name
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function getFactoryMethod($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        return $this->factoryMethod;
-    }
-
-    /**
-     * Sets the name of the service that acts as a factory using the factory method.
-     *
-     * @param string $factoryService The factory service id
-     *
-     * @return Definition The current instance
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function setFactoryService($factoryService)
-    {
-        @trigger_error(sprintf('%s(%s) is deprecated since version 2.6 and will be removed in 3.0. Use Definition::setFactory() instead.', __METHOD__, $factoryService), E_USER_DEPRECATED);
-
-        $this->factoryService = $factoryService;
-
-        return $this;
-    }
-
-    /**
-     * Gets the factory service id.
-     *
-     * @return string|null The factory service id
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function getFactoryService($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        return $this->factoryService;
-    }
-
-    /**
-     * Sets the service class.
-     *
-     * @param string $class The service class
-     *
-     * @return Definition The current instance
-     */
-    public function setClass($class)
-    {
-        $this->class = $class;
-
-        return $this;
-    }
-
-    /**
-     * Gets the service class.
-     *
-     * @return string|null The service class
-     */
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    /**
-     * Sets the arguments to pass to the service constructor/factory method.
-     *
-     * @param array $arguments An array of arguments
-     *
-     * @return Definition The current instance
-     */
-    public function setArguments(array $arguments)
-    {
-        $this->arguments = $arguments;
-
-        return $this;
-    }
-
-    public function setProperties(array $properties)
-    {
-        $this->properties = $properties;
-
-        return $this;
-    }
-
-    public function getProperties()
-    {
-        return $this->properties;
-    }
-
-    public function setProperty($name, $value)
-    {
-        $this->properties[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Adds an argument to pass to the service constructor/factory method.
-     *
-     * @param mixed $argument An argument
-     *
-     * @return Definition The current instance
-     */
-    public function addArgument($argument)
-    {
-        $this->arguments[] = $argument;
-
-        return $this;
-    }
-
-    /**
-     * Sets a specific argument.
-     *
-     * @param int   $index
-     * @param mixed $argument
-     *
-     * @return Definition The current instance
-     *
-     * @throws OutOfBoundsException When the replaced argument does not exist
-     */
-    public function replaceArgument($index, $argument)
-    {
-        if ($index < 0 || $index > count($this->arguments) - 1) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));
-        }
-
-        $this->arguments[$index] = $argument;
-
-        return $this;
-    }
-
-    /**
-     * Gets the arguments to pass to the service constructor/factory method.
-     *
-     * @return array The array of arguments
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * Gets an argument to pass to the service constructor/factory method.
-     *
-     * @param int $index
-     *
-     * @return mixed The argument value
-     *
-     * @throws OutOfBoundsException When the argument does not exist
-     */
-    public function getArgument($index)
-    {
-        if ($index < 0 || $index > count($this->arguments) - 1) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, count($this->arguments) - 1));
-        }
-
-        return $this->arguments[$index];
-    }
-
-    /**
-     * Sets the methods to call after service initialization.
-     *
-     * @param array $calls An array of method calls
-     *
-     * @return Definition The current instance
-     */
-    public function setMethodCalls(array $calls = array())
-    {
-        $this->calls = array();
-        foreach ($calls as $call) {
-            $this->addMethodCall($call[0], $call[1]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a method to call after service initialization.
-     *
-     * @param string $method    The method name to call
-     * @param array  $arguments An array of arguments to pass to the method call
-     *
-     * @return Definition The current instance
-     *
-     * @throws InvalidArgumentException on empty $method param
-     */
-    public function addMethodCall($method, array $arguments = array())
-    {
-        if (empty($method)) {
-            throw new InvalidArgumentException(sprintf('Method name cannot be empty.'));
-        }
-        $this->calls[] = array($method, $arguments);
-
-        return $this;
-    }
-
-    /**
-     * Removes a method to call after service initialization.
-     *
-     * @param string $method The method name to remove
-     *
-     * @return Definition The current instance
-     */
-    public function removeMethodCall($method)
-    {
-        foreach ($this->calls as $i => $call) {
-            if ($call[0] === $method) {
-                unset($this->calls[$i]);
-                break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Check if the current definition has a given method to call after service initialization.
-     *
-     * @param string $method The method name to search for
-     *
-     * @return bool
-     */
-    public function hasMethodCall($method)
-    {
-        foreach ($this->calls as $call) {
-            if ($call[0] === $method) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the methods to call after service initialization.
-     *
-     * @return array An array of method calls
-     */
-    public function getMethodCalls()
-    {
-        return $this->calls;
-    }
-
-    /**
-     * Sets tags for this definition.
-     *
-     * @param array $tags
-     *
-     * @return Definition the current instance
-     */
-    public function setTags(array $tags)
-    {
-        $this->tags = $tags;
-
-        return $this;
-    }
-
-    /**
-     * Returns all tags.
-     *
-     * @return array An array of tags
-     */
-    public function getTags()
-    {
-        return $this->tags;
-    }
-
-    /**
-     * Gets a tag by name.
-     *
-     * @param string $name The tag name
-     *
-     * @return array An array of attributes
-     */
-    public function getTag($name)
-    {
-        return isset($this->tags[$name]) ? $this->tags[$name] : array();
-    }
-
-    /**
-     * Adds a tag for this definition.
-     *
-     * @param string $name       The tag name
-     * @param array  $attributes An array of attributes
-     *
-     * @return Definition The current instance
-     */
-    public function addTag($name, array $attributes = array())
-    {
-        $this->tags[$name][] = $attributes;
-
-        return $this;
-    }
-
-    /**
-     * Whether this definition has a tag with the given name.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasTag($name)
-    {
-        return isset($this->tags[$name]);
-    }
-
-    /**
-     * Clears all tags for a given name.
-     *
-     * @param string $name The tag name
-     *
-     * @return Definition
-     */
-    public function clearTag($name)
-    {
-        if (isset($this->tags[$name])) {
-            unset($this->tags[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clears the tags for this definition.
-     *
-     * @return Definition The current instance
-     */
-    public function clearTags()
-    {
-        $this->tags = array();
-
-        return $this;
-    }
-
-    /**
-     * Sets a file to require before creating the service.
-     *
-     * @param string $file A full pathname to include
-     *
-     * @return Definition The current instance
-     */
-    public function setFile($file)
-    {
-        $this->file = $file;
-
-        return $this;
-    }
-
-    /**
-     * Gets the file to require before creating the service.
-     *
-     * @return string|null The full pathname to include
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Sets the scope of the service.
-     *
-     * @param string $scope Whether the service must be shared or not
-     *
-     * @return Definition The current instance
-     */
-    public function setScope($scope)
-    {
-        $this->scope = $scope;
-
-        return $this;
-    }
-
-    /**
-     * Returns the scope of the service.
-     *
-     * @return string
-     */
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    /**
-     * Sets the visibility of this service.
-     *
-     * @param bool $boolean
-     *
-     * @return Definition The current instance
-     */
-    public function setPublic($boolean)
-    {
-        $this->public = (bool) $boolean;
-
-        return $this;
-    }
-
-    /**
-     * Whether this service is public facing.
-     *
-     * @return bool
-     */
-    public function isPublic()
-    {
-        return $this->public;
-    }
-
-    /**
-     * Sets the synchronized flag of this service.
-     *
-     * @param bool $boolean
-     *
-     * @return Definition The current instance
-     *
-     * @deprecated since version 2.7, will be removed in 3.0.
-     */
-    public function setSynchronized($boolean, $triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        $this->synchronized = (bool) $boolean;
-
-        return $this;
-    }
-
-    /**
-     * Whether this service is synchronized.
-     *
-     * @return bool
-     *
-     * @deprecated since version 2.7, will be removed in 3.0.
-     */
-    public function isSynchronized($triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        return $this->synchronized;
-    }
-
-    /**
-     * Sets the lazy flag of this service.
-     *
-     * @param bool $lazy
-     *
-     * @return Definition The current instance
-     */
-    public function setLazy($lazy)
-    {
-        $this->lazy = (bool) $lazy;
-
-        return $this;
-    }
-
-    /**
-     * Whether this service is lazy.
-     *
-     * @return bool
-     */
-    public function isLazy()
-    {
-        return $this->lazy;
-    }
-
-    /**
-     * Sets whether this definition is synthetic, that is not constructed by the
-     * container, but dynamically injected.
-     *
-     * @param bool $boolean
-     *
-     * @return Definition the current instance
-     */
-    public function setSynthetic($boolean)
-    {
-        $this->synthetic = (bool) $boolean;
-
-        return $this;
-    }
-
-    /**
-     * Whether this definition is synthetic, that is not constructed by the
-     * container, but dynamically injected.
-     *
-     * @return bool
-     */
-    public function isSynthetic()
-    {
-        return $this->synthetic;
-    }
-
-    /**
-     * Whether this definition is abstract, that means it merely serves as a
-     * template for other definitions.
-     *
-     * @param bool $boolean
-     *
-     * @return Definition the current instance
-     */
-    public function setAbstract($boolean)
-    {
-        $this->abstract = (bool) $boolean;
-
-        return $this;
-    }
-
-    /**
-     * Whether this definition is abstract, that means it merely serves as a
-     * template for other definitions.
-     *
-     * @return bool
-     */
-    public function isAbstract()
-    {
-        return $this->abstract;
-    }
-
-    /**
-     * Sets a configurator to call after the service is fully initialized.
-     *
-     * @param callable $callable A PHP callable
-     *
-     * @return Definition The current instance
-     */
-    public function setConfigurator($callable)
-    {
-        $this->configurator = $callable;
-
-        return $this;
-    }
-
-    /**
-     * Gets the configurator to call after the service is fully initialized.
-     *
-     * @return callable|null The PHP callable to call
-     */
-    public function getConfigurator()
-    {
-        return $this->configurator;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/DefinitionDecorator.php b/vendor/symfony/dependency-injection/DefinitionDecorator.php
deleted file mode 100644
index 334127a..0000000
--- a/vendor/symfony/dependency-injection/DefinitionDecorator.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
-
-/**
- * This definition decorates another definition.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class DefinitionDecorator extends Definition
-{
-    private $parent;
-    private $changes = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $parent The id of Definition instance to decorate.
-     */
-    public function __construct($parent)
-    {
-        parent::__construct();
-
-        $this->parent = $parent;
-    }
-
-    /**
-     * Returns the Definition being decorated.
-     *
-     * @return string
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Returns all changes tracked for the Definition object.
-     *
-     * @return array An array of changes for this Definition
-     */
-    public function getChanges()
-    {
-        return $this->changes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setClass($class)
-    {
-        $this->changes['class'] = true;
-
-        return parent::setClass($class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFactory($callable)
-    {
-        $this->changes['factory'] = true;
-
-        return parent::setFactory($callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     */
-    public function setFactoryClass($class)
-    {
-        $this->changes['factory_class'] = true;
-
-        return parent::setFactoryClass($class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFactoryMethod($method)
-    {
-        $this->changes['factory_method'] = true;
-
-        return parent::setFactoryMethod($method);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFactoryService($service)
-    {
-        $this->changes['factory_service'] = true;
-
-        return parent::setFactoryService($service);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setConfigurator($callable)
-    {
-        $this->changes['configurator'] = true;
-
-        return parent::setConfigurator($callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFile($file)
-    {
-        $this->changes['file'] = true;
-
-        return parent::setFile($file);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPublic($boolean)
-    {
-        $this->changes['public'] = true;
-
-        return parent::setPublic($boolean);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLazy($boolean)
-    {
-        $this->changes['lazy'] = true;
-
-        return parent::setLazy($boolean);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDecoratedService($id, $renamedId = null)
-    {
-        $this->changes['decorated_service'] = true;
-
-        return parent::setDecoratedService($id, $renamedId);
-    }
-
-    /**
-     * Gets an argument to pass to the service constructor/factory method.
-     *
-     * If replaceArgument() has been used to replace an argument, this method
-     * will return the replacement value.
-     *
-     * @param int $index
-     *
-     * @return mixed The argument value
-     *
-     * @throws OutOfBoundsException When the argument does not exist
-     */
-    public function getArgument($index)
-    {
-        if (array_key_exists('index_'.$index, $this->arguments)) {
-            return $this->arguments['index_'.$index];
-        }
-
-        $lastIndex = count(array_filter(array_keys($this->arguments), 'is_int')) - 1;
-
-        if ($index < 0 || $index > $lastIndex) {
-            throw new OutOfBoundsException(sprintf('The index "%d" is not in the range [0, %d].', $index, $lastIndex));
-        }
-
-        return $this->arguments[$index];
-    }
-
-    /**
-     * You should always use this method when overwriting existing arguments
-     * of the parent definition.
-     *
-     * If you directly call setArguments() keep in mind that you must follow
-     * certain conventions when you want to overwrite the arguments of the
-     * parent definition, otherwise your arguments will only be appended.
-     *
-     * @param int   $index
-     * @param mixed $value
-     *
-     * @return DefinitionDecorator the current instance
-     *
-     * @throws InvalidArgumentException when $index isn't an integer
-     */
-    public function replaceArgument($index, $value)
-    {
-        if (!is_int($index)) {
-            throw new InvalidArgumentException('$index must be an integer.');
-        }
-
-        $this->arguments['index_'.$index] = $value;
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/Dumper.php b/vendor/symfony/dependency-injection/Dumper/Dumper.php
deleted file mode 100644
index 4b9d586..0000000
--- a/vendor/symfony/dependency-injection/Dumper/Dumper.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Dumper is the abstract class for all built-in dumpers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Dumper implements DumperInterface
-{
-    protected $container;
-
-    /**
-     * Constructor.
-     *
-     * @param ContainerBuilder $container The service container to dump
-     */
-    public function __construct(ContainerBuilder $container)
-    {
-        $this->container = $container;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/DumperInterface.php b/vendor/symfony/dependency-injection/Dumper/DumperInterface.php
deleted file mode 100644
index dd001e4..0000000
--- a/vendor/symfony/dependency-injection/Dumper/DumperInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-/**
- * DumperInterface is the interface implemented by service container dumper classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface DumperInterface
-{
-    /**
-     * Dumps the service container.
-     *
-     * @param array $options An array of options
-     *
-     * @return string The representation of the service container
-     */
-    public function dump(array $options = array());
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php b/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
deleted file mode 100644
index f69d1e9..0000000
--- a/vendor/symfony/dependency-injection/Dumper/GraphvizDumper.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\DependencyInjection\Scope;
-
-/**
- * GraphvizDumper dumps a service container as a graphviz file.
- *
- * You can convert the generated dot file with the dot utility (http://www.graphviz.org/):
- *
- *   dot -Tpng container.dot > foo.png
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class GraphvizDumper extends Dumper
-{
-    private $nodes;
-    private $edges;
-    private $options = array(
-            'graph' => array('ratio' => 'compress'),
-            'node' => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
-            'edge' => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
-            'node.instance' => array('fillcolor' => '#9999ff', 'style' => 'filled'),
-            'node.definition' => array('fillcolor' => '#eeeeee'),
-            'node.missing' => array('fillcolor' => '#ff9999', 'style' => 'filled'),
-        );
-
-    /**
-     * Dumps the service container as a graphviz graph.
-     *
-     * Available options:
-     *
-     *  * graph: The default options for the whole graph
-     *  * node: The default options for nodes
-     *  * edge: The default options for edges
-     *  * node.instance: The default options for services that are defined directly by object instances
-     *  * node.definition: The default options for services that are defined via service definition instances
-     *  * node.missing: The default options for missing services
-     *
-     * @param array $options An array of options
-     *
-     * @return string The dot representation of the service container
-     */
-    public function dump(array $options = array())
-    {
-        foreach (array('graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing') as $key) {
-            if (isset($options[$key])) {
-                $this->options[$key] = array_merge($this->options[$key], $options[$key]);
-            }
-        }
-
-        $this->nodes = $this->findNodes();
-
-        $this->edges = array();
-        foreach ($this->container->getDefinitions() as $id => $definition) {
-            $this->edges[$id] = array_merge(
-                $this->findEdges($id, $definition->getArguments(), true, ''),
-                $this->findEdges($id, $definition->getProperties(), false, '')
-            );
-
-            foreach ($definition->getMethodCalls() as $call) {
-                $this->edges[$id] = array_merge(
-                    $this->edges[$id],
-                    $this->findEdges($id, $call[1], false, $call[0].'()')
-                );
-            }
-        }
-
-        return $this->startDot().$this->addNodes().$this->addEdges().$this->endDot();
-    }
-
-    /**
-     * Returns all nodes.
-     *
-     * @return string A string representation of all nodes
-     */
-    private function addNodes()
-    {
-        $code = '';
-        foreach ($this->nodes as $id => $node) {
-            $aliases = $this->getAliases($id);
-
-            $code .= sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
-        }
-
-        return $code;
-    }
-
-    /**
-     * Returns all edges.
-     *
-     * @return string A string representation of all edges
-     */
-    private function addEdges()
-    {
-        $code = '';
-        foreach ($this->edges as $id => $edges) {
-            foreach ($edges as $edge) {
-                $code .= sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed');
-            }
-        }
-
-        return $code;
-    }
-
-    /**
-     * Finds all edges belonging to a specific service id.
-     *
-     * @param string $id        The service id used to find edges
-     * @param array  $arguments An array of arguments
-     * @param bool   $required
-     * @param string $name
-     *
-     * @return array An array of edges
-     */
-    private function findEdges($id, $arguments, $required, $name)
-    {
-        $edges = array();
-        foreach ($arguments as $argument) {
-            if ($argument instanceof Parameter) {
-                $argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
-            } elseif (is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match)) {
-                $argument = $this->container->hasParameter($match[1]) ? $this->container->getParameter($match[1]) : null;
-            }
-
-            if ($argument instanceof Reference) {
-                if (!$this->container->has((string) $argument)) {
-                    $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
-                }
-
-                $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
-            } elseif (is_array($argument)) {
-                $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
-            }
-        }
-
-        return $edges;
-    }
-
-    /**
-     * Finds all nodes.
-     *
-     * @return array An array of all nodes
-     */
-    private function findNodes()
-    {
-        $nodes = array();
-
-        $container = $this->cloneContainer();
-
-        foreach ($container->getDefinitions() as $id => $definition) {
-            $class = $definition->getClass();
-
-            if ('\\' === substr($class, 0, 1)) {
-                $class = substr($class, 1);
-            }
-
-            try {
-                $class = $this->container->getParameterBag()->resolveValue($class);
-            } catch (ParameterNotFoundException $e) {
-            }
-
-            $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => array_merge($this->options['node.definition'], array('style' => ContainerInterface::SCOPE_PROTOTYPE !== $definition->getScope() ? 'filled' : 'dotted')));
-            $container->setDefinition($id, new Definition('stdClass'));
-        }
-
-        foreach ($container->getServiceIds() as $id) {
-            $service = $container->get($id);
-
-            if (array_key_exists($id, $container->getAliases())) {
-                continue;
-            }
-
-            if (!$container->hasDefinition($id)) {
-                $class = ('service_container' === $id) ? get_class($this->container) : get_class($service);
-                $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
-            }
-        }
-
-        return $nodes;
-    }
-
-    private function cloneContainer()
-    {
-        $parameterBag = new ParameterBag($this->container->getParameterBag()->all());
-
-        $container = new ContainerBuilder($parameterBag);
-        $container->setDefinitions($this->container->getDefinitions());
-        $container->setAliases($this->container->getAliases());
-        $container->setResources($this->container->getResources());
-        foreach ($this->container->getScopes() as $scope => $parentScope) {
-            $container->addScope(new Scope($scope, $parentScope));
-        }
-        foreach ($this->container->getExtensions() as $extension) {
-            $container->registerExtension($extension);
-        }
-
-        return $container;
-    }
-
-    /**
-     * Returns the start dot.
-     *
-     * @return string The string representation of a start dot
-     */
-    private function startDot()
-    {
-        return sprintf("digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
-            $this->addOptions($this->options['graph']),
-            $this->addOptions($this->options['node']),
-            $this->addOptions($this->options['edge'])
-        );
-    }
-
-    /**
-     * Returns the end dot.
-     *
-     * @return string
-     */
-    private function endDot()
-    {
-        return "}\n";
-    }
-
-    /**
-     * Adds attributes.
-     *
-     * @param array $attributes An array of attributes
-     *
-     * @return string A comma separated list of attributes
-     */
-    private function addAttributes($attributes)
-    {
-        $code = array();
-        foreach ($attributes as $k => $v) {
-            $code[] = sprintf('%s="%s"', $k, $v);
-        }
-
-        return $code ? ', '.implode(', ', $code) : '';
-    }
-
-    /**
-     * Adds options.
-     *
-     * @param array $options An array of options
-     *
-     * @return string A space separated list of options
-     */
-    private function addOptions($options)
-    {
-        $code = array();
-        foreach ($options as $k => $v) {
-            $code[] = sprintf('%s="%s"', $k, $v);
-        }
-
-        return implode(' ', $code);
-    }
-
-    /**
-     * Dotizes an identifier.
-     *
-     * @param string $id The identifier to dotize
-     *
-     * @return string A dotized string
-     */
-    private function dotize($id)
-    {
-        return strtolower(preg_replace('/\W/i', '_', $id));
-    }
-
-    /**
-     * Compiles an array of aliases for a specified service id.
-     *
-     * @param string $id A service id
-     *
-     * @return array An array of aliases
-     */
-    private function getAliases($id)
-    {
-        $aliases = array();
-        foreach ($this->container->getAliases() as $alias => $origin) {
-            if ($id == $origin) {
-                $aliases[] = $alias;
-            }
-        }
-
-        return $aliases;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php b/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
deleted file mode 100644
index bb3df8b..0000000
--- a/vendor/symfony/dependency-injection/Dumper/PhpDumper.php
+++ /dev/null
@@ -1,1560 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-use Symfony\Component\DependencyInjection\Variable;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
-use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface as ProxyDumper;
-use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\NullDumper;
-use Symfony\Component\DependencyInjection\ExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\Expression;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * PhpDumper dumps a service container as a PHP class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class PhpDumper extends Dumper
-{
-    /**
-     * Characters that might appear in the generated variable name as first character.
-     *
-     * @var string
-     */
-    const FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz';
-
-    /**
-     * Characters that might appear in the generated variable name as any but the first character.
-     *
-     * @var string
-     */
-    const NON_FIRST_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_';
-
-    private $inlinedDefinitions;
-    private $definitionVariables;
-    private $referenceVariables;
-    private $variableCount;
-    private $reservedVariables = array('instance', 'class');
-    private $expressionLanguage;
-    private $targetDirRegex;
-    private $targetDirMaxMatches;
-
-    /**
-     * @var ExpressionFunctionProviderInterface[]
-     */
-    private $expressionLanguageProviders = array();
-
-    /**
-     * @var \Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface
-     */
-    private $proxyDumper;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ContainerBuilder $container)
-    {
-        parent::__construct($container);
-
-        $this->inlinedDefinitions = new \SplObjectStorage();
-    }
-
-    /**
-     * Sets the dumper to be used when dumping proxies in the generated container.
-     *
-     * @param ProxyDumper $proxyDumper
-     */
-    public function setProxyDumper(ProxyDumper $proxyDumper)
-    {
-        $this->proxyDumper = $proxyDumper;
-    }
-
-    /**
-     * Dumps the service container as a PHP class.
-     *
-     * Available options:
-     *
-     *  * class:      The class name
-     *  * base_class: The base class name
-     *  * namespace:  The class namespace
-     *
-     * @param array $options An array of options
-     *
-     * @return string A PHP class representing of the service container
-     */
-    public function dump(array $options = array())
-    {
-        $this->targetDirRegex = null;
-        $options = array_merge(array(
-            'class' => 'ProjectServiceContainer',
-            'base_class' => 'Container',
-            'namespace' => '',
-        ), $options);
-
-        if (!empty($options['file']) && is_dir($dir = dirname($options['file']))) {
-            // Build a regexp where the first root dirs are mandatory,
-            // but every other sub-dir is optional up to the full path in $dir
-            // Mandate at least 2 root dirs and not more that 5 optional dirs.
-
-            $dir = explode(DIRECTORY_SEPARATOR, realpath($dir));
-            $i = count($dir);
-
-            if (3 <= $i) {
-                $regex = '';
-                $lastOptionalDir = $i > 8 ? $i - 5 : 3;
-                $this->targetDirMaxMatches = $i - $lastOptionalDir;
-
-                while (--$i >= $lastOptionalDir) {
-                    $regex = sprintf('(%s%s)?', preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#'), $regex);
-                }
-
-                do {
-                    $regex = preg_quote(DIRECTORY_SEPARATOR.$dir[$i], '#').$regex;
-                } while (0 < --$i);
-
-                $this->targetDirRegex = '#'.preg_quote($dir[0], '#').$regex.'#';
-            }
-        }
-
-        $code = $this->startClass($options['class'], $options['base_class'], $options['namespace']);
-
-        if ($this->container->isFrozen()) {
-            $code .= $this->addFrozenConstructor();
-            $code .= $this->addFrozenCompile();
-        } else {
-            $code .= $this->addConstructor();
-        }
-
-        $code .=
-            $this->addServices().
-            $this->addDefaultParametersMethod().
-            $this->endClass().
-            $this->addProxyClasses()
-        ;
-        $this->targetDirRegex = null;
-
-        return $code;
-    }
-
-    /**
-     * Retrieves the currently set proxy dumper or instantiates one.
-     *
-     * @return ProxyDumper
-     */
-    private function getProxyDumper()
-    {
-        if (!$this->proxyDumper) {
-            $this->proxyDumper = new NullDumper();
-        }
-
-        return $this->proxyDumper;
-    }
-
-    /**
-     * Generates Service local temp variables.
-     *
-     * @param string $cId
-     * @param string $definition
-     *
-     * @return string
-     */
-    private function addServiceLocalTempVariables($cId, $definition)
-    {
-        static $template = "        \$%s = %s;\n";
-
-        $localDefinitions = array_merge(
-            array($definition),
-            $this->getInlinedDefinitions($definition)
-        );
-
-        $calls = $behavior = array();
-        foreach ($localDefinitions as $iDefinition) {
-            $this->getServiceCallsFromArguments($iDefinition->getArguments(), $calls, $behavior);
-            $this->getServiceCallsFromArguments($iDefinition->getMethodCalls(), $calls, $behavior);
-            $this->getServiceCallsFromArguments($iDefinition->getProperties(), $calls, $behavior);
-            $this->getServiceCallsFromArguments(array($iDefinition->getConfigurator()), $calls, $behavior);
-            $this->getServiceCallsFromArguments(array($iDefinition->getFactory()), $calls, $behavior);
-        }
-
-        $code = '';
-        foreach ($calls as $id => $callCount) {
-            if ('service_container' === $id || $id === $cId) {
-                continue;
-            }
-
-            if ($callCount > 1) {
-                $name = $this->getNextVariableName();
-                $this->referenceVariables[$id] = new Variable($name);
-
-                if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $behavior[$id]) {
-                    $code .= sprintf($template, $name, $this->getServiceCall($id));
-                } else {
-                    $code .= sprintf($template, $name, $this->getServiceCall($id, new Reference($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)));
-                }
-            }
-        }
-
-        if ('' !== $code) {
-            $code .= "\n";
-        }
-
-        return $code;
-    }
-
-    /**
-     * Generates code for the proxies to be attached after the container class.
-     *
-     * @return string
-     */
-    private function addProxyClasses()
-    {
-        /* @var $definitions Definition[] */
-        $definitions = array_filter(
-            $this->container->getDefinitions(),
-            array($this->getProxyDumper(), 'isProxyCandidate')
-        );
-        $code = '';
-
-        foreach ($definitions as $definition) {
-            $code .= "\n".$this->getProxyDumper()->getProxyCode($definition);
-        }
-
-        return $code;
-    }
-
-    /**
-     * Generates the require_once statement for service includes.
-     *
-     * @param string     $id         The service id
-     * @param Definition $definition
-     *
-     * @return string
-     */
-    private function addServiceInclude($id, $definition)
-    {
-        $template = "        require_once %s;\n";
-        $code = '';
-
-        if (null !== $file = $definition->getFile()) {
-            $code .= sprintf($template, $this->dumpValue($file));
-        }
-
-        foreach ($this->getInlinedDefinitions($definition) as $definition) {
-            if (null !== $file = $definition->getFile()) {
-                $code .= sprintf($template, $this->dumpValue($file));
-            }
-        }
-
-        if ('' !== $code) {
-            $code .= "\n";
-        }
-
-        return $code;
-    }
-
-    /**
-     * Generates the inline definition of a service.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return string
-     *
-     * @throws RuntimeException                  When the factory definition is incomplete
-     * @throws ServiceCircularReferenceException When a circular reference is detected
-     */
-    private function addServiceInlinedDefinitions($id, $definition)
-    {
-        $code = '';
-        $variableMap = $this->definitionVariables;
-        $nbOccurrences = new \SplObjectStorage();
-        $processed = new \SplObjectStorage();
-        $inlinedDefinitions = $this->getInlinedDefinitions($definition);
-
-        foreach ($inlinedDefinitions as $definition) {
-            if (false === $nbOccurrences->contains($definition)) {
-                $nbOccurrences->offsetSet($definition, 1);
-            } else {
-                $i = $nbOccurrences->offsetGet($definition);
-                $nbOccurrences->offsetSet($definition, $i + 1);
-            }
-        }
-
-        foreach ($inlinedDefinitions as $sDefinition) {
-            if ($processed->contains($sDefinition)) {
-                continue;
-            }
-            $processed->offsetSet($sDefinition);
-
-            $class = $this->dumpValue($sDefinition->getClass());
-            if ($nbOccurrences->offsetGet($sDefinition) > 1 || $sDefinition->getMethodCalls() || $sDefinition->getProperties() || null !== $sDefinition->getConfigurator() || false !== strpos($class, '$')) {
-                $name = $this->getNextVariableName();
-                $variableMap->offsetSet($sDefinition, new Variable($name));
-
-                // a construct like:
-                // $a = new ServiceA(ServiceB $b); $b = new ServiceB(ServiceA $a);
-                // this is an indication for a wrong implementation, you can circumvent this problem
-                // by setting up your service structure like this:
-                // $b = new ServiceB();
-                // $a = new ServiceA(ServiceB $b);
-                // $b->setServiceA(ServiceA $a);
-                if ($this->hasReference($id, $sDefinition->getArguments())) {
-                    throw new ServiceCircularReferenceException($id, array($id));
-                }
-
-                $code .= $this->addNewInstance($id, $sDefinition, '$'.$name, ' = ');
-
-                if (!$this->hasReference($id, $sDefinition->getMethodCalls(), true) && !$this->hasReference($id, $sDefinition->getProperties(), true)) {
-                    $code .= $this->addServiceMethodCalls(null, $sDefinition, $name);
-                    $code .= $this->addServiceProperties(null, $sDefinition, $name);
-                    $code .= $this->addServiceConfigurator(null, $sDefinition, $name);
-                }
-
-                $code .= "\n";
-            }
-        }
-
-        return $code;
-    }
-
-    /**
-     * Adds the service return statement.
-     *
-     * @param string     $id         Service id
-     * @param Definition $definition
-     *
-     * @return string
-     */
-    private function addServiceReturn($id, $definition)
-    {
-        if ($this->isSimpleInstance($id, $definition)) {
-            return "    }\n";
-        }
-
-        return "\n        return \$instance;\n    }\n";
-    }
-
-    /**
-     * Generates the service instance.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return string
-     *
-     * @throws InvalidArgumentException
-     * @throws RuntimeException
-     */
-    private function addServiceInstance($id, $definition)
-    {
-        $class = $definition->getClass();
-
-        if ('\\' === substr($class, 0, 1)) {
-            $class = substr($class, 1);
-        }
-
-        $class = $this->dumpValue($class);
-
-        if (0 === strpos($class, "'") && !preg_match('/^\'[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\\\{2}[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)*\'$/', $class)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
-        }
-
-        $simple = $this->isSimpleInstance($id, $definition);
-        $isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition);
-        $instantiation = '';
-
-        if (!$isProxyCandidate && ContainerInterface::SCOPE_CONTAINER === $definition->getScope()) {
-            $instantiation = "\$this->services['$id'] = ".($simple ? '' : '$instance');
-        } elseif (!$isProxyCandidate && ContainerInterface::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
-            $instantiation = "\$this->services['$id'] = \$this->scopedServices['$scope']['$id'] = ".($simple ? '' : '$instance');
-        } elseif (!$simple) {
-            $instantiation = '$instance';
-        }
-
-        $return = '';
-        if ($simple) {
-            $return = 'return ';
-        } else {
-            $instantiation .= ' = ';
-        }
-
-        $code = $this->addNewInstance($id, $definition, $return, $instantiation);
-
-        if (!$simple) {
-            $code .= "\n";
-        }
-
-        return $code;
-    }
-
-    /**
-     * Checks if the definition is a simple instance.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return bool
-     */
-    private function isSimpleInstance($id, $definition)
-    {
-        foreach (array_merge(array($definition), $this->getInlinedDefinitions($definition)) as $sDefinition) {
-            if ($definition !== $sDefinition && !$this->hasReference($id, $sDefinition->getMethodCalls())) {
-                continue;
-            }
-
-            if ($sDefinition->getMethodCalls() || $sDefinition->getProperties() || $sDefinition->getConfigurator()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds method calls to a service definition.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     * @param string     $variableName
-     *
-     * @return string
-     */
-    private function addServiceMethodCalls($id, $definition, $variableName = 'instance')
-    {
-        $calls = '';
-        foreach ($definition->getMethodCalls() as $call) {
-            $arguments = array();
-            foreach ($call[1] as $value) {
-                $arguments[] = $this->dumpValue($value);
-            }
-
-            $calls .= $this->wrapServiceConditionals($call[1], sprintf("        \$%s->%s(%s);\n", $variableName, $call[0], implode(', ', $arguments)));
-        }
-
-        return $calls;
-    }
-
-    private function addServiceProperties($id, $definition, $variableName = 'instance')
-    {
-        $code = '';
-        foreach ($definition->getProperties() as $name => $value) {
-            $code .= sprintf("        \$%s->%s = %s;\n", $variableName, $name, $this->dumpValue($value));
-        }
-
-        return $code;
-    }
-
-    /**
-     * Generates the inline definition setup.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return string
-     *
-     * @throws ServiceCircularReferenceException when the container contains a circular reference
-     */
-    private function addServiceInlinedDefinitionsSetup($id, $definition)
-    {
-        $this->referenceVariables[$id] = new Variable('instance');
-
-        $code = '';
-        $processed = new \SplObjectStorage();
-        foreach ($this->getInlinedDefinitions($definition) as $iDefinition) {
-            if ($processed->contains($iDefinition)) {
-                continue;
-            }
-            $processed->offsetSet($iDefinition);
-
-            if (!$this->hasReference($id, $iDefinition->getMethodCalls(), true) && !$this->hasReference($id, $iDefinition->getProperties(), true)) {
-                continue;
-            }
-
-            // if the instance is simple, the return statement has already been generated
-            // so, the only possible way to get there is because of a circular reference
-            if ($this->isSimpleInstance($id, $definition)) {
-                throw new ServiceCircularReferenceException($id, array($id));
-            }
-
-            $name = (string) $this->definitionVariables->offsetGet($iDefinition);
-            $code .= $this->addServiceMethodCalls(null, $iDefinition, $name);
-            $code .= $this->addServiceProperties(null, $iDefinition, $name);
-            $code .= $this->addServiceConfigurator(null, $iDefinition, $name);
-        }
-
-        if ('' !== $code) {
-            $code .= "\n";
-        }
-
-        return $code;
-    }
-
-    /**
-     * Adds configurator definition.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     * @param string     $variableName
-     *
-     * @return string
-     */
-    private function addServiceConfigurator($id, $definition, $variableName = 'instance')
-    {
-        if (!$callable = $definition->getConfigurator()) {
-            return '';
-        }
-
-        if (is_array($callable)) {
-            if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))) {
-                return sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
-            }
-
-            $class = $this->dumpValue($callable[0]);
-            // If the class is a string we can optimize call_user_func away
-            if (strpos($class, "'") === 0) {
-                return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
-            }
-
-            return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
-        }
-
-        return sprintf("        %s(\$%s);\n", $callable, $variableName);
-    }
-
-    /**
-     * Adds a service.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return string
-     */
-    private function addService($id, $definition)
-    {
-        $this->definitionVariables = new \SplObjectStorage();
-        $this->referenceVariables = array();
-        $this->variableCount = 0;
-
-        $return = array();
-
-        if ($definition->isSynthetic()) {
-            $return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
-        } elseif ($class = $definition->getClass()) {
-            $return[] = sprintf('@return %s A %s instance.', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
-        } elseif ($definition->getFactory()) {
-            $factory = $definition->getFactory();
-            if (is_string($factory)) {
-                $return[] = sprintf('@return object An instance returned by %s().', $factory);
-            } elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
-                if (is_string($factory[0]) || $factory[0] instanceof Reference) {
-                    $return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
-                } elseif ($factory[0] instanceof Definition) {
-                    $return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
-                }
-            }
-        } elseif ($definition->getFactoryClass(false)) {
-            $return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryClass(false), $definition->getFactoryMethod(false));
-        } elseif ($definition->getFactoryService(false)) {
-            $return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryService(false), $definition->getFactoryMethod(false));
-        }
-
-        $scope = $definition->getScope();
-        if (!in_array($scope, array(ContainerInterface::SCOPE_CONTAINER, ContainerInterface::SCOPE_PROTOTYPE))) {
-            if ($return && 0 === strpos($return[count($return) - 1], '@return')) {
-                $return[] = '';
-            }
-            $return[] = sprintf("@throws InactiveScopeException when the '%s' service is requested while the '%s' scope is not active", $id, $scope);
-        }
-
-        $return = implode("\n     * ", $return);
-
-        $doc = '';
-        if (ContainerInterface::SCOPE_PROTOTYPE !== $scope) {
-            $doc .= <<<EOF
-
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-EOF;
-        }
-
-        if (!$definition->isPublic()) {
-            $doc .= <<<EOF
-
-     *
-     * This service is private.
-     * If you want to be able to request this service from the container directly,
-     * make it public, otherwise you might end up with broken code.
-EOF;
-        }
-
-        if ($definition->isLazy()) {
-            $lazyInitialization = '$lazyLoad = true';
-            $lazyInitializationDoc = "\n     * @param bool    \$lazyLoad whether to try lazy-loading the service with a proxy\n     *";
-        } else {
-            $lazyInitialization = '';
-            $lazyInitializationDoc = '';
-        }
-
-        // with proxies, for 5.3.3 compatibility, the getter must be public to be accessible to the initializer
-        $isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition);
-        $visibility = $isProxyCandidate ? 'public' : 'protected';
-        $code = <<<EOF
-
-    /**
-     * Gets the '$id' service.$doc
-     *$lazyInitializationDoc
-     * $return
-     */
-    {$visibility} function get{$this->camelize($id)}Service($lazyInitialization)
-    {
-
-EOF;
-
-        $code .= $isProxyCandidate ? $this->getProxyDumper()->getProxyFactoryCode($definition, $id) : '';
-
-        if (!in_array($scope, array(ContainerInterface::SCOPE_CONTAINER, ContainerInterface::SCOPE_PROTOTYPE))) {
-            $code .= <<<EOF
-        if (!isset(\$this->scopedServices['$scope'])) {
-            throw new InactiveScopeException('$id', '$scope');
-        }
-
-
-EOF;
-        }
-
-        if ($definition->isSynthetic()) {
-            $code .= sprintf("        throw new RuntimeException('You have requested a synthetic service (\"%s\"). The DIC does not know how to construct this service.');\n    }\n", $id);
-        } else {
-            $code .=
-                $this->addServiceInclude($id, $definition).
-                $this->addServiceLocalTempVariables($id, $definition).
-                $this->addServiceInlinedDefinitions($id, $definition).
-                $this->addServiceInstance($id, $definition).
-                $this->addServiceInlinedDefinitionsSetup($id, $definition).
-                $this->addServiceMethodCalls($id, $definition).
-                $this->addServiceProperties($id, $definition).
-                $this->addServiceConfigurator($id, $definition).
-                $this->addServiceReturn($id, $definition)
-            ;
-        }
-
-        $this->definitionVariables = null;
-        $this->referenceVariables = null;
-
-        return $code;
-    }
-
-    /**
-     * Adds multiple services.
-     *
-     * @return string
-     */
-    private function addServices()
-    {
-        $publicServices = $privateServices = $synchronizers = '';
-        $definitions = $this->container->getDefinitions();
-        ksort($definitions);
-        foreach ($definitions as $id => $definition) {
-            if ($definition->isPublic()) {
-                $publicServices .= $this->addService($id, $definition);
-            } else {
-                $privateServices .= $this->addService($id, $definition);
-            }
-
-            $synchronizers .= $this->addServiceSynchronizer($id, $definition);
-        }
-
-        return $publicServices.$synchronizers.$privateServices;
-    }
-
-    /**
-     * Adds synchronizer methods.
-     *
-     * @param string     $id         A service identifier
-     * @param Definition $definition A Definition instance
-     *
-     * @return string|null
-     *
-     * @deprecated since version 2.7, will be removed in 3.0.
-     */
-    private function addServiceSynchronizer($id, Definition $definition)
-    {
-        if (!$definition->isSynchronized(false)) {
-            return;
-        }
-
-        if ('request' !== $id) {
-            @trigger_error('Synchronized services were deprecated in version 2.7 and won\'t work anymore in 3.0.', E_USER_DEPRECATED);
-        }
-
-        $code = '';
-        foreach ($this->container->getDefinitions() as $definitionId => $definition) {
-            foreach ($definition->getMethodCalls() as $call) {
-                foreach ($call[1] as $argument) {
-                    if ($argument instanceof Reference && $id == (string) $argument) {
-                        $arguments = array();
-                        foreach ($call[1] as $value) {
-                            $arguments[] = $this->dumpValue($value);
-                        }
-
-                        $call = $this->wrapServiceConditionals($call[1], sprintf("\$this->get('%s')->%s(%s);", $definitionId, $call[0], implode(', ', $arguments)));
-
-                        $code .= <<<EOF
-        if (\$this->initialized('$definitionId')) {
-            $call
-        }
-
-EOF;
-                    }
-                }
-            }
-        }
-
-        if (!$code) {
-            return;
-        }
-
-        return <<<EOF
-
-    /**
-     * Updates the '$id' service.
-     */
-    protected function synchronize{$this->camelize($id)}Service()
-    {
-$code    }
-
-EOF;
-    }
-
-    private function addNewInstance($id, Definition $definition, $return, $instantiation)
-    {
-        $class = $this->dumpValue($definition->getClass());
-
-        $arguments = array();
-        foreach ($definition->getArguments() as $value) {
-            $arguments[] = $this->dumpValue($value);
-        }
-
-        if (null !== $definition->getFactory()) {
-            $callable = $definition->getFactory();
-            if (is_array($callable)) {
-                if ($callable[0] instanceof Reference
-                    || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))) {
-                    return sprintf("        $return{$instantiation}%s->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
-                }
-
-                $class = $this->dumpValue($callable[0]);
-                // If the class is a string we can optimize call_user_func away
-                if (strpos($class, "'") === 0) {
-                    return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '');
-                }
-
-                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
-            }
-
-            return sprintf("        $return{$instantiation}\\%s(%s);\n", $callable, $arguments ? implode(', ', $arguments) : '');
-        } elseif (null !== $definition->getFactoryMethod(false)) {
-            if (null !== $definition->getFactoryClass(false)) {
-                $class = $this->dumpValue($definition->getFactoryClass(false));
-
-                // If the class is a string we can optimize call_user_func away
-                if (strpos($class, "'") === 0) {
-                    return sprintf("        $return{$instantiation}%s::%s(%s);\n", $this->dumpLiteralClass($class), $definition->getFactoryMethod(false), $arguments ? implode(', ', $arguments) : '');
-                }
-
-                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($definition->getFactoryClass(false)), $definition->getFactoryMethod(false), $arguments ? ', '.implode(', ', $arguments) : '');
-            }
-
-            if (null !== $definition->getFactoryService(false)) {
-                return sprintf("        $return{$instantiation}%s->%s(%s);\n", $this->getServiceCall($definition->getFactoryService(false)), $definition->getFactoryMethod(false), implode(', ', $arguments));
-            }
-
-            throw new RuntimeException(sprintf('Factory method requires a factory service or factory class in service definition for %s', $id));
-        }
-
-        if (false !== strpos($class, '$')) {
-            return sprintf("        \$class = %s;\n\n        $return{$instantiation}new \$class(%s);\n", $class, implode(', ', $arguments));
-        }
-
-        return sprintf("        $return{$instantiation}new %s(%s);\n", $this->dumpLiteralClass($class), implode(', ', $arguments));
-    }
-
-    /**
-     * Adds the class headers.
-     *
-     * @param string $class     Class name
-     * @param string $baseClass The name of the base class
-     * @param string $namespace The class namespace
-     *
-     * @return string
-     */
-    private function startClass($class, $baseClass, $namespace)
-    {
-        $bagClass = $this->container->isFrozen() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';
-        $namespaceLine = $namespace ? "namespace $namespace;\n" : '';
-
-        return <<<EOF
-<?php
-$namespaceLine
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-$bagClass
-
-/**
- * $class.
- *
- * This class has been auto-generated
- * by the Symfony Dependency Injection Component.
- */
-class $class extends $baseClass
-{
-    private \$parameters;
-    private \$targetDirs = array();
-
-EOF;
-    }
-
-    /**
-     * Adds the constructor.
-     *
-     * @return string
-     */
-    private function addConstructor()
-    {
-        $targetDirs = $this->exportTargetDirs();
-        $arguments = $this->container->getParameterBag()->all() ? 'new ParameterBag($this->getDefaultParameters())' : null;
-
-        $code = <<<EOF
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {{$targetDirs}
-        parent::__construct($arguments);
-
-EOF;
-
-        if (count($scopes = $this->container->getScopes()) > 0) {
-            $code .= "\n";
-            $code .= '        $this->scopes = '.$this->dumpValue($scopes).";\n";
-            $code .= '        $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n";
-        }
-
-        $code .= $this->addMethodMap();
-        $code .= $this->addAliases();
-
-        $code .= <<<EOF
-    }
-
-EOF;
-
-        return $code;
-    }
-
-    /**
-     * Adds the constructor for a frozen container.
-     *
-     * @return string
-     */
-    private function addFrozenConstructor()
-    {
-        $targetDirs = $this->exportTargetDirs();
-
-        $code = <<<EOF
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {{$targetDirs}
-EOF;
-
-        if ($this->container->getParameterBag()->all()) {
-            $code .= "\n        \$this->parameters = \$this->getDefaultParameters();\n";
-        }
-
-        $code .= <<<EOF
-
-        \$this->services =
-        \$this->scopedServices =
-        \$this->scopeStacks = array();
-EOF;
-
-        $code .= "\n";
-        if (count($scopes = $this->container->getScopes()) > 0) {
-            $code .= '        $this->scopes = '.$this->dumpValue($scopes).";\n";
-            $code .= '        $this->scopeChildren = '.$this->dumpValue($this->container->getScopeChildren()).";\n";
-        } else {
-            $code .= "        \$this->scopes = array();\n";
-            $code .= "        \$this->scopeChildren = array();\n";
-        }
-
-        $code .= $this->addMethodMap();
-        $code .= $this->addAliases();
-
-        $code .= <<<EOF
-    }
-
-EOF;
-
-        return $code;
-    }
-
-    /**
-     * Adds the constructor for a frozen container.
-     *
-     * @return string
-     */
-    private function addFrozenCompile()
-    {
-        return <<<EOF
-
-    /**
-     * {@inheritdoc}
-     */
-    public function compile()
-    {
-        throw new LogicException('You cannot compile a dumped frozen container.');
-    }
-
-EOF;
-    }
-
-    /**
-     * Adds the methodMap property definition.
-     *
-     * @return string
-     */
-    private function addMethodMap()
-    {
-        if (!$definitions = $this->container->getDefinitions()) {
-            return '';
-        }
-
-        $code = "        \$this->methodMap = array(\n";
-        ksort($definitions);
-        foreach ($definitions as $id => $definition) {
-            $code .= '            '.var_export($id, true).' => '.var_export('get'.$this->camelize($id).'Service', true).",\n";
-        }
-
-        return $code."        );\n";
-    }
-
-    /**
-     * Adds the aliases property definition.
-     *
-     * @return string
-     */
-    private function addAliases()
-    {
-        if (!$aliases = $this->container->getAliases()) {
-            if ($this->container->isFrozen()) {
-                return "\n        \$this->aliases = array();\n";
-            } else {
-                return '';
-            }
-        }
-
-        $code = "        \$this->aliases = array(\n";
-        ksort($aliases);
-        foreach ($aliases as $alias => $id) {
-            $id = (string) $id;
-            while (isset($aliases[$id])) {
-                $id = (string) $aliases[$id];
-            }
-            $code .= '            '.var_export($alias, true).' => '.var_export($id, true).",\n";
-        }
-
-        return $code."        );\n";
-    }
-
-    /**
-     * Adds default parameters method.
-     *
-     * @return string
-     */
-    private function addDefaultParametersMethod()
-    {
-        if (!$this->container->getParameterBag()->all()) {
-            return '';
-        }
-
-        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
-
-        $code = '';
-        if ($this->container->isFrozen()) {
-            $code .= <<<EOF
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParameter(\$name)
-    {
-        \$name = strtolower(\$name);
-
-        if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
-            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
-        }
-
-        return \$this->parameters[\$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasParameter(\$name)
-    {
-        \$name = strtolower(\$name);
-
-        return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameter(\$name, \$value)
-    {
-        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParameterBag()
-    {
-        if (null === \$this->parameterBag) {
-            \$this->parameterBag = new FrozenParameterBag(\$this->parameters);
-        }
-
-        return \$this->parameterBag;
-    }
-
-EOF;
-        }
-
-        $code .= <<<EOF
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return $parameters;
-    }
-
-EOF;
-
-        return $code;
-    }
-
-    /**
-     * Exports parameters.
-     *
-     * @param array  $parameters
-     * @param string $path
-     * @param int    $indent
-     *
-     * @return string
-     *
-     * @throws InvalidArgumentException
-     */
-    private function exportParameters($parameters, $path = '', $indent = 12)
-    {
-        $php = array();
-        foreach ($parameters as $key => $value) {
-            if (is_array($value)) {
-                $value = $this->exportParameters($value, $path.'/'.$key, $indent + 4);
-            } elseif ($value instanceof Variable) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain variable references. Variable "%s" found in "%s".', $value, $path.'/'.$key));
-            } elseif ($value instanceof Definition) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain service definitions. Definition for "%s" found in "%s".', $value->getClass(), $path.'/'.$key));
-            } elseif ($value instanceof Reference) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain references to other services (reference to service "%s" found in "%s").', $value, $path.'/'.$key));
-            } elseif ($value instanceof Expression) {
-                throw new InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain expressions. Expression "%s" found in "%s".', $value, $path.'/'.$key));
-            } else {
-                $value = $this->export($value);
-            }
-
-            $php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), var_export($key, true), $value);
-        }
-
-        return sprintf("array(\n%s\n%s)", implode("\n", $php), str_repeat(' ', $indent - 4));
-    }
-
-    /**
-     * Ends the class definition.
-     *
-     * @return string
-     */
-    private function endClass()
-    {
-        return <<<EOF
-}
-
-EOF;
-    }
-
-    /**
-     * Wraps the service conditionals.
-     *
-     * @param string $value
-     * @param string $code
-     *
-     * @return string
-     */
-    private function wrapServiceConditionals($value, $code)
-    {
-        if (!$services = ContainerBuilder::getServiceConditionals($value)) {
-            return $code;
-        }
-
-        $conditions = array();
-        foreach ($services as $service) {
-            $conditions[] = sprintf("\$this->has('%s')", $service);
-        }
-
-        // re-indent the wrapped code
-        $code = implode("\n", array_map(function ($line) { return $line ? '    '.$line : $line; }, explode("\n", $code)));
-
-        return sprintf("        if (%s) {\n%s        }\n", implode(' && ', $conditions), $code);
-    }
-
-    /**
-     * Builds service calls from arguments.
-     *
-     * @param array $arguments
-     * @param array &$calls    By reference
-     * @param array &$behavior By reference
-     */
-    private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior)
-    {
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $this->getServiceCallsFromArguments($argument, $calls, $behavior);
-            } elseif ($argument instanceof Reference) {
-                $id = (string) $argument;
-
-                if (!isset($calls[$id])) {
-                    $calls[$id] = 0;
-                }
-                if (!isset($behavior[$id])) {
-                    $behavior[$id] = $argument->getInvalidBehavior();
-                } elseif (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $behavior[$id]) {
-                    $behavior[$id] = $argument->getInvalidBehavior();
-                }
-
-                ++$calls[$id];
-            }
-        }
-    }
-
-    /**
-     * Returns the inline definition.
-     *
-     * @param Definition $definition
-     *
-     * @return array
-     */
-    private function getInlinedDefinitions(Definition $definition)
-    {
-        if (false === $this->inlinedDefinitions->contains($definition)) {
-            $definitions = array_merge(
-                $this->getDefinitionsFromArguments($definition->getArguments()),
-                $this->getDefinitionsFromArguments($definition->getMethodCalls()),
-                $this->getDefinitionsFromArguments($definition->getProperties()),
-                $this->getDefinitionsFromArguments(array($definition->getConfigurator())),
-                $this->getDefinitionsFromArguments(array($definition->getFactory()))
-            );
-
-            $this->inlinedDefinitions->offsetSet($definition, $definitions);
-
-            return $definitions;
-        }
-
-        return $this->inlinedDefinitions->offsetGet($definition);
-    }
-
-    /**
-     * Gets the definition from arguments.
-     *
-     * @param array $arguments
-     *
-     * @return array
-     */
-    private function getDefinitionsFromArguments(array $arguments)
-    {
-        $definitions = array();
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                $definitions = array_merge($definitions, $this->getDefinitionsFromArguments($argument));
-            } elseif ($argument instanceof Definition) {
-                $definitions = array_merge(
-                    $definitions,
-                    $this->getInlinedDefinitions($argument),
-                    array($argument)
-                );
-            }
-        }
-
-        return $definitions;
-    }
-
-    /**
-     * Checks if a service id has a reference.
-     *
-     * @param string $id
-     * @param array  $arguments
-     * @param bool   $deep
-     * @param array  $visited
-     *
-     * @return bool
-     */
-    private function hasReference($id, array $arguments, $deep = false, array &$visited = array())
-    {
-        foreach ($arguments as $argument) {
-            if (is_array($argument)) {
-                if ($this->hasReference($id, $argument, $deep, $visited)) {
-                    return true;
-                }
-            } elseif ($argument instanceof Reference) {
-                $argumentId = (string) $argument;
-                if ($id === $argumentId) {
-                    return true;
-                }
-
-                if ($deep && !isset($visited[$argumentId])) {
-                    $visited[$argumentId] = true;
-
-                    $service = $this->container->getDefinition($argumentId);
-                    $arguments = array_merge($service->getMethodCalls(), $service->getArguments(), $service->getProperties());
-
-                    if ($this->hasReference($id, $arguments, $deep, $visited)) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Dumps values.
-     *
-     * @param mixed $value
-     * @param bool  $interpolate
-     *
-     * @return string
-     *
-     * @throws RuntimeException
-     */
-    private function dumpValue($value, $interpolate = true)
-    {
-        if (is_array($value)) {
-            $code = array();
-            foreach ($value as $k => $v) {
-                $code[] = sprintf('%s => %s', $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate));
-            }
-
-            return sprintf('array(%s)', implode(', ', $code));
-        } elseif ($value instanceof Definition) {
-            if (null !== $this->definitionVariables && $this->definitionVariables->contains($value)) {
-                return $this->dumpValue($this->definitionVariables->offsetGet($value), $interpolate);
-            }
-            if (count($value->getMethodCalls()) > 0) {
-                throw new RuntimeException('Cannot dump definitions which have method calls.');
-            }
-            if (null !== $value->getConfigurator()) {
-                throw new RuntimeException('Cannot dump definitions which have a configurator.');
-            }
-
-            $arguments = array();
-            foreach ($value->getArguments() as $argument) {
-                $arguments[] = $this->dumpValue($argument);
-            }
-
-            if (null !== $value->getFactory()) {
-                $factory = $value->getFactory();
-
-                if (is_string($factory)) {
-                    return sprintf('\\%s(%s)', $factory, implode(', ', $arguments));
-                }
-
-                if (is_array($factory)) {
-                    if (is_string($factory[0])) {
-                        return sprintf('\\%s::%s(%s)', $factory[0], $factory[1], implode(', ', $arguments));
-                    }
-
-                    if ($factory[0] instanceof Definition) {
-                        return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
-                    }
-
-                    if ($factory[0] instanceof Reference) {
-                        return sprintf('%s->%s(%s)', $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
-                    }
-                }
-
-                throw new RuntimeException('Cannot dump definition because of invalid factory');
-            }
-
-            if (null !== $value->getFactoryMethod(false)) {
-                if (null !== $value->getFactoryClass(false)) {
-                    return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($value->getFactoryClass(false)), $value->getFactoryMethod(false), count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
-                } elseif (null !== $value->getFactoryService(false)) {
-                    $service = $this->dumpValue($value->getFactoryService(false));
-
-                    return sprintf('%s->%s(%s)', 0 === strpos($service, '$') ? sprintf('$this->get(%s)', $service) : $this->getServiceCall($value->getFactoryService(false)), $value->getFactoryMethod(false), implode(', ', $arguments));
-                } else {
-                    throw new RuntimeException('Cannot dump definitions which have factory method without factory service or factory class.');
-                }
-            }
-
-            $class = $value->getClass();
-            if (null === $class) {
-                throw new RuntimeException('Cannot dump definitions which have no class nor factory.');
-            }
-            $class = $this->dumpValue($class);
-            if (false !== strpos($class, '$')) {
-                throw new RuntimeException('Cannot dump definitions which have a variable class name.');
-            }
-
-            return sprintf('new \\%s(%s)', substr(str_replace('\\\\', '\\', $class), 1, -1), implode(', ', $arguments));
-        } elseif ($value instanceof Variable) {
-            return '$'.$value;
-        } elseif ($value instanceof Reference) {
-            if (null !== $this->referenceVariables && isset($this->referenceVariables[$id = (string) $value])) {
-                return $this->dumpValue($this->referenceVariables[$id], $interpolate);
-            }
-
-            return $this->getServiceCall((string) $value, $value);
-        } elseif ($value instanceof Expression) {
-            return $this->getExpressionLanguage()->compile((string) $value, array('this' => 'container'));
-        } elseif ($value instanceof Parameter) {
-            return $this->dumpParameter($value);
-        } elseif (true === $interpolate && is_string($value)) {
-            if (preg_match('/^%([^%]+)%$/', $value, $match)) {
-                // we do this to deal with non string values (Boolean, integer, ...)
-                // the preg_replace_callback converts them to strings
-                return $this->dumpParameter(strtolower($match[1]));
-            } else {
-                $that = $this;
-                $replaceParameters = function ($match) use ($that) {
-                    return "'.".$that->dumpParameter(strtolower($match[2])).".'";
-                };
-
-                $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, $this->export($value)));
-
-                return $code;
-            }
-        } elseif (is_object($value) || is_resource($value)) {
-            throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        } else {
-            return $this->export($value);
-        }
-    }
-
-    /**
-     * Dumps a string to a literal (aka PHP Code) class value.
-     *
-     * @param string $class
-     *
-     * @return string
-     */
-    private function dumpLiteralClass($class)
-    {
-        return '\\'.substr(str_replace('\\\\', '\\', $class), 1, -1);
-    }
-
-    /**
-     * Dumps a parameter.
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public function dumpParameter($name)
-    {
-        if ($this->container->isFrozen() && $this->container->hasParameter($name)) {
-            return $this->dumpValue($this->container->getParameter($name), false);
-        }
-
-        return sprintf("\$this->getParameter('%s')", strtolower($name));
-    }
-
-    /**
-     * @deprecated since version 2.6.2, to be removed in 3.0.
-     *             Use \Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider instead.
-     *
-     * @param ExpressionFunctionProviderInterface $provider
-     */
-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6.2 and will be removed in 3.0. Use the Symfony\Component\DependencyInjection\ContainerBuilder::addExpressionLanguageProvider method instead.', E_USER_DEPRECATED);
-
-        $this->expressionLanguageProviders[] = $provider;
-    }
-
-    /**
-     * Gets a service call.
-     *
-     * @param string    $id
-     * @param Reference $reference
-     *
-     * @return string
-     */
-    private function getServiceCall($id, Reference $reference = null)
-    {
-        if ('service_container' === $id) {
-            return '$this';
-        }
-
-        if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
-            return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
-        } else {
-            if ($this->container->hasAlias($id)) {
-                $id = (string) $this->container->getAlias($id);
-            }
-
-            return sprintf('$this->get(\'%s\')', $id);
-        }
-    }
-
-    /**
-     * Convert a service id to a valid PHP method name.
-     *
-     * @param string $id
-     *
-     * @return string
-     *
-     * @throws InvalidArgumentException
-     */
-    private function camelize($id)
-    {
-        $name = Container::camelize($id);
-
-        if (!preg_match('/^[a-zA-Z0-9_\x7f-\xff]+$/', $name)) {
-            throw new InvalidArgumentException(sprintf('Service id "%s" cannot be converted to a valid PHP method name.', $id));
-        }
-
-        return $name;
-    }
-
-    /**
-     * Returns the next name to use.
-     *
-     * @return string
-     */
-    private function getNextVariableName()
-    {
-        $firstChars = self::FIRST_CHARS;
-        $firstCharsLength = strlen($firstChars);
-        $nonFirstChars = self::NON_FIRST_CHARS;
-        $nonFirstCharsLength = strlen($nonFirstChars);
-
-        while (true) {
-            $name = '';
-            $i = $this->variableCount;
-
-            if ('' === $name) {
-                $name .= $firstChars[$i % $firstCharsLength];
-                $i = (int) ($i / $firstCharsLength);
-            }
-
-            while ($i > 0) {
-                --$i;
-                $name .= $nonFirstChars[$i % $nonFirstCharsLength];
-                $i = (int) ($i / $nonFirstCharsLength);
-            }
-
-            ++$this->variableCount;
-
-            // check that the name is not reserved
-            if (in_array($name, $this->reservedVariables, true)) {
-                continue;
-            }
-
-            return $name;
-        }
-    }
-
-    private function getExpressionLanguage()
-    {
-        if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
-            $providers = array_merge($this->container->getExpressionLanguageProviders(), $this->expressionLanguageProviders);
-            $this->expressionLanguage = new ExpressionLanguage(null, $providers);
-
-            if ($this->container->isTrackingResources()) {
-                foreach ($providers as $provider) {
-                    $this->container->addObjectResource($provider);
-                }
-            }
-        }
-
-        return $this->expressionLanguage;
-    }
-
-    private function exportTargetDirs()
-    {
-        return null === $this->targetDirRegex ? '' : <<<EOF
-
-        \$dir = __DIR__;
-        for (\$i = 1; \$i <= {$this->targetDirMaxMatches}; ++\$i) {
-            \$this->targetDirs[\$i] = \$dir = dirname(\$dir);
-        }
-EOF;
-    }
-
-    private function export($value)
-    {
-        if (null !== $this->targetDirRegex && is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {
-            $prefix = $matches[0][1] ? var_export(substr($value, 0, $matches[0][1]), true).'.' : '';
-            $suffix = $matches[0][1] + strlen($matches[0][0]);
-            $suffix = isset($value[$suffix]) ? '.'.var_export(substr($value, $suffix), true) : '';
-            $dirname = '__DIR__';
-
-            if (0 < $offset = 1 + $this->targetDirMaxMatches - count($matches)) {
-                $dirname = sprintf('$this->targetDirs[%d]', $offset);
-            }
-
-            if ($prefix || $suffix) {
-                return sprintf('(%s%s%s)', $prefix, $dirname, $suffix);
-            }
-
-            return $dirname;
-        }
-
-        return var_export($value, true);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php b/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
deleted file mode 100644
index bd8e200..0000000
--- a/vendor/symfony/dependency-injection/Dumper/XmlDumper.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\ExpressionLanguage\Expression;
-
-/**
- * XmlDumper dumps a service container as an XML string.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class XmlDumper extends Dumper
-{
-    /**
-     * @var \DOMDocument
-     */
-    private $document;
-
-    /**
-     * Dumps the service container as an XML string.
-     *
-     * @param array $options An array of options
-     *
-     * @return string An xml string representing of the service container
-     */
-    public function dump(array $options = array())
-    {
-        $this->document = new \DOMDocument('1.0', 'utf-8');
-        $this->document->formatOutput = true;
-
-        $container = $this->document->createElementNS('http://symfony.com/schema/dic/services', 'container');
-        $container->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $container->setAttribute('xsi:schemaLocation', 'http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd');
-
-        $this->addParameters($container);
-        $this->addServices($container);
-
-        $this->document->appendChild($container);
-        $xml = $this->document->saveXML();
-        $this->document = null;
-
-        return $xml;
-    }
-
-    /**
-     * Adds parameters.
-     *
-     * @param \DOMElement $parent
-     */
-    private function addParameters(\DOMElement $parent)
-    {
-        $data = $this->container->getParameterBag()->all();
-        if (!$data) {
-            return;
-        }
-
-        if ($this->container->isFrozen()) {
-            $data = $this->escape($data);
-        }
-
-        $parameters = $this->document->createElement('parameters');
-        $parent->appendChild($parameters);
-        $this->convertParameters($data, 'parameter', $parameters);
-    }
-
-    /**
-     * Adds method calls.
-     *
-     * @param array       $methodcalls
-     * @param \DOMElement $parent
-     */
-    private function addMethodCalls(array $methodcalls, \DOMElement $parent)
-    {
-        foreach ($methodcalls as $methodcall) {
-            $call = $this->document->createElement('call');
-            $call->setAttribute('method', $methodcall[0]);
-            if (count($methodcall[1])) {
-                $this->convertParameters($methodcall[1], 'argument', $call);
-            }
-            $parent->appendChild($call);
-        }
-    }
-
-    /**
-     * Adds a service.
-     *
-     * @param Definition  $definition
-     * @param string      $id
-     * @param \DOMElement $parent
-     */
-    private function addService($definition, $id, \DOMElement $parent)
-    {
-        $service = $this->document->createElement('service');
-        if (null !== $id) {
-            $service->setAttribute('id', $id);
-        }
-        if ($class = $definition->getClass()) {
-            if ('\\' === substr($class, 0, 1)) {
-                $class = substr($class, 1);
-            }
-
-            $service->setAttribute('class', $class);
-        }
-        if ($definition->getFactoryMethod(false)) {
-            $service->setAttribute('factory-method', $definition->getFactoryMethod(false));
-        }
-        if ($definition->getFactoryClass(false)) {
-            $service->setAttribute('factory-class', $definition->getFactoryClass(false));
-        }
-        if ($definition->getFactoryService(false)) {
-            $service->setAttribute('factory-service', $definition->getFactoryService(false));
-        }
-        if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {
-            $service->setAttribute('scope', $scope);
-        }
-        if (!$definition->isPublic()) {
-            $service->setAttribute('public', 'false');
-        }
-        if ($definition->isSynthetic()) {
-            $service->setAttribute('synthetic', 'true');
-        }
-        if ($definition->isSynchronized(false)) {
-            $service->setAttribute('synchronized', 'true');
-        }
-        if ($definition->isLazy()) {
-            $service->setAttribute('lazy', 'true');
-        }
-        if (null !== $decorated = $definition->getDecoratedService()) {
-            list($decorated, $renamedId) = $decorated;
-            $service->setAttribute('decorates', $decorated);
-            if (null !== $renamedId) {
-                $service->setAttribute('decoration-inner-name', $renamedId);
-            }
-        }
-
-        foreach ($definition->getTags() as $name => $tags) {
-            foreach ($tags as $attributes) {
-                $tag = $this->document->createElement('tag');
-                $tag->setAttribute('name', $name);
-                foreach ($attributes as $key => $value) {
-                    $tag->setAttribute($key, $value);
-                }
-                $service->appendChild($tag);
-            }
-        }
-
-        if ($definition->getFile()) {
-            $file = $this->document->createElement('file');
-            $file->appendChild($this->document->createTextNode($definition->getFile()));
-            $service->appendChild($file);
-        }
-
-        if ($parameters = $definition->getArguments()) {
-            $this->convertParameters($parameters, 'argument', $service);
-        }
-
-        if ($parameters = $definition->getProperties()) {
-            $this->convertParameters($parameters, 'property', $service, 'name');
-        }
-
-        $this->addMethodCalls($definition->getMethodCalls(), $service);
-
-        if ($callable = $definition->getFactory()) {
-            $factory = $this->document->createElement('factory');
-
-            if (is_array($callable) && $callable[0] instanceof Definition) {
-                $this->addService($callable[0], null, $factory);
-                $factory->setAttribute('method', $callable[1]);
-            } elseif (is_array($callable)) {
-                $factory->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
-                $factory->setAttribute('method', $callable[1]);
-            } else {
-                $factory->setAttribute('function', $callable);
-            }
-            $service->appendChild($factory);
-        }
-
-        if ($callable = $definition->getConfigurator()) {
-            $configurator = $this->document->createElement('configurator');
-
-            if (is_array($callable) && $callable[0] instanceof Definition) {
-                $this->addService($callable[0], null, $configurator);
-                $configurator->setAttribute('method', $callable[1]);
-            } elseif (is_array($callable)) {
-                $configurator->setAttribute($callable[0] instanceof Reference ? 'service' : 'class', $callable[0]);
-                $configurator->setAttribute('method', $callable[1]);
-            } else {
-                $configurator->setAttribute('function', $callable);
-            }
-            $service->appendChild($configurator);
-        }
-
-        $parent->appendChild($service);
-    }
-
-    /**
-     * Adds a service alias.
-     *
-     * @param string      $alias
-     * @param Alias       $id
-     * @param \DOMElement $parent
-     */
-    private function addServiceAlias($alias, Alias $id, \DOMElement $parent)
-    {
-        $service = $this->document->createElement('service');
-        $service->setAttribute('id', $alias);
-        $service->setAttribute('alias', $id);
-        if (!$id->isPublic()) {
-            $service->setAttribute('public', 'false');
-        }
-        $parent->appendChild($service);
-    }
-
-    /**
-     * Adds services.
-     *
-     * @param \DOMElement $parent
-     */
-    private function addServices(\DOMElement $parent)
-    {
-        $definitions = $this->container->getDefinitions();
-        if (!$definitions) {
-            return;
-        }
-
-        $services = $this->document->createElement('services');
-        foreach ($definitions as $id => $definition) {
-            $this->addService($definition, $id, $services);
-        }
-
-        $aliases = $this->container->getAliases();
-        foreach ($aliases as $alias => $id) {
-            while (isset($aliases[(string) $id])) {
-                $id = $aliases[(string) $id];
-            }
-            $this->addServiceAlias($alias, $id, $services);
-        }
-        $parent->appendChild($services);
-    }
-
-    /**
-     * Converts parameters.
-     *
-     * @param array       $parameters
-     * @param string      $type
-     * @param \DOMElement $parent
-     * @param string      $keyAttribute
-     */
-    private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
-    {
-        $withKeys = array_keys($parameters) !== range(0, count($parameters) - 1);
-        foreach ($parameters as $key => $value) {
-            $element = $this->document->createElement($type);
-            if ($withKeys) {
-                $element->setAttribute($keyAttribute, $key);
-            }
-
-            if (is_array($value)) {
-                $element->setAttribute('type', 'collection');
-                $this->convertParameters($value, $type, $element, 'key');
-            } elseif ($value instanceof Reference) {
-                $element->setAttribute('type', 'service');
-                $element->setAttribute('id', (string) $value);
-                $behaviour = $value->getInvalidBehavior();
-                if ($behaviour == ContainerInterface::NULL_ON_INVALID_REFERENCE) {
-                    $element->setAttribute('on-invalid', 'null');
-                } elseif ($behaviour == ContainerInterface::IGNORE_ON_INVALID_REFERENCE) {
-                    $element->setAttribute('on-invalid', 'ignore');
-                }
-                if (!$value->isStrict()) {
-                    $element->setAttribute('strict', 'false');
-                }
-            } elseif ($value instanceof Definition) {
-                $element->setAttribute('type', 'service');
-                $this->addService($value, null, $element);
-            } elseif ($value instanceof Expression) {
-                $element->setAttribute('type', 'expression');
-                $text = $this->document->createTextNode(self::phpToXml((string) $value));
-                $element->appendChild($text);
-            } else {
-                if (in_array($value, array('null', 'true', 'false'), true)) {
-                    $element->setAttribute('type', 'string');
-                }
-                $text = $this->document->createTextNode(self::phpToXml($value));
-                $element->appendChild($text);
-            }
-            $parent->appendChild($element);
-        }
-    }
-
-    /**
-     * Escapes arguments.
-     *
-     * @param array $arguments
-     *
-     * @return array
-     */
-    private function escape($arguments)
-    {
-        $args = array();
-        foreach ($arguments as $k => $v) {
-            if (is_array($v)) {
-                $args[$k] = $this->escape($v);
-            } elseif (is_string($v)) {
-                $args[$k] = str_replace('%', '%%', $v);
-            } else {
-                $args[$k] = $v;
-            }
-        }
-
-        return $args;
-    }
-
-    /**
-     * Converts php types to xml types.
-     *
-     * @param mixed $value Value to convert
-     *
-     * @return string
-     *
-     * @throws RuntimeException When trying to dump object or resource
-     */
-    public static function phpToXml($value)
-    {
-        switch (true) {
-            case null === $value:
-                return 'null';
-            case true === $value:
-                return 'true';
-            case false === $value:
-                return 'false';
-            case $value instanceof Parameter:
-                return '%'.$value.'%';
-            case is_object($value) || is_resource($value):
-                throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-            default:
-                return (string) $value;
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Dumper/YamlDumper.php b/vendor/symfony/dependency-injection/Dumper/YamlDumper.php
deleted file mode 100644
index e8e108c..0000000
--- a/vendor/symfony/dependency-injection/Dumper/YamlDumper.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?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\Component\DependencyInjection\Dumper;
-
-use Symfony\Component\Yaml\Dumper as YmlDumper;
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Parameter;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\ExpressionLanguage\Expression;
-
-/**
- * YamlDumper dumps a service container as a YAML string.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class YamlDumper extends Dumper
-{
-    private $dumper;
-
-    /**
-     * Dumps the service container as an YAML string.
-     *
-     * @param array $options An array of options
-     *
-     * @return string A YAML string representing of the service container
-     */
-    public function dump(array $options = array())
-    {
-        if (!class_exists('Symfony\Component\Yaml\Dumper')) {
-            throw new RuntimeException('Unable to dump the container as the Symfony Yaml Component is not installed.');
-        }
-
-        if (null === $this->dumper) {
-            $this->dumper = new YmlDumper();
-        }
-
-        return $this->addParameters()."\n".$this->addServices();
-    }
-
-    /**
-     * Adds a service.
-     *
-     * @param string     $id
-     * @param Definition $definition
-     *
-     * @return string
-     */
-    private function addService($id, $definition)
-    {
-        $code = "    $id:\n";
-        if ($class = $definition->getClass()) {
-            if ('\\' === substr($class, 0, 1)) {
-                $class = substr($class, 1);
-            }
-
-            $code .= sprintf("        class: %s\n", $class);
-        }
-
-        if (!$definition->isPublic()) {
-            $code .= "        public: false\n";
-        }
-
-        $tagsCode = '';
-        foreach ($definition->getTags() as $name => $tags) {
-            foreach ($tags as $attributes) {
-                $att = array();
-                foreach ($attributes as $key => $value) {
-                    $att[] = sprintf('%s: %s', $this->dumper->dump($key), $this->dumper->dump($value));
-                }
-                $att = $att ? ', '.implode(', ', $att) : '';
-
-                $tagsCode .= sprintf("            - { name: %s%s }\n", $this->dumper->dump($name), $att);
-            }
-        }
-        if ($tagsCode) {
-            $code .= "        tags:\n".$tagsCode;
-        }
-
-        if ($definition->getFile()) {
-            $code .= sprintf("        file: %s\n", $definition->getFile());
-        }
-
-        if ($definition->isSynthetic()) {
-            $code .= sprintf("        synthetic: true\n");
-        }
-
-        if ($definition->isSynchronized(false)) {
-            $code .= sprintf("        synchronized: true\n");
-        }
-
-        if ($definition->getFactoryClass(false)) {
-            $code .= sprintf("        factory_class: %s\n", $definition->getFactoryClass(false));
-        }
-
-        if ($definition->isLazy()) {
-            $code .= sprintf("        lazy: true\n");
-        }
-
-        if ($definition->getFactoryMethod(false)) {
-            $code .= sprintf("        factory_method: %s\n", $definition->getFactoryMethod(false));
-        }
-
-        if ($definition->getFactoryService(false)) {
-            $code .= sprintf("        factory_service: %s\n", $definition->getFactoryService(false));
-        }
-
-        if ($definition->getArguments()) {
-            $code .= sprintf("        arguments: %s\n", $this->dumper->dump($this->dumpValue($definition->getArguments()), 0));
-        }
-
-        if ($definition->getProperties()) {
-            $code .= sprintf("        properties: %s\n", $this->dumper->dump($this->dumpValue($definition->getProperties()), 0));
-        }
-
-        if ($definition->getMethodCalls()) {
-            $code .= sprintf("        calls:\n%s\n", $this->dumper->dump($this->dumpValue($definition->getMethodCalls()), 1, 12));
-        }
-
-        if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {
-            $code .= sprintf("        scope: %s\n", $scope);
-        }
-
-        if (null !== $decorated = $definition->getDecoratedService()) {
-            list($decorated, $renamedId) = $decorated;
-            $code .= sprintf("        decorates: %s\n", $decorated);
-            if (null !== $renamedId) {
-                $code .= sprintf("        decoration_inner_name: %s\n", $renamedId);
-            }
-        }
-
-        if ($callable = $definition->getFactory()) {
-            $code .= sprintf("        factory: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
-        }
-
-        if ($callable = $definition->getConfigurator()) {
-            $code .= sprintf("        configurator: %s\n", $this->dumper->dump($this->dumpCallable($callable), 0));
-        }
-
-        return $code;
-    }
-
-    /**
-     * Adds a service alias.
-     *
-     * @param string $alias
-     * @param Alias  $id
-     *
-     * @return string
-     */
-    private function addServiceAlias($alias, $id)
-    {
-        if ($id->isPublic()) {
-            return sprintf("    %s: '@%s'\n", $alias, $id);
-        }
-
-        return sprintf("    %s:\n        alias: %s\n        public: false", $alias, $id);
-    }
-
-    /**
-     * Adds services.
-     *
-     * @return string
-     */
-    private function addServices()
-    {
-        if (!$this->container->getDefinitions()) {
-            return '';
-        }
-
-        $code = "services:\n";
-        foreach ($this->container->getDefinitions() as $id => $definition) {
-            $code .= $this->addService($id, $definition);
-        }
-
-        $aliases = $this->container->getAliases();
-        foreach ($aliases as $alias => $id) {
-            while (isset($aliases[(string) $id])) {
-                $id = $aliases[(string) $id];
-            }
-            $code .= $this->addServiceAlias($alias, $id);
-        }
-
-        return $code;
-    }
-
-    /**
-     * Adds parameters.
-     *
-     * @return string
-     */
-    private function addParameters()
-    {
-        if (!$this->container->getParameterBag()->all()) {
-            return '';
-        }
-
-        $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isFrozen());
-
-        return $this->dumper->dump(array('parameters' => $parameters), 2);
-    }
-
-    /**
-     * Dumps callable to YAML format.
-     *
-     * @param callable $callable
-     *
-     * @return callable
-     */
-    private function dumpCallable($callable)
-    {
-        if (is_array($callable)) {
-            if ($callable[0] instanceof Reference) {
-                $callable = array($this->getServiceCall((string) $callable[0], $callable[0]), $callable[1]);
-            } else {
-                $callable = array($callable[0], $callable[1]);
-            }
-        }
-
-        return $callable;
-    }
-
-    /**
-     * Dumps the value to YAML format.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     *
-     * @throws RuntimeException When trying to dump object or resource
-     */
-    private function dumpValue($value)
-    {
-        if (is_array($value)) {
-            $code = array();
-            foreach ($value as $k => $v) {
-                $code[$k] = $this->dumpValue($v);
-            }
-
-            return $code;
-        } elseif ($value instanceof Reference) {
-            return $this->getServiceCall((string) $value, $value);
-        } elseif ($value instanceof Parameter) {
-            return $this->getParameterCall((string) $value);
-        } elseif ($value instanceof Expression) {
-            return $this->getExpressionCall((string) $value);
-        } elseif (is_object($value) || is_resource($value)) {
-            throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
-        }
-
-        return $value;
-    }
-
-    /**
-     * Gets the service call.
-     *
-     * @param string    $id
-     * @param Reference $reference
-     *
-     * @return string
-     */
-    private function getServiceCall($id, Reference $reference = null)
-    {
-        if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
-            return sprintf('@?%s', $id);
-        }
-
-        return sprintf('@%s', $id);
-    }
-
-    /**
-     * Gets parameter call.
-     *
-     * @param string $id
-     *
-     * @return string
-     */
-    private function getParameterCall($id)
-    {
-        return sprintf('%%%s%%', $id);
-    }
-
-    private function getExpressionCall($expression)
-    {
-        return sprintf('@=%s', $expression);
-    }
-
-    /**
-     * Prepares parameters.
-     *
-     * @param array $parameters
-     * @param bool  $escape
-     *
-     * @return array
-     */
-    private function prepareParameters($parameters, $escape = true)
-    {
-        $filtered = array();
-        foreach ($parameters as $key => $value) {
-            if (is_array($value)) {
-                $value = $this->prepareParameters($value, $escape);
-            } elseif ($value instanceof Reference || is_string($value) && 0 === strpos($value, '@')) {
-                $value = '@'.$value;
-            }
-
-            $filtered[$key] = $value;
-        }
-
-        return $escape ? $this->escape($filtered) : $filtered;
-    }
-
-    /**
-     * Escapes arguments.
-     *
-     * @param array $arguments
-     *
-     * @return array
-     */
-    private function escape($arguments)
-    {
-        $args = array();
-        foreach ($arguments as $k => $v) {
-            if (is_array($v)) {
-                $args[$k] = $this->escape($v);
-            } elseif (is_string($v)) {
-                $args[$k] = str_replace('%', '%%', $v);
-            } else {
-                $args[$k] = $v;
-            }
-        }
-
-        return $args;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/BadMethodCallException.php b/vendor/symfony/dependency-injection/Exception/BadMethodCallException.php
deleted file mode 100644
index 959238e..0000000
--- a/vendor/symfony/dependency-injection/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base BadMethodCallException for Dependency Injection component.
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ExceptionInterface.php b/vendor/symfony/dependency-injection/Exception/ExceptionInterface.php
deleted file mode 100644
index f5e9099..0000000
--- a/vendor/symfony/dependency-injection/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base ExceptionInterface for Dependency Injection component.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bulat Shakirzyanov <bulat@theopenskyproject.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/InactiveScopeException.php b/vendor/symfony/dependency-injection/Exception/InactiveScopeException.php
deleted file mode 100644
index 6b3dd3e..0000000
--- a/vendor/symfony/dependency-injection/Exception/InactiveScopeException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when you try to create a service of an inactive scope.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class InactiveScopeException extends RuntimeException
-{
-    private $serviceId;
-    private $scope;
-
-    public function __construct($serviceId, $scope, \Exception $previous = null)
-    {
-        parent::__construct(sprintf('You cannot create a service ("%s") of an inactive scope ("%s").', $serviceId, $scope), 0, $previous);
-
-        $this->serviceId = $serviceId;
-        $this->scope = $scope;
-    }
-
-    public function getServiceId()
-    {
-        return $this->serviceId;
-    }
-
-    public function getScope()
-    {
-        return $this->scope;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/InvalidArgumentException.php b/vendor/symfony/dependency-injection/Exception/InvalidArgumentException.php
deleted file mode 100644
index 119bb7d..0000000
--- a/vendor/symfony/dependency-injection/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base InvalidArgumentException for Dependency Injection component.
- *
- * @author Bulat Shakirzyanov <bulat@theopenskyproject.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/LogicException.php b/vendor/symfony/dependency-injection/Exception/LogicException.php
deleted file mode 100644
index 17a070c..0000000
--- a/vendor/symfony/dependency-injection/Exception/LogicException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base LogicException for Dependency Injection component.
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/OutOfBoundsException.php b/vendor/symfony/dependency-injection/Exception/OutOfBoundsException.php
deleted file mode 100644
index a61f143..0000000
--- a/vendor/symfony/dependency-injection/Exception/OutOfBoundsException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base OutOfBoundsException for Dependency Injection component.
- */
-class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php b/vendor/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php
deleted file mode 100644
index 2915176..0000000
--- a/vendor/symfony/dependency-injection/Exception/ParameterCircularReferenceException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when a circular reference in a parameter is detected.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParameterCircularReferenceException extends RuntimeException
-{
-    private $parameters;
-
-    public function __construct($parameters, \Exception $previous = null)
-    {
-        parent::__construct(sprintf('Circular reference detected for parameter "%s" ("%s" > "%s").', $parameters[0], implode('" > "', $parameters), $parameters[0]), 0, $previous);
-
-        $this->parameters = $parameters;
-    }
-
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ParameterNotFoundException.php b/vendor/symfony/dependency-injection/Exception/ParameterNotFoundException.php
deleted file mode 100644
index b529f0f..0000000
--- a/vendor/symfony/dependency-injection/Exception/ParameterNotFoundException.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when a non-existent parameter is used.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParameterNotFoundException extends InvalidArgumentException
-{
-    private $key;
-    private $sourceId;
-    private $sourceKey;
-    private $alternatives;
-
-    /**
-     * Constructor.
-     *
-     * @param string     $key          The requested parameter key
-     * @param string     $sourceId     The service id that references the non-existent parameter
-     * @param string     $sourceKey    The parameter key that references the non-existent parameter
-     * @param \Exception $previous     The previous exception
-     * @param string[]   $alternatives Some parameter name alternatives
-     */
-    public function __construct($key, $sourceId = null, $sourceKey = null, \Exception $previous = null, array $alternatives = array())
-    {
-        $this->key = $key;
-        $this->sourceId = $sourceId;
-        $this->sourceKey = $sourceKey;
-        $this->alternatives = $alternatives;
-
-        parent::__construct('', 0, $previous);
-
-        $this->updateRepr();
-    }
-
-    public function updateRepr()
-    {
-        if (null !== $this->sourceId) {
-            $this->message = sprintf('The service "%s" has a dependency on a non-existent parameter "%s".', $this->sourceId, $this->key);
-        } elseif (null !== $this->sourceKey) {
-            $this->message = sprintf('The parameter "%s" has a dependency on a non-existent parameter "%s".', $this->sourceKey, $this->key);
-        } else {
-            $this->message = sprintf('You have requested a non-existent parameter "%s".', $this->key);
-        }
-
-        if ($this->alternatives) {
-            if (1 == count($this->alternatives)) {
-                $this->message .= ' Did you mean this: "';
-            } else {
-                $this->message .= ' Did you mean one of these: "';
-            }
-            $this->message .= implode('", "', $this->alternatives).'"?';
-        }
-    }
-
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    public function getSourceId()
-    {
-        return $this->sourceId;
-    }
-
-    public function getSourceKey()
-    {
-        return $this->sourceKey;
-    }
-
-    public function setSourceId($sourceId)
-    {
-        $this->sourceId = $sourceId;
-
-        $this->updateRepr();
-    }
-
-    public function setSourceKey($sourceKey)
-    {
-        $this->sourceKey = $sourceKey;
-
-        $this->updateRepr();
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/RuntimeException.php b/vendor/symfony/dependency-injection/Exception/RuntimeException.php
deleted file mode 100644
index 5c24541..0000000
--- a/vendor/symfony/dependency-injection/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Base RuntimeException for Dependency Injection component.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ScopeCrossingInjectionException.php b/vendor/symfony/dependency-injection/Exception/ScopeCrossingInjectionException.php
deleted file mode 100644
index 661fbab..0000000
--- a/vendor/symfony/dependency-injection/Exception/ScopeCrossingInjectionException.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when the a scope crossing injection is detected.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ScopeCrossingInjectionException extends RuntimeException
-{
-    private $sourceServiceId;
-    private $sourceScope;
-    private $destServiceId;
-    private $destScope;
-
-    public function __construct($sourceServiceId, $sourceScope, $destServiceId, $destScope, \Exception $previous = null)
-    {
-        parent::__construct(sprintf(
-            'Scope Crossing Injection detected: The definition "%s" references the service "%s" which belongs to another scope hierarchy. '
-           .'This service might not be available consistently. Generally, it is safer to either move the definition "%s" to scope "%s", or '
-           .'declare "%s" as a child scope of "%s". If you can be sure that the other scope is always active, you can set the reference to strict=false to get rid of this error.',
-           $sourceServiceId,
-           $destServiceId,
-           $sourceServiceId,
-           $destScope,
-           $sourceScope,
-           $destScope
-        ), 0, $previous);
-
-        $this->sourceServiceId = $sourceServiceId;
-        $this->sourceScope = $sourceScope;
-        $this->destServiceId = $destServiceId;
-        $this->destScope = $destScope;
-    }
-
-    public function getSourceServiceId()
-    {
-        return $this->sourceServiceId;
-    }
-
-    public function getSourceScope()
-    {
-        return $this->sourceScope;
-    }
-
-    public function getDestServiceId()
-    {
-        return $this->destServiceId;
-    }
-
-    public function getDestScope()
-    {
-        return $this->destScope;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ScopeWideningInjectionException.php b/vendor/symfony/dependency-injection/Exception/ScopeWideningInjectionException.php
deleted file mode 100644
index 86a6684..0000000
--- a/vendor/symfony/dependency-injection/Exception/ScopeWideningInjectionException.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * Thrown when a scope widening injection is detected.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ScopeWideningInjectionException extends RuntimeException
-{
-    private $sourceServiceId;
-    private $sourceScope;
-    private $destServiceId;
-    private $destScope;
-
-    public function __construct($sourceServiceId, $sourceScope, $destServiceId, $destScope, \Exception $previous = null)
-    {
-        parent::__construct(sprintf(
-            'Scope Widening Injection detected: The definition "%s" references the service "%s" which belongs to a narrower scope. '
-           .'Generally, it is safer to either move "%s" to scope "%s" or alternatively rely on the provider pattern by injecting the container itself, and requesting the service "%s" each time it is needed. '
-           .'In rare, special cases however that might not be necessary, then you can set the reference to strict=false to get rid of this error.',
-           $sourceServiceId,
-           $destServiceId,
-           $sourceServiceId,
-           $destScope,
-           $destServiceId
-        ), 0, $previous);
-
-        $this->sourceServiceId = $sourceServiceId;
-        $this->sourceScope = $sourceScope;
-        $this->destServiceId = $destServiceId;
-        $this->destScope = $destScope;
-    }
-
-    public function getSourceServiceId()
-    {
-        return $this->sourceServiceId;
-    }
-
-    public function getSourceScope()
-    {
-        return $this->sourceScope;
-    }
-
-    public function getDestServiceId()
-    {
-        return $this->destServiceId;
-    }
-
-    public function getDestScope()
-    {
-        return $this->destScope;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php b/vendor/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php
deleted file mode 100644
index 26e3fb3..0000000
--- a/vendor/symfony/dependency-injection/Exception/ServiceCircularReferenceException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when a circular reference is detected.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ServiceCircularReferenceException extends RuntimeException
-{
-    private $serviceId;
-    private $path;
-
-    public function __construct($serviceId, array $path, \Exception $previous = null)
-    {
-        parent::__construct(sprintf('Circular reference detected for service "%s", path: "%s".', $serviceId, implode(' -> ', $path)), 0, $previous);
-
-        $this->serviceId = $serviceId;
-        $this->path = $path;
-    }
-
-    public function getServiceId()
-    {
-        return $this->serviceId;
-    }
-
-    public function getPath()
-    {
-        return $this->path;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Exception/ServiceNotFoundException.php b/vendor/symfony/dependency-injection/Exception/ServiceNotFoundException.php
deleted file mode 100644
index e65da50..0000000
--- a/vendor/symfony/dependency-injection/Exception/ServiceNotFoundException.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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\Component\DependencyInjection\Exception;
-
-/**
- * This exception is thrown when a non-existent service is requested.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ServiceNotFoundException extends InvalidArgumentException
-{
-    private $id;
-    private $sourceId;
-
-    public function __construct($id, $sourceId = null, \Exception $previous = null, array $alternatives = array())
-    {
-        if (null === $sourceId) {
-            $msg = sprintf('You have requested a non-existent service "%s".', $id);
-        } else {
-            $msg = sprintf('The service "%s" has a dependency on a non-existent service "%s".', $sourceId, $id);
-        }
-
-        if ($alternatives) {
-            if (1 == count($alternatives)) {
-                $msg .= ' Did you mean this: "';
-            } else {
-                $msg .= ' Did you mean one of these: "';
-            }
-            $msg .= implode('", "', $alternatives).'"?';
-        }
-
-        parent::__construct($msg, 0, $previous);
-
-        $this->id = $id;
-        $this->sourceId = $sourceId;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getSourceId()
-    {
-        return $this->sourceId;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ExpressionLanguage.php b/vendor/symfony/dependency-injection/ExpressionLanguage.php
deleted file mode 100644
index acc97bc..0000000
--- a/vendor/symfony/dependency-injection/ExpressionLanguage.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface;
-
-/**
- * Adds some function to the default ExpressionLanguage.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @see ExpressionLanguageProvider
- */
-class ExpressionLanguage extends BaseExpressionLanguage
-{
-    public function __construct(ParserCacheInterface $cache = null, array $providers = array())
-    {
-        // prepend the default provider to let users override it easily
-        array_unshift($providers, new ExpressionLanguageProvider());
-
-        parent::__construct($cache, $providers);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ExpressionLanguageProvider.php b/vendor/symfony/dependency-injection/ExpressionLanguageProvider.php
deleted file mode 100644
index ce6d695..0000000
--- a/vendor/symfony/dependency-injection/ExpressionLanguageProvider.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\DependencyInjection;
-
-use Symfony\Component\ExpressionLanguage\ExpressionFunction;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * Define some ExpressionLanguage functions.
- *
- * To get a service, use service('request').
- * To get a parameter, use parameter('kernel.debug').
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
-{
-    public function getFunctions()
-    {
-        return array(
-            new ExpressionFunction('service', function ($arg) {
-                return sprintf('$this->get(%s)', $arg);
-            }, function (array $variables, $value) {
-                return $variables['container']->get($value);
-            }),
-
-            new ExpressionFunction('parameter', function ($arg) {
-                return sprintf('$this->getParameter(%s)', $arg);
-            }, function (array $variables, $value) {
-                return $variables['container']->getParameter($value);
-            }),
-        );
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Extension/ConfigurationExtensionInterface.php b/vendor/symfony/dependency-injection/Extension/ConfigurationExtensionInterface.php
deleted file mode 100644
index 705ba38..0000000
--- a/vendor/symfony/dependency-injection/Extension/ConfigurationExtensionInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\DependencyInjection\Extension;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-/**
- * ConfigurationExtensionInterface is the interface implemented by container extension classes.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-interface ConfigurationExtensionInterface
-{
-    /**
-     * Returns extension configuration.
-     *
-     * @param array            $config    An array of configuration values
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     *
-     * @return ConfigurationInterface|null The configuration or null
-     */
-    public function getConfiguration(array $config, ContainerBuilder $container);
-}
diff --git a/vendor/symfony/dependency-injection/Extension/Extension.php b/vendor/symfony/dependency-injection/Extension/Extension.php
deleted file mode 100644
index f8e058b..0000000
--- a/vendor/symfony/dependency-injection/Extension/Extension.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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\Component\DependencyInjection\Extension;
-
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-/**
- * Provides useful features shared by many extensions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Extension implements ExtensionInterface, ConfigurationExtensionInterface
-{
-    /**
-     * Returns the base path for the XSD files.
-     *
-     * @return string The XSD base path
-     */
-    public function getXsdValidationBasePath()
-    {
-        return false;
-    }
-
-    /**
-     * Returns the namespace to be used for this extension (XML namespace).
-     *
-     * @return string The XML namespace
-     */
-    public function getNamespace()
-    {
-        return 'http://example.org/schema/dic/'.$this->getAlias();
-    }
-
-    /**
-     * Returns the recommended alias to use in XML.
-     *
-     * This alias is also the mandatory prefix to use when using YAML.
-     *
-     * This convention is to remove the "Extension" postfix from the class
-     * name and then lowercase and underscore the result. So:
-     *
-     *     AcmeHelloExtension
-     *
-     * becomes
-     *
-     *     acme_hello
-     *
-     * This can be overridden in a sub-class to specify the alias manually.
-     *
-     * @return string The alias
-     *
-     * @throws BadMethodCallException When the extension name does not follow conventions
-     */
-    public function getAlias()
-    {
-        $className = get_class($this);
-        if (substr($className, -9) != 'Extension') {
-            throw new BadMethodCallException('This extension does not follow the naming convention; you must overwrite the getAlias() method.');
-        }
-        $classBaseName = substr(strrchr($className, '\\'), 1, -9);
-
-        return Container::underscore($classBaseName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        $reflected = new \ReflectionClass($this);
-        $namespace = $reflected->getNamespaceName();
-
-        $class = $namespace.'\\Configuration';
-        if (class_exists($class)) {
-            $r = new \ReflectionClass($class);
-            $container->addResource(new FileResource($r->getFileName()));
-
-            if (!method_exists($class, '__construct')) {
-                $configuration = new $class();
-
-                return $configuration;
-            }
-        }
-    }
-
-    final protected function processConfiguration(ConfigurationInterface $configuration, array $configs)
-    {
-        $processor = new Processor();
-
-        return $processor->processConfiguration($configuration, $configs);
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     * @param array            $config
-     *
-     * @return bool Whether the configuration is enabled
-     *
-     * @throws InvalidArgumentException When the config is not enableable
-     */
-    protected function isConfigEnabled(ContainerBuilder $container, array $config)
-    {
-        if (!array_key_exists('enabled', $config)) {
-            throw new InvalidArgumentException("The config array has no 'enabled' key.");
-        }
-
-        return (bool) $container->getParameterBag()->resolveValue($config['enabled']);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Extension/ExtensionInterface.php b/vendor/symfony/dependency-injection/Extension/ExtensionInterface.php
deleted file mode 100644
index 1fd1baa..0000000
--- a/vendor/symfony/dependency-injection/Extension/ExtensionInterface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\DependencyInjection\Extension;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * ExtensionInterface is the interface implemented by container extension classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ExtensionInterface
-{
-    /**
-     * Loads a specific configuration.
-     *
-     * @param array            $config    An array of configuration values
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     *
-     * @throws \InvalidArgumentException When provided tag is not defined in this extension
-     */
-    public function load(array $config, ContainerBuilder $container);
-
-    /**
-     * Returns the namespace to be used for this extension (XML namespace).
-     *
-     * @return string The XML namespace
-     */
-    public function getNamespace();
-
-    /**
-     * Returns the base path for the XSD files.
-     *
-     * @return string The XSD base path
-     */
-    public function getXsdValidationBasePath();
-
-    /**
-     * Returns the recommended alias to use in XML.
-     *
-     * This alias is also the mandatory prefix to use when using YAML.
-     *
-     * @return string The alias
-     */
-    public function getAlias();
-}
diff --git a/vendor/symfony/dependency-injection/Extension/PrependExtensionInterface.php b/vendor/symfony/dependency-injection/Extension/PrependExtensionInterface.php
deleted file mode 100644
index c666bdb..0000000
--- a/vendor/symfony/dependency-injection/Extension/PrependExtensionInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\DependencyInjection\Extension;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-interface PrependExtensionInterface
-{
-    /**
-     * Allow an extension to prepend the extension configurations.
-     *
-     * @param ContainerBuilder $container
-     */
-    public function prepend(ContainerBuilder $container);
-}
diff --git a/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php b/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php
deleted file mode 100644
index e630a1e..0000000
--- a/vendor/symfony/dependency-injection/IntrospectableContainerInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * IntrospectableContainerInterface defines additional introspection functionality
- * for containers, allowing logic to be implemented based on a Container's state.
- *
- * @author Evan Villemez <evillemez@gmail.com>
- */
-interface IntrospectableContainerInterface extends ContainerInterface
-{
-    /**
-     * Check for whether or not a service has been initialized.
-     *
-     * @param string $id
-     *
-     * @return bool true if the service has been initialized, false otherwise
-     */
-    public function initialized($id);
-}
diff --git a/vendor/symfony/dependency-injection/LICENSE b/vendor/symfony/dependency-injection/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/dependency-injection/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/dependency-injection/LazyProxy/Instantiator/InstantiatorInterface.php b/vendor/symfony/dependency-injection/LazyProxy/Instantiator/InstantiatorInterface.php
deleted file mode 100644
index a8dd525..0000000
--- a/vendor/symfony/dependency-injection/LazyProxy/Instantiator/InstantiatorInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Component\DependencyInjection\LazyProxy\Instantiator;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * Lazy proxy instantiator, capable of instantiating a proxy given a container, the
- * service definitions and a callback that produces the real service instance.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-interface InstantiatorInterface
-{
-    /**
-     * Instantiates a proxy object.
-     *
-     * @param ContainerInterface $container        the container from which the service is being requested
-     * @param Definition         $definition       the definition of the requested service
-     * @param string             $id               identifier of the requested service
-     * @param callable           $realInstantiator zero-argument callback that is capable of producing the real
-     *                                             service instance
-     *
-     * @return object
-     */
-    public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator);
-}
diff --git a/vendor/symfony/dependency-injection/LazyProxy/Instantiator/RealServiceInstantiator.php b/vendor/symfony/dependency-injection/LazyProxy/Instantiator/RealServiceInstantiator.php
deleted file mode 100644
index cad9320..0000000
--- a/vendor/symfony/dependency-injection/LazyProxy/Instantiator/RealServiceInstantiator.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\DependencyInjection\LazyProxy\Instantiator;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * {@inheritdoc}
- *
- * Noop proxy instantiator - simply produces the real service instead of a proxy instance.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class RealServiceInstantiator implements InstantiatorInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
-    {
-        return call_user_func($realInstantiator);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php b/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
deleted file mode 100644
index 878d965..0000000
--- a/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/DumperInterface.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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\Component\DependencyInjection\LazyProxy\PhpDumper;
-
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * Lazy proxy dumper capable of generating the instantiation logic PHP code for proxied services.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-interface DumperInterface
-{
-    /**
-     * Inspects whether the given definitions should produce proxy instantiation logic in the dumped container.
-     *
-     * @param Definition $definition
-     *
-     * @return bool
-     */
-    public function isProxyCandidate(Definition $definition);
-
-    /**
-     * Generates the code to be used to instantiate a proxy in the dumped factory code.
-     *
-     * @param Definition $definition
-     * @param string     $id         service identifier
-     *
-     * @return string
-     */
-    public function getProxyFactoryCode(Definition $definition, $id);
-
-    /**
-     * Generates the code for the lazy proxy.
-     *
-     * @param Definition $definition
-     *
-     * @return string
-     */
-    public function getProxyCode(Definition $definition);
-}
diff --git a/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php b/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php
deleted file mode 100644
index 30911d3..0000000
--- a/vendor/symfony/dependency-injection/LazyProxy/PhpDumper/NullDumper.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\DependencyInjection\LazyProxy\PhpDumper;
-
-use Symfony\Component\DependencyInjection\Definition;
-
-/**
- * Null dumper, negates any proxy code generation for any given service definition.
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-class NullDumper implements DumperInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function isProxyCandidate(Definition $definition)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProxyFactoryCode(Definition $definition, $id)
-    {
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProxyCode(Definition $definition)
-    {
-        return '';
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/ClosureLoader.php b/vendor/symfony/dependency-injection/Loader/ClosureLoader.php
deleted file mode 100644
index a5b4e5a..0000000
--- a/vendor/symfony/dependency-injection/Loader/ClosureLoader.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\Loader\Loader;
-
-/**
- * ClosureLoader loads service definitions from a PHP closure.
- *
- * The Closure has access to the container as its first argument.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ClosureLoader extends Loader
-{
-    private $container;
-
-    /**
-     * Constructor.
-     *
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
-    public function __construct(ContainerBuilder $container)
-    {
-        $this->container = $container;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        call_user_func($resource, $this->container);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return $resource instanceof \Closure;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/FileLoader.php b/vendor/symfony/dependency-injection/Loader/FileLoader.php
deleted file mode 100644
index d71eecf..0000000
--- a/vendor/symfony/dependency-injection/Loader/FileLoader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\Loader\FileLoader as BaseFileLoader;
-use Symfony\Component\Config\FileLocatorInterface;
-
-/**
- * FileLoader is the abstract class used by all built-in loaders that are file based.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class FileLoader extends BaseFileLoader
-{
-    protected $container;
-
-    /**
-     * Constructor.
-     *
-     * @param ContainerBuilder     $container A ContainerBuilder instance
-     * @param FileLocatorInterface $locator   A FileLocator instance
-     */
-    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator)
-    {
-        $this->container = $container;
-
-        parent::__construct($locator);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/IniFileLoader.php b/vendor/symfony/dependency-injection/Loader/IniFileLoader.php
deleted file mode 100644
index 16ddf87..0000000
--- a/vendor/symfony/dependency-injection/Loader/IniFileLoader.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * IniFileLoader loads parameters from INI files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class IniFileLoader extends FileLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        $path = $this->locator->locate($resource);
-
-        $this->container->addResource(new FileResource($path));
-
-        $result = parse_ini_file($path, true);
-        if (false === $result || array() === $result) {
-            throw new InvalidArgumentException(sprintf('The "%s" file is not valid.', $resource));
-        }
-
-        if (isset($result['parameters']) && is_array($result['parameters'])) {
-            foreach ($result['parameters'] as $key => $value) {
-                $this->container->setParameter($key, $value);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'ini' === pathinfo($resource, PATHINFO_EXTENSION);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/PhpFileLoader.php b/vendor/symfony/dependency-injection/Loader/PhpFileLoader.php
deleted file mode 100644
index 08c1d9a..0000000
--- a/vendor/symfony/dependency-injection/Loader/PhpFileLoader.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * PhpFileLoader loads service definitions from a PHP file.
- *
- * The PHP file is required and the $container variable can be
- * used within the file to change the container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class PhpFileLoader extends FileLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        // the container and loader variables are exposed to the included file below
-        $container = $this->container;
-        $loader = $this;
-
-        $path = $this->locator->locate($resource);
-        $this->setCurrentDir(dirname($path));
-        $this->container->addResource(new FileResource($path));
-
-        include $path;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php b/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
deleted file mode 100644
index ebe330b..0000000
--- a/vendor/symfony/dependency-injection/Loader/XmlFileLoader.php
+++ /dev/null
@@ -1,568 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\ExpressionLanguage\Expression;
-
-/**
- * XmlFileLoader loads XML files service definitions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class XmlFileLoader extends FileLoader
-{
-    const NS = 'http://symfony.com/schema/dic/services';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        $path = $this->locator->locate($resource);
-
-        $xml = $this->parseFileToDOM($path);
-
-        $this->container->addResource(new FileResource($path));
-
-        // anonymous services
-        $this->processAnonymousServices($xml, $path);
-
-        // imports
-        $this->parseImports($xml, $path);
-
-        // parameters
-        $this->parseParameters($xml);
-
-        // extensions
-        $this->loadFromExtensions($xml);
-
-        // services
-        $this->parseDefinitions($xml, $path);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Parses parameters.
-     *
-     * @param \DOMDocument $xml
-     */
-    private function parseParameters(\DOMDocument $xml)
-    {
-        if ($parameters = $this->getChildren($xml->documentElement, 'parameters')) {
-            $this->container->getParameterBag()->add($this->getArgumentsAsPhp($parameters[0], 'parameter'));
-        }
-    }
-
-    /**
-     * Parses imports.
-     *
-     * @param \DOMDocument $xml
-     * @param string       $file
-     */
-    private function parseImports(\DOMDocument $xml, $file)
-    {
-        $xpath = new \DOMXPath($xml);
-        $xpath->registerNamespace('container', self::NS);
-
-        if (false === $imports = $xpath->query('//container:imports/container:import')) {
-            return;
-        }
-
-        foreach ($imports as $import) {
-            $this->setCurrentDir(dirname($file));
-            $this->import($import->getAttribute('resource'), null, (bool) XmlUtils::phpize($import->getAttribute('ignore-errors')), $file);
-        }
-    }
-
-    /**
-     * Parses multiple definitions.
-     *
-     * @param \DOMDocument $xml
-     * @param string       $file
-     */
-    private function parseDefinitions(\DOMDocument $xml, $file)
-    {
-        $xpath = new \DOMXPath($xml);
-        $xpath->registerNamespace('container', self::NS);
-
-        if (false === $services = $xpath->query('//container:services/container:service')) {
-            return;
-        }
-
-        foreach ($services as $service) {
-            if (null !== $definition = $this->parseDefinition($service, $file)) {
-                $this->container->setDefinition((string) $service->getAttribute('id'), $definition);
-            }
-        }
-    }
-
-    /**
-     * Parses an individual Definition.
-     *
-     * @param \DOMElement $service
-     * @param string      $file
-     *
-     * @return Definition|null
-     */
-    private function parseDefinition(\DOMElement $service, $file)
-    {
-        if ($alias = $service->getAttribute('alias')) {
-            $public = true;
-            if ($publicAttr = $service->getAttribute('public')) {
-                $public = XmlUtils::phpize($publicAttr);
-            }
-            $this->container->setAlias((string) $service->getAttribute('id'), new Alias($alias, $public));
-
-            return;
-        }
-
-        if ($parent = $service->getAttribute('parent')) {
-            $definition = new DefinitionDecorator($parent);
-        } else {
-            $definition = new Definition();
-        }
-
-        foreach (array('class', 'scope', 'public', 'factory-class', 'factory-method', 'factory-service', 'synthetic', 'lazy', 'abstract') as $key) {
-            if ($value = $service->getAttribute($key)) {
-                if (in_array($key, array('factory-class', 'factory-method', 'factory-service'))) {
-                    @trigger_error(sprintf('The "%s" attribute of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use the "factory" element instead.', $key, (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
-                }
-                $method = 'set'.str_replace('-', '', $key);
-                $definition->$method(XmlUtils::phpize($value));
-            }
-        }
-
-        if ($value = $service->getAttribute('synchronized')) {
-            $triggerDeprecation = 'request' !== (string) $service->getAttribute('id');
-
-            if ($triggerDeprecation) {
-                @trigger_error(sprintf('The "synchronized" attribute of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', (string) $service->getAttribute('id'), $file), E_USER_DEPRECATED);
-            }
-
-            $definition->setSynchronized(XmlUtils::phpize($value), $triggerDeprecation);
-        }
-
-        if ($files = $this->getChildren($service, 'file')) {
-            $definition->setFile($files[0]->nodeValue);
-        }
-
-        $definition->setArguments($this->getArgumentsAsPhp($service, 'argument'));
-        $definition->setProperties($this->getArgumentsAsPhp($service, 'property'));
-
-        if ($factories = $this->getChildren($service, 'factory')) {
-            $factory = $factories[0];
-            if ($function = $factory->getAttribute('function')) {
-                $definition->setFactory($function);
-            } else {
-                $factoryService = $this->getChildren($factory, 'service');
-
-                if (isset($factoryService[0])) {
-                    $class = $this->parseDefinition($factoryService[0], $file);
-                } elseif ($childService = $factory->getAttribute('service')) {
-                    $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
-                } else {
-                    $class = $factory->getAttribute('class');
-                }
-
-                $definition->setFactory(array($class, $factory->getAttribute('method')));
-            }
-        }
-
-        if ($configurators = $this->getChildren($service, 'configurator')) {
-            $configurator = $configurators[0];
-            if ($function = $configurator->getAttribute('function')) {
-                $definition->setConfigurator($function);
-            } else {
-                $configuratorService = $this->getChildren($configurator, 'service');
-
-                if (isset($configuratorService[0])) {
-                    $class = $this->parseDefinition($configuratorService[0], $file);
-                } elseif ($childService = $configurator->getAttribute('service')) {
-                    $class = new Reference($childService, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, false);
-                } else {
-                    $class = $configurator->getAttribute('class');
-                }
-
-                $definition->setConfigurator(array($class, $configurator->getAttribute('method')));
-            }
-        }
-
-        foreach ($this->getChildren($service, 'call') as $call) {
-            $definition->addMethodCall($call->getAttribute('method'), $this->getArgumentsAsPhp($call, 'argument'));
-        }
-
-        foreach ($this->getChildren($service, 'tag') as $tag) {
-            $parameters = array();
-            foreach ($tag->attributes as $name => $node) {
-                if ('name' === $name) {
-                    continue;
-                }
-
-                if (false !== strpos($name, '-') && false === strpos($name, '_') && !array_key_exists($normalizedName = str_replace('-', '_', $name), $parameters)) {
-                    $parameters[$normalizedName] = XmlUtils::phpize($node->nodeValue);
-                }
-                // keep not normalized key for BC too
-                $parameters[$name] = XmlUtils::phpize($node->nodeValue);
-            }
-
-            $definition->addTag($tag->getAttribute('name'), $parameters);
-        }
-
-        if ($value = $service->getAttribute('decorates')) {
-            $renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null;
-            $definition->setDecoratedService($value, $renameId);
-        }
-
-        return $definition;
-    }
-
-    /**
-     * Parses a XML file to a \DOMDocument.
-     *
-     * @param string $file Path to a file
-     *
-     * @return \DOMDocument
-     *
-     * @throws InvalidArgumentException When loading of XML file returns error
-     */
-    private function parseFileToDOM($file)
-    {
-        try {
-            $dom = XmlUtils::loadFile($file, array($this, 'validateSchema'));
-        } catch (\InvalidArgumentException $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s".', $file), $e->getCode(), $e);
-        }
-
-        $this->validateExtensions($dom, $file);
-
-        return $dom;
-    }
-
-    /**
-     * Processes anonymous services.
-     *
-     * @param \DOMDocument $xml
-     * @param string       $file
-     */
-    private function processAnonymousServices(\DOMDocument $xml, $file)
-    {
-        $definitions = array();
-        $count = 0;
-
-        $xpath = new \DOMXPath($xml);
-        $xpath->registerNamespace('container', self::NS);
-
-        // anonymous services as arguments/properties
-        if (false !== $nodes = $xpath->query('//container:argument[@type="service"][not(@id)]|//container:property[@type="service"][not(@id)]')) {
-            foreach ($nodes as $node) {
-                // give it a unique name
-                $id = sprintf('%s_%d', hash('sha256', $file), ++$count);
-                $node->setAttribute('id', $id);
-
-                if ($services = $this->getChildren($node, 'service')) {
-                    $definitions[$id] = array($services[0], $file, false);
-                    $services[0]->setAttribute('id', $id);
-                }
-            }
-        }
-
-        // anonymous services "in the wild"
-        if (false !== $nodes = $xpath->query('//container:services/container:service[not(@id)]')) {
-            foreach ($nodes as $node) {
-                // give it a unique name
-                $id = sprintf('%s_%d', hash('sha256', $file), ++$count);
-                $node->setAttribute('id', $id);
-
-                if ($services = $this->getChildren($node, 'service')) {
-                    $definitions[$id] = array($node, $file, true);
-                    $services[0]->setAttribute('id', $id);
-                }
-            }
-        }
-
-        // resolve definitions
-        krsort($definitions);
-        foreach ($definitions as $id => $def) {
-            list($domElement, $file, $wild) = $def;
-
-            // anonymous services are always private
-            // we could not use the constant false here, because of XML parsing
-            $domElement->setAttribute('public', 'false');
-
-            if (null !== $definition = $this->parseDefinition($domElement, $file)) {
-                $this->container->setDefinition($id, $definition);
-            }
-
-            if (true === $wild) {
-                $tmpDomElement = new \DOMElement('_services', null, self::NS);
-                $domElement->parentNode->replaceChild($tmpDomElement, $domElement);
-                $tmpDomElement->setAttribute('id', $id);
-            } else {
-                $domElement->parentNode->removeChild($domElement);
-            }
-        }
-    }
-
-    /**
-     * Returns arguments as valid php types.
-     *
-     * @param \DOMElement $node
-     * @param string      $name
-     * @param bool        $lowercase
-     *
-     * @return mixed
-     */
-    private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
-    {
-        $arguments = array();
-        foreach ($this->getChildren($node, $name) as $arg) {
-            if ($arg->hasAttribute('name')) {
-                $arg->setAttribute('key', $arg->getAttribute('name'));
-            }
-
-            if (!$arg->hasAttribute('key')) {
-                $key = !$arguments ? 0 : max(array_keys($arguments)) + 1;
-            } else {
-                $key = $arg->getAttribute('key');
-            }
-
-            // parameter keys are case insensitive
-            if ('parameter' == $name && $lowercase) {
-                $key = strtolower($key);
-            }
-
-            // this is used by DefinitionDecorator to overwrite a specific
-            // argument of the parent definition
-            if ($arg->hasAttribute('index')) {
-                $key = 'index_'.$arg->getAttribute('index');
-            }
-
-            switch ($arg->getAttribute('type')) {
-                case 'service':
-                    $onInvalid = $arg->getAttribute('on-invalid');
-                    $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
-                    if ('ignore' == $onInvalid) {
-                        $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
-                    } elseif ('null' == $onInvalid) {
-                        $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
-                    }
-
-                    if ($strict = $arg->getAttribute('strict')) {
-                        $strict = XmlUtils::phpize($strict);
-                    } else {
-                        $strict = true;
-                    }
-
-                    $arguments[$key] = new Reference($arg->getAttribute('id'), $invalidBehavior, $strict);
-                    break;
-                case 'expression':
-                    $arguments[$key] = new Expression($arg->nodeValue);
-                    break;
-                case 'collection':
-                    $arguments[$key] = $this->getArgumentsAsPhp($arg, $name, false);
-                    break;
-                case 'string':
-                    $arguments[$key] = $arg->nodeValue;
-                    break;
-                case 'constant':
-                    $arguments[$key] = constant($arg->nodeValue);
-                    break;
-                default:
-                    $arguments[$key] = XmlUtils::phpize($arg->nodeValue);
-            }
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Get child elements by name.
-     *
-     * @param \DOMNode $node
-     * @param mixed    $name
-     *
-     * @return array
-     */
-    private function getChildren(\DOMNode $node, $name)
-    {
-        $children = array();
-        foreach ($node->childNodes as $child) {
-            if ($child instanceof \DOMElement && $child->localName === $name && $child->namespaceURI === self::NS) {
-                $children[] = $child;
-            }
-        }
-
-        return $children;
-    }
-
-    /**
-     * Validates a documents XML schema.
-     *
-     * @param \DOMDocument $dom
-     *
-     * @return bool
-     *
-     * @throws RuntimeException When extension references a non-existent XSD file
-     */
-    public function validateSchema(\DOMDocument $dom)
-    {
-        $schemaLocations = array('http://symfony.com/schema/dic/services' => str_replace('\\', '/', __DIR__.'/schema/dic/services/services-1.0.xsd'));
-
-        if ($element = $dom->documentElement->getAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'schemaLocation')) {
-            $items = preg_split('/\s+/', $element);
-            for ($i = 0, $nb = count($items); $i < $nb; $i += 2) {
-                if (!$this->container->hasExtension($items[$i])) {
-                    continue;
-                }
-
-                if (($extension = $this->container->getExtension($items[$i])) && false !== $extension->getXsdValidationBasePath()) {
-                    $path = str_replace($extension->getNamespace(), str_replace('\\', '/', $extension->getXsdValidationBasePath()).'/', $items[$i + 1]);
-
-                    if (!is_file($path)) {
-                        throw new RuntimeException(sprintf('Extension "%s" references a non-existent XSD file "%s"', get_class($extension), $path));
-                    }
-
-                    $schemaLocations[$items[$i]] = $path;
-                }
-            }
-        }
-
-        $tmpfiles = array();
-        $imports = '';
-        foreach ($schemaLocations as $namespace => $location) {
-            $parts = explode('/', $location);
-            if (0 === stripos($location, 'phar://')) {
-                $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
-                if ($tmpfile) {
-                    copy($location, $tmpfile);
-                    $tmpfiles[] = $tmpfile;
-                    $parts = explode('/', str_replace('\\', '/', $tmpfile));
-                }
-            }
-            $drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
-            $location = 'file:///'.$drive.implode('/', array_map('rawurlencode', $parts));
-
-            $imports .= sprintf('  <xsd:import namespace="%s" schemaLocation="%s" />'."\n", $namespace, $location);
-        }
-
-        $source = <<<EOF
-<?xml version="1.0" encoding="utf-8" ?>
-<xsd:schema xmlns="http://symfony.com/schema"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://symfony.com/schema"
-    elementFormDefault="qualified">
-
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
-$imports
-</xsd:schema>
-EOF
-        ;
-
-        $valid = @$dom->schemaValidateSource($source);
-
-        foreach ($tmpfiles as $tmpfile) {
-            @unlink($tmpfile);
-        }
-
-        return $valid;
-    }
-
-    /**
-     * Validates an extension.
-     *
-     * @param \DOMDocument $dom
-     * @param string       $file
-     *
-     * @throws InvalidArgumentException When no extension is found corresponding to a tag
-     */
-    private function validateExtensions(\DOMDocument $dom, $file)
-    {
-        foreach ($dom->documentElement->childNodes as $node) {
-            if (!$node instanceof \DOMElement || 'http://symfony.com/schema/dic/services' === $node->namespaceURI) {
-                continue;
-            }
-
-            // can it be handled by an extension?
-            if (!$this->container->hasExtension($node->namespaceURI)) {
-                $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getNamespace(); }, $this->container->getExtensions()));
-                throw new InvalidArgumentException(sprintf(
-                    'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
-                    $node->tagName,
-                    $file,
-                    $node->namespaceURI,
-                    $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'
-                ));
-            }
-        }
-    }
-
-    /**
-     * Loads from an extension.
-     *
-     * @param \DOMDocument $xml
-     */
-    private function loadFromExtensions(\DOMDocument $xml)
-    {
-        foreach ($xml->documentElement->childNodes as $node) {
-            if (!$node instanceof \DOMElement || $node->namespaceURI === self::NS) {
-                continue;
-            }
-
-            $values = static::convertDomElementToArray($node);
-            if (!is_array($values)) {
-                $values = array();
-            }
-
-            $this->container->loadFromExtension($node->namespaceURI, $values);
-        }
-    }
-
-    /**
-     * Converts a \DomElement object to a PHP array.
-     *
-     * The following rules applies during the conversion:
-     *
-     *  * Each tag is converted to a key value or an array
-     *    if there is more than one "value"
-     *
-     *  * The content of a tag is set under a "value" key (<foo>bar</foo>)
-     *    if the tag also has some nested tags
-     *
-     *  * The attributes are converted to keys (<foo foo="bar"/>)
-     *
-     *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
-     *
-     * @param \DomElement $element A \DomElement instance
-     *
-     * @return array A PHP array
-     */
-    public static function convertDomElementToArray(\DomElement $element)
-    {
-        return XmlUtils::convertDomElementToArray($element);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php b/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
deleted file mode 100644
index 5b3fb46..0000000
--- a/vendor/symfony/dependency-injection/Loader/YamlFileLoader.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?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\Component\DependencyInjection\Loader;
-
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
-use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Parser as YamlParser;
-use Symfony\Component\ExpressionLanguage\Expression;
-
-/**
- * YamlFileLoader loads YAML files service definitions.
- *
- * The YAML format does not support anonymous services (cf. the XML loader).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class YamlFileLoader extends FileLoader
-{
-    private $yamlParser;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        $path = $this->locator->locate($resource);
-
-        $content = $this->loadFile($path);
-
-        $this->container->addResource(new FileResource($path));
-
-        // empty file
-        if (null === $content) {
-            return;
-        }
-
-        // imports
-        $this->parseImports($content, $path);
-
-        // parameters
-        if (isset($content['parameters'])) {
-            if (!is_array($content['parameters'])) {
-                throw new InvalidArgumentException(sprintf('The "parameters" key should contain an array in %s. Check your YAML syntax.', $resource));
-            }
-
-            foreach ($content['parameters'] as $key => $value) {
-                $this->container->setParameter($key, $this->resolveServices($value));
-            }
-        }
-
-        // extensions
-        $this->loadFromExtensions($content);
-
-        // services
-        $this->parseDefinitions($content, $resource);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yml', 'yaml'), true);
-    }
-
-    /**
-     * Parses all imports.
-     *
-     * @param array  $content
-     * @param string $file
-     */
-    private function parseImports($content, $file)
-    {
-        if (!isset($content['imports'])) {
-            return;
-        }
-
-        if (!is_array($content['imports'])) {
-            throw new InvalidArgumentException(sprintf('The "imports" key should contain an array in %s. Check your YAML syntax.', $file));
-        }
-
-        foreach ($content['imports'] as $import) {
-            if (!is_array($import)) {
-                throw new InvalidArgumentException(sprintf('The values in the "imports" key should be arrays in %s. Check your YAML syntax.', $file));
-            }
-
-            $this->setCurrentDir(dirname($file));
-            $this->import($import['resource'], null, isset($import['ignore_errors']) ? (bool) $import['ignore_errors'] : false, $file);
-        }
-    }
-
-    /**
-     * Parses definitions.
-     *
-     * @param array  $content
-     * @param string $file
-     */
-    private function parseDefinitions($content, $file)
-    {
-        if (!isset($content['services'])) {
-            return;
-        }
-
-        if (!is_array($content['services'])) {
-            throw new InvalidArgumentException(sprintf('The "services" key should contain an array in %s. Check your YAML syntax.', $file));
-        }
-
-        foreach ($content['services'] as $id => $service) {
-            $this->parseDefinition($id, $service, $file);
-        }
-    }
-
-    /**
-     * Parses a definition.
-     *
-     * @param string $id
-     * @param array  $service
-     * @param string $file
-     *
-     * @throws InvalidArgumentException When tags are invalid
-     */
-    private function parseDefinition($id, $service, $file)
-    {
-        if (is_string($service) && 0 === strpos($service, '@')) {
-            $this->container->setAlias($id, substr($service, 1));
-
-            return;
-        }
-
-        if (!is_array($service)) {
-            throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', gettype($service), $id, $file));
-        }
-
-        if (isset($service['alias'])) {
-            $public = !array_key_exists('public', $service) || (bool) $service['public'];
-            $this->container->setAlias($id, new Alias($service['alias'], $public));
-
-            return;
-        }
-
-        if (isset($service['parent'])) {
-            $definition = new DefinitionDecorator($service['parent']);
-        } else {
-            $definition = new Definition();
-        }
-
-        if (isset($service['class'])) {
-            $definition->setClass($service['class']);
-        }
-
-        if (isset($service['scope'])) {
-            $definition->setScope($service['scope']);
-        }
-
-        if (isset($service['synthetic'])) {
-            $definition->setSynthetic($service['synthetic']);
-        }
-
-        if (isset($service['synchronized'])) {
-            @trigger_error(sprintf('The "synchronized" key of service "%s" in file "%s" is deprecated since version 2.7 and will be removed in 3.0.', $id, $file), E_USER_DEPRECATED);
-            $definition->setSynchronized($service['synchronized'], 'request' !== $id);
-        }
-
-        if (isset($service['lazy'])) {
-            $definition->setLazy($service['lazy']);
-        }
-
-        if (isset($service['public'])) {
-            $definition->setPublic($service['public']);
-        }
-
-        if (isset($service['abstract'])) {
-            $definition->setAbstract($service['abstract']);
-        }
-
-        if (isset($service['factory'])) {
-            if (is_string($service['factory'])) {
-                if (strpos($service['factory'], ':') !== false && strpos($service['factory'], '::') === false) {
-                    $parts = explode(':', $service['factory']);
-                    $definition->setFactory(array($this->resolveServices('@'.$parts[0]), $parts[1]));
-                } else {
-                    $definition->setFactory($service['factory']);
-                }
-            } else {
-                $definition->setFactory(array($this->resolveServices($service['factory'][0]), $service['factory'][1]));
-            }
-        }
-
-        if (isset($service['factory_class'])) {
-            @trigger_error(sprintf('The "factory_class" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
-            $definition->setFactoryClass($service['factory_class']);
-        }
-
-        if (isset($service['factory_method'])) {
-            @trigger_error(sprintf('The "factory_method" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
-            $definition->setFactoryMethod($service['factory_method']);
-        }
-
-        if (isset($service['factory_service'])) {
-            @trigger_error(sprintf('The "factory_service" key of service "%s" in file "%s" is deprecated since version 2.6 and will be removed in 3.0. Use "factory" instead.', $id, $file), E_USER_DEPRECATED);
-            $definition->setFactoryService($service['factory_service']);
-        }
-
-        if (isset($service['file'])) {
-            $definition->setFile($service['file']);
-        }
-
-        if (isset($service['arguments'])) {
-            $definition->setArguments($this->resolveServices($service['arguments']));
-        }
-
-        if (isset($service['properties'])) {
-            $definition->setProperties($this->resolveServices($service['properties']));
-        }
-
-        if (isset($service['configurator'])) {
-            if (is_string($service['configurator'])) {
-                $definition->setConfigurator($service['configurator']);
-            } else {
-                $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
-            }
-        }
-
-        if (isset($service['calls'])) {
-            if (!is_array($service['calls'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "calls" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-            }
-
-            foreach ($service['calls'] as $call) {
-                if (isset($call['method'])) {
-                    $method = $call['method'];
-                    $args = isset($call['arguments']) ? $this->resolveServices($call['arguments']) : array();
-                } else {
-                    $method = $call[0];
-                    $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
-                }
-
-                $definition->addMethodCall($method, $args);
-            }
-        }
-
-        if (isset($service['tags'])) {
-            if (!is_array($service['tags'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-            }
-
-            foreach ($service['tags'] as $tag) {
-                if (!is_array($tag)) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-                }
-
-                if (!isset($tag['name'])) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
-                }
-
-                $name = $tag['name'];
-                unset($tag['name']);
-
-                foreach ($tag as $attribute => $value) {
-                    if (!is_scalar($value) && null !== $value) {
-                        throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
-                    }
-                }
-
-                $definition->addTag($name, $tag);
-            }
-        }
-
-        if (isset($service['decorates'])) {
-            $renameId = isset($service['decoration_inner_name']) ? $service['decoration_inner_name'] : null;
-            $definition->setDecoratedService($service['decorates'], $renameId);
-        }
-
-        $this->container->setDefinition($id, $definition);
-    }
-
-    /**
-     * Loads a YAML file.
-     *
-     * @param string $file
-     *
-     * @return array The file content
-     *
-     * @throws InvalidArgumentException when the given file is not a local file or when it does not exist
-     */
-    protected function loadFile($file)
-    {
-        if (!class_exists('Symfony\Component\Yaml\Parser')) {
-            throw new RuntimeException('Unable to load YAML config files as the Symfony Yaml Component is not installed.');
-        }
-
-        if (!stream_is_local($file)) {
-            throw new InvalidArgumentException(sprintf('This is not a local file "%s".', $file));
-        }
-
-        if (!file_exists($file)) {
-            throw new InvalidArgumentException(sprintf('The service file "%s" is not valid.', $file));
-        }
-
-        if (null === $this->yamlParser) {
-            $this->yamlParser = new YamlParser();
-        }
-
-        try {
-            $configuration = $this->yamlParser->parse(file_get_contents($file));
-        } catch (ParseException $e) {
-            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);
-        }
-
-        return $this->validate($configuration, $file);
-    }
-
-    /**
-     * Validates a YAML file.
-     *
-     * @param mixed  $content
-     * @param string $file
-     *
-     * @return array
-     *
-     * @throws InvalidArgumentException When service file is not valid
-     */
-    private function validate($content, $file)
-    {
-        if (null === $content) {
-            return $content;
-        }
-
-        if (!is_array($content)) {
-            throw new InvalidArgumentException(sprintf('The service file "%s" is not valid. It should contain an array. Check your YAML syntax.', $file));
-        }
-
-        foreach ($content as $namespace => $data) {
-            if (in_array($namespace, array('imports', 'parameters', 'services'))) {
-                continue;
-            }
-
-            if (!$this->container->hasExtension($namespace)) {
-                $extensionNamespaces = array_filter(array_map(function ($ext) { return $ext->getAlias(); }, $this->container->getExtensions()));
-                throw new InvalidArgumentException(sprintf(
-                    'There is no extension able to load the configuration for "%s" (in %s). Looked for namespace "%s", found %s',
-                    $namespace,
-                    $file,
-                    $namespace,
-                    $extensionNamespaces ? sprintf('"%s"', implode('", "', $extensionNamespaces)) : 'none'
-                ));
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Resolves services.
-     *
-     * @param string|array $value
-     *
-     * @return array|string|Reference
-     */
-    private function resolveServices($value)
-    {
-        if (is_array($value)) {
-            $value = array_map(array($this, 'resolveServices'), $value);
-        } elseif (is_string($value) &&  0 === strpos($value, '@=')) {
-            return new Expression(substr($value, 2));
-        } elseif (is_string($value) &&  0 === strpos($value, '@')) {
-            if (0 === strpos($value, '@@')) {
-                $value = substr($value, 1);
-                $invalidBehavior = null;
-            } elseif (0 === strpos($value, '@?')) {
-                $value = substr($value, 2);
-                $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
-            } else {
-                $value = substr($value, 1);
-                $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
-            }
-
-            if ('=' === substr($value, -1)) {
-                $value = substr($value, 0, -1);
-                $strict = false;
-            } else {
-                $strict = true;
-            }
-
-            if (null !== $invalidBehavior) {
-                $value = new Reference($value, $invalidBehavior, $strict);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Loads from Extensions.
-     *
-     * @param array $content
-     */
-    private function loadFromExtensions($content)
-    {
-        foreach ($content as $namespace => $values) {
-            if (in_array($namespace, array('imports', 'parameters', 'services'))) {
-                continue;
-            }
-
-            if (!is_array($values)) {
-                $values = array();
-            }
-
-            $this->container->loadFromExtension($namespace, $values);
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd b/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd
deleted file mode 100644
index ac2cba7..0000000
--- a/vendor/symfony/dependency-injection/Loader/schema/dic/services/services-1.0.xsd
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://symfony.com/schema/dic/services"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     targetNamespace="http://symfony.com/schema/dic/services"
-     elementFormDefault="qualified">
-
-  <xsd:annotation>
-    <xsd:documentation><![CDATA[
-      Symfony XML Services Schema, version 1.0
-      Authors: Fabien Potencier
-
-      This defines a way to describe PHP objects (services) and their
-      dependencies.
-    ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:element name="container" type="container" />
-
-  <xsd:complexType name="container">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        The root element of a service file.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="imports" type="imports" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="parameters" type="parameters" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="services" type="services" minOccurs="0" maxOccurs="1" />
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="services">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Enclosing element for the definition of all services
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="imports">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Enclosing element for the import elements
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element name="import" type="import" />
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:complexType name="import">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Import an external resource defining other services or parameters
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="resource" type="xsd:string" use="required" />
-    <xsd:attribute name="ignore-errors" type="boolean" />
-  </xsd:complexType>
-
-  <xsd:complexType name="callable">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:element name="service" type="service" minOccurs="0" maxOccurs="1" />
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="service" type="xsd:string" />
-    <xsd:attribute name="class" type="xsd:string" />
-    <xsd:attribute name="method" type="xsd:string" />
-    <xsd:attribute name="function" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="service">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="file" type="xsd:string" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="configurator" type="callable" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="factory" type="callable" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="call" type="call" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="tag" type="tag" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="class" type="xsd:string" />
-    <xsd:attribute name="scope" type="xsd:string" />
-    <xsd:attribute name="public" type="boolean" />
-    <xsd:attribute name="synthetic" type="boolean" />
-    <xsd:attribute name="synchronized" type="boolean" />
-    <xsd:attribute name="lazy" type="boolean" />
-    <xsd:attribute name="abstract" type="boolean" />
-    <xsd:attribute name="factory-class" type="xsd:string" />
-    <xsd:attribute name="factory-method" type="xsd:string" />
-    <xsd:attribute name="factory-service" type="xsd:string" />
-    <xsd:attribute name="alias" type="xsd:string" />
-    <xsd:attribute name="parent" type="xsd:string" />
-    <xsd:attribute name="decorates" type="xsd:string" />
-    <xsd:attribute name="decoration-inner-name" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tag">
-    <xsd:attribute name="name" type="xsd:string" />
-    <xsd:anyAttribute namespace="##any" processContents="lax" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parameters">
-    <xsd:choice minOccurs="1" maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parameter" />
-    </xsd:choice>
-    <xsd:attribute name="type" type="parameter_type" />
-    <xsd:attribute name="key" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="parameter" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="parameter" type="parameter" />
-    </xsd:choice>
-    <xsd:attribute name="type" type="parameter_type" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="key" type="xsd:string" />
-    <xsd:attribute name="on-invalid" type="invalid_sequence" />
-  </xsd:complexType>
-
-  <xsd:complexType name="property" mixed="true">
-    <xsd:choice minOccurs="0" maxOccurs="1">
-      <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-    <xsd:attribute name="type" type="argument_type" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="key" type="xsd:string" />
-    <xsd:attribute name="name" type="xsd:string" />
-    <xsd:attribute name="on-invalid" type="xsd:string" />
-    <xsd:attribute name="strict" type="boolean" />
-  </xsd:complexType>
-
-  <xsd:complexType name="argument" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-    <xsd:attribute name="type" type="argument_type" />
-    <xsd:attribute name="id" type="xsd:string" />
-    <xsd:attribute name="key" type="xsd:string" />
-    <xsd:attribute name="index" type="xsd:integer" />
-    <xsd:attribute name="on-invalid" type="xsd:string" />
-    <xsd:attribute name="strict" type="boolean" />
-  </xsd:complexType>
-
-  <xsd:complexType name="call" mixed="true">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="argument" type="argument" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="service" type="service" />
-    </xsd:choice>
-    <xsd:attribute name="method" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:simpleType name="parameter_type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="collection" />
-      <xsd:enumeration value="string" />
-      <xsd:enumeration value="constant" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="argument_type">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="collection" />
-      <xsd:enumeration value="service" />
-      <xsd:enumeration value="expression" />
-      <xsd:enumeration value="string" />
-      <xsd:enumeration value="constant" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="invalid_sequence">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="null" />
-      <xsd:enumeration value="ignore" />
-      <xsd:enumeration value="exception" />
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="boolean">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(%.+%|true|false)" />
-    </xsd:restriction>
-  </xsd:simpleType>
-</xsd:schema>
diff --git a/vendor/symfony/dependency-injection/Parameter.php b/vendor/symfony/dependency-injection/Parameter.php
deleted file mode 100644
index 5431ed8..0000000
--- a/vendor/symfony/dependency-injection/Parameter.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * Parameter represents a parameter reference.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Parameter
-{
-    private $id;
-
-    /**
-     * Constructor.
-     *
-     * @param string $id The parameter key
-     */
-    public function __construct($id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * __toString.
-     *
-     * @return string The parameter key
-     */
-    public function __toString()
-    {
-        return (string) $this->id;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php b/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php
deleted file mode 100644
index d9fe9ec..0000000
--- a/vendor/symfony/dependency-injection/ParameterBag/FrozenParameterBag.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Component\DependencyInjection\ParameterBag;
-
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-
-/**
- * Holds read-only parameters.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FrozenParameterBag extends ParameterBag
-{
-    /**
-     * Constructor.
-     *
-     * For performance reasons, the constructor assumes that
-     * all keys are already lowercased.
-     *
-     * This is always the case when used internally.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function __construct(array $parameters = array())
-    {
-        $this->parameters = $parameters;
-        $this->resolved = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        throw new LogicException('Impossible to call clear() on a frozen ParameterBag.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add(array $parameters)
-    {
-        throw new LogicException('Impossible to call add() on a frozen ParameterBag.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($name, $value)
-    {
-        throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($name)
-    {
-        throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php b/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php
deleted file mode 100644
index 64a7789..0000000
--- a/vendor/symfony/dependency-injection/ParameterBag/ParameterBag.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?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\Component\DependencyInjection\ParameterBag;
-
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-use Symfony\Component\DependencyInjection\Exception\ParameterCircularReferenceException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-
-/**
- * Holds parameters.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParameterBag implements ParameterBagInterface
-{
-    protected $parameters = array();
-    protected $resolved = false;
-
-    /**
-     * Constructor.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function __construct(array $parameters = array())
-    {
-        $this->add($parameters);
-    }
-
-    /**
-     * Clears all parameters.
-     */
-    public function clear()
-    {
-        $this->parameters = array();
-    }
-
-    /**
-     * Adds parameters to the service container parameters.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function add(array $parameters)
-    {
-        foreach ($parameters as $key => $value) {
-            $this->parameters[strtolower($key)] = $value;
-        }
-    }
-
-    /**
-     * Gets the service container parameters.
-     *
-     * @return array An array of parameters
-     */
-    public function all()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Gets a service container parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
-     *
-     * @throws ParameterNotFoundException if the parameter is not defined
-     */
-    public function get($name)
-    {
-        $name = strtolower($name);
-
-        if (!array_key_exists($name, $this->parameters)) {
-            if (!$name) {
-                throw new ParameterNotFoundException($name);
-            }
-
-            $alternatives = array();
-            foreach ($this->parameters as $key => $parameterValue) {
-                $lev = levenshtein($name, $key);
-                if ($lev <= strlen($name) / 3 || false !== strpos($key, $name)) {
-                    $alternatives[] = $key;
-                }
-            }
-
-            throw new ParameterNotFoundException($name, null, null, null, $alternatives);
-        }
-
-        return $this->parameters[$name];
-    }
-
-    /**
-     * Sets a service container parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
-     */
-    public function set($name, $value)
-    {
-        $this->parameters[strtolower($name)] = $value;
-    }
-
-    /**
-     * Returns true if a parameter name is defined.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool true if the parameter name is defined, false otherwise
-     */
-    public function has($name)
-    {
-        return array_key_exists(strtolower($name), $this->parameters);
-    }
-
-    /**
-     * Removes a parameter.
-     *
-     * @param string $name The parameter name
-     */
-    public function remove($name)
-    {
-        unset($this->parameters[strtolower($name)]);
-    }
-
-    /**
-     * Replaces parameter placeholders (%name%) by their values for all parameters.
-     */
-    public function resolve()
-    {
-        if ($this->resolved) {
-            return;
-        }
-
-        $parameters = array();
-        foreach ($this->parameters as $key => $value) {
-            try {
-                $value = $this->resolveValue($value);
-                $parameters[$key] = $this->unescapeValue($value);
-            } catch (ParameterNotFoundException $e) {
-                $e->setSourceKey($key);
-
-                throw $e;
-            }
-        }
-
-        $this->parameters = $parameters;
-        $this->resolved = true;
-    }
-
-    /**
-     * Replaces parameter placeholders (%name%) by their values.
-     *
-     * @param mixed $value     A value
-     * @param array $resolving An array of keys that are being resolved (used internally to detect circular references)
-     *
-     * @return mixed The resolved value
-     *
-     * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
-     * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
-     */
-    public function resolveValue($value, array $resolving = array())
-    {
-        if (is_array($value)) {
-            $args = array();
-            foreach ($value as $k => $v) {
-                $args[$this->resolveValue($k, $resolving)] = $this->resolveValue($v, $resolving);
-            }
-
-            return $args;
-        }
-
-        if (!is_string($value)) {
-            return $value;
-        }
-
-        return $this->resolveString($value, $resolving);
-    }
-
-    /**
-     * Resolves parameters inside a string.
-     *
-     * @param string $value     The string to resolve
-     * @param array  $resolving An array of keys that are being resolved (used internally to detect circular references)
-     *
-     * @return string The resolved string
-     *
-     * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
-     * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
-     */
-    public function resolveString($value, array $resolving = array())
-    {
-        // we do this to deal with non string values (Boolean, integer, ...)
-        // as the preg_replace_callback throw an exception when trying
-        // a non-string in a parameter value
-        if (preg_match('/^%([^%\s]+)%$/', $value, $match)) {
-            $key = strtolower($match[1]);
-
-            if (isset($resolving[$key])) {
-                throw new ParameterCircularReferenceException(array_keys($resolving));
-            }
-
-            $resolving[$key] = true;
-
-            return $this->resolved ? $this->get($key) : $this->resolveValue($this->get($key), $resolving);
-        }
-
-        $self = $this;
-
-        return preg_replace_callback('/%%|%([^%\s]+)%/', function ($match) use ($self, $resolving, $value) {
-            // skip %%
-            if (!isset($match[1])) {
-                return '%%';
-            }
-
-            $key = strtolower($match[1]);
-            if (isset($resolving[$key])) {
-                throw new ParameterCircularReferenceException(array_keys($resolving));
-            }
-
-            $resolved = $self->get($key);
-
-            if (!is_string($resolved) && !is_numeric($resolved)) {
-                throw new RuntimeException(sprintf('A string value must be composed of strings and/or numbers, but found parameter "%s" of type %s inside string value "%s".', $key, gettype($resolved), $value));
-            }
-
-            $resolved = (string) $resolved;
-            $resolving[$key] = true;
-
-            return $self->isResolved() ? $resolved : $self->resolveString($resolved, $resolving);
-        }, $value);
-    }
-
-    public function isResolved()
-    {
-        return $this->resolved;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function escapeValue($value)
-    {
-        if (is_string($value)) {
-            return str_replace('%', '%%', $value);
-        }
-
-        if (is_array($value)) {
-            $result = array();
-            foreach ($value as $k => $v) {
-                $result[$k] = $this->escapeValue($v);
-            }
-
-            return $result;
-        }
-
-        return $value;
-    }
-
-    public function unescapeValue($value)
-    {
-        if (is_string($value)) {
-            return str_replace('%%', '%', $value);
-        }
-
-        if (is_array($value)) {
-            $result = array();
-            foreach ($value as $k => $v) {
-                $result[$k] = $this->unescapeValue($v);
-            }
-
-            return $result;
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ParameterBag/ParameterBagInterface.php b/vendor/symfony/dependency-injection/ParameterBag/ParameterBagInterface.php
deleted file mode 100644
index 3291b37..0000000
--- a/vendor/symfony/dependency-injection/ParameterBag/ParameterBagInterface.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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\Component\DependencyInjection\ParameterBag;
-
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-
-/**
- * ParameterBagInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ParameterBagInterface
-{
-    /**
-     * Clears all parameters.
-     *
-     * @throws LogicException if the ParameterBagInterface can not be cleared
-     */
-    public function clear();
-
-    /**
-     * Adds parameters to the service container parameters.
-     *
-     * @param array $parameters An array of parameters
-     *
-     * @throws LogicException if the parameter can not be added
-     */
-    public function add(array $parameters);
-
-    /**
-     * Gets the service container parameters.
-     *
-     * @return array An array of parameters
-     */
-    public function all();
-
-    /**
-     * Gets a service container parameter.
-     *
-     * @param string $name The parameter name
-     *
-     * @return mixed The parameter value
-     *
-     * @throws ParameterNotFoundException if the parameter is not defined
-     */
-    public function get($name);
-
-    /**
-     * Sets a service container parameter.
-     *
-     * @param string $name  The parameter name
-     * @param mixed  $value The parameter value
-     *
-     * @throws LogicException if the parameter can not be set
-     */
-    public function set($name, $value);
-
-    /**
-     * Returns true if a parameter name is defined.
-     *
-     * @param string $name The parameter name
-     *
-     * @return bool true if the parameter name is defined, false otherwise
-     */
-    public function has($name);
-
-    /**
-     * Replaces parameter placeholders (%name%) by their values for all parameters.
-     */
-    public function resolve();
-
-    /**
-     * Replaces parameter placeholders (%name%) by their values.
-     *
-     * @param mixed $value A value
-     *
-     * @throws ParameterNotFoundException if a placeholder references a parameter that does not exist
-     */
-    public function resolveValue($value);
-
-    /**
-     * Escape parameter placeholders %.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public function escapeValue($value);
-
-    /**
-     * Unescape parameter placeholders %.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public function unescapeValue($value);
-}
diff --git a/vendor/symfony/dependency-injection/README.md b/vendor/symfony/dependency-injection/README.md
deleted file mode 100644
index 19a1142..0000000
--- a/vendor/symfony/dependency-injection/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-DependencyInjection Component
-=============================
-
-DependencyInjection manages your services via a robust and flexible Dependency
-Injection Container.
-
-Here is a simple example that shows how to register services and parameters:
-
-```php
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-$sc = new ContainerBuilder();
-$sc
-    ->register('foo', '%foo.class%')
-    ->addArgument(new Reference('bar'))
-;
-$sc->setParameter('foo.class', 'Foo');
-
-$sc->get('foo');
-```
-
-Method Calls (Setter Injection):
-
-```php
-$sc = new ContainerBuilder();
-
-$sc
-    ->register('bar', '%bar.class%')
-    ->addMethodCall('setFoo', array(new Reference('foo')))
-;
-$sc->setParameter('bar.class', 'Bar');
-
-$sc->get('bar');
-```
-
-Factory Class:
-
-If your service is retrieved by calling a static method:
-
-```php
-$sc = new ContainerBuilder();
-
-$sc
-    ->register('bar', '%bar.class%')
-    ->setFactory(array('%bar.class%', 'getInstance'))
-    ->addArgument('Aarrg!!!')
-;
-$sc->setParameter('bar.class', 'Bar');
-
-$sc->get('bar');
-```
-
-File Include:
-
-For some services, especially those that are difficult or impossible to
-autoload, you may need the container to include a file before
-instantiating your class.
-
-```php
-$sc = new ContainerBuilder();
-
-$sc
-    ->register('bar', '%bar.class%')
-    ->setFile('/path/to/file')
-    ->addArgument('Aarrg!!!')
-;
-$sc->setParameter('bar.class', 'Bar');
-
-$sc->get('bar');
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/DependencyInjection/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/dependency-injection/Reference.php b/vendor/symfony/dependency-injection/Reference.php
deleted file mode 100644
index 6a48249..0000000
--- a/vendor/symfony/dependency-injection/Reference.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * Reference represents a service reference.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Reference
-{
-    private $id;
-    private $invalidBehavior;
-    private $strict;
-
-    /**
-     * Constructor.
-     *
-     * @param string $id              The service identifier
-     * @param int    $invalidBehavior The behavior when the service does not exist
-     * @param bool   $strict          Sets how this reference is validated
-     *
-     * @see Container
-     */
-    public function __construct($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $strict = true)
-    {
-        $this->id = strtolower($id);
-        $this->invalidBehavior = $invalidBehavior;
-        $this->strict = $strict;
-    }
-
-    /**
-     * __toString.
-     *
-     * @return string The service identifier
-     */
-    public function __toString()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the behavior to be used when the service does not exist.
-     *
-     * @return int
-     */
-    public function getInvalidBehavior()
-    {
-        return $this->invalidBehavior;
-    }
-
-    /**
-     * Returns true when this Reference is strict.
-     *
-     * @return bool
-     */
-    public function isStrict()
-    {
-        return $this->strict;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/Scope.php b/vendor/symfony/dependency-injection/Scope.php
deleted file mode 100644
index 737fe26..0000000
--- a/vendor/symfony/dependency-injection/Scope.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * Scope class.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Scope implements ScopeInterface
-{
-    private $name;
-    private $parentName;
-
-    public function __construct($name, $parentName = ContainerInterface::SCOPE_CONTAINER)
-    {
-        $this->name = $name;
-        $this->parentName = $parentName;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getParentName()
-    {
-        return $this->parentName;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/ScopeInterface.php b/vendor/symfony/dependency-injection/ScopeInterface.php
deleted file mode 100644
index ea55165..0000000
--- a/vendor/symfony/dependency-injection/ScopeInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * Scope Interface.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface ScopeInterface
-{
-    public function getName();
-
-    public function getParentName();
-}
diff --git a/vendor/symfony/dependency-injection/SimpleXMLElement.php b/vendor/symfony/dependency-injection/SimpleXMLElement.php
deleted file mode 100644
index 63d44ea..0000000
--- a/vendor/symfony/dependency-injection/SimpleXMLElement.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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\Component\DependencyInjection;
-
-@trigger_error('The '.__NAMESPACE__.'\SimpleXMLElement method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\ExpressionLanguage\Expression;
-
-/**
- * SimpleXMLElement class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class SimpleXMLElement extends \SimpleXMLElement
-{
-    /**
-     * Converts an attribute as a PHP type.
-     *
-     * @param string $name
-     *
-     * @return mixed
-     */
-    public function getAttributeAsPhp($name)
-    {
-        return self::phpize($this[$name]);
-    }
-
-    /**
-     * Returns arguments as valid PHP types.
-     *
-     * @param string $name
-     * @param bool   $lowercase
-     *
-     * @return mixed
-     */
-    public function getArgumentsAsPhp($name, $lowercase = true)
-    {
-        $arguments = array();
-        foreach ($this->$name as $arg) {
-            if (isset($arg['name'])) {
-                $arg['key'] = (string) $arg['name'];
-            }
-            $key = isset($arg['key']) ? (string) $arg['key'] : (!$arguments ? 0 : max(array_keys($arguments)) + 1);
-
-            // parameter keys are case insensitive
-            if ('parameter' == $name && $lowercase) {
-                $key = strtolower($key);
-            }
-
-            // this is used by DefinitionDecorator to overwrite a specific
-            // argument of the parent definition
-            if (isset($arg['index'])) {
-                $key = 'index_'.$arg['index'];
-            }
-
-            switch ($arg['type']) {
-                case 'service':
-                    $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
-                    if (isset($arg['on-invalid']) && 'ignore' == $arg['on-invalid']) {
-                        $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
-                    } elseif (isset($arg['on-invalid']) && 'null' == $arg['on-invalid']) {
-                        $invalidBehavior = ContainerInterface::NULL_ON_INVALID_REFERENCE;
-                    }
-
-                    if (isset($arg['strict'])) {
-                        $strict = self::phpize($arg['strict']);
-                    } else {
-                        $strict = true;
-                    }
-
-                    $arguments[$key] = new Reference((string) $arg['id'], $invalidBehavior, $strict);
-                    break;
-                case 'expression':
-                    $arguments[$key] = new Expression((string) $arg);
-                    break;
-                case 'collection':
-                    $arguments[$key] = $arg->getArgumentsAsPhp($name, false);
-                    break;
-                case 'string':
-                    $arguments[$key] = (string) $arg;
-                    break;
-                case 'constant':
-                    $arguments[$key] = constant((string) $arg);
-                    break;
-                default:
-                    $arguments[$key] = self::phpize($arg);
-            }
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Converts an xml value to a PHP type.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public static function phpize($value)
-    {
-        return XmlUtils::phpize($value);
-    }
-}
diff --git a/vendor/symfony/dependency-injection/TaggedContainerInterface.php b/vendor/symfony/dependency-injection/TaggedContainerInterface.php
deleted file mode 100644
index 90b297f..0000000
--- a/vendor/symfony/dependency-injection/TaggedContainerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * TaggedContainerInterface is the interface implemented when a container knows how to deals with tags.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface TaggedContainerInterface extends ContainerInterface
-{
-    /**
-     * Returns service ids for a given tag.
-     *
-     * @param string $name The tag name
-     *
-     * @return array An array of tags
-     */
-    public function findTaggedServiceIds($name);
-}
diff --git a/vendor/symfony/dependency-injection/Variable.php b/vendor/symfony/dependency-injection/Variable.php
deleted file mode 100644
index e502356..0000000
--- a/vendor/symfony/dependency-injection/Variable.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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\Component\DependencyInjection;
-
-/**
- * Represents a variable.
- *
- *     $var = new Variable('a');
- *
- * will be dumped as
- *
- *     $a
- *
- * by the PHP dumper.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Variable
-{
-    private $name;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Converts the object to a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->name;
-    }
-}
diff --git a/vendor/symfony/dependency-injection/composer.json b/vendor/symfony/dependency-injection/composer.json
deleted file mode 100644
index 87ea6fd..0000000
--- a/vendor/symfony/dependency-injection/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "symfony/dependency-injection",
-    "type": "library",
-    "description": "Symfony DependencyInjection Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/yaml": "~2.1",
-        "symfony/config": "~2.2",
-        "symfony/expression-language": "~2.6"
-    },
-    "conflict": {
-        "symfony/expression-language": "<2.6"
-    },
-    "suggest": {
-        "symfony/yaml": "",
-        "symfony/config": "",
-        "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/dependency-injection/phpunit.xml.dist b/vendor/symfony/dependency-injection/phpunit.xml.dist
deleted file mode 100644
index 86252d0..0000000
--- a/vendor/symfony/dependency-injection/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony DependencyInjection Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/dom-crawler/.gitignore b/vendor/symfony/dom-crawler/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/dom-crawler/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/dom-crawler/CHANGELOG.md b/vendor/symfony/dom-crawler/CHANGELOG.md
deleted file mode 100644
index 48fd323..0000000
--- a/vendor/symfony/dom-crawler/CHANGELOG.md
+++ /dev/null
@@ -1,45 +0,0 @@
-CHANGELOG
-=========
-
-2.5.0
------
-
-* [BC BREAK] The default value for checkbox and radio inputs without a value attribute have changed
-  from '1' to 'on' to match the HTML specification.
-* [BC BREAK] The typehints on the `Link`, `Form` and `FormField` classes have been changed from
-  `\DOMNode` to `DOMElement`. Using any other type of `DOMNode` was triggering fatal errors in previous
-  versions. Code extending these classes will need to update the typehints when overwriting these methods.
-
-2.4.0
------
-
- * `Crawler::addXmlContent()` removes the default document namespace again if it's an only namespace.
- * added support for automatic discovery and explicit registration of document
-   namespaces for `Crawler::filterXPath()` and `Crawler::filter()`
- * improved content type guessing in `Crawler::addContent()`
- * [BC BREAK] `Crawler::addXmlContent()` no longer removes the default document
-   namespace
-
-2.3.0
------
-
- * added Crawler::html()
- * [BC BREAK] Crawler::each() and Crawler::reduce() now return Crawler instances instead of DomElement instances
- * added schema relative URL support to links
- * added support for HTML5 'form' attribute
-
-2.2.0
------
-
- * added a way to set raw path to the file in FileFormField - necessary for
-   simulating HTTP requests
-
-2.1.0
------
-
- * added support for the HTTP PATCH method
- * refactored the Form class internals to support multi-dimensional fields
-   (the public API is backward compatible)
- * added a way to get parsing errors for Crawler::addHtmlContent() and
-   Crawler::addXmlContent() via libxml functions
- * added support for submitting a form without a submit button
diff --git a/vendor/symfony/dom-crawler/Crawler.php b/vendor/symfony/dom-crawler/Crawler.php
deleted file mode 100644
index 94e0a21..0000000
--- a/vendor/symfony/dom-crawler/Crawler.php
+++ /dev/null
@@ -1,1016 +0,0 @@
-<?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\Component\DomCrawler;
-
-use Symfony\Component\CssSelector\CssSelector;
-
-/**
- * Crawler eases navigation of a list of \DOMElement objects.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Crawler extends \SplObjectStorage
-{
-    /**
-     * @var string The current URI
-     */
-    protected $uri;
-
-    /**
-     * @var string The default namespace prefix to be used with XPath and CSS expressions
-     */
-    private $defaultNamespacePrefix = 'default';
-
-    /**
-     * @var array A map of manually registered namespaces
-     */
-    private $namespaces = array();
-
-    /**
-     * @var string The base href value
-     */
-    private $baseHref;
-
-    /**
-     * Constructor.
-     *
-     * @param mixed  $node       A Node to use as the base for the crawling
-     * @param string $currentUri The current URI
-     * @param string $baseHref   The base href value
-     */
-    public function __construct($node = null, $currentUri = null, $baseHref = null)
-    {
-        $this->uri = $currentUri;
-        $this->baseHref = $baseHref ?: $currentUri;
-
-        $this->add($node);
-    }
-
-    /**
-     * Removes all the nodes.
-     */
-    public function clear()
-    {
-        $this->removeAll($this);
-    }
-
-    /**
-     * Adds a node to the current list of nodes.
-     *
-     * This method uses the appropriate specialized add*() method based
-     * on the type of the argument.
-     *
-     * @param \DOMNodeList|\DOMNode|array|string|null $node A node
-     *
-     * @throws \InvalidArgumentException When node is not the expected type.
-     */
-    public function add($node)
-    {
-        if ($node instanceof \DOMNodeList) {
-            $this->addNodeList($node);
-        } elseif ($node instanceof \DOMNode) {
-            $this->addNode($node);
-        } elseif (is_array($node)) {
-            $this->addNodes($node);
-        } elseif (is_string($node)) {
-            $this->addContent($node);
-        } elseif (null !== $node) {
-            throw new \InvalidArgumentException(sprintf('Expecting a DOMNodeList or DOMNode instance, an array, a string, or null, but got "%s".', is_object($node) ? get_class($node) : gettype($node)));
-        }
-    }
-
-    /**
-     * Adds HTML/XML content.
-     *
-     * If the charset is not set via the content type, it is assumed
-     * to be ISO-8859-1, which is the default charset defined by the
-     * HTTP 1.1 specification.
-     *
-     * @param string      $content A string to parse as HTML/XML
-     * @param null|string $type    The content type of the string
-     */
-    public function addContent($content, $type = null)
-    {
-        if (empty($type)) {
-            $type = 0 === strpos($content, '<?xml') ? 'application/xml' : 'text/html';
-        }
-
-        // DOM only for HTML/XML content
-        if (!preg_match('/(x|ht)ml/i', $type, $xmlMatches)) {
-            return;
-        }
-
-        $charset = null;
-        if (false !== $pos = stripos($type, 'charset=')) {
-            $charset = substr($type, $pos + 8);
-            if (false !== $pos = strpos($charset, ';')) {
-                $charset = substr($charset, 0, $pos);
-            }
-        }
-
-        // http://www.w3.org/TR/encoding/#encodings
-        // http://www.w3.org/TR/REC-xml/#NT-EncName
-        if (null === $charset &&
-            preg_match('/\<meta[^\>]+charset *= *["\']?([a-zA-Z\-0-9_:.]+)/i', $content, $matches)) {
-            $charset = $matches[1];
-        }
-
-        if (null === $charset) {
-            $charset = 'ISO-8859-1';
-        }
-
-        if ('x' === $xmlMatches[1]) {
-            $this->addXmlContent($content, $charset);
-        } else {
-            $this->addHtmlContent($content, $charset);
-        }
-    }
-
-    /**
-     * Adds an HTML content to the list of nodes.
-     *
-     * The libxml errors are disabled when the content is parsed.
-     *
-     * If you want to get parsing errors, be sure to enable
-     * internal errors via libxml_use_internal_errors(true)
-     * and then, get the errors via libxml_get_errors(). Be
-     * sure to clear errors with libxml_clear_errors() afterward.
-     *
-     * @param string $content The HTML content
-     * @param string $charset The charset
-     */
-    public function addHtmlContent($content, $charset = 'UTF-8')
-    {
-        $internalErrors = libxml_use_internal_errors(true);
-        $disableEntities = libxml_disable_entity_loader(true);
-
-        $dom = new \DOMDocument('1.0', $charset);
-        $dom->validateOnParse = true;
-
-        set_error_handler(function () {throw new \Exception();});
-
-        try {
-            // Convert charset to HTML-entities to work around bugs in DOMDocument::loadHTML()
-
-            if (function_exists('mb_convert_encoding')) {
-                $content = mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
-            } elseif (function_exists('iconv')) {
-                $content = preg_replace_callback(
-                    '/[\x80-\xFF]+/',
-                    function ($m) {
-                        $m = unpack('C*', $m[0]);
-                        $i = 1;
-                        $entities = '';
-
-                        while (isset($m[$i])) {
-                            if (0xF0 <= $m[$i]) {
-                                $c = (($m[$i++] - 0xF0) << 18) + (($m[$i++] - 0x80) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
-                            } elseif (0xE0 <= $m[$i]) {
-                                $c = (($m[$i++] - 0xE0) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++]  - 0x80;
-                            } else {
-                                $c = (($m[$i++] - 0xC0) << 6) + $m[$i++] - 0x80;
-                            }
-
-                            $entities .= '&#'.$c.';';
-                        }
-
-                        return $entities;
-                    },
-                    iconv($charset, 'UTF-8', $content)
-                );
-            }
-        } catch (\Exception $e) {
-        }
-
-        restore_error_handler();
-
-        if ('' !== trim($content)) {
-            @$dom->loadHTML($content);
-        }
-
-        libxml_use_internal_errors($internalErrors);
-        libxml_disable_entity_loader($disableEntities);
-
-        $this->addDocument($dom);
-
-        $base = $this->filterRelativeXPath('descendant-or-self::base')->extract(array('href'));
-
-        $baseHref = current($base);
-        if (count($base) && !empty($baseHref)) {
-            if ($this->baseHref) {
-                $linkNode = $dom->createElement('a');
-                $linkNode->setAttribute('href', $baseHref);
-                $link = new Link($linkNode, $this->baseHref);
-                $this->baseHref = $link->getUri();
-            } else {
-                $this->baseHref = $baseHref;
-            }
-        }
-    }
-
-    /**
-     * Adds an XML content to the list of nodes.
-     *
-     * The libxml errors are disabled when the content is parsed.
-     *
-     * If you want to get parsing errors, be sure to enable
-     * internal errors via libxml_use_internal_errors(true)
-     * and then, get the errors via libxml_get_errors(). Be
-     * sure to clear errors with libxml_clear_errors() afterward.
-     *
-     * @param string $content The XML content
-     * @param string $charset The charset
-     */
-    public function addXmlContent($content, $charset = 'UTF-8')
-    {
-        // remove the default namespace if it's the only namespace to make XPath expressions simpler
-        if (!preg_match('/xmlns:/', $content)) {
-            $content = str_replace('xmlns', 'ns', $content);
-        }
-
-        $internalErrors = libxml_use_internal_errors(true);
-        $disableEntities = libxml_disable_entity_loader(true);
-
-        $dom = new \DOMDocument('1.0', $charset);
-        $dom->validateOnParse = true;
-
-        if ('' !== trim($content)) {
-            @$dom->loadXML($content, LIBXML_NONET);
-        }
-
-        libxml_use_internal_errors($internalErrors);
-        libxml_disable_entity_loader($disableEntities);
-
-        $this->addDocument($dom);
-    }
-
-    /**
-     * Adds a \DOMDocument to the list of nodes.
-     *
-     * @param \DOMDocument $dom A \DOMDocument instance
-     */
-    public function addDocument(\DOMDocument $dom)
-    {
-        if ($dom->documentElement) {
-            $this->addNode($dom->documentElement);
-        }
-    }
-
-    /**
-     * Adds a \DOMNodeList to the list of nodes.
-     *
-     * @param \DOMNodeList $nodes A \DOMNodeList instance
-     */
-    public function addNodeList(\DOMNodeList $nodes)
-    {
-        foreach ($nodes as $node) {
-            if ($node instanceof \DOMNode) {
-                $this->addNode($node);
-            }
-        }
-    }
-
-    /**
-     * Adds an array of \DOMNode instances to the list of nodes.
-     *
-     * @param \DOMNode[] $nodes An array of \DOMNode instances
-     */
-    public function addNodes(array $nodes)
-    {
-        foreach ($nodes as $node) {
-            $this->add($node);
-        }
-    }
-
-    /**
-     * Adds a \DOMNode instance to the list of nodes.
-     *
-     * @param \DOMNode $node A \DOMNode instance
-     */
-    public function addNode(\DOMNode $node)
-    {
-        if ($node instanceof \DOMDocument) {
-            $this->attach($node->documentElement);
-        } else {
-            $this->attach($node);
-        }
-    }
-
-    // Serializing and unserializing a crawler creates DOM objects in a corrupted state. DOM elements are not properly serializable.
-    public function unserialize($serialized)
-    {
-        throw new \BadMethodCallException('A Crawler cannot be serialized.');
-    }
-
-    public function serialize()
-    {
-        throw new \BadMethodCallException('A Crawler cannot be serialized.');
-    }
-
-    /**
-     * Returns a node given its position in the node list.
-     *
-     * @param int $position The position
-     *
-     * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist.
-     */
-    public function eq($position)
-    {
-        foreach ($this as $i => $node) {
-            if ($i == $position) {
-                return $this->createSubCrawler($node);
-            }
-        }
-
-        return $this->createSubCrawler(null);
-    }
-
-    /**
-     * Calls an anonymous function on each node of the list.
-     *
-     * The anonymous function receives the position and the node wrapped
-     * in a Crawler instance as arguments.
-     *
-     * Example:
-     *
-     *     $crawler->filter('h1')->each(function ($node, $i) {
-     *         return $node->text();
-     *     });
-     *
-     * @param \Closure $closure An anonymous function
-     *
-     * @return array An array of values returned by the anonymous function
-     */
-    public function each(\Closure $closure)
-    {
-        $data = array();
-        foreach ($this as $i => $node) {
-            $data[] = $closure($this->createSubCrawler($node), $i);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Slices the list of nodes by $offset and $length.
-     *
-     * @param int $offset
-     * @param int $length
-     *
-     * @return Crawler A Crawler instance with the sliced nodes
-     */
-    public function slice($offset = 0, $length = -1)
-    {
-        return $this->createSubCrawler(iterator_to_array(new \LimitIterator($this, $offset, $length)));
-    }
-
-    /**
-     * Reduces the list of nodes by calling an anonymous function.
-     *
-     * To remove a node from the list, the anonymous function must return false.
-     *
-     * @param \Closure $closure An anonymous function
-     *
-     * @return Crawler A Crawler instance with the selected nodes.
-     */
-    public function reduce(\Closure $closure)
-    {
-        $nodes = array();
-        foreach ($this as $i => $node) {
-            if (false !== $closure($this->createSubCrawler($node), $i)) {
-                $nodes[] = $node;
-            }
-        }
-
-        return $this->createSubCrawler($nodes);
-    }
-
-    /**
-     * Returns the first node of the current selection.
-     *
-     * @return Crawler A Crawler instance with the first selected node
-     */
-    public function first()
-    {
-        return $this->eq(0);
-    }
-
-    /**
-     * Returns the last node of the current selection.
-     *
-     * @return Crawler A Crawler instance with the last selected node
-     */
-    public function last()
-    {
-        return $this->eq(count($this) - 1);
-    }
-
-    /**
-     * Returns the siblings nodes of the current selection.
-     *
-     * @return Crawler A Crawler instance with the sibling nodes
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function siblings()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        return $this->createSubCrawler($this->sibling($this->getNode(0)->parentNode->firstChild));
-    }
-
-    /**
-     * Returns the next siblings nodes of the current selection.
-     *
-     * @return Crawler A Crawler instance with the next sibling nodes
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function nextAll()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        return $this->createSubCrawler($this->sibling($this->getNode(0)));
-    }
-
-    /**
-     * Returns the previous sibling nodes of the current selection.
-     *
-     * @return Crawler A Crawler instance with the previous sibling nodes
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function previousAll()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        return $this->createSubCrawler($this->sibling($this->getNode(0), 'previousSibling'));
-    }
-
-    /**
-     * Returns the parents nodes of the current selection.
-     *
-     * @return Crawler A Crawler instance with the parents nodes of the current selection
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function parents()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $node = $this->getNode(0);
-        $nodes = array();
-
-        while ($node = $node->parentNode) {
-            if (1 === $node->nodeType) {
-                $nodes[] = $node;
-            }
-        }
-
-        return $this->createSubCrawler($nodes);
-    }
-
-    /**
-     * Returns the children nodes of the current selection.
-     *
-     * @return Crawler A Crawler instance with the children nodes
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function children()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $node = $this->getNode(0)->firstChild;
-
-        return $this->createSubCrawler($node ? $this->sibling($node) : array());
-    }
-
-    /**
-     * Returns the attribute value of the first node of the list.
-     *
-     * @param string $attribute The attribute name
-     *
-     * @return string|null The attribute value or null if the attribute does not exist
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function attr($attribute)
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $node = $this->getNode(0);
-
-        return $node->hasAttribute($attribute) ? $node->getAttribute($attribute) : null;
-    }
-
-    /**
-     * Returns the node name of the first node of the list.
-     *
-     * @return string The node name
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function nodeName()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        return $this->getNode(0)->nodeName;
-    }
-
-    /**
-     * Returns the node value of the first node of the list.
-     *
-     * @return string The node value
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function text()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        return $this->getNode(0)->nodeValue;
-    }
-
-    /**
-     * Returns the first node of the list as HTML.
-     *
-     * @return string The node html
-     *
-     * @throws \InvalidArgumentException When current node is empty
-     */
-    public function html()
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $html = '';
-        foreach ($this->getNode(0)->childNodes as $child) {
-            $html .= $child->ownerDocument->saveHTML($child);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Extracts information from the list of nodes.
-     *
-     * You can extract attributes or/and the node value (_text).
-     *
-     * Example:
-     *
-     * $crawler->filter('h1 a')->extract(array('_text', 'href'));
-     *
-     * @param array $attributes An array of attributes
-     *
-     * @return array An array of extracted values
-     */
-    public function extract($attributes)
-    {
-        $attributes = (array) $attributes;
-        $count = count($attributes);
-
-        $data = array();
-        foreach ($this as $node) {
-            $elements = array();
-            foreach ($attributes as $attribute) {
-                if ('_text' === $attribute) {
-                    $elements[] = $node->nodeValue;
-                } else {
-                    $elements[] = $node->getAttribute($attribute);
-                }
-            }
-
-            $data[] = $count > 1 ? $elements : $elements[0];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Filters the list of nodes with an XPath expression.
-     *
-     * The XPath expression is evaluated in the context of the crawler, which
-     * is considered as a fake parent of the elements inside it.
-     * This means that a child selector "div" or "./div" will match only
-     * the div elements of the current crawler, not their children.
-     *
-     * @param string $xpath An XPath expression
-     *
-     * @return Crawler A new instance of Crawler with the filtered list of nodes
-     */
-    public function filterXPath($xpath)
-    {
-        $xpath = $this->relativize($xpath);
-
-        // If we dropped all expressions in the XPath while preparing it, there would be no match
-        if ('' === $xpath) {
-            return $this->createSubCrawler(null);
-        }
-
-        return $this->filterRelativeXPath($xpath);
-    }
-
-    /**
-     * Filters the list of nodes with a CSS selector.
-     *
-     * This method only works if you have installed the CssSelector Symfony Component.
-     *
-     * @param string $selector A CSS selector
-     *
-     * @return Crawler A new instance of Crawler with the filtered list of nodes
-     *
-     * @throws \RuntimeException if the CssSelector Component is not available
-     */
-    public function filter($selector)
-    {
-        if (!class_exists('Symfony\\Component\\CssSelector\\CssSelector')) {
-            throw new \RuntimeException('Unable to filter with a CSS selector as the Symfony CssSelector is not installed (you can use filterXPath instead).');
-        }
-
-        // The CssSelector already prefixes the selector with descendant-or-self::
-        return $this->filterRelativeXPath(CssSelector::toXPath($selector));
-    }
-
-    /**
-     * Selects links by name or alt value for clickable images.
-     *
-     * @param string $value The link text
-     *
-     * @return Crawler A new instance of Crawler with the filtered list of nodes
-     */
-    public function selectLink($value)
-    {
-        $xpath = sprintf('descendant-or-self::a[contains(concat(\' \', normalize-space(string(.)), \' \'), %s) ', static::xpathLiteral(' '.$value.' ')).
-                            sprintf('or ./img[contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)]]', static::xpathLiteral(' '.$value.' '));
-
-        return $this->filterRelativeXPath($xpath);
-    }
-
-    /**
-     * Selects a button by name or alt value for images.
-     *
-     * @param string $value The button text
-     *
-     * @return Crawler A new instance of Crawler with the filtered list of nodes
-     */
-    public function selectButton($value)
-    {
-        $translate = 'translate(@type, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")';
-        $xpath = sprintf('descendant-or-self::input[((contains(%s, "submit") or contains(%s, "button")) and contains(concat(\' \', normalize-space(string(@value)), \' \'), %s)) ', $translate, $translate, static::xpathLiteral(' '.$value.' ')).
-                         sprintf('or (contains(%s, "image") and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %s)) or @id=%s or @name=%s] ', $translate, static::xpathLiteral(' '.$value.' '), static::xpathLiteral($value), static::xpathLiteral($value)).
-                         sprintf('| descendant-or-self::button[contains(concat(\' \', normalize-space(string(.)), \' \'), %s) or @id=%s or @name=%s]', static::xpathLiteral(' '.$value.' '), static::xpathLiteral($value), static::xpathLiteral($value));
-
-        return $this->filterRelativeXPath($xpath);
-    }
-
-    /**
-     * Returns a Link object for the first node in the list.
-     *
-     * @param string $method The method for the link (get by default)
-     *
-     * @return Link A Link instance
-     *
-     * @throws \InvalidArgumentException If the current node list is empty
-     */
-    public function link($method = 'get')
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $node = $this->getNode(0);
-
-        return new Link($node, $this->baseHref, $method);
-    }
-
-    /**
-     * Returns an array of Link objects for the nodes in the list.
-     *
-     * @return Link[] An array of Link instances
-     */
-    public function links()
-    {
-        $links = array();
-        foreach ($this as $node) {
-            $links[] = new Link($node, $this->baseHref, 'get');
-        }
-
-        return $links;
-    }
-
-    /**
-     * Returns a Form object for the first node in the list.
-     *
-     * @param array  $values An array of values for the form fields
-     * @param string $method The method for the form
-     *
-     * @return Form A Form instance
-     *
-     * @throws \InvalidArgumentException If the current node list is empty
-     */
-    public function form(array $values = null, $method = null)
-    {
-        if (!count($this)) {
-            throw new \InvalidArgumentException('The current node list is empty.');
-        }
-
-        $form = new Form($this->getNode(0), $this->uri, $method, $this->baseHref);
-
-        if (null !== $values) {
-            $form->setValues($values);
-        }
-
-        return $form;
-    }
-
-    /**
-     * Overloads a default namespace prefix to be used with XPath and CSS expressions.
-     *
-     * @param string $prefix
-     */
-    public function setDefaultNamespacePrefix($prefix)
-    {
-        $this->defaultNamespacePrefix = $prefix;
-    }
-
-    /**
-     * @param string $prefix
-     * @param string $namespace
-     */
-    public function registerNamespace($prefix, $namespace)
-    {
-        $this->namespaces[$prefix] = $namespace;
-    }
-
-    /**
-     * Converts string for XPath expressions.
-     *
-     * Escaped characters are: quotes (") and apostrophe (').
-     *
-     *  Examples:
-     *  <code>
-     *     echo Crawler::xpathLiteral('foo " bar');
-     *     //prints 'foo " bar'
-     *
-     *     echo Crawler::xpathLiteral("foo ' bar");
-     *     //prints "foo ' bar"
-     *
-     *     echo Crawler::xpathLiteral('a\'b"c');
-     *     //prints concat('a', "'", 'b"c')
-     *  </code>
-     *
-     * @param string $s String to be escaped
-     *
-     * @return string Converted string
-     */
-    public static function xpathLiteral($s)
-    {
-        if (false === strpos($s, "'")) {
-            return sprintf("'%s'", $s);
-        }
-
-        if (false === strpos($s, '"')) {
-            return sprintf('"%s"', $s);
-        }
-
-        $string = $s;
-        $parts = array();
-        while (true) {
-            if (false !== $pos = strpos($string, "'")) {
-                $parts[] = sprintf("'%s'", substr($string, 0, $pos));
-                $parts[] = "\"'\"";
-                $string = substr($string, $pos + 1);
-            } else {
-                $parts[] = "'$string'";
-                break;
-            }
-        }
-
-        return sprintf('concat(%s)', implode($parts, ', '));
-    }
-
-    /**
-     * Filters the list of nodes with an XPath expression.
-     *
-     * The XPath expression should already be processed to apply it in the context of each node.
-     *
-     * @param string $xpath
-     *
-     * @return Crawler
-     */
-    private function filterRelativeXPath($xpath)
-    {
-        $prefixes = $this->findNamespacePrefixes($xpath);
-
-        $crawler = $this->createSubCrawler(null);
-
-        foreach ($this as $node) {
-            $domxpath = $this->createDOMXPath($node->ownerDocument, $prefixes);
-            $crawler->add($domxpath->query($xpath, $node));
-        }
-
-        return $crawler;
-    }
-
-    /**
-     * Make the XPath relative to the current context.
-     *
-     * The returned XPath will match elements matching the XPath inside the current crawler
-     * when running in the context of a node of the crawler.
-     *
-     * @param string $xpath
-     *
-     * @return string
-     */
-    private function relativize($xpath)
-    {
-        $expressions = array();
-
-        $unionPattern = '/\|(?![^\[]*\])/';
-        // An expression which will never match to replace expressions which cannot match in the crawler
-        // We cannot simply drop
-        $nonMatchingExpression = 'a[name() = "b"]';
-
-        // Split any unions into individual expressions.
-        foreach (preg_split($unionPattern, $xpath) as $expression) {
-            $expression = trim($expression);
-            $parenthesis = '';
-
-            // If the union is inside some braces, we need to preserve the opening braces and apply
-            // the change only inside it.
-            if (preg_match('/^[\(\s*]+/', $expression, $matches)) {
-                $parenthesis = $matches[0];
-                $expression = substr($expression, strlen($parenthesis));
-            }
-
-            // BC for Symfony 2.4 and lower were elements were adding in a fake _root parent
-            if (0 === strpos($expression, '/_root/')) {
-                $expression = './'.substr($expression, 7);
-            } elseif (0 === strpos($expression, 'self::*/')) {
-                $expression = './'.substr($expression, 8);
-            }
-
-            // add prefix before absolute element selector
-            if (empty($expression)) {
-                $expression = $nonMatchingExpression;
-            } elseif (0 === strpos($expression, '//')) {
-                $expression = 'descendant-or-self::'.substr($expression, 2);
-            } elseif (0 === strpos($expression, './/')) {
-                $expression = 'descendant-or-self::'.substr($expression, 3);
-            } elseif (0 === strpos($expression, './')) {
-                $expression = 'self::'.substr($expression, 2);
-            } elseif (0 === strpos($expression, 'child::')) {
-                $expression = 'self::'.substr($expression, 7);
-            } elseif ('/' === $expression[0] || 0 === strpos($expression, 'self::')) {
-                // the only direct child in Symfony 2.4 and lower is _root, which is already handled previously
-                // so let's drop the expression entirely
-                $expression = $nonMatchingExpression;
-            } elseif ('.' === $expression[0]) {
-                // '.' is the fake root element in Symfony 2.4 and lower, which is excluded from results
-                $expression = $nonMatchingExpression;
-            } elseif (0 === strpos($expression, 'descendant::')) {
-                $expression = 'descendant-or-self::'.substr($expression, strlen('descendant::'));
-            } elseif (preg_match('/^(ancestor|ancestor-or-self|attribute|following|following-sibling|namespace|parent|preceding|preceding-sibling)::/', $expression)) {
-                // the fake root has no parent, preceding or following nodes and also no attributes (even no namespace attributes)
-                $expression = $nonMatchingExpression;
-            } elseif (0 !== strpos($expression, 'descendant-or-self::')) {
-                $expression = 'self::'.$expression;
-            }
-            $expressions[] = $parenthesis.$expression;
-        }
-
-        return implode(' | ', $expressions);
-    }
-
-    /**
-     * @param int $position
-     *
-     * @return \DOMElement|null
-     */
-    public function getNode($position)
-    {
-        foreach ($this as $i => $node) {
-            if ($i == $position) {
-                return $node;
-            }
-        }
-    }
-
-    /**
-     * @param \DOMElement $node
-     * @param string      $siblingDir
-     *
-     * @return array
-     */
-    protected function sibling($node, $siblingDir = 'nextSibling')
-    {
-        $nodes = array();
-
-        do {
-            if ($node !== $this->getNode(0) && $node->nodeType === 1) {
-                $nodes[] = $node;
-            }
-        } while ($node = $node->$siblingDir);
-
-        return $nodes;
-    }
-
-    /**
-     * @param \DOMDocument $document
-     * @param array        $prefixes
-     *
-     * @return \DOMXPath
-     *
-     * @throws \InvalidArgumentException
-     */
-    private function createDOMXPath(\DOMDocument $document, array $prefixes = array())
-    {
-        $domxpath = new \DOMXPath($document);
-
-        foreach ($prefixes as $prefix) {
-            $namespace = $this->discoverNamespace($domxpath, $prefix);
-            if (null !== $namespace) {
-                $domxpath->registerNamespace($prefix, $namespace);
-            }
-        }
-
-        return $domxpath;
-    }
-
-    /**
-     * @param \DOMXPath $domxpath
-     * @param string    $prefix
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException
-     */
-    private function discoverNamespace(\DOMXPath $domxpath, $prefix)
-    {
-        if (isset($this->namespaces[$prefix])) {
-            return $this->namespaces[$prefix];
-        }
-
-        // ask for one namespace, otherwise we'd get a collection with an item for each node
-        $namespaces = $domxpath->query(sprintf('(//namespace::*[name()="%s"])[last()]', $this->defaultNamespacePrefix === $prefix ? '' : $prefix));
-
-        if ($node = $namespaces->item(0)) {
-            return $node->nodeValue;
-        }
-    }
-
-    /**
-     * @param string $xpath
-     *
-     * @return array
-     */
-    private function findNamespacePrefixes($xpath)
-    {
-        if (preg_match_all('/(?P<prefix>[a-z_][a-z_0-9\-\.]*+):[^"\/:]/i', $xpath, $matches)) {
-            return array_unique($matches['prefix']);
-        }
-
-        return array();
-    }
-
-    /**
-     * Creates a crawler for some subnodes.
-     *
-     * @param \DOMElement|\DOMElement[]|\DOMNodeList|null $nodes
-     *
-     * @return static
-     */
-    private function createSubCrawler($nodes)
-    {
-        $crawler = new static($nodes, $this->uri, $this->baseHref);
-
-        return $crawler;
-    }
-}
diff --git a/vendor/symfony/dom-crawler/Field/ChoiceFormField.php b/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
deleted file mode 100644
index fcf510c..0000000
--- a/vendor/symfony/dom-crawler/Field/ChoiceFormField.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?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\Component\DomCrawler\Field;
-
-/**
- * ChoiceFormField represents a choice form field.
- *
- * It is constructed from a HTML select tag, or a HTML checkbox, or radio inputs.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ChoiceFormField extends FormField
-{
-    /**
-     * @var string
-     */
-    private $type;
-    /**
-     * @var bool
-     */
-    private $multiple;
-    /**
-     * @var array
-     */
-    private $options;
-    /**
-     * @var bool
-     */
-    private $validationDisabled = false;
-
-    /**
-     * Returns true if the field should be included in the submitted values.
-     *
-     * @return bool true if the field should be included in the submitted values, false otherwise
-     */
-    public function hasValue()
-    {
-        // don't send a value for unchecked checkboxes
-        if (in_array($this->type, array('checkbox', 'radio')) && null === $this->value) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Check if the current selected option is disabled.
-     *
-     * @return bool
-     */
-    public function isDisabled()
-    {
-        foreach ($this->options as $option) {
-            if ($option['value'] == $this->value && $option['disabled']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets the value of the field.
-     *
-     * @param string $value The value of the field
-     */
-    public function select($value)
-    {
-        $this->setValue($value);
-    }
-
-    /**
-     * Ticks a checkbox.
-     *
-     * @throws \LogicException When the type provided is not correct
-     */
-    public function tick()
-    {
-        if ('checkbox' !== $this->type) {
-            throw new \LogicException(sprintf('You cannot tick "%s" as it is not a checkbox (%s).', $this->name, $this->type));
-        }
-
-        $this->setValue(true);
-    }
-
-    /**
-     * Ticks a checkbox.
-     *
-     * @throws \LogicException When the type provided is not correct
-     */
-    public function untick()
-    {
-        if ('checkbox' !== $this->type) {
-            throw new \LogicException(sprintf('You cannot tick "%s" as it is not a checkbox (%s).', $this->name, $this->type));
-        }
-
-        $this->setValue(false);
-    }
-
-    /**
-     * Sets the value of the field.
-     *
-     * @param string $value The value of the field
-     *
-     * @throws \InvalidArgumentException When value type provided is not correct
-     */
-    public function setValue($value)
-    {
-        if ('checkbox' === $this->type && false === $value) {
-            // uncheck
-            $this->value = null;
-        } elseif ('checkbox' === $this->type && true === $value) {
-            // check
-            $this->value = $this->options[0]['value'];
-        } else {
-            if (is_array($value)) {
-                if (!$this->multiple) {
-                    throw new \InvalidArgumentException(sprintf('The value for "%s" cannot be an array.', $this->name));
-                }
-
-                foreach ($value as $v) {
-                    if (!$this->containsOption($v, $this->options)) {
-                        throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: %s).', $this->name, $v, implode(', ', $this->availableOptionValues())));
-                    }
-                }
-            } elseif (!$this->containsOption($value, $this->options)) {
-                throw new \InvalidArgumentException(sprintf('Input "%s" cannot take "%s" as a value (possible values: %s).', $this->name, $value, implode(', ', $this->availableOptionValues())));
-            }
-
-            if ($this->multiple) {
-                $value = (array) $value;
-            }
-
-            if (is_array($value)) {
-                $this->value = $value;
-            } else {
-                parent::setValue($value);
-            }
-        }
-    }
-
-    /**
-     * Adds a choice to the current ones.
-     *
-     * This method should only be used internally.
-     *
-     * @param \DOMElement $node
-     *
-     * @throws \LogicException When choice provided is not multiple nor radio
-     */
-    public function addChoice(\DOMElement $node)
-    {
-        if (!$this->multiple && 'radio' !== $this->type) {
-            throw new \LogicException(sprintf('Unable to add a choice for "%s" as it is not multiple or is not a radio button.', $this->name));
-        }
-
-        $option = $this->buildOptionValue($node);
-        $this->options[] = $option;
-
-        if ($node->hasAttribute('checked')) {
-            $this->value = $option['value'];
-        }
-    }
-
-    /**
-     * Returns the type of the choice field (radio, select, or checkbox).
-     *
-     * @return string The type
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Returns true if the field accepts multiple values.
-     *
-     * @return bool true if the field accepts multiple values, false otherwise
-     */
-    public function isMultiple()
-    {
-        return $this->multiple;
-    }
-
-    /**
-     * Initializes the form field.
-     *
-     * @throws \LogicException When node type is incorrect
-     */
-    protected function initialize()
-    {
-        if ('input' !== $this->node->nodeName && 'select' !== $this->node->nodeName) {
-            throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input or select tag (%s given).', $this->node->nodeName));
-        }
-
-        if ('input' === $this->node->nodeName && 'checkbox' !== strtolower($this->node->getAttribute('type')) && 'radio' !== strtolower($this->node->getAttribute('type'))) {
-            throw new \LogicException(sprintf('A ChoiceFormField can only be created from an input tag with a type of checkbox or radio (given type is %s).', $this->node->getAttribute('type')));
-        }
-
-        $this->value = null;
-        $this->options = array();
-        $this->multiple = false;
-
-        if ('input' == $this->node->nodeName) {
-            $this->type = strtolower($this->node->getAttribute('type'));
-            $optionValue = $this->buildOptionValue($this->node);
-            $this->options[] = $optionValue;
-
-            if ($this->node->hasAttribute('checked')) {
-                $this->value = $optionValue['value'];
-            }
-        } else {
-            $this->type = 'select';
-            if ($this->node->hasAttribute('multiple')) {
-                $this->multiple = true;
-                $this->value = array();
-                $this->name = str_replace('[]', '', $this->name);
-            }
-
-            $found = false;
-            foreach ($this->xpath->query('descendant::option', $this->node) as $option) {
-                $optionValue = $this->buildOptionValue($option);
-                $this->options[] = $optionValue;
-
-                if ($option->hasAttribute('selected')) {
-                    $found = true;
-                    if ($this->multiple) {
-                        $this->value[] = $optionValue['value'];
-                    } else {
-                        $this->value = $optionValue['value'];
-                    }
-                }
-            }
-
-            // if no option is selected and if it is a simple select box, take the first option as the value
-            if (!$found && !$this->multiple && !empty($this->options)) {
-                $this->value = $this->options[0]['value'];
-            }
-        }
-    }
-
-    /**
-     * Returns option value with associated disabled flag.
-     *
-     * @param \DOMElement $node
-     *
-     * @return array
-     */
-    private function buildOptionValue(\DOMElement $node)
-    {
-        $option = array();
-
-        $defaultValue = (isset($node->nodeValue) && !empty($node->nodeValue)) ? $node->nodeValue : 'on';
-        $option['value'] = $node->hasAttribute('value') ? $node->getAttribute('value') : $defaultValue;
-        $option['disabled'] = $node->hasAttribute('disabled');
-
-        return $option;
-    }
-
-    /**
-     * Checks whether given value is in the existing options.
-     *
-     * @param string $optionValue
-     * @param array  $options
-     *
-     * @return bool
-     */
-    public function containsOption($optionValue, $options)
-    {
-        if ($this->validationDisabled) {
-            return true;
-        }
-
-        foreach ($options as $option) {
-            if ($option['value'] == $optionValue) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns list of available field options.
-     *
-     * @return array
-     */
-    public function availableOptionValues()
-    {
-        $values = array();
-
-        foreach ($this->options as $option) {
-            $values[] = $option['value'];
-        }
-
-        return $values;
-    }
-
-    /**
-     * Disables the internal validation of the field.
-     *
-     * @return self
-     */
-    public function disableValidation()
-    {
-        $this->validationDisabled = true;
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/dom-crawler/Field/FileFormField.php b/vendor/symfony/dom-crawler/Field/FileFormField.php
deleted file mode 100644
index 0e0f943..0000000
--- a/vendor/symfony/dom-crawler/Field/FileFormField.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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\Component\DomCrawler\Field;
-
-/**
- * FileFormField represents a file form field (an HTML file input tag).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FileFormField extends FormField
-{
-    /**
-     * Sets the PHP error code associated with the field.
-     *
-     * @param int $error The error code (one of UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, or UPLOAD_ERR_EXTENSION)
-     *
-     * @throws \InvalidArgumentException When error code doesn't exist
-     */
-    public function setErrorCode($error)
-    {
-        $codes = array(UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION);
-        if (!in_array($error, $codes)) {
-            throw new \InvalidArgumentException(sprintf('The error code %s is not valid.', $error));
-        }
-
-        $this->value = array('name' => '', 'type' => '', 'tmp_name' => '', 'error' => $error, 'size' => 0);
-    }
-
-    /**
-     * Sets the value of the field.
-     *
-     * @param string $value The value of the field
-     */
-    public function upload($value)
-    {
-        $this->setValue($value);
-    }
-
-    /**
-     * Sets the value of the field.
-     *
-     * @param string $value The value of the field
-     */
-    public function setValue($value)
-    {
-        if (null !== $value && is_readable($value)) {
-            $error = UPLOAD_ERR_OK;
-            $size = filesize($value);
-            $info = pathinfo($value);
-            $name = $info['basename'];
-
-            // copy to a tmp location
-            $tmp = sys_get_temp_dir().'/'.sha1(uniqid(mt_rand(), true));
-            if (array_key_exists('extension', $info)) {
-                $tmp .= '.'.$info['extension'];
-            }
-            if (is_file($tmp)) {
-                unlink($tmp);
-            }
-            copy($value, $tmp);
-            $value = $tmp;
-        } else {
-            $error = UPLOAD_ERR_NO_FILE;
-            $size = 0;
-            $name = '';
-            $value = '';
-        }
-
-        $this->value = array('name' => $name, 'type' => '', 'tmp_name' => $value, 'error' => $error, 'size' => $size);
-    }
-
-    /**
-     * Sets path to the file as string for simulating HTTP request.
-     *
-     * @param string $path The path to the file
-     */
-    public function setFilePath($path)
-    {
-        parent::setValue($path);
-    }
-
-    /**
-     * Initializes the form field.
-     *
-     * @throws \LogicException When node type is incorrect
-     */
-    protected function initialize()
-    {
-        if ('input' !== $this->node->nodeName) {
-            throw new \LogicException(sprintf('A FileFormField can only be created from an input tag (%s given).', $this->node->nodeName));
-        }
-
-        if ('file' !== strtolower($this->node->getAttribute('type'))) {
-            throw new \LogicException(sprintf('A FileFormField can only be created from an input tag with a type of file (given type is %s).', $this->node->getAttribute('type')));
-        }
-
-        $this->setValue(null);
-    }
-}
diff --git a/vendor/symfony/dom-crawler/Field/FormField.php b/vendor/symfony/dom-crawler/Field/FormField.php
deleted file mode 100644
index a6b33de..0000000
--- a/vendor/symfony/dom-crawler/Field/FormField.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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\Component\DomCrawler\Field;
-
-/**
- * FormField is the abstract class for all form fields.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class FormField
-{
-    /**
-     * @var \DOMElement
-     */
-    protected $node;
-    /**
-     * @var string
-     */
-    protected $name;
-    /**
-     * @var string
-     */
-    protected $value;
-    /**
-     * @var \DOMDocument
-     */
-    protected $document;
-    /**
-     * @var \DOMXPath
-     */
-    protected $xpath;
-    /**
-     * @var bool
-     */
-    protected $disabled;
-
-    /**
-     * Constructor.
-     *
-     * @param \DOMElement $node The node associated with this field
-     */
-    public function __construct(\DOMElement $node)
-    {
-        $this->node = $node;
-        $this->name = $node->getAttribute('name');
-        $this->xpath = new \DOMXPath($node->ownerDocument);
-
-        $this->initialize();
-    }
-
-    /**
-     * Returns the name of the field.
-     *
-     * @return string The name of the field
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the value of the field.
-     *
-     * @return string|array The value of the field
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Sets the value of the field.
-     *
-     * @param string $value The value of the field
-     */
-    public function setValue($value)
-    {
-        $this->value = (string) $value;
-    }
-
-    /**
-     * Returns true if the field should be included in the submitted values.
-     *
-     * @return bool true if the field should be included in the submitted values, false otherwise
-     */
-    public function hasValue()
-    {
-        return true;
-    }
-
-    /**
-     * Check if the current field is disabled.
-     *
-     * @return bool
-     */
-    public function isDisabled()
-    {
-        return $this->node->hasAttribute('disabled');
-    }
-
-    /**
-     * Initializes the form field.
-     */
-    abstract protected function initialize();
-}
diff --git a/vendor/symfony/dom-crawler/Field/InputFormField.php b/vendor/symfony/dom-crawler/Field/InputFormField.php
deleted file mode 100644
index 090913e..0000000
--- a/vendor/symfony/dom-crawler/Field/InputFormField.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\DomCrawler\Field;
-
-/**
- * InputFormField represents an input form field (an HTML input tag).
- *
- * For inputs with type of file, checkbox, or radio, there are other more
- * specialized classes (cf. FileFormField and ChoiceFormField).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InputFormField extends FormField
-{
-    /**
-     * Initializes the form field.
-     *
-     * @throws \LogicException When node type is incorrect
-     */
-    protected function initialize()
-    {
-        if ('input' !== $this->node->nodeName && 'button' !== $this->node->nodeName) {
-            throw new \LogicException(sprintf('An InputFormField can only be created from an input or button tag (%s given).', $this->node->nodeName));
-        }
-
-        if ('checkbox' === strtolower($this->node->getAttribute('type'))) {
-            throw new \LogicException('Checkboxes should be instances of ChoiceFormField.');
-        }
-
-        if ('file' === strtolower($this->node->getAttribute('type'))) {
-            throw new \LogicException('File inputs should be instances of FileFormField.');
-        }
-
-        $this->value = $this->node->getAttribute('value');
-    }
-}
diff --git a/vendor/symfony/dom-crawler/Field/TextareaFormField.php b/vendor/symfony/dom-crawler/Field/TextareaFormField.php
deleted file mode 100644
index 15526e1..0000000
--- a/vendor/symfony/dom-crawler/Field/TextareaFormField.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Component\DomCrawler\Field;
-
-/**
- * TextareaFormField represents a textarea form field (an HTML textarea tag).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TextareaFormField extends FormField
-{
-    /**
-     * Initializes the form field.
-     *
-     * @throws \LogicException When node type is incorrect
-     */
-    protected function initialize()
-    {
-        if ('textarea' !== $this->node->nodeName) {
-            throw new \LogicException(sprintf('A TextareaFormField can only be created from a textarea tag (%s given).', $this->node->nodeName));
-        }
-
-        $this->value = '';
-        foreach ($this->node->childNodes as $node) {
-            $this->value .= $node->wholeText;
-        }
-    }
-}
diff --git a/vendor/symfony/dom-crawler/Form.php b/vendor/symfony/dom-crawler/Form.php
deleted file mode 100644
index 0c7a3b2..0000000
--- a/vendor/symfony/dom-crawler/Form.php
+++ /dev/null
@@ -1,471 +0,0 @@
-<?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\Component\DomCrawler;
-
-use Symfony\Component\DomCrawler\Field\ChoiceFormField;
-use Symfony\Component\DomCrawler\Field\FormField;
-
-/**
- * Form represents an HTML form.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Form extends Link implements \ArrayAccess
-{
-    /**
-     * @var \DOMElement
-     */
-    private $button;
-
-    /**
-     * @var FormFieldRegistry
-     */
-    private $fields;
-
-    /**
-     * @var string
-     */
-    private $baseHref;
-
-    /**
-     * Constructor.
-     *
-     * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the form is embedded
-     * @param string      $method     The method to use for the link (if null, it defaults to the method defined by the form)
-     * @param string      $baseHref   The URI of the <base> used for relative links, but not for empty action
-     *
-     * @throws \LogicException if the node is not a button inside a form tag
-     */
-    public function __construct(\DOMElement $node, $currentUri, $method = null, $baseHref = null)
-    {
-        parent::__construct($node, $currentUri, $method);
-        $this->baseHref = $baseHref;
-
-        $this->initialize();
-    }
-
-    /**
-     * Gets the form node associated with this form.
-     *
-     * @return \DOMElement A \DOMElement instance
-     */
-    public function getFormNode()
-    {
-        return $this->node;
-    }
-
-    /**
-     * Sets the value of the fields.
-     *
-     * @param array $values An array of field values
-     *
-     * @return Form
-     */
-    public function setValues(array $values)
-    {
-        foreach ($values as $name => $value) {
-            $this->fields->set($name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the field values.
-     *
-     * The returned array does not include file fields (@see getFiles).
-     *
-     * @return array An array of field values.
-     */
-    public function getValues()
-    {
-        $values = array();
-        foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
-            if (!$field instanceof Field\FileFormField && $field->hasValue()) {
-                $values[$name] = $field->getValue();
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Gets the file field values.
-     *
-     * @return array An array of file field values.
-     */
-    public function getFiles()
-    {
-        if (!in_array($this->getMethod(), array('POST', 'PUT', 'DELETE', 'PATCH'))) {
-            return array();
-        }
-
-        $files = array();
-
-        foreach ($this->fields->all() as $name => $field) {
-            if ($field->isDisabled()) {
-                continue;
-            }
-
-            if ($field instanceof Field\FileFormField) {
-                $files[$name] = $field->getValue();
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Gets the field values as PHP.
-     *
-     * This method converts fields with the array notation
-     * (like foo[bar] to arrays) like PHP does.
-     *
-     * @return array An array of field values.
-     */
-    public function getPhpValues()
-    {
-        $values = array();
-        foreach ($this->getValues() as $name => $value) {
-            $qs = http_build_query(array($name => $value), '', '&');
-            if (!empty($qs)) {
-                parse_str($qs, $expandedValue);
-                $varName = substr($name, 0, strlen(key($expandedValue)));
-                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Gets the file field values as PHP.
-     *
-     * This method converts fields with the array notation
-     * (like foo[bar] to arrays) like PHP does.
-     *
-     * @return array An array of field values.
-     */
-    public function getPhpFiles()
-    {
-        $values = array();
-        foreach ($this->getFiles() as $name => $value) {
-            $qs = http_build_query(array($name => $value), '', '&');
-            if (!empty($qs)) {
-                parse_str($qs, $expandedValue);
-                $varName = substr($name, 0, strlen(key($expandedValue)));
-                $values = array_replace_recursive($values, array($varName => current($expandedValue)));
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Gets the URI of the form.
-     *
-     * The returned URI is not the same as the form "action" attribute.
-     * This method merges the value if the method is GET to mimics
-     * browser behavior.
-     *
-     * @return string The URI
-     */
-    public function getUri()
-    {
-        $uri = parent::getUri();
-
-        if (!in_array($this->getMethod(), array('POST', 'PUT', 'DELETE', 'PATCH'))) {
-            $query = parse_url($uri, PHP_URL_QUERY);
-            $currentParameters = array();
-            if ($query) {
-                parse_str($query, $currentParameters);
-            }
-
-            $queryString = http_build_query(array_merge($currentParameters, $this->getValues()), null, '&');
-
-            $pos = strpos($uri, '?');
-            $base = false === $pos ? $uri : substr($uri, 0, $pos);
-            $uri = rtrim($base.'?'.$queryString, '?');
-        }
-
-        return $uri;
-    }
-
-    protected function getRawUri()
-    {
-        return $this->node->getAttribute('action');
-    }
-
-    /**
-     * Gets the form method.
-     *
-     * If no method is defined in the form, GET is returned.
-     *
-     * @return string The method
-     */
-    public function getMethod()
-    {
-        if (null !== $this->method) {
-            return $this->method;
-        }
-
-        return $this->node->getAttribute('method') ? strtoupper($this->node->getAttribute('method')) : 'GET';
-    }
-
-    /**
-     * Returns true if the named field exists.
-     *
-     * @param string $name The field name
-     *
-     * @return bool true if the field exists, false otherwise
-     */
-    public function has($name)
-    {
-        return $this->fields->has($name);
-    }
-
-    /**
-     * Removes a field from the form.
-     *
-     * @param string $name The field name
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     */
-    public function remove($name)
-    {
-        $this->fields->remove($name);
-    }
-
-    /**
-     * Gets a named field.
-     *
-     * @param string $name The field name
-     *
-     * @return FormField The field instance
-     *
-     * @throws \InvalidArgumentException When field is not present in this form
-     */
-    public function get($name)
-    {
-        return $this->fields->get($name);
-    }
-
-    /**
-     * Sets a named field.
-     *
-     * @param FormField $field The field
-     */
-    public function set(FormField $field)
-    {
-        $this->fields->add($field);
-    }
-
-    /**
-     * Gets all fields.
-     *
-     * @return FormField[] An array of fields
-     */
-    public function all()
-    {
-        return $this->fields->all();
-    }
-
-    /**
-     * Returns true if the named field exists.
-     *
-     * @param string $name The field name
-     *
-     * @return bool true if the field exists, false otherwise
-     */
-    public function offsetExists($name)
-    {
-        return $this->has($name);
-    }
-
-    /**
-     * Gets the value of a field.
-     *
-     * @param string $name The field name
-     *
-     * @return FormField The associated Field instance
-     *
-     * @throws \InvalidArgumentException if the field does not exist
-     */
-    public function offsetGet($name)
-    {
-        return $this->fields->get($name);
-    }
-
-    /**
-     * Sets the value of a field.
-     *
-     * @param string       $name  The field name
-     * @param string|array $value The value of the field
-     *
-     * @throws \InvalidArgumentException if the field does not exist
-     */
-    public function offsetSet($name, $value)
-    {
-        $this->fields->set($name, $value);
-    }
-
-    /**
-     * Removes a field from the form.
-     *
-     * @param string $name The field name
-     */
-    public function offsetUnset($name)
-    {
-        $this->fields->remove($name);
-    }
-
-    /**
-     * Disables validation.
-     *
-     * @return self
-     */
-    public function disableValidation()
-    {
-        foreach ($this->fields->all() as $field) {
-            if ($field instanceof Field\ChoiceFormField) {
-                $field->disableValidation();
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the node for the form.
-     *
-     * Expects a 'submit' button \DOMElement and finds the corresponding form element, or the form element itself.
-     *
-     * @param \DOMElement $node A \DOMElement instance
-     *
-     * @throws \LogicException If given node is not a button or input or does not have a form ancestor
-     */
-    protected function setNode(\DOMElement $node)
-    {
-        $this->button = $node;
-        if ('button' === $node->nodeName || ('input' === $node->nodeName && in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image')))) {
-            if ($node->hasAttribute('form')) {
-                // if the node has the HTML5-compliant 'form' attribute, use it
-                $formId = $node->getAttribute('form');
-                $form = $node->ownerDocument->getElementById($formId);
-                if (null === $form) {
-                    throw new \LogicException(sprintf('The selected node has an invalid form attribute (%s).', $formId));
-                }
-                $this->node = $form;
-
-                return;
-            }
-            // we loop until we find a form ancestor
-            do {
-                if (null === $node = $node->parentNode) {
-                    throw new \LogicException('The selected node does not have a form ancestor.');
-                }
-            } while ('form' !== $node->nodeName);
-        } elseif ('form' !== $node->nodeName) {
-            throw new \LogicException(sprintf('Unable to submit on a "%s" tag.', $node->nodeName));
-        }
-
-        $this->node = $node;
-    }
-
-    /**
-     * Adds form elements related to this form.
-     *
-     * Creates an internal copy of the submitted 'button' element and
-     * the form node or the entire document depending on whether we need
-     * to find non-descendant elements through HTML5 'form' attribute.
-     */
-    private function initialize()
-    {
-        $this->fields = new FormFieldRegistry();
-
-        $xpath = new \DOMXPath($this->node->ownerDocument);
-
-        // add submitted button if it has a valid name
-        if ('form' !== $this->button->nodeName && $this->button->hasAttribute('name') && $this->button->getAttribute('name')) {
-            if ('input' == $this->button->nodeName && 'image' == strtolower($this->button->getAttribute('type'))) {
-                $name = $this->button->getAttribute('name');
-                $this->button->setAttribute('value', '0');
-
-                // temporarily change the name of the input node for the x coordinate
-                $this->button->setAttribute('name', $name.'.x');
-                $this->set(new Field\InputFormField($this->button));
-
-                // temporarily change the name of the input node for the y coordinate
-                $this->button->setAttribute('name', $name.'.y');
-                $this->set(new Field\InputFormField($this->button));
-
-                // restore the original name of the input node
-                $this->button->setAttribute('name', $name);
-            } else {
-                $this->set(new Field\InputFormField($this->button));
-            }
-        }
-
-        // find form elements corresponding to the current form
-        if ($this->node->hasAttribute('id')) {
-            // corresponding elements are either descendants or have a matching HTML5 form attribute
-            $formId = Crawler::xpathLiteral($this->node->getAttribute('id'));
-
-            $fieldNodes = $xpath->query(sprintf('descendant::input[@form=%s] | descendant::button[@form=%s] | descendant::textarea[@form=%s] | descendant::select[@form=%s] | //form[@id=%s]//input[not(@form)] | //form[@id=%s]//button[not(@form)] | //form[@id=%s]//textarea[not(@form)] | //form[@id=%s]//select[not(@form)]', $formId, $formId, $formId, $formId, $formId, $formId, $formId, $formId));
-            foreach ($fieldNodes as $node) {
-                $this->addField($node);
-            }
-        } else {
-            // do the xpath query with $this->node as the context node, to only find descendant elements
-            // however, descendant elements with form attribute are not part of this form
-            $fieldNodes = $xpath->query('descendant::input[not(@form)] | descendant::button[not(@form)] | descendant::textarea[not(@form)] | descendant::select[not(@form)]', $this->node);
-            foreach ($fieldNodes as $node) {
-                $this->addField($node);
-            }
-        }
-
-        if ($this->baseHref && '' !== $this->node->getAttribute('action')) {
-            $this->currentUri = $this->baseHref;
-        }
-    }
-
-    private function addField(\DOMElement $node)
-    {
-        if (!$node->hasAttribute('name') || !$node->getAttribute('name')) {
-            return;
-        }
-
-        $nodeName = $node->nodeName;
-        if ('select' == $nodeName || 'input' == $nodeName && 'checkbox' == strtolower($node->getAttribute('type'))) {
-            $this->set(new Field\ChoiceFormField($node));
-        } elseif ('input' == $nodeName && 'radio' == strtolower($node->getAttribute('type'))) {
-            // there may be other fields with the same name that are no choice
-            // fields already registered (see https://github.com/symfony/symfony/issues/11689)
-            if ($this->has($node->getAttribute('name')) && $this->get($node->getAttribute('name')) instanceof ChoiceFormField) {
-                $this->get($node->getAttribute('name'))->addChoice($node);
-            } else {
-                $this->set(new Field\ChoiceFormField($node));
-            }
-        } elseif ('input' == $nodeName && 'file' == strtolower($node->getAttribute('type'))) {
-            $this->set(new Field\FileFormField($node));
-        } elseif ('input' == $nodeName && !in_array(strtolower($node->getAttribute('type')), array('submit', 'button', 'image'))) {
-            $this->set(new Field\InputFormField($node));
-        } elseif ('textarea' == $nodeName) {
-            $this->set(new Field\TextareaFormField($node));
-        }
-    }
-}
diff --git a/vendor/symfony/dom-crawler/FormFieldRegistry.php b/vendor/symfony/dom-crawler/FormFieldRegistry.php
deleted file mode 100644
index edb2788..0000000
--- a/vendor/symfony/dom-crawler/FormFieldRegistry.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?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\Component\DomCrawler;
-
-use Symfony\Component\DomCrawler\Field\FormField;
-
-/**
- * This is an internal class that must not be used directly.
- */
-class FormFieldRegistry
-{
-    private $fields = array();
-
-    private $base;
-
-    /**
-     * Adds a field to the registry.
-     *
-     * @param FormField $field The field
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     */
-    public function add(FormField $field)
-    {
-        $segments = $this->getSegments($field->getName());
-
-        $target = &$this->fields;
-        while ($segments) {
-            if (!is_array($target)) {
-                $target = array();
-            }
-            $path = array_shift($segments);
-            if ('' === $path) {
-                $target = &$target[];
-            } else {
-                $target = &$target[$path];
-            }
-        }
-        $target = $field;
-    }
-
-    /**
-     * Removes a field and its children from the registry.
-     *
-     * @param string $name The fully qualified name of the base field
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     */
-    public function remove($name)
-    {
-        $segments = $this->getSegments($name);
-        $target = &$this->fields;
-        while (count($segments) > 1) {
-            $path = array_shift($segments);
-            if (!array_key_exists($path, $target)) {
-                return;
-            }
-            $target = &$target[$path];
-        }
-        unset($target[array_shift($segments)]);
-    }
-
-    /**
-     * Returns the value of the field and its children.
-     *
-     * @param string $name The fully qualified name of the field
-     *
-     * @return mixed The value of the field
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     * @throws \InvalidArgumentException if the field does not exist
-     */
-    public function &get($name)
-    {
-        $segments = $this->getSegments($name);
-        $target = &$this->fields;
-        while ($segments) {
-            $path = array_shift($segments);
-            if (!array_key_exists($path, $target)) {
-                throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path));
-            }
-            $target = &$target[$path];
-        }
-
-        return $target;
-    }
-
-    /**
-     * Tests whether the form has the given field.
-     *
-     * @param string $name The fully qualified name of the field
-     *
-     * @return bool Whether the form has the given field
-     */
-    public function has($name)
-    {
-        try {
-            $this->get($name);
-
-            return true;
-        } catch (\InvalidArgumentException $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Set the value of a field and its children.
-     *
-     * @param string $name  The fully qualified name of the field
-     * @param mixed  $value The value
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     * @throws \InvalidArgumentException if the field does not exist
-     */
-    public function set($name, $value)
-    {
-        $target = &$this->get($name);
-        if ((!is_array($value) && $target instanceof Field\FormField) || $target instanceof Field\ChoiceFormField) {
-            $target->setValue($value);
-        } elseif (is_array($value)) {
-            $fields = self::create($name, $value);
-            foreach ($fields->all() as $k => $v) {
-                $this->set($k, $v);
-            }
-        } else {
-            throw new \InvalidArgumentException(sprintf('Cannot set value on a compound field "%s".', $name));
-        }
-    }
-
-    /**
-     * Returns the list of field with their value.
-     *
-     * @return FormField[] The list of fields as array((string) Fully qualified name => (mixed) value)
-     */
-    public function all()
-    {
-        return $this->walk($this->fields, $this->base);
-    }
-
-    /**
-     * Creates an instance of the class.
-     *
-     * This function is made private because it allows overriding the $base and
-     * the $values properties without any type checking.
-     *
-     * @param string $base   The fully qualified name of the base field
-     * @param array  $values The values of the fields
-     *
-     * @return FormFieldRegistry
-     */
-    private static function create($base, array $values)
-    {
-        $registry = new static();
-        $registry->base = $base;
-        $registry->fields = $values;
-
-        return $registry;
-    }
-
-    /**
-     * Transforms a PHP array in a list of fully qualified name / value.
-     *
-     * @param array  $array  The PHP array
-     * @param string $base   The name of the base field
-     * @param array  $output The initial values
-     *
-     * @return array The list of fields as array((string) Fully qualified name => (mixed) value)
-     */
-    private function walk(array $array, $base = '', array &$output = array())
-    {
-        foreach ($array as $k => $v) {
-            $path = empty($base) ? $k : sprintf('%s[%s]', $base, $k);
-            if (is_array($v)) {
-                $this->walk($v, $path, $output);
-            } else {
-                $output[$path] = $v;
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Splits a field name into segments as a web browser would do.
-     *
-     * <code>
-     *     getSegments('base[foo][3][]') = array('base', 'foo, '3', '');
-     * </code>
-     *
-     * @param string $name The name of the field
-     *
-     * @return string[] The list of segments
-     *
-     * @throws \InvalidArgumentException when the name is malformed
-     */
-    private function getSegments($name)
-    {
-        if (preg_match('/^(?P<base>[^[]+)(?P<extra>(\[.*)|$)/', $name, $m)) {
-            $segments = array($m['base']);
-            while (!empty($m['extra'])) {
-                if (preg_match('/^\[(?P<segment>.*?)\](?P<extra>.*)$/', $m['extra'], $m)) {
-                    $segments[] = $m['segment'];
-                } else {
-                    throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name));
-                }
-            }
-
-            return $segments;
-        }
-
-        throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name));
-    }
-}
diff --git a/vendor/symfony/dom-crawler/LICENSE b/vendor/symfony/dom-crawler/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/dom-crawler/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/dom-crawler/Link.php b/vendor/symfony/dom-crawler/Link.php
deleted file mode 100644
index ede0991..0000000
--- a/vendor/symfony/dom-crawler/Link.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?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\Component\DomCrawler;
-
-/**
- * Link represents an HTML link (an HTML a, area or link tag).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Link
-{
-    /**
-     * @var \DOMElement
-     */
-    protected $node;
-
-    /**
-     * @var string The method to use for the link
-     */
-    protected $method;
-
-    /**
-     * @var string The URI of the page where the link is embedded (or the base href)
-     */
-    protected $currentUri;
-
-    /**
-     * Constructor.
-     *
-     * @param \DOMElement $node       A \DOMElement instance
-     * @param string      $currentUri The URI of the page where the link is embedded (or the base href)
-     * @param string      $method     The method to use for the link (get by default)
-     *
-     * @throws \InvalidArgumentException if the node is not a link
-     */
-    public function __construct(\DOMElement $node, $currentUri, $method = 'GET')
-    {
-        if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
-            throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
-        }
-
-        $this->setNode($node);
-        $this->method = $method ? strtoupper($method) : null;
-        $this->currentUri = $currentUri;
-    }
-
-    /**
-     * Gets the node associated with this link.
-     *
-     * @return \DOMElement A \DOMElement instance
-     */
-    public function getNode()
-    {
-        return $this->node;
-    }
-
-    /**
-     * Gets the method associated with this link.
-     *
-     * @return string The method
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Gets the URI associated with this link.
-     *
-     * @return string The URI
-     */
-    public function getUri()
-    {
-        $uri = trim($this->getRawUri());
-
-        // absolute URL?
-        if (null !== parse_url($uri, PHP_URL_SCHEME)) {
-            return $uri;
-        }
-
-        // empty URI
-        if (!$uri) {
-            return $this->currentUri;
-        }
-
-        // an anchor
-        if ('#' === $uri[0]) {
-            return $this->cleanupAnchor($this->currentUri).$uri;
-        }
-
-        $baseUri = $this->cleanupUri($this->currentUri);
-
-        if ('?' === $uri[0]) {
-            return $baseUri.$uri;
-        }
-
-        // absolute URL with relative schema
-        if (0 === strpos($uri, '//')) {
-            return preg_replace('#^([^/]*)//.*$#', '$1', $baseUri).$uri;
-        }
-
-        $baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $baseUri);
-
-        // absolute path
-        if ('/' === $uri[0]) {
-            return $baseUri.$uri;
-        }
-
-        // relative path
-        $path = parse_url(substr($this->currentUri, strlen($baseUri)), PHP_URL_PATH);
-        $path = $this->canonicalizePath(substr($path, 0, strrpos($path, '/')).'/'.$uri);
-
-        return $baseUri.('' === $path || '/' !== $path[0] ? '/' : '').$path;
-    }
-
-    /**
-     * Returns raw URI data.
-     *
-     * @return string
-     */
-    protected function getRawUri()
-    {
-        return $this->node->getAttribute('href');
-    }
-
-    /**
-     * Returns the canonicalized URI path (see RFC 3986, section 5.2.4).
-     *
-     * @param string $path URI path
-     *
-     * @return string
-     */
-    protected function canonicalizePath($path)
-    {
-        if ('' === $path || '/' === $path) {
-            return $path;
-        }
-
-        if ('.' === substr($path, -1)) {
-            $path .= '/';
-        }
-
-        $output = array();
-
-        foreach (explode('/', $path) as $segment) {
-            if ('..' === $segment) {
-                array_pop($output);
-            } elseif ('.' !== $segment) {
-                $output[] = $segment;
-            }
-        }
-
-        return implode('/', $output);
-    }
-
-    /**
-     * Sets current \DOMElement instance.
-     *
-     * @param \DOMElement $node A \DOMElement instance
-     *
-     * @throws \LogicException If given node is not an anchor
-     */
-    protected function setNode(\DOMElement $node)
-    {
-        if ('a' !== $node->nodeName && 'area' !== $node->nodeName && 'link' !== $node->nodeName) {
-            throw new \LogicException(sprintf('Unable to navigate from a "%s" tag.', $node->nodeName));
-        }
-
-        $this->node = $node;
-    }
-
-    /**
-     * Removes the query string and the anchor from the given uri.
-     *
-     * @param string $uri The uri to clean
-     *
-     * @return string
-     */
-    private function cleanupUri($uri)
-    {
-        return $this->cleanupQuery($this->cleanupAnchor($uri));
-    }
-
-    /**
-     * Remove the query string from the uri.
-     *
-     * @param string $uri
-     *
-     * @return string
-     */
-    private function cleanupQuery($uri)
-    {
-        if (false !== $pos = strpos($uri, '?')) {
-            return substr($uri, 0, $pos);
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Remove the anchor from the uri.
-     *
-     * @param string $uri
-     *
-     * @return string
-     */
-    private function cleanupAnchor($uri)
-    {
-        if (false !== $pos = strpos($uri, '#')) {
-            return substr($uri, 0, $pos);
-        }
-
-        return $uri;
-    }
-}
diff --git a/vendor/symfony/dom-crawler/README.md b/vendor/symfony/dom-crawler/README.md
deleted file mode 100644
index d2c8de5..0000000
--- a/vendor/symfony/dom-crawler/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-DomCrawler Component
-====================
-
-DomCrawler eases DOM navigation for HTML and XML documents.
-
-If you are familiar with jQuery, DomCrawler is a PHP equivalent:
-
-```php
-use Symfony\Component\DomCrawler\Crawler;
-
-$crawler = new Crawler();
-$crawler->addContent('<html><body><p>Hello World!</p></body></html>');
-
-print $crawler->filterXPath('descendant-or-self::body/p')->text();
-```
-
-If you are also using the CssSelector component, you can use CSS Selectors
-instead of XPath expressions:
-
-```php
-use Symfony\Component\DomCrawler\Crawler;
-
-$crawler = new Crawler();
-$crawler->addContent('<html><body><p>Hello World!</p></body></html>');
-
-print $crawler->filter('body > p')->text();
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/DomCrawler/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/dom-crawler/composer.json b/vendor/symfony/dom-crawler/composer.json
deleted file mode 100644
index f8033c5..0000000
--- a/vendor/symfony/dom-crawler/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "symfony/dom-crawler",
-    "type": "library",
-    "description": "Symfony DomCrawler Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/css-selector": "~2.3"
-    },
-    "suggest": {
-        "symfony/css-selector": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\DomCrawler\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/dom-crawler/phpunit.xml.dist b/vendor/symfony/dom-crawler/phpunit.xml.dist
deleted file mode 100644
index d15dd6a..0000000
--- a/vendor/symfony/dom-crawler/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony DomCrawler Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/event-dispatcher/.gitignore b/vendor/symfony/event-dispatcher/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/event-dispatcher/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/event-dispatcher/CHANGELOG.md b/vendor/symfony/event-dispatcher/CHANGELOG.md
deleted file mode 100644
index bb42ee1..0000000
--- a/vendor/symfony/event-dispatcher/CHANGELOG.md
+++ /dev/null
@@ -1,23 +0,0 @@
-CHANGELOG
-=========
-
-2.5.0
------
-
- * added Debug\TraceableEventDispatcher (originally in HttpKernel)
- * changed Debug\TraceableEventDispatcherInterface to extend EventDispatcherInterface
- * added RegisterListenersPass (originally in HttpKernel)
-
-2.1.0
------
-
- * added TraceableEventDispatcherInterface
- * added ContainerAwareEventDispatcher
- * added a reference to the EventDispatcher on the Event
- * added a reference to the Event name on the event
- * added fluid interface to the dispatch() method which now returns the Event
-   object
- * added GenericEvent event class
- * added the possibility for subscribers to subscribe several times for the
-   same event
- * added ImmutableEventDispatcher
diff --git a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php b/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
deleted file mode 100644
index b92defe..0000000
--- a/vendor/symfony/event-dispatcher/ContainerAwareEventDispatcher.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?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\Component\EventDispatcher;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Lazily loads listeners and subscribers from the dependency injection
- * container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Jordan Alliot <jordan.alliot@gmail.com>
- */
-class ContainerAwareEventDispatcher extends EventDispatcher
-{
-    /**
-     * The container from where services are loaded.
-     *
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * The service IDs of the event listeners and subscribers.
-     *
-     * @var array
-     */
-    private $listenerIds = array();
-
-    /**
-     * The services registered as listeners.
-     *
-     * @var array
-     */
-    private $listeners = array();
-
-    /**
-     * Constructor.
-     *
-     * @param ContainerInterface $container A ContainerInterface instance
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-    /**
-     * Adds a service as event listener.
-     *
-     * @param string $eventName Event for which the listener is added
-     * @param array  $callback  The service ID of the listener service & the method
-     *                          name that has to be called
-     * @param int    $priority  The higher this value, the earlier an event listener
-     *                          will be triggered in the chain.
-     *                          Defaults to 0.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addListenerService($eventName, $callback, $priority = 0)
-    {
-        if (!is_array($callback) || 2 !== count($callback)) {
-            throw new \InvalidArgumentException('Expected an array("service", "method") argument');
-        }
-
-        $this->listenerIds[$eventName][] = array($callback[0], $callback[1], $priority);
-    }
-
-    public function removeListener($eventName, $listener)
-    {
-        $this->lazyLoad($eventName);
-
-        if (isset($this->listenerIds[$eventName])) {
-            foreach ($this->listenerIds[$eventName] as $i => $args) {
-                list($serviceId, $method, $priority) = $args;
-                $key = $serviceId.'.'.$method;
-                if (isset($this->listeners[$eventName][$key]) && $listener === array($this->listeners[$eventName][$key], $method)) {
-                    unset($this->listeners[$eventName][$key]);
-                    if (empty($this->listeners[$eventName])) {
-                        unset($this->listeners[$eventName]);
-                    }
-                    unset($this->listenerIds[$eventName][$i]);
-                    if (empty($this->listenerIds[$eventName])) {
-                        unset($this->listenerIds[$eventName]);
-                    }
-                }
-            }
-        }
-
-        parent::removeListener($eventName, $listener);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasListeners($eventName = null)
-    {
-        if (null === $eventName) {
-            return (bool) count($this->listenerIds) || (bool) count($this->listeners);
-        }
-
-        if (isset($this->listenerIds[$eventName])) {
-            return true;
-        }
-
-        return parent::hasListeners($eventName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getListeners($eventName = null)
-    {
-        if (null === $eventName) {
-            foreach ($this->listenerIds as $serviceEventName => $args) {
-                $this->lazyLoad($serviceEventName);
-            }
-        } else {
-            $this->lazyLoad($eventName);
-        }
-
-        return parent::getListeners($eventName);
-    }
-
-    /**
-     * Adds a service as event subscriber.
-     *
-     * @param string $serviceId The service ID of the subscriber service
-     * @param string $class     The service's class name (which must implement EventSubscriberInterface)
-     */
-    public function addSubscriberService($serviceId, $class)
-    {
-        foreach ($class::getSubscribedEvents() as $eventName => $params) {
-            if (is_string($params)) {
-                $this->listenerIds[$eventName][] = array($serviceId, $params, 0);
-            } elseif (is_string($params[0])) {
-                $this->listenerIds[$eventName][] = array($serviceId, $params[0], isset($params[1]) ? $params[1] : 0);
-            } else {
-                foreach ($params as $listener) {
-                    $this->listenerIds[$eventName][] = array($serviceId, $listener[0], isset($listener[1]) ? $listener[1] : 0);
-                }
-            }
-        }
-    }
-
-    public function getContainer()
-    {
-        return $this->container;
-    }
-
-    /**
-     * Lazily loads listeners for this event from the dependency injection
-     * container.
-     *
-     * @param string $eventName The name of the event to dispatch. The name of
-     *                          the event is the name of the method that is
-     *                          invoked on listeners.
-     */
-    protected function lazyLoad($eventName)
-    {
-        if (isset($this->listenerIds[$eventName])) {
-            foreach ($this->listenerIds[$eventName] as $args) {
-                list($serviceId, $method, $priority) = $args;
-                $listener = $this->container->get($serviceId);
-
-                $key = $serviceId.'.'.$method;
-                if (!isset($this->listeners[$eventName][$key])) {
-                    $this->addListener($eventName, array($listener, $method), $priority);
-                } elseif ($listener !== $this->listeners[$eventName][$key]) {
-                    parent::removeListener($eventName, array($this->listeners[$eventName][$key], $method));
-                    $this->addListener($eventName, array($listener, $method), $priority);
-                }
-
-                $this->listeners[$eventName][$key] = $listener;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
deleted file mode 100644
index 7653ccf..0000000
--- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?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\Component\EventDispatcher\Debug;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Stopwatch\Stopwatch;
-use Psr\Log\LoggerInterface;
-
-/**
- * Collects some data about event listeners.
- *
- * This event dispatcher delegates the dispatching to another one.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TraceableEventDispatcher implements TraceableEventDispatcherInterface
-{
-    protected $logger;
-    protected $stopwatch;
-
-    private $called;
-    private $dispatcher;
-    private $wrappedListeners;
-
-    /**
-     * Constructor.
-     *
-     * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
-     * @param Stopwatch                $stopwatch  A Stopwatch instance
-     * @param LoggerInterface          $logger     A LoggerInterface instance
-     */
-    public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null)
-    {
-        $this->dispatcher = $dispatcher;
-        $this->stopwatch = $stopwatch;
-        $this->logger = $logger;
-        $this->called = array();
-        $this->wrappedListeners = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addListener($eventName, $listener, $priority = 0)
-    {
-        $this->dispatcher->addListener($eventName, $listener, $priority);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addSubscriber(EventSubscriberInterface $subscriber)
-    {
-        $this->dispatcher->addSubscriber($subscriber);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeListener($eventName, $listener)
-    {
-        if (isset($this->wrappedListeners[$eventName])) {
-            foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
-                if ($wrappedListener->getWrappedListener() === $listener) {
-                    $listener = $wrappedListener;
-                    unset($this->wrappedListeners[$eventName][$index]);
-                    break;
-                }
-            }
-        }
-
-        return $this->dispatcher->removeListener($eventName, $listener);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeSubscriber(EventSubscriberInterface $subscriber)
-    {
-        return $this->dispatcher->removeSubscriber($subscriber);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getListeners($eventName = null)
-    {
-        return $this->dispatcher->getListeners($eventName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasListeners($eventName = null)
-    {
-        return $this->dispatcher->hasListeners($eventName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dispatch($eventName, Event $event = null)
-    {
-        if (null === $event) {
-            $event = new Event();
-        }
-
-        $this->preProcess($eventName);
-        $this->preDispatch($eventName, $event);
-
-        $e = $this->stopwatch->start($eventName, 'section');
-
-        $this->dispatcher->dispatch($eventName, $event);
-
-        if ($e->isStarted()) {
-            $e->stop();
-        }
-
-        $this->postDispatch($eventName, $event);
-        $this->postProcess($eventName);
-
-        return $event;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCalledListeners()
-    {
-        $called = array();
-        foreach ($this->called as $eventName => $listeners) {
-            foreach ($listeners as $listener) {
-                $info = $this->getListenerInfo($listener->getWrappedListener(), $eventName);
-                $called[$eventName.'.'.$info['pretty']] = $info;
-            }
-        }
-
-        return $called;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNotCalledListeners()
-    {
-        try {
-            $allListeners = $this->getListeners();
-        } catch (\Exception $e) {
-            if (null !== $this->logger) {
-                $this->logger->info('An exception was thrown while getting the uncalled listeners.', array('exception' => $e));
-            }
-
-            // unable to retrieve the uncalled listeners
-            return array();
-        }
-
-        $notCalled = array();
-        foreach ($allListeners as $eventName => $listeners) {
-            foreach ($listeners as $listener) {
-                $called = false;
-                if (isset($this->called[$eventName])) {
-                    foreach ($this->called[$eventName] as $l) {
-                        if ($l->getWrappedListener() === $listener) {
-                            $called = true;
-
-                            break;
-                        }
-                    }
-                }
-
-                if (!$called) {
-                    $info = $this->getListenerInfo($listener, $eventName);
-                    $notCalled[$eventName.'.'.$info['pretty']] = $info;
-                }
-            }
-        }
-
-        return $notCalled;
-    }
-
-    /**
-     * Proxies all method calls to the original event dispatcher.
-     *
-     * @param string $method    The method name
-     * @param array  $arguments The method arguments
-     *
-     * @return mixed
-     */
-    public function __call($method, $arguments)
-    {
-        return call_user_func_array(array($this->dispatcher, $method), $arguments);
-    }
-
-    /**
-     * Called before dispatching the event.
-     *
-     * @param string $eventName The event name
-     * @param Event  $event     The event
-     */
-    protected function preDispatch($eventName, Event $event)
-    {
-    }
-
-    /**
-     * Called after dispatching the event.
-     *
-     * @param string $eventName The event name
-     * @param Event  $event     The event
-     */
-    protected function postDispatch($eventName, Event $event)
-    {
-    }
-
-    private function preProcess($eventName)
-    {
-        foreach ($this->dispatcher->getListeners($eventName) as $listener) {
-            $this->dispatcher->removeListener($eventName, $listener);
-            $info = $this->getListenerInfo($listener, $eventName);
-            $name = isset($info['class']) ? $info['class'] : $info['type'];
-            $wrappedListener = new WrappedListener($listener, $name, $this->stopwatch, $this);
-            $this->wrappedListeners[$eventName][] = $wrappedListener;
-            $this->dispatcher->addListener($eventName, $wrappedListener);
-        }
-    }
-
-    private function postProcess($eventName)
-    {
-        unset($this->wrappedListeners[$eventName]);
-        $skipped = false;
-        foreach ($this->dispatcher->getListeners($eventName) as $listener) {
-            if (!$listener instanceof WrappedListener) { // #12845: a new listener was added during dispatch.
-                continue;
-            }
-            // Unwrap listener
-            $this->dispatcher->removeListener($eventName, $listener);
-            $this->dispatcher->addListener($eventName, $listener->getWrappedListener());
-
-            $info = $this->getListenerInfo($listener->getWrappedListener(), $eventName);
-            if ($listener->wasCalled()) {
-                if (null !== $this->logger) {
-                    $this->logger->debug(sprintf('Notified event "%s" to listener "%s".', $eventName, $info['pretty']));
-                }
-
-                if (!isset($this->called[$eventName])) {
-                    $this->called[$eventName] = new \SplObjectStorage();
-                }
-
-                $this->called[$eventName]->attach($listener);
-            }
-
-            if (null !== $this->logger && $skipped) {
-                $this->logger->debug(sprintf('Listener "%s" was not called for event "%s".', $info['pretty'], $eventName));
-            }
-
-            if ($listener->stoppedPropagation()) {
-                if (null !== $this->logger) {
-                    $this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s".', $info['pretty'], $eventName));
-                }
-
-                $skipped = true;
-            }
-        }
-    }
-
-    /**
-     * Returns information about the listener.
-     *
-     * @param object $listener  The listener
-     * @param string $eventName The event name
-     *
-     * @return array Information about the listener
-     */
-    private function getListenerInfo($listener, $eventName)
-    {
-        $info = array(
-            'event' => $eventName,
-        );
-        if ($listener instanceof \Closure) {
-            $info += array(
-                'type' => 'Closure',
-                'pretty' => 'closure',
-            );
-        } elseif (is_string($listener)) {
-            try {
-                $r = new \ReflectionFunction($listener);
-                $file = $r->getFileName();
-                $line = $r->getStartLine();
-            } catch (\ReflectionException $e) {
-                $file = null;
-                $line = null;
-            }
-            $info += array(
-                'type' => 'Function',
-                'function' => $listener,
-                'file' => $file,
-                'line' => $line,
-                'pretty' => $listener,
-            );
-        } elseif (is_array($listener) || (is_object($listener) && is_callable($listener))) {
-            if (!is_array($listener)) {
-                $listener = array($listener, '__invoke');
-            }
-            $class = is_object($listener[0]) ? get_class($listener[0]) : $listener[0];
-            try {
-                $r = new \ReflectionMethod($class, $listener[1]);
-                $file = $r->getFileName();
-                $line = $r->getStartLine();
-            } catch (\ReflectionException $e) {
-                $file = null;
-                $line = null;
-            }
-            $info += array(
-                'type' => 'Method',
-                'class' => $class,
-                'method' => $listener[1],
-                'file' => $file,
-                'line' => $line,
-                'pretty' => $class.'::'.$listener[1],
-            );
-        }
-
-        return $info;
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php b/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php
deleted file mode 100644
index 5483e81..0000000
--- a/vendor/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\EventDispatcher\Debug;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface TraceableEventDispatcherInterface extends EventDispatcherInterface
-{
-    /**
-     * Gets the called listeners.
-     *
-     * @return array An array of called listeners
-     */
-    public function getCalledListeners();
-
-    /**
-     * Gets the not called listeners.
-     *
-     * @return array An array of not called listeners
-     */
-    public function getNotCalledListeners();
-}
diff --git a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php b/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
deleted file mode 100644
index e16627d..0000000
--- a/vendor/symfony/event-dispatcher/Debug/WrappedListener.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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\Component\EventDispatcher\Debug;
-
-use Symfony\Component\Stopwatch\Stopwatch;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class WrappedListener
-{
-    private $listener;
-    private $name;
-    private $called;
-    private $stoppedPropagation;
-    private $stopwatch;
-    private $dispatcher;
-
-    public function __construct($listener, $name, Stopwatch $stopwatch, EventDispatcherInterface $dispatcher = null)
-    {
-        $this->listener = $listener;
-        $this->name = $name;
-        $this->stopwatch = $stopwatch;
-        $this->dispatcher = $dispatcher;
-        $this->called = false;
-        $this->stoppedPropagation = false;
-    }
-
-    public function getWrappedListener()
-    {
-        return $this->listener;
-    }
-
-    public function wasCalled()
-    {
-        return $this->called;
-    }
-
-    public function stoppedPropagation()
-    {
-        return $this->stoppedPropagation;
-    }
-
-    public function __invoke(Event $event, $eventName, EventDispatcherInterface $dispatcher)
-    {
-        $this->called = true;
-
-        $e = $this->stopwatch->start($this->name, 'event_listener');
-
-        call_user_func($this->listener, $event, $eventName, $this->dispatcher ?: $dispatcher);
-
-        if ($e->isStarted()) {
-            $e->stop();
-        }
-
-        if ($event->isPropagationStopped()) {
-            $this->stoppedPropagation = true;
-        }
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
deleted file mode 100644
index 7e74a37..0000000
--- a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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\Component\EventDispatcher\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Compiler pass to register tagged services for an event dispatcher.
- */
-class RegisterListenersPass implements CompilerPassInterface
-{
-    /**
-     * @var string
-     */
-    protected $dispatcherService;
-
-    /**
-     * @var string
-     */
-    protected $listenerTag;
-
-    /**
-     * @var string
-     */
-    protected $subscriberTag;
-
-    /**
-     * Constructor.
-     *
-     * @param string $dispatcherService Service name of the event dispatcher in processed container
-     * @param string $listenerTag       Tag name used for listener
-     * @param string $subscriberTag     Tag name used for subscribers
-     */
-    public function __construct($dispatcherService = 'event_dispatcher', $listenerTag = 'kernel.event_listener', $subscriberTag = 'kernel.event_subscriber')
-    {
-        $this->dispatcherService = $dispatcherService;
-        $this->listenerTag = $listenerTag;
-        $this->subscriberTag = $subscriberTag;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->dispatcherService) && !$container->hasAlias($this->dispatcherService)) {
-            return;
-        }
-
-        $definition = $container->findDefinition($this->dispatcherService);
-
-        foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
-            $def = $container->getDefinition($id);
-            if (!$def->isPublic()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must be public as event listeners are lazy-loaded.', $id));
-            }
-
-            if ($def->isAbstract()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must not be abstract as event listeners are lazy-loaded.', $id));
-            }
-
-            foreach ($events as $event) {
-                $priority = isset($event['priority']) ? $event['priority'] : 0;
-
-                if (!isset($event['event'])) {
-                    throw new \InvalidArgumentException(sprintf('Service "%s" must define the "event" attribute on "%s" tags.', $id, $this->listenerTag));
-                }
-
-                if (!isset($event['method'])) {
-                    $event['method'] = 'on'.preg_replace_callback(array(
-                        '/(?<=\b)[a-z]/i',
-                        '/[^a-z0-9]/i',
-                    ), function ($matches) { return strtoupper($matches[0]); }, $event['event']);
-                    $event['method'] = preg_replace('/[^a-z0-9]/i', '', $event['method']);
-                }
-
-                $definition->addMethodCall('addListenerService', array($event['event'], array($id, $event['method']), $priority));
-            }
-        }
-
-        foreach ($container->findTaggedServiceIds($this->subscriberTag) as $id => $attributes) {
-            $def = $container->getDefinition($id);
-            if (!$def->isPublic()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must be public as event subscribers are lazy-loaded.', $id));
-            }
-
-            if ($def->isAbstract()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
-            }
-
-            // We must assume that the class value has been correctly filled, even if the service is created by a factory
-            $class = $container->getParameterBag()->resolveValue($def->getClass());
-
-            $refClass = new \ReflectionClass($class);
-            $interface = 'Symfony\Component\EventDispatcher\EventSubscriberInterface';
-            if (!$refClass->implementsInterface($interface)) {
-                throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
-            }
-
-            $definition->addMethodCall('addSubscriberService', array($id, $class));
-        }
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Event.php b/vendor/symfony/event-dispatcher/Event.php
deleted file mode 100644
index 4a56349..0000000
--- a/vendor/symfony/event-dispatcher/Event.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * Event is the base class for classes containing event data.
- *
- * This class contains no event data. It is used by events that do not pass
- * state information to an event handler when an event is raised.
- *
- * You can call the method stopPropagation() to abort the execution of
- * further listeners in your event listener.
- *
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Event
-{
-    /**
-     * @var bool Whether no further event listeners should be triggered
-     */
-    private $propagationStopped = false;
-
-    /**
-     * @var EventDispatcher Dispatcher that dispatched this event
-     */
-    private $dispatcher;
-
-    /**
-     * @var string This event's name
-     */
-    private $name;
-
-    /**
-     * Returns whether further event listeners should be triggered.
-     *
-     * @see Event::stopPropagation()
-     *
-     * @return bool Whether propagation was already stopped for this event.
-     */
-    public function isPropagationStopped()
-    {
-        return $this->propagationStopped;
-    }
-
-    /**
-     * Stops the propagation of the event to further event listeners.
-     *
-     * If multiple event listeners are connected to the same event, no
-     * further event listener will be triggered once any trigger calls
-     * stopPropagation().
-     */
-    public function stopPropagation()
-    {
-        $this->propagationStopped = true;
-    }
-
-    /**
-     * Stores the EventDispatcher that dispatches this Event.
-     *
-     * @param EventDispatcherInterface $dispatcher
-     *
-     * @deprecated since version 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
-     */
-    public function setDispatcher(EventDispatcherInterface $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * Returns the EventDispatcher that dispatches this Event.
-     *
-     * @return EventDispatcherInterface
-     *
-     * @deprecated since version 2.4, to be removed in 3.0. The event dispatcher is passed to the listener call.
-     */
-    public function getDispatcher()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event dispatcher instance can be received in the listener call instead.', E_USER_DEPRECATED);
-
-        return $this->dispatcher;
-    }
-
-    /**
-     * Gets the event's name.
-     *
-     * @return string
-     *
-     * @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
-     */
-    public function getName()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0. The event name can be received in the listener call instead.', E_USER_DEPRECATED);
-
-        return $this->name;
-    }
-
-    /**
-     * Sets the event's name property.
-     *
-     * @param string $name The event name.
-     *
-     * @deprecated since version 2.4, to be removed in 3.0. The event name is passed to the listener call.
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/EventDispatcher.php b/vendor/symfony/event-dispatcher/EventDispatcher.php
deleted file mode 100644
index b54d07b..0000000
--- a/vendor/symfony/event-dispatcher/EventDispatcher.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * The EventDispatcherInterface is the central point of Symfony's event listener system.
- *
- * Listeners are registered on the manager and events are dispatched through the
- * manager.
- *
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Jordan Alliot <jordan.alliot@gmail.com>
- */
-class EventDispatcher implements EventDispatcherInterface
-{
-    private $listeners = array();
-    private $sorted = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dispatch($eventName, Event $event = null)
-    {
-        if (null === $event) {
-            $event = new Event();
-        }
-
-        $event->setDispatcher($this);
-        $event->setName($eventName);
-
-        if ($listeners = $this->getListeners($eventName)) {
-            $this->doDispatch($listeners, $eventName, $event);
-        }
-
-        return $event;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getListeners($eventName = null)
-    {
-        if (null !== $eventName) {
-            if (!isset($this->listeners[$eventName])) {
-                return array();
-            }
-
-            if (!isset($this->sorted[$eventName])) {
-                $this->sortListeners($eventName);
-            }
-
-            return $this->sorted[$eventName];
-        }
-
-        foreach ($this->listeners as $eventName => $eventListeners) {
-            if (!isset($this->sorted[$eventName])) {
-                $this->sortListeners($eventName);
-            }
-        }
-
-        return array_filter($this->sorted);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasListeners($eventName = null)
-    {
-        return (bool) count($this->getListeners($eventName));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addListener($eventName, $listener, $priority = 0)
-    {
-        $this->listeners[$eventName][$priority][] = $listener;
-        unset($this->sorted[$eventName]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeListener($eventName, $listener)
-    {
-        if (!isset($this->listeners[$eventName])) {
-            return;
-        }
-
-        foreach ($this->listeners[$eventName] as $priority => $listeners) {
-            if (false !== ($key = array_search($listener, $listeners, true))) {
-                unset($this->listeners[$eventName][$priority][$key], $this->sorted[$eventName]);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addSubscriber(EventSubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            if (is_string($params)) {
-                $this->addListener($eventName, array($subscriber, $params));
-            } elseif (is_string($params[0])) {
-                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
-            } else {
-                foreach ($params as $listener) {
-                    $this->addListener($eventName, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeSubscriber(EventSubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
-            if (is_array($params) && is_array($params[0])) {
-                foreach ($params as $listener) {
-                    $this->removeListener($eventName, array($subscriber, $listener[0]));
-                }
-            } else {
-                $this->removeListener($eventName, array($subscriber, is_string($params) ? $params : $params[0]));
-            }
-        }
-    }
-
-    /**
-     * Triggers the listeners of an event.
-     *
-     * This method can be overridden to add functionality that is executed
-     * for each listener.
-     *
-     * @param callable[] $listeners The event listeners.
-     * @param string     $eventName The name of the event to dispatch.
-     * @param Event      $event     The event object to pass to the event handlers/listeners.
-     */
-    protected function doDispatch($listeners, $eventName, Event $event)
-    {
-        foreach ($listeners as $listener) {
-            call_user_func($listener, $event, $eventName, $this);
-            if ($event->isPropagationStopped()) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Sorts the internal list of listeners for the given event by priority.
-     *
-     * @param string $eventName The name of the event.
-     */
-    private function sortListeners($eventName)
-    {
-        $this->sorted[$eventName] = array();
-
-        krsort($this->listeners[$eventName]);
-        $this->sorted[$eventName] = call_user_func_array('array_merge', $this->listeners[$eventName]);
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/EventDispatcherInterface.php b/vendor/symfony/event-dispatcher/EventDispatcherInterface.php
deleted file mode 100644
index a9bdd2c..0000000
--- a/vendor/symfony/event-dispatcher/EventDispatcherInterface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * The EventDispatcherInterface is the central point of Symfony's event listener system.
- * Listeners are registered on the manager and events are dispatched through the
- * manager.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface EventDispatcherInterface
-{
-    /**
-     * Dispatches an event to all registered listeners.
-     *
-     * @param string $eventName The name of the event to dispatch. The name of
-     *                          the event is the name of the method that is
-     *                          invoked on listeners.
-     * @param Event  $event     The event to pass to the event handlers/listeners.
-     *                          If not supplied, an empty Event instance is created.
-     *
-     * @return Event
-     */
-    public function dispatch($eventName, Event $event = null);
-
-    /**
-     * Adds an event listener that listens on the specified events.
-     *
-     * @param string   $eventName The event to listen on
-     * @param callable $listener  The listener
-     * @param int      $priority  The higher this value, the earlier an event
-     *                            listener will be triggered in the chain (defaults to 0)
-     */
-    public function addListener($eventName, $listener, $priority = 0);
-
-    /**
-     * Adds an event subscriber.
-     *
-     * The subscriber is asked for all the events he is
-     * interested in and added as a listener for these events.
-     *
-     * @param EventSubscriberInterface $subscriber The subscriber.
-     */
-    public function addSubscriber(EventSubscriberInterface $subscriber);
-
-    /**
-     * Removes an event listener from the specified events.
-     *
-     * @param string   $eventName The event to remove a listener from
-     * @param callable $listener  The listener to remove
-     */
-    public function removeListener($eventName, $listener);
-
-    /**
-     * Removes an event subscriber.
-     *
-     * @param EventSubscriberInterface $subscriber The subscriber
-     */
-    public function removeSubscriber(EventSubscriberInterface $subscriber);
-
-    /**
-     * Gets the listeners of a specific event or all listeners sorted by descending priority.
-     *
-     * @param string $eventName The name of the event
-     *
-     * @return array The event listeners for the specified event, or all event listeners by event name
-     */
-    public function getListeners($eventName = null);
-
-    /**
-     * Checks whether an event has any registered listeners.
-     *
-     * @param string $eventName The name of the event
-     *
-     * @return bool true if the specified event has any listeners, false otherwise
-     */
-    public function hasListeners($eventName = null);
-}
diff --git a/vendor/symfony/event-dispatcher/EventSubscriberInterface.php b/vendor/symfony/event-dispatcher/EventSubscriberInterface.php
deleted file mode 100644
index ec53e54..0000000
--- a/vendor/symfony/event-dispatcher/EventSubscriberInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * An EventSubscriber knows himself what events he is interested in.
- * If an EventSubscriber is added to an EventDispatcherInterface, the manager invokes
- * {@link getSubscribedEvents} and registers the subscriber as a listener for all
- * returned events.
- *
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface EventSubscriberInterface
-{
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The array keys are event names and the value can be:
-     *
-     *  * The method name to call (priority defaults to 0)
-     *  * An array composed of the method name to call and the priority
-     *  * An array of arrays composed of the method names to call and respective
-     *    priorities, or 0 if unset
-     *
-     * For instance:
-     *
-     *  * array('eventName' => 'methodName')
-     *  * array('eventName' => array('methodName', $priority))
-     *  * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
-     *
-     * @return array The event names to listen to
-     */
-    public static function getSubscribedEvents();
-}
diff --git a/vendor/symfony/event-dispatcher/GenericEvent.php b/vendor/symfony/event-dispatcher/GenericEvent.php
deleted file mode 100644
index 6458180..0000000
--- a/vendor/symfony/event-dispatcher/GenericEvent.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * Event encapsulation class.
- *
- * Encapsulates events thus decoupling the observer from the subject they encapsulate.
- *
- * @author Drak <drak@zikula.org>
- */
-class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
-{
-    /**
-     * Event subject.
-     *
-     * @var mixed usually object or callable
-     */
-    protected $subject;
-
-    /**
-     * Array of arguments.
-     *
-     * @var array
-     */
-    protected $arguments;
-
-    /**
-     * Encapsulate an event with $subject and $args.
-     *
-     * @param mixed $subject   The subject of the event, usually an object.
-     * @param array $arguments Arguments to store in the event.
-     */
-    public function __construct($subject = null, array $arguments = array())
-    {
-        $this->subject = $subject;
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Getter for subject property.
-     *
-     * @return mixed $subject The observer subject.
-     */
-    public function getSubject()
-    {
-        return $this->subject;
-    }
-
-    /**
-     * Get argument by key.
-     *
-     * @param string $key Key.
-     *
-     * @throws \InvalidArgumentException If key is not found.
-     *
-     * @return mixed Contents of array key.
-     */
-    public function getArgument($key)
-    {
-        if ($this->hasArgument($key)) {
-            return $this->arguments[$key];
-        }
-
-        throw new \InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
-    }
-
-    /**
-     * Add argument to event.
-     *
-     * @param string $key   Argument name.
-     * @param mixed  $value Value.
-     *
-     * @return GenericEvent
-     */
-    public function setArgument($key, $value)
-    {
-        $this->arguments[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Getter for all arguments.
-     *
-     * @return array
-     */
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * Set args property.
-     *
-     * @param array $args Arguments.
-     *
-     * @return GenericEvent
-     */
-    public function setArguments(array $args = array())
-    {
-        $this->arguments = $args;
-
-        return $this;
-    }
-
-    /**
-     * Has argument.
-     *
-     * @param string $key Key of arguments array.
-     *
-     * @return bool
-     */
-    public function hasArgument($key)
-    {
-        return array_key_exists($key, $this->arguments);
-    }
-
-    /**
-     * ArrayAccess for argument getter.
-     *
-     * @param string $key Array key.
-     *
-     * @throws \InvalidArgumentException If key does not exist in $this->args.
-     *
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        return $this->getArgument($key);
-    }
-
-    /**
-     * ArrayAccess for argument setter.
-     *
-     * @param string $key   Array key to set.
-     * @param mixed  $value Value.
-     */
-    public function offsetSet($key, $value)
-    {
-        $this->setArgument($key, $value);
-    }
-
-    /**
-     * ArrayAccess for unset argument.
-     *
-     * @param string $key Array key.
-     */
-    public function offsetUnset($key)
-    {
-        if ($this->hasArgument($key)) {
-            unset($this->arguments[$key]);
-        }
-    }
-
-    /**
-     * ArrayAccess has argument.
-     *
-     * @param string $key Array key.
-     *
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return $this->hasArgument($key);
-    }
-
-    /**
-     * IteratorAggregate for iterating over the object like an array.
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->arguments);
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php b/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php
deleted file mode 100644
index 7ef9ece..0000000
--- a/vendor/symfony/event-dispatcher/ImmutableEventDispatcher.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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\Component\EventDispatcher;
-
-/**
- * A read-only proxy for an event dispatcher.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ImmutableEventDispatcher implements EventDispatcherInterface
-{
-    /**
-     * The proxied dispatcher.
-     *
-     * @var EventDispatcherInterface
-     */
-    private $dispatcher;
-
-    /**
-     * Creates an unmodifiable proxy for an event dispatcher.
-     *
-     * @param EventDispatcherInterface $dispatcher The proxied event dispatcher.
-     */
-    public function __construct(EventDispatcherInterface $dispatcher)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dispatch($eventName, Event $event = null)
-    {
-        return $this->dispatcher->dispatch($eventName, $event);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addListener($eventName, $listener, $priority = 0)
-    {
-        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addSubscriber(EventSubscriberInterface $subscriber)
-    {
-        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeListener($eventName, $listener)
-    {
-        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeSubscriber(EventSubscriberInterface $subscriber)
-    {
-        throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getListeners($eventName = null)
-    {
-        return $this->dispatcher->getListeners($eventName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasListeners($eventName = null)
-    {
-        return $this->dispatcher->hasListeners($eventName);
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/LICENSE b/vendor/symfony/event-dispatcher/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/event-dispatcher/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/event-dispatcher/README.md b/vendor/symfony/event-dispatcher/README.md
deleted file mode 100644
index 8031f4d..0000000
--- a/vendor/symfony/event-dispatcher/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-EventDispatcher Component
-=========================
-
-The Symfony EventDispatcher component implements the Mediator pattern in a
-simple and effective way to make your projects truly extensible.
-
-```php
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
-
-$dispatcher = new EventDispatcher();
-
-$dispatcher->addListener('event_name', function (Event $event) {
-    // ...
-});
-
-$dispatcher->dispatch('event_name');
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/EventDispatcher/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
deleted file mode 100644
index 2e4c3fd..0000000
--- a/vendor/symfony/event-dispatcher/Tests/AbstractEventDispatcherTest.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-abstract class AbstractEventDispatcherTest extends \PHPUnit_Framework_TestCase
-{
-    /* Some pseudo events */
-    const preFoo = 'pre.foo';
-    const postFoo = 'post.foo';
-    const preBar = 'pre.bar';
-    const postBar = 'post.bar';
-
-    /**
-     * @var EventDispatcher
-     */
-    private $dispatcher;
-
-    private $listener;
-
-    protected function setUp()
-    {
-        $this->dispatcher = $this->createEventDispatcher();
-        $this->listener = new TestEventListener();
-    }
-
-    protected function tearDown()
-    {
-        $this->dispatcher = null;
-        $this->listener = null;
-    }
-
-    abstract protected function createEventDispatcher();
-
-    public function testInitialState()
-    {
-        $this->assertEquals(array(), $this->dispatcher->getListeners());
-        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertFalse($this->dispatcher->hasListeners(self::postFoo));
-    }
-
-    public function testAddListener()
-    {
-        $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo'));
-        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
-        $this->assertCount(1, $this->dispatcher->getListeners(self::preFoo));
-        $this->assertCount(1, $this->dispatcher->getListeners(self::postFoo));
-        $this->assertCount(2, $this->dispatcher->getListeners());
-    }
-
-    public function testGetListenersSortsByPriority()
-    {
-        $listener1 = new TestEventListener();
-        $listener2 = new TestEventListener();
-        $listener3 = new TestEventListener();
-        $listener1->name = '1';
-        $listener2->name = '2';
-        $listener3->name = '3';
-
-        $this->dispatcher->addListener('pre.foo', array($listener1, 'preFoo'), -10);
-        $this->dispatcher->addListener('pre.foo', array($listener2, 'preFoo'), 10);
-        $this->dispatcher->addListener('pre.foo', array($listener3, 'preFoo'));
-
-        $expected = array(
-            array($listener2, 'preFoo'),
-            array($listener3, 'preFoo'),
-            array($listener1, 'preFoo'),
-        );
-
-        $this->assertSame($expected, $this->dispatcher->getListeners('pre.foo'));
-    }
-
-    public function testGetAllListenersSortsByPriority()
-    {
-        $listener1 = new TestEventListener();
-        $listener2 = new TestEventListener();
-        $listener3 = new TestEventListener();
-        $listener4 = new TestEventListener();
-        $listener5 = new TestEventListener();
-        $listener6 = new TestEventListener();
-
-        $this->dispatcher->addListener('pre.foo', $listener1, -10);
-        $this->dispatcher->addListener('pre.foo', $listener2);
-        $this->dispatcher->addListener('pre.foo', $listener3, 10);
-        $this->dispatcher->addListener('post.foo', $listener4, -10);
-        $this->dispatcher->addListener('post.foo', $listener5);
-        $this->dispatcher->addListener('post.foo', $listener6, 10);
-
-        $expected = array(
-            'pre.foo' => array($listener3, $listener2, $listener1),
-            'post.foo' => array($listener6, $listener5, $listener4),
-        );
-
-        $this->assertSame($expected, $this->dispatcher->getListeners());
-    }
-
-    public function testDispatch()
-    {
-        $this->dispatcher->addListener('pre.foo', array($this->listener, 'preFoo'));
-        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'));
-        $this->dispatcher->dispatch(self::preFoo);
-        $this->assertTrue($this->listener->preFooInvoked);
-        $this->assertFalse($this->listener->postFooInvoked);
-        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch('noevent'));
-        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(self::preFoo));
-        $event = new Event();
-        $return = $this->dispatcher->dispatch(self::preFoo, $event);
-        $this->assertSame($event, $return);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyDispatch()
-    {
-        $event = new Event();
-        $return = $this->dispatcher->dispatch(self::preFoo, $event);
-        $this->assertEquals('pre.foo', $event->getName());
-    }
-
-    public function testDispatchForClosure()
-    {
-        $invoked = 0;
-        $listener = function () use (&$invoked) {
-            ++$invoked;
-        };
-        $this->dispatcher->addListener('pre.foo', $listener);
-        $this->dispatcher->addListener('post.foo', $listener);
-        $this->dispatcher->dispatch(self::preFoo);
-        $this->assertEquals(1, $invoked);
-    }
-
-    public function testStopEventPropagation()
-    {
-        $otherListener = new TestEventListener();
-
-        // postFoo() stops the propagation, so only one listener should
-        // be executed
-        // Manually set priority to enforce $this->listener to be called first
-        $this->dispatcher->addListener('post.foo', array($this->listener, 'postFoo'), 10);
-        $this->dispatcher->addListener('post.foo', array($otherListener, 'preFoo'));
-        $this->dispatcher->dispatch(self::postFoo);
-        $this->assertTrue($this->listener->postFooInvoked);
-        $this->assertFalse($otherListener->postFooInvoked);
-    }
-
-    public function testDispatchByPriority()
-    {
-        $invoked = array();
-        $listener1 = function () use (&$invoked) {
-            $invoked[] = '1';
-        };
-        $listener2 = function () use (&$invoked) {
-            $invoked[] = '2';
-        };
-        $listener3 = function () use (&$invoked) {
-            $invoked[] = '3';
-        };
-        $this->dispatcher->addListener('pre.foo', $listener1, -10);
-        $this->dispatcher->addListener('pre.foo', $listener2);
-        $this->dispatcher->addListener('pre.foo', $listener3, 10);
-        $this->dispatcher->dispatch(self::preFoo);
-        $this->assertEquals(array('3', '2', '1'), $invoked);
-    }
-
-    public function testRemoveListener()
-    {
-        $this->dispatcher->addListener('pre.bar', $this->listener);
-        $this->assertTrue($this->dispatcher->hasListeners(self::preBar));
-        $this->dispatcher->removeListener('pre.bar', $this->listener);
-        $this->assertFalse($this->dispatcher->hasListeners(self::preBar));
-        $this->dispatcher->removeListener('notExists', $this->listener);
-    }
-
-    public function testAddSubscriber()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
-    }
-
-    public function testAddSubscriberWithPriorities()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-
-        $eventSubscriber = new TestEventSubscriberWithPriorities();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-
-        $listeners = $this->dispatcher->getListeners('pre.foo');
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertCount(2, $listeners);
-        $this->assertInstanceOf('Symfony\Component\EventDispatcher\Tests\TestEventSubscriberWithPriorities', $listeners[0][0]);
-    }
-
-    public function testAddSubscriberWithMultipleListeners()
-    {
-        $eventSubscriber = new TestEventSubscriberWithMultipleListeners();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-
-        $listeners = $this->dispatcher->getListeners('pre.foo');
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertCount(2, $listeners);
-        $this->assertEquals('preFoo2', $listeners[0][1]);
-    }
-
-    public function testRemoveSubscriber()
-    {
-        $eventSubscriber = new TestEventSubscriber();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertTrue($this->dispatcher->hasListeners(self::postFoo));
-        $this->dispatcher->removeSubscriber($eventSubscriber);
-        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertFalse($this->dispatcher->hasListeners(self::postFoo));
-    }
-
-    public function testRemoveSubscriberWithPriorities()
-    {
-        $eventSubscriber = new TestEventSubscriberWithPriorities();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->dispatcher->removeSubscriber($eventSubscriber);
-        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
-    }
-
-    public function testRemoveSubscriberWithMultipleListeners()
-    {
-        $eventSubscriber = new TestEventSubscriberWithMultipleListeners();
-        $this->dispatcher->addSubscriber($eventSubscriber);
-        $this->assertTrue($this->dispatcher->hasListeners(self::preFoo));
-        $this->assertCount(2, $this->dispatcher->getListeners(self::preFoo));
-        $this->dispatcher->removeSubscriber($eventSubscriber);
-        $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyEventReceivesTheDispatcherInstance()
-    {
-        $dispatcher = null;
-        $this->dispatcher->addListener('test', function ($event) use (&$dispatcher) {
-            $dispatcher = $event->getDispatcher();
-        });
-        $this->dispatcher->dispatch('test');
-        $this->assertSame($this->dispatcher, $dispatcher);
-    }
-
-    public function testEventReceivesTheDispatcherInstanceAsArgument()
-    {
-        $listener = new TestWithDispatcher();
-        $this->dispatcher->addListener('test', array($listener, 'foo'));
-        $this->assertNull($listener->name);
-        $this->assertNull($listener->dispatcher);
-        $this->dispatcher->dispatch('test');
-        $this->assertEquals('test', $listener->name);
-        $this->assertSame($this->dispatcher, $listener->dispatcher);
-    }
-
-    /**
-     * @see https://bugs.php.net/bug.php?id=62976
-     *
-     * This bug affects:
-     *  - The PHP 5.3 branch for versions < 5.3.18
-     *  - The PHP 5.4 branch for versions < 5.4.8
-     *  - The PHP 5.5 branch is not affected
-     */
-    public function testWorkaroundForPhpBug62976()
-    {
-        $dispatcher = $this->createEventDispatcher();
-        $dispatcher->addListener('bug.62976', new CallableClass());
-        $dispatcher->removeListener('bug.62976', function () {});
-        $this->assertTrue($dispatcher->hasListeners('bug.62976'));
-    }
-
-    public function testHasListenersWhenAddedCallbackListenerIsRemoved()
-    {
-        $listener = function () {};
-        $this->dispatcher->addListener('foo', $listener);
-        $this->dispatcher->removeListener('foo', $listener);
-        $this->assertFalse($this->dispatcher->hasListeners());
-    }
-
-    public function testGetListenersWhenAddedCallbackListenerIsRemoved()
-    {
-        $listener = function () {};
-        $this->dispatcher->addListener('foo', $listener);
-        $this->dispatcher->removeListener('foo', $listener);
-        $this->assertSame(array(), $this->dispatcher->getListeners());
-    }
-
-    public function testHasListenersWithoutEventsReturnsFalseAfterHasListenersWithEventHasBeenCalled()
-    {
-        $this->assertFalse($this->dispatcher->hasListeners('foo'));
-        $this->assertFalse($this->dispatcher->hasListeners());
-    }
-}
-
-class CallableClass
-{
-    public function __invoke()
-    {
-    }
-}
-
-class TestEventListener
-{
-    public $preFooInvoked = false;
-    public $postFooInvoked = false;
-
-    /* Listener methods */
-
-    public function preFoo(Event $e)
-    {
-        $this->preFooInvoked = true;
-    }
-
-    public function postFoo(Event $e)
-    {
-        $this->postFooInvoked = true;
-
-        $e->stopPropagation();
-    }
-}
-
-class TestWithDispatcher
-{
-    public $name;
-    public $dispatcher;
-
-    public function foo(Event $e, $name, $dispatcher)
-    {
-        $this->name = $name;
-        $this->dispatcher = $dispatcher;
-    }
-}
-
-class TestEventSubscriber implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array('pre.foo' => 'preFoo', 'post.foo' => 'postFoo');
-    }
-}
-
-class TestEventSubscriberWithPriorities implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array(
-            'pre.foo' => array('preFoo', 10),
-            'post.foo' => array('postFoo'),
-            );
-    }
-}
-
-class TestEventSubscriberWithMultipleListeners implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array('pre.foo' => array(
-            array('preFoo1'),
-            array('preFoo2', 10),
-        ));
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
deleted file mode 100644
index 6f2fbcb..0000000
--- a/vendor/symfony/event-dispatcher/Tests/ContainerAwareEventDispatcherTest.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\Scope;
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-class ContainerAwareEventDispatcherTest extends AbstractEventDispatcherTest
-{
-    protected function createEventDispatcher()
-    {
-        $container = new Container();
-
-        return new ContainerAwareEventDispatcher($container);
-    }
-
-    public function testAddAListenerService()
-    {
-        $event = new Event();
-
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $service
-            ->expects($this->once())
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $dispatcher->dispatch('onEvent', $event);
-    }
-
-    public function testAddASubscriberService()
-    {
-        $event = new Event();
-
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\SubscriberService');
-
-        $service
-            ->expects($this->once())
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $container = new Container();
-        $container->set('service.subscriber', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addSubscriberService('service.subscriber', 'Symfony\Component\EventDispatcher\Tests\SubscriberService');
-
-        $dispatcher->dispatch('onEvent', $event);
-    }
-
-    public function testPreventDuplicateListenerService()
-    {
-        $event = new Event();
-
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $service
-            ->expects($this->once())
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 5);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'), 10);
-
-        $dispatcher->dispatch('onEvent', $event);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testTriggerAListenerServiceOutOfScope()
-    {
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $scope = new Scope('scope');
-        $container = new Container();
-        $container->addScope($scope);
-        $container->enterScope('scope');
-
-        $container->set('service.listener', $service, 'scope');
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $container->leaveScope('scope');
-        $dispatcher->dispatch('onEvent');
-    }
-
-    public function testReEnteringAScope()
-    {
-        $event = new Event();
-
-        $service1 = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $service1
-            ->expects($this->exactly(2))
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $scope = new Scope('scope');
-        $container = new Container();
-        $container->addScope($scope);
-        $container->enterScope('scope');
-
-        $container->set('service.listener', $service1, 'scope');
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-        $dispatcher->dispatch('onEvent', $event);
-
-        $service2 = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $service2
-            ->expects($this->once())
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $container->enterScope('scope');
-        $container->set('service.listener', $service2, 'scope');
-
-        $dispatcher->dispatch('onEvent', $event);
-
-        $container->leaveScope('scope');
-
-        $dispatcher->dispatch('onEvent');
-    }
-
-    public function testHasListenersOnLazyLoad()
-    {
-        $event = new Event();
-
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $event->setDispatcher($dispatcher);
-        $event->setName('onEvent');
-
-        $service
-            ->expects($this->once())
-            ->method('onEvent')
-            ->with($event)
-        ;
-
-        $this->assertTrue($dispatcher->hasListeners());
-
-        if ($dispatcher->hasListeners('onEvent')) {
-            $dispatcher->dispatch('onEvent');
-        }
-    }
-
-    public function testGetListenersOnLazyLoad()
-    {
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $listeners = $dispatcher->getListeners();
-
-        $this->assertTrue(isset($listeners['onEvent']));
-
-        $this->assertCount(1, $dispatcher->getListeners('onEvent'));
-    }
-
-    public function testRemoveAfterDispatch()
-    {
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $dispatcher->dispatch('onEvent', new Event());
-        $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent'));
-        $this->assertFalse($dispatcher->hasListeners('onEvent'));
-    }
-
-    public function testRemoveBeforeDispatch()
-    {
-        $service = $this->getMock('Symfony\Component\EventDispatcher\Tests\Service');
-
-        $container = new Container();
-        $container->set('service.listener', $service);
-
-        $dispatcher = new ContainerAwareEventDispatcher($container);
-        $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent'));
-
-        $dispatcher->removeListener('onEvent', array($container->get('service.listener'), 'onEvent'));
-        $this->assertFalse($dispatcher->hasListeners('onEvent'));
-    }
-}
-
-class Service
-{
-    public function onEvent(Event $e)
-    {
-    }
-}
-
-class SubscriberService implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array(
-            'onEvent' => array('onEvent'),
-        );
-    }
-
-    public function onEvent(Event $e)
-    {
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
deleted file mode 100644
index 4aa6226..0000000
--- a/vendor/symfony/event-dispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?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\Component\EventDispatcher\Tests\Debug;
-
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Stopwatch\Stopwatch;
-
-class TraceableEventDispatcherTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAddRemoveListener()
-    {
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-
-        $tdispatcher->addListener('foo', $listener = function () {; });
-        $listeners = $dispatcher->getListeners('foo');
-        $this->assertCount(1, $listeners);
-        $this->assertSame($listener, $listeners[0]);
-
-        $tdispatcher->removeListener('foo', $listener);
-        $this->assertCount(0, $dispatcher->getListeners('foo'));
-    }
-
-    public function testGetListeners()
-    {
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-
-        $tdispatcher->addListener('foo', $listener = function () {; });
-        $this->assertSame($dispatcher->getListeners('foo'), $tdispatcher->getListeners('foo'));
-    }
-
-    public function testHasListeners()
-    {
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-
-        $this->assertFalse($dispatcher->hasListeners('foo'));
-        $this->assertFalse($tdispatcher->hasListeners('foo'));
-
-        $tdispatcher->addListener('foo', $listener = function () {; });
-        $this->assertTrue($dispatcher->hasListeners('foo'));
-        $this->assertTrue($tdispatcher->hasListeners('foo'));
-    }
-
-    public function testAddRemoveSubscriber()
-    {
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-
-        $subscriber = new EventSubscriber();
-
-        $tdispatcher->addSubscriber($subscriber);
-        $listeners = $dispatcher->getListeners('foo');
-        $this->assertCount(1, $listeners);
-        $this->assertSame(array($subscriber, 'call'), $listeners[0]);
-
-        $tdispatcher->removeSubscriber($subscriber);
-        $this->assertCount(0, $dispatcher->getListeners('foo'));
-    }
-
-    public function testGetCalledListeners()
-    {
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-        $tdispatcher->addListener('foo', $listener = function () {; });
-
-        $this->assertEquals(array(), $tdispatcher->getCalledListeners());
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure')), $tdispatcher->getNotCalledListeners());
-
-        $tdispatcher->dispatch('foo');
-
-        $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure')), $tdispatcher->getCalledListeners());
-        $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
-    }
-
-    public function testGetCalledListenersNested()
-    {
-        $tdispatcher = null;
-        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
-        $dispatcher->addListener('foo', function (Event $event, $eventName, $dispatcher) use (&$tdispatcher) {
-            $tdispatcher = $dispatcher;
-            $dispatcher->dispatch('bar');
-        });
-        $dispatcher->addListener('bar', function (Event $event) {});
-        $dispatcher->dispatch('foo');
-        $this->assertSame($dispatcher, $tdispatcher);
-        $this->assertCount(2, $dispatcher->getCalledListeners());
-    }
-
-    public function testLogger()
-    {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
-
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
-        $tdispatcher->addListener('foo', $listener1 = function () {; });
-        $tdispatcher->addListener('foo', $listener2 = function () {; });
-
-        $logger->expects($this->at(0))->method('debug')->with('Notified event "foo" to listener "closure".');
-        $logger->expects($this->at(1))->method('debug')->with('Notified event "foo" to listener "closure".');
-
-        $tdispatcher->dispatch('foo');
-    }
-
-    public function testLoggerWithStoppedEvent()
-    {
-        $logger = $this->getMock('Psr\Log\LoggerInterface');
-
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch(), $logger);
-        $tdispatcher->addListener('foo', $listener1 = function (Event $event) { $event->stopPropagation(); });
-        $tdispatcher->addListener('foo', $listener2 = function () {; });
-
-        $logger->expects($this->at(0))->method('debug')->with('Notified event "foo" to listener "closure".');
-        $logger->expects($this->at(1))->method('debug')->with('Listener "closure" stopped propagation of the event "foo".');
-        $logger->expects($this->at(2))->method('debug')->with('Listener "closure" was not called for event "foo".');
-
-        $tdispatcher->dispatch('foo');
-    }
-
-    public function testDispatchCallListeners()
-    {
-        $called = array();
-
-        $dispatcher = new EventDispatcher();
-        $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
-        $tdispatcher->addListener('foo', $listener1 = function () use (&$called) { $called[] = 'foo1'; });
-        $tdispatcher->addListener('foo', $listener2 = function () use (&$called) { $called[] = 'foo2'; });
-
-        $tdispatcher->dispatch('foo');
-
-        $this->assertEquals(array('foo1', 'foo2'), $called);
-    }
-
-    public function testDispatchNested()
-    {
-        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
-        $loop = 1;
-        $dispatcher->addListener('foo', $listener1 = function () use ($dispatcher, &$loop) {
-            ++$loop;
-            if (2 == $loop) {
-                $dispatcher->dispatch('foo');
-            }
-        });
-
-        $dispatcher->dispatch('foo');
-    }
-
-    public function testDispatchReusedEventNested()
-    {
-        $nestedCall = false;
-        $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
-        $dispatcher->addListener('foo', function (Event $e) use ($dispatcher) {
-            $dispatcher->dispatch('bar', $e);
-        });
-        $dispatcher->addListener('bar', function (Event $e) use (&$nestedCall) {
-            $nestedCall = true;
-        });
-
-        $this->assertFalse($nestedCall);
-        $dispatcher->dispatch('foo');
-        $this->assertTrue($nestedCall);
-    }
-
-    public function testListenerCanRemoveItselfWhenExecuted()
-    {
-        $eventDispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
-        $listener1 = function ($event, $eventName, EventDispatcherInterface $dispatcher) use (&$listener1) {
-            $dispatcher->removeListener('foo', $listener1);
-        };
-        $eventDispatcher->addListener('foo', $listener1);
-        $eventDispatcher->addListener('foo', function () {});
-        $eventDispatcher->dispatch('foo');
-
-        $this->assertCount(1, $eventDispatcher->getListeners('foo'), 'expected listener1 to be removed');
-    }
-}
-
-class EventSubscriber implements EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-        return array('foo' => 'call');
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
deleted file mode 100644
index 0fdd637..0000000
--- a/vendor/symfony/event-dispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?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\Component\EventDispatcher\Tests\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
-
-class RegisterListenersPassTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Tests that event subscribers not implementing EventSubscriberInterface
-     * trigger an exception.
-     *
-     * @expectedException \InvalidArgumentException
-     */
-    public function testEventSubscriberWithoutInterface()
-    {
-        // one service, not implementing any interface
-        $services = array(
-            'my_event_subscriber' => array(0 => array()),
-        );
-
-        $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
-        $definition->expects($this->atLeastOnce())
-            ->method('isPublic')
-            ->will($this->returnValue(true));
-        $definition->expects($this->atLeastOnce())
-            ->method('getClass')
-            ->will($this->returnValue('stdClass'));
-
-        $builder = $this->getMock(
-            'Symfony\Component\DependencyInjection\ContainerBuilder',
-            array('hasDefinition', 'findTaggedServiceIds', 'getDefinition')
-        );
-        $builder->expects($this->any())
-            ->method('hasDefinition')
-            ->will($this->returnValue(true));
-
-        // We don't test kernel.event_listener here
-        $builder->expects($this->atLeastOnce())
-            ->method('findTaggedServiceIds')
-            ->will($this->onConsecutiveCalls(array(), $services));
-
-        $builder->expects($this->atLeastOnce())
-            ->method('getDefinition')
-            ->will($this->returnValue($definition));
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($builder);
-    }
-
-    public function testValidEventSubscriber()
-    {
-        $services = array(
-            'my_event_subscriber' => array(0 => array()),
-        );
-
-        $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
-        $definition->expects($this->atLeastOnce())
-            ->method('isPublic')
-            ->will($this->returnValue(true));
-        $definition->expects($this->atLeastOnce())
-            ->method('getClass')
-            ->will($this->returnValue('Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService'));
-
-        $builder = $this->getMock(
-            'Symfony\Component\DependencyInjection\ContainerBuilder',
-            array('hasDefinition', 'findTaggedServiceIds', 'getDefinition', 'findDefinition')
-        );
-        $builder->expects($this->any())
-            ->method('hasDefinition')
-            ->will($this->returnValue(true));
-
-        // We don't test kernel.event_listener here
-        $builder->expects($this->atLeastOnce())
-            ->method('findTaggedServiceIds')
-            ->will($this->onConsecutiveCalls(array(), $services));
-
-        $builder->expects($this->atLeastOnce())
-            ->method('getDefinition')
-            ->will($this->returnValue($definition));
-
-        $builder->expects($this->atLeastOnce())
-            ->method('findDefinition')
-            ->will($this->returnValue($definition));
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($builder);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must be public as event listeners are lazy-loaded.
-     */
-    public function testPrivateEventListener()
-    {
-        $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setPublic(false)->addTag('kernel.event_listener', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must be public as event subscribers are lazy-loaded.
-     */
-    public function testPrivateEventSubscriber()
-    {
-        $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setPublic(false)->addTag('kernel.event_subscriber', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must not be abstract as event listeners are lazy-loaded.
-     */
-    public function testAbstractEventListener()
-    {
-        $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must not be abstract as event subscribers are lazy-loaded.
-     */
-    public function testAbstractEventSubscriber()
-    {
-        $container = new ContainerBuilder();
-        $container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-    }
-
-    public function testEventSubscriberResolvableClassName()
-    {
-        $container = new ContainerBuilder();
-
-        $container->setParameter('subscriber.class', 'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService');
-        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-
-        $definition = $container->getDefinition('event_dispatcher');
-        $expected_calls = array(
-            array(
-                'addSubscriberService',
-                array(
-                    'foo',
-                    'Symfony\Component\EventDispatcher\Tests\DependencyInjection\SubscriberService',
-                ),
-            ),
-        );
-        $this->assertSame($expected_calls, $definition->getMethodCalls());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage You have requested a non-existent parameter "subscriber.class"
-     */
-    public function testEventSubscriberUnresolvableClassName()
-    {
-        $container = new ContainerBuilder();
-        $container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', array());
-        $container->register('event_dispatcher', 'stdClass');
-
-        $registerListenersPass = new RegisterListenersPass();
-        $registerListenersPass->process($container);
-    }
-}
-
-class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubscriberInterface
-{
-    public static function getSubscribedEvents()
-    {
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/EventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/EventDispatcherTest.php
deleted file mode 100644
index 5faa5c8..0000000
--- a/vendor/symfony/event-dispatcher/Tests/EventDispatcherTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\EventDispatcher;
-
-class EventDispatcherTest extends AbstractEventDispatcherTest
-{
-    protected function createEventDispatcher()
-    {
-        return new EventDispatcher();
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/EventTest.php b/vendor/symfony/event-dispatcher/Tests/EventTest.php
deleted file mode 100644
index 9a82267..0000000
--- a/vendor/symfony/event-dispatcher/Tests/EventTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-
-/**
- * Test class for Event.
- */
-class EventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \Symfony\Component\EventDispatcher\Event
-     */
-    protected $event;
-
-    /**
-     * @var \Symfony\Component\EventDispatcher\EventDispatcher
-     */
-    protected $dispatcher;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->event = new Event();
-        $this->dispatcher = new EventDispatcher();
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        $this->event = null;
-        $this->dispatcher = null;
-    }
-
-    public function testIsPropagationStopped()
-    {
-        $this->assertFalse($this->event->isPropagationStopped());
-    }
-
-    public function testStopPropagationAndIsPropagationStopped()
-    {
-        $this->event->stopPropagation();
-        $this->assertTrue($this->event->isPropagationStopped());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacySetDispatcher()
-    {
-        $this->event->setDispatcher($this->dispatcher);
-        $this->assertSame($this->dispatcher, $this->event->getDispatcher());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyGetDispatcher()
-    {
-        $this->assertNull($this->event->getDispatcher());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacyGetName()
-    {
-        $this->assertNull($this->event->getName());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testLegacySetName()
-    {
-        $this->event->setName('foo');
-        $this->assertEquals('foo', $this->event->getName());
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php b/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php
deleted file mode 100644
index aebd82d..0000000
--- a/vendor/symfony/event-dispatcher/Tests/GenericEventTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\GenericEvent;
-
-/**
- * Test class for Event.
- */
-class GenericEventTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var GenericEvent
-     */
-    private $event;
-
-    private $subject;
-
-    /**
-     * Prepares the environment before running a test.
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->subject = new \stdClass();
-        $this->event = new GenericEvent($this->subject, array('name' => 'Event'));
-    }
-
-    /**
-     * Cleans up the environment after running a test.
-     */
-    protected function tearDown()
-    {
-        $this->subject = null;
-        $this->event = null;
-
-        parent::tearDown();
-    }
-
-    public function testConstruct()
-    {
-        $this->assertEquals($this->event, new GenericEvent($this->subject, array('name' => 'Event')));
-    }
-
-    /**
-     * Tests Event->getArgs().
-     */
-    public function testGetArguments()
-    {
-        // test getting all
-        $this->assertSame(array('name' => 'Event'), $this->event->getArguments());
-    }
-
-    public function testSetArguments()
-    {
-        $result = $this->event->setArguments(array('foo' => 'bar'));
-        $this->assertAttributeSame(array('foo' => 'bar'), 'arguments', $this->event);
-        $this->assertSame($this->event, $result);
-    }
-
-    public function testSetArgument()
-    {
-        $result = $this->event->setArgument('foo2', 'bar2');
-        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
-        $this->assertEquals($this->event, $result);
-    }
-
-    public function testGetArgument()
-    {
-        // test getting key
-        $this->assertEquals('Event', $this->event->getArgument('name'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testGetArgException()
-    {
-        $this->event->getArgument('nameNotExist');
-    }
-
-    public function testOffsetGet()
-    {
-        // test getting key
-        $this->assertEquals('Event', $this->event['name']);
-
-        // test getting invalid arg
-        $this->setExpectedException('InvalidArgumentException');
-        $this->assertFalse($this->event['nameNotExist']);
-    }
-
-    public function testOffsetSet()
-    {
-        $this->event['foo2'] = 'bar2';
-        $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
-    }
-
-    public function testOffsetUnset()
-    {
-        unset($this->event['name']);
-        $this->assertAttributeSame(array(), 'arguments', $this->event);
-    }
-
-    public function testOffsetIsset()
-    {
-        $this->assertTrue(isset($this->event['name']));
-        $this->assertFalse(isset($this->event['nameNotExist']));
-    }
-
-    public function testHasArgument()
-    {
-        $this->assertTrue($this->event->hasArgument('name'));
-        $this->assertFalse($this->event->hasArgument('nameNotExist'));
-    }
-
-    public function testGetSubject()
-    {
-        $this->assertSame($this->subject, $this->event->getSubject());
-    }
-
-    public function testHasIterator()
-    {
-        $data = array();
-        foreach ($this->event as $key => $value) {
-            $data[$key] = $value;
-        }
-        $this->assertEquals(array('name' => 'Event'), $data);
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php b/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
deleted file mode 100644
index 80a7e43..0000000
--- a/vendor/symfony/event-dispatcher/Tests/ImmutableEventDispatcherTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ImmutableEventDispatcherTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $innerDispatcher;
-
-    /**
-     * @var ImmutableEventDispatcher
-     */
-    private $dispatcher;
-
-    protected function setUp()
-    {
-        $this->innerDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
-        $this->dispatcher = new ImmutableEventDispatcher($this->innerDispatcher);
-    }
-
-    public function testDispatchDelegates()
-    {
-        $event = new Event();
-
-        $this->innerDispatcher->expects($this->once())
-            ->method('dispatch')
-            ->with('event', $event)
-            ->will($this->returnValue('result'));
-
-        $this->assertSame('result', $this->dispatcher->dispatch('event', $event));
-    }
-
-    public function testGetListenersDelegates()
-    {
-        $this->innerDispatcher->expects($this->once())
-            ->method('getListeners')
-            ->with('event')
-            ->will($this->returnValue('result'));
-
-        $this->assertSame('result', $this->dispatcher->getListeners('event'));
-    }
-
-    public function testHasListenersDelegates()
-    {
-        $this->innerDispatcher->expects($this->once())
-            ->method('hasListeners')
-            ->with('event')
-            ->will($this->returnValue('result'));
-
-        $this->assertSame('result', $this->dispatcher->hasListeners('event'));
-    }
-
-    /**
-     * @expectedException \BadMethodCallException
-     */
-    public function testAddListenerDisallowed()
-    {
-        $this->dispatcher->addListener('event', function () { return 'foo'; });
-    }
-
-    /**
-     * @expectedException \BadMethodCallException
-     */
-    public function testAddSubscriberDisallowed()
-    {
-        $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
-
-        $this->dispatcher->addSubscriber($subscriber);
-    }
-
-    /**
-     * @expectedException \BadMethodCallException
-     */
-    public function testRemoveListenerDisallowed()
-    {
-        $this->dispatcher->removeListener('event', function () { return 'foo'; });
-    }
-
-    /**
-     * @expectedException \BadMethodCallException
-     */
-    public function testRemoveSubscriberDisallowed()
-    {
-        $subscriber = $this->getMock('Symfony\Component\EventDispatcher\EventSubscriberInterface');
-
-        $this->dispatcher->removeSubscriber($subscriber);
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/composer.json b/vendor/symfony/event-dispatcher/composer.json
deleted file mode 100644
index 8a6a750..0000000
--- a/vendor/symfony/event-dispatcher/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "symfony/event-dispatcher",
-    "type": "library",
-    "description": "Symfony EventDispatcher Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/dependency-injection": "~2.6",
-        "symfony/expression-language": "~2.6",
-        "symfony/config": "~2.0,>=2.0.5",
-        "symfony/stopwatch": "~2.3",
-        "psr/log": "~1.0"
-    },
-    "suggest": {
-        "symfony/dependency-injection": "",
-        "symfony/http-kernel": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/event-dispatcher/phpunit.xml.dist b/vendor/symfony/event-dispatcher/phpunit.xml.dist
deleted file mode 100644
index ae0586e..0000000
--- a/vendor/symfony/event-dispatcher/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony EventDispatcher Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/http-foundation/.gitignore b/vendor/symfony/http-foundation/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/http-foundation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/http-foundation/AcceptHeader.php b/vendor/symfony/http-foundation/AcceptHeader.php
deleted file mode 100644
index 2260787..0000000
--- a/vendor/symfony/http-foundation/AcceptHeader.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Represents an Accept-* header.
- *
- * An accept header is compound with a list of items,
- * sorted by descending quality.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class AcceptHeader
-{
-    /**
-     * @var AcceptHeaderItem[]
-     */
-    private $items = array();
-
-    /**
-     * @var bool
-     */
-    private $sorted = true;
-
-    /**
-     * Constructor.
-     *
-     * @param AcceptHeaderItem[] $items
-     */
-    public function __construct(array $items)
-    {
-        foreach ($items as $item) {
-            $this->add($item);
-        }
-    }
-
-    /**
-     * Builds an AcceptHeader instance from a string.
-     *
-     * @param string $headerValue
-     *
-     * @return AcceptHeader
-     */
-    public static function fromString($headerValue)
-    {
-        $index = 0;
-
-        return new self(array_map(function ($itemValue) use (&$index) {
-            $item = AcceptHeaderItem::fromString($itemValue);
-            $item->setIndex($index++);
-
-            return $item;
-        }, preg_split('/\s*(?:,*("[^"]+"),*|,*(\'[^\']+\'),*|,+)\s*/', $headerValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)));
-    }
-
-    /**
-     * Returns header value's string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return implode(',', $this->items);
-    }
-
-    /**
-     * Tests if header has given value.
-     *
-     * @param string $value
-     *
-     * @return bool
-     */
-    public function has($value)
-    {
-        return isset($this->items[$value]);
-    }
-
-    /**
-     * Returns given value's item, if exists.
-     *
-     * @param string $value
-     *
-     * @return AcceptHeaderItem|null
-     */
-    public function get($value)
-    {
-        return isset($this->items[$value]) ? $this->items[$value] : null;
-    }
-
-    /**
-     * Adds an item.
-     *
-     * @param AcceptHeaderItem $item
-     *
-     * @return AcceptHeader
-     */
-    public function add(AcceptHeaderItem $item)
-    {
-        $this->items[$item->getValue()] = $item;
-        $this->sorted = false;
-
-        return $this;
-    }
-
-    /**
-     * Returns all items.
-     *
-     * @return AcceptHeaderItem[]
-     */
-    public function all()
-    {
-        $this->sort();
-
-        return $this->items;
-    }
-
-    /**
-     * Filters items on their value using given regex.
-     *
-     * @param string $pattern
-     *
-     * @return AcceptHeader
-     */
-    public function filter($pattern)
-    {
-        return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) {
-            return preg_match($pattern, $item->getValue());
-        }));
-    }
-
-    /**
-     * Returns first item.
-     *
-     * @return AcceptHeaderItem|null
-     */
-    public function first()
-    {
-        $this->sort();
-
-        return !empty($this->items) ? reset($this->items) : null;
-    }
-
-    /**
-     * Sorts items by descending quality.
-     */
-    private function sort()
-    {
-        if (!$this->sorted) {
-            uasort($this->items, function ($a, $b) {
-                $qA = $a->getQuality();
-                $qB = $b->getQuality();
-
-                if ($qA === $qB) {
-                    return $a->getIndex() > $b->getIndex() ? 1 : -1;
-                }
-
-                return $qA > $qB ? -1 : 1;
-            });
-
-            $this->sorted = true;
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/AcceptHeaderItem.php b/vendor/symfony/http-foundation/AcceptHeaderItem.php
deleted file mode 100644
index 21a5d15..0000000
--- a/vendor/symfony/http-foundation/AcceptHeaderItem.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Represents an Accept-* header item.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class AcceptHeaderItem
-{
-    /**
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @var float
-     */
-    private $quality = 1.0;
-
-    /**
-     * @var int
-     */
-    private $index = 0;
-
-    /**
-     * @var array
-     */
-    private $attributes = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $value
-     * @param array  $attributes
-     */
-    public function __construct($value, array $attributes = array())
-    {
-        $this->value = $value;
-        foreach ($attributes as $name => $value) {
-            $this->setAttribute($name, $value);
-        }
-    }
-
-    /**
-     * Builds an AcceptHeaderInstance instance from a string.
-     *
-     * @param string $itemValue
-     *
-     * @return AcceptHeaderItem
-     */
-    public static function fromString($itemValue)
-    {
-        $bits = preg_split('/\s*(?:;*("[^"]+");*|;*(\'[^\']+\');*|;+)\s*/', $itemValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-        $value = array_shift($bits);
-        $attributes = array();
-
-        $lastNullAttribute = null;
-        foreach ($bits as $bit) {
-            if (($start = substr($bit, 0, 1)) === ($end = substr($bit, -1)) && ($start === '"' || $start === '\'')) {
-                $attributes[$lastNullAttribute] = substr($bit, 1, -1);
-            } elseif ('=' === $end) {
-                $lastNullAttribute = $bit = substr($bit, 0, -1);
-                $attributes[$bit] = null;
-            } else {
-                $parts = explode('=', $bit);
-                $attributes[$parts[0]] = isset($parts[1]) && strlen($parts[1]) > 0 ? $parts[1] : '';
-            }
-        }
-
-        return new self(($start = substr($value, 0, 1)) === ($end = substr($value, -1)) && ($start === '"' || $start === '\'') ? substr($value, 1, -1) : $value, $attributes);
-    }
-
-    /**
-     * Returns header  value's string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $string = $this->value.($this->quality < 1 ? ';q='.$this->quality : '');
-        if (count($this->attributes) > 0) {
-            $string .= ';'.implode(';', array_map(function ($name, $value) {
-                return sprintf(preg_match('/[,;=]/', $value) ? '%s="%s"' : '%s=%s', $name, $value);
-            }, array_keys($this->attributes), $this->attributes));
-        }
-
-        return $string;
-    }
-
-    /**
-     * Set the item value.
-     *
-     * @param string $value
-     *
-     * @return AcceptHeaderItem
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
-    /**
-     * Returns the item value.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Set the item quality.
-     *
-     * @param float $quality
-     *
-     * @return AcceptHeaderItem
-     */
-    public function setQuality($quality)
-    {
-        $this->quality = $quality;
-
-        return $this;
-    }
-
-    /**
-     * Returns the item quality.
-     *
-     * @return float
-     */
-    public function getQuality()
-    {
-        return $this->quality;
-    }
-
-    /**
-     * Set the item index.
-     *
-     * @param int $index
-     *
-     * @return AcceptHeaderItem
-     */
-    public function setIndex($index)
-    {
-        $this->index = $index;
-
-        return $this;
-    }
-
-    /**
-     * Returns the item index.
-     *
-     * @return int
-     */
-    public function getIndex()
-    {
-        return $this->index;
-    }
-
-    /**
-     * Tests if an attribute exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasAttribute($name)
-    {
-        return isset($this->attributes[$name]);
-    }
-
-    /**
-     * Returns an attribute by its name.
-     *
-     * @param string $name
-     * @param mixed  $default
-     *
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null)
-    {
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : $default;
-    }
-
-    /**
-     * Returns all attributes.
-     *
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Set an attribute.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return AcceptHeaderItem
-     */
-    public function setAttribute($name, $value)
-    {
-        if ('q' === $name) {
-            $this->quality = (float) $value;
-        } else {
-            $this->attributes[$name] = (string) $value;
-        }
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/http-foundation/ApacheRequest.php b/vendor/symfony/http-foundation/ApacheRequest.php
deleted file mode 100644
index 84803eb..0000000
--- a/vendor/symfony/http-foundation/ApacheRequest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Request represents an HTTP request from an Apache server.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ApacheRequest extends Request
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function prepareRequestUri()
-    {
-        return $this->server->get('REQUEST_URI');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function prepareBaseUrl()
-    {
-        $baseUrl = $this->server->get('SCRIPT_NAME');
-
-        if (false === strpos($this->server->get('REQUEST_URI'), $baseUrl)) {
-            // assume mod_rewrite
-            return rtrim(dirname($baseUrl), '/\\');
-        }
-
-        return $baseUrl;
-    }
-}
diff --git a/vendor/symfony/http-foundation/BinaryFileResponse.php b/vendor/symfony/http-foundation/BinaryFileResponse.php
deleted file mode 100644
index ca407b4..0000000
--- a/vendor/symfony/http-foundation/BinaryFileResponse.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?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\Component\HttpFoundation;
-
-use Symfony\Component\HttpFoundation\File\File;
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
-
-/**
- * BinaryFileResponse represents an HTTP response delivering a file.
- *
- * @author Niklas Fiekas <niklas.fiekas@tu-clausthal.de>
- * @author stealth35 <stealth35-php@live.fr>
- * @author Igor Wiedler <igor@wiedler.ch>
- * @author Jordan Alliot <jordan.alliot@gmail.com>
- * @author Sergey Linnik <linniksa@gmail.com>
- */
-class BinaryFileResponse extends Response
-{
-    protected static $trustXSendfileTypeHeader = false;
-
-    protected $file;
-    protected $offset;
-    protected $maxlen;
-    protected $deleteFileAfterSend = false;
-
-    /**
-     * Constructor.
-     *
-     * @param \SplFileInfo|string $file               The file to stream
-     * @param int                 $status             The response status code
-     * @param array               $headers            An array of response headers
-     * @param bool                $public             Files are public by default
-     * @param null|string         $contentDisposition The type of Content-Disposition to set automatically with the filename
-     * @param bool                $autoEtag           Whether the ETag header should be automatically set
-     * @param bool                $autoLastModified   Whether the Last-Modified header should be automatically set
-     */
-    public function __construct($file, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
-    {
-        parent::__construct(null, $status, $headers);
-
-        $this->setFile($file, $contentDisposition, $autoEtag, $autoLastModified);
-
-        if ($public) {
-            $this->setPublic();
-        }
-    }
-
-    /**
-     * @param \SplFileInfo|string $file               The file to stream
-     * @param int                 $status             The response status code
-     * @param array               $headers            An array of response headers
-     * @param bool                $public             Files are public by default
-     * @param null|string         $contentDisposition The type of Content-Disposition to set automatically with the filename
-     * @param bool                $autoEtag           Whether the ETag header should be automatically set
-     * @param bool                $autoLastModified   Whether the Last-Modified header should be automatically set
-     *
-     * @return BinaryFileResponse The created response
-     */
-    public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
-    {
-        return new static($file, $status, $headers, $public, $contentDisposition, $autoEtag, $autoLastModified);
-    }
-
-    /**
-     * Sets the file to stream.
-     *
-     * @param \SplFileInfo|string $file               The file to stream
-     * @param string              $contentDisposition
-     * @param bool                $autoEtag
-     * @param bool                $autoLastModified
-     *
-     * @return BinaryFileResponse
-     *
-     * @throws FileException
-     */
-    public function setFile($file, $contentDisposition = null, $autoEtag = false, $autoLastModified = true)
-    {
-        if (!$file instanceof File) {
-            if ($file instanceof \SplFileInfo) {
-                $file = new File($file->getPathname());
-            } else {
-                $file = new File((string) $file);
-            }
-        }
-
-        if (!$file->isReadable()) {
-            throw new FileException('File must be readable.');
-        }
-
-        $this->file = $file;
-
-        if ($autoEtag) {
-            $this->setAutoEtag();
-        }
-
-        if ($autoLastModified) {
-            $this->setAutoLastModified();
-        }
-
-        if ($contentDisposition) {
-            $this->setContentDisposition($contentDisposition);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the file.
-     *
-     * @return File The file to stream
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Automatically sets the Last-Modified header according the file modification date.
-     */
-    public function setAutoLastModified()
-    {
-        $this->setLastModified(\DateTime::createFromFormat('U', $this->file->getMTime()));
-
-        return $this;
-    }
-
-    /**
-     * Automatically sets the ETag header according to the checksum of the file.
-     */
-    public function setAutoEtag()
-    {
-        $this->setEtag(sha1_file($this->file->getPathname()));
-
-        return $this;
-    }
-
-    /**
-     * Sets the Content-Disposition header with the given filename.
-     *
-     * @param string $disposition      ResponseHeaderBag::DISPOSITION_INLINE or ResponseHeaderBag::DISPOSITION_ATTACHMENT
-     * @param string $filename         Optionally use this filename instead of the real name of the file
-     * @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename
-     *
-     * @return BinaryFileResponse
-     */
-    public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
-    {
-        if ($filename === '') {
-            $filename = $this->file->getFilename();
-        }
-
-        $dispositionHeader = $this->headers->makeDisposition($disposition, $filename, $filenameFallback);
-        $this->headers->set('Content-Disposition', $dispositionHeader);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare(Request $request)
-    {
-        $this->headers->set('Content-Length', $this->file->getSize());
-
-        if (!$this->headers->has('Accept-Ranges')) {
-            // Only accept ranges on safe HTTP methods
-            $this->headers->set('Accept-Ranges', $request->isMethodSafe() ? 'bytes' : 'none');
-        }
-
-        if (!$this->headers->has('Content-Type')) {
-            $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');
-        }
-
-        if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) {
-            $this->setProtocolVersion('1.1');
-        }
-
-        $this->ensureIEOverSSLCompatibility($request);
-
-        $this->offset = 0;
-        $this->maxlen = -1;
-
-        if (self::$trustXSendfileTypeHeader && $request->headers->has('X-Sendfile-Type')) {
-            // Use X-Sendfile, do not send any content.
-            $type = $request->headers->get('X-Sendfile-Type');
-            $path = $this->file->getRealPath();
-            if (strtolower($type) == 'x-accel-redirect') {
-                // Do X-Accel-Mapping substitutions.
-                // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
-                foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
-                    $mapping = explode('=', $mapping, 2);
-
-                    if (2 == count($mapping)) {
-                        $pathPrefix = trim($mapping[0]);
-                        $location = trim($mapping[1]);
-
-                        if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) {
-                            $path = $location.substr($path, strlen($pathPrefix));
-                            break;
-                        }
-                    }
-                }
-            }
-            $this->headers->set($type, $path);
-            $this->maxlen = 0;
-        } elseif ($request->headers->has('Range')) {
-            // Process the range headers.
-            if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) {
-                $range = $request->headers->get('Range');
-                $fileSize = $this->file->getSize();
-
-                list($start, $end) = explode('-', substr($range, 6), 2) + array(0);
-
-                $end = ('' === $end) ? $fileSize - 1 : (int) $end;
-
-                if ('' === $start) {
-                    $start = $fileSize - $end;
-                    $end = $fileSize - 1;
-                } else {
-                    $start = (int) $start;
-                }
-
-                if ($start <= $end) {
-                    if ($start < 0 || $end > $fileSize - 1) {
-                        $this->setStatusCode(416);
-                    } elseif ($start !== 0 || $end !== $fileSize - 1) {
-                        $this->maxlen = $end < $fileSize ? $end - $start + 1 : -1;
-                        $this->offset = $start;
-
-                        $this->setStatusCode(206);
-                        $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $fileSize));
-                        $this->headers->set('Content-Length', $end - $start + 1);
-                    }
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sends the file.
-     */
-    public function sendContent()
-    {
-        if (!$this->isSuccessful()) {
-            parent::sendContent();
-
-            return;
-        }
-
-        if (0 === $this->maxlen) {
-            return;
-        }
-
-        $out = fopen('php://output', 'wb');
-        $file = fopen($this->file->getPathname(), 'rb');
-
-        stream_copy_to_stream($file, $out, $this->maxlen, $this->offset);
-
-        fclose($out);
-        fclose($file);
-
-        if ($this->deleteFileAfterSend) {
-            unlink($this->file->getPathname());
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \LogicException when the content is not null
-     */
-    public function setContent($content)
-    {
-        if (null !== $content) {
-            throw new \LogicException('The content cannot be set on a BinaryFileResponse instance.');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return false
-     */
-    public function getContent()
-    {
-        return false;
-    }
-
-    /**
-     * Trust X-Sendfile-Type header.
-     */
-    public static function trustXSendfileTypeHeader()
-    {
-        self::$trustXSendfileTypeHeader = true;
-    }
-
-    /**
-     * If this is set to true, the file will be unlinked after the request is send
-     * Note: If the X-Sendfile header is used, the deleteFileAfterSend setting will not be used.
-     *
-     * @param bool $shouldDelete
-     *
-     * @return BinaryFileResponse
-     */
-    public function deleteFileAfterSend($shouldDelete)
-    {
-        $this->deleteFileAfterSend = $shouldDelete;
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/http-foundation/CHANGELOG.md b/vendor/symfony/http-foundation/CHANGELOG.md
deleted file mode 100644
index dcdeb4e..0000000
--- a/vendor/symfony/http-foundation/CHANGELOG.md
+++ /dev/null
@@ -1,122 +0,0 @@
-CHANGELOG
-=========
-
-2.6.0
------
-
- * PdoSessionHandler changes
-   - implemented different session locking strategies to prevent loss of data by concurrent access to the same session
-   - [BC BREAK] save session data in a binary column without base64_encode
-   - [BC BREAK] added lifetime column to the session table which allows to have different lifetimes for each session
-   - implemented lazy connections that are only opened when a session is used by either passing a dsn string
-     explicitly or falling back to session.save_path ini setting
-   - added a createTable method that initializes a correctly defined table depending on the database vendor
-
-2.5.0
------
-
- * added `JsonResponse::setEncodingOptions()` & `JsonResponse::getEncodingOptions()` for easier manipulation
-   of the options used while encoding data to JSON format.
-
-2.4.0
------
-
- * added RequestStack
- * added Request::getEncodings()
- * added accessors methods to session handlers
-
-2.3.0
------
-
- * added support for ranges of IPs in trusted proxies
- * `UploadedFile::isValid` now returns false if the file was not uploaded via HTTP (in a non-test mode)
- * Improved error-handling of `\Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler`
-   to ensure the supplied PDO handler throws Exceptions on error (as the class expects). Added related test cases
-   to verify that Exceptions are properly thrown when the PDO queries fail.
-
-2.2.0
------
-
- * fixed the Request::create() precedence (URI information always take precedence now)
- * added Request::getTrustedProxies()
- * deprecated Request::isProxyTrusted()
- * [BC BREAK] JsonResponse does not turn a top level empty array to an object anymore, use an ArrayObject to enforce objects
- * added a IpUtils class to check if an IP belongs to a CIDR
- * added Request::getRealMethod() to get the "real" HTTP method (getMethod() returns the "intended" HTTP method)
- * disabled _method request parameter support by default (call Request::enableHttpMethodParameterOverride() to
-   enable it, and Request::getHttpMethodParameterOverride() to check if it is supported)
- * Request::splitHttpAcceptHeader() method is deprecated and will be removed in 2.3
- * Deprecated Flashbag::count() and \Countable interface, will be removed in 2.3
-
-2.1.0
------
-
- * added Request::getSchemeAndHttpHost() and Request::getUserInfo()
- * added a fluent interface to the Response class
- * added Request::isProxyTrusted()
- * added JsonResponse
- * added a getTargetUrl method to RedirectResponse
- * added support for streamed responses
- * made Response::prepare() method the place to enforce HTTP specification
- * [BC BREAK] moved management of the locale from the Session class to the Request class
- * added a generic access to the PHP built-in filter mechanism: ParameterBag::filter()
- * made FileBinaryMimeTypeGuesser command configurable
- * added Request::getUser() and Request::getPassword()
- * added support for the PATCH method in Request
- * removed the ContentTypeMimeTypeGuesser class as it is deprecated and never used on PHP 5.3
- * added ResponseHeaderBag::makeDisposition() (implements RFC 6266)
- * made mimetype to extension conversion configurable
- * [BC BREAK] Moved all session related classes and interfaces into own namespace, as
-   `Symfony\Component\HttpFoundation\Session` and renamed classes accordingly.
-   Session handlers are located in the subnamespace `Symfony\Component\HttpFoundation\Session\Handler`.
- * SessionHandlers must implement `\SessionHandlerInterface` or extend from the
-   `Symfony\Component\HttpFoundation\Storage\Handler\NativeSessionHandler` base class.
- * Added internal storage driver proxy mechanism for forward compatibility with
-   PHP 5.4 `\SessionHandler` class.
- * Added session handlers for custom Memcache, Memcached and Null session save handlers.
- * [BC BREAK] Removed `NativeSessionStorage` and replaced with `NativeFileSessionHandler`.
- * [BC BREAK] `SessionStorageInterface` methods removed: `write()`, `read()` and
-   `remove()`.  Added `getBag()`, `registerBag()`.  The `NativeSessionStorage` class
-   is a mediator for the session storage internals including the session handlers
-   which do the real work of participating in the internal PHP session workflow.
- * [BC BREAK] Introduced mock implementations of `SessionStorage` to enable unit
-   and functional testing without starting real PHP sessions.  Removed
-   `ArraySessionStorage`, and replaced with `MockArraySessionStorage` for unit
-   tests; removed `FilesystemSessionStorage`, and replaced with`MockFileSessionStorage`
-   for functional tests.  These do not interact with global session ini
-   configuration values, session functions or `$_SESSION` superglobal. This means
-   they can be configured directly allowing multiple instances to work without
-   conflicting in the same PHP process.
- * [BC BREAK] Removed the `close()` method from the `Session` class, as this is
-   now redundant.
- * Deprecated the following methods from the Session class: `setFlash()`, `setFlashes()`
-   `getFlash()`, `hasFlash()`, and `removeFlash()`. Use `getFlashBag()` instead
-   which returns a `FlashBagInterface`.
- * `Session->clear()` now only clears session attributes as before it cleared
-   flash messages and attributes. `Session->getFlashBag()->all()` clears flashes now.
- * Session data is now managed by `SessionBagInterface` to better encapsulate
-   session data.
- * Refactored session attribute and flash messages system to their own
-  `SessionBagInterface` implementations.
- * Added `FlashBag`. Flashes expire when retrieved by `get()` or `all()`. This
-   implementation is ESI compatible.
- * Added `AutoExpireFlashBag` (default) to replicate Symfony 2.0.x auto expire
-   behaviour of messages auto expiring after one page page load.  Messages must
-   be retrieved by `get()` or `all()`.
- * Added `Symfony\Component\HttpFoundation\Attribute\AttributeBag` to replicate
-   attributes storage behaviour from 2.0.x (default).
- * Added `Symfony\Component\HttpFoundation\Attribute\NamespacedAttributeBag` for
-   namespace session attributes.
- * Flash API can stores messages in an array so there may be multiple messages
-   per flash type.  The old `Session` class API remains without BC break as it
-   will allow single messages as before.
- * Added basic session meta-data to the session to record session create time,
-   last updated time, and the lifetime of the session cookie that was provided
-   to the client.
- * Request::getClientIp() method doesn't take a parameter anymore but bases
-   itself on the trustProxy parameter.
- * Added isMethod() to Request object.
- * [BC BREAK] The methods `getPathInfo()`, `getBaseUrl()` and `getBasePath()` of
-   a `Request` now all return a raw value (vs a urldecoded value before). Any call
-   to one of these methods must be checked and wrapped in a `rawurldecode()` if
-   needed.
diff --git a/vendor/symfony/http-foundation/Cookie.php b/vendor/symfony/http-foundation/Cookie.php
deleted file mode 100644
index 061703d..0000000
--- a/vendor/symfony/http-foundation/Cookie.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Represents a cookie.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Cookie
-{
-    protected $name;
-    protected $value;
-    protected $domain;
-    protected $expire;
-    protected $path;
-    protected $secure;
-    protected $httpOnly;
-
-    /**
-     * Constructor.
-     *
-     * @param string               $name     The name of the cookie
-     * @param string               $value    The value of the cookie
-     * @param int|string|\DateTime $expire   The time the cookie expires
-     * @param string               $path     The path on the server in which the cookie will be available on
-     * @param string               $domain   The domain that the cookie is available to
-     * @param bool                 $secure   Whether the cookie should only be transmitted over a secure HTTPS connection from the client
-     * @param bool                 $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($name, $value = null, $expire = 0, $path = '/', $domain = null, $secure = false, $httpOnly = true)
-    {
-        // from PHP source code
-        if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
-            throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
-        }
-
-        if (empty($name)) {
-            throw new \InvalidArgumentException('The cookie name cannot be empty.');
-        }
-
-        // convert expiration time to a Unix timestamp
-        if ($expire instanceof \DateTime) {
-            $expire = $expire->format('U');
-        } elseif (!is_numeric($expire)) {
-            $expire = strtotime($expire);
-
-            if (false === $expire || -1 === $expire) {
-                throw new \InvalidArgumentException('The cookie expiration time is not valid.');
-            }
-        }
-
-        $this->name = $name;
-        $this->value = $value;
-        $this->domain = $domain;
-        $this->expire = $expire;
-        $this->path = empty($path) ? '/' : $path;
-        $this->secure = (bool) $secure;
-        $this->httpOnly = (bool) $httpOnly;
-    }
-
-    /**
-     * Returns the cookie as a string.
-     *
-     * @return string The cookie
-     */
-    public function __toString()
-    {
-        $str = urlencode($this->getName()).'=';
-
-        if ('' === (string) $this->getValue()) {
-            $str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001);
-        } else {
-            $str .= urlencode($this->getValue());
-
-            if ($this->getExpiresTime() !== 0) {
-                $str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());
-            }
-        }
-
-        if ($this->path) {
-            $str .= '; path='.$this->path;
-        }
-
-        if ($this->getDomain()) {
-            $str .= '; domain='.$this->getDomain();
-        }
-
-        if (true === $this->isSecure()) {
-            $str .= '; secure';
-        }
-
-        if (true === $this->isHttpOnly()) {
-            $str .= '; httponly';
-        }
-
-        return $str;
-    }
-
-    /**
-     * Gets the name of the cookie.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Gets the value of the cookie.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Gets the domain that the cookie is available to.
-     *
-     * @return string
-     */
-    public function getDomain()
-    {
-        return $this->domain;
-    }
-
-    /**
-     * Gets the time the cookie expires.
-     *
-     * @return int
-     */
-    public function getExpiresTime()
-    {
-        return $this->expire;
-    }
-
-    /**
-     * Gets the path on the server in which the cookie will be available on.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Checks whether the cookie should only be transmitted over a secure HTTPS connection from the client.
-     *
-     * @return bool
-     */
-    public function isSecure()
-    {
-        return $this->secure;
-    }
-
-    /**
-     * Checks whether the cookie will be made accessible only through the HTTP protocol.
-     *
-     * @return bool
-     */
-    public function isHttpOnly()
-    {
-        return $this->httpOnly;
-    }
-
-    /**
-     * Whether this cookie is about to be cleared.
-     *
-     * @return bool
-     */
-    public function isCleared()
-    {
-        return $this->expire < time();
-    }
-}
diff --git a/vendor/symfony/http-foundation/ExpressionRequestMatcher.php b/vendor/symfony/http-foundation/ExpressionRequestMatcher.php
deleted file mode 100644
index e9c8441..0000000
--- a/vendor/symfony/http-foundation/ExpressionRequestMatcher.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\HttpFoundation;
-
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-
-/**
- * ExpressionRequestMatcher uses an expression to match a Request.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ExpressionRequestMatcher extends RequestMatcher
-{
-    private $language;
-    private $expression;
-
-    public function setExpression(ExpressionLanguage $language, $expression)
-    {
-        $this->language = $language;
-        $this->expression = $expression;
-    }
-
-    public function matches(Request $request)
-    {
-        if (!$this->language) {
-            throw new \LogicException('Unable to match the request as the expression language is not available.');
-        }
-
-        return $this->language->evaluate($this->expression, array(
-            'request' => $request,
-            'method' => $request->getMethod(),
-            'path' => rawurldecode($request->getPathInfo()),
-            'host' => $request->getHost(),
-            'ip' => $request->getClientIp(),
-            'attributes' => $request->attributes->all(),
-        )) && parent::matches($request);
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php b/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php
deleted file mode 100644
index 41f7a46..0000000
--- a/vendor/symfony/http-foundation/File/Exception/AccessDeniedException.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\HttpFoundation\File\Exception;
-
-/**
- * Thrown when the access on a file was denied.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class AccessDeniedException extends FileException
-{
-    /**
-     * Constructor.
-     *
-     * @param string $path The path to the accessed file
-     */
-    public function __construct($path)
-    {
-        parent::__construct(sprintf('The file %s could not be accessed', $path));
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/Exception/FileException.php b/vendor/symfony/http-foundation/File/Exception/FileException.php
deleted file mode 100644
index fad5133..0000000
--- a/vendor/symfony/http-foundation/File/Exception/FileException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\HttpFoundation\File\Exception;
-
-/**
- * Thrown when an error occurred in the component File.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FileException extends \RuntimeException
-{
-}
diff --git a/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php b/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php
deleted file mode 100644
index ac90d40..0000000
--- a/vendor/symfony/http-foundation/File/Exception/FileNotFoundException.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\HttpFoundation\File\Exception;
-
-/**
- * Thrown when a file was not found.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FileNotFoundException extends FileException
-{
-    /**
-     * Constructor.
-     *
-     * @param string $path The path to the file that was not found
-     */
-    public function __construct($path)
-    {
-        parent::__construct(sprintf('The file "%s" does not exist', $path));
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php b/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
deleted file mode 100644
index 0444b87..0000000
--- a/vendor/symfony/http-foundation/File/Exception/UnexpectedTypeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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\Component\HttpFoundation\File\Exception;
-
-class UnexpectedTypeException extends FileException
-{
-    public function __construct($value, $expectedType)
-    {
-        parent::__construct(sprintf('Expected argument of type %s, %s given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/Exception/UploadException.php b/vendor/symfony/http-foundation/File/Exception/UploadException.php
deleted file mode 100644
index 7074e76..0000000
--- a/vendor/symfony/http-foundation/File/Exception/UploadException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\HttpFoundation\File\Exception;
-
-/**
- * Thrown when an error occurred during file upload.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class UploadException extends FileException
-{
-}
diff --git a/vendor/symfony/http-foundation/File/File.php b/vendor/symfony/http-foundation/File/File.php
deleted file mode 100644
index f1b28b4..0000000
--- a/vendor/symfony/http-foundation/File/File.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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\Component\HttpFoundation\File;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
-use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
-
-/**
- * A file in the file system.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class File extends \SplFileInfo
-{
-    /**
-     * Constructs a new file from the given path.
-     *
-     * @param string $path      The path to the file
-     * @param bool   $checkPath Whether to check the path or not
-     *
-     * @throws FileNotFoundException If the given path is not a file
-     */
-    public function __construct($path, $checkPath = true)
-    {
-        if ($checkPath && !is_file($path)) {
-            throw new FileNotFoundException($path);
-        }
-
-        parent::__construct($path);
-    }
-
-    /**
-     * Returns the extension based on the mime type.
-     *
-     * If the mime type is unknown, returns null.
-     *
-     * This method uses the mime type as guessed by getMimeType()
-     * to guess the file extension.
-     *
-     * @return string|null The guessed extension or null if it cannot be guessed
-     *
-     * @see ExtensionGuesser
-     * @see getMimeType()
-     */
-    public function guessExtension()
-    {
-        $type = $this->getMimeType();
-        $guesser = ExtensionGuesser::getInstance();
-
-        return $guesser->guess($type);
-    }
-
-    /**
-     * Returns the mime type of the file.
-     *
-     * The mime type is guessed using a MimeTypeGuesser instance, which uses finfo(),
-     * mime_content_type() and the system binary "file" (in this order), depending on
-     * which of those are available.
-     *
-     * @return string|null The guessed mime type (i.e. "application/pdf")
-     *
-     * @see MimeTypeGuesser
-     */
-    public function getMimeType()
-    {
-        $guesser = MimeTypeGuesser::getInstance();
-
-        return $guesser->guess($this->getPathname());
-    }
-
-    /**
-     * Moves the file to a new location.
-     *
-     * @param string $directory The destination folder
-     * @param string $name      The new file name
-     *
-     * @return File A File object representing the new file
-     *
-     * @throws FileException if the target file could not be created
-     */
-    public function move($directory, $name = null)
-    {
-        $target = $this->getTargetFile($directory, $name);
-
-        if (!@rename($this->getPathname(), $target)) {
-            $error = error_get_last();
-            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message'])));
-        }
-
-        @chmod($target, 0666 & ~umask());
-
-        return $target;
-    }
-
-    protected function getTargetFile($directory, $name = null)
-    {
-        if (!is_dir($directory)) {
-            if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) {
-                throw new FileException(sprintf('Unable to create the "%s" directory', $directory));
-            }
-        } elseif (!is_writable($directory)) {
-            throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
-        }
-
-        $target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
-
-        return new self($target, false);
-    }
-
-    /**
-     * Returns locale independent base name of the given path.
-     *
-     * @param string $name The new file name
-     *
-     * @return string containing
-     */
-    protected function getName($name)
-    {
-        $originalName = str_replace('\\', '/', $name);
-        $pos = strrpos($originalName, '/');
-        $originalName = false === $pos ? $originalName : substr($originalName, $pos + 1);
-
-        return $originalName;
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesser.php b/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesser.php
deleted file mode 100644
index ec9b78a..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesser.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-/**
- * A singleton mime type to file extension guesser.
- *
- * A default guesser is provided.
- * You can register custom guessers by calling the register()
- * method on the singleton instance:
- *
- *     $guesser = ExtensionGuesser::getInstance();
- *     $guesser->register(new MyCustomExtensionGuesser());
- *
- * The last registered guesser is preferred over previously registered ones.
- */
-class ExtensionGuesser implements ExtensionGuesserInterface
-{
-    /**
-     * The singleton instance.
-     *
-     * @var ExtensionGuesser
-     */
-    private static $instance = null;
-
-    /**
-     * All registered ExtensionGuesserInterface instances.
-     *
-     * @var array
-     */
-    protected $guessers = array();
-
-    /**
-     * Returns the singleton instance.
-     *
-     * @return ExtensionGuesser
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Registers all natively provided extension guessers.
-     */
-    private function __construct()
-    {
-        $this->register(new MimeTypeExtensionGuesser());
-    }
-
-    /**
-     * Registers a new extension guesser.
-     *
-     * When guessing, this guesser is preferred over previously registered ones.
-     *
-     * @param ExtensionGuesserInterface $guesser
-     */
-    public function register(ExtensionGuesserInterface $guesser)
-    {
-        array_unshift($this->guessers, $guesser);
-    }
-
-    /**
-     * Tries to guess the extension.
-     *
-     * The mime type is passed to each registered mime type guesser in reverse order
-     * of their registration (last registered is queried first). Once a guesser
-     * returns a value that is not NULL, this method terminates and returns the
-     * value.
-     *
-     * @param string $mimeType The mime type
-     *
-     * @return string The guessed extension or NULL, if none could be guessed
-     */
-    public function guess($mimeType)
-    {
-        foreach ($this->guessers as $guesser) {
-            if (null !== $extension = $guesser->guess($mimeType)) {
-                return $extension;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesserInterface.php b/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesserInterface.php
deleted file mode 100644
index d19a0e5..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/ExtensionGuesserInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-/**
- * Guesses the file extension corresponding to a given mime type.
- */
-interface ExtensionGuesserInterface
-{
-    /**
-     * Makes a best guess for a file extension, given a mime type.
-     *
-     * @param string $mimeType The mime type
-     *
-     * @return string The guessed extension or NULL, if none could be guessed
-     */
-    public function guess($mimeType);
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
deleted file mode 100644
index f917a06..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/FileBinaryMimeTypeGuesser.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
-
-/**
- * Guesses the mime type with the binary "file" (only available on *nix).
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
-{
-    private $cmd;
-
-    /**
-     * Constructor.
-     *
-     * The $cmd pattern must contain a "%s" string that will be replaced
-     * with the file name to guess.
-     *
-     * The command output must start with the mime type of the file.
-     *
-     * @param string $cmd The command to run to get the mime type of a file
-     */
-    public function __construct($cmd = 'file -b --mime %s 2>/dev/null')
-    {
-        $this->cmd = $cmd;
-    }
-
-    /**
-     * Returns whether this guesser is supported on the current OS.
-     *
-     * @return bool
-     */
-    public static function isSupported()
-    {
-        return '\\' !== DIRECTORY_SEPARATOR && function_exists('passthru') && function_exists('escapeshellarg');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function guess($path)
-    {
-        if (!is_file($path)) {
-            throw new FileNotFoundException($path);
-        }
-
-        if (!is_readable($path)) {
-            throw new AccessDeniedException($path);
-        }
-
-        if (!self::isSupported()) {
-            return;
-        }
-
-        ob_start();
-
-        // need to use --mime instead of -i. see #6641
-        passthru(sprintf($this->cmd, escapeshellarg($path)), $return);
-        if ($return > 0) {
-            ob_end_clean();
-
-            return;
-        }
-
-        $type = trim(ob_get_clean());
-
-        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
-            // it's not a type, but an error message
-            return;
-        }
-
-        return $match[1];
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
deleted file mode 100644
index a7e4ae2..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
-
-/**
- * Guesses the mime type using the PECL extension FileInfo.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
-{
-    private $magicFile;
-
-    /**
-     * Constructor.
-     *
-     * @param string $magicFile A magic file to use with the finfo instance
-     *
-     * @link http://www.php.net/manual/en/function.finfo-open.php
-     */
-    public function __construct($magicFile = null)
-    {
-        $this->magicFile = $magicFile;
-    }
-
-    /**
-     * Returns whether this guesser is supported on the current OS/PHP setup.
-     *
-     * @return bool
-     */
-    public static function isSupported()
-    {
-        return function_exists('finfo_open');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function guess($path)
-    {
-        if (!is_file($path)) {
-            throw new FileNotFoundException($path);
-        }
-
-        if (!is_readable($path)) {
-            throw new AccessDeniedException($path);
-        }
-
-        if (!self::isSupported()) {
-            return;
-        }
-
-        if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
-            return;
-        }
-
-        return $finfo->file($path);
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php
deleted file mode 100644
index 75eeefb..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeExtensionGuesser.php
+++ /dev/null
@@ -1,807 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-/**
- * Provides a best-guess mapping of mime type to file extension.
- */
-class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
-{
-    /**
-     * A map of mime types and their default extensions.
-     *
-     * This list has been placed under the public domain by the Apache HTTPD project.
-     * This list has been updated from upstream on 2013-04-23.
-     *
-     * @see http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
-     *
-     * @var array
-     */
-    protected $defaultExtensions = array(
-        'application/andrew-inset' => 'ez',
-        'application/applixware' => 'aw',
-        'application/atom+xml' => 'atom',
-        'application/atomcat+xml' => 'atomcat',
-        'application/atomsvc+xml' => 'atomsvc',
-        'application/ccxml+xml' => 'ccxml',
-        'application/cdmi-capability' => 'cdmia',
-        'application/cdmi-container' => 'cdmic',
-        'application/cdmi-domain' => 'cdmid',
-        'application/cdmi-object' => 'cdmio',
-        'application/cdmi-queue' => 'cdmiq',
-        'application/cu-seeme' => 'cu',
-        'application/davmount+xml' => 'davmount',
-        'application/docbook+xml' => 'dbk',
-        'application/dssc+der' => 'dssc',
-        'application/dssc+xml' => 'xdssc',
-        'application/ecmascript' => 'ecma',
-        'application/emma+xml' => 'emma',
-        'application/epub+zip' => 'epub',
-        'application/exi' => 'exi',
-        'application/font-tdpfr' => 'pfr',
-        'application/gml+xml' => 'gml',
-        'application/gpx+xml' => 'gpx',
-        'application/gxf' => 'gxf',
-        'application/hyperstudio' => 'stk',
-        'application/inkml+xml' => 'ink',
-        'application/ipfix' => 'ipfix',
-        'application/java-archive' => 'jar',
-        'application/java-serialized-object' => 'ser',
-        'application/java-vm' => 'class',
-        'application/javascript' => 'js',
-        'application/json' => 'json',
-        'application/jsonml+json' => 'jsonml',
-        'application/lost+xml' => 'lostxml',
-        'application/mac-binhex40' => 'hqx',
-        'application/mac-compactpro' => 'cpt',
-        'application/mads+xml' => 'mads',
-        'application/marc' => 'mrc',
-        'application/marcxml+xml' => 'mrcx',
-        'application/mathematica' => 'ma',
-        'application/mathml+xml' => 'mathml',
-        'application/mbox' => 'mbox',
-        'application/mediaservercontrol+xml' => 'mscml',
-        'application/metalink+xml' => 'metalink',
-        'application/metalink4+xml' => 'meta4',
-        'application/mets+xml' => 'mets',
-        'application/mods+xml' => 'mods',
-        'application/mp21' => 'm21',
-        'application/mp4' => 'mp4s',
-        'application/msword' => 'doc',
-        'application/mxf' => 'mxf',
-        'application/octet-stream' => 'bin',
-        'application/oda' => 'oda',
-        'application/oebps-package+xml' => 'opf',
-        'application/ogg' => 'ogx',
-        'application/omdoc+xml' => 'omdoc',
-        'application/onenote' => 'onetoc',
-        'application/oxps' => 'oxps',
-        'application/patch-ops-error+xml' => 'xer',
-        'application/pdf' => 'pdf',
-        'application/pgp-encrypted' => 'pgp',
-        'application/pgp-signature' => 'asc',
-        'application/pics-rules' => 'prf',
-        'application/pkcs10' => 'p10',
-        'application/pkcs7-mime' => 'p7m',
-        'application/pkcs7-signature' => 'p7s',
-        'application/pkcs8' => 'p8',
-        'application/pkix-attr-cert' => 'ac',
-        'application/pkix-cert' => 'cer',
-        'application/pkix-crl' => 'crl',
-        'application/pkix-pkipath' => 'pkipath',
-        'application/pkixcmp' => 'pki',
-        'application/pls+xml' => 'pls',
-        'application/postscript' => 'ai',
-        'application/prs.cww' => 'cww',
-        'application/pskc+xml' => 'pskcxml',
-        'application/rdf+xml' => 'rdf',
-        'application/reginfo+xml' => 'rif',
-        'application/relax-ng-compact-syntax' => 'rnc',
-        'application/resource-lists+xml' => 'rl',
-        'application/resource-lists-diff+xml' => 'rld',
-        'application/rls-services+xml' => 'rs',
-        'application/rpki-ghostbusters' => 'gbr',
-        'application/rpki-manifest' => 'mft',
-        'application/rpki-roa' => 'roa',
-        'application/rsd+xml' => 'rsd',
-        'application/rss+xml' => 'rss',
-        'application/rtf' => 'rtf',
-        'application/sbml+xml' => 'sbml',
-        'application/scvp-cv-request' => 'scq',
-        'application/scvp-cv-response' => 'scs',
-        'application/scvp-vp-request' => 'spq',
-        'application/scvp-vp-response' => 'spp',
-        'application/sdp' => 'sdp',
-        'application/set-payment-initiation' => 'setpay',
-        'application/set-registration-initiation' => 'setreg',
-        'application/shf+xml' => 'shf',
-        'application/smil+xml' => 'smi',
-        'application/sparql-query' => 'rq',
-        'application/sparql-results+xml' => 'srx',
-        'application/srgs' => 'gram',
-        'application/srgs+xml' => 'grxml',
-        'application/sru+xml' => 'sru',
-        'application/ssdl+xml' => 'ssdl',
-        'application/ssml+xml' => 'ssml',
-        'application/tei+xml' => 'tei',
-        'application/thraud+xml' => 'tfi',
-        'application/timestamped-data' => 'tsd',
-        'application/vnd.3gpp.pic-bw-large' => 'plb',
-        'application/vnd.3gpp.pic-bw-small' => 'psb',
-        'application/vnd.3gpp.pic-bw-var' => 'pvb',
-        'application/vnd.3gpp2.tcap' => 'tcap',
-        'application/vnd.3m.post-it-notes' => 'pwn',
-        'application/vnd.accpac.simply.aso' => 'aso',
-        'application/vnd.accpac.simply.imp' => 'imp',
-        'application/vnd.acucobol' => 'acu',
-        'application/vnd.acucorp' => 'atc',
-        'application/vnd.adobe.air-application-installer-package+zip' => 'air',
-        'application/vnd.adobe.formscentral.fcdt' => 'fcdt',
-        'application/vnd.adobe.fxp' => 'fxp',
-        'application/vnd.adobe.xdp+xml' => 'xdp',
-        'application/vnd.adobe.xfdf' => 'xfdf',
-        'application/vnd.ahead.space' => 'ahead',
-        'application/vnd.airzip.filesecure.azf' => 'azf',
-        'application/vnd.airzip.filesecure.azs' => 'azs',
-        'application/vnd.amazon.ebook' => 'azw',
-        'application/vnd.americandynamics.acc' => 'acc',
-        'application/vnd.amiga.ami' => 'ami',
-        'application/vnd.android.package-archive' => 'apk',
-        'application/vnd.anser-web-certificate-issue-initiation' => 'cii',
-        'application/vnd.anser-web-funds-transfer-initiation' => 'fti',
-        'application/vnd.antix.game-component' => 'atx',
-        'application/vnd.apple.installer+xml' => 'mpkg',
-        'application/vnd.apple.mpegurl' => 'm3u8',
-        'application/vnd.aristanetworks.swi' => 'swi',
-        'application/vnd.astraea-software.iota' => 'iota',
-        'application/vnd.audiograph' => 'aep',
-        'application/vnd.blueice.multipass' => 'mpm',
-        'application/vnd.bmi' => 'bmi',
-        'application/vnd.businessobjects' => 'rep',
-        'application/vnd.chemdraw+xml' => 'cdxml',
-        'application/vnd.chipnuts.karaoke-mmd' => 'mmd',
-        'application/vnd.cinderella' => 'cdy',
-        'application/vnd.claymore' => 'cla',
-        'application/vnd.cloanto.rp9' => 'rp9',
-        'application/vnd.clonk.c4group' => 'c4g',
-        'application/vnd.cluetrust.cartomobile-config' => 'c11amc',
-        'application/vnd.cluetrust.cartomobile-config-pkg' => 'c11amz',
-        'application/vnd.commonspace' => 'csp',
-        'application/vnd.contact.cmsg' => 'cdbcmsg',
-        'application/vnd.cosmocaller' => 'cmc',
-        'application/vnd.crick.clicker' => 'clkx',
-        'application/vnd.crick.clicker.keyboard' => 'clkk',
-        'application/vnd.crick.clicker.palette' => 'clkp',
-        'application/vnd.crick.clicker.template' => 'clkt',
-        'application/vnd.crick.clicker.wordbank' => 'clkw',
-        'application/vnd.criticaltools.wbs+xml' => 'wbs',
-        'application/vnd.ctc-posml' => 'pml',
-        'application/vnd.cups-ppd' => 'ppd',
-        'application/vnd.curl.car' => 'car',
-        'application/vnd.curl.pcurl' => 'pcurl',
-        'application/vnd.dart' => 'dart',
-        'application/vnd.data-vision.rdz' => 'rdz',
-        'application/vnd.dece.data' => 'uvf',
-        'application/vnd.dece.ttml+xml' => 'uvt',
-        'application/vnd.dece.unspecified' => 'uvx',
-        'application/vnd.dece.zip' => 'uvz',
-        'application/vnd.denovo.fcselayout-link' => 'fe_launch',
-        'application/vnd.dna' => 'dna',
-        'application/vnd.dolby.mlp' => 'mlp',
-        'application/vnd.dpgraph' => 'dpg',
-        'application/vnd.dreamfactory' => 'dfac',
-        'application/vnd.ds-keypoint' => 'kpxx',
-        'application/vnd.dvb.ait' => 'ait',
-        'application/vnd.dvb.service' => 'svc',
-        'application/vnd.dynageo' => 'geo',
-        'application/vnd.ecowin.chart' => 'mag',
-        'application/vnd.enliven' => 'nml',
-        'application/vnd.epson.esf' => 'esf',
-        'application/vnd.epson.msf' => 'msf',
-        'application/vnd.epson.quickanime' => 'qam',
-        'application/vnd.epson.salt' => 'slt',
-        'application/vnd.epson.ssf' => 'ssf',
-        'application/vnd.eszigno3+xml' => 'es3',
-        'application/vnd.ezpix-album' => 'ez2',
-        'application/vnd.ezpix-package' => 'ez3',
-        'application/vnd.fdf' => 'fdf',
-        'application/vnd.fdsn.mseed' => 'mseed',
-        'application/vnd.fdsn.seed' => 'seed',
-        'application/vnd.flographit' => 'gph',
-        'application/vnd.fluxtime.clip' => 'ftc',
-        'application/vnd.framemaker' => 'fm',
-        'application/vnd.frogans.fnc' => 'fnc',
-        'application/vnd.frogans.ltf' => 'ltf',
-        'application/vnd.fsc.weblaunch' => 'fsc',
-        'application/vnd.fujitsu.oasys' => 'oas',
-        'application/vnd.fujitsu.oasys2' => 'oa2',
-        'application/vnd.fujitsu.oasys3' => 'oa3',
-        'application/vnd.fujitsu.oasysgp' => 'fg5',
-        'application/vnd.fujitsu.oasysprs' => 'bh2',
-        'application/vnd.fujixerox.ddd' => 'ddd',
-        'application/vnd.fujixerox.docuworks' => 'xdw',
-        'application/vnd.fujixerox.docuworks.binder' => 'xbd',
-        'application/vnd.fuzzysheet' => 'fzs',
-        'application/vnd.genomatix.tuxedo' => 'txd',
-        'application/vnd.geogebra.file' => 'ggb',
-        'application/vnd.geogebra.tool' => 'ggt',
-        'application/vnd.geometry-explorer' => 'gex',
-        'application/vnd.geonext' => 'gxt',
-        'application/vnd.geoplan' => 'g2w',
-        'application/vnd.geospace' => 'g3w',
-        'application/vnd.gmx' => 'gmx',
-        'application/vnd.google-earth.kml+xml' => 'kml',
-        'application/vnd.google-earth.kmz' => 'kmz',
-        'application/vnd.grafeq' => 'gqf',
-        'application/vnd.groove-account' => 'gac',
-        'application/vnd.groove-help' => 'ghf',
-        'application/vnd.groove-identity-message' => 'gim',
-        'application/vnd.groove-injector' => 'grv',
-        'application/vnd.groove-tool-message' => 'gtm',
-        'application/vnd.groove-tool-template' => 'tpl',
-        'application/vnd.groove-vcard' => 'vcg',
-        'application/vnd.hal+xml' => 'hal',
-        'application/vnd.handheld-entertainment+xml' => 'zmm',
-        'application/vnd.hbci' => 'hbci',
-        'application/vnd.hhe.lesson-player' => 'les',
-        'application/vnd.hp-hpgl' => 'hpgl',
-        'application/vnd.hp-hpid' => 'hpid',
-        'application/vnd.hp-hps' => 'hps',
-        'application/vnd.hp-jlyt' => 'jlt',
-        'application/vnd.hp-pcl' => 'pcl',
-        'application/vnd.hp-pclxl' => 'pclxl',
-        'application/vnd.hydrostatix.sof-data' => 'sfd-hdstx',
-        'application/vnd.ibm.minipay' => 'mpy',
-        'application/vnd.ibm.modcap' => 'afp',
-        'application/vnd.ibm.rights-management' => 'irm',
-        'application/vnd.ibm.secure-container' => 'sc',
-        'application/vnd.iccprofile' => 'icc',
-        'application/vnd.igloader' => 'igl',
-        'application/vnd.immervision-ivp' => 'ivp',
-        'application/vnd.immervision-ivu' => 'ivu',
-        'application/vnd.insors.igm' => 'igm',
-        'application/vnd.intercon.formnet' => 'xpw',
-        'application/vnd.intergeo' => 'i2g',
-        'application/vnd.intu.qbo' => 'qbo',
-        'application/vnd.intu.qfx' => 'qfx',
-        'application/vnd.ipunplugged.rcprofile' => 'rcprofile',
-        'application/vnd.irepository.package+xml' => 'irp',
-        'application/vnd.is-xpr' => 'xpr',
-        'application/vnd.isac.fcs' => 'fcs',
-        'application/vnd.jam' => 'jam',
-        'application/vnd.jcp.javame.midlet-rms' => 'rms',
-        'application/vnd.jisp' => 'jisp',
-        'application/vnd.joost.joda-archive' => 'joda',
-        'application/vnd.kahootz' => 'ktz',
-        'application/vnd.kde.karbon' => 'karbon',
-        'application/vnd.kde.kchart' => 'chrt',
-        'application/vnd.kde.kformula' => 'kfo',
-        'application/vnd.kde.kivio' => 'flw',
-        'application/vnd.kde.kontour' => 'kon',
-        'application/vnd.kde.kpresenter' => 'kpr',
-        'application/vnd.kde.kspread' => 'ksp',
-        'application/vnd.kde.kword' => 'kwd',
-        'application/vnd.kenameaapp' => 'htke',
-        'application/vnd.kidspiration' => 'kia',
-        'application/vnd.kinar' => 'kne',
-        'application/vnd.koan' => 'skp',
-        'application/vnd.kodak-descriptor' => 'sse',
-        'application/vnd.las.las+xml' => 'lasxml',
-        'application/vnd.llamagraphics.life-balance.desktop' => 'lbd',
-        'application/vnd.llamagraphics.life-balance.exchange+xml' => 'lbe',
-        'application/vnd.lotus-1-2-3' => '123',
-        'application/vnd.lotus-approach' => 'apr',
-        'application/vnd.lotus-freelance' => 'pre',
-        'application/vnd.lotus-notes' => 'nsf',
-        'application/vnd.lotus-organizer' => 'org',
-        'application/vnd.lotus-screencam' => 'scm',
-        'application/vnd.lotus-wordpro' => 'lwp',
-        'application/vnd.macports.portpkg' => 'portpkg',
-        'application/vnd.mcd' => 'mcd',
-        'application/vnd.medcalcdata' => 'mc1',
-        'application/vnd.mediastation.cdkey' => 'cdkey',
-        'application/vnd.mfer' => 'mwf',
-        'application/vnd.mfmp' => 'mfm',
-        'application/vnd.micrografx.flo' => 'flo',
-        'application/vnd.micrografx.igx' => 'igx',
-        'application/vnd.mif' => 'mif',
-        'application/vnd.mobius.daf' => 'daf',
-        'application/vnd.mobius.dis' => 'dis',
-        'application/vnd.mobius.mbk' => 'mbk',
-        'application/vnd.mobius.mqy' => 'mqy',
-        'application/vnd.mobius.msl' => 'msl',
-        'application/vnd.mobius.plc' => 'plc',
-        'application/vnd.mobius.txf' => 'txf',
-        'application/vnd.mophun.application' => 'mpn',
-        'application/vnd.mophun.certificate' => 'mpc',
-        'application/vnd.mozilla.xul+xml' => 'xul',
-        'application/vnd.ms-artgalry' => 'cil',
-        'application/vnd.ms-cab-compressed' => 'cab',
-        'application/vnd.ms-excel' => 'xls',
-        'application/vnd.ms-excel.addin.macroenabled.12' => 'xlam',
-        'application/vnd.ms-excel.sheet.binary.macroenabled.12' => 'xlsb',
-        'application/vnd.ms-excel.sheet.macroenabled.12' => 'xlsm',
-        'application/vnd.ms-excel.template.macroenabled.12' => 'xltm',
-        'application/vnd.ms-fontobject' => 'eot',
-        'application/vnd.ms-htmlhelp' => 'chm',
-        'application/vnd.ms-ims' => 'ims',
-        'application/vnd.ms-lrm' => 'lrm',
-        'application/vnd.ms-officetheme' => 'thmx',
-        'application/vnd.ms-pki.seccat' => 'cat',
-        'application/vnd.ms-pki.stl' => 'stl',
-        'application/vnd.ms-powerpoint' => 'ppt',
-        'application/vnd.ms-powerpoint.addin.macroenabled.12' => 'ppam',
-        'application/vnd.ms-powerpoint.presentation.macroenabled.12' => 'pptm',
-        'application/vnd.ms-powerpoint.slide.macroenabled.12' => 'sldm',
-        'application/vnd.ms-powerpoint.slideshow.macroenabled.12' => 'ppsm',
-        'application/vnd.ms-powerpoint.template.macroenabled.12' => 'potm',
-        'application/vnd.ms-project' => 'mpp',
-        'application/vnd.ms-word.document.macroenabled.12' => 'docm',
-        'application/vnd.ms-word.template.macroenabled.12' => 'dotm',
-        'application/vnd.ms-works' => 'wps',
-        'application/vnd.ms-wpl' => 'wpl',
-        'application/vnd.ms-xpsdocument' => 'xps',
-        'application/vnd.mseq' => 'mseq',
-        'application/vnd.musician' => 'mus',
-        'application/vnd.muvee.style' => 'msty',
-        'application/vnd.mynfc' => 'taglet',
-        'application/vnd.neurolanguage.nlu' => 'nlu',
-        'application/vnd.nitf' => 'ntf',
-        'application/vnd.noblenet-directory' => 'nnd',
-        'application/vnd.noblenet-sealer' => 'nns',
-        'application/vnd.noblenet-web' => 'nnw',
-        'application/vnd.nokia.n-gage.data' => 'ngdat',
-        'application/vnd.nokia.n-gage.symbian.install' => 'n-gage',
-        'application/vnd.nokia.radio-preset' => 'rpst',
-        'application/vnd.nokia.radio-presets' => 'rpss',
-        'application/vnd.novadigm.edm' => 'edm',
-        'application/vnd.novadigm.edx' => 'edx',
-        'application/vnd.novadigm.ext' => 'ext',
-        'application/vnd.oasis.opendocument.chart' => 'odc',
-        'application/vnd.oasis.opendocument.chart-template' => 'otc',
-        'application/vnd.oasis.opendocument.database' => 'odb',
-        'application/vnd.oasis.opendocument.formula' => 'odf',
-        'application/vnd.oasis.opendocument.formula-template' => 'odft',
-        'application/vnd.oasis.opendocument.graphics' => 'odg',
-        'application/vnd.oasis.opendocument.graphics-template' => 'otg',
-        'application/vnd.oasis.opendocument.image' => 'odi',
-        'application/vnd.oasis.opendocument.image-template' => 'oti',
-        'application/vnd.oasis.opendocument.presentation' => 'odp',
-        'application/vnd.oasis.opendocument.presentation-template' => 'otp',
-        'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
-        'application/vnd.oasis.opendocument.spreadsheet-template' => 'ots',
-        'application/vnd.oasis.opendocument.text' => 'odt',
-        'application/vnd.oasis.opendocument.text-master' => 'odm',
-        'application/vnd.oasis.opendocument.text-template' => 'ott',
-        'application/vnd.oasis.opendocument.text-web' => 'oth',
-        'application/vnd.olpc-sugar' => 'xo',
-        'application/vnd.oma.dd2+xml' => 'dd2',
-        'application/vnd.openofficeorg.extension' => 'oxt',
-        'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx',
-        'application/vnd.openxmlformats-officedocument.presentationml.slide' => 'sldx',
-        'application/vnd.openxmlformats-officedocument.presentationml.slideshow' => 'ppsx',
-        'application/vnd.openxmlformats-officedocument.presentationml.template' => 'potx',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.template' => 'xltx',
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx',
-        'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'dotx',
-        'application/vnd.osgeo.mapguide.package' => 'mgp',
-        'application/vnd.osgi.dp' => 'dp',
-        'application/vnd.osgi.subsystem' => 'esa',
-        'application/vnd.palm' => 'pdb',
-        'application/vnd.pawaafile' => 'paw',
-        'application/vnd.pg.format' => 'str',
-        'application/vnd.pg.osasli' => 'ei6',
-        'application/vnd.picsel' => 'efif',
-        'application/vnd.pmi.widget' => 'wg',
-        'application/vnd.pocketlearn' => 'plf',
-        'application/vnd.powerbuilder6' => 'pbd',
-        'application/vnd.previewsystems.box' => 'box',
-        'application/vnd.proteus.magazine' => 'mgz',
-        'application/vnd.publishare-delta-tree' => 'qps',
-        'application/vnd.pvi.ptid1' => 'ptid',
-        'application/vnd.quark.quarkxpress' => 'qxd',
-        'application/vnd.realvnc.bed' => 'bed',
-        'application/vnd.recordare.musicxml' => 'mxl',
-        'application/vnd.recordare.musicxml+xml' => 'musicxml',
-        'application/vnd.rig.cryptonote' => 'cryptonote',
-        'application/vnd.rim.cod' => 'cod',
-        'application/vnd.rn-realmedia' => 'rm',
-        'application/vnd.rn-realmedia-vbr' => 'rmvb',
-        'application/vnd.route66.link66+xml' => 'link66',
-        'application/vnd.sailingtracker.track' => 'st',
-        'application/vnd.seemail' => 'see',
-        'application/vnd.sema' => 'sema',
-        'application/vnd.semd' => 'semd',
-        'application/vnd.semf' => 'semf',
-        'application/vnd.shana.informed.formdata' => 'ifm',
-        'application/vnd.shana.informed.formtemplate' => 'itp',
-        'application/vnd.shana.informed.interchange' => 'iif',
-        'application/vnd.shana.informed.package' => 'ipk',
-        'application/vnd.simtech-mindmapper' => 'twd',
-        'application/vnd.smaf' => 'mmf',
-        'application/vnd.smart.teacher' => 'teacher',
-        'application/vnd.solent.sdkm+xml' => 'sdkm',
-        'application/vnd.spotfire.dxp' => 'dxp',
-        'application/vnd.spotfire.sfs' => 'sfs',
-        'application/vnd.stardivision.calc' => 'sdc',
-        'application/vnd.stardivision.draw' => 'sda',
-        'application/vnd.stardivision.impress' => 'sdd',
-        'application/vnd.stardivision.math' => 'smf',
-        'application/vnd.stardivision.writer' => 'sdw',
-        'application/vnd.stardivision.writer-global' => 'sgl',
-        'application/vnd.stepmania.package' => 'smzip',
-        'application/vnd.stepmania.stepchart' => 'sm',
-        'application/vnd.sun.xml.calc' => 'sxc',
-        'application/vnd.sun.xml.calc.template' => 'stc',
-        'application/vnd.sun.xml.draw' => 'sxd',
-        'application/vnd.sun.xml.draw.template' => 'std',
-        'application/vnd.sun.xml.impress' => 'sxi',
-        'application/vnd.sun.xml.impress.template' => 'sti',
-        'application/vnd.sun.xml.math' => 'sxm',
-        'application/vnd.sun.xml.writer' => 'sxw',
-        'application/vnd.sun.xml.writer.global' => 'sxg',
-        'application/vnd.sun.xml.writer.template' => 'stw',
-        'application/vnd.sus-calendar' => 'sus',
-        'application/vnd.svd' => 'svd',
-        'application/vnd.symbian.install' => 'sis',
-        'application/vnd.syncml+xml' => 'xsm',
-        'application/vnd.syncml.dm+wbxml' => 'bdm',
-        'application/vnd.syncml.dm+xml' => 'xdm',
-        'application/vnd.tao.intent-module-archive' => 'tao',
-        'application/vnd.tcpdump.pcap' => 'pcap',
-        'application/vnd.tmobile-livetv' => 'tmo',
-        'application/vnd.trid.tpt' => 'tpt',
-        'application/vnd.triscape.mxs' => 'mxs',
-        'application/vnd.trueapp' => 'tra',
-        'application/vnd.ufdl' => 'ufd',
-        'application/vnd.uiq.theme' => 'utz',
-        'application/vnd.umajin' => 'umj',
-        'application/vnd.unity' => 'unityweb',
-        'application/vnd.uoml+xml' => 'uoml',
-        'application/vnd.vcx' => 'vcx',
-        'application/vnd.visio' => 'vsd',
-        'application/vnd.visionary' => 'vis',
-        'application/vnd.vsf' => 'vsf',
-        'application/vnd.wap.wbxml' => 'wbxml',
-        'application/vnd.wap.wmlc' => 'wmlc',
-        'application/vnd.wap.wmlscriptc' => 'wmlsc',
-        'application/vnd.webturbo' => 'wtb',
-        'application/vnd.wolfram.player' => 'nbp',
-        'application/vnd.wordperfect' => 'wpd',
-        'application/vnd.wqd' => 'wqd',
-        'application/vnd.wt.stf' => 'stf',
-        'application/vnd.xara' => 'xar',
-        'application/vnd.xfdl' => 'xfdl',
-        'application/vnd.yamaha.hv-dic' => 'hvd',
-        'application/vnd.yamaha.hv-script' => 'hvs',
-        'application/vnd.yamaha.hv-voice' => 'hvp',
-        'application/vnd.yamaha.openscoreformat' => 'osf',
-        'application/vnd.yamaha.openscoreformat.osfpvg+xml' => 'osfpvg',
-        'application/vnd.yamaha.smaf-audio' => 'saf',
-        'application/vnd.yamaha.smaf-phrase' => 'spf',
-        'application/vnd.yellowriver-custom-menu' => 'cmp',
-        'application/vnd.zul' => 'zir',
-        'application/vnd.zzazz.deck+xml' => 'zaz',
-        'application/voicexml+xml' => 'vxml',
-        'application/widget' => 'wgt',
-        'application/winhlp' => 'hlp',
-        'application/wsdl+xml' => 'wsdl',
-        'application/wspolicy+xml' => 'wspolicy',
-        'application/x-7z-compressed' => '7z',
-        'application/x-abiword' => 'abw',
-        'application/x-ace-compressed' => 'ace',
-        'application/x-apple-diskimage' => 'dmg',
-        'application/x-authorware-bin' => 'aab',
-        'application/x-authorware-map' => 'aam',
-        'application/x-authorware-seg' => 'aas',
-        'application/x-bcpio' => 'bcpio',
-        'application/x-bittorrent' => 'torrent',
-        'application/x-blorb' => 'blb',
-        'application/x-bzip' => 'bz',
-        'application/x-bzip2' => 'bz2',
-        'application/x-cbr' => 'cbr',
-        'application/x-cdlink' => 'vcd',
-        'application/x-cfs-compressed' => 'cfs',
-        'application/x-chat' => 'chat',
-        'application/x-chess-pgn' => 'pgn',
-        'application/x-conference' => 'nsc',
-        'application/x-cpio' => 'cpio',
-        'application/x-csh' => 'csh',
-        'application/x-debian-package' => 'deb',
-        'application/x-dgc-compressed' => 'dgc',
-        'application/x-director' => 'dir',
-        'application/x-doom' => 'wad',
-        'application/x-dtbncx+xml' => 'ncx',
-        'application/x-dtbook+xml' => 'dtb',
-        'application/x-dtbresource+xml' => 'res',
-        'application/x-dvi' => 'dvi',
-        'application/x-envoy' => 'evy',
-        'application/x-eva' => 'eva',
-        'application/x-font-bdf' => 'bdf',
-        'application/x-font-ghostscript' => 'gsf',
-        'application/x-font-linux-psf' => 'psf',
-        'application/x-font-otf' => 'otf',
-        'application/x-font-pcf' => 'pcf',
-        'application/x-font-snf' => 'snf',
-        'application/x-font-ttf' => 'ttf',
-        'application/x-font-type1' => 'pfa',
-        'application/x-font-woff' => 'woff',
-        'application/x-freearc' => 'arc',
-        'application/x-futuresplash' => 'spl',
-        'application/x-gca-compressed' => 'gca',
-        'application/x-glulx' => 'ulx',
-        'application/x-gnumeric' => 'gnumeric',
-        'application/x-gramps-xml' => 'gramps',
-        'application/x-gtar' => 'gtar',
-        'application/x-hdf' => 'hdf',
-        'application/x-install-instructions' => 'install',
-        'application/x-iso9660-image' => 'iso',
-        'application/x-java-jnlp-file' => 'jnlp',
-        'application/x-latex' => 'latex',
-        'application/x-lzh-compressed' => 'lzh',
-        'application/x-mie' => 'mie',
-        'application/x-mobipocket-ebook' => 'prc',
-        'application/x-ms-application' => 'application',
-        'application/x-ms-shortcut' => 'lnk',
-        'application/x-ms-wmd' => 'wmd',
-        'application/x-ms-wmz' => 'wmz',
-        'application/x-ms-xbap' => 'xbap',
-        'application/x-msaccess' => 'mdb',
-        'application/x-msbinder' => 'obd',
-        'application/x-mscardfile' => 'crd',
-        'application/x-msclip' => 'clp',
-        'application/x-msdownload' => 'exe',
-        'application/x-msmediaview' => 'mvb',
-        'application/x-msmetafile' => 'wmf',
-        'application/x-msmoney' => 'mny',
-        'application/x-mspublisher' => 'pub',
-        'application/x-msschedule' => 'scd',
-        'application/x-msterminal' => 'trm',
-        'application/x-mswrite' => 'wri',
-        'application/x-netcdf' => 'nc',
-        'application/x-nzb' => 'nzb',
-        'application/x-pkcs12' => 'p12',
-        'application/x-pkcs7-certificates' => 'p7b',
-        'application/x-pkcs7-certreqresp' => 'p7r',
-        'application/x-rar-compressed' => 'rar',
-        'application/x-rar' => 'rar',
-        'application/x-research-info-systems' => 'ris',
-        'application/x-sh' => 'sh',
-        'application/x-shar' => 'shar',
-        'application/x-shockwave-flash' => 'swf',
-        'application/x-silverlight-app' => 'xap',
-        'application/x-sql' => 'sql',
-        'application/x-stuffit' => 'sit',
-        'application/x-stuffitx' => 'sitx',
-        'application/x-subrip' => 'srt',
-        'application/x-sv4cpio' => 'sv4cpio',
-        'application/x-sv4crc' => 'sv4crc',
-        'application/x-t3vm-image' => 't3',
-        'application/x-tads' => 'gam',
-        'application/x-tar' => 'tar',
-        'application/x-tcl' => 'tcl',
-        'application/x-tex' => 'tex',
-        'application/x-tex-tfm' => 'tfm',
-        'application/x-texinfo' => 'texinfo',
-        'application/x-tgif' => 'obj',
-        'application/x-ustar' => 'ustar',
-        'application/x-wais-source' => 'src',
-        'application/x-x509-ca-cert' => 'der',
-        'application/x-xfig' => 'fig',
-        'application/x-xliff+xml' => 'xlf',
-        'application/x-xpinstall' => 'xpi',
-        'application/x-xz' => 'xz',
-        'application/x-zmachine' => 'z1',
-        'application/xaml+xml' => 'xaml',
-        'application/xcap-diff+xml' => 'xdf',
-        'application/xenc+xml' => 'xenc',
-        'application/xhtml+xml' => 'xhtml',
-        'application/xml' => 'xml',
-        'application/xml-dtd' => 'dtd',
-        'application/xop+xml' => 'xop',
-        'application/xproc+xml' => 'xpl',
-        'application/xslt+xml' => 'xslt',
-        'application/xspf+xml' => 'xspf',
-        'application/xv+xml' => 'mxml',
-        'application/yang' => 'yang',
-        'application/yin+xml' => 'yin',
-        'application/zip' => 'zip',
-        'audio/adpcm' => 'adp',
-        'audio/basic' => 'au',
-        'audio/midi' => 'mid',
-        'audio/mp4' => 'mp4a',
-        'audio/mpeg' => 'mpga',
-        'audio/ogg' => 'oga',
-        'audio/s3m' => 's3m',
-        'audio/silk' => 'sil',
-        'audio/vnd.dece.audio' => 'uva',
-        'audio/vnd.digital-winds' => 'eol',
-        'audio/vnd.dra' => 'dra',
-        'audio/vnd.dts' => 'dts',
-        'audio/vnd.dts.hd' => 'dtshd',
-        'audio/vnd.lucent.voice' => 'lvp',
-        'audio/vnd.ms-playready.media.pya' => 'pya',
-        'audio/vnd.nuera.ecelp4800' => 'ecelp4800',
-        'audio/vnd.nuera.ecelp7470' => 'ecelp7470',
-        'audio/vnd.nuera.ecelp9600' => 'ecelp9600',
-        'audio/vnd.rip' => 'rip',
-        'audio/webm' => 'weba',
-        'audio/x-aac' => 'aac',
-        'audio/x-aiff' => 'aif',
-        'audio/x-caf' => 'caf',
-        'audio/x-flac' => 'flac',
-        'audio/x-matroska' => 'mka',
-        'audio/x-mpegurl' => 'm3u',
-        'audio/x-ms-wax' => 'wax',
-        'audio/x-ms-wma' => 'wma',
-        'audio/x-pn-realaudio' => 'ram',
-        'audio/x-pn-realaudio-plugin' => 'rmp',
-        'audio/x-wav' => 'wav',
-        'audio/xm' => 'xm',
-        'chemical/x-cdx' => 'cdx',
-        'chemical/x-cif' => 'cif',
-        'chemical/x-cmdf' => 'cmdf',
-        'chemical/x-cml' => 'cml',
-        'chemical/x-csml' => 'csml',
-        'chemical/x-xyz' => 'xyz',
-        'image/bmp' => 'bmp',
-        'image/x-ms-bmp' => 'bmp',
-        'image/cgm' => 'cgm',
-        'image/g3fax' => 'g3',
-        'image/gif' => 'gif',
-        'image/ief' => 'ief',
-        'image/jpeg' => 'jpeg',
-        'image/ktx' => 'ktx',
-        'image/png' => 'png',
-        'image/prs.btif' => 'btif',
-        'image/sgi' => 'sgi',
-        'image/svg+xml' => 'svg',
-        'image/tiff' => 'tiff',
-        'image/vnd.adobe.photoshop' => 'psd',
-        'image/vnd.dece.graphic' => 'uvi',
-        'image/vnd.dvb.subtitle' => 'sub',
-        'image/vnd.djvu' => 'djvu',
-        'image/vnd.dwg' => 'dwg',
-        'image/vnd.dxf' => 'dxf',
-        'image/vnd.fastbidsheet' => 'fbs',
-        'image/vnd.fpx' => 'fpx',
-        'image/vnd.fst' => 'fst',
-        'image/vnd.fujixerox.edmics-mmr' => 'mmr',
-        'image/vnd.fujixerox.edmics-rlc' => 'rlc',
-        'image/vnd.ms-modi' => 'mdi',
-        'image/vnd.ms-photo' => 'wdp',
-        'image/vnd.net-fpx' => 'npx',
-        'image/vnd.wap.wbmp' => 'wbmp',
-        'image/vnd.xiff' => 'xif',
-        'image/webp' => 'webp',
-        'image/x-3ds' => '3ds',
-        'image/x-cmu-raster' => 'ras',
-        'image/x-cmx' => 'cmx',
-        'image/x-freehand' => 'fh',
-        'image/x-icon' => 'ico',
-        'image/x-mrsid-image' => 'sid',
-        'image/x-pcx' => 'pcx',
-        'image/x-pict' => 'pic',
-        'image/x-portable-anymap' => 'pnm',
-        'image/x-portable-bitmap' => 'pbm',
-        'image/x-portable-graymap' => 'pgm',
-        'image/x-portable-pixmap' => 'ppm',
-        'image/x-rgb' => 'rgb',
-        'image/x-tga' => 'tga',
-        'image/x-xbitmap' => 'xbm',
-        'image/x-xpixmap' => 'xpm',
-        'image/x-xwindowdump' => 'xwd',
-        'message/rfc822' => 'eml',
-        'model/iges' => 'igs',
-        'model/mesh' => 'msh',
-        'model/vnd.collada+xml' => 'dae',
-        'model/vnd.dwf' => 'dwf',
-        'model/vnd.gdl' => 'gdl',
-        'model/vnd.gtw' => 'gtw',
-        'model/vnd.mts' => 'mts',
-        'model/vnd.vtu' => 'vtu',
-        'model/vrml' => 'wrl',
-        'model/x3d+binary' => 'x3db',
-        'model/x3d+vrml' => 'x3dv',
-        'model/x3d+xml' => 'x3d',
-        'text/cache-manifest' => 'appcache',
-        'text/calendar' => 'ics',
-        'text/css' => 'css',
-        'text/csv' => 'csv',
-        'text/html' => 'html',
-        'text/n3' => 'n3',
-        'text/plain' => 'txt',
-        'text/prs.lines.tag' => 'dsc',
-        'text/richtext' => 'rtx',
-        'text/rtf' => 'rtf',
-        'text/sgml' => 'sgml',
-        'text/tab-separated-values' => 'tsv',
-        'text/troff' => 't',
-        'text/turtle' => 'ttl',
-        'text/uri-list' => 'uri',
-        'text/vcard' => 'vcard',
-        'text/vnd.curl' => 'curl',
-        'text/vnd.curl.dcurl' => 'dcurl',
-        'text/vnd.curl.scurl' => 'scurl',
-        'text/vnd.curl.mcurl' => 'mcurl',
-        'text/vnd.dvb.subtitle' => 'sub',
-        'text/vnd.fly' => 'fly',
-        'text/vnd.fmi.flexstor' => 'flx',
-        'text/vnd.graphviz' => 'gv',
-        'text/vnd.in3d.3dml' => '3dml',
-        'text/vnd.in3d.spot' => 'spot',
-        'text/vnd.sun.j2me.app-descriptor' => 'jad',
-        'text/vnd.wap.wml' => 'wml',
-        'text/vnd.wap.wmlscript' => 'wmls',
-        'text/x-asm' => 's',
-        'text/x-c' => 'c',
-        'text/x-fortran' => 'f',
-        'text/x-pascal' => 'p',
-        'text/x-java-source' => 'java',
-        'text/x-opml' => 'opml',
-        'text/x-nfo' => 'nfo',
-        'text/x-setext' => 'etx',
-        'text/x-sfv' => 'sfv',
-        'text/x-uuencode' => 'uu',
-        'text/x-vcalendar' => 'vcs',
-        'text/x-vcard' => 'vcf',
-        'video/3gpp' => '3gp',
-        'video/3gpp2' => '3g2',
-        'video/h261' => 'h261',
-        'video/h263' => 'h263',
-        'video/h264' => 'h264',
-        'video/jpeg' => 'jpgv',
-        'video/jpm' => 'jpm',
-        'video/mj2' => 'mj2',
-        'video/mp4' => 'mp4',
-        'video/mpeg' => 'mpeg',
-        'video/ogg' => 'ogv',
-        'video/quicktime' => 'qt',
-        'video/vnd.dece.hd' => 'uvh',
-        'video/vnd.dece.mobile' => 'uvm',
-        'video/vnd.dece.pd' => 'uvp',
-        'video/vnd.dece.sd' => 'uvs',
-        'video/vnd.dece.video' => 'uvv',
-        'video/vnd.dvb.file' => 'dvb',
-        'video/vnd.fvt' => 'fvt',
-        'video/vnd.mpegurl' => 'mxu',
-        'video/vnd.ms-playready.media.pyv' => 'pyv',
-        'video/vnd.uvvu.mp4' => 'uvu',
-        'video/vnd.vivo' => 'viv',
-        'video/webm' => 'webm',
-        'video/x-f4v' => 'f4v',
-        'video/x-fli' => 'fli',
-        'video/x-flv' => 'flv',
-        'video/x-m4v' => 'm4v',
-        'video/x-matroska' => 'mkv',
-        'video/x-mng' => 'mng',
-        'video/x-ms-asf' => 'asf',
-        'video/x-ms-vob' => 'vob',
-        'video/x-ms-wm' => 'wm',
-        'video/x-ms-wmv' => 'wmv',
-        'video/x-ms-wmx' => 'wmx',
-        'video/x-ms-wvx' => 'wvx',
-        'video/x-msvideo' => 'avi',
-        'video/x-sgi-movie' => 'movie',
-        'video/x-smv' => 'smv',
-        'x-conference/x-cooltalk' => 'ice',
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function guess($mimeType)
-    {
-        return isset($this->defaultExtensions[$mimeType]) ? $this->defaultExtensions[$mimeType] : null;
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
deleted file mode 100644
index ecc8a30..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesser.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
-
-/**
- * A singleton mime type guesser.
- *
- * By default, all mime type guessers provided by the framework are installed
- * (if available on the current OS/PHP setup).
- *
- * You can register custom guessers by calling the register() method on the
- * singleton instance. Custom guessers are always called before any default ones.
- *
- *     $guesser = MimeTypeGuesser::getInstance();
- *     $guesser->register(new MyCustomMimeTypeGuesser());
- *
- * If you want to change the order of the default guessers, just re-register your
- * preferred one as a custom one. The last registered guesser is preferred over
- * previously registered ones.
- *
- * Re-registering a built-in guesser also allows you to configure it:
- *
- *     $guesser = MimeTypeGuesser::getInstance();
- *     $guesser->register(new FileinfoMimeTypeGuesser('/path/to/magic/file'));
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class MimeTypeGuesser implements MimeTypeGuesserInterface
-{
-    /**
-     * The singleton instance.
-     *
-     * @var MimeTypeGuesser
-     */
-    private static $instance = null;
-
-    /**
-     * All registered MimeTypeGuesserInterface instances.
-     *
-     * @var array
-     */
-    protected $guessers = array();
-
-    /**
-     * Returns the singleton instance.
-     *
-     * @return MimeTypeGuesser
-     */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Resets the singleton instance.
-     */
-    public static function reset()
-    {
-        self::$instance = null;
-    }
-
-    /**
-     * Registers all natively provided mime type guessers.
-     */
-    private function __construct()
-    {
-        if (FileBinaryMimeTypeGuesser::isSupported()) {
-            $this->register(new FileBinaryMimeTypeGuesser());
-        }
-
-        if (FileinfoMimeTypeGuesser::isSupported()) {
-            $this->register(new FileinfoMimeTypeGuesser());
-        }
-    }
-
-    /**
-     * Registers a new mime type guesser.
-     *
-     * When guessing, this guesser is preferred over previously registered ones.
-     *
-     * @param MimeTypeGuesserInterface $guesser
-     */
-    public function register(MimeTypeGuesserInterface $guesser)
-    {
-        array_unshift($this->guessers, $guesser);
-    }
-
-    /**
-     * Tries to guess the mime type of the given file.
-     *
-     * The file is passed to each registered mime type guesser in reverse order
-     * of their registration (last registered is queried first). Once a guesser
-     * returns a value that is not NULL, this method terminates and returns the
-     * value.
-     *
-     * @param string $path The path to the file
-     *
-     * @return string The mime type or NULL, if none could be guessed
-     *
-     * @throws \LogicException
-     * @throws FileNotFoundException
-     * @throws AccessDeniedException
-     */
-    public function guess($path)
-    {
-        if (!is_file($path)) {
-            throw new FileNotFoundException($path);
-        }
-
-        if (!is_readable($path)) {
-            throw new AccessDeniedException($path);
-        }
-
-        if (!$this->guessers) {
-            $msg = 'Unable to guess the mime type as no guessers are available';
-            if (!FileinfoMimeTypeGuesser::isSupported()) {
-                $msg .= ' (Did you enable the php_fileinfo extension?)';
-            }
-            throw new \LogicException($msg);
-        }
-
-        foreach ($this->guessers as $guesser) {
-            if (null !== $mimeType = $guesser->guess($path)) {
-                return $mimeType;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php b/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
deleted file mode 100644
index f8c3ad2..0000000
--- a/vendor/symfony/http-foundation/File/MimeType/MimeTypeGuesserInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\HttpFoundation\File\MimeType;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
-
-/**
- * Guesses the mime type of a file.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface MimeTypeGuesserInterface
-{
-    /**
-     * Guesses the mime type of the file with the given path.
-     *
-     * @param string $path The path to the file
-     *
-     * @return string The mime type or NULL, if none could be guessed
-     *
-     * @throws FileNotFoundException If the file does not exist
-     * @throws AccessDeniedException If the file could not be read
-     */
-    public function guess($path);
-}
diff --git a/vendor/symfony/http-foundation/File/UploadedFile.php b/vendor/symfony/http-foundation/File/UploadedFile.php
deleted file mode 100644
index 6b869e0..0000000
--- a/vendor/symfony/http-foundation/File/UploadedFile.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?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\Component\HttpFoundation\File;
-
-use Symfony\Component\HttpFoundation\File\Exception\FileException;
-use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
-use Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser;
-
-/**
- * A file uploaded through a form.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class UploadedFile extends File
-{
-    /**
-     * Whether the test mode is activated.
-     *
-     * Local files are used in test mode hence the code should not enforce HTTP uploads.
-     *
-     * @var bool
-     */
-    private $test = false;
-
-    /**
-     * The original name of the uploaded file.
-     *
-     * @var string
-     */
-    private $originalName;
-
-    /**
-     * The mime type provided by the uploader.
-     *
-     * @var string
-     */
-    private $mimeType;
-
-    /**
-     * The file size provided by the uploader.
-     *
-     * @var string
-     */
-    private $size;
-
-    /**
-     * The UPLOAD_ERR_XXX constant provided by the uploader.
-     *
-     * @var int
-     */
-    private $error;
-
-    /**
-     * Accepts the information of the uploaded file as provided by the PHP global $_FILES.
-     *
-     * The file object is only created when the uploaded file is valid (i.e. when the
-     * isValid() method returns true). Otherwise the only methods that could be called
-     * on an UploadedFile instance are:
-     *
-     *   * getClientOriginalName,
-     *   * getClientMimeType,
-     *   * isValid,
-     *   * getError.
-     *
-     * Calling any other method on an non-valid instance will cause an unpredictable result.
-     *
-     * @param string $path         The full temporary path to the file
-     * @param string $originalName The original file name
-     * @param string $mimeType     The type of the file as provided by PHP
-     * @param int    $size         The file size
-     * @param int    $error        The error constant of the upload (one of PHP's UPLOAD_ERR_XXX constants)
-     * @param bool   $test         Whether the test mode is active
-     *
-     * @throws FileException         If file_uploads is disabled
-     * @throws FileNotFoundException If the file does not exist
-     */
-    public function __construct($path, $originalName, $mimeType = null, $size = null, $error = null, $test = false)
-    {
-        $this->originalName = $this->getName($originalName);
-        $this->mimeType = $mimeType ?: 'application/octet-stream';
-        $this->size = $size;
-        $this->error = $error ?: UPLOAD_ERR_OK;
-        $this->test = (bool) $test;
-
-        parent::__construct($path, UPLOAD_ERR_OK === $this->error);
-    }
-
-    /**
-     * Returns the original file name.
-     *
-     * It is extracted from the request from which the file has been uploaded.
-     * Then it should not be considered as a safe value.
-     *
-     * @return string|null The original name
-     */
-    public function getClientOriginalName()
-    {
-        return $this->originalName;
-    }
-
-    /**
-     * Returns the original file extension.
-     *
-     * It is extracted from the original file name that was uploaded.
-     * Then it should not be considered as a safe value.
-     *
-     * @return string The extension
-     */
-    public function getClientOriginalExtension()
-    {
-        return pathinfo($this->originalName, PATHINFO_EXTENSION);
-    }
-
-    /**
-     * Returns the file mime type.
-     *
-     * The client mime type is extracted from the request from which the file
-     * was uploaded, so it should not be considered as a safe value.
-     *
-     * For a trusted mime type, use getMimeType() instead (which guesses the mime
-     * type based on the file content).
-     *
-     * @return string|null The mime type
-     *
-     * @see getMimeType()
-     */
-    public function getClientMimeType()
-    {
-        return $this->mimeType;
-    }
-
-    /**
-     * Returns the extension based on the client mime type.
-     *
-     * If the mime type is unknown, returns null.
-     *
-     * This method uses the mime type as guessed by getClientMimeType()
-     * to guess the file extension. As such, the extension returned
-     * by this method cannot be trusted.
-     *
-     * For a trusted extension, use guessExtension() instead (which guesses
-     * the extension based on the guessed mime type for the file).
-     *
-     * @return string|null The guessed extension or null if it cannot be guessed
-     *
-     * @see guessExtension()
-     * @see getClientMimeType()
-     */
-    public function guessClientExtension()
-    {
-        $type = $this->getClientMimeType();
-        $guesser = ExtensionGuesser::getInstance();
-
-        return $guesser->guess($type);
-    }
-
-    /**
-     * Returns the file size.
-     *
-     * It is extracted from the request from which the file has been uploaded.
-     * Then it should not be considered as a safe value.
-     *
-     * @return int|null The file size
-     */
-    public function getClientSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * Returns the upload error.
-     *
-     * If the upload was successful, the constant UPLOAD_ERR_OK is returned.
-     * Otherwise one of the other UPLOAD_ERR_XXX constants is returned.
-     *
-     * @return int The upload error
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Returns whether the file was uploaded successfully.
-     *
-     * @return bool True if the file has been uploaded with HTTP and no error occurred.
-     */
-    public function isValid()
-    {
-        $isOk = $this->error === UPLOAD_ERR_OK;
-
-        return $this->test ? $isOk : $isOk && is_uploaded_file($this->getPathname());
-    }
-
-    /**
-     * Moves the file to a new location.
-     *
-     * @param string $directory The destination folder
-     * @param string $name      The new file name
-     *
-     * @return File A File object representing the new file
-     *
-     * @throws FileException if, for any reason, the file could not have been moved
-     */
-    public function move($directory, $name = null)
-    {
-        if ($this->isValid()) {
-            if ($this->test) {
-                return parent::move($directory, $name);
-            }
-
-            $target = $this->getTargetFile($directory, $name);
-
-            if (!@move_uploaded_file($this->getPathname(), $target)) {
-                $error = error_get_last();
-                throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message'])));
-            }
-
-            @chmod($target, 0666 & ~umask());
-
-            return $target;
-        }
-
-        throw new FileException($this->getErrorMessage());
-    }
-
-    /**
-     * Returns the maximum size of an uploaded file as configured in php.ini.
-     *
-     * @return int The maximum size of an uploaded file in bytes
-     */
-    public static function getMaxFilesize()
-    {
-        $iniMax = strtolower(ini_get('upload_max_filesize'));
-
-        if ('' === $iniMax) {
-            return PHP_INT_MAX;
-        }
-
-        $max = ltrim($iniMax, '+');
-        if (0 === strpos($max, '0x')) {
-            $max = intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
-            $max = intval($max, 8);
-        } else {
-            $max = (int) $max;
-        }
-
-        switch (substr($iniMax, -1)) {
-            case 't': $max *= 1024;
-            case 'g': $max *= 1024;
-            case 'm': $max *= 1024;
-            case 'k': $max *= 1024;
-        }
-
-        return $max;
-    }
-
-    /**
-     * Returns an informative upload error message.
-     *
-     * @return string The error message regarding the specified error code
-     */
-    public function getErrorMessage()
-    {
-        static $errors = array(
-            UPLOAD_ERR_INI_SIZE => 'The file "%s" exceeds your upload_max_filesize ini directive (limit is %d KiB).',
-            UPLOAD_ERR_FORM_SIZE => 'The file "%s" exceeds the upload limit defined in your form.',
-            UPLOAD_ERR_PARTIAL => 'The file "%s" was only partially uploaded.',
-            UPLOAD_ERR_NO_FILE => 'No file was uploaded.',
-            UPLOAD_ERR_CANT_WRITE => 'The file "%s" could not be written on disk.',
-            UPLOAD_ERR_NO_TMP_DIR => 'File could not be uploaded: missing temporary directory.',
-            UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
-        );
-
-        $errorCode = $this->error;
-        $maxFilesize = $errorCode === UPLOAD_ERR_INI_SIZE ? self::getMaxFilesize() / 1024 : 0;
-        $message = isset($errors[$errorCode]) ? $errors[$errorCode] : 'The file "%s" was not uploaded due to an unknown error.';
-
-        return sprintf($message, $this->getClientOriginalName(), $maxFilesize);
-    }
-}
diff --git a/vendor/symfony/http-foundation/FileBag.php b/vendor/symfony/http-foundation/FileBag.php
deleted file mode 100644
index 197eab4..0000000
--- a/vendor/symfony/http-foundation/FileBag.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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\Component\HttpFoundation;
-
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-/**
- * FileBag is a container for uploaded files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- */
-class FileBag extends ParameterBag
-{
-    private static $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
-
-    /**
-     * Constructor.
-     *
-     * @param array $parameters An array of HTTP files
-     */
-    public function __construct(array $parameters = array())
-    {
-        $this->replace($parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function replace(array $files = array())
-    {
-        $this->parameters = array();
-        $this->add($files);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $value)
-    {
-        if (!is_array($value) && !$value instanceof UploadedFile) {
-            throw new \InvalidArgumentException('An uploaded file must be an array or an instance of UploadedFile.');
-        }
-
-        parent::set($key, $this->convertFileInformation($value));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add(array $files = array())
-    {
-        foreach ($files as $key => $file) {
-            $this->set($key, $file);
-        }
-    }
-
-    /**
-     * Converts uploaded files to UploadedFile instances.
-     *
-     * @param array|UploadedFile $file A (multi-dimensional) array of uploaded file information
-     *
-     * @return array A (multi-dimensional) array of UploadedFile instances
-     */
-    protected function convertFileInformation($file)
-    {
-        if ($file instanceof UploadedFile) {
-            return $file;
-        }
-
-        $file = $this->fixPhpFilesArray($file);
-        if (is_array($file)) {
-            $keys = array_keys($file);
-            sort($keys);
-
-            if ($keys == self::$fileKeys) {
-                if (UPLOAD_ERR_NO_FILE == $file['error']) {
-                    $file = null;
-                } else {
-                    $file = new UploadedFile($file['tmp_name'], $file['name'], $file['type'], $file['size'], $file['error']);
-                }
-            } else {
-                $file = array_map(array($this, 'convertFileInformation'), $file);
-            }
-        }
-
-        return $file;
-    }
-
-    /**
-     * Fixes a malformed PHP $_FILES array.
-     *
-     * PHP has a bug that the format of the $_FILES array differs, depending on
-     * whether the uploaded file fields had normal field names or array-like
-     * field names ("normal" vs. "parent[child]").
-     *
-     * This method fixes the array to look like the "normal" $_FILES array.
-     *
-     * It's safe to pass an already converted array, in which case this method
-     * just returns the original array unmodified.
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    protected function fixPhpFilesArray($data)
-    {
-        if (!is_array($data)) {
-            return $data;
-        }
-
-        $keys = array_keys($data);
-        sort($keys);
-
-        if (self::$fileKeys != $keys || !isset($data['name']) || !is_array($data['name'])) {
-            return $data;
-        }
-
-        $files = $data;
-        foreach (self::$fileKeys as $k) {
-            unset($files[$k]);
-        }
-
-        foreach ($data['name'] as $key => $name) {
-            $files[$key] = $this->fixPhpFilesArray(array(
-                'error' => $data['error'][$key],
-                'name' => $name,
-                'type' => $data['type'][$key],
-                'tmp_name' => $data['tmp_name'][$key],
-                'size' => $data['size'][$key],
-            ));
-        }
-
-        return $files;
-    }
-}
diff --git a/vendor/symfony/http-foundation/HeaderBag.php b/vendor/symfony/http-foundation/HeaderBag.php
deleted file mode 100644
index dc12000..0000000
--- a/vendor/symfony/http-foundation/HeaderBag.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * HeaderBag is a container for HTTP headers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HeaderBag implements \IteratorAggregate, \Countable
-{
-    protected $headers = array();
-    protected $cacheControl = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $headers An array of HTTP headers
-     */
-    public function __construct(array $headers = array())
-    {
-        foreach ($headers as $key => $values) {
-            $this->set($key, $values);
-        }
-    }
-
-    /**
-     * Returns the headers as a string.
-     *
-     * @return string The headers
-     */
-    public function __toString()
-    {
-        if (!$this->headers) {
-            return '';
-        }
-
-        $max = max(array_map('strlen', array_keys($this->headers))) + 1;
-        $content = '';
-        ksort($this->headers);
-        foreach ($this->headers as $name => $values) {
-            $name = implode('-', array_map('ucfirst', explode('-', $name)));
-            foreach ($values as $value) {
-                $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Returns the headers.
-     *
-     * @return array An array of headers
-     */
-    public function all()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Returns the parameter keys.
-     *
-     * @return array An array of parameter keys
-     */
-    public function keys()
-    {
-        return array_keys($this->headers);
-    }
-
-    /**
-     * Replaces the current HTTP headers by a new set.
-     *
-     * @param array $headers An array of HTTP headers
-     */
-    public function replace(array $headers = array())
-    {
-        $this->headers = array();
-        $this->add($headers);
-    }
-
-    /**
-     * Adds new headers the current HTTP headers set.
-     *
-     * @param array $headers An array of HTTP headers
-     */
-    public function add(array $headers)
-    {
-        foreach ($headers as $key => $values) {
-            $this->set($key, $values);
-        }
-    }
-
-    /**
-     * Returns a header value by name.
-     *
-     * @param string $key     The header name
-     * @param mixed  $default The default value
-     * @param bool   $first   Whether to return the first value or all header values
-     *
-     * @return string|array The first header value if $first is true, an array of values otherwise
-     */
-    public function get($key, $default = null, $first = true)
-    {
-        $key = strtr(strtolower($key), '_', '-');
-
-        if (!array_key_exists($key, $this->headers)) {
-            if (null === $default) {
-                return $first ? null : array();
-            }
-
-            return $first ? $default : array($default);
-        }
-
-        if ($first) {
-            return count($this->headers[$key]) ? $this->headers[$key][0] : $default;
-        }
-
-        return $this->headers[$key];
-    }
-
-    /**
-     * Sets a header by name.
-     *
-     * @param string       $key     The key
-     * @param string|array $values  The value or an array of values
-     * @param bool         $replace Whether to replace the actual value or not (true by default)
-     */
-    public function set($key, $values, $replace = true)
-    {
-        $key = strtr(strtolower($key), '_', '-');
-
-        $values = array_values((array) $values);
-
-        if (true === $replace || !isset($this->headers[$key])) {
-            $this->headers[$key] = $values;
-        } else {
-            $this->headers[$key] = array_merge($this->headers[$key], $values);
-        }
-
-        if ('cache-control' === $key) {
-            $this->cacheControl = $this->parseCacheControl($values[0]);
-        }
-    }
-
-    /**
-     * Returns true if the HTTP header is defined.
-     *
-     * @param string $key The HTTP header
-     *
-     * @return bool true if the parameter exists, false otherwise
-     */
-    public function has($key)
-    {
-        return array_key_exists(strtr(strtolower($key), '_', '-'), $this->headers);
-    }
-
-    /**
-     * Returns true if the given HTTP header contains the given value.
-     *
-     * @param string $key   The HTTP header name
-     * @param string $value The HTTP value
-     *
-     * @return bool true if the value is contained in the header, false otherwise
-     */
-    public function contains($key, $value)
-    {
-        return in_array($value, $this->get($key, null, false));
-    }
-
-    /**
-     * Removes a header.
-     *
-     * @param string $key The HTTP header name
-     */
-    public function remove($key)
-    {
-        $key = strtr(strtolower($key), '_', '-');
-
-        unset($this->headers[$key]);
-
-        if ('cache-control' === $key) {
-            $this->cacheControl = array();
-        }
-    }
-
-    /**
-     * Returns the HTTP header value converted to a date.
-     *
-     * @param string    $key     The parameter key
-     * @param \DateTime $default The default value
-     *
-     * @return null|\DateTime The parsed DateTime or the default value if the header does not exist
-     *
-     * @throws \RuntimeException When the HTTP header is not parseable
-     */
-    public function getDate($key, \DateTime $default = null)
-    {
-        if (null === $value = $this->get($key)) {
-            return $default;
-        }
-
-        if (false === $date = \DateTime::createFromFormat(DATE_RFC2822, $value)) {
-            throw new \RuntimeException(sprintf('The %s HTTP header is not parseable (%s).', $key, $value));
-        }
-
-        return $date;
-    }
-
-    /**
-     * Adds a custom Cache-Control directive.
-     *
-     * @param string $key   The Cache-Control directive name
-     * @param mixed  $value The Cache-Control directive value
-     */
-    public function addCacheControlDirective($key, $value = true)
-    {
-        $this->cacheControl[$key] = $value;
-
-        $this->set('Cache-Control', $this->getCacheControlHeader());
-    }
-
-    /**
-     * Returns true if the Cache-Control directive is defined.
-     *
-     * @param string $key The Cache-Control directive
-     *
-     * @return bool true if the directive exists, false otherwise
-     */
-    public function hasCacheControlDirective($key)
-    {
-        return array_key_exists($key, $this->cacheControl);
-    }
-
-    /**
-     * Returns a Cache-Control directive value by name.
-     *
-     * @param string $key The directive name
-     *
-     * @return mixed|null The directive value if defined, null otherwise
-     */
-    public function getCacheControlDirective($key)
-    {
-        return array_key_exists($key, $this->cacheControl) ? $this->cacheControl[$key] : null;
-    }
-
-    /**
-     * Removes a Cache-Control directive.
-     *
-     * @param string $key The Cache-Control directive
-     */
-    public function removeCacheControlDirective($key)
-    {
-        unset($this->cacheControl[$key]);
-
-        $this->set('Cache-Control', $this->getCacheControlHeader());
-    }
-
-    /**
-     * Returns an iterator for headers.
-     *
-     * @return \ArrayIterator An \ArrayIterator instance
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->headers);
-    }
-
-    /**
-     * Returns the number of headers.
-     *
-     * @return int The number of headers
-     */
-    public function count()
-    {
-        return count($this->headers);
-    }
-
-    protected function getCacheControlHeader()
-    {
-        $parts = array();
-        ksort($this->cacheControl);
-        foreach ($this->cacheControl as $key => $value) {
-            if (true === $value) {
-                $parts[] = $key;
-            } else {
-                if (preg_match('#[^a-zA-Z0-9._-]#', $value)) {
-                    $value = '"'.$value.'"';
-                }
-
-                $parts[] = "$key=$value";
-            }
-        }
-
-        return implode(', ', $parts);
-    }
-
-    /**
-     * Parses a Cache-Control HTTP header.
-     *
-     * @param string $header The value of the Cache-Control HTTP header
-     *
-     * @return array An array representing the attribute values
-     */
-    protected function parseCacheControl($header)
-    {
-        $cacheControl = array();
-        preg_match_all('#([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?#', $header, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            $cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
-        }
-
-        return $cacheControl;
-    }
-}
diff --git a/vendor/symfony/http-foundation/IpUtils.php b/vendor/symfony/http-foundation/IpUtils.php
deleted file mode 100644
index e08301e..0000000
--- a/vendor/symfony/http-foundation/IpUtils.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Http utility functions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class IpUtils
-{
-    /**
-     * This class should not be instantiated.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Checks if an IPv4 or IPv6 address is contained in the list of given IPs or subnets.
-     *
-     * @param string       $requestIp IP to check
-     * @param string|array $ips       List of IPs or subnets (can be a string if only a single one)
-     *
-     * @return bool Whether the IP is valid
-     */
-    public static function checkIp($requestIp, $ips)
-    {
-        if (!is_array($ips)) {
-            $ips = array($ips);
-        }
-
-        $method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';
-
-        foreach ($ips as $ip) {
-            if (self::$method($requestIp, $ip)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Compares two IPv4 addresses.
-     * In case a subnet is given, it checks if it contains the request IP.
-     *
-     * @param string $requestIp IPv4 address to check
-     * @param string $ip        IPv4 address or subnet in CIDR notation
-     *
-     * @return bool Whether the request IP matches the IP, or whether the request IP is within the CIDR subnet.
-     */
-    public static function checkIp4($requestIp, $ip)
-    {
-        if (false !== strpos($ip, '/')) {
-            list($address, $netmask) = explode('/', $ip, 2);
-
-            if ($netmask === '0') {
-                // Ensure IP is valid - using ip2long below implicitly validates, but we need to do it manually here
-                return filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
-            }
-
-            if ($netmask < 0 || $netmask > 32) {
-                return false;
-            }
-        } else {
-            $address = $ip;
-            $netmask = 32;
-        }
-
-        return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
-    }
-
-    /**
-     * Compares two IPv6 addresses.
-     * In case a subnet is given, it checks if it contains the request IP.
-     *
-     * @author David Soria Parra <dsp at php dot net>
-     *
-     * @see https://github.com/dsp/v6tools
-     *
-     * @param string $requestIp IPv6 address to check
-     * @param string $ip        IPv6 address or subnet in CIDR notation
-     *
-     * @return bool Whether the IP is valid
-     *
-     * @throws \RuntimeException When IPV6 support is not enabled
-     */
-    public static function checkIp6($requestIp, $ip)
-    {
-        if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
-            throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
-        }
-
-        if (false !== strpos($ip, '/')) {
-            list($address, $netmask) = explode('/', $ip, 2);
-
-            if ($netmask < 1 || $netmask > 128) {
-                return false;
-            }
-        } else {
-            $address = $ip;
-            $netmask = 128;
-        }
-
-        $bytesAddr = unpack('n*', inet_pton($address));
-        $bytesTest = unpack('n*', inet_pton($requestIp));
-
-        for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
-            $left = $netmask - 16 * ($i - 1);
-            $left = ($left <= 16) ? $left : 16;
-            $mask = ~(0xffff >> $left) & 0xffff;
-            if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/http-foundation/JsonResponse.php b/vendor/symfony/http-foundation/JsonResponse.php
deleted file mode 100644
index 5399d1b..0000000
--- a/vendor/symfony/http-foundation/JsonResponse.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Response represents an HTTP response in JSON format.
- *
- * Note that this class does not force the returned JSON content to be an
- * object. It is however recommended that you do return an object as it
- * protects yourself against XSSI and JSON-JavaScript Hijacking.
- *
- * @see https://www.owasp.org/index.php/OWASP_AJAX_Security_Guidelines#Always_return_JSON_with_an_Object_on_the_outside
- *
- * @author Igor Wiedler <igor@wiedler.ch>
- */
-class JsonResponse extends Response
-{
-    protected $data;
-    protected $callback;
-
-    // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
-    // 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT
-    protected $encodingOptions = 15;
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $data    The response data
-     * @param int   $status  The response status code
-     * @param array $headers An array of response headers
-     */
-    public function __construct($data = null, $status = 200, $headers = array())
-    {
-        parent::__construct('', $status, $headers);
-
-        if (null === $data) {
-            $data = new \ArrayObject();
-        }
-
-        $this->setData($data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function create($data = null, $status = 200, $headers = array())
-    {
-        return new static($data, $status, $headers);
-    }
-
-    /**
-     * Sets the JSONP callback.
-     *
-     * @param string|null $callback The JSONP callback or null to use none
-     *
-     * @return JsonResponse
-     *
-     * @throws \InvalidArgumentException When the callback name is not valid
-     */
-    public function setCallback($callback = null)
-    {
-        if (null !== $callback) {
-            // taken from http://www.geekality.net/2011/08/03/valid-javascript-identifier/
-            $pattern = '/^[$_\p{L}][$_\p{L}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]*+$/u';
-            $parts = explode('.', $callback);
-            foreach ($parts as $part) {
-                if (!preg_match($pattern, $part)) {
-                    throw new \InvalidArgumentException('The callback name is not valid.');
-                }
-            }
-        }
-
-        $this->callback = $callback;
-
-        return $this->update();
-    }
-
-    /**
-     * Sets the data to be sent as JSON.
-     *
-     * @param mixed $data
-     *
-     * @return JsonResponse
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setData($data = array())
-    {
-        if (defined('HHVM_VERSION')) {
-            // HHVM does not trigger any warnings and let exceptions
-            // thrown from a JsonSerializable object pass through.
-            // If only PHP did the same...
-            $data = json_encode($data, $this->encodingOptions);
-        } else {
-            try {
-                if (PHP_VERSION_ID < 50400) {
-                    // PHP 5.3 triggers annoying warnings for some
-                    // types that can't be serialized as JSON (INF, resources, etc.)
-                    // but doesn't provide the JsonSerializable interface.
-                    set_error_handler('var_dump', 0);
-                    $data = @json_encode($data, $this->encodingOptions);
-                } else {
-                    // PHP 5.4 and up wrap exceptions thrown by JsonSerializable
-                    // objects in a new exception that needs to be removed.
-                    // Fortunately, PHP 5.5 and up do not trigger any warning anymore.
-                    if (PHP_VERSION_ID < 50500) {
-                        // Clear json_last_error()
-                        json_encode(null);
-                        $errorHandler = set_error_handler('var_dump');
-                        restore_error_handler();
-                        set_error_handler(function () use ($errorHandler) {
-                            if (JSON_ERROR_NONE === json_last_error()) {
-                                return $errorHandler && false !== call_user_func_array($errorHandler, func_get_args());
-                            }
-                        });
-                    }
-
-                    $data = json_encode($data, $this->encodingOptions);
-                }
-
-                if (PHP_VERSION_ID < 50500) {
-                    restore_error_handler();
-                }
-            } catch (\Exception $e) {
-                if (PHP_VERSION_ID < 50500) {
-                    restore_error_handler();
-                }
-                if (PHP_VERSION_ID >= 50400 && 'Exception' === get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
-                    throw $e->getPrevious() ?: $e;
-                }
-                throw $e;
-            }
-        }
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException($this->transformJsonError());
-        }
-
-        $this->data = $data;
-
-        return $this->update();
-    }
-
-    /**
-     * Returns options used while encoding data to JSON.
-     *
-     * @return int
-     */
-    public function getEncodingOptions()
-    {
-        return $this->encodingOptions;
-    }
-
-    /**
-     * Sets options used while encoding data to JSON.
-     *
-     * @param int $encodingOptions
-     *
-     * @return JsonResponse
-     */
-    public function setEncodingOptions($encodingOptions)
-    {
-        $this->encodingOptions = (int) $encodingOptions;
-
-        return $this->setData(json_decode($this->data));
-    }
-
-    /**
-     * Updates the content and headers according to the JSON data and callback.
-     *
-     * @return JsonResponse
-     */
-    protected function update()
-    {
-        if (null !== $this->callback) {
-            // Not using application/javascript for compatibility reasons with older browsers.
-            $this->headers->set('Content-Type', 'text/javascript');
-
-            return $this->setContent(sprintf('/**/%s(%s);', $this->callback, $this->data));
-        }
-
-        // Only set the header when there is none or when it equals 'text/javascript' (from a previous update with callback)
-        // in order to not overwrite a custom definition.
-        if (!$this->headers->has('Content-Type') || 'text/javascript' === $this->headers->get('Content-Type')) {
-            $this->headers->set('Content-Type', 'application/json');
-        }
-
-        return $this->setContent($this->data);
-    }
-
-    private function transformJsonError()
-    {
-        if (function_exists('json_last_error_msg')) {
-            return json_last_error_msg();
-        }
-
-        switch (json_last_error()) {
-            case JSON_ERROR_DEPTH:
-                return 'Maximum stack depth exceeded.';
-
-            case JSON_ERROR_STATE_MISMATCH:
-                return 'Underflow or the modes mismatch.';
-
-            case JSON_ERROR_CTRL_CHAR:
-                return 'Unexpected control character found.';
-
-            case JSON_ERROR_SYNTAX:
-                return 'Syntax error, malformed JSON.';
-
-            case JSON_ERROR_UTF8:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded.';
-
-            default:
-                return 'Unknown error.';
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/LICENSE b/vendor/symfony/http-foundation/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/http-foundation/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/http-foundation/ParameterBag.php b/vendor/symfony/http-foundation/ParameterBag.php
deleted file mode 100644
index ecc0de1..0000000
--- a/vendor/symfony/http-foundation/ParameterBag.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * ParameterBag is a container for key/value pairs.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParameterBag implements \IteratorAggregate, \Countable
-{
-    /**
-     * Parameter storage.
-     *
-     * @var array
-     */
-    protected $parameters;
-
-    /**
-     * Constructor.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function __construct(array $parameters = array())
-    {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * Returns the parameters.
-     *
-     * @return array An array of parameters
-     */
-    public function all()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Returns the parameter keys.
-     *
-     * @return array An array of parameter keys
-     */
-    public function keys()
-    {
-        return array_keys($this->parameters);
-    }
-
-    /**
-     * Replaces the current parameters by a new set.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function replace(array $parameters = array())
-    {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * Adds parameters.
-     *
-     * @param array $parameters An array of parameters
-     */
-    public function add(array $parameters = array())
-    {
-        $this->parameters = array_replace($this->parameters, $parameters);
-    }
-
-    /**
-     * Returns a parameter by name.
-     *
-     * @param string $path    The key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return mixed
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function get($path, $default = null, $deep = false)
-    {
-        if (!$deep || false === $pos = strpos($path, '[')) {
-            return array_key_exists($path, $this->parameters) ? $this->parameters[$path] : $default;
-        }
-
-        $root = substr($path, 0, $pos);
-        if (!array_key_exists($root, $this->parameters)) {
-            return $default;
-        }
-
-        $value = $this->parameters[$root];
-        $currentKey = null;
-        for ($i = $pos, $c = strlen($path); $i < $c; ++$i) {
-            $char = $path[$i];
-
-            if ('[' === $char) {
-                if (null !== $currentKey) {
-                    throw new \InvalidArgumentException(sprintf('Malformed path. Unexpected "[" at position %d.', $i));
-                }
-
-                $currentKey = '';
-            } elseif (']' === $char) {
-                if (null === $currentKey) {
-                    throw new \InvalidArgumentException(sprintf('Malformed path. Unexpected "]" at position %d.', $i));
-                }
-
-                if (!is_array($value) || !array_key_exists($currentKey, $value)) {
-                    return $default;
-                }
-
-                $value = $value[$currentKey];
-                $currentKey = null;
-            } else {
-                if (null === $currentKey) {
-                    throw new \InvalidArgumentException(sprintf('Malformed path. Unexpected "%s" at position %d.', $char, $i));
-                }
-
-                $currentKey .= $char;
-            }
-        }
-
-        if (null !== $currentKey) {
-            throw new \InvalidArgumentException(sprintf('Malformed path. Path must end with "]".'));
-        }
-
-        return $value;
-    }
-
-    /**
-     * Sets a parameter by name.
-     *
-     * @param string $key   The key
-     * @param mixed  $value The value
-     */
-    public function set($key, $value)
-    {
-        $this->parameters[$key] = $value;
-    }
-
-    /**
-     * Returns true if the parameter is defined.
-     *
-     * @param string $key The key
-     *
-     * @return bool true if the parameter exists, false otherwise
-     */
-    public function has($key)
-    {
-        return array_key_exists($key, $this->parameters);
-    }
-
-    /**
-     * Removes a parameter.
-     *
-     * @param string $key The key
-     */
-    public function remove($key)
-    {
-        unset($this->parameters[$key]);
-    }
-
-    /**
-     * Returns the alphabetic characters of the parameter value.
-     *
-     * @param string $key     The parameter key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return string The filtered value
-     */
-    public function getAlpha($key, $default = '', $deep = false)
-    {
-        return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default, $deep));
-    }
-
-    /**
-     * Returns the alphabetic characters and digits of the parameter value.
-     *
-     * @param string $key     The parameter key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return string The filtered value
-     */
-    public function getAlnum($key, $default = '', $deep = false)
-    {
-        return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default, $deep));
-    }
-
-    /**
-     * Returns the digits of the parameter value.
-     *
-     * @param string $key     The parameter key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return string The filtered value
-     */
-    public function getDigits($key, $default = '', $deep = false)
-    {
-        // we need to remove - and + because they're allowed in the filter
-        return str_replace(array('-', '+'), '', $this->filter($key, $default, $deep, FILTER_SANITIZE_NUMBER_INT));
-    }
-
-    /**
-     * Returns the parameter value converted to integer.
-     *
-     * @param string $key     The parameter key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return int The filtered value
-     */
-    public function getInt($key, $default = 0, $deep = false)
-    {
-        return (int) $this->get($key, $default, $deep);
-    }
-
-    /**
-     * Returns the parameter value converted to boolean.
-     *
-     * @param string $key     The parameter key
-     * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
-     *
-     * @return bool The filtered value
-     */
-    public function getBoolean($key, $default = false, $deep = false)
-    {
-        return $this->filter($key, $default, $deep, FILTER_VALIDATE_BOOLEAN);
-    }
-
-    /**
-     * Filter key.
-     *
-     * @param string $key     Key.
-     * @param mixed  $default Default = null.
-     * @param bool   $deep    Default = false.
-     * @param int    $filter  FILTER_* constant.
-     * @param mixed  $options Filter options.
-     *
-     * @see http://php.net/manual/en/function.filter-var.php
-     *
-     * @return mixed
-     */
-    public function filter($key, $default = null, $deep = false, $filter = FILTER_DEFAULT, $options = array())
-    {
-        $value = $this->get($key, $default, $deep);
-
-        // Always turn $options into an array - this allows filter_var option shortcuts.
-        if (!is_array($options) && $options) {
-            $options = array('flags' => $options);
-        }
-
-        // Add a convenience check for arrays.
-        if (is_array($value) && !isset($options['flags'])) {
-            $options['flags'] = FILTER_REQUIRE_ARRAY;
-        }
-
-        return filter_var($value, $filter, $options);
-    }
-
-    /**
-     * Returns an iterator for parameters.
-     *
-     * @return \ArrayIterator An \ArrayIterator instance
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->parameters);
-    }
-
-    /**
-     * Returns the number of parameters.
-     *
-     * @return int The number of parameters
-     */
-    public function count()
-    {
-        return count($this->parameters);
-    }
-}
diff --git a/vendor/symfony/http-foundation/README.md b/vendor/symfony/http-foundation/README.md
deleted file mode 100644
index 11ad6ee..0000000
--- a/vendor/symfony/http-foundation/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-HttpFoundation Component
-========================
-
-HttpFoundation defines an object-oriented layer for the HTTP specification.
-
-It provides an abstraction for requests, responses, uploaded files, cookies,
-sessions, ...
-
-In this example, we get a Request object from the current PHP global
-variables:
-
-```php
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-$request = Request::createFromGlobals();
-echo $request->getPathInfo();
-```
-
-You can also create a Request directly -- that's interesting for unit testing:
-
-```php
-$request = Request::create('/?foo=bar', 'GET');
-echo $request->getPathInfo();
-```
-
-And here is how to create and send a Response:
-
-```php
-$response = new Response('Not Found', 404, array('Content-Type' => 'text/plain'));
-$response->send();
-```
-
-The Request and the Response classes have many other methods that implement
-the HTTP specification.
-
-Loading
--------
-
-If you are not using Composer but are using PHP 5.3.x, you must add the following to your autoloader:
-
-```php
-// SessionHandlerInterface
-if (!interface_exists('SessionHandlerInterface')) {
-    $loader->registerPrefixFallback(__DIR__.'/../vendor/symfony/src/Symfony/Component/HttpFoundation/Resources/stubs');
-}
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/HttpFoundation/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/http-foundation/RedirectResponse.php b/vendor/symfony/http-foundation/RedirectResponse.php
deleted file mode 100644
index a21eb5c..0000000
--- a/vendor/symfony/http-foundation/RedirectResponse.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * RedirectResponse represents an HTTP response doing a redirect.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RedirectResponse extends Response
-{
-    protected $targetUrl;
-
-    /**
-     * Creates a redirect response so that it conforms to the rules defined for a redirect status code.
-     *
-     * @param string $url     The URL to redirect to
-     * @param int    $status  The status code (302 by default)
-     * @param array  $headers The headers (Location is always set to the given URL)
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @see http://tools.ietf.org/html/rfc2616#section-10.3
-     */
-    public function __construct($url, $status = 302, $headers = array())
-    {
-        if (empty($url)) {
-            throw new \InvalidArgumentException('Cannot redirect to an empty URL.');
-        }
-
-        parent::__construct('', $status, $headers);
-
-        $this->setTargetUrl($url);
-
-        if (!$this->isRedirect()) {
-            throw new \InvalidArgumentException(sprintf('The HTTP status code is not a redirect ("%s" given).', $status));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function create($url = '', $status = 302, $headers = array())
-    {
-        return new static($url, $status, $headers);
-    }
-
-    /**
-     * Returns the target URL.
-     *
-     * @return string target URL
-     */
-    public function getTargetUrl()
-    {
-        return $this->targetUrl;
-    }
-
-    /**
-     * Sets the redirect target of this response.
-     *
-     * @param string $url The URL to redirect to
-     *
-     * @return RedirectResponse The current response.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setTargetUrl($url)
-    {
-        if (empty($url)) {
-            throw new \InvalidArgumentException('Cannot redirect to an empty URL.');
-        }
-
-        $this->targetUrl = $url;
-
-        $this->setContent(
-            sprintf('<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <meta http-equiv="refresh" content="1;url=%1$s" />
-
-        <title>Redirecting to %1$s</title>
-    </head>
-    <body>
-        Redirecting to <a href="%1$s">%1$s</a>.
-    </body>
-</html>', htmlspecialchars($url, ENT_QUOTES, 'UTF-8')));
-
-        $this->headers->set('Location', $url);
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php
deleted file mode 100644
index ff8d411..0000000
--- a/vendor/symfony/http-foundation/Request.php
+++ /dev/null
@@ -1,1920 +0,0 @@
-<?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\Component\HttpFoundation;
-
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
-
-/**
- * Request represents an HTTP request.
- *
- * The methods dealing with URL accept / return a raw path (% encoded):
- *   * getBasePath
- *   * getBaseUrl
- *   * getPathInfo
- *   * getRequestUri
- *   * getUri
- *   * getUriForPath
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Request
-{
-    const HEADER_FORWARDED = 'forwarded';
-    const HEADER_CLIENT_IP = 'client_ip';
-    const HEADER_CLIENT_HOST = 'client_host';
-    const HEADER_CLIENT_PROTO = 'client_proto';
-    const HEADER_CLIENT_PORT = 'client_port';
-
-    const METHOD_HEAD = 'HEAD';
-    const METHOD_GET = 'GET';
-    const METHOD_POST = 'POST';
-    const METHOD_PUT = 'PUT';
-    const METHOD_PATCH = 'PATCH';
-    const METHOD_DELETE = 'DELETE';
-    const METHOD_PURGE = 'PURGE';
-    const METHOD_OPTIONS = 'OPTIONS';
-    const METHOD_TRACE = 'TRACE';
-    const METHOD_CONNECT = 'CONNECT';
-
-    /**
-     * @var string[]
-     */
-    protected static $trustedProxies = array();
-
-    /**
-     * @var string[]
-     */
-    protected static $trustedHostPatterns = array();
-
-    /**
-     * @var string[]
-     */
-    protected static $trustedHosts = array();
-
-    /**
-     * Names for headers that can be trusted when
-     * using trusted proxies.
-     *
-     * The FORWARDED header is the standard as of rfc7239.
-     *
-     * The other headers are non-standard, but widely used
-     * by popular reverse proxies (like Apache mod_proxy or Amazon EC2).
-     */
-    protected static $trustedHeaders = array(
-        self::HEADER_FORWARDED => 'FORWARDED',
-        self::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
-        self::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
-        self::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
-        self::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
-    );
-
-    protected static $httpMethodParameterOverride = false;
-
-    /**
-     * Custom parameters.
-     *
-     * @var \Symfony\Component\HttpFoundation\ParameterBag
-     */
-    public $attributes;
-
-    /**
-     * Request body parameters ($_POST).
-     *
-     * @var \Symfony\Component\HttpFoundation\ParameterBag
-     */
-    public $request;
-
-    /**
-     * Query string parameters ($_GET).
-     *
-     * @var \Symfony\Component\HttpFoundation\ParameterBag
-     */
-    public $query;
-
-    /**
-     * Server and execution environment parameters ($_SERVER).
-     *
-     * @var \Symfony\Component\HttpFoundation\ServerBag
-     */
-    public $server;
-
-    /**
-     * Uploaded files ($_FILES).
-     *
-     * @var \Symfony\Component\HttpFoundation\FileBag
-     */
-    public $files;
-
-    /**
-     * Cookies ($_COOKIE).
-     *
-     * @var \Symfony\Component\HttpFoundation\ParameterBag
-     */
-    public $cookies;
-
-    /**
-     * Headers (taken from the $_SERVER).
-     *
-     * @var \Symfony\Component\HttpFoundation\HeaderBag
-     */
-    public $headers;
-
-    /**
-     * @var string
-     */
-    protected $content;
-
-    /**
-     * @var array
-     */
-    protected $languages;
-
-    /**
-     * @var array
-     */
-    protected $charsets;
-
-    /**
-     * @var array
-     */
-    protected $encodings;
-
-    /**
-     * @var array
-     */
-    protected $acceptableContentTypes;
-
-    /**
-     * @var string
-     */
-    protected $pathInfo;
-
-    /**
-     * @var string
-     */
-    protected $requestUri;
-
-    /**
-     * @var string
-     */
-    protected $baseUrl;
-
-    /**
-     * @var string
-     */
-    protected $basePath;
-
-    /**
-     * @var string
-     */
-    protected $method;
-
-    /**
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * @var \Symfony\Component\HttpFoundation\Session\SessionInterface
-     */
-    protected $session;
-
-    /**
-     * @var string
-     */
-    protected $locale;
-
-    /**
-     * @var string
-     */
-    protected $defaultLocale = 'en';
-
-    /**
-     * @var array
-     */
-    protected static $formats;
-
-    protected static $requestFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param array           $query      The GET parameters
-     * @param array           $request    The POST parameters
-     * @param array           $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
-     * @param array           $cookies    The COOKIE parameters
-     * @param array           $files      The FILES parameters
-     * @param array           $server     The SERVER parameters
-     * @param string|resource $content    The raw body data
-     */
-    public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
-    {
-        $this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
-    }
-
-    /**
-     * Sets the parameters for this request.
-     *
-     * This method also re-initializes all properties.
-     *
-     * @param array           $query      The GET parameters
-     * @param array           $request    The POST parameters
-     * @param array           $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
-     * @param array           $cookies    The COOKIE parameters
-     * @param array           $files      The FILES parameters
-     * @param array           $server     The SERVER parameters
-     * @param string|resource $content    The raw body data
-     */
-    public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
-    {
-        $this->request = new ParameterBag($request);
-        $this->query = new ParameterBag($query);
-        $this->attributes = new ParameterBag($attributes);
-        $this->cookies = new ParameterBag($cookies);
-        $this->files = new FileBag($files);
-        $this->server = new ServerBag($server);
-        $this->headers = new HeaderBag($this->server->getHeaders());
-
-        $this->content = $content;
-        $this->languages = null;
-        $this->charsets = null;
-        $this->encodings = null;
-        $this->acceptableContentTypes = null;
-        $this->pathInfo = null;
-        $this->requestUri = null;
-        $this->baseUrl = null;
-        $this->basePath = null;
-        $this->method = null;
-        $this->format = null;
-    }
-
-    /**
-     * Creates a new request with values from PHP's super globals.
-     *
-     * @return Request A new request
-     */
-    public static function createFromGlobals()
-    {
-        // With the php's bug #66606, the php's built-in web server
-        // stores the Content-Type and Content-Length header values in
-        // HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH fields.
-        $server = $_SERVER;
-        if ('cli-server' === php_sapi_name()) {
-            if (array_key_exists('HTTP_CONTENT_LENGTH', $_SERVER)) {
-                $server['CONTENT_LENGTH'] = $_SERVER['HTTP_CONTENT_LENGTH'];
-            }
-            if (array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) {
-                $server['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE'];
-            }
-        }
-
-        $request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $server);
-
-        if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
-            && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), array('PUT', 'DELETE', 'PATCH'))
-        ) {
-            parse_str($request->getContent(), $data);
-            $request->request = new ParameterBag($data);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Creates a Request based on a given URI and configuration.
-     *
-     * The information contained in the URI always take precedence
-     * over the other information (server and parameters).
-     *
-     * @param string $uri        The URI
-     * @param string $method     The HTTP method
-     * @param array  $parameters The query (GET) or request (POST) parameters
-     * @param array  $cookies    The request cookies ($_COOKIE)
-     * @param array  $files      The request files ($_FILES)
-     * @param array  $server     The server parameters ($_SERVER)
-     * @param string $content    The raw body data
-     *
-     * @return Request A Request instance
-     */
-    public static function create($uri, $method = 'GET', $parameters = array(), $cookies = array(), $files = array(), $server = array(), $content = null)
-    {
-        $server = array_replace(array(
-            'SERVER_NAME' => 'localhost',
-            'SERVER_PORT' => 80,
-            'HTTP_HOST' => 'localhost',
-            'HTTP_USER_AGENT' => 'Symfony/2.X',
-            'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-            'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.5',
-            'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
-            'REMOTE_ADDR' => '127.0.0.1',
-            'SCRIPT_NAME' => '',
-            'SCRIPT_FILENAME' => '',
-            'SERVER_PROTOCOL' => 'HTTP/1.1',
-            'REQUEST_TIME' => time(),
-        ), $server);
-
-        $server['PATH_INFO'] = '';
-        $server['REQUEST_METHOD'] = strtoupper($method);
-
-        $components = parse_url($uri);
-        if (isset($components['host'])) {
-            $server['SERVER_NAME'] = $components['host'];
-            $server['HTTP_HOST'] = $components['host'];
-        }
-
-        if (isset($components['scheme'])) {
-            if ('https' === $components['scheme']) {
-                $server['HTTPS'] = 'on';
-                $server['SERVER_PORT'] = 443;
-            } else {
-                unset($server['HTTPS']);
-                $server['SERVER_PORT'] = 80;
-            }
-        }
-
-        if (isset($components['port'])) {
-            $server['SERVER_PORT'] = $components['port'];
-            $server['HTTP_HOST'] = $server['HTTP_HOST'].':'.$components['port'];
-        }
-
-        if (isset($components['user'])) {
-            $server['PHP_AUTH_USER'] = $components['user'];
-        }
-
-        if (isset($components['pass'])) {
-            $server['PHP_AUTH_PW'] = $components['pass'];
-        }
-
-        if (!isset($components['path'])) {
-            $components['path'] = '/';
-        }
-
-        switch (strtoupper($method)) {
-            case 'POST':
-            case 'PUT':
-            case 'DELETE':
-                if (!isset($server['CONTENT_TYPE'])) {
-                    $server['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
-                }
-                // no break
-            case 'PATCH':
-                $request = $parameters;
-                $query = array();
-                break;
-            default:
-                $request = array();
-                $query = $parameters;
-                break;
-        }
-
-        $queryString = '';
-        if (isset($components['query'])) {
-            parse_str(html_entity_decode($components['query']), $qs);
-
-            if ($query) {
-                $query = array_replace($qs, $query);
-                $queryString = http_build_query($query, '', '&');
-            } else {
-                $query = $qs;
-                $queryString = $components['query'];
-            }
-        } elseif ($query) {
-            $queryString = http_build_query($query, '', '&');
-        }
-
-        $server['REQUEST_URI'] = $components['path'].('' !== $queryString ? '?'.$queryString : '');
-        $server['QUERY_STRING'] = $queryString;
-
-        return self::createRequestFromFactory($query, $request, array(), $cookies, $files, $server, $content);
-    }
-
-    /**
-     * Sets a callable able to create a Request instance.
-     *
-     * This is mainly useful when you need to override the Request class
-     * to keep BC with an existing system. It should not be used for any
-     * other purpose.
-     *
-     * @param callable|null $callable A PHP callable
-     */
-    public static function setFactory($callable)
-    {
-        self::$requestFactory = $callable;
-    }
-
-    /**
-     * Clones a request and overrides some of its parameters.
-     *
-     * @param array $query      The GET parameters
-     * @param array $request    The POST parameters
-     * @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
-     * @param array $cookies    The COOKIE parameters
-     * @param array $files      The FILES parameters
-     * @param array $server     The SERVER parameters
-     *
-     * @return Request The duplicated request
-     */
-    public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
-    {
-        $dup = clone $this;
-        if ($query !== null) {
-            $dup->query = new ParameterBag($query);
-        }
-        if ($request !== null) {
-            $dup->request = new ParameterBag($request);
-        }
-        if ($attributes !== null) {
-            $dup->attributes = new ParameterBag($attributes);
-        }
-        if ($cookies !== null) {
-            $dup->cookies = new ParameterBag($cookies);
-        }
-        if ($files !== null) {
-            $dup->files = new FileBag($files);
-        }
-        if ($server !== null) {
-            $dup->server = new ServerBag($server);
-            $dup->headers = new HeaderBag($dup->server->getHeaders());
-        }
-        $dup->languages = null;
-        $dup->charsets = null;
-        $dup->encodings = null;
-        $dup->acceptableContentTypes = null;
-        $dup->pathInfo = null;
-        $dup->requestUri = null;
-        $dup->baseUrl = null;
-        $dup->basePath = null;
-        $dup->method = null;
-        $dup->format = null;
-
-        if (!$dup->get('_format') && $this->get('_format')) {
-            $dup->attributes->set('_format', $this->get('_format'));
-        }
-
-        if (!$dup->getRequestFormat(null)) {
-            $dup->setRequestFormat($this->getRequestFormat(null));
-        }
-
-        return $dup;
-    }
-
-    /**
-     * Clones the current request.
-     *
-     * Note that the session is not cloned as duplicated requests
-     * are most of the time sub-requests of the main one.
-     */
-    public function __clone()
-    {
-        $this->query = clone $this->query;
-        $this->request = clone $this->request;
-        $this->attributes = clone $this->attributes;
-        $this->cookies = clone $this->cookies;
-        $this->files = clone $this->files;
-        $this->server = clone $this->server;
-        $this->headers = clone $this->headers;
-    }
-
-    /**
-     * Returns the request as a string.
-     *
-     * @return string The request
-     */
-    public function __toString()
-    {
-        try {
-            $content = $this->getContent();
-        } catch (\LogicException $e) {
-            return trigger_error($e, E_USER_ERROR);
-        }
-
-        return
-            sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
-            $this->headers."\r\n".
-            $content;
-    }
-
-    /**
-     * Overrides the PHP global variables according to this request instance.
-     *
-     * It overrides $_GET, $_POST, $_REQUEST, $_SERVER, $_COOKIE.
-     * $_FILES is never overridden, see rfc1867
-     */
-    public function overrideGlobals()
-    {
-        $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), null, '&')));
-
-        $_GET = $this->query->all();
-        $_POST = $this->request->all();
-        $_SERVER = $this->server->all();
-        $_COOKIE = $this->cookies->all();
-
-        foreach ($this->headers->all() as $key => $value) {
-            $key = strtoupper(str_replace('-', '_', $key));
-            if (in_array($key, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
-                $_SERVER[$key] = implode(', ', $value);
-            } else {
-                $_SERVER['HTTP_'.$key] = implode(', ', $value);
-            }
-        }
-
-        $request = array('g' => $_GET, 'p' => $_POST, 'c' => $_COOKIE);
-
-        $requestOrder = ini_get('request_order') ?: ini_get('variables_order');
-        $requestOrder = preg_replace('#[^cgp]#', '', strtolower($requestOrder)) ?: 'gp';
-
-        $_REQUEST = array();
-        foreach (str_split($requestOrder) as $order) {
-            $_REQUEST = array_merge($_REQUEST, $request[$order]);
-        }
-    }
-
-    /**
-     * Sets a list of trusted proxies.
-     *
-     * You should only list the reverse proxies that you manage directly.
-     *
-     * @param array $proxies A list of trusted proxies
-     */
-    public static function setTrustedProxies(array $proxies)
-    {
-        self::$trustedProxies = $proxies;
-    }
-
-    /**
-     * Gets the list of trusted proxies.
-     *
-     * @return array An array of trusted proxies.
-     */
-    public static function getTrustedProxies()
-    {
-        return self::$trustedProxies;
-    }
-
-    /**
-     * Sets a list of trusted host patterns.
-     *
-     * You should only list the hosts you manage using regexs.
-     *
-     * @param array $hostPatterns A list of trusted host patterns
-     */
-    public static function setTrustedHosts(array $hostPatterns)
-    {
-        self::$trustedHostPatterns = array_map(function ($hostPattern) {
-            return sprintf('#%s#i', $hostPattern);
-        }, $hostPatterns);
-        // we need to reset trusted hosts on trusted host patterns change
-        self::$trustedHosts = array();
-    }
-
-    /**
-     * Gets the list of trusted host patterns.
-     *
-     * @return array An array of trusted host patterns.
-     */
-    public static function getTrustedHosts()
-    {
-        return self::$trustedHostPatterns;
-    }
-
-    /**
-     * Sets the name for trusted headers.
-     *
-     * The following header keys are supported:
-     *
-     *  * Request::HEADER_CLIENT_IP:    defaults to X-Forwarded-For   (see getClientIp())
-     *  * Request::HEADER_CLIENT_HOST:  defaults to X-Forwarded-Host  (see getHost())
-     *  * Request::HEADER_CLIENT_PORT:  defaults to X-Forwarded-Port  (see getPort())
-     *  * Request::HEADER_CLIENT_PROTO: defaults to X-Forwarded-Proto (see getScheme() and isSecure())
-     *
-     * Setting an empty value allows to disable the trusted header for the given key.
-     *
-     * @param string $key   The header key
-     * @param string $value The header name
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function setTrustedHeaderName($key, $value)
-    {
-        if (!array_key_exists($key, self::$trustedHeaders)) {
-            throw new \InvalidArgumentException(sprintf('Unable to set the trusted header name for key "%s".', $key));
-        }
-
-        self::$trustedHeaders[$key] = $value;
-    }
-
-    /**
-     * Gets the trusted proxy header name.
-     *
-     * @param string $key The header key
-     *
-     * @return string The header name
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function getTrustedHeaderName($key)
-    {
-        if (!array_key_exists($key, self::$trustedHeaders)) {
-            throw new \InvalidArgumentException(sprintf('Unable to get the trusted header name for key "%s".', $key));
-        }
-
-        return self::$trustedHeaders[$key];
-    }
-
-    /**
-     * Normalizes a query string.
-     *
-     * It builds a normalized query string, where keys/value pairs are alphabetized,
-     * have consistent escaping and unneeded delimiters are removed.
-     *
-     * @param string $qs Query string
-     *
-     * @return string A normalized query string for the Request
-     */
-    public static function normalizeQueryString($qs)
-    {
-        if ('' == $qs) {
-            return '';
-        }
-
-        $parts = array();
-        $order = array();
-
-        foreach (explode('&', $qs) as $param) {
-            if ('' === $param || '=' === $param[0]) {
-                // Ignore useless delimiters, e.g. "x=y&".
-                // Also ignore pairs with empty key, even if there was a value, e.g. "=value", as such nameless values cannot be retrieved anyway.
-                // PHP also does not include them when building _GET.
-                continue;
-            }
-
-            $keyValuePair = explode('=', $param, 2);
-
-            // GET parameters, that are submitted from a HTML form, encode spaces as "+" by default (as defined in enctype application/x-www-form-urlencoded).
-            // PHP also converts "+" to spaces when filling the global _GET or when using the function parse_str. This is why we use urldecode and then normalize to
-            // RFC 3986 with rawurlencode.
-            $parts[] = isset($keyValuePair[1]) ?
-                rawurlencode(urldecode($keyValuePair[0])).'='.rawurlencode(urldecode($keyValuePair[1])) :
-                rawurlencode(urldecode($keyValuePair[0]));
-            $order[] = urldecode($keyValuePair[0]);
-        }
-
-        array_multisort($order, SORT_ASC, $parts);
-
-        return implode('&', $parts);
-    }
-
-    /**
-     * Enables support for the _method request parameter to determine the intended HTTP method.
-     *
-     * Be warned that enabling this feature might lead to CSRF issues in your code.
-     * Check that you are using CSRF tokens when required.
-     * If the HTTP method parameter override is enabled, an html-form with method "POST" can be altered
-     * and used to send a "PUT" or "DELETE" request via the _method request parameter.
-     * If these methods are not protected against CSRF, this presents a possible vulnerability.
-     *
-     * The HTTP method can only be overridden when the real HTTP method is POST.
-     */
-    public static function enableHttpMethodParameterOverride()
-    {
-        self::$httpMethodParameterOverride = true;
-    }
-
-    /**
-     * Checks whether support for the _method request parameter is enabled.
-     *
-     * @return bool True when the _method request parameter is enabled, false otherwise
-     */
-    public static function getHttpMethodParameterOverride()
-    {
-        return self::$httpMethodParameterOverride;
-    }
-
-    /**
-     * Gets a "parameter" value.
-     *
-     * This method is mainly useful for libraries that want to provide some flexibility.
-     *
-     * Order of precedence: GET, PATH, POST
-     *
-     * Avoid using this method in controllers:
-     *
-     *  * slow
-     *  * prefer to get from a "named" source
-     *
-     * It is better to explicitly get request parameters from the appropriate
-     * public property instead (query, attributes, request).
-     *
-     * @param string $key     the key
-     * @param mixed  $default the default value
-     * @param bool   $deep    is parameter deep in multidimensional array
-     *
-     * @return mixed
-     */
-    public function get($key, $default = null, $deep = false)
-    {
-        if ($this !== $result = $this->query->get($key, $this, $deep)) {
-            return $result;
-        }
-
-        if ($this !== $result = $this->attributes->get($key, $this, $deep)) {
-            return $result;
-        }
-
-        if ($this !== $result = $this->request->get($key, $this, $deep)) {
-            return $result;
-        }
-
-        return $default;
-    }
-
-    /**
-     * Gets the Session.
-     *
-     * @return SessionInterface|null The session
-     */
-    public function getSession()
-    {
-        return $this->session;
-    }
-
-    /**
-     * Whether the request contains a Session which was started in one of the
-     * previous requests.
-     *
-     * @return bool
-     */
-    public function hasPreviousSession()
-    {
-        // the check for $this->session avoids malicious users trying to fake a session cookie with proper name
-        return $this->hasSession() && $this->cookies->has($this->session->getName());
-    }
-
-    /**
-     * Whether the request contains a Session object.
-     *
-     * This method does not give any information about the state of the session object,
-     * like whether the session is started or not. It is just a way to check if this Request
-     * is associated with a Session instance.
-     *
-     * @return bool true when the Request contains a Session object, false otherwise
-     */
-    public function hasSession()
-    {
-        return null !== $this->session;
-    }
-
-    /**
-     * Sets the Session.
-     *
-     * @param SessionInterface $session The Session
-     */
-    public function setSession(SessionInterface $session)
-    {
-        $this->session = $session;
-    }
-
-    /**
-     * Returns the client IP addresses.
-     *
-     * In the returned array the most trusted IP address is first, and the
-     * least trusted one last. The "real" client IP address is the last one,
-     * but this is also the least trusted one. Trusted proxies are stripped.
-     *
-     * Use this method carefully; you should use getClientIp() instead.
-     *
-     * @return array The client IP addresses
-     *
-     * @see getClientIp()
-     */
-    public function getClientIps()
-    {
-        $clientIps = array();
-        $ip = $this->server->get('REMOTE_ADDR');
-
-        if (!$this->isFromTrustedProxy()) {
-            return array($ip);
-        }
-
-        if (self::$trustedHeaders[self::HEADER_FORWARDED] && $this->headers->has(self::$trustedHeaders[self::HEADER_FORWARDED])) {
-            $forwardedHeader = $this->headers->get(self::$trustedHeaders[self::HEADER_FORWARDED]);
-            preg_match_all('{(for)=("?\[?)([a-z0-9\.:_\-/]*)}', $forwardedHeader, $matches);
-            $clientIps = $matches[3];
-        } elseif (self::$trustedHeaders[self::HEADER_CLIENT_IP] && $this->headers->has(self::$trustedHeaders[self::HEADER_CLIENT_IP])) {
-            $clientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_IP])));
-        }
-
-        $clientIps[] = $ip; // Complete the IP chain with the IP the request actually came from
-        $ip = $clientIps[0]; // Fallback to this when the client IP falls into the range of trusted proxies
-
-        foreach ($clientIps as $key => $clientIp) {
-            // Remove port (unfortunately, it does happen)
-            if (preg_match('{((?:\d+\.){3}\d+)\:\d+}', $clientIp, $match)) {
-                $clientIps[$key] = $clientIp = $match[1];
-            }
-
-            if (IpUtils::checkIp($clientIp, self::$trustedProxies)) {
-                unset($clientIps[$key]);
-            }
-        }
-
-        // Now the IP chain contains only untrusted proxies and the client IP
-        return $clientIps ? array_reverse($clientIps) : array($ip);
-    }
-
-    /**
-     * Returns the client IP address.
-     *
-     * This method can read the client IP address from the "X-Forwarded-For" header
-     * when trusted proxies were set via "setTrustedProxies()". The "X-Forwarded-For"
-     * header value is a comma+space separated list of IP addresses, the left-most
-     * being the original client, and each successive proxy that passed the request
-     * adding the IP address where it received the request from.
-     *
-     * If your reverse proxy uses a different header name than "X-Forwarded-For",
-     * ("Client-Ip" for instance), configure it via "setTrustedHeaderName()" with
-     * the "client-ip" key.
-     *
-     * @return string The client IP address
-     *
-     * @see getClientIps()
-     * @see http://en.wikipedia.org/wiki/X-Forwarded-For
-     */
-    public function getClientIp()
-    {
-        $ipAddresses = $this->getClientIps();
-
-        return $ipAddresses[0];
-    }
-
-    /**
-     * Returns current script name.
-     *
-     * @return string
-     */
-    public function getScriptName()
-    {
-        return $this->server->get('SCRIPT_NAME', $this->server->get('ORIG_SCRIPT_NAME', ''));
-    }
-
-    /**
-     * Returns the path being requested relative to the executed script.
-     *
-     * The path info always starts with a /.
-     *
-     * Suppose this request is instantiated from /mysite on localhost:
-     *
-     *  * http://localhost/mysite              returns an empty string
-     *  * http://localhost/mysite/about        returns '/about'
-     *  * http://localhost/mysite/enco%20ded   returns '/enco%20ded'
-     *  * http://localhost/mysite/about?var=1  returns '/about'
-     *
-     * @return string The raw path (i.e. not urldecoded)
-     */
-    public function getPathInfo()
-    {
-        if (null === $this->pathInfo) {
-            $this->pathInfo = $this->preparePathInfo();
-        }
-
-        return $this->pathInfo;
-    }
-
-    /**
-     * Returns the root path from which this request is executed.
-     *
-     * Suppose that an index.php file instantiates this request object:
-     *
-     *  * http://localhost/index.php         returns an empty string
-     *  * http://localhost/index.php/page    returns an empty string
-     *  * http://localhost/web/index.php     returns '/web'
-     *  * http://localhost/we%20b/index.php  returns '/we%20b'
-     *
-     * @return string The raw path (i.e. not urldecoded)
-     */
-    public function getBasePath()
-    {
-        if (null === $this->basePath) {
-            $this->basePath = $this->prepareBasePath();
-        }
-
-        return $this->basePath;
-    }
-
-    /**
-     * Returns the root URL from which this request is executed.
-     *
-     * The base URL never ends with a /.
-     *
-     * This is similar to getBasePath(), except that it also includes the
-     * script filename (e.g. index.php) if one exists.
-     *
-     * @return string The raw URL (i.e. not urldecoded)
-     */
-    public function getBaseUrl()
-    {
-        if (null === $this->baseUrl) {
-            $this->baseUrl = $this->prepareBaseUrl();
-        }
-
-        return $this->baseUrl;
-    }
-
-    /**
-     * Gets the request's scheme.
-     *
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->isSecure() ? 'https' : 'http';
-    }
-
-    /**
-     * Returns the port on which the request is made.
-     *
-     * This method can read the client port from the "X-Forwarded-Port" header
-     * when trusted proxies were set via "setTrustedProxies()".
-     *
-     * The "X-Forwarded-Port" header must contain the client port.
-     *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Port",
-     * configure it via "setTrustedHeaderName()" with the "client-port" key.
-     *
-     * @return string
-     */
-    public function getPort()
-    {
-        if ($this->isFromTrustedProxy()) {
-            if (self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
-                return $port;
-            }
-
-            if (self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && 'https' === $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO], 'http')) {
-                return 443;
-            }
-        }
-
-        if ($host = $this->headers->get('HOST')) {
-            if ($host[0] === '[') {
-                $pos = strpos($host, ':', strrpos($host, ']'));
-            } else {
-                $pos = strrpos($host, ':');
-            }
-
-            if (false !== $pos) {
-                return (int) substr($host, $pos + 1);
-            }
-
-            return 'https' === $this->getScheme() ? 443 : 80;
-        }
-
-        return $this->server->get('SERVER_PORT');
-    }
-
-    /**
-     * Returns the user.
-     *
-     * @return string|null
-     */
-    public function getUser()
-    {
-        return $this->headers->get('PHP_AUTH_USER');
-    }
-
-    /**
-     * Returns the password.
-     *
-     * @return string|null
-     */
-    public function getPassword()
-    {
-        return $this->headers->get('PHP_AUTH_PW');
-    }
-
-    /**
-     * Gets the user info.
-     *
-     * @return string A user name and, optionally, scheme-specific information about how to gain authorization to access the server
-     */
-    public function getUserInfo()
-    {
-        $userinfo = $this->getUser();
-
-        $pass = $this->getPassword();
-        if ('' != $pass) {
-            $userinfo .= ":$pass";
-        }
-
-        return $userinfo;
-    }
-
-    /**
-     * Returns the HTTP host being requested.
-     *
-     * The port name will be appended to the host if it's non-standard.
-     *
-     * @return string
-     */
-    public function getHttpHost()
-    {
-        $scheme = $this->getScheme();
-        $port = $this->getPort();
-
-        if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
-            return $this->getHost();
-        }
-
-        return $this->getHost().':'.$port;
-    }
-
-    /**
-     * Returns the requested URI (path and query string).
-     *
-     * @return string The raw URI (i.e. not URI decoded)
-     */
-    public function getRequestUri()
-    {
-        if (null === $this->requestUri) {
-            $this->requestUri = $this->prepareRequestUri();
-        }
-
-        return $this->requestUri;
-    }
-
-    /**
-     * Gets the scheme and HTTP host.
-     *
-     * If the URL was called with basic authentication, the user
-     * and the password are not added to the generated string.
-     *
-     * @return string The scheme and HTTP host
-     */
-    public function getSchemeAndHttpHost()
-    {
-        return $this->getScheme().'://'.$this->getHttpHost();
-    }
-
-    /**
-     * Generates a normalized URI (URL) for the Request.
-     *
-     * @return string A normalized URI (URL) for the Request
-     *
-     * @see getQueryString()
-     */
-    public function getUri()
-    {
-        if (null !== $qs = $this->getQueryString()) {
-            $qs = '?'.$qs;
-        }
-
-        return $this->getSchemeAndHttpHost().$this->getBaseUrl().$this->getPathInfo().$qs;
-    }
-
-    /**
-     * Generates a normalized URI for the given path.
-     *
-     * @param string $path A path to use instead of the current one
-     *
-     * @return string The normalized URI for the path
-     */
-    public function getUriForPath($path)
-    {
-        return $this->getSchemeAndHttpHost().$this->getBaseUrl().$path;
-    }
-
-    /**
-     * Returns the path as relative reference from the current Request path.
-     *
-     * Only the URIs path component (no schema, host etc.) is relevant and must be given.
-     * Both paths must be absolute and not contain relative parts.
-     * Relative URLs from one resource to another are useful when generating self-contained downloadable document archives.
-     * Furthermore, they can be used to reduce the link size in documents.
-     *
-     * Example target paths, given a base path of "/a/b/c/d":
-     * - "/a/b/c/d"     -> ""
-     * - "/a/b/c/"      -> "./"
-     * - "/a/b/"        -> "../"
-     * - "/a/b/c/other" -> "other"
-     * - "/a/x/y"       -> "../../x/y"
-     *
-     * @param string $path The target path
-     *
-     * @return string The relative target path
-     */
-    public function getRelativeUriForPath($path)
-    {
-        // be sure that we are dealing with an absolute path
-        if (!isset($path[0]) || '/' !== $path[0]) {
-            return $path;
-        }
-
-        if ($path === $basePath = $this->getPathInfo()) {
-            return '';
-        }
-
-        $sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
-        $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
-        array_pop($sourceDirs);
-        $targetFile = array_pop($targetDirs);
-
-        foreach ($sourceDirs as $i => $dir) {
-            if (isset($targetDirs[$i]) && $dir === $targetDirs[$i]) {
-                unset($sourceDirs[$i], $targetDirs[$i]);
-            } else {
-                break;
-            }
-        }
-
-        $targetDirs[] = $targetFile;
-        $path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs);
-
-        // A reference to the same base directory or an empty subdirectory must be prefixed with "./".
-        // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
-        // as the first segment of a relative-path reference, as it would be mistaken for a scheme name
-        // (see http://tools.ietf.org/html/rfc3986#section-4.2).
-        return !isset($path[0]) || '/' === $path[0]
-            || false !== ($colonPos = strpos($path, ':')) && ($colonPos < ($slashPos = strpos($path, '/')) || false === $slashPos)
-            ? "./$path" : $path;
-    }
-
-    /**
-     * Generates the normalized query string for the Request.
-     *
-     * It builds a normalized query string, where keys/value pairs are alphabetized
-     * and have consistent escaping.
-     *
-     * @return string|null A normalized query string for the Request
-     */
-    public function getQueryString()
-    {
-        $qs = static::normalizeQueryString($this->server->get('QUERY_STRING'));
-
-        return '' === $qs ? null : $qs;
-    }
-
-    /**
-     * Checks whether the request is secure or not.
-     *
-     * This method can read the client protocol from the "X-Forwarded-Proto" header
-     * when trusted proxies were set via "setTrustedProxies()".
-     *
-     * The "X-Forwarded-Proto" header must contain the protocol: "https" or "http".
-     *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Proto"
-     * ("SSL_HTTPS" for instance), configure it via "setTrustedHeaderName()" with
-     * the "client-proto" key.
-     *
-     * @return bool
-     */
-    public function isSecure()
-    {
-        if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
-            return in_array(strtolower(current(explode(',', $proto))), array('https', 'on', 'ssl', '1'));
-        }
-
-        $https = $this->server->get('HTTPS');
-
-        return !empty($https) && 'off' !== strtolower($https);
-    }
-
-    /**
-     * Returns the host name.
-     *
-     * This method can read the client host name from the "X-Forwarded-Host" header
-     * when trusted proxies were set via "setTrustedProxies()".
-     *
-     * The "X-Forwarded-Host" header must contain the client host name.
-     *
-     * If your reverse proxy uses a different header name than "X-Forwarded-Host",
-     * configure it via "setTrustedHeaderName()" with the "client-host" key.
-     *
-     * @return string
-     *
-     * @throws \UnexpectedValueException when the host name is invalid
-     */
-    public function getHost()
-    {
-        if ($this->isFromTrustedProxy() && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
-            $elements = explode(',', $host);
-
-            $host = $elements[count($elements) - 1];
-        } elseif (!$host = $this->headers->get('HOST')) {
-            if (!$host = $this->server->get('SERVER_NAME')) {
-                $host = $this->server->get('SERVER_ADDR', '');
-            }
-        }
-
-        // trim and remove port number from host
-        // host is lowercase as per RFC 952/2181
-        $host = strtolower(preg_replace('/:\d+$/', '', trim($host)));
-
-        // as the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
-        // 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
-        if ($host && '' !== preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $host)) {
-            throw new \UnexpectedValueException(sprintf('Invalid Host "%s"', $host));
-        }
-
-        if (count(self::$trustedHostPatterns) > 0) {
-            // to avoid host header injection attacks, you should provide a list of trusted host patterns
-
-            if (in_array($host, self::$trustedHosts)) {
-                return $host;
-            }
-
-            foreach (self::$trustedHostPatterns as $pattern) {
-                if (preg_match($pattern, $host)) {
-                    self::$trustedHosts[] = $host;
-
-                    return $host;
-                }
-            }
-
-            throw new \UnexpectedValueException(sprintf('Untrusted Host "%s"', $host));
-        }
-
-        return $host;
-    }
-
-    /**
-     * Sets the request method.
-     *
-     * @param string $method
-     */
-    public function setMethod($method)
-    {
-        $this->method = null;
-        $this->server->set('REQUEST_METHOD', $method);
-    }
-
-    /**
-     * Gets the request "intended" method.
-     *
-     * If the X-HTTP-Method-Override header is set, and if the method is a POST,
-     * then it is used to determine the "real" intended HTTP method.
-     *
-     * The _method request parameter can also be used to determine the HTTP method,
-     * but only if enableHttpMethodParameterOverride() has been called.
-     *
-     * The method is always an uppercased string.
-     *
-     * @return string The request method
-     *
-     * @see getRealMethod()
-     */
-    public function getMethod()
-    {
-        if (null === $this->method) {
-            $this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
-
-            if ('POST' === $this->method) {
-                if ($method = $this->headers->get('X-HTTP-METHOD-OVERRIDE')) {
-                    $this->method = strtoupper($method);
-                } elseif (self::$httpMethodParameterOverride) {
-                    $this->method = strtoupper($this->request->get('_method', $this->query->get('_method', 'POST')));
-                }
-            }
-        }
-
-        return $this->method;
-    }
-
-    /**
-     * Gets the "real" request method.
-     *
-     * @return string The request method
-     *
-     * @see getMethod()
-     */
-    public function getRealMethod()
-    {
-        return strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
-    }
-
-    /**
-     * Gets the mime type associated with the format.
-     *
-     * @param string $format The format
-     *
-     * @return string The associated mime type (null if not found)
-     */
-    public function getMimeType($format)
-    {
-        if (null === static::$formats) {
-            static::initializeFormats();
-        }
-
-        return isset(static::$formats[$format]) ? static::$formats[$format][0] : null;
-    }
-
-    /**
-     * Gets the format associated with the mime type.
-     *
-     * @param string $mimeType The associated mime type
-     *
-     * @return string|null The format (null if not found)
-     */
-    public function getFormat($mimeType)
-    {
-        if (false !== $pos = strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, $pos);
-        }
-
-        if (null === static::$formats) {
-            static::initializeFormats();
-        }
-
-        foreach (static::$formats as $format => $mimeTypes) {
-            if (in_array($mimeType, (array) $mimeTypes)) {
-                return $format;
-            }
-        }
-    }
-
-    /**
-     * Associates a format with mime types.
-     *
-     * @param string       $format    The format
-     * @param string|array $mimeTypes The associated mime types (the preferred one must be the first as it will be used as the content type)
-     */
-    public function setFormat($format, $mimeTypes)
-    {
-        if (null === static::$formats) {
-            static::initializeFormats();
-        }
-
-        static::$formats[$format] = is_array($mimeTypes) ? $mimeTypes : array($mimeTypes);
-    }
-
-    /**
-     * Gets the request format.
-     *
-     * Here is the process to determine the format:
-     *
-     *  * format defined by the user (with setRequestFormat())
-     *  * _format request parameter
-     *  * $default
-     *
-     * @param string $default The default format
-     *
-     * @return string The request format
-     */
-    public function getRequestFormat($default = 'html')
-    {
-        if (null === $this->format) {
-            $this->format = $this->get('_format', $default);
-        }
-
-        return $this->format;
-    }
-
-    /**
-     * Sets the request format.
-     *
-     * @param string $format The request format.
-     */
-    public function setRequestFormat($format)
-    {
-        $this->format = $format;
-    }
-
-    /**
-     * Gets the format associated with the request.
-     *
-     * @return string|null The format (null if no content type is present)
-     */
-    public function getContentType()
-    {
-        return $this->getFormat($this->headers->get('CONTENT_TYPE'));
-    }
-
-    /**
-     * Sets the default locale.
-     *
-     * @param string $locale
-     */
-    public function setDefaultLocale($locale)
-    {
-        $this->defaultLocale = $locale;
-
-        if (null === $this->locale) {
-            $this->setPhpDefaultLocale($locale);
-        }
-    }
-
-    /**
-     * Get the default locale.
-     *
-     * @return string
-     */
-    public function getDefaultLocale()
-    {
-        return $this->defaultLocale;
-    }
-
-    /**
-     * Sets the locale.
-     *
-     * @param string $locale
-     */
-    public function setLocale($locale)
-    {
-        $this->setPhpDefaultLocale($this->locale = $locale);
-    }
-
-    /**
-     * Get the locale.
-     *
-     * @return string
-     */
-    public function getLocale()
-    {
-        return null === $this->locale ? $this->defaultLocale : $this->locale;
-    }
-
-    /**
-     * Checks if the request method is of specified type.
-     *
-     * @param string $method Uppercase request method (GET, POST etc).
-     *
-     * @return bool
-     */
-    public function isMethod($method)
-    {
-        return $this->getMethod() === strtoupper($method);
-    }
-
-    /**
-     * Checks whether the method is safe or not.
-     *
-     * @return bool
-     */
-    public function isMethodSafe()
-    {
-        return in_array($this->getMethod(), array('GET', 'HEAD'));
-    }
-
-    /**
-     * Returns the request body content.
-     *
-     * @param bool $asResource If true, a resource will be returned
-     *
-     * @return string|resource The request body content or a resource to read the body stream.
-     *
-     * @throws \LogicException
-     */
-    public function getContent($asResource = false)
-    {
-        $currentContentIsResource = is_resource($this->content);
-        if (PHP_VERSION_ID < 50600 && false === $this->content) {
-            throw new \LogicException('getContent() can only be called once when using the resource return type and PHP below 5.6.');
-        }
-
-        if (true === $asResource) {
-            if ($currentContentIsResource) {
-                rewind($this->content);
-
-                return $this->content;
-            }
-
-            // Content passed in parameter (test)
-            if (is_string($this->content)) {
-                $resource = fopen('php://temp', 'r+');
-                fwrite($resource, $this->content);
-                rewind($resource);
-
-                return $resource;
-            }
-
-            $this->content = false;
-
-            return fopen('php://input', 'rb');
-        }
-
-        if ($currentContentIsResource) {
-            rewind($this->content);
-
-            return stream_get_contents($this->content);
-        }
-
-        if (null === $this->content) {
-            $this->content = file_get_contents('php://input');
-        }
-
-        return $this->content;
-    }
-
-    /**
-     * Gets the Etags.
-     *
-     * @return array The entity tags
-     */
-    public function getETags()
-    {
-        return preg_split('/\s*,\s*/', $this->headers->get('if_none_match'), null, PREG_SPLIT_NO_EMPTY);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNoCache()
-    {
-        return $this->headers->hasCacheControlDirective('no-cache') || 'no-cache' == $this->headers->get('Pragma');
-    }
-
-    /**
-     * Returns the preferred language.
-     *
-     * @param array $locales An array of ordered available locales
-     *
-     * @return string|null The preferred locale
-     */
-    public function getPreferredLanguage(array $locales = null)
-    {
-        $preferredLanguages = $this->getLanguages();
-
-        if (empty($locales)) {
-            return isset($preferredLanguages[0]) ? $preferredLanguages[0] : null;
-        }
-
-        if (!$preferredLanguages) {
-            return $locales[0];
-        }
-
-        $extendedPreferredLanguages = array();
-        foreach ($preferredLanguages as $language) {
-            $extendedPreferredLanguages[] = $language;
-            if (false !== $position = strpos($language, '_')) {
-                $superLanguage = substr($language, 0, $position);
-                if (!in_array($superLanguage, $preferredLanguages)) {
-                    $extendedPreferredLanguages[] = $superLanguage;
-                }
-            }
-        }
-
-        $preferredLanguages = array_values(array_intersect($extendedPreferredLanguages, $locales));
-
-        return isset($preferredLanguages[0]) ? $preferredLanguages[0] : $locales[0];
-    }
-
-    /**
-     * Gets a list of languages acceptable by the client browser.
-     *
-     * @return array Languages ordered in the user browser preferences
-     */
-    public function getLanguages()
-    {
-        if (null !== $this->languages) {
-            return $this->languages;
-        }
-
-        $languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();
-        $this->languages = array();
-        foreach ($languages as $lang => $acceptHeaderItem) {
-            if (false !== strpos($lang, '-')) {
-                $codes = explode('-', $lang);
-                if ('i' === $codes[0]) {
-                    // Language not listed in ISO 639 that are not variants
-                    // of any listed language, which can be registered with the
-                    // i-prefix, such as i-cherokee
-                    if (count($codes) > 1) {
-                        $lang = $codes[1];
-                    }
-                } else {
-                    for ($i = 0, $max = count($codes); $i < $max; ++$i) {
-                        if ($i === 0) {
-                            $lang = strtolower($codes[0]);
-                        } else {
-                            $lang .= '_'.strtoupper($codes[$i]);
-                        }
-                    }
-                }
-            }
-
-            $this->languages[] = $lang;
-        }
-
-        return $this->languages;
-    }
-
-    /**
-     * Gets a list of charsets acceptable by the client browser.
-     *
-     * @return array List of charsets in preferable order
-     */
-    public function getCharsets()
-    {
-        if (null !== $this->charsets) {
-            return $this->charsets;
-        }
-
-        return $this->charsets = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Charset'))->all());
-    }
-
-    /**
-     * Gets a list of encodings acceptable by the client browser.
-     *
-     * @return array List of encodings in preferable order
-     */
-    public function getEncodings()
-    {
-        if (null !== $this->encodings) {
-            return $this->encodings;
-        }
-
-        return $this->encodings = array_keys(AcceptHeader::fromString($this->headers->get('Accept-Encoding'))->all());
-    }
-
-    /**
-     * Gets a list of content types acceptable by the client browser.
-     *
-     * @return array List of content types in preferable order
-     */
-    public function getAcceptableContentTypes()
-    {
-        if (null !== $this->acceptableContentTypes) {
-            return $this->acceptableContentTypes;
-        }
-
-        return $this->acceptableContentTypes = array_keys(AcceptHeader::fromString($this->headers->get('Accept'))->all());
-    }
-
-    /**
-     * Returns true if the request is a XMLHttpRequest.
-     *
-     * It works if your JavaScript library sets an X-Requested-With HTTP header.
-     * It is known to work with common JavaScript frameworks:
-     *
-     * @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
-     *
-     * @return bool true if the request is an XMLHttpRequest, false otherwise
-     */
-    public function isXmlHttpRequest()
-    {
-        return 'XMLHttpRequest' == $this->headers->get('X-Requested-With');
-    }
-
-    /*
-     * The following methods are derived from code of the Zend Framework (1.10dev - 2010-01-24)
-     *
-     * Code subject to the new BSD license (http://framework.zend.com/license/new-bsd).
-     *
-     * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-     */
-
-    protected function prepareRequestUri()
-    {
-        $requestUri = '';
-
-        if ($this->headers->has('X_ORIGINAL_URL')) {
-            // IIS with Microsoft Rewrite Module
-            $requestUri = $this->headers->get('X_ORIGINAL_URL');
-            $this->headers->remove('X_ORIGINAL_URL');
-            $this->server->remove('HTTP_X_ORIGINAL_URL');
-            $this->server->remove('UNENCODED_URL');
-            $this->server->remove('IIS_WasUrlRewritten');
-        } elseif ($this->headers->has('X_REWRITE_URL')) {
-            // IIS with ISAPI_Rewrite
-            $requestUri = $this->headers->get('X_REWRITE_URL');
-            $this->headers->remove('X_REWRITE_URL');
-        } elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
-            // IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
-            $requestUri = $this->server->get('UNENCODED_URL');
-            $this->server->remove('UNENCODED_URL');
-            $this->server->remove('IIS_WasUrlRewritten');
-        } elseif ($this->server->has('REQUEST_URI')) {
-            $requestUri = $this->server->get('REQUEST_URI');
-            // HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path, only use URL path
-            $schemeAndHttpHost = $this->getSchemeAndHttpHost();
-            if (strpos($requestUri, $schemeAndHttpHost) === 0) {
-                $requestUri = substr($requestUri, strlen($schemeAndHttpHost));
-            }
-        } elseif ($this->server->has('ORIG_PATH_INFO')) {
-            // IIS 5.0, PHP as CGI
-            $requestUri = $this->server->get('ORIG_PATH_INFO');
-            if ('' != $this->server->get('QUERY_STRING')) {
-                $requestUri .= '?'.$this->server->get('QUERY_STRING');
-            }
-            $this->server->remove('ORIG_PATH_INFO');
-        }
-
-        // normalize the request URI to ease creating sub-requests from this request
-        $this->server->set('REQUEST_URI', $requestUri);
-
-        return $requestUri;
-    }
-
-    /**
-     * Prepares the base URL.
-     *
-     * @return string
-     */
-    protected function prepareBaseUrl()
-    {
-        $filename = basename($this->server->get('SCRIPT_FILENAME'));
-
-        if (basename($this->server->get('SCRIPT_NAME')) === $filename) {
-            $baseUrl = $this->server->get('SCRIPT_NAME');
-        } elseif (basename($this->server->get('PHP_SELF')) === $filename) {
-            $baseUrl = $this->server->get('PHP_SELF');
-        } elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) {
-            $baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); // 1and1 shared hosting compatibility
-        } else {
-            // Backtrack up the script_filename to find the portion matching
-            // php_self
-            $path = $this->server->get('PHP_SELF', '');
-            $file = $this->server->get('SCRIPT_FILENAME', '');
-            $segs = explode('/', trim($file, '/'));
-            $segs = array_reverse($segs);
-            $index = 0;
-            $last = count($segs);
-            $baseUrl = '';
-            do {
-                $seg = $segs[$index];
-                $baseUrl = '/'.$seg.$baseUrl;
-                ++$index;
-            } while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
-        }
-
-        // Does the baseUrl have anything in common with the request_uri?
-        $requestUri = $this->getRequestUri();
-
-        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, $baseUrl)) {
-            // full $baseUrl matches
-            return $prefix;
-        }
-
-        if ($baseUrl && false !== $prefix = $this->getUrlencodedPrefix($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR).'/')) {
-            // directory portion of $baseUrl matches
-            return rtrim($prefix, '/'.DIRECTORY_SEPARATOR);
-        }
-
-        $truncatedRequestUri = $requestUri;
-        if (false !== $pos = strpos($requestUri, '?')) {
-            $truncatedRequestUri = substr($requestUri, 0, $pos);
-        }
-
-        $basename = basename($baseUrl);
-        if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) {
-            // no match whatsoever; set it blank
-            return '';
-        }
-
-        // If using mod_rewrite or ISAPI_Rewrite strip the script filename
-        // out of baseUrl. $pos !== 0 makes sure it is not matching a value
-        // from PATH_INFO or QUERY_STRING
-        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && $pos !== 0) {
-            $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
-        }
-
-        return rtrim($baseUrl, '/'.DIRECTORY_SEPARATOR);
-    }
-
-    /**
-     * Prepares the base path.
-     *
-     * @return string base path
-     */
-    protected function prepareBasePath()
-    {
-        $filename = basename($this->server->get('SCRIPT_FILENAME'));
-        $baseUrl = $this->getBaseUrl();
-        if (empty($baseUrl)) {
-            return '';
-        }
-
-        if (basename($baseUrl) === $filename) {
-            $basePath = dirname($baseUrl);
-        } else {
-            $basePath = $baseUrl;
-        }
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $basePath = str_replace('\\', '/', $basePath);
-        }
-
-        return rtrim($basePath, '/');
-    }
-
-    /**
-     * Prepares the path info.
-     *
-     * @return string path info
-     */
-    protected function preparePathInfo()
-    {
-        $baseUrl = $this->getBaseUrl();
-
-        if (null === ($requestUri = $this->getRequestUri())) {
-            return '/';
-        }
-
-        $pathInfo = '/';
-
-        // Remove the query string from REQUEST_URI
-        if ($pos = strpos($requestUri, '?')) {
-            $requestUri = substr($requestUri, 0, $pos);
-        }
-
-        $pathInfo = substr($requestUri, strlen($baseUrl));
-        if (null !== $baseUrl && (false === $pathInfo || '' === $pathInfo)) {
-            // If substr() returns false then PATH_INFO is set to an empty string
-            return '/';
-        } elseif (null === $baseUrl) {
-            return $requestUri;
-        }
-
-        return (string) $pathInfo;
-    }
-
-    /**
-     * Initializes HTTP request formats.
-     */
-    protected static function initializeFormats()
-    {
-        static::$formats = array(
-            'html' => array('text/html', 'application/xhtml+xml'),
-            'txt' => array('text/plain'),
-            'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
-            'css' => array('text/css'),
-            'json' => array('application/json', 'application/x-json'),
-            'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
-            'rdf' => array('application/rdf+xml'),
-            'atom' => array('application/atom+xml'),
-            'rss' => array('application/rss+xml'),
-            'form' => array('application/x-www-form-urlencoded'),
-        );
-    }
-
-    /**
-     * Sets the default PHP locale.
-     *
-     * @param string $locale
-     */
-    private function setPhpDefaultLocale($locale)
-    {
-        // if either the class Locale doesn't exist, or an exception is thrown when
-        // setting the default locale, the intl module is not installed, and
-        // the call can be ignored:
-        try {
-            if (class_exists('Locale', false)) {
-                \Locale::setDefault($locale);
-            }
-        } catch (\Exception $e) {
-        }
-    }
-
-    /*
-     * Returns the prefix as encoded in the string when the string starts with
-     * the given prefix, false otherwise.
-     *
-     * @param string $string The urlencoded string
-     * @param string $prefix The prefix not encoded
-     *
-     * @return string|false The prefix as it is encoded in $string, or false
-     */
-    private function getUrlencodedPrefix($string, $prefix)
-    {
-        if (0 !== strpos(rawurldecode($string), $prefix)) {
-            return false;
-        }
-
-        $len = strlen($prefix);
-
-        if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
-            return $match[0];
-        }
-
-        return false;
-    }
-
-    private static function createRequestFromFactory(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
-    {
-        if (self::$requestFactory) {
-            $request = call_user_func(self::$requestFactory, $query, $request, $attributes, $cookies, $files, $server, $content);
-
-            if (!$request instanceof self) {
-                throw new \LogicException('The Request factory must return an instance of Symfony\Component\HttpFoundation\Request.');
-            }
-
-            return $request;
-        }
-
-        return new static($query, $request, $attributes, $cookies, $files, $server, $content);
-    }
-
-    private function isFromTrustedProxy()
-    {
-        return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR'), self::$trustedProxies);
-    }
-}
diff --git a/vendor/symfony/http-foundation/RequestMatcher.php b/vendor/symfony/http-foundation/RequestMatcher.php
deleted file mode 100644
index ca094ca..0000000
--- a/vendor/symfony/http-foundation/RequestMatcher.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * RequestMatcher compares a pre-defined set of checks against a Request instance.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RequestMatcher implements RequestMatcherInterface
-{
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var string
-     */
-    private $host;
-
-    /**
-     * @var array
-     */
-    private $methods = array();
-
-    /**
-     * @var string
-     */
-    private $ips = array();
-
-    /**
-     * @var array
-     */
-    private $attributes = array();
-
-    /**
-     * @var string[]
-     */
-    private $schemes = array();
-
-    /**
-     * @param string|null          $path
-     * @param string|null          $host
-     * @param string|string[]|null $methods
-     * @param string|string[]|null $ips
-     * @param array                $attributes
-     * @param string|string[]|null $schemes
-     */
-    public function __construct($path = null, $host = null, $methods = null, $ips = null, array $attributes = array(), $schemes = null)
-    {
-        $this->matchPath($path);
-        $this->matchHost($host);
-        $this->matchMethod($methods);
-        $this->matchIps($ips);
-        $this->matchScheme($schemes);
-
-        foreach ($attributes as $k => $v) {
-            $this->matchAttribute($k, $v);
-        }
-    }
-
-    /**
-     * Adds a check for the HTTP scheme.
-     *
-     * @param string|string[]|null $scheme An HTTP scheme or an array of HTTP schemes
-     */
-    public function matchScheme($scheme)
-    {
-        $this->schemes = array_map('strtolower', (array) $scheme);
-    }
-
-    /**
-     * Adds a check for the URL host name.
-     *
-     * @param string $regexp A Regexp
-     */
-    public function matchHost($regexp)
-    {
-        $this->host = $regexp;
-    }
-
-    /**
-     * Adds a check for the URL path info.
-     *
-     * @param string $regexp A Regexp
-     */
-    public function matchPath($regexp)
-    {
-        $this->path = $regexp;
-    }
-
-    /**
-     * Adds a check for the client IP.
-     *
-     * @param string $ip A specific IP address or a range specified using IP/netmask like 192.168.1.0/24
-     */
-    public function matchIp($ip)
-    {
-        $this->matchIps($ip);
-    }
-
-    /**
-     * Adds a check for the client IP.
-     *
-     * @param string|string[] $ips A specific IP address or a range specified using IP/netmask like 192.168.1.0/24
-     */
-    public function matchIps($ips)
-    {
-        $this->ips = (array) $ips;
-    }
-
-    /**
-     * Adds a check for the HTTP method.
-     *
-     * @param string|string[] $method An HTTP method or an array of HTTP methods
-     */
-    public function matchMethod($method)
-    {
-        $this->methods = array_map('strtoupper', (array) $method);
-    }
-
-    /**
-     * Adds a check for request attribute.
-     *
-     * @param string $key    The request attribute name
-     * @param string $regexp A Regexp
-     */
-    public function matchAttribute($key, $regexp)
-    {
-        $this->attributes[$key] = $regexp;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function matches(Request $request)
-    {
-        if ($this->schemes && !in_array($request->getScheme(), $this->schemes)) {
-            return false;
-        }
-
-        if ($this->methods && !in_array($request->getMethod(), $this->methods)) {
-            return false;
-        }
-
-        foreach ($this->attributes as $key => $pattern) {
-            if (!preg_match('{'.$pattern.'}', $request->attributes->get($key))) {
-                return false;
-            }
-        }
-
-        if (null !== $this->path && !preg_match('{'.$this->path.'}', rawurldecode($request->getPathInfo()))) {
-            return false;
-        }
-
-        if (null !== $this->host && !preg_match('{'.$this->host.'}i', $request->getHost())) {
-            return false;
-        }
-
-        if (IpUtils::checkIp($request->getClientIp(), $this->ips)) {
-            return true;
-        }
-
-        // Note to future implementors: add additional checks above the
-        // foreach above or else your check might not be run!
-        return count($this->ips) === 0;
-    }
-}
diff --git a/vendor/symfony/http-foundation/RequestMatcherInterface.php b/vendor/symfony/http-foundation/RequestMatcherInterface.php
deleted file mode 100644
index 066e7e8..0000000
--- a/vendor/symfony/http-foundation/RequestMatcherInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * RequestMatcherInterface is an interface for strategies to match a Request.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface RequestMatcherInterface
-{
-    /**
-     * Decides whether the rule(s) implemented by the strategy matches the supplied request.
-     *
-     * @param Request $request The request to check for a match
-     *
-     * @return bool true if the request matches, false otherwise
-     */
-    public function matches(Request $request);
-}
diff --git a/vendor/symfony/http-foundation/RequestStack.php b/vendor/symfony/http-foundation/RequestStack.php
deleted file mode 100644
index 3d9cfd0..0000000
--- a/vendor/symfony/http-foundation/RequestStack.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Request stack that controls the lifecycle of requests.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class RequestStack
-{
-    /**
-     * @var Request[]
-     */
-    private $requests = array();
-
-    /**
-     * Pushes a Request on the stack.
-     *
-     * This method should generally not be called directly as the stack
-     * management should be taken care of by the application itself.
-     */
-    public function push(Request $request)
-    {
-        $this->requests[] = $request;
-    }
-
-    /**
-     * Pops the current request from the stack.
-     *
-     * This operation lets the current request go out of scope.
-     *
-     * This method should generally not be called directly as the stack
-     * management should be taken care of by the application itself.
-     *
-     * @return Request|null
-     */
-    public function pop()
-    {
-        if (!$this->requests) {
-            return;
-        }
-
-        return array_pop($this->requests);
-    }
-
-    /**
-     * @return Request|null
-     */
-    public function getCurrentRequest()
-    {
-        return end($this->requests) ?: null;
-    }
-
-    /**
-     * Gets the master Request.
-     *
-     * Be warned that making your code aware of the master request
-     * might make it un-compatible with other features of your framework
-     * like ESI support.
-     *
-     * @return Request|null
-     */
-    public function getMasterRequest()
-    {
-        if (!$this->requests) {
-            return;
-        }
-
-        return $this->requests[0];
-    }
-
-    /**
-     * Returns the parent request of the current.
-     *
-     * Be warned that making your code aware of the parent request
-     * might make it un-compatible with other features of your framework
-     * like ESI support.
-     *
-     * If current Request is the master request, it returns null.
-     *
-     * @return Request|null
-     */
-    public function getParentRequest()
-    {
-        $pos = count($this->requests) - 2;
-
-        if (!isset($this->requests[$pos])) {
-            return;
-        }
-
-        return $this->requests[$pos];
-    }
-}
diff --git a/vendor/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php b/vendor/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php
deleted file mode 100644
index 9baa7bc..0000000
--- a/vendor/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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.
- */
-
-/**
- * SessionHandlerInterface for PHP < 5.4.
- *
- * The order in which these methods are invoked by PHP are:
- * 1. open [session_start]
- * 2. read
- * 3. gc [optional depending on probability settings: gc_probability / gc_divisor]
- * 4. destroy [optional when session_regenerate_id(true) is used]
- * 5. write [session_write_close] or destroy [session_destroy]
- * 6. close
- *
- * Extensive documentation can be found at php.net, see links:
- *
- * @see http://php.net/sessionhandlerinterface
- * @see http://php.net/session.customhandler
- * @see http://php.net/session-set-save-handler
- *
- * @author Drak <drak@zikula.org>
- * @author Tobias Schultze <http://tobion.de>
- */
-interface SessionHandlerInterface
-{
-    /**
-     * Re-initializes existing session, or creates a new one.
-     *
-     * @see http://php.net/sessionhandlerinterface.open
-     *
-     * @param string $savePath    Save path
-     * @param string $sessionName Session name, see http://php.net/function.session-name.php
-     *
-     * @return bool true on success, false on failure
-     */
-    public function open($savePath, $sessionName);
-
-    /**
-     * Closes the current session.
-     *
-     * @see http://php.net/sessionhandlerinterface.close
-     *
-     * @return bool true on success, false on failure
-     */
-    public function close();
-
-    /**
-     * Reads the session data.
-     *
-     * @see http://php.net/sessionhandlerinterface.read
-     *
-     * @param string $sessionId Session ID, see http://php.net/function.session-id
-     *
-     * @return string Same session data as passed in write() or empty string when non-existent or on failure
-     */
-    public function read($sessionId);
-
-    /**
-     * Writes the session data to the storage.
-     *
-     * Care, the session ID passed to write() can be different from the one previously
-     * received in read() when the session ID changed due to session_regenerate_id().
-     *
-     * @see http://php.net/sessionhandlerinterface.write
-     *
-     * @param string $sessionId Session ID , see http://php.net/function.session-id
-     * @param string $data      Serialized session data to save
-     *
-     * @return bool true on success, false on failure
-     */
-    public function write($sessionId, $data);
-
-    /**
-     * Destroys a session.
-     *
-     * @see http://php.net/sessionhandlerinterface.destroy
-     *
-     * @param string $sessionId Session ID, see http://php.net/function.session-id
-     *
-     * @return bool true on success, false on failure
-     */
-    public function destroy($sessionId);
-
-    /**
-     * Cleans up expired sessions (garbage collection).
-     *
-     * @see http://php.net/sessionhandlerinterface.gc
-     *
-     * @param string|int $maxlifetime Sessions that have not updated for the last maxlifetime seconds will be removed
-     *
-     * @return bool true on success, false on failure
-     */
-    public function gc($maxlifetime);
-}
diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php
deleted file mode 100644
index cb706d5..0000000
--- a/vendor/symfony/http-foundation/Response.php
+++ /dev/null
@@ -1,1171 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * Response represents an HTTP response.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Response
-{
-    const HTTP_CONTINUE = 100;
-    const HTTP_SWITCHING_PROTOCOLS = 101;
-    const HTTP_PROCESSING = 102;            // RFC2518
-    const HTTP_OK = 200;
-    const HTTP_CREATED = 201;
-    const HTTP_ACCEPTED = 202;
-    const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
-    const HTTP_NO_CONTENT = 204;
-    const HTTP_RESET_CONTENT = 205;
-    const HTTP_PARTIAL_CONTENT = 206;
-    const HTTP_MULTI_STATUS = 207;          // RFC4918
-    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
-    const HTTP_IM_USED = 226;               // RFC3229
-    const HTTP_MULTIPLE_CHOICES = 300;
-    const HTTP_MOVED_PERMANENTLY = 301;
-    const HTTP_FOUND = 302;
-    const HTTP_SEE_OTHER = 303;
-    const HTTP_NOT_MODIFIED = 304;
-    const HTTP_USE_PROXY = 305;
-    const HTTP_RESERVED = 306;
-    const HTTP_TEMPORARY_REDIRECT = 307;
-    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
-    const HTTP_BAD_REQUEST = 400;
-    const HTTP_UNAUTHORIZED = 401;
-    const HTTP_PAYMENT_REQUIRED = 402;
-    const HTTP_FORBIDDEN = 403;
-    const HTTP_NOT_FOUND = 404;
-    const HTTP_METHOD_NOT_ALLOWED = 405;
-    const HTTP_NOT_ACCEPTABLE = 406;
-    const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
-    const HTTP_REQUEST_TIMEOUT = 408;
-    const HTTP_CONFLICT = 409;
-    const HTTP_GONE = 410;
-    const HTTP_LENGTH_REQUIRED = 411;
-    const HTTP_PRECONDITION_FAILED = 412;
-    const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
-    const HTTP_REQUEST_URI_TOO_LONG = 414;
-    const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
-    const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-    const HTTP_EXPECTATION_FAILED = 417;
-    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
-    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
-    const HTTP_LOCKED = 423;                                                      // RFC4918
-    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
-    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
-    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
-    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
-    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
-    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
-    const HTTP_INTERNAL_SERVER_ERROR = 500;
-    const HTTP_NOT_IMPLEMENTED = 501;
-    const HTTP_BAD_GATEWAY = 502;
-    const HTTP_SERVICE_UNAVAILABLE = 503;
-    const HTTP_GATEWAY_TIMEOUT = 504;
-    const HTTP_VERSION_NOT_SUPPORTED = 505;
-    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
-    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
-    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
-    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
-    const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;                             // RFC6585
-
-    /**
-     * @var \Symfony\Component\HttpFoundation\ResponseHeaderBag
-     */
-    public $headers;
-
-    /**
-     * @var string
-     */
-    protected $content;
-
-    /**
-     * @var string
-     */
-    protected $version;
-
-    /**
-     * @var int
-     */
-    protected $statusCode;
-
-    /**
-     * @var string
-     */
-    protected $statusText;
-
-    /**
-     * @var string
-     */
-    protected $charset;
-
-    /**
-     * Status codes translation table.
-     *
-     * The list of codes is complete according to the
-     * {@link http://www.iana.org/assignments/http-status-codes/ Hypertext Transfer Protocol (HTTP) Status Code Registry}
-     * (last updated 2012-02-13).
-     *
-     * Unless otherwise noted, the status code is defined in RFC2616.
-     *
-     * @var array
-     */
-    public static $statusTexts = array(
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',            // RFC2518
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',          // RFC4918
-        208 => 'Already Reported',      // RFC5842
-        226 => 'IM Used',               // RFC3229
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Reserved',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',    // RFC7238
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',                                               // RFC2324
-        422 => 'Unprocessable Entity',                                        // RFC4918
-        423 => 'Locked',                                                      // RFC4918
-        424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
-        426 => 'Upgrade Required',                                            // RFC2817
-        428 => 'Precondition Required',                                       // RFC6585
-        429 => 'Too Many Requests',                                           // RFC6585
-        431 => 'Request Header Fields Too Large',                             // RFC6585
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
-        507 => 'Insufficient Storage',                                        // RFC4918
-        508 => 'Loop Detected',                                               // RFC5842
-        510 => 'Not Extended',                                                // RFC2774
-        511 => 'Network Authentication Required',                             // RFC6585
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $content The response content, see setContent()
-     * @param int   $status  The response status code
-     * @param array $headers An array of response headers
-     *
-     * @throws \InvalidArgumentException When the HTTP status code is not valid
-     */
-    public function __construct($content = '', $status = 200, $headers = array())
-    {
-        $this->headers = new ResponseHeaderBag($headers);
-        $this->setContent($content);
-        $this->setStatusCode($status);
-        $this->setProtocolVersion('1.0');
-        if (!$this->headers->has('Date')) {
-            $this->setDate(\DateTime::createFromFormat('U', time(), new \DateTimeZone('UTC')));
-        }
-    }
-
-    /**
-     * Factory method for chainability.
-     *
-     * Example:
-     *
-     *     return Response::create($body, 200)
-     *         ->setSharedMaxAge(300);
-     *
-     * @param mixed $content The response content, see setContent()
-     * @param int   $status  The response status code
-     * @param array $headers An array of response headers
-     *
-     * @return Response
-     */
-    public static function create($content = '', $status = 200, $headers = array())
-    {
-        return new static($content, $status, $headers);
-    }
-
-    /**
-     * Returns the Response as an HTTP string.
-     *
-     * The string representation of the Response is the same as the
-     * one that will be sent to the client only if the prepare() method
-     * has been called before.
-     *
-     * @return string The Response as an HTTP string
-     *
-     * @see prepare()
-     */
-    public function __toString()
-    {
-        return
-            sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
-            $this->headers."\r\n".
-            $this->getContent();
-    }
-
-    /**
-     * Clones the current Response instance.
-     */
-    public function __clone()
-    {
-        $this->headers = clone $this->headers;
-    }
-
-    /**
-     * Prepares the Response before it is sent to the client.
-     *
-     * This method tweaks the Response to ensure that it is
-     * compliant with RFC 2616. Most of the changes are based on
-     * the Request that is "associated" with this Response.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return Response The current response.
-     */
-    public function prepare(Request $request)
-    {
-        $headers = $this->headers;
-
-        if ($this->isInformational() || $this->isEmpty()) {
-            $this->setContent(null);
-            $headers->remove('Content-Type');
-            $headers->remove('Content-Length');
-        } else {
-            // Content-type based on the Request
-            if (!$headers->has('Content-Type')) {
-                $format = $request->getRequestFormat();
-                if (null !== $format && $mimeType = $request->getMimeType($format)) {
-                    $headers->set('Content-Type', $mimeType);
-                }
-            }
-
-            // Fix Content-Type
-            $charset = $this->charset ?: 'UTF-8';
-            if (!$headers->has('Content-Type')) {
-                $headers->set('Content-Type', 'text/html; charset='.$charset);
-            } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) {
-                // add the charset
-                $headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset);
-            }
-
-            // Fix Content-Length
-            if ($headers->has('Transfer-Encoding')) {
-                $headers->remove('Content-Length');
-            }
-
-            if ($request->isMethod('HEAD')) {
-                // cf. RFC2616 14.13
-                $length = $headers->get('Content-Length');
-                $this->setContent(null);
-                if ($length) {
-                    $headers->set('Content-Length', $length);
-                }
-            }
-        }
-
-        // Fix protocol
-        if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) {
-            $this->setProtocolVersion('1.1');
-        }
-
-        // Check if we need to send extra expire info headers
-        if ('1.0' == $this->getProtocolVersion() && 'no-cache' == $this->headers->get('Cache-Control')) {
-            $this->headers->set('pragma', 'no-cache');
-            $this->headers->set('expires', -1);
-        }
-
-        $this->ensureIEOverSSLCompatibility($request);
-
-        return $this;
-    }
-
-    /**
-     * Sends HTTP headers.
-     *
-     * @return Response
-     */
-    public function sendHeaders()
-    {
-        // headers have already been sent by the developer
-        if (headers_sent()) {
-            return $this;
-        }
-
-        // status
-        header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
-
-        // headers
-        foreach ($this->headers->allPreserveCase() as $name => $values) {
-            foreach ($values as $value) {
-                header($name.': '.$value, false, $this->statusCode);
-            }
-        }
-
-        // cookies
-        foreach ($this->headers->getCookies() as $cookie) {
-            setcookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sends content for the current web response.
-     *
-     * @return Response
-     */
-    public function sendContent()
-    {
-        echo $this->content;
-
-        return $this;
-    }
-
-    /**
-     * Sends HTTP headers and content.
-     *
-     * @return Response
-     */
-    public function send()
-    {
-        $this->sendHeaders();
-        $this->sendContent();
-
-        if (function_exists('fastcgi_finish_request')) {
-            fastcgi_finish_request();
-        } elseif ('cli' !== PHP_SAPI) {
-            static::closeOutputBuffers(0, true);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the response content.
-     *
-     * Valid types are strings, numbers, null, and objects that implement a __toString() method.
-     *
-     * @param mixed $content Content that can be cast to string
-     *
-     * @return Response
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function setContent($content)
-    {
-        if (null !== $content && !is_string($content) && !is_numeric($content) && !is_callable(array($content, '__toString'))) {
-            throw new \UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', gettype($content)));
-        }
-
-        $this->content = (string) $content;
-
-        return $this;
-    }
-
-    /**
-     * Gets the current response content.
-     *
-     * @return string Content
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Sets the HTTP protocol version (1.0 or 1.1).
-     *
-     * @param string $version The HTTP protocol version
-     *
-     * @return Response
-     */
-    public function setProtocolVersion($version)
-    {
-        $this->version = $version;
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP protocol version.
-     *
-     * @return string The HTTP protocol version
-     */
-    public function getProtocolVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Sets the response status code.
-     *
-     * @param int   $code HTTP status code
-     * @param mixed $text HTTP status text
-     *
-     * If the status text is null it will be automatically populated for the known
-     * status codes and left empty otherwise.
-     *
-     * @return Response
-     *
-     * @throws \InvalidArgumentException When the HTTP status code is not valid
-     */
-    public function setStatusCode($code, $text = null)
-    {
-        $this->statusCode = $code = (int) $code;
-        if ($this->isInvalid()) {
-            throw new \InvalidArgumentException(sprintf('The HTTP status code "%s" is not valid.', $code));
-        }
-
-        if (null === $text) {
-            $this->statusText = isset(self::$statusTexts[$code]) ? self::$statusTexts[$code] : '';
-
-            return $this;
-        }
-
-        if (false === $text) {
-            $this->statusText = '';
-
-            return $this;
-        }
-
-        $this->statusText = $text;
-
-        return $this;
-    }
-
-    /**
-     * Retrieves the status code for the current web response.
-     *
-     * @return int Status code
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * Sets the response charset.
-     *
-     * @param string $charset Character set
-     *
-     * @return Response
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = $charset;
-
-        return $this;
-    }
-
-    /**
-     * Retrieves the response charset.
-     *
-     * @return string Character set
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Returns true if the response is worth caching under any circumstance.
-     *
-     * Responses marked "private" with an explicit Cache-Control directive are
-     * considered uncacheable.
-     *
-     * Responses with neither a freshness lifetime (Expires, max-age) nor cache
-     * validator (Last-Modified, ETag) are considered uncacheable.
-     *
-     * @return bool true if the response is worth caching, false otherwise
-     */
-    public function isCacheable()
-    {
-        if (!in_array($this->statusCode, array(200, 203, 300, 301, 302, 404, 410))) {
-            return false;
-        }
-
-        if ($this->headers->hasCacheControlDirective('no-store') || $this->headers->getCacheControlDirective('private')) {
-            return false;
-        }
-
-        return $this->isValidateable() || $this->isFresh();
-    }
-
-    /**
-     * Returns true if the response is "fresh".
-     *
-     * Fresh responses may be served from cache without any interaction with the
-     * origin. A response is considered fresh when it includes a Cache-Control/max-age
-     * indicator or Expires header and the calculated age is less than the freshness lifetime.
-     *
-     * @return bool true if the response is fresh, false otherwise
-     */
-    public function isFresh()
-    {
-        return $this->getTtl() > 0;
-    }
-
-    /**
-     * Returns true if the response includes headers that can be used to validate
-     * the response with the origin server using a conditional GET request.
-     *
-     * @return bool true if the response is validateable, false otherwise
-     */
-    public function isValidateable()
-    {
-        return $this->headers->has('Last-Modified') || $this->headers->has('ETag');
-    }
-
-    /**
-     * Marks the response as "private".
-     *
-     * It makes the response ineligible for serving other clients.
-     *
-     * @return Response
-     */
-    public function setPrivate()
-    {
-        $this->headers->removeCacheControlDirective('public');
-        $this->headers->addCacheControlDirective('private');
-
-        return $this;
-    }
-
-    /**
-     * Marks the response as "public".
-     *
-     * It makes the response eligible for serving other clients.
-     *
-     * @return Response
-     */
-    public function setPublic()
-    {
-        $this->headers->addCacheControlDirective('public');
-        $this->headers->removeCacheControlDirective('private');
-
-        return $this;
-    }
-
-    /**
-     * Returns true if the response must be revalidated by caches.
-     *
-     * This method indicates that the response must not be served stale by a
-     * cache in any circumstance without first revalidating with the origin.
-     * When present, the TTL of the response should not be overridden to be
-     * greater than the value provided by the origin.
-     *
-     * @return bool true if the response must be revalidated by a cache, false otherwise
-     */
-    public function mustRevalidate()
-    {
-        return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->hasCacheControlDirective('proxy-revalidate');
-    }
-
-    /**
-     * Returns the Date header as a DateTime instance.
-     *
-     * @return \DateTime A \DateTime instance
-     *
-     * @throws \RuntimeException When the header is not parseable
-     */
-    public function getDate()
-    {
-        return $this->headers->getDate('Date', new \DateTime());
-    }
-
-    /**
-     * Sets the Date header.
-     *
-     * @param \DateTime $date A \DateTime instance
-     *
-     * @return Response
-     */
-    public function setDate(\DateTime $date)
-    {
-        $date->setTimezone(new \DateTimeZone('UTC'));
-        $this->headers->set('Date', $date->format('D, d M Y H:i:s').' GMT');
-
-        return $this;
-    }
-
-    /**
-     * Returns the age of the response.
-     *
-     * @return int The age of the response in seconds
-     */
-    public function getAge()
-    {
-        if (null !== $age = $this->headers->get('Age')) {
-            return (int) $age;
-        }
-
-        return max(time() - $this->getDate()->format('U'), 0);
-    }
-
-    /**
-     * Marks the response stale by setting the Age header to be equal to the maximum age of the response.
-     *
-     * @return Response
-     */
-    public function expire()
-    {
-        if ($this->isFresh()) {
-            $this->headers->set('Age', $this->getMaxAge());
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the value of the Expires header as a DateTime instance.
-     *
-     * @return \DateTime|null A DateTime instance or null if the header does not exist
-     */
-    public function getExpires()
-    {
-        try {
-            return $this->headers->getDate('Expires');
-        } catch (\RuntimeException $e) {
-            // according to RFC 2616 invalid date formats (e.g. "0" and "-1") must be treated as in the past
-            return \DateTime::createFromFormat(DATE_RFC2822, 'Sat, 01 Jan 00 00:00:00 +0000');
-        }
-    }
-
-    /**
-     * Sets the Expires HTTP header with a DateTime instance.
-     *
-     * Passing null as value will remove the header.
-     *
-     * @param \DateTime|null $date A \DateTime instance or null to remove the header
-     *
-     * @return Response
-     */
-    public function setExpires(\DateTime $date = null)
-    {
-        if (null === $date) {
-            $this->headers->remove('Expires');
-        } else {
-            $date = clone $date;
-            $date->setTimezone(new \DateTimeZone('UTC'));
-            $this->headers->set('Expires', $date->format('D, d M Y H:i:s').' GMT');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the number of seconds after the time specified in the response's Date
-     * header when the response should no longer be considered fresh.
-     *
-     * First, it checks for a s-maxage directive, then a max-age directive, and then it falls
-     * back on an expires header. It returns null when no maximum age can be established.
-     *
-     * @return int|null Number of seconds
-     */
-    public function getMaxAge()
-    {
-        if ($this->headers->hasCacheControlDirective('s-maxage')) {
-            return (int) $this->headers->getCacheControlDirective('s-maxage');
-        }
-
-        if ($this->headers->hasCacheControlDirective('max-age')) {
-            return (int) $this->headers->getCacheControlDirective('max-age');
-        }
-
-        if (null !== $this->getExpires()) {
-            return $this->getExpires()->format('U') - $this->getDate()->format('U');
-        }
-    }
-
-    /**
-     * Sets the number of seconds after which the response should no longer be considered fresh.
-     *
-     * This methods sets the Cache-Control max-age directive.
-     *
-     * @param int $value Number of seconds
-     *
-     * @return Response
-     */
-    public function setMaxAge($value)
-    {
-        $this->headers->addCacheControlDirective('max-age', $value);
-
-        return $this;
-    }
-
-    /**
-     * Sets the number of seconds after which the response should no longer be considered fresh by shared caches.
-     *
-     * This methods sets the Cache-Control s-maxage directive.
-     *
-     * @param int $value Number of seconds
-     *
-     * @return Response
-     */
-    public function setSharedMaxAge($value)
-    {
-        $this->setPublic();
-        $this->headers->addCacheControlDirective('s-maxage', $value);
-
-        return $this;
-    }
-
-    /**
-     * Returns the response's time-to-live in seconds.
-     *
-     * It returns null when no freshness information is present in the response.
-     *
-     * When the responses TTL is <= 0, the response may not be served from cache without first
-     * revalidating with the origin.
-     *
-     * @return int|null The TTL in seconds
-     */
-    public function getTtl()
-    {
-        if (null !== $maxAge = $this->getMaxAge()) {
-            return $maxAge - $this->getAge();
-        }
-    }
-
-    /**
-     * Sets the response's time-to-live for shared caches.
-     *
-     * This method adjusts the Cache-Control/s-maxage directive.
-     *
-     * @param int $seconds Number of seconds
-     *
-     * @return Response
-     */
-    public function setTtl($seconds)
-    {
-        $this->setSharedMaxAge($this->getAge() + $seconds);
-
-        return $this;
-    }
-
-    /**
-     * Sets the response's time-to-live for private/client caches.
-     *
-     * This method adjusts the Cache-Control/max-age directive.
-     *
-     * @param int $seconds Number of seconds
-     *
-     * @return Response
-     */
-    public function setClientTtl($seconds)
-    {
-        $this->setMaxAge($this->getAge() + $seconds);
-
-        return $this;
-    }
-
-    /**
-     * Returns the Last-Modified HTTP header as a DateTime instance.
-     *
-     * @return \DateTime|null A DateTime instance or null if the header does not exist
-     *
-     * @throws \RuntimeException When the HTTP header is not parseable
-     */
-    public function getLastModified()
-    {
-        return $this->headers->getDate('Last-Modified');
-    }
-
-    /**
-     * Sets the Last-Modified HTTP header with a DateTime instance.
-     *
-     * Passing null as value will remove the header.
-     *
-     * @param \DateTime|null $date A \DateTime instance or null to remove the header
-     *
-     * @return Response
-     */
-    public function setLastModified(\DateTime $date = null)
-    {
-        if (null === $date) {
-            $this->headers->remove('Last-Modified');
-        } else {
-            $date = clone $date;
-            $date->setTimezone(new \DateTimeZone('UTC'));
-            $this->headers->set('Last-Modified', $date->format('D, d M Y H:i:s').' GMT');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the literal value of the ETag HTTP header.
-     *
-     * @return string|null The ETag HTTP header or null if it does not exist
-     */
-    public function getEtag()
-    {
-        return $this->headers->get('ETag');
-    }
-
-    /**
-     * Sets the ETag value.
-     *
-     * @param string|null $etag The ETag unique identifier or null to remove the header
-     * @param bool        $weak Whether you want a weak ETag or not
-     *
-     * @return Response
-     */
-    public function setEtag($etag = null, $weak = false)
-    {
-        if (null === $etag) {
-            $this->headers->remove('Etag');
-        } else {
-            if (0 !== strpos($etag, '"')) {
-                $etag = '"'.$etag.'"';
-            }
-
-            $this->headers->set('ETag', (true === $weak ? 'W/' : '').$etag);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the response's cache headers (validation and/or expiration).
-     *
-     * Available options are: etag, last_modified, max_age, s_maxage, private, and public.
-     *
-     * @param array $options An array of cache options
-     *
-     * @return Response
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setCache(array $options)
-    {
-        if ($diff = array_diff(array_keys($options), array('etag', 'last_modified', 'max_age', 's_maxage', 'private', 'public'))) {
-            throw new \InvalidArgumentException(sprintf('Response does not support the following options: "%s".', implode('", "', array_values($diff))));
-        }
-
-        if (isset($options['etag'])) {
-            $this->setEtag($options['etag']);
-        }
-
-        if (isset($options['last_modified'])) {
-            $this->setLastModified($options['last_modified']);
-        }
-
-        if (isset($options['max_age'])) {
-            $this->setMaxAge($options['max_age']);
-        }
-
-        if (isset($options['s_maxage'])) {
-            $this->setSharedMaxAge($options['s_maxage']);
-        }
-
-        if (isset($options['public'])) {
-            if ($options['public']) {
-                $this->setPublic();
-            } else {
-                $this->setPrivate();
-            }
-        }
-
-        if (isset($options['private'])) {
-            if ($options['private']) {
-                $this->setPrivate();
-            } else {
-                $this->setPublic();
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Modifies the response so that it conforms to the rules defined for a 304 status code.
-     *
-     * This sets the status, removes the body, and discards any headers
-     * that MUST NOT be included in 304 responses.
-     *
-     * @return Response
-     *
-     * @see http://tools.ietf.org/html/rfc2616#section-10.3.5
-     */
-    public function setNotModified()
-    {
-        $this->setStatusCode(304);
-        $this->setContent(null);
-
-        // remove headers that MUST NOT be included with 304 Not Modified responses
-        foreach (array('Allow', 'Content-Encoding', 'Content-Language', 'Content-Length', 'Content-MD5', 'Content-Type', 'Last-Modified') as $header) {
-            $this->headers->remove($header);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns true if the response includes a Vary header.
-     *
-     * @return bool true if the response includes a Vary header, false otherwise
-     */
-    public function hasVary()
-    {
-        return null !== $this->headers->get('Vary');
-    }
-
-    /**
-     * Returns an array of header names given in the Vary header.
-     *
-     * @return array An array of Vary names
-     */
-    public function getVary()
-    {
-        if (!$vary = $this->headers->get('Vary', null, false)) {
-            return array();
-        }
-
-        $ret = array();
-        foreach ($vary as $item) {
-            $ret = array_merge($ret, preg_split('/[\s,]+/', $item));
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets the Vary header.
-     *
-     * @param string|array $headers
-     * @param bool         $replace Whether to replace the actual value of not (true by default)
-     *
-     * @return Response
-     */
-    public function setVary($headers, $replace = true)
-    {
-        $this->headers->set('Vary', $headers, $replace);
-
-        return $this;
-    }
-
-    /**
-     * Determines if the Response validators (ETag, Last-Modified) match
-     * a conditional value specified in the Request.
-     *
-     * If the Response is not modified, it sets the status code to 304 and
-     * removes the actual content by calling the setNotModified() method.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if the Response validators match the Request, false otherwise
-     */
-    public function isNotModified(Request $request)
-    {
-        if (!$request->isMethodSafe()) {
-            return false;
-        }
-
-        $notModified = false;
-        $lastModified = $this->headers->get('Last-Modified');
-        $modifiedSince = $request->headers->get('If-Modified-Since');
-
-        if ($etags = $request->getETags()) {
-            $notModified = in_array($this->getEtag(), $etags) || in_array('*', $etags);
-        }
-
-        if ($modifiedSince && $lastModified) {
-            $notModified = strtotime($modifiedSince) >= strtotime($lastModified) && (!$etags || $notModified);
-        }
-
-        if ($notModified) {
-            $this->setNotModified();
-        }
-
-        return $notModified;
-    }
-
-    // http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-    /**
-     * Is response invalid?
-     *
-     * @return bool
-     */
-    public function isInvalid()
-    {
-        return $this->statusCode < 100 || $this->statusCode >= 600;
-    }
-
-    /**
-     * Is response informative?
-     *
-     * @return bool
-     */
-    public function isInformational()
-    {
-        return $this->statusCode >= 100 && $this->statusCode < 200;
-    }
-
-    /**
-     * Is response successful?
-     *
-     * @return bool
-     */
-    public function isSuccessful()
-    {
-        return $this->statusCode >= 200 && $this->statusCode < 300;
-    }
-
-    /**
-     * Is the response a redirect?
-     *
-     * @return bool
-     */
-    public function isRedirection()
-    {
-        return $this->statusCode >= 300 && $this->statusCode < 400;
-    }
-
-    /**
-     * Is there a client error?
-     *
-     * @return bool
-     */
-    public function isClientError()
-    {
-        return $this->statusCode >= 400 && $this->statusCode < 500;
-    }
-
-    /**
-     * Was there a server side error?
-     *
-     * @return bool
-     */
-    public function isServerError()
-    {
-        return $this->statusCode >= 500 && $this->statusCode < 600;
-    }
-
-    /**
-     * Is the response OK?
-     *
-     * @return bool
-     */
-    public function isOk()
-    {
-        return 200 === $this->statusCode;
-    }
-
-    /**
-     * Is the response forbidden?
-     *
-     * @return bool
-     */
-    public function isForbidden()
-    {
-        return 403 === $this->statusCode;
-    }
-
-    /**
-     * Is the response a not found error?
-     *
-     * @return bool
-     */
-    public function isNotFound()
-    {
-        return 404 === $this->statusCode;
-    }
-
-    /**
-     * Is the response a redirect of some form?
-     *
-     * @param string $location
-     *
-     * @return bool
-     */
-    public function isRedirect($location = null)
-    {
-        return in_array($this->statusCode, array(201, 301, 302, 303, 307, 308)) && (null === $location ?: $location == $this->headers->get('Location'));
-    }
-
-    /**
-     * Is the response empty?
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return in_array($this->statusCode, array(204, 304));
-    }
-
-    /**
-     * Cleans or flushes output buffers up to target level.
-     *
-     * Resulting level can be greater than target level if a non-removable buffer has been encountered.
-     *
-     * @param int  $targetLevel The target output buffering level
-     * @param bool $flush       Whether to flush or clean the buffers
-     */
-    public static function closeOutputBuffers($targetLevel, $flush)
-    {
-        $status = ob_get_status(true);
-        $level = count($status);
-        $flags = defined('PHP_OUTPUT_HANDLER_REMOVABLE') ? PHP_OUTPUT_HANDLER_REMOVABLE | ($flush ? PHP_OUTPUT_HANDLER_FLUSHABLE : PHP_OUTPUT_HANDLER_CLEANABLE) : -1;
-
-        while ($level-- > $targetLevel && ($s = $status[$level]) && (!isset($s['del']) ? !isset($s['flags']) || $flags === ($s['flags'] & $flags) : $s['del'])) {
-            if ($flush) {
-                ob_end_flush();
-            } else {
-                ob_end_clean();
-            }
-        }
-    }
-
-    /**
-     * Checks if we need to remove Cache-Control for SSL encrypted downloads when using IE < 9.
-     *
-     * @link http://support.microsoft.com/kb/323308
-     */
-    protected function ensureIEOverSSLCompatibility(Request $request)
-    {
-        if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) == 1 && true === $request->isSecure()) {
-            if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {
-                $this->headers->remove('Cache-Control');
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/ResponseHeaderBag.php b/vendor/symfony/http-foundation/ResponseHeaderBag.php
deleted file mode 100644
index 328bf49..0000000
--- a/vendor/symfony/http-foundation/ResponseHeaderBag.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * ResponseHeaderBag is a container for Response HTTP headers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ResponseHeaderBag extends HeaderBag
-{
-    const COOKIES_FLAT = 'flat';
-    const COOKIES_ARRAY = 'array';
-
-    const DISPOSITION_ATTACHMENT = 'attachment';
-    const DISPOSITION_INLINE = 'inline';
-
-    /**
-     * @var array
-     */
-    protected $computedCacheControl = array();
-
-    /**
-     * @var array
-     */
-    protected $cookies = array();
-
-    /**
-     * @var array
-     */
-    protected $headerNames = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $headers An array of HTTP headers
-     */
-    public function __construct(array $headers = array())
-    {
-        parent::__construct($headers);
-
-        if (!isset($this->headers['cache-control'])) {
-            $this->set('Cache-Control', '');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $cookies = '';
-        foreach ($this->getCookies() as $cookie) {
-            $cookies .= 'Set-Cookie: '.$cookie."\r\n";
-        }
-
-        ksort($this->headerNames);
-
-        return parent::__toString().$cookies;
-    }
-
-    /**
-     * Returns the headers, with original capitalizations.
-     *
-     * @return array An array of headers
-     */
-    public function allPreserveCase()
-    {
-        return array_combine($this->headerNames, $this->headers);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function replace(array $headers = array())
-    {
-        $this->headerNames = array();
-
-        parent::replace($headers);
-
-        if (!isset($this->headers['cache-control'])) {
-            $this->set('Cache-Control', '');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($key, $values, $replace = true)
-    {
-        parent::set($key, $values, $replace);
-
-        $uniqueKey = strtr(strtolower($key), '_', '-');
-        $this->headerNames[$uniqueKey] = $key;
-
-        // ensure the cache-control header has sensible defaults
-        if (in_array($uniqueKey, array('cache-control', 'etag', 'last-modified', 'expires'))) {
-            $computed = $this->computeCacheControlValue();
-            $this->headers['cache-control'] = array($computed);
-            $this->headerNames['cache-control'] = 'Cache-Control';
-            $this->computedCacheControl = $this->parseCacheControl($computed);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($key)
-    {
-        parent::remove($key);
-
-        $uniqueKey = strtr(strtolower($key), '_', '-');
-        unset($this->headerNames[$uniqueKey]);
-
-        if ('cache-control' === $uniqueKey) {
-            $this->computedCacheControl = array();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasCacheControlDirective($key)
-    {
-        return array_key_exists($key, $this->computedCacheControl);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheControlDirective($key)
-    {
-        return array_key_exists($key, $this->computedCacheControl) ? $this->computedCacheControl[$key] : null;
-    }
-
-    /**
-     * Sets a cookie.
-     *
-     * @param Cookie $cookie
-     */
-    public function setCookie(Cookie $cookie)
-    {
-        $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
-    }
-
-    /**
-     * Removes a cookie from the array, but does not unset it in the browser.
-     *
-     * @param string $name
-     * @param string $path
-     * @param string $domain
-     */
-    public function removeCookie($name, $path = '/', $domain = null)
-    {
-        if (null === $path) {
-            $path = '/';
-        }
-
-        unset($this->cookies[$domain][$path][$name]);
-
-        if (empty($this->cookies[$domain][$path])) {
-            unset($this->cookies[$domain][$path]);
-
-            if (empty($this->cookies[$domain])) {
-                unset($this->cookies[$domain]);
-            }
-        }
-    }
-
-    /**
-     * Returns an array with all cookies.
-     *
-     * @param string $format
-     *
-     * @throws \InvalidArgumentException When the $format is invalid
-     *
-     * @return array
-     */
-    public function getCookies($format = self::COOKIES_FLAT)
-    {
-        if (!in_array($format, array(self::COOKIES_FLAT, self::COOKIES_ARRAY))) {
-            throw new \InvalidArgumentException(sprintf('Format "%s" invalid (%s).', $format, implode(', ', array(self::COOKIES_FLAT, self::COOKIES_ARRAY))));
-        }
-
-        if (self::COOKIES_ARRAY === $format) {
-            return $this->cookies;
-        }
-
-        $flattenedCookies = array();
-        foreach ($this->cookies as $path) {
-            foreach ($path as $cookies) {
-                foreach ($cookies as $cookie) {
-                    $flattenedCookies[] = $cookie;
-                }
-            }
-        }
-
-        return $flattenedCookies;
-    }
-
-    /**
-     * Clears a cookie in the browser.
-     *
-     * @param string $name
-     * @param string $path
-     * @param string $domain
-     * @param bool   $secure
-     * @param bool   $httpOnly
-     */
-    public function clearCookie($name, $path = '/', $domain = null, $secure = false, $httpOnly = true)
-    {
-        $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly));
-    }
-
-    /**
-     * Generates a HTTP Content-Disposition field-value.
-     *
-     * @param string $disposition      One of "inline" or "attachment"
-     * @param string $filename         A unicode string
-     * @param string $filenameFallback A string containing only ASCII characters that
-     *                                 is semantically equivalent to $filename. If the filename is already ASCII,
-     *                                 it can be omitted, or just copied from $filename
-     *
-     * @return string A string suitable for use as a Content-Disposition field-value.
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @see RFC 6266
-     */
-    public function makeDisposition($disposition, $filename, $filenameFallback = '')
-    {
-        if (!in_array($disposition, array(self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE))) {
-            throw new \InvalidArgumentException(sprintf('The disposition must be either "%s" or "%s".', self::DISPOSITION_ATTACHMENT, self::DISPOSITION_INLINE));
-        }
-
-        if ('' == $filenameFallback) {
-            $filenameFallback = $filename;
-        }
-
-        // filenameFallback is not ASCII.
-        if (!preg_match('/^[\x20-\x7e]*$/', $filenameFallback)) {
-            throw new \InvalidArgumentException('The filename fallback must only contain ASCII characters.');
-        }
-
-        // percent characters aren't safe in fallback.
-        if (false !== strpos($filenameFallback, '%')) {
-            throw new \InvalidArgumentException('The filename fallback cannot contain the "%" character.');
-        }
-
-        // path separators aren't allowed in either.
-        if (false !== strpos($filename, '/') || false !== strpos($filename, '\\') || false !== strpos($filenameFallback, '/') || false !== strpos($filenameFallback, '\\')) {
-            throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
-        }
-
-        $output = sprintf('%s; filename="%s"', $disposition, str_replace('"', '\\"', $filenameFallback));
-
-        if ($filename !== $filenameFallback) {
-            $output .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns the calculated value of the cache-control header.
-     *
-     * This considers several other headers and calculates or modifies the
-     * cache-control header to a sensible, conservative value.
-     *
-     * @return string
-     */
-    protected function computeCacheControlValue()
-    {
-        if (!$this->cacheControl && !$this->has('ETag') && !$this->has('Last-Modified') && !$this->has('Expires')) {
-            return 'no-cache';
-        }
-
-        if (!$this->cacheControl) {
-            // conservative by default
-            return 'private, must-revalidate';
-        }
-
-        $header = $this->getCacheControlHeader();
-        if (isset($this->cacheControl['public']) || isset($this->cacheControl['private'])) {
-            return $header;
-        }
-
-        // public if s-maxage is defined, private otherwise
-        if (!isset($this->cacheControl['s-maxage'])) {
-            return $header.', private';
-        }
-
-        return $header;
-    }
-}
diff --git a/vendor/symfony/http-foundation/ServerBag.php b/vendor/symfony/http-foundation/ServerBag.php
deleted file mode 100644
index fa1cb2f..0000000
--- a/vendor/symfony/http-foundation/ServerBag.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * ServerBag is a container for HTTP headers from the $_SERVER variable.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Robert Kiss <kepten@gmail.com>
- */
-class ServerBag extends ParameterBag
-{
-    /**
-     * Gets the HTTP headers.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        $headers = array();
-        $contentHeaders = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
-        foreach ($this->parameters as $key => $value) {
-            if (0 === strpos($key, 'HTTP_')) {
-                $headers[substr($key, 5)] = $value;
-            }
-            // CONTENT_* are not prefixed with HTTP_
-            elseif (isset($contentHeaders[$key])) {
-                $headers[$key] = $value;
-            }
-        }
-
-        if (isset($this->parameters['PHP_AUTH_USER'])) {
-            $headers['PHP_AUTH_USER'] = $this->parameters['PHP_AUTH_USER'];
-            $headers['PHP_AUTH_PW'] = isset($this->parameters['PHP_AUTH_PW']) ? $this->parameters['PHP_AUTH_PW'] : '';
-        } else {
-            /*
-             * php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
-             * For this workaround to work, add these lines to your .htaccess file:
-             * RewriteCond %{HTTP:Authorization} ^(.+)$
-             * RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-             *
-             * A sample .htaccess file:
-             * RewriteEngine On
-             * RewriteCond %{HTTP:Authorization} ^(.+)$
-             * RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-             * RewriteCond %{REQUEST_FILENAME} !-f
-             * RewriteRule ^(.*)$ app.php [QSA,L]
-             */
-
-            $authorizationHeader = null;
-            if (isset($this->parameters['HTTP_AUTHORIZATION'])) {
-                $authorizationHeader = $this->parameters['HTTP_AUTHORIZATION'];
-            } elseif (isset($this->parameters['REDIRECT_HTTP_AUTHORIZATION'])) {
-                $authorizationHeader = $this->parameters['REDIRECT_HTTP_AUTHORIZATION'];
-            }
-
-            if (null !== $authorizationHeader) {
-                if (0 === stripos($authorizationHeader, 'basic ')) {
-                    // Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW when authorization header is basic
-                    $exploded = explode(':', base64_decode(substr($authorizationHeader, 6)), 2);
-                    if (count($exploded) == 2) {
-                        list($headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']) = $exploded;
-                    }
-                } elseif (empty($this->parameters['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader, 'digest '))) {
-                    // In some circumstances PHP_AUTH_DIGEST needs to be set
-                    $headers['PHP_AUTH_DIGEST'] = $authorizationHeader;
-                    $this->parameters['PHP_AUTH_DIGEST'] = $authorizationHeader;
-                } elseif (0 === stripos($authorizationHeader, 'bearer ')) {
-                    /*
-                     * XXX: Since there is no PHP_AUTH_BEARER in PHP predefined variables,
-                     *      I'll just set $headers['AUTHORIZATION'] here.
-                     *      http://php.net/manual/en/reserved.variables.server.php
-                     */
-                    $headers['AUTHORIZATION'] = $authorizationHeader;
-                }
-            }
-        }
-
-        // PHP_AUTH_USER/PHP_AUTH_PW
-        if (isset($headers['PHP_AUTH_USER'])) {
-            $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']);
-        } elseif (isset($headers['PHP_AUTH_DIGEST'])) {
-            $headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST'];
-        }
-
-        return $headers;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php b/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php
deleted file mode 100644
index af292e3..0000000
--- a/vendor/symfony/http-foundation/Session/Attribute/AttributeBag.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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\Component\HttpFoundation\Session\Attribute;
-
-/**
- * This class relates to session attribute storage.
- */
-class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Countable
-{
-    private $name = 'attributes';
-
-    /**
-     * @var string
-     */
-    private $storageKey;
-
-    /**
-     * @var array
-     */
-    protected $attributes = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $storageKey The key used to store attributes in the session
-     */
-    public function __construct($storageKey = '_sf2_attributes')
-    {
-        $this->storageKey = $storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(array &$attributes)
-    {
-        $this->attributes = &$attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStorageKey()
-    {
-        return $this->storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($name, $default = null)
-    {
-        return array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function replace(array $attributes)
-    {
-        $this->attributes = array();
-        foreach ($attributes as $key => $value) {
-            $this->set($key, $value);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($name)
-    {
-        $retval = null;
-        if (array_key_exists($name, $this->attributes)) {
-            $retval = $this->attributes[$name];
-            unset($this->attributes[$name]);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $return = $this->attributes;
-        $this->attributes = array();
-
-        return $return;
-    }
-
-    /**
-     * Returns an iterator for attributes.
-     *
-     * @return \ArrayIterator An \ArrayIterator instance
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->attributes);
-    }
-
-    /**
-     * Returns the number of attributes.
-     *
-     * @return int The number of attributes
-     */
-    public function count()
-    {
-        return count($this->attributes);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php b/vendor/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php
deleted file mode 100644
index 0d8d179..0000000
--- a/vendor/symfony/http-foundation/Session/Attribute/AttributeBagInterface.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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\Component\HttpFoundation\Session\Attribute;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-
-/**
- * Attributes store.
- *
- * @author Drak <drak@zikula.org>
- */
-interface AttributeBagInterface extends SessionBagInterface
-{
-    /**
-     * Checks if an attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
-     */
-    public function has($name);
-
-    /**
-     * Returns an attribute.
-     *
-     * @param string $name    The attribute name
-     * @param mixed  $default The default value if not found
-     *
-     * @return mixed
-     */
-    public function get($name, $default = null);
-
-    /**
-     * Sets an attribute.
-     *
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function set($name, $value);
-
-    /**
-     * Returns attributes.
-     *
-     * @return array Attributes
-     */
-    public function all();
-
-    /**
-     * Sets attributes.
-     *
-     * @param array $attributes Attributes
-     */
-    public function replace(array $attributes);
-
-    /**
-     * Removes an attribute.
-     *
-     * @param string $name
-     *
-     * @return mixed The removed value or null when it does not exist
-     */
-    public function remove($name);
-}
diff --git a/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php b/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
deleted file mode 100644
index 68cecf6..0000000
--- a/vendor/symfony/http-foundation/Session/Attribute/NamespacedAttributeBag.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?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\Component\HttpFoundation\Session\Attribute;
-
-/**
- * This class provides structured storage of session attributes using
- * a name spacing character in the key.
- *
- * @author Drak <drak@zikula.org>
- */
-class NamespacedAttributeBag extends AttributeBag
-{
-    /**
-     * Namespace character.
-     *
-     * @var string
-     */
-    private $namespaceCharacter;
-
-    /**
-     * Constructor.
-     *
-     * @param string $storageKey         Session storage key.
-     * @param string $namespaceCharacter Namespace character to use in keys.
-     */
-    public function __construct($storageKey = '_sf2_attributes', $namespaceCharacter = '/')
-    {
-        $this->namespaceCharacter = $namespaceCharacter;
-        parent::__construct($storageKey);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($name)
-    {
-        // reference mismatch: if fixed, re-introduced in array_key_exists; keep as it is
-        $attributes = $this->resolveAttributePath($name);
-        $name = $this->resolveKey($name);
-
-        if (null === $attributes) {
-            return false;
-        }
-
-        return array_key_exists($name, $attributes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($name, $default = null)
-    {
-        // reference mismatch: if fixed, re-introduced in array_key_exists; keep as it is
-        $attributes = $this->resolveAttributePath($name);
-        $name = $this->resolveKey($name);
-
-        if (null === $attributes) {
-            return $default;
-        }
-
-        return array_key_exists($name, $attributes) ? $attributes[$name] : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($name, $value)
-    {
-        $attributes = &$this->resolveAttributePath($name, true);
-        $name = $this->resolveKey($name);
-        $attributes[$name] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($name)
-    {
-        $retval = null;
-        $attributes = &$this->resolveAttributePath($name);
-        $name = $this->resolveKey($name);
-        if (null !== $attributes && array_key_exists($name, $attributes)) {
-            $retval = $attributes[$name];
-            unset($attributes[$name]);
-        }
-
-        return $retval;
-    }
-
-    /**
-     * Resolves a path in attributes property and returns it as a reference.
-     *
-     * This method allows structured namespacing of session attributes.
-     *
-     * @param string $name         Key name
-     * @param bool   $writeContext Write context, default false
-     *
-     * @return array
-     */
-    protected function &resolveAttributePath($name, $writeContext = false)
-    {
-        $array = &$this->attributes;
-        $name = (strpos($name, $this->namespaceCharacter) === 0) ? substr($name, 1) : $name;
-
-        // Check if there is anything to do, else return
-        if (!$name) {
-            return $array;
-        }
-
-        $parts = explode($this->namespaceCharacter, $name);
-        if (count($parts) < 2) {
-            if (!$writeContext) {
-                return $array;
-            }
-
-            $array[$parts[0]] = array();
-
-            return $array;
-        }
-
-        unset($parts[count($parts) - 1]);
-
-        foreach ($parts as $part) {
-            if (null !== $array && !array_key_exists($part, $array)) {
-                $array[$part] = $writeContext ? array() : null;
-            }
-
-            $array = &$array[$part];
-        }
-
-        return $array;
-    }
-
-    /**
-     * Resolves the key from the name.
-     *
-     * This is the last part in a dot separated string.
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function resolveKey($name)
-    {
-        if (false !== $pos = strrpos($name, $this->namespaceCharacter)) {
-            $name = substr($name, $pos + 1);
-        }
-
-        return $name;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php b/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php
deleted file mode 100644
index b9de5ce..0000000
--- a/vendor/symfony/http-foundation/Session/Flash/AutoExpireFlashBag.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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\Component\HttpFoundation\Session\Flash;
-
-/**
- * AutoExpireFlashBag flash message container.
- *
- * @author Drak <drak@zikula.org>
- */
-class AutoExpireFlashBag implements FlashBagInterface
-{
-    private $name = 'flashes';
-
-    /**
-     * Flash messages.
-     *
-     * @var array
-     */
-    private $flashes = array('display' => array(), 'new' => array());
-
-    /**
-     * The storage key for flashes in the session.
-     *
-     * @var string
-     */
-    private $storageKey;
-
-    /**
-     * Constructor.
-     *
-     * @param string $storageKey The key used to store flashes in the session.
-     */
-    public function __construct($storageKey = '_sf2_flashes')
-    {
-        $this->storageKey = $storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(array &$flashes)
-    {
-        $this->flashes = &$flashes;
-
-        // The logic: messages from the last request will be stored in new, so we move them to previous
-        // This request we will show what is in 'display'.  What is placed into 'new' this time round will
-        // be moved to display next time round.
-        $this->flashes['display'] = array_key_exists('new', $this->flashes) ? $this->flashes['new'] : array();
-        $this->flashes['new'] = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($type, $message)
-    {
-        $this->flashes['new'][$type][] = $message;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function peek($type, array $default = array())
-    {
-        return $this->has($type) ? $this->flashes['display'][$type] : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function peekAll()
-    {
-        return array_key_exists('display', $this->flashes) ? (array) $this->flashes['display'] : array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($type, array $default = array())
-    {
-        $return = $default;
-
-        if (!$this->has($type)) {
-            return $return;
-        }
-
-        if (isset($this->flashes['display'][$type])) {
-            $return = $this->flashes['display'][$type];
-            unset($this->flashes['display'][$type]);
-        }
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        $return = $this->flashes['display'];
-        $this->flashes = array('new' => array(), 'display' => array());
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setAll(array $messages)
-    {
-        $this->flashes['new'] = $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($type, $messages)
-    {
-        $this->flashes['new'][$type] = (array) $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($type)
-    {
-        return array_key_exists($type, $this->flashes['display']) && $this->flashes['display'][$type];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keys()
-    {
-        return array_keys($this->flashes['display']);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStorageKey()
-    {
-        return $this->storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        return $this->all();
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Flash/FlashBag.php b/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
deleted file mode 100644
index 0da7715..0000000
--- a/vendor/symfony/http-foundation/Session/Flash/FlashBag.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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\Component\HttpFoundation\Session\Flash;
-
-/**
- * FlashBag flash message container.
- *
- * \IteratorAggregate implementation is deprecated and will be removed in 3.0.
- *
- * @author Drak <drak@zikula.org>
- */
-class FlashBag implements FlashBagInterface, \IteratorAggregate
-{
-    private $name = 'flashes';
-
-    /**
-     * Flash messages.
-     *
-     * @var array
-     */
-    private $flashes = array();
-
-    /**
-     * The storage key for flashes in the session.
-     *
-     * @var string
-     */
-    private $storageKey;
-
-    /**
-     * Constructor.
-     *
-     * @param string $storageKey The key used to store flashes in the session.
-     */
-    public function __construct($storageKey = '_sf2_flashes')
-    {
-        $this->storageKey = $storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(array &$flashes)
-    {
-        $this->flashes = &$flashes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($type, $message)
-    {
-        $this->flashes[$type][] = $message;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function peek($type, array $default = array())
-    {
-        return $this->has($type) ? $this->flashes[$type] : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function peekAll()
-    {
-        return $this->flashes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($type, array $default = array())
-    {
-        if (!$this->has($type)) {
-            return $default;
-        }
-
-        $return = $this->flashes[$type];
-
-        unset($this->flashes[$type]);
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        $return = $this->peekAll();
-        $this->flashes = array();
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($type, $messages)
-    {
-        $this->flashes[$type] = (array) $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setAll(array $messages)
-    {
-        $this->flashes = $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($type)
-    {
-        return array_key_exists($type, $this->flashes) && $this->flashes[$type];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function keys()
-    {
-        return array_keys($this->flashes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStorageKey()
-    {
-        return $this->storageKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        return $this->all();
-    }
-
-    /**
-     * Returns an iterator for flashes.
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     *
-     * @return \ArrayIterator An \ArrayIterator instance
-     */
-    public function getIterator()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return new \ArrayIterator($this->all());
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php b/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php
deleted file mode 100644
index be79d9d..0000000
--- a/vendor/symfony/http-foundation/Session/Flash/FlashBagInterface.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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\Component\HttpFoundation\Session\Flash;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-
-/**
- * FlashBagInterface.
- *
- * @author Drak <drak@zikula.org>
- */
-interface FlashBagInterface extends SessionBagInterface
-{
-    /**
-     * Adds a flash message for type.
-     *
-     * @param string $type
-     * @param string $message
-     */
-    public function add($type, $message);
-
-    /**
-     * Registers a message for a given type.
-     *
-     * @param string       $type
-     * @param string|array $message
-     */
-    public function set($type, $message);
-
-    /**
-     * Gets flash messages for a given type.
-     *
-     * @param string $type    Message category type.
-     * @param array  $default Default value if $type does not exist.
-     *
-     * @return array
-     */
-    public function peek($type, array $default = array());
-
-    /**
-     * Gets all flash messages.
-     *
-     * @return array
-     */
-    public function peekAll();
-
-    /**
-     * Gets and clears flash from the stack.
-     *
-     * @param string $type
-     * @param array  $default Default value if $type does not exist.
-     *
-     * @return array
-     */
-    public function get($type, array $default = array());
-
-    /**
-     * Gets and clears flashes from the stack.
-     *
-     * @return array
-     */
-    public function all();
-
-    /**
-     * Sets all flash messages.
-     */
-    public function setAll(array $messages);
-
-    /**
-     * Has flash messages for a given type?
-     *
-     * @param string $type
-     *
-     * @return bool
-     */
-    public function has($type);
-
-    /**
-     * Returns a list of all defined types.
-     *
-     * @return array
-     */
-    public function keys();
-}
diff --git a/vendor/symfony/http-foundation/Session/Session.php b/vendor/symfony/http-foundation/Session/Session.php
deleted file mode 100644
index b743fe1..0000000
--- a/vendor/symfony/http-foundation/Session/Session.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?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\Component\HttpFoundation\Session;
-
-use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
-use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag;
-use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBag;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-
-/**
- * Session.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Drak <drak@zikula.org>
- */
-class Session implements SessionInterface, \IteratorAggregate, \Countable
-{
-    /**
-     * Storage driver.
-     *
-     * @var SessionStorageInterface
-     */
-    protected $storage;
-
-    /**
-     * @var string
-     */
-    private $flashName;
-
-    /**
-     * @var string
-     */
-    private $attributeName;
-
-    /**
-     * Constructor.
-     *
-     * @param SessionStorageInterface $storage    A SessionStorageInterface instance.
-     * @param AttributeBagInterface   $attributes An AttributeBagInterface instance, (defaults null for default AttributeBag)
-     * @param FlashBagInterface       $flashes    A FlashBagInterface instance (defaults null for default FlashBag)
-     */
-    public function __construct(SessionStorageInterface $storage = null, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null)
-    {
-        $this->storage = $storage ?: new NativeSessionStorage();
-
-        $attributes = $attributes ?: new AttributeBag();
-        $this->attributeName = $attributes->getName();
-        $this->registerBag($attributes);
-
-        $flashes = $flashes ?: new FlashBag();
-        $this->flashName = $flashes->getName();
-        $this->registerBag($flashes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        return $this->storage->start();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($name)
-    {
-        return $this->storage->getBag($this->attributeName)->has($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($name, $default = null)
-    {
-        return $this->storage->getBag($this->attributeName)->get($name, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($name, $value)
-    {
-        $this->storage->getBag($this->attributeName)->set($name, $value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all()
-    {
-        return $this->storage->getBag($this->attributeName)->all();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function replace(array $attributes)
-    {
-        $this->storage->getBag($this->attributeName)->replace($attributes);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($name)
-    {
-        return $this->storage->getBag($this->attributeName)->remove($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $this->storage->getBag($this->attributeName)->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStarted()
-    {
-        return $this->storage->isStarted();
-    }
-
-    /**
-     * Returns an iterator for attributes.
-     *
-     * @return \ArrayIterator An \ArrayIterator instance
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->storage->getBag($this->attributeName)->all());
-    }
-
-    /**
-     * Returns the number of attributes.
-     *
-     * @return int The number of attributes
-     */
-    public function count()
-    {
-        return count($this->storage->getBag($this->attributeName)->all());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function invalidate($lifetime = null)
-    {
-        $this->storage->clear();
-
-        return $this->migrate(true, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function migrate($destroy = false, $lifetime = null)
-    {
-        return $this->storage->regenerate($destroy, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save()
-    {
-        $this->storage->save();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return $this->storage->getId();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setId($id)
-    {
-        $this->storage->setId($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->storage->getName();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setName($name)
-    {
-        $this->storage->setName($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataBag()
-    {
-        return $this->storage->getMetadataBag();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerBag(SessionBagInterface $bag)
-    {
-        $this->storage->registerBag($bag);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBag($name)
-    {
-        return $this->storage->getBag($name);
-    }
-
-    /**
-     * Gets the flashbag interface.
-     *
-     * @return FlashBagInterface
-     */
-    public function getFlashBag()
-    {
-        return $this->getBag($this->flashName);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/SessionBagInterface.php b/vendor/symfony/http-foundation/Session/SessionBagInterface.php
deleted file mode 100644
index 182a47d..0000000
--- a/vendor/symfony/http-foundation/Session/SessionBagInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Component\HttpFoundation\Session;
-
-/**
- * Session Bag store.
- *
- * @author Drak <drak@zikula.org>
- */
-interface SessionBagInterface
-{
-    /**
-     * Gets this bag's name.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Initializes the Bag.
-     *
-     * @param array $array
-     */
-    public function initialize(array &$array);
-
-    /**
-     * Gets the storage key for this bag.
-     *
-     * @return string
-     */
-    public function getStorageKey();
-
-    /**
-     * Clears out data from bag.
-     *
-     * @return mixed Whatever data was contained.
-     */
-    public function clear();
-}
diff --git a/vendor/symfony/http-foundation/Session/SessionInterface.php b/vendor/symfony/http-foundation/Session/SessionInterface.php
deleted file mode 100644
index e2b6584..0000000
--- a/vendor/symfony/http-foundation/Session/SessionInterface.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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\Component\HttpFoundation\Session;
-
-use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
-
-/**
- * Interface for the session.
- *
- * @author Drak <drak@zikula.org>
- */
-interface SessionInterface
-{
-    /**
-     * Starts the session storage.
-     *
-     * @return bool True if session started.
-     *
-     * @throws \RuntimeException If session fails to start.
-     */
-    public function start();
-
-    /**
-     * Returns the session ID.
-     *
-     * @return string The session ID.
-     */
-    public function getId();
-
-    /**
-     * Sets the session ID.
-     *
-     * @param string $id
-     */
-    public function setId($id);
-
-    /**
-     * Returns the session name.
-     *
-     * @return mixed The session name.
-     */
-    public function getName();
-
-    /**
-     * Sets the session name.
-     *
-     * @param string $name
-     */
-    public function setName($name);
-
-    /**
-     * Invalidates the current session.
-     *
-     * Clears all session attributes and flashes and regenerates the
-     * session and deletes the old session from persistence.
-     *
-     * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                      will leave the system settings unchanged, 0 sets the cookie
-     *                      to expire with browser session. Time is in seconds, and is
-     *                      not a Unix timestamp.
-     *
-     * @return bool True if session invalidated, false if error.
-     */
-    public function invalidate($lifetime = null);
-
-    /**
-     * Migrates the current session to a new session id while maintaining all
-     * session attributes.
-     *
-     * @param bool $destroy  Whether to delete the old session or leave it to garbage collection.
-     * @param int  $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                       will leave the system settings unchanged, 0 sets the cookie
-     *                       to expire with browser session. Time is in seconds, and is
-     *                       not a Unix timestamp.
-     *
-     * @return bool True if session migrated, false if error.
-     */
-    public function migrate($destroy = false, $lifetime = null);
-
-    /**
-     * Force the session to be saved and closed.
-     *
-     * This method is generally not required for real sessions as
-     * the session will be automatically saved at the end of
-     * code execution.
-     */
-    public function save();
-
-    /**
-     * Checks if an attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
-     */
-    public function has($name);
-
-    /**
-     * Returns an attribute.
-     *
-     * @param string $name    The attribute name
-     * @param mixed  $default The default value if not found.
-     *
-     * @return mixed
-     */
-    public function get($name, $default = null);
-
-    /**
-     * Sets an attribute.
-     *
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function set($name, $value);
-
-    /**
-     * Returns attributes.
-     *
-     * @return array Attributes
-     */
-    public function all();
-
-    /**
-     * Sets attributes.
-     *
-     * @param array $attributes Attributes
-     */
-    public function replace(array $attributes);
-
-    /**
-     * Removes an attribute.
-     *
-     * @param string $name
-     *
-     * @return mixed The removed value or null when it does not exist
-     */
-    public function remove($name);
-
-    /**
-     * Clears all attributes.
-     */
-    public function clear();
-
-    /**
-     * Checks if the session was started.
-     *
-     * @return bool
-     */
-    public function isStarted();
-
-    /**
-     * Registers a SessionBagInterface with the session.
-     *
-     * @param SessionBagInterface $bag
-     */
-    public function registerBag(SessionBagInterface $bag);
-
-    /**
-     * Gets a bag instance by name.
-     *
-     * @param string $name
-     *
-     * @return SessionBagInterface
-     */
-    public function getBag($name);
-
-    /**
-     * Gets session meta.
-     *
-     * @return MetadataBag
-     */
-    public function getMetadataBag();
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
deleted file mode 100644
index 111541d..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-@trigger_error('The '.__NAMESPACE__.'\LegacyPdoSessionHandler class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler class instead.', E_USER_DEPRECATED);
-
-/**
- * Session handler using a PDO connection to read and write data.
- *
- * Session data is a binary string that can contain non-printable characters like the null byte.
- * For this reason this handler base64 encodes the data to be able to save it in a character column.
- *
- * This version of the PdoSessionHandler does NOT implement locking. So concurrent requests to the
- * same session can result in data loss due to race conditions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Michael Williams <michael.williams@funsational.com>
- * @author Tobias Schultze <http://tobion.de>
- *
- * @deprecated since version 2.6, to be removed in 3.0. Use
- *             {@link PdoSessionHandler} instead.
- */
-class LegacyPdoSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \PDO PDO instance
-     */
-    private $pdo;
-
-    /**
-     * @var string Table name
-     */
-    private $table;
-
-    /**
-     * @var string Column for session id
-     */
-    private $idCol;
-
-    /**
-     * @var string Column for session data
-     */
-    private $dataCol;
-
-    /**
-     * @var string Column for timestamp
-     */
-    private $timeCol;
-
-    /**
-     * Constructor.
-     *
-     * List of available options:
-     *  * db_table: The name of the table [required]
-     *  * db_id_col: The column where to store the session id [default: sess_id]
-     *  * db_data_col: The column where to store the session data [default: sess_data]
-     *  * db_time_col: The column where to store the timestamp [default: sess_time]
-     *
-     * @param \PDO  $pdo       A \PDO instance
-     * @param array $dbOptions An associative array of DB options
-     *
-     * @throws \InvalidArgumentException When "db_table" option is not provided
-     */
-    public function __construct(\PDO $pdo, array $dbOptions = array())
-    {
-        if (!array_key_exists('db_table', $dbOptions)) {
-            throw new \InvalidArgumentException('You must provide the "db_table" option for a PdoSessionStorage.');
-        }
-        if (\PDO::ERRMODE_EXCEPTION !== $pdo->getAttribute(\PDO::ATTR_ERRMODE)) {
-            throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
-        }
-
-        $this->pdo = $pdo;
-        $dbOptions = array_merge(array(
-            'db_id_col' => 'sess_id',
-            'db_data_col' => 'sess_data',
-            'db_time_col' => 'sess_time',
-        ), $dbOptions);
-
-        $this->table = $dbOptions['db_table'];
-        $this->idCol = $dbOptions['db_id_col'];
-        $this->dataCol = $dbOptions['db_data_col'];
-        $this->timeCol = $dbOptions['db_time_col'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        // delete the record associated with this id
-        $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
-
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $stmt->execute();
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete a session: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // delete the session records that have expired
-        $sql = "DELETE FROM $this->table WHERE $this->timeCol < :time";
-
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindValue(':time', time() - $maxlifetime, \PDO::PARAM_INT);
-            $stmt->execute();
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to delete expired sessions: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        $sql = "SELECT $this->dataCol FROM $this->table WHERE $this->idCol = :id";
-
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $stmt->execute();
-
-            // We use fetchAll instead of fetchColumn to make sure the DB cursor gets closed
-            $sessionRows = $stmt->fetchAll(\PDO::FETCH_NUM);
-
-            if ($sessionRows) {
-                return base64_decode($sessionRows[0][0]);
-            }
-
-            return '';
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to read the session data: %s', $e->getMessage()), 0, $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        $encoded = base64_encode($data);
-
-        try {
-            // We use a single MERGE SQL query when supported by the database.
-            $mergeSql = $this->getMergeSql();
-
-            if (null !== $mergeSql) {
-                $mergeStmt = $this->pdo->prepare($mergeSql);
-                $mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                $mergeStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-                $mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                $mergeStmt->execute();
-
-                return true;
-            }
-
-            $updateStmt = $this->pdo->prepare(
-                "UPDATE $this->table SET $this->dataCol = :data, $this->timeCol = :time WHERE $this->idCol = :id"
-            );
-            $updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $updateStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-            $updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-            $updateStmt->execute();
-
-            // When MERGE is not supported, like in Postgres, we have to use this approach that can result in
-            // duplicate key errors when the same session is written simultaneously. We can just catch such an
-            // error and re-execute the update. This is similar to a serializable transaction with retry logic
-            // on serialization failures but without the overhead and without possible false positives due to
-            // longer gap locking.
-            if (!$updateStmt->rowCount()) {
-                try {
-                    $insertStmt = $this->pdo->prepare(
-                        "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)"
-                    );
-                    $insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                    $insertStmt->bindParam(':data', $encoded, \PDO::PARAM_STR);
-                    $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                    $insertStmt->execute();
-                } catch (\PDOException $e) {
-                    // Handle integrity violation SQLSTATE 23000 (or a subclass like 23505 in Postgres) for duplicate keys
-                    if (0 === strpos($e->getCode(), '23')) {
-                        $updateStmt->execute();
-                    } else {
-                        throw $e;
-                    }
-                }
-            }
-        } catch (\PDOException $e) {
-            throw new \RuntimeException(sprintf('PDOException was thrown when trying to write the session data: %s', $e->getMessage()), 0, $e);
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database.
-     *
-     * @return string|null The SQL string or null when not supported
-     */
-    private function getMergeSql()
-    {
-        $driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-
-        switch ($driver) {
-            case 'mysql':
-                return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->timeCol = VALUES($this->timeCol)";
-            case 'oci':
-                // DUAL is Oracle specific dummy table
-                return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) ".
-                "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time";
-            case 'sqlsrv' === $driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
-                // MERGE is only available since SQL Server 2008 and must be terminated by semicolon
-                // It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
-                return "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = :id) ".
-                "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->timeCol = :time;";
-            case 'sqlite':
-                return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
-        }
-    }
-
-    /**
-     * Return a PDO instance.
-     *
-     * @return \PDO
-     */
-    protected function getConnection()
-    {
-        return $this->pdo;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
deleted file mode 100644
index f6f99ed..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcacheSessionHandler.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * MemcacheSessionHandler.
- *
- * @author Drak <drak@zikula.org>
- */
-class MemcacheSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \Memcache Memcache driver.
-     */
-    private $memcache;
-
-    /**
-     * @var int Time to live in seconds
-     */
-    private $ttl;
-
-    /**
-     * @var string Key prefix for shared environments.
-     */
-    private $prefix;
-
-    /**
-     * Constructor.
-     *
-     * List of available options:
-     *  * prefix: The prefix to use for the memcache keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
-     *
-     * @param \Memcache $memcache A \Memcache instance
-     * @param array     $options  An associative array of Memcache options
-     *
-     * @throws \InvalidArgumentException When unsupported options are passed
-     */
-    public function __construct(\Memcache $memcache, array $options = array())
-    {
-        if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
-            throw new \InvalidArgumentException(sprintf(
-                'The following options are not supported "%s"', implode(', ', $diff)
-            ));
-        }
-
-        $this->memcache = $memcache;
-        $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
-        $this->prefix = isset($options['prefix']) ? $options['prefix'] : 'sf2s';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return $this->memcache->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return $this->memcache->get($this->prefix.$sessionId) ?: '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return $this->memcache->set($this->prefix.$sessionId, $data, 0, time() + $this->ttl);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return $this->memcache->delete($this->prefix.$sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // not required here because memcache will auto expire the records anyhow.
-        return true;
-    }
-
-    /**
-     * Return a Memcache instance.
-     *
-     * @return \Memcache
-     */
-    protected function getMemcache()
-    {
-        return $this->memcache;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
deleted file mode 100644
index d87bef8..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * MemcachedSessionHandler.
- *
- * Memcached based session storage handler based on the Memcached class
- * provided by the PHP memcached extension.
- *
- * @see http://php.net/memcached
- *
- * @author Drak <drak@zikula.org>
- */
-class MemcachedSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \Memcached Memcached driver.
-     */
-    private $memcached;
-
-    /**
-     * @var int Time to live in seconds
-     */
-    private $ttl;
-
-    /**
-     * @var string Key prefix for shared environments.
-     */
-    private $prefix;
-
-    /**
-     * Constructor.
-     *
-     * List of available options:
-     *  * prefix: The prefix to use for the memcached keys in order to avoid collision
-     *  * expiretime: The time to live in seconds
-     *
-     * @param \Memcached $memcached A \Memcached instance
-     * @param array      $options   An associative array of Memcached options
-     *
-     * @throws \InvalidArgumentException When unsupported options are passed
-     */
-    public function __construct(\Memcached $memcached, array $options = array())
-    {
-        $this->memcached = $memcached;
-
-        if ($diff = array_diff(array_keys($options), array('prefix', 'expiretime'))) {
-            throw new \InvalidArgumentException(sprintf(
-                'The following options are not supported "%s"', implode(', ', $diff)
-            ));
-        }
-
-        $this->ttl = isset($options['expiretime']) ? (int) $options['expiretime'] : 86400;
-        $this->prefix = isset($options['prefix']) ? $options['prefix'] : 'sf2s';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return $this->memcached->get($this->prefix.$sessionId) ?: '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return $this->memcached->set($this->prefix.$sessionId, $data, time() + $this->ttl);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return $this->memcached->delete($this->prefix.$sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // not required here because memcached will auto expire the records anyhow.
-        return true;
-    }
-
-    /**
-     * Return a Memcached instance.
-     *
-     * @return \Memcached
-     */
-    protected function getMemcached()
-    {
-        return $this->memcached;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
deleted file mode 100644
index f1df25d..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * MongoDB session handler.
- *
- * @author Markus Bachmann <markus.bachmann@bachi.biz>
- */
-class MongoDbSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \Mongo
-     */
-    private $mongo;
-
-    /**
-     * @var \MongoCollection
-     */
-    private $collection;
-
-    /**
-     * @var array
-     */
-    private $options;
-
-    /**
-     * Constructor.
-     *
-     * List of available options:
-     *  * database: The name of the database [required]
-     *  * collection: The name of the collection [required]
-     *  * id_field: The field name for storing the session id [default: _id]
-     *  * data_field: The field name for storing the session data [default: data]
-     *  * time_field: The field name for storing the timestamp [default: time]
-     *  * expiry_field: The field name for storing the expiry-timestamp [default: expires_at]
-     *
-     * It is strongly recommended to put an index on the `expiry_field` for
-     * garbage-collection. Alternatively it's possible to automatically expire
-     * the sessions in the database as described below:
-     *
-     * A TTL collections can be used on MongoDB 2.2+ to cleanup expired sessions
-     * automatically. Such an index can for example look like this:
-     *
-     *     db.<session-collection>.ensureIndex(
-     *         { "<expiry-field>": 1 },
-     *         { "expireAfterSeconds": 0 }
-     *     )
-     *
-     * More details on: http://docs.mongodb.org/manual/tutorial/expire-data/
-     *
-     * If you use such an index, you can drop `gc_probability` to 0 since
-     * no garbage-collection is required.
-     *
-     * @param \Mongo|\MongoClient $mongo   A MongoClient or Mongo instance
-     * @param array               $options An associative array of field options
-     *
-     * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided
-     * @throws \InvalidArgumentException When "database" or "collection" not provided
-     */
-    public function __construct($mongo, array $options)
-    {
-        if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
-            throw new \InvalidArgumentException('MongoClient or Mongo instance required');
-        }
-
-        if (!isset($options['database']) || !isset($options['collection'])) {
-            throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');
-        }
-
-        $this->mongo = $mongo;
-
-        $this->options = array_merge(array(
-            'id_field' => '_id',
-            'data_field' => 'data',
-            'time_field' => 'time',
-            'expiry_field' => 'expires_at',
-        ), $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        $this->getCollection()->remove(array(
-            $this->options['id_field'] => $sessionId,
-        ));
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        $this->getCollection()->remove(array(
-            $this->options['expiry_field'] => array('$lt' => new \MongoDate()),
-        ));
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        $expiry = new \MongoDate(time() + (int) ini_get('session.gc_maxlifetime'));
-
-        $fields = array(
-            $this->options['data_field'] => new \MongoBinData($data, \MongoBinData::BYTE_ARRAY),
-            $this->options['time_field'] => new \MongoDate(),
-            $this->options['expiry_field'] => $expiry,
-        );
-
-        $this->getCollection()->update(
-            array($this->options['id_field'] => $sessionId),
-            array('$set' => $fields),
-            array('upsert' => true, 'multiple' => false)
-        );
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        $dbData = $this->getCollection()->findOne(array(
-            $this->options['id_field'] => $sessionId,
-            $this->options['expiry_field'] => array('$gte' => new \MongoDate()),
-        ));
-
-        return null === $dbData ? '' : $dbData[$this->options['data_field']]->bin;
-    }
-
-    /**
-     * Return a "MongoCollection" instance.
-     *
-     * @return \MongoCollection
-     */
-    private function getCollection()
-    {
-        if (null === $this->collection) {
-            $this->collection = $this->mongo->selectCollection($this->options['database'], $this->options['collection']);
-        }
-
-        return $this->collection;
-    }
-
-    /**
-     * Return a Mongo instance.
-     *
-     * @return \Mongo
-     */
-    protected function getMongo()
-    {
-        return $this->mongo;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
deleted file mode 100644
index f39235c..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * NativeFileSessionHandler.
- *
- * Native session handler using PHP's built in file storage.
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeFileSessionHandler extends NativeSessionHandler
-{
-    /**
-     * Constructor.
-     *
-     * @param string $savePath Path of directory to save session files.
-     *                         Default null will leave setting as defined by PHP.
-     *                         '/path', 'N;/path', or 'N;octal-mode;/path
-     *
-     * @see http://php.net/session.configuration.php#ini.session.save-path for further details.
-     *
-     * @throws \InvalidArgumentException On invalid $savePath
-     */
-    public function __construct($savePath = null)
-    {
-        if (null === $savePath) {
-            $savePath = ini_get('session.save_path');
-        }
-
-        $baseDir = $savePath;
-
-        if ($count = substr_count($savePath, ';')) {
-            if ($count > 2) {
-                throw new \InvalidArgumentException(sprintf('Invalid argument $savePath \'%s\'', $savePath));
-            }
-
-            // characters after last ';' are the path
-            $baseDir = ltrim(strrchr($savePath, ';'), ';');
-        }
-
-        if ($baseDir && !is_dir($baseDir)) {
-            mkdir($baseDir, 0777, true);
-        }
-
-        ini_set('session.save_path', $savePath);
-        ini_set('session.save_handler', 'files');
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
deleted file mode 100644
index 95d5cdb..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NativeSessionHandler.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-// Adds SessionHandler functionality if available.
-// @see http://php.net/sessionhandler
-if (PHP_VERSION_ID >= 50400) {
-    class NativeSessionHandler extends \SessionHandler
-    {
-    }
-} else {
-    class NativeSessionHandler
-    {
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
deleted file mode 100644
index 1516d43..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * NullSessionHandler.
- *
- * Can be used in unit testing or in a situations where persisted sessions are not desired.
- *
- * @author Drak <drak@zikula.org>
- */
-class NullSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        return true;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
deleted file mode 100644
index 48e81ee..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php
+++ /dev/null
@@ -1,695 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * Session handler using a PDO connection to read and write data.
- *
- * It works with MySQL, PostgreSQL, Oracle, SQL Server and SQLite and implements
- * different locking strategies to handle concurrent access to the same session.
- * Locking is necessary to prevent loss of data due to race conditions and to keep
- * the session data consistent between read() and write(). With locking, requests
- * for the same session will wait until the other one finished writing. For this
- * reason it's best practice to close a session as early as possible to improve
- * concurrency. PHPs internal files session handler also implements locking.
- *
- * Attention: Since SQLite does not support row level locks but locks the whole database,
- * it means only one session can be accessed at a time. Even different sessions would wait
- * for another to finish. So saving session in SQLite should only be considered for
- * development or prototypes.
- *
- * Session data is a binary string that can contain non-printable characters like the null byte.
- * For this reason it must be saved in a binary column in the database like BLOB in MySQL.
- * Saving it in a character column could corrupt the data. You can use createTable()
- * to initialize a correctly defined table.
- *
- * @see http://php.net/sessionhandlerinterface
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Michael Williams <michael.williams@funsational.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class PdoSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * No locking is done. This means sessions are prone to loss of data due to
-     * race conditions of concurrent requests to the same session. The last session
-     * write will win in this case. It might be useful when you implement your own
-     * logic to deal with this like an optimistic approach.
-     */
-    const LOCK_NONE = 0;
-
-    /**
-     * Creates an application-level lock on a session. The disadvantage is that the
-     * lock is not enforced by the database and thus other, unaware parts of the
-     * application could still concurrently modify the session. The advantage is it
-     * does not require a transaction.
-     * This mode is not available for SQLite and not yet implemented for oci and sqlsrv.
-     */
-    const LOCK_ADVISORY = 1;
-
-    /**
-     * Issues a real row lock. Since it uses a transaction between opening and
-     * closing a session, you have to be careful when you use same database connection
-     * that you also use for your application logic. This mode is the default because
-     * it's the only reliable solution across DBMSs.
-     */
-    const LOCK_TRANSACTIONAL = 2;
-
-    /**
-     * @var \PDO|null PDO instance or null when not connected yet
-     */
-    private $pdo;
-
-    /**
-     * @var string|null|false DSN string or null for session.save_path or false when lazy connection disabled
-     */
-    private $dsn = false;
-
-    /**
-     * @var string Database driver
-     */
-    private $driver;
-
-    /**
-     * @var string Table name
-     */
-    private $table = 'sessions';
-
-    /**
-     * @var string Column for session id
-     */
-    private $idCol = 'sess_id';
-
-    /**
-     * @var string Column for session data
-     */
-    private $dataCol = 'sess_data';
-
-    /**
-     * @var string Column for lifetime
-     */
-    private $lifetimeCol = 'sess_lifetime';
-
-    /**
-     * @var string Column for timestamp
-     */
-    private $timeCol = 'sess_time';
-
-    /**
-     * @var string Username when lazy-connect
-     */
-    private $username = '';
-
-    /**
-     * @var string Password when lazy-connect
-     */
-    private $password = '';
-
-    /**
-     * @var array Connection options when lazy-connect
-     */
-    private $connectionOptions = array();
-
-    /**
-     * @var int The strategy for locking, see constants
-     */
-    private $lockMode = self::LOCK_TRANSACTIONAL;
-
-    /**
-     * It's an array to support multiple reads before closing which is manual, non-standard usage.
-     *
-     * @var \PDOStatement[] An array of statements to release advisory locks
-     */
-    private $unlockStatements = array();
-
-    /**
-     * @var bool True when the current session exists but expired according to session.gc_maxlifetime
-     */
-    private $sessionExpired = false;
-
-    /**
-     * @var bool Whether a transaction is active
-     */
-    private $inTransaction = false;
-
-    /**
-     * @var bool Whether gc() has been called
-     */
-    private $gcCalled = false;
-
-    /**
-     * Constructor.
-     *
-     * You can either pass an existing database connection as PDO instance or
-     * pass a DSN string that will be used to lazy-connect to the database
-     * when the session is actually used. Furthermore it's possible to pass null
-     * which will then use the session.save_path ini setting as PDO DSN parameter.
-     *
-     * List of available options:
-     *  * db_table: The name of the table [default: sessions]
-     *  * db_id_col: The column where to store the session id [default: sess_id]
-     *  * db_data_col: The column where to store the session data [default: sess_data]
-     *  * db_lifetime_col: The column where to store the lifetime [default: sess_lifetime]
-     *  * db_time_col: The column where to store the timestamp [default: sess_time]
-     *  * db_username: The username when lazy-connect [default: '']
-     *  * db_password: The password when lazy-connect [default: '']
-     *  * db_connection_options: An array of driver-specific connection options [default: array()]
-     *  * lock_mode: The strategy for locking, see constants [default: LOCK_TRANSACTIONAL]
-     *
-     * @param \PDO|string|null $pdoOrDsn A \PDO instance or DSN string or null
-     * @param array            $options  An associative array of options
-     *
-     * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
-     */
-    public function __construct($pdoOrDsn = null, array $options = array())
-    {
-        if ($pdoOrDsn instanceof \PDO) {
-            if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
-                throw new \InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
-            }
-
-            $this->pdo = $pdoOrDsn;
-            $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-        } else {
-            $this->dsn = $pdoOrDsn;
-        }
-
-        $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table;
-        $this->idCol = isset($options['db_id_col']) ? $options['db_id_col'] : $this->idCol;
-        $this->dataCol = isset($options['db_data_col']) ? $options['db_data_col'] : $this->dataCol;
-        $this->lifetimeCol = isset($options['db_lifetime_col']) ? $options['db_lifetime_col'] : $this->lifetimeCol;
-        $this->timeCol = isset($options['db_time_col']) ? $options['db_time_col'] : $this->timeCol;
-        $this->username = isset($options['db_username']) ? $options['db_username'] : $this->username;
-        $this->password = isset($options['db_password']) ? $options['db_password'] : $this->password;
-        $this->connectionOptions = isset($options['db_connection_options']) ? $options['db_connection_options'] : $this->connectionOptions;
-        $this->lockMode = isset($options['lock_mode']) ? $options['lock_mode'] : $this->lockMode;
-    }
-
-    /**
-     * Creates the table to store sessions which can be called once for setup.
-     *
-     * Session ID is saved in a column of maximum length 128 because that is enough even
-     * for a 512 bit configured session.hash_function like Whirlpool. Session data is
-     * saved in a BLOB. One could also use a shorter inlined varbinary column
-     * if one was sure the data fits into it.
-     *
-     * @throws \PDOException    When the table already exists
-     * @throws \DomainException When an unsupported PDO driver is used
-     */
-    public function createTable()
-    {
-        // connect if we are not yet
-        $this->getConnection();
-
-        switch ($this->driver) {
-            case 'mysql':
-                // We use varbinary for the ID column because it prevents unwanted conversions:
-                // - character set conversions between server and client
-                // - trailing space removal
-                // - case-insensitivity
-                // - language processing like é == e
-                $sql = "CREATE TABLE $this->table ($this->idCol VARBINARY(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol MEDIUMINT NOT NULL, $this->timeCol INTEGER UNSIGNED NOT NULL) COLLATE utf8_bin, ENGINE = InnoDB";
-                break;
-            case 'sqlite':
-                $sql = "CREATE TABLE $this->table ($this->idCol TEXT NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
-                break;
-            case 'pgsql':
-                $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol BYTEA NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
-                break;
-            case 'oci':
-                $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR2(128) NOT NULL PRIMARY KEY, $this->dataCol BLOB NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
-                break;
-            case 'sqlsrv':
-                $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(128) NOT NULL PRIMARY KEY, $this->dataCol VARBINARY(MAX) NOT NULL, $this->lifetimeCol INTEGER NOT NULL, $this->timeCol INTEGER NOT NULL)";
-                break;
-            default:
-                throw new \DomainException(sprintf('Creating the session table is currently not implemented for PDO driver "%s".', $this->driver));
-        }
-
-        try {
-            $this->pdo->exec($sql);
-        } catch (\PDOException $e) {
-            $this->rollback();
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns true when the current session exists but expired according to session.gc_maxlifetime.
-     *
-     * Can be used to distinguish between a new session and one that expired due to inactivity.
-     *
-     * @return bool Whether current session expired
-     */
-    public function isSessionExpired()
-    {
-        return $this->sessionExpired;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        if (null === $this->pdo) {
-            $this->connect($this->dsn ?: $savePath);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        try {
-            return $this->doRead($sessionId);
-        } catch (\PDOException $e) {
-            $this->rollback();
-
-            throw $e;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        // We delay gc() to close() so that it is executed outside the transactional and blocking read-write process.
-        // This way, pruning expired sessions does not block them from being started while the current session is used.
-        $this->gcCalled = true;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        // delete the record associated with this id
-        $sql = "DELETE FROM $this->table WHERE $this->idCol = :id";
-
-        try {
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $stmt->execute();
-        } catch (\PDOException $e) {
-            $this->rollback();
-
-            throw $e;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        $maxlifetime = (int) ini_get('session.gc_maxlifetime');
-
-        try {
-            // We use a single MERGE SQL query when supported by the database.
-            $mergeSql = $this->getMergeSql();
-
-            if (null !== $mergeSql) {
-                $mergeStmt = $this->pdo->prepare($mergeSql);
-                $mergeStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                $mergeStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
-                $mergeStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
-                $mergeStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                $mergeStmt->execute();
-
-                return true;
-            }
-
-            $updateStmt = $this->pdo->prepare(
-                "UPDATE $this->table SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time WHERE $this->idCol = :id"
-            );
-            $updateStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-            $updateStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
-            $updateStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
-            $updateStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-            $updateStmt->execute();
-
-            // When MERGE is not supported, like in Postgres, we have to use this approach that can result in
-            // duplicate key errors when the same session is written simultaneously (given the LOCK_NONE behavior).
-            // We can just catch such an error and re-execute the update. This is similar to a serializable
-            // transaction with retry logic on serialization failures but without the overhead and without possible
-            // false positives due to longer gap locking.
-            if (!$updateStmt->rowCount()) {
-                try {
-                    $insertStmt = $this->pdo->prepare(
-                        "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)"
-                    );
-                    $insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                    $insertStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
-                    $insertStmt->bindParam(':lifetime', $maxlifetime, \PDO::PARAM_INT);
-                    $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                    $insertStmt->execute();
-                } catch (\PDOException $e) {
-                    // Handle integrity violation SQLSTATE 23000 (or a subclass like 23505 in Postgres) for duplicate keys
-                    if (0 === strpos($e->getCode(), '23')) {
-                        $updateStmt->execute();
-                    } else {
-                        throw $e;
-                    }
-                }
-            }
-        } catch (\PDOException $e) {
-            $this->rollback();
-
-            throw $e;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->commit();
-
-        while ($unlockStmt = array_shift($this->unlockStatements)) {
-            $unlockStmt->execute();
-        }
-
-        if ($this->gcCalled) {
-            $this->gcCalled = false;
-
-            // delete the session records that have expired
-            $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol < :time";
-
-            $stmt = $this->pdo->prepare($sql);
-            $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
-            $stmt->execute();
-        }
-
-        if (false !== $this->dsn) {
-            $this->pdo = null; // only close lazy-connection
-        }
-
-        return true;
-    }
-
-    /**
-     * Lazy-connects to the database.
-     *
-     * @param string $dsn DSN string
-     */
-    private function connect($dsn)
-    {
-        $this->pdo = new \PDO($dsn, $this->username, $this->password, $this->connectionOptions);
-        $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-        $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-    }
-
-    /**
-     * Helper method to begin a transaction.
-     *
-     * Since SQLite does not support row level locks, we have to acquire a reserved lock
-     * on the database immediately. Because of https://bugs.php.net/42766 we have to create
-     * such a transaction manually which also means we cannot use PDO::commit or
-     * PDO::rollback or PDO::inTransaction for SQLite.
-     *
-     * Also MySQLs default isolation, REPEATABLE READ, causes deadlock for different sessions
-     * due to http://www.mysqlperformanceblog.com/2013/12/12/one-more-innodb-gap-lock-to-avoid/ .
-     * So we change it to READ COMMITTED.
-     */
-    private function beginTransaction()
-    {
-        if (!$this->inTransaction) {
-            if ('sqlite' === $this->driver) {
-                $this->pdo->exec('BEGIN IMMEDIATE TRANSACTION');
-            } else {
-                if ('mysql' === $this->driver) {
-                    $this->pdo->exec('SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
-                }
-                $this->pdo->beginTransaction();
-            }
-            $this->inTransaction = true;
-        }
-    }
-
-    /**
-     * Helper method to commit a transaction.
-     */
-    private function commit()
-    {
-        if ($this->inTransaction) {
-            try {
-                // commit read-write transaction which also releases the lock
-                if ('sqlite' === $this->driver) {
-                    $this->pdo->exec('COMMIT');
-                } else {
-                    $this->pdo->commit();
-                }
-                $this->inTransaction = false;
-            } catch (\PDOException $e) {
-                $this->rollback();
-
-                throw $e;
-            }
-        }
-    }
-
-    /**
-     * Helper method to rollback a transaction.
-     */
-    private function rollback()
-    {
-        // We only need to rollback if we are in a transaction. Otherwise the resulting
-        // error would hide the real problem why rollback was called. We might not be
-        // in a transaction when not using the transactional locking behavior or when
-        // two callbacks (e.g. destroy and write) are invoked that both fail.
-        if ($this->inTransaction) {
-            if ('sqlite' === $this->driver) {
-                $this->pdo->exec('ROLLBACK');
-            } else {
-                $this->pdo->rollBack();
-            }
-            $this->inTransaction = false;
-        }
-    }
-
-    /**
-     * Reads the session data in respect to the different locking strategies.
-     *
-     * We need to make sure we do not return session data that is already considered garbage according
-     * to the session.gc_maxlifetime setting because gc() is called after read() and only sometimes.
-     *
-     * @param string $sessionId Session ID
-     *
-     * @return string The session data
-     */
-    private function doRead($sessionId)
-    {
-        $this->sessionExpired = false;
-
-        if (self::LOCK_ADVISORY === $this->lockMode) {
-            $this->unlockStatements[] = $this->doAdvisoryLock($sessionId);
-        }
-
-        $selectSql = $this->getSelectSql();
-        $selectStmt = $this->pdo->prepare($selectSql);
-        $selectStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-        $selectStmt->execute();
-
-        $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
-
-        if ($sessionRows) {
-            if ($sessionRows[0][1] + $sessionRows[0][2] < time()) {
-                $this->sessionExpired = true;
-
-                return '';
-            }
-
-            return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
-        }
-
-        if (self::LOCK_TRANSACTIONAL === $this->lockMode && 'sqlite' !== $this->driver) {
-            // Exclusive-reading of non-existent rows does not block, so we need to do an insert to block
-            // until other connections to the session are committed.
-            try {
-                $insertStmt = $this->pdo->prepare(
-                    "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)"
-                );
-                $insertStmt->bindParam(':id', $sessionId, \PDO::PARAM_STR);
-                $insertStmt->bindValue(':data', '', \PDO::PARAM_LOB);
-                $insertStmt->bindValue(':lifetime', 0, \PDO::PARAM_INT);
-                $insertStmt->bindValue(':time', time(), \PDO::PARAM_INT);
-                $insertStmt->execute();
-            } catch (\PDOException $e) {
-                // Catch duplicate key error because other connection created the session already.
-                // It would only not be the case when the other connection destroyed the session.
-                if (0 === strpos($e->getCode(), '23')) {
-                    // Retrieve finished session data written by concurrent connection. SELECT
-                    // FOR UPDATE is necessary to avoid deadlock of connection that starts reading
-                    // before we write (transform intention to real lock).
-                    $selectStmt->execute();
-                    $sessionRows = $selectStmt->fetchAll(\PDO::FETCH_NUM);
-
-                    if ($sessionRows) {
-                        return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
-                    }
-
-                    return '';
-                }
-
-                throw $e;
-            }
-        }
-
-        return '';
-    }
-
-    /**
-     * Executes an application-level lock on the database.
-     *
-     * @param string $sessionId Session ID
-     *
-     * @return \PDOStatement The statement that needs to be executed later to release the lock
-     *
-     * @throws \DomainException When an unsupported PDO driver is used
-     *
-     * @todo implement missing advisory locks
-     *       - for oci using DBMS_LOCK.REQUEST
-     *       - for sqlsrv using sp_getapplock with LockOwner = Session
-     */
-    private function doAdvisoryLock($sessionId)
-    {
-        switch ($this->driver) {
-            case 'mysql':
-                // should we handle the return value? 0 on timeout, null on error
-                // we use a timeout of 50 seconds which is also the default for innodb_lock_wait_timeout
-                $stmt = $this->pdo->prepare('SELECT GET_LOCK(:key, 50)');
-                $stmt->bindValue(':key', $sessionId, \PDO::PARAM_STR);
-                $stmt->execute();
-
-                $releaseStmt = $this->pdo->prepare('DO RELEASE_LOCK(:key)');
-                $releaseStmt->bindValue(':key', $sessionId, \PDO::PARAM_STR);
-
-                return $releaseStmt;
-            case 'pgsql':
-                // Obtaining an exclusive session level advisory lock requires an integer key.
-                // So we convert the HEX representation of the session id to an integer.
-                // Since integers are signed, we have to skip one hex char to fit in the range.
-                if (4 === PHP_INT_SIZE) {
-                    $sessionInt1 = hexdec(substr($sessionId, 0, 7));
-                    $sessionInt2 = hexdec(substr($sessionId, 7, 7));
-
-                    $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key1, :key2)');
-                    $stmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
-                    $stmt->bindValue(':key2', $sessionInt2, \PDO::PARAM_INT);
-                    $stmt->execute();
-
-                    $releaseStmt = $this->pdo->prepare('SELECT pg_advisory_unlock(:key1, :key2)');
-                    $releaseStmt->bindValue(':key1', $sessionInt1, \PDO::PARAM_INT);
-                    $releaseStmt->bindValue(':key2', $sessionInt2, \PDO::PARAM_INT);
-                } else {
-                    $sessionBigInt = hexdec(substr($sessionId, 0, 15));
-
-                    $stmt = $this->pdo->prepare('SELECT pg_advisory_lock(:key)');
-                    $stmt->bindValue(':key', $sessionBigInt, \PDO::PARAM_INT);
-                    $stmt->execute();
-
-                    $releaseStmt = $this->pdo->prepare('SELECT pg_advisory_unlock(:key)');
-                    $releaseStmt->bindValue(':key', $sessionBigInt, \PDO::PARAM_INT);
-                }
-
-                return $releaseStmt;
-            case 'sqlite':
-                throw new \DomainException('SQLite does not support advisory locks.');
-            default:
-                throw new \DomainException(sprintf('Advisory locks are currently not implemented for PDO driver "%s".', $this->driver));
-        }
-    }
-
-    /**
-     * Return a locking or nonlocking SQL query to read session information.
-     *
-     * @return string The SQL string
-     *
-     * @throws \DomainException When an unsupported PDO driver is used
-     */
-    private function getSelectSql()
-    {
-        if (self::LOCK_TRANSACTIONAL === $this->lockMode) {
-            $this->beginTransaction();
-
-            switch ($this->driver) {
-                case 'mysql':
-                case 'oci':
-                case 'pgsql':
-                    return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WHERE $this->idCol = :id FOR UPDATE";
-                case 'sqlsrv':
-                    return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WITH (UPDLOCK, ROWLOCK) WHERE $this->idCol = :id";
-                case 'sqlite':
-                    // we already locked when starting transaction
-                    break;
-                default:
-                    throw new \DomainException(sprintf('Transactional locks are currently not implemented for PDO driver "%s".', $this->driver));
-            }
-        }
-
-        return "SELECT $this->dataCol, $this->lifetimeCol, $this->timeCol FROM $this->table WHERE $this->idCol = :id";
-    }
-
-    /**
-     * Returns a merge/upsert (i.e. insert or update) SQL query when supported by the database for writing session data.
-     *
-     * @return string|null The SQL string or null when not supported
-     */
-    private function getMergeSql()
-    {
-        switch ($this->driver) {
-            case 'mysql':
-                return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
-                    "ON DUPLICATE KEY UPDATE $this->dataCol = VALUES($this->dataCol), $this->lifetimeCol = VALUES($this->lifetimeCol), $this->timeCol = VALUES($this->timeCol)";
-            case 'oci':
-                // DUAL is Oracle specific dummy table
-                return "MERGE INTO $this->table USING DUAL ON ($this->idCol = :id) ".
-                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time";
-            case 'sqlsrv' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '10', '>='):
-                // MERGE is only available since SQL Server 2008 and must be terminated by semicolon
-                // It also requires HOLDLOCK according to http://weblogs.sqlteam.com/dang/archive/2009/01/31/UPSERT-Race-Condition-With-MERGE.aspx
-                return "MERGE INTO $this->table WITH (HOLDLOCK) USING (SELECT 1 AS dummy) AS src ON ($this->idCol = :id) ".
-                    "WHEN NOT MATCHED THEN INSERT ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
-                    "WHEN MATCHED THEN UPDATE SET $this->dataCol = :data, $this->lifetimeCol = :lifetime, $this->timeCol = :time;";
-            case 'sqlite':
-                return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
-        }
-    }
-
-    /**
-     * Return a PDO instance.
-     *
-     * @return \PDO
-     */
-    protected function getConnection()
-    {
-        if (null === $this->pdo) {
-            $this->connect($this->dsn ?: ini_get('session.save_path'));
-        }
-
-        return $this->pdo;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php b/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php
deleted file mode 100644
index d49c36c..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Handler/WriteCheckSessionHandler.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Handler;
-
-/**
- * Wraps another SessionHandlerInterface to only write the session when it has been modified.
- *
- * @author Adrien Brault <adrien.brault@gmail.com>
- */
-class WriteCheckSessionHandler implements \SessionHandlerInterface
-{
-    /**
-     * @var \SessionHandlerInterface
-     */
-    private $wrappedSessionHandler;
-
-    /**
-     * @var array sessionId => session
-     */
-    private $readSessions;
-
-    public function __construct(\SessionHandlerInterface $wrappedSessionHandler)
-    {
-        $this->wrappedSessionHandler = $wrappedSessionHandler;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        return $this->wrappedSessionHandler->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return $this->wrappedSessionHandler->destroy($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        return $this->wrappedSessionHandler->gc($maxlifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        return $this->wrappedSessionHandler->open($savePath, $sessionName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        $session = $this->wrappedSessionHandler->read($sessionId);
-
-        $this->readSessions[$sessionId] = $session;
-
-        return $session;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        if (isset($this->readSessions[$sessionId]) && $data === $this->readSessions[$sessionId]) {
-            return true;
-        }
-
-        return $this->wrappedSessionHandler->write($sessionId, $data);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php b/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
deleted file mode 100644
index ec7b267..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/MetadataBag.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-
-/**
- * Metadata container.
- *
- * Adds metadata to the session.
- *
- * @author Drak <drak@zikula.org>
- */
-class MetadataBag implements SessionBagInterface
-{
-    const CREATED = 'c';
-    const UPDATED = 'u';
-    const LIFETIME = 'l';
-
-    /**
-     * @var string
-     */
-    private $name = '__metadata';
-
-    /**
-     * @var string
-     */
-    private $storageKey;
-
-    /**
-     * @var array
-     */
-    protected $meta = array(self::CREATED => 0, self::UPDATED => 0, self::LIFETIME => 0);
-
-    /**
-     * Unix timestamp.
-     *
-     * @var int
-     */
-    private $lastUsed;
-
-    /**
-     * @var int
-     */
-    private $updateThreshold;
-
-    /**
-     * Constructor.
-     *
-     * @param string $storageKey      The key used to store bag in the session.
-     * @param int    $updateThreshold The time to wait between two UPDATED updates
-     */
-    public function __construct($storageKey = '_sf2_meta', $updateThreshold = 0)
-    {
-        $this->storageKey = $storageKey;
-        $this->updateThreshold = $updateThreshold;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(array &$array)
-    {
-        $this->meta = &$array;
-
-        if (isset($array[self::CREATED])) {
-            $this->lastUsed = $this->meta[self::UPDATED];
-
-            $timeStamp = time();
-            if ($timeStamp - $array[self::UPDATED] >= $this->updateThreshold) {
-                $this->meta[self::UPDATED] = $timeStamp;
-            }
-        } else {
-            $this->stampCreated();
-        }
-    }
-
-    /**
-     * Gets the lifetime that the session cookie was set with.
-     *
-     * @return int
-     */
-    public function getLifetime()
-    {
-        return $this->meta[self::LIFETIME];
-    }
-
-    /**
-     * Stamps a new session's metadata.
-     *
-     * @param int $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                      will leave the system settings unchanged, 0 sets the cookie
-     *                      to expire with browser session. Time is in seconds, and is
-     *                      not a Unix timestamp.
-     */
-    public function stampNew($lifetime = null)
-    {
-        $this->stampCreated($lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStorageKey()
-    {
-        return $this->storageKey;
-    }
-
-    /**
-     * Gets the created timestamp metadata.
-     *
-     * @return int Unix timestamp
-     */
-    public function getCreated()
-    {
-        return $this->meta[self::CREATED];
-    }
-
-    /**
-     * Gets the last used metadata.
-     *
-     * @return int Unix timestamp
-     */
-    public function getLastUsed()
-    {
-        return $this->lastUsed;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        // nothing to do
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Sets name.
-     *
-     * @param string $name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    private function stampCreated($lifetime = null)
-    {
-        $timeStamp = time();
-        $this->meta[self::CREATED] = $this->meta[self::UPDATED] = $this->lastUsed = $timeStamp;
-        $this->meta[self::LIFETIME] = (null === $lifetime) ? ini_get('session.cookie_lifetime') : $lifetime;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
deleted file mode 100644
index bc13737..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-
-/**
- * MockArraySessionStorage mocks the session for unit tests.
- *
- * No PHP session is actually started since a session can be initialized
- * and shutdown only once per PHP execution cycle.
- *
- * When doing functional testing, you should use MockFileSessionStorage instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Drak <drak@zikula.org>
- */
-class MockArraySessionStorage implements SessionStorageInterface
-{
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var bool
-     */
-    protected $started = false;
-
-    /**
-     * @var bool
-     */
-    protected $closed = false;
-
-    /**
-     * @var array
-     */
-    protected $data = array();
-
-    /**
-     * @var MetadataBag
-     */
-    protected $metadataBag;
-
-    /**
-     * @var array
-     */
-    protected $bags;
-
-    /**
-     * Constructor.
-     *
-     * @param string      $name    Session name
-     * @param MetadataBag $metaBag MetadataBag instance.
-     */
-    public function __construct($name = 'MOCKSESSID', MetadataBag $metaBag = null)
-    {
-        $this->name = $name;
-        $this->setMetadataBag($metaBag);
-    }
-
-    /**
-     * Sets the session data.
-     *
-     * @param array $array
-     */
-    public function setSessionData(array $array)
-    {
-        $this->data = $array;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        if ($this->started) {
-            return true;
-        }
-
-        if (empty($this->id)) {
-            $this->id = $this->generateId();
-        }
-
-        $this->loadSession();
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function regenerate($destroy = false, $lifetime = null)
-    {
-        if (!$this->started) {
-            $this->start();
-        }
-
-        $this->metadataBag->stampNew($lifetime);
-        $this->id = $this->generateId();
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setId($id)
-    {
-        if ($this->started) {
-            throw new \LogicException('Cannot set session ID after the session has started.');
-        }
-
-        $this->id = $id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save()
-    {
-        if (!$this->started || $this->closed) {
-            throw new \RuntimeException('Trying to save a session that was not started yet or was already closed');
-        }
-        // nothing to do since we don't persist the session data
-        $this->closed = false;
-        $this->started = false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        // clear out the bags
-        foreach ($this->bags as $bag) {
-            $bag->clear();
-        }
-
-        // clear out the session
-        $this->data = array();
-
-        // reconnect the bags to the session
-        $this->loadSession();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerBag(SessionBagInterface $bag)
-    {
-        $this->bags[$bag->getName()] = $bag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBag($name)
-    {
-        if (!isset($this->bags[$name])) {
-            throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
-        }
-
-        if (!$this->started) {
-            $this->start();
-        }
-
-        return $this->bags[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStarted()
-    {
-        return $this->started;
-    }
-
-    /**
-     * Sets the MetadataBag.
-     *
-     * @param MetadataBag $bag
-     */
-    public function setMetadataBag(MetadataBag $bag = null)
-    {
-        if (null === $bag) {
-            $bag = new MetadataBag();
-        }
-
-        $this->metadataBag = $bag;
-    }
-
-    /**
-     * Gets the MetadataBag.
-     *
-     * @return MetadataBag
-     */
-    public function getMetadataBag()
-    {
-        return $this->metadataBag;
-    }
-
-    /**
-     * Generates a session ID.
-     *
-     * This doesn't need to be particularly cryptographically secure since this is just
-     * a mock.
-     *
-     * @return string
-     */
-    protected function generateId()
-    {
-        return hash('sha256', uniqid('ss_mock_', true));
-    }
-
-    protected function loadSession()
-    {
-        $bags = array_merge($this->bags, array($this->metadataBag));
-
-        foreach ($bags as $bag) {
-            $key = $bag->getStorageKey();
-            $this->data[$key] = isset($this->data[$key]) ? $this->data[$key] : array();
-            $bag->initialize($this->data[$key]);
-        }
-
-        $this->started = true;
-        $this->closed = false;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
deleted file mode 100644
index 1f4117b..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/MockFileSessionStorage.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-/**
- * MockFileSessionStorage is used to mock sessions for
- * functional testing when done in a single PHP process.
- *
- * No PHP session is actually started since a session can be initialized
- * and shutdown only once per PHP execution cycle and this class does
- * not pollute any session related globals, including session_*() functions
- * or session.* PHP ini directives.
- *
- * @author Drak <drak@zikula.org>
- */
-class MockFileSessionStorage extends MockArraySessionStorage
-{
-    /**
-     * @var string
-     */
-    private $savePath;
-
-    /**
-     * Constructor.
-     *
-     * @param string      $savePath Path of directory to save session files.
-     * @param string      $name     Session name.
-     * @param MetadataBag $metaBag  MetadataBag instance.
-     */
-    public function __construct($savePath = null, $name = 'MOCKSESSID', MetadataBag $metaBag = null)
-    {
-        if (null === $savePath) {
-            $savePath = sys_get_temp_dir();
-        }
-
-        if (!is_dir($savePath)) {
-            mkdir($savePath, 0777, true);
-        }
-
-        $this->savePath = $savePath;
-
-        parent::__construct($name, $metaBag);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        if ($this->started) {
-            return true;
-        }
-
-        if (!$this->id) {
-            $this->id = $this->generateId();
-        }
-
-        $this->read();
-
-        $this->started = true;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function regenerate($destroy = false, $lifetime = null)
-    {
-        if (!$this->started) {
-            $this->start();
-        }
-
-        if ($destroy) {
-            $this->destroy();
-        }
-
-        return parent::regenerate($destroy, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save()
-    {
-        if (!$this->started) {
-            throw new \RuntimeException('Trying to save a session that was not started yet or was already closed');
-        }
-
-        file_put_contents($this->getFilePath(), serialize($this->data));
-
-        // this is needed for Silex, where the session object is re-used across requests
-        // in functional tests. In Symfony, the container is rebooted, so we don't have
-        // this issue
-        $this->started = false;
-    }
-
-    /**
-     * Deletes a session from persistent storage.
-     * Deliberately leaves session data in memory intact.
-     */
-    private function destroy()
-    {
-        if (is_file($this->getFilePath())) {
-            unlink($this->getFilePath());
-        }
-    }
-
-    /**
-     * Calculate path to file.
-     *
-     * @return string File path
-     */
-    private function getFilePath()
-    {
-        return $this->savePath.'/'.$this->id.'.mocksess';
-    }
-
-    /**
-     * Reads session from storage and loads session.
-     */
-    private function read()
-    {
-        $filePath = $this->getFilePath();
-        $this->data = is_readable($filePath) && is_file($filePath) ? unserialize(file_get_contents($filePath)) : array();
-
-        $this->loadSession();
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
deleted file mode 100644
index fd03dc8..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/NativeSessionStorage.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\NativeProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
-
-/**
- * This provides a base class for session attribute storage.
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeSessionStorage implements SessionStorageInterface
-{
-    /**
-     * Array of SessionBagInterface.
-     *
-     * @var SessionBagInterface[]
-     */
-    protected $bags;
-
-    /**
-     * @var bool
-     */
-    protected $started = false;
-
-    /**
-     * @var bool
-     */
-    protected $closed = false;
-
-    /**
-     * @var AbstractProxy
-     */
-    protected $saveHandler;
-
-    /**
-     * @var MetadataBag
-     */
-    protected $metadataBag;
-
-    /**
-     * Constructor.
-     *
-     * Depending on how you want the storage driver to behave you probably
-     * want to override this constructor entirely.
-     *
-     * List of options for $options array with their defaults.
-     *
-     * @see http://php.net/session.configuration for options
-     * but we omit 'session.' from the beginning of the keys for convenience.
-     *
-     * ("auto_start", is not supported as it tells PHP to start a session before
-     * PHP starts to execute user-land code. Setting during runtime has no effect).
-     *
-     * cache_limiter, "" (use "0" to prevent headers from being sent entirely).
-     * cookie_domain, ""
-     * cookie_httponly, ""
-     * cookie_lifetime, "0"
-     * cookie_path, "/"
-     * cookie_secure, ""
-     * entropy_file, ""
-     * entropy_length, "0"
-     * gc_divisor, "100"
-     * gc_maxlifetime, "1440"
-     * gc_probability, "1"
-     * hash_bits_per_character, "4"
-     * hash_function, "0"
-     * name, "PHPSESSID"
-     * referer_check, ""
-     * serialize_handler, "php"
-     * use_cookies, "1"
-     * use_only_cookies, "1"
-     * use_trans_sid, "0"
-     * upload_progress.enabled, "1"
-     * upload_progress.cleanup, "1"
-     * upload_progress.prefix, "upload_progress_"
-     * upload_progress.name, "PHP_SESSION_UPLOAD_PROGRESS"
-     * upload_progress.freq, "1%"
-     * upload_progress.min-freq, "1"
-     * url_rewriter.tags, "a=href,area=href,frame=src,form=,fieldset="
-     *
-     * @param array                                                            $options Session configuration options.
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag.
-     */
-    public function __construct(array $options = array(), $handler = null, MetadataBag $metaBag = null)
-    {
-        session_cache_limiter(''); // disable by default because it's managed by HeaderBag (if used)
-        ini_set('session.use_cookies', 1);
-
-        if (PHP_VERSION_ID >= 50400) {
-            session_register_shutdown();
-        } else {
-            register_shutdown_function('session_write_close');
-        }
-
-        $this->setMetadataBag($metaBag);
-        $this->setOptions($options);
-        $this->setSaveHandler($handler);
-    }
-
-    /**
-     * Gets the save handler instance.
-     *
-     * @return AbstractProxy
-     */
-    public function getSaveHandler()
-    {
-        return $this->saveHandler;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        if ($this->started) {
-            return true;
-        }
-
-        if (PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE === session_status()) {
-            throw new \RuntimeException('Failed to start the session: already started by PHP.');
-        }
-
-        if (PHP_VERSION_ID < 50400 && !$this->closed && isset($_SESSION) && session_id()) {
-            // not 100% fool-proof, but is the most reliable way to determine if a session is active in PHP 5.3
-            throw new \RuntimeException('Failed to start the session: already started by PHP ($_SESSION is set).');
-        }
-
-        if (ini_get('session.use_cookies') && headers_sent($file, $line)) {
-            throw new \RuntimeException(sprintf('Failed to start the session because headers have already been sent by "%s" at line %d.', $file, $line));
-        }
-
-        // ok to try and start the session
-        if (!session_start()) {
-            throw new \RuntimeException('Failed to start the session');
-        }
-
-        $this->loadSession();
-        if (!$this->saveHandler->isWrapper() && !$this->saveHandler->isSessionHandlerInterface()) {
-            // This condition matches only PHP 5.3 with internal save handlers
-            $this->saveHandler->setActive(true);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return $this->saveHandler->getId();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setId($id)
-    {
-        $this->saveHandler->setId($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->saveHandler->getName();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setName($name)
-    {
-        $this->saveHandler->setName($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function regenerate($destroy = false, $lifetime = null)
-    {
-        // Cannot regenerate the session ID for non-active sessions.
-        if (PHP_VERSION_ID >= 50400 && \PHP_SESSION_ACTIVE !== session_status()) {
-            return false;
-        }
-
-        // Check if session ID exists in PHP 5.3
-        if (PHP_VERSION_ID < 50400 && '' === session_id()) {
-            return false;
-        }
-
-        if (null !== $lifetime) {
-            ini_set('session.cookie_lifetime', $lifetime);
-        }
-
-        if ($destroy) {
-            $this->metadataBag->stampNew();
-        }
-
-        $isRegenerated = session_regenerate_id($destroy);
-
-        // The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
-        // @see https://bugs.php.net/bug.php?id=70013
-        $this->loadSession();
-
-        return $isRegenerated;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save()
-    {
-        session_write_close();
-
-        if (!$this->saveHandler->isWrapper() && !$this->saveHandler->isSessionHandlerInterface()) {
-            // This condition matches only PHP 5.3 with internal save handlers
-            $this->saveHandler->setActive(false);
-        }
-
-        $this->closed = true;
-        $this->started = false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        // clear out the bags
-        foreach ($this->bags as $bag) {
-            $bag->clear();
-        }
-
-        // clear out the session
-        $_SESSION = array();
-
-        // reconnect the bags to the session
-        $this->loadSession();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerBag(SessionBagInterface $bag)
-    {
-        $this->bags[$bag->getName()] = $bag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBag($name)
-    {
-        if (!isset($this->bags[$name])) {
-            throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
-        }
-
-        if ($this->saveHandler->isActive() && !$this->started) {
-            $this->loadSession();
-        } elseif (!$this->started) {
-            $this->start();
-        }
-
-        return $this->bags[$name];
-    }
-
-    /**
-     * Sets the MetadataBag.
-     *
-     * @param MetadataBag $metaBag
-     */
-    public function setMetadataBag(MetadataBag $metaBag = null)
-    {
-        if (null === $metaBag) {
-            $metaBag = new MetadataBag();
-        }
-
-        $this->metadataBag = $metaBag;
-    }
-
-    /**
-     * Gets the MetadataBag.
-     *
-     * @return MetadataBag
-     */
-    public function getMetadataBag()
-    {
-        return $this->metadataBag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStarted()
-    {
-        return $this->started;
-    }
-
-    /**
-     * Sets session.* ini variables.
-     *
-     * For convenience we omit 'session.' from the beginning of the keys.
-     * Explicitly ignores other ini keys.
-     *
-     * @param array $options Session ini directives array(key => value).
-     *
-     * @see http://php.net/session.configuration
-     */
-    public function setOptions(array $options)
-    {
-        $validOptions = array_flip(array(
-            'cache_limiter', 'cookie_domain', 'cookie_httponly',
-            'cookie_lifetime', 'cookie_path', 'cookie_secure',
-            'entropy_file', 'entropy_length', 'gc_divisor',
-            'gc_maxlifetime', 'gc_probability', 'hash_bits_per_character',
-            'hash_function', 'name', 'referer_check',
-            'serialize_handler', 'use_cookies',
-            'use_only_cookies', 'use_trans_sid', 'upload_progress.enabled',
-            'upload_progress.cleanup', 'upload_progress.prefix', 'upload_progress.name',
-            'upload_progress.freq', 'upload_progress.min-freq', 'url_rewriter.tags',
-        ));
-
-        foreach ($options as $key => $value) {
-            if (isset($validOptions[$key])) {
-                ini_set('session.'.$key, $value);
-            }
-        }
-    }
-
-    /**
-     * Registers session save handler as a PHP session handler.
-     *
-     * To use internal PHP session save handlers, override this method using ini_set with
-     * session.save_handler and session.save_path e.g.
-     *
-     *     ini_set('session.save_handler', 'files');
-     *     ini_set('session.save_path', /tmp');
-     *
-     * or pass in a NativeSessionHandler instance which configures session.save_handler in the
-     * constructor, for a template see NativeFileSessionHandler or use handlers in
-     * composer package drak/native-session
-     *
-     * @see http://php.net/session-set-save-handler
-     * @see http://php.net/sessionhandlerinterface
-     * @see http://php.net/sessionhandler
-     * @see http://github.com/drak/NativeSession
-     *
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $saveHandler
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setSaveHandler($saveHandler = null)
-    {
-        if (!$saveHandler instanceof AbstractProxy &&
-            !$saveHandler instanceof NativeSessionHandler &&
-            !$saveHandler instanceof \SessionHandlerInterface &&
-            null !== $saveHandler) {
-            throw new \InvalidArgumentException('Must be instance of AbstractProxy or NativeSessionHandler; implement \SessionHandlerInterface; or be null.');
-        }
-
-        // Wrap $saveHandler in proxy and prevent double wrapping of proxy
-        if (!$saveHandler instanceof AbstractProxy && $saveHandler instanceof \SessionHandlerInterface) {
-            $saveHandler = new SessionHandlerProxy($saveHandler);
-        } elseif (!$saveHandler instanceof AbstractProxy) {
-            $saveHandler = PHP_VERSION_ID >= 50400 ?
-                new SessionHandlerProxy(new \SessionHandler()) : new NativeProxy();
-        }
-        $this->saveHandler = $saveHandler;
-
-        if ($this->saveHandler instanceof \SessionHandlerInterface) {
-            if (PHP_VERSION_ID >= 50400) {
-                session_set_save_handler($this->saveHandler, false);
-            } else {
-                session_set_save_handler(
-                    array($this->saveHandler, 'open'),
-                    array($this->saveHandler, 'close'),
-                    array($this->saveHandler, 'read'),
-                    array($this->saveHandler, 'write'),
-                    array($this->saveHandler, 'destroy'),
-                    array($this->saveHandler, 'gc')
-                );
-            }
-        }
-    }
-
-    /**
-     * Load the session with attributes.
-     *
-     * After starting the session, PHP retrieves the session from whatever handlers
-     * are set to (either PHP's internal, or a custom save handler set with session_set_save_handler()).
-     * PHP takes the return value from the read() handler, unserializes it
-     * and populates $_SESSION with the result automatically.
-     *
-     * @param array|null $session
-     */
-    protected function loadSession(array &$session = null)
-    {
-        if (null === $session) {
-            $session = &$_SESSION;
-        }
-
-        $bags = array_merge($this->bags, array($this->metadataBag));
-
-        foreach ($bags as $bag) {
-            $key = $bag->getStorageKey();
-            $session[$key] = isset($session[$key]) ? $session[$key] : array();
-            $bag->initialize($session[$key]);
-        }
-
-        $this->started = true;
-        $this->closed = false;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php b/vendor/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php
deleted file mode 100644
index ced706f..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/PhpBridgeSessionStorage.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
-use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
-
-/**
- * Allows session to be started by PHP and managed by Symfony.
- *
- * @author Drak <drak@zikula.org>
- */
-class PhpBridgeSessionStorage extends NativeSessionStorage
-{
-    /**
-     * Constructor.
-     *
-     * @param AbstractProxy|NativeSessionHandler|\SessionHandlerInterface|null $handler
-     * @param MetadataBag                                                      $metaBag MetadataBag
-     */
-    public function __construct($handler = null, MetadataBag $metaBag = null)
-    {
-        $this->setMetadataBag($metaBag);
-        $this->setSaveHandler($handler);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start()
-    {
-        if ($this->started) {
-            return true;
-        }
-
-        $this->loadSession();
-        if (!$this->saveHandler->isWrapper() && !$this->saveHandler->isSessionHandlerInterface()) {
-            // This condition matches only PHP 5.3 + internal save handlers
-            $this->saveHandler->setActive(true);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        // clear out the bags and nothing else that may be set
-        // since the purpose of this driver is to share a handler
-        foreach ($this->bags as $bag) {
-            $bag->clear();
-        }
-
-        // reconnect the bags to the session
-        $this->loadSession();
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
deleted file mode 100644
index 1036818..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/AbstractProxy.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Proxy;
-
-/**
- * AbstractProxy.
- *
- * @author Drak <drak@zikula.org>
- */
-abstract class AbstractProxy
-{
-    /**
-     * Flag if handler wraps an internal PHP session handler (using \SessionHandler).
-     *
-     * @var bool
-     */
-    protected $wrapper = false;
-
-    /**
-     * @var bool
-     */
-    protected $active = false;
-
-    /**
-     * @var string
-     */
-    protected $saveHandlerName;
-
-    /**
-     * Gets the session.save_handler name.
-     *
-     * @return string
-     */
-    public function getSaveHandlerName()
-    {
-        return $this->saveHandlerName;
-    }
-
-    /**
-     * Is this proxy handler and instance of \SessionHandlerInterface.
-     *
-     * @return bool
-     */
-    public function isSessionHandlerInterface()
-    {
-        return ($this instanceof \SessionHandlerInterface);
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool
-     */
-    public function isWrapper()
-    {
-        return $this->wrapper;
-    }
-
-    /**
-     * Has a session started?
-     *
-     * @return bool
-     */
-    public function isActive()
-    {
-        if (PHP_VERSION_ID >= 50400) {
-            return $this->active = \PHP_SESSION_ACTIVE === session_status();
-        }
-
-        return $this->active;
-    }
-
-    /**
-     * Sets the active flag.
-     *
-     * Has no effect under PHP 5.4+ as status is detected
-     * automatically in isActive()
-     *
-     * @internal
-     *
-     * @param bool $flag
-     *
-     * @throws \LogicException
-     */
-    public function setActive($flag)
-    {
-        if (PHP_VERSION_ID >= 50400) {
-            throw new \LogicException('This method is disabled in PHP 5.4.0+');
-        }
-
-        $this->active = (bool) $flag;
-    }
-
-    /**
-     * Gets the session ID.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return session_id();
-    }
-
-    /**
-     * Sets the session ID.
-     *
-     * @param string $id
-     *
-     * @throws \LogicException
-     */
-    public function setId($id)
-    {
-        if ($this->isActive()) {
-            throw new \LogicException('Cannot change the ID of an active session');
-        }
-
-        session_id($id);
-    }
-
-    /**
-     * Gets the session name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return session_name();
-    }
-
-    /**
-     * Sets the session name.
-     *
-     * @param string $name
-     *
-     * @throws \LogicException
-     */
-    public function setName($name)
-    {
-        if ($this->isActive()) {
-            throw new \LogicException('Cannot change the name of an active session');
-        }
-
-        session_name($name);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php
deleted file mode 100644
index 5bb2c71..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/NativeProxy.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Proxy;
-
-/**
- * NativeProxy.
- *
- * This proxy is built-in session handlers in PHP 5.3.x
- *
- * @author Drak <drak@zikula.org>
- */
-class NativeProxy extends AbstractProxy
-{
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        // this makes an educated guess as to what the handler is since it should already be set.
-        $this->saveHandlerName = ini_get('session.save_handler');
-    }
-
-    /**
-     * Returns true if this handler wraps an internal PHP session save handler using \SessionHandler.
-     *
-     * @return bool False.
-     */
-    public function isWrapper()
-    {
-        return false;
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php b/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
deleted file mode 100644
index 81643c7..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/Proxy/SessionHandlerProxy.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage\Proxy;
-
-/**
- * SessionHandler proxy.
- *
- * @author Drak <drak@zikula.org>
- */
-class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
-{
-    /**
-     * @var \SessionHandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * Constructor.
-     *
-     * @param \SessionHandlerInterface $handler
-     */
-    public function __construct(\SessionHandlerInterface $handler)
-    {
-        $this->handler = $handler;
-        $this->wrapper = ($handler instanceof \SessionHandler);
-        $this->saveHandlerName = $this->wrapper ? ini_get('session.save_handler') : 'user';
-    }
-
-    // \SessionHandlerInterface
-
-    /**
-     * {@inheritdoc}
-     */
-    public function open($savePath, $sessionName)
-    {
-        $return = (bool) $this->handler->open($savePath, $sessionName);
-
-        if (true === $return) {
-            $this->active = true;
-        }
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->active = false;
-
-        return (bool) $this->handler->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($sessionId)
-    {
-        return (string) $this->handler->read($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($sessionId, $data)
-    {
-        return (bool) $this->handler->write($sessionId, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function destroy($sessionId)
-    {
-        return (bool) $this->handler->destroy($sessionId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function gc($maxlifetime)
-    {
-        return (bool) $this->handler->gc($maxlifetime);
-    }
-}
diff --git a/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php b/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
deleted file mode 100644
index 9f81847..0000000
--- a/vendor/symfony/http-foundation/Session/Storage/SessionStorageInterface.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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\Component\HttpFoundation\Session\Storage;
-
-use Symfony\Component\HttpFoundation\Session\SessionBagInterface;
-
-/**
- * StorageInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Drak <drak@zikula.org>
- */
-interface SessionStorageInterface
-{
-    /**
-     * Starts the session.
-     *
-     * @throws \RuntimeException If something goes wrong starting the session.
-     *
-     * @return bool True if started.
-     */
-    public function start();
-
-    /**
-     * Checks if the session is started.
-     *
-     * @return bool True if started, false otherwise.
-     */
-    public function isStarted();
-
-    /**
-     * Returns the session ID.
-     *
-     * @return string The session ID or empty.
-     */
-    public function getId();
-
-    /**
-     * Sets the session ID.
-     *
-     * @param string $id
-     */
-    public function setId($id);
-
-    /**
-     * Returns the session name.
-     *
-     * @return mixed The session name.
-     */
-    public function getName();
-
-    /**
-     * Sets the session name.
-     *
-     * @param string $name
-     */
-    public function setName($name);
-
-    /**
-     * Regenerates id that represents this storage.
-     *
-     * This method must invoke session_regenerate_id($destroy) unless
-     * this interface is used for a storage object designed for unit
-     * or functional testing where a real PHP session would interfere
-     * with testing.
-     *
-     * Note regenerate+destroy should not clear the session data in memory
-     * only delete the session data from persistent storage.
-     *
-     * Care: When regenerating the session ID no locking is involved in PHPs
-     * session design. See https://bugs.php.net/bug.php?id=61470 for a discussion.
-     * So you must make sure the regenerated session is saved BEFORE sending the
-     * headers with the new ID. Symfonys HttpKernel offers a listener for this.
-     * See Symfony\Component\HttpKernel\EventListener\SaveSessionListener.
-     * Otherwise session data could get lost again for concurrent requests with the
-     * new ID. One result could be that you get logged out after just logging in.
-     *
-     * @param bool $destroy  Destroy session when regenerating?
-     * @param int  $lifetime Sets the cookie lifetime for the session cookie. A null value
-     *                       will leave the system settings unchanged, 0 sets the cookie
-     *                       to expire with browser session. Time is in seconds, and is
-     *                       not a Unix timestamp.
-     *
-     * @return bool True if session regenerated, false if error
-     *
-     * @throws \RuntimeException If an error occurs while regenerating this storage
-     */
-    public function regenerate($destroy = false, $lifetime = null);
-
-    /**
-     * Force the session to be saved and closed.
-     *
-     * This method must invoke session_write_close() unless this interface is
-     * used for a storage object design for unit or functional testing where
-     * a real PHP session would interfere with testing, in which case it
-     * it should actually persist the session data if required.
-     *
-     * @throws \RuntimeException If the session is saved without being started, or if the session
-     *                           is already closed.
-     */
-    public function save();
-
-    /**
-     * Clear all session data in memory.
-     */
-    public function clear();
-
-    /**
-     * Gets a SessionBagInterface by name.
-     *
-     * @param string $name
-     *
-     * @return SessionBagInterface
-     *
-     * @throws \InvalidArgumentException If the bag does not exist
-     */
-    public function getBag($name);
-
-    /**
-     * Registers a SessionBagInterface for use.
-     *
-     * @param SessionBagInterface $bag
-     */
-    public function registerBag(SessionBagInterface $bag);
-
-    /**
-     * @return MetadataBag
-     */
-    public function getMetadataBag();
-}
diff --git a/vendor/symfony/http-foundation/StreamedResponse.php b/vendor/symfony/http-foundation/StreamedResponse.php
deleted file mode 100644
index 4b936a1..0000000
--- a/vendor/symfony/http-foundation/StreamedResponse.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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\Component\HttpFoundation;
-
-/**
- * StreamedResponse represents a streamed HTTP response.
- *
- * A StreamedResponse uses a callback for its content.
- *
- * The callback should use the standard PHP functions like echo
- * to stream the response back to the client. The flush() method
- * can also be used if needed.
- *
- * @see flush()
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class StreamedResponse extends Response
-{
-    protected $callback;
-    protected $streamed;
-
-    /**
-     * Constructor.
-     *
-     * @param callable|null $callback A valid PHP callback or null to set it later
-     * @param int           $status   The response status code
-     * @param array         $headers  An array of response headers
-     */
-    public function __construct($callback = null, $status = 200, $headers = array())
-    {
-        parent::__construct(null, $status, $headers);
-
-        if (null !== $callback) {
-            $this->setCallback($callback);
-        }
-        $this->streamed = false;
-    }
-
-    /**
-     * Factory method for chainability.
-     *
-     * @param callable|null $callback A valid PHP callback or null to set it later
-     * @param int           $status   The response status code
-     * @param array         $headers  An array of response headers
-     *
-     * @return StreamedResponse
-     */
-    public static function create($callback = null, $status = 200, $headers = array())
-    {
-        return new static($callback, $status, $headers);
-    }
-
-    /**
-     * Sets the PHP callback associated with this Response.
-     *
-     * @param callable $callback A valid PHP callback
-     *
-     * @throws \LogicException
-     */
-    public function setCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \LogicException('The Response callback must be a valid PHP callable.');
-        }
-        $this->callback = $callback;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * This method only sends the content once.
-     */
-    public function sendContent()
-    {
-        if ($this->streamed) {
-            return;
-        }
-
-        $this->streamed = true;
-
-        if (null === $this->callback) {
-            throw new \LogicException('The Response callback must not be null.');
-        }
-
-        call_user_func($this->callback);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \LogicException when the content is not null
-     */
-    public function setContent($content)
-    {
-        if (null !== $content) {
-            throw new \LogicException('The content cannot be set on a StreamedResponse instance.');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return false
-     */
-    public function getContent()
-    {
-        return false;
-    }
-}
diff --git a/vendor/symfony/http-foundation/composer.json b/vendor/symfony/http-foundation/composer.json
deleted file mode 100644
index 09f9679..0000000
--- a/vendor/symfony/http-foundation/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "symfony/http-foundation",
-    "type": "library",
-    "description": "Symfony HttpFoundation Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/expression-language": "~2.4"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" },
-        "classmap": [ "Resources/stubs" ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/http-foundation/phpunit.xml.dist b/vendor/symfony/http-foundation/phpunit.xml.dist
deleted file mode 100644
index 9ffdb43..0000000
--- a/vendor/symfony/http-foundation/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony HttpFoundation Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/http-kernel/.gitignore b/vendor/symfony/http-kernel/.gitignore
deleted file mode 100644
index 94a6a25..0000000
--- a/vendor/symfony/http-kernel/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
-Tests/Fixtures/cache/
-Tests/Fixtures/logs/
diff --git a/vendor/symfony/http-kernel/Bundle/Bundle.php b/vendor/symfony/http-kernel/Bundle/Bundle.php
deleted file mode 100644
index ebec7ff..0000000
--- a/vendor/symfony/http-kernel/Bundle/Bundle.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?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\Component\HttpKernel\Bundle;
-
-use Symfony\Component\DependencyInjection\ContainerAware;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-
-/**
- * An implementation of BundleInterface that adds a few conventions
- * for DependencyInjection extensions and Console commands.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Bundle extends ContainerAware implements BundleInterface
-{
-    protected $name;
-    protected $extension;
-    protected $path;
-
-    /**
-     * Boots the Bundle.
-     */
-    public function boot()
-    {
-    }
-
-    /**
-     * Shutdowns the Bundle.
-     */
-    public function shutdown()
-    {
-    }
-
-    /**
-     * Builds the bundle.
-     *
-     * It is only ever called once when the cache is empty.
-     *
-     * This method can be overridden to register compilation passes,
-     * other extensions, ...
-     *
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
-    public function build(ContainerBuilder $container)
-    {
-    }
-
-    /**
-     * Returns the bundle's container extension.
-     *
-     * @return ExtensionInterface|null The container extension
-     *
-     * @throws \LogicException
-     */
-    public function getContainerExtension()
-    {
-        if (null === $this->extension) {
-            $class = $this->getContainerExtensionClass();
-            if (class_exists($class)) {
-                $extension = new $class();
-
-                if (!$extension instanceof ExtensionInterface) {
-                    throw new \LogicException(sprintf('Extension %s must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface.', $class));
-                }
-
-                // check naming convention
-                $basename = preg_replace('/Bundle$/', '', $this->getName());
-                $expectedAlias = Container::underscore($basename);
-                if ($expectedAlias != $extension->getAlias()) {
-                    throw new \LogicException(sprintf(
-                        'Users will expect the alias of the default extension of a bundle to be the underscored version of the bundle name ("%s"). You can override "Bundle::getContainerExtension()" if you want to use "%s" or another alias.',
-                        $expectedAlias, $extension->getAlias()
-                    ));
-                }
-
-                $this->extension = $extension;
-            } else {
-                $this->extension = false;
-            }
-        }
-
-        if ($this->extension) {
-            return $this->extension;
-        }
-    }
-
-    /**
-     * Gets the Bundle namespace.
-     *
-     * @return string The Bundle namespace
-     */
-    public function getNamespace()
-    {
-        $class = get_class($this);
-
-        return substr($class, 0, strrpos($class, '\\'));
-    }
-
-    /**
-     * Gets the Bundle directory path.
-     *
-     * @return string The Bundle absolute path
-     */
-    public function getPath()
-    {
-        if (null === $this->path) {
-            $reflected = new \ReflectionObject($this);
-            $this->path = dirname($reflected->getFileName());
-        }
-
-        return $this->path;
-    }
-
-    /**
-     * Returns the bundle parent name.
-     *
-     * @return string The Bundle parent name it overrides or null if no parent
-     */
-    public function getParent()
-    {
-    }
-
-    /**
-     * Returns the bundle name (the class short name).
-     *
-     * @return string The Bundle name
-     */
-    final public function getName()
-    {
-        if (null !== $this->name) {
-            return $this->name;
-        }
-
-        $name = get_class($this);
-        $pos = strrpos($name, '\\');
-
-        return $this->name = false === $pos ? $name : substr($name, $pos + 1);
-    }
-
-    /**
-     * Finds and registers Commands.
-     *
-     * Override this method if your bundle commands do not follow the conventions:
-     *
-     * * Commands are in the 'Command' sub-directory
-     * * Commands extend Symfony\Component\Console\Command\Command
-     *
-     * @param Application $application An Application instance
-     */
-    public function registerCommands(Application $application)
-    {
-        if (!is_dir($dir = $this->getPath().'/Command')) {
-            return;
-        }
-
-        $finder = new Finder();
-        $finder->files()->name('*Command.php')->in($dir);
-
-        $prefix = $this->getNamespace().'\\Command';
-        foreach ($finder as $file) {
-            $ns = $prefix;
-            if ($relativePath = $file->getRelativePath()) {
-                $ns .= '\\'.strtr($relativePath, '/', '\\');
-            }
-            $class = $ns.'\\'.$file->getBasename('.php');
-            if ($this->container) {
-                $alias = 'console.command.'.strtolower(str_replace('\\', '_', $class));
-                if ($this->container->has($alias)) {
-                    continue;
-                }
-            }
-            $r = new \ReflectionClass($class);
-            if ($r->isSubclassOf('Symfony\\Component\\Console\\Command\\Command') && !$r->isAbstract() && !$r->getConstructor()->getNumberOfRequiredParameters()) {
-                $application->add($r->newInstance());
-            }
-        }
-    }
-
-    /**
-     * Returns the bundle's container extension class.
-     *
-     * @return string
-     */
-    protected function getContainerExtensionClass()
-    {
-        $basename = preg_replace('/Bundle$/', '', $this->getName());
-
-        return $this->getNamespace().'\\DependencyInjection\\'.$basename.'Extension';
-    }
-}
diff --git a/vendor/symfony/http-kernel/Bundle/BundleInterface.php b/vendor/symfony/http-kernel/Bundle/BundleInterface.php
deleted file mode 100644
index 25eea1d..0000000
--- a/vendor/symfony/http-kernel/Bundle/BundleInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\HttpKernel\Bundle;
-
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
-
-/**
- * BundleInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface BundleInterface extends ContainerAwareInterface
-{
-    /**
-     * Boots the Bundle.
-     */
-    public function boot();
-
-    /**
-     * Shutdowns the Bundle.
-     */
-    public function shutdown();
-
-    /**
-     * Builds the bundle.
-     *
-     * It is only ever called once when the cache is empty.
-     *
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
-    public function build(ContainerBuilder $container);
-
-    /**
-     * Returns the container extension that should be implicitly loaded.
-     *
-     * @return ExtensionInterface|null The default extension or null if there is none
-     */
-    public function getContainerExtension();
-
-    /**
-     * Returns the bundle name that this bundle overrides.
-     *
-     * Despite its name, this method does not imply any parent/child relationship
-     * between the bundles, just a way to extend and override an existing
-     * bundle.
-     *
-     * @return string The Bundle name it overrides or null if no parent
-     */
-    public function getParent();
-
-    /**
-     * Returns the bundle name (the class short name).
-     *
-     * @return string The Bundle name
-     */
-    public function getName();
-
-    /**
-     * Gets the Bundle namespace.
-     *
-     * @return string The Bundle namespace
-     */
-    public function getNamespace();
-
-    /**
-     * Gets the Bundle directory path.
-     *
-     * The path should always be returned as a Unix path (with /).
-     *
-     * @return string The Bundle absolute path
-     */
-    public function getPath();
-}
diff --git a/vendor/symfony/http-kernel/CHANGELOG.md b/vendor/symfony/http-kernel/CHANGELOG.md
deleted file mode 100644
index ad27886..0000000
--- a/vendor/symfony/http-kernel/CHANGELOG.md
+++ /dev/null
@@ -1,73 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
- * added the HTTP status code to profiles
-
-2.6.0
------
-
- * deprecated `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener`, use `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` instead
- * deprecated unused method `Symfony\Component\HttpKernel\Kernel::isClassInActiveBundle` and `Symfony\Component\HttpKernel\KernelInterface::isClassInActiveBundle`
-
-2.5.0
------
-
- * deprecated `Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass`, use `Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass` instead
-
-2.4.0
------
-
- * added event listeners for the session
- * added the KernelEvents::FINISH_REQUEST event
-
-2.3.0
------
-
- * [BC BREAK] renamed `Symfony\Component\HttpKernel\EventListener\DeprecationLoggerListener` to `Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener` and changed its constructor
- * deprecated `Symfony\Component\HttpKernel\Debug\ErrorHandler`, `Symfony\Component\HttpKernel\Debug\ExceptionHandler`,
-   `Symfony\Component\HttpKernel\Exception\FatalErrorException` and `Symfony\Component\HttpKernel\Exception\FlattenException`
- * deprecated `Symfony\Component\HttpKernel\Kernel::init()``
- * added the possibility to specify an id an extra attributes to hinclude tags
- * added the collect of data if a controller is a Closure in the Request collector
- * pass exceptions from the ExceptionListener to the logger using the logging context to allow for more
-   detailed messages
-
-2.2.0
------
-
- * [BC BREAK] the path info for sub-request is now always _fragment (or whatever you configured instead of the default)
- * added Symfony\Component\HttpKernel\EventListener\FragmentListener
- * added Symfony\Component\HttpKernel\UriSigner
- * added Symfony\Component\HttpKernel\FragmentRenderer and rendering strategies (in Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface)
- * added Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel
- * added ControllerReference to create reference of Controllers (used in the FragmentRenderer class)
- * [BC BREAK] renamed TimeDataCollector::getTotalTime() to
-   TimeDataCollector::getDuration()
- * updated the MemoryDataCollector to include the memory used in the
-   kernel.terminate event listeners
- * moved the Stopwatch classes to a new component
- * added TraceableControllerResolver
- * added TraceableEventDispatcher (removed ContainerAwareTraceableEventDispatcher)
- * added support for WinCache opcode cache in ConfigDataCollector
-
-2.1.0
------
-
- * [BC BREAK] the charset is now configured via the Kernel::getCharset() method
- * [BC BREAK] the current locale for the user is not stored anymore in the session
- * added the HTTP method to the profiler storage
- * updated all listeners to implement EventSubscriberInterface
- * added TimeDataCollector
- * added ContainerAwareTraceableEventDispatcher
- * moved TraceableEventDispatcherInterface to the EventDispatcher component
- * added RouterListener, LocaleListener, and StreamedResponseListener
- * added CacheClearerInterface (and ChainCacheClearer)
- * added a kernel.terminate event (via TerminableInterface and PostResponseEvent)
- * added a Stopwatch class
- * added WarmableInterface
- * improved extensibility between bundles
- * added profiler storages for Memcache(d), File-based, MongoDB, Redis
- * moved Filesystem class to its own component
diff --git a/vendor/symfony/http-kernel/CacheClearer/CacheClearerInterface.php b/vendor/symfony/http-kernel/CacheClearer/CacheClearerInterface.php
deleted file mode 100644
index d4a2db3..0000000
--- a/vendor/symfony/http-kernel/CacheClearer/CacheClearerInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\HttpKernel\CacheClearer;
-
-/**
- * CacheClearerInterface.
- *
- * @author Dustin Dobervich <ddobervich@gmail.com>
- */
-interface CacheClearerInterface
-{
-    /**
-     * Clears any caches necessary.
-     *
-     * @param string $cacheDir The cache directory.
-     */
-    public function clear($cacheDir);
-}
diff --git a/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php b/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php
deleted file mode 100644
index 81c43b6..0000000
--- a/vendor/symfony/http-kernel/CacheClearer/ChainCacheClearer.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\HttpKernel\CacheClearer;
-
-/**
- * ChainCacheClearer.
- *
- * @author Dustin Dobervich <ddobervich@gmail.com>
- */
-class ChainCacheClearer implements CacheClearerInterface
-{
-    /**
-     * @var array
-     */
-    protected $clearers;
-
-    /**
-     * Constructs a new instance of ChainCacheClearer.
-     *
-     * @param array $clearers The initial clearers.
-     */
-    public function __construct(array $clearers = array())
-    {
-        $this->clearers = $clearers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear($cacheDir)
-    {
-        foreach ($this->clearers as $clearer) {
-            $clearer->clear($cacheDir);
-        }
-    }
-
-    /**
-     * Adds a cache clearer to the aggregate.
-     *
-     * @param CacheClearerInterface $clearer
-     */
-    public function add(CacheClearerInterface $clearer)
-    {
-        $this->clearers[] = $clearer;
-    }
-}
diff --git a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php
deleted file mode 100644
index 948b3ff..0000000
--- a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmer.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\CacheWarmer;
-
-/**
- * Abstract cache warmer that knows how to write a file to the cache.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class CacheWarmer implements CacheWarmerInterface
-{
-    protected function writeCacheFile($file, $content)
-    {
-        $tmpFile = tempnam(dirname($file), basename($file));
-        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
-            @chmod($file, 0666 & ~umask());
-
-            return;
-        }
-
-        throw new \RuntimeException(sprintf('Failed to write cache file "%s".', $file));
-    }
-}
diff --git a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
deleted file mode 100644
index e5f4e4f..0000000
--- a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerAggregate.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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\Component\HttpKernel\CacheWarmer;
-
-/**
- * Aggregates several cache warmers into a single one.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class CacheWarmerAggregate implements CacheWarmerInterface
-{
-    protected $warmers = array();
-    protected $optionalsEnabled = false;
-
-    public function __construct(array $warmers = array())
-    {
-        foreach ($warmers as $warmer) {
-            $this->add($warmer);
-        }
-    }
-
-    public function enableOptionalWarmers()
-    {
-        $this->optionalsEnabled = true;
-    }
-
-    /**
-     * Warms up the cache.
-     *
-     * @param string $cacheDir The cache directory
-     */
-    public function warmUp($cacheDir)
-    {
-        foreach ($this->warmers as $warmer) {
-            if (!$this->optionalsEnabled && $warmer->isOptional()) {
-                continue;
-            }
-
-            $warmer->warmUp($cacheDir);
-        }
-    }
-
-    /**
-     * Checks whether this warmer is optional or not.
-     *
-     * @return bool always false
-     */
-    public function isOptional()
-    {
-        return false;
-    }
-
-    public function setWarmers(array $warmers)
-    {
-        $this->warmers = array();
-        foreach ($warmers as $warmer) {
-            $this->add($warmer);
-        }
-    }
-
-    public function add(CacheWarmerInterface $warmer)
-    {
-        $this->warmers[] = $warmer;
-    }
-}
diff --git a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php b/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php
deleted file mode 100644
index 8fece5e..0000000
--- a/vendor/symfony/http-kernel/CacheWarmer/CacheWarmerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\CacheWarmer;
-
-/**
- * Interface for classes able to warm up the cache.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface CacheWarmerInterface extends WarmableInterface
-{
-    /**
-     * Checks whether this warmer is optional or not.
-     *
-     * Optional warmers can be ignored on certain conditions.
-     *
-     * A warmer should return true if the cache can be
-     * generated incrementally and on-demand.
-     *
-     * @return bool true if the warmer is optional, false otherwise
-     */
-    public function isOptional();
-}
diff --git a/vendor/symfony/http-kernel/CacheWarmer/WarmableInterface.php b/vendor/symfony/http-kernel/CacheWarmer/WarmableInterface.php
deleted file mode 100644
index 25d8ee8..0000000
--- a/vendor/symfony/http-kernel/CacheWarmer/WarmableInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\HttpKernel\CacheWarmer;
-
-/**
- * Interface for classes that support warming their cache.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface WarmableInterface
-{
-    /**
-     * Warms up the cache.
-     *
-     * @param string $cacheDir The cache directory
-     */
-    public function warmUp($cacheDir);
-}
diff --git a/vendor/symfony/http-kernel/Client.php b/vendor/symfony/http-kernel/Client.php
deleted file mode 100644
index b344fa1..0000000
--- a/vendor/symfony/http-kernel/Client.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Component\BrowserKit\Client as BaseClient;
-use Symfony\Component\BrowserKit\Request as DomRequest;
-use Symfony\Component\BrowserKit\Response as DomResponse;
-use Symfony\Component\BrowserKit\Cookie as DomCookie;
-use Symfony\Component\BrowserKit\History;
-use Symfony\Component\BrowserKit\CookieJar;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Client simulates a browser and makes requests to a Kernel object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Client extends BaseClient
-{
-    protected $kernel;
-
-    /**
-     * Constructor.
-     *
-     * @param HttpKernelInterface $kernel    An HttpKernel instance
-     * @param array               $server    The server parameters (equivalent of $_SERVER)
-     * @param History             $history   A History instance to store the browser history
-     * @param CookieJar           $cookieJar A CookieJar instance to store the cookies
-     */
-    public function __construct(HttpKernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
-    {
-        // These class properties must be set before calling the parent constructor, as it may depend on it.
-        $this->kernel = $kernel;
-        $this->followRedirects = false;
-
-        parent::__construct($server, $history, $cookieJar);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return Request|null A Request instance
-     */
-    public function getRequest()
-    {
-        return parent::getRequest();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return Response|null A Response instance
-     */
-    public function getResponse()
-    {
-        return parent::getResponse();
-    }
-
-    /**
-     * Makes a request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return Response A Response instance
-     */
-    protected function doRequest($request)
-    {
-        $response = $this->kernel->handle($request);
-
-        if ($this->kernel instanceof TerminableInterface) {
-            $this->kernel->terminate($request, $response);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Returns the script to execute when the request must be insulated.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return string
-     */
-    protected function getScript($request)
-    {
-        $kernel = str_replace("'", "\\'", serialize($this->kernel));
-        $request = str_replace("'", "\\'", serialize($request));
-
-        $r = new \ReflectionClass('\\Symfony\\Component\\ClassLoader\\ClassLoader');
-        $requirePath = str_replace("'", "\\'", $r->getFileName());
-        $symfonyPath = str_replace("'", "\\'", dirname(dirname(dirname(__DIR__))));
-        $errorReporting = error_reporting();
-
-        $code = <<<EOF
-<?php
-
-error_reporting($errorReporting & ~E_USER_DEPRECATED);
-
-require_once '$requirePath';
-
-\$loader = new Symfony\Component\ClassLoader\ClassLoader();
-\$loader->addPrefix('Symfony', '$symfonyPath');
-\$loader->register();
-
-\$kernel = unserialize('$kernel');
-\$request = unserialize('$request');
-EOF;
-
-        return $code.$this->getHandleScript();
-    }
-
-    protected function getHandleScript()
-    {
-        return <<<'EOF'
-$response = $kernel->handle($request);
-
-if ($kernel instanceof Symfony\Component\HttpKernel\TerminableInterface) {
-    $kernel->terminate($request, $response);
-}
-
-echo serialize($response);
-EOF;
-    }
-
-    /**
-     * Converts the BrowserKit request to a HttpKernel request.
-     *
-     * @param DomRequest $request A DomRequest instance
-     *
-     * @return Request A Request instance
-     */
-    protected function filterRequest(DomRequest $request)
-    {
-        $httpRequest = Request::create($request->getUri(), $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
-
-        foreach ($this->filterFiles($httpRequest->files->all()) as $key => $value) {
-            $httpRequest->files->set($key, $value);
-        }
-
-        return $httpRequest;
-    }
-
-    /**
-     * Filters an array of files.
-     *
-     * This method created test instances of UploadedFile so that the move()
-     * method can be called on those instances.
-     *
-     * If the size of a file is greater than the allowed size (from php.ini) then
-     * an invalid UploadedFile is returned with an error set to UPLOAD_ERR_INI_SIZE.
-     *
-     * @see UploadedFile
-     *
-     * @param array $files An array of files
-     *
-     * @return array An array with all uploaded files marked as already moved
-     */
-    protected function filterFiles(array $files)
-    {
-        $filtered = array();
-        foreach ($files as $key => $value) {
-            if (is_array($value)) {
-                $filtered[$key] = $this->filterFiles($value);
-            } elseif ($value instanceof UploadedFile) {
-                if ($value->isValid() && $value->getSize() > UploadedFile::getMaxFilesize()) {
-                    $filtered[$key] = new UploadedFile(
-                        '',
-                        $value->getClientOriginalName(),
-                        $value->getClientMimeType(),
-                        0,
-                        UPLOAD_ERR_INI_SIZE,
-                        true
-                    );
-                } else {
-                    $filtered[$key] = new UploadedFile(
-                        $value->getPathname(),
-                        $value->getClientOriginalName(),
-                        $value->getClientMimeType(),
-                        $value->getClientSize(),
-                        $value->getError(),
-                        true
-                    );
-                }
-            }
-        }
-
-        return $filtered;
-    }
-
-    /**
-     * Converts the HttpKernel response to a BrowserKit response.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return DomResponse A DomResponse instance
-     */
-    protected function filterResponse($response)
-    {
-        $headers = $response->headers->all();
-        if ($response->headers->getCookies()) {
-            $cookies = array();
-            foreach ($response->headers->getCookies() as $cookie) {
-                $cookies[] = new DomCookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());
-            }
-            $headers['Set-Cookie'] = $cookies;
-        }
-
-        // this is needed to support StreamedResponse
-        ob_start();
-        $response->sendContent();
-        $content = ob_get_clean();
-
-        return new DomResponse($content, $response->getStatusCode(), $headers);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Config/EnvParametersResource.php b/vendor/symfony/http-kernel/Config/EnvParametersResource.php
deleted file mode 100644
index 5f54450..0000000
--- a/vendor/symfony/http-kernel/Config/EnvParametersResource.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\HttpKernel\Config;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * EnvParametersResource represents resources stored in prefixed environment variables.
- *
- * @author Chris Wilkinson <chriswilkinson84@gmail.com>
- */
-class EnvParametersResource implements ResourceInterface, \Serializable
-{
-    /**
-     * @var string
-     */
-    private $prefix;
-
-    /**
-     * @var string
-     */
-    private $variables;
-
-    /**
-     * Constructor.
-     *
-     * @param string $prefix
-     */
-    public function __construct($prefix)
-    {
-        $this->prefix = $prefix;
-        $this->variables = $this->findVariables();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return serialize($this->getResource());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResource()
-    {
-        return array('prefix' => $this->prefix, 'variables' => $this->variables);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($timestamp)
-    {
-        return $this->findVariables() === $this->variables;
-    }
-
-    public function serialize()
-    {
-        return serialize(array('prefix' => $this->prefix, 'variables' => $this->variables));
-    }
-
-    public function unserialize($serialized)
-    {
-        $unserialized = unserialize($serialized);
-
-        $this->prefix = $unserialized['prefix'];
-        $this->variables = $unserialized['variables'];
-    }
-
-    private function findVariables()
-    {
-        $variables = array();
-
-        foreach ($_SERVER as $key => $value) {
-            if (0 === strpos($key, $this->prefix)) {
-                $variables[$key] = $value;
-            }
-        }
-
-        ksort($variables);
-
-        return $variables;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Config/FileLocator.php b/vendor/symfony/http-kernel/Config/FileLocator.php
deleted file mode 100644
index 169c9ad..0000000
--- a/vendor/symfony/http-kernel/Config/FileLocator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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\Component\HttpKernel\Config;
-
-use Symfony\Component\Config\FileLocator as BaseFileLocator;
-use Symfony\Component\HttpKernel\KernelInterface;
-
-/**
- * FileLocator uses the KernelInterface to locate resources in bundles.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FileLocator extends BaseFileLocator
-{
-    private $kernel;
-    private $path;
-
-    /**
-     * Constructor.
-     *
-     * @param KernelInterface $kernel A KernelInterface instance
-     * @param null|string     $path   The path the global resource directory
-     * @param array           $paths  An array of paths where to look for resources
-     */
-    public function __construct(KernelInterface $kernel, $path = null, array $paths = array())
-    {
-        $this->kernel = $kernel;
-        if (null !== $path) {
-            $this->path = $path;
-            $paths[] = $path;
-        }
-
-        parent::__construct($paths);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function locate($file, $currentPath = null, $first = true)
-    {
-        if (isset($file[0]) && '@' === $file[0]) {
-            return $this->kernel->locateResource($file, $this->path, $first);
-        }
-
-        return parent::locate($file, $currentPath, $first);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Controller/ControllerReference.php b/vendor/symfony/http-kernel/Controller/ControllerReference.php
deleted file mode 100644
index 3d1592e..0000000
--- a/vendor/symfony/http-kernel/Controller/ControllerReference.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\HttpKernel\Controller;
-
-use Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface;
-
-/**
- * Acts as a marker and a data holder for a Controller.
- *
- * Some methods in Symfony accept both a URI (as a string) or a controller as
- * an argument. In the latter case, instead of passing an array representing
- * the controller, you can use an instance of this class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @see FragmentRendererInterface
- */
-class ControllerReference
-{
-    public $controller;
-    public $attributes = array();
-    public $query = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $controller The controller name
-     * @param array  $attributes An array of parameters to add to the Request attributes
-     * @param array  $query      An array of parameters to add to the Request query string
-     */
-    public function __construct($controller, array $attributes = array(), array $query = array())
-    {
-        $this->controller = $controller;
-        $this->attributes = $attributes;
-        $this->query = $query;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolver.php b/vendor/symfony/http-kernel/Controller/ControllerResolver.php
deleted file mode 100644
index 0be0b68..0000000
--- a/vendor/symfony/http-kernel/Controller/ControllerResolver.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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\Component\HttpKernel\Controller;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * ControllerResolver.
- *
- * This implementation uses the '_controller' request attribute to determine
- * the controller to execute and uses the request attributes to determine
- * the controller method arguments.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ControllerResolver implements ControllerResolverInterface
-{
-    private $logger;
-
-    /**
-     * Constructor.
-     *
-     * @param LoggerInterface $logger A LoggerInterface instance
-     */
-    public function __construct(LoggerInterface $logger = null)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * This method looks for a '_controller' request attribute that represents
-     * the controller name (a string like ClassName::MethodName).
-     */
-    public function getController(Request $request)
-    {
-        if (!$controller = $request->attributes->get('_controller')) {
-            if (null !== $this->logger) {
-                $this->logger->warning('Unable to look for the controller as the "_controller" parameter is missing.');
-            }
-
-            return false;
-        }
-
-        if (is_array($controller)) {
-            return $controller;
-        }
-
-        if (is_object($controller)) {
-            if (method_exists($controller, '__invoke')) {
-                return $controller;
-            }
-
-            throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', get_class($controller), $request->getPathInfo()));
-        }
-
-        if (false === strpos($controller, ':')) {
-            if (method_exists($controller, '__invoke')) {
-                return $this->instantiateController($controller);
-            } elseif (function_exists($controller)) {
-                return $controller;
-            }
-        }
-
-        $callable = $this->createController($controller);
-
-        if (!is_callable($callable)) {
-            throw new \InvalidArgumentException(sprintf('Controller "%s" for URI "%s" is not callable.', $controller, $request->getPathInfo()));
-        }
-
-        return $callable;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getArguments(Request $request, $controller)
-    {
-        if (is_array($controller)) {
-            $r = new \ReflectionMethod($controller[0], $controller[1]);
-        } elseif (is_object($controller) && !$controller instanceof \Closure) {
-            $r = new \ReflectionObject($controller);
-            $r = $r->getMethod('__invoke');
-        } else {
-            $r = new \ReflectionFunction($controller);
-        }
-
-        return $this->doGetArguments($request, $controller, $r->getParameters());
-    }
-
-    protected function doGetArguments(Request $request, $controller, array $parameters)
-    {
-        $attributes = $request->attributes->all();
-        $arguments = array();
-        foreach ($parameters as $param) {
-            if (array_key_exists($param->name, $attributes)) {
-                $arguments[] = $attributes[$param->name];
-            } elseif ($param->getClass() && $param->getClass()->isInstance($request)) {
-                $arguments[] = $request;
-            } elseif ($param->isDefaultValueAvailable()) {
-                $arguments[] = $param->getDefaultValue();
-            } else {
-                if (is_array($controller)) {
-                    $repr = sprintf('%s::%s()', get_class($controller[0]), $controller[1]);
-                } elseif (is_object($controller)) {
-                    $repr = get_class($controller);
-                } else {
-                    $repr = $controller;
-                }
-
-                throw new \RuntimeException(sprintf('Controller "%s" requires that you provide a value for the "$%s" argument (because there is no default value or because there is a non optional argument after this one).', $repr, $param->name));
-            }
-        }
-
-        return $arguments;
-    }
-
-    /**
-     * Returns a callable for the given controller.
-     *
-     * @param string $controller A Controller string
-     *
-     * @return callable A PHP callable
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected function createController($controller)
-    {
-        if (false === strpos($controller, '::')) {
-            throw new \InvalidArgumentException(sprintf('Unable to find controller "%s".', $controller));
-        }
-
-        list($class, $method) = explode('::', $controller, 2);
-
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
-        }
-
-        return array($this->instantiateController($class), $method);
-    }
-
-    /**
-     * Returns an instantiated controller.
-     *
-     * @param string $class A class name
-     *
-     * @return object
-     */
-    protected function instantiateController($class)
-    {
-        return new $class();
-    }
-}
diff --git a/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php b/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php
deleted file mode 100644
index f7b19ed..0000000
--- a/vendor/symfony/http-kernel/Controller/ControllerResolverInterface.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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\Component\HttpKernel\Controller;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * A ControllerResolverInterface implementation knows how to determine the
- * controller to execute based on a Request object.
- *
- * It can also determine the arguments to pass to the Controller.
- *
- * A Controller can be any valid PHP callable.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ControllerResolverInterface
-{
-    /**
-     * Returns the Controller instance associated with a Request.
-     *
-     * As several resolvers can exist for a single application, a resolver must
-     * return false when it is not able to determine the controller.
-     *
-     * The resolver must only throw an exception when it should be able to load
-     * controller but cannot because of some errors made by the developer.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return callable|false A PHP callable representing the Controller,
-     *                        or false if this resolver is not able to determine the controller
-     *
-     * @throws \LogicException If the controller can't be found
-     */
-    public function getController(Request $request);
-
-    /**
-     * Returns the arguments to pass to the controller.
-     *
-     * @param Request  $request    A Request instance
-     * @param callable $controller A PHP callable
-     *
-     * @return array An array of arguments to pass to the controller
-     *
-     * @throws \RuntimeException When value for argument given is not provided
-     */
-    public function getArguments(Request $request, $controller);
-}
diff --git a/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php b/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php
deleted file mode 100644
index f8de31c..0000000
--- a/vendor/symfony/http-kernel/Controller/TraceableControllerResolver.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\HttpKernel\Controller;
-
-use Symfony\Component\Stopwatch\Stopwatch;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * TraceableControllerResolver.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TraceableControllerResolver implements ControllerResolverInterface
-{
-    private $resolver;
-    private $stopwatch;
-
-    /**
-     * Constructor.
-     *
-     * @param ControllerResolverInterface $resolver  A ControllerResolverInterface instance
-     * @param Stopwatch                   $stopwatch A Stopwatch instance
-     */
-    public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch)
-    {
-        $this->resolver = $resolver;
-        $this->stopwatch = $stopwatch;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getController(Request $request)
-    {
-        $e = $this->stopwatch->start('controller.get_callable');
-
-        $ret = $this->resolver->getController($request);
-
-        $e->stop();
-
-        return $ret;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getArguments(Request $request, $controller)
-    {
-        $e = $this->stopwatch->start('controller.get_arguments');
-
-        $ret = $this->resolver->getArguments($request, $controller);
-
-        $e->stop();
-
-        return $ret;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php b/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php
deleted file mode 100644
index 853adcb..0000000
--- a/vendor/symfony/http-kernel/DataCollector/ConfigDataCollector.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * ConfigDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ConfigDataCollector extends DataCollector
-{
-    /**
-     * @var KernelInterface
-     */
-    private $kernel;
-    private $name;
-    private $version;
-    private $cacheVersionInfo = true;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name    The name of the application using the web profiler
-     * @param string $version The version of the application using the web profiler
-     */
-    public function __construct($name = null, $version = null)
-    {
-        $this->name = $name;
-        $this->version = $version;
-    }
-
-    /**
-     * Sets the Kernel associated with this Request.
-     *
-     * @param KernelInterface $kernel A KernelInterface instance
-     */
-    public function setKernel(KernelInterface $kernel = null)
-    {
-        $this->kernel = $kernel;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        $this->data = array(
-            'app_name' => $this->name,
-            'app_version' => $this->version,
-            'token' => $response->headers->get('X-Debug-Token'),
-            'symfony_version' => Kernel::VERSION,
-            'symfony_state' => 'unknown',
-            'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
-            'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
-            'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
-            'php_version' => PHP_VERSION,
-            'xdebug_enabled' => extension_loaded('xdebug'),
-            'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
-            'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
-            'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
-            'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
-            'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
-            'bundles' => array(),
-            'sapi_name' => php_sapi_name(),
-        );
-
-        if (isset($this->kernel)) {
-            foreach ($this->kernel->getBundles() as $name => $bundle) {
-                $this->data['bundles'][$name] = $bundle->getPath();
-            }
-
-            $this->data['symfony_state'] = $this->determineSymfonyState();
-        }
-    }
-
-    public function getApplicationName()
-    {
-        return $this->data['app_name'];
-    }
-
-    public function getApplicationVersion()
-    {
-        return $this->data['app_version'];
-    }
-
-    /**
-     * Gets the token.
-     *
-     * @return string The token
-     */
-    public function getToken()
-    {
-        return $this->data['token'];
-    }
-
-    /**
-     * Gets the Symfony version.
-     *
-     * @return string The Symfony version
-     */
-    public function getSymfonyVersion()
-    {
-        return $this->data['symfony_version'];
-    }
-
-    /**
-     * Returns the state of the current Symfony release.
-     *
-     * @return string One of: unknown, dev, stable, eom, eol
-     */
-    public function getSymfonyState()
-    {
-        return $this->data['symfony_state'];
-    }
-
-    public function setCacheVersionInfo($cacheVersionInfo)
-    {
-        $this->cacheVersionInfo = $cacheVersionInfo;
-    }
-
-    /**
-     * Gets the PHP version.
-     *
-     * @return string The PHP version
-     */
-    public function getPhpVersion()
-    {
-        return $this->data['php_version'];
-    }
-
-    /**
-     * Gets the application name.
-     *
-     * @return string The application name
-     */
-    public function getAppName()
-    {
-        return $this->data['name'];
-    }
-
-    /**
-     * Gets the environment.
-     *
-     * @return string The environment
-     */
-    public function getEnv()
-    {
-        return $this->data['env'];
-    }
-
-    /**
-     * Returns true if the debug is enabled.
-     *
-     * @return bool true if debug is enabled, false otherwise
-     */
-    public function isDebug()
-    {
-        return $this->data['debug'];
-    }
-
-    /**
-     * Returns true if the XDebug is enabled.
-     *
-     * @return bool true if XDebug is enabled, false otherwise
-     */
-    public function hasXDebug()
-    {
-        return $this->data['xdebug_enabled'];
-    }
-
-    /**
-     * Returns true if EAccelerator is enabled.
-     *
-     * @return bool true if EAccelerator is enabled, false otherwise
-     */
-    public function hasEAccelerator()
-    {
-        return $this->data['eaccel_enabled'];
-    }
-
-    /**
-     * Returns true if APC is enabled.
-     *
-     * @return bool true if APC is enabled, false otherwise
-     */
-    public function hasApc()
-    {
-        return $this->data['apc_enabled'];
-    }
-
-    /**
-     * Returns true if Zend OPcache is enabled.
-     *
-     * @return bool true if Zend OPcache is enabled, false otherwise
-     */
-    public function hasZendOpcache()
-    {
-        return $this->data['zend_opcache_enabled'];
-    }
-
-    /**
-     * Returns true if XCache is enabled.
-     *
-     * @return bool true if XCache is enabled, false otherwise
-     */
-    public function hasXCache()
-    {
-        return $this->data['xcache_enabled'];
-    }
-
-    /**
-     * Returns true if WinCache is enabled.
-     *
-     * @return bool true if WinCache is enabled, false otherwise
-     */
-    public function hasWinCache()
-    {
-        return $this->data['wincache_enabled'];
-    }
-
-    /**
-     * Returns true if any accelerator is enabled.
-     *
-     * @return bool true if any accelerator is enabled, false otherwise
-     */
-    public function hasAccelerator()
-    {
-        return $this->hasApc() || $this->hasZendOpcache() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache();
-    }
-
-    public function getBundles()
-    {
-        return $this->data['bundles'];
-    }
-
-    /**
-     * Gets the PHP SAPI name.
-     *
-     * @return string The environment
-     */
-    public function getSapiName()
-    {
-        return $this->data['sapi_name'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'config';
-    }
-
-    /**
-     * Tries to retrieve information about the current Symfony version.
-     *
-     * @return string One of: dev, stable, eom, eol
-     */
-    private function determineSymfonyState()
-    {
-        $now = new \DateTime();
-        $eom = \DateTime::createFromFormat('m/Y', Kernel::END_OF_MAINTENANCE)->modify('last day of this month');
-        $eol = \DateTime::createFromFormat('m/Y', Kernel::END_OF_LIFE)->modify('last day of this month');
-
-        if ($now > $eol) {
-            $versionState = 'eol';
-        } elseif ($now > $eom) {
-            $versionState = 'eom';
-        } elseif ('' !== Kernel::EXTRA_VERSION) {
-            $versionState = 'dev';
-        } else {
-            $versionState = 'stable';
-        }
-
-        return $versionState;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/DataCollector.php b/vendor/symfony/http-kernel/DataCollector/DataCollector.php
deleted file mode 100644
index 5dca652..0000000
--- a/vendor/symfony/http-kernel/DataCollector/DataCollector.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpKernel\DataCollector\Util\ValueExporter;
-
-/**
- * DataCollector.
- *
- * Children of this class must store the collected data in the data property.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@symfony.com>
- */
-abstract class DataCollector implements DataCollectorInterface, \Serializable
-{
-    protected $data = array();
-
-    /**
-     * @var ValueExporter
-     */
-    private $valueExporter;
-
-    public function serialize()
-    {
-        return serialize($this->data);
-    }
-
-    public function unserialize($data)
-    {
-        $this->data = unserialize($data);
-    }
-
-    /**
-     * Converts a PHP variable to a string.
-     *
-     * @param mixed $var A PHP variable
-     *
-     * @return string The string representation of the variable
-     */
-    protected function varToString($var)
-    {
-        if (null === $this->valueExporter) {
-            $this->valueExporter = new ValueExporter();
-        }
-
-        return $this->valueExporter->exportValue($var);
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php b/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php
deleted file mode 100644
index 2820ad5..0000000
--- a/vendor/symfony/http-kernel/DataCollector/DataCollectorInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * DataCollectorInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface DataCollectorInterface
-{
-    /**
-     * Collects data for the given Request and Response.
-     *
-     * @param Request    $request   A Request instance
-     * @param Response   $response  A Response instance
-     * @param \Exception $exception An Exception instance
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null);
-
-    /**
-     * Returns the name of the collector.
-     *
-     * @return string The collector name
-     */
-    public function getName();
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php b/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
deleted file mode 100644
index c50bf7a..0000000
--- a/vendor/symfony/http-kernel/DataCollector/DumpDataCollector.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Stopwatch\Stopwatch;
-use Symfony\Component\VarDumper\Cloner\Data;
-use Symfony\Component\VarDumper\Cloner\VarCloner;
-use Symfony\Component\VarDumper\Dumper\CliDumper;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
-use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DumpDataCollector extends DataCollector implements DataDumperInterface
-{
-    private $stopwatch;
-    private $fileLinkFormat;
-    private $dataCount = 0;
-    private $isCollected = true;
-    private $clonesCount = 0;
-    private $clonesIndex = 0;
-    private $rootRefs;
-    private $charset;
-    private $requestStack;
-    private $dumper;
-    private $dumperIsInjected;
-
-    public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, $charset = null, RequestStack $requestStack = null, DataDumperInterface $dumper = null)
-    {
-        $this->stopwatch = $stopwatch;
-        $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-        $this->charset = $charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8';
-        $this->requestStack = $requestStack;
-        $this->dumper = $dumper;
-        $this->dumperIsInjected = null !== $dumper;
-
-        // All clones share these properties by reference:
-        $this->rootRefs = array(
-            &$this->data,
-            &$this->dataCount,
-            &$this->isCollected,
-            &$this->clonesCount,
-        );
-    }
-
-    public function __clone()
-    {
-        $this->clonesIndex = ++$this->clonesCount;
-    }
-
-    public function dump(Data $data)
-    {
-        if ($this->stopwatch) {
-            $this->stopwatch->start('dump');
-        }
-        if ($this->isCollected) {
-            $this->isCollected = false;
-        }
-
-        $trace = DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS;
-        if (PHP_VERSION_ID >= 50400) {
-            $trace = debug_backtrace($trace, 7);
-        } else {
-            $trace = debug_backtrace($trace);
-        }
-
-        $file = $trace[0]['file'];
-        $line = $trace[0]['line'];
-        $name = false;
-        $fileExcerpt = false;
-
-        for ($i = 1; $i < 7; ++$i) {
-            if (isset($trace[$i]['class'], $trace[$i]['function'])
-                && 'dump' === $trace[$i]['function']
-                && 'Symfony\Component\VarDumper\VarDumper' === $trace[$i]['class']
-            ) {
-                $file = $trace[$i]['file'];
-                $line = $trace[$i]['line'];
-
-                while (++$i < 7) {
-                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
-                        $file = $trace[$i]['file'];
-                        $line = $trace[$i]['line'];
-
-                        break;
-                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
-                        $info = $trace[$i]['object'];
-                        $name = $info->getTemplateName();
-                        $src = method_exists($info, 'getSource') ? $info->getSource() : $info->getEnvironment()->getLoader()->getSource($name);
-                        $info = $info->getDebugInfo();
-                        if (null !== $src && isset($info[$trace[$i - 1]['line']])) {
-                            $file = false;
-                            $line = $info[$trace[$i - 1]['line']];
-                            $src = explode("\n", $src);
-                            $fileExcerpt = array();
-
-                            for ($i = max($line - 3, 1), $max = min($line + 3, count($src)); $i <= $max; ++$i) {
-                                $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.$this->htmlEncode($src[$i - 1]).'</code></li>';
-                            }
-
-                            $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
-                        }
-                        break;
-                    }
-                }
-                break;
-            }
-        }
-
-        if (false === $name) {
-            $name = str_replace('\\', '/', $file);
-            $name = substr($name, strrpos($name, '/') + 1);
-        }
-
-        if ($this->dumper) {
-            $this->doDump($data, $name, $file, $line);
-        }
-
-        $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');
-        ++$this->dataCount;
-
-        if ($this->stopwatch) {
-            $this->stopwatch->stop('dump');
-        }
-    }
-
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        // Sub-requests and programmatic calls stay in the collected profile.
-        if ($this->dumper || ($this->requestStack && $this->requestStack->getMasterRequest() !== $request) || $request->isXmlHttpRequest() || $request->headers->has('Origin')) {
-            return;
-        }
-
-        // In all other conditions that remove the web debug toolbar, dumps are written on the output.
-        if (!$this->requestStack
-            || !$response->headers->has('X-Debug-Token')
-            || $response->isRedirection()
-            || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))
-            || 'html' !== $request->getRequestFormat()
-            || false === strripos($response->getContent(), '</body>')
-        ) {
-            if ($response->headers->has('Content-Type') && false !== strpos($response->headers->get('Content-Type'), 'html')) {
-                $this->dumper = new HtmlDumper('php://output', $this->charset);
-            } else {
-                $this->dumper = new CliDumper('php://output', $this->charset);
-            }
-
-            foreach ($this->data as $dump) {
-                $this->doDump($dump['data'], $dump['name'], $dump['file'], $dump['line']);
-            }
-        }
-    }
-
-    public function serialize()
-    {
-        if ($this->clonesCount !== $this->clonesIndex) {
-            return 'a:0:{}';
-        }
-
-        $ser = serialize($this->data);
-        $this->data = array();
-        $this->dataCount = 0;
-        $this->isCollected = true;
-        if (!$this->dumperIsInjected) {
-            $this->dumper = null;
-        }
-
-        return $ser;
-    }
-
-    public function unserialize($data)
-    {
-        parent::unserialize($data);
-        $this->dataCount = count($this->data);
-        self::__construct($this->stopwatch);
-    }
-
-    public function getDumpsCount()
-    {
-        return $this->dataCount;
-    }
-
-    public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
-    {
-        $data = fopen('php://memory', 'r+b');
-
-        if ('html' === $format) {
-            $dumper = new HtmlDumper($data, $this->charset);
-        } else {
-            throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
-        }
-        $dumps = array();
-
-        foreach ($this->data as $dump) {
-            if (method_exists($dump['data'], 'withMaxDepth')) {
-                $dumper->dump($dump['data']->withMaxDepth($maxDepthLimit)->withMaxItemsPerDepth($maxItemsPerDepth));
-            } else {
-                // getLimitedClone is @deprecated, to be removed in 3.0
-                $dumper->dump($dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth));
-            }
-            rewind($data);
-            $dump['data'] = stream_get_contents($data);
-            ftruncate($data, 0);
-            rewind($data);
-            $dumps[] = $dump;
-        }
-
-        return $dumps;
-    }
-
-    public function getName()
-    {
-        return 'dump';
-    }
-
-    public function __destruct()
-    {
-        if (0 === $this->clonesCount-- && !$this->isCollected && $this->data) {
-            $this->clonesCount = 0;
-            $this->isCollected = true;
-
-            $h = headers_list();
-            $i = count($h);
-            array_unshift($h, 'Content-Type: '.ini_get('default_mimetype'));
-            while (0 !== stripos($h[$i], 'Content-Type:')) {
-                --$i;
-            }
-
-            if ('cli' !== PHP_SAPI && stripos($h[$i], 'html')) {
-                $this->dumper = new HtmlDumper('php://output', $this->charset);
-            } else {
-                $this->dumper = new CliDumper('php://output', $this->charset);
-            }
-
-            foreach ($this->data as $i => $dump) {
-                $this->data[$i] = null;
-                $this->doDump($dump['data'], $dump['name'], $dump['file'], $dump['line']);
-            }
-
-            $this->data = array();
-            $this->dataCount = 0;
-        }
-    }
-
-    private function doDump($data, $name, $file, $line)
-    {
-        if (PHP_VERSION_ID >= 50400 && $this->dumper instanceof CliDumper) {
-            $contextDumper = function ($name, $file, $line, $fileLinkFormat) {
-                if ($this instanceof HtmlDumper) {
-                    if ('' !== $file) {
-                        $s = $this->style('meta', '%s');
-                        $name = strip_tags($this->style('', $name));
-                        $file = strip_tags($this->style('', $file));
-                        if ($fileLinkFormat) {
-                            $link = strtr(strip_tags($this->style('', $fileLinkFormat)), array('%f' => $file, '%l' => (int) $line));
-                            $name = sprintf('<a href="%s" title="%s">'.$s.'</a>', $link, $file, $name);
-                        } else {
-                            $name = sprintf('<abbr title="%s">'.$s.'</abbr>', $file, $name);
-                        }
-                    } else {
-                        $name = $this->style('meta', $name);
-                    }
-                    $this->line = $name.' on line '.$this->style('meta', $line).':';
-                } else {
-                    $this->line = $this->style('meta', $name).' on line '.$this->style('meta', $line).':';
-                }
-                $this->dumpLine(0);
-            };
-            $contextDumper = $contextDumper->bindTo($this->dumper, $this->dumper);
-            $contextDumper($name, $file, $line, $this->fileLinkFormat);
-        } else {
-            $cloner = new VarCloner();
-            $this->dumper->dump($cloner->cloneVar($name.' on line '.$line.':'));
-        }
-        $this->dumper->dump($data);
-    }
-
-    private function htmlEncode($s)
-    {
-        $html = '';
-
-        $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
-        $dumper->setDumpHeader('');
-        $dumper->setDumpBoundaries('', '');
-
-        $cloner = new VarCloner();
-        $dumper->dump($cloner->cloneVar($s));
-
-        return substr(strip_tags($html), 1, -1);
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php b/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php
deleted file mode 100644
index 0a87bc3..0000000
--- a/vendor/symfony/http-kernel/DataCollector/EventDataCollector.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcherInterface;
-
-/**
- * EventDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class EventDataCollector extends DataCollector implements LateDataCollectorInterface
-{
-    protected $dispatcher;
-
-    public function __construct(EventDispatcherInterface $dispatcher = null)
-    {
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        $this->data = array(
-            'called_listeners' => array(),
-            'not_called_listeners' => array(),
-        );
-    }
-
-    public function lateCollect()
-    {
-        if ($this->dispatcher instanceof TraceableEventDispatcherInterface) {
-            $this->setCalledListeners($this->dispatcher->getCalledListeners());
-            $this->setNotCalledListeners($this->dispatcher->getNotCalledListeners());
-        }
-    }
-
-    /**
-     * Sets the called listeners.
-     *
-     * @param array $listeners An array of called listeners
-     *
-     * @see TraceableEventDispatcherInterface
-     */
-    public function setCalledListeners(array $listeners)
-    {
-        $this->data['called_listeners'] = $listeners;
-    }
-
-    /**
-     * Gets the called listeners.
-     *
-     * @return array An array of called listeners
-     *
-     * @see TraceableEventDispatcherInterface
-     */
-    public function getCalledListeners()
-    {
-        return $this->data['called_listeners'];
-    }
-
-    /**
-     * Sets the not called listeners.
-     *
-     * @param array $listeners An array of not called listeners
-     *
-     * @see TraceableEventDispatcherInterface
-     */
-    public function setNotCalledListeners(array $listeners)
-    {
-        $this->data['not_called_listeners'] = $listeners;
-    }
-
-    /**
-     * Gets the not called listeners.
-     *
-     * @return array An array of not called listeners
-     *
-     * @see TraceableEventDispatcherInterface
-     */
-    public function getNotCalledListeners()
-    {
-        return $this->data['not_called_listeners'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'events';
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/ExceptionDataCollector.php b/vendor/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
deleted file mode 100644
index 9fe8264..0000000
--- a/vendor/symfony/http-kernel/DataCollector/ExceptionDataCollector.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * ExceptionDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ExceptionDataCollector extends DataCollector
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        if (null !== $exception) {
-            $this->data = array(
-                'exception' => FlattenException::create($exception),
-            );
-        }
-    }
-
-    /**
-     * Checks if the exception is not null.
-     *
-     * @return bool true if the exception is not null, false otherwise
-     */
-    public function hasException()
-    {
-        return isset($this->data['exception']);
-    }
-
-    /**
-     * Gets the exception.
-     *
-     * @return \Exception The exception
-     */
-    public function getException()
-    {
-        return $this->data['exception'];
-    }
-
-    /**
-     * Gets the exception message.
-     *
-     * @return string The exception message
-     */
-    public function getMessage()
-    {
-        return $this->data['exception']->getMessage();
-    }
-
-    /**
-     * Gets the exception code.
-     *
-     * @return int The exception code
-     */
-    public function getCode()
-    {
-        return $this->data['exception']->getCode();
-    }
-
-    /**
-     * Gets the status code.
-     *
-     * @return int The status code
-     */
-    public function getStatusCode()
-    {
-        return $this->data['exception']->getStatusCode();
-    }
-
-    /**
-     * Gets the exception trace.
-     *
-     * @return array The exception trace
-     */
-    public function getTrace()
-    {
-        return $this->data['exception']->getTrace();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'exception';
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/LateDataCollectorInterface.php b/vendor/symfony/http-kernel/DataCollector/LateDataCollectorInterface.php
deleted file mode 100644
index 012332d..0000000
--- a/vendor/symfony/http-kernel/DataCollector/LateDataCollectorInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-/**
- * LateDataCollectorInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface LateDataCollectorInterface
-{
-    /**
-     * Collects data as late as possible.
-     */
-    public function lateCollect();
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php b/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
deleted file mode 100644
index 1258434..0000000
--- a/vendor/symfony/http-kernel/DataCollector/LoggerDataCollector.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
-
-/**
- * LogDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface
-{
-    private $logger;
-
-    public function __construct($logger = null)
-    {
-        if (null !== $logger && $logger instanceof DebugLoggerInterface) {
-            $this->logger = $logger;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        // everything is done as late as possible
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function lateCollect()
-    {
-        if (null !== $this->logger) {
-            $this->data = $this->computeErrorsCount();
-            $this->data['logs'] = $this->sanitizeLogs($this->logger->getLogs());
-        }
-    }
-
-    /**
-     * Gets the called events.
-     *
-     * @return array An array of called events
-     *
-     * @see TraceableEventDispatcherInterface
-     */
-    public function countErrors()
-    {
-        return isset($this->data['error_count']) ? $this->data['error_count'] : 0;
-    }
-
-    /**
-     * Gets the logs.
-     *
-     * @return array An array of logs
-     */
-    public function getLogs()
-    {
-        return isset($this->data['logs']) ? $this->data['logs'] : array();
-    }
-
-    public function getPriorities()
-    {
-        return isset($this->data['priorities']) ? $this->data['priorities'] : array();
-    }
-
-    public function countDeprecations()
-    {
-        return isset($this->data['deprecation_count']) ? $this->data['deprecation_count'] : 0;
-    }
-
-    public function countScreams()
-    {
-        return isset($this->data['scream_count']) ? $this->data['scream_count'] : 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'logger';
-    }
-
-    private function sanitizeLogs($logs)
-    {
-        $errorContextById = array();
-        $sanitizedLogs = array();
-
-        foreach ($logs as $log) {
-            $context = $this->sanitizeContext($log['context']);
-
-            if (isset($context['type'], $context['file'], $context['line'], $context['level'])) {
-                $errorId = md5("{$context['type']}/{$context['line']}/{$context['file']}\x00{$log['message']}", true);
-                $silenced = !($context['type'] & $context['level']);
-
-                if (isset($errorContextById[$errorId])) {
-                    if (isset($errorContextById[$errorId]['errorCount'])) {
-                        ++$errorContextById[$errorId]['errorCount'];
-                    } else {
-                        $errorContextById[$errorId]['errorCount'] = 2;
-                    }
-
-                    if (!$silenced && isset($errorContextById[$errorId]['scream'])) {
-                        unset($errorContextById[$errorId]['scream']);
-                        $errorContextById[$errorId]['level'] = $context['level'];
-                    }
-
-                    continue;
-                }
-
-                $errorContextById[$errorId] = &$context;
-                if ($silenced) {
-                    $context['scream'] = true;
-                }
-
-                $log['context'] = &$context;
-                unset($context);
-            } else {
-                $log['context'] = $context;
-            }
-
-            $sanitizedLogs[] = $log;
-        }
-
-        return $sanitizedLogs;
-    }
-
-    private function sanitizeContext($context)
-    {
-        if (is_array($context)) {
-            foreach ($context as $key => $value) {
-                $context[$key] = $this->sanitizeContext($value);
-            }
-
-            return $context;
-        }
-
-        if (is_resource($context)) {
-            return sprintf('Resource(%s)', get_resource_type($context));
-        }
-
-        if (is_object($context)) {
-            return sprintf('Object(%s)', get_class($context));
-        }
-
-        return $context;
-    }
-
-    private function computeErrorsCount()
-    {
-        $count = array(
-            'error_count' => $this->logger->countErrors(),
-            'deprecation_count' => 0,
-            'scream_count' => 0,
-            'priorities' => array(),
-        );
-
-        foreach ($this->logger->getLogs() as $log) {
-            if (isset($count['priorities'][$log['priority']])) {
-                ++$count['priorities'][$log['priority']]['count'];
-            } else {
-                $count['priorities'][$log['priority']] = array(
-                    'count' => 1,
-                    'name' => $log['priorityName'],
-                );
-            }
-
-            if (isset($log['context']['type'], $log['context']['level'])) {
-                if (E_DEPRECATED === $log['context']['type'] || E_USER_DEPRECATED === $log['context']['type']) {
-                    ++$count['deprecation_count'];
-                } elseif (!($log['context']['type'] & $log['context']['level'])) {
-                    ++$count['scream_count'];
-                }
-            }
-        }
-
-        ksort($count['priorities']);
-
-        return $count;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php b/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
deleted file mode 100644
index 9385010..0000000
--- a/vendor/symfony/http-kernel/DataCollector/MemoryDataCollector.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * MemoryDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class MemoryDataCollector extends DataCollector implements LateDataCollectorInterface
-{
-    public function __construct()
-    {
-        $this->data = array(
-            'memory' => 0,
-            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        $this->updateMemoryUsage();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function lateCollect()
-    {
-        $this->updateMemoryUsage();
-    }
-
-    /**
-     * Gets the memory.
-     *
-     * @return int The memory
-     */
-    public function getMemory()
-    {
-        return $this->data['memory'];
-    }
-
-    /**
-     * Gets the PHP memory limit.
-     *
-     * @return int The memory limit
-     */
-    public function getMemoryLimit()
-    {
-        return $this->data['memory_limit'];
-    }
-
-    /**
-     * Updates the memory usage data.
-     */
-    public function updateMemoryUsage()
-    {
-        $this->data['memory'] = memory_get_peak_usage(true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'memory';
-    }
-
-    private function convertToBytes($memoryLimit)
-    {
-        if ('-1' === $memoryLimit) {
-            return -1;
-        }
-
-        $memoryLimit = strtolower($memoryLimit);
-        $max = strtolower(ltrim($memoryLimit, '+'));
-        if (0 === strpos($max, '0x')) {
-            $max = intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
-            $max = intval($max, 8);
-        } else {
-            $max = (int) $max;
-        }
-
-        switch (substr($memoryLimit, -1)) {
-            case 't': $max *= 1024;
-            case 'g': $max *= 1024;
-            case 'm': $max *= 1024;
-            case 'k': $max *= 1024;
-        }
-
-        return $max;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php b/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
deleted file mode 100644
index 9a499a7..0000000
--- a/vendor/symfony/http-kernel/DataCollector/RequestDataCollector.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\ParameterBag;
-use Symfony\Component\HttpFoundation\HeaderBag;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * RequestDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RequestDataCollector extends DataCollector implements EventSubscriberInterface
-{
-    protected $controllers;
-
-    public function __construct()
-    {
-        $this->controllers = new \SplObjectStorage();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        $responseHeaders = $response->headers->all();
-        $cookies = array();
-        foreach ($response->headers->getCookies() as $cookie) {
-            $cookies[] = $this->getCookieHeader($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());
-        }
-        if (count($cookies) > 0) {
-            $responseHeaders['Set-Cookie'] = $cookies;
-        }
-
-        // attributes are serialized and as they can be anything, they need to be converted to strings.
-        $attributes = array();
-        foreach ($request->attributes->all() as $key => $value) {
-            if ('_route' === $key && is_object($value)) {
-                $attributes[$key] = $this->varToString($value->getPath());
-            } elseif ('_route_params' === $key) {
-                // we need to keep route params as an array (see getRouteParams())
-                foreach ($value as $k => $v) {
-                    $value[$k] = $this->varToString($v);
-                }
-                $attributes[$key] = $value;
-            } else {
-                $attributes[$key] = $this->varToString($value);
-            }
-        }
-
-        $content = null;
-        try {
-            $content = $request->getContent();
-        } catch (\LogicException $e) {
-            // the user already got the request content as a resource
-            $content = false;
-        }
-
-        $sessionMetadata = array();
-        $sessionAttributes = array();
-        $flashes = array();
-        if ($request->hasSession()) {
-            $session = $request->getSession();
-            if ($session->isStarted()) {
-                $sessionMetadata['Created'] = date(DATE_RFC822, $session->getMetadataBag()->getCreated());
-                $sessionMetadata['Last used'] = date(DATE_RFC822, $session->getMetadataBag()->getLastUsed());
-                $sessionMetadata['Lifetime'] = $session->getMetadataBag()->getLifetime();
-                $sessionAttributes = $session->all();
-                $flashes = $session->getFlashBag()->peekAll();
-            }
-        }
-
-        $statusCode = $response->getStatusCode();
-
-        $this->data = array(
-            'format' => $request->getRequestFormat(),
-            'content' => $content,
-            'content_type' => $response->headers->get('Content-Type', 'text/html'),
-            'status_text' => isset(Response::$statusTexts[$statusCode]) ? Response::$statusTexts[$statusCode] : '',
-            'status_code' => $statusCode,
-            'request_query' => $request->query->all(),
-            'request_request' => $request->request->all(),
-            'request_headers' => $request->headers->all(),
-            'request_server' => $request->server->all(),
-            'request_cookies' => $request->cookies->all(),
-            'request_attributes' => $attributes,
-            'response_headers' => $responseHeaders,
-            'session_metadata' => $sessionMetadata,
-            'session_attributes' => $sessionAttributes,
-            'flashes' => $flashes,
-            'path_info' => $request->getPathInfo(),
-            'controller' => 'n/a',
-            'locale' => $request->getLocale(),
-        );
-
-        if (isset($this->data['request_headers']['php-auth-pw'])) {
-            $this->data['request_headers']['php-auth-pw'] = '******';
-        }
-
-        if (isset($this->data['request_server']['PHP_AUTH_PW'])) {
-            $this->data['request_server']['PHP_AUTH_PW'] = '******';
-        }
-
-        if (isset($this->data['request_request']['_password'])) {
-            $this->data['request_request']['_password'] = '******';
-        }
-
-        if (isset($this->controllers[$request])) {
-            $controller = $this->controllers[$request];
-            if (is_array($controller)) {
-                try {
-                    $r = new \ReflectionMethod($controller[0], $controller[1]);
-                    $this->data['controller'] = array(
-                        'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
-                        'method' => $controller[1],
-                        'file' => $r->getFileName(),
-                        'line' => $r->getStartLine(),
-                    );
-                } catch (\ReflectionException $e) {
-                    if (is_callable($controller)) {
-                        // using __call or  __callStatic
-                        $this->data['controller'] = array(
-                            'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
-                            'method' => $controller[1],
-                            'file' => 'n/a',
-                            'line' => 'n/a',
-                        );
-                    }
-                }
-            } elseif ($controller instanceof \Closure) {
-                $r = new \ReflectionFunction($controller);
-                $this->data['controller'] = array(
-                    'class' => $r->getName(),
-                    'method' => null,
-                    'file' => $r->getFileName(),
-                    'line' => $r->getStartLine(),
-                );
-            } elseif (is_object($controller)) {
-                $r = new \ReflectionClass($controller);
-                $this->data['controller'] = array(
-                    'class' => $r->getName(),
-                    'method' => null,
-                    'file' => $r->getFileName(),
-                    'line' => $r->getStartLine(),
-                );
-            } else {
-                $this->data['controller'] = (string) $controller ?: 'n/a';
-            }
-            unset($this->controllers[$request]);
-        }
-    }
-
-    public function getPathInfo()
-    {
-        return $this->data['path_info'];
-    }
-
-    public function getRequestRequest()
-    {
-        return new ParameterBag($this->data['request_request']);
-    }
-
-    public function getRequestQuery()
-    {
-        return new ParameterBag($this->data['request_query']);
-    }
-
-    public function getRequestHeaders()
-    {
-        return new HeaderBag($this->data['request_headers']);
-    }
-
-    public function getRequestServer()
-    {
-        return new ParameterBag($this->data['request_server']);
-    }
-
-    public function getRequestCookies()
-    {
-        return new ParameterBag($this->data['request_cookies']);
-    }
-
-    public function getRequestAttributes()
-    {
-        return new ParameterBag($this->data['request_attributes']);
-    }
-
-    public function getResponseHeaders()
-    {
-        return new ResponseHeaderBag($this->data['response_headers']);
-    }
-
-    public function getSessionMetadata()
-    {
-        return $this->data['session_metadata'];
-    }
-
-    public function getSessionAttributes()
-    {
-        return $this->data['session_attributes'];
-    }
-
-    public function getFlashes()
-    {
-        return $this->data['flashes'];
-    }
-
-    public function getContent()
-    {
-        return $this->data['content'];
-    }
-
-    public function getContentType()
-    {
-        return $this->data['content_type'];
-    }
-
-    public function getStatusText()
-    {
-        return $this->data['status_text'];
-    }
-
-    public function getStatusCode()
-    {
-        return $this->data['status_code'];
-    }
-
-    public function getFormat()
-    {
-        return $this->data['format'];
-    }
-
-    public function getLocale()
-    {
-        return $this->data['locale'];
-    }
-
-    /**
-     * Gets the route name.
-     *
-     * The _route request attributes is automatically set by the Router Matcher.
-     *
-     * @return string The route
-     */
-    public function getRoute()
-    {
-        return isset($this->data['request_attributes']['_route']) ? $this->data['request_attributes']['_route'] : '';
-    }
-
-    /**
-     * Gets the route parameters.
-     *
-     * The _route_params request attributes is automatically set by the RouterListener.
-     *
-     * @return array The parameters
-     */
-    public function getRouteParams()
-    {
-        return isset($this->data['request_attributes']['_route_params']) ? $this->data['request_attributes']['_route_params'] : array();
-    }
-
-    /**
-     * Gets the controller.
-     *
-     * @return string The controller as a string
-     */
-    public function getController()
-    {
-        return $this->data['controller'];
-    }
-
-    public function onKernelController(FilterControllerEvent $event)
-    {
-        $this->controllers[$event->getRequest()] = $event->getController();
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(KernelEvents::CONTROLLER => 'onKernelController');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'request';
-    }
-
-    private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly)
-    {
-        $cookie = sprintf('%s=%s', $name, urlencode($value));
-
-        if (0 !== $expires) {
-            if (is_numeric($expires)) {
-                $expires = (int) $expires;
-            } elseif ($expires instanceof \DateTime) {
-                $expires = $expires->getTimestamp();
-            } else {
-                $tmp = strtotime($expires);
-                if (false === $tmp || -1 == $tmp) {
-                    throw new \InvalidArgumentException(sprintf('The "expires" cookie parameter is not valid (%s).', $expires));
-                }
-                $expires = $tmp;
-            }
-
-            $cookie .= '; expires='.str_replace('+0000', '', \DateTime::createFromFormat('U', $expires, new \DateTimeZone('GMT'))->format('D, d-M-Y H:i:s T'));
-        }
-
-        if ($domain) {
-            $cookie .= '; domain='.$domain;
-        }
-
-        $cookie .= '; path='.$path;
-
-        if ($secure) {
-            $cookie .= '; secure';
-        }
-
-        if ($httponly) {
-            $cookie .= '; httponly';
-        }
-
-        return $cookie;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php b/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php
deleted file mode 100644
index 76d9623..0000000
--- a/vendor/symfony/http-kernel/DataCollector/RouterDataCollector.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-
-/**
- * RouterDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RouterDataCollector extends DataCollector
-{
-    protected $controllers;
-
-    public function __construct()
-    {
-        $this->controllers = new \SplObjectStorage();
-
-        $this->data = array(
-            'redirect' => false,
-            'url' => null,
-            'route' => null,
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        if ($response instanceof RedirectResponse) {
-            $this->data['redirect'] = true;
-            $this->data['url'] = $response->getTargetUrl();
-
-            if ($this->controllers->contains($request)) {
-                $this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
-            }
-        }
-
-        unset($this->controllers[$request]);
-    }
-
-    protected function guessRoute(Request $request, $controller)
-    {
-        return 'n/a';
-    }
-
-    /**
-     * Remembers the controller associated to each request.
-     *
-     * @param FilterControllerEvent $event The filter controller event
-     */
-    public function onKernelController(FilterControllerEvent $event)
-    {
-        $this->controllers[$event->getRequest()] = $event->getController();
-    }
-
-    /**
-     * @return bool Whether this request will result in a redirect
-     */
-    public function getRedirect()
-    {
-        return $this->data['redirect'];
-    }
-
-    /**
-     * @return string|null The target URL
-     */
-    public function getTargetUrl()
-    {
-        return $this->data['url'];
-    }
-
-    /**
-     * @return string|null The target route
-     */
-    public function getTargetRoute()
-    {
-        return $this->data['route'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'router';
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/TimeDataCollector.php b/vendor/symfony/http-kernel/DataCollector/TimeDataCollector.php
deleted file mode 100644
index 4ccaafa..0000000
--- a/vendor/symfony/http-kernel/DataCollector/TimeDataCollector.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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\Component\HttpKernel\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\KernelInterface;
-
-/**
- * TimeDataCollector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
-{
-    protected $kernel;
-    protected $stopwatch;
-
-    public function __construct(KernelInterface $kernel = null, $stopwatch = null)
-    {
-        $this->kernel = $kernel;
-        $this->stopwatch = $stopwatch;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        if (null !== $this->kernel) {
-            $startTime = $this->kernel->getStartTime();
-        } else {
-            $startTime = $request->server->get('REQUEST_TIME_FLOAT', $request->server->get('REQUEST_TIME'));
-        }
-
-        $this->data = array(
-            'token' => $response->headers->get('X-Debug-Token'),
-            'start_time' => $startTime * 1000,
-            'events' => array(),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function lateCollect()
-    {
-        if (null !== $this->stopwatch && isset($this->data['token'])) {
-            $this->setEvents($this->stopwatch->getSectionEvents($this->data['token']));
-        }
-        unset($this->data['token']);
-    }
-
-    /**
-     * Sets the request events.
-     *
-     * @param array $events The request events
-     */
-    public function setEvents(array $events)
-    {
-        foreach ($events as $event) {
-            $event->ensureStopped();
-        }
-
-        $this->data['events'] = $events;
-    }
-
-    /**
-     * Gets the request events.
-     *
-     * @return array The request events
-     */
-    public function getEvents()
-    {
-        return $this->data['events'];
-    }
-
-    /**
-     * Gets the request elapsed time.
-     *
-     * @return float The elapsed time
-     */
-    public function getDuration()
-    {
-        if (!isset($this->data['events']['__section__'])) {
-            return 0;
-        }
-
-        $lastEvent = $this->data['events']['__section__'];
-
-        return $lastEvent->getOrigin() + $lastEvent->getDuration() - $this->getStartTime();
-    }
-
-    /**
-     * Gets the initialization time.
-     *
-     * This is the time spent until the beginning of the request handling.
-     *
-     * @return float The elapsed time
-     */
-    public function getInitTime()
-    {
-        if (!isset($this->data['events']['__section__'])) {
-            return 0;
-        }
-
-        return $this->data['events']['__section__']->getOrigin() - $this->getStartTime();
-    }
-
-    /**
-     * Gets the request time.
-     *
-     * @return int The time
-     */
-    public function getStartTime()
-    {
-        return $this->data['start_time'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'time';
-    }
-}
diff --git a/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php b/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
deleted file mode 100644
index d2f0898..0000000
--- a/vendor/symfony/http-kernel/DataCollector/Util/ValueExporter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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\Component\HttpKernel\DataCollector\Util;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ValueExporter
-{
-    /**
-     * Converts a PHP value to a string.
-     *
-     * @param mixed $value The PHP value
-     * @param int   $depth only for internal usage
-     * @param bool  $deep  only for internal usage
-     *
-     * @return string The string representation of the given value
-     */
-    public function exportValue($value, $depth = 1, $deep = false)
-    {
-        if (is_object($value)) {
-            if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
-                return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
-            }
-
-            return sprintf('Object(%s)', get_class($value));
-        }
-
-        if (is_array($value)) {
-            if (empty($value)) {
-                return '[]';
-            }
-
-            $indent = str_repeat('  ', $depth);
-
-            $a = array();
-            foreach ($value as $k => $v) {
-                if (is_array($v)) {
-                    $deep = true;
-                }
-                $a[] = sprintf('%s => %s', $k, $this->exportValue($v, $depth + 1, $deep));
-            }
-
-            if ($deep) {
-                return sprintf("[\n%s%s\n%s]", $indent, implode(sprintf(", \n%s", $indent), $a), str_repeat('  ', $depth - 1));
-            }
-
-            return sprintf('[%s]', implode(', ', $a));
-        }
-
-        if (is_resource($value)) {
-            return sprintf('Resource(%s#%d)', get_resource_type($value), $value);
-        }
-
-        if (null === $value) {
-            return 'null';
-        }
-
-        if (false === $value) {
-            return 'false';
-        }
-
-        if (true === $value) {
-            return 'true';
-        }
-
-        return (string) $value;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Debug/ErrorHandler.php b/vendor/symfony/http-kernel/Debug/ErrorHandler.php
deleted file mode 100644
index af714a3..0000000
--- a/vendor/symfony/http-kernel/Debug/ErrorHandler.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\HttpKernel\Debug;
-
-@trigger_error('The '.__NAMESPACE__.'\ErrorHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ErrorHandler class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Debug\ErrorHandler as DebugErrorHandler;
-
-/**
- * ErrorHandler.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class ErrorHandler extends DebugErrorHandler
-{
-}
diff --git a/vendor/symfony/http-kernel/Debug/ExceptionHandler.php b/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
deleted file mode 100644
index 50755d9..0000000
--- a/vendor/symfony/http-kernel/Debug/ExceptionHandler.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\HttpKernel\Debug;
-
-@trigger_error('The '.__NAMESPACE__.'\ExceptionHandler class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\ExceptionHandler class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Debug\ExceptionHandler as DebugExceptionHandler;
-
-/**
- * ExceptionHandler converts an exception to a Response object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class ExceptionHandler extends DebugExceptionHandler
-{
-}
diff --git a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
deleted file mode 100644
index eb1d8a8..0000000
--- a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\HttpKernel\Debug;
-
-use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher as BaseTraceableEventDispatcher;
-use Symfony\Component\HttpKernel\Profiler\Profiler;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Collects some data about event listeners.
- *
- * This event dispatcher delegates the dispatching to another one.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TraceableEventDispatcher extends BaseTraceableEventDispatcher
-{
-    /**
-     * Sets the profiler.
-     *
-     * The traceable event dispatcher does not use the profiler anymore.
-     * The job is now done directly by the Profiler listener and the
-     * data collectors themselves.
-     *
-     * @param Profiler|null $profiler A Profiler instance
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public function setProfiler(Profiler $profiler = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function preDispatch($eventName, Event $event)
-    {
-        switch ($eventName) {
-            case KernelEvents::REQUEST:
-                $this->stopwatch->openSection();
-                break;
-            case KernelEvents::VIEW:
-            case KernelEvents::RESPONSE:
-                // stop only if a controller has been executed
-                if ($this->stopwatch->isStarted('controller')) {
-                    $this->stopwatch->stop('controller');
-                }
-                break;
-            case KernelEvents::TERMINATE:
-                $token = $event->getResponse()->headers->get('X-Debug-Token');
-                // There is a very special case when using built-in AppCache class as kernel wrapper, in the case
-                // of an ESI request leading to a `stale` response [B]  inside a `fresh` cached response [A].
-                // In this case, `$token` contains the [B] debug token, but the  open `stopwatch` section ID
-                // is equal to the [A] debug token. Trying to reopen section with the [B] token throws an exception
-                // which must be caught.
-                try {
-                    $this->stopwatch->openSection($token);
-                } catch (\LogicException $e) {
-                }
-                break;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function postDispatch($eventName, Event $event)
-    {
-        switch ($eventName) {
-            case KernelEvents::CONTROLLER:
-                $this->stopwatch->start('controller', 'section');
-                break;
-            case KernelEvents::RESPONSE:
-                $token = $event->getResponse()->headers->get('X-Debug-Token');
-                $this->stopwatch->stopSection($token);
-                break;
-            case KernelEvents::TERMINATE:
-                // In the special case described in the `preDispatch` method above, the `$token` section
-                // does not exist, then closing it throws an exception which must be caught.
-                $token = $event->getResponse()->headers->get('X-Debug-Token');
-                try {
-                    $this->stopwatch->stopSection($token);
-                } catch (\LogicException $e) {
-                }
-                break;
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php b/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php
deleted file mode 100644
index 09af6bd..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/AddClassesToCachePass.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\HttpKernel\Kernel;
-
-/**
- * Sets the classes to compile in the cache for the container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class AddClassesToCachePass implements CompilerPassInterface
-{
-    private $kernel;
-
-    public function __construct(Kernel $kernel)
-    {
-        $this->kernel = $kernel;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $classes = array();
-        foreach ($container->getExtensions() as $extension) {
-            if ($extension instanceof Extension) {
-                $classes = array_merge($classes, $extension->getClassesToCompile());
-            }
-        }
-
-        $this->kernel->setClassCache(array_unique($container->getParameterBag()->resolveValue($classes)));
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php b/vendor/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php
deleted file mode 100644
index c7eca30..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/ConfigurableExtension.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * This extension sub-class provides first-class integration with the
- * Config/Definition Component.
- *
- * You can use this as base class if
- *
- *    a) you use the Config/Definition component for configuration,
- *    b) your configuration class is named "Configuration", and
- *    c) the configuration class resides in the DependencyInjection sub-folder.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-abstract class ConfigurableExtension extends Extension
-{
-    /**
-     * {@inheritdoc}
-     */
-    final public function load(array $configs, ContainerBuilder $container)
-    {
-        $this->loadInternal($this->processConfiguration($this->getConfiguration($configs, $container), $configs), $container);
-    }
-
-    /**
-     * Configures the passed container according to the merged configuration.
-     *
-     * @param array            $mergedConfig
-     * @param ContainerBuilder $container
-     */
-    abstract protected function loadInternal(array $mergedConfig, ContainerBuilder $container);
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php b/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
deleted file mode 100644
index 97aa740..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/ContainerAwareHttpKernel.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\HttpKernel;
-use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Scope;
-
-/**
- * Adds a managed request scope.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0.
- */
-class ContainerAwareHttpKernel extends HttpKernel
-{
-    protected $container;
-
-    /**
-     * Constructor.
-     *
-     * @param EventDispatcherInterface    $dispatcher         An EventDispatcherInterface instance
-     * @param ContainerInterface          $container          A ContainerInterface instance
-     * @param ControllerResolverInterface $controllerResolver A ControllerResolverInterface instance
-     * @param RequestStack                $requestStack       A stack for master/sub requests
-     * @param bool                        $triggerDeprecation Whether or not to trigger the deprecation warning for the ContainerAwareHttpKernel
-     */
-    public function __construct(EventDispatcherInterface $dispatcher, ContainerInterface $container, ControllerResolverInterface $controllerResolver, RequestStack $requestStack = null, $triggerDeprecation = true)
-    {
-        parent::__construct($dispatcher, $controllerResolver, $requestStack);
-
-        if ($triggerDeprecation) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.7 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpKernel class instead.', E_USER_DEPRECATED);
-        }
-
-        $this->container = $container;
-
-        // the request scope might have been created before (see FrameworkBundle)
-        if (!$container->hasScope('request')) {
-            $container->addScope(new Scope('request'));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        $this->container->enterScope('request');
-        $this->container->set('request', $request, 'request');
-
-        try {
-            $response = parent::handle($request, $type, $catch);
-        } catch (\Exception $e) {
-            $this->container->set('request', null, 'request');
-            $this->container->leaveScope('request');
-
-            throw $e;
-        }
-
-        $this->container->set('request', null, 'request');
-        $this->container->leaveScope('request');
-
-        return $response;
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/Extension.php b/vendor/symfony/http-kernel/DependencyInjection/Extension.php
deleted file mode 100644
index 2ca0f13..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/Extension.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Extension\Extension as BaseExtension;
-
-/**
- * Allow adding classes to the class cache.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Extension extends BaseExtension
-{
-    private $classes = array();
-
-    /**
-     * Gets the classes to cache.
-     *
-     * @return array An array of classes
-     */
-    public function getClassesToCompile()
-    {
-        return $this->classes;
-    }
-
-    /**
-     * Adds classes to the class cache.
-     *
-     * @param array $classes An array of classes
-     */
-    public function addClassesToCompile(array $classes)
-    {
-        $this->classes = array_merge($this->classes, $classes);
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php b/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
deleted file mode 100644
index dc44b2d..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/FragmentRendererPass.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-
-/**
- * Adds services tagged kernel.fragment_renderer as HTTP content rendering strategies.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FragmentRendererPass implements CompilerPassInterface
-{
-    private $handlerService;
-    private $rendererTag;
-
-    /**
-     * @param string $handlerService Service name of the fragment handler in the container
-     * @param string $rendererTag    Tag name used for fragments
-     */
-    public function __construct($handlerService = 'fragment.handler', $rendererTag = 'kernel.fragment_renderer')
-    {
-        $this->handlerService = $handlerService;
-        $this->rendererTag = $rendererTag;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->handlerService)) {
-            return;
-        }
-
-        $definition = $container->getDefinition($this->handlerService);
-        foreach ($container->findTaggedServiceIds($this->rendererTag) as $id => $tags) {
-            $def = $container->getDefinition($id);
-            if (!$def->isPublic()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must be public as fragment renderer are lazy-loaded.', $id));
-            }
-
-            if ($def->isAbstract()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" must not be abstract as fragment renderer are lazy-loaded.', $id));
-            }
-
-            $refClass = new \ReflectionClass($container->getParameterBag()->resolveValue($def->getClass()));
-            $interface = 'Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface';
-            if (!$refClass->implementsInterface($interface)) {
-                throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
-            }
-
-            foreach ($tags as $tag) {
-                if (!isset($tag['alias'])) {
-                    @trigger_error(sprintf('Service "%s" will have to define the "alias" attribute on the "%s" tag as of Symfony 3.0.', $id, $this->rendererTag), E_USER_DEPRECATED);
-
-                    // register the handler as a non-lazy-loaded one
-                    $definition->addMethodCall('addRenderer', array(new Reference($id)));
-                } else {
-                    $definition->addMethodCall('addRendererService', array($tag['alias'], $id));
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php b/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php
deleted file mode 100644
index 4efe7cb..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/LazyLoadingFragmentHandler.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
-
-/**
- * Lazily loads fragment renderers from the dependency injection container.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class LazyLoadingFragmentHandler extends FragmentHandler
-{
-    private $container;
-    private $rendererIds = array();
-
-    public function __construct(ContainerInterface $container, $debug = false, RequestStack $requestStack = null)
-    {
-        $this->container = $container;
-
-        parent::__construct(array(), $debug, $requestStack);
-    }
-
-    /**
-     * Adds a service as a fragment renderer.
-     *
-     * @param string $renderer The render service id
-     */
-    public function addRendererService($name, $renderer)
-    {
-        $this->rendererIds[$name] = $renderer;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render($uri, $renderer = 'inline', array $options = array())
-    {
-        if (isset($this->rendererIds[$renderer])) {
-            $this->addRenderer($this->container->get($this->rendererIds[$renderer]));
-
-            unset($this->rendererIds[$renderer]);
-        }
-
-        return parent::render($uri, $renderer, $options);
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php b/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php
deleted file mode 100644
index dcd7382..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/MergeExtensionConfigurationPass.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass as BaseMergeExtensionConfigurationPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Ensures certain extensions are always loaded.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class MergeExtensionConfigurationPass extends BaseMergeExtensionConfigurationPass
-{
-    private $extensions;
-
-    public function __construct(array $extensions)
-    {
-        $this->extensions = $extensions;
-    }
-
-    public function process(ContainerBuilder $container)
-    {
-        foreach ($this->extensions as $extension) {
-            if (!count($container->getExtensionConfig($extension))) {
-                $container->loadFromExtension($extension, array());
-            }
-        }
-
-        parent::process($container);
-    }
-}
diff --git a/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
deleted file mode 100644
index f1c2247..0000000
--- a/vendor/symfony/http-kernel/DependencyInjection/RegisterListenersPass.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\HttpKernel\DependencyInjection;
-
-@trigger_error('The '.__NAMESPACE__.'\RegisterListenersPass is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass as BaseRegisterListenersPass;
-
-/**
- * Compiler pass to register tagged services for an event dispatcher.
- *
- * @deprecated since version 2.5, to be removed in 3.0. Use the Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass class instead.
- */
-class RegisterListenersPass extends BaseRegisterListenersPass
-{
-}
diff --git a/vendor/symfony/http-kernel/Event/FilterControllerEvent.php b/vendor/symfony/http-kernel/Event/FilterControllerEvent.php
deleted file mode 100644
index 77a5c1a..0000000
--- a/vendor/symfony/http-kernel/Event/FilterControllerEvent.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Allows filtering of a controller callable.
- *
- * You can call getController() to retrieve the current controller. With
- * setController() you can set a new controller that is used in the processing
- * of the request.
- *
- * Controllers should be callables.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FilterControllerEvent extends KernelEvent
-{
-    /**
-     * The current controller.
-     */
-    private $controller;
-
-    public function __construct(HttpKernelInterface $kernel, $controller, Request $request, $requestType)
-    {
-        parent::__construct($kernel, $request, $requestType);
-
-        $this->setController($controller);
-    }
-
-    /**
-     * Returns the current controller.
-     *
-     * @return callable
-     */
-    public function getController()
-    {
-        return $this->controller;
-    }
-
-    /**
-     * Sets a new controller.
-     *
-     * @param callable $controller
-     *
-     * @throws \LogicException
-     */
-    public function setController($controller)
-    {
-        // controller must be a callable
-        if (!is_callable($controller)) {
-            throw new \LogicException(sprintf('The controller must be a callable (%s given).', $this->varToString($controller)));
-        }
-
-        $this->controller = $controller;
-    }
-
-    private function varToString($var)
-    {
-        if (is_object($var)) {
-            return sprintf('Object(%s)', get_class($var));
-        }
-
-        if (is_array($var)) {
-            $a = array();
-            foreach ($var as $k => $v) {
-                $a[] = sprintf('%s => %s', $k, $this->varToString($v));
-            }
-
-            return sprintf('Array(%s)', implode(', ', $a));
-        }
-
-        if (is_resource($var)) {
-            return sprintf('Resource(%s)', get_resource_type($var));
-        }
-
-        if (null === $var) {
-            return 'null';
-        }
-
-        if (false === $var) {
-            return 'false';
-        }
-
-        if (true === $var) {
-            return 'true';
-        }
-
-        return (string) $var;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/FilterResponseEvent.php b/vendor/symfony/http-kernel/Event/FilterResponseEvent.php
deleted file mode 100644
index ed816a9..0000000
--- a/vendor/symfony/http-kernel/Event/FilterResponseEvent.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Allows to filter a Response object.
- *
- * You can call getResponse() to retrieve the current response. With
- * setResponse() you can set a new response that will be returned to the
- * browser.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FilterResponseEvent extends KernelEvent
-{
-    /**
-     * The current response object.
-     *
-     * @var Response
-     */
-    private $response;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, Response $response)
-    {
-        parent::__construct($kernel, $request, $requestType);
-
-        $this->setResponse($response);
-    }
-
-    /**
-     * Returns the current response object.
-     *
-     * @return Response
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Sets a new response object.
-     *
-     * @param Response $response
-     */
-    public function setResponse(Response $response)
-    {
-        $this->response = $response;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/FinishRequestEvent.php b/vendor/symfony/http-kernel/Event/FinishRequestEvent.php
deleted file mode 100644
index ee72484..0000000
--- a/vendor/symfony/http-kernel/Event/FinishRequestEvent.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-/**
- * Triggered whenever a request is fully processed.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class FinishRequestEvent extends KernelEvent
-{
-}
diff --git a/vendor/symfony/http-kernel/Event/GetResponseEvent.php b/vendor/symfony/http-kernel/Event/GetResponseEvent.php
deleted file mode 100644
index 4c96a4b..0000000
--- a/vendor/symfony/http-kernel/Event/GetResponseEvent.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Allows to create a response for a request.
- *
- * Call setResponse() to set the response that will be returned for the
- * current request. The propagation of this event is stopped as soon as a
- * response is set.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class GetResponseEvent extends KernelEvent
-{
-    /**
-     * The response object.
-     *
-     * @var Response
-     */
-    private $response;
-
-    /**
-     * Returns the response object.
-     *
-     * @return Response
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Sets a response and stops event propagation.
-     *
-     * @param Response $response
-     */
-    public function setResponse(Response $response)
-    {
-        $this->response = $response;
-
-        $this->stopPropagation();
-    }
-
-    /**
-     * Returns whether a response was set.
-     *
-     * @return bool Whether a response was set
-     */
-    public function hasResponse()
-    {
-        return null !== $this->response;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php b/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php
deleted file mode 100644
index f70ce09..0000000
--- a/vendor/symfony/http-kernel/Event/GetResponseForControllerResultEvent.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Allows to create a response for the return value of a controller.
- *
- * Call setResponse() to set the response that will be returned for the
- * current request. The propagation of this event is stopped as soon as a
- * response is set.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class GetResponseForControllerResultEvent extends GetResponseEvent
-{
-    /**
-     * The return value of the controller.
-     *
-     * @var mixed
-     */
-    private $controllerResult;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, $controllerResult)
-    {
-        parent::__construct($kernel, $request, $requestType);
-
-        $this->controllerResult = $controllerResult;
-    }
-
-    /**
-     * Returns the return value of the controller.
-     *
-     * @return mixed The controller return value
-     */
-    public function getControllerResult()
-    {
-        return $this->controllerResult;
-    }
-
-    /**
-     * Assigns the return value of the controller.
-     *
-     * @param mixed $controllerResult The controller return value
-     */
-    public function setControllerResult($controllerResult)
-    {
-        $this->controllerResult = $controllerResult;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php b/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php
deleted file mode 100644
index 003953f..0000000
--- a/vendor/symfony/http-kernel/Event/GetResponseForExceptionEvent.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Allows to create a response for a thrown exception.
- *
- * Call setResponse() to set the response that will be returned for the
- * current request. The propagation of this event is stopped as soon as a
- * response is set.
- *
- * You can also call setException() to replace the thrown exception. This
- * exception will be thrown if no response is set during processing of this
- * event.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class GetResponseForExceptionEvent extends GetResponseEvent
-{
-    /**
-     * The exception object.
-     *
-     * @var \Exception
-     */
-    private $exception;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType, \Exception $e)
-    {
-        parent::__construct($kernel, $request, $requestType);
-
-        $this->setException($e);
-    }
-
-    /**
-     * Returns the thrown exception.
-     *
-     * @return \Exception The thrown exception
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
-
-    /**
-     * Replaces the thrown exception.
-     *
-     * This exception will be thrown if no response is set in the event.
-     *
-     * @param \Exception $exception The thrown exception
-     */
-    public function setException(\Exception $exception)
-    {
-        $this->exception = $exception;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/KernelEvent.php b/vendor/symfony/http-kernel/Event/KernelEvent.php
deleted file mode 100644
index 2043a01..0000000
--- a/vendor/symfony/http-kernel/Event/KernelEvent.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * Base class for events thrown in the HttpKernel component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class KernelEvent extends Event
-{
-    /**
-     * The kernel in which this event was thrown.
-     *
-     * @var HttpKernelInterface
-     */
-    private $kernel;
-
-    /**
-     * The request the kernel is currently processing.
-     *
-     * @var Request
-     */
-    private $request;
-
-    /**
-     * The request type the kernel is currently processing.  One of
-     * HttpKernelInterface::MASTER_REQUEST and HttpKernelInterface::SUB_REQUEST.
-     *
-     * @var int
-     */
-    private $requestType;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, $requestType)
-    {
-        $this->kernel = $kernel;
-        $this->request = $request;
-        $this->requestType = $requestType;
-    }
-
-    /**
-     * Returns the kernel in which this event was thrown.
-     *
-     * @return HttpKernelInterface
-     */
-    public function getKernel()
-    {
-        return $this->kernel;
-    }
-
-    /**
-     * Returns the request the kernel is currently processing.
-     *
-     * @return Request
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Returns the request type the kernel is currently processing.
-     *
-     * @return int One of HttpKernelInterface::MASTER_REQUEST and
-     *             HttpKernelInterface::SUB_REQUEST
-     */
-    public function getRequestType()
-    {
-        return $this->requestType;
-    }
-
-    /**
-     * Checks if this is a master request.
-     *
-     * @return bool True if the request is a master request
-     */
-    public function isMasterRequest()
-    {
-        return HttpKernelInterface::MASTER_REQUEST === $this->requestType;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Event/PostResponseEvent.php b/vendor/symfony/http-kernel/Event/PostResponseEvent.php
deleted file mode 100644
index 5d4450b..0000000
--- a/vendor/symfony/http-kernel/Event/PostResponseEvent.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\HttpKernel\Event;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Allows to execute logic after a response was sent.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class PostResponseEvent extends Event
-{
-    /**
-     * The kernel in which this event was thrown.
-     *
-     * @var HttpKernelInterface
-     */
-    private $kernel;
-
-    private $request;
-
-    private $response;
-
-    public function __construct(HttpKernelInterface $kernel, Request $request, Response $response)
-    {
-        $this->kernel = $kernel;
-        $this->request = $request;
-        $this->response = $response;
-    }
-
-    /**
-     * Returns the kernel in which this event was thrown.
-     *
-     * @return HttpKernelInterface
-     */
-    public function getKernel()
-    {
-        return $this->kernel;
-    }
-
-    /**
-     * Returns the request for which this event was thrown.
-     *
-     * @return Request
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Returns the response for which this event was thrown.
-     *
-     * @return Response
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php b/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
deleted file mode 100644
index 14a5d43..0000000
--- a/vendor/symfony/http-kernel/EventListener/AddRequestFormatsListener.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-
-/**
- * Adds configured formats to each request.
- *
- * @author Gildas Quemener <gildas.quemener@gmail.com>
- */
-class AddRequestFormatsListener implements EventSubscriberInterface
-{
-    /**
-     * @var array
-     */
-    protected $formats;
-
-    /**
-     * @param array $formats
-     */
-    public function __construct(array $formats)
-    {
-        $this->formats = $formats;
-    }
-
-    /**
-     * Adds request formats.
-     *
-     * @param GetResponseEvent $event
-     */
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        foreach ($this->formats as $format => $mimeTypes) {
-            $event->getRequest()->setFormat($format, $mimeTypes);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(KernelEvents::REQUEST => 'onKernelRequest');
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
deleted file mode 100644
index f50e4d6..0000000
--- a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\Debug\ExceptionHandler;
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\KernelEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\Console\ConsoleEvents;
-use Symfony\Component\Console\Event\ConsoleEvent;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
-
-/**
- * Configures errors and exceptions handlers.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DebugHandlersListener implements EventSubscriberInterface
-{
-    private $exceptionHandler;
-    private $logger;
-    private $levels;
-    private $throwAt;
-    private $scream;
-    private $fileLinkFormat;
-    private $firstCall = true;
-
-    /**
-     * @param callable|null        $exceptionHandler A handler that will be called on Exception
-     * @param LoggerInterface|null $logger           A PSR-3 logger
-     * @param array|int            $levels           An array map of E_* to LogLevel::* or an integer bit field of E_* constants
-     * @param int|null             $throwAt          Thrown errors in a bit field of E_* constants, or null to keep the current value
-     * @param bool                 $scream           Enables/disables screaming mode, where even silenced errors are logged
-     * @param string               $fileLinkFormat   The format for links to source files
-     */
-    public function __construct($exceptionHandler, LoggerInterface $logger = null, $levels = null, $throwAt = -1, $scream = true, $fileLinkFormat = null)
-    {
-        $this->exceptionHandler = $exceptionHandler;
-        $this->logger = $logger;
-        $this->levels = $levels;
-        $this->throwAt = is_numeric($throwAt) ? (int) $throwAt : (null === $throwAt ? null : ($throwAt ? -1 : null));
-        $this->scream = (bool) $scream;
-        $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
-    }
-
-    /**
-     * Configures the error handler.
-     *
-     * @param Event|null $event The triggering event
-     */
-    public function configure(Event $event = null)
-    {
-        if (!$this->firstCall) {
-            return;
-        }
-        $this->firstCall = false;
-        if ($this->logger || null !== $this->throwAt) {
-            $handler = set_error_handler('var_dump', 0);
-            $handler = is_array($handler) ? $handler[0] : null;
-            restore_error_handler();
-            if ($handler instanceof ErrorHandler) {
-                if ($this->logger) {
-                    $handler->setDefaultLogger($this->logger, $this->levels);
-                    if (is_array($this->levels)) {
-                        $scream = 0;
-                        foreach ($this->levels as $type => $log) {
-                            $scream |= $type;
-                        }
-                    } else {
-                        $scream = null === $this->levels ? E_ALL | E_STRICT : $this->levels;
-                    }
-                    if ($this->scream) {
-                        $handler->screamAt($scream);
-                    }
-                    $this->logger = $this->levels = null;
-                }
-                if (null !== $this->throwAt) {
-                    $handler->throwAt($this->throwAt, true);
-                }
-            }
-        }
-        if (!$this->exceptionHandler) {
-            if ($event instanceof KernelEvent) {
-                $this->exceptionHandler = array($event->getKernel(), 'terminateWithException');
-            } elseif ($event instanceof ConsoleEvent && $app = $event->getCommand()->getApplication()) {
-                $output = $event->getOutput();
-                if ($output instanceof ConsoleOutputInterface) {
-                    $output = $output->getErrorOutput();
-                }
-                $this->exceptionHandler = function ($e) use ($app, $output) {
-                    $app->renderException($e, $output);
-                };
-            }
-        }
-        if ($this->exceptionHandler) {
-            $handler = set_exception_handler('var_dump');
-            $handler = is_array($handler) ? $handler[0] : null;
-            restore_exception_handler();
-            if ($handler instanceof ErrorHandler) {
-                $h = $handler->setExceptionHandler('var_dump') ?: $this->exceptionHandler;
-                $handler->setExceptionHandler($h);
-                $handler = is_array($h) ? $h[0] : null;
-            }
-            if ($handler instanceof ExceptionHandler) {
-                $handler->setHandler($this->exceptionHandler);
-                if (null !== $this->fileLinkFormat) {
-                    $handler->setFileLinkFormat($this->fileLinkFormat);
-                }
-            }
-            $this->exceptionHandler = null;
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        $events = array(KernelEvents::REQUEST => array('configure', 2048));
-
-        if (defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) {
-            $events[ConsoleEvents::COMMAND] = array('configure', 2048);
-        }
-
-        return $events;
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/DumpListener.php b/vendor/symfony/http-kernel/EventListener/DumpListener.php
deleted file mode 100644
index bccde8e..0000000
--- a/vendor/symfony/http-kernel/EventListener/DumpListener.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\VarDumper\Cloner\ClonerInterface;
-use Symfony\Component\VarDumper\Dumper\DataDumperInterface;
-use Symfony\Component\VarDumper\VarDumper;
-
-/**
- * Configures dump() handler.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DumpListener implements EventSubscriberInterface
-{
-    private $cloner;
-    private $dumper;
-
-    /**
-     * @param ClonerInterface     $cloner Cloner service.
-     * @param DataDumperInterface $dumper Dumper service.
-     */
-    public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper)
-    {
-        $this->cloner = $cloner;
-        $this->dumper = $dumper;
-    }
-
-    public function configure()
-    {
-        $cloner = $this->cloner;
-        $dumper = $this->dumper;
-
-        VarDumper::setHandler(function ($var) use ($cloner, $dumper) {
-            $dumper->dump($cloner->cloneVar($var));
-        });
-    }
-
-    public static function getSubscribedEvents()
-    {
-        // Register early to have a working dump() as early as possible
-        return array(KernelEvents::REQUEST => array('configure', 1024));
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php b/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
deleted file mode 100644
index 80c3fe5..0000000
--- a/vendor/symfony/http-kernel/EventListener/ErrorsLoggerListener.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-@trigger_error('The '.__NAMESPACE__.'\ErrorsLoggerListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\DebugHandlersListener class instead.', E_USER_DEPRECATED);
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\ErrorHandler;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Injects the logger into the ErrorHandler, so that it can log various errors.
- *
- * @author Colin Frei <colin@colinfrei.com>
- * @author Konstantin Myakshin <koc-dp@yandex.ru>
- *
- * @deprecated since version 2.6, to be removed in 3.0. Use the DebugHandlersListener class instead.
- */
-class ErrorsLoggerListener implements EventSubscriberInterface
-{
-    private $channel;
-    private $logger;
-
-    public function __construct($channel, LoggerInterface $logger = null)
-    {
-        $this->channel = $channel;
-        $this->logger = $logger;
-    }
-
-    public function injectLogger()
-    {
-        if (null !== $this->logger) {
-            ErrorHandler::setLogger($this->logger, $this->channel);
-            $this->logger = null;
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(KernelEvents::REQUEST => array('injectLogger', 2048));
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/EsiListener.php b/vendor/symfony/http-kernel/EventListener/EsiListener.php
deleted file mode 100644
index bceb672..0000000
--- a/vendor/symfony/http-kernel/EventListener/EsiListener.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-@trigger_error('The '.__NAMESPACE__.'\EsiListener class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\EventListener\SurrogateListener class instead.', E_USER_DEPRECATED);
-
-/**
- * EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.6, to be removed in 3.0. Use SurrogateListener instead
- */
-class EsiListener extends SurrogateListener
-{
-}
diff --git a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php b/vendor/symfony/http-kernel/EventListener/ExceptionListener.php
deleted file mode 100644
index fc2efed..0000000
--- a/vendor/symfony/http-kernel/EventListener/ExceptionListener.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Debug\Exception\FlattenException;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * ExceptionListener.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ExceptionListener implements EventSubscriberInterface
-{
-    protected $controller;
-    protected $logger;
-
-    public function __construct($controller, LoggerInterface $logger = null)
-    {
-        $this->controller = $controller;
-        $this->logger = $logger;
-    }
-
-    public function onKernelException(GetResponseForExceptionEvent $event)
-    {
-        $exception = $event->getException();
-        $request = $event->getRequest();
-
-        $this->logException($exception, sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', get_class($exception), $exception->getMessage(), $exception->getFile(), $exception->getLine()));
-
-        $request = $this->duplicateRequest($exception, $request);
-
-        try {
-            $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);
-        } catch (\Exception $e) {
-            $this->logException($e, sprintf('Exception thrown when handling an exception (%s: %s at %s line %s)', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()), false);
-
-            $wrapper = $e;
-
-            while ($prev = $wrapper->getPrevious()) {
-                if ($exception === $wrapper = $prev) {
-                    throw $e;
-                }
-            }
-
-            $prev = new \ReflectionProperty('Exception', 'previous');
-            $prev->setAccessible(true);
-            $prev->setValue($wrapper, $exception);
-
-            throw $e;
-        }
-
-        $event->setResponse($response);
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::EXCEPTION => array('onKernelException', -128),
-        );
-    }
-
-    /**
-     * Logs an exception.
-     *
-     * @param \Exception $exception The \Exception instance
-     * @param string     $message   The error message to log
-     */
-    protected function logException(\Exception $exception, $message)
-    {
-        if (null !== $this->logger) {
-            if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
-                $this->logger->critical($message, array('exception' => $exception));
-            } else {
-                $this->logger->error($message, array('exception' => $exception));
-            }
-        }
-    }
-
-    /**
-     * Clones the request for the exception.
-     *
-     * @param \Exception $exception The thrown exception.
-     * @param Request    $request   The original request.
-     *
-     * @return Request $request The cloned request.
-     */
-    protected function duplicateRequest(\Exception $exception, Request $request)
-    {
-        $attributes = array(
-            '_controller' => $this->controller,
-            'exception' => FlattenException::create($exception),
-            'logger' => $this->logger instanceof DebugLoggerInterface ? $this->logger : null,
-            // keep for BC -- as $format can be an argument of the controller callable
-            // see src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
-            // @deprecated since version 2.4, to be removed in 3.0
-            'format' => $request->getRequestFormat(),
-        );
-        $request = $request->duplicate(null, null, $attributes);
-        $request->setMethod('GET');
-
-        return $request;
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/FragmentListener.php b/vendor/symfony/http-kernel/EventListener/FragmentListener.php
deleted file mode 100644
index 302faa1..0000000
--- a/vendor/symfony/http-kernel/EventListener/FragmentListener.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\UriSigner;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Handles content fragments represented by special URIs.
- *
- * All URL paths starting with /_fragment are handled as
- * content fragments by this listener.
- *
- * If throws an AccessDeniedHttpException exception if the request
- * is not signed or if it is not an internal sub-request.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FragmentListener implements EventSubscriberInterface
-{
-    private $signer;
-    private $fragmentPath;
-
-    /**
-     * Constructor.
-     *
-     * @param UriSigner $signer       A UriSigner instance
-     * @param string    $fragmentPath The path that triggers this listener
-     */
-    public function __construct(UriSigner $signer, $fragmentPath = '/_fragment')
-    {
-        $this->signer = $signer;
-        $this->fragmentPath = $fragmentPath;
-    }
-
-    /**
-     * Fixes request attributes when the path is '/_fragment'.
-     *
-     * @param GetResponseEvent $event A GetResponseEvent instance
-     *
-     * @throws AccessDeniedHttpException if the request does not come from a trusted IP.
-     */
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        if ($request->attributes->has('_controller') || $this->fragmentPath !== rawurldecode($request->getPathInfo())) {
-            return;
-        }
-
-        if ($event->isMasterRequest()) {
-            $this->validateRequest($request);
-        }
-
-        parse_str($request->query->get('_path', ''), $attributes);
-        $request->attributes->add($attributes);
-        $request->attributes->set('_route_params', array_replace($request->attributes->get('_route_params', array()), $attributes));
-        $request->query->remove('_path');
-    }
-
-    protected function validateRequest(Request $request)
-    {
-        // is the Request safe?
-        if (!$request->isMethodSafe()) {
-            throw new AccessDeniedHttpException();
-        }
-
-        // is the Request signed?
-        // we cannot use $request->getUri() here as we want to work with the original URI (no query string reordering)
-        if ($this->signer->check($request->getSchemeAndHttpHost().$request->getBaseUrl().$request->getPathInfo().(null !== ($qs = $request->server->get('QUERY_STRING')) ? '?'.$qs : ''))) {
-            return;
-        }
-
-        throw new AccessDeniedHttpException();
-    }
-
-    /**
-     * @deprecated since version 2.3.19, to be removed in 3.0.
-     *
-     * @return string[]
-     */
-    protected function getLocalIpAddresses()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3.19 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return array('127.0.0.1', 'fe80::1', '::1');
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::REQUEST => array(array('onKernelRequest', 48)),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/LocaleListener.php b/vendor/symfony/http-kernel/EventListener/LocaleListener.php
deleted file mode 100644
index 564f6dc..0000000
--- a/vendor/symfony/http-kernel/EventListener/LocaleListener.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Initializes the locale based on the current request.
- *
- * This listener works in 2 modes:
- *
- *  * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- *  * 2.4+ mode where you must pass a RequestStack instance in the constructor.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class LocaleListener implements EventSubscriberInterface
-{
-    private $router;
-    private $defaultLocale;
-    private $requestStack;
-
-    /**
-     * RequestStack will become required in 3.0.
-     */
-    public function __construct($defaultLocale = 'en', RequestContextAwareInterface $router = null, RequestStack $requestStack = null)
-    {
-        $this->defaultLocale = $defaultLocale;
-        $this->requestStack = $requestStack;
-        $this->router = $router;
-    }
-
-    /**
-     * Sets the current Request.
-     *
-     * This method was used to synchronize the Request, but as the HttpKernel
-     * is doing that automatically now, you should never call it directly.
-     * It is kept public for BC with the 2.3 version.
-     *
-     * @param Request|null $request A Request instance
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public function setRequest(Request $request = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (null === $request) {
-            return;
-        }
-
-        $this->setLocale($request);
-        $this->setRouterContext($request);
-    }
-
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        $request = $event->getRequest();
-        $request->setDefaultLocale($this->defaultLocale);
-
-        $this->setLocale($request);
-        $this->setRouterContext($request);
-    }
-
-    public function onKernelFinishRequest(FinishRequestEvent $event)
-    {
-        if (null === $this->requestStack) {
-            return; // removed when requestStack is required
-        }
-
-        if (null !== $parentRequest = $this->requestStack->getParentRequest()) {
-            $this->setRouterContext($parentRequest);
-        }
-    }
-
-    private function setLocale(Request $request)
-    {
-        if ($locale = $request->attributes->get('_locale')) {
-            $request->setLocale($locale);
-        }
-    }
-
-    private function setRouterContext(Request $request)
-    {
-        if (null !== $this->router) {
-            $this->router->getContext()->setParameter('_locale', $request->getLocale());
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            // must be registered after the Router to have access to the _locale
-            KernelEvents::REQUEST => array(array('onKernelRequest', 16)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php b/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
deleted file mode 100644
index 06a5bbf..0000000
--- a/vendor/symfony/http-kernel/EventListener/ProfilerListener.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Profiler\Profiler;
-use Symfony\Component\HttpFoundation\RequestMatcherInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * ProfilerListener collects data for the current request by listening to the kernel events.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ProfilerListener implements EventSubscriberInterface
-{
-    protected $profiler;
-    protected $matcher;
-    protected $onlyException;
-    protected $onlyMasterRequests;
-    protected $exception;
-    protected $requests = array();
-    protected $profiles;
-    protected $requestStack;
-    protected $parents;
-
-    /**
-     * Constructor.
-     *
-     * @param Profiler                     $profiler           A Profiler instance
-     * @param RequestMatcherInterface|null $matcher            A RequestMatcher instance
-     * @param bool                         $onlyException      true if the profiler only collects data when an exception occurs, false otherwise
-     * @param bool                         $onlyMasterRequests true if the profiler only collects data when the request is a master request, false otherwise
-     * @param RequestStack|null            $requestStack       A RequestStack instance
-     */
-    public function __construct(Profiler $profiler, RequestMatcherInterface $matcher = null, $onlyException = false, $onlyMasterRequests = false, RequestStack $requestStack = null)
-    {
-        if (null === $requestStack) {
-            // Prevent the deprecation notice to be triggered all the time.
-            // The onKernelRequest() method fires some logic only when the
-            // RequestStack instance is not provided as a dependency.
-            @trigger_error('Since version 2.4, the '.__METHOD__.' method must accept a RequestStack instance to get the request instead of using the '.__CLASS__.'::onKernelRequest method that will be removed in 3.0.', E_USER_DEPRECATED);
-        }
-
-        $this->profiler = $profiler;
-        $this->matcher = $matcher;
-        $this->onlyException = (bool) $onlyException;
-        $this->onlyMasterRequests = (bool) $onlyMasterRequests;
-        $this->profiles = new \SplObjectStorage();
-        $this->parents = new \SplObjectStorage();
-        $this->requestStack = $requestStack;
-    }
-
-    /**
-     * Handles the onKernelException event.
-     *
-     * @param GetResponseForExceptionEvent $event A GetResponseForExceptionEvent instance
-     */
-    public function onKernelException(GetResponseForExceptionEvent $event)
-    {
-        if ($this->onlyMasterRequests && !$event->isMasterRequest()) {
-            return;
-        }
-
-        $this->exception = $event->getException();
-    }
-
-    /**
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        if (null === $this->requestStack) {
-            $this->requests[] = $event->getRequest();
-        }
-    }
-
-    /**
-     * Handles the onKernelResponse event.
-     *
-     * @param FilterResponseEvent $event A FilterResponseEvent instance
-     */
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        $master = $event->isMasterRequest();
-        if ($this->onlyMasterRequests && !$master) {
-            return;
-        }
-
-        if ($this->onlyException && null === $this->exception) {
-            return;
-        }
-
-        $request = $event->getRequest();
-        $exception = $this->exception;
-        $this->exception = null;
-
-        if (null !== $this->matcher && !$this->matcher->matches($request)) {
-            return;
-        }
-
-        if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) {
-            return;
-        }
-
-        $this->profiles[$request] = $profile;
-
-        if (null !== $this->requestStack) {
-            $this->parents[$request] = $this->requestStack->getParentRequest();
-        } elseif (!$master) {
-            // to be removed when requestStack is required
-            array_pop($this->requests);
-
-            $this->parents[$request] = end($this->requests);
-        }
-    }
-
-    public function onKernelTerminate(PostResponseEvent $event)
-    {
-        // attach children to parents
-        foreach ($this->profiles as $request) {
-            // isset call should be removed when requestStack is required
-            if (isset($this->parents[$request]) && null !== $parentRequest = $this->parents[$request]) {
-                if (isset($this->profiles[$parentRequest])) {
-                    $this->profiles[$parentRequest]->addChild($this->profiles[$request]);
-                }
-            }
-        }
-
-        // save profiles
-        foreach ($this->profiles as $request) {
-            $this->profiler->saveProfile($this->profiles[$request]);
-        }
-
-        $this->profiles = new \SplObjectStorage();
-        $this->parents = new \SplObjectStorage();
-        $this->requests = array();
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            // kernel.request must be registered as early as possible to not break
-            // when an exception is thrown in any other kernel.request listener
-            KernelEvents::REQUEST => array('onKernelRequest', 1024),
-            KernelEvents::RESPONSE => array('onKernelResponse', -100),
-            KernelEvents::EXCEPTION => 'onKernelException',
-            KernelEvents::TERMINATE => array('onKernelTerminate', -1024),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/ResponseListener.php b/vendor/symfony/http-kernel/EventListener/ResponseListener.php
deleted file mode 100644
index eeb2b0f..0000000
--- a/vendor/symfony/http-kernel/EventListener/ResponseListener.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * ResponseListener fixes the Response headers based on the Request.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ResponseListener implements EventSubscriberInterface
-{
-    private $charset;
-
-    public function __construct($charset)
-    {
-        $this->charset = $charset;
-    }
-
-    /**
-     * Filters the Response.
-     *
-     * @param FilterResponseEvent $event A FilterResponseEvent instance
-     */
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        $response = $event->getResponse();
-
-        if (null === $response->getCharset()) {
-            $response->setCharset($this->charset);
-        }
-
-        $response->prepare($event->getRequest());
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => 'onKernelResponse',
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/RouterListener.php b/vendor/symfony/http-kernel/EventListener/RouterListener.php
deleted file mode 100644
index 297aab6..0000000
--- a/vendor/symfony/http-kernel/EventListener/RouterListener.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Initializes the context from the request and sets request attributes based on a matching route.
- *
- * This listener works in 2 modes:
- *
- *  * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- *  * 2.4+ mode where you must pass a RequestStack instance in the constructor.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class RouterListener implements EventSubscriberInterface
-{
-    private $matcher;
-    private $context;
-    private $logger;
-    private $request;
-    private $requestStack;
-
-    /**
-     * Constructor.
-     *
-     * RequestStack will become required in 3.0.
-     *
-     * @param UrlMatcherInterface|RequestMatcherInterface $matcher      The Url or Request matcher
-     * @param RequestContext|null                         $context      The RequestContext (can be null when $matcher implements RequestContextAwareInterface)
-     * @param LoggerInterface|null                        $logger       The logger
-     * @param RequestStack|null                           $requestStack A RequestStack instance
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($matcher, RequestContext $context = null, LoggerInterface $logger = null, RequestStack $requestStack = null)
-    {
-        if (!$matcher instanceof UrlMatcherInterface && !$matcher instanceof RequestMatcherInterface) {
-            throw new \InvalidArgumentException('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface.');
-        }
-
-        if (null === $context && !$matcher instanceof RequestContextAwareInterface) {
-            throw new \InvalidArgumentException('You must either pass a RequestContext or the matcher must implement RequestContextAwareInterface.');
-        }
-
-        if (!$requestStack instanceof RequestStack) {
-            @trigger_error('The '.__METHOD__.' method now requires a RequestStack instance as '.__CLASS__.'::setRequest method will not be supported anymore in 3.0.', E_USER_DEPRECATED);
-        }
-
-        $this->matcher = $matcher;
-        $this->context = $context ?: $matcher->getContext();
-        $this->requestStack = $requestStack;
-        $this->logger = $logger;
-    }
-
-    /**
-     * Sets the current Request.
-     *
-     * This method was used to synchronize the Request, but as the HttpKernel
-     * is doing that automatically now, you should never call it directly.
-     * It is kept public for BC with the 2.3 version.
-     *
-     * @param Request|null $request A Request instance
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public function setRequest(Request $request = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be made private in 3.0.', E_USER_DEPRECATED);
-
-        $this->setCurrentRequest($request);
-    }
-
-    private function setCurrentRequest(Request $request = null)
-    {
-        if (null !== $request && $this->request !== $request) {
-            $this->context->fromRequest($request);
-        }
-
-        $this->request = $request;
-    }
-
-    public function onKernelFinishRequest(FinishRequestEvent $event)
-    {
-        if (null === $this->requestStack) {
-            return; // removed when requestStack is required
-        }
-
-        $this->setCurrentRequest($this->requestStack->getParentRequest());
-    }
-
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        $request = $event->getRequest();
-
-        // initialize the context that is also used by the generator (assuming matcher and generator share the same context instance)
-        // we call setCurrentRequest even if most of the time, it has already been done to keep compatibility
-        // with frameworks which do not use the Symfony service container
-        // when we have a RequestStack, no need to do it
-        if (null !== $this->requestStack) {
-            $this->setCurrentRequest($request);
-        }
-
-        if ($request->attributes->has('_controller')) {
-            // routing is already done
-            return;
-        }
-
-        // add attributes based on the request (routing)
-        try {
-            // matching a request is more powerful than matching a URL path + context, so try that first
-            if ($this->matcher instanceof RequestMatcherInterface) {
-                $parameters = $this->matcher->matchRequest($request);
-            } else {
-                $parameters = $this->matcher->match($request->getPathInfo());
-            }
-
-            if (null !== $this->logger) {
-                $this->logger->info(sprintf('Matched route "%s".', isset($parameters['_route']) ? $parameters['_route'] : 'n/a'), array(
-                    'route_parameters' => $parameters,
-                    'request_uri' => $request->getUri(),
-                ));
-            }
-
-            $request->attributes->add($parameters);
-            unset($parameters['_route'], $parameters['_controller']);
-            $request->attributes->set('_route_params', $parameters);
-        } catch (ResourceNotFoundException $e) {
-            $message = sprintf('No route found for "%s %s"', $request->getMethod(), $request->getPathInfo());
-
-            if ($referer = $request->headers->get('referer')) {
-                $message .= sprintf(' (from "%s")', $referer);
-            }
-
-            throw new NotFoundHttpException($message, $e);
-        } catch (MethodNotAllowedException $e) {
-            $message = sprintf('No route found for "%s %s": Method Not Allowed (Allow: %s)', $request->getMethod(), $request->getPathInfo(), implode(', ', $e->getAllowedMethods()));
-
-            throw new MethodNotAllowedHttpException($e->getAllowedMethods(), $message, $e);
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::REQUEST => array(array('onKernelRequest', 32)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php b/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php
deleted file mode 100644
index 36809b5..0000000
--- a/vendor/symfony/http-kernel/EventListener/SaveSessionListener.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-
-/**
- * Saves the session, in case it is still open, before sending the response/headers.
- *
- * This ensures several things in case the developer did not save the session explicitly:
- *
- *  * If a session save handler without locking is used, it ensures the data is available
- *    on the next request, e.g. after a redirect. PHPs auto-save at script end via
- *    session_register_shutdown is executed after fastcgi_finish_request. So in this case
- *    the data could be missing the next request because it might not be saved the moment
- *    the new request is processed.
- *  * A locking save handler (e.g. the native 'files') circumvents concurrency problems like
- *    the one above. But by saving the session before long-running things in the terminate event,
- *    we ensure the session is not blocked longer than needed.
- *  * When regenerating the session ID no locking is involved in PHPs session design. See
- *    https://bugs.php.net/bug.php?id=61470 for a discussion. So in this case, the session must
- *    be saved anyway before sending the headers with the new session ID. Otherwise session
- *    data could get lost again for concurrent requests with the new ID. One result could be
- *    that you get logged out after just logging in.
- *
- * This listener should be executed as one of the last listeners, so that previous listeners
- * can still operate on the open session. This prevents the overhead of restarting it.
- * Listeners after closing the session can still work with the session as usual because
- * Symfonys session implementation starts the session on demand. So writing to it after
- * it is saved will just restart it.
- *
- * @author Tobias Schultze <http://tobion.de>
- */
-class SaveSessionListener implements EventSubscriberInterface
-{
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        $session = $event->getRequest()->getSession();
-        if ($session && $session->isStarted()) {
-            $session->save();
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            // low priority but higher than StreamedResponseListener
-            KernelEvents::RESPONSE => array(array('onKernelResponse', -1000)),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/SessionListener.php b/vendor/symfony/http-kernel/EventListener/SessionListener.php
deleted file mode 100644
index ecf065f..0000000
--- a/vendor/symfony/http-kernel/EventListener/SessionListener.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Sets the session in the request.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-abstract class SessionListener implements EventSubscriberInterface
-{
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        $request = $event->getRequest();
-        $session = $this->getSession();
-        if (null === $session || $request->hasSession()) {
-            return;
-        }
-
-        $request->setSession($session);
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 128),
-        );
-    }
-
-    /**
-     * Gets the session object.
-     *
-     * @return SessionInterface|null A SessionInterface instance or null if no session is available
-     */
-    abstract protected function getSession();
-}
diff --git a/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php b/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php
deleted file mode 100644
index 571cd74..0000000
--- a/vendor/symfony/http-kernel/EventListener/StreamedResponseListener.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * StreamedResponseListener is responsible for sending the Response
- * to the client.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class StreamedResponseListener implements EventSubscriberInterface
-{
-    /**
-     * Filters the Response.
-     *
-     * @param FilterResponseEvent $event A FilterResponseEvent instance
-     */
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        $response = $event->getResponse();
-
-        if ($response instanceof StreamedResponse) {
-            $response->send();
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => array('onKernelResponse', -1024),
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/SurrogateListener.php b/vendor/symfony/http-kernel/EventListener/SurrogateListener.php
deleted file mode 100644
index dc815a2..0000000
--- a/vendor/symfony/http-kernel/EventListener/SurrogateListener.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * SurrogateListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for Surrogates.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class SurrogateListener implements EventSubscriberInterface
-{
-    private $surrogate;
-
-    /**
-     * Constructor.
-     *
-     * @param SurrogateInterface $surrogate An SurrogateInterface instance
-     */
-    public function __construct(SurrogateInterface $surrogate = null)
-    {
-        $this->surrogate = $surrogate;
-    }
-
-    /**
-     * Filters the Response.
-     *
-     * @param FilterResponseEvent $event A FilterResponseEvent instance
-     */
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        if (!$event->isMasterRequest() || null === $this->surrogate) {
-            return;
-        }
-
-        $this->surrogate->addSurrogateControl($event->getResponse());
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => 'onKernelResponse',
-        );
-    }
-}
diff --git a/vendor/symfony/http-kernel/EventListener/TestSessionListener.php b/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
deleted file mode 100644
index 8fc8e57..0000000
--- a/vendor/symfony/http-kernel/EventListener/TestSessionListener.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * TestSessionListener.
- *
- * Saves session in test environment.
- *
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class TestSessionListener implements EventSubscriberInterface
-{
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        // bootstrap the session
-        $session = $this->getSession();
-        if (!$session) {
-            return;
-        }
-
-        $cookies = $event->getRequest()->cookies;
-
-        if ($cookies->has($session->getName())) {
-            $session->setId($cookies->get($session->getName()));
-        }
-    }
-
-    /**
-     * Checks if session was initialized and saves if current request is master
-     * Runs on 'kernel.response' in test environment.
-     *
-     * @param FilterResponseEvent $event
-     */
-    public function onKernelResponse(FilterResponseEvent $event)
-    {
-        if (!$event->isMasterRequest()) {
-            return;
-        }
-
-        $session = $event->getRequest()->getSession();
-        if ($session && $session->isStarted()) {
-            $session->save();
-            $params = session_get_cookie_params();
-            $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
-        }
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::REQUEST => array('onKernelRequest', 192),
-            KernelEvents::RESPONSE => array('onKernelResponse', -128),
-        );
-    }
-
-    /**
-     * Gets the session object.
-     *
-     * @return SessionInterface|null A SessionInterface instance or null if no session is available
-     */
-    abstract protected function getSession();
-}
diff --git a/vendor/symfony/http-kernel/EventListener/TranslatorListener.php b/vendor/symfony/http-kernel/EventListener/TranslatorListener.php
deleted file mode 100644
index 6967ad0..0000000
--- a/vendor/symfony/http-kernel/EventListener/TranslatorListener.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Component\HttpKernel\EventListener;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Translation\TranslatorInterface;
-
-/**
- * Synchronizes the locale between the request and the translator.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TranslatorListener implements EventSubscriberInterface
-{
-    private $translator;
-    private $requestStack;
-
-    public function __construct(TranslatorInterface $translator, RequestStack $requestStack)
-    {
-        $this->translator = $translator;
-        $this->requestStack = $requestStack;
-    }
-
-    public function onKernelRequest(GetResponseEvent $event)
-    {
-        $this->setLocale($event->getRequest());
-    }
-
-    public function onKernelFinishRequest(FinishRequestEvent $event)
-    {
-        if (null === $parentRequest = $this->requestStack->getParentRequest()) {
-            return;
-        }
-
-        $this->setLocale($parentRequest);
-    }
-
-    public static function getSubscribedEvents()
-    {
-        return array(
-            // must be registered after the Locale listener
-            KernelEvents::REQUEST => array(array('onKernelRequest', 10)),
-            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
-        );
-    }
-
-    private function setLocale(Request $request)
-    {
-        try {
-            $this->translator->setLocale($request->getLocale());
-        } catch (\InvalidArgumentException $e) {
-            $this->translator->setLocale($request->getDefaultLocale());
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php b/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php
deleted file mode 100644
index 79d8639..0000000
--- a/vendor/symfony/http-kernel/Exception/AccessDeniedHttpException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * AccessDeniedHttpException.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christophe Coevoet <stof@notk.org>
- */
-class AccessDeniedHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(403, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php b/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php
deleted file mode 100644
index 5f68172..0000000
--- a/vendor/symfony/http-kernel/Exception/BadRequestHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * BadRequestHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class BadRequestHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(400, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/ConflictHttpException.php b/vendor/symfony/http-kernel/Exception/ConflictHttpException.php
deleted file mode 100644
index 34d738e..0000000
--- a/vendor/symfony/http-kernel/Exception/ConflictHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * ConflictHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class ConflictHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(409, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/FatalErrorException.php b/vendor/symfony/http-kernel/Exception/FatalErrorException.php
deleted file mode 100644
index 0d2b4f9..0000000
--- a/vendor/symfony/http-kernel/Exception/FatalErrorException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-@trigger_error('The '.__NAMESPACE__.'\FatalErrorException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FatalErrorException class instead.', E_USER_DEPRECATED);
-
-/*
- * Fatal Error Exception.
- *
- * @author Konstanton Myakshin <koc-dp@yandex.ru>
- *
- * @deprecated since version 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class_exists('Symfony\Component\Debug\Exception\FatalErrorException');
diff --git a/vendor/symfony/http-kernel/Exception/FlattenException.php b/vendor/symfony/http-kernel/Exception/FlattenException.php
deleted file mode 100644
index 599aa95..0000000
--- a/vendor/symfony/http-kernel/Exception/FlattenException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-@trigger_error('The '.__NAMESPACE__.'\FlattenException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Debug\Exception\FlattenException class instead.', E_USER_DEPRECATED);
-
-/*
- * FlattenException wraps a PHP Exception to be able to serialize it.
- *
- * Basically, this class removes all objects from the trace.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.3, to be removed in 3.0. Use the same class from the Debug component instead.
- */
-class_exists('Symfony\Component\Debug\Exception\FlattenException');
diff --git a/vendor/symfony/http-kernel/Exception/GoneHttpException.php b/vendor/symfony/http-kernel/Exception/GoneHttpException.php
deleted file mode 100644
index 16ea223..0000000
--- a/vendor/symfony/http-kernel/Exception/GoneHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * GoneHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class GoneHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(410, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/HttpException.php b/vendor/symfony/http-kernel/Exception/HttpException.php
deleted file mode 100644
index 4e1b526..0000000
--- a/vendor/symfony/http-kernel/Exception/HttpException.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * HttpException.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class HttpException extends \RuntimeException implements HttpExceptionInterface
-{
-    private $statusCode;
-    private $headers;
-
-    public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = array(), $code = 0)
-    {
-        $this->statusCode = $statusCode;
-        $this->headers = $headers;
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/HttpExceptionInterface.php b/vendor/symfony/http-kernel/Exception/HttpExceptionInterface.php
deleted file mode 100644
index 8aa50a9..0000000
--- a/vendor/symfony/http-kernel/Exception/HttpExceptionInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * Interface for HTTP error exceptions.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-interface HttpExceptionInterface
-{
-    /**
-     * Returns the status code.
-     *
-     * @return int An HTTP response status code
-     */
-    public function getStatusCode();
-
-    /**
-     * Returns response headers.
-     *
-     * @return array Response headers
-     */
-    public function getHeaders();
-}
diff --git a/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php b/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php
deleted file mode 100644
index 0c4b943..0000000
--- a/vendor/symfony/http-kernel/Exception/LengthRequiredHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * LengthRequiredHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class LengthRequiredHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(411, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php b/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
deleted file mode 100644
index 78dd26b..0000000
--- a/vendor/symfony/http-kernel/Exception/MethodNotAllowedHttpException.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * MethodNotAllowedHttpException.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class MethodNotAllowedHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param array      $allow    An array of allowed methods
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct(array $allow, $message = null, \Exception $previous = null, $code = 0)
-    {
-        $headers = array('Allow' => strtoupper(implode(', ', $allow)));
-
-        parent::__construct(405, $message, $previous, $headers, $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php b/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php
deleted file mode 100644
index cc6be4b..0000000
--- a/vendor/symfony/http-kernel/Exception/NotAcceptableHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * NotAcceptableHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class NotAcceptableHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(406, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php b/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php
deleted file mode 100644
index 4639e37..0000000
--- a/vendor/symfony/http-kernel/Exception/NotFoundHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * NotFoundHttpException.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class NotFoundHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(404, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php b/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
deleted file mode 100644
index 9df0e7b..0000000
--- a/vendor/symfony/http-kernel/Exception/PreconditionFailedHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * PreconditionFailedHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class PreconditionFailedHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(412, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php b/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
deleted file mode 100644
index 08ebca2..0000000
--- a/vendor/symfony/http-kernel/Exception/PreconditionRequiredHttpException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * PreconditionRequiredHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- *
- * @see http://tools.ietf.org/html/rfc6585
- */
-class PreconditionRequiredHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(428, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php b/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
deleted file mode 100644
index 32b9e2d..0000000
--- a/vendor/symfony/http-kernel/Exception/ServiceUnavailableHttpException.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * ServiceUnavailableHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class ServiceUnavailableHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
-     * @param string     $message    The internal exception message
-     * @param \Exception $previous   The previous exception
-     * @param int        $code       The internal exception code
-     */
-    public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
-    {
-        $headers = array();
-        if ($retryAfter) {
-            $headers = array('Retry-After' => $retryAfter);
-        }
-
-        parent::__construct(503, $message, $previous, $headers, $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php b/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
deleted file mode 100644
index ab86e09..0000000
--- a/vendor/symfony/http-kernel/Exception/TooManyRequestsHttpException.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * TooManyRequestsHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- *
- * @see http://tools.ietf.org/html/rfc6585
- */
-class TooManyRequestsHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param int|string $retryAfter The number of seconds or HTTP-date after which the request may be retried
-     * @param string     $message    The internal exception message
-     * @param \Exception $previous   The previous exception
-     * @param int        $code       The internal exception code
-     */
-    public function __construct($retryAfter = null, $message = null, \Exception $previous = null, $code = 0)
-    {
-        $headers = array();
-        if ($retryAfter) {
-            $headers = array('Retry-After' => $retryAfter);
-        }
-
-        parent::__construct(429, $message, $previous, $headers, $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php b/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php
deleted file mode 100644
index 0dfe42d..0000000
--- a/vendor/symfony/http-kernel/Exception/UnauthorizedHttpException.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * UnauthorizedHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class UnauthorizedHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $challenge WWW-Authenticate challenge string
-     * @param string     $message   The internal exception message
-     * @param \Exception $previous  The previous exception
-     * @param int        $code      The internal exception code
-     */
-    public function __construct($challenge, $message = null, \Exception $previous = null, $code = 0)
-    {
-        $headers = array('WWW-Authenticate' => $challenge);
-
-        parent::__construct(401, $message, $previous, $headers, $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php b/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
deleted file mode 100644
index eb13f56..0000000
--- a/vendor/symfony/http-kernel/Exception/UnprocessableEntityHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * UnprocessableEntityHttpException.
- *
- * @author Steve Hutchins <hutchinsteve@gmail.com>
- */
-class UnprocessableEntityHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(422, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php b/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
deleted file mode 100644
index a9d8fa0..0000000
--- a/vendor/symfony/http-kernel/Exception/UnsupportedMediaTypeHttpException.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\HttpKernel\Exception;
-
-/**
- * UnsupportedMediaTypeHttpException.
- *
- * @author Ben Ramsey <ben@benramsey.com>
- */
-class UnsupportedMediaTypeHttpException extends HttpException
-{
-    /**
-     * Constructor.
-     *
-     * @param string     $message  The internal exception message
-     * @param \Exception $previous The previous exception
-     * @param int        $code     The internal exception code
-     */
-    public function __construct($message = null, \Exception $previous = null, $code = 0)
-    {
-        parent::__construct(415, $message, $previous, array(), $code);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
deleted file mode 100644
index 1968001..0000000
--- a/vendor/symfony/http-kernel/Fragment/AbstractSurrogateFragmentRenderer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\HttpCache\SurrogateInterface;
-use Symfony\Component\HttpKernel\UriSigner;
-
-/**
- * Implements Surrogate rendering strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRenderer
-{
-    private $surrogate;
-    private $inlineStrategy;
-    private $signer;
-
-    /**
-     * Constructor.
-     *
-     * The "fallback" strategy when surrogate is not available should always be an
-     * instance of InlineFragmentRenderer.
-     *
-     * @param SurrogateInterface        $surrogate      An Surrogate instance
-     * @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported
-     * @param UriSigner                 $signer
-     */
-    public function __construct(SurrogateInterface $surrogate = null, FragmentRendererInterface $inlineStrategy, UriSigner $signer = null)
-    {
-        $this->surrogate = $surrogate;
-        $this->inlineStrategy = $inlineStrategy;
-        $this->signer = $signer;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Note that if the current Request has no surrogate capability, this method
-     * falls back to use the inline rendering strategy.
-     *
-     * Additional available options:
-     *
-     *  * alt: an alternative URI to render in case of an error
-     *  * comment: a comment to add when returning the surrogate tag
-     *
-     * Note, that not all surrogate strategies support all options. For now
-     * 'alt' and 'comment' are only supported by ESI.
-     *
-     * @see Symfony\Component\HttpKernel\HttpCache\SurrogateInterface
-     */
-    public function render($uri, Request $request, array $options = array())
-    {
-        if (!$this->surrogate || !$this->surrogate->hasSurrogateCapability($request)) {
-            return $this->inlineStrategy->render($uri, $request, $options);
-        }
-
-        if ($uri instanceof ControllerReference) {
-            $uri = $this->generateSignedFragmentUri($uri, $request);
-        }
-
-        $alt = isset($options['alt']) ? $options['alt'] : null;
-        if ($alt instanceof ControllerReference) {
-            $alt = $this->generateSignedFragmentUri($alt, $request);
-        }
-
-        $tag = $this->surrogate->renderIncludeTag($uri, $alt, isset($options['ignore_errors']) ? $options['ignore_errors'] : false, isset($options['comment']) ? $options['comment'] : '');
-
-        return new Response($tag);
-    }
-
-    private function generateSignedFragmentUri($uri, Request $request)
-    {
-        if (null === $this->signer) {
-            throw new \LogicException('You must use a URI when using the ESI rendering strategy or set a URL signer.');
-        }
-
-        // we need to sign the absolute URI, but want to return the path only.
-        $fragmentUri = $this->signer->sign($this->generateFragmentUri($uri, $request, true));
-
-        return substr($fragmentUri, strlen($request->getSchemeAndHttpHost()));
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/EsiFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/EsiFragmentRenderer.php
deleted file mode 100644
index a4570e3..0000000
--- a/vendor/symfony/http-kernel/Fragment/EsiFragmentRenderer.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-/**
- * Implements the ESI rendering strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class EsiFragmentRenderer extends AbstractSurrogateFragmentRenderer
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'esi';
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php b/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
deleted file mode 100644
index 774870a..0000000
--- a/vendor/symfony/http-kernel/Fragment/FragmentHandler.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-
-/**
- * Renders a URI that represents a resource fragment.
- *
- * This class handles the rendering of resource fragments that are included into
- * a main resource. The handling of the rendering is managed by specialized renderers.
- *
- * This listener works in 2 modes:
- *
- *  * 2.3 compatibility mode where you must call setRequest whenever the Request changes.
- *  * 2.4+ mode where you must pass a RequestStack instance in the constructor.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @see FragmentRendererInterface
- */
-class FragmentHandler
-{
-    private $debug;
-    private $renderers = array();
-    private $request;
-    private $requestStack;
-
-    /**
-     * Constructor.
-     *
-     * RequestStack will become required in 3.0.
-     *
-     * @param FragmentRendererInterface[] $renderers    An array of FragmentRendererInterface instances
-     * @param bool                        $debug        Whether the debug mode is enabled or not
-     * @param RequestStack|null           $requestStack The Request stack that controls the lifecycle of requests
-     */
-    public function __construct(array $renderers = array(), $debug = false, RequestStack $requestStack = null)
-    {
-        $this->requestStack = $requestStack;
-        foreach ($renderers as $renderer) {
-            $this->addRenderer($renderer);
-        }
-        $this->debug = $debug;
-    }
-
-    /**
-     * Adds a renderer.
-     *
-     * @param FragmentRendererInterface $renderer A FragmentRendererInterface instance
-     */
-    public function addRenderer(FragmentRendererInterface $renderer)
-    {
-        $this->renderers[$renderer->getName()] = $renderer;
-    }
-
-    /**
-     * Sets the current Request.
-     *
-     * This method was used to synchronize the Request, but as the HttpKernel
-     * is doing that automatically now, you should never call it directly.
-     * It is kept public for BC with the 2.3 version.
-     *
-     * @param Request|null $request A Request instance
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public function setRequest(Request $request = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $this->request = $request;
-    }
-
-    /**
-     * Renders a URI and returns the Response content.
-     *
-     * Available options:
-     *
-     *  * ignore_errors: true to return an empty string in case of an error
-     *
-     * @param string|ControllerReference $uri      A URI as a string or a ControllerReference instance
-     * @param string                     $renderer The renderer name
-     * @param array                      $options  An array of options
-     *
-     * @return string|null The Response content or null when the Response is streamed
-     *
-     * @throws \InvalidArgumentException when the renderer does not exist
-     * @throws \LogicException           when no master request is being handled
-     */
-    public function render($uri, $renderer = 'inline', array $options = array())
-    {
-        if (!isset($options['ignore_errors'])) {
-            $options['ignore_errors'] = !$this->debug;
-        }
-
-        if (!isset($this->renderers[$renderer])) {
-            throw new \InvalidArgumentException(sprintf('The "%s" renderer does not exist.', $renderer));
-        }
-
-        if (!$request = $this->getRequest()) {
-            throw new \LogicException('Rendering a fragment can only be done when handling a Request.');
-        }
-
-        return $this->deliver($this->renderers[$renderer]->render($uri, $request, $options));
-    }
-
-    /**
-     * Delivers the Response as a string.
-     *
-     * When the Response is a StreamedResponse, the content is streamed immediately
-     * instead of being returned.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return string|null The Response content or null when the Response is streamed
-     *
-     * @throws \RuntimeException when the Response is not successful
-     */
-    protected function deliver(Response $response)
-    {
-        if (!$response->isSuccessful()) {
-            throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $this->getRequest()->getUri(), $response->getStatusCode()));
-        }
-
-        if (!$response instanceof StreamedResponse) {
-            return $response->getContent();
-        }
-
-        $response->sendContent();
-    }
-
-    private function getRequest()
-    {
-        return $this->requestStack ? $this->requestStack->getCurrentRequest() : $this->request;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php b/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php
deleted file mode 100644
index b177c3a..0000000
--- a/vendor/symfony/http-kernel/Fragment/FragmentRendererInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Interface implemented by all rendering strategies.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface FragmentRendererInterface
-{
-    /**
-     * Renders a URI and returns the Response content.
-     *
-     * @param string|ControllerReference $uri     A URI as a string or a ControllerReference instance
-     * @param Request                    $request A Request instance
-     * @param array                      $options An array of options
-     *
-     * @return Response A Response instance
-     */
-    public function render($uri, Request $request, array $options = array());
-
-    /**
-     * Gets the name of the strategy.
-     *
-     * @return string The strategy name
-     */
-    public function getName();
-}
diff --git a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
deleted file mode 100644
index 56c96b3..0000000
--- a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Templating\EngineInterface;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\UriSigner;
-
-/**
- * Implements the Hinclude rendering strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HIncludeFragmentRenderer extends RoutableFragmentRenderer
-{
-    private $globalDefaultTemplate;
-    private $signer;
-    private $templating;
-    private $charset;
-
-    /**
-     * Constructor.
-     *
-     * @param EngineInterface|\Twig_Environment $templating            An EngineInterface or a \Twig_Environment instance
-     * @param UriSigner                         $signer                A UriSigner instance
-     * @param string                            $globalDefaultTemplate The global default content (it can be a template name or the content)
-     * @param string                            $charset
-     */
-    public function __construct($templating = null, UriSigner $signer = null, $globalDefaultTemplate = null, $charset = 'utf-8')
-    {
-        $this->setTemplating($templating);
-        $this->globalDefaultTemplate = $globalDefaultTemplate;
-        $this->signer = $signer;
-        $this->charset = $charset;
-    }
-
-    /**
-     * Sets the templating engine to use to render the default content.
-     *
-     * @param EngineInterface|\Twig_Environment|null $templating An EngineInterface or a \Twig_Environment instance
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setTemplating($templating)
-    {
-        if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof \Twig_Environment) {
-            throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of \Twig_Environment or Symfony\Component\Templating\EngineInterface');
-        }
-
-        $this->templating = $templating;
-    }
-
-    /**
-     * Checks if a templating engine has been set.
-     *
-     * @return bool true if the templating engine has been set, false otherwise
-     */
-    public function hasTemplating()
-    {
-        return null !== $this->templating;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Additional available options:
-     *
-     *  * default:    The default content (it can be a template name or the content)
-     *  * id:         An optional hx:include tag id attribute
-     *  * attributes: An optional array of hx:include tag attributes
-     */
-    public function render($uri, Request $request, array $options = array())
-    {
-        if ($uri instanceof ControllerReference) {
-            if (null === $this->signer) {
-                throw new \LogicException('You must use a proper URI when using the Hinclude rendering strategy or set a URL signer.');
-            }
-
-            // we need to sign the absolute URI, but want to return the path only.
-            $uri = substr($this->signer->sign($this->generateFragmentUri($uri, $request, true)), strlen($request->getSchemeAndHttpHost()));
-        }
-
-        // We need to replace ampersands in the URI with the encoded form in order to return valid html/xml content.
-        $uri = str_replace('&', '&amp;', $uri);
-
-        $template = isset($options['default']) ? $options['default'] : $this->globalDefaultTemplate;
-        if (null !== $this->templating && $template && $this->templateExists($template)) {
-            $content = $this->templating->render($template);
-        } else {
-            $content = $template;
-        }
-
-        $attributes = isset($options['attributes']) && is_array($options['attributes']) ? $options['attributes'] : array();
-        if (isset($options['id']) && $options['id']) {
-            $attributes['id'] = $options['id'];
-        }
-        $renderedAttributes = '';
-        if (count($attributes) > 0) {
-            if (PHP_VERSION_ID >= 50400) {
-                $flags = ENT_QUOTES | ENT_SUBSTITUTE;
-            } else {
-                $flags = ENT_QUOTES;
-            }
-            foreach ($attributes as $attribute => $value) {
-                $renderedAttributes .= sprintf(
-                    ' %s="%s"',
-                    htmlspecialchars($attribute, $flags, $this->charset, false),
-                    htmlspecialchars($value, $flags, $this->charset, false)
-                );
-            }
-        }
-
-        return new Response(sprintf('<hx:include src="%s"%s>%s</hx:include>', $uri, $renderedAttributes, $content));
-    }
-
-    /**
-     * @param string $template
-     *
-     * @return bool
-     */
-    private function templateExists($template)
-    {
-        if ($this->templating instanceof EngineInterface) {
-            try {
-                return $this->templating->exists($template);
-            } catch (\InvalidArgumentException $e) {
-                return false;
-            }
-        }
-
-        $loader = $this->templating->getLoader();
-        if ($loader instanceof \Twig_ExistsLoaderInterface) {
-            return $loader->exists($template);
-        }
-
-        try {
-            $loader->getSource($template);
-
-            return true;
-        } catch (\Twig_Error_Loader $e) {
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'hinclude';
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
deleted file mode 100644
index a6ab82e..0000000
--- a/vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * Implements the inline rendering strategy where the Request is rendered by the current HTTP kernel.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InlineFragmentRenderer extends RoutableFragmentRenderer
-{
-    private $kernel;
-    private $dispatcher;
-
-    /**
-     * Constructor.
-     *
-     * @param HttpKernelInterface      $kernel     A HttpKernelInterface instance
-     * @param EventDispatcherInterface $dispatcher A EventDispatcherInterface instance
-     */
-    public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null)
-    {
-        $this->kernel = $kernel;
-        $this->dispatcher = $dispatcher;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Additional available options:
-     *
-     *  * alt: an alternative URI to render in case of an error
-     */
-    public function render($uri, Request $request, array $options = array())
-    {
-        $reference = null;
-        if ($uri instanceof ControllerReference) {
-            $reference = $uri;
-
-            // Remove attributes from the generated URI because if not, the Symfony
-            // routing system will use them to populate the Request attributes. We don't
-            // want that as we want to preserve objects (so we manually set Request attributes
-            // below instead)
-            $attributes = $reference->attributes;
-            $reference->attributes = array();
-
-            // The request format and locale might have been overridden by the user
-            foreach (array('_format', '_locale') as $key) {
-                if (isset($attributes[$key])) {
-                    $reference->attributes[$key] = $attributes[$key];
-                }
-            }
-
-            $uri = $this->generateFragmentUri($uri, $request, false, false);
-
-            $reference->attributes = array_merge($attributes, $reference->attributes);
-        }
-
-        $subRequest = $this->createSubRequest($uri, $request);
-
-        // override Request attributes as they can be objects (which are not supported by the generated URI)
-        if (null !== $reference) {
-            $subRequest->attributes->add($reference->attributes);
-        }
-
-        $level = ob_get_level();
-        try {
-            return $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
-        } catch (\Exception $e) {
-            // we dispatch the exception event to trigger the logging
-            // the response that comes back is simply ignored
-            if (isset($options['ignore_errors']) && $options['ignore_errors'] && $this->dispatcher) {
-                $event = new GetResponseForExceptionEvent($this->kernel, $request, HttpKernelInterface::SUB_REQUEST, $e);
-
-                $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
-            }
-
-            // let's clean up the output buffers that were created by the sub-request
-            Response::closeOutputBuffers($level, false);
-
-            if (isset($options['alt'])) {
-                $alt = $options['alt'];
-                unset($options['alt']);
-
-                return $this->render($alt, $request, $options);
-            }
-
-            if (!isset($options['ignore_errors']) || !$options['ignore_errors']) {
-                throw $e;
-            }
-
-            return new Response();
-        }
-    }
-
-    protected function createSubRequest($uri, Request $request)
-    {
-        $cookies = $request->cookies->all();
-        $server = $request->server->all();
-
-        // Override the arguments to emulate a sub-request.
-        // Sub-request object will point to localhost as client ip and real client ip
-        // will be included into trusted header for client ip
-        try {
-            if ($trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP)) {
-                $currentXForwardedFor = $request->headers->get($trustedHeaderName, '');
-
-                $server['HTTP_'.$trustedHeaderName] = ($currentXForwardedFor ? $currentXForwardedFor.', ' : '').$request->getClientIp();
-            }
-        } catch (\InvalidArgumentException $e) {
-            // Do nothing
-        }
-
-        $server['REMOTE_ADDR'] = '127.0.0.1';
-
-        $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
-        if ($request->headers->has('Surrogate-Capability')) {
-            $subRequest->headers->set('Surrogate-Capability', $request->headers->get('Surrogate-Capability'));
-        }
-
-        if ($session = $request->getSession()) {
-            $subRequest->setSession($session);
-        }
-
-        return $subRequest;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'inline';
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php
deleted file mode 100644
index d7eeb89..0000000
--- a/vendor/symfony/http-kernel/Fragment/RoutableFragmentRenderer.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-use Symfony\Component\HttpKernel\Controller\ControllerReference;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\EventListener\FragmentListener;
-
-/**
- * Adds the possibility to generate a fragment URI for a given Controller.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class RoutableFragmentRenderer implements FragmentRendererInterface
-{
-    private $fragmentPath = '/_fragment';
-
-    /**
-     * Sets the fragment path that triggers the fragment listener.
-     *
-     * @param string $path The path
-     *
-     * @see FragmentListener
-     */
-    public function setFragmentPath($path)
-    {
-        $this->fragmentPath = $path;
-    }
-
-    /**
-     * Generates a fragment URI for a given controller.
-     *
-     * @param ControllerReference $reference A ControllerReference instance
-     * @param Request             $request   A Request instance
-     * @param bool                $absolute  Whether to generate an absolute URL or not
-     * @param bool                $strict    Whether to allow non-scalar attributes or not
-     *
-     * @return string A fragment URI
-     */
-    protected function generateFragmentUri(ControllerReference $reference, Request $request, $absolute = false, $strict = true)
-    {
-        if ($strict) {
-            $this->checkNonScalar($reference->attributes);
-        }
-
-        // We need to forward the current _format and _locale values as we don't have
-        // a proper routing pattern to do the job for us.
-        // This makes things inconsistent if you switch from rendering a controller
-        // to rendering a route if the route pattern does not contain the special
-        // _format and _locale placeholders.
-        if (!isset($reference->attributes['_format'])) {
-            $reference->attributes['_format'] = $request->getRequestFormat();
-        }
-        if (!isset($reference->attributes['_locale'])) {
-            $reference->attributes['_locale'] = $request->getLocale();
-        }
-
-        $reference->attributes['_controller'] = $reference->controller;
-
-        $reference->query['_path'] = http_build_query($reference->attributes, '', '&');
-
-        $path = $this->fragmentPath.'?'.http_build_query($reference->query, '', '&');
-
-        if ($absolute) {
-            return $request->getUriForPath($path);
-        }
-
-        return $request->getBaseUrl().$path;
-    }
-
-    private function checkNonScalar($values)
-    {
-        foreach ($values as $key => $value) {
-            if (is_array($value)) {
-                $this->checkNonScalar($value);
-            } elseif (!is_scalar($value) && null !== $value) {
-                throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/Fragment/SsiFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/SsiFragmentRenderer.php
deleted file mode 100644
index 45e7122..0000000
--- a/vendor/symfony/http-kernel/Fragment/SsiFragmentRenderer.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\HttpKernel\Fragment;
-
-/**
- * Implements the SSI rendering strategy.
- *
- * @author Sebastian Krebs <krebs.seb@gmail.com>
- */
-class SsiFragmentRenderer extends AbstractSurrogateFragmentRenderer
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'ssi';
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/Esi.php b/vendor/symfony/http-kernel/HttpCache/Esi.php
deleted file mode 100644
index bc344c6..0000000
--- a/vendor/symfony/http-kernel/HttpCache/Esi.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?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\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * Esi implements the ESI capabilities to Request and Response instances.
- *
- * For more information, read the following W3C notes:
- *
- *  * ESI Language Specification 1.0 (http://www.w3.org/TR/esi-lang)
- *
- *  * Edge Architecture Specification (http://www.w3.org/TR/edge-arch)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Esi implements SurrogateInterface
-{
-    private $contentTypes;
-    private $phpEscapeMap = array(
-        array('<?', '<%', '<s', '<S'),
-        array('<?php echo "<?"; ?>', '<?php echo "<%"; ?>', '<?php echo "<s"; ?>', '<?php echo "<S"; ?>'),
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param array $contentTypes An array of content-type that should be parsed for ESI information.
-     *                            (default: text/html, text/xml, application/xhtml+xml, and application/xml)
-     */
-    public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml'))
-    {
-        $this->contentTypes = $contentTypes;
-    }
-
-    public function getName()
-    {
-        return 'esi';
-    }
-
-    /**
-     * Returns a new cache strategy instance.
-     *
-     * @return ResponseCacheStrategyInterface A ResponseCacheStrategyInterface instance
-     */
-    public function createCacheStrategy()
-    {
-        return new ResponseCacheStrategy();
-    }
-
-    /**
-     * Checks that at least one surrogate has ESI/1.0 capability.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if one surrogate has ESI/1.0 capability, false otherwise
-     */
-    public function hasSurrogateCapability(Request $request)
-    {
-        if (null === $value = $request->headers->get('Surrogate-Capability')) {
-            return false;
-        }
-
-        return false !== strpos($value, 'ESI/1.0');
-    }
-
-    /**
-     * Checks that at least one surrogate has ESI/1.0 capability.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if one surrogate has ESI/1.0 capability, false otherwise
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use hasSurrogateCapability() instead
-     */
-    public function hasSurrogateEsiCapability(Request $request)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasSurrogateCapability() method instead.', E_USER_DEPRECATED);
-
-        return $this->hasSurrogateCapability($request);
-    }
-
-    /**
-     * Adds ESI/1.0 capability to the given Request.
-     *
-     * @param Request $request A Request instance
-     */
-    public function addSurrogateCapability(Request $request)
-    {
-        $current = $request->headers->get('Surrogate-Capability');
-        $new = 'symfony2="ESI/1.0"';
-
-        $request->headers->set('Surrogate-Capability', $current ? $current.', '.$new : $new);
-    }
-
-    /**
-     * Adds ESI/1.0 capability to the given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use addSurrogateCapability() instead
-     */
-    public function addSurrogateEsiCapability(Request $request)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addSurrogateCapability() method instead.', E_USER_DEPRECATED);
-
-        $this->addSurrogateCapability($request);
-    }
-
-    /**
-     * Adds HTTP headers to specify that the Response needs to be parsed for ESI.
-     *
-     * This method only adds an ESI HTTP header if the Response has some ESI tags.
-     *
-     * @param Response $response A Response instance
-     */
-    public function addSurrogateControl(Response $response)
-    {
-        if (false !== strpos($response->getContent(), '<esi:include')) {
-            $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
-        }
-    }
-
-    /**
-     * Checks that the Response needs to be parsed for ESI tags.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return bool true if the Response needs to be parsed, false otherwise
-     */
-    public function needsParsing(Response $response)
-    {
-        if (!$control = $response->headers->get('Surrogate-Control')) {
-            return false;
-        }
-
-        return (bool) preg_match('#content="[^"]*ESI/1.0[^"]*"#', $control);
-    }
-
-    /**
-     * Checks that the Response needs to be parsed for ESI tags.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return bool true if the Response needs to be parsed, false otherwise
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use needsParsing() instead
-     */
-    public function needsEsiParsing(Response $response)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the needsParsing() method instead.', E_USER_DEPRECATED);
-
-        return $this->needsParsing($response);
-    }
-
-    /**
-     * Renders an ESI tag.
-     *
-     * @param string $uri          A URI
-     * @param string $alt          An alternate URI
-     * @param bool   $ignoreErrors Whether to ignore errors or not
-     * @param string $comment      A comment to add as an esi:include tag
-     *
-     * @return string
-     */
-    public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comment = '')
-    {
-        $html = sprintf('<esi:include src="%s"%s%s />',
-            $uri,
-            $ignoreErrors ? ' onerror="continue"' : '',
-            $alt ? sprintf(' alt="%s"', $alt) : ''
-        );
-
-        if (!empty($comment)) {
-            return sprintf("<esi:comment text=\"%s\" />\n%s", $comment, $html);
-        }
-
-        return $html;
-    }
-
-    /**
-     * Replaces a Response ESI tags with the included resource content.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     *
-     * @return Response
-     */
-    public function process(Request $request, Response $response)
-    {
-        $type = $response->headers->get('Content-Type');
-        if (empty($type)) {
-            $type = 'text/html';
-        }
-
-        $parts = explode(';', $type);
-        if (!in_array($parts[0], $this->contentTypes)) {
-            return $response;
-        }
-
-        // we don't use a proper XML parser here as we can have ESI tags in a plain text response
-        $content = $response->getContent();
-        $content = preg_replace('#<esi\:remove>.*?</esi\:remove>#s', '', $content);
-        $content = preg_replace('#<esi\:comment[^>]+>#s', '', $content);
-
-        $chunks = preg_split('#<esi\:include\s+(.*?)\s*(?:/|</esi\:include)>#', $content, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $chunks[0] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[0]);
-
-        $i = 1;
-        while (isset($chunks[$i])) {
-            $options = array();
-            preg_match_all('/(src|onerror|alt)="([^"]*?)"/', $chunks[$i], $matches, PREG_SET_ORDER);
-            foreach ($matches as $set) {
-                $options[$set[1]] = $set[2];
-            }
-
-            if (!isset($options['src'])) {
-                throw new \RuntimeException('Unable to process an ESI tag without a "src" attribute.');
-            }
-
-            $chunks[$i] = sprintf('<?php echo $this->surrogate->handle($this, %s, %s, %s) ?>'."\n",
-                var_export($options['src'], true),
-                var_export(isset($options['alt']) ? $options['alt'] : '', true),
-                isset($options['onerror']) && 'continue' === $options['onerror'] ? 'true' : 'false'
-            );
-            ++$i;
-            $chunks[$i] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[$i]);
-            ++$i;
-        }
-        $content = implode('', $chunks);
-
-        $response->setContent($content);
-        $response->headers->set('X-Body-Eval', 'ESI');
-
-        // remove ESI/1.0 from the Surrogate-Control header
-        if ($response->headers->has('Surrogate-Control')) {
-            $value = $response->headers->get('Surrogate-Control');
-            if ('content="ESI/1.0"' == $value) {
-                $response->headers->remove('Surrogate-Control');
-            } elseif (preg_match('#,\s*content="ESI/1.0"#', $value)) {
-                $response->headers->set('Surrogate-Control', preg_replace('#,\s*content="ESI/1.0"#', '', $value));
-            } elseif (preg_match('#content="ESI/1.0",\s*#', $value)) {
-                $response->headers->set('Surrogate-Control', preg_replace('#content="ESI/1.0",\s*#', '', $value));
-            }
-        }
-    }
-
-    /**
-     * Handles an ESI from the cache.
-     *
-     * @param HttpCache $cache        An HttpCache instance
-     * @param string    $uri          The main URI
-     * @param string    $alt          An alternative URI
-     * @param bool      $ignoreErrors Whether to ignore errors or not
-     *
-     * @return string
-     *
-     * @throws \RuntimeException
-     * @throws \Exception
-     */
-    public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
-    {
-        $subRequest = Request::create($uri, 'get', array(), $cache->getRequest()->cookies->all(), array(), $cache->getRequest()->server->all());
-
-        try {
-            $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
-
-            if (!$response->isSuccessful()) {
-                throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $subRequest->getUri(), $response->getStatusCode()));
-            }
-
-            return $response->getContent();
-        } catch (\Exception $e) {
-            if ($alt) {
-                return $this->handle($cache, $alt, '', $ignoreErrors);
-            }
-
-            if (!$ignoreErrors) {
-                throw $e;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php b/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
deleted file mode 100644
index 636f60e..0000000
--- a/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategy.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-@trigger_error('The '.__NAMESPACE__.'\EsiResponseCacheStrategy class is deprecated since version 2.6 and will be removed in 3.0. Use the Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy class instead.', E_USER_DEPRECATED);
-
-/**
- * EsiResponseCacheStrategy knows how to compute the Response cache HTTP header
- * based on the different ESI response cache headers.
- *
- * This implementation changes the master response TTL to the smallest TTL received
- * or force validation if one of the ESI has validation cache strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.6, to be removed in 3.0. Use ResponseCacheStrategy instead
- */
-class EsiResponseCacheStrategy extends ResponseCacheStrategy implements EsiResponseCacheStrategyInterface
-{
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php b/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
deleted file mode 100644
index 5388e99..0000000
--- a/vendor/symfony/http-kernel/HttpCache/EsiResponseCacheStrategyInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-/**
- * ResponseCacheStrategyInterface implementations know how to compute the
- * Response cache HTTP header based on the different response cache headers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.6, to be removed in 3.0. Use ResponseCacheStrategyInterface instead.
- */
-interface EsiResponseCacheStrategyInterface extends ResponseCacheStrategyInterface
-{
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/HttpCache.php b/vendor/symfony/http-kernel/HttpCache/HttpCache.php
deleted file mode 100644
index a16c740..0000000
--- a/vendor/symfony/http-kernel/HttpCache/HttpCache.php
+++ /dev/null
@@ -1,706 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpKernel\TerminableInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Cache provides HTTP caching.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HttpCache implements HttpKernelInterface, TerminableInterface
-{
-    private $kernel;
-    private $store;
-    private $request;
-    private $surrogate;
-    private $surrogateCacheStrategy;
-    private $options = array();
-    private $traces = array();
-
-    /**
-     * Constructor.
-     *
-     * The available options are:
-     *
-     *   * debug:                 If true, the traces are added as a HTTP header to ease debugging
-     *
-     *   * default_ttl            The number of seconds that a cache entry should be considered
-     *                            fresh when no explicit freshness information is provided in
-     *                            a response. Explicit Cache-Control or Expires headers
-     *                            override this value. (default: 0)
-     *
-     *   * private_headers        Set of request headers that trigger "private" cache-control behavior
-     *                            on responses that don't explicitly state whether the response is
-     *                            public or private via a Cache-Control directive. (default: Authorization and Cookie)
-     *
-     *   * allow_reload           Specifies whether the client can force a cache reload by including a
-     *                            Cache-Control "no-cache" directive in the request. Set it to ``true``
-     *                            for compliance with RFC 2616. (default: false)
-     *
-     *   * allow_revalidate       Specifies whether the client can force a cache revalidate by including
-     *                            a Cache-Control "max-age=0" directive in the request. Set it to ``true``
-     *                            for compliance with RFC 2616. (default: false)
-     *
-     *   * stale_while_revalidate Specifies the default number of seconds (the granularity is the second as the
-     *                            Response TTL precision is a second) during which the cache can immediately return
-     *                            a stale response while it revalidates it in the background (default: 2).
-     *                            This setting is overridden by the stale-while-revalidate HTTP Cache-Control
-     *                            extension (see RFC 5861).
-     *
-     *   * stale_if_error         Specifies the default number of seconds (the granularity is the second) during which
-     *                            the cache can serve a stale response when an error is encountered (default: 60).
-     *                            This setting is overridden by the stale-if-error HTTP Cache-Control extension
-     *                            (see RFC 5861).
-     *
-     * @param HttpKernelInterface $kernel    An HttpKernelInterface instance
-     * @param StoreInterface      $store     A Store instance
-     * @param SurrogateInterface  $surrogate A SurrogateInterface instance
-     * @param array               $options   An array of options
-     */
-    public function __construct(HttpKernelInterface $kernel, StoreInterface $store, SurrogateInterface $surrogate = null, array $options = array())
-    {
-        $this->store = $store;
-        $this->kernel = $kernel;
-        $this->surrogate = $surrogate;
-
-        // needed in case there is a fatal error because the backend is too slow to respond
-        register_shutdown_function(array($this->store, 'cleanup'));
-
-        $this->options = array_merge(array(
-            'debug' => false,
-            'default_ttl' => 0,
-            'private_headers' => array('Authorization', 'Cookie'),
-            'allow_reload' => false,
-            'allow_revalidate' => false,
-            'stale_while_revalidate' => 2,
-            'stale_if_error' => 60,
-        ), $options);
-    }
-
-    /**
-     * Gets the current store.
-     *
-     * @return StoreInterface $store A StoreInterface instance
-     */
-    public function getStore()
-    {
-        return $this->store;
-    }
-
-    /**
-     * Returns an array of events that took place during processing of the last request.
-     *
-     * @return array An array of events
-     */
-    public function getTraces()
-    {
-        return $this->traces;
-    }
-
-    /**
-     * Returns a log message for the events of the last request processing.
-     *
-     * @return string A log message
-     */
-    public function getLog()
-    {
-        $log = array();
-        foreach ($this->traces as $request => $traces) {
-            $log[] = sprintf('%s: %s', $request, implode(', ', $traces));
-        }
-
-        return implode('; ', $log);
-    }
-
-    /**
-     * Gets the Request instance associated with the master request.
-     *
-     * @return Request A Request instance
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Gets the Kernel instance.
-     *
-     * @return HttpKernelInterface An HttpKernelInterface instance
-     */
-    public function getKernel()
-    {
-        return $this->kernel;
-    }
-
-    /**
-     * Gets the Surrogate instance.
-     *
-     * @throws \LogicException
-     *
-     * @return SurrogateInterface A Surrogate instance
-     */
-    public function getSurrogate()
-    {
-        if (!$this->surrogate instanceof Esi) {
-            throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
-        }
-
-        return $this->surrogate;
-    }
-
-    /**
-     * Gets the Esi instance.
-     *
-     * @throws \LogicException
-     *
-     * @return Esi An Esi instance
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use getSurrogate() instead
-     */
-    public function getEsi()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
-
-        return $this->getSurrogate();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        // FIXME: catch exceptions and implement a 500 error page here? -> in Varnish, there is a built-in error page mechanism
-        if (HttpKernelInterface::MASTER_REQUEST === $type) {
-            $this->traces = array();
-            $this->request = $request;
-            if (null !== $this->surrogate) {
-                $this->surrogateCacheStrategy = $this->surrogate->createCacheStrategy();
-            }
-        }
-
-        $path = $request->getPathInfo();
-        if ($qs = $request->getQueryString()) {
-            $path .= '?'.$qs;
-        }
-        $this->traces[$request->getMethod().' '.$path] = array();
-
-        if (!$request->isMethodSafe()) {
-            $response = $this->invalidate($request, $catch);
-        } elseif ($request->headers->has('expect')) {
-            $response = $this->pass($request, $catch);
-        } else {
-            $response = $this->lookup($request, $catch);
-        }
-
-        $this->restoreResponseBody($request, $response);
-
-        $response->setDate(\DateTime::createFromFormat('U', time(), new \DateTimeZone('UTC')));
-
-        if (HttpKernelInterface::MASTER_REQUEST === $type && $this->options['debug']) {
-            $response->headers->set('X-Symfony-Cache', $this->getLog());
-        }
-
-        if (null !== $this->surrogate) {
-            if (HttpKernelInterface::MASTER_REQUEST === $type) {
-                $this->surrogateCacheStrategy->update($response);
-            } else {
-                $this->surrogateCacheStrategy->add($response);
-            }
-        }
-
-        $response->prepare($request);
-
-        $response->isNotModified($request);
-
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function terminate(Request $request, Response $response)
-    {
-        if ($this->getKernel() instanceof TerminableInterface) {
-            $this->getKernel()->terminate($request, $response);
-        }
-    }
-
-    /**
-     * Forwards the Request to the backend without storing the Response in the cache.
-     *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
-     *
-     * @return Response A Response instance
-     */
-    protected function pass(Request $request, $catch = false)
-    {
-        $this->record($request, 'pass');
-
-        return $this->forward($request, $catch);
-    }
-
-    /**
-     * Invalidates non-safe methods (like POST, PUT, and DELETE).
-     *
-     * @param Request $request A Request instance
-     * @param bool    $catch   Whether to process exceptions
-     *
-     * @return Response A Response instance
-     *
-     * @throws \Exception
-     *
-     * @see RFC2616 13.10
-     */
-    protected function invalidate(Request $request, $catch = false)
-    {
-        $response = $this->pass($request, $catch);
-
-        // invalidate only when the response is successful
-        if ($response->isSuccessful() || $response->isRedirect()) {
-            try {
-                $this->store->invalidate($request, $catch);
-
-                // As per the RFC, invalidate Location and Content-Location URLs if present
-                foreach (array('Location', 'Content-Location') as $header) {
-                    if ($uri = $response->headers->get($header)) {
-                        $subRequest = Request::create($uri, 'get', array(), array(), array(), $request->server->all());
-
-                        $this->store->invalidate($subRequest);
-                    }
-                }
-
-                $this->record($request, 'invalidate');
-            } catch (\Exception $e) {
-                $this->record($request, 'invalidate-failed');
-
-                if ($this->options['debug']) {
-                    throw $e;
-                }
-            }
-        }
-
-        return $response;
-    }
-
-    /**
-     * Lookups a Response from the cache for the given Request.
-     *
-     * When a matching cache entry is found and is fresh, it uses it as the
-     * response without forwarding any request to the backend. When a matching
-     * cache entry is found but is stale, it attempts to "validate" the entry with
-     * the backend using conditional GET. When no matching cache entry is found,
-     * it triggers "miss" processing.
-     *
-     * @param Request $request A Request instance
-     * @param bool    $catch   whether to process exceptions
-     *
-     * @return Response A Response instance
-     *
-     * @throws \Exception
-     */
-    protected function lookup(Request $request, $catch = false)
-    {
-        // if allow_reload and no-cache Cache-Control, allow a cache reload
-        if ($this->options['allow_reload'] && $request->isNoCache()) {
-            $this->record($request, 'reload');
-
-            return $this->fetch($request, $catch);
-        }
-
-        try {
-            $entry = $this->store->lookup($request);
-        } catch (\Exception $e) {
-            $this->record($request, 'lookup-failed');
-
-            if ($this->options['debug']) {
-                throw $e;
-            }
-
-            return $this->pass($request, $catch);
-        }
-
-        if (null === $entry) {
-            $this->record($request, 'miss');
-
-            return $this->fetch($request, $catch);
-        }
-
-        if (!$this->isFreshEnough($request, $entry)) {
-            $this->record($request, 'stale');
-
-            return $this->validate($request, $entry, $catch);
-        }
-
-        $this->record($request, 'fresh');
-
-        $entry->headers->set('Age', $entry->getAge());
-
-        return $entry;
-    }
-
-    /**
-     * Validates that a cache entry is fresh.
-     *
-     * The original request is used as a template for a conditional
-     * GET request with the backend.
-     *
-     * @param Request  $request A Request instance
-     * @param Response $entry   A Response instance to validate
-     * @param bool     $catch   Whether to process exceptions
-     *
-     * @return Response A Response instance
-     */
-    protected function validate(Request $request, Response $entry, $catch = false)
-    {
-        $subRequest = clone $request;
-
-        // send no head requests because we want content
-        $subRequest->setMethod('GET');
-
-        // add our cached last-modified validator
-        $subRequest->headers->set('if_modified_since', $entry->headers->get('Last-Modified'));
-
-        // Add our cached etag validator to the environment.
-        // We keep the etags from the client to handle the case when the client
-        // has a different private valid entry which is not cached here.
-        $cachedEtags = $entry->getEtag() ? array($entry->getEtag()) : array();
-        $requestEtags = $request->getETags();
-        if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
-            $subRequest->headers->set('if_none_match', implode(', ', $etags));
-        }
-
-        $response = $this->forward($subRequest, $catch, $entry);
-
-        if (304 == $response->getStatusCode()) {
-            $this->record($request, 'valid');
-
-            // return the response and not the cache entry if the response is valid but not cached
-            $etag = $response->getEtag();
-            if ($etag && in_array($etag, $requestEtags) && !in_array($etag, $cachedEtags)) {
-                return $response;
-            }
-
-            $entry = clone $entry;
-            $entry->headers->remove('Date');
-
-            foreach (array('Date', 'Expires', 'Cache-Control', 'ETag', 'Last-Modified') as $name) {
-                if ($response->headers->has($name)) {
-                    $entry->headers->set($name, $response->headers->get($name));
-                }
-            }
-
-            $response = $entry;
-        } else {
-            $this->record($request, 'invalid');
-        }
-
-        if ($response->isCacheable()) {
-            $this->store($request, $response);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Forwards the Request to the backend and determines whether the response should be stored.
-     *
-     * This methods is triggered when the cache missed or a reload is required.
-     *
-     * @param Request $request A Request instance
-     * @param bool    $catch   whether to process exceptions
-     *
-     * @return Response A Response instance
-     */
-    protected function fetch(Request $request, $catch = false)
-    {
-        $subRequest = clone $request;
-
-        // send no head requests because we want content
-        $subRequest->setMethod('GET');
-
-        // avoid that the backend sends no content
-        $subRequest->headers->remove('if_modified_since');
-        $subRequest->headers->remove('if_none_match');
-
-        $response = $this->forward($subRequest, $catch);
-
-        if ($response->isCacheable()) {
-            $this->store($request, $response);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Forwards the Request to the backend and returns the Response.
-     *
-     * @param Request  $request A Request instance
-     * @param bool     $catch   Whether to catch exceptions or not
-     * @param Response $entry   A Response instance (the stale entry if present, null otherwise)
-     *
-     * @return Response A Response instance
-     */
-    protected function forward(Request $request, $catch = false, Response $entry = null)
-    {
-        if ($this->surrogate) {
-            $this->surrogate->addSurrogateCapability($request);
-        }
-
-        // modify the X-Forwarded-For header if needed
-        $forwardedFor = $request->headers->get('X-Forwarded-For');
-        if ($forwardedFor) {
-            $request->headers->set('X-Forwarded-For', $forwardedFor.', '.$request->server->get('REMOTE_ADDR'));
-        } else {
-            $request->headers->set('X-Forwarded-For', $request->server->get('REMOTE_ADDR'));
-        }
-
-        // fix the client IP address by setting it to 127.0.0.1 as HttpCache
-        // is always called from the same process as the backend.
-        $request->server->set('REMOTE_ADDR', '127.0.0.1');
-
-        // make sure HttpCache is a trusted proxy
-        if (!in_array('127.0.0.1', $trustedProxies = Request::getTrustedProxies())) {
-            $trustedProxies[] = '127.0.0.1';
-            Request::setTrustedProxies($trustedProxies);
-        }
-
-        // always a "master" request (as the real master request can be in cache)
-        $response = $this->kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, $catch);
-        // FIXME: we probably need to also catch exceptions if raw === true
-
-        // we don't implement the stale-if-error on Requests, which is nonetheless part of the RFC
-        if (null !== $entry && in_array($response->getStatusCode(), array(500, 502, 503, 504))) {
-            if (null === $age = $entry->headers->getCacheControlDirective('stale-if-error')) {
-                $age = $this->options['stale_if_error'];
-            }
-
-            if (abs($entry->getTtl()) < $age) {
-                $this->record($request, 'stale-if-error');
-
-                return $entry;
-            }
-        }
-
-        $this->processResponseBody($request, $response);
-
-        if ($this->isPrivateRequest($request) && !$response->headers->hasCacheControlDirective('public')) {
-            $response->setPrivate(true);
-        } elseif ($this->options['default_ttl'] > 0 && null === $response->getTtl() && !$response->headers->getCacheControlDirective('must-revalidate')) {
-            $response->setTtl($this->options['default_ttl']);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Checks whether the cache entry is "fresh enough" to satisfy the Request.
-     *
-     * @param Request  $request A Request instance
-     * @param Response $entry   A Response instance
-     *
-     * @return bool true if the cache entry if fresh enough, false otherwise
-     */
-    protected function isFreshEnough(Request $request, Response $entry)
-    {
-        if (!$entry->isFresh()) {
-            return $this->lock($request, $entry);
-        }
-
-        if ($this->options['allow_revalidate'] && null !== $maxAge = $request->headers->getCacheControlDirective('max-age')) {
-            return $maxAge > 0 && $maxAge >= $entry->getAge();
-        }
-
-        return true;
-    }
-
-    /**
-     * Locks a Request during the call to the backend.
-     *
-     * @param Request  $request A Request instance
-     * @param Response $entry   A Response instance
-     *
-     * @return bool true if the cache entry can be returned even if it is staled, false otherwise
-     */
-    protected function lock(Request $request, Response $entry)
-    {
-        // try to acquire a lock to call the backend
-        $lock = $this->store->lock($request);
-
-        // there is already another process calling the backend
-        if (true !== $lock) {
-            // check if we can serve the stale entry
-            if (null === $age = $entry->headers->getCacheControlDirective('stale-while-revalidate')) {
-                $age = $this->options['stale_while_revalidate'];
-            }
-
-            if (abs($entry->getTtl()) < $age) {
-                $this->record($request, 'stale-while-revalidate');
-
-                // server the stale response while there is a revalidation
-                return true;
-            }
-
-            // wait for the lock to be released
-            $wait = 0;
-            while ($this->store->isLocked($request) && $wait < 5000000) {
-                usleep(50000);
-                $wait += 50000;
-            }
-
-            if ($wait < 2000000) {
-                // replace the current entry with the fresh one
-                $new = $this->lookup($request);
-                $entry->headers = $new->headers;
-                $entry->setContent($new->getContent());
-                $entry->setStatusCode($new->getStatusCode());
-                $entry->setProtocolVersion($new->getProtocolVersion());
-                foreach ($new->headers->getCookies() as $cookie) {
-                    $entry->headers->setCookie($cookie);
-                }
-            } else {
-                // backend is slow as hell, send a 503 response (to avoid the dog pile effect)
-                $entry->setStatusCode(503);
-                $entry->setContent('503 Service Unavailable');
-                $entry->headers->set('Retry-After', 10);
-            }
-
-            return true;
-        }
-
-        // we have the lock, call the backend
-        return false;
-    }
-
-    /**
-     * Writes the Response to the cache.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     *
-     * @throws \Exception
-     */
-    protected function store(Request $request, Response $response)
-    {
-        try {
-            $this->store->write($request, $response);
-
-            $this->record($request, 'store');
-
-            $response->headers->set('Age', $response->getAge());
-        } catch (\Exception $e) {
-            $this->record($request, 'store-failed');
-
-            if ($this->options['debug']) {
-                throw $e;
-            }
-        }
-
-        // now that the response is cached, release the lock
-        $this->store->unlock($request);
-    }
-
-    /**
-     * Restores the Response body.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     */
-    private function restoreResponseBody(Request $request, Response $response)
-    {
-        if ($request->isMethod('HEAD') || 304 === $response->getStatusCode()) {
-            $response->setContent(null);
-            $response->headers->remove('X-Body-Eval');
-            $response->headers->remove('X-Body-File');
-
-            return;
-        }
-
-        if ($response->headers->has('X-Body-Eval')) {
-            ob_start();
-
-            if ($response->headers->has('X-Body-File')) {
-                include $response->headers->get('X-Body-File');
-            } else {
-                eval('; ?>'.$response->getContent().'<?php ;');
-            }
-
-            $response->setContent(ob_get_clean());
-            $response->headers->remove('X-Body-Eval');
-            if (!$response->headers->has('Transfer-Encoding')) {
-                $response->headers->set('Content-Length', strlen($response->getContent()));
-            }
-        } elseif ($response->headers->has('X-Body-File')) {
-            $response->setContent(file_get_contents($response->headers->get('X-Body-File')));
-        } else {
-            return;
-        }
-
-        $response->headers->remove('X-Body-File');
-    }
-
-    protected function processResponseBody(Request $request, Response $response)
-    {
-        if (null !== $this->surrogate && $this->surrogate->needsParsing($response)) {
-            $this->surrogate->process($request, $response);
-        }
-    }
-
-    /**
-     * Checks if the Request includes authorization or other sensitive information
-     * that should cause the Response to be considered private by default.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if the Request is private, false otherwise
-     */
-    private function isPrivateRequest(Request $request)
-    {
-        foreach ($this->options['private_headers'] as $key) {
-            $key = strtolower(str_replace('HTTP_', '', $key));
-
-            if ('cookie' === $key) {
-                if (count($request->cookies->all())) {
-                    return true;
-                }
-            } elseif ($request->headers->has($key)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Records that an event took place.
-     *
-     * @param Request $request A Request instance
-     * @param string  $event   The event name
-     */
-    private function record(Request $request, $event)
-    {
-        $path = $request->getPathInfo();
-        if ($qs = $request->getQueryString()) {
-            $path .= '?'.$qs;
-        }
-        $this->traces[$request->getMethod().' '.$path][] = $event;
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
deleted file mode 100644
index 67ffd97..0000000
--- a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * ResponseCacheStrategy knows how to compute the Response cache HTTP header
- * based on the different response cache headers.
- *
- * This implementation changes the master response TTL to the smallest TTL received
- * or force validation if one of the surrogates has validation cache strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ResponseCacheStrategy implements ResponseCacheStrategyInterface
-{
-    private $cacheable = true;
-    private $embeddedResponses = 0;
-    private $ttls = array();
-    private $maxAges = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add(Response $response)
-    {
-        if ($response->isValidateable()) {
-            $this->cacheable = false;
-        } else {
-            $this->ttls[] = $response->getTtl();
-            $this->maxAges[] = $response->getMaxAge();
-        }
-
-        ++$this->embeddedResponses;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function update(Response $response)
-    {
-        // if we have no embedded Response, do nothing
-        if (0 === $this->embeddedResponses) {
-            return;
-        }
-
-        // Remove validation related headers in order to avoid browsers using
-        // their own cache, because some of the response content comes from
-        // at least one embedded response (which likely has a different caching strategy).
-        if ($response->isValidateable()) {
-            $response->setEtag(null);
-            $response->setLastModified(null);
-            $this->cacheable = false;
-        }
-
-        if (!$this->cacheable) {
-            $response->headers->set('Cache-Control', 'no-cache, must-revalidate');
-
-            return;
-        }
-
-        $this->ttls[] = $response->getTtl();
-        $this->maxAges[] = $response->getMaxAge();
-
-        if (null !== $maxAge = min($this->maxAges)) {
-            $response->setSharedMaxAge($maxAge);
-            $response->headers->set('Age', $maxAge - min($this->ttls));
-        }
-        $response->setMaxAge(0);
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategyInterface.php b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategyInterface.php
deleted file mode 100644
index d70c2e0..0000000
--- a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategyInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- * (based on commit 02d2b48d75bcb63cf1c0c7149c077ad256542801)
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * ResponseCacheStrategyInterface implementations know how to compute the
- * Response cache HTTP header based on the different response cache headers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ResponseCacheStrategyInterface
-{
-    /**
-     * Adds a Response.
-     *
-     * @param Response $response
-     */
-    public function add(Response $response);
-
-    /**
-     * Updates the Response HTTP headers based on the embedded Responses.
-     *
-     * @param Response $response
-     */
-    public function update(Response $response);
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/Ssi.php b/vendor/symfony/http-kernel/HttpCache/Ssi.php
deleted file mode 100644
index 43311b6..0000000
--- a/vendor/symfony/http-kernel/HttpCache/Ssi.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?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\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * Ssi implements the SSI capabilities to Request and Response instances.
- *
- * @author Sebastian Krebs <krebs.seb@gmail.com>
- */
-class Ssi implements SurrogateInterface
-{
-    private $contentTypes;
-    private $phpEscapeMap = array(
-        array('<?', '<%', '<s', '<S'),
-        array('<?php echo "<?"; ?>', '<?php echo "<%"; ?>', '<?php echo "<s"; ?>', '<?php echo "<S"; ?>'),
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param array $contentTypes An array of content-type that should be parsed for SSI information.
-     *                            (default: text/html, text/xml, application/xhtml+xml, and application/xml)
-     */
-    public function __construct(array $contentTypes = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/xml'))
-    {
-        $this->contentTypes = $contentTypes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'ssi';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createCacheStrategy()
-    {
-        return new ResponseCacheStrategy();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasSurrogateCapability(Request $request)
-    {
-        if (null === $value = $request->headers->get('Surrogate-Capability')) {
-            return false;
-        }
-
-        return false !== strpos($value, 'SSI/1.0');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addSurrogateCapability(Request $request)
-    {
-        $current = $request->headers->get('Surrogate-Capability');
-        $new = 'symfony2="SSI/1.0"';
-
-        $request->headers->set('Surrogate-Capability', $current ? $current.', '.$new : $new);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addSurrogateControl(Response $response)
-    {
-        if (false !== strpos($response->getContent(), '<!--#include')) {
-            $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function needsParsing(Response $response)
-    {
-        if (!$control = $response->headers->get('Surrogate-Control')) {
-            return false;
-        }
-
-        return (bool) preg_match('#content="[^"]*SSI/1.0[^"]*"#', $control);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comment = '')
-    {
-        return sprintf('<!--#include virtual="%s" -->', $uri);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(Request $request, Response $response)
-    {
-        $type = $response->headers->get('Content-Type');
-        if (empty($type)) {
-            $type = 'text/html';
-        }
-
-        $parts = explode(';', $type);
-        if (!in_array($parts[0], $this->contentTypes)) {
-            return $response;
-        }
-
-        // we don't use a proper XML parser here as we can have SSI tags in a plain text response
-        $content = $response->getContent();
-
-        $chunks = preg_split('#<!--\#include\s+(.*?)\s*-->#', $content, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $chunks[0] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[0]);
-
-        $i = 1;
-        while (isset($chunks[$i])) {
-            $options = array();
-            preg_match_all('/(virtual)="([^"]*?)"/', $chunks[$i], $matches, PREG_SET_ORDER);
-            foreach ($matches as $set) {
-                $options[$set[1]] = $set[2];
-            }
-
-            if (!isset($options['virtual'])) {
-                throw new \RuntimeException('Unable to process an SSI tag without a "virtual" attribute.');
-            }
-
-            $chunks[$i] = sprintf('<?php echo $this->surrogate->handle($this, %s, \'\', false) ?>'."\n",
-                var_export($options['virtual'], true)
-            );
-            ++$i;
-            $chunks[$i] = str_replace($this->phpEscapeMap[0], $this->phpEscapeMap[1], $chunks[$i]);
-            ++$i;
-        }
-        $content = implode('', $chunks);
-
-        $response->setContent($content);
-        $response->headers->set('X-Body-Eval', 'SSI');
-
-        // remove SSI/1.0 from the Surrogate-Control header
-        if ($response->headers->has('Surrogate-Control')) {
-            $value = $response->headers->get('Surrogate-Control');
-            if ('content="SSI/1.0"' == $value) {
-                $response->headers->remove('Surrogate-Control');
-            } elseif (preg_match('#,\s*content="SSI/1.0"#', $value)) {
-                $response->headers->set('Surrogate-Control', preg_replace('#,\s*content="SSI/1.0"#', '', $value));
-            } elseif (preg_match('#content="SSI/1.0",\s*#', $value)) {
-                $response->headers->set('Surrogate-Control', preg_replace('#content="SSI/1.0",\s*#', '', $value));
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors)
-    {
-        $subRequest = Request::create($uri, 'get', array(), $cache->getRequest()->cookies->all(), array(), $cache->getRequest()->server->all());
-
-        try {
-            $response = $cache->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true);
-
-            if (!$response->isSuccessful()) {
-                throw new \RuntimeException(sprintf('Error when rendering "%s" (Status code is %s).', $subRequest->getUri(), $response->getStatusCode()));
-            }
-
-            return $response->getContent();
-        } catch (\Exception $e) {
-            if ($alt) {
-                return $this->handle($cache, $alt, '', $ignoreErrors);
-            }
-
-            if (!$ignoreErrors) {
-                throw $e;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/Store.php b/vendor/symfony/http-kernel/HttpCache/Store.php
deleted file mode 100644
index 044d14e..0000000
--- a/vendor/symfony/http-kernel/HttpCache/Store.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Store implements all the logic for storing cache metadata (Request and Response headers).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Store implements StoreInterface
-{
-    protected $root;
-    private $keyCache;
-    private $locks;
-
-    /**
-     * Constructor.
-     *
-     * @param string $root The path to the cache directory
-     */
-    public function __construct($root)
-    {
-        $this->root = $root;
-        if (!is_dir($this->root)) {
-            mkdir($this->root, 0777, true);
-        }
-        $this->keyCache = new \SplObjectStorage();
-        $this->locks = array();
-    }
-
-    /**
-     * Cleanups storage.
-     */
-    public function cleanup()
-    {
-        // unlock everything
-        foreach ($this->locks as $lock) {
-            if (file_exists($lock)) {
-                @unlink($lock);
-            }
-        }
-
-        $error = error_get_last();
-        if (1 === $error['type'] && false === headers_sent()) {
-            // send a 503
-            header('HTTP/1.0 503 Service Unavailable');
-            header('Retry-After: 10');
-            echo '503 Service Unavailable';
-        }
-    }
-
-    /**
-     * Locks the cache for a given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool|string true if the lock is acquired, the path to the current lock otherwise
-     */
-    public function lock(Request $request)
-    {
-        $path = $this->getPath($this->getCacheKey($request).'.lck');
-        if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true)) {
-            return false;
-        }
-
-        $lock = @fopen($path, 'x');
-        if (false !== $lock) {
-            fclose($lock);
-
-            $this->locks[] = $path;
-
-            return true;
-        }
-
-        return !file_exists($path) ?: $path;
-    }
-
-    /**
-     * Releases the lock for the given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise
-     */
-    public function unlock(Request $request)
-    {
-        $file = $this->getPath($this->getCacheKey($request).'.lck');
-
-        return is_file($file) ? @unlink($file) : false;
-    }
-
-    public function isLocked(Request $request)
-    {
-        return is_file($this->getPath($this->getCacheKey($request).'.lck'));
-    }
-
-    /**
-     * Locates a cached Response for the Request provided.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return Response|null A Response instance, or null if no cache entry was found
-     */
-    public function lookup(Request $request)
-    {
-        $key = $this->getCacheKey($request);
-
-        if (!$entries = $this->getMetadata($key)) {
-            return;
-        }
-
-        // find a cached entry that matches the request.
-        $match = null;
-        foreach ($entries as $entry) {
-            if ($this->requestsMatch(isset($entry[1]['vary'][0]) ? implode(', ', $entry[1]['vary']) : '', $request->headers->all(), $entry[0])) {
-                $match = $entry;
-
-                break;
-            }
-        }
-
-        if (null === $match) {
-            return;
-        }
-
-        list($req, $headers) = $match;
-        if (is_file($body = $this->getPath($headers['x-content-digest'][0]))) {
-            return $this->restoreResponse($headers, $body);
-        }
-
-        // TODO the metaStore referenced an entity that doesn't exist in
-        // the entityStore. We definitely want to return nil but we should
-        // also purge the entry from the meta-store when this is detected.
-    }
-
-    /**
-     * Writes a cache entry to the store for the given Request and Response.
-     *
-     * Existing entries are read and any that match the response are removed. This
-     * method calls write with the new list of cache entries.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     *
-     * @return string The key under which the response is stored
-     *
-     * @throws \RuntimeException
-     */
-    public function write(Request $request, Response $response)
-    {
-        $key = $this->getCacheKey($request);
-        $storedEnv = $this->persistRequest($request);
-
-        // write the response body to the entity store if this is the original response
-        if (!$response->headers->has('X-Content-Digest')) {
-            $digest = $this->generateContentDigest($response);
-
-            if (false === $this->save($digest, $response->getContent())) {
-                throw new \RuntimeException('Unable to store the entity.');
-            }
-
-            $response->headers->set('X-Content-Digest', $digest);
-
-            if (!$response->headers->has('Transfer-Encoding')) {
-                $response->headers->set('Content-Length', strlen($response->getContent()));
-            }
-        }
-
-        // read existing cache entries, remove non-varying, and add this one to the list
-        $entries = array();
-        $vary = $response->headers->get('vary');
-        foreach ($this->getMetadata($key) as $entry) {
-            if (!isset($entry[1]['vary'][0])) {
-                $entry[1]['vary'] = array('');
-            }
-
-            if ($vary != $entry[1]['vary'][0] || !$this->requestsMatch($vary, $entry[0], $storedEnv)) {
-                $entries[] = $entry;
-            }
-        }
-
-        $headers = $this->persistResponse($response);
-        unset($headers['age']);
-
-        array_unshift($entries, array($storedEnv, $headers));
-
-        if (false === $this->save($key, serialize($entries))) {
-            throw new \RuntimeException('Unable to store the metadata.');
-        }
-
-        return $key;
-    }
-
-    /**
-     * Returns content digest for $response.
-     *
-     * @param Response $response
-     *
-     * @return string
-     */
-    protected function generateContentDigest(Response $response)
-    {
-        return 'en'.hash('sha256', $response->getContent());
-    }
-
-    /**
-     * Invalidates all cache entries that match the request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @throws \RuntimeException
-     */
-    public function invalidate(Request $request)
-    {
-        $modified = false;
-        $key = $this->getCacheKey($request);
-
-        $entries = array();
-        foreach ($this->getMetadata($key) as $entry) {
-            $response = $this->restoreResponse($entry[1]);
-            if ($response->isFresh()) {
-                $response->expire();
-                $modified = true;
-                $entries[] = array($entry[0], $this->persistResponse($response));
-            } else {
-                $entries[] = $entry;
-            }
-        }
-
-        if ($modified) {
-            if (false === $this->save($key, serialize($entries))) {
-                throw new \RuntimeException('Unable to store the metadata.');
-            }
-        }
-    }
-
-    /**
-     * Determines whether two Request HTTP header sets are non-varying based on
-     * the vary response header value provided.
-     *
-     * @param string $vary A Response vary header
-     * @param array  $env1 A Request HTTP header array
-     * @param array  $env2 A Request HTTP header array
-     *
-     * @return bool true if the two environments match, false otherwise
-     */
-    private function requestsMatch($vary, $env1, $env2)
-    {
-        if (empty($vary)) {
-            return true;
-        }
-
-        foreach (preg_split('/[\s,]+/', $vary) as $header) {
-            $key = strtr(strtolower($header), '_', '-');
-            $v1 = isset($env1[$key]) ? $env1[$key] : null;
-            $v2 = isset($env2[$key]) ? $env2[$key] : null;
-            if ($v1 !== $v2) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets all data associated with the given key.
-     *
-     * Use this method only if you know what you are doing.
-     *
-     * @param string $key The store key
-     *
-     * @return array An array of data associated with the key
-     */
-    private function getMetadata($key)
-    {
-        if (false === $entries = $this->load($key)) {
-            return array();
-        }
-
-        return unserialize($entries);
-    }
-
-    /**
-     * Purges data for the given URL.
-     *
-     * @param string $url A URL
-     *
-     * @return bool true if the URL exists and has been purged, false otherwise
-     */
-    public function purge($url)
-    {
-        if (is_file($path = $this->getPath($this->getCacheKey(Request::create($url))))) {
-            unlink($path);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Loads data for the given key.
-     *
-     * @param string $key The store key
-     *
-     * @return string The data associated with the key
-     */
-    private function load($key)
-    {
-        $path = $this->getPath($key);
-
-        return is_file($path) ? file_get_contents($path) : false;
-    }
-
-    /**
-     * Save data for the given key.
-     *
-     * @param string $key  The store key
-     * @param string $data The data to store
-     *
-     * @return bool
-     */
-    private function save($key, $data)
-    {
-        $path = $this->getPath($key);
-        if (!is_dir(dirname($path)) && false === @mkdir(dirname($path), 0777, true)) {
-            return false;
-        }
-
-        $tmpFile = tempnam(dirname($path), basename($path));
-        if (false === $fp = @fopen($tmpFile, 'wb')) {
-            return false;
-        }
-        @fwrite($fp, $data);
-        @fclose($fp);
-
-        if ($data != file_get_contents($tmpFile)) {
-            return false;
-        }
-
-        if (false === @rename($tmpFile, $path)) {
-            return false;
-        }
-
-        @chmod($path, 0666 & ~umask());
-    }
-
-    public function getPath($key)
-    {
-        return $this->root.DIRECTORY_SEPARATOR.substr($key, 0, 2).DIRECTORY_SEPARATOR.substr($key, 2, 2).DIRECTORY_SEPARATOR.substr($key, 4, 2).DIRECTORY_SEPARATOR.substr($key, 6);
-    }
-
-    /**
-     * Generates a cache key for the given Request.
-     *
-     * This method should return a key that must only depend on a
-     * normalized version of the request URI.
-     *
-     * If the same URI can have more than one representation, based on some
-     * headers, use a Vary header to indicate them, and each representation will
-     * be stored independently under the same cache key.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return string A key for the given Request
-     */
-    protected function generateCacheKey(Request $request)
-    {
-        return 'md'.hash('sha256', $request->getUri());
-    }
-
-    /**
-     * Returns a cache key for the given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return string A key for the given Request
-     */
-    private function getCacheKey(Request $request)
-    {
-        if (isset($this->keyCache[$request])) {
-            return $this->keyCache[$request];
-        }
-
-        return $this->keyCache[$request] = $this->generateCacheKey($request);
-    }
-
-    /**
-     * Persists the Request HTTP headers.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return array An array of HTTP headers
-     */
-    private function persistRequest(Request $request)
-    {
-        return $request->headers->all();
-    }
-
-    /**
-     * Persists the Response HTTP headers.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return array An array of HTTP headers
-     */
-    private function persistResponse(Response $response)
-    {
-        $headers = $response->headers->all();
-        $headers['X-Status'] = array($response->getStatusCode());
-
-        return $headers;
-    }
-
-    /**
-     * Restores a Response from the HTTP headers and body.
-     *
-     * @param array  $headers An array of HTTP headers for the Response
-     * @param string $body    The Response body
-     *
-     * @return Response
-     */
-    private function restoreResponse($headers, $body = null)
-    {
-        $status = $headers['X-Status'][0];
-        unset($headers['X-Status']);
-
-        if (null !== $body) {
-            $headers['X-Body-File'] = array($body);
-        }
-
-        return new Response($body, $status, $headers);
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/StoreInterface.php b/vendor/symfony/http-kernel/HttpCache/StoreInterface.php
deleted file mode 100644
index ddc0c04..0000000
--- a/vendor/symfony/http-kernel/HttpCache/StoreInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * This code is partially based on the Rack-Cache library by Ryan Tomayko,
- * which is released under the MIT license.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Interface implemented by HTTP cache stores.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface StoreInterface
-{
-    /**
-     * Locates a cached Response for the Request provided.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return Response|null A Response instance, or null if no cache entry was found
-     */
-    public function lookup(Request $request);
-
-    /**
-     * Writes a cache entry to the store for the given Request and Response.
-     *
-     * Existing entries are read and any that match the response are removed. This
-     * method calls write with the new list of cache entries.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     *
-     * @return string The key under which the response is stored
-     */
-    public function write(Request $request, Response $response);
-
-    /**
-     * Invalidates all cache entries that match the request.
-     *
-     * @param Request $request A Request instance
-     */
-    public function invalidate(Request $request);
-
-    /**
-     * Locks the cache for a given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool|string true if the lock is acquired, the path to the current lock otherwise
-     */
-    public function lock(Request $request);
-
-    /**
-     * Releases the lock for the given Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool False if the lock file does not exist or cannot be unlocked, true otherwise
-     */
-    public function unlock(Request $request);
-
-    /**
-     * Returns whether or not a lock exists.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if lock exists, false otherwise
-     */
-    public function isLocked(Request $request);
-
-    /**
-     * Purges data for the given URL.
-     *
-     * @param string $url A URL
-     *
-     * @return bool true if the URL exists and has been purged, false otherwise
-     */
-    public function purge($url);
-
-    /**
-     * Cleanups storage.
-     */
-    public function cleanup();
-}
diff --git a/vendor/symfony/http-kernel/HttpCache/SurrogateInterface.php b/vendor/symfony/http-kernel/HttpCache/SurrogateInterface.php
deleted file mode 100644
index 5d65fd6..0000000
--- a/vendor/symfony/http-kernel/HttpCache/SurrogateInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Component\HttpKernel\HttpCache;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-interface SurrogateInterface
-{
-    /**
-     * Returns surrogate name.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Returns a new cache strategy instance.
-     *
-     * @return ResponseCacheStrategyInterface A ResponseCacheStrategyInterface instance
-     */
-    public function createCacheStrategy();
-
-    /**
-     * Checks that at least one surrogate has Surrogate capability.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return bool true if one surrogate has Surrogate capability, false otherwise
-     */
-    public function hasSurrogateCapability(Request $request);
-
-    /**
-     * Adds Surrogate-capability to the given Request.
-     *
-     * @param Request $request A Request instance
-     */
-    public function addSurrogateCapability(Request $request);
-
-    /**
-     * Adds HTTP headers to specify that the Response needs to be parsed for Surrogate.
-     *
-     * This method only adds an Surrogate HTTP header if the Response has some Surrogate tags.
-     *
-     * @param Response $response A Response instance
-     */
-    public function addSurrogateControl(Response $response);
-
-    /**
-     * Checks that the Response needs to be parsed for Surrogate tags.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return bool true if the Response needs to be parsed, false otherwise
-     */
-    public function needsParsing(Response $response);
-
-    /**
-     * Renders a Surrogate tag.
-     *
-     * @param string $uri          A URI
-     * @param string $alt          An alternate URI
-     * @param bool   $ignoreErrors Whether to ignore errors or not
-     * @param string $comment      A comment to add as an esi:include tag
-     *
-     * @return string
-     */
-    public function renderIncludeTag($uri, $alt = null, $ignoreErrors = true, $comment = '');
-
-    /**
-     * Replaces a Response Surrogate tags with the included resource content.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     *
-     * @return Response
-     */
-    public function process(Request $request, Response $response);
-
-    /**
-     * Handles a Surrogate from the cache.
-     *
-     * @param HttpCache $cache        An HttpCache instance
-     * @param string    $uri          The main URI
-     * @param string    $alt          An alternative URI
-     * @param bool      $ignoreErrors Whether to ignore errors or not
-     *
-     * @return string
-     *
-     * @throws \RuntimeException
-     * @throws \Exception
-     */
-    public function handle(HttpCache $cache, $uri, $alt, $ignoreErrors);
-}
diff --git a/vendor/symfony/http-kernel/HttpKernel.php b/vendor/symfony/http-kernel/HttpKernel.php
deleted file mode 100644
index 1600b2c..0000000
--- a/vendor/symfony/http-kernel/HttpKernel.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-/**
- * HttpKernel notifies events to convert a Request object to a Response one.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class HttpKernel implements HttpKernelInterface, TerminableInterface
-{
-    protected $dispatcher;
-    protected $resolver;
-    protected $requestStack;
-
-    /**
-     * Constructor.
-     *
-     * @param EventDispatcherInterface    $dispatcher   An EventDispatcherInterface instance
-     * @param ControllerResolverInterface $resolver     A ControllerResolverInterface instance
-     * @param RequestStack                $requestStack A stack for master/sub requests
-     */
-    public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null)
-    {
-        $this->dispatcher = $dispatcher;
-        $this->resolver = $resolver;
-        $this->requestStack = $requestStack ?: new RequestStack();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        $request->headers->set('X-Php-Ob-Level', ob_get_level());
-
-        try {
-            return $this->handleRaw($request, $type);
-        } catch (\Exception $e) {
-            if (false === $catch) {
-                $this->finishRequest($request, $type);
-
-                throw $e;
-            }
-
-            return $this->handleException($e, $request, $type);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function terminate(Request $request, Response $response)
-    {
-        $this->dispatcher->dispatch(KernelEvents::TERMINATE, new PostResponseEvent($this, $request, $response));
-    }
-
-    /**
-     * @throws \LogicException If the request stack is empty
-     *
-     * @internal
-     */
-    public function terminateWithException(\Exception $exception)
-    {
-        if (!$request = $this->requestStack->getMasterRequest()) {
-            throw new \LogicException('Request stack is empty', 0, $exception);
-        }
-
-        $response = $this->handleException($exception, $request, self::MASTER_REQUEST);
-
-        $response->sendHeaders();
-        $response->sendContent();
-
-        $this->terminate($request, $response);
-    }
-
-    /**
-     * Handles a request to convert it to a response.
-     *
-     * Exceptions are not caught.
-     *
-     * @param Request $request A Request instance
-     * @param int     $type    The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
-     *
-     * @return Response A Response instance
-     *
-     * @throws \LogicException       If one of the listener does not behave as expected
-     * @throws NotFoundHttpException When controller cannot be found
-     */
-    private function handleRaw(Request $request, $type = self::MASTER_REQUEST)
-    {
-        $this->requestStack->push($request);
-
-        // request
-        $event = new GetResponseEvent($this, $request, $type);
-        $this->dispatcher->dispatch(KernelEvents::REQUEST, $event);
-
-        if ($event->hasResponse()) {
-            return $this->filterResponse($event->getResponse(), $request, $type);
-        }
-
-        // load controller
-        if (false === $controller = $this->resolver->getController($request)) {
-            throw new NotFoundHttpException(sprintf('Unable to find the controller for path "%s". The route is wrongly configured.', $request->getPathInfo()));
-        }
-
-        $event = new FilterControllerEvent($this, $controller, $request, $type);
-        $this->dispatcher->dispatch(KernelEvents::CONTROLLER, $event);
-        $controller = $event->getController();
-
-        // controller arguments
-        $arguments = $this->resolver->getArguments($request, $controller);
-
-        // call controller
-        $response = call_user_func_array($controller, $arguments);
-
-        // view
-        if (!$response instanceof Response) {
-            $event = new GetResponseForControllerResultEvent($this, $request, $type, $response);
-            $this->dispatcher->dispatch(KernelEvents::VIEW, $event);
-
-            if ($event->hasResponse()) {
-                $response = $event->getResponse();
-            }
-
-            if (!$response instanceof Response) {
-                $msg = sprintf('The controller must return a response (%s given).', $this->varToString($response));
-
-                // the user may have forgotten to return something
-                if (null === $response) {
-                    $msg .= ' Did you forget to add a return statement somewhere in your controller?';
-                }
-                throw new \LogicException($msg);
-            }
-        }
-
-        return $this->filterResponse($response, $request, $type);
-    }
-
-    /**
-     * Filters a response object.
-     *
-     * @param Response $response A Response instance
-     * @param Request  $request  An error message in case the response is not a Response object
-     * @param int      $type     The type of the request (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
-     *
-     * @return Response The filtered Response instance
-     *
-     * @throws \RuntimeException if the passed object is not a Response instance
-     */
-    private function filterResponse(Response $response, Request $request, $type)
-    {
-        $event = new FilterResponseEvent($this, $request, $type, $response);
-
-        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);
-
-        $this->finishRequest($request, $type);
-
-        return $event->getResponse();
-    }
-
-    /**
-     * Publishes the finish request event, then pop the request from the stack.
-     *
-     * Note that the order of the operations is important here, otherwise
-     * operations such as {@link RequestStack::getParentRequest()} can lead to
-     * weird results.
-     *
-     * @param Request $request
-     * @param int     $type
-     */
-    private function finishRequest(Request $request, $type)
-    {
-        $this->dispatcher->dispatch(KernelEvents::FINISH_REQUEST, new FinishRequestEvent($this, $request, $type));
-        $this->requestStack->pop();
-    }
-
-    /**
-     * Handles an exception by trying to convert it to a Response.
-     *
-     * @param \Exception $e       An \Exception instance
-     * @param Request    $request A Request instance
-     * @param int        $type    The type of the request
-     *
-     * @return Response A Response instance
-     *
-     * @throws \Exception
-     */
-    private function handleException(\Exception $e, $request, $type)
-    {
-        $event = new GetResponseForExceptionEvent($this, $request, $type, $e);
-        $this->dispatcher->dispatch(KernelEvents::EXCEPTION, $event);
-
-        // a listener might have replaced the exception
-        $e = $event->getException();
-
-        if (!$event->hasResponse()) {
-            $this->finishRequest($request, $type);
-
-            throw $e;
-        }
-
-        $response = $event->getResponse();
-
-        // the developer asked for a specific status code
-        if ($response->headers->has('X-Status-Code')) {
-            $response->setStatusCode($response->headers->get('X-Status-Code'));
-
-            $response->headers->remove('X-Status-Code');
-        } elseif (!$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
-            // ensure that we actually have an error response
-            if ($e instanceof HttpExceptionInterface) {
-                // keep the HTTP status code and headers
-                $response->setStatusCode($e->getStatusCode());
-                $response->headers->add($e->getHeaders());
-            } else {
-                $response->setStatusCode(500);
-            }
-        }
-
-        try {
-            return $this->filterResponse($response, $request, $type);
-        } catch (\Exception $e) {
-            return $response;
-        }
-    }
-
-    private function varToString($var)
-    {
-        if (is_object($var)) {
-            return sprintf('Object(%s)', get_class($var));
-        }
-
-        if (is_array($var)) {
-            $a = array();
-            foreach ($var as $k => $v) {
-                $a[] = sprintf('%s => %s', $k, $this->varToString($v));
-            }
-
-            return sprintf('Array(%s)', implode(', ', $a));
-        }
-
-        if (is_resource($var)) {
-            return sprintf('Resource(%s)', get_resource_type($var));
-        }
-
-        if (null === $var) {
-            return 'null';
-        }
-
-        if (false === $var) {
-            return 'false';
-        }
-
-        if (true === $var) {
-            return 'true';
-        }
-
-        return (string) $var;
-    }
-}
diff --git a/vendor/symfony/http-kernel/HttpKernelInterface.php b/vendor/symfony/http-kernel/HttpKernelInterface.php
deleted file mode 100644
index 5050bfc..0000000
--- a/vendor/symfony/http-kernel/HttpKernelInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * HttpKernelInterface handles a Request to convert it to a Response.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface HttpKernelInterface
-{
-    const MASTER_REQUEST = 1;
-    const SUB_REQUEST = 2;
-
-    /**
-     * Handles a Request to convert it to a Response.
-     *
-     * When $catch is true, the implementation must catch all exceptions
-     * and do its best to convert them to a Response instance.
-     *
-     * @param Request $request A Request instance
-     * @param int     $type    The type of the request
-     *                         (one of HttpKernelInterface::MASTER_REQUEST or HttpKernelInterface::SUB_REQUEST)
-     * @param bool    $catch   Whether to catch exceptions or not
-     *
-     * @return Response A Response instance
-     *
-     * @throws \Exception When an Exception occurs during processing
-     */
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
-}
diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php
deleted file mode 100644
index a02dcd9..0000000
--- a/vendor/symfony/http-kernel/Kernel.php
+++ /dev/null
@@ -1,761 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
-use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\Loader\IniFileLoader;
-use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\HttpKernel\Config\EnvParametersResource;
-use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
-use Symfony\Component\HttpKernel\DependencyInjection\AddClassesToCachePass;
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\Config\Loader\DelegatingLoader;
-use Symfony\Component\Config\ConfigCache;
-use Symfony\Component\ClassLoader\ClassCollectionLoader;
-
-/**
- * The Kernel is the heart of the Symfony system.
- *
- * It manages an environment made of bundles.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Kernel implements KernelInterface, TerminableInterface
-{
-    /**
-     * @var BundleInterface[]
-     */
-    protected $bundles = array();
-
-    protected $bundleMap;
-    protected $container;
-    protected $rootDir;
-    protected $environment;
-    protected $debug;
-    protected $booted = false;
-    protected $name;
-    protected $startTime;
-    protected $loadClassCache;
-
-    const VERSION = '2.7.6';
-    const VERSION_ID = 20706;
-    const MAJOR_VERSION = 2;
-    const MINOR_VERSION = 7;
-    const RELEASE_VERSION = 6;
-    const EXTRA_VERSION = '';
-
-    const END_OF_MAINTENANCE = '05/2018';
-    const END_OF_LIFE = '05/2019';
-
-    /**
-     * Constructor.
-     *
-     * @param string $environment The environment
-     * @param bool   $debug       Whether to enable debugging or not
-     */
-    public function __construct($environment, $debug)
-    {
-        $this->environment = $environment;
-        $this->debug = (bool) $debug;
-        $this->rootDir = $this->getRootDir();
-        $this->name = $this->getName();
-
-        if ($this->debug) {
-            $this->startTime = microtime(true);
-        }
-
-        $defClass = new \ReflectionMethod($this, 'init');
-        $defClass = $defClass->getDeclaringClass()->name;
-
-        if (__CLASS__ !== $defClass) {
-            @trigger_error(sprintf('Calling the %s::init() method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', $defClass), E_USER_DEPRECATED);
-            $this->init();
-        }
-    }
-
-    /**
-     * @deprecated since version 2.3, to be removed in 3.0. Move your logic in the constructor instead.
-     */
-    public function init()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Move your logic to the constructor method instead.', E_USER_DEPRECATED);
-    }
-
-    public function __clone()
-    {
-        if ($this->debug) {
-            $this->startTime = microtime(true);
-        }
-
-        $this->booted = false;
-        $this->container = null;
-    }
-
-    /**
-     * Boots the current kernel.
-     */
-    public function boot()
-    {
-        if (true === $this->booted) {
-            return;
-        }
-
-        if ($this->loadClassCache) {
-            $this->doLoadClassCache($this->loadClassCache[0], $this->loadClassCache[1]);
-        }
-
-        // init bundles
-        $this->initializeBundles();
-
-        // init container
-        $this->initializeContainer();
-
-        foreach ($this->getBundles() as $bundle) {
-            $bundle->setContainer($this->container);
-            $bundle->boot();
-        }
-
-        $this->booted = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function terminate(Request $request, Response $response)
-    {
-        if (false === $this->booted) {
-            return;
-        }
-
-        if ($this->getHttpKernel() instanceof TerminableInterface) {
-            $this->getHttpKernel()->terminate($request, $response);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function shutdown()
-    {
-        if (false === $this->booted) {
-            return;
-        }
-
-        $this->booted = false;
-
-        foreach ($this->getBundles() as $bundle) {
-            $bundle->shutdown();
-            $bundle->setContainer(null);
-        }
-
-        $this->container = null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        if (false === $this->booted) {
-            $this->boot();
-        }
-
-        return $this->getHttpKernel()->handle($request, $type, $catch);
-    }
-
-    /**
-     * Gets a HTTP kernel from the container.
-     *
-     * @return HttpKernel
-     */
-    protected function getHttpKernel()
-    {
-        return $this->container->get('http_kernel');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBundles()
-    {
-        return $this->bundles;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function isClassInActiveBundle($class)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in version 3.0.', E_USER_DEPRECATED);
-
-        foreach ($this->getBundles() as $bundle) {
-            if (0 === strpos($class, $bundle->getNamespace())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBundle($name, $first = true)
-    {
-        if (!isset($this->bundleMap[$name])) {
-            throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, get_class($this)));
-        }
-
-        if (true === $first) {
-            return $this->bundleMap[$name][0];
-        }
-
-        return $this->bundleMap[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \RuntimeException if a custom resource is hidden by a resource in a derived bundle
-     */
-    public function locateResource($name, $dir = null, $first = true)
-    {
-        if ('@' !== $name[0]) {
-            throw new \InvalidArgumentException(sprintf('A resource name must start with @ ("%s" given).', $name));
-        }
-
-        if (false !== strpos($name, '..')) {
-            throw new \RuntimeException(sprintf('File name "%s" contains invalid characters (..).', $name));
-        }
-
-        $bundleName = substr($name, 1);
-        $path = '';
-        if (false !== strpos($bundleName, '/')) {
-            list($bundleName, $path) = explode('/', $bundleName, 2);
-        }
-
-        $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
-        $overridePath = substr($path, 9);
-        $resourceBundle = null;
-        $bundles = $this->getBundle($bundleName, false);
-        $files = array();
-
-        foreach ($bundles as $bundle) {
-            if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) {
-                if (null !== $resourceBundle) {
-                    throw new \RuntimeException(sprintf('"%s" resource is hidden by a resource from the "%s" derived bundle. Create a "%s" file to override the bundle resource.',
-                        $file,
-                        $resourceBundle,
-                        $dir.'/'.$bundles[0]->getName().$overridePath
-                    ));
-                }
-
-                if ($first) {
-                    return $file;
-                }
-                $files[] = $file;
-            }
-
-            if (file_exists($file = $bundle->getPath().'/'.$path)) {
-                if ($first && !$isResource) {
-                    return $file;
-                }
-                $files[] = $file;
-                $resourceBundle = $bundle->getName();
-            }
-        }
-
-        if (count($files) > 0) {
-            return $first && $isResource ? $files[0] : $files;
-        }
-
-        throw new \InvalidArgumentException(sprintf('Unable to find file "%s".', $name));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        if (null === $this->name) {
-            $this->name = preg_replace('/[^a-zA-Z0-9_]+/', '', basename($this->rootDir));
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getEnvironment()
-    {
-        return $this->environment;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRootDir()
-    {
-        if (null === $this->rootDir) {
-            $r = new \ReflectionObject($this);
-            $this->rootDir = dirname($r->getFileName());
-        }
-
-        return $this->rootDir;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContainer()
-    {
-        return $this->container;
-    }
-
-    /**
-     * Loads the PHP class cache.
-     *
-     * This methods only registers the fact that you want to load the cache classes.
-     * The cache will actually only be loaded when the Kernel is booted.
-     *
-     * That optimization is mainly useful when using the HttpCache class in which
-     * case the class cache is not loaded if the Response is in the cache.
-     *
-     * @param string $name      The cache name prefix
-     * @param string $extension File extension of the resulting file
-     */
-    public function loadClassCache($name = 'classes', $extension = '.php')
-    {
-        $this->loadClassCache = array($name, $extension);
-    }
-
-    /**
-     * Used internally.
-     */
-    public function setClassCache(array $classes)
-    {
-        file_put_contents($this->getCacheDir().'/classes.map', sprintf('<?php return %s;', var_export($classes, true)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStartTime()
-    {
-        return $this->debug ? $this->startTime : -INF;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheDir()
-    {
-        return $this->rootDir.'/cache/'.$this->environment;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLogDir()
-    {
-        return $this->rootDir.'/logs';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCharset()
-    {
-        return 'UTF-8';
-    }
-
-    protected function doLoadClassCache($name, $extension)
-    {
-        if (!$this->booted && is_file($this->getCacheDir().'/classes.map')) {
-            ClassCollectionLoader::load(include($this->getCacheDir().'/classes.map'), $this->getCacheDir(), $name, $this->debug, false, $extension);
-        }
-    }
-
-    /**
-     * Initializes the data structures related to the bundle management.
-     *
-     *  - the bundles property maps a bundle name to the bundle instance,
-     *  - the bundleMap property maps a bundle name to the bundle inheritance hierarchy (most derived bundle first).
-     *
-     * @throws \LogicException if two bundles share a common name
-     * @throws \LogicException if a bundle tries to extend a non-registered bundle
-     * @throws \LogicException if a bundle tries to extend itself
-     * @throws \LogicException if two bundles extend the same ancestor
-     */
-    protected function initializeBundles()
-    {
-        // init bundles
-        $this->bundles = array();
-        $topMostBundles = array();
-        $directChildren = array();
-
-        foreach ($this->registerBundles() as $bundle) {
-            $name = $bundle->getName();
-            if (isset($this->bundles[$name])) {
-                throw new \LogicException(sprintf('Trying to register two bundles with the same name "%s"', $name));
-            }
-            $this->bundles[$name] = $bundle;
-
-            if ($parentName = $bundle->getParent()) {
-                if (isset($directChildren[$parentName])) {
-                    throw new \LogicException(sprintf('Bundle "%s" is directly extended by two bundles "%s" and "%s".', $parentName, $name, $directChildren[$parentName]));
-                }
-                if ($parentName == $name) {
-                    throw new \LogicException(sprintf('Bundle "%s" can not extend itself.', $name));
-                }
-                $directChildren[$parentName] = $name;
-            } else {
-                $topMostBundles[$name] = $bundle;
-            }
-        }
-
-        // look for orphans
-        if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
-            $diff = array_keys($diff);
-
-            throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
-        }
-
-        // inheritance
-        $this->bundleMap = array();
-        foreach ($topMostBundles as $name => $bundle) {
-            $bundleMap = array($bundle);
-            $hierarchy = array($name);
-
-            while (isset($directChildren[$name])) {
-                $name = $directChildren[$name];
-                array_unshift($bundleMap, $this->bundles[$name]);
-                $hierarchy[] = $name;
-            }
-
-            foreach ($hierarchy as $bundle) {
-                $this->bundleMap[$bundle] = $bundleMap;
-                array_pop($bundleMap);
-            }
-        }
-    }
-
-    /**
-     * Gets the container class.
-     *
-     * @return string The container class
-     */
-    protected function getContainerClass()
-    {
-        return $this->name.ucfirst($this->environment).($this->debug ? 'Debug' : '').'ProjectContainer';
-    }
-
-    /**
-     * Gets the container's base class.
-     *
-     * All names except Container must be fully qualified.
-     *
-     * @return string
-     */
-    protected function getContainerBaseClass()
-    {
-        return 'Container';
-    }
-
-    /**
-     * Initializes the service container.
-     *
-     * The cached version of the service container is used when fresh, otherwise the
-     * container is built.
-     */
-    protected function initializeContainer()
-    {
-        $class = $this->getContainerClass();
-        $cache = new ConfigCache($this->getCacheDir().'/'.$class.'.php', $this->debug);
-        $fresh = true;
-        if (!$cache->isFresh()) {
-            $container = $this->buildContainer();
-            $container->compile();
-            $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
-
-            $fresh = false;
-        }
-
-        require_once $cache->getPath();
-
-        $this->container = new $class();
-        $this->container->set('kernel', $this);
-
-        if (!$fresh && $this->container->has('cache_warmer')) {
-            $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
-        }
-    }
-
-    /**
-     * Returns the kernel parameters.
-     *
-     * @return array An array of kernel parameters
-     */
-    protected function getKernelParameters()
-    {
-        $bundles = array();
-        foreach ($this->bundles as $name => $bundle) {
-            $bundles[$name] = get_class($bundle);
-        }
-
-        return array_merge(
-            array(
-                'kernel.root_dir' => realpath($this->rootDir) ?: $this->rootDir,
-                'kernel.environment' => $this->environment,
-                'kernel.debug' => $this->debug,
-                'kernel.name' => $this->name,
-                'kernel.cache_dir' => realpath($this->getCacheDir()) ?: $this->getCacheDir(),
-                'kernel.logs_dir' => realpath($this->getLogDir()) ?: $this->getLogDir(),
-                'kernel.bundles' => $bundles,
-                'kernel.charset' => $this->getCharset(),
-                'kernel.container_class' => $this->getContainerClass(),
-            ),
-            $this->getEnvParameters()
-        );
-    }
-
-    /**
-     * Gets the environment parameters.
-     *
-     * Only the parameters starting with "SYMFONY__" are considered.
-     *
-     * @return array An array of parameters
-     */
-    protected function getEnvParameters()
-    {
-        $parameters = array();
-        foreach ($_SERVER as $key => $value) {
-            if (0 === strpos($key, 'SYMFONY__')) {
-                $parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * Builds the service container.
-     *
-     * @return ContainerBuilder The compiled service container
-     *
-     * @throws \RuntimeException
-     */
-    protected function buildContainer()
-    {
-        foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
-            if (!is_dir($dir)) {
-                if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                    throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
-                }
-            } elseif (!is_writable($dir)) {
-                throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
-            }
-        }
-
-        $container = $this->getContainerBuilder();
-        $container->addObjectResource($this);
-        $this->prepareContainer($container);
-
-        if (null !== $cont = $this->registerContainerConfiguration($this->getContainerLoader($container))) {
-            $container->merge($cont);
-        }
-
-        $container->addCompilerPass(new AddClassesToCachePass($this));
-        $container->addResource(new EnvParametersResource('SYMFONY__'));
-
-        return $container;
-    }
-
-    /**
-     * Prepares the ContainerBuilder before it is compiled.
-     *
-     * @param ContainerBuilder $container A ContainerBuilder instance
-     */
-    protected function prepareContainer(ContainerBuilder $container)
-    {
-        $extensions = array();
-        foreach ($this->bundles as $bundle) {
-            if ($extension = $bundle->getContainerExtension()) {
-                $container->registerExtension($extension);
-                $extensions[] = $extension->getAlias();
-            }
-
-            if ($this->debug) {
-                $container->addObjectResource($bundle);
-            }
-        }
-        foreach ($this->bundles as $bundle) {
-            $bundle->build($container);
-        }
-
-        // ensure these extensions are implicitly loaded
-        $container->getCompilerPassConfig()->setMergePass(new MergeExtensionConfigurationPass($extensions));
-    }
-
-    /**
-     * Gets a new ContainerBuilder instance used to build the service container.
-     *
-     * @return ContainerBuilder
-     */
-    protected function getContainerBuilder()
-    {
-        $container = new ContainerBuilder(new ParameterBag($this->getKernelParameters()));
-
-        if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {
-            $container->setProxyInstantiator(new RuntimeInstantiator());
-        }
-
-        return $container;
-    }
-
-    /**
-     * Dumps the service container to PHP code in the cache.
-     *
-     * @param ConfigCache      $cache     The config cache
-     * @param ContainerBuilder $container The service container
-     * @param string           $class     The name of the class to generate
-     * @param string           $baseClass The name of the container's base class
-     */
-    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, $class, $baseClass)
-    {
-        // cache the container
-        $dumper = new PhpDumper($container);
-
-        if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper')) {
-            $dumper->setProxyDumper(new ProxyDumper(md5($cache->getPath())));
-        }
-
-        $content = $dumper->dump(array('class' => $class, 'base_class' => $baseClass, 'file' => $cache->getPath()));
-        if (!$this->debug) {
-            $content = static::stripComments($content);
-        }
-
-        $cache->write($content, $container->getResources());
-    }
-
-    /**
-     * Returns a loader for the container.
-     *
-     * @param ContainerInterface $container The service container
-     *
-     * @return DelegatingLoader The loader
-     */
-    protected function getContainerLoader(ContainerInterface $container)
-    {
-        $locator = new FileLocator($this);
-        $resolver = new LoaderResolver(array(
-            new XmlFileLoader($container, $locator),
-            new YamlFileLoader($container, $locator),
-            new IniFileLoader($container, $locator),
-            new PhpFileLoader($container, $locator),
-            new ClosureLoader($container),
-        ));
-
-        return new DelegatingLoader($resolver);
-    }
-
-    /**
-     * Removes comments from a PHP source string.
-     *
-     * We don't use the PHP php_strip_whitespace() function
-     * as we want the content to be readable and well-formatted.
-     *
-     * @param string $source A PHP string
-     *
-     * @return string The PHP string with the comments removed
-     */
-    public static function stripComments($source)
-    {
-        if (!function_exists('token_get_all')) {
-            return $source;
-        }
-
-        $rawChunk = '';
-        $output = '';
-        $tokens = token_get_all($source);
-        $ignoreSpace = false;
-        for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
-            if (is_string($token)) {
-                $rawChunk .= $token;
-            } elseif (T_START_HEREDOC === $token[0]) {
-                $output .= $rawChunk.$token[1];
-                do {
-                    $token = next($tokens);
-                    $output .= $token[1];
-                } while ($token[0] !== T_END_HEREDOC);
-                $rawChunk = '';
-            } elseif (T_WHITESPACE === $token[0]) {
-                if ($ignoreSpace) {
-                    $ignoreSpace = false;
-
-                    continue;
-                }
-
-                // replace multiple new lines with a single newline
-                $rawChunk .= preg_replace(array('/\n{2,}/S'), "\n", $token[1]);
-            } elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
-                $ignoreSpace = true;
-            } else {
-                $rawChunk .= $token[1];
-
-                // The PHP-open tag already has a new-line
-                if (T_OPEN_TAG === $token[0]) {
-                    $ignoreSpace = true;
-                }
-            }
-        }
-
-        $output .= $rawChunk;
-
-        return $output;
-    }
-
-    public function serialize()
-    {
-        return serialize(array($this->environment, $this->debug));
-    }
-
-    public function unserialize($data)
-    {
-        list($environment, $debug) = unserialize($data);
-
-        $this->__construct($environment, $debug);
-    }
-}
diff --git a/vendor/symfony/http-kernel/KernelEvents.php b/vendor/symfony/http-kernel/KernelEvents.php
deleted file mode 100644
index 8768979..0000000
--- a/vendor/symfony/http-kernel/KernelEvents.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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\Component\HttpKernel;
-
-/**
- * Contains all events thrown in the HttpKernel component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class KernelEvents
-{
-    /**
-     * The REQUEST event occurs at the very beginning of request
-     * dispatching.
-     *
-     * This event allows you to create a response for a request before any
-     * other code in the framework is executed. The event listener method
-     * receives a Symfony\Component\HttpKernel\Event\GetResponseEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const REQUEST = 'kernel.request';
-
-    /**
-     * The EXCEPTION event occurs when an uncaught exception appears.
-     *
-     * This event allows you to create a response for a thrown exception or
-     * to modify the thrown exception. The event listener method receives
-     * a Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const EXCEPTION = 'kernel.exception';
-
-    /**
-     * The VIEW event occurs when the return value of a controller
-     * is not a Response instance.
-     *
-     * This event allows you to create a response for the return value of the
-     * controller. The event listener method receives a
-     * Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent
-     * instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const VIEW = 'kernel.view';
-
-    /**
-     * The CONTROLLER event occurs once a controller was found for
-     * handling a request.
-     *
-     * This event allows you to change the controller that will handle the
-     * request. The event listener method receives a
-     * Symfony\Component\HttpKernel\Event\FilterControllerEvent instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const CONTROLLER = 'kernel.controller';
-
-    /**
-     * The RESPONSE event occurs once a response was created for
-     * replying to a request.
-     *
-     * This event allows you to modify or replace the response that will be
-     * replied. The event listener method receives a
-     * Symfony\Component\HttpKernel\Event\FilterResponseEvent instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const RESPONSE = 'kernel.response';
-
-    /**
-     * The TERMINATE event occurs once a response was sent.
-     *
-     * This event allows you to run expensive post-response jobs.
-     * The event listener method receives a
-     * Symfony\Component\HttpKernel\Event\PostResponseEvent instance.
-     *
-     * @Event
-     *
-     * @var string
-     */
-    const TERMINATE = 'kernel.terminate';
-
-    /**
-     * The FINISH_REQUEST event occurs when a response was generated for a request.
-     *
-     * This event allows you to reset the global and environmental state of
-     * the application, when it was changed during the request.
-     *
-     * @var string
-     */
-    const FINISH_REQUEST = 'kernel.finish_request';
-}
diff --git a/vendor/symfony/http-kernel/KernelInterface.php b/vendor/symfony/http-kernel/KernelInterface.php
deleted file mode 100644
index ee5d273..0000000
--- a/vendor/symfony/http-kernel/KernelInterface.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Symfony\Component\Config\Loader\LoaderInterface;
-
-/**
- * The Kernel is the heart of the Symfony system.
- *
- * It manages an environment made of bundles.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface KernelInterface extends HttpKernelInterface, \Serializable
-{
-    /**
-     * Returns an array of bundles to register.
-     *
-     * @return BundleInterface[] An array of bundle instances.
-     */
-    public function registerBundles();
-
-    /**
-     * Loads the container configuration.
-     *
-     * @param LoaderInterface $loader A LoaderInterface instance
-     */
-    public function registerContainerConfiguration(LoaderInterface $loader);
-
-    /**
-     * Boots the current kernel.
-     */
-    public function boot();
-
-    /**
-     * Shutdowns the kernel.
-     *
-     * This method is mainly useful when doing functional testing.
-     */
-    public function shutdown();
-
-    /**
-     * Gets the registered bundle instances.
-     *
-     * @return BundleInterface[] An array of registered bundle instances
-     */
-    public function getBundles();
-
-    /**
-     * Checks if a given class name belongs to an active bundle.
-     *
-     * @param string $class A class name
-     *
-     * @return bool true if the class belongs to an active bundle, false otherwise
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    public function isClassInActiveBundle($class);
-
-    /**
-     * Returns a bundle and optionally its descendants by its name.
-     *
-     * @param string $name  Bundle name
-     * @param bool   $first Whether to return the first bundle only or together with its descendants
-     *
-     * @return BundleInterface|BundleInterface[] A BundleInterface instance or an array of BundleInterface instances if $first is false
-     *
-     * @throws \InvalidArgumentException when the bundle is not enabled
-     */
-    public function getBundle($name, $first = true);
-
-    /**
-     * Returns the file path for a given resource.
-     *
-     * A Resource can be a file or a directory.
-     *
-     * The resource name must follow the following pattern:
-     *
-     *     "@BundleName/path/to/a/file.something"
-     *
-     * where BundleName is the name of the bundle
-     * and the remaining part is the relative path in the bundle.
-     *
-     * If $dir is passed, and the first segment of the path is "Resources",
-     * this method will look for a file named:
-     *
-     *     $dir/<BundleName>/path/without/Resources
-     *
-     * before looking in the bundle resource folder.
-     *
-     * @param string $name  A resource name to locate
-     * @param string $dir   A directory where to look for the resource first
-     * @param bool   $first Whether to return the first path or paths for all matching bundles
-     *
-     * @return string|array The absolute path of the resource or an array if $first is false
-     *
-     * @throws \InvalidArgumentException if the file cannot be found or the name is not valid
-     * @throws \RuntimeException         if the name contains invalid/unsafe characters
-     */
-    public function locateResource($name, $dir = null, $first = true);
-
-    /**
-     * Gets the name of the kernel.
-     *
-     * @return string The kernel name
-     */
-    public function getName();
-
-    /**
-     * Gets the environment.
-     *
-     * @return string The current environment
-     */
-    public function getEnvironment();
-
-    /**
-     * Checks if debug mode is enabled.
-     *
-     * @return bool true if debug mode is enabled, false otherwise
-     */
-    public function isDebug();
-
-    /**
-     * Gets the application root dir.
-     *
-     * @return string The application root dir
-     */
-    public function getRootDir();
-
-    /**
-     * Gets the current container.
-     *
-     * @return ContainerInterface A ContainerInterface instance
-     */
-    public function getContainer();
-
-    /**
-     * Gets the request start time (not available if debug is disabled).
-     *
-     * @return int The request start timestamp
-     */
-    public function getStartTime();
-
-    /**
-     * Gets the cache directory.
-     *
-     * @return string The cache directory
-     */
-    public function getCacheDir();
-
-    /**
-     * Gets the log directory.
-     *
-     * @return string The log directory
-     */
-    public function getLogDir();
-
-    /**
-     * Gets the charset of the application.
-     *
-     * @return string The charset
-     */
-    public function getCharset();
-}
diff --git a/vendor/symfony/http-kernel/LICENSE b/vendor/symfony/http-kernel/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/http-kernel/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php b/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php
deleted file mode 100644
index 5635a21..0000000
--- a/vendor/symfony/http-kernel/Log/DebugLoggerInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\HttpKernel\Log;
-
-/**
- * DebugLoggerInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface DebugLoggerInterface
-{
-    /**
-     * Returns an array of logs.
-     *
-     * A log is an array with the following mandatory keys:
-     * timestamp, message, priority, and priorityName.
-     * It can also have an optional context key containing an array.
-     *
-     * @return array An array of logs
-     */
-    public function getLogs();
-
-    /**
-     * Returns the number of errors.
-     *
-     * @return int The number of errors
-     */
-    public function countErrors();
-}
diff --git a/vendor/symfony/http-kernel/Log/LoggerInterface.php b/vendor/symfony/http-kernel/Log/LoggerInterface.php
deleted file mode 100644
index cad38e5..0000000
--- a/vendor/symfony/http-kernel/Log/LoggerInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\HttpKernel\Log;
-
-use Psr\Log\LoggerInterface as PsrLogger;
-
-/**
- * LoggerInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.2, to be removed in 3.0. Type-hint \Psr\Log\LoggerInterface instead.
- */
-interface LoggerInterface extends PsrLogger
-{
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
-     */
-    public function emerg($message, array $context = array());
-
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
-     */
-    public function crit($message, array $context = array());
-
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
-     */
-    public function err($message, array $context = array());
-
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
-     */
-    public function warn($message, array $context = array());
-}
diff --git a/vendor/symfony/http-kernel/Log/NullLogger.php b/vendor/symfony/http-kernel/Log/NullLogger.php
deleted file mode 100644
index 36a857d..0000000
--- a/vendor/symfony/http-kernel/Log/NullLogger.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\HttpKernel\Log;
-
-@trigger_error('The '.__NAMESPACE__.'\NullLogger class is deprecated since version 2.2 and will be removed in 3.0. Use the Psr\Log\NullLogger class instead from the psr/log Composer package.', E_USER_DEPRECATED);
-
-use Psr\Log\NullLogger as PsrNullLogger;
-
-/**
- * NullLogger.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class NullLogger extends PsrNullLogger implements LoggerInterface
-{
-    public function emerg($message, array $context = array())
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new emergency() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-    }
-
-    public function crit($message, array $context = array())
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new critical() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-    }
-
-    public function err($message, array $context = array())
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new error() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-    }
-
-    public function warn($message, array $context = array())
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. You should use the new warning() method instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php
deleted file mode 100644
index c6395bd..0000000
--- a/vendor/symfony/http-kernel/Profiler/BaseMemcacheProfilerStorage.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * Base Memcache storage for profiling information in a Memcache.
- *
- * @author Andrej Hudec <pulzarraider@gmail.com>
- */
-abstract class BaseMemcacheProfilerStorage implements ProfilerStorageInterface
-{
-    const TOKEN_PREFIX = 'sf_profiler_';
-
-    protected $dsn;
-    protected $lifetime;
-
-    /**
-     * Constructor.
-     *
-     * @param string $dsn      A data source name
-     * @param string $username
-     * @param string $password
-     * @param int    $lifetime The lifetime to use for the purge
-     */
-    public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
-    {
-        $this->dsn = $dsn;
-        $this->lifetime = (int) $lifetime;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null)
-    {
-        $indexName = $this->getIndexName();
-
-        $indexContent = $this->getValue($indexName);
-        if (!$indexContent) {
-            return array();
-        }
-
-        $profileList = explode("\n", $indexContent);
-        $result = array();
-
-        foreach ($profileList as $item) {
-            if ($limit === 0) {
-                break;
-            }
-
-            if ($item == '') {
-                continue;
-            }
-
-            $values = explode("\t", $item, 7);
-            list($itemToken, $itemIp, $itemMethod, $itemUrl, $itemTime, $itemParent) = $values;
-            $statusCode = isset($values[6]) ? $values[6] : null;
-
-            $itemTime = (int) $itemTime;
-
-            if ($ip && false === strpos($itemIp, $ip) || $url && false === strpos($itemUrl, $url) || $method && false === strpos($itemMethod, $method)) {
-                continue;
-            }
-
-            if (!empty($start) && $itemTime < $start) {
-                continue;
-            }
-
-            if (!empty($end) && $itemTime > $end) {
-                continue;
-            }
-
-            $result[$itemToken] = array(
-                'token' => $itemToken,
-                'ip' => $itemIp,
-                'method' => $itemMethod,
-                'url' => $itemUrl,
-                'time' => $itemTime,
-                'parent' => $itemParent,
-                'status_code' => $statusCode,
-            );
-            --$limit;
-        }
-
-        usort($result, function ($a, $b) {
-            if ($a['time'] === $b['time']) {
-                return 0;
-            }
-
-            return $a['time'] > $b['time'] ? -1 : 1;
-        });
-
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function purge()
-    {
-        // delete only items from index
-        $indexName = $this->getIndexName();
-
-        $indexContent = $this->getValue($indexName);
-
-        if (!$indexContent) {
-            return false;
-        }
-
-        $profileList = explode("\n", $indexContent);
-
-        foreach ($profileList as $item) {
-            if ($item == '') {
-                continue;
-            }
-
-            if (false !== $pos = strpos($item, "\t")) {
-                $this->delete($this->getItemName(substr($item, 0, $pos)));
-            }
-        }
-
-        return $this->delete($indexName);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($token)
-    {
-        if (empty($token)) {
-            return false;
-        }
-
-        $profile = $this->getValue($this->getItemName($token));
-
-        if (false !== $profile) {
-            $profile = $this->createProfileFromData($token, $profile);
-        }
-
-        return $profile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(Profile $profile)
-    {
-        $data = array(
-            'token' => $profile->getToken(),
-            'parent' => $profile->getParentToken(),
-            'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data' => $profile->getCollectors(),
-            'ip' => $profile->getIp(),
-            'method' => $profile->getMethod(),
-            'url' => $profile->getUrl(),
-            'time' => $profile->getTime(),
-        );
-
-        $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
-
-        if ($this->setValue($this->getItemName($profile->getToken()), $data, $this->lifetime)) {
-            if (!$profileIndexed) {
-                // Add to index
-                $indexName = $this->getIndexName();
-
-                $indexRow = implode("\t", array(
-                    $profile->getToken(),
-                    $profile->getIp(),
-                    $profile->getMethod(),
-                    $profile->getUrl(),
-                    $profile->getTime(),
-                    $profile->getParentToken(),
-                    $profile->getStatusCode(),
-                ))."\n";
-
-                return $this->appendValue($indexName, $indexRow, $this->lifetime);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve item from the memcache server.
-     *
-     * @param string $key
-     *
-     * @return mixed
-     */
-    abstract protected function getValue($key);
-
-    /**
-     * Store an item on the memcache server under the specified key.
-     *
-     * @param string $key
-     * @param mixed  $value
-     * @param int    $expiration
-     *
-     * @return bool
-     */
-    abstract protected function setValue($key, $value, $expiration = 0);
-
-    /**
-     * Delete item from the memcache server.
-     *
-     * @param string $key
-     *
-     * @return bool
-     */
-    abstract protected function delete($key);
-
-    /**
-     * Append data to an existing item on the memcache server.
-     *
-     * @param string $key
-     * @param string $value
-     * @param int    $expiration
-     *
-     * @return bool
-     */
-    abstract protected function appendValue($key, $value, $expiration = 0);
-
-    private function createProfileFromData($token, $data, $parent = null)
-    {
-        $profile = new Profile($token);
-        $profile->setIp($data['ip']);
-        $profile->setMethod($data['method']);
-        $profile->setUrl($data['url']);
-        $profile->setTime($data['time']);
-        $profile->setCollectors($data['data']);
-
-        if (!$parent && $data['parent']) {
-            $parent = $this->read($data['parent']);
-        }
-
-        if ($parent) {
-            $profile->setParent($parent);
-        }
-
-        foreach ($data['children'] as $token) {
-            if (!$token) {
-                continue;
-            }
-
-            if (!$childProfileData = $this->getValue($this->getItemName($token))) {
-                continue;
-            }
-
-            $profile->addChild($this->createProfileFromData($token, $childProfileData, $profile));
-        }
-
-        return $profile;
-    }
-
-    /**
-     * Get item name.
-     *
-     * @param string $token
-     *
-     * @return string
-     */
-    private function getItemName($token)
-    {
-        $name = self::TOKEN_PREFIX.$token;
-
-        if ($this->isItemNameValid($name)) {
-            return $name;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get name of index.
-     *
-     * @return string
-     */
-    private function getIndexName()
-    {
-        $name = self::TOKEN_PREFIX.'index';
-
-        if ($this->isItemNameValid($name)) {
-            return $name;
-        }
-
-        return false;
-    }
-
-    private function isItemNameValid($name)
-    {
-        $length = strlen($name);
-
-        if ($length > 250) {
-            throw new \RuntimeException(sprintf('The memcache item key "%s" is too long (%s bytes). Allowed maximum size is 250 bytes.', $name, $length));
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
deleted file mode 100644
index 581ab64..0000000
--- a/vendor/symfony/http-kernel/Profiler/FileProfilerStorage.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * Storage for profiler using files.
- *
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
-class FileProfilerStorage implements ProfilerStorageInterface
-{
-    /**
-     * Folder where profiler data are stored.
-     *
-     * @var string
-     */
-    private $folder;
-
-    /**
-     * Constructs the file storage using a "dsn-like" path.
-     *
-     * Example : "file:/path/to/the/storage/folder"
-     *
-     * @param string $dsn The DSN
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct($dsn)
-    {
-        if (0 !== strpos($dsn, 'file:')) {
-            throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn));
-        }
-        $this->folder = substr($dsn, 5);
-
-        if (!is_dir($this->folder)) {
-            mkdir($this->folder, 0777, true);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null)
-    {
-        $file = $this->getIndexFilename();
-
-        if (!file_exists($file)) {
-            return array();
-        }
-
-        $file = fopen($file, 'r');
-        fseek($file, 0, SEEK_END);
-
-        $result = array();
-        while (count($result) < $limit && $line = $this->readLineFromFile($file)) {
-            $values = str_getcsv($line);
-            list($csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent) = $values;
-            $csvStatusCode = isset($values[6]) ? $values[6] : null;
-
-            $csvTime = (int) $csvTime;
-
-            if ($ip && false === strpos($csvIp, $ip) || $url && false === strpos($csvUrl, $url) || $method && false === strpos($csvMethod, $method)) {
-                continue;
-            }
-
-            if (!empty($start) && $csvTime < $start) {
-                continue;
-            }
-
-            if (!empty($end) && $csvTime > $end) {
-                continue;
-            }
-
-            $result[$csvToken] = array(
-                'token' => $csvToken,
-                'ip' => $csvIp,
-                'method' => $csvMethod,
-                'url' => $csvUrl,
-                'time' => $csvTime,
-                'parent' => $csvParent,
-                'status_code' => $csvStatusCode,
-            );
-        }
-
-        fclose($file);
-
-        return array_values($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function purge()
-    {
-        $flags = \FilesystemIterator::SKIP_DOTS;
-        $iterator = new \RecursiveDirectoryIterator($this->folder, $flags);
-        $iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::CHILD_FIRST);
-
-        foreach ($iterator as $file) {
-            if (is_file($file)) {
-                unlink($file);
-            } else {
-                rmdir($file);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($token)
-    {
-        if (!$token || !file_exists($file = $this->getFilename($token))) {
-            return;
-        }
-
-        return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(Profile $profile)
-    {
-        $file = $this->getFilename($profile->getToken());
-
-        $profileIndexed = is_file($file);
-        if (!$profileIndexed) {
-            // Create directory
-            $dir = dirname($file);
-            if (!is_dir($dir)) {
-                mkdir($dir, 0777, true);
-            }
-        }
-
-        // Store profile
-        $data = array(
-            'token' => $profile->getToken(),
-            'parent' => $profile->getParentToken(),
-            'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data' => $profile->getCollectors(),
-            'ip' => $profile->getIp(),
-            'method' => $profile->getMethod(),
-            'url' => $profile->getUrl(),
-            'time' => $profile->getTime(),
-        );
-
-        if (false === file_put_contents($file, serialize($data))) {
-            return false;
-        }
-
-        if (!$profileIndexed) {
-            // Add to index
-            if (false === $file = fopen($this->getIndexFilename(), 'a')) {
-                return false;
-            }
-
-            fputcsv($file, array(
-                $profile->getToken(),
-                $profile->getIp(),
-                $profile->getMethod(),
-                $profile->getUrl(),
-                $profile->getTime(),
-                $profile->getParentToken(),
-                $profile->getStatusCode(),
-            ));
-            fclose($file);
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets filename to store data, associated to the token.
-     *
-     * @param string $token
-     *
-     * @return string The profile filename
-     */
-    protected function getFilename($token)
-    {
-        // Uses 4 last characters, because first are mostly the same.
-        $folderA = substr($token, -2, 2);
-        $folderB = substr($token, -4, 2);
-
-        return $this->folder.'/'.$folderA.'/'.$folderB.'/'.$token;
-    }
-
-    /**
-     * Gets the index filename.
-     *
-     * @return string The index filename
-     */
-    protected function getIndexFilename()
-    {
-        return $this->folder.'/index.csv';
-    }
-
-    /**
-     * Reads a line in the file, backward.
-     *
-     * This function automatically skips the empty lines and do not include the line return in result value.
-     *
-     * @param resource $file The file resource, with the pointer placed at the end of the line to read
-     *
-     * @return mixed A string representing the line or null if beginning of file is reached
-     */
-    protected function readLineFromFile($file)
-    {
-        $line = '';
-        $position = ftell($file);
-
-        if (0 === $position) {
-            return;
-        }
-
-        while (true) {
-            $chunkSize = min($position, 1024);
-            $position -= $chunkSize;
-            fseek($file, $position);
-
-            if (0 === $chunkSize) {
-                // bof reached
-                break;
-            }
-
-            $buffer = fread($file, $chunkSize);
-
-            if (false === ($upTo = strrpos($buffer, "\n"))) {
-                $line = $buffer.$line;
-                continue;
-            }
-
-            $position += $upTo;
-            $line = substr($buffer, $upTo + 1).$line;
-            fseek($file, max(0, $position), SEEK_SET);
-
-            if ('' !== $line) {
-                break;
-            }
-        }
-
-        return '' === $line ? null : $line;
-    }
-
-    protected function createProfileFromData($token, $data, $parent = null)
-    {
-        $profile = new Profile($token);
-        $profile->setIp($data['ip']);
-        $profile->setMethod($data['method']);
-        $profile->setUrl($data['url']);
-        $profile->setTime($data['time']);
-        $profile->setCollectors($data['data']);
-
-        if (!$parent && $data['parent']) {
-            $parent = $this->read($data['parent']);
-        }
-
-        if ($parent) {
-            $profile->setParent($parent);
-        }
-
-        foreach ($data['children'] as $token) {
-            if (!$token || !file_exists($file = $this->getFilename($token))) {
-                continue;
-            }
-
-            $profile->addChild($this->createProfileFromData($token, unserialize(file_get_contents($file)), $profile));
-        }
-
-        return $profile;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
deleted file mode 100644
index 2727405..0000000
--- a/vendor/symfony/http-kernel/Profiler/MemcacheProfilerStorage.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * Memcache Profiler Storage.
- *
- * @author Andrej Hudec <pulzarraider@gmail.com>
- */
-class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage
-{
-    /**
-     * @var \Memcache
-     */
-    private $memcache;
-
-    /**
-     * Internal convenience method that returns the instance of the Memcache.
-     *
-     * @return \Memcache
-     *
-     * @throws \RuntimeException
-     */
-    protected function getMemcache()
-    {
-        if (null === $this->memcache) {
-            if (!preg_match('#^memcache://(?(?=\[.*\])\[(.*)\]|(.*)):(.*)$#', $this->dsn, $matches)) {
-                throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Memcache with an invalid dsn "%s". The expected format is "memcache://[host]:port".', $this->dsn));
-            }
-
-            $host = $matches[1] ?: $matches[2];
-            $port = $matches[3];
-
-            $memcache = new \Memcache();
-            $memcache->addserver($host, $port);
-
-            $this->memcache = $memcache;
-        }
-
-        return $this->memcache;
-    }
-
-    /**
-     * Set instance of the Memcache.
-     *
-     * @param \Memcache $memcache
-     */
-    public function setMemcache($memcache)
-    {
-        $this->memcache = $memcache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getValue($key)
-    {
-        return $this->getMemcache()->get($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function setValue($key, $value, $expiration = 0)
-    {
-        return $this->getMemcache()->set($key, $value, false, time() + $expiration);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function delete($key)
-    {
-        return $this->getMemcache()->delete($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function appendValue($key, $value, $expiration = 0)
-    {
-        $memcache = $this->getMemcache();
-
-        if (method_exists($memcache, 'append')) {
-            // Memcache v3.0
-            if (!$result = $memcache->append($key, $value, false, $expiration)) {
-                return $memcache->set($key, $value, false, $expiration);
-            }
-
-            return $result;
-        }
-
-        // simulate append in Memcache <3.0
-        $content = $memcache->get($key);
-
-        return $memcache->set($key, $content.$value, false, $expiration);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php
deleted file mode 100644
index 0c57373..0000000
--- a/vendor/symfony/http-kernel/Profiler/MemcachedProfilerStorage.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * Memcached Profiler Storage.
- *
- * @author Andrej Hudec <pulzarraider@gmail.com>
- */
-class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage
-{
-    /**
-     * @var \Memcached
-     */
-    private $memcached;
-
-    /**
-     * Internal convenience method that returns the instance of the Memcached.
-     *
-     * @return \Memcached
-     *
-     * @throws \RuntimeException
-     */
-    protected function getMemcached()
-    {
-        if (null === $this->memcached) {
-            if (!preg_match('#^memcached://(?(?=\[.*\])\[(.*)\]|(.*)):(.*)$#', $this->dsn, $matches)) {
-                throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Memcached with an invalid dsn "%s". The expected format is "memcached://[host]:port".', $this->dsn));
-            }
-
-            $host = $matches[1] ?: $matches[2];
-            $port = $matches[3];
-
-            $memcached = new \Memcached();
-
-            // disable compression to allow appending
-            $memcached->setOption(\Memcached::OPT_COMPRESSION, false);
-
-            $memcached->addServer($host, $port);
-
-            $this->memcached = $memcached;
-        }
-
-        return $this->memcached;
-    }
-
-    /**
-     * Set instance of the Memcached.
-     *
-     * @param \Memcached $memcached
-     */
-    public function setMemcached($memcached)
-    {
-        $this->memcached = $memcached;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getValue($key)
-    {
-        return $this->getMemcached()->get($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function setValue($key, $value, $expiration = 0)
-    {
-        return $this->getMemcached()->set($key, $value, time() + $expiration);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function delete($key)
-    {
-        return $this->getMemcached()->delete($key);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function appendValue($key, $value, $expiration = 0)
-    {
-        $memcached = $this->getMemcached();
-
-        if (!$result = $memcached->append($key, $value)) {
-            return $memcached->set($key, $value, $expiration);
-        }
-
-        return $result;
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php
deleted file mode 100644
index f35a7f7..0000000
--- a/vendor/symfony/http-kernel/Profiler/MongoDbProfilerStorage.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-class MongoDbProfilerStorage implements ProfilerStorageInterface
-{
-    protected $dsn;
-    protected $lifetime;
-    private $mongo;
-
-    /**
-     * Constructor.
-     *
-     * @param string $dsn      A data source name
-     * @param string $username Not used
-     * @param string $password Not used
-     * @param int    $lifetime The lifetime to use for the purge
-     */
-    public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
-    {
-        $this->dsn = $dsn;
-        $this->lifetime = (int) $lifetime;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null)
-    {
-        $cursor = $this->getMongo()->find($this->buildQuery($ip, $url, $method, $start, $end), array('_id', 'parent', 'ip', 'method', 'url', 'time', 'status_code'))->sort(array('time' => -1))->limit($limit);
-
-        $tokens = array();
-        foreach ($cursor as $profile) {
-            $tokens[] = $this->getData($profile);
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function purge()
-    {
-        $this->getMongo()->remove(array());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($token)
-    {
-        $profile = $this->getMongo()->findOne(array('_id' => $token, 'data' => array('$exists' => true)));
-
-        if (null !== $profile) {
-            $profile = $this->createProfileFromData($this->getData($profile));
-        }
-
-        return $profile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(Profile $profile)
-    {
-        $this->cleanup();
-
-        $record = array(
-            '_id' => $profile->getToken(),
-            'parent' => $profile->getParentToken(),
-            'data' => base64_encode(serialize($profile->getCollectors())),
-            'ip' => $profile->getIp(),
-            'method' => $profile->getMethod(),
-            'url' => $profile->getUrl(),
-            'time' => $profile->getTime(),
-            'status_code' => $profile->getStatusCode(),
-        );
-
-        $result = $this->getMongo()->update(array('_id' => $profile->getToken()), array_filter($record, function ($v) { return !empty($v); }), array('upsert' => true));
-
-        return (bool) (isset($result['ok']) ? $result['ok'] : $result);
-    }
-
-    /**
-     * Internal convenience method that returns the instance of the MongoDB Collection.
-     *
-     * @return \MongoCollection
-     *
-     * @throws \RuntimeException
-     */
-    protected function getMongo()
-    {
-        if (null !== $this->mongo) {
-            return $this->mongo;
-        }
-
-        if (!$parsedDsn = $this->parseDsn($this->dsn)) {
-            throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use MongoDB with an invalid dsn "%s". The expected format is "mongodb://[user:pass@]host/database/collection"', $this->dsn));
-        }
-
-        list($server, $database, $collection) = $parsedDsn;
-        $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? '\Mongo' : '\MongoClient';
-        $mongo = new $mongoClass($server);
-
-        return $this->mongo = $mongo->selectCollection($database, $collection);
-    }
-
-    /**
-     * @param array $data
-     *
-     * @return Profile
-     */
-    protected function createProfileFromData(array $data)
-    {
-        $profile = $this->getProfile($data);
-
-        if ($data['parent']) {
-            $parent = $this->getMongo()->findOne(array('_id' => $data['parent'], 'data' => array('$exists' => true)));
-            if ($parent) {
-                $profile->setParent($this->getProfile($this->getData($parent)));
-            }
-        }
-
-        $profile->setChildren($this->readChildren($data['token']));
-
-        return $profile;
-    }
-
-    /**
-     * @param string $token
-     *
-     * @return Profile[] An array of Profile instances
-     */
-    protected function readChildren($token)
-    {
-        $profiles = array();
-
-        $cursor = $this->getMongo()->find(array('parent' => $token, 'data' => array('$exists' => true)));
-        foreach ($cursor as $d) {
-            $profiles[] = $this->getProfile($this->getData($d));
-        }
-
-        return $profiles;
-    }
-
-    protected function cleanup()
-    {
-        $this->getMongo()->remove(array('time' => array('$lt' => time() - $this->lifetime)));
-    }
-
-    /**
-     * @param string $ip
-     * @param string $url
-     * @param string $method
-     * @param int    $start
-     * @param int    $end
-     *
-     * @return array
-     */
-    private function buildQuery($ip, $url, $method, $start, $end)
-    {
-        $query = array();
-
-        if (!empty($ip)) {
-            $query['ip'] = $ip;
-        }
-
-        if (!empty($url)) {
-            $query['url'] = $url;
-        }
-
-        if (!empty($method)) {
-            $query['method'] = $method;
-        }
-
-        if (!empty($start) || !empty($end)) {
-            $query['time'] = array();
-        }
-
-        if (!empty($start)) {
-            $query['time']['$gte'] = $start;
-        }
-
-        if (!empty($end)) {
-            $query['time']['$lte'] = $end;
-        }
-
-        return $query;
-    }
-
-    /**
-     * @param array $data
-     *
-     * @return array
-     */
-    private function getData(array $data)
-    {
-        return array(
-            'token' => $data['_id'],
-            'parent' => isset($data['parent']) ? $data['parent'] : null,
-            'ip' => isset($data['ip']) ? $data['ip'] : null,
-            'method' => isset($data['method']) ? $data['method'] : null,
-            'url' => isset($data['url']) ? $data['url'] : null,
-            'time' => isset($data['time']) ? $data['time'] : null,
-            'data' => isset($data['data']) ? $data['data'] : null,
-            'status_code' => isset($data['status_code']) ? $data['status_code'] : null,
-        );
-    }
-
-    /**
-     * @param array $data
-     *
-     * @return Profile
-     */
-    private function getProfile(array $data)
-    {
-        $profile = new Profile($data['token']);
-        $profile->setIp($data['ip']);
-        $profile->setMethod($data['method']);
-        $profile->setUrl($data['url']);
-        $profile->setTime($data['time']);
-        $profile->setCollectors(unserialize(base64_decode($data['data'])));
-
-        return $profile;
-    }
-
-    /**
-     * @param string $dsn
-     *
-     * @return null|array Array($server, $database, $collection)
-     */
-    private function parseDsn($dsn)
-    {
-        if (!preg_match('#^(mongodb://.*)/(.*)/(.*)$#', $dsn, $matches)) {
-            return;
-        }
-
-        $server = $matches[1];
-        $database = $matches[2];
-        $collection = $matches[3];
-        preg_match('#^mongodb://(([^:]+):?(.*)(?=@))?@?([^/]*)(.*)$#', $server, $matchesServer);
-
-        if ('' == $matchesServer[5] && '' != $matches[2]) {
-            $server .= '/'.$matches[2];
-        }
-
-        return array($server, $database, $collection);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php
deleted file mode 100644
index 92e8a1b..0000000
--- a/vendor/symfony/http-kernel/Profiler/MysqlProfilerStorage.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * A ProfilerStorage for Mysql.
- *
- * @author Jan Schumann <js@schumann-it.com>
- */
-class MysqlProfilerStorage extends PdoProfilerStorage
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function initDb()
-    {
-        if (null === $this->db) {
-            if (0 !== strpos($this->dsn, 'mysql')) {
-                throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Mysql with an invalid dsn "%s". The expected format is "mysql:dbname=database_name;host=host_name".', $this->dsn));
-            }
-
-            if (!class_exists('PDO') || !in_array('mysql', \PDO::getAvailableDrivers(), true)) {
-                throw new \RuntimeException('You need to enable PDO_Mysql extension for the profiler to run properly.');
-            }
-
-            $db = new \PDO($this->dsn, $this->username, $this->password);
-            $db->exec('CREATE TABLE IF NOT EXISTS sf_profiler_data (token VARCHAR(255) PRIMARY KEY, data LONGTEXT, ip VARCHAR(64), method VARCHAR(6), url VARCHAR(255), time INTEGER UNSIGNED, parent VARCHAR(255), created_at INTEGER UNSIGNED, status_code SMALLINT UNSIGNED, KEY (created_at), KEY (ip), KEY (method), KEY (url), KEY (parent))');
-
-            $this->db = $db;
-        }
-
-        return $this->db;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function buildCriteria($ip, $url, $start, $end, $limit, $method)
-    {
-        $criteria = array();
-        $args = array();
-
-        if ($ip = preg_replace('/[^\d\.]/', '', $ip)) {
-            $criteria[] = 'ip LIKE :ip';
-            $args[':ip'] = '%'.$ip.'%';
-        }
-
-        if ($url) {
-            $criteria[] = 'url LIKE :url';
-            $args[':url'] = '%'.addcslashes($url, '%_\\').'%';
-        }
-
-        if ($method) {
-            $criteria[] = 'method = :method';
-            $args[':method'] = $method;
-        }
-
-        if (!empty($start)) {
-            $criteria[] = 'time >= :start';
-            $args[':start'] = $start;
-        }
-
-        if (!empty($end)) {
-            $criteria[] = 'time <= :end';
-            $args[':end'] = $end;
-        }
-
-        return array($criteria, $args);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php
deleted file mode 100644
index 48f813f..0000000
--- a/vendor/symfony/http-kernel/Profiler/PdoProfilerStorage.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * Base PDO storage for profiling information in a PDO database.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jan Schumann <js@schumann-it.com>
- */
-abstract class PdoProfilerStorage implements ProfilerStorageInterface
-{
-    protected $dsn;
-    protected $username;
-    protected $password;
-    protected $lifetime;
-    protected $db;
-
-    /**
-     * Constructor.
-     *
-     * @param string $dsn      A data source name
-     * @param string $username The username for the database
-     * @param string $password The password for the database
-     * @param int    $lifetime The lifetime to use for the purge
-     */
-    public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
-    {
-        $this->dsn = $dsn;
-        $this->username = $username;
-        $this->password = $password;
-        $this->lifetime = (int) $lifetime;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null)
-    {
-        if (null === $start) {
-            $start = 0;
-        }
-
-        if (null === $end) {
-            $end = time();
-        }
-
-        list($criteria, $args) = $this->buildCriteria($ip, $url, $start, $end, $limit, $method);
-
-        $criteria = $criteria ? 'WHERE '.implode(' AND ', $criteria) : '';
-
-        $db = $this->initDb();
-        $tokens = $this->fetch($db, 'SELECT token, ip, method, url, time, parent, status_code FROM sf_profiler_data '.$criteria.' ORDER BY time DESC LIMIT '.((int) $limit), $args);
-        $this->close($db);
-
-        return $tokens;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($token)
-    {
-        $db = $this->initDb();
-        $args = array(':token' => $token);
-        $data = $this->fetch($db, 'SELECT data, parent, ip, method, url, time FROM sf_profiler_data WHERE token = :token LIMIT 1', $args);
-        $this->close($db);
-        if (isset($data[0]['data'])) {
-            return $this->createProfileFromData($token, $data[0]);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(Profile $profile)
-    {
-        $db = $this->initDb();
-        $args = array(
-            ':token' => $profile->getToken(),
-            ':parent' => $profile->getParentToken(),
-            ':data' => base64_encode(serialize($profile->getCollectors())),
-            ':ip' => $profile->getIp(),
-            ':method' => $profile->getMethod(),
-            ':url' => $profile->getUrl(),
-            ':time' => $profile->getTime(),
-            ':created_at' => time(),
-            ':status_code' => $profile->getStatusCode(),
-        );
-
-        try {
-            if ($this->has($profile->getToken())) {
-                $this->exec($db, 'UPDATE sf_profiler_data SET parent = :parent, data = :data, ip = :ip, method = :method, url = :url, time = :time, created_at = :created_at, status_code = :status_code WHERE token = :token', $args);
-            } else {
-                $this->exec($db, 'INSERT INTO sf_profiler_data (token, parent, data, ip, method, url, time, created_at, status_code) VALUES (:token, :parent, :data, :ip, :method, :url, :time, :created_at, :status_code)', $args);
-            }
-            $this->cleanup();
-            $status = true;
-        } catch (\Exception $e) {
-            $status = false;
-        }
-
-        $this->close($db);
-
-        return $status;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function purge()
-    {
-        $db = $this->initDb();
-        $this->exec($db, 'DELETE FROM sf_profiler_data');
-        $this->close($db);
-    }
-
-    /**
-     * Build SQL criteria to fetch records by ip and url.
-     *
-     * @param string $ip     The IP
-     * @param string $url    The URL
-     * @param string $start  The start period to search from
-     * @param string $end    The end period to search to
-     * @param string $limit  The maximum number of tokens to return
-     * @param string $method The request method
-     *
-     * @return array An array with (criteria, args)
-     */
-    abstract protected function buildCriteria($ip, $url, $start, $end, $limit, $method);
-
-    /**
-     * Initializes the database.
-     *
-     * @throws \RuntimeException When the requested database driver is not installed
-     */
-    abstract protected function initDb();
-
-    protected function cleanup()
-    {
-        $db = $this->initDb();
-        $this->exec($db, 'DELETE FROM sf_profiler_data WHERE created_at < :time', array(':time' => time() - $this->lifetime));
-        $this->close($db);
-    }
-
-    protected function exec($db, $query, array $args = array())
-    {
-        $stmt = $this->prepareStatement($db, $query);
-
-        foreach ($args as $arg => $val) {
-            $stmt->bindValue($arg, $val, is_int($val) ? \PDO::PARAM_INT : \PDO::PARAM_STR);
-        }
-        $success = $stmt->execute();
-        if (!$success) {
-            throw new \RuntimeException(sprintf('Error executing query "%s"', $query));
-        }
-    }
-
-    protected function prepareStatement($db, $query)
-    {
-        try {
-            $stmt = $db->prepare($query);
-        } catch (\Exception $e) {
-            $stmt = false;
-        }
-
-        if (false === $stmt) {
-            throw new \RuntimeException('The database cannot successfully prepare the statement');
-        }
-
-        return $stmt;
-    }
-
-    protected function fetch($db, $query, array $args = array())
-    {
-        $stmt = $this->prepareStatement($db, $query);
-
-        foreach ($args as $arg => $val) {
-            $stmt->bindValue($arg, $val, is_int($val) ? \PDO::PARAM_INT : \PDO::PARAM_STR);
-        }
-        $stmt->execute();
-        $return = $stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-        return $return;
-    }
-
-    protected function close($db)
-    {
-    }
-
-    protected function createProfileFromData($token, $data, $parent = null)
-    {
-        $profile = new Profile($token);
-        $profile->setIp($data['ip']);
-        $profile->setMethod($data['method']);
-        $profile->setUrl($data['url']);
-        $profile->setTime($data['time']);
-        $profile->setCollectors(unserialize(base64_decode($data['data'])));
-
-        if (!$parent && !empty($data['parent'])) {
-            $parent = $this->read($data['parent']);
-        }
-
-        if ($parent) {
-            $profile->setParent($parent);
-        }
-
-        $profile->setChildren($this->readChildren($token, $profile));
-
-        return $profile;
-    }
-
-    /**
-     * Reads the child profiles for the given token.
-     *
-     * @param string $token  The parent token
-     * @param string $parent The parent instance
-     *
-     * @return Profile[] An array of Profile instance
-     */
-    protected function readChildren($token, $parent)
-    {
-        $db = $this->initDb();
-        $data = $this->fetch($db, 'SELECT token, data, ip, method, url, time FROM sf_profiler_data WHERE parent = :token', array(':token' => $token));
-        $this->close($db);
-
-        if (!$data) {
-            return array();
-        }
-
-        $profiles = array();
-        foreach ($data as $d) {
-            $profiles[] = $this->createProfileFromData($d['token'], $d, $parent);
-        }
-
-        return $profiles;
-    }
-
-    /**
-     * Returns whether data for the given token already exists in storage.
-     *
-     * @param string $token The profile token
-     *
-     * @return string
-     */
-    protected function has($token)
-    {
-        $db = $this->initDb();
-        $tokenExists = $this->fetch($db, 'SELECT 1 FROM sf_profiler_data WHERE token = :token LIMIT 1', array(':token' => $token));
-        $this->close($db);
-
-        return !empty($tokenExists);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/Profile.php b/vendor/symfony/http-kernel/Profiler/Profile.php
deleted file mode 100644
index a4e4ba6..0000000
--- a/vendor/symfony/http-kernel/Profiler/Profile.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
-
-/**
- * Profile.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Profile
-{
-    private $token;
-
-    /**
-     * @var DataCollectorInterface[]
-     */
-    private $collectors = array();
-
-    private $ip;
-    private $method;
-    private $url;
-    private $time;
-    private $statusCode;
-
-    /**
-     * @var Profile
-     */
-    private $parent;
-
-    /**
-     * @var Profile[]
-     */
-    private $children = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $token The token
-     */
-    public function __construct($token)
-    {
-        $this->token = $token;
-    }
-
-    /**
-     * Sets the token.
-     *
-     * @param string $token The token
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-    }
-
-    /**
-     * Gets the token.
-     *
-     * @return string The token
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * Sets the parent token.
-     *
-     * @param Profile $parent The parent Profile
-     */
-    public function setParent(Profile $parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Returns the parent profile.
-     *
-     * @return Profile The parent profile
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Returns the parent token.
-     *
-     * @return null|string The parent token
-     */
-    public function getParentToken()
-    {
-        return $this->parent ? $this->parent->getToken() : null;
-    }
-
-    /**
-     * Returns the IP.
-     *
-     * @return string The IP
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * Sets the IP.
-     *
-     * @param string $ip
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-    }
-
-    /**
-     * Returns the request method.
-     *
-     * @return string The request method
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    public function setMethod($method)
-    {
-        $this->method = $method;
-    }
-
-    /**
-     * Returns the URL.
-     *
-     * @return string The URL
-     */
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-    public function setUrl($url)
-    {
-        $this->url = $url;
-    }
-
-    /**
-     * Returns the time.
-     *
-     * @return string The time
-     */
-    public function getTime()
-    {
-        if (null === $this->time) {
-            return 0;
-        }
-
-        return $this->time;
-    }
-
-    public function setTime($time)
-    {
-        $this->time = $time;
-    }
-
-    /**
-     * @param int $statusCode
-     */
-    public function setStatusCode($statusCode)
-    {
-        $this->statusCode = $statusCode;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * Finds children profilers.
-     *
-     * @return Profile[] An array of Profile
-     */
-    public function getChildren()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Sets children profiler.
-     *
-     * @param Profile[] $children An array of Profile
-     */
-    public function setChildren(array $children)
-    {
-        $this->children = array();
-        foreach ($children as $child) {
-            $this->addChild($child);
-        }
-    }
-
-    /**
-     * Adds the child token.
-     *
-     * @param Profile $child The child Profile
-     */
-    public function addChild(Profile $child)
-    {
-        $this->children[] = $child;
-        $child->setParent($this);
-    }
-
-    /**
-     * Gets a Collector by name.
-     *
-     * @param string $name A collector name
-     *
-     * @return DataCollectorInterface A DataCollectorInterface instance
-     *
-     * @throws \InvalidArgumentException if the collector does not exist
-     */
-    public function getCollector($name)
-    {
-        if (!isset($this->collectors[$name])) {
-            throw new \InvalidArgumentException(sprintf('Collector "%s" does not exist.', $name));
-        }
-
-        return $this->collectors[$name];
-    }
-
-    /**
-     * Gets the Collectors associated with this profile.
-     *
-     * @return DataCollectorInterface[]
-     */
-    public function getCollectors()
-    {
-        return $this->collectors;
-    }
-
-    /**
-     * Sets the Collectors associated with this profile.
-     *
-     * @param DataCollectorInterface[] $collectors
-     */
-    public function setCollectors(array $collectors)
-    {
-        $this->collectors = array();
-        foreach ($collectors as $collector) {
-            $this->addCollector($collector);
-        }
-    }
-
-    /**
-     * Adds a Collector.
-     *
-     * @param DataCollectorInterface $collector A DataCollectorInterface instance
-     */
-    public function addCollector(DataCollectorInterface $collector)
-    {
-        $this->collectors[$collector->getName()] = $collector;
-    }
-
-    /**
-     * Returns true if a Collector for the given name exists.
-     *
-     * @param string $name A collector name
-     *
-     * @return bool
-     */
-    public function hasCollector($name)
-    {
-        return isset($this->collectors[$name]);
-    }
-
-    public function __sleep()
-    {
-        return array('token', 'parent', 'children', 'collectors', 'ip', 'method', 'url', 'time');
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/Profiler.php b/vendor/symfony/http-kernel/Profiler/Profiler.php
deleted file mode 100644
index 864f624..0000000
--- a/vendor/symfony/http-kernel/Profiler/Profiler.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
-use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Profiler.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Profiler
-{
-    /**
-     * @var ProfilerStorageInterface
-     */
-    private $storage;
-
-    /**
-     * @var DataCollectorInterface[]
-     */
-    private $collectors = array();
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var bool
-     */
-    private $enabled = true;
-
-    /**
-     * Constructor.
-     *
-     * @param ProfilerStorageInterface $storage A ProfilerStorageInterface instance
-     * @param LoggerInterface          $logger  A LoggerInterface instance
-     */
-    public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null)
-    {
-        $this->storage = $storage;
-        $this->logger = $logger;
-    }
-
-    /**
-     * Disables the profiler.
-     */
-    public function disable()
-    {
-        $this->enabled = false;
-    }
-
-    /**
-     * Enables the profiler.
-     */
-    public function enable()
-    {
-        $this->enabled = true;
-    }
-
-    /**
-     * Loads the Profile for the given Response.
-     *
-     * @param Response $response A Response instance
-     *
-     * @return Profile A Profile instance
-     */
-    public function loadProfileFromResponse(Response $response)
-    {
-        if (!$token = $response->headers->get('X-Debug-Token')) {
-            return false;
-        }
-
-        return $this->loadProfile($token);
-    }
-
-    /**
-     * Loads the Profile for the given token.
-     *
-     * @param string $token A token
-     *
-     * @return Profile A Profile instance
-     */
-    public function loadProfile($token)
-    {
-        return $this->storage->read($token);
-    }
-
-    /**
-     * Saves a Profile.
-     *
-     * @param Profile $profile A Profile instance
-     *
-     * @return bool
-     */
-    public function saveProfile(Profile $profile)
-    {
-        // late collect
-        foreach ($profile->getCollectors() as $collector) {
-            if ($collector instanceof LateDataCollectorInterface) {
-                $collector->lateCollect();
-            }
-        }
-
-        if (!($ret = $this->storage->write($profile)) && null !== $this->logger) {
-            $this->logger->warning('Unable to store the profiler information.', array('configured_storage' => get_class($this->storage)));
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Purges all data from the storage.
-     */
-    public function purge()
-    {
-        $this->storage->purge();
-    }
-
-    /**
-     * Exports the current profiler data.
-     *
-     * @param Profile $profile A Profile instance
-     *
-     * @return string The exported data
-     */
-    public function export(Profile $profile)
-    {
-        return base64_encode(serialize($profile));
-    }
-
-    /**
-     * Imports data into the profiler storage.
-     *
-     * @param string $data A data string as exported by the export() method
-     *
-     * @return Profile A Profile instance
-     */
-    public function import($data)
-    {
-        $profile = unserialize(base64_decode($data));
-
-        if ($this->storage->read($profile->getToken())) {
-            return false;
-        }
-
-        $this->saveProfile($profile);
-
-        return $profile;
-    }
-
-    /**
-     * Finds profiler tokens for the given criteria.
-     *
-     * @param string $ip     The IP
-     * @param string $url    The URL
-     * @param string $limit  The maximum number of tokens to return
-     * @param string $method The request method
-     * @param string $start  The start date to search from
-     * @param string $end    The end date to search to
-     *
-     * @return array An array of tokens
-     *
-     * @see http://php.net/manual/en/datetime.formats.php for the supported date/time formats
-     */
-    public function find($ip, $url, $limit, $method, $start, $end)
-    {
-        return $this->storage->find($ip, $url, $limit, $method, $this->getTimestamp($start), $this->getTimestamp($end));
-    }
-
-    /**
-     * Collects data for the given Response.
-     *
-     * @param Request    $request   A Request instance
-     * @param Response   $response  A Response instance
-     * @param \Exception $exception An exception instance if the request threw one
-     *
-     * @return Profile|null A Profile instance or null if the profiler is disabled
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-        if (false === $this->enabled) {
-            return;
-        }
-
-        $profile = new Profile(substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
-        $profile->setTime(time());
-        $profile->setUrl($request->getUri());
-        $profile->setIp($request->getClientIp());
-        $profile->setMethod($request->getMethod());
-        $profile->setStatusCode($response->getStatusCode());
-
-        $response->headers->set('X-Debug-Token', $profile->getToken());
-
-        foreach ($this->collectors as $collector) {
-            $collector->collect($request, $response, $exception);
-
-            // we need to clone for sub-requests
-            $profile->addCollector(clone $collector);
-        }
-
-        return $profile;
-    }
-
-    /**
-     * Gets the Collectors associated with this profiler.
-     *
-     * @return array An array of collectors
-     */
-    public function all()
-    {
-        return $this->collectors;
-    }
-
-    /**
-     * Sets the Collectors associated with this profiler.
-     *
-     * @param DataCollectorInterface[] $collectors An array of collectors
-     */
-    public function set(array $collectors = array())
-    {
-        $this->collectors = array();
-        foreach ($collectors as $collector) {
-            $this->add($collector);
-        }
-    }
-
-    /**
-     * Adds a Collector.
-     *
-     * @param DataCollectorInterface $collector A DataCollectorInterface instance
-     */
-    public function add(DataCollectorInterface $collector)
-    {
-        $this->collectors[$collector->getName()] = $collector;
-    }
-
-    /**
-     * Returns true if a Collector for the given name exists.
-     *
-     * @param string $name A collector name
-     *
-     * @return bool
-     */
-    public function has($name)
-    {
-        return isset($this->collectors[$name]);
-    }
-
-    /**
-     * Gets a Collector by name.
-     *
-     * @param string $name A collector name
-     *
-     * @return DataCollectorInterface A DataCollectorInterface instance
-     *
-     * @throws \InvalidArgumentException if the collector does not exist
-     */
-    public function get($name)
-    {
-        if (!isset($this->collectors[$name])) {
-            throw new \InvalidArgumentException(sprintf('Collector "%s" does not exist.', $name));
-        }
-
-        return $this->collectors[$name];
-    }
-
-    private function getTimestamp($value)
-    {
-        if (null === $value || '' == $value) {
-            return;
-        }
-
-        try {
-            $value = new \DateTime(is_numeric($value) ? '@'.$value : $value);
-        } catch (\Exception $e) {
-            return;
-        }
-
-        return $value->getTimestamp();
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/ProfilerStorageInterface.php b/vendor/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
deleted file mode 100644
index ea72af2..0000000
--- a/vendor/symfony/http-kernel/Profiler/ProfilerStorageInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * ProfilerStorageInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ProfilerStorageInterface
-{
-    /**
-     * Finds profiler tokens for the given criteria.
-     *
-     * @param string   $ip     The IP
-     * @param string   $url    The URL
-     * @param string   $limit  The maximum number of tokens to return
-     * @param string   $method The request method
-     * @param int|null $start  The start date to search from
-     * @param int|null $end    The end date to search to
-     *
-     * @return array An array of tokens
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null);
-
-    /**
-     * Reads data associated with the given token.
-     *
-     * The method returns false if the token does not exist in the storage.
-     *
-     * @param string $token A token
-     *
-     * @return Profile The profile associated with token
-     */
-    public function read($token);
-
-    /**
-     * Saves a Profile.
-     *
-     * @param Profile $profile A Profile instance
-     *
-     * @return bool Write operation successful
-     */
-    public function write(Profile $profile);
-
-    /**
-     * Purges all data from the database.
-     */
-    public function purge();
-}
diff --git a/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php
deleted file mode 100644
index b0e14ea..0000000
--- a/vendor/symfony/http-kernel/Profiler/RedisProfilerStorage.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * RedisProfilerStorage stores profiling information in Redis.
- *
- * @author Andrej Hudec <pulzarraider@gmail.com>
- * @author Stephane PY <py.stephane1@gmail.com>
- */
-class RedisProfilerStorage implements ProfilerStorageInterface
-{
-    const TOKEN_PREFIX = 'sf_profiler_';
-
-    const REDIS_OPT_SERIALIZER = 1;
-    const REDIS_OPT_PREFIX = 2;
-    const REDIS_SERIALIZER_NONE = 0;
-    const REDIS_SERIALIZER_PHP = 1;
-
-    protected $dsn;
-    protected $lifetime;
-
-    /**
-     * @var \Redis
-     */
-    private $redis;
-
-    /**
-     * Constructor.
-     *
-     * @param string $dsn      A data source name
-     * @param string $username Not used
-     * @param string $password Not used
-     * @param int    $lifetime The lifetime to use for the purge
-     */
-    public function __construct($dsn, $username = '', $password = '', $lifetime = 86400)
-    {
-        $this->dsn = $dsn;
-        $this->lifetime = (int) $lifetime;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function find($ip, $url, $limit, $method, $start = null, $end = null)
-    {
-        $indexName = $this->getIndexName();
-
-        if (!$indexContent = $this->getValue($indexName, self::REDIS_SERIALIZER_NONE)) {
-            return array();
-        }
-
-        $profileList = array_reverse(explode("\n", $indexContent));
-        $result = array();
-
-        foreach ($profileList as $item) {
-            if ($limit === 0) {
-                break;
-            }
-
-            if ($item == '') {
-                continue;
-            }
-
-            $values = explode("\t", $item, 7);
-            list($itemToken, $itemIp, $itemMethod, $itemUrl, $itemTime, $itemParent) = $values;
-            $statusCode = isset($values[6]) ? $values[6] : null;
-
-            $itemTime = (int) $itemTime;
-
-            if ($ip && false === strpos($itemIp, $ip) || $url && false === strpos($itemUrl, $url) || $method && false === strpos($itemMethod, $method)) {
-                continue;
-            }
-
-            if (!empty($start) && $itemTime < $start) {
-                continue;
-            }
-
-            if (!empty($end) && $itemTime > $end) {
-                continue;
-            }
-
-            $result[] = array(
-                'token' => $itemToken,
-                'ip' => $itemIp,
-                'method' => $itemMethod,
-                'url' => $itemUrl,
-                'time' => $itemTime,
-                'parent' => $itemParent,
-                'status_code' => $statusCode,
-            );
-            --$limit;
-        }
-
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function purge()
-    {
-        // delete only items from index
-        $indexName = $this->getIndexName();
-
-        $indexContent = $this->getValue($indexName, self::REDIS_SERIALIZER_NONE);
-
-        if (!$indexContent) {
-            return false;
-        }
-
-        $profileList = explode("\n", $indexContent);
-
-        $result = array();
-
-        foreach ($profileList as $item) {
-            if ($item == '') {
-                continue;
-            }
-
-            if (false !== $pos = strpos($item, "\t")) {
-                $result[] = $this->getItemName(substr($item, 0, $pos));
-            }
-        }
-
-        $result[] = $indexName;
-
-        return $this->delete($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($token)
-    {
-        if (empty($token)) {
-            return false;
-        }
-
-        $profile = $this->getValue($this->getItemName($token), self::REDIS_SERIALIZER_PHP);
-
-        if (false !== $profile) {
-            $profile = $this->createProfileFromData($token, $profile);
-        }
-
-        return $profile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(Profile $profile)
-    {
-        $data = array(
-            'token' => $profile->getToken(),
-            'parent' => $profile->getParentToken(),
-            'children' => array_map(function ($p) { return $p->getToken(); }, $profile->getChildren()),
-            'data' => $profile->getCollectors(),
-            'ip' => $profile->getIp(),
-            'method' => $profile->getMethod(),
-            'url' => $profile->getUrl(),
-            'time' => $profile->getTime(),
-        );
-
-        $profileIndexed = false !== $this->getValue($this->getItemName($profile->getToken()));
-
-        if ($this->setValue($this->getItemName($profile->getToken()), $data, $this->lifetime, self::REDIS_SERIALIZER_PHP)) {
-            if (!$profileIndexed) {
-                // Add to index
-                $indexName = $this->getIndexName();
-
-                $indexRow = implode("\t", array(
-                    $profile->getToken(),
-                    $profile->getIp(),
-                    $profile->getMethod(),
-                    $profile->getUrl(),
-                    $profile->getTime(),
-                    $profile->getParentToken(),
-                    $profile->getStatusCode(),
-                ))."\n";
-
-                return $this->appendValue($indexName, $indexRow, $this->lifetime);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Internal convenience method that returns the instance of Redis.
-     *
-     * @return \Redis
-     *
-     * @throws \RuntimeException
-     */
-    protected function getRedis()
-    {
-        if (null === $this->redis) {
-            $data = parse_url($this->dsn);
-
-            if (false === $data || !isset($data['scheme']) || $data['scheme'] !== 'redis' || !isset($data['host']) || !isset($data['port'])) {
-                throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Redis with an invalid dsn "%s". The minimal expected format is "redis://[host]:port".', $this->dsn));
-            }
-
-            if (!extension_loaded('redis')) {
-                throw new \RuntimeException('RedisProfilerStorage requires that the redis extension is loaded.');
-            }
-
-            $redis = new \Redis();
-            $redis->connect($data['host'], $data['port']);
-
-            if (isset($data['path'])) {
-                $redis->select(substr($data['path'], 1));
-            }
-
-            if (isset($data['pass'])) {
-                $redis->auth($data['pass']);
-            }
-
-            $redis->setOption(self::REDIS_OPT_PREFIX, self::TOKEN_PREFIX);
-
-            $this->redis = $redis;
-        }
-
-        return $this->redis;
-    }
-
-    /**
-     * Set instance of the Redis.
-     *
-     * @param \Redis $redis
-     */
-    public function setRedis($redis)
-    {
-        $this->redis = $redis;
-    }
-
-    private function createProfileFromData($token, $data, $parent = null)
-    {
-        $profile = new Profile($token);
-        $profile->setIp($data['ip']);
-        $profile->setMethod($data['method']);
-        $profile->setUrl($data['url']);
-        $profile->setTime($data['time']);
-        $profile->setCollectors($data['data']);
-
-        if (!$parent && $data['parent']) {
-            $parent = $this->read($data['parent']);
-        }
-
-        if ($parent) {
-            $profile->setParent($parent);
-        }
-
-        foreach ($data['children'] as $token) {
-            if (!$token) {
-                continue;
-            }
-
-            if (!$childProfileData = $this->getValue($this->getItemName($token), self::REDIS_SERIALIZER_PHP)) {
-                continue;
-            }
-
-            $profile->addChild($this->createProfileFromData($token, $childProfileData, $profile));
-        }
-
-        return $profile;
-    }
-
-    /**
-     * Gets the item name.
-     *
-     * @param string $token
-     *
-     * @return string
-     */
-    private function getItemName($token)
-    {
-        $name = $token;
-
-        if ($this->isItemNameValid($name)) {
-            return $name;
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the name of the index.
-     *
-     * @return string
-     */
-    private function getIndexName()
-    {
-        $name = 'index';
-
-        if ($this->isItemNameValid($name)) {
-            return $name;
-        }
-
-        return false;
-    }
-
-    private function isItemNameValid($name)
-    {
-        $length = strlen($name);
-
-        if ($length > 2147483648) {
-            throw new \RuntimeException(sprintf('The Redis item key "%s" is too long (%s bytes). Allowed maximum size is 2^31 bytes.', $name, $length));
-        }
-
-        return true;
-    }
-
-    /**
-     * Retrieves an item from the Redis server.
-     *
-     * @param string $key
-     * @param int    $serializer
-     *
-     * @return mixed
-     */
-    private function getValue($key, $serializer = self::REDIS_SERIALIZER_NONE)
-    {
-        $redis = $this->getRedis();
-        $redis->setOption(self::REDIS_OPT_SERIALIZER, $serializer);
-
-        return $redis->get($key);
-    }
-
-    /**
-     * Stores an item on the Redis server under the specified key.
-     *
-     * @param string $key
-     * @param mixed  $value
-     * @param int    $expiration
-     * @param int    $serializer
-     *
-     * @return bool
-     */
-    private function setValue($key, $value, $expiration = 0, $serializer = self::REDIS_SERIALIZER_NONE)
-    {
-        $redis = $this->getRedis();
-        $redis->setOption(self::REDIS_OPT_SERIALIZER, $serializer);
-
-        return $redis->setex($key, $expiration, $value);
-    }
-
-    /**
-     * Appends data to an existing item on the Redis server.
-     *
-     * @param string $key
-     * @param string $value
-     * @param int    $expiration
-     *
-     * @return bool
-     */
-    private function appendValue($key, $value, $expiration = 0)
-    {
-        $redis = $this->getRedis();
-        $redis->setOption(self::REDIS_OPT_SERIALIZER, self::REDIS_SERIALIZER_NONE);
-
-        if ($redis->exists($key)) {
-            $redis->append($key, $value);
-
-            return $redis->setTimeout($key, $expiration);
-        }
-
-        return $redis->setex($key, $expiration, $value);
-    }
-
-    /**
-     * Removes the specified keys.
-     *
-     * @param array $keys
-     *
-     * @return bool
-     */
-    private function delete(array $keys)
-    {
-        return (bool) $this->getRedis()->delete($keys);
-    }
-}
diff --git a/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php b/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php
deleted file mode 100644
index 4a996fd..0000000
--- a/vendor/symfony/http-kernel/Profiler/SqliteProfilerStorage.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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\Component\HttpKernel\Profiler;
-
-/**
- * SqliteProfilerStorage stores profiling information in a SQLite database.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class SqliteProfilerStorage extends PdoProfilerStorage
-{
-    /**
-     * @throws \RuntimeException When neither of SQLite3 or PDO_SQLite extension is enabled
-     */
-    protected function initDb()
-    {
-        if (null === $this->db || $this->db instanceof \SQLite3) {
-            if (0 !== strpos($this->dsn, 'sqlite')) {
-                throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use Sqlite with an invalid dsn "%s". The expected format is "sqlite:/path/to/the/db/file".', $this->dsn));
-            }
-            if (class_exists('SQLite3')) {
-                $db = new \SQLite3(substr($this->dsn, 7, strlen($this->dsn)), \SQLITE3_OPEN_READWRITE | \SQLITE3_OPEN_CREATE);
-                if (method_exists($db, 'busyTimeout')) {
-                    // busyTimeout only exists for PHP >= 5.3.3
-                    $db->busyTimeout(1000);
-                }
-            } elseif (class_exists('PDO') && in_array('sqlite', \PDO::getAvailableDrivers(), true)) {
-                $db = new \PDO($this->dsn);
-            } else {
-                throw new \RuntimeException('You need to enable either the SQLite3 or PDO_SQLite extension for the profiler to run properly.');
-            }
-
-            $db->exec('PRAGMA temp_store=MEMORY; PRAGMA journal_mode=MEMORY;');
-            $db->exec('CREATE TABLE IF NOT EXISTS sf_profiler_data (token STRING, data STRING, ip STRING, method STRING, url STRING, time INTEGER, parent STRING, created_at INTEGER, status_code INTEGER)');
-            $db->exec('CREATE INDEX IF NOT EXISTS data_created_at ON sf_profiler_data (created_at)');
-            $db->exec('CREATE INDEX IF NOT EXISTS data_ip ON sf_profiler_data (ip)');
-            $db->exec('CREATE INDEX IF NOT EXISTS data_method ON sf_profiler_data (method)');
-            $db->exec('CREATE INDEX IF NOT EXISTS data_url ON sf_profiler_data (url)');
-            $db->exec('CREATE INDEX IF NOT EXISTS data_parent ON sf_profiler_data (parent)');
-            $db->exec('CREATE UNIQUE INDEX IF NOT EXISTS data_token ON sf_profiler_data (token)');
-
-            $this->db = $db;
-        }
-
-        return $this->db;
-    }
-
-    protected function exec($db, $query, array $args = array())
-    {
-        if ($db instanceof \SQLite3) {
-            $stmt = $this->prepareStatement($db, $query);
-            foreach ($args as $arg => $val) {
-                $stmt->bindValue($arg, $val, is_int($val) ? \SQLITE3_INTEGER : \SQLITE3_TEXT);
-            }
-
-            $res = $stmt->execute();
-            if (false === $res) {
-                throw new \RuntimeException(sprintf('Error executing SQLite query "%s"', $query));
-            }
-            $res->finalize();
-        } else {
-            parent::exec($db, $query, $args);
-        }
-    }
-
-    protected function fetch($db, $query, array $args = array())
-    {
-        $return = array();
-
-        if ($db instanceof \SQLite3) {
-            $stmt = $this->prepareStatement($db, $query, true);
-            foreach ($args as $arg => $val) {
-                $stmt->bindValue($arg, $val, is_int($val) ? \SQLITE3_INTEGER : \SQLITE3_TEXT);
-            }
-            $res = $stmt->execute();
-            while ($row = $res->fetchArray(\SQLITE3_ASSOC)) {
-                $return[] = $row;
-            }
-            $res->finalize();
-            $stmt->close();
-        } else {
-            $return = parent::fetch($db, $query, $args);
-        }
-
-        return $return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function buildCriteria($ip, $url, $start, $end, $limit, $method)
-    {
-        $criteria = array();
-        $args = array();
-
-        if ($ip = preg_replace('/[^\d\.]/', '', $ip)) {
-            $criteria[] = 'ip LIKE :ip';
-            $args[':ip'] = '%'.$ip.'%';
-        }
-
-        if ($url) {
-            $criteria[] = 'url LIKE :url ESCAPE "\"';
-            $args[':url'] = '%'.addcslashes($url, '%_\\').'%';
-        }
-
-        if ($method) {
-            $criteria[] = 'method = :method';
-            $args[':method'] = $method;
-        }
-
-        if (!empty($start)) {
-            $criteria[] = 'time >= :start';
-            $args[':start'] = $start;
-        }
-
-        if (!empty($end)) {
-            $criteria[] = 'time <= :end';
-            $args[':end'] = $end;
-        }
-
-        return array($criteria, $args);
-    }
-
-    protected function close($db)
-    {
-        if ($db instanceof \SQLite3) {
-            $db->close();
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/README.md b/vendor/symfony/http-kernel/README.md
deleted file mode 100644
index 9ec8c04..0000000
--- a/vendor/symfony/http-kernel/README.md
+++ /dev/null
@@ -1,99 +0,0 @@
-HttpKernel Component
-====================
-
-HttpKernel provides the building blocks to create flexible and fast HTTP-based
-frameworks.
-
-``HttpKernelInterface`` is the core interface of the Symfony full-stack
-framework:
-
-```php
-interface HttpKernelInterface
-{
-    /**
-     * Handles a Request to convert it to a Response.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return Response A Response instance
-     */
-    function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true);
-}
-```
-
-It takes a ``Request`` as an input and should return a ``Response`` as an
-output. Using this interface makes your code compatible with all frameworks
-using the Symfony components. And this will give you many cool features for
-free.
-
-Creating a framework based on the Symfony components is really easy. Here is
-a very simple, but fully-featured framework based on the Symfony components:
-
-```php
-$routes = new RouteCollection();
-$routes->add('hello', new Route('/hello', array('_controller' =>
-    function (Request $request) {
-        return new Response(sprintf("Hello %s", $request->get('name')));
-    }
-)));
-
-$request = Request::createFromGlobals();
-
-$context = new RequestContext();
-$context->fromRequest($request);
-
-$matcher = new UrlMatcher($routes, $context);
-
-$dispatcher = new EventDispatcher();
-$dispatcher->addSubscriber(new RouterListener($matcher));
-
-$resolver = new ControllerResolver();
-
-$kernel = new HttpKernel($dispatcher, $resolver);
-
-$kernel->handle($request)->send();
-```
-
-This is all you need to create a flexible framework with the Symfony
-components.
-
-Want to add an HTTP reverse proxy and benefit from HTTP caching and Edge Side
-Includes?
-
-```php
-$kernel = new HttpKernel($dispatcher, $resolver);
-
-$kernel = new HttpCache($kernel, new Store(__DIR__.'/cache'));
-```
-
-Want to functional test this small framework?
-
-```php
-$client = new Client($kernel);
-$crawler = $client->request('GET', '/hello/Fabien');
-
-$this->assertEquals('Fabien', $crawler->filter('p > span')->text());
-```
-
-Want nice error pages instead of ugly PHP exceptions?
-
-```php
-$dispatcher->addSubscriber(new ExceptionListener(function (Request $request) {
-    $msg = 'Something went wrong! ('.$request->get('exception')->getMessage().')';
-
-    return new Response($msg, 500);
-}));
-```
-
-And that's why the simple looking ``HttpKernelInterface`` is so powerful. It
-gives you access to a lot of cool features, ready to be used out of the box,
-with no efforts.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/HttpKernel/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/http-kernel/TerminableInterface.php b/vendor/symfony/http-kernel/TerminableInterface.php
deleted file mode 100644
index d55a15b..0000000
--- a/vendor/symfony/http-kernel/TerminableInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\HttpKernel;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Terminable extends the Kernel request/response cycle with dispatching a post
- * response event after sending the response and before shutting down the kernel.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Pierre Minnieur <pierre.minnieur@sensiolabs.de>
- */
-interface TerminableInterface
-{
-    /**
-     * Terminates a request/response cycle.
-     *
-     * Should be called after sending the response and before shutting down the kernel.
-     *
-     * @param Request  $request  A Request instance
-     * @param Response $response A Response instance
-     */
-    public function terminate(Request $request, Response $response);
-}
diff --git a/vendor/symfony/http-kernel/UriSigner.php b/vendor/symfony/http-kernel/UriSigner.php
deleted file mode 100644
index 6ddce87..0000000
--- a/vendor/symfony/http-kernel/UriSigner.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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\Component\HttpKernel;
-
-/**
- * Signs URIs.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class UriSigner
-{
-    private $secret;
-
-    /**
-     * Constructor.
-     *
-     * @param string $secret A secret
-     */
-    public function __construct($secret)
-    {
-        $this->secret = $secret;
-    }
-
-    /**
-     * Signs a URI.
-     *
-     * The given URI is signed by adding a _hash query string parameter
-     * which value depends on the URI and the secret.
-     *
-     * @param string $uri A URI to sign
-     *
-     * @return string The signed URI
-     */
-    public function sign($uri)
-    {
-        $url = parse_url($uri);
-        if (isset($url['query'])) {
-            parse_str($url['query'], $params);
-        } else {
-            $params = array();
-        }
-
-        $uri = $this->buildUrl($url, $params);
-
-        return $uri.(false === (strpos($uri, '?')) ? '?' : '&').'_hash='.$this->computeHash($uri);
-    }
-
-    /**
-     * Checks that a URI contains the correct hash.
-     *
-     * The _hash query string parameter must be the last one
-     * (as it is generated that way by the sign() method, it should
-     * never be a problem).
-     *
-     * @param string $uri A signed URI
-     *
-     * @return bool True if the URI is signed correctly, false otherwise
-     */
-    public function check($uri)
-    {
-        $url = parse_url($uri);
-        if (isset($url['query'])) {
-            parse_str($url['query'], $params);
-        } else {
-            $params = array();
-        }
-
-        if (empty($params['_hash'])) {
-            return false;
-        }
-
-        $hash = urlencode($params['_hash']);
-        unset($params['_hash']);
-
-        return $this->computeHash($this->buildUrl($url, $params)) === $hash;
-    }
-
-    private function computeHash($uri)
-    {
-        return urlencode(base64_encode(hash_hmac('sha256', $uri, $this->secret, true)));
-    }
-
-    private function buildUrl(array $url, array $params = array())
-    {
-        ksort($params);
-        $url['query'] = http_build_query($params, '', '&');
-
-        $scheme = isset($url['scheme']) ? $url['scheme'].'://' : '';
-        $host = isset($url['host']) ? $url['host'] : '';
-        $port = isset($url['port']) ? ':'.$url['port'] : '';
-        $user = isset($url['user']) ? $url['user'] : '';
-        $pass = isset($url['pass']) ? ':'.$url['pass']  : '';
-        $pass = ($user || $pass) ? "$pass@" : '';
-        $path = isset($url['path']) ? $url['path'] : '';
-        $query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';
-        $fragment = isset($url['fragment']) ? '#'.$url['fragment'] : '';
-
-        return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
-    }
-}
diff --git a/vendor/symfony/http-kernel/composer.json b/vendor/symfony/http-kernel/composer.json
deleted file mode 100644
index 623d732..0000000
--- a/vendor/symfony/http-kernel/composer.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "name": "symfony/http-kernel",
-    "type": "library",
-    "description": "Symfony HttpKernel Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9",
-        "symfony/event-dispatcher": "~2.6,>=2.6.7",
-        "symfony/http-foundation": "~2.5,>=2.5.4",
-        "symfony/debug": "~2.6,>=2.6.2",
-        "psr/log": "~1.0"
-    },
-    "require-dev": {
-        "symfony/browser-kit": "~2.3",
-        "symfony/class-loader": "~2.1",
-        "symfony/config": "~2.7",
-        "symfony/console": "~2.3",
-        "symfony/css-selector": "~2.0,>=2.0.5",
-        "symfony/dependency-injection": "~2.2",
-        "symfony/dom-crawler": "~2.0,>=2.0.5",
-        "symfony/expression-language": "~2.4",
-        "symfony/finder": "~2.0,>=2.0.5",
-        "symfony/process": "~2.0,>=2.0.5",
-        "symfony/routing": "~2.2",
-        "symfony/stopwatch": "~2.3",
-        "symfony/templating": "~2.2",
-        "symfony/translation": "~2.0,>=2.0.5",
-        "symfony/var-dumper": "~2.6"
-    },
-    "conflict": {
-        "symfony/config": "<2.7"
-    },
-    "suggest": {
-        "symfony/browser-kit": "",
-        "symfony/class-loader": "",
-        "symfony/config": "",
-        "symfony/console": "",
-        "symfony/dependency-injection": "",
-        "symfony/finder": "",
-        "symfony/var-dumper": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\HttpKernel\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/http-kernel/phpunit.xml.dist b/vendor/symfony/http-kernel/phpunit.xml.dist
deleted file mode 100644
index 1314966..0000000
--- a/vendor/symfony/http-kernel/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony HttpKernel Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/process/.gitignore b/vendor/symfony/process/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/process/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/process/CHANGELOG.md b/vendor/symfony/process/CHANGELOG.md
deleted file mode 100644
index 2f3c1be..0000000
--- a/vendor/symfony/process/CHANGELOG.md
+++ /dev/null
@@ -1,40 +0,0 @@
-CHANGELOG
-=========
-
-2.5.0
------
-
- * added support for PTY mode
- * added the convenience method "mustRun"
- * deprecation: Process::setStdin() is deprecated in favor of Process::setInput()
- * deprecation: Process::getStdin() is deprecated in favor of Process::getInput()
- * deprecation: Process::setInput() and ProcessBuilder::setInput() do not accept non-scalar types
-
-2.4.0
------
-
- * added the ability to define an idle timeout
-
-2.3.0
------
-
- * added ProcessUtils::escapeArgument() to fix the bug in escapeshellarg() function on Windows
- * added Process::signal()
- * added Process::getPid()
- * added support for a TTY mode
-
-2.2.0
------
-
- * added ProcessBuilder::setArguments() to reset the arguments on a builder
- * added a way to retrieve the standard and error output incrementally
- * added Process:restart()
-
-2.1.0
------
-
- * added support for non-blocking processes (start(), wait(), isRunning(), stop())
- * enhanced Windows compatibility
- * added Process::getExitCodeText() that returns a string representation for
-   the exit code returned by the process
- * added ProcessBuilder
diff --git a/vendor/symfony/process/Exception/ExceptionInterface.php b/vendor/symfony/process/Exception/ExceptionInterface.php
deleted file mode 100644
index 75c1c9e..0000000
--- a/vendor/symfony/process/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Process\Exception;
-
-/**
- * Marker Interface for the Process Component.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/process/Exception/InvalidArgumentException.php b/vendor/symfony/process/Exception/InvalidArgumentException.php
deleted file mode 100644
index 926ee21..0000000
--- a/vendor/symfony/process/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Process\Exception;
-
-/**
- * InvalidArgumentException for the Process Component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/process/Exception/LogicException.php b/vendor/symfony/process/Exception/LogicException.php
deleted file mode 100644
index be3d490..0000000
--- a/vendor/symfony/process/Exception/LogicException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Process\Exception;
-
-/**
- * LogicException for the Process Component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/process/Exception/ProcessFailedException.php b/vendor/symfony/process/Exception/ProcessFailedException.php
deleted file mode 100644
index 7523a5e..0000000
--- a/vendor/symfony/process/Exception/ProcessFailedException.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Component\Process\Exception;
-
-use Symfony\Component\Process\Process;
-
-/**
- * Exception for failed processes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ProcessFailedException extends RuntimeException
-{
-    private $process;
-
-    public function __construct(Process $process)
-    {
-        if ($process->isSuccessful()) {
-            throw new InvalidArgumentException('Expected a failed process, but the given process was successful.');
-        }
-
-        $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)",
-            $process->getCommandLine(),
-            $process->getExitCode(),
-            $process->getExitCodeText()
-        );
-
-        if (!$process->isOutputDisabled()) {
-            $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s",
-                $process->getOutput(),
-                $process->getErrorOutput()
-            );
-        }
-
-        parent::__construct($error);
-
-        $this->process = $process;
-    }
-
-    public function getProcess()
-    {
-        return $this->process;
-    }
-}
diff --git a/vendor/symfony/process/Exception/ProcessTimedOutException.php b/vendor/symfony/process/Exception/ProcessTimedOutException.php
deleted file mode 100644
index d451146..0000000
--- a/vendor/symfony/process/Exception/ProcessTimedOutException.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Component\Process\Exception;
-
-use Symfony\Component\Process\Process;
-
-/**
- * Exception that is thrown when a process times out.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ProcessTimedOutException extends RuntimeException
-{
-    const TYPE_GENERAL = 1;
-    const TYPE_IDLE = 2;
-
-    private $process;
-    private $timeoutType;
-
-    public function __construct(Process $process, $timeoutType)
-    {
-        $this->process = $process;
-        $this->timeoutType = $timeoutType;
-
-        parent::__construct(sprintf(
-            'The process "%s" exceeded the timeout of %s seconds.',
-            $process->getCommandLine(),
-            $this->getExceededTimeout()
-        ));
-    }
-
-    public function getProcess()
-    {
-        return $this->process;
-    }
-
-    public function isGeneralTimeout()
-    {
-        return $this->timeoutType === self::TYPE_GENERAL;
-    }
-
-    public function isIdleTimeout()
-    {
-        return $this->timeoutType === self::TYPE_IDLE;
-    }
-
-    public function getExceededTimeout()
-    {
-        switch ($this->timeoutType) {
-            case self::TYPE_GENERAL:
-                return $this->process->getTimeout();
-
-            case self::TYPE_IDLE:
-                return $this->process->getIdleTimeout();
-
-            default:
-                throw new \LogicException(sprintf('Unknown timeout type "%d".', $this->timeoutType));
-        }
-    }
-}
diff --git a/vendor/symfony/process/Exception/RuntimeException.php b/vendor/symfony/process/Exception/RuntimeException.php
deleted file mode 100644
index adead25..0000000
--- a/vendor/symfony/process/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Process\Exception;
-
-/**
- * RuntimeException for the Process Component.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/process/ExecutableFinder.php b/vendor/symfony/process/ExecutableFinder.php
deleted file mode 100644
index fa11cb6..0000000
--- a/vendor/symfony/process/ExecutableFinder.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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\Component\Process;
-
-/**
- * Generic executable finder.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ExecutableFinder
-{
-    private $suffixes = array('.exe', '.bat', '.cmd', '.com');
-
-    /**
-     * Replaces default suffixes of executable.
-     *
-     * @param array $suffixes
-     */
-    public function setSuffixes(array $suffixes)
-    {
-        $this->suffixes = $suffixes;
-    }
-
-    /**
-     * Adds new possible suffix to check for executable.
-     *
-     * @param string $suffix
-     */
-    public function addSuffix($suffix)
-    {
-        $this->suffixes[] = $suffix;
-    }
-
-    /**
-     * Finds an executable by name.
-     *
-     * @param string $name      The executable name (without the extension)
-     * @param string $default   The default to return if no executable is found
-     * @param array  $extraDirs Additional dirs to check into
-     *
-     * @return string The executable path or default value
-     */
-    public function find($name, $default = null, array $extraDirs = array())
-    {
-        if (ini_get('open_basedir')) {
-            $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
-            $dirs = array();
-            foreach ($searchPath as $path) {
-                // Silencing against https://bugs.php.net/69240
-                if (@is_dir($path)) {
-                    $dirs[] = $path;
-                } else {
-                    if (basename($path) == $name && is_executable($path)) {
-                        return $path;
-                    }
-                }
-            }
-        } else {
-            $dirs = array_merge(
-                explode(PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
-                $extraDirs
-            );
-        }
-
-        $suffixes = array('');
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $pathExt = getenv('PATHEXT');
-            $suffixes = $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes;
-        }
-        foreach ($suffixes as $suffix) {
-            foreach ($dirs as $dir) {
-                if (is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
-                    return $file;
-                }
-            }
-        }
-
-        return $default;
-    }
-}
diff --git a/vendor/symfony/process/LICENSE b/vendor/symfony/process/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/process/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/process/PhpExecutableFinder.php b/vendor/symfony/process/PhpExecutableFinder.php
deleted file mode 100644
index f8f57cc..0000000
--- a/vendor/symfony/process/PhpExecutableFinder.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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\Component\Process;
-
-/**
- * An executable finder specifically designed for the PHP executable.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class PhpExecutableFinder
-{
-    private $executableFinder;
-
-    public function __construct()
-    {
-        $this->executableFinder = new ExecutableFinder();
-    }
-
-    /**
-     * Finds The PHP executable.
-     *
-     * @param bool $includeArgs Whether or not include command arguments
-     *
-     * @return string|false The PHP executable path or false if it cannot be found
-     */
-    public function find($includeArgs = true)
-    {
-        // HHVM support
-        if (defined('HHVM_VERSION')) {
-            return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
-        }
-
-        // PHP_BINARY return the current sapi executable
-        if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server')) && is_file(PHP_BINARY)) {
-            return PHP_BINARY;
-        }
-
-        if ($php = getenv('PHP_PATH')) {
-            if (!is_executable($php)) {
-                return false;
-            }
-
-            return $php;
-        }
-
-        if ($php = getenv('PHP_PEAR_PHP_BIN')) {
-            if (is_executable($php)) {
-                return $php;
-            }
-        }
-
-        $dirs = array(PHP_BINDIR);
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $dirs[] = 'C:\xampp\php\\';
-        }
-
-        return $this->executableFinder->find('php', false, $dirs);
-    }
-
-    /**
-     * Finds the PHP executable arguments.
-     *
-     * @return array The PHP executable arguments
-     */
-    public function findArguments()
-    {
-        $arguments = array();
-
-        // HHVM support
-        if (defined('HHVM_VERSION')) {
-            $arguments[] = '--php';
-        }
-
-        return $arguments;
-    }
-}
diff --git a/vendor/symfony/process/PhpProcess.php b/vendor/symfony/process/PhpProcess.php
deleted file mode 100644
index 1adbd97..0000000
--- a/vendor/symfony/process/PhpProcess.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\Process;
-
-use Symfony\Component\Process\Exception\RuntimeException;
-
-/**
- * PhpProcess runs a PHP script in an independent process.
- *
- * $p = new PhpProcess('<?php echo "foo"; ?>');
- * $p->run();
- * print $p->getOutput()."\n";
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class PhpProcess extends Process
-{
-    /**
-     * Constructor.
-     *
-     * @param string      $script  The PHP script to run (as a string)
-     * @param string|null $cwd     The working directory or null to use the working dir of the current PHP process
-     * @param array|null  $env     The environment variables or null to use the same environment as the current PHP process
-     * @param int         $timeout The timeout in seconds
-     * @param array       $options An array of options for proc_open
-     */
-    public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = array())
-    {
-        $executableFinder = new PhpExecutableFinder();
-        if (false === $php = $executableFinder->find()) {
-            $php = null;
-        }
-
-        parent::__construct($php, $cwd, $env, $script, $timeout, $options);
-    }
-
-    /**
-     * Sets the path to the PHP binary to use.
-     */
-    public function setPhpBinary($php)
-    {
-        $this->setCommandLine($php);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function start($callback = null)
-    {
-        if (null === $this->getCommandLine()) {
-            throw new RuntimeException('Unable to find the PHP executable.');
-        }
-
-        parent::start($callback);
-    }
-}
diff --git a/vendor/symfony/process/Pipes/AbstractPipes.php b/vendor/symfony/process/Pipes/AbstractPipes.php
deleted file mode 100644
index 1ca8573..0000000
--- a/vendor/symfony/process/Pipes/AbstractPipes.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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\Component\Process\Pipes;
-
-/**
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @internal
- */
-abstract class AbstractPipes implements PipesInterface
-{
-    /** @var array */
-    public $pipes = array();
-
-    /** @var string */
-    protected $inputBuffer = '';
-    /** @var resource|null */
-    protected $input;
-
-    /** @var bool */
-    private $blocked = true;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        foreach ($this->pipes as $pipe) {
-            fclose($pipe);
-        }
-        $this->pipes = array();
-    }
-
-    /**
-     * Returns true if a system call has been interrupted.
-     *
-     * @return bool
-     */
-    protected function hasSystemCallBeenInterrupted()
-    {
-        $lastError = error_get_last();
-
-        // stream_select returns false when the `select` system call is interrupted by an incoming signal
-        return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call');
-    }
-
-    /**
-     * Unblocks streams.
-     */
-    protected function unblock()
-    {
-        if (!$this->blocked) {
-            return;
-        }
-
-        foreach ($this->pipes as $pipe) {
-            stream_set_blocking($pipe, 0);
-        }
-        if (null !== $this->input) {
-            stream_set_blocking($this->input, 0);
-        }
-
-        $this->blocked = false;
-    }
-}
diff --git a/vendor/symfony/process/Pipes/PipesInterface.php b/vendor/symfony/process/Pipes/PipesInterface.php
deleted file mode 100644
index 09d3f61..0000000
--- a/vendor/symfony/process/Pipes/PipesInterface.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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\Component\Process\Pipes;
-
-/**
- * PipesInterface manages descriptors and pipes for the use of proc_open.
- *
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @internal
- */
-interface PipesInterface
-{
-    const CHUNK_SIZE = 16384;
-
-    /**
-     * Returns an array of descriptors for the use of proc_open.
-     *
-     * @return array
-     */
-    public function getDescriptors();
-
-    /**
-     * Returns an array of filenames indexed by their related stream in case these pipes use temporary files.
-     *
-     * @return string[]
-     */
-    public function getFiles();
-
-    /**
-     * Reads data in file handles and pipes.
-     *
-     * @param bool $blocking Whether to use blocking calls or not.
-     * @param bool $close    Whether to close pipes if they've reached EOF.
-     *
-     * @return string[] An array of read data indexed by their fd.
-     */
-    public function readAndWrite($blocking, $close = false);
-
-    /**
-     * Returns if the current state has open file handles or pipes.
-     *
-     * @return bool
-     */
-    public function areOpen();
-
-    /**
-     * Closes file handles and pipes.
-     */
-    public function close();
-}
diff --git a/vendor/symfony/process/Pipes/UnixPipes.php b/vendor/symfony/process/Pipes/UnixPipes.php
deleted file mode 100644
index f8a0d19..0000000
--- a/vendor/symfony/process/Pipes/UnixPipes.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?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\Component\Process\Pipes;
-
-use Symfony\Component\Process\Process;
-
-/**
- * UnixPipes implementation uses unix pipes as handles.
- *
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @internal
- */
-class UnixPipes extends AbstractPipes
-{
-    /** @var bool */
-    private $ttyMode;
-    /** @var bool */
-    private $ptyMode;
-    /** @var bool */
-    private $disableOutput;
-
-    public function __construct($ttyMode, $ptyMode, $input, $disableOutput)
-    {
-        $this->ttyMode = (bool) $ttyMode;
-        $this->ptyMode = (bool) $ptyMode;
-        $this->disableOutput = (bool) $disableOutput;
-
-        if (is_resource($input)) {
-            $this->input = $input;
-        } else {
-            $this->inputBuffer = (string) $input;
-        }
-    }
-
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDescriptors()
-    {
-        if ($this->disableOutput) {
-            $nullstream = fopen('/dev/null', 'c');
-
-            return array(
-                array('pipe', 'r'),
-                $nullstream,
-                $nullstream,
-            );
-        }
-
-        if ($this->ttyMode) {
-            return array(
-                array('file', '/dev/tty', 'r'),
-                array('file', '/dev/tty', 'w'),
-                array('file', '/dev/tty', 'w'),
-            );
-        }
-
-        if ($this->ptyMode && Process::isPtySupported()) {
-            return array(
-                array('pty'),
-                array('pty'),
-                array('pty'),
-            );
-        }
-
-        return array(
-            array('pipe', 'r'),
-            array('pipe', 'w'), // stdout
-            array('pipe', 'w'), // stderr
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFiles()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function readAndWrite($blocking, $close = false)
-    {
-        // only stdin is left open, job has been done !
-        // we can now close it
-        if (1 === count($this->pipes) && array(0) === array_keys($this->pipes)) {
-            fclose($this->pipes[0]);
-            unset($this->pipes[0]);
-        }
-
-        if (empty($this->pipes)) {
-            return array();
-        }
-
-        $this->unblock();
-
-        $read = array();
-
-        if (null !== $this->input) {
-            // if input is a resource, let's add it to stream_select argument to
-            // fill a buffer
-            $r = array_merge($this->pipes, array('input' => $this->input));
-        } else {
-            $r = $this->pipes;
-        }
-        // discard read on stdin
-        unset($r[0]);
-
-        $w = isset($this->pipes[0]) ? array($this->pipes[0]) : null;
-        $e = null;
-
-        // let's have a look if something changed in streams
-        if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) {
-            // if a system call has been interrupted, forget about it, let's try again
-            // otherwise, an error occurred, let's reset pipes
-            if (!$this->hasSystemCallBeenInterrupted()) {
-                $this->pipes = array();
-            }
-
-            return $read;
-        }
-
-        // nothing has changed
-        if (0 === $n) {
-            return $read;
-        }
-
-        foreach ($r as $pipe) {
-            // prior PHP 5.4 the array passed to stream_select is modified and
-            // lose key association, we have to find back the key
-            $type = (false !== $found = array_search($pipe, $this->pipes)) ? $found : 'input';
-            $data = '';
-            while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {
-                $data .= $dataread;
-            }
-
-            if ('' !== $data) {
-                if ($type === 'input') {
-                    $this->inputBuffer .= $data;
-                } else {
-                    $read[$type] = $data;
-                }
-            }
-
-            if (false === $data || (true === $close && feof($pipe) && '' === $data)) {
-                if ($type === 'input') {
-                    // no more data to read on input resource
-                    // use an empty buffer in the next reads
-                    $this->input = null;
-                } else {
-                    fclose($this->pipes[$type]);
-                    unset($this->pipes[$type]);
-                }
-            }
-        }
-
-        if (null !== $w && 0 < count($w)) {
-            while (strlen($this->inputBuffer)) {
-                $written = fwrite($w[0], $this->inputBuffer, 2 << 18); // write 512k
-                if ($written > 0) {
-                    $this->inputBuffer = (string) substr($this->inputBuffer, $written);
-                } else {
-                    break;
-                }
-            }
-        }
-
-        // no input to read on resource, buffer is empty and stdin still open
-        if ('' === $this->inputBuffer && null === $this->input && isset($this->pipes[0])) {
-            fclose($this->pipes[0]);
-            unset($this->pipes[0]);
-        }
-
-        return $read;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function areOpen()
-    {
-        return (bool) $this->pipes;
-    }
-
-    /**
-     * Creates a new UnixPipes instance.
-     *
-     * @param Process         $process
-     * @param string|resource $input
-     *
-     * @return UnixPipes
-     */
-    public static function create(Process $process, $input)
-    {
-        return new static($process->isTty(), $process->isPty(), $input, $process->isOutputDisabled());
-    }
-}
diff --git a/vendor/symfony/process/Pipes/WindowsPipes.php b/vendor/symfony/process/Pipes/WindowsPipes.php
deleted file mode 100644
index 1472f8c..0000000
--- a/vendor/symfony/process/Pipes/WindowsPipes.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?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\Component\Process\Pipes;
-
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\Exception\RuntimeException;
-
-/**
- * WindowsPipes implementation uses temporary files as handles.
- *
- * @see https://bugs.php.net/bug.php?id=51800
- * @see https://bugs.php.net/bug.php?id=65650
- *
- * @author Romain Neutron <imprec@gmail.com>
- *
- * @internal
- */
-class WindowsPipes extends AbstractPipes
-{
-    /** @var array */
-    private $files = array();
-    /** @var array */
-    private $fileHandles = array();
-    /** @var array */
-    private $readBytes = array(
-        Process::STDOUT => 0,
-        Process::STDERR => 0,
-    );
-    /** @var bool */
-    private $disableOutput;
-
-    public function __construct($disableOutput, $input)
-    {
-        $this->disableOutput = (bool) $disableOutput;
-
-        if (!$this->disableOutput) {
-            // Fix for PHP bug #51800: reading from STDOUT pipe hangs forever on Windows if the output is too big.
-            // Workaround for this problem is to use temporary files instead of pipes on Windows platform.
-            //
-            // @see https://bugs.php.net/bug.php?id=51800
-            $this->files = array(
-                Process::STDOUT => tempnam(sys_get_temp_dir(), 'out_sf_proc'),
-                Process::STDERR => tempnam(sys_get_temp_dir(), 'err_sf_proc'),
-            );
-            foreach ($this->files as $offset => $file) {
-                if (false === $file || false === $this->fileHandles[$offset] = fopen($file, 'rb')) {
-                    throw new RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
-                }
-            }
-        }
-
-        if (is_resource($input)) {
-            $this->input = $input;
-        } else {
-            $this->inputBuffer = $input;
-        }
-    }
-
-    public function __destruct()
-    {
-        $this->close();
-        $this->removeFiles();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDescriptors()
-    {
-        if ($this->disableOutput) {
-            $nullstream = fopen('NUL', 'c');
-
-            return array(
-                array('pipe', 'r'),
-                $nullstream,
-                $nullstream,
-            );
-        }
-
-        // We're not using pipe on Windows platform as it hangs (https://bugs.php.net/bug.php?id=51800)
-        // We're not using file handles as it can produce corrupted output https://bugs.php.net/bug.php?id=65650
-        // So we redirect output within the commandline and pass the nul device to the process
-        return array(
-            array('pipe', 'r'),
-            array('file', 'NUL', 'w'),
-            array('file', 'NUL', 'w'),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function readAndWrite($blocking, $close = false)
-    {
-        $this->write($blocking, $close);
-
-        $read = array();
-        $fh = $this->fileHandles;
-        foreach ($fh as $type => $fileHandle) {
-            if (0 !== fseek($fileHandle, $this->readBytes[$type])) {
-                continue;
-            }
-            $data = '';
-            $dataread = null;
-            while (!feof($fileHandle)) {
-                if (false !== $dataread = fread($fileHandle, self::CHUNK_SIZE)) {
-                    $data .= $dataread;
-                }
-            }
-            if (0 < $length = strlen($data)) {
-                $this->readBytes[$type] += $length;
-                $read[$type] = $data;
-            }
-
-            if (false === $dataread || (true === $close && feof($fileHandle) && '' === $data)) {
-                fclose($this->fileHandles[$type]);
-                unset($this->fileHandles[$type]);
-            }
-        }
-
-        return $read;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function areOpen()
-    {
-        return (bool) $this->pipes && (bool) $this->fileHandles;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        parent::close();
-        foreach ($this->fileHandles as $handle) {
-            fclose($handle);
-        }
-        $this->fileHandles = array();
-    }
-
-    /**
-     * Creates a new WindowsPipes instance.
-     *
-     * @param Process $process The process
-     * @param $input
-     *
-     * @return WindowsPipes
-     */
-    public static function create(Process $process, $input)
-    {
-        return new static($process->isOutputDisabled(), $input);
-    }
-
-    /**
-     * Removes temporary files.
-     */
-    private function removeFiles()
-    {
-        foreach ($this->files as $filename) {
-            if (file_exists($filename)) {
-                @unlink($filename);
-            }
-        }
-        $this->files = array();
-    }
-
-    /**
-     * Writes input to stdin.
-     *
-     * @param bool $blocking
-     * @param bool $close
-     */
-    private function write($blocking, $close)
-    {
-        if (empty($this->pipes)) {
-            return;
-        }
-
-        $this->unblock();
-
-        $r = null !== $this->input ? array('input' => $this->input) : null;
-        $w = isset($this->pipes[0]) ? array($this->pipes[0]) : null;
-        $e = null;
-
-        // let's have a look if something changed in streams
-        if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) {
-            // if a system call has been interrupted, forget about it, let's try again
-            // otherwise, an error occurred, let's reset pipes
-            if (!$this->hasSystemCallBeenInterrupted()) {
-                $this->pipes = array();
-            }
-
-            return;
-        }
-
-        // nothing has changed
-        if (0 === $n) {
-            return;
-        }
-
-        if (null !== $w && 0 < count($r)) {
-            $data = '';
-            while ($dataread = fread($r['input'], self::CHUNK_SIZE)) {
-                $data .= $dataread;
-            }
-
-            $this->inputBuffer .= $data;
-
-            if (false === $data || (true === $close && feof($r['input']) && '' === $data)) {
-                // no more data to read on input resource
-                // use an empty buffer in the next reads
-                $this->input = null;
-            }
-        }
-
-        if (null !== $w && 0 < count($w)) {
-            while (strlen($this->inputBuffer)) {
-                $written = fwrite($w[0], $this->inputBuffer, 2 << 18);
-                if ($written > 0) {
-                    $this->inputBuffer = (string) substr($this->inputBuffer, $written);
-                } else {
-                    break;
-                }
-            }
-        }
-
-        // no input to read on resource, buffer is empty and stdin still open
-        if ('' === $this->inputBuffer && null === $this->input && isset($this->pipes[0])) {
-            fclose($this->pipes[0]);
-            unset($this->pipes[0]);
-        }
-    }
-}
diff --git a/vendor/symfony/process/Process.php b/vendor/symfony/process/Process.php
deleted file mode 100644
index 699151f..0000000
--- a/vendor/symfony/process/Process.php
+++ /dev/null
@@ -1,1504 +0,0 @@
-<?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\Component\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-use Symfony\Component\Process\Exception\LogicException;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-use Symfony\Component\Process\Exception\ProcessTimedOutException;
-use Symfony\Component\Process\Exception\RuntimeException;
-use Symfony\Component\Process\Pipes\PipesInterface;
-use Symfony\Component\Process\Pipes\UnixPipes;
-use Symfony\Component\Process\Pipes\WindowsPipes;
-
-/**
- * Process is a thin wrapper around proc_* functions to easily
- * start independent PHP processes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Romain Neutron <imprec@gmail.com>
- */
-class Process
-{
-    const ERR = 'err';
-    const OUT = 'out';
-
-    const STATUS_READY = 'ready';
-    const STATUS_STARTED = 'started';
-    const STATUS_TERMINATED = 'terminated';
-
-    const STDIN = 0;
-    const STDOUT = 1;
-    const STDERR = 2;
-
-    // Timeout Precision in seconds.
-    const TIMEOUT_PRECISION = 0.2;
-
-    private $callback;
-    private $commandline;
-    private $cwd;
-    private $env;
-    private $input;
-    private $starttime;
-    private $lastOutputTime;
-    private $timeout;
-    private $idleTimeout;
-    private $options;
-    private $exitcode;
-    private $fallbackExitcode;
-    private $processInformation;
-    private $outputDisabled = false;
-    private $stdout;
-    private $stderr;
-    private $enhanceWindowsCompatibility = true;
-    private $enhanceSigchildCompatibility;
-    private $process;
-    private $status = self::STATUS_READY;
-    private $incrementalOutputOffset = 0;
-    private $incrementalErrorOutputOffset = 0;
-    private $tty;
-    private $pty;
-
-    private $useFileHandles = false;
-    /** @var PipesInterface */
-    private $processPipes;
-
-    private $latestSignal;
-
-    private static $sigchild;
-
-    /**
-     * Exit codes translation table.
-     *
-     * User-defined errors must use exit codes in the 64-113 range.
-     *
-     * @var array
-     */
-    public static $exitCodes = array(
-        0 => 'OK',
-        1 => 'General error',
-        2 => 'Misuse of shell builtins',
-
-        126 => 'Invoked command cannot execute',
-        127 => 'Command not found',
-        128 => 'Invalid exit argument',
-
-        // signals
-        129 => 'Hangup',
-        130 => 'Interrupt',
-        131 => 'Quit and dump core',
-        132 => 'Illegal instruction',
-        133 => 'Trace/breakpoint trap',
-        134 => 'Process aborted',
-        135 => 'Bus error: "access to undefined portion of memory object"',
-        136 => 'Floating point exception: "erroneous arithmetic operation"',
-        137 => 'Kill (terminate immediately)',
-        138 => 'User-defined 1',
-        139 => 'Segmentation violation',
-        140 => 'User-defined 2',
-        141 => 'Write to pipe with no one reading',
-        142 => 'Signal raised by alarm',
-        143 => 'Termination (request to terminate)',
-        // 144 - not defined
-        145 => 'Child process terminated, stopped (or continued*)',
-        146 => 'Continue if stopped',
-        147 => 'Stop executing temporarily',
-        148 => 'Terminal stop signal',
-        149 => 'Background process attempting to read from tty ("in")',
-        150 => 'Background process attempting to write to tty ("out")',
-        151 => 'Urgent data available on socket',
-        152 => 'CPU time limit exceeded',
-        153 => 'File size limit exceeded',
-        154 => 'Signal raised by timer counting virtual time: "virtual timer expired"',
-        155 => 'Profiling timer expired',
-        // 156 - not defined
-        157 => 'Pollable event',
-        // 158 - not defined
-        159 => 'Bad syscall',
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param string         $commandline The command line to run
-     * @param string|null    $cwd         The working directory or null to use the working dir of the current PHP process
-     * @param array|null     $env         The environment variables or null to use the same environment as the current PHP process
-     * @param string|null    $input       The input
-     * @param int|float|null $timeout     The timeout in seconds or null to disable
-     * @param array          $options     An array of options for proc_open
-     *
-     * @throws RuntimeException When proc_open is not installed
-     */
-    public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
-    {
-        if (!function_exists('proc_open')) {
-            throw new RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
-        }
-
-        $this->commandline = $commandline;
-        $this->cwd = $cwd;
-
-        // on Windows, if the cwd changed via chdir(), proc_open defaults to the dir where PHP was started
-        // on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
-        // @see : https://bugs.php.net/bug.php?id=51800
-        // @see : https://bugs.php.net/bug.php?id=50524
-        if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || '\\' === DIRECTORY_SEPARATOR)) {
-            $this->cwd = getcwd();
-        }
-        if (null !== $env) {
-            $this->setEnv($env);
-        }
-
-        $this->input = $input;
-        $this->setTimeout($timeout);
-        $this->useFileHandles = '\\' === DIRECTORY_SEPARATOR;
-        $this->pty = false;
-        $this->enhanceWindowsCompatibility = true;
-        $this->enhanceSigchildCompatibility = '\\' !== DIRECTORY_SEPARATOR && $this->isSigchildEnabled();
-        $this->options = array_replace(array('suppress_errors' => true, 'binary_pipes' => true), $options);
-    }
-
-    public function __destruct()
-    {
-        // stop() will check if we have a process running.
-        $this->stop();
-    }
-
-    public function __clone()
-    {
-        $this->resetProcessData();
-    }
-
-    /**
-     * Runs the process.
-     *
-     * The callback receives the type of output (out or err) and
-     * some bytes from the output in real-time. It allows to have feedback
-     * from the independent process during execution.
-     *
-     * The STDOUT and STDERR are also available after the process is finished
-     * via the getOutput() and getErrorOutput() methods.
-     *
-     * @param callable|null $callback A PHP callback to run whenever there is some
-     *                                output available on STDOUT or STDERR
-     *
-     * @return int The exit status code
-     *
-     * @throws RuntimeException When process can't be launched
-     * @throws RuntimeException When process stopped after receiving signal
-     * @throws LogicException   In case a callback is provided and output has been disabled
-     */
-    public function run($callback = null)
-    {
-        $this->start($callback);
-
-        return $this->wait();
-    }
-
-    /**
-     * Runs the process.
-     *
-     * This is identical to run() except that an exception is thrown if the process
-     * exits with a non-zero exit code.
-     *
-     * @param callable|null $callback
-     *
-     * @return self
-     *
-     * @throws RuntimeException       if PHP was compiled with --enable-sigchild and the enhanced sigchild compatibility mode is not enabled
-     * @throws ProcessFailedException if the process didn't terminate successfully
-     */
-    public function mustRun($callback = null)
-    {
-        if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
-        }
-
-        if (0 !== $this->run($callback)) {
-            throw new ProcessFailedException($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Starts the process and returns after writing the input to STDIN.
-     *
-     * This method blocks until all STDIN data is sent to the process then it
-     * returns while the process runs in the background.
-     *
-     * The termination of the process can be awaited with wait().
-     *
-     * The callback receives the type of output (out or err) and some bytes from
-     * the output in real-time while writing the standard input to the process.
-     * It allows to have feedback from the independent process during execution.
-     * If there is no callback passed, the wait() method can be called
-     * with true as a second parameter then the callback will get all data occurred
-     * in (and since) the start call.
-     *
-     * @param callable|null $callback A PHP callback to run whenever there is some
-     *                                output available on STDOUT or STDERR
-     *
-     * @throws RuntimeException When process can't be launched
-     * @throws RuntimeException When process is already running
-     * @throws LogicException   In case a callback is provided and output has been disabled
-     */
-    public function start($callback = null)
-    {
-        if ($this->isRunning()) {
-            throw new RuntimeException('Process is already running');
-        }
-        if ($this->outputDisabled && null !== $callback) {
-            throw new LogicException('Output has been disabled, enable it to allow the use of a callback.');
-        }
-
-        $this->resetProcessData();
-        $this->starttime = $this->lastOutputTime = microtime(true);
-        $this->callback = $this->buildCallback($callback);
-        $descriptors = $this->getDescriptors();
-
-        $commandline = $this->commandline;
-
-        if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
-            $commandline = 'cmd /V:ON /E:ON /D /C "('.$commandline.')';
-            foreach ($this->processPipes->getFiles() as $offset => $filename) {
-                $commandline .= ' '.$offset.'>'.ProcessUtils::escapeArgument($filename);
-            }
-            $commandline .= '"';
-
-            if (!isset($this->options['bypass_shell'])) {
-                $this->options['bypass_shell'] = true;
-            }
-        }
-
-        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
-
-        if (!is_resource($this->process)) {
-            throw new RuntimeException('Unable to launch a new process.');
-        }
-        $this->status = self::STATUS_STARTED;
-
-        if ($this->tty) {
-            return;
-        }
-
-        $this->updateStatus(false);
-        $this->checkTimeout();
-    }
-
-    /**
-     * Restarts the process.
-     *
-     * Be warned that the process is cloned before being started.
-     *
-     * @param callable|null $callback A PHP callback to run whenever there is some
-     *                                output available on STDOUT or STDERR
-     *
-     * @return Process The new process
-     *
-     * @throws RuntimeException When process can't be launched
-     * @throws RuntimeException When process is already running
-     *
-     * @see start()
-     */
-    public function restart($callback = null)
-    {
-        if ($this->isRunning()) {
-            throw new RuntimeException('Process is already running');
-        }
-
-        $process = clone $this;
-        $process->start($callback);
-
-        return $process;
-    }
-
-    /**
-     * Waits for the process to terminate.
-     *
-     * The callback receives the type of output (out or err) and some bytes
-     * from the output in real-time while writing the standard input to the process.
-     * It allows to have feedback from the independent process during execution.
-     *
-     * @param callable|null $callback A valid PHP callback
-     *
-     * @return int The exitcode of the process
-     *
-     * @throws RuntimeException When process timed out
-     * @throws RuntimeException When process stopped after receiving signal
-     * @throws LogicException   When process is not yet started
-     */
-    public function wait($callback = null)
-    {
-        $this->requireProcessIsStarted(__FUNCTION__);
-
-        $this->updateStatus(false);
-        if (null !== $callback) {
-            $this->callback = $this->buildCallback($callback);
-        }
-
-        do {
-            $this->checkTimeout();
-            $running = '\\' === DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
-            $close = '\\' !== DIRECTORY_SEPARATOR || !$running;
-            $this->readPipes(true, $close);
-        } while ($running);
-
-        while ($this->isRunning()) {
-            usleep(1000);
-        }
-
-        if ($this->processInformation['signaled'] && $this->processInformation['termsig'] !== $this->latestSignal) {
-            throw new RuntimeException(sprintf('The process has been signaled with signal "%s".', $this->processInformation['termsig']));
-        }
-
-        return $this->exitcode;
-    }
-
-    /**
-     * Returns the Pid (process identifier), if applicable.
-     *
-     * @return int|null The process id if running, null otherwise
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated
-     */
-    public function getPid()
-    {
-        if ($this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.');
-        }
-
-        $this->updateStatus(false);
-
-        return $this->isRunning() ? $this->processInformation['pid'] : null;
-    }
-
-    /**
-     * Sends a POSIX signal to the process.
-     *
-     * @param int $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
-     *
-     * @return Process
-     *
-     * @throws LogicException   In case the process is not running
-     * @throws RuntimeException In case --enable-sigchild is activated
-     * @throws RuntimeException In case of failure
-     */
-    public function signal($signal)
-    {
-        $this->doSignal($signal, true);
-
-        return $this;
-    }
-
-    /**
-     * Disables fetching output and error output from the underlying process.
-     *
-     * @return Process
-     *
-     * @throws RuntimeException In case the process is already running
-     * @throws LogicException   if an idle timeout is set
-     */
-    public function disableOutput()
-    {
-        if ($this->isRunning()) {
-            throw new RuntimeException('Disabling output while the process is running is not possible.');
-        }
-        if (null !== $this->idleTimeout) {
-            throw new LogicException('Output can not be disabled while an idle timeout is set.');
-        }
-
-        $this->outputDisabled = true;
-
-        return $this;
-    }
-
-    /**
-     * Enables fetching output and error output from the underlying process.
-     *
-     * @return Process
-     *
-     * @throws RuntimeException In case the process is already running
-     */
-    public function enableOutput()
-    {
-        if ($this->isRunning()) {
-            throw new RuntimeException('Enabling output while the process is running is not possible.');
-        }
-
-        $this->outputDisabled = false;
-
-        return $this;
-    }
-
-    /**
-     * Returns true in case the output is disabled, false otherwise.
-     *
-     * @return bool
-     */
-    public function isOutputDisabled()
-    {
-        return $this->outputDisabled;
-    }
-
-    /**
-     * Returns the current output of the process (STDOUT).
-     *
-     * @return string The process output
-     *
-     * @throws LogicException in case the output has been disabled
-     * @throws LogicException In case the process is not started
-     */
-    public function getOutput()
-    {
-        if ($this->outputDisabled) {
-            throw new LogicException('Output has been disabled.');
-        }
-
-        $this->requireProcessIsStarted(__FUNCTION__);
-
-        $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
-
-        return $this->stdout;
-    }
-
-    /**
-     * Returns the output incrementally.
-     *
-     * In comparison with the getOutput method which always return the whole
-     * output, this one returns the new output since the last call.
-     *
-     * @throws LogicException in case the output has been disabled
-     * @throws LogicException In case the process is not started
-     *
-     * @return string The process output since the last call
-     */
-    public function getIncrementalOutput()
-    {
-        $this->requireProcessIsStarted(__FUNCTION__);
-
-        $data = $this->getOutput();
-
-        $latest = substr($data, $this->incrementalOutputOffset);
-
-        if (false === $latest) {
-            return '';
-        }
-
-        $this->incrementalOutputOffset = strlen($data);
-
-        return $latest;
-    }
-
-    /**
-     * Clears the process output.
-     *
-     * @return Process
-     */
-    public function clearOutput()
-    {
-        $this->stdout = '';
-        $this->incrementalOutputOffset = 0;
-
-        return $this;
-    }
-
-    /**
-     * Returns the current error output of the process (STDERR).
-     *
-     * @return string The process error output
-     *
-     * @throws LogicException in case the output has been disabled
-     * @throws LogicException In case the process is not started
-     */
-    public function getErrorOutput()
-    {
-        if ($this->outputDisabled) {
-            throw new LogicException('Output has been disabled.');
-        }
-
-        $this->requireProcessIsStarted(__FUNCTION__);
-
-        $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
-
-        return $this->stderr;
-    }
-
-    /**
-     * Returns the errorOutput incrementally.
-     *
-     * In comparison with the getErrorOutput method which always return the
-     * whole error output, this one returns the new error output since the last
-     * call.
-     *
-     * @throws LogicException in case the output has been disabled
-     * @throws LogicException In case the process is not started
-     *
-     * @return string The process error output since the last call
-     */
-    public function getIncrementalErrorOutput()
-    {
-        $this->requireProcessIsStarted(__FUNCTION__);
-
-        $data = $this->getErrorOutput();
-
-        $latest = substr($data, $this->incrementalErrorOutputOffset);
-
-        if (false === $latest) {
-            return '';
-        }
-
-        $this->incrementalErrorOutputOffset = strlen($data);
-
-        return $latest;
-    }
-
-    /**
-     * Clears the process output.
-     *
-     * @return Process
-     */
-    public function clearErrorOutput()
-    {
-        $this->stderr = '';
-        $this->incrementalErrorOutputOffset = 0;
-
-        return $this;
-    }
-
-    /**
-     * Returns the exit code returned by the process.
-     *
-     * @return null|int The exit status code, null if the Process is not terminated
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
-     */
-    public function getExitCode()
-    {
-        if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
-        }
-
-        $this->updateStatus(false);
-
-        return $this->exitcode;
-    }
-
-    /**
-     * Returns a string representation for the exit code returned by the process.
-     *
-     * This method relies on the Unix exit code status standardization
-     * and might not be relevant for other operating systems.
-     *
-     * @return null|string A string representation for the exit status code, null if the Process is not terminated.
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated and the sigchild compatibility mode is disabled
-     *
-     * @see http://tldp.org/LDP/abs/html/exitcodes.html
-     * @see http://en.wikipedia.org/wiki/Unix_signal
-     */
-    public function getExitCodeText()
-    {
-        if (null === $exitcode = $this->getExitCode()) {
-            return;
-        }
-
-        return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error';
-    }
-
-    /**
-     * Checks if the process ended successfully.
-     *
-     * @return bool true if the process ended successfully, false otherwise
-     */
-    public function isSuccessful()
-    {
-        return 0 === $this->getExitCode();
-    }
-
-    /**
-     * Returns true if the child process has been terminated by an uncaught signal.
-     *
-     * It always returns false on Windows.
-     *
-     * @return bool
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated
-     * @throws LogicException   In case the process is not terminated
-     */
-    public function hasBeenSignaled()
-    {
-        $this->requireProcessIsTerminated(__FUNCTION__);
-
-        if ($this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
-        }
-
-        $this->updateStatus(false);
-
-        return $this->processInformation['signaled'];
-    }
-
-    /**
-     * Returns the number of the signal that caused the child process to terminate its execution.
-     *
-     * It is only meaningful if hasBeenSignaled() returns true.
-     *
-     * @return int
-     *
-     * @throws RuntimeException In case --enable-sigchild is activated
-     * @throws LogicException   In case the process is not terminated
-     */
-    public function getTermSignal()
-    {
-        $this->requireProcessIsTerminated(__FUNCTION__);
-
-        if ($this->isSigchildEnabled()) {
-            throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
-        }
-
-        $this->updateStatus(false);
-
-        return $this->processInformation['termsig'];
-    }
-
-    /**
-     * Returns true if the child process has been stopped by a signal.
-     *
-     * It always returns false on Windows.
-     *
-     * @return bool
-     *
-     * @throws LogicException In case the process is not terminated
-     */
-    public function hasBeenStopped()
-    {
-        $this->requireProcessIsTerminated(__FUNCTION__);
-
-        $this->updateStatus(false);
-
-        return $this->processInformation['stopped'];
-    }
-
-    /**
-     * Returns the number of the signal that caused the child process to stop its execution.
-     *
-     * It is only meaningful if hasBeenStopped() returns true.
-     *
-     * @return int
-     *
-     * @throws LogicException In case the process is not terminated
-     */
-    public function getStopSignal()
-    {
-        $this->requireProcessIsTerminated(__FUNCTION__);
-
-        $this->updateStatus(false);
-
-        return $this->processInformation['stopsig'];
-    }
-
-    /**
-     * Checks if the process is currently running.
-     *
-     * @return bool true if the process is currently running, false otherwise
-     */
-    public function isRunning()
-    {
-        if (self::STATUS_STARTED !== $this->status) {
-            return false;
-        }
-
-        $this->updateStatus(false);
-
-        return $this->processInformation['running'];
-    }
-
-    /**
-     * Checks if the process has been started with no regard to the current state.
-     *
-     * @return bool true if status is ready, false otherwise
-     */
-    public function isStarted()
-    {
-        return $this->status != self::STATUS_READY;
-    }
-
-    /**
-     * Checks if the process is terminated.
-     *
-     * @return bool true if process is terminated, false otherwise
-     */
-    public function isTerminated()
-    {
-        $this->updateStatus(false);
-
-        return $this->status == self::STATUS_TERMINATED;
-    }
-
-    /**
-     * Gets the process status.
-     *
-     * The status is one of: ready, started, terminated.
-     *
-     * @return string The current process status
-     */
-    public function getStatus()
-    {
-        $this->updateStatus(false);
-
-        return $this->status;
-    }
-
-    /**
-     * Stops the process.
-     *
-     * @param int|float $timeout The timeout in seconds
-     * @param int       $signal  A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL
-     *
-     * @return int The exit-code of the process
-     *
-     * @throws RuntimeException if the process got signaled
-     */
-    public function stop($timeout = 10, $signal = null)
-    {
-        $timeoutMicro = microtime(true) + $timeout;
-        if ($this->isRunning()) {
-            if ('\\' === DIRECTORY_SEPARATOR && !$this->isSigchildEnabled()) {
-                exec(sprintf('taskkill /F /T /PID %d 2>&1', $this->getPid()), $output, $exitCode);
-                if ($exitCode > 0) {
-                    throw new RuntimeException('Unable to kill the process');
-                }
-            }
-            // given `SIGTERM` may not be defined and that `proc_terminate` uses the constant value and not the constant itself, we use the same here
-            $this->doSignal(15, false);
-            do {
-                usleep(1000);
-            } while ($this->isRunning() && microtime(true) < $timeoutMicro);
-
-            if ($this->isRunning() && !$this->isSigchildEnabled()) {
-                if (null !== $signal || defined('SIGKILL')) {
-                    // avoid exception here :
-                    // process is supposed to be running, but it might have stop
-                    // just after this line.
-                    // in any case, let's silently discard the error, we can not do anything
-                    $this->doSignal($signal ?: SIGKILL, false);
-                }
-            }
-        }
-
-        $this->updateStatus(false);
-        if ($this->processInformation['running']) {
-            $this->close();
-        }
-
-        return $this->exitcode;
-    }
-
-    /**
-     * Adds a line to the STDOUT stream.
-     *
-     * @param string $line The line to append
-     */
-    public function addOutput($line)
-    {
-        $this->lastOutputTime = microtime(true);
-        $this->stdout .= $line;
-    }
-
-    /**
-     * Adds a line to the STDERR stream.
-     *
-     * @param string $line The line to append
-     */
-    public function addErrorOutput($line)
-    {
-        $this->lastOutputTime = microtime(true);
-        $this->stderr .= $line;
-    }
-
-    /**
-     * Gets the command line to be executed.
-     *
-     * @return string The command to execute
-     */
-    public function getCommandLine()
-    {
-        return $this->commandline;
-    }
-
-    /**
-     * Sets the command line to be executed.
-     *
-     * @param string $commandline The command to execute
-     *
-     * @return self The current Process instance
-     */
-    public function setCommandLine($commandline)
-    {
-        $this->commandline = $commandline;
-
-        return $this;
-    }
-
-    /**
-     * Gets the process timeout (max. runtime).
-     *
-     * @return float|null The timeout in seconds or null if it's disabled
-     */
-    public function getTimeout()
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * Gets the process idle timeout (max. time since last output).
-     *
-     * @return float|null The timeout in seconds or null if it's disabled
-     */
-    public function getIdleTimeout()
-    {
-        return $this->idleTimeout;
-    }
-
-    /**
-     * Sets the process timeout (max. runtime).
-     *
-     * To disable the timeout, set this value to null.
-     *
-     * @param int|float|null $timeout The timeout in seconds
-     *
-     * @return self The current Process instance
-     *
-     * @throws InvalidArgumentException if the timeout is negative
-     */
-    public function setTimeout($timeout)
-    {
-        $this->timeout = $this->validateTimeout($timeout);
-
-        return $this;
-    }
-
-    /**
-     * Sets the process idle timeout (max. time since last output).
-     *
-     * To disable the timeout, set this value to null.
-     *
-     * @param int|float|null $timeout The timeout in seconds
-     *
-     * @return self The current Process instance.
-     *
-     * @throws LogicException           if the output is disabled
-     * @throws InvalidArgumentException if the timeout is negative
-     */
-    public function setIdleTimeout($timeout)
-    {
-        if (null !== $timeout && $this->outputDisabled) {
-            throw new LogicException('Idle timeout can not be set while the output is disabled.');
-        }
-
-        $this->idleTimeout = $this->validateTimeout($timeout);
-
-        return $this;
-    }
-
-    /**
-     * Enables or disables the TTY mode.
-     *
-     * @param bool $tty True to enabled and false to disable
-     *
-     * @return self The current Process instance
-     *
-     * @throws RuntimeException In case the TTY mode is not supported
-     */
-    public function setTty($tty)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR && $tty) {
-            throw new RuntimeException('TTY mode is not supported on Windows platform.');
-        }
-        if ($tty && (!file_exists('/dev/tty') || !is_readable('/dev/tty'))) {
-            throw new RuntimeException('TTY mode requires /dev/tty to be readable.');
-        }
-
-        $this->tty = (bool) $tty;
-
-        return $this;
-    }
-
-    /**
-     * Checks if the TTY mode is enabled.
-     *
-     * @return bool true if the TTY mode is enabled, false otherwise
-     */
-    public function isTty()
-    {
-        return $this->tty;
-    }
-
-    /**
-     * Sets PTY mode.
-     *
-     * @param bool $bool
-     *
-     * @return self
-     */
-    public function setPty($bool)
-    {
-        $this->pty = (bool) $bool;
-
-        return $this;
-    }
-
-    /**
-     * Returns PTY state.
-     *
-     * @return bool
-     */
-    public function isPty()
-    {
-        return $this->pty;
-    }
-
-    /**
-     * Gets the working directory.
-     *
-     * @return string|null The current working directory or null on failure
-     */
-    public function getWorkingDirectory()
-    {
-        if (null === $this->cwd) {
-            // getcwd() will return false if any one of the parent directories does not have
-            // the readable or search mode set, even if the current directory does
-            return getcwd() ?: null;
-        }
-
-        return $this->cwd;
-    }
-
-    /**
-     * Sets the current working directory.
-     *
-     * @param string $cwd The new working directory
-     *
-     * @return self The current Process instance
-     */
-    public function setWorkingDirectory($cwd)
-    {
-        $this->cwd = $cwd;
-
-        return $this;
-    }
-
-    /**
-     * Gets the environment variables.
-     *
-     * @return array The current environment variables
-     */
-    public function getEnv()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Sets the environment variables.
-     *
-     * An environment variable value should be a string.
-     * If it is an array, the variable is ignored.
-     *
-     * That happens in PHP when 'argv' is registered into
-     * the $_ENV array for instance.
-     *
-     * @param array $env The new environment variables
-     *
-     * @return self The current Process instance
-     */
-    public function setEnv(array $env)
-    {
-        // Process can not handle env values that are arrays
-        $env = array_filter($env, function ($value) {
-            return !is_array($value);
-        });
-
-        $this->env = array();
-        foreach ($env as $key => $value) {
-            $this->env[$key] = (string) $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Gets the contents of STDIN.
-     *
-     * @return string|null The current contents
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use setInput() instead.
-     *             This method is deprecated in favor of getInput.
-     */
-    public function getStdin()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getInput() method instead.', E_USER_DEPRECATED);
-
-        return $this->getInput();
-    }
-
-    /**
-     * Gets the Process input.
-     *
-     * @return null|string The Process input
-     */
-    public function getInput()
-    {
-        return $this->input;
-    }
-
-    /**
-     * Sets the contents of STDIN.
-     *
-     * @param string|null $stdin The new contents
-     *
-     * @return self The current Process instance
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use setInput() instead.
-     *
-     * @throws LogicException           In case the process is running
-     * @throws InvalidArgumentException In case the argument is invalid
-     */
-    public function setStdin($stdin)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the setInput() method instead.', E_USER_DEPRECATED);
-
-        return $this->setInput($stdin);
-    }
-
-    /**
-     * Sets the input.
-     *
-     * This content will be passed to the underlying process standard input.
-     *
-     * @param mixed $input The content
-     *
-     * @return self The current Process instance
-     *
-     * @throws LogicException In case the process is running
-     *
-     * Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
-     */
-    public function setInput($input)
-    {
-        if ($this->isRunning()) {
-            throw new LogicException('Input can not be set while the process is running.');
-        }
-
-        $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
-
-        return $this;
-    }
-
-    /**
-     * Gets the options for proc_open.
-     *
-     * @return array The current options
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Sets the options for proc_open.
-     *
-     * @param array $options The new options
-     *
-     * @return self The current Process instance
-     */
-    public function setOptions(array $options)
-    {
-        $this->options = $options;
-
-        return $this;
-    }
-
-    /**
-     * Gets whether or not Windows compatibility is enabled.
-     *
-     * This is true by default.
-     *
-     * @return bool
-     */
-    public function getEnhanceWindowsCompatibility()
-    {
-        return $this->enhanceWindowsCompatibility;
-    }
-
-    /**
-     * Sets whether or not Windows compatibility is enabled.
-     *
-     * @param bool $enhance
-     *
-     * @return self The current Process instance
-     */
-    public function setEnhanceWindowsCompatibility($enhance)
-    {
-        $this->enhanceWindowsCompatibility = (bool) $enhance;
-
-        return $this;
-    }
-
-    /**
-     * Returns whether sigchild compatibility mode is activated or not.
-     *
-     * @return bool
-     */
-    public function getEnhanceSigchildCompatibility()
-    {
-        return $this->enhanceSigchildCompatibility;
-    }
-
-    /**
-     * Activates sigchild compatibility mode.
-     *
-     * Sigchild compatibility mode is required to get the exit code and
-     * determine the success of a process when PHP has been compiled with
-     * the --enable-sigchild option
-     *
-     * @param bool $enhance
-     *
-     * @return self The current Process instance
-     */
-    public function setEnhanceSigchildCompatibility($enhance)
-    {
-        $this->enhanceSigchildCompatibility = (bool) $enhance;
-
-        return $this;
-    }
-
-    /**
-     * Performs a check between the timeout definition and the time the process started.
-     *
-     * In case you run a background process (with the start method), you should
-     * trigger this method regularly to ensure the process timeout
-     *
-     * @throws ProcessTimedOutException In case the timeout was reached
-     */
-    public function checkTimeout()
-    {
-        if ($this->status !== self::STATUS_STARTED) {
-            return;
-        }
-
-        if (null !== $this->timeout && $this->timeout < microtime(true) - $this->starttime) {
-            $this->stop(0);
-
-            throw new ProcessTimedOutException($this, ProcessTimedOutException::TYPE_GENERAL);
-        }
-
-        if (null !== $this->idleTimeout && $this->idleTimeout < microtime(true) - $this->lastOutputTime) {
-            $this->stop(0);
-
-            throw new ProcessTimedOutException($this, ProcessTimedOutException::TYPE_IDLE);
-        }
-    }
-
-    /**
-     * Returns whether PTY is supported on the current operating system.
-     *
-     * @return bool
-     */
-    public static function isPtySupported()
-    {
-        static $result;
-
-        if (null !== $result) {
-            return $result;
-        }
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            return $result = false;
-        }
-
-        $proc = @proc_open('echo 1', array(array('pty'), array('pty'), array('pty')), $pipes);
-        if (is_resource($proc)) {
-            proc_close($proc);
-
-            return $result = true;
-        }
-
-        return $result = false;
-    }
-
-    /**
-     * Creates the descriptors needed by the proc_open.
-     *
-     * @return array
-     */
-    private function getDescriptors()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->processPipes = WindowsPipes::create($this, $this->input);
-        } else {
-            $this->processPipes = UnixPipes::create($this, $this->input);
-        }
-        $descriptors = $this->processPipes->getDescriptors($this->outputDisabled);
-
-        if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
-            $descriptors = array_merge($descriptors, array(array('pipe', 'w')));
-
-            $this->commandline = '('.$this->commandline.') 3>/dev/null; code=$?; echo $code >&3; exit $code';
-        }
-
-        return $descriptors;
-    }
-
-    /**
-     * Builds up the callback used by wait().
-     *
-     * The callbacks adds all occurred output to the specific buffer and calls
-     * the user callback (if present) with the received output.
-     *
-     * @param callable|null $callback The user defined PHP callback
-     *
-     * @return \Closure A PHP closure
-     */
-    protected function buildCallback($callback)
-    {
-        $that = $this;
-        $out = self::OUT;
-        $callback = function ($type, $data) use ($that, $callback, $out) {
-            if ($out == $type) {
-                $that->addOutput($data);
-            } else {
-                $that->addErrorOutput($data);
-            }
-
-            if (null !== $callback) {
-                call_user_func($callback, $type, $data);
-            }
-        };
-
-        return $callback;
-    }
-
-    /**
-     * Updates the status of the process, reads pipes.
-     *
-     * @param bool $blocking Whether to use a blocking read call.
-     */
-    protected function updateStatus($blocking)
-    {
-        if (self::STATUS_STARTED !== $this->status) {
-            return;
-        }
-
-        $this->processInformation = proc_get_status($this->process);
-        $this->captureExitCode();
-
-        $this->readPipes($blocking, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
-
-        if (!$this->processInformation['running']) {
-            $this->close();
-        }
-    }
-
-    /**
-     * Returns whether PHP has been compiled with the '--enable-sigchild' option or not.
-     *
-     * @return bool
-     */
-    protected function isSigchildEnabled()
-    {
-        if (null !== self::$sigchild) {
-            return self::$sigchild;
-        }
-
-        if (!function_exists('phpinfo')) {
-            return self::$sigchild = false;
-        }
-
-        ob_start();
-        phpinfo(INFO_GENERAL);
-
-        return self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
-    }
-
-    /**
-     * Validates and returns the filtered timeout.
-     *
-     * @param int|float|null $timeout
-     *
-     * @return float|null
-     *
-     * @throws InvalidArgumentException if the given timeout is a negative number
-     */
-    private function validateTimeout($timeout)
-    {
-        $timeout = (float) $timeout;
-
-        if (0.0 === $timeout) {
-            $timeout = null;
-        } elseif ($timeout < 0) {
-            throw new InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
-        }
-
-        return $timeout;
-    }
-
-    /**
-     * Reads pipes, executes callback.
-     *
-     * @param bool $blocking Whether to use blocking calls or not.
-     * @param bool $close    Whether to close file handles or not.
-     */
-    private function readPipes($blocking, $close)
-    {
-        $result = $this->processPipes->readAndWrite($blocking, $close);
-
-        $callback = $this->callback;
-        foreach ($result as $type => $data) {
-            if (3 == $type) {
-                $this->fallbackExitcode = (int) $data;
-            } else {
-                $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
-            }
-        }
-    }
-
-    /**
-     * Captures the exitcode if mentioned in the process information.
-     */
-    private function captureExitCode()
-    {
-        if (isset($this->processInformation['exitcode']) && -1 != $this->processInformation['exitcode']) {
-            $this->exitcode = $this->processInformation['exitcode'];
-        }
-    }
-
-    /**
-     * Closes process resource, closes file handles, sets the exitcode.
-     *
-     * @return int The exitcode
-     */
-    private function close()
-    {
-        $this->processPipes->close();
-        if (is_resource($this->process)) {
-            $exitcode = proc_close($this->process);
-        } else {
-            $exitcode = -1;
-        }
-
-        $this->exitcode = -1 !== $exitcode ? $exitcode : (null !== $this->exitcode ? $this->exitcode : -1);
-        $this->status = self::STATUS_TERMINATED;
-
-        if (-1 === $this->exitcode && null !== $this->fallbackExitcode) {
-            $this->exitcode = $this->fallbackExitcode;
-        } elseif (-1 === $this->exitcode && $this->processInformation['signaled'] && 0 < $this->processInformation['termsig']) {
-            // if process has been signaled, no exitcode but a valid termsig, apply Unix convention
-            $this->exitcode = 128 + $this->processInformation['termsig'];
-        }
-
-        return $this->exitcode;
-    }
-
-    /**
-     * Resets data related to the latest run of the process.
-     */
-    private function resetProcessData()
-    {
-        $this->starttime = null;
-        $this->callback = null;
-        $this->exitcode = null;
-        $this->fallbackExitcode = null;
-        $this->processInformation = null;
-        $this->stdout = null;
-        $this->stderr = null;
-        $this->process = null;
-        $this->latestSignal = null;
-        $this->status = self::STATUS_READY;
-        $this->incrementalOutputOffset = 0;
-        $this->incrementalErrorOutputOffset = 0;
-    }
-
-    /**
-     * Sends a POSIX signal to the process.
-     *
-     * @param int  $signal         A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
-     * @param bool $throwException Whether to throw exception in case signal failed
-     *
-     * @return bool True if the signal was sent successfully, false otherwise
-     *
-     * @throws LogicException   In case the process is not running
-     * @throws RuntimeException In case --enable-sigchild is activated
-     * @throws RuntimeException In case of failure
-     */
-    private function doSignal($signal, $throwException)
-    {
-        if (!$this->isRunning()) {
-            if ($throwException) {
-                throw new LogicException('Can not send signal on a non running process.');
-            }
-
-            return false;
-        }
-
-        if ($this->isSigchildEnabled()) {
-            if ($throwException) {
-                throw new RuntimeException('This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
-            }
-
-            return false;
-        }
-
-        if (true !== @proc_terminate($this->process, $signal)) {
-            if ($throwException) {
-                throw new RuntimeException(sprintf('Error while sending signal `%s`.', $signal));
-            }
-
-            return false;
-        }
-
-        $this->latestSignal = $signal;
-
-        return true;
-    }
-
-    /**
-     * Ensures the process is running or terminated, throws a LogicException if the process has a not started.
-     *
-     * @param string $functionName The function name that was called.
-     *
-     * @throws LogicException If the process has not run.
-     */
-    private function requireProcessIsStarted($functionName)
-    {
-        if (!$this->isStarted()) {
-            throw new LogicException(sprintf('Process must be started before calling %s.', $functionName));
-        }
-    }
-
-    /**
-     * Ensures the process is terminated, throws a LogicException if the process has a status different than `terminated`.
-     *
-     * @param string $functionName The function name that was called.
-     *
-     * @throws LogicException If the process is not yet terminated.
-     */
-    private function requireProcessIsTerminated($functionName)
-    {
-        if (!$this->isTerminated()) {
-            throw new LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
-        }
-    }
-}
diff --git a/vendor/symfony/process/ProcessBuilder.php b/vendor/symfony/process/ProcessBuilder.php
deleted file mode 100644
index a782fd6..0000000
--- a/vendor/symfony/process/ProcessBuilder.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?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\Component\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-use Symfony\Component\Process\Exception\LogicException;
-
-/**
- * Process builder.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class ProcessBuilder
-{
-    private $arguments;
-    private $cwd;
-    private $env = array();
-    private $input;
-    private $timeout = 60;
-    private $options = array();
-    private $inheritEnv = true;
-    private $prefix = array();
-    private $outputDisabled = false;
-
-    /**
-     * Constructor.
-     *
-     * @param string[] $arguments An array of arguments
-     */
-    public function __construct(array $arguments = array())
-    {
-        $this->arguments = $arguments;
-    }
-
-    /**
-     * Creates a process builder instance.
-     *
-     * @param string[] $arguments An array of arguments
-     *
-     * @return ProcessBuilder
-     */
-    public static function create(array $arguments = array())
-    {
-        return new static($arguments);
-    }
-
-    /**
-     * Adds an unescaped argument to the command string.
-     *
-     * @param string $argument A command argument
-     *
-     * @return ProcessBuilder
-     */
-    public function add($argument)
-    {
-        $this->arguments[] = $argument;
-
-        return $this;
-    }
-
-    /**
-     * Adds a prefix to the command string.
-     *
-     * The prefix is preserved when resetting arguments.
-     *
-     * @param string|array $prefix A command prefix or an array of command prefixes
-     *
-     * @return ProcessBuilder
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = is_array($prefix) ? $prefix : array($prefix);
-
-        return $this;
-    }
-
-    /**
-     * Sets the arguments of the process.
-     *
-     * Arguments must not be escaped.
-     * Previous arguments are removed.
-     *
-     * @param string[] $arguments
-     *
-     * @return ProcessBuilder
-     */
-    public function setArguments(array $arguments)
-    {
-        $this->arguments = $arguments;
-
-        return $this;
-    }
-
-    /**
-     * Sets the working directory.
-     *
-     * @param null|string $cwd The working directory
-     *
-     * @return ProcessBuilder
-     */
-    public function setWorkingDirectory($cwd)
-    {
-        $this->cwd = $cwd;
-
-        return $this;
-    }
-
-    /**
-     * Sets whether environment variables will be inherited or not.
-     *
-     * @param bool $inheritEnv
-     *
-     * @return ProcessBuilder
-     */
-    public function inheritEnvironmentVariables($inheritEnv = true)
-    {
-        $this->inheritEnv = $inheritEnv;
-
-        return $this;
-    }
-
-    /**
-     * Sets an environment variable.
-     *
-     * Setting a variable overrides its previous value. Use `null` to unset a
-     * defined environment variable.
-     *
-     * @param string      $name  The variable name
-     * @param null|string $value The variable value
-     *
-     * @return ProcessBuilder
-     */
-    public function setEnv($name, $value)
-    {
-        $this->env[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Adds a set of environment variables.
-     *
-     * Already existing environment variables with the same name will be
-     * overridden by the new values passed to this method. Pass `null` to unset
-     * a variable.
-     *
-     * @param array $variables The variables
-     *
-     * @return ProcessBuilder
-     */
-    public function addEnvironmentVariables(array $variables)
-    {
-        $this->env = array_replace($this->env, $variables);
-
-        return $this;
-    }
-
-    /**
-     * Sets the input of the process.
-     *
-     * @param mixed $input The input as a string
-     *
-     * @return ProcessBuilder
-     *
-     * @throws InvalidArgumentException In case the argument is invalid
-     *
-     * Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
-     */
-    public function setInput($input)
-    {
-        $this->input = ProcessUtils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
-
-        return $this;
-    }
-
-    /**
-     * Sets the process timeout.
-     *
-     * To disable the timeout, set this value to null.
-     *
-     * @param float|null $timeout
-     *
-     * @return ProcessBuilder
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setTimeout($timeout)
-    {
-        if (null === $timeout) {
-            $this->timeout = null;
-
-            return $this;
-        }
-
-        $timeout = (float) $timeout;
-
-        if ($timeout < 0) {
-            throw new InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
-        }
-
-        $this->timeout = $timeout;
-
-        return $this;
-    }
-
-    /**
-     * Adds a proc_open option.
-     *
-     * @param string $name  The option name
-     * @param string $value The option value
-     *
-     * @return ProcessBuilder
-     */
-    public function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Disables fetching output and error output from the underlying process.
-     *
-     * @return ProcessBuilder
-     */
-    public function disableOutput()
-    {
-        $this->outputDisabled = true;
-
-        return $this;
-    }
-
-    /**
-     * Enables fetching output and error output from the underlying process.
-     *
-     * @return ProcessBuilder
-     */
-    public function enableOutput()
-    {
-        $this->outputDisabled = false;
-
-        return $this;
-    }
-
-    /**
-     * Creates a Process instance and returns it.
-     *
-     * @return Process
-     *
-     * @throws LogicException In case no arguments have been provided
-     */
-    public function getProcess()
-    {
-        if (0 === count($this->prefix) && 0 === count($this->arguments)) {
-            throw new LogicException('You must add() command arguments before calling getProcess().');
-        }
-
-        $options = $this->options;
-
-        $arguments = array_merge($this->prefix, $this->arguments);
-        $script = implode(' ', array_map(array(__NAMESPACE__.'\\ProcessUtils', 'escapeArgument'), $arguments));
-
-        if ($this->inheritEnv) {
-            // include $_ENV for BC purposes
-            $env = array_replace($_ENV, $_SERVER, $this->env);
-        } else {
-            $env = $this->env;
-        }
-
-        $process = new Process($script, $this->cwd, $env, $this->input, $this->timeout, $options);
-
-        if ($this->outputDisabled) {
-            $process->disableOutput();
-        }
-
-        return $process;
-    }
-}
diff --git a/vendor/symfony/process/ProcessUtils.php b/vendor/symfony/process/ProcessUtils.php
deleted file mode 100644
index 4f30b63..0000000
--- a/vendor/symfony/process/ProcessUtils.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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\Component\Process;
-
-use Symfony\Component\Process\Exception\InvalidArgumentException;
-
-/**
- * ProcessUtils is a bunch of utility methods.
- *
- * This class contains static methods only and is not meant to be instantiated.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class ProcessUtils
-{
-    /**
-     * This class should not be instantiated.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Escapes a string to be used as a shell argument.
-     *
-     * @param string $argument The argument that will be escaped
-     *
-     * @return string The escaped argument
-     */
-    public static function escapeArgument($argument)
-    {
-        //Fix for PHP bug #43784 escapeshellarg removes % from given string
-        //Fix for PHP bug #49446 escapeshellarg doesn't work on Windows
-        //@see https://bugs.php.net/bug.php?id=43784
-        //@see https://bugs.php.net/bug.php?id=49446
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            if ('' === $argument) {
-                return escapeshellarg($argument);
-            }
-
-            $escapedArgument = '';
-            $quote = false;
-            foreach (preg_split('/(")/', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
-                if ('"' === $part) {
-                    $escapedArgument .= '\\"';
-                } elseif (self::isSurroundedBy($part, '%')) {
-                    // Avoid environment variable expansion
-                    $escapedArgument .= '^%"'.substr($part, 1, -1).'"^%';
-                } else {
-                    // escape trailing backslash
-                    if ('\\' === substr($part, -1)) {
-                        $part .= '\\';
-                    }
-                    $quote = true;
-                    $escapedArgument .= $part;
-                }
-            }
-            if ($quote) {
-                $escapedArgument = '"'.$escapedArgument.'"';
-            }
-
-            return $escapedArgument;
-        }
-
-        return escapeshellarg($argument);
-    }
-
-    /**
-     * Validates and normalizes a Process input.
-     *
-     * @param string $caller The name of method call that validates the input
-     * @param mixed  $input  The input to validate
-     *
-     * @return string The validated input
-     *
-     * @throws InvalidArgumentException In case the input is not valid
-     *
-     * Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.
-     */
-    public static function validateInput($caller, $input)
-    {
-        if (null !== $input) {
-            if (is_resource($input)) {
-                return $input;
-            }
-            if (is_scalar($input)) {
-                return (string) $input;
-            }
-            // deprecated as of Symfony 2.5, to be removed in 3.0
-            if (is_object($input) && method_exists($input, '__toString')) {
-                @trigger_error('Passing an object as an input is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-                return (string) $input;
-            }
-
-            throw new InvalidArgumentException(sprintf('%s only accepts strings or stream resources.', $caller));
-        }
-
-        return $input;
-    }
-
-    private static function isSurroundedBy($arg, $char)
-    {
-        return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
-    }
-}
diff --git a/vendor/symfony/process/README.md b/vendor/symfony/process/README.md
deleted file mode 100644
index 7222fe8..0000000
--- a/vendor/symfony/process/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-Process Component
-=================
-
-Process executes commands in sub-processes.
-
-In this example, we run a simple directory listing and get the result back:
-
-```php
-use Symfony\Component\Process\Process;
-use Symfony\Component\Process\Exception\ProcessFailedException;
-
-$process = new Process('ls -lsa');
-$process->setTimeout(3600);
-$process->run();
-if (!$process->isSuccessful()) {
-    throw new ProcessFailedException($process);
-}
-
-print $process->getOutput();
-```
-
-You can think that this is easy to achieve with plain PHP but it's not especially
-if you want to take care of the subtle differences between the different platforms.
-
-You can simplify the code by using `mustRun()` instead of `run()`, which will
-throw a `ProcessFailedException` automatically in case of a problem:
-
-```php
-use Symfony\Component\Process\Process;
-
-$process = new Process('ls -lsa');
-$process->setTimeout(3600);
-$process->mustRun();
-
-print $process->getOutput();
-```
-
-And if you want to be able to get some feedback in real-time, just pass an
-anonymous function to the ``run()`` method and you will get the output buffer
-as it becomes available:
-
-```php
-use Symfony\Component\Process\Process;
-
-$process = new Process('ls -lsa');
-$process->run(function ($type, $buffer) {
-    if (Process::ERR === $type) {
-        echo 'ERR > '.$buffer;
-    } else {
-        echo 'OUT > '.$buffer;
-    }
-});
-```
-
-That's great if you want to execute a long running command (like rsync-ing files to a
-remote server) and give feedback to the user in real-time.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Process/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/process/composer.json b/vendor/symfony/process/composer.json
deleted file mode 100644
index 8d21baf..0000000
--- a/vendor/symfony/process/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "symfony/process",
-    "type": "library",
-    "description": "Symfony Process Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Process\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/process/phpunit.xml.dist b/vendor/symfony/process/phpunit.xml.dist
deleted file mode 100644
index b5d605c..0000000
--- a/vendor/symfony/process/phpunit.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Process Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/psr-http-message-bridge/.travis.yml b/vendor/symfony/psr-http-message-bridge/.travis.yml
deleted file mode 100644
index 39e7eb6..0000000
--- a/vendor/symfony/psr-http-message-bridge/.travis.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-language: php
-
-sudo: false
-
-matrix:
-    include:
-        - php: 5.3
-        - php: 5.4
-        - php: 5.5
-        - php: 5.6
-        - php: 5.3
-          env: deps=low
-        - php: 5.6
-          env: deps=high
-        - php: nightly
-        - php: hhvm
-    allow_failures:
-        - php: nightly
-        - php: hhvm
-    fast_finish: true
-
-env:
-    global:
-        - deps=no
-        - SYMFONY_DEPRECATIONS_HELPER=weak
-
-before_install:
-    - composer self-update
-    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
-    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
-    - if [[ "$TRAVIS_PHP_VERSION" != "nightly" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then php -i; fi;
-    # Set the COMPOSER_ROOT_VERSION to the right version according to the branch being built
-    - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi;
-
-install:
-    - if [[ "$TRAVIS_PHP_VERSION" != "5.3" ]] && [[ "$TRAVIS_PHP_VERSION" != "5.4" ]]; then composer require --no-update zendframework/zend-diactoros; fi;
-    - if [ "$deps" = "no" ]; then export SYMFONY_DEPRECATIONS_HELPER=strict; fi;
-    - if [ "$deps" = "no" ]; then composer --prefer-source install; fi;
-    - if [ "$deps" = "high" ]; then composer --prefer-source update; fi;
-    - if [ "$deps" = "low" ]; then composer --prefer-source --prefer-lowest --prefer-stable update; fi;
-
-script:
-    - phpunit
diff --git a/vendor/symfony/psr-http-message-bridge/CHANGELOG.md b/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
deleted file mode 100644
index 569522f..0000000
--- a/vendor/symfony/psr-http-message-bridge/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-CHANGELOG
-=========
-
-2.8.0
------
-
- * added the component
diff --git a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php b/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
deleted file mode 100644
index 31726f1..0000000
--- a/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?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\Bridge\PsrHttpMessage\Factory;
-
-use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Zend\Diactoros\Response as DiactorosResponse;
-use Zend\Diactoros\ServerRequest;
-use Zend\Diactoros\ServerRequestFactory as DiactorosRequestFactory;
-use Zend\Diactoros\Stream as DiactorosStream;
-use Zend\Diactoros\UploadedFile as DiactorosUploadedFile;
-
-/**
- * Builds Psr\HttpMessage instances using the Zend Diactoros implementation.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class DiactorosFactory implements HttpMessageFactoryInterface
-{
-    public function __construct()
-    {
-        if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
-            throw new \RuntimeException('Zend Diactoros must be installed to use the DiactorosFactory.');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createRequest(Request $symfonyRequest)
-    {
-        $server = DiactorosRequestFactory::normalizeServer($symfonyRequest->server->all());
-        $headers = $symfonyRequest->headers->all();
-
-        try {
-            $body = new DiactorosStream($symfonyRequest->getContent(true));
-        } catch (\LogicException $e) {
-            $body = new DiactorosStream('php://temp', 'wb+');
-            $body->write($symfonyRequest->getContent());
-        }
-
-        $request = new ServerRequest(
-            $server,
-            DiactorosRequestFactory::normalizeFiles($this->getFiles($symfonyRequest->files->all())),
-            $symfonyRequest->getUri(),
-            $symfonyRequest->getMethod(),
-            $body,
-            $headers
-        );
-
-        $request = $request
-            ->withCookieParams($symfonyRequest->cookies->all())
-            ->withQueryParams($symfonyRequest->query->all())
-            ->withParsedBody($symfonyRequest->request->all())
-        ;
-
-        foreach ($symfonyRequest->attributes->all() as $key => $value) {
-            $request = $request->withAttribute($key, $value);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Converts Symfony uploaded files array to the PSR one.
-     *
-     * @param array $uploadedFiles
-     *
-     * @return array
-     */
-    private function getFiles(array $uploadedFiles)
-    {
-        $files = array();
-
-        foreach ($uploadedFiles as $key => $value) {
-            if ($value instanceof UploadedFile) {
-                $files[$key] = $this->createUploadedFile($value);
-            } else {
-                $files[$key] = $this->getFiles($value);
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Creates a PSR-7 UploadedFile instance from a Symfony one.
-     *
-     * @param UploadedFile $symfonyUploadedFile
-     *
-     * @return UploadedFileInterface
-     */
-    private function createUploadedFile(UploadedFile $symfonyUploadedFile)
-    {
-        return new DiactorosUploadedFile(
-            $symfonyUploadedFile->getRealPath(),
-            $symfonyUploadedFile->getSize(),
-            $symfonyUploadedFile->getError(),
-            $symfonyUploadedFile->getClientOriginalName(),
-            $symfonyUploadedFile->getClientMimeType()
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createResponse(Response $symfonyResponse)
-    {
-        if ($symfonyResponse instanceof BinaryFileResponse) {
-            $stream = new DiactorosStream($symfonyResponse->getFile()->getPathname(), 'r');
-        } else {
-            $stream = new DiactorosStream('php://temp', 'wb+');
-            if ($symfonyResponse instanceof StreamedResponse) {
-                ob_start(function ($buffer) use ($stream) {
-                    $stream->write($buffer);
-
-                    return false;
-                });
-
-                $symfonyResponse->sendContent();
-                ob_end_clean();
-            } else {
-                $stream->write($symfonyResponse->getContent());
-            }
-        }
-
-        $headers = $symfonyResponse->headers->all();
-
-        $cookies = $symfonyResponse->headers->getCookies();
-        if (!empty($cookies)) {
-            $headers['Set-Cookie'] = array();
-
-            foreach ($cookies as $cookie) {
-                $headers['Set-Cookie'][] = $cookie->__toString();
-            }
-        }
-
-        $response = new DiactorosResponse(
-            $stream,
-            $symfonyResponse->getStatusCode(),
-            $headers
-        );
-
-        $protocolVersion = $symfonyResponse->getProtocolVersion();
-        if ('1.1' !== $protocolVersion) {
-            $response = $response->withProtocolVersion($protocolVersion);
-        }
-
-        return $response;
-    }
-}
diff --git a/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php b/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
deleted file mode 100644
index 2c356fd..0000000
--- a/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?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\Bridge\PsrHttpMessage\Factory;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Symfony\Bridge\PsrHttpMessage\HttpFoundationFactoryInterface;
-use Symfony\Component\HttpFoundation\Cookie;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * {@inheritdoc}
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class HttpFoundationFactory implements HttpFoundationFactoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function createRequest(ServerRequestInterface $psrRequest)
-    {
-        $parsedBody = $psrRequest->getParsedBody();
-        $parsedBody = is_array($parsedBody) ? $parsedBody : array();
-
-        $request = new Request(
-            $psrRequest->getQueryParams(),
-            $parsedBody,
-            $psrRequest->getAttributes(),
-            $psrRequest->getCookieParams(),
-            $this->getFiles($psrRequest->getUploadedFiles()),
-            $psrRequest->getServerParams(),
-            $psrRequest->getBody()->__toString()
-        );
-        $request->headers->replace($psrRequest->getHeaders());
-
-        return $request;
-    }
-
-    /**
-     * Converts to the input array to $_FILES structure.
-     *
-     * @param array $uploadedFiles
-     *
-     * @return array
-     */
-    private function getFiles(array $uploadedFiles)
-    {
-        $files = array();
-
-        foreach ($uploadedFiles as $key => $value) {
-            if ($value instanceof UploadedFileInterface) {
-                $files[$key] = $this->createUploadedFile($value);
-            } else {
-                $files[$key] = $this->getFiles($value);
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Creates Symfony UploadedFile instance from PSR-7 ones.
-     *
-     * @param UploadedFileInterface $psrUploadedFile
-     *
-     * @return UploadedFile
-     */
-    private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
-    {
-        $temporaryPath = $this->getTemporaryPath();
-        $psrUploadedFile->moveTo($temporaryPath);
-
-        $clientFileName = $psrUploadedFile->getClientFilename();
-
-        return new UploadedFile(
-            $temporaryPath,
-            null === $clientFileName ? '' : $clientFileName,
-            $psrUploadedFile->getClientMediaType(),
-            $psrUploadedFile->getSize(),
-            $psrUploadedFile->getError(),
-            true
-        );
-    }
-
-    /**
-     * Gets a temporary file path.
-     *
-     * @return string
-     */
-    protected function getTemporaryPath()
-    {
-        return tempnam(sys_get_temp_dir(), uniqid('symfony', true));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createResponse(ResponseInterface $psrResponse)
-    {
-        $response = new Response(
-            $psrResponse->getBody()->__toString(),
-            $psrResponse->getStatusCode(),
-            $psrResponse->getHeaders()
-        );
-        $response->setProtocolVersion($psrResponse->getProtocolVersion());
-
-        foreach ($psrResponse->getHeader('Set-Cookie') as $cookie) {
-            $response->headers->setCookie($this->createCookie($cookie));
-        }
-
-        return $response;
-    }
-
-    /**
-     * Creates a Cookie instance from a cookie string.
-     *
-     * Some snippets have been taken from the Guzzle project: https://github.com/guzzle/guzzle/blob/5.3/src/Cookie/SetCookie.php#L34
-     *
-     * @param string $cookie
-     *
-     * @return Cookie
-     *
-     * @throws \InvalidArgumentException
-     */
-    private function createCookie($cookie)
-    {
-        foreach (explode(';', $cookie) as $part) {
-            $part = trim($part);
-
-            $data = explode('=', $part, 2);
-            $name = $data[0];
-            $value = isset($data[1]) ? trim($data[1], " \n\r\t\0\x0B\"") : null;
-
-            if (!isset($cookieName)) {
-                $cookieName = $name;
-                $cookieValue = $value;
-
-                continue;
-            }
-
-            if ('expires' === strtolower($name) && null !== $value) {
-                $cookieExpire = new \DateTime($value);
-
-                continue;
-            }
-
-            if ('path' === strtolower($name) && null !== $value) {
-                $cookiePath = $value;
-
-                continue;
-            }
-
-            if ('domain' === strtolower($name) && null !== $value) {
-                $cookieDomain = $value;
-
-                continue;
-            }
-
-            if ('secure' === strtolower($name)) {
-                $cookieSecure = true;
-
-                continue;
-            }
-
-            if ('httponly' === strtolower($name)) {
-                $cookieHttpOnly = true;
-
-                continue;
-            }
-        }
-
-        if (!isset($cookieName)) {
-            throw new \InvalidArgumentException('The value of the Set-Cookie header is malformed.');
-        }
-
-        return new Cookie(
-            $cookieName,
-            $cookieValue,
-            isset($cookieExpire) ? $cookieExpire : 0,
-            isset($cookiePath) ? $cookiePath : '/',
-            isset($cookieDomain) ? $cookieDomain : null,
-            isset($cookieSecure),
-            isset($cookieHttpOnly)
-        );
-    }
-}
diff --git a/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php b/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php
deleted file mode 100644
index 32ec456..0000000
--- a/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Bridge\PsrHttpMessage;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Creates Symfony Request and Response instances from PSR-7 ones.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface HttpFoundationFactoryInterface
-{
-    /**
-     * Creates a Symfony Request instance from a PSR-7 one.
-     *
-     * @param ServerRequestInterface $psrRequest
-     *
-     * @return Request
-     */
-    public function createRequest(ServerRequestInterface $psrRequest);
-
-    /**
-     * Creates a Symfony Response instance from a PSR-7 one.
-     *
-     * @param ResponseInterface $psrResponse
-     *
-     * @return Response
-     */
-    public function createResponse(ResponseInterface $psrResponse);
-}
diff --git a/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php b/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php
deleted file mode 100644
index 1367c8c..0000000
--- a/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Bridge\PsrHttpMessage;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Creates PSR HTTP Request and Response instances from Symfony ones.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface HttpMessageFactoryInterface
-{
-    /**
-     * Creates a PSR-7 Request instance from a Symfony one.
-     *
-     * @param Request $symfonyRequest
-     *
-     * @return ServerRequestInterface
-     */
-    public function createRequest(Request $symfonyRequest);
-
-    /**
-     * Creates a PSR-7 Response instance from a Symfony one.
-     *
-     * @param Response $symfonyResponse
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(Response $symfonyResponse);
-}
diff --git a/vendor/symfony/psr-http-message-bridge/LICENSE b/vendor/symfony/psr-http-message-bridge/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/psr-http-message-bridge/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/psr-http-message-bridge/README.md b/vendor/symfony/psr-http-message-bridge/README.md
deleted file mode 100644
index d2b2d37..0000000
--- a/vendor/symfony/psr-http-message-bridge/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-PSR-7 Bridge
-============
-
-Provides integration for PSR7.
-
-Resources
----------
-
-If you want to run the unit tests, install dev dependencies before
-running PHPUnit:
-
-    $ cd path/to/Symfony/Bridge/PsrHttpMessage/
-    $ composer.phar install
-    $ phpunit
diff --git a/vendor/symfony/psr-http-message-bridge/composer.json b/vendor/symfony/psr-http-message-bridge/composer.json
deleted file mode 100644
index 9dc9ce7..0000000
--- a/vendor/symfony/psr-http-message-bridge/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/psr-http-message-bridge",
-    "type": "symfony-bridge",
-    "description": "PSR HTTP message bridge",
-    "keywords": ["http", "psr-7", "http-message"],
-    "homepage": "http://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "http://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3",
-        "psr/http-message": "~1.0",
-        "symfony/http-foundation": "~2.3|~3.0"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0"
-    },
-    "suggest": {
-        "zendframework/zend-diactoros": "To use the Zend Diactoros factory"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" }
-    },
-    "minimum-stability": "dev"
-}
diff --git a/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist b/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist
deleted file mode 100644
index 9a6e477..0000000
--- a/vendor/symfony/psr-http-message-bridge/phpunit.xml.dist
+++ /dev/null
@@ -1,30 +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="vendor/autoload.php"
->
-    <testsuites>
-        <testsuite name="Symfony PSR-7 HTTP message Bridge Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/routing/.gitignore b/vendor/symfony/routing/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/routing/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/routing/Annotation/Route.php b/vendor/symfony/routing/Annotation/Route.php
deleted file mode 100644
index 7e7e056..0000000
--- a/vendor/symfony/routing/Annotation/Route.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?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\Component\Routing\Annotation;
-
-/**
- * Annotation class for @Route().
- *
- * @Annotation
- * @Target({"CLASS", "METHOD"})
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Route
-{
-    private $path;
-    private $name;
-    private $requirements = array();
-    private $options = array();
-    private $defaults = array();
-    private $host;
-    private $methods = array();
-    private $schemes = array();
-    private $condition;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data An array of key/value parameters.
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __construct(array $data)
-    {
-        if (isset($data['value'])) {
-            $data['path'] = $data['value'];
-            unset($data['value']);
-        }
-
-        foreach ($data as $key => $value) {
-            $method = 'set'.str_replace('_', '', $key);
-            if (!method_exists($this, $method)) {
-                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, get_class($this)));
-            }
-            $this->$method($value);
-        }
-    }
-
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use setPath instead.
-     */
-    public function setPattern($pattern)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
-
-        $this->path = $pattern;
-    }
-
-    /**
-     * @deprecated since version 2.2, to be removed in 3.0. Use getPath instead.
-     */
-    public function getPattern()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead and use the "path" option instead of the "pattern" option in the route definition.', E_USER_DEPRECATED);
-
-        return $this->path;
-    }
-
-    public function setPath($path)
-    {
-        $this->path = $path;
-    }
-
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    public function setHost($pattern)
-    {
-        $this->host = $pattern;
-    }
-
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setRequirements($requirements)
-    {
-        if (isset($requirements['_method'])) {
-            if (0 === count($this->methods)) {
-                $this->methods = explode('|', $requirements['_method']);
-            }
-
-            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', E_USER_DEPRECATED);
-        }
-
-        if (isset($requirements['_scheme'])) {
-            if (0 === count($this->schemes)) {
-                $this->schemes = explode('|', $requirements['_scheme']);
-            }
-
-            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', E_USER_DEPRECATED);
-        }
-
-        $this->requirements = $requirements;
-    }
-
-    public function getRequirements()
-    {
-        return $this->requirements;
-    }
-
-    public function setOptions($options)
-    {
-        $this->options = $options;
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function setDefaults($defaults)
-    {
-        $this->defaults = $defaults;
-    }
-
-    public function getDefaults()
-    {
-        return $this->defaults;
-    }
-
-    public function setSchemes($schemes)
-    {
-        $this->schemes = is_array($schemes) ? $schemes : array($schemes);
-    }
-
-    public function getSchemes()
-    {
-        return $this->schemes;
-    }
-
-    public function setMethods($methods)
-    {
-        $this->methods = is_array($methods) ? $methods : array($methods);
-    }
-
-    public function getMethods()
-    {
-        return $this->methods;
-    }
-
-    public function setCondition($condition)
-    {
-        $this->condition = $condition;
-    }
-
-    public function getCondition()
-    {
-        return $this->condition;
-    }
-}
diff --git a/vendor/symfony/routing/CHANGELOG.md b/vendor/symfony/routing/CHANGELOG.md
deleted file mode 100644
index b5fd9db..0000000
--- a/vendor/symfony/routing/CHANGELOG.md
+++ /dev/null
@@ -1,177 +0,0 @@
-CHANGELOG
-=========
-
-2.5.0
------
-
- * [DEPRECATION] The `ApacheMatcherDumper` and `ApacheUrlMatcher` were deprecated and
-   will be removed in Symfony 3.0, since the performance gains were minimal and
-   it's hard to replicate the behaviour of PHP implementation.
-
-2.3.0
------
-
- * added RequestContext::getQueryString()
-
-2.2.0
------
-
- * [DEPRECATION] Several route settings have been renamed (the old ones will be removed in 3.0):
-
-    * The `pattern` setting for a route has been deprecated in favor of `path`
-    * The `_scheme` and `_method` requirements have been moved to the `schemes` and `methods` settings
-
-   Before:
-
-   ```yaml
-   article_edit:
-       pattern: /article/{id}
-       requirements: { '_method': 'POST|PUT', '_scheme': 'https', 'id': '\d+' }
-   ```
-
-   ```xml
-   <route id="article_edit" pattern="/article/{id}">
-       <requirement key="_method">POST|PUT</requirement>
-       <requirement key="_scheme">https</requirement>
-       <requirement key="id">\d+</requirement>
-   </route>
-   ```
-
-   ```php
-   $route = new Route();
-   $route->setPattern('/article/{id}');
-   $route->setRequirement('_method', 'POST|PUT');
-   $route->setRequirement('_scheme', 'https');
-   ```
-
-   After:
-
-   ```yaml
-   article_edit:
-       path: /article/{id}
-       methods: [POST, PUT]
-       schemes: https
-       requirements: { 'id': '\d+' }
-   ```
-
-   ```xml
-   <route id="article_edit" pattern="/article/{id}" methods="POST PUT" schemes="https">
-       <requirement key="id">\d+</requirement>
-   </route>
-   ```
-
-   ```php
-   $route = new Route();
-   $route->setPath('/article/{id}');
-   $route->setMethods(array('POST', 'PUT'));
-   $route->setSchemes('https');
-   ```
-
- * [BC BREAK] RouteCollection does not behave like a tree structure anymore but as
-   a flat array of Routes. So when using PHP to build the RouteCollection, you must
-   make sure to add routes to the sub-collection before adding it to the parent
-   collection (this is not relevant when using YAML or XML for Route definitions).
-
-   Before:
-
-   ```php
-   $rootCollection = new RouteCollection();
-   $subCollection = new RouteCollection();
-   $rootCollection->addCollection($subCollection);
-   $subCollection->add('foo', new Route('/foo'));
-   ```
-
-   After:
-
-   ```php
-   $rootCollection = new RouteCollection();
-   $subCollection = new RouteCollection();
-   $subCollection->add('foo', new Route('/foo'));
-   $rootCollection->addCollection($subCollection);
-   ```
-
-   Also one must call `addCollection` from the bottom to the top hierarchy.
-   So the correct sequence is the following (and not the reverse):
-
-   ```php
-   $childCollection->addCollection($grandchildCollection);
-   $rootCollection->addCollection($childCollection);
-   ```
-
- * [DEPRECATION] The methods `RouteCollection::getParent()` and `RouteCollection::getRoot()`
-   have been deprecated and will be removed in Symfony 2.3.
- * [BC BREAK] Misusing the `RouteCollection::addPrefix` method to add defaults, requirements
-   or options without adding a prefix is not supported anymore. So if you called `addPrefix`
-   with an empty prefix or `/` only (both have no relevance), like
-   `addPrefix('', $defaultsArray, $requirementsArray, $optionsArray)`
-   you need to use the new dedicated methods `addDefaults($defaultsArray)`,
-   `addRequirements($requirementsArray)` or `addOptions($optionsArray)` instead.
- * [DEPRECATION] The `$options` parameter to `RouteCollection::addPrefix()` has been deprecated
-   because adding options has nothing to do with adding a path prefix. If you want to add options
-   to all child routes of a RouteCollection, you can use `addOptions()`.
- * [DEPRECATION] The method `RouteCollection::getPrefix()` has been deprecated
-   because it suggested that all routes in the collection would have this prefix, which is
-   not necessarily true. On top of that, since there is no tree structure anymore, this method
-   is also useless. Don't worry about performance, prefix optimization for matching is still done
-   in the dumper, which was also improved in 2.2.0 to find even more grouping possibilities.
- * [DEPRECATION] `RouteCollection::addCollection(RouteCollection $collection)` should now only be
-   used with a single parameter. The other params `$prefix`, `$default`, `$requirements` and `$options`
-   will still work, but have been deprecated. The `addPrefix` method should be used for this
-   use-case instead.
-   Before: `$parentCollection->addCollection($collection, '/prefix', array(...), array(...))`
-   After:
-   ```php
-   $collection->addPrefix('/prefix', array(...), array(...));
-   $parentCollection->addCollection($collection);
-   ```
- * added support for the method default argument values when defining a @Route
- * Adjacent placeholders without separator work now, e.g. `/{x}{y}{z}.{_format}`.
- * Characters that function as separator between placeholders are now whitelisted
-   to fix routes with normal text around a variable, e.g. `/prefix{var}suffix`.
- * [BC BREAK] The default requirement of a variable has been changed slightly.
-   Previously it disallowed the previous and the next char around a variable. Now
-   it disallows the slash (`/`) and the next char. Using the previous char added
-   no value and was problematic because the route `/index.{_format}` would be
-   matched by `/index.ht/ml`.
- * The default requirement now uses possessive quantifiers when possible which
-   improves matching performance by up to 20% because it prevents backtracking
-   when it's not needed.
- * The ConfigurableRequirementsInterface can now also be used to disable the requirements
-   check on URL generation completely by calling `setStrictRequirements(null)`. It
-   improves performance in production environment as you should know that params always
-   pass the requirements (otherwise it would break your link anyway).
- * There is no restriction on the route name anymore. So non-alphanumeric characters
-   are now also allowed.
- * [BC BREAK] `RouteCompilerInterface::compile(Route $route)` was made static
-   (only relevant if you implemented your own RouteCompiler).
- * Added possibility to generate relative paths and network paths in the UrlGenerator, e.g.
-   "../parent-file" and "//example.com/dir/file". The third parameter in
-   `UrlGeneratorInterface::generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)`
-   now accepts more values and you should use the constants defined in `UrlGeneratorInterface` for
-   claritiy. The old method calls with a Boolean parameter will continue to work because they
-   equal the signature using the constants.
-
-2.1.0
------
-
- * added RequestMatcherInterface
- * added RequestContext::fromRequest()
- * the UrlMatcher does not throw a \LogicException anymore when the required
-   scheme is not the current one
- * added TraceableUrlMatcher
- * added the possibility to define options, default values and requirements
-   for placeholders in prefix, including imported routes
- * added RouterInterface::getRouteCollection
- * [BC BREAK] the UrlMatcher urldecodes the route parameters only once, they
-   were decoded twice before. Note that the `urldecode()` calls have been
-   changed for a single `rawurldecode()` in order to support `+` for input
-   paths.
- * added RouteCollection::getRoot method to retrieve the root of a
-   RouteCollection tree
- * [BC BREAK] made RouteCollection::setParent private which could not have
-   been used anyway without creating inconsistencies
- * [BC BREAK] RouteCollection::remove also removes a route from parent
-   collections (not only from its children)
- * added ConfigurableRequirementsInterface that allows to disable exceptions
-   (and generate empty URLs instead) when generating a route with an invalid
-   parameter value
diff --git a/vendor/symfony/routing/CompiledRoute.php b/vendor/symfony/routing/CompiledRoute.php
deleted file mode 100644
index 3eca9ec..0000000
--- a/vendor/symfony/routing/CompiledRoute.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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\Component\Routing;
-
-/**
- * CompiledRoutes are returned by the RouteCompiler class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class CompiledRoute implements \Serializable
-{
-    private $variables;
-    private $tokens;
-    private $staticPrefix;
-    private $regex;
-    private $pathVariables;
-    private $hostVariables;
-    private $hostRegex;
-    private $hostTokens;
-
-    /**
-     * Constructor.
-     *
-     * @param string      $staticPrefix  The static prefix of the compiled route
-     * @param string      $regex         The regular expression to use to match this route
-     * @param array       $tokens        An array of tokens to use to generate URL for this route
-     * @param array       $pathVariables An array of path variables
-     * @param string|null $hostRegex     Host regex
-     * @param array       $hostTokens    Host tokens
-     * @param array       $hostVariables An array of host variables
-     * @param array       $variables     An array of variables (variables defined in the path and in the host patterns)
-     */
-    public function __construct($staticPrefix, $regex, array $tokens, array $pathVariables, $hostRegex = null, array $hostTokens = array(), array $hostVariables = array(), array $variables = array())
-    {
-        $this->staticPrefix = (string) $staticPrefix;
-        $this->regex = $regex;
-        $this->tokens = $tokens;
-        $this->pathVariables = $pathVariables;
-        $this->hostRegex = $hostRegex;
-        $this->hostTokens = $hostTokens;
-        $this->hostVariables = $hostVariables;
-        $this->variables = $variables;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function serialize()
-    {
-        return serialize(array(
-            'vars' => $this->variables,
-            'path_prefix' => $this->staticPrefix,
-            'path_regex' => $this->regex,
-            'path_tokens' => $this->tokens,
-            'path_vars' => $this->pathVariables,
-            'host_regex' => $this->hostRegex,
-            'host_tokens' => $this->hostTokens,
-            'host_vars' => $this->hostVariables,
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unserialize($serialized)
-    {
-        $data = unserialize($serialized);
-        $this->variables = $data['vars'];
-        $this->staticPrefix = $data['path_prefix'];
-        $this->regex = $data['path_regex'];
-        $this->tokens = $data['path_tokens'];
-        $this->pathVariables = $data['path_vars'];
-        $this->hostRegex = $data['host_regex'];
-        $this->hostTokens = $data['host_tokens'];
-        $this->hostVariables = $data['host_vars'];
-    }
-
-    /**
-     * Returns the static prefix.
-     *
-     * @return string The static prefix
-     */
-    public function getStaticPrefix()
-    {
-        return $this->staticPrefix;
-    }
-
-    /**
-     * Returns the regex.
-     *
-     * @return string The regex
-     */
-    public function getRegex()
-    {
-        return $this->regex;
-    }
-
-    /**
-     * Returns the host regex.
-     *
-     * @return string|null The host regex or null
-     */
-    public function getHostRegex()
-    {
-        return $this->hostRegex;
-    }
-
-    /**
-     * Returns the tokens.
-     *
-     * @return array The tokens
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-    }
-
-    /**
-     * Returns the host tokens.
-     *
-     * @return array The tokens
-     */
-    public function getHostTokens()
-    {
-        return $this->hostTokens;
-    }
-
-    /**
-     * Returns the variables.
-     *
-     * @return array The variables
-     */
-    public function getVariables()
-    {
-        return $this->variables;
-    }
-
-    /**
-     * Returns the path variables.
-     *
-     * @return array The variables
-     */
-    public function getPathVariables()
-    {
-        return $this->pathVariables;
-    }
-
-    /**
-     * Returns the host variables.
-     *
-     * @return array The variables
-     */
-    public function getHostVariables()
-    {
-        return $this->hostVariables;
-    }
-}
diff --git a/vendor/symfony/routing/Exception/ExceptionInterface.php b/vendor/symfony/routing/Exception/ExceptionInterface.php
deleted file mode 100644
index db76362..0000000
--- a/vendor/symfony/routing/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * ExceptionInterface.
- *
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/routing/Exception/InvalidParameterException.php b/vendor/symfony/routing/Exception/InvalidParameterException.php
deleted file mode 100644
index 94d841f..0000000
--- a/vendor/symfony/routing/Exception/InvalidParameterException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * Exception thrown when a parameter is not valid.
- *
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
-class InvalidParameterException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/routing/Exception/MethodNotAllowedException.php b/vendor/symfony/routing/Exception/MethodNotAllowedException.php
deleted file mode 100644
index f684c74..0000000
--- a/vendor/symfony/routing/Exception/MethodNotAllowedException.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * The resource was found but the request method is not allowed.
- *
- * This exception should trigger an HTTP 405 response in your application code.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface
-{
-    /**
-     * @var array
-     */
-    protected $allowedMethods = array();
-
-    public function __construct(array $allowedMethods, $message = null, $code = 0, \Exception $previous = null)
-    {
-        $this->allowedMethods = array_map('strtoupper', $allowedMethods);
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * Gets the allowed HTTP methods.
-     *
-     * @return array
-     */
-    public function getAllowedMethods()
-    {
-        return $this->allowedMethods;
-    }
-}
diff --git a/vendor/symfony/routing/Exception/MissingMandatoryParametersException.php b/vendor/symfony/routing/Exception/MissingMandatoryParametersException.php
deleted file mode 100644
index 57f3a40..0000000
--- a/vendor/symfony/routing/Exception/MissingMandatoryParametersException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * Exception thrown when a route cannot be generated because of missing
- * mandatory parameters.
- *
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
-class MissingMandatoryParametersException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/routing/Exception/ResourceNotFoundException.php b/vendor/symfony/routing/Exception/ResourceNotFoundException.php
deleted file mode 100644
index ccbca15..0000000
--- a/vendor/symfony/routing/Exception/ResourceNotFoundException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * The resource was not found.
- *
- * This exception should trigger an HTTP 404 response in your application code.
- *
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class ResourceNotFoundException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/routing/Exception/RouteNotFoundException.php b/vendor/symfony/routing/Exception/RouteNotFoundException.php
deleted file mode 100644
index 24ab0b4..0000000
--- a/vendor/symfony/routing/Exception/RouteNotFoundException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Routing\Exception;
-
-/**
- * Exception thrown when a route does not exist.
- *
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
-class RouteNotFoundException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/routing/Generator/ConfigurableRequirementsInterface.php b/vendor/symfony/routing/Generator/ConfigurableRequirementsInterface.php
deleted file mode 100644
index dc97b7e..0000000
--- a/vendor/symfony/routing/Generator/ConfigurableRequirementsInterface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\Routing\Generator;
-
-/**
- * ConfigurableRequirementsInterface must be implemented by URL generators that
- * can be configured whether an exception should be generated when the parameters
- * do not match the requirements. It is also possible to disable the requirements
- * check for URL generation completely.
- *
- * The possible configurations and use-cases:
- * - setStrictRequirements(true): Throw an exception for mismatching requirements. This
- *   is mostly useful in development environment.
- * - setStrictRequirements(false): Don't throw an exception but return null as URL for
- *   mismatching requirements and log the problem. Useful when you cannot control all
- *   params because they come from third party libs but don't want to have a 404 in
- *   production environment. It should log the mismatch so one can review it.
- * - setStrictRequirements(null): Return the URL with the given parameters without
- *   checking the requirements at all. When generating a URL you should either trust
- *   your params or you validated them beforehand because otherwise it would break your
- *   link anyway. So in production environment you should know that params always pass
- *   the requirements. Thus this option allows to disable the check on URL generation for
- *   performance reasons (saving a preg_match for each requirement every time a URL is
- *   generated).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-interface ConfigurableRequirementsInterface
-{
-    /**
-     * Enables or disables the exception on incorrect parameters.
-     * Passing null will deactivate the requirements check completely.
-     *
-     * @param bool|null $enabled
-     */
-    public function setStrictRequirements($enabled);
-
-    /**
-     * Returns whether to throw an exception on incorrect parameters.
-     * Null means the requirements check is deactivated completely.
-     *
-     * @return bool|null
-     */
-    public function isStrictRequirements();
-}
diff --git a/vendor/symfony/routing/Generator/Dumper/GeneratorDumper.php b/vendor/symfony/routing/Generator/Dumper/GeneratorDumper.php
deleted file mode 100644
index 4739bd8..0000000
--- a/vendor/symfony/routing/Generator/Dumper/GeneratorDumper.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Routing\Generator\Dumper;
-
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * GeneratorDumper is the base class for all built-in generator dumpers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class GeneratorDumper implements GeneratorDumperInterface
-{
-    /**
-     * @var RouteCollection
-     */
-    private $routes;
-
-    /**
-     * Constructor.
-     *
-     * @param RouteCollection $routes The RouteCollection to dump
-     */
-    public function __construct(RouteCollection $routes)
-    {
-        $this->routes = $routes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
-}
diff --git a/vendor/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php b/vendor/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php
deleted file mode 100644
index fed3472..0000000
--- a/vendor/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\Routing\Generator\Dumper;
-
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * GeneratorDumperInterface is the interface that all generator dumper classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface GeneratorDumperInterface
-{
-    /**
-     * Dumps a set of routes to a string representation of executable code
-     * that can then be used to generate a URL of such a route.
-     *
-     * @param array $options An array of options
-     *
-     * @return string Executable code
-     */
-    public function dump(array $options = array());
-
-    /**
-     * Gets the routes to dump.
-     *
-     * @return RouteCollection A RouteCollection instance
-     */
-    public function getRoutes();
-}
diff --git a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php b/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php
deleted file mode 100644
index b53caaf..0000000
--- a/vendor/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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\Component\Routing\Generator\Dumper;
-
-/**
- * PhpGeneratorDumper creates a PHP class able to generate URLs for a given set of routes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class PhpGeneratorDumper extends GeneratorDumper
-{
-    /**
-     * Dumps a set of routes to a PHP class.
-     *
-     * Available options:
-     *
-     *  * class:      The class name
-     *  * base_class: The base class name
-     *
-     * @param array $options An array of options
-     *
-     * @return string A PHP class representing the generator class
-     */
-    public function dump(array $options = array())
-    {
-        $options = array_merge(array(
-            'class' => 'ProjectUrlGenerator',
-            'base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-        ), $options);
-
-        return <<<EOF
-<?php
-
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Psr\Log\LoggerInterface;
-
-/**
- * {$options['class']}
- *
- * This class has been auto-generated
- * by the Symfony Routing Component.
- */
-class {$options['class']} extends {$options['base_class']}
-{
-    private static \$declaredRoutes = {$this->generateDeclaredRoutes()};
-
-    /**
-     * Constructor.
-     */
-    public function __construct(RequestContext \$context, LoggerInterface \$logger = null)
-    {
-        \$this->context = \$context;
-        \$this->logger = \$logger;
-    }
-
-{$this->generateGenerateMethod()}
-}
-
-EOF;
-    }
-
-    /**
-     * Generates PHP code representing an array of defined routes
-     * together with the routes properties (e.g. requirements).
-     *
-     * @return string PHP code
-     */
-    private function generateDeclaredRoutes()
-    {
-        $routes = "array(\n";
-        foreach ($this->getRoutes()->all() as $name => $route) {
-            $compiledRoute = $route->compile();
-
-            $properties = array();
-            $properties[] = $compiledRoute->getVariables();
-            $properties[] = $route->getDefaults();
-            $properties[] = $route->getRequirements();
-            $properties[] = $compiledRoute->getTokens();
-            $properties[] = $compiledRoute->getHostTokens();
-            $properties[] = $route->getSchemes();
-
-            $routes .= sprintf("        '%s' => %s,\n", $name, str_replace("\n", '', var_export($properties, true)));
-        }
-        $routes .= '    )';
-
-        return $routes;
-    }
-
-    /**
-     * Generates PHP code representing the `generate` method that implements the UrlGeneratorInterface.
-     *
-     * @return string PHP code
-     */
-    private function generateGenerateMethod()
-    {
-        return <<<EOF
-    public function generate(\$name, \$parameters = array(), \$referenceType = self::ABSOLUTE_PATH)
-    {
-        if (!isset(self::\$declaredRoutes[\$name])) {
-            throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', \$name));
-        }
-
-        list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = self::\$declaredRoutes[\$name];
-
-        return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$referenceType, \$hostTokens, \$requiredSchemes);
-    }
-EOF;
-    }
-}
diff --git a/vendor/symfony/routing/Generator/UrlGenerator.php b/vendor/symfony/routing/Generator/UrlGenerator.php
deleted file mode 100644
index 6798951..0000000
--- a/vendor/symfony/routing/Generator/UrlGenerator.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?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\Component\Routing\Generator;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Exception\InvalidParameterException;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
-use Psr\Log\LoggerInterface;
-
-/**
- * UrlGenerator can generate a URL or a path for any route in the RouteCollection
- * based on the passed parameters.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInterface
-{
-    /**
-     * @var RouteCollection
-     */
-    protected $routes;
-
-    /**
-     * @var RequestContext
-     */
-    protected $context;
-
-    /**
-     * @var bool|null
-     */
-    protected $strictRequirements = true;
-
-    /**
-     * @var LoggerInterface|null
-     */
-    protected $logger;
-
-    /**
-     * This array defines the characters (besides alphanumeric ones) that will not be percent-encoded in the path segment of the generated URL.
-     *
-     * PHP's rawurlencode() encodes all chars except "a-zA-Z0-9-._~" according to RFC 3986. But we want to allow some chars
-     * to be used in their literal form (reasons below). Other chars inside the path must of course be encoded, e.g.
-     * "?" and "#" (would be interpreted wrongly as query and fragment identifier),
-     * "'" and """ (are used as delimiters in HTML).
-     */
-    protected $decodedChars = array(
-        // the slash can be used to designate a hierarchical structure and we want allow using it with this meaning
-        // some webservers don't allow the slash in encoded form in the path for security reasons anyway
-        // see http://stackoverflow.com/questions/4069002/http-400-if-2f-part-of-get-url-in-jboss
-        '%2F' => '/',
-        // the following chars are general delimiters in the URI specification but have only special meaning in the authority component
-        // so they can safely be used in the path in unencoded form
-        '%40' => '@',
-        '%3A' => ':',
-        // these chars are only sub-delimiters that have no predefined meaning and can therefore be used literally
-        // so URI producing applications can use these chars to delimit subcomponents in a path segment without being encoded for better readability
-        '%3B' => ';',
-        '%2C' => ',',
-        '%3D' => '=',
-        '%2B' => '+',
-        '%21' => '!',
-        '%2A' => '*',
-        '%7C' => '|',
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param RouteCollection      $routes  A RouteCollection instance
-     * @param RequestContext       $context The context
-     * @param LoggerInterface|null $logger  A logger instance
-     */
-    public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null)
-    {
-        $this->routes = $routes;
-        $this->context = $context;
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContext(RequestContext $context)
-    {
-        $this->context = $context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setStrictRequirements($enabled)
-    {
-        $this->strictRequirements = null === $enabled ? null : (bool) $enabled;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isStrictRequirements()
-    {
-        return $this->strictRequirements;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
-    {
-        if (null === $route = $this->routes->get($name)) {
-            throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
-        }
-
-        // the Route has a cache of its own and is not recompiled as long as it does not get modified
-        $compiledRoute = $route->compile();
-
-        return $this->doGenerate($compiledRoute->getVariables(), $route->getDefaults(), $route->getRequirements(), $compiledRoute->getTokens(), $parameters, $name, $referenceType, $compiledRoute->getHostTokens(), $route->getSchemes());
-    }
-
-    /**
-     * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
-     * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
-     *                                             it does not match the requirement
-     */
-    protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, array $requiredSchemes = array())
-    {
-        $variables = array_flip($variables);
-        $mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters);
-
-        // all params must be given
-        if ($diff = array_diff_key($variables, $mergedParams)) {
-            throw new MissingMandatoryParametersException(sprintf('Some mandatory parameters are missing ("%s") to generate a URL for route "%s".', implode('", "', array_keys($diff)), $name));
-        }
-
-        $url = '';
-        $optional = true;
-        foreach ($tokens as $token) {
-            if ('variable' === $token[0]) {
-                if (!$optional || !array_key_exists($token[3], $defaults) || null !== $mergedParams[$token[3]] && (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]]) {
-                    // check requirement
-                    if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
-                        $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
-                        if ($this->strictRequirements) {
-                            throw new InvalidParameterException($message);
-                        }
-
-                        if ($this->logger) {
-                            $this->logger->error($message);
-                        }
-
-                        return;
-                    }
-
-                    $url = $token[1].$mergedParams[$token[3]].$url;
-                    $optional = false;
-                }
-            } else {
-                // static text
-                $url = $token[1].$url;
-                $optional = false;
-            }
-        }
-
-        if ('' === $url) {
-            $url = '/';
-        }
-
-        // the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-        $url = strtr(rawurlencode($url), $this->decodedChars);
-
-        // the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
-        // so we need to encode them as they are not used for this purpose here
-        // otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
-        $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
-        if ('/..' === substr($url, -3)) {
-            $url = substr($url, 0, -2).'%2E%2E';
-        } elseif ('/.' === substr($url, -2)) {
-            $url = substr($url, 0, -1).'%2E';
-        }
-
-        $schemeAuthority = '';
-        if ($host = $this->context->getHost()) {
-            $scheme = $this->context->getScheme();
-
-            if ($requiredSchemes) {
-                $schemeMatched = false;
-                foreach ($requiredSchemes as $requiredScheme) {
-                    if ($scheme === $requiredScheme) {
-                        $schemeMatched = true;
-
-                        break;
-                    }
-                }
-
-                if (!$schemeMatched) {
-                    $referenceType = self::ABSOLUTE_URL;
-                    $scheme = current($requiredSchemes);
-                }
-            } elseif (isset($requirements['_scheme']) && ($req = strtolower($requirements['_scheme'])) && $scheme !== $req) {
-                // We do this for BC; to be removed if _scheme is not supported anymore
-                $referenceType = self::ABSOLUTE_URL;
-                $scheme = $req;
-            }
-
-            if ($hostTokens) {
-                $routeHost = '';
-                foreach ($hostTokens as $token) {
-                    if ('variable' === $token[0]) {
-                        if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#i', $mergedParams[$token[3]])) {
-                            $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
-
-                            if ($this->strictRequirements) {
-                                throw new InvalidParameterException($message);
-                            }
-
-                            if ($this->logger) {
-                                $this->logger->error($message);
-                            }
-
-                            return;
-                        }
-
-                        $routeHost = $token[1].$mergedParams[$token[3]].$routeHost;
-                    } else {
-                        $routeHost = $token[1].$routeHost;
-                    }
-                }
-
-                if ($routeHost !== $host) {
-                    $host = $routeHost;
-                    if (self::ABSOLUTE_URL !== $referenceType) {
-                        $referenceType = self::NETWORK_PATH;
-                    }
-                }
-            }
-
-            if (self::ABSOLUTE_URL === $referenceType || self::NETWORK_PATH === $referenceType) {
-                $port = '';
-                if ('http' === $scheme && 80 != $this->context->getHttpPort()) {
-                    $port = ':'.$this->context->getHttpPort();
-                } elseif ('https' === $scheme && 443 != $this->context->getHttpsPort()) {
-                    $port = ':'.$this->context->getHttpsPort();
-                }
-
-                $schemeAuthority = self::NETWORK_PATH === $referenceType ? '//' : "$scheme://";
-                $schemeAuthority .= $host.$port;
-            }
-        }
-
-        if (self::RELATIVE_PATH === $referenceType) {
-            $url = self::getRelativePath($this->context->getPathInfo(), $url);
-        } else {
-            $url = $schemeAuthority.$this->context->getBaseUrl().$url;
-        }
-
-        // add a query string if needed
-        $extra = array_diff_key($parameters, $variables, $defaults);
-        if ($extra && $query = http_build_query($extra, '', '&')) {
-            // "/" and "?" can be left decoded for better user experience, see
-            // http://tools.ietf.org/html/rfc3986#section-3.4
-            $url .= '?'.strtr($query, array('%2F' => '/'));
-        }
-
-        return $url;
-    }
-
-    /**
-     * Returns the target path as relative reference from the base path.
-     *
-     * Only the URIs path component (no schema, host etc.) is relevant and must be given, starting with a slash.
-     * Both paths must be absolute and not contain relative parts.
-     * Relative URLs from one resource to another are useful when generating self-contained downloadable document archives.
-     * Furthermore, they can be used to reduce the link size in documents.
-     *
-     * Example target paths, given a base path of "/a/b/c/d":
-     * - "/a/b/c/d"     -> ""
-     * - "/a/b/c/"      -> "./"
-     * - "/a/b/"        -> "../"
-     * - "/a/b/c/other" -> "other"
-     * - "/a/x/y"       -> "../../x/y"
-     *
-     * @param string $basePath   The base path
-     * @param string $targetPath The target path
-     *
-     * @return string The relative target path
-     */
-    public static function getRelativePath($basePath, $targetPath)
-    {
-        if ($basePath === $targetPath) {
-            return '';
-        }
-
-        $sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
-        $targetDirs = explode('/', isset($targetPath[0]) && '/' === $targetPath[0] ? substr($targetPath, 1) : $targetPath);
-        array_pop($sourceDirs);
-        $targetFile = array_pop($targetDirs);
-
-        foreach ($sourceDirs as $i => $dir) {
-            if (isset($targetDirs[$i]) && $dir === $targetDirs[$i]) {
-                unset($sourceDirs[$i], $targetDirs[$i]);
-            } else {
-                break;
-            }
-        }
-
-        $targetDirs[] = $targetFile;
-        $path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs);
-
-        // A reference to the same base directory or an empty subdirectory must be prefixed with "./".
-        // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
-        // as the first segment of a relative-path reference, as it would be mistaken for a scheme name
-        // (see http://tools.ietf.org/html/rfc3986#section-4.2).
-        return '' === $path || '/' === $path[0]
-            || false !== ($colonPos = strpos($path, ':')) && ($colonPos < ($slashPos = strpos($path, '/')) || false === $slashPos)
-            ? "./$path" : $path;
-    }
-}
diff --git a/vendor/symfony/routing/Generator/UrlGeneratorInterface.php b/vendor/symfony/routing/Generator/UrlGeneratorInterface.php
deleted file mode 100644
index fc294b7..0000000
--- a/vendor/symfony/routing/Generator/UrlGeneratorInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\Routing\Generator;
-
-use Symfony\Component\Routing\Exception\InvalidParameterException;
-use Symfony\Component\Routing\Exception\MissingMandatoryParametersException;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-use Symfony\Component\Routing\RequestContextAwareInterface;
-
-/**
- * UrlGeneratorInterface is the interface that all URL generator classes must implement.
- *
- * The constants in this interface define the different types of resource references that
- * are declared in RFC 3986: http://tools.ietf.org/html/rfc3986
- * We are using the term "URL" instead of "URI" as this is more common in web applications
- * and we do not need to distinguish them as the difference is mostly semantical and
- * less technical. Generating URIs, i.e. representation-independent resource identifiers,
- * is also possible.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-interface UrlGeneratorInterface extends RequestContextAwareInterface
-{
-    /**
-     * Generates an absolute URL, e.g. "http://example.com/dir/file".
-     */
-    const ABSOLUTE_URL = true;
-
-    /**
-     * Generates an absolute path, e.g. "/dir/file".
-     */
-    const ABSOLUTE_PATH = false;
-
-    /**
-     * Generates a relative path based on the current request path, e.g. "../parent-file".
-     *
-     * @see UrlGenerator::getRelativePath()
-     */
-    const RELATIVE_PATH = 'relative';
-
-    /**
-     * Generates a network path, e.g. "//example.com/dir/file".
-     * Such reference reuses the current scheme but specifies the host.
-     */
-    const NETWORK_PATH = 'network';
-
-    /**
-     * Generates a URL or path for a specific route based on the given parameters.
-     *
-     * Parameters that reference placeholders in the route pattern will substitute them in the
-     * path or host. Extra params are added as query string to the URL.
-     *
-     * When the passed reference type cannot be generated for the route because it requires a different
-     * host or scheme than the current one, the method will return a more comprehensive reference
-     * that includes the required params. For example, when you call this method with $referenceType = ABSOLUTE_PATH
-     * but the route requires the https scheme whereas the current scheme is http, it will instead return an
-     * ABSOLUTE_URL with the https scheme and the current host. This makes sure the generated URL matches
-     * the route in any case.
-     *
-     * If there is no route with the given name, the generator must throw the RouteNotFoundException.
-     *
-     * @param string      $name          The name of the route
-     * @param mixed       $parameters    An array of parameters
-     * @param bool|string $referenceType The type of reference to be generated (one of the constants)
-     *
-     * @return string The generated URL
-     *
-     * @throws RouteNotFoundException              If the named route doesn't exist
-     * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route
-     * @throws InvalidParameterException           When a parameter value for a placeholder is not correct because
-     *                                             it does not match the requirement
-     */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH);
-}
diff --git a/vendor/symfony/routing/LICENSE b/vendor/symfony/routing/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/routing/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/routing/Loader/AnnotationClassLoader.php b/vendor/symfony/routing/Loader/AnnotationClassLoader.php
deleted file mode 100644
index 7b0ef25..0000000
--- a/vendor/symfony/routing/Loader/AnnotationClassLoader.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Loader\LoaderResolverInterface;
-
-/**
- * AnnotationClassLoader loads routing information from a PHP class and its methods.
- *
- * You need to define an implementation for the getRouteDefaults() method. Most of the
- * time, this method should define some PHP callable to be called for the route
- * (a controller in MVC speak).
- *
- * The @Route annotation can be set on the class (for global parameters),
- * and on each method.
- *
- * The @Route annotation main value is the route path. The annotation also
- * recognizes several parameters: requirements, options, defaults, schemes,
- * methods, host, and name. The name parameter is mandatory.
- * Here is an example of how you should be able to use it:
- *
- *     /**
- *      * @Route("/Blog")
- *      * /
- *     class Blog
- *     {
- *         /**
- *          * @Route("/", name="blog_index")
- *          * /
- *         public function index()
- *         {
- *         }
- *
- *         /**
- *          * @Route("/{id}", name="blog_post", requirements = {"id" = "\d+"})
- *          * /
- *         public function show()
- *         {
- *         }
- *     }
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class AnnotationClassLoader implements LoaderInterface
-{
-    /**
-     * @var Reader
-     */
-    protected $reader;
-
-    /**
-     * @var string
-     */
-    protected $routeAnnotationClass = 'Symfony\\Component\\Routing\\Annotation\\Route';
-
-    /**
-     * @var int
-     */
-    protected $defaultRouteIndex = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param Reader $reader
-     */
-    public function __construct(Reader $reader)
-    {
-        $this->reader = $reader;
-    }
-
-    /**
-     * Sets the annotation class to read route properties from.
-     *
-     * @param string $class A fully-qualified class name
-     */
-    public function setRouteAnnotationClass($class)
-    {
-        $this->routeAnnotationClass = $class;
-    }
-
-    /**
-     * Loads from annotations from a class.
-     *
-     * @param string      $class A class name
-     * @param string|null $type  The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     *
-     * @throws \InvalidArgumentException When route can't be parsed
-     */
-    public function load($class, $type = null)
-    {
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
-        }
-
-        $class = new \ReflectionClass($class);
-        if ($class->isAbstract()) {
-            throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class));
-        }
-
-        $globals = $this->getGlobals($class);
-
-        $collection = new RouteCollection();
-        $collection->addResource(new FileResource($class->getFileName()));
-
-        foreach ($class->getMethods() as $method) {
-            $this->defaultRouteIndex = 0;
-            foreach ($this->reader->getMethodAnnotations($method) as $annot) {
-                if ($annot instanceof $this->routeAnnotationClass) {
-                    $this->addRoute($collection, $annot, $globals, $class, $method);
-                }
-            }
-        }
-
-        return $collection;
-    }
-
-    protected function addRoute(RouteCollection $collection, $annot, $globals, \ReflectionClass $class, \ReflectionMethod $method)
-    {
-        $name = $annot->getName();
-        if (null === $name) {
-            $name = $this->getDefaultRouteName($class, $method);
-        }
-
-        $defaults = array_replace($globals['defaults'], $annot->getDefaults());
-        foreach ($method->getParameters() as $param) {
-            if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
-                $defaults[$param->getName()] = $param->getDefaultValue();
-            }
-        }
-        $requirements = array_replace($globals['requirements'], $annot->getRequirements());
-        $options = array_replace($globals['options'], $annot->getOptions());
-        $schemes = array_merge($globals['schemes'], $annot->getSchemes());
-        $methods = array_merge($globals['methods'], $annot->getMethods());
-
-        $host = $annot->getHost();
-        if (null === $host) {
-            $host = $globals['host'];
-        }
-
-        $condition = $annot->getCondition();
-        if (null === $condition) {
-            $condition = $globals['condition'];
-        }
-
-        $route = $this->createRoute($globals['path'].$annot->getPath(), $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
-
-        $this->configureRoute($route, $class, $method, $annot);
-
-        $collection->add($name, $route);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setResolver(LoaderResolverInterface $resolver)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResolver()
-    {
-    }
-
-    /**
-     * Gets the default route name for a class method.
-     *
-     * @param \ReflectionClass  $class
-     * @param \ReflectionMethod $method
-     *
-     * @return string
-     */
-    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
-    {
-        $name = strtolower(str_replace('\\', '_', $class->name).'_'.$method->name);
-        if ($this->defaultRouteIndex > 0) {
-            $name .= '_'.$this->defaultRouteIndex;
-        }
-        ++$this->defaultRouteIndex;
-
-        return $name;
-    }
-
-    protected function getGlobals(\ReflectionClass $class)
-    {
-        $globals = array(
-            'path' => '',
-            'requirements' => array(),
-            'options' => array(),
-            'defaults' => array(),
-            'schemes' => array(),
-            'methods' => array(),
-            'host' => '',
-            'condition' => '',
-        );
-
-        if ($annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
-            // for BC reasons
-            if (null !== $annot->getPath()) {
-                $globals['path'] = $annot->getPath();
-            } elseif (null !== $annot->getPattern()) {
-                $globals['path'] = $annot->getPattern();
-            }
-
-            if (null !== $annot->getRequirements()) {
-                $globals['requirements'] = $annot->getRequirements();
-            }
-
-            if (null !== $annot->getOptions()) {
-                $globals['options'] = $annot->getOptions();
-            }
-
-            if (null !== $annot->getDefaults()) {
-                $globals['defaults'] = $annot->getDefaults();
-            }
-
-            if (null !== $annot->getSchemes()) {
-                $globals['schemes'] = $annot->getSchemes();
-            }
-
-            if (null !== $annot->getMethods()) {
-                $globals['methods'] = $annot->getMethods();
-            }
-
-            if (null !== $annot->getHost()) {
-                $globals['host'] = $annot->getHost();
-            }
-
-            if (null !== $annot->getCondition()) {
-                $globals['condition'] = $annot->getCondition();
-            }
-        }
-
-        return $globals;
-    }
-
-    protected function createRoute($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition)
-    {
-        return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
-    }
-
-    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot);
-}
diff --git a/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php b/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
deleted file mode 100644
index abd68ed..0000000
--- a/vendor/symfony/routing/Loader/AnnotationDirectoryLoader.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Config\Resource\DirectoryResource;
-
-/**
- * AnnotationDirectoryLoader loads routing information from annotations set
- * on PHP classes and methods.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class AnnotationDirectoryLoader extends AnnotationFileLoader
-{
-    /**
-     * Loads from annotations from a directory.
-     *
-     * @param string      $path A directory path
-     * @param string|null $type The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     *
-     * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed
-     */
-    public function load($path, $type = null)
-    {
-        $dir = $this->locator->locate($path);
-
-        $collection = new RouteCollection();
-        $collection->addResource(new DirectoryResource($dir, '/\.php$/'));
-        $files = iterator_to_array(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($dir), \RecursiveIteratorIterator::LEAVES_ONLY));
-        usort($files, function (\SplFileInfo $a, \SplFileInfo $b) {
-            return (string) $a > (string) $b ? 1 : -1;
-        });
-
-        foreach ($files as $file) {
-            if (!$file->isFile() || '.php' !== substr($file->getFilename(), -4)) {
-                continue;
-            }
-
-            if ($class = $this->findClass($file)) {
-                $refl = new \ReflectionClass($class);
-                if ($refl->isAbstract()) {
-                    continue;
-                }
-
-                $collection->addCollection($this->loader->load($class, $type));
-            }
-        }
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        try {
-            $path = $this->locator->locate($resource);
-        } catch (\Exception $e) {
-            return false;
-        }
-
-        return is_string($resource) && is_dir($path) && (!$type || 'annotation' === $type);
-    }
-}
diff --git a/vendor/symfony/routing/Loader/AnnotationFileLoader.php b/vendor/symfony/routing/Loader/AnnotationFileLoader.php
deleted file mode 100644
index 8ce57ac..0000000
--- a/vendor/symfony/routing/Loader/AnnotationFileLoader.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Config\FileLocatorInterface;
-
-/**
- * AnnotationFileLoader loads routing information from annotations set
- * on a PHP class and its methods.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class AnnotationFileLoader extends FileLoader
-{
-    protected $loader;
-
-    /**
-     * Constructor.
-     *
-     * @param FileLocatorInterface  $locator A FileLocator instance
-     * @param AnnotationClassLoader $loader  An AnnotationClassLoader instance
-     *
-     * @throws \RuntimeException
-     */
-    public function __construct(FileLocatorInterface $locator, AnnotationClassLoader $loader)
-    {
-        if (!function_exists('token_get_all')) {
-            throw new \RuntimeException('The Tokenizer extension is required for the routing annotation loaders.');
-        }
-
-        parent::__construct($locator);
-
-        $this->loader = $loader;
-    }
-
-    /**
-     * Loads from annotations from a file.
-     *
-     * @param string      $file A PHP file path
-     * @param string|null $type The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     *
-     * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
-     */
-    public function load($file, $type = null)
-    {
-        $path = $this->locator->locate($file);
-
-        $collection = new RouteCollection();
-        if ($class = $this->findClass($path)) {
-            $collection->addResource(new FileResource($path));
-            $collection->addCollection($this->loader->load($class, $type));
-        }
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'annotation' === $type);
-    }
-
-    /**
-     * Returns the full class name for the first class in the file.
-     *
-     * @param string $file A PHP file path
-     *
-     * @return string|false Full class name if found, false otherwise
-     */
-    protected function findClass($file)
-    {
-        $class = false;
-        $namespace = false;
-        $tokens = token_get_all(file_get_contents($file));
-        for ($i = 0, $count = count($tokens); $i < $count; ++$i) {
-            $token = $tokens[$i];
-
-            if (!is_array($token)) {
-                continue;
-            }
-
-            if (true === $class && T_STRING === $token[0]) {
-                return $namespace.'\\'.$token[1];
-            }
-
-            if (true === $namespace && T_STRING === $token[0]) {
-                $namespace = '';
-                do {
-                    $namespace .= $token[1];
-                    $token = $tokens[++$i];
-                } while ($i < $count && is_array($token) && in_array($token[0], array(T_NS_SEPARATOR, T_STRING)));
-            }
-
-            if (T_CLASS === $token[0]) {
-                $class = true;
-            }
-
-            if (T_NAMESPACE === $token[0]) {
-                $namespace = true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/symfony/routing/Loader/ClosureLoader.php b/vendor/symfony/routing/Loader/ClosureLoader.php
deleted file mode 100644
index 5df9f6a..0000000
--- a/vendor/symfony/routing/Loader/ClosureLoader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Config\Loader\Loader;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * ClosureLoader loads routes from a PHP closure.
- *
- * The Closure must return a RouteCollection instance.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ClosureLoader extends Loader
-{
-    /**
-     * Loads a Closure.
-     *
-     * @param \Closure    $closure A Closure
-     * @param string|null $type    The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     */
-    public function load($closure, $type = null)
-    {
-        return $closure();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return $resource instanceof \Closure && (!$type || 'closure' === $type);
-    }
-}
diff --git a/vendor/symfony/routing/Loader/PhpFileLoader.php b/vendor/symfony/routing/Loader/PhpFileLoader.php
deleted file mode 100644
index b4ba5fb..0000000
--- a/vendor/symfony/routing/Loader/PhpFileLoader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * PhpFileLoader loads routes from a PHP file.
- *
- * The file must return a RouteCollection instance.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class PhpFileLoader extends FileLoader
-{
-    /**
-     * Loads a PHP file.
-     *
-     * @param string      $file A PHP file path
-     * @param string|null $type The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     */
-    public function load($file, $type = null)
-    {
-        $path = $this->locator->locate($file);
-        $this->setCurrentDir(dirname($path));
-
-        $collection = self::includeFile($path, $this);
-        $collection->addResource(new FileResource($path));
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'php' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'php' === $type);
-    }
-
-    /**
-     * Safe include. Used for scope isolation.
-     *
-     * @param string        $file   File to include
-     * @param PhpFileLoader $loader the loader variable is exposed to the included file below
-     *
-     * @return RouteCollection
-     */
-    private static function includeFile($file, PhpFileLoader $loader)
-    {
-        return include $file;
-    }
-}
diff --git a/vendor/symfony/routing/Loader/XmlFileLoader.php b/vendor/symfony/routing/Loader/XmlFileLoader.php
deleted file mode 100644
index b5c24f9..0000000
--- a/vendor/symfony/routing/Loader/XmlFileLoader.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Config\Util\XmlUtils;
-
-/**
- * XmlFileLoader loads XML routing files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class XmlFileLoader extends FileLoader
-{
-    const NAMESPACE_URI = 'http://symfony.com/schema/routing';
-    const SCHEME_PATH = '/schema/routing/routing-1.0.xsd';
-
-    /**
-     * Loads an XML file.
-     *
-     * @param string      $file An XML file path
-     * @param string|null $type The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     *
-     * @throws \InvalidArgumentException When the file cannot be loaded or when the XML cannot be
-     *                                   parsed because it does not validate against the scheme.
-     */
-    public function load($file, $type = null)
-    {
-        $path = $this->locator->locate($file);
-
-        $xml = $this->loadFile($path);
-
-        $collection = new RouteCollection();
-        $collection->addResource(new FileResource($path));
-
-        // process routes and imports
-        foreach ($xml->documentElement->childNodes as $node) {
-            if (!$node instanceof \DOMElement) {
-                continue;
-            }
-
-            $this->parseNode($collection, $node, $path, $file);
-        }
-
-        return $collection;
-    }
-
-    /**
-     * Parses a node from a loaded XML file.
-     *
-     * @param RouteCollection $collection Collection to associate with the node
-     * @param \DOMElement     $node       Element to parse
-     * @param string          $path       Full path of the XML file being processed
-     * @param string          $file       Loaded file name
-     *
-     * @throws \InvalidArgumentException When the XML is invalid
-     */
-    protected function parseNode(RouteCollection $collection, \DOMElement $node, $path, $file)
-    {
-        if (self::NAMESPACE_URI !== $node->namespaceURI) {
-            return;
-        }
-
-        switch ($node->localName) {
-            case 'route':
-                $this->parseRoute($collection, $node, $path);
-                break;
-            case 'import':
-                $this->parseImport($collection, $node, $path, $file);
-                break;
-            default:
-                throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "route" or "import".', $node->localName, $path));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'xml' === pathinfo($resource, PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
-    }
-
-    /**
-     * Parses a route and adds it to the RouteCollection.
-     *
-     * @param RouteCollection $collection RouteCollection instance
-     * @param \DOMElement     $node       Element to parse that represents a Route
-     * @param string          $path       Full path of the XML file being processed
-     *
-     * @throws \InvalidArgumentException When the XML is invalid
-     */
-    protected function parseRoute(RouteCollection $collection, \DOMElement $node, $path)
-    {
-        if ('' === ($id = $node->getAttribute('id')) || (!$node->hasAttribute('pattern') && !$node->hasAttribute('path'))) {
-            throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" must have an "id" and a "path" attribute.', $path));
-        }
-
-        if ($node->hasAttribute('pattern')) {
-            if ($node->hasAttribute('path')) {
-                throw new \InvalidArgumentException(sprintf('The <route> element in file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
-            }
-
-            @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
-
-            $node->setAttribute('path', $node->getAttribute('pattern'));
-            $node->removeAttribute('pattern');
-        }
-
-        $schemes = preg_split('/[\s,\|]++/', $node->getAttribute('schemes'), -1, PREG_SPLIT_NO_EMPTY);
-        $methods = preg_split('/[\s,\|]++/', $node->getAttribute('methods'), -1, PREG_SPLIT_NO_EMPTY);
-
-        list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
-
-        if (isset($requirements['_method'])) {
-            if (0 === count($methods)) {
-                $methods = explode('|', $requirements['_method']);
-            }
-
-            unset($requirements['_method']);
-            @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" attribute instead.', $id, $path), E_USER_DEPRECATED);
-        }
-
-        if (isset($requirements['_scheme'])) {
-            if (0 === count($schemes)) {
-                $schemes = explode('|', $requirements['_scheme']);
-            }
-
-            unset($requirements['_scheme']);
-            @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" attribute instead.', $id, $path), E_USER_DEPRECATED);
-        }
-
-        $route = new Route($node->getAttribute('path'), $defaults, $requirements, $options, $node->getAttribute('host'), $schemes, $methods, $condition);
-        $collection->add($id, $route);
-    }
-
-    /**
-     * Parses an import and adds the routes in the resource to the RouteCollection.
-     *
-     * @param RouteCollection $collection RouteCollection instance
-     * @param \DOMElement     $node       Element to parse that represents a Route
-     * @param string          $path       Full path of the XML file being processed
-     * @param string          $file       Loaded file name
-     *
-     * @throws \InvalidArgumentException When the XML is invalid
-     */
-    protected function parseImport(RouteCollection $collection, \DOMElement $node, $path, $file)
-    {
-        if ('' === $resource = $node->getAttribute('resource')) {
-            throw new \InvalidArgumentException(sprintf('The <import> element in file "%s" must have a "resource" attribute.', $path));
-        }
-
-        $type = $node->getAttribute('type');
-        $prefix = $node->getAttribute('prefix');
-        $host = $node->hasAttribute('host') ? $node->getAttribute('host') : null;
-        $schemes = $node->hasAttribute('schemes') ? preg_split('/[\s,\|]++/', $node->getAttribute('schemes'), -1, PREG_SPLIT_NO_EMPTY) : null;
-        $methods = $node->hasAttribute('methods') ? preg_split('/[\s,\|]++/', $node->getAttribute('methods'), -1, PREG_SPLIT_NO_EMPTY) : null;
-
-        list($defaults, $requirements, $options, $condition) = $this->parseConfigs($node, $path);
-
-        $this->setCurrentDir(dirname($path));
-
-        $subCollection = $this->import($resource, ('' !== $type ? $type : null), false, $file);
-        /* @var $subCollection RouteCollection */
-        $subCollection->addPrefix($prefix);
-        if (null !== $host) {
-            $subCollection->setHost($host);
-        }
-        if (null !== $condition) {
-            $subCollection->setCondition($condition);
-        }
-        if (null !== $schemes) {
-            $subCollection->setSchemes($schemes);
-        }
-        if (null !== $methods) {
-            $subCollection->setMethods($methods);
-        }
-        $subCollection->addDefaults($defaults);
-        $subCollection->addRequirements($requirements);
-        $subCollection->addOptions($options);
-
-        $collection->addCollection($subCollection);
-    }
-
-    /**
-     * Loads an XML file.
-     *
-     * @param string $file An XML file path
-     *
-     * @return \DOMDocument
-     *
-     * @throws \InvalidArgumentException When loading of XML file fails because of syntax errors
-     *                                   or when the XML structure is not as expected by the scheme -
-     *                                   see validate()
-     */
-    protected function loadFile($file)
-    {
-        return XmlUtils::loadFile($file, __DIR__.static::SCHEME_PATH);
-    }
-
-    /**
-     * Parses the config elements (default, requirement, option).
-     *
-     * @param \DOMElement $node Element to parse that contains the configs
-     * @param string      $path Full path of the XML file being processed
-     *
-     * @return array An array with the defaults as first item, requirements as second and options as third.
-     *
-     * @throws \InvalidArgumentException When the XML is invalid
-     */
-    private function parseConfigs(\DOMElement $node, $path)
-    {
-        $defaults = array();
-        $requirements = array();
-        $options = array();
-        $condition = null;
-
-        foreach ($node->getElementsByTagNameNS(self::NAMESPACE_URI, '*') as $n) {
-            switch ($n->localName) {
-                case 'default':
-                    if ($this->isElementValueNull($n)) {
-                        $defaults[$n->getAttribute('key')] = null;
-                    } else {
-                        $defaults[$n->getAttribute('key')] = trim($n->textContent);
-                    }
-
-                    break;
-                case 'requirement':
-                    $requirements[$n->getAttribute('key')] = trim($n->textContent);
-                    break;
-                case 'option':
-                    $options[$n->getAttribute('key')] = trim($n->textContent);
-                    break;
-                case 'condition':
-                    $condition = trim($n->textContent);
-                    break;
-                default:
-                    throw new \InvalidArgumentException(sprintf('Unknown tag "%s" used in file "%s". Expected "default", "requirement" or "option".', $n->localName, $path));
-            }
-        }
-
-        return array($defaults, $requirements, $options, $condition);
-    }
-
-    private function isElementValueNull(\DOMElement $element)
-    {
-        $namespaceUri = 'http://www.w3.org/2001/XMLSchema-instance';
-
-        if (!$element->hasAttributeNS($namespaceUri, 'nil')) {
-            return false;
-        }
-
-        return 'true' === $element->getAttributeNS($namespaceUri, 'nil') || '1' === $element->getAttributeNS($namespaceUri, 'nil');
-    }
-}
diff --git a/vendor/symfony/routing/Loader/YamlFileLoader.php b/vendor/symfony/routing/Loader/YamlFileLoader.php
deleted file mode 100644
index 817714a..0000000
--- a/vendor/symfony/routing/Loader/YamlFileLoader.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?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\Component\Routing\Loader;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Parser as YamlParser;
-use Symfony\Component\Config\Loader\FileLoader;
-
-/**
- * YamlFileLoader loads Yaml routing files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class YamlFileLoader extends FileLoader
-{
-    private static $availableKeys = array(
-        'resource', 'type', 'prefix', 'pattern', 'path', 'host', 'schemes', 'methods', 'defaults', 'requirements', 'options', 'condition',
-    );
-    private $yamlParser;
-
-    /**
-     * Loads a Yaml file.
-     *
-     * @param string      $file A Yaml file path
-     * @param string|null $type The resource type
-     *
-     * @return RouteCollection A RouteCollection instance
-     *
-     * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
-     */
-    public function load($file, $type = null)
-    {
-        $path = $this->locator->locate($file);
-
-        if (!stream_is_local($path)) {
-            throw new \InvalidArgumentException(sprintf('This is not a local file "%s".', $path));
-        }
-
-        if (!file_exists($path)) {
-            throw new \InvalidArgumentException(sprintf('File "%s" not found.', $path));
-        }
-
-        if (null === $this->yamlParser) {
-            $this->yamlParser = new YamlParser();
-        }
-
-        try {
-            $parsedConfig = $this->yamlParser->parse(file_get_contents($path));
-        } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
-        }
-
-        $collection = new RouteCollection();
-        $collection->addResource(new FileResource($path));
-
-        // empty file
-        if (null === $parsedConfig) {
-            return $collection;
-        }
-
-        // not an array
-        if (!is_array($parsedConfig)) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));
-        }
-
-        foreach ($parsedConfig as $name => $config) {
-            if (isset($config['pattern'])) {
-                if (isset($config['path'])) {
-                    throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));
-                }
-
-                @trigger_error(sprintf('The "pattern" option in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "path" option in the route definition instead.', $path), E_USER_DEPRECATED);
-
-                $config['path'] = $config['pattern'];
-                unset($config['pattern']);
-            }
-
-            $this->validate($config, $name, $path);
-
-            if (isset($config['resource'])) {
-                $this->parseImport($collection, $config, $path, $file);
-            } else {
-                $this->parseRoute($collection, $name, $config, $path);
-            }
-        }
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && in_array(pathinfo($resource, PATHINFO_EXTENSION), array('yml', 'yaml'), true) && (!$type || 'yaml' === $type);
-    }
-
-    /**
-     * Parses a route and adds it to the RouteCollection.
-     *
-     * @param RouteCollection $collection A RouteCollection instance
-     * @param string          $name       Route name
-     * @param array           $config     Route definition
-     * @param string          $path       Full path of the YAML file being processed
-     */
-    protected function parseRoute(RouteCollection $collection, $name, array $config, $path)
-    {
-        $defaults = isset($config['defaults']) ? $config['defaults'] : array();
-        $requirements = isset($config['requirements']) ? $config['requirements'] : array();
-        $options = isset($config['options']) ? $config['options'] : array();
-        $host = isset($config['host']) ? $config['host'] : '';
-        $schemes = isset($config['schemes']) ? $config['schemes'] : array();
-        $methods = isset($config['methods']) ? $config['methods'] : array();
-        $condition = isset($config['condition']) ? $config['condition'] : null;
-
-        if (isset($requirements['_method'])) {
-            if (0 === count($methods)) {
-                $methods = explode('|', $requirements['_method']);
-            }
-
-            unset($requirements['_method']);
-            @trigger_error(sprintf('The "_method" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "methods" option instead.', $name, $path), E_USER_DEPRECATED);
-        }
-
-        if (isset($requirements['_scheme'])) {
-            if (0 === count($schemes)) {
-                $schemes = explode('|', $requirements['_scheme']);
-            }
-
-            unset($requirements['_scheme']);
-            @trigger_error(sprintf('The "_scheme" requirement of route "%s" in file "%s" is deprecated since version 2.2 and will be removed in 3.0. Use the "schemes" option instead.', $name, $path), E_USER_DEPRECATED);
-        }
-
-        $route = new Route($config['path'], $defaults, $requirements, $options, $host, $schemes, $methods, $condition);
-
-        $collection->add($name, $route);
-    }
-
-    /**
-     * Parses an import and adds the routes in the resource to the RouteCollection.
-     *
-     * @param RouteCollection $collection A RouteCollection instance
-     * @param array           $config     Route definition
-     * @param string          $path       Full path of the YAML file being processed
-     * @param string          $file       Loaded file name
-     */
-    protected function parseImport(RouteCollection $collection, array $config, $path, $file)
-    {
-        $type = isset($config['type']) ? $config['type'] : null;
-        $prefix = isset($config['prefix']) ? $config['prefix'] : '';
-        $defaults = isset($config['defaults']) ? $config['defaults'] : array();
-        $requirements = isset($config['requirements']) ? $config['requirements'] : array();
-        $options = isset($config['options']) ? $config['options'] : array();
-        $host = isset($config['host']) ? $config['host'] : null;
-        $condition = isset($config['condition']) ? $config['condition'] : null;
-        $schemes = isset($config['schemes']) ? $config['schemes'] : null;
-        $methods = isset($config['methods']) ? $config['methods'] : null;
-
-        $this->setCurrentDir(dirname($path));
-
-        $subCollection = $this->import($config['resource'], $type, false, $file);
-        /* @var $subCollection RouteCollection */
-        $subCollection->addPrefix($prefix);
-        if (null !== $host) {
-            $subCollection->setHost($host);
-        }
-        if (null !== $condition) {
-            $subCollection->setCondition($condition);
-        }
-        if (null !== $schemes) {
-            $subCollection->setSchemes($schemes);
-        }
-        if (null !== $methods) {
-            $subCollection->setMethods($methods);
-        }
-        $subCollection->addDefaults($defaults);
-        $subCollection->addRequirements($requirements);
-        $subCollection->addOptions($options);
-
-        $collection->addCollection($subCollection);
-    }
-
-    /**
-     * Validates the route configuration.
-     *
-     * @param array  $config A resource config
-     * @param string $name   The config key
-     * @param string $path   The loaded file path
-     *
-     * @throws \InvalidArgumentException If one of the provided config keys is not supported,
-     *                                   something is missing or the combination is nonsense
-     */
-    protected function validate($config, $name, $path)
-    {
-        if (!is_array($config)) {
-            throw new \InvalidArgumentException(sprintf('The definition of "%s" in "%s" must be a YAML array.', $name, $path));
-        }
-        if ($extraKeys = array_diff(array_keys($config), self::$availableKeys)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The routing file "%s" contains unsupported keys for "%s": "%s". Expected one of: "%s".',
-                $path, $name, implode('", "', $extraKeys), implode('", "', self::$availableKeys)
-            ));
-        }
-        if (isset($config['resource']) && isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'The routing file "%s" must not specify both the "resource" key and the "path" key for "%s". Choose between an import and a route definition.',
-                $path, $name
-            ));
-        }
-        if (!isset($config['resource']) && isset($config['type'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'The "type" key for the route definition "%s" in "%s" is unsupported. It is only available for imports in combination with the "resource" key.',
-                $name, $path
-            ));
-        }
-        if (!isset($config['resource']) && !isset($config['path'])) {
-            throw new \InvalidArgumentException(sprintf(
-                'You must define a "path" for the route "%s" in file "%s".',
-                $name, $path
-            ));
-        }
-    }
-}
diff --git a/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd b/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd
deleted file mode 100644
index d40aa42..0000000
--- a/vendor/symfony/routing/Loader/schema/routing/routing-1.0.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns="http://symfony.com/schema/routing"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://symfony.com/schema/routing"
-    elementFormDefault="qualified">
-
-  <xsd:annotation>
-    <xsd:documentation><![CDATA[
-      Symfony XML Routing Schema, version 1.0
-      Authors: Fabien Potencier, Tobias Schultze
-
-      This scheme defines the elements and attributes that can be used to define
-      routes. A route maps an HTTP request to a set of configuration variables.
-    ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:element name="routes" type="routes" />
-
-  <xsd:complexType name="routes">
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="import" type="import" />
-      <xsd:element name="route" type="route" />
-    </xsd:choice>
-  </xsd:complexType>
-
-  <xsd:group name="configs">
-    <xsd:choice>
-      <xsd:element name="default" nillable="true" type="element" />
-      <xsd:element name="requirement" type="element" />
-      <xsd:element name="option" type="element" />
-      <xsd:element name="condition" type="xsd:string" />
-    </xsd:choice>
-  </xsd:group>
-
-  <xsd:complexType name="route">
-    <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-
-    <xsd:attribute name="id" type="xsd:string" use="required" />
-    <xsd:attribute name="path" type="xsd:string" />
-    <xsd:attribute name="pattern" type="xsd:string" />
-    <xsd:attribute name="host" type="xsd:string" />
-    <xsd:attribute name="schemes" type="xsd:string" />
-    <xsd:attribute name="methods" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="import">
-    <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-
-    <xsd:attribute name="resource" type="xsd:string" use="required" />
-    <xsd:attribute name="type" type="xsd:string" />
-    <xsd:attribute name="prefix" type="xsd:string" />
-    <xsd:attribute name="host" type="xsd:string" />
-    <xsd:attribute name="schemes" type="xsd:string" />
-    <xsd:attribute name="methods" type="xsd:string" />
-  </xsd:complexType>
-
-  <xsd:complexType name="element">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="key" type="xsd:string" use="required" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-</xsd:schema>
diff --git a/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php b/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
deleted file mode 100644
index c0474f2..0000000
--- a/vendor/symfony/routing/Matcher/ApacheUrlMatcher.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-@trigger_error('The '.__NAMESPACE__.'\ApacheUrlMatcher class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
-
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-
-/**
- * ApacheUrlMatcher matches URL based on Apache mod_rewrite matching (see ApacheMatcherDumper).
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             The performance gains are minimal and it's very hard to replicate
- *             the behavior of PHP implementation.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-class ApacheUrlMatcher extends UrlMatcher
-{
-    /**
-     * Tries to match a URL based on Apache mod_rewrite matching.
-     *
-     * Returns false if no route matches the URL.
-     *
-     * @param string $pathinfo The pathinfo to be parsed
-     *
-     * @return array An array of parameters
-     *
-     * @throws MethodNotAllowedException If the current method is not allowed
-     */
-    public function match($pathinfo)
-    {
-        $parameters = array();
-        $defaults = array();
-        $allow = array();
-        $route = null;
-
-        foreach ($this->denormalizeValues($_SERVER) as $key => $value) {
-            $name = $key;
-
-            // skip non-routing variables
-            // this improves performance when $_SERVER contains many usual
-            // variables like HTTP_*, DOCUMENT_ROOT, REQUEST_URI, ...
-            if (false === strpos($name, '_ROUTING_')) {
-                continue;
-            }
-
-            while (0 === strpos($name, 'REDIRECT_')) {
-                $name = substr($name, 9);
-            }
-
-            // expect _ROUTING_<type>_<name>
-            // or _ROUTING_<type>
-
-            if (0 !== strpos($name, '_ROUTING_')) {
-                continue;
-            }
-            if (false !== $pos = strpos($name, '_', 9)) {
-                $type = substr($name, 9, $pos - 9);
-                $name = substr($name, $pos + 1);
-            } else {
-                $type = substr($name, 9);
-            }
-
-            if ('param' === $type) {
-                if ('' !== $value) {
-                    $parameters[$name] = $value;
-                }
-            } elseif ('default' === $type) {
-                $defaults[$name] = $value;
-            } elseif ('route' === $type) {
-                $route = $value;
-            } elseif ('allow' === $type) {
-                $allow[] = $name;
-            }
-
-            unset($_SERVER[$key]);
-        }
-
-        if (null !== $route) {
-            $parameters['_route'] = $route;
-
-            return $this->mergeDefaults($parameters, $defaults);
-        } elseif (0 < count($allow)) {
-            throw new MethodNotAllowedException($allow);
-        } else {
-            return parent::match($pathinfo);
-        }
-    }
-
-    /**
-     * Denormalizes an array of values.
-     *
-     * @param string[] $values
-     *
-     * @return array
-     */
-    private function denormalizeValues(array $values)
-    {
-        $normalizedValues = array();
-        foreach ($values as $key => $value) {
-            if (preg_match('~^(.*)\[(\d+)\]$~', $key, $matches)) {
-                if (!isset($normalizedValues[$matches[1]])) {
-                    $normalizedValues[$matches[1]] = array();
-                }
-                $normalizedValues[$matches[1]][(int) $matches[2]] = $value;
-            } else {
-                $normalizedValues[$key] = $value;
-            }
-        }
-
-        return $normalizedValues;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
deleted file mode 100644
index 1eb5185..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-@trigger_error('The '.__NAMESPACE__.'\ApacheMatcherDumper class is deprecated since version 2.5 and will be removed in 3.0. It\'s hard to replicate the behaviour of the PHP implementation and the performance gains are minimal.', E_USER_DEPRECATED);
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Dumps a set of Apache mod_rewrite rules.
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             The performance gains are minimal and it's very hard to replicate
- *             the behavior of PHP implementation.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Kris Wallsmith <kris@symfony.com>
- */
-class ApacheMatcherDumper extends MatcherDumper
-{
-    /**
-     * Dumps a set of Apache mod_rewrite rules.
-     *
-     * Available options:
-     *
-     *  * script_name: The script name (app.php by default)
-     *  * base_uri:    The base URI ("" by default)
-     *
-     * @param array $options An array of options
-     *
-     * @return string A string to be used as Apache rewrite rules
-     *
-     * @throws \LogicException When the route regex is invalid
-     */
-    public function dump(array $options = array())
-    {
-        $options = array_merge(array(
-            'script_name' => 'app.php',
-            'base_uri' => '',
-        ), $options);
-
-        $options['script_name'] = self::escape($options['script_name'], ' ', '\\');
-
-        $rules = array("# skip \"real\" requests\nRewriteCond %{REQUEST_FILENAME} -f\nRewriteRule .* - [QSA,L]");
-        $methodVars = array();
-        $hostRegexUnique = 0;
-        $prevHostRegex = '';
-
-        foreach ($this->getRoutes()->all() as $name => $route) {
-            if ($route->getCondition()) {
-                throw new \LogicException(sprintf('Unable to dump the routes for Apache as route "%s" has a condition.', $name));
-            }
-
-            $compiledRoute = $route->compile();
-            $hostRegex = $compiledRoute->getHostRegex();
-
-            if (null !== $hostRegex && $prevHostRegex !== $hostRegex) {
-                $prevHostRegex = $hostRegex;
-                ++$hostRegexUnique;
-
-                $rule = array();
-
-                $regex = $this->regexToApacheRegex($hostRegex);
-                $regex = self::escape($regex, ' ', '\\');
-
-                $rule[] = sprintf('RewriteCond %%{HTTP:Host} %s', $regex);
-
-                $variables = array();
-                $variables[] = sprintf('E=__ROUTING_host_%s:1', $hostRegexUnique);
-
-                foreach ($compiledRoute->getHostVariables() as $i => $variable) {
-                    $variables[] = sprintf('E=__ROUTING_host_%s_%s:%%%d', $hostRegexUnique, $variable, $i + 1);
-                }
-
-                $variables = implode(',', $variables);
-
-                $rule[] = sprintf('RewriteRule .? - [%s]', $variables);
-
-                $rules[] = implode("\n", $rule);
-            }
-
-            $rules[] = $this->dumpRoute($name, $route, $options, $hostRegexUnique);
-
-            $methodVars = array_merge($methodVars, $route->getMethods());
-        }
-        if (0 < count($methodVars)) {
-            $rule = array('# 405 Method Not Allowed');
-            $methodVars = array_values(array_unique($methodVars));
-            if (in_array('GET', $methodVars) && !in_array('HEAD', $methodVars)) {
-                $methodVars[] = 'HEAD';
-            }
-            foreach ($methodVars as $i => $methodVar) {
-                $rule[] = sprintf('RewriteCond %%{ENV:_ROUTING__allow_%s} =1%s', $methodVar, isset($methodVars[$i + 1]) ? ' [OR]' : '');
-            }
-            $rule[] = sprintf('RewriteRule .* %s [QSA,L]', $options['script_name']);
-
-            $rules[] = implode("\n", $rule);
-        }
-
-        return implode("\n\n", $rules)."\n";
-    }
-
-    /**
-     * Dumps a single route.
-     *
-     * @param string $name            Route name
-     * @param Route  $route           The route
-     * @param array  $options         Options
-     * @param bool   $hostRegexUnique Unique identifier for the host regex
-     *
-     * @return string The compiled route
-     */
-    private function dumpRoute($name, $route, array $options, $hostRegexUnique)
-    {
-        $compiledRoute = $route->compile();
-
-        // prepare the apache regex
-        $regex = $this->regexToApacheRegex($compiledRoute->getRegex());
-        $regex = '^'.self::escape(preg_quote($options['base_uri']).substr($regex, 1), ' ', '\\');
-
-        $methods = $this->getRouteMethods($route);
-
-        $hasTrailingSlash = (!$methods || in_array('HEAD', $methods)) && '/$' === substr($regex, -2) && '^/$' !== $regex;
-
-        $variables = array('E=_ROUTING_route:'.$name);
-        foreach ($compiledRoute->getHostVariables() as $variable) {
-            $variables[] = sprintf('E=_ROUTING_param_%s:%%{ENV:__ROUTING_host_%s_%s}', $variable, $hostRegexUnique, $variable);
-        }
-        foreach ($compiledRoute->getPathVariables() as $i => $variable) {
-            $variables[] = 'E=_ROUTING_param_'.$variable.':%'.($i + 1);
-        }
-        foreach ($this->normalizeValues($route->getDefaults()) as $key => $value) {
-            $variables[] = 'E=_ROUTING_default_'.$key.':'.strtr($value, array(
-                ':' => '\\:',
-                '=' => '\\=',
-                '\\' => '\\\\',
-                ' ' => '\\ ',
-            ));
-        }
-        $variables = implode(',', $variables);
-
-        $rule = array("# $name");
-
-        // method mismatch
-        if (0 < count($methods)) {
-            $allow = array();
-            foreach ($methods as $method) {
-                $allow[] = 'E=_ROUTING_allow_'.$method.':1';
-            }
-
-            if ($compiledRoute->getHostRegex()) {
-                $rule[] = sprintf('RewriteCond %%{ENV:__ROUTING_host_%s} =1', $hostRegexUnique);
-            }
-
-            $rule[] = "RewriteCond %{REQUEST_URI} $regex";
-            $rule[] = sprintf('RewriteCond %%{REQUEST_METHOD} !^(%s)$ [NC]', implode('|', $methods));
-            $rule[] = sprintf('RewriteRule .* - [S=%d,%s]', $hasTrailingSlash ? 2 : 1, implode(',', $allow));
-        }
-
-        // redirect with trailing slash appended
-        if ($hasTrailingSlash) {
-            if ($compiledRoute->getHostRegex()) {
-                $rule[] = sprintf('RewriteCond %%{ENV:__ROUTING_host_%s} =1', $hostRegexUnique);
-            }
-
-            $rule[] = 'RewriteCond %{REQUEST_URI} '.substr($regex, 0, -2).'$';
-            $rule[] = 'RewriteRule .* $0/ [QSA,L,R=301]';
-        }
-
-        // the main rule
-
-        if ($compiledRoute->getHostRegex()) {
-            $rule[] = sprintf('RewriteCond %%{ENV:__ROUTING_host_%s} =1', $hostRegexUnique);
-        }
-
-        $rule[] = "RewriteCond %{REQUEST_URI} $regex";
-        $rule[] = "RewriteRule .* {$options['script_name']} [QSA,L,$variables]";
-
-        return implode("\n", $rule);
-    }
-
-    /**
-     * Returns methods allowed for a route.
-     *
-     * @param Route $route The route
-     *
-     * @return array The methods
-     */
-    private function getRouteMethods(Route $route)
-    {
-        $methods = $route->getMethods();
-
-        // GET and HEAD are equivalent
-        if (in_array('GET', $methods) && !in_array('HEAD', $methods)) {
-            $methods[] = 'HEAD';
-        }
-
-        return $methods;
-    }
-
-    /**
-     * Converts a regex to make it suitable for mod_rewrite.
-     *
-     * @param string $regex The regex
-     *
-     * @return string The converted regex
-     */
-    private function regexToApacheRegex($regex)
-    {
-        $regexPatternEnd = strrpos($regex, $regex[0]);
-
-        return preg_replace('/\?P<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1));
-    }
-
-    /**
-     * Escapes a string.
-     *
-     * @param string $string The string to be escaped
-     * @param string $char   The character to be escaped
-     * @param string $with   The character to be used for escaping
-     *
-     * @return string The escaped string
-     */
-    private static function escape($string, $char, $with)
-    {
-        $escaped = false;
-        $output = '';
-        foreach (str_split($string) as $symbol) {
-            if ($escaped) {
-                $output .= $symbol;
-                $escaped = false;
-                continue;
-            }
-            if ($symbol === $char) {
-                $output .= $with.$char;
-                continue;
-            }
-            if ($symbol === $with) {
-                $escaped = true;
-            }
-            $output .= $symbol;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Normalizes an array of values.
-     *
-     * @param array $values
-     *
-     * @return string[]
-     */
-    private function normalizeValues(array $values)
-    {
-        $normalizedValues = array();
-        foreach ($values as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $index => $bit) {
-                    $normalizedValues[sprintf('%s[%s]', $key, $index)] = $bit;
-                }
-            } else {
-                $normalizedValues[$key] = (string) $value;
-            }
-        }
-
-        return $normalizedValues;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php b/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php
deleted file mode 100644
index e7dea88..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/DumperCollection.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-/**
- * Collection of routes.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @internal
- */
-class DumperCollection implements \IteratorAggregate
-{
-    /**
-     * @var DumperCollection|null
-     */
-    private $parent;
-
-    /**
-     * @var (DumperCollection|DumperRoute)[]
-     */
-    private $children = array();
-
-    /**
-     * @var array
-     */
-    private $attributes = array();
-
-    /**
-     * Returns the children routes and collections.
-     *
-     * @return (DumperCollection|DumperRoute)[] Array of DumperCollection|DumperRoute
-     */
-    public function all()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Adds a route or collection.
-     *
-     * @param DumperRoute|DumperCollection The route or collection
-     */
-    public function add($child)
-    {
-        if ($child instanceof self) {
-            $child->setParent($this);
-        }
-        $this->children[] = $child;
-    }
-
-    /**
-     * Sets children.
-     *
-     * @param array $children The children
-     */
-    public function setAll(array $children)
-    {
-        foreach ($children as $child) {
-            if ($child instanceof self) {
-                $child->setParent($this);
-            }
-        }
-        $this->children = $children;
-    }
-
-    /**
-     * Returns an iterator over the children.
-     *
-     * @return \Iterator The iterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->children);
-    }
-
-    /**
-     * Returns the root of the collection.
-     *
-     * @return DumperCollection The root collection
-     */
-    public function getRoot()
-    {
-        return (null !== $this->parent) ? $this->parent->getRoot() : $this;
-    }
-
-    /**
-     * Returns the parent collection.
-     *
-     * @return DumperCollection|null The parent collection or null if the collection has no parent
-     */
-    protected function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Sets the parent collection.
-     *
-     * @param DumperCollection $parent The parent collection
-     */
-    protected function setParent(DumperCollection $parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Returns true if the attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * Returns an attribute by name.
-     *
-     * @param string $name    The attribute name
-     * @param mixed  $default Default value is the attribute doesn't exist
-     *
-     * @return mixed The attribute value
-     */
-    public function getAttribute($name, $default = null)
-    {
-        return $this->hasAttribute($name) ? $this->attributes[$name] : $default;
-    }
-
-    /**
-     * Sets an attribute by name.
-     *
-     * @param string $name  The attribute name
-     * @param mixed  $value The attribute value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Sets multiple attributes.
-     *
-     * @param array $attributes The attributes
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php b/vendor/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php
deleted file mode 100644
index dd1a0d9..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-/**
- * Prefix tree of routes preserving routes order.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @internal
- */
-class DumperPrefixCollection extends DumperCollection
-{
-    /**
-     * @var string
-     */
-    private $prefix = '';
-
-    /**
-     * Returns the prefix.
-     *
-     * @return string The prefix
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * Sets the prefix.
-     *
-     * @param string $prefix The prefix
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Adds a route in the tree.
-     *
-     * @param DumperRoute $route The route
-     *
-     * @return DumperPrefixCollection The node the route was added to
-     *
-     * @throws \LogicException
-     */
-    public function addPrefixRoute(DumperRoute $route)
-    {
-        $prefix = $route->getRoute()->compile()->getStaticPrefix();
-
-        for ($collection = $this; null !== $collection; $collection = $collection->getParent()) {
-            // Same prefix, add to current leave
-            if ($collection->prefix === $prefix) {
-                $collection->add($route);
-
-                return $collection;
-            }
-
-            // Prefix starts with route's prefix
-            if ('' === $collection->prefix || 0 === strpos($prefix, $collection->prefix)) {
-                $child = new self();
-                $child->setPrefix(substr($prefix, 0, strlen($collection->prefix) + 1));
-                $collection->add($child);
-
-                return $child->addPrefixRoute($route);
-            }
-        }
-
-        // Reached only if the root has a non empty prefix
-        throw new \LogicException('The collection root must not have a prefix');
-    }
-
-    /**
-     * Merges nodes whose prefix ends with a slash.
-     *
-     * Children of a node whose prefix ends with a slash are moved to the parent node
-     */
-    public function mergeSlashNodes()
-    {
-        $children = array();
-
-        foreach ($this as $child) {
-            if ($child instanceof self) {
-                $child->mergeSlashNodes();
-                if ('/' === substr($child->prefix, -1)) {
-                    $children = array_merge($children, $child->all());
-                } else {
-                    $children[] = $child;
-                }
-            } else {
-                $children[] = $child;
-            }
-        }
-
-        $this->setAll($children);
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php b/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php
deleted file mode 100644
index 3ad08c2..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/DumperRoute.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-use Symfony\Component\Routing\Route;
-
-/**
- * Container for a Route.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @internal
- */
-class DumperRoute
-{
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var Route
-     */
-    private $route;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name  The route name
-     * @param Route  $route The route
-     */
-    public function __construct($name, Route $route)
-    {
-        $this->name = $name;
-        $this->route = $route;
-    }
-
-    /**
-     * Returns the route name.
-     *
-     * @return string The route name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the route.
-     *
-     * @return Route The route
-     */
-    public function getRoute()
-    {
-        return $this->route;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/MatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/MatcherDumper.php
deleted file mode 100644
index 52edc01..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/MatcherDumper.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * MatcherDumper is the abstract class for all built-in matcher dumpers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class MatcherDumper implements MatcherDumperInterface
-{
-    /**
-     * @var RouteCollection
-     */
-    private $routes;
-
-    /**
-     * Constructor.
-     *
-     * @param RouteCollection $routes The RouteCollection to dump
-     */
-    public function __construct(RouteCollection $routes)
-    {
-        $this->routes = $routes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php b/vendor/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php
deleted file mode 100644
index 5e7c134..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * MatcherDumperInterface is the interface that all matcher dumper classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface MatcherDumperInterface
-{
-    /**
-     * Dumps a set of routes to a string representation of executable code
-     * that can then be used to match a request against these routes.
-     *
-     * @param array $options An array of options
-     *
-     * @return string Executable code
-     */
-    public function dump(array $options = array());
-
-    /**
-     * Gets the routes to dump.
-     *
-     * @return RouteCollection A RouteCollection instance
-     */
-    public function getRoutes();
-}
diff --git a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php b/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
deleted file mode 100644
index aa7df8a..0000000
--- a/vendor/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?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\Component\Routing\Matcher\Dumper;
-
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * PhpMatcherDumper creates a PHP class able to match URLs for a given set of routes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- */
-class PhpMatcherDumper extends MatcherDumper
-{
-    private $expressionLanguage;
-
-    /**
-     * @var ExpressionFunctionProviderInterface[]
-     */
-    private $expressionLanguageProviders = array();
-
-    /**
-     * Dumps a set of routes to a PHP class.
-     *
-     * Available options:
-     *
-     *  * class:      The class name
-     *  * base_class: The base class name
-     *
-     * @param array $options An array of options
-     *
-     * @return string A PHP class representing the matcher class
-     */
-    public function dump(array $options = array())
-    {
-        $options = array_replace(array(
-            'class' => 'ProjectUrlMatcher',
-            'base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
-        ), $options);
-
-        // trailing slash support is only enabled if we know how to redirect the user
-        $interfaces = class_implements($options['base_class']);
-        $supportsRedirections = isset($interfaces['Symfony\\Component\\Routing\\Matcher\\RedirectableUrlMatcherInterface']);
-
-        return <<<EOF
-<?php
-
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\RequestContext;
-
-/**
- * {$options['class']}.
- *
- * This class has been auto-generated
- * by the Symfony Routing Component.
- */
-class {$options['class']} extends {$options['base_class']}
-{
-    /**
-     * Constructor.
-     */
-    public function __construct(RequestContext \$context)
-    {
-        \$this->context = \$context;
-    }
-
-{$this->generateMatchMethod($supportsRedirections)}
-}
-
-EOF;
-    }
-
-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
-    {
-        $this->expressionLanguageProviders[] = $provider;
-    }
-
-    /**
-     * Generates the code for the match method implementing UrlMatcherInterface.
-     *
-     * @param bool $supportsRedirections Whether redirections are supported by the base class
-     *
-     * @return string Match method as PHP code
-     */
-    private function generateMatchMethod($supportsRedirections)
-    {
-        $code = rtrim($this->compileRoutes($this->getRoutes(), $supportsRedirections), "\n");
-
-        return <<<EOF
-    public function match(\$pathinfo)
-    {
-        \$allow = array();
-        \$pathinfo = rawurldecode(\$pathinfo);
-        \$context = \$this->context;
-        \$request = \$this->request;
-
-$code
-
-        throw 0 < count(\$allow) ? new MethodNotAllowedException(array_unique(\$allow)) : new ResourceNotFoundException();
-    }
-EOF;
-    }
-
-    /**
-     * Generates PHP code to match a RouteCollection with all its routes.
-     *
-     * @param RouteCollection $routes               A RouteCollection instance
-     * @param bool            $supportsRedirections Whether redirections are supported by the base class
-     *
-     * @return string PHP code
-     */
-    private function compileRoutes(RouteCollection $routes, $supportsRedirections)
-    {
-        $fetchedHost = false;
-
-        $groups = $this->groupRoutesByHostRegex($routes);
-        $code = '';
-
-        foreach ($groups as $collection) {
-            if (null !== $regex = $collection->getAttribute('host_regex')) {
-                if (!$fetchedHost) {
-                    $code .= "        \$host = \$this->context->getHost();\n\n";
-                    $fetchedHost = true;
-                }
-
-                $code .= sprintf("        if (preg_match(%s, \$host, \$hostMatches)) {\n", var_export($regex, true));
-            }
-
-            $tree = $this->buildPrefixTree($collection);
-            $groupCode = $this->compilePrefixRoutes($tree, $supportsRedirections);
-
-            if (null !== $regex) {
-                // apply extra indention at each line (except empty ones)
-                $groupCode = preg_replace('/^.{2,}$/m', '    $0', $groupCode);
-                $code .= $groupCode;
-                $code .= "        }\n\n";
-            } else {
-                $code .= $groupCode;
-            }
-        }
-
-        return $code;
-    }
-
-    /**
-     * Generates PHP code recursively to match a tree of routes.
-     *
-     * @param DumperPrefixCollection $collection           A DumperPrefixCollection instance
-     * @param bool                   $supportsRedirections Whether redirections are supported by the base class
-     * @param string                 $parentPrefix         Prefix of the parent collection
-     *
-     * @return string PHP code
-     */
-    private function compilePrefixRoutes(DumperPrefixCollection $collection, $supportsRedirections, $parentPrefix = '')
-    {
-        $code = '';
-        $prefix = $collection->getPrefix();
-        $optimizable = 1 < strlen($prefix) && 1 < count($collection->all());
-        $optimizedPrefix = $parentPrefix;
-
-        if ($optimizable) {
-            $optimizedPrefix = $prefix;
-
-            $code .= sprintf("    if (0 === strpos(\$pathinfo, %s)) {\n", var_export($prefix, true));
-        }
-
-        foreach ($collection as $route) {
-            if ($route instanceof DumperCollection) {
-                $code .= $this->compilePrefixRoutes($route, $supportsRedirections, $optimizedPrefix);
-            } else {
-                $code .= $this->compileRoute($route->getRoute(), $route->getName(), $supportsRedirections, $optimizedPrefix)."\n";
-            }
-        }
-
-        if ($optimizable) {
-            $code .= "    }\n\n";
-            // apply extra indention at each line (except empty ones)
-            $code = preg_replace('/^.{2,}$/m', '    $0', $code);
-        }
-
-        return $code;
-    }
-
-    /**
-     * Compiles a single Route to PHP code used to match it against the path info.
-     *
-     * @param Route       $route                A Route instance
-     * @param string      $name                 The name of the Route
-     * @param bool        $supportsRedirections Whether redirections are supported by the base class
-     * @param string|null $parentPrefix         The prefix of the parent collection used to optimize the code
-     *
-     * @return string PHP code
-     *
-     * @throws \LogicException
-     */
-    private function compileRoute(Route $route, $name, $supportsRedirections, $parentPrefix = null)
-    {
-        $code = '';
-        $compiledRoute = $route->compile();
-        $conditions = array();
-        $hasTrailingSlash = false;
-        $matches = false;
-        $hostMatches = false;
-        $methods = $route->getMethods();
-
-        // GET and HEAD are equivalent
-        if (in_array('GET', $methods) && !in_array('HEAD', $methods)) {
-            $methods[] = 'HEAD';
-        }
-
-        $supportsTrailingSlash = $supportsRedirections && (!$methods || in_array('HEAD', $methods));
-
-        if (!count($compiledRoute->getPathVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#', $compiledRoute->getRegex(), $m)) {
-            if ($supportsTrailingSlash && substr($m['url'], -1) === '/') {
-                $conditions[] = sprintf("rtrim(\$pathinfo, '/') === %s", var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
-                $hasTrailingSlash = true;
-            } else {
-                $conditions[] = sprintf('$pathinfo === %s', var_export(str_replace('\\', '', $m['url']), true));
-            }
-        } else {
-            if ($compiledRoute->getStaticPrefix() && $compiledRoute->getStaticPrefix() !== $parentPrefix) {
-                $conditions[] = sprintf('0 === strpos($pathinfo, %s)', var_export($compiledRoute->getStaticPrefix(), true));
-            }
-
-            $regex = $compiledRoute->getRegex();
-            if ($supportsTrailingSlash && $pos = strpos($regex, '/$')) {
-                $regex = substr($regex, 0, $pos).'/?$'.substr($regex, $pos + 2);
-                $hasTrailingSlash = true;
-            }
-            $conditions[] = sprintf('preg_match(%s, $pathinfo, $matches)', var_export($regex, true));
-
-            $matches = true;
-        }
-
-        if ($compiledRoute->getHostVariables()) {
-            $hostMatches = true;
-        }
-
-        if ($route->getCondition()) {
-            $conditions[] = $this->getExpressionLanguage()->compile($route->getCondition(), array('context', 'request'));
-        }
-
-        $conditions = implode(' && ', $conditions);
-
-        $code .= <<<EOF
-        // $name
-        if ($conditions) {
-
-EOF;
-
-        $gotoname = 'not_'.preg_replace('/[^A-Za-z0-9_]/', '', $name);
-        if ($methods) {
-            if (1 === count($methods)) {
-                $code .= <<<EOF
-            if (\$this->context->getMethod() != '$methods[0]') {
-                \$allow[] = '$methods[0]';
-                goto $gotoname;
-            }
-
-
-EOF;
-            } else {
-                $methods = implode("', '", $methods);
-                $code .= <<<EOF
-            if (!in_array(\$this->context->getMethod(), array('$methods'))) {
-                \$allow = array_merge(\$allow, array('$methods'));
-                goto $gotoname;
-            }
-
-
-EOF;
-            }
-        }
-
-        if ($hasTrailingSlash) {
-            $code .= <<<EOF
-            if (substr(\$pathinfo, -1) !== '/') {
-                return \$this->redirect(\$pathinfo.'/', '$name');
-            }
-
-
-EOF;
-        }
-
-        if ($schemes = $route->getSchemes()) {
-            if (!$supportsRedirections) {
-                throw new \LogicException('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
-            }
-            $schemes = str_replace("\n", '', var_export(array_flip($schemes), true));
-            $code .= <<<EOF
-            \$requiredSchemes = $schemes;
-            if (!isset(\$requiredSchemes[\$this->context->getScheme()])) {
-                return \$this->redirect(\$pathinfo, '$name', key(\$requiredSchemes));
-            }
-
-
-EOF;
-        }
-
-        // optimize parameters array
-        if ($matches || $hostMatches) {
-            $vars = array();
-            if ($hostMatches) {
-                $vars[] = '$hostMatches';
-            }
-            if ($matches) {
-                $vars[] = '$matches';
-            }
-            $vars[] = "array('_route' => '$name')";
-
-            $code .= sprintf(
-                "            return \$this->mergeDefaults(array_replace(%s), %s);\n",
-                implode(', ', $vars),
-                str_replace("\n", '', var_export($route->getDefaults(), true))
-            );
-        } elseif ($route->getDefaults()) {
-            $code .= sprintf("            return %s;\n", str_replace("\n", '', var_export(array_replace($route->getDefaults(), array('_route' => $name)), true)));
-        } else {
-            $code .= sprintf("            return array('_route' => '%s');\n", $name);
-        }
-        $code .= "        }\n";
-
-        if ($methods) {
-            $code .= "        $gotoname:\n";
-        }
-
-        return $code;
-    }
-
-    /**
-     * Groups consecutive routes having the same host regex.
-     *
-     * The result is a collection of collections of routes having the same host regex.
-     *
-     * @param RouteCollection $routes A flat RouteCollection
-     *
-     * @return DumperCollection A collection with routes grouped by host regex in sub-collections
-     */
-    private function groupRoutesByHostRegex(RouteCollection $routes)
-    {
-        $groups = new DumperCollection();
-
-        $currentGroup = new DumperCollection();
-        $currentGroup->setAttribute('host_regex', null);
-        $groups->add($currentGroup);
-
-        foreach ($routes as $name => $route) {
-            $hostRegex = $route->compile()->getHostRegex();
-            if ($currentGroup->getAttribute('host_regex') !== $hostRegex) {
-                $currentGroup = new DumperCollection();
-                $currentGroup->setAttribute('host_regex', $hostRegex);
-                $groups->add($currentGroup);
-            }
-            $currentGroup->add(new DumperRoute($name, $route));
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Organizes the routes into a prefix tree.
-     *
-     * Routes order is preserved such that traversing the tree will traverse the
-     * routes in the origin order.
-     *
-     * @param DumperCollection $collection A collection of routes
-     *
-     * @return DumperPrefixCollection
-     */
-    private function buildPrefixTree(DumperCollection $collection)
-    {
-        $tree = new DumperPrefixCollection();
-        $current = $tree;
-
-        foreach ($collection as $route) {
-            $current = $current->addPrefixRoute($route);
-        }
-
-        $tree->mergeSlashNodes();
-
-        return $tree;
-    }
-
-    private function getExpressionLanguage()
-    {
-        if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
-            $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
-        }
-
-        return $this->expressionLanguage;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php b/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
deleted file mode 100644
index 463bc0d..0000000
--- a/vendor/symfony/routing/Matcher/RedirectableUrlMatcher.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Route;
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function match($pathinfo)
-    {
-        try {
-            $parameters = parent::match($pathinfo);
-        } catch (ResourceNotFoundException $e) {
-            if ('/' === substr($pathinfo, -1) || !in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
-                throw $e;
-            }
-
-            try {
-                parent::match($pathinfo.'/');
-
-                return $this->redirect($pathinfo.'/', null);
-            } catch (ResourceNotFoundException $e2) {
-                throw $e;
-            }
-        }
-
-        return $parameters;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function handleRouteRequirements($pathinfo, $name, Route $route)
-    {
-        // expression condition
-        if ($route->getCondition() && !$this->getExpressionLanguage()->evaluate($route->getCondition(), array('context' => $this->context, 'request' => $this->request))) {
-            return array(self::REQUIREMENT_MISMATCH, null);
-        }
-
-        // check HTTP scheme requirement
-        $scheme = $this->context->getScheme();
-        $schemes = $route->getSchemes();
-        if ($schemes && !$route->hasScheme($scheme)) {
-            return array(self::ROUTE_MATCH, $this->redirect($pathinfo, $name, current($schemes)));
-        }
-
-        return array(self::REQUIREMENT_MATCH, null);
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php b/vendor/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php
deleted file mode 100644
index 4dd8969..0000000
--- a/vendor/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-/**
- * RedirectableUrlMatcherInterface knows how to redirect the user.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface RedirectableUrlMatcherInterface
-{
-    /**
-     * Redirects the user to another URL.
-     *
-     * @param string      $path   The path info to redirect to.
-     * @param string      $route  The route name that matched
-     * @param string|null $scheme The URL scheme (null to keep the current one)
-     *
-     * @return array An array of parameters
-     */
-    public function redirect($path, $route, $scheme = null);
-}
diff --git a/vendor/symfony/routing/Matcher/RequestMatcherInterface.php b/vendor/symfony/routing/Matcher/RequestMatcherInterface.php
deleted file mode 100644
index b5def3d..0000000
--- a/vendor/symfony/routing/Matcher/RequestMatcherInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-
-/**
- * RequestMatcherInterface is the interface that all request matcher classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface RequestMatcherInterface
-{
-    /**
-     * Tries to match a request with a set of routes.
-     *
-     * If the matcher can not find information, it must throw one of the exceptions documented
-     * below.
-     *
-     * @param Request $request The request to match
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If no matching resource could be found
-     * @throws MethodNotAllowedException If a matching resource was found but the request method is not allowed
-     */
-    public function matchRequest(Request $request);
-}
diff --git a/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php b/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
deleted file mode 100644
index ef4f24c..0000000
--- a/vendor/symfony/routing/Matcher/TraceableUrlMatcher.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-use Symfony\Component\Routing\Exception\ExceptionInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * TraceableUrlMatcher helps debug path info matching by tracing the match.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class TraceableUrlMatcher extends UrlMatcher
-{
-    const ROUTE_DOES_NOT_MATCH = 0;
-    const ROUTE_ALMOST_MATCHES = 1;
-    const ROUTE_MATCHES = 2;
-
-    protected $traces;
-
-    public function getTraces($pathinfo)
-    {
-        $this->traces = array();
-
-        try {
-            $this->match($pathinfo);
-        } catch (ExceptionInterface $e) {
-        }
-
-        return $this->traces;
-    }
-
-    protected function matchCollection($pathinfo, RouteCollection $routes)
-    {
-        foreach ($routes as $name => $route) {
-            $compiledRoute = $route->compile();
-
-            if (!preg_match($compiledRoute->getRegex(), $pathinfo, $matches)) {
-                // does it match without any requirements?
-                $r = new Route($route->getPath(), $route->getDefaults(), array(), $route->getOptions());
-                $cr = $r->compile();
-                if (!preg_match($cr->getRegex(), $pathinfo)) {
-                    $this->addTrace(sprintf('Path "%s" does not match', $route->getPath()), self::ROUTE_DOES_NOT_MATCH, $name, $route);
-
-                    continue;
-                }
-
-                foreach ($route->getRequirements() as $n => $regex) {
-                    $r = new Route($route->getPath(), $route->getDefaults(), array($n => $regex), $route->getOptions());
-                    $cr = $r->compile();
-
-                    if (in_array($n, $cr->getVariables()) && !preg_match($cr->getRegex(), $pathinfo)) {
-                        $this->addTrace(sprintf('Requirement for "%s" does not match (%s)', $n, $regex), self::ROUTE_ALMOST_MATCHES, $name, $route);
-
-                        continue 2;
-                    }
-                }
-
-                continue;
-            }
-
-            // check host requirement
-            $hostMatches = array();
-            if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) {
-                $this->addTrace(sprintf('Host "%s" does not match the requirement ("%s")', $this->context->getHost(), $route->getHost()), self::ROUTE_ALMOST_MATCHES, $name, $route);
-
-                continue;
-            }
-
-            // check HTTP method requirement
-            if ($requiredMethods = $route->getMethods()) {
-                // HEAD and GET are equivalent as per RFC
-                if ('HEAD' === $method = $this->context->getMethod()) {
-                    $method = 'GET';
-                }
-
-                if (!in_array($method, $requiredMethods)) {
-                    $this->allow = array_merge($this->allow, $requiredMethods);
-
-                    $this->addTrace(sprintf('Method "%s" does not match any of the required methods (%s)', $this->context->getMethod(), implode(', ', $requiredMethods)), self::ROUTE_ALMOST_MATCHES, $name, $route);
-
-                    continue;
-                }
-            }
-
-            // check condition
-            if ($condition = $route->getCondition()) {
-                if (!$this->getExpressionLanguage()->evaluate($condition, array('context' => $this->context, 'request' => $this->request))) {
-                    $this->addTrace(sprintf('Condition "%s" does not evaluate to "true"', $condition), self::ROUTE_ALMOST_MATCHES, $name, $route);
-
-                    continue;
-                }
-            }
-
-            // check HTTP scheme requirement
-            if ($requiredSchemes = $route->getSchemes()) {
-                $scheme = $this->context->getScheme();
-
-                if (!$route->hasScheme($scheme)) {
-                    $this->addTrace(sprintf('Scheme "%s" does not match any of the required schemes (%s); the user will be redirected to first required scheme', $scheme, implode(', ', $requiredSchemes)), self::ROUTE_ALMOST_MATCHES, $name, $route);
-
-                    return true;
-                }
-            }
-
-            $this->addTrace('Route matches!', self::ROUTE_MATCHES, $name, $route);
-
-            return true;
-        }
-    }
-
-    private function addTrace($log, $level = self::ROUTE_DOES_NOT_MATCH, $name = null, $route = null)
-    {
-        $this->traces[] = array(
-            'log' => $log,
-            'name' => $name,
-            'level' => $level,
-            'path' => null !== $route ? $route->getPath() : null,
-        );
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/UrlMatcher.php b/vendor/symfony/routing/Matcher/UrlMatcher.php
deleted file mode 100644
index 9786a9b..0000000
--- a/vendor/symfony/routing/Matcher/UrlMatcher.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * UrlMatcher matches URL based on a set of routes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
-{
-    const REQUIREMENT_MATCH = 0;
-    const REQUIREMENT_MISMATCH = 1;
-    const ROUTE_MATCH = 2;
-
-    /**
-     * @var RequestContext
-     */
-    protected $context;
-
-    /**
-     * @var array
-     */
-    protected $allow = array();
-
-    /**
-     * @var RouteCollection
-     */
-    protected $routes;
-
-    protected $request;
-    protected $expressionLanguage;
-
-    /**
-     * @var ExpressionFunctionProviderInterface[]
-     */
-    protected $expressionLanguageProviders = array();
-
-    /**
-     * Constructor.
-     *
-     * @param RouteCollection $routes  A RouteCollection instance
-     * @param RequestContext  $context The context
-     */
-    public function __construct(RouteCollection $routes, RequestContext $context)
-    {
-        $this->routes = $routes;
-        $this->context = $context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContext(RequestContext $context)
-    {
-        $this->context = $context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function match($pathinfo)
-    {
-        $this->allow = array();
-
-        if ($ret = $this->matchCollection(rawurldecode($pathinfo), $this->routes)) {
-            return $ret;
-        }
-
-        throw 0 < count($this->allow)
-            ? new MethodNotAllowedException(array_unique($this->allow))
-            : new ResourceNotFoundException(sprintf('No routes found for "%s".', $pathinfo));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function matchRequest(Request $request)
-    {
-        $this->request = $request;
-
-        $ret = $this->match($request->getPathInfo());
-
-        $this->request = null;
-
-        return $ret;
-    }
-
-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
-    {
-        $this->expressionLanguageProviders[] = $provider;
-    }
-
-    /**
-     * Tries to match a URL with a set of routes.
-     *
-     * @param string          $pathinfo The path info to be parsed
-     * @param RouteCollection $routes   The set of routes
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If the resource could not be found
-     * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
-     */
-    protected function matchCollection($pathinfo, RouteCollection $routes)
-    {
-        foreach ($routes as $name => $route) {
-            $compiledRoute = $route->compile();
-
-            // check the static prefix of the URL first. Only use the more expensive preg_match when it matches
-            if ('' !== $compiledRoute->getStaticPrefix() && 0 !== strpos($pathinfo, $compiledRoute->getStaticPrefix())) {
-                continue;
-            }
-
-            if (!preg_match($compiledRoute->getRegex(), $pathinfo, $matches)) {
-                continue;
-            }
-
-            $hostMatches = array();
-            if ($compiledRoute->getHostRegex() && !preg_match($compiledRoute->getHostRegex(), $this->context->getHost(), $hostMatches)) {
-                continue;
-            }
-
-            // check HTTP method requirement
-            if ($requiredMethods = $route->getMethods()) {
-                // HEAD and GET are equivalent as per RFC
-                if ('HEAD' === $method = $this->context->getMethod()) {
-                    $method = 'GET';
-                }
-
-                if (!in_array($method, $requiredMethods)) {
-                    $this->allow = array_merge($this->allow, $requiredMethods);
-
-                    continue;
-                }
-            }
-
-            $status = $this->handleRouteRequirements($pathinfo, $name, $route);
-
-            if (self::ROUTE_MATCH === $status[0]) {
-                return $status[1];
-            }
-
-            if (self::REQUIREMENT_MISMATCH === $status[0]) {
-                continue;
-            }
-
-            return $this->getAttributes($route, $name, array_replace($matches, $hostMatches));
-        }
-    }
-
-    /**
-     * Returns an array of values to use as request attributes.
-     *
-     * As this method requires the Route object, it is not available
-     * in matchers that do not have access to the matched Route instance
-     * (like the PHP and Apache matcher dumpers).
-     *
-     * @param Route  $route      The route we are matching against
-     * @param string $name       The name of the route
-     * @param array  $attributes An array of attributes from the matcher
-     *
-     * @return array An array of parameters
-     */
-    protected function getAttributes(Route $route, $name, array $attributes)
-    {
-        $attributes['_route'] = $name;
-
-        return $this->mergeDefaults($attributes, $route->getDefaults());
-    }
-
-    /**
-     * Handles specific route requirements.
-     *
-     * @param string $pathinfo The path
-     * @param string $name     The route name
-     * @param Route  $route    The route
-     *
-     * @return array The first element represents the status, the second contains additional information
-     */
-    protected function handleRouteRequirements($pathinfo, $name, Route $route)
-    {
-        // expression condition
-        if ($route->getCondition() && !$this->getExpressionLanguage()->evaluate($route->getCondition(), array('context' => $this->context, 'request' => $this->request))) {
-            return array(self::REQUIREMENT_MISMATCH, null);
-        }
-
-        // check HTTP scheme requirement
-        $scheme = $this->context->getScheme();
-        $status = $route->getSchemes() && !$route->hasScheme($scheme) ? self::REQUIREMENT_MISMATCH : self::REQUIREMENT_MATCH;
-
-        return array($status, null);
-    }
-
-    /**
-     * Get merged default parameters.
-     *
-     * @param array $params   The parameters
-     * @param array $defaults The defaults
-     *
-     * @return array Merged default parameters
-     */
-    protected function mergeDefaults($params, $defaults)
-    {
-        foreach ($params as $key => $value) {
-            if (!is_int($key)) {
-                $defaults[$key] = $value;
-            }
-        }
-
-        return $defaults;
-    }
-
-    protected function getExpressionLanguage()
-    {
-        if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new \RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
-            $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders);
-        }
-
-        return $this->expressionLanguage;
-    }
-}
diff --git a/vendor/symfony/routing/Matcher/UrlMatcherInterface.php b/vendor/symfony/routing/Matcher/UrlMatcherInterface.php
deleted file mode 100644
index af38662..0000000
--- a/vendor/symfony/routing/Matcher/UrlMatcherInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\Routing\Matcher;
-
-use Symfony\Component\Routing\RequestContextAwareInterface;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Exception\MethodNotAllowedException;
-
-/**
- * UrlMatcherInterface is the interface that all URL matcher classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface UrlMatcherInterface extends RequestContextAwareInterface
-{
-    /**
-     * Tries to match a URL path with a set of routes.
-     *
-     * If the matcher can not find information, it must throw one of the exceptions documented
-     * below.
-     *
-     * @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded)
-     *
-     * @return array An array of parameters
-     *
-     * @throws ResourceNotFoundException If the resource could not be found
-     * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
-     */
-    public function match($pathinfo);
-}
diff --git a/vendor/symfony/routing/README.md b/vendor/symfony/routing/README.md
deleted file mode 100644
index 1a94583..0000000
--- a/vendor/symfony/routing/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Routing Component
-=================
-
-Routing associates a request with the code that will convert it to a response.
-
-The example below demonstrates how you can set up a fully working routing
-system:
-
-```php
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Matcher\UrlMatcher;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Route;
-
-$routes = new RouteCollection();
-$routes->add('hello', new Route('/hello', array('controller' => 'foo')));
-
-$context = new RequestContext();
-
-// this is optional and can be done without a Request instance
-$context->fromRequest(Request::createFromGlobals());
-
-$matcher = new UrlMatcher($routes, $context);
-
-$parameters = $matcher->match('/hello');
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Routing/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/routing/RequestContext.php b/vendor/symfony/routing/RequestContext.php
deleted file mode 100644
index 862b824..0000000
--- a/vendor/symfony/routing/RequestContext.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?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\Component\Routing;
-
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * Holds information about the current request.
- *
- * This class implements a fluent interface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class RequestContext
-{
-    private $baseUrl;
-    private $pathInfo;
-    private $method;
-    private $host;
-    private $scheme;
-    private $httpPort;
-    private $httpsPort;
-    private $queryString;
-
-    /**
-     * @var array
-     */
-    private $parameters = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $baseUrl     The base URL
-     * @param string $method      The HTTP method
-     * @param string $host        The HTTP host name
-     * @param string $scheme      The HTTP scheme
-     * @param int    $httpPort    The HTTP port
-     * @param int    $httpsPort   The HTTPS port
-     * @param string $path        The path
-     * @param string $queryString The query string
-     */
-    public function __construct($baseUrl = '', $method = 'GET', $host = 'localhost', $scheme = 'http', $httpPort = 80, $httpsPort = 443, $path = '/', $queryString = '')
-    {
-        $this->setBaseUrl($baseUrl);
-        $this->setMethod($method);
-        $this->setHost($host);
-        $this->setScheme($scheme);
-        $this->setHttpPort($httpPort);
-        $this->setHttpsPort($httpsPort);
-        $this->setPathInfo($path);
-        $this->setQueryString($queryString);
-    }
-
-    /**
-     * Updates the RequestContext information based on a HttpFoundation Request.
-     *
-     * @param Request $request A Request instance
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function fromRequest(Request $request)
-    {
-        $this->setBaseUrl($request->getBaseUrl());
-        $this->setPathInfo($request->getPathInfo());
-        $this->setMethod($request->getMethod());
-        $this->setHost($request->getHost());
-        $this->setScheme($request->getScheme());
-        $this->setHttpPort($request->isSecure() ? $this->httpPort : $request->getPort());
-        $this->setHttpsPort($request->isSecure() ? $request->getPort() : $this->httpsPort);
-        $this->setQueryString($request->server->get('QUERY_STRING', ''));
-
-        return $this;
-    }
-
-    /**
-     * Gets the base URL.
-     *
-     * @return string The base URL
-     */
-    public function getBaseUrl()
-    {
-        return $this->baseUrl;
-    }
-
-    /**
-     * Sets the base URL.
-     *
-     * @param string $baseUrl The base URL
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setBaseUrl($baseUrl)
-    {
-        $this->baseUrl = $baseUrl;
-
-        return $this;
-    }
-
-    /**
-     * Gets the path info.
-     *
-     * @return string The path info
-     */
-    public function getPathInfo()
-    {
-        return $this->pathInfo;
-    }
-
-    /**
-     * Sets the path info.
-     *
-     * @param string $pathInfo The path info
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setPathInfo($pathInfo)
-    {
-        $this->pathInfo = $pathInfo;
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP method.
-     *
-     * The method is always an uppercased string.
-     *
-     * @return string The HTTP method
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Sets the HTTP method.
-     *
-     * @param string $method The HTTP method
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setMethod($method)
-    {
-        $this->method = strtoupper($method);
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP host.
-     *
-     * The host is always lowercased because it must be treated case-insensitive.
-     *
-     * @return string The HTTP host
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Sets the HTTP host.
-     *
-     * @param string $host The HTTP host
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setHost($host)
-    {
-        $this->host = strtolower($host);
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP scheme.
-     *
-     * @return string The HTTP scheme
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * Sets the HTTP scheme.
-     *
-     * @param string $scheme The HTTP scheme
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setScheme($scheme)
-    {
-        $this->scheme = strtolower($scheme);
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTP port.
-     *
-     * @return int The HTTP port
-     */
-    public function getHttpPort()
-    {
-        return $this->httpPort;
-    }
-
-    /**
-     * Sets the HTTP port.
-     *
-     * @param int $httpPort The HTTP port
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setHttpPort($httpPort)
-    {
-        $this->httpPort = (int) $httpPort;
-
-        return $this;
-    }
-
-    /**
-     * Gets the HTTPS port.
-     *
-     * @return int The HTTPS port
-     */
-    public function getHttpsPort()
-    {
-        return $this->httpsPort;
-    }
-
-    /**
-     * Sets the HTTPS port.
-     *
-     * @param int $httpsPort The HTTPS port
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setHttpsPort($httpsPort)
-    {
-        $this->httpsPort = (int) $httpsPort;
-
-        return $this;
-    }
-
-    /**
-     * Gets the query string.
-     *
-     * @return string The query string without the "?"
-     */
-    public function getQueryString()
-    {
-        return $this->queryString;
-    }
-
-    /**
-     * Sets the query string.
-     *
-     * @param string $queryString The query string (after "?")
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setQueryString($queryString)
-    {
-        // string cast to be fault-tolerant, accepting null
-        $this->queryString = (string) $queryString;
-
-        return $this;
-    }
-
-    /**
-     * Returns the parameters.
-     *
-     * @return array The parameters
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Sets the parameters.
-     *
-     * @param array $parameters The parameters
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setParameters(array $parameters)
-    {
-        $this->parameters = $parameters;
-
-        return $this;
-    }
-
-    /**
-     * Gets a parameter value.
-     *
-     * @param string $name A parameter name
-     *
-     * @return mixed The parameter value or null if nonexistent
-     */
-    public function getParameter($name)
-    {
-        return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
-    }
-
-    /**
-     * Checks if a parameter value is set for the given parameter.
-     *
-     * @param string $name A parameter name
-     *
-     * @return bool True if the parameter value is set, false otherwise
-     */
-    public function hasParameter($name)
-    {
-        return array_key_exists($name, $this->parameters);
-    }
-
-    /**
-     * Sets a parameter value.
-     *
-     * @param string $name      A parameter name
-     * @param mixed  $parameter The parameter value
-     *
-     * @return RequestContext The current instance, implementing a fluent interface
-     */
-    public function setParameter($name, $parameter)
-    {
-        $this->parameters[$name] = $parameter;
-
-        return $this;
-    }
-}
diff --git a/vendor/symfony/routing/RequestContextAwareInterface.php b/vendor/symfony/routing/RequestContextAwareInterface.php
deleted file mode 100644
index ebb0ef4..0000000
--- a/vendor/symfony/routing/RequestContextAwareInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Routing;
-
-interface RequestContextAwareInterface
-{
-    /**
-     * Sets the request context.
-     *
-     * @param RequestContext $context The context
-     */
-    public function setContext(RequestContext $context);
-
-    /**
-     * Gets the request context.
-     *
-     * @return RequestContext The context
-     */
-    public function getContext();
-}
diff --git a/vendor/symfony/routing/Route.php b/vendor/symfony/routing/Route.php
deleted file mode 100644
index b485bde..0000000
--- a/vendor/symfony/routing/Route.php
+++ /dev/null
@@ -1,659 +0,0 @@
-<?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\Component\Routing;
-
-/**
- * A Route describes a route and its parameters.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class Route implements \Serializable
-{
-    /**
-     * @var string
-     */
-    private $path = '/';
-
-    /**
-     * @var string
-     */
-    private $host = '';
-
-    /**
-     * @var array
-     */
-    private $schemes = array();
-
-    /**
-     * @var array
-     */
-    private $methods = array();
-
-    /**
-     * @var array
-     */
-    private $defaults = array();
-
-    /**
-     * @var array
-     */
-    private $requirements = array();
-
-    /**
-     * @var array
-     */
-    private $options = array();
-
-    /**
-     * @var null|CompiledRoute
-     */
-    private $compiled;
-
-    /**
-     * @var string
-     */
-    private $condition = '';
-
-    /**
-     * Constructor.
-     *
-     * Available options:
-     *
-     *  * compiler_class: A class name able to compile this route instance (RouteCompiler by default)
-     *
-     * @param string       $path         The path pattern to match
-     * @param array        $defaults     An array of default parameter values
-     * @param array        $requirements An array of requirements for parameters (regexes)
-     * @param array        $options      An array of options
-     * @param string       $host         The host pattern to match
-     * @param string|array $schemes      A required URI scheme or an array of restricted schemes
-     * @param string|array $methods      A required HTTP method or an array of restricted methods
-     * @param string       $condition    A condition that should evaluate to true for the route to match
-     */
-    public function __construct($path, array $defaults = array(), array $requirements = array(), array $options = array(), $host = '', $schemes = array(), $methods = array(), $condition = '')
-    {
-        $this->setPath($path);
-        $this->setDefaults($defaults);
-        $this->setRequirements($requirements);
-        $this->setOptions($options);
-        $this->setHost($host);
-        // The conditions make sure that an initial empty $schemes/$methods does not override the corresponding requirement.
-        // They can be removed when the BC layer is removed.
-        if ($schemes) {
-            $this->setSchemes($schemes);
-        }
-        if ($methods) {
-            $this->setMethods($methods);
-        }
-        $this->setCondition($condition);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function serialize()
-    {
-        return serialize(array(
-            'path' => $this->path,
-            'host' => $this->host,
-            'defaults' => $this->defaults,
-            'requirements' => $this->requirements,
-            'options' => $this->options,
-            'schemes' => $this->schemes,
-            'methods' => $this->methods,
-            'condition' => $this->condition,
-            'compiled' => $this->compiled,
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unserialize($serialized)
-    {
-        $data = unserialize($serialized);
-        $this->path = $data['path'];
-        $this->host = $data['host'];
-        $this->defaults = $data['defaults'];
-        $this->requirements = $data['requirements'];
-        $this->options = $data['options'];
-        $this->schemes = $data['schemes'];
-        $this->methods = $data['methods'];
-
-        if (isset($data['condition'])) {
-            $this->condition = $data['condition'];
-        }
-        if (isset($data['compiled'])) {
-            $this->compiled = $data['compiled'];
-        }
-    }
-
-    /**
-     * Returns the pattern for the path.
-     *
-     * @return string The pattern
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use getPath instead.
-     */
-    public function getPattern()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the getPath() method instead.', E_USER_DEPRECATED);
-
-        return $this->path;
-    }
-
-    /**
-     * Sets the pattern for the path.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string $pattern The path pattern
-     *
-     * @return Route The current Route instance
-     *
-     * @deprecated since version 2.2, to be removed in 3.0. Use setPath instead.
-     */
-    public function setPattern($pattern)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Use the setPath() method instead.', E_USER_DEPRECATED);
-
-        return $this->setPath($pattern);
-    }
-
-    /**
-     * Returns the pattern for the path.
-     *
-     * @return string The path pattern
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Sets the pattern for the path.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string $pattern The path pattern
-     *
-     * @return Route The current Route instance
-     */
-    public function setPath($pattern)
-    {
-        // A pattern must start with a slash and must not have multiple slashes at the beginning because the
-        // generated path for this route would be confused with a network path, e.g. '//domain.com/path'.
-        $this->path = '/'.ltrim(trim($pattern), '/');
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the pattern for the host.
-     *
-     * @return string The host pattern
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Sets the pattern for the host.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string $pattern The host pattern
-     *
-     * @return Route The current Route instance
-     */
-    public function setHost($pattern)
-    {
-        $this->host = (string) $pattern;
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the lowercased schemes this route is restricted to.
-     * So an empty array means that any scheme is allowed.
-     *
-     * @return array The schemes
-     */
-    public function getSchemes()
-    {
-        return $this->schemes;
-    }
-
-    /**
-     * Sets the schemes (e.g. 'https') this route is restricted to.
-     * So an empty array means that any scheme is allowed.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string|array $schemes The scheme or an array of schemes
-     *
-     * @return Route The current Route instance
-     */
-    public function setSchemes($schemes)
-    {
-        $this->schemes = array_map('strtolower', (array) $schemes);
-
-        // this is to keep BC and will be removed in a future version
-        if ($this->schemes) {
-            $this->requirements['_scheme'] = implode('|', $this->schemes);
-        } else {
-            unset($this->requirements['_scheme']);
-        }
-
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Checks if a scheme requirement has been set.
-     *
-     * @param string $scheme
-     *
-     * @return bool true if the scheme requirement exists, otherwise false
-     */
-    public function hasScheme($scheme)
-    {
-        return in_array(strtolower($scheme), $this->schemes, true);
-    }
-
-    /**
-     * Returns the uppercased HTTP methods this route is restricted to.
-     * So an empty array means that any method is allowed.
-     *
-     * @return array The methods
-     */
-    public function getMethods()
-    {
-        return $this->methods;
-    }
-
-    /**
-     * Sets the HTTP methods (e.g. 'POST') this route is restricted to.
-     * So an empty array means that any method is allowed.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string|array $methods The method or an array of methods
-     *
-     * @return Route The current Route instance
-     */
-    public function setMethods($methods)
-    {
-        $this->methods = array_map('strtoupper', (array) $methods);
-
-        // this is to keep BC and will be removed in a future version
-        if ($this->methods) {
-            $this->requirements['_method'] = implode('|', $this->methods);
-        } else {
-            unset($this->requirements['_method']);
-        }
-
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the options.
-     *
-     * @return array The options
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Sets the options.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $options The options
-     *
-     * @return Route The current Route instance
-     */
-    public function setOptions(array $options)
-    {
-        $this->options = array(
-            'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler',
-        );
-
-        return $this->addOptions($options);
-    }
-
-    /**
-     * Adds options.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $options The options
-     *
-     * @return Route The current Route instance
-     */
-    public function addOptions(array $options)
-    {
-        foreach ($options as $name => $option) {
-            $this->options[$name] = $option;
-        }
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Sets an option value.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string $name  An option name
-     * @param mixed  $value The option value
-     *
-     * @return Route The current Route instance
-     */
-    public function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Get an option value.
-     *
-     * @param string $name An option name
-     *
-     * @return mixed The option value or null when not given
-     */
-    public function getOption($name)
-    {
-        return isset($this->options[$name]) ? $this->options[$name] : null;
-    }
-
-    /**
-     * Checks if an option has been set.
-     *
-     * @param string $name An option name
-     *
-     * @return bool true if the option is set, false otherwise
-     */
-    public function hasOption($name)
-    {
-        return array_key_exists($name, $this->options);
-    }
-
-    /**
-     * Returns the defaults.
-     *
-     * @return array The defaults
-     */
-    public function getDefaults()
-    {
-        return $this->defaults;
-    }
-
-    /**
-     * Sets the defaults.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $defaults The defaults
-     *
-     * @return Route The current Route instance
-     */
-    public function setDefaults(array $defaults)
-    {
-        $this->defaults = array();
-
-        return $this->addDefaults($defaults);
-    }
-
-    /**
-     * Adds defaults.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $defaults The defaults
-     *
-     * @return Route The current Route instance
-     */
-    public function addDefaults(array $defaults)
-    {
-        foreach ($defaults as $name => $default) {
-            $this->defaults[$name] = $default;
-        }
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Gets a default value.
-     *
-     * @param string $name A variable name
-     *
-     * @return mixed The default value or null when not given
-     */
-    public function getDefault($name)
-    {
-        return isset($this->defaults[$name]) ? $this->defaults[$name] : null;
-    }
-
-    /**
-     * Checks if a default value is set for the given variable.
-     *
-     * @param string $name A variable name
-     *
-     * @return bool true if the default value is set, false otherwise
-     */
-    public function hasDefault($name)
-    {
-        return array_key_exists($name, $this->defaults);
-    }
-
-    /**
-     * Sets a default value.
-     *
-     * @param string $name    A variable name
-     * @param mixed  $default The default value
-     *
-     * @return Route The current Route instance
-     */
-    public function setDefault($name, $default)
-    {
-        $this->defaults[$name] = $default;
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the requirements.
-     *
-     * @return array The requirements
-     */
-    public function getRequirements()
-    {
-        return $this->requirements;
-    }
-
-    /**
-     * Sets the requirements.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $requirements The requirements
-     *
-     * @return Route The current Route instance
-     */
-    public function setRequirements(array $requirements)
-    {
-        $this->requirements = array();
-
-        return $this->addRequirements($requirements);
-    }
-
-    /**
-     * Adds requirements.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $requirements The requirements
-     *
-     * @return Route The current Route instance
-     */
-    public function addRequirements(array $requirements)
-    {
-        foreach ($requirements as $key => $regex) {
-            $this->requirements[$key] = $this->sanitizeRequirement($key, $regex);
-        }
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the requirement for the given key.
-     *
-     * @param string $key The key
-     *
-     * @return string|null The regex or null when not given
-     */
-    public function getRequirement($key)
-    {
-        if ('_scheme' === $key) {
-            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getSchemes() instead.', E_USER_DEPRECATED);
-        } elseif ('_method' === $key) {
-            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use getMethods() instead.', E_USER_DEPRECATED);
-        }
-
-        return isset($this->requirements[$key]) ? $this->requirements[$key] : null;
-    }
-
-    /**
-     * Checks if a requirement is set for the given key.
-     *
-     * @param string $key A variable name
-     *
-     * @return bool true if a requirement is specified, false otherwise
-     */
-    public function hasRequirement($key)
-    {
-        return array_key_exists($key, $this->requirements);
-    }
-
-    /**
-     * Sets a requirement for the given key.
-     *
-     * @param string $key   The key
-     * @param string $regex The regex
-     *
-     * @return Route The current Route instance
-     */
-    public function setRequirement($key, $regex)
-    {
-        $this->requirements[$key] = $this->sanitizeRequirement($key, $regex);
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Returns the condition.
-     *
-     * @return string The condition
-     */
-    public function getCondition()
-    {
-        return $this->condition;
-    }
-
-    /**
-     * Sets the condition.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param string $condition The condition
-     *
-     * @return Route The current Route instance
-     */
-    public function setCondition($condition)
-    {
-        $this->condition = (string) $condition;
-        $this->compiled = null;
-
-        return $this;
-    }
-
-    /**
-     * Compiles the route.
-     *
-     * @return CompiledRoute A CompiledRoute instance
-     *
-     * @throws \LogicException If the Route cannot be compiled because the
-     *                         path or host pattern is invalid
-     *
-     * @see RouteCompiler which is responsible for the compilation process
-     */
-    public function compile()
-    {
-        if (null !== $this->compiled) {
-            return $this->compiled;
-        }
-
-        $class = $this->getOption('compiler_class');
-
-        return $this->compiled = $class::compile($this);
-    }
-
-    private function sanitizeRequirement($key, $regex)
-    {
-        if (!is_string($regex)) {
-            throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" must be a string.', $key));
-        }
-
-        if ('' !== $regex && '^' === $regex[0]) {
-            $regex = (string) substr($regex, 1); // returns false for a single character
-        }
-
-        if ('$' === substr($regex, -1)) {
-            $regex = substr($regex, 0, -1);
-        }
-
-        if ('' === $regex) {
-            throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" cannot be empty.', $key));
-        }
-
-        // this is to keep BC and will be removed in a future version
-        if ('_scheme' === $key) {
-            @trigger_error('The "_scheme" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setSchemes() method instead.', E_USER_DEPRECATED);
-
-            $this->setSchemes(explode('|', $regex));
-        } elseif ('_method' === $key) {
-            @trigger_error('The "_method" requirement is deprecated since version 2.2 and will be removed in 3.0. Use the setMethods() method instead.', E_USER_DEPRECATED);
-
-            $this->setMethods(explode('|', $regex));
-        }
-
-        return $regex;
-    }
-}
diff --git a/vendor/symfony/routing/RouteCollection.php b/vendor/symfony/routing/RouteCollection.php
deleted file mode 100644
index d6ac840..0000000
--- a/vendor/symfony/routing/RouteCollection.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?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\Component\Routing;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * A RouteCollection represents a set of Route instances.
- *
- * When adding a route at the end of the collection, an existing route
- * with the same name is removed first. So there can only be one route
- * with a given name.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class RouteCollection implements \IteratorAggregate, \Countable
-{
-    /**
-     * @var Route[]
-     */
-    private $routes = array();
-
-    /**
-     * @var array
-     */
-    private $resources = array();
-
-    public function __clone()
-    {
-        foreach ($this->routes as $name => $route) {
-            $this->routes[$name] = clone $route;
-        }
-    }
-
-    /**
-     * Gets the current RouteCollection as an Iterator that includes all routes.
-     *
-     * It implements \IteratorAggregate.
-     *
-     * @see all()
-     *
-     * @return \ArrayIterator An \ArrayIterator object for iterating over routes
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->routes);
-    }
-
-    /**
-     * Gets the number of Routes in this collection.
-     *
-     * @return int The number of routes
-     */
-    public function count()
-    {
-        return count($this->routes);
-    }
-
-    /**
-     * Adds a route.
-     *
-     * @param string $name  The route name
-     * @param Route  $route A Route instance
-     */
-    public function add($name, Route $route)
-    {
-        unset($this->routes[$name]);
-
-        $this->routes[$name] = $route;
-    }
-
-    /**
-     * Returns all routes in this collection.
-     *
-     * @return Route[] An array of routes
-     */
-    public function all()
-    {
-        return $this->routes;
-    }
-
-    /**
-     * Gets a route by name.
-     *
-     * @param string $name The route name
-     *
-     * @return Route|null A Route instance or null when not found
-     */
-    public function get($name)
-    {
-        return isset($this->routes[$name]) ? $this->routes[$name] : null;
-    }
-
-    /**
-     * Removes a route or an array of routes by name from the collection.
-     *
-     * @param string|array $name The route name or an array of route names
-     */
-    public function remove($name)
-    {
-        foreach ((array) $name as $n) {
-            unset($this->routes[$n]);
-        }
-    }
-
-    /**
-     * Adds a route collection at the end of the current set by appending all
-     * routes of the added collection.
-     *
-     * @param RouteCollection $collection A RouteCollection instance
-     */
-    public function addCollection(RouteCollection $collection)
-    {
-        // we need to remove all routes with the same names first because just replacing them
-        // would not place the new route at the end of the merged array
-        foreach ($collection->all() as $name => $route) {
-            unset($this->routes[$name]);
-            $this->routes[$name] = $route;
-        }
-
-        $this->resources = array_merge($this->resources, $collection->getResources());
-    }
-
-    /**
-     * Adds a prefix to the path of all child routes.
-     *
-     * @param string $prefix       An optional prefix to add before each pattern of the route collection
-     * @param array  $defaults     An array of default values
-     * @param array  $requirements An array of requirements
-     */
-    public function addPrefix($prefix, array $defaults = array(), array $requirements = array())
-    {
-        $prefix = trim(trim($prefix), '/');
-
-        if ('' === $prefix) {
-            return;
-        }
-
-        foreach ($this->routes as $route) {
-            $route->setPath('/'.$prefix.$route->getPath());
-            $route->addDefaults($defaults);
-            $route->addRequirements($requirements);
-        }
-    }
-
-    /**
-     * Sets the host pattern on all routes.
-     *
-     * @param string $pattern      The pattern
-     * @param array  $defaults     An array of default values
-     * @param array  $requirements An array of requirements
-     */
-    public function setHost($pattern, array $defaults = array(), array $requirements = array())
-    {
-        foreach ($this->routes as $route) {
-            $route->setHost($pattern);
-            $route->addDefaults($defaults);
-            $route->addRequirements($requirements);
-        }
-    }
-
-    /**
-     * Sets a condition on all routes.
-     *
-     * Existing conditions will be overridden.
-     *
-     * @param string $condition The condition
-     */
-    public function setCondition($condition)
-    {
-        foreach ($this->routes as $route) {
-            $route->setCondition($condition);
-        }
-    }
-
-    /**
-     * Adds defaults to all routes.
-     *
-     * An existing default value under the same name in a route will be overridden.
-     *
-     * @param array $defaults An array of default values
-     */
-    public function addDefaults(array $defaults)
-    {
-        if ($defaults) {
-            foreach ($this->routes as $route) {
-                $route->addDefaults($defaults);
-            }
-        }
-    }
-
-    /**
-     * Adds requirements to all routes.
-     *
-     * An existing requirement under the same name in a route will be overridden.
-     *
-     * @param array $requirements An array of requirements
-     */
-    public function addRequirements(array $requirements)
-    {
-        if ($requirements) {
-            foreach ($this->routes as $route) {
-                $route->addRequirements($requirements);
-            }
-        }
-    }
-
-    /**
-     * Adds options to all routes.
-     *
-     * An existing option value under the same name in a route will be overridden.
-     *
-     * @param array $options An array of options
-     */
-    public function addOptions(array $options)
-    {
-        if ($options) {
-            foreach ($this->routes as $route) {
-                $route->addOptions($options);
-            }
-        }
-    }
-
-    /**
-     * Sets the schemes (e.g. 'https') all child routes are restricted to.
-     *
-     * @param string|array $schemes The scheme or an array of schemes
-     */
-    public function setSchemes($schemes)
-    {
-        foreach ($this->routes as $route) {
-            $route->setSchemes($schemes);
-        }
-    }
-
-    /**
-     * Sets the HTTP methods (e.g. 'POST') all child routes are restricted to.
-     *
-     * @param string|array $methods The method or an array of methods
-     */
-    public function setMethods($methods)
-    {
-        foreach ($this->routes as $route) {
-            $route->setMethods($methods);
-        }
-    }
-
-    /**
-     * Returns an array of resources loaded to build this collection.
-     *
-     * @return ResourceInterface[] An array of resources
-     */
-    public function getResources()
-    {
-        return array_unique($this->resources);
-    }
-
-    /**
-     * Adds a resource for this collection.
-     *
-     * @param ResourceInterface $resource A resource instance
-     */
-    public function addResource(ResourceInterface $resource)
-    {
-        $this->resources[] = $resource;
-    }
-}
diff --git a/vendor/symfony/routing/RouteCompiler.php b/vendor/symfony/routing/RouteCompiler.php
deleted file mode 100644
index f6637da..0000000
--- a/vendor/symfony/routing/RouteCompiler.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?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\Component\Routing;
-
-/**
- * RouteCompiler compiles Route instances to CompiledRoute instances.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-class RouteCompiler implements RouteCompilerInterface
-{
-    const REGEX_DELIMITER = '#';
-
-    /**
-     * This string defines the characters that are automatically considered separators in front of
-     * optional placeholders (with default and no static text following). Such a single separator
-     * can be left out together with the optional placeholder from matching and generating URLs.
-     */
-    const SEPARATORS = '/,;.:-_~+*=@|';
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \LogicException  If a variable is referenced more than once
-     * @throws \DomainException If a variable name is numeric because PHP raises an error for such
-     *                          subpatterns in PCRE and thus would break matching, e.g. "(?P<123>.+)".
-     */
-    public static function compile(Route $route)
-    {
-        $hostVariables = array();
-        $variables = array();
-        $hostRegex = null;
-        $hostTokens = array();
-
-        if ('' !== $host = $route->getHost()) {
-            $result = self::compilePattern($route, $host, true);
-
-            $hostVariables = $result['variables'];
-            $variables = $hostVariables;
-
-            $hostTokens = $result['tokens'];
-            $hostRegex = $result['regex'];
-        }
-
-        $path = $route->getPath();
-
-        $result = self::compilePattern($route, $path, false);
-
-        $staticPrefix = $result['staticPrefix'];
-
-        $pathVariables = $result['variables'];
-        $variables = array_merge($variables, $pathVariables);
-
-        $tokens = $result['tokens'];
-        $regex = $result['regex'];
-
-        return new CompiledRoute(
-            $staticPrefix,
-            $regex,
-            $tokens,
-            $pathVariables,
-            $hostRegex,
-            $hostTokens,
-            $hostVariables,
-            array_unique($variables)
-        );
-    }
-
-    private static function compilePattern(Route $route, $pattern, $isHost)
-    {
-        $tokens = array();
-        $variables = array();
-        $matches = array();
-        $pos = 0;
-        $defaultSeparator = $isHost ? '.' : '/';
-
-        // Match all variables enclosed in "{}" and iterate over them. But we only want to match the innermost variable
-        // in case of nested "{}", e.g. {foo{bar}}. This in ensured because \w does not match "{" or "}" itself.
-        preg_match_all('#\{\w+\}#', $pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            $varName = substr($match[0][0], 1, -1);
-            // get all static text preceding the current variable
-            $precedingText = substr($pattern, $pos, $match[0][1] - $pos);
-            $pos = $match[0][1] + strlen($match[0][0]);
-            $precedingChar = strlen($precedingText) > 0 ? substr($precedingText, -1) : '';
-            $isSeparator = '' !== $precedingChar && false !== strpos(static::SEPARATORS, $precedingChar);
-
-            if (is_numeric($varName)) {
-                throw new \DomainException(sprintf('Variable name "%s" cannot be numeric in route pattern "%s". Please use a different name.', $varName, $pattern));
-            }
-            if (in_array($varName, $variables)) {
-                throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $pattern, $varName));
-            }
-
-            if ($isSeparator && strlen($precedingText) > 1) {
-                $tokens[] = array('text', substr($precedingText, 0, -1));
-            } elseif (!$isSeparator && strlen($precedingText) > 0) {
-                $tokens[] = array('text', $precedingText);
-            }
-
-            $regexp = $route->getRequirement($varName);
-            if (null === $regexp) {
-                $followingPattern = (string) substr($pattern, $pos);
-                // Find the next static character after the variable that functions as a separator. By default, this separator and '/'
-                // are disallowed for the variable. This default requirement makes sure that optional variables can be matched at all
-                // and that the generating-matching-combination of URLs unambiguous, i.e. the params used for generating the URL are
-                // the same that will be matched. Example: new Route('/{page}.{_format}', array('_format' => 'html'))
-                // If {page} would also match the separating dot, {_format} would never match as {page} will eagerly consume everything.
-                // Also even if {_format} was not optional the requirement prevents that {page} matches something that was originally
-                // part of {_format} when generating the URL, e.g. _format = 'mobile.html'.
-                $nextSeparator = self::findNextSeparator($followingPattern);
-                $regexp = sprintf(
-                    '[^%s%s]+',
-                    preg_quote($defaultSeparator, self::REGEX_DELIMITER),
-                    $defaultSeparator !== $nextSeparator && '' !== $nextSeparator ? preg_quote($nextSeparator, self::REGEX_DELIMITER) : ''
-                );
-                if (('' !== $nextSeparator && !preg_match('#^\{\w+\}#', $followingPattern)) || '' === $followingPattern) {
-                    // When we have a separator, which is disallowed for the variable, we can optimize the regex with a possessive
-                    // quantifier. This prevents useless backtracking of PCRE and improves performance by 20% for matching those patterns.
-                    // Given the above example, there is no point in backtracking into {page} (that forbids the dot) when a dot must follow
-                    // after it. This optimization cannot be applied when the next char is no real separator or when the next variable is
-                    // directly adjacent, e.g. '/{x}{y}'.
-                    $regexp .= '+';
-                }
-            }
-
-            $tokens[] = array('variable', $isSeparator ? $precedingChar : '', $regexp, $varName);
-            $variables[] = $varName;
-        }
-
-        if ($pos < strlen($pattern)) {
-            $tokens[] = array('text', substr($pattern, $pos));
-        }
-
-        // find the first optional token
-        $firstOptional = PHP_INT_MAX;
-        if (!$isHost) {
-            for ($i = count($tokens) - 1; $i >= 0; --$i) {
-                $token = $tokens[$i];
-                if ('variable' === $token[0] && $route->hasDefault($token[3])) {
-                    $firstOptional = $i;
-                } else {
-                    break;
-                }
-            }
-        }
-
-        // compute the matching regexp
-        $regexp = '';
-        for ($i = 0, $nbToken = count($tokens); $i < $nbToken; ++$i) {
-            $regexp .= self::computeRegexp($tokens, $i, $firstOptional);
-        }
-
-        return array(
-            'staticPrefix' => 'text' === $tokens[0][0] ? $tokens[0][1] : '',
-            'regex' => self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s'.($isHost ? 'i' : ''),
-            'tokens' => array_reverse($tokens),
-            'variables' => $variables,
-        );
-    }
-
-    /**
-     * Returns the next static character in the Route pattern that will serve as a separator.
-     *
-     * @param string $pattern The route pattern
-     *
-     * @return string The next static character that functions as separator (or empty string when none available)
-     */
-    private static function findNextSeparator($pattern)
-    {
-        if ('' == $pattern) {
-            // return empty string if pattern is empty or false (false which can be returned by substr)
-            return '';
-        }
-        // first remove all placeholders from the pattern so we can find the next real static character
-        $pattern = preg_replace('#\{\w+\}#', '', $pattern);
-
-        return isset($pattern[0]) && false !== strpos(static::SEPARATORS, $pattern[0]) ? $pattern[0] : '';
-    }
-
-    /**
-     * Computes the regexp used to match a specific token. It can be static text or a subpattern.
-     *
-     * @param array $tokens        The route tokens
-     * @param int   $index         The index of the current token
-     * @param int   $firstOptional The index of the first optional token
-     *
-     * @return string The regexp pattern for a single token
-     */
-    private static function computeRegexp(array $tokens, $index, $firstOptional)
-    {
-        $token = $tokens[$index];
-        if ('text' === $token[0]) {
-            // Text tokens
-            return preg_quote($token[1], self::REGEX_DELIMITER);
-        } else {
-            // Variable tokens
-            if (0 === $index && 0 === $firstOptional) {
-                // When the only token is an optional variable token, the separator is required
-                return sprintf('%s(?P<%s>%s)?', preg_quote($token[1], self::REGEX_DELIMITER), $token[3], $token[2]);
-            } else {
-                $regexp = sprintf('%s(?P<%s>%s)', preg_quote($token[1], self::REGEX_DELIMITER), $token[3], $token[2]);
-                if ($index >= $firstOptional) {
-                    // Enclose each optional token in a subpattern to make it optional.
-                    // "?:" means it is non-capturing, i.e. the portion of the subject string that
-                    // matched the optional subpattern is not passed back.
-                    $regexp = "(?:$regexp";
-                    $nbTokens = count($tokens);
-                    if ($nbTokens - 1 == $index) {
-                        // Close the optional subpatterns
-                        $regexp .= str_repeat(')?', $nbTokens - $firstOptional - (0 === $firstOptional ? 1 : 0));
-                    }
-                }
-
-                return $regexp;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/routing/RouteCompilerInterface.php b/vendor/symfony/routing/RouteCompilerInterface.php
deleted file mode 100644
index e6f8ee6d..0000000
--- a/vendor/symfony/routing/RouteCompilerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\Routing;
-
-/**
- * RouteCompilerInterface is the interface that all RouteCompiler classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface RouteCompilerInterface
-{
-    /**
-     * Compiles the current route instance.
-     *
-     * @param Route $route A Route instance
-     *
-     * @return CompiledRoute A CompiledRoute instance
-     *
-     * @throws \LogicException If the Route cannot be compiled because the
-     *                         path or host pattern is invalid
-     */
-    public static function compile(Route $route);
-}
diff --git a/vendor/symfony/routing/Router.php b/vendor/symfony/routing/Router.php
deleted file mode 100644
index 2cbbb2b..0000000
--- a/vendor/symfony/routing/Router.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?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\Component\Routing;
-
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\ConfigCacheInterface;
-use Symfony\Component\Config\ConfigCacheFactoryInterface;
-use Symfony\Component\Config\ConfigCacheFactory;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Routing\Generator\ConfigurableRequirementsInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Generator\Dumper\GeneratorDumperInterface;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
-use Symfony\Component\Routing\Matcher\Dumper\MatcherDumperInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
-
-/**
- * The Router class is an example of the integration of all pieces of the
- * routing system for easier use.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Router implements RouterInterface, RequestMatcherInterface
-{
-    /**
-     * @var UrlMatcherInterface|null
-     */
-    protected $matcher;
-
-    /**
-     * @var UrlGeneratorInterface|null
-     */
-    protected $generator;
-
-    /**
-     * @var RequestContext
-     */
-    protected $context;
-
-    /**
-     * @var LoaderInterface
-     */
-    protected $loader;
-
-    /**
-     * @var RouteCollection|null
-     */
-    protected $collection;
-
-    /**
-     * @var mixed
-     */
-    protected $resource;
-
-    /**
-     * @var array
-     */
-    protected $options = array();
-
-    /**
-     * @var LoggerInterface|null
-     */
-    protected $logger;
-
-    /**
-     * @var ConfigCacheFactoryInterface|null
-     */
-    private $configCacheFactory;
-
-    /**
-     * @var ExpressionFunctionProviderInterface[]
-     */
-    private $expressionLanguageProviders = array();
-
-    /**
-     * Constructor.
-     *
-     * @param LoaderInterface $loader   A LoaderInterface instance
-     * @param mixed           $resource The main resource to load
-     * @param array           $options  An array of options
-     * @param RequestContext  $context  The context
-     * @param LoggerInterface $logger   A logger instance
-     */
-    public function __construct(LoaderInterface $loader, $resource, array $options = array(), RequestContext $context = null, LoggerInterface $logger = null)
-    {
-        $this->loader = $loader;
-        $this->resource = $resource;
-        $this->logger = $logger;
-        $this->context = $context ?: new RequestContext();
-        $this->setOptions($options);
-    }
-
-    /**
-     * Sets options.
-     *
-     * Available options:
-     *
-     *   * cache_dir:     The cache directory (or null to disable caching)
-     *   * debug:         Whether to enable debugging or not (false by default)
-     *   * resource_type: Type hint for the main resource (optional)
-     *
-     * @param array $options An array of options
-     *
-     * @throws \InvalidArgumentException When unsupported option is provided
-     */
-    public function setOptions(array $options)
-    {
-        $this->options = array(
-            'cache_dir' => null,
-            'debug' => false,
-            'generator_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-            'generator_base_class' => 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
-            'generator_dumper_class' => 'Symfony\\Component\\Routing\\Generator\\Dumper\\PhpGeneratorDumper',
-            'generator_cache_class' => 'ProjectUrlGenerator',
-            'matcher_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
-            'matcher_base_class' => 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
-            'matcher_dumper_class' => 'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper',
-            'matcher_cache_class' => 'ProjectUrlMatcher',
-            'resource_type' => null,
-            'strict_requirements' => true,
-        );
-
-        // check option names and live merge, if errors are encountered Exception will be thrown
-        $invalid = array();
-        foreach ($options as $key => $value) {
-            if (array_key_exists($key, $this->options)) {
-                $this->options[$key] = $value;
-            } else {
-                $invalid[] = $key;
-            }
-        }
-
-        if ($invalid) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the following options: "%s".', implode('", "', $invalid)));
-        }
-    }
-
-    /**
-     * Sets an option.
-     *
-     * @param string $key   The key
-     * @param mixed  $value The value
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setOption($key, $value)
-    {
-        if (!array_key_exists($key, $this->options)) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the "%s" option.', $key));
-        }
-
-        $this->options[$key] = $value;
-    }
-
-    /**
-     * Gets an option value.
-     *
-     * @param string $key The key
-     *
-     * @return mixed The value
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function getOption($key)
-    {
-        if (!array_key_exists($key, $this->options)) {
-            throw new \InvalidArgumentException(sprintf('The Router does not support the "%s" option.', $key));
-        }
-
-        return $this->options[$key];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRouteCollection()
-    {
-        if (null === $this->collection) {
-            $this->collection = $this->loader->load($this->resource, $this->options['resource_type']);
-        }
-
-        return $this->collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContext(RequestContext $context)
-    {
-        $this->context = $context;
-
-        if (null !== $this->matcher) {
-            $this->getMatcher()->setContext($context);
-        }
-        if (null !== $this->generator) {
-            $this->getGenerator()->setContext($context);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * Sets the ConfigCache factory to use.
-     *
-     * @param ConfigCacheFactoryInterface $configCacheFactory The factory to use.
-     */
-    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
-    {
-        $this->configCacheFactory = $configCacheFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
-    {
-        return $this->getGenerator()->generate($name, $parameters, $referenceType);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function match($pathinfo)
-    {
-        return $this->getMatcher()->match($pathinfo);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function matchRequest(Request $request)
-    {
-        $matcher = $this->getMatcher();
-        if (!$matcher instanceof RequestMatcherInterface) {
-            // fallback to the default UrlMatcherInterface
-            return $matcher->match($request->getPathInfo());
-        }
-
-        return $matcher->matchRequest($request);
-    }
-
-    /**
-     * Gets the UrlMatcher instance associated with this Router.
-     *
-     * @return UrlMatcherInterface A UrlMatcherInterface instance
-     */
-    public function getMatcher()
-    {
-        if (null !== $this->matcher) {
-            return $this->matcher;
-        }
-
-        if (null === $this->options['cache_dir'] || null === $this->options['matcher_cache_class']) {
-            $this->matcher = new $this->options['matcher_class']($this->getRouteCollection(), $this->context);
-            if (method_exists($this->matcher, 'addExpressionLanguageProvider')) {
-                foreach ($this->expressionLanguageProviders as $provider) {
-                    $this->matcher->addExpressionLanguageProvider($provider);
-                }
-            }
-
-            return $this->matcher;
-        }
-
-        $class = $this->options['matcher_cache_class'];
-        $baseClass = $this->options['matcher_base_class'];
-        $expressionLanguageProviders = $this->expressionLanguageProviders;
-        $that = $this; // required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0.
-
-        $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$class.'.php',
-            function (ConfigCacheInterface $cache) use ($that, $class, $baseClass, $expressionLanguageProviders) {
-                $dumper = $that->getMatcherDumperInstance();
-                if (method_exists($dumper, 'addExpressionLanguageProvider')) {
-                    foreach ($expressionLanguageProviders as $provider) {
-                        $dumper->addExpressionLanguageProvider($provider);
-                    }
-                }
-
-                $options = array(
-                    'class' => $class,
-                    'base_class' => $baseClass,
-                );
-
-                $cache->write($dumper->dump($options), $that->getRouteCollection()->getResources());
-            }
-        );
-
-        require_once $cache->getPath();
-
-        return $this->matcher = new $class($this->context);
-    }
-
-    /**
-     * Gets the UrlGenerator instance associated with this Router.
-     *
-     * @return UrlGeneratorInterface A UrlGeneratorInterface instance
-     */
-    public function getGenerator()
-    {
-        if (null !== $this->generator) {
-            return $this->generator;
-        }
-
-        if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) {
-            $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->logger);
-        } else {
-            $class = $this->options['generator_cache_class'];
-            $baseClass = $this->options['generator_base_class'];
-            $that = $this; // required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0.
-            $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$class.'.php',
-                function (ConfigCacheInterface $cache) use ($that, $class, $baseClass) {
-                    $dumper = $that->getGeneratorDumperInstance();
-
-                    $options = array(
-                        'class' => $class,
-                        'base_class' => $baseClass,
-                    );
-
-                    $cache->write($dumper->dump($options), $that->getRouteCollection()->getResources());
-                }
-            );
-
-            require_once $cache->getPath();
-
-            $this->generator = new $class($this->context, $this->logger);
-        }
-
-        if ($this->generator instanceof ConfigurableRequirementsInterface) {
-            $this->generator->setStrictRequirements($this->options['strict_requirements']);
-        }
-
-        return $this->generator;
-    }
-
-    public function addExpressionLanguageProvider(ExpressionFunctionProviderInterface $provider)
-    {
-        $this->expressionLanguageProviders[] = $provider;
-    }
-
-    /**
-     * This method is public because it needs to be callable from a closure in PHP 5.3. It should be converted back to protected in 3.0.
-     *
-     * @internal
-     *
-     * @return GeneratorDumperInterface
-     */
-    public function getGeneratorDumperInstance()
-    {
-        return new $this->options['generator_dumper_class']($this->getRouteCollection());
-    }
-
-    /**
-     * This method is public because it needs to be callable from a closure in PHP 5.3. It should be converted back to protected in 3.0.
-     *
-     * @internal
-     *
-     * @return MatcherDumperInterface
-     */
-    public function getMatcherDumperInstance()
-    {
-        return new $this->options['matcher_dumper_class']($this->getRouteCollection());
-    }
-
-    /**
-     * Provides the ConfigCache factory implementation, falling back to a
-     * default implementation if necessary.
-     *
-     * @return ConfigCacheFactoryInterface $configCacheFactory
-     */
-    private function getConfigCacheFactory()
-    {
-        if (null === $this->configCacheFactory) {
-            $this->configCacheFactory = new ConfigCacheFactory($this->options['debug']);
-        }
-
-        return $this->configCacheFactory;
-    }
-}
diff --git a/vendor/symfony/routing/RouterInterface.php b/vendor/symfony/routing/RouterInterface.php
deleted file mode 100644
index a10ae34..0000000
--- a/vendor/symfony/routing/RouterInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Component\Routing;
-
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
-
-/**
- * RouterInterface is the interface that all Router classes must implement.
- *
- * This interface is the concatenation of UrlMatcherInterface and UrlGeneratorInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface RouterInterface extends UrlMatcherInterface, UrlGeneratorInterface
-{
-    /**
-     * Gets the RouteCollection instance associated with this Router.
-     *
-     * @return RouteCollection A RouteCollection instance
-     */
-    public function getRouteCollection();
-}
diff --git a/vendor/symfony/routing/composer.json b/vendor/symfony/routing/composer.json
deleted file mode 100644
index 02837f6..0000000
--- a/vendor/symfony/routing/composer.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "symfony/routing",
-    "type": "library",
-    "description": "Symfony Routing Component",
-    "keywords": ["routing", "router", "URL", "URI"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/config": "~2.7",
-        "symfony/http-foundation": "~2.3",
-        "symfony/yaml": "~2.0,>=2.0.5",
-        "symfony/expression-language": "~2.4",
-        "doctrine/annotations": "~1.0",
-        "doctrine/common": "~2.2",
-        "psr/log": "~1.0"
-    },
-    "conflict": {
-        "symfony/config": "<2.7"
-    },
-    "suggest": {
-        "symfony/config": "For using the all-in-one router or any loader",
-        "symfony/yaml": "For using the YAML loader",
-        "symfony/expression-language": "For using expression matching",
-        "doctrine/annotations": "For using the annotation loader"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Routing\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/routing/phpunit.xml.dist b/vendor/symfony/routing/phpunit.xml.dist
deleted file mode 100644
index a908308..0000000
--- a/vendor/symfony/routing/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Routing Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/serializer/.gitignore b/vendor/symfony/serializer/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/serializer/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/serializer/Annotation/Groups.php b/vendor/symfony/serializer/Annotation/Groups.php
deleted file mode 100644
index 519837a..0000000
--- a/vendor/symfony/serializer/Annotation/Groups.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Component\Serializer\Annotation;
-
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-
-/**
- * Annotation class for @Groups().
- *
- * @Annotation
- * @Target({"PROPERTY", "METHOD"})
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class Groups
-{
-    /**
-     * @var array
-     */
-    private $groups;
-
-    /**
-     * @param array $data
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(array $data)
-    {
-        if (!isset($data['value']) || !$data['value']) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" cannot be empty.', get_class($this)));
-        }
-
-        if (!is_array($data['value'])) {
-            throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
-        }
-
-        foreach ($data['value'] as $group) {
-            if (!is_string($group)) {
-                throw new InvalidArgumentException(sprintf('Parameter of annotation "%s" must be an array of strings.', get_class($this)));
-            }
-        }
-
-        $this->groups = $data['value'];
-    }
-
-    /**
-     * Gets groups.
-     *
-     * @return array
-     */
-    public function getGroups()
-    {
-        return $this->groups;
-    }
-}
diff --git a/vendor/symfony/serializer/CHANGELOG.md b/vendor/symfony/serializer/CHANGELOG.md
deleted file mode 100644
index ceeeeb1..0000000
--- a/vendor/symfony/serializer/CHANGELOG.md
+++ /dev/null
@@ -1,96 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
- * added support for serialization and deserialization groups including
-   annotations, XML and YAML mapping.
- * added `AbstractNormalizer` to factorise code and ease normalizers development
- * added circular references handling for `PropertyNormalizer`
- * added support for a context key called `object_to_populate` in `AbstractNormalizer`
-   to reuse existing objects in the deserialization process
- * added `NameConverterInterface` and `CamelCaseToSnakeCaseNameConverter`
- * [DEPRECATION] `GetSetMethodNormalizer::setCamelizedAttributes()` and
-   `PropertyNormalizer::setCamelizedAttributes()` are replaced by
-   `CamelCaseToSnakeCaseNameConverter`
- * [DEPRECATION] the `Exception` interface has been renamed to `ExceptionInterface`
- * added `ObjectNormalizer` leveraging the `PropertyAccess` component to normalize
-   objects containing both properties and getters / setters / issers / hassers methods.
-
-2.6.0
------
-
- * added a new serializer: `PropertyNormalizer`. Like `GetSetMethodNormalizer`,
-   this normalizer will map an object's properties to an array.
- * added circular references handling for `GetSetMethodNormalizer`
-
-2.5.0
------
-
- * added support for `is.*` getters in `GetSetMethodNormalizer`
-
-2.4.0
------
-
- * added `$context` support for XMLEncoder.
- * [DEPRECATION] JsonEncode and JsonDecode where modified to throw
-   an exception if error found. No need for get*Error() functions
-
-2.3.0
------
-
- * added `GetSetMethodNormalizer::setCamelizedAttributes` to allow calling
-   camel cased methods for underscored properties
-
-2.2.0
------
-
- * [BC BREAK] All Serializer, Normalizer and Encoder interfaces have been
-   modified to include an optional `$context` array parameter.
- * The XML Root name can now be configured with the `xml_root_name`
-   parameter in the context option to the `XmlEncoder`.
- * Options to `json_encode` and `json_decode` can be passed through
-   the context options of `JsonEncode` and `JsonDecode` encoder/decoders.
-
-2.1.0
------
-
- * added DecoderInterface::supportsDecoding(),
-   EncoderInterface::supportsEncoding()
- * removed NormalizableInterface::denormalize(),
-   NormalizerInterface::denormalize(),
-   NormalizerInterface::supportsDenormalization()
- * removed normalize() denormalize() encode() decode() supportsSerialization()
-   supportsDeserialization() supportsEncoding() supportsDecoding()
-   getEncoder() from SerializerInterface
- * Serializer now implements NormalizerInterface, DenormalizerInterface,
-   EncoderInterface, DecoderInterface in addition to SerializerInterface
- * added DenormalizableInterface and DenormalizerInterface
- * [BC BREAK] changed `GetSetMethodNormalizer`'s key names from all lowercased
-   to camelCased (e.g. `mypropertyvalue` to `myPropertyValue`)
- * [BC BREAK] convert the `item` XML tag to an array
-
-    ``` xml
-    <?xml version="1.0"?>
-    <response>
-        <item><title><![CDATA[title1]]></title></item><item><title><![CDATA[title2]]></title></item>
-    </response>
-    ```
-
-    Before:
-
-        Array()
-
-    After:
-
-        Array(
-            [item] => Array(
-                [0] => Array(
-                    [title] => title1
-                )
-                [1] => Array(
-                    [title] => title2
-                )
-            )
-        )
diff --git a/vendor/symfony/serializer/Encoder/ChainDecoder.php b/vendor/symfony/serializer/Encoder/ChainDecoder.php
deleted file mode 100644
index f8f17b4..0000000
--- a/vendor/symfony/serializer/Encoder/ChainDecoder.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\RuntimeException;
-
-/**
- * Decoder delegating the decoding to a chain of decoders.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-class ChainDecoder implements DecoderInterface
-{
-    protected $decoders = array();
-    protected $decoderByFormat = array();
-
-    public function __construct(array $decoders = array())
-    {
-        $this->decoders = $decoders;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function decode($data, $format, array $context = array())
-    {
-        return $this->getDecoder($format)->decode($data, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDecoding($format)
-    {
-        try {
-            $this->getDecoder($format);
-        } catch (RuntimeException $e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets the decoder supporting the format.
-     *
-     * @param string $format
-     *
-     * @return DecoderInterface
-     *
-     * @throws RuntimeException if no decoder is found
-     */
-    private function getDecoder($format)
-    {
-        if (isset($this->decoderByFormat[$format])
-            && isset($this->decoders[$this->decoderByFormat[$format]])
-        ) {
-            return $this->decoders[$this->decoderByFormat[$format]];
-        }
-
-        foreach ($this->decoders as $i => $decoder) {
-            if ($decoder->supportsDecoding($format)) {
-                $this->decoderByFormat[$format] = $i;
-
-                return $decoder;
-            }
-        }
-
-        throw new RuntimeException(sprintf('No decoder found for format "%s".', $format));
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/ChainEncoder.php b/vendor/symfony/serializer/Encoder/ChainEncoder.php
deleted file mode 100644
index 5ee352a..0000000
--- a/vendor/symfony/serializer/Encoder/ChainEncoder.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\RuntimeException;
-
-/**
- * Encoder delegating the decoding to a chain of encoders.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-class ChainEncoder implements EncoderInterface
-{
-    protected $encoders = array();
-    protected $encoderByFormat = array();
-
-    public function __construct(array $encoders = array())
-    {
-        $this->encoders = $encoders;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function encode($data, $format, array $context = array())
-    {
-        return $this->getEncoder($format)->encode($data, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsEncoding($format)
-    {
-        try {
-            $this->getEncoder($format);
-        } catch (RuntimeException $e) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks whether the normalization is needed for the given format.
-     *
-     * @param string $format
-     *
-     * @return bool
-     */
-    public function needsNormalization($format)
-    {
-        $encoder = $this->getEncoder($format);
-
-        if (!$encoder instanceof NormalizationAwareInterface) {
-            return true;
-        }
-
-        if ($encoder instanceof self) {
-            return $encoder->needsNormalization($format);
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets the encoder supporting the format.
-     *
-     * @param string $format
-     *
-     * @return EncoderInterface
-     *
-     * @throws RuntimeException if no encoder is found
-     */
-    private function getEncoder($format)
-    {
-        if (isset($this->encoderByFormat[$format])
-            && isset($this->encoders[$this->encoderByFormat[$format]])
-        ) {
-            return $this->encoders[$this->encoderByFormat[$format]];
-        }
-
-        foreach ($this->encoders as $i => $encoder) {
-            if ($encoder->supportsEncoding($format)) {
-                $this->encoderByFormat[$format] = $i;
-
-                return $encoder;
-            }
-        }
-
-        throw new RuntimeException(sprintf('No encoder found for format "%s".', $format));
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/DecoderInterface.php b/vendor/symfony/serializer/Encoder/DecoderInterface.php
deleted file mode 100644
index 910f4ce..0000000
--- a/vendor/symfony/serializer/Encoder/DecoderInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Defines the interface of decoders.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface DecoderInterface
-{
-    /**
-     * Decodes a string into PHP data.
-     *
-     * @param string $data    Data to decode
-     * @param string $format  Format name
-     * @param array  $context options that decoders have access to.
-     *
-     * The format parameter specifies which format the data is in; valid values
-     * depend on the specific implementation. Authors implementing this interface
-     * are encouraged to document which formats they support in a non-inherited
-     * phpdoc comment.
-     *
-     * @return mixed
-     *
-     * @throws UnexpectedValueException
-     */
-    public function decode($data, $format, array $context = array());
-
-    /**
-     * Checks whether the deserializer can decode from given format.
-     *
-     * @param string $format format name
-     *
-     * @return bool
-     */
-    public function supportsDecoding($format);
-}
diff --git a/vendor/symfony/serializer/Encoder/EncoderInterface.php b/vendor/symfony/serializer/Encoder/EncoderInterface.php
deleted file mode 100644
index fe7e777..0000000
--- a/vendor/symfony/serializer/Encoder/EncoderInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Defines the interface of encoders.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface EncoderInterface
-{
-    /**
-     * Encodes data into the given format.
-     *
-     * @param mixed  $data    Data to encode
-     * @param string $format  Format name
-     * @param array  $context options that normalizers/encoders have access to.
-     *
-     * @return scalar
-     *
-     * @throws UnexpectedValueException
-     */
-    public function encode($data, $format, array $context = array());
-
-    /**
-     * Checks whether the serializer can encode to given format.
-     *
-     * @param string $format format name
-     *
-     * @return bool
-     */
-    public function supportsEncoding($format);
-}
diff --git a/vendor/symfony/serializer/Encoder/JsonDecode.php b/vendor/symfony/serializer/Encoder/JsonDecode.php
deleted file mode 100644
index 5f5f289..0000000
--- a/vendor/symfony/serializer/Encoder/JsonDecode.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Decodes JSON data.
- *
- * @author Sander Coolen <sander@jibber.nl>
- */
-class JsonDecode implements DecoderInterface
-{
-    /**
-     * Specifies if the returned result should be an associative array or a nested stdClass object hierarchy.
-     *
-     * @var bool
-     */
-    private $associative;
-
-    /**
-     * Specifies the recursion depth.
-     *
-     * @var int
-     */
-    private $recursionDepth;
-
-    private $lastError = JSON_ERROR_NONE;
-
-    protected $serializer;
-
-    /**
-     * Constructs a new JsonDecode instance.
-     *
-     * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy
-     * @param int  $depth       Specifies the recursion depth
-     */
-    public function __construct($associative = false, $depth = 512)
-    {
-        $this->associative = $associative;
-        $this->recursionDepth = (int) $depth;
-    }
-
-    /**
-     * Returns the last decoding error (if any).
-     *
-     * @return int
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             The {@self decode()} method throws an exception if error found.
-     * @see http://php.net/manual/en/function.json-last-error.php json_last_error
-     */
-    public function getLastError()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
-
-        return $this->lastError;
-    }
-
-    /**
-     * Decodes data.
-     *
-     * @param string $data    The encoded JSON string to decode
-     * @param string $format  Must be set to JsonEncoder::FORMAT
-     * @param array  $context An optional set of options for the JSON decoder; see below
-     *
-     * The $context array is a simple key=>value array, with the following supported keys:
-     *
-     * json_decode_associative: boolean
-     *      If true, returns the object as associative array.
-     *      If false, returns the object as nested stdClass
-     *      If not specified, this method will use the default set in JsonDecode::__construct
-     *
-     * json_decode_recursion_depth: integer
-     *      Specifies the maximum recursion depth
-     *      If not specified, this method will use the default set in JsonDecode::__construct
-     *
-     * json_decode_options: integer
-     *      Specifies additional options as per documentation for json_decode. Only supported with PHP 5.4.0 and higher
-     *
-     * @return mixed
-     *
-     * @throws UnexpectedValueException
-     *
-     * @see http://php.net/json_decode json_decode
-     */
-    public function decode($data, $format, array $context = array())
-    {
-        $context = $this->resolveContext($context);
-
-        $associative = $context['json_decode_associative'];
-        $recursionDepth = $context['json_decode_recursion_depth'];
-        $options = $context['json_decode_options'];
-
-        if (PHP_VERSION_ID >= 50400) {
-            $decodedData = json_decode($data, $associative, $recursionDepth, $options);
-        } else {
-            $decodedData = json_decode($data, $associative, $recursionDepth);
-        }
-
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
-        }
-
-        return $decodedData;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDecoding($format)
-    {
-        return JsonEncoder::FORMAT === $format;
-    }
-
-    /**
-     * Merges the default options of the Json Decoder with the passed context.
-     *
-     * @param array $context
-     *
-     * @return array
-     */
-    private function resolveContext(array $context)
-    {
-        $defaultOptions = array(
-            'json_decode_associative' => $this->associative,
-            'json_decode_recursion_depth' => $this->recursionDepth,
-            'json_decode_options' => 0,
-        );
-
-        return array_merge($defaultOptions, $context);
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/JsonEncode.php b/vendor/symfony/serializer/Encoder/JsonEncode.php
deleted file mode 100644
index 3a6b2fd..0000000
--- a/vendor/symfony/serializer/Encoder/JsonEncode.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Encodes JSON data.
- *
- * @author Sander Coolen <sander@jibber.nl>
- */
-class JsonEncode implements EncoderInterface
-{
-    private $options;
-    private $lastError = JSON_ERROR_NONE;
-
-    public function __construct($bitmask = 0)
-    {
-        $this->options = $bitmask;
-    }
-
-    /**
-     * Returns the last encoding error (if any).
-     *
-     * @return int
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             The {@self encode()} throws an exception if error found.
-     * @see http://php.net/manual/en/function.json-last-error.php json_last_error
-     */
-    public function getLastError()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
-
-        return $this->lastError;
-    }
-
-    /**
-     * Encodes PHP data to a JSON string.
-     *
-     * {@inheritdoc}
-     */
-    public function encode($data, $format, array $context = array())
-    {
-        $context = $this->resolveContext($context);
-
-        $encodedJson = json_encode($data, $context['json_encode_options']);
-
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
-        }
-
-        return $encodedJson;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsEncoding($format)
-    {
-        return JsonEncoder::FORMAT === $format;
-    }
-
-    /**
-     * Merge default json encode options with context.
-     *
-     * @param array $context
-     *
-     * @return array
-     */
-    private function resolveContext(array $context = array())
-    {
-        return array_merge(array('json_encode_options' => $this->options), $context);
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/JsonEncoder.php b/vendor/symfony/serializer/Encoder/JsonEncoder.php
deleted file mode 100644
index 284f579..0000000
--- a/vendor/symfony/serializer/Encoder/JsonEncoder.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-/**
- * Encodes JSON data.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class JsonEncoder implements EncoderInterface, DecoderInterface
-{
-    const FORMAT = 'json';
-
-    /**
-     * @var JsonEncode
-     */
-    protected $encodingImpl;
-
-    /**
-     * @var JsonDecode
-     */
-    protected $decodingImpl;
-
-    public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)
-    {
-        $this->encodingImpl = $encodingImpl ?: new JsonEncode();
-        $this->decodingImpl = $decodingImpl ?: new JsonDecode(true);
-    }
-
-    /**
-     * Returns the last encoding error (if any).
-     *
-     * @return int
-     *
-     * @deprecated since version 2.5, to be removed in 3.0. JsonEncode throws exception if an error is found.
-     */
-    public function getLastEncodingError()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonEncode::encode() method instead to get the last JSON encoding error.', E_USER_DEPRECATED);
-
-        return $this->encodingImpl->getLastError();
-    }
-
-    /**
-     * Returns the last decoding error (if any).
-     *
-     * @return int
-     *
-     * @deprecated since version 2.5, to be removed in 3.0. JsonDecode throws exception if an error is found.
-     */
-    public function getLastDecodingError()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Catch the exception raised by the Symfony\Component\Serializer\Encoder\JsonDecode::decode() method instead to get the last JSON decoding error.', E_USER_DEPRECATED);
-
-        return $this->decodingImpl->getLastError();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function encode($data, $format, array $context = array())
-    {
-        return $this->encodingImpl->encode($data, self::FORMAT, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function decode($data, $format, array $context = array())
-    {
-        return $this->decodingImpl->decode($data, self::FORMAT, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsEncoding($format)
-    {
-        return self::FORMAT === $format;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDecoding($format)
-    {
-        return self::FORMAT === $format;
-    }
-
-    /**
-     * Resolves json_last_error message.
-     *
-     * @return string
-     */
-    public static function getLastErrorMessage()
-    {
-        if (function_exists('json_last_error_msg')) {
-            return json_last_error_msg();
-        }
-
-        switch (json_last_error()) {
-            case JSON_ERROR_DEPTH:
-                return 'Maximum stack depth exceeded';
-            case JSON_ERROR_STATE_MISMATCH:
-                return 'Underflow or the modes mismatch';
-            case JSON_ERROR_CTRL_CHAR:
-                return 'Unexpected control character found';
-            case JSON_ERROR_SYNTAX:
-                return 'Syntax error, malformed JSON';
-            case JSON_ERROR_UTF8:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            default:
-                return 'Unknown error';
-        }
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/NormalizationAwareInterface.php b/vendor/symfony/serializer/Encoder/NormalizationAwareInterface.php
deleted file mode 100644
index c066bd7..0000000
--- a/vendor/symfony/serializer/Encoder/NormalizationAwareInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-/**
- * Defines the interface of encoders that will normalize data themselves.
- *
- * Implementing this interface essentially just tells the Serializer that the
- * data should not be pre-normalized before being passed to this Encoder.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface NormalizationAwareInterface
-{
-}
diff --git a/vendor/symfony/serializer/Encoder/SerializerAwareEncoder.php b/vendor/symfony/serializer/Encoder/SerializerAwareEncoder.php
deleted file mode 100644
index a3d8ff3..0000000
--- a/vendor/symfony/serializer/Encoder/SerializerAwareEncoder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Serializer\SerializerAwareInterface;
-
-/**
- * SerializerAware Encoder implementation.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-abstract class SerializerAwareEncoder implements SerializerAwareInterface
-{
-    protected $serializer;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSerializer(SerializerInterface $serializer)
-    {
-        $this->serializer = $serializer;
-    }
-}
diff --git a/vendor/symfony/serializer/Encoder/XmlEncoder.php b/vendor/symfony/serializer/Encoder/XmlEncoder.php
deleted file mode 100644
index ce0c475..0000000
--- a/vendor/symfony/serializer/Encoder/XmlEncoder.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?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\Component\Serializer\Encoder;
-
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Encodes XML data.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author John Wards <jwards@whiteoctober.co.uk>
- * @author Fabian Vogler <fabian@equivalence.ch>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, DecoderInterface, NormalizationAwareInterface
-{
-    /**
-     * @var \DOMDocument
-     */
-    private $dom;
-    private $format;
-    private $context;
-    private $rootNodeName = 'response';
-
-    /**
-     * Construct new XmlEncoder and allow to change the root node element name.
-     *
-     * @param string $rootNodeName
-     */
-    public function __construct($rootNodeName = 'response')
-    {
-        $this->rootNodeName = $rootNodeName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function encode($data, $format, array $context = array())
-    {
-        if ($data instanceof \DOMDocument) {
-            return $data->saveXML();
-        }
-
-        $xmlRootNodeName = $this->resolveXmlRootName($context);
-
-        $this->dom = $this->createDomDocument($context);
-        $this->format = $format;
-        $this->context = $context;
-
-        if (null !== $data && !is_scalar($data)) {
-            $root = $this->dom->createElement($xmlRootNodeName);
-            $this->dom->appendChild($root);
-            $this->buildXml($root, $data, $xmlRootNodeName);
-        } else {
-            $this->appendNode($this->dom, $data, $xmlRootNodeName);
-        }
-
-        return $this->dom->saveXML();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function decode($data, $format, array $context = array())
-    {
-        if ('' === trim($data)) {
-            throw new UnexpectedValueException('Invalid XML data, it can not be empty.');
-        }
-
-        $internalErrors = libxml_use_internal_errors(true);
-        $disableEntities = libxml_disable_entity_loader(true);
-        libxml_clear_errors();
-
-        $dom = new \DOMDocument();
-        $dom->loadXML($data, LIBXML_NONET | LIBXML_NOBLANKS);
-
-        libxml_use_internal_errors($internalErrors);
-        libxml_disable_entity_loader($disableEntities);
-
-        if ($error = libxml_get_last_error()) {
-            libxml_clear_errors();
-
-            throw new UnexpectedValueException($error->message);
-        }
-
-        foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                throw new UnexpectedValueException('Document types are not allowed.');
-            }
-        }
-
-        $rootNode = $dom->firstChild;
-
-        // todo: throw an exception if the root node name is not correctly configured (bc)
-
-        if ($rootNode->hasChildNodes()) {
-            $xpath = new \DOMXPath($dom);
-            $data = array();
-            foreach ($xpath->query('namespace::*', $dom->documentElement) as $nsNode) {
-                $data['@'.$nsNode->nodeName] = $nsNode->nodeValue;
-            }
-
-            unset($data['@xmlns:xml']);
-
-            if (empty($data)) {
-                return $this->parseXml($rootNode);
-            }
-
-            return array_merge($data, (array) $this->parseXml($rootNode));
-        }
-
-        if (!$rootNode->hasAttributes()) {
-            return $rootNode->nodeValue;
-        }
-
-        $data = array();
-
-        foreach ($rootNode->attributes as $attrKey => $attr) {
-            $data['@'.$attrKey] = $attr->nodeValue;
-        }
-
-        $data['#'] = $rootNode->nodeValue;
-
-        return $data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsEncoding($format)
-    {
-        return 'xml' === $format;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDecoding($format)
-    {
-        return 'xml' === $format;
-    }
-
-    /**
-     * Sets the root node name.
-     *
-     * @param string $name root node name
-     */
-    public function setRootNodeName($name)
-    {
-        $this->rootNodeName = $name;
-    }
-
-    /**
-     * Returns the root node name.
-     *
-     * @return string
-     */
-    public function getRootNodeName()
-    {
-        return $this->rootNodeName;
-    }
-
-    /**
-     * @param \DOMNode $node
-     * @param string   $val
-     *
-     * @return bool
-     */
-    final protected function appendXMLString(\DOMNode $node, $val)
-    {
-        if (strlen($val) > 0) {
-            $frag = $this->dom->createDocumentFragment();
-            $frag->appendXML($val);
-            $node->appendChild($frag);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param \DOMNode $node
-     * @param string   $val
-     *
-     * @return bool
-     */
-    final protected function appendText(\DOMNode $node, $val)
-    {
-        $nodeText = $this->dom->createTextNode($val);
-        $node->appendChild($nodeText);
-
-        return true;
-    }
-
-    /**
-     * @param \DOMNode $node
-     * @param string   $val
-     *
-     * @return bool
-     */
-    final protected function appendCData(\DOMNode $node, $val)
-    {
-        $nodeText = $this->dom->createCDATASection($val);
-        $node->appendChild($nodeText);
-
-        return true;
-    }
-
-    /**
-     * @param \DOMNode             $node
-     * @param \DOMDocumentFragment $fragment
-     *
-     * @return bool
-     */
-    final protected function appendDocumentFragment(\DOMNode $node, $fragment)
-    {
-        if ($fragment instanceof \DOMDocumentFragment) {
-            $node->appendChild($fragment);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks the name is a valid xml element name.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    final protected function isElementNameValid($name)
-    {
-        return $name &&
-            false === strpos($name, ' ') &&
-            preg_match('#^[\pL_][\pL0-9._:-]*$#ui', $name);
-    }
-
-    /**
-     * Parse the input DOMNode into an array or a string.
-     *
-     * @param \DOMNode $node xml to parse
-     *
-     * @return array|string
-     */
-    private function parseXml(\DOMNode $node)
-    {
-        $data = $this->parseXmlAttributes($node);
-
-        $value = $this->parseXmlValue($node);
-
-        if (!count($data)) {
-            return $value;
-        }
-
-        if (!is_array($value)) {
-            $data['#'] = $value;
-
-            return $data;
-        }
-
-        if (1 === count($value) && key($value)) {
-            $data[key($value)] = current($value);
-
-            return $data;
-        }
-
-        foreach ($value as $key => $val) {
-            $data[$key] = $val;
-        }
-
-        return $data;
-    }
-
-    /**
-     * Parse the input DOMNode attributes into an array.
-     *
-     * @param \DOMNode $node xml to parse
-     *
-     * @return array
-     */
-    private function parseXmlAttributes(\DOMNode $node)
-    {
-        if (!$node->hasAttributes()) {
-            return array();
-        }
-
-        $data = array();
-
-        foreach ($node->attributes as $attr) {
-            if (ctype_digit($attr->nodeValue)) {
-                $data['@'.$attr->nodeName] = (int) $attr->nodeValue;
-            } else {
-                $data['@'.$attr->nodeName] = $attr->nodeValue;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Parse the input DOMNode value (content and children) into an array or a string.
-     *
-     * @param \DOMNode $node xml to parse
-     *
-     * @return array|string
-     */
-    private function parseXmlValue(\DOMNode $node)
-    {
-        if (!$node->hasChildNodes()) {
-            return $node->nodeValue;
-        }
-
-        if (1 === $node->childNodes->length && in_array($node->firstChild->nodeType, array(XML_TEXT_NODE, XML_CDATA_SECTION_NODE))) {
-            return $node->firstChild->nodeValue;
-        }
-
-        $value = array();
-
-        foreach ($node->childNodes as $subnode) {
-            $val = $this->parseXml($subnode);
-
-            if ('item' === $subnode->nodeName && isset($val['@key'])) {
-                if (isset($val['#'])) {
-                    $value[$val['@key']] = $val['#'];
-                } else {
-                    $value[$val['@key']] = $val;
-                }
-            } else {
-                $value[$subnode->nodeName][] = $val;
-            }
-        }
-
-        foreach ($value as $key => $val) {
-            if (is_array($val) && 1 === count($val)) {
-                $value[$key] = current($val);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Parse the data and convert it to DOMElements.
-     *
-     * @param \DOMNode     $parentNode
-     * @param array|object $data
-     * @param string|null  $xmlRootNodeName
-     *
-     * @return bool
-     *
-     * @throws UnexpectedValueException
-     */
-    private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
-    {
-        $append = true;
-
-        if (is_array($data) || $data instanceof \Traversable) {
-            foreach ($data as $key => $data) {
-                //Ah this is the magic @ attribute types.
-                if (0 === strpos($key, '@') && is_scalar($data) && $this->isElementNameValid($attributeName = substr($key, 1))) {
-                    $parentNode->setAttribute($attributeName, $data);
-                } elseif ($key === '#') {
-                    $append = $this->selectNodeType($parentNode, $data);
-                } elseif (is_array($data) && false === is_numeric($key)) {
-                    // Is this array fully numeric keys?
-                    if (ctype_digit(implode('', array_keys($data)))) {
-                        /*
-                         * Create nodes to append to $parentNode based on the $key of this array
-                         * Produces <xml><item>0</item><item>1</item></xml>
-                         * From array("item" => array(0,1));.
-                         */
-                        foreach ($data as $subData) {
-                            $append = $this->appendNode($parentNode, $subData, $key);
-                        }
-                    } else {
-                        $append = $this->appendNode($parentNode, $data, $key);
-                    }
-                } elseif (is_numeric($key) || !$this->isElementNameValid($key)) {
-                    $append = $this->appendNode($parentNode, $data, 'item', $key);
-                } else {
-                    $append = $this->appendNode($parentNode, $data, $key);
-                }
-            }
-
-            return $append;
-        }
-
-        if (is_object($data)) {
-            $data = $this->serializer->normalize($data, $this->format, $this->context);
-            if (null !== $data && !is_scalar($data)) {
-                return $this->buildXml($parentNode, $data, $xmlRootNodeName);
-            }
-
-            // top level data object was normalized into a scalar
-            if (!$parentNode->parentNode->parentNode) {
-                $root = $parentNode->parentNode;
-                $root->removeChild($parentNode);
-
-                return $this->appendNode($root, $data, $xmlRootNodeName);
-            }
-
-            return $this->appendNode($parentNode, $data, 'data');
-        }
-
-        throw new UnexpectedValueException(sprintf('An unexpected value could not be serialized: %s', var_export($data, true)));
-    }
-
-    /**
-     * Selects the type of node to create and appends it to the parent.
-     *
-     * @param \DOMNode     $parentNode
-     * @param array|object $data
-     * @param string       $nodeName
-     * @param string       $key
-     *
-     * @return bool
-     */
-    private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
-    {
-        $node = $this->dom->createElement($nodeName);
-        if (null !== $key) {
-            $node->setAttribute('key', $key);
-        }
-        $appendNode = $this->selectNodeType($node, $data);
-        // we may have decided not to append this node, either in error or if its $nodeName is not valid
-        if ($appendNode) {
-            $parentNode->appendChild($node);
-        }
-
-        return $appendNode;
-    }
-
-    /**
-     * Checks if a value contains any characters which would require CDATA wrapping.
-     *
-     * @param string $val
-     *
-     * @return bool
-     */
-    private function needsCdataWrapping($val)
-    {
-        return preg_match('/[<>&]/', $val);
-    }
-
-    /**
-     * Tests the value being passed and decide what sort of element to create.
-     *
-     * @param \DOMNode $node
-     * @param mixed    $val
-     *
-     * @return bool
-     */
-    private function selectNodeType(\DOMNode $node, $val)
-    {
-        if (is_array($val)) {
-            return $this->buildXml($node, $val);
-        } elseif ($val instanceof \SimpleXMLElement) {
-            $child = $this->dom->importNode(dom_import_simplexml($val), true);
-            $node->appendChild($child);
-        } elseif ($val instanceof \Traversable) {
-            $this->buildXml($node, $val);
-        } elseif (is_object($val)) {
-            return $this->buildXml($node, $this->serializer->normalize($val, $this->format, $this->context));
-        } elseif (is_numeric($val)) {
-            return $this->appendText($node, (string) $val);
-        } elseif (is_string($val) && $this->needsCdataWrapping($val)) {
-            return $this->appendCData($node, $val);
-        } elseif (is_string($val)) {
-            return $this->appendText($node, $val);
-        } elseif (is_bool($val)) {
-            return $this->appendText($node, (int) $val);
-        } elseif ($val instanceof \DOMNode) {
-            $child = $this->dom->importNode($val, true);
-            $node->appendChild($child);
-        }
-
-        return true;
-    }
-
-    /**
-     * Get real XML root node name, taking serializer options into account.
-     *
-     * @param array $context
-     *
-     * @return string
-     */
-    private function resolveXmlRootName(array $context = array())
-    {
-        return isset($context['xml_root_node_name'])
-            ? $context['xml_root_node_name']
-            : $this->rootNodeName;
-    }
-
-    /**
-     * Create a DOM document, taking serializer options into account.
-     *
-     * @param array $context options that the encoder has access to.
-     *
-     * @return \DOMDocument
-     */
-    private function createDomDocument(array $context)
-    {
-        $document = new \DOMDocument();
-
-        // Set an attribute on the DOM document specifying, as part of the XML declaration,
-        $xmlOptions = array(
-            // nicely formats output with indentation and extra space
-            'xml_format_output' => 'formatOutput',
-            // the version number of the document
-            'xml_version' => 'xmlVersion',
-            // the encoding of the document
-            'xml_encoding' => 'encoding',
-            // whether the document is standalone
-            'xml_standalone' => 'xmlStandalone',
-        );
-        foreach ($xmlOptions as $xmlOption => $documentProperty) {
-            if (isset($context[$xmlOption])) {
-                $document->$documentProperty = $context[$xmlOption];
-            }
-        }
-
-        return $document;
-    }
-}
diff --git a/vendor/symfony/serializer/Exception/CircularReferenceException.php b/vendor/symfony/serializer/Exception/CircularReferenceException.php
deleted file mode 100644
index dc84183..0000000
--- a/vendor/symfony/serializer/Exception/CircularReferenceException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * CircularReferenceException.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class CircularReferenceException extends RuntimeException
-{
-}
diff --git a/vendor/symfony/serializer/Exception/Exception.php b/vendor/symfony/serializer/Exception/Exception.php
deleted file mode 100644
index fc0606e..0000000
--- a/vendor/symfony/serializer/Exception/Exception.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * Base exception.
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use ExceptionInterface instead.
- */
-interface Exception
-{
-}
diff --git a/vendor/symfony/serializer/Exception/ExceptionInterface.php b/vendor/symfony/serializer/Exception/ExceptionInterface.php
deleted file mode 100644
index ff67edb..0000000
--- a/vendor/symfony/serializer/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * Base exception interface.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface ExceptionInterface extends Exception
-{
-}
diff --git a/vendor/symfony/serializer/Exception/InvalidArgumentException.php b/vendor/symfony/serializer/Exception/InvalidArgumentException.php
deleted file mode 100644
index f4e645c..0000000
--- a/vendor/symfony/serializer/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * InvalidArgumentException.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/serializer/Exception/LogicException.php b/vendor/symfony/serializer/Exception/LogicException.php
deleted file mode 100644
index 08c53e0..0000000
--- a/vendor/symfony/serializer/Exception/LogicException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * LogicException.
- *
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/serializer/Exception/MappingException.php b/vendor/symfony/serializer/Exception/MappingException.php
deleted file mode 100644
index 4df4eec..0000000
--- a/vendor/symfony/serializer/Exception/MappingException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * MappingException.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class MappingException extends RuntimeException
-{
-}
diff --git a/vendor/symfony/serializer/Exception/RuntimeException.php b/vendor/symfony/serializer/Exception/RuntimeException.php
deleted file mode 100644
index a287d97..0000000
--- a/vendor/symfony/serializer/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * RuntimeException.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/serializer/Exception/UnexpectedValueException.php b/vendor/symfony/serializer/Exception/UnexpectedValueException.php
deleted file mode 100644
index 2a63c5b..0000000
--- a/vendor/symfony/serializer/Exception/UnexpectedValueException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * UnexpectedValueException.
- *
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- */
-class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/serializer/Exception/UnsupportedException.php b/vendor/symfony/serializer/Exception/UnsupportedException.php
deleted file mode 100644
index 7dc44ee..0000000
--- a/vendor/symfony/serializer/Exception/UnsupportedException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Serializer\Exception;
-
-/**
- * UnsupportedException.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class UnsupportedException extends InvalidArgumentException
-{
-}
diff --git a/vendor/symfony/serializer/LICENSE b/vendor/symfony/serializer/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/serializer/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/serializer/Mapping/AttributeMetadata.php b/vendor/symfony/serializer/Mapping/AttributeMetadata.php
deleted file mode 100644
index 7a1d3db..0000000
--- a/vendor/symfony/serializer/Mapping/AttributeMetadata.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Component\Serializer\Mapping;
-
-/**
- * {@inheritdoc}
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class AttributeMetadata implements AttributeMetadataInterface
-{
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getName()} instead.
-     */
-    public $name;
-
-    /**
-     * @var array
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getGroups()} instead.
-     */
-    public $groups = array();
-
-    /**
-     * Constructs a metadata for the given attribute.
-     *
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addGroup($group)
-    {
-        if (!in_array($group, $this->groups)) {
-            $this->groups[] = $group;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroups()
-    {
-        return $this->groups;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge(AttributeMetadataInterface $attributeMetadata)
-    {
-        foreach ($attributeMetadata->getGroups() as $group) {
-            $this->addGroup($group);
-        }
-    }
-
-    /**
-     * Returns the names of the properties that should be serialized.
-     *
-     * @return string[]
-     */
-    public function __sleep()
-    {
-        return array('name', 'groups');
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php b/vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
deleted file mode 100644
index 0701a58..0000000
--- a/vendor/symfony/serializer/Mapping/AttributeMetadataInterface.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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\Component\Serializer\Mapping;
-
-/**
- * Stores metadata needed for serializing and deserializing attributes.
- *
- * Primarily, the metadata stores serialization groups.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface AttributeMetadataInterface
-{
-    /**
-     * Gets the attribute name.
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Adds this attribute to the given group.
-     *
-     * @param string $group
-     */
-    public function addGroup($group);
-
-    /**
-     * Gets groups of this attribute.
-     *
-     * @return string[]
-     */
-    public function getGroups();
-
-    /**
-     * Merges an {@see AttributeMetadataInterface} with in the current one.
-     *
-     * @param AttributeMetadataInterface $attributeMetadata
-     */
-    public function merge(AttributeMetadataInterface $attributeMetadata);
-}
diff --git a/vendor/symfony/serializer/Mapping/ClassMetadata.php b/vendor/symfony/serializer/Mapping/ClassMetadata.php
deleted file mode 100644
index 55ddf52..0000000
--- a/vendor/symfony/serializer/Mapping/ClassMetadata.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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\Component\Serializer\Mapping;
-
-/**
- * {@inheritdoc}
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ClassMetadata implements ClassMetadataInterface
-{
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getName()} instead.
-     */
-    public $name;
-
-    /**
-     * @var AttributeMetadataInterface[]
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getAttributesMetadata()} instead.
-     */
-    public $attributesMetadata = array();
-
-    /**
-     * @var \ReflectionClass
-     */
-    private $reflClass;
-
-    /**
-     * Constructs a metadata for the given class.
-     *
-     * @param string $class
-     */
-    public function __construct($class)
-    {
-        $this->name = $class;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata)
-    {
-        $this->attributesMetadata[$attributeMetadata->getName()] = $attributeMetadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributesMetadata()
-    {
-        return $this->attributesMetadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function merge(ClassMetadataInterface $classMetadata)
-    {
-        foreach ($classMetadata->getAttributesMetadata() as $attributeMetadata) {
-            if (isset($this->attributesMetadata[$attributeMetadata->getName()])) {
-                $this->attributesMetadata[$attributeMetadata->getName()]->merge($attributeMetadata);
-            } else {
-                $this->addAttributeMetadata($attributeMetadata);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getReflectionClass()
-    {
-        if (!$this->reflClass) {
-            $this->reflClass = new \ReflectionClass($this->getName());
-        }
-
-        return $this->reflClass;
-    }
-
-    /**
-     * Returns the names of the properties that should be serialized.
-     *
-     * @return string[]
-     */
-    public function __sleep()
-    {
-        return array(
-            'name',
-            'attributesMetadata',
-        );
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/ClassMetadataInterface.php b/vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
deleted file mode 100644
index c967666..0000000
--- a/vendor/symfony/serializer/Mapping/ClassMetadataInterface.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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\Component\Serializer\Mapping;
-
-/**
- * Stores metadata needed for serializing and deserializing objects of specific class.
- *
- * Primarily, the metadata stores the list of attributes to serialize or deserialize.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface ClassMetadataInterface
-{
-    /**
-     * Returns the name of the backing PHP class.
-     *
-     * @return string The name of the backing class.
-     */
-    public function getName();
-
-    /**
-     * Adds an {@link AttributeMetadataInterface}.
-     *
-     * @param AttributeMetadataInterface $attributeMetadata
-     */
-    public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata);
-
-    /**
-     * Gets the list of {@link AttributeMetadataInterface}.
-     *
-     * @return AttributeMetadataInterface[]
-     */
-    public function getAttributesMetadata();
-
-    /**
-     * Merges a {@link ClassMetadataInterface} in the current one.
-     *
-     * @param ClassMetadataInterface $classMetadata
-     */
-    public function merge(ClassMetadataInterface $classMetadata);
-
-    /**
-     * Returns a {@link \ReflectionClass} instance for this class.
-     *
-     * @return \ReflectionClass
-     */
-    public function getReflectionClass();
-}
diff --git a/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php b/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php
deleted file mode 100644
index 3a354e3..0000000
--- a/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactory.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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\Component\Serializer\Mapping\Factory;
-
-use Doctrine\Common\Cache\Cache;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Mapping\ClassMetadata;
-use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
-
-/**
- * Returns a {@link ClassMetadata}.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ClassMetadataFactory implements ClassMetadataFactoryInterface
-{
-    /**
-     * @var LoaderInterface
-     */
-    private $loader;
-    /**
-     * @var Cache
-     */
-    private $cache;
-    /**
-     * @var array
-     */
-    private $loadedClasses;
-
-    /**
-     * @param LoaderInterface $loader
-     * @param Cache|null      $cache
-     */
-    public function __construct(LoaderInterface $loader, Cache $cache = null)
-    {
-        $this->loader = $loader;
-        $this->cache = $cache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFor($value)
-    {
-        $class = $this->getClass($value);
-        if (!$class) {
-            throw new InvalidArgumentException(sprintf('Cannot create metadata for non-objects. Got: "%s"', gettype($value)));
-        }
-
-        if (isset($this->loadedClasses[$class])) {
-            return $this->loadedClasses[$class];
-        }
-
-        if ($this->cache && ($this->loadedClasses[$class] = $this->cache->fetch($class))) {
-            return $this->loadedClasses[$class];
-        }
-
-        if (!class_exists($class) && !interface_exists($class)) {
-            throw new InvalidArgumentException(sprintf('The class or interface "%s" does not exist.', $class));
-        }
-
-        $classMetadata = new ClassMetadata($class);
-        $this->loader->loadClassMetadata($classMetadata);
-
-        $reflectionClass = $classMetadata->getReflectionClass();
-
-        // Include metadata from the parent class
-        if ($parent = $reflectionClass->getParentClass()) {
-            $classMetadata->merge($this->getMetadataFor($parent->name));
-        }
-
-        // Include metadata from all implemented interfaces
-        foreach ($reflectionClass->getInterfaces() as $interface) {
-            $classMetadata->merge($this->getMetadataFor($interface->name));
-        }
-
-        if ($this->cache) {
-            $this->cache->save($class, $classMetadata);
-        }
-
-        return $this->loadedClasses[$class] = $classMetadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasMetadataFor($value)
-    {
-        $class = $this->getClass($value);
-
-        return class_exists($class) || interface_exists($class);
-    }
-
-    /**
-     * Gets a class name for a given class or instance.
-     *
-     * @param mixed $value
-     *
-     * @return string|bool
-     */
-    private function getClass($value)
-    {
-        if (!is_object($value) && !is_string($value)) {
-            return false;
-        }
-
-        return ltrim(is_object($value) ? get_class($value) : $value, '\\');
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php b/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php
deleted file mode 100644
index 7ef91a8..0000000
--- a/vendor/symfony/serializer/Mapping/Factory/ClassMetadataFactoryInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Component\Serializer\Mapping\Factory;
-
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-
-/**
- * Returns a {@see ClassMetadataInterface}.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface ClassMetadataFactoryInterface
-{
-    /**
-     * If the method was called with the same class name (or an object of that
-     * class) before, the same metadata instance is returned.
-     *
-     * If the factory was configured with a cache, this method will first look
-     * for an existing metadata instance in the cache. If an existing instance
-     * is found, it will be returned without further ado.
-     *
-     * Otherwise, a new metadata instance is created. If the factory was
-     * configured with a loader, the metadata is passed to the
-     * {@link \Symfony\Component\Serializer\Mapping\Loader\LoaderInterface::loadClassMetadata()} method for further
-     * configuration. At last, the new object is returned.
-     *
-     * @param string|object $value
-     *
-     * @return ClassMetadataInterface
-     *
-     * @throws InvalidArgumentException
-     */
-    public function getMetadataFor($value);
-
-    /**
-     * Checks if class has metadata.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function hasMetadataFor($value);
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/AnnotationLoader.php b/vendor/symfony/serializer/Mapping/Loader/AnnotationLoader.php
deleted file mode 100644
index 6c563b4..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/AnnotationLoader.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Exception\MappingException;
-use Symfony\Component\Serializer\Mapping\AttributeMetadata;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-
-/**
- * Annotation loader.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class AnnotationLoader implements LoaderInterface
-{
-    /**
-     * @var Reader
-     */
-    private $reader;
-
-    /**
-     * @param Reader $reader
-     */
-    public function __construct(Reader $reader)
-    {
-        $this->reader = $reader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadataInterface $classMetadata)
-    {
-        $reflectionClass = $classMetadata->getReflectionClass();
-        $className = $reflectionClass->name;
-        $loaded = false;
-
-        $attributesMetadata = $classMetadata->getAttributesMetadata();
-
-        foreach ($reflectionClass->getProperties() as $property) {
-            if (!isset($attributesMetadata[$property->name])) {
-                $attributesMetadata[$property->name] = new AttributeMetadata($property->name);
-                $classMetadata->addAttributeMetadata($attributesMetadata[$property->name]);
-            }
-
-            if ($property->getDeclaringClass()->name === $className) {
-                foreach ($this->reader->getPropertyAnnotations($property) as $groups) {
-                    if ($groups instanceof Groups) {
-                        foreach ($groups->getGroups() as $group) {
-                            $attributesMetadata[$property->name]->addGroup($group);
-                        }
-                    }
-
-                    $loaded = true;
-                }
-            }
-        }
-
-        foreach ($reflectionClass->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name === $className) {
-                foreach ($this->reader->getMethodAnnotations($method) as $groups) {
-                    if ($groups instanceof Groups) {
-                        if (preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches)) {
-                            $attributeName = lcfirst($matches[2]);
-
-                            if (isset($attributesMetadata[$attributeName])) {
-                                $attributeMetadata = $attributesMetadata[$attributeName];
-                            } else {
-                                $attributesMetadata[$attributeName] = $attributeMetadata = new AttributeMetadata($attributeName);
-                                $classMetadata->addAttributeMetadata($attributeMetadata);
-                            }
-
-                            foreach ($groups->getGroups() as $group) {
-                                $attributeMetadata->addGroup($group);
-                            }
-                        } else {
-                            throw new MappingException(sprintf('Groups on "%s::%s" cannot be added. Groups can only be added on methods beginning with "get", "is", "has" or "set".', $className, $method->name));
-                        }
-                    }
-
-                    $loaded = true;
-                }
-            }
-        }
-
-        return $loaded;
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/FileLoader.php b/vendor/symfony/serializer/Mapping/Loader/FileLoader.php
deleted file mode 100644
index 38bb593..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/FileLoader.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Symfony\Component\Serializer\Exception\MappingException;
-
-/**
- * Base class for all file based loaders.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-abstract class FileLoader implements LoaderInterface
-{
-    /**
-     * @var string
-     */
-    protected $file;
-
-    /**
-     * Constructor.
-     *
-     * @param string $file The mapping file to load
-     *
-     * @throws MappingException if the mapping file does not exist or is not readable
-     */
-    public function __construct($file)
-    {
-        if (!is_file($file)) {
-            throw new MappingException(sprintf('The mapping file %s does not exist', $file));
-        }
-
-        if (!is_readable($file)) {
-            throw new MappingException(sprintf('The mapping file %s is not readable', $file));
-        }
-
-        $this->file = $file;
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php b/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php
deleted file mode 100644
index 8bf1c17..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/LoaderChain.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Symfony\Component\Serializer\Exception\MappingException;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-
-/**
- * Calls multiple {@link LoaderInterface} instances in a chain.
- *
- * This class accepts multiple instances of LoaderInterface to be passed to the
- * constructor. When {@link loadClassMetadata()} is called, the same method is called
- * in <em>all</em> of these loaders, regardless of whether any of them was
- * successful or not.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class LoaderChain implements LoaderInterface
-{
-    /**
-     * @var LoaderInterface[]
-     */
-    private $loaders;
-
-    /**
-     * Accepts a list of LoaderInterface instances.
-     *
-     * @param LoaderInterface[] $loaders An array of LoaderInterface instances
-     *
-     * @throws MappingException If any of the loaders does not implement LoaderInterface
-     */
-    public function __construct(array $loaders)
-    {
-        foreach ($loaders as $loader) {
-            if (!$loader instanceof LoaderInterface) {
-                throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', get_class($loader)));
-            }
-        }
-
-        $this->loaders = $loaders;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadataInterface $metadata)
-    {
-        $success = false;
-
-        foreach ($this->loaders as $loader) {
-            $success = $loader->loadClassMetadata($metadata) || $success;
-        }
-
-        return $success;
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/LoaderInterface.php b/vendor/symfony/serializer/Mapping/Loader/LoaderInterface.php
deleted file mode 100644
index ebf84b6..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/LoaderInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-
-/**
- * Loads {@link ClassMetadataInterface}.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface LoaderInterface
-{
-    /**
-     * Load class metadata.
-     *
-     * @param ClassMetadataInterface $classMetadata A metadata
-     *
-     * @return bool
-     */
-    public function loadClassMetadata(ClassMetadataInterface $classMetadata);
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/XmlFileLoader.php b/vendor/symfony/serializer/Mapping/Loader/XmlFileLoader.php
deleted file mode 100644
index 0da2f7d..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/XmlFileLoader.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Serializer\Exception\MappingException;
-use Symfony\Component\Serializer\Mapping\AttributeMetadata;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-
-/**
- * Loads XML mapping files.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class XmlFileLoader extends FileLoader
-{
-    /**
-     * An array of {@class \SimpleXMLElement} instances.
-     *
-     * @var \SimpleXMLElement[]|null
-     */
-    private $classes;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadataInterface $classMetadata)
-    {
-        if (null === $this->classes) {
-            $this->classes = array();
-            $xml = $this->parseFile($this->file);
-
-            foreach ($xml->class as $class) {
-                $this->classes[(string) $class['name']] = $class;
-            }
-        }
-
-        $attributesMetadata = $classMetadata->getAttributesMetadata();
-
-        if (isset($this->classes[$classMetadata->getName()])) {
-            $xml = $this->classes[$classMetadata->getName()];
-
-            foreach ($xml->attribute as $attribute) {
-                $attributeName = (string) $attribute['name'];
-
-                if (isset($attributesMetadata[$attributeName])) {
-                    $attributeMetadata = $attributesMetadata[$attributeName];
-                } else {
-                    $attributeMetadata = new AttributeMetadata($attributeName);
-                    $classMetadata->addAttributeMetadata($attributeMetadata);
-                }
-
-                foreach ($attribute->group as $group) {
-                    $attributeMetadata->addGroup((string) $group);
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses a XML File.
-     *
-     * @param string $file Path of file
-     *
-     * @return \SimpleXMLElement
-     *
-     * @throws MappingException
-     */
-    private function parseFile($file)
-    {
-        try {
-            $dom = XmlUtils::loadFile($file, __DIR__.'/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd');
-        } catch (\Exception $e) {
-            throw new MappingException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        return simplexml_import_dom($dom);
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php b/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php
deleted file mode 100644
index 1c84698..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/YamlFileLoader.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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\Component\Serializer\Mapping\Loader;
-
-use Symfony\Component\Serializer\Exception\MappingException;
-use Symfony\Component\Serializer\Mapping\AttributeMetadata;
-use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
-use Symfony\Component\Yaml\Parser;
-
-/**
- * YAML File Loader.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class YamlFileLoader extends FileLoader
-{
-    private $yamlParser;
-
-    /**
-     * An array of YAML class descriptions.
-     *
-     * @var array
-     */
-    private $classes = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadataInterface $classMetadata)
-    {
-        if (null === $this->classes) {
-            if (!stream_is_local($this->file)) {
-                throw new MappingException(sprintf('This is not a local file "%s".', $this->file));
-            }
-
-            if (null === $this->yamlParser) {
-                $this->yamlParser = new Parser();
-            }
-
-            $classes = $this->yamlParser->parse(file_get_contents($this->file));
-
-            if (empty($classes)) {
-                return false;
-            }
-
-            // not an array
-            if (!is_array($classes)) {
-                throw new MappingException(sprintf('The file "%s" must contain a YAML array.', $this->file));
-            }
-
-            $this->classes = $classes;
-        }
-
-        if (isset($this->classes[$classMetadata->getName()])) {
-            $yaml = $this->classes[$classMetadata->getName()];
-
-            if (isset($yaml['attributes']) && is_array($yaml['attributes'])) {
-                $attributesMetadata = $classMetadata->getAttributesMetadata();
-                foreach ($yaml['attributes'] as $attribute => $data) {
-                    if (isset($attributesMetadata[$attribute])) {
-                        $attributeMetadata = $attributesMetadata[$attribute];
-                    } else {
-                        $attributeMetadata = new AttributeMetadata($attribute);
-                        $classMetadata->addAttributeMetadata($attributeMetadata);
-                    }
-
-                    if (isset($data['groups'])) {
-                        foreach ($data['groups'] as $group) {
-                            $attributeMetadata->addGroup($group);
-                        }
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd b/vendor/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd
deleted file mode 100644
index cd5a9a9..0000000
--- a/vendor/symfony/serializer/Mapping/Loader/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" ?>
-
-<xsd:schema xmlns="http://symfony.com/schema/dic/serializer-mapping"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://symfony.com/schema/dic/serializer-mapping"
-            elementFormDefault="qualified">
-
-    <xsd:annotation>
-        <xsd:documentation><![CDATA[
-      Symfony Serializer Mapping Schema, version 1.0
-      Authors: Kévin Dunglas
-
-      A serializer mapping connects attributes with serialization groups.
-    ]]></xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:element name="serializer" type="serializer" />
-
-    <xsd:complexType name="serializer">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
-        The root element of the serializer mapping definition.
-      ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="class" type="class" />
-        </xsd:choice>
-    </xsd:complexType>
-
-    <xsd:complexType name="class">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
-        Contains serialization groups for a single class.
-
-        Nested elements may be class property and/or getter definitions.
-      ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:choice>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-
-    <xsd:complexType name="attribute">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[
-        Contains serialization groups for a attributes. The name of the attribute should be given in the "name" option.
-      ]]></xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="group" type="xsd:string" maxOccurs="unbounded" />
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string" use="required" />
-    </xsd:complexType>
-
-</xsd:schema>
diff --git a/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php b/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
deleted file mode 100644
index 8ef851c..0000000
--- a/vendor/symfony/serializer/NameConverter/CamelCaseToSnakeCaseNameConverter.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\Serializer\NameConverter;
-
-/**
- * CamelCase to Underscore name converter.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
-{
-    /**
-     * @var array|null
-     */
-    private $attributes;
-    /**
-     * @var bool
-     */
-    private $lowerCamelCase;
-
-    /**
-     * @param null|array $attributes     The list of attributes to rename or null for all attributes.
-     * @param bool       $lowerCamelCase Use lowerCamelCase style.
-     */
-    public function __construct(array $attributes = null, $lowerCamelCase = true)
-    {
-        $this->attributes = $attributes;
-        $this->lowerCamelCase = $lowerCamelCase;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function normalize($propertyName)
-    {
-        if (null === $this->attributes || in_array($propertyName, $this->attributes)) {
-            $snakeCasedName = '';
-
-            $len = strlen($propertyName);
-            for ($i = 0; $i < $len; ++$i) {
-                if (ctype_upper($propertyName[$i])) {
-                    $snakeCasedName .= '_'.strtolower($propertyName[$i]);
-                } else {
-                    $snakeCasedName .= strtolower($propertyName[$i]);
-                }
-            }
-
-            return $snakeCasedName;
-        }
-
-        return $propertyName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function denormalize($propertyName)
-    {
-        $camelCasedName = preg_replace_callback('/(^|_|\.)+(.)/', function ($match) {
-            return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
-        }, $propertyName);
-
-        if ($this->lowerCamelCase) {
-            $camelCasedName = lcfirst($camelCasedName);
-        }
-
-        if (null === $this->attributes || in_array($camelCasedName, $this->attributes)) {
-            return $this->lowerCamelCase ? lcfirst($camelCasedName) : $camelCasedName;
-        }
-
-        return $propertyName;
-    }
-}
diff --git a/vendor/symfony/serializer/NameConverter/NameConverterInterface.php b/vendor/symfony/serializer/NameConverter/NameConverterInterface.php
deleted file mode 100644
index c9f66b0..0000000
--- a/vendor/symfony/serializer/NameConverter/NameConverterInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Serializer\NameConverter;
-
-/**
- * Defines the interface for property name converters.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface NameConverterInterface
-{
-    /**
-     * Converts a property name to its normalized value.
-     *
-     * @param string $propertyName
-     *
-     * @return string
-     */
-    public function normalize($propertyName);
-
-    /**
-     * Converts a property name to its denormalized value.
-     *
-     * @param string $propertyName
-     *
-     * @return string
-     */
-    public function denormalize($propertyName);
-}
diff --git a/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php b/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
deleted file mode 100644
index 55c60c0..0000000
--- a/vendor/symfony/serializer/Normalizer/AbstractNormalizer.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-use Symfony\Component\Serializer\Exception\CircularReferenceException;
-use Symfony\Component\Serializer\Exception\InvalidArgumentException;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
-use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
-use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
-use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
-
-/**
- * Normalizer implementation.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-abstract class AbstractNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface
-{
-    /**
-     * @var int
-     */
-    protected $circularReferenceLimit = 1;
-    /**
-     * @var callable
-     */
-    protected $circularReferenceHandler;
-    /**
-     * @var ClassMetadataFactoryInterface|null
-     */
-    protected $classMetadataFactory;
-    /**
-     * @var NameConverterInterface|null
-     */
-    protected $nameConverter;
-    /**
-     * @var array
-     */
-    protected $callbacks = array();
-    /**
-     * @var array
-     */
-    protected $ignoredAttributes = array();
-    /**
-     * @var array
-     */
-    protected $camelizedAttributes = array();
-
-    /**
-     * Sets the {@link ClassMetadataFactoryInterface} to use.
-     *
-     * @param ClassMetadataFactoryInterface|null $classMetadataFactory
-     * @param NameConverterInterface|null        $nameConverter
-     */
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null)
-    {
-        $this->classMetadataFactory = $classMetadataFactory;
-        $this->nameConverter = $nameConverter;
-    }
-
-    /**
-     * Set circular reference limit.
-     *
-     * @param int $circularReferenceLimit limit of iterations for the same object
-     *
-     * @return self
-     */
-    public function setCircularReferenceLimit($circularReferenceLimit)
-    {
-        $this->circularReferenceLimit = $circularReferenceLimit;
-
-        return $this;
-    }
-
-    /**
-     * Set circular reference handler.
-     *
-     * @param callable $circularReferenceHandler
-     *
-     * @return self
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setCircularReferenceHandler($circularReferenceHandler)
-    {
-        if (!is_callable($circularReferenceHandler)) {
-            throw new InvalidArgumentException('The given circular reference handler is not callable.');
-        }
-
-        $this->circularReferenceHandler = $circularReferenceHandler;
-
-        return $this;
-    }
-
-    /**
-     * Set normalization callbacks.
-     *
-     * @param callable[] $callbacks help normalize the result
-     *
-     * @return self
-     *
-     * @throws InvalidArgumentException if a non-callable callback is set
-     */
-    public function setCallbacks(array $callbacks)
-    {
-        foreach ($callbacks as $attribute => $callback) {
-            if (!is_callable($callback)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The given callback for attribute "%s" is not callable.',
-                    $attribute
-                ));
-            }
-        }
-        $this->callbacks = $callbacks;
-
-        return $this;
-    }
-
-    /**
-     * Set ignored attributes for normalization and denormalization.
-     *
-     * @param array $ignoredAttributes
-     *
-     * @return self
-     */
-    public function setIgnoredAttributes(array $ignoredAttributes)
-    {
-        $this->ignoredAttributes = $ignoredAttributes;
-
-        return $this;
-    }
-
-    /**
-     * Set attributes to be camelized on denormalize.
-     *
-     * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
-     *
-     * @param array $camelizedAttributes
-     *
-     * @return self
-     *
-     * @throws LogicException
-     */
-    public function setCamelizedAttributes(array $camelizedAttributes)
-    {
-        @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
-
-        if ($this->nameConverter && !$this->nameConverter instanceof CamelCaseToSnakeCaseNameConverter) {
-            throw new LogicException(sprintf('%s cannot be called if a custom Name Converter is defined.', __METHOD__));
-        }
-
-        $attributes = array();
-        foreach ($camelizedAttributes as $camelizedAttribute) {
-            $attributes[] = lcfirst(preg_replace_callback('/(^|_|\.)+(.)/', function ($match) {
-                return ('.' === $match[1] ? '_' : '').strtoupper($match[2]);
-            }, $camelizedAttribute));
-        }
-
-        $this->nameConverter = new CamelCaseToSnakeCaseNameConverter($attributes);
-
-        return $this;
-    }
-
-    /**
-     * Detects if the configured circular reference limit is reached.
-     *
-     * @param object $object
-     * @param array  $context
-     *
-     * @return bool
-     *
-     * @throws CircularReferenceException
-     */
-    protected function isCircularReference($object, &$context)
-    {
-        $objectHash = spl_object_hash($object);
-
-        if (isset($context['circular_reference_limit'][$objectHash])) {
-            if ($context['circular_reference_limit'][$objectHash] >= $this->circularReferenceLimit) {
-                unset($context['circular_reference_limit'][$objectHash]);
-
-                return true;
-            }
-
-            ++$context['circular_reference_limit'][$objectHash];
-        } else {
-            $context['circular_reference_limit'][$objectHash] = 1;
-        }
-
-        return false;
-    }
-
-    /**
-     * Handles a circular reference.
-     *
-     * If a circular reference handler is set, it will be called. Otherwise, a
-     * {@class CircularReferenceException} will be thrown.
-     *
-     * @param object $object
-     *
-     * @return mixed
-     *
-     * @throws CircularReferenceException
-     */
-    protected function handleCircularReference($object)
-    {
-        if ($this->circularReferenceHandler) {
-            return call_user_func($this->circularReferenceHandler, $object);
-        }
-
-        throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));
-    }
-
-    /**
-     * Format an attribute name, for example to convert a snake_case name to camelCase.
-     *
-     * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
-     *
-     * @param string $attributeName
-     *
-     * @return string
-     */
-    protected function formatAttribute($attributeName)
-    {
-        @trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;
-    }
-
-    /**
-     * Gets attributes to normalize using groups.
-     *
-     * @param string|object $classOrObject
-     * @param array         $context
-     * @param bool          $attributesAsString If false, return an array of {@link AttributeMetadataInterface}
-     *
-     * @return string[]|AttributeMetadataInterface[]|bool
-     */
-    protected function getAllowedAttributes($classOrObject, array $context, $attributesAsString = false)
-    {
-        if (!$this->classMetadataFactory || !isset($context['groups']) || !is_array($context['groups'])) {
-            return false;
-        }
-
-        $allowedAttributes = array();
-        foreach ($this->classMetadataFactory->getMetadataFor($classOrObject)->getAttributesMetadata() as $attributeMetadata) {
-            if (count(array_intersect($attributeMetadata->getGroups(), $context['groups']))) {
-                $allowedAttributes[] = $attributesAsString ? $attributeMetadata->getName() : $attributeMetadata;
-            }
-        }
-
-        return array_unique($allowedAttributes);
-    }
-
-    /**
-     * Normalizes the given data to an array. It's particularly useful during
-     * the denormalization process.
-     *
-     * @param object|array $data
-     *
-     * @return array
-     */
-    protected function prepareForDenormalization($data)
-    {
-        return (array) $data;
-    }
-
-    /**
-     * Instantiates an object using constructor parameters when needed.
-     *
-     * This method also allows to denormalize data into an existing object if
-     * it is present in the context with the object_to_populate key.
-     *
-     * @param array            $data
-     * @param string           $class
-     * @param array            $context
-     * @param \ReflectionClass $reflectionClass
-     * @param array|bool       $allowedAttributes
-     *
-     * @return object
-     *
-     * @throws RuntimeException
-     */
-    protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
-    {
-        if (
-            isset($context['object_to_populate']) &&
-            is_object($context['object_to_populate']) &&
-            $class === get_class($context['object_to_populate'])
-        ) {
-            return $context['object_to_populate'];
-        }
-
-        $constructor = $reflectionClass->getConstructor();
-        if ($constructor) {
-            $constructorParameters = $constructor->getParameters();
-
-            $params = array();
-            foreach ($constructorParameters as $constructorParameter) {
-                $paramName = $constructorParameter->name;
-                $key = $this->nameConverter ? $this->nameConverter->normalize($paramName) : $paramName;
-
-                $allowed = $allowedAttributes === false || in_array($paramName, $allowedAttributes);
-                $ignored = in_array($paramName, $this->ignoredAttributes);
-                if (method_exists($constructorParameter, 'isVariadic') && $constructorParameter->isVariadic()) {
-                    if ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
-                        if (!is_array($data[$paramName])) {
-                            throw new RuntimeException(sprintf('Cannot create an instance of %s from serialized data because the variadic parameter %s can only accept an array.', $class, $constructorParameter->name));
-                        }
-
-                        $params = array_merge($params, $data[$paramName]);
-                    }
-                } elseif ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
-                    $params[] = $data[$key];
-                    // don't run set for a parameter passed to the constructor
-                    unset($data[$key]);
-                } elseif ($constructorParameter->isDefaultValueAvailable()) {
-                    $params[] = $constructorParameter->getDefaultValue();
-                } else {
-                    throw new RuntimeException(
-                        sprintf(
-                            'Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.',
-                            $class,
-                            $constructorParameter->name
-                        )
-                    );
-                }
-            }
-
-            return $reflectionClass->newInstanceArgs($params);
-        }
-
-        return new $class();
-    }
-}
diff --git a/vendor/symfony/serializer/Normalizer/CustomNormalizer.php b/vendor/symfony/serializer/Normalizer/CustomNormalizer.php
deleted file mode 100644
index 83c3c14..0000000
--- a/vendor/symfony/serializer/Normalizer/CustomNormalizer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-/**
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class CustomNormalizer extends SerializerAwareNormalizer implements NormalizerInterface, DenormalizerInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function normalize($object, $format = null, array $context = array())
-    {
-        return $object->normalize($this->serializer, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function denormalize($data, $class, $format = null, array $context = array())
-    {
-        $object = new $class();
-        $object->denormalize($this->serializer, $data, $format, $context);
-
-        return $object;
-    }
-
-    /**
-     * Checks if the given class implements the NormalizableInterface.
-     *
-     * @param mixed  $data   Data to normalize.
-     * @param string $format The format being (de-)serialized from or into.
-     *
-     * @return bool
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return $data instanceof NormalizableInterface;
-    }
-
-    /**
-     * Checks if the given class implements the NormalizableInterface.
-     *
-     * @param mixed  $data   Data to denormalize from.
-     * @param string $type   The class to which the data should be denormalized.
-     * @param string $format The format being deserialized from.
-     *
-     * @return bool
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        $class = new \ReflectionClass($type);
-
-        return $class->isSubclassOf('Symfony\Component\Serializer\Normalizer\DenormalizableInterface');
-    }
-}
diff --git a/vendor/symfony/serializer/Normalizer/DenormalizableInterface.php b/vendor/symfony/serializer/Normalizer/DenormalizableInterface.php
deleted file mode 100644
index 86c2702..0000000
--- a/vendor/symfony/serializer/Normalizer/DenormalizableInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-/**
- * Defines the most basic interface a class must implement to be denormalizable.
- *
- * If a denormalizer is registered for the class and it doesn't implement
- * the Denormalizable interfaces, the normalizer will be used instead
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface DenormalizableInterface
-{
-    /**
-     * Denormalizes the object back from an array of scalars|arrays.
-     *
-     * It is important to understand that the denormalize() call should denormalize
-     * recursively all child objects of the implementor.
-     *
-     * @param DenormalizerInterface $denormalizer The denormalizer is given so that you
-     *                                            can use it to denormalize objects contained within this object
-     * @param array|scalar          $data         The data from which to re-create the object.
-     * @param string|null           $format       The format is optionally given to be able to denormalize differently
-     *                                            based on different input formats
-     * @param array                 $context      options for denormalizing
-     */
-    public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
-}
diff --git a/vendor/symfony/serializer/Normalizer/DenormalizerInterface.php b/vendor/symfony/serializer/Normalizer/DenormalizerInterface.php
deleted file mode 100644
index 8b6c233..0000000
--- a/vendor/symfony/serializer/Normalizer/DenormalizerInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-/**
- * Defines the interface of denormalizers.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface DenormalizerInterface
-{
-    /**
-     * Denormalizes data back into an object of the given class.
-     *
-     * @param mixed  $data    data to restore
-     * @param string $class   the expected class to instantiate
-     * @param string $format  format the given data was extracted from
-     * @param array  $context options available to the denormalizer
-     *
-     * @return object
-     */
-    public function denormalize($data, $class, $format = null, array $context = array());
-
-    /**
-     * Checks whether the given class is supported for denormalization by this normalizer.
-     *
-     * @param mixed  $data   Data to denormalize from.
-     * @param string $type   The class to which the data should be denormalized.
-     * @param string $format The format being deserialized from.
-     *
-     * @return bool
-     */
-    public function supportsDenormalization($data, $type, $format = null);
-}
diff --git a/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php b/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php
deleted file mode 100644
index 44a71cf..0000000
--- a/vendor/symfony/serializer/Normalizer/GetSetMethodNormalizer.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-use Symfony\Component\Serializer\Exception\CircularReferenceException;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-
-/**
- * Converts between objects with getter and setter methods and arrays.
- *
- * The normalization process looks at all public methods and calls the ones
- * which have a name starting with get and take no parameters. The result is a
- * map from property names (method name stripped of the get prefix and converted
- * to lower case) to property values. Property values are normalized through the
- * serializer.
- *
- * The denormalization first looks at the constructor of the given class to see
- * if any of the parameters have the same name as one of the properties. The
- * constructor is then called with all parameters or an exception is thrown if
- * any required parameters were not present as properties. Then the denormalizer
- * walks through the given map of property names to property values to see if a
- * setter method exists for any of the properties. If a setter exists it is
- * called with the property value. No automatic denormalization of the value
- * takes place.
- *
- * @author Nils Adermann <naderman@naderman.de>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class GetSetMethodNormalizer extends AbstractNormalizer
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @throws LogicException
-     * @throws CircularReferenceException
-     */
-    public function normalize($object, $format = null, array $context = array())
-    {
-        if ($this->isCircularReference($object, $context)) {
-            return $this->handleCircularReference($object);
-        }
-
-        $reflectionObject = new \ReflectionObject($object);
-        $reflectionMethods = $reflectionObject->getMethods(\ReflectionMethod::IS_PUBLIC);
-        $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
-
-        $attributes = array();
-        foreach ($reflectionMethods as $method) {
-            if ($this->isGetMethod($method)) {
-                $attributeName = lcfirst(substr($method->name, 0 === strpos($method->name, 'is') ? 2 : 3));
-                if (in_array($attributeName, $this->ignoredAttributes)) {
-                    continue;
-                }
-
-                if (false !== $allowedAttributes && !in_array($attributeName, $allowedAttributes)) {
-                    continue;
-                }
-
-                $attributeValue = $method->invoke($object);
-                if (isset($this->callbacks[$attributeName])) {
-                    $attributeValue = call_user_func($this->callbacks[$attributeName], $attributeValue);
-                }
-                if (null !== $attributeValue && !is_scalar($attributeValue)) {
-                    if (!$this->serializer instanceof NormalizerInterface) {
-                        throw new LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $attributeName));
-                    }
-
-                    $attributeValue = $this->serializer->normalize($attributeValue, $format, $context);
-                }
-
-                if ($this->nameConverter) {
-                    $attributeName = $this->nameConverter->normalize($attributeName);
-                }
-
-                $attributes[$attributeName] = $attributeValue;
-            }
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws RuntimeException
-     */
-    public function denormalize($data, $class, $format = null, array $context = array())
-    {
-        $allowedAttributes = $this->getAllowedAttributes($class, $context, true);
-        $normalizedData = $this->prepareForDenormalization($data);
-
-        $reflectionClass = new \ReflectionClass($class);
-        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes);
-
-        $classMethods = get_class_methods($object);
-        foreach ($normalizedData as $attribute => $value) {
-            if ($this->nameConverter) {
-                $attribute = $this->nameConverter->denormalize($attribute);
-            }
-
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
-            $ignored = in_array($attribute, $this->ignoredAttributes);
-
-            if ($allowed && !$ignored) {
-                $setter = 'set'.ucfirst($attribute);
-
-                if (in_array($setter, $classMethods)) {
-                    $object->$setter($value);
-                }
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return is_object($data) && !$data instanceof \Traversable && $this->supports(get_class($data));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return $this->supports($type);
-    }
-
-    /**
-     * Checks if the given class has any get{Property} method.
-     *
-     * @param string $class
-     *
-     * @return bool
-     */
-    private function supports($class)
-    {
-        $class = new \ReflectionClass($class);
-        $methods = $class->getMethods(\ReflectionMethod::IS_PUBLIC);
-        foreach ($methods as $method) {
-            if ($this->isGetMethod($method)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a method's name is get.* or is.*, and can be called without parameters.
-     *
-     * @param \ReflectionMethod $method the method to check
-     *
-     * @return bool whether the method is a getter or boolean getter.
-     */
-    private function isGetMethod(\ReflectionMethod $method)
-    {
-        $methodLength = strlen($method->name);
-
-        return (
-            ((0 === strpos($method->name, 'get') && 3 < $methodLength) ||
-            (0 === strpos($method->name, 'is') && 2 < $methodLength)) &&
-            0 === $method->getNumberOfRequiredParameters()
-        );
-    }
-}
diff --git a/vendor/symfony/serializer/Normalizer/NormalizableInterface.php b/vendor/symfony/serializer/Normalizer/NormalizableInterface.php
deleted file mode 100644
index b9fefe8..0000000
--- a/vendor/symfony/serializer/Normalizer/NormalizableInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-/**
- * Defines the most basic interface a class must implement to be normalizable.
- *
- * If a normalizer is registered for the class and it doesn't implement
- * the Normalizable interfaces, the normalizer will be used instead.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface NormalizableInterface
-{
-    /**
-     * Normalizes the object into an array of scalars|arrays.
-     *
-     * It is important to understand that the normalize() call should normalize
-     * recursively all child objects of the implementor.
-     *
-     * @param NormalizerInterface $normalizer The normalizer is given so that you
-     *                                        can use it to normalize objects contained within this object.
-     * @param string|null         $format     The format is optionally given to be able to normalize differently
-     *                                        based on different output formats.
-     * @param array               $context    Options for normalizing this object
-     *
-     * @return array|string|bool|int|float|null
-     */
-    public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());
-}
diff --git a/vendor/symfony/serializer/Normalizer/NormalizerInterface.php b/vendor/symfony/serializer/Normalizer/NormalizerInterface.php
deleted file mode 100644
index 2a51d63..0000000
--- a/vendor/symfony/serializer/Normalizer/NormalizerInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-/**
- * Defines the interface of normalizers.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface NormalizerInterface
-{
-    /**
-     * Normalizes an object into a set of arrays/scalars.
-     *
-     * @param object $object  object to normalize
-     * @param string $format  format the normalization result will be encoded as
-     * @param array  $context Context options for the normalizer
-     *
-     * @return array|string|bool|int|float|null
-     */
-    public function normalize($object, $format = null, array $context = array());
-
-    /**
-     * Checks whether the given class is supported for normalization by this normalizer.
-     *
-     * @param mixed  $data   Data to normalize.
-     * @param string $format The format being (de-)serialized from or into.
-     *
-     * @return bool
-     */
-    public function supportsNormalization($data, $format = null);
-}
diff --git a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php b/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
deleted file mode 100644
index ba84ac7..0000000
--- a/vendor/symfony/serializer/Normalizer/ObjectNormalizer.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Serializer\Exception\CircularReferenceException;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
-use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
-
-/**
- * Converts between objects and arrays using the PropertyAccess component.
- *
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ObjectNormalizer extends AbstractNormalizer
-{
-    /**
-     * @var PropertyAccessorInterface
-     */
-    protected $propertyAccessor;
-
-    public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null)
-    {
-        parent::__construct($classMetadataFactory, $nameConverter);
-
-        $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return is_object($data) && !$data instanceof \Traversable;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws CircularReferenceException
-     */
-    public function normalize($object, $format = null, array $context = array())
-    {
-        if ($this->isCircularReference($object, $context)) {
-            return $this->handleCircularReference($object);
-        }
-
-        $data = array();
-        $attributes = $this->getAllowedAttributes($object, $context, true);
-
-        // If not using groups, detect manually
-        if (false === $attributes) {
-            $attributes = array();
-
-            // methods
-            $reflClass = new \ReflectionClass($object);
-            foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
-                if (
-                    !$reflMethod->isConstructor() &&
-                    !$reflMethod->isDestructor() &&
-                    0 === $reflMethod->getNumberOfRequiredParameters()
-                ) {
-                    $name = $reflMethod->getName();
-
-                    if (strpos($name, 'get') === 0 || strpos($name, 'has') === 0) {
-                        // getters and hassers
-                        $attributes[lcfirst(substr($name, 3))] = true;
-                    } elseif (strpos($name, 'is') === 0) {
-                        // issers
-                        $attributes[lcfirst(substr($name, 2))] = true;
-                    }
-                }
-            }
-
-            // properties
-            foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
-                $attributes[$reflProperty->getName()] = true;
-            }
-
-            $attributes = array_keys($attributes);
-        }
-
-        foreach ($attributes as $attribute) {
-            if (in_array($attribute, $this->ignoredAttributes)) {
-                continue;
-            }
-
-            $attributeValue = $this->propertyAccessor->getValue($object, $attribute);
-
-            if (isset($this->callbacks[$attribute])) {
-                $attributeValue = call_user_func($this->callbacks[$attribute], $attributeValue);
-            }
-
-            if (null !== $attributeValue && !is_scalar($attributeValue)) {
-                if (!$this->serializer instanceof NormalizerInterface) {
-                    throw new LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $attribute));
-                }
-
-                $attributeValue = $this->serializer->normalize($attributeValue, $format, $context);
-            }
-
-            if ($this->nameConverter) {
-                $attribute = $this->nameConverter->normalize($attribute);
-            }
-
-            $data[$attribute] = $attributeValue;
-        }
-
-        return $data;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return class_exists($type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function denormalize($data, $class, $format = null, array $context = array())
-    {
-        $allowedAttributes = $this->getAllowedAttributes($class, $context, true);
-        $normalizedData = $this->prepareForDenormalization($data);
-
-        $reflectionClass = new \ReflectionClass($class);
-        $object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes);
-
-        foreach ($normalizedData as $attribute => $value) {
-            if ($this->nameConverter) {
-                $attribute = $this->nameConverter->denormalize($attribute);
-            }
-
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
-            $ignored = in_array($attribute, $this->ignoredAttributes);
-
-            if ($allowed && !$ignored) {
-                try {
-                    $this->propertyAccessor->setValue($object, $attribute, $value);
-                } catch (NoSuchPropertyException $exception) {
-                    // Properties not found are ignored
-                }
-            }
-        }
-
-        return $object;
-    }
-}
diff --git a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php b/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php
deleted file mode 100644
index c8e83d1..0000000
--- a/vendor/symfony/serializer/Normalizer/PropertyNormalizer.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-use Symfony\Component\Serializer\Exception\CircularReferenceException;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\RuntimeException;
-
-/**
- * Converts between objects and arrays by mapping properties.
- *
- * The normalization process looks for all the object's properties (public and private).
- * The result is a map from property names to property values. Property values
- * are normalized through the serializer.
- *
- * The denormalization first looks at the constructor of the given class to see
- * if any of the parameters have the same name as one of the properties. The
- * constructor is then called with all parameters or an exception is thrown if
- * any required parameters were not present as properties. Then the denormalizer
- * walks through the given map of property names to property values to see if a
- * property with the corresponding name exists. If found, the property gets the value.
- *
- * @author Matthieu Napoli <matthieu@mnapoli.fr>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class PropertyNormalizer extends AbstractNormalizer
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @throws CircularReferenceException
-     */
-    public function normalize($object, $format = null, array $context = array())
-    {
-        if ($this->isCircularReference($object, $context)) {
-            return $this->handleCircularReference($object);
-        }
-
-        $reflectionObject = new \ReflectionObject($object);
-        $attributes = array();
-        $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
-
-        foreach ($reflectionObject->getProperties() as $property) {
-            if (in_array($property->name, $this->ignoredAttributes)) {
-                continue;
-            }
-
-            if (false !== $allowedAttributes && !in_array($property->name, $allowedAttributes)) {
-                continue;
-            }
-
-            // Override visibility
-            if (!$property->isPublic()) {
-                $property->setAccessible(true);
-            }
-
-            $attributeValue = $property->getValue($object);
-
-            if (isset($this->callbacks[$property->name])) {
-                $attributeValue = call_user_func($this->callbacks[$property->name], $attributeValue);
-            }
-            if (null !== $attributeValue && !is_scalar($attributeValue)) {
-                if (!$this->serializer instanceof NormalizerInterface) {
-                    throw new LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $property->name));
-                }
-
-                $attributeValue = $this->serializer->normalize($attributeValue, $format, $context);
-            }
-
-            $propertyName = $property->name;
-            if ($this->nameConverter) {
-                $propertyName = $this->nameConverter->normalize($propertyName);
-            }
-
-            $attributes[$propertyName] = $attributeValue;
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws RuntimeException
-     */
-    public function denormalize($data, $class, $format = null, array $context = array())
-    {
-        $allowedAttributes = $this->getAllowedAttributes($class, $context, true);
-        $data = $this->prepareForDenormalization($data);
-
-        $reflectionClass = new \ReflectionClass($class);
-        $object = $this->instantiateObject($data, $class, $context, $reflectionClass, $allowedAttributes);
-
-        foreach ($data as $propertyName => $value) {
-            if ($this->nameConverter) {
-                $propertyName = $this->nameConverter->denormalize($propertyName);
-            }
-
-            $allowed = $allowedAttributes === false || in_array($propertyName, $allowedAttributes);
-            $ignored = in_array($propertyName, $this->ignoredAttributes);
-            if ($allowed && !$ignored && $reflectionClass->hasProperty($propertyName)) {
-                $property = $reflectionClass->getProperty($propertyName);
-
-                // Override visibility
-                if (!$property->isPublic()) {
-                    $property->setAccessible(true);
-                }
-
-                $property->setValue($object, $value);
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return is_object($data) && !$data instanceof \Traversable && $this->supports(get_class($data));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return $this->supports($type);
-    }
-
-    /**
-     * Checks if the given class has any non-static property.
-     *
-     * @param string $class
-     *
-     * @return bool
-     */
-    private function supports($class)
-    {
-        $class = new \ReflectionClass($class);
-
-        // We look for at least one non-static property
-        foreach ($class->getProperties() as $property) {
-            if (!$property->isStatic()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/symfony/serializer/Normalizer/SerializerAwareNormalizer.php b/vendor/symfony/serializer/Normalizer/SerializerAwareNormalizer.php
deleted file mode 100644
index 3956857..0000000
--- a/vendor/symfony/serializer/Normalizer/SerializerAwareNormalizer.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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\Component\Serializer\Normalizer;
-
-use Symfony\Component\Serializer\SerializerInterface;
-use Symfony\Component\Serializer\SerializerAwareInterface;
-
-/**
- * SerializerAware Normalizer implementation.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-abstract class SerializerAwareNormalizer implements SerializerAwareInterface
-{
-    /**
-     * @var SerializerInterface
-     */
-    protected $serializer;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSerializer(SerializerInterface $serializer)
-    {
-        $this->serializer = $serializer;
-    }
-}
diff --git a/vendor/symfony/serializer/README.md b/vendor/symfony/serializer/README.md
deleted file mode 100644
index 156a288..0000000
--- a/vendor/symfony/serializer/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Serializer Component
-====================
-
-With the Serializer component it's possible to handle serializing data structures,
-including object graphs, into array structures or other formats like XML and JSON.
-It can also handle deserializing XML and JSON back to object graphs.
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Serializer/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/serializer/Serializer.php b/vendor/symfony/serializer/Serializer.php
deleted file mode 100644
index 4aeddab..0000000
--- a/vendor/symfony/serializer/Serializer.php
+++ /dev/null
@@ -1,310 +0,0 @@
-<?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\Component\Serializer;
-
-use Symfony\Component\Serializer\Encoder\ChainDecoder;
-use Symfony\Component\Serializer\Encoder\ChainEncoder;
-use Symfony\Component\Serializer\Encoder\EncoderInterface;
-use Symfony\Component\Serializer\Encoder\DecoderInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Exception\LogicException;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
-
-/**
- * Serializer serializes and deserializes data.
- *
- * objects are turned into arrays by normalizers.
- * arrays are turned into various output formats by encoders.
- *
- * $serializer->serialize($obj, 'xml')
- * $serializer->decode($data, 'xml')
- * $serializer->denormalize($data, 'Class', 'xml')
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Lukas Kahwe Smith <smith@pooteeweet.org>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class Serializer implements SerializerInterface, NormalizerInterface, DenormalizerInterface, EncoderInterface, DecoderInterface
-{
-    /**
-     * @var Encoder\ChainEncoder
-     */
-    protected $encoder;
-    /**
-     * @var Encoder\ChainDecoder
-     */
-    protected $decoder;
-    /**
-     * @var array
-     */
-    protected $normalizers = array();
-    /**
-     * @var array
-     */
-    protected $normalizerCache = array();
-    /**
-     * @var array
-     */
-    protected $denormalizerCache = array();
-
-    public function __construct(array $normalizers = array(), array $encoders = array())
-    {
-        foreach ($normalizers as $normalizer) {
-            if ($normalizer instanceof SerializerAwareInterface) {
-                $normalizer->setSerializer($this);
-            }
-        }
-        $this->normalizers = $normalizers;
-
-        $decoders = array();
-        $realEncoders = array();
-        foreach ($encoders as $encoder) {
-            if ($encoder instanceof SerializerAwareInterface) {
-                $encoder->setSerializer($this);
-            }
-            if ($encoder instanceof DecoderInterface) {
-                $decoders[] = $encoder;
-            }
-            if ($encoder instanceof EncoderInterface) {
-                $realEncoders[] = $encoder;
-            }
-        }
-        $this->encoder = new ChainEncoder($realEncoders);
-        $this->decoder = new ChainDecoder($decoders);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function serialize($data, $format, array $context = array())
-    {
-        if (!$this->supportsEncoding($format)) {
-            throw new UnexpectedValueException(sprintf('Serialization for the format %s is not supported', $format));
-        }
-
-        if ($this->encoder->needsNormalization($format)) {
-            $data = $this->normalize($data, $format, $context);
-        }
-
-        return $this->encode($data, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function deserialize($data, $type, $format, array $context = array())
-    {
-        if (!$this->supportsDecoding($format)) {
-            throw new UnexpectedValueException(sprintf('Deserialization for the format %s is not supported', $format));
-        }
-
-        $data = $this->decode($data, $format, $context);
-
-        return $this->denormalize($data, $type, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function normalize($data, $format = null, array $context = array())
-    {
-        // If a normalizer supports the given data, use it
-        if ($normalizer = $this->getNormalizer($data, $format)) {
-            return $normalizer->normalize($data, $format, $context);
-        }
-
-        if (null === $data || is_scalar($data)) {
-            return $data;
-        }
-        if (is_object($data) && $this->supportsNormalization($data, $format)) {
-            return $this->normalizeObject($data, $format, $context);
-        }
-        if ($data instanceof \Traversable) {
-            $normalized = array();
-            foreach ($data as $key => $val) {
-                $normalized[$key] = $this->normalize($val, $format, $context);
-            }
-
-            return $normalized;
-        }
-        if (is_object($data)) {
-            return $this->normalizeObject($data, $format, $context);
-        }
-        if (is_array($data)) {
-            foreach ($data as $key => $val) {
-                $data[$key] = $this->normalize($val, $format, $context);
-            }
-
-            return $data;
-        }
-        throw new UnexpectedValueException(sprintf('An unexpected value could not be normalized: %s', var_export($data, true)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function denormalize($data, $type, $format = null, array $context = array())
-    {
-        return $this->denormalizeObject($data, $type, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsNormalization($data, $format = null)
-    {
-        return null !== $this->getNormalizer($data, $format);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return null !== $this->getDenormalizer($data, $type, $format);
-    }
-
-    /**
-     * Returns a matching normalizer.
-     *
-     * @param mixed  $data   Data to get the serializer for
-     * @param string $format format name, present to give the option to normalizers to act differently based on formats
-     *
-     * @return NormalizerInterface|null
-     */
-    private function getNormalizer($data, $format)
-    {
-        if ($isObject = is_object($data)) {
-            $class = get_class($data);
-            if (isset($this->normalizerCache[$class][$format])) {
-                return $this->normalizerCache[$class][$format];
-            }
-        }
-
-        foreach ($this->normalizers as $normalizer) {
-            if ($normalizer instanceof NormalizerInterface && $normalizer->supportsNormalization($data, $format)) {
-                if ($isObject) {
-                    $this->normalizerCache[$class][$format] = $normalizer;
-                }
-
-                return $normalizer;
-            }
-        }
-    }
-
-    /**
-     * Returns a matching denormalizer.
-     *
-     * @param mixed  $data   data to restore
-     * @param string $class  the expected class to instantiate
-     * @param string $format format name, present to give the option to normalizers to act differently based on formats
-     *
-     * @return DenormalizerInterface|null
-     */
-    private function getDenormalizer($data, $class, $format)
-    {
-        if (isset($this->denormalizerCache[$class][$format])) {
-            return $this->denormalizerCache[$class][$format];
-        }
-
-        foreach ($this->normalizers as $normalizer) {
-            if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $class, $format)) {
-                $this->denormalizerCache[$class][$format] = $normalizer;
-
-                return $normalizer;
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function encode($data, $format, array $context = array())
-    {
-        return $this->encoder->encode($data, $format, $context);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function decode($data, $format, array $context = array())
-    {
-        return $this->decoder->decode($data, $format, $context);
-    }
-
-    /**
-     * Normalizes an object into a set of arrays/scalars.
-     *
-     * @param object $object  object to normalize
-     * @param string $format  format name, present to give the option to normalizers to act differently based on formats
-     * @param array  $context The context data for this particular normalization
-     *
-     * @return array|string|bool|int|float|null
-     *
-     * @throws LogicException
-     * @throws UnexpectedValueException
-     */
-    private function normalizeObject($object, $format, array $context = array())
-    {
-        if (!$this->normalizers) {
-            throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
-        }
-
-        if ($normalizer = $this->getNormalizer($object, $format)) {
-            return $normalizer->normalize($object, $format, $context);
-        }
-        throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', get_class($object)));
-    }
-
-    /**
-     * Denormalizes data back into an object of the given class.
-     *
-     * @param mixed  $data    data to restore
-     * @param string $class   the expected class to instantiate
-     * @param string $format  format name, present to give the option to normalizers to act differently based on formats
-     * @param array  $context The context data for this particular denormalization
-     *
-     * @return object
-     *
-     * @throws LogicException
-     * @throws UnexpectedValueException
-     */
-    private function denormalizeObject($data, $class, $format, array $context = array())
-    {
-        if (!$this->normalizers) {
-            throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
-        }
-
-        if ($normalizer = $this->getDenormalizer($data, $class, $format)) {
-            return $normalizer->denormalize($data, $class, $format, $context);
-        }
-        throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $class));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsEncoding($format)
-    {
-        return $this->encoder->supportsEncoding($format);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsDecoding($format)
-    {
-        return $this->decoder->supportsDecoding($format);
-    }
-}
diff --git a/vendor/symfony/serializer/SerializerAwareInterface.php b/vendor/symfony/serializer/SerializerAwareInterface.php
deleted file mode 100644
index dd0a62e..0000000
--- a/vendor/symfony/serializer/SerializerAwareInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Component\Serializer;
-
-/**
- * Defines the interface of encoders.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface SerializerAwareInterface
-{
-    /**
-     * Sets the owning Serializer object.
-     *
-     * @param SerializerInterface $serializer
-     */
-    public function setSerializer(SerializerInterface $serializer);
-}
diff --git a/vendor/symfony/serializer/SerializerInterface.php b/vendor/symfony/serializer/SerializerInterface.php
deleted file mode 100644
index c79db91..0000000
--- a/vendor/symfony/serializer/SerializerInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\Serializer;
-
-/**
- * Defines the interface of the Serializer.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface SerializerInterface
-{
-    /**
-     * Serializes data in the appropriate format.
-     *
-     * @param mixed  $data    any data
-     * @param string $format  format name
-     * @param array  $context options normalizers/encoders have access to
-     *
-     * @return string
-     */
-    public function serialize($data, $format, array $context = array());
-
-    /**
-     * Deserializes data into the given type.
-     *
-     * @param mixed  $data
-     * @param string $type
-     * @param string $format
-     * @param array  $context
-     *
-     * @return object
-     */
-    public function deserialize($data, $type, $format, array $context = array());
-}
diff --git a/vendor/symfony/serializer/composer.json b/vendor/symfony/serializer/composer.json
deleted file mode 100644
index 0db008b..0000000
--- a/vendor/symfony/serializer/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "symfony/serializer",
-    "type": "library",
-    "description": "Symfony Serializer Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/yaml": "~2.0,>=2.0.5",
-        "symfony/config": "~2.2",
-        "symfony/property-access": "~2.3",
-        "doctrine/annotations": "~1.0",
-        "doctrine/cache": "~1.0"
-    },
-    "suggest": {
-        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-        "symfony/yaml": "For using the default YAML mapping loader.",
-        "symfony/config": "For using the XML mapping loader.",
-        "symfony/property-access": "For using the ObjectNormalizer."
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Serializer\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/serializer/phpunit.xml.dist b/vendor/symfony/serializer/phpunit.xml.dist
deleted file mode 100644
index 279e1eb..0000000
--- a/vendor/symfony/serializer/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Serializer Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/translation/.gitignore b/vendor/symfony/translation/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/translation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/translation/CHANGELOG.md b/vendor/symfony/translation/CHANGELOG.md
deleted file mode 100644
index 157752c..0000000
--- a/vendor/symfony/translation/CHANGELOG.md
+++ /dev/null
@@ -1,47 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
- * added DataCollectorTranslator for collecting the translated messages.
-
-2.6.0
------
-
- * added possibility to cache catalogues
- * added TranslatorBagInterface
- * added LoggingTranslator
- * added Translator::getMessages() for retrieving the message catalogue as an array
-
-2.5.0
------
-
- * added relative file path template to the file dumpers
- * added optional backup to the file dumpers
- * changed IcuResFileDumper to extend FileDumper
-
-2.3.0
------
-
- * added classes to make operations on catalogues (like making a diff or a merge on 2 catalogues)
- * added Translator::getFallbackLocales()
- * deprecated Translator::setFallbackLocale() in favor of the new Translator::setFallbackLocales() method
-
-2.2.0
------
-
- * QtTranslationsLoader class renamed to QtFileLoader. QtTranslationsLoader is deprecated and will be removed in 2.3.
- * [BC BREAK] uniformized the exception thrown by the load() method when an error occurs. The load() method now
-   throws Symfony\Component\Translation\Exception\NotFoundResourceException when a resource cannot be found
-   and Symfony\Component\Translation\Exception\InvalidResourceException when a resource is invalid.
- * changed the exception class thrown by some load() methods from \RuntimeException to \InvalidArgumentException
-   (IcuDatFileLoader, IcuResFileLoader and QtFileLoader)
-
-2.1.0
------
-
- * added support for more than one fallback locale
- * added support for extracting translation messages from templates (Twig and PHP)
- * added dumpers for translation catalogs
- * added support for QT, gettext, and ResourceBundles
diff --git a/vendor/symfony/translation/Catalogue/AbstractOperation.php b/vendor/symfony/translation/Catalogue/AbstractOperation.php
deleted file mode 100644
index 062056b..0000000
--- a/vendor/symfony/translation/Catalogue/AbstractOperation.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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\Component\Translation\Catalogue;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\MessageCatalogueInterface;
-
-/**
- * Base catalogues binary operation class.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractOperation implements OperationInterface
-{
-    /**
-     * @var MessageCatalogueInterface
-     */
-    protected $source;
-
-    /**
-     * @var MessageCatalogueInterface
-     */
-    protected $target;
-
-    /**
-     * @var MessageCatalogue
-     */
-    protected $result;
-
-    /**
-     * @var null|array
-     */
-    private $domains;
-
-    /**
-     * @var array
-     */
-    protected $messages;
-
-    /**
-     * @param MessageCatalogueInterface $source
-     * @param MessageCatalogueInterface $target
-     *
-     * @throws \LogicException
-     */
-    public function __construct(MessageCatalogueInterface $source, MessageCatalogueInterface $target)
-    {
-        if ($source->getLocale() !== $target->getLocale()) {
-            throw new \LogicException('Operated catalogues must belong to the same locale.');
-        }
-
-        $this->source = $source;
-        $this->target = $target;
-        $this->result = new MessageCatalogue($source->getLocale());
-        $this->domains = null;
-        $this->messages = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDomains()
-    {
-        if (null === $this->domains) {
-            $this->domains = array_values(array_unique(array_merge($this->source->getDomains(), $this->target->getDomains())));
-        }
-
-        return $this->domains;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMessages($domain)
-    {
-        if (!in_array($domain, $this->getDomains())) {
-            throw new \InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
-        }
-
-        if (!isset($this->messages[$domain]['all'])) {
-            $this->processDomain($domain);
-        }
-
-        return $this->messages[$domain]['all'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNewMessages($domain)
-    {
-        if (!in_array($domain, $this->getDomains())) {
-            throw new \InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
-        }
-
-        if (!isset($this->messages[$domain]['new'])) {
-            $this->processDomain($domain);
-        }
-
-        return $this->messages[$domain]['new'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getObsoleteMessages($domain)
-    {
-        if (!in_array($domain, $this->getDomains())) {
-            throw new \InvalidArgumentException(sprintf('Invalid domain: %s.', $domain));
-        }
-
-        if (!isset($this->messages[$domain]['obsolete'])) {
-            $this->processDomain($domain);
-        }
-
-        return $this->messages[$domain]['obsolete'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResult()
-    {
-        foreach ($this->getDomains() as $domain) {
-            if (!isset($this->messages[$domain])) {
-                $this->processDomain($domain);
-            }
-        }
-
-        return $this->result;
-    }
-
-    /**
-     * @param string $domain
-     */
-    abstract protected function processDomain($domain);
-}
diff --git a/vendor/symfony/translation/Catalogue/DiffOperation.php b/vendor/symfony/translation/Catalogue/DiffOperation.php
deleted file mode 100644
index 2d1994e..0000000
--- a/vendor/symfony/translation/Catalogue/DiffOperation.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\Translation\Catalogue;
-
-/**
- * Diff operation between two catalogues.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class DiffOperation extends AbstractOperation
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function processDomain($domain)
-    {
-        $this->messages[$domain] = array(
-            'all' => array(),
-            'new' => array(),
-            'obsolete' => array(),
-        );
-
-        foreach ($this->source->all($domain) as $id => $message) {
-            if ($this->target->has($id, $domain)) {
-                $this->messages[$domain]['all'][$id] = $message;
-                $this->result->add(array($id => $message), $domain);
-                if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
-                }
-            } else {
-                $this->messages[$domain]['obsolete'][$id] = $message;
-            }
-        }
-
-        foreach ($this->target->all($domain) as $id => $message) {
-            if (!$this->source->has($id, $domain)) {
-                $this->messages[$domain]['all'][$id] = $message;
-                $this->messages[$domain]['new'][$id] = $message;
-                $this->result->add(array($id => $message), $domain);
-                if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Catalogue/MergeOperation.php b/vendor/symfony/translation/Catalogue/MergeOperation.php
deleted file mode 100644
index 562ca0e..0000000
--- a/vendor/symfony/translation/Catalogue/MergeOperation.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Component\Translation\Catalogue;
-
-/**
- * Merge operation between two catalogues.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class MergeOperation extends AbstractOperation
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function processDomain($domain)
-    {
-        $this->messages[$domain] = array(
-            'all' => array(),
-            'new' => array(),
-            'obsolete' => array(),
-        );
-
-        foreach ($this->source->all($domain) as $id => $message) {
-            $this->messages[$domain]['all'][$id] = $message;
-            $this->result->add(array($id => $message), $domain);
-            if (null !== $keyMetadata = $this->source->getMetadata($id, $domain)) {
-                $this->result->setMetadata($id, $keyMetadata, $domain);
-            }
-        }
-
-        foreach ($this->target->all($domain) as $id => $message) {
-            if (!$this->source->has($id, $domain)) {
-                $this->messages[$domain]['all'][$id] = $message;
-                $this->messages[$domain]['new'][$id] = $message;
-                $this->result->add(array($id => $message), $domain);
-                if (null !== $keyMetadata = $this->target->getMetadata($id, $domain)) {
-                    $this->result->setMetadata($id, $keyMetadata, $domain);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Catalogue/OperationInterface.php b/vendor/symfony/translation/Catalogue/OperationInterface.php
deleted file mode 100644
index d72378a..0000000
--- a/vendor/symfony/translation/Catalogue/OperationInterface.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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\Component\Translation\Catalogue;
-
-use Symfony\Component\Translation\MessageCatalogueInterface;
-
-/**
- * Represents an operation on catalogue(s).
- *
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-interface OperationInterface
-{
-    /**
-     * Returns domains affected by operation.
-     *
-     * @return array
-     */
-    public function getDomains();
-
-    /**
-     * Returns all valid messages after operation.
-     *
-     * @param string $domain
-     *
-     * @return array
-     */
-    public function getMessages($domain);
-
-    /**
-     * Returns new messages after operation.
-     *
-     * @param string $domain
-     *
-     * @return array
-     */
-    public function getNewMessages($domain);
-
-    /**
-     * Returns obsolete messages after operation.
-     *
-     * @param string $domain
-     *
-     * @return array
-     */
-    public function getObsoleteMessages($domain);
-
-    /**
-     * Returns resulting catalogue.
-     *
-     * @return MessageCatalogueInterface
-     */
-    public function getResult();
-}
diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
deleted file mode 100644
index c3c140f..0000000
--- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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\Component\Translation\DataCollector;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
-use Symfony\Component\Translation\DataCollectorTranslator;
-
-/**
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-class TranslationDataCollector extends DataCollector implements LateDataCollectorInterface
-{
-    /**
-     * @var DataCollectorTranslator
-     */
-    private $translator;
-
-    /**
-     * @param DataCollectorTranslator $translator
-     */
-    public function __construct(DataCollectorTranslator $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function lateCollect()
-    {
-        $messages = $this->sanitizeCollectedMessages($this->translator->getCollectedMessages());
-
-        $this->data = $this->computeCount($messages);
-        $this->data['messages'] = $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
-    {
-    }
-
-    /**
-     * @return array
-     */
-    public function getMessages()
-    {
-        return isset($this->data['messages']) ? $this->data['messages'] : array();
-    }
-
-    /**
-     * @return int
-     */
-    public function getCountMissings()
-    {
-        return isset($this->data[DataCollectorTranslator::MESSAGE_MISSING]) ? $this->data[DataCollectorTranslator::MESSAGE_MISSING] : 0;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCountFallbacks()
-    {
-        return isset($this->data[DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK]) ? $this->data[DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK] : 0;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCountDefines()
-    {
-        return isset($this->data[DataCollectorTranslator::MESSAGE_DEFINED]) ? $this->data[DataCollectorTranslator::MESSAGE_DEFINED] : 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'translation';
-    }
-
-    private function sanitizeCollectedMessages($messages)
-    {
-        $result = array();
-        foreach ($messages as $key => $message) {
-            $messageId = $message['locale'].$message['domain'].$message['id'];
-
-            if (!isset($result[$messageId])) {
-                $message['count'] = 1;
-                $messages[$key]['translation'] = $this->sanitizeString($message['translation']);
-                $result[$messageId] = $message;
-            } else {
-                ++$result[$messageId]['count'];
-            }
-
-            unset($messages[$key]);
-        }
-
-        return $result;
-    }
-
-    private function computeCount($messages)
-    {
-        $count = array(
-            DataCollectorTranslator::MESSAGE_DEFINED => 0,
-            DataCollectorTranslator::MESSAGE_MISSING => 0,
-            DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK => 0,
-        );
-
-        foreach ($messages as $message) {
-            ++$count[$message['state']];
-        }
-
-        return $count;
-    }
-
-    private function sanitizeString($string, $length = 80)
-    {
-        $string = trim(preg_replace('/\s+/', ' ', $string));
-
-        if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) {
-            if (mb_strlen($string, $encoding) > $length) {
-                return mb_substr($string, 0, $length - 3, $encoding).'...';
-            }
-        } elseif (strlen($string) > $length) {
-            return substr($string, 0, $length - 3).'...';
-        }
-
-        return $string;
-    }
-}
diff --git a/vendor/symfony/translation/DataCollectorTranslator.php b/vendor/symfony/translation/DataCollectorTranslator.php
deleted file mode 100644
index 4c69ff6..0000000
--- a/vendor/symfony/translation/DataCollectorTranslator.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInterface
-{
-    const MESSAGE_DEFINED = 0;
-    const MESSAGE_MISSING = 1;
-    const MESSAGE_EQUALS_FALLBACK = 2;
-
-    /**
-     * @var TranslatorInterface|TranslatorBagInterface
-     */
-    private $translator;
-
-    /**
-     * @var array
-     */
-    private $messages = array();
-
-    /**
-     * @param TranslatorInterface $translator The translator must implement TranslatorBagInterface
-     */
-    public function __construct(TranslatorInterface $translator)
-    {
-        if (!$translator instanceof TranslatorBagInterface) {
-            throw new \InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
-        }
-
-        $this->translator = $translator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
-    {
-        $trans = $this->translator->trans($id, $parameters, $domain, $locale);
-        $this->collectMessage($locale, $domain, $id, $trans);
-
-        return $trans;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
-    {
-        $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
-        $this->collectMessage($locale, $domain, $id, $trans);
-
-        return $trans;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLocale($locale)
-    {
-        $this->translator->setLocale($locale);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        return $this->translator->getLocale();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCatalogue($locale = null)
-    {
-        return $this->translator->getCatalogue($locale);
-    }
-
-    /**
-     * Passes through all unknown calls onto the translator object.
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->translator, $method), $args);
-    }
-
-    /**
-     * @return array
-     */
-    public function getCollectedMessages()
-    {
-        return $this->messages;
-    }
-
-    /**
-     * @param string|null $locale
-     * @param string|null $domain
-     * @param string      $id
-     * @param string      $trans
-     */
-    private function collectMessage($locale, $domain, $id, $translation)
-    {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
-        $id = (string) $id;
-        $catalogue = $this->translator->getCatalogue($locale);
-        $locale = $catalogue->getLocale();
-        if ($catalogue->defines($id, $domain)) {
-            $state = self::MESSAGE_DEFINED;
-        } elseif ($catalogue->has($id, $domain)) {
-            $state = self::MESSAGE_EQUALS_FALLBACK;
-
-            $fallbackCatalogue = $catalogue->getFallBackCatalogue();
-            while ($fallbackCatalogue) {
-                if ($fallbackCatalogue->defines($id, $domain)) {
-                    $locale = $fallbackCatalogue->getLocale();
-                    break;
-                }
-
-                $fallbackCatalogue = $fallbackCatalogue->getFallBackCatalogue();
-            }
-        } else {
-            $state = self::MESSAGE_MISSING;
-        }
-
-        $this->messages[] = array(
-            'locale' => $locale,
-            'domain' => $domain,
-            'id' => $id,
-            'translation' => $translation,
-            'state' => $state,
-        );
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/vendor/symfony/translation/Dumper/CsvFileDumper.php
deleted file mode 100644
index 08005b0..0000000
--- a/vendor/symfony/translation/Dumper/CsvFileDumper.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * CsvFileDumper generates a csv formatted string representation of a message catalogue.
- *
- * @author Stealth35
- */
-class CsvFileDumper extends FileDumper
-{
-    private $delimiter = ';';
-    private $enclosure = '"';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        $handle = fopen('php://memory', 'rb+');
-
-        foreach ($messages->all($domain) as $source => $target) {
-            fputcsv($handle, array($source, $target), $this->delimiter, $this->enclosure);
-        }
-
-        rewind($handle);
-        $output = stream_get_contents($handle);
-        fclose($handle);
-
-        return $output;
-    }
-
-    /**
-     * Sets the delimiter and escape character for CSV.
-     *
-     * @param string $delimiter delimiter character
-     * @param string $enclosure enclosure character
-     */
-    public function setCsvControl($delimiter = ';', $enclosure = '"')
-    {
-        $this->delimiter = $delimiter;
-        $this->enclosure = $enclosure;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'csv';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/DumperInterface.php b/vendor/symfony/translation/Dumper/DumperInterface.php
deleted file mode 100644
index cebc65e..0000000
--- a/vendor/symfony/translation/Dumper/DumperInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * DumperInterface is the interface implemented by all translation dumpers.
- * There is no common option.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-interface DumperInterface
-{
-    /**
-     * Dumps the message catalogue.
-     *
-     * @param MessageCatalogue $messages The message catalogue
-     * @param array            $options  Options that are used by the dumper
-     */
-    public function dump(MessageCatalogue $messages, $options = array());
-}
diff --git a/vendor/symfony/translation/Dumper/FileDumper.php b/vendor/symfony/translation/Dumper/FileDumper.php
deleted file mode 100644
index f2f17d6..0000000
--- a/vendor/symfony/translation/Dumper/FileDumper.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * FileDumper is an implementation of DumperInterface that dump a message catalogue to file(s).
- * Performs backup of already existing files.
- *
- * Options:
- * - path (mandatory): the directory where the files should be saved
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-abstract class FileDumper implements DumperInterface
-{
-    /**
-     * A template for the relative paths to files.
-     *
-     * @var string
-     */
-    protected $relativePathTemplate = '%domain%.%locale%.%extension%';
-
-    /**
-     * Make file backup before the dump.
-     *
-     * @var bool
-     */
-    private $backup = true;
-
-    /**
-     * Sets the template for the relative paths to files.
-     *
-     * @param string $relativePathTemplate A template for the relative paths to files
-     */
-    public function setRelativePathTemplate($relativePathTemplate)
-    {
-        $this->relativePathTemplate = $relativePathTemplate;
-    }
-
-    /**
-     * Sets backup flag.
-     *
-     * @param bool
-     */
-    public function setBackup($backup)
-    {
-        $this->backup = $backup;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dump(MessageCatalogue $messages, $options = array())
-    {
-        if (!array_key_exists('path', $options)) {
-            throw new \InvalidArgumentException('The file dumper needs a path option.');
-        }
-
-        // save a file for each domain
-        foreach ($messages->getDomains() as $domain) {
-            // backup
-            $fullpath = $options['path'].'/'.$this->getRelativePath($domain, $messages->getLocale());
-            if (file_exists($fullpath)) {
-                if ($this->backup) {
-                    copy($fullpath, $fullpath.'~');
-                }
-            } else {
-                $directory = dirname($fullpath);
-                if (!file_exists($directory) && !@mkdir($directory, 0777, true)) {
-                    throw new \RuntimeException(sprintf('Unable to create directory "%s".', $directory));
-                }
-            }
-            // save file
-            file_put_contents($fullpath, $this->format($messages, $domain));
-        }
-    }
-
-    /**
-     * Transforms a domain of a message catalogue to its string representation.
-     *
-     * @param MessageCatalogue $messages
-     * @param string           $domain
-     *
-     * @return string representation
-     */
-    abstract protected function format(MessageCatalogue $messages, $domain);
-
-    /**
-     * Gets the file extension of the dumper.
-     *
-     * @return string file extension
-     */
-    abstract protected function getExtension();
-
-    /**
-     * Gets the relative file path using the template.
-     *
-     * @param string $domain The domain
-     * @param string $locale The locale
-     *
-     * @return string The relative file path
-     */
-    private function getRelativePath($domain, $locale)
-    {
-        return strtr($this->relativePathTemplate, array(
-            '%domain%' => $domain,
-            '%locale%' => $locale,
-            '%extension%' => $this->getExtension(),
-        ));
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/IcuResFileDumper.php b/vendor/symfony/translation/Dumper/IcuResFileDumper.php
deleted file mode 100644
index 0a2ed9f..0000000
--- a/vendor/symfony/translation/Dumper/IcuResFileDumper.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * IcuResDumper generates an ICU ResourceBundle formatted string representation of a message catalogue.
- *
- * @author Stealth35
- */
-class IcuResFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected $relativePathTemplate = '%domain%/%locale%.%extension%';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        $data = $indexes = $resources = '';
-
-        foreach ($messages->all($domain) as $source => $target) {
-            $indexes .= pack('v', strlen($data) + 28);
-            $data    .= $source."\0";
-        }
-
-        $data .= $this->writePadding($data);
-
-        $keyTop = $this->getPosition($data);
-
-        foreach ($messages->all($domain) as $source => $target) {
-            $resources .= pack('V', $this->getPosition($data));
-
-            $data .= pack('V', strlen($target))
-                .mb_convert_encoding($target."\0", 'UTF-16LE', 'UTF-8')
-                .$this->writePadding($data)
-                  ;
-        }
-
-        $resOffset = $this->getPosition($data);
-
-        $data .= pack('v', count($messages))
-            .$indexes
-            .$this->writePadding($data)
-            .$resources
-              ;
-
-        $bundleTop = $this->getPosition($data);
-
-        $root = pack('V7',
-            $resOffset + (2 << 28), // Resource Offset + Resource Type
-            6,                      // Index length
-            $keyTop,                // Index keys top
-            $bundleTop,             // Index resources top
-            $bundleTop,             // Index bundle top
-            count($messages),       // Index max table length
-            0                       // Index attributes
-        );
-
-        $header = pack('vC2v4C12@32',
-            32,                     // Header size
-            0xDA, 0x27,             // Magic number 1 and 2
-            20, 0, 0, 2,            // Rest of the header, ..., Size of a char
-            0x52, 0x65, 0x73, 0x42, // Data format identifier
-            1, 2, 0, 0,             // Data version
-            1, 4, 0, 0              // Unicode version
-        );
-
-        $output = $header
-               .$root
-               .$data;
-
-        return $output;
-    }
-
-    private function writePadding($data)
-    {
-        $padding = strlen($data) % 4;
-
-        if ($padding) {
-            return str_repeat("\xAA", 4 - $padding);
-        }
-    }
-
-    private function getPosition($data)
-    {
-        $position = (strlen($data) + 28) / 4;
-
-        return $position;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'res';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/IniFileDumper.php b/vendor/symfony/translation/Dumper/IniFileDumper.php
deleted file mode 100644
index 45df389..0000000
--- a/vendor/symfony/translation/Dumper/IniFileDumper.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * IniFileDumper generates an ini formatted string representation of a message catalogue.
- *
- * @author Stealth35
- */
-class IniFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        $output = '';
-
-        foreach ($messages->all($domain) as $source => $target) {
-            $escapeTarget = str_replace('"', '\"', $target);
-            $output .= $source.'="'.$escapeTarget."\"\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'ini';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/JsonFileDumper.php b/vendor/symfony/translation/Dumper/JsonFileDumper.php
deleted file mode 100644
index 7ad3518..0000000
--- a/vendor/symfony/translation/Dumper/JsonFileDumper.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * JsonFileDumper generates an json formatted string representation of a message catalogue.
- *
- * @author singles
- */
-class JsonFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        return json_encode($messages->all($domain), defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'json';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/MoFileDumper.php b/vendor/symfony/translation/Dumper/MoFileDumper.php
deleted file mode 100644
index f8dc6ac..0000000
--- a/vendor/symfony/translation/Dumper/MoFileDumper.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Loader\MoFileLoader;
-
-/**
- * MoFileDumper generates a gettext formatted string representation of a message catalogue.
- *
- * @author Stealth35
- */
-class MoFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        $output = $sources = $targets = $sourceOffsets = $targetOffsets = '';
-        $offsets = array();
-        $size = 0;
-
-        foreach ($messages->all($domain) as $source => $target) {
-            $offsets[] = array_map('strlen', array($sources, $source, $targets, $target));
-            $sources .= "\0".$source;
-            $targets .= "\0".$target;
-            ++$size;
-        }
-
-        $header = array(
-            'magicNumber' => MoFileLoader::MO_LITTLE_ENDIAN_MAGIC,
-            'formatRevision' => 0,
-            'count' => $size,
-            'offsetId' => MoFileLoader::MO_HEADER_SIZE,
-            'offsetTranslated' => MoFileLoader::MO_HEADER_SIZE + (8 * $size),
-            'sizeHashes' => 0,
-            'offsetHashes' => MoFileLoader::MO_HEADER_SIZE + (16 * $size),
-        );
-
-        $sourcesSize = strlen($sources);
-        $sourcesStart = $header['offsetHashes'] + 1;
-
-        foreach ($offsets as $offset) {
-            $sourceOffsets .= $this->writeLong($offset[1])
-                          .$this->writeLong($offset[0] + $sourcesStart);
-            $targetOffsets .= $this->writeLong($offset[3])
-                          .$this->writeLong($offset[2] + $sourcesStart + $sourcesSize);
-        }
-
-        $output = implode(array_map(array($this, 'writeLong'), $header))
-               .$sourceOffsets
-               .$targetOffsets
-               .$sources
-               .$targets
-                ;
-
-        return $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'mo';
-    }
-
-    private function writeLong($str)
-    {
-        return pack('V*', $str);
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/PhpFileDumper.php b/vendor/symfony/translation/Dumper/PhpFileDumper.php
deleted file mode 100644
index b354c12..0000000
--- a/vendor/symfony/translation/Dumper/PhpFileDumper.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * PhpFileDumper generates PHP files from a message catalogue.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-class PhpFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function format(MessageCatalogue $messages, $domain)
-    {
-        $output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
-
-        return $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'php';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/PoFileDumper.php b/vendor/symfony/translation/Dumper/PoFileDumper.php
deleted file mode 100644
index 983064b..0000000
--- a/vendor/symfony/translation/Dumper/PoFileDumper.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * PoFileDumper generates a gettext formatted string representation of a message catalogue.
- *
- * @author Stealth35
- */
-class PoFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain = 'messages')
-    {
-        $output = 'msgid ""'."\n";
-        $output .= 'msgstr ""'."\n";
-        $output .= '"Content-Type: text/plain; charset=UTF-8\n"'."\n";
-        $output .= '"Content-Transfer-Encoding: 8bit\n"'."\n";
-        $output .= '"Language: '.$messages->getLocale().'\n"'."\n";
-        $output .= "\n";
-
-        $newLine = false;
-        foreach ($messages->all($domain) as $source => $target) {
-            if ($newLine) {
-                $output .= "\n";
-            } else {
-                $newLine = true;
-            }
-            $output .= sprintf('msgid "%s"'."\n", $this->escape($source));
-            $output .= sprintf('msgstr "%s"', $this->escape($target));
-        }
-
-        return $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'po';
-    }
-
-    private function escape($str)
-    {
-        return addcslashes($str, "\0..\37\42\134");
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/QtFileDumper.php b/vendor/symfony/translation/Dumper/QtFileDumper.php
deleted file mode 100644
index 42aa093..0000000
--- a/vendor/symfony/translation/Dumper/QtFileDumper.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * QtFileDumper generates ts files from a message catalogue.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class QtFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(MessageCatalogue $messages, $domain)
-    {
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->formatOutput = true;
-        $ts = $dom->appendChild($dom->createElement('TS'));
-        $context = $ts->appendChild($dom->createElement('context'));
-        $context->appendChild($dom->createElement('name', $domain));
-
-        foreach ($messages->all($domain) as $source => $target) {
-            $message = $context->appendChild($dom->createElement('message'));
-            $message->appendChild($dom->createElement('source', $source));
-            $message->appendChild($dom->createElement('translation', $target));
-        }
-
-        return $dom->saveXML();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'ts';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php
deleted file mode 100644
index 58d1973..0000000
--- a/vendor/symfony/translation/Dumper/XliffFileDumper.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * XliffFileDumper generates xliff files from a message catalogue.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-class XliffFileDumper extends FileDumper
-{
-    /**
-     * @var string
-     */
-    private $defaultLocale;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dump(MessageCatalogue $messages, $options = array())
-    {
-        if (array_key_exists('default_locale', $options)) {
-            $this->defaultLocale = $options['default_locale'];
-        } else {
-            $this->defaultLocale = \Locale::getDefault();
-        }
-
-        parent::dump($messages, $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function format(MessageCatalogue $messages, $domain)
-    {
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->formatOutput = true;
-
-        $xliff = $dom->appendChild($dom->createElement('xliff'));
-        $xliff->setAttribute('version', '1.2');
-        $xliff->setAttribute('xmlns', 'urn:oasis:names:tc:xliff:document:1.2');
-
-        $xliffFile = $xliff->appendChild($dom->createElement('file'));
-        $xliffFile->setAttribute('source-language', str_replace('_', '-', $this->defaultLocale));
-        $xliffFile->setAttribute('target-language', str_replace('_', '-', $messages->getLocale()));
-        $xliffFile->setAttribute('datatype', 'plaintext');
-        $xliffFile->setAttribute('original', 'file.ext');
-
-        $xliffBody = $xliffFile->appendChild($dom->createElement('body'));
-        foreach ($messages->all($domain) as $source => $target) {
-            $translation = $dom->createElement('trans-unit');
-
-            $translation->setAttribute('id', md5($source));
-            $translation->setAttribute('resname', $source);
-
-            $s = $translation->appendChild($dom->createElement('source'));
-            $s->appendChild($dom->createTextNode($source));
-
-            // Does the target contain characters requiring a CDATA section?
-            $text = 1 === preg_match('/[&<>]/', $target) ? $dom->createCDATASection($target) : $dom->createTextNode($target);
-
-            $t = $translation->appendChild($dom->createElement('target'));
-            $t->appendChild($text);
-
-            $metadata = $messages->getMetadata($source, $domain);
-            if (null !== $metadata && array_key_exists('notes', $metadata) && is_array($metadata['notes'])) {
-                foreach ($metadata['notes'] as $note) {
-                    if (!isset($note['content'])) {
-                        continue;
-                    }
-
-                    $n = $translation->appendChild($dom->createElement('note'));
-                    $n->appendChild($dom->createTextNode($note['content']));
-
-                    if (isset($note['priority'])) {
-                        $n->setAttribute('priority', $note['priority']);
-                    }
-
-                    if (isset($note['from'])) {
-                        $n->setAttribute('from', $note['from']);
-                    }
-                }
-            }
-
-            $xliffBody->appendChild($translation);
-        }
-
-        return $dom->saveXML();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'xlf';
-    }
-}
diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/vendor/symfony/translation/Dumper/YamlFileDumper.php
deleted file mode 100644
index 870fb98..0000000
--- a/vendor/symfony/translation/Dumper/YamlFileDumper.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\Translation\Dumper;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Yaml\Yaml;
-
-/**
- * YamlFileDumper generates yaml files from a message catalogue.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-class YamlFileDumper extends FileDumper
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function format(MessageCatalogue $messages, $domain)
-    {
-        if (!class_exists('Symfony\Component\Yaml\Yaml')) {
-            throw new \LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.');
-        }
-
-        return Yaml::dump($messages->all($domain));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getExtension()
-    {
-        return 'yml';
-    }
-}
diff --git a/vendor/symfony/translation/Exception/ExceptionInterface.php b/vendor/symfony/translation/Exception/ExceptionInterface.php
deleted file mode 100644
index c85fb93..0000000
--- a/vendor/symfony/translation/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Translation\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/translation/Exception/InvalidResourceException.php b/vendor/symfony/translation/Exception/InvalidResourceException.php
deleted file mode 100644
index cf07943..0000000
--- a/vendor/symfony/translation/Exception/InvalidResourceException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Translation\Exception;
-
-/**
- * Thrown when a resource cannot be loaded.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class InvalidResourceException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/translation/Exception/NotFoundResourceException.php b/vendor/symfony/translation/Exception/NotFoundResourceException.php
deleted file mode 100644
index cff73ae..0000000
--- a/vendor/symfony/translation/Exception/NotFoundResourceException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Translation\Exception;
-
-/**
- * Thrown when a resource does not exist.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class NotFoundResourceException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php b/vendor/symfony/translation/Extractor/AbstractFileExtractor.php
deleted file mode 100644
index 196bc33..0000000
--- a/vendor/symfony/translation/Extractor/AbstractFileExtractor.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Component\Translation\Extractor;
-
-/**
- * Base class used by classes that extract translation messages from files.
- *
- * @author Marcos D. Sánchez <marcosdsanchez@gmail.com>
- */
-abstract class AbstractFileExtractor
-{
-    /**
-     * @param string|array $resource files, a file or a directory
-     *
-     * @return array
-     */
-    protected function extractFiles($resource)
-    {
-        if (is_array($resource) || $resource instanceof \Traversable) {
-            $files = array();
-            foreach ($resource as $file) {
-                if ($this->canBeExtracted($file)) {
-                    $files[] = $this->toSplFileInfo($file);
-                }
-            }
-        } elseif (is_file($resource)) {
-            $files = $this->canBeExtracted($resource) ? array($this->toSplFileInfo($resource)) : array();
-        } else {
-            $files = $this->extractFromDirectory($resource);
-        }
-
-        return $files;
-    }
-
-    /**
-     * @param string $file
-     *
-     * @return \SplFileInfo
-     */
-    private function toSplFileInfo($file)
-    {
-        return ($file instanceof \SplFileInfo) ? $file : new \SplFileInfo($file);
-    }
-
-    /**
-     * @param string $file
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return bool
-     */
-    protected function isFile($file)
-    {
-        if (!is_file($file)) {
-            throw new \InvalidArgumentException(sprintf('The "%s" file does not exist.', $file));
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $file
-     *
-     * @return bool
-     */
-    abstract protected function canBeExtracted($file);
-
-    /**
-     * @param string|array $resource files, a file or a directory
-     *
-     * @return array files to be extracted
-     */
-    abstract protected function extractFromDirectory($resource);
-}
diff --git a/vendor/symfony/translation/Extractor/ChainExtractor.php b/vendor/symfony/translation/Extractor/ChainExtractor.php
deleted file mode 100644
index 50e3c84..0000000
--- a/vendor/symfony/translation/Extractor/ChainExtractor.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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\Component\Translation\Extractor;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * ChainExtractor extracts translation messages from template files.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-class ChainExtractor implements ExtractorInterface
-{
-    /**
-     * The extractors.
-     *
-     * @var ExtractorInterface[]
-     */
-    private $extractors = array();
-
-    /**
-     * Adds a loader to the translation extractor.
-     *
-     * @param string             $format    The format of the loader
-     * @param ExtractorInterface $extractor The loader
-     */
-    public function addExtractor($format, ExtractorInterface $extractor)
-    {
-        $this->extractors[$format] = $extractor;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPrefix($prefix)
-    {
-        foreach ($this->extractors as $extractor) {
-            $extractor->setPrefix($prefix);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function extract($directory, MessageCatalogue $catalogue)
-    {
-        foreach ($this->extractors as $extractor) {
-            $extractor->extract($directory, $catalogue);
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Extractor/ExtractorInterface.php b/vendor/symfony/translation/Extractor/ExtractorInterface.php
deleted file mode 100644
index 438f80b..0000000
--- a/vendor/symfony/translation/Extractor/ExtractorInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Translation\Extractor;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * Extracts translation messages from a directory or files to the catalogue.
- * New found messages are injected to the catalogue using the prefix.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-interface ExtractorInterface
-{
-    /**
-     * Extracts translation messages from files, a file or a directory to the catalogue.
-     *
-     * @param string|array     $resource  files, a file or a directory
-     * @param MessageCatalogue $catalogue The catalogue
-     */
-    public function extract($resource, MessageCatalogue $catalogue);
-
-    /**
-     * Sets the prefix that should be used for new found messages.
-     *
-     * @param string $prefix The prefix
-     */
-    public function setPrefix($prefix);
-}
diff --git a/vendor/symfony/translation/IdentityTranslator.php b/vendor/symfony/translation/IdentityTranslator.php
deleted file mode 100644
index 46a0463..0000000
--- a/vendor/symfony/translation/IdentityTranslator.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * IdentityTranslator does not translate anything.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class IdentityTranslator implements TranslatorInterface
-{
-    private $selector;
-    private $locale;
-
-    /**
-     * Constructor.
-     *
-     * @param MessageSelector|null $selector The message selector for pluralization
-     */
-    public function __construct(MessageSelector $selector = null)
-    {
-        $this->selector = $selector ?: new MessageSelector();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLocale($locale)
-    {
-        $this->locale = $locale;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        return $this->locale ?: \Locale::getDefault();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
-    {
-        return strtr((string) $id, $parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
-    {
-        return strtr($this->selector->choose((string) $id, (int) $number, $locale ?: $this->getLocale()), $parameters);
-    }
-}
diff --git a/vendor/symfony/translation/Interval.php b/vendor/symfony/translation/Interval.php
deleted file mode 100644
index 2a51156..0000000
--- a/vendor/symfony/translation/Interval.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * Tests if a given number belongs to a given math interval.
- *
- * An interval can represent a finite set of numbers:
- *
- *  {1,2,3,4}
- *
- * An interval can represent numbers between two numbers:
- *
- *  [1, +Inf]
- *  ]-1,2[
- *
- * The left delimiter can be [ (inclusive) or ] (exclusive).
- * The right delimiter can be [ (exclusive) or ] (inclusive).
- * Beside numbers, you can use -Inf and +Inf for the infinite.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @see    http://en.wikipedia.org/wiki/Interval_%28mathematics%29#The_ISO_notation
- */
-class Interval
-{
-    /**
-     * Tests if the given number is in the math interval.
-     *
-     * @param int    $number   A number
-     * @param string $interval An interval
-     *
-     * @return bool
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function test($number, $interval)
-    {
-        $interval = trim($interval);
-
-        if (!preg_match('/^'.self::getIntervalRegexp().'$/x', $interval, $matches)) {
-            throw new \InvalidArgumentException(sprintf('"%s" is not a valid interval.', $interval));
-        }
-
-        if ($matches[1]) {
-            foreach (explode(',', $matches[2]) as $n) {
-                if ($number == $n) {
-                    return true;
-                }
-            }
-        } else {
-            $leftNumber = self::convertNumber($matches['left']);
-            $rightNumber = self::convertNumber($matches['right']);
-
-            return
-                ('[' === $matches['left_delimiter'] ? $number >= $leftNumber : $number > $leftNumber)
-                && (']' === $matches['right_delimiter'] ? $number <= $rightNumber : $number < $rightNumber)
-            ;
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a Regexp that matches valid intervals.
-     *
-     * @return string A Regexp (without the delimiters)
-     */
-    public static function getIntervalRegexp()
-    {
-        return <<<EOF
-        ({\s*
-            (\-?\d+(\.\d+)?[\s*,\s*\-?\d+(\.\d+)?]*)
-        \s*})
-
-            |
-
-        (?P<left_delimiter>[\[\]])
-            \s*
-            (?P<left>-Inf|\-?\d+(\.\d+)?)
-            \s*,\s*
-            (?P<right>\+?Inf|\-?\d+(\.\d+)?)
-            \s*
-        (?P<right_delimiter>[\[\]])
-EOF;
-    }
-
-    private static function convertNumber($number)
-    {
-        if ('-Inf' === $number) {
-            return log(0);
-        } elseif ('+Inf' === $number || 'Inf' === $number) {
-            return -log(0);
-        }
-
-        return (float) $number;
-    }
-}
diff --git a/vendor/symfony/translation/LICENSE b/vendor/symfony/translation/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/translation/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/translation/Loader/ArrayLoader.php b/vendor/symfony/translation/Loader/ArrayLoader.php
deleted file mode 100644
index 9a595b7..0000000
--- a/vendor/symfony/translation/Loader/ArrayLoader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-/**
- * ArrayLoader loads translations from a PHP array.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ArrayLoader implements LoaderInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        $this->flatten($resource);
-        $catalogue = new MessageCatalogue($locale);
-        $catalogue->add($resource, $domain);
-
-        return $catalogue;
-    }
-
-    /**
-     * Flattens an nested array of translations.
-     *
-     * The scheme used is:
-     *   'key' => array('key2' => array('key3' => 'value'))
-     * Becomes:
-     *   'key.key2.key3' => 'value'
-     *
-     * This function takes an array by reference and will modify it
-     *
-     * @param array  &$messages The array that will be flattened
-     * @param array  $subnode   Current subnode being parsed, used internally for recursive calls
-     * @param string $path      Current path being parsed, used internally for recursive calls
-     */
-    private function flatten(array &$messages, array $subnode = null, $path = null)
-    {
-        if (null === $subnode) {
-            $subnode = &$messages;
-        }
-        foreach ($subnode as $key => $value) {
-            if (is_array($value)) {
-                $nodePath = $path ? $path.'.'.$key : $key;
-                $this->flatten($messages, $value, $nodePath);
-                if (null === $path) {
-                    unset($messages[$key]);
-                }
-            } elseif (null !== $path) {
-                $messages[$path.'.'.$key] = $value;
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Loader/CsvFileLoader.php b/vendor/symfony/translation/Loader/CsvFileLoader.php
deleted file mode 100644
index 2240179..0000000
--- a/vendor/symfony/translation/Loader/CsvFileLoader.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * CsvFileLoader loads translations from CSV files.
- *
- * @author Saša Stamenković <umpirsky@gmail.com>
- */
-class CsvFileLoader extends ArrayLoader
-{
-    private $delimiter = ';';
-    private $enclosure = '"';
-    private $escape = '\\';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = array();
-
-        try {
-            $file = new \SplFileObject($resource, 'rb');
-        } catch (\RuntimeException $e) {
-            throw new NotFoundResourceException(sprintf('Error opening file "%s".', $resource), 0, $e);
-        }
-
-        $file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::SKIP_EMPTY);
-        $file->setCsvControl($this->delimiter, $this->enclosure, $this->escape);
-
-        foreach ($file as $data) {
-            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === count($data)) {
-                $messages[$data[0]] = $data[1];
-            }
-        }
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-
-    /**
-     * Sets the delimiter, enclosure, and escape character for CSV.
-     *
-     * @param string $delimiter delimiter character
-     * @param string $enclosure enclosure character
-     * @param string $escape    escape character
-     */
-    public function setCsvControl($delimiter = ';', $enclosure = '"', $escape = '\\')
-    {
-        $this->delimiter = $delimiter;
-        $this->enclosure = $enclosure;
-        $this->escape = $escape;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/vendor/symfony/translation/Loader/IcuDatFileLoader.php
deleted file mode 100644
index 71ba90a..0000000
--- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * IcuResFileLoader loads translations from a resource bundle.
- *
- * @author stealth35
- */
-class IcuDatFileLoader extends IcuResFileLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource.'.dat')) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource.'.dat')) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        try {
-            $rb = new \ResourceBundle($locale, $resource);
-        } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
-            $rb = null;
-        }
-
-        if (!$rb) {
-            throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource));
-        } elseif (intl_is_failure($rb->getErrorCode())) {
-            throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
-        }
-
-        $messages = $this->flatten($rb);
-        $catalogue = new MessageCatalogue($locale);
-        $catalogue->add($messages, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource.'.dat'));
-        }
-
-        return $catalogue;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/vendor/symfony/translation/Loader/IcuResFileLoader.php
deleted file mode 100644
index 2f8037f..0000000
--- a/vendor/symfony/translation/Loader/IcuResFileLoader.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\DirectoryResource;
-
-/**
- * IcuResFileLoader loads translations from a resource bundle.
- *
- * @author stealth35
- */
-class IcuResFileLoader implements LoaderInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!is_dir($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        try {
-            $rb = new \ResourceBundle($locale, $resource);
-        } catch (\Exception $e) {
-            // HHVM compatibility: constructor throws on invalid resource
-            $rb = null;
-        }
-
-        if (!$rb) {
-            throw new InvalidResourceException(sprintf('Cannot load resource "%s"', $resource));
-        } elseif (intl_is_failure($rb->getErrorCode())) {
-            throw new InvalidResourceException($rb->getErrorMessage(), $rb->getErrorCode());
-        }
-
-        $messages = $this->flatten($rb);
-        $catalogue = new MessageCatalogue($locale);
-        $catalogue->add($messages, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\DirectoryResource')) {
-            $catalogue->addResource(new DirectoryResource($resource));
-        }
-
-        return $catalogue;
-    }
-
-    /**
-     * Flattens an ResourceBundle.
-     *
-     * The scheme used is:
-     *   key { key2 { key3 { "value" } } }
-     * Becomes:
-     *   'key.key2.key3' => 'value'
-     *
-     * This function takes an array by reference and will modify it
-     *
-     * @param \ResourceBundle $rb       the ResourceBundle that will be flattened
-     * @param array           $messages used internally for recursive calls
-     * @param string          $path     current path being parsed, used internally for recursive calls
-     *
-     * @return array the flattened ResourceBundle
-     */
-    protected function flatten(\ResourceBundle $rb, array &$messages = array(), $path = null)
-    {
-        foreach ($rb as $key => $value) {
-            $nodePath = $path ? $path.'.'.$key : $key;
-            if ($value instanceof \ResourceBundle) {
-                $this->flatten($value, $messages, $nodePath);
-            } else {
-                $messages[$nodePath] = $value;
-            }
-        }
-
-        return $messages;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/IniFileLoader.php b/vendor/symfony/translation/Loader/IniFileLoader.php
deleted file mode 100644
index 1b3a7b1..0000000
--- a/vendor/symfony/translation/Loader/IniFileLoader.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * IniFileLoader loads translations from an ini file.
- *
- * @author stealth35
- */
-class IniFileLoader extends ArrayLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = parse_ini_file($resource, true);
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/JsonFileLoader.php b/vendor/symfony/translation/Loader/JsonFileLoader.php
deleted file mode 100644
index 81717f3..0000000
--- a/vendor/symfony/translation/Loader/JsonFileLoader.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * JsonFileLoader loads translations from an json file.
- *
- * @author singles
- */
-class JsonFileLoader extends ArrayLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = array();
-        if ($data = file_get_contents($resource)) {
-            $messages = json_decode($data, true);
-
-            if (0 < $errorCode = json_last_error()) {
-                throw new InvalidResourceException(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
-            }
-        }
-
-        if (null === $messages) {
-            $messages = array();
-        }
-
-        $catalogue = parent::load($messages, $locale, $domain);
-        $catalogue->addResource(new FileResource($resource));
-
-        return $catalogue;
-    }
-
-    /**
-     * Translates JSON_ERROR_* constant into meaningful message.
-     *
-     * @param int $errorCode Error code returned by json_last_error() call
-     *
-     * @return string Message string
-     */
-    private function getJSONErrorMessage($errorCode)
-    {
-        switch ($errorCode) {
-            case JSON_ERROR_DEPTH:
-                return 'Maximum stack depth exceeded';
-            case JSON_ERROR_STATE_MISMATCH:
-                return 'Underflow or the modes mismatch';
-            case JSON_ERROR_CTRL_CHAR:
-                return 'Unexpected control character found';
-            case JSON_ERROR_SYNTAX:
-                return 'Syntax error, malformed JSON';
-            case JSON_ERROR_UTF8:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            default:
-                return 'Unknown error';
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Loader/LoaderInterface.php b/vendor/symfony/translation/Loader/LoaderInterface.php
deleted file mode 100644
index 6b65fe3..0000000
--- a/vendor/symfony/translation/Loader/LoaderInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-
-/**
- * LoaderInterface is the interface implemented by all translation loaders.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface LoaderInterface
-{
-    /**
-     * Loads a locale.
-     *
-     * @param mixed  $resource A resource
-     * @param string $locale   A locale
-     * @param string $domain   The domain
-     *
-     * @return MessageCatalogue A MessageCatalogue instance
-     *
-     * @throws NotFoundResourceException when the resource cannot be found
-     * @throws InvalidResourceException  when the resource cannot be loaded
-     */
-    public function load($resource, $locale, $domain = 'messages');
-}
diff --git a/vendor/symfony/translation/Loader/MoFileLoader.php b/vendor/symfony/translation/Loader/MoFileLoader.php
deleted file mode 100644
index 746fd52..0000000
--- a/vendor/symfony/translation/Loader/MoFileLoader.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/)
- */
-class MoFileLoader extends ArrayLoader
-{
-    /**
-     * Magic used for validating the format of a MO file as well as
-     * detecting if the machine used to create that file was little endian.
-     *
-     * @var float
-     */
-    const MO_LITTLE_ENDIAN_MAGIC = 0x950412de;
-
-    /**
-     * Magic used for validating the format of a MO file as well as
-     * detecting if the machine used to create that file was big endian.
-     *
-     * @var float
-     */
-    const MO_BIG_ENDIAN_MAGIC = 0xde120495;
-
-    /**
-     * The size of the header of a MO file in bytes.
-     *
-     * @var int Number of bytes.
-     */
-    const MO_HEADER_SIZE = 28;
-
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = $this->parse($resource);
-
-        // empty file
-        if (null === $messages) {
-            $messages = array();
-        }
-
-        // not an array
-        if (!is_array($messages)) {
-            throw new InvalidResourceException(sprintf('The file "%s" must contain a valid mo file.', $resource));
-        }
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-
-    /**
-     * Parses machine object (MO) format, independent of the machine's endian it
-     * was created on. Both 32bit and 64bit systems are supported.
-     *
-     * @param resource $resource
-     *
-     * @return array
-     *
-     * @throws InvalidResourceException If stream content has an invalid format.
-     */
-    private function parse($resource)
-    {
-        $stream = fopen($resource, 'r');
-
-        $stat = fstat($stream);
-
-        if ($stat['size'] < self::MO_HEADER_SIZE) {
-            throw new InvalidResourceException('MO stream content has an invalid format.');
-        }
-        $magic = unpack('V1', fread($stream, 4));
-        $magic = hexdec(substr(dechex(current($magic)), -8));
-
-        if ($magic == self::MO_LITTLE_ENDIAN_MAGIC) {
-            $isBigEndian = false;
-        } elseif ($magic == self::MO_BIG_ENDIAN_MAGIC) {
-            $isBigEndian = true;
-        } else {
-            throw new InvalidResourceException('MO stream content has an invalid format.');
-        }
-
-        // formatRevision
-        $this->readLong($stream, $isBigEndian);
-        $count = $this->readLong($stream, $isBigEndian);
-        $offsetId = $this->readLong($stream, $isBigEndian);
-        $offsetTranslated = $this->readLong($stream, $isBigEndian);
-        // sizeHashes
-        $this->readLong($stream, $isBigEndian);
-        // offsetHashes
-        $this->readLong($stream, $isBigEndian);
-
-        $messages = array();
-
-        for ($i = 0; $i < $count; ++$i) {
-            $singularId = $pluralId = null;
-            $translated = null;
-
-            fseek($stream, $offsetId + $i * 8);
-
-            $length = $this->readLong($stream, $isBigEndian);
-            $offset = $this->readLong($stream, $isBigEndian);
-
-            if ($length < 1) {
-                continue;
-            }
-
-            fseek($stream, $offset);
-            $singularId = fread($stream, $length);
-
-            if (strpos($singularId, "\000") !== false) {
-                list($singularId, $pluralId) = explode("\000", $singularId);
-            }
-
-            fseek($stream, $offsetTranslated + $i * 8);
-            $length = $this->readLong($stream, $isBigEndian);
-            $offset = $this->readLong($stream, $isBigEndian);
-
-            if ($length < 1) {
-                continue;
-            }
-
-            fseek($stream, $offset);
-            $translated = fread($stream, $length);
-
-            if (strpos($translated, "\000") !== false) {
-                $translated = explode("\000", $translated);
-            }
-
-            $ids = array('singular' => $singularId, 'plural' => $pluralId);
-            $item = compact('ids', 'translated');
-
-            if (is_array($item['translated'])) {
-                $messages[$item['ids']['singular']] = stripcslashes($item['translated'][0]);
-                if (isset($item['ids']['plural'])) {
-                    $plurals = array();
-                    foreach ($item['translated'] as $plural => $translated) {
-                        $plurals[] = sprintf('{%d} %s', $plural, $translated);
-                    }
-                    $messages[$item['ids']['plural']] = stripcslashes(implode('|', $plurals));
-                }
-            } elseif (!empty($item['ids']['singular'])) {
-                $messages[$item['ids']['singular']] = stripcslashes($item['translated']);
-            }
-        }
-
-        fclose($stream);
-
-        return array_filter($messages);
-    }
-
-    /**
-     * Reads an unsigned long from stream respecting endianess.
-     *
-     * @param resource $stream
-     * @param bool     $isBigEndian
-     *
-     * @return int
-     */
-    private function readLong($stream, $isBigEndian)
-    {
-        $result = unpack($isBigEndian ? 'N1' : 'V1', fread($stream, 4));
-        $result = current($result);
-
-        return (int) substr($result, -8);
-    }
-}
diff --git a/vendor/symfony/translation/Loader/PhpFileLoader.php b/vendor/symfony/translation/Loader/PhpFileLoader.php
deleted file mode 100644
index a52e0bb..0000000
--- a/vendor/symfony/translation/Loader/PhpFileLoader.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * PhpFileLoader loads translations from PHP files returning an array of translations.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class PhpFileLoader extends ArrayLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = require $resource;
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/PoFileLoader.php b/vendor/symfony/translation/Loader/PoFileLoader.php
deleted file mode 100644
index b5d12e9..0000000
--- a/vendor/symfony/translation/Loader/PoFileLoader.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * @copyright Copyright (c) 2010, Union of RAD http://union-of-rad.org (http://lithify.me/)
- * @copyright Copyright (c) 2012, Clemens Tolboom
- */
-class PoFileLoader extends ArrayLoader
-{
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        $messages = $this->parse($resource);
-
-        // empty file
-        if (null === $messages) {
-            $messages = array();
-        }
-
-        // not an array
-        if (!is_array($messages)) {
-            throw new InvalidResourceException(sprintf('The file "%s" must contain a valid po file.', $resource));
-        }
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-
-    /**
-     * Parses portable object (PO) format.
-     *
-     * From http://www.gnu.org/software/gettext/manual/gettext.html#PO-Files
-     * we should be able to parse files having:
-     *
-     * white-space
-     * #  translator-comments
-     * #. extracted-comments
-     * #: reference...
-     * #, flag...
-     * #| msgid previous-untranslated-string
-     * msgid untranslated-string
-     * msgstr translated-string
-     *
-     * extra or different lines are:
-     *
-     * #| msgctxt previous-context
-     * #| msgid previous-untranslated-string
-     * msgctxt context
-     *
-     * #| msgid previous-untranslated-string-singular
-     * #| msgid_plural previous-untranslated-string-plural
-     * msgid untranslated-string-singular
-     * msgid_plural untranslated-string-plural
-     * msgstr[0] translated-string-case-0
-     * ...
-     * msgstr[N] translated-string-case-n
-     *
-     * The definition states:
-     * - white-space and comments are optional.
-     * - msgid "" that an empty singleline defines a header.
-     *
-     * This parser sacrifices some features of the reference implementation the
-     * differences to that implementation are as follows.
-     * - No support for comments spanning multiple lines.
-     * - Translator and extracted comments are treated as being the same type.
-     * - Message IDs are allowed to have other encodings as just US-ASCII.
-     *
-     * Items with an empty id are ignored.
-     *
-     * @param resource $resource
-     *
-     * @return array
-     */
-    private function parse($resource)
-    {
-        $stream = fopen($resource, 'r');
-
-        $defaults = array(
-            'ids' => array(),
-            'translated' => null,
-        );
-
-        $messages = array();
-        $item = $defaults;
-
-        while ($line = fgets($stream)) {
-            $line = trim($line);
-
-            if ($line === '') {
-                // Whitespace indicated current item is done
-                $this->addMessage($messages, $item);
-                $item = $defaults;
-            } elseif (substr($line, 0, 7) === 'msgid "') {
-                // We start a new msg so save previous
-                // TODO: this fails when comments or contexts are added
-                $this->addMessage($messages, $item);
-                $item = $defaults;
-                $item['ids']['singular'] = substr($line, 7, -1);
-            } elseif (substr($line, 0, 8) === 'msgstr "') {
-                $item['translated'] = substr($line, 8, -1);
-            } elseif ($line[0] === '"') {
-                $continues = isset($item['translated']) ? 'translated' : 'ids';
-
-                if (is_array($item[$continues])) {
-                    end($item[$continues]);
-                    $item[$continues][key($item[$continues])] .= substr($line, 1, -1);
-                } else {
-                    $item[$continues] .= substr($line, 1, -1);
-                }
-            } elseif (substr($line, 0, 14) === 'msgid_plural "') {
-                $item['ids']['plural'] = substr($line, 14, -1);
-            } elseif (substr($line, 0, 7) === 'msgstr[') {
-                $size = strpos($line, ']');
-                $item['translated'][(int) substr($line, 7, 1)] = substr($line, $size + 3, -1);
-            }
-        }
-        // save last item
-        $this->addMessage($messages, $item);
-        fclose($stream);
-
-        return $messages;
-    }
-
-    /**
-     * Save a translation item to the messages.
-     *
-     * A .po file could contain by error missing plural indexes. We need to
-     * fix these before saving them.
-     *
-     * @param array $messages
-     * @param array $item
-     */
-    private function addMessage(array &$messages, array $item)
-    {
-        if (is_array($item['translated'])) {
-            $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated'][0]);
-            if (isset($item['ids']['plural'])) {
-                $plurals = $item['translated'];
-                // PO are by definition indexed so sort by index.
-                ksort($plurals);
-                // Make sure every index is filled.
-                end($plurals);
-                $count = key($plurals);
-                // Fill missing spots with '-'.
-                $empties = array_fill(0, $count + 1, '-');
-                $plurals += $empties;
-                ksort($plurals);
-                $messages[stripcslashes($item['ids']['plural'])] = stripcslashes(implode('|', $plurals));
-            }
-        } elseif (!empty($item['ids']['singular'])) {
-            $messages[stripcslashes($item['ids']['singular'])] = stripcslashes($item['translated']);
-        }
-    }
-}
diff --git a/vendor/symfony/translation/Loader/QtFileLoader.php b/vendor/symfony/translation/Loader/QtFileLoader.php
deleted file mode 100644
index 657bd6e..0000000
--- a/vendor/symfony/translation/Loader/QtFileLoader.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * QtFileLoader loads translations from QT Translations XML files.
- *
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- */
-class QtFileLoader implements LoaderInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        try {
-            $dom = XmlUtils::loadFile($resource);
-        } catch (\InvalidArgumentException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s".', $resource), $e->getCode(), $e);
-        }
-
-        $internalErrors = libxml_use_internal_errors(true);
-        libxml_clear_errors();
-
-        $xpath = new \DOMXPath($dom);
-        $nodes = $xpath->evaluate('//TS/context/name[text()="'.$domain.'"]');
-
-        $catalogue = new MessageCatalogue($locale);
-        if ($nodes->length == 1) {
-            $translations = $nodes->item(0)->nextSibling->parentNode->parentNode->getElementsByTagName('message');
-            foreach ($translations as $translation) {
-                $translationValue = (string) $translation->getElementsByTagName('translation')->item(0)->nodeValue;
-
-                if (!empty($translationValue)) {
-                    $catalogue->set(
-                        (string) $translation->getElementsByTagName('source')->item(0)->nodeValue,
-                        $translationValue,
-                        $domain
-                    );
-                }
-                $translation = $translation->nextSibling;
-            }
-
-            if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-                $catalogue->addResource(new FileResource($resource));
-            }
-        }
-
-        libxml_use_internal_errors($internalErrors);
-
-        return $catalogue;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php
deleted file mode 100644
index 0e335db..0000000
--- a/vendor/symfony/translation/Loader/XliffFileLoader.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-
-/**
- * XliffFileLoader loads translations from XLIFF files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class XliffFileLoader implements LoaderInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        list($xml, $encoding) = $this->parseFile($resource);
-        $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
-
-        $catalogue = new MessageCatalogue($locale);
-        foreach ($xml->xpath('//xliff:trans-unit') as $translation) {
-            $attributes = $translation->attributes();
-
-            if (!(isset($attributes['resname']) || isset($translation->source))) {
-                continue;
-            }
-
-            $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
-            // If the xlf file has another encoding specified, try to convert it because
-            // simple_xml will always return utf-8 encoded values
-            $target = $this->utf8ToCharset((string) (isset($translation->target) ? $translation->target : $source), $encoding);
-
-            $catalogue->set((string) $source, $target, $domain);
-
-            if (isset($translation->note)) {
-                $notes = array();
-                foreach ($translation->note as $xmlNote) {
-                    $noteAttributes = $xmlNote->attributes();
-                    $note = array('content' => $this->utf8ToCharset((string) $xmlNote, $encoding));
-                    if (isset($noteAttributes['priority'])) {
-                        $note['priority'] = (int) $noteAttributes['priority'];
-                    }
-
-                    if (isset($noteAttributes['from'])) {
-                        $note['from'] = (string) $noteAttributes['from'];
-                    }
-
-                    $notes[] = $note;
-                }
-
-                $catalogue->setMetadata((string) $source, array('notes' => $notes), $domain);
-            }
-        }
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-
-    /**
-     * Convert a UTF8 string to the specified encoding.
-     *
-     * @param string $content  String to decode
-     * @param string $encoding Target encoding
-     *
-     * @return string
-     */
-    private function utf8ToCharset($content, $encoding = null)
-    {
-        if ('UTF-8' !== $encoding && !empty($encoding)) {
-            if (function_exists('mb_convert_encoding')) {
-                return mb_convert_encoding($content, $encoding, 'UTF-8');
-            }
-
-            if (function_exists('iconv')) {
-                return iconv('UTF-8', $encoding, $content);
-            }
-
-            throw new \RuntimeException('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
-        }
-
-        return $content;
-    }
-
-    /**
-     * Validates and parses the given file into a SimpleXMLElement.
-     *
-     * @param string $file
-     *
-     * @throws \RuntimeException
-     *
-     * @return \SimpleXMLElement
-     *
-     * @throws InvalidResourceException
-     */
-    private function parseFile($file)
-    {
-        try {
-            $dom = XmlUtils::loadFile($file);
-        } catch (\InvalidArgumentException $e) {
-            throw new InvalidResourceException(sprintf('Unable to load "%s": %s', $file, $e->getMessage()), $e->getCode(), $e);
-        }
-
-        $internalErrors = libxml_use_internal_errors(true);
-
-        $location = str_replace('\\', '/', __DIR__).'/schema/dic/xliff-core/xml.xsd';
-        $parts = explode('/', $location);
-        if (0 === stripos($location, 'phar://')) {
-            $tmpfile = tempnam(sys_get_temp_dir(), 'sf2');
-            if ($tmpfile) {
-                copy($location, $tmpfile);
-                $parts = explode('/', str_replace('\\', '/', $tmpfile));
-            }
-        }
-        $drive = '\\' === DIRECTORY_SEPARATOR ? array_shift($parts).'/' : '';
-        $location = 'file:///'.$drive.implode('/', array_map('rawurlencode', $parts));
-
-        $source = file_get_contents(__DIR__.'/schema/dic/xliff-core/xliff-core-1.2-strict.xsd');
-        $source = str_replace('http://www.w3.org/2001/xml.xsd', $location, $source);
-
-        if (!@$dom->schemaValidateSource($source)) {
-            throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $file, implode("\n", $this->getXmlErrors($internalErrors))));
-        }
-
-        $dom->normalizeDocument();
-
-        libxml_clear_errors();
-        libxml_use_internal_errors($internalErrors);
-
-        return array(simplexml_import_dom($dom), strtoupper($dom->encoding));
-    }
-
-    /**
-     * Returns the XML errors of the internal XML parser.
-     *
-     * @param bool $internalErrors
-     *
-     * @return array An array of errors
-     */
-    private function getXmlErrors($internalErrors)
-    {
-        $errors = array();
-        foreach (libxml_get_errors() as $error) {
-            $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
-                LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
-                $error->code,
-                trim($error->message),
-                $error->file ?: 'n/a',
-                $error->line,
-                $error->column
-            );
-        }
-
-        libxml_clear_errors();
-        libxml_use_internal_errors($internalErrors);
-
-        return $errors;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php
deleted file mode 100644
index a34cf05..0000000
--- a/vendor/symfony/translation/Loader/YamlFileLoader.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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\Component\Translation\Loader;
-
-use Symfony\Component\Translation\Exception\InvalidResourceException;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\Yaml\Parser as YamlParser;
-use Symfony\Component\Yaml\Exception\ParseException;
-
-/**
- * YamlFileLoader loads translations from Yaml files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class YamlFileLoader extends ArrayLoader
-{
-    private $yamlParser;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $locale, $domain = 'messages')
-    {
-        if (!stream_is_local($resource)) {
-            throw new InvalidResourceException(sprintf('This is not a local file "%s".', $resource));
-        }
-
-        if (!file_exists($resource)) {
-            throw new NotFoundResourceException(sprintf('File "%s" not found.', $resource));
-        }
-
-        if (!class_exists('Symfony\Component\Yaml\Parser')) {
-            throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.');
-        }
-
-        if (null === $this->yamlParser) {
-            $this->yamlParser = new YamlParser();
-        }
-
-        try {
-            $messages = $this->yamlParser->parse(file_get_contents($resource));
-        } catch (ParseException $e) {
-            throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
-        }
-
-        // empty file
-        if (null === $messages) {
-            $messages = array();
-        }
-
-        // not an array
-        if (!is_array($messages)) {
-            throw new InvalidResourceException(sprintf('The file "%s" must contain a YAML array.', $resource));
-        }
-
-        $catalogue = parent::load($messages, $locale, $domain);
-
-        if (class_exists('Symfony\Component\Config\Resource\FileResource')) {
-            $catalogue->addResource(new FileResource($resource));
-        }
-
-        return $catalogue;
-    }
-}
diff --git a/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-1.2-strict.xsd b/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-1.2-strict.xsd
deleted file mode 100644
index 3ce2a8e..0000000
--- a/vendor/symfony/translation/Loader/schema/dic/xliff-core/xliff-core-1.2-strict.xsd
+++ /dev/null
@@ -1,2223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-May-19-2004:
-- Changed the <choice> for ElemType_header, moving minOccurs="0" maxOccurs="unbounded" from its elements 
-to <choice> itself.
-- Added <choice> for ElemType_trans-unit to allow "any order" for <context-group>, <count-group>, <prop-group>, <note>, and
-<alt-trans>.
-
-Oct-2005
-- updated version info to 1.2
-- equiv-trans attribute to <trans-unit> element 
-- merged-trans attribute for <group> element
-- Add the <seg-source> element as optional in the <trans-unit> and <alt-trans> content models, at the same level as <source> 
-- Create a new value "seg" for the mtype attribute of the <mrk> element
-- Add mid as an optional attribute for the <alt-trans> element
-
-Nov-14-2005
-- Changed name attribute for <context-group> from required to optional
-- Added extension point at <xliff>
-
-Jan-9-2006
-- Added alttranstype type attribute to <alt-trans>, and values
-
-Jan-10-2006
-- Corrected error with overwritten purposeValueList
-- Corrected name="AttrType_Version",  attribute should have been "name"
-
--->
-<xsd:schema xmlns:xlf="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="urn:oasis:names:tc:xliff:document:1.2" xml:lang="en">
-  <!-- Import for xml:lang and xml:space -->
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <!-- Attributes Lists -->
-  <xsd:simpleType name="XTend">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="x-[^\s]+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="context-typeValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'context-type'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="database">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a database content.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="element">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the content of an element within an XML document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="elementtitle">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the name of an element within an XML document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="linenumber">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the line number from the sourcefile (see context-type="sourcefile") where the &lt;source&gt; is found.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="numparams">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a the number of parameters contained within the &lt;source&gt;.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="paramnotes">
-        <xsd:annotation>
-          <xsd:documentation>Indicates notes pertaining to the parameters in the &lt;source&gt;.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="record">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the content of a record within a database.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="recordtitle">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the name of a record within a database.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="sourcefile">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the original source file in the case that multiple files are merged to form the original file from which the XLIFF file is created. This differs from the original &lt;file&gt; attribute in that this sourcefile is one of many that make up that file.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="count-typeValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'count-type'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="num-usages">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the count units are items that are used X times in a certain context; example: this is a reusable text unit which is used 42 times in other texts.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="repetition">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the count units are translation units existing already in the same document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="total">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a total count.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="InlineDelimitersValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'ctype' when used other elements than &lt;ph&gt; or &lt;x&gt;.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="bold">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a run of bolded text.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="italic">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a run of text in italics.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="underlined">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a run of underlined text.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="link">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a run of hyper-text.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="InlinePlaceholdersValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'ctype' when used with &lt;ph&gt; or &lt;x&gt;.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="image">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a inline image.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pb">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a page break.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="lb">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a line break.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="mime-typeValueList">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(text|multipart|message|application|image|audio|video|model)(/.+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="datatypeValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'datatype'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="asp">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Active Server Page data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="c">
-        <xsd:annotation>
-          <xsd:documentation>Indicates C source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cdf">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Channel Definition Format (CDF) data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cfm">
-        <xsd:annotation>
-          <xsd:documentation>Indicates ColdFusion data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cpp">
-        <xsd:annotation>
-          <xsd:documentation>Indicates C++ source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="csharp">
-        <xsd:annotation>
-          <xsd:documentation>Indicates C-Sharp data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cstring">
-        <xsd:annotation>
-          <xsd:documentation>Indicates strings from C, ASM, and driver files data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="csv">
-        <xsd:annotation>
-          <xsd:documentation>Indicates comma-separated values data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="database">
-        <xsd:annotation>
-          <xsd:documentation>Indicates database data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="documentfooter">
-        <xsd:annotation>
-          <xsd:documentation>Indicates portions of document that follows data and contains metadata.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="documentheader">
-        <xsd:annotation>
-          <xsd:documentation>Indicates portions of document that precedes data and contains metadata.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="filedialog">
-        <xsd:annotation>
-          <xsd:documentation>Indicates data from standard UI file operations dialogs (e.g., Open, Save, Save As, Export, Import).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="form">
-        <xsd:annotation>
-          <xsd:documentation>Indicates standard user input screen data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="html">
-        <xsd:annotation>
-          <xsd:documentation>Indicates HyperText Markup Language (HTML) data - document instance.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="htmlbody">
-        <xsd:annotation>
-          <xsd:documentation>Indicates content within an HTML document’s &lt;body&gt; element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="ini">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Windows INI file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="interleaf">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Interleaf data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="javaclass">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Java source file data (extension '.java').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="javapropertyresourcebundle">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Java property resource bundle data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="javalistresourcebundle">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Java list resource bundle data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="javascript">
-        <xsd:annotation>
-          <xsd:documentation>Indicates JavaScript source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="jscript">
-        <xsd:annotation>
-          <xsd:documentation>Indicates JScript source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="layout">
-        <xsd:annotation>
-          <xsd:documentation>Indicates information relating to formatting.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="lisp">
-        <xsd:annotation>
-          <xsd:documentation>Indicates LISP source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="margin">
-        <xsd:annotation>
-          <xsd:documentation>Indicates information relating to margin formats.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="menufile">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a file containing menu.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="messagefile">
-        <xsd:annotation>
-          <xsd:documentation>Indicates numerically identified string table.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="mif">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Maker Interchange Format (MIF) data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="mimetype">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the datatype attribute value is a MIME Type value and is defined in the mime-type attribute.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="mo">
-        <xsd:annotation>
-          <xsd:documentation>Indicates GNU Machine Object data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="msglib">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Message Librarian strings created by Novell's Message Librarian Tool.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pagefooter">
-        <xsd:annotation>
-          <xsd:documentation>Indicates information to be displayed at the bottom of each page of a document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pageheader">
-        <xsd:annotation>
-          <xsd:documentation>Indicates information to be displayed at the top of each page of a document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="parameters">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a list of property values (e.g., settings within INI files or preferences dialog).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pascal">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Pascal source file data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="php">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Hypertext Preprocessor data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="plaintext">
-        <xsd:annotation>
-          <xsd:documentation>Indicates plain text file (no formatting other than, possibly, wrapping).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="po">
-        <xsd:annotation>
-          <xsd:documentation>Indicates GNU Portable Object file.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="report">
-        <xsd:annotation>
-          <xsd:documentation>Indicates dynamically generated user defined document. e.g. Oracle Report, Crystal Report, etc.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="resources">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Windows .NET binary resources.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="resx">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Windows .NET Resources.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rtf">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Rich Text Format (RTF) data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="sgml">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Standard Generalized Markup Language (SGML) data - document instance.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="sgmldtd">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Standard Generalized Markup Language (SGML) data - Document Type Definition (DTD).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="svg">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Scalable Vector Graphic (SVG) data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="vbscript">
-        <xsd:annotation>
-          <xsd:documentation>Indicates VisualBasic Script source file.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="warning">
-        <xsd:annotation>
-          <xsd:documentation>Indicates warning message.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="winres">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Windows (Win32) resources (i.e. resources extracted from an RC script, a message file, or a compiled file).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="xhtml">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Extensible HyperText Markup Language (XHTML) data - document instance.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="xml">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Extensible Markup Language (XML) data - document instance.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="xmldtd">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Extensible Markup Language (XML) data - Document Type Definition (DTD).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="xsl">
-        <xsd:annotation>
-          <xsd:documentation>Indicates Extensible Stylesheet Language (XSL) data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="xul">
-        <xsd:annotation>
-          <xsd:documentation>Indicates XUL elements.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="mtypeValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'mtype'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="abbrev">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text is an abbreviation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="abbreviated-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8: A term resulting from the omission of any part of the full term while designating the same concept.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="abbreviation">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8.1: An abbreviated form of a simple term resulting from the omission of some of its letters (e.g. 'adj.' for 'adjective').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="acronym">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8.4: An abbreviated form of a term made up of letters from the full form of a multiword term strung together into a sequence pronounced only syllabically (e.g. 'radar' for 'radio detecting and ranging').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="appellation">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620: A proper-name term, such as the name of an agency or other proper entity.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="collocation">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.18.1: A recurrent word combination characterized by cohesion in that the components of the collocation must co-occur within an utterance or series of utterances, even though they do not necessarily have to maintain immediate proximity to one another.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="common-name">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.5: A synonym for an international scientific term that is used in general discourse in a given language.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="datetime">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text is a date and/or time.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="equation">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.15: An expression used to represent a concept based on a statement that two mathematical expressions are, for instance, equal as identified by the equal sign (=), or assigned to one another by a similar sign.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="expanded-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.7: The complete representation of a term for which there is an abbreviated form.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="formula">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.14: Figures, symbols or the like used to express a concept briefly, such as a mathematical or chemical formula.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="head-term">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.1: The concept designation that has been chosen to head a terminological record.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="initialism">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8.3: An abbreviated form of a term consisting of some of the initial letters of the words making up a multiword term or the term elements making up a compound term when these letters are pronounced individually (e.g. 'BSE' for 'bovine spongiform encephalopathy').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="international-scientific-term">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.4: A term that is part of an international scientific nomenclature as adopted by an appropriate scientific body.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="internationalism">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.6: A term that has the same or nearly identical orthographic or phonemic form in many languages.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="logical-expression">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.16: An expression used to represent a concept based on mathematical or logical relations, such as statements of inequality, set relationships, Boolean operations, and the like.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="materials-management-unit">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.17: A unit to track object.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="name">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text is a name.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="near-synonym">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.3: A term that represents the same or a very similar concept as another term in the same language, but for which interchangeability is limited to some contexts and inapplicable in others.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="part-number">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.17.2: A unique alphanumeric designation assigned to an object in a manufacturing system.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="phrase">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text is a phrase.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="phraseological-unit">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.18: Any group of two or more words that form a unit, the meaning of which frequently cannot be deduced based on the combined sense of the words making up the phrase.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="protected">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text should not be translated.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="romanized-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.12: A form of a term resulting from an operation whereby non-Latin writing systems are converted to the Latin alphabet.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="seg">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the marked text represents a segment.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="set-phrase">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.18.2: A fixed, lexicalized phrase.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="short-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8.2: A variant of a multiword term that includes fewer words than the full form of the term (e.g. 'Group of Twenty-four' for 'Intergovernmental Group of Twenty-four on International Monetary Affairs').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="sku">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.17.1: Stock keeping unit, an inventory item identified by a unique alphanumeric designation assigned to an object in an inventory control system.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="standard-text">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.19: A fixed chunk of recurring text.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="symbol">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.13: A designation of a concept by letters, numerals, pictograms or any combination thereof.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="synonym">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.2: Any term that represents the same or a very similar concept as the main entry term in a term entry.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="synonymous-phrase">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.18.3: Phraseological unit in a language that expresses the same semantic content as another phrase in that same language.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="term">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the marked text is a term.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="transcribed-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.11: A form of a term resulting from an operation whereby the characters of one writing system are represented by characters from another writing system, taking into account the pronunciation of the characters converted.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="transliterated-form">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.10: A form of a term resulting from an operation whereby the characters of an alphabetic writing system are represented by characters from another alphabetic writing system.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="truncated-term">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.8.5: An abbreviated form of a term resulting from the omission of one or more term elements or syllables (e.g. 'flu' for 'influenza').</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="variant">
-        <xsd:annotation>
-          <xsd:documentation>ISO-12620 2.1.9: One of the alternate forms of a term.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="restypeValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'restype'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="auto3state">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC AUTO3STATE control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="autocheckbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC AUTOCHECKBOX control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="autoradiobutton">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC AUTORADIOBUTTON control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="bedit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC BEDIT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="bitmap">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a bitmap, for example a BITMAP resource in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="button">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a button object, for example a BUTTON control Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="caption">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a caption, such as the caption of a dialog box.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cell">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the cell in a table, for example the content of the &lt;td&gt; element in HTML.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="checkbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates check box object, for example a CHECKBOX control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="checkboxmenuitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a menu item with an associated checkbox.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="checkedlistbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a list box, but with a check-box for each item.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="colorchooser">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a color selection dialog.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="combobox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a combination of edit box and listbox object, for example a COMBOBOX control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="comboboxexitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an initialization entry of an extended combobox DLGINIT resource block. (code 0x1234).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="comboboxitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an initialization entry of a combobox DLGINIT resource block (code 0x0403).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="component">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a UI base class element that cannot be represented by any other element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="contextmenu">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a context menu.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="ctext">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC CTEXT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cursor">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a cursor, for example a CURSOR resource in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="datetimepicker">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a date/time picker.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="defpushbutton">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC DEFPUSHBUTTON control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="dialog">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a dialog box.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="dlginit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC DLGINIT resource block.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="edit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an edit box object, for example an EDIT control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="file">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a filename.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="filechooser">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a file dialog.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="fn">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a footnote.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="font">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a font name.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="footer">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a footer.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="frame">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a frame object.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="grid">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a XUL grid element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="groupbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a groupbox object, for example a GROUPBOX control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="header">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a header item.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="heading">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a heading, such has the content of &lt;h1&gt;, &lt;h2&gt;, etc. in HTML.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="hedit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC HEDIT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="hscrollbar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a horizontal scrollbar.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="icon">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an icon, for example an ICON resource in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="iedit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC IEDIT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="keywords">
-        <xsd:annotation>
-          <xsd:documentation>Indicates keyword list, such as the content of the Keywords meta-data in HTML, or a K footnote in WinHelp RTF.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="label">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a label object.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="linklabel">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a label that is also a HTML link (not necessarily a URL).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="list">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a list (a group of list-items, for example an &lt;ol&gt; or &lt;ul&gt; element in HTML).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="listbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a listbox object, for example an LISTBOX control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="listitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an list item (an entry in a list).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="ltext">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC LTEXT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="menu">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a menu (a group of menu-items).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="menubar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a toolbar containing one or more tope level menus.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="menuitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a menu item (an entry in a menu).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="menuseparator">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a XUL menuseparator element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="message">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a message, for example an entry in a MESSAGETABLE resource in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="monthcalendar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a calendar control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="numericupdown">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an edit box beside a spin control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="panel">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a catch all for rectangular areas.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="popupmenu">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a standalone menu not necessarily associated with a menubar.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pushbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a pushbox object, for example a PUSHBOX control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pushbutton">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC PUSHBUTTON control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="radio">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a radio button object.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="radiobuttonmenuitem">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a menuitem with associated radio button.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rcdata">
-        <xsd:annotation>
-          <xsd:documentation>Indicates raw data resources for an application.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="row">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a row in a table.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rtext">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC RTEXT control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="scrollpane">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a user navigable container used to show a portion of a document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="separator">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a generic divider object (e.g. menu group separator).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="shortcut">
-        <xsd:annotation>
-          <xsd:documentation>Windows accelerators, shortcuts in resource or property files.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="spinner">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a UI control to indicate process activity but not progress.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="splitter">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a splitter bar.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="state3">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC STATE3 control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="statusbar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a window for providing feedback to the users, like 'read-only', etc.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="string">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a string, for example an entry in a STRINGTABLE resource in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="tabcontrol">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a layers of controls with a tab to select layers.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="table">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a display and edits regular two-dimensional tables of cells.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="textbox">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a XUL textbox element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="togglebutton">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a UI button that can be toggled to on or off state.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="toolbar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an array of controls, usually buttons.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="tooltip">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a pop up tool tip text.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="trackbar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a bar with a pointer indicating a position within a certain range.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="tree">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a control that displays a set of hierarchical data.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="uri">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a URI (URN or URL).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="userbutton">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a Windows RC USERBUTTON control.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="usercontrol">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a user-defined control like CONTROL control in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="var">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the text of a variable.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="versioninfo">
-        <xsd:annotation>
-          <xsd:documentation>Indicates version information about a resource like VERSIONINFO in Windows.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="vscrollbar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a vertical scrollbar.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="window">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a graphical window.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="size-unitValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'size-unit'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="byte">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in 8-bit bytes.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="char">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in Unicode characters.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="col">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in columns. Used for HTML text area.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="cm">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in centimeters.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="dlgunit">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in dialog units, as defined in Windows resources.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="em">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in 'font-size' units (as defined in CSS).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="ex">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in 'x-height' units (as defined in CSS).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="glyph">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in glyphs. A glyph is considered to be one or more combined Unicode characters that represent a single displayable text character. Sometimes referred to as a 'grapheme cluster'</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="in">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in inches.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="mm">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in millimeters.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="percent">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in percentage.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="pixel">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in pixels.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="point">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in point.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="row">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a size in rows. Used for HTML text area.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="stateValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'state'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="final">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the terminating state.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-adaptation">
-        <xsd:annotation>
-          <xsd:documentation>Indicates only non-textual information needs adaptation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-l10n">
-        <xsd:annotation>
-          <xsd:documentation>Indicates both text and non-textual information needs adaptation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-review-adaptation">
-        <xsd:annotation>
-          <xsd:documentation>Indicates only non-textual information needs review.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-review-l10n">
-        <xsd:annotation>
-          <xsd:documentation>Indicates both text and non-textual information needs review.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-review-translation">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that only the text of the item needs to be reviewed.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="needs-translation">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item needs to be translated.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="new">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item is new. For example, translation units that were not in a previous version of the document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="signed-off">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that changes are reviewed and approved.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="translated">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item has been translated.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="state-qualifierValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'state-qualifier'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="exact-match">
-        <xsd:annotation>
-          <xsd:documentation>Indicates an exact match. An exact match occurs when a source text of a segment is exactly the same as the source text of a segment that was translated previously.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="fuzzy-match">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a fuzzy match. A fuzzy match occurs when a source text of a segment is very similar to the source text of a segment that was translated previously (e.g. when the difference is casing, a few changed words, white-space discripancy, etc.).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="id-match">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a match based on matching IDs (in addition to matching text).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="leveraged-glossary">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a translation derived from a glossary.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="leveraged-inherited">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a translation derived from existing translation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="leveraged-mt">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a translation derived from machine translation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="leveraged-repository">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a translation derived from a translation repository.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="leveraged-tm">
-        <xsd:annotation>
-          <xsd:documentation>Indicates a translation derived from a translation memory.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="mt-suggestion">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the translation is suggested by machine translation.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rejected-grammar">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item has been rejected because of incorrect grammar.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rejected-inaccurate">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item has been rejected because it is incorrect.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rejected-length">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item has been rejected because it is too long or too short.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rejected-spelling">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the item has been rejected because of incorrect spelling.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="tm-suggestion">
-        <xsd:annotation>
-          <xsd:documentation>Indicates the translation is suggested by translation memory.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="unitValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'unit'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="word">
-        <xsd:annotation>
-          <xsd:documentation>Refers to words.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="page">
-        <xsd:annotation>
-          <xsd:documentation>Refers to pages.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="trans-unit">
-        <xsd:annotation>
-          <xsd:documentation>Refers to &lt;trans-unit&gt; elements.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="bin-unit">
-        <xsd:annotation>
-          <xsd:documentation>Refers to &lt;bin-unit&gt; elements.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="glyph">
-        <xsd:annotation>
-          <xsd:documentation>Refers to glyphs.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="item">
-        <xsd:annotation>
-          <xsd:documentation>Refers to &lt;trans-unit&gt; and/or &lt;bin-unit&gt; elements.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="instance">
-        <xsd:annotation>
-          <xsd:documentation>Refers to the occurrences of instances defined by the count-type value.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="character">
-        <xsd:annotation>
-          <xsd:documentation>Refers to characters.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="line">
-        <xsd:annotation>
-          <xsd:documentation>Refers to lines.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="sentence">
-        <xsd:annotation>
-          <xsd:documentation>Refers to sentences.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="paragraph">
-        <xsd:annotation>
-          <xsd:documentation>Refers to paragraphs.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="segment">
-        <xsd:annotation>
-          <xsd:documentation>Refers to segments.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="placeable">
-        <xsd:annotation>
-          <xsd:documentation>Refers to placeables (inline elements).</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="priorityValueList">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'priority'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:positiveInteger">
-      <xsd:enumeration value="1">
-        <xsd:annotation>
-          <xsd:documentation>Highest priority.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="2">
-        <xsd:annotation>
-          <xsd:documentation>High priority.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="3">
-        <xsd:annotation>
-          <xsd:documentation>High priority, but not as important as 2.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="4">
-        <xsd:annotation>
-          <xsd:documentation>High priority, but not as important as 3.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="5">
-        <xsd:annotation>
-          <xsd:documentation>Medium priority, but more important than 6.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="6">
-        <xsd:annotation>
-          <xsd:documentation>Medium priority, but less important than 5.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="7">
-        <xsd:annotation>
-          <xsd:documentation>Low priority, but more important than 8.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="8">
-        <xsd:annotation>
-          <xsd:documentation>Low priority, but more important than 9.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="9">
-        <xsd:annotation>
-          <xsd:documentation>Low priority.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="10">
-        <xsd:annotation>
-          <xsd:documentation>Lowest priority.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="reformatValueYesNo">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="yes">
-        <xsd:annotation>
-          <xsd:documentation>This value indicates that all properties can be reformatted. This value must be used alone.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="no">
-        <xsd:annotation>
-          <xsd:documentation>This value indicates that no properties should be reformatted. This value must be used alone.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="reformatValueList">
-    <xsd:list>
-      <xsd:simpleType>
-        <xsd:union memberTypes="xlf:XTend">
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:string">
-              <xsd:enumeration value="coord">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that all information in the coord attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="coord-x">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the x information in the coord attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="coord-y">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the y information in the coord attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="coord-cx">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the cx information in the coord attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="coord-cy">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the cy information in the coord attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="font">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that all the information in the font attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="font-name">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the name information in the font attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="font-size">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the size information in the font attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="font-weight">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the weight information in the font attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="css-style">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the information in the css-style attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="style">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the information in the style attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-              <xsd:enumeration value="ex-style">
-                <xsd:annotation>
-                  <xsd:documentation>This value indicates that the information in the exstyle attribute can be modified.</xsd:documentation>
-                </xsd:annotation>
-              </xsd:enumeration>
-            </xsd:restriction>
-          </xsd:simpleType>
-        </xsd:union>
-      </xsd:simpleType>
-    </xsd:list>
-  </xsd:simpleType>
-  <xsd:simpleType name="purposeValueList">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="information">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the context is informational in nature, specifying for example, how a term should be translated. Thus, should be displayed to anyone editing the XLIFF document.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="location">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the context-group is used to specify where the term was found in the translatable source. Thus, it is not displayed.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="match">
-        <xsd:annotation>
-          <xsd:documentation>Indicates that the context information should be used during translation memory lookups. Thus, it is not displayed.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="alttranstypeValueList">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="proposal">
-        <xsd:annotation>
-          <xsd:documentation>Represents a translation proposal from a translation memory or other resource.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="previous-version">
-        <xsd:annotation>
-          <xsd:documentation>Represents a previous version of the target element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="rejected">
-        <xsd:annotation>
-          <xsd:documentation>Represents a rejected version of the target element.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="reference">
-        <xsd:annotation>
-          <xsd:documentation>Represents a translation to be used for reference purposes only, for example from a related product or a different language.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-      <xsd:enumeration value="accepted">
-        <xsd:annotation>
-          <xsd:documentation>Represents a proposed translation that was used for the translation of the trans-unit, possibly modified.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!-- Other Types -->
-  <xsd:complexType name="ElemType_ExternalReference">
-    <xsd:choice>
-      <xsd:element ref="xlf:internal-file"/>
-      <xsd:element ref="xlf:external-file"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:simpleType name="AttrType_purpose">
-    <xsd:list>
-      <xsd:simpleType>
-        <xsd:union memberTypes="xlf:purposeValueList xlf:XTend"/>
-      </xsd:simpleType>
-    </xsd:list>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_datatype">
-    <xsd:union memberTypes="xlf:datatypeValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_restype">
-    <xsd:union memberTypes="xlf:restypeValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_alttranstype">
-    <xsd:union memberTypes="xlf:alttranstypeValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_context-type">
-    <xsd:union memberTypes="xlf:context-typeValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_state">
-    <xsd:union memberTypes="xlf:stateValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_state-qualifier">
-    <xsd:union memberTypes="xlf:state-qualifierValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_count-type">
-    <xsd:union memberTypes="xlf:restypeValueList xlf:count-typeValueList xlf:datatypeValueList xlf:stateValueList xlf:state-qualifierValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_InlineDelimiters">
-    <xsd:union memberTypes="xlf:InlineDelimitersValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_InlinePlaceholders">
-    <xsd:union memberTypes="xlf:InlinePlaceholdersValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_size-unit">
-    <xsd:union memberTypes="xlf:size-unitValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_mtype">
-    <xsd:union memberTypes="xlf:mtypeValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_unit">
-    <xsd:union memberTypes="xlf:unitValueList xlf:XTend"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_priority">
-    <xsd:union memberTypes="xlf:priorityValueList"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_reformat">
-    <xsd:union memberTypes="xlf:reformatValueYesNo xlf:reformatValueList"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_YesNo">
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="yes"/>
-      <xsd:enumeration value="no"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_Position">
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="open"/>
-      <xsd:enumeration value="close"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_assoc">
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="preceding"/>
-      <xsd:enumeration value="following"/>
-      <xsd:enumeration value="both"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_annotates">
-    <xsd:restriction base="xsd:NMTOKEN">
-      <xsd:enumeration value="source"/>
-      <xsd:enumeration value="target"/>
-      <xsd:enumeration value="general"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_Coordinates">
-    <xsd:annotation>
-      <xsd:documentation>Values for the attribute 'coord'.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="(-?\d+|#);(-?\d+|#);(-?\d+|#);(-?\d+|#)"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="AttrType_Version">
-    <xsd:annotation>
-      <xsd:documentation>Version values: 1.0 and 1.1 are allowed for backward compatibility.</xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="1.2"/>
-      <xsd:enumeration value="1.1"/>
-      <xsd:enumeration value="1.0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <!-- Groups -->
-  <xsd:group name="ElemGroup_TextContent">
-    <xsd:choice>
-      <xsd:element ref="xlf:g"/>
-      <xsd:element ref="xlf:bpt"/>
-      <xsd:element ref="xlf:ept"/>
-      <xsd:element ref="xlf:ph"/>
-      <xsd:element ref="xlf:it"/>
-      <xsd:element ref="xlf:mrk"/>
-      <xsd:element ref="xlf:x"/>
-      <xsd:element ref="xlf:bx"/>
-      <xsd:element ref="xlf:ex"/>
-    </xsd:choice>
-  </xsd:group>
-  <xsd:attributeGroup name="AttrGroup_TextContent">
-    <xsd:attribute name="id" type="xsd:string" use="required"/>
-    <xsd:attribute name="xid" type="xsd:string" use="optional"/>
-    <xsd:attribute name="equiv-text" type="xsd:string" use="optional"/>
-    <xsd:anyAttribute namespace="##other" processContents="strict"/>
-  </xsd:attributeGroup>
-  <!-- XLIFF Structure -->
-  <xsd:element name="xliff">
-    <xsd:complexType>
-      <xsd:sequence maxOccurs="unbounded">
-        <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-        <xsd:element ref="xlf:file"/>
-      </xsd:sequence>
-      <xsd:attribute name="version" type="xlf:AttrType_Version" use="required"/>
-      <xsd:attribute ref="xml:lang" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="file">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element minOccurs="0" ref="xlf:header"/>
-        <xsd:element ref="xlf:body"/>
-      </xsd:sequence>
-      <xsd:attribute name="original" type="xsd:string" use="required"/>
-      <xsd:attribute name="source-language" type="xsd:language" use="required"/>
-      <xsd:attribute name="datatype" type="xlf:AttrType_datatype" use="required"/>
-      <xsd:attribute name="tool-id" type="xsd:string" use="optional"/>
-      <xsd:attribute name="date" type="xsd:dateTime" use="optional"/>
-      <xsd:attribute ref="xml:space" use="optional"/>
-      <xsd:attribute name="category" type="xsd:string" use="optional"/>
-      <xsd:attribute name="target-language" type="xsd:language" use="optional"/>
-      <xsd:attribute name="product-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="product-version" type="xsd:string" use="optional"/>
-      <xsd:attribute name="build-num" type="xsd:string" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_group_id">
-      <xsd:selector xpath=".//xlf:group"/>
-      <xsd:field xpath="@id"/>
-    </xsd:unique>
-    <xsd:key name="K_unit_id">
-      <xsd:selector xpath=".//xlf:trans-unit|.//xlf:bin-unit"/>
-      <xsd:field xpath="@id"/>
-    </xsd:key>
-    <xsd:keyref name="KR_unit_id" refer="xlf:K_unit_id">
-      <xsd:selector xpath=".//bpt|.//ept|.//it|.//ph|.//g|.//x|.//bx|.//ex|.//sub"/>
-      <xsd:field xpath="@xid"/>
-    </xsd:keyref>
-    <xsd:key name="K_tool-id">
-      <xsd:selector xpath="xlf:header/xlf:tool"/>
-      <xsd:field xpath="@tool-id"/>
-    </xsd:key>
-    <xsd:keyref name="KR_file_tool-id" refer="xlf:K_tool-id">
-      <xsd:selector xpath="."/>
-      <xsd:field xpath="@tool-id"/>
-    </xsd:keyref>
-    <xsd:keyref name="KR_phase_tool-id" refer="xlf:K_tool-id">
-      <xsd:selector xpath="xlf:header/xlf:phase-group/xlf:phase"/>
-      <xsd:field xpath="@tool-id"/>
-    </xsd:keyref>
-    <xsd:keyref name="KR_alt-trans_tool-id" refer="xlf:K_tool-id">
-      <xsd:selector xpath=".//xlf:trans-unit/xlf:alt-trans"/>
-      <xsd:field xpath="@tool-id"/>
-    </xsd:keyref>
-    <xsd:key name="K_count-group_name">
-      <xsd:selector xpath=".//xlf:count-group"/>
-      <xsd:field xpath="@name"/>
-    </xsd:key>
-    <xsd:unique name="U_context-group_name">
-      <xsd:selector xpath=".//xlf:context-group"/>
-      <xsd:field xpath="@name"/>
-    </xsd:unique>
-    <xsd:key name="K_phase-name">
-      <xsd:selector xpath="xlf:header/xlf:phase-group/xlf:phase"/>
-      <xsd:field xpath="@phase-name"/>
-    </xsd:key>
-    <xsd:keyref name="KR_phase-name" refer="xlf:K_phase-name">
-      <xsd:selector xpath=".//xlf:count|.//xlf:trans-unit|.//xlf:target|.//bin-unit|.//bin-target"/>
-      <xsd:field xpath="@phase-name"/>
-    </xsd:keyref>
-    <xsd:unique name="U_uid">
-      <xsd:selector xpath=".//xlf:external-file"/>
-      <xsd:field xpath="@uid"/>
-    </xsd:unique>
-  </xsd:element>
-  <xsd:element name="header">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element minOccurs="0" name="skl" type="xlf:ElemType_ExternalReference"/>
-        <xsd:element minOccurs="0" ref="xlf:phase-group"/>
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-          <xsd:element name="glossary" type="xlf:ElemType_ExternalReference"/>
-          <xsd:element name="reference" type="xlf:ElemType_ExternalReference"/>
-          <xsd:element ref="xlf:count-group"/>
-          <xsd:element ref="xlf:note"/>
-          <xsd:element ref="xlf:tool"/>
-        </xsd:choice>
-        <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="internal-file">
-    <xsd:complexType>
-      <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-          <xsd:attribute name="form" type="xsd:string"/>
-          <xsd:attribute name="crc" type="xsd:NMTOKEN"/>
-        </xsd:extension>
-      </xsd:simpleContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="external-file">
-    <xsd:complexType>
-      <xsd:attribute name="href" type="xsd:string" use="required"/>
-      <xsd:attribute name="crc" type="xsd:NMTOKEN"/>
-      <xsd:attribute name="uid" type="xsd:NMTOKEN"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="note">
-    <xsd:complexType>
-      <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-          <xsd:attribute ref="xml:lang" use="optional"/>
-          <xsd:attribute default="1" name="priority" type="xlf:AttrType_priority" use="optional"/>
-          <xsd:attribute name="from" type="xsd:string" use="optional"/>
-          <xsd:attribute default="general" name="annotates" type="xlf:AttrType_annotates" use="optional"/>
-        </xsd:extension>
-      </xsd:simpleContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="phase-group">
-    <xsd:complexType>
-      <xsd:sequence maxOccurs="unbounded">
-        <xsd:element ref="xlf:phase"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="phase">
-    <xsd:complexType>
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:note"/>
-      </xsd:sequence>
-      <xsd:attribute name="phase-name" type="xsd:string" use="required"/>
-      <xsd:attribute name="process-name" type="xsd:string" use="required"/>
-      <xsd:attribute name="company-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="tool-id" type="xsd:string" use="optional"/>
-      <xsd:attribute name="date" type="xsd:dateTime" use="optional"/>
-      <xsd:attribute name="job-id" type="xsd:string" use="optional"/>
-      <xsd:attribute name="contact-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="contact-email" type="xsd:string" use="optional"/>
-      <xsd:attribute name="contact-phone" type="xsd:string" use="optional"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="count-group">
-    <xsd:complexType>
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:count"/>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="xsd:string" use="required"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="count">
-    <xsd:complexType>
-      <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-          <xsd:attribute name="count-type" type="xlf:AttrType_count-type" use="optional"/>
-          <xsd:attribute name="phase-name" type="xsd:string" use="optional"/>
-          <xsd:attribute default="word" name="unit" type="xlf:AttrType_unit" use="optional"/>
-        </xsd:extension>
-      </xsd:simpleContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="context-group">
-    <xsd:complexType>
-      <xsd:sequence maxOccurs="unbounded">
-        <xsd:element ref="xlf:context"/>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="purpose" type="xlf:AttrType_purpose" use="optional"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="context">
-    <xsd:complexType>
-      <xsd:simpleContent>
-        <xsd:extension base="xsd:string">
-          <xsd:attribute name="context-type" type="xlf:AttrType_context-type" use="required"/>
-          <xsd:attribute default="no" name="match-mandatory" type="xlf:AttrType_YesNo" use="optional"/>
-          <xsd:attribute name="crc" type="xsd:NMTOKEN" use="optional"/>
-        </xsd:extension>
-      </xsd:simpleContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="tool">
-    <xsd:complexType mixed="true">
-      <xsd:sequence>
-        <xsd:any namespace="##any" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="tool-id" type="xsd:string" use="required"/>
-      <xsd:attribute name="tool-name" type="xsd:string" use="required"/>
-      <xsd:attribute name="tool-version" type="xsd:string" use="optional"/>
-      <xsd:attribute name="tool-company" type="xsd:string" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="body">
-    <xsd:complexType>
-      <xsd:choice maxOccurs="unbounded" minOccurs="0">
-        <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:group"/>
-        <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:trans-unit"/>
-        <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:bin-unit"/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="group">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:sequence>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:context-group"/>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:count-group"/>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:note"/>
-          <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-        </xsd:sequence>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:group"/>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:trans-unit"/>
-          <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:bin-unit"/>
-        </xsd:choice>
-      </xsd:sequence>
-      <xsd:attribute name="id" type="xsd:string" use="optional"/>
-      <xsd:attribute name="datatype" type="xlf:AttrType_datatype" use="optional"/>
-      <xsd:attribute default="default" ref="xml:space" use="optional"/>
-      <xsd:attribute name="restype" type="xlf:AttrType_restype" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extradata" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extype" type="xsd:string" use="optional"/>
-      <xsd:attribute name="help-id" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="menu" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-option" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="coord" type="xlf:AttrType_Coordinates" use="optional"/>
-      <xsd:attribute name="font" type="xsd:string" use="optional"/>
-      <xsd:attribute name="css-style" type="xsd:string" use="optional"/>
-      <xsd:attribute name="style" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="exstyle" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute default="yes" name="translate" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attribute default="yes" name="reformat" type="xlf:AttrType_reformat" use="optional"/>
-      <xsd:attribute default="pixel" name="size-unit" type="xlf:AttrType_size-unit" use="optional"/>
-      <xsd:attribute name="maxwidth" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minwidth" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="maxheight" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minheight" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="maxbytes" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minbytes" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="charclass" type="xsd:string" use="optional"/>
-      <xsd:attribute default="no" name="merged-trans" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="trans-unit">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="xlf:source"/>
-        <xsd:element minOccurs="0" ref="xlf:seg-source"/>
-        <xsd:element minOccurs="0" ref="xlf:target"/>
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-          <xsd:element ref="xlf:context-group"/>
-          <xsd:element ref="xlf:count-group"/>
-          <xsd:element ref="xlf:note"/>
-          <xsd:element ref="xlf:alt-trans"/>
-        </xsd:choice>
-        <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-      </xsd:sequence>
-      <xsd:attribute name="id" type="xsd:string" use="required"/>
-      <xsd:attribute name="approved" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attribute default="yes" name="translate" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attribute default="yes" name="reformat" type="xlf:AttrType_reformat" use="optional"/>
-      <xsd:attribute default="default" ref="xml:space" use="optional"/>
-      <xsd:attribute name="datatype" type="xlf:AttrType_datatype" use="optional"/>
-      <xsd:attribute name="phase-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="restype" type="xlf:AttrType_restype" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extradata" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extype" type="xsd:string" use="optional"/>
-      <xsd:attribute name="help-id" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="menu" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-option" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="coord" type="xlf:AttrType_Coordinates" use="optional"/>
-      <xsd:attribute name="font" type="xsd:string" use="optional"/>
-      <xsd:attribute name="css-style" type="xsd:string" use="optional"/>
-      <xsd:attribute name="style" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="exstyle" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute default="pixel" name="size-unit" type="xlf:AttrType_size-unit" use="optional"/>
-      <xsd:attribute name="maxwidth" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minwidth" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="maxheight" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minheight" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="maxbytes" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="minbytes" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="charclass" type="xsd:string" use="optional"/>
-      <xsd:attribute default="yes" name="merged-trans" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_tu_segsrc_mid">
-      <xsd:selector xpath="./xlf:seg-source/xlf:mrk"/>
-      <xsd:field xpath="@mid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_tu_segsrc_mid" refer="xlf:U_tu_segsrc_mid">
-      <xsd:selector xpath="./xlf:target/xlf:mrk|./xlf:alt-trans"/>
-      <xsd:field xpath="@mid"/>
-    </xsd:keyref>
-  </xsd:element>
-  <xsd:element name="source">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute ref="xml:lang" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_source_bpt_rid">
-      <xsd:selector xpath=".//xlf:bpt"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_source_ept_rid" refer="xlf:U_source_bpt_rid">
-      <xsd:selector xpath=".//xlf:ept"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-    <xsd:unique name="U_source_bx_rid">
-      <xsd:selector xpath=".//xlf:bx"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_source_ex_rid" refer="xlf:U_source_bx_rid">
-      <xsd:selector xpath=".//xlf:ex"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-  </xsd:element>
-  <xsd:element name="seg-source">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute ref="xml:lang" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_segsrc_bpt_rid">
-      <xsd:selector xpath=".//xlf:bpt"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_segsrc_ept_rid" refer="xlf:U_segsrc_bpt_rid">
-      <xsd:selector xpath=".//xlf:ept"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-    <xsd:unique name="U_segsrc_bx_rid">
-      <xsd:selector xpath=".//xlf:bx"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_segsrc_ex_rid" refer="xlf:U_segsrc_bx_rid">
-      <xsd:selector xpath=".//xlf:ex"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-  </xsd:element>
-  <xsd:element name="target">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute name="state" type="xlf:AttrType_state" use="optional"/>
-      <xsd:attribute name="state-qualifier" type="xlf:AttrType_state-qualifier" use="optional"/>
-      <xsd:attribute name="phase-name" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute ref="xml:lang" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:attribute name="coord" type="xlf:AttrType_Coordinates" use="optional"/>
-      <xsd:attribute name="font" type="xsd:string" use="optional"/>
-      <xsd:attribute name="css-style" type="xsd:string" use="optional"/>
-      <xsd:attribute name="style" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="exstyle" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute default="yes" name="equiv-trans" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_target_bpt_rid">
-      <xsd:selector xpath=".//xlf:bpt"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_target_ept_rid" refer="xlf:U_target_bpt_rid">
-      <xsd:selector xpath=".//xlf:ept"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-    <xsd:unique name="U_target_bx_rid">
-      <xsd:selector xpath=".//xlf:bx"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_target_ex_rid" refer="xlf:U_target_bx_rid">
-      <xsd:selector xpath=".//xlf:ex"/>
-      <xsd:field xpath="@rid"/>
-    </xsd:keyref>
-  </xsd:element>
-  <xsd:element name="alt-trans">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element minOccurs="0" ref="xlf:source"/>
-        <xsd:element minOccurs="0" ref="xlf:seg-source"/>
-        <xsd:element maxOccurs="1" ref="xlf:target"/>
-        <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:context-group"/>
-        <xsd:element maxOccurs="unbounded" minOccurs="0" ref="xlf:note"/>
-        <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-      </xsd:sequence>
-      <xsd:attribute name="match-quality" type="xsd:string" use="optional"/>
-      <xsd:attribute name="tool-id" type="xsd:string" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute ref="xml:lang" use="optional"/>
-      <xsd:attribute name="origin" type="xsd:string" use="optional"/>
-      <xsd:attribute name="datatype" type="xlf:AttrType_datatype" use="optional"/>
-      <xsd:attribute default="default" ref="xml:space" use="optional"/>
-      <xsd:attribute name="restype" type="xlf:AttrType_restype" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extradata" type="xsd:string" use="optional"/>
-      <xsd:attribute name="extype" type="xsd:string" use="optional"/>
-      <xsd:attribute name="help-id" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="menu" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-option" type="xsd:string" use="optional"/>
-      <xsd:attribute name="menu-name" type="xsd:string" use="optional"/>
-      <xsd:attribute name="mid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="coord" type="xlf:AttrType_Coordinates" use="optional"/>
-      <xsd:attribute name="font" type="xsd:string" use="optional"/>
-      <xsd:attribute name="css-style" type="xsd:string" use="optional"/>
-      <xsd:attribute name="style" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="exstyle" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="phase-name" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute default="proposal" name="alttranstype" type="xlf:AttrType_alttranstype" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-    <xsd:unique name="U_at_segsrc_mid">
-      <xsd:selector xpath="./xlf:seg-source/xlf:mrk"/>
-      <xsd:field xpath="@mid"/>
-    </xsd:unique>
-    <xsd:keyref name="KR_at_segsrc_mid" refer="xlf:U_at_segsrc_mid">
-      <xsd:selector xpath="./xlf:target/xlf:mrk"/>
-      <xsd:field xpath="@mid"/>
-    </xsd:keyref>
-  </xsd:element>
-  <xsd:element name="bin-unit">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="xlf:bin-source"/>
-        <xsd:element minOccurs="0" ref="xlf:bin-target"/>
-        <xsd:choice maxOccurs="unbounded" minOccurs="0">
-          <xsd:element ref="xlf:context-group"/>
-          <xsd:element ref="xlf:count-group"/>
-          <xsd:element ref="xlf:note"/>
-          <xsd:element ref="xlf:trans-unit"/>
-        </xsd:choice>
-        <xsd:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="strict"/>
-      </xsd:sequence>
-      <xsd:attribute name="id" type="xsd:string" use="required"/>
-      <xsd:attribute name="mime-type" type="xlf:mime-typeValueList" use="required"/>
-      <xsd:attribute name="approved" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attribute default="yes" name="translate" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attribute default="yes" name="reformat" type="xlf:AttrType_reformat" use="optional"/>
-      <xsd:attribute name="restype" type="xlf:AttrType_restype" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:attribute name="phase-name" type="xsd:string" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="bin-source">
-    <xsd:complexType>
-      <xsd:choice>
-        <xsd:element ref="xlf:internal-file"/>
-        <xsd:element ref="xlf:external-file"/>
-      </xsd:choice>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="bin-target">
-    <xsd:complexType>
-      <xsd:choice>
-        <xsd:element ref="xlf:internal-file"/>
-        <xsd:element ref="xlf:external-file"/>
-      </xsd:choice>
-      <xsd:attribute name="mime-type" type="xlf:mime-typeValueList" use="optional"/>
-      <xsd:attribute name="state" type="xlf:AttrType_state" use="optional"/>
-      <xsd:attribute name="state-qualifier" type="xlf:AttrType_state-qualifier" use="optional"/>
-      <xsd:attribute name="phase-name" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="restype" type="xlf:AttrType_restype" use="optional"/>
-      <xsd:attribute name="resname" type="xsd:string" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-  <!-- Element for inline codes -->
-  <xsd:element name="g">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlineDelimiters" use="optional"/>
-      <xsd:attribute default="yes" name="clone" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="x">
-    <xsd:complexType>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlinePlaceholders" use="optional"/>
-      <xsd:attribute default="yes" name="clone" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="bx">
-    <xsd:complexType>
-      <xsd:attribute name="rid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlineDelimiters" use="optional"/>
-      <xsd:attribute default="yes" name="clone" type="xlf:AttrType_YesNo" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="ex">
-    <xsd:complexType>
-      <xsd:attribute name="rid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="ph">
-    <xsd:complexType mixed="true">
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:sub"/>
-      </xsd:sequence>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlinePlaceholders" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:string" use="optional"/>
-      <xsd:attribute name="assoc" type="xlf:AttrType_assoc" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="bpt">
-    <xsd:complexType mixed="true">
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:sub"/>
-      </xsd:sequence>
-      <xsd:attribute name="rid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlineDelimiters" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:string" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="ept">
-    <xsd:complexType mixed="true">
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:sub"/>
-      </xsd:sequence>
-      <xsd:attribute name="rid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:string" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="it">
-    <xsd:complexType mixed="true">
-      <xsd:sequence maxOccurs="unbounded" minOccurs="0">
-        <xsd:element ref="xlf:sub"/>
-      </xsd:sequence>
-      <xsd:attribute name="pos" type="xlf:AttrType_Position" use="required"/>
-      <xsd:attribute name="rid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlineDelimiters" use="optional"/>
-      <xsd:attribute name="crc" type="xsd:string" use="optional"/>
-      <xsd:attributeGroup ref="xlf:AttrGroup_TextContent"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="sub">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute name="datatype" type="xlf:AttrType_datatype" use="optional"/>
-      <xsd:attribute name="ctype" type="xlf:AttrType_InlineDelimiters" use="optional"/>
-      <xsd:attribute name="xid" type="xsd:string" use="optional"/>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="mrk">
-    <xsd:complexType mixed="true">
-      <xsd:group maxOccurs="unbounded" minOccurs="0" ref="xlf:ElemGroup_TextContent"/>
-      <xsd:attribute name="mtype" type="xlf:AttrType_mtype" use="required"/>
-      <xsd:attribute name="mid" type="xsd:NMTOKEN" use="optional"/>
-      <xsd:attribute name="comment" type="xsd:string" use="optional"/>
-      <xsd:anyAttribute namespace="##other" processContents="strict"/>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
diff --git a/vendor/symfony/translation/Loader/schema/dic/xliff-core/xml.xsd b/vendor/symfony/translation/Loader/schema/dic/xliff-core/xml.xsd
deleted file mode 100644
index a46162a..0000000
--- a/vendor/symfony/translation/Loader/schema/dic/xliff-core/xml.xsd
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version='1.0'?>
-<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns ="http://www.w3.org/1999/xhtml"
-  xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   <div>
-    <h1>About the XML namespace</h1>
-
-    <div class="bodytext">
-     <p>
-
-      This schema document describes the XML namespace, in a form
-      suitable for import by other schema documents.
-     </p>
-     <p>
-      See <a href="http://www.w3.org/XML/1998/namespace.html">
-      http://www.w3.org/XML/1998/namespace.html</a> and
-      <a href="http://www.w3.org/TR/REC-xml">
-      http://www.w3.org/TR/REC-xml</a> for information 
-      about this namespace.
-     </p>
-
-     <p>
-      Note that local names in this namespace are intended to be
-      defined only by the World Wide Web Consortium or its subgroups.
-      The names currently defined in this namespace are listed below.
-      They should not be used with conflicting semantics by any Working
-      Group, specification, or document instance.
-     </p>
-     <p>   
-      See further below in this document for more information about <a
-      href="#usage">how to refer to this schema document from your own
-      XSD schema documents</a> and about <a href="#nsversioning">the
-      namespace-versioning policy governing this schema document</a>.
-     </p>
-    </div>
-   </div>
-
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>lang (as an attribute name)</h3>
-      <p>
-
-       denotes an attribute whose value
-       is a language code for the natural language of the content of
-       any element; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML specification.</p>
-     
-    </div>
-    <div>
-     <h4>Notes</h4>
-     <p>
-      Attempting to install the relevant ISO 2- and 3-letter
-      codes as the enumerated possible values is probably never
-      going to be a realistic possibility.  
-     </p>
-     <p>
-
-      See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-       http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-      and the IANA language subtag registry at
-      <a href="http://www.iana.org/assignments/language-subtag-registry">
-       http://www.iana.org/assignments/language-subtag-registry</a>
-      for further information.
-     </p>
-     <p>
-
-      The union allows for the 'un-declaration' of xml:lang with
-      the empty string.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:annotation>
-   <xs:documentation>
-
-    <div>
-     
-      <h3>space (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose
-       value is a keyword indicating what whitespace processing
-       discipline is intended for the content of the element; its
-       value is inherited.  This name is reserved by virtue of its
-       definition in the XML specification.</p>
-     
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
- 
- <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
-   <xs:documentation>
-
-    <div>
-     
-      <h3>base (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose value
-       provides a URI to be used as the base for interpreting any
-       relative URIs in the scope of the element on which it
-       appears; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML Base specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
-      for information about this attribute.
-     </p>
-
-    </div>
-   </xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>id (as an attribute name)</h3> 
-      <p>
-
-       denotes an attribute whose value
-       should be interpreted as if declared to be of type ID.
-       This name is reserved by virtue of its definition in the
-       xml:id specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
-      for information about this attribute.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
-  <xs:attribute ref="xml:id"/>
- </xs:attributeGroup>
-
- <xs:annotation>
-
-  <xs:documentation>
-   <div>
-   
-    <h3>Father (in any context at all)</h3> 
-
-    <div class="bodytext">
-     <p>
-      denotes Jon Bosak, the chair of 
-      the original XML Working Group.  This name is reserved by 
-      the following decision of the W3C XML Plenary and 
-      XML Coordination groups:
-     </p>
-     <blockquote>
-       <p>
-
-	In appreciation for his vision, leadership and
-	dedication the W3C XML Plenary on this 10th day of
-	February, 2000, reserves for Jon Bosak in perpetuity
-	the XML name "xml:Father".
-       </p>
-     </blockquote>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-
-   <div xml:id="usage" id="usage">
-    <h2><a name="usage">About this schema document</a></h2>
-
-    <div class="bodytext">
-     <p>
-      This schema defines attributes and an attribute group suitable
-      for use by schemas wishing to allow <code>xml:base</code>,
-      <code>xml:lang</code>, <code>xml:space</code> or
-      <code>xml:id</code> attributes on elements they define.
-     </p>
-
-     <p>
-      To enable this, such a schema must import this schema for
-      the XML namespace, e.g. as follows:
-     </p>
-     <pre>
-          &lt;schema.. .>
-          .. .
-           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-     </pre>
-     <p>
-      or
-     </p>
-     <pre>
-
-           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
-     </pre>
-     <p>
-      Subsequently, qualified reference to any of the attributes or the
-      group defined below will have the desired effect, e.g.
-     </p>
-     <pre>
-          &lt;type.. .>
-          .. .
-           &lt;attributeGroup ref="xml:specialAttrs"/>
-     </pre>
-     <p>
-      will define a type which will schema-validate an instance element
-      with any of those attributes.
-     </p>
-
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-   <div id="nsversioning" xml:id="nsversioning">
-    <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
-
-    <div class="bodytext">
-     <p>
-      In keeping with the XML Schema WG's standard versioning
-      policy, this schema document will persist at
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd</a>.
-     </p>
-     <p>
-      At the date of issue it can also be found at
-      <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd</a>.
-     </p>
-
-     <p>
-      The schema document at that URI may however change in the future,
-      in order to remain compatible with the latest version of XML
-      Schema itself, or with the XML namespace itself.  In other words,
-      if the XML Schema or XML namespaces change, the version of this
-      document at <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd 
-      </a> 
-      will change accordingly; the version at 
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd 
-      </a> 
-      will not change.
-     </p>
-     <p>
-
-      Previous dated (and unchanging) versions of this schema 
-      document are at:
-     </p>
-     <ul>
-      <li><a href="http://www.w3.org/2009/01/xml.xsd">
-	http://www.w3.org/2009/01/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2007/08/xml.xsd">
-	http://www.w3.org/2007/08/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2004/10/xml.xsd">
-
-	http://www.w3.org/2004/10/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2001/03/xml.xsd">
-	http://www.w3.org/2001/03/xml.xsd</a></li>
-     </ul>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
-</xs:schema>
diff --git a/vendor/symfony/translation/LoggingTranslator.php b/vendor/symfony/translation/LoggingTranslator.php
deleted file mode 100644
index fa5c5cc..0000000
--- a/vendor/symfony/translation/LoggingTranslator.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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\Component\Translation;
-
-use Psr\Log\LoggerInterface;
-
-/**
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface
-{
-    /**
-     * @var TranslatorInterface|TranslatorBagInterface
-     */
-    private $translator;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @param TranslatorInterface $translator The translator must implement TranslatorBagInterface
-     * @param LoggerInterface     $logger
-     */
-    public function __construct(TranslatorInterface $translator, LoggerInterface $logger)
-    {
-        if (!$translator instanceof TranslatorBagInterface) {
-            throw new \InvalidArgumentException(sprintf('The Translator "%s" must implement TranslatorInterface and TranslatorBagInterface.', get_class($translator)));
-        }
-
-        $this->translator = $translator;
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
-    {
-        $trans = $this->translator->trans($id, $parameters, $domain, $locale);
-        $this->log($id, $domain, $locale);
-
-        return $trans;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
-    {
-        $trans = $this->translator->transChoice($id, $number, $parameters, $domain, $locale);
-        $this->log($id, $domain, $locale);
-
-        return $trans;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLocale($locale)
-    {
-        $this->translator->setLocale($locale);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        return $this->translator->getLocale();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCatalogue($locale = null)
-    {
-        return $this->translator->getCatalogue($locale);
-    }
-
-    /**
-     * Passes through all unknown calls onto the translator object.
-     */
-    public function __call($method, $args)
-    {
-        return call_user_func_array(array($this->translator, $method), $args);
-    }
-
-    /**
-     * Logs for missing translations.
-     *
-     * @param string      $id
-     * @param string|null $domain
-     * @param string|null $locale
-     */
-    private function log($id, $domain, $locale)
-    {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
-        $id = (string) $id;
-        $catalogue = $this->translator->getCatalogue($locale);
-        if ($catalogue->defines($id, $domain)) {
-            return;
-        }
-
-        if ($catalogue->has($id, $domain)) {
-            $this->logger->debug('Translation use fallback catalogue.', array('id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()));
-        } else {
-            $this->logger->warning('Translation not found.', array('id' => $id, 'domain' => $domain, 'locale' => $catalogue->getLocale()));
-        }
-    }
-}
diff --git a/vendor/symfony/translation/MessageCatalogue.php b/vendor/symfony/translation/MessageCatalogue.php
deleted file mode 100644
index dd354a8..0000000
--- a/vendor/symfony/translation/MessageCatalogue.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?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\Component\Translation;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * MessageCatalogue.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface
-{
-    private $messages = array();
-    private $metadata = array();
-    private $resources = array();
-    private $locale;
-    private $fallbackCatalogue;
-    private $parent;
-
-    /**
-     * Constructor.
-     *
-     * @param string $locale   The locale
-     * @param array  $messages An array of messages classified by domain
-     */
-    public function __construct($locale, array $messages = array())
-    {
-        $this->locale = $locale;
-        $this->messages = $messages;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        return $this->locale;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDomains()
-    {
-        return array_keys($this->messages);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function all($domain = null)
-    {
-        if (null === $domain) {
-            return $this->messages;
-        }
-
-        return isset($this->messages[$domain]) ? $this->messages[$domain] : array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($id, $translation, $domain = 'messages')
-    {
-        $this->add(array($id => $translation), $domain);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($id, $domain = 'messages')
-    {
-        if (isset($this->messages[$domain][$id])) {
-            return true;
-        }
-
-        if (null !== $this->fallbackCatalogue) {
-            return $this->fallbackCatalogue->has($id, $domain);
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function defines($id, $domain = 'messages')
-    {
-        return isset($this->messages[$domain][$id]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($id, $domain = 'messages')
-    {
-        if (isset($this->messages[$domain][$id])) {
-            return $this->messages[$domain][$id];
-        }
-
-        if (null !== $this->fallbackCatalogue) {
-            return $this->fallbackCatalogue->get($id, $domain);
-        }
-
-        return $id;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function replace($messages, $domain = 'messages')
-    {
-        $this->messages[$domain] = array();
-
-        $this->add($messages, $domain);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($messages, $domain = 'messages')
-    {
-        if (!isset($this->messages[$domain])) {
-            $this->messages[$domain] = $messages;
-        } else {
-            $this->messages[$domain] = array_replace($this->messages[$domain], $messages);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addCatalogue(MessageCatalogueInterface $catalogue)
-    {
-        if ($catalogue->getLocale() !== $this->locale) {
-            throw new \LogicException(sprintf('Cannot add a catalogue for locale "%s" as the current locale for this catalogue is "%s"', $catalogue->getLocale(), $this->locale));
-        }
-
-        foreach ($catalogue->all() as $domain => $messages) {
-            $this->add($messages, $domain);
-        }
-
-        foreach ($catalogue->getResources() as $resource) {
-            $this->addResource($resource);
-        }
-
-        if ($catalogue instanceof MetadataAwareInterface) {
-            $metadata = $catalogue->getMetadata('', '');
-            $this->addMetadata($metadata);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addFallbackCatalogue(MessageCatalogueInterface $catalogue)
-    {
-        // detect circular references
-        $c = $catalogue;
-        while ($c = $c->getFallbackCatalogue()) {
-            if ($c->getLocale() === $this->getLocale()) {
-                throw new \LogicException(sprintf('Circular reference detected when adding a fallback catalogue for locale "%s".', $catalogue->getLocale()));
-            }
-        }
-
-        $c = $this;
-        do {
-            if ($c->getLocale() === $catalogue->getLocale()) {
-                throw new \LogicException(sprintf('Circular reference detected when adding a fallback catalogue for locale "%s".', $catalogue->getLocale()));
-            }
-        } while ($c = $c->parent);
-
-        $catalogue->parent = $this;
-        $this->fallbackCatalogue = $catalogue;
-
-        foreach ($catalogue->getResources() as $resource) {
-            $this->addResource($resource);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFallbackCatalogue()
-    {
-        return $this->fallbackCatalogue;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResources()
-    {
-        return array_values($this->resources);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addResource(ResourceInterface $resource)
-    {
-        $this->resources[$resource->__toString()] = $resource;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata($key = '', $domain = 'messages')
-    {
-        if ('' == $domain) {
-            return $this->metadata;
-        }
-
-        if (isset($this->metadata[$domain])) {
-            if ('' == $key) {
-                return $this->metadata[$domain];
-            }
-
-            if (isset($this->metadata[$domain][$key])) {
-                return $this->metadata[$domain][$key];
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setMetadata($key, $value, $domain = 'messages')
-    {
-        $this->metadata[$domain][$key] = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteMetadata($key = '', $domain = 'messages')
-    {
-        if ('' == $domain) {
-            $this->metadata = array();
-        } elseif ('' == $key) {
-            unset($this->metadata[$domain]);
-        } else {
-            unset($this->metadata[$domain][$key]);
-        }
-    }
-
-    /**
-     * Adds current values with the new values.
-     *
-     * @param array $values Values to add
-     */
-    private function addMetadata(array $values)
-    {
-        foreach ($values as $domain => $keys) {
-            foreach ($keys as $key => $value) {
-                $this->setMetadata($key, $value, $domain);
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/translation/MessageCatalogueInterface.php b/vendor/symfony/translation/MessageCatalogueInterface.php
deleted file mode 100644
index b1b516d..0000000
--- a/vendor/symfony/translation/MessageCatalogueInterface.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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\Component\Translation;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * MessageCatalogueInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface MessageCatalogueInterface
-{
-    /**
-     * Gets the catalogue locale.
-     *
-     * @return string The locale
-     */
-    public function getLocale();
-
-    /**
-     * Gets the domains.
-     *
-     * @return array An array of domains
-     */
-    public function getDomains();
-
-    /**
-     * Gets the messages within a given domain.
-     *
-     * If $domain is null, it returns all messages.
-     *
-     * @param string $domain The domain name
-     *
-     * @return array An array of messages
-     */
-    public function all($domain = null);
-
-    /**
-     * Sets a message translation.
-     *
-     * @param string $id          The message id
-     * @param string $translation The messages translation
-     * @param string $domain      The domain name
-     */
-    public function set($id, $translation, $domain = 'messages');
-
-    /**
-     * Checks if a message has a translation.
-     *
-     * @param string $id     The message id
-     * @param string $domain The domain name
-     *
-     * @return bool true if the message has a translation, false otherwise
-     */
-    public function has($id, $domain = 'messages');
-
-    /**
-     * Checks if a message has a translation (it does not take into account the fallback mechanism).
-     *
-     * @param string $id     The message id
-     * @param string $domain The domain name
-     *
-     * @return bool true if the message has a translation, false otherwise
-     */
-    public function defines($id, $domain = 'messages');
-
-    /**
-     * Gets a message translation.
-     *
-     * @param string $id     The message id
-     * @param string $domain The domain name
-     *
-     * @return string The message translation
-     */
-    public function get($id, $domain = 'messages');
-
-    /**
-     * Sets translations for a given domain.
-     *
-     * @param array  $messages An array of translations
-     * @param string $domain   The domain name
-     */
-    public function replace($messages, $domain = 'messages');
-
-    /**
-     * Adds translations for a given domain.
-     *
-     * @param array  $messages An array of translations
-     * @param string $domain   The domain name
-     */
-    public function add($messages, $domain = 'messages');
-
-    /**
-     * Merges translations from the given Catalogue into the current one.
-     *
-     * The two catalogues must have the same locale.
-     *
-     * @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
-     */
-    public function addCatalogue(MessageCatalogueInterface $catalogue);
-
-    /**
-     * Merges translations from the given Catalogue into the current one
-     * only when the translation does not exist.
-     *
-     * This is used to provide default translations when they do not exist for the current locale.
-     *
-     * @param MessageCatalogueInterface $catalogue A MessageCatalogueInterface instance
-     */
-    public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
-
-    /**
-     * Gets the fallback catalogue.
-     *
-     * @return MessageCatalogueInterface|null A MessageCatalogueInterface instance or null when no fallback has been set
-     */
-    public function getFallbackCatalogue();
-
-    /**
-     * Returns an array of resources loaded to build this collection.
-     *
-     * @return ResourceInterface[] An array of resources
-     */
-    public function getResources();
-
-    /**
-     * Adds a resource for this collection.
-     *
-     * @param ResourceInterface $resource A resource instance
-     */
-    public function addResource(ResourceInterface $resource);
-}
diff --git a/vendor/symfony/translation/MessageSelector.php b/vendor/symfony/translation/MessageSelector.php
deleted file mode 100644
index bdbb0f9..0000000
--- a/vendor/symfony/translation/MessageSelector.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * MessageSelector.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class MessageSelector
-{
-    /**
-     * Given a message with different plural translations separated by a
-     * pipe (|), this method returns the correct portion of the message based
-     * on the given number, locale and the pluralization rules in the message
-     * itself.
-     *
-     * The message supports two different types of pluralization rules:
-     *
-     * interval: {0} There are no apples|{1} There is one apple|]1,Inf] There are %count% apples
-     * indexed:  There is one apple|There are %count% apples
-     *
-     * The indexed solution can also contain labels (e.g. one: There is one apple).
-     * This is purely for making the translations more clear - it does not
-     * affect the functionality.
-     *
-     * The two methods can also be mixed:
-     *     {0} There are no apples|one: There is one apple|more: There are %count% apples
-     *
-     * @param string $message The message being translated
-     * @param int    $number  The number of items represented for the message
-     * @param string $locale  The locale to use for choosing
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function choose($message, $number, $locale)
-    {
-        $parts = explode('|', $message);
-        $explicitRules = array();
-        $standardRules = array();
-        foreach ($parts as $part) {
-            $part = trim($part);
-
-            if (preg_match('/^(?P<interval>'.Interval::getIntervalRegexp().')\s*(?P<message>.*?)$/xs', $part, $matches)) {
-                $explicitRules[$matches['interval']] = $matches['message'];
-            } elseif (preg_match('/^\w+\:\s*(.*?)$/', $part, $matches)) {
-                $standardRules[] = $matches[1];
-            } else {
-                $standardRules[] = $part;
-            }
-        }
-
-        // try to match an explicit rule, then fallback to the standard ones
-        foreach ($explicitRules as $interval => $m) {
-            if (Interval::test($number, $interval)) {
-                return $m;
-            }
-        }
-
-        $position = PluralizationRules::get($number, $locale);
-
-        if (!isset($standardRules[$position])) {
-            // when there's exactly one rule given, and that rule is a standard
-            // rule, use this rule
-            if (1 === count($parts) && isset($standardRules[0])) {
-                return $standardRules[0];
-            }
-
-            throw new \InvalidArgumentException(sprintf('Unable to choose a translation for "%s" with locale "%s" for value "%d". Double check that this translation has the correct plural options (e.g. "There is one apple|There are %%count%% apples").', $message, $locale, $number));
-        }
-
-        return $standardRules[$position];
-    }
-}
diff --git a/vendor/symfony/translation/MetadataAwareInterface.php b/vendor/symfony/translation/MetadataAwareInterface.php
deleted file mode 100644
index e93c6fb..0000000
--- a/vendor/symfony/translation/MetadataAwareInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * MetadataAwareInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface MetadataAwareInterface
-{
-    /**
-     * Gets metadata for the given domain and key.
-     *
-     * Passing an empty domain will return an array with all metadata indexed by
-     * domain and then by key. Passing an empty key will return an array with all
-     * metadata for the given domain.
-     *
-     * @param string $key    The key
-     * @param string $domain The domain name
-     *
-     * @return mixed The value that was set or an array with the domains/keys or null
-     */
-    public function getMetadata($key = '', $domain = 'messages');
-
-    /**
-     * Adds metadata to a message domain.
-     *
-     * @param string $key    The key
-     * @param mixed  $value  The value
-     * @param string $domain The domain name
-     */
-    public function setMetadata($key, $value, $domain = 'messages');
-
-    /**
-     * Deletes metadata for the given key and domain.
-     *
-     * Passing an empty domain will delete all metadata. Passing an empty key will
-     * delete all metadata for the given domain.
-     *
-     * @param string $key    The key
-     * @param string $domain The domain name
-     */
-    public function deleteMetadata($key = '', $domain = 'messages');
-}
diff --git a/vendor/symfony/translation/PluralizationRules.php b/vendor/symfony/translation/PluralizationRules.php
deleted file mode 100644
index f250423..0000000
--- a/vendor/symfony/translation/PluralizationRules.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * Returns the plural rules for a given locale.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class PluralizationRules
-{
-    private static $rules = array();
-
-    /**
-     * Returns the plural position to use for the given locale and number.
-     *
-     * @param int    $number The number
-     * @param string $locale The locale
-     *
-     * @return int The plural position
-     */
-    public static function get($number, $locale)
-    {
-        if ('pt_BR' === $locale) {
-            // temporary set a locale for brazilian
-            $locale = 'xbr';
-        }
-
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-        }
-
-        if (isset(self::$rules[$locale])) {
-            $return = call_user_func(self::$rules[$locale], $number);
-
-            if (!is_int($return) || $return < 0) {
-                return 0;
-            }
-
-            return $return;
-        }
-
-        /*
-         * The plural rules are derived from code of the Zend Framework (2010-09-25),
-         * which is subject to the new BSD license (http://framework.zend.com/license/new-bsd).
-         * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-         */
-        switch ($locale) {
-            case 'az':
-            case 'bo':
-            case 'dz':
-            case 'id':
-            case 'ja':
-            case 'jv':
-            case 'ka':
-            case 'km':
-            case 'kn':
-            case 'ko':
-            case 'ms':
-            case 'th':
-            case 'tr':
-            case 'vi':
-            case 'zh':
-                return 0;
-                break;
-
-            case 'af':
-            case 'bn':
-            case 'bg':
-            case 'ca':
-            case 'da':
-            case 'de':
-            case 'el':
-            case 'en':
-            case 'eo':
-            case 'es':
-            case 'et':
-            case 'eu':
-            case 'fa':
-            case 'fi':
-            case 'fo':
-            case 'fur':
-            case 'fy':
-            case 'gl':
-            case 'gu':
-            case 'ha':
-            case 'he':
-            case 'hu':
-            case 'is':
-            case 'it':
-            case 'ku':
-            case 'lb':
-            case 'ml':
-            case 'mn':
-            case 'mr':
-            case 'nah':
-            case 'nb':
-            case 'ne':
-            case 'nl':
-            case 'nn':
-            case 'no':
-            case 'om':
-            case 'or':
-            case 'pa':
-            case 'pap':
-            case 'ps':
-            case 'pt':
-            case 'so':
-            case 'sq':
-            case 'sv':
-            case 'sw':
-            case 'ta':
-            case 'te':
-            case 'tk':
-            case 'ur':
-            case 'zu':
-                return ($number == 1) ? 0 : 1;
-
-            case 'am':
-            case 'bh':
-            case 'fil':
-            case 'fr':
-            case 'gun':
-            case 'hi':
-            case 'ln':
-            case 'mg':
-            case 'nso':
-            case 'xbr':
-            case 'ti':
-            case 'wa':
-                return (($number == 0) || ($number == 1)) ? 0 : 1;
-
-            case 'be':
-            case 'bs':
-            case 'hr':
-            case 'ru':
-            case 'sr':
-            case 'uk':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-
-            case 'cs':
-            case 'sk':
-                return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
-
-            case 'ga':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
-
-            case 'lt':
-                return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
-
-            case 'sl':
-                return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
-
-            case 'mk':
-                return ($number % 10 == 1) ? 0 : 1;
-
-            case 'mt':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
-
-            case 'lv':
-                return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
-
-            case 'pl':
-                return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
-
-            case 'cy':
-                return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
-
-            case 'ro':
-                return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
-
-            case 'ar':
-                return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5))));
-
-            default:
-                return 0;
-        }
-    }
-
-    /**
-     * Overrides the default plural rule for a given locale.
-     *
-     * @param callable $rule   A PHP callable
-     * @param string   $locale The locale
-     *
-     * @throws \LogicException
-     */
-    public static function set($rule, $locale)
-    {
-        if ('pt_BR' === $locale) {
-            // temporary set a locale for brazilian
-            $locale = 'xbr';
-        }
-
-        if (strlen($locale) > 3) {
-            $locale = substr($locale, 0, -strlen(strrchr($locale, '_')));
-        }
-
-        if (!is_callable($rule)) {
-            throw new \LogicException('The given rule can not be called');
-        }
-
-        self::$rules[$locale] = $rule;
-    }
-}
diff --git a/vendor/symfony/translation/README.md b/vendor/symfony/translation/README.md
deleted file mode 100644
index 2b46b51..0000000
--- a/vendor/symfony/translation/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Translation Component
-=====================
-
-Translation provides tools for loading translation files and generating
-translated strings from these including support for pluralization.
-
-```php
-use Symfony\Component\Translation\Translator;
-use Symfony\Component\Translation\MessageSelector;
-use Symfony\Component\Translation\Loader\ArrayLoader;
-
-$translator = new Translator('fr_FR', new MessageSelector());
-$translator->setFallbackLocales(array('fr'));
-$translator->addLoader('array', new ArrayLoader());
-$translator->addResource('array', array(
-    'Hello World!' => 'Bonjour',
-), 'fr');
-
-echo $translator->trans('Hello World!')."\n";
-```
-
-Resources
----------
-
-Silex integration:
-
-https://github.com/silexphp/Silex/blob/master/src/Silex/Provider/TranslationServiceProvider.php
-
-Documentation:
-
-https://symfony.com/doc/2.7/book/translation.html
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Translation/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/translation/Translator.php b/vendor/symfony/translation/Translator.php
deleted file mode 100644
index c6d8c16..0000000
--- a/vendor/symfony/translation/Translator.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?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\Component\Translation;
-
-use Symfony\Component\Translation\Loader\LoaderInterface;
-use Symfony\Component\Translation\Exception\NotFoundResourceException;
-use Symfony\Component\Config\ConfigCacheInterface;
-use Symfony\Component\Config\ConfigCacheFactoryInterface;
-use Symfony\Component\Config\ConfigCacheFactory;
-
-/**
- * Translator.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Translator implements TranslatorInterface, TranslatorBagInterface
-{
-    /**
-     * @var MessageCatalogueInterface[]
-     */
-    protected $catalogues = array();
-
-    /**
-     * @var string
-     */
-    protected $locale;
-
-    /**
-     * @var array
-     */
-    private $fallbackLocales = array();
-
-    /**
-     * @var LoaderInterface[]
-     */
-    private $loaders = array();
-
-    /**
-     * @var array
-     */
-    private $resources = array();
-
-    /**
-     * @var MessageSelector
-     */
-    private $selector;
-
-    /**
-     * @var string
-     */
-    private $cacheDir;
-
-    /**
-     * @var bool
-     */
-    private $debug;
-
-    /**
-     * @var ConfigCacheFactoryInterface|null
-     */
-    private $configCacheFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param string               $locale   The locale
-     * @param MessageSelector|null $selector The message selector for pluralization
-     * @param string|null          $cacheDir The directory to use for the cache
-     * @param bool                 $debug    Use cache in debug mode ?
-     *
-     * @throws \InvalidArgumentException If a locale contains invalid characters
-     */
-    public function __construct($locale, MessageSelector $selector = null, $cacheDir = null, $debug = false)
-    {
-        $this->setLocale($locale);
-        $this->selector = $selector ?: new MessageSelector();
-        $this->cacheDir = $cacheDir;
-        $this->debug = $debug;
-    }
-
-    /**
-     * Sets the ConfigCache factory to use.
-     *
-     * @param ConfigCacheFactoryInterface $configCacheFactory
-     */
-    public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
-    {
-        $this->configCacheFactory = $configCacheFactory;
-    }
-
-    /**
-     * Adds a Loader.
-     *
-     * @param string          $format The name of the loader (@see addResource())
-     * @param LoaderInterface $loader A LoaderInterface instance
-     */
-    public function addLoader($format, LoaderInterface $loader)
-    {
-        $this->loaders[$format] = $loader;
-    }
-
-    /**
-     * Adds a Resource.
-     *
-     * @param string $format   The name of the loader (@see addLoader())
-     * @param mixed  $resource The resource name
-     * @param string $locale   The locale
-     * @param string $domain   The domain
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     */
-    public function addResource($format, $resource, $locale, $domain = null)
-    {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
-        $this->assertValidLocale($locale);
-
-        $this->resources[$locale][] = array($format, $resource, $domain);
-
-        if (in_array($locale, $this->fallbackLocales)) {
-            $this->catalogues = array();
-        } else {
-            unset($this->catalogues[$locale]);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLocale($locale)
-    {
-        $this->assertValidLocale($locale);
-        $this->locale = $locale;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        return $this->locale;
-    }
-
-    /**
-     * Sets the fallback locale(s).
-     *
-     * @param string|array $locales The fallback locale(s)
-     *
-     * @throws \InvalidArgumentException If a locale contains invalid characters
-     *
-     * @deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead.
-     */
-    public function setFallbackLocale($locales)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
-
-        $this->setFallbackLocales(is_array($locales) ? $locales : array($locales));
-    }
-
-    /**
-     * Sets the fallback locales.
-     *
-     * @param array $locales The fallback locales
-     *
-     * @throws \InvalidArgumentException If a locale contains invalid characters
-     */
-    public function setFallbackLocales(array $locales)
-    {
-        // needed as the fallback locales are linked to the already loaded catalogues
-        $this->catalogues = array();
-
-        foreach ($locales as $locale) {
-            $this->assertValidLocale($locale);
-        }
-
-        $this->fallbackLocales = $locales;
-    }
-
-    /**
-     * Gets the fallback locales.
-     *
-     * @return array $locales The fallback locales
-     */
-    public function getFallbackLocales()
-    {
-        return $this->fallbackLocales;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
-    {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
-        return strtr($this->getCatalogue($locale)->get((string) $id, $domain), $parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
-    {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
-        $id = (string) $id;
-        $catalogue = $this->getCatalogue($locale);
-        $locale = $catalogue->getLocale();
-        while (!$catalogue->defines($id, $domain)) {
-            if ($cat = $catalogue->getFallbackCatalogue()) {
-                $catalogue = $cat;
-                $locale = $catalogue->getLocale();
-            } else {
-                break;
-            }
-        }
-
-        return strtr($this->selector->choose($catalogue->get($id, $domain), (int) $number, $locale), $parameters);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCatalogue($locale = null)
-    {
-        if (null === $locale) {
-            $locale = $this->getLocale();
-        } else {
-            $this->assertValidLocale($locale);
-        }
-
-        if (!isset($this->catalogues[$locale])) {
-            $this->loadCatalogue($locale);
-        }
-
-        return $this->catalogues[$locale];
-    }
-
-    /**
-     * Gets the loaders.
-     *
-     * @return array LoaderInterface[]
-     */
-    protected function getLoaders()
-    {
-        return $this->loaders;
-    }
-
-    /**
-     * Collects all messages for the given locale.
-     *
-     * @param string|null $locale Locale of translations, by default is current locale
-     *
-     * @return array[array] indexed by catalog
-     */
-    public function getMessages($locale = null)
-    {
-        $catalogue = $this->getCatalogue($locale);
-        $messages = $catalogue->all();
-        while ($catalogue = $catalogue->getFallbackCatalogue()) {
-            $messages = array_replace_recursive($catalogue->all(), $messages);
-        }
-
-        return $messages;
-    }
-
-    /**
-     * @param string $locale
-     */
-    protected function loadCatalogue($locale)
-    {
-        if (null === $this->cacheDir) {
-            $this->initializeCatalogue($locale);
-        } else {
-            $this->initializeCacheCatalogue($locale);
-        }
-    }
-
-    /**
-     * @param string $locale
-     */
-    protected function initializeCatalogue($locale)
-    {
-        $this->assertValidLocale($locale);
-
-        try {
-            $this->doLoadCatalogue($locale);
-        } catch (NotFoundResourceException $e) {
-            if (!$this->computeFallbackLocales($locale)) {
-                throw $e;
-            }
-        }
-        $this->loadFallbackCatalogues($locale);
-    }
-
-    /**
-     * @param string $locale
-     */
-    private function initializeCacheCatalogue($locale)
-    {
-        if (isset($this->catalogues[$locale])) {
-            /* Catalogue already initialized. */
-            return;
-        }
-
-        $this->assertValidLocale($locale);
-        $self = $this; // required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0.
-        $cache = $this->getConfigCacheFactory()->cache($this->getCatalogueCachePath($locale),
-            function (ConfigCacheInterface $cache) use ($self, $locale) {
-                $self->dumpCatalogue($locale, $cache);
-            }
-        );
-
-        if (isset($this->catalogues[$locale])) {
-            /* Catalogue has been initialized as it was written out to cache. */
-            return;
-        }
-
-        /* Read catalogue from cache. */
-        $this->catalogues[$locale] = include $cache->getPath();
-    }
-
-    /**
-     * This method is public because it needs to be callable from a closure in PHP 5.3. It should be made protected (or even private, if possible) in 3.0.
-     *
-     * @internal
-     */
-    public function dumpCatalogue($locale, ConfigCacheInterface $cache)
-    {
-        $this->initializeCatalogue($locale);
-        $fallbackContent = $this->getFallbackContent($this->catalogues[$locale]);
-
-        $content = sprintf(<<<EOF
-<?php
-
-use Symfony\Component\Translation\MessageCatalogue;
-
-\$catalogue = new MessageCatalogue('%s', %s);
-
-%s
-return \$catalogue;
-
-EOF
-            ,
-            $locale,
-            var_export($this->catalogues[$locale]->all(), true),
-            $fallbackContent
-        );
-
-        $cache->write($content, $this->catalogues[$locale]->getResources());
-    }
-
-    private function getFallbackContent(MessageCatalogue $catalogue)
-    {
-        $fallbackContent = '';
-        $current = '';
-        $replacementPattern = '/[^a-z0-9_]/i';
-        $fallbackCatalogue = $catalogue->getFallbackCatalogue();
-        while ($fallbackCatalogue) {
-            $fallback = $fallbackCatalogue->getLocale();
-            $fallbackSuffix = ucfirst(preg_replace($replacementPattern, '_', $fallback));
-            $currentSuffix = ucfirst(preg_replace($replacementPattern, '_', $current));
-
-            $fallbackContent .= sprintf(<<<EOF
-\$catalogue%s = new MessageCatalogue('%s', %s);
-\$catalogue%s->addFallbackCatalogue(\$catalogue%s);
-
-EOF
-                ,
-                $fallbackSuffix,
-                $fallback,
-                var_export($fallbackCatalogue->all(), true),
-                $currentSuffix,
-                $fallbackSuffix
-            );
-            $current = $fallbackCatalogue->getLocale();
-            $fallbackCatalogue = $fallbackCatalogue->getFallbackCatalogue();
-        }
-
-        return $fallbackContent;
-    }
-
-    private function getCatalogueCachePath($locale)
-    {
-        return $this->cacheDir.'/catalogue.'.$locale.'.'.sha1(serialize($this->fallbackLocales)).'.php';
-    }
-
-    private function doLoadCatalogue($locale)
-    {
-        $this->catalogues[$locale] = new MessageCatalogue($locale);
-
-        if (isset($this->resources[$locale])) {
-            foreach ($this->resources[$locale] as $resource) {
-                if (!isset($this->loaders[$resource[0]])) {
-                    throw new \RuntimeException(sprintf('The "%s" translation loader is not registered.', $resource[0]));
-                }
-                $this->catalogues[$locale]->addCatalogue($this->loaders[$resource[0]]->load($resource[1], $locale, $resource[2]));
-            }
-        }
-    }
-
-    private function loadFallbackCatalogues($locale)
-    {
-        $current = $this->catalogues[$locale];
-
-        foreach ($this->computeFallbackLocales($locale) as $fallback) {
-            if (!isset($this->catalogues[$fallback])) {
-                $this->doLoadCatalogue($fallback);
-            }
-
-            $fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
-            $current->addFallbackCatalogue($fallbackCatalogue);
-            $current = $fallbackCatalogue;
-        }
-    }
-
-    protected function computeFallbackLocales($locale)
-    {
-        $locales = array();
-        foreach ($this->fallbackLocales as $fallback) {
-            if ($fallback === $locale) {
-                continue;
-            }
-
-            $locales[] = $fallback;
-        }
-
-        if (strrchr($locale, '_') !== false) {
-            array_unshift($locales, substr($locale, 0, -strlen(strrchr($locale, '_'))));
-        }
-
-        return array_unique($locales);
-    }
-
-    /**
-     * Asserts that the locale is valid, throws an Exception if not.
-     *
-     * @param string $locale Locale to tests
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     */
-    protected function assertValidLocale($locale)
-    {
-        if (1 !== preg_match('/^[a-z0-9@_\\.\\-]*$/i', $locale)) {
-            throw new \InvalidArgumentException(sprintf('Invalid "%s" locale.', $locale));
-        }
-    }
-
-    /**
-     * Provides the ConfigCache factory implementation, falling back to a
-     * default implementation if necessary.
-     *
-     * @return ConfigCacheFactoryInterface $configCacheFactory
-     */
-    private function getConfigCacheFactory()
-    {
-        if (!$this->configCacheFactory) {
-            $this->configCacheFactory = new ConfigCacheFactory($this->debug);
-        }
-
-        return $this->configCacheFactory;
-    }
-}
diff --git a/vendor/symfony/translation/TranslatorBagInterface.php b/vendor/symfony/translation/TranslatorBagInterface.php
deleted file mode 100644
index 6f650b5..0000000
--- a/vendor/symfony/translation/TranslatorBagInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * TranslatorBagInterface.
- *
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- */
-interface TranslatorBagInterface
-{
-    /**
-     * Gets the catalogue by locale.
-     *
-     * @param string|null $locale The locale or null to use the default
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     *
-     * @return MessageCatalogueInterface
-     */
-    public function getCatalogue($locale = null);
-}
diff --git a/vendor/symfony/translation/TranslatorInterface.php b/vendor/symfony/translation/TranslatorInterface.php
deleted file mode 100644
index 869e0b9..0000000
--- a/vendor/symfony/translation/TranslatorInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\Translation;
-
-/**
- * TranslatorInterface.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface TranslatorInterface
-{
-    /**
-     * Translates the given message.
-     *
-     * @param string      $id         The message id (may also be an object that can be cast to string)
-     * @param array       $parameters An array of parameters for the message
-     * @param string|null $domain     The domain for the message or null to use the default
-     * @param string|null $locale     The locale or null to use the default
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     *
-     * @return string The translated string
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null);
-
-    /**
-     * Translates the given choice message by choosing a translation according to a number.
-     *
-     * @param string      $id         The message id (may also be an object that can be cast to string)
-     * @param int         $number     The number to use to find the indice of the message
-     * @param array       $parameters An array of parameters for the message
-     * @param string|null $domain     The domain for the message or null to use the default
-     * @param string|null $locale     The locale or null to use the default
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     *
-     * @return string The translated string
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null);
-
-    /**
-     * Sets the current locale.
-     *
-     * @param string $locale The locale
-     *
-     * @throws \InvalidArgumentException If the locale contains invalid characters
-     */
-    public function setLocale($locale);
-
-    /**
-     * Returns the current locale.
-     *
-     * @return string The locale
-     */
-    public function getLocale();
-}
diff --git a/vendor/symfony/translation/Writer/TranslationWriter.php b/vendor/symfony/translation/Writer/TranslationWriter.php
deleted file mode 100644
index 44ac182..0000000
--- a/vendor/symfony/translation/Writer/TranslationWriter.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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\Component\Translation\Writer;
-
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Dumper\DumperInterface;
-
-/**
- * TranslationWriter writes translation messages.
- *
- * @author Michel Salib <michelsalib@hotmail.com>
- */
-class TranslationWriter
-{
-    /**
-     * Dumpers used for export.
-     *
-     * @var array
-     */
-    private $dumpers = array();
-
-    /**
-     * Adds a dumper to the writer.
-     *
-     * @param string          $format The format of the dumper
-     * @param DumperInterface $dumper The dumper
-     */
-    public function addDumper($format, DumperInterface $dumper)
-    {
-        $this->dumpers[$format] = $dumper;
-    }
-
-    /**
-     * Disables dumper backup.
-     */
-    public function disableBackup()
-    {
-        foreach ($this->dumpers as $dumper) {
-            $dumper->setBackup(false);
-        }
-    }
-
-    /**
-     * Obtains the list of supported formats.
-     *
-     * @return array
-     */
-    public function getFormats()
-    {
-        return array_keys($this->dumpers);
-    }
-
-    /**
-     * Writes translation from the catalogue according to the selected format.
-     *
-     * @param MessageCatalogue $catalogue The message catalogue to dump
-     * @param string           $format    The format to use to dump the messages
-     * @param array            $options   Options that are passed to the dumper
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function writeTranslations(MessageCatalogue $catalogue, $format, $options = array())
-    {
-        if (!isset($this->dumpers[$format])) {
-            throw new \InvalidArgumentException(sprintf('There is no dumper associated with format "%s".', $format));
-        }
-
-        // get the right dumper
-        $dumper = $this->dumpers[$format];
-
-        if (isset($options['path']) && !is_dir($options['path'])) {
-            mkdir($options['path'], 0777, true);
-        }
-
-        // save
-        $dumper->dump($catalogue, $options);
-    }
-}
diff --git a/vendor/symfony/translation/composer.json b/vendor/symfony/translation/composer.json
deleted file mode 100644
index ac833a4..0000000
--- a/vendor/symfony/translation/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "symfony/translation",
-    "type": "library",
-    "description": "Symfony Translation Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "require-dev": {
-        "symfony/config": "~2.7",
-        "symfony/intl": "~2.4",
-        "symfony/yaml": "~2.2",
-        "psr/log": "~1.0"
-    },
-    "conflict": {
-        "symfony/config": "<2.7"
-    },
-    "suggest": {
-        "symfony/config": "",
-        "symfony/yaml": "",
-        "psr/log": "To use logging capability in translator"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Translation\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/translation/phpunit.xml.dist b/vendor/symfony/translation/phpunit.xml.dist
deleted file mode 100644
index 16cca4a..0000000
--- a/vendor/symfony/translation/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Translation Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/validator/.gitignore b/vendor/symfony/validator/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/validator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/validator/CHANGELOG.md b/vendor/symfony/validator/CHANGELOG.md
deleted file mode 100644
index 4531286..0000000
--- a/vendor/symfony/validator/CHANGELOG.md
+++ /dev/null
@@ -1,170 +0,0 @@
-CHANGELOG
-=========
-
-2.7.0
------
-
- * deprecated `DefaultTranslator` in favor of `Symfony\Component\Translation\IdentityTranslator`
- * deprecated PHP7-incompatible constraints (Null, True, False) and related validators (NullValidator, TrueValidator, FalseValidator) in favor of their `Is`-prefixed equivalent
-
-2.6.0
------
-
- * [BC BREAK] `FileValidator` disallow empty files
- * [BC BREAK] `UserPasswordValidator` source message change
- * [BC BREAK] added internal `ExecutionContextInterface::setConstraint()`
- * added `ConstraintViolation::getConstraint()`
- * [BC BREAK] The `ExpressionValidator` will now evaluate the Expression even when the property value is null or an empty string
- * deprecated `ClassMetadata::hasMemberMetadatas()`
- * deprecated `ClassMetadata::getMemberMetadatas()`
- * deprecated `ClassMetadata::addMemberMetadata()`
- * [BC BREAK] added `Mapping\MetadataInterface::getConstraints()`
- * added generic "payload" option to all constraints for attaching domain-specific data
- * [BC BREAK] added `ConstraintViolationBuilderInterface::setCause()`
-
-2.5.0
------
-
- * deprecated `ApcCache` in favor of `DoctrineCache`
- * added `DoctrineCache` to adapt any Doctrine cache
- * `GroupSequence` now implements `ArrayAccess`, `Countable` and `Traversable`
- * [BC BREAK] changed `ClassMetadata::getGroupSequence()` to return a `GroupSequence` instance instead of an array
- * `Callback` can now be put onto properties (useful when you pass a closure to the constraint)
- * deprecated `ClassBasedInterface`
- * deprecated `MetadataInterface`
- * deprecated `PropertyMetadataInterface`
- * deprecated `PropertyMetadataContainerInterface`
- * deprecated `Mapping\ElementMetadata`
- * added `Mapping\MetadataInterface`
- * added `Mapping\ClassMetadataInterface`
- * added `Mapping\PropertyMetadataInterface`
- * added `Mapping\GenericMetadata`
- * added `Mapping\CascadingStrategy`
- * added `Mapping\TraversalStrategy`
- * deprecated `Mapping\ClassMetadata::accept()`
- * deprecated `Mapping\MemberMetadata::accept()`
- * removed array type hint of `Mapping\ClassMetadata::setGroupSequence()`
- * deprecated `MetadataFactoryInterface`
- * deprecated `Mapping\BlackholeMetadataFactory`
- * deprecated `Mapping\ClassMetadataFactory`
- * added `Mapping\Factory\MetadataFactoryInterface`
- * added `Mapping\Factory\BlackHoleMetadataFactory`
- * added `Mapping\Factory\LazyLoadingMetadataFactory`
- * deprecated `ExecutionContextInterface`
- * deprecated `ExecutionContext`
- * deprecated `GlobalExecutionContextInterface`
- * added `Context\ExecutionContextInterface`
- * added `Context\ExecutionContext`
- * added `Context\ExecutionContextFactoryInterface`
- * added `Context\ExecutionContextFactory`
- * deprecated `ValidatorInterface`
- * deprecated `Validator`
- * deprecated `ValidationVisitorInterface`
- * deprecated `ValidationVisitor`
- * added `Validator\ValidatorInterface`
- * added `Validator\RecursiveValidator`
- * added `Validator\ContextualValidatorInterface`
- * added `Validator\RecursiveContextualValidator`
- * added `Violation\ConstraintViolationBuilderInterface`
- * added `Violation\ConstraintViolationBuilder`
- * added `ConstraintViolation::getParameters()`
- * added `ConstraintViolation::getPlural()`
- * added `Constraints\Traverse`
- * deprecated `$deep` property in `Constraints\Valid`
- * added `ValidatorBuilderInterface::setApiVersion()`
- * added `Validation::API_VERSION_2_4`
- * added `Validation::API_VERSION_2_5`
- * added `Exception\OutOfBoundsException`
- * added `Exception\UnsupportedMetadataException`
- * made `Exception\ValidatorException` extend `Exception\RuntimeException`
- * added `Util\PropertyPath`
- * made the PropertyAccess component an optional dependency
- * deprecated `ValidatorBuilder::setPropertyAccessor()`
- * deprecated `validate` and `validateValue` on `Validator\Context\ExecutionContext` use `getValidator()` together with `inContext()` instead
-
-2.4.0
------
-
- * added a constraint the uses the expression language
- * added `minRatio`, `maxRatio`, `allowSquare`, `allowLandscape`, and `allowPortrait` to Image validator
-
-2.3.29
-------
-
- * fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
-
-2.3.0
------
-
- * added the ISBN, ISSN, and IBAN validators
- * copied the constraints `Optional` and `Required` to the
-   `Symfony\Component\Validator\Constraints\` namespace and deprecated the original
-   classes.
- * added comparison validators (EqualTo, NotEqualTo, LessThan, LessThanOrEqualTo, GreaterThan, GreaterThanOrEqualTo, IdenticalTo, NotIdenticalTo)
-
-2.2.0
------
-
- * added a CardScheme validator
- * added a Luhn validator
- * moved @api-tags from `Validator` to `ValidatorInterface`
- * moved @api-tags from `ConstraintViolation` to the new `ConstraintViolationInterface`
- * moved @api-tags from `ConstraintViolationList` to the new `ConstraintViolationListInterface`
- * moved @api-tags from `ExecutionContext` to the new `ExecutionContextInterface`
- * [BC BREAK] `ConstraintValidatorInterface::initialize` is now type hinted against `ExecutionContextInterface` instead of `ExecutionContext`
- * [BC BREAK] changed the visibility of the properties in `Validator` from protected to private
- * deprecated `ClassMetadataFactoryInterface` in favor of the new `MetadataFactoryInterface`
- * deprecated `ClassMetadataFactory::getClassMetadata` in favor of `getMetadataFor`
- * created `MetadataInterface`, `PropertyMetadataInterface`, `ClassBasedInterface` and `PropertyMetadataContainerInterface`
- * deprecated `GraphWalker` in favor of the new `ValidationVisitorInterface`
- * deprecated `ExecutionContext::addViolationAtPath`
- * deprecated `ExecutionContext::addViolationAtSubPath` in favor of `ExecutionContextInterface::addViolationAt`
- * deprecated `ExecutionContext::getCurrentClass` in favor of `ExecutionContextInterface::getClassName`
- * deprecated `ExecutionContext::getCurrentProperty` in favor of `ExecutionContextInterface::getPropertyName`
- * deprecated `ExecutionContext::getCurrentValue` in favor of `ExecutionContextInterface::getValue`
- * deprecated `ExecutionContext::getGraphWalker` in favor of `ExecutionContextInterface::validate` and `ExecutionContextInterface::validateValue`
- * improved `ValidatorInterface::validateValue` to accept arrays of constraints
- * changed `ValidatorInterface::getMetadataFactory` to return a `MetadataFactoryInterface` instead of a `ClassMetadataFactoryInterface`
- * removed `ClassMetadataFactoryInterface` type hint from `ValidatorBuilderInterface::setMetadataFactory`.
-   As of Symfony 2.3, this method will be typed against `MetadataFactoryInterface` instead.
- * [BC BREAK] the switches `traverse` and `deep` in the `Valid` constraint and in `GraphWalker::walkReference`
-   are ignored for arrays now. Arrays are always traversed recursively.
- * added dependency to Translation component
- * violation messages are now translated with a TranslatorInterface implementation
- * [BC BREAK] inserted argument `$message` in the constructor of `ConstraintViolation`
- * [BC BREAK] inserted arguments `$translator` and `$translationDomain` in the constructor of `ExecutionContext`
- * [BC BREAK] inserted arguments `$translator` and `$translationDomain` in the constructor of `GraphWalker`
- * [BC BREAK] inserted arguments `$translator` and `$translationDomain` in the constructor of `ValidationVisitor`
- * [BC BREAK] inserted arguments `$translator` and `$translationDomain` in the constructor of `Validator`
- * [BC BREAK] added `setTranslator()` and `setTranslationDomain()` to `ValidatorBuilderInterface`
- * improved the Validator to support pluralized messages by default
- * [BC BREAK] changed the source of all pluralized messages in the translation files to the pluralized version
- * added ExceptionInterface, BadMethodCallException and InvalidArgumentException
-
-2.1.0
------
-
- * added support for `ctype_*` assertions in `TypeValidator`
- * improved the ImageValidator with min width, max width, min height, and max height constraints
- * added support for MIME with wildcard in FileValidator
- * changed Collection validator to add "missing" and "extra" errors to
-   individual fields
- * changed default value for `extraFieldsMessage` and `missingFieldsMessage`
-   in Collection constraint
- * made ExecutionContext immutable
- * deprecated Constraint methods `setMessage`, `getMessageTemplate` and
-   `getMessageParameters`
- * added support for dynamic group sequences with the GroupSequenceProvider pattern
- * [BC BREAK] ConstraintValidatorInterface method `isValid` has been renamed to
-   `validate`, its return value was dropped. ConstraintValidator still contains
-   `isValid` for BC
- * [BC BREAK] collections in fields annotated with `Valid` are not traversed
-   recursively anymore by default. `Valid` contains a new property `deep`
-   which enables the BC behavior.
- * added Count constraint
- * added Length constraint
- * added Range constraint
- * deprecated the Min and Max constraints
- * deprecated the MinLength and MaxLength constraints
- * added Validation and ValidatorBuilderInterface
- * deprecated ValidatorContext, ValidatorContextInterface and ValidatorFactory
diff --git a/vendor/symfony/validator/ClassBasedInterface.php b/vendor/symfony/validator/ClassBasedInterface.php
deleted file mode 100644
index 7c2eb8f..0000000
--- a/vendor/symfony/validator/ClassBasedInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * An object backed by a PHP class.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Mapping\ClassMetadataInterface} instead.
- */
-interface ClassBasedInterface
-{
-    /**
-     * Returns the name of the backing PHP class.
-     *
-     * @return string The name of the backing class.
-     */
-    public function getClassName();
-}
diff --git a/vendor/symfony/validator/Constraint.php b/vendor/symfony/validator/Constraint.php
deleted file mode 100644
index dc93d22..0000000
--- a/vendor/symfony/validator/Constraint.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?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\Component\Validator;
-
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\InvalidArgumentException;
-use Symfony\Component\Validator\Exception\InvalidOptionsException;
-use Symfony\Component\Validator\Exception\MissingOptionsException;
-
-/**
- * Contains the properties of a constraint definition.
- *
- * A constraint can be defined on a class, an option or a getter method.
- * The Constraint class encapsulates all the configuration required for
- * validating this class, option or getter result successfully.
- *
- * Constraint instances are immutable and serializable.
- *
- * @property array $groups The groups that the constraint belongs to
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class Constraint
-{
-    /**
-     * The name of the group given to all constraints with no explicit group.
-     *
-     * @var string
-     */
-    const DEFAULT_GROUP = 'Default';
-
-    /**
-     * Marks a constraint that can be put onto classes.
-     *
-     * @var string
-     */
-    const CLASS_CONSTRAINT = 'class';
-
-    /**
-     * Marks a constraint that can be put onto properties.
-     *
-     * @var string
-     */
-    const PROPERTY_CONSTRAINT = 'property';
-
-    /**
-     * Maps error codes to the names of their constants.
-     *
-     * @var array
-     */
-    protected static $errorNames = array();
-
-    /**
-     * Domain-specific data attached to a constraint.
-     *
-     * @var mixed
-     */
-    public $payload;
-
-    /**
-     * Returns the name of the given error code.
-     *
-     * @param int $errorCode The error code
-     *
-     * @return string The name of the error code
-     *
-     * @throws InvalidArgumentException If the error code does not exist
-     */
-    public static function getErrorName($errorCode)
-    {
-        if (!isset(static::$errorNames[$errorCode])) {
-            throw new InvalidArgumentException(sprintf(
-                'The error code "%s" does not exist for constraint of type "%s".',
-                $errorCode,
-                get_called_class()
-            ));
-        }
-
-        return static::$errorNames[$errorCode];
-    }
-
-    /**
-     * Initializes the constraint with options.
-     *
-     * You should pass an associative array. The keys should be the names of
-     * existing properties in this class. The values should be the value for these
-     * properties.
-     *
-     * Alternatively you can override the method getDefaultOption() to return the
-     * name of an existing property. If no associative array is passed, this
-     * property is set instead.
-     *
-     * You can force that certain options are set by overriding
-     * getRequiredOptions() to return the names of these options. If any
-     * option is not set here, an exception is thrown.
-     *
-     * @param mixed $options The options (as associative array)
-     *                       or the value for the default
-     *                       option (any other type)
-     *
-     * @throws InvalidOptionsException       When you pass the names of non-existing
-     *                                       options
-     * @throws MissingOptionsException       When you don't pass any of the options
-     *                                       returned by getRequiredOptions()
-     * @throws ConstraintDefinitionException When you don't pass an associative
-     *                                       array, but getDefaultOption() returns
-     *                                       null
-     */
-    public function __construct($options = null)
-    {
-        $invalidOptions = array();
-        $missingOptions = array_flip((array) $this->getRequiredOptions());
-        $knownOptions = get_object_vars($this);
-
-        // The "groups" option is added to the object lazily
-        $knownOptions['groups'] = true;
-
-        if (is_array($options) && count($options) >= 1 && isset($options['value']) && !property_exists($this, 'value')) {
-            $options[$this->getDefaultOption()] = $options['value'];
-            unset($options['value']);
-        }
-
-        if (is_array($options) && count($options) > 0 && is_string(key($options))) {
-            foreach ($options as $option => $value) {
-                if (array_key_exists($option, $knownOptions)) {
-                    $this->$option = $value;
-                    unset($missingOptions[$option]);
-                } else {
-                    $invalidOptions[] = $option;
-                }
-            }
-        } elseif (null !== $options && !(is_array($options) && count($options) === 0)) {
-            $option = $this->getDefaultOption();
-
-            if (null === $option) {
-                throw new ConstraintDefinitionException(
-                    sprintf('No default option is configured for constraint %s', get_class($this))
-                );
-            }
-
-            if (array_key_exists($option, $knownOptions)) {
-                $this->$option = $options;
-                unset($missingOptions[$option]);
-            } else {
-                $invalidOptions[] = $option;
-            }
-        }
-
-        if (count($invalidOptions) > 0) {
-            throw new InvalidOptionsException(
-                sprintf('The options "%s" do not exist in constraint %s', implode('", "', $invalidOptions), get_class($this)),
-                $invalidOptions
-            );
-        }
-
-        if (count($missingOptions) > 0) {
-            throw new MissingOptionsException(
-                sprintf('The options "%s" must be set for constraint %s', implode('", "', array_keys($missingOptions)), get_class($this)),
-                array_keys($missingOptions)
-            );
-        }
-    }
-
-    /**
-     * Sets the value of a lazily initialized option.
-     *
-     * Corresponding properties are added to the object on first access. Hence
-     * this method will be called at most once per constraint instance and
-     * option name.
-     *
-     * @param string $option The option name
-     * @param mixed  $value  The value to set
-     *
-     * @throws InvalidOptionsException If an invalid option name is given
-     */
-    public function __set($option, $value)
-    {
-        if ('groups' === $option) {
-            $this->groups = (array) $value;
-
-            return;
-        }
-
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, get_class($this)), array($option));
-    }
-
-    /**
-     * Returns the value of a lazily initialized option.
-     *
-     * Corresponding properties are added to the object on first access. Hence
-     * this method will be called at most once per constraint instance and
-     * option name.
-     *
-     * @param string $option The option name
-     *
-     * @return mixed The value of the option
-     *
-     * @throws InvalidOptionsException If an invalid option name is given
-     *
-     * @internal This method should not be used or overwritten in userland code.
-     *
-     * @since 2.6
-     */
-    public function __get($option)
-    {
-        if ('groups' === $option) {
-            $this->groups = array(self::DEFAULT_GROUP);
-
-            return $this->groups;
-        }
-
-        throw new InvalidOptionsException(sprintf('The option "%s" does not exist in constraint %s', $option, get_class($this)), array($option));
-    }
-
-    /**
-     * Adds the given group if this constraint is in the Default group.
-     *
-     * @param string $group
-     */
-    public function addImplicitGroupName($group)
-    {
-        if (in_array(self::DEFAULT_GROUP, $this->groups) && !in_array($group, $this->groups)) {
-            $this->groups[] = $group;
-        }
-    }
-
-    /**
-     * Returns the name of the default option.
-     *
-     * Override this method to define a default option.
-     *
-     * @return string
-     *
-     * @see __construct()
-     */
-    public function getDefaultOption()
-    {
-    }
-
-    /**
-     * Returns the name of the required options.
-     *
-     * Override this method if you want to define required options.
-     *
-     * @return array
-     *
-     * @see __construct()
-     */
-    public function getRequiredOptions()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the name of the class that validates this constraint.
-     *
-     * By default, this is the fully qualified name of the constraint class
-     * suffixed with "Validator". You can override this method to change that
-     * behaviour.
-     *
-     * @return string
-     */
-    public function validatedBy()
-    {
-        return get_class($this).'Validator';
-    }
-
-    /**
-     * Returns whether the constraint can be put onto classes, properties or
-     * both.
-     *
-     * This method should return one or more of the constants
-     * Constraint::CLASS_CONSTRAINT and Constraint::PROPERTY_CONSTRAINT.
-     *
-     * @return string|array One or more constant values
-     */
-    public function getTargets()
-    {
-        return self::PROPERTY_CONSTRAINT;
-    }
-
-    /**
-     * Optimizes the serialized value to minimize storage space.
-     *
-     * @return array The properties to serialize
-     *
-     * @internal This method may be replaced by an implementation of
-     *           {@link \Serializable} in the future. Please don't use or
-     *           overwrite it.
-     *
-     * @since 2.6
-     */
-    public function __sleep()
-    {
-        // Initialize "groups" option if it is not set
-        $this->groups;
-
-        return array_keys(get_object_vars($this));
-    }
-}
diff --git a/vendor/symfony/validator/ConstraintValidator.php b/vendor/symfony/validator/ConstraintValidator.php
deleted file mode 100644
index df6e86e..0000000
--- a/vendor/symfony/validator/ConstraintValidator.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?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\Component\Validator;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface as ExecutionContextInterface2Dot5;
-use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;
-use Symfony\Component\Validator\Violation\LegacyConstraintViolationBuilder;
-
-/**
- * Base class for constraint validators.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class ConstraintValidator implements ConstraintValidatorInterface
-{
-    /**
-     * Whether to format {@link \DateTime} objects as RFC-3339 dates
-     * ("Y-m-d H:i:s").
-     *
-     * @var int
-     */
-    const PRETTY_DATE = 1;
-
-    /**
-     * Whether to cast objects with a "__toString()" method to strings.
-     *
-     * @var int
-     */
-    const OBJECT_TO_STRING = 2;
-
-    /**
-     * @var ExecutionContextInterface
-     */
-    protected $context;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(ExecutionContextInterface $context)
-    {
-        $this->context = $context;
-    }
-
-    /**
-     * Wrapper for {@link ExecutionContextInterface::buildViolation} that
-     * supports the 2.4 context API.
-     *
-     * @param string $message    The violation message
-     * @param array  $parameters The message parameters
-     *
-     * @return ConstraintViolationBuilderInterface The violation builder
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    protected function buildViolation($message, array $parameters = array())
-    {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if ($this->context instanceof ExecutionContextInterface2Dot5) {
-            return $this->context->buildViolation($message, $parameters);
-        }
-
-        return new LegacyConstraintViolationBuilder($this->context, $message, $parameters);
-    }
-
-    /**
-     * Wrapper for {@link ExecutionContextInterface::buildViolation} that
-     * supports the 2.4 context API.
-     *
-     * @param ExecutionContextInterface $context    The context to use
-     * @param string                    $message    The violation message
-     * @param array                     $parameters The message parameters
-     *
-     * @return ConstraintViolationBuilderInterface The violation builder
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    protected function buildViolationInContext(ExecutionContextInterface $context, $message, array $parameters = array())
-    {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if ($context instanceof ExecutionContextInterface2Dot5) {
-            return $context->buildViolation($message, $parameters);
-        }
-
-        return new LegacyConstraintViolationBuilder($context, $message, $parameters);
-    }
-
-    /**
-     * Returns a string representation of the type of the value.
-     *
-     * This method should be used if you pass the type of a value as
-     * message parameter to a constraint violation. Note that such
-     * parameters should usually not be included in messages aimed at
-     * non-technical people.
-     *
-     * @param mixed $value The value to return the type of
-     *
-     * @return string The type of the value
-     */
-    protected function formatTypeOf($value)
-    {
-        return is_object($value) ? get_class($value) : gettype($value);
-    }
-
-    /**
-     * Returns a string representation of the value.
-     *
-     * This method returns the equivalent PHP tokens for most scalar types
-     * (i.e. "false" for false, "1" for 1 etc.). Strings are always wrapped
-     * in double quotes ("). Objects, arrays and resources are formatted as
-     * "object", "array" and "resource". If the parameter $prettyDateTime
-     * is set to true, {@link \DateTime} objects will be formatted as
-     * RFC-3339 dates ("Y-m-d H:i:s").
-     *
-     * Be careful when passing message parameters to a constraint violation
-     * that (may) contain objects, arrays or resources. These parameters
-     * should only be displayed for technical users. Non-technical users
-     * won't know what an "object", "array" or "resource" is and will be
-     * confused by the violation message.
-     *
-     * @param mixed $value  The value to format as string
-     * @param int   $format A bitwise combination of the format
-     *                      constants in this class
-     *
-     * @return string The string representation of the passed value
-     */
-    protected function formatValue($value, $format = 0)
-    {
-        $isDateTime = $value instanceof \DateTime || $value instanceof \DateTimeInterface;
-
-        if (($format & self::PRETTY_DATE) && $isDateTime) {
-            if (class_exists('IntlDateFormatter')) {
-                $locale = \Locale::getDefault();
-                $formatter = new \IntlDateFormatter($locale, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT);
-
-                // neither the native nor the stub IntlDateFormatter support
-                // DateTimeImmutable as of yet
-                if (!$value instanceof \DateTime) {
-                    $value = new \DateTime(
-                        $value->format('Y-m-d H:i:s.u e'),
-                        $value->getTimezone()
-                    );
-                }
-
-                return $formatter->format($value);
-            }
-
-            return $value->format('Y-m-d H:i:s');
-        }
-
-        if (is_object($value)) {
-            if ($format & self::OBJECT_TO_STRING && method_exists($value, '__toString')) {
-                return $value->__toString();
-            }
-
-            return 'object';
-        }
-
-        if (is_array($value)) {
-            return 'array';
-        }
-
-        if (is_string($value)) {
-            return '"'.$value.'"';
-        }
-
-        if (is_resource($value)) {
-            return 'resource';
-        }
-
-        if (null === $value) {
-            return 'null';
-        }
-
-        if (false === $value) {
-            return 'false';
-        }
-
-        if (true === $value) {
-            return 'true';
-        }
-
-        return (string) $value;
-    }
-
-    /**
-     * Returns a string representation of a list of values.
-     *
-     * Each of the values is converted to a string using
-     * {@link formatValue()}. The values are then concatenated with commas.
-     *
-     * @param array $values A list of values
-     * @param int   $format A bitwise combination of the format
-     *                      constants in this class
-     *
-     * @return string The string representation of the value list
-     *
-     * @see formatValue()
-     */
-    protected function formatValues(array $values, $format = 0)
-    {
-        foreach ($values as $key => $value) {
-            $values[$key] = $this->formatValue($value, $format);
-        }
-
-        return implode(', ', $values);
-    }
-}
diff --git a/vendor/symfony/validator/ConstraintValidatorFactory.php b/vendor/symfony/validator/ConstraintValidatorFactory.php
deleted file mode 100644
index cc6981b..0000000
--- a/vendor/symfony/validator/ConstraintValidatorFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Component\Validator;
-
-use Symfony\Component\Validator\Constraints\ExpressionValidator;
-
-/**
- * Default implementation of the ConstraintValidatorFactoryInterface.
- *
- * This enforces the convention that the validatedBy() method on any
- * Constraint will return the class name of the ConstraintValidator that
- * should validate the Constraint.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
-{
-    protected $validators = array();
-
-    private $propertyAccessor;
-
-    public function __construct($propertyAccessor = null)
-    {
-        $this->propertyAccessor = $propertyAccessor;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInstance(Constraint $constraint)
-    {
-        $className = $constraint->validatedBy();
-
-        if (!isset($this->validators[$className])) {
-            $this->validators[$className] = 'validator.expression' === $className
-                ? new ExpressionValidator($this->propertyAccessor)
-                : new $className();
-        }
-
-        return $this->validators[$className];
-    }
-}
diff --git a/vendor/symfony/validator/ConstraintValidatorFactoryInterface.php b/vendor/symfony/validator/ConstraintValidatorFactoryInterface.php
deleted file mode 100644
index 5e21627..0000000
--- a/vendor/symfony/validator/ConstraintValidatorFactoryInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Specifies an object able to return the correct ConstraintValidatorInterface
- * instance given a Constraint object.
- */
-interface ConstraintValidatorFactoryInterface
-{
-    /**
-     * Given a Constraint, this returns the ConstraintValidatorInterface
-     * object that should be used to verify its validity.
-     *
-     * @param Constraint $constraint The source constraint
-     *
-     * @return ConstraintValidatorInterface
-     */
-    public function getInstance(Constraint $constraint);
-}
diff --git a/vendor/symfony/validator/ConstraintValidatorInterface.php b/vendor/symfony/validator/ConstraintValidatorInterface.php
deleted file mode 100644
index 85fd451..0000000
--- a/vendor/symfony/validator/ConstraintValidatorInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ConstraintValidatorInterface
-{
-    /**
-     * Initializes the constraint validator.
-     *
-     * @param ExecutionContextInterface $context The current validation context
-     */
-    public function initialize(ExecutionContextInterface $context);
-
-    /**
-     * Checks if the passed value is valid.
-     *
-     * @param mixed      $value      The value that should be validated
-     * @param Constraint $constraint The constraint for the validation
-     */
-    public function validate($value, Constraint $constraint);
-}
diff --git a/vendor/symfony/validator/ConstraintViolation.php b/vendor/symfony/validator/ConstraintViolation.php
deleted file mode 100644
index 31b44d2..0000000
--- a/vendor/symfony/validator/ConstraintViolation.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Default implementation of {@ConstraintViolationInterface}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ConstraintViolation implements ConstraintViolationInterface
-{
-    /**
-     * @var string
-     */
-    private $message;
-
-    /**
-     * @var string
-     */
-    private $messageTemplate;
-
-    /**
-     * @var array
-     */
-    private $parameters;
-
-    /**
-     * @var int|null
-     */
-    private $plural;
-
-    /**
-     * @var mixed
-     */
-    private $root;
-
-    /**
-     * @var string
-     */
-    private $propertyPath;
-
-    /**
-     * @var mixed
-     */
-    private $invalidValue;
-
-    /**
-     * @var Constraint|null
-     */
-    private $constraint;
-
-    /**
-     * @var mixed
-     */
-    private $code;
-
-    /**
-     * @var mixed
-     */
-    private $cause;
-
-    /**
-     * Creates a new constraint violation.
-     *
-     * @param string          $message         The violation message
-     * @param string          $messageTemplate The raw violation message
-     * @param array           $parameters      The parameters to substitute in the
-     *                                         raw violation message
-     * @param mixed           $root            The value originally passed to the
-     *                                         validator
-     * @param string          $propertyPath    The property path from the root
-     *                                         value to the invalid value
-     * @param mixed           $invalidValue    The invalid value that caused this
-     *                                         violation
-     * @param int|null        $plural          The number for determining the plural
-     *                                         form when translating the message
-     * @param mixed           $code            The error code of the violation
-     * @param Constraint|null $constraint      The constraint whose validation
-     *                                         caused the violation
-     * @param mixed           $cause           The cause of the violation
-     */
-    public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null, Constraint $constraint = null, $cause = null)
-    {
-        $this->message = $message;
-        $this->messageTemplate = $messageTemplate;
-        $this->parameters = $parameters;
-        $this->plural = $plural;
-        $this->root = $root;
-        $this->propertyPath = $propertyPath;
-        $this->invalidValue = $invalidValue;
-        $this->constraint = $constraint;
-        $this->code = $code;
-        $this->cause = $cause;
-    }
-
-    /**
-     * Converts the violation into a string for debugging purposes.
-     *
-     * @return string The violation as string.
-     */
-    public function __toString()
-    {
-        if (is_object($this->root)) {
-            $class = 'Object('.get_class($this->root).')';
-        } elseif (is_array($this->root)) {
-            $class = 'Array';
-        } else {
-            $class = (string) $this->root;
-        }
-
-        $propertyPath = (string) $this->propertyPath;
-        $code = $this->code;
-
-        if ('' !== $propertyPath && '[' !== $propertyPath[0] && '' !== $class) {
-            $class .= '.';
-        }
-
-        if (!empty($code)) {
-            $code = ' (code '.$code.')';
-        }
-
-        return $class.$propertyPath.":\n    ".$this->getMessage().$code;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMessageTemplate()
-    {
-        return $this->messageTemplate;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.7, to be removed in 3.0.
-     *             Use getParameters() instead
-     */
-    public function getMessageParameters()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getParameters() method instead.', E_USER_DEPRECATED);
-
-        return $this->parameters;
-    }
-
-    /**
-     * Alias of {@link getMessageParameters()}.
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.7, to be removed in 3.0.
-     *             Use getPlural() instead
-     */
-    public function getMessagePluralization()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.7, to be removed in 3.0. Use the ConstraintViolation::getPlural() method instead.', E_USER_DEPRECATED);
-
-        return $this->plural;
-    }
-
-    /**
-     * Alias of {@link getMessagePluralization()}.
-     */
-    public function getPlural()
-    {
-        return $this->plural;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoot()
-    {
-        return $this->root;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyPath()
-    {
-        return $this->propertyPath;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInvalidValue()
-    {
-        return $this->invalidValue;
-    }
-
-    /**
-     * Returns the constraint whose validation caused the violation.
-     *
-     * @return Constraint|null The constraint or null if it is not known
-     */
-    public function getConstraint()
-    {
-        return $this->constraint;
-    }
-
-    /**
-     * Returns the cause of the violation.
-     *
-     * @return mixed
-     */
-    public function getCause()
-    {
-        return $this->cause;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-}
diff --git a/vendor/symfony/validator/ConstraintViolationInterface.php b/vendor/symfony/validator/ConstraintViolationInterface.php
deleted file mode 100644
index 1ed09b3..0000000
--- a/vendor/symfony/validator/ConstraintViolationInterface.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * A violation of a constraint that happened during validation.
- *
- * For each constraint that fails during validation one or more violations are
- * created. The violations store the violation message, the path to the failing
- * element in the validation graph and the root element that was originally
- * passed to the validator. For example, take the following graph:
- *
- * <pre>
- * (Person)---(firstName: string)
- *      \
- *   (address: Address)---(street: string)
- * </pre>
- *
- * If the <tt>Person</tt> object is validated and validation fails for the
- * "firstName" property, the generated violation has the <tt>Person</tt>
- * instance as root and the property path "firstName". If validation fails
- * for the "street" property of the related <tt>Address</tt> instance, the root
- * element is still the person, but the property path is "address.street".
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ConstraintViolationInterface
-{
-    /**
-     * Returns the violation message.
-     *
-     * @return string The violation message.
-     */
-    public function getMessage();
-
-    /**
-     * Returns the raw violation message.
-     *
-     * The raw violation message contains placeholders for the parameters
-     * returned by {@link getMessageParameters}. Typically you'll pass the
-     * message template and parameters to a translation engine.
-     *
-     * @return string The raw violation message.
-     */
-    public function getMessageTemplate();
-
-    /**
-     * Returns the parameters to be inserted into the raw violation message.
-     *
-     * @return array A possibly empty list of parameters indexed by the names
-     *               that appear in the message template.
-     *
-     * @see getMessageTemplate()
-     *
-     * @deprecated since version 2.7, to be replaced by getParameters() in 3.0.
-     */
-    public function getMessageParameters();
-
-    /**
-     * Returns a number for pluralizing the violation message.
-     *
-     * For example, the message template could have different translation based
-     * on a parameter "choices":
-     *
-     * <ul>
-     * <li>Please select exactly one entry. (choices=1)</li>
-     * <li>Please select two entries. (choices=2)</li>
-     * </ul>
-     *
-     * This method returns the value of the parameter for choosing the right
-     * pluralization form (in this case "choices").
-     *
-     * @return int|null The number to use to pluralize of the message.
-     *
-     * @deprecated since version 2.7, to be replaced by getPlural() in 3.0.
-     */
-    public function getMessagePluralization();
-
-    /**
-     * Returns the root element of the validation.
-     *
-     * @return mixed The value that was passed originally to the validator when
-     *               the validation was started. Because the validator traverses
-     *               the object graph, the value at which the violation occurs
-     *               is not necessarily the value that was originally validated.
-     */
-    public function getRoot();
-
-    /**
-     * Returns the property path from the root element to the violation.
-     *
-     * @return string The property path indicates how the validator reached
-     *                the invalid value from the root element. If the root
-     *                element is a <tt>Person</tt> instance with a property
-     *                "address" that contains an <tt>Address</tt> instance
-     *                with an invalid property "street", the generated property
-     *                path is "address.street". Property access is denoted by
-     *                dots, while array access is denoted by square brackets,
-     *                for example "addresses[1].street".
-     */
-    public function getPropertyPath();
-
-    /**
-     * Returns the value that caused the violation.
-     *
-     * @return mixed The invalid value that caused the validated constraint to
-     *               fail.
-     */
-    public function getInvalidValue();
-
-    /**
-     * Returns a machine-digestible error code for the violation.
-     *
-     * @return mixed The error code.
-     */
-    public function getCode();
-}
diff --git a/vendor/symfony/validator/ConstraintViolationList.php b/vendor/symfony/validator/ConstraintViolationList.php
deleted file mode 100644
index cccfa86..0000000
--- a/vendor/symfony/validator/ConstraintViolationList.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Default implementation of {@ConstraintViolationListInterface}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ConstraintViolationList implements \IteratorAggregate, ConstraintViolationListInterface
-{
-    /**
-     * @var ConstraintViolationInterface[]
-     */
-    private $violations = array();
-
-    /**
-     * Creates a new constraint violation list.
-     *
-     * @param ConstraintViolationInterface[] $violations The constraint violations to add to the list
-     */
-    public function __construct(array $violations = array())
-    {
-        foreach ($violations as $violation) {
-            $this->add($violation);
-        }
-    }
-
-    /**
-     * Converts the violation into a string for debugging purposes.
-     *
-     * @return string The violation as string.
-     */
-    public function __toString()
-    {
-        $string = '';
-
-        foreach ($this->violations as $violation) {
-            $string .= $violation."\n";
-        }
-
-        return $string;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add(ConstraintViolationInterface $violation)
-    {
-        $this->violations[] = $violation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addAll(ConstraintViolationListInterface $otherList)
-    {
-        foreach ($otherList as $violation) {
-            $this->violations[] = $violation;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get($offset)
-    {
-        if (!isset($this->violations[$offset])) {
-            throw new \OutOfBoundsException(sprintf('The offset "%s" does not exist.', $offset));
-        }
-
-        return $this->violations[$offset];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($offset)
-    {
-        return isset($this->violations[$offset]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($offset, ConstraintViolationInterface $violation)
-    {
-        $this->violations[$offset] = $violation;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove($offset)
-    {
-        unset($this->violations[$offset]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->violations);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function count()
-    {
-        return count($this->violations);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetExists($offset)
-    {
-        return $this->has($offset);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetGet($offset)
-    {
-        return $this->get($offset);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetSet($offset, $violation)
-    {
-        if (null === $offset) {
-            $this->add($violation);
-        } else {
-            $this->set($offset, $violation);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function offsetUnset($offset)
-    {
-        $this->remove($offset);
-    }
-}
diff --git a/vendor/symfony/validator/ConstraintViolationListInterface.php b/vendor/symfony/validator/ConstraintViolationListInterface.php
deleted file mode 100644
index 8d15bd7..0000000
--- a/vendor/symfony/validator/ConstraintViolationListInterface.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * A list of constraint violations.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ConstraintViolationListInterface extends \Traversable, \Countable, \ArrayAccess
-{
-    /**
-     * Adds a constraint violation to this list.
-     *
-     * @param ConstraintViolationInterface $violation The violation to add.
-     */
-    public function add(ConstraintViolationInterface $violation);
-
-    /**
-     * Merges an existing violation list into this list.
-     *
-     * @param ConstraintViolationListInterface $otherList The list to merge.
-     */
-    public function addAll(ConstraintViolationListInterface $otherList);
-
-    /**
-     * Returns the violation at a given offset.
-     *
-     * @param int $offset The offset of the violation.
-     *
-     * @return ConstraintViolationInterface The violation.
-     *
-     * @throws \OutOfBoundsException If the offset does not exist.
-     */
-    public function get($offset);
-
-    /**
-     * Returns whether the given offset exists.
-     *
-     * @param int $offset The violation offset.
-     *
-     * @return bool Whether the offset exists.
-     */
-    public function has($offset);
-
-    /**
-     * Sets a violation at a given offset.
-     *
-     * @param int                          $offset    The violation offset.
-     * @param ConstraintViolationInterface $violation The violation.
-     */
-    public function set($offset, ConstraintViolationInterface $violation);
-
-    /**
-     * Removes a violation at a given offset.
-     *
-     * @param int $offset The offset to remove.
-     */
-    public function remove($offset);
-}
diff --git a/vendor/symfony/validator/Constraints/AbstractComparison.php b/vendor/symfony/validator/Constraints/AbstractComparison.php
deleted file mode 100644
index fb1f1f3..0000000
--- a/vendor/symfony/validator/Constraints/AbstractComparison.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * Used for the comparison of values.
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-abstract class AbstractComparison extends Constraint
-{
-    public $message;
-    public $value;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        if (is_array($options) && !isset($options['value'])) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The %s constraint requires the "value" option to be set.',
-                get_class($this)
-            ));
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'value';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php b/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php
deleted file mode 100644
index 67d73a5..0000000
--- a/vendor/symfony/validator/Constraints/AbstractComparisonValidator.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Provides a base class for the validation of property comparisons.
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class AbstractComparisonValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof AbstractComparison) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\AbstractComparison');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        $comparedValue = $constraint->value;
-
-        // Convert strings to DateTimes if comparing another DateTime
-        // This allows to compare with any date/time value supported by
-        // the DateTime constructor:
-        // http://php.net/manual/en/datetime.formats.php
-        if (is_string($comparedValue)) {
-            if ($value instanceof \DatetimeImmutable) {
-                // If $value is immutable, convert the compared value to a
-                // DateTimeImmutable too
-                $comparedValue = new \DatetimeImmutable($comparedValue);
-            } elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
-                // Otherwise use DateTime
-                $comparedValue = new \DateTime($comparedValue);
-            }
-        }
-
-        if (!$this->compareValues($value, $comparedValue)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
-                    ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE))
-                    ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
-                    ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE))
-                    ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue))
-                    ->addViolation();
-            }
-        }
-    }
-
-    /**
-     * Compares the two given values to find if their relationship is valid.
-     *
-     * @param mixed $value1 The first value to compare
-     * @param mixed $value2 The second value to compare
-     *
-     * @return bool true if the relationship is valid, false otherwise
-     */
-    abstract protected function compareValues($value1, $value2);
-}
diff --git a/vendor/symfony/validator/Constraints/All.php b/vendor/symfony/validator/Constraints/All.php
deleted file mode 100644
index b531a1d..0000000
--- a/vendor/symfony/validator/Constraints/All.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class All extends Composite
-{
-    public $constraints = array();
-
-    public function getDefaultOption()
-    {
-        return 'constraints';
-    }
-
-    public function getRequiredOptions()
-    {
-        return array('constraints');
-    }
-
-    protected function getCompositeOption()
-    {
-        return 'constraints';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/AllValidator.php b/vendor/symfony/validator/Constraints/AllValidator.php
deleted file mode 100644
index 94ff819..0000000
--- a/vendor/symfony/validator/Constraints/AllValidator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class AllValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof All) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\All');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if (!is_array($value) && !$value instanceof \Traversable) {
-            throw new UnexpectedTypeException($value, 'array or Traversable');
-        }
-
-        $context = $this->context;
-
-        if ($context instanceof ExecutionContextInterface) {
-            $validator = $context->getValidator()->inContext($context);
-
-            foreach ($value as $key => $element) {
-                $validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
-            }
-        } else {
-            // 2.4 API
-            foreach ($value as $key => $element) {
-                $context->validateValue($element, $constraint->constraints, '['.$key.']');
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Blank.php b/vendor/symfony/validator/Constraints/Blank.php
deleted file mode 100644
index ad93c74..0000000
--- a/vendor/symfony/validator/Constraints/Blank.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Blank extends Constraint
-{
-    public $message = 'This value should be blank.';
-}
diff --git a/vendor/symfony/validator/Constraints/BlankValidator.php b/vendor/symfony/validator/Constraints/BlankValidator.php
deleted file mode 100644
index de4b49b..0000000
--- a/vendor/symfony/validator/Constraints/BlankValidator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class BlankValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Blank) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Blank');
-        }
-
-        if ('' !== $value && null !== $value) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Callback.php b/vendor/symfony/validator/Constraints/Callback.php
deleted file mode 100644
index bef94dd..0000000
--- a/vendor/symfony/validator/Constraints/Callback.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"CLASS", "PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Callback extends Constraint
-{
-    /**
-     * @var string|callable
-     *
-     * @since 2.4
-     */
-    public $callback;
-
-    /**
-     * @var array
-     *
-     * @deprecated since version 2.4, to be removed in 3.0.
-     */
-    public $methods;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        // Invocation through annotations with an array parameter only
-        if (is_array($options) && 1 === count($options) && isset($options['value'])) {
-            $options = $options['value'];
-        }
-
-        if (is_array($options) && isset($options['methods'])) {
-            @trigger_error('The "methods" option of the '.__CLASS__.' class is deprecated since version 2.4 and will be removed in 3.0. Use the "callback" option instead.', E_USER_DEPRECATED);
-        }
-
-        if (is_array($options) && !isset($options['callback']) && !isset($options['methods']) && !isset($options['groups'])) {
-            if (is_callable($options) || !$options) {
-                $options = array('callback' => $options);
-            } else {
-                // @deprecated, to be removed in 3.0
-                $options = array('methods' => $options);
-            }
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'callback';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTargets()
-    {
-        return array(self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT);
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/CallbackValidator.php b/vendor/symfony/validator/Constraints/CallbackValidator.php
deleted file mode 100644
index df49204..0000000
--- a/vendor/symfony/validator/Constraints/CallbackValidator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validator for Callback constraint.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class CallbackValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($object, Constraint $constraint)
-    {
-        if (!$constraint instanceof Callback) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Callback');
-        }
-
-        if (null !== $constraint->callback && null !== $constraint->methods) {
-            throw new ConstraintDefinitionException(
-                'The Callback constraint supports either the option "callback" '.
-                'or "methods", but not both at the same time.'
-            );
-        }
-
-        // has to be an array so that we can differentiate between callables
-        // and method names
-        if (null !== $constraint->methods && !is_array($constraint->methods)) {
-            throw new UnexpectedTypeException($constraint->methods, 'array');
-        }
-
-        $methods = $constraint->methods ?: array($constraint->callback);
-
-        foreach ($methods as $method) {
-            if ($method instanceof \Closure) {
-                $method($object, $this->context);
-            } elseif (is_array($method)) {
-                if (!is_callable($method)) {
-                    if (isset($method[0]) && is_object($method[0])) {
-                        $method[0] = get_class($method[0]);
-                    }
-                    throw new ConstraintDefinitionException(sprintf('%s targeted by Callback constraint is not a valid callable', json_encode($method)));
-                }
-
-                call_user_func($method, $object, $this->context);
-            } elseif (null !== $object) {
-                if (!method_exists($object, $method)) {
-                    throw new ConstraintDefinitionException(sprintf('Method "%s" targeted by Callback constraint does not exist in class %s', $method, get_class($object)));
-                }
-
-                $reflMethod = new \ReflectionMethod($object, $method);
-
-                if ($reflMethod->isStatic()) {
-                    $reflMethod->invoke(null, $object, $this->context);
-                } else {
-                    $reflMethod->invoke($object, $this->context);
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/CardScheme.php b/vendor/symfony/validator/Constraints/CardScheme.php
deleted file mode 100644
index 14f3b5d..0000000
--- a/vendor/symfony/validator/Constraints/CardScheme.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * Metadata for the CardSchemeValidator.
- *
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Tim Nagel <t.nagel@infinite.net.au>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class CardScheme extends Constraint
-{
-    const NOT_NUMERIC_ERROR = 1;
-    const INVALID_FORMAT_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::NOT_NUMERIC_ERROR => 'NOT_NUMERIC_ERROR',
-        self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-    );
-
-    public $message = 'Unsupported card type or invalid card number.';
-    public $schemes;
-
-    public function getDefaultOption()
-    {
-        return 'schemes';
-    }
-
-    public function getRequiredOptions()
-    {
-        return array('schemes');
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/CardSchemeValidator.php b/vendor/symfony/validator/Constraints/CardSchemeValidator.php
deleted file mode 100644
index 229e0d2..0000000
--- a/vendor/symfony/validator/Constraints/CardSchemeValidator.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates that a card number belongs to a specified scheme.
- *
- * @author Tim Nagel <t.nagel@infinite.net.au>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see http://en.wikipedia.org/wiki/Bank_card_number
- * @see http://www.regular-expressions.info/creditcard.html
- * @see http://www.barclaycard.co.uk/business/files/Ranges_and_Rules_September_2014.pdf
- */
-class CardSchemeValidator extends ConstraintValidator
-{
-    protected $schemes = array(
-        // American Express card numbers start with 34 or 37 and have 15 digits.
-        'AMEX' => array(
-            '/^3[47][0-9]{13}$/',
-        ),
-        // China UnionPay cards start with 62 and have between 16 and 19 digits.
-        // Please note that these cards do not follow Luhn Algorithm as a checksum.
-        'CHINA_UNIONPAY' => array(
-            '/^62[0-9]{14,17}$/',
-        ),
-        // Diners Club card numbers begin with 300 through 305, 36 or 38. All have 14 digits.
-        // There are Diners Club cards that begin with 5 and have 16 digits.
-        // These are a joint venture between Diners Club and MasterCard, and should be processed like a MasterCard.
-        'DINERS' => array(
-            '/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/',
-        ),
-        // Discover card numbers begin with 6011, 622126 through 622925, 644 through 649 or 65.
-        // All have 16 digits.
-        'DISCOVER' => array(
-            '/^6011[0-9]{12}$/',
-            '/^64[4-9][0-9]{13}$/',
-            '/^65[0-9]{14}$/',
-            '/^622(12[6-9]|1[3-9][0-9]|[2-8][0-9][0-9]|91[0-9]|92[0-5])[0-9]{10}$/',
-        ),
-        // InstaPayment cards begin with 637 through 639 and have 16 digits.
-        'INSTAPAYMENT' => array(
-            '/^63[7-9][0-9]{13}$/',
-        ),
-        // JCB cards beginning with 2131 or 1800 have 15 digits.
-        // JCB cards beginning with 35 have 16 digits.
-        'JCB' => array(
-            '/^(?:2131|1800|35[0-9]{3})[0-9]{11}$/',
-        ),
-        // Laser cards begin with either 6304, 6706, 6709 or 6771 and have between 16 and 19 digits.
-        'LASER' => array(
-            '/^(6304|670[69]|6771)[0-9]{12,15}$/',
-        ),
-        // Maestro international cards begin with 675900..675999 and have between 12 and 19 digits.
-        // Maestro UK cards begin with either 500000..509999 or 560000..699999 and have between 12 and 19 digits.
-        'MAESTRO' => array(
-            '/^(6759[0-9]{2})[0-9]{6,13}$/',
-            '/^(50[0-9]{4})[0-9]{6,13}$/',
-            '/^5[6-9][0-9]{10,17}$/',
-            '/^6[0-9]{11,18}$/',
-        ),
-        // All MasterCard numbers start with the numbers 51 through 55. All have 16 digits.
-        'MASTERCARD' => array(
-            '/^5[1-5][0-9]{14}$/',
-        ),
-        // All Visa card numbers start with a 4. New cards have 16 digits. Old cards have 13.
-        'VISA' => array(
-            '/^4([0-9]{12}|[0-9]{15})$/',
-        ),
-    );
-
-    /**
-     * Validates a creditcard belongs to a specified scheme.
-     *
-     * @param mixed      $value
-     * @param Constraint $constraint
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof CardScheme) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\CardScheme');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_numeric($value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(CardScheme::NOT_NUMERIC_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(CardScheme::NOT_NUMERIC_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $schemes = array_flip((array) $constraint->schemes);
-        $schemeRegexes = array_intersect_key($this->schemes, $schemes);
-
-        foreach ($schemeRegexes as $regexes) {
-            foreach ($regexes as $regex) {
-                if (preg_match($regex, $value)) {
-                    return;
-                }
-            }
-        }
-
-        if ($this->context instanceof ExecutionContextInterface) {
-            $this->context->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->setCode(CardScheme::INVALID_FORMAT_ERROR)
-                ->addViolation();
-        } else {
-            $this->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->setCode(CardScheme::INVALID_FORMAT_ERROR)
-                ->addViolation();
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Choice.php b/vendor/symfony/validator/Constraints/Choice.php
deleted file mode 100644
index 4e2c8e7..0000000
--- a/vendor/symfony/validator/Constraints/Choice.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Choice extends Constraint
-{
-    const NO_SUCH_CHOICE_ERROR = 1;
-    const TOO_FEW_ERROR = 2;
-    const TOO_MANY_ERROR = 3;
-
-    protected static $errorNames = array(
-        self::NO_SUCH_CHOICE_ERROR => 'NO_SUCH_CHOICE_ERROR',
-        self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
-        self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
-    );
-
-    public $choices;
-    public $callback;
-    public $multiple = false;
-    public $strict = false;
-    public $min;
-    public $max;
-    public $message = 'The value you selected is not a valid choice.';
-    public $multipleMessage = 'One or more of the given values is invalid.';
-    public $minMessage = 'You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.';
-    public $maxMessage = 'You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'choices';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/ChoiceValidator.php b/vendor/symfony/validator/Constraints/ChoiceValidator.php
deleted file mode 100644
index 83cfc6e..0000000
--- a/vendor/symfony/validator/Constraints/ChoiceValidator.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * ChoiceValidator validates that the value is one of the expected values.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Florian Eckerstorfer <florian@eckerstorfer.org>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ChoiceValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Choice) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Choice');
-        }
-
-        if (!is_array($constraint->choices) && !$constraint->callback) {
-            throw new ConstraintDefinitionException('Either "choices" or "callback" must be specified on constraint Choice');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if ($constraint->multiple && !is_array($value)) {
-            throw new UnexpectedTypeException($value, 'array');
-        }
-
-        if ($constraint->callback) {
-            if (!is_callable($choices = array($this->context->getClassName(), $constraint->callback))
-                && !is_callable($choices = $constraint->callback)
-            ) {
-                throw new ConstraintDefinitionException('The Choice constraint expects a valid callback');
-            }
-            $choices = call_user_func($choices);
-        } else {
-            $choices = $constraint->choices;
-        }
-
-        if ($constraint->multiple) {
-            foreach ($value as $_value) {
-                if (!in_array($_value, $choices, $constraint->strict)) {
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->multipleMessage)
-                            ->setParameter('{{ value }}', $this->formatValue($_value))
-                            ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
-                            ->setInvalidValue($_value)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->multipleMessage)
-                            ->setParameter('{{ value }}', $this->formatValue($_value))
-                            ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
-                            ->setInvalidValue($_value)
-                            ->addViolation();
-                    }
-
-                    return;
-                }
-            }
-
-            $count = count($value);
-
-            if ($constraint->min !== null && $count < $constraint->min) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->minMessage)
-                        ->setParameter('{{ limit }}', $constraint->min)
-                        ->setPlural((int) $constraint->min)
-                        ->setCode(Choice::TOO_FEW_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->minMessage)
-                        ->setParameter('{{ limit }}', $constraint->min)
-                        ->setPlural((int) $constraint->min)
-                        ->setCode(Choice::TOO_FEW_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-
-            if ($constraint->max !== null && $count > $constraint->max) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->maxMessage)
-                        ->setParameter('{{ limit }}', $constraint->max)
-                        ->setPlural((int) $constraint->max)
-                        ->setCode(Choice::TOO_MANY_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->maxMessage)
-                        ->setParameter('{{ limit }}', $constraint->max)
-                        ->setPlural((int) $constraint->max)
-                        ->setCode(Choice::TOO_MANY_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        } elseif (!in_array($value, $choices, $constraint->strict)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Choice::NO_SUCH_CHOICE_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Collection.php b/vendor/symfony/validator/Constraints/Collection.php
deleted file mode 100644
index ae55366..0000000
--- a/vendor/symfony/validator/Constraints/Collection.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Collection extends Composite
-{
-    const MISSING_FIELD_ERROR = 1;
-    const NO_SUCH_FIELD_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::MISSING_FIELD_ERROR => 'MISSING_FIELD_ERROR',
-        self::NO_SUCH_FIELD_ERROR => 'NO_SUCH_FIELD_ERROR',
-    );
-
-    public $fields = array();
-    public $allowExtraFields = false;
-    public $allowMissingFields = false;
-    public $extraFieldsMessage = 'This field was not expected.';
-    public $missingFieldsMessage = 'This field is missing.';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        // no known options set? $options is the fields array
-        if (is_array($options)
-            && !array_intersect(array_keys($options), array('groups', 'fields', 'allowExtraFields', 'allowMissingFields', 'extraFieldsMessage', 'missingFieldsMessage'))) {
-            $options = array('fields' => $options);
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initializeNestedConstraints()
-    {
-        parent::initializeNestedConstraints();
-
-        if (!is_array($this->fields)) {
-            throw new ConstraintDefinitionException(sprintf('The option "fields" is expected to be an array in constraint %s', __CLASS__));
-        }
-
-        foreach ($this->fields as $fieldName => $field) {
-            // the XmlFileLoader and YamlFileLoader pass the field Optional
-            // and Required constraint as an array with exactly one element
-            if (is_array($field) && count($field) == 1) {
-                $this->fields[$fieldName] = $field = $field[0];
-            }
-
-            if (!$field instanceof Optional && !$field instanceof Required) {
-                $this->fields[$fieldName] = $field = new Required($field);
-            }
-        }
-    }
-
-    public function getRequiredOptions()
-    {
-        return array('fields');
-    }
-
-    protected function getCompositeOption()
-    {
-        return 'fields';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Collection/Optional.php b/vendor/symfony/validator/Constraints/Collection/Optional.php
deleted file mode 100644
index 68471f9..0000000
--- a/vendor/symfony/validator/Constraints/Collection/Optional.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator\Constraints\Collection;
-
-@trigger_error('The '.__NAMESPACE__.'\Optional class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Optional class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\Constraints\Optional as BaseOptional;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.3, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Validator\Constraints\Optional} instead.
- */
-class Optional extends BaseOptional
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Collection/Required.php b/vendor/symfony/validator/Constraints/Collection/Required.php
deleted file mode 100644
index 4b062bb..0000000
--- a/vendor/symfony/validator/Constraints/Collection/Required.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator\Constraints\Collection;
-
-@trigger_error('The '.__NAMESPACE__.'\Required class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Validator\Constraints\Required class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\Constraints\Required as BaseRequired;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.3, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Validator\Constraints\Required} instead.
- */
-class Required extends BaseRequired
-{
-}
diff --git a/vendor/symfony/validator/Constraints/CollectionValidator.php b/vendor/symfony/validator/Constraints/CollectionValidator.php
deleted file mode 100644
index 737e880..0000000
--- a/vendor/symfony/validator/Constraints/CollectionValidator.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class CollectionValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Collection) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Collection');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if (!is_array($value) && !($value instanceof \Traversable && $value instanceof \ArrayAccess)) {
-            throw new UnexpectedTypeException($value, 'array or Traversable and ArrayAccess');
-        }
-
-        // We need to keep the initialized context when CollectionValidator
-        // calls itself recursively (Collection constraints can be nested).
-        // Since the context of the validator is overwritten when initialize()
-        // is called for the nested constraint, the outer validator is
-        // acting on the wrong context when the nested validation terminates.
-        //
-        // A better solution - which should be approached in Symfony 3.0 - is to
-        // remove the initialize() method and pass the context as last argument
-        // to validate() instead.
-        $context = $this->context;
-
-        foreach ($constraint->fields as $field => $fieldConstraint) {
-            // bug fix issue #2779
-            $existsInArray = is_array($value) && array_key_exists($field, $value);
-            $existsInArrayAccess = $value instanceof \ArrayAccess && $value->offsetExists($field);
-
-            if ($existsInArray || $existsInArrayAccess) {
-                if (count($fieldConstraint->constraints) > 0) {
-                    if ($context instanceof ExecutionContextInterface) {
-                        $context->getValidator()
-                            ->inContext($context)
-                            ->atPath('['.$field.']')
-                            ->validate($value[$field], $fieldConstraint->constraints);
-                    } else {
-                        // 2.4 API
-                        $context->validateValue($value[$field], $fieldConstraint->constraints, '['.$field.']');
-                    }
-                }
-            } elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
-                if ($context instanceof ExecutionContextInterface) {
-                    $context->buildViolation($constraint->missingFieldsMessage)
-                        ->atPath('['.$field.']')
-                        ->setParameter('{{ field }}', $this->formatValue($field))
-                        ->setInvalidValue(null)
-                        ->setCode(Collection::MISSING_FIELD_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolationInContext($context, $constraint->missingFieldsMessage)
-                        ->atPath('['.$field.']')
-                        ->setParameter('{{ field }}', $this->formatValue($field))
-                        ->setInvalidValue(null)
-                        ->setCode(Collection::MISSING_FIELD_ERROR)
-                        ->addViolation();
-                }
-            }
-        }
-
-        if (!$constraint->allowExtraFields) {
-            foreach ($value as $field => $fieldValue) {
-                if (!isset($constraint->fields[$field])) {
-                    if ($context instanceof ExecutionContextInterface) {
-                        $context->buildViolation($constraint->extraFieldsMessage)
-                            ->atPath('['.$field.']')
-                            ->setParameter('{{ field }}', $this->formatValue($field))
-                            ->setInvalidValue($fieldValue)
-                            ->setCode(Collection::NO_SUCH_FIELD_ERROR)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolationInContext($context, $constraint->extraFieldsMessage)
-                            ->atPath('['.$field.']')
-                            ->setParameter('{{ field }}', $this->formatValue($field))
-                            ->setInvalidValue($fieldValue)
-                            ->setCode(Collection::NO_SUCH_FIELD_ERROR)
-                            ->addViolation();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Composite.php b/vendor/symfony/validator/Constraints/Composite.php
deleted file mode 100644
index 90c9862..0000000
--- a/vendor/symfony/validator/Constraints/Composite.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * A constraint that is composed of other constraints.
- *
- * You should never use the nested constraint instances anywhere else, because
- * their groups are adapted when passed to the constructor of this class.
- *
- * If you want to create your own composite constraint, extend this class and
- * let {@link getCompositeOption()} return the name of the property which
- * contains the nested constraints.
- *
- * @since  2.6
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class Composite extends Constraint
-{
-    /**
-     * {@inheritdoc}
-     *
-     * The groups of the composite and its nested constraints are made
-     * consistent using the following strategy:
-     *
-     *   - If groups are passed explicitly to the composite constraint, but
-     *     not to the nested constraints, the options of the composite
-     *     constraint are copied to the nested constraints;
-     *
-     *   - If groups are passed explicitly to the nested constraints, but not
-     *     to the composite constraint, the groups of all nested constraints
-     *     are merged and used as groups for the composite constraint;
-     *
-     *   - If groups are passed explicitly to both the composite and its nested
-     *     constraints, the groups of the nested constraints must be a subset
-     *     of the groups of the composite constraint. If not, a
-     *     {@link ConstraintDefinitionException} is thrown.
-     *
-     * All this is done in the constructor, because constraints can then be
-     * cached. When constraints are loaded from the cache, no more group
-     * checks need to be done.
-     */
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-
-        $this->initializeNestedConstraints();
-
-        /* @var Constraint[] $nestedConstraints */
-        $compositeOption = $this->getCompositeOption();
-        $nestedConstraints = $this->$compositeOption;
-
-        if (!is_array($nestedConstraints)) {
-            $nestedConstraints = array($nestedConstraints);
-        }
-
-        foreach ($nestedConstraints as $constraint) {
-            if (!$constraint instanceof Constraint) {
-                throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, get_class($this)));
-            }
-
-            if ($constraint instanceof Valid) {
-                throw new ConstraintDefinitionException(sprintf('The constraint Valid cannot be nested inside constraint %s. You can only declare the Valid constraint directly on a field or method.', get_class($this)));
-            }
-        }
-
-        if (!property_exists($this, 'groups')) {
-            $mergedGroups = array();
-
-            foreach ($nestedConstraints as $constraint) {
-                foreach ($constraint->groups as $group) {
-                    $mergedGroups[$group] = true;
-                }
-            }
-
-            $this->groups = array_keys($mergedGroups);
-            $this->$compositeOption = $nestedConstraints;
-
-            return;
-        }
-
-        foreach ($nestedConstraints as $constraint) {
-            if (property_exists($constraint, 'groups')) {
-                $excessGroups = array_diff($constraint->groups, $this->groups);
-
-                if (count($excessGroups) > 0) {
-                    throw new ConstraintDefinitionException(sprintf(
-                        'The group(s) "%s" passed to the constraint %s '.
-                        'should also be passed to its containing constraint %s',
-                        implode('", "', $excessGroups),
-                        get_class($constraint),
-                        get_class($this)
-                    ));
-                }
-            } else {
-                $constraint->groups = $this->groups;
-            }
-        }
-
-        $this->$compositeOption = $nestedConstraints;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Implicit group names are forwarded to nested constraints.
-     *
-     * @param string $group
-     */
-    public function addImplicitGroupName($group)
-    {
-        parent::addImplicitGroupName($group);
-
-        /** @var Constraint[] $nestedConstraints */
-        $nestedConstraints = $this->{$this->getCompositeOption()};
-
-        foreach ($nestedConstraints as $constraint) {
-            $constraint->addImplicitGroupName($group);
-        }
-    }
-
-    /**
-     * Returns the name of the property that contains the nested constraints.
-     *
-     * @return string The property name
-     */
-    abstract protected function getCompositeOption();
-
-    /**
-     * Initializes the nested constraints.
-     *
-     * This method can be overwritten in subclasses to clean up the nested
-     * constraints passed to the constructor.
-     *
-     * @see Collection::initializeNestedConstraints()
-     */
-    protected function initializeNestedConstraints()
-    {
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Count.php b/vendor/symfony/validator/Constraints/Count.php
deleted file mode 100644
index 3378227..0000000
--- a/vendor/symfony/validator/Constraints/Count.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\MissingOptionsException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Count extends Constraint
-{
-    const TOO_FEW_ERROR = 1;
-    const TOO_MANY_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::TOO_FEW_ERROR => 'TOO_FEW_ERROR',
-        self::TOO_MANY_ERROR => 'TOO_MANY_ERROR',
-    );
-
-    public $minMessage = 'This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.';
-    public $maxMessage = 'This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.';
-    public $exactMessage = 'This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.';
-    public $min;
-    public $max;
-
-    public function __construct($options = null)
-    {
-        if (null !== $options && !is_array($options)) {
-            $options = array(
-                'min' => $options,
-                'max' => $options,
-            );
-        }
-
-        parent::__construct($options);
-
-        if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/CountValidator.php b/vendor/symfony/validator/Constraints/CountValidator.php
deleted file mode 100644
index cbe90e0..0000000
--- a/vendor/symfony/validator/Constraints/CountValidator.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class CountValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (null === $value) {
-            return;
-        }
-
-        if (!is_array($value) && !$value instanceof \Countable) {
-            throw new UnexpectedTypeException($value, 'array or \Countable');
-        }
-
-        $count = count($value);
-
-        if (null !== $constraint->max && $count > $constraint->max) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
-                    ->setParameter('{{ count }}', $count)
-                    ->setParameter('{{ limit }}', $constraint->max)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->max)
-                    ->setCode(Count::TOO_MANY_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
-                    ->setParameter('{{ count }}', $count)
-                    ->setParameter('{{ limit }}', $constraint->max)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->max)
-                    ->setCode(Count::TOO_MANY_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (null !== $constraint->min && $count < $constraint->min) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->minMessage)
-                    ->setParameter('{{ count }}', $count)
-                    ->setParameter('{{ limit }}', $constraint->min)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->min)
-                    ->setCode(Count::TOO_FEW_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->minMessage)
-                    ->setParameter('{{ count }}', $count)
-                    ->setParameter('{{ limit }}', $constraint->min)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->min)
-                    ->setCode(Count::TOO_FEW_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Country.php b/vendor/symfony/validator/Constraints/Country.php
deleted file mode 100644
index d1df3a8..0000000
--- a/vendor/symfony/validator/Constraints/Country.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Country extends Constraint
-{
-    public $message = 'This value is not a valid country.';
-}
diff --git a/vendor/symfony/validator/Constraints/CountryValidator.php b/vendor/symfony/validator/Constraints/CountryValidator.php
deleted file mode 100644
index 22b7909..0000000
--- a/vendor/symfony/validator/Constraints/CountryValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Intl\Intl;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid country code.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class CountryValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Country) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Country');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $countries = Intl::getRegionBundle()->getCountryNames();
-
-        if (!isset($countries[$value])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Currency.php b/vendor/symfony/validator/Constraints/Currency.php
deleted file mode 100644
index 736af83..0000000
--- a/vendor/symfony/validator/Constraints/Currency.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Miha Vrhovnik <miha.vrhovnik@pagein.si>
- */
-class Currency extends Constraint
-{
-    public $message = 'This value is not a valid currency.';
-}
diff --git a/vendor/symfony/validator/Constraints/CurrencyValidator.php b/vendor/symfony/validator/Constraints/CurrencyValidator.php
deleted file mode 100644
index 4fa91d5..0000000
--- a/vendor/symfony/validator/Constraints/CurrencyValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Intl\Intl;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid currency.
- *
- * @author Miha Vrhovnik <miha.vrhovnik@pagein.si>
- */
-class CurrencyValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Currency) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Currency');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $currencies = Intl::getCurrencyBundle()->getCurrencyNames();
-
-        if (!isset($currencies[$value])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Date.php b/vendor/symfony/validator/Constraints/Date.php
deleted file mode 100644
index 1001d78..0000000
--- a/vendor/symfony/validator/Constraints/Date.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Date extends Constraint
-{
-    const INVALID_FORMAT_ERROR = 1;
-    const INVALID_DATE_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-        self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
-    );
-
-    public $message = 'This value is not a valid date.';
-}
diff --git a/vendor/symfony/validator/Constraints/DateTime.php b/vendor/symfony/validator/Constraints/DateTime.php
deleted file mode 100644
index a71bbbd..0000000
--- a/vendor/symfony/validator/Constraints/DateTime.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class DateTime extends Constraint
-{
-    const INVALID_FORMAT_ERROR = 1;
-    const INVALID_DATE_ERROR = 2;
-    const INVALID_TIME_ERROR = 3;
-
-    protected static $errorNames = array(
-        self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-        self::INVALID_DATE_ERROR => 'INVALID_DATE_ERROR',
-        self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
-    );
-
-    public $message = 'This value is not a valid datetime.';
-}
diff --git a/vendor/symfony/validator/Constraints/DateTimeValidator.php b/vendor/symfony/validator/Constraints/DateTimeValidator.php
deleted file mode 100644
index 29864b4..0000000
--- a/vendor/symfony/validator/Constraints/DateTimeValidator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class DateTimeValidator extends DateValidator
-{
-    const PATTERN = '/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof DateTime) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\DateTime');
-        }
-
-        if (null === $value || '' === $value || $value instanceof \DateTime) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if (!preg_match(static::PATTERN, $value, $matches)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (!DateValidator::checkDate($matches[1], $matches[2], $matches[3])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_DATE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_DATE_ERROR)
-                    ->addViolation();
-            }
-        }
-
-        if (!TimeValidator::checkTime($matches[4], $matches[5], $matches[6])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_TIME_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(DateTime::INVALID_TIME_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/DateValidator.php b/vendor/symfony/validator/Constraints/DateValidator.php
deleted file mode 100644
index e14791c..0000000
--- a/vendor/symfony/validator/Constraints/DateValidator.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class DateValidator extends ConstraintValidator
-{
-    const PATTERN = '/^(\d{4})-(\d{2})-(\d{2})$/';
-
-    /**
-     * Checks whether a date is valid.
-     *
-     * @param int $year  The year
-     * @param int $month The month
-     * @param int $day   The day
-     *
-     * @return bool Whether the date is valid
-     *
-     * @internal
-     */
-    public static function checkDate($year, $month, $day)
-    {
-        return checkdate($month, $day, $year);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Date) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Date');
-        }
-
-        if (null === $value || '' === $value || $value instanceof \DateTime) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if (!preg_match(static::PATTERN, $value, $matches)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Date::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Date::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (!self::checkDate($matches[1], $matches[2], $matches[3])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Date::INVALID_DATE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Date::INVALID_DATE_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Email.php b/vendor/symfony/validator/Constraints/Email.php
deleted file mode 100644
index 96abf2c..0000000
--- a/vendor/symfony/validator/Constraints/Email.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Email extends Constraint
-{
-    const INVALID_FORMAT_ERROR = 1;
-    const MX_CHECK_FAILED_ERROR = 2;
-    const HOST_CHECK_FAILED_ERROR = 3;
-
-    protected static $errorNames = array(
-        self::INVALID_FORMAT_ERROR => 'STRICT_CHECK_FAILED_ERROR',
-        self::MX_CHECK_FAILED_ERROR => 'MX_CHECK_FAILED_ERROR',
-        self::HOST_CHECK_FAILED_ERROR => 'HOST_CHECK_FAILED_ERROR',
-    );
-
-    public $message = 'This value is not a valid email address.';
-    public $checkMX = false;
-    public $checkHost = false;
-    public $strict;
-}
diff --git a/vendor/symfony/validator/Constraints/EmailValidator.php b/vendor/symfony/validator/Constraints/EmailValidator.php
deleted file mode 100644
index 8a8aade..0000000
--- a/vendor/symfony/validator/Constraints/EmailValidator.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\RuntimeException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class EmailValidator extends ConstraintValidator
-{
-    /**
-     * @var bool
-     */
-    private $isStrict;
-
-    public function __construct($strict = false)
-    {
-        $this->isStrict = $strict;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Email) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Email');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if (null === $constraint->strict) {
-            $constraint->strict = $this->isStrict;
-        }
-
-        if ($constraint->strict) {
-            if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {
-                throw new RuntimeException('Strict email validation requires egulias/email-validator');
-            }
-
-            $strictValidator = new \Egulias\EmailValidator\EmailValidator();
-
-            if (!$strictValidator->isValid($value, false, true)) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Email::INVALID_FORMAT_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Email::INVALID_FORMAT_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        } elseif (!preg_match('/^.+\@\S+\.\S+$/', $value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Email::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Email::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $host = substr($value, strpos($value, '@') + 1);
-
-        // Check for host DNS resource records
-        if ($constraint->checkMX) {
-            if (!$this->checkMX($host)) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Email::MX_CHECK_FAILED_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Email::MX_CHECK_FAILED_ERROR)
-                        ->addViolation();
-                }
-            }
-
-            return;
-        }
-
-        if ($constraint->checkHost && !$this->checkHost($host)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Email::HOST_CHECK_FAILED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Email::HOST_CHECK_FAILED_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-
-    /**
-     * Check DNS Records for MX type.
-     *
-     * @param string $host Host
-     *
-     * @return bool
-     */
-    private function checkMX($host)
-    {
-        return checkdnsrr($host, 'MX');
-    }
-
-    /**
-     * Check if one of MX, A or AAAA DNS RR exists.
-     *
-     * @param string $host Host
-     *
-     * @return bool
-     */
-    private function checkHost($host)
-    {
-        return $this->checkMX($host) || (checkdnsrr($host, 'A') || checkdnsrr($host, 'AAAA'));
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/EqualTo.php b/vendor/symfony/validator/Constraints/EqualTo.php
deleted file mode 100644
index 8d3d752..0000000
--- a/vendor/symfony/validator/Constraints/EqualTo.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class EqualTo extends AbstractComparison
-{
-    public $message = 'This value should be equal to {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/EqualToValidator.php b/vendor/symfony/validator/Constraints/EqualToValidator.php
deleted file mode 100644
index 3739dbe..0000000
--- a/vendor/symfony/validator/Constraints/EqualToValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are equal (==).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class EqualToValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 == $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Existence.php b/vendor/symfony/validator/Constraints/Existence.php
deleted file mode 100644
index 5ea6ffe..0000000
--- a/vendor/symfony/validator/Constraints/Existence.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class Existence extends Composite
-{
-    public $constraints = array();
-
-    public function getDefaultOption()
-    {
-        return 'constraints';
-    }
-
-    protected function getCompositeOption()
-    {
-        return 'constraints';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Expression.php b/vendor/symfony/validator/Constraints/Expression.php
deleted file mode 100644
index dfa242c..0000000
--- a/vendor/symfony/validator/Constraints/Expression.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"CLASS", "PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Expression extends Constraint
-{
-    public $message = 'This value is not valid.';
-    public $expression;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'expression';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequiredOptions()
-    {
-        return array('expression');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTargets()
-    {
-        return array(self::CLASS_CONSTRAINT, self::PROPERTY_CONSTRAINT);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validatedBy()
-    {
-        return 'validator.expression';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/ExpressionValidator.php b/vendor/symfony/validator/Constraints/ExpressionValidator.php
deleted file mode 100644
index 15d51f9..0000000
--- a/vendor/symfony/validator/Constraints/ExpressionValidator.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
-use Symfony\Component\PropertyAccess\PropertyAccess;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\PropertyAccess\PropertyPath;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Exception\RuntimeException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@symfony.com>
- */
-class ExpressionValidator extends ConstraintValidator
-{
-    /**
-     * @var PropertyAccessorInterface
-     */
-    private $propertyAccessor;
-
-    /**
-     * @var ExpressionLanguage
-     */
-    private $expressionLanguage;
-
-    /**
-     * @param PropertyAccessorInterface|null $propertyAccessor Optional as of Symfony 2.5
-     *
-     * @throws UnexpectedTypeException If the property accessor is invalid
-     */
-    public function __construct($propertyAccessor = null)
-    {
-        if (null !== $propertyAccessor && !$propertyAccessor instanceof PropertyAccessorInterface) {
-            throw new UnexpectedTypeException($propertyAccessor, 'null or \Symfony\Component\PropertyAccess\PropertyAccessorInterface');
-        }
-
-        $this->propertyAccessor = $propertyAccessor;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Expression) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Expression');
-        }
-
-        $variables = array();
-
-        // Symfony 2.5+
-        if ($this->context instanceof ExecutionContextInterface) {
-            $variables['value'] = $value;
-            $variables['this'] = $this->context->getObject();
-        } elseif (null === $this->context->getPropertyName()) {
-            $variables['value'] = $value;
-            $variables['this'] = $value;
-        } else {
-            $root = $this->context->getRoot();
-            $variables['value'] = $value;
-
-            if (is_object($root)) {
-                // Extract the object that the property belongs to from the object
-                // graph
-                $path = new PropertyPath($this->context->getPropertyPath());
-                $parentPath = $path->getParent();
-                $variables['this'] = $parentPath ? $this->getPropertyAccessor()->getValue($root, $parentPath) : $root;
-            } else {
-                $variables['this'] = null;
-            }
-        }
-
-        if (!$this->getExpressionLanguage()->evaluate($constraint->expression, $variables)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-
-    private function getExpressionLanguage()
-    {
-        if (null === $this->expressionLanguage) {
-            if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
-                throw new RuntimeException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
-            }
-            $this->expressionLanguage = new ExpressionLanguage();
-        }
-
-        return $this->expressionLanguage;
-    }
-
-    private function getPropertyAccessor()
-    {
-        if (null === $this->propertyAccessor) {
-            if (!class_exists('Symfony\Component\PropertyAccess\PropertyAccess')) {
-                throw new RuntimeException('Unable to use expressions as the Symfony PropertyAccess component is not installed.');
-            }
-            $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
-        }
-
-        return $this->propertyAccessor;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/False.php b/vendor/symfony/validator/Constraints/False.php
deleted file mode 100644
index 1e103ad..0000000
--- a/vendor/symfony/validator/Constraints/False.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalse class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsFalse instead.
- */
-class False extends IsFalse
-{
-}
diff --git a/vendor/symfony/validator/Constraints/FalseValidator.php b/vendor/symfony/validator/Constraints/FalseValidator.php
deleted file mode 100644
index 9614c30..0000000
--- a/vendor/symfony/validator/Constraints/FalseValidator.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsFalseValidator class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsFalseValidator instead.
- */
-class FalseValidator extends IsFalseValidator
-{
-}
diff --git a/vendor/symfony/validator/Constraints/File.php b/vendor/symfony/validator/Constraints/File.php
deleted file mode 100644
index de9fc00..0000000
--- a/vendor/symfony/validator/Constraints/File.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class File extends Constraint
-{
-    // Check the Image constraint for clashes if adding new constants here
-
-    const NOT_FOUND_ERROR = 1;
-    const NOT_READABLE_ERROR = 2;
-    const EMPTY_ERROR = 3;
-    const TOO_LARGE_ERROR = 4;
-    const INVALID_MIME_TYPE_ERROR = 5;
-
-    protected static $errorNames = array(
-        self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
-        self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
-        self::EMPTY_ERROR => 'EMPTY_ERROR',
-        self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
-        self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
-    );
-
-    public $binaryFormat;
-    public $mimeTypes = array();
-    public $notFoundMessage = 'The file could not be found.';
-    public $notReadableMessage = 'The file is not readable.';
-    public $maxSizeMessage = 'The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.';
-    public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
-    public $disallowEmptyMessage = 'An empty file is not allowed.';
-
-    public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
-    public $uploadFormSizeErrorMessage = 'The file is too large.';
-    public $uploadPartialErrorMessage = 'The file was only partially uploaded.';
-    public $uploadNoFileErrorMessage = 'No file was uploaded.';
-    public $uploadNoTmpDirErrorMessage = 'No temporary folder was configured in php.ini.';
-    public $uploadCantWriteErrorMessage = 'Cannot write temporary file to disk.';
-    public $uploadExtensionErrorMessage = 'A PHP extension caused the upload to fail.';
-    public $uploadErrorMessage = 'The file could not be uploaded.';
-
-    protected $maxSize;
-
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-
-        if (null !== $this->maxSize) {
-            $this->normalizeBinaryFormat($this->maxSize);
-        }
-    }
-
-    public function __set($option, $value)
-    {
-        if ('maxSize' === $option) {
-            $this->normalizeBinaryFormat($value);
-
-            return;
-        }
-
-        parent::__set($option, $value);
-    }
-
-    public function __get($option)
-    {
-        if ('maxSize' === $option) {
-            return $this->maxSize;
-        }
-
-        return parent::__get($option);
-    }
-
-    private function normalizeBinaryFormat($maxSize)
-    {
-        if (ctype_digit((string) $maxSize)) {
-            $this->maxSize = (int) $maxSize;
-            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-        } elseif (preg_match('/^\d++k$/i', $maxSize)) {
-            $this->maxSize = $maxSize * 1000;
-            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-        } elseif (preg_match('/^\d++M$/i', $maxSize)) {
-            $this->maxSize = $maxSize * 1000000;
-            $this->binaryFormat = null === $this->binaryFormat ? false : $this->binaryFormat;
-        } elseif (preg_match('/^\d++Ki$/i', $maxSize)) {
-            $this->maxSize = $maxSize << 10;
-            $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
-        } elseif (preg_match('/^\d++Mi$/i', $maxSize)) {
-            $this->maxSize = $maxSize << 20;
-            $this->binaryFormat = null === $this->binaryFormat ? true : $this->binaryFormat;
-        } else {
-            throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size', $this->maxSize));
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/FileValidator.php b/vendor/symfony/validator/Constraints/FileValidator.php
deleted file mode 100644
index 34eb0d2..0000000
--- a/vendor/symfony/validator/Constraints/FileValidator.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\HttpFoundation\File\File as FileObject;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class FileValidator extends ConstraintValidator
-{
-    const KB_BYTES = 1000;
-    const MB_BYTES = 1000000;
-    const KIB_BYTES = 1024;
-    const MIB_BYTES = 1048576;
-
-    private static $suffices = array(
-        1 => 'bytes',
-        self::KB_BYTES => 'kB',
-        self::MB_BYTES => 'MB',
-        self::KIB_BYTES => 'KiB',
-        self::MIB_BYTES => 'MiB',
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof File) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\File');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if ($value instanceof UploadedFile && !$value->isValid()) {
-            switch ($value->getError()) {
-                case UPLOAD_ERR_INI_SIZE:
-                    $iniLimitSize = UploadedFile::getMaxFilesize();
-                    if ($constraint->maxSize && $constraint->maxSize < $iniLimitSize) {
-                        $limitInBytes = $constraint->maxSize;
-                        $binaryFormat = $constraint->binaryFormat;
-                    } else {
-                        $limitInBytes = $iniLimitSize;
-                        $binaryFormat = true;
-                    }
-
-                    list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes(0, $limitInBytes, $binaryFormat);
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadIniSizeErrorMessage)
-                            ->setParameter('{{ limit }}', $limitAsString)
-                            ->setParameter('{{ suffix }}', $suffix)
-                            ->setCode(UPLOAD_ERR_INI_SIZE)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadIniSizeErrorMessage)
-                            ->setParameter('{{ limit }}', $limitAsString)
-                            ->setParameter('{{ suffix }}', $suffix)
-                            ->setCode(UPLOAD_ERR_INI_SIZE)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_FORM_SIZE:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadFormSizeErrorMessage)
-                            ->setCode(UPLOAD_ERR_FORM_SIZE)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadFormSizeErrorMessage)
-                            ->setCode(UPLOAD_ERR_FORM_SIZE)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_PARTIAL:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadPartialErrorMessage)
-                            ->setCode(UPLOAD_ERR_PARTIAL)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadPartialErrorMessage)
-                            ->setCode(UPLOAD_ERR_PARTIAL)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_NO_FILE:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadNoFileErrorMessage)
-                            ->setCode(UPLOAD_ERR_NO_FILE)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadNoFileErrorMessage)
-                            ->setCode(UPLOAD_ERR_NO_FILE)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_NO_TMP_DIR:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadNoTmpDirErrorMessage)
-                            ->setCode(UPLOAD_ERR_NO_TMP_DIR)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadNoTmpDirErrorMessage)
-                            ->setCode(UPLOAD_ERR_NO_TMP_DIR)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_CANT_WRITE:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadCantWriteErrorMessage)
-                            ->setCode(UPLOAD_ERR_CANT_WRITE)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadCantWriteErrorMessage)
-                            ->setCode(UPLOAD_ERR_CANT_WRITE)
-                            ->addViolation();
-                    }
-
-                    return;
-                case UPLOAD_ERR_EXTENSION:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadExtensionErrorMessage)
-                            ->setCode(UPLOAD_ERR_EXTENSION)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadExtensionErrorMessage)
-                            ->setCode(UPLOAD_ERR_EXTENSION)
-                            ->addViolation();
-                    }
-
-                    return;
-                default:
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->uploadErrorMessage)
-                            ->setCode($value->getError())
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->uploadErrorMessage)
-                            ->setCode($value->getError())
-                            ->addViolation();
-                    }
-
-                    return;
-            }
-        }
-
-        if (!is_scalar($value) && !$value instanceof FileObject && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $path = $value instanceof FileObject ? $value->getPathname() : (string) $value;
-
-        if (!is_file($path)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->notFoundMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::NOT_FOUND_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->notFoundMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::NOT_FOUND_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (!is_readable($path)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->notReadableMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::NOT_READABLE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->notReadableMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::NOT_READABLE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $sizeInBytes = filesize($path);
-
-        if (0 === $sizeInBytes) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->disallowEmptyMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::EMPTY_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->disallowEmptyMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setCode(File::EMPTY_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if ($constraint->maxSize) {
-            $limitInBytes = $constraint->maxSize;
-
-            if ($sizeInBytes > $limitInBytes) {
-                list($sizeAsString, $limitAsString, $suffix) = $this->factorizeSizes($sizeInBytes, $limitInBytes, $constraint->binaryFormat);
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->maxSizeMessage)
-                        ->setParameter('{{ file }}', $this->formatValue($path))
-                        ->setParameter('{{ size }}', $sizeAsString)
-                        ->setParameter('{{ limit }}', $limitAsString)
-                        ->setParameter('{{ suffix }}', $suffix)
-                        ->setCode(File::TOO_LARGE_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->maxSizeMessage)
-                        ->setParameter('{{ file }}', $this->formatValue($path))
-                        ->setParameter('{{ size }}', $sizeAsString)
-                        ->setParameter('{{ limit }}', $limitAsString)
-                        ->setParameter('{{ suffix }}', $suffix)
-                        ->setCode(File::TOO_LARGE_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        if ($constraint->mimeTypes) {
-            if (!$value instanceof FileObject) {
-                $value = new FileObject($value);
-            }
-
-            $mimeTypes = (array) $constraint->mimeTypes;
-            $mime = $value->getMimeType();
-
-            foreach ($mimeTypes as $mimeType) {
-                if ($mimeType === $mime) {
-                    return;
-                }
-
-                if ($discrete = strstr($mimeType, '/*', true)) {
-                    if (strstr($mime, '/', true) === $discrete) {
-                        return;
-                    }
-                }
-            }
-
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->mimeTypesMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setParameter('{{ type }}', $this->formatValue($mime))
-                    ->setParameter('{{ types }}', $this->formatValues($mimeTypes))
-                    ->setCode(File::INVALID_MIME_TYPE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->mimeTypesMessage)
-                    ->setParameter('{{ file }}', $this->formatValue($path))
-                    ->setParameter('{{ type }}', $this->formatValue($mime))
-                    ->setParameter('{{ types }}', $this->formatValues($mimeTypes))
-                    ->setCode(File::INVALID_MIME_TYPE_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-
-    private static function moreDecimalsThan($double, $numberOfDecimals)
-    {
-        return strlen((string) $double) > strlen(round($double, $numberOfDecimals));
-    }
-
-    /**
-     * Convert the limit to the smallest possible number
-     * (i.e. try "MB", then "kB", then "bytes").
-     */
-    private function factorizeSizes($size, $limit, $binaryFormat)
-    {
-        if ($binaryFormat) {
-            $coef = self::MIB_BYTES;
-            $coefFactor = self::KIB_BYTES;
-        } else {
-            $coef = self::MB_BYTES;
-            $coefFactor = self::KB_BYTES;
-        }
-
-        $limitAsString = (string) ($limit / $coef);
-
-        // Restrict the limit to 2 decimals (without rounding! we
-        // need the precise value)
-        while (self::moreDecimalsThan($limitAsString, 2)) {
-            $coef /= $coefFactor;
-            $limitAsString = (string) ($limit / $coef);
-        }
-
-        // Convert size to the same measure, but round to 2 decimals
-        $sizeAsString = (string) round($size / $coef, 2);
-
-        // If the size and limit produce the same string output
-        // (due to rounding), reduce the coefficient
-        while ($sizeAsString === $limitAsString) {
-            $coef /= $coefFactor;
-            $limitAsString = (string) ($limit / $coef);
-            $sizeAsString = (string) round($size / $coef, 2);
-        }
-
-        return array($sizeAsString, $limitAsString, self::$suffices[$coef]);
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/GreaterThan.php b/vendor/symfony/validator/Constraints/GreaterThan.php
deleted file mode 100644
index ec7fafb..0000000
--- a/vendor/symfony/validator/Constraints/GreaterThan.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class GreaterThan extends AbstractComparison
-{
-    public $message = 'This value should be greater than {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php b/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php
deleted file mode 100644
index 36fdd9c..0000000
--- a/vendor/symfony/validator/Constraints/GreaterThanOrEqual.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class GreaterThanOrEqual extends AbstractComparison
-{
-    public $message = 'This value should be greater than or equal to {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php
deleted file mode 100644
index 2363204..0000000
--- a/vendor/symfony/validator/Constraints/GreaterThanOrEqualValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are greater than or equal to the previous (>=).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class GreaterThanOrEqualValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 >= $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/GreaterThanValidator.php b/vendor/symfony/validator/Constraints/GreaterThanValidator.php
deleted file mode 100644
index fdcf0c1..0000000
--- a/vendor/symfony/validator/Constraints/GreaterThanValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are greater than the previous (>).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class GreaterThanValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 > $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/GroupSequence.php b/vendor/symfony/validator/Constraints/GroupSequence.php
deleted file mode 100644
index aea0558..0000000
--- a/vendor/symfony/validator/Constraints/GroupSequence.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Exception\OutOfBoundsException;
-
-/**
- * A sequence of validation groups.
- *
- * When validating a group sequence, each group will only be validated if all
- * of the previous groups in the sequence succeeded. For example:
- *
- *     $validator->validate($address, null, new GroupSequence('Basic', 'Strict'));
- *
- * In the first step, all constraints that belong to the group "Basic" will be
- * validated. If none of the constraints fail, the validator will then validate
- * the constraints in group "Strict". This is useful, for example, if "Strict"
- * contains expensive checks that require a lot of CPU or slow, external
- * services. You usually don't want to run expensive checks if any of the cheap
- * checks fail.
- *
- * When adding metadata to a class, you can override the "Default" group of
- * that class with a group sequence:
- *
- *     /**
- *      * @GroupSequence({"Address", "Strict"})
- *      *\/
- *     class Address
- *     {
- *         // ...
- *     }
- *
- * Whenever you validate that object in the "Default" group, the group sequence
- * will be validated:
- *
- *     $validator->validate($address);
- *
- * If you want to execute the constraints of the "Default" group for a class
- * with an overridden default group, pass the class name as group name instead:
- *
- *     $validator->validate($address, null, "Address")
- *
- * @Annotation
- * @Target({"CLASS", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * Implementing \ArrayAccess, \IteratorAggregate and \Countable is @deprecated since 2.5 and will be removed in 3.0.
- */
-class GroupSequence implements \ArrayAccess, \IteratorAggregate, \Countable
-{
-    /**
-     * The groups in the sequence.
-     *
-     * @var string[]|GroupSequence[]
-     */
-    public $groups;
-
-    /**
-     * The group in which cascaded objects are validated when validating
-     * this sequence.
-     *
-     * By default, cascaded objects are validated in each of the groups of
-     * the sequence.
-     *
-     * If a class has a group sequence attached, that sequence replaces the
-     * "Default" group. When validating that class in the "Default" group, the
-     * group sequence is used instead, but still the "Default" group should be
-     * cascaded to other objects.
-     *
-     * @var string|GroupSequence
-     */
-    public $cascadedGroup;
-
-    /**
-     * Creates a new group sequence.
-     *
-     * @param string[] $groups The groups in the sequence
-     */
-    public function __construct(array $groups)
-    {
-        // Support for Doctrine annotations
-        $this->groups = isset($groups['value']) ? $groups['value'] : $groups;
-    }
-
-    /**
-     * Returns an iterator for this group.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @return \Traversable The iterator
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function getIterator()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return new \ArrayIterator($this->groups);
-    }
-
-    /**
-     * Returns whether the given offset exists in the sequence.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @param int $offset The offset
-     *
-     * @return bool Whether the offset exists
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function offsetExists($offset)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return isset($this->groups[$offset]);
-    }
-
-    /**
-     * Returns the group at the given offset.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @param int $offset The offset
-     *
-     * @return string The group a the given offset
-     *
-     * @throws OutOfBoundsException If the object does not exist
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function offsetGet($offset)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (!isset($this->groups[$offset])) {
-            throw new OutOfBoundsException(sprintf(
-                'The offset "%s" does not exist.',
-                $offset
-            ));
-        }
-
-        return $this->groups[$offset];
-    }
-
-    /**
-     * Sets the group at the given offset.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @param int    $offset The offset
-     * @param string $value  The group name
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function offsetSet($offset, $value)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (null !== $offset) {
-            $this->groups[$offset] = $value;
-
-            return;
-        }
-
-        $this->groups[] = $value;
-    }
-
-    /**
-     * Removes the group at the given offset.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @param int $offset The offset
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function offsetUnset($offset)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        unset($this->groups[$offset]);
-    }
-
-    /**
-     * Returns the number of groups in the sequence.
-     *
-     * Implemented for backwards compatibility with Symfony < 2.5.
-     *
-     * @return int The number of groups
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function count()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        return count($this->groups);
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/GroupSequenceProvider.php b/vendor/symfony/validator/Constraints/GroupSequenceProvider.php
deleted file mode 100644
index 3904473..0000000
--- a/vendor/symfony/validator/Constraints/GroupSequenceProvider.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Annotation to define a group sequence provider.
- *
- * @Annotation
- * @Target({"CLASS", "ANNOTATION"})
- */
-class GroupSequenceProvider
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Iban.php b/vendor/symfony/validator/Constraints/Iban.php
deleted file mode 100644
index c4dc985..0000000
--- a/vendor/symfony/validator/Constraints/Iban.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Manuel Reinhard <manu@sprain.ch>
- * @author Michael Schummel
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Iban extends Constraint
-{
-    /** @deprecated, to be removed in 3.0. */
-    const TOO_SHORT_ERROR = 1;
-    const INVALID_COUNTRY_CODE_ERROR = 2;
-    const INVALID_CHARACTERS_ERROR = 3;
-    /** @deprecated, to be removed in 3.0. */
-    const INVALID_CASE_ERROR = 4;
-    const CHECKSUM_FAILED_ERROR = 5;
-    const INVALID_FORMAT_ERROR = 6;
-    const NOT_SUPPORTED_COUNTRY_CODE_ERROR = 7;
-
-    protected static $errorNames = array(
-        self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
-        self::INVALID_COUNTRY_CODE_ERROR => 'INVALID_COUNTRY_CODE_ERROR',
-        self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-        self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
-        self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-        self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-        self::NOT_SUPPORTED_COUNTRY_CODE_ERROR => 'NOT_SUPPORTED_COUNTRY_CODE_ERROR',
-    );
-
-    public $message = 'This is not a valid International Bank Account Number (IBAN).';
-}
diff --git a/vendor/symfony/validator/Constraints/IbanValidator.php b/vendor/symfony/validator/Constraints/IbanValidator.php
deleted file mode 100644
index 72ae002..0000000
--- a/vendor/symfony/validator/Constraints/IbanValidator.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Manuel Reinhard <manu@sprain.ch>
- * @author Michael Schummel
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @link http://www.michael-schummel.de/2007/10/05/iban-prufung-mit-php/
- */
-class IbanValidator extends ConstraintValidator
-{
-    /**
-     * IBAN country specific formats.
-     *
-     * The first 2 characters from an IBAN format are the two-character ISO country code.
-     * The following 2 characters represent the check digits calculated from the rest of the IBAN characters.
-     * The rest are up to thirty alphanumeric characters for
-     * a BBAN (Basic Bank Account Number) which has a fixed length per country and,
-     * included within it, a bank identifier with a fixed position and a fixed length per country
-     *
-     * @link http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf
-     *
-     * @var array
-     */
-    private static $formats = array(
-        'AD' => 'AD\d{2}\d{4}\d{4}[\dA-Z]{12}', // Andorra
-        'AE' => 'AE\d{2}\d{3}\d{16}', // United Arab Emirates
-        'AL' => 'AL\d{2}\d{8}[\dA-Z]{16}', // Albania
-        'AO' => 'AO\d{2}\d{21}', // Angola
-        'AT' => 'AT\d{2}\d{5}\d{11}', // Austria
-        'AX' => 'FI\d{2}\d{6}\d{7}\d{1}', // Aland Islands
-        'AZ' => 'AZ\d{2}[A-Z]{4}[\dA-Z]{20}', // Azerbaijan
-        'BA' => 'BA\d{2}\d{3}\d{3}\d{8}\d{2}', // Bosnia and Herzegovina
-        'BE' => 'BE\d{2}\d{3}\d{7}\d{2}', // Belgium
-        'BF' => 'BF\d{2}\d{23}', // Burkina Faso
-        'BG' => 'BG\d{2}[A-Z]{4}\d{4}\d{2}[\dA-Z]{8}', // Bulgaria
-        'BH' => 'BH\d{2}[A-Z]{4}[\dA-Z]{14}', // Bahrain
-        'BI' => 'BI\d{2}\d{12}', // Burundi
-        'BJ' => 'BJ\d{2}[A-Z]{1}\d{23}', // Benin
-        'BL' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Saint Barthelemy
-        'BR' => 'BR\d{2}\d{8}\d{5}\d{10}[A-Z][\dA-Z]', // Brazil
-        'CG' => 'CG\d{2}\d{23}', // Congo
-        'CH' => 'CH\d{2}\d{5}[\dA-Z]{12}', // Switzerland
-        'CI' => 'CI\d{2}[A-Z]{1}\d{23}', // Ivory Coast
-        'CM' => 'CM\d{2}\d{23}', // Cameron
-        'CR' => 'CR\d{2}\d{3}\d{14}', // Costa Rica
-        'CV' => 'CV\d{2}\d{21}', // Cape Verde
-        'CY' => 'CY\d{2}\d{3}\d{5}[\dA-Z]{16}', // Cyprus
-        'CZ' => 'CZ\d{2}\d{20}', // Czech Republic
-        'DE' => 'DE\d{2}\d{8}\d{10}', // Germany
-        'DO' => 'DO\d{2}[\dA-Z]{4}\d{20}', // Dominican Republic
-        'DK' => 'DK\d{2}\d{4}\d{10}', // Denmark
-        'DZ' => 'DZ\d{2}\d{20}', // Algeria
-        'EE' => 'EE\d{2}\d{2}\d{2}\d{11}\d{1}', // Estonia
-        'ES' => 'ES\d{2}\d{4}\d{4}\d{1}\d{1}\d{10}', // Spain (also includes Canary Islands, Ceuta and Melilla)
-        'FI' => 'FI\d{2}\d{6}\d{7}\d{1}', // Finland
-        'FO' => 'FO\d{2}\d{4}\d{9}\d{1}', // Faroe Islands
-        'FR' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // France
-        'GF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // French Guyana
-        'GB' => 'GB\d{2}[A-Z]{4}\d{6}\d{8}', // United Kingdom of Great Britain and Northern Ireland
-        'GE' => 'GE\d{2}[A-Z]{2}\d{16}', // Georgia
-        'GI' => 'GI\d{2}[A-Z]{4}[\dA-Z]{15}', // Gibraltar
-        'GL' => 'GL\d{2}\d{4}\d{9}\d{1}', // Greenland
-        'GP' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Guadeloupe
-        'GR' => 'GR\d{2}\d{3}\d{4}[\dA-Z]{16}', // Greece
-        'GT' => 'GT\d{2}[\dA-Z]{4}[\dA-Z]{20}', // Guatemala
-        'HR' => 'HR\d{2}\d{7}\d{10}', // Croatia
-        'HU' => 'HU\d{2}\d{3}\d{4}\d{1}\d{15}\d{1}', // Hungary
-        'IE' => 'IE\d{2}[A-Z]{4}\d{6}\d{8}', // Ireland
-        'IL' => 'IL\d{2}\d{3}\d{3}\d{13}', // Israel
-        'IR' => 'IR\d{2}\d{22}', // Iran
-        'IS' => 'IS\d{2}\d{4}\d{2}\d{6}\d{10}', // Iceland
-        'IT' => 'IT\d{2}[A-Z]{1}\d{5}\d{5}[\dA-Z]{12}', // Italy
-        'JO' => 'JO\d{2}[A-Z]{4}\d{4}[\dA-Z]{18}', // Jordan
-        'KW' => 'KW\d{2}[A-Z]{4}\d{22}', // KUWAIT
-        'KZ' => 'KZ\d{2}\d{3}[\dA-Z]{13}', // Kazakhstan
-        'LB' => 'LB\d{2}\d{4}[\dA-Z]{20}', // LEBANON
-        'LI' => 'LI\d{2}\d{5}[\dA-Z]{12}', // Liechtenstein (Principality of)
-        'LT' => 'LT\d{2}\d{5}\d{11}', // Lithuania
-        'LU' => 'LU\d{2}\d{3}[\dA-Z]{13}', // Luxembourg
-        'LV' => 'LV\d{2}[A-Z]{4}[\dA-Z]{13}', // Latvia
-        'MC' => 'MC\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Monaco
-        'MD' => 'MD\d{2}[\dA-Z]{2}[\dA-Z]{18}', // Moldova
-        'ME' => 'ME\d{2}\d{3}\d{13}\d{2}', // Montenegro
-        'MF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Saint Martin (French part)
-        'MG' => 'MG\d{2}\d{23}', // Madagascar
-        'MK' => 'MK\d{2}\d{3}[\dA-Z]{10}\d{2}', // Macedonia, Former Yugoslav Republic of
-        'ML' => 'ML\d{2}[A-Z]{1}\d{23}', // Mali
-        'MQ' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Martinique
-        'MR' => 'MR13\d{5}\d{5}\d{11}\d{2}', // Mauritania
-        'MT' => 'MT\d{2}[A-Z]{4}\d{5}[\dA-Z]{18}', // Malta
-        'MU' => 'MU\d{2}[A-Z]{4}\d{2}\d{2}\d{12}\d{3}[A-Z]{3}', // Mauritius
-        'MZ' => 'MZ\d{2}\d{21}', // Mozambique
-        'NC' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // New Caledonia
-        'NL' => 'NL\d{2}[A-Z]{4}\d{10}', // The Netherlands
-        'NO' => 'NO\d{2}\d{4}\d{6}\d{1}', // Norway
-        'PF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // French Polynesia
-        'PK' => 'PK\d{2}[A-Z]{4}[\dA-Z]{16}', // Pakistan
-        'PL' => 'PL\d{2}\d{8}\d{16}', // Poland
-        'PM' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Saint Pierre et Miquelon
-        'PS' => 'PS\d{2}[A-Z]{4}[\dA-Z]{21}', // Palestine, State of
-        'PT' => 'PT\d{2}\d{4}\d{4}\d{11}\d{2}', // Portugal (plus Azores and Madeira)
-        'QA' => 'QA\d{2}[A-Z]{4}[\dA-Z]{21}', // Qatar
-        'RE' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Reunion
-        'RO' => 'RO\d{2}[A-Z]{4}[\dA-Z]{16}', // Romania
-        'RS' => 'RS\d{2}\d{3}\d{13}\d{2}', // Serbia
-        'SA' => 'SA\d{2}\d{2}[\dA-Z]{18}', // Saudi Arabia
-        'SE' => 'SE\d{2}\d{3}\d{16}\d{1}', // Sweden
-        'SI' => 'SI\d{2}\d{5}\d{8}\d{2}', // Slovenia
-        'SK' => 'SK\d{2}\d{4}\d{6}\d{10}', // Slovak Republic
-        'SM' => 'SM\d{2}[A-Z]{1}\d{5}\d{5}[\dA-Z]{12}', // San Marino
-        'SN' => 'SN\d{2}[A-Z]{1}\d{23}', // Senegal
-        'TF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // French Southern Territories
-        'TL' => 'TL\d{2}\d{3}\d{14}\d{2}', // Timor-Leste
-        'TN' => 'TN59\d{2}\d{3}\d{13}\d{2}', // Tunisia
-        'TR' => 'TR\d{2}\d{5}[\dA-Z]{1}[\dA-Z]{16}', // Turkey
-        'UA' => 'UA\d{2}[A-Z]{6}[\dA-Z]{19}', // Ukraine
-        'VG' => 'VG\d{2}[A-Z]{4}\d{16}', // Virgin Islands, British
-        'WF' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Wallis and Futuna Islands
-        'XK' => 'XK\d{2}\d{4}\d{10}\d{2}', // Republic of Kosovo
-        'YT' => 'FR\d{2}\d{5}\d{5}[\dA-Z]{11}\d{2}', // Mayotte
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Iban) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Iban');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        // Remove spaces and convert to uppercase
-        $canonicalized = str_replace(' ', '', strtoupper($value));
-
-        // The IBAN must contain only digits and characters...
-        if (!ctype_alnum($canonicalized)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // ...start with a two-letter country code
-        $countryCode = substr($canonicalized, 0, 2);
-
-        if (!ctype_alpha($countryCode)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_COUNTRY_CODE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_COUNTRY_CODE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // ...have a format available
-        if (!array_key_exists($countryCode, self::$formats)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::NOT_SUPPORTED_COUNTRY_CODE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::NOT_SUPPORTED_COUNTRY_CODE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // ...and have a valid format
-        if (!preg_match('/^'.self::$formats[$countryCode].'$/', $canonicalized)
-        ) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // Move the first four characters to the end
-        // e.g. CH93 0076 2011 6238 5295 7
-        //   -> 0076 2011 6238 5295 7 CH93
-        $canonicalized = substr($canonicalized, 4).substr($canonicalized, 0, 4);
-
-        // Convert all remaining letters to their ordinals
-        // The result is an integer, which is too large for PHP's int
-        // data type, so we store it in a string instead.
-        // e.g. 0076 2011 6238 5295 7 CH93
-        //   -> 0076 2011 6238 5295 7 121893
-        $checkSum = self::toBigInt($canonicalized);
-
-        // Do a modulo-97 operation on the large integer
-        // We cannot use PHP's modulo operator, so we calculate the
-        // modulo step-wisely instead
-        if (1 !== self::bigModulo97($checkSum)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Iban::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-
-    private static function toBigInt($string)
-    {
-        $chars = str_split($string);
-        $bigInt = '';
-
-        foreach ($chars as $char) {
-            // Convert uppercase characters to ordinals, starting with 10 for "A"
-            if (ctype_upper($char)) {
-                $bigInt .= (ord($char) - 55);
-
-                continue;
-            }
-
-            // Simply append digits
-            $bigInt .= $char;
-        }
-
-        return $bigInt;
-    }
-
-    private static function bigModulo97($bigInt)
-    {
-        $parts = str_split($bigInt, 7);
-        $rest = 0;
-
-        foreach ($parts as $part) {
-            $rest = ($rest.$part) % 97;
-        }
-
-        return $rest;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IdenticalTo.php b/vendor/symfony/validator/Constraints/IdenticalTo.php
deleted file mode 100644
index 6d00286..0000000
--- a/vendor/symfony/validator/Constraints/IdenticalTo.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class IdenticalTo extends AbstractComparison
-{
-    public $message = 'This value should be identical to {{ compared_value_type }} {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/IdenticalToValidator.php b/vendor/symfony/validator/Constraints/IdenticalToValidator.php
deleted file mode 100644
index a186726..0000000
--- a/vendor/symfony/validator/Constraints/IdenticalToValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are identical (===).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class IdenticalToValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 === $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Image.php b/vendor/symfony/validator/Constraints/Image.php
deleted file mode 100644
index f75c6a2..0000000
--- a/vendor/symfony/validator/Constraints/Image.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Benjamin Dulau <benjamin.dulau@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Image extends File
-{
-    // Don't reuse values used in File
-
-    const SIZE_NOT_DETECTED_ERROR = 10;
-    const TOO_WIDE_ERROR = 11;
-    const TOO_NARROW_ERROR = 12;
-    const TOO_HIGH_ERROR = 13;
-    const TOO_LOW_ERROR = 14;
-    const RATIO_TOO_BIG_ERROR = 15;
-    const RATIO_TOO_SMALL_ERROR = 16;
-    const SQUARE_NOT_ALLOWED_ERROR = 17;
-    const LANDSCAPE_NOT_ALLOWED_ERROR = 18;
-    const PORTRAIT_NOT_ALLOWED_ERROR = 19;
-
-    // Include the mapping from the base class
-
-    protected static $errorNames = array(
-        self::NOT_FOUND_ERROR => 'NOT_FOUND_ERROR',
-        self::NOT_READABLE_ERROR => 'NOT_READABLE_ERROR',
-        self::EMPTY_ERROR => 'EMPTY_ERROR',
-        self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
-        self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
-        self::SIZE_NOT_DETECTED_ERROR => 'SIZE_NOT_DETECTED_ERROR',
-        self::TOO_WIDE_ERROR => 'TOO_WIDE_ERROR',
-        self::TOO_NARROW_ERROR => 'TOO_NARROW_ERROR',
-        self::TOO_HIGH_ERROR => 'TOO_HIGH_ERROR',
-        self::TOO_LOW_ERROR => 'TOO_LOW_ERROR',
-        self::RATIO_TOO_BIG_ERROR => 'RATIO_TOO_BIG_ERROR',
-        self::RATIO_TOO_SMALL_ERROR => 'RATIO_TOO_SMALL_ERROR',
-        self::SQUARE_NOT_ALLOWED_ERROR => 'SQUARE_NOT_ALLOWED_ERROR',
-        self::LANDSCAPE_NOT_ALLOWED_ERROR => 'LANDSCAPE_NOT_ALLOWED_ERROR',
-        self::PORTRAIT_NOT_ALLOWED_ERROR => 'PORTRAIT_NOT_ALLOWED_ERROR',
-    );
-
-    public $mimeTypes = 'image/*';
-    public $minWidth;
-    public $maxWidth;
-    public $maxHeight;
-    public $minHeight;
-    public $maxRatio;
-    public $minRatio;
-    public $allowSquare = true;
-    public $allowLandscape = true;
-    public $allowPortrait = true;
-
-    // The constant for a wrong MIME type is taken from the parent class.
-    public $mimeTypesMessage = 'This file is not a valid image.';
-    public $sizeNotDetectedMessage = 'The size of the image could not be detected.';
-    public $maxWidthMessage = 'The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.';
-    public $minWidthMessage = 'The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.';
-    public $maxHeightMessage = 'The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.';
-    public $minHeightMessage = 'The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.';
-    public $maxRatioMessage = 'The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.';
-    public $minRatioMessage = 'The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.';
-    public $allowSquareMessage = 'The image is square ({{ width }}x{{ height }}px). Square images are not allowed.';
-    public $allowLandscapeMessage = 'The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.';
-    public $allowPortraitMessage = 'The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.';
-}
diff --git a/vendor/symfony/validator/Constraints/ImageValidator.php b/vendor/symfony/validator/Constraints/ImageValidator.php
deleted file mode 100644
index a5165e2..0000000
--- a/vendor/symfony/validator/Constraints/ImageValidator.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid image file and is valid
- * against minWidth, maxWidth, minHeight and maxHeight constraints.
- *
- * @author Benjamin Dulau <benjamin.dulau@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ImageValidator extends FileValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Image) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Image');
-        }
-
-        $violations = count($this->context->getViolations());
-
-        parent::validate($value, $constraint);
-
-        $failed = count($this->context->getViolations()) !== $violations;
-
-        if ($failed || null === $value || '' === $value) {
-            return;
-        }
-
-        if (null === $constraint->minWidth && null === $constraint->maxWidth
-            && null === $constraint->minHeight && null === $constraint->maxHeight
-            && null === $constraint->minRatio && null === $constraint->maxRatio
-            && $constraint->allowSquare && $constraint->allowLandscape && $constraint->allowPortrait) {
-            return;
-        }
-
-        $size = @getimagesize($value);
-
-        if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->sizeNotDetectedMessage)
-                    ->setCode(Image::SIZE_NOT_DETECTED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->sizeNotDetectedMessage)
-                    ->setCode(Image::SIZE_NOT_DETECTED_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $width = $size[0];
-        $height = $size[1];
-
-        if ($constraint->minWidth) {
-            if (!ctype_digit((string) $constraint->minWidth)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum width', $constraint->minWidth));
-            }
-
-            if ($width < $constraint->minWidth) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->minWidthMessage)
-                        ->setParameter('{{ width }}', $width)
-                        ->setParameter('{{ min_width }}', $constraint->minWidth)
-                        ->setCode(Image::TOO_NARROW_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->minWidthMessage)
-                        ->setParameter('{{ width }}', $width)
-                        ->setParameter('{{ min_width }}', $constraint->minWidth)
-                        ->setCode(Image::TOO_NARROW_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        if ($constraint->maxWidth) {
-            if (!ctype_digit((string) $constraint->maxWidth)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum width', $constraint->maxWidth));
-            }
-
-            if ($width > $constraint->maxWidth) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->maxWidthMessage)
-                        ->setParameter('{{ width }}', $width)
-                        ->setParameter('{{ max_width }}', $constraint->maxWidth)
-                        ->setCode(Image::TOO_WIDE_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->maxWidthMessage)
-                        ->setParameter('{{ width }}', $width)
-                        ->setParameter('{{ max_width }}', $constraint->maxWidth)
-                        ->setCode(Image::TOO_WIDE_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        if ($constraint->minHeight) {
-            if (!ctype_digit((string) $constraint->minHeight)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum height', $constraint->minHeight));
-            }
-
-            if ($height < $constraint->minHeight) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->minHeightMessage)
-                        ->setParameter('{{ height }}', $height)
-                        ->setParameter('{{ min_height }}', $constraint->minHeight)
-                        ->setCode(Image::TOO_LOW_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->minHeightMessage)
-                        ->setParameter('{{ height }}', $height)
-                        ->setParameter('{{ min_height }}', $constraint->minHeight)
-                        ->setCode(Image::TOO_LOW_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        if ($constraint->maxHeight) {
-            if (!ctype_digit((string) $constraint->maxHeight)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum height', $constraint->maxHeight));
-            }
-
-            if ($height > $constraint->maxHeight) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->maxHeightMessage)
-                        ->setParameter('{{ height }}', $height)
-                        ->setParameter('{{ max_height }}', $constraint->maxHeight)
-                        ->setCode(Image::TOO_HIGH_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->maxHeightMessage)
-                        ->setParameter('{{ height }}', $height)
-                        ->setParameter('{{ max_height }}', $constraint->maxHeight)
-                        ->setCode(Image::TOO_HIGH_ERROR)
-                        ->addViolation();
-                }
-            }
-        }
-
-        $ratio = round($width / $height, 2);
-
-        if (null !== $constraint->minRatio) {
-            if (!is_numeric((string) $constraint->minRatio)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid minimum ratio', $constraint->minRatio));
-            }
-
-            if ($ratio < $constraint->minRatio) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->minRatioMessage)
-                        ->setParameter('{{ ratio }}', $ratio)
-                        ->setParameter('{{ min_ratio }}', $constraint->minRatio)
-                        ->setCode(Image::RATIO_TOO_SMALL_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->minRatioMessage)
-                        ->setParameter('{{ ratio }}', $ratio)
-                        ->setParameter('{{ min_ratio }}', $constraint->minRatio)
-                        ->setCode(Image::RATIO_TOO_SMALL_ERROR)
-                        ->addViolation();
-                }
-            }
-        }
-
-        if (null !== $constraint->maxRatio) {
-            if (!is_numeric((string) $constraint->maxRatio)) {
-                throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum ratio', $constraint->maxRatio));
-            }
-
-            if ($ratio > $constraint->maxRatio) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->maxRatioMessage)
-                        ->setParameter('{{ ratio }}', $ratio)
-                        ->setParameter('{{ max_ratio }}', $constraint->maxRatio)
-                        ->setCode(Image::RATIO_TOO_BIG_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->maxRatioMessage)
-                        ->setParameter('{{ ratio }}', $ratio)
-                        ->setParameter('{{ max_ratio }}', $constraint->maxRatio)
-                        ->setCode(Image::RATIO_TOO_BIG_ERROR)
-                        ->addViolation();
-                }
-            }
-        }
-
-        if (!$constraint->allowSquare && $width == $height) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->allowSquareMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::SQUARE_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->allowSquareMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::SQUARE_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            }
-        }
-
-        if (!$constraint->allowLandscape && $width > $height) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->allowLandscapeMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::LANDSCAPE_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->allowLandscapeMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::LANDSCAPE_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            }
-        }
-
-        if (!$constraint->allowPortrait && $width < $height) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->allowPortraitMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::PORTRAIT_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->allowPortraitMessage)
-                    ->setParameter('{{ width }}', $width)
-                    ->setParameter('{{ height }}', $height)
-                    ->setCode(Image::PORTRAIT_NOT_ALLOWED_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Ip.php b/vendor/symfony/validator/Constraints/Ip.php
deleted file mode 100644
index 8096502..0000000
--- a/vendor/symfony/validator/Constraints/Ip.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * Validates that a value is a valid IP address.
- *
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Joseph Bielawski <stloyd@gmail.com>
- */
-class Ip extends Constraint
-{
-    const V4 = '4';
-    const V6 = '6';
-    const ALL = 'all';
-
-    // adds FILTER_FLAG_NO_PRIV_RANGE flag (skip private ranges)
-    const V4_NO_PRIV = '4_no_priv';
-    const V6_NO_PRIV = '6_no_priv';
-    const ALL_NO_PRIV = 'all_no_priv';
-
-    // adds FILTER_FLAG_NO_RES_RANGE flag (skip reserved ranges)
-    const V4_NO_RES = '4_no_res';
-    const V6_NO_RES = '6_no_res';
-    const ALL_NO_RES = 'all_no_res';
-
-    // adds FILTER_FLAG_NO_PRIV_RANGE and FILTER_FLAG_NO_RES_RANGE flags (skip both)
-    const V4_ONLY_PUBLIC = '4_public';
-    const V6_ONLY_PUBLIC = '6_public';
-    const ALL_ONLY_PUBLIC = 'all_public';
-
-    protected static $versions = array(
-        self::V4,
-        self::V6,
-        self::ALL,
-
-        self::V4_NO_PRIV,
-        self::V6_NO_PRIV,
-        self::ALL_NO_PRIV,
-
-        self::V4_NO_RES,
-        self::V6_NO_RES,
-        self::ALL_NO_RES,
-
-        self::V4_ONLY_PUBLIC,
-        self::V6_ONLY_PUBLIC,
-        self::ALL_ONLY_PUBLIC,
-    );
-
-    public $version = self::V4;
-
-    public $message = 'This is not a valid IP address.';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-
-        if (!in_array($this->version, self::$versions)) {
-            throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s"', implode('", "', self::$versions)));
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IpValidator.php b/vendor/symfony/validator/Constraints/IpValidator.php
deleted file mode 100644
index 0b17cf7..0000000
--- a/vendor/symfony/validator/Constraints/IpValidator.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid IP address.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Joseph Bielawski <stloyd@gmail.com>
- */
-class IpValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Ip) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Ip');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        switch ($constraint->version) {
-            case Ip::V4:
-               $flag = FILTER_FLAG_IPV4;
-               break;
-
-            case Ip::V6:
-               $flag = FILTER_FLAG_IPV6;
-               break;
-
-            case Ip::V4_NO_PRIV:
-               $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE;
-               break;
-
-            case Ip::V6_NO_PRIV:
-               $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE;
-               break;
-
-            case Ip::ALL_NO_PRIV:
-               $flag = FILTER_FLAG_NO_PRIV_RANGE;
-               break;
-
-            case Ip::V4_NO_RES:
-               $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            case Ip::V6_NO_RES:
-               $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            case Ip::ALL_NO_RES:
-               $flag = FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            case Ip::V4_ONLY_PUBLIC:
-               $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            case Ip::V6_ONLY_PUBLIC:
-               $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            case Ip::ALL_ONLY_PUBLIC:
-               $flag = FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
-               break;
-
-            default:
-                $flag = null;
-                break;
-        }
-
-        if (!filter_var($value, FILTER_VALIDATE_IP, $flag)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IsFalse.php b/vendor/symfony/validator/Constraints/IsFalse.php
deleted file mode 100644
index 71a0ed6..0000000
--- a/vendor/symfony/validator/Constraints/IsFalse.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsFalse extends Constraint
-{
-    public $message = 'This value should be false.';
-}
diff --git a/vendor/symfony/validator/Constraints/IsFalseValidator.php b/vendor/symfony/validator/Constraints/IsFalseValidator.php
deleted file mode 100644
index b78163b..0000000
--- a/vendor/symfony/validator/Constraints/IsFalseValidator.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsFalseValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof IsFalse) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsFalse');
-        }
-
-        if (null === $value || false === $value || 0 === $value || '0' === $value) {
-            return;
-        }
-
-        if ($this->context instanceof ExecutionContextInterface) {
-            $this->context->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->addViolation();
-        } else {
-            $this->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->addViolation();
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IsNull.php b/vendor/symfony/validator/Constraints/IsNull.php
deleted file mode 100644
index 64e837a..0000000
--- a/vendor/symfony/validator/Constraints/IsNull.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsNull extends Constraint
-{
-    public $message = 'This value should be null.';
-}
diff --git a/vendor/symfony/validator/Constraints/IsNullValidator.php b/vendor/symfony/validator/Constraints/IsNullValidator.php
deleted file mode 100644
index 5615121..0000000
--- a/vendor/symfony/validator/Constraints/IsNullValidator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsNullValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof IsNull) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsNull');
-        }
-
-        if (null !== $value) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IsTrue.php b/vendor/symfony/validator/Constraints/IsTrue.php
deleted file mode 100644
index 653135b..0000000
--- a/vendor/symfony/validator/Constraints/IsTrue.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsTrue extends Constraint
-{
-    public $message = 'This value should be true.';
-}
diff --git a/vendor/symfony/validator/Constraints/IsTrueValidator.php b/vendor/symfony/validator/Constraints/IsTrueValidator.php
deleted file mode 100644
index 2882dd6..0000000
--- a/vendor/symfony/validator/Constraints/IsTrueValidator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class IsTrueValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof IsTrue) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\IsTrue');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if (true !== $value && 1 !== $value && '1' !== $value) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Isbn.php b/vendor/symfony/validator/Constraints/Isbn.php
deleted file mode 100644
index 3878c84..0000000
--- a/vendor/symfony/validator/Constraints/Isbn.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author The Whole Life To Learn <thewholelifetolearn@gmail.com>
- * @author Manuel Reinhard <manu@sprain.ch>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Isbn extends Constraint
-{
-    const TOO_SHORT_ERROR = 1;
-    const TOO_LONG_ERROR = 2;
-    const INVALID_CHARACTERS_ERROR = 3;
-    const CHECKSUM_FAILED_ERROR = 4;
-    const TYPE_NOT_RECOGNIZED_ERROR = 5;
-
-    protected static $errorNames = array(
-        self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
-        self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
-        self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-        self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-        self::TYPE_NOT_RECOGNIZED_ERROR => 'TYPE_NOT_RECOGNIZED_ERROR',
-    );
-
-    public $isbn10Message = 'This value is not a valid ISBN-10.';
-    public $isbn13Message = 'This value is not a valid ISBN-13.';
-    public $bothIsbnMessage = 'This value is neither a valid ISBN-10 nor a valid ISBN-13.';
-    public $type;
-    public $message;
-
-    /**
-     * @deprecated since version 2.5, to be removed in 3.0. Use option "type" instead.
-     *
-     * @var bool
-     */
-    public $isbn10 = false;
-
-    /**
-     * @deprecated since version 2.5, to be removed in 3.0. Use option "type" instead.
-     *
-     * @var bool
-     */
-    public $isbn13 = false;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'type';
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/IsbnValidator.php b/vendor/symfony/validator/Constraints/IsbnValidator.php
deleted file mode 100644
index aaf52dc..0000000
--- a/vendor/symfony/validator/Constraints/IsbnValidator.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether the value is a valid ISBN-10 or ISBN-13.
- *
- * @author The Whole Life To Learn <thewholelifetolearn@gmail.com>
- * @author Manuel Reinhard <manu@sprain.ch>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see https://en.wikipedia.org/wiki/Isbn
- */
-class IsbnValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Isbn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Isbn');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $canonical = str_replace('-', '', $value);
-
-        if (null === $constraint->type) {
-            if ($constraint->isbn10 && !$constraint->isbn13) {
-                @trigger_error('The "isbn10" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
-                $constraint->type = 'isbn10';
-            } elseif ($constraint->isbn13 && !$constraint->isbn10) {
-                @trigger_error('The "isbn13" option of the Isbn constraint is deprecated since version 2.5 and will be removed in 3.0. Use the "type" option instead.', E_USER_DEPRECATED);
-                $constraint->type = 'isbn13';
-            }
-        }
-
-        // Explicitly validate against ISBN-10
-        if ('isbn10' === $constraint->type) {
-            if (true !== ($code = $this->validateIsbn10($canonical))) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($this->getMessage($constraint, $constraint->type))
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode($code)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($this->getMessage($constraint, $constraint->type))
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode($code)
-                        ->addViolation();
-                }
-            }
-
-            return;
-        }
-
-        // Explicitly validate against ISBN-13
-        if ('isbn13' === $constraint->type) {
-            if (true !== ($code = $this->validateIsbn13($canonical))) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($this->getMessage($constraint, $constraint->type))
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode($code)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($this->getMessage($constraint, $constraint->type))
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode($code)
-                        ->addViolation();
-                }
-            }
-
-            return;
-        }
-
-        // Try both ISBNs
-
-        // First, try ISBN-10
-        $code = $this->validateIsbn10($canonical);
-
-        // The ISBN can only be an ISBN-13 if the value was too long for ISBN-10
-        if (Isbn::TOO_LONG_ERROR === $code) {
-            // Try ISBN-13 now
-            $code = $this->validateIsbn13($canonical);
-
-            // If too short, this means we have 11 or 12 digits
-            if (Isbn::TOO_SHORT_ERROR === $code) {
-                $code = Isbn::TYPE_NOT_RECOGNIZED_ERROR;
-            }
-        }
-
-        if (true !== $code) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($this->getMessage($constraint))
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode($code)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($this->getMessage($constraint))
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode($code)
-                    ->addViolation();
-            }
-        }
-    }
-
-    protected function validateIsbn10($isbn)
-    {
-        // Choose an algorithm so that ERROR_INVALID_CHARACTERS is preferred
-        // over ERROR_TOO_SHORT/ERROR_TOO_LONG
-        // Otherwise "0-45122-5244" passes, but "0-45122_5244" reports
-        // "too long"
-
-        // Error priority:
-        // 1. ERROR_INVALID_CHARACTERS
-        // 2. ERROR_TOO_SHORT/ERROR_TOO_LONG
-        // 3. ERROR_CHECKSUM_FAILED
-
-        $checkSum = 0;
-
-        for ($i = 0; $i < 10; ++$i) {
-            // If we test the length before the loop, we get an ERROR_TOO_SHORT
-            // when actually an ERROR_INVALID_CHARACTERS is wanted, e.g. for
-            // "0-45122_5244" (typo)
-            if (!isset($isbn{$i})) {
-                return Isbn::TOO_SHORT_ERROR;
-            }
-
-            if ('X' === $isbn{$i}) {
-                $digit = 10;
-            } elseif (ctype_digit($isbn{$i})) {
-                $digit = $isbn{$i};
-            } else {
-                return Isbn::INVALID_CHARACTERS_ERROR;
-            }
-
-            $checkSum += $digit * (10 - $i);
-        }
-
-        if (isset($isbn{$i})) {
-            return Isbn::TOO_LONG_ERROR;
-        }
-
-        return 0 === $checkSum % 11 ? true : Isbn::CHECKSUM_FAILED_ERROR;
-    }
-
-    protected function validateIsbn13($isbn)
-    {
-        // Error priority:
-        // 1. ERROR_INVALID_CHARACTERS
-        // 2. ERROR_TOO_SHORT/ERROR_TOO_LONG
-        // 3. ERROR_CHECKSUM_FAILED
-
-        if (!ctype_digit($isbn)) {
-            return Isbn::INVALID_CHARACTERS_ERROR;
-        }
-
-        $length = strlen($isbn);
-
-        if ($length < 13) {
-            return Isbn::TOO_SHORT_ERROR;
-        }
-
-        if ($length > 13) {
-            return Isbn::TOO_LONG_ERROR;
-        }
-
-        $checkSum = 0;
-
-        for ($i = 0; $i < 13; $i += 2) {
-            $checkSum += $isbn{$i};
-        }
-
-        for ($i = 1; $i < 12; $i += 2) {
-            $checkSum += $isbn{$i}
-            * 3;
-        }
-
-        return 0 === $checkSum % 10 ? true : Isbn::CHECKSUM_FAILED_ERROR;
-    }
-
-    protected function getMessage($constraint, $type = null)
-    {
-        if (null !== $constraint->message) {
-            return $constraint->message;
-        } elseif ('isbn10' === $type) {
-            return $constraint->isbn10Message;
-        } elseif ('isbn13' === $type) {
-            return $constraint->isbn13Message;
-        }
-
-        return $constraint->bothIsbnMessage;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Issn.php b/vendor/symfony/validator/Constraints/Issn.php
deleted file mode 100644
index 39716a2..0000000
--- a/vendor/symfony/validator/Constraints/Issn.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Antonio J. García Lagar <aj@garcialagar.es>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Issn extends Constraint
-{
-    const TOO_SHORT_ERROR = 1;
-    const TOO_LONG_ERROR = 2;
-    const MISSING_HYPHEN_ERROR = 3;
-    const INVALID_CHARACTERS_ERROR = 4;
-    const INVALID_CASE_ERROR = 5;
-    const CHECKSUM_FAILED_ERROR = 6;
-
-    protected static $errorNames = array(
-        self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
-        self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
-        self::MISSING_HYPHEN_ERROR => 'MISSING_HYPHEN_ERROR',
-        self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-        self::INVALID_CASE_ERROR => 'INVALID_CASE_ERROR',
-        self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-    );
-
-    public $message = 'This value is not a valid ISSN.';
-    public $caseSensitive = false;
-    public $requireHyphen = false;
-}
diff --git a/vendor/symfony/validator/Constraints/IssnValidator.php b/vendor/symfony/validator/Constraints/IssnValidator.php
deleted file mode 100644
index 000af74..0000000
--- a/vendor/symfony/validator/Constraints/IssnValidator.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether the value is a valid ISSN.
- *
- * @author Antonio J. García Lagar <aj@garcialagar.es>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see https://en.wikipedia.org/wiki/Issn
- */
-class IssnValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Issn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Issn');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $canonical = $value;
-
-        // 1234-567X
-        //     ^
-        if (isset($canonical{4}) && '-' === $canonical{4}) {
-            // remove hyphen
-            $canonical = substr($canonical, 0, 4).substr($canonical, 5);
-        } elseif ($constraint->requireHyphen) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::MISSING_HYPHEN_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::MISSING_HYPHEN_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $length = strlen($canonical);
-
-        if ($length < 8) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::TOO_SHORT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::TOO_SHORT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if ($length > 8) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::TOO_LONG_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::TOO_LONG_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // 1234567X
-        // ^^^^^^^ digits only
-        if (!ctype_digit(substr($canonical, 0, 7))) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // 1234567X
-        //        ^ digit, x or X
-        if (!ctype_digit($canonical{7}) && 'x' !== $canonical{7} && 'X' !== $canonical{7}) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // 1234567X
-        //        ^ case-sensitive?
-        if ($constraint->caseSensitive && 'x' === $canonical{7}) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CASE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::INVALID_CASE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        // Calculate a checksum. "X" equals 10.
-        $checkSum = 'X' === $canonical{7}
-        || 'x' === $canonical{7}
-        ? 10
-            : $canonical{7};
-
-        for ($i = 0; $i < 7; ++$i) {
-            // Multiply the first digit by 8, the second by 7, etc.
-            $checkSum += (8 - $i) * $canonical{$i};
-        }
-
-        if (0 !== $checkSum % 11) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Issn::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Language.php b/vendor/symfony/validator/Constraints/Language.php
deleted file mode 100644
index c6f513c..0000000
--- a/vendor/symfony/validator/Constraints/Language.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Language extends Constraint
-{
-    public $message = 'This value is not a valid language.';
-}
diff --git a/vendor/symfony/validator/Constraints/LanguageValidator.php b/vendor/symfony/validator/Constraints/LanguageValidator.php
deleted file mode 100644
index 1f514ab..0000000
--- a/vendor/symfony/validator/Constraints/LanguageValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Intl\Intl;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid language code.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LanguageValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Language) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Language');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $languages = Intl::getLanguageBundle()->getLanguageNames();
-
-        if (!isset($languages[$value])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Length.php b/vendor/symfony/validator/Constraints/Length.php
deleted file mode 100644
index bca4edb..0000000
--- a/vendor/symfony/validator/Constraints/Length.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\MissingOptionsException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Length extends Constraint
-{
-    const TOO_SHORT_ERROR = 1;
-    const TOO_LONG_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
-        self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
-    );
-
-    public $maxMessage = 'This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.';
-    public $minMessage = 'This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.';
-    public $exactMessage = 'This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.';
-    public $charsetMessage = 'This value does not match the expected {{ charset }} charset.';
-    public $max;
-    public $min;
-    public $charset = 'UTF-8';
-
-    public function __construct($options = null)
-    {
-        if (null !== $options && !is_array($options)) {
-            $options = array(
-                'min' => $options,
-                'max' => $options,
-            );
-        }
-
-        parent::__construct($options);
-
-        if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/LengthValidator.php b/vendor/symfony/validator/Constraints/LengthValidator.php
deleted file mode 100644
index d340749..0000000
--- a/vendor/symfony/validator/Constraints/LengthValidator.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LengthValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Length) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Length');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $stringValue = (string) $value;
-        $invalidCharset = false;
-
-        if ('UTF8' === $charset = strtoupper($constraint->charset)) {
-            $charset = 'UTF-8';
-        }
-
-        if ('UTF-8' === $charset) {
-            if (!preg_match('//u', $stringValue)) {
-                $invalidCharset = true;
-            } elseif (function_exists('utf8_decode')) {
-                $length = strlen(utf8_decode($stringValue));
-            } else {
-                preg_replace('/./u', '', $stringValue, -1, $length);
-            }
-        } elseif (function_exists('mb_strlen')) {
-            if (@mb_check_encoding($stringValue, $constraint->charset)) {
-                $length = mb_strlen($stringValue, $constraint->charset);
-            } else {
-                $invalidCharset = true;
-            }
-        } elseif (function_exists('iconv_strlen')) {
-            $length = @iconv_strlen($stringValue, $constraint->charset);
-            $invalidCharset = false === $length;
-        } else {
-            $length = strlen($stringValue);
-        }
-
-        if ($invalidCharset) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->charsetMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ charset }}', $constraint->charset)
-                    ->setInvalidValue($value)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->charsetMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ charset }}', $constraint->charset)
-                    ->setInvalidValue($value)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (null !== $constraint->max && $length > $constraint->max) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ limit }}', $constraint->max)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->max)
-                    ->setCode(Length::TOO_LONG_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ limit }}', $constraint->max)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->max)
-                    ->setCode(Length::TOO_LONG_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (null !== $constraint->min && $length < $constraint->min) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->minMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ limit }}', $constraint->min)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->min)
-                    ->setCode(Length::TOO_SHORT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->minMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($stringValue))
-                    ->setParameter('{{ limit }}', $constraint->min)
-                    ->setInvalidValue($value)
-                    ->setPlural((int) $constraint->min)
-                    ->setCode(Length::TOO_SHORT_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/LessThan.php b/vendor/symfony/validator/Constraints/LessThan.php
deleted file mode 100644
index b116320..0000000
--- a/vendor/symfony/validator/Constraints/LessThan.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class LessThan extends AbstractComparison
-{
-    public $message = 'This value should be less than {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/LessThanOrEqual.php b/vendor/symfony/validator/Constraints/LessThanOrEqual.php
deleted file mode 100644
index 7faca84..0000000
--- a/vendor/symfony/validator/Constraints/LessThanOrEqual.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class LessThanOrEqual extends AbstractComparison
-{
-    public $message = 'This value should be less than or equal to {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php b/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php
deleted file mode 100644
index dcc93b2..0000000
--- a/vendor/symfony/validator/Constraints/LessThanOrEqualValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are less than or equal to the previous (<=).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class LessThanOrEqualValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 <= $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/LessThanValidator.php b/vendor/symfony/validator/Constraints/LessThanValidator.php
deleted file mode 100644
index 081316a..0000000
--- a/vendor/symfony/validator/Constraints/LessThanValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are less than the previous (<).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class LessThanValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 < $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Locale.php b/vendor/symfony/validator/Constraints/Locale.php
deleted file mode 100644
index cf30eb2..0000000
--- a/vendor/symfony/validator/Constraints/Locale.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Locale extends Constraint
-{
-    public $message = 'This value is not a valid locale.';
-}
diff --git a/vendor/symfony/validator/Constraints/LocaleValidator.php b/vendor/symfony/validator/Constraints/LocaleValidator.php
deleted file mode 100644
index 038a1a4..0000000
--- a/vendor/symfony/validator/Constraints/LocaleValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Intl\Intl;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value is a valid locale code.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LocaleValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Locale) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Locale');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        $locales = Intl::getLocaleBundle()->getLocaleNames();
-
-        if (!isset($locales[$value])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Luhn.php b/vendor/symfony/validator/Constraints/Luhn.php
deleted file mode 100644
index 24f5bc7..0000000
--- a/vendor/symfony/validator/Constraints/Luhn.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * Metadata for the LuhnValidator.
- *
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Tim Nagel <t.nagel@infinite.net.au>
- * @author Greg Knapp http://gregk.me/2011/php-implementation-of-bank-card-luhn-algorithm/
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Luhn extends Constraint
-{
-    const INVALID_CHARACTERS_ERROR = 1;
-    const CHECKSUM_FAILED_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-        self::CHECKSUM_FAILED_ERROR => 'CHECKSUM_FAILED_ERROR',
-    );
-
-    public $message = 'Invalid card number.';
-}
diff --git a/vendor/symfony/validator/Constraints/LuhnValidator.php b/vendor/symfony/validator/Constraints/LuhnValidator.php
deleted file mode 100644
index 31d4497..0000000
--- a/vendor/symfony/validator/Constraints/LuhnValidator.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates a PAN using the LUHN Algorithm.
- *
- * For a list of example card numbers that are used to test this
- * class, please see the LuhnValidatorTest class.
- *
- * @see    http://en.wikipedia.org/wiki/Luhn_algorithm
- *
- * @author Tim Nagel <t.nagel@infinite.net.au>
- * @author Greg Knapp http://gregk.me/2011/php-implementation-of-bank-card-luhn-algorithm/
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LuhnValidator extends ConstraintValidator
-{
-    /**
-     * Validates a credit card number with the Luhn algorithm.
-     *
-     * @param mixed      $value
-     * @param Constraint $constraint
-     *
-     * @throws UnexpectedTypeException when the given credit card number is no string
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Luhn) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Luhn');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        // Work with strings only, because long numbers are represented as floats
-        // internally and don't work with strlen()
-        if (!is_string($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if (!ctype_digit($value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Luhn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Luhn::INVALID_CHARACTERS_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $checkSum = 0;
-        $length = strlen($value);
-
-        // Starting with the last digit and walking left, add every second
-        // digit to the check sum
-        // e.g. 7  9  9  2  7  3  9  8  7  1  3
-        //      ^     ^     ^     ^     ^     ^
-        //    = 7  +  9  +  7  +  9  +  7  +  3
-        for ($i = $length - 1; $i >= 0; $i -= 2) {
-            $checkSum += $value{$i};
-        }
-
-        // Starting with the second last digit and walking left, double every
-        // second digit and add it to the check sum
-        // For doubles greater than 9, sum the individual digits
-        // e.g. 7  9  9  2  7  3  9  8  7  1  3
-        //         ^     ^     ^     ^     ^
-        //    =    1+8 + 4  +  6  +  1+6 + 2
-        for ($i = $length - 2; $i >= 0; $i -= 2) {
-            $checkSum += array_sum(str_split($value{$i} * 2));
-        }
-
-        if (0 === $checkSum || 0 !== $checkSum % 10) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Luhn::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Luhn::CHECKSUM_FAILED_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/NotBlank.php b/vendor/symfony/validator/Constraints/NotBlank.php
deleted file mode 100644
index 750f412..0000000
--- a/vendor/symfony/validator/Constraints/NotBlank.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class NotBlank extends Constraint
-{
-    public $message = 'This value should not be blank.';
-}
diff --git a/vendor/symfony/validator/Constraints/NotBlankValidator.php b/vendor/symfony/validator/Constraints/NotBlankValidator.php
deleted file mode 100644
index f0d4f21..0000000
--- a/vendor/symfony/validator/Constraints/NotBlankValidator.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class NotBlankValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof NotBlank) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotBlank');
-        }
-
-        if (false === $value || (empty($value) && '0' != $value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/NotEqualTo.php b/vendor/symfony/validator/Constraints/NotEqualTo.php
deleted file mode 100644
index abd8092..0000000
--- a/vendor/symfony/validator/Constraints/NotEqualTo.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class NotEqualTo extends AbstractComparison
-{
-    public $message = 'This value should not be equal to {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/NotEqualToValidator.php b/vendor/symfony/validator/Constraints/NotEqualToValidator.php
deleted file mode 100644
index 5710a85..0000000
--- a/vendor/symfony/validator/Constraints/NotEqualToValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values are all unequal (!=).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class NotEqualToValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 != $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/NotIdenticalTo.php b/vendor/symfony/validator/Constraints/NotIdenticalTo.php
deleted file mode 100644
index fb4ef3f..0000000
--- a/vendor/symfony/validator/Constraints/NotIdenticalTo.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class NotIdenticalTo extends AbstractComparison
-{
-    public $message = 'This value should not be identical to {{ compared_value_type }} {{ compared_value }}.';
-}
diff --git a/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php b/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php
deleted file mode 100644
index ed8dc1c..0000000
--- a/vendor/symfony/validator/Constraints/NotIdenticalToValidator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * Validates values aren't identical (!==).
- *
- * @author Daniel Holmes <daniel@danielholmes.org>
- */
-class NotIdenticalToValidator extends AbstractComparisonValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function compareValues($value1, $value2)
-    {
-        return $value1 !== $value2;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/NotNull.php b/vendor/symfony/validator/Constraints/NotNull.php
deleted file mode 100644
index 57f2492..0000000
--- a/vendor/symfony/validator/Constraints/NotNull.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class NotNull extends Constraint
-{
-    public $message = 'This value should not be null.';
-}
diff --git a/vendor/symfony/validator/Constraints/NotNullValidator.php b/vendor/symfony/validator/Constraints/NotNullValidator.php
deleted file mode 100644
index 88ffb98..0000000
--- a/vendor/symfony/validator/Constraints/NotNullValidator.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class NotNullValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof NotNull) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\NotNull');
-        }
-
-        if (null === $value) {
-            $this->context->addViolation($constraint->message);
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Null.php b/vendor/symfony/validator/Constraints/Null.php
deleted file mode 100644
index 705d93f..0000000
--- a/vendor/symfony/validator/Constraints/Null.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNull class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsNull instead.
- */
-class Null extends IsNull
-{
-}
diff --git a/vendor/symfony/validator/Constraints/NullValidator.php b/vendor/symfony/validator/Constraints/NullValidator.php
deleted file mode 100644
index bd17eab..0000000
--- a/vendor/symfony/validator/Constraints/NullValidator.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsNullValidator class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsNullValidator instead.
- */
-class NullValidator extends IsNullValidator
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Optional.php b/vendor/symfony/validator/Constraints/Optional.php
deleted file mode 100644
index dab8b43..0000000
--- a/vendor/symfony/validator/Constraints/Optional.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Optional extends Existence
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Range.php b/vendor/symfony/validator/Constraints/Range.php
deleted file mode 100644
index c59c50c..0000000
--- a/vendor/symfony/validator/Constraints/Range.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\MissingOptionsException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Range extends Constraint
-{
-    const INVALID_VALUE_ERROR = 1;
-    const BEYOND_RANGE_ERROR = 2;
-    const BELOW_RANGE_ERROR = 3;
-
-    protected static $errorNames = array(
-        self::INVALID_VALUE_ERROR => 'INVALID_VALUE_ERROR',
-        self::BEYOND_RANGE_ERROR => 'BEYOND_RANGE_ERROR',
-        self::BELOW_RANGE_ERROR => 'BELOW_RANGE_ERROR',
-    );
-
-    public $minMessage = 'This value should be {{ limit }} or more.';
-    public $maxMessage = 'This value should be {{ limit }} or less.';
-    public $invalidMessage = 'This value should be a valid number.';
-    public $min;
-    public $max;
-
-    public function __construct($options = null)
-    {
-        parent::__construct($options);
-
-        if (null === $this->min && null === $this->max) {
-            throw new MissingOptionsException(sprintf('Either option "min" or "max" must be given for constraint %s', __CLASS__), array('min', 'max'));
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/RangeValidator.php b/vendor/symfony/validator/Constraints/RangeValidator.php
deleted file mode 100644
index 8f5fdda..0000000
--- a/vendor/symfony/validator/Constraints/RangeValidator.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class RangeValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Range) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Range');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if (!is_numeric($value) && !$value instanceof \DateTime && !$value instanceof \DateTimeInterface) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->invalidMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setCode(Range::INVALID_VALUE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->invalidMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setCode(Range::INVALID_VALUE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        $min = $constraint->min;
-        $max = $constraint->max;
-
-        // Convert strings to DateTimes if comparing another DateTime
-        // This allows to compare with any date/time value supported by
-        // the DateTime constructor:
-        // http://php.net/manual/en/datetime.formats.php
-        if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
-            if (is_string($min)) {
-                $min = new \DateTime($min);
-            }
-
-            if (is_string($max)) {
-                $max = new \DateTime($max);
-            }
-        }
-
-        if (null !== $constraint->max && $value > $max) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->maxMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setParameter('{{ limit }}', $this->formatValue($max, self::PRETTY_DATE))
-                    ->setCode(Range::BEYOND_RANGE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->maxMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setParameter('{{ limit }}', $this->formatValue($max, self::PRETTY_DATE))
-                    ->setCode(Range::BEYOND_RANGE_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (null !== $constraint->min && $value < $min) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->minMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setParameter('{{ limit }}', $this->formatValue($min, self::PRETTY_DATE))
-                    ->setCode(Range::BELOW_RANGE_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->minMessage)
-                    ->setParameter('{{ value }}', $this->formatValue($value, self::PRETTY_DATE))
-                    ->setParameter('{{ limit }}', $this->formatValue($min, self::PRETTY_DATE))
-                    ->setCode(Range::BELOW_RANGE_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Regex.php b/vendor/symfony/validator/Constraints/Regex.php
deleted file mode 100644
index 724274a..0000000
--- a/vendor/symfony/validator/Constraints/Regex.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Regex extends Constraint
-{
-    public $message = 'This value is not valid.';
-    public $pattern;
-    public $htmlPattern;
-    public $match = true;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'pattern';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequiredOptions()
-    {
-        return array('pattern');
-    }
-
-    /**
-     * Converts the htmlPattern to a suitable format for HTML5 pattern.
-     * Example: /^[a-z]+$/ would be converted to [a-z]+
-     * However, if options are specified, it cannot be converted.
-     *
-     * Pattern is also ignored if match=false since the pattern should
-     * then be reversed before application.
-     *
-     * @link http://dev.w3.org/html5/spec/single-page.html#the-pattern-attribute
-     *
-     * @return string|null
-     */
-    public function getHtmlPattern()
-    {
-        // If htmlPattern is specified, use it
-        if (null !== $this->htmlPattern) {
-            return empty($this->htmlPattern)
-                ? null
-                : $this->htmlPattern;
-        }
-
-        // Quit if delimiters not at very beginning/end (e.g. when options are passed)
-        if ($this->pattern[0] !== $this->pattern[strlen($this->pattern) - 1]) {
-            return;
-        }
-
-        $delimiter = $this->pattern[0];
-
-        // Unescape the delimiter
-        $pattern = str_replace('\\'.$delimiter, $delimiter, substr($this->pattern, 1, -1));
-
-        // If the pattern is inverted, we can simply wrap it in
-        // ((?!pattern).)*
-        if (!$this->match) {
-            return '((?!'.$pattern.').)*';
-        }
-
-        // If the pattern contains an or statement, wrap the pattern in
-        // .*(pattern).* and quit. Otherwise we'd need to parse the pattern
-        if (false !== strpos($pattern, '|')) {
-            return '.*('.$pattern.').*';
-        }
-
-        // Trim leading ^, otherwise prepend .*
-        $pattern = '^' === $pattern[0] ? substr($pattern, 1) : '.*'.$pattern;
-
-        // Trim trailing $, otherwise append .*
-        $pattern = '$' === $pattern[strlen($pattern) - 1] ? substr($pattern, 0, -1) : $pattern.'.*';
-
-        return $pattern;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/RegexValidator.php b/vendor/symfony/validator/Constraints/RegexValidator.php
deleted file mode 100644
index 850d760..0000000
--- a/vendor/symfony/validator/Constraints/RegexValidator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether a value match or not given regexp pattern.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Joseph Bielawski <stloyd@gmail.com>
- */
-class RegexValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Regex) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Regex');
-        }
-
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if ($constraint->match xor preg_match($constraint->pattern, $value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Required.php b/vendor/symfony/validator/Constraints/Required.php
deleted file mode 100644
index bd77a90..0000000
--- a/vendor/symfony/validator/Constraints/Required.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-/**
- * @Annotation
- * @Target({"ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Required extends Existence
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Time.php b/vendor/symfony/validator/Constraints/Time.php
deleted file mode 100644
index 1134c2e..0000000
--- a/vendor/symfony/validator/Constraints/Time.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Time extends Constraint
-{
-    const INVALID_FORMAT_ERROR = 1;
-    const INVALID_TIME_ERROR = 2;
-
-    protected static $errorNames = array(
-        self::INVALID_FORMAT_ERROR => 'INVALID_FORMAT_ERROR',
-        self::INVALID_TIME_ERROR => 'INVALID_TIME_ERROR',
-    );
-
-    public $message = 'This value is not a valid time.';
-}
diff --git a/vendor/symfony/validator/Constraints/TimeValidator.php b/vendor/symfony/validator/Constraints/TimeValidator.php
deleted file mode 100644
index b5b7b9c..0000000
--- a/vendor/symfony/validator/Constraints/TimeValidator.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class TimeValidator extends ConstraintValidator
-{
-    const PATTERN = '/^(\d{2}):(\d{2}):(\d{2})$/';
-
-    /**
-     * Checks whether a time is valid.
-     *
-     * @param int $hour   The hour
-     * @param int $minute The minute
-     * @param int $second The second
-     *
-     * @return bool Whether the time is valid
-     *
-     * @internal
-     */
-    public static function checkTime($hour, $minute, $second)
-    {
-        return $hour >= 0 && $hour < 24 && $minute >= 0 && $minute < 60 && $second >= 0 && $second < 60;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Time) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Time');
-        }
-
-        if (null === $value || '' === $value || $value instanceof \DateTime) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if (!preg_match(static::PATTERN, $value, $matches)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Time::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Time::INVALID_FORMAT_ERROR)
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if (!self::checkTime($matches[1], $matches[2], $matches[3])) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Time::INVALID_TIME_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Time::INVALID_TIME_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Traverse.php b/vendor/symfony/validator/Constraints/Traverse.php
deleted file mode 100644
index 5811ad7..0000000
--- a/vendor/symfony/validator/Constraints/Traverse.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * @Annotation
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Traverse extends Constraint
-{
-    public $traverse = true;
-
-    public function __construct($options = null)
-    {
-        if (is_array($options) && array_key_exists('groups', $options)) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The option "groups" is not supported by the constraint %s',
-                __CLASS__
-            ));
-        }
-
-        parent::__construct($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'traverse';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTargets()
-    {
-        return self::CLASS_CONSTRAINT;
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/True.php b/vendor/symfony/validator/Constraints/True.php
deleted file mode 100644
index b9efff3..0000000
--- a/vendor/symfony/validator/Constraints/True.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrue class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsTrue instead.
- */
-class True extends IsTrue
-{
-}
diff --git a/vendor/symfony/validator/Constraints/TrueValidator.php b/vendor/symfony/validator/Constraints/TrueValidator.php
deleted file mode 100644
index 14d8798..0000000
--- a/vendor/symfony/validator/Constraints/TrueValidator.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-@trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since version 2.7 and will be removed in 3.0. Use the IsTrueValidator class in the same namespace instead.', E_USER_DEPRECATED);
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use IsTrueValidator instead.
- */
-class TrueValidator extends IsTrueValidator
-{
-}
diff --git a/vendor/symfony/validator/Constraints/Type.php b/vendor/symfony/validator/Constraints/Type.php
deleted file mode 100644
index afe5903..0000000
--- a/vendor/symfony/validator/Constraints/Type.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Type extends Constraint
-{
-    public $message = 'This value should be of type {{ type }}.';
-    public $type;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'type';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequiredOptions()
-    {
-        return array('type');
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/TypeValidator.php b/vendor/symfony/validator/Constraints/TypeValidator.php
deleted file mode 100644
index 592f122..0000000
--- a/vendor/symfony/validator/Constraints/TypeValidator.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class TypeValidator extends ConstraintValidator
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Type) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Type');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        $type = strtolower($constraint->type);
-        $type = $type == 'boolean' ? 'bool' : $constraint->type;
-        $isFunction = 'is_'.$type;
-        $ctypeFunction = 'ctype_'.$type;
-
-        if (function_exists($isFunction) && $isFunction($value)) {
-            return;
-        } elseif (function_exists($ctypeFunction) && $ctypeFunction($value)) {
-            return;
-        } elseif ($value instanceof $constraint->type) {
-            return;
-        }
-
-        if ($this->context instanceof ExecutionContextInterface) {
-            $this->context->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->setParameter('{{ type }}', $constraint->type)
-                ->addViolation();
-        } else {
-            $this->buildViolation($constraint->message)
-                ->setParameter('{{ value }}', $this->formatValue($value))
-                ->setParameter('{{ type }}', $constraint->type)
-                ->addViolation();
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Url.php b/vendor/symfony/validator/Constraints/Url.php
deleted file mode 100644
index 3637bc1..0000000
--- a/vendor/symfony/validator/Constraints/Url.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Url extends Constraint
-{
-    public $message = 'This value is not a valid URL.';
-    public $dnsMessage = 'The host could not be resolved.';
-    public $protocols = array('http', 'https');
-    public $checkDNS = false;
-}
diff --git a/vendor/symfony/validator/Constraints/UrlValidator.php b/vendor/symfony/validator/Constraints/UrlValidator.php
deleted file mode 100644
index 1fd76a8..0000000
--- a/vendor/symfony/validator/Constraints/UrlValidator.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class UrlValidator extends ConstraintValidator
-{
-    const PATTERN = '~^
-            (%s)://                                 # protocol
-            (([\pL\pN-]+:)?([\pL\pN-]+)@)?          # basic auth
-            (
-                ([\pL\pN\pS-\.])+(\.?([\pL]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
-                    |                                              # or
-                \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                 # a IP address
-                    |                                              # or
-                \[
-                    (?:(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){6})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:::(?:(?:(?:[0-9a-f]{1,4})):){5})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){4})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,1}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){3})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,2}(?:(?:[0-9a-f]{1,4})))?::(?:(?:(?:[0-9a-f]{1,4})):){2})(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,3}(?:(?:[0-9a-f]{1,4})))?::(?:(?:[0-9a-f]{1,4})):)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,4}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:(?:(?:(?:[0-9a-f]{1,4})):(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,5}(?:(?:[0-9a-f]{1,4})))?::)(?:(?:[0-9a-f]{1,4})))|(?:(?:(?:(?:(?:(?:[0-9a-f]{1,4})):){0,6}(?:(?:[0-9a-f]{1,4})))?::))))
-                \]  # a IPv6 address
-            )
-            (:[0-9]+)?                              # a port (optional)
-            (/?|/\S+|\?|\#)                         # a /, nothing, a / with something, a query or a fragment
-        $~ixu';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (!$constraint instanceof Url) {
-            throw new UnexpectedTypeException($constraint, __NAMESPACE__.'\Url');
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-        if ('' === $value) {
-            return;
-        }
-
-        $pattern = sprintf(static::PATTERN, implode('|', $constraint->protocols));
-
-        if (!preg_match($pattern, $value)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->addViolation();
-            }
-
-            return;
-        }
-
-        if ($constraint->checkDNS) {
-            $host = parse_url($value, PHP_URL_HOST);
-
-            if (!checkdnsrr($host, 'ANY')) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->dnsMessage)
-                       ->setParameter('{{ value }}', $this->formatValue($host))
-                       ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->dnsMessage)
-                       ->setParameter('{{ value }}', $this->formatValue($host))
-                       ->addViolation();
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Uuid.php b/vendor/symfony/validator/Constraints/Uuid.php
deleted file mode 100644
index 8589b95..0000000
--- a/vendor/symfony/validator/Constraints/Uuid.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * @Annotation
- *
- * @author Colin O'Dell <colinodell@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Uuid extends Constraint
-{
-    const TOO_SHORT_ERROR = 1;
-    const TOO_LONG_ERROR = 2;
-    const INVALID_CHARACTERS_ERROR = 3;
-    const INVALID_HYPHEN_PLACEMENT_ERROR = 4;
-    const INVALID_VERSION_ERROR = 5;
-    const INVALID_VARIANT_ERROR = 6;
-
-    protected static $errorNames = array(
-        self::TOO_SHORT_ERROR => 'TOO_SHORT_ERROR',
-        self::TOO_LONG_ERROR => 'TOO_LONG_ERROR',
-        self::INVALID_CHARACTERS_ERROR => 'INVALID_CHARACTERS_ERROR',
-        self::INVALID_HYPHEN_PLACEMENT_ERROR => 'INVALID_HYPHEN_PLACEMENT_ERROR',
-        self::INVALID_VERSION_ERROR => 'INVALID_VERSION_ERROR',
-        self::INVALID_VARIANT_ERROR => 'INVALID_VARIANT_ERROR',
-    );
-
-    // Possible versions defined by RFC 4122
-    const V1_MAC = 1;
-    const V2_DCE = 2;
-    const V3_MD5 = 3;
-    const V4_RANDOM = 4;
-    const V5_SHA1 = 5;
-
-    /**
-     * Message to display when validation fails.
-     *
-     * @var string
-     */
-    public $message = 'This is not a valid UUID.';
-
-    /**
-     * Strict mode only allows UUIDs that meet the formal definition and formatting per RFC 4122.
-     *
-     * Set this to `false` to allow legacy formats with different dash positioning or wrapping characters
-     *
-     * @var bool
-     */
-    public $strict = true;
-
-    /**
-     * Array of allowed versions (see version constants above).
-     *
-     * All UUID versions are allowed by default
-     *
-     * @var int[]
-     */
-    public $versions = array(
-        self::V1_MAC,
-        self::V2_DCE,
-        self::V3_MD5,
-        self::V4_RANDOM,
-        self::V5_SHA1,
-    );
-}
diff --git a/vendor/symfony/validator/Constraints/UuidValidator.php b/vendor/symfony/validator/Constraints/UuidValidator.php
deleted file mode 100644
index 08f9e27..0000000
--- a/vendor/symfony/validator/Constraints/UuidValidator.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Constraints\Deprecated\UuidValidator as Deprecated;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Validates whether the value is a valid UUID per RFC 4122.
- *
- * @author Colin O'Dell <colinodell@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see http://tools.ietf.org/html/rfc4122
- * @see https://en.wikipedia.org/wiki/Universally_unique_identifier
- */
-class UuidValidator extends ConstraintValidator
-{
-    // The strict pattern matches UUIDs like this:
-    // xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
-
-    // Roughly speaking:
-    // x = any hexadecimal character
-    // M = any allowed version {1..5}
-    // N = any allowed variant {8, 9, a, b}
-
-    const STRICT_LENGTH = 36;
-    const STRICT_FIRST_HYPHEN_POSITION = 8;
-    const STRICT_LAST_HYPHEN_POSITION = 23;
-    const STRICT_VERSION_POSITION = 14;
-    const STRICT_VARIANT_POSITION = 19;
-
-    // The loose pattern validates similar yet non-compliant UUIDs.
-    // Hyphens are completely optional. If present, they should only appear
-    // between every fourth character:
-    // xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx
-    // xxxxxxxxxxxx-xxxx-xxxx-xxxx-xxxx-xxxx
-    // xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-    // The value can also be wrapped with characters like []{}:
-    // {xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx}
-
-    // Neither the version nor the variant is validated by this pattern.
-
-    const LOOSE_MAX_LENGTH = 39;
-    const LOOSE_FIRST_HYPHEN_POSITION = 4;
-
-    /**
-     * @deprecated since version 2.6, to be removed in 3.0
-     */
-    const STRICT_PATTERN = '/^[a-f0-9]{8}-[a-f0-9]{4}-[%s][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$/i';
-
-    /**
-     * @deprecated since version 2.6, to be removed in 3.0
-     */
-    const LOOSE_PATTERN = '/^[a-f0-9]{4}(?:-?[a-f0-9]{4}){7}$/i';
-
-    /**
-     * @deprecated since version 2.6, to be removed in 3.0
-     */
-    const STRICT_UUID_LENGTH = 36;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (null === $value || '' === $value) {
-            return;
-        }
-
-        if (!is_scalar($value) && !(is_object($value) && method_exists($value, '__toString'))) {
-            throw new UnexpectedTypeException($value, 'string');
-        }
-
-        $value = (string) $value;
-
-        if ($constraint->strict) {
-            $this->validateStrict($value, $constraint);
-
-            return;
-        }
-
-        $this->validateLoose($value, $constraint);
-    }
-
-    private function validateLoose($value, Uuid $constraint)
-    {
-        // Error priority:
-        // 1. ERROR_INVALID_CHARACTERS
-        // 2. ERROR_INVALID_HYPHEN_PLACEMENT
-        // 3. ERROR_TOO_SHORT/ERROR_TOO_LONG
-
-        // Trim any wrapping characters like [] or {} used by some legacy systems
-        $trimmed = trim($value, '[]{}');
-
-        // Position of the next expected hyphen
-        $h = self::LOOSE_FIRST_HYPHEN_POSITION;
-
-        // Expected length
-        $l = self::LOOSE_MAX_LENGTH;
-
-        for ($i = 0; $i < $l; ++$i) {
-            // Check length
-            if (!isset($trimmed{$i})) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::TOO_SHORT_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::TOO_SHORT_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-
-            // Hyphens must occur every fifth position
-            // xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx-xxxx
-            //     ^    ^    ^    ^    ^    ^    ^
-            if ('-' === $trimmed{$i}) {
-                if ($i !== $h) {
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->message)
-                            ->setParameter('{{ value }}', $this->formatValue($value))
-                            ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                            ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->message)
-                            ->setParameter('{{ value }}', $this->formatValue($value))
-                            ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                            ->addViolation();
-                    }
-
-                    return;
-                }
-
-                $h += 5;
-
-                continue;
-            }
-
-            // Missing hyphens are ignored
-            if ($i === $h) {
-                $h += 4;
-                --$l;
-            }
-
-            // Check characters
-            if (!ctype_xdigit($trimmed{$i})) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        // Check length again
-        if (isset($trimmed{$i})) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::TOO_LONG_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::TOO_LONG_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-
-    private function validateStrict($value, Uuid $constraint)
-    {
-        // Error priority:
-        // 1. ERROR_INVALID_CHARACTERS
-        // 2. ERROR_INVALID_HYPHEN_PLACEMENT
-        // 3. ERROR_TOO_SHORT/ERROR_TOO_LONG
-        // 4. ERROR_INVALID_VERSION
-        // 5. ERROR_INVALID_VARIANT
-
-        // Position of the next expected hyphen
-        $h = self::STRICT_FIRST_HYPHEN_POSITION;
-
-        for ($i = 0; $i < self::STRICT_LENGTH; ++$i) {
-            // Check length
-            if (!isset($value{$i})) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::TOO_SHORT_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::TOO_SHORT_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-
-            // Check hyphen placement
-            // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-            //         ^    ^    ^    ^
-            if ('-' === $value{$i}) {
-                if ($i !== $h) {
-                    if ($this->context instanceof ExecutionContextInterface) {
-                        $this->context->buildViolation($constraint->message)
-                             ->setParameter(
-                                 '{{ value }}',
-                                 $this->formatValue($value)
-                             )
-                             ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                             ->addViolation();
-                    } else {
-                        $this->buildViolation($constraint->message)
-                              ->setParameter(
-                                  '{{ value }}',
-                                  $this->formatValue($value)
-                              )
-                              ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                              ->addViolation();
-                    }
-
-                    return;
-                }
-
-                // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-                //                        ^
-                if ($h < self::STRICT_LAST_HYPHEN_POSITION) {
-                    $h += 5;
-                }
-
-                continue;
-            }
-
-            // Check characters
-            if (!ctype_xdigit($value{$i})) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_CHARACTERS_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-
-            // Missing hyphen
-            if ($i === $h) {
-                if ($this->context instanceof ExecutionContextInterface) {
-                    $this->context->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                        ->addViolation();
-                } else {
-                    $this->buildViolation($constraint->message)
-                        ->setParameter('{{ value }}', $this->formatValue($value))
-                        ->setCode(Uuid::INVALID_HYPHEN_PLACEMENT_ERROR)
-                        ->addViolation();
-                }
-
-                return;
-            }
-        }
-
-        // Check length again
-        if (isset($value{$i})) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::TOO_LONG_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::TOO_LONG_ERROR)
-                    ->addViolation();
-            }
-        }
-
-        // Check version
-        if (!in_array($value{self::STRICT_VERSION_POSITION}, $constraint->versions)) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::INVALID_VERSION_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::INVALID_VERSION_ERROR)
-                    ->addViolation();
-            }
-        }
-
-        // Check variant - first two bits must equal "10"
-        //   0b10xx
-        // & 0b1100 (12)
-        // = 0b1000 (8)
-        if ((hexdec($value{self::STRICT_VARIANT_POSITION}) & 12) !== 8) {
-            if ($this->context instanceof ExecutionContextInterface) {
-                $this->context->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::INVALID_VARIANT_ERROR)
-                    ->addViolation();
-            } else {
-                $this->buildViolation($constraint->message)
-                    ->setParameter('{{ value }}', $this->formatValue($value))
-                    ->setCode(Uuid::INVALID_VARIANT_ERROR)
-                    ->addViolation();
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Constraints/Valid.php b/vendor/symfony/validator/Constraints/Valid.php
deleted file mode 100644
index 0fb7829..0000000
--- a/vendor/symfony/validator/Constraints/Valid.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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\Component\Validator\Constraints;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-
-/**
- * @Annotation
- * @Target({"PROPERTY", "METHOD", "ANNOTATION"})
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class Valid extends Constraint
-{
-    public $traverse = true;
-
-    /**
-     * @deprecated since version 2.5, to be removed in Symfony 3.0.
-     */
-    public $deep = true;
-
-    public function __construct($options = null)
-    {
-        if (is_array($options) && array_key_exists('groups', $options)) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The option "groups" is not supported by the constraint %s',
-                __CLASS__
-            ));
-        }
-
-        if (is_array($options) && array_key_exists('deep', $options)) {
-            @trigger_error('The "deep" option for the Valid constraint is deprecated since version 2.5 and will be removed in 3.0. When traversing arrays, nested arrays are always traversed. When traversing nested objects, their traversal strategy is used.', E_USER_DEPRECATED);
-        }
-
-        parent::__construct($options);
-    }
-}
diff --git a/vendor/symfony/validator/Context/ExecutionContext.php b/vendor/symfony/validator/Context/ExecutionContext.php
deleted file mode 100644
index 722bcc9..0000000
--- a/vendor/symfony/validator/Context/ExecutionContext.php
+++ /dev/null
@@ -1,464 +0,0 @@
-<?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\Component\Validator\Context;
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\ClassBasedInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\Valid;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\Mapping\MetadataInterface;
-use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
-use Symfony\Component\Validator\Util\PropertyPath;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
-use Symfony\Component\Validator\Violation\ConstraintViolationBuilder;
-
-/**
- * The context used and created by {@link ExecutionContextFactory}.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see ExecutionContextInterface
- *
- * @internal You should not instantiate or use this class. Code against
- *           {@link ExecutionContextInterface} instead.
- */
-class ExecutionContext implements ExecutionContextInterface
-{
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
-
-    /**
-     * The root value of the validated object graph.
-     *
-     * @var mixed
-     */
-    private $root;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var string
-     */
-    private $translationDomain;
-
-    /**
-     * The violations generated in the current context.
-     *
-     * @var ConstraintViolationList
-     */
-    private $violations;
-
-    /**
-     * The currently validated value.
-     *
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * The currently validated object.
-     *
-     * @var object|null
-     */
-    private $object;
-
-    /**
-     * The property path leading to the current value.
-     *
-     * @var string
-     */
-    private $propertyPath = '';
-
-    /**
-     * The current validation metadata.
-     *
-     * @var MetadataInterface|null
-     */
-    private $metadata;
-
-    /**
-     * The currently validated group.
-     *
-     * @var string|null
-     */
-    private $group;
-
-    /**
-     * The currently validated constraint.
-     *
-     * @var Constraint|null
-     */
-    private $constraint;
-
-    /**
-     * Stores which objects have been validated in which group.
-     *
-     * @var array
-     */
-    private $validatedObjects = array();
-
-    /**
-     * Stores which class constraint has been validated for which object.
-     *
-     * @var array
-     */
-    private $validatedConstraints = array();
-
-    /**
-     * Stores which objects have been initialized.
-     *
-     * @var array
-     */
-    private $initializedObjects;
-
-    /**
-     * Creates a new execution context.
-     *
-     * @param ValidatorInterface  $validator         The validator
-     * @param mixed               $root              The root value of the
-     *                                               validated object graph
-     * @param TranslatorInterface $translator        The translator
-     * @param string|null         $translationDomain The translation domain to
-     *                                               use for translating
-     *                                               violation messages
-     *
-     * @internal Called by {@link ExecutionContextFactory}. Should not be used
-     *           in user code.
-     */
-    public function __construct(ValidatorInterface $validator, $root, TranslatorInterface $translator, $translationDomain = null)
-    {
-        $this->validator = $validator;
-        $this->root = $root;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-        $this->violations = new ConstraintViolationList();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setNode($value, $object, MetadataInterface $metadata = null, $propertyPath)
-    {
-        $this->value = $value;
-        $this->object = $object;
-        $this->metadata = $metadata;
-        $this->propertyPath = (string) $propertyPath;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setGroup($group)
-    {
-        $this->group = $group;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setConstraint(Constraint $constraint)
-    {
-        $this->constraint = $constraint;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolation($message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null)
-    {
-        // The parameters $invalidValue and following are ignored by the new
-        // API, as they are not present in the new interface anymore.
-        // You should use buildViolation() instead.
-        if (func_num_args() > 2) {
-            @trigger_error('The parameters $invalidValue, $plural and $code in method '.__METHOD__.' are deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
-
-            $this
-                ->buildViolation($message, $parameters)
-                ->setInvalidValue($invalidValue)
-                ->setPlural($plural)
-                ->setCode($code)
-                ->addViolation()
-            ;
-
-            return;
-        }
-
-        $this->violations->add(new ConstraintViolation(
-            $this->translator->trans($message, $parameters, $this->translationDomain),
-            $message,
-            $parameters,
-            $this->root,
-            $this->propertyPath,
-            $this->value,
-            null,
-            null,
-            $this->constraint
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildViolation($message, array $parameters = array())
-    {
-        return new ConstraintViolationBuilder(
-            $this->violations,
-            $this->constraint,
-            $message,
-            $parameters,
-            $this->root,
-            $this->propertyPath,
-            $this->value,
-            $this->translator,
-            $this->translationDomain
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getViolations()
-    {
-        return $this->violations;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValidator()
-    {
-        return $this->validator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoot()
-    {
-        return $this->root;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return $this->metadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroup()
-    {
-        return $this->group;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClassName()
-    {
-        return $this->metadata instanceof ClassBasedInterface ? $this->metadata->getClassName() : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyName()
-    {
-        return $this->metadata instanceof PropertyMetadataInterface ? $this->metadata->getPropertyName() : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyPath($subPath = '')
-    {
-        return PropertyPath::append($this->propertyPath, $subPath);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::buildViolation method instead.', E_USER_DEPRECATED);
-
-        if (func_num_args() > 2) {
-            $this
-                ->buildViolation($message, $parameters)
-                ->atPath($subPath)
-                ->setInvalidValue($invalidValue)
-                ->setPlural($plural)
-                ->setCode($code)
-                ->addViolation()
-            ;
-
-            return;
-        }
-
-        $this
-            ->buildViolation($message, $parameters)
-            ->atPath($subPath)
-            ->addViolation()
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
-
-        if (is_array($value)) {
-            // The $traverse flag is ignored for arrays
-            $constraint = new Valid(array('traverse' => true, 'deep' => $deep));
-
-            return $this
-                ->getValidator()
-                ->inContext($this)
-                ->atPath($subPath)
-                ->validate($value, $constraint, $groups)
-            ;
-        }
-
-        if ($traverse && $value instanceof \Traversable) {
-            $constraint = new Valid(array('traverse' => true, 'deep' => $deep));
-
-            return $this
-                ->getValidator()
-                ->inContext($this)
-                ->atPath($subPath)
-                ->validate($value, $constraint, $groups)
-            ;
-        }
-
-        return $this
-            ->getValidator()
-            ->inContext($this)
-            ->atPath($subPath)
-            ->validate($value, null, $groups)
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateValue($value, $constraints, $subPath = '', $groups = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the '.__CLASS__.'::getValidator() method instead.', E_USER_DEPRECATED);
-
-        return $this
-            ->getValidator()
-            ->inContext($this)
-            ->atPath($subPath)
-            ->validate($value, $constraints, $groups)
-        ;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        @trigger_error('The '.__METHOD__.' is deprecated since version 2.5 and will be removed in 3.0. Use the new Symfony\Component\Validator\Context\ExecutionContext::getValidator method in combination with Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
-
-        $validator = $this->getValidator();
-
-        if ($validator instanceof LegacyValidatorInterface) {
-            return $validator->getMetadataFactory();
-        }
-
-        // The ValidatorInterface extends from the deprecated MetadataFactoryInterface, so return it when we don't have the factory instance itself
-        return $validator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function markGroupAsValidated($cacheKey, $groupHash)
-    {
-        if (!isset($this->validatedObjects[$cacheKey])) {
-            $this->validatedObjects[$cacheKey] = array();
-        }
-
-        $this->validatedObjects[$cacheKey][$groupHash] = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isGroupValidated($cacheKey, $groupHash)
-    {
-        return isset($this->validatedObjects[$cacheKey][$groupHash]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function markConstraintAsValidated($cacheKey, $constraintHash)
-    {
-        $this->validatedConstraints[$cacheKey.':'.$constraintHash] = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConstraintValidated($cacheKey, $constraintHash)
-    {
-        return isset($this->validatedConstraints[$cacheKey.':'.$constraintHash]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function markObjectAsInitialized($cacheKey)
-    {
-        $this->initializedObjects[$cacheKey] = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isObjectInitialized($cacheKey)
-    {
-        return isset($this->initializedObjects[$cacheKey]);
-    }
-}
diff --git a/vendor/symfony/validator/Context/ExecutionContextFactory.php b/vendor/symfony/validator/Context/ExecutionContextFactory.php
deleted file mode 100644
index f4f01d9..0000000
--- a/vendor/symfony/validator/Context/ExecutionContextFactory.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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\Component\Validator\Context;
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * Creates new {@link ExecutionContext} instances.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal You should not instantiate or use this class. Code against
- *           {@link ExecutionContextFactoryInterface} instead.
- */
-class ExecutionContextFactory implements ExecutionContextFactoryInterface
-{
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var string|null
-     */
-    private $translationDomain;
-
-    /**
-     * Creates a new context factory.
-     *
-     * @param TranslatorInterface $translator        The translator
-     * @param string|null         $translationDomain The translation domain to
-     *                                               use for translating
-     *                                               violation messages
-     */
-    public function __construct(TranslatorInterface $translator, $translationDomain = null)
-    {
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createContext(ValidatorInterface $validator, $root)
-    {
-        return new ExecutionContext(
-            $validator,
-            $root,
-            $this->translator,
-            $this->translationDomain
-        );
-    }
-}
diff --git a/vendor/symfony/validator/Context/ExecutionContextFactoryInterface.php b/vendor/symfony/validator/Context/ExecutionContextFactoryInterface.php
deleted file mode 100644
index e4af667..0000000
--- a/vendor/symfony/validator/Context/ExecutionContextFactoryInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Component\Validator\Context;
-
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * Creates instances of {@link ExecutionContextInterface}.
- *
- * You can use a custom factory if you want to customize the execution context
- * that is passed through the validation run.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ExecutionContextFactoryInterface
-{
-    /**
-     * Creates a new execution context.
-     *
-     * @param ValidatorInterface $validator The validator
-     * @param mixed              $root      The root value of the validated
-     *                                      object graph
-     *
-     * @return ExecutionContextInterface The new execution context
-     */
-    public function createContext(ValidatorInterface $validator, $root);
-}
diff --git a/vendor/symfony/validator/Context/ExecutionContextInterface.php b/vendor/symfony/validator/Context/ExecutionContextInterface.php
deleted file mode 100644
index 2ef80b6..0000000
--- a/vendor/symfony/validator/Context/ExecutionContextInterface.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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\Component\Validator\Context;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ExecutionContextInterface as LegacyExecutionContextInterface;
-use Symfony\Component\Validator\Mapping\MetadataInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;
-
-/**
- * The context of a validation run.
- *
- * The context collects all violations generated during the validation. By
- * default, validators execute all validations in a new context:
- *
- *     $violations = $validator->validate($object);
- *
- * When you make another call to the validator, while the validation is in
- * progress, the violations will be isolated from each other:
- *
- *     public function validate($value, Constraint $constraint)
- *     {
- *         $validator = $this->context->getValidator();
- *
- *         // The violations are not added to $this->context
- *         $violations = $validator->validate($value);
- *     }
- *
- * However, if you want to add the violations to the current context, use the
- * {@link ValidatorInterface::inContext()} method:
- *
- *     public function validate($value, Constraint $constraint)
- *     {
- *         $validator = $this->context->getValidator();
- *
- *         // The violations are added to $this->context
- *         $validator
- *             ->inContext($this->context)
- *             ->validate($value)
- *         ;
- *     }
- *
- * Additionally, the context provides information about the current state of
- * the validator, such as the currently validated class, the name of the
- * currently validated property and more. These values change over time, so you
- * cannot store a context and expect that the methods still return the same
- * results later on.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ExecutionContextInterface extends LegacyExecutionContextInterface
-{
-    /**
-     * Returns a builder for adding a violation with extended information.
-     *
-     * Call {@link ConstraintViolationBuilderInterface::addViolation()} to
-     * add the violation when you're done with the configuration:
-     *
-     *     $context->buildViolation('Please enter a number between %min% and %max%.')
-     *         ->setParameter('%min%', 3)
-     *         ->setParameter('%max%', 10)
-     *         ->setTranslationDomain('number_validation')
-     *         ->addViolation();
-     *
-     * @param string $message    The error message
-     * @param array  $parameters The parameters substituted in the error message
-     *
-     * @return ConstraintViolationBuilderInterface The violation builder
-     */
-    public function buildViolation($message, array $parameters = array());
-
-    /**
-     * Returns the validator.
-     *
-     * Useful if you want to validate additional constraints:
-     *
-     *     public function validate($value, Constraint $constraint)
-     *     {
-     *         $validator = $this->context->getValidator();
-     *
-     *         $violations = $validator->validateValue($value, new Length(array('min' => 3)));
-     *
-     *         if (count($violations) > 0) {
-     *             // ...
-     *         }
-     *     }
-     *
-     * @return ValidatorInterface
-     */
-    public function getValidator();
-
-    /**
-     * Returns the currently validated object.
-     *
-     * If the validator is currently validating a class constraint, the
-     * object of that class is returned. If it is a validating a property or
-     * getter constraint, the object that the property/getter belongs to is
-     * returned.
-     *
-     * In other cases, null is returned.
-     *
-     * @return object|null The currently validated object or null.
-     */
-    public function getObject();
-
-    /**
-     * Sets the currently validated value.
-     *
-     * @param mixed                  $value        The validated value
-     * @param object|null            $object       The currently validated object
-     * @param MetadataInterface|null $metadata     The validation metadata
-     * @param string                 $propertyPath The property path to the current value
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function setNode($value, $object, MetadataInterface $metadata = null, $propertyPath);
-
-    /**
-     * Sets the currently validated group.
-     *
-     * @param string|null $group The validated group
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function setGroup($group);
-
-    /**
-     * Sets the currently validated constraint.
-     *
-     * @param Constraint $constraint The validated constraint
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function setConstraint(Constraint $constraint);
-
-    /**
-     * Marks an object as validated in a specific validation group.
-     *
-     * @param string $cacheKey  The hash of the object
-     * @param string $groupHash The group's name or hash, if it is group
-     *                          sequence
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function markGroupAsValidated($cacheKey, $groupHash);
-
-    /**
-     * Returns whether an object was validated in a specific validation group.
-     *
-     * @param string $cacheKey  The hash of the object
-     * @param string $groupHash The group's name or hash, if it is group
-     *                          sequence
-     *
-     * @return bool Whether the object was already validated for that
-     *              group
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function isGroupValidated($cacheKey, $groupHash);
-
-    /**
-     * Marks a constraint as validated for an object.
-     *
-     * @param string $cacheKey       The hash of the object
-     * @param string $constraintHash The hash of the constraint
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function markConstraintAsValidated($cacheKey, $constraintHash);
-
-    /**
-     * Returns whether a constraint was validated for an object.
-     *
-     * @param string $cacheKey       The hash of the object
-     * @param string $constraintHash The hash of the constraint
-     *
-     * @return bool Whether the constraint was already validated
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     */
-    public function isConstraintValidated($cacheKey, $constraintHash);
-
-    /**
-     * Marks that an object was initialized.
-     *
-     * @param string $cacheKey The hash of the object
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     *
-     * @see ObjectInitializerInterface
-     */
-    public function markObjectAsInitialized($cacheKey);
-
-    /**
-     * Returns whether an object was initialized.
-     *
-     * @param string $cacheKey The hash of the object
-     *
-     * @return bool Whether the object was already initialized
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     *
-     * @see ObjectInitializerInterface
-     */
-    public function isObjectInitialized($cacheKey);
-}
diff --git a/vendor/symfony/validator/Context/LegacyExecutionContext.php b/vendor/symfony/validator/Context/LegacyExecutionContext.php
deleted file mode 100644
index f52b359..0000000
--- a/vendor/symfony/validator/Context/LegacyExecutionContext.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Component\Validator\Context;
-
-@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContext class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * An execution context that is compatible with the legacy API (< 2.5).
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class LegacyExecutionContext extends ExecutionContext
-{
-    /**
-     * @var MetadataFactoryInterface
-     */
-    private $metadataFactory;
-
-    /**
-     * Creates a new context.
-     *
-     * @see ExecutionContext::__construct()
-     *
-     * @internal Called by {@link LegacyExecutionContextFactory}. Should not be used
-     *           in user code.
-     */
-    public function __construct(ValidatorInterface $validator, $root, MetadataFactoryInterface $metadataFactory, TranslatorInterface $translator, $translationDomain = null)
-    {
-        parent::__construct(
-            $validator,
-            $root,
-            $translator,
-            $translationDomain
-        );
-
-        $this->metadataFactory = $metadataFactory;
-    }
-}
diff --git a/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php b/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
deleted file mode 100644
index c110644..0000000
--- a/vendor/symfony/validator/Context/LegacyExecutionContextFactory.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Validator\Context;
-
-@trigger_error('The '.__NAMESPACE__.'\LegacyExecutionContextFactory class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * Creates new {@link LegacyExecutionContext} instances.
- *
- * Implemented for backward compatibility with Symfony < 2.5.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class LegacyExecutionContextFactory implements ExecutionContextFactoryInterface
-{
-    /**
-     * @var MetadataFactoryInterface
-     */
-    private $metadataFactory;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var string|null
-     */
-    private $translationDomain;
-
-    /**
-     * Creates a new context factory.
-     *
-     * @param MetadataFactoryInterface $metadataFactory   The metadata factory
-     * @param TranslatorInterface      $translator        The translator
-     * @param string|null              $translationDomain The translation domain
-     *                                                    to use for translating
-     *                                                    violation messages
-     */
-    public function __construct(MetadataFactoryInterface $metadataFactory, TranslatorInterface $translator, $translationDomain = null)
-    {
-        $this->metadataFactory = $metadataFactory;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createContext(ValidatorInterface $validator, $root)
-    {
-        return new LegacyExecutionContext(
-            $validator,
-            $root,
-            $this->metadataFactory,
-            $this->translator,
-            $this->translationDomain
-        );
-    }
-}
diff --git a/vendor/symfony/validator/DefaultTranslator.php b/vendor/symfony/validator/DefaultTranslator.php
deleted file mode 100644
index 85853d8..0000000
--- a/vendor/symfony/validator/DefaultTranslator.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?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\Component\Validator;
-
-@trigger_error('The class '.__NAMESPACE__.'\DefaultTranslator is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Exception\BadMethodCallException;
-use Symfony\Component\Validator\Exception\InvalidArgumentException;
-
-/**
- * Simple translator implementation that simply replaces the parameters in
- * the message IDs.
- *
- * Example usage:
- *
- *     $translator = new DefaultTranslator();
- *
- *     echo $translator->trans(
- *         'This is a {{ var }}.',
- *         array('{{ var }}' => 'donkey')
- *     );
- *
- *     // -> This is a donkey.
- *
- *     echo $translator->transChoice(
- *         'This is {{ count }} donkey.|These are {{ count }} donkeys.',
- *         3,
- *         array('{{ count }}' => 'three')
- *     );
- *
- *     // -> These are three donkeys.
- *
- * This translator does not support message catalogs, translation domains or
- * locales. Instead, it implements a subset of the capabilities of
- * {@link \Symfony\Component\Translation\Translator} and can be used in places
- * where translation is not required by default but should be optional.
- *
- * @deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Translation\IdentityTranslator instead.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class DefaultTranslator implements TranslatorInterface
-{
-    /**
-     * Interpolates the given message.
-     *
-     * Parameters are replaced in the message in the same manner that
-     * {@link strtr()} uses.
-     *
-     * Example usage:
-     *
-     *     $translator = new DefaultTranslator();
-     *
-     *     echo $translator->trans(
-     *         'This is a {{ var }}.',
-     *         array('{{ var }}' => 'donkey')
-     *     );
-     *
-     *     // -> This is a donkey.
-     *
-     * @param string $id         The message id
-     * @param array  $parameters An array of parameters for the message
-     * @param string $domain     Ignored
-     * @param string $locale     Ignored
-     *
-     * @return string The interpolated string
-     */
-    public function trans($id, array $parameters = array(), $domain = null, $locale = null)
-    {
-        return strtr($id, $parameters);
-    }
-
-    /**
-     * Interpolates the given choice message by choosing a variant according to a number.
-     *
-     * The variants are passed in the message ID using the format
-     * "<singular>|<plural>". "<singular>" is chosen if the passed $number is
-     * exactly 1. "<plural>" is chosen otherwise.
-     *
-     * This format is consistent with the format supported by
-     * {@link \Symfony\Component\Translation\Translator}, but it does not
-     * have the same expressiveness. While Translator supports intervals in
-     * message translations, which are needed for languages other than English,
-     * this translator does not. You should use Translator or a custom
-     * implementation of {@link \Symfony\Component\Translation\TranslatorInterface} if you need this or similar
-     * functionality.
-     *
-     * Example usage:
-     *
-     *     echo $translator->transChoice(
-     *         'This is {{ count }} donkey.|These are {{ count }} donkeys.',
-     *         0,
-     *         array('{{ count }}' => 0)
-     *     );
-     *
-     *     // -> These are 0 donkeys.
-     *
-     *     echo $translator->transChoice(
-     *         'This is {{ count }} donkey.|These are {{ count }} donkeys.',
-     *         1,
-     *         array('{{ count }}' => 1)
-     *     );
-     *
-     *     // -> This is 1 donkey.
-     *
-     *     echo $translator->transChoice(
-     *         'This is {{ count }} donkey.|These are {{ count }} donkeys.',
-     *         3,
-     *         array('{{ count }}' => 3)
-     *     );
-     *
-     *     // -> These are 3 donkeys.
-     *
-     * @param string $id         The message id
-     * @param int    $number     The number to use to find the index of the message
-     * @param array  $parameters An array of parameters for the message
-     * @param string $domain     Ignored
-     * @param string $locale     Ignored
-     *
-     * @return string The translated string
-     *
-     * @throws InvalidArgumentException If the message id does not have the format
-     *                                  "singular|plural".
-     */
-    public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
-    {
-        $ids = explode('|', $id);
-
-        if (1 == $number) {
-            return strtr($ids[0], $parameters);
-        }
-
-        if (!isset($ids[1])) {
-            throw new InvalidArgumentException(sprintf('The message "%s" cannot be pluralized, because it is missing a plural (e.g. "There is one apple|There are %%count%% apples").', $id));
-        }
-
-        return strtr($ids[1], $parameters);
-    }
-
-    /**
-     * Not supported.
-     *
-     * @param string $locale The locale
-     *
-     * @throws BadMethodCallException
-     */
-    public function setLocale($locale)
-    {
-        throw new BadMethodCallException('Unsupported method.');
-    }
-
-    /**
-     * Returns the locale of the translator.
-     *
-     * @return string Always returns 'en'
-     */
-    public function getLocale()
-    {
-        return 'en';
-    }
-}
diff --git a/vendor/symfony/validator/Exception/BadMethodCallException.php b/vendor/symfony/validator/Exception/BadMethodCallException.php
deleted file mode 100644
index 939161b..0000000
--- a/vendor/symfony/validator/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * Base BadMethodCallException for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/validator/Exception/ConstraintDefinitionException.php b/vendor/symfony/validator/Exception/ConstraintDefinitionException.php
deleted file mode 100644
index b24fdd6..0000000
--- a/vendor/symfony/validator/Exception/ConstraintDefinitionException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class ConstraintDefinitionException extends ValidatorException
-{
-}
diff --git a/vendor/symfony/validator/Exception/ExceptionInterface.php b/vendor/symfony/validator/Exception/ExceptionInterface.php
deleted file mode 100644
index 77d09b9..0000000
--- a/vendor/symfony/validator/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * Base ExceptionInterface for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/validator/Exception/GroupDefinitionException.php b/vendor/symfony/validator/Exception/GroupDefinitionException.php
deleted file mode 100644
index ab7e91d..0000000
--- a/vendor/symfony/validator/Exception/GroupDefinitionException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class GroupDefinitionException extends ValidatorException
-{
-}
diff --git a/vendor/symfony/validator/Exception/InvalidArgumentException.php b/vendor/symfony/validator/Exception/InvalidArgumentException.php
deleted file mode 100644
index 22da39b..0000000
--- a/vendor/symfony/validator/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * Base InvalidArgumentException for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/validator/Exception/InvalidOptionsException.php b/vendor/symfony/validator/Exception/InvalidOptionsException.php
deleted file mode 100644
index ce87c42..0000000
--- a/vendor/symfony/validator/Exception/InvalidOptionsException.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class InvalidOptionsException extends ValidatorException
-{
-    private $options;
-
-    public function __construct($message, array $options)
-    {
-        parent::__construct($message);
-
-        $this->options = $options;
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-}
diff --git a/vendor/symfony/validator/Exception/MappingException.php b/vendor/symfony/validator/Exception/MappingException.php
deleted file mode 100644
index 4c8c057..0000000
--- a/vendor/symfony/validator/Exception/MappingException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class MappingException extends ValidatorException
-{
-}
diff --git a/vendor/symfony/validator/Exception/MissingOptionsException.php b/vendor/symfony/validator/Exception/MissingOptionsException.php
deleted file mode 100644
index 07c5d9e..0000000
--- a/vendor/symfony/validator/Exception/MissingOptionsException.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class MissingOptionsException extends ValidatorException
-{
-    private $options;
-
-    public function __construct($message, array $options)
-    {
-        parent::__construct($message);
-
-        $this->options = $options;
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-}
diff --git a/vendor/symfony/validator/Exception/NoSuchMetadataException.php b/vendor/symfony/validator/Exception/NoSuchMetadataException.php
deleted file mode 100644
index 4cac74c..0000000
--- a/vendor/symfony/validator/Exception/NoSuchMetadataException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class NoSuchMetadataException extends ValidatorException
-{
-}
diff --git a/vendor/symfony/validator/Exception/OutOfBoundsException.php b/vendor/symfony/validator/Exception/OutOfBoundsException.php
deleted file mode 100644
index 30906e8..0000000
--- a/vendor/symfony/validator/Exception/OutOfBoundsException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * Base OutOfBoundsException for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/validator/Exception/RuntimeException.php b/vendor/symfony/validator/Exception/RuntimeException.php
deleted file mode 100644
index df4a50c..0000000
--- a/vendor/symfony/validator/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * Base RuntimeException for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/validator/Exception/UnexpectedTypeException.php b/vendor/symfony/validator/Exception/UnexpectedTypeException.php
deleted file mode 100644
index 49d8cc2..0000000
--- a/vendor/symfony/validator/Exception/UnexpectedTypeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class UnexpectedTypeException extends ValidatorException
-{
-    public function __construct($value, $expectedType)
-    {
-        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, is_object($value) ? get_class($value) : gettype($value)));
-    }
-}
diff --git a/vendor/symfony/validator/Exception/UnsupportedMetadataException.php b/vendor/symfony/validator/Exception/UnsupportedMetadataException.php
deleted file mode 100644
index 97cc5ff..0000000
--- a/vendor/symfony/validator/Exception/UnsupportedMetadataException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Validator\Exception;
-
-/**
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class UnsupportedMetadataException extends InvalidArgumentException
-{
-}
diff --git a/vendor/symfony/validator/Exception/ValidatorException.php b/vendor/symfony/validator/Exception/ValidatorException.php
deleted file mode 100644
index 28bd470..0000000
--- a/vendor/symfony/validator/Exception/ValidatorException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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\Component\Validator\Exception;
-
-class ValidatorException extends RuntimeException
-{
-}
diff --git a/vendor/symfony/validator/ExecutionContext.php b/vendor/symfony/validator/ExecutionContext.php
deleted file mode 100644
index 5875e94..0000000
--- a/vendor/symfony/validator/ExecutionContext.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?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\Component\Validator;
-
-@trigger_error('The '.__NAMESPACE__.'\ExecutionContext class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Context\ExecutionContext class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-
-/**
- * Default implementation of {@link ExecutionContextInterface}.
- *
- * This class is immutable by design.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Context\ExecutionContext} instead.
- */
-class ExecutionContext implements ExecutionContextInterface
-{
-    /**
-     * @var GlobalExecutionContextInterface
-     */
-    private $globalContext;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var null|string
-     */
-    private $translationDomain;
-
-    /**
-     * @var MetadataInterface
-     */
-    private $metadata;
-
-    /**
-     * @var mixed
-     */
-    private $value;
-
-    /**
-     * @var string
-     */
-    private $group;
-
-    /**
-     * @var string
-     */
-    private $propertyPath;
-
-    /**
-     * Creates a new execution context.
-     *
-     * @param GlobalExecutionContextInterface $globalContext     The global context storing node-independent state.
-     * @param TranslatorInterface             $translator        The translator for translating violation messages.
-     * @param null|string                     $translationDomain The domain of the validation messages.
-     * @param MetadataInterface               $metadata          The metadata of the validated node.
-     * @param mixed                           $value             The value of the validated node.
-     * @param string                          $group             The current validation group.
-     * @param string                          $propertyPath      The property path to the current node.
-     */
-    public function __construct(GlobalExecutionContextInterface $globalContext, TranslatorInterface $translator, $translationDomain = null, MetadataInterface $metadata = null, $value = null, $group = null, $propertyPath = '')
-    {
-        if (null === $group) {
-            $group = Constraint::DEFAULT_GROUP;
-        }
-
-        $this->globalContext = $globalContext;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-        $this->metadata = $metadata;
-        $this->value = $value;
-        $this->propertyPath = $propertyPath;
-        $this->group = $group;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null)
-    {
-        if (null === $plural) {
-            $translatedMessage = $this->translator->trans($message, $params, $this->translationDomain);
-        } else {
-            try {
-                $translatedMessage = $this->translator->transChoice($message, $plural, $params, $this->translationDomain);
-            } catch (\InvalidArgumentException $e) {
-                $translatedMessage = $this->translator->trans($message, $params, $this->translationDomain);
-            }
-        }
-
-        $this->globalContext->getViolations()->add(new ConstraintViolation(
-            $translatedMessage,
-            $message,
-            $params,
-            $this->globalContext->getRoot(),
-            $this->propertyPath,
-            // check using func_num_args() to allow passing null values
-            func_num_args() >= 3 ? $invalidValue : $this->value,
-            $plural,
-            $code
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null)
-    {
-        $this->globalContext->getViolations()->add(new ConstraintViolation(
-            null === $plural
-                ? $this->translator->trans($message, $parameters, $this->translationDomain)
-                : $this->translator->transChoice($message, $plural, $parameters, $this->translationDomain),
-            $message,
-            $parameters,
-            $this->globalContext->getRoot(),
-            $this->getPropertyPath($subPath),
-            // check using func_num_args() to allow passing null values
-            func_num_args() >= 4 ? $invalidValue : $this->value,
-            $plural,
-            $code
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getViolations()
-    {
-        return $this->globalContext->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoot()
-    {
-        return $this->globalContext->getRoot();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyPath($subPath = '')
-    {
-        if ('' != $subPath && '' !== $this->propertyPath && '[' !== $subPath[0]) {
-            return $this->propertyPath.'.'.$subPath;
-        }
-
-        return $this->propertyPath.$subPath;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClassName()
-    {
-        if ($this->metadata instanceof ClassBasedInterface) {
-            return $this->metadata->getClassName();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyName()
-    {
-        if ($this->metadata instanceof PropertyMetadataInterface) {
-            return $this->metadata->getPropertyName();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroup()
-    {
-        return $this->group;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata()
-    {
-        return $this->metadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFor($value)
-    {
-        return $this->globalContext->getMetadataFactory()->getMetadataFor($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false)
-    {
-        $propertyPath = $this->getPropertyPath($subPath);
-
-        foreach ($this->resolveGroups($groups) as $group) {
-            $this->globalContext->getVisitor()->validate($value, $group, $propertyPath, $traverse, $deep);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateValue($value, $constraints, $subPath = '', $groups = null)
-    {
-        $constraints = is_array($constraints) ? $constraints : array($constraints);
-
-        if (null === $groups && '' === $subPath) {
-            $context = clone $this;
-            $context->value = $value;
-            $context->executeConstraintValidators($value, $constraints);
-
-            return;
-        }
-
-        $propertyPath = $this->getPropertyPath($subPath);
-
-        foreach ($this->resolveGroups($groups) as $group) {
-            $context = clone $this;
-            $context->value = $value;
-            $context->group = $group;
-            $context->propertyPath = $propertyPath;
-            $context->executeConstraintValidators($value, $constraints);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        return $this->globalContext->getMetadataFactory();
-    }
-
-    /**
-     * Executes the validators of the given constraints for the given value.
-     *
-     * @param mixed        $value       The value to validate.
-     * @param Constraint[] $constraints The constraints to match against.
-     */
-    private function executeConstraintValidators($value, array $constraints)
-    {
-        foreach ($constraints as $constraint) {
-            $validator = $this->globalContext->getValidatorFactory()->getInstance($constraint);
-            $validator->initialize($this);
-            $validator->validate($value, $constraint);
-        }
-    }
-
-    /**
-     * Returns an array of group names.
-     *
-     * @param null|string|string[] $groups The groups to resolve. If a single string is
-     *                                     passed, it is converted to an array. If null
-     *                                     is passed, an array containing the current
-     *                                     group of the context is returned.
-     *
-     * @return array An array of validation groups.
-     */
-    private function resolveGroups($groups)
-    {
-        return $groups ? (array) $groups : (array) $this->group;
-    }
-}
diff --git a/vendor/symfony/validator/ExecutionContextInterface.php b/vendor/symfony/validator/ExecutionContextInterface.php
deleted file mode 100644
index b07e928..0000000
--- a/vendor/symfony/validator/ExecutionContextInterface.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Stores the validator's state during validation.
- *
- * For example, let's validate the following object graph:
- *
- * <pre>
- * (Person)---($firstName: string)
- *      \
- *   ($address: Address)---($street: string)
- * </pre>
- *
- * We validate the <tt>Person</tt> instance, which becomes the "root" of the
- * validation run (see {@link getRoot}). The state of the context after the
- * first step will be like this:
- *
- * <pre>
- * (Person)---($firstName: string)
- *    ^ \
- *   ($address: Address)---($street: string)
- * </pre>
- *
- * The validator is stopped at the <tt>Person</tt> node, both the root and the
- * value (see {@link getValue}) of the context point to the <tt>Person</tt>
- * instance. The property path is empty at this point (see {@link getPropertyPath}).
- * The metadata of the context is the metadata of the <tt>Person</tt> node
- * (see {@link getMetadata}).
- *
- * After advancing to the property <tt>$firstName</tt> of the <tt>Person</tt>
- * instance, the state of the context looks like this:
- *
- * <pre>
- * (Person)---($firstName: string)
- *      \              ^
- *   ($address: Address)---($street: string)
- * </pre>
- *
- * The validator is stopped at the property <tt>$firstName</tt>. The root still
- * points to the <tt>Person</tt> instance, because this is where the validation
- * started. The property path is now "firstName" and the current value is the
- * value of that property.
- *
- * After advancing to the <tt>$address</tt> property and then to the
- * <tt>$street</tt> property of the <tt>Address</tt> instance, the context state
- * looks like this:
- *
- * <pre>
- * (Person)---($firstName: string)
- *      \
- *   ($address: Address)---($street: string)
- *                               ^
- * </pre>
- *
- * The validator is stopped at the property <tt>$street</tt>. The root still
- * points to the <tt>Person</tt> instance, but the property path is now
- * "address.street" and the validated value is the value of that property.
- *
- * Apart from the root, the property path and the currently validated value,
- * the execution context also knows the metadata of the current node (see
- * {@link getMetadata}) which for example returns a {@link Mapping\PropertyMetadata}
- * or a {@link Mapping\ClassMetadata} object. he context also contains the
- * validation group that is currently being validated (see {@link getGroup}) and
- * the violations that happened up until now (see {@link getViolations}).
- *
- * Apart from reading the execution context, you can also use
- * {@link addViolation} or {@link addViolationAt} to add new violations and
- * {@link validate} or {@link validateValue} to validate values that the
- * validator otherwise would not reach.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Context\ExecutionContextInterface} instead.
- */
-interface ExecutionContextInterface
-{
-    /**
-     * Adds a violation at the current node of the validation graph.
-     *
-     * Note: the parameters $invalidValue, $plural and $code are deprecated since version 2.5 and will be removed in 3.0.
-     *
-     * @param string   $message      The error message
-     * @param array    $params       The parameters substituted in the error message
-     * @param mixed    $invalidValue The invalid, validated value
-     * @param int|null $plural       The number to use to pluralize of the message
-     * @param int|null $code         The violation code
-     */
-    public function addViolation($message, array $params = array(), $invalidValue = null, $plural = null, $code = null);
-
-    /**
-     * Adds a violation at the validation graph node with the given property
-     * path relative to the current property path.
-     *
-     * @param string   $subPath      The relative property path for the violation
-     * @param string   $message      The error message
-     * @param array    $parameters   The parameters substituted in the error message
-     * @param mixed    $invalidValue The invalid, validated value
-     * @param int|null $plural       The number to use to pluralize of the message
-     * @param int|null $code         The violation code
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link Context\ExecutionContextInterface::buildViolation()}
-     *             instead.
-     */
-    public function addViolationAt($subPath, $message, array $parameters = array(), $invalidValue = null, $plural = null, $code = null);
-
-    /**
-     * Validates the given value within the scope of the current validation.
-     *
-     * The value may be any value recognized by the used metadata factory
-     * (see {@link MetadataFactoryInterface::getMetadata}), or an array or a
-     * traversable object of such values.
-     *
-     * Usually you validate a value that is not the current node of the
-     * execution context. For this case, you can pass the {@link $subPath}
-     * argument which is appended to the current property path when a violation
-     * is created. For example, take the following object graph:
-     *
-     * <pre>
-     * (Person)---($address: Address)---($phoneNumber: PhoneNumber)
-     *                     ^
-     * </pre>
-     *
-     * When the execution context stops at the <tt>Person</tt> instance, the
-     * property path is "address". When you validate the <tt>PhoneNumber</tt>
-     * instance now, pass "phoneNumber" as sub path to correct the property path
-     * to "address.phoneNumber":
-     *
-     * <pre>
-     * $context->validate($address->phoneNumber, 'phoneNumber');
-     * </pre>
-     *
-     * Any violations generated during the validation will be added to the
-     * violation list that you can access with {@link getViolations}.
-     *
-     * @param mixed                $value    The value to validate.
-     * @param string               $subPath  The path to append to the context's property path.
-     * @param null|string|string[] $groups   The groups to validate in. If you don't pass any
-     *                                       groups here, the current group of the context
-     *                                       will be used.
-     * @param bool                 $traverse Whether to traverse the value if it is an array
-     *                                       or an instance of <tt>\Traversable</tt>.
-     * @param bool                 $deep     Whether to traverse the value recursively if
-     *                                       it is a collection of collections.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link Context\ExecutionContextInterface::getValidator()}
-     *             instead.
-     */
-    public function validate($value, $subPath = '', $groups = null, $traverse = false, $deep = false);
-
-    /**
-     * Validates a value against a constraint.
-     *
-     * Use the parameter <tt>$subPath</tt> to adapt the property path for the
-     * validated value. For example, take the following object graph:
-     *
-     * <pre>
-     * (Person)---($address: Address)---($street: string)
-     *                     ^
-     * </pre>
-     *
-     * When the validator validates the <tt>Address</tt> instance, the
-     * property path stored in the execution context is "address". When you
-     * manually validate the property <tt>$street</tt> now, pass the sub path
-     * "street" to adapt the full property path to "address.street":
-     *
-     * <pre>
-     * $context->validate($address->street, new NotNull(), 'street');
-     * </pre>
-     *
-     * @param mixed                   $value       The value to validate.
-     * @param Constraint|Constraint[] $constraints The constraint(s) to validate against.
-     * @param string                  $subPath     The path to append to the context's property path.
-     * @param null|string|string[]    $groups      The groups to validate in. If you don't pass any
-     *                                             groups here, the current group of the context
-     *                                             will be used.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link Context\ExecutionContextInterface::getValidator()}
-     *             instead.
-     */
-    public function validateValue($value, $constraints, $subPath = '', $groups = null);
-
-    /**
-     * Returns the violations generated by the validator so far.
-     *
-     * @return ConstraintViolationListInterface The constraint violation list.
-     */
-    public function getViolations();
-
-    /**
-     * Returns the value at which validation was started in the object graph.
-     *
-     * The validator, when given an object, traverses the properties and
-     * related objects and their properties. The root of the validation is the
-     * object from which the traversal started.
-     *
-     * The current value is returned by {@link getValue}.
-     *
-     * @return mixed The root value of the validation.
-     */
-    public function getRoot();
-
-    /**
-     * Returns the value that the validator is currently validating.
-     *
-     * If you want to retrieve the object that was originally passed to the
-     * validator, use {@link getRoot}.
-     *
-     * @return mixed The currently validated value.
-     */
-    public function getValue();
-
-    /**
-     * Returns the metadata for the currently validated value.
-     *
-     * With the core implementation, this method returns a
-     * {@link Mapping\ClassMetadata} instance if the current value is an object,
-     * a {@link Mapping\PropertyMetadata} instance if the current value is
-     * the value of a property and a {@link Mapping\GetterMetadata} instance if
-     * the validated value is the result of a getter method.
-     *
-     * If the validated value is neither of these, for example if the validator
-     * has been called with a plain value and constraint, this method returns
-     * null.
-     *
-     * @return MetadataInterface|null The metadata of the currently validated
-     *                                value.
-     */
-    public function getMetadata();
-
-    /**
-     * Returns the used metadata factory.
-     *
-     * @return MetadataFactoryInterface The metadata factory.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link Context\ExecutionContextInterface::getValidator()}
-     *             instead and call
-     *             {@link Validator\ValidatorInterface::getMetadataFor()} or
-     *             {@link Validator\ValidatorInterface::hasMetadataFor()} there.
-     */
-    public function getMetadataFactory();
-
-    /**
-     * Returns the validation group that is currently being validated.
-     *
-     * @return string The current validation group.
-     */
-    public function getGroup();
-
-    /**
-     * Returns the class name of the current node.
-     *
-     * If the metadata of the current node does not implement
-     * {@link ClassBasedInterface} or if no metadata is available for the
-     * current node, this method returns null.
-     *
-     * @return string|null The class name or null, if no class name could be found.
-     */
-    public function getClassName();
-
-    /**
-     * Returns the property name of the current node.
-     *
-     * If the metadata of the current node does not implement
-     * {@link PropertyMetadataInterface} or if no metadata is available for the
-     * current node, this method returns null.
-     *
-     * @return string|null The property name or null, if no property name could be found.
-     */
-    public function getPropertyName();
-
-    /**
-     * Returns the property path to the value that the validator is currently
-     * validating.
-     *
-     * For example, take the following object graph:
-     *
-     * <pre>
-     * (Person)---($address: Address)---($street: string)
-     * </pre>
-     *
-     * When the <tt>Person</tt> instance is passed to the validator, the
-     * property path is initially empty. When the <tt>$address</tt> property
-     * of that person is validated, the property path is "address". When
-     * the <tt>$street</tt> property of the related <tt>Address</tt> instance
-     * is validated, the property path is "address.street".
-     *
-     * Properties of objects are prefixed with a dot in the property path.
-     * Indices of arrays or objects implementing the {@link \ArrayAccess}
-     * interface are enclosed in brackets. For example, if the property in
-     * the previous example is <tt>$addresses</tt> and contains an array
-     * of <tt>Address</tt> instance, the property path generated for the
-     * <tt>$street</tt> property of one of these addresses is for example
-     * "addresses[0].street".
-     *
-     * @param string $subPath Optional. The suffix appended to the current
-     *                        property path.
-     *
-     * @return string The current property path. The result may be an empty
-     *                string if the validator is currently validating the
-     *                root value of the validation graph.
-     */
-    public function getPropertyPath($subPath = '');
-}
diff --git a/vendor/symfony/validator/GlobalExecutionContextInterface.php b/vendor/symfony/validator/GlobalExecutionContextInterface.php
deleted file mode 100644
index 5c646f2..0000000
--- a/vendor/symfony/validator/GlobalExecutionContextInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Stores the node-independent state of a validation run.
- *
- * When the validator validates a graph of objects, it uses two classes to
- * store the state during the validation:
- *
- * <ul>
- * <li>For each node in the validation graph (objects, properties, getters) the
- * validator creates an instance of {@link ExecutionContextInterface} that
- * stores the information about that node.</li>
- * <li>One single <tt>GlobalExecutionContextInterface</tt> stores the state
- * that is independent of the current node.</li>
- * </ul>
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Context\ExecutionContextInterface} instead.
- */
-interface GlobalExecutionContextInterface
-{
-    /**
-     * Returns the violations generated by the validator so far.
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations.
-     */
-    public function getViolations();
-
-    /**
-     * Returns the value at which validation was started in the object graph.
-     *
-     * @return mixed The root value.
-     *
-     * @see ExecutionContextInterface::getRoot()
-     */
-    public function getRoot();
-
-    /**
-     * Returns the visitor instance used to validate the object graph nodes.
-     *
-     * @return ValidationVisitorInterface The validation visitor.
-     */
-    public function getVisitor();
-
-    /**
-     * Returns the factory for constraint validators.
-     *
-     * @return ConstraintValidatorFactoryInterface The constraint validator factory.
-     */
-    public function getValidatorFactory();
-
-    /**
-     * Returns the factory for validation metadata objects.
-     *
-     * @return MetadataFactoryInterface The metadata factory.
-     */
-    public function getMetadataFactory();
-}
diff --git a/vendor/symfony/validator/GroupSequenceProviderInterface.php b/vendor/symfony/validator/GroupSequenceProviderInterface.php
deleted file mode 100644
index 62e8a5e..0000000
--- a/vendor/symfony/validator/GroupSequenceProviderInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Defines the interface for a group sequence provider.
- */
-interface GroupSequenceProviderInterface
-{
-    /**
-     * Returns which validation groups should be used for a certain state
-     * of the object.
-     *
-     * @return array An array of validation groups
-     */
-    public function getGroupSequence();
-}
diff --git a/vendor/symfony/validator/LICENSE b/vendor/symfony/validator/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/validator/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php b/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
deleted file mode 100644
index 01b8013..0000000
--- a/vendor/symfony/validator/Mapping/BlackholeMetadataFactory.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-@trigger_error('The '.__NAMESPACE__.'\BlackholeMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory as MappingBlackHoleMetadataFactory;
-
-/**
- * Alias of {@link Factory\BlackHoleMetadataFactory}.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Factory\BlackHoleMetadataFactory} instead.
- */
-class BlackholeMetadataFactory extends MappingBlackHoleMetadataFactory
-{
-}
diff --git a/vendor/symfony/validator/Mapping/Cache/ApcCache.php b/vendor/symfony/validator/Mapping/Cache/ApcCache.php
deleted file mode 100644
index 63fc8ac..0000000
--- a/vendor/symfony/validator/Mapping/Cache/ApcCache.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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\Component\Validator\Mapping\Cache;
-
-@trigger_error('The '.__NAMESPACE__.'\ApcCache class is deprecated since version 2.5 and will be removed in 3.0. Use DoctrineCache with the Doctrine\Common\Cache\ApcCache class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use DoctrineCache with \Doctrine\Common\Cache\ApcCache instead.
- */
-class ApcCache implements CacheInterface
-{
-    private $prefix;
-
-    public function __construct($prefix)
-    {
-        if (!extension_loaded('apc')) {
-            throw new \RuntimeException('Unable to use ApcCache to cache validator mappings as APC is not enabled.');
-        }
-
-        $this->prefix = $prefix;
-    }
-
-    public function has($class)
-    {
-        if (!function_exists('apc_exists')) {
-            $exists = false;
-
-            apc_fetch($this->prefix.$class, $exists);
-
-            return $exists;
-        }
-
-        return apc_exists($this->prefix.$class);
-    }
-
-    public function read($class)
-    {
-        return apc_fetch($this->prefix.$class);
-    }
-
-    public function write(ClassMetadata $metadata)
-    {
-        apc_store($this->prefix.$metadata->getClassName(), $metadata);
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Cache/CacheInterface.php b/vendor/symfony/validator/Mapping/Cache/CacheInterface.php
deleted file mode 100644
index e8047c6..0000000
--- a/vendor/symfony/validator/Mapping/Cache/CacheInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Validator\Mapping\Cache;
-
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Persists ClassMetadata instances in a cache.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface CacheInterface
-{
-    /**
-     * Returns whether metadata for the given class exists in the cache.
-     *
-     * @param string $class
-     */
-    public function has($class);
-
-    /**
-     * Returns the metadata for the given class from the cache.
-     *
-     * @param string $class Class Name
-     *
-     * @return ClassMetadata|false A ClassMetadata instance or false on miss
-     */
-    public function read($class);
-
-    /**
-     * Stores a class metadata in the cache.
-     *
-     * @param ClassMetadata $metadata A Class Metadata
-     */
-    public function write(ClassMetadata $metadata);
-}
diff --git a/vendor/symfony/validator/Mapping/Cache/DoctrineCache.php b/vendor/symfony/validator/Mapping/Cache/DoctrineCache.php
deleted file mode 100644
index 6dd5447..0000000
--- a/vendor/symfony/validator/Mapping/Cache/DoctrineCache.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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\Component\Validator\Mapping\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Adapts a Doctrine cache to a CacheInterface.
- *
- * @author Florian Voutzinos <florian@voutzinos.com>
- */
-final class DoctrineCache implements CacheInterface
-{
-    private $cache;
-
-    /**
-     * Creates a new Doctrine cache.
-     *
-     * @param Cache $cache The cache to adapt
-     */
-    public function __construct(Cache $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * Sets the cache to adapt.
-     *
-     * @param Cache $cache The cache to adapt
-     */
-    public function setCache(Cache $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function has($class)
-    {
-        return $this->cache->contains($class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($class)
-    {
-        return $this->cache->fetch($class);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(ClassMetadata $metadata)
-    {
-        $this->cache->save($metadata->getClassName(), $metadata);
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/CascadingStrategy.php b/vendor/symfony/validator/Mapping/CascadingStrategy.php
deleted file mode 100644
index 2b97bdd..0000000
--- a/vendor/symfony/validator/Mapping/CascadingStrategy.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-/**
- * Specifies whether an object should be cascaded.
- *
- * Cascading is relevant for any node type but class nodes. If such a node
- * contains an object of value, and if cascading is enabled, then the node
- * traverser will try to find class metadata for that object and validate the
- * object against that metadata.
- *
- * If no metadata is found for a cascaded object, and if that object implements
- * {@link \Traversable}, the node traverser will iterate over the object and
- * cascade each object or collection contained within, unless iteration is
- * prohibited by the specified {@link TraversalStrategy}.
- *
- * Although the constants currently represent a boolean switch, they are
- * implemented as bit mask in order to allow future extensions.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see TraversalStrategy
- */
-class CascadingStrategy
-{
-    /**
-     * Specifies that a node should not be cascaded.
-     */
-    const NONE = 1;
-
-    /**
-     * Specifies that a node should be cascaded.
-     */
-    const CASCADE = 2;
-
-    /**
-     * Not instantiable.
-     */
-    private function __construct()
-    {
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/ClassMetadata.php b/vendor/symfony/validator/Mapping/ClassMetadata.php
deleted file mode 100644
index 3f4f51b..0000000
--- a/vendor/symfony/validator/Mapping/ClassMetadata.php
+++ /dev/null
@@ -1,556 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\GroupSequence;
-use Symfony\Component\Validator\Constraints\Traverse;
-use Symfony\Component\Validator\Constraints\Valid;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\GroupDefinitionException;
-use Symfony\Component\Validator\ValidationVisitorInterface;
-
-/**
- * Default implementation of {@link ClassMetadataInterface}.
- *
- * This class supports serialization and cloning.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ClassMetadata extends ElementMetadata implements ClassMetadataInterface
-{
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getClassName()} instead.
-     */
-    public $name;
-
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getDefaultGroup()} instead.
-     */
-    public $defaultGroup;
-
-    /**
-     * @var MemberMetadata[]
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getPropertyMetadata()} instead.
-     */
-    public $members = array();
-
-    /**
-     * @var PropertyMetadata[]
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getPropertyMetadata()} instead.
-     */
-    public $properties = array();
-
-    /**
-     * @var GetterMetadata[]
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getPropertyMetadata()} instead.
-     */
-    public $getters = array();
-
-    /**
-     * @var array
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getGroupSequence()} instead.
-     */
-    public $groupSequence = array();
-
-    /**
-     * @var bool
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link isGroupSequenceProvider()} instead.
-     */
-    public $groupSequenceProvider = false;
-
-    /**
-     * The strategy for traversing traversable objects.
-     *
-     * By default, only instances of {@link \Traversable} are traversed.
-     *
-     * @var int
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getTraversalStrategy()} instead.
-     */
-    public $traversalStrategy = TraversalStrategy::IMPLICIT;
-
-    /**
-     * @var \ReflectionClass
-     */
-    private $reflClass;
-
-    /**
-     * Constructs a metadata for the given class.
-     *
-     * @param string $class
-     */
-    public function __construct($class)
-    {
-        $this->name = $class;
-        // class name without namespace
-        if (false !== $nsSep = strrpos($class, '\\')) {
-            $this->defaultGroup = substr($class, $nsSep + 1);
-        } else {
-            $this->defaultGroup = $class;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        if (null === $propagatedGroup && Constraint::DEFAULT_GROUP === $group
-                && ($this->hasGroupSequence() || $this->isGroupSequenceProvider())) {
-            if ($this->hasGroupSequence()) {
-                $groups = $this->getGroupSequence()->groups;
-            } else {
-                $groups = $value->getGroupSequence();
-            }
-
-            foreach ($groups as $group) {
-                $this->accept($visitor, $value, $group, $propertyPath, Constraint::DEFAULT_GROUP);
-
-                if (count($visitor->getViolations()) > 0) {
-                    break;
-                }
-            }
-
-            return;
-        }
-
-        $visitor->visit($this, $value, $group, $propertyPath);
-
-        if (null !== $value) {
-            $pathPrefix = empty($propertyPath) ? '' : $propertyPath.'.';
-
-            foreach ($this->getConstrainedProperties() as $property) {
-                foreach ($this->getPropertyMetadata($property) as $member) {
-                    $member->accept($visitor, $member->getPropertyValue($value), $group, $pathPrefix.$property, $propagatedGroup);
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __sleep()
-    {
-        $parentProperties = parent::__sleep();
-
-        // Don't store the cascading strategy. Classes never cascade.
-        unset($parentProperties[array_search('cascadingStrategy', $parentProperties)]);
-
-        return array_merge($parentProperties, array(
-            'getters',
-            'groupSequence',
-            'groupSequenceProvider',
-            'members',
-            'name',
-            'properties',
-            'defaultGroup',
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClassName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Returns the name of the default group for this class.
-     *
-     * For each class, the group "Default" is an alias for the group
-     * "<ClassName>", where <ClassName> is the non-namespaced name of the
-     * class. All constraints implicitly or explicitly assigned to group
-     * "Default" belong to both of these groups, unless the class defines
-     * a group sequence.
-     *
-     * If a class defines a group sequence, validating the class in "Default"
-     * will validate the group sequence. The constraints assigned to "Default"
-     * can still be validated by validating the class in "<ClassName>".
-     *
-     * @return string The name of the default group
-     */
-    public function getDefaultGroup()
-    {
-        return $this->defaultGroup;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addConstraint(Constraint $constraint)
-    {
-        if (!in_array(Constraint::CLASS_CONSTRAINT, (array) $constraint->getTargets())) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The constraint "%s" cannot be put on classes.',
-                get_class($constraint)
-            ));
-        }
-
-        if ($constraint instanceof Valid) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The constraint "%s" cannot be put on classes.',
-                get_class($constraint)
-            ));
-        }
-
-        if ($constraint instanceof Traverse) {
-            if ($constraint->traverse) {
-                // If traverse is true, traversal should be explicitly enabled
-                $this->traversalStrategy = TraversalStrategy::TRAVERSE;
-            } else {
-                // If traverse is false, traversal should be explicitly disabled
-                $this->traversalStrategy = TraversalStrategy::NONE;
-            }
-
-            // The constraint is not added
-            return $this;
-        }
-
-        $constraint->addImplicitGroupName($this->getDefaultGroup());
-
-        parent::addConstraint($constraint);
-
-        return $this;
-    }
-
-    /**
-     * Adds a constraint to the given property.
-     *
-     * @param string     $property   The name of the property
-     * @param Constraint $constraint The constraint
-     *
-     * @return ClassMetadata This object
-     */
-    public function addPropertyConstraint($property, Constraint $constraint)
-    {
-        if (!isset($this->properties[$property])) {
-            $this->properties[$property] = new PropertyMetadata($this->getClassName(), $property);
-
-            $this->addPropertyMetadata($this->properties[$property]);
-        }
-
-        $constraint->addImplicitGroupName($this->getDefaultGroup());
-
-        $this->properties[$property]->addConstraint($constraint);
-
-        return $this;
-    }
-
-    /**
-     * @param string       $property
-     * @param Constraint[] $constraints
-     *
-     * @return ClassMetadata
-     */
-    public function addPropertyConstraints($property, array $constraints)
-    {
-        foreach ($constraints as $constraint) {
-            $this->addPropertyConstraint($property, $constraint);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds a constraint to the getter of the given property.
-     *
-     * The name of the getter is assumed to be the name of the property with an
-     * uppercased first letter and either the prefix "get" or "is".
-     *
-     * @param string     $property   The name of the property
-     * @param Constraint $constraint The constraint
-     *
-     * @return ClassMetadata This object
-     */
-    public function addGetterConstraint($property, Constraint $constraint)
-    {
-        if (!isset($this->getters[$property])) {
-            $this->getters[$property] = new GetterMetadata($this->getClassName(), $property);
-
-            $this->addPropertyMetadata($this->getters[$property]);
-        }
-
-        $constraint->addImplicitGroupName($this->getDefaultGroup());
-
-        $this->getters[$property]->addConstraint($constraint);
-
-        return $this;
-    }
-
-    /**
-     * @param string       $property
-     * @param Constraint[] $constraints
-     *
-     * @return ClassMetadata
-     */
-    public function addGetterConstraints($property, array $constraints)
-    {
-        foreach ($constraints as $constraint) {
-            $this->addGetterConstraint($property, $constraint);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Merges the constraints of the given metadata into this object.
-     *
-     * @param ClassMetadata $source The source metadata
-     */
-    public function mergeConstraints(ClassMetadata $source)
-    {
-        foreach ($source->getConstraints() as $constraint) {
-            $this->addConstraint(clone $constraint);
-        }
-
-        foreach ($source->getConstrainedProperties() as $property) {
-            foreach ($source->getPropertyMetadata($property) as $member) {
-                $member = clone $member;
-
-                foreach ($member->getConstraints() as $constraint) {
-                    $constraint->addImplicitGroupName($this->getDefaultGroup());
-                }
-
-                $this->addPropertyMetadata($member);
-
-                if ($member instanceof MemberMetadata && !$member->isPrivate($this->name)) {
-                    $property = $member->getPropertyName();
-
-                    if ($member instanceof PropertyMetadata && !isset($this->properties[$property])) {
-                        $this->properties[$property] = $member;
-                    } elseif ($member instanceof GetterMetadata && !isset($this->getters[$property])) {
-                        $this->getters[$property] = $member;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Adds a member metadata.
-     *
-     * @param MemberMetadata $metadata
-     *
-     * @deprecated since version 2.6, to be removed in 3.0.
-     */
-    protected function addMemberMetadata(MemberMetadata $metadata)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the addPropertyMetadata() method instead.', E_USER_DEPRECATED);
-
-        $this->addPropertyMetadata($metadata);
-    }
-
-    /**
-     * Returns true if metadatas of members is present for the given property.
-     *
-     * @param string $property The name of the property
-     *
-     * @return bool
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use {@link hasPropertyMetadata} instead.
-     */
-    public function hasMemberMetadatas($property)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the hasPropertyMetadata() method instead.', E_USER_DEPRECATED);
-
-        return $this->hasPropertyMetadata($property);
-    }
-
-    /**
-     * Returns all metadatas of members describing the given property.
-     *
-     * @param string $property The name of the property
-     *
-     * @return MemberMetadata[] An array of MemberMetadata
-     *
-     * @deprecated since version 2.6, to be removed in 3.0. Use {@link getPropertyMetadata} instead.
-     */
-    public function getMemberMetadatas($property)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getPropertyMetadata() method instead.', E_USER_DEPRECATED);
-
-        return $this->getPropertyMetadata($property);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasPropertyMetadata($property)
-    {
-        return array_key_exists($property, $this->members);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyMetadata($property)
-    {
-        if (!isset($this->members[$property])) {
-            return array();
-        }
-
-        return $this->members[$property];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConstrainedProperties()
-    {
-        return array_keys($this->members);
-    }
-
-    /**
-     * Sets the default group sequence for this class.
-     *
-     * @param array $groupSequence An array of group names
-     *
-     * @return ClassMetadata
-     *
-     * @throws GroupDefinitionException
-     */
-    public function setGroupSequence($groupSequence)
-    {
-        if ($this->isGroupSequenceProvider()) {
-            throw new GroupDefinitionException('Defining a static group sequence is not allowed with a group sequence provider');
-        }
-
-        if (is_array($groupSequence)) {
-            $groupSequence = new GroupSequence($groupSequence);
-        }
-
-        if (in_array(Constraint::DEFAULT_GROUP, $groupSequence->groups, true)) {
-            throw new GroupDefinitionException(sprintf('The group "%s" is not allowed in group sequences', Constraint::DEFAULT_GROUP));
-        }
-
-        if (!in_array($this->getDefaultGroup(), $groupSequence->groups, true)) {
-            throw new GroupDefinitionException(sprintf('The group "%s" is missing in the group sequence', $this->getDefaultGroup()));
-        }
-
-        $this->groupSequence = $groupSequence;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasGroupSequence()
-    {
-        return $this->groupSequence && count($this->groupSequence->groups) > 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGroupSequence()
-    {
-        return $this->groupSequence;
-    }
-
-    /**
-     * Returns a ReflectionClass instance for this class.
-     *
-     * @return \ReflectionClass
-     */
-    public function getReflectionClass()
-    {
-        if (!$this->reflClass) {
-            $this->reflClass = new \ReflectionClass($this->getClassName());
-        }
-
-        return $this->reflClass;
-    }
-
-    /**
-     * Sets whether a group sequence provider should be used.
-     *
-     * @param bool $active
-     *
-     * @throws GroupDefinitionException
-     */
-    public function setGroupSequenceProvider($active)
-    {
-        if ($this->hasGroupSequence()) {
-            throw new GroupDefinitionException('Defining a group sequence provider is not allowed with a static group sequence');
-        }
-
-        if (!$this->getReflectionClass()->implementsInterface('Symfony\Component\Validator\GroupSequenceProviderInterface')) {
-            throw new GroupDefinitionException(sprintf('Class "%s" must implement GroupSequenceProviderInterface', $this->name));
-        }
-
-        $this->groupSequenceProvider = $active;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isGroupSequenceProvider()
-    {
-        return $this->groupSequenceProvider;
-    }
-
-    /**
-     * Class nodes are never cascaded.
-     *
-     * {@inheritdoc}
-     */
-    public function getCascadingStrategy()
-    {
-        return CascadingStrategy::NONE;
-    }
-
-    /**
-     * Adds a property metadata.
-     *
-     * @param PropertyMetadataInterface $metadata
-     */
-    private function addPropertyMetadata(PropertyMetadataInterface $metadata)
-    {
-        $property = $metadata->getPropertyName();
-
-        $this->members[$property][] = $metadata;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/ClassMetadataFactory.php b/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
deleted file mode 100644
index 4069b3f..0000000
--- a/vendor/symfony/validator/Mapping/ClassMetadataFactory.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-@trigger_error('The '.__NAMESPACE__.'\ClassMetadataFactory class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
-
-/**
- * Alias of {@link LazyLoadingMetadataFactory}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link LazyLoadingMetadataFactory} instead.
- */
-class ClassMetadataFactory extends LazyLoadingMetadataFactory
-{
-}
diff --git a/vendor/symfony/validator/Mapping/ClassMetadataInterface.php b/vendor/symfony/validator/Mapping/ClassMetadataInterface.php
deleted file mode 100644
index 577440d..0000000
--- a/vendor/symfony/validator/Mapping/ClassMetadataInterface.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\ClassBasedInterface;
-use Symfony\Component\Validator\PropertyMetadataContainerInterface as LegacyPropertyMetadataContainerInterface;
-
-/**
- * Stores all metadata needed for validating objects of specific class.
- *
- * Most importantly, the metadata stores the constraints against which an object
- * and its properties should be validated.
- *
- * Additionally, the metadata stores whether the "Default" group is overridden
- * by a group sequence for that class and whether instances of that class
- * should be traversed or not.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see MetadataInterface
- * @see \Symfony\Component\Validator\Constraints\GroupSequence
- * @see \Symfony\Component\Validator\GroupSequenceProviderInterface
- * @see TraversalStrategy
- */
-interface ClassMetadataInterface extends MetadataInterface, LegacyPropertyMetadataContainerInterface, ClassBasedInterface
-{
-    /**
-     * Returns the names of all constrained properties.
-     *
-     * @return string[] A list of property names
-     */
-    public function getConstrainedProperties();
-
-    /**
-     * Returns whether the "Default" group is overridden by a group sequence.
-     *
-     * If it is, you can access the group sequence with {@link getGroupSequence()}.
-     *
-     * @return bool Returns true if the "Default" group is overridden
-     *
-     * @see \Symfony\Component\Validator\Constraints\GroupSequence
-     */
-    public function hasGroupSequence();
-
-    /**
-     * Returns the group sequence that overrides the "Default" group for this
-     * class.
-     *
-     * @return \Symfony\Component\Validator\Constraints\GroupSequence|null The group sequence or null
-     *
-     * @see \Symfony\Component\Validator\Constraints\GroupSequence
-     */
-    public function getGroupSequence();
-
-    /**
-     * Returns whether the "Default" group is overridden by a dynamic group
-     * sequence obtained by the validated objects.
-     *
-     * If this method returns true, the class must implement
-     * {@link \Symfony\Component\Validator\GroupSequenceProviderInterface}.
-     * This interface will be used to obtain the group sequence when an object
-     * of this class is validated.
-     *
-     * @return bool Returns true if the "Default" group is overridden by
-     *              a dynamic group sequence
-     *
-     * @see \Symfony\Component\Validator\GroupSequenceProviderInterface
-     */
-    public function isGroupSequenceProvider();
-}
diff --git a/vendor/symfony/validator/Mapping/ElementMetadata.php b/vendor/symfony/validator/Mapping/ElementMetadata.php
deleted file mode 100644
index 69fe8bf..0000000
--- a/vendor/symfony/validator/Mapping/ElementMetadata.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-/**
- * Contains the metadata of a structural element.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Extend {@link GenericMetadata} instead.
- */
-abstract class ElementMetadata extends GenericMetadata
-{
-    public function __construct()
-    {
-        if (!$this instanceof MemberMetadata && !$this instanceof ClassMetadata) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Mapping\GenericMetadata class instead.', E_USER_DEPRECATED);
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Factory/BlackHoleMetadataFactory.php b/vendor/symfony/validator/Mapping/Factory/BlackHoleMetadataFactory.php
deleted file mode 100644
index 5b38d0c..0000000
--- a/vendor/symfony/validator/Mapping/Factory/BlackHoleMetadataFactory.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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\Component\Validator\Mapping\Factory;
-
-/**
- * Metadata factory that does not store metadata.
- *
- * This implementation is useful if you want to validate values against
- * constraints only and you don't need to add constraints to classes and
- * properties.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class BlackHoleMetadataFactory implements MetadataFactoryInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFor($value)
-    {
-        throw new \LogicException('This class does not support metadata.');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasMetadataFor($value)
-    {
-        return false;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php
deleted file mode 100644
index 6c5c277..0000000
--- a/vendor/symfony/validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?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\Component\Validator\Mapping\Factory;
-
-use Symfony\Component\Validator\Exception\NoSuchMetadataException;
-use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
-use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
-use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
-
-/**
- * Creates new {@link ClassMetadataInterface} instances.
- *
- * Whenever {@link getMetadataFor()} is called for the first time with a given
- * class name or object of that class, a new metadata instance is created and
- * returned. On subsequent requests for the same class, the same metadata
- * instance will be returned.
- *
- * You can optionally pass a {@link LoaderInterface} instance to the constructor.
- * Whenever a new metadata instance is created, it is passed to the loader,
- * which can configure the metadata based on configuration loaded from the
- * filesystem or a database. If you want to use multiple loaders, wrap them in a
- * {@link LoaderChain}.
- *
- * You can also optionally pass a {@link CacheInterface} instance to the
- * constructor. This cache will be used for persisting the generated metadata
- * between multiple PHP requests.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LazyLoadingMetadataFactory implements MetadataFactoryInterface
-{
-    /**
-     * The loader for loading the class metadata.
-     *
-     * @var LoaderInterface|null
-     */
-    protected $loader;
-
-    /**
-     * The cache for caching class metadata.
-     *
-     * @var CacheInterface|null
-     */
-    protected $cache;
-
-    /**
-     * The loaded metadata, indexed by class name.
-     *
-     * @var ClassMetadata[]
-     */
-    protected $loadedClasses = array();
-
-    /**
-     * Creates a new metadata factory.
-     *
-     * @param LoaderInterface|null $loader The loader for configuring new metadata
-     * @param CacheInterface|null  $cache  The cache for persisting metadata
-     *                                     between multiple PHP requests
-     */
-    public function __construct(LoaderInterface $loader = null, CacheInterface $cache = null)
-    {
-        $this->loader = $loader;
-        $this->cache = $cache;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * If the method was called with the same class name (or an object of that
-     * class) before, the same metadata instance is returned.
-     *
-     * If the factory was configured with a cache, this method will first look
-     * for an existing metadata instance in the cache. If an existing instance
-     * is found, it will be returned without further ado.
-     *
-     * Otherwise, a new metadata instance is created. If the factory was
-     * configured with a loader, the metadata is passed to the
-     * {@link LoaderInterface::loadClassMetadata()} method for further
-     * configuration. At last, the new object is returned.
-     */
-    public function getMetadataFor($value)
-    {
-        if (!is_object($value) && !is_string($value)) {
-            throw new NoSuchMetadataException(sprintf('Cannot create metadata for non-objects. Got: %s', gettype($value)));
-        }
-
-        $class = ltrim(is_object($value) ? get_class($value) : $value, '\\');
-
-        if (isset($this->loadedClasses[$class])) {
-            return $this->loadedClasses[$class];
-        }
-
-        if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
-            return $this->loadedClasses[$class];
-        }
-
-        if (!class_exists($class) && !interface_exists($class)) {
-            throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
-        }
-
-        $metadata = new ClassMetadata($class);
-
-        // Include constraints from the parent class
-        if ($parent = $metadata->getReflectionClass()->getParentClass()) {
-            $metadata->mergeConstraints($this->getMetadataFor($parent->name));
-        }
-
-        // Include constraints from all implemented interfaces
-        foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
-            if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->name) {
-                continue;
-            }
-            $metadata->mergeConstraints($this->getMetadataFor($interface->name));
-        }
-
-        if (null !== $this->loader) {
-            $this->loader->loadClassMetadata($metadata);
-        }
-
-        if (null !== $this->cache) {
-            $this->cache->write($metadata);
-        }
-
-        return $this->loadedClasses[$class] = $metadata;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasMetadataFor($value)
-    {
-        if (!is_object($value) && !is_string($value)) {
-            return false;
-        }
-
-        $class = ltrim(is_object($value) ? get_class($value) : $value, '\\');
-
-        if (class_exists($class) || interface_exists($class)) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Factory/MetadataFactoryInterface.php b/vendor/symfony/validator/Mapping/Factory/MetadataFactoryInterface.php
deleted file mode 100644
index 6e55e77..0000000
--- a/vendor/symfony/validator/Mapping/Factory/MetadataFactoryInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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\Component\Validator\Mapping\Factory;
-
-use Symfony\Component\Validator\MetadataFactoryInterface as LegacyMetadataFactoryInterface;
-
-/**
- * Returns {@link \Symfony\Component\Validator\Mapping\MetadataInterface} instances for values.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface MetadataFactoryInterface extends LegacyMetadataFactoryInterface
-{
-}
diff --git a/vendor/symfony/validator/Mapping/GenericMetadata.php b/vendor/symfony/validator/Mapping/GenericMetadata.php
deleted file mode 100644
index 3459074..0000000
--- a/vendor/symfony/validator/Mapping/GenericMetadata.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\Traverse;
-use Symfony\Component\Validator\Constraints\Valid;
-use Symfony\Component\Validator\Exception\BadMethodCallException;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\ValidationVisitorInterface;
-
-/**
- * A generic container of {@link Constraint} objects.
- *
- * This class supports serialization and cloning.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class GenericMetadata implements MetadataInterface
-{
-    /**
-     * @var Constraint[]
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getConstraints()} and {@link findConstraints()} instead.
-     */
-    public $constraints = array();
-
-    /**
-     * @var array
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link findConstraints()} instead.
-     */
-    public $constraintsByGroup = array();
-
-    /**
-     * The strategy for cascading objects.
-     *
-     * By default, objects are not cascaded.
-     *
-     * @var int
-     *
-     * @see CascadingStrategy
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getCascadingStrategy()} instead.
-     */
-    public $cascadingStrategy = CascadingStrategy::NONE;
-
-    /**
-     * The strategy for traversing traversable objects.
-     *
-     * By default, traversable objects are not traversed.
-     *
-     * @var int
-     *
-     * @see TraversalStrategy
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getTraversalStrategy()} instead.
-     */
-    public $traversalStrategy = TraversalStrategy::NONE;
-
-    /**
-     * Returns the names of the properties that should be serialized.
-     *
-     * @return string[]
-     */
-    public function __sleep()
-    {
-        return array(
-            'constraints',
-            'constraintsByGroup',
-            'cascadingStrategy',
-            'traversalStrategy',
-        );
-    }
-
-    /**
-     * Clones this object.
-     */
-    public function __clone()
-    {
-        $constraints = $this->constraints;
-
-        $this->constraints = array();
-        $this->constraintsByGroup = array();
-
-        foreach ($constraints as $constraint) {
-            $this->addConstraint(clone $constraint);
-        }
-    }
-
-    /**
-     * Adds a constraint.
-     *
-     * If the constraint {@link Valid} is added, the cascading strategy will be
-     * changed to {@link CascadingStrategy::CASCADE}. Depending on the
-     * properties $traverse and $deep of that constraint, the traversal strategy
-     * will be set to one of the following:
-     *
-     *  - {@link TraversalStrategy::IMPLICIT} if $traverse is enabled and $deep
-     *    is enabled
-     *  - {@link TraversalStrategy::IMPLICIT} | {@link TraversalStrategy::STOP_RECURSION}
-     *    if $traverse is enabled, but $deep is disabled
-     *  - {@link TraversalStrategy::NONE} if $traverse is disabled
-     *
-     * @param Constraint $constraint The constraint to add
-     *
-     * @return GenericMetadata This object
-     *
-     * @throws ConstraintDefinitionException When trying to add the
-     *                                       {@link Traverse} constraint
-     */
-    public function addConstraint(Constraint $constraint)
-    {
-        if ($constraint instanceof Traverse) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The constraint "%s" can only be put on classes. Please use '.
-                '"Symfony\Component\Validator\Constraints\Valid" instead.',
-                get_class($constraint)
-            ));
-        }
-
-        if ($constraint instanceof Valid) {
-            $this->cascadingStrategy = CascadingStrategy::CASCADE;
-
-            if ($constraint->traverse) {
-                // Traverse unless the value is not traversable
-                $this->traversalStrategy = TraversalStrategy::IMPLICIT;
-
-                if (!$constraint->deep) {
-                    $this->traversalStrategy |= TraversalStrategy::STOP_RECURSION;
-                }
-            } else {
-                $this->traversalStrategy = TraversalStrategy::NONE;
-            }
-
-            return $this;
-        }
-
-        $this->constraints[] = $constraint;
-
-        foreach ($constraint->groups as $group) {
-            $this->constraintsByGroup[$group][] = $constraint;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds an list of constraints.
-     *
-     * @param Constraint[] $constraints The constraints to add
-     *
-     * @return GenericMetadata This object
-     */
-    public function addConstraints(array $constraints)
-    {
-        foreach ($constraints as $constraint) {
-            $this->addConstraint($constraint);
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConstraints()
-    {
-        return $this->constraints;
-    }
-
-    /**
-     * Returns whether this element has any constraints.
-     *
-     * @return bool
-     */
-    public function hasConstraints()
-    {
-        return count($this->constraints) > 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Aware of the global group (* group).
-     */
-    public function findConstraints($group)
-    {
-        return isset($this->constraintsByGroup[$group])
-            ? $this->constraintsByGroup[$group]
-            : array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCascadingStrategy()
-    {
-        return $this->cascadingStrategy;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTraversalStrategy()
-    {
-        return $this->traversalStrategy;
-    }
-
-    /**
-     * Exists for compatibility with the deprecated
-     * {@link Symfony\Component\Validator\MetadataInterface}.
-     *
-     * Should not be used.
-     *
-     * Implemented for backward compatibility with Symfony < 2.5.
-     *
-     * @throws BadMethodCallException
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath)
-    {
-        throw new BadMethodCallException('Not supported.');
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/GetterMetadata.php b/vendor/symfony/validator/Mapping/GetterMetadata.php
deleted file mode 100644
index 0cf9992..0000000
--- a/vendor/symfony/validator/Mapping/GetterMetadata.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Exception\ValidatorException;
-
-/**
- * Stores all metadata needed for validating a class property via its getter
- * method.
- *
- * A property getter is any method that is equal to the property's name,
- * prefixed with either "get" or "is". That method will be used to access the
- * property's value.
- *
- * The getter will be invoked by reflection, so the access of private and
- * protected getters is supported.
- *
- * This class supports serialization and cloning.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see PropertyMetadataInterface
- */
-class GetterMetadata extends MemberMetadata
-{
-    /**
-     * Constructor.
-     *
-     * @param string $class    The class the getter is defined on
-     * @param string $property The property which the getter returns
-     *
-     * @throws ValidatorException
-     */
-    public function __construct($class, $property)
-    {
-        $getMethod = 'get'.ucfirst($property);
-        $isMethod = 'is'.ucfirst($property);
-        $hasMethod = 'has'.ucfirst($property);
-
-        if (method_exists($class, $getMethod)) {
-            $method = $getMethod;
-        } elseif (method_exists($class, $isMethod)) {
-            $method = $isMethod;
-        } elseif (method_exists($class, $hasMethod)) {
-            $method = $hasMethod;
-        } else {
-            throw new ValidatorException(sprintf('Neither of these methods exist in class %s: %s, %s, %s', $class, $getMethod, $isMethod, $hasMethod));
-        }
-
-        parent::__construct($class, $method, $property);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyValue($object)
-    {
-        return $this->newReflectionMember($object)->invoke($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function newReflectionMember($objectOrClassName)
-    {
-        return new \ReflectionMethod($objectOrClassName, $this->getName());
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php b/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php
deleted file mode 100644
index 2ae8988..0000000
--- a/vendor/symfony/validator/Mapping/Loader/AbstractLoader.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\MappingException;
-
-/**
- * Base loader for validation metadata.
- *
- * This loader supports the loading of constraints from Symfony's default
- * namespace (see {@link DEFAULT_NAMESPACE}) using the short class names of
- * those constraints. Constraints can also be loaded using their fully
- * qualified class names. At last, namespace aliases can be defined to load
- * constraints with the syntax "alias:ShortName".
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-abstract class AbstractLoader implements LoaderInterface
-{
-    /**
-     * The namespace to load constraints from by default.
-     */
-    const DEFAULT_NAMESPACE = '\\Symfony\\Component\\Validator\\Constraints\\';
-
-    /**
-     * @var array
-     */
-    protected $namespaces = array();
-
-    /**
-     * Adds a namespace alias.
-     *
-     * The namespace alias can be used to reference constraints from specific
-     * namespaces in {@link newConstraint()}:
-     *
-     *     $this->addNamespaceAlias('mynamespace', '\\Acme\\Package\\Constraints\\');
-     *
-     *     $constraint = $this->newConstraint('mynamespace:NotNull');
-     *
-     * @param string $alias     The alias
-     * @param string $namespace The PHP namespace
-     */
-    protected function addNamespaceAlias($alias, $namespace)
-    {
-        $this->namespaces[$alias] = $namespace;
-    }
-
-    /**
-     * Creates a new constraint instance for the given constraint name.
-     *
-     * @param string $name    The constraint name. Either a constraint relative
-     *                        to the default constraint namespace, or a fully
-     *                        qualified class name. Alternatively, the constraint
-     *                        may be preceded by a namespace alias and a colon.
-     *                        The namespace alias must have been defined using
-     *                        {@link addNamespaceAlias()}.
-     * @param mixed  $options The constraint options
-     *
-     * @return Constraint
-     *
-     * @throws MappingException If the namespace prefix is undefined
-     */
-    protected function newConstraint($name, $options = null)
-    {
-        if (strpos($name, '\\') !== false && class_exists($name)) {
-            $className = (string) $name;
-        } elseif (strpos($name, ':') !== false) {
-            list($prefix, $className) = explode(':', $name, 2);
-
-            if (!isset($this->namespaces[$prefix])) {
-                throw new MappingException(sprintf('Undefined namespace prefix "%s"', $prefix));
-            }
-
-            $className = $this->namespaces[$prefix].$className;
-        } else {
-            $className = self::DEFAULT_NAMESPACE.$name;
-        }
-
-        return new $className($options);
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php b/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php
deleted file mode 100644
index d1b8c35..0000000
--- a/vendor/symfony/validator/Mapping/Loader/AnnotationLoader.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Constraints\GroupSequence;
-use Symfony\Component\Validator\Constraints\GroupSequenceProvider;
-use Symfony\Component\Validator\Exception\MappingException;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Loads validation metadata using a Doctrine annotation {@link Reader}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class AnnotationLoader implements LoaderInterface
-{
-    /**
-     * @var Reader
-     */
-    protected $reader;
-
-    public function __construct(Reader $reader)
-    {
-        $this->reader = $reader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadata $metadata)
-    {
-        $reflClass = $metadata->getReflectionClass();
-        $className = $reflClass->name;
-        $success = false;
-
-        foreach ($this->reader->getClassAnnotations($reflClass) as $constraint) {
-            if ($constraint instanceof GroupSequence) {
-                $metadata->setGroupSequence($constraint->groups);
-            } elseif ($constraint instanceof GroupSequenceProvider) {
-                $metadata->setGroupSequenceProvider(true);
-            } elseif ($constraint instanceof Constraint) {
-                $metadata->addConstraint($constraint);
-            }
-
-            $success = true;
-        }
-
-        foreach ($reflClass->getProperties() as $property) {
-            if ($property->getDeclaringClass()->name === $className) {
-                foreach ($this->reader->getPropertyAnnotations($property) as $constraint) {
-                    if ($constraint instanceof Constraint) {
-                        $metadata->addPropertyConstraint($property->name, $constraint);
-                    }
-
-                    $success = true;
-                }
-            }
-        }
-
-        foreach ($reflClass->getMethods() as $method) {
-            if ($method->getDeclaringClass()->name === $className) {
-                foreach ($this->reader->getMethodAnnotations($method) as $constraint) {
-                    if ($constraint instanceof Callback) {
-                        $constraint->callback = $method->getName();
-                        $constraint->methods = null;
-
-                        $metadata->addConstraint($constraint);
-                    } elseif ($constraint instanceof Constraint) {
-                        if (preg_match('/^(get|is|has)(.+)$/i', $method->name, $matches)) {
-                            $metadata->addGetterConstraint(lcfirst($matches[2]), $constraint);
-                        } else {
-                            throw new MappingException(sprintf('The constraint on "%s::%s" cannot be added. Constraints can only be added on methods beginning with "get", "is" or "has".', $className, $method->name));
-                        }
-                    }
-
-                    $success = true;
-                }
-            }
-        }
-
-        return $success;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/FileLoader.php b/vendor/symfony/validator/Mapping/Loader/FileLoader.php
deleted file mode 100644
index 326bbdf..0000000
--- a/vendor/symfony/validator/Mapping/Loader/FileLoader.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Exception\MappingException;
-
-/**
- * Base loader for loading validation metadata from a file.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see YamlFileLoader
- * @see XmlFileLoader
- */
-abstract class FileLoader extends AbstractLoader
-{
-    /**
-     * The file to load.
-     *
-     * @var string
-     */
-    protected $file;
-
-    /**
-     * Creates a new loader.
-     *
-     * @param string $file The mapping file to load
-     *
-     * @throws MappingException If the file does not exist or is not readable
-     */
-    public function __construct($file)
-    {
-        if (!is_file($file)) {
-            throw new MappingException(sprintf('The mapping file "%s" does not exist', $file));
-        }
-
-        if (!is_readable($file)) {
-            throw new MappingException(sprintf('The mapping file "%s" is not readable', $file));
-        }
-
-        if (!stream_is_local($this->file)) {
-            throw new MappingException(sprintf('The mapping file "%s" is not a local file', $file));
-        }
-
-        $this->file = $file;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/FilesLoader.php b/vendor/symfony/validator/Mapping/Loader/FilesLoader.php
deleted file mode 100644
index 571c7e7..0000000
--- a/vendor/symfony/validator/Mapping/Loader/FilesLoader.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-/**
- * Base loader for loading validation metadata from a list of files.
- *
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see YamlFilesLoader
- * @see XmlFilesLoader
- */
-abstract class FilesLoader extends LoaderChain
-{
-    /**
-     * Creates a new loader.
-     *
-     * @param array $paths An array of file paths
-     */
-    public function __construct(array $paths)
-    {
-        parent::__construct($this->getFileLoaders($paths));
-    }
-
-    /**
-     * Returns an array of file loaders for the given file paths.
-     *
-     * @param array $paths An array of file paths
-     *
-     * @return LoaderInterface[] The metadata loaders
-     */
-    protected function getFileLoaders($paths)
-    {
-        $loaders = array();
-
-        foreach ($paths as $path) {
-            $loaders[] = $this->getFileLoaderInstance($path);
-        }
-
-        return $loaders;
-    }
-
-    /**
-     * Creates a loader for the given file path.
-     *
-     * @param string $path The file path
-     *
-     * @return LoaderInterface The created loader
-     */
-    abstract protected function getFileLoaderInstance($path);
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/LoaderChain.php b/vendor/symfony/validator/Mapping/Loader/LoaderChain.php
deleted file mode 100644
index 970d906..0000000
--- a/vendor/symfony/validator/Mapping/Loader/LoaderChain.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Exception\MappingException;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Loads validation metadata from multiple {@link LoaderInterface} instances.
- *
- * Pass the loaders when constructing the chain. Once
- * {@link loadClassMetadata()} is called, that method will be called on all
- * loaders in the chain.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class LoaderChain implements LoaderInterface
-{
-    /**
-     * @var LoaderInterface[]
-     */
-    protected $loaders;
-
-    /**
-     * @param LoaderInterface[] $loaders The metadata loaders to use
-     *
-     * @throws MappingException If any of the loaders has an invalid type
-     */
-    public function __construct(array $loaders)
-    {
-        foreach ($loaders as $loader) {
-            if (!$loader instanceof LoaderInterface) {
-                throw new MappingException(sprintf('Class %s is expected to implement LoaderInterface', get_class($loader)));
-            }
-        }
-
-        $this->loaders = $loaders;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadata $metadata)
-    {
-        $success = false;
-
-        foreach ($this->loaders as $loader) {
-            $success = $loader->loadClassMetadata($metadata) || $success;
-        }
-
-        return $success;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/LoaderInterface.php b/vendor/symfony/validator/Mapping/Loader/LoaderInterface.php
deleted file mode 100644
index 5dadc82..0000000
--- a/vendor/symfony/validator/Mapping/Loader/LoaderInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Loads validation metadata into {@link ClassMetadata} instances.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface LoaderInterface
-{
-    /**
-     * Loads validation metadata into a {@link ClassMetadata} instance.
-     *
-     * @param ClassMetadata $metadata The metadata to load
-     *
-     * @return bool Whether the loader succeeded
-     */
-    public function loadClassMetadata(ClassMetadata $metadata);
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php b/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php
deleted file mode 100644
index 4ff2257..0000000
--- a/vendor/symfony/validator/Mapping/Loader/StaticMethodLoader.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Exception\MappingException;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Loads validation metadata by calling a static method on the loaded class.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class StaticMethodLoader implements LoaderInterface
-{
-    /**
-     * The name of the method to call.
-     *
-     * @var string
-     */
-    protected $methodName;
-
-    /**
-     * Creates a new loader.
-     *
-     * @param string $methodName The name of the static method to call
-     */
-    public function __construct($methodName = 'loadValidatorMetadata')
-    {
-        $this->methodName = $methodName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadata $metadata)
-    {
-        /** @var \ReflectionClass $reflClass */
-        $reflClass = $metadata->getReflectionClass();
-
-        if (!$reflClass->isInterface() && $reflClass->hasMethod($this->methodName)) {
-            $reflMethod = $reflClass->getMethod($this->methodName);
-
-            if ($reflMethod->isAbstract()) {
-                return false;
-            }
-
-            if (!$reflMethod->isStatic()) {
-                throw new MappingException(sprintf('The method %s::%s should be static', $reflClass->name, $this->methodName));
-            }
-
-            if ($reflMethod->getDeclaringClass()->name != $reflClass->name) {
-                return false;
-            }
-
-            $reflMethod->invoke(null, $metadata);
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/XmlFileLoader.php b/vendor/symfony/validator/Mapping/Loader/XmlFileLoader.php
deleted file mode 100644
index 2961b00..0000000
--- a/vendor/symfony/validator/Mapping/Loader/XmlFileLoader.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Config\Util\XmlUtils;
-use Symfony\Component\Validator\Exception\MappingException;
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-
-/**
- * Loads validation metadata from an XML file.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class XmlFileLoader extends FileLoader
-{
-    /**
-     * The XML nodes of the mapping file.
-     *
-     * @var \SimpleXMLElement[]|null
-     */
-    protected $classes;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadata $metadata)
-    {
-        if (null === $this->classes) {
-            // This method may throw an exception. Do not modify the class'
-            // state before it completes
-            $xml = $this->parseFile($this->file);
-
-            $this->classes = array();
-
-            foreach ($xml->namespace as $namespace) {
-                $this->addNamespaceAlias((string) $namespace['prefix'], trim((string) $namespace));
-            }
-
-            foreach ($xml->class as $class) {
-                $this->classes[(string) $class['name']] = $class;
-            }
-        }
-
-        if (isset($this->classes[$metadata->getClassName()])) {
-            $classDescription = $this->classes[$metadata->getClassName()];
-
-            $this->loadClassMetadataFromXml($metadata, $classDescription);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses a collection of "constraint" XML nodes.
-     *
-     * @param \SimpleXMLElement $nodes The XML nodes
-     *
-     * @return array The Constraint instances
-     */
-    protected function parseConstraints(\SimpleXMLElement $nodes)
-    {
-        $constraints = array();
-
-        foreach ($nodes as $node) {
-            if (count($node) > 0) {
-                if (count($node->value) > 0) {
-                    $options = $this->parseValues($node->value);
-                } elseif (count($node->constraint) > 0) {
-                    $options = $this->parseConstraints($node->constraint);
-                } elseif (count($node->option) > 0) {
-                    $options = $this->parseOptions($node->option);
-                } else {
-                    $options = array();
-                }
-            } elseif (strlen((string) $node) > 0) {
-                $options = trim($node);
-            } else {
-                $options = null;
-            }
-
-            $constraints[] = $this->newConstraint((string) $node['name'], $options);
-        }
-
-        return $constraints;
-    }
-
-    /**
-     * Parses a collection of "value" XML nodes.
-     *
-     * @param \SimpleXMLElement $nodes The XML nodes
-     *
-     * @return array The values
-     */
-    protected function parseValues(\SimpleXMLElement $nodes)
-    {
-        $values = array();
-
-        foreach ($nodes as $node) {
-            if (count($node) > 0) {
-                if (count($node->value) > 0) {
-                    $value = $this->parseValues($node->value);
-                } elseif (count($node->constraint) > 0) {
-                    $value = $this->parseConstraints($node->constraint);
-                } else {
-                    $value = array();
-                }
-            } else {
-                $value = trim($node);
-            }
-
-            if (isset($node['key'])) {
-                $values[(string) $node['key']] = $value;
-            } else {
-                $values[] = $value;
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Parses a collection of "option" XML nodes.
-     *
-     * @param \SimpleXMLElement $nodes The XML nodes
-     *
-     * @return array The options
-     */
-    protected function parseOptions(\SimpleXMLElement $nodes)
-    {
-        $options = array();
-
-        foreach ($nodes as $node) {
-            if (count($node) > 0) {
-                if (count($node->value) > 0) {
-                    $value = $this->parseValues($node->value);
-                } elseif (count($node->constraint) > 0) {
-                    $value = $this->parseConstraints($node->constraint);
-                } else {
-                    $value = array();
-                }
-            } else {
-                $value = XmlUtils::phpize($node);
-                if (is_string($value)) {
-                    $value = trim($value);
-                }
-            }
-
-            $options[(string) $node['name']] = $value;
-        }
-
-        return $options;
-    }
-
-    /**
-     * Loads the XML class descriptions from the given file.
-     *
-     * @param string $path The path of the XML file
-     *
-     * @return \SimpleXMLElement The class descriptions
-     *
-     * @throws MappingException If the file could not be loaded
-     */
-    protected function parseFile($path)
-    {
-        try {
-            $dom = XmlUtils::loadFile($path, __DIR__.'/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd');
-        } catch (\Exception $e) {
-            throw new MappingException($e->getMessage(), $e->getCode(), $e);
-        }
-
-        return simplexml_import_dom($dom);
-    }
-
-    /**
-     * Loads the validation metadata from the given XML class description.
-     *
-     * @param ClassMetadata $metadata         The metadata to load
-     * @param array         $classDescription The XML class description
-     */
-    private function loadClassMetadataFromXml(ClassMetadata $metadata, $classDescription)
-    {
-        foreach ($classDescription->{'group-sequence-provider'} as $_) {
-            $metadata->setGroupSequenceProvider(true);
-        }
-
-        foreach ($classDescription->{'group-sequence'} as $groupSequence) {
-            if (count($groupSequence->value) > 0) {
-                $metadata->setGroupSequence($this->parseValues($groupSequence[0]->value));
-            }
-        }
-
-        foreach ($this->parseConstraints($classDescription->constraint) as $constraint) {
-            $metadata->addConstraint($constraint);
-        }
-
-        foreach ($classDescription->property as $property) {
-            foreach ($this->parseConstraints($property->constraint) as $constraint) {
-                $metadata->addPropertyConstraint((string) $property['name'], $constraint);
-            }
-        }
-
-        foreach ($classDescription->getter as $getter) {
-            foreach ($this->parseConstraints($getter->constraint) as $constraint) {
-                $metadata->addGetterConstraint((string) $getter['property'], $constraint);
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/XmlFilesLoader.php b/vendor/symfony/validator/Mapping/Loader/XmlFilesLoader.php
deleted file mode 100644
index 6017c3f..0000000
--- a/vendor/symfony/validator/Mapping/Loader/XmlFilesLoader.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-/**
- * Loads validation metadata from a list of XML files.
- *
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see FilesLoader
- */
-class XmlFilesLoader extends FilesLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getFileLoaderInstance($file)
-    {
-        return new XmlFileLoader($file);
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php b/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
deleted file mode 100644
index cf6dd92..0000000
--- a/vendor/symfony/validator/Mapping/Loader/YamlFileLoader.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Parser as YamlParser;
-
-/**
- * Loads validation metadata from a YAML file.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class YamlFileLoader extends FileLoader
-{
-    /**
-     * An array of YAML class descriptions.
-     *
-     * @var array
-     */
-    protected $classes = null;
-
-    /**
-     * Caches the used YAML parser.
-     *
-     * @var YamlParser
-     */
-    private $yamlParser;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadClassMetadata(ClassMetadata $metadata)
-    {
-        if (null === $this->classes) {
-            if (null === $this->yamlParser) {
-                $this->yamlParser = new YamlParser();
-            }
-
-            // This method may throw an exception. Do not modify the class'
-            // state before it completes
-            if (false === ($classes = $this->parseFile($this->file))) {
-                return false;
-            }
-
-            $this->classes = $classes;
-
-            if (isset($this->classes['namespaces'])) {
-                foreach ($this->classes['namespaces'] as $alias => $namespace) {
-                    $this->addNamespaceAlias($alias, $namespace);
-                }
-
-                unset($this->classes['namespaces']);
-            }
-        }
-
-        if (isset($this->classes[$metadata->getClassName()])) {
-            $classDescription = $this->classes[$metadata->getClassName()];
-
-            $this->loadClassMetadataFromYaml($metadata, $classDescription);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses a collection of YAML nodes.
-     *
-     * @param array $nodes The YAML nodes
-     *
-     * @return array An array of values or Constraint instances
-     */
-    protected function parseNodes(array $nodes)
-    {
-        $values = array();
-
-        foreach ($nodes as $name => $childNodes) {
-            if (is_numeric($name) && is_array($childNodes) && 1 === count($childNodes)) {
-                $options = current($childNodes);
-
-                if (is_array($options)) {
-                    $options = $this->parseNodes($options);
-                }
-
-                $values[] = $this->newConstraint(key($childNodes), $options);
-            } else {
-                if (is_array($childNodes)) {
-                    $childNodes = $this->parseNodes($childNodes);
-                }
-
-                $values[$name] = $childNodes;
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Loads the YAML class descriptions from the given file.
-     *
-     * @param string $path The path of the YAML file
-     *
-     * @return array|null The class descriptions or null, if the file was empty
-     *
-     * @throws \InvalidArgumentException If the file could not be loaded or did
-     *                                   not contain a YAML array
-     */
-    private function parseFile($path)
-    {
-        try {
-            $classes = $this->yamlParser->parse(file_get_contents($path));
-        } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
-        }
-
-        // empty file
-        if (null === $classes) {
-            return;
-        }
-
-        // not an array
-        if (!is_array($classes)) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $this->file));
-        }
-
-        return $classes;
-    }
-
-    /**
-     * Loads the validation metadata from the given YAML class description.
-     *
-     * @param ClassMetadata $metadata         The metadata to load
-     * @param array         $classDescription The YAML class description
-     */
-    private function loadClassMetadataFromYaml(ClassMetadata $metadata, array $classDescription)
-    {
-        if (isset($classDescription['group_sequence_provider'])) {
-            $metadata->setGroupSequenceProvider(
-                (bool) $classDescription['group_sequence_provider']
-            );
-        }
-
-        if (isset($classDescription['group_sequence'])) {
-            $metadata->setGroupSequence($classDescription['group_sequence']);
-        }
-
-        if (isset($classDescription['constraints']) && is_array($classDescription['constraints'])) {
-            foreach ($this->parseNodes($classDescription['constraints']) as $constraint) {
-                $metadata->addConstraint($constraint);
-            }
-        }
-
-        if (isset($classDescription['properties']) && is_array($classDescription['properties'])) {
-            foreach ($classDescription['properties'] as $property => $constraints) {
-                if (null !== $constraints) {
-                    foreach ($this->parseNodes($constraints) as $constraint) {
-                        $metadata->addPropertyConstraint($property, $constraint);
-                    }
-                }
-            }
-        }
-
-        if (isset($classDescription['getters']) && is_array($classDescription['getters'])) {
-            foreach ($classDescription['getters'] as $getter => $constraints) {
-                if (null !== $constraints) {
-                    foreach ($this->parseNodes($constraints) as $constraint) {
-                        $metadata->addGetterConstraint($getter, $constraint);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/YamlFilesLoader.php b/vendor/symfony/validator/Mapping/Loader/YamlFilesLoader.php
deleted file mode 100644
index 235856f..0000000
--- a/vendor/symfony/validator/Mapping/Loader/YamlFilesLoader.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Validator\Mapping\Loader;
-
-/**
- * Loads validation metadata from a list of YAML files.
- *
- * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see FilesLoader
- */
-class YamlFilesLoader extends FilesLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getFileLoaderInstance($file)
-    {
-        return new YamlFileLoader($file);
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd b/vendor/symfony/validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd
deleted file mode 100644
index 1ca840b..0000000
--- a/vendor/symfony/validator/Mapping/Loader/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" ?>
-
-<xsd:schema xmlns="http://symfony.com/schema/dic/constraint-mapping"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://symfony.com/schema/dic/constraint-mapping"
-    elementFormDefault="qualified">
-
-  <xsd:annotation>
-    <xsd:documentation><![CDATA[
-      Symfony Validator Constraint Mapping Schema, version 1.0
-      Authors: Bernhard Schussek
-
-      A constraint mapping connects classes, properties and getters with
-      validation constraints.
-    ]]></xsd:documentation>
-  </xsd:annotation>
-  
-  <xsd:element name="constraint-mapping" type="constraint-mapping" />
-  
-  <xsd:complexType name="constraint-mapping">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        The root element of the constraint mapping definition.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="namespace" type="namespace" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="class" type="class" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="namespace">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains the abbreviation for a namespace.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="prefix" type="xsd:string" use="required" />
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="class">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains constraints for a single class.
-        
-        Nested elements may be class constraints, property and/or getter 
-        definitions.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:element name="group-sequence-provider" type="group-sequence-provider" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="group-sequence" type="group-sequence" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="constraint" type="constraint" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="getter" type="getter" minOccurs="0" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-  </xsd:complexType>
-
-  <xsd:complexType name="group-sequence">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains the group sequence of a class. Each group should be written
-        into a "value" tag.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="value" type="value" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="group-sequence-provider">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Defines the name of the group sequence provider for a class.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-  </xsd:complexType>
-  
-  <xsd:complexType name="property">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains constraints for a single property. The name of the property
-        should be given in the "name" option.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="constraint" type="constraint" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="getter">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains constraints for a getter method. The name of the corresponding
-        property should be given in the "property" option.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="constraint" type="constraint" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="property" type="xsd:string" use="required" />
-  </xsd:complexType>
-  
-  <xsd:complexType name="constraint" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains a constraint definition. The name of the constraint should be
-        given in the "name" option.
-        
-        May contain a single value, multiple "constraint" elements, 
-        multiple "value" elements or multiple "option" elements.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0">
-      <xsd:element name="constraint" type="constraint" minOccurs="1" maxOccurs="unbounded" />
-      <xsd:element name="option" type="option" minOccurs="1" maxOccurs="unbounded" />
-      <xsd:element name="value" type="value" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="name" type="xsd:string" use="required" />    
-  </xsd:complexType>
-  
-  <xsd:complexType name="option" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        Contains a constraint option definition. The name of the option
-        should be given in the "name" option.
-        
-        May contain a single value, multiple "value" elements or multiple
-        "constraint" elements.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0">
-      <xsd:element name="constraint" type="constraint" minOccurs="1" maxOccurs="unbounded" />
-      <xsd:element name="value" type="value" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="name" type="xsd:string" use="required" />  
-  </xsd:complexType>
-  
-  <xsd:complexType name="value" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation><![CDATA[
-        A value of an element.
-        
-        May contain a single value, multiple "value" elements or multiple
-        "constraint" elements.
-      ]]></xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0">
-      <xsd:element name="constraint" type="constraint" minOccurs="1" maxOccurs="unbounded" />
-      <xsd:element name="value" type="value" minOccurs="1" maxOccurs="unbounded" />
-    </xsd:choice>
-    <xsd:attribute name="key" type="xsd:string" use="optional" /> 
-  </xsd:complexType>
-</xsd:schema>
diff --git a/vendor/symfony/validator/Mapping/MemberMetadata.php b/vendor/symfony/validator/Mapping/MemberMetadata.php
deleted file mode 100644
index 0def248..0000000
--- a/vendor/symfony/validator/Mapping/MemberMetadata.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\ValidationVisitorInterface;
-
-/**
- * Stores all metadata needed for validating a class property.
- *
- * The method of accessing the property's value must be specified by subclasses
- * by implementing the {@link newReflectionMember()} method.
- *
- * This class supports serialization and cloning.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see PropertyMetadataInterface
- */
-abstract class MemberMetadata extends ElementMetadata implements PropertyMetadataInterface
-{
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getClassName()} instead.
-     */
-    public $class;
-
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getName()} instead.
-     */
-    public $name;
-
-    /**
-     * @var string
-     *
-     * @internal This property is public in order to reduce the size of the
-     *           class' serialized representation. Do not access it. Use
-     *           {@link getPropertyName()} instead.
-     */
-    public $property;
-
-    /**
-     * @var \ReflectionMethod[]|\ReflectionProperty[]
-     */
-    private $reflMember = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string $class    The name of the class this member is defined on
-     * @param string $name     The name of the member
-     * @param string $property The property the member belongs to
-     */
-    public function __construct($class, $name, $property)
-    {
-        $this->class = $class;
-        $this->name = $name;
-        $this->property = $property;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath, $propagatedGroup = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-        $visitor->visit($this, $value, $group, $propertyPath);
-
-        if ($this->isCascaded()) {
-            $visitor->validate($value, $propagatedGroup ?: $group, $propertyPath, $this->isCollectionCascaded(), $this->isCollectionCascadedDeeply());
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addConstraint(Constraint $constraint)
-    {
-        if (!in_array(Constraint::PROPERTY_CONSTRAINT, (array) $constraint->getTargets())) {
-            throw new ConstraintDefinitionException(sprintf(
-                'The constraint %s cannot be put on properties or getters',
-                get_class($constraint)
-            ));
-        }
-
-        parent::addConstraint($constraint);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __sleep()
-    {
-        return array_merge(parent::__sleep(), array(
-            'class',
-            'name',
-            'property',
-        ));
-    }
-
-    /**
-     * Returns the name of the member.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClassName()
-    {
-        return $this->class;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyName()
-    {
-        return $this->property;
-    }
-
-    /**
-     * Returns whether this member is public.
-     *
-     * @param object|string $objectOrClassName The object or the class name
-     *
-     * @return bool
-     */
-    public function isPublic($objectOrClassName)
-    {
-        return $this->getReflectionMember($objectOrClassName)->isPublic();
-    }
-
-    /**
-     * Returns whether this member is protected.
-     *
-     * @param object|string $objectOrClassName The object or the class name
-     *
-     * @return bool
-     */
-    public function isProtected($objectOrClassName)
-    {
-        return $this->getReflectionMember($objectOrClassName)->isProtected();
-    }
-
-    /**
-     * Returns whether this member is private.
-     *
-     * @param object|string $objectOrClassName The object or the class name
-     *
-     * @return bool
-     */
-    public function isPrivate($objectOrClassName)
-    {
-        return $this->getReflectionMember($objectOrClassName)->isPrivate();
-    }
-
-    /**
-     * Returns whether objects stored in this member should be validated.
-     *
-     * @return bool
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link getCascadingStrategy()} instead.
-     */
-    public function isCascaded()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getCascadingStrategy() method instead.', E_USER_DEPRECATED);
-
-        return (bool) ($this->cascadingStrategy & CascadingStrategy::CASCADE);
-    }
-
-    /**
-     * Returns whether arrays or traversable objects stored in this member
-     * should be traversed and validated in each entry.
-     *
-     * @return bool
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link getTraversalStrategy()} instead.
-     */
-    public function isCollectionCascaded()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
-
-        return (bool) ($this->traversalStrategy & (TraversalStrategy::IMPLICIT | TraversalStrategy::TRAVERSE));
-    }
-
-    /**
-     * Returns whether arrays or traversable objects stored in this member
-     * should be traversed recursively for inner arrays/traversable objects.
-     *
-     * @return bool
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link getTraversalStrategy()} instead.
-     */
-    public function isCollectionCascadedDeeply()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the getTraversalStrategy() method instead.', E_USER_DEPRECATED);
-
-        return !($this->traversalStrategy & TraversalStrategy::STOP_RECURSION);
-    }
-
-    /**
-     * Returns the reflection instance for accessing the member's value.
-     *
-     * @param object|string $objectOrClassName The object or the class name
-     *
-     * @return \ReflectionMethod|\ReflectionProperty The reflection instance
-     */
-    public function getReflectionMember($objectOrClassName)
-    {
-        $className = is_string($objectOrClassName) ? $objectOrClassName : get_class($objectOrClassName);
-        if (!isset($this->reflMember[$className])) {
-            $this->reflMember[$className] = $this->newReflectionMember($objectOrClassName);
-        }
-
-        return $this->reflMember[$className];
-    }
-
-    /**
-     * Creates a new reflection instance for accessing the member's value.
-     *
-     * Must be implemented by subclasses.
-     *
-     * @param object|string $objectOrClassName The object or the class name
-     *
-     * @return \ReflectionMethod|\ReflectionProperty The reflection instance
-     */
-    abstract protected function newReflectionMember($objectOrClassName);
-}
diff --git a/vendor/symfony/validator/Mapping/MetadataInterface.php b/vendor/symfony/validator/Mapping/MetadataInterface.php
deleted file mode 100644
index e5f09e1..0000000
--- a/vendor/symfony/validator/Mapping/MetadataInterface.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\MetadataInterface as LegacyMetadataInterface;
-
-/**
- * A container for validation metadata.
- *
- * Most importantly, the metadata stores the constraints against which an object
- * and its properties should be validated.
- *
- * Additionally, the metadata stores whether objects should be validated
- * against their class' metadata and whether traversable objects should be
- * traversed or not.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see CascadingStrategy
- * @see TraversalStrategy
- */
-interface MetadataInterface extends LegacyMetadataInterface
-{
-    /**
-     * Returns the strategy for cascading objects.
-     *
-     * @return int The cascading strategy
-     *
-     * @see CascadingStrategy
-     */
-    public function getCascadingStrategy();
-
-    /**
-     * Returns the strategy for traversing traversable objects.
-     *
-     * @return int The traversal strategy
-     *
-     * @see TraversalStrategy
-     */
-    public function getTraversalStrategy();
-
-    /**
-     * Returns all constraints of this element.
-     *
-     * @return Constraint[] A list of Constraint instances
-     */
-    public function getConstraints();
-}
diff --git a/vendor/symfony/validator/Mapping/PropertyMetadata.php b/vendor/symfony/validator/Mapping/PropertyMetadata.php
deleted file mode 100644
index 7319294..0000000
--- a/vendor/symfony/validator/Mapping/PropertyMetadata.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\Exception\ValidatorException;
-
-/**
- * Stores all metadata needed for validating a class property.
- *
- * The value of the property is obtained by directly accessing the property.
- * The property will be accessed by reflection, so the access of private and
- * protected properties is supported.
- *
- * This class supports serialization and cloning.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see PropertyMetadataInterface
- */
-class PropertyMetadata extends MemberMetadata
-{
-    /**
-     * Constructor.
-     *
-     * @param string $class The class this property is defined on
-     * @param string $name  The name of this property
-     *
-     * @throws ValidatorException
-     */
-    public function __construct($class, $name)
-    {
-        if (!property_exists($class, $name)) {
-            throw new ValidatorException(sprintf('Property %s does not exist in class %s', $name, $class));
-        }
-
-        parent::__construct($class, $name, $name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPropertyValue($object)
-    {
-        return $this->getReflectionMember($object)->getValue($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function newReflectionMember($objectOrClassName)
-    {
-        $class = new \ReflectionClass($objectOrClassName);
-        while (!$class->hasProperty($this->getName())) {
-            $class = $class->getParentClass();
-        }
-
-        $member = new \ReflectionProperty($class->getName(), $this->getName());
-        $member->setAccessible(true);
-
-        return $member;
-    }
-}
diff --git a/vendor/symfony/validator/Mapping/PropertyMetadataInterface.php b/vendor/symfony/validator/Mapping/PropertyMetadataInterface.php
deleted file mode 100644
index 8a77aa8..0000000
--- a/vendor/symfony/validator/Mapping/PropertyMetadataInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-use Symfony\Component\Validator\ClassBasedInterface;
-use Symfony\Component\Validator\PropertyMetadataInterface as LegacyPropertyMetadataInterface;
-
-/**
- * Stores all metadata needed for validating the value of a class property.
- *
- * Most importantly, the metadata stores the constraints against which the
- * property's value should be validated.
- *
- * Additionally, the metadata stores whether objects stored in the property
- * should be validated against their class' metadata and whether traversable
- * objects should be traversed or not.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see MetadataInterface
- * @see CascadingStrategy
- * @see TraversalStrategy
- */
-interface PropertyMetadataInterface extends MetadataInterface, LegacyPropertyMetadataInterface, ClassBasedInterface
-{
-}
diff --git a/vendor/symfony/validator/Mapping/TraversalStrategy.php b/vendor/symfony/validator/Mapping/TraversalStrategy.php
deleted file mode 100644
index ae76857..0000000
--- a/vendor/symfony/validator/Mapping/TraversalStrategy.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Component\Validator\Mapping;
-
-/**
- * Specifies whether and how a traversable object should be traversed.
- *
- * If the node traverser traverses a node whose value is an instance of
- * {@link \Traversable}, and if that node is either a class node or if
- * cascading is enabled, then the node's traversal strategy will be checked.
- * Depending on the requested traversal strategy, the node traverser will
- * iterate over the object and cascade each object or collection returned by
- * the iterator.
- *
- * The traversal strategy is ignored for arrays. Arrays are always iterated.
- *
- * @since  2.1
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see CascadingStrategy
- */
-class TraversalStrategy
-{
-    /**
-     * Specifies that a node's value should be iterated only if it is an
-     * instance of {@link \Traversable}.
-     */
-    const IMPLICIT = 1;
-
-    /**
-     * Specifies that a node's value should never be iterated.
-     */
-    const NONE = 2;
-
-    /**
-     * Specifies that a node's value should always be iterated. If the value is
-     * not an instance of {@link \Traversable}, an exception should be thrown.
-     */
-    const TRAVERSE = 4;
-
-    /**
-     * Specifies that nested instances of {@link \Traversable} should never be
-     * iterated. Can be combined with {@link IMPLICIT} or {@link TRAVERSE}.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0. This constant was added for backwards compatibility only.
-     *
-     * @internal
-     */
-    const STOP_RECURSION = 8;
-
-    /**
-     * Not instantiable.
-     */
-    private function __construct()
-    {
-    }
-}
diff --git a/vendor/symfony/validator/MetadataFactoryInterface.php b/vendor/symfony/validator/MetadataFactoryInterface.php
deleted file mode 100644
index 555bea9..0000000
--- a/vendor/symfony/validator/MetadataFactoryInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Returns {@link MetadataInterface} instances for values.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Mapping\Factory\MetadataFactoryInterface} instead.
- */
-interface MetadataFactoryInterface
-{
-    /**
-     * Returns the metadata for the given value.
-     *
-     * @param mixed $value Some value
-     *
-     * @return MetadataInterface The metadata for the value
-     *
-     * @throws Exception\NoSuchMetadataException If no metadata exists for the given value
-     */
-    public function getMetadataFor($value);
-
-    /**
-     * Returns whether the class is able to return metadata for the given value.
-     *
-     * @param mixed $value Some value
-     *
-     * @return bool Whether metadata can be returned for that value
-     */
-    public function hasMetadataFor($value);
-}
diff --git a/vendor/symfony/validator/MetadataInterface.php b/vendor/symfony/validator/MetadataInterface.php
deleted file mode 100644
index 2c89449..0000000
--- a/vendor/symfony/validator/MetadataInterface.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * A container for validation metadata.
- *
- * The container contains constraints that may belong to different validation
- * groups. Constraints for a specific group can be fetched by calling
- * {@link findConstraints}.
- *
- * Implement this interface to add validation metadata to your own metadata
- * layer. Each metadata may have named properties. Each property can be
- * represented by one or more {@link PropertyMetadataInterface} instances that
- * are returned by {@link getPropertyMetadata}. Since
- * <tt>PropertyMetadataInterface</tt> inherits from <tt>MetadataInterface</tt>,
- * each property may be divided into further properties.
- *
- * The {@link accept} method of each metadata implements the Visitor pattern.
- * The method should forward the call to the visitor's
- * {@link ValidationVisitorInterface::visit} method and additionally call
- * <tt>accept()</tt> on all structurally related metadata instances.
- *
- * For example, to store constraints for PHP classes and their properties,
- * create a class <tt>ClassMetadata</tt> (implementing <tt>MetadataInterface</tt>)
- * and a class <tt>PropertyMetadata</tt> (implementing <tt>PropertyMetadataInterface</tt>).
- * <tt>ClassMetadata::getPropertyMetadata($property)</tt> returns all
- * <tt>PropertyMetadata</tt> instances for a property of that class. Its
- * <tt>accept()</tt>-method simply forwards to <tt>ValidationVisitorInterface::visit()</tt>
- * and calls <tt>accept()</tt> on all contained <tt>PropertyMetadata</tt>
- * instances, which themselves call <tt>ValidationVisitorInterface::visit()</tt>
- * again.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Mapping\MetadataInterface} instead.
- */
-interface MetadataInterface
-{
-    /**
-     * Implementation of the Visitor design pattern.
-     *
-     * Calls {@link ValidationVisitorInterface::visit} and then forwards the
-     * <tt>accept()</tt>-call to all property metadata instances.
-     *
-     * @param ValidationVisitorInterface $visitor      The visitor implementing the validation logic
-     * @param mixed                      $value        The value to validate
-     * @param string|string[]            $group        The validation group to validate in
-     * @param string                     $propertyPath The current property path in the validation graph
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function accept(ValidationVisitorInterface $visitor, $value, $group, $propertyPath);
-
-    /**
-     * Returns all constraints for a given validation group.
-     *
-     * @param string $group The validation group
-     *
-     * @return Constraint[] A list of constraint instances
-     */
-    public function findConstraints($group);
-}
diff --git a/vendor/symfony/validator/ObjectInitializerInterface.php b/vendor/symfony/validator/ObjectInitializerInterface.php
deleted file mode 100644
index dcbc2cd..0000000
--- a/vendor/symfony/validator/ObjectInitializerInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Prepares an object for validation.
- *
- * Concrete implementations of this interface are used by {@link ValidationVisitorInterface}
- * to initialize objects just before validating them.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ObjectInitializerInterface
-{
-    /**
-     * Initializes an object just before validation.
-     *
-     * @param object $object The object to validate
-     */
-    public function initialize($object);
-}
diff --git a/vendor/symfony/validator/PropertyMetadataContainerInterface.php b/vendor/symfony/validator/PropertyMetadataContainerInterface.php
deleted file mode 100644
index 5441be1..0000000
--- a/vendor/symfony/validator/PropertyMetadataContainerInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * A container for {@link PropertyMetadataInterface} instances.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Mapping\ClassMetadataInterface} instead.
- */
-interface PropertyMetadataContainerInterface
-{
-    /**
-     * Check if there's any metadata attached to the given named property.
-     *
-     * @param string $property The property name.
-     *
-     * @return bool
-     */
-    public function hasPropertyMetadata($property);
-
-    /**
-     * Returns all metadata instances for the given named property.
-     *
-     * If your implementation does not support properties, simply throw an
-     * exception in this method (for example a <tt>BadMethodCallException</tt>).
-     *
-     * @param string $property The property name.
-     *
-     * @return PropertyMetadataInterface[] A list of metadata instances. Empty if
-     *                                     no metadata exists for the property.
-     */
-    public function getPropertyMetadata($property);
-}
diff --git a/vendor/symfony/validator/PropertyMetadataInterface.php b/vendor/symfony/validator/PropertyMetadataInterface.php
deleted file mode 100644
index 46e7c69..0000000
--- a/vendor/symfony/validator/PropertyMetadataInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * A container for validation metadata of a property.
- *
- * What exactly you define as "property" is up to you. The validator expects
- * implementations of {@link MetadataInterface} that contain constraints and
- * optionally a list of named properties that also have constraints (and may
- * have further sub properties). Such properties are mapped by implementations
- * of this interface.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see MetadataInterface
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Mapping\PropertyMetadataInterface} instead.
- */
-interface PropertyMetadataInterface extends MetadataInterface
-{
-    /**
-     * Returns the name of the property.
-     *
-     * @return string The property name.
-     */
-    public function getPropertyName();
-
-    /**
-     * Extracts the value of the property from the given container.
-     *
-     * @param mixed $containingValue The container to extract the property value from.
-     *
-     * @return mixed The value of the property.
-     */
-    public function getPropertyValue($containingValue);
-}
diff --git a/vendor/symfony/validator/README.md b/vendor/symfony/validator/README.md
deleted file mode 100644
index 4555b9a..0000000
--- a/vendor/symfony/validator/README.md
+++ /dev/null
@@ -1,126 +0,0 @@
-Validator Component
-===================
-
-This component is based on the JSR-303 Bean Validation specification and
-enables specifying validation rules for classes using XML, YAML, PHP or
-annotations, which can then be checked against instances of these classes.
-
-Usage
------
-
-The component provides "validation constraints", which are simple objects
-containing the rules for the validation. Let's validate a simple string
-as an example:
-
-```php
-use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\Constraints\Length;
-
-$validator = Validation::createValidator();
-
-$violations = $validator->validateValue('Bernhard', new Length(array('min' => 10)));
-```
-
-This validation will fail because the given string is shorter than ten
-characters. The precise errors, here called "constraint violations",  are
-returned by the validator. You can analyze these or return them to the user.
-If the violation list is empty, validation succeeded.
-
-Validation of arrays is possible using the `Collection` constraint:
-
-```php
-use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\Constraints as Assert;
-
-$validator = Validation::createValidator();
-
-$constraint = new Assert\Collection(array(
-    'name' => new Assert\Collection(array(
-        'first_name' => new Assert\Length(array('min' => 101)),
-        'last_name' => new Assert\Length(array('min' => 1)),
-    )),
-    'email' => new Assert\Email(),
-    'simple' => new Assert\Length(array('min' => 102)),
-    'gender' => new Assert\Choice(array(3, 4)),
-    'file' => new Assert\File(),
-    'password' => new Assert\Length(array('min' => 60)),
-));
-
-$violations = $validator->validateValue($input, $constraint);
-```
-
-Again, the validator returns the list of violations.
-
-Validation of objects is possible using "constraint mapping". With such
-a mapping you can put constraints onto properties and objects of classes.
-Whenever an object of this class is validated, its properties and
-method results are matched against the constraints.
-
-```php
-use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\Constraints as Assert;
-
-class User
-{
-    /**
-     * @Assert\Length(min = 3)
-     * @Assert\NotBlank
-     */
-    private $name;
-
-    /**
-     * @Assert\Email
-     * @Assert\NotBlank
-     */
-    private $email;
-
-    public function __construct($name, $email)
-    {
-        $this->name = $name;
-        $this->email = $email;
-    }
-
-    /**
-     * @Assert\IsTrue(message = "The user should have a Google Mail account")
-     */
-    public function isGmailUser()
-    {
-        return false !== strpos($this->email, '@gmail.com');
-    }
-}
-
-$validator = Validation::createValidatorBuilder()
-    ->enableAnnotationMapping()
-    ->getValidator();
-
-$user = new User('John Doe', 'john@example.com');
-
-$violations = $validator->validate($user);
-```
-
-This example uses the annotation support of Doctrine Common to
-map constraints to properties and methods. You can also map constraints
-using XML, YAML or plain PHP, if you dislike annotations or don't want
-to include Doctrine. Check the documentation for more information about
-these drivers.
-
-Resources
----------
-
-Silex integration:
-
-https://github.com/silexphp/Silex/blob/master/src/Silex/Provider/ValidatorServiceProvider.php
-
-Documentation:
-
-https://symfony.com/doc/2.7/book/validation.html
-
-JSR-303 Specification:
-
-http://jcp.org/en/jsr/detail?id=303
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Validator/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/validator/Resources/translations/validators.af.xlf b/vendor/symfony/validator/Resources/translations/validators.af.xlf
deleted file mode 100644
index 177bb00..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.af.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Hierdie waarde moet vals wees.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Hierdie waarde moet waar wees.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Hierdie waarde moet van die soort {{type}} wees.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Hierdie waarde moet leeg wees.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Die waarde wat jy gekies het is nie 'n geldige keuse nie.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Jy moet ten minste {{ limit }} kies.|Jy moet ten minste {{ limit }} keuses kies.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Jy moet by die meeste {{ limit }} keuse kies.|Jy moet by die meeste {{ limit }} keuses kies.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Een of meer van die gegewe waardes is ongeldig.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Die veld is nie verwag nie.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Hierdie veld ontbreek.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Hierdie waarde is nie 'n geldige datum nie.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Hierdie waarde is nie 'n geldige datum en tyd nie.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Hierdie waarde is nie 'n geldige e-pos adres nie.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Die lêer kon nie gevind word nie.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Die lêer kan nie gelees word nie.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Die lêer is te groot ({{ size }} {{ suffix }}). Toegelaat maksimum grootte is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Die MIME-tipe van die lêer is ongeldig ({{ type }}). Toegelaat MIME-tipes is {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Hierdie waarde moet {{ limit }} of minder wees.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Hierdie waarde is te lank. Dit moet {{ limit }} karakter of minder wees.|Hierdie waarde is te lank. Dit moet {{ limit }} karakters of minder wees.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Hierdie waarde moet {{ limit }} of meer wees.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Hierdie waarde is te kort. Dit moet {{ limit }} karakter of meer wees.|Hierdie waarde is te kort. Dit moet {{ limit }} karakters of meer wees.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Hierdie waarde moet nie leeg wees nie.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Hierdie waarde moet nie nul wees nie.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Hierdie waarde moet nul wees.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Hierdie waarde is nie geldig nie.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Hierdie waarde is nie 'n geldige tyd nie.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Hierdie waarde is nie 'n geldige URL nie.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Die twee waardes moet gelyk wees.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Die lêer is te groot. Toegelaat maksimum grootte is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Die lêer is te groot.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Die lêer kan nie opgelaai word nie.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Hierdie waarde moet 'n geldige nommer wees.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Hierdie lêer is nie 'n geldige beeld nie.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Hierdie is nie 'n geldige IP-adres nie.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Hierdie waarde is nie 'n geldige taal nie.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Hierdie waarde is nie 'n geldige land instelling nie.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Hierdie waarde is nie 'n geldige land nie.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Hierdie waarde word reeds gebruik.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Die grootte van die beeld kon nie opgespoor word nie.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Die beeld breedte is te groot ({{ width }}px). Toegelaat maksimum breedte is {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Die beeld breedte is te klein ({{ width }}px). Minimum breedte verwag is {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Die beeld hoogte is te groot ({{ height }}px). Toegelaat maksimum hoogte is {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Die beeld hoogte is te klein ({{ height }}px). Minimum hoogte verwag is {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Hierdie waarde moet die huidige wagwoord van die gebruiker wees.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Hierdie waarde moet presies {{ limit }} karakter wees.|Hierdie waarde moet presies {{ limit }} karakters wees.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Die lêer is slegs gedeeltelik opgelaai.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Geen lêer is opgelaai nie.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Geen tydelike lêer is ingestel in php.ini nie.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kan nie tydelike lêer skryf op skyf nie.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>'n PHP-uitbreiding veroorsaak die oplaai van die lêer om te misluk.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Hierdie versameling moet {{ limit }} element of meer bevat.|Hierdie versameling moet {{ limit }} elemente of meer bevat.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Hierdie versameling moet {{ limit }} element of minder bevat.|Hierdie versameling moet {{ limit }} elemente of meer bevat.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Hierdie versameling moet presies {{ limit }} element bevat.|Hierdie versameling moet presies {{ limit }} elemente bevat.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ongeldige kredietkaart nommer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nie-ondersteunde tipe kaart of ongeldige kredietkaart nommer.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ar.xlf b/vendor/symfony/validator/Resources/translations/validators.ar.xlf
deleted file mode 100644
index 4950e0c..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.ar.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>هذه القيمة يجب أن تكون خاطئة.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>هذه القيمة يجب أن تكون حقيقية.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>هذه القيمة يجب ان تكون من نوع {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>هذه القيمة يجب ان تكون فارغة.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>القيمة المختارة ليست خيارا صحيحا.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>يجب ان تختار {{ limit }} اختيار على الاقل.|يجب ان تختار {{ limit }} اختيار على الاقل.|يجب ان تختار {{ limit }} اختيارات على الاقل.|يجب ان تختار {{ limit }} اختيار على الاقل.|يجب ان تختار {{ limit }} اختيار على الاقل.|يجب ان تختار {{ limit }} اختيار على الاقل.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>يجب ان تختار {{ limit }} اختيار على الاكثر.|يجب ان تختار {{ limit }} اختيار على الاكثر.|يجب ان تختار {{ limit }} اختيارات على الاكثر.|يجب ان تختار {{ limit }} اختيار على الاكثر.|يجب ان تختار {{ limit }} اختيار على الاكثر.|يجب ان تختار {{ limit }} اختيار على الاكثر.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>واحد أو أكثر من القيم المعطاه خاطئ.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>لم يكن من المتوقع هذا المجال.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>هذا المجال مفقود.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>هذه القيمة ليست تاريخا صالحا.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>هذه القيمة ليست تاريخا و وقتا صالحا.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>هذه القيمة ليست عنوان بريد إلكتروني صحيح.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>لا يمكن العثور على الملف.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>الملف غير قابل للقراءة.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>الملف كبير جدا ({{ size }} {{ suffix }}).اقصى مساحه مسموح بها ({{ limit }} {{ suffix }}).</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>نوع الملف غير صحيح ({{ type }}). الانواع المسموح بها هى {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>هذه القيمة يجب ان تكون {{ limit }} او اقل.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حرف او اقل.|هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حرف او اقل.|هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حروف او اقل.|هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حرف او اقل.|هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حرف او اقل.|هذه القيمة طويلة جدا. يجب ان تكون {{ limit }} حرف او اقل.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>هذه القيمة يجب ان تكون {{ limit }} او اكثر.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حرف او اكثر.|هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حرف او اكثر.|هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حروف او اكثر.|هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حرف او اكثر.|هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حرف او اكثر.|هذه القيمة قصيرة جدا. يجب ان تكون {{ limit }} حرف او اكثر.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>هذه القيمة يجب الا تكون فارغة.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>هذه القيمة يجب الا تكون فارغة.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>هذه القيمة يجب ان تكون فارغة.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>هذه القيمة غير صحيحة.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>هذه القيمة ليست وقت صحيح.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>هذه القيمة ليست رابط الكترونى صحيح.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>القيمتان يجب ان تكونا متساويتان.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>الملف كبير جدا. اقصى مساحه مسموح بها {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>الملف كبير جدا.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>لم استطع استقبال الملف.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>هذه القيمة يجب ان تكون رقم.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>هذا الملف ليس صورة صحيحة.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>هذه القيمة ليست عنوان رقمى صحيح.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>هذه القيمة ليست لغة صحيحة.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>هذه القيمة ليست موقع صحيح.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>هذه القيمة ليست بلدا صالحا.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>هذه القيمة مستخدمة بالفعل.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>لم استطع معرفة حجم الصورة.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>عرض الصورة كبير جدا ({{ width }}px). اقصى عرض مسموح به هو{{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>عرض الصورة صغير جدا ({{ width }}px). اقل عرض مسموح به هو{{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>طول الصورة كبير جدا ({{ height }}px). اقصى طول مسموح به هو{{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>طول الصورة صغير جدا ({{ height }}px). اقل طول مسموح به هو{{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>هذه القيمة يجب ان تكون كلمة سر المستخدم الحالية.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>هذه القيمة يجب ان تحتوى على {{ limit }} حرف فقط.|هذه القيمة يجب ان تحتوى على {{ limit }} حرف فقط.|هذه القيمة يجب ان تحتوى على {{ limit }} حروف فقط.|هذه القيمة يجب ان تحتوى على {{ limit }} حرف فقط.|هذه القيمة يجب ان تحتوى على {{ limit }} حرف فقط.|هذه القيمة يجب ان تحتوى على {{ limit }} حرف فقط.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>تم استقبال جزء من الملف فقط.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>لم يتم ارسال اى ملف.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>لم يتم تهيئة حافظة مؤقتة فى ملف php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>لم استطع كتابة الملف المؤقت.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>احد اضافات PHP تسببت فى فشل استقبال الملف.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اكثر.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اكثر.|هذه المجموعة يجب ان تحتوى على {{ limit }} عناصر او اكثر.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اكثر.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اكثر.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اكثر.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اقل.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اقل.|هذه المجموعة يجب ان تحتوى على {{ limit }} عناصر او اقل.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اقل.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اقل.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر او اقل.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر فقط.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر فقط.|هذه المجموعة يجب ان تحتوى على {{ limit }} عناصر فقط.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر فقط.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر فقط.|هذه المجموعة يجب ان تحتوى على {{ limit }} عنصر فقط.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>رقم البطاقه غير صحيح.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>نوع البطاقه غير مدعوم او الرقم غير صحيح.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>الرقم IBAN (رقم الحساب المصرفي الدولي) الذي تم إدخاله غير صالح.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>هذه القيمة ليست ISBN-10 صالحة.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>هذه القيمة ليست ISBN-13 صالحة.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>هذه القيمة ليست ISBN-10 صالحة ولا ISBN-13 صالحة.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>هذه القيمة ليست ISSN صالحة.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>العُملة غير صحيحة.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>القيمة يجب ان تساوي {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>القيمة يجب ان تكون اعلي من {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>القيمة يجب ان تكون مساوية او اعلي من {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>القيمة يجب ان تطابق {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>القيمة يجب ان تكون اقل من {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>القيمة يجب ان تساوي او تقل عن {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>القيمة يجب ان لا تساوي {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>القيمة يجب ان لا تطابق {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>نسبة العرض على الارتفاع للصورة كبيرة جدا ({{ ratio }}). الحد الأقصى للنسبة المسموح به هو {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>نسبة العرض على الارتفاع للصورة صغيرة جدا ({{ ratio }}). الحد الأدنى للنسبة المسموح به هو {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>الصورة مربعة ({{ width }}x{{ height }}px). الصور المربعة غير مسموح بها.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>الصورة في وضع أفقي ({{ width }}x{{ height }}px). الصور في وضع أفقي غير مسموح بها.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>الصورة في وضع عمودي ({{ width }}x{{ height }}px). الصور في وضع عمودي غير مسموح بها.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>ملف فارغ غير مسموح به.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>يتعذر الإتصال بالنطاق.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>هذه القيمة غير متطابقة مع صيغة التحويل {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.az.xlf b/vendor/symfony/validator/Resources/translations/validators.az.xlf
deleted file mode 100644
index add868c..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.az.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Bu dəyər false olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Bu dəyər true olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Bu dəyərin tipi {{ type }} olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Bu dəyər boş olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Seçdiyiniz dəyər düzgün bir seçim değil.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Ən az {{ limit }} seçim qeyd edilməlidir.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Ən çox {{ limit }} seçim qeyd edilməlidir.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Təqdim edilən dəyərlərdən bir və ya bir neçəsi yanlışdır.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Bu sahə gözlənilmirdi.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Bu sahə əksikdir.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Bu dəyər düzgün bir tarix deyil.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Bu dəyər düzgün bir tarixsaat deyil.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Bu dəyər düzgün bir e-poçt adresi deyil.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Fayl tapılmadı.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Fayl oxunabilən deyil.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fayl çox böyükdür ({{ size }} {{ suffix }}). İcazə verilən maksimum fayl ölçüsü {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Faylın mime tipi yanlışdr ({{ type }}). İcazə verilən mime tipləri {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Bu dəyər {{ limit }} və ya altında olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Bu dəyər çox uzundur. {{ limit }} və ya daha az simvol olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Bu dəyər {{ limit }} veya daha fazla olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Bu dəyər çox qısadır. {{ limit }} və ya daha çox simvol olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Bu dəyər boş olmamalıdır.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Bu dəyər boş olmamalıdır.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Bu dəyər boş olmamalıdır.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Bu dəyər doğru deyil.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Bu dəyər doğru bir saat deyil.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Bu dəyər doğru bir URL değil.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>İki dəyər eyni olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fayl çox böyükdür. İcazə verilən ən böyük fayl ölçüsü {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Fayl çox böyükdür.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Fayl yüklənəbilmir.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Bu dəyər rəqəm olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Bu fayl düzgün bir şəkil deyil.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Bu düzgün bir IP adresi deyil.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Bu dəyər düzgün bir dil deyil.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Bu dəyər düzgün bir dil deyil.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Bu dəyər düzgün bir ölkə deyil.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Bu dəyər hal-hazırda istifadədədir.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Şəklin ölçüsü hesablana bilmir.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Şəklin genişliyi çox böyükdür ({{ width }}px). İcazə verilən ən böyük genişlik {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Şəklin genişliyi çox kiçikdir ({{ width }}px). Ən az {{ min_width }}px olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Şəklin yüksəkliyi çox böyükdür ({{ height }}px). İcazə verilən ən böyük yüksəklik {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Şəklin yüksəkliyi çox kiçikdir ({{ height }}px). Ən az {{ min_height }}px olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Bu dəyər istifadəçinin hazırkı parolu olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Bu dəyər tam olaraq {{ limit }} simvol olmaldır.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Fayl qismən yükləndi.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Fayl yüklənmədi.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>php.ini'də müvəqqəti qovluq quraşdırılmayıb.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Müvəqqəti fayl diskə yazıla bilmir.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Bir PHP əlavəsi faylın yüklənməsinə mane oldu.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Bu kolleksiyada {{ limit }} və ya daha çox element olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Bu kolleksiyada {{ limit }} və ya daha az element olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Bu kolleksiyada tam olaraq {{ limit }} element olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Yanlış kart nömrəsi.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Dəstəklənməyən kart tipi və ya yanlış kart nömrəsi.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.bg.xlf b/vendor/symfony/validator/Resources/translations/validators.bg.xlf
deleted file mode 100644
index 7c5da55..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.bg.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Стойността трябва да бъде лъжа (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Стойността трябва да бъде истина (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Стойността трябва да бъде от тип {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Стойността трябва да бъде празна.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Избраната стойност е невалидна.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Трябва да изберете поне {{ limit }} опция.|Трябва да изберете поне {{ limit }} опции.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Трябва да изберете най-много {{ limit }} опция.|Трябва да изберете най-много {{ limit }} опции.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Една или повече от зададените стойности е невалидна.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Това поле не се е очаквало.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Това поле липсва.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Стойността не е валидна дата (date).</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Стойността не е валидна дата (datetime).</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Стойността не е валиден email адрес.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Файлът не беше открит.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Файлът не може да бъде прочетен.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файлът е твърде голям ({{ size }} {{ suffix }}). Максималният размер е {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Майм типа на файла е невалиден ({{ type }}). Разрешени майм типове са {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Стойността трябва да бъде {{ limit }} или по-малко.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Стойността е твърде дълга. Трябва да съдържа най-много {{ limit }} символ.|Стойността е твърде дълга. Трябва да съдържа най-много {{ limit }} символа.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Стойността трябва да бъде {{ limit }} или повече.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Стойността е твърде кратка. Трябва да съдържа поне {{ limit }} символ.|Стойността е твърде кратка. Трябва да съдържа поне {{ limit }} символа.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Стойността не трябва да бъде празна.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Стойността не трябва да бъде null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Стойността трябва да бъде null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Стойността не е валидна.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Стойността не е валидно време (time).</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Стойността не е валиден URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Двете стойности трябва да бъдат равни.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файлът е твърде голям. Разрешеният максимален размер е {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Файлът е твърде голям.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Файлът не може да бъде качен.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Стойността трябва да бъде валиден номер.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Файлът не е валидно изображение.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Това не е валиден IP адрес.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Стойността не е валиден език.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Стойността не е валидна локализация.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Стойността не е валидна държава.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Стойността вече е в употреба.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Размера на изображението не може да бъде определен.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Изображението е твърде широко ({{ width }}px). Широчината трябва да бъде максимум {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Изображението е с твърде малка широчина ({{ width }}px). Широчината трябва да бъде минимум {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Изображението е с твърде голяма височина ({{ height }}px). Височината трябва да бъде максимум {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Изображението е с твърде малка височина ({{ height }}px). Височина трябва да бъде минимум {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Стойността трябва да бъде текущата потребителска парола.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Стойността трябва да бъде точно {{ limit }} символ.|Стойността трябва да бъде точно {{ limit }} символа.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Файлът е качен частично.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Файлът не беше качен.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Не е посочена директория за временни файлове в php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Не може да запише временен файл на диска.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP разширение предизвика прекъсване на качването.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Колекцията трябва да съдържа поне {{ limit }} елемент.|Колекцията трябва да съдържа поне {{ limit }} елемента.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Колекцията трябва да съдържа най-много {{ limit }} елемент.|Колекцията трябва да съдържа най-много {{ limit }} елемента.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Колекцията трябва да съдържа точно {{ limit }} елемент.|Колекцията трябва да съдържа точно {{ limit }} елемента.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Невалиден номер на картата.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Неподдържан тип карта или невалиден номер на картата.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Невалиден Международен номер на банкова сметка (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Невалиден ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Невалиден ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Невалидна стойност както за ISBN-10, така и за ISBN-13 .</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Невалиден Международен стандартен сериен номер (ISSN).</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Невалидна валута.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде равна на {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде по-голяма от {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде по-голяма или равна на {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде идентична с {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде по-малка {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Стойността трябва да бъде по-малка или равна на {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Стойността не трябва да бъде равна на {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Стойността не трябва да бъде идентична с {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ca.xlf b/vendor/symfony/validator/Resources/translations/validators.ca.xlf
deleted file mode 100644
index 85b6970..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.ca.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Aquest valor hauria de ser fals.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Aquest valor hauria de ser cert.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Aquest valor hauria de ser del tipus {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Aquest valor hauria d'estar buit.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>El valor seleccionat no és una opció vàlida.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Ha de seleccionar almenys {{ limit }} opció.|Ha de seleccionar almenys {{ limit }} opcions.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Ha de seleccionar com a màxim {{ limit }} opció.|Ha de seleccionar com a màxim {{ limit }} opcions.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Un o més dels valors facilitats són incorrectes.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Aquest camp no s'esperava.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Aquest camp està desaparegut.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Aquest valor no és una data vàlida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Aquest valor no és una data i hora vàlida.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Aquest valor no és una adreça d'email vàlida.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>No s'ha pogut trobar l'arxiu.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>No es pot llegir l'arxiu.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>L'arxiu és massa gran ({{ size }} {{ suffix }}). La grandària màxima permesa és {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>El tipus mime de l'arxiu no és vàlid ({{ type }}). Els tipus mime vàlids són {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Aquest valor hauria de ser {{ limit }} o menys.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Aquest valor és massa llarg. Hauria de tenir {{ limit }} caràcter o menys.|Aquest valor és massa llarg. Hauria de tenir {{ limit }} caràcters o menys.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Aquest valor hauria de ser {{ limit }} o més.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Aquest valor és massa curt. Hauria de tenir {{ limit }} caràcters o més.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Aquest valor no hauria d'estar buit.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Aquest valor no hauria de ser null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Aquest valor hauria de ser null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Aquest valor no és vàlid.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Aquest valor no és una hora vàlida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Aquest valor no és una URL vàlida.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Els dos valors haurien de ser iguals.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>L'arxiu és massa gran.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>No es pot pujar l'arxiu.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Aquest valor hauria de ser un nombre vàlid.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>L'arxiu no és una imatge vàlida.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Això no és una adreça IP vàlida.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Aquest valor no és un idioma vàlid.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Aquest valor no és una localització vàlida.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Aquest valor no és un país vàlid.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Aquest valor ja s'ha utilitzat.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>No s'ha pogut determinar la grandària de la imatge.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>L'amplària de la imatge és massa gran ({{ width }}px). L'amplària màxima permesa són {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>L'amplària de la imatge és massa petita ({{ width }}px). L'amplària mínima requerida són {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>L'altura de la imatge és massa gran ({{ height }}px). L'altura màxima permesa són {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>L'altura de la imatge és massa petita ({{ height }}px). L'altura mínima requerida són {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Aquest valor hauria de ser la contrasenya actual de l'usuari.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Aquest valor hauria de tenir exactament {{ limit }} caràcter.|Aquest valor hauria de tenir exactament {{ limit }} caràcters.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>L'arxiu va ser només pujat parcialment.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Cap arxiu va ser pujat.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Cap carpeta temporal va ser configurada en php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>No es va poder escriure l'arxiu temporal en el disc.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Una extensió de PHP va fer que la pujada fallara.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Aquesta col·lecció ha de contenir {{ limit }} element o més.|Aquesta col·lecció ha de contenir {{ limit }} elements o més.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Aquesta col·lecció ha de contenir {{ limit }} element o menys.|Aquesta col·lecció ha de contenir {{ limit }} elements o menys.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Aquesta col·lecció ha de contenir exactament {{ limit }} element.|Aquesta col·lecció ha de contenir exactament {{ limit }} elements.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Número de targeta invàlid.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipus de targeta no suportada o número de targeta invàlid.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Això no és un nombre de compte bancari internacional (IBAN) vàlid.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Aquest valor no és un ISBN-10 vàlid.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Aquest valor no és un ISBN-13 vàlid.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Aquest valor no és ni un ISBN-10 vàlid ni un ISBN-13 vàlid.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Aquest valor no és un ISSN vàlid.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Aquest valor no és una divisa vàlida.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser més gran a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser major o igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser idèntic a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser menor a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Aquest valor hauria de ser menor o igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Aquest valor no hauria de ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Aquest valor no hauria de idèntic a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>La proporció de l'imatge és massa gran ({{ ratio }}). La màxima proporció permesa és {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>La proporció de l'imatge és massa petita ({{ ratio }}). La mínima proporció permesa és {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>L'imatge és quadrada({{ width }}x{{ height }}px). Les imatges quadrades no estan permeses.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>L'imatge està orientada horitzontalment ({{ width }}x{{ height }}px). Les imatges orientades horitzontalment no estan permeses.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>L'imatge està orientada verticalment ({{ width }}x{{ height }}px). Les imatges orientades verticalment no estan permeses.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>No està permès un fixter buit.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.cs.xlf b/vendor/symfony/validator/Resources/translations/validators.cs.xlf
deleted file mode 100644
index 2ae47b2..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.cs.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Tato hodnota musí být nepravdivá (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Tato hodnota musí být pravdivá (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Tato hodnota musí být typu {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Tato hodnota musí být prázdná.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Vybraná hodnota není platnou možností.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Musí být vybrána nejméně {{ limit }} možnost.|Musí být vybrány nejméně {{ limit }} možnosti.|Musí být vybráno nejméně {{ limit }} možností.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Musí být vybrána maximálně {{ limit }} možnost.|Musí být vybrány maximálně {{ limit }} možnosti.|Musí být vybráno maximálně {{ limit }} možností.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Některé z uvedených hodnot jsou neplatné.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Toto pole nebyla očekávána.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Toto pole chybí.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Tato hodnota není platné datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Tato hodnota není platné datum s časovým údajem.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Tato hodnota není platná e-mailová adresa.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Soubor nebyl nalezen.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Soubor je nečitelný.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Soubor je příliš velký ({{ size }} {{ suffix }}). Maximální povolená velikost souboru je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Neplatný mime typ souboru ({{ type }}). Povolené mime typy souborů jsou {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Tato hodnota musí být {{ limit }} nebo méně.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Tato hodnota je příliš dlouhá. Musí obsahovat maximálně {{ limit }} znak.|Tato hodnota je příliš dlouhá. Musí obsahovat maximálně {{ limit }} znaky.|Tato hodnota je příliš dlouhá. Musí obsahovat maximálně {{ limit }} znaků.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Tato hodnota musí být {{ limit }} nebo více.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Tato hodnota je příliš krátká. Musí obsahovat minimálně {{ limit }} znak.|Tato hodnota je příliš krátká. Musí obsahovat minimálně {{ limit }} znaky.|Tato hodnota je příliš krátká. Musí obsahovat minimálně {{ limit }} znaků.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Tato hodnota nesmí být prázdná.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Tato hodnota nesmí být null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Tato hodnota musí být null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Tato hodnota není platná.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Tato hodnota není platný časový údaj.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Tato hodnota není platná URL adresa.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Tyto dvě hodnoty musí být stejné.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Soubor je příliš velký. Maximální povolená velikost souboru je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Soubor je příliš velký.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Soubor se nepodařilo nahrát.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Tato hodnota musí být číslo.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Tento soubor není obrázek.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Toto není platná IP adresa.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Tento jazyk neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Tato lokalizace neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Tato země neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Tato hodnota je již používána.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Nepodařily se zjistit rozměry obrázku.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Obrázek je příliš široký ({{ width }}px). Maximální povolená šířka obrázku je {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Obrázek je příliš úzký ({{ width }}px). Minimální šířka musí být {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Obrázek je příliš vysoký ({{ height }}px). Maximální povolená výška obrázku je {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Obrázek je příliš nízký ({{ height }}px). Minimální výška obrázku musí být {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Tato hodnota musí být aktuální heslo uživatele.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Tato hodnota musí mít přesně {{ limit }} znak.|Tato hodnota musí mít přesně {{ limit }} znaky.|Tato hodnota musí mít přesně {{ limit }} znaků.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Byla nahrána jen část souboru.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Žádný soubor nebyl nahrán.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>V php.ini není nastavena cesta k adresáři pro dočasné soubory.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Dočasný soubor se nepodařilo zapsat na disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Rozšíření PHP zabránilo nahrání souboru.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Tato kolekce musí obsahovat minimálně {{ limit }} prvek.|Tato kolekce musí obsahovat minimálně {{ limit }} prvky.|Tato kolekce musí obsahovat minimálně {{ limit }} prvků.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Tato kolekce musí obsahovat maximálně {{ limit }} prvek.|Tato kolekce musí obsahovat maximálně {{ limit }} prvky.|Tato kolekce musí obsahovat maximálně {{ limit }} prvků.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Tato kolekce musí obsahovat přesně {{ limit }} prvek.|Tato kolekce musí obsahovat přesně {{ limit }} prvky.|Tato kolekce musí obsahovat přesně {{ limit }} prvků.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Neplatné číslo karty.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nepodporovaný typ karty nebo neplatné číslo karty.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Toto je neplatný IBAN.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Tato hodnota není platné ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Tato hodnota není platné ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Tato hodnota není platné ISBN-10 ani ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Tato hodnota není platné ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Tato měna neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Tato hodnota musí být rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Tato hodnota musí být větší než {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Tato hodnota musí být větší nebo rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Tato hodnota musí být typu {{ compared_value_type }} a zároveň musí být rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Tato hodnota musí být menší než {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Tato hodnota musí být menší nebo rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Tato hodnota nesmí být rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Tato hodnota nesmí být typu {{ compared_value_type }} a zároveň nesmí být rovna {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Poměr stran obrázku je příliš velký ({{ ratio }}). Maximální povolený poměr stran obrázku je {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Poměr stran obrázku je příliš malý ({{ ratio }}). Minimální povolený poměr stran obrázku je {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Strany obrázku jsou čtvercové ({{ width }}x{{ height }}px). Čtvercové obrázky nejsou povolené.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Obrázek je orientovaný na šířku ({{ width }}x{{ height }}px). Obrázky orientované na šířku nejsou povolené.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Obrázek je orientovaný na výšku ({{ width }}x{{ height }}px). Obrázky orientované na výšku nejsou povolené.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Soubor nesmí být prázdný.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.cy.xlf b/vendor/symfony/validator/Resources/translations/validators.cy.xlf
deleted file mode 100644
index da7cb9a..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.cy.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Dylid bod y gwerth hwn yn ffug.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Dylid bod y gwerth hwn yn wir.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Dylid bod y gwerth hwn bod o fath {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Dylid bod y gwerth hwn yn wag.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Nid yw'r gwerth â ddewiswyd yn ddilys.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Rhaid dewis o leiaf {{ limit }} opsiwn.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Rhaid dewis dim mwy na {{ limit }} opsiwn.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Mae un neu fwy o'r gwerthoedd a roddwyd yn annilys.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Nid oedd disgwyl y maes hwn.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Mae'r maes hwn ar goll.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Nid yw'r gwerth yn ddyddiad dilys.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Nid yw'r gwerth yn datetime dilys.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Nid yw'r gwerth yn gyfeiriad ebost dilys.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Ni ddarganfyddwyd y ffeil.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Ni ellir darllen y ffeil.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Mae'r ffeil yn rhy fawr ({{ size }} {{ suffix }}). Yr uchafswm â ganiateir yw {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Nid yw math mime y ffeil yn ddilys ({{ type }}). Dyma'r mathau â ganiateir {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Dylai'r gwerth hwn fod yn {{ limit }} neu lai.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Mae'r gwerth hwn rhy hir. Dylai gynnwys {{ limit }} nodyn cyfrifiadurol neu lai.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Dylai'r gwerth hwn fod yn {{ limit }} neu fwy.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Mae'r gwerth hwn yn rhy fyr. Dylai gynnwys {{ limit }} nodyn cyfrifiadurol neu fwy.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ni ddylai'r gwerth hwn fod yn wag.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ni ddylai'r gwerth hwn fod yn null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Dylai'r gwerth fod yn null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Nid yw'r gwerth hwn yn ddilys.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Nid yw'r gwerth hwn yn amser dilys.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Nid yw'r gwerth hwn yn URL dilys.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Rhaid i'r ddau werth fod yn gyfystyr a'u gilydd.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Mae'r ffeil yn rhy fawr. Yr uchafswm â ganiateir yw {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Mae'r ffeil yn rhy fawr.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Methwyd ag uwchlwytho'r ffeil.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Dylai'r gwerth hwn fod yn rif dilys.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Nid yw'r ffeil hon yn ddelwedd dilys.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Nid yw hwn yn gyfeiriad IP dilys.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Nid yw'r gwerth hwn yn iaith ddilys.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Nid yw'r gwerth hwn yn locale dilys.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Nid yw'r gwerth hwn yn wlad dilys.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Mae'r gwerth hwn eisoes yn cael ei ddefnyddio.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Methwyd â darganfod maint y ddelwedd.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Mae lled y ddelwedd yn rhy fawr ({{ width }}px). Y lled mwyaf â ganiateir yw {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Mae lled y ddelwedd yn rhy fach ({{ width }}px). Y lled lleiaf â ganiateir yw {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Mae uchder y ddelwedd yn rhy fawr ({{ width }}px). Yr uchder mwyaf â ganiateir yw {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Mae uchder y ddelwedd yn rhy fach ({{ width }}px). Yr uchder lleiaf â ganiateir yw {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Dylaid bod y gwerth hwn yn gyfrinair presenol y defnyddiwr.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Dylai'r gwerth hwn fod yn union {{ limit }} nodyn cyfrifiadurol o hyd.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Dim ond rhan o'r ffeil ag uwchlwythwyd.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ni uwchlwythwyd unrhyw ffeil.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nid oes ffolder dros-dro wedi'i gosod yn php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Methwyd ag ysgrifennu'r ffeil dros-dro ar ddisg.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Methwyd ag uwchlwytho oherwydd ategyn PHP.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Dylai'r casgliad hwn gynnwys {{ limit }} elfen neu fwy.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Dylai'r casgliad hwn gynnwys {{ limit }} elfen neu lai.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Dylai'r casgliad hwn gynnwys union {{ limit }} elfen.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Nid oedd rhif y cerdyn yn ddilys.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Unai ni dderbynir y math yna o gerdyn, neu nid yw rhif y cerdyn yn ddilys.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.da.xlf b/vendor/symfony/validator/Resources/translations/validators.da.xlf
deleted file mode 100644
index 14e479a..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.da.xlf
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Værdien skal være falsk.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Værdien skal være sand.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Værdien skal være af typen {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Værdien skal være blank.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Værdien skal være en af de givne muligheder.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Du skal vælge mindst {{ limit }} muligheder.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Du kan højest vælge {{ limit }} muligheder.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>En eller flere af de oplyste værdier er ugyldige.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Feltet blev ikke forventet.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Dette felt er mangler.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Værdien er ikke en gyldig dato.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Værdien er ikke en gyldig dato og tid.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Værdien er ikke en gyldig e-mail adresse.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Filen kunne ikke findes.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Filen kan ikke læses.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen er for stor ({{ size }} {{ suffix }}). Tilladte maksimale størrelse {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mimetypen af filen er ugyldig ({{ type }}). Tilladte mimetyper er {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Værdien skal være {{ limit }} eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Værdien er for lang. Den skal have {{ limit }} bogstaver eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Værdien skal være {{ limit }} eller mere.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Værdien er for kort. Den skal have {{ limit }} tegn eller flere.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Værdien må ikke være blank.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Værdien må ikke være tom (null).</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Værdien skal være tom (null).</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Værdien er ikke gyldig.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Værdien er ikke en gyldig tid.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Værdien er ikke en gyldig URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>De to værdier skal være ens.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Filen er for stor.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Filen kunne ikke blive uploadet.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Værdien skal være et gyldigt tal.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Filen er ikke gyldigt billede.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dette er ikke en gyldig IP adresse.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Værdien er ikke et gyldigt sprog.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Værdien er ikke en gyldig lokalitet.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Værdien er ikke et gyldigt land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Værdien er allerede i brug.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Størrelsen på billedet kunne ikke detekteres.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Billedbredden er for stor ({{ width }}px). Tilladt maksimumsbredde er {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Billedebredden er for lille ({{ width }}px). Forventet minimumshøjde er {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Billedhøjden er for stor ({{ height }}px). Tilladt maksimumshøjde er {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Billedhøjden er for lille ({{ height }}px). Forventet minimumshøjde er {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Værdien skal være brugerens nuværende password.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Værdien skal have præcis {{ limit }} tegn.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Filen var kun delvis uploadet.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ingen fil blev uploadet.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Ingen midlertidig mappe er konfigureret i php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kan ikke skrive midlertidig fil til disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>En PHP udvidelse forårsagede fejl i upload.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Denne samling skal indeholde {{ limit }} element eller flere.|Denne samling skal indeholde {{ limit }} elementer eller flere.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Denne samling skal indeholde {{ limit }} element eller mindre.|Denne samling skal indeholde {{ limit }} elementer eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Denne samling skal indeholde præcis {{ limit }} element.|Denne samling skal indeholde præcis {{ limit }} elementer.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ugyldigt kortnummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Ikke-understøttet korttype eller ugyldigt kortnummer.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Det er ikke en gyldig International Bank Account Number (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Værdien er ikke en gyldig ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Værdien er ikke en gyldig ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Værdien er hverken en gyldig ISBN-10 eller en gyldig ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Værdien er ikke en gyldig ISSN.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.de.xlf b/vendor/symfony/validator/Resources/translations/validators.de.xlf
deleted file mode 100644
index 105f2fb..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.de.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Dieser Wert sollte false sein.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Dieser Wert sollte true sein.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Dieser Wert sollte vom Typ {{ type }} sein.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Dieser Wert sollte leer sein.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Sie haben einen ungültigen Wert ausgewählt.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Sie müssen mindestens {{ limit }} Möglichkeit wählen.|Sie müssen mindestens {{ limit }} Möglichkeiten wählen.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Sie dürfen höchstens {{ limit }} Möglichkeit wählen.|Sie dürfen höchstens {{ limit }} Möglichkeiten wählen.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Einer oder mehrere der angegebenen Werte sind ungültig.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Dieses Feld wurde nicht erwartet.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Dieses Feld fehlt.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Dieser Wert entspricht keiner gültigen Datumsangabe.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Dieser Wert entspricht keiner gültigen Datums- und Zeitangabe.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Dieser Wert ist keine gültige E-Mail-Adresse.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Die Datei wurde nicht gefunden.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Die Datei ist nicht lesbar.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Die Datei ist zu groß ({{ size }} {{ suffix }}). Die maximal zulässige Größe beträgt {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Der Dateityp ist ungültig ({{ type }}). Erlaubte Dateitypen sind {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Dieser Wert sollte kleiner oder gleich {{ limit }} sein.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Diese Zeichenkette ist zu lang. Sie sollte höchstens {{ limit }} Zeichen haben.|Diese Zeichenkette ist zu lang. Sie sollte höchstens {{ limit }} Zeichen haben.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Dieser Wert sollte größer oder gleich {{ limit }} sein.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Diese Zeichenkette ist zu kurz. Sie sollte mindestens {{ limit }} Zeichen haben.|Diese Zeichenkette ist zu kurz. Sie sollte mindestens {{ limit }} Zeichen haben.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Dieser Wert sollte nicht leer sein.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Dieser Wert sollte nicht null sein.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Dieser Wert sollte null sein.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Dieser Wert ist nicht gültig.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Dieser Wert entspricht keiner gültigen Zeitangabe.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Dieser Wert ist keine gültige URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Die beiden Werte sollten identisch sein.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Die Datei ist zu groß.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Die Datei konnte nicht hochgeladen werden.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Dieser Wert sollte eine gültige Zahl sein.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Diese Datei ist kein gültiges Bild.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dies ist keine gültige IP-Adresse.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Dieser Wert entspricht keiner gültigen Sprache.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Dieser Wert entspricht keinem gültigen Gebietsschema.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Dieser Wert entspricht keinem gültigen Land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Dieser Wert wird bereits verwendet.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Die Größe des Bildes konnte nicht ermittelt werden.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Die Bildbreite ist zu groß ({{ width }}px). Die maximal zulässige Breite beträgt {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Die Bildbreite ist zu gering ({{ width }}px). Die erwartete Mindestbreite beträgt {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Die Bildhöhe ist zu groß ({{ height }}px). Die maximal zulässige Höhe beträgt {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Die Bildhöhe ist zu gering ({{ height }}px). Die erwartete Mindesthöhe beträgt {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Dieser Wert sollte dem aktuellen Benutzerpasswort entsprechen.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Dieser Wert sollte genau {{ limit }} Zeichen lang sein.|Dieser Wert sollte genau {{ limit }} Zeichen lang sein.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Die Datei wurde nur teilweise hochgeladen.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Es wurde keine Datei hochgeladen.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Es wurde kein temporärer Ordner in der php.ini konfiguriert.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kann die temporäre Datei nicht speichern.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Eine PHP-Erweiterung verhinderte den Upload.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Diese Sammlung sollte {{ limit }} oder mehr Elemente beinhalten.|Diese Sammlung sollte {{ limit }} oder mehr Elemente beinhalten.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Diese Sammlung sollte {{ limit }} oder weniger Elemente beinhalten.|Diese Sammlung sollte {{ limit }} oder weniger Elemente beinhalten.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Diese Sammlung sollte genau {{ limit }} Element beinhalten.|Diese Sammlung sollte genau {{ limit }} Elemente beinhalten.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ungültige Kartennummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nicht unterstützer Kartentyp oder ungültige Kartennummer.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Dieser Wert ist keine gültige internationale Bankkontonummer (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Dieser Wert entspricht keiner gültigen ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Dieser Wert entspricht keiner gültigen ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Dieser Wert ist weder eine gültige ISBN-10 noch eine gültige ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Dieser Wert ist keine gültige ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Dieser Wert ist keine gültige Währung.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte gleich {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Dieser Wert sollte größer als {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte größer oder gleich {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Dieser Wert sollte identisch sein mit {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Dieser Wert sollte kleiner als {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte kleiner oder gleich {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte nicht {{ compared_value }} sein.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Dieser Wert sollte nicht identisch sein mit {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Das Seitenverhältnis des Bildes ist zu groß ({{ ratio }}). Der erlaubte Maximalwert ist {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Das Seitenverhältnis des Bildes ist zu klein ({{ ratio }}). Der erwartete Minimalwert ist {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Das Bild ist quadratisch ({{ width }}x{{ height }}px). Quadratische Bilder sind nicht erlaubt.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Das Bild ist im Querformat ({{ width }}x{{ height }}px). Bilder im Querformat sind nicht erlaubt.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Das Bild ist im Hochformat ({{ width }}x{{ height }}px). Bilder im Hochformat sind nicht erlaubt.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Eine leere Datei ist nicht erlaubt.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Der Hostname konnte nicht aufgelöst werden.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Dieser Wert entspricht nicht dem erwarteten Zeichensatz {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.el.xlf b/vendor/symfony/validator/Resources/translations/validators.el.xlf
deleted file mode 100644
index 4fa0d42..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.el.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Αυτή η τιμή πρέπει να είναι ψευδής.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Αυτή η τιμή πρέπει να είναι αληθής.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Αυτή η τιμή πρέπει να είναι τύπου {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Αυτή η τιμή πρέπει να είναι κενή.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Η τιμή που επιλέχθηκε δεν αντιστοιχεί σε έγκυρη επιλογή.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Πρέπει να επιλέξετε τουλάχιστον {{ limit }} επιλογή.|Πρέπει να επιλέξετε τουλάχιστον {{ limit }} επιλογές.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Πρέπει να επιλέξετε το πολύ {{ limit }} επιλογή.|Πρέπει να επιλέξετε το πολύ {{ limit }} επιλογές.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Μια ή περισσότερες τιμές δεν είναι έγκυρες.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Αυτό το πεδίο δεν ήταν αναμενόμενο.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Λείπει αυτό το πεδίο.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Η τιμή δεν αντιστοιχεί σε έγκυρη ημερομηνία.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Η τιμή δεν αντιστοιχεί σε έγκυρη ημερομηνία και ώρα.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Η τιμή δεν αντιστοιχεί σε έγκυρο email.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Το αρχείο δε μπορεί να βρεθεί.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Το αρχείο δεν είναι αναγνώσιμο.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Το αρχείο είναι πολύ μεγάλο ({{ size }} {{ suffix }}). Το μέγιστο επιτρεπτό μέγεθος είναι {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Ο τύπος mime του αρχείου δεν είναι έγκυρος ({{ type }}). Οι έγκρυοι τύποι mime είναι {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Αυτή η τιμή θα έπρεπε να είναι {{ limit }} ή λιγότερο.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Αυτή η τιμή είναι πολύ μεγάλη. Θα έπρεπε να έχει {{ limit }} χαρακτήρα ή λιγότερο.|Αυτή η τιμή είναι πολύ μεγάλη. Θα έπρεπε να έχει {{ limit }} χαρακτήρες ή λιγότερο.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Αυτή η τιμή θα έπρεπε να είναι {{ limit }} ή περισσότερο.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Αυτή η τιμή είναι πολύ μικρή. Θα έπρεπε να έχει {{ limit }} χαρακτήρα ή περισσότερο.|Αυτή η τιμή είναι πολύ μικρή. Θα έπρεπε να έχει {{ limit }} χαρακτήρες ή περισσότερο.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Αυτή η τιμή δεν πρέπει να είναι κενή.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Αυτή η τιμή δεν πρέπει να είναι μηδενική.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Αυτή η τιμή πρέπει να είναι μηδενική.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Αυτή η τιμή δεν είναι έκγυρη.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Αυτή η τιμή δεν αντιστοιχεί σε έγκυρη ώρα.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Αυτή η τιμή δεν αντιστοιχεί σε έγκυρο URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Οι δύο τιμές θα πρέπει να είναι ίδιες.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Το αρχείο είναι πολύ μεγάλο. Το μέγιστο επιτρεπτό μέγεθος είναι {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Το αρχείο είναι πολύ μεγάλο.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Το αρχείο δε μπορεί να ανέβει.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι ένας έγκυρος αριθμός.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Το αρχείο δεν αποτελεί έγκυρη εικόνα.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Αυτό δεν είναι μια έκγυρη διεύθυνση IP.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Αυτή η τιμή δεν αντιστοιχεί σε μια έκγυρη γλώσσα.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Αυτή η τιμή δεν αντιστοιχεί σε έκγυρο κωδικό τοποθεσίας.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Αυτή η τιμή δεν αντιστοιχεί σε μια έκγυρη χώρα.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Αυτή η τιμή χρησιμοποιείται ήδη.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Το μέγεθος της εικόνας δεν ήταν δυνατό να ανιχνευθεί.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Το πλάτος της εικόνας είναι πολύ μεγάλο ({{ width }}px). Το μέγιστο επιτρεπτό πλάτος είναι {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Το πλάτος της εικόνας είναι πολύ μικρό ({{ width }}px). Το ελάχιστο επιτρεπτό πλάτος είναι {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Το ύψος της εικόνας είναι πολύ μεγάλο ({{ height }}px). Το μέγιστο επιτρεπτό ύψος είναι {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Το ύψος της εικόνας είναι πολύ μικρό ({{ height }}px). Το ελάχιστο επιτρεπτό ύψος είναι {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Αυτή η τιμή θα έπρεπε να είναι ο τρέχων κωδικός.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Αυτή η τιμή θα έπρεπε να έχει ακριβώς {{ limit }} χαρακτήρα.|Αυτή η τιμή θα έπρεπε να έχει ακριβώς {{ limit }} χαρακτήρες.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Το αρχείο δεν ανέβηκε ολόκληρο.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Δεν ανέβηκε κανένα αρχείο.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Κανένας προσωρινός φάκελος δεν έχει ρυθμιστεί στο php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Αδυναμία εγγραφής προσωρινού αρχείου στο δίσκο.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Μια επέκταση PHP προκάλεσε αδυναμία ανεβάσματος.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Αυτή η συλλογή θα πρέπει να περιέχει {{ limit }} στοιχείο ή περισσότερα.|Αυτή η συλλογή θα πρέπει να περιέχει {{ limit }} στοιχεία ή περισσότερα.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Αυτή η συλλογή θα πρέπει να περιέχει {{ limit }} στοιχείo ή λιγότερα.|Αυτή η συλλογή θα πρέπει να περιέχει {{ limit }} στοιχεία ή λιγότερα.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Αυτή η συλλογή θα πρέπει να περιέχει ακριβώς {{ limit }} στοιχείo.|Αυτή η συλλογή θα πρέπει να περιέχει ακριβώς {{ limit }} στοιχεία.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Μη έγκυρος αριθμός κάρτας.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Μη υποστηριζόμενος τύπος κάρτας ή μη έγκυρος αριθμός κάρτας.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Αυτό δεν αντιστοιχεί σε έκγυρο διεθνή αριθμό τραπεζικού λογαριασμού (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Αυτό δεν είναι έγκυρος κωδικός ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Αυτό δεν είναι έγκυρος κωδικός ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Αυτό δεν είναι ούτε έγκυρος κωδικός ISBN-10 ούτε έγκυρος κωδικός ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Αυτό δεν είναι έγκυρος κωδικός ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Αυτό δεν αντιστοιχεί σε έγκυρο νόμισμα.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι ίση με {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι μεγαλύτερη από {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι μεγαλύτερη ή ίση με {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι πανομοιότυπη με {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι μικρότερη από {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Αυτή η τιμή θα πρέπει να είναι μικρότερη ή ίση με {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Αυτή η τιμή δεν θα πρέπει να είναι ίση με {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Αυτή η τιμή δεν πρέπει να είναι πανομοιότυπη με {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.en.xlf b/vendor/symfony/validator/Resources/translations/validators.en.xlf
deleted file mode 100644
index e666c79..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.en.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>This value should be false.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>This value should be true.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>This value should be of type {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>This value should be blank.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>The value you selected is not a valid choice.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>One or more of the given values is invalid.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>This field was not expected.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>This field is missing.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>This value is not a valid date.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>This value is not a valid datetime.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>This value is not a valid email address.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>The file could not be found.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>The file is not readable.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>This value should be {{ limit }} or less.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>This value should be {{ limit }} or more.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>This value should not be blank.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>This value should not be null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>This value should be null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>This value is not valid.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>This value is not a valid time.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>This value is not a valid URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>The two values should be equal.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>The file is too large.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>The file could not be uploaded.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>This value should be a valid number.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>This file is not a valid image.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>This is not a valid IP address.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>This value is not a valid language.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>This value is not a valid locale.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>This value is not a valid country.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>This value is already used.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>The size of the image could not be detected.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>This value should be the user's current password.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>The file was only partially uploaded.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>No file was uploaded.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>No temporary folder was configured in php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Cannot write temporary file to disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>A PHP extension caused the upload to fail.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Invalid card number.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Unsupported card type or invalid card number.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>This is not a valid International Bank Account Number (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>This value is not a valid ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>This value is not a valid ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>This value is neither a valid ISBN-10 nor a valid ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>This value is not a valid ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>This value is not a valid currency.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>This value should be equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>This value should be greater than {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>This value should be greater than or equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>This value should be less than {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>This value should be less than or equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>This value should not be equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>An empty file is not allowed.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>The host could not be resolved.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>This value does not match the expected {{ charset }} charset.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.es.xlf b/vendor/symfony/validator/Resources/translations/validators.es.xlf
deleted file mode 100644
index d874573..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.es.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Este valor debería ser falso.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Este valor debería ser verdadero.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Este valor debería ser de tipo {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Este valor debería estar vacío.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>El valor seleccionado no es una opción válida.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Debe seleccionar al menos {{ limit }} opción.|Debe seleccionar al menos {{ limit }} opciones.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Debe seleccionar como máximo {{ limit }} opción.|Debe seleccionar como máximo {{ limit }} opciones.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Uno o más de los valores indicados no son válidos.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Este campo no se esperaba.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Este campo está desaparecido.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Este valor no es una fecha válida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Este valor no es una fecha y hora válidas.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Este valor no es una dirección de email válida.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>No se pudo encontrar el archivo.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>No se puede leer el archivo.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>El archivo es demasiado grande ({{ size }} {{ suffix }}). El tamaño máximo permitido es {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>El tipo mime del archivo no es válido ({{ type }}). Los tipos mime válidos son {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Este valor debería ser {{ limit }} o menos.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Este valor es demasiado largo. Debería tener {{ limit }} carácter o menos.|Este valor es demasiado largo. Debería tener {{ limit }} caracteres o menos.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Este valor debería ser {{ limit }} o más.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Este valor es demasiado corto. Debería tener {{ limit }} carácter o más.|Este valor es demasiado corto. Debería tener {{ limit }} caracteres o más.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Este valor no debería estar vacío.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Este valor no debería ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Este valor debería ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Este valor no es válido.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Este valor no es una hora válida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Este valor no es una URL válida.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Los dos valores deberían ser iguales.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>El archivo es demasiado grande. El tamaño máximo permitido es {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>El archivo es demasiado grande.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>No se pudo subir el archivo.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Este valor debería ser un número válido.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>El archivo no es una imagen válida.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Esto no es una dirección IP válida.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Este valor no es un idioma válido.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Este valor no es una localización válida.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Este valor no es un país válido.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Este valor ya se ha utilizado.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>No se pudo determinar el tamaño de la imagen.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>El ancho de la imagen es demasiado grande ({{ width }}px). El ancho máximo permitido es de {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>El ancho de la imagen es demasiado pequeño ({{ width }}px). El ancho mínimo requerido es {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>La altura de la imagen es demasiado grande ({{ height }}px). La altura máxima permitida es de {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>La altura de la imagen es demasiado pequeña ({{ height }}px). La altura mínima requerida es de {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Este valor debería ser la contraseña actual del usuario.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Este valor debería tener exactamente {{ limit }} carácter.|Este valor debería tener exactamente {{ limit }} caracteres.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>El archivo fue sólo subido parcialmente.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ningún archivo fue subido.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Ninguna carpeta temporal fue configurada en php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>No se pudo escribir el archivo temporal en el disco.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Una extensión de PHP hizo que la subida fallara.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Esta colección debe contener {{ limit }} elemento o más.|Esta colección debe contener {{ limit }} elementos o más.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Esta colección debe contener {{ limit }} elemento o menos.|Esta colección debe contener {{ limit }} elementos o menos.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Esta colección debe contener exactamente {{ limit }} elemento.|Esta colección debe contener exactamente {{ limit }} elementos.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Número de tarjeta inválido.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipo de tarjeta no soportado o número de tarjeta inválido.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Esto no es un International Bank Account Number (IBAN) válido.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Este valor no es un ISBN-10 válido.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Este valor no es un ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Este valor no es ni un ISBN-10 válido ni un ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Este valor no es un ISSN válido.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Este valor no es una divisa válida.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser igual que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Este valor debería ser mayor que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser mayor o igual que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor debería ser idéntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Este valor debería ser menor que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser menor o igual que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser distinto de {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor no debería ser idéntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>La proporción de la imagen es demasiado grande ({{ ratio }}). La máxima proporción permitida es {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>La proporción de la imagen es demasiado pequeña ({{ ratio }}). La mínima proporción permitida es {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>La imagen es cuadrada ({{ width }}x{{ height }}px). Las imágenes cuadradas no están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>La imagen está orientada horizontalmente ({{ width }}x{{ height }}px). Las imágenes orientadas horizontalmente no están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>La imagen está orientada verticalmente ({{ width }}x{{ height }}px). Las imágenes orientadas verticalmente no están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>No está permitido un archivo vacío.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>No se puede resolver el host.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>La codificación de caracteres para este valor debería ser {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.et.xlf b/vendor/symfony/validator/Resources/translations/validators.et.xlf
deleted file mode 100644
index d047c8b..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.et.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version='1.0'?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Väärtus peaks olema väär.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Väärtus peaks oleme tõene.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Väärtus peaks olema {{ type }}-tüüpi.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Väärtus peaks olema tühi.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Väärtus peaks olema üks etteantud valikutest.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Valima peaks vähemalt {{ limit }} valikut.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Valima peaks mitte rohkem kui  {{ limit }} valikut.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>One or more of the given values is invalid.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>See väli ei oodatud.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>See väli on puudu.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Väärtus pole korrektne kuupäev.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Väärtus pole korrektne kuupäev ja kellaeg.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Väärtus pole korrektne e-maili aadress.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Faili ei leita.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Fail ei ole loetav.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fail on liiga suur ({{ size }} {{ suffix }}). Suurim lubatud suurus on {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Faili sisutüüp on vigane ({{ type }}). Lubatud sisutüübid on {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Väärtus peaks olema {{ limit }} või vähem.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Väärtus on liiga pikk. Pikkus peaks olema {{ limit }} tähemärki või vähem.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Väärtus peaks olema {{ limit }} või rohkem.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Väärtus on liiga lühike. Pikkus peaks  olema {{ limit }} tähemärki või rohkem.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Väärtus ei tohiks olla tühi.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Väärtus ei tohiks olla 'null'.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Väärtus peaks olema 'null'.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Väärtus on vigane.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Väärtus pole korrektne aeg.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Väärtus pole korrektne URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Väärtused peaksid olema võrdsed.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fail on liiga suur. Maksimaalne lubatud suurus on {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Fail on liiga suur.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Faili ei saa üles laadida.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Väärtus peaks olema korrektne number.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Fail ei ole korrektne pilt.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>IP aadress pole korrektne.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Väärtus pole korrektne keel.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Väärtus pole korrektne asukohakeel.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Väärtus pole olemasolev riik.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Väärtust on juba kasutatud.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Pildi suurust polnud võimalik tuvastada.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Pilt on liiga lai ({{ width }}px). Suurim lubatud laius on {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Pilt on liiga kitsas ({{ width }}px). Vähim lubatud laius on {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Pilt on liiga pikk ({{ height }}px). Lubatud suurim pikkus on {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Pilt pole piisavalt pikk ({{ height }}px). Lubatud vähim pikkus on {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Väärtus peaks olema kasutaja kehtiv salasõna.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} characters.</source>
-                <target>Väärtus peaks olema täpselt {{ limit }} tähemärk pikk.|Väärtus peaks olema täpselt {{ limit }} tähemärki pikk.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Fail ei laetud täielikult üles.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ühtegi faili ei laetud üles.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Ühtegi ajutist kausta polnud php.ini-s seadistatud.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Ajutist faili ei saa kettale kirjutada.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP laiendi tõttu ebaõnnestus faili üleslaadimine.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} elements or more.</source>
-                <target>Kogumikus peaks olema vähemalt {{ limit }} element.|Kogumikus peaks olema vähemalt {{ limit }} elementi.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} elements or less.</source>
-                <target>Kogumikus peaks olema ülimalt {{ limit }} element.|Kogumikus peaks olema ülimalt {{ limit }} elementi.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} elements.</source>
-                <target>Kogumikus peaks olema täpselt {{ limit }} element.|Kogumikus peaks olema täpselt {{ limit }}|elementi.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Vigane kaardi number.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Kaardi tüüpi ei toetata või kaardi number on vigane.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Väärtus pole korrektne IBAN-number.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Väärtus pole korrektne ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Väärtus pole korrektne ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Väärtus pole korrektne ISBN-10 ega ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Väärtus pole korrektne ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Väärtus pole korrektne valuuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Väärtus peaks olema võrdne {{ compared_value }}-ga.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Väärtus peaks olema suurem kui {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Väärtus peaks olema suurem kui või võrduma {{ compared_value }}-ga.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Väärtus peaks olema identne väärtusega {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Väärtus peaks olema väiksem kui {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Väärtus peaks olema väiksem kui või võrduma {{ compared_value }}-ga.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Väärtus ei tohiks võrduda {{ compared_value }}-ga.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Väärtus ei tohiks olla identne väärtusega {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.eu.xlf b/vendor/symfony/validator/Resources/translations/validators.eu.xlf
deleted file mode 100644
index b2edefd..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.eu.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Balio hau faltsua izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Balio hau egia izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Balio hau {{ type }} motakoa izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Balio hau hutsik egon beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Hautatu duzun balioa ez da aukera egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Gutxienez aukera {{ limit }} hautatu behar duzu.|Gutxienez {{ limit }} aukera hautatu behar dituzu.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Gehienez aukera {{ limit }} hautatu behar duzu.|Gehienez {{ limit }} aukera hautatu behar dituzu.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Emandako balioetatik gutxienez bat ez da egokia.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Eremu hau ez zen espero.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Eremu hau falta da.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Balio hau ez da data egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Balio hau ez da data-ordu egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Balio hau ez da posta elektroniko egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Ezin izan da fitxategia aurkitu.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Fitxategia ez da irakurgarria.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fitxategia handiegia da ({{ size }} {{ suffix }}). Baimendutako tamaina handiena {{ limit }} {{ suffix }} da.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Fitxategiaren mime mota ez da egokia ({{ type }}). Hauek dira baimendutako mime motak: {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Balio hau gehienez {{ limit }} izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Balio hau luzeegia da. Gehienez karaktere {{ limit }} eduki beharko luke.|Balio hau luzeegia da. Gehienez {{ limit }} karaktere eduki beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Balio hau gutxienez {{ limit }} izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Balio hau motzegia da. Karaktere {{ limit }} gutxienez eduki beharko luke.|Balio hau motzegia da. Gutxienez {{ limit }} karaktere eduki beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Balio hau ez litzateke hutsik egon behar.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Balio hau ez litzateke nulua izan behar.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Balio hau nulua izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Balio hau ez da egokia.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Balio hau ez da ordu egoki bat.</target>
-           </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Balio hau ez da baliabideen kokatzaile uniforme (URL) egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Bi balioak berdinak izan beharko lirateke.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fitxategia handiegia da. Baimendutako tamaina handiena {{ limit }} {{ suffix }} da.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Fitxategia handiegia da.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Ezin izan da fitxategia igo.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Balio hau zenbaki egoki bat izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Fitxategi hau ez da irudi egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Honako hau ez da IP helbide egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Balio hau ez da hizkuntza egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Balio hau ez da kokapen egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Balio hau ez da herrialde egoki bat.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Balio hau jadanik erabilia izan da.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Ezin izan da irudiaren tamaina detektatu.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Irudiaren zabalera handiegia da ({{ width }}px). Onartutako gehienezko zabalera {{ max_width }}px dira.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Irudiaren zabalera txikiegia da ({{ width }}px). Onartutako gutxieneko zabalera {{ min_width }}px dira.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Irudiaren altuera handiegia da ({{ height }}px). Onartutako gehienezko altuera {{ max_height }}px dira.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Irudiaren altuera txikiegia da ({{ height }}px). Onartutako gutxieneko altuera {{ min_height }}px dira.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Balio hau uneko erabiltzailearen pasahitza izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Balio honek zehazki karaktere {{ limit }} izan beharko luke.|Balio honek zehazki {{ limit }} karaktere izan beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Fitxategiaren zati bat bakarrik igo da.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ez da fitxategirik igo.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Ez da aldi baterako karpetarik konfiguratu php.ini fitxategian.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Ezin izan da aldi baterako fitxategia diskoan idatzi.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP luzapen batek igoeraren hutsa eragin du.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Bilduma honek gutxienez elementu {{ limit }} eduki beharko luke.|Bilduma honek gutxienez {{ limit }} elementu eduki beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Bilduma honek gehienez elementu {{ limit }} eduki beharko luke.|Bilduma honek gehienez {{ limit }} elementu eduki beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Bilduma honek zehazki elementu {{ limit }} eduki beharko luke.|Bilduma honek zehazki {{ limit }} elementu eduki beharko lituzke.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Txartel zenbaki baliogabea.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Txartel mota onartezina edo txartel zenbaki baliogabea.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Hau ez da baliozko banku internazionaleko kontu zenbaki (IBAN) bat.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Balio hau ez da onartutako ISBN-10 bat.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Balio hau ez da onartutako ISBN-13 bat.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Balio hau ez da onartutako ISBN-10 edo ISBN-13 bat.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Balio hau ez da onartutako ISSN bat.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Balio hau ez da baliozko moneta bat.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value }}-(r)en berbera izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value }} baino handiagoa izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value }}-(r)en berdina edota handiagoa izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value_type }} {{ compared_value }}-(r)en berbera izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value }} baino txikiagoa izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Balio hau {{ compared_value }}-(r)en berdina edota txikiagoa izan beharko litzateke.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Balio hau ez litzateke {{ compared_value }}-(r)en berdina izan behar.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Balio hau ez litzateke {{ compared_value_type }} {{ compared_value }}-(r)en berbera izan behar.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.fa.xlf b/vendor/symfony/validator/Resources/translations/validators.fa.xlf
deleted file mode 100644
index 98b4bd6..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.fa.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target state="needs-review-translation">این مقدار باید نادرست(False) باشد.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>این مقدار باید درست(True) باشد.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>این مقدار باید از نوع {{ type }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>این فیلد باید خالی باشد.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>گزینه انتخابی معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>باید حداقل {{ limit }} گزینه انتخاب کنید.|باید حداقل {{ limit }} گزینه انتخاب کنید.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>حداکثر {{ limit }} گزینه می توانید انتخاب کنید.|حداکثر {{ limit }} گزینه می توانید انتخاب کنید.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>یک یا چند مقدار نامعتبر وجود دارد.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>The fields {{ fields }} were not expected.</source>
-                <target>فیلدهای {{ fields }} اضافی هستند.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>The fields {{ fields }} are missing.</source>
-                <target>فیلدهای {{ fields }} کم هستند.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>این مقدار یک تاریخ معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>این مقدار یک تاریخ و زمان معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>این یک رایانامه معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>فایل پیدا نشد.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>فایل قابلیت خواندن ندارد.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>فایل بیش از اندازه بزرگ است({{ size }} {{ suffix }}). حداکثر اندازه مجاز برابر {{ limit }} {{ suffix }} است.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>این نوع فایل مجاز نیست({{ type }}). نوع های مجاز {{ types }} هستند.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>این مقدار باید کوچکتر یا مساوی {{ limit }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>بسیار طولانی است.حداکثر تعداد حروف مجاز برابر {{ limit }} است.|بسیار طولانی است.حداکثر تعداد حروف مجاز برابر {{ limit }} است.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>این مقدار باید برابر و یا بیشتر از {{ limit }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>بسیار کوتاه است.تعداد حروف باید حداقل {{ limit }} باشد.|بسیار کوتاه است.تعداد حروف باید حداقل {{ limit }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>این مقدار نباید تهی باشد.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>باید مقداری داشته باشد..</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>نباید مقداری داشته باشد.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>این مقدار معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>این مقدار یک زمان صحیح نیست.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>این یک URL معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>دو مقدار باید برابر باشند.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>فایل بیش از اندازه بزرگ است. حداکثر اندازه مجاز برابر {{ limit }} {{ suffix }} است.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>فایل بیش از اندازه بزرگ است.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>بارگذاری فایل با شکست مواجه شد.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>این مقدار باید یک عدد معتبر باشد.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>این فایل یک تصویر نیست.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>این مقدار یک IP معتبر نیست.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>این مقدار یک زبان صحیح نیست.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>این مقدار یک محل صحیح نیست.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>این مقدار یک کشور صحیح نیست.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>این مقدار قبلا مورد استفاده قرار گرفته است.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>اندازه تصویر قابل شناسایی نیست.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>طول تصویر بسیار بزرگ است ({{ width }}px). بشینه طول مجاز {{ max_width }}px است.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>طول تصویر بسیار کوچک است ({{ width }}px). کمینه طول موردنظر {{ min_width }}px است.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>ارتفاع تصویر بسیار بزرگ است ({{ height }}px). بشینه ارتفاع مجاز {{ max_height }}px است.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>ارتفاع تصویر بسیار کوچک است ({{ height }}px). کمینه ارتفاع موردنظر {{ min_height }}px است.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>این مقدار می بایست کلمه عبور کنونی کاربر باشد.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target> این مقدار می بایست دقیقا {{ limit }} کاراکتر داشته باشد.| این مقدار می بایست دقیقا {{ limit }} کاراکتر داشته باشد.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>فایل به صورت جزیی بارگذاری شده است.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>هیچ فایلی بارگذاری نشد.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>فولدر موقت در php.ini پیکربندی نشده است.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>فایل موقت را نمی توان در دیسک نوشت.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>اکستنشن PHP موجب شد که بارگذاری فایل با شکست مواجه شود.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>این مجموعه می بایست دارای {{ limit }} عنصر یا بیشتر باشد.|این مجموعه می بایست دارای {{ limit }} عنصر یا بیشتر باشد.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>این مجموعه می بایست دارای حداقل {{ limit }} عنصر یا کمتر باشد.|این مجموعه می بایست دارای {{ limit }} عنصر یا کمتر باشد.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>این مجموعه می بایست به طور دقیق دارا {{ limit }} عنصر باشد.|این مجموعه می بایست به طور دقیق دارای {{ limit }} قلم باشد.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>شماره کارت نامعتبر است.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>نوع کارت پشتیبانی نمی شود یا شماره کارت نامعتبر است.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>این یک شماره حساب بین المللی بانک (IBAN) درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>این مقدار یک ISBN-10 درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>این مقدار یک ISBN-13 درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>این مقدار یک ISBN-10 درست یا ISBN-13 درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>این مقدار یک ISSN درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>این مقدار یک یکای پول درست نیست.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>این مقدار باید برابر با {{ compared_value }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>این مقدار باید از {{ compared_value }} بیشتر باشد.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>این مقدار باید بزرگتر یا مساوی با {{ compared_value }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>این مقدار باید با {{ compared_value_type }} {{ compared_value }} یکی باشد.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>این مقدار باید کمتر از {{ compared_value }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>این مقدار باید کمتر یا مساوی با {{ compared_value }} باشد.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>این مقدار نباید با {{ compared_value }} برابر باشد.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>این مقدار نباید {{ compared_value_type }} {{ compared_value }} یکی باشد.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.fi.xlf b/vendor/symfony/validator/Resources/translations/validators.fi.xlf
deleted file mode 100644
index 3f5a07e..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.fi.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Arvon tulee olla epätosi.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Arvon tulee olla tosi.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Arvon tulee olla tyyppiä {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Arvon tulee olla tyhjä.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Arvon tulee olla yksi annetuista vaihtoehdoista.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Sinun tulee valita vähintään {{ limit }} vaihtoehtoa.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Sinun tulee valitan enintään {{ limit }} vaihtoehtoa.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Yksi tai useampi annetuista arvoista on virheellinen.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Tässä kentässä ei odotettu.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Tämä kenttä puuttuu.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Annettu arvo ei ole kelvollinen päivämäärä.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Annettu arvo ei ole kelvollinen päivämäärä ja kellonaika.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Annettu arvo ei ole kelvollinen sähköpostiosoite.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Tiedostoa ei löydy.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Tiedostoa ei voida lukea.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Tiedostonkoko ({{ size }} {{ suffix }}) on liian iso. Suurin sallittu tiedostonkoko on {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Tiedostotyyppi ({{ type }}) on virheellinen. Sallittuja tiedostotyyppejä ovat {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Arvon tulee olla {{ limit }} tai vähemmän.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Liian pitkä syöte. Syöte saa olla enintään {{ limit }} merkkiä.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Arvon tulee olla {{ limit }} tai enemmän.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Liian lyhyt syöte. Syötteen tulee olla vähintään {{ limit }} merkkiä.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Kenttä ei voi olla tyhjä.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Syöte ei voi olla null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Syötteen tulee olla null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Virheellinen arvo.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Annettu arvo ei ole kelvollinen kellonaika.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Annettu arvo ei ole kelvollinen URL-osoite.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Kahden annetun arvon tulee olla samat.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Annettu tiedosto on liian iso. Suurin sallittu tiedostokoko on {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Tiedosto on liian iso.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Tiedoston siirto epäonnistui.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Tämän arvon tulee olla numero.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Tämä tiedosto ei ole kelvollinen kuva.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Tämä ei ole kelvollinen IP-osoite.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Tämä arvo ei ole kelvollinen kieli.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Tämä arvo ei ole kelvollinen kieli- ja alueasetus (locale).</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Tämä arvo ei ole kelvollinen maa.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Tämä arvo on jo käytetty.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Kuvan kokoa ei voitu tunnistaa.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Kuva on liian leveä ({{ width }}px). Sallittu maksimileveys on {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Kuva on liian kapea ({{ width }}px). Leveyden tulisi olla vähintään {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Kuva on liian korkea ({{ width }}px). Sallittu maksimikorkeus on {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Kuva on liian matala ({{ height }}px). Korkeuden tulisi olla vähintään {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Tämän arvon tulisi olla käyttäjän tämänhetkinen salasana.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Tämän arvon tulisi olla tasan yhden merkin pituinen.|Tämän arvon tulisi olla tasan {{ limit }} merkkiä pitkä.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Tiedosto ladattiin vain osittain.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Tiedostoa ei ladattu.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Väliaikaishakemistoa ei ole asetettu php.ini -tiedostoon.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Väliaikaistiedostoa ei voitu kirjoittaa levylle.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP-laajennoksen vuoksi tiedoston lataus epäonnistui.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Tässä ryhmässä tulisi olla yksi tai useampi elementti.|Tässä ryhmässä tulisi olla vähintään {{ limit }} elementtiä.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Tässä ryhmässä tulisi olla enintään yksi elementti.|Tässä ryhmässä tulisi olla enintään {{ limit }} elementtiä.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Tässä ryhmässä tulisi olla tasan yksi elementti.|Tässä ryhmässä tulisi olla enintään {{ limit }} elementtiä.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Virheellinen korttinumero.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tätä korttityyppiä ei tueta tai korttinumero on virheellinen.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.fr.xlf b/vendor/symfony/validator/Resources/translations/validators.fr.xlf
deleted file mode 100644
index b50ecbc..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.fr.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Cette valeur doit être fausse.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Cette valeur doit être vraie.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Cette valeur doit être de type {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Cette valeur doit être vide.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Cette valeur doit être l'un des choix proposés.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Vous devez sélectionner au moins {{ limit }} choix.|Vous devez sélectionner au moins {{ limit }} choix.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Vous devez sélectionner au maximum {{ limit }} choix.|Vous devez sélectionner au maximum {{ limit }} choix.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Une ou plusieurs des valeurs soumises sont invalides.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Ce champ n'a pas été prévu.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Ce champ est manquant.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Cette valeur n'est pas une date valide.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Cette valeur n'est pas une date valide.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Cette valeur n'est pas une adresse email valide.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Le fichier n'a pas été trouvé.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Le fichier n'est pas lisible.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Le fichier est trop volumineux ({{ size }} {{ suffix }}). Sa taille ne doit pas dépasser {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Le type du fichier est invalide ({{ type }}). Les types autorisés sont {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Cette valeur doit être inférieure ou égale à {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Cette chaine est trop longue. Elle doit avoir au maximum {{ limit }} caractère.|Cette chaine est trop longue. Elle doit avoir au maximum {{ limit }} caractères.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Cette valeur doit être supérieure ou égale à {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Cette chaine est trop courte. Elle doit avoir au minimum {{ limit }} caractère.|Cette chaine est trop courte. Elle doit avoir au minimum {{ limit }} caractères.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Cette valeur ne doit pas être vide.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Cette valeur ne doit pas être nulle.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Cette valeur doit être nulle.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Cette valeur n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Cette valeur n'est pas une heure valide.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Cette valeur n'est pas une URL valide.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Les deux valeurs doivent être identiques.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Le fichier est trop volumineux. Sa taille ne doit pas dépasser {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Le fichier est trop volumineux.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Le téléchargement de ce fichier est impossible.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Cette valeur doit être un nombre.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ce fichier n'est pas une image valide.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Cette adresse IP n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Cette langue n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Ce paramètre régional n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Ce pays n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Cette valeur est déjà utilisée.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>La taille de l'image n'a pas pu être détectée.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>La largeur de l'image est trop grande ({{ width }}px). La largeur maximale autorisée est de {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>La largeur de l'image est trop petite ({{ width }}px). La largeur minimale attendue est de {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>La hauteur de l'image est trop grande ({{ height }}px). La hauteur maximale autorisée est de {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>La hauteur de l'image est trop petite ({{ height }}px). La hauteur minimale attendue est de {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Cette valeur doit être le mot de passe actuel de l'utilisateur.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Cette chaine doit avoir exactement {{ limit }} caractère.|Cette chaine doit avoir exactement {{ limit }} caractères.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Le fichier a été partiellement transféré.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Aucun fichier n'a été transféré.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Aucun répertoire temporaire n'a été configuré dans le php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Impossible d'écrire le fichier temporaire sur le disque.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Une extension PHP a empêché le transfert du fichier.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Cette collection doit contenir {{ limit }} élément ou plus.|Cette collection doit contenir {{ limit }} éléments ou plus.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Cette collection doit contenir {{ limit }} élément ou moins.|Cette collection doit contenir {{ limit }} éléments ou moins.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Cette collection doit contenir exactement {{ limit }} élément.|Cette collection doit contenir exactement {{ limit }} éléments.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Numéro de carte invalide.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Type de carte non supporté ou numéro invalide.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Le numéro IBAN (International Bank Account Number) saisi n'est pas valide.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Cette valeur n'est pas un code ISBN-10 valide.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Cette valeur n'est pas un code ISBN-13 valide.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Cette valeur n'est ni un code ISBN-10, ni un code ISBN-13 valide.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Cette valeur n'est pas un code ISSN valide.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Cette valeur n'est pas une devise valide.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Cette valeur doit être égale à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Cette valeur doit être supérieure à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Cette valeur doit être supérieure ou égale à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Cette valeur doit être identique à {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Cette valeur doit être inférieure à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Cette valeur doit être inférieure ou égale à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Cette valeur ne doit pas être égale à {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Cette valeur ne doit pas être identique à {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Le rapport largeur/hauteur de l'image est trop grand ({{ ratio }}). Le rapport maximal autorisé est {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Le rapport largeur/hauteur de l'image est trop petit ({{ ratio }}). Le rapport minimal attendu est {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>L'image est carrée ({{ width }}x{{ height }}px). Les images carrées ne sont pas autorisées.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>L'image est au format paysage ({{ width }}x{{ height }}px). Les images au format paysage ne sont pas autorisées.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>L'image est au format portrait ({{ width }}x{{ height }}px). Les images au format portrait ne sont pas autorisées.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Un fichier vide n'est pas autorisé.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Le nom de domaine n'a pas pu être résolu.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Cette valeur ne correspond pas au jeu de caractères {{ charset }} attendu.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.gl.xlf b/vendor/symfony/validator/Resources/translations/validators.gl.xlf
deleted file mode 100644
index 1d0cc13..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.gl.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Este valor debería ser falso.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Este valor debería ser verdadeiro.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Este valor debería ser de tipo {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Este valor debería estar baleiro.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>O valor seleccionado non é unha opción válida.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Debe seleccionar polo menos {{ limit }} opción.|Debe seleccionar polo menos {{ limit }} opcions.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Debe seleccionar como máximo {{ limit }} opción.|Debe seleccionar como máximo {{ limit }} opcions.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Un ou máis dos valores indicados non son válidos.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Este campo non era esperado.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Este campo falta.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Este valor non é unha data válida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Este valor non é unha data e hora válidas.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Este valor non é unha dirección de correo electrónico válida.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Non se puido atopar o arquivo.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>O arquivo non se pode ler.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é demasiado grande ({{ size }} {{ suffix }}). O tamaño máximo permitido é {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>O tipo mime do arquivo non é válido ({{ type }}). Os tipos mime válidos son {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Este valor debería ser {{ limit }} ou menos.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Este valor é demasiado longo. Debería ter {{ limit }} carácter ou menos.|Este valor é demasiado longo. Debería ter {{ limit }} caracteres ou menos.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Este valor debería ser {{ limit }} ou máis.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Este valor é demasiado curto. Debería ter {{ limit }} carácter ou máis.|Este valor é demasiado corto. Debería ter {{ limit }} caracteres ou máis.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Este valor non debería estar baleiro.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Este valor non debería ser null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Este valor debería ser null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Este valor non é válido.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Este valor non é unha hora válida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Este valor non é unha URL válida.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Os dous valores deberían ser iguais.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é demasiado grande. O tamaño máximo permitido é {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>O arquivo é demasiado grande.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>No se puido cargar o arquivo.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Este valor debería ser un número válido.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>O arquivo non é unha imaxe válida.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Isto non é unha dirección IP válida.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Este valor non é un idioma válido.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Este valor non é unha localización válida.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Este valor non é un país válido.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Este valor xa está a ser empregado.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Non se puido determinar o tamaño da imaxe.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>A largura da imaxe é demasiado grande ({{ width }}px). A largura máxima permitida son {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>A largura da imaxe é demasiado pequena ({{ width }}px). A largura mínima requerida son {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>A altura da imaxe é demasiado grande ({{ height }}px). A altura máxima permitida son {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>A altura da imaxe é demasiado pequena ({{ height }}px). A altura mínima requerida son {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Este valor debería ser a contrasinal actual do usuario.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Este valor debería ter exactamente {{ limit }} carácter.|Este valor debería ter exactamente {{ limit }} caracteres.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>O arquivo foi só subido parcialmente.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Non se subiu ningún arquivo.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Ningunha carpeta temporal foi configurada en php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Non se puido escribir o arquivo temporal no disco.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Unha extensión de PHP provocou que a subida fallara.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Esta colección debe conter {{ limit }} elemento ou máis.|Esta colección debe conter {{ limit }} elementos ou máis.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Esta colección debe conter {{ limit }} elemento ou menos.|Esta colección debe conter {{ limit }} elementos ou menos.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Esta colección debe conter exactamente {{ limit }} elemento.|Esta colección debe conter exactamente {{ limit }} elementos.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Número de tarxeta non válido.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipo de tarxeta non soportado ou número de tarxeta non válido.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Este valor non é un International Bank Account Number (IBAN) válido.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Este valor non é un ISBN-10 válido.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Este valor non é un ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Este valor non é nin un ISBN-10 válido nin un ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Este valor non é un ISSN válido.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Este valor non é unha moeda válida.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Este valor debería ser maior que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser maior ou igual que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor debería ser identico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Este valor debería ser menor que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Este valor debería ser menor ou igual que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Este valor non debería ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor non debería ser identico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>A proporción da imaxe é demasiado grande ({{ ratio }}). A proporción máxima permitida é {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>A proporción da é demasiado pequena ({{ ratio }}). A proporción mínima permitida é {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>A imaxe é cadrada ({{ width }}x{{ height }}px). As imáxenes cadradas non están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>A imaxe está orientada horizontalmente ({{ width }}x{{ height }}px). As imáxenes orientadas horizontalmente non están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>A imaxe está orientada verticalmente ({{ width }}x{{ height }}px). As imáxenes orientadas verticalmente non están permitidas.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Non está permitido un arquivo baleiro.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Non se puido resolver o host.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>A codificación de caracteres para este valor debería ser {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.he.xlf b/vendor/symfony/validator/Resources/translations/validators.he.xlf
deleted file mode 100644
index 6510514..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.he.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>הערך צריך להיות שקר.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>הערך צריך להיות אמת.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>הערך צריך להיות מסוג {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>הערך צריך להיות ריק.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>הערך שבחרת אינו חוקי.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>אתה צריך לבחור לפחות {{ limit }} אפשרויות.|אתה צריך לבחור לפחות {{ limit }} אפשרויות.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>אתה צריך לבחור לכל היותר {{ limit }} אפשרויות.|אתה צריך לבחור לכל היותר {{ limit }} אפשרויות.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>אחד או יותר מהערכים אינו חוקי.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>שדה זה לא היה צפוי</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>שדה זה חסר.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>הערך אינו תאריך חוקי.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>הערך אינו תאריך ושעה חוקיים.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>כתובת המייל אינה תקינה.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>הקובץ לא נמצא.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>לא ניתן לקרוא את הקובץ.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>הקובץ גדול מדי ({{ size }} {{ suffix }}). הגודל המרבי המותר הוא {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>סוג MIME של הקובץ אינו חוקי ({{ type }}). מותרים סוגי MIME {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>הערך צריל להכיל {{ limit }} תווים לכל היותר.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>הערך ארוך מידי. הוא צריך להכיל {{ limit }} תווים לכל היותר.|הערך ארוך מידי. הוא צריך להכיל {{ limit }} תווים לכל היותר.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>הערך צריך להכיל {{ limit }} תווים לפחות.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>הערך קצר מידיץ הוא צריך להכיל {{ limit }} תווים לפחות.|הערך קצר מידיץ הוא צריך להכיל {{ limit }} תווים לפחות.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>הערך לא אמור להיות ריק.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>הערך לא אמור להיות ריק.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>הערך צריך להיות ריק.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>הערך אינו חוקי.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>הערך אינו זמן תקין.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>זאת אינה כתובת אתר תקינה.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>שני הערכים צריכים להיות שווים.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>הקובץ גדול מדי. הגודל המרבי המותר הוא {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>הקובץ גדול מדי.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>לא ניתן לעלות את הקובץ.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>הערך צריך להיות מספר חוקי.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>הקובץ הזה אינו תמונה תקינה.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>זו אינה כתובת IP חוקית.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>הערך אינו שפה חוקית.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>הערך אינו אזור תקף.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>הערך אינו ארץ חוקית.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>הערך כבר בשימוש.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>לא ניתן לקבוע את גודל התמונה.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>רוחב התמונה גדול מדי ({{ width }}px). הרוחב המקסימלי הוא {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>רוחב התמונה קטן מדי ({{ width }}px). הרוחב המינימלי הוא {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>גובה התמונה גדול מדי ({{ height }}px). הגובה המקסימלי הוא {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>גובה התמונה קטן מדי ({{ height }}px). הגובה המינימלי הוא {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>הערך צריך להיות סיסמת המשתמש הנוכחי.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>הערך צריך להיות בדיוק {{ limit }} תווים.|הערך צריך להיות בדיוק {{ limit }} תווים.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>הקובץ הועלה באופן חלקי.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>הקובץ לא הועלה.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>לא הוגדרה תיקייה זמנית ב php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>לא ניתן לכתוב קובץ זמני לדיסק.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>סיומת PHP גרם להעלאה להיכשל.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>האוסף אמור להכיל {{ limit }} אלמנטים או יותר.|האוסף אמור להכיל {{ limit }} אלמנטים או יותר.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>האוסף אמור להכיל {{ limit }} אלמנטים או פחות.|האוסף אמור להכיל {{ limit }} אלמנטים או פחות.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>האוסף צריך להכיל בדיוק {{ limit }} אלמנטים.|האוסף צריך להכיל בדיוק {{ limit }} אלמנטים.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>מספר הכרטיס אינו חוקי.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>סוג הכרטיס אינו נתמך או לא חוקי.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>This is not a valid International Bank Account Number (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>This value is not a valid ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>This value is not a valid ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>This value is neither a valid ISBN-10 nor a valid ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>This value is not a valid ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>This value is not a valid currency.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>This value should be equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>This value should be greater than {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>This value should be greater than or equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>This value should be less than {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>This value should be less than or equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>This value should not be equal to {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>An empty file is not allowed.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.hr.xlf b/vendor/symfony/validator/Resources/translations/validators.hr.xlf
deleted file mode 100644
index a11e825..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.hr.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Ova vrijednost treba biti netočna (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Ova vrijednost treba biti točna (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Ova vrijednost treba biti tipa {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Ova vrijednost treba biti prazna.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Ova vrijednost treba biti jedna od ponuđenih.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Izaberite barem {{ limit }} mogućnosti.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Izaberite najviše {{ limit }} mogućnosti.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Jedna ili više danih vrijednosti nije ispravna.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Ovo polje nije očekivalo.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Ovo polje nedostaje.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Ova vrijednost nije ispravan datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ova vrijednost nije ispravan datum-vrijeme.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Ova vrijednost nije ispravna e-mail adresa.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Datoteka ne može biti pronađena.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Datoteka nije čitljiva.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Datoteka je prevelika ({{ size }} {{ suffix }}). Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mime tip datoteke nije ispravan ({{ type }}). Dozvoljeni mime tipovi su {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Ova vrijednost treba biti {{ limit }} ili manje.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Ova vrijednost je predugačka. Treba imati {{ limit }} znakova ili manje.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Ova vrijednost treba biti {{ limit }} ili više.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Ova vrijednost je prekratka. Treba imati {{ limit }} znakova ili više.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ova vrijednost ne smije biti prazna.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ova vrijednost ne smije biti null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Ova vrijednost treba biti null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Ova vrijednost nije ispravna.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ova vrijednost nije ispravno vrijeme.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Ova vrijednost nije ispravan URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Obje vrijednosti trebaju biti jednake.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Ova datoteka je prevelika.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Ova datoteka ne može biti prenesena.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Ova vrijednost treba biti ispravan broj.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ova datoteka nije ispravna slika.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Ovo nije ispravna IP adresa.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Ova vrijednost nije ispravan jezik.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Ova vrijednost nije ispravana regionalna oznaka.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Ova vrijednost nije ispravna zemlja.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Ova vrijednost je već iskorištena.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Veličina slike se ne može odrediti.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Širina slike je prevelika ({{ width }}px). Najveća dozvoljena širina je {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Širina slike je premala ({{ width }}px). Najmanja dozvoljena širina je {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Visina slike je prevelika ({{ height }}px). Najveća dozvoljena visina je {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Visina slike je premala ({{ height }}px). Najmanja dozvoljena visina je {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Ova vrijednost treba biti trenutna korisnička lozinka.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Ova vrijednost treba imati točno {{ limit }} znakova.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Datoteka je samo djelomično prenesena.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Niti jedna datoteka nije prenesena.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>U php.ini datoteci nije konfiguriran privremeni folder.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Ne mogu zapisati privremenu datoteku na disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Prijenos datoteke nije uspio zbog PHP ekstenzije.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ova kolekcija treba sadržavati {{ limit }} ili više elemenata.|Ova kolekcija treba sadržavati {{ limit }} ili više elemenata.|Ova kolekcija treba sadržavati {{ limit }} ili više elemenata.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ova kolekcija treba sadržavati {{ limit }} ili manje elemenata.|Ova kolekcija treba sadržavati {{ limit }} ili manje elemenata.|Ova kolekcija treba sadržavati {{ limit }} ili manje elemenata.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ova kolekcija treba sadržavati točno {{ limit }} element.|Ova kolekcija treba sadržavati točno {{ limit }} elementa.|Ova kolekcija treba sadržavati točno {{ limit }} elemenata.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Neispravan broj kartice.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Neispravan broj kartice ili tip kartice nije podržan.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Ova vrijednost nije ispravan međunarodni broj bankovnog računa (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ova vrijednost nije ispravan ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ova vrijednost nije ispravan ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ova vrijednost nije ispravan ISBN-10 niti ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ova vrijednost nije ispravan ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ova vrijednost nije ispravna valuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti jednaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti veća od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti veća ili jednaka od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti manja od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ova vrijednost bi trebala biti manja ili jednaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ova vrijednost ne bi trebala biti {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ova vrijednost ne bi trebala biti {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.hu.xlf b/vendor/symfony/validator/Resources/translations/validators.hu.xlf
deleted file mode 100644
index a972c02..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.hu.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Ennek az értéknek hamisnak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Ennek az értéknek igaznak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Ennek az értéknek {{ type }} típusúnak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Ennek az értéknek üresnek kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>A választott érték érvénytelen.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Legalább {{ limit }} értéket kell kiválasztani.|Legalább {{ limit }} értéket kell kiválasztani.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Legfeljebb {{ limit }} értéket lehet kiválasztani.|Legfeljebb {{ limit }} értéket lehet kiválasztani.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>A megadott értékek közül legalább egy érvénytelen.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Nem várt mező.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Ez a mező hiányzik.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Ez az érték nem egy érvényes dátum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ez az érték nem egy érvényes időpont.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Ez az érték nem egy érvényes e-mail cím.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>A fájl nem található.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>A fájl nem olvasható.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>A fájl túl nagy ({{ size }} {{ suffix }}). A legnagyobb megengedett méret {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>A fájl MIME típusa érvénytelen ({{ type }}). Az engedélyezett MIME típusok: {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Ez az érték legfeljebb {{ limit }} lehet.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Ez az érték túl hosszú. Legfeljebb {{ limit }} karaktert tartalmazhat.|Ez az érték túl hosszú. Legfeljebb {{ limit }} karaktert tartalmazhat.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Ez az érték legalább {{ limit }} kell, hogy legyen.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Ez az érték túl rövid. Legalább {{ limit }} karaktert kell tartalmaznia.|Ez az érték túl rövid. Legalább {{ limit }} karaktert kell tartalmaznia.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ez az érték nem lehet üres.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ez az érték nem lehet null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Ennek az értéknek nullnak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Ez az érték nem érvényes.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ez az érték nem egy érvényes időpont.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Ez az érték nem egy érvényes URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>A két értéknek azonosnak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>A fájl túl nagy. A megengedett maximális méret: {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>A fájl túl nagy.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>A fájl nem tölthető fel.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Ennek az értéknek érvényes számnak kell lennie.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ez a fájl nem egy érvényes kép.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Ez az érték nem egy érvényes IP cím.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Ez az érték nem egy érvényes nyelv.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Ez az érték nem egy érvényes területi beállítás.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Ez az érték nem egy érvényes ország.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Ez az érték már használatban van.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>A kép méretét nem lehet megállapítani.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>A kép szélessége túl nagy ({{ width }}px). A megengedett legnagyobb szélesség {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>A kép szélessége túl kicsi ({{ width }}px). Az elvárt legkisebb szélesség {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>A kép magassága túl nagy ({{ height }}px). A megengedett legnagyobb magasság {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>A kép magassága túl kicsi ({{ height }}px). Az elvárt legkisebb magasság {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Ez az érték a felhasználó jelenlegi jelszavával kell megegyezzen.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Ennek az értéknek pontosan {{ limit }} karaktert kell tartalmaznia.|Ennek az értéknek pontosan {{ limit }} karaktert kell tartalmaznia.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>A fájl csak részben lett feltöltve.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nem lett fájl feltöltve.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nincs ideiglenes könyvtár beállítva a php.ini-ben.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Az ideiglenes fájl nem írható a lemezre.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Egy PHP bővítmény miatt a feltöltés nem sikerült.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ennek a gyűjteménynek legalább {{ limit }} elemet kell tartalmaznia.|Ennek a gyűjteménynek legalább {{ limit }} elemet kell tartalmaznia.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ez a gyűjtemény legfeljebb {{ limit }} elemet tartalmazhat.|Ez a gyűjtemény legfeljebb {{ limit }} elemet tartalmazhat.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ennek a gyűjteménynek pontosan {{ limit }} elemet kell tartalmaznia.|Ennek a gyűjteménynek pontosan {{ limit }} elemet kell tartalmaznia.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Érvénytelen kártyaszám.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nem támogatott kártyatípus vagy érvénytelen kártyaszám.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Érvénytelen nemzetközi bankszámlaszám (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ez az érték nem egy érvényes ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ez az érték nem egy érvényes ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ez az érték nem egy érvényes ISBN-10 vagy ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ez az érték nem egy érvényes ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ez az érték nem egy érvényes pénznem.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ez az érték legyen {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ez az érték nagyobb legyen, mint {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ez az érték nagyobb vagy egyenlő legyen, mint {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ez az érték ugyanolyan legyen, mint {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ez az érték kisebb legyen, mint {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ez az érték kisebb vagy egyenlő legyen, mint {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ez az érték ne legyen {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ez az érték ne legyen ugyanolyan, mint {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>A képarány túl nagy ({{ ratio }}). A megengedett legnagyobb képarány {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>A képarány túl kicsi ({{ ratio }}). A megengedett legkisebb képarány {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>A kép négyzet alakú ({{ width }}x{{ height }}px). A négyzet alakú képek nem engedélyezettek.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>A kép fekvő tájolású ({{ width }}x{{ height }}px). A fekvő tájolású képek nem engedélyezettek.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>A kép álló tájolású ({{ width }}x{{ height }}px). Az álló tájolású képek nem engedélyezettek.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Üres fájl nem megengedett.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Az állomásnevet nem lehet feloldani.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Ez az érték nem az elvárt {{ charset }} karakterkódolást használja.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.hy.xlf b/vendor/symfony/validator/Resources/translations/validators.hy.xlf
deleted file mode 100644
index 664c085..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.hy.xlf
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Արժեքը պետք է լինի կեղծ.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Արժեքը պետք է լինի ճշմարիտ.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Արժեքը պետք է լինի {{ type }} տեսակի.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Արժեքը պետք է լինի դատարկ.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Ձեր ընտրած արժեքը անթույլատրելի է.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Դուք պետք է ընտրեք ամենաքիչը {{ limit }} տարբերակներ.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Դուք պետք է ընտրեք ոչ ավելի քան {{ limit }} տարբերակներ.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Մեկ կամ ավելի տրված արժեքները անթույլատրելի են.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Այս դաշտը չի սպասվում.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Այս դաշտը բացակայում է.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Արժեքը սխալ ամսաթիվ է.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ամսաթվի և ժամանակի արժեքը անթույլատրելի է.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Էլ-փոստի արժեքը անթույլատրելի է.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Ֆայլը չի գտնվել.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Ֆայլը անընթեռնելի է.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ֆայլը չափազանց մեծ է ({{ size }} {{ suffix }}): Մաքսիմալ թույլատրելի չափսը՝ {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>MIME-տեսակը անթույլատրելի է({{ type }}): Ֆայլերի թույլատրելի MIME-տեսակներն են: {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Արժեքը պետք է լինի {{ limit }} կամ փոքր.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Արժեքը չափազանց երկար է: Պետք է լինի {{ limit }} կամ ավել սիմվոլներ.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Արժեքը պետ է լինի {{ limit }} կամ շատ.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Արժեքը չափազանց կարճ է: Պետք է լինի {{ limit }} կամ ավելի սիմվոլներ.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Արժեքը չպետք է դատարկ լինի.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Արժեքը չպետք է լինի null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Արժեքը պետք է լինի null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Անթույլատրելի արժեք.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ժամանակի արժեքը անթույլատրելի է.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Արժեքը  URL  չէ.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Երկու արժեքները պետք է նույնը լինեն.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ֆայլը չափազանց մեծ է: Մաքսիմալ թույլատրելի չափսը {{ limit }} {{ suffix }} է.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Ֆայլը չափազանց մեծ է.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Ֆայլը չի կարող բեռնվել.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Արժեքը պետք է լինի թիվ.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>Արժեքը պետք է լինի երկիր.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>Ֆայլը նկարի թույլատրելի ֆորմատ չէ.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>Արժեքը թույլատրելի IP հասցե չէ.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>Արժեքը թույլատրելի լեզու չէ.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid locale.</source>
-                <target>Արժեքը չի հանդիսանում թույլատրելի տեղայնացում.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Այդ արժեքը արդեն օգտագործվում է.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Նկարի չափսերը չստացվեց որոշել.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Նկարի լայնությունը չափազանց մեծ է({{ width }}px). Մաքսիմալ չափն է {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Նկարի լայնությունը չափազանց փոքր է ({{ width }}px). Մինիմալ չափն է {{ min_ width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Նկարի բարձրությունը չափազանց մեծ է ({{ height }}px). Մաքսիմալ չափն է {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Նկարի բարձրությունը չափազանց փոքր է ({{ height }}px). Մինիմալ չափն է {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Այս արժեքը պետք է լինի օգտագործողի ներկա ծածկագիրը.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Այս արժեքը պետք է ունենա ճիշտ {{ limit }} սիմվոլներ.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.id.xlf b/vendor/symfony/validator/Resources/translations/validators.id.xlf
deleted file mode 100644
index 742f4a1..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.id.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Nilai ini harus bernilai salah.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Nilai ini harus bernilai benar.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Nilai ini harus bertipe {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Nilai ini harus kosong.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Nilai yang dipilih tidak tepat.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Anda harus memilih paling tidak {{ limit }} pilihan.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Anda harus memilih paling banyak {{ limit }} pilihan.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Satu atau lebih nilai yang diberikan tidak sah.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Bidang ini tidak diharapkan.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Bidang ini hilang.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Nilai ini bukan merupakan tanggal yang sah.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Nilai ini bukan merupakan tanggal dan waktu yang sah.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Nilai ini bukan alamat email yang sah.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Berkas tidak ditemukan.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Berkas tidak bisa dibaca.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ukuran berkas terlalu besar ({{ size }} {{ suffix }}). Ukuran maksimum yang diizinkan adalah {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Jenis berkas ({{ type }}) tidak sah. Jenis berkas yang diijinkan adalah {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Nilai ini harus {{ limit }} atau kurang.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Nilai ini terlalu panjang. Seharusnya {{ limit }} karakter atau kurang.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Nilai ini harus {{ limit }} atau lebih.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Nilai ini terlalu pendek. Seharusnya {{ limit }} karakter atau lebih.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Nilai ini tidak boleh kosong.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Nilai ini tidak boleh 'null'.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Nilai ini harus 'null'.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Nilai ini tidak sah.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Nilai ini bukan merupakan waktu yang sah.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Nilai ini bukan URL yang sah.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Isi keduanya harus sama.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ukuran berkas terlalu besar. Ukuran maksimum yang diijinkan adalah {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Ukuran berkas terlalu besar.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Berkas tidak dapat diunggah.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Nilai ini harus angka yang sah.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Berkas ini tidak termasuk gambar.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Ini bukan alamat IP yang sah.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Nilai ini bukan bahasa yang sah.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Nilai ini bukan lokal yang sah.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Nilai ini bukan negara yang sah.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Nilai ini sudah digunakan.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Ukuran dari gambar tidak bisa dideteksi.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Lebar gambar terlalu besar ({{ width }}px). Ukuran lebar maksimum adalah {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Lebar gambar terlalu kecil ({{ width }}px). Ukuran lebar minimum yang diharapkan adalah {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Tinggi gambar terlalu besar ({{ height }}px). Ukuran tinggi maksimum adalah {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Tinggi gambar terlalu kecil ({{ height }}px). Ukuran tinggi minimum yang diharapkan adalah {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Nilai ini harus kata sandi pengguna saat ini.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Nilai ini harus memiliki tepat {{ limit }} karakter.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Berkas hanya terunggah sebagian.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Tidak ada berkas terunggah.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Direktori sementara tidak dikonfiguasi pada php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Tidak dapat menuliskan berkas sementara ke dalam media penyimpanan.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Sebuah ekstensi PHP menyebabkan kegagalan unggah.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Kumpulan ini harus memiliki {{ limit }} elemen atau lebih.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Kumpulan ini harus memiliki kurang dari {{ limit }} elemen.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Kumpulan ini harus memiliki tepat {{ limit }} elemen.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Nomor kartu tidak sah.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Jenis kartu tidak didukung atau nomor kartu tidak sah.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Ini bukan Nomor Rekening Bank Internasional (IBAN) yang sah.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Nilai ini bukan ISBN-10 yang sah.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Nilai ini bukan ISBN-13 yang sah.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Nilai ini bukan ISBN-10 maupun ISBN-13 yang sah.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Nilai ini bukan ISSN yang sah.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Nilai ini bukan mata uang yang sah.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya sama dengan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya lebih dari {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya lebih dari atau sama dengan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya identik dengan {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya kurang dari {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya kurang dari atau sama dengan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya tidak sama dengan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Nilai ini seharusnya tidak identik dengan {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.it.xlf b/vendor/symfony/validator/Resources/translations/validators.it.xlf
deleted file mode 100644
index 38e437d..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.it.xlf
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Questo valore dovrebbe essere falso.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Questo valore dovrebbe essere vero.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Questo valore dovrebbe essere di tipo {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Questo valore dovrebbe essere vuoto.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Questo valore dovrebbe essere una delle opzioni disponibili.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Si dovrebbe selezionare almeno {{ limit }} opzione.|Si dovrebbero selezionare almeno {{ limit }} opzioni.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Si dovrebbe selezionare al massimo {{ limit }} opzione.|Si dovrebbero selezionare al massimo {{ limit }} opzioni.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Uno o più valori inseriti non sono validi.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Questo campo non è stato previsto.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Questo campo è mancante.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Questo valore non è una data valida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Questo valore non è una data e ora valida.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Questo valore non è un indirizzo email valido.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Non è stato possibile trovare il file.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Il file non è leggibile.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Il file è troppo grande ({{ size }} {{ suffix }}). La dimensione massima consentita è {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Il mime type del file non è valido ({{ type }}). I tipi permessi sono {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Questo valore dovrebbe essere {{ limit }} o inferiore.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Questo valore è troppo lungo. Dovrebbe essere al massimo di {{ limit }} carattere.|Questo valore è troppo lungo. Dovrebbe essere al massimo di {{ limit }} caratteri.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Questo valore dovrebbe essere {{ limit }} o superiore.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Questo valore è troppo corto. Dovrebbe essere almeno di {{ limit }} carattere.|Questo valore è troppo corto. Dovrebbe essere almeno di {{ limit }} caratteri.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Questo valore non dovrebbe essere vuoto.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Questo valore non dovrebbe essere nullo.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Questo valore dovrebbe essere nullo.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Questo valore non è valido.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Questo valore non è un'ora valida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Questo valore non è un URL valido.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>I due valori dovrebbero essere uguali.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Il file è troppo grande. La dimensione massima è {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Il file è troppo grande.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Il file non può essere caricato.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Questo valore dovrebbe essere un numero.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Questo file non è una immagine valida.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Questo valore non è un indirizzo IP valido.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Questo valore non è una lingua valida.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Questo valore non è una impostazione regionale valida.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Questo valore non è una nazione valida.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Questo valore è già stato utilizzato.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>La dimensione dell'immagine non può essere determinata.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>La larghezza dell'immagine è troppo grande ({{ width }}px). La larghezza massima è di {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>La larghezza dell'immagine è troppo piccola ({{ width }}px). La larghezza minima è di {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>L'altezza dell'immagine è troppo grande ({{ height }}px). L'altezza massima è di {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>L'altezza dell'immagine è troppo piccola ({{ height }}px). L'altezza minima è di {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Questo valore dovrebbe essere la password attuale dell'utente.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Questo valore dovrebbe contenere esattamente {{ limit }} carattere.|Questo valore dovrebbe contenere esattamente {{ limit }} caratteri.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Il file è stato caricato solo parzialmente.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nessun file è stato caricato.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nessuna cartella temporanea è stata configurata nel php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Impossibile scrivere il file temporaneo sul disco.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Un'estensione PHP ha causato il fallimento del caricamento.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Questa collezione dovrebbe contenere almeno {{ limit }} elemento.|Questa collezione dovrebbe contenere almeno {{ limit }} elementi.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Questa collezione dovrebbe contenere massimo {{ limit }} elemento.|Questa collezione dovrebbe contenere massimo {{ limit }} elementi.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Questa collezione dovrebbe contenere esattamente {{ limit }} elemento.|Questa collezione dovrebbe contenere esattamente {{ limit }} elementi.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Numero di carta non valido.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipo di carta non supportato o numero non valido.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Questo valore non è un IBAN (International Bank Account Number) valido.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Questo valore non è un codice ISBN-10 valido.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Questo valore non è un codice ISBN-13 valido.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Questo valore non è un codice ISBN-10 o ISBN-13 valido.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Questo valore non è un codice ISSN valido.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Questo valore non è una valuta valida.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere uguale a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere maggiore di {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere maggiore o uguale a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere identico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere minore di {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere minore o uguale a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere diverso da {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Questo valore dovrebbe essere diverso da {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Il rapporto di aspetto dell'immagine è troppo grande ({{ ratio }}). Il rapporto massimo consentito è {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Il rapporto di aspetto dell'immagine è troppo piccolo ({{ ratio }}). Il rapporto minimo consentito è {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>L'immagine è quadrata ({{ width }}x{{ height }}px). Le immagini quadrate non sono consentite.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>L'immagine è orizzontale ({{ width }}x{{ height }}px). Le immagini orizzontali non sono consentite.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>L'immagine è verticale ({{ width }}x{{ height }}px). Le immagini verticali non sono consentite.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Un file vuoto non è consentito.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>L'host non può essere risolto.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Questo valore non corrisponde al charset {{ charset }}.</target>
-            </trans-unit>
-            <trans-unit id="81">
-                <source>This is not a valid Business Identifier Code (BIC).</source>
-                <target>Questo valore non è un codice BIC valido.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ja.xlf b/vendor/symfony/validator/Resources/translations/validators.ja.xlf
deleted file mode 100644
index a58f5b8..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.ja.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>falseでなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>trueでなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>型は{{ type }}でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>空でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>有効な選択肢ではありません。</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>{{ limit }}個以上選択してください。</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>{{ limit }}個以内で選択してください。</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>無効な選択肢が含まれています。</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>このフィールドは予期されていませんでした。</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>このフィールドは、欠落しています。</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>有効な日付ではありません。</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>有効な日時ではありません。</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>有効なメールアドレスではありません。</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>ファイルが見つかりません。</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>ファイルを読み込めません。</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>ファイルのサイズが大きすぎます({{ size }} {{ suffix }})。有効な最大サイズは{{ limit }} {{ suffix }}です。</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>ファイルのMIMEタイプが無効です({{ type }})。有効なMIMEタイプは{{ types }}です。</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>{{ limit }}以下でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>値が長すぎます。{{ limit }}文字以内でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>{{ limit }}以上でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>値が短すぎます。{{ limit }}文字以上でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>空であってはなりません。</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>nullであってはなりません。</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>nullでなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>有効な値ではありません。</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>有効な時刻ではありません。</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>有効なURLではありません。</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>2つの値が同じでなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>ファイルのサイズが大きすぎます。有効な最大サイズは{{ limit }} {{ suffix }}です。</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>ファイルのサイズが大きすぎます。</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>ファイルをアップロードできませんでした。</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>有効な数字ではありません。</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>ファイルが画像ではありません。</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>有効なIPアドレスではありません。</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>有効な言語名ではありません。</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>有効なロケールではありません。</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>有効な国名ではありません。</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>既に使用されています。</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>画像のサイズが検出できません。</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>画像の幅が大きすぎます({{ width }}ピクセル)。{{ max_width }}ピクセルまでにしてください。</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>画像の幅が小さすぎます({{ width }}ピクセル)。{{ min_width }}ピクセル以上にしてください。</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>画像の高さが大きすぎます({{ height }}ピクセル)。{{ max_height }}ピクセルまでにしてください。</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>画像の高さが小さすぎます({{ height }}ピクセル)。{{ min_height }}ピクセル以上にしてください。</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>ユーザーの現在のパスワードでなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>ちょうど{{ limit }}文字でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>ファイルのアップロードは完全ではありません。</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>ファイルがアップロードされていません。</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>php.iniで一時フォルダが設定されていません。</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>一時ファイルをディスクに書き込むことができません。</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP拡張によってアップロードに失敗しました。</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>{{ limit }}個以上の要素を含んでなければいけません。</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>要素は{{ limit }}個までです。</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>要素はちょうど{{ limit }}個でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>無効なカード番号です。</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>未対応のカード種類又は無効なカード番号です。</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>有効なIBANコードではありません。</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>有効なISBN-10コードではありません。</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>有効なISBN-13コードではありません。</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>有効なISBN-10コード又はISBN-13コードではありません。</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>有効なISSNコードではありません。</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>有効な貨幣ではありません。</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>{{ compared_value }}と等しくなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>{{ compared_value }}より大きくなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>{{ compared_value }}以上でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>{{ compared_value_type }}としての{{ compared_value }}と等しくなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>{{ compared_value }}未満でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>{{ compared_value }}以下でなければなりません。</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>{{ compared_value }}と等しくてはいけません。</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>{{ compared_value_type }}としての{{ compared_value }}と等しくてはいけません。</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>画像のアスペクト比が大きすぎます({{ ratio }})。{{ max_ratio }}までにしてください。</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>画像のアスペクト比が小さすぎます({{ ratio }})。{{ min_ratio }}以上にしてください。</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>画像が正方形になっています({{ width }}x{{ height }}ピクセル)。正方形の画像は許可されていません。</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>画像が横向きになっています({{ width }}x{{ height }}ピクセル)。横向きの画像は許可されていません。</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>画像が縦向きになっています({{ width }}x{{ height }}ピクセル)。縦向きの画像は許可されていません。</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>空のファイルは許可されていません。</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>ホストを解決できませんでした。</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>この値は予期される文字コード（{{ charset }}）と異なります。</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.lb.xlf b/vendor/symfony/validator/Resources/translations/validators.lb.xlf
deleted file mode 100644
index 8281c7c..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.lb.xlf
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Dëse Wäert sollt falsch sinn.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Dëse Wäert sollt wouer sinn.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Dëse Wäert sollt vum Typ {{ type }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Dëse Wäert sollt eidel sinn.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Dëse Wäert sollt enger vun de Wielméiglechkeeten entspriechen.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Dir sollt mindestens {{ limit }} Méiglechkeete wielen.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Dir sollt héchstens {{ limit }} Méiglechkeete wielen.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Een oder méi vun de Wäerter ass ongëlteg.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>The fields {{ fields }} were not expected.</source>
-                <target>D'Felder {{ fields }} goufen net erwaart.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>The fields {{ fields }} are missing.</source>
-                <target>D'Felder {{ fields }} feelen.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Dëse Wäert entsprécht kenger gëlteger Datumsangab.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Dëse Wäert entsprécht kenger gëlteger Datums- an Zäitangab.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Dëse Wäert ass keng gëlteg Email-Adress.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>De Fichier gouf net fonnt.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>De Fichier ass net liesbar.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>De Fichier ass ze grouss ({{ size }} {{ suffix }}). Déi zougeloosse Maximalgréisst bedréit {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Den Typ vum Fichier ass ongëlteg ({{ type }}). Erlaabten Type sinn {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Dëse Wäert soll méi kleng oder gläich {{ limit }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Dës Zeecheketten ass ze laang. Se sollt héchstens {{ limit }} Zeechen hunn.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Dëse Wäert sollt méi grouss oder gläich {{ limit }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Dës Zeecheketten ass ze kuerz. Se sollt mindestens {{ limit }} Zeechen hunn.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Dëse Wäert sollt net eidel sinn.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Dëst sollt keen Null-Wäert sinn.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Dëst sollt keen Null-Wäert sinn.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Dëse Wäert ass net gëlteg.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Dëse Wäert entsprécht kenger gëlteger Zäitangab.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Dëse Wäert ass keng gëlteg URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Béid Wäerter sollten identesch sinn.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>De fichier ass ze grouss. Déi maximal Gréisst dierf {{ limit }} {{ suffix }} net depasséieren.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>De Fichier ass ze grouss.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>De Fichier konnt net eropgeluede ginn.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Dëse Wäert sollt eng gëlteg Zuel sinn.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Dëse Fichier ass kee gëltegt Bild.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dëst ass keng gëlteg IP-Adress.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Dëse Wäert aentsprécht kenger gëlteger Sprooch.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Dëse Wäert entsprécht kengem gëltege Gebittsschema.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Dëse Wäert entsprécht kengem gëltege Land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Dëse Wäert gëtt scho benotzt.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>D'Gréisst vum Bild konnt net detektéiert ginn.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>D'Breet vum Bild ass ze grouss ({{ width }}px). Déi erlaabte maximal Breet ass {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>D'Breet vum Bild ass ze kleng ({{ width }}px). Déi minimal Breet ass {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>D'Héicht vum Bild ass ze grouss ({{ height }}px). Déi erlaabte maximal Héicht ass {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>D'Héicht vum Bild ass ze kleng ({{ height }}px). Déi minimal Héicht ass {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Dëse Wäert sollt dem aktuelle Benotzerpasswuert entspriechen.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Dëse Wäert sollt exactly {{ limit }} Buschtaf hunn.|Dëse Wäert sollt exakt {{ limit }} Buschtawen hunn.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>De Fichier gouf just deelweis eropgelueden.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Et gouf kee Fichier eropgelueden.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Et gouf keen temporären Dossier an der php.ini konfiguréiert.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Den temporäre Fichier kann net gespäichert ginn.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Eng PHP-Erweiderung huet den Upload verhënnert.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Dës Sammlung sollt {{ limit }} oder méi Elementer hunn.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Dës Sammlung sollt {{ limit }} oder manner Elementer hunn.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Dës Sammlung sollt exakt {{ limit }} Element hunn.|Dës Sammlung sollt exakt {{ limit }} Elementer hunn.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ongëlteg Kaartennummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Net ënnerstëtzte Kaartentyp oder ongëlteg Kaartennummer.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Dëst ass keng gëlteg IBAN-Kontonummer.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Dëse Wäert ass keng gëlteg ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Dëse Wäert ass keng gëlteg ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Dëse Wäert ass weder eng gëlteg ISBN-10 nach eng gëlteg ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Dëse Wäert ass keng gëlteg ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Dëse Wäert ass keng gëlteg Währung.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt méi grouss wéi {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt méi grouss wéi oder gläich {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt identesch si mat {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt méi kleng wéi {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt méi kleng wéi oder gläich {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt net {{ compared_value }} sinn.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Dëse Wäert sollt net identesch si mat {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>D'Säiteverhältnis vum Bild ass ze grouss ({{ ratio }}). Den erlaabte Maximalwäert ass {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>D'Säiteverhältnis vum Bild ass ze kleng ({{ ratio }}). Den erwaarte Minimalwäert ass {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>D'Bild ass quadratesch ({{ width }}x{{ height }}px). Quadratesch Biller sinn net erlaabt.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>D'Bild ass am Queeschformat ({{ width }}x{{ height }}px). Biller am Queeschformat sinn net erlaabt.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>D'Bild ass am Héichformat ({{ width }}x{{ height }}px). Biller am Héichformat sinn net erlaabt.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.lt.xlf b/vendor/symfony/validator/Resources/translations/validators.lt.xlf
deleted file mode 100644
index a556c45..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.lt.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Reikšmė turi būti neigiama.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Reikšmė turi būti teigiama.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Šios reikšmės tipas turi būti {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Ši reikšmė turi būti tuščia.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Neteisingas pasirinkimas.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Turite pasirinkti bent {{ limit }} variantą.|Turite pasirinkti bent {{ limit }} variantus.|Turite pasirinkti bent {{ limit }} variantų.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Turite pasirinkti ne daugiau kaip {{ limit }} variantą.|Turite pasirinkti ne daugiau kaip {{ limit }} variantus.|Turite pasirinkti ne daugiau kaip {{ limit }} variantų.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Viena ar daugiau įvestų reikšmių yra netinkamos.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Nebuvo tikimasi Šis laukas.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Šiame lauke yra dingęs.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Ši reikšmė nėra data.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ši reikšmė nera data ir laikas.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Ši reikšmė nėra tinkamas el. pašto adresas.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Byla nerasta.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Negalima nuskaityti bylos.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Byla yra per didelė ({{ size }} {{ suffix }}). Maksimalus dydis {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Netinkamas bylos tipas (mime type) ({{ type }}). Galimi bylų tipai {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Reikšmė turi būti {{ limit }} arba mažiau.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.|Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.|Per didelis simbolių skaičius. Turi susidaryti iš {{ limit }} arba mažiau simbolių.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Reikšmė turi būti {{ limit }} arba daugiau.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.|Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.|Per mažas simbolių skaičius. Turi susidaryti iš {{ limit }} arba daugiau simbolių.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ši reikšmė negali būti tuščia.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ši reikšmė negali būti null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Ši reikšmė turi būti null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Netinkama reikšmė.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ši reikšmė nėra laikas.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Ši reikšmė nėra tinkamas interneto adresas.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Abi reikšmės turi būti identiškos.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Byla yra per didelė. Maksimalus dydis yra {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Byla per didelė.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Byla negali būti įkelta.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Ši reikšmė turi būti skaičius.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>Ši reikšmė nėra tinkama šalis.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>Byla nėra paveikslėlis.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>Ši reikšmė nėra tinkamas IP adresas.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>Ši reikšmė nėra tinkama kalba.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid locale.</source>
-                <target>Ši reikšmė nėra tinkama lokalė.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Ši reikšmė jau yra naudojama.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Nepavyko nustatyti nuotraukos dydžio.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Nuotraukos plotis per didelis ({{ width }}px). Maksimalus leidžiamas plotis yra {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Nuotraukos plotis per mažas ({{ width }}px). Minimalus leidžiamas plotis yra {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Nuotraukos aukštis per didelis ({{ height }}px). Maksimalus leidžiamas aukštis yra {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Nuotraukos aukštis per mažas ({{ height }}px). Minimalus leidžiamas aukštis yra {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Ši reikšmė turi sutapti su dabartiniu naudotojo slaptažodžiu.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Ši reikšmė turi turėti lygiai {{ limit }} simbolį.|Ši reikšmė turi turėti lygiai {{ limit }} simbolius.|Ši reikšmė turi turėti lygiai {{ limit }} simbolių.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Failas buvo tik dalinai įkeltas.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nebuvo įkelta jokių failų.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nėra sukonfiguruoto jokio laikino katalogo php.ini faile.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Nepavyko išsaugoti laikino failo.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP plėtinys sutrukdė failo įkėlimą ir jis nepavyko.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Sąraše turi būti {{ limit }} arba daugiau įrašų.|Sąraše turi būti {{ limit }} arba daugiau įrašų.|Sąraše turi būti {{ limit }} arba daugiau įrašų.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Sąraše turi būti {{ limit }} arba mažiau įrašų.|Sąraše turi būti {{ limit }} arba mažiau įrašų.|Sąraše turi būti {{ limit }} arba mažiau įrašų.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Sąraše turi būti lygiai {{ limit }} įrašas.|Sąraše turi būti lygiai {{ limit }} įrašai.|Sąraše turi būti lygiai {{ limit }} įrašų.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Klaidingas kortelės numeris.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Kortelės tipas nepalaikomas arba klaidingas kortelės numeris.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Ši reišmė neatitinka tarptautinio banko sąskaitos numerio formato (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ši reikšmė neatitinka ISBN-10 formato.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ši reikšmė neatitinka ISBN-13 formato.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ši reikšmė neatitinka nei ISBN-10, nei ISBN-13 formato.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ši reišmė neatitinka ISSN formato.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Netinkamas valiutos formatas.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti lygi {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti didesnė už {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti didesnė už arba lygi {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti identiška {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti mažesnė už {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ši reikšmė turi būti mažesnė už arba lygi {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ši reikšmė neturi būti lygi {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ši reikšmė neturi būti identiška {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Nuotraukos santykis yra per didelis ({{ ratio }}). Didžiausias leistinas santykis yra {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Nuotraukos santykis yra per mažas ({{ ratio }}). Mažiausias leistinas santykis yra {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Nuotrauka yra kvadratinė ({{ width }}x{{ height }}px). Kvadratinės nuotraukos nėra leistinos.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Nuotrauka orientuota į plotį ({{ width }}x{{ height }}px). Nuotraukos orientuotos į plotį nėra leistinos.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Nuotrauka orientuota į aukštį ({{ width }}x{{ height }}px). Nuotraukos orientuotos į aukštį nėra leistinos.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Failas negali būti tuščias.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.mn.xlf b/vendor/symfony/validator/Resources/translations/validators.mn.xlf
deleted file mode 100644
index dfe7eeb..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.mn.xlf
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Энэ утга буруу байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Энэ утга үнэн байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Энэ утга  {{ type }} -н төрөл байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Энэ утга хоосон байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Сонгосон утга буруу байна.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Хамгийн багадаа {{ limit }} утга сонгогдсон байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Хамгийн ихдээ {{ limit }} утга сонгогдох боломжтой.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Өгөгдсөн нэг эсвэл нэгээс олон утга буруу байна.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Энэ талбар нь хүлээгдэж байсан юм.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Энэ талбар нь алга болсон байна.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Энэ утга буруу date төрөл байна .</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Энэ утга буруу цаг төрөл байна.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>И-майл хаяг буруу байна.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Файл олдсонгүй.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Файл уншигдахуйц биш байна.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл хэтэрхий том байна ({{ size }} {{ suffix }}). Зөвшөөрөгдөх дээд хэмжээ  {{ limit }} {{ suffix }} байна.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Файлын MIME-төрөл нь буруу байна ({{ type }}). Зөвшөөрөгдөх MIME-төрлүүд {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Энэ утга  {{ limit }} юмуу эсвэл бага байна.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Энэ утга хэтэрхий урт байна. {{ limit }} тэмдэгтийн урттай юмуу эсвэл бага байна.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Энэ утга {{ limit }} юмуу эсвэл их байна.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Энэ утга хэтэрхий богино байна. {{ limit }} тэмдэгт эсвэл их байна.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Энэ утга хоосон байж болохгүй.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Энэ утга null байж болохгүй.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Энэ утга null байна.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Энэ утга буруу байна.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Энэ утга буруу цаг төрөл байна.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Энэ утга буруу URL байна .</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Хоёр утгууд ижил байх ёстой.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл хэтэрхий том байна. Зөвшөөрөгдөх дээд хэмжээ нь {{ limit }} {{ suffix }} байна.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Файл хэтэрхий том байна.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Файл upload хийгдсэнгүй.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Энэ утга зөвхөн тоо байна.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>Энэ утга үнэн бодит улс биш байна.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>Файл зураг биш байна.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>IP хаяг зөв биш байна.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>Энэ утга үнэн зөв хэл биш байна .</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.nb.xlf b/vendor/symfony/validator/Resources/translations/validators.nb.xlf
deleted file mode 100644
index a8b790c..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.nb.xlf
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Verdien skal være falsk.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Verdien skal være sann.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Verdien skal være av typen {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Verdien skal være blank.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Verdien skal være en av de gitte valg.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Du skal velge minst {{ limit }} valg.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Du kan maks velge {{ limit }} valg.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>En eller flere av de oppgitte verdier er ugyldige.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Dette feltet ikke var forventet.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Dette feltet mangler.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Verdien er ikke en gyldig dato.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Verdien er ikke en gyldig dato og tid.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Verdien er ikke en gyldig e-mail adresse.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Filen kunne ikke finnes.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Filen kan ikke leses.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen er for stor ({{ size }} {{ suffix }}). Tilatte maksimale størrelse {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mimetypen av filen er ugyldig ({{ type }}). Tilatte mimetyper er {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Verdien skal være {{ limit }} eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Verdien er for lang. Den skal ha {{ limit }} bokstaver eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Verdien skal være {{ limit }} eller mer.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Verdien er for kort. Den skal ha {{ limit }} tegn eller flere.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Verdien må ikke være blank.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Verdien må ikke være tom (null).</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Verdien skal være tom (null).</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Verdien er ikke gyldig.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Verdien er ikke en gyldig tid.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Verdien er ikke en gyldig URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>De to verdier skal være ens.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Filen er for stor.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Filen kunne ikke lastes opp.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Denne verdi skal være et gyldig tall.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Denne filen er ikke et gyldig bilde.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dette er ikke en gyldig IP adresse.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Denne verdi er ikke et gyldig språk.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Denne verdi er ikke en gyldig lokalitet.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Denne verdi er ikke et gyldig land.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.nl.xlf b/vendor/symfony/validator/Resources/translations/validators.nl.xlf
deleted file mode 100644
index fe33469..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.nl.xlf
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Deze waarde mag niet waar zijn.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Deze waarde moet waar zijn.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Deze waarde moet van het type {{ type }} zijn.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Deze waarde moet leeg zijn.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>De geselecteerde waarde is geen geldige optie.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Selecteer ten minste {{ limit }} optie.|Selecteer ten minste {{ limit }} opties.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Selecteer maximaal {{ limit }} optie.|Selecteer maximaal {{ limit }} opties.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Eén of meer van de ingegeven waarden zijn ongeldig.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Dit veld was niet verwacht.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Dit veld ontbreekt.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Deze waarde is geen geldige datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Deze waarde is geen geldige datum en tijd.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Deze waarde is geen geldig e-mailadres.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Het bestand is niet gevonden.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Het bestand is niet leesbaar.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Het bestand is te groot ({{ size }} {{ suffix }}). Toegestane maximum grootte is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Het mime type van het bestand is ongeldig ({{ type }}). Toegestane mime types zijn {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Deze waarde moet {{ limit }} of minder zijn.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Deze waarde is te lang. Hij mag maximaal {{ limit }} teken bevatten.|Deze waarde is te lang. Hij mag maximaal {{ limit }} tekens bevatten.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Deze waarde moet {{ limit }} of meer zijn.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Deze waarde is te kort. Hij moet tenminste {{ limit }} teken bevatten.|Deze waarde is te kort. Hij moet tenminste {{ limit }} tekens bevatten.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Deze waarde mag niet leeg zijn.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Deze waarde mag niet null zijn.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Deze waarde moet null zijn.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Deze waarde is ongeldig.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Deze waarde is geen geldige tijd.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Deze waarde is geen geldige URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>De twee waarden moeten gelijk zijn.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Het bestand is te groot. Toegestane maximum grootte is {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Het bestand is te groot.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Het bestand kon niet geüpload worden.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Deze waarde moet een geldig getal zijn.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Dit bestand is geen geldige afbeelding.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dit is geen geldig IP-adres.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Deze waarde representeert geen geldige taal.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Deze waarde representeert geen geldige lokalisering.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Deze waarde representeert geen geldig land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Deze waarde wordt al gebruikt.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>De grootte van de afbeelding kon niet bepaald worden.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>De afbeelding is te breed ({{ width }}px). De maximaal toegestane breedte is {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>De afbeelding is niet breed genoeg ({{ width }}px). De minimaal verwachte breedte is {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>De afbeelding is te hoog ({{ height }}px). De maximaal toegestane hoogte is {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>De afbeelding is niet hoog genoeg ({{ height }}px). De minimaal verwachte hoogte is {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Deze waarde moet het huidige wachtwoord van de gebruiker zijn.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Deze waarde moet exact {{ limit }} teken lang zijn.|Deze waarde moet exact {{ limit }} tekens lang zijn.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Het bestand is niet geheel geüpload.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Er is geen bestand geüpload.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Er is geen tijdelijke map geconfigureerd in php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kan het tijdelijke bestand niet wegschrijven op disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>De upload is mislukt vanwege een PHP-extensie.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Deze collectie moet {{ limit }} element of meer bevatten.|Deze collectie moet {{ limit }} elementen of meer bevatten.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Deze collectie moet {{ limit }} element of minder bevatten.|Deze collectie moet {{ limit }} elementen of minder bevatten.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Deze collectie moet exact {{ limit }} element bevatten.|Deze collectie moet exact {{ limit }} elementen bevatten.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ongeldig creditcardnummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Niet-ondersteund type creditcard of ongeldig nummer.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Dit is geen geldig internationaal bankrekeningnummer (IBAN).</target>
-            </trans-unit>
-             <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Deze waarde is geen geldige ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Deze waarde is geen geldige ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Deze waarde is geen geldige ISBN-10 of ISBN-13 waarde.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Deze waarde is geen geldige ISSN waarde.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Deze waarde is geen geldige valuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Deze waarde moet gelijk zijn aan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Deze waarde moet groter zijn dan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Deze waarde moet groter dan of gelijk aan {{ compared_value }} zijn.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Deze waarde moet identiek zijn aan {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Deze waarde moet minder zijn dan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Deze waarde moet minder dan of gelijk aan {{ compared_value }} zijn.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Deze waarde mag niet gelijk zijn aan {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Deze waarde mag niet identiek zijn aan {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>De afbeeldingsverhouding is te groot ({{ ratio }}). Maximale verhouding is {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>De afbeeldingsverhouding is te klein ({{ ratio }}). Minimale verhouding is {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>De afbeelding is vierkant ({{ width }}x{{ height }}px). Vierkante afbeeldingen zijn niet toegestaan.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>De afbeelding is liggend ({{ width }}x{{ height }}px). Liggende afbeeldingen zijn niet toegestaan.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>De afbeelding is staand ({{ width }}x{{ height }}px). Staande afbeeldingen zijn niet toegestaan.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Lege bestanden zijn niet toegestaan.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Deze waarde is niet in de verwachte tekencodering {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.no.xlf b/vendor/symfony/validator/Resources/translations/validators.no.xlf
deleted file mode 100644
index ea01c63..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.no.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Verdien skulle ha vore tom/nei.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Verdien skulla ha vore satt/ja.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Verdien må vere av typen {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Verdien skal vere blank.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Verdien du valgte er ikkje gyldig.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Du må velge minst {{ limit }} valg.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Du kan maksimalt gjere {{ limit }} valg.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Ein eller fleire av dei opplyste verdiane er ugyldige.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Dette feltet var ikke forventet.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Dette feltet mangler.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Verdien er ikkje ein gyldig dato.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Verdien er ikkje ein gyldig dato og tid.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Verdien er ikkje ei gyldig e-postadresse.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Fila kunne ikkje finnes.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Fila kan ikkje lesast.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fila er for stor ({{ size }} {{ suffix }}). Tillatt maksimal størrelse er {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mime-typen av fila er ugyldig ({{ type }}). Tillatte mime-typar er {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Verdien må vere {{ limit }} eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Verdien er for lang. Den må vere {{ limit }} bokstavar eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Verdien må vere {{ limit }} eller meir.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Verdien er for kort. Den må ha {{ limit }} teikn eller fleire.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Verdien må ikkje vere blank.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Verdien må ikkje vere tom (null).</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Verdien må vere tom (null).</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Verdien er ikkje gyldig.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Verdien er ikkje gyldig tidseining.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Verdien er ikkje ein gyldig URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Dei to verdiane må vere like.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fila er for stor. Den maksimale storleik er {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Fila er for stor.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Fila kunne ikkje bli lasta opp.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Verdien må vere eit gyldig tal.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Fila er ikkje eit gyldig bilete.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Dette er ikkje ei gyldig IP-adresse.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Verdien er ikkje eit gyldig språk.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Verdien er ikkje ein gyldig lokalitet (språk/region).</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Verdien er ikkje eit gyldig land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Verdien er allereie i bruk.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Storleiken på biletet kunne ikkje oppdagast.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Biletbreidda er for stor, ({{ width }} pikslar). Tillatt maksimumsbreidde er {{ max_width }} pikslar.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Biletbreidda er for liten, ({{ width }} pikslar). Forventa minimumsbreidde er {{ min_width }} pikslar.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Bilethøgda er for stor, ({{ height }} pikslar). Tillatt maksimumshøgde er {{ max_height }} pikslar.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Billethøgda er for låg, ({{ height }} pikslar). Forventa minimumshøgde er {{ min_height }} pikslar.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Verdien må vere brukaren sitt noverande passord.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Verdien må vere nøyaktig {{ limit }} teikn.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Fila vart kun delvis opplasta.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Inga fil vart lasta opp.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Førebels mappe (tmp) er ikkje konfigurert i php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kan ikkje skrive førebels fil til disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Ei PHP-udviding forårsaka feil under opplasting.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Denne samlinga må innehalde {{ limit }} element eller meir.|Denne samlinga må innehalde {{ limit }} element eller meir.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Denne samlinga må innehalde {{ limit }} element eller færre.|Denne samlinga må innehalde {{ limit }} element eller færre.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Denne samlinga må innehalde nøyaktig {{ limit }} element.|Denne samlinga må innehalde nøyaktig {{ limit }} element.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ugyldig kortnummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Korttypen er ikkje støtta eller ugyldig kortnummer.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.pl.xlf b/vendor/symfony/validator/Resources/translations/validators.pl.xlf
deleted file mode 100644
index 1d6875f..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.pl.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Ta wartość powinna być fałszem.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Ta wartość powinna być prawdą.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Ta wartość powinna być typu {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Ta wartość powinna być pusta.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Ta wartość powinna być jedną z podanych opcji.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Powinieneś wybrać co najmniej {{ limit }} opcję.|Powinieneś wybrać co najmniej {{ limit }} opcje.|Powinieneś wybrać co najmniej {{ limit }} opcji.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Powinieneś wybrać maksymalnie {{ limit }} opcję.|Powinieneś wybrać maksymalnie {{ limit }} opcje.|Powinieneś wybrać maksymalnie {{ limit }} opcji.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Jedna lub więcej z podanych wartości jest nieprawidłowa.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>To pole nie spodziewano.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>To pole jest chybianie.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Ta wartość nie jest prawidłową datą.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ta wartość nie jest prawidłową datą i czasem.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Ta wartość nie jest prawidłowym adresem email.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Plik nie mógł zostać odnaleziony.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Nie można odczytać pliku.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Plik jest za duży ({{ size }} {{ suffix }}). Maksymalny dozwolony rozmiar to {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Nieprawidłowy typ mime pliku ({{ type }}). Dozwolone typy mime to {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Ta wartość powinna wynosić {{ limit }} lub mniej.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Ta wartość jest zbyt długa. Powinna mieć {{ limit }} lub mniej znaków.|Ta wartość jest zbyt długa. Powinna mieć {{ limit }} lub mniej znaków.|Ta wartość jest zbyt długa. Powinna mieć {{ limit }} lub mniej znaków.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Ta wartość powinna wynosić {{ limit }} lub więcej.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Ta wartość jest zbyt krótka. Powinna mieć {{ limit }} lub więcej znaków.|Ta wartość jest zbyt krótka. Powinna mieć {{ limit }} lub więcej znaków.|Ta wartość jest zbyt krótka. Powinna mieć {{ limit }} lub więcej znaków.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ta wartość nie powinna być pusta.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ta wartość nie powinna być nullem.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Ta wartość powinna być nullem.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Ta wartość jest nieprawidłowa.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ta wartość nie jest prawidłowym czasem.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Ta wartość nie jest prawidłowym adresem URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Obie wartości powinny być równe.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Plik jest za duży. Maksymalny dozwolony rozmiar to {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Plik jest za duży.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Plik nie mógł być wgrany.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Ta wartość powinna być prawidłową liczbą.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ten plik nie jest obrazem.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>To nie jest prawidłowy adres IP.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Ta wartość nie jest prawidłowym językiem.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Ta wartość nie jest prawidłową lokalizacją.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Ta wartość nie jest prawidłową nazwą kraju.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Ta wartość jest już wykorzystywana.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Nie można wykryć rozmiaru obrazka.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Szerokość obrazka jest zbyt duża ({{ width }}px). Maksymalna dopuszczalna szerokość to {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Szerokość obrazka jest zbyt mała ({{ width }}px). Oczekiwana minimalna szerokość to {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Wysokość obrazka jest zbyt duża ({{ height }}px). Maksymalna dopuszczalna wysokość to {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Wysokość obrazka jest zbyt mała ({{ height }}px). Oczekiwana minimalna wysokość to {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Ta wartość powinna być aktualnym hasłem użytkownika.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Ta wartość powinna mieć dokładnie {{ limit }} znak.|Ta wartość powinna mieć dokładnie {{ limit }} znaki.|Ta wartość powinna mieć dokładnie {{ limit }} znaków.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Plik został wgrany tylko częściowo.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Żaden plik nie został wgrany.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nie skonfigurowano folderu tymczasowego w php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Nie można zapisać pliku tymczasowego na dysku.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Rozszerzenie PHP spowodowało błąd podczas wgrywania.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ten zbiór powinien zawierać {{ limit }} lub więcej elementów.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ten zbiór powinien zawierać {{ limit }} lub mniej elementów.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ten zbiór powinien zawierać dokładnie {{ limit }} element.|Ten zbiór powinien zawierać dokładnie {{ limit }} elementy.|Ten zbiór powinien zawierać dokładnie {{ limit }} elementów.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Nieprawidłowy numer karty.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nieobsługiwany rodzaj karty lub nieprawidłowy numer karty.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Nieprawidłowy międzynarodowy numer rachunku bankowego (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ta wartość nie jest prawidłowym numerem ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ta wartość nie jest prawidłowym numerem ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ta wartość nie jest prawidłowym numerem ISBN-10 ani ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ta wartość nie jest prawidłowym numerem ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ta wartość nie jest prawidłową walutą.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ta wartość powinna być równa {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ta wartość powinna być większa niż {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ta wartość powinna być większa bądź równa {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ta wartość powinna być identycznego typu {{ compared_value_type }} oraz wartości {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ta wartość powinna być mniejsza niż {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ta wartość powinna być mniejsza bądź równa {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ta wartość nie powinna być równa {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ta wartość nie powinna być identycznego typu {{ compared_value_type }} oraz wartości {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Proporcje obrazu są zbyt duże ({{ ratio }}). Maksymalne proporcje to {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Proporcje obrazu są zbyt małe ({{ ratio }}). Minimalne proporcje to {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Obraz jest kwadratem ({{ width }}x{{ height }}px). Kwadratowe obrazy nie są akceptowane.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Obraz jest panoramiczny ({{ width }}x{{ height }}px). Panoramiczne zdjęcia nie są akceptowane.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Obraz jest portretowy ({{ width }}x{{ height }}px). Portretowe zdjęcia nie są akceptowane.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Plik nie może być pusty.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Nazwa hosta nie została rozpoznana.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Ta wartość nie pasuje do oczekiwanego zestawu znaków {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.pt.xlf b/vendor/symfony/validator/Resources/translations/validators.pt.xlf
deleted file mode 100644
index d563c92..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.pt.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Este valor deveria ser falso.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Este valor deveria ser verdadeiro.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Este valor deveria ser do tipo {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Este valor deveria ser vazio.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>O valor selecionado não é uma opção válida.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Você deveria selecionar {{ limit }} opção no mínimo.|Você deveria selecionar {{ limit }} opções no mínimo.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Você deve selecionar, no máximo {{ limit }} opção.|Você deve selecionar, no máximo {{ limit }} opções.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Um ou mais dos valores introduzidos não são válidos.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Este campo não era esperado.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Este campo está faltando.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Este valor não é uma data válida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Este valor não é uma data-hora válida.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Este valor não é um endereço de e-mail válido.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>O arquivo não pôde ser encontrado.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>O arquivo não pôde ser lido.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é muito grande ({{ size }} {{ suffix }}). O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>O tipo mime do arquivo é inválido ({{ type }}). Os tipos mime permitidos são {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Este valor deveria ser {{ limit }} ou menor.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>O valor é muito longo. Deveria ter {{ limit }} caracteres ou menos.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Este valor deveria ser {{ limit }} ou mais.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>O valor é muito curto. Deveria de ter {{ limit }} caractere ou mais.|O valor é muito curto. Deveria de ter {{ limit }} caracteres ou mais.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Este valor não deveria ser branco/vazio.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Este valor não deveria ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Este valor deveria ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Este valor não é válido.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Este valor não é uma hora válida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Este valor não é um URL válido.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Os dois valores deveriam ser iguais.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>O ficheiro é muito grande.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Não foi possível carregar o ficheiro.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Este valor deveria de ser um número válido.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Este ficheiro não é uma imagem.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Este endereço de IP não é válido.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Este valor não é uma linguagem válida.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Este valor não é um 'locale' válido.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Este valor não é um País válido.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Este valor já está a ser usado.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>O tamanho da imagem não foi detetado.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>A largura da imagem ({{ width }}px) é muito grande. A largura máxima da imagem é: {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>A largura da imagem ({{ width }}px) é muito pequena. A largura miníma da imagem é de: {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>A altura da imagem ({{ height }}px) é muito grande. A altura máxima da imagem é de: {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>A altura da imagem ({{ height }}px) é muito pequena. A altura miníma da imagem é de: {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Este valor deveria de ser a password atual do utilizador.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Este valor tem de ter exatamente {{ limit }} carateres.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Só foi enviado parte do ficheiro.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nenhum ficheiro foi enviado.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Não existe nenhum directório temporária configurado no ficheiro php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Não foi possível escrever ficheiros temporários no disco.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Uma extensão PHP causou a falha no envio.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Esta coleção deve conter {{ limit }} elemento ou mais.|Esta coleção deve conter {{ limit }} elementos ou mais.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Esta coleção deve conter {{ limit }} elemento ou menos.|Esta coleção deve conter {{ limit }} elementos ou menos.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Esta coleção deve conter exatamente {{ limit }} elemento.|Esta coleção deve conter exatamente {{ limit }} elementos.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Número de cartão inválido.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipo de cartão não suportado ou número de cartão inválido.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Este não é um Número Internacional de Conta Bancária (IBAN) válido.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Este valor não é um ISBN-10 válido.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Este valor não é um ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Este valor não é um ISBN-10 ou ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Este valor não é um ISSN válido.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Este não é um valor monetário válido.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Este valor deve ser superior a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser igual ou superior a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor deve ser idêntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Este valor deve ser inferior a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser igual ou inferior a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Este valor não deve ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor não deve ser idêntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>O formato da imagem é muito grande ({{ ratio }}). O formato máximo é {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>O formato da imagem é muito pequeno ({{ ratio }}). O formato mínimo esperado é {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>A imagem é um quadrado ({{ width }}x{{ height }}px). Imagens quadradas não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>A imagem está orientada à paisagem ({{ width }}x{{ height }}px). Imagens orientadas à paisagem não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>A imagem está orientada ao retrato ({{ width }}x{{ height }}px). Imagens orientadas ao retrato não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Ficheiro vazio não é permitido.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.pt_BR.xlf b/vendor/symfony/validator/Resources/translations/validators.pt_BR.xlf
deleted file mode 100644
index bff91e3..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.pt_BR.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Este valor deve ser falso.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Este valor deve ser verdadeiro.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Este valor deve ser do tipo {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Este valor deve ser vazio.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>O valor selecionado não é uma opção válida.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Você deve selecionar, no mínimo, {{ limit }} opção.|Você deve selecionar, no mínimo, {{ limit }} opções.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Você deve selecionar, no máximo, {{ limit }} opção.|Você deve selecionar, no máximo, {{ limit }} opções.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Um ou mais valores informados são inválidos.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Este campo não era esperado.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Este campo está ausente.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Este valor não é uma data válida.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Este valor não é uma data e hora válida.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Este valor não é um endereço de e-mail válido.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>O arquivo não foi encontrado.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>O arquivo não pode ser lido.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é muito grande ({{ size }} {{ suffix }}). O tamanho máximo permitido é {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>O tipo mime do arquivo é inválido ({{ type }}). Os tipos mime permitidos são {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Este valor deve ser {{ limit }} ou menos.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Este valor é muito longo. Deve ter {{ limit }} caractere ou menos.|Este valor é muito longo. Deve ter {{ limit }} caracteres ou menos.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Este valor deve ser {{ limit }} ou mais.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Este valor é muito curto. Deve ter {{ limit }} caractere ou mais.|Este valor é muito curto. Deve ter {{ limit }} caracteres ou mais.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Este valor não deve ser vazio.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Este valor não deve ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Este valor deve ser nulo.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Este valor não é válido.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Este valor não é uma hora válida.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Este valor não é uma URL válida.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Os dois valores devem ser iguais.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>O arquivo é muito grande.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>O arquivo não pode ser enviado.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Este valor deve ser um número válido.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Este arquivo não é uma imagem válida.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Este não é um endereço de IP válido.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Este valor não é um idioma válido.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Este valor não é uma localidade válida.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Este valor não é um país válido.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Este valor já está sendo usado.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>O tamanho da imagem não pode ser detectado.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>A largura da imagem é muito grande ({{ width }}px). A largura máxima permitida é de {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>A largura da imagem é muito pequena ({{ width }}px). A largura mínima esperada é de {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>A altura da imagem é muito grande ({{ height }}px). A altura máxima permitida é de {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>A altura da imagem é muito pequena ({{ height }}px). A altura mínima esperada é de {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Este valor deve ser a senha atual do usuário.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Este valor deve ter exatamente {{ limit }} caractere.|Este valor deve ter exatamente {{ limit }} caracteres.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>O arquivo foi enviado apenas parcialmente.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nenhum arquivo foi enviado.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nenhum diretório temporário foi configurado no php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Não foi possível escrever o arquivo temporário no disco.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Uma extensão PHP fez com que o envio falhasse.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Esta coleção deve conter {{ limit }} elemento ou mais.|Esta coleção deve conter {{ limit }} elementos ou mais.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Esta coleção deve conter {{ limit }} elemento ou menos.|Esta coleção deve conter {{ limit }} elementos ou menos.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Esta coleção deve conter exatamente {{ limit }} elemento.|Esta coleção deve conter exatamente {{ limit }} elementos.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Número de cartão inválido.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipo de cartão não suportado ou número de cartão inválido.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Este não é um Número Internacional de Conta Bancária (IBAN) válido.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Este valor não é um ISBN-10 válido.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Este valor não é um ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Este valor não é um ISBN-10 e nem um ISBN-13 válido.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Este valor não é um ISSN válido.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Este não é um valor monetário válido.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Este valor deve ser maior que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser maior ou igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor deve ser idêntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Este valor deve ser menor que {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Este valor deve ser menor ou igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Este valor não deve ser igual a {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Este valor não deve ser idêntico a {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>A proporção da imagem é muito grande ({{ ratio }}). A proporção máxima permitida é {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>A proporção da imagem é muito pequena ({{ ratio }}). A proporção mínima esperada é {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>A imagem está num formato quadrado ({{ width }}x{{ height }}px). Imagens com formato quadrado não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>A imagem está orientada à paisagem ({{ width }}x{{ height }}px). Imagens orientadas à paisagem não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>A imagem está orientada ao retrato ({{ width }}x{{ height }}px). Imagens orientadas ao retrato não são permitidas.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Arquivo vazio não é permitido.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>O host não pôde ser resolvido.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Este valor não corresponde ao charset {{ charset }} esperado.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ro.xlf b/vendor/symfony/validator/Resources/translations/validators.ro.xlf
deleted file mode 100644
index 27346a9..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.ro.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Această valoare ar trebui să fie falsă (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Această valoare ar trebui să fie adevărată (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Această valoare ar trebui să fie de tipul {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Această valoare ar trebui sa fie goală.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Valoarea selectată nu este o opțiune validă.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Trebuie să selectați cel puțin {{ limit }} opțiune.|Trebuie să selectați cel puțin {{ limit }} opțiuni.|Trebuie să selectați cel puțin {{ limit }} de opțiuni</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Trebuie să selectați cel mult {{ limit }} opțiune.|Trebuie să selectați cel mult {{ limit }} opțiuni.|Trebuie să selectați cel mult {{ limit }} de opțiuni.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Una sau mai multe dintre valorile furnizate sunt invalide.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Acest câmp nu era de aşteptat.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Acest câmp este lipsă.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Această valoare nu reprezintă o dată validă.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Această valoare nu reprezintă o dată și oră validă.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Această valoare nu reprezintă o adresă de e-mail validă.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Fișierul nu a putut fi găsit.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Fișierul nu poate fi citit.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fișierul este prea mare ({{ size }} {{ suffix }}). Dimensiunea maximă permisă este {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Tipul fișierului este invalid ({{ type }}). Tipurile permise de fișiere sunt ({{ types }}).</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Această valoare ar trebui să fie cel mult {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} caracter.|Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} caractere.|Această valoare este prea lungă. Ar trebui să aibă maxim {{ limit }} de caractere.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Această valoare ar trebui să fie cel puțin {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} caracter.|Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} caractere.|Această valoare este prea scurtă. Ar trebui să aibă minim {{ limit }} de caractere.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Această valoare nu ar trebui să fie goală.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Această valoare nu ar trebui să fie nulă (null).</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Această valoare ar trebui să fie nulă (null).</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Această valoare nu este validă.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Această valoare nu reprezintă o oră validă.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Această valoare nu reprezintă un URL (link) valid.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Cele două valori ar trebui să fie egale.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Fișierul este prea mare. Mărimea maximă permisă este {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Fișierul este prea mare.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Fișierul nu a putut fi încărcat.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Această valoare nu reprezintă un număr valid.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Acest fișier nu este o imagine validă.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Această valoare nu este o adresă IP validă.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Această valoare nu reprezintă o limbă corectă.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Această valoare nu reprezintă un dialect (o limbă) corect.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Această valoare nu este o țară validă.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Această valoare este folosită deja.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Mărimea imaginii nu a putut fi detectată.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Lățimea imaginii este prea mare ({{ width }}px). Lățimea maximă permisă este de {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Lățimea imaginii este prea mică ({{ width }}px). Lățimea minimă permisă este de {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Înălțimea imaginii este prea mare ({{ height }}px). Înălțimea maximă permisă este de {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Înălțimea imaginii este prea mică ({{ height }}px). Înălțimea minimă permisă este de {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Această valoare trebuie să fie parola curentă a utilizatorului.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Această valoare trebuie să conțină exact {{ limit }} caracter.|Această valoare trebuie să conțină exact {{ limit }} caractere.|Această valoare trebuie să conțină exact {{ limit }} de caractere.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Fișierul a fost încărcat parțial.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nu a fost încărcat nici un fișier.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Nu este configurat nici un director temporar in php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Nu a fost posibilă scrierea fișierului temporar pe disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>O extensie PHP a prevenit încărcarea cu succes a fișierului.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Această colecție trebuie să conțină cel puțin {{ limit }} element.|Această colecție trebuie să conțină cel puțin {{ limit }} elemente.|Această colecție trebuie să conțină cel puțin {{ limit }} de elemente.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Această colecție trebuie să conțină cel mult {{ limit }} element.|Această colecție trebuie să conțină cel mult {{ limit }} elemente.|Această colecție trebuie să conțină cel mult {{ limit }} de elemente.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Această colecție trebuie să conțină {{ limit }} element.|Această colecție trebuie să conțină {{ limit }} elemente.|Această colecție trebuie să conțină {{ limit }} de elemente.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Numărul card invalid.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Tipul sau numărul cardului nu sunt valide.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Acesta nu este un cod IBAN (International Bank Account Number) valid.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Această valoare nu este un cod ISBN-10 valid.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Această valoare nu este un cod ISBN-13 valid.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Această valoare nu este un cod ISBN-10 sau ISBN-13 valid.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Această valoare nu este un cod ISSN valid.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Această valoare nu este o monedă validă.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Această valoare trebuie să fie egală cu {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Această valoare trebuie să fie mai mare de {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Această valoare trebuie să fie mai mare sau egală cu {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Această valoare trebuie identică cu {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Această valoare trebuie să fie mai mică de {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Această valoare trebuie să fie mai mică sau egală cu {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Această valoare nu trebuie să fie egală cu {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Această valoare nu trebuie să fie identică cu {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.ru.xlf b/vendor/symfony/validator/Resources/translations/validators.ru.xlf
deleted file mode 100644
index d7a90c9..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.ru.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Значение должно быть ложным.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Значение должно быть истинным.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Тип значения должен быть {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Значение должно быть пустым.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Выбранное Вами значение недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Вы должны выбрать хотя бы {{ limit }} вариант.|Вы должны выбрать хотя бы {{ limit }} варианта.|Вы должны выбрать хотя бы {{ limit }} вариантов.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Вы должны выбрать не более чем {{ limit }} вариант.|Вы должны выбрать не более чем {{ limit }} варианта.|Вы должны выбрать не более чем {{ limit }} вариантов.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Одно или несколько заданных значений недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Это поле не ожидалось.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Это поле отсутствует.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Значение не является правильной датой.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Значение даты и времени недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Значение адреса электронной почты недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Файл не может быть найден.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Файл не может быть прочитан.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл слишком большой ({{ size }} {{ suffix }}). Максимально допустимый размер {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>MIME-тип файла недопустим ({{ type }}). Допустимы MIME-типы файлов {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Значение должно быть {{ limit }} или меньше.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Значение слишком длинное. Должно быть равно {{ limit }} символу или меньше.|Значение слишком длинное. Должно быть равно {{ limit }} символам или меньше.|Значение слишком длинное. Должно быть равно {{ limit }} символам или меньше.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Значение должно быть {{ limit }} или больше.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Значение слишком короткое. Должно быть равно {{ limit }} символу или больше.|Значение слишком короткое. Должно быть равно {{ limit }} символам или больше.|Значение слишком короткое. Должно быть равно {{ limit }} символам или больше.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Значение не должно быть пустым.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Значение не должно быть null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Значение должно быть null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Значение недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Значение времени недопустимо.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Значение не является допустимым URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Оба значения должны быть одинаковыми.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл слишком большой. Максимально допустимый размер {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Файл слишком большой.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Файл не может быть загружен.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Значение должно быть числом.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>Значение не является допустимой страной.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>Файл не является допустимым форматом изображения.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>Значение не является допустимым IP адресом.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>Значение не является допустимым языком.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid locale.</source>
-                <target>Значение не является допустимой локалью.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Это значение уже используется.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Не удалось определить размер изображения.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Ширина изображения слишком велика ({{ width }}px). Максимально допустимая ширина {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Ширина изображения слишком мала ({{ width }}px). Минимально допустимая ширина {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Высота изображения слишком велика ({{ height }}px). Максимально допустимая высота {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Высота изображения слишком мала ({{ height }}px). Минимально допустимая высота {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Значение должно быть текущим паролем пользователя.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Значение должно быть равно {{ limit }} символу.|Значение должно быть равно {{ limit }} символам.|Значение должно быть равно {{ limit }} символам.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Файл был загружен только частично.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Файл не был загружен.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Не настроена временная директория в php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Невозможно записать временный файл на диск.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Расширение PHP вызвало ошибку при загрузке.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Эта коллекция должна содержать {{ limit }} элемент или больше.|Эта коллекция должна содержать {{ limit }} элемента или больше.|Эта коллекция должна содержать {{ limit }} элементов или больше.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Эта коллекция должна содержать {{ limit }} элемент или меньше.|Эта коллекция должна содержать {{ limit }} элемента или меньше.|Эта коллекция должна содержать {{ limit }} элементов или меньше.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Эта коллекция должна содержать ровно {{ limit }} элемент.|Эта коллекция должна содержать ровно {{ limit }} элемента.|Эта коллекция должна содержать ровно {{ limit }} элементов.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Неверный номер карты.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Неподдерживаемый тип или неверный номер карты.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Значение не является допустимым международным номером банковского счета (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Значение имеет неверный формат ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Значение имеет неверный формат ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Значение не соответствует форматам ISBN-10 и ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Значение не соответствует формату ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Некорректный формат валюты.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Значение должно быть равно {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Значение должно быть больше чем {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Значение должно быть больше или равно {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Значение должно быть идентичным {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Значение должно быть меньше чем {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Значение должно быть меньше или равно {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Значение не должно быть равно {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Значение не должно быть идентичным {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Соотношение сторон изображения слишком велико ({{ ratio }}). Максимальное соотношение сторон {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Соотношение сторон изображения слишком мало ({{ ratio }}). Минимальное соотношение сторон {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Изображение квадратное ({{ width }}x{{ height }}px). Квадратные изображения не разрешены.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Изображение в альбомной ориентации ({{ width }}x{{ height }}px). Изображения в альбомной ориентации не разрешены.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Изображение в портретной ориентации ({{ width }}x{{ height }}px). Изображения в портретной ориентации не разрешены.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Пустые файлы не разрешены.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Имя хоста не может быть разрешено.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Значение не совпадает с ожидаемой {{ charset }} кодировкой.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sk.xlf b/vendor/symfony/validator/Resources/translations/validators.sk.xlf
deleted file mode 100644
index 46f3ec3..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sk.xlf
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Táto hodnota by mala byť nastavená na false.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Táto hodnota by mala byť nastavená na true.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Táto hodnota by mala byť typu {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Táto hodnota by mala byť prázdna.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Táto hodnota by mala byť jednou z poskytnutých možností.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Mali by ste vybrať minimálne {{ limit }} možnosť.|Mali by ste vybrať minimálne {{ limit }} možnosti.|Mali by ste vybrať minimálne {{ limit }} možností.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Mali by ste vybrať najviac {{ limit }} možnosť.|Mali by ste vybrať najviac {{ limit }} možnosti.|Mali by ste vybrať najviac {{ limit }} možností.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Niektoré z uvedených hodnôt sú neplatné.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Toto pole sa neočakáva.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Toto pole chýba.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Tato hodnota nemá platný formát dátumu.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Táto hodnota nemá platný formát dátumu a času.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Táto hodnota nie je platná emailová adresa.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Súbor sa nenašiel.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Súbor nie je čitateľný.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Súbor je príliš veľký ({{ size }} {{ suffix }}). Maximálna povolená veľkosť je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Súbor typu ({{ type }}) nie je podporovaný. Podporované typy sú {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Táto hodnota by mala byť {{ limit }} alebo menej.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znak.|Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znaky.|Táto hodnota obsahuje viac znakov ako je povolené. Mala by obsahovať najviac {{ limit }} znakov.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Táto hodnota by mala byť viac ako {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Táto hodnota je príliš krátka. Musí obsahovať minimálne {{ limit }} znak.|Táto hodnota je príliš krátka. Musí obsahovať minimálne {{ limit }} znaky.|Táto hodnota je príliš krátka. Minimálny počet znakov je {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Táto hodnota by mala byť vyplnená.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Táto hodnota by nemala byť null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Táto hodnota by mala byť null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Táto hodnota nie je platná.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Tato hodnota nemá správny formát času.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Táto hodnota nie je platnou URL adresou.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Tieto dve hodnoty by mali byť rovnaké.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Súbor je príliš veľký. Maximálna povolená veľkosť je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Súbor je príliš veľký.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Súbor sa nepodarilo nahrať.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Táto hodnota by mala byť číslo.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Tento súbor nie je obrázok.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Toto nie je platná IP adresa.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Tento jazyk neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Táto lokalizácia neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Táto krajina neexistuje.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Táto hodnota sa už používa.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Nepodarilo sa zistiť rozmery obrázku.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Obrázok je príliš široký ({{ width }}px). Maximálna povolená šírka obrázku je {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Obrázok je príliš úzky ({{ width }}px). Minimálna šírka obrázku by mala byť {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>>Obrázok je príliš vysoký ({{ height }}px). Maximálna povolená výška obrázku je {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Obrázok je príliš nízky ({{ height }}px). Minimálna výška obrázku by mala byť {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Táto hodnota by mala byť aktuálne heslo používateľa.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Táto hodnota by mala mať presne {{ limit }} znak.|Táto hodnota by mala mať presne {{ limit }} znaky.|Táto hodnota by mala mať presne {{ limit }} znakov.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Bola nahraná len časť súboru.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Žiadny súbor nebol nahraný.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>V php.ini nie je nastavená cesta k adresáru pre dočasné súbory.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Dočasný súbor sa nepodarilo zapísať na disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Rozšírenie PHP zabránilo nahraniu súboru.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Táto kolekcia by mala obsahovať aspoň {{ limit }} prvok alebo viac.|Táto kolekcia by mala obsahovať aspoň {{ limit }} prvky alebo viac.|Táto kolekcia by mala obsahovať aspoň {{ limit }} prvkov alebo viac.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Táto kolekcia by mala maximálne {{ limit }} prvok.|Táto kolekcia by mala obsahovať maximálne {{ limit }} prvky.|Táto kolekcia by mala obsahovať maximálne {{ limit }} prvkov.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Táto kolekcia by mala obsahovať presne {{ limit }} prvok.|Táto kolekcia by mala obsahovať presne {{ limit }} prvky.|Táto kolekcia by mala obsahovať presne {{ limit }} prvkov.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Neplatné číslo karty.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nepodporovaný typ karty alebo neplatné číslo karty.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Toto je neplatný IBAN.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Táto hodnota je neplatné ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Táto hodnota je neplatné ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Táto hodnota nie je platné ISBN-10 ani ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Táto hodnota nie je platné ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Táto hodnota nie je platná mena.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť väčšia ako {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť väčšia alebo rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť typu {{ compared_value_type }} a zároveň by mala byť rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť menšia ako {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Táto hodnota by mala byť menšia alebo rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Táto hodnota by nemala byť rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Táto hodnota by nemala byť typu {{ compared_value_type }} a zároveň by nemala byť rovná {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Pomer strán obrázku je príliš veľký ({{ ratio }}). Maximálny povolený pomer strán obrázku je {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Pomer strán obrázku je príliš malý ({{ ratio }}). Minimálny povolený pomer strán obrázku je {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Strany obrázku sú štvorcové ({{ width }}x{{ height }}px). Štvorcové obrázky nie sú povolené.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Obrázok je orientovaný na šírku ({{ width }}x{{ height }}px). Obrázky orientované na šírku nie sú povolené.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Obrázok je orientovaný na výšku ({{ width }}x{{ height }}px). Obrázky orientované na výšku nie sú povolené.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Súbor nesmie byť prázdny.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sl.xlf b/vendor/symfony/validator/Resources/translations/validators.sl.xlf
deleted file mode 100644
index 4f0e7c6..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sl.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Vrednost bi morala biti nepravilna (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Vrednost bi morala biti pravilna (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Vrednost mora biti naslednjega tipa {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Vrednost mora biti prazna.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Vrednost, ki ste jo izbrali, ni veljavna možnost.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Izbrati morate vsaj {{ limit }} možnost.|Izbrati morate vsaj {{ limit }} možnosti.|Izbrati morate vsaj {{ limit }} možnosti.|Izbrati morate vsaj {{ limit }} možnosti.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Izberete lahko največ {{ limit }} možnost.|Izberete lahko največ {{ limit }} možnosti.|Izberete lahko največ {{ limit }} možnosti.|Izberete lahko največ {{ limit }} možnosti.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Ena ali več podanih vrednosti ni veljavnih.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>To polje ni bilo pričakovati.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>To polje manjka.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Ta vrednost ni veljaven datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Ta vrednost ni veljaven datum in čas.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Ta vrednost ni veljaven e-poštni naslov.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Datoteke ni mogoče najti.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Datoteke ni mogoče prebrati.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Datoteka je prevelika ({{ size }} {{ suffix }}). Največja dovoljena velikost je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mime tip datoteke je neveljaven ({{ type }}). Dovoljeni mime tipi so {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Ta vrednost bi morala biti {{ limit }} ali manj.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Ta vrednost je predolga. Morala bi imeti {{ limit }} znak ali manj.|Ta vrednost je predolga. Morala bi imeti {{ limit }} znaka ali manj.|Ta vrednost je predolga. Morala bi imeti {{ limit }} znake ali manj.|Ta vrednost je predolga. Morala bi imeti {{ limit }} znakov ali manj.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Ta vrednost bi morala biti {{ limit }} ali več.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Ta vrednost je prekratka. Morala bi imeti {{ limit }} znak ali več.|Ta vrednost je prekratka. Morala bi imeti {{ limit }} znaka ali več.|Ta vrednost je prekratka. Morala bi imeti {{ limit }} znake ali več.|Ta vrednost je prekratka. Morala bi imeti {{ limit }} znakov ali več.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Ta vrednost ne bi smela biti prazna.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Ta vrednost ne bi smela biti nedefinirana (null).</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Ta vrednost bi morala biti nedefinirana (null).</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Ta vrednost ni veljavna.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Ta vrednost ni veljaven čas.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Ta vrednost ni veljaven URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Ti dve vrednosti bi morali biti enaki.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Datoteka je prevelika. Največja dovoljena velikost je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Datoteka je prevelika.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Datoteke ni bilo mogoče naložiti.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Ta vrednost bi morala biti veljavna številka.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ta datoteka ni veljavna slika.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>To ni veljaven IP naslov.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Ta vrednost ni veljaven jezik.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Ta vrednost ni veljavna lokalnost.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Ta vrednost ni veljavna država.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Ta vrednost je že uporabljena.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Velikosti slike ni bilo mogoče zaznati.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Širina slike je preširoka ({{ width }}px). Največja dovoljena širina je {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Širina slike je premajhna ({{ width }}px). Najmanjša predvidena širina je {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Višina slike je prevelika ({{ height }}px). Največja dovoljena višina je {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Višina slike je premajhna ({{ height }}px). Najmanjša predvidena višina je {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Ta vrednost bi morala biti trenutno uporabnikovo geslo.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Ta vrednost bi morala imeti točno {{ limit }} znak.|Ta vrednost bi morala imeti točno {{ limit }} znaka.|Ta vrednost bi morala imeti točno {{ limit }} znake.|Ta vrednost bi morala imeti točno {{ limit }} znakov.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Datoteka je bila le delno naložena.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nobena datoteka ni bila naložena.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Začasna mapa ni nastavljena v php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Začasne datoteke ni bilo mogoče zapisati na disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP razširitev je vzrok, da nalaganje ni uspelo.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ta zbirka bi morala vsebovati {{ limit }} element ali več.|Ta zbirka bi morala vsebovati {{ limit }} elementa ali več.|Ta zbirka bi morala vsebovati {{ limit }} elemente ali več.|Ta zbirka bi morala vsebovati {{ limit }} elementov ali več.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ta zbirka bi morala vsebovati {{ limit }} element ali manj.|Ta zbirka bi morala vsebovati {{ limit }} elementa ali manj.|Ta zbirka bi morala vsebovati {{ limit }} elemente ali manj.|Ta zbirka bi morala vsebovati {{ limit }} elementov ali manj.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ta zbirka bi morala vsebovati točno {{ limit }} element.|Ta zbirka bi morala vsebovati točno {{ limit }} elementa.|Ta zbirka bi morala vsebovati točno {{ limit }} elemente.|Ta zbirka bi morala vsebovati točno {{ limit }} elementov.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Neveljavna številka kartice.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nepodprti tip kartice ali neveljavna številka kartice.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>To ni veljavna mednarodna številka bančnega računa (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Neveljavna vrednost po ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Neveljavna vrednost po ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Neveljavna vrednost po ISBN-10 ali po ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Neveljavna vrednost ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ta vrednost ni veljavna valuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti enaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti večja od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti večja ali enaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti identična {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti manjša od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ta vrednost bi morala biti manjša ali enaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ta vrednost ne bi smela biti enaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ta vrednost ne bi smela biti identična {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Razmerje slike je preveliko ({{ ratio }}). Največje dovoljeno razmerje je {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Razmerje slike je premajhno ({{ ratio }}). Najmanjše pričakovano razmerje je {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Slika je kvadrat ({{ width }}x{{ height }}px). Kvadratne slike niso dovoljene.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Slika je ležeče usmerjena ({{ width }}x{{ height }}px). Ležeče usmerjene slike niso dovoljene.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Slika je pokončno usmerjena ({{ width }}x{{ height }}px). Pokončno usmerjene slike niso dovoljene.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>Prazna datoteka ni dovoljena.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Gostitelja ni bilo mogoče prepoznati.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Ta vrednost se ne ujema s pričakovanim naborom znakov {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sq.xlf b/vendor/symfony/validator/Resources/translations/validators.sq.xlf
deleted file mode 100644
index ffc8ccf..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sq.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Kjo vlerë duhet të jetë e pavërtetë (false).</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Kjo vlerë duhet të jetë e vërtetë (true).</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Kjo vlerë duhet të jetë e llojit {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Kjo vlerë duhet të jetë e zbrazët.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Vlera që keni zgjedhur nuk është alternativë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Duhet të zgjedhni së paku {{ limit }} alternativa.|Duhet të zgjedhni së paku {{ limit }} alternativa.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Duhet të zgjedhni më së shumti {{ limit }} alternativa.|Duhet të zgjedhni më së shumti {{ limit }} alternativa.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Një apo më shumë nga vlerat e dhëna nuk janë të sakta.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Kjo fushë nuk pritej.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Kjo fushë është zhdukur.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Kjo vlerë nuk është datë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Kjo vlerë nuk është datë-kohë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Kjo vlerë nuk është e-mail adresë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>File nuk mund të gjindej.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>File nuk është i lexueshëm.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>File është shumë i madh ({{ size }} {{ suffix }}). Madhësia më e madhe e lejuar është {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Lloji mime i files nuk është i vlefshëm ({{ type }}). Llojet mime të lejuara janë {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Kjo vlerë duhet të jetë {{ limit }} ose më pak.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Kjo vlerë është shumë e gjatë. Duhet t'i ketë {{ limit }} ose më pak karaktere.|Kjo vlerë është shumë e gjatë. Duhet t'i ketë {{ limit }} ose më pak karaktere.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Kjo vlerë duhet të jetë {{ limit }} ose më shumë.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Kjo vlerë është shumë e shkurtër. Duhet t'i ketë {{ limit }} ose më shumë karaktere.|Kjo vlerë është shumë e shkurtër. Duhet t'i ketë {{ limit }} ose më shumë karaktere.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Kjo vlerë nuk duhet të jetë e zbrazët.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Kjo vlerë nuk duhet të jetë null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Kjo vlerë duhet të jetë null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Kjo vlerë nuk është e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Kjo vlerë nuk është kohë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Kjo vlerë nuk është URL e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Këto dy vlera duhet të jenë të barabarta.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Ky file është shumë i madh. Madhësia maksimale e lejuar është {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Ky file është shumë i madh.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Ky file nuk mund të ngarkohet.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Kjo vlerë duhet të jetë numër i vlefshëm.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ky file nuk është imazh i vlefshëm.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Kjo vlerë nuk është IP adresë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Kjo vlerë nuk është gjuhë e vlefshme.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Kjo vlerë nuk është përcaktim rajonal i vlefshëm.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Kjo vlerë nuk është shtet i vlefshëm.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Kjo vlerë është tashmë në përdorim.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Madhësia e këtij imazhi nuk mund të zbulohet.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Gjerësia e imazhit është shumë e madhe ({{ width }}px). Gjerësia maksimale e lejuar është {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Gjerësia e imazhit është shumë e vogël ({{ width }}px). Gjerësia minimale e pritur është {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Gjatësia e imazhit është shumë e madhe ({{ height }}px). Gjatësia maksimale e lejuar është {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Gjatësia e imazhit është shumë e vogël ({{ height }}px). Gjatësia minimale e pritur është {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Kjo vlerë duhet të jetë fjalëkalimi aktual i përdoruesit.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Kjo vlerë duhet të ketë saktësisht {{ limit }} karaktere.|Kjo vlerë duhet të ketë saktësisht {{ limit }} karaktere.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Ky file është ngarkuar pjesërisht.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Nuk është ngarkuar ndonjë file.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Asnjë folder i përkohshëm nuk është konfiguruar në php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Nuk mund të shkruhet file i përkohshëm në disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Një ekstenzion i PHP-së bëri të dështojë ngarkimi i files.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ky kolekcion duhet të përmbajë {{ limit }} ose më shumë elemente.|Ky kolekcion duhet të përmbajë {{ limit }} ose më shumë elemente.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ky kolekcion duhet të përmbajë {{ limit }} ose më shumë elemente.|Ky kolekcion duhet të përmbajë {{ limit }} ose më shumë elemente.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ky kolekcion duhet të përmbajë saktësisht {{ limit }} elemente.|Ky kolekcion duhet të përmbajë saktësisht {{ limit }} elemente.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Numër kartele i pavlefshëm.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Lloj kartele i pambështetur ose numër kartele i pavlefshëm.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sr_Cyrl.xlf b/vendor/symfony/validator/Resources/translations/validators.sr_Cyrl.xlf
deleted file mode 100644
index 81f5210..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sr_Cyrl.xlf
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Вредност треба да буде нетачна.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Вредност треба да буде тачна.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Вредност треба да буде типа {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Вредност треба да буде празна.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Вредност треба да буде једна од понуђених.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Изаберите бар {{ limit }} могућност.|Изаберите бар {{ limit }} могућности.|Изаберите бар {{ limit }} могућности.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Изаберите највише {{ limit }} могућност.|Изаберите највише {{ limit }} могућности.|Изаберите највише {{ limit }} могућности.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Једна или више вредности је невалидна.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Ово поље не очекује.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Ово поље недостаје.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Вредност није валидан датум.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Вредност није валидан датум-време.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Вредност није валидна адреса електронске поште.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Датотека не може бити пронађена.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Датотека није читљива.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Датотека је превелика ({{ size }} {{ suffix }}). Највећа дозвољена величина је {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Миме тип датотеке није валидан ({{ type }}). Дозвољени миме типови су {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Вредност треба да буде {{ limit }} или мање.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Вредност је предугачка. Треба да има {{ limit }} карактер или мање.|Вредност је предугачка. Треба да има {{ limit }} карактера или мање.|Вредност је предугачка. Треба да има {{ limit }} карактера или мање.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Вредност треба да буде {{ limit }} или више.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Вредност је прекратка. Треба да има {{ limit }} карактер или више.|Вредност је прекратка. Треба да има {{ limit }} карактера или више.|Вредност је прекратка. Треба да има {{ limit }} карактера или више.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Вредност не треба да буде празна.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Вредност не треба да буде null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Вредност треба да буде null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Вредност је невалидна.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Вредност није валидно време.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Вредност није валидан URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Обе вредности треба да буду једнаке.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Датотека је превелика. Највећа дозвољена величина је {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Датотека је превелика.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Датотека не може бити отпремљена.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Вредност треба да буде валидан број.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ова датотека није валидна слика.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Ово није валидна ИП адреса.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Вредност није валидан језик.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Вредност није валидан локал.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Вредност није валидна земља.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Вредност је већ искоришћена.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Величина слике не може бити одређена.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Ширина слике је превелика ({{ width }}px). Најећа дозвољена ширина је {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Ширина слике је премала ({{ width }}px). Најмања дозвољена ширина је {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Висина слике је превелика ({{ height }}px). Најећа дозвољена висина је {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Висина слике је премала ({{ height }}px). Најмања дозвољена висина је {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Вредност треба да буде тренутна корисничка лозинка.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Вредност треба да има тачно {{ limit }} карактер.|Вредност треба да има тачно {{ limit }} карактера.|Вредност треба да има тачно {{ limit }} карактера.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Датотека је само парцијално отпремљена.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Датотека није отпремљена.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Привремени директоријум није конфигурисан у php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Немогуће писање привремене датотеке на диск.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP екстензија је проузроковала неуспех отпремања датотеке.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ова колекција треба да садржи {{ limit }} или више елемената.|Ова колекција треба да садржи {{ limit }} или више елемената.|Ова колекција треба да садржи {{ limit }} или више елемената.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ова колекција треба да садржи {{ limit }} или мање елемената.|Ова колекција треба да садржи {{ limit }} или мање елемената.|Ова колекција треба да садржи {{ limit }} или мање елемената.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ова колекција треба да садржи тачно {{ limit }} елемент.|Ова колекција треба да садржи тачно {{ limit }} елемента.|Ова колекција треба да садржи тачно {{ limit }} елемената.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Невалидан број картице.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Невалидан број картице или тип картице није подржан.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Ово није валидан међународни број банковног рачуна (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ово није валидан ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ово није валидан ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ово није валидан ISBN-10 или ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ово није валидан ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ово није валидна валута.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде већа од {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде већа или једнака {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде идентична са {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде мања од {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ова вредност треба да буде мања или једнака {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ова вредност не треба да буде једнака {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ова вредност не треба да буде идентична са {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Размера ове слике је превелика ({{ ratio }}). Максимална дозвољена размера је {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Размера ове слике је премала ({{ ratio }}). Минимална очекивана размера је {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Слика је квадратна ({{ width }}x{{ height }}px). Квадратне слике нису дозвољене.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Слика је оријентације пејзажа ({{ width }}x{{ height }}px). Пејзажна оријентација слика није дозвољена.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Слика је оријантације портрета ({{ width }}x{{ height }}px). Портретна оријентација слика није дозвољена.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf b/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf
deleted file mode 100644
index 60c093a..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sr_Latn.xlf
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Vrednost treba da bude netačna.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Vrednost treba da bude tačna.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Vrednost treba da bude tipa {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Vrednost treba da bude prazna.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Vrednost treba da bude jedna od ponuđenih.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Izaberite bar {{ limit }} mogućnost.|Izaberite bar {{ limit }} mogućnosti.|Izaberite bar {{ limit }} mogućnosti.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Izaberite najviše {{ limit }} mogućnost.|Izaberite najviše {{ limit }} mogućnosti.|Izaberite najviše {{ limit }} mogućnosti.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Jedna ili više vrednosti je nevalidna.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Ovo polje ne očekuje.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Ovo polje nedostaje.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Vrednost nije validan datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Vrednost nije validan datum-vreme.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Vrednost nije validna adresa elektronske pošte.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Datoteka ne može biti pronađena.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Datoteka nije čitljiva.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Datoteka je prevelika ({{ size }} {{ suffix }}). Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mime tip datoteke nije validan ({{ type }}). Dozvoljeni mime tipovi su {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Vrednost treba da bude {{ limit }} ili manje.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Vrednost je predugačka. Treba da ima {{ limit }} karakter ili manje.|Vrednost je predugačka. Treba da ima {{ limit }} karaktera ili manje.|Vrednost je predugačka. Treba da ima {{ limit }} karaktera ili manje.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Vrednost treba da bude {{ limit }} ili više.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Vrednost je prekratka. Treba da ima {{ limit }} karakter ili više.|Vrednost je prekratka. Treba da ima {{ limit }} karaktera ili više.|Vrednost je prekratka. Treba da ima {{ limit }} karaktera ili više.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Vrednost ne treba da bude prazna.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Vrednost ne treba da bude null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Vrednost treba da bude null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Vrednost je nevalidna.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Vrednost nije validno vreme.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Vrednost nije validan URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Obe vrednosti treba da budu jednake.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Datoteka je prevelika.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Datoteka ne može biti otpremljena.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Vrednost treba da bude validan broj.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Ova datoteka nije validna slika.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Ovo nije validna IP adresa.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Vrednost nije validan jezik.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Vrednost nije validan lokal.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Vrednost nije validna zemlja.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Vrednost je već iskorišćena.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Veličina slike ne može biti određena.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Širina slike je prevelika ({{ width }}px). Najeća dozvoljena širina je {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Širina slike je premala ({{ width }}px). Najmanja dozvoljena širina je {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Visina slike je prevelika ({{ height }}px). Najeća dozvoljena visina je {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Visina slike je premala ({{ height }}px). Najmanja dozvoljena visina je {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Vrednost treba da bude trenutna korisnička lozinka.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Vrednost treba da ima tačno {{ limit }} karakter.|Vrednost treba da ima tačno {{ limit }} karaktera.|Vrednost treba da ima tačno {{ limit }} karaktera.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Datoteka je samo parcijalno otpremljena.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Datoteka nije otpremljena.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Privremeni direktorijum nije konfigurisan u php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Nemoguće pisanje privremene datoteke na disk.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP ekstenzija je prouzrokovala neuspeh otpremanja datoteke.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ova kolekcija treba da sadrži {{ limit }} ili više elemenata.|Ova kolekcija treba da sadrži {{ limit }} ili više elemenata.|Ova kolekcija treba da sadrži {{ limit }} ili više elemenata.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ova kolekcija treba da sadrži {{ limit }} ili manje elemenata.|Ova kolekcija treba da sadrži {{ limit }} ili manje elemenata.|Ova kolekcija treba da sadrži {{ limit }} ili manje elemenata.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ova kolekcija treba da sadrži tačno {{ limit }} element.|Ova kolekcija treba da sadrži tačno {{ limit }} elementa.|Ova kolekcija treba da sadrži tačno {{ limit }} elemenata.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Nevalidan broj kartice.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Nevalidan broj kartice ili tip kartice nije podržan.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Ovo nije validan međunarodni broj bankovnog računa (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Ovo nije validan ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Ovo nije validan ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Ovo nije validan ISBN-10 ili ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Ovo nije validan ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Ovo nije validna valuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude veća od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude veća ili jednaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude identična sa {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude manja od {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Ova vrednost treba da bude manja ili jednaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Ova vrednost ne treba da bude jednaka {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Ova vrednost ne treba da bude identična sa {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Razmera ove slike je prevelika ({{ ratio }}). Maksimalna dozvoljena razmera je {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Razmera ove slike je premala ({{ ratio }}). Minimalna očekivana razmera je {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Slika je kvadratna ({{ width }}x{{ height }}px). Kvadratne slike nisu dozvoljene.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Slika je orijentacije pejzaža ({{ width }}x{{ height }}px). Pejzažna orijentacija slika nije dozvoljena.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Slika je orijantacije portreta ({{ width }}x{{ height }}px). Portretna orijentacija slika nije dozvoljena.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.sv.xlf b/vendor/symfony/validator/Resources/translations/validators.sv.xlf
deleted file mode 100644
index 693f12b..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.sv.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Värdet ska vara falskt.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Värdet ska vara sant.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Värdet ska vara av typen {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Värdet ska vara tomt.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Värdet ska vara ett av de givna valen.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Du måste välja minst {{ limit }} val.|Du måste välja minst {{ limit }} val.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Du kan som mest välja {{ limit }} val.|Du kan som mest välja {{ limit }} val.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Ett eller fler av de angivna värdena är ogiltigt.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Det här fältet förväntades inte.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Det här fältet saknas.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Värdet är inte ett giltigt datum.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Värdet är inte ett giltigt datum med tid.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Värdet är inte en giltig epost-adress.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Filen kunde inte hittas.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Filen är inte läsbar.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen är för stor ({{ size }} {{ suffix }}). Största tillåtna storlek är {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Filens MIME-typ ({{ type }}) är ogiltig. De tillåtna typerna är {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Värdet ska vara {{ limit }} eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Värdet är för långt. Det ska ha {{ limit }} tecken eller färre.|Värdet är för långt. Det ska ha {{ limit }} tecken eller färre.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Värdet ska vara {{ limit }} eller mer.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Värdet är för kort. Det ska ha {{ limit }} tecken eller mer.|Värdet är för kort. Det ska ha {{ limit }} tecken eller mer.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Värdet kan inte vara tomt.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Värdet kan inte vara null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Värdet ska vara null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Värdet är inte giltigt.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Värdet är inte en giltig tid.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Värdet är inte en giltig URL.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>De två värdena måste vara lika.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Filen är för stor. Tillåten maximal storlek är {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Filen är för stor.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Filen kunde inte laddas upp.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Värdet ska vara ett giltigt nummer.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Filen är ingen giltig bild.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Det här är inte en giltig IP-adress.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Värdet är inte ett giltigt språk.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Värdet är inte en giltig plats.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Värdet är inte ett giltigt land.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Värdet används redan.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Det gick inte att fastställa storleken på bilden.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Bildens bredd är för stor ({{ width }}px). Tillåten maximal bredd är {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Bildens bredd är för liten ({{ width }}px). Minsta förväntade bredd är {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Bildens höjd är för stor ({{ height }}px). Tillåten maximal bredd är {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Bildens höjd är för liten ({{ height }}px). Minsta förväntade höjd är {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Värdet ska vara användarens nuvarande lösenord.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Värdet ska ha exakt {{ limit }} tecken.|Värdet ska ha exakt {{ limit }} tecken.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Filen laddades bara upp delvis.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Ingen fil laddades upp.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Det finns ingen temporär mapp konfigurerad i php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Kan inte skriva temporär fil till disken.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>En PHP extension gjorde att uppladdningen misslyckades.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Den här samlingen ska innehålla {{ limit }} element eller mer.|Den här samlingen ska innehålla {{ limit }} element eller mer.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Den här samlingen ska innehålla {{ limit }} element eller mindre.|Den här samlingen ska innehålla {{ limit }} element eller mindre.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Den här samlingen ska innehålla exakt {{ limit }} element.|Den här samlingen ska innehålla exakt {{ limit }} element.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Ogiltigt kortnummer.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Okänd korttyp eller ogiltigt kortnummer.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Det här är inte en giltig International Bank Account Number (IBANK).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Värdet är inte en giltig ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Värdet är inte en giltig ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Värdet är varken en giltig ISBN-10 eller en giltig ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Värdet är inte en giltig ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Värdet är inte en giltig valuta.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Värdet ska vara detsamma som {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Värdet ska vara större än {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Värdet ska bara större än eller detsamma som {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Värdet ska vara identiskt till {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Värdet ska vara mindre än {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Värdet ska vara mindre än eller detsamma som {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Värdet ska inte vara detsamma som {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Värdet ska inte vara identiskt med {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>Förhållandet mellan bildens bredd och höjd är för stort ({{ ratio }}). Högsta tillåtna förhållande är {{ max_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>Förhållandet mellan bildens bredd och höjd är för litet ({{ ratio }}). Minsta tillåtna förhållande är {{ min_ratio }}.</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>Bilden är kvadratisk ({{ width }}x{{ height }}px). Kvadratiska bilder tillåts inte.</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>Bilden är landskapsorienterad ({{ width }}x{{ height }}px). Landskapsorienterade bilder tillåts inte.</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>Bilden är porträttsorienterad ({{ width }}x{{ height }}px). Porträttsorienterade bilder tillåts inte.</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>En tom fil är inte tillåten.</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>Värddatorn kunde inte hittas.</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>Detta värde har inte den förväntade teckenkodningen {{ charset }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.th.xlf b/vendor/symfony/validator/Resources/translations/validators.th.xlf
deleted file mode 100644
index d5b5703..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.th.xlf
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>ค่านี้ควรจะเป็น false</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>ค่านี้ควรจะเป็น true</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>ค่านี้ควรจะเป็นชนิด {{ type }}</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>ควรจะเป็นค่าว่าง</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>คุณเลือกค่าที่ไม่ตรงกับตัวเลือก</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>คุณต้องเลือกอย่างน้อย {{ limit }} ตัวเลือก</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>คุณเลือกได้มากที่สุด {{ limit }} ตัวเลือก</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>มีบางค่าที่ส่งมาไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>ฟิลด์นี้ที่ไม่ได้คาดหวัง</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>ฟิลด์นี้จะหายไป</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>ค่าของวันที่ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>ค่าของวันที่และเวลาไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>ค่าของอีเมล์ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>ไม่พบไฟล์</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>ไฟล์ไม่อยู่ในสถานะที่สามารถอ่านได้</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>ไฟล์ใหญ่เกิน ({{ size }} {{ suffix }}) อนุญาตให้ใหญ่ที่สุดได้ไม่เกิน {{ limit }} {{ suffix }}</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Mime type ของไฟล์ไม่ถูกต้อง ({{ type }}) Mime types ที่อนุญาตคือ {{ types }}</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>ค่านี้ควรจะเป็น {{ limit }} หรือน้อยกว่านั้น</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>ค่านี้ยาวเกินไป ควรจะมีแค่ {{ limit }} ตัวอักษรหรือน้อยกว่านั้น</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>ค่านี้ควรจะมี {{ limit }} หรือมากกว่านั้น</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>ค่านี้สั้นเกินไป ควรจะมี {{ limit }} ตัวอักษรหรือมากกว่านั้น</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>ค่านี้ไม่ควรเป็นค่าว่าง</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>ค่านี้ไม่ควรเป็นค่า null</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>ค่านี้ควรเป็นค่า null</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>ค่านี้ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>ค่าของเวลาไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>ค่าของ URL ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>ค่าทั้งสองค่าควรจะเหมือนกัน</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>ขนาดไฟล์ใหญ่เกินไป อนุญาตให้ไฟล์ขนาดใหญ่ได้ไม่เกิน {{ limit }} {{ suffix }}</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>ขนาดไฟล์ใหญ่เกินไป</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>ไม่สามารถอัปโหลดไฟล์ได้</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>ค่าของตัวเลขไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>ไฟล์นี้ไม่ใช่ไฟล์รูปภาพ</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>ค่าของ IP ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>ค่าของภาษาไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>ค่าของภูมิภาค (Locale) ไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>ค่าของประเทศไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Tค่านี้ถูกใช้งานไปแล้ว</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>ไม่สามารถตรวจสอบขนาดไฟล์ของภาพได้</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>ความกว้างของภาพเกินขนาด ({{ width }}px) อนุญาตให้กว้างได้มากที่สุด {{ max_width }}px</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>ความกว้างของภาพไม่ได้ขนาด ({{ width }}px) อนุญาตให้สั้นที่สุด {{ min_width }}px</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>ความสูงของภาพเกินขนาด ({{ height }}px) อนุญาตให้สูงได้มากที่สุด {{ max_height }}px</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>ความสูงของภาพไม่ได้ขนาด ({{ height }}px) อนุญาตให้สูงอย่างน้อยที่สุด {{ min_height }}px</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>ค่านี้ควรจะเป็นรหัสผ่านปัจจุบันของผู้ใช้</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>ค่านี้ควรจะมีความยาว {{ limit }} ตัวอักษร</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>อัปโหลดไฟล์ได้เพียงบางส่วนเท่านั้น</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>ไม่มีไฟล์ใดถูกอัปโหลด</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>ไม่พบไฟล์ temp ควรจะกำหนดใน php.ini</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>ไม่สามารถเขียน temp ไฟล์ลงดิสก์ได้</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>PHP extension เกี่ยวกับการอัปโหลดมีปัญหา</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>คอเล็กชั่นนี้ควรจะประกอบไปด้วยอ่างน้อย {{ limit }} สมาชิก</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>คอเล็กชั่นนี้ไม่ควรมีสมาชิกเกิน {{ limit }}</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>คอเล็กชั่นนี้ควรจะมีสมาชิก {{ limit }} เท่านั้น</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>หมายเลขบัตรไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>ไม่รู้จักประเภทของบัตร หรือหมายเลขบัตรไม่ถูกต้อง</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>นี่ไม่ถูกต้องตาม International Bank Account Number (IBAN)</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>ค่านี้ไม่ถูกต้องตาม ISBN-10</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>ค่านี้ไม่ถูกต้องตาม ISBN-13</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>ค่านี้ไม่ถูกต้องตามทั้ง ISBN-10 และ ISBN-13</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>ค่านี้ไม่ถุกต้องตาม ISSN</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>ค่านี้ไม่ถูกต้องตามสกุลเงิน</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>ค่านี้ไม่ตรงกับ {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>ค่านี้ควรจะมากกว่า {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>ค่านี้ควรจะมากกว่าหรือตรงกับ {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>ค่านี้ควรจะเหมือนกันกับ {{ compared_value_type }} {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>ค่านี้ควรจะน้อยกว่า {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>ค่านี้ควรจะน้อยกว่าหรือเท่ากับ {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>ค่านี้ไม่ควรเท่ากันกับ {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>ค่านี้ไม่ควรเหมือนกันกับ {{ compared_value_type }} {{ compared_value }}</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>สัดส่วนของภาพใหญ่เกิน ({{ ratio }}) สามารถมีขนาดใหญ่ที่สุดได้ {{ max_ratio }}</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>สัดส่วนของภาพเล็กเกิน ({{ ratio }}) สามารถมีขนาดเล็กที่สุดได้ {{ min_ratio }}</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>รูปภาพเป็นจุตรัส ({{ width }}x{{ height }}px) ไม่อนุญาตภาพที่เป็นสี่เหลี่ยมจตุรัส</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>ภาพนี้เป็นแนวนอน ({{ width }}x{{ height }}px) ไม่อนุญาตภาพที่เป็นแนวนอน</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>ภาพนี้เป็นแนวตั้ง ({{ width }}x{{ height }}px) ไม่อนุญาตภาพที่เป็นแนวตั้ง</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.tr.xlf b/vendor/symfony/validator/Resources/translations/validators.tr.xlf
deleted file mode 100644
index a7906ea..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.tr.xlf
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Bu değer olumsuz olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Bu değer olumlu olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Bu değerin tipi {{ type }} olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Bu değer boş olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Seçtiğiniz değer geçerli bir seçenek değil.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>En az {{ limit }} seçenek belirtmelisiniz.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>En çok {{ limit }} seçenek belirtmelisiniz.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Verilen değerlerden bir veya daha fazlası geçersiz.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Bu alan beklenen olmadı.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Bu alan, eksik</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Bu değer doğru bir tarih biçimi değildir.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Bu değer doğru bir tarihsaat biçimi değildir.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Bu değer doğru bir e-mail adresi değildir.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Dosya bulunamadı.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Dosya okunabilir değil.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Dosya çok büyük ({{ size }} {{ suffix }}). İzin verilen en büyük dosya boyutu {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Dosyanın mime tipi geçersiz ({{ type }}). İzin verilen mime tipleri {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Bu değer {{ limit }} ve altında olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Bu değer çok uzun. {{ limit }} karakter veya daha az olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Bu değer {{ limit }} veya daha fazla olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Bu değer çok kısa. {{ limit }} karakter veya daha fazla olmaldır.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Bu değer boş bırakılmamalıdır.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Bu değer boş bırakılmamalıdır.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Bu değer boş bırakılmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Bu değer geçerli değil.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Bu değer doğru bir saat değil.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Bu değer doğru bir URL değil.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>İki değer eşit olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Dosya çok büyük. İzin verilen en büyük dosya boyutu {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Dosya çok büyük.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Dosya yüklenemiyor.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Bu değer geçerli bir rakam olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Bu dosya geçerli bir resim değildir.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Bu geçerli bir IP adresi değildir.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Bu değer geçerli bir lisan değil.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Bu değer geçerli bir yer değildir.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Bu değer geçerli bir ülke değildir.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Bu değer şu anda kullanımda.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Resmin boyutu saptanamıyor.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Resmin genişliği çok büyük ({{ width }}px). İzin verilen en büyük genişlik {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Resmin genişliği çok küçük ({{ width }}px). En az {{ min_width }}px olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Resmin yüksekliği çok büyük ({{ height }}px). İzin verilen en büyük yükseklik {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Resmin yüksekliği çok küçük ({{ height }}px). En az {{ min_height }}px olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Bu değer kullanıcının şu anki şifresi olmalıdır.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Bu değer tam olarak {{ limit }} karakter olmaldır.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Dosya sadece kısmen yüklendi.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Hiçbir dosya yüklenmedi.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>php.ini içerisinde geçici dizin tanımlanmadı.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Geçici dosya diske yazılamıyor.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Bir PHP eklentisi dosyanın yüklemesini başarısız kıldı.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Bu derlem {{ limit }} veya daha çok eleman içermelidir.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Bu derlem {{ limit }} veya daha az eleman içermelidir.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Bu derlem {{ limit }} eleman içermelidir.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Geçersiz kart numarası.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Desteklenmeyen kart tipi veya geçersiz kart numarası.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.uk.xlf b/vendor/symfony/validator/Resources/translations/validators.uk.xlf
deleted file mode 100644
index 02ecd5a..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.uk.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Значення повинно бути Ні.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Значення повинно бути Так.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Тип значення повинен бути {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Значення повинно бути пустим.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Обране вами значення недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Ви повинні обрати хоча б {{ limit }} варіант.|Ви повинні обрати хоча б {{ limit }} варіанти.|Ви повинні обрати хоча б {{ limit }} варіантів.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Ви повинні обрати не більше ніж {{ limit }} варіантів.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Одне або кілька заданих значень є недопустимі.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Це поле не очікується.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Це поле не вистачає.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Дане значення не є вірною датою.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Дане значення дати та часу недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Значення адреси электронної пошти недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Файл не знайдено.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Файл не читається.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл занадто великий ({{ size }} {{ suffix }}). Дозволений максимальний розмір {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>MIME-тип файлу недопустимий ({{ type }}). Допустимі MIME-типи файлів {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Значення повинно бути {{ limit }} або менше.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Значення занадто довге. Повинно бути рівне {{ limit }} символу або менше.|Значення занадто довге. Повинно бути рівне {{ limit }} символам або менше.|Значення занадто довге. Повинно бути рівне {{ limit }} символам або менше.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Значення повинно бути {{ limit }} або більше.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Значення занадто коротке. Повинно бути рівне {{ limit }} символу або більше.|Значення занадто коротке. Повинно бути рівне {{ limit }} символам або більше.|Значення занадто коротке. Повинно бути рівне {{ limit }} символам або більше.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Значення не повинно бути пустим.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Значення не повинно бути null.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Значення повинно бути null.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Значення недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Значення часу недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Значення URL недопустиме.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Обидва занчення повинні бути одинаковими.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Файл занадто великий. Максимальний допустимий розмір {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Файл занадто великий.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Файл не можливо завантажити.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Значення має бути допустимим числом.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Цей файл не є допустимим форматом зображення.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Це некоректна IP адреса.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Це некоректна мова.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Це некоректна локалізація.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Це некоректна країна.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Це значення вже використовується.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Не вдалося визначити розмір зображення.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Ширина зображення занадто велика ({{ width }}px). Максимально допустима ширина {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Ширина зображення занадто мала ({{ width }}px). Мінімально допустима ширина {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Висота зображення занадто велика ({{ height }}px). Максимально допустима висота {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Висота зображення занадто мала ({{ height }}px). Мінімально допустима висота {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Значення має бути поточним паролем користувача.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Значення повиино бути рівним {{ limit }} символу.|Значення повиино бути рівним {{ limit }} символам.|Значення повиино бути рівним {{ limit }} символам.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Файл був завантажений лише частково.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Файл не був завантажений.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Не налаштована тимчасова директорія в php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Неможливо записати тимчасовий файл на диск.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Розширення PHP викликало помилку при завантаженні.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Ця колекція повинна містити {{ limit }} елемент чи більше.|Ця колекція повинна містити {{ limit }} елемента чи більше.|Ця колекція повинна містити {{ limit }} елементів чи більше.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Ця колекція повинна містити {{ limit }} елемент чи менше.|Ця колекція повинна містити {{ limit }} елемента чи менше.|Ця колекція повинна містити {{ limit }} елементов чи менше.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Ця колекція повинна містити рівно {{ limit }} елемент.|Ця колекція повинна містити рівно {{ limit }} елемента.|Ця колекція повинна містити рівно {{ limit }} елементів.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Невірний номер карти.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Непідтримуваний тип карти або невірний номер карти.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Це не дійсний міжнародний номер банківського рахунку (IBAN).</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Значення не у форматі ISBN-10.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Значення не у форматі ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Значення не відповідає форматам ISBN-10 та ISBN-13.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Значення має невірний формат ISSN.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Значення має невірний формат валюти.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Значення повинно дорівнювати {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Значення має бути більше ніж {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Значення має бути більше або дорівнювати {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Значення має бути ідентичним {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Значення повинно бути менше ніж {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Значення повинно бути менше або дорівнювати {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Значення не повинно дорівнювати  {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Значення не повинно бути ідентичним {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.vi.xlf b/vendor/symfony/validator/Resources/translations/validators.vi.xlf
deleted file mode 100644
index e1833c7..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.vi.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>Giá trị này phải là sai.</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>Giá trị này phải là đúng.</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>Giá trị này phải là kiểu  {{ type }}.</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>Giá trị này phải rỗng.</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>Giá trị bạn vừa chọn không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>Bạn phải chọn ít nhất {{ limit }} lựa chọn.|Bạn phải chọn ít nhất {{ limit }} lựa chọn.</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>Bạn phải chọn nhiều nhất {{ limit }} lựa chọn.|Bạn phải chọn nhiều  nhất {{ limit }} lựa chọn.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>Một hoặc nhiều giá trị được chọn không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>Lĩnh vực này không được dự kiến.</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>Lĩnh vực này là mất tích.</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>Giá trị không phải là ngày hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>Giá trị không phải là ngày tháng hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>Giá trị này không phải là email hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>Tập tin không tìm thấy.</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>Tập tin không thể đọc được.</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Tập tin quá lớn ({{ size }} {{ suffix }}). Kích thước tối đa cho phép {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>Kiểu mime của tập tin không hợp lệ ({{ type }}). Kiểu hợp lệ là {{ types }}.</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>Giá trị phải bằng hoặc nhỏ hơn {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>Giá trị quá dài. Phải bằng hoặc ít hơn {{ limit }} kí tự.|Giá trị quá dài. Phải bằng hoặc ít hơn {{ limit }} kí tự.</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>Giá trị phải lớn hơn hoặc bằng {{ limit }}.</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>Giá trị quá ngắn. Phải hơn hoặc bằng {{ limit }} kí tự.|Giá trị quá ngắn. Phải hơn hoặc bằng {{ limit }} kí tự.</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>Giá trị không được phép để trống.</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>Giá trị không được phép rỗng.</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>Giá trị phải rỗng.</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>Giá trị không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>Giá trị không phải là thời gian hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>Giá trị không phải là địa chỉ URL hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>Hai giá trị phải bằng nhau.</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>Tập tin quá lớn. Kích thước tối đa cho phép là {{ limit }} {{ suffix }}.</target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>Tập tin quá lớn.</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>Tập tin không thể tải lên.</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>Giá trị phải là con số.</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This file is not a valid image.</source>
-                <target>Tập tin không phải là hình ảnh.</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This is not a valid IP address.</source>
-                <target>Địa chỉ IP không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This value is not a valid language.</source>
-                <target>Giá trị không phải là ngôn ngữ hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid locale.</source>
-                <target>Giá trị không phải là một bản địa địa phương hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid country.</source>
-                <target>Giá trị không phải là nước hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>Giá trị đã được sử dụng.</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>Kích thước của hình ảnh không thể xác định.</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>Chiều rộng của hình quá lớn ({{ width }}px). Chiều rộng tối đa phải là {{ max_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>Chiều rộng của hình quá thấp ({{ width }}px). Chiều rộng tối thiểu phải là {{ min_width }}px.</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>Chiều cao của hình quá cao ({{ height }}px). Chiều cao tối đa phải là {{ max_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>Chiều cao của hình quá thấp ({{ height }}px). Chiều cao tối thiểu phải là {{ min_height }}px.</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>Giá trị này phải là mật khẩu hiện tại của người dùng.</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>Giá trị phải có chính xác {{ limit }} kí tự.|Giá trị phải có chính xác {{ limit }} kí tự.</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>Tập tin chỉ được tải lên một phần.</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>Tập tin không được tải lên.</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>Thư mục tạm không được định nghĩa trong php.ini.</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>Không thể ghi tập tin tạm ra đĩa.</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>Một PHP extension đã phá hỏng quá trình tải lên của tập tin.</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>Danh sách phải chứa {{ limit }} hoặc nhiều hơn thành phần.|Danh sách phải chứa {{ limit }} hoặc nhiều hơn thành phần.</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>Danh sách phải chứa {{ limit }} hoặc ít hơn thành phần.|Danh sách phải chứa {{ limit }} hoặc ít hơn thành phần.</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>Danh sách phải chứa chính xác {{ limit }} thành phần.|Danh sách phải chứa chính xác {{ limit }} thành phần.</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>Số thẻ không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>Thẻ không được hỗ trợ hoặc số thẻ không hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>Giá trị không phải là International Bank Account Number (IBAN) hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>Giá trị không phải là ISBN-10 hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>Giá trị không phải là ISBN-13 hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>Giá trị không phải là ISBN-10 hoặc ISBN-13 hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>Giá trị không là ISSN hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>Giá trị không phải là đơn vi tiền tệ hợp lệ.</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Giá trị phải bằng {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>Giá trị phải lớn hơn {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Giá trị phải lớn hơn hoặc bằng {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Giá trị phải giống  {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>Giá trị phải bé hơn {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Giá trị không được phép nhỏ hơn hoặc bằng {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>Giá trị không được phép bằng {{ compared_value }}.</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Giá trị không được phép giống như {{ compared_value_type }} {{ compared_value }}.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.zh_CN.xlf b/vendor/symfony/validator/Resources/translations/validators.zh_CN.xlf
deleted file mode 100644
index 6c95ef1..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.zh_CN.xlf
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>该变量的值应为 false 。</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>该变量的值应为 true 。</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>该变量的类型应为 {{ type }} 。</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>该变量值应为空。</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>选定变量的值不是有效的选项。</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>您至少要选择 {{ limit }} 个选项。</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>您最多能选择 {{ limit }} 个选项。</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>一个或者多个给定的值无效。</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>此字段是多余的。</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>此字段缺失。</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>该值不是一个有效的日期（date）。</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>该值不是一个有效的日期时间（datetime）。</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>该值不是一个有效的邮件地址。</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>文件未找到。</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>文件不可读。</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>文件太大 ({{ size }} {{ suffix }})。文件大小不可以超过 {{ limit }} {{ suffix }} 。</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>无效的文件类型 ({{ type }}) 。允许的文件类型有 {{ types }} 。</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>这个变量的值应该小于或等于 {{ limit }}。</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>字符串太长，长度不可超过 {{ limit }} 个字符。</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>该变量的值应该大于或等于 {{ limit }}。</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>字符串太短，长度不可少于 {{ limit }} 个字符。</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>该变量不应为空。</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>该变量不应为 null 。</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>该变量应为空 null 。</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>该变量值无效 。</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>该值不是一个有效的时间。</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>该值不是一个有效的 URL 。</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>这两个变量的值应该相等。</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>文件太大，文件大小不可以超过 {{ limit }} {{ suffix }}。 </target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>文件太大。</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>无法上传此文件。</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>该值应该为有效的数字。</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>该值不是有效的国家名。</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>该文件不是有效的图片。</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>该值不是有效的IP地址。</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>该值不是有效的语言名。</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid locale.</source>
-                <target>该值不是有效的区域值（locale）。</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>该值已经被使用。</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>不能解析图片大小。</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>图片太宽 ({{ width }}px)，最大宽度为 {{ max_width }}px 。</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>图片宽度不够 ({{ width }}px)，最小宽度为 {{ min_width }}px 。</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>图片太高 ({{ height }}px)，最大高度为 {{ max_height }}px 。</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>图片高度不够 ({{ height }}px)，最小高度为 {{ min_height }}px 。</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>该变量的值应为用户当前的密码。</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>该变量应为 {{ limit }} 个字符。</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>该文件的上传不完整。</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>没有上传任何文件。</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>php.ini 里没有配置临时文件目录。</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>临时文件写入磁盘失败。</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>某个 PHP 扩展造成上传失败。</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>该集合最少应包含 {{ limit }} 个元素。</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>该集合最多包含 {{ limit }} 个元素。</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>该集合应包含 {{ limit }} 个元素 element 。</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>无效的信用卡号。</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>不支持的信用卡类型或无效的信用卡号。</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>该值不是有效的国际银行帐号（IBAN）。</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>该值不是有效的10位国际标准书号（ISBN-10）。</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>该值不是有效的13位国际标准书号（ISBN-13）。</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>该值不是有效的国际标准书号（ISBN-10 或 ISBN-13）。</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>该值不是有效的国际标准期刊号（ISSN）。</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>该值不是有效的货币名（currency）。</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>该值应等于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>该值应大于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>该值应大于或等于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>该值应与 {{ compared_value_type }} {{ compared_value }} 相同。</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>该值应小于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>该值应小于或等于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>该值不应先等于 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>该值不应与 {{ compared_value_type }} {{ compared_value }} 相同。</target>
-            </trans-unit>
-            <trans-unit id="73">
-                <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
-                <target>图片宽高比太大 ({{ ratio }})。允许的最大宽高比为 {{ max_ratio }}。</target>
-            </trans-unit>
-            <trans-unit id="74">
-                <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
-                <target>图片宽高比太小 ({{ ratio }})。允许的最大宽高比为 {{ min_ratio }}。</target>
-            </trans-unit>
-            <trans-unit id="75">
-                <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
-                <target>图片是方形的 ({{ width }}x{{ height }}px)。不允许使用方形的图片。</target>
-            </trans-unit>
-            <trans-unit id="76">
-                <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
-                <target>图片是横向的 ({{ width }}x{{ height }}px)。不允许使用横向的图片。</target>
-            </trans-unit>
-            <trans-unit id="77">
-                <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
-                <target>图片是纵向的 ({{ width }}x{{ height }}px)。不允许使用纵向的图片。</target>
-            </trans-unit>
-            <trans-unit id="78">
-                <source>An empty file is not allowed.</source>
-                <target>不允许使用空文件。</target>
-            </trans-unit>
-            <trans-unit id="79">
-                <source>The host could not be resolved.</source>
-                <target>主机名无法解析。</target>
-            </trans-unit>
-            <trans-unit id="80">
-                <source>This value does not match the expected {{ charset }} charset.</source>
-                <target>该值不符合 {{ charset }} 编码。</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf b/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf
deleted file mode 100644
index d9d5f2f..0000000
--- a/vendor/symfony/validator/Resources/translations/validators.zh_TW.xlf
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>This value should be false.</source>
-                <target>該變數的值應為 false 。</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>This value should be true.</source>
-                <target>該變數的值應為 true 。</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>This value should be of type {{ type }}.</source>
-                <target>該變數的類型應為 {{ type }} 。</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>This value should be blank.</source>
-                <target>該變數應為空。</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>The value you selected is not a valid choice.</source>
-                <target>選定變數的值不是有效的選項。</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source>
-                <target>您至少要選擇 {{ limit }} 個選項。</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source>
-                <target>您最多能選擇 {{ limit }} 個選項。</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>One or more of the given values is invalid.</source>
-                <target>一個或者多個給定的值無效。</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>This field was not expected.</source>
-                <target>此字段是沒有預料到。</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>This field is missing.</source>
-                <target>此字段缺失。</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>This value is not a valid date.</source>
-                <target>該值不是一個有效的日期（date）。</target>
-            </trans-unit>
-            <trans-unit id="12">
-                <source>This value is not a valid datetime.</source>
-                <target>該值不是一個有效的日期時間（datetime）。</target>
-            </trans-unit>
-            <trans-unit id="13">
-                <source>This value is not a valid email address.</source>
-                <target>該值不是一個有效的郵件地址。</target>
-            </trans-unit>
-            <trans-unit id="14">
-                <source>The file could not be found.</source>
-                <target>找不到檔案。</target>
-            </trans-unit>
-            <trans-unit id="15">
-                <source>The file is not readable.</source>
-                <target>無法讀取檔案。</target>
-            </trans-unit>
-            <trans-unit id="16">
-                <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>檔案太大 ({{ size }} {{ suffix }})。檔案大小不可以超過 {{ limit }} {{ suffix }} 。</target>
-            </trans-unit>
-            <trans-unit id="17">
-                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source>
-                <target>無效的檔案類型 ({{ type }}) 。允許的檔案類型有 {{ types }} 。</target>
-            </trans-unit>
-            <trans-unit id="18">
-                <source>This value should be {{ limit }} or less.</source>
-                <target>這個變數的值應該小於或等於 {{ limit }}。</target>
-            </trans-unit>
-            <trans-unit id="19">
-                <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source>
-                <target>字串太長，長度不可超過 {{ limit }} 個字元。</target>
-            </trans-unit>
-            <trans-unit id="20">
-                <source>This value should be {{ limit }} or more.</source>
-                <target>該變數的值應該大於或等於 {{ limit }}。</target>
-            </trans-unit>
-            <trans-unit id="21">
-                <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source>
-                <target>字串太短，長度不可少於 {{ limit }} 個字元。</target>
-            </trans-unit>
-            <trans-unit id="22">
-                <source>This value should not be blank.</source>
-                <target>該變數不應為空白。</target>
-            </trans-unit>
-            <trans-unit id="23">
-                <source>This value should not be null.</source>
-                <target>該值不應為 null 。</target>
-            </trans-unit>
-            <trans-unit id="24">
-                <source>This value should be null.</source>
-                <target>該值應為 null 。</target>
-            </trans-unit>
-            <trans-unit id="25">
-                <source>This value is not valid.</source>
-                <target>無效的數值 。</target>
-            </trans-unit>
-            <trans-unit id="26">
-                <source>This value is not a valid time.</source>
-                <target>該值不是一個有效的時間。</target>
-            </trans-unit>
-            <trans-unit id="27">
-                <source>This value is not a valid URL.</source>
-                <target>該值不是一個有效的 URL 。</target>
-            </trans-unit>
-            <trans-unit id="31">
-                <source>The two values should be equal.</source>
-                <target>這兩個變數的值應該相等。</target>
-            </trans-unit>
-            <trans-unit id="32">
-                <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
-                <target>檔案太大，檔案大小不可以超過 {{ limit }} {{ suffix }}。 </target>
-            </trans-unit>
-            <trans-unit id="33">
-                <source>The file is too large.</source>
-                <target>檔案太大。</target>
-            </trans-unit>
-            <trans-unit id="34">
-                <source>The file could not be uploaded.</source>
-                <target>無法上傳此檔案。</target>
-            </trans-unit>
-            <trans-unit id="35">
-                <source>This value should be a valid number.</source>
-                <target>該值應該為有效的數字。</target>
-            </trans-unit>
-            <trans-unit id="36">
-                <source>This value is not a valid country.</source>
-                <target>該值不是有效的國家名。</target>
-            </trans-unit>
-            <trans-unit id="37">
-                <source>This file is not a valid image.</source>
-                <target>該檔案不是有效的圖片。</target>
-            </trans-unit>
-            <trans-unit id="38">
-                <source>This is not a valid IP address.</source>
-                <target>該值不是有效的IP地址。</target>
-            </trans-unit>
-            <trans-unit id="39">
-                <source>This value is not a valid language.</source>
-                <target>該值不是有效的語言名。</target>
-            </trans-unit>
-            <trans-unit id="40">
-                <source>This value is not a valid locale.</source>
-                <target>該值不是有效的區域值（locale）。</target>
-            </trans-unit>
-            <trans-unit id="41">
-                <source>This value is already used.</source>
-                <target>該值已經被使用。</target>
-            </trans-unit>
-            <trans-unit id="42">
-                <source>The size of the image could not be detected.</source>
-                <target>不能解析圖片大小。</target>
-            </trans-unit>
-            <trans-unit id="43">
-                <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
-                <target>圖片太寬 ({{ width }}px)，最大寬度為 {{ max_width }}px 。</target>
-            </trans-unit>
-            <trans-unit id="44">
-                <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
-                <target>圖片寬度不夠 ({{ width }}px)，最小寬度為 {{ min_width }}px 。</target>
-            </trans-unit>
-            <trans-unit id="45">
-                <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
-                <target>圖片太高 ({{ height }}px)，最大高度為 {{ max_height }}px 。</target>
-            </trans-unit>
-            <trans-unit id="46">
-                <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
-                <target>圖片高度不夠 ({{ height }}px)，最小高度為 {{ min_height }}px 。</target>
-            </trans-unit>
-            <trans-unit id="47">
-                <source>This value should be the user's current password.</source>
-                <target>該變數的值應為用戶目前的密碼。</target>
-            </trans-unit>
-            <trans-unit id="48">
-                <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source>
-                <target>該變數應為 {{ limit }} 個字元。</target>
-            </trans-unit>
-            <trans-unit id="49">
-                <source>The file was only partially uploaded.</source>
-                <target>該檔案的上傳不完整。</target>
-            </trans-unit>
-            <trans-unit id="50">
-                <source>No file was uploaded.</source>
-                <target>沒有上傳任何檔案。</target>
-            </trans-unit>
-            <trans-unit id="51">
-                <source>No temporary folder was configured in php.ini.</source>
-                <target>php.ini 裡沒有配置臨時目錄。</target>
-            </trans-unit>
-            <trans-unit id="52">
-                <source>Cannot write temporary file to disk.</source>
-                <target>暫存檔寫入磁碟失敗。</target>
-            </trans-unit>
-            <trans-unit id="53">
-                <source>A PHP extension caused the upload to fail.</source>
-                <target>某個 PHP 擴展造成上傳失敗。</target>
-            </trans-unit>
-            <trans-unit id="54">
-                <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source>
-                <target>該集合最少應包含 {{ limit }} 個元素。</target>
-            </trans-unit>
-            <trans-unit id="55">
-                <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source>
-                <target>該集合最多包含 {{ limit }} 個元素。</target>
-            </trans-unit>
-            <trans-unit id="56">
-                <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source>
-                <target>該集合應包含 {{ limit }} 個元素 element 。</target>
-            </trans-unit>
-            <trans-unit id="57">
-                <source>Invalid card number.</source>
-                <target>無效的信用卡號。</target>
-            </trans-unit>
-            <trans-unit id="58">
-                <source>Unsupported card type or invalid card number.</source>
-                <target>不支援的信用卡類型或無效的信用卡號。</target>
-            </trans-unit>
-            <trans-unit id="59">
-                <source>This is not a valid International Bank Account Number (IBAN).</source>
-                <target>該值不是有效的國際銀行帳號（IBAN）。</target>
-            </trans-unit>
-            <trans-unit id="60">
-                <source>This value is not a valid ISBN-10.</source>
-                <target>該值不是有效的10位國際標準書號（ISBN-10）。</target>
-            </trans-unit>
-            <trans-unit id="61">
-                <source>This value is not a valid ISBN-13.</source>
-                <target>該值不是有效的13位國際標準書號（ISBN-13）。</target>
-            </trans-unit>
-            <trans-unit id="62">
-                <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source>
-                <target>該值不是有效的國際標準書號（ISBN-10 或 ISBN-13）。</target>
-            </trans-unit>
-            <trans-unit id="63">
-                <source>This value is not a valid ISSN.</source>
-                <target>該值不是有效的國際標準期刊號（ISSN）。</target>
-            </trans-unit>
-            <trans-unit id="64">
-                <source>This value is not a valid currency.</source>
-                <target>該值不是有效的貨幣名（currency）。</target>
-            </trans-unit>
-            <trans-unit id="65">
-                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>該值應等於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="66">
-                <source>This value should be greater than {{ compared_value }}.</source>
-                <target>該值應大於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="67">
-                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>該值應大於或等於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="68">
-                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>該值應與 {{ compared_value_type }} {{ compared_value }} 相同。</target>
-            </trans-unit>
-            <trans-unit id="69">
-                <source>This value should be less than {{ compared_value }}.</source>
-                <target>該值應小於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="70">
-                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>該值應小於或等於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="71">
-                <source>This value should not be equal to {{ compared_value }}.</source>
-                <target>該值應不等於 {{ compared_value }} 。</target>
-            </trans-unit>
-            <trans-unit id="72">
-                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>該值不應與 {{ compared_value_type }} {{ compared_value }} 相同。</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
diff --git a/vendor/symfony/validator/Util/PropertyPath.php b/vendor/symfony/validator/Util/PropertyPath.php
deleted file mode 100644
index 3ef8a8b..0000000
--- a/vendor/symfony/validator/Util/PropertyPath.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Component\Validator\Util;
-
-/**
- * Contains utility methods for dealing with property paths.
- *
- * For more extensive functionality, use Symfony's PropertyAccess component.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class PropertyPath
-{
-    /**
-     * Appends a path to a given property path.
-     *
-     * If the base path is empty, the appended path will be returned unchanged.
-     * If the base path is not empty, and the appended path starts with a
-     * squared opening bracket ("["), the concatenation of the two paths is
-     * returned. Otherwise, the concatenation of the two paths is returned,
-     * separated by a dot (".").
-     *
-     * @param string $basePath The base path
-     * @param string $subPath  The path to append
-     *
-     * @return string The concatenation of the two property paths
-     */
-    public static function append($basePath, $subPath)
-    {
-        if ('' !== (string) $subPath) {
-            if ('[' === $subPath{0}) {
-                return $basePath.$subPath;
-            }
-
-            return '' !== (string) $basePath ? $basePath.'.'.$subPath : $subPath;
-        }
-
-        return $basePath;
-    }
-
-    /**
-     * Not instantiable.
-     */
-    private function __construct()
-    {
-    }
-}
diff --git a/vendor/symfony/validator/Validation.php b/vendor/symfony/validator/Validation.php
deleted file mode 100644
index 1693f73..0000000
--- a/vendor/symfony/validator/Validation.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Entry point for the Validator component.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-final class Validation
-{
-    /**
-     * The Validator API provided by Symfony 2.4 and older.
-     *
-     * @deprecated use API_VERSION_2_5_BC instead.
-     */
-    const API_VERSION_2_4 = 1;
-
-    /**
-     * The Validator API provided by Symfony 2.5 and newer.
-     */
-    const API_VERSION_2_5 = 2;
-
-    /**
-     * The Validator API provided by Symfony 2.5 and newer with a backwards
-     * compatibility layer for 2.4 and older.
-     */
-    const API_VERSION_2_5_BC = 3;
-
-    /**
-     * Creates a new validator.
-     *
-     * If you want to configure the validator, use
-     * {@link createValidatorBuilder()} instead.
-     *
-     * @return ValidatorInterface The new validator.
-     */
-    public static function createValidator()
-    {
-        return self::createValidatorBuilder()->getValidator();
-    }
-
-    /**
-     * Creates a configurable builder for validator objects.
-     *
-     * @return ValidatorBuilderInterface The new builder.
-     */
-    public static function createValidatorBuilder()
-    {
-        return new ValidatorBuilder();
-    }
-
-    /**
-     * This class cannot be instantiated.
-     */
-    private function __construct()
-    {
-    }
-}
diff --git a/vendor/symfony/validator/ValidationVisitor.php b/vendor/symfony/validator/ValidationVisitor.php
deleted file mode 100644
index 8386462..0000000
--- a/vendor/symfony/validator/ValidationVisitor.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?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\Component\Validator;
-
-@trigger_error('The '.__NAMESPACE__.'\ValidationVisitor class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Exception\NoSuchMetadataException;
-use Symfony\Component\Validator\Exception\UnexpectedTypeException;
-
-/**
- * Default implementation of {@link ValidationVisitorInterface} and
- * {@link GlobalExecutionContextInterface}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class ValidationVisitor implements ValidationVisitorInterface, GlobalExecutionContextInterface
-{
-    /**
-     * @var mixed
-     */
-    private $root;
-
-    /**
-     * @var MetadataFactoryInterface
-     */
-    private $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
-    private $validatorFactory;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var null|string
-     */
-    private $translationDomain;
-
-    /**
-     * @var array
-     */
-    private $objectInitializers;
-
-    /**
-     * @var ConstraintViolationList
-     */
-    private $violations;
-
-    /**
-     * @var array
-     */
-    private $validatedObjects = array();
-
-    /**
-     * Creates a new validation visitor.
-     *
-     * @param mixed                               $root               The value passed to the validator.
-     * @param MetadataFactoryInterface            $metadataFactory    The factory for obtaining metadata instances.
-     * @param ConstraintValidatorFactoryInterface $validatorFactory   The factory for creating constraint validators.
-     * @param TranslatorInterface                 $translator         The translator for translating violation messages.
-     * @param string|null                         $translationDomain  The domain of the translation messages.
-     * @param ObjectInitializerInterface[]        $objectInitializers The initializers for preparing objects before validation.
-     *
-     * @throws UnexpectedTypeException If any of the object initializers is not an instance of ObjectInitializerInterface
-     */
-    public function __construct($root, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, TranslatorInterface $translator, $translationDomain = null, array $objectInitializers = array())
-    {
-        foreach ($objectInitializers as $initializer) {
-            if (!$initializer instanceof ObjectInitializerInterface) {
-                throw new UnexpectedTypeException($initializer, 'Symfony\Component\Validator\ObjectInitializerInterface');
-            }
-        }
-
-        $this->root = $root;
-        $this->metadataFactory = $metadataFactory;
-        $this->validatorFactory = $validatorFactory;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-        $this->objectInitializers = $objectInitializers;
-        $this->violations = new ConstraintViolationList();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function visit(MetadataInterface $metadata, $value, $group, $propertyPath)
-    {
-        $context = new ExecutionContext(
-            $this,
-            $this->translator,
-            $this->translationDomain,
-            $metadata,
-            $value,
-            $group,
-            $propertyPath
-        );
-
-        $context->validateValue($value, $metadata->findConstraints($group));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $group, $propertyPath, $traverse = false, $deep = false)
-    {
-        if (null === $value) {
-            return;
-        }
-
-        if (is_object($value)) {
-            $hash = spl_object_hash($value);
-
-            // Exit, if the object is already validated for the current group
-            if (isset($this->validatedObjects[$hash][$group])) {
-                return;
-            }
-
-            // Initialize if the object wasn't initialized before
-            if (!isset($this->validatedObjects[$hash])) {
-                foreach ($this->objectInitializers as $initializer) {
-                    if (!$initializer instanceof ObjectInitializerInterface) {
-                        throw new \LogicException('Validator initializers must implement ObjectInitializerInterface.');
-                    }
-                    $initializer->initialize($value);
-                }
-            }
-
-            // Remember validating this object before starting and possibly
-            // traversing the object graph
-            $this->validatedObjects[$hash][$group] = true;
-        }
-
-        // Validate arrays recursively by default, otherwise every driver needs
-        // to implement special handling for arrays.
-        // https://github.com/symfony/symfony/issues/6246
-        if (is_array($value) || ($traverse && $value instanceof \Traversable)) {
-            foreach ($value as $key => $element) {
-                // Ignore any scalar values in the collection
-                if (is_object($element) || is_array($element)) {
-                    // Only repeat the traversal if $deep is set
-                    $this->validate($element, $group, $propertyPath.'['.$key.']', $deep, $deep);
-                }
-            }
-
-            try {
-                $this->metadataFactory->getMetadataFor($value)->accept($this, $value, $group, $propertyPath);
-            } catch (NoSuchMetadataException $e) {
-                // Metadata doesn't necessarily have to exist for
-                // traversable objects, because we know how to validate
-                // them anyway. Optionally, additional metadata is supported.
-            }
-        } else {
-            $this->metadataFactory->getMetadataFor($value)->accept($this, $value, $group, $propertyPath);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getViolations()
-    {
-        return $this->violations;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoot()
-    {
-        return $this->root;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVisitor()
-    {
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValidatorFactory()
-    {
-        return $this->validatorFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        return $this->metadataFactory;
-    }
-}
diff --git a/vendor/symfony/validator/ValidationVisitorInterface.php b/vendor/symfony/validator/ValidationVisitorInterface.php
deleted file mode 100644
index 0ab7b73..0000000
--- a/vendor/symfony/validator/ValidationVisitorInterface.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Validates values against constraints defined in {@link MetadataInterface}
- * instances.
- *
- * This interface is an implementation of the Visitor design pattern. A value
- * is validated by first passing it to the {@link validate} method. That method
- * will determine the matching {@link MetadataInterface} for validating the
- * value. It then calls the {@link MetadataInterface::accept} method of that
- * metadata. <tt>accept()</tt> does two things:
- *
- * <ol>
- * <li>It calls {@link visit} to validate the value against the constraints of
- * the metadata.</li>
- * <li>It calls <tt>accept()</tt> on all nested metadata instances with the
- * corresponding values extracted from the current value. For example, if the
- * current metadata represents a class and the current value is an object of
- * that class, the metadata contains nested instances for each property of that
- * class. It forwards the call to these nested metadata with the values of the
- * corresponding properties in the original object.</li>
- * </ol>
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-interface ValidationVisitorInterface
-{
-    /**
-     * Validates a value.
-     *
-     * If the value is an array or a traversable object, you can set the
-     * parameter <tt>$traverse</tt> to <tt>true</tt> in order to run through
-     * the collection and validate each element. If these elements can be
-     * collections again and you want to traverse them recursively, set the
-     * parameter <tt>$deep</tt> to <tt>true</tt> as well.
-     *
-     * If you set <tt>$traversable</tt> to <tt>true</tt>, the visitor will
-     * nevertheless try to find metadata for the collection and validate its
-     * constraints. If no such metadata is found, the visitor ignores that and
-     * only iterates the collection.
-     *
-     * If you don't set <tt>$traversable</tt> to <tt>true</tt> and the visitor
-     * does not find metadata for the given value, it will fail with an
-     * exception.
-     *
-     * @param mixed  $value        The value to validate.
-     * @param string $group        The validation group to validate.
-     * @param string $propertyPath The current property path in the validation graph.
-     * @param bool   $traverse     Whether to traverse the value if it is traversable.
-     * @param bool   $deep         Whether to traverse nested traversable values recursively.
-     *
-     * @throws Exception\NoSuchMetadataException If no metadata can be found for
-     *                                           the given value.
-     */
-    public function validate($value, $group, $propertyPath, $traverse = false, $deep = false);
-
-    /**
-     * Validates a value against the constraints defined in some metadata.
-     *
-     * This method implements the Visitor design pattern. See also
-     * {@link ValidationVisitorInterface}.
-     *
-     * @param MetadataInterface $metadata     The metadata holding the constraints.
-     * @param mixed             $value        The value to validate.
-     * @param string            $group        The validation group to validate.
-     * @param string            $propertyPath The current property path in the validation graph.
-     */
-    public function visit(MetadataInterface $metadata, $value, $group, $propertyPath);
-}
diff --git a/vendor/symfony/validator/Validator.php b/vendor/symfony/validator/Validator.php
deleted file mode 100644
index 4da27e7..0000000
--- a/vendor/symfony/validator/Validator.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?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\Component\Validator;
-
-@trigger_error('The '.__NAMESPACE__.'\Validator class is deprecated since version 2.5 and will be removed in 3.0. Use the Symfony\Component\Validator\Validator\RecursiveValidator class instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Constraints\Valid;
-use Symfony\Component\Validator\Exception\ValidatorException;
-
-/**
- * Default implementation of {@link ValidatorInterface}.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link Validator\RecursiveValidator} instead.
- */
-class Validator implements ValidatorInterface, Mapping\Factory\MetadataFactoryInterface
-{
-    /**
-     * @var MetadataFactoryInterface
-     */
-    private $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
-    private $validatorFactory;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var null|string
-     */
-    private $translationDomain;
-
-    /**
-     * @var array
-     */
-    private $objectInitializers;
-
-    public function __construct(
-        MetadataFactoryInterface $metadataFactory,
-        ConstraintValidatorFactoryInterface $validatorFactory,
-        TranslatorInterface $translator,
-        $translationDomain = 'validators',
-        array $objectInitializers = array()
-    ) {
-        $this->metadataFactory = $metadataFactory;
-        $this->validatorFactory = $validatorFactory;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-        $this->objectInitializers = $objectInitializers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        return $this->metadataFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFor($value)
-    {
-        return $this->metadataFactory->getMetadataFor($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasMetadataFor($value)
-    {
-        return $this->metadataFactory->hasMetadataFor($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $groups = null, $traverse = false, $deep = false)
-    {
-        $visitor = $this->createVisitor($value);
-
-        foreach ($this->resolveGroups($groups) as $group) {
-            $visitor->validate($value, $group, '', $traverse, $deep);
-        }
-
-        return $visitor->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws ValidatorException If the metadata for the value does not support properties.
-     */
-    public function validateProperty($containingValue, $property, $groups = null)
-    {
-        $visitor = $this->createVisitor($containingValue);
-        $metadata = $this->metadataFactory->getMetadataFor($containingValue);
-
-        if (!$metadata instanceof PropertyMetadataContainerInterface) {
-            $valueAsString = is_scalar($containingValue)
-                ? '"'.$containingValue.'"'
-                : 'the value of type '.gettype($containingValue);
-
-            throw new ValidatorException(sprintf('The metadata for %s does not support properties.', $valueAsString));
-        }
-
-        foreach ($this->resolveGroups($groups) as $group) {
-            if (!$metadata->hasPropertyMetadata($property)) {
-                continue;
-            }
-
-            foreach ($metadata->getPropertyMetadata($property) as $propMeta) {
-                $propMeta->accept($visitor, $propMeta->getPropertyValue($containingValue), $group, $property);
-            }
-        }
-
-        return $visitor->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws ValidatorException If the metadata for the value does not support properties.
-     */
-    public function validatePropertyValue($containingValue, $property, $value, $groups = null)
-    {
-        $visitor = $this->createVisitor(is_object($containingValue) ? $containingValue : $value);
-        $metadata = $this->metadataFactory->getMetadataFor($containingValue);
-
-        if (!$metadata instanceof PropertyMetadataContainerInterface) {
-            $valueAsString = is_scalar($containingValue)
-                ? '"'.$containingValue.'"'
-                : 'the value of type '.gettype($containingValue);
-
-            throw new ValidatorException(sprintf('The metadata for '.$valueAsString.' does not support properties.'));
-        }
-
-        // If $containingValue is passed as class name, take $value as root
-        // and start the traversal with an empty property path
-        $propertyPath = is_object($containingValue) ? $property : '';
-
-        foreach ($this->resolveGroups($groups) as $group) {
-            if (!$metadata->hasPropertyMetadata($property)) {
-                continue;
-            }
-
-            foreach ($metadata->getPropertyMetadata($property) as $propMeta) {
-                $propMeta->accept($visitor, $value, $group, $propertyPath);
-            }
-        }
-
-        return $visitor->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateValue($value, $constraints, $groups = null)
-    {
-        $context = new ExecutionContext($this->createVisitor($value), $this->translator, $this->translationDomain);
-
-        $constraints = is_array($constraints) ? $constraints : array($constraints);
-
-        foreach ($constraints as $constraint) {
-            if ($constraint instanceof Valid) {
-                // Why can't the Valid constraint be executed directly?
-                //
-                // It cannot be executed like regular other constraints, because regular
-                // constraints are only executed *if they belong to the validated group*.
-                // The Valid constraint, on the other hand, is always executed and propagates
-                // the group to the cascaded object. The propagated group depends on
-                //
-                //  * Whether a group sequence is currently being executed. Then the default
-                //    group is propagated.
-                //
-                //  * Otherwise the validated group is propagated.
-
-                throw new ValidatorException(
-                    sprintf(
-                        'The constraint %s cannot be validated. Use the method validate() instead.',
-                        get_class($constraint)
-                    )
-                );
-            }
-
-            $context->validateValue($value, $constraint, '', $groups);
-        }
-
-        return $context->getViolations();
-    }
-
-    /**
-     * @param mixed $root
-     *
-     * @return ValidationVisitor
-     */
-    private function createVisitor($root)
-    {
-        return new ValidationVisitor(
-            $root,
-            $this->metadataFactory,
-            $this->validatorFactory,
-            $this->translator,
-            $this->translationDomain,
-            $this->objectInitializers
-        );
-    }
-
-    /**
-     * @param null|string|string[] $groups
-     *
-     * @return string[]
-     */
-    private function resolveGroups($groups)
-    {
-        return $groups ? (array) $groups : array(Constraint::DEFAULT_GROUP);
-    }
-}
diff --git a/vendor/symfony/validator/Validator/ContextualValidatorInterface.php b/vendor/symfony/validator/Validator/ContextualValidatorInterface.php
deleted file mode 100644
index 048d6c7..0000000
--- a/vendor/symfony/validator/Validator/ContextualValidatorInterface.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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\Component\Validator\Validator;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-
-/**
- * A validator in a specific execution context.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ContextualValidatorInterface
-{
-    /**
-     * Appends the given path to the property path of the context.
-     *
-     * If called multiple times, the path will always be reset to the context's
-     * original path with the given path appended to it.
-     *
-     * @param string $path The path to append
-     *
-     * @return ContextualValidatorInterface This validator
-     */
-    public function atPath($path);
-
-    /**
-     * Validates a value against a constraint or a list of constraints.
-     *
-     * If no constraint is passed, the constraint
-     * {@link \Symfony\Component\Validator\Constraints\Valid} is assumed.
-     *
-     * @param mixed                   $value       The value to validate
-     * @param Constraint|Constraint[] $constraints The constraint(s) to validate
-     *                                             against
-     * @param array|null              $groups      The validation groups to
-     *                                             validate. If none is given,
-     *                                             "Default" is assumed
-     *
-     * @return ContextualValidatorInterface This validator
-     */
-    public function validate($value, $constraints = null, $groups = null);
-
-    /**
-     * Validates a property of an object against the constraints specified
-     * for this property.
-     *
-     * @param object     $object       The object
-     * @param string     $propertyName The name of the validated property
-     * @param array|null $groups       The validation groups to validate. If
-     *                                 none is given, "Default" is assumed
-     *
-     * @return ContextualValidatorInterface This validator
-     */
-    public function validateProperty($object, $propertyName, $groups = null);
-
-    /**
-     * Validates a value against the constraints specified for an object's
-     * property.
-     *
-     * @param object|string $objectOrClass The object or its class name
-     * @param string        $propertyName  The name of the property
-     * @param mixed         $value         The value to validate against the
-     *                                     property's constraints
-     * @param array|null    $groups        The validation groups to validate. If
-     *                                     none is given, "Default" is assumed
-     *
-     * @return ContextualValidatorInterface This validator
-     */
-    public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null);
-
-    /**
-     * Returns the violations that have been generated so far in the context
-     * of the validator.
-     *
-     * @return ConstraintViolationListInterface The constraint violations
-     */
-    public function getViolations();
-}
diff --git a/vendor/symfony/validator/Validator/LegacyValidator.php b/vendor/symfony/validator/Validator/LegacyValidator.php
deleted file mode 100644
index e35f4c9..0000000
--- a/vendor/symfony/validator/Validator/LegacyValidator.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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\Component\Validator\Validator;
-
-@trigger_error('The '.__NAMESPACE__.'\LegacyValidator class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-/**
- * A validator that supports both the API of Symfony < 2.5 and Symfony 2.5+.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @see \Symfony\Component\Validator\ValidatorInterface
- * @see \Symfony\Component\Validator\Validator\ValidatorInterface
- * @deprecated since version 2.5, to be removed in 3.0.
- */
-class LegacyValidator extends RecursiveValidator
-{
-}
diff --git a/vendor/symfony/validator/Validator/RecursiveContextualValidator.php b/vendor/symfony/validator/Validator/RecursiveContextualValidator.php
deleted file mode 100644
index e27f6f6..0000000
--- a/vendor/symfony/validator/Validator/RecursiveContextualValidator.php
+++ /dev/null
@@ -1,875 +0,0 @@
-<?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\Component\Validator\Validator;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\GroupSequence;
-use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
-use Symfony\Component\Validator\Exception\NoSuchMetadataException;
-use Symfony\Component\Validator\Exception\RuntimeException;
-use Symfony\Component\Validator\Exception\UnsupportedMetadataException;
-use Symfony\Component\Validator\Exception\ValidatorException;
-use Symfony\Component\Validator\Mapping\CascadingStrategy;
-use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
-use Symfony\Component\Validator\Mapping\GenericMetadata;
-use Symfony\Component\Validator\Mapping\MetadataInterface;
-use Symfony\Component\Validator\Mapping\PropertyMetadataInterface;
-use Symfony\Component\Validator\Mapping\TraversalStrategy;
-use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\ObjectInitializerInterface;
-use Symfony\Component\Validator\Util\PropertyPath;
-
-/**
- * Recursive implementation of {@link ContextualValidatorInterface}.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class RecursiveContextualValidator implements ContextualValidatorInterface
-{
-    /**
-     * @var ExecutionContextInterface
-     */
-    private $context;
-
-    /**
-     * @var string
-     */
-    private $defaultPropertyPath;
-
-    /**
-     * @var array
-     */
-    private $defaultGroups;
-
-    /**
-     * @var MetadataFactoryInterface
-     */
-    private $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
-    private $validatorFactory;
-
-    /**
-     * @var ObjectInitializerInterface[]
-     */
-    private $objectInitializers;
-
-    /**
-     * Creates a validator for the given context.
-     *
-     * @param ExecutionContextInterface           $context            The execution context
-     * @param MetadataFactoryInterface            $metadataFactory    The factory for
-     *                                                                fetching the metadata
-     *                                                                of validated objects
-     * @param ConstraintValidatorFactoryInterface $validatorFactory   The factory for creating
-     *                                                                constraint validators
-     * @param ObjectInitializerInterface[]        $objectInitializers The object initializers
-     */
-    public function __construct(ExecutionContextInterface $context, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = array())
-    {
-        $this->context = $context;
-        $this->defaultPropertyPath = $context->getPropertyPath();
-        $this->defaultGroups = array($context->getGroup() ?: Constraint::DEFAULT_GROUP);
-        $this->metadataFactory = $metadataFactory;
-        $this->validatorFactory = $validatorFactory;
-        $this->objectInitializers = $objectInitializers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function atPath($path)
-    {
-        $this->defaultPropertyPath = $this->context->getPropertyPath($path);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $constraints = null, $groups = null)
-    {
-        $groups = $groups ? $this->normalizeGroups($groups) : $this->defaultGroups;
-
-        $previousValue = $this->context->getValue();
-        $previousObject = $this->context->getObject();
-        $previousMetadata = $this->context->getMetadata();
-        $previousPath = $this->context->getPropertyPath();
-        $previousGroup = $this->context->getGroup();
-
-        // If explicit constraints are passed, validate the value against
-        // those constraints
-        if (null !== $constraints) {
-            // You can pass a single constraint or an array of constraints
-            // Make sure to deal with an array in the rest of the code
-            if (!is_array($constraints)) {
-                $constraints = array($constraints);
-            }
-
-            $metadata = new GenericMetadata();
-            $metadata->addConstraints($constraints);
-
-            $this->validateGenericNode(
-                $value,
-                null,
-                is_object($value) ? spl_object_hash($value) : null,
-                $metadata,
-                $this->defaultPropertyPath,
-                $groups,
-                null,
-                TraversalStrategy::IMPLICIT,
-                $this->context
-            );
-
-            $this->context->setNode($previousValue, $previousObject, $previousMetadata, $previousPath);
-            $this->context->setGroup($previousGroup);
-
-            return $this;
-        }
-
-        // If an object is passed without explicit constraints, validate that
-        // object against the constraints defined for the object's class
-        if (is_object($value)) {
-            $this->validateObject(
-                $value,
-                $this->defaultPropertyPath,
-                $groups,
-                TraversalStrategy::IMPLICIT,
-                $this->context
-            );
-
-            $this->context->setNode($previousValue, $previousObject, $previousMetadata, $previousPath);
-            $this->context->setGroup($previousGroup);
-
-            return $this;
-        }
-
-        // If an array is passed without explicit constraints, validate each
-        // object in the array
-        if (is_array($value)) {
-            $this->validateEachObjectIn(
-                $value,
-                $this->defaultPropertyPath,
-                $groups,
-                true,
-                $this->context
-            );
-
-            $this->context->setNode($previousValue, $previousObject, $previousMetadata, $previousPath);
-            $this->context->setGroup($previousGroup);
-
-            return $this;
-        }
-
-        throw new RuntimeException(sprintf(
-            'Cannot validate values of type "%s" automatically. Please '.
-            'provide a constraint.',
-            gettype($value)
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateProperty($object, $propertyName, $groups = null)
-    {
-        $classMetadata = $this->metadataFactory->getMetadataFor($object);
-
-        if (!$classMetadata instanceof ClassMetadataInterface) {
-            // Cannot be UnsupportedMetadataException because of BC with
-            // Symfony < 2.5
-            throw new ValidatorException(sprintf(
-                'The metadata factory should return instances of '.
-                '"\Symfony\Component\Validator\Mapping\ClassMetadataInterface", '.
-                'got: "%s".',
-                is_object($classMetadata) ? get_class($classMetadata) : gettype($classMetadata)
-            ));
-        }
-
-        $propertyMetadatas = $classMetadata->getPropertyMetadata($propertyName);
-        $groups = $groups ? $this->normalizeGroups($groups) : $this->defaultGroups;
-        $cacheKey = spl_object_hash($object);
-        $propertyPath = PropertyPath::append($this->defaultPropertyPath, $propertyName);
-
-        $previousValue = $this->context->getValue();
-        $previousObject = $this->context->getObject();
-        $previousMetadata = $this->context->getMetadata();
-        $previousPath = $this->context->getPropertyPath();
-        $previousGroup = $this->context->getGroup();
-
-        foreach ($propertyMetadatas as $propertyMetadata) {
-            $propertyValue = $propertyMetadata->getPropertyValue($object);
-
-            $this->validateGenericNode(
-                $propertyValue,
-                $object,
-                $cacheKey.':'.$propertyName,
-                $propertyMetadata,
-                $propertyPath,
-                $groups,
-                null,
-                TraversalStrategy::IMPLICIT,
-                $this->context
-            );
-        }
-
-        $this->context->setNode($previousValue, $previousObject, $previousMetadata, $previousPath);
-        $this->context->setGroup($previousGroup);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null)
-    {
-        $classMetadata = $this->metadataFactory->getMetadataFor($objectOrClass);
-
-        if (!$classMetadata instanceof ClassMetadataInterface) {
-            // Cannot be UnsupportedMetadataException because of BC with
-            // Symfony < 2.5
-            throw new ValidatorException(sprintf(
-                'The metadata factory should return instances of '.
-                '"\Symfony\Component\Validator\Mapping\ClassMetadataInterface", '.
-                'got: "%s".',
-                is_object($classMetadata) ? get_class($classMetadata) : gettype($classMetadata)
-            ));
-        }
-
-        $propertyMetadatas = $classMetadata->getPropertyMetadata($propertyName);
-        $groups = $groups ? $this->normalizeGroups($groups) : $this->defaultGroups;
-
-        if (is_object($objectOrClass)) {
-            $object = $objectOrClass;
-            $cacheKey = spl_object_hash($objectOrClass);
-            $propertyPath = PropertyPath::append($this->defaultPropertyPath, $propertyName);
-        } else {
-            // $objectOrClass contains a class name
-            $object = null;
-            $cacheKey = null;
-            $propertyPath = $this->defaultPropertyPath;
-        }
-
-        $previousValue = $this->context->getValue();
-        $previousObject = $this->context->getObject();
-        $previousMetadata = $this->context->getMetadata();
-        $previousPath = $this->context->getPropertyPath();
-        $previousGroup = $this->context->getGroup();
-
-        foreach ($propertyMetadatas as $propertyMetadata) {
-            $this->validateGenericNode(
-                $value,
-                $object,
-                $cacheKey.':'.$propertyName,
-                $propertyMetadata,
-                $propertyPath,
-                $groups,
-                null,
-                TraversalStrategy::IMPLICIT,
-                $this->context
-            );
-        }
-
-        $this->context->setNode($previousValue, $previousObject, $previousMetadata, $previousPath);
-        $this->context->setGroup($previousGroup);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getViolations()
-    {
-        return $this->context->getViolations();
-    }
-
-    /**
-     * Normalizes the given group or list of groups to an array.
-     *
-     * @param mixed $groups The groups to normalize
-     *
-     * @return array A group array
-     */
-    protected function normalizeGroups($groups)
-    {
-        if (is_array($groups)) {
-            return $groups;
-        }
-
-        return array($groups);
-    }
-    /**
-     * Validates an object against the constraints defined for its class.
-     *
-     * If no metadata is available for the class, but the class is an instance
-     * of {@link \Traversable} and the selected traversal strategy allows
-     * traversal, the object will be iterated and each nested object will be
-     * validated instead.
-     *
-     * @param object                    $object            The object to cascade
-     * @param string                    $propertyPath      The current property path
-     * @param string[]                  $groups            The validated groups
-     * @param int                       $traversalStrategy The strategy for traversing the
-     *                                                     cascaded object
-     * @param ExecutionContextInterface $context           The current execution context
-     *
-     * @throws NoSuchMetadataException      If the object has no associated metadata
-     *                                      and does not implement {@link \Traversable}
-     *                                      or if traversal is disabled via the
-     *                                      $traversalStrategy argument
-     * @throws UnsupportedMetadataException If the metadata returned by the
-     *                                      metadata factory does not implement
-     *                                      {@link ClassMetadataInterface}
-     */
-    private function validateObject($object, $propertyPath, array $groups, $traversalStrategy, ExecutionContextInterface $context)
-    {
-        try {
-            $classMetadata = $this->metadataFactory->getMetadataFor($object);
-
-            if (!$classMetadata instanceof ClassMetadataInterface) {
-                throw new UnsupportedMetadataException(sprintf(
-                    'The metadata factory should return instances of '.
-                    '"Symfony\Component\Validator\Mapping\ClassMetadataInterface", '.
-                    'got: "%s".',
-                    is_object($classMetadata) ? get_class($classMetadata) : gettype($classMetadata)
-                ));
-            }
-
-            $this->validateClassNode(
-                $object,
-                spl_object_hash($object),
-                $classMetadata,
-                $propertyPath,
-                $groups,
-                null,
-                $traversalStrategy,
-                $context
-            );
-        } catch (NoSuchMetadataException $e) {
-            // Rethrow if not Traversable
-            if (!$object instanceof \Traversable) {
-                throw $e;
-            }
-
-            // Rethrow unless IMPLICIT or TRAVERSE
-            if (!($traversalStrategy & (TraversalStrategy::IMPLICIT | TraversalStrategy::TRAVERSE))) {
-                throw $e;
-            }
-
-            $this->validateEachObjectIn(
-                $object,
-                $propertyPath,
-                $groups,
-                $traversalStrategy & TraversalStrategy::STOP_RECURSION,
-                $context
-            );
-        }
-    }
-
-    /**
-     * Validates each object in a collection against the constraints defined
-     * for their classes.
-     *
-     * If the parameter $recursive is set to true, nested {@link \Traversable}
-     * objects are iterated as well. Nested arrays are always iterated,
-     * regardless of the value of $recursive.
-     *
-     * @param array|\Traversable        $collection    The collection
-     * @param string                    $propertyPath  The current property path
-     * @param string[]                  $groups        The validated groups
-     * @param bool                      $stopRecursion Whether to disable
-     *                                                 recursive iteration. For
-     *                                                 backwards compatibility
-     *                                                 with Symfony < 2.5.
-     * @param ExecutionContextInterface $context       The current execution context
-     *
-     * @see ClassNode
-     * @see CollectionNode
-     */
-    private function validateEachObjectIn($collection, $propertyPath, array $groups, $stopRecursion, ExecutionContextInterface $context)
-    {
-        if ($stopRecursion) {
-            $traversalStrategy = TraversalStrategy::NONE;
-        } else {
-            $traversalStrategy = TraversalStrategy::IMPLICIT;
-        }
-
-        foreach ($collection as $key => $value) {
-            if (is_array($value)) {
-                // Arrays are always cascaded, independent of the specified
-                // traversal strategy
-                // (BC with Symfony < 2.5)
-                $this->validateEachObjectIn(
-                    $value,
-                    $propertyPath.'['.$key.']',
-                    $groups,
-                    $stopRecursion,
-                    $context
-                );
-
-                continue;
-            }
-
-            // Scalar and null values in the collection are ignored
-            // (BC with Symfony < 2.5)
-            if (is_object($value)) {
-                $this->validateObject(
-                    $value,
-                    $propertyPath.'['.$key.']',
-                    $groups,
-                    $traversalStrategy,
-                    $context
-                );
-            }
-        }
-    }
-
-    /**
-     * Validates a class node.
-     *
-     * A class node is a combination of an object with a {@link ClassMetadataInterface}
-     * instance. Each class node (conceptionally) has zero or more succeeding
-     * property nodes:
-     *
-     *     (Article:class node)
-     *                \
-     *        ($title:property node)
-     *
-     * This method validates the passed objects against all constraints defined
-     * at class level. It furthermore triggers the validation of each of the
-     * class' properties against the constraints for that property.
-     *
-     * If the selected traversal strategy allows traversal, the object is
-     * iterated and each nested object is validated against its own constraints.
-     * The object is not traversed if traversal is disabled in the class
-     * metadata.
-     *
-     * If the passed groups contain the group "Default", the validator will
-     * check whether the "Default" group has been replaced by a group sequence
-     * in the class metadata. If this is the case, the group sequence is
-     * validated instead.
-     *
-     * @param object                    $object            The validated object
-     * @param string                    $cacheKey          The key for caching
-     *                                                     the validated object
-     * @param ClassMetadataInterface    $metadata          The class metadata of
-     *                                                     the object
-     * @param string                    $propertyPath      The property path leading
-     *                                                     to the object
-     * @param string[]                  $groups            The groups in which the
-     *                                                     object should be validated
-     * @param string[]|null             $cascadedGroups    The groups in which
-     *                                                     cascaded objects should
-     *                                                     be validated
-     * @param int                       $traversalStrategy The strategy used for
-     *                                                     traversing the object
-     * @param ExecutionContextInterface $context           The current execution context
-     *
-     * @throws UnsupportedMetadataException  If a property metadata does not
-     *                                       implement {@link PropertyMetadataInterface}
-     * @throws ConstraintDefinitionException If traversal was enabled but the
-     *                                       object does not implement
-     *                                       {@link \Traversable}
-     *
-     * @see TraversalStrategy
-     */
-    private function validateClassNode($object, $cacheKey, ClassMetadataInterface $metadata = null, $propertyPath, array $groups, $cascadedGroups, $traversalStrategy, ExecutionContextInterface $context)
-    {
-        $context->setNode($object, $object, $metadata, $propertyPath);
-
-        if (!$context->isObjectInitialized($cacheKey)) {
-            foreach ($this->objectInitializers as $initializer) {
-                $initializer->initialize($object);
-            }
-
-            $context->markObjectAsInitialized($cacheKey);
-        }
-
-        foreach ($groups as $key => $group) {
-            // If the "Default" group is replaced by a group sequence, remember
-            // to cascade the "Default" group when traversing the group
-            // sequence
-            $defaultOverridden = false;
-
-            // Use the object hash for group sequences
-            $groupHash = is_object($group) ? spl_object_hash($group) : $group;
-
-            if ($context->isGroupValidated($cacheKey, $groupHash)) {
-                // Skip this group when validating the properties and when
-                // traversing the object
-                unset($groups[$key]);
-
-                continue;
-            }
-
-            $context->markGroupAsValidated($cacheKey, $groupHash);
-
-            // Replace the "Default" group by the group sequence defined
-            // for the class, if applicable.
-            // This is done after checking the cache, so that
-            // spl_object_hash() isn't called for this sequence and
-            // "Default" is used instead in the cache. This is useful
-            // if the getters below return different group sequences in
-            // every call.
-            if (Constraint::DEFAULT_GROUP === $group) {
-                if ($metadata->hasGroupSequence()) {
-                    // The group sequence is statically defined for the class
-                    $group = $metadata->getGroupSequence();
-                    $defaultOverridden = true;
-                } elseif ($metadata->isGroupSequenceProvider()) {
-                    // The group sequence is dynamically obtained from the validated
-                    // object
-                    /* @var \Symfony\Component\Validator\GroupSequenceProviderInterface $object */
-                    $group = $object->getGroupSequence();
-                    $defaultOverridden = true;
-
-                    if (!$group instanceof GroupSequence) {
-                        $group = new GroupSequence($group);
-                    }
-                }
-            }
-
-            // If the groups (=[<G1,G2>,G3,G4]) contain a group sequence
-            // (=<G1,G2>), then call validateClassNode() with each entry of the
-            // group sequence and abort if necessary (G1, G2)
-            if ($group instanceof GroupSequence) {
-                $this->stepThroughGroupSequence(
-                     $object,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $traversalStrategy,
-                     $group,
-                     $defaultOverridden ? Constraint::DEFAULT_GROUP : null,
-                     $context
-                );
-
-                // Skip the group sequence when validating properties, because
-                // stepThroughGroupSequence() already validates the properties
-                unset($groups[$key]);
-
-                continue;
-            }
-
-            $this->validateInGroup($object, $cacheKey, $metadata, $group, $context);
-        }
-
-        // If no more groups should be validated for the property nodes,
-        // we can safely quit
-        if (0 === count($groups)) {
-            return;
-        }
-
-        // Validate all properties against their constraints
-        foreach ($metadata->getConstrainedProperties() as $propertyName) {
-            // If constraints are defined both on the getter of a property as
-            // well as on the property itself, then getPropertyMetadata()
-            // returns two metadata objects, not just one
-            foreach ($metadata->getPropertyMetadata($propertyName) as $propertyMetadata) {
-                if (!$propertyMetadata instanceof PropertyMetadataInterface) {
-                    throw new UnsupportedMetadataException(sprintf(
-                        'The property metadata instances should implement '.
-                        '"Symfony\Component\Validator\Mapping\PropertyMetadataInterface", '.
-                        'got: "%s".',
-                        is_object($propertyMetadata) ? get_class($propertyMetadata) : gettype($propertyMetadata)
-                    ));
-                }
-
-                $propertyValue = $propertyMetadata->getPropertyValue($object);
-
-                $this->validateGenericNode(
-                    $propertyValue,
-                    $object,
-                    $cacheKey.':'.$propertyName,
-                    $propertyMetadata,
-                    PropertyPath::append($propertyPath, $propertyName),
-                    $groups,
-                    $cascadedGroups,
-                    TraversalStrategy::IMPLICIT,
-                    $context
-                );
-            }
-        }
-
-        // If no specific traversal strategy was requested when this method
-        // was called, use the traversal strategy of the class' metadata
-        if ($traversalStrategy & TraversalStrategy::IMPLICIT) {
-            // Keep the STOP_RECURSION flag, if it was set
-            $traversalStrategy = $metadata->getTraversalStrategy()
-                | ($traversalStrategy & TraversalStrategy::STOP_RECURSION);
-        }
-
-        // Traverse only if IMPLICIT or TRAVERSE
-        if (!($traversalStrategy & (TraversalStrategy::IMPLICIT | TraversalStrategy::TRAVERSE))) {
-            return;
-        }
-
-        // If IMPLICIT, stop unless we deal with a Traversable
-        if ($traversalStrategy & TraversalStrategy::IMPLICIT && !$object instanceof \Traversable) {
-            return;
-        }
-
-        // If TRAVERSE, fail if we have no Traversable
-        if (!$object instanceof \Traversable) {
-            // Must throw a ConstraintDefinitionException for backwards
-            // compatibility reasons with Symfony < 2.5
-            throw new ConstraintDefinitionException(sprintf(
-                'Traversal was enabled for "%s", but this class '.
-                'does not implement "\Traversable".',
-                get_class($object)
-            ));
-        }
-
-        $this->validateEachObjectIn(
-            $object,
-            $propertyPath,
-            $groups,
-            $traversalStrategy & TraversalStrategy::STOP_RECURSION,
-            $context
-        );
-    }
-
-    /**
-     * Validates a node that is not a class node.
-     *
-     * Currently, two such node types exist:
-     *
-     *  - property nodes, which consist of the value of an object's
-     *    property together with a {@link PropertyMetadataInterface} instance
-     *  - generic nodes, which consist of a value and some arbitrary
-     *    constraints defined in a {@link MetadataInterface} container
-     *
-     * In both cases, the value is validated against all constraints defined
-     * in the passed metadata object. Then, if the value is an instance of
-     * {@link \Traversable} and the selected traversal strategy permits it,
-     * the value is traversed and each nested object validated against its own
-     * constraints. Arrays are always traversed.
-     *
-     * @param mixed                     $value             The validated value
-     * @param object|null               $object            The current object
-     * @param string                    $cacheKey          The key for caching
-     *                                                     the validated value
-     * @param MetadataInterface         $metadata          The metadata of the
-     *                                                     value
-     * @param string                    $propertyPath      The property path leading
-     *                                                     to the value
-     * @param string[]                  $groups            The groups in which the
-     *                                                     value should be validated
-     * @param string[]|null             $cascadedGroups    The groups in which
-     *                                                     cascaded objects should
-     *                                                     be validated
-     * @param int                       $traversalStrategy The strategy used for
-     *                                                     traversing the value
-     * @param ExecutionContextInterface $context           The current execution context
-     *
-     * @see TraversalStrategy
-     */
-    private function validateGenericNode($value, $object, $cacheKey, MetadataInterface $metadata = null, $propertyPath, array $groups, $cascadedGroups, $traversalStrategy, ExecutionContextInterface $context)
-    {
-        $context->setNode($value, $object, $metadata, $propertyPath);
-
-        foreach ($groups as $key => $group) {
-            if ($group instanceof GroupSequence) {
-                $this->stepThroughGroupSequence(
-                     $value,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $traversalStrategy,
-                     $group,
-                     null,
-                     $context
-                );
-
-                // Skip the group sequence when cascading, as the cascading
-                // logic is already done in stepThroughGroupSequence()
-                unset($groups[$key]);
-
-                continue;
-            }
-
-            $this->validateInGroup($value, $cacheKey, $metadata, $group, $context);
-        }
-
-        if (0 === count($groups)) {
-            return;
-        }
-
-        if (null === $value) {
-            return;
-        }
-
-        $cascadingStrategy = $metadata->getCascadingStrategy();
-
-        // Quit unless we have an array or a cascaded object
-        if (!is_array($value) && !($cascadingStrategy & CascadingStrategy::CASCADE)) {
-            return;
-        }
-
-        // If no specific traversal strategy was requested when this method
-        // was called, use the traversal strategy of the node's metadata
-        if ($traversalStrategy & TraversalStrategy::IMPLICIT) {
-            // Keep the STOP_RECURSION flag, if it was set
-            $traversalStrategy = $metadata->getTraversalStrategy()
-                | ($traversalStrategy & TraversalStrategy::STOP_RECURSION);
-        }
-
-        // The $cascadedGroups property is set, if the "Default" group is
-        // overridden by a group sequence
-        // See validateClassNode()
-        $cascadedGroups = count($cascadedGroups) > 0
-            ? $cascadedGroups
-            : $groups;
-
-        if (is_array($value)) {
-            // Arrays are always traversed, independent of the specified
-            // traversal strategy
-            // (BC with Symfony < 2.5)
-            $this->validateEachObjectIn(
-                $value,
-                $propertyPath,
-                $cascadedGroups,
-                $traversalStrategy & TraversalStrategy::STOP_RECURSION,
-                $context
-            );
-
-            return;
-        }
-
-        // If the value is a scalar, pass it anyway, because we want
-        // a NoSuchMetadataException to be thrown in that case
-        // (BC with Symfony < 2.5)
-        $this->validateObject(
-            $value,
-            $propertyPath,
-            $cascadedGroups,
-            $traversalStrategy,
-            $context
-        );
-
-        // Currently, the traversal strategy can only be TRAVERSE for a
-        // generic node if the cascading strategy is CASCADE. Thus, traversable
-        // objects will always be handled within validateObject() and there's
-        // nothing more to do here.
-
-        // see GenericMetadata::addConstraint()
-    }
-
-    /**
-     * Sequentially validates a node's value in each group of a group sequence.
-     *
-     * If any of the constraints generates a violation, subsequent groups in the
-     * group sequence are skipped.
-     *
-     * @param mixed                     $value             The validated value
-     * @param object|null               $object            The current object
-     * @param string                    $cacheKey          The key for caching
-     *                                                     the validated value
-     * @param MetadataInterface         $metadata          The metadata of the
-     *                                                     value
-     * @param string                    $propertyPath      The property path leading
-     *                                                     to the value
-     * @param int                       $traversalStrategy The strategy used for
-     *                                                     traversing the value
-     * @param GroupSequence             $groupSequence     The group sequence
-     * @param string[]|null             $cascadedGroup     The group that should
-     *                                                     be passed to cascaded
-     *                                                     objects instead of
-     *                                                     the group sequence
-     * @param ExecutionContextInterface $context           The execution context
-     */
-    private function stepThroughGroupSequence($value, $object, $cacheKey, MetadataInterface $metadata = null, $propertyPath, $traversalStrategy, GroupSequence $groupSequence, $cascadedGroup, ExecutionContextInterface $context)
-    {
-        $violationCount = count($context->getViolations());
-        $cascadedGroups = $cascadedGroup ? array($cascadedGroup) : null;
-
-        foreach ($groupSequence->groups as $groupInSequence) {
-            $groups = array($groupInSequence);
-
-            if ($metadata instanceof ClassMetadataInterface) {
-                $this->validateClassNode(
-                     $value,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $groups,
-                     $cascadedGroups,
-                     $traversalStrategy,
-                     $context
-                );
-            } else {
-                $this->validateGenericNode(
-                     $value,
-                     $object,
-                     $cacheKey,
-                     $metadata,
-                     $propertyPath,
-                     $groups,
-                     $cascadedGroups,
-                     $traversalStrategy,
-                     $context
-                );
-            }
-
-            // Abort sequence validation if a violation was generated
-            if (count($context->getViolations()) > $violationCount) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Validates a node's value against all constraints in the given group.
-     *
-     * @param mixed                     $value    The validated value
-     * @param string                    $cacheKey The key for caching the
-     *                                            validated value
-     * @param MetadataInterface         $metadata The metadata of the value
-     * @param string                    $group    The group to validate
-     * @param ExecutionContextInterface $context  The execution context
-     */
-    private function validateInGroup($value, $cacheKey, MetadataInterface $metadata, $group, ExecutionContextInterface $context)
-    {
-        $context->setGroup($group);
-
-        foreach ($metadata->findConstraints($group) as $constraint) {
-            // Prevent duplicate validation of constraints, in the case
-            // that constraints belong to multiple validated groups
-            if (null !== $cacheKey) {
-                $constraintHash = spl_object_hash($constraint);
-
-                if ($context->isConstraintValidated($cacheKey, $constraintHash)) {
-                    continue;
-                }
-
-                $context->markConstraintAsValidated($cacheKey, $constraintHash);
-            }
-
-            $context->setConstraint($constraint);
-
-            $validator = $this->validatorFactory->getInstance($constraint);
-            $validator->initialize($context);
-            $validator->validate($value, $constraint);
-        }
-    }
-}
diff --git a/vendor/symfony/validator/Validator/RecursiveValidator.php b/vendor/symfony/validator/Validator/RecursiveValidator.php
deleted file mode 100644
index e4dc0fb..0000000
--- a/vendor/symfony/validator/Validator/RecursiveValidator.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?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\Component\Validator\Validator;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Constraints\GroupSequence;
-use Symfony\Component\Validator\Constraints\Valid;
-use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
-use Symfony\Component\Validator\Context\ExecutionContextFactoryInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\MetadataFactoryInterface;
-use Symfony\Component\Validator\ObjectInitializerInterface;
-use Symfony\Component\Validator\ValidatorInterface as LegacyValidatorInterface;
-
-/**
- * Recursive implementation of {@link ValidatorInterface}.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class RecursiveValidator implements ValidatorInterface, LegacyValidatorInterface
-{
-    /**
-     * @var ExecutionContextFactoryInterface
-     */
-    protected $contextFactory;
-
-    /**
-     * @var MetadataFactoryInterface
-     */
-    protected $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface
-     */
-    protected $validatorFactory;
-
-    /**
-     * @var ObjectInitializerInterface[]
-     */
-    protected $objectInitializers;
-
-    /**
-     * Creates a new validator.
-     *
-     * @param ExecutionContextFactoryInterface    $contextFactory     The factory for
-     *                                                                creating new contexts
-     * @param MetadataFactoryInterface            $metadataFactory    The factory for
-     *                                                                fetching the metadata
-     *                                                                of validated objects
-     * @param ConstraintValidatorFactoryInterface $validatorFactory   The factory for creating
-     *                                                                constraint validators
-     * @param ObjectInitializerInterface[]        $objectInitializers The object initializers
-     */
-    public function __construct(ExecutionContextFactoryInterface $contextFactory, MetadataFactoryInterface $metadataFactory, ConstraintValidatorFactoryInterface $validatorFactory, array $objectInitializers = array())
-    {
-        $this->contextFactory = $contextFactory;
-        $this->metadataFactory = $metadataFactory;
-        $this->validatorFactory = $validatorFactory;
-        $this->objectInitializers = $objectInitializers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function startContext($root = null)
-    {
-        return new RecursiveContextualValidator(
-            $this->contextFactory->createContext($this, $root),
-            $this->metadataFactory,
-            $this->validatorFactory,
-            $this->objectInitializers
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function inContext(ExecutionContextInterface $context)
-    {
-        return new RecursiveContextualValidator(
-            $context,
-            $this->metadataFactory,
-            $this->validatorFactory,
-            $this->objectInitializers
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFor($object)
-    {
-        return $this->metadataFactory->getMetadataFor($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasMetadataFor($object)
-    {
-        return $this->metadataFactory->hasMetadataFor($object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validate($value, $groups = null, $traverse = false, $deep = false)
-    {
-        $numArgs = func_num_args();
-
-        // Use new signature if constraints are given in the second argument
-        if (self::testConstraints($groups) && ($numArgs < 3 || 3 === $numArgs && self::testGroups($traverse))) {
-            // Rename to avoid total confusion ;)
-            $constraints = $groups;
-            $groups = $traverse;
-        } else {
-            @trigger_error('The Symfony\Component\Validator\ValidatorInterface::validate method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
-
-            $constraints = new Valid(array('traverse' => $traverse, 'deep' => $deep));
-        }
-
-        return $this->startContext($value)
-            ->validate($value, $constraints, $groups)
-            ->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateProperty($object, $propertyName, $groups = null)
-    {
-        return $this->startContext($object)
-            ->validateProperty($object, $propertyName, $groups)
-            ->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null)
-    {
-        // If a class name is passed, take $value as root
-        return $this->startContext(is_object($objectOrClass) ? $objectOrClass : $value)
-            ->validatePropertyValue($objectOrClass, $propertyName, $value, $groups)
-            ->getViolations();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function validateValue($value, $constraints, $groups = null)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::validate method instead.', E_USER_DEPRECATED);
-
-        return $this->validate($value, $constraints, $groups);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadataFactory()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.5 and will be removed in version 3.0. Use the Symfony\Component\Validator\Validator\ValidatorInterface::getMetadataFor or Symfony\Component\Validator\Validator\ValidatorInterface::hasMetadataFor method instead.', E_USER_DEPRECATED);
-
-        return $this->metadataFactory;
-    }
-
-    private static function testConstraints($constraints)
-    {
-        return null === $constraints || $constraints instanceof Constraint || (is_array($constraints) && (0 === count($constraints) || current($constraints) instanceof Constraint));
-    }
-
-    private static function testGroups($groups)
-    {
-        return null === $groups || is_string($groups) || $groups instanceof GroupSequence || (is_array($groups) && (0 === count($groups) || is_string(current($groups)) || current($groups) instanceof GroupSequence));
-    }
-}
diff --git a/vendor/symfony/validator/Validator/ValidatorInterface.php b/vendor/symfony/validator/Validator/ValidatorInterface.php
deleted file mode 100644
index 3aafa34..0000000
--- a/vendor/symfony/validator/Validator/ValidatorInterface.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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\Component\Validator\Validator;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
-
-/**
- * Validates PHP values against constraints.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ValidatorInterface extends MetadataFactoryInterface
-{
-    /**
-     * Validates a value against a constraint or a list of constraints.
-     *
-     * If no constraint is passed, the constraint
-     * {@link \Symfony\Component\Validator\Constraints\Valid} is assumed.
-     *
-     * @param mixed                   $value       The value to validate
-     * @param Constraint|Constraint[] $constraints The constraint(s) to validate
-     *                                             against
-     * @param array|null              $groups      The validation groups to
-     *                                             validate. If none is given,
-     *                                             "Default" is assumed
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations.
-     *                                          If the list is empty, validation
-     *                                          succeeded
-     */
-    public function validate($value, $constraints = null, $groups = null);
-
-    /**
-     * Validates a property of an object against the constraints specified
-     * for this property.
-     *
-     * @param object     $object       The object
-     * @param string     $propertyName The name of the validated property
-     * @param array|null $groups       The validation groups to validate. If
-     *                                 none is given, "Default" is assumed
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations.
-     *                                          If the list is empty, validation
-     *                                          succeeded
-     */
-    public function validateProperty($object, $propertyName, $groups = null);
-
-    /**
-     * Validates a value against the constraints specified for an object's
-     * property.
-     *
-     * @param object|string $objectOrClass The object or its class name
-     * @param string        $propertyName  The name of the property
-     * @param mixed         $value         The value to validate against the
-     *                                     property's constraints
-     * @param array|null    $groups        The validation groups to validate. If
-     *                                     none is given, "Default" is assumed
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations.
-     *                                          If the list is empty, validation
-     *                                          succeeded
-     */
-    public function validatePropertyValue($objectOrClass, $propertyName, $value, $groups = null);
-
-    /**
-     * Starts a new validation context and returns a validator for that context.
-     *
-     * The returned validator collects all violations generated within its
-     * context. You can access these violations with the
-     * {@link ContextualValidatorInterface::getViolations()} method.
-     *
-     * @return ContextualValidatorInterface The validator for the new context
-     */
-    public function startContext();
-
-    /**
-     * Returns a validator in the given execution context.
-     *
-     * The returned validator adds all generated violations to the given
-     * context.
-     *
-     * @param ExecutionContextInterface $context The execution context
-     *
-     * @return ContextualValidatorInterface The validator for that context
-     */
-    public function inContext(ExecutionContextInterface $context);
-}
diff --git a/vendor/symfony/validator/ValidatorBuilder.php b/vendor/symfony/validator/ValidatorBuilder.php
deleted file mode 100644
index 4a69976..0000000
--- a/vendor/symfony/validator/ValidatorBuilder.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?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\Component\Validator;
-
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\CachedReader;
-use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Cache\ArrayCache;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Translation\IdentityTranslator;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Context\ExecutionContextFactory;
-use Symfony\Component\Validator\Exception\InvalidArgumentException;
-use Symfony\Component\Validator\Exception\ValidatorException;
-use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
-use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
-use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
-use Symfony\Component\Validator\Mapping\Loader\LoaderChain;
-use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
-use Symfony\Component\Validator\Mapping\Loader\XmlFileLoader;
-use Symfony\Component\Validator\Mapping\Loader\XmlFilesLoader;
-use Symfony\Component\Validator\Mapping\Loader\YamlFileLoader;
-use Symfony\Component\Validator\Mapping\Loader\YamlFilesLoader;
-use Symfony\Component\Validator\Validator\RecursiveValidator;
-
-/**
- * The default implementation of {@link ValidatorBuilderInterface}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-class ValidatorBuilder implements ValidatorBuilderInterface
-{
-    /**
-     * @var array
-     */
-    private $initializers = array();
-
-    /**
-     * @var array
-     */
-    private $xmlMappings = array();
-
-    /**
-     * @var array
-     */
-    private $yamlMappings = array();
-
-    /**
-     * @var array
-     */
-    private $methodMappings = array();
-
-    /**
-     * @var Reader|null
-     */
-    private $annotationReader;
-
-    /**
-     * @var MetadataFactoryInterface|null
-     */
-    private $metadataFactory;
-
-    /**
-     * @var ConstraintValidatorFactoryInterface|null
-     */
-    private $validatorFactory;
-
-    /**
-     * @var CacheInterface|null
-     */
-    private $metadataCache;
-
-    /**
-     * @var TranslatorInterface|null
-     */
-    private $translator;
-
-    /**
-     * @var null|string
-     */
-    private $translationDomain;
-
-    /**
-     * @var PropertyAccessorInterface|null
-     */
-    private $propertyAccessor;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addObjectInitializer(ObjectInitializerInterface $initializer)
-    {
-        $this->initializers[] = $initializer;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addObjectInitializers(array $initializers)
-    {
-        $this->initializers = array_merge($this->initializers, $initializers);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addXmlMapping($path)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->xmlMappings[] = $path;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addXmlMappings(array $paths)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->xmlMappings = array_merge($this->xmlMappings, $paths);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addYamlMapping($path)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->yamlMappings[] = $path;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addYamlMappings(array $paths)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->yamlMappings = array_merge($this->yamlMappings, $paths);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addMethodMapping($methodName)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->methodMappings[] = $methodName;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addMethodMappings(array $methodNames)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot add custom mappings after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->methodMappings = array_merge($this->methodMappings, $methodNames);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function enableAnnotationMapping(Reader $annotationReader = null)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot enable annotation mapping after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        if (null === $annotationReader) {
-            if (!class_exists('Doctrine\Common\Annotations\AnnotationReader') || !class_exists('Doctrine\Common\Cache\ArrayCache')) {
-                throw new \RuntimeException('Enabling annotation based constraint mapping requires the packages doctrine/annotations and doctrine/cache to be installed.');
-            }
-
-            $annotationReader = new CachedReader(new AnnotationReader(), new ArrayCache());
-        }
-
-        $this->annotationReader = $annotationReader;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function disableAnnotationMapping()
-    {
-        $this->annotationReader = null;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setMetadataFactory(MetadataFactoryInterface $metadataFactory)
-    {
-        if (count($this->xmlMappings) > 0 || count($this->yamlMappings) > 0 || count($this->methodMappings) > 0 || null !== $this->annotationReader) {
-            throw new ValidatorException('You cannot set a custom metadata factory after adding custom mappings. You should do either of both.');
-        }
-
-        $this->metadataFactory = $metadataFactory;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setMetadataCache(CacheInterface $cache)
-    {
-        if (null !== $this->metadataFactory) {
-            throw new ValidatorException('You cannot set a custom metadata cache after setting a custom metadata factory. Configure your metadata factory instead.');
-        }
-
-        $this->metadataCache = $cache;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory)
-    {
-        if (null !== $this->propertyAccessor) {
-            throw new ValidatorException('You cannot set a validator factory after setting a custom property accessor. Remove the call to setPropertyAccessor() if you want to call setConstraintValidatorFactory().');
-        }
-
-        $this->validatorFactory = $validatorFactory;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setTranslator(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setTranslationDomain($translationDomain)
-    {
-        $this->translationDomain = $translationDomain;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             The validator will function without a property accessor.
-     */
-    public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. The validator will function without a property accessor.', E_USER_DEPRECATED);
-
-        if (null !== $this->validatorFactory) {
-            throw new ValidatorException('You cannot set a property accessor after setting a custom validator factory. Configure your validator factory instead.');
-        }
-
-        $this->propertyAccessor = $propertyAccessor;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since version 2.7, to be removed in 3.0.
-     */
-    public function setApiVersion($apiVersion)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated in version 2.7 and will be removed in version 3.0.', E_USER_DEPRECATED);
-
-        if (!in_array($apiVersion, array(Validation::API_VERSION_2_4, Validation::API_VERSION_2_5, Validation::API_VERSION_2_5_BC))) {
-            throw new InvalidArgumentException(sprintf('The requested API version is invalid: "%s"', $apiVersion));
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getValidator()
-    {
-        $metadataFactory = $this->metadataFactory;
-
-        if (!$metadataFactory) {
-            $loaders = array();
-
-            if (count($this->xmlMappings) > 1) {
-                $loaders[] = new XmlFilesLoader($this->xmlMappings);
-            } elseif (1 === count($this->xmlMappings)) {
-                $loaders[] = new XmlFileLoader($this->xmlMappings[0]);
-            }
-
-            if (count($this->yamlMappings) > 1) {
-                $loaders[] = new YamlFilesLoader($this->yamlMappings);
-            } elseif (1 === count($this->yamlMappings)) {
-                $loaders[] = new YamlFileLoader($this->yamlMappings[0]);
-            }
-
-            foreach ($this->methodMappings as $methodName) {
-                $loaders[] = new StaticMethodLoader($methodName);
-            }
-
-            if ($this->annotationReader) {
-                $loaders[] = new AnnotationLoader($this->annotationReader);
-            }
-
-            $loader = null;
-
-            if (count($loaders) > 1) {
-                $loader = new LoaderChain($loaders);
-            } elseif (1 === count($loaders)) {
-                $loader = $loaders[0];
-            }
-
-            $metadataFactory = new LazyLoadingMetadataFactory($loader, $this->metadataCache);
-        }
-
-        $validatorFactory = $this->validatorFactory ?: new ConstraintValidatorFactory($this->propertyAccessor);
-        $translator = $this->translator;
-
-        if (null === $translator) {
-            $translator = new IdentityTranslator();
-            // Force the locale to be 'en' when no translator is provided rather than relying on the Intl default locale
-            // This avoids depending on Intl or the stub implementation being available. It also ensures that Symfony
-            // validation messages are pluralized properly even when the default locale gets changed because they are in
-            // English.
-            $translator->setLocale('en');
-        }
-
-        $contextFactory = new ExecutionContextFactory($translator, $this->translationDomain);
-
-        return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $this->initializers);
-    }
-}
diff --git a/vendor/symfony/validator/ValidatorBuilderInterface.php b/vendor/symfony/validator/ValidatorBuilderInterface.php
deleted file mode 100644
index e15fb7a..0000000
--- a/vendor/symfony/validator/ValidatorBuilderInterface.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?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\Component\Validator;
-
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
-
-/**
- * A configurable builder for ValidatorInterface objects.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ValidatorBuilderInterface
-{
-    /**
-     * Adds an object initializer to the validator.
-     *
-     * @param ObjectInitializerInterface $initializer The initializer
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addObjectInitializer(ObjectInitializerInterface $initializer);
-
-    /**
-     * Adds a list of object initializers to the validator.
-     *
-     * @param array $initializers The initializer
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addObjectInitializers(array $initializers);
-
-    /**
-     * Adds an XML constraint mapping file to the validator.
-     *
-     * @param string $path The path to the mapping file
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addXmlMapping($path);
-
-    /**
-     * Adds a list of XML constraint mapping files to the validator.
-     *
-     * @param array $paths The paths to the mapping files
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addXmlMappings(array $paths);
-
-    /**
-     * Adds a YAML constraint mapping file to the validator.
-     *
-     * @param string $path The path to the mapping file
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addYamlMapping($path);
-
-    /**
-     * Adds a list of YAML constraint mappings file to the validator.
-     *
-     * @param array $paths The paths to the mapping files
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addYamlMappings(array $paths);
-
-    /**
-     * Enables constraint mapping using the given static method.
-     *
-     * @param string $methodName The name of the method
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addMethodMapping($methodName);
-
-    /**
-     * Enables constraint mapping using the given static methods.
-     *
-     * @param array $methodNames The names of the methods
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function addMethodMappings(array $methodNames);
-
-    /**
-     * Enables annotation based constraint mapping.
-     *
-     * @param Reader $annotationReader The annotation reader to be used
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function enableAnnotationMapping(Reader $annotationReader = null);
-
-    /**
-     * Disables annotation based constraint mapping.
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function disableAnnotationMapping();
-
-    /**
-     * Sets the class metadata factory used by the validator.
-     *
-     * @param MetadataFactoryInterface $metadataFactory The metadata factory
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function setMetadataFactory(MetadataFactoryInterface $metadataFactory);
-
-    /**
-     * Sets the cache for caching class metadata.
-     *
-     * @param CacheInterface $cache The cache instance
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function setMetadataCache(CacheInterface $cache);
-
-    /**
-     * Sets the constraint validator factory used by the validator.
-     *
-     * @param ConstraintValidatorFactoryInterface $validatorFactory The validator factory
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function setConstraintValidatorFactory(ConstraintValidatorFactoryInterface $validatorFactory);
-
-    /**
-     * Sets the translator used for translating violation messages.
-     *
-     * @param TranslatorInterface $translator The translator instance
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function setTranslator(TranslatorInterface $translator);
-
-    /**
-     * Sets the default translation domain of violation messages.
-     *
-     * The same message can have different translations in different domains.
-     * Pass the domain that is used for violation messages by default to this
-     * method.
-     *
-     * @param string $translationDomain The translation domain of the violation messages
-     *
-     * @return ValidatorBuilderInterface The builder object
-     */
-    public function setTranslationDomain($translationDomain);
-
-    /**
-     * Sets the property accessor for resolving property paths.
-     *
-     * @param PropertyAccessorInterface $propertyAccessor The property accessor
-     *
-     * @return ValidatorBuilderInterface The builder object
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     */
-    public function setPropertyAccessor(PropertyAccessorInterface $propertyAccessor);
-
-    /**
-     * Sets the API version that the returned validator should support.
-     *
-     * @param int $apiVersion The required API version
-     *
-     * @return ValidatorBuilderInterface The builder object
-     *
-     * @see Validation::API_VERSION_2_5
-     * @see Validation::API_VERSION_2_5_BC
-     * @deprecated since version 2.7, to be removed in 3.0.
-     */
-    public function setApiVersion($apiVersion);
-
-    /**
-     * Builds and returns a new validator object.
-     *
-     * @return ValidatorInterface The built validator.
-     */
-    public function getValidator();
-}
diff --git a/vendor/symfony/validator/ValidatorInterface.php b/vendor/symfony/validator/ValidatorInterface.php
deleted file mode 100644
index cffc138..0000000
--- a/vendor/symfony/validator/ValidatorInterface.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Component\Validator;
-
-/**
- * Validates values and graphs of objects and arrays.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @deprecated since version 2.5, to be removed in 3.0.
- *             Use {@link \Symfony\Component\Validator\Validator\ValidatorInterface} instead.
- */
-interface ValidatorInterface
-{
-    /**
-     * Validates a value.
-     *
-     * The accepted values depend on the {@link MetadataFactoryInterface}
-     * implementation.
-     *
-     * The signature changed with Symfony 2.5 (see
-     * {@link Validator\ValidatorInterface::validate()}. This signature will be
-     * disabled in Symfony 3.0.
-     *
-     * @param mixed      $value    The value to validate
-     * @param array|null $groups   The validation groups to validate.
-     * @param bool       $traverse Whether to traverse the value if it is traversable.
-     * @param bool       $deep     Whether to traverse nested traversable values recursively.
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations. If the
-     *                                          list is empty, validation succeeded.
-     */
-    public function validate($value, $groups = null, $traverse = false, $deep = false);
-
-    /**
-     * Validates a property of a value against its current value.
-     *
-     * The accepted values depend on the {@link MetadataFactoryInterface}
-     * implementation.
-     *
-     * @param mixed      $containingValue The value containing the property.
-     * @param string     $property        The name of the property to validate.
-     * @param array|null $groups          The validation groups to validate.
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations. If the
-     *                                          list is empty, validation succeeded.
-     */
-    public function validateProperty($containingValue, $property, $groups = null);
-
-    /**
-     * Validate a property of a value against a potential value.
-     *
-     * The accepted values depend on the {@link MetadataFactoryInterface}
-     * implementation.
-     *
-     * @param mixed      $containingValue The value containing the property.
-     * @param string     $property        The name of the property to validate
-     * @param string     $value           The value to validate against the
-     *                                    constraints of the property.
-     * @param array|null $groups          The validation groups to validate.
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations. If the
-     *                                          list is empty, validation succeeded.
-     */
-    public function validatePropertyValue($containingValue, $property, $value, $groups = null);
-
-    /**
-     * Validates a value against a constraint or a list of constraints.
-     *
-     * @param mixed                   $value       The value to validate.
-     * @param Constraint|Constraint[] $constraints The constraint(s) to validate against.
-     * @param array|null              $groups      The validation groups to validate.
-     *
-     * @return ConstraintViolationListInterface A list of constraint violations. If the
-     *                                          list is empty, validation succeeded.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Renamed to {@link Validator\ValidatorInterface::validate()}
-     *             in Symfony 2.5.
-     */
-    public function validateValue($value, $constraints, $groups = null);
-
-    /**
-     * Returns the factory for metadata instances.
-     *
-     * @return MetadataFactoryInterface The metadata factory.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0.
-     *             Use {@link Validator\ValidatorInterface::getMetadataFor()} or
-     *             {@link Validator\ValidatorInterface::hasMetadataFor()}
-     *             instead.
-     */
-    public function getMetadataFactory();
-}
diff --git a/vendor/symfony/validator/Violation/ConstraintViolationBuilder.php b/vendor/symfony/validator/Violation/ConstraintViolationBuilder.php
deleted file mode 100644
index d7d3877..0000000
--- a/vendor/symfony/validator/Violation/ConstraintViolationBuilder.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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\Component\Validator\Violation;
-
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintViolation;
-use Symfony\Component\Validator\ConstraintViolationList;
-use Symfony\Component\Validator\Util\PropertyPath;
-
-/**
- * Default implementation of {@link ConstraintViolationBuilderInterface}.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal You should not instantiate or use this class. Code against
- *           {@link ConstraintViolationBuilderInterface} instead.
- */
-class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
-{
-    /**
-     * @var ConstraintViolationList
-     */
-    private $violations;
-
-    /**
-     * @var string
-     */
-    private $message;
-
-    /**
-     * @var array
-     */
-    private $parameters;
-
-    /**
-     * @var mixed
-     */
-    private $root;
-
-    /**
-     * @var mixed
-     */
-    private $invalidValue;
-
-    /**
-     * @var string
-     */
-    private $propertyPath;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
-    /**
-     * @var string|null
-     */
-    private $translationDomain;
-
-    /**
-     * @var int|null
-     */
-    private $plural;
-
-    /**
-     * @var Constraint
-     */
-    private $constraint;
-
-    /**
-     * @var mixed
-     */
-    private $code;
-
-    /**
-     * @var mixed
-     */
-    private $cause;
-
-    public function __construct(ConstraintViolationList $violations, Constraint $constraint, $message, array $parameters, $root, $propertyPath, $invalidValue, TranslatorInterface $translator, $translationDomain = null)
-    {
-        $this->violations = $violations;
-        $this->message = $message;
-        $this->parameters = $parameters;
-        $this->root = $root;
-        $this->propertyPath = $propertyPath;
-        $this->invalidValue = $invalidValue;
-        $this->translator = $translator;
-        $this->translationDomain = $translationDomain;
-        $this->constraint = $constraint;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function atPath($path)
-    {
-        $this->propertyPath = PropertyPath::append($this->propertyPath, $path);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameter($key, $value)
-    {
-        $this->parameters[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameters(array $parameters)
-    {
-        $this->parameters = $parameters;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setTranslationDomain($translationDomain)
-    {
-        $this->translationDomain = $translationDomain;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setInvalidValue($invalidValue)
-    {
-        $this->invalidValue = $invalidValue;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPlural($number)
-    {
-        $this->plural = $number;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCause($cause)
-    {
-        $this->cause = $cause;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolation()
-    {
-        if (null === $this->plural) {
-            $translatedMessage = $this->translator->trans(
-                $this->message,
-                $this->parameters,
-                $this->translationDomain
-            );
-        } else {
-            try {
-                $translatedMessage = $this->translator->transChoice(
-                    $this->message,
-                    $this->plural,
-                    $this->parameters,
-                    $this->translationDomain#
-                );
-            } catch (\InvalidArgumentException $e) {
-                $translatedMessage = $this->translator->trans(
-                    $this->message,
-                    $this->parameters,
-                    $this->translationDomain
-                );
-            }
-        }
-
-        $this->violations->add(new ConstraintViolation(
-            $translatedMessage,
-            $this->message,
-            $this->parameters,
-            $this->root,
-            $this->propertyPath,
-            $this->invalidValue,
-            $this->plural,
-            $this->code,
-            $this->constraint,
-            $this->cause
-        ));
-    }
-}
diff --git a/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php b/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php
deleted file mode 100644
index b7cc2ec..0000000
--- a/vendor/symfony/validator/Violation/ConstraintViolationBuilderInterface.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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\Component\Validator\Violation;
-
-/**
- * Builds {@link \Symfony\Component\Validator\ConstraintViolationInterface}
- * objects.
- *
- * Use the various methods on this interface to configure the built violation.
- * Finally, call {@link addViolation()} to add the violation to the current
- * execution context.
- *
- * @since  2.5
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- */
-interface ConstraintViolationBuilderInterface
-{
-    /**
-     * Stores the property path at which the violation should be generated.
-     *
-     * The passed path will be appended to the current property path of the
-     * execution context.
-     *
-     * @param string $path The property path
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function atPath($path);
-
-    /**
-     * Sets a parameter to be inserted into the violation message.
-     *
-     * @param string $key   The name of the parameter
-     * @param string $value The value to be inserted in the parameter's place
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function setParameter($key, $value);
-
-    /**
-     * Sets all parameters to be inserted into the violation message.
-     *
-     * @param array $parameters An array with the parameter names as keys and
-     *                          the values to be inserted in their place as
-     *                          values
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function setParameters(array $parameters);
-
-    /**
-     * Sets the translation domain which should be used for translating the
-     * violation message.
-     *
-     * @param string $translationDomain The translation domain
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     *
-     * @see \Symfony\Component\Translation\TranslatorInterface
-     */
-    public function setTranslationDomain($translationDomain);
-
-    /**
-     * Sets the invalid value that caused this violation.
-     *
-     * @param mixed $invalidValue The invalid value
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function setInvalidValue($invalidValue);
-
-    /**
-     * Sets the number which determines how the plural form of the violation
-     * message is chosen when it is translated.
-     *
-     * @param int $number The number for determining the plural form
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     *
-     * @see \Symfony\Component\Translation\TranslatorInterface::transChoice()
-     */
-    public function setPlural($number);
-
-    /**
-     * Sets the violation code.
-     *
-     * @param int $code The violation code
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function setCode($code);
-
-    /**
-     * Sets the cause of the violation.
-     *
-     * @param mixed $cause The cause of the violation
-     *
-     * @return ConstraintViolationBuilderInterface This builder
-     */
-    public function setCause($cause);
-
-    /**
-     * Adds the violation to the current execution context.
-     */
-    public function addViolation();
-}
diff --git a/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php b/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
deleted file mode 100644
index 7410b0a..0000000
--- a/vendor/symfony/validator/Violation/LegacyConstraintViolationBuilder.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?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\Component\Validator\Violation;
-
-@trigger_error('The '.__NAMESPACE__.'\LegacyConstraintViolationBuilder class is deprecated since version 2.5 and will be removed in 3.0.', E_USER_DEPRECATED);
-
-use Symfony\Component\Validator\ExecutionContextInterface;
-
-/**
- * Backwards-compatible implementation of {@link ConstraintViolationBuilderInterface}.
- *
- * @author Bernhard Schussek <bschussek@gmail.com>
- *
- * @internal You should not instantiate or use this class. Code against
- *           {@link ConstraintViolationBuilderInterface} instead.
- *
- * @deprecated since version 2.5.5, to be removed in 3.0.
- */
-class LegacyConstraintViolationBuilder implements ConstraintViolationBuilderInterface
-{
-    /**
-     * @var ExecutionContextInterface
-     */
-    private $context;
-
-    /**
-     * @var string
-     */
-    private $message;
-
-    /**
-     * @var array
-     */
-    private $parameters;
-
-    /**
-     * @var mixed
-     */
-    private $invalidValue;
-
-    /**
-     * @var string
-     */
-    private $propertyPath;
-
-    /**
-     * @var int|null
-     */
-    private $plural;
-
-    /**
-     * @var mixed
-     */
-    private $code;
-
-    public function __construct(ExecutionContextInterface $context, $message, array $parameters)
-    {
-        $this->context = $context;
-        $this->message = $message;
-        $this->parameters = $parameters;
-        $this->invalidValue = $context->getValue();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function atPath($path)
-    {
-        $this->propertyPath = $path;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameter($key, $value)
-    {
-        $this->parameters[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setParameters(array $parameters)
-    {
-        $this->parameters = $parameters;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setTranslationDomain($translationDomain)
-    {
-        // can't be set in the old API
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setInvalidValue($invalidValue)
-    {
-        $this->invalidValue = $invalidValue;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPlural($number)
-    {
-        $this->plural = $number;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCause($cause)
-    {
-        // do nothing - we can't save the cause through the old API
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addViolation()
-    {
-        if ($this->propertyPath) {
-            $this->context->addViolationAt($this->propertyPath, $this->message, $this->parameters, $this->invalidValue, $this->plural, $this->code);
-
-            return;
-        }
-
-        $this->context->addViolation($this->message, $this->parameters, $this->invalidValue, $this->plural, $this->code);
-    }
-}
diff --git a/vendor/symfony/validator/composer.json b/vendor/symfony/validator/composer.json
deleted file mode 100644
index c0a898a..0000000
--- a/vendor/symfony/validator/composer.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "name": "symfony/validator",
-    "type": "library",
-    "description": "Symfony Validator Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9",
-        "symfony/translation": "~2.4"
-    },
-    "require-dev": {
-        "doctrine/common": "~2.3",
-        "symfony/http-foundation": "~2.1",
-        "symfony/intl": "~2.4",
-        "symfony/yaml": "~2.0,>=2.0.5",
-        "symfony/config": "~2.2",
-        "symfony/property-access": "~2.3",
-        "symfony/expression-language": "~2.4",
-        "doctrine/annotations": "~1.0",
-        "doctrine/cache": "~1.0",
-        "egulias/email-validator": "~1.2,>=1.2.1"
-    },
-    "suggest": {
-        "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-        "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
-        "symfony/http-foundation": "",
-        "symfony/intl": "",
-        "symfony/yaml": "",
-        "symfony/config": "",
-        "egulias/email-validator": "Strict (RFC compliant) email validation",
-        "symfony/property-access": "For using the 2.4 Validator API",
-        "symfony/expression-language": "For using the 2.4 Expression validator"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Validator\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/validator/phpunit.xml.dist b/vendor/symfony/validator/phpunit.xml.dist
deleted file mode 100644
index 1bf4391..0000000
--- a/vendor/symfony/validator/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Validator Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/symfony/yaml/.gitignore b/vendor/symfony/yaml/.gitignore
deleted file mode 100644
index c49a5d8..0000000
--- a/vendor/symfony/yaml/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/vendor/symfony/yaml/CHANGELOG.md b/vendor/symfony/yaml/CHANGELOG.md
deleted file mode 100644
index 096cf65..0000000
--- a/vendor/symfony/yaml/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-CHANGELOG
-=========
-
-2.1.0
------
-
- * Yaml::parse() does not evaluate loaded files as PHP files by default
-   anymore (call Yaml::enablePhpParsing() to get back the old behavior)
diff --git a/vendor/symfony/yaml/Dumper.php b/vendor/symfony/yaml/Dumper.php
deleted file mode 100644
index 39cdcfc..0000000
--- a/vendor/symfony/yaml/Dumper.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Component\Yaml;
-
-/**
- * Dumper dumps PHP variables to YAML strings.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Dumper
-{
-    /**
-     * The amount of spaces to use for indentation of nested nodes.
-     *
-     * @var int
-     */
-    protected $indentation = 4;
-
-    /**
-     * Sets the indentation.
-     *
-     * @param int $num The amount of spaces to use for indentation of nested nodes.
-     */
-    public function setIndentation($num)
-    {
-        $this->indentation = (int) $num;
-    }
-
-    /**
-     * Dumps a PHP value to YAML.
-     *
-     * @param mixed $input                  The PHP value
-     * @param int   $inline                 The level where you switch to inline YAML
-     * @param int   $indent                 The level of indentation (used internally)
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML representation of the PHP value
-     */
-    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        $output = '';
-        $prefix = $indent ? str_repeat(' ', $indent) : '';
-
-        if ($inline <= 0 || !is_array($input) || empty($input)) {
-            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
-        } else {
-            $isAHash = array_keys($input) !== range(0, count($input) - 1);
-
-            foreach ($input as $key => $value) {
-                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
-
-                $output .= sprintf('%s%s%s%s',
-                    $prefix,
-                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
-                    $willBeInlined ? ' ' : "\n",
-                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
-                ).($willBeInlined ? "\n" : '');
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/vendor/symfony/yaml/Escaper.php b/vendor/symfony/yaml/Escaper.php
deleted file mode 100644
index ac325a2..0000000
--- a/vendor/symfony/yaml/Escaper.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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\Component\Yaml;
-
-/**
- * Escaper encapsulates escaping rules for single and double-quoted
- * YAML strings.
- *
- * @author Matthew Lewinski <matthew@lewinski.org>
- */
-class Escaper
-{
-    // Characters that would cause a dumped string to require double quoting.
-    const REGEX_CHARACTER_TO_ESCAPE = "[\\x00-\\x1f]|\xc2\x85|\xc2\xa0|\xe2\x80\xa8|\xe2\x80\xa9";
-
-    // Mapping arrays for escaping a double quoted string. The backslash is
-    // first to ensure proper escaping because str_replace operates iteratively
-    // on the input arrays. This ordering of the characters avoids the use of strtr,
-    // which performs more slowly.
-    private static $escapees = array('\\', '\\\\', '\\"', '"',
-                                     "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
-                                     "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
-                                     "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
-                                     "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
-                                     "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
-    private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
-                                     '\\0',   '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
-                                     '\\b',   '\\t',   '\\n',   '\\v',   '\\f',   '\\r',   '\\x0e', '\\x0f',
-                                     '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
-                                     '\\x18', '\\x19', '\\x1a', '\\e',   '\\x1c', '\\x1d', '\\x1e', '\\x1f',
-                                     '\\N', '\\_', '\\L', '\\P',);
-
-    /**
-     * Determines if a PHP value would require double quoting in YAML.
-     *
-     * @param string $value A PHP value
-     *
-     * @return bool True if the value would require double quotes.
-     */
-    public static function requiresDoubleQuoting($value)
-    {
-        return preg_match('/'.self::REGEX_CHARACTER_TO_ESCAPE.'/u', $value);
-    }
-
-    /**
-     * Escapes and surrounds a PHP value with double quotes.
-     *
-     * @param string $value A PHP value
-     *
-     * @return string The quoted, escaped string
-     */
-    public static function escapeWithDoubleQuotes($value)
-    {
-        return sprintf('"%s"', str_replace(self::$escapees, self::$escaped, $value));
-    }
-
-    /**
-     * Determines if a PHP value would require single quoting in YAML.
-     *
-     * @param string $value A PHP value
-     *
-     * @return bool True if the value would require single quotes.
-     */
-    public static function requiresSingleQuoting($value)
-    {
-        // Determines if a PHP value is entirely composed of a value that would
-        // require single quoting in YAML.
-        if (in_array(strtolower($value), array('null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'))) {
-            return true;
-        }
-
-        // Determines if the PHP value contains any single characters that would
-        // cause it to require single quoting in YAML.
-        return preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` ]/x', $value);
-    }
-
-    /**
-     * Escapes and surrounds a PHP value with single quotes.
-     *
-     * @param string $value A PHP value
-     *
-     * @return string The quoted, escaped string
-     */
-    public static function escapeWithSingleQuotes($value)
-    {
-        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
-    }
-}
diff --git a/vendor/symfony/yaml/Exception/DumpException.php b/vendor/symfony/yaml/Exception/DumpException.php
deleted file mode 100644
index cce972f..0000000
--- a/vendor/symfony/yaml/Exception/DumpException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during dumping.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class DumpException extends RuntimeException
-{
-}
diff --git a/vendor/symfony/yaml/Exception/ExceptionInterface.php b/vendor/symfony/yaml/Exception/ExceptionInterface.php
deleted file mode 100644
index ad850ee..0000000
--- a/vendor/symfony/yaml/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Yaml\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/symfony/yaml/Exception/ParseException.php b/vendor/symfony/yaml/Exception/ParseException.php
deleted file mode 100644
index b74eb91..0000000
--- a/vendor/symfony/yaml/Exception/ParseException.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?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\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during parsing.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ParseException extends RuntimeException
-{
-    private $parsedFile;
-    private $parsedLine;
-    private $snippet;
-    private $rawMessage;
-
-    /**
-     * Constructor.
-     *
-     * @param string     $message    The error message
-     * @param int        $parsedLine The line where the error occurred
-     * @param int        $snippet    The snippet of code near the problem
-     * @param string     $parsedFile The file name where the error occurred
-     * @param \Exception $previous   The previous exception
-     */
-    public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, \Exception $previous = null)
-    {
-        $this->parsedFile = $parsedFile;
-        $this->parsedLine = $parsedLine;
-        $this->snippet = $snippet;
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-
-        parent::__construct($this->message, 0, $previous);
-    }
-
-    /**
-     * Gets the snippet of code near the error.
-     *
-     * @return string The snippet of code
-     */
-    public function getSnippet()
-    {
-        return $this->snippet;
-    }
-
-    /**
-     * Sets the snippet of code near the error.
-     *
-     * @param string $snippet The code snippet
-     */
-    public function setSnippet($snippet)
-    {
-        $this->snippet = $snippet;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the filename where the error occurred.
-     *
-     * This method returns null if a string is parsed.
-     *
-     * @return string The filename
-     */
-    public function getParsedFile()
-    {
-        return $this->parsedFile;
-    }
-
-    /**
-     * Sets the filename where the error occurred.
-     *
-     * @param string $parsedFile The filename
-     */
-    public function setParsedFile($parsedFile)
-    {
-        $this->parsedFile = $parsedFile;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the line where the error occurred.
-     *
-     * @return int The file line
-     */
-    public function getParsedLine()
-    {
-        return $this->parsedLine;
-    }
-
-    /**
-     * Sets the line where the error occurred.
-     *
-     * @param int $parsedLine The file line
-     */
-    public function setParsedLine($parsedLine)
-    {
-        $this->parsedLine = $parsedLine;
-
-        $this->updateRepr();
-    }
-
-    private function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        if (null !== $this->parsedFile) {
-            if (PHP_VERSION_ID >= 50400) {
-                $jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-            } else {
-                $jsonOptions = 0;
-            }
-            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, $jsonOptions));
-        }
-
-        if ($this->parsedLine >= 0) {
-            $this->message .= sprintf(' at line %d', $this->parsedLine);
-        }
-
-        if ($this->snippet) {
-            $this->message .= sprintf(' (near "%s")', $this->snippet);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-    }
-}
diff --git a/vendor/symfony/yaml/Exception/RuntimeException.php b/vendor/symfony/yaml/Exception/RuntimeException.php
deleted file mode 100644
index 3f36b73..0000000
--- a/vendor/symfony/yaml/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Component\Yaml\Exception;
-
-/**
- * Exception class thrown when an error occurs during parsing.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/symfony/yaml/Inline.php b/vendor/symfony/yaml/Inline.php
deleted file mode 100644
index a5b53bd..0000000
--- a/vendor/symfony/yaml/Inline.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?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\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-use Symfony\Component\Yaml\Exception\DumpException;
-
-/**
- * Inline implements a YAML parser/dumper for the YAML inline syntax.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Inline
-{
-    const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
-
-    private static $exceptionOnInvalidType = false;
-    private static $objectSupport = false;
-    private static $objectForMap = false;
-
-    /**
-     * Converts a YAML string to a PHP array.
-     *
-     * @param string $value                  A YAML string
-     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool   $objectSupport          true if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     * @param array  $references             Mapping of variable names to values
-     *
-     * @return array A PHP array representing the YAML string
-     *
-     * @throws ParseException
-     */
-    public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false, $references = array())
-    {
-        self::$exceptionOnInvalidType = $exceptionOnInvalidType;
-        self::$objectSupport = $objectSupport;
-        self::$objectForMap = $objectForMap;
-
-        $value = trim($value);
-
-        if ('' === $value) {
-            return '';
-        }
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        $i = 0;
-        switch ($value[0]) {
-            case '[':
-                $result = self::parseSequence($value, $i, $references);
-                ++$i;
-                break;
-            case '{':
-                $result = self::parseMapping($value, $i, $references);
-                ++$i;
-                break;
-            default:
-                $result = self::parseScalar($value, null, array('"', "'"), $i, true, $references);
-        }
-
-        // some comments are allowed at the end
-        if (preg_replace('/\s+#.*$/A', '', substr($value, $i))) {
-            throw new ParseException(sprintf('Unexpected characters near "%s".', substr($value, $i)));
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Dumps a given PHP variable to a YAML string.
-     *
-     * @param mixed $value                  The PHP variable to convert
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML string representing the PHP array
-     *
-     * @throws DumpException When trying to dump PHP resource
-     */
-    public static function dump($value, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        switch (true) {
-            case is_resource($value):
-                if ($exceptionOnInvalidType) {
-                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
-                }
-
-                return 'null';
-            case is_object($value):
-                if ($objectSupport) {
-                    return '!!php/object:'.serialize($value);
-                }
-
-                if ($exceptionOnInvalidType) {
-                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
-                }
-
-                return 'null';
-            case is_array($value):
-                return self::dumpArray($value, $exceptionOnInvalidType, $objectSupport);
-            case null === $value:
-                return 'null';
-            case true === $value:
-                return 'true';
-            case false === $value:
-                return 'false';
-            case ctype_digit($value):
-                return is_string($value) ? "'$value'" : (int) $value;
-            case is_numeric($value):
-                $locale = setlocale(LC_NUMERIC, 0);
-                if (false !== $locale) {
-                    setlocale(LC_NUMERIC, 'C');
-                }
-                if (is_float($value)) {
-                    $repr = (string) $value;
-                    if (is_infinite($value)) {
-                        $repr = str_ireplace('INF', '.Inf', $repr);
-                    } elseif (floor($value) == $value && $repr == $value) {
-                        // Preserve float data type since storing a whole number will result in integer value.
-                        $repr = '!!float '.$repr;
-                    }
-                } else {
-                    $repr = is_string($value) ? "'$value'" : (string) $value;
-                }
-                if (false !== $locale) {
-                    setlocale(LC_NUMERIC, $locale);
-                }
-
-                return $repr;
-            case '' == $value:
-                return "''";
-            case Escaper::requiresDoubleQuoting($value):
-                return Escaper::escapeWithDoubleQuotes($value);
-            case Escaper::requiresSingleQuoting($value):
-            case preg_match(self::getHexRegex(), $value):
-            case preg_match(self::getTimestampRegex(), $value):
-                return Escaper::escapeWithSingleQuotes($value);
-            default:
-                return $value;
-        }
-    }
-
-    /**
-     * Dumps a PHP array to a YAML string.
-     *
-     * @param array $value                  The PHP array to dump
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string The YAML string representing the PHP array
-     */
-    private static function dumpArray($value, $exceptionOnInvalidType, $objectSupport)
-    {
-        // array
-        $keys = array_keys($value);
-        $keysCount = count($keys);
-        if ((1 === $keysCount && '0' == $keys[0])
-            || ($keysCount > 1 && array_reduce($keys, function ($v, $w) { return (int) $v + $w; }, 0) === $keysCount * ($keysCount - 1) / 2)
-        ) {
-            $output = array();
-            foreach ($value as $val) {
-                $output[] = self::dump($val, $exceptionOnInvalidType, $objectSupport);
-            }
-
-            return sprintf('[%s]', implode(', ', $output));
-        }
-
-        // mapping
-        $output = array();
-        foreach ($value as $key => $val) {
-            $output[] = sprintf('%s: %s', self::dump($key, $exceptionOnInvalidType, $objectSupport), self::dump($val, $exceptionOnInvalidType, $objectSupport));
-        }
-
-        return sprintf('{ %s }', implode(', ', $output));
-    }
-
-    /**
-     * Parses a scalar to a YAML string.
-     *
-     * @param string $scalar
-     * @param string $delimiters
-     * @param array  $stringDelimiters
-     * @param int    &$i
-     * @param bool   $evaluate
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
-    {
-        if (in_array($scalar[$i], $stringDelimiters)) {
-            // quoted scalar
-            $output = self::parseQuotedScalar($scalar, $i);
-
-            if (null !== $delimiters) {
-                $tmp = ltrim(substr($scalar, $i), ' ');
-                if (!in_array($tmp[0], $delimiters)) {
-                    throw new ParseException(sprintf('Unexpected characters (%s).', substr($scalar, $i)));
-                }
-            }
-        } else {
-            // "normal" string
-            if (!$delimiters) {
-                $output = substr($scalar, $i);
-                $i += strlen($output);
-
-                // remove comments
-                if (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
-                    $output = substr($output, 0, $match[0][1]);
-                }
-            } elseif (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) {
-                $output = $match[1];
-                $i += strlen($output);
-            } else {
-                throw new ParseException(sprintf('Malformed inline YAML string (%s).', $scalar));
-            }
-
-            if ($evaluate) {
-                $output = self::evaluateScalar($output, $references);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Parses a quoted scalar to YAML.
-     *
-     * @param string $scalar
-     * @param int    &$i
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseQuotedScalar($scalar, &$i)
-    {
-        if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
-            throw new ParseException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
-        }
-
-        $output = substr($match[0], 1, strlen($match[0]) - 2);
-
-        $unescaper = new Unescaper();
-        if ('"' == $scalar[$i]) {
-            $output = $unescaper->unescapeDoubleQuotedString($output);
-        } else {
-            $output = $unescaper->unescapeSingleQuotedString($output);
-        }
-
-        $i += strlen($match[0]);
-
-        return $output;
-    }
-
-    /**
-     * Parses a sequence to a YAML string.
-     *
-     * @param string $sequence
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseSequence($sequence, &$i = 0, $references = array())
-    {
-        $output = array();
-        $len = strlen($sequence);
-        ++$i;
-
-        // [foo, bar, ...]
-        while ($i < $len) {
-            switch ($sequence[$i]) {
-                case '[':
-                    // nested sequence
-                    $output[] = self::parseSequence($sequence, $i, $references);
-                    break;
-                case '{':
-                    // nested mapping
-                    $output[] = self::parseMapping($sequence, $i, $references);
-                    break;
-                case ']':
-                    return $output;
-                case ',':
-                case ' ':
-                    break;
-                default:
-                    $isQuoted = in_array($sequence[$i], array('"', "'"));
-                    $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i, true, $references);
-
-                    // the value can be an array if a reference has been resolved to an array var
-                    if (!is_array($value) && !$isQuoted && false !== strpos($value, ': ')) {
-                        // embedded mapping?
-                        try {
-                            $pos = 0;
-                            $value = self::parseMapping('{'.$value.'}', $pos, $references);
-                        } catch (\InvalidArgumentException $e) {
-                            // no, it's not
-                        }
-                    }
-
-                    $output[] = $value;
-
-                    --$i;
-            }
-
-            ++$i;
-        }
-
-        throw new ParseException(sprintf('Malformed inline YAML string %s', $sequence));
-    }
-
-    /**
-     * Parses a mapping to a YAML string.
-     *
-     * @param string $mapping
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseMapping($mapping, &$i = 0, $references = array())
-    {
-        $output = array();
-        $len = strlen($mapping);
-        ++$i;
-
-        // {foo: bar, bar:foo, ...}
-        while ($i < $len) {
-            switch ($mapping[$i]) {
-                case ' ':
-                case ',':
-                    ++$i;
-                    continue 2;
-                case '}':
-                    if (self::$objectForMap) {
-                        return (object) $output;
-                    }
-
-                    return $output;
-            }
-
-            // key
-            $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
-
-            // value
-            $done = false;
-
-            while ($i < $len) {
-                switch ($mapping[$i]) {
-                    case '[':
-                        // nested sequence
-                        $value = self::parseSequence($mapping, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case '{':
-                        // nested mapping
-                        $value = self::parseMapping($mapping, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case ':':
-                    case ' ':
-                        break;
-                    default:
-                        $value = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i, true, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        --$i;
-                }
-
-                ++$i;
-
-                if ($done) {
-                    continue 2;
-                }
-            }
-        }
-
-        throw new ParseException(sprintf('Malformed inline YAML string %s', $mapping));
-    }
-
-    /**
-     * Evaluates scalars and replaces magic values.
-     *
-     * @param string $scalar
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
-     */
-    private static function evaluateScalar($scalar, $references = array())
-    {
-        $scalar = trim($scalar);
-        $scalarLower = strtolower($scalar);
-
-        if (0 === strpos($scalar, '*')) {
-            if (false !== $pos = strpos($scalar, '#')) {
-                $value = substr($scalar, 1, $pos - 2);
-            } else {
-                $value = substr($scalar, 1);
-            }
-
-            // an unquoted *
-            if (false === $value || '' === $value) {
-                throw new ParseException('A reference must contain at least one character.');
-            }
-
-            if (!array_key_exists($value, $references)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value));
-            }
-
-            return $references[$value];
-        }
-
-        switch (true) {
-            case 'null' === $scalarLower:
-            case '' === $scalar:
-            case '~' === $scalar:
-                return;
-            case 'true' === $scalarLower:
-                return true;
-            case 'false' === $scalarLower:
-                return false;
-            // Optimise for returning strings.
-            case $scalar[0] === '+' || $scalar[0] === '-' || $scalar[0] === '.' || $scalar[0] === '!' || is_numeric($scalar[0]):
-                switch (true) {
-                    case 0 === strpos($scalar, '!str'):
-                        return (string) substr($scalar, 5);
-                    case 0 === strpos($scalar, '! '):
-                        return (int) self::parseScalar(substr($scalar, 2));
-                    case 0 === strpos($scalar, '!!php/object:'):
-                        if (self::$objectSupport) {
-                            return unserialize(substr($scalar, 13));
-                        }
-
-                        if (self::$exceptionOnInvalidType) {
-                            throw new ParseException('Object support when parsing a YAML file has been disabled.');
-                        }
-
-                        return;
-                    case 0 === strpos($scalar, '!!float '):
-                        return (float) substr($scalar, 8);
-                    case ctype_digit($scalar):
-                        $raw = $scalar;
-                        $cast = (int) $scalar;
-
-                        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
-                    case '-' === $scalar[0] && ctype_digit(substr($scalar, 1)):
-                        $raw = $scalar;
-                        $cast = (int) $scalar;
-
-                        return '0' == $scalar[1] ? octdec($scalar) : (((string) $raw === (string) $cast) ? $cast : $raw);
-                    case is_numeric($scalar):
-                    case preg_match(self::getHexRegex(), $scalar):
-                        return '0x' === $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
-                    case '.inf' === $scalarLower:
-                    case '.nan' === $scalarLower:
-                        return -log(0);
-                    case '-.inf' === $scalarLower:
-                        return log(0);
-                    case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-                        return (float) str_replace(',', '', $scalar);
-                    case preg_match(self::getTimestampRegex(), $scalar):
-                        return strtotime($scalar);
-                }
-            default:
-                return (string) $scalar;
-        }
-    }
-
-    /**
-     * Gets a regex that matches a YAML date.
-     *
-     * @return string The regular expression
-     *
-     * @see http://www.yaml.org/spec/1.2/spec.html#id2761573
-     */
-    private static function getTimestampRegex()
-    {
-        return <<<EOF
-        ~^
-        (?P<year>[0-9][0-9][0-9][0-9])
-        -(?P<month>[0-9][0-9]?)
-        -(?P<day>[0-9][0-9]?)
-        (?:(?:[Tt]|[ \t]+)
-        (?P<hour>[0-9][0-9]?)
-        :(?P<minute>[0-9][0-9])
-        :(?P<second>[0-9][0-9])
-        (?:\.(?P<fraction>[0-9]*))?
-        (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
-        (?::(?P<tz_minute>[0-9][0-9]))?))?)?
-        $~x
-EOF;
-    }
-
-    /**
-     * Gets a regex that matches a YAML number in hexadecimal notation.
-     *
-     * @return string
-     */
-    private static function getHexRegex()
-    {
-        return '~^0x[0-9a-f]++$~i';
-    }
-}
diff --git a/vendor/symfony/yaml/LICENSE b/vendor/symfony/yaml/LICENSE
deleted file mode 100644
index 43028bc..0000000
--- a/vendor/symfony/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2015 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/vendor/symfony/yaml/Parser.php b/vendor/symfony/yaml/Parser.php
deleted file mode 100644
index 04f2237..0000000
--- a/vendor/symfony/yaml/Parser.php
+++ /dev/null
@@ -1,712 +0,0 @@
-<?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\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-/**
- * Parser parses YAML strings to convert them to PHP arrays.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Parser
-{
-    const BLOCK_SCALAR_HEADER_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
-    // BC - wrongly named
-    const FOLDED_SCALAR_PATTERN = self::BLOCK_SCALAR_HEADER_PATTERN;
-
-    private $offset = 0;
-    private $lines = array();
-    private $currentLineNb = -1;
-    private $currentLine = '';
-    private $refs = array();
-
-    /**
-     * Constructor.
-     *
-     * @param int $offset The offset of YAML document (used for line numbers in error messages)
-     */
-    public function __construct($offset = 0)
-    {
-        $this->offset = $offset;
-    }
-
-    /**
-     * Parses a YAML string to a PHP value.
-     *
-     * @param string $value                  A YAML string
-     * @param bool   $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool   $objectSupport          true if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     *
-     * @return mixed A PHP value
-     *
-     * @throws ParseException If the YAML is not valid
-     */
-    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
-    {
-        if (!preg_match('//u', $value)) {
-            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
-        }
-        $this->currentLineNb = -1;
-        $this->currentLine = '';
-        $value = $this->cleanup($value);
-        $this->lines = explode("\n", $value);
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('UTF-8');
-        }
-
-        $data = array();
-        $context = null;
-        $allowOverwrite = false;
-        while ($this->moveToNextLine()) {
-            if ($this->isCurrentLineEmpty()) {
-                continue;
-            }
-
-            // tab?
-            if ("\t" === $this->currentLine[0]) {
-                throw new ParseException('A YAML file cannot contain tabs as indentation.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-
-            $isRef = $mergeNode = false;
-            if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
-                if ($context && 'mapping' == $context) {
-                    throw new ParseException('You cannot define a sequence item when in a mapping');
-                }
-                $context = 'sequence';
-
-                if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
-                    $isRef = $matches['ref'];
-                    $values['value'] = $matches['value'];
-                }
-
-                // array
-                if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
-                    $c = $this->getRealCurrentLineNb() + 1;
-                    $parser = new self($c);
-                    $parser->refs = &$this->refs;
-                    $data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                } else {
-                    if (isset($values['leadspaces'])
-                        && preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)
-                    ) {
-                        // this is a compact notation element, add to next block and parse
-                        $c = $this->getRealCurrentLineNb();
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-
-                        $block = $values['value'];
-                        if ($this->isNextLineIndented()) {
-                            $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + strlen($values['leadspaces']) + 1);
-                        }
-
-                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    } else {
-                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    }
-                }
-                if ($isRef) {
-                    $this->refs[$isRef] = end($data);
-                }
-            } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values) && (false === strpos($values['key'], ' #') || in_array($values['key'][0], array('"', "'")))) {
-                if ($context && 'sequence' == $context) {
-                    throw new ParseException('You cannot define a mapping item when in a sequence');
-                }
-                $context = 'mapping';
-
-                // force correct settings
-                Inline::parse(null, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-                try {
-                    $key = Inline::parseScalar($values['key']);
-                } catch (ParseException $e) {
-                    $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-                    $e->setSnippet($this->currentLine);
-
-                    throw $e;
-                }
-
-                // Convert float keys to strings, to avoid being converted to integers by PHP
-                if (is_float($key)) {
-                    $key = (string) $key;
-                }
-
-                if ('<<' === $key) {
-                    $mergeNode = true;
-                    $allowOverwrite = true;
-                    if (isset($values['value']) && 0 === strpos($values['value'], '*')) {
-                        $refName = substr($values['value'], 1);
-                        if (!array_key_exists($refName, $this->refs)) {
-                            throw new ParseException(sprintf('Reference "%s" does not exist.', $refName), $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        $refValue = $this->refs[$refName];
-
-                        if (!is_array($refValue)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        foreach ($refValue as $key => $value) {
-                            if (!isset($data[$key])) {
-                                $data[$key] = $value;
-                            }
-                        }
-                    } else {
-                        if (isset($values['value']) && $values['value'] !== '') {
-                            $value = $values['value'];
-                        } else {
-                            $value = $this->getNextEmbedBlock();
-                        }
-                        $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-
-                        if (!is_array($parsed)) {
-                            throw new ParseException('YAML merge keys used with a scalar value instead of an array.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-                        }
-
-                        if (isset($parsed[0])) {
-                            // If the value associated with the merge key is a sequence, then this sequence is expected to contain mapping nodes
-                            // and each of these nodes is merged in turn according to its order in the sequence. Keys in mapping nodes earlier
-                            // in the sequence override keys specified in later mapping nodes.
-                            foreach ($parsed as $parsedItem) {
-                                if (!is_array($parsedItem)) {
-                                    throw new ParseException('Merge items must be arrays.', $this->getRealCurrentLineNb() + 1, $parsedItem);
-                                }
-
-                                foreach ($parsedItem as $key => $value) {
-                                    if (!isset($data[$key])) {
-                                        $data[$key] = $value;
-                                    }
-                                }
-                            }
-                        } else {
-                            // If the value associated with the key is a single mapping node, each of its key/value pairs is inserted into the
-                            // current mapping, unless the key already exists in it.
-                            foreach ($parsed as $key => $value) {
-                                if (!isset($data[$key])) {
-                                    $data[$key] = $value;
-                                }
-                            }
-                        }
-                    }
-                } elseif (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) {
-                    $isRef = $matches['ref'];
-                    $values['value'] = $matches['value'];
-                }
-
-                if ($mergeNode) {
-                    // Merge keys
-                } elseif (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
-                    // hash
-                    // if next line is less indented or equal, then it means that the current value is null
-                    if (!$this->isNextLineIndented() && !$this->isNextLineUnIndentedCollection()) {
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
-                            $data[$key] = null;
-                        }
-                    } else {
-                        $c = $this->getRealCurrentLineNb() + 1;
-                        $parser = new self($c);
-                        $parser->refs = &$this->refs;
-                        $value = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // But overwriting is allowed when a merge node is used in current block.
-                        if ($allowOverwrite || !isset($data[$key])) {
-                            $data[$key] = $value;
-                        }
-                    }
-                } else {
-                    $value = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport, $objectForMap);
-                    // Spec: Keys MUST be unique; first one wins.
-                    // But overwriting is allowed when a merge node is used in current block.
-                    if ($allowOverwrite || !isset($data[$key])) {
-                        $data[$key] = $value;
-                    }
-                }
-                if ($isRef) {
-                    $this->refs[$isRef] = $data[$key];
-                }
-            } else {
-                // multiple documents are not supported
-                if ('---' === $this->currentLine) {
-                    throw new ParseException('Multiple documents are not supported.');
-                }
-
-                // 1-liner optionally followed by newline(s)
-                if (is_string($value) && $this->lines[0] === trim($value)) {
-                    try {
-                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-                    } catch (ParseException $e) {
-                        $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-                        $e->setSnippet($this->currentLine);
-
-                        throw $e;
-                    }
-
-                    if (is_array($value)) {
-                        $first = reset($value);
-                        if (is_string($first) && 0 === strpos($first, '*')) {
-                            $data = array();
-                            foreach ($value as $alias) {
-                                $data[] = $this->refs[substr($alias, 1)];
-                            }
-                            $value = $data;
-                        }
-                    }
-
-                    if (isset($mbEncoding)) {
-                        mb_internal_encoding($mbEncoding);
-                    }
-
-                    return $value;
-                }
-
-                switch (preg_last_error()) {
-                    case PREG_INTERNAL_ERROR:
-                        $error = 'Internal PCRE error.';
-                        break;
-                    case PREG_BACKTRACK_LIMIT_ERROR:
-                        $error = 'pcre.backtrack_limit reached.';
-                        break;
-                    case PREG_RECURSION_LIMIT_ERROR:
-                        $error = 'pcre.recursion_limit reached.';
-                        break;
-                    case PREG_BAD_UTF8_ERROR:
-                        $error = 'Malformed UTF-8 data.';
-                        break;
-                    case PREG_BAD_UTF8_OFFSET_ERROR:
-                        $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point.';
-                        break;
-                    default:
-                        $error = 'Unable to parse.';
-                }
-
-                throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return empty($data) ? null : $data;
-    }
-
-    /**
-     * Returns the current line number (takes the offset into account).
-     *
-     * @return int The current line number
-     */
-    private function getRealCurrentLineNb()
-    {
-        return $this->currentLineNb + $this->offset;
-    }
-
-    /**
-     * Returns the current line indentation.
-     *
-     * @return int The current line indentation
-     */
-    private function getCurrentLineIndentation()
-    {
-        return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
-    }
-
-    /**
-     * Returns the next embed block of YAML.
-     *
-     * @param int  $indentation The indent level at which the block is to be read, or null for default
-     * @param bool $inSequence  True if the enclosing data structure is a sequence
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When indentation problem are detected
-     */
-    private function getNextEmbedBlock($indentation = null, $inSequence = false)
-    {
-        $oldLineIndentation = $this->getCurrentLineIndentation();
-
-        if (!$this->moveToNextLine()) {
-            return;
-        }
-
-        if (null === $indentation) {
-            $newIndent = $this->getCurrentLineIndentation();
-
-            $unindentedEmbedBlock = $this->isStringUnIndentedCollectionItem($this->currentLine);
-
-            if (!$this->isCurrentLineEmpty() && 0 === $newIndent && !$unindentedEmbedBlock) {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        } else {
-            $newIndent = $indentation;
-        }
-
-        $data = array();
-        if ($this->getCurrentLineIndentation() >= $newIndent) {
-            $data[] = substr($this->currentLine, $newIndent);
-        } else {
-            $this->moveToPreviousLine();
-
-            return;
-        }
-
-        if ($inSequence && $oldLineIndentation === $newIndent && isset($data[0][0]) && '-' === $data[0][0]) {
-            // the previous line contained a dash but no item content, this line is a sequence item with the same indentation
-            // and therefore no nested list or mapping
-            $this->moveToPreviousLine();
-
-            return;
-        }
-
-        $isItUnindentedCollection = $this->isStringUnIndentedCollectionItem($this->currentLine);
-
-        // Comments must not be removed inside a block scalar
-        $removeCommentsPattern = '~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~';
-        $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
-
-        while ($this->moveToNextLine()) {
-            $indent = $this->getCurrentLineIndentation();
-
-            if ($indent === $newIndent) {
-                $removeComments = !preg_match($removeCommentsPattern, $this->currentLine);
-            }
-
-            if ($isItUnindentedCollection && !$this->isStringUnIndentedCollectionItem($this->currentLine) && $newIndent === $indent) {
-                $this->moveToPreviousLine();
-                break;
-            }
-
-            if ($this->isCurrentLineBlank()) {
-                $data[] = substr($this->currentLine, $newIndent);
-                continue;
-            }
-
-            if ($removeComments && $this->isCurrentLineComment()) {
-                continue;
-            }
-
-            if ($indent >= $newIndent) {
-                $data[] = substr($this->currentLine, $newIndent);
-            } elseif (0 == $indent) {
-                $this->moveToPreviousLine();
-
-                break;
-            } else {
-                throw new ParseException('Indentation problem.', $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        }
-
-        return implode("\n", $data);
-    }
-
-    /**
-     * Moves the parser to the next line.
-     *
-     * @return bool
-     */
-    private function moveToNextLine()
-    {
-        if ($this->currentLineNb >= count($this->lines) - 1) {
-            return false;
-        }
-
-        $this->currentLine = $this->lines[++$this->currentLineNb];
-
-        return true;
-    }
-
-    /**
-     * Moves the parser to the previous line.
-     */
-    private function moveToPreviousLine()
-    {
-        $this->currentLine = $this->lines[--$this->currentLineNb];
-    }
-
-    /**
-     * Parses a YAML value.
-     *
-     * @param string $value                  A YAML value
-     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
-     * @param bool   $objectSupport          True if object support is enabled, false otherwise
-     * @param bool   $objectForMap           true if maps should return a stdClass instead of array()
-     *
-     * @return mixed A PHP value
-     *
-     * @throws ParseException When reference does not exist
-     */
-    private function parseValue($value, $exceptionOnInvalidType, $objectSupport, $objectForMap)
-    {
-        if (0 === strpos($value, '*')) {
-            if (false !== $pos = strpos($value, '#')) {
-                $value = substr($value, 1, $pos - 2);
-            } else {
-                $value = substr($value, 1);
-            }
-
-            if (!array_key_exists($value, $this->refs)) {
-                throw new ParseException(sprintf('Reference "%s" does not exist.', $value), $this->currentLine);
-            }
-
-            return $this->refs[$value];
-        }
-
-        if (preg_match('/^'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
-            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
-
-            return $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
-        }
-
-        try {
-            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap, $this->refs);
-        } catch (ParseException $e) {
-            $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-            $e->setSnippet($this->currentLine);
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Parses a block scalar.
-     *
-     * @param string $style       The style indicator that was used to begin this block scalar (| or >)
-     * @param string $chomping    The chomping indicator that was used to begin this block scalar (+ or -)
-     * @param int    $indentation The indentation indicator that was used to begin this block scalar
-     *
-     * @return string The text value
-     */
-    private function parseBlockScalar($style, $chomping = '', $indentation = 0)
-    {
-        $notEOF = $this->moveToNextLine();
-        if (!$notEOF) {
-            return '';
-        }
-
-        $isCurrentLineBlank = $this->isCurrentLineBlank();
-        $text = '';
-
-        // leading blank lines are consumed before determining indentation
-        while ($notEOF && $isCurrentLineBlank) {
-            // newline only if not EOF
-            if ($notEOF = $this->moveToNextLine()) {
-                $text .= "\n";
-                $isCurrentLineBlank = $this->isCurrentLineBlank();
-            }
-        }
-
-        // determine indentation if not specified
-        if (0 === $indentation) {
-            if (preg_match('/^ +/', $this->currentLine, $matches)) {
-                $indentation = strlen($matches[0]);
-            }
-        }
-
-        if ($indentation > 0) {
-            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
-
-            while (
-                $notEOF && (
-                    $isCurrentLineBlank ||
-                    preg_match($pattern, $this->currentLine, $matches)
-                )
-            ) {
-                if ($isCurrentLineBlank) {
-                    $text .= substr($this->currentLine, $indentation);
-                } else {
-                    $text .= $matches[1];
-                }
-
-                // newline only if not EOF
-                if ($notEOF = $this->moveToNextLine()) {
-                    $text .= "\n";
-                    $isCurrentLineBlank = $this->isCurrentLineBlank();
-                }
-            }
-        } elseif ($notEOF) {
-            $text .= "\n";
-        }
-
-        if ($notEOF) {
-            $this->moveToPreviousLine();
-        }
-
-        // folded style
-        if ('>' === $style) {
-            // folded lines
-            // replace all non-leading/non-trailing single newlines with spaces
-            preg_match('/(\n*)$/', $text, $matches);
-            $text = preg_replace('/(?<!\n|^)\n(?!\n)/', ' ', rtrim($text, "\n"));
-            $text .= $matches[1];
-
-            // empty separation lines
-            // remove one newline from each group of non-leading/non-trailing newlines
-            $text = preg_replace('/[^\n]\n+\K\n(?=[^\n])/', '', $text);
-        }
-
-        // deal with trailing newlines
-        if ('' === $chomping) {
-            $text = preg_replace('/\n+$/', "\n", $text);
-        } elseif ('-' === $chomping) {
-            $text = preg_replace('/\n+$/', '', $text);
-        }
-
-        return $text;
-    }
-
-    /**
-     * Returns true if the next line is indented.
-     *
-     * @return bool Returns true if the next line is indented, false otherwise
-     */
-    private function isNextLineIndented()
-    {
-        $currentIndentation = $this->getCurrentLineIndentation();
-        $EOF = !$this->moveToNextLine();
-
-        while (!$EOF && $this->isCurrentLineEmpty()) {
-            $EOF = !$this->moveToNextLine();
-        }
-
-        if ($EOF) {
-            return false;
-        }
-
-        $ret = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
-
-        $this->moveToPreviousLine();
-
-        return $ret;
-    }
-
-    /**
-     * Returns true if the current line is blank or if it is a comment line.
-     *
-     * @return bool Returns true if the current line is empty or if it is a comment line, false otherwise
-     */
-    private function isCurrentLineEmpty()
-    {
-        return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
-    }
-
-    /**
-     * Returns true if the current line is blank.
-     *
-     * @return bool Returns true if the current line is blank, false otherwise
-     */
-    private function isCurrentLineBlank()
-    {
-        return '' == trim($this->currentLine, ' ');
-    }
-
-    /**
-     * Returns true if the current line is a comment line.
-     *
-     * @return bool Returns true if the current line is a comment line, false otherwise
-     */
-    private function isCurrentLineComment()
-    {
-        //checking explicitly the first char of the trim is faster than loops or strpos
-        $ltrimmedLine = ltrim($this->currentLine, ' ');
-
-        return $ltrimmedLine[0] === '#';
-    }
-
-    /**
-     * Cleanups a YAML string to be parsed.
-     *
-     * @param string $value The input YAML string
-     *
-     * @return string A cleaned up YAML string
-     */
-    private function cleanup($value)
-    {
-        $value = str_replace(array("\r\n", "\r"), "\n", $value);
-
-        // strip YAML header
-        $count = 0;
-        $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#u', '', $value, -1, $count);
-        $this->offset += $count;
-
-        // remove leading comments
-        $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
-        if ($count == 1) {
-            // items have been removed, update the offset
-            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-            $value = $trimmedValue;
-        }
-
-        // remove start of the document marker (---)
-        $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
-        if ($count == 1) {
-            // items have been removed, update the offset
-            $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
-            $value = $trimmedValue;
-
-            // remove end of the document marker (...)
-            $value = preg_replace('#\.\.\.\s*$#', '', $value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Returns true if the next line starts unindented collection.
-     *
-     * @return bool Returns true if the next line starts unindented collection, false otherwise
-     */
-    private function isNextLineUnIndentedCollection()
-    {
-        $currentIndentation = $this->getCurrentLineIndentation();
-        $notEOF = $this->moveToNextLine();
-
-        while ($notEOF && $this->isCurrentLineEmpty()) {
-            $notEOF = $this->moveToNextLine();
-        }
-
-        if (false === $notEOF) {
-            return false;
-        }
-
-        $ret = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem($this->currentLine)
-        ) {
-            $ret = true;
-        }
-
-        $this->moveToPreviousLine();
-
-        return $ret;
-    }
-
-    /**
-     * Returns true if the string is un-indented collection item.
-     *
-     * @return bool Returns true if the string is un-indented collection item, false otherwise
-     */
-    private function isStringUnIndentedCollectionItem()
-    {
-        return (0 === strpos($this->currentLine, '- '));
-    }
-}
diff --git a/vendor/symfony/yaml/README.md b/vendor/symfony/yaml/README.md
deleted file mode 100644
index 85a9786..0000000
--- a/vendor/symfony/yaml/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Yaml Component
-==============
-
-YAML implements most of the YAML 1.2 specification.
-
-```php
-use Symfony\Component\Yaml\Yaml;
-
-$array = Yaml::parse(file_get_contents(filename));
-
-print Yaml::dump($array);
-```
-
-Resources
----------
-
-You can run the unit tests with the following command:
-
-    $ cd path/to/Symfony/Component/Yaml/
-    $ composer install
-    $ phpunit
diff --git a/vendor/symfony/yaml/Unescaper.php b/vendor/symfony/yaml/Unescaper.php
deleted file mode 100644
index 1b5e5ec..0000000
--- a/vendor/symfony/yaml/Unescaper.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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\Component\Yaml;
-
-/**
- * Unescaper encapsulates unescaping rules for single and double-quoted
- * YAML strings.
- *
- * @author Matthew Lewinski <matthew@lewinski.org>
- */
-class Unescaper
-{
-    /**
-     * Parser and Inline assume UTF-8 encoding, so escaped Unicode characters
-     * must be converted to that encoding.
-     *
-     * @deprecated since version 2.5, to be removed in 3.0
-     *
-     * @internal
-     */
-    const ENCODING = 'UTF-8';
-
-    /**
-     * Regex fragment that matches an escaped character in a double quoted string.
-     */
-    const REGEX_ESCAPED_CHARACTER = "\\\\([0abt\tnvfre \\\"\\/\\\\N_LP]|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})";
-
-    /**
-     * Unescapes a single quoted string.
-     *
-     * @param string $value A single quoted string.
-     *
-     * @return string The unescaped string.
-     */
-    public function unescapeSingleQuotedString($value)
-    {
-        return str_replace('\'\'', '\'', $value);
-    }
-
-    /**
-     * Unescapes a double quoted string.
-     *
-     * @param string $value A double quoted string.
-     *
-     * @return string The unescaped string.
-     */
-    public function unescapeDoubleQuotedString($value)
-    {
-        $self = $this;
-        $callback = function ($match) use ($self) {
-            return $self->unescapeCharacter($match[0]);
-        };
-
-        // evaluate the string
-        return preg_replace_callback('/'.self::REGEX_ESCAPED_CHARACTER.'/u', $callback, $value);
-    }
-
-    /**
-     * Unescapes a character that was found in a double-quoted string.
-     *
-     * @param string $value An escaped character
-     *
-     * @return string The unescaped character
-     */
-    public function unescapeCharacter($value)
-    {
-        switch ($value{1}) {
-            case '0':
-                return "\x0";
-            case 'a':
-                return "\x7";
-            case 'b':
-                return "\x8";
-            case 't':
-                return "\t";
-            case "\t":
-                return "\t";
-            case 'n':
-                return "\n";
-            case 'v':
-                return "\xB";
-            case 'f':
-                return "\xC";
-            case 'r':
-                return "\r";
-            case 'e':
-                return "\x1B";
-            case ' ':
-                return ' ';
-            case '"':
-                return '"';
-            case '/':
-                return '/';
-            case '\\':
-                return '\\';
-            case 'N':
-                // U+0085 NEXT LINE
-                return "\xC2\x85";
-            case '_':
-                // U+00A0 NO-BREAK SPACE
-                return "\xC2\xA0";
-            case 'L':
-                // U+2028 LINE SEPARATOR
-                return "\xE2\x80\xA8";
-            case 'P':
-                // U+2029 PARAGRAPH SEPARATOR
-                return "\xE2\x80\xA9";
-            case 'x':
-                return self::utf8chr(hexdec(substr($value, 2, 2)));
-            case 'u':
-                return self::utf8chr(hexdec(substr($value, 2, 4)));
-            case 'U':
-                return self::utf8chr(hexdec(substr($value, 2, 8)));
-        }
-    }
-
-    /**
-     * Get the UTF-8 character for the given code point.
-     *
-     * @param int $c The unicode code point
-     *
-     * @return string The corresponding UTF-8 character
-     */
-    private static function utf8chr($c)
-    {
-        if (0x80 > $c %= 0x200000) {
-            return chr($c);
-        }
-        if (0x800 > $c) {
-            return chr(0xC0 | $c >> 6).chr(0x80 | $c & 0x3F);
-        }
-        if (0x10000 > $c) {
-            return chr(0xE0 | $c >> 12).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-        }
-
-        return chr(0xF0 | $c >> 18).chr(0x80 | $c >> 12 & 0x3F).chr(0x80 | $c >> 6 & 0x3F).chr(0x80 | $c & 0x3F);
-    }
-}
diff --git a/vendor/symfony/yaml/Yaml.php b/vendor/symfony/yaml/Yaml.php
deleted file mode 100644
index 2d5f62c..0000000
--- a/vendor/symfony/yaml/Yaml.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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\Component\Yaml;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-/**
- * Yaml offers convenience methods to load and dump YAML.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Yaml
-{
-    /**
-     * Parses YAML into a PHP array.
-     *
-     * The parse method, when supplied with a YAML stream (string or file),
-     * will do its best to convert YAML in a file into a PHP array.
-     *
-     *  Usage:
-     *  <code>
-     *   $array = Yaml::parse(file_get_contents('config.yml'));
-     *   print_r($array);
-     *  </code>
-     *
-     * As this method accepts both plain strings and file names as an input,
-     * you must validate the input before calling this method. Passing a file
-     * as an input is a deprecated feature and will be removed in 3.0.
-     *
-     * Note: the ability to pass file names to the Yaml::parse method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.
-     *
-     * @param string $input                  Path to a YAML file or a string containing YAML
-     * @param bool   $exceptionOnInvalidType True if an exception must be thrown on invalid types false otherwise
-     * @param bool   $objectSupport          True if object support is enabled, false otherwise
-     * @param bool   $objectForMap           True if maps should return a stdClass instead of array()
-     *
-     * @return array The YAML converted to a PHP array
-     *
-     * @throws ParseException If the YAML is not valid
-     */
-    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false, $objectForMap = false)
-    {
-        // if input is a file, process it
-        $file = '';
-        if (strpos($input, "\n") === false && is_file($input)) {
-            @trigger_error('The ability to pass file names to the '.__METHOD__.' method is deprecated since version 2.2 and will be removed in 3.0. Pass the YAML contents of the file instead.', E_USER_DEPRECATED);
-
-            if (false === is_readable($input)) {
-                throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
-            }
-
-            $file = $input;
-            $input = file_get_contents($file);
-        }
-
-        $yaml = new Parser();
-
-        try {
-            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport, $objectForMap);
-        } catch (ParseException $e) {
-            if ($file) {
-                $e->setParsedFile($file);
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Dumps a PHP array to a YAML string.
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.
-     *
-     * @param array $array                  PHP array
-     * @param int   $inline                 The level where you switch to inline YAML
-     * @param int   $indent                 The amount of spaces to use for indentation of nested nodes.
-     * @param bool  $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
-     * @param bool  $objectSupport          true if object support is enabled, false otherwise
-     *
-     * @return string A YAML string representing the original PHP array
-     */
-    public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
-    {
-        $yaml = new Dumper();
-        $yaml->setIndentation($indent);
-
-        return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
-    }
-}
diff --git a/vendor/symfony/yaml/composer.json b/vendor/symfony/yaml/composer.json
deleted file mode 100644
index b798141..0000000
--- a/vendor/symfony/yaml/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "symfony/yaml",
-    "type": "library",
-    "description": "Symfony Yaml Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.9"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Yaml\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev"
-        }
-    }
-}
diff --git a/vendor/symfony/yaml/phpunit.xml.dist b/vendor/symfony/yaml/phpunit.xml.dist
deleted file mode 100644
index 418b2c6..0000000
--- a/vendor/symfony/yaml/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Yaml Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/vendor/twig/twig/.editorconfig b/vendor/twig/twig/.editorconfig
deleted file mode 100644
index 270f1d1..0000000
--- a/vendor/twig/twig/.editorconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-end_of_line = LF
-
-[*.php]
-indent_style = space
-indent_size = 4
-
-[*.test]
-indent_style = space
-indent_size = 4
-
-[*.rst]
-indent_style = space
-indent_size = 4
diff --git a/vendor/twig/twig/.gitignore b/vendor/twig/twig/.gitignore
deleted file mode 100644
index 3110362..0000000
--- a/vendor/twig/twig/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/build
-/composer.lock
-/ext/twig/autom4te.cache/
-/phpunit.xml
-/vendor
diff --git a/vendor/twig/twig/.travis.yml b/vendor/twig/twig/.travis.yml
deleted file mode 100644
index 37262da..0000000
--- a/vendor/twig/twig/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
-
-php:
-    - 5.2
-    - 5.3
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - hhvm
-
-env:
-    - TWIG_EXT=no
-    - TWIG_EXT=yes
-
-install:
-    # Composer is not available on PHP 5.2
-    - if [ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]; then travis_retry composer install; fi
-
-before_script:
-    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
-    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
-    - if [ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]; then sed -i.bak "s|vendor/autoload.php|test/bootstrap.php|" phpunit.xml.dist; fi
-
-matrix:
-    fast_finish: true
-    exclude:
-        - php: hhvm
-          env: TWIG_EXT=yes
-    allow_failures:
-        - php: 7.0
-          env: TWIG_EXT=yes
diff --git a/vendor/twig/twig/CHANGELOG b/vendor/twig/twig/CHANGELOG
deleted file mode 100644
index e8f9da0..0000000
--- a/vendor/twig/twig/CHANGELOG
+++ /dev/null
@@ -1,811 +0,0 @@
-* 1.23.1 (2015-XX-XX)
-
- * fixed some exception messages which triggered PHP warnings
- * fixed BC on Twig_Test_NodeTestCase
-
-* 1.23.0 (2015-10-29)
-
- * deprecated the possibility to override an extension by registering another one with the same name
- * deprecated Twig_ExtensionInterface::getGlobals() (added Twig_Extension_GlobalsInterface for BC)
- * deprecated Twig_ExtensionInterface::initRuntime() (added Twig_Extension_InitRuntimeInterface for BC)
- * deprecated Twig_Environment::computeAlternatives()
-
-* 1.22.3 (2015-10-13)
-
- * fixed regression when using null as a cache strategy
- * improved performance when checking template freshness
- * fixed warnings when loaded templates do not exist
- * fixed template class name generation to prevent possible collisions
- * fixed logic for custom escapers to call them even on integers and null values
- * changed template cache names to take into account the Twig C extension
-
-* 1.22.2 (2015-09-22)
-
- * fixed a race condition in template loading
-
-* 1.22.1 (2015-09-15)
-
- * fixed regression in template_from_string
-
-* 1.22.0 (2015-09-13)
-
- * made Twig_Test_IntegrationTestCase more flexible
- * added an option to force PHP bytecode invalidation when writing a compiled template into the cache
- * fixed the profiler duration for the root node
- * changed template cache names to take into account enabled extensions
- * deprecated Twig_Environment::clearCacheFiles(), Twig_Environment::getCacheFilename(),
-   Twig_Environment::writeCacheFile(), and Twig_Environment::getTemplateClassPrefix()
- * added a way to override the filesystem template cache system
- * added a way to get the original template source from Twig_Template
-
-* 1.21.2 (2015-09-09)
-
- * fixed variable names for the deprecation triggering code
- * fixed escaping strategy detection based on filename
- * added Traversable support for replace, merge, and sort
- * deprecated support for character by character replacement for the "replace" filter
-
-* 1.21.1 (2015-08-26)
-
- * fixed regression when using the deprecated Twig_Test_* classes
-
-* 1.21.0 (2015-08-24)
-
- * added deprecation notices for deprecated features
- * added a deprecation "framework" for filters/functions/tests and test fixtures
-
-* 1.20.0 (2015-08-12)
-
- * forbid access to the Twig environment from templates and internal parts of Twig_Template
- * fixed limited RCEs when in sandbox mode
- * deprecated Twig_Template::getEnvironment()
- * deprecated the _self variable for usage outside of the from and import tags
- * added Twig_BaseNodeVisitor to ease the compatibility of node visitors 
-   between 1.x and 2.x
-
-* 1.19.0 (2015-07-31)
-
- * fixed wrong error message when including an undefined template in a child template
- * added support for variadic filters, functions, and tests
- * added support for extra positional arguments in macros
- * added ignore_missing flag to the source function
- * fixed batch filter with zero items
- * deprecated Twig_Environment::clearTemplateCache()
- * fixed sandbox disabling when using the include function
-
-* 1.18.2 (2015-06-06)
-
- * fixed template/line guessing in exceptions for nested templates
- * optimized the number of inodes and the size of realpath cache when using the cache
-
-* 1.18.1 (2015-04-19)
-
- * fixed memory leaks in the C extension
- * deprecated Twig_Loader_String
- * fixed the slice filter when used with a SimpleXMLElement object
- * fixed filesystem loader when trying to load non-files (like directories)
-
-* 1.18.0 (2015-01-25)
-
- * fixed some error messages where the line was wrong (unknown variables or argument names)
- * added a new way to customize the main Module node (via empty nodes)
- * added Twig_Environment::createTemplate() to create a template from a string
- * added a profiler
- * fixed filesystem loader cache when different file paths are used for the same template
-
-* 1.17.0 (2015-01-14)
-
- * added a 'filename' autoescaping strategy, which dynamically chooses the
-   autoescaping strategy for a template based on template file extension.
-
-* 1.16.3 (2014-12-25)
-
- * fixed regression for dynamic parent templates
- * fixed cache management with statcache
- * fixed a regression in the slice filter
-
-* 1.16.2 (2014-10-17)
-
- * fixed timezone on dates as strings
- * fixed 2-words test names when a custom node class is not used
- * fixed macros when using an argument named like a PHP super global (like GET or POST)
- * fixed date_modify when working with DateTimeImmutable
- * optimized for loops
- * fixed multi-byte characters handling in the split filter
- * fixed a regression in the in operator
- * fixed a regression in the slice filter
-
-* 1.16.1 (2014-10-10)
-
- * improved error reporting in a sandboxed template
- * fixed missing error file/line information under certain circumstances
- * fixed wrong error line number in some error messages
- * fixed the in operator to use strict comparisons
- * sped up the slice filter
- * fixed for mb function overload mb_substr acting different
- * fixed the attribute() function when passing a variable for the arguments
-
-* 1.16.0 (2014-07-05)
-
- * changed url_encode to always encode according to RFC 3986
- * fixed inheritance in a 'use'-hierarchy
- * removed the __toString policy check when the sandbox is disabled
- * fixed recursively calling blocks in templates with inheritance
-
-* 1.15.1 (2014-02-13)
-
- * fixed the conversion of the special '0000-00-00 00:00' date
- * added an error message when trying to import an undefined block from a trait
- * fixed a C extension crash when accessing defined but uninitialized property.
-
-* 1.15.0 (2013-12-06)
-
- * made ignoreStrictCheck in Template::getAttribute() works with __call() methods throwing BadMethodCallException
- * added min and max functions
- * added the round filter
- * fixed a bug that prevented the optimizers to be enabled/disabled selectively
- * fixed first and last filters for UTF-8 strings
- * added a source function to include the content of a template without rendering it
- * fixed the C extension sandbox behavior when get or set is prepend to method name
-
-* 1.14.2 (2013-10-30)
-
- * fixed error filename/line when an error occurs in an included file
- * allowed operators that contain whitespaces to have more than one whitespace
- * allowed tests to be made of 1 or 2 words (like "same as" or "divisible by")
-
-* 1.14.1 (2013-10-15)
-
- * made it possible to use named operators as variables
- * fixed the possibility to have a variable named 'matches'
- * added support for PHP 5.5 DateTimeInterface
-
-* 1.14.0 (2013-10-03)
-
- * fixed usage of the html_attr escaping strategy to avoid double-escaping with the html strategy
- * added new operators: ends with, starts with, and matches
- * fixed some compatibility issues with HHVM
- * added a way to add custom escaping strategies
- * fixed the C extension compilation on Windows
- * fixed the batch filter when using a fill argument with an exact match of elements to batch
- * fixed the filesystem loader cache when a template name exists in several namespaces
- * fixed template_from_string when the template includes or extends other ones
- * fixed a crash of the C extension on an edge case
-
-* 1.13.2 (2013-08-03)
-
- * fixed the error line number for an error occurs in and embedded template
- * fixed crashes of the C extension on some edge cases
-
-* 1.13.1 (2013-06-06)
-
- * added the possibility to ignore the filesystem constructor argument in Twig_Loader_Filesystem
- * fixed Twig_Loader_Chain::exists() for a loader which implements Twig_ExistsLoaderInterface
- * adjusted backtrace call to reduce memory usage when an error occurs
- * added support for object instances as the second argument of the constant test
- * fixed the include function when used in an assignment
-
-* 1.13.0 (2013-05-10)
-
- * fixed getting a numeric-like item on a variable ('09' for instance)
- * fixed getting a boolean or float key on an array, so it is consistent with PHP's array access:
-   `{{ array[false] }}` behaves the same as `echo $array[false];` (equals `$array[0]`)
- * made the escape filter 20% faster for happy path (escaping string for html with UTF-8)
- * changed ☃ to § in tests
- * enforced usage of named arguments after positional ones
-
-* 1.12.3 (2013-04-08)
-
- * fixed a security issue in the filesystem loader where it was possible to include a template one
-   level above the configured path
- * fixed fatal error that should be an exception when adding a filter/function/test too late
- * added a batch filter
- * added support for encoding an array as query string in the url_encode filter
-
-* 1.12.2 (2013-02-09)
-
- * fixed the timezone used by the date filter and function when the given date contains a timezone (like 2010-01-28T15:00:00+02:00)
- * fixed globals when getGlobals is called early on
- * added the first and last filter
-
-* 1.12.1 (2013-01-15)
-
- * added support for object instances as the second argument of the constant function
- * relaxed globals management to avoid a BC break
- * added support for {{ some_string[:2] }}
-
-* 1.12.0 (2013-01-08)
-
- * added verbatim as an alias for the raw tag to avoid confusion with the raw filter
- * fixed registration of tests and functions as anonymous functions
- * fixed globals management
-
-* 1.12.0-RC1 (2012-12-29)
-
- * added an include function (does the same as the include tag but in a more flexible way)
- * added the ability to use any PHP callable to define filters, functions, and tests
- * added a syntax error when using a loop variable that is not defined
- * added the ability to set default values for macro arguments
- * added support for named arguments for filters, tests, and functions
- * moved filters/functions/tests syntax errors to the parser
- * added support for extended ternary operator syntaxes
-
-* 1.11.1 (2012-11-11)
-
- * fixed debug info line numbering (was off by 2)
- * fixed escaping when calling a macro inside another one (regression introduced in 1.9.1)
- * optimized variable access on PHP 5.4
- * fixed a crash of the C extension when an exception was thrown from a macro called without being imported (using _self.XXX)
-
-* 1.11.0 (2012-11-07)
-
- * fixed macro compilation when a variable name is a PHP reserved keyword
- * changed the date filter behavior to always apply the default timezone, except if false is passed as the timezone
- * fixed bitwise operator precedences
- * added the template_from_string function
- * fixed default timezone usage for the date function
- * optimized the way Twig exceptions are managed (to make them faster)
- * added Twig_ExistsLoaderInterface (implementing this interface in your loader make the chain loader much faster)
-
-* 1.10.3 (2012-10-19)
-
- * fixed wrong template location in some error messages
- * reverted a BC break introduced in 1.10.2
- * added a split filter
-
-* 1.10.2 (2012-10-15)
-
- * fixed macro calls on PHP 5.4
-
-* 1.10.1 (2012-10-15)
-
- * made a speed optimization to macro calls when imported via the "import" tag
- * fixed C extension compilation on Windows
- * fixed a segfault in the C extension when using DateTime objects
-
-* 1.10.0 (2012-09-28)
-
- * extracted functional tests framework to make it reusable for third-party extensions
- * added namespaced templates support in Twig_Loader_Filesystem
- * added Twig_Loader_Filesystem::prependPath()
- * fixed an error when a token parser pass a closure as a test to the subparse() method
-
-* 1.9.2 (2012-08-25)
-
- * fixed the in operator for objects that contain circular references
- * fixed the C extension when accessing a public property of an object implementing the \ArrayAccess interface
-
-* 1.9.1 (2012-07-22)
-
- * optimized macro calls when auto-escaping is on
- * fixed wrong parent class for Twig_Function_Node
- * made Twig_Loader_Chain more explicit about problems
-
-* 1.9.0 (2012-07-13)
-
- * made the parsing independent of the template loaders
- * fixed exception trace when an error occurs when rendering a child template
- * added escaping strategies for CSS, URL, and HTML attributes
- * fixed nested embed tag calls
- * added the date_modify filter
-
-* 1.8.3 (2012-06-17)
-
- * fixed paths in the filesystem loader when passing a path that ends with a slash or a backslash
- * fixed escaping when a project defines a function named html or js
- * fixed chmod mode to apply the umask correctly
-
-* 1.8.2 (2012-05-30)
-
- * added the abs filter
- * fixed a regression when using a number in template attributes
- * fixed compiler when mbstring.func_overload is set to 2
- * fixed DateTimeZone support in date filter
-
-* 1.8.1 (2012-05-17)
-
- * fixed a regression when dealing with SimpleXMLElement instances in templates
- * fixed "is_safe" value for the "dump" function when "html_errors" is not defined in php.ini
- * switched to use mbstring whenever possible instead of iconv (you might need to update your encoding as mbstring and iconv encoding names sometimes differ)
-
-* 1.8.0 (2012-05-08)
-
- * enforced interface when adding tests, filters, functions, and node visitors from extensions
- * fixed a side-effect of the date filter where the timezone might be changed
- * simplified usage of the autoescape tag; the only (optional) argument is now the escaping strategy or false (with a BC layer)
- * added a way to dynamically change the auto-escaping strategy according to the template "filename"
- * changed the autoescape option to also accept a supported escaping strategy (for BC, true is equivalent to html)
- * added an embed tag
-
-* 1.7.0 (2012-04-24)
-
- * fixed a PHP warning when using CIFS
- * fixed template line number in some exceptions
- * added an iterable test
- * added an error when defining two blocks with the same name in a template
- * added the preserves_safety option for filters
- * fixed a PHP notice when trying to access a key on a non-object/array variable
- * enhanced error reporting when the template file is an instance of SplFileInfo
- * added Twig_Environment::mergeGlobals()
- * added compilation checks to avoid misuses of the sandbox tag
- * fixed filesystem loader freshness logic for high traffic websites
- * fixed random function when charset is null
-
-* 1.6.5 (2012-04-11)
-
- * fixed a regression when a template only extends another one without defining any blocks
-
-* 1.6.4 (2012-04-02)
-
- * fixed PHP notice in Twig_Error::guessTemplateLine() introduced in 1.6.3
- * fixed performance when compiling large files
- * optimized parent template creation when the template does not use dynamic inheritance
-
-* 1.6.3 (2012-03-22)
-
- * fixed usage of Z_ADDREF_P for PHP 5.2 in the C extension
- * fixed compilation of numeric values used in templates when using a locale where the decimal separator is not a dot
- * made the strategy used to guess the real template file name and line number in exception messages much faster and more accurate
-
-* 1.6.2 (2012-03-18)
-
- * fixed sandbox mode when used with inheritance
- * added preserveKeys support for the slice filter
- * fixed the date filter when a DateTime instance is passed with a specific timezone
- * added a trim filter
-
-* 1.6.1 (2012-02-29)
-
- * fixed Twig C extension
- * removed the creation of Twig_Markup instances when not needed
- * added a way to set the default global timezone for dates
- * fixed the slice filter on strings when the length is not specified
- * fixed the creation of the cache directory in case of a race condition
-
-* 1.6.0 (2012-02-04)
-
- * fixed raw blocks when used with the whitespace trim option
- * made a speed optimization to macro calls when imported via the "from" tag
- * fixed globals, parsers, visitors, filters, tests, and functions management in Twig_Environment when a new one or new extension is added
- * fixed the attribute function when passing arguments
- * added slice notation support for the [] operator (syntactic sugar for the slice operator)
- * added a slice filter
- * added string support for the reverse filter
- * fixed the empty test and the length filter for Twig_Markup instances
- * added a date function to ease date comparison
- * fixed unary operators precedence
- * added recursive parsing support in the parser
- * added string and integer handling for the random function
-
-* 1.5.1 (2012-01-05)
-
- * fixed a regression when parsing strings
-
-* 1.5.0 (2012-01-04)
-
- * added Traversable objects support for the join filter
-
-* 1.5.0-RC2 (2011-12-30)
-
- * added a way to set the default global date interval format
- * fixed the date filter for DateInterval instances (setTimezone() does not exist for them)
- * refactored Twig_Template::display() to ease its extension
- * added a number_format filter
-
-* 1.5.0-RC1 (2011-12-26)
-
- * removed the need to quote hash keys
- * allowed hash keys to be any expression
- * added a do tag
- * added a flush tag
- * added support for dynamically named filters and functions
- * added a dump function to help debugging templates
- * added a nl2br filter
- * added a random function
- * added a way to change the default format for the date filter
- * fixed the lexer when an operator ending with a letter ends a line
- * added string interpolation support
- * enhanced exceptions for unknown filters, functions, tests, and tags
-
-* 1.4.0 (2011-12-07)
-
- * fixed lexer when using big numbers (> PHP_INT_MAX)
- * added missing preserveKeys argument to the reverse filter
- * fixed macros containing filter tag calls
-
-* 1.4.0-RC2 (2011-11-27)
-
- * removed usage of Reflection in Twig_Template::getAttribute()
- * added a C extension that can optionally replace Twig_Template::getAttribute()
- * added negative timestamp support to the date filter
-
-* 1.4.0-RC1 (2011-11-20)
-
- * optimized variable access when using PHP 5.4
- * changed the precedence of the .. operator to be more consistent with languages that implements such a feature like Ruby
- * added an Exception to Twig_Loader_Array::isFresh() method when the template does not exist to be consistent with other loaders
- * added Twig_Function_Node to allow more complex functions to have their own Node class
- * added Twig_Filter_Node to allow more complex filters to have their own Node class
- * added Twig_Test_Node to allow more complex tests to have their own Node class
- * added a better error message when a template is empty but contain a BOM
- * fixed "in" operator for empty strings
- * fixed the "defined" test and the "default" filter (now works with more than one call (foo.bar.foo) and for both values of the strict_variables option)
- * changed the way extensions are loaded (addFilter/addFunction/addGlobal/addTest/addNodeVisitor/addTokenParser/addExtension can now be called in any order)
- * added Twig_Environment::display()
- * made the escape filter smarter when the encoding is not supported by PHP
- * added a convert_encoding filter
- * moved all node manipulations outside the compile() Node method
- * made several speed optimizations
-
-* 1.3.0 (2011-10-08)
-
-no changes
-
-* 1.3.0-RC1 (2011-10-04)
-
- * added an optimization for the parent() function
- * added cache reloading when auto_reload is true and an extension has been modified
- * added the possibility to force the escaping of a string already marked as safe (instance of Twig_Markup)
- * allowed empty templates to be used as traits
- * added traits support for the "parent" function
-
-* 1.2.0 (2011-09-13)
-
-no changes
-
-* 1.2.0-RC1 (2011-09-10)
-
- * enhanced the exception when a tag remains unclosed
- * added support for empty Countable objects for the "empty" test
- * fixed algorithm that determines if a template using inheritance is valid (no output between block definitions)
- * added better support for encoding problems when escaping a string (available as of PHP 5.4)
- * added a way to ignore a missing template when using the "include" tag ({% include "foo" ignore missing %})
- * added support for an array of templates to the "include" and "extends" tags ({% include ['foo', 'bar'] %})
- * added support for bitwise operators in expressions
- * added the "attribute" function to allow getting dynamic attributes on variables
- * added Twig_Loader_Chain
- * added Twig_Loader_Array::setTemplate()
- * added an optimization for the set tag when used to capture a large chunk of static text
- * changed name regex to match PHP one "[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" (works for blocks, tags, functions, filters, and macros)
- * removed the possibility to use the "extends" tag from a block
- * added "if" modifier support to "for" loops
-
-* 1.1.2 (2011-07-30)
-
- * fixed json_encode filter on PHP 5.2
- * fixed regression introduced in 1.1.1 ({{ block(foo|lower) }})
- * fixed inheritance when using conditional parents
- * fixed compilation of templates when the body of a child template is not empty
- * fixed output when a macro throws an exception
- * fixed a parsing problem when a large chunk of text is enclosed in a comment tag
- * added PHPDoc for all Token parsers and Core extension functions
-
-* 1.1.1 (2011-07-17)
-
- * added a performance optimization in the Optimizer (also helps to lower the number of nested level calls)
- * made some performance improvement for some edge cases
-
-* 1.1.0 (2011-06-28)
-
- * fixed json_encode filter
-
-* 1.1.0-RC3 (2011-06-24)
-
- * fixed method case-sensitivity when using the sandbox mode
- * added timezone support for the date filter
- * fixed possible security problems with NUL bytes
-
-* 1.1.0-RC2 (2011-06-16)
-
- * added an exception when the template passed to "use" is not a string
- * made 'a.b is defined' not throw an exception if a is not defined (in strict mode)
- * added {% line \d+ %} directive
-
-* 1.1.0-RC1 (2011-05-28)
-
-Flush your cache after upgrading.
-
- * fixed date filter when using a timestamp
- * fixed the defined test for some cases
- * fixed a parsing problem when a large chunk of text is enclosed in a raw tag
- * added support for horizontal reuse of template blocks (see docs for more information)
- * added whitespace control modifier to all tags (see docs for more information)
- * added null as an alias for none (the null test is also an alias for the none test now)
- * made TRUE, FALSE, NONE equivalent to their lowercase counterparts
- * wrapped all compilation and runtime exceptions with Twig_Error_Runtime and added logic to guess the template name and line
- * moved display() method to Twig_Template (generated templates should now use doDisplay() instead)
-
-* 1.0.0 (2011-03-27)
-
- * fixed output when using mbstring
- * fixed duplicate call of methods when using the sandbox
- * made the charset configurable for the escape filter
-
-* 1.0.0-RC2 (2011-02-21)
-
- * changed the way {% set %} works when capturing (the content is now marked as safe)
- * added support for macro name in the endmacro tag
- * make Twig_Error compatible with PHP 5.3.0 >
- * fixed an infinite loop on some Windows configurations
- * fixed the "length" filter for numbers
- * fixed Template::getAttribute() as properties in PHP are case sensitive
- * removed coupling between Twig_Node and Twig_Template
- * fixed the ternary operator precedence rule
-
-* 1.0.0-RC1 (2011-01-09)
-
-Backward incompatibilities:
-
- * the "items" filter, which has been deprecated for quite a long time now, has been removed
- * the "range" filter has been converted to a function: 0|range(10) -> range(0, 10)
- * the "constant" filter has been converted to a function: {{ some_date|date('DATE_W3C'|constant) }} -> {{ some_date|date(constant('DATE_W3C')) }}
- * the "cycle" filter has been converted to a function: {{ ['odd', 'even']|cycle(i) }} -> {{ cycle(['odd', 'even'], i) }}
- * the "for" tag does not support "joined by" anymore
- * the "autoescape" first argument is now "true"/"false" (instead of "on"/"off")
- * the "parent" tag has been replaced by a "parent" function ({{ parent() }} instead of {% parent %})
- * the "display" tag has been replaced by a "block" function ({{ block('title') }} instead of {% display title %})
- * removed the grammar and simple token parser (moved to the Twig Extensions repository)
-
-Changes:
-
- * added "needs_context" option for filters and functions (the context is then passed as a first argument)
- * added global variables support
- * made macros return their value instead of echoing directly (fixes calling a macro in sandbox mode)
- * added the "from" tag to import macros as functions
- * added support for functions (a function is just syntactic sugar for a getAttribute() call)
- * made macros callable when sandbox mode is enabled
- * added an exception when a macro uses a reserved name
- * the "default" filter now uses the "empty" test instead of just checking for null
- * added the "empty" test
-
-* 0.9.10 (2010-12-16)
-
-Backward incompatibilities:
-
- * The Escaper extension is enabled by default, which means that all displayed
-   variables are now automatically escaped. You can revert to the previous
-   behavior by removing the extension via $env->removeExtension('escaper')
-   or just set the 'autoescape' option to 'false'.
- * removed the "without loop" attribute for the "for" tag (not needed anymore
-   as the Optimizer take care of that for most cases)
- * arrays and hashes have now a different syntax
-     * arrays keep the same syntax with square brackets: [1, 2]
-     * hashes now use curly braces (["a": "b"] should now be written as {"a": "b"})
-     * support for "arrays with keys" and "hashes without keys" is not supported anymore ([1, "foo": "bar"] or {"foo": "bar", 1})
- * the i18n extension is now part of the Twig Extensions repository
-
-Changes:
-
- * added the merge filter
- * removed 'is_escaper' option for filters (a left over from the previous version) -- you must use 'is_safe' now instead
- * fixed usage of operators as method names (like is, in, and not)
- * changed the order of execution for node visitors
- * fixed default() filter behavior when used with strict_variables set to on
- * fixed filesystem loader compatibility with PHAR files
- * enhanced error messages when an unexpected token is parsed in an expression
- * fixed filename not being added to syntax error messages
- * added the autoescape option to enable/disable autoescaping
- * removed the newline after a comment (mimics PHP behavior)
- * added a syntax error exception when parent block is used on a template that does not extend another one
- * made the Escaper extension enabled by default
- * fixed sandbox extension when used with auto output escaping
- * fixed escaper when wrapping a Twig_Node_Print (the original class must be preserved)
- * added an Optimizer extension (enabled by default; optimizes "for" loops and "raw" filters)
- * added priority to node visitors
-
-* 0.9.9 (2010-11-28)
-
-Backward incompatibilities:
- * the self special variable has been renamed to _self
- * the odd and even filters are now tests:
-     {{ foo|odd }} must now be written {{ foo is odd }}
- * the "safe" filter has been renamed to "raw"
- * in Node classes,
-        sub-nodes are now accessed via getNode() (instead of property access)
-        attributes via getAttribute() (instead of array access)
- * the urlencode filter had been renamed to url_encode
- * the include tag now merges the passed variables with the current context by default
-   (the old behavior is still possible by adding the "only" keyword)
- * moved Exceptions to Twig_Error_* (Twig_SyntaxError/Twig_RuntimeError are now Twig_Error_Syntax/Twig_Error_Runtime)
- * removed support for {{ 1 < i < 3 }} (use {{ i > 1 and i < 3 }} instead)
- * the "in" filter has been removed ({{ a|in(b) }} should now be written {{ a in b }})
-
-Changes:
- * added file and line to Twig_Error_Runtime exceptions thrown from Twig_Template
- * changed trans tag to accept any variable for the plural count
- * fixed sandbox mode (__toString() method check was not enforced if called implicitly from complex statements)
- * added the ** (power) operator
- * changed the algorithm used for parsing expressions
- * added the spaceless tag
- * removed trim_blocks option
- * added support for is*() methods for attributes (foo.bar now looks for foo->getBar() or foo->isBar())
- * changed all exceptions to extend Twig_Error
- * fixed unary expressions ({{ not(1 or 0) }})
- * fixed child templates (with an extend tag) that uses one or more imports
- * added support for {{ 1 not in [2, 3] }} (more readable than the current {{ not (1 in [2, 3]) }})
- * escaping has been rewritten
- * the implementation of template inheritance has been rewritten
-   (blocks can now be called individually and still work with inheritance)
- * fixed error handling for if tag when a syntax error occurs within a subparse process
- * added a way to implement custom logic for resolving token parsers given a tag name
- * fixed js escaper to be stricter (now uses a whilelist-based js escaper)
- * added the following filers: "constant", "trans", "replace", "json_encode"
- * added a "constant" test
- * fixed objects with __toString() not being autoescaped
- * fixed subscript expressions when calling __call() (methods now keep the case)
- * added "test" feature (accessible via the "is" operator)
- * removed the debug tag (should be done in an extension)
- * fixed trans tag when no vars are used in plural form
- * fixed race condition when writing template cache
- * added the special _charset variable to reference the current charset
- * added the special _context variable to reference the current context
- * renamed self to _self (to avoid conflict)
- * fixed Twig_Template::getAttribute() for protected properties
-
-* 0.9.8 (2010-06-28)
-
-Backward incompatibilities:
- * the trans tag plural count is now attached to the plural tag:
-    old: `{% trans count %}...{% plural %}...{% endtrans %}`
-    new: `{% trans %}...{% plural count %}...{% endtrans %}`
-
- * added a way to translate strings coming from a variable ({% trans var %})
- * fixed trans tag when used with the Escaper extension
- * fixed default cache umask
- * removed Twig_Template instances from the debug tag output
- * fixed objects with __isset() defined
- * fixed set tag when used with a capture
- * fixed type hinting for Twig_Environment::addFilter() method
-
-* 0.9.7 (2010-06-12)
-
-Backward incompatibilities:
- * changed 'as' to '=' for the set tag ({% set title as "Title" %} must now be {% set title = "Title" %})
- * removed the sandboxed attribute of the include tag (use the new sandbox tag instead)
- * refactored the Node system (if you have custom nodes, you will have to update them to use the new API)
-
- * added self as a special variable that refers to the current template (useful for importing macros from the current template)
- * added Twig_Template instance support to the include tag
- * added support for dynamic and conditional inheritance ({% extends some_var %} and {% extends standalone ? "minimum" : "base" %})
- * added a grammar sub-framework to ease the creation of custom tags
- * fixed the for tag for large arrays (some loop variables are now only available for arrays and objects that implement the Countable interface)
- * removed the Twig_Resource::resolveMissingFilter() method
- * fixed the filter tag which did not apply filtering to included files
- * added a bunch of unit tests
- * added a bunch of phpdoc
- * added a sandbox tag in the sandbox extension
- * changed the date filter to support any date format supported by DateTime
- * added strict_variable setting to throw an exception when an invalid variable is used in a template (disabled by default)
- * added the lexer, parser, and compiler as arguments to the Twig_Environment constructor
- * changed the cache option to only accepts an explicit path to a cache directory or false
- * added a way to add token parsers, filters, and visitors without creating an extension
- * added three interfaces: Twig_NodeInterface, Twig_TokenParserInterface, and Twig_FilterInterface
- * changed the generated code to match the new coding standards
- * fixed sandbox mode (__toString() method check was not enforced if called implicitly from a simple statement like {{ article }})
- * added an exception when a child template has a non-empty body (as it is always ignored when rendering)
-
-* 0.9.6 (2010-05-12)
-
- * fixed variables defined outside a loop and for which the value changes in a for loop
- * fixed the test suite for PHP 5.2 and older versions of PHPUnit
- * added support for __call() in expression resolution
- * fixed node visiting for macros (macros are now visited by visitors as any other node)
- * fixed nested block definitions with a parent call (rarely useful but nonetheless supported now)
- * added the cycle filter
- * fixed the Lexer when mbstring.func_overload is used with an mbstring.internal_encoding different from ASCII
- * added a long-syntax for the set tag ({% set foo %}...{% endset %})
- * unit tests are now powered by PHPUnit
- * added support for gettext via the `i18n` extension
- * fixed twig_capitalize_string_filter() and fixed twig_length_filter() when used with UTF-8 values
- * added a more useful exception if an if tag is not closed properly
- * added support for escaping strategy in the autoescape tag
- * fixed lexer when a template has a big chunk of text between/in a block
-
-* 0.9.5 (2010-01-20)
-
-As for any new release, don't forget to remove all cached templates after
-upgrading.
-
-If you have defined custom filters, you MUST upgrade them for this release. To
-upgrade, replace "array" with "new Twig_Filter_Function", and replace the
-environment constant by the "needs_environment" option:
-
-  // before
-  'even'   => array('twig_is_even_filter', false),
-  'escape' => array('twig_escape_filter', true),
-
-  // after
-  'even'   => new Twig_Filter_Function('twig_is_even_filter'),
-  'escape' => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true)),
-
-If you have created NodeTransformer classes, you will need to upgrade them to
-the new interface (please note that the interface is not yet considered
-stable).
-
- * fixed list nodes that did not extend the Twig_NodeListInterface
- * added the "without loop" option to the for tag (it disables the generation of the loop variable)
- * refactored node transformers to node visitors
- * fixed automatic-escaping for blocks
- * added a way to specify variables to pass to an included template
- * changed the automatic-escaping rules to be more sensible and more configurable in custom filters (the documentation lists all the rules)
- * improved the filter system to allow object methods to be used as filters
- * changed the Array and String loaders to actually make use of the cache mechanism
- * included the default filter function definitions in the extension class files directly (Core, Escaper)
- * added the // operator (like the floor() PHP function)
- * added the .. operator (as a syntactic sugar for the range filter when the step is 1)
- * added the in operator (as a syntactic sugar for the in filter)
- * added the following filters in the Core extension: in, range
- * added support for arrays (same behavior as in PHP, a mix between lists and dictionaries, arrays and hashes)
- * enhanced some error messages to provide better feedback in case of parsing errors
-
-* 0.9.4 (2009-12-02)
-
-If you have custom loaders, you MUST upgrade them for this release: The
-Twig_Loader base class has been removed, and the Twig_LoaderInterface has also
-been changed (see the source code for more information or the documentation).
-
- * added support for DateTime instances for the date filter
- * fixed loop.last when the array only has one item
- * made it possible to insert newlines in tag and variable blocks
- * fixed a bug when a literal '\n' were present in a template text
- * fixed bug when the filename of a template contains */
- * refactored loaders
-
-* 0.9.3 (2009-11-11)
-
-This release is NOT backward compatible with the previous releases.
-
-  The loaders do not take the cache and autoReload arguments anymore. Instead,
-  the Twig_Environment class has two new options: cache and auto_reload.
-  Upgrading your code means changing this kind of code:
-
-      $loader = new Twig_Loader_Filesystem('/path/to/templates', '/path/to/compilation_cache', true);
-      $twig = new Twig_Environment($loader);
-
-  to something like this:
-
-      $loader = new Twig_Loader_Filesystem('/path/to/templates');
-      $twig = new Twig_Environment($loader, array(
-        'cache' => '/path/to/compilation_cache',
-        'auto_reload' => true,
-      ));
-
- * deprecated the "items" filter as it is not needed anymore
- * made cache and auto_reload options of Twig_Environment instead of arguments of Twig_Loader
- * optimized template loading speed
- * removed output when an error occurs in a template and render() is used
- * made major speed improvements for loops (up to 300% on even the smallest loops)
- * added properties as part of the sandbox mode
- * added public properties support (obj.item can now be the item property on the obj object)
- * extended set tag to support expression as value ({% set foo as 'foo' ~ 'bar' %} )
- * fixed bug when \ was used in HTML
-
-* 0.9.2 (2009-10-29)
-
- * made some speed optimizations
- * changed the cache extension to .php
- * added a js escaping strategy
- * added support for short block tag
- * changed the filter tag to allow chained filters
- * made lexer more flexible as you can now change the default delimiters
- * added set tag
- * changed default directory permission when cache dir does not exist (more secure)
- * added macro support
- * changed filters first optional argument to be a Twig_Environment instance instead of a Twig_Template instance
- * made Twig_Autoloader::autoload() a static method
- * avoid writing template file if an error occurs
- * added $ escaping when outputting raw strings
- * enhanced some error messages to ease debugging
- * fixed empty cache files when the template contains an error
-
-* 0.9.1 (2009-10-14)
-
-  * fixed a bug in PHP 5.2.6
-  * fixed numbers with one than one decimal
-  * added support for method calls with arguments ({{ foo.bar('a', 43) }})
-  * made small speed optimizations
-  * made minor tweaks to allow better extensibility and flexibility
-
-* 0.9.0 (2009-10-12)
-
- * Initial release
diff --git a/vendor/twig/twig/LICENSE b/vendor/twig/twig/LICENSE
deleted file mode 100644
index a470002..0000000
--- a/vendor/twig/twig/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2009-2014 by the Twig Team.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-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.
-
-    * 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.
-
-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.
diff --git a/vendor/twig/twig/README.rst b/vendor/twig/twig/README.rst
deleted file mode 100644
index 81737b0..0000000
--- a/vendor/twig/twig/README.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Twig, the flexible, fast, and secure template language for PHP
-==============================================================
-
-Twig is a template language for PHP, released under the new BSD license (code
-and documentation).
-
-Twig uses a syntax similar to the Django and Jinja template languages which
-inspired the Twig runtime environment.
-
-More Information
-----------------
-
-Read the `documentation`_ for more information.
-
-.. _documentation: http://twig.sensiolabs.org/documentation
diff --git a/vendor/twig/twig/composer.json b/vendor/twig/twig/composer.json
deleted file mode 100644
index 339a5d4..0000000
--- a/vendor/twig/twig/composer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name": "twig/twig",
-    "type": "library",
-    "description": "Twig, the flexible, fast, and secure template language for PHP",
-    "keywords": ["templating"],
-    "homepage": "http://twig.sensiolabs.org",
-    "license": "BSD-3-Clause",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com",
-            "homepage": "http://fabien.potencier.org",
-            "role": "Lead Developer"
-        },
-        {
-            "name": "Twig Team",
-            "homepage": "http://twig.sensiolabs.org/contributors",
-            "role": "Contributors"
-        },
-        {
-            "name": "Armin Ronacher",
-            "email": "armin.ronacher@active-4.com",
-            "role": "Project Founder"
-        }
-    ],
-    "support": {
-        "forum": "https://groups.google.com/forum/#!forum/twig-users"
-    },
-    "require": {
-        "php": ">=5.2.7"
-    },
-    "require-dev": {
-        "symfony/phpunit-bridge": "~2.7",
-        "symfony/debug": "~2.7"
-    },
-    "autoload": {
-        "psr-0" : {
-            "Twig_" : "lib/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.23-dev"
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Autoloader.php b/vendor/twig/twig/lib/Twig/Autoloader.php
deleted file mode 100644
index d47583f..0000000
--- a/vendor/twig/twig/lib/Twig/Autoloader.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Autoloader class is deprecated and will be removed in 2.0. Use Composer instead.', E_USER_DEPRECATED);
-
-/**
- * Autoloads Twig classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated Use Composer instead. Will be removed in Twig 2.0.
- */
-class Twig_Autoloader
-{
-    /**
-     * Registers Twig_Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not.
-     */
-    public static function register($prepend = false)
-    {
-        @trigger_error('Using Twig_Autoloader is deprecated. Use Composer instead.', E_USER_DEPRECATED);
-
-        if (PHP_VERSION_ID < 50300) {
-            spl_autoload_register(array(__CLASS__, 'autoload'));
-        } else {
-            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-        }
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     */
-    public static function autoload($class)
-    {
-        if (0 !== strpos($class, 'Twig')) {
-            return;
-        }
-
-        if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
-            require $file;
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php b/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
deleted file mode 100644
index 3c6ef66..0000000
--- a/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_BaseNodeVisitor can be used to make node visitors compatible with Twig 1.x and 2.x.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    final public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node) {
-            throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
-        }
-
-        return $this->doEnterNode($node, $env);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    final public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node) {
-            throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
-        }
-
-        return $this->doLeaveNode($node, $env);
-    }
-
-    /**
-     * Called before child nodes are visited.
-     *
-     * @param Twig_Node        $node The node to visit
-     * @param Twig_Environment $env  The Twig environment instance
-     *
-     * @return Twig_Node The modified node
-     */
-    abstract protected function doEnterNode(Twig_Node $node, Twig_Environment $env);
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @param Twig_Node        $node The node to visit
-     * @param Twig_Environment $env  The Twig environment instance
-     *
-     * @return Twig_Node|false The modified node or false if the node must be removed
-     */
-    abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
-}
diff --git a/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
deleted file mode 100644
index 2c2182a..0000000
--- a/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Implements a cache on the filesystem.
- *
- * @author Andrew Tch <andrew@noop.lv>
- */
-class Twig_Cache_Filesystem implements Twig_CacheInterface
-{
-    const FORCE_BYTECODE_INVALIDATION = 1;
-
-    private $directory;
-    private $options;
-
-    /**
-     * @param $directory string The root cache directory
-     * @param $options   int    A set of options
-     */
-    public function __construct($directory, $options = 0)
-    {
-        $this->directory = $directory;
-        $this->options = $options;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function generateKey($name, $className)
-    {
-        $hash = hash('sha256', $className);
-
-        return $this->directory.'/'.$hash[0].$hash[1].'/'.$hash.'.php';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($key)
-    {
-        @include_once $key;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($key, $content)
-    {
-        $dir = dirname($key);
-        if (!is_dir($dir)) {
-            if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
-            }
-        } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf('Unable to write in the cache directory (%s).', $dir));
-        }
-
-        $tmpFile = tempnam($dir, basename($key));
-        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $key)) {
-            @chmod($key, 0666 & ~umask());
-
-            if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
-                // Compile cached file into bytecode cache
-                if (function_exists('opcache_invalidate')) {
-                    opcache_invalidate($key, true);
-                } elseif (function_exists('apc_compile_file')) {
-                    apc_compile_file($key);
-                }
-            }
-
-            return;
-        }
-
-        throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTimestamp($key)
-    {
-        if (!file_exists($key)) {
-            return 0;
-        }
-
-        return (int) @filemtime($key);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Cache/Null.php b/vendor/twig/twig/lib/Twig/Cache/Null.php
deleted file mode 100644
index fde8c80..0000000
--- a/vendor/twig/twig/lib/Twig/Cache/Null.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Implements a no-cache strategy.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Cache_Null implements Twig_CacheInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function generateKey($name, $className)
-    {
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($key, $content)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($key)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTimestamp($key)
-    {
-        return 0;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/CacheInterface.php b/vendor/twig/twig/lib/Twig/CacheInterface.php
deleted file mode 100644
index 9b17e0f..0000000
--- a/vendor/twig/twig/lib/Twig/CacheInterface.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by cache classes.
- *
- * It is highly recommended to always store templates on the filesystem to
- * benefit from the PHP opcode cache. This interface is mostly useful if you
- * need to implement a custom strategy for storing templates on the filesystem.
- *
- * @author Andrew Tch <andrew@noop.lv>
- */
-interface Twig_CacheInterface
-{
-    /**
-     * Generates a cache key for the given template class name.
-     *
-     * @param string $name      The template name
-     * @param string $className The template class name
-     *
-     * @return string
-     */
-    public function generateKey($name, $className);
-
-    /**
-     * Writes the compiled template to cache.
-     *
-     * @param string $key     The cache key
-     * @param string $content The template representation as a PHP class
-     */
-    public function write($key, $content);
-
-    /**
-     * Loads a template from the cache.
-     *
-     * @param string $key The cache key
-     */
-    public function load($key);
-
-    /**
-     * Returns the modification timestamp of a key.
-     *
-     * @param string $key The cache key
-     *
-     * @return int
-     */
-    public function getTimestamp($key);
-}
diff --git a/vendor/twig/twig/lib/Twig/Compiler.php b/vendor/twig/twig/lib/Twig/Compiler.php
deleted file mode 100644
index abea3aa..0000000
--- a/vendor/twig/twig/lib/Twig/Compiler.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Compiles a node to PHP code.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Compiler implements Twig_CompilerInterface
-{
-    protected $lastLine;
-    protected $source;
-    protected $indentation;
-    protected $env;
-    protected $debugInfo = array();
-    protected $sourceOffset;
-    protected $sourceLine;
-    protected $filename;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env The twig environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Returns the environment instance related to this compiler.
-     *
-     * @return Twig_Environment The environment instance
-     */
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource()
-    {
-        return $this->source;
-    }
-
-    /**
-     * Compiles a node.
-     *
-     * @param Twig_NodeInterface $node        The node to compile
-     * @param int                $indentation The current indentation
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function compile(Twig_NodeInterface $node, $indentation = 0)
-    {
-        $this->lastLine = null;
-        $this->source = '';
-        $this->debugInfo = array();
-        $this->sourceOffset = 0;
-        // source code starts at 1 (as we then increment it when we encounter new lines)
-        $this->sourceLine = 1;
-        $this->indentation = $indentation;
-
-        if ($node instanceof Twig_Node_Module) {
-            $this->filename = $node->getAttribute('filename');
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    public function subcompile(Twig_NodeInterface $node, $raw = true)
-    {
-        if (false === $raw) {
-            $this->addIndentation();
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    /**
-     * Adds a raw string to the compiled code.
-     *
-     * @param string $string The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function raw($string)
-    {
-        $this->source .= $string;
-
-        return $this;
-    }
-
-    /**
-     * Writes a string to the compiled code by adding indentation.
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function write()
-    {
-        $strings = func_get_args();
-        foreach ($strings as $string) {
-            $this->addIndentation();
-            $this->source .= $string;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Appends an indentation to the current PHP code after compilation.
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function addIndentation()
-    {
-        $this->source .= str_repeat(' ', $this->indentation * 4);
-
-        return $this;
-    }
-
-    /**
-     * Adds a quoted string to the compiled code.
-     *
-     * @param string $value The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function string($value)
-    {
-        $this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
-
-        return $this;
-    }
-
-    /**
-     * Returns a PHP representation of a given value.
-     *
-     * @param mixed $value The value to convert
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function repr($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
-                setlocale(LC_NUMERIC, 'C');
-            }
-
-            $this->raw($value);
-
-            if (false !== $locale) {
-                setlocale(LC_NUMERIC, $locale);
-            }
-        } elseif (null === $value) {
-            $this->raw('null');
-        } elseif (is_bool($value)) {
-            $this->raw($value ? 'true' : 'false');
-        } elseif (is_array($value)) {
-            $this->raw('array(');
-            $first = true;
-            foreach ($value as $key => $v) {
-                if (!$first) {
-                    $this->raw(', ');
-                }
-                $first = false;
-                $this->repr($key);
-                $this->raw(' => ');
-                $this->repr($v);
-            }
-            $this->raw(')');
-        } else {
-            $this->string($value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds debugging information.
-     *
-     * @param Twig_NodeInterface $node The related twig node
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function addDebugInfo(Twig_NodeInterface $node)
-    {
-        if ($node->getLine() != $this->lastLine) {
-            $this->write(sprintf("// line %d\n", $node->getLine()));
-
-            // when mbstring.func_overload is set to 2
-            // mb_substr_count() replaces substr_count()
-            // but they have different signatures!
-            if (((int) ini_get('mbstring.func_overload')) & 2) {
-                // this is much slower than the "right" version
-                $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
-            } else {
-                $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
-            }
-            $this->sourceOffset = strlen($this->source);
-            $this->debugInfo[$this->sourceLine] = $node->getLine();
-
-            $this->lastLine = $node->getLine();
-        }
-
-        return $this;
-    }
-
-    public function getDebugInfo()
-    {
-        ksort($this->debugInfo);
-
-        return $this->debugInfo;
-    }
-
-    /**
-     * Indents the generated code.
-     *
-     * @param int $step The number of indentation to add
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function indent($step = 1)
-    {
-        $this->indentation += $step;
-
-        return $this;
-    }
-
-    /**
-     * Outdents the generated code.
-     *
-     * @param int $step The number of indentation to remove
-     *
-     * @return Twig_Compiler The current compiler instance
-     *
-     * @throws LogicException When trying to outdent too much so the indentation would become negative
-     */
-    public function outdent($step = 1)
-    {
-        // can't outdent by more steps than the current indentation level
-        if ($this->indentation < $step) {
-            throw new LogicException('Unable to call outdent() as the indentation would become negative');
-        }
-
-        $this->indentation -= $step;
-
-        return $this;
-    }
-
-    public function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/CompilerInterface.php b/vendor/twig/twig/lib/Twig/CompilerInterface.php
deleted file mode 100644
index 272c767..0000000
--- a/vendor/twig/twig/lib/Twig/CompilerInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by compiler classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_CompilerInterface
-{
-    /**
-     * Compiles a node.
-     *
-     * @param Twig_NodeInterface $node The node to compile
-     *
-     * @return Twig_CompilerInterface The current compiler instance
-     */
-    public function compile(Twig_NodeInterface $node);
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource();
-}
diff --git a/vendor/twig/twig/lib/Twig/Environment.php b/vendor/twig/twig/lib/Twig/Environment.php
deleted file mode 100644
index 99a6b01..0000000
--- a/vendor/twig/twig/lib/Twig/Environment.php
+++ /dev/null
@@ -1,1381 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores the Twig configuration.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Environment
-{
-    const VERSION = '1.23.1';
-
-    protected $charset;
-    protected $loader;
-    protected $debug;
-    protected $autoReload;
-    protected $cache;
-    protected $lexer;
-    protected $parser;
-    protected $compiler;
-    protected $baseTemplateClass;
-    protected $extensions;
-    protected $parsers;
-    protected $visitors;
-    protected $filters;
-    protected $tests;
-    protected $functions;
-    protected $globals;
-    protected $runtimeInitialized = false;
-    protected $extensionInitialized = false;
-    protected $loadedTemplates;
-    protected $strictVariables;
-    protected $unaryOperators;
-    protected $binaryOperators;
-    protected $templateClassPrefix = '__TwigTemplate_';
-    protected $functionCallbacks = array();
-    protected $filterCallbacks = array();
-    protected $staging;
-
-    private $originalCache;
-    private $bcWriteCacheFile = false;
-    private $bcGetCacheFilename = false;
-    private $lastModifiedExtension = 0;
-
-    /**
-     * Constructor.
-     *
-     * Available options:
-     *
-     *  * debug: When set to true, it automatically set "auto_reload" to true as
-     *           well (default to false).
-     *
-     *  * charset: The charset used by the templates (default to UTF-8).
-     *
-     *  * base_template_class: The base template class to use for generated
-     *                         templates (default to Twig_Template).
-     *
-     *  * cache: An absolute path where to store the compiled templates,
-     *           a Twig_Cache_Interface implementation,
-     *           or false to disable compilation cache (default).
-     *
-     *  * auto_reload: Whether to reload the template if the original source changed.
-     *                 If you don't provide the auto_reload option, it will be
-     *                 determined automatically based on the debug value.
-     *
-     *  * strict_variables: Whether to ignore invalid variables in templates
-     *                      (default to false).
-     *
-     *  * autoescape: Whether to enable auto-escaping (default to html):
-     *                  * false: disable auto-escaping
-     *                  * true: equivalent to html
-     *                  * html, js: set the autoescaping to one of the supported strategies
-     *                  * filename: set the autoescaping strategy based on the template filename extension
-     *                  * PHP callback: a PHP callback that returns an escaping strategy based on the template "filename"
-     *
-     *  * optimizations: A flag that indicates which optimizations to apply
-     *                   (default to -1 which means that all optimizations are enabled;
-     *                   set it to 0 to disable).
-     *
-     * @param Twig_LoaderInterface $loader  A Twig_LoaderInterface instance
-     * @param array                $options An array of options
-     */
-    public function __construct(Twig_LoaderInterface $loader = null, $options = array())
-    {
-        if (null !== $loader) {
-            $this->setLoader($loader);
-        } else {
-            @trigger_error('Not passing a Twig_LoaderInterface as the first constructor argument of Twig_Environment is deprecated.', E_USER_DEPRECATED);
-        }
-
-        $options = array_merge(array(
-            'debug' => false,
-            'charset' => 'UTF-8',
-            'base_template_class' => 'Twig_Template',
-            'strict_variables' => false,
-            'autoescape' => 'html',
-            'cache' => false,
-            'auto_reload' => null,
-            'optimizations' => -1,
-        ), $options);
-
-        $this->debug = (bool) $options['debug'];
-        $this->charset = strtoupper($options['charset']);
-        $this->baseTemplateClass = $options['base_template_class'];
-        $this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
-        $this->strictVariables = (bool) $options['strict_variables'];
-        $this->setCache($options['cache']);
-
-        $this->addExtension(new Twig_Extension_Core());
-        $this->addExtension(new Twig_Extension_Escaper($options['autoescape']));
-        $this->addExtension(new Twig_Extension_Optimizer($options['optimizations']));
-        $this->staging = new Twig_Extension_Staging();
-
-        // For BC
-        if (is_string($this->originalCache)) {
-            $r = new ReflectionMethod($this, 'writeCacheFile');
-            if ($r->getDeclaringClass()->getName() !== __CLASS__) {
-                @trigger_error('The Twig_Environment::writeCacheFile method is deprecated and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
-                $this->bcWriteCacheFile = true;
-            }
-
-            $r = new ReflectionMethod($this, 'getCacheFilename');
-            if ($r->getDeclaringClass()->getName() !== __CLASS__) {
-                @trigger_error('The Twig_Environment::getCacheFilename method is deprecated and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
-                $this->bcGetCacheFilename = true;
-            }
-        }
-    }
-
-    /**
-     * Gets the base template class for compiled templates.
-     *
-     * @return string The base template class name
-     */
-    public function getBaseTemplateClass()
-    {
-        return $this->baseTemplateClass;
-    }
-
-    /**
-     * Sets the base template class for compiled templates.
-     *
-     * @param string $class The base template class name
-     */
-    public function setBaseTemplateClass($class)
-    {
-        $this->baseTemplateClass = $class;
-    }
-
-    /**
-     * Enables debugging mode.
-     */
-    public function enableDebug()
-    {
-        $this->debug = true;
-    }
-
-    /**
-     * Disables debugging mode.
-     */
-    public function disableDebug()
-    {
-        $this->debug = false;
-    }
-
-    /**
-     * Checks if debug mode is enabled.
-     *
-     * @return bool true if debug mode is enabled, false otherwise
-     */
-    public function isDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Enables the auto_reload option.
-     */
-    public function enableAutoReload()
-    {
-        $this->autoReload = true;
-    }
-
-    /**
-     * Disables the auto_reload option.
-     */
-    public function disableAutoReload()
-    {
-        $this->autoReload = false;
-    }
-
-    /**
-     * Checks if the auto_reload option is enabled.
-     *
-     * @return bool true if auto_reload is enabled, false otherwise
-     */
-    public function isAutoReload()
-    {
-        return $this->autoReload;
-    }
-
-    /**
-     * Enables the strict_variables option.
-     */
-    public function enableStrictVariables()
-    {
-        $this->strictVariables = true;
-    }
-
-    /**
-     * Disables the strict_variables option.
-     */
-    public function disableStrictVariables()
-    {
-        $this->strictVariables = false;
-    }
-
-    /**
-     * Checks if the strict_variables option is enabled.
-     *
-     * @return bool true if strict_variables is enabled, false otherwise
-     */
-    public function isStrictVariables()
-    {
-        return $this->strictVariables;
-    }
-
-    /**
-     * Gets the current cache implementation.
-     *
-     * @param bool $original Whether to return the original cache option or the real cache instance
-     *
-     * @return Twig_CacheInterface|string|false A Twig_CacheInterface implementation,
-     *                                          an absolute path to the compiled templates,
-     *                                          or false to disable cache
-     */
-    public function getCache($original = true)
-    {
-        return $original ? $this->originalCache : $this->cache;
-    }
-
-    /**
-     * Sets the current cache implementation.
-     *
-     * @param Twig_CacheInterface|string|false $cache A Twig_CacheInterface implementation,
-     *                                                an absolute path to the compiled templates,
-     *                                                or false to disable cache
-     */
-    public function setCache($cache)
-    {
-        if (is_string($cache)) {
-            $this->originalCache = $cache;
-            $this->cache = new Twig_Cache_Filesystem($cache);
-        } elseif (false === $cache) {
-            $this->originalCache = $cache;
-            $this->cache = new Twig_Cache_Null();
-        } elseif (null === $cache) {
-            @trigger_error('Using "null" as the cache strategy is deprecated and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-            $this->originalCache = false;
-            $this->cache = new Twig_Cache_Null();
-        } elseif ($cache instanceof Twig_CacheInterface) {
-            $this->originalCache = $this->cache = $cache;
-        } else {
-            throw new LogicException(sprintf('Cache can only be a string, false, or a Twig_CacheInterface implementation.'));
-        }
-    }
-
-    /**
-     * Gets the cache filename for a given template.
-     *
-     * @param string $name The template name
-     *
-     * @return string|false The cache file name or false when caching is disabled
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function getCacheFilename($name)
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $key = $this->cache->generateKey($name, $this->getTemplateClass($name));
-
-        return !$key ? false : $key;
-    }
-
-    /**
-     * Gets the template class associated with the given string.
-     *
-     * The generated template class is based on the following parameters:
-     *
-     *  * The cache key for the given template;
-     *  * The currently enabled extensions;
-     *  * Whether the Twig C extension is available or not.
-     *
-     * @param string   $name  The name for which to calculate the template class name
-     * @param int|null $index The index if it is an embedded template
-     *
-     * @return string The template class name
-     */
-    public function getTemplateClass($name, $index = null)
-    {
-        $key = $this->getLoader()->getCacheKey($name);
-        $key .= json_encode(array_keys($this->extensions));
-        $key .= function_exists('twig_template_get_attributes');
-
-        return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
-    }
-
-    /**
-     * Gets the template class prefix.
-     *
-     * @return string The template class prefix
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function getTemplateClassPrefix()
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->templateClassPrefix;
-    }
-
-    /**
-     * Renders a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     * @throws Twig_Error_Runtime When an error occurred during rendering
-     */
-    public function render($name, array $context = array())
-    {
-        return $this->loadTemplate($name)->render($context);
-    }
-
-    /**
-     * Displays a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     * @throws Twig_Error_Runtime When an error occurred during rendering
-     */
-    public function display($name, array $context = array())
-    {
-        $this->loadTemplate($name)->display($context);
-    }
-
-    /**
-     * Loads a template by name.
-     *
-     * @param string $name  The template name
-     * @param int    $index The index if it is an embedded template
-     *
-     * @return Twig_TemplateInterface A template instance representing the given template name
-     *
-     * @throws Twig_Error_Loader When the template cannot be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
-     */
-    public function loadTemplate($name, $index = null)
-    {
-        $cls = $this->getTemplateClass($name, $index);
-
-        if (isset($this->loadedTemplates[$cls])) {
-            return $this->loadedTemplates[$cls];
-        }
-
-        if (!class_exists($cls, false)) {
-            if ($this->bcGetCacheFilename) {
-                $key = $this->getCacheFilename($name);
-            } else {
-                $key = $this->cache->generateKey($name, $cls);
-            }
-
-            if (!$this->isAutoReload() || $this->isTemplateFresh($name, $this->cache->getTimestamp($key))) {
-                $this->cache->load($key);
-            }
-
-            if (!class_exists($cls, false)) {
-                $content = $this->compileSource($this->getLoader()->getSource($name), $name);
-                if ($this->bcWriteCacheFile) {
-                    $this->writeCacheFile($key, $content);
-                } else {
-                    $this->cache->write($key, $content);
-                }
-
-                eval('?>'.$content);
-            }
-        }
-
-        if (!$this->runtimeInitialized) {
-            $this->initRuntime();
-        }
-
-        return $this->loadedTemplates[$cls] = new $cls($this);
-    }
-
-    /**
-     * Creates a template from source.
-     *
-     * This method should not be used as a generic way to load templates.
-     *
-     * @param string $template The template name
-     *
-     * @return Twig_Template A template instance representing the given template name
-     *
-     * @throws Twig_Error_Loader When the template cannot be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
-     */
-    public function createTemplate($template)
-    {
-        $name = sprintf('__string_template__%s', hash('sha256', uniqid(mt_rand(), true), false));
-
-        $loader = new Twig_Loader_Chain(array(
-            new Twig_Loader_Array(array($name => $template)),
-            $current = $this->getLoader(),
-        ));
-
-        $this->setLoader($loader);
-        try {
-            $template = $this->loadTemplate($name);
-        } catch (Exception $e) {
-            $this->setLoader($current);
-
-            throw $e;
-        }
-        $this->setLoader($current);
-
-        return $template;
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * Besides checking the loader for freshness information,
-     * this method also checks if the enabled extensions have
-     * not changed.
-     *
-     * @param string $name The template name
-     * @param int    $time The last modification time of the cached template
-     *
-     * @return bool true if the template is fresh, false otherwise
-     */
-    public function isTemplateFresh($name, $time)
-    {
-        if (0 === $this->lastModifiedExtension) {
-            foreach ($this->extensions as $extension) {
-                $r = new ReflectionObject($extension);
-                if (file_exists($r->getFileName()) && ($extensionTime = filemtime($r->getFileName())) > $this->lastModifiedExtension) {
-                    $this->lastModifiedExtension = $extensionTime;
-                }
-            }
-        }
-
-        return $this->lastModifiedExtension <= $time && $this->getLoader()->isFresh($name, $time);
-    }
-
-    /**
-     * Tries to load a template consecutively from an array.
-     *
-     * Similar to loadTemplate() but it also accepts Twig_TemplateInterface instances and an array
-     * of templates where each is tried to be loaded.
-     *
-     * @param string|Twig_Template|array $names A template or an array of templates to try consecutively
-     *
-     * @return Twig_Template
-     *
-     * @throws Twig_Error_Loader When none of the templates can be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
-     */
-    public function resolveTemplate($names)
-    {
-        if (!is_array($names)) {
-            $names = array($names);
-        }
-
-        foreach ($names as $name) {
-            if ($name instanceof Twig_Template) {
-                return $name;
-            }
-
-            try {
-                return $this->loadTemplate($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        if (1 === count($names)) {
-            throw $e;
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
-    }
-
-    /**
-     * Clears the internal template cache.
-     *
-     * @deprecated since 1.18.3 (to be removed in 2.0)
-     */
-    public function clearTemplateCache()
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->loadedTemplates = array();
-    }
-
-    /**
-     * Clears the template cache files on the filesystem.
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function clearCacheFiles()
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        if (is_string($this->originalCache)) {
-            foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->originalCache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-                if ($file->isFile()) {
-                    @unlink($file->getPathname());
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the Lexer instance.
-     *
-     * @return Twig_LexerInterface A Twig_LexerInterface instance
-     */
-    public function getLexer()
-    {
-        if (null === $this->lexer) {
-            $this->lexer = new Twig_Lexer($this);
-        }
-
-        return $this->lexer;
-    }
-
-    /**
-     * Sets the Lexer instance.
-     *
-     * @param Twig_LexerInterface $lexer A Twig_LexerInterface instance
-     */
-    public function setLexer(Twig_LexerInterface $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return Twig_TokenStream A Twig_TokenStream instance
-     *
-     * @throws Twig_Error_Syntax When the code is syntactically wrong
-     */
-    public function tokenize($source, $name = null)
-    {
-        return $this->getLexer()->tokenize($source, $name);
-    }
-
-    /**
-     * Gets the Parser instance.
-     *
-     * @return Twig_ParserInterface A Twig_ParserInterface instance
-     */
-    public function getParser()
-    {
-        if (null === $this->parser) {
-            $this->parser = new Twig_Parser($this);
-        }
-
-        return $this->parser;
-    }
-
-    /**
-     * Sets the Parser instance.
-     *
-     * @param Twig_ParserInterface $parser A Twig_ParserInterface instance
-     */
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @param Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
-     *
-     * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
-     */
-    public function parse(Twig_TokenStream $stream)
-    {
-        return $this->getParser()->parse($stream);
-    }
-
-    /**
-     * Gets the Compiler instance.
-     *
-     * @return Twig_CompilerInterface A Twig_CompilerInterface instance
-     */
-    public function getCompiler()
-    {
-        if (null === $this->compiler) {
-            $this->compiler = new Twig_Compiler($this);
-        }
-
-        return $this->compiler;
-    }
-
-    /**
-     * Sets the Compiler instance.
-     *
-     * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance
-     */
-    public function setCompiler(Twig_CompilerInterface $compiler)
-    {
-        $this->compiler = $compiler;
-    }
-
-    /**
-     * Compiles a node and returns the PHP code.
-     *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compile(Twig_NodeInterface $node)
-    {
-        return $this->getCompiler()->compile($node)->getSource();
-    }
-
-    /**
-     * Compiles a template source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return string The compiled PHP source code
-     *
-     * @throws Twig_Error_Syntax When there was an error during tokenizing, parsing or compiling
-     */
-    public function compileSource($source, $name = null)
-    {
-        try {
-            $compiled = $this->compile($this->parse($this->tokenize($source, $name)), $source);
-
-            if (isset($source[0])) {
-                $compiled .= '/* '.str_replace(array('*/', "\r\n", "\r", "\n"), array('*//* ', "\n", "\n", "*/\n/* "), $source)."*/\n";
-            }
-
-            return $compiled;
-        } catch (Twig_Error $e) {
-            $e->setTemplateFile($name);
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
-        }
-    }
-
-    /**
-     * Sets the Loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
-     */
-    public function setLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * Gets the Loader instance.
-     *
-     * @return Twig_LoaderInterface A Twig_LoaderInterface instance
-     */
-    public function getLoader()
-    {
-        if (null === $this->loader) {
-            throw new LogicException('You must set a loader first.');
-        }
-
-        return $this->loader;
-    }
-
-    /**
-     * Sets the default template charset.
-     *
-     * @param string $charset The default charset
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = strtoupper($charset);
-    }
-
-    /**
-     * Gets the default template charset.
-     *
-     * @return string The default charset
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Initializes the runtime environment.
-     *
-     * @deprecated since 1.23 (to be removed in 2.0)
-     */
-    public function initRuntime()
-    {
-        $this->runtimeInitialized = true;
-
-        foreach ($this->getExtensions() as $name => $extension) {
-            if (!$extension instanceof Twig_Extension_InitRuntimeInterface) {
-                $m = new ReflectionMethod($extension, 'initRuntime');
-
-                if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Defining the initRuntime() method in the "%s" extension is deprecated. Use the `needs_environment` option to get the Twig_Environment instance in filters, functions, or tests; or explicitly implement Twig_Extension_InitRuntimeInterface if needed (not recommended).', $name), E_USER_DEPRECATED);
-                }
-            }
-
-            $extension->initRuntime($this);
-        }
-    }
-
-    /**
-     * Returns true if the given extension is registered.
-     *
-     * @param string $name The extension name
-     *
-     * @return bool Whether the extension is registered or not
-     */
-    public function hasExtension($name)
-    {
-        return isset($this->extensions[$name]);
-    }
-
-    /**
-     * Gets an extension by name.
-     *
-     * @param string $name The extension name
-     *
-     * @return Twig_ExtensionInterface A Twig_ExtensionInterface instance
-     */
-    public function getExtension($name)
-    {
-        if (!isset($this->extensions[$name])) {
-            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $name));
-        }
-
-        return $this->extensions[$name];
-    }
-
-    /**
-     * Registers an extension.
-     *
-     * @param Twig_ExtensionInterface $extension A Twig_ExtensionInterface instance
-     */
-    public function addExtension(Twig_ExtensionInterface $extension)
-    {
-        $name = $extension->getName();
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $name));
-        }
-
-        if (isset($this->extensions[$name])) {
-            @trigger_error(sprintf('The possibility to register the same extension twice ("%s") is deprecated and will be removed in Twig 2.0. Use proper PHP inheritance instead.', $name), E_USER_DEPRECATED);
-        }
-
-        $this->lastModifiedExtension = 0;
-
-        $this->extensions[$name] = $extension;
-    }
-
-    /**
-     * Removes an extension by name.
-     *
-     * This method is deprecated and you should not use it.
-     *
-     * @param string $name The extension name
-     *
-     * @deprecated since 1.12 (to be removed in 2.0)
-     */
-    public function removeExtension($name)
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to remove extension "%s" as extensions have already been initialized.', $name));
-        }
-
-        unset($this->extensions[$name]);
-    }
-
-    /**
-     * Registers an array of extensions.
-     *
-     * @param array $extensions An array of extensions
-     */
-    public function setExtensions(array $extensions)
-    {
-        foreach ($extensions as $extension) {
-            $this->addExtension($extension);
-        }
-    }
-
-    /**
-     * Returns all registered extensions.
-     *
-     * @return array An array of extensions
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Registers a Token Parser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        if ($this->extensionInitialized) {
-            throw new LogicException('Unable to add a token parser as extensions have already been initialized.');
-        }
-
-        $this->staging->addTokenParser($parser);
-    }
-
-    /**
-     * Gets the registered Token Parsers.
-     *
-     * @return Twig_TokenParserBrokerInterface A broker containing token parsers
-     */
-    public function getTokenParsers()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->parsers;
-    }
-
-    /**
-     * Gets registered tags.
-     *
-     * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
-     *
-     * @return Twig_TokenParserInterface[] An array of Twig_TokenParserInterface instances
-     */
-    public function getTags()
-    {
-        $tags = array();
-        foreach ($this->getTokenParsers()->getParsers() as $parser) {
-            if ($parser instanceof Twig_TokenParserInterface) {
-                $tags[$parser->getTag()] = $parser;
-            }
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Registers a Node Visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if ($this->extensionInitialized) {
-            throw new LogicException('Unable to add a node visitor as extensions have already been initialized.');
-        }
-
-        $this->staging->addNodeVisitor($visitor);
-    }
-
-    /**
-     * Gets the registered Node Visitors.
-     *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->visitors;
-    }
-
-    /**
-     * Registers a Filter.
-     *
-     * @param string|Twig_SimpleFilter               $name   The filter name or a Twig_SimpleFilter instance
-     * @param Twig_FilterInterface|Twig_SimpleFilter $filter A Twig_FilterInterface instance or a Twig_SimpleFilter instance
-     */
-    public function addFilter($name, $filter = null)
-    {
-        if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
-            throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter');
-        }
-
-        if ($name instanceof Twig_SimpleFilter) {
-            $filter = $name;
-            $name = $filter->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleFilter" instead when defining filter "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addFilter($name, $filter);
-    }
-
-    /**
-     * Get a filter by name.
-     *
-     * Subclasses may override this method and load filters differently;
-     * so no list of filters is available.
-     *
-     * @param string $name The filter name
-     *
-     * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exist
-     */
-    public function getFilter($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->filters[$name])) {
-            return $this->filters[$name];
-        }
-
-        foreach ($this->filters as $pattern => $filter) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $filter->setArguments($matches);
-
-                    return $filter;
-                }
-            }
-        }
-
-        foreach ($this->filterCallbacks as $callback) {
-            if (false !== $filter = call_user_func($callback, $name)) {
-                return $filter;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFilterCallback($callable)
-    {
-        $this->filterCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets the registered Filters.
-     *
-     * Be warned that this method cannot return filters defined with registerUndefinedFunctionCallback.
-     *
-     * @return Twig_FilterInterface[] An array of Twig_FilterInterface instances
-     *
-     * @see registerUndefinedFilterCallback
-     */
-    public function getFilters()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->filters;
-    }
-
-    /**
-     * Registers a Test.
-     *
-     * @param string|Twig_SimpleTest             $name The test name or a Twig_SimpleTest instance
-     * @param Twig_TestInterface|Twig_SimpleTest $test A Twig_TestInterface instance or a Twig_SimpleTest instance
-     */
-    public function addTest($name, $test = null)
-    {
-        if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
-            throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest');
-        }
-
-        if ($name instanceof Twig_SimpleTest) {
-            $test = $name;
-            $name = $test->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleTest" instead when defining test "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addTest($name, $test);
-    }
-
-    /**
-     * Gets the registered Tests.
-     *
-     * @return Twig_TestInterface[] An array of Twig_TestInterface instances
-     */
-    public function getTests()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->tests;
-    }
-
-    /**
-     * Gets a test by name.
-     *
-     * @param string $name The test name
-     *
-     * @return Twig_Test|false A Twig_Test instance or false if the test does not exist
-     */
-    public function getTest($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->tests[$name])) {
-            return $this->tests[$name];
-        }
-
-        return false;
-    }
-
-    /**
-     * Registers a Function.
-     *
-     * @param string|Twig_SimpleFunction                 $name     The function name or a Twig_SimpleFunction instance
-     * @param Twig_FunctionInterface|Twig_SimpleFunction $function A Twig_FunctionInterface instance or a Twig_SimpleFunction instance
-     */
-    public function addFunction($name, $function = null)
-    {
-        if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
-            throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction');
-        }
-
-        if ($name instanceof Twig_SimpleFunction) {
-            $function = $name;
-            $name = $function->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleFunction" instead when defining function "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addFunction($name, $function);
-    }
-
-    /**
-     * Get a function by name.
-     *
-     * Subclasses may override this method and load functions differently;
-     * so no list of functions is available.
-     *
-     * @param string $name function name
-     *
-     * @return Twig_Function|false A Twig_Function instance or false if the function does not exist
-     */
-    public function getFunction($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->functions[$name])) {
-            return $this->functions[$name];
-        }
-
-        foreach ($this->functions as $pattern => $function) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $function->setArguments($matches);
-
-                    return $function;
-                }
-            }
-        }
-
-        foreach ($this->functionCallbacks as $callback) {
-            if (false !== $function = call_user_func($callback, $name)) {
-                return $function;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFunctionCallback($callable)
-    {
-        $this->functionCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets registered functions.
-     *
-     * Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
-     *
-     * @return Twig_FunctionInterface[] An array of Twig_FunctionInterface instances
-     *
-     * @see registerUndefinedFunctionCallback
-     */
-    public function getFunctions()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->functions;
-    }
-
-    /**
-     * Registers a Global.
-     *
-     * New globals can be added before compiling or rendering a template;
-     * but after, you can only update existing globals.
-     *
-     * @param string $name  The global name
-     * @param mixed  $value The global value
-     */
-    public function addGlobal($name, $value)
-    {
-        if ($this->extensionInitialized || $this->runtimeInitialized) {
-            if (null === $this->globals) {
-                $this->globals = $this->initGlobals();
-            }
-
-            if (!array_key_exists($name, $this->globals)) {
-                // The deprecation notice must be turned into the following exception in Twig 2.0
-                @trigger_error(sprintf('Registering global variable "%s" at runtime or when the extensions have already been initialized is deprecated.', $name), E_USER_DEPRECATED);
-                //throw new LogicException(sprintf('Unable to add global "%s" as the runtime or the extensions have already been initialized.', $name));
-            }
-        }
-
-        if ($this->extensionInitialized || $this->runtimeInitialized) {
-            // update the value
-            $this->globals[$name] = $value;
-        } else {
-            $this->staging->addGlobal($name, $value);
-        }
-    }
-
-    /**
-     * Gets the registered Globals.
-     *
-     * @return array An array of globals
-     */
-    public function getGlobals()
-    {
-        if (!$this->runtimeInitialized && !$this->extensionInitialized) {
-            return $this->initGlobals();
-        }
-
-        if (null === $this->globals) {
-            $this->globals = $this->initGlobals();
-        }
-
-        return $this->globals;
-    }
-
-    /**
-     * Merges a context with the defined globals.
-     *
-     * @param array $context An array representing the context
-     *
-     * @return array The context merged with the globals
-     */
-    public function mergeGlobals(array $context)
-    {
-        // we don't use array_merge as the context being generally
-        // bigger than globals, this code is faster.
-        foreach ($this->getGlobals() as $key => $value) {
-            if (!array_key_exists($key, $context)) {
-                $context[$key] = $value;
-            }
-        }
-
-        return $context;
-    }
-
-    /**
-     * Gets the registered unary Operators.
-     *
-     * @return array An array of unary operators
-     */
-    public function getUnaryOperators()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->unaryOperators;
-    }
-
-    /**
-     * Gets the registered binary Operators.
-     *
-     * @return array An array of binary operators
-     */
-    public function getBinaryOperators()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->binaryOperators;
-    }
-
-    /**
-     * @deprecated since 1.23 (to be removed in 2.0)
-     */
-    public function computeAlternatives($name, $items)
-    {
-        @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        return Twig_Error_Syntax::computeAlternatives($name, $items);
-    }
-
-    protected function initGlobals()
-    {
-        $globals = array();
-        foreach ($this->extensions as $name => $extension) {
-            if (!$extension instanceof Twig_Extension_GlobalsInterface) {
-                $m = new ReflectionMethod($extension, 'getGlobals');
-
-                if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Defining the getGlobals() method in the "%s" extension is deprecated without explicitly implementing Twig_Extension_GlobalsInterface.', $name), E_USER_DEPRECATED);
-                }
-            }
-
-            $extGlob = $extension->getGlobals();
-            if (!is_array($extGlob)) {
-                throw new UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', get_class($extension)));
-            }
-
-            $globals[] = $extGlob;
-        }
-
-        $globals[] = $this->staging->getGlobals();
-
-        return call_user_func_array('array_merge', $globals);
-    }
-
-    protected function initExtensions()
-    {
-        if ($this->extensionInitialized) {
-            return;
-        }
-
-        $this->extensionInitialized = true;
-        $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
-        $this->filters = array();
-        $this->functions = array();
-        $this->tests = array();
-        $this->visitors = array();
-        $this->unaryOperators = array();
-        $this->binaryOperators = array();
-
-        foreach ($this->extensions as $extension) {
-            $this->initExtension($extension);
-        }
-        $this->initExtension($this->staging);
-    }
-
-    protected function initExtension(Twig_ExtensionInterface $extension)
-    {
-        // filters
-        foreach ($extension->getFilters() as $name => $filter) {
-            if ($filter instanceof Twig_SimpleFilter) {
-                $name = $filter->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for filter "%s" is deprecated. Use Twig_SimpleFilter instead.', get_class($filter), $name), E_USER_DEPRECATED);
-            }
-
-            $this->filters[$name] = $filter;
-        }
-
-        // functions
-        foreach ($extension->getFunctions() as $name => $function) {
-            if ($function instanceof Twig_SimpleFunction) {
-                $name = $function->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for function "%s" is deprecated. Use Twig_SimpleFunction instead.', get_class($function), $name), E_USER_DEPRECATED);
-            }
-
-            $this->functions[$name] = $function;
-        }
-
-        // tests
-        foreach ($extension->getTests() as $name => $test) {
-            if ($test instanceof Twig_SimpleTest) {
-                $name = $test->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for test "%s" is deprecated. Use Twig_SimpleTest instead.', get_class($test), $name), E_USER_DEPRECATED);
-            }
-
-            $this->tests[$name] = $test;
-        }
-
-        // token parsers
-        foreach ($extension->getTokenParsers() as $parser) {
-            if ($parser instanceof Twig_TokenParserInterface) {
-                $this->parsers->addTokenParser($parser);
-            } elseif ($parser instanceof Twig_TokenParserBrokerInterface) {
-                @trigger_error('Registering a Twig_TokenParserBrokerInterface instance is deprecated.', E_USER_DEPRECATED);
-
-                $this->parsers->addTokenParserBroker($parser);
-            } else {
-                throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances');
-            }
-        }
-
-        // node visitors
-        foreach ($extension->getNodeVisitors() as $visitor) {
-            $this->visitors[] = $visitor;
-        }
-
-        // operators
-        if ($operators = $extension->getOperators()) {
-            if (2 !== count($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
-            }
-
-            $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
-            $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
-        }
-    }
-
-    /**
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    protected function writeCacheFile($file, $content)
-    {
-        $this->cache->write($file, $content);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Error.php b/vendor/twig/twig/lib/Twig/Error.php
deleted file mode 100644
index 37c7435..0000000
--- a/vendor/twig/twig/lib/Twig/Error.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig base exception.
- *
- * This exception class and its children must only be used when
- * an error occurs during the loading of a template, when a syntax error
- * is detected in a template, or when rendering a template. Other
- * errors must use regular PHP exception classes (like when the template
- * cache directory is not writable for instance).
- *
- * To help debugging template issues, this class tracks the original template
- * name and line where the error occurred.
- *
- * Whenever possible, you must set these information (original template name
- * and line number) yourself by passing them to the constructor. If some or all
- * these information are not available from where you throw the exception, then
- * this class will guess them automatically (when the line number is set to -1
- * and/or the filename is set to null). As this is a costly operation, this
- * can be disabled by passing false for both the filename and the line number
- * when creating a new instance of this class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error extends Exception
-{
-    protected $lineno;
-    protected $filename;
-    protected $rawMessage;
-    protected $previous;
-
-    /**
-     * Constructor.
-     *
-     * Set both the line number and the filename to false to
-     * disable automatic guessing of the original template name
-     * and line number.
-     *
-     * Set the line number to -1 to enable its automatic guessing.
-     * Set the filename to null to enable its automatic guessing.
-     *
-     * By default, automatic guessing is enabled.
-     *
-     * @param string    $message  The error message
-     * @param int       $lineno   The template line where the error occurred
-     * @param string    $filename The template file name where the error occurred
-     * @param Exception $previous The previous exception
-     */
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        if (PHP_VERSION_ID < 50300) {
-            $this->previous = $previous;
-            parent::__construct('');
-        } else {
-            parent::__construct('', 0, $previous);
-        }
-
-        $this->lineno = $lineno;
-        $this->filename = $filename;
-
-        if (-1 === $this->lineno || null === $this->filename) {
-            $this->guessTemplateInfo();
-        }
-
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the raw message.
-     *
-     * @return string The raw message
-     */
-    public function getRawMessage()
-    {
-        return $this->rawMessage;
-    }
-
-    /**
-     * Gets the filename where the error occurred.
-     *
-     * @return string The filename
-     */
-    public function getTemplateFile()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Sets the filename where the error occurred.
-     *
-     * @param string $filename The filename
-     */
-    public function setTemplateFile($filename)
-    {
-        $this->filename = $filename;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the template line where the error occurred.
-     *
-     * @return int The template line
-     */
-    public function getTemplateLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Sets the template line where the error occurred.
-     *
-     * @param int $lineno The template line
-     */
-    public function setTemplateLine($lineno)
-    {
-        $this->lineno = $lineno;
-
-        $this->updateRepr();
-    }
-
-    public function guess()
-    {
-        $this->guessTemplateInfo();
-        $this->updateRepr();
-    }
-
-    /**
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     *
-     * @param string $method    The method name
-     * @param array  $arguments The parameters to be passed to the method
-     *
-     * @return Exception The previous exception or null
-     *
-     * @throws BadMethodCallException
-     */
-    public function __call($method, $arguments)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->previous;
-        }
-
-        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
-    }
-
-    public function appendMessage($rawMessage)
-    {
-        $this->rawMessage .= $rawMessage;
-        $this->updateRepr();
-    }
-
-    /**
-     * @internal
-     */
-    protected function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        $questionMark = false;
-        if ('?' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $questionMark = true;
-        }
-
-        if ($this->filename) {
-            if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
-                $filename = sprintf('"%s"', $this->filename);
-            } else {
-                $filename = json_encode($this->filename);
-            }
-            $this->message .= sprintf(' in %s', $filename);
-        }
-
-        if ($this->lineno && $this->lineno >= 0) {
-            $this->message .= sprintf(' at line %d', $this->lineno);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-
-        if ($questionMark) {
-            $this->message .= '?';
-        }
-    }
-
-    /**
-     * @internal
-     */
-    protected function guessTemplateInfo()
-    {
-        $template = null;
-        $templateClass = null;
-
-        if (PHP_VERSION_ID >= 50306) {
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
-        } else {
-            $backtrace = debug_backtrace();
-        }
-
-        foreach ($backtrace as $trace) {
-            if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
-                $currentClass = get_class($trace['object']);
-                $isEmbedContainer = 0 === strpos($templateClass, $currentClass);
-                if (null === $this->filename || ($this->filename == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
-                    $template = $trace['object'];
-                    $templateClass = get_class($trace['object']);
-                }
-            }
-        }
-
-        // update template filename
-        if (null !== $template && null === $this->filename) {
-            $this->filename = $template->getTemplateName();
-        }
-
-        if (null === $template || $this->lineno > -1) {
-            return;
-        }
-
-        $r = new ReflectionObject($template);
-        $file = $r->getFileName();
-
-        // hhvm has a bug where eval'ed files comes out as the current directory
-        if (is_dir($file)) {
-            $file = '';
-        }
-
-        $exceptions = array($e = $this);
-        while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
-            $exceptions[] = $e;
-        }
-
-        while ($e = array_pop($exceptions)) {
-            $traces = $e->getTrace();
-            array_unshift($traces, array('file' => $e->getFile(), 'line' => $e->getLine()));
-
-            while ($trace = array_shift($traces)) {
-                if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
-                    continue;
-                }
-
-                foreach ($template->getDebugInfo() as $codeLine => $templateLine) {
-                    if ($codeLine <= $trace['line']) {
-                        // update template line
-                        $this->lineno = $templateLine;
-
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Error/Loader.php b/vendor/twig/twig/lib/Twig/Error/Loader.php
deleted file mode 100644
index 68efb57..0000000
--- a/vendor/twig/twig/lib/Twig/Error/Loader.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs during template loading.
- *
- * Automatic template information guessing is always turned off as
- * if a template cannot be loaded, there is nothing to guess.
- * However, when a template is loaded from another one, then, we need
- * to find the current context and this is automatically done by
- * Twig_Template::displayWithErrorHandling().
- *
- * This strategy makes Twig_Environment::resolveTemplate() much faster.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Loader extends Twig_Error
-{
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, false, false, $previous);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Error/Runtime.php b/vendor/twig/twig/lib/Twig/Error/Runtime.php
deleted file mode 100644
index 8b6cedd..0000000
--- a/vendor/twig/twig/lib/Twig/Error/Runtime.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs at runtime.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Runtime extends Twig_Error
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Error/Syntax.php b/vendor/twig/twig/lib/Twig/Error/Syntax.php
deleted file mode 100644
index f73730a..0000000
--- a/vendor/twig/twig/lib/Twig/Error/Syntax.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a syntax error occurs during lexing or parsing of a template.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Syntax extends Twig_Error
-{
-    /**
-     * Tweaks the error message to include suggestions.
-     *
-     * @param string $name  The original name of the item that does not exist
-     * @param array  $items An array of possible items
-     */
-    public function addSuggestions($name, array $items)
-    {
-        if (!$alternatives = self::computeAlternatives($name, $items)) {
-            return;
-        }
-
-        $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', $alternatives)));
-    }
-
-    /**
-     * @internal
-     *
-     * To be merged with the addSuggestions() method in 2.0.
-     */
-    public static function computeAlternatives($name, $items)
-    {
-        $alternatives = array();
-        foreach ($items as $item) {
-            $lev = levenshtein($name, $item);
-            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
-                $alternatives[$item] = $lev;
-            }
-        }
-        asort($alternatives);
-
-        return array_keys($alternatives);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php b/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
deleted file mode 100644
index b168c3c..0000000
--- a/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Adds an exists() method for loaders.
- *
- * @author Florin Patan <florinpatan@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_ExistsLoaderInterface
-{
-    /**
-     * Check if we have the source code of a template, given its name.
-     *
-     * @param string $name The name of the template to check if we can load
-     *
-     * @return bool If the template source code is handled by this loader or not
-     */
-    public function exists($name);
-}
diff --git a/vendor/twig/twig/lib/Twig/ExpressionParser.php b/vendor/twig/twig/lib/Twig/ExpressionParser.php
deleted file mode 100644
index cad11af..0000000
--- a/vendor/twig/twig/lib/Twig/ExpressionParser.php
+++ /dev/null
@@ -1,641 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Parses expressions.
- *
- * This parser implements a "Precedence climbing" algorithm.
- *
- * @see http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
- * @see http://en.wikipedia.org/wiki/Operator-precedence_parser
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_ExpressionParser
-{
-    const OPERATOR_LEFT = 1;
-    const OPERATOR_RIGHT = 2;
-
-    protected $parser;
-    protected $unaryOperators;
-    protected $binaryOperators;
-
-    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
-    {
-        $this->parser = $parser;
-        $this->unaryOperators = $unaryOperators;
-        $this->binaryOperators = $binaryOperators;
-    }
-
-    public function parseExpression($precedence = 0)
-    {
-        $expr = $this->getPrimary();
-        $token = $this->parser->getCurrentToken();
-        while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
-            $op = $this->binaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-
-            if (isset($op['callable'])) {
-                $expr = call_user_func($op['callable'], $this->parser, $expr);
-            } else {
-                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
-                $class = $op['class'];
-                $expr = new $class($expr, $expr1, $token->getLine());
-            }
-
-            $token = $this->parser->getCurrentToken();
-        }
-
-        if (0 === $precedence) {
-            return $this->parseConditionalExpression($expr);
-        }
-
-        return $expr;
-    }
-
-    protected function getPrimary()
-    {
-        $token = $this->parser->getCurrentToken();
-
-        if ($this->isUnary($token)) {
-            $operator = $this->unaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression($operator['precedence']);
-            $class = $operator['class'];
-
-            return $this->parsePostfixExpression(new $class($expr, $token->getLine()));
-        } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'An opened parenthesis is not properly closed');
-
-            return $this->parsePostfixExpression($expr);
-        }
-
-        return $this->parsePrimaryExpression();
-    }
-
-    protected function parseConditionalExpression($expr)
-    {
-        while ($this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, '?')) {
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $expr2 = $this->parseExpression();
-                if ($this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                    $expr3 = $this->parseExpression();
-                } else {
-                    $expr3 = new Twig_Node_Expression_Constant('', $this->parser->getCurrentToken()->getLine());
-                }
-            } else {
-                $expr2 = $expr;
-                $expr3 = $this->parseExpression();
-            }
-
-            $expr = new Twig_Node_Expression_Conditional($expr, $expr2, $expr3, $this->parser->getCurrentToken()->getLine());
-        }
-
-        return $expr;
-    }
-
-    protected function isUnary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
-    }
-
-    protected function isBinary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
-    }
-
-    public function parsePrimaryExpression()
-    {
-        $token = $this->parser->getCurrentToken();
-        switch ($token->getType()) {
-            case Twig_Token::NAME_TYPE:
-                $this->parser->getStream()->next();
-                switch ($token->getValue()) {
-                    case 'true':
-                    case 'TRUE':
-                        $node = new Twig_Node_Expression_Constant(true, $token->getLine());
-                        break;
-
-                    case 'false':
-                    case 'FALSE':
-                        $node = new Twig_Node_Expression_Constant(false, $token->getLine());
-                        break;
-
-                    case 'none':
-                    case 'NONE':
-                    case 'null':
-                    case 'NULL':
-                        $node = new Twig_Node_Expression_Constant(null, $token->getLine());
-                        break;
-
-                    default:
-                        if ('(' === $this->parser->getCurrentToken()->getValue()) {
-                            $node = $this->getFunctionNode($token->getValue(), $token->getLine());
-                        } else {
-                            $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                        }
-                }
-                break;
-
-            case Twig_Token::NUMBER_TYPE:
-                $this->parser->getStream()->next();
-                $node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                break;
-
-            case Twig_Token::STRING_TYPE:
-            case Twig_Token::INTERPOLATION_START_TYPE:
-                $node = $this->parseStringExpression();
-                break;
-
-            case Twig_Token::OPERATOR_TYPE:
-                if (preg_match(Twig_Lexer::REGEX_NAME, $token->getValue(), $matches) && $matches[0] == $token->getValue()) {
-                    // in this context, string operators are variable names
-                    $this->parser->getStream()->next();
-                    $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                    break;
-                } elseif (isset($this->unaryOperators[$token->getValue()])) {
-                    $class = $this->unaryOperators[$token->getValue()]['class'];
-
-                    $ref = new ReflectionClass($class);
-                    $negClass = 'Twig_Node_Expression_Unary_Neg';
-                    $posClass = 'Twig_Node_Expression_Unary_Pos';
-                    if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
-                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getFilename());
-                    }
-
-                    $this->parser->getStream()->next();
-                    $expr = $this->parsePrimaryExpression();
-
-                    $node = new $class($expr, $token->getLine());
-                    break;
-                }
-
-            default:
-                if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
-                    $node = $this->parseArrayExpression();
-                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
-                    $node = $this->parseHashExpression();
-                } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getFilename());
-                }
-        }
-
-        return $this->parsePostfixExpression($node);
-    }
-
-    public function parseStringExpression()
-    {
-        $stream = $this->parser->getStream();
-
-        $nodes = array();
-        // a string cannot be followed by another string in a single expression
-        $nextCanBeString = true;
-        while (true) {
-            if ($nextCanBeString && $token = $stream->nextIf(Twig_Token::STRING_TYPE)) {
-                $nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                $nextCanBeString = false;
-            } elseif ($stream->nextIf(Twig_Token::INTERPOLATION_START_TYPE)) {
-                $nodes[] = $this->parseExpression();
-                $stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
-                $nextCanBeString = true;
-            } else {
-                break;
-            }
-        }
-
-        $expr = array_shift($nodes);
-        foreach ($nodes as $node) {
-            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
-        }
-
-        return $expr;
-    }
-
-    public function parseArrayExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            $node->addElement($this->parseExpression());
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
-
-        return $node;
-    }
-
-    public function parseHashExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'A hash value must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            // a hash key can be:
-            //
-            //  * a number -- 12
-            //  * a string -- 'a'
-            //  * a name, which is equivalent to a string -- a
-            //  * an expression, which must be enclosed in parentheses -- (1 + 2)
-            if (($token = $stream->nextIf(Twig_Token::STRING_TYPE)) || ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) || $token = $stream->nextIf(Twig_Token::NUMBER_TYPE)) {
-                $key = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            } elseif ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $key = $this->parseExpression();
-            } else {
-                $current = $stream->getCurrent();
-
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $this->parser->getFilename());
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
-            $value = $this->parseExpression();
-
-            $node->addElement($value, $key);
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
-
-        return $node;
-    }
-
-    public function parsePostfixExpression($node)
-    {
-        while (true) {
-            $token = $this->parser->getCurrentToken();
-            if ($token->getType() == Twig_Token::PUNCTUATION_TYPE) {
-                if ('.' == $token->getValue() || '[' == $token->getValue()) {
-                    $node = $this->parseSubscriptExpression($node);
-                } elseif ('|' == $token->getValue()) {
-                    $node = $this->parseFilterExpression($node);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-
-        return $node;
-    }
-
-    public function getFunctionNode($name, $line)
-    {
-        switch ($name) {
-            case 'parent':
-                $this->parseArguments();
-                if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getFilename());
-                }
-
-                if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getFilename());
-                }
-
-                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
-            case 'block':
-                return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $line);
-            case 'attribute':
-                $args = $this->parseArguments();
-                if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getFilename());
-                }
-
-                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
-            default:
-                if (null !== $alias = $this->parser->getImportedSymbol('function', $name)) {
-                    $arguments = new Twig_Node_Expression_Array(array(), $line);
-                    foreach ($this->parseArguments() as $n) {
-                        $arguments->addElement($n);
-                    }
-
-                    $node = new Twig_Node_Expression_MethodCall($alias['node'], $alias['name'], $arguments, $line);
-                    $node->setAttribute('safe', true);
-
-                    return $node;
-                }
-
-                $args = $this->parseArguments(true);
-                $class = $this->getFunctionNodeClass($name, $line);
-
-                return new $class($name, $args, $line);
-        }
-    }
-
-    public function parseSubscriptExpression($node)
-    {
-        $stream = $this->parser->getStream();
-        $token = $stream->next();
-        $lineno = $token->getLine();
-        $arguments = new Twig_Node_Expression_Array(array(), $lineno);
-        $type = Twig_Template::ANY_CALL;
-        if ($token->getValue() == '.') {
-            $token = $stream->next();
-            if (
-                $token->getType() == Twig_Token::NAME_TYPE
-                ||
-                $token->getType() == Twig_Token::NUMBER_TYPE
-                ||
-                ($token->getType() == Twig_Token::OPERATOR_TYPE && preg_match(Twig_Lexer::REGEX_NAME, $token->getValue()))
-            ) {
-                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
-
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                    $type = Twig_TemplateInterface::METHOD_CALL;
-                    foreach ($this->parseArguments() as $n) {
-                        $arguments->addElement($n);
-                    }
-                }
-            } else {
-                throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
-            }
-
-            if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
-                if (!$arg instanceof Twig_Node_Expression_Constant) {
-                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $this->parser->getFilename());
-                }
-
-                $name = $arg->getAttribute('value');
-
-                if ($this->parser->isReservedMacroName($name)) {
-                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $this->parser->getFilename());
-                }
-
-                $node = new Twig_Node_Expression_MethodCall($node, 'get'.$name, $arguments, $lineno);
-                $node->setAttribute('safe', true);
-
-                return $node;
-            }
-        } else {
-            $type = Twig_Template::ARRAY_CALL;
-
-            // slice?
-            $slice = false;
-            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $slice = true;
-                $arg = new Twig_Node_Expression_Constant(0, $token->getLine());
-            } else {
-                $arg = $this->parseExpression();
-            }
-
-            if ($stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $slice = true;
-            }
-
-            if ($slice) {
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    $length = new Twig_Node_Expression_Constant(null, $token->getLine());
-                } else {
-                    $length = $this->parseExpression();
-                }
-
-                $class = $this->getFilterNodeClass('slice', $token->getLine());
-                $arguments = new Twig_Node(array($arg, $length));
-                $filter = new $class($node, new Twig_Node_Expression_Constant('slice', $token->getLine()), $arguments, $token->getLine());
-
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-
-                return $filter;
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-        }
-
-        return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
-    }
-
-    public function parseFilterExpression($node)
-    {
-        $this->parser->getStream()->next();
-
-        return $this->parseFilterExpressionRaw($node);
-    }
-
-    public function parseFilterExpressionRaw($node, $tag = null)
-    {
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE);
-
-            $name = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $arguments = new Twig_Node();
-            } else {
-                $arguments = $this->parseArguments(true);
-            }
-
-            $class = $this->getFilterNodeClass($name->getAttribute('value'), $token->getLine());
-
-            $node = new $class($node, $name, $arguments, $token->getLine(), $tag);
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '|')) {
-                break;
-            }
-
-            $this->parser->getStream()->next();
-        }
-
-        return $node;
-    }
-
-    /**
-     * Parses arguments.
-     *
-     * @param bool $namedArguments Whether to allow named arguments or not
-     * @param bool $definition     Whether we are parsing arguments for a function definition
-     *
-     * @return Twig_Node
-     *
-     * @throws Twig_Error_Syntax
-     */
-    public function parseArguments($namedArguments = false, $definition = false)
-    {
-        $args = array();
-        $stream = $this->parser->getStream();
-
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) {
-            if (!empty($args)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
-            }
-
-            if ($definition) {
-                $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'An argument must be a name');
-                $value = new Twig_Node_Expression_Name($token->getValue(), $this->parser->getCurrentToken()->getLine());
-            } else {
-                $value = $this->parseExpression();
-            }
-
-            $name = null;
-            if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
-                if (!$value instanceof Twig_Node_Expression_Name) {
-                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $this->parser->getFilename());
-                }
-                $name = $value->getAttribute('name');
-
-                if ($definition) {
-                    $value = $this->parsePrimaryExpression();
-
-                    if (!$this->checkConstantExpression($value)) {
-                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $this->parser->getFilename());
-                    }
-                } else {
-                    $value = $this->parseExpression();
-                }
-            }
-
-            if ($definition) {
-                if (null === $name) {
-                    $name = $value->getAttribute('name');
-                    $value = new Twig_Node_Expression_Constant(null, $this->parser->getCurrentToken()->getLine());
-                }
-                $args[$name] = $value;
-            } else {
-                if (null === $name) {
-                    $args[] = $value;
-                } else {
-                    $args[$name] = $value;
-                }
-            }
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
-
-        return new Twig_Node($args);
-    }
-
-    public function parseAssignmentExpression()
-    {
-        $targets = array();
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $token->getValue()), $token->getLine(), $this->parser->getFilename());
-            }
-            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
-
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    public function parseMultitargetExpression()
-    {
-        $targets = array();
-        while (true) {
-            $targets[] = $this->parseExpression();
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    protected function getFunctionNodeClass($name, $line)
-    {
-        $env = $this->parser->getEnvironment();
-
-        if (false === $function = $env->getFunction($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getFilename());
-            $e->addSuggestions($name, array_keys($env->getFunctions()));
-
-            throw $e;
-        }
-
-        if ($function instanceof Twig_SimpleFunction && $function->isDeprecated()) {
-            $message = sprintf('Twig Function "%s" is deprecated', $function->getName());
-            if ($function->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $function->getAlternative());
-            }
-            $message .= sprintf(' in %s at line %d.', $this->parser->getFilename(), $line);
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        if ($function instanceof Twig_SimpleFunction) {
-            return $function->getNodeClass();
-        }
-
-        return $function instanceof Twig_Function_Node ? $function->getClass() : 'Twig_Node_Expression_Function';
-    }
-
-    protected function getFilterNodeClass($name, $line)
-    {
-        $env = $this->parser->getEnvironment();
-
-        if (false === $filter = $env->getFilter($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getFilename());
-            $e->addSuggestions($name, array_keys($env->getFilters()));
-
-            throw $e;
-        }
-
-        if ($filter instanceof Twig_SimpleFilter && $filter->isDeprecated()) {
-            $message = sprintf('Twig Filter "%s" is deprecated', $filter->getName());
-            if ($filter->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $filter->getAlternative());
-            }
-            $message .= sprintf(' in %s at line %d.', $this->parser->getFilename(), $line);
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        if ($filter instanceof Twig_SimpleFilter) {
-            return $filter->getNodeClass();
-        }
-
-        return $filter instanceof Twig_Filter_Node ? $filter->getClass() : 'Twig_Node_Expression_Filter';
-    }
-
-    // checks that the node only contains "constant" elements
-    protected function checkConstantExpression(Twig_NodeInterface $node)
-    {
-        if (!($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array
-            || $node instanceof Twig_Node_Expression_Unary_Neg || $node instanceof Twig_Node_Expression_Unary_Pos
-        )) {
-            return false;
-        }
-
-        foreach ($node as $n) {
-            if (!$this->checkConstantExpression($n)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension.php b/vendor/twig/twig/lib/Twig/Extension.php
deleted file mode 100644
index cb03b3d..0000000
--- a/vendor/twig/twig/lib/Twig/Extension.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Extension implements Twig_ExtensionInterface
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
-     */
-    public function initRuntime(Twig_Environment $environment)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTokenParsers()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNodeVisitors()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFilters()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTests()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFunctions()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOperators()
-    {
-        return array();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
-     */
-    public function getGlobals()
-    {
-        return array();
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Core.php b/vendor/twig/twig/lib/Twig/Extension/Core.php
deleted file mode 100644
index 0aed990..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Core.php
+++ /dev/null
@@ -1,1544 +0,0 @@
-<?php
-
-if (!defined('ENT_SUBSTITUTE')) {
-    // use 0 as hhvm does not support several flags yet
-    define('ENT_SUBSTITUTE', 0);
-}
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Core extends Twig_Extension
-{
-    protected $dateFormats = array('F j, Y H:i', '%d days');
-    protected $numberFormat = array(0, '.', ',');
-    protected $timezone = null;
-    protected $escapers = array();
-
-    /**
-     * Defines a new escaper to be used via the escape filter.
-     *
-     * @param string   $strategy The strategy name that should be used as a strategy in the escape call
-     * @param callable $callable A valid PHP callable
-     */
-    public function setEscaper($strategy, $callable)
-    {
-        $this->escapers[$strategy] = $callable;
-    }
-
-    /**
-     * Gets all defined escapers.
-     *
-     * @return array An array of escapers
-     */
-    public function getEscapers()
-    {
-        return $this->escapers;
-    }
-
-    /**
-     * Sets the default format to be used by the date filter.
-     *
-     * @param string $format             The default date format string
-     * @param string $dateIntervalFormat The default date interval format string
-     */
-    public function setDateFormat($format = null, $dateIntervalFormat = null)
-    {
-        if (null !== $format) {
-            $this->dateFormats[0] = $format;
-        }
-
-        if (null !== $dateIntervalFormat) {
-            $this->dateFormats[1] = $dateIntervalFormat;
-        }
-    }
-
-    /**
-     * Gets the default format to be used by the date filter.
-     *
-     * @return array The default date format string and the default date interval format string
-     */
-    public function getDateFormat()
-    {
-        return $this->dateFormats;
-    }
-
-    /**
-     * Sets the default timezone to be used by the date filter.
-     *
-     * @param DateTimeZone|string $timezone The default timezone string or a DateTimeZone object
-     */
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-    }
-
-    /**
-     * Gets the default timezone to be used by the date filter.
-     *
-     * @return DateTimeZone The default timezone currently in use
-     */
-    public function getTimezone()
-    {
-        if (null === $this->timezone) {
-            $this->timezone = new DateTimeZone(date_default_timezone_get());
-        }
-
-        return $this->timezone;
-    }
-
-    /**
-     * Sets the default format to be used by the number_format filter.
-     *
-     * @param int    $decimal      The number of decimal places to use.
-     * @param string $decimalPoint The character(s) to use for the decimal point.
-     * @param string $thousandSep  The character(s) to use for the thousands separator.
-     */
-    public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
-    {
-        $this->numberFormat = array($decimal, $decimalPoint, $thousandSep);
-    }
-
-    /**
-     * Get the default format used by the number_format filter.
-     *
-     * @return array The arguments for number_format()
-     */
-    public function getNumberFormat()
-    {
-        return $this->numberFormat;
-    }
-
-    public function getTokenParsers()
-    {
-        return array(
-            new Twig_TokenParser_For(),
-            new Twig_TokenParser_If(),
-            new Twig_TokenParser_Extends(),
-            new Twig_TokenParser_Include(),
-            new Twig_TokenParser_Block(),
-            new Twig_TokenParser_Use(),
-            new Twig_TokenParser_Filter(),
-            new Twig_TokenParser_Macro(),
-            new Twig_TokenParser_Import(),
-            new Twig_TokenParser_From(),
-            new Twig_TokenParser_Set(),
-            new Twig_TokenParser_Spaceless(),
-            new Twig_TokenParser_Flush(),
-            new Twig_TokenParser_Do(),
-            new Twig_TokenParser_Embed(),
-        );
-    }
-
-    public function getFilters()
-    {
-        $filters = array(
-            // formatting filters
-            new Twig_SimpleFilter('date', 'twig_date_format_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('format', 'sprintf'),
-            new Twig_SimpleFilter('replace', 'twig_replace_filter'),
-            new Twig_SimpleFilter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('abs', 'abs'),
-            new Twig_SimpleFilter('round', 'twig_round'),
-
-            // encoding
-            new Twig_SimpleFilter('url_encode', 'twig_urlencode_filter'),
-            new Twig_SimpleFilter('json_encode', 'twig_jsonencode_filter'),
-            new Twig_SimpleFilter('convert_encoding', 'twig_convert_encoding'),
-
-            // string filters
-            new Twig_SimpleFilter('title', 'twig_title_string_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('upper', 'strtoupper'),
-            new Twig_SimpleFilter('lower', 'strtolower'),
-            new Twig_SimpleFilter('striptags', 'strip_tags'),
-            new Twig_SimpleFilter('trim', 'trim'),
-            new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
-
-            // array helpers
-            new Twig_SimpleFilter('join', 'twig_join_filter'),
-            new Twig_SimpleFilter('split', 'twig_split_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('sort', 'twig_sort_filter'),
-            new Twig_SimpleFilter('merge', 'twig_array_merge'),
-            new Twig_SimpleFilter('batch', 'twig_array_batch'),
-
-            // string/array filters
-            new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('length', 'twig_length_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('slice', 'twig_slice', array('needs_environment' => true)),
-            new Twig_SimpleFilter('first', 'twig_first', array('needs_environment' => true)),
-            new Twig_SimpleFilter('last', 'twig_last', array('needs_environment' => true)),
-
-            // iteration and runtime
-            new Twig_SimpleFilter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
-            new Twig_SimpleFilter('keys', 'twig_get_array_keys_filter'),
-
-            // escaping
-            new Twig_SimpleFilter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-            new Twig_SimpleFilter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-        );
-
-        if (function_exists('mb_get_info')) {
-            $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
-            $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
-        }
-
-        return $filters;
-    }
-
-    public function getFunctions()
-    {
-        return array(
-            new Twig_SimpleFunction('max', 'max'),
-            new Twig_SimpleFunction('min', 'min'),
-            new Twig_SimpleFunction('range', 'range'),
-            new Twig_SimpleFunction('constant', 'twig_constant'),
-            new Twig_SimpleFunction('cycle', 'twig_cycle'),
-            new Twig_SimpleFunction('random', 'twig_random', array('needs_environment' => true)),
-            new Twig_SimpleFunction('date', 'twig_date_converter', array('needs_environment' => true)),
-            new Twig_SimpleFunction('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
-            new Twig_SimpleFunction('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
-        );
-    }
-
-    public function getTests()
-    {
-        return array(
-            new Twig_SimpleTest('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
-            new Twig_SimpleTest('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
-            new Twig_SimpleTest('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
-            new Twig_SimpleTest('sameas', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => true, 'alternative' => 'same as')),
-            new Twig_SimpleTest('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
-            new Twig_SimpleTest('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
-            new Twig_SimpleTest('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
-            new Twig_SimpleTest('divisibleby', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => true, 'alternative' => 'divisible by')),
-            new Twig_SimpleTest('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
-            new Twig_SimpleTest('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
-            new Twig_SimpleTest('empty', 'twig_test_empty'),
-            new Twig_SimpleTest('iterable', 'twig_test_iterable'),
-        );
-    }
-
-    public function getOperators()
-    {
-        return array(
-            array(
-                'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
-                '-' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'),
-                '+' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'),
-            ),
-            array(
-                'or' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'and' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-or' => array('precedence' => 16, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-xor' => array('precedence' => 17, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-and' => array('precedence' => 18, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '!=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'matches' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Matches', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'starts with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_StartsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'ends with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_EndsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '..' => array('precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '+' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '-' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '~' => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '*' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '/' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '//' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '%' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is' => array('precedence' => 100, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
-            ),
-        );
-    }
-
-    public function parseNotTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
-    {
-        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
-    }
-
-    public function parseTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
-    {
-        $stream = $parser->getStream();
-        list($name, $test) = $this->getTest($parser, $node->getLine());
-
-        if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
-            $message = sprintf('Twig Test "%s" is deprecated', $name);
-            if ($test->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $test->getAlternative());
-            }
-            $message .= sprintf(' in %s at line %d.', $stream->getFilename(), $stream->getCurrent()->getLine());
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        $class = $this->getTestNodeClass($parser, $test);
-        $arguments = null;
-        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $parser->getExpressionParser()->parseArguments(true);
-        }
-
-        return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
-    }
-
-    protected function getTest(Twig_Parser $parser, $line)
-    {
-        $stream = $parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        $env = $parser->getEnvironment();
-
-        if ($test = $env->getTest($name)) {
-            return array($name, $test);
-        }
-
-        if ($stream->test(Twig_Token::NAME_TYPE)) {
-            // try 2-words tests
-            $name = $name.' '.$parser->getCurrentToken()->getValue();
-
-            if ($test = $env->getTest($name)) {
-                $parser->getStream()->next();
-
-                return array($name, $test);
-            }
-        }
-
-        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $parser->getFilename());
-        $e->addSuggestions($name, array_keys($env->getTests()));
-
-        throw $e;
-    }
-
-    protected function getTestNodeClass(Twig_Parser $parser, $test)
-    {
-        if ($test instanceof Twig_SimpleTest) {
-            return $test->getNodeClass();
-        }
-
-        return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
-    }
-
-    public function getName()
-    {
-        return 'core';
-    }
-}
-
-/**
- * Cycles over a value.
- *
- * @param ArrayAccess|array $values   An array or an ArrayAccess instance
- * @param int               $position The cycle position
- *
- * @return string The next value in the cycle
- */
-function twig_cycle($values, $position)
-{
-    if (!is_array($values) && !$values instanceof ArrayAccess) {
-        return $values;
-    }
-
-    return $values[$position % count($values)];
-}
-
-/**
- * Returns a random value depending on the supplied parameter type:
- * - a random item from a Traversable or array
- * - a random character from a string
- * - a random integer between 0 and the integer parameter.
- *
- * @param Twig_Environment             $env    A Twig_Environment instance
- * @param Traversable|array|int|string $values The values to pick a random item from
- *
- * @throws Twig_Error_Runtime When $values is an empty array (does not apply to an empty string which is returned as is).
- *
- * @return mixed A random value from the given sequence
- */
-function twig_random(Twig_Environment $env, $values = null)
-{
-    if (null === $values) {
-        return mt_rand();
-    }
-
-    if (is_int($values) || is_float($values)) {
-        return $values < 0 ? mt_rand($values, 0) : mt_rand(0, $values);
-    }
-
-    if ($values instanceof Traversable) {
-        $values = iterator_to_array($values);
-    } elseif (is_string($values)) {
-        if ('' === $values) {
-            return '';
-        }
-        if (null !== $charset = $env->getCharset()) {
-            if ('UTF-8' != $charset) {
-                $values = twig_convert_encoding($values, 'UTF-8', $charset);
-            }
-
-            // unicode version of str_split()
-            // split at all positions, but not after the start and not before the end
-            $values = preg_split('/(?<!^)(?!$)/u', $values);
-
-            if ('UTF-8' != $charset) {
-                foreach ($values as $i => $value) {
-                    $values[$i] = twig_convert_encoding($value, $charset, 'UTF-8');
-                }
-            }
-        } else {
-            return $values[mt_rand(0, strlen($values) - 1)];
-        }
-    }
-
-    if (!is_array($values)) {
-        return $values;
-    }
-
-    if (0 === count($values)) {
-        throw new Twig_Error_Runtime('The random function cannot pick from an empty array.');
-    }
-
-    return $values[array_rand($values, 1)];
-}
-
-/**
- * Converts a date to the given format.
- *
- * <pre>
- *   {{ post.published_at|date("m/d/Y") }}
- * </pre>
- *
- * @param Twig_Environment                               $env      A Twig_Environment instance
- * @param DateTime|DateTimeInterface|DateInterval|string $date     A date
- * @param string|null                                    $format   The target format, null to use the default
- * @param DateTimeZone|string|null|false                 $timezone The target timezone, null to use the default, false to leave unchanged
- *
- * @return string The formatted date
- */
-function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
-{
-    if (null === $format) {
-        $formats = $env->getExtension('core')->getDateFormat();
-        $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
-    }
-
-    if ($date instanceof DateInterval) {
-        return $date->format($format);
-    }
-
-    return twig_date_converter($env, $date, $timezone)->format($format);
-}
-
-/**
- * Returns a new date object modified.
- *
- * <pre>
- *   {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
- * </pre>
- *
- * @param Twig_Environment $env      A Twig_Environment instance
- * @param DateTime|string  $date     A date
- * @param string           $modifier A modifier string
- *
- * @return DateTime A new date object
- */
-function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
-{
-    $date = twig_date_converter($env, $date, false);
-    $resultDate = $date->modify($modifier);
-
-    // This is a hack to ensure PHP 5.2 support and support for DateTimeImmutable
-    // DateTime::modify does not return the modified DateTime object < 5.3.0
-    // and DateTimeImmutable does not modify $date.
-    return null === $resultDate ? $date : $resultDate;
-}
-
-/**
- * Converts an input to a DateTime instance.
- *
- * <pre>
- *    {% if date(user.created_at) < date('+2days') %}
- *      {# do something #}
- *    {% endif %}
- * </pre>
- *
- * @param Twig_Environment                       $env      A Twig_Environment instance
- * @param DateTime|DateTimeInterface|string|null $date     A date
- * @param DateTimeZone|string|null|false         $timezone The target timezone, null to use the default, false to leave unchanged
- *
- * @return DateTime A DateTime instance
- */
-function twig_date_converter(Twig_Environment $env, $date = null, $timezone = null)
-{
-    // determine the timezone
-    if (false !== $timezone) {
-        if (null === $timezone) {
-            $timezone = $env->getExtension('core')->getTimezone();
-        } elseif (!$timezone instanceof DateTimeZone) {
-            $timezone = new DateTimeZone($timezone);
-        }
-    }
-
-    // immutable dates
-    if ($date instanceof DateTimeImmutable) {
-        return false !== $timezone ? $date->setTimezone($timezone) : $date;
-    }
-
-    if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
-        $date = clone $date;
-        if (false !== $timezone) {
-            $date->setTimezone($timezone);
-        }
-
-        return $date;
-    }
-
-    if (null === $date || 'now' === $date) {
-        return new DateTime($date, false !== $timezone ? $timezone : $env->getExtension('core')->getTimezone());
-    }
-
-    $asString = (string) $date;
-    if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
-        $date = new DateTime('@'.$date);
-    } else {
-        $date = new DateTime($date, $env->getExtension('core')->getTimezone());
-    }
-
-    if (false !== $timezone) {
-        $date->setTimezone($timezone);
-    }
-
-    return $date;
-}
-
-/**
- * Replaces strings within a string.
- *
- * @param string            $str  String to replace in
- * @param array|Traversable $from Replace values
- * @param string|null       $to   Replace to, deprecated (@see http://php.net/manual/en/function.strtr.php)
- *
- * @return string
- */
-function twig_replace_filter($str, $from, $to = null)
-{
-    if ($from instanceof Traversable) {
-        $from = iterator_to_array($from);
-    } elseif (is_string($from) && is_string($to)) {
-        @trigger_error('Using "replace" with character by character replacement is deprecated and will be removed in Twig 2.0', E_USER_DEPRECATED);
-
-        return strtr($str, $from, $to);
-    } elseif (!is_array($from)) {
-        throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".',is_object($from) ? get_class($from) : gettype($from)));
-    }
-
-    return strtr($str, $from);
-}
-
-/**
- * Rounds a number.
- *
- * @param int|float $value     The value to round
- * @param int|float $precision The rounding precision
- * @param string    $method    The method to use for rounding
- *
- * @return int|float The rounded number
- */
-function twig_round($value, $precision = 0, $method = 'common')
-{
-    if ('common' == $method) {
-        return round($value, $precision);
-    }
-
-    if ('ceil' != $method && 'floor' != $method) {
-        throw new Twig_Error_Runtime('The round filter only supports the "common", "ceil", and "floor" methods.');
-    }
-
-    return $method($value * pow(10, $precision)) / pow(10, $precision);
-}
-
-/**
- * Number format filter.
- *
- * All of the formatting options can be left null, in that case the defaults will
- * be used.  Supplying any of the parameters will override the defaults set in the
- * environment object.
- *
- * @param Twig_Environment $env          A Twig_Environment instance
- * @param mixed            $number       A float/int/string of the number to format
- * @param int              $decimal      The number of decimal points to display.
- * @param string           $decimalPoint The character(s) to use for the decimal point.
- * @param string           $thousandSep  The character(s) to use for the thousands separator.
- *
- * @return string The formatted number
- */
-function twig_number_format_filter(Twig_Environment $env, $number, $decimal = null, $decimalPoint = null, $thousandSep = null)
-{
-    $defaults = $env->getExtension('core')->getNumberFormat();
-    if (null === $decimal) {
-        $decimal = $defaults[0];
-    }
-
-    if (null === $decimalPoint) {
-        $decimalPoint = $defaults[1];
-    }
-
-    if (null === $thousandSep) {
-        $thousandSep = $defaults[2];
-    }
-
-    return number_format((float) $number, $decimal, $decimalPoint, $thousandSep);
-}
-
-/**
- * URL encodes (RFC 3986) a string as a path segment or an array as a query string.
- *
- * @param string|array $url A URL or an array of query parameters
- *
- * @return string The URL encoded value
- */
-function twig_urlencode_filter($url)
-{
-    if (is_array($url)) {
-        if (defined('PHP_QUERY_RFC3986')) {
-            return http_build_query($url, '', '&', PHP_QUERY_RFC3986);
-        }
-
-        return http_build_query($url, '', '&');
-    }
-
-    return rawurlencode($url);
-}
-
-if (PHP_VERSION_ID < 50300) {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed $value   The value to encode.
-     * @param int   $options Not used on PHP 5.2.x
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value);
-    }
-} else {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed $value   The value to encode.
-     * @param int   $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value, $options);
-    }
-}
-
-function _twig_markup2string(&$value)
-{
-    if ($value instanceof Twig_Markup) {
-        $value = (string) $value;
-    }
-}
-
-/**
- * Merges an array with another one.
- *
- * <pre>
- *  {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
- *
- *  {% set items = items|merge({ 'peugeot': 'car' }) %}
- *
- *  {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
- * </pre>
- *
- * @param array|Traversable $arr1 An array
- * @param array|Traversable $arr2 An array
- *
- * @return array The merged array
- */
-function twig_array_merge($arr1, $arr2)
-{
-    if ($arr1 instanceof Traversable) {
-        $arr1 = iterator_to_array($arr1);
-    } elseif (!is_array($arr1)) {
-        throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as first argument.', gettype($arr1)));
-    }
-
-    if ($arr2 instanceof Traversable) {
-        $arr2 = iterator_to_array($arr2);
-    } elseif (!is_array($arr2)) {
-        throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as second argument.', gettype($arr2)));
-    }
-
-    return array_merge($arr1, $arr2);
-}
-
-/**
- * Slices a variable.
- *
- * @param Twig_Environment $env          A Twig_Environment instance
- * @param mixed            $item         A variable
- * @param int              $start        Start of the slice
- * @param int              $length       Size of the slice
- * @param bool             $preserveKeys Whether to preserve key or not (when the input is an array)
- *
- * @return mixed The sliced variable
- */
-function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
-{
-    if ($item instanceof Traversable) {
-        if ($item instanceof IteratorAggregate) {
-            $item = $item->getIterator();
-        }
-
-        if ($start >= 0 && $length >= 0 && $item instanceof Iterator) {
-            try {
-                return iterator_to_array(new LimitIterator($item, $start, $length === null ? -1 : $length), $preserveKeys);
-            } catch (OutOfBoundsException $exception) {
-                return array();
-            }
-        }
-
-        $item = iterator_to_array($item, $preserveKeys);
-    }
-
-    if (is_array($item)) {
-        return array_slice($item, $start, $length, $preserveKeys);
-    }
-
-    $item = (string) $item;
-
-    if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
-        return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
-    }
-
-    return (string) (null === $length ? substr($item, $start) : substr($item, $start, $length));
-}
-
-/**
- * Returns the first element of the item.
- *
- * @param Twig_Environment $env  A Twig_Environment instance
- * @param mixed            $item A variable
- *
- * @return mixed The first element of the item
- */
-function twig_first(Twig_Environment $env, $item)
-{
-    $elements = twig_slice($env, $item, 0, 1, false);
-
-    return is_string($elements) ? $elements : current($elements);
-}
-
-/**
- * Returns the last element of the item.
- *
- * @param Twig_Environment $env  A Twig_Environment instance
- * @param mixed            $item A variable
- *
- * @return mixed The last element of the item
- */
-function twig_last(Twig_Environment $env, $item)
-{
-    $elements = twig_slice($env, $item, -1, 1, false);
-
-    return is_string($elements) ? $elements : current($elements);
-}
-
-/**
- * Joins the values to a string.
- *
- * The separator between elements is an empty string per default, you can define it with the optional parameter.
- *
- * <pre>
- *  {{ [1, 2, 3]|join('|') }}
- *  {# returns 1|2|3 #}
- *
- *  {{ [1, 2, 3]|join }}
- *  {# returns 123 #}
- * </pre>
- *
- * @param array  $value An array
- * @param string $glue  The separator
- *
- * @return string The concatenated string
- */
-function twig_join_filter($value, $glue = '')
-{
-    if ($value instanceof Traversable) {
-        $value = iterator_to_array($value, false);
-    }
-
-    return implode($glue, (array) $value);
-}
-
-/**
- * Splits the string into an array.
- *
- * <pre>
- *  {{ "one,two,three"|split(',') }}
- *  {# returns [one, two, three] #}
- *
- *  {{ "one,two,three,four,five"|split(',', 3) }}
- *  {# returns [one, two, "three,four,five"] #}
- *
- *  {{ "123"|split('') }}
- *  {# returns [1, 2, 3] #}
- *
- *  {{ "aabbcc"|split('', 2) }}
- *  {# returns [aa, bb, cc] #}
- * </pre>
- *
- * @param Twig_Environment $env       A Twig_Environment instance
- * @param string           $value     A string
- * @param string           $delimiter The delimiter
- * @param int              $limit     The limit
- *
- * @return array The split string as an array
- */
-function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = null)
-{
-    if (!empty($delimiter)) {
-        return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
-    }
-
-    if (!function_exists('mb_get_info') || null === $charset = $env->getCharset()) {
-        return str_split($value, null === $limit ? 1 : $limit);
-    }
-
-    if ($limit <= 1) {
-        return preg_split('/(?<!^)(?!$)/u', $value);
-    }
-
-    $length = mb_strlen($value, $charset);
-    if ($length < $limit) {
-        return array($value);
-    }
-
-    $r = array();
-    for ($i = 0; $i < $length; $i += $limit) {
-        $r[] = mb_substr($value, $i, $limit, $charset);
-    }
-
-    return $r;
-}
-
-// The '_default' filter is used internally to avoid using the ternary operator
-// which costs a lot for big contexts (before PHP 5.4). So, on average,
-// a function call is cheaper.
-/**
- * @internal
- */
-function _twig_default_filter($value, $default = '')
-{
-    if (twig_test_empty($value)) {
-        return $default;
-    }
-
-    return $value;
-}
-
-/**
- * Returns the keys for the given array.
- *
- * It is useful when you want to iterate over the keys of an array:
- *
- * <pre>
- *  {% for key in array|keys %}
- *      {# ... #}
- *  {% endfor %}
- * </pre>
- *
- * @param array $array An array
- *
- * @return array The keys
- */
-function twig_get_array_keys_filter($array)
-{
-    if ($array instanceof Traversable) {
-        return array_keys(iterator_to_array($array));
-    }
-
-    if (!is_array($array)) {
-        return array();
-    }
-
-    return array_keys($array);
-}
-
-/**
- * Reverses a variable.
- *
- * @param Twig_Environment         $env          A Twig_Environment instance
- * @param array|Traversable|string $item         An array, a Traversable instance, or a string
- * @param bool                     $preserveKeys Whether to preserve key or not
- *
- * @return mixed The reversed input
- */
-function twig_reverse_filter(Twig_Environment $env, $item, $preserveKeys = false)
-{
-    if ($item instanceof Traversable) {
-        return array_reverse(iterator_to_array($item), $preserveKeys);
-    }
-
-    if (is_array($item)) {
-        return array_reverse($item, $preserveKeys);
-    }
-
-    if (null !== $charset = $env->getCharset()) {
-        $string = (string) $item;
-
-        if ('UTF-8' != $charset) {
-            $item = twig_convert_encoding($string, 'UTF-8', $charset);
-        }
-
-        preg_match_all('/./us', $item, $matches);
-
-        $string = implode('', array_reverse($matches[0]));
-
-        if ('UTF-8' != $charset) {
-            $string = twig_convert_encoding($string, $charset, 'UTF-8');
-        }
-
-        return $string;
-    }
-
-    return strrev((string) $item);
-}
-
-/**
- * Sorts an array.
- *
- * @param array|Traversable $array
- *
- * @return array
- */
-function twig_sort_filter($array)
-{
-    if ($array instanceof Traversable) {
-        $array = iterator_to_array($array);
-    } elseif (!is_array($array)) {
-        throw new Twig_Error_Runtime(sprintf('The sort filter only works with arrays or "Traversable", got "%s".', gettype($array)));
-    }
-
-    asort($array);
-
-    return $array;
-}
-
-/**
- * @internal
- */
-function twig_in_filter($value, $compare)
-{
-    if (is_array($compare)) {
-        return in_array($value, $compare, is_object($value) || is_resource($value));
-    } elseif (is_string($compare) && (is_string($value) || is_int($value) || is_float($value))) {
-        return '' === $value || false !== strpos($compare, (string) $value);
-    } elseif ($compare instanceof Traversable) {
-        return in_array($value, iterator_to_array($compare, false), is_object($value) || is_resource($value));
-    }
-
-    return false;
-}
-
-/**
- * Escapes a string.
- *
- * @param Twig_Environment $env        A Twig_Environment instance
- * @param string           $string     The value to be escaped
- * @param string           $strategy   The escaping strategy
- * @param string           $charset    The charset
- * @param bool             $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
- *
- * @return string
- */
-function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false)
-{
-    if ($autoescape && $string instanceof Twig_Markup) {
-        return $string;
-    }
-
-    if (!is_string($string)) {
-        if (is_object($string) && method_exists($string, '__toString')) {
-            $string = (string) $string;
-        } elseif (in_array($strategy, array('html', 'js', 'css', 'html_attr', 'url'))) {
-            return $string;
-        }
-    }
-
-    if (null === $charset) {
-        $charset = $env->getCharset();
-    }
-
-    switch ($strategy) {
-        case 'html':
-            // see http://php.net/htmlspecialchars
-
-            // Using a static variable to avoid initializing the array
-            // each time the function is called. Moving the declaration on the
-            // top of the function slow downs other escaping strategies.
-            static $htmlspecialcharsCharsets;
-
-            if (null === $htmlspecialcharsCharsets) {
-                if (defined('HHVM_VERSION')) {
-                    $htmlspecialcharsCharsets = array('utf-8' => true, 'UTF-8' => true);
-                } else {
-                    $htmlspecialcharsCharsets = array(
-                        'ISO-8859-1' => true, 'ISO8859-1' => true,
-                        'ISO-8859-15' => true, 'ISO8859-15' => true,
-                        'utf-8' => true, 'UTF-8' => true,
-                        'CP866' => true, 'IBM866' => true, '866' => true,
-                        'CP1251' => true, 'WINDOWS-1251' => true, 'WIN-1251' => true,
-                        '1251' => true,
-                        'CP1252' => true, 'WINDOWS-1252' => true, '1252' => true,
-                        'KOI8-R' => true, 'KOI8-RU' => true, 'KOI8R' => true,
-                        'BIG5' => true, '950' => true,
-                        'GB2312' => true, '936' => true,
-                        'BIG5-HKSCS' => true,
-                        'SHIFT_JIS' => true, 'SJIS' => true, '932' => true,
-                        'EUC-JP' => true, 'EUCJP' => true,
-                        'ISO8859-5' => true, 'ISO-8859-5' => true, 'MACROMAN' => true,
-                    );
-                }
-            }
-
-            if (isset($htmlspecialcharsCharsets[$charset])) {
-                return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-            }
-
-            if (isset($htmlspecialcharsCharsets[strtoupper($charset)])) {
-                // cache the lowercase variant for future iterations
-                $htmlspecialcharsCharsets[$charset] = true;
-
-                return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-            }
-
-            $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            $string = htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-
-            return twig_convert_encoding($string, $charset, 'UTF-8');
-
-        case 'js':
-            // escape all non-alphanumeric characters
-            // into their \xHH or \uHHHH representations
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', '_twig_escape_js_callback', $string);
-
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'css':
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9]#Su', '_twig_escape_css_callback', $string);
-
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'html_attr':
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9,\.\-_]#Su', '_twig_escape_html_attr_callback', $string);
-
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'url':
-            if (PHP_VERSION_ID < 50300) {
-                return str_replace('%7E', '~', rawurlencode($string));
-            }
-
-            return rawurlencode($string);
-
-        default:
-            static $escapers;
-
-            if (null === $escapers) {
-                $escapers = $env->getExtension('core')->getEscapers();
-            }
-
-            if (isset($escapers[$strategy])) {
-                return call_user_func($escapers[$strategy], $env, $string, $charset);
-            }
-
-            $validStrategies = implode(', ', array_merge(array('html', 'js', 'url', 'css', 'html_attr'), array_keys($escapers)));
-
-            throw new Twig_Error_Runtime(sprintf('Invalid escaping strategy "%s" (valid ones: %s).', $strategy, $validStrategies));
-    }
-}
-
-/**
- * @internal
- */
-function twig_escape_filter_is_safe(Twig_Node $filterArgs)
-{
-    foreach ($filterArgs as $arg) {
-        if ($arg instanceof Twig_Node_Expression_Constant) {
-            return array($arg->getAttribute('value'));
-        }
-
-        return array();
-    }
-
-    return array('html');
-}
-
-if (function_exists('mb_convert_encoding')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return mb_convert_encoding($string, $to, $from);
-    }
-} elseif (function_exists('iconv')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return iconv($from, $to, $string);
-    }
-} else {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
-    }
-}
-
-function _twig_escape_js_callback($matches)
-{
-    $char = $matches[0];
-
-    // \xHH
-    if (!isset($char[1])) {
-        return '\\x'.strtoupper(substr('00'.bin2hex($char), -2));
-    }
-
-    // \uHHHH
-    $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
-    return '\\u'.strtoupper(substr('0000'.bin2hex($char), -4));
-}
-
-function _twig_escape_css_callback($matches)
-{
-    $char = $matches[0];
-
-    // \xHH
-    if (!isset($char[1])) {
-        $hex = ltrim(strtoupper(bin2hex($char)), '0');
-        if (0 === strlen($hex)) {
-            $hex = '0';
-        }
-
-        return '\\'.$hex.' ';
-    }
-
-    // \uHHHH
-    $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
-    return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
-}
-
-/**
- * This function is adapted from code coming from Zend Framework.
- *
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-function _twig_escape_html_attr_callback($matches)
-{
-    /*
-     * While HTML supports far more named entities, the lowest common denominator
-     * has become HTML5's XML Serialisation which is restricted to the those named
-     * entities that XML supports. Using HTML entities would result in this error:
-     *     XML Parsing Error: undefined entity
-     */
-    static $entityMap = array(
-        34 => 'quot', /* quotation mark */
-        38 => 'amp',  /* ampersand */
-        60 => 'lt',   /* less-than sign */
-        62 => 'gt',   /* greater-than sign */
-    );
-
-    $chr = $matches[0];
-    $ord = ord($chr);
-
-    /*
-     * The following replaces characters undefined in HTML with the
-     * hex entity for the Unicode replacement character.
-     */
-    if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r") || ($ord >= 0x7f && $ord <= 0x9f)) {
-        return '&#xFFFD;';
-    }
-
-    /*
-     * Check if the current character to escape has a name entity we should
-     * replace it with while grabbing the hex value of the character.
-     */
-    if (strlen($chr) == 1) {
-        $hex = strtoupper(substr('00'.bin2hex($chr), -2));
-    } else {
-        $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
-        $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
-    }
-
-    $int = hexdec($hex);
-    if (array_key_exists($int, $entityMap)) {
-        return sprintf('&%s;', $entityMap[$int]);
-    }
-
-    /*
-     * Per OWASP recommendations, we'll use hex entities for any other
-     * characters where a named entity does not exist.
-     */
-    return sprintf('&#x%s;', $hex);
-}
-
-// add multibyte extensions if possible
-if (function_exists('mb_get_info')) {
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A variable
-     *
-     * @return int The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
-    }
-
-    /**
-     * Converts a string to uppercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The uppercased string
-     */
-    function twig_upper_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtoupper($string, $charset);
-        }
-
-        return strtoupper($string);
-    }
-
-    /**
-     * Converts a string to lowercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The lowercased string
-     */
-    function twig_lower_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtolower($string, $charset);
-        }
-
-        return strtolower($string);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_convert_case($string, MB_CASE_TITLE, $charset);
-        }
-
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== $charset = $env->getCharset()) {
-            return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
-        }
-
-        return ucfirst(strtolower($string));
-    }
-}
-// and byte fallback
-else {
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A variable
-     *
-     * @return int The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? strlen($thing) : count($thing);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        return ucfirst(strtolower($string));
-    }
-}
-
-/**
- * @internal
- */
-function twig_ensure_traversable($seq)
-{
-    if ($seq instanceof Traversable || is_array($seq)) {
-        return $seq;
-    }
-
-    return array();
-}
-
-/**
- * Checks if a variable is empty.
- *
- * <pre>
- * {# evaluates to true if the foo variable is null, false, or the empty string #}
- * {% if foo is empty %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A variable
- *
- * @return bool true if the value is empty, false otherwise
- */
-function twig_test_empty($value)
-{
-    if ($value instanceof Countable) {
-        return 0 == count($value);
-    }
-
-    return '' === $value || false === $value || null === $value || array() === $value;
-}
-
-/**
- * Checks if a variable is traversable.
- *
- * <pre>
- * {# evaluates to true if the foo variable is an array or a traversable object #}
- * {% if foo is traversable %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A variable
- *
- * @return bool true if the value is traversable
- */
-function twig_test_iterable($value)
-{
-    return $value instanceof Traversable || is_array($value);
-}
-
-/**
- * Renders a template.
- *
- * @param Twig_Environment $env
- * @param array            $context
- * @param string|array     $template      The template to render or an array of templates to try consecutively
- * @param array            $variables     The variables to pass to the template
- * @param bool             $withContext
- * @param bool             $ignoreMissing Whether to ignore missing templates or not
- * @param bool             $sandboxed     Whether to sandbox the template or not
- *
- * @return string The rendered template
- */
-function twig_include(Twig_Environment $env, $context, $template, $variables = array(), $withContext = true, $ignoreMissing = false, $sandboxed = false)
-{
-    $alreadySandboxed = false;
-    $sandbox = null;
-    if ($withContext) {
-        $variables = array_merge($context, $variables);
-    }
-
-    if ($isSandboxed = $sandboxed && $env->hasExtension('sandbox')) {
-        $sandbox = $env->getExtension('sandbox');
-        if (!$alreadySandboxed = $sandbox->isSandboxed()) {
-            $sandbox->enableSandbox();
-        }
-    }
-
-    $result = null;
-    try {
-        $result = $env->resolveTemplate($template)->render($variables);
-    } catch (Twig_Error_Loader $e) {
-        if (!$ignoreMissing) {
-            if ($isSandboxed && !$alreadySandboxed) {
-                $sandbox->disableSandbox();
-            }
-
-            throw $e;
-        }
-    }
-
-    if ($isSandboxed && !$alreadySandboxed) {
-        $sandbox->disableSandbox();
-    }
-
-    return $result;
-}
-
-/**
- * Returns a template content without rendering it.
- *
- * @param Twig_Environment $env
- * @param string           $name          The template name
- * @param bool             $ignoreMissing Whether to ignore missing templates or not
- *
- * @return string The template source
- */
-function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
-{
-    try {
-        return $env->getLoader()->getSource($name);
-    } catch (Twig_Error_Loader $e) {
-        if (!$ignoreMissing) {
-            throw $e;
-        }
-    }
-}
-
-/**
- * Provides the ability to get constants from instances as well as class/global constants.
- *
- * @param string      $constant The name of the constant
- * @param null|object $object   The object to get the constant from
- *
- * @return string
- */
-function twig_constant($constant, $object = null)
-{
-    if (null !== $object) {
-        $constant = get_class($object).'::'.$constant;
-    }
-
-    return constant($constant);
-}
-
-/**
- * Batches item.
- *
- * @param array $items An array of items
- * @param int   $size  The size of the batch
- * @param mixed $fill  A value used to fill missing items
- *
- * @return array
- */
-function twig_array_batch($items, $size, $fill = null)
-{
-    if ($items instanceof Traversable) {
-        $items = iterator_to_array($items, false);
-    }
-
-    $size = ceil($size);
-
-    $result = array_chunk($items, $size, true);
-
-    if (null !== $fill && !empty($result)) {
-        $last = count($result) - 1;
-        if ($fillCount = $size - count($result[$last])) {
-            $result[$last] = array_merge(
-                $result[$last],
-                array_fill(0, $fillCount, $fill)
-            );
-        }
-    }
-
-    return $result;
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Debug.php b/vendor/twig/twig/lib/Twig/Extension/Debug.php
deleted file mode 100644
index 42fdb1e..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Debug.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Debug extends Twig_Extension
-{
-    public function getFunctions()
-    {
-        // dump is safe if var_dump is overridden by xdebug
-        $isDumpOutputHtmlSafe = extension_loaded('xdebug')
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump'))
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
-            && (false === ini_get('html_errors') || ini_get('html_errors'))
-            || 'cli' === php_sapi_name()
-        ;
-
-        return array(
-            new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
-        );
-    }
-
-    public function getName()
-    {
-        return 'debug';
-    }
-}
-
-function twig_var_dump(Twig_Environment $env, $context)
-{
-    if (!$env->isDebug()) {
-        return;
-    }
-
-    ob_start();
-
-    $count = func_num_args();
-    if (2 === $count) {
-        $vars = array();
-        foreach ($context as $key => $value) {
-            if (!$value instanceof Twig_Template) {
-                $vars[$key] = $value;
-            }
-        }
-
-        var_dump($vars);
-    } else {
-        for ($i = 2; $i < $count; ++$i) {
-            var_dump(func_get_arg($i));
-        }
-    }
-
-    return ob_get_clean();
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
deleted file mode 100644
index 0e06693..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Escaper.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Escaper extends Twig_Extension
-{
-    protected $defaultStrategy;
-
-    /**
-     * Constructor.
-     *
-     * @param string|false|callable $defaultStrategy An escaping strategy
-     *
-     * @see setDefaultStrategy()
-     */
-    public function __construct($defaultStrategy = 'html')
-    {
-        $this->setDefaultStrategy($defaultStrategy);
-    }
-
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_AutoEscape());
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Escaper());
-    }
-
-    public function getFilters()
-    {
-        return array(
-            new Twig_SimpleFilter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
-        );
-    }
-
-    /**
-     * Sets the default strategy to use when not defined by the user.
-     *
-     * The strategy can be a valid PHP callback that takes the template
-     * "filename" as an argument and returns the strategy to use.
-     *
-     * @param string|false|callable $defaultStrategy An escaping strategy
-     */
-    public function setDefaultStrategy($defaultStrategy)
-    {
-        // for BC
-        if (true === $defaultStrategy) {
-            @trigger_error('Using "true" as the default strategy is deprecated. Use "html" instead.', E_USER_DEPRECATED);
-
-            $defaultStrategy = 'html';
-        }
-
-        if ('filename' === $defaultStrategy) {
-            $defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
-        }
-
-        $this->defaultStrategy = $defaultStrategy;
-    }
-
-    /**
-     * Gets the default strategy to use when not defined by the user.
-     *
-     * @param string $filename The template "filename"
-     *
-     * @return string|false The default strategy to use for the template
-     */
-    public function getDefaultStrategy($filename)
-    {
-        // disable string callables to avoid calling a function named html or js,
-        // or any other upcoming escaping strategy
-        if (!is_string($this->defaultStrategy) && false !== $this->defaultStrategy) {
-            return call_user_func($this->defaultStrategy, $filename);
-        }
-
-        return $this->defaultStrategy;
-    }
-
-    public function getName()
-    {
-        return 'escaper';
-    }
-}
-
-/**
- * Marks a variable as being safe.
- *
- * @param string $string A PHP variable
- *
- * @return string
- */
-function twig_raw_filter($string)
-{
-    return $string;
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php b/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
deleted file mode 100644
index 5370b8e..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/GlobalsInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Enables usage of the deprecated Twig_Extension::getGlobals() method.
- *
- * Explicitly implement this interface if you really need to implement the
- * deprecated getGlobals() method in your extensions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Extension_GlobalsInterface
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php b/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
deleted file mode 100644
index 7a07582..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/InitRuntimeInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Enables usage of the deprecated Twig_Extension::initRuntime() method.
- *
- * Explicitly implement this interface if you really need to implement the
- * deprecated initRuntime() method in your extensions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Extension_InitRuntimeInterface
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Optimizer.php b/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
deleted file mode 100644
index 5a64a1a..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Optimizer extends Twig_Extension
-{
-    protected $optimizers;
-
-    public function __construct($optimizers = -1)
-    {
-        $this->optimizers = $optimizers;
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
-    }
-
-    public function getName()
-    {
-        return 'optimizer';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Profiler.php b/vendor/twig/twig/lib/Twig/Extension/Profiler.php
deleted file mode 100644
index 4d9f97f..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Profiler.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Extension_Profiler extends Twig_Extension
-{
-    private $actives = array();
-
-    public function __construct(Twig_Profiler_Profile $profile)
-    {
-        $this->actives[] = $profile;
-    }
-
-    public function enter(Twig_Profiler_Profile $profile)
-    {
-        $this->actives[0]->addProfile($profile);
-        array_unshift($this->actives, $profile);
-    }
-
-    public function leave(Twig_Profiler_Profile $profile)
-    {
-        $profile->leave();
-        array_shift($this->actives);
-
-        if (1 === count($this->actives)) {
-            $this->actives[0]->leave();
-        }
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_Profiler_NodeVisitor_Profiler($this->getName()));
-    }
-
-    public function getName()
-    {
-        return 'profiler';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Sandbox.php b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
deleted file mode 100644
index 760d123..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_Sandbox extends Twig_Extension
-{
-    protected $sandboxedGlobally;
-    protected $sandboxed;
-    protected $policy;
-
-    public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandboxed = false)
-    {
-        $this->policy = $policy;
-        $this->sandboxedGlobally = $sandboxed;
-    }
-
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_Sandbox());
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Sandbox());
-    }
-
-    public function enableSandbox()
-    {
-        $this->sandboxed = true;
-    }
-
-    public function disableSandbox()
-    {
-        $this->sandboxed = false;
-    }
-
-    public function isSandboxed()
-    {
-        return $this->sandboxedGlobally || $this->sandboxed;
-    }
-
-    public function isSandboxedGlobally()
-    {
-        return $this->sandboxedGlobally;
-    }
-
-    public function setSecurityPolicy(Twig_Sandbox_SecurityPolicyInterface $policy)
-    {
-        $this->policy = $policy;
-    }
-
-    public function getSecurityPolicy()
-    {
-        return $this->policy;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkSecurity($tags, $filters, $functions);
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkMethodAllowed($obj, $method);
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkPropertyAllowed($obj, $method);
-        }
-    }
-
-    public function ensureToStringAllowed($obj)
-    {
-        if ($this->isSandboxed() && is_object($obj)) {
-            $this->policy->checkMethodAllowed($obj, '__toString');
-        }
-
-        return $obj;
-    }
-
-    public function getName()
-    {
-        return 'sandbox';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Staging.php b/vendor/twig/twig/lib/Twig/Extension/Staging.php
deleted file mode 100644
index d21004d..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/Staging.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Internal class.
- *
- * This class is used by Twig_Environment as a staging area and must not be used directly.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @internal
- */
-class Twig_Extension_Staging extends Twig_Extension
-{
-    protected $functions = array();
-    protected $filters = array();
-    protected $visitors = array();
-    protected $tokenParsers = array();
-    protected $globals = array();
-    protected $tests = array();
-
-    public function addFunction($name, $function)
-    {
-        $this->functions[$name] = $function;
-    }
-
-    public function getFunctions()
-    {
-        return $this->functions;
-    }
-
-    public function addFilter($name, $filter)
-    {
-        $this->filters[$name] = $filter;
-    }
-
-    public function getFilters()
-    {
-        return $this->filters;
-    }
-
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        $this->visitors[] = $visitor;
-    }
-
-    public function getNodeVisitors()
-    {
-        return $this->visitors;
-    }
-
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $this->tokenParsers[] = $parser;
-    }
-
-    public function getTokenParsers()
-    {
-        return $this->tokenParsers;
-    }
-
-    public function addGlobal($name, $value)
-    {
-        $this->globals[$name] = $value;
-    }
-
-    public function getGlobals()
-    {
-        return $this->globals;
-    }
-
-    public function addTest($name, $test)
-    {
-        $this->tests[$name] = $test;
-    }
-
-    public function getTests()
-    {
-        return $this->tests;
-    }
-
-    public function getName()
-    {
-        return 'staging';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
deleted file mode 100644
index 2a3ddb6..0000000
--- a/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Extension_StringLoader extends Twig_Extension
-{
-    public function getFunctions()
-    {
-        return array(
-            new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
-        );
-    }
-
-    public function getName()
-    {
-        return 'string_loader';
-    }
-}
-
-/**
- * Loads a template from a string.
- *
- * <pre>
- * {{ include(template_from_string("Hello {{ name }}")) }}
- * </pre>
- *
- * @param Twig_Environment $env      A Twig_Environment instance
- * @param string           $template A template as a string or object implementing __toString()
- *
- * @return Twig_Template A Twig_Template instance
- */
-function twig_template_from_string(Twig_Environment $env, $template)
-{
-    return $env->createTemplate((string) $template);
-}
diff --git a/vendor/twig/twig/lib/Twig/ExtensionInterface.php b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
deleted file mode 100644
index 5cf3f46..0000000
--- a/vendor/twig/twig/lib/Twig/ExtensionInterface.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by extension classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_ExtensionInterface
-{
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterace instead
-     */
-    public function initRuntime(Twig_Environment $environment);
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return Twig_TokenParserInterface[]
-     */
-    public function getTokenParsers();
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors();
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return Twig_SimpleFilter[]
-     */
-    public function getFilters();
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return Twig_SimpleTest[]
-     */
-    public function getTests();
-
-    /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return Twig_SimpleFunction[]
-     */
-    public function getFunctions();
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    public function getOperators();
-
-    /**
-     * Returns a list of global variables to add to the existing list.
-     *
-     * @return array An array of global variables
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
-     */
-    public function getGlobals();
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName();
-}
diff --git a/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php b/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
deleted file mode 100644
index 9bda0b4..0000000
--- a/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default autoescaping strategy based on file names.
- *
- * This strategy sets the HTML as the default autoescaping strategy,
- * but changes it based on the filename.
- *
- * Note that there is no runtime performance impact as the
- * default autoescaping strategy is set at compilation time.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_FileExtensionEscapingStrategy
-{
-    /**
-     * Guesses the best autoescaping strategy based on the file name.
-     *
-     * @param string $filename The template file name
-     *
-     * @return string|false The escaping strategy name to use or false to disable
-     */
-    public static function guess($filename)
-    {
-        if (in_array(substr($filename, -1), array('/', '\\'))) {
-            return 'html'; // return html for directories
-        }
-
-        if ('.twig' === substr($filename, -5)) {
-            $filename = substr($filename, 0, -5);
-        }
-
-        $extension = pathinfo($filename, PATHINFO_EXTENSION);
-
-        switch ($extension) {
-            case 'js':
-                return 'js';
-
-            case 'css':
-                return 'css';
-
-            case 'txt':
-                return false;
-
-            default:
-                return 'html';
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter.php b/vendor/twig/twig/lib/Twig/Filter.php
deleted file mode 100644
index 101d2e7..0000000
--- a/vendor/twig/twig/lib/Twig/Filter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'pre_escape' => null,
-            'preserves_safety' => null,
-            'callable' => null,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-    }
-
-    public function getPreservesSafety()
-    {
-        return $this->options['preserves_safety'];
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Function.php b/vendor/twig/twig/lib/Twig/Filter/Function.php
deleted file mode 100644
index d679cab..0000000
--- a/vendor/twig/twig/lib/Twig/Filter/Function.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Function extends Twig_Filter
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Method.php b/vendor/twig/twig/lib/Twig/Filter/Method.php
deleted file mode 100644
index 655aab4..0000000
--- a/vendor/twig/twig/lib/Twig/Filter/Method.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Method extends Twig_Filter
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Filter/Node.php b/vendor/twig/twig/lib/Twig/Filter/Node.php
deleted file mode 100644
index a922f50..0000000
--- a/vendor/twig/twig/lib/Twig/Filter/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Filter_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template filter as a node.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Node extends Twig_Filter
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
deleted file mode 100644
index 5679861..0000000
--- a/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterCallableInterface
-{
-    public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/FilterInterface.php b/vendor/twig/twig/lib/Twig/FilterInterface.php
deleted file mode 100644
index 6b0be0e..0000000
--- a/vendor/twig/twig/lib/Twig/FilterInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterInterface
-{
-    /**
-     * Compiles a filter.
-     *
-     * @return string The PHP code for the filter
-     */
-    public function compile();
-
-    public function needsEnvironment();
-
-    public function needsContext();
-
-    public function getSafe(Twig_Node $filterArgs);
-
-    public function getPreservesSafety();
-
-    public function getPreEscape();
-
-    public function setArguments($arguments);
-
-    public function getArguments();
-}
diff --git a/vendor/twig/twig/lib/Twig/Function.php b/vendor/twig/twig/lib/Twig/Function.php
deleted file mode 100644
index 9fc76a8..0000000
--- a/vendor/twig/twig/lib/Twig/Function.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'callable' => null,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Function/Function.php b/vendor/twig/twig/lib/Twig/Function/Function.php
deleted file mode 100644
index ae83e15..0000000
--- a/vendor/twig/twig/lib/Twig/Function/Function.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Function extends Twig_Function
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Function/Method.php b/vendor/twig/twig/lib/Twig/Function/Method.php
deleted file mode 100644
index ba9945e..0000000
--- a/vendor/twig/twig/lib/Twig/Function/Method.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Method extends Twig_Function
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Function/Node.php b/vendor/twig/twig/lib/Twig/Function/Node.php
deleted file mode 100644
index 118b0ba..0000000
--- a/vendor/twig/twig/lib/Twig/Function/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template function as a node.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Node extends Twig_Function
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
deleted file mode 100644
index 87d795e..0000000
--- a/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionCallableInterface
-{
-    public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/FunctionInterface.php b/vendor/twig/twig/lib/Twig/FunctionInterface.php
deleted file mode 100644
index f449234..0000000
--- a/vendor/twig/twig/lib/Twig/FunctionInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionInterface
-{
-    /**
-     * Compiles a function.
-     *
-     * @return string The PHP code for the function
-     */
-    public function compile();
-
-    public function needsEnvironment();
-
-    public function needsContext();
-
-    public function getSafe(Twig_Node $filterArgs);
-
-    public function setArguments($arguments);
-
-    public function getArguments();
-}
diff --git a/vendor/twig/twig/lib/Twig/Lexer.php b/vendor/twig/twig/lib/Twig/Lexer.php
deleted file mode 100644
index 575b4f3..0000000
--- a/vendor/twig/twig/lib/Twig/Lexer.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Lexes a template string.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Lexer implements Twig_LexerInterface
-{
-    protected $tokens;
-    protected $code;
-    protected $cursor;
-    protected $lineno;
-    protected $end;
-    protected $state;
-    protected $states;
-    protected $brackets;
-    protected $env;
-    protected $filename;
-    protected $options;
-    protected $regexes;
-    protected $position;
-    protected $positions;
-    protected $currentVarBlockLine;
-
-    const STATE_DATA = 0;
-    const STATE_BLOCK = 1;
-    const STATE_VAR = 2;
-    const STATE_STRING = 3;
-    const STATE_INTERPOLATION = 4;
-
-    const REGEX_NAME = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
-    const REGEX_STRING = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
-    const REGEX_DQ_STRING_DELIM = '/"/A';
-    const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
-    const PUNCTUATION = '()[]{}?:.,|';
-
-    public function __construct(Twig_Environment $env, array $options = array())
-    {
-        $this->env = $env;
-
-        $this->options = array_merge(array(
-            'tag_comment' => array('{#', '#}'),
-            'tag_block' => array('{%', '%}'),
-            'tag_variable' => array('{{', '}}'),
-            'whitespace_trim' => '-',
-            'interpolation' => array('#{', '}'),
-        ), $options);
-
-        $this->regexes = array(
-            'lex_var' => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
-            'lex_block' => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
-            'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:end%s)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
-            'operator' => $this->getOperatorRegex(),
-            'lex_comment' => '/(?:'.preg_quote($this->options['whitespace_trim'], '/').preg_quote($this->options['tag_comment'][1], '/').'\s*|'.preg_quote($this->options['tag_comment'][1], '/').')\n?/s',
-            'lex_block_raw' => '/\s*(raw|verbatim)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
-            'lex_block_line' => '/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As',
-            'lex_tokens_start' => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
-            'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
-            'interpolation_end' => '/\s*'.preg_quote($this->options['interpolation'][1], '/').'/A',
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function tokenize($code, $filename = null)
-    {
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);
-        $this->filename = $filename;
-        $this->cursor = 0;
-        $this->lineno = 1;
-        $this->end = strlen($this->code);
-        $this->tokens = array();
-        $this->state = self::STATE_DATA;
-        $this->states = array();
-        $this->brackets = array();
-        $this->position = -1;
-
-        // find all token starts in one go
-        preg_match_all($this->regexes['lex_tokens_start'], $this->code, $matches, PREG_OFFSET_CAPTURE);
-        $this->positions = $matches;
-
-        while ($this->cursor < $this->end) {
-            // dispatch to the lexing functions depending
-            // on the current state
-            switch ($this->state) {
-                case self::STATE_DATA:
-                    $this->lexData();
-                    break;
-
-                case self::STATE_BLOCK:
-                    $this->lexBlock();
-                    break;
-
-                case self::STATE_VAR:
-                    $this->lexVar();
-                    break;
-
-                case self::STATE_STRING:
-                    $this->lexString();
-                    break;
-
-                case self::STATE_INTERPOLATION:
-                    $this->lexInterpolation();
-                    break;
-            }
-        }
-
-        $this->pushToken(Twig_Token::EOF_TYPE);
-
-        if (!empty($this->brackets)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
-        }
-
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return new Twig_TokenStream($this->tokens, $this->filename);
-    }
-
-    protected function lexData()
-    {
-        // if no matches are left we return the rest of the template as simple text token
-        if ($this->position == count($this->positions[0]) - 1) {
-            $this->pushToken(Twig_Token::TEXT_TYPE, substr($this->code, $this->cursor));
-            $this->cursor = $this->end;
-
-            return;
-        }
-
-        // Find the first token after the current cursor
-        $position = $this->positions[0][++$this->position];
-        while ($position[1] < $this->cursor) {
-            if ($this->position == count($this->positions[0]) - 1) {
-                return;
-            }
-            $position = $this->positions[0][++$this->position];
-        }
-
-        // push the template text first
-        $text = $textContent = substr($this->code, $this->cursor, $position[1] - $this->cursor);
-        if (isset($this->positions[2][$this->position][0])) {
-            $text = rtrim($text);
-        }
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-        $this->moveCursor($textContent.$position[0]);
-
-        switch ($this->positions[1][$this->position][0]) {
-            case $this->options['tag_comment'][0]:
-                $this->lexComment();
-                break;
-
-            case $this->options['tag_block'][0]:
-                // raw data?
-                if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lexRawData($match[1]);
-                // {% line \d+ %}
-                } elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lineno = (int) $match[1];
-                } else {
-                    $this->pushToken(Twig_Token::BLOCK_START_TYPE);
-                    $this->pushState(self::STATE_BLOCK);
-                    $this->currentVarBlockLine = $this->lineno;
-                }
-                break;
-
-            case $this->options['tag_variable'][0]:
-                $this->pushToken(Twig_Token::VAR_START_TYPE);
-                $this->pushState(self::STATE_VAR);
-                $this->currentVarBlockLine = $this->lineno;
-                break;
-        }
-    }
-
-    protected function lexBlock()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::BLOCK_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexVar()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::VAR_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexExpression()
-    {
-        // whitespace
-        if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
-            $this->moveCursor($match[0]);
-
-            if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
-            }
-        }
-
-        // operators
-        if (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::OPERATOR_TYPE, preg_replace('/\s+/', ' ', $match[0]));
-            $this->moveCursor($match[0]);
-        }
-        // names
-        elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::NAME_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // numbers
-        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
-            $number = (float) $match[0];  // floats
-            if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
-                $number = (int) $match[0]; // integers lower than the maximum
-            }
-            $this->pushToken(Twig_Token::NUMBER_TYPE, $number);
-            $this->moveCursor($match[0]);
-        }
-        // punctuation
-        elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
-            // opening bracket
-            if (false !== strpos('([{', $this->code[$this->cursor])) {
-                $this->brackets[] = array($this->code[$this->cursor], $this->lineno);
-            }
-            // closing bracket
-            elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
-                if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
-                }
-
-                list($expect, $lineno) = array_pop($this->brackets);
-                if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
-                }
-            }
-
-            $this->pushToken(Twig_Token::PUNCTUATION_TYPE, $this->code[$this->cursor]);
-            ++$this->cursor;
-        }
-        // strings
-        elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)));
-            $this->moveCursor($match[0]);
-        }
-        // opening double quoted string
-        elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array('"', $this->lineno);
-            $this->pushState(self::STATE_STRING);
-            $this->moveCursor($match[0]);
-        }
-        // unlexable
-        else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->filename);
-        }
-    }
-
-    protected function lexRawData($tag)
-    {
-        if ('raw' === $tag) {
-            @trigger_error(sprintf('Twig Tag "raw" is deprecated. Use "verbatim" instead in %s at line %d.', $this->filename, $this->lineno), E_USER_DEPRECATED);
-        }
-
-        if (!preg_match(str_replace('%s', $tag, $this->regexes['lex_raw_data']), $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->filename);
-        }
-
-        $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
-        $this->moveCursor($text.$match[0][0]);
-
-        if (false !== strpos($match[1][0], $this->options['whitespace_trim'])) {
-            $text = rtrim($text);
-        }
-
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-    }
-
-    protected function lexComment()
-    {
-        if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->filename);
-        }
-
-        $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
-    }
-
-    protected function lexString()
-    {
-        if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array($this->options['interpolation'][0], $this->lineno);
-            $this->pushToken(Twig_Token::INTERPOLATION_START_TYPE);
-            $this->moveCursor($match[0]);
-            $this->pushState(self::STATE_INTERPOLATION);
-        } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor) && strlen($match[0]) > 0) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[0]));
-            $this->moveCursor($match[0]);
-        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            if ($this->code[$this->cursor] != '"') {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->filename);
-            }
-
-            $this->popState();
-            ++$this->cursor;
-        }
-    }
-
-    protected function lexInterpolation()
-    {
-        $bracket = end($this->brackets);
-        if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, null, $this->cursor)) {
-            array_pop($this->brackets);
-            $this->pushToken(Twig_Token::INTERPOLATION_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function pushToken($type, $value = '')
-    {
-        // do not push empty text tokens
-        if (Twig_Token::TEXT_TYPE === $type && '' === $value) {
-            return;
-        }
-
-        $this->tokens[] = new Twig_Token($type, $value, $this->lineno);
-    }
-
-    protected function moveCursor($text)
-    {
-        $this->cursor += strlen($text);
-        $this->lineno += substr_count($text, "\n");
-    }
-
-    protected function getOperatorRegex()
-    {
-        $operators = array_merge(
-            array('='),
-            array_keys($this->env->getUnaryOperators()),
-            array_keys($this->env->getBinaryOperators())
-        );
-
-        $operators = array_combine($operators, array_map('strlen', $operators));
-        arsort($operators);
-
-        $regex = array();
-        foreach ($operators as $operator => $length) {
-            // an operator that ends with a character must be followed by
-            // a whitespace or a parenthesis
-            if (ctype_alpha($operator[$length - 1])) {
-                $r = preg_quote($operator, '/').'(?=[\s()])';
-            } else {
-                $r = preg_quote($operator, '/');
-            }
-
-            // an operator with a space can be any amount of whitespaces
-            $r = preg_replace('/\s+/', '\s+', $r);
-
-            $regex[] = $r;
-        }
-
-        return '/'.implode('|', $regex).'/A';
-    }
-
-    protected function pushState($state)
-    {
-        $this->states[] = $this->state;
-        $this->state = $state;
-    }
-
-    protected function popState()
-    {
-        if (0 === count($this->states)) {
-            throw new Exception('Cannot pop state without a previous state');
-        }
-
-        $this->state = array_pop($this->states);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/LexerInterface.php b/vendor/twig/twig/lib/Twig/LexerInterface.php
deleted file mode 100644
index 24a9478..0000000
--- a/vendor/twig/twig/lib/Twig/LexerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by lexer classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_LexerInterface
-{
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string $code     The source code
-     * @param string $filename A unique identifier for the source code
-     *
-     * @return Twig_TokenStream A token stream instance
-     *
-     * @throws Twig_Error_Syntax When the code is syntactically wrong
-     */
-    public function tokenize($code, $filename = null);
-}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Array.php b/vendor/twig/twig/lib/Twig/Loader/Array.php
deleted file mode 100644
index 90221d5..0000000
--- a/vendor/twig/twig/lib/Twig/Loader/Array.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads a template from an array.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * This loader should only be used for unit testing.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
-{
-    protected $templates = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array $templates An array of templates (keys are the names, and values are the source code)
-     */
-    public function __construct(array $templates)
-    {
-        $this->templates = $templates;
-    }
-
-    /**
-     * Adds or overrides a template.
-     *
-     * @param string $name     The template name
-     * @param string $template The template source
-     */
-    public function setTemplate($name, $template)
-    {
-        $this->templates[(string) $name] = $template;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSource($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exists($name)
-    {
-        return isset($this->templates[(string) $name]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheKey($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($name, $time)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return true;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Chain.php b/vendor/twig/twig/lib/Twig/Loader/Chain.php
deleted file mode 100644
index 81d57ad..0000000
--- a/vendor/twig/twig/lib/Twig/Loader/Chain.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads templates from other loaders.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
-{
-    private $hasSourceCache = array();
-    protected $loaders = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_LoaderInterface[] $loaders An array of loader instances
-     */
-    public function __construct(array $loaders = array())
-    {
-        foreach ($loaders as $loader) {
-            $this->addLoader($loader);
-        }
-    }
-
-    /**
-     * Adds a loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Loader instance
-     */
-    public function addLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loaders[] = $loader;
-        $this->hasSourceCache = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSource($name)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->getSource($name);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = $e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exists($name)
-    {
-        $name = (string) $name;
-
-        if (isset($this->hasSourceCache[$name])) {
-            return $this->hasSourceCache[$name];
-        }
-
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface) {
-                if ($loader->exists($name)) {
-                    return $this->hasSourceCache[$name] = true;
-                }
-
-                continue;
-            }
-
-            try {
-                $loader->getSource($name);
-
-                return $this->hasSourceCache[$name] = true;
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        return $this->hasSourceCache[$name] = false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheKey($name)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->getCacheKey($name);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = get_class($loader).': '.$e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($name, $time)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->isFresh($name, $time);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = get_class($loader).': '.$e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
deleted file mode 100644
index 1bc75a1..0000000
--- a/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads template from the filesystem.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
-{
-    /** Identifier of the main namespace. */
-    const MAIN_NAMESPACE = '__main__';
-
-    protected $paths = array();
-    protected $cache = array();
-    protected $errorCache = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
-     */
-    public function __construct($paths = array())
-    {
-        if ($paths) {
-            $this->setPaths($paths);
-        }
-    }
-
-    /**
-     * Returns the paths to the templates.
-     *
-     * @param string $namespace A path namespace
-     *
-     * @return array The array of paths where to look for templates
-     */
-    public function getPaths($namespace = self::MAIN_NAMESPACE)
-    {
-        return isset($this->paths[$namespace]) ? $this->paths[$namespace] : array();
-    }
-
-    /**
-     * Returns the path namespaces.
-     *
-     * The main namespace is always defined.
-     *
-     * @return array The array of defined namespaces
-     */
-    public function getNamespaces()
-    {
-        return array_keys($this->paths);
-    }
-
-    /**
-     * Sets the paths where templates are stored.
-     *
-     * @param string|array $paths     A path or an array of paths where to look for templates
-     * @param string       $namespace A path namespace
-     */
-    public function setPaths($paths, $namespace = self::MAIN_NAMESPACE)
-    {
-        if (!is_array($paths)) {
-            $paths = array($paths);
-        }
-
-        $this->paths[$namespace] = array();
-        foreach ($paths as $path) {
-            $this->addPath($path, $namespace);
-        }
-    }
-
-    /**
-     * Adds a path where templates are stored.
-     *
-     * @param string $path      A path where to look for templates
-     * @param string $namespace A path name
-     *
-     * @throws Twig_Error_Loader
-     */
-    public function addPath($path, $namespace = self::MAIN_NAMESPACE)
-    {
-        // invalidate the cache
-        $this->cache = $this->errorCache = array();
-
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
-        }
-
-        $this->paths[$namespace][] = rtrim($path, '/\\');
-    }
-
-    /**
-     * Prepends a path where templates are stored.
-     *
-     * @param string $path      A path where to look for templates
-     * @param string $namespace A path name
-     *
-     * @throws Twig_Error_Loader
-     */
-    public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
-    {
-        // invalidate the cache
-        $this->cache = $this->errorCache = array();
-
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
-        }
-
-        $path = rtrim($path, '/\\');
-
-        if (!isset($this->paths[$namespace])) {
-            $this->paths[$namespace][] = $path;
-        } else {
-            array_unshift($this->paths[$namespace], $path);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSource($name)
-    {
-        return file_get_contents($this->findTemplate($name));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheKey($name)
-    {
-        return $this->findTemplate($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exists($name)
-    {
-        $name = $this->normalizeName($name);
-
-        if (isset($this->cache[$name])) {
-            return true;
-        }
-
-        try {
-            return false !== $this->findTemplate($name, false);
-        } catch (Twig_Error_Loader $exception) {
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($name, $time)
-    {
-        return filemtime($this->findTemplate($name)) <= $time;
-    }
-
-    protected function findTemplate($name)
-    {
-        $throw = func_num_args() > 1 ? func_get_arg(1) : true;
-        $name = $this->normalizeName($name);
-
-        if (isset($this->cache[$name])) {
-            return $this->cache[$name];
-        }
-
-        if (isset($this->errorCache[$name])) {
-            if (!$throw) {
-                return false;
-            }
-
-            throw new Twig_Error_Loader($this->errorCache[$name]);
-        }
-
-        $this->validateName($name);
-
-        list($namespace, $shortname) = $this->parseName($name);
-
-        if (!isset($this->paths[$namespace])) {
-            $this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
-
-            if (!$throw) {
-                return false;
-            }
-
-            throw new Twig_Error_Loader($this->errorCache[$name]);
-        }
-
-        foreach ($this->paths[$namespace] as $path) {
-            if (is_file($path.'/'.$shortname)) {
-                if (false !== $realpath = realpath($path.'/'.$shortname)) {
-                    return $this->cache[$name] = $realpath;
-                }
-
-                return $this->cache[$name] = $path.'/'.$shortname;
-            }
-        }
-
-        $this->errorCache[$name] = sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]));
-
-        if (!$throw) {
-            return false;
-        }
-
-        throw new Twig_Error_Loader($this->errorCache[$name]);
-    }
-
-    protected function parseName($name, $default = self::MAIN_NAMESPACE)
-    {
-        if (isset($name[0]) && '@' == $name[0]) {
-            if (false === $pos = strpos($name, '/')) {
-                throw new Twig_Error_Loader(sprintf('Malformed namespaced template name "%s" (expecting "@namespace/template_name").', $name));
-            }
-
-            $namespace = substr($name, 1, $pos - 1);
-            $shortname = substr($name, $pos + 1);
-
-            return array($namespace, $shortname);
-        }
-
-        return array($default, $name);
-    }
-
-    protected function normalizeName($name)
-    {
-        return preg_replace('#/{2,}#', '/', str_replace('\\', '/', (string) $name));
-    }
-
-    protected function validateName($name)
-    {
-        if (false !== strpos($name, "\0")) {
-            throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
-        }
-
-        $name = ltrim($name, '/');
-        $parts = explode('/', $name);
-        $level = 0;
-        foreach ($parts as $part) {
-            if ('..' === $part) {
-                --$level;
-            } elseif ('.' !== $part) {
-                ++$level;
-            }
-
-            if ($level < 0) {
-                throw new Twig_Error_Loader(sprintf('Looks like you try to load a template outside configured directories (%s).', $name));
-            }
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Loader/String.php b/vendor/twig/twig/lib/Twig/Loader/String.php
deleted file mode 100644
index 00f507a..0000000
--- a/vendor/twig/twig/lib/Twig/Loader/String.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Loader_String class is deprecated since version 1.18.1 and will be removed in 2.0. Use Twig_Loader_Array instead or Twig_Environment::createTemplate().', E_USER_DEPRECATED);
-
-/**
- * Loads a template from a string.
- *
- * This loader should NEVER be used. It only exists for Twig internal purposes.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @deprecated since 1.18.1 (to be removed in 2.0)
- *
- * @internal
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getSource($name)
-    {
-        return $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function exists($name)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheKey($name)
-    {
-        return $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($name, $time)
-    {
-        return true;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/LoaderInterface.php b/vendor/twig/twig/lib/Twig/LoaderInterface.php
deleted file mode 100644
index 544ea4e..0000000
--- a/vendor/twig/twig/lib/Twig/LoaderInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface all loaders must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param string $name The name of the template to load
-     *
-     * @return string The template source code
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function getSource($name);
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param string $name The name of the template to load
-     *
-     * @return string The cache key
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function getCacheKey($name);
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string $name The template name
-     * @param int    $time Timestamp of the last modification time of the
-     *                     cached template
-     *
-     * @return bool true if the template is fresh, false otherwise
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function isFresh($name, $time);
-}
diff --git a/vendor/twig/twig/lib/Twig/Markup.php b/vendor/twig/twig/lib/Twig/Markup.php
deleted file mode 100644
index 69871fc..0000000
--- a/vendor/twig/twig/lib/Twig/Markup.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a content as safe.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Markup implements Countable
-{
-    protected $content;
-    protected $charset;
-
-    public function __construct($content, $charset)
-    {
-        $this->content = (string) $content;
-        $this->charset = $charset;
-    }
-
-    public function __toString()
-    {
-        return $this->content;
-    }
-
-    public function count()
-    {
-        return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node.php b/vendor/twig/twig/lib/Twig/Node.php
deleted file mode 100644
index 45a8976..0000000
--- a/vendor/twig/twig/lib/Twig/Node.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node implements Twig_NodeInterface
-{
-    protected $nodes;
-    protected $attributes;
-    protected $lineno;
-    protected $tag;
-
-    /**
-     * Constructor.
-     *
-     * The nodes are automatically made available as properties ($this->node).
-     * The attributes are automatically made available as array items ($this['name']).
-     *
-     * @param array  $nodes      An array of named nodes
-     * @param array  $attributes An array of attributes (should not be nodes)
-     * @param int    $lineno     The line number
-     * @param string $tag        The tag name associated with the Node
-     */
-    public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
-    {
-        $this->nodes = $nodes;
-        $this->attributes = $attributes;
-        $this->lineno = $lineno;
-        $this->tag = $tag;
-    }
-
-    public function __toString()
-    {
-        $attributes = array();
-        foreach ($this->attributes as $name => $value) {
-            $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
-        }
-
-        $repr = array(get_class($this).'('.implode(', ', $attributes));
-
-        if (count($this->nodes)) {
-            foreach ($this->nodes as $name => $node) {
-                $len = strlen($name) + 4;
-                $noderepr = array();
-                foreach (explode("\n", (string) $node) as $line) {
-                    $noderepr[] = str_repeat(' ', $len).$line;
-                }
-
-                $repr[] = sprintf('  %s: %s', $name, ltrim(implode("\n", $noderepr)));
-            }
-
-            $repr[] = ')';
-        } else {
-            $repr[0] .= ')';
-        }
-
-        return implode("\n", $repr);
-    }
-
-    /**
-     * @deprecated since 1.16.1 (to be removed in 2.0)
-     */
-    public function toXml($asDom = false)
-    {
-        @trigger_error(sprintf('%s is deprecated.', __METHOD__), E_USER_DEPRECATED);
-
-        $dom = new DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($xml = $dom->createElement('twig'));
-
-        $xml->appendChild($node = $dom->createElement('node'));
-        $node->setAttribute('class', get_class($this));
-
-        foreach ($this->attributes as $name => $value) {
-            $node->appendChild($attribute = $dom->createElement('attribute'));
-            $attribute->setAttribute('name', $name);
-            $attribute->appendChild($dom->createTextNode($value));
-        }
-
-        foreach ($this->nodes as $name => $n) {
-            if (null === $n) {
-                continue;
-            }
-
-            $child = $n->toXml(true)->getElementsByTagName('node')->item(0);
-            $child = $dom->importNode($child, true);
-            $child->setAttribute('name', $name);
-
-            $node->appendChild($child);
-        }
-
-        return $asDom ? $dom : $dom->saveXML();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        foreach ($this->nodes as $node) {
-            $node->compile($compiler);
-        }
-    }
-
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    public function getNodeTag()
-    {
-        return $this->tag;
-    }
-
-    /**
-     * Returns true if the attribute is defined.
-     *
-     * @param string $name The attribute name
-     *
-     * @return bool true if the attribute is defined, false otherwise
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * Gets an attribute value by name.
-     *
-     * @param string $name
-     *
-     * @return mixed
-     */
-    public function getAttribute($name)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            throw new LogicException(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * Sets an attribute by name to a value.
-     *
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Removes an attribute by name.
-     *
-     * @param string $name
-     */
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
-    /**
-     * Returns true if the node with the given name exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasNode($name)
-    {
-        return array_key_exists($name, $this->nodes);
-    }
-
-    /**
-     * Gets a node by name.
-     *
-     * @param string $name
-     *
-     * @return Twig_Node
-     */
-    public function getNode($name)
-    {
-        if (!array_key_exists($name, $this->nodes)) {
-            throw new LogicException(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->nodes[$name];
-    }
-
-    /**
-     * Sets a node.
-     *
-     * @param string    $name
-     * @param Twig_Node $node
-     */
-    public function setNode($name, $node = null)
-    {
-        $this->nodes[$name] = $node;
-    }
-
-    /**
-     * Removes a node by name.
-     *
-     * @param string $name
-     */
-    public function removeNode($name)
-    {
-        unset($this->nodes[$name]);
-    }
-
-    public function count()
-    {
-        return count($this->nodes);
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->nodes);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/AutoEscape.php b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
deleted file mode 100644
index 47cc998..0000000
--- a/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an autoescape node.
- *
- * The value is the escaping strategy (can be html, js, ...)
- *
- * The true value is equivalent to html.
- *
- * If autoescaping is disabled, then the value is false.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_AutoEscape extends Twig_Node
-{
-    public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
-    {
-        parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('body'));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Block.php b/vendor/twig/twig/lib/Twig/Node/Block.php
deleted file mode 100644
index a05af6f..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Block.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Block extends Twig_Node
-{
-    public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("public function block_%s(\$context, array \$blocks = array())\n", $this->getAttribute('name')), "{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
deleted file mode 100644
index 9cd1551..0000000
--- a/vendor/twig/twig/lib/Twig/Node/BlockReference.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("\$this->displayBlock('%s', \$context, \$blocks);\n", $this->getAttribute('name')))
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Body.php b/vendor/twig/twig/lib/Twig/Node/Body.php
deleted file mode 100644
index 3ffb134..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Body.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a body node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Body extends Twig_Node
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php b/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
deleted file mode 100644
index b4a436a..0000000
--- a/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_CheckSecurity extends Twig_Node
-{
-    protected $usedFilters;
-    protected $usedTags;
-    protected $usedFunctions;
-
-    public function __construct(array $usedFilters, array $usedTags, array $usedFunctions)
-    {
-        $this->usedFilters = $usedFilters;
-        $this->usedTags = $usedTags;
-        $this->usedFunctions = $usedFunctions;
-
-        parent::__construct();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $tags = $filters = $functions = array();
-        foreach (array('tags', 'filters', 'functions') as $type) {
-            foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
-                if ($node instanceof Twig_Node) {
-                    ${$type}[$name] = $node->getLine();
-                } else {
-                    ${$type}[$node] = null;
-                }
-            }
-        }
-
-        $compiler
-            ->write('$tags = ')->repr(array_filter($tags))->raw(";\n")
-            ->write('$filters = ')->repr(array_filter($filters))->raw(";\n")
-            ->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
-            ->write("try {\n")
-            ->indent()
-            ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
-            ->indent()
-            ->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
-            ->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
-            ->write(!$functions ? "array()\n" : "array('".implode("', '", array_keys($functions))."')\n")
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->write("} catch (Twig_Sandbox_SecurityError \$e) {\n")
-            ->indent()
-            ->write("\$e->setTemplateFile(\$this->getTemplateName());\n\n")
-            ->write("if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$tags[\$e->getTagName()]);\n")
-            ->outdent()
-            ->write("} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFilterError && isset(\$filters[\$e->getFilterName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$filters[\$e->getFilterName()]);\n")
-            ->outdent()
-            ->write("} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFunctionError && isset(\$functions[\$e->getFunctionName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$functions[\$e->getFunctionName()]);\n")
-            ->outdent()
-            ->write("}\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Do.php b/vendor/twig/twig/lib/Twig/Node/Do.php
deleted file mode 100644
index 14fb84e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Do.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a do node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Do extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Embed.php b/vendor/twig/twig/lib/Twig/Node/Embed.php
deleted file mode 100644
index a213040..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Embed.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an embed node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Embed extends Twig_Node_Include
-{
-    // we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
-    public function __construct($filename, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
-
-        $this->setAttribute('filename', $filename);
-        $this->setAttribute('index', $index);
-    }
-
-    protected function addGetTemplate(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write('$this->loadTemplate(')
-            ->string($this->getAttribute('filename'))
-            ->raw(', ')
-            ->repr($compiler->getFilename())
-            ->raw(', ')
-            ->repr($this->getLine())
-            ->raw(', ')
-            ->string($this->getAttribute('index'))
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression.php b/vendor/twig/twig/lib/Twig/Node/Expression.php
deleted file mode 100644
index a7382e7..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Abstract class for all nodes that represents an expression.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Node_Expression extends Twig_Node
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Array.php b/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
deleted file mode 100644
index 83e583b..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Array extends Twig_Node_Expression
-{
-    protected $index;
-
-    public function __construct(array $elements, $lineno)
-    {
-        parent::__construct($elements, array(), $lineno);
-
-        $this->index = -1;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if ($pair['key'] instanceof Twig_Node_Expression_Constant && ctype_digit((string) $pair['key']->getAttribute('value')) && $pair['key']->getAttribute('value') > $this->index) {
-                $this->index = $pair['key']->getAttribute('value');
-            }
-        }
-    }
-
-    public function getKeyValuePairs()
-    {
-        $pairs = array();
-
-        foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = array(
-                'key' => $pair[0],
-                'value' => $pair[1],
-            );
-        }
-
-        return $pairs;
-    }
-
-    public function hasElement(Twig_Node_Expression $key)
-    {
-        foreach ($this->getKeyValuePairs() as $pair) {
-            // we compare the string representation of the keys
-            // to avoid comparing the line numbers which are not relevant here.
-            if ((string) $key == (string) $pair['key']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $key = null)
-    {
-        if (null === $key) {
-            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getLine());
-        }
-
-        array_push($this->nodes, $key, $value);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('array(');
-        $first = true;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler
-                ->subcompile($pair['key'])
-                ->raw(' => ')
-                ->subcompile($pair['value'])
-            ;
-        }
-        $compiler->raw(')');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php b/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
deleted file mode 100644
index ce0c5fb..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('$context[')
-            ->string($this->getAttribute('name'))
-            ->raw(']')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
deleted file mode 100644
index c821db5..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
-    {
-        parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('left'))
-            ->raw(' ')
-        ;
-        $this->operator($compiler);
-        $compiler
-            ->raw(' ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
deleted file mode 100644
index 0ef8e11..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('+');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
deleted file mode 100644
index d5752eb..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&&');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
deleted file mode 100644
index 9a46d84..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
deleted file mode 100644
index 058a20b..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('|');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
deleted file mode 100644
index f4da73d..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('^');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
deleted file mode 100644
index f9a6462..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('.');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
deleted file mode 100644
index e0797a6..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Div extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
deleted file mode 100644
index 93b3b96..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2013 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_EndsWith extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $left = $compiler->getVarName();
-        $right = $compiler->getVarName();
-        $compiler
-            ->raw(sprintf('(is_string($%s = ', $left))
-            ->subcompile($this->getNode('left'))
-            ->raw(sprintf(') && is_string($%s = ', $right))
-            ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || $%2$s === substr($%1$s, -strlen($%2$s))))', $left, $right))
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
deleted file mode 100644
index 7b1236d..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Equal extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('==');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
deleted file mode 100644
index b606f6d..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('intval(floor(');
-        parent::compile($compiler);
-        $compiler->raw('))');
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
deleted file mode 100644
index a110bd9..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Greater extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
deleted file mode 100644
index 3754fed..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_GreaterEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>=');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
deleted file mode 100644
index 9565a60..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('in');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
deleted file mode 100644
index 45fd300..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Less extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
deleted file mode 100644
index e38e257..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_LessEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<=');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
deleted file mode 100644
index 93bb292..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2013 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Matches extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('preg_match(')
-            ->subcompile($this->getNode('right'))
-            ->raw(', ')
-            ->subcompile($this->getNode('left'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
deleted file mode 100644
index 9924114..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mod extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('%');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
deleted file mode 100644
index c91529c..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mul extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('*');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
deleted file mode 100644
index 26867ba..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('!=');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
deleted file mode 100644
index 49ab39e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('!twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('not in');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
deleted file mode 100644
index adba49c..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Or extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('||');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
deleted file mode 100644
index cd6d046..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('pow(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('**');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
deleted file mode 100644
index 692ec9c..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('range(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('..');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
deleted file mode 100644
index d2e30d6..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2013 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_StartsWith extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $left = $compiler->getVarName();
-        $right = $compiler->getVarName();
-        $compiler
-            ->raw(sprintf('(is_string($%s = ', $left))
-            ->subcompile($this->getNode('left'))
-            ->raw(sprintf(') && is_string($%s = ', $right))
-            ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || 0 === strpos($%1$s, $%2$s)))', $left, $right))
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
deleted file mode 100644
index d446399..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Sub extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('-');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
deleted file mode 100644
index f6ed6ff..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $name, $asString = false, $lineno, $tag = null)
-    {
-        parent::__construct(array('name' => $name), array('as_string' => $asString, 'output' => false), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('as_string')) {
-            $compiler->raw('(string) ');
-        }
-
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write('$this->displayBlock(')
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw('$this->renderBlock(')
-                ->subcompile($this->getNode('name'))
-                ->raw(', $context, $blocks)')
-            ;
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
deleted file mode 100644
index 51e2cac..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
-{
-    protected function compileCallable(Twig_Compiler $compiler)
-    {
-        $closingParenthesis = false;
-        if ($this->hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
-            if (is_string($callable)) {
-                $compiler->raw($callable);
-            } elseif (is_array($callable) && $callable[0] instanceof Twig_ExtensionInterface) {
-                $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', $callable[0]->getName(), $callable[1]));
-            } else {
-                $type = ucfirst($this->getAttribute('type'));
-                $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
-                $closingParenthesis = true;
-            }
-        } else {
-            $compiler->raw($this->getAttribute('thing')->compile());
-        }
-
-        $this->compileArguments($compiler);
-
-        if ($closingParenthesis) {
-            $compiler->raw(')');
-        }
-    }
-
-    protected function compileArguments(Twig_Compiler $compiler)
-    {
-        $compiler->raw('(');
-
-        $first = true;
-
-        if ($this->hasAttribute('needs_environment') && $this->getAttribute('needs_environment')) {
-            $compiler->raw('$this->env');
-            $first = false;
-        }
-
-        if ($this->hasAttribute('needs_context') && $this->getAttribute('needs_context')) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->raw('$context');
-            $first = false;
-        }
-
-        if ($this->hasAttribute('arguments')) {
-            foreach ($this->getAttribute('arguments') as $argument) {
-                if (!$first) {
-                    $compiler->raw(', ');
-                }
-                $compiler->string($argument);
-                $first = false;
-            }
-        }
-
-        if ($this->hasNode('node')) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->subcompile($this->getNode('node'));
-            $first = false;
-        }
-
-        if ($this->hasNode('arguments') && null !== $this->getNode('arguments')) {
-            $callable = $this->hasAttribute('callable') ? $this->getAttribute('callable') : null;
-
-            $arguments = $this->getArguments($callable, $this->getNode('arguments'));
-
-            foreach ($arguments as $node) {
-                if (!$first) {
-                    $compiler->raw(', ');
-                }
-                $compiler->subcompile($node);
-                $first = false;
-            }
-        }
-
-        $compiler->raw(')');
-    }
-
-    protected function getArguments($callable, $arguments)
-    {
-        $callType = $this->getAttribute('type');
-        $callName = $this->getAttribute('name');
-
-        $parameters = array();
-        $named = false;
-        foreach ($arguments as $name => $node) {
-            if (!is_int($name)) {
-                $named = true;
-                $name = $this->normalizeName($name);
-            } elseif ($named) {
-                throw new Twig_Error_Syntax(sprintf('Positional arguments cannot be used after named arguments for %s "%s".', $callType, $callName));
-            }
-
-            $parameters[$name] = $node;
-        }
-
-        $isVariadic = $this->hasAttribute('is_variadic') && $this->getAttribute('is_variadic');
-        if (!$named && !$isVariadic) {
-            return $parameters;
-        }
-
-        if (!$callable) {
-            if ($named) {
-                $message = sprintf('Named arguments are not supported for %s "%s".', $callType, $callName);
-            } else {
-                $message = sprintf('Arbitrary positional arguments are not supported for %s "%s".', $callType, $callName);
-            }
-
-            throw new LogicException($message);
-        }
-
-        // manage named arguments
-        if (is_array($callable)) {
-            $r = new ReflectionMethod($callable[0], $callable[1]);
-        } elseif (is_object($callable) && !$callable instanceof Closure) {
-            $r = new ReflectionObject($callable);
-            $r = $r->getMethod('__invoke');
-        } elseif (is_string($callable) && false !== strpos($callable, '::')) {
-            $r = new ReflectionMethod($callable);
-        } else {
-            $r = new ReflectionFunction($callable);
-        }
-
-        $definition = $r->getParameters();
-        if ($this->hasNode('node')) {
-            array_shift($definition);
-        }
-        if ($this->hasAttribute('needs_environment') && $this->getAttribute('needs_environment')) {
-            array_shift($definition);
-        }
-        if ($this->hasAttribute('needs_context') && $this->getAttribute('needs_context')) {
-            array_shift($definition);
-        }
-        if ($this->hasAttribute('arguments') && null !== $this->getAttribute('arguments')) {
-            foreach ($this->getAttribute('arguments') as $argument) {
-                array_shift($definition);
-            }
-        }
-        if ($isVariadic) {
-            $argument = end($definition);
-            if ($argument && $argument->isArray() && $argument->isDefaultValueAvailable() && array() === $argument->getDefaultValue()) {
-                array_pop($definition);
-            } else {
-                $callableName = $r->name;
-                if ($r->getDeclaringClass()) {
-                    $callableName = $r->getDeclaringClass()->name.'::'.$callableName;
-                }
-
-                throw new LogicException(sprintf('The last parameter of "%s" for %s "%s" must be an array with default value, eg. "array $arg = array()".', $callableName, $callType, $callName));
-            }
-        }
-
-        $arguments = array();
-        $names = array();
-        $missingArguments = array();
-        $optionalArguments = array();
-        $pos = 0;
-        foreach ($definition as $param) {
-            $names[] = $name = $this->normalizeName($param->name);
-
-            if (array_key_exists($name, $parameters)) {
-                if (array_key_exists($pos, $parameters)) {
-                    throw new Twig_Error_Syntax(sprintf('Argument "%s" is defined twice for %s "%s".', $name, $callType, $callName));
-                }
-
-                if (!empty($missingArguments)) {
-                    throw new Twig_Error_Syntax(sprintf(
-                        'Argument "%s" could not be assigned for %s "%s(%s)" because it is mapped to an internal PHP function which cannot determine default value for optional argument%s "%s".',
-                        $name, $callType, $callName, implode(', ', $names), count($missingArguments) > 1 ? 's' : '', implode('", "', $missingArguments))
-                    );
-                }
-
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $parameters[$name];
-                unset($parameters[$name]);
-                $optionalArguments = array();
-            } elseif (array_key_exists($pos, $parameters)) {
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $parameters[$pos];
-                unset($parameters[$pos]);
-                $optionalArguments = array();
-                ++$pos;
-            } elseif ($param->isDefaultValueAvailable()) {
-                $optionalArguments[] = new Twig_Node_Expression_Constant($param->getDefaultValue(), -1);
-            } elseif ($param->isOptional()) {
-                if (empty($parameters)) {
-                    break;
-                } else {
-                    $missingArguments[] = $name;
-                }
-            } else {
-                throw new Twig_Error_Syntax(sprintf('Value for argument "%s" is required for %s "%s".', $name, $callType, $callName));
-            }
-        }
-
-        if ($isVariadic) {
-            $arbitraryArguments = new Twig_Node_Expression_Array(array(), -1);
-            foreach ($parameters as $key => $value) {
-                if (is_int($key)) {
-                    $arbitraryArguments->addElement($value);
-                } else {
-                    $arbitraryArguments->addElement($value, new Twig_Node_Expression_Constant($key, -1));
-                }
-                unset($parameters[$key]);
-            }
-
-            if ($arbitraryArguments->count()) {
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $arbitraryArguments;
-            }
-        }
-
-        if (!empty($parameters)) {
-            $unknownParameter = null;
-            foreach ($parameters as $parameter) {
-                if ($parameter instanceof Twig_Node) {
-                    $unknownParameter = $parameter;
-                    break;
-                }
-            }
-
-            throw new Twig_Error_Syntax(sprintf(
-                'Unknown argument%s "%s" for %s "%s(%s)".',
-                count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $callType, $callName, implode(', ', $names)
-            ), $unknownParameter ? $unknownParameter->getLine() : -1);
-        }
-
-        return $arguments;
-    }
-
-    protected function normalizeName($name)
-    {
-        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), $name));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php b/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
deleted file mode 100644
index edcb1e2..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Conditional extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $expr1, Twig_Node_Expression $expr2, Twig_Node_Expression $expr3, $lineno)
-    {
-        parent::__construct(array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('((')
-            ->subcompile($this->getNode('expr1'))
-            ->raw(') ? (')
-            ->subcompile($this->getNode('expr2'))
-            ->raw(') : (')
-            ->subcompile($this->getNode('expr3'))
-            ->raw('))')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
deleted file mode 100644
index a91dc69..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Constant extends Twig_Node_Expression
-{
-    public function __construct($value, $lineno)
-    {
-        parent::__construct(array(), array('value' => $value), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->repr($this->getAttribute('value'));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
deleted file mode 100644
index 6140c57..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an extension call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(sprintf("\$this->env->getExtension('%s')", $this->getAttribute('name')));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
deleted file mode 100644
index a906232..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        parent::__construct(array('node' => $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getNode('filter')->getAttribute('value');
-        $filter = $compiler->getEnvironment()->getFilter($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'filter');
-        $this->setAttribute('thing', $filter);
-        $this->setAttribute('needs_environment', $filter->needsEnvironment());
-        $this->setAttribute('needs_context', $filter->needsContext());
-        $this->setAttribute('arguments', $filter->getArguments());
-        if ($filter instanceof Twig_FilterCallableInterface || $filter instanceof Twig_SimpleFilter) {
-            $this->setAttribute('callable', $filter->getCallable());
-        }
-        if ($filter instanceof Twig_SimpleFilter) {
-            $this->setAttribute('is_variadic', $filter->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
deleted file mode 100644
index 1827c88..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Returns the value or the default value when it is undefined or empty.
- *
- * <pre>
- *  {{ var.foo|default('foo item on var is not defined') }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getLine()), $arguments, $node->getLine());
-
-        if ('default' === $filterName->getAttribute('value') && ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr)) {
-            $test = new Twig_Node_Expression_Test_Defined(clone $node, 'defined', new Twig_Node(), $node->getLine());
-            $false = count($arguments) ? $arguments->getNode(0) : new Twig_Node_Expression_Constant('', $node->getLine());
-
-            $node = new Twig_Node_Expression_Conditional($test, $default, $false, $node->getLine());
-        } else {
-            $node = $default;
-        }
-
-        parent::__construct($node, $filterName, $arguments, $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('node'));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
deleted file mode 100644
index 7326ede..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
-{
-    public function __construct($name, Twig_NodeInterface $arguments, $lineno)
-    {
-        parent::__construct(array('arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $function = $compiler->getEnvironment()->getFunction($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'function');
-        $this->setAttribute('thing', $function);
-        $this->setAttribute('needs_environment', $function->needsEnvironment());
-        $this->setAttribute('needs_context', $function->needsContext());
-        $this->setAttribute('arguments', $function->getArguments());
-        if ($function instanceof Twig_FunctionCallableInterface || $function instanceof Twig_SimpleFunction) {
-            $this->setAttribute('callable', $function->getCallable());
-        }
-        if ($function instanceof Twig_SimpleFunction) {
-            $this->setAttribute('is_variadic', $function->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
deleted file mode 100644
index 6ce6111..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_Node_Expression $arguments = null, $type, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if (function_exists('twig_template_get_attributes') && !$this->getAttribute('disable_c_ext')) {
-            $compiler->raw('twig_template_get_attributes($this, ');
-        } else {
-            $compiler->raw('$this->getAttribute(');
-        }
-
-        if ($this->getAttribute('ignore_strict_check')) {
-            $this->getNode('node')->setAttribute('ignore_strict_check', true);
-        }
-
-        $compiler->subcompile($this->getNode('node'));
-
-        $compiler->raw(', ')->subcompile($this->getNode('attribute'));
-
-        // only generate optional arguments when needed (to make generated code more readable)
-        $needFourth = $this->getAttribute('ignore_strict_check');
-        $needThird = $needFourth || $this->getAttribute('is_defined_test');
-        $needSecond = $needThird || Twig_Template::ANY_CALL !== $this->getAttribute('type');
-        $needFirst = $needSecond || null !== $this->getNode('arguments');
-
-        if ($needFirst) {
-            if (null !== $this->getNode('arguments')) {
-                $compiler->raw(', ')->subcompile($this->getNode('arguments'));
-            } else {
-                $compiler->raw(', array()');
-            }
-        }
-
-        if ($needSecond) {
-            $compiler->raw(', ')->repr($this->getAttribute('type'));
-        }
-
-        if ($needThird) {
-            $compiler->raw(', ')->repr($this->getAttribute('is_defined_test'));
-        }
-
-        if ($needFourth) {
-            $compiler->raw(', ')->repr($this->getAttribute('ignore_strict_check'));
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
deleted file mode 100644
index 620b02b..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_MethodCall extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $node, $method, Twig_Node_Expression_Array $arguments, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'arguments' => $arguments), array('method' => $method, 'safe' => false), $lineno);
-
-        if ($node instanceof Twig_Node_Expression_Name) {
-            $node->setAttribute('always_defined', true);
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->subcompile($this->getNode('node'))
-            ->raw('->')
-            ->raw($this->getAttribute('method'))
-            ->raw('(')
-        ;
-        $first = true;
-        foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler->subcompile($pair['value']);
-        }
-        $compiler->raw(')');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Name.php b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
deleted file mode 100644
index c062a21..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Name extends Twig_Node_Expression
-{
-    protected $specialVars = array(
-        '_self' => '$this',
-        '_context' => '$context',
-        '_charset' => '$this->env->getCharset()',
-    );
-
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false, 'always_defined' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-
-        $compiler->addDebugInfo($this);
-
-        if ($this->getAttribute('is_defined_test')) {
-            if ($this->isSpecial()) {
-                if ('_self' === $name) {
-                    @trigger_error(sprintf('Global variable "_self" is deprecated in %s at line %d', '?', $this->getLine()), E_USER_DEPRECATED);
-                }
-
-                $compiler->repr(true);
-            } else {
-                $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
-            }
-        } elseif ($this->isSpecial()) {
-            if ('_self' === $name) {
-                @trigger_error(sprintf('Global variable "_self" is deprecated in %s at line %d', '?', $this->getLine()), E_USER_DEPRECATED);
-            }
-
-            $compiler->raw($this->specialVars[$name]);
-        } elseif ($this->getAttribute('always_defined')) {
-            $compiler
-                ->raw('$context[')
-                ->string($name)
-                ->raw(']')
-            ;
-        } else {
-            // remove the non-PHP 5.4 version when PHP 5.3 support is dropped
-            // as the non-optimized version is just a workaround for slow ternary operator
-            // when the context has a lot of variables
-            if (PHP_VERSION_ID >= 50400) {
-                // PHP 5.4 ternary operator performance was optimized
-                $compiler
-                    ->raw('(isset($context[')
-                    ->string($name)
-                    ->raw(']) ? $context[')
-                    ->string($name)
-                    ->raw('] : ')
-                ;
-
-                if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
-                    $compiler->raw('null)');
-                } else {
-                    $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
-                }
-            } else {
-                $compiler
-                    ->raw('$this->getContext($context, ')
-                    ->string($name)
-                ;
-
-                if ($this->getAttribute('ignore_strict_check')) {
-                    $compiler->raw(', true');
-                }
-
-                $compiler
-                    ->raw(')')
-                ;
-            }
-        }
-    }
-
-    public function isSpecial()
-    {
-        return isset($this->specialVars[$this->getAttribute('name')]);
-    }
-
-    public function isSimple()
-    {
-        return !$this->isSpecial() && !$this->getAttribute('is_defined_test');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
deleted file mode 100644
index 694c080..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a parent node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Parent extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('output' => false, 'name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write('$this->displayParentBlock(')
-                ->string($this->getAttribute('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw('$this->renderParentBlock(')
-                ->string($this->getAttribute('name'))
-                ->raw(', $context, $blocks)')
-            ;
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
deleted file mode 100644
index e6b058e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_TempName extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('$_')
-            ->raw($this->getAttribute('name'))
-            ->raw('_')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
deleted file mode 100644
index c0358c8..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
-{
-    public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $test = $compiler->getEnvironment()->getTest($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'test');
-        $this->setAttribute('thing', $test);
-        if ($test instanceof Twig_TestCallableInterface || $test instanceof Twig_SimpleTest) {
-            $this->setAttribute('callable', $test->getCallable());
-        }
-        if ($test instanceof Twig_SimpleTest) {
-            $this->setAttribute('is_variadic', $test->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
deleted file mode 100644
index de55f5f..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is the exact same value as a constant.
- *
- * <pre>
- *  {% if post.status is constant('Post::PUBLISHED') %}
- *    the status attribute is exactly the same as Post::PUBLISHED
- *  {% endif %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' === constant(')
-        ;
-
-        if ($this->getNode('arguments')->hasNode(1)) {
-            $compiler
-                ->raw('get_class(')
-                ->subcompile($this->getNode('arguments')->getNode(1))
-                ->raw(')."::".')
-            ;
-        }
-
-        $compiler
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw('))')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
deleted file mode 100644
index 4b4a48a..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is defined in the current context.
- *
- * <pre>
- * {# defined works with variable names and variable attributes #}
- * {% if foo is defined %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
-{
-    public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
-    {
-        parent::__construct($node, $name, $arguments, $lineno);
-
-        if ($node instanceof Twig_Node_Expression_Name) {
-            $node->setAttribute('is_defined_test', true);
-        } elseif ($node instanceof Twig_Node_Expression_GetAttr) {
-            $node->setAttribute('is_defined_test', true);
-
-            $this->changeIgnoreStrictCheck($node);
-        } else {
-            throw new Twig_Error_Syntax('The "defined" test only works with simple variables.', $this->getLine());
-        }
-    }
-
-    protected function changeIgnoreStrictCheck(Twig_Node_Expression_GetAttr $node)
-    {
-        $node->setAttribute('ignore_strict_check', true);
-
-        if ($node->getNode('node') instanceof Twig_Node_Expression_GetAttr) {
-            $this->changeIgnoreStrictCheck($node->getNode('node'));
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('node'));
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
deleted file mode 100644
index d5bed23..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is divisible by a number.
- *
- * <pre>
- *  {% if loop.index is divisible by(3) %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(0 == ')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % ')
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
deleted file mode 100644
index d7853e8..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a number is even.
- *
- * <pre>
- *  {{ var is even }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % 2 == 0')
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
deleted file mode 100644
index 1c83825..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks that a variable is null.
- *
- * <pre>
- *  {{ var is none }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(null === ')
-            ->subcompile($this->getNode('node'))
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
deleted file mode 100644
index 421c19e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a number is odd.
- *
- * <pre>
- *  {{ var is odd }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % 2 == 1')
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
deleted file mode 100644
index b48905e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is the same as another one (=== in PHP).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' === ')
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw(')')
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
deleted file mode 100644
index 1cf54c3..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $node, $lineno)
-    {
-        parent::__construct(array('node' => $node), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(' ');
-        $this->operator($compiler);
-        $compiler->subcompile($this->getNode('node'));
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
deleted file mode 100644
index 2a3937e..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Neg extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('-');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
deleted file mode 100644
index f94073c..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Not extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('!');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
deleted file mode 100644
index 04edb52..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Pos extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('+');
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Flush.php b/vendor/twig/twig/lib/Twig/Node/Flush.php
deleted file mode 100644
index 2af17a4..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Flush.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a flush node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Flush extends Twig_Node
-{
-    public function __construct($lineno, $tag)
-    {
-        parent::__construct(array(), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("flush();\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/For.php b/vendor/twig/twig/lib/Twig/Node/For.php
deleted file mode 100644
index 2d45093..0000000
--- a/vendor/twig/twig/lib/Twig/Node/For.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a for node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_For extends Twig_Node
-{
-    protected $loop;
-
-    public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        $body = new Twig_Node(array($body, $this->loop = new Twig_Node_ForLoop($lineno, $tag)));
-
-        if (null !== $ifexpr) {
-            $body = new Twig_Node_If(new Twig_Node(array($ifexpr, $body)), null, $lineno, $tag);
-        }
-
-        parent::__construct(array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body, 'else' => $else), array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("\$context['_parent'] = \$context;\n")
-            ->write("\$context['_seq'] = twig_ensure_traversable(")
-            ->subcompile($this->getNode('seq'))
-            ->raw(");\n")
-        ;
-
-        if (null !== $this->getNode('else')) {
-            $compiler->write("\$context['_iterated'] = false;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("\$context['loop'] = array(\n")
-                ->write("  'parent' => \$context['_parent'],\n")
-                ->write("  'index0' => 0,\n")
-                ->write("  'index'  => 1,\n")
-                ->write("  'first'  => true,\n")
-                ->write(");\n")
-            ;
-
-            if (!$this->getAttribute('ifexpr')) {
-                $compiler
-                    ->write("if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable)) {\n")
-                    ->indent()
-                    ->write("\$length = count(\$context['_seq']);\n")
-                    ->write("\$context['loop']['revindex0'] = \$length - 1;\n")
-                    ->write("\$context['loop']['revindex'] = \$length;\n")
-                    ->write("\$context['loop']['length'] = \$length;\n")
-                    ->write("\$context['loop']['last'] = 1 === \$length;\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-
-        $this->loop->setAttribute('else', null !== $this->getNode('else'));
-        $this->loop->setAttribute('with_loop', $this->getAttribute('with_loop'));
-        $this->loop->setAttribute('ifexpr', $this->getAttribute('ifexpr'));
-
-        $compiler
-            ->write("foreach (\$context['_seq'] as ")
-            ->subcompile($this->getNode('key_target'))
-            ->raw(' => ')
-            ->subcompile($this->getNode('value_target'))
-            ->raw(") {\n")
-            ->indent()
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n")
-        ;
-
-        if (null !== $this->getNode('else')) {
-            $compiler
-                ->write("if (!\$context['_iterated']) {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-                ->outdent()
-                ->write("}\n")
-            ;
-        }
-
-        $compiler->write("\$_parent = \$context['_parent'];\n");
-
-        // remove some "private" loop variables (needed for nested loops)
-        $compiler->write('unset($context[\'_seq\'], $context[\'_iterated\'], $context[\''.$this->getNode('key_target')->getAttribute('name').'\'], $context[\''.$this->getNode('value_target')->getAttribute('name').'\'], $context[\'_parent\'], $context[\'loop\']);'."\n");
-
-        // keep the values set in the inner context for variables defined in the outer context
-        $compiler->write("\$context = array_intersect_key(\$context, \$_parent) + \$_parent;\n");
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/ForLoop.php b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
deleted file mode 100644
index 2554d48..0000000
--- a/vendor/twig/twig/lib/Twig/Node/ForLoop.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Internal node used by the for node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_ForLoop extends Twig_Node
-{
-    public function __construct($lineno, $tag = null)
-    {
-        parent::__construct(array(), array('with_loop' => false, 'ifexpr' => false, 'else' => false), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('else')) {
-            $compiler->write("\$context['_iterated'] = true;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("++\$context['loop']['index0'];\n")
-                ->write("++\$context['loop']['index'];\n")
-                ->write("\$context['loop']['first'] = false;\n")
-            ;
-
-            if (!$this->getAttribute('ifexpr')) {
-                $compiler
-                    ->write("if (isset(\$context['loop']['length'])) {\n")
-                    ->indent()
-                    ->write("--\$context['loop']['revindex0'];\n")
-                    ->write("--\$context['loop']['revindex'];\n")
-                    ->write("\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/If.php b/vendor/twig/twig/lib/Twig/Node/If.php
deleted file mode 100644
index caff936..0000000
--- a/vendor/twig/twig/lib/Twig/Node/If.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an if node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_If extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        parent::__construct(array('tests' => $tests, 'else' => $else), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-        for ($i = 0, $count = count($this->getNode('tests')); $i < $count; $i += 2) {
-            if ($i > 0) {
-                $compiler
-                    ->outdent()
-                    ->write('} elseif (')
-                ;
-            } else {
-                $compiler
-                    ->write('if (')
-                ;
-            }
-
-            $compiler
-                ->subcompile($this->getNode('tests')->getNode($i))
-                ->raw(") {\n")
-                ->indent()
-                ->subcompile($this->getNode('tests')->getNode($i + 1))
-            ;
-        }
-
-        if ($this->hasNode('else') && null !== $this->getNode('else')) {
-            $compiler
-                ->outdent()
-                ->write("} else {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("}\n");
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Import.php b/vendor/twig/twig/lib/Twig/Node/Import.php
deleted file mode 100644
index df37af3..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Import.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an import node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Import extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $var, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr, 'var' => $var), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('var'))
-            ->raw(' = ')
-        ;
-
-        if ($this->getNode('expr') instanceof Twig_Node_Expression_Name && '_self' === $this->getNode('expr')->getAttribute('name')) {
-            $compiler->raw('$this');
-        } else {
-            $compiler
-                ->raw('$this->loadTemplate(')
-                ->subcompile($this->getNode('expr'))
-                ->raw(', ')
-                ->repr($compiler->getFilename())
-                ->raw(', ')
-                ->repr($this->getLine())
-                ->raw(')')
-            ;
-        }
-
-        $compiler->raw(";\n");
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Include.php b/vendor/twig/twig/lib/Twig/Node/Include.php
deleted file mode 100644
index 9952f73..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Include.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an include node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->write("try {\n")
-                ->indent()
-            ;
-        }
-
-        $this->addGetTemplate($compiler);
-
-        $compiler->raw('->display(');
-
-        $this->addTemplateArguments($compiler);
-
-        $compiler->raw(");\n");
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->outdent()
-                ->write("} catch (Twig_Error_Loader \$e) {\n")
-                ->indent()
-                ->write("// ignore missing template\n")
-                ->outdent()
-                ->write("}\n\n")
-            ;
-        }
-    }
-
-    protected function addGetTemplate(Twig_Compiler $compiler)
-    {
-        $compiler
-             ->write('$this->loadTemplate(')
-             ->subcompile($this->getNode('expr'))
-             ->raw(', ')
-             ->repr($compiler->getFilename())
-             ->raw(', ')
-             ->repr($this->getLine())
-             ->raw(')')
-         ;
-    }
-
-    protected function addTemplateArguments(Twig_Compiler $compiler)
-    {
-        if (null === $this->getNode('variables')) {
-            $compiler->raw(false === $this->getAttribute('only') ? '$context' : 'array()');
-        } elseif (false === $this->getAttribute('only')) {
-            $compiler
-                ->raw('array_merge($context, ')
-                ->subcompile($this->getNode('variables'))
-                ->raw(')')
-            ;
-        } else {
-            $compiler->subcompile($this->getNode('variables'));
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Macro.php b/vendor/twig/twig/lib/Twig/Node/Macro.php
deleted file mode 100644
index 932e795..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Macro.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a macro node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Macro extends Twig_Node
-{
-    const VARARGS_NAME = 'varargs';
-
-    public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        foreach ($arguments as $argumentName => $argument) {
-            if (self::VARARGS_NAME === $argumentName) {
-                throw new Twig_Error_Syntax(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getLine());
-            }
-        }
-
-        parent::__construct(array('body' => $body, 'arguments' => $arguments), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf('public function get%s(', $this->getAttribute('name')))
-        ;
-
-        $count = count($this->getNode('arguments'));
-        $pos = 0;
-        foreach ($this->getNode('arguments') as $name => $default) {
-            $compiler
-                ->raw('$__'.$name.'__ = ')
-                ->subcompile($default)
-            ;
-
-            if (++$pos < $count) {
-                $compiler->raw(', ');
-            }
-        }
-
-        if (PHP_VERSION_ID >= 50600) {
-            if ($count) {
-                $compiler->raw(', ');
-            }
-
-            $compiler->raw('...$__varargs__');
-        }
-
-        $compiler
-            ->raw(")\n")
-            ->write("{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->write("\$context = \$this->env->mergeGlobals(array(\n")
-            ->indent()
-        ;
-
-        foreach ($this->getNode('arguments') as $name => $default) {
-            $compiler
-                ->addIndentation()
-                ->string($name)
-                ->raw(' => $__'.$name.'__')
-                ->raw(",\n")
-            ;
-        }
-
-        $compiler
-            ->addIndentation()
-            ->string(self::VARARGS_NAME)
-            ->raw(' => ')
-        ;
-
-        if (PHP_VERSION_ID >= 50600) {
-            $compiler->raw("\$__varargs__,\n");
-        } else {
-            $compiler
-                ->raw('func_num_args() > ')
-                ->repr($count)
-                ->raw(' ? array_slice(func_get_args(), ')
-                ->repr($count)
-                ->raw(") : array(),\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("));\n\n")
-            ->write("\$blocks = array();\n\n")
-            ->write("ob_start();\n")
-            ->write("try {\n")
-            ->indent()
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("} catch (Exception \$e) {\n")
-            ->indent()
-            ->write("ob_end_clean();\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("}\n\n")
-            ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Module.php b/vendor/twig/twig/lib/Twig/Node/Module.php
deleted file mode 100644
index 01161d3..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Module.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a module node.
- *
- * Consider this class as being final. If you need to customize the behavior of
- * the generated class, consider adding nodes to the following nodes: display_start,
- * display_end, constructor_start, constructor_end, and class_end.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Module extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $filename)
-    {
-        // embedded templates are set as attributes so that they are only visited once by the visitors
-        parent::__construct(array(
-            'parent' => $parent,
-            'body' => $body,
-            'blocks' => $blocks,
-            'macros' => $macros,
-            'traits' => $traits,
-            'display_start' => new Twig_Node(),
-            'display_end' => new Twig_Node(),
-            'constructor_start' => new Twig_Node(),
-            'constructor_end' => new Twig_Node(),
-            'class_end' => new Twig_Node(),
-        ), array(
-            'filename' => $filename,
-            'index' => null,
-            'embedded_templates' => $embeddedTemplates,
-        ), 1);
-    }
-
-    public function setIndex($index)
-    {
-        $this->setAttribute('index', $index);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $this->compileTemplate($compiler);
-
-        foreach ($this->getAttribute('embedded_templates') as $template) {
-            $compiler->subcompile($template);
-        }
-    }
-
-    protected function compileTemplate(Twig_Compiler $compiler)
-    {
-        if (!$this->getAttribute('index')) {
-            $compiler->write('<?php');
-        }
-
-        $this->compileClassHeader($compiler);
-
-        if (
-            count($this->getNode('blocks'))
-            || count($this->getNode('traits'))
-            || null === $this->getNode('parent')
-            || $this->getNode('parent') instanceof Twig_Node_Expression_Constant
-            || count($this->getNode('constructor_start'))
-            || count($this->getNode('constructor_end'))
-        ) {
-            $this->compileConstructor($compiler);
-        }
-
-        $this->compileGetParent($compiler);
-
-        $this->compileDisplay($compiler);
-
-        $compiler->subcompile($this->getNode('blocks'));
-
-        $this->compileMacros($compiler);
-
-        $this->compileGetTemplateName($compiler);
-
-        $this->compileIsTraitable($compiler);
-
-        $this->compileDebugInfo($compiler);
-
-        $this->compileClassFooter($compiler);
-    }
-
-    protected function compileGetParent(Twig_Compiler $compiler)
-    {
-        if (null === $parent = $this->getNode('parent')) {
-            return;
-        }
-
-        $compiler
-            ->write("protected function doGetParent(array \$context)\n", "{\n")
-            ->indent()
-            ->addDebugInfo($parent)
-            ->write('return ')
-        ;
-
-        if ($parent instanceof Twig_Node_Expression_Constant) {
-            $compiler->subcompile($parent);
-        } else {
-            $compiler
-                ->raw('$this->loadTemplate(')
-                ->subcompile($parent)
-                ->raw(', ')
-                ->repr($compiler->getFilename())
-                ->raw(', ')
-                ->repr($this->getNode('parent')->getLine())
-                ->raw(')')
-            ;
-        }
-
-        $compiler
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileClassHeader(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("\n\n")
-            // if the filename contains */, add a blank to avoid a PHP parse error
-            ->write('/* '.str_replace('*/', '* /', $this->getAttribute('filename'))." */\n")
-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename'), $this->getAttribute('index')))
-            ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
-            ->write("{\n")
-            ->indent()
-        ;
-    }
-
-    protected function compileConstructor(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function __construct(Twig_Environment \$env)\n", "{\n")
-            ->indent()
-            ->subcompile($this->getNode('constructor_start'))
-            ->write("parent::__construct(\$env);\n\n")
-        ;
-
-        // parent
-        if (null === $parent = $this->getNode('parent')) {
-            $compiler->write("\$this->parent = false;\n\n");
-        } elseif ($parent instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->addDebugInfo($parent)
-                ->write('$this->parent = $this->loadTemplate(')
-                ->subcompile($parent)
-                ->raw(', ')
-                ->repr($compiler->getFilename())
-                ->raw(', ')
-                ->repr($this->getNode('parent')->getLine())
-                ->raw(");\n")
-            ;
-        }
-
-        $countTraits = count($this->getNode('traits'));
-        if ($countTraits) {
-            // traits
-            foreach ($this->getNode('traits') as $i => $trait) {
-                $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i));
-
-                $compiler
-                    ->addDebugInfo($trait->getNode('template'))
-                    ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
-                    ->indent()
-                    ->write("throw new Twig_Error_Runtime('Template \"'.")
-                    ->subcompile($trait->getNode('template'))
-                    ->raw(".'\" cannot be used as a trait.');\n")
-                    ->outdent()
-                    ->write("}\n")
-                    ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
-                ;
-
-                foreach ($trait->getNode('targets') as $key => $value) {
-                    $compiler
-                        ->write(sprintf('if (!isset($_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw("])) {\n")
-                        ->indent()
-                        ->write("throw new Twig_Error_Runtime(sprintf('Block ")
-                        ->string($key)
-                        ->raw(' is not defined in trait ')
-                        ->subcompile($trait->getNode('template'))
-                        ->raw(".'));\n")
-                        ->outdent()
-                        ->write("}\n\n")
-
-                        ->write(sprintf('$_trait_%s_blocks[', $i))
-                        ->subcompile($value)
-                        ->raw(sprintf('] = $_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw(sprintf(']; unset($_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw("]);\n\n")
-                    ;
-                }
-            }
-
-            if ($countTraits > 1) {
-                $compiler
-                    ->write("\$this->traits = array_merge(\n")
-                    ->indent()
-                ;
-
-                for ($i = 0; $i < $countTraits; ++$i) {
-                    $compiler
-                        ->write(sprintf('$_trait_%s_blocks'.($i == $countTraits - 1 ? '' : ',')."\n", $i))
-                    ;
-                }
-
-                $compiler
-                    ->outdent()
-                    ->write(");\n\n")
-                ;
-            } else {
-                $compiler
-                    ->write("\$this->traits = \$_trait_0_blocks;\n\n")
-                ;
-            }
-
-            $compiler
-                ->write("\$this->blocks = array_merge(\n")
-                ->indent()
-                ->write("\$this->traits,\n")
-                ->write("array(\n")
-            ;
-        } else {
-            $compiler
-                ->write("\$this->blocks = array(\n")
-            ;
-        }
-
-        // blocks
-        $compiler
-            ->indent()
-        ;
-
-        foreach ($this->getNode('blocks') as $name => $node) {
-            $compiler
-                ->write(sprintf("'%s' => array(\$this, 'block_%s'),\n", $name, $name))
-            ;
-        }
-
-        if ($countTraits) {
-            $compiler
-                ->outdent()
-                ->write(")\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->subcompile($this->getNode('constructor_end'))
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileDisplay(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("protected function doDisplay(array \$context, array \$blocks = array())\n", "{\n")
-            ->indent()
-            ->subcompile($this->getNode('display_start'))
-            ->subcompile($this->getNode('body'))
-        ;
-
-        if (null !== $parent = $this->getNode('parent')) {
-            $compiler->addDebugInfo($parent);
-            if ($parent instanceof Twig_Node_Expression_Constant) {
-                $compiler->write('$this->parent');
-            } else {
-                $compiler->write('$this->getParent($context)');
-            }
-            $compiler->raw("->display(\$context, array_merge(\$this->blocks, \$blocks));\n");
-        }
-
-        $compiler
-            ->subcompile($this->getNode('display_end'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileClassFooter(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->subcompile($this->getNode('class_end'))
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    protected function compileMacros(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('macros'));
-    }
-
-    protected function compileGetTemplateName(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getTemplateName()\n", "{\n")
-            ->indent()
-            ->write('return ')
-            ->repr($this->getAttribute('filename'))
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileIsTraitable(Twig_Compiler $compiler)
-    {
-        // A template can be used as a trait if:
-        //   * it has no parent
-        //   * it has no macros
-        //   * it has no body
-        //
-        // Put another way, a template can be used as a trait if it
-        // only contains blocks and use statements.
-        $traitable = null === $this->getNode('parent') && 0 === count($this->getNode('macros'));
-        if ($traitable) {
-            if ($this->getNode('body') instanceof Twig_Node_Body) {
-                $nodes = $this->getNode('body')->getNode(0);
-            } else {
-                $nodes = $this->getNode('body');
-            }
-
-            if (!count($nodes)) {
-                $nodes = new Twig_Node(array($nodes));
-            }
-
-            foreach ($nodes as $node) {
-                if (!count($node)) {
-                    continue;
-                }
-
-                if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) {
-                    continue;
-                }
-
-                if ($node instanceof Twig_Node_BlockReference) {
-                    continue;
-                }
-
-                $traitable = false;
-                break;
-            }
-        }
-
-        if ($traitable) {
-            return;
-        }
-
-        $compiler
-            ->write("public function isTraitable()\n", "{\n")
-            ->indent()
-            ->write(sprintf("return %s;\n", $traitable ? 'true' : 'false'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileDebugInfo(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getDebugInfo()\n", "{\n")
-            ->indent()
-            ->write(sprintf("return %s;\n", str_replace("\n", '', var_export(array_reverse($compiler->getDebugInfo(), true), true))))
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    protected function compileLoadTemplate(Twig_Compiler $compiler, $node, $var)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->write(sprintf('%s = $this->loadTemplate(', $var))
-                ->subcompile($node)
-                ->raw(', ')
-                ->repr($compiler->getFilename())
-                ->raw(', ')
-                ->repr($node->getLine())
-                ->raw(");\n")
-            ;
-        } else {
-            throw new LogicException('Trait templates can only be constant nodes');
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Print.php b/vendor/twig/twig/lib/Twig/Node/Print.php
deleted file mode 100644
index 7b69ee8..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Print.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node that outputs an expression.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Sandbox.php b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
deleted file mode 100644
index cd705e2..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Sandbox.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a sandbox node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Sandbox extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("\$sandbox = \$this->env->getExtension('sandbox');\n")
-            ->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
-            ->indent()
-            ->write("\$sandbox->enableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-            ->subcompile($this->getNode('body'))
-            ->write("if (!\$alreadySandboxed) {\n")
-            ->indent()
-            ->write("\$sandbox->disableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
deleted file mode 100644
index 148dd2b..0000000
--- a/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_Node_SandboxedPrint adds a check for the __toString() method
- * when the variable is an object and the sandbox is activated.
- *
- * When there is a simple Print statement, like {{ article }},
- * and if the sandbox is enabled, we need to check that the __toString()
- * method is allowed if 'article' is an object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_SandboxedPrint extends Twig_Node_Print
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo $this->env->getExtension(\'sandbox\')->ensureToStringAllowed(')
-            ->subcompile($this->getNode('expr'))
-            ->raw(");\n")
-        ;
-    }
-
-    /**
-     * Removes node filters.
-     *
-     * This is mostly needed when another visitor adds filters (like the escaper one).
-     *
-     * @param Twig_Node $node A Node
-     *
-     * @return Twig_Node
-     */
-    protected function removeNodeFilter($node)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->removeNodeFilter($node->getNode('node'));
-        }
-
-        return $node;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Set.php b/vendor/twig/twig/lib/Twig/Node/Set.php
deleted file mode 100644
index e5a6603..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Set.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a set node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Set extends Twig_Node
-{
-    public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
-    {
-        parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag);
-
-        /*
-         * Optimizes the node when capture is used for a large block of text.
-         *
-         * {% set foo %}foo{% endset %} is compiled to $context['foo'] = new Twig_Markup("foo");
-         */
-        if ($this->getAttribute('capture')) {
-            $this->setAttribute('safe', true);
-
-            $values = $this->getNode('values');
-            if ($values instanceof Twig_Node_Text) {
-                $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getLine()));
-                $this->setAttribute('capture', false);
-            }
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if (count($this->getNode('names')) > 1) {
-            $compiler->write('list(');
-            foreach ($this->getNode('names') as $idx => $node) {
-                if ($idx) {
-                    $compiler->raw(', ');
-                }
-
-                $compiler->subcompile($node);
-            }
-            $compiler->raw(')');
-        } else {
-            if ($this->getAttribute('capture')) {
-                $compiler
-                    ->write("ob_start();\n")
-                    ->subcompile($this->getNode('values'))
-                ;
-            }
-
-            $compiler->subcompile($this->getNode('names'), false);
-
-            if ($this->getAttribute('capture')) {
-                $compiler->raw(" = ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())");
-            }
-        }
-
-        if (!$this->getAttribute('capture')) {
-            $compiler->raw(' = ');
-
-            if (count($this->getNode('names')) > 1) {
-                $compiler->write('array(');
-                foreach ($this->getNode('values') as $idx => $value) {
-                    if ($idx) {
-                        $compiler->raw(', ');
-                    }
-
-                    $compiler->subcompile($value);
-                }
-                $compiler->raw(')');
-            } else {
-                if ($this->getAttribute('safe')) {
-                    $compiler
-                        ->raw("('' === \$tmp = ")
-                        ->subcompile($this->getNode('values'))
-                        ->raw(") ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())")
-                    ;
-                } else {
-                    $compiler->subcompile($this->getNode('values'));
-                }
-            }
-        }
-
-        $compiler->raw(";\n");
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/SetTemp.php b/vendor/twig/twig/lib/Twig/Node/SetTemp.php
deleted file mode 100644
index 3bdd1cb..0000000
--- a/vendor/twig/twig/lib/Twig/Node/SetTemp.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Node_SetTemp extends Twig_Node
-{
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $compiler
-            ->addDebugInfo($this)
-            ->write('if (isset($context[')
-            ->string($name)
-            ->raw('])) { $_')
-            ->raw($name)
-            ->raw('_ = $context[')
-            ->repr($name)
-            ->raw(']; } else { $_')
-            ->raw($name)
-            ->raw("_ = null; }\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Spaceless.php b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
deleted file mode 100644
index 486e461..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Spaceless.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a spaceless node.
- *
- * It removes spaces between HTML tags.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Spaceless extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless')
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("ob_start();\n")
-            ->subcompile($this->getNode('body'))
-            ->write("echo trim(preg_replace('/>\s+</', '><', ob_get_clean()));\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Node/Text.php b/vendor/twig/twig/lib/Twig/Node/Text.php
deleted file mode 100644
index 39879bb..0000000
--- a/vendor/twig/twig/lib/Twig/Node/Text.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a text node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($data, $lineno)
-    {
-        parent::__construct(array(), array('data' => $data), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->string($this->getAttribute('data'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeInterface.php b/vendor/twig/twig/lib/Twig/NodeInterface.php
deleted file mode 100644
index 8077349..0000000
--- a/vendor/twig/twig/lib/Twig/NodeInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_NodeInterface extends Countable, IteratorAggregate
-{
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler $compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler);
-
-    public function getLine();
-
-    public function getNodeTag();
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeOutputInterface.php b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
deleted file mode 100644
index 22172c0..0000000
--- a/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a displayable node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeOutputInterface
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeTraverser.php b/vendor/twig/twig/lib/Twig/NodeTraverser.php
deleted file mode 100644
index 00f7b54..0000000
--- a/vendor/twig/twig/lib/Twig/NodeTraverser.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeTraverser is a node traverser.
- *
- * It visits all nodes and their children and calls the given visitor for each.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeTraverser
-{
-    protected $env;
-    protected $visitors = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment            $env      A Twig_Environment instance
-     * @param Twig_NodeVisitorInterface[] $visitors An array of Twig_NodeVisitorInterface instances
-     */
-    public function __construct(Twig_Environment $env, array $visitors = array())
-    {
-        $this->env = $env;
-        foreach ($visitors as $visitor) {
-            $this->addVisitor($visitor);
-        }
-    }
-
-    /**
-     * Adds a visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
-    public function addVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if (!isset($this->visitors[$visitor->getPriority()])) {
-            $this->visitors[$visitor->getPriority()] = array();
-        }
-
-        $this->visitors[$visitor->getPriority()][] = $visitor;
-    }
-
-    /**
-     * Traverses a node and calls the registered visitors.
-     *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
-     * @return Twig_NodeInterface
-     */
-    public function traverse(Twig_NodeInterface $node)
-    {
-        ksort($this->visitors);
-        foreach ($this->visitors as $visitors) {
-            foreach ($visitors as $visitor) {
-                $node = $this->traverseForVisitor($visitor, $node);
-            }
-        }
-
-        return $node;
-    }
-
-    protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
-    {
-        if (null === $node) {
-            return;
-        }
-
-        $node = $visitor->enterNode($node, $this->env);
-
-        foreach ($node as $k => $n) {
-            if (false !== $n = $this->traverseForVisitor($visitor, $n)) {
-                $node->setNode($k, $n);
-            } else {
-                $node->removeNode($k);
-            }
-        }
-
-        return $visitor->leaveNode($node, $this->env);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
deleted file mode 100644
index 5c94977..0000000
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Escaper implements output escaping.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
-{
-    protected $statusStack = array();
-    protected $blocks = array();
-    protected $safeAnalysis;
-    protected $traverser;
-    protected $defaultStrategy = false;
-    protected $safeVars = array();
-
-    public function __construct()
-    {
-        $this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            if ($env->hasExtension('escaper') && $defaultStrategy = $env->getExtension('escaper')->getDefaultStrategy($node->getAttribute('filename'))) {
-                $this->defaultStrategy = $defaultStrategy;
-            }
-            $this->safeVars = array();
-        } elseif ($node instanceof Twig_Node_AutoEscape) {
-            $this->statusStack[] = $node->getAttribute('value');
-        } elseif ($node instanceof Twig_Node_Block) {
-            $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ? $this->blocks[$node->getAttribute('name')] : $this->needEscaping($env);
-        } elseif ($node instanceof Twig_Node_Import) {
-            $this->safeVars[] = $node->getNode('var')->getAttribute('name');
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->defaultStrategy = false;
-            $this->safeVars = array();
-        } elseif ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->preEscapeFilterNode($node, $env);
-        } elseif ($node instanceof Twig_Node_Print) {
-            return $this->escapePrintNode($node, $env, $this->needEscaping($env));
-        }
-
-        if ($node instanceof Twig_Node_AutoEscape || $node instanceof Twig_Node_Block) {
-            array_pop($this->statusStack);
-        } elseif ($node instanceof Twig_Node_BlockReference) {
-            $this->blocks[$node->getAttribute('name')] = $this->needEscaping($env);
-        }
-
-        return $node;
-    }
-
-    protected function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type)
-    {
-        if (false === $type) {
-            return $node;
-        }
-
-        $expression = $node->getNode('expr');
-
-        if ($this->isSafeFor($type, $expression, $env)) {
-            return $node;
-        }
-
-        $class = get_class($node);
-
-        return new $class(
-            $this->getEscaperFilter($type, $expression),
-            $node->getLine()
-        );
-    }
-
-    protected function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env)
-    {
-        $name = $filter->getNode('filter')->getAttribute('value');
-
-        $type = $env->getFilter($name)->getPreEscape();
-        if (null === $type) {
-            return $filter;
-        }
-
-        $node = $filter->getNode('node');
-        if ($this->isSafeFor($type, $node, $env)) {
-            return $filter;
-        }
-
-        $filter->setNode('node', $this->getEscaperFilter($type, $node));
-
-        return $filter;
-    }
-
-    protected function isSafeFor($type, Twig_NodeInterface $expression, $env)
-    {
-        $safe = $this->safeAnalysis->getSafe($expression);
-
-        if (null === $safe) {
-            if (null === $this->traverser) {
-                $this->traverser = new Twig_NodeTraverser($env, array($this->safeAnalysis));
-            }
-
-            $this->safeAnalysis->setSafeVars($this->safeVars);
-
-            $this->traverser->traverse($expression);
-            $safe = $this->safeAnalysis->getSafe($expression);
-        }
-
-        return in_array($type, $safe) || in_array('all', $safe);
-    }
-
-    protected function needEscaping(Twig_Environment $env)
-    {
-        if (count($this->statusStack)) {
-            return $this->statusStack[count($this->statusStack) - 1];
-        }
-
-        return $this->defaultStrategy ? $this->defaultStrategy : false;
-    }
-
-    protected function getEscaperFilter($type, Twig_NodeInterface $node)
-    {
-        $line = $node->getLine();
-        $name = new Twig_Node_Expression_Constant('escape', $line);
-        $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line)));
-
-        return new Twig_Node_Expression_Filter($node, $name, $args, $line);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
deleted file mode 100644
index 872b7fe..0000000
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Optimizer tries to optimizes the AST.
- *
- * This visitor is always the last registered one.
- *
- * You can configure which optimizations you want to activate via the
- * optimizer mode.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
-{
-    const OPTIMIZE_ALL = -1;
-    const OPTIMIZE_NONE = 0;
-    const OPTIMIZE_FOR = 2;
-    const OPTIMIZE_RAW_FILTER = 4;
-    const OPTIMIZE_VAR_ACCESS = 8;
-
-    protected $loops = array();
-    protected $loopsTargets = array();
-    protected $optimizers;
-    protected $prependedNodes = array();
-    protected $inABody = false;
-
-    /**
-     * Constructor.
-     *
-     * @param int $optimizers The optimizer mode
-     */
-    public function __construct($optimizers = -1)
-    {
-        if (!is_int($optimizers) || $optimizers > (self::OPTIMIZE_FOR | self::OPTIMIZE_RAW_FILTER | self::OPTIMIZE_VAR_ACCESS)) {
-            throw new InvalidArgumentException(sprintf('Optimizer mode "%s" is not valid.', $optimizers));
-        }
-
-        $this->optimizers = $optimizers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->enterOptimizeFor($node, $env);
-        }
-
-        if (PHP_VERSION_ID < 50400 && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
-            if ($this->inABody) {
-                if (!$node instanceof Twig_Node_Expression) {
-                    if (get_class($node) !== 'Twig_Node') {
-                        array_unshift($this->prependedNodes, array());
-                    }
-                } else {
-                    $node = $this->optimizeVariables($node, $env);
-                }
-            } elseif ($node instanceof Twig_Node_Body) {
-                $this->inABody = true;
-            }
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        $expression = $node instanceof Twig_Node_Expression;
-
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->leaveOptimizeFor($node, $env);
-        }
-
-        if (self::OPTIMIZE_RAW_FILTER === (self::OPTIMIZE_RAW_FILTER & $this->optimizers)) {
-            $node = $this->optimizeRawFilter($node, $env);
-        }
-
-        $node = $this->optimizePrintNode($node, $env);
-
-        if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
-            if ($node instanceof Twig_Node_Body) {
-                $this->inABody = false;
-            } elseif ($this->inABody) {
-                if (!$expression && get_class($node) !== 'Twig_Node' && $prependedNodes = array_shift($this->prependedNodes)) {
-                    $nodes = array();
-                    foreach (array_unique($prependedNodes) as $name) {
-                        $nodes[] = new Twig_Node_SetTemp($name, $node->getLine());
-                    }
-
-                    $nodes[] = $node;
-                    $node = new Twig_Node($nodes);
-                }
-            }
-        }
-
-        return $node;
-    }
-
-    protected function optimizeVariables(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ('Twig_Node_Expression_Name' === get_class($node) && $node->isSimple()) {
-            $this->prependedNodes[0][] = $node->getAttribute('name');
-
-            return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getLine());
-        }
-
-        return $node;
-    }
-
-    /**
-     * Optimizes print nodes.
-     *
-     * It replaces:
-     *
-     *   * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()"
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     *
-     * @return Twig_NodeInterface
-     */
-    protected function optimizePrintNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node_Print) {
-            return $node;
-        }
-
-        if (
-            $node->getNode('expr') instanceof Twig_Node_Expression_BlockReference ||
-            $node->getNode('expr') instanceof Twig_Node_Expression_Parent
-        ) {
-            $node->getNode('expr')->setAttribute('output', true);
-
-            return $node->getNode('expr');
-        }
-
-        return $node;
-    }
-
-    /**
-     * Removes "raw" filters.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     *
-     * @return Twig_NodeInterface
-     */
-    protected function optimizeRawFilter(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter && 'raw' == $node->getNode('filter')->getAttribute('value')) {
-            return $node->getNode('node');
-        }
-
-        return $node;
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function enterOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            // disable the loop variable by default
-            $node->setAttribute('with_loop', false);
-            array_unshift($this->loops, $node);
-            array_unshift($this->loopsTargets, $node->getNode('value_target')->getAttribute('name'));
-            array_unshift($this->loopsTargets, $node->getNode('key_target')->getAttribute('name'));
-        } elseif (!$this->loops) {
-            // we are outside a loop
-            return;
-        }
-
-        // when do we need to add the loop variable back?
-
-        // the loop variable is referenced for the current loop
-        elseif ($node instanceof Twig_Node_Expression_Name && 'loop' === $node->getAttribute('name')) {
-            $node->setAttribute('always_defined', true);
-            $this->addLoopToCurrent();
-        }
-
-        // optimize access to loop targets
-        elseif ($node instanceof Twig_Node_Expression_Name && in_array($node->getAttribute('name'), $this->loopsTargets)) {
-            $node->setAttribute('always_defined', true);
-        }
-
-        // block reference
-        elseif ($node instanceof Twig_Node_BlockReference || $node instanceof Twig_Node_Expression_BlockReference) {
-            $this->addLoopToCurrent();
-        }
-
-        // include without the only attribute
-        elseif ($node instanceof Twig_Node_Include && !$node->getAttribute('only')) {
-            $this->addLoopToAll();
-        }
-
-        // include function without the with_context=false parameter
-        elseif ($node instanceof Twig_Node_Expression_Function
-            && 'include' === $node->getAttribute('name')
-            && (!$node->getNode('arguments')->hasNode('with_context')
-                 || false !== $node->getNode('arguments')->getNode('with_context')->getAttribute('value')
-               )
-        ) {
-            $this->addLoopToAll();
-        }
-
-        // the loop variable is referenced via an attribute
-        elseif ($node instanceof Twig_Node_Expression_GetAttr
-            && (!$node->getNode('attribute') instanceof Twig_Node_Expression_Constant
-                || 'parent' === $node->getNode('attribute')->getAttribute('value')
-               )
-            && (true === $this->loops[0]->getAttribute('with_loop')
-                || ($node->getNode('node') instanceof Twig_Node_Expression_Name
-                    && 'loop' === $node->getNode('node')->getAttribute('name')
-                   )
-               )
-        ) {
-            $this->addLoopToAll();
-        }
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     *
-     * @param Twig_NodeInterface $node A Node
-     * @param Twig_Environment   $env  The current Twig environment
-     */
-    protected function leaveOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            array_shift($this->loops);
-            array_shift($this->loopsTargets);
-            array_shift($this->loopsTargets);
-        }
-    }
-
-    protected function addLoopToCurrent()
-    {
-        $this->loops[0]->setAttribute('with_loop', true);
-    }
-
-    protected function addLoopToAll()
-    {
-        foreach ($this->loops as $loop) {
-            $loop->setAttribute('with_loop', true);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 255;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
deleted file mode 100644
index 439f5bf..0000000
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
-{
-    protected $data = array();
-    protected $safeVars = array();
-
-    public function setSafeVars($safeVars)
-    {
-        $this->safeVars = $safeVars;
-    }
-
-    public function getSafe(Twig_NodeInterface $node)
-    {
-        $hash = spl_object_hash($node);
-        if (!isset($this->data[$hash])) {
-            return;
-        }
-
-        foreach ($this->data[$hash] as $bucket) {
-            if ($bucket['key'] !== $node) {
-                continue;
-            }
-
-            if (in_array('html_attr', $bucket['value'])) {
-                $bucket['value'][] = 'html';
-            }
-
-            return $bucket['value'];
-        }
-    }
-
-    protected function setSafe(Twig_NodeInterface $node, array $safe)
-    {
-        $hash = spl_object_hash($node);
-        if (isset($this->data[$hash])) {
-            foreach ($this->data[$hash] as &$bucket) {
-                if ($bucket['key'] === $node) {
-                    $bucket['value'] = $safe;
-
-                    return;
-                }
-            }
-        }
-        $this->data[$hash][] = array(
-            'key' => $node,
-            'value' => $safe,
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            // constants are marked safe for all
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_BlockReference) {
-            // blocks are safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Parent) {
-            // parent block is safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Conditional) {
-            // intersect safeness of both operands
-            $safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3')));
-            $this->setSafe($node, $safe);
-        } elseif ($node instanceof Twig_Node_Expression_Filter) {
-            // filter expression is safe when the filter is safe
-            $name = $node->getNode('filter')->getAttribute('value');
-            $args = $node->getNode('arguments');
-            if (false !== $filter = $env->getFilter($name)) {
-                $safe = $filter->getSafe($args);
-                if (null === $safe) {
-                    $safe = $this->intersectSafe($this->getSafe($node->getNode('node')), $filter->getPreservesSafety());
-                }
-                $this->setSafe($node, $safe);
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_Function) {
-            // function expression is safe when the function is safe
-            $name = $node->getAttribute('name');
-            $args = $node->getNode('arguments');
-            $function = $env->getFunction($name);
-            if (false !== $function) {
-                $this->setSafe($node, $function->getSafe($args));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_MethodCall) {
-            if ($node->getAttribute('safe')) {
-                $this->setSafe($node, array('all'));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name) {
-            $name = $node->getNode('node')->getAttribute('name');
-            // attributes on template instances are safe
-            if ('_self' == $name || in_array($name, $this->safeVars)) {
-                $this->setSafe($node, array('all'));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } else {
-            $this->setSafe($node, array());
-        }
-
-        return $node;
-    }
-
-    protected function intersectSafe(array $a = null, array $b = null)
-    {
-        if (null === $a || null === $b) {
-            return array();
-        }
-
-        if (in_array('all', $a)) {
-            return $b;
-        }
-
-        if (in_array('all', $b)) {
-            return $a;
-        }
-
-        return array_intersect($a, $b);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
deleted file mode 100644
index 7f1b913..0000000
--- a/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Sandbox implements sandboxing.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
-{
-    protected $inAModule = false;
-    protected $tags;
-    protected $filters;
-    protected $functions;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = true;
-            $this->tags = array();
-            $this->filters = array();
-            $this->functions = array();
-
-            return $node;
-        } elseif ($this->inAModule) {
-            // look for tags
-            if ($node->getNodeTag() && !isset($this->tags[$node->getNodeTag()])) {
-                $this->tags[$node->getNodeTag()] = $node;
-            }
-
-            // look for filters
-            if ($node instanceof Twig_Node_Expression_Filter && !isset($this->filters[$node->getNode('filter')->getAttribute('value')])) {
-                $this->filters[$node->getNode('filter')->getAttribute('value')] = $node;
-            }
-
-            // look for functions
-            if ($node instanceof Twig_Node_Expression_Function && !isset($this->functions[$node->getAttribute('name')])) {
-                $this->functions[$node->getAttribute('name')] = $node;
-            }
-
-            // wrap print to check __toString() calls
-            if ($node instanceof Twig_Node_Print) {
-                return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getLine(), $node->getNodeTag());
-            }
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = false;
-
-            $node->setNode('display_start', new Twig_Node(array(new Twig_Node_CheckSecurity($this->filters, $this->tags, $this->functions), $node->getNode('display_start'))));
-        }
-
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
deleted file mode 100644
index f276163..0000000
--- a/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitorInterface is the interface the all node visitor classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeVisitorInterface
-{
-    /**
-     * Called before child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @return Twig_NodeInterface The modified node
-     */
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @param Twig_NodeInterface $node The node to visit
-     * @param Twig_Environment   $env  The Twig environment instance
-     *
-     * @return Twig_NodeInterface|false The modified node or false if the node must be removed
-     */
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Returns the priority for this visitor.
-     *
-     * Priority should be between -10 and 10 (0 is the default).
-     *
-     * @return int The priority level
-     */
-    public function getPriority();
-}
diff --git a/vendor/twig/twig/lib/Twig/Parser.php b/vendor/twig/twig/lib/Twig/Parser.php
deleted file mode 100644
index ed28a0e..0000000
--- a/vendor/twig/twig/lib/Twig/Parser.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default parser implementation.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Parser implements Twig_ParserInterface
-{
-    protected $stack = array();
-    protected $stream;
-    protected $parent;
-    protected $handlers;
-    protected $visitors;
-    protected $expressionParser;
-    protected $blocks;
-    protected $blockStack;
-    protected $macros;
-    protected $env;
-    protected $reservedMacroNames;
-    protected $importedSymbols;
-    protected $traits;
-    protected $embeddedTemplates = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    public function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
-    }
-
-    public function getFilename()
-    {
-        return $this->stream->getFilename();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false)
-    {
-        // push all variables into the stack to keep the current state of the parser
-        $vars = get_object_vars($this);
-        unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser'], $vars['reservedMacroNames']);
-        $this->stack[] = $vars;
-
-        // tag handlers
-        if (null === $this->handlers) {
-            $this->handlers = $this->env->getTokenParsers();
-            $this->handlers->setParser($this);
-        }
-
-        // node visitors
-        if (null === $this->visitors) {
-            $this->visitors = $this->env->getNodeVisitors();
-        }
-
-        if (null === $this->expressionParser) {
-            $this->expressionParser = new Twig_ExpressionParser($this, $this->env->getUnaryOperators(), $this->env->getBinaryOperators());
-        }
-
-        $this->stream = $stream;
-        $this->parent = null;
-        $this->blocks = array();
-        $this->macros = array();
-        $this->traits = array();
-        $this->blockStack = array();
-        $this->importedSymbols = array(array());
-        $this->embeddedTemplates = array();
-
-        try {
-            $body = $this->subparse($test, $dropNeedle);
-
-            if (null !== $this->parent && null === $body = $this->filterBodyNodes($body)) {
-                $body = new Twig_Node();
-            }
-        } catch (Twig_Error_Syntax $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($this->getFilename());
-            }
-
-            if (!$e->getTemplateLine()) {
-                $e->setTemplateLine($this->stream->getCurrent()->getLine());
-            }
-
-            throw $e;
-        }
-
-        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $this->getFilename());
-
-        $traverser = new Twig_NodeTraverser($this->env, $this->visitors);
-
-        $node = $traverser->traverse($node);
-
-        // restore previous stack so previous parse() call can resume working
-        foreach (array_pop($this->stack) as $key => $val) {
-            $this->$key = $val;
-        }
-
-        return $node;
-    }
-
-    public function subparse($test, $dropNeedle = false)
-    {
-        $lineno = $this->getCurrentToken()->getLine();
-        $rv = array();
-        while (!$this->stream->isEOF()) {
-            switch ($this->getCurrentToken()->getType()) {
-                case Twig_Token::TEXT_TYPE:
-                    $token = $this->stream->next();
-                    $rv[] = new Twig_Node_Text($token->getValue(), $token->getLine());
-                    break;
-
-                case Twig_Token::VAR_START_TYPE:
-                    $token = $this->stream->next();
-                    $expr = $this->expressionParser->parseExpression();
-                    $this->stream->expect(Twig_Token::VAR_END_TYPE);
-                    $rv[] = new Twig_Node_Print($expr, $token->getLine());
-                    break;
-
-                case Twig_Token::BLOCK_START_TYPE:
-                    $this->stream->next();
-                    $token = $this->getCurrentToken();
-
-                    if ($token->getType() !== Twig_Token::NAME_TYPE) {
-                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->getFilename());
-                    }
-
-                    if (null !== $test && call_user_func($test, $token)) {
-                        if ($dropNeedle) {
-                            $this->stream->next();
-                        }
-
-                        if (1 === count($rv)) {
-                            return $rv[0];
-                        }
-
-                        return new Twig_Node($rv, array(), $lineno);
-                    }
-
-                    $subparser = $this->handlers->getTokenParser($token->getValue());
-                    if (null === $subparser) {
-                        if (null !== $test) {
-                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->getFilename());
-
-                            if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {
-                                $e->appendMessage(sprintf(' (expecting closing tag for the "%s" tag defined near line %s).', $test[0]->getTag(), $lineno));
-                            }
-                        } else {
-                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->getFilename());
-                            $e->addSuggestions($token->getValue(), array_keys($this->env->getTags()));
-                        }
-
-                        throw $e;
-                    }
-
-                    $this->stream->next();
-
-                    $node = $subparser->parse($token);
-                    if (null !== $node) {
-                        $rv[] = $node;
-                    }
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->getFilename());
-            }
-        }
-
-        if (1 === count($rv)) {
-            return $rv[0];
-        }
-
-        return new Twig_Node($rv, array(), $lineno);
-    }
-
-    public function addHandler($name, $class)
-    {
-        $this->handlers[$name] = $class;
-    }
-
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        $this->visitors[] = $visitor;
-    }
-
-    public function getBlockStack()
-    {
-        return $this->blockStack;
-    }
-
-    public function peekBlockStack()
-    {
-        return $this->blockStack[count($this->blockStack) - 1];
-    }
-
-    public function popBlockStack()
-    {
-        array_pop($this->blockStack);
-    }
-
-    public function pushBlockStack($name)
-    {
-        $this->blockStack[] = $name;
-    }
-
-    public function hasBlock($name)
-    {
-        return isset($this->blocks[$name]);
-    }
-
-    public function getBlock($name)
-    {
-        return $this->blocks[$name];
-    }
-
-    public function setBlock($name, Twig_Node_Block $value)
-    {
-        $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getLine());
-    }
-
-    public function hasMacro($name)
-    {
-        return isset($this->macros[$name]);
-    }
-
-    public function setMacro($name, Twig_Node_Macro $node)
-    {
-        if ($this->isReservedMacroName($name)) {
-            throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword.', $name), $node->getLine(), $this->getFilename());
-        }
-
-        $this->macros[$name] = $node;
-    }
-
-    public function isReservedMacroName($name)
-    {
-        if (null === $this->reservedMacroNames) {
-            $this->reservedMacroNames = array();
-            $r = new ReflectionClass($this->env->getBaseTemplateClass());
-            foreach ($r->getMethods() as $method) {
-                $methodName = strtolower($method->getName());
-
-                if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) {
-                    $this->reservedMacroNames[] = substr($methodName, 3);
-                }
-            }
-        }
-
-        return in_array(strtolower($name), $this->reservedMacroNames);
-    }
-
-    public function addTrait($trait)
-    {
-        $this->traits[] = $trait;
-    }
-
-    public function hasTraits()
-    {
-        return count($this->traits) > 0;
-    }
-
-    public function embedTemplate(Twig_Node_Module $template)
-    {
-        $template->setIndex(mt_rand());
-
-        $this->embeddedTemplates[] = $template;
-    }
-
-    public function addImportedSymbol($type, $alias, $name = null, Twig_Node_Expression $node = null)
-    {
-        $this->importedSymbols[0][$type][$alias] = array('name' => $name, 'node' => $node);
-    }
-
-    public function getImportedSymbol($type, $alias)
-    {
-        foreach ($this->importedSymbols as $functions) {
-            if (isset($functions[$type][$alias])) {
-                return $functions[$type][$alias];
-            }
-        }
-    }
-
-    public function isMainScope()
-    {
-        return 1 === count($this->importedSymbols);
-    }
-
-    public function pushLocalScope()
-    {
-        array_unshift($this->importedSymbols, array());
-    }
-
-    public function popLocalScope()
-    {
-        array_shift($this->importedSymbols);
-    }
-
-    /**
-     * Gets the expression parser.
-     *
-     * @return Twig_ExpressionParser The expression parser
-     */
-    public function getExpressionParser()
-    {
-        return $this->expressionParser;
-    }
-
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * Gets the token stream.
-     *
-     * @return Twig_TokenStream The token stream
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Gets the current token.
-     *
-     * @return Twig_Token The current token
-     */
-    public function getCurrentToken()
-    {
-        return $this->stream->getCurrent();
-    }
-
-    protected function filterBodyNodes(Twig_NodeInterface $node)
-    {
-        // check that the body does not contain non-empty output nodes
-        if (
-            ($node instanceof Twig_Node_Text && !ctype_space($node->getAttribute('data')))
-            ||
-            (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
-        ) {
-            if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {
-                throw new Twig_Error_Syntax('A template that extends another one cannot have a body but a byte order mark (BOM) has been detected; it must be removed.', $node->getLine(), $this->getFilename());
-            }
-
-            throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->getFilename());
-        }
-
-        // bypass "set" nodes as they "capture" the output
-        if ($node instanceof Twig_Node_Set) {
-            return $node;
-        }
-
-        if ($node instanceof Twig_NodeOutputInterface) {
-            return;
-        }
-
-        foreach ($node as $k => $n) {
-            if (null !== $n && null === $this->filterBodyNodes($n)) {
-                $node->removeNode($k);
-            }
-        }
-
-        return $node;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/ParserInterface.php b/vendor/twig/twig/lib/Twig/ParserInterface.php
deleted file mode 100644
index 8e7cc0a..0000000
--- a/vendor/twig/twig/lib/Twig/ParserInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by parser classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_ParserInterface
-{
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @param Twig_TokenStream $stream A token stream instance
-     *
-     * @return Twig_Node_Module A node tree
-     *
-     * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
-     */
-    public function parse(Twig_TokenStream $stream);
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
deleted file mode 100644
index b82747a..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Dumper_Blackfire
-{
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        $data = array();
-        $this->dumpProfile('main()', $profile, $data);
-        $this->dumpChildren('main()', $profile, $data);
-
-        $start = microtime(true);
-        $str = <<<EOF
-file-format: BlackfireProbe
-cost-dimensions: wt mu pmu
-request-start: {$start}
-
-
-EOF;
-
-        foreach ($data as $name => $values) {
-            $str .= "{$name}//{$values['ct']} {$values['wt']} {$values['mu']} {$values['pmu']}\n";
-        }
-
-        return $str;
-    }
-
-    private function dumpChildren($parent, Twig_Profiler_Profile $profile, &$data)
-    {
-        foreach ($profile as $p) {
-            if ($p->isTemplate()) {
-                $name = $p->getTemplate();
-            } else {
-                $name = sprintf('%s::%s(%s)', $p->getTemplate(), $p->getType(), $p->getName());
-            }
-            $this->dumpProfile(sprintf('%s==>%s', $parent, $name), $p, $data);
-            $this->dumpChildren($name, $p, $data);
-        }
-    }
-
-    private function dumpProfile($edge, Twig_Profiler_Profile $profile, &$data)
-    {
-        if (isset($data[$edge])) {
-            $data[$edge]['ct'] += 1;
-            $data[$edge]['wt'] += floor($profile->getDuration() * 1000000);
-            $data[$edge]['mu'] += $profile->getMemoryUsage();
-            $data[$edge]['pmu'] += $profile->getPeakMemoryUsage();
-        } else {
-            $data[$edge] = array(
-                'ct' => 1,
-                'wt' => floor($profile->getDuration() * 1000000),
-                'mu' => $profile->getMemoryUsage(),
-                'pmu' => $profile->getPeakMemoryUsage(),
-            );
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
deleted file mode 100644
index f066da7..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
-{
-    private static $colors = array(
-        'block' => '#dfd',
-        'macro' => '#ddf',
-        'template' => '#ffd',
-        'big' => '#d44',
-    );
-
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        return '<pre>'.parent::dump($profile).'</pre>';
-    }
-
-    protected function formatTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ <span style="background-color: %s">%s</span>', $prefix, self::$colors['template'], $profile->getTemplate());
-    }
-
-    protected function formatNonTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s::%s(<span style="background-color: %s">%s</span>)', $prefix, $profile->getTemplate(), $profile->getType(), isset(self::$colors[$profile->getType()]) ? self::$colors[$profile->getType()] : 'auto', $profile->getName());
-    }
-
-    protected function formatTime(Twig_Profiler_Profile $profile, $percent)
-    {
-        return sprintf('<span style="color: %s">%.2fms/%.0f%%</span>', $percent > 20 ? self::$colors['big'] : 'auto', $profile->getDuration() * 1000, $percent);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
deleted file mode 100644
index 998e210..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Dumper_Text
-{
-    private $root;
-
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        return $this->dumpProfile($profile);
-    }
-
-    protected function formatTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s', $prefix, $profile->getTemplate());
-    }
-
-    protected function formatNonTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s::%s(%s)', $prefix, $profile->getTemplate(), $profile->getType(), $profile->getName());
-    }
-
-    protected function formatTime(Twig_Profiler_Profile $profile, $percent)
-    {
-        return sprintf('%.2fms/%.0f%%', $profile->getDuration() * 1000, $percent);
-    }
-
-    private function dumpProfile(Twig_Profiler_Profile $profile, $prefix = '', $sibling = false)
-    {
-        if ($profile->isRoot()) {
-            $this->root = $profile->getDuration();
-            $start = $profile->getName();
-        } else {
-            if ($profile->isTemplate()) {
-                $start = $this->formatTemplate($profile, $prefix);
-            } else {
-                $start = $this->formatNonTemplate($profile, $prefix);
-            }
-            $prefix .= $sibling ? '│ ' : '  ';
-        }
-
-        $percent = $this->root ? $profile->getDuration() / $this->root * 100 : 0;
-
-        if ($profile->getDuration() * 1000 < 1) {
-            $str = $start."\n";
-        } else {
-            $str = sprintf("%s %s\n", $start, $this->formatTime($profile, $percent));
-        }
-
-        $nCount = count($profile->getProfiles());
-        foreach ($profile as $i => $p) {
-            $str .= $this->dumpProfile($p, $prefix, $i + 1 !== $nCount);
-        }
-
-        return $str;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
deleted file mode 100644
index 2f97214..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a profile enter node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Node_EnterProfile extends Twig_Node
-{
-    public function __construct($extensionName, $type, $name, $varName)
-    {
-        parent::__construct(array(), array('extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write(sprintf('$%s = $this->env->getExtension(', $this->getAttribute('var_name')))
-            ->repr($this->getAttribute('extension_name'))
-            ->raw(");\n")
-            ->write(sprintf('$%s->enter($%s = new Twig_Profiler_Profile($this->getTemplateName(), ', $this->getAttribute('var_name'), $this->getAttribute('var_name').'_prof'))
-            ->repr($this->getAttribute('type'))
-            ->raw(', ')
-            ->repr($this->getAttribute('name'))
-            ->raw("));\n\n")
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
deleted file mode 100644
index 88074c2..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a profile leave node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Node_LeaveProfile extends Twig_Node
-{
-    public function __construct($varName)
-    {
-        parent::__construct(array(), array('var_name' => $varName));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("\n")
-            ->write(sprintf("\$%s->leave(\$%s);\n\n", $this->getAttribute('var_name'), $this->getAttribute('var_name').'_prof'))
-        ;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php b/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
deleted file mode 100644
index 4b0baa8..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
-{
-    private $extensionName;
-
-    public function __construct($extensionName)
-    {
-        $this->extensionName = $extensionName;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        return $node;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $varName = $this->getVarName();
-            $node->setNode('display_start', new Twig_Node(array(new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getAttribute('filename'), $varName), $node->getNode('display_start'))));
-            $node->setNode('display_end', new Twig_Node(array(new Twig_Profiler_Node_LeaveProfile($varName), $node->getNode('display_end'))));
-        } elseif ($node instanceof Twig_Node_Block) {
-            $varName = $this->getVarName();
-            $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::BLOCK, $node->getAttribute('name'), $varName),
-                $node->getNode('body'),
-                new Twig_Profiler_Node_LeaveProfile($varName),
-            )));
-        } elseif ($node instanceof Twig_Node_Macro) {
-            $varName = $this->getVarName();
-            $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::MACRO, $node->getAttribute('name'), $varName),
-                $node->getNode('body'),
-                new Twig_Profiler_Node_LeaveProfile($varName),
-            )));
-        }
-
-        return $node;
-    }
-
-    private function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPriority()
-    {
-        return 0;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Profiler/Profile.php b/vendor/twig/twig/lib/Twig/Profiler/Profile.php
deleted file mode 100644
index 104bc05..0000000
--- a/vendor/twig/twig/lib/Twig/Profiler/Profile.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2015 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Profile implements IteratorAggregate, Serializable
-{
-    const ROOT = 'ROOT';
-    const BLOCK = 'block';
-    const TEMPLATE = 'template';
-    const MACRO = 'macro';
-
-    private $template;
-    private $name;
-    private $type;
-    private $starts = array();
-    private $ends = array();
-    private $profiles = array();
-
-    public function __construct($template = 'main', $type = self::ROOT, $name = 'main')
-    {
-        $this->template = $template;
-        $this->type = $type;
-        $this->name = 0 === strpos($name, '__internal_') ? 'INTERNAL' : $name;
-        $this->enter();
-    }
-
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function isRoot()
-    {
-        return self::ROOT === $this->type;
-    }
-
-    public function isTemplate()
-    {
-        return self::TEMPLATE === $this->type;
-    }
-
-    public function isBlock()
-    {
-        return self::BLOCK === $this->type;
-    }
-
-    public function isMacro()
-    {
-        return self::MACRO === $this->type;
-    }
-
-    public function getProfiles()
-    {
-        return $this->profiles;
-    }
-
-    public function addProfile(Twig_Profiler_Profile $profile)
-    {
-        $this->profiles[] = $profile;
-    }
-
-    /**
-     * Returns the duration in microseconds.
-     *
-     * @return int
-     */
-    public function getDuration()
-    {
-        if ($this->isRoot() && $this->profiles) {
-            // for the root node with children, duration is the sum of all child durations
-            $duration = 0;
-            foreach ($this->profiles as $profile) {
-                $duration += $profile->getDuration();
-            }
-
-            return $duration;
-        }
-
-        return isset($this->ends['wt']) && isset($this->starts['wt']) ? $this->ends['wt'] - $this->starts['wt'] : 0;
-    }
-
-    /**
-     * Returns the memory usage in bytes.
-     *
-     * @return int
-     */
-    public function getMemoryUsage()
-    {
-        return isset($this->ends['mu']) && isset($this->starts['mu']) ? $this->ends['mu'] - $this->starts['mu'] : 0;
-    }
-
-    /**
-     * Returns the peak memory usage in bytes.
-     *
-     * @return int
-     */
-    public function getPeakMemoryUsage()
-    {
-        return isset($this->ends['pmu']) && isset($this->starts['pmu']) ? $this->ends['pmu'] - $this->starts['pmu'] : 0;
-    }
-
-    /**
-     * Starts the profiling.
-     */
-    public function enter()
-    {
-        $this->starts = array(
-            'wt' => microtime(true),
-            'mu' => memory_get_usage(),
-            'pmu' => memory_get_peak_usage(),
-        );
-    }
-
-    /**
-     * Stops the profiling.
-     */
-    public function leave()
-    {
-        $this->ends = array(
-            'wt' => microtime(true),
-            'mu' => memory_get_usage(),
-            'pmu' => memory_get_peak_usage(),
-        );
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->profiles);
-    }
-
-    public function serialize()
-    {
-        return serialize(array($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles));
-    }
-
-    public function unserialize($data)
-    {
-        list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = unserialize($data);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
deleted file mode 100644
index 015bfae..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a security error occurs at runtime.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityError extends Twig_Error
-{
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
deleted file mode 100644
index 99faba9..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed filter is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedFilterError extends Twig_Sandbox_SecurityError
-{
-    private $filterName;
-
-    public function __construct($message, $functionName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->filterName = $functionName;
-    }
-
-    public function getFilterName()
-    {
-        return $this->filterName;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
deleted file mode 100644
index 05cf488..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed function is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedFunctionError extends Twig_Sandbox_SecurityError
-{
-    private $functionName;
-
-    public function __construct($message, $functionName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->functionName = $functionName;
-    }
-
-    public function getFunctionName()
-    {
-        return $this->functionName;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
deleted file mode 100644
index b3bb5e8..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed tag is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedTagError extends Twig_Sandbox_SecurityError
-{
-    private $tagName;
-
-    public function __construct($message, $tagName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->tagName = $tagName;
-    }
-
-    public function getTagName()
-    {
-        return $this->tagName;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
deleted file mode 100644
index c4dd03d..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a security policy which need to be enforced when sandbox mode is enabled.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
-{
-    protected $allowedTags;
-    protected $allowedFilters;
-    protected $allowedMethods;
-    protected $allowedProperties;
-    protected $allowedFunctions;
-
-    public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array())
-    {
-        $this->allowedTags = $allowedTags;
-        $this->allowedFilters = $allowedFilters;
-        $this->setAllowedMethods($allowedMethods);
-        $this->allowedProperties = $allowedProperties;
-        $this->allowedFunctions = $allowedFunctions;
-    }
-
-    public function setAllowedTags(array $tags)
-    {
-        $this->allowedTags = $tags;
-    }
-
-    public function setAllowedFilters(array $filters)
-    {
-        $this->allowedFilters = $filters;
-    }
-
-    public function setAllowedMethods(array $methods)
-    {
-        $this->allowedMethods = array();
-        foreach ($methods as $class => $m) {
-            $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : array($m));
-        }
-    }
-
-    public function setAllowedProperties(array $properties)
-    {
-        $this->allowedProperties = $properties;
-    }
-
-    public function setAllowedFunctions(array $functions)
-    {
-        $this->allowedFunctions = $functions;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        foreach ($tags as $tag) {
-            if (!in_array($tag, $this->allowedTags)) {
-                throw new Twig_Sandbox_SecurityNotAllowedTagError(sprintf('Tag "%s" is not allowed.', $tag), $tag);
-            }
-        }
-
-        foreach ($filters as $filter) {
-            if (!in_array($filter, $this->allowedFilters)) {
-                throw new Twig_Sandbox_SecurityNotAllowedFilterError(sprintf('Filter "%s" is not allowed.', $filter), $filter);
-            }
-        }
-
-        foreach ($functions as $function) {
-            if (!in_array($function, $this->allowedFunctions)) {
-                throw new Twig_Sandbox_SecurityNotAllowedFunctionError(sprintf('Function "%s" is not allowed.', $function), $function);
-            }
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($obj instanceof Twig_TemplateInterface || $obj instanceof Twig_Markup) {
-            return true;
-        }
-
-        $allowed = false;
-        $method = strtolower($method);
-        foreach ($this->allowedMethods as $class => $methods) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($method, $methods);
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, get_class($obj)));
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $property)
-    {
-        $allowed = false;
-        foreach ($this->allowedProperties as $class => $properties) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($property, is_array($properties) ? $properties : array($properties));
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, get_class($obj)));
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
deleted file mode 100644
index 6ab48e3..0000000
--- a/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interfaces that all security policy classes must implements.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Sandbox_SecurityPolicyInterface
-{
-    public function checkSecurity($tags, $filters, $functions);
-
-    public function checkMethodAllowed($obj, $method);
-
-    public function checkPropertyAllowed($obj, $method);
-}
diff --git a/vendor/twig/twig/lib/Twig/SimpleFilter.php b/vendor/twig/twig/lib/Twig/SimpleFilter.php
deleted file mode 100644
index cefc4f5..0000000
--- a/vendor/twig/twig/lib/Twig/SimpleFilter.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009-2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleFilter
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'is_variadic' => false,
-            'is_safe' => null,
-            'is_safe_callback' => null,
-            'pre_escape' => null,
-            'preserves_safety' => null,
-            'node_class' => 'Twig_Node_Expression_Filter',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (null !== $this->options['is_safe']) {
-            return $this->options['is_safe'];
-        }
-
-        if (null !== $this->options['is_safe_callback']) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-    }
-
-    public function getPreservesSafety()
-    {
-        return $this->options['preserves_safety'];
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/SimpleFunction.php b/vendor/twig/twig/lib/Twig/SimpleFunction.php
deleted file mode 100644
index 7973540..0000000
--- a/vendor/twig/twig/lib/Twig/SimpleFunction.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010-2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleFunction
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'is_variadic' => false,
-            'is_safe' => null,
-            'is_safe_callback' => null,
-            'node_class' => 'Twig_Node_Expression_Function',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (null !== $this->options['is_safe']) {
-            return $this->options['is_safe'];
-        }
-
-        if (null !== $this->options['is_safe_callback']) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/SimpleTest.php b/vendor/twig/twig/lib/Twig/SimpleTest.php
deleted file mode 100644
index 8ba2192..0000000
--- a/vendor/twig/twig/lib/Twig/SimpleTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010-2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleTest
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'is_variadic' => false,
-            'node_class' => 'Twig_Node_Expression_Test',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
deleted file mode 100644
index a816022..0000000
--- a/vendor/twig/twig/lib/Twig/Template.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default base class for compiled templates.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Template implements Twig_TemplateInterface
-{
-    protected static $cache = array();
-
-    protected $parent;
-    protected $parents = array();
-    protected $env;
-    protected $blocks = array();
-    protected $traits = array();
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env A Twig_Environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * Returns the template name.
-     *
-     * @return string The template name
-     */
-    abstract public function getTemplateName();
-
-    /**
-     * @deprecated since 1.20 (to be removed in 2.0)
-     */
-    public function getEnvironment()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.20 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-        return $this->env;
-    }
-
-    /**
-     * Returns the parent template.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param array $context
-     *
-     * @return Twig_TemplateInterface|false The parent template or false if there is no parent
-     *
-     * @internal
-     */
-    public function getParent(array $context)
-    {
-        if (null !== $this->parent) {
-            return $this->parent;
-        }
-
-        try {
-            $parent = $this->doGetParent($context);
-
-            if (false === $parent) {
-                return false;
-            }
-
-            if ($parent instanceof self) {
-                return $this->parents[$parent->getTemplateName()] = $parent;
-            }
-
-            if (!isset($this->parents[$parent])) {
-                $this->parents[$parent] = $this->loadTemplate($parent);
-            }
-        } catch (Twig_Error_Loader $e) {
-            $e->setTemplateFile(null);
-            $e->guess();
-
-            throw $e;
-        }
-
-        return $this->parents[$parent];
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return false;
-    }
-
-    public function isTraitable()
-    {
-        return true;
-    }
-
-    /**
-     * Displays a parent block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name    The block name to display from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @internal
-     */
-    public function displayParentBlock($name, array $context, array $blocks = array())
-    {
-        $name = (string) $name;
-
-        if (isset($this->traits[$name])) {
-            $this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
-        } elseif (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, $blocks, false);
-        } else {
-            throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block', $name), -1, $this->getTemplateName());
-        }
-    }
-
-    /**
-     * Displays a block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name      The block name to display
-     * @param array  $context   The context
-     * @param array  $blocks    The current set of blocks
-     * @param bool   $useBlocks Whether to use the current set of blocks
-     *
-     * @internal
-     */
-    public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
-    {
-        $name = (string) $name;
-
-        if ($useBlocks && isset($blocks[$name])) {
-            $template = $blocks[$name][0];
-            $block = $blocks[$name][1];
-        } elseif (isset($this->blocks[$name])) {
-            $template = $this->blocks[$name][0];
-            $block = $this->blocks[$name][1];
-        } else {
-            $template = null;
-            $block = null;
-        }
-
-        if (null !== $template) {
-            // avoid RCEs when sandbox is enabled
-            if (!$template instanceof self) {
-                throw new LogicException('A block must be a method on a Twig_Template instance.');
-            }
-
-            try {
-                $template->$block($context, $blocks);
-            } catch (Twig_Error $e) {
-                if (!$e->getTemplateFile()) {
-                    $e->setTemplateFile($template->getTemplateName());
-                }
-
-                // this is mostly useful for Twig_Error_Loader exceptions
-                // see Twig_Error_Loader
-                if (false === $e->getTemplateLine()) {
-                    $e->setTemplateLine(-1);
-                    $e->guess();
-                }
-
-                throw $e;
-            } catch (Exception $e) {
-                throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getTemplateName(), $e);
-            }
-        } elseif (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
-        }
-    }
-
-    /**
-     * Renders a parent block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name    The block name to render from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @return string The rendered block
-     *
-     * @internal
-     */
-    public function renderParentBlock($name, array $context, array $blocks = array())
-    {
-        ob_start();
-        $this->displayParentBlock($name, $context, $blocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Renders a block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name      The block name to render
-     * @param array  $context   The context
-     * @param array  $blocks    The current set of blocks
-     * @param bool   $useBlocks Whether to use the current set of blocks
-     *
-     * @return string The rendered block
-     *
-     * @internal
-     */
-    public function renderBlock($name, array $context, array $blocks = array(), $useBlocks = true)
-    {
-        ob_start();
-        $this->displayBlock($name, $context, $blocks, $useBlocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Returns whether a block exists or not.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * This method does only return blocks defined in the current template
-     * or defined in "used" traits.
-     *
-     * It does not return blocks from parent templates as the parent
-     * template name can be dynamic, which is only known based on the
-     * current context.
-     *
-     * @param string $name The block name
-     *
-     * @return bool true if the block exists, false otherwise
-     *
-     * @internal
-     */
-    public function hasBlock($name)
-    {
-        return isset($this->blocks[(string) $name]);
-    }
-
-    /**
-     * Returns all block names.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @return array An array of block names
-     *
-     * @see hasBlock
-     *
-     * @internal
-     */
-    public function getBlockNames()
-    {
-        return array_keys($this->blocks);
-    }
-
-    protected function loadTemplate($template, $templateName = null, $line = null, $index = null)
-    {
-        try {
-            if (is_array($template)) {
-                return $this->env->resolveTemplate($template);
-            }
-
-            if ($template instanceof self) {
-                return $template;
-            }
-
-            return $this->env->loadTemplate($template, $index);
-        } catch (Twig_Error $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($templateName ? $templateName : $this->getTemplateName());
-            }
-
-            if ($e->getTemplateLine()) {
-                throw $e;
-            }
-
-            if (!$line) {
-                $e->guess();
-            } else {
-                $e->setTemplateLine($line);
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns all blocks.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @return array An array of blocks
-     *
-     * @see hasBlock
-     *
-     * @internal
-     */
-    public function getBlocks()
-    {
-        return $this->blocks;
-    }
-
-    /**
-     * Returns the template source code.
-     *
-     * @return string|null The template source code or null if it is not available
-     */
-    public function getSource()
-    {
-        $reflector = new ReflectionClass($this);
-        $file = $reflector->getFileName();
-
-        if (!file_exists($file)) {
-            return;
-        }
-
-        $source = file($file, FILE_IGNORE_NEW_LINES);
-        array_splice($source, 0, $reflector->getEndLine());
-
-        $i = 0;
-        while (isset($source[$i]) && '/* */' === substr_replace($source[$i], '', 3, -2)) {
-            $source[$i] = str_replace('*//* ', '*/', substr($source[$i], 3, -2));
-            ++$i;
-        }
-        array_splice($source, $i);
-
-        return implode("\n", $source);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function display(array $context, array $blocks = array())
-    {
-        $this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render(array $context)
-    {
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->display($context);
-        } catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        }
-
-        return ob_get_clean();
-    }
-
-    protected function displayWithErrorHandling(array $context, array $blocks = array())
-    {
-        try {
-            $this->doDisplay($context, $blocks);
-        } catch (Twig_Error $e) {
-            if (!$e->getTemplateFile()) {
-                $e->setTemplateFile($this->getTemplateName());
-            }
-
-            // this is mostly useful for Twig_Error_Loader exceptions
-            // see Twig_Error_Loader
-            if (false === $e->getTemplateLine()) {
-                $e->setTemplateLine(-1);
-                $e->guess();
-            }
-
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
-        }
-    }
-
-    /**
-     * Auto-generated method to display the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    abstract protected function doDisplay(array $context, array $blocks = array());
-
-    /**
-     * Returns a variable from the context.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * This method should not be overridden in a sub-class as this is an
-     * implementation detail that has been introduced to optimize variable
-     * access for versions of PHP before 5.4. This is not a way to override
-     * the way to get a variable value.
-     *
-     * @param array  $context           The context
-     * @param string $item              The variable to return from the context
-     * @param bool   $ignoreStrictCheck Whether to ignore the strict variable check or not
-     *
-     * @return mixed The content of the context variable
-     *
-     * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode
-     *
-     * @internal
-     */
-    final protected function getContext($context, $item, $ignoreStrictCheck = false)
-    {
-        if (!array_key_exists($item, $context)) {
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item), -1, $this->getTemplateName());
-        }
-
-        return $context[$item];
-    }
-
-    /**
-     * Returns the attribute value for a given array/object.
-     *
-     * @param mixed  $object            The object or array from where to get the item
-     * @param mixed  $item              The item to get from the array or object
-     * @param array  $arguments         An array of arguments to pass if the item is an object method
-     * @param string $type              The type of attribute (@see Twig_Template constants)
-     * @param bool   $isDefinedTest     Whether this is only a defined check
-     * @param bool   $ignoreStrictCheck Whether to ignore the strict attribute check or not
-     *
-     * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
-     *
-     * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
-     */
-    protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
-    {
-        // array
-        if (self::METHOD_CALL !== $type) {
-            $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
-
-            if ((is_array($object) && array_key_exists($arrayItem, $object))
-                || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
-            ) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                return $object[$arrayItem];
-            }
-
-            if (self::ARRAY_CALL === $type || !is_object($object)) {
-                if ($isDefinedTest) {
-                    return false;
-                }
-
-                if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                    return;
-                }
-
-                if ($object instanceof ArrayAccess) {
-                    $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist', $arrayItem, get_class($object));
-                } elseif (is_object($object)) {
-                    $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface', $item, get_class($object));
-                } elseif (is_array($object)) {
-                    if (empty($object)) {
-                        $message = sprintf('Key "%s" does not exist as the array is empty', $arrayItem);
-                    } else {
-                        $message = sprintf('Key "%s" for array with keys "%s" does not exist', $arrayItem, implode(', ', array_keys($object)));
-                    }
-                } elseif (self::ARRAY_CALL === $type) {
-                    if (null === $object) {
-                        $message = sprintf('Impossible to access a key ("%s") on a null variable', $item);
-                    } else {
-                        $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
-                    }
-                } elseif (null === $object) {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a null variable', $item);
-                } else {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
-                }
-
-                throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
-            }
-        }
-
-        if (!is_object($object)) {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            if (null === $object) {
-                $message = sprintf('Impossible to invoke a method ("%s") on a null variable', $item);
-            } else {
-                $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
-            }
-
-            throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
-        }
-
-        // object property
-        if (self::METHOD_CALL !== $type && !$object instanceof self) { // Twig_Template does not have public properties, and we don't want to allow access to internal ones
-            if (isset($object->$item) || array_key_exists((string) $item, $object)) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                if ($this->env->hasExtension('sandbox')) {
-                    $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
-                }
-
-                return $object->$item;
-            }
-        }
-
-        $class = get_class($object);
-
-        // object method
-        if (!isset(self::$cache[$class]['methods'])) {
-            // get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
-            if ($object instanceof self) {
-                $ref = new ReflectionClass($class);
-                $methods = array();
-
-                foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
-                    $methodName = strtolower($refMethod->name);
-
-                    // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
-                    if ('getenvironment' !== $methodName) {
-                        $methods[$methodName] = true;
-                    }
-                }
-
-                self::$cache[$class]['methods'] = $methods;
-            } else {
-                self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object)));
-            }
-        }
-
-        $call = false;
-        $lcItem = strtolower($item);
-        if (isset(self::$cache[$class]['methods'][$lcItem])) {
-            $method = (string) $item;
-        } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
-            $method = 'get'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
-            $method = 'is'.$item;
-        } elseif (isset(self::$cache[$class]['methods']['__call'])) {
-            $method = (string) $item;
-            $call = true;
-        } else {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)), -1, $this->getTemplateName());
-        }
-
-        if ($isDefinedTest) {
-            return true;
-        }
-
-        if ($this->env->hasExtension('sandbox')) {
-            $this->env->getExtension('sandbox')->checkMethodAllowed($object, $method);
-        }
-
-        // Some objects throw exceptions when they have __call, and the method we try
-        // to call is not supported. If ignoreStrictCheck is true, we should return null.
-        try {
-            $ret = call_user_func_array(array($object, $method), $arguments);
-        } catch (BadMethodCallException $e) {
-            if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
-                return;
-            }
-            throw $e;
-        }
-
-        // useful when calling a template method from a template
-        // this is not supported but unfortunately heavily used in the Symfony profiler
-        if ($object instanceof Twig_TemplateInterface) {
-            return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
-        }
-
-        return $ret;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TemplateInterface.php b/vendor/twig/twig/lib/Twig/TemplateInterface.php
deleted file mode 100644
index 3274640..0000000
--- a/vendor/twig/twig/lib/Twig/TemplateInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by all compiled templates.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_TemplateInterface
-{
-    const ANY_CALL = 'any';
-    const ARRAY_CALL = 'array';
-    const METHOD_CALL = 'method';
-
-    /**
-     * Renders the template with the given context and returns it as string.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render(array $context);
-
-    /**
-     * Displays the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    public function display(array $context, array $blocks = array());
-
-    /**
-     * Returns the bound environment for this template.
-     *
-     * @return Twig_Environment The current environment
-     */
-    public function getEnvironment();
-}
diff --git a/vendor/twig/twig/lib/Twig/Test.php b/vendor/twig/twig/lib/Twig/Test.php
deleted file mode 100644
index 3c2d859..0000000
--- a/vendor/twig/twig/lib/Twig/Test.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Test implements Twig_TestInterface, Twig_TestCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'callable' => null,
-        ), $options);
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/Function.php b/vendor/twig/twig/lib/Twig/Test/Function.php
deleted file mode 100644
index 5e76c71..0000000
--- a/vendor/twig/twig/lib/Twig/Test/Function.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Function extends Twig_Test
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
deleted file mode 100644
index 45ca7dc..0000000
--- a/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Integration test helper.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Karma Dordrak <drak@zikula.org>
- */
-abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @return string
-     */
-    abstract protected function getFixturesDir();
-
-    /**
-     * @return Twig_ExtensionInterface[]
-     */
-    protected function getExtensions()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleFilter[]
-     */
-    protected function getTwigFilters()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleFunction[]
-     */
-    protected function getTwigFunctions()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleTest[]
-     */
-    protected function getTwigTests()
-    {
-        return array();
-    }
-
-    /**
-     * @dataProvider getTests
-     */
-    public function testIntegration($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        $this->doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs);
-    }
-
-    /**
-     * @dataProvider getLegacyTests
-     * @group legacy
-     */
-    public function testLegacyIntegration($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        $this->doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs);
-    }
-
-    public function getTests($name, $legacyTests = false)
-    {
-        $fixturesDir = realpath($this->getFixturesDir());
-        $tests = array();
-
-        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($fixturesDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if (!preg_match('/\.test$/', $file)) {
-                continue;
-            }
-
-            if ($legacyTests xor false !== strpos($file->getRealpath(), '.legacy.test')) {
-                continue;
-            }
-
-            $test = file_get_contents($file->getRealpath());
-
-            if (preg_match('/--TEST--\s*(.*?)\s*(?:--CONDITION--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)\s*(?:--DATA--\s*(.*))?\s*--EXCEPTION--\s*(.*)/sx', $test, $match)) {
-                $message = $match[1];
-                $condition = $match[2];
-                $templates = self::parseTemplates($match[3]);
-                $exception = $match[5];
-                $outputs = array(array(null, $match[4], null, ''));
-            } elseif (preg_match('/--TEST--\s*(.*?)\s*(?:--CONDITION--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)--DATA--.*?--EXPECT--.*/s', $test, $match)) {
-                $message = $match[1];
-                $condition = $match[2];
-                $templates = self::parseTemplates($match[3]);
-                $exception = false;
-                preg_match_all('/--DATA--(.*?)(?:--CONFIG--(.*?))?--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $outputs, PREG_SET_ORDER);
-            } else {
-                throw new InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
-            }
-
-            $tests[] = array(str_replace($fixturesDir.'/', '', $file), $message, $condition, $templates, $exception, $outputs);
-        }
-
-        if ($legacyTests && empty($tests)) {
-            // add a dummy test to avoid a PHPUnit message
-            return array(array('not', '-', '', array(), '', array()));
-        }
-
-        return $tests;
-    }
-
-    public function getLegacyTests()
-    {
-        return $this->getTests('testLegacyIntegration', true);
-    }
-
-    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        if ($condition) {
-            eval('$ret = '.$condition.';');
-            if (!$ret) {
-                $this->markTestSkipped($condition);
-            }
-        }
-
-        $loader = new Twig_Loader_Array($templates);
-
-        foreach ($outputs as $i => $match) {
-            $config = array_merge(array(
-                'cache' => false,
-                'strict_variables' => true,
-            ), $match[2] ? eval($match[2].';') : array());
-            $twig = new Twig_Environment($loader, $config);
-            $twig->addGlobal('global', 'global');
-            foreach ($this->getExtensions() as $extension) {
-                $twig->addExtension($extension);
-            }
-
-            foreach ($this->getTwigFilters() as $filter) {
-                $twig->addFilter($filter);
-            }
-
-            foreach ($this->getTwigTests() as $test) {
-                $twig->addTest($test);
-            }
-
-            foreach ($this->getTwigFunctions() as $function) {
-                $twig->addFunction($function);
-            }
-
-            // avoid using the same PHP class name for different cases
-            // only for PHP 5.2+
-            if (PHP_VERSION_ID >= 50300) {
-                $p = new ReflectionProperty($twig, 'templateClassPrefix');
-                $p->setAccessible(true);
-                $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
-            }
-
-            try {
-                $template = $twig->loadTemplate('index.twig');
-            } catch (Exception $e) {
-                if (false !== $exception) {
-                    $message = $e->getMessage();
-                    $this->assertSame(trim($exception), trim(sprintf('%s: %s', get_class($e), $message)));
-                    $this->assertSame('.', substr($message, strlen($message) - 1), $message, 'Exception message must end with a dot.');
-
-                    return;
-                }
-
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateFile($file);
-
-                    throw $e;
-                }
-
-                throw new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-            }
-
-            try {
-                $output = trim($template->render(eval($match[1].';')), "\n ");
-            } catch (Exception $e) {
-                if (false !== $exception) {
-                    $this->assertSame(trim($exception), trim(sprintf('%s: %s', get_class($e), $e->getMessage())));
-
-                    return;
-                }
-
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateFile($file);
-                } else {
-                    $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-                }
-
-                $output = trim(sprintf('%s: %s', get_class($e), $e->getMessage()));
-            }
-
-            if (false !== $exception) {
-                list($class) = explode(':', $exception);
-                $this->assertThat(null, new PHPUnit_Framework_Constraint_Exception($class));
-            }
-
-            $expected = trim($match[3], "\n ");
-
-            if ($expected !== $output) {
-                printf("Compiled templates that failed on case %d:\n", $i + 1);
-
-                foreach (array_keys($templates) as $name) {
-                    echo "Template: $name\n";
-                    $source = $loader->getSource($name);
-                    echo $twig->compile($twig->parse($twig->tokenize($source, $name)));
-                }
-            }
-            $this->assertEquals($expected, $output, $message.' (in '.$file.')');
-        }
-    }
-
-    protected static function parseTemplates($test)
-    {
-        $templates = array();
-        preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            $templates[($match[1] ? $match[1] : 'index.twig')] = $match[2];
-        }
-
-        return $templates;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/Method.php b/vendor/twig/twig/lib/Twig/Test/Method.php
deleted file mode 100644
index 2779986..0000000
--- a/vendor/twig/twig/lib/Twig/Test/Method.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Method extends Twig_Test
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/Node.php b/vendor/twig/twig/lib/Twig/Test/Node.php
deleted file mode 100644
index baef49c..0000000
--- a/vendor/twig/twig/lib/Twig/Test/Node.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Test_Node class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test as a Node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Node extends Twig_Test
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
deleted file mode 100644
index e591c1d..0000000
--- a/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Test_NodeTestCase extends PHPUnit_Framework_TestCase
-{
-    abstract public function getTests();
-
-    /**
-     * @dataProvider getTests
-     */
-    public function testCompile($node, $source, $environment = null, $isPattern = false)
-    {
-        $this->assertNodeCompilation($source, $node, $environment, $isPattern);
-    }
-
-    public function assertNodeCompilation($source, Twig_Node $node, Twig_Environment $environment = null, $isPattern = false)
-    {
-        $compiler = $this->getCompiler($environment);
-        $compiler->compile($node);
-
-        if ($isPattern) {
-            $this->assertStringMatchesFormat($source, trim($compiler->getSource()));
-        } else {
-            $this->assertEquals($source, trim($compiler->getSource()));
-        }
-    }
-
-    protected function getCompiler(Twig_Environment $environment = null)
-    {
-        return new Twig_Compiler(null === $environment ? $this->getEnvironment() : $environment);
-    }
-
-    protected function getEnvironment()
-    {
-        return new Twig_Environment(new Twig_Loader_Array(array()));
-    }
-
-    protected function getVariableGetter($name, $line = false)
-    {
-        $line = $line > 0 ? "// line {$line}\n" : '';
-
-        if (PHP_VERSION_ID >= 50400) {
-            return sprintf('%s(isset($context["%s"]) ? $context["%s"] : null)', $line, $name, $name);
-        }
-
-        return sprintf('%s$this->getContext($context, "%s")', $line, $name);
-    }
-
-    protected function getAttributeGetter()
-    {
-        if (function_exists('twig_template_get_attributes')) {
-            return 'twig_template_get_attributes($this, ';
-        }
-
-        return '$this->getAttribute(';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/vendor/twig/twig/lib/Twig/TestCallableInterface.php
deleted file mode 100644
index 98d3457..0000000
--- a/vendor/twig/twig/lib/Twig/TestCallableInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestCallableInterface
-{
-    public function getCallable();
-}
diff --git a/vendor/twig/twig/lib/Twig/TestInterface.php b/vendor/twig/twig/lib/Twig/TestInterface.php
deleted file mode 100644
index 2fa821c..0000000
--- a/vendor/twig/twig/lib/Twig/TestInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestInterface
-{
-    /**
-     * Compiles a test.
-     *
-     * @return string The PHP code for the test
-     */
-    public function compile();
-}
diff --git a/vendor/twig/twig/lib/Twig/Token.php b/vendor/twig/twig/lib/Twig/Token.php
deleted file mode 100644
index a0a029b..0000000
--- a/vendor/twig/twig/lib/Twig/Token.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a Token.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Token
-{
-    protected $value;
-    protected $type;
-    protected $lineno;
-
-    const EOF_TYPE = -1;
-    const TEXT_TYPE = 0;
-    const BLOCK_START_TYPE = 1;
-    const VAR_START_TYPE = 2;
-    const BLOCK_END_TYPE = 3;
-    const VAR_END_TYPE = 4;
-    const NAME_TYPE = 5;
-    const NUMBER_TYPE = 6;
-    const STRING_TYPE = 7;
-    const OPERATOR_TYPE = 8;
-    const PUNCTUATION_TYPE = 9;
-    const INTERPOLATION_START_TYPE = 10;
-    const INTERPOLATION_END_TYPE = 11;
-
-    /**
-     * Constructor.
-     *
-     * @param int    $type   The type of the token
-     * @param string $value  The token value
-     * @param int    $lineno The line position in the source
-     */
-    public function __construct($type, $value, $lineno)
-    {
-        $this->type = $type;
-        $this->value = $value;
-        $this->lineno = $lineno;
-    }
-
-    /**
-     * Returns a string representation of the token.
-     *
-     * @return string A string representation of the token
-     */
-    public function __toString()
-    {
-        return sprintf('%s(%s)', self::typeToString($this->type, true), $this->value);
-    }
-
-    /**
-     * Tests the current token for a type and/or a value.
-     *
-     * Parameters may be:
-     * * just type
-     * * type and value (or array of possible values)
-     * * just value (or array of possible values) (NAME_TYPE is used as type)
-     *
-     * @param array|int         $type   The type to test
-     * @param array|string|null $values The token value
-     *
-     * @return bool
-     */
-    public function test($type, $values = null)
-    {
-        if (null === $values && !is_int($type)) {
-            $values = $type;
-            $type = self::NAME_TYPE;
-        }
-
-        return ($this->type === $type) && (
-            null === $values ||
-            (is_array($values) && in_array($this->value, $values)) ||
-            $this->value == $values
-        );
-    }
-
-    /**
-     * Gets the line.
-     *
-     * @return int The source line
-     */
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Gets the token type.
-     *
-     * @return int The token type
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Gets the token value.
-     *
-     * @return string The token value
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the constant representation (internal) of a given type.
-     *
-     * @param int  $type  The type as an integer
-     * @param bool $short Whether to return a short representation or not
-     *
-     * @return string The string representation
-     */
-    public static function typeToString($type, $short = false)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                $name = 'EOF_TYPE';
-                break;
-            case self::TEXT_TYPE:
-                $name = 'TEXT_TYPE';
-                break;
-            case self::BLOCK_START_TYPE:
-                $name = 'BLOCK_START_TYPE';
-                break;
-            case self::VAR_START_TYPE:
-                $name = 'VAR_START_TYPE';
-                break;
-            case self::BLOCK_END_TYPE:
-                $name = 'BLOCK_END_TYPE';
-                break;
-            case self::VAR_END_TYPE:
-                $name = 'VAR_END_TYPE';
-                break;
-            case self::NAME_TYPE:
-                $name = 'NAME_TYPE';
-                break;
-            case self::NUMBER_TYPE:
-                $name = 'NUMBER_TYPE';
-                break;
-            case self::STRING_TYPE:
-                $name = 'STRING_TYPE';
-                break;
-            case self::OPERATOR_TYPE:
-                $name = 'OPERATOR_TYPE';
-                break;
-            case self::PUNCTUATION_TYPE:
-                $name = 'PUNCTUATION_TYPE';
-                break;
-            case self::INTERPOLATION_START_TYPE:
-                $name = 'INTERPOLATION_START_TYPE';
-                break;
-            case self::INTERPOLATION_END_TYPE:
-                $name = 'INTERPOLATION_END_TYPE';
-                break;
-            default:
-                throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
-        }
-
-        return $short ? $name : 'Twig_Token::'.$name;
-    }
-
-    /**
-     * Returns the english representation of a given type.
-     *
-     * @param int $type The type as an integer
-     *
-     * @return string The string representation
-     */
-    public static function typeToEnglish($type)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                return 'end of template';
-            case self::TEXT_TYPE:
-                return 'text';
-            case self::BLOCK_START_TYPE:
-                return 'begin of statement block';
-            case self::VAR_START_TYPE:
-                return 'begin of print statement';
-            case self::BLOCK_END_TYPE:
-                return 'end of statement block';
-            case self::VAR_END_TYPE:
-                return 'end of print statement';
-            case self::NAME_TYPE:
-                return 'name';
-            case self::NUMBER_TYPE:
-                return 'number';
-            case self::STRING_TYPE:
-                return 'string';
-            case self::OPERATOR_TYPE:
-                return 'operator';
-            case self::PUNCTUATION_TYPE:
-                return 'punctuation';
-            case self::INTERPOLATION_START_TYPE:
-                return 'begin of string interpolation';
-            case self::INTERPOLATION_END_TYPE:
-                return 'end of string interpolation';
-            default:
-                throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser.php b/vendor/twig/twig/lib/Twig/TokenParser.php
deleted file mode 100644
index fa9b6d8..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all token parsers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_TokenParser implements Twig_TokenParserInterface
-{
-    /**
-     * @var Twig_Parser
-     */
-    protected $parser;
-
-    /**
-     * Sets the parser associated with this token parser.
-     *
-     * @param Twig_Parser $parser A Twig_Parser instance
-     */
-    public function setParser(Twig_Parser $parser)
-    {
-        $this->parser = $parser;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
deleted file mode 100644
index c753e62..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template to be escaped or not.
- *
- * <pre>
- * {% autoescape true %}
- *   Everything will be automatically escaped in this block
- * {% endautoescape %}
- *
- * {% autoescape false %}
- *   Everything will be outputed as is in this block
- * {% endautoescape %}
- *
- * {% autoescape true js %}
- *   Everything will be automatically escaped in this block
- *   using the js escaping strategy
- * {% endautoescape %}
- * </pre>
- */
-class Twig_TokenParser_AutoEscape extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-
-        if ($stream->test(Twig_Token::BLOCK_END_TYPE)) {
-            $value = 'html';
-        } else {
-            $expr = $this->parser->getExpressionParser()->parseExpression();
-            if (!$expr instanceof Twig_Node_Expression_Constant) {
-                throw new Twig_Error_Syntax('An escaping strategy must be a string or a bool.', $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-            $value = $expr->getAttribute('value');
-
-            $compat = true === $value || false === $value;
-
-            if (true === $value) {
-                $value = 'html';
-            }
-
-            if ($compat && $stream->test(Twig_Token::NAME_TYPE)) {
-                @trigger_error('Using the autoescape tag with "true" or "false" before the strategy name is deprecated.', E_USER_DEPRECATED);
-
-                if (false === $value) {
-                    throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getFilename());
-                }
-
-                $value = $stream->next()->getValue();
-            }
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endautoescape');
-    }
-
-    public function getTag()
-    {
-        return 'autoescape';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Block.php b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
deleted file mode 100644
index 4ffafbe..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Block.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as being reusable.
- *
- * <pre>
- *  {% block head %}
- *    <link rel="stylesheet" href="style.css" />
- *    <title>{% block title %}{% endblock %} - My Webpage</title>
- *  {% endblock %}
- * </pre>
- */
-class Twig_TokenParser_Block extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        if ($this->parser->hasBlock($name)) {
-            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getFilename());
-        }
-        $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
-        $this->parser->pushLocalScope();
-        $this->parser->pushBlockStack($name);
-
-        if ($stream->nextIf(Twig_Token::BLOCK_END_TYPE)) {
-            $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
-                $value = $token->getValue();
-
-                if ($value != $name) {
-                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());
-                }
-            }
-        } else {
-            $body = new Twig_Node(array(
-                new Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno),
-            ));
-        }
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block->setNode('body', $body);
-        $this->parser->popBlockStack();
-        $this->parser->popLocalScope();
-
-        return new Twig_Node_BlockReference($name, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endblock');
-    }
-
-    public function getTag()
-    {
-        return 'block';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Do.php b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
deleted file mode 100644
index 7adb5a0..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Do.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Evaluates an expression, discarding the returned value.
- */
-class Twig_TokenParser_Do extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Do($expr, $token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'do';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
deleted file mode 100644
index e685b95..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Embeds a template.
- */
-class Twig_TokenParser_Embed extends Twig_TokenParser_Include
-{
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
-
-        $parent = $this->parser->getExpressionParser()->parseExpression();
-
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
-
-        // inject a fake parent to make the parent() function work
-        $stream->injectTokens(array(
-            new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', $token->getLine()),
-            new Twig_Token(Twig_Token::NAME_TYPE, 'extends', $token->getLine()),
-            new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine()),
-            new Twig_Token(Twig_Token::BLOCK_END_TYPE, '', $token->getLine()),
-        ));
-
-        $module = $this->parser->parse($stream, array($this, 'decideBlockEnd'), true);
-
-        // override the parent with the correct one
-        $module->setNode('parent', $parent);
-
-        $this->parser->embedTemplate($module);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Embed($module->getAttribute('filename'), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endembed');
-    }
-
-    public function getTag()
-    {
-        return 'embed';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Extends.php b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
deleted file mode 100644
index 510417a..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extends a template by another one.
- *
- * <pre>
- *  {% extends "base.html" %}
- * </pre>
- */
-class Twig_TokenParser_Extends extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        if (!$this->parser->isMainScope()) {
-            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $this->parser->getFilename());
-        }
-
-        if (null !== $this->parser->getParent()) {
-            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $this->parser->getFilename());
-        }
-        $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-    }
-
-    public function getTag()
-    {
-        return 'extends';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Filter.php b/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
deleted file mode 100644
index b20dd5b..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Filters a section of a template by applying filters.
- *
- * <pre>
- * {% filter upper %}
- *  This text becomes uppercase
- * {% endfilter %}
- * </pre>
- */
-class Twig_TokenParser_Filter extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $name = $this->parser->getVarName();
-        $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), true, $token->getLine(), $this->getTag());
-
-        $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block = new Twig_Node_Block($name, $body, $token->getLine());
-        $this->parser->setBlock($name, $block);
-
-        return new Twig_Node_Print($filter, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endfilter');
-    }
-
-    public function getTag()
-    {
-        return 'filter';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Flush.php b/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
deleted file mode 100644
index f9ce7c3..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Flushes the output to the client.
- *
- * @see flush()
- */
-class Twig_TokenParser_Flush extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Flush($token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'flush';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/For.php b/vendor/twig/twig/lib/Twig/TokenParser/For.php
deleted file mode 100644
index 3fac511..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/For.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loops over each item of a sequence.
- *
- * <pre>
- * <ul>
- *  {% for user in users %}
- *    <li>{{ user.username|e }}</li>
- *  {% endfor %}
- * </ul>
- * </pre>
- */
-class Twig_TokenParser_For extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $targets = $this->parser->getExpressionParser()->parseAssignmentExpression();
-        $stream->expect(Twig_Token::OPERATOR_TYPE, 'in');
-        $seq = $this->parser->getExpressionParser()->parseExpression();
-
-        $ifexpr = null;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'if')) {
-            $ifexpr = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideForFork'));
-        if ($stream->next()->getValue() == 'else') {
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-            $else = $this->parser->subparse(array($this, 'decideForEnd'), true);
-        } else {
-            $else = null;
-        }
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        if (count($targets) > 1) {
-            $keyTarget = $targets->getNode(0);
-            $keyTarget = new Twig_Node_Expression_AssignName($keyTarget->getAttribute('name'), $keyTarget->getLine());
-            $valueTarget = $targets->getNode(1);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
-        } else {
-            $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno);
-            $valueTarget = $targets->getNode(0);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
-        }
-
-        if ($ifexpr) {
-            $this->checkLoopUsageCondition($stream, $ifexpr);
-            $this->checkLoopUsageBody($stream, $body);
-        }
-
-        return new Twig_Node_For($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, $lineno, $this->getTag());
-    }
-
-    public function decideForFork(Twig_Token $token)
-    {
-        return $token->test(array('else', 'endfor'));
-    }
-
-    public function decideForEnd(Twig_Token $token)
-    {
-        return $token->test('endfor');
-    }
-
-    // the loop variable cannot be used in the condition
-    protected function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_NodeInterface $node)
-    {
-        if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
-            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getLine(), $stream->getFilename());
-        }
-
-        foreach ($node as $n) {
-            if (!$n) {
-                continue;
-            }
-
-            $this->checkLoopUsageCondition($stream, $n);
-        }
-    }
-
-    // check usage of non-defined loop-items
-    // it does not catch all problems (for instance when a for is included into another or when the variable is used in an include)
-    protected function checkLoopUsageBody(Twig_TokenStream $stream, Twig_NodeInterface $node)
-    {
-        if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
-            $attribute = $node->getNode('attribute');
-            if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {
-                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getLine(), $stream->getFilename());
-            }
-        }
-
-        // should check for parent.loop.XXX usage
-        if ($node instanceof Twig_Node_For) {
-            return;
-        }
-
-        foreach ($node as $n) {
-            if (!$n) {
-                continue;
-            }
-
-            $this->checkLoopUsageBody($stream, $n);
-        }
-    }
-
-    public function getTag()
-    {
-        return 'for';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/From.php b/vendor/twig/twig/lib/Twig/TokenParser/From.php
deleted file mode 100644
index f7547eb..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/From.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% from 'forms.html' import forms %}
- * </pre>
- */
-class Twig_TokenParser_From extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect('import');
-
-        $targets = array();
-        do {
-            $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-            $alias = $name;
-            if ($stream->nextIf('as')) {
-                $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-            }
-
-            $targets[$name] = $alias;
-
-            if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        } while (true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
-
-        foreach ($targets as $name => $alias) {
-            if ($this->parser->isReservedMacroName($name)) {
-                throw new Twig_Error_Syntax(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getFilename());
-            }
-
-            $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
-        }
-
-        return $node;
-    }
-
-    public function getTag()
-    {
-        return 'from';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/If.php b/vendor/twig/twig/lib/Twig/TokenParser/If.php
deleted file mode 100644
index 91c0604..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/If.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Tests a condition.
- *
- * <pre>
- * {% if users %}
- *  <ul>
- *    {% for user in users %}
- *      <li>{{ user.username|e }}</li>
- *    {% endfor %}
- *  </ul>
- * {% endif %}
- * </pre>
- */
-class Twig_TokenParser_If extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideIfFork'));
-        $tests = array($expr, $body);
-        $else = null;
-
-        $end = false;
-        while (!$end) {
-            switch ($stream->next()->getValue()) {
-                case 'else':
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $else = $this->parser->subparse(array($this, 'decideIfEnd'));
-                    break;
-
-                case 'elseif':
-                    $expr = $this->parser->getExpressionParser()->parseExpression();
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
-                    $tests[] = $expr;
-                    $tests[] = $body;
-                    break;
-
-                case 'endif':
-                    $end = true;
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
-    }
-
-    public function decideIfFork(Twig_Token $token)
-    {
-        return $token->test(array('elseif', 'else', 'endif'));
-    }
-
-    public function decideIfEnd(Twig_Token $token)
-    {
-        return $token->test(array('endif'));
-    }
-
-    public function getTag()
-    {
-        return 'if';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Import.php b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
deleted file mode 100644
index 85c5c03..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Import.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% import 'forms.html' as forms %}
- * </pre>
- */
-class Twig_TokenParser_Import extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect('as');
-        $var = new Twig_Node_Expression_AssignName($this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue(), $token->getLine());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->addImportedSymbol('template', $var->getAttribute('name'));
-
-        return new Twig_Node_Import($macro, $var, $token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'import';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Include.php b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
deleted file mode 100644
index 0e76dae..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Include.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
-class Twig_TokenParser_Include extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
-
-        return new Twig_Node_Include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
-
-    protected function parseArguments()
-    {
-        $stream = $this->parser->getStream();
-
-        $ignoreMissing = false;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'ignore')) {
-            $stream->expect(Twig_Token::NAME_TYPE, 'missing');
-
-            $ignoreMissing = true;
-        }
-
-        $variables = null;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) {
-            $variables = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $only = false;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'only')) {
-            $only = true;
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return array($variables, $only, $ignoreMissing);
-    }
-
-    public function getTag()
-    {
-        return 'include';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Macro.php b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
deleted file mode 100644
index 8a7ebd6..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a macro.
- *
- * <pre>
- * {% macro input(name, value, type, size) %}
- *    <input type="{{ type|default('text') }}" name="{{ name }}" value="{{ value|e }}" size="{{ size|default(20) }}" />
- * {% endmacro %}
- * </pre>
- */
-class Twig_TokenParser_Macro extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-        $arguments = $this->parser->getExpressionParser()->parseArguments(true, true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $this->parser->pushLocalScope();
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
-            $value = $token->getValue();
-
-            if ($value != $name) {
-                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-        }
-        $this->parser->popLocalScope();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body(array($body)), $arguments, $lineno, $this->getTag()));
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endmacro');
-    }
-
-    public function getTag()
-    {
-        return 'macro';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
deleted file mode 100644
index 1feadd0..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as untrusted code that must be evaluated in the sandbox mode.
- *
- * <pre>
- * {% sandbox %}
- *     {% include 'user.html' %}
- * {% endsandbox %}
- * </pre>
- *
- * @see http://www.twig-project.org/doc/api.html#sandbox-extension for details
- */
-class Twig_TokenParser_Sandbox extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        // in a sandbox tag, only include tags are allowed
-        if (!$body instanceof Twig_Node_Include) {
-            foreach ($body as $node) {
-                if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) {
-                    continue;
-                }
-
-                if (!$node instanceof Twig_Node_Include) {
-                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getLine(), $this->parser->getFilename());
-                }
-            }
-        }
-
-        return new Twig_Node_Sandbox($body, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endsandbox');
-    }
-
-    public function getTag()
-    {
-        return 'sandbox';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Set.php b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
deleted file mode 100644
index 5ca614b..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Set.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a variable.
- *
- * <pre>
- *  {% set foo = 'foo' %}
- *
- *  {% set foo = [1, 2] %}
- *
- *  {% set foo = {'foo': 'bar'} %}
- *
- *  {% set foo = 'foo' ~ 'bar' %}
- *
- *  {% set foo, bar = 'foo', 'bar' %}
- *
- *  {% set foo %}Some content{% endset %}
- * </pre>
- */
-class Twig_TokenParser_Set extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $names = $this->parser->getExpressionParser()->parseAssignmentExpression();
-
-        $capture = false;
-        if ($stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
-            $values = $this->parser->getExpressionParser()->parseMultitargetExpression();
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            if (count($names) !== count($values)) {
-                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-        } else {
-            $capture = true;
-
-            if (count($names) > 1) {
-                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getFilename());
-            }
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            $values = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        }
-
-        return new Twig_Node_Set($capture, $names, $values, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endset');
-    }
-
-    public function getTag()
-    {
-        return 'set';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php b/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
deleted file mode 100644
index 53d906d..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Remove whitespaces between HTML tags.
- *
- * <pre>
- * {% spaceless %}
- *      <div>
- *          <strong>foo</strong>
- *      </div>
- * {% endspaceless %}
- *
- * {# output will be <div><strong>foo</strong></div> #}
- * </pre>
- */
-class Twig_TokenParser_Spaceless extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideSpacelessEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Spaceless($body, $lineno, $this->getTag());
-    }
-
-    public function decideSpacelessEnd(Twig_Token $token)
-    {
-        return $token->test('endspaceless');
-    }
-
-    public function getTag()
-    {
-        return 'spaceless';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Use.php b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
deleted file mode 100644
index 4945d03..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParser/Use.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2011 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports blocks defined in another template into the current template.
- *
- * <pre>
- * {% extends "base.html" %}
- *
- * {% use "blocks.html" %}
- *
- * {% block title %}{% endblock %}
- * {% block content %}{% endblock %}
- * </pre>
- *
- * @see http://www.twig-project.org/doc/templates.html#horizontal-reuse for details.
- */
-class Twig_TokenParser_Use extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $template = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-
-        if (!$template instanceof Twig_Node_Expression_Constant) {
-            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getFilename());
-        }
-
-        $targets = array();
-        if ($stream->nextIf('with')) {
-            do {
-                $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-                $alias = $name;
-                if ($stream->nextIf('as')) {
-                    $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-                }
-
-                $targets[$name] = new Twig_Node_Expression_Constant($alias, -1);
-
-                if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                    break;
-                }
-            } while (true);
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
-    }
-
-    public function getTag()
-    {
-        return 'use';
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParserBroker.php b/vendor/twig/twig/lib/Twig/TokenParserBroker.php
deleted file mode 100644
index d88bb43..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParserBroker.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default implementation of a token parser broker.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
-{
-    protected $parser;
-    protected $parsers = array();
-    protected $brokers = array();
-
-    /**
-     * Constructor.
-     *
-     * @param array|Traversable $parsers                 A Traversable of Twig_TokenParserInterface instances
-     * @param array|Traversable $brokers                 A Traversable of Twig_TokenParserBrokerInterface instances
-     * @param bool              $triggerDeprecationError
-     */
-    public function __construct($parsers = array(), $brokers = array(), $triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
-        }
-
-        foreach ($parsers as $parser) {
-            if (!$parser instanceof Twig_TokenParserInterface) {
-                throw new LogicException('$parsers must a an array of Twig_TokenParserInterface.');
-            }
-            $this->parsers[$parser->getTag()] = $parser;
-        }
-        foreach ($brokers as $broker) {
-            if (!$broker instanceof Twig_TokenParserBrokerInterface) {
-                throw new LogicException('$brokers must a an array of Twig_TokenParserBrokerInterface.');
-            }
-            $this->brokers[] = $broker;
-        }
-    }
-
-    /**
-     * Adds a TokenParser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $this->parsers[$parser->getTag()] = $parser;
-    }
-
-    /**
-     * Removes a TokenParser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function removeTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $name = $parser->getTag();
-        if (isset($this->parsers[$name]) && $parser === $this->parsers[$name]) {
-            unset($this->parsers[$name]);
-        }
-    }
-
-    /**
-     * Adds a TokenParserBroker.
-     *
-     * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
-     */
-    public function addTokenParserBroker(Twig_TokenParserBroker $broker)
-    {
-        $this->brokers[] = $broker;
-    }
-
-    /**
-     * Removes a TokenParserBroker.
-     *
-     * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
-     */
-    public function removeTokenParserBroker(Twig_TokenParserBroker $broker)
-    {
-        if (false !== $pos = array_search($broker, $this->brokers)) {
-            unset($this->brokers[$pos]);
-        }
-    }
-
-    /**
-     * Gets a suitable TokenParser for a tag.
-     *
-     * First looks in parsers, then in brokers.
-     *
-     * @param string $tag A tag name
-     *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    public function getTokenParser($tag)
-    {
-        if (isset($this->parsers[$tag])) {
-            return $this->parsers[$tag];
-        }
-        $broker = end($this->brokers);
-        while (false !== $broker) {
-            $parser = $broker->getTokenParser($tag);
-            if (null !== $parser) {
-                return $parser;
-            }
-            $broker = prev($this->brokers);
-        }
-    }
-
-    public function getParsers()
-    {
-        return $this->parsers;
-    }
-
-    public function getParser()
-    {
-        return $this->parser;
-    }
-
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-        foreach ($this->parsers as $tokenParser) {
-            $tokenParser->setParser($parser);
-        }
-        foreach ($this->brokers as $broker) {
-            $broker->setParser($parser);
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php b/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
deleted file mode 100644
index 3ec2a88..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- * (c) 2010 Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parser brokers.
- *
- * Token parser brokers allows to implement custom logic in the process of resolving a token parser for a given tag name.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TokenParserBrokerInterface
-{
-    /**
-     * Gets a TokenParser suitable for a tag.
-     *
-     * @param string $tag A tag name
-     *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    public function getTokenParser($tag);
-
-    /**
-     * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
-     *
-     * @param Twig_ParserInterface $parser A Twig_ParserInterface interface
-     */
-    public function setParser(Twig_ParserInterface $parser);
-
-    /**
-     * Gets the Twig_ParserInterface.
-     *
-     * @return null|Twig_ParserInterface A Twig_ParserInterface instance or null
-     */
-    public function getParser();
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenParserInterface.php b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
deleted file mode 100644
index 12ec396..0000000
--- a/vendor/twig/twig/lib/Twig/TokenParserInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2010 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parsers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_TokenParserInterface
-{
-    /**
-     * Sets the parser associated with this token parser.
-     *
-     * @param Twig_Parser $parser A Twig_Parser instance
-     */
-    public function setParser(Twig_Parser $parser);
-
-    /**
-     * Parses a token and returns a node.
-     *
-     * @param Twig_Token $token A Twig_Token instance
-     *
-     * @return Twig_NodeInterface A Twig_NodeInterface instance
-     *
-     * @throws Twig_Error_Syntax
-     */
-    public function parse(Twig_Token $token);
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag();
-}
diff --git a/vendor/twig/twig/lib/Twig/TokenStream.php b/vendor/twig/twig/lib/Twig/TokenStream.php
deleted file mode 100644
index 016f812..0000000
--- a/vendor/twig/twig/lib/Twig/TokenStream.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a token stream.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_TokenStream
-{
-    protected $tokens;
-    protected $current = 0;
-    protected $filename;
-
-    /**
-     * Constructor.
-     *
-     * @param array  $tokens   An array of tokens
-     * @param string $filename The name of the filename which tokens are associated with
-     */
-    public function __construct(array $tokens, $filename = null)
-    {
-        $this->tokens = $tokens;
-        $this->filename = $filename;
-    }
-
-    /**
-     * Returns a string representation of the token stream.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return implode("\n", $this->tokens);
-    }
-
-    public function injectTokens(array $tokens)
-    {
-        $this->tokens = array_merge(array_slice($this->tokens, 0, $this->current), $tokens, array_slice($this->tokens, $this->current));
-    }
-
-    /**
-     * Sets the pointer to the next token and returns the old one.
-     *
-     * @return Twig_Token
-     */
-    public function next()
-    {
-        if (!isset($this->tokens[++$this->current])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->filename);
-        }
-
-        return $this->tokens[$this->current - 1];
-    }
-
-    /**
-     * Tests a token, sets the pointer to the next one and returns it or throws a syntax error.
-     *
-     * @return Twig_Token|null The next token if the condition is true, null otherwise
-     */
-    public function nextIf($primary, $secondary = null)
-    {
-        if ($this->tokens[$this->current]->test($primary, $secondary)) {
-            return $this->next();
-        }
-    }
-
-    /**
-     * Tests a token and returns it or throws a syntax error.
-     *
-     * @return Twig_Token
-     */
-    public function expect($type, $value = null, $message = null)
-    {
-        $token = $this->tokens[$this->current];
-        if (!$token->test($type, $value)) {
-            $line = $token->getLine();
-            throw new Twig_Error_Syntax(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).',
-                $message ? $message.'. ' : '',
-                Twig_Token::typeToEnglish($token->getType()), $token->getValue(),
-                Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
-                $line,
-                $this->filename
-            );
-        }
-        $this->next();
-
-        return $token;
-    }
-
-    /**
-     * Looks at the next token.
-     *
-     * @param int $number
-     *
-     * @return Twig_Token
-     */
-    public function look($number = 1)
-    {
-        if (!isset($this->tokens[$this->current + $number])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->filename);
-        }
-
-        return $this->tokens[$this->current + $number];
-    }
-
-    /**
-     * Tests the current token.
-     *
-     * @return bool
-     */
-    public function test($primary, $secondary = null)
-    {
-        return $this->tokens[$this->current]->test($primary, $secondary);
-    }
-
-    /**
-     * Checks if end of stream was reached.
-     *
-     * @return bool
-     */
-    public function isEOF()
-    {
-        return $this->tokens[$this->current]->getType() === Twig_Token::EOF_TYPE;
-    }
-
-    /**
-     * Gets the current token.
-     *
-     * @return Twig_Token
-     */
-    public function getCurrent()
-    {
-        return $this->tokens[$this->current];
-    }
-
-    /**
-     * Gets the filename associated with this stream.
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php b/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
deleted file mode 100644
index e406f0a..0000000
--- a/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Util_DeprecationCollector
-{
-    private $twig;
-    private $deprecations;
-
-    public function __construct(Twig_Environment $twig)
-    {
-        $this->twig = $twig;
-    }
-
-    /**
-     * Returns deprecations for templates contained in a directory.
-     *
-     * @param string $dir A directory where templates are stored
-     * @param string $ext Limit the loaded templates by extension
-     *
-     * @return array() An array of deprecations
-     */
-    public function collectDir($dir, $ext = '.twig')
-    {
-        $iterator = new RegexIterator(
-            new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY
-            ), '{'.preg_quote($ext).'$}'
-        );
-
-        return $this->collect(new Twig_Util_TemplateDirIterator($iterator));
-    }
-
-    /**
-     * Returns deprecations for passed templates.
-     *
-     * @param Iterator $iterator An iterator of templates (where keys are template names and values the contents of the template)
-     *
-     * @return array() An array of deprecations
-     */
-    public function collect(Iterator $iterator)
-    {
-        $this->deprecations = array();
-
-        set_error_handler(array($this, 'errorHandler'));
-
-        foreach ($iterator as $name => $contents) {
-            try {
-                $this->twig->parse($this->twig->tokenize($contents, $name));
-            } catch (Twig_Error_Syntax $e) {
-                // ignore templates containing syntax errors
-            }
-        }
-
-        restore_error_handler();
-
-        $deprecations = $this->deprecations;
-        $this->deprecations = array();
-
-        return $deprecations;
-    }
-
-    /**
-     * @internal
-     */
-    public function errorHandler($type, $msg)
-    {
-        if (E_USER_DEPRECATED === $type) {
-            $this->deprecations[] = $msg;
-        }
-    }
-}
diff --git a/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php b/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
deleted file mode 100644
index 3fb8932..0000000
--- a/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Util_TemplateDirIterator extends IteratorIterator
-{
-    public function current()
-    {
-        return file_get_contents(parent::current());
-    }
-
-    public function key()
-    {
-        return (string) parent::key();
-    }
-}
diff --git a/vendor/twig/twig/phpunit.xml.dist b/vendor/twig/twig/phpunit.xml.dist
deleted file mode 100644
index 6f6d1d2..0000000
--- a/vendor/twig/twig/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +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="vendor/autoload.php"
->
-  <testsuites>
-    <testsuite name="Twig Test Suite">
-      <directory>./test/Twig/</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./lib/Twig/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/web.config b/vendor/web.config
deleted file mode 100644
index 2e065e2..0000000
--- a/vendor/web.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration>
-  <system.webServer>
-    <authorization>
-      <deny users="*">
-    </authorization>
-  </system.webServer>
-</configuration>
diff --git a/vendor/wikimedia/composer-merge-plugin/LICENSE b/vendor/wikimedia/composer-merge-plugin/LICENSE
deleted file mode 100644
index 3c9804a..0000000
--- a/vendor/wikimedia/composer-merge-plugin/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Bryan Davis, Wikimedia Foundation, and contributors
-
-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/vendor/wikimedia/composer-merge-plugin/README.md b/vendor/wikimedia/composer-merge-plugin/README.md
deleted file mode 100644
index f020d40..0000000
--- a/vendor/wikimedia/composer-merge-plugin/README.md
+++ /dev/null
@@ -1,183 +0,0 @@
-[![Latest Stable Version]](https://packagist.org/packages/wikimedia/composer-merge-plugin) [![License]](https://github.com/wikimedia/composer-merge-plugin/blob/master/LICENSE)
-[![Build Status]](https://travis-ci.org/wikimedia/composer-merge-plugin)
-[![Code Coverage]](https://scrutinizer-ci.com/g/wikimedia/composer-merge-plugin/?branch=master)
-
-Composer Merge Plugin
-=====================
-
-Merge multiple composer.json files at [Composer] runtime.
-
-Composer Merge Plugin is intended to allow easier dependency management for
-applications which ship a composer.json file and expect some deployments to
-install additional Composer managed libraries. It does this by allowing the
-application's top level `composer.json` file to provide a list of optional
-additional configuration files. When Composer is run it will parse these files
-and merge their configuration settings into the base configuration. This
-combined configuration will then be used when downloading additional libraries
-and generating the autoloader.
-
-Composer Merge Plugin was created to help with installation of [MediaWiki]
-which has core library requirements as well as optional libraries and
-extensions which may be managed via Composer.
-
-
-Installation
-------------
-
-```
-$ composer require wikimedia/composer-merge-plugin
-```
-
-
-Usage
------
-
-```
-{
-    "require": {
-        "wikimedia/composer-merge-plugin": "dev-master"
-    },
-    "extra": {
-        "merge-plugin": {
-            "include": [
-                "composer.local.json",
-                "extensions/*/composer.json"
-            ],
-            "require": [
-                "submodule/composer.json"
-            ],
-            "recurse": true,
-            "replace": false,
-            "merge-dev": true,
-            "merge-extra": false
-        }
-    }
-}
-```
-
-
-Plugin configuration
---------------------
-
-The plugin reads its configuration from the `merge-plugin` section of your
-composer.json's `extra` section. An `include` setting is required to tell
-Composer Merge Plugin which file(s) to merge.
-
-
-### include
-
-The `include` setting can specify either a single value or an array of values.
-Each value is treated as a PHP `glob()` pattern identifying additional
-composer.json style configuration files to merge into the root package
-configuration for the current Composer execution.
-
-The following sections of the found configuration files will be merged into
-the Composer root package configuration as though they were directly included
-in the top-level composer.json file:
-
-* [autoload](https://getcomposer.org/doc/04-schema.md#autoload)
-* [autoload-dev](https://getcomposer.org/doc/04-schema.md#autoload-dev)
-  (optional, see [merge-dev](#merge-dev) below)
-* [conflict](https://getcomposer.org/doc/04-schema.md#conflict)
-* [provide](https://getcomposer.org/doc/04-schema.md#provide)
-* [replace](https://getcomposer.org/doc/04-schema.md#replace)
-* [repositories](https://getcomposer.org/doc/04-schema.md#repositories)
-* [require](https://getcomposer.org/doc/04-schema.md#require)
-* [require-dev](https://getcomposer.org/doc/04-schema.md#require-dev)
-  (optional, see [merge-dev](#merge-dev) below)
-* [suggest](https://getcomposer.org/doc/04-schema.md#suggest)
-* [extra](https://getcomposer.org/doc/04-schema.md#extra)
-  (optional, see [merge-extra](#merge-extra) below)
-
-
-### require
-
-The `require` setting is identical to `[include](#include)` except when
-a pattern fails to match at least one file then it will cause an error.
-
-### recurse
-
-By default the merge plugin is recursive; if an included file has
-a `merge-plugin` section it will also be processed. This functionality can be
-disabled by adding a `"recurse": false` setting.
-
-
-### replace
-
-By default, Composer's conflict resolution engine is used to determine which
-version of a package should be installed when multiple files specify the same
-package. A `"replace": true` setting can be provided to change to a "last
-version specified wins" conflict resolution strategy. In this mode, duplicate
-package declarations found in merged files will overwrite the declarations
-made by earlier files. Files are loaded in the order specified by the
-`include` setting with globbed files being processed in alphabetical order.
-
-
-### merge-dev
-
-By default, `autoload-dev` and `require-dev` sections of included files are
-merged. A `"merge-dev": false` setting will disable this behavior.
-
-
-### merge-extra
-
-A `"merge-extra": true` setting enables the merging the contents of the
-`extra` section of included files as well. The normal merge mode for the extra
-section is to accept the first version of any key found (e.g. a key in the
-master config wins over the version found in any imported config). If
-`replace` mode is active ([see above](#replace)) then this behavior changes
-and the last key found will win (e.g. the key in the master config is replaced
-by the key in the imported config). The usefulness of merging the extra
-section will vary depending on the Composer plugins being used and the order
-in which they are processed by Composer.
-
-Note that `merge-plugin` sections are excluded from the merge process, but are
-always processed by the plugin unless [recursion](#recurse) is disabled.
-
-
-Running tests
--------------
-
-```
-$ composer install
-$ composer test
-```
-
-
-Contributing
-------------
-
-Bug, feature requests and other issues should be reported to the [GitHub
-project]. We accept code and documentation contributions via Pull Requests on
-GitHub as well.
-
-- [PSR-2 Coding Standard][] is used by the project. The included test
-  configuration uses [PHP Code Sniffer][] to validate the conventions.
-- Tests are encouraged. Our test coverage isn't perfect but we'd like it to
-  get better rather than worse, so please try to include tests with your
-  changes.
-- Keep the documentation up to date. Make sure `README.md` and other
-  relevant documentation is kept up to date with your changes.
-- One pull request per feature. Try to keep your changes focused on solving
-  a single problem. This will make it easier for us to review the change and
-  easier for you to make sure you have updated the necessary tests and
-  documentation.
-
-
-License
--------
-
-Composer Merge plugin is licensed under the MIT license. See the `LICENSE`
-file for more details.
-
-
----
-[Composer]: https://getcomposer.org/
-[MediaWiki]: https://www.mediawiki.org/wiki/MediaWiki
-[GitHub project]: https://github.com/wikimedia/composer-merge-plugin
-[PSR-2 Coding Standard]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
-[PHP Code Sniffer]: http://pear.php.net/package/PHP_CodeSniffer
-[Latest Stable Version]: https://img.shields.io/packagist/v/wikimedia/composer-merge-plugin.svg?style=flat
-[License]: https://img.shields.io/packagist/l/wikimedia/composer-merge-plugin.svg?style=flat
-[Build Status]: https://img.shields.io/travis/wikimedia/composer-merge-plugin.svg?style=flat
-[Code Coverage]: https://img.shields.io/scrutinizer/coverage/g/wikimedia/composer-merge-plugin/master.svg?style=flat
diff --git a/vendor/wikimedia/composer-merge-plugin/composer.json b/vendor/wikimedia/composer-merge-plugin/composer.json
deleted file mode 100644
index dce70e7..0000000
--- a/vendor/wikimedia/composer-merge-plugin/composer.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "name": "wikimedia/composer-merge-plugin",
-    "description": "Composer plugin to merge multiple composer.json files",
-    "type": "composer-plugin",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Bryan Davis",
-            "email": "bd808@wikimedia.org"
-        }
-    ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require": {
-        "composer-plugin-api": "^1.0",
-        "php": ">=5.3.2"
-    },
-    "require-dev": {
-        "composer/composer": "1.0.*@dev",
-        "jakub-onderka/php-parallel-lint": "~0.8",
-        "phpunit/phpunit": "~4.8|~5.0",
-        "squizlabs/php_codesniffer": "~2.1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Wikimedia\\Composer\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3.x-dev"
-        },
-        "class": "Wikimedia\\Composer\\MergePlugin"
-    },
-    "config": {
-        "optimize-autoloader": true
-    },
-    "scripts": {
-        "test": [
-            "composer validate --no-interaction",
-            "parallel-lint src tests",
-            "phpunit --log-junit=reports/unitreport.xml --coverage-text --coverage-html=reports/coverage --coverage-clover=reports/coverage.xml",
-            "phpcs --encoding=utf-8 --standard=PSR2 --report-checkstyle=reports/checkstyle-phpcs.xml --report-full --extensions=php src/* tests/phpunit/*"
-        ]
-    }
-}
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Logger.php b/vendor/wikimedia/composer-merge-plugin/src/Logger.php
deleted file mode 100644
index 1635a2b..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/Logger.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer;
-
-use Composer\IO\IOInterface;
-
-/**
- * Simple logging wrapper for Composer\IO\IOInterface
- *
- * @author Bryan Davis <bd808@bd808.com>
- */
-class Logger
-{
-    /**
-     * @var string $name
-     */
-    protected $name;
-
-    /**
-     * @var IOInterface $inputOutput
-     */
-    protected $inputOutput;
-
-    /**
-     * @param string $name
-     * @param IOInterface $io
-     */
-    public function __construct($name, IOInterface $io)
-    {
-        $this->name = $name;
-        $this->inputOutput = $io;
-    }
-
-    /**
-     * Log a debug message
-     *
-     * Messages will be output at the "very verbose" logging level (eg `-vv`
-     * needed on the Composer command).
-     *
-     * @param string $message
-     */
-    public function debug($message)
-    {
-        if ($this->inputOutput->isVeryVerbose()) {
-            $message = "  <info>[{$this->name}]</info> {$message}";
-            $this->log($message);
-        }
-    }
-
-    /**
-     * Log an informative message
-     *
-     * Messages will be output at the "verbose" logging level (eg `-v` needed
-     * on the Composer command).
-     *
-     * @param string $message
-     */
-    public function info($message)
-    {
-        if ($this->inputOutput->isVerbose()) {
-            $message = "  <info>[{$this->name}]</info> {$message}";
-            $this->log($message);
-        }
-    }
-
-    /**
-     * Log a warning message
-     *
-     * @param string $message
-     */
-    public function warning($message)
-    {
-        $message = "  <error>[{$this->name}]</error> {$message}";
-        $this->log($message);
-    }
-
-    /**
-     * Write a message
-     *
-     * @param string $message
-     */
-    protected function log($message)
-    {
-        if (method_exists($this->inputOutput, 'writeError')) {
-            $this->inputOutput->writeError($message);
-        } else {
-            // @codeCoverageIgnoreStart
-            // Backwards compatiblity for Composer before cb336a5
-            $this->inputOutput->write($message);
-            // @codeCoverageIgnoreEnd
-        }
-    }
-}
-// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
deleted file mode 100644
index b32131f..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
+++ /dev/null
@@ -1,507 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer\Merge;
-
-use Wikimedia\Composer\Logger;
-
-use Composer\Composer;
-use Composer\Json\JsonFile;
-use Composer\Package\BasePackage;
-use Composer\Package\CompletePackage;
-use Composer\Package\Link;
-use Composer\Package\Loader\ArrayLoader;
-use Composer\Package\RootAliasPackage;
-use Composer\Package\RootPackage;
-use Composer\Package\RootPackageInterface;
-use Composer\Package\Version\VersionParser;
-use UnexpectedValueException;
-
-/**
- * Processing for a composer.json file that will be merged into
- * a RootPackageInterface
- *
- * @author Bryan Davis <bd808@bd808.com>
- */
-class ExtraPackage
-{
-
-    /**
-     * @var Composer $composer
-     */
-    protected $composer;
-
-    /**
-     * @var Logger $logger
-     */
-    protected $logger;
-
-    /**
-     * @var string $path
-     */
-    protected $path;
-
-    /**
-     * @var array $json
-     */
-    protected $json;
-
-    /**
-     * @var CompletePackage $package
-     */
-    protected $package;
-
-    /**
-     * @param string $path Path to composer.json file
-     * @param Composer $composer
-     * @param Logger $logger
-     */
-    public function __construct($path, Composer $composer, Logger $logger)
-    {
-        $this->path = $path;
-        $this->composer = $composer;
-        $this->logger = $logger;
-        $this->json = $this->readPackageJson($path);
-        $this->package = $this->loadPackage($this->json);
-    }
-
-    /**
-     * Get list of additional packages to include if precessing recursively.
-     *
-     * @return array
-     */
-    public function getIncludes()
-    {
-        return isset($this->json['extra']['merge-plugin']['include']) ?
-            $this->json['extra']['merge-plugin']['include'] : array();
-    }
-
-    /**
-     * Get list of additional packages to require if precessing recursively.
-     *
-     * @return array
-     */
-    public function getRequires()
-    {
-        return isset($this->json['extra']['merge-plugin']['require']) ?
-            $this->json['extra']['merge-plugin']['require'] : array();
-    }
-
-    /**
-     * Read the contents of a composer.json style file into an array.
-     *
-     * The package contents are fixed up to be usable to create a Package
-     * object by providing dummy "name" and "version" values if they have not
-     * been provided in the file. This is consistent with the default root
-     * package loading behavior of Composer.
-     *
-     * @param string $path
-     * @return array
-     */
-    protected function readPackageJson($path)
-    {
-        $file = new JsonFile($path);
-        $json = $file->read();
-        if (!isset($json['name'])) {
-            $json['name'] = 'merge-plugin/' .
-                strtr($path, DIRECTORY_SEPARATOR, '-');
-        }
-        if (!isset($json['version'])) {
-            $json['version'] = '1.0.0';
-        }
-        return $json;
-    }
-
-    /**
-     * @param string $json
-     * @return CompletePackage
-     */
-    protected function loadPackage($json)
-    {
-        $loader = new ArrayLoader();
-        $package = $loader->load($json);
-        // @codeCoverageIgnoreStart
-        if (!$package instanceof CompletePackage) {
-            throw new UnexpectedValueException(
-                'Expected instance of CompletePackage, got ' .
-                get_class($package)
-            );
-        }
-        // @codeCoverageIgnoreEnd
-        return $package;
-    }
-
-    /**
-     * Merge this package into a RootPackageInterface
-     *
-     * @param RootPackageInterface $root
-     * @param PluginState $state
-     */
-    public function mergeInto(RootPackageInterface $root, PluginState $state)
-    {
-        $this->addRepositories($root);
-
-        $this->mergeRequires('require', $root, $state);
-        if ($state->isDevMode()) {
-            $this->mergeRequires('require-dev', $root, $state);
-        }
-
-        $this->mergePackageLinks('conflict', $root);
-        $this->mergePackageLinks('replace', $root);
-        $this->mergePackageLinks('provide', $root);
-
-        $this->mergeSuggests($root);
-
-        $this->mergeAutoload('autoload', $root);
-        if ($state->isDevMode()) {
-            $this->mergeAutoload('devAutoload', $root);
-        }
-
-        $this->mergeExtra($root, $state);
-    }
-
-    /**
-     * Add a collection of repositories described by the given configuration
-     * to the given package and the global repository manager.
-     *
-     * @param RootPackageInterface $root
-     */
-    protected function addRepositories(RootPackageInterface $root)
-    {
-        if (!isset($this->json['repositories'])) {
-            return;
-        }
-        $repoManager = $this->composer->getRepositoryManager();
-        $newRepos = array();
-
-        foreach ($this->json['repositories'] as $repoJson) {
-            if (!isset($repoJson['type'])) {
-                continue;
-            }
-            $this->logger->info("Adding {$repoJson['type']} repository");
-            $repo = $repoManager->createRepository(
-                $repoJson['type'],
-                $repoJson
-            );
-            $repoManager->addRepository($repo);
-            $newRepos[] = $repo;
-        }
-
-        $unwrapped = self::unwrapIfNeeded($root, 'setRepositories');
-        $unwrapped->setRepositories(array_merge(
-            $newRepos,
-            $root->getRepositories()
-        ));
-    }
-
-    /**
-     * Merge require or require-dev into a RootPackageInterface
-     *
-     * @param string $type 'require' or 'require-dev'
-     * @param RootPackageInterface $root
-     * @param PluginState $state
-     */
-    protected function mergeRequires(
-        $type,
-        RootPackageInterface $root,
-        PluginState $state
-    ) {
-        $linkType = BasePackage::$supportedLinkTypes[$type];
-        $getter = 'get' . ucfirst($linkType['method']);
-        $setter = 'set' . ucfirst($linkType['method']);
-
-        $requires = $this->package->{$getter}();
-        if (empty($requires)) {
-            return;
-        }
-
-        $this->mergeStabilityFlags($root, $requires);
-
-        $requires = $this->replaceSelfVersionDependencies(
-            $type,
-            $requires,
-            $root
-        );
-
-        $root->{$setter}($this->mergeOrDefer(
-            $type,
-            $root->{$getter}(),
-            $requires,
-            $state
-        ));
-    }
-
-    /**
-     * Merge two collections of package links and collect duplicates for
-     * subsequent processing.
-     *
-     * @param string $type 'require' or 'require-dev'
-     * @param array $origin Primary collection
-     * @param array $merge Additional collection
-     * @param PluginState $state
-     * @return array Merged collection
-     */
-    protected function mergeOrDefer(
-        $type,
-        array $origin,
-        array $merge,
-        $state
-    ) {
-        $dups = array();
-        foreach ($merge as $name => $link) {
-            if (!isset($origin[$name]) || $state->replaceDuplicateLinks()) {
-                $this->logger->info("Merging <comment>{$name}</comment>");
-                $origin[$name] = $link;
-            } else {
-                // Defer to solver.
-                $this->logger->info(
-                    "Deferring duplicate <comment>{$name}</comment>"
-                );
-                $dups[] = $link;
-            }
-        }
-        $state->addDuplicateLinks($type, $dups);
-        return $origin;
-    }
-
-    /**
-     * Merge autoload or autoload-dev into a RootPackageInterface
-     *
-     * @param string $type 'autoload' or 'devAutoload'
-     * @param RootPackageInterface $root
-     */
-    protected function mergeAutoload($type, RootPackageInterface $root)
-    {
-        $getter = 'get' . ucfirst($type);
-        $setter = 'set' . ucfirst($type);
-
-        $autoload = $this->package->{$getter}();
-        if (empty($autoload)) {
-            return;
-        }
-
-        $unwrapped = self::unwrapIfNeeded($root, $setter);
-        $unwrapped->{$setter}(array_merge_recursive(
-            $root->{$getter}(),
-            $this->fixRelativePaths($autoload)
-        ));
-    }
-
-    /**
-     * Fix a collection of paths that are relative to this package to be
-     * relative to the base package.
-     *
-     * @param array $paths
-     * @return array
-     */
-    protected function fixRelativePaths(array $paths)
-    {
-        $base = dirname($this->path);
-        $base = ($base === '.') ? '' : "{$base}/";
-
-        array_walk_recursive(
-            $paths,
-            function (&$path) use ($base) {
-                $path = "{$base}{$path}";
-            }
-        );
-        return $paths;
-    }
-
-    /**
-     * Extract and merge stability flags from the given collection of
-     * requires and merge them into a RootPackageInterface
-     *
-     * @param RootPackageInterface $root
-     * @param array $requires
-     */
-    protected function mergeStabilityFlags(
-        RootPackageInterface $root,
-        array $requires
-    ) {
-        $flags = $root->getStabilityFlags();
-        $sf = new StabilityFlags($flags, $root->getMinimumStability());
-
-        $unwrapped = self::unwrapIfNeeded($root, 'setStabilityFlags');
-        $unwrapped->setStabilityFlags(array_merge(
-            $flags,
-            $sf->extractAll($requires)
-        ));
-    }
-
-    /**
-     * Merge package links of the given type  into a RootPackageInterface
-     *
-     * @param string $type 'conflict', 'replace' or 'provide'
-     * @param RootPackageInterface $root
-     */
-    protected function mergePackageLinks($type, RootPackageInterface $root)
-    {
-        $linkType = BasePackage::$supportedLinkTypes[$type];
-        $getter = 'get' . ucfirst($linkType['method']);
-        $setter = 'set' . ucfirst($linkType['method']);
-
-        $links = $this->package->{$getter}();
-        if (!empty($links)) {
-            $unwrapped = self::unwrapIfNeeded($root, $setter);
-            // @codeCoverageIgnoreStart
-            if ($root !== $unwrapped) {
-                $this->logger->warning(
-                    'This Composer version does not support ' .
-                    "'{$type}' merging for aliased packages."
-                );
-            }
-            // @codeCoverageIgnoreEnd
-            $unwrapped->{$setter}(array_merge(
-                $root->{$getter}(),
-                $this->replaceSelfVersionDependencies($type, $links, $root)
-            ));
-        }
-    }
-
-    /**
-     * Merge suggested packages into a RootPackageInterface
-     *
-     * @param RootPackageInterface $root
-     */
-    protected function mergeSuggests(RootPackageInterface $root)
-    {
-        $suggests = $this->package->getSuggests();
-        if (!empty($suggests)) {
-            $unwrapped = self::unwrapIfNeeded($root, 'setSuggests');
-            $unwrapped->setSuggests(array_merge(
-                $root->getSuggests(),
-                $suggests
-            ));
-        }
-    }
-
-    /**
-     * Merge extra config into a RootPackageInterface
-     *
-     * @param RootPackageInterface $root
-     * @param PluginState $state
-     */
-    public function mergeExtra(RootPackageInterface $root, PluginState $state)
-    {
-        $extra = $this->package->getExtra();
-        unset($extra['merge-plugin']);
-        if (!$state->shouldMergeExtra() || empty($extra)) {
-            return;
-        }
-
-        $rootExtra = $root->getExtra();
-        $unwrapped = self::unwrapIfNeeded($root, 'setExtra');
-
-        if ($state->replaceDuplicateLinks()) {
-            $unwrapped->setExtra(
-                array_merge($rootExtra, $extra)
-            );
-
-        } else {
-            foreach (array_intersect(
-                array_keys($extra),
-                array_keys($rootExtra)
-            ) as $key) {
-                $this->logger->info(
-                    "Ignoring duplicate <comment>{$key}</comment> in ".
-                    "<comment>{$this->path}</comment> extra config."
-                );
-            }
-            $unwrapped->setExtra(
-                array_merge($extra, $rootExtra)
-            );
-        }
-    }
-
-    /**
-     * Update Links with a 'self.version' constraint with the root package's
-     * version.
-     *
-     * @param string $type Link type
-     * @param array $links
-     * @param RootPackageInterface $root
-     * @return array
-     */
-    protected function replaceSelfVersionDependencies(
-        $type,
-        array $links,
-        RootPackageInterface $root
-    ) {
-        $linkType = BasePackage::$supportedLinkTypes[$type];
-        $version = $root->getVersion();
-        $prettyVersion = $root->getPrettyVersion();
-        $vp = new VersionParser();
-
-        $method = 'get' . ucfirst($linkType['method']);
-        $packages = $root->$method();
-
-        return array_map(
-            function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
-                if ('self.version' === $link->getPrettyConstraint()) {
-                    if (isset($packages[$link->getSource()])) {
-                        /** @var Link $package */
-                        $package = $packages[$link->getSource()];
-                        return new Link(
-                            $link->getSource(),
-                            $link->getTarget(),
-                            $vp->parseConstraints($package->getConstraint()->getPrettyString()),
-                            $linkType['description'],
-                            $package->getPrettyConstraint()
-                        );
-                    }
-
-                    return new Link(
-                        $link->getSource(),
-                        $link->getTarget(),
-                        $vp->parseConstraints($version),
-                        $linkType['description'],
-                        $prettyVersion
-                    );
-                }
-                return $link;
-            },
-            $links
-        );
-    }
-
-    /**
-     * Get a full featured Package from a RootPackageInterface.
-     *
-     * In Composer versions before 599ad77 the RootPackageInterface only
-     * defines a sub-set of operations needed by composer-merge-plugin and
-     * RootAliasPackage only implemented those methods defined by the
-     * interface. Most of the unimplemented methods in RootAliasPackage can be
-     * worked around because the getter methods that are implemented proxy to
-     * the aliased package which we can modify by unwrapping. The exception
-     * being modifying the 'conflicts', 'provides' and 'replaces' collections.
-     * We have no way to actually modify those collections unfortunately in
-     * older versions of Composer.
-     *
-     * @param RootPackageInterface $root
-     * @param string $method Method needed
-     * @return RootPackageInterface|RootPackage
-     */
-    public static function unwrapIfNeeded(
-        RootPackageInterface $root,
-        $method = 'setExtra'
-    ) {
-        // @codeCoverageIgnoreStart
-        if ($root instanceof RootAliasPackage &&
-            !method_exists($root, $method)
-        ) {
-            // Unwrap and return the aliased RootPackage.
-            $root = $root->getAliasOf();
-        }
-        // @codeCoverageIgnoreEnd
-        return $root;
-    }
-}
-// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/MissingFileException.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/MissingFileException.php
deleted file mode 100644
index 873719d..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/Merge/MissingFileException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer\Merge;
-
-/**
- * @author Bryan Davis <bd808@bd808.com>
- */
-class MissingFileException extends \RuntimeException
-{
-}
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php
deleted file mode 100644
index a191c1e..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer\Merge;
-
-use Composer\Composer;
-
-/**
- * Mutable plugin state
- *
- * @author Bryan Davis <bd808@bd808.com>
- */
-class PluginState
-{
-    /**
-     * @var Composer $composer
-     */
-    protected $composer;
-
-    /**
-     * @var array $includes
-     */
-    protected $includes = array();
-
-    /**
-     * @var array $requires
-     */
-    protected $requires = array();
-
-    /**
-     * @var array $duplicateLinks
-     */
-    protected $duplicateLinks = array();
-
-    /**
-     * @var bool $devMode
-     */
-    protected $devMode = false;
-
-    /**
-     * @var bool $recurse
-     */
-    protected $recurse = true;
-
-    /**
-     * @var bool $replace
-     */
-    protected $replace = false;
-
-    /**
-     * Whether to merge the -dev sections.
-     * @var bool $mergeDev
-     */
-    protected $mergeDev = true;
-
-    /**
-     * Whether to merge the extra section.
-     *
-     * By default, the extra section is not merged and there will be many
-     * cases where the merge of the extra section is performed too late
-     * to be of use to other plugins. When enabled, merging uses one of
-     * two strategies - either 'first wins' or 'last wins'. When enabled,
-     * 'first wins' is the default behaviour. If Replace mode is activated
-     * then 'last wins' is used.
-     *
-     * @var bool $mergeExtra
-     */
-    protected $mergeExtra = false;
-
-    /**
-     * @var bool $firstInstall
-     */
-    protected $firstInstall = false;
-
-    /**
-     * @var bool $locked
-     */
-    protected $locked = false;
-
-    /**
-     * @var bool $dumpAutoloader
-     */
-    protected $dumpAutoloader = false;
-
-    /**
-     * @var bool $optimizeAutoloader
-     */
-    protected $optimizeAutoloader = false;
-
-    /**
-     * @param Composer $composer
-     */
-    public function __construct(Composer $composer)
-    {
-        $this->composer = $composer;
-    }
-
-    /**
-     * Load plugin settings
-     */
-    public function loadSettings()
-    {
-        $extra = $this->composer->getPackage()->getExtra();
-        $config = array_merge(
-            array(
-                'include' => array(),
-                'require' => array(),
-                'recurse' => true,
-                'replace' => false,
-                'merge-dev' => true,
-                'merge-extra' => false,
-            ),
-            isset($extra['merge-plugin']) ? $extra['merge-plugin'] : array()
-        );
-
-        $this->includes = (is_array($config['include'])) ?
-            $config['include'] : array($config['include']);
-        $this->requires = (is_array($config['require'])) ?
-            $config['require'] : array($config['require']);
-        $this->recurse = (bool)$config['recurse'];
-        $this->replace = (bool)$config['replace'];
-        $this->mergeDev = (bool)$config['merge-dev'];
-        $this->mergeExtra = (bool)$config['merge-extra'];
-    }
-
-    /**
-     * Get list of filenames and/or glob patterns to include
-     *
-     * @return array
-     */
-    public function getIncludes()
-    {
-        return $this->includes;
-    }
-
-    /**
-     * Get list of filenames and/or glob patterns to require
-     *
-     * @return array
-     */
-    public function getRequires()
-    {
-        return $this->requires;
-    }
-
-    /**
-     * Set the first install flag
-     *
-     * @param bool $flag
-     */
-    public function setFirstInstall($flag)
-    {
-        $this->firstInstall = (bool)$flag;
-    }
-
-    /**
-     * Is this the first time that the plugin has been installed?
-     *
-     * @return bool
-     */
-    public function isFirstInstall()
-    {
-        return $this->firstInstall;
-    }
-
-    /**
-     * Set the locked flag
-     *
-     * @param bool $flag
-     */
-    public function setLocked($flag)
-    {
-        $this->locked = (bool)$flag;
-    }
-
-    /**
-     * Was a lockfile present when the plugin was installed?
-     *
-     * @return bool
-     */
-    public function isLocked()
-    {
-        return $this->locked;
-    }
-
-    /**
-     * Should an update be forced?
-     *
-     * @return true If packages are not locked
-     */
-    public function forceUpdate()
-    {
-        return !$this->locked;
-    }
-
-    /**
-     * Set the devMode flag
-     *
-     * @param bool $flag
-     */
-    public function setDevMode($flag)
-    {
-        $this->devMode = (bool)$flag;
-    }
-
-    /**
-     * Should devMode settings be processed?
-     *
-     * @return bool
-     */
-    public function isDevMode()
-    {
-        return $this->mergeDev && $this->devMode;
-    }
-
-    /**
-     * Set the dumpAutoloader flag
-     *
-     * @param bool $flag
-     */
-    public function setDumpAutoloader($flag)
-    {
-        $this->dumpAutoloader = (bool)$flag;
-    }
-
-    /**
-     * Is the autoloader file supposed to be written out?
-     *
-     * @return bool
-     */
-    public function shouldDumpAutoloader()
-    {
-        return $this->dumpAutoloader;
-    }
-
-    /**
-     * Set the optimizeAutoloader flag
-     *
-     * @param bool $flag
-     */
-    public function setOptimizeAutoloader($flag)
-    {
-        $this->optimizeAutoloader = (bool)$flag;
-    }
-
-    /**
-     * Should the autoloader be optimized?
-     *
-     * @return bool
-     */
-    public function shouldOptimizeAutoloader()
-    {
-        return $this->optimizeAutoloader;
-    }
-
-    /**
-     * Add duplicate packages
-     *
-     * @param string $type Package type
-     * @param array $packages
-     */
-    public function addDuplicateLinks($type, array $packages)
-    {
-        if (!isset($this->duplicateLinks[$type])) {
-            $this->duplicateLinks[$type] = array();
-        }
-        $this->duplicateLinks[$type] =
-            array_merge($this->duplicateLinks[$type], $packages);
-    }
-
-    /**
-     * Get duplicate packages
-     *
-     * @param string $type Package type
-     * @return array
-     */
-    public function getDuplicateLinks($type)
-    {
-        return isset($this->duplicateLinks[$type]) ?
-            $this->duplicateLinks[$type] : array();
-    }
-
-    /**
-     * Should includes be recursively processed?
-     *
-     * @return bool
-     */
-    public function recurseIncludes()
-    {
-        return $this->recurse;
-    }
-
-    /**
-     * Should duplicate links be replaced in a 'last definition wins' order?
-     *
-     * @return bool
-     */
-    public function replaceDuplicateLinks()
-    {
-        return $this->replace;
-    }
-
-    /**
-     * Should the extra section be merged?
-     *
-     * By default, the extra section is not merged and there will be many
-     * cases where the merge of the extra section is performed too late
-     * to be of use to other plugins. When enabled, merging uses one of
-     * two strategies - either 'first wins' or 'last wins'. When enabled,
-     * 'first wins' is the default behaviour. If Replace mode is activated
-     * then 'last wins' is used.
-     *
-     * @return bool
-     */
-    public function shouldMergeExtra()
-    {
-        return $this->mergeExtra;
-    }
-}
-// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php
deleted file mode 100644
index 1c106e0..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer\Merge;
-
-use Composer\Package\BasePackage;
-use Composer\Package\Version\VersionParser;
-
-/**
- * Adapted from Composer's RootPackageLoader::extractStabilityFlags
- * @author Bryan Davis <bd808@bd808.com>
- */
-class StabilityFlags
-{
-
-    /**
-     * @var array Current package name => stability mappings
-     */
-    protected $stabilityFlags;
-
-    /**
-     * @var int Current default minimum stability
-     */
-    protected $minimumStability;
-
-    /**
-     * @var string Regex to extract an explict stability flag (eg '@dev')
-     */
-    protected $explicitStabilityRe;
-
-
-    /**
-     * @param array $stabilityFlags Current package name => stability mappings
-     * @param int $minimumStability Current default minimum stability
-     */
-    public function __construct(
-        array $stabilityFlags = array(),
-        $minimumStability = BasePackage::STABILITY_STABLE
-    ) {
-        $this->stabilityFlags = $stabilityFlags;
-        $this->minimumStability = $this->getStabilityInt($minimumStability);
-        $this->explicitStabilityRe = '/^[^@]*?@(' .
-            implode('|', array_keys(BasePackage::$stabilities)) .
-            ')$/i';
-    }
-
-    /**
-     * Get the stability value for a given string.
-     *
-     * @param string $name Stability name
-     * @return int Stability value
-     */
-    protected function getStabilityInt($name)
-    {
-        $name = VersionParser::normalizeStability($name);
-        return isset(BasePackage::$stabilities[$name]) ?
-            BasePackage::$stabilities[$name] :
-            BasePackage::STABILITY_STABLE;
-    }
-
-    /**
-     * Extract and merge stability flags from the given collection of
-     * requires with another collection of stability flags.
-     *
-     * @param array $requires New package name => link mappings
-     * @return array Unified package name => stability mappings
-     */
-    public function extractAll(array $requires)
-    {
-        $flags = array();
-
-        foreach ($requires as $name => $link) {
-            $name = strtolower($name);
-            $version = $link->getPrettyConstraint();
-
-            $stability = $this->getExplicitStability($version);
-
-            if ($stability === null) {
-                $stability = $this->getParsedStability($version);
-            }
-
-            $flags[$name] = max($stability, $this->getCurrentStability($name));
-        }
-
-        // Filter out null stability values
-        return array_filter($flags, function ($v) {
-            return $v !== null;
-        });
-    }
-
-
-    /**
-     * Extract the most unstable explicit stability (eg '@dev') from a version
-     * specification.
-     *
-     * @param string $version
-     * @return int|null Stability or null if no explict stability found
-     */
-    protected function getExplicitStability($version)
-    {
-        $found = null;
-        $constraints = $this->splitConstraints($version);
-        foreach ($constraints as $constraint) {
-            if (preg_match($this->explicitStabilityRe, $constraint, $match)) {
-                $stability = $this->getStabilityInt($match[1]);
-                $found = max($stability, $found);
-            }
-        }
-        return $found;
-    }
-
-
-    /**
-     * Split a version specification into a list of version constraints.
-     *
-     * @param string $version
-     * @return array
-     */
-    protected function splitConstraints($version)
-    {
-        $found = array();
-        $orConstraints = preg_split('/\s*\|\|?\s*/', trim($version));
-        foreach ($orConstraints as $constraints) {
-            $andConstraints = preg_split(
-                '/(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)/',
-                $constraints
-            );
-            foreach ($andConstraints as $constraint) {
-                $found[] = $constraint;
-            }
-        }
-        return $found;
-    }
-
-
-    /**
-     * Get the stability of a version
-     *
-     * @param string $version
-     * @return int|null Stability or null if STABLE or less than minimum
-     */
-    protected function getParsedStability($version)
-    {
-        // Drop aliasing if used
-        $version = preg_replace('/^([^,\s@]+) as .+$/', '$1', $version);
-        $stability = $this->getStabilityInt(
-            VersionParser::parseStability($version)
-        );
-
-        if ($stability === BasePackage::STABILITY_STABLE ||
-            $this->minimumStability > $stability
-        ) {
-            // Ignore if 'stable' or more stable than the global
-            // minimum
-            $stability = null;
-        }
-
-        return $stability;
-    }
-
-
-    /**
-     * Get the current stability of a given package.
-     *
-     * @param string $name
-     * @return int|null Stability of null if not set
-     */
-    protected function getCurrentStability($name)
-    {
-        return isset($this->stabilityFlags[$name]) ?
-            $this->stabilityFlags[$name] : null;
-    }
-}
-// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php b/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php
deleted file mode 100644
index ea41d41..0000000
--- a/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-/**
- * This file is part of the Composer Merge plugin.
- *
- * Copyright (C) 2015 Bryan Davis, Wikimedia Foundation, and contributors
- *
- * This software may be modified and distributed under the terms of the MIT
- * license. See the LICENSE file for details.
- */
-
-namespace Wikimedia\Composer;
-
-use Wikimedia\Composer\Merge\ExtraPackage;
-use Wikimedia\Composer\Merge\MissingFileException;
-use Wikimedia\Composer\Merge\PluginState;
-
-use Composer\Composer;
-use Composer\DependencyResolver\Operation\InstallOperation;
-use Composer\EventDispatcher\EventSubscriberInterface;
-use Composer\Factory;
-use Composer\Installer;
-use Composer\Installer\InstallerEvent;
-use Composer\Installer\InstallerEvents;
-use Composer\Installer\PackageEvent;
-use Composer\Installer\PackageEvents;
-use Composer\IO\IOInterface;
-use Composer\Package\RootPackageInterface;
-use Composer\Plugin\PluginInterface;
-use Composer\Script\Event;
-use Composer\Script\ScriptEvents;
-
-/**
- * Composer plugin that allows merging multiple composer.json files.
- *
- * When installed, this plugin will look for a "merge-plugin" key in the
- * composer configuration's "extra" section. The value for this key is
- * a set of options configuring the plugin.
- *
- * An "include" setting is required. The value of this setting can be either
- * a single value or an array of values. Each value is treated as a glob()
- * pattern identifying additional composer.json style configuration files to
- * merge into the configuration for the current compser execution.
- *
- * The "autoload", "autoload-dev", "conflict", "provide", "replace",
- * "repositories", "require", "require-dev", and "suggest" sections of the
- * found configuration files will be merged into the root package
- * configuration as though they were directly included in the top-level
- * composer.json file.
- *
- * If included files specify conflicting package versions for "require" or
- * "require-dev", the normal Composer dependency solver process will be used
- * to attempt to resolve the conflict. Specifying the 'replace' key as true will
- * change this default behaviour so that the last-defined version of a package
- * will win, allowing for force-overrides of package defines.
- *
- * By default the "extra" section is not merged. This can be enabled by
- * setitng the 'merge-extra' key to true. In normal mode, when the same key is
- * found in both the original and the imported extra section, the version in
- * the original config is used and the imported version is skipped. If
- * 'replace' mode is active, this behaviour changes so the imported version of
- * the key is used, replacing the version in the original config.
- *
- *
- * @code
- * {
- *     "require": {
- *         "wikimedia/composer-merge-plugin": "dev-master"
- *     },
- *     "extra": {
- *         "merge-plugin": {
- *             "include": [
- *                 "composer.local.json"
- *             ]
- *         }
- *     }
- * }
- * @endcode
- *
- * @author Bryan Davis <bd808@bd808.com>
- */
-class MergePlugin implements PluginInterface, EventSubscriberInterface
-{
-
-    /**
-     * Offical package name
-     */
-    const PACKAGE_NAME = 'wikimedia/composer-merge-plugin';
-
-    /**
-     * @var Composer $composer
-     */
-    protected $composer;
-
-    /**
-     * @var PluginState $state
-     */
-    protected $state;
-
-    /**
-     * @var Logger $logger
-     */
-    protected $logger;
-
-    /**
-     * Files that have already been processed
-     *
-     * @var string[] $loadedFiles
-     */
-    protected $loadedFiles = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function activate(Composer $composer, IOInterface $io)
-    {
-        $this->composer = $composer;
-        $this->state = new PluginState($this->composer);
-        $this->logger = new Logger('merge-plugin', $io);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(
-            InstallerEvents::PRE_DEPENDENCIES_SOLVING => 'onDependencySolve',
-            PackageEvents::POST_PACKAGE_INSTALL => 'onPostPackageInstall',
-            ScriptEvents::POST_INSTALL_CMD => 'onPostInstallOrUpdate',
-            ScriptEvents::POST_UPDATE_CMD => 'onPostInstallOrUpdate',
-            ScriptEvents::PRE_AUTOLOAD_DUMP => 'onInstallUpdateOrDump',
-            ScriptEvents::PRE_INSTALL_CMD => 'onInstallUpdateOrDump',
-            ScriptEvents::PRE_UPDATE_CMD => 'onInstallUpdateOrDump',
-        );
-    }
-
-    /**
-     * Handle an event callback for an install, update or dump command by
-     * checking for "merge-plugin" in the "extra" data and merging package
-     * contents if found.
-     *
-     * @param Event $event
-     */
-    public function onInstallUpdateOrDump(Event $event)
-    {
-        $this->state->loadSettings();
-        $this->state->setDevMode($event->isDevMode());
-        $this->mergeFiles($this->state->getIncludes(), false);
-        $this->mergeFiles($this->state->getRequires(), true);
-
-        if ($event->getName() === ScriptEvents::PRE_AUTOLOAD_DUMP) {
-            $this->state->setDumpAutoloader(true);
-            $flags = $event->getFlags();
-            if (isset($flags['optimize'])) {
-                $this->state->setOptimizeAutoloader($flags['optimize']);
-            }
-        }
-    }
-
-    /**
-     * Find configuration files matching the configured glob patterns and
-     * merge their contents with the master package.
-     *
-     * @param array $patterns List of files/glob patterns
-     * @param bool $required Are the patterns required to match files?
-     * @throws MissingFileException when required and a pattern returns no
-     *      results
-     */
-    protected function mergeFiles(array $patterns, $required = false)
-    {
-        $root = $this->composer->getPackage();
-
-        $files = array_map(
-            function ($files, $pattern) use ($required) {
-                if ($required && !$files) {
-                    throw new MissingFileException(
-                        "merge-plugin: No files matched required '{$pattern}'"
-                    );
-                }
-                return $files;
-            },
-            array_map('glob', $patterns),
-            $patterns
-        );
-
-        foreach (array_reduce($files, 'array_merge', array()) as $path) {
-            $this->mergeFile($root, $path);
-        }
-    }
-
-    /**
-     * Read a JSON file and merge its contents
-     *
-     * @param RootPackageInterface $root
-     * @param string $path
-     */
-    protected function mergeFile(RootPackageInterface $root, $path)
-    {
-        if (isset($this->loadedFiles[$path])) {
-            $this->logger->debug("Already merged <comment>$path</comment>");
-            return;
-        } else {
-            $this->loadedFiles[$path] = true;
-        }
-        $this->logger->info("Loading <comment>{$path}</comment>...");
-
-        $package = new ExtraPackage($path, $this->composer, $this->logger);
-        $package->mergeInto($root, $this->state);
-
-        if ($this->state->recurseIncludes()) {
-            $this->mergeFiles($package->getIncludes(), false);
-            $this->mergeFiles($package->getRequires(), true);
-        }
-    }
-
-    /**
-     * Handle an event callback for pre-dependency solving phase of an install
-     * or update by adding any duplicate package dependencies found during
-     * initial merge processing to the request that will be processed by the
-     * dependency solver.
-     *
-     * @param InstallerEvent $event
-     */
-    public function onDependencySolve(InstallerEvent $event)
-    {
-        $request = $event->getRequest();
-        foreach ($this->state->getDuplicateLinks('require') as $link) {
-            $this->logger->info(
-                "Adding dependency <comment>{$link}</comment>"
-            );
-            $request->install($link->getTarget(), $link->getConstraint());
-        }
-        if ($this->state->isDevMode()) {
-            foreach ($this->state->getDuplicateLinks('require-dev') as $link) {
-                $this->logger->info(
-                    "Adding dev dependency <comment>{$link}</comment>"
-                );
-                $request->install($link->getTarget(), $link->getConstraint());
-            }
-        }
-    }
-
-    /**
-     * Handle an event callback following installation of a new package by
-     * checking to see if the package that was installed was our plugin.
-     *
-     * @param PackageEvent $event
-     */
-    public function onPostPackageInstall(PackageEvent $event)
-    {
-        $op = $event->getOperation();
-        if ($op instanceof InstallOperation) {
-            $package = $op->getPackage()->getName();
-            if ($package === self::PACKAGE_NAME) {
-                $this->logger->info('composer-merge-plugin installed');
-                $this->state->setFirstInstall(true);
-                $this->state->setLocked(
-                    $event->getComposer()->getLocker()->isLocked()
-                );
-            }
-        }
-    }
-
-    /**
-     * Handle an event callback following an install or update command. If our
-     * plugin was installed during the run then trigger an update command to
-     * process any merge-patterns in the current config.
-     *
-     * @param Event $event
-     */
-    public function onPostInstallOrUpdate(Event $event)
-    {
-        // @codeCoverageIgnoreStart
-        if ($this->state->isFirstInstall()) {
-            $this->state->setFirstInstall(false);
-            $this->logger->info(
-                '<comment>' .
-                'Running additional update to apply merge settings' .
-                '</comment>'
-            );
-
-            $config = $this->composer->getConfig();
-
-            $preferSource = $config->get('preferred-install') == 'source';
-            $preferDist = $config->get('preferred-install') == 'dist';
-
-            $installer = Installer::create(
-                $event->getIO(),
-                // Create a new Composer instance to ensure full processing of
-                // the merged files.
-                Factory::create($event->getIO(), null, false)
-            );
-
-            $installer->setPreferSource($preferSource);
-            $installer->setPreferDist($preferDist);
-            $installer->setDevMode($event->isDevMode());
-            $installer->setDumpAutoloader($this->state->shouldDumpAutoloader());
-            $installer->setOptimizeAutoloader(
-                $this->state->shouldOptimizeAutoloader()
-            );
-
-            if ($this->state->forceUpdate()) {
-                // Force update mode so that new packages are processed rather
-                // than just telling the user that composer.json and
-                // composer.lock don't match.
-                $installer->setUpdate(true);
-            }
-
-            $installer->run();
-        }
-        // @codeCoverageIgnoreEnd
-    }
-}
-// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/zendframework/zend-diactoros/.coveralls.yml b/vendor/zendframework/zend-diactoros/.coveralls.yml
deleted file mode 100644
index 53bda82..0000000
--- a/vendor/zendframework/zend-diactoros/.coveralls.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-coverage_clover: clover.xml
-json_path: coveralls-upload.json
-src_dir: src
diff --git a/vendor/zendframework/zend-diactoros/CHANGELOG.md b/vendor/zendframework/zend-diactoros/CHANGELOG.md
deleted file mode 100644
index 57b0a87..0000000
--- a/vendor/zendframework/zend-diactoros/CHANGELOG.md
+++ /dev/null
@@ -1,302 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 1.1.3 - 2015-08-10
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#71](https://github.com/zendframework/zend-diactoros/pull/71) fixes the
-  docblock of the `JsonResponse` constructor to typehint the `$data` argument
-  as `mixed`.
-- [#73](https://github.com/zendframework/zend-diactoros/pull/73) changes the
-  behavior in `Request` such that if it marshals a stream during instantiation,
-  the stream is marked as writeable (specifically, mode `wb+`).
-- [#85](https://github.com/zendframework/zend-diactoros/pull/85) updates the
-  behavior of `Zend\Diactoros\Uri`'s various `with*()` methods that are
-  documented as accepting strings to raise exceptions on non-string input.
-  Previously, several simply passed non-string input on verbatim, others
-  normalized the input, and a few correctly raised the exceptions. Behavior is
-  now consistent across each.
-- [#87](https://github.com/zendframework/zend-diactoros/pull/87) fixes
-  `UploadedFile` to ensure that `moveTo()` works correctly in non-SAPI
-  environments when the file provided to the constructor is a path.
-
-## 1.1.2 - 2015-07-12
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#67](https://github.com/zendframework/zend-diactoros/pull/67) ensures that
-  the `Stream` class only accepts `stream` resources, not any resource.
-
-## 1.1.1 - 2015-06-25
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#64](https://github.com/zendframework/zend-diactoros/pull/64) fixes the
-  behavior of `JsonResponse` with regards to serialization of `null` and scalar
-  values; the new behavior is to serialize them verbatim, without any casting.
-
-## 1.1.0 - 2015-06-24
-
-### Added
-
-- [#52](https://github.com/zendframework/zend-diactoros/pull/52),
-  [#58](https://github.com/zendframework/zend-diactoros/pull/58),
-  [#59](https://github.com/zendframework/zend-diactoros/pull/59), and
-  [#61](https://github.com/zendframework/zend-diactoros/pull/61) create several
-  custom response types for simplifying response creation:
-
-  - `Zend\Diactoros\Response\HtmlResponse` accepts HTML content via its
-    constructor, and sets the `Content-Type` to `text/html`.
-  - `Zend\Diactoros\Response\JsonResponse` accepts data to serialize to JSON via
-    its constructor, and sets the `Content-Type` to `application/json`.
-  - `Zend\Diactoros\Response\EmptyResponse` allows creating empty, read-only
-    responses, with a default status code of 204.
-  - `Zend\Diactoros\Response\RedirectResponse` allows specifying a URI for the
-    `Location` header in the constructor, with a default status code of 302.
-
-  Each also accepts an optional status code, and optional headers (which can
-  also be used to provide an alternate `Content-Type` in the case of the HTML
-  and JSON responses).
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- [#43](https://github.com/zendframework/zend-diactoros/pull/43) removed both
-  `ServerRequestFactory::marshalUri()` and `ServerRequestFactory::marshalHostAndPort()`,
-  which were deprecated prior to the 1.0 release.
-
-### Fixed
-
-- [#29](https://github.com/zendframework/zend-diactoros/pull/29) fixes request
-  method validation to allow any valid token as defined by [RFC
-  7230](http://tools.ietf.org/html/rfc7230#appendix-B). This allows usage of
-  custom request methods, vs a static, hard-coded list.
-
-## 1.0.5 - 2015-06-24
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#60](https://github.com/zendframework/zend-diactoros/pull/60) fixes
-  the behavior of `UploadedFile` when the `$errorStatus` provided at
-  instantiation is not `UPLOAD_ERR_OK`. Prior to the fix, an
-  `InvalidArgumentException` would occur at instantiation due to the fact that
-  the upload file was missing or invalid. With the fix, no exception is raised
-  until a call to `moveTo()` or `getStream()` is made.
-
-## 1.0.4 - 2015-06-23
-
-This is a security release.
-
-A patch has been applied to `Zend\Diactoros\Uri::filterPath()` that ensures that
-paths can only begin with a single leading slash. This prevents the following
-potential security issues:
-
-- XSS vectors. If the URI path is used for links or form targets, this prevents
-  cases where the first segment of the path resembles a domain name, thus
-  creating scheme-relative links such as `//example.com/foo`. With the patch,
-  the leading double slash is reduced to a single slash, preventing the XSS
-  vector.
-- Open redirects. If the URI path is used for `Location` or `Link` headers,
-  without a scheme and authority, potential for open redirects exist if clients
-  do not prepend the scheme and authority. Again, preventing a double slash
-  corrects the vector.
-
-If you are using `Zend\Diactoros\Uri` for creating links, form targets, or
-redirect paths, and only using the path segment, we recommend upgrading
-immediately.
-
-### Added
-
-- [#25](https://github.com/zendframework/zend-diactoros/pull/25) adds
-  documentation. Documentation is written in markdown, and can be converted to
-  HTML using [bookdown](http://bookdown.io). New features now MUST include
-  documentation for acceptance.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#51](https://github.com/zendframework/zend-diactoros/pull/51) fixes
-  `MessageTrait::getHeaderLine()` to return an empty string instead of `null` if
-  the header is undefined (which is the behavior specified in PSR-7).
-- [#57](https://github.com/zendframework/zend-diactoros/pull/57) fixes the
-  behavior of how the `ServerRequestFactory` marshals upload files when they are
-  represented as a nested associative array.
-- [#49](https://github.com/zendframework/zend-diactoros/pull/49) provides several 
-  fixes that ensure that Diactoros complies with the PSR-7 specification:
-  - `MessageInterface::getHeaderLine()` MUST return a string (that string CAN be
-    empty). Previously, Diactoros would return `null`.
-  - If no `Host` header is set, the `$preserveHost` flag MUST be ignored when
-    calling `withUri()` (previously, Diactoros would not set the `Host` header
-    if `$preserveHost` was `true`, but no `Host` header was present).
-  - The request method MUST be a string; it CAN be empty. Previously, Diactoros
-    would return `null`.
-  - The request MUST return a `UriInterface` instance from `getUri()`; that
-    instance CAN be empty. Previously, Diactoros would return `null`; now it
-    lazy-instantiates an empty `Uri` instance on initialization.
-- [ZF2015-05](http://framework.zend.com/security/advisory/ZF2015-05) was
-  addressed by altering `Uri::filterPath()` to prevent emitting a path prepended
-  with multiple slashes.
-
-## 1.0.3 - 2015-06-04
-
-### Added
-
-- [#48](https://github.com/zendframework/zend-diactoros/pull/48) drops the
-  minimum supported PHP version to 5.4, to allow an easier upgrade path for
-  Symfony 2.7 users, and potential Drupal 8 usage.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 1.0.2 - 2015-06-04
-
-### Added
-
-- [#27](https://github.com/zendframework/zend-diactoros/pull/27) adds phonetic
-  pronunciation of "Diactoros" to the README file.
-- [#36](https://github.com/zendframework/zend-diactoros/pull/36) adds property
-  annotations to the class-level docblock of `Zend\Diactoros\RequestTrait` to
-  ensure properties inherited from the `MessageTrait` are inherited by
-  implementations.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
--
-### Fixed
-
-- [#41](https://github.com/zendframework/zend-diactoros/pull/41) fixes the
-  namespace for test files to begin with `ZendTest` instead of `Zend`.
-- [#46](https://github.com/zendframework/zend-diactoros/pull/46) ensures that
-  the cookie and query params for the `ServerRequest` implementation are
-  initialized as arrays.
-- [#47](https://github.com/zendframework/zend-diactoros/pull/47) modifies the
-  internal logic in `HeaderSecurity::isValid()` to use a regular expression
-  instead of character-by-character comparisons, improving performance.
-
-## 1.0.1 - 2015-05-26
-
-### Added
-
-- [#10](https://github.com/zendframework/zend-diactoros/pull/10) adds
-  `Zend\Diactoros\RelativeStream`, which will return stream contents relative to
-  a given offset (i.e., a subset of the stream).  `AbstractSerializer` was
-  updated to create a `RelativeStream` when creating the body of a message,
-  which will prevent duplication of the stream in-memory.
-- [#21](https://github.com/zendframework/zend-diactoros/pull/21) adds a
-  `.gitattributes` file that excludes directories and files not needed for
-  production; this will further minify the package for production use cases.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/zendframework/zend-diactoros/pull/9) ensures that
-  attributes are initialized to an empty array, ensuring that attempts to
-  retrieve single attributes when none are defined will not produce errors.
-- [#14](https://github.com/zendframework/zend-diactoros/pull/14) updates
-  `Zend\Diactoros\Request` to use a `php://temp` stream by default instead of
-  `php://memory`, to ensure requests do not create an out-of-memory condition.
-- [#15](https://github.com/zendframework/zend-diactoros/pull/15) updates
-  `Zend\Diactoros\Stream` to ensure that write operations trigger an exception
-  if the stream is not writeable. Additionally, it adds more robust logic for
-  determining if a stream is writeable.
-
-## 1.0.0 - 2015-05-21
-
-First stable release, and first release as `zend-diactoros`.
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
diff --git a/vendor/zendframework/zend-diactoros/CONTRIBUTING.md b/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
deleted file mode 100644
index d99a16c..0000000
--- a/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
+++ /dev/null
@@ -1,223 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-diactoros/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## Documentation
-
-Documentation is in [GitHub Flavored Markdown](https://help.github.com/articles/github-flavored-markdown/),
-and rendered using [bookdown](http://bookdown.io). Please read and follow the [general documentation
-guidelines](https://github.com/zendframework/documentation/blob/master/CONTRIBUTING.md) when
-providing documentation.
-
-All new features **must** include documentation before they may be accepted and merged.
-
-## RUNNING TESTS
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-diactoros.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-## Running Coding Standards Checks
-
-This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
-standards checks, and provides configuration for our selected checks.
-`phpcs` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/phpcs --standard=PSR2 src test
-```
-
-`phpcs` also installs a tool named `phpcbf` which can attempt to fix problems
-for you:
-
-```console
-$ ./vendor/bin/phpcbf --standard=PSR2 src test
-```
-
-If you allow phpcbf to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-diactoros)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-diactoros.git
-   $ cd zend-diactoros
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-diactoros.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-diactoros.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/vendor/zendframework/zend-diactoros/LICENSE.md b/vendor/zendframework/zend-diactoros/LICENSE.md
deleted file mode 100644
index b401e72..0000000
--- a/vendor/zendframework/zend-diactoros/LICENSE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2015, Zend Technologies USA, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 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.
-
-- 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.
-
-- Neither the name of Zend Technologies USA, Inc. 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-diactoros/README.md b/vendor/zendframework/zend-diactoros/README.md
deleted file mode 100644
index b25dc9b..0000000
--- a/vendor/zendframework/zend-diactoros/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# zend-diactoros
-
-Master:
-[![Build status][Master image]][Master]
-[![Coverage Status][Master coverage image]][Master coverage]
-Develop:
-[![Build status][Develop image]][Develop]
-[![Coverage Status][Develop coverage image]][Develop coverage]
-
-> Diactoros (pronunciation: `/dɪʌktɒrɒs/`): an epithet for Hermes, meaning literally, "the messenger."
-
-This package supercedes and replaces [phly/http](https://github.com/phly/http).
-
-`zend-diactoros` is a PHP package containing implementations of the [accepted PSR-7 HTTP message interfaces](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md), as well as a "server" implementation similar to [node's http.Server](http://nodejs.org/api/http.html).
-
-* File issues at https://github.com/zendframework/zend-diactoros/issues
-* Issue patches to https://github.com/zendframework/zend-diactoros/pulls
-
-## Documentation
-
-Documentation is [in the doc tree](doc/), and can be compiled using [bookdown](http://bookdown.io):
-
-```console
-$ bookdown doc/bookdown.json
-$ php -S 0.0.0.0:8080 -t doc/html/ # then browse to http://localhost:8080/
-```
-
-> ### Bookdown
->
-> You can install bookdown globally using `composer global require bookdown/bookdown`. If you do
-> this, make sure that `$HOME/.composer/vendor/bin` is on your `$PATH`.
-
-  [Master]: https://travis-ci.org/zendframework/zend-diactoros
-  [Master image]: https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=master
-  [Master coverage image]: https://img.shields.io/coveralls/zendframework/zend-diactoros/master.svg
-  [Master coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=master
-  [Develop]: https://github.com/zendframework/zend-diactoros/tree/develop
-  [Develop image]:  https://secure.travis-ci.org/zendframework/zend-diactoros.svg?branch=develop
-  [Develop coverage image]: https://coveralls.io/repos/zendframework/zend-diactoros/badge.svg?branch=develop
-  [Develop coverage]: https://coveralls.io/r/zendframework/zend-diactoros?branch=develop
diff --git a/vendor/zendframework/zend-diactoros/composer.json b/vendor/zendframework/zend-diactoros/composer.json
deleted file mode 100644
index fee75d9..0000000
--- a/vendor/zendframework/zend-diactoros/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "zendframework/zend-diactoros",
-  "description": "PSR HTTP Message implementations",
-  "type": "library",
-  "license": "BSD-2-Clause",
-  "keywords": [
-    "http",
-    "psr",
-    "psr-7"
-  ],
-  "homepage": "https://github.com/zendframework/zend-diactoros",
-  "support": {
-    "issues": "https://github.com/zendframework/zend-diactoros/issues",
-    "source": "https://github.com/zendframework/zend-diactoros"
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.0-dev",
-      "dev-develop": "1.1-dev"
-    }
-  },
-  "require": {
-    "php": ">=5.4",
-    "psr/http-message": "~1.0"
-  },
-  "require-dev": {
-    "phpunit/PHPUnit": "~4.6",
-    "squizlabs/php_codesniffer": "^2.3.1"
-  },
-  "provide": {
-    "psr/http-message-implementation": "~1.0.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Zend\\Diactoros\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "ZendTest\\Diactoros\\": "test/"
-    },
-    "files": [
-      "test/TestAsset/Functions.php",
-      "test/TestAsset/SapiResponse.php"
-    ]
-  }
-}
diff --git a/vendor/zendframework/zend-diactoros/phpcs.xml b/vendor/zendframework/zend-diactoros/phpcs.xml
deleted file mode 100644
index e994eae..0000000
--- a/vendor/zendframework/zend-diactoros/phpcs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Zend Framework coding standard">
-    <description>Zend Framework coding standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Paths to check -->
-    <file>src</file>
-    <file>test</file>
-</ruleset>
diff --git a/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php b/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
deleted file mode 100644
index a55ca5a..0000000
--- a/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use Psr\Http\Message\StreamInterface;
-use UnexpectedValueException;
-
-/**
- * Provides base functionality for request and response de/serialization
- * strategies, including functionality for retrieving a line at a time from
- * the message, splitting headers from the body, and serializing headers.
- */
-abstract class AbstractSerializer
-{
-    const CR  = "\r";
-    const EOL = "\r\n";
-    const LF  = "\n";
-
-    /**
-     * Retrieve a single line from the stream.
-     *
-     * Retrieves a line from the stream; a line is defined as a sequence of
-     * characters ending in a CRLF sequence.
-     *
-     * @param StreamInterface $stream
-     * @return string
-     * @throws UnexpectedValueException if the sequence contains a CR or LF in
-     *     isolation, or ends in a CR.
-     */
-    protected static function getLine(StreamInterface $stream)
-    {
-        $line    = '';
-        $crFound = false;
-        while (! $stream->eof()) {
-            $char = $stream->read(1);
-
-            if ($crFound && $char === self::LF) {
-                $crFound = false;
-                break;
-            }
-
-            // CR NOT followed by LF
-            if ($crFound && $char !== self::LF) {
-                throw new UnexpectedValueException('Unexpected carriage return detected');
-            }
-
-            // LF in isolation
-            if (! $crFound && $char === self::LF) {
-                throw new UnexpectedValueException('Unexpected line feed detected');
-            }
-
-            // CR found; do not append
-            if ($char === self::CR) {
-                $crFound = true;
-                continue;
-            }
-
-            // Any other character: append
-            $line .= $char;
-        }
-
-        // CR found at end of stream
-        if ($crFound) {
-            throw new UnexpectedValueException("Unexpected end of headers");
-        }
-
-        return $line;
-    }
-
-    /**
-     * Split the stream into headers and body content.
-     *
-     * Returns an array containing two elements
-     *
-     * - The first is an array of headers
-     * - The second is a StreamInterface containing the body content
-     *
-     * @param StreamInterface $stream
-     * @return array
-     * @throws UnexpectedValueException For invalid headers.
-     */
-    protected static function splitStream(StreamInterface $stream)
-    {
-        $headers       = [];
-        $currentHeader = false;
-
-        while ($line = self::getLine($stream)) {
-            if (preg_match(';^(?P<name>[!#$%&\'*+.^_`\|~0-9a-zA-Z-]+):(?P<value>.*)$;', $line, $matches)) {
-                $currentHeader = $matches['name'];
-                if (! isset($headers[$currentHeader])) {
-                    $headers[$currentHeader] = [];
-                }
-                $headers[$currentHeader][] = ltrim($matches['value']);
-                continue;
-            }
-
-            if (! $currentHeader) {
-                throw new UnexpectedValueException('Invalid header detected');
-            }
-
-            if (! preg_match('#^[ \t]#', $line)) {
-                throw new UnexpectedValueException('Invalid header continuation');
-            }
-
-            // Append continuation to last header value found
-            $value = array_pop($headers[$currentHeader]);
-            $headers[$currentHeader][] = $value . ltrim($line);
-        }
-
-        // use RelativeStream to avoid copying initial stream into memory
-        return [$headers, new RelativeStream($stream, $stream->tell())];
-    }
-
-    /**
-     * Serialize headers to string values.
-     *
-     * @param array $headers
-     * @return string
-     */
-    protected static function serializeHeaders(array $headers)
-    {
-        $lines = [];
-        foreach ($headers as $header => $values) {
-            $normalized = self::filterHeader($header);
-            foreach ($values as $value) {
-                $lines[] = sprintf('%s: %s', $normalized, $value);
-            }
-        }
-
-        return implode("\r\n", $lines);
-    }
-
-    /**
-     * Filter a header name to wordcase
-     *
-     * @param string $header
-     * @return string
-     */
-    protected static function filterHeader($header)
-    {
-        $filtered = str_replace('-', ' ', $header);
-        $filtered = ucwords($filtered);
-        return str_replace(' ', '-', $filtered);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php b/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
deleted file mode 100644
index bdef44a..0000000
--- a/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Exception;
-
-use BadMethodCallException;
-
-/**
- * Exception indicating a deprecated method.
- */
-class DeprecatedMethodException extends BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
deleted file mode 100644
index a2b22fb..0000000
--- a/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Exception;
-
-/**
- * Marker interface for package-specific exceptions.
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php b/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
deleted file mode 100644
index 231beac..0000000
--- a/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-
-/**
- * Provide security tools around HTTP headers to prevent common injection vectors.
- *
- * Code is largely lifted from the Zend\Http\Header\HeaderValue implementation in
- * Zend Framework, released with the copyright and license below.
- *
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-final class HeaderSecurity
-{
-    /**
-     * Private constructor; non-instantiable.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Filter a header value
-     *
-     * Ensures CRLF header injection vectors are filtered.
-     *
-     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
-     * tabs are allowed in values; header continuations MUST consist of
-     * a single CRLF sequence followed by a space or horizontal tab.
-     *
-     * This method filters any values not allowed from the string, and is
-     * lossy.
-     *
-     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
-     * @param string $value
-     * @return string
-     */
-    public static function filter($value)
-    {
-        $value  = (string) $value;
-        $length = strlen($value);
-        $string = '';
-        for ($i = 0; $i < $length; $i += 1) {
-            $ascii = ord($value[$i]);
-
-            // Detect continuation sequences
-            if ($ascii === 13) {
-                $lf = ord($value[$i + 1]);
-                $ws = ord($value[$i + 2]);
-                if ($lf === 10 && in_array($ws, [9, 32], true)) {
-                    $string .= $value[$i] . $value[$i + 1];
-                    $i += 1;
-                }
-
-                continue;
-            }
-
-            // Non-visible, non-whitespace characters
-            // 9 === horizontal tab
-            // 32-126, 128-254 === visible
-            // 127 === DEL
-            // 255 === null byte
-            if (($ascii < 32 && $ascii !== 9)
-                || $ascii === 127
-                || $ascii > 254
-            ) {
-                continue;
-            }
-
-            $string .= $value[$i];
-        }
-
-        return $string;
-    }
-
-    /**
-     * Validate a header value.
-     *
-     * Per RFC 7230, only VISIBLE ASCII characters, spaces, and horizontal
-     * tabs are allowed in values; header continuations MUST consist of
-     * a single CRLF sequence followed by a space or horizontal tab.
-     *
-     * @see http://en.wikipedia.org/wiki/HTTP_response_splitting
-     * @param string $value
-     * @return bool
-     */
-    public static function isValid($value)
-    {
-        $value  = (string) $value;
-
-        // Look for:
-        // \n not preceded by \r, OR
-        // \r not followed by \n, OR
-        // \r\n not followed by space or horizontal tab; these are all CRLF attacks
-        if (preg_match("#(?:(?:(?<!\r)\n)|(?:\r(?!\n))|(?:\r\n(?![ \t])))#", $value)) {
-            return false;
-        }
-
-        // Non-visible, non-whitespace characters
-        // 9 === horizontal tab
-        // 10 === line feed
-        // 13 === carriage return
-        // 32-126, 128-254 === visible
-        // 127 === DEL (disallowed)
-        // 255 === null byte (disallowed)
-        if (preg_match('/[^\x09\x0a\x0d\x20-\x7E\x80-\xFE]/', $value)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Assert a header value is valid.
-     *
-     * @param string $value
-     * @throws InvalidArgumentException for invalid values
-     */
-    public static function assertValid($value)
-    {
-        if (! self::isValid($value)) {
-            throw new InvalidArgumentException('Invalid header value');
-        }
-    }
-
-    /**
-     * Assert whether or not a header name is valid.
-     *
-     * @see http://tools.ietf.org/html/rfc7230#section-3.2
-     * @param mixed $name
-     * @throws InvalidArgumentException
-     */
-    public static function assertValidName($name)
-    {
-        if (! preg_match('/^[a-zA-Z0-9\'`#$%&*+.^_|~!-]+$/', $name)) {
-            throw new InvalidArgumentException('Invalid header name');
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/MessageTrait.php b/vendor/zendframework/zend-diactoros/src/MessageTrait.php
deleted file mode 100644
index 1b3fc6f..0000000
--- a/vendor/zendframework/zend-diactoros/src/MessageTrait.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Trait implementing the various methods defined in MessageInterface.
- *
- * @see https://github.com/php-fig/http-message/tree/master/src/MessageInterface.php
- */
-trait MessageTrait
-{
-    /**
-     * List of all registered headers, as key => array of values.
-     *
-     * @var array
-     */
-    protected $headers = [];
-
-    /**
-     * Map of normalized header name to original name used to register header.
-     *
-     * @var array
-     */
-    protected $headerNames = [];
-
-    /**
-     * @var string
-     */
-    private $protocol = '1.1';
-
-    /**
-     * @var StreamInterface
-     */
-    private $stream;
-
-    /**
-     * Retrieves the HTTP protocol version as a string.
-     *
-     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
-     *
-     * @return string HTTP protocol version.
-     */
-    public function getProtocolVersion()
-    {
-        return $this->protocol;
-    }
-
-    /**
-     * Return an instance with the specified HTTP protocol version.
-     *
-     * The version string MUST contain only the HTTP version number (e.g.,
-     * "1.1", "1.0").
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new protocol version.
-     *
-     * @param string $version HTTP protocol version
-     * @return static
-     */
-    public function withProtocolVersion($version)
-    {
-        $new = clone $this;
-        $new->protocol = $version;
-        return $new;
-    }
-
-    /**
-     * Retrieves all message headers.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * @return array Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings.
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($header)
-    {
-        return array_key_exists(strtolower($header), $this->headerNames);
-    }
-
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $header Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader($header)
-    {
-        if (! $this->hasHeader($header)) {
-            return [];
-        }
-
-        $header = $this->headerNames[strtolower($header)];
-        $value  = $this->headers[$header];
-        $value  = is_array($value) ? $value : [$value];
-
-        return $value;
-    }
-
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine($name)
-    {
-        $value = $this->getHeader($name);
-        if (empty($value)) {
-            return '';
-        }
-
-        return implode(',', $value);
-    }
-
-    /**
-     * Return an instance with the provided header, replacing any existing
-     * values of any headers with the same case-insensitive name.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $header Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($header, $value)
-    {
-        if (is_string($value)) {
-            $value = [$value];
-        }
-
-        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
-            throw new InvalidArgumentException(
-                'Invalid header value; must be a string or array of strings'
-            );
-        }
-
-        HeaderSecurity::assertValidName($header);
-        self::assertValidHeaderValue($value);
-
-        $normalized = strtolower($header);
-
-        $new = clone $this;
-        $new->headerNames[$normalized] = $header;
-        $new->headers[$header]         = $value;
-
-        return $new;
-    }
-
-    /**
-     * Return an instance with the specified header appended with the
-     * given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $header Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader($header, $value)
-    {
-        if (is_string($value)) {
-            $value = [ $value ];
-        }
-
-        if (! is_array($value) || ! $this->arrayContainsOnlyStrings($value)) {
-            throw new InvalidArgumentException(
-                'Invalid header value; must be a string or array of strings'
-            );
-        }
-
-        HeaderSecurity::assertValidName($header);
-        self::assertValidHeaderValue($value);
-
-        if (! $this->hasHeader($header)) {
-            return $this->withHeader($header, $value);
-        }
-
-        $normalized = strtolower($header);
-        $header     = $this->headerNames[$normalized];
-
-        $new = clone $this;
-        $new->headers[$header] = array_merge($this->headers[$header], $value);
-        return $new;
-    }
-
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $header Case-insensitive header field name to remove.
-     * @return static
-     */
-    public function withoutHeader($header)
-    {
-        if (! $this->hasHeader($header)) {
-            return clone $this;
-        }
-
-        $normalized = strtolower($header);
-        $original   = $this->headerNames[$normalized];
-
-        $new = clone $this;
-        unset($new->headers[$original], $new->headerNames[$normalized]);
-        return $new;
-    }
-
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return static
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body)
-    {
-        $new = clone $this;
-        $new->stream = $body;
-        return $new;
-    }
-
-    /**
-     * Test that an array contains only strings
-     *
-     * @param array $array
-     * @return bool
-     */
-    private function arrayContainsOnlyStrings(array $array)
-    {
-        return array_reduce($array, [__CLASS__, 'filterStringValue'], true);
-    }
-
-    /**
-     * Filter a set of headers to ensure they are in the correct internal format.
-     *
-     * Used by message constructors to allow setting all initial headers at once.
-     *
-     * @param array $originalHeaders Headers to filter.
-     * @return array Filtered headers and names.
-     */
-    private function filterHeaders(array $originalHeaders)
-    {
-        $headerNames = $headers = [];
-        foreach ($originalHeaders as $header => $value) {
-            if (! is_string($header)) {
-                continue;
-            }
-
-            if (! is_array($value) && ! is_string($value)) {
-                continue;
-            }
-
-            if (! is_array($value)) {
-                $value = [ $value ];
-            }
-
-            $headerNames[strtolower($header)] = $header;
-            $headers[$header] = $value;
-        }
-
-        return [$headerNames, $headers];
-    }
-
-    /**
-     * Test if a value is a string
-     *
-     * Used with array_reduce.
-     *
-     * @param bool $carry
-     * @param mixed $item
-     * @return bool
-     */
-    private static function filterStringValue($carry, $item)
-    {
-        if (! is_string($item)) {
-            return false;
-        }
-        return $carry;
-    }
-
-    /**
-     * Assert that the provided header values are valid.
-     *
-     * @see http://tools.ietf.org/html/rfc7230#section-3.2
-     * @param string[] $values
-     * @throws InvalidArgumentException
-     */
-    private static function assertValidHeaderValue(array $values)
-    {
-        array_walk($values, __NAMESPACE__ . '\HeaderSecurity::assertValid');
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/PhpInputStream.php b/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
deleted file mode 100644
index a035234..0000000
--- a/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-/**
- * Caching version of php://input
- */
-class PhpInputStream extends Stream
-{
-    /**
-     * @var string
-     */
-    private $cache = '';
-
-    /**
-     * @var bool
-     */
-    private $reachedEof = false;
-
-    /**
-     * @param  string|resource $stream
-     * @param  string $mode
-     */
-    public function __construct($stream = 'php://input', $mode = 'r')
-    {
-        $mode = 'r';
-        parent::__construct($stream, $mode);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        if ($this->reachedEof) {
-            return $this->cache;
-        }
-
-        $this->getContents();
-        return $this->cache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isWritable()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        $content = parent::read($length);
-        if ($content && ! $this->reachedEof) {
-            $this->cache .= $content;
-        }
-
-        if ($this->eof()) {
-            $this->reachedEof = true;
-        }
-
-        return $content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContents($maxLength = -1)
-    {
-        if ($this->reachedEof) {
-            return $this->cache;
-        }
-
-        $contents     = stream_get_contents($this->resource, $maxLength);
-        $this->cache .= $contents;
-
-        if ($maxLength === -1 || $this->eof()) {
-            $this->reachedEof = true;
-        }
-
-        return $contents;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/RelativeStream.php b/vendor/zendframework/zend-diactoros/src/RelativeStream.php
deleted file mode 100644
index f293d51..0000000
--- a/vendor/zendframework/zend-diactoros/src/RelativeStream.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Class RelativeStream
- *
- * Wrapper for default Stream class, representing subpart (starting from given offset) of initial stream.
- * It can be used to avoid copying full stream, conserving memory.
- * @example see Zend\Diactoros\AbstractSerializer::splitStream()
- */
-final class RelativeStream implements StreamInterface
-{
-    /**
-     * @var StreamInterface
-     */
-    private $decoratedStream;
-
-    /**
-     * @var int
-     */
-    private $offset;
-
-    /**
-     * Class constructor
-     *
-     * @param StreamInterface $decoratedStream
-     * @param int $offset
-     */
-    public function __construct(StreamInterface $decoratedStream, $offset)
-    {
-        $this->decoratedStream = $decoratedStream;
-        $this->offset = (int)$offset;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        $this->seek(0);
-        return $this->getContents();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->decoratedStream->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function detach()
-    {
-        return $this->decoratedStream->detach();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        return $this->decoratedStream->getSize() - $this->offset;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function tell()
-    {
-        return $this->decoratedStream->tell() - $this->offset;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eof()
-    {
-        return $this->decoratedStream->eof();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isSeekable()
-    {
-        return $this->decoratedStream->isSeekable();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence == SEEK_SET) {
-            return $this->decoratedStream->seek($offset + $this->offset, $whence);
-        }
-        return $this->decoratedStream->seek($offset, $whence);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rewind()
-    {
-        return $this->seek(0);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isWritable()
-    {
-        return $this->decoratedStream->isWritable();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($string)
-    {
-        return $this->decoratedStream->write($string);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isReadable()
-    {
-        return $this->decoratedStream->isReadable();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        return $this->decoratedStream->read($length);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContents()
-    {
-        return $this->decoratedStream->getContents();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata($key = null)
-    {
-        return $this->decoratedStream->getMetadata($key);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Request.php b/vendor/zendframework/zend-diactoros/src/Request.php
deleted file mode 100644
index 6e00c25..0000000
--- a/vendor/zendframework/zend-diactoros/src/Request.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * HTTP Request encapsulation
- *
- * Requests are considered immutable; all methods that might change state are
- * implemented such that they retain the internal state of the current
- * message and return a new instance that contains the changed state.
- */
-class Request implements RequestInterface
-{
-    use MessageTrait, RequestTrait;
-
-    /**
-     * @param null|string $uri URI for the request, if any.
-     * @param null|string $method HTTP method for the request, if any.
-     * @param string|resource|StreamInterface $body Message body, if any.
-     * @param array $headers Headers for the message, if any.
-     * @throws \InvalidArgumentException for any invalid value.
-     */
-    public function __construct($uri = null, $method = null, $body = 'php://temp', array $headers = [])
-    {
-        $this->initialize($uri, $method, $body, $headers);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaders()
-    {
-        $headers = $this->headers;
-        if (! $this->hasHeader('host')
-            && ($this->uri && $this->uri->getHost())
-        ) {
-            $headers['Host'] = [$this->getHostFromUri()];
-        }
-
-        return $headers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeader($header)
-    {
-        if (! $this->hasHeader($header)) {
-            if (strtolower($header) === 'host'
-                && ($this->uri && $this->uri->getHost())
-            ) {
-                return [$this->getHostFromUri()];
-            }
-
-            return [];
-        }
-
-        $header = $this->headerNames[strtolower($header)];
-        $value  = $this->headers[$header];
-        $value  = is_array($value) ? $value : [$value];
-
-        return $value;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Request/Serializer.php b/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
deleted file mode 100644
index d7c8d13..0000000
--- a/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Request;
-
-use InvalidArgumentException;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
-use UnexpectedValueException;
-use Zend\Diactoros\AbstractSerializer;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\Uri;
-
-/**
- * Serialize (cast to string) or deserialize (cast string to Request) messages.
- *
- * This class provides functionality for serializing a RequestInterface instance
- * to a string, as well as the reverse operation of creating a Request instance
- * from a string/stream representing a message.
- */
-final class Serializer extends AbstractSerializer
-{
-    /**
-     * Deserialize a request string to a request instance.
-     *
-     * Internally, casts the message to a stream and invokes fromStream().
-     *
-     * @param string $message
-     * @return Request
-     * @throws UnexpectedValueException when errors occur parsing the message.
-     */
-    public static function fromString($message)
-    {
-        $stream = new Stream('php://temp', 'wb+');
-        $stream->write($message);
-        return self::fromStream($stream);
-    }
-
-    /**
-     * Deserialize a request stream to a request instance.
-     *
-     * @param StreamInterface $stream
-     * @return Request
-     * @throws UnexpectedValueException when errors occur parsing the message.
-     */
-    public static function fromStream(StreamInterface $stream)
-    {
-        if (! $stream->isReadable() || ! $stream->isSeekable()) {
-            throw new InvalidArgumentException('Message stream must be both readable and seekable');
-        }
-
-        $stream->rewind();
-
-        list($method, $requestTarget, $version) = self::getRequestLine($stream);
-        $uri = self::createUriFromRequestTarget($requestTarget);
-
-        list($headers, $body) = self::splitStream($stream);
-
-        return (new Request($uri, $method, $body, $headers))
-            ->withProtocolVersion($version)
-            ->withRequestTarget($requestTarget);
-    }
-
-    /**
-     * Serialize a request message to a string.
-     *
-     * @param RequestInterface $request
-     * @return string
-     */
-    public static function toString(RequestInterface $request)
-    {
-        $headers = self::serializeHeaders($request->getHeaders());
-        $body    = (string) $request->getBody();
-        $format  = '%s %s HTTP/%s%s%s';
-
-        if (! empty($headers)) {
-            $headers = "\r\n" . $headers;
-        }
-        if (! empty($body)) {
-            $headers .= "\r\n\r\n";
-        }
-
-        return sprintf(
-            $format,
-            $request->getMethod(),
-            $request->getRequestTarget(),
-            $request->getProtocolVersion(),
-            $headers,
-            $body
-        );
-    }
-
-    /**
-     * Retrieve the components of the request line.
-     *
-     * Retrieves the first line of the stream and parses it, raising an
-     * exception if it does not follow specifications; if valid, returns a list
-     * with the method, target, and version, in that order.
-     *
-     * @param StreamInterface $stream
-     * @return array
-     */
-    private static function getRequestLine(StreamInterface $stream)
-    {
-        $requestLine = self::getLine($stream);
-
-        if (! preg_match(
-            '#^(?P<method>[!\#$%&\'*+.^_`|~a-zA-Z0-9-]+) (?P<target>[^\s]+) HTTP/(?P<version>[1-9]\d*\.\d+)$#',
-            $requestLine,
-            $matches
-        )) {
-            throw new UnexpectedValueException('Invalid request line detected');
-        }
-
-        return [$matches['method'], $matches['target'], $matches['version']];
-    }
-
-    /**
-     * Create and return a Uri instance based on the provided request target.
-     *
-     * If the request target is of authority or asterisk form, an empty Uri
-     * instance is returned; otherwise, the value is used to create and return
-     * a new Uri instance.
-     *
-     * @param string $requestTarget
-     * @return Uri
-     */
-    private static function createUriFromRequestTarget($requestTarget)
-    {
-        if (preg_match('#^https?://#', $requestTarget)) {
-            return new Uri($requestTarget);
-        }
-
-        if (preg_match('#^(\*|[^/])#', $requestTarget)) {
-            return new Uri();
-        }
-
-        return new Uri($requestTarget);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/vendor/zendframework/zend-diactoros/src/RequestTrait.php
deleted file mode 100644
index 2ef15a9..0000000
--- a/vendor/zendframework/zend-diactoros/src/RequestTrait.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Trait with common request behaviors.
- *
- * Server and client-side requests differ slightly in how the Host header is
- * handled; on client-side, it should be calculated on-the-fly from the
- * composed URI (if present), while on server-side, it will be calculated from
- * the environment. As such, this trait exists to provide the common code
- * between both client-side and server-side requests, and each can then
- * use the headers functionality required by their implementations.
- *
- * @property array $headers
- * @property array $headerNames
- * @property StreamInterface $stream
- * @method bool hasHeader(string $header)
- */
-trait RequestTrait
-{
-    /**
-     * @var string
-     */
-    private $method = '';
-
-    /**
-     * The request-target, if it has been provided or calculated.
-     *
-     * @var null|string
-     */
-    private $requestTarget;
-
-    /**
-     * @var null|UriInterface
-     */
-    private $uri;
-
-    /**
-     * Initialize request state.
-     *
-     * Used by constructors.
-     *
-     * @param null|string $uri URI for the request, if any.
-     * @param null|string $method HTTP method for the request, if any.
-     * @param string|resource|StreamInterface $body Message body, if any.
-     * @param array $headers Headers for the message, if any.
-     * @throws InvalidArgumentException for any invalid value.
-     */
-    private function initialize($uri = null, $method = null, $body = 'php://memory', array $headers = [])
-    {
-        if (! $uri instanceof UriInterface && ! is_string($uri) && null !== $uri) {
-            throw new InvalidArgumentException(
-                'Invalid URI provided; must be null, a string, or a Psr\Http\Message\UriInterface instance'
-            );
-        }
-
-        $this->validateMethod($method);
-
-        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Body must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (is_string($uri)) {
-            $uri = new Uri($uri);
-        }
-
-        $this->method = $method ?: '';
-        $this->uri    = $uri ?: new Uri();
-        $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
-
-        list($this->headerNames, $headers) = $this->filterHeaders($headers);
-        $this->assertHeaders($headers);
-        $this->headers = $headers;
-    }
-
-    /**
-     * Retrieves the message's request target.
-     *
-     * Retrieves the message's request-target either as it will appear (for
-     * clients), as it appeared at request (for servers), or as it was
-     * specified for the instance (see withRequestTarget()).
-     *
-     * In most cases, this will be the origin-form of the composed URI,
-     * unless a value was provided to the concrete implementation (see
-     * withRequestTarget() below).
-     *
-     * If no URI is available, and no request-target has been specifically
-     * provided, this method MUST return the string "/".
-     *
-     * @return string
-     */
-    public function getRequestTarget()
-    {
-        if (null !== $this->requestTarget) {
-            return $this->requestTarget;
-        }
-
-        if (! $this->uri) {
-            return '/';
-        }
-
-        $target = $this->uri->getPath();
-        if ($this->uri->getQuery()) {
-            $target .= '?' . $this->uri->getQuery();
-        }
-
-        if (empty($target)) {
-            $target = '/';
-        }
-
-        return $target;
-    }
-
-    /**
-     * Create a new instance with a specific request-target.
-     *
-     * If the request needs a non-origin-form request-target — e.g., for
-     * specifying an absolute-form, authority-form, or asterisk-form —
-     * this method may be used to create an instance with the specified
-     * request-target, verbatim.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * changed request target.
-     *
-     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
-     *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
-     * @return static
-     * @throws InvalidArgumentException if the request target is invalid.
-     */
-    public function withRequestTarget($requestTarget)
-    {
-        if (preg_match('#\s#', $requestTarget)) {
-            throw new InvalidArgumentException(
-                'Invalid request target provided; cannot contain whitespace'
-            );
-        }
-
-        $new = clone $this;
-        $new->requestTarget = $requestTarget;
-        return $new;
-    }
-
-    /**
-     * Retrieves the HTTP method of the request.
-     *
-     * @return string Returns the request method.
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Return an instance with the provided HTTP method.
-     *
-     * While HTTP method names are typically all uppercase characters, HTTP
-     * method names are case-sensitive and thus implementations SHOULD NOT
-     * modify the given string.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * changed request method.
-     *
-     * @param string $method Case-insensitive method.
-     * @return static
-     * @throws InvalidArgumentException for invalid HTTP methods.
-     */
-    public function withMethod($method)
-    {
-        $this->validateMethod($method);
-        $new = clone $this;
-        $new->method = $method;
-        return $new;
-    }
-
-    /**
-     * Retrieves the URI instance.
-     *
-     * This method MUST return a UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @return UriInterface Returns a UriInterface instance
-     *     representing the URI of the request, if any.
-     */
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Returns an instance with the provided URI.
-     *
-     * This method will update the Host header of the returned request by
-     * default if the URI contains a host component. If the URI does not
-     * contain a host component, any pre-existing Host header will be carried
-     * over to the returned request.
-     *
-     * You can opt-in to preserving the original state of the Host header by
-     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
-     * `true`, the returned request will not update the Host header of the
-     * returned message -- even if the message contains no Host header. This
-     * means that a call to `getHeader('Host')` on the original request MUST
-     * equal the return value of a call to `getHeader('Host')` on the returned
-     * request.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new UriInterface instance.
-     *
-     * @link http://tools.ietf.org/html/rfc3986#section-4.3
-     * @param UriInterface $uri New request URI to use.
-     * @param bool $preserveHost Preserve the original state of the Host header.
-     * @return static
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false)
-    {
-        $new = clone $this;
-        $new->uri = $uri;
-
-        if ($preserveHost && $this->hasHeader('Host')) {
-            return $new;
-        }
-
-        if (! $uri->getHost()) {
-            return $new;
-        }
-
-        $host = $uri->getHost();
-        if ($uri->getPort()) {
-            $host .= ':' . $uri->getPort();
-        }
-
-        $new->headerNames['host'] = 'Host';
-        $new->headers['Host'] = [$host];
-
-        return $new;
-    }
-
-    /**
-     * Validate the HTTP method
-     *
-     * @param null|string $method
-     * @throws InvalidArgumentException on invalid HTTP method.
-     */
-    private function validateMethod($method)
-    {
-        if (null === $method) {
-            return;
-        }
-
-        if (! is_string($method)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unsupported HTTP method; must be a string, received %s',
-                (is_object($method) ? get_class($method) : gettype($method))
-            ));
-        }
-
-        if (! preg_match('/^[!#$%&\'*+.^_`\|~0-9a-z-]+$/i', $method)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unsupported HTTP method "%s" provided',
-                $method
-            ));
-        }
-    }
-
-    /**
-     * Retrieve the host from the URI instance
-     *
-     * @return string
-     */
-    private function getHostFromUri()
-    {
-        $host  = $this->uri->getHost();
-        $host .= $this->uri->getPort() ? ':' . $this->uri->getPort() : '';
-        return $host;
-    }
-
-    /**
-     * Ensure header names and values are valid.
-     *
-     * @param array $headers
-     * @throws InvalidArgumentException
-     */
-    private function assertHeaders(array $headers)
-    {
-        foreach ($headers as $name => $headerValues) {
-            HeaderSecurity::assertValidName($name);
-            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response.php b/vendor/zendframework/zend-diactoros/src/Response.php
deleted file mode 100644
index ef250e6..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * HTTP response encapsulation.
- *
- * Responses are considered immutable; all methods that might change state are
- * implemented such that they retain the internal state of the current
- * message and return a new instance that contains the changed state.
- */
-class Response implements ResponseInterface
-{
-    use MessageTrait;
-
-    /**
-     * Map of standard HTTP status code/reason phrases
-     *
-     * @var array
-     */
-    private $phrases = [
-        // INFORMATIONAL CODES
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        // SUCCESS CODES
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-status',
-        208 => 'Already Reported',
-        // REDIRECTION CODES
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Switch Proxy', // Deprecated
-        307 => 'Temporary Redirect',
-        // CLIENT ERROR
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Time-out',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Large',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested range not satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Unordered Collection',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        // SERVER ERROR
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Time-out',
-        505 => 'HTTP Version not supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        511 => 'Network Authentication Required',
-    ];
-
-    /**
-     * @var string
-     */
-    private $reasonPhrase = '';
-
-    /**
-     * @var int
-     */
-    private $statusCode = 200;
-
-    /**
-     * @param string|resource|StreamInterface $stream Stream identifier and/or actual stream resource
-     * @param int $status Status code for the response, if any.
-     * @param array $headers Headers for the response, if any.
-     * @throws InvalidArgumentException on any invalid element.
-     */
-    public function __construct($body = 'php://memory', $status = 200, array $headers = [])
-    {
-        if (! is_string($body) && ! is_resource($body) && ! $body instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Stream must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (null !== $status) {
-            $this->validateStatus($status);
-        }
-
-        $this->stream     = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
-        $this->statusCode = $status ? (int) $status : 200;
-
-        list($this->headerNames, $headers) = $this->filterHeaders($headers);
-        $this->assertHeaders($headers);
-        $this->headers = $headers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getReasonPhrase()
-    {
-        if (! $this->reasonPhrase
-            && isset($this->phrases[$this->statusCode])
-        ) {
-            $this->reasonPhrase = $this->phrases[$this->statusCode];
-        }
-
-        return $this->reasonPhrase;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withStatus($code, $reasonPhrase = '')
-    {
-        $this->validateStatus($code);
-        $new = clone $this;
-        $new->statusCode   = (int) $code;
-        $new->reasonPhrase = $reasonPhrase;
-        return $new;
-    }
-
-    /**
-     * Validate a status code.
-     *
-     * @param int|string $code
-     * @throws InvalidArgumentException on an invalid status code.
-     */
-    private function validateStatus($code)
-    {
-        if (! is_numeric($code)
-            || is_float($code)
-            || $code < 100
-            || $code >= 600
-        ) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid status code "%s"; must be an integer between 100 and 599, inclusive',
-                (is_scalar($code) ? $code : gettype($code))
-            ));
-        }
-    }
-
-    /**
-     * Ensure header names and values are valid.
-     *
-     * @param array $headers
-     * @throws InvalidArgumentException
-     */
-    private function assertHeaders(array $headers)
-    {
-        foreach ($headers as $name => $headerValues) {
-            HeaderSecurity::assertValidName($name);
-            array_walk($headerValues, __NAMESPACE__ . '\HeaderSecurity::assertValid');
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php b/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
deleted file mode 100644
index 25ea7f3..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use Psr\Http\Message\ResponseInterface;
-
-interface EmitterInterface
-{
-    /**
-     * Emit a response.
-     *
-     * Emits a response, including status line, headers, and the message body,
-     * according to the environment.
-     *
-     * Implementations of this method may be written in such a way as to have
-     * side effects, such as usage of header() or pushing output to the
-     * output buffer.
-     *
-     * Implementations MAY raise exceptions if they are unable to emit the
-     * response; e.g., if headers have already been sent.
-     *
-     * @param ResponseInterface $response
-     */
-    public function emit(ResponseInterface $response);
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php b/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
deleted file mode 100644
index 9110306..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-/**
- * A class representing empty HTTP responses.
- */
-class EmptyResponse extends Response
-{
-    /**
-     * Create an empty response with the given status code.
-     *
-     * @param int $status Status code for the response, if any.
-     * @param array $headers Headers for the response, if any.
-     */
-    public function __construct($status = 204, array $headers = [])
-    {
-        $body = new Stream('php://temp', 'r');
-        parent::__construct($body, $status, $headers);
-    }
-
-    /**
-     * Create an empty response with the given headers.
-     *
-     * @param array $headers Headers for the response.
-     * @return EmptyResponse
-     */
-    public static function withHeaders(array $headers)
-    {
-        return new static(204, $headers);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
deleted file mode 100644
index d298ee0..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-/**
- * HTML response.
- *
- * Allows creating a response by passing an HTML string to the constructor;
- * by default, sets a status code of 200 and sets the Content-Type header to
- * text/html.
- */
-class HtmlResponse extends Response
-{
-    use InjectContentTypeTrait;
-
-    /**
-     * Create an HTML response.
-     *
-     * Produces an HTML response with a Content-Type of text/html and a default
-     * status of 200.
-     *
-     * @param string|StreamInterface $html HTML or stream for the message body.
-     * @param int $status Integer status code for the response; 200 by default.
-     * @param array $headers Array of headers to use at initialization.
-     * @throws InvalidArgumentException if $html is neither a string or stream.
-     */
-    public function __construct($html, $status = 200, array $headers = [])
-    {
-        parent::__construct(
-            $this->createBody($html),
-            $status,
-            $this->injectContentType('text/html', $headers)
-        );
-    }
-
-    /**
-     * Create the message body.
-     *
-     * @param string|StreamInterface $html
-     * @return StreamInterface
-     * @throws InvalidArgumentException if $html is neither a string or stream.
-     */
-    private function createBody($html)
-    {
-        if ($html instanceof StreamInterface) {
-            return $html;
-        }
-
-        if (! is_string($html)) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid content (%s) provided to %s',
-                (is_object($html) ? get_class($html) : gettype($html)),
-                __CLASS__
-            ));
-        }
-
-        $body = new Stream('php://temp', 'wb+');
-        $body->write($html);
-        return $body;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php b/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
deleted file mode 100644
index 00fd217..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-trait InjectContentTypeTrait
-{
-    /**
-     * Inject the provided Content-Type, if none is already present.
-     *
-     * @param string $contentType
-     * @param array $headers
-     * @return array Headers with injected Content-Type
-     */
-    private function injectContentType($contentType, array $headers)
-    {
-        $hasContentType = array_reduce(array_keys($headers), function ($carry, $item) {
-            return $carry ?: (strtolower($item) === 'content-type');
-        }, false);
-
-        if (! $hasContentType) {
-            $headers['content-type'] = [$contentType];
-        }
-
-        return $headers;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
deleted file mode 100644
index 766c866..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use InvalidArgumentException;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-/**
- * JSON response.
- *
- * Allows creating a response by passing data to the constructor; by default,
- * serializes the data to JSON, sets a status code of 200 and sets the
- * Content-Type header to application/json.
- */
-class JsonResponse extends Response
-{
-    use InjectContentTypeTrait;
-
-    /**
-     * Create a JSON response with the given data.
-     *
-     * Default JSON encoding is performed with the following options, which
-     * produces RFC4627-compliant JSON, capable of embedding into HTML.
-     *
-     * - JSON_HEX_TAG
-     * - JSON_HEX_APOS
-     * - JSON_HEX_AMP
-     * - JSON_HEX_QUOT
-     *
-     * @param mixed $data Data to convert to JSON.
-     * @param int $status Integer status code for the response; 200 by default.
-     * @param array $headers Array of headers to use at initialization.
-     * @param int $encodingOptions JSON encoding options to use.
-     * @throws InvalidArgumentException if unable to encode the $data to JSON.
-     */
-    public function __construct($data, $status = 200, array $headers = [], $encodingOptions = 15)
-    {
-        $body = new Stream('php://temp', 'wb+');
-        $body->write($this->jsonEncode($data, $encodingOptions));
-
-        $headers = $this->injectContentType('application/json', $headers);
-
-        parent::__construct($body, $status, $headers);
-    }
-
-    /**
-     * Encode the provided data to JSON.
-     *
-     * @param mixed $data
-     * @param int $encodingOptions
-     * @return string
-     * @throws InvalidArgumentException if unable to encode the $data to JSON.
-     */
-    private function jsonEncode($data, $encodingOptions)
-    {
-        if (is_resource($data)) {
-            throw new InvalidArgumentException('Cannot JSON encode resources');
-        }
-
-        // Clear json_last_error()
-        json_encode(null);
-
-        $json = json_encode($data, $encodingOptions);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to encode data to JSON in %s: %s',
-                __CLASS__,
-                json_last_error_msg()
-            ));
-        }
-
-        return $json;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php b/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
deleted file mode 100644
index 26911f0..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use InvalidArgumentException;
-use Psr\Http\Message\UriInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-/**
- * Produce a redirect response.
- */
-class RedirectResponse extends Response
-{
-    /**
-     * Create a redirect response.
-     *
-     * Produces a redirect response with a Location header and the given status
-     * (302 by default).
-     *
-     * Note: this method overwrites the `location` $headers value.
-     *
-     * @param string|UriInterface $uri URI for the Location header.
-     * @param int $status Integer status code for the redirect; 302 by default.
-     * @param array $headers Array of headers to use at initialization.
-     */
-    public function __construct($uri, $status = 302, array $headers = [])
-    {
-        if (! is_string($uri) && ! $uri instanceof UriInterface) {
-            throw new InvalidArgumentException(sprintf(
-                'Uri provided to %s MUST be a string or Psr\Http\Message\UriInterface instance; received "%s"',
-                __CLASS__,
-                (is_object($uri) ? get_class($uri) : gettype($uri))
-            ));
-        }
-
-        $headers['location'] = [(string) $uri];
-        parent::__construct('php://temp', $status, $headers);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
deleted file mode 100644
index bba291e..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use Psr\Http\Message\ResponseInterface;
-use RuntimeException;
-
-class SapiEmitter implements EmitterInterface
-{
-    /**
-     * Emits a response for a PHP SAPI environment.
-     *
-     * Emits the status line and headers via the header() function, and the
-     * body content via the output buffer.
-     *
-     * @param ResponseInterface $response
-     * @param null|int $maxBufferLevel Maximum output buffering level to unwrap.
-     */
-    public function emit(ResponseInterface $response, $maxBufferLevel = null)
-    {
-        if (headers_sent()) {
-            throw new RuntimeException('Unable to emit response; headers already sent');
-        }
-
-        $this->emitStatusLine($response);
-        $this->emitHeaders($response);
-        $this->emitBody($response, $maxBufferLevel);
-    }
-
-    /**
-     * Emit the status line.
-     *
-     * Emits the status line using the protocol version and status code from
-     * the response; if a reason phrase is availble, it, too, is emitted.
-     *
-     * @param ResponseInterface $response
-     */
-    private function emitStatusLine(ResponseInterface $response)
-    {
-        $reasonPhrase = $response->getReasonPhrase();
-        header(sprintf(
-            'HTTP/%s %d%s',
-            $response->getProtocolVersion(),
-            $response->getStatusCode(),
-            ($reasonPhrase ? ' ' . $reasonPhrase : '')
-        ));
-    }
-
-    /**
-     * Emit response headers.
-     *
-     * Loops through each header, emitting each; if the header value
-     * is an array with multiple values, ensures that each is sent
-     * in such a way as to create aggregate headers (instead of replace
-     * the previous).
-     *
-     * @param ResponseInterface $response
-     */
-    private function emitHeaders(ResponseInterface $response)
-    {
-        foreach ($response->getHeaders() as $header => $values) {
-            $name  = $this->filterHeader($header);
-            $first = true;
-            foreach ($values as $value) {
-                header(sprintf(
-                    '%s: %s',
-                    $name,
-                    $value
-                ), $first);
-                $first = false;
-            }
-        }
-    }
-
-    /**
-     * Emit the message body.
-     *
-     * Loops through the output buffer, flushing each, before emitting
-     * the response body using `echo()`.
-     *
-     * @param ResponseInterface $response
-     * @param int $maxBufferLevel Flush up to this buffer level.
-     */
-    private function emitBody(ResponseInterface $response, $maxBufferLevel)
-    {
-        if (null === $maxBufferLevel) {
-            $maxBufferLevel = ob_get_level();
-        }
-
-        while (ob_get_level() > $maxBufferLevel) {
-            ob_end_flush();
-        }
-
-        echo $response->getBody();
-    }
-
-    /**
-     * Filter a header name to wordcase
-     *
-     * @param string $header
-     * @return string
-     */
-    private function filterHeader($header)
-    {
-        $filtered = str_replace('-', ' ', $header);
-        $filtered = ucwords($filtered);
-        return str_replace(' ', '-', $filtered);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Response/Serializer.php b/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
deleted file mode 100644
index 8da835d..0000000
--- a/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros\Response;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
-use UnexpectedValueException;
-use Zend\Diactoros\AbstractSerializer;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
-
-final class Serializer extends AbstractSerializer
-{
-    /**
-     * Deserialize a response string to a response instance.
-     *
-     * @param string $message
-     * @return Response
-     * @throws UnexpectedValueException when errors occur parsing the message.
-     */
-    public static function fromString($message)
-    {
-        $stream = new Stream('php://temp', 'wb+');
-        $stream->write($message);
-        return static::fromStream($stream);
-    }
-
-    /**
-     * Parse a response from a stream.
-     *
-     * @param StreamInterface $stream
-     * @return ResponseInterface
-     * @throws InvalidArgumentException when the stream is not readable.
-     * @throws UnexpectedValueException when errors occur parsing the message.
-     */
-    public static function fromStream(StreamInterface $stream)
-    {
-        if (! $stream->isReadable() || ! $stream->isSeekable()) {
-            throw new InvalidArgumentException('Message stream must be both readable and seekable');
-        }
-
-        $stream->rewind();
-
-        list($version, $status, $reasonPhrase) = self::getStatusLine($stream);
-        list($headers, $body)                  = self::splitStream($stream);
-
-        return (new Response($body, $status, $headers))
-            ->withProtocolVersion($version)
-            ->withStatus($status, $reasonPhrase);
-    }
-
-    /**
-     * Create a string representation of a response.
-     *
-     * @param ResponseInterface $response
-     * @return string
-     */
-    public static function toString(ResponseInterface $response)
-    {
-        $reasonPhrase = $response->getReasonPhrase();
-        $headers      = self::serializeHeaders($response->getHeaders());
-        $body         = (string) $response->getBody();
-        $format       = 'HTTP/%s %d%s%s%s';
-
-        if (! empty($headers)) {
-            $headers = "\r\n" . $headers;
-        }
-        if (! empty($body)) {
-            $headers .= "\r\n\r\n";
-        }
-
-        return sprintf(
-            $format,
-            $response->getProtocolVersion(),
-            $response->getStatusCode(),
-            ($reasonPhrase ? ' ' . $reasonPhrase : ''),
-            $headers,
-            $body
-        );
-    }
-
-    /**
-     * Retrieve the status line for the message.
-     *
-     * @param StreamInterface $stream
-     * @return array Array with three elements: 0 => version, 1 => status, 2 => reason
-     * @throws UnexpectedValueException if line is malformed
-     */
-    private static function getStatusLine(StreamInterface $stream)
-    {
-        $line = self::getLine($stream);
-
-        if (! preg_match(
-            '#^HTTP/(?P<version>[1-9]\d*\.\d) (?P<status>[1-5]\d{2})(\s+(?P<reason>.+))?$#',
-            $line,
-            $matches
-        )) {
-            throw new UnexpectedValueException('No status line detected');
-        }
-
-        return [$matches['version'], $matches['status'], isset($matches['reason']) ? $matches['reason'] : ''];
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Server.php b/vendor/zendframework/zend-diactoros/src/Server.php
deleted file mode 100644
index e3c9b30..0000000
--- a/vendor/zendframework/zend-diactoros/src/Server.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use OutOfBoundsException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * "Serve" incoming HTTP requests
- *
- * Given a callback, takes an incoming request, dispatches it to the
- * callback, and then sends a response.
- */
-class Server
-{
-    /**
-     * @var callable
-     */
-    private $callback;
-
-    /**
-     * Response emitter to use; by default, uses Response\SapiEmitter.
-     *
-     * @var Response\EmitterInterface
-     */
-    private $emitter;
-
-    /**
-     * @var ServerRequestInterface
-     */
-    private $request;
-
-    /**
-     * @var ResponseInterface
-     */
-    private $response;
-
-    /**
-     * Constructor
-     *
-     * Given a callback, a request, and a response, we can create a server.
-     *
-     * @param callable $callback
-     * @param ServerRequestInterface $request
-     * @param ResponseInterface $response
-     */
-    public function __construct(
-        callable $callback,
-        ServerRequestInterface $request,
-        ResponseInterface $response
-    ) {
-        $this->callback = $callback;
-        $this->request  = $request;
-        $this->response = $response;
-    }
-
-    /**
-     * Allow retrieving the request, response and callback as properties
-     *
-     * @param string $name
-     * @return mixed
-     * @throws OutOfBoundsException for invalid properties
-     */
-    public function __get($name)
-    {
-        if (! property_exists($this, $name)) {
-            throw new OutOfBoundsException('Cannot retrieve arbitrary properties from server');
-        }
-        return $this->{$name};
-    }
-
-    /**
-     * Set alternate response emitter to use.
-     *
-     * @param Response\EmitterInterface $emitter
-     */
-    public function setEmitter(Response\EmitterInterface $emitter)
-    {
-        $this->emitter = $emitter;
-    }
-
-    /**
-     * Create a Server instance
-     *
-     * Creates a server instance from the callback and the following
-     * PHP environmental values:
-     *
-     * - server; typically this will be the $_SERVER superglobal
-     * - query; typically this will be the $_GET superglobal
-     * - body; typically this will be the $_POST superglobal
-     * - cookies; typically this will be the $_COOKIE superglobal
-     * - files; typically this will be the $_FILES superglobal
-     *
-     * @param callable $callback
-     * @param array $server
-     * @param array $query
-     * @param array $body
-     * @param array $cookies
-     * @param array $files
-     * @return static
-     */
-    public static function createServer(
-        callable $callback,
-        array $server,
-        array $query,
-        array $body,
-        array $cookies,
-        array $files
-    ) {
-        $request  = ServerRequestFactory::fromGlobals($server, $query, $body, $cookies, $files);
-        $response = new Response();
-        return new static($callback, $request, $response);
-    }
-
-    /**
-     * Create a Server instance from an existing request object
-     *
-     * Provided a callback, an existing request object, and optionally an
-     * existing response object, create and return the Server instance.
-     *
-     * If no Response object is provided, one will be created.
-     *
-     * @param callable $callback
-     * @param ServerRequestInterface $request
-     * @param null|ResponseInterface $response
-     * @return static
-     */
-    public static function createServerFromRequest(
-        callable $callback,
-        ServerRequestInterface $request,
-        ResponseInterface $response = null
-    ) {
-        if (! $response) {
-            $response = new Response();
-        }
-        return new static($callback, $request, $response);
-    }
-
-    /**
-     * "Listen" to an incoming request
-     *
-     * If provided a $finalHandler, that callable will be used for
-     * incomplete requests.
-     *
-     * Output buffering is enabled prior to invoking the attached
-     * callback; any output buffered will be sent prior to any
-     * response body content.
-     *
-     * @param null|callable $finalHandler
-     */
-    public function listen(callable $finalHandler = null)
-    {
-        $callback = $this->callback;
-
-        ob_start();
-        $bufferLevel = ob_get_level();
-
-        $response = $callback($this->request, $this->response, $finalHandler);
-        if (! $response instanceof ResponseInterface) {
-            $response = $this->response;
-        }
-        $this->getEmitter()->emit($response, $bufferLevel);
-    }
-
-    /**
-     * Retrieve the current response emitter.
-     *
-     * If none has been registered, lazy-loads a Response\SapiEmitter.
-     *
-     * @return Response\EmitterInterface
-     */
-    private function getEmitter()
-    {
-        if (! $this->emitter) {
-            $this->emitter = new Response\SapiEmitter();
-        }
-
-        return $this->emitter;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/ServerRequest.php b/vendor/zendframework/zend-diactoros/src/ServerRequest.php
deleted file mode 100644
index 67a04b4..0000000
--- a/vendor/zendframework/zend-diactoros/src/ServerRequest.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
-
-/**
- * Server-side HTTP request
- *
- * Extends the Request definition to add methods for accessing incoming data,
- * specifically server parameters, cookies, matched path parameters, query
- * string arguments, body parameters, and upload file information.
- *
- * "Attributes" are discovered via decomposing the request (and usually
- * specifically the URI path), and typically will be injected by the application.
- *
- * Requests are considered immutable; all methods that might change state are
- * implemented such that they retain the internal state of the current
- * message and return a new instance that contains the changed state.
- */
-class ServerRequest implements ServerRequestInterface
-{
-    use MessageTrait, RequestTrait;
-
-    /**
-     * @var array
-     */
-    private $attributes = [];
-
-    /**
-     * @var array
-     */
-    private $cookieParams = [];
-
-    /**
-     * @var null|array|object
-     */
-    private $parsedBody;
-
-    /**
-     * @var array
-     */
-    private $queryParams = [];
-
-    /**
-     * @var array
-     */
-    private $serverParams;
-
-    /**
-     * @var array
-     */
-    private $uploadedFiles;
-
-    /**
-     * @param array $serverParams Server parameters, typically from $_SERVER
-     * @param array $uploadedFiles Upload file information, a tree of UploadedFiles
-     * @param null|string $uri URI for the request, if any.
-     * @param null|string $method HTTP method for the request, if any.
-     * @param string|resource|StreamInterface $body Message body, if any.
-     * @param array $headers Headers for the message, if any.
-     * @throws InvalidArgumentException for any invalid value.
-     */
-    public function __construct(
-        array $serverParams = [],
-        array $uploadedFiles = [],
-        $uri = null,
-        $method = null,
-        $body = 'php://input',
-        array $headers = []
-    ) {
-        $this->validateUploadedFiles($uploadedFiles);
-
-        $body = $this->getStream($body);
-        $this->initialize($uri, $method, $body, $headers);
-        $this->serverParams  = $serverParams;
-        $this->uploadedFiles = $uploadedFiles;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getServerParams()
-    {
-        return $this->serverParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUploadedFiles()
-    {
-        return $this->uploadedFiles;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUploadedFiles(array $uploadedFiles)
-    {
-        $this->validateUploadedFiles($uploadedFiles);
-        $new = clone $this;
-        $new->uploadedFiles = $uploadedFiles;
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCookieParams()
-    {
-        return $this->cookieParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withCookieParams(array $cookies)
-    {
-        $new = clone $this;
-        $new->cookieParams = $cookies;
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQueryParams()
-    {
-        return $this->queryParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withQueryParams(array $query)
-    {
-        $new = clone $this;
-        $new->queryParams = $query;
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withParsedBody($data)
-    {
-        $new = clone $this;
-        $new->parsedBody = $data;
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttribute($attribute, $default = null)
-    {
-        if (! array_key_exists($attribute, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$attribute];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withAttribute($attribute, $value)
-    {
-        $new = clone $this;
-        $new->attributes[$attribute] = $value;
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withoutAttribute($attribute)
-    {
-        if (! isset($this->attributes[$attribute])) {
-            return clone $this;
-        }
-
-        $new = clone $this;
-        unset($new->attributes[$attribute]);
-        return $new;
-    }
-
-    /**
-     * Proxy to receive the request method.
-     *
-     * This overrides the parent functionality to ensure the method is never
-     * empty; if no method is present, it returns 'GET'.
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        if (empty($this->method)) {
-            return 'GET';
-        }
-        return $this->method;
-    }
-
-    /**
-     * Set the request method.
-     *
-     * Unlike the regular Request implementation, the server-side
-     * normalizes the method to uppercase to ensure consistency
-     * and make checking the method simpler.
-     *
-     * This methods returns a new instance.
-     *
-     * @param string $method
-     * @return self
-     */
-    public function withMethod($method)
-    {
-        $this->validateMethod($method);
-        $new = clone $this;
-        $new->method = $method;
-        return $new;
-    }
-
-    /**
-     * Set the body stream
-     *
-     * @param string|resource|StreamInterface $stream
-     * @return StreamInterface
-     */
-    private function getStream($stream)
-    {
-        if ($stream === 'php://input') {
-            return new PhpInputStream();
-        }
-
-        if (! is_string($stream) && ! is_resource($stream) && ! $stream instanceof StreamInterface) {
-            throw new InvalidArgumentException(
-                'Stream must be a string stream resource identifier, '
-                . 'an actual stream resource, '
-                . 'or a Psr\Http\Message\StreamInterface implementation'
-            );
-        }
-
-        if (! $stream instanceof StreamInterface) {
-            return new Stream($stream, 'r');
-        }
-
-        return $stream;
-    }
-
-    /**
-     * Recursively validate the structure in an uploaded files array.
-     *
-     * @param array $uploadedFiles
-     * @throws InvalidArgumentException if any leaf is not an UploadedFileInterface instance.
-     */
-    private function validateUploadedFiles(array $uploadedFiles)
-    {
-        foreach ($uploadedFiles as $file) {
-            if (is_array($file)) {
-                $this->validateUploadedFiles($file);
-                continue;
-            }
-
-            if (! $file instanceof UploadedFileInterface) {
-                throw new InvalidArgumentException('Invalid leaf in uploaded files structure');
-            }
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php b/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
deleted file mode 100644
index e23dfe5..0000000
--- a/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\MessageInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use stdClass;
-
-/**
- * Class for marshaling a request object from the current PHP environment.
- *
- * Logic largely refactored from the ZF2 Zend\Http\PhpEnvironment\Request class.
- *
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-abstract class ServerRequestFactory
-{
-    /**
-     * Function to use to get apache request headers; present only to simplify mocking.
-     *
-     * @var callable
-     */
-    private static $apacheRequestHeaders = 'apache_request_headers';
-
-    /**
-     * Create a request from the supplied superglobal values.
-     *
-     * If any argument is not supplied, the corresponding superglobal value will
-     * be used.
-     *
-     * The ServerRequest created is then passed to the fromServer() method in
-     * order to marshal the request URI and headers.
-     *
-     * @see fromServer()
-     * @param array $server $_SERVER superglobal
-     * @param array $query $_GET superglobal
-     * @param array $body $_POST superglobal
-     * @param array $cookies $_COOKIE superglobal
-     * @param array $files $_FILES superglobal
-     * @return ServerRequest
-     * @throws InvalidArgumentException for invalid file values
-     */
-    public static function fromGlobals(
-        array $server = null,
-        array $query = null,
-        array $body = null,
-        array $cookies = null,
-        array $files = null
-    ) {
-        $server  = static::normalizeServer($server ?: $_SERVER);
-        $files   = static::normalizeFiles($files ?: $_FILES);
-        $headers = static::marshalHeaders($server);
-        $request = new ServerRequest(
-            $server,
-            $files,
-            static::marshalUriFromServer($server, $headers),
-            static::get('REQUEST_METHOD', $server, 'GET'),
-            'php://input',
-            $headers
-        );
-
-        return $request
-            ->withCookieParams($cookies ?: $_COOKIE)
-            ->withQueryParams($query ?: $_GET)
-            ->withParsedBody($body ?: $_POST);
-    }
-
-    /**
-     * Access a value in an array, returning a default value if not found
-     *
-     * Will also do a case-insensitive search if a case sensitive search fails.
-     *
-     * @param string $key
-     * @param array $values
-     * @param mixed $default
-     * @return mixed
-     */
-    public static function get($key, array $values, $default = null)
-    {
-        if (array_key_exists($key, $values)) {
-            return $values[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Search for a header value.
-     *
-     * Does a case-insensitive search for a matching header.
-     *
-     * If found, it is returned as a string, using comma concatenation.
-     *
-     * If not, the $default is returned.
-     *
-     * @param string $header
-     * @param array $headers
-     * @param mixed $default
-     * @return string
-     */
-    public static function getHeader($header, array $headers, $default = null)
-    {
-        $header  = strtolower($header);
-        $headers = array_change_key_case($headers, CASE_LOWER);
-        if (array_key_exists($header, $headers)) {
-            $value = is_array($headers[$header]) ? implode(', ', $headers[$header]) : $headers[$header];
-            return $value;
-        }
-
-        return $default;
-    }
-
-    /**
-     * Marshal the $_SERVER array
-     *
-     * Pre-processes and returns the $_SERVER superglobal.
-     *
-     * @param array $server
-     * @return array
-     */
-    public static function normalizeServer(array $server)
-    {
-        // This seems to be the only way to get the Authorization header on Apache
-        $apacheRequestHeaders = self::$apacheRequestHeaders;
-        if (isset($server['HTTP_AUTHORIZATION'])
-            || ! is_callable($apacheRequestHeaders)
-        ) {
-            return $server;
-        }
-
-        $apacheRequestHeaders = $apacheRequestHeaders();
-        if (isset($apacheRequestHeaders['Authorization'])) {
-            $server['HTTP_AUTHORIZATION'] = $apacheRequestHeaders['Authorization'];
-            return $server;
-        }
-
-        if (isset($apacheRequestHeaders['authorization'])) {
-            $server['HTTP_AUTHORIZATION'] = $apacheRequestHeaders['authorization'];
-            return $server;
-        }
-
-        return $server;
-    }
-
-    /**
-     * Normalize uploaded files
-     *
-     * Transforms each value into an UploadedFileInterface instance, and ensures
-     * that nested arrays are normalized.
-     *
-     * @param array $files
-     * @return array
-     * @throws InvalidArgumentException for unrecognized values
-     */
-    public static function normalizeFiles(array $files)
-    {
-        $normalized = [];
-        foreach ($files as $key => $value) {
-            if ($value instanceof UploadedFileInterface) {
-                $normalized[$key] = $value;
-                continue;
-            }
-
-            if (is_array($value) && isset($value['tmp_name'])) {
-                $normalized[$key] = self::createUploadedFileFromSpec($value);
-                continue;
-            }
-
-            if (is_array($value)) {
-                $normalized[$key] = self::normalizeFiles($value);
-                continue;
-            }
-
-            throw new InvalidArgumentException('Invalid value in files specification');
-        }
-        return $normalized;
-    }
-
-    /**
-     * Marshal headers from $_SERVER
-     *
-     * @param array $server
-     * @return array
-     */
-    public static function marshalHeaders(array $server)
-    {
-        $headers = [];
-        foreach ($server as $key => $value) {
-            if (strpos($key, 'HTTP_COOKIE') === 0) {
-                // Cookies are handled using the $_COOKIE superglobal
-                continue;
-            }
-
-            if ($value && strpos($key, 'HTTP_') === 0) {
-                $name = strtr(substr($key, 5), '_', ' ');
-                $name = strtr(ucwords(strtolower($name)), ' ', '-');
-                $name = strtolower($name);
-
-                $headers[$name] = $value;
-                continue;
-            }
-
-            if ($value && strpos($key, 'CONTENT_') === 0) {
-                $name = substr($key, 8); // Content-
-                $name = 'Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)));
-                $name = strtolower($name);
-                $headers[$name] = $value;
-                continue;
-            }
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Marshal the URI from the $_SERVER array and headers
-     *
-     * @param array $server
-     * @param array $headers
-     * @return Uri
-     */
-    public static function marshalUriFromServer(array $server, array $headers)
-    {
-        $uri = new Uri('');
-
-        // URI scheme
-        $scheme = 'http';
-        $https  = self::get('HTTPS', $server);
-        if (($https && 'off' !== $https)
-            || self::getHeader('x-forwarded-proto', $headers, false) === 'https'
-        ) {
-            $scheme = 'https';
-        }
-        if (! empty($scheme)) {
-            $uri = $uri->withScheme($scheme);
-        }
-
-        // Set the host
-        $accumulator = (object) ['host' => '', 'port' => null];
-        self::marshalHostAndPortFromHeaders($accumulator, $server, $headers);
-        $host = $accumulator->host;
-        $port = $accumulator->port;
-        if (! empty($host)) {
-            $uri = $uri->withHost($host);
-            if (! empty($port)) {
-                $uri = $uri->withPort($port);
-            }
-        }
-
-        // URI path
-        $path = self::marshalRequestUri($server);
-        $path = self::stripQueryString($path);
-
-        // URI query
-        $query = '';
-        if (isset($server['QUERY_STRING'])) {
-            $query = ltrim($server['QUERY_STRING'], '?');
-        }
-
-        return $uri
-            ->withPath($path)
-            ->withQuery($query);
-    }
-
-    /**
-     * Marshal the host and port from HTTP headers and/or the PHP environment
-     *
-     * @param stdClass $accumulator
-     * @param array $server
-     * @param array $headers
-     */
-    public static function marshalHostAndPortFromHeaders(stdClass $accumulator, array $server, array $headers)
-    {
-        if (self::getHeader('host', $headers, false)) {
-            self::marshalHostAndPortFromHeader($accumulator, self::getHeader('host', $headers));
-            return;
-        }
-
-        if (! isset($server['SERVER_NAME'])) {
-            return;
-        }
-
-        $accumulator->host = $server['SERVER_NAME'];
-        if (isset($server['SERVER_PORT'])) {
-            $accumulator->port = (int) $server['SERVER_PORT'];
-        }
-
-        if (! isset($server['SERVER_ADDR']) || ! preg_match('/^\[[0-9a-fA-F\:]+\]$/', $accumulator->host)) {
-            return;
-        }
-
-        // Misinterpreted IPv6-Address
-        // Reported for Safari on Windows
-        self::marshalIpv6HostAndPort($accumulator, $server);
-    }
-
-    /**
-     * Detect the base URI for the request
-     *
-     * Looks at a variety of criteria in order to attempt to autodetect a base
-     * URI, including rewrite URIs, proxy URIs, etc.
-     *
-     * From ZF2's Zend\Http\PhpEnvironment\Request class
-     * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
-     * @license   http://framework.zend.com/license/new-bsd New BSD License
-     *
-     * @param array $server
-     * @return string
-     */
-    public static function marshalRequestUri(array $server)
-    {
-        // IIS7 with URL Rewrite: make sure we get the unencoded url
-        // (double slash problem).
-        $iisUrlRewritten = self::get('IIS_WasUrlRewritten', $server);
-        $unencodedUrl    = self::get('UNENCODED_URL', $server, '');
-        if ('1' == $iisUrlRewritten && ! empty($unencodedUrl)) {
-            return $unencodedUrl;
-        }
-
-        $requestUri = self::get('REQUEST_URI', $server);
-
-        // Check this first so IIS will catch.
-        $httpXRewriteUrl = self::get('HTTP_X_REWRITE_URL', $server);
-        if ($httpXRewriteUrl !== null) {
-            $requestUri = $httpXRewriteUrl;
-        }
-
-        // Check for IIS 7.0 or later with ISAPI_Rewrite
-        $httpXOriginalUrl = self::get('HTTP_X_ORIGINAL_URL', $server);
-        if ($httpXOriginalUrl !== null) {
-            $requestUri = $httpXOriginalUrl;
-        }
-
-        if ($requestUri !== null) {
-            return preg_replace('#^[^/:]+://[^/]+#', '', $requestUri);
-        }
-
-        $origPathInfo = self::get('ORIG_PATH_INFO', $server);
-        if (empty($origPathInfo)) {
-            return '/';
-        }
-
-        return $origPathInfo;
-    }
-
-    /**
-     * Strip the query string from a path
-     *
-     * @param mixed $path
-     * @return string
-     */
-    public static function stripQueryString($path)
-    {
-        if (($qpos = strpos($path, '?')) !== false) {
-            return substr($path, 0, $qpos);
-        }
-        return $path;
-    }
-
-    /**
-     * Marshal the host and port from the request header
-     *
-     * @param stdClass $accumulator
-     * @param string|array $host
-     * @return void
-     */
-    private static function marshalHostAndPortFromHeader(stdClass $accumulator, $host)
-    {
-        if (is_array($host)) {
-            $host = implode(', ', $host);
-        }
-
-        $accumulator->host = $host;
-        $accumulator->port = null;
-
-        // works for regname, IPv4 & IPv6
-        if (preg_match('|\:(\d+)$|', $accumulator->host, $matches)) {
-            $accumulator->host = substr($accumulator->host, 0, -1 * (strlen($matches[1]) + 1));
-            $accumulator->port = (int) $matches[1];
-        }
-    }
-
-    /**
-     * Marshal host/port from misinterpreted IPv6 address
-     *
-     * @param stdClass $accumulator
-     * @param array $server
-     */
-    private static function marshalIpv6HostAndPort(stdClass $accumulator, array $server)
-    {
-        $accumulator->host = '[' . $server['SERVER_ADDR'] . ']';
-        $accumulator->port = $accumulator->port ?: 80;
-        if ($accumulator->port . ']' === substr($accumulator->host, strrpos($accumulator->host, ':') + 1)) {
-            // The last digit of the IPv6-Address has been taken as port
-            // Unset the port so the default port can be used
-            $accumulator->port = null;
-        }
-    }
-
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * If the specification represents an array of values, this method will
-     * delegate to normalizeNestedFileSpec() and return that return value.
-     *
-     * @param array $value $_FILES struct
-     * @return array|UploadedFileInterface
-     */
-    private static function createUploadedFileFromSpec(array $value)
-    {
-        if (is_array($value['tmp_name'])) {
-            return self::normalizeNestedFileSpec($value);
-        }
-
-        return new UploadedFile(
-            $value['tmp_name'],
-            $value['size'],
-            $value['error'],
-            $value['name'],
-            $value['type']
-        );
-    }
-
-    /**
-     * Normalize an array of file specifications.
-     *
-     * Loops through all nested files and returns a normalized array of
-     * UploadedFileInterface instances.
-     *
-     * @param array $files
-     * @return UploadedFileInterface[]
-     */
-    private static function normalizeNestedFileSpec(array $files = [])
-    {
-        $normalizedFiles = [];
-        foreach (array_keys($files['tmp_name']) as $key) {
-            $spec = [
-                'tmp_name' => $files['tmp_name'][$key],
-                'size'     => $files['size'][$key],
-                'error'    => $files['error'][$key],
-                'name'     => $files['name'][$key],
-                'type'     => $files['type'][$key],
-            ];
-            $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
-        }
-        return $normalizedFiles;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Stream.php b/vendor/zendframework/zend-diactoros/src/Stream.php
deleted file mode 100644
index aca58d2..0000000
--- a/vendor/zendframework/zend-diactoros/src/Stream.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use RuntimeException;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * Implementation of PSR HTTP streams
- */
-class Stream implements StreamInterface
-{
-    /**
-     * @var resource
-     */
-    protected $resource;
-
-    /**
-     * @var string|resource
-     */
-    protected $stream;
-
-    /**
-     * @param string|resource $stream
-     * @param string $mode Mode with which to open stream
-     * @throws InvalidArgumentException
-     */
-    public function __construct($stream, $mode = 'r')
-    {
-        $this->setStream($stream, $mode);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        if (! $this->isReadable()) {
-            return '';
-        }
-
-        try {
-            $this->rewind();
-            return $this->getContents();
-        } catch (RuntimeException $e) {
-            return '';
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        if (! $this->resource) {
-            return;
-        }
-
-        $resource = $this->detach();
-        fclose($resource);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function detach()
-    {
-        $resource = $this->resource;
-        $this->resource = null;
-        return $resource;
-    }
-
-    /**
-     * Attach a new stream/resource to the instance.
-     *
-     * @param string|resource $resource
-     * @param string $mode
-     * @throws InvalidArgumentException for stream identifier that cannot be
-     *     cast to a resource
-     * @throws InvalidArgumentException for non-resource stream
-     */
-    public function attach($resource, $mode = 'r')
-    {
-        $this->setStream($resource, $mode);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        if (null === $this->resource) {
-            return null;
-        }
-
-        $stats = fstat($this->resource);
-        return $stats['size'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function tell()
-    {
-        if (! $this->resource) {
-            throw new RuntimeException('No resource available; cannot tell position');
-        }
-
-        $result = ftell($this->resource);
-        if (! is_int($result)) {
-            throw new RuntimeException('Error occurred during tell operation');
-        }
-
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function eof()
-    {
-        if (! $this->resource) {
-            return true;
-        }
-
-        return feof($this->resource);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isSeekable()
-    {
-        if (! $this->resource) {
-            return false;
-        }
-
-        $meta = stream_get_meta_data($this->resource);
-        return $meta['seekable'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (! $this->resource) {
-            throw new RuntimeException('No resource available; cannot seek position');
-        }
-
-        if (! $this->isSeekable()) {
-            throw new RuntimeException('Stream is not seekable');
-        }
-
-        $result = fseek($this->resource, $offset, $whence);
-
-        if (0 !== $result) {
-            throw new RuntimeException('Error seeking within stream');
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rewind()
-    {
-        return $this->seek(0);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isWritable()
-    {
-        if (! $this->resource) {
-            return false;
-        }
-
-        $meta = stream_get_meta_data($this->resource);
-        $mode = $meta['mode'];
-
-        return (
-            strstr($mode, 'x')
-            || strstr($mode, 'w')
-            || strstr($mode, 'c')
-            || strstr($mode, 'a')
-            || strstr($mode, '+')
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write($string)
-    {
-        if (! $this->resource) {
-            throw new RuntimeException('No resource available; cannot write');
-        }
-
-        if (! $this->isWritable()) {
-            throw new RuntimeException('Stream is not writable');
-        }
-
-        $result = fwrite($this->resource, $string);
-
-        if (false === $result) {
-            throw new RuntimeException('Error writing to stream');
-        }
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isReadable()
-    {
-        if (! $this->resource) {
-            return false;
-        }
-
-        $meta = stream_get_meta_data($this->resource);
-        $mode = $meta['mode'];
-
-        return (strstr($mode, 'r') || strstr($mode, '+'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        if (! $this->resource) {
-            throw new RuntimeException('No resource available; cannot read');
-        }
-
-        if (! $this->isReadable()) {
-            throw new RuntimeException('Stream is not readable');
-        }
-
-        $result = fread($this->resource, $length);
-
-        if (false === $result) {
-            throw new RuntimeException('Error reading stream');
-        }
-
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContents()
-    {
-        if (! $this->isReadable()) {
-            throw new RuntimeException('Stream is not readable');
-        }
-
-        $result = stream_get_contents($this->resource);
-        if (false === $result) {
-            throw new RuntimeException('Error reading from stream');
-        }
-        return $result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata($key = null)
-    {
-        if (null === $key) {
-            return stream_get_meta_data($this->resource);
-        }
-
-        $metadata = stream_get_meta_data($this->resource);
-        if (! array_key_exists($key, $metadata)) {
-            return null;
-        }
-
-        return $metadata[$key];
-    }
-
-    /**
-     * Set the internal stream resource.
-     *
-     * @param string|resource $stream String stream target or stream resource.
-     * @param string $mode Resource mode for stream target.
-     * @throws InvalidArgumentException for invalid streams or resources.
-     */
-    private function setStream($stream, $mode = 'r')
-    {
-        $error    = null;
-        $resource = $stream;
-
-        if (is_string($stream)) {
-            set_error_handler(function ($e) use (&$error) {
-                $error = $e;
-            }, E_WARNING);
-            $resource = fopen($stream, $mode);
-            restore_error_handler();
-        }
-
-        if ($error) {
-            throw new InvalidArgumentException('Invalid stream reference provided');
-        }
-
-        if (! is_resource($resource) || 'stream' !== get_resource_type($resource)) {
-            throw new InvalidArgumentException(
-                'Invalid stream provided; must be a string stream identifier or stream resource'
-            );
-        }
-
-        if ($stream !== $resource) {
-            $this->stream = $stream;
-        }
-
-        $this->resource = $resource;
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/vendor/zendframework/zend-diactoros/src/UploadedFile.php
deleted file mode 100644
index 1aa083f..0000000
--- a/vendor/zendframework/zend-diactoros/src/UploadedFile.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use RuntimeException;
-
-class UploadedFile implements UploadedFileInterface
-{
-    /**
-     * @var string
-     */
-    private $clientFilename;
-
-    /**
-     * @var string
-     */
-    private $clientMediaType;
-
-    /**
-     * @var int
-     */
-    private $error;
-
-    /**
-     * @var null|string
-     */
-    private $file;
-
-    /**
-     * @var bool
-     */
-    private $moved = false;
-
-    /**
-     * @var int
-     */
-    private $size;
-
-    /**
-     * @var null|StreamInterface
-     */
-    private $stream;
-
-    public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
-    {
-        if ($errorStatus === UPLOAD_ERR_OK) {
-            if (is_string($streamOrFile)) {
-                $this->file = $streamOrFile;
-            }
-            if (is_resource($streamOrFile)) {
-                $this->stream = new Stream($streamOrFile);
-            }
-
-            if (! $this->file && ! $this->stream) {
-                if (! $streamOrFile instanceof StreamInterface) {
-                    throw new InvalidArgumentException('Invalid stream or file provided for UploadedFile');
-                }
-                $this->stream = $streamOrFile;
-            }
-        }
-
-        if (! is_int($size)) {
-            throw new InvalidArgumentException('Invalid size provided for UploadedFile; must be an int');
-        }
-        $this->size = $size;
-
-        if (! is_int($errorStatus)
-            || 0 > $errorStatus
-            || 8 < $errorStatus
-        ) {
-            throw new InvalidArgumentException(
-                'Invalid error status for UploadedFile; must be an UPLOAD_ERR_* constant'
-            );
-        }
-        $this->error = $errorStatus;
-
-        if (null !== $clientFilename && ! is_string($clientFilename)) {
-            throw new InvalidArgumentException(
-                'Invalid client filename provided for UploadedFile; must be null or a string'
-            );
-        }
-        $this->clientFilename = $clientFilename;
-
-        if (null !== $clientMediaType && ! is_string($clientMediaType)) {
-            throw new InvalidArgumentException(
-                'Invalid client media type provided for UploadedFile; must be null or a string'
-            );
-        }
-        $this->clientMediaType = $clientMediaType;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @throws \RuntimeException if the upload was not successful.
-     */
-    public function getStream()
-    {
-        if ($this->error !== UPLOAD_ERR_OK) {
-            throw new RuntimeException('Cannot retrieve stream due to upload error');
-        }
-
-        if ($this->moved) {
-            throw new RuntimeException('Cannot retrieve stream after it has already been moved');
-        }
-
-        if ($this->stream instanceof StreamInterface) {
-            return $this->stream;
-        }
-
-        $this->stream = new Stream($this->file);
-        return $this->stream;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @see http://php.net/is_uploaded_file
-     * @see http://php.net/move_uploaded_file
-     * @param string $targetPath Path to which to move the uploaded file.
-     * @throws \RuntimeException if the upload was not successful.
-     * @throws \InvalidArgumentException if the $path specified is invalid.
-     * @throws \RuntimeException on any error during the move operation, or on
-     *     the second or subsequent call to the method.
-     */
-    public function moveTo($targetPath)
-    {
-        if ($this->error !== UPLOAD_ERR_OK) {
-            throw new RuntimeException('Cannot retrieve stream due to upload error');
-        }
-
-        if (! is_string($targetPath)) {
-            throw new InvalidArgumentException(
-                'Invalid path provided for move operation; must be a string'
-            );
-        }
-
-        if (empty($targetPath)) {
-            throw new InvalidArgumentException(
-                'Invalid path provided for move operation; must be a non-empty string'
-            );
-        }
-
-        if ($this->moved) {
-            throw new RuntimeException('Cannot move file; already moved!');
-        }
-
-        $sapi = PHP_SAPI;
-        switch (true) {
-            case (empty($sapi) || 0 === strpos($sapi, 'cli') || ! $this->file):
-                // Non-SAPI environment, or no filename present
-                $this->writeFile($targetPath);
-                break;
-            default:
-                // SAPI environment, with file present
-                if (false === move_uploaded_file($this->file, $targetPath)) {
-                    throw new RuntimeException('Error occurred while moving uploaded file');
-                }
-                break;
-        }
-
-        $this->moved = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|null The file size in bytes or null if unknown.
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @see http://php.net/manual/en/features.file-upload.errors.php
-     * @return int One of PHP's UPLOAD_ERR_XXX constants.
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string|null The filename sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientFilename()
-    {
-        return $this->clientFilename;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClientMediaType()
-    {
-        return $this->clientMediaType;
-    }
-
-    /**
-     * Write internal stream to given path
-     *
-     * @param string $path
-     */
-    private function writeFile($path)
-    {
-        $handle = fopen($path, 'wb+');
-        if (false === $handle) {
-            throw new RuntimeException('Unable to write to designated path');
-        }
-
-        $stream = $this->getStream();
-        $stream->rewind();
-        while (! $stream->eof()) {
-            fwrite($handle, $stream->read(4096));
-        }
-
-        fclose($handle);
-    }
-}
diff --git a/vendor/zendframework/zend-diactoros/src/Uri.php b/vendor/zendframework/zend-diactoros/src/Uri.php
deleted file mode 100644
index be3077a..0000000
--- a/vendor/zendframework/zend-diactoros/src/Uri.php
+++ /dev/null
@@ -1,659 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @see       http://github.com/zendframework/zend-diactoros for the canonical source repository
- * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
- */
-
-namespace Zend\Diactoros;
-
-use InvalidArgumentException;
-use Psr\Http\Message\UriInterface;
-
-/**
- * Implementation of Psr\Http\UriInterface.
- *
- * Provides a value object representing a URI for HTTP requests.
- *
- * Instances of this class  are considered immutable; all methods that
- * might change state are implemented such that they retain the internal
- * state of the current instance and return a new instance that contains the
- * changed state.
- */
-class Uri implements UriInterface
-{
-    /**
-     * Sub-delimiters used in query strings and fragments.
-     *
-     * @const string
-     */
-    const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
-
-    /**
-     * Unreserved characters used in paths, query strings, and fragments.
-     *
-     * @const string
-     */
-    const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
-
-    /**
-     * @var int[] Array indexed by valid scheme names to their corresponding ports.
-     */
-    protected $allowedSchemes = [
-        'http'  => 80,
-        'https' => 443,
-    ];
-
-    /**
-     * @var string
-     */
-    private $scheme = '';
-
-    /**
-     * @var string
-     */
-    private $userInfo = '';
-
-    /**
-     * @var string
-     */
-    private $host = '';
-
-    /**
-     * @var int
-     */
-    private $port;
-
-    /**
-     * @var string
-     */
-    private $path = '';
-
-    /**
-     * @var string
-     */
-    private $query = '';
-
-    /**
-     * @var string
-     */
-    private $fragment = '';
-
-    /**
-     * generated uri string cache
-     * @var string|null
-     */
-    private $uriString;
-
-    /**
-     * @param string $uri
-     * @throws InvalidArgumentException on non-string $uri argument
-     */
-    public function __construct($uri = '')
-    {
-        if (! is_string($uri)) {
-            throw new InvalidArgumentException(sprintf(
-                'URI passed to constructor must be a string; received "%s"',
-                (is_object($uri) ? get_class($uri) : gettype($uri))
-            ));
-        }
-
-        if (! empty($uri)) {
-            $this->parseUri($uri);
-        }
-    }
-
-    /**
-     * Operations to perform on clone.
-     *
-     * Since cloning usually is for purposes of mutation, we reset the
-     * $uriString property so it will be re-calculated.
-     */
-    public function __clone()
-    {
-        $this->uriString = null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        if (null !== $this->uriString) {
-            return $this->uriString;
-        }
-
-        $this->uriString = static::createUriString(
-            $this->scheme,
-            $this->getAuthority(),
-            $this->getPath(), // Absolute URIs should use a "/" for an empty path
-            $this->query,
-            $this->fragment
-        );
-
-        return $this->uriString;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthority()
-    {
-        if (empty($this->host)) {
-            return '';
-        }
-
-        $authority = $this->host;
-        if (! empty($this->userInfo)) {
-            $authority = $this->userInfo . '@' . $authority;
-        }
-
-        if ($this->isNonStandardPort($this->scheme, $this->host, $this->port)) {
-            $authority .= ':' . $this->port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserInfo()
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPort()
-    {
-        return $this->isNonStandardPort($this->scheme, $this->host, $this->port)
-            ? $this->port
-            : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withScheme($scheme)
-    {
-        if (! is_string($scheme)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects a string argument; received %s',
-                __METHOD__,
-                (is_object($scheme) ? get_class($scheme) : gettype($scheme))
-            ));
-        }
-
-        $scheme = $this->filterScheme($scheme);
-
-        if ($scheme === $this->scheme) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->scheme = $scheme;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUserInfo($user, $password = null)
-    {
-        if (! is_string($user)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects a string user argument; received %s',
-                __METHOD__,
-                (is_object($user) ? get_class($user) : gettype($user))
-            ));
-        }
-        if (null !== $password && ! is_string($password)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects a string password argument; received %s',
-                __METHOD__,
-                (is_object($password) ? get_class($password) : gettype($password))
-            ));
-        }
-
-        $info = $user;
-        if ($password) {
-            $info .= ':' . $password;
-        }
-
-        if ($info === $this->userInfo) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->userInfo = $info;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withHost($host)
-    {
-        if (! is_string($host)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects a string argument; received %s',
-                __METHOD__,
-                (is_object($host) ? get_class($host) : gettype($host))
-            ));
-        }
-
-        if ($host === $this->host) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->host = $host;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withPort($port)
-    {
-        if (! is_numeric($port)) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid port "%s" specified; must be an integer or integer string',
-                (is_object($port) ? get_class($port) : gettype($port))
-            ));
-        }
-
-        $port = (int) $port;
-
-        if ($port === $this->port) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        if ($port < 1 || $port > 65535) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid port "%d" specified; must be a valid TCP/UDP port',
-                $port
-            ));
-        }
-
-        $new = clone $this;
-        $new->port = $port;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withPath($path)
-    {
-        if (! is_string($path)) {
-            throw new InvalidArgumentException(
-                'Invalid path provided; must be a string'
-            );
-        }
-
-        if (strpos($path, '?') !== false) {
-            throw new InvalidArgumentException(
-                'Invalid path provided; must not contain a query string'
-            );
-        }
-
-        if (strpos($path, '#') !== false) {
-            throw new InvalidArgumentException(
-                'Invalid path provided; must not contain a URI fragment'
-            );
-        }
-
-        $path = $this->filterPath($path);
-
-        if ($path === $this->path) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->path = $path;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withQuery($query)
-    {
-        if (! is_string($query)) {
-            throw new InvalidArgumentException(
-                'Query string must be a string'
-            );
-        }
-
-        if (strpos($query, '#') !== false) {
-            throw new InvalidArgumentException(
-                'Query string must not include a URI fragment'
-            );
-        }
-
-        $query = $this->filterQuery($query);
-
-        if ($query === $this->query) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->query = $query;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withFragment($fragment)
-    {
-        if (! is_string($fragment)) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects a string argument; received %s',
-                __METHOD__,
-                (is_object($fragment) ? get_class($fragment) : gettype($fragment))
-            ));
-        }
-
-        $fragment = $this->filterFragment($fragment);
-
-        if ($fragment === $this->fragment) {
-            // Do nothing if no change was made.
-            return clone $this;
-        }
-
-        $new = clone $this;
-        $new->fragment = $fragment;
-
-        return $new;
-    }
-
-    /**
-     * Parse a URI into its parts, and set the properties
-     *
-     * @param string $uri
-     */
-    private function parseUri($uri)
-    {
-        $parts = parse_url($uri);
-
-        if (false === $parts) {
-            throw new \InvalidArgumentException(
-                'The source URI string appears to be malformed'
-            );
-        }
-
-        $this->scheme    = isset($parts['scheme'])   ? $this->filterScheme($parts['scheme']) : '';
-        $this->userInfo  = isset($parts['user'])     ? $parts['user']     : '';
-        $this->host      = isset($parts['host'])     ? $parts['host']     : '';
-        $this->port      = isset($parts['port'])     ? $parts['port']     : null;
-        $this->path      = isset($parts['path'])     ? $this->filterPath($parts['path']) : '';
-        $this->query     = isset($parts['query'])    ? $this->filterQuery($parts['query']) : '';
-        $this->fragment  = isset($parts['fragment']) ? $this->filterFragment($parts['fragment']) : '';
-
-        if (isset($parts['pass'])) {
-            $this->userInfo .= ':' . $parts['pass'];
-        }
-    }
-
-    /**
-     * Create a URI string from its various parts
-     *
-     * @param string $scheme
-     * @param string $authority
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
-     * @return string
-     */
-    private static function createUriString($scheme, $authority, $path, $query, $fragment)
-    {
-        $uri = '';
-
-        if (! empty($scheme)) {
-            $uri .= sprintf('%s://', $scheme);
-        }
-
-        if (! empty($authority)) {
-            $uri .= $authority;
-        }
-
-        if ($path) {
-            if (empty($path) || '/' !== substr($path, 0, 1)) {
-                $path = '/' . $path;
-            }
-
-            $uri .= $path;
-        }
-
-        if ($query) {
-            $uri .= sprintf('?%s', $query);
-        }
-
-        if ($fragment) {
-            $uri .= sprintf('#%s', $fragment);
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Is a given port non-standard for the current scheme?
-     *
-     * @param string $scheme
-     * @param string $host
-     * @param int $port
-     * @return bool
-     */
-    private function isNonStandardPort($scheme, $host, $port)
-    {
-        if (! $scheme) {
-            return true;
-        }
-
-        if (! $host || ! $port) {
-            return false;
-        }
-
-        return ! isset($this->allowedSchemes[$scheme]) || $port !== $this->allowedSchemes[$scheme];
-    }
-
-    /**
-     * Filters the scheme to ensure it is a valid scheme.
-     *
-     * @param string $scheme Scheme name.
-     *
-     * @return string Filtered scheme.
-     */
-    private function filterScheme($scheme)
-    {
-        $scheme = strtolower($scheme);
-        $scheme = preg_replace('#:(//)?$#', '', $scheme);
-
-        if (empty($scheme)) {
-            return '';
-        }
-
-        if (! array_key_exists($scheme, $this->allowedSchemes)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unsupported scheme "%s"; must be any empty string or in the set (%s)',
-                $scheme,
-                implode(', ', array_keys($this->allowedSchemes))
-            ));
-        }
-
-        return $scheme;
-    }
-
-    /**
-     * Filters the path of a URI to ensure it is properly encoded.
-     *
-     * @param string $path
-     * @return string
-     */
-    private function filterPath($path)
-    {
-        $path = preg_replace_callback(
-            '/(?:[^' . self::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'urlEncodeChar'],
-            $path
-        );
-
-        if (empty($path)) {
-            // No path
-            return $path;
-        }
-
-        if ($path[0] !== '/') {
-            // Relative path
-            return $path;
-        }
-
-        // Ensure only one leading slash, to prevent XSS attempts.
-        return '/' . ltrim($path, '/');
-    }
-
-    /**
-     * Filter a query string to ensure it is propertly encoded.
-     *
-     * Ensures that the values in the query string are properly urlencoded.
-     *
-     * @param string $query
-     * @return string
-     */
-    private function filterQuery($query)
-    {
-        if (! empty($query) && strpos($query, '?') === 0) {
-            $query = substr($query, 1);
-        }
-
-        $parts = explode('&', $query);
-        foreach ($parts as $index => $part) {
-            list($key, $value) = $this->splitQueryValue($part);
-            if ($value === null) {
-                $parts[$index] = $this->filterQueryOrFragment($key);
-                continue;
-            }
-            $parts[$index] = sprintf(
-                '%s=%s',
-                $this->filterQueryOrFragment($key),
-                $this->filterQueryOrFragment($value)
-            );
-        }
-
-        return implode('&', $parts);
-    }
-
-    /**
-     * Split a query value into a key/value tuple.
-     *
-     * @param string $value
-     * @return array A value with exactly two elements, key and value
-     */
-    private function splitQueryValue($value)
-    {
-        $data = explode('=', $value, 2);
-        if (1 === count($data)) {
-            $data[] = null;
-        }
-        return $data;
-    }
-
-    /**
-     * Filter a fragment value to ensure it is properly encoded.
-     *
-     * @param null|string $fragment
-     * @return string
-     */
-    private function filterFragment($fragment)
-    {
-        if (! empty($fragment) && strpos($fragment, '#') === 0) {
-            $fragment = substr($fragment, 1);
-        }
-
-        return $this->filterQueryOrFragment($fragment);
-    }
-
-    /**
-     * Filter a query string key or value, or a fragment.
-     *
-     * @param string $value
-     * @return string
-     */
-    private function filterQueryOrFragment($value)
-    {
-        return preg_replace_callback(
-            '/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'urlEncodeChar'],
-            $value
-        );
-    }
-
-    /**
-     * URL encode a character returned by a regex.
-     *
-     * @param array $matches
-     * @return string
-     */
-    private function urlEncodeChar(array $matches)
-    {
-        return rawurlencode($matches[0]);
-    }
-}
diff --git a/vendor/zendframework/zend-escaper/CONTRIBUTING.md b/vendor/zendframework/zend-escaper/CONTRIBUTING.md
deleted file mode 100644
index 2b58aca..0000000
--- a/vendor/zendframework/zend-escaper/CONTRIBUTING.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-escaper/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-escaper.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
-```
-
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
-```
-
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-escaper)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-escaper.git
-   $ cd zend-escaper
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-escaper.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-escaper.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/vendor/zendframework/zend-escaper/LICENSE.md b/vendor/zendframework/zend-escaper/LICENSE.md
deleted file mode 100644
index dbb1b49..0000000
--- a/vendor/zendframework/zend-escaper/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 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.
-
-- 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.
-
-- Neither the name of Zend Technologies USA, Inc. 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 OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-escaper/README.md b/vendor/zendframework/zend-escaper/README.md
deleted file mode 100644
index 9ed284f..0000000
--- a/vendor/zendframework/zend-escaper/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# zend-escaper
-
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-escaper.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-escaper)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-escaper/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-escaper?branch=master)
-
-The OWASP Top 10 web security risks study lists Cross-Site Scripting (XSS) in
-second place. PHP’s sole functionality against XSS is limited to two functions
-of which one is commonly misapplied. Thus, the `Zend\Escaper` component was written.
-It offers developers a way to escape output and defend from XSS and related
-vulnerabilities by introducing contextual escaping based on peer-reviewed rules.
-
-
-- File issues at https://github.com/zendframework/zend-escaper/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-escaper
diff --git a/vendor/zendframework/zend-escaper/composer.json b/vendor/zendframework/zend-escaper/composer.json
deleted file mode 100644
index faa4375..0000000
--- a/vendor/zendframework/zend-escaper/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "zendframework/zend-escaper",
-    "description": " ",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2",
-        "escaper"
-    ],
-    "homepage": "https://github.com/zendframework/zend-escaper",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Escaper\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.3.23"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Escaper\\": "test/"
-        }
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
-    }
-}
\ No newline at end of file
diff --git a/vendor/zendframework/zend-escaper/src/Escaper.php b/vendor/zendframework/zend-escaper/src/Escaper.php
deleted file mode 100644
index 072d543..0000000
--- a/vendor/zendframework/zend-escaper/src/Escaper.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper;
-
-/**
- * Context specific methods for use in secure output escaping
- */
-class Escaper
-{
-    /**
-     * Entity Map mapping Unicode codepoints to any available named HTML entities.
-     *
-     * While HTML supports far more named entities, the lowest common denominator
-     * has become HTML5's XML Serialisation which is restricted to the those named
-     * entities that XML supports. Using HTML entities would result in this error:
-     *     XML Parsing Error: undefined entity
-     *
-     * @var array
-     */
-    protected static $htmlNamedEntityMap = array(
-        34 => 'quot',         // quotation mark
-        38 => 'amp',          // ampersand
-        60 => 'lt',           // less-than sign
-        62 => 'gt',           // greater-than sign
-    );
-
-    /**
-     * Current encoding for escaping. If not UTF-8, we convert strings from this encoding
-     * pre-escaping and back to this encoding post-escaping.
-     *
-     * @var string
-     */
-    protected $encoding = 'utf-8';
-
-    /**
-     * Holds the value of the special flags passed as second parameter to
-     * htmlspecialchars(). We modify these for PHP 5.4 to take advantage
-     * of the new ENT_SUBSTITUTE flag for correctly dealing with invalid
-     * UTF-8 sequences.
-     *
-     * @var string
-     */
-    protected $htmlSpecialCharsFlags = ENT_QUOTES;
-
-    /**
-     * Static Matcher which escapes characters for HTML Attribute contexts
-     *
-     * @var callable
-     */
-    protected $htmlAttrMatcher;
-
-    /**
-     * Static Matcher which escapes characters for Javascript contexts
-     *
-     * @var callable
-     */
-    protected $jsMatcher;
-
-    /**
-     * Static Matcher which escapes characters for CSS Attribute contexts
-     *
-     * @var callable
-     */
-    protected $cssMatcher;
-
-    /**
-     * List of all encoding supported by this class
-     *
-     * @var array
-     */
-    protected $supportedEncodings = array(
-        'iso-8859-1',   'iso8859-1',    'iso-8859-5',   'iso8859-5',
-        'iso-8859-15',  'iso8859-15',   'utf-8',        'cp866',
-        'ibm866',       '866',          'cp1251',       'windows-1251',
-        'win-1251',     '1251',         'cp1252',       'windows-1252',
-        '1252',         'koi8-r',       'koi8-ru',      'koi8r',
-        'big5',         '950',          'gb2312',       '936',
-        'big5-hkscs',   'shift_jis',    'sjis',         'sjis-win',
-        'cp932',        '932',          'euc-jp',       'eucjp',
-        'eucjp-win',    'macroman'
-    );
-
-    /**
-     * Constructor: Single parameter allows setting of global encoding for use by
-     * the current object. If PHP 5.4 is detected, additional ENT_SUBSTITUTE flag
-     * is set for htmlspecialchars() calls.
-     *
-     * @param string $encoding
-     * @throws Exception\InvalidArgumentException
-     */
-    public function __construct($encoding = null)
-    {
-        if ($encoding !== null) {
-            $encoding = (string) $encoding;
-            if ($encoding === '') {
-                throw new Exception\InvalidArgumentException(
-                    get_class($this) . ' constructor parameter does not allow a blank value'
-                );
-            }
-
-            $encoding = strtolower($encoding);
-            if (!in_array($encoding, $this->supportedEncodings)) {
-                throw new Exception\InvalidArgumentException(
-                    'Value of \'' . $encoding . '\' passed to ' . get_class($this)
-                    . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
-                );
-            }
-
-            $this->encoding = $encoding;
-        }
-
-        if (defined('ENT_SUBSTITUTE')) {
-            $this->htmlSpecialCharsFlags|= ENT_SUBSTITUTE;
-        }
-
-        // set matcher callbacks
-        $this->htmlAttrMatcher = array($this, 'htmlAttrMatcher');
-        $this->jsMatcher       = array($this, 'jsMatcher');
-        $this->cssMatcher      = array($this, 'cssMatcher');
-    }
-
-    /**
-     * Return the encoding that all output/input is expected to be encoded in.
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Escape a string for the HTML Body context where there are very few characters
-     * of special meaning. Internally this will use htmlspecialchars().
-     *
-     * @param string $string
-     * @return string
-     */
-    public function escapeHtml($string)
-    {
-        return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
-    }
-
-    /**
-     * Escape a string for the HTML Attribute context. We use an extended set of characters
-     * to escape that are not covered by htmlspecialchars() to cover cases where an attribute
-     * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE).
-     *
-     * @param string $string
-     * @return string
-     */
-    public function escapeHtmlAttr($string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9,\.\-_]/iSu', $this->htmlAttrMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Escape a string for the Javascript context. This does not use json_encode(). An extended
-     * set of characters are escaped beyond ECMAScript's rules for Javascript literal string
-     * escaping in order to prevent misinterpretation of Javascript as HTML leading to the
-     * injection of special characters and entities. The escaping used should be tolerant
-     * of cases where HTML escaping was not applied on top of Javascript escaping correctly.
-     * Backslash escaping is not used as it still leaves the escaped character as-is and so
-     * is not useful in a HTML context.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function escapeJs($string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9,\._]/iSu', $this->jsMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Escape a string for the URI or Parameter contexts. This should not be used to escape
-     * an entire URI - only a subcomponent being inserted. The function is a simple proxy
-     * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function escapeUrl($string)
-    {
-        return rawurlencode($string);
-    }
-
-    /**
-     * Escape a string for the CSS context. CSS escaping can be applied to any string being
-     * inserted into CSS and escapes everything except alphanumerics.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function escapeCss($string)
-    {
-        $string = $this->toUtf8($string);
-        if ($string === '' || ctype_digit($string)) {
-            return $string;
-        }
-
-        $result = preg_replace_callback('/[^a-z0-9]/iSu', $this->cssMatcher, $string);
-        return $this->fromUtf8($result);
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies HTML Attribute
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function htmlAttrMatcher($matches)
-    {
-        $chr = $matches[0];
-        $ord = ord($chr);
-
-        /**
-         * The following replaces characters undefined in HTML with the
-         * hex entity for the Unicode replacement character.
-         */
-        if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r")
-            || ($ord >= 0x7f && $ord <= 0x9f)
-        ) {
-            return '&#xFFFD;';
-        }
-
-        /**
-         * Check if the current character to escape has a name entity we should
-         * replace it with while grabbing the integer value of the character.
-         */
-        if (strlen($chr) > 1) {
-            $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-        }
-
-        $hex = bin2hex($chr);
-        $ord = hexdec($hex);
-        if (isset(static::$htmlNamedEntityMap[$ord])) {
-            return '&' . static::$htmlNamedEntityMap[$ord] . ';';
-        }
-
-        /**
-         * Per OWASP recommendations, we'll use upper hex entities
-         * for any other characters where a named entity does not exist.
-         */
-        if ($ord > 255) {
-            return sprintf('&#x%04X;', $ord);
-        }
-        return sprintf('&#x%02X;', $ord);
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies Javascript
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function jsMatcher($matches)
-    {
-        $chr = $matches[0];
-        if (strlen($chr) == 1) {
-            return sprintf('\\x%02X', ord($chr));
-        }
-        $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-        return sprintf('\\u%04s', strtoupper(bin2hex($chr)));
-    }
-
-    /**
-     * Callback function for preg_replace_callback that applies CSS
-     * escaping to all matches.
-     *
-     * @param array $matches
-     * @return string
-     */
-    protected function cssMatcher($matches)
-    {
-        $chr = $matches[0];
-        if (strlen($chr) == 1) {
-            $ord = ord($chr);
-        } else {
-            $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
-            $ord = hexdec(bin2hex($chr));
-        }
-        return sprintf('\\%X ', $ord);
-    }
-
-    /**
-     * Converts a string to UTF-8 from the base encoding. The base encoding is set via this
-     * class' constructor.
-     *
-     * @param string $string
-     * @throws Exception\RuntimeException
-     * @return string
-     */
-    protected function toUtf8($string)
-    {
-        if ($this->getEncoding() === 'utf-8') {
-            $result = $string;
-        } else {
-            $result = $this->convertEncoding($string, 'UTF-8', $this->getEncoding());
-        }
-
-        if (!$this->isUtf8($result)) {
-            throw new Exception\RuntimeException(
-                sprintf('String to be escaped was not valid UTF-8 or could not be converted: %s', $result)
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts a string from UTF-8 to the base encoding. The base encoding is set via this
-     * class' constructor.
-     * @param string $string
-     * @return string
-     */
-    protected function fromUtf8($string)
-    {
-        if ($this->getEncoding() === 'utf-8') {
-            return $string;
-        }
-
-        return $this->convertEncoding($string, $this->getEncoding(), 'UTF-8');
-    }
-
-    /**
-     * Checks if a given string appears to be valid UTF-8 or not.
-     *
-     * @param string $string
-     * @return bool
-     */
-    protected function isUtf8($string)
-    {
-        return ($string === '' || preg_match('/^./su', $string));
-    }
-
-    /**
-     * Encoding conversion helper which wraps iconv and mbstring where they exist or throws
-     * and exception where neither is available.
-     *
-     * @param string $string
-     * @param string $to
-     * @param array|string $from
-     * @throws Exception\RuntimeException
-     * @return string
-     */
-    protected function convertEncoding($string, $to, $from)
-    {
-        if (function_exists('iconv')) {
-            $result = iconv($from, $to, $string);
-        } elseif (function_exists('mb_convert_encoding')) {
-            $result = mb_convert_encoding($string, $to, $from);
-        } else {
-            throw new Exception\RuntimeException(
-                get_class($this)
-                . ' requires either the iconv or mbstring extension to be installed'
-                . ' when escaping for non UTF-8 strings.'
-            );
-        }
-
-        if ($result === false) {
-            return ''; // return non-fatal blank string on encoding errors from users
-        }
-        return $result;
-    }
-}
diff --git a/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 7174796..0000000
--- a/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 0ad3f73..0000000
--- a/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php b/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
deleted file mode 100644
index d626123..0000000
--- a/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Escaper\Exception;
-
-/**
- * Invalid argument exception
- */
-class RuntimeException extends \RuntimeException implements
-    ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/CHANGELOG.md b/vendor/zendframework/zend-feed/CHANGELOG.md
deleted file mode 100644
index 426cab5..0000000
--- a/vendor/zendframework/zend-feed/CHANGELOG.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 2.5.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#5](https://github.com/zendframework/zend-feed/pull/5) fixes the enclosure
-  length check to allow zero and integer strings.
-- [#2](https://github.com/zendframework/zend-feed/pull/2) ensures that the
-  routine for "absolutising" a link in `Reader\FeedSet` always generates a URI
-  with a scheme.
diff --git a/vendor/zendframework/zend-feed/CONTRIBUTING.md b/vendor/zendframework/zend-feed/CONTRIBUTING.md
deleted file mode 100644
index e964373..0000000
--- a/vendor/zendframework/zend-feed/CONTRIBUTING.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-feed/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-feed.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
-```
-
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
-```
-
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-feed)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-feed.git
-   $ cd zend-feed
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-feed.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-feed.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/vendor/zendframework/zend-feed/LICENSE.md b/vendor/zendframework/zend-feed/LICENSE.md
deleted file mode 100644
index dbb1b49..0000000
--- a/vendor/zendframework/zend-feed/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 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.
-
-- 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.
-
-- Neither the name of Zend Technologies USA, Inc. 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 OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-feed/README.md b/vendor/zendframework/zend-feed/README.md
deleted file mode 100644
index ba8b872..0000000
--- a/vendor/zendframework/zend-feed/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# zend-feed
-
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-feed.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-feed)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-feed/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-feed?branch=master)
-
-`Zend\Feed` provides functionality for consuming RSS and Atom feeds. It provides
-a natural syntax for accessing elements of feeds, feed attributes, and entry
-attributes. `Zend\Feed` also has extensive support for modifying feed and entry
-structure with the same natural syntax, and turning the result back into XML.
-
-
-- File issues at https://github.com/zendframework/zend-feed/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-feed
diff --git a/vendor/zendframework/zend-feed/composer.json b/vendor/zendframework/zend-feed/composer.json
deleted file mode 100644
index 2c29f06..0000000
--- a/vendor/zendframework/zend-feed/composer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "name": "zendframework/zend-feed",
-    "description": "provides functionality for consuming RSS and Atom feeds",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2",
-        "feed"
-    ],
-    "homepage": "https://github.com/zendframework/zend-feed",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Feed\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.5",
-        "zendframework/zend-escaper": "~2.5",
-        "zendframework/zend-stdlib": "~2.5"
-    },
-    "require-dev": {
-        "zendframework/zend-db": "~2.5",
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-validator": "~2.5",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
-    },
-    "suggest": {
-        "zendframework/zend-cache": "Zend\\Cache component",
-        "zendframework/zend-db": "Zend\\Db component",
-        "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-        "zendframework/zend-validator": "Zend\\Validator component"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Feed\\": "test/"
-        }
-    }
-}
\ No newline at end of file
diff --git a/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
deleted file mode 100644
index 3e994f2..0000000
--- a/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 0f75296..0000000
--- a/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 29b6482..0000000
--- a/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
deleted file mode 100644
index 43167a1..0000000
--- a/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Exception;
-
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
deleted file mode 100644
index 7321c96..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-use Traversable;
-use Zend\Http\PhpEnvironment\Response as PhpResponse;
-use Zend\Stdlib\ArrayUtils;
-
-abstract class AbstractCallback implements CallbackInterface
-{
-    /**
-     * An instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistenceInterface
-     * used to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @var Model\SubscriptionPersistenceInterface
-     */
-    protected $storage = null;
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend\Controller\Response\Http.
-     *
-     * @var HttpResponse|PhpResponse
-     */
-    protected $httpResponse = null;
-
-    /**
-     * The number of Subscribers for which any updates are on behalf of.
-     *
-     * @var int
-     */
-    protected $subscriberCount = 1;
-
-    /**
-     * Constructor; accepts an array or Traversable object to preset
-     * options for the Subscriber without calling all supported setter
-     * methods in turn.
-     *
-     * @param  array|Traversable $options Options array or Traversable object
-     */
-    public function __construct($options = null)
-    {
-        if ($options !== null) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Traversable $options Options array or Traversable object
-     * @return AbstractCallback
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        }
-
-        if (!is_array($options)) {
-            throw new Exception\InvalidArgumentException('Array or Traversable object'
-            . 'expected, got ' . gettype($options));
-        }
-
-        if (is_array($options)) {
-            $this->setOptions($options);
-        }
-
-        if (array_key_exists('storage', $options)) {
-            $this->setStorage($options['storage']);
-        }
-        return $this;
-    }
-
-    /**
-     * Send the response, including all headers.
-     * If you wish to handle this via Zend\Http, use the getter methods
-     * to retrieve any data needed to be set on your HTTP Response object, or
-     * simply give this object the HTTP Response instance to work with for you!
-     *
-     * @return void
-     */
-    public function sendResponse()
-    {
-        $this->getHttpResponse()->send();
-    }
-
-    /**
-     * Sets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @param  Model\SubscriptionPersistenceInterface $storage
-     * @return AbstractCallback
-     */
-    public function setStorage(Model\SubscriptionPersistenceInterface $storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Gets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @return Model\SubscriptionPersistenceInterface
-     * @throws Exception\RuntimeException
-     */
-    public function getStorage()
-    {
-        if ($this->storage === null) {
-            throw new Exception\RuntimeException('No storage object has been'
-                . ' set that subclasses Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence');
-        }
-        return $this->storage;
-    }
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend\Controller\Response\Http.
-     *
-     * @param  HttpResponse|PhpResponse $httpResponse
-     * @return AbstractCallback
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setHttpResponse($httpResponse)
-    {
-        if (!$httpResponse instanceof HttpResponse && !$httpResponse instanceof PhpResponse) {
-            throw new Exception\InvalidArgumentException('HTTP Response object must'
-                . ' implement one of Zend\Feed\Pubsubhubbub\HttpResponse or'
-                . ' Zend\Http\PhpEnvironment\Response');
-        }
-        $this->httpResponse = $httpResponse;
-        return $this;
-    }
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend\Controller\Response\Http.
-     *
-     * @return HttpResponse|PhpResponse
-     */
-    public function getHttpResponse()
-    {
-        if ($this->httpResponse === null) {
-            $this->httpResponse = new HttpResponse;
-        }
-        return $this->httpResponse;
-    }
-
-    /**
-     * Sets the number of Subscribers for which any updates are on behalf of.
-     * In other words, is this class serving one or more subscribers? How many?
-     * Defaults to 1 if left unchanged.
-     *
-     * @param  string|int $count
-     * @return AbstractCallback
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setSubscriberCount($count)
-    {
-        $count = intval($count);
-        if ($count <= 0) {
-            throw new Exception\InvalidArgumentException('Subscriber count must be'
-                . ' greater than zero');
-        }
-        $this->subscriberCount = $count;
-        return $this;
-    }
-
-    /**
-     * Gets the number of Subscribers for which any updates are on behalf of.
-     * In other words, is this class serving one or more subscribers? How many?
-     *
-     * @return int
-     */
-    public function getSubscriberCount()
-    {
-        return $this->subscriberCount;
-    }
-
-    /**
-     * Attempt to detect the callback URL (specifically the path forward)
-     * @return string
-     */
-    protected function _detectCallbackUrl()
-    {
-        $callbackUrl = '';
-        if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
-            $callbackUrl = $_SERVER['HTTP_X_ORIGINAL_URL'];
-        } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-            $callbackUrl = $_SERVER['HTTP_X_REWRITE_URL'];
-        } elseif (isset($_SERVER['REQUEST_URI'])) {
-            $callbackUrl = $_SERVER['REQUEST_URI'];
-            $scheme = 'http';
-            if ($_SERVER['HTTPS'] == 'on') {
-                $scheme = 'https';
-            }
-            $schemeAndHttpHost = $scheme . '://' . $this->_getHttpHost();
-            if (strpos($callbackUrl, $schemeAndHttpHost) === 0) {
-                $callbackUrl = substr($callbackUrl, strlen($schemeAndHttpHost));
-            }
-        } elseif (isset($_SERVER['ORIG_PATH_INFO'])) {
-            $callbackUrl= $_SERVER['ORIG_PATH_INFO'];
-            if (!empty($_SERVER['QUERY_STRING'])) {
-                $callbackUrl .= '?' . $_SERVER['QUERY_STRING'];
-            }
-        }
-        return $callbackUrl;
-    }
-
-    /**
-     * Get the HTTP host
-     *
-     * @return string
-     */
-    protected function _getHttpHost()
-    {
-        if (!empty($_SERVER['HTTP_HOST'])) {
-            return $_SERVER['HTTP_HOST'];
-        }
-        $scheme = 'http';
-        if ($_SERVER['HTTPS'] == 'on') {
-            $scheme = 'https';
-        }
-        $name = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if (($scheme == 'http' && $port == 80)
-            || ($scheme == 'https' && $port == 443)
-        ) {
-            return $name;
-        }
-
-        return $name . ':' . $port;
-    }
-
-    /**
-     * Retrieve a Header value from either $_SERVER or Apache
-     *
-     * @param string $header
-     * @return bool|string
-     */
-    protected function _getHeader($header)
-    {
-        $temp = strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
-            return $_SERVER[$temp];
-        }
-        $temp = 'HTTP_' . strtoupper(str_replace('-', '_', $header));
-        if (!empty($_SERVER[$temp])) {
-            return $_SERVER[$temp];
-        }
-        if (function_exists('apache_request_headers')) {
-            $headers = apache_request_headers();
-            if (!empty($headers[$header])) {
-                return $headers[$header];
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return the raw body of the request
-     *
-     * @return string|false Raw body, or false if not present
-     */
-    protected function _getRawBody()
-    {
-        $body = file_get_contents('php://input');
-        if (strlen(trim($body)) == 0 && isset($GLOBALS['HTTP_RAW_POST_DATA'])) {
-            $body = $GLOBALS['HTTP_RAW_POST_DATA'];
-        }
-        if (strlen(trim($body)) > 0) {
-            return $body;
-        }
-        return false;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
deleted file mode 100644
index c6b7412..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-interface CallbackInterface
-{
-    /**
-     * Handle any callback from a Hub Server responding to a subscription or
-     * unsubscription request. This should be the Hub Server confirming the
-     * the request prior to taking action on it.
-     *
-     * @param array $httpData GET/POST data if available and not in $_GET/POST
-     * @param bool $sendResponseNow Whether to send response now or when asked
-     */
-    public function handle(array $httpData = null, $sendResponseNow = false);
-
-    /**
-     * Send the response, including all headers.
-     * If you wish to handle this via Zend\Mvc\Controller, use the getter methods
-     * to retrieve any data needed to be set on your HTTP Response object, or
-     * simply give this object the HTTP Response instance to work with for you!
-     *
-     * @return void
-     */
-    public function sendResponse();
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
-     *
-     * @param HttpResponse|\Zend\Http\PhpEnvironment\Response $httpResponse
-     */
-    public function setHttpResponse($httpResponse);
-
-    /**
-     * An instance of a class handling Http Responses. This is implemented in
-     * Zend\Feed\Pubsubhubbub\HttpResponse which shares an unenforced interface with
-     * (i.e. not inherited from) Zend\Feed\Pubsubhubbub\AbstractCallback.
-     *
-     * @return HttpResponse|\Zend\Http\PhpEnvironment\Response
-     */
-    public function getHttpResponse();
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
deleted file mode 100644
index f32bc1c..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception\ExceptionInterface as Exception;
-
-interface ExceptionInterface extends Exception
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
deleted file mode 100644
index cad1e01..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception;
-
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
deleted file mode 100644
index cc954a5..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
deleted file mode 100644
index 9722968..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-class HttpResponse
-{
-    /**
-     * The body of any response to the current callback request
-     *
-     * @var string
-     */
-    protected $content = '';
-
-    /**
-     * Array of headers. Each header is an array with keys 'name' and 'value'
-     *
-     * @var array
-     */
-    protected $headers = [];
-
-    /**
-     * HTTP response code to use in headers
-     *
-     * @var int
-     */
-    protected $statusCode = 200;
-
-    /**
-     * Send the response, including all headers
-     *
-     * @return void
-     */
-    public function send()
-    {
-        $this->sendHeaders();
-        echo $this->getContent();
-    }
-
-    /**
-     * Send all headers
-     *
-     * Sends any headers specified. If an {@link setHttpResponseCode() HTTP response code}
-     * has been specified, it is sent with the first header.
-     *
-     * @return void
-     */
-    public function sendHeaders()
-    {
-        if (count($this->headers) || (200 != $this->statusCode)) {
-            $this->canSendHeaders(true);
-        } elseif (200 == $this->statusCode) {
-            return;
-        }
-        $httpCodeSent = false;
-        foreach ($this->headers as $header) {
-            if (!$httpCodeSent && $this->statusCode) {
-                header($header['name'] . ': ' . $header['value'], $header['replace'], $this->statusCode);
-                $httpCodeSent = true;
-            } else {
-                header($header['name'] . ': ' . $header['value'], $header['replace']);
-            }
-        }
-        if (!$httpCodeSent) {
-            header('HTTP/1.1 ' . $this->statusCode);
-        }
-    }
-
-    /**
-     * Set a header
-     *
-     * If $replace is true, replaces any headers already defined with that
-     * $name.
-     *
-     * @param  string $name
-     * @param  string $value
-     * @param  bool $replace
-     * @return \Zend\Feed\PubSubHubbub\HttpResponse
-     */
-    public function setHeader($name, $value, $replace = false)
-    {
-        $name  = $this->_normalizeHeader($name);
-        $value = (string) $value;
-        if ($replace) {
-            foreach ($this->headers as $key => $header) {
-                if ($name == $header['name']) {
-                    unset($this->headers[$key]);
-                }
-            }
-        }
-        $this->headers[] = [
-            'name'    => $name,
-            'value'   => $value,
-            'replace' => $replace,
-        ];
-
-        return $this;
-    }
-
-    /**
-     * Check if a specific Header is set and return its value
-     *
-     * @param  string $name
-     * @return string|null
-     */
-    public function getHeader($name)
-    {
-        $name = $this->_normalizeHeader($name);
-        foreach ($this->headers as $header) {
-            if ($header['name'] == $name) {
-                return $header['value'];
-            }
-        }
-    }
-
-    /**
-     * Return array of headers; see {@link $headers} for format
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Can we send headers?
-     *
-     * @param  bool $throw Whether or not to throw an exception if headers have been sent; defaults to false
-     * @return HttpResponse
-     * @throws Exception\RuntimeException
-     */
-    public function canSendHeaders($throw = false)
-    {
-        $ok = headers_sent($file, $line);
-        if ($ok && $throw) {
-            throw new Exception\RuntimeException('Cannot send headers; headers already sent in ' . $file . ', line ' . $line);
-        }
-        return !$ok;
-    }
-
-    /**
-     * Set HTTP response code to use with headers
-     *
-     * @param  int $code
-     * @return HttpResponse
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setStatusCode($code)
-    {
-        if (!is_int($code) || (100 > $code) || (599 < $code)) {
-            throw new Exception\InvalidArgumentException('Invalid HTTP response'
-            . ' code:' . $code);
-        }
-        $this->statusCode = $code;
-        return $this;
-    }
-
-    /**
-     * Retrieve HTTP response code
-     *
-     * @return int
-     */
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * Set body content
-     *
-     * @param  string $content
-     * @return \Zend\Feed\PubSubHubbub\HttpResponse
-     */
-    public function setContent($content)
-    {
-        $this->content = (string) $content;
-        $this->setHeader('content-length', strlen($content));
-        return $this;
-    }
-
-    /**
-     * Return the body content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * Normalizes a header name to X-Capitalized-Names
-     *
-     * @param  string $name
-     * @return string
-     */
-    protected function _normalizeHeader($name)
-    {
-        $filtered = str_replace(['-', '_'], ' ', (string) $name);
-        $filtered = ucwords(strtolower($filtered));
-        $filtered = str_replace(' ', '-', $filtered);
-        return $filtered;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
deleted file mode 100644
index 3ebd07f..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Model;
-
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\TableGateway\TableGatewayInterface;
-
-class AbstractModel
-{
-    /**
-     * Zend\Db\TableGateway\TableGatewayInterface instance to host database methods
-     *
-     * @var TableGatewayInterface
-     */
-    protected $db = null;
-
-    /**
-     * Constructor
-     *
-     * @param null|TableGatewayInterface $tableGateway
-     */
-    public function __construct(TableGatewayInterface $tableGateway = null)
-    {
-        if ($tableGateway === null) {
-            $parts = explode('\\', get_class($this));
-            $table = strtolower(array_pop($parts));
-            $this->db = new TableGateway($table, null);
-        } else {
-            $this->db = $tableGateway;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
deleted file mode 100644
index a208616..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Model;
-
-use DateInterval;
-use DateTime;
-use Zend\Feed\PubSubHubbub;
-
-class Subscription extends AbstractModel implements SubscriptionPersistenceInterface
-{
-    /**
-     * Common DateTime object to assist with unit testing
-     *
-     * @var DateTime
-     */
-    protected $now;
-
-    /**
-     * Save subscription to RDMBS
-     *
-     * @param array $data
-     * @return bool
-     * @throws PubSubHubbub\Exception\InvalidArgumentException
-     */
-    public function setSubscription(array $data)
-    {
-        if (!isset($data['id'])) {
-            throw new PubSubHubbub\Exception\InvalidArgumentException(
-                'ID must be set before attempting a save'
-            );
-        }
-        $result = $this->db->select(['id' => $data['id']]);
-        if ($result && (0 < count($result))) {
-            $data['created_time'] = $result->current()->created_time;
-            $now = $this->getNow();
-            if (array_key_exists('lease_seconds', $data)
-                && $data['lease_seconds']
-            ) {
-                $data['expiration_time'] = $now->add(new DateInterval('PT' . $data['lease_seconds'] . 'S'))
-                    ->format('Y-m-d H:i:s');
-            }
-            $this->db->update(
-                $data,
-                ['id' => $data['id']]
-            );
-            return false;
-        }
-
-        $this->db->insert($data);
-        return true;
-    }
-
-    /**
-     * Get subscription by ID/key
-     *
-     * @param  string $key
-     * @return array
-     * @throws PubSubHubbub\Exception\InvalidArgumentException
-     */
-    public function getSubscription($key)
-    {
-        if (empty($key) || !is_string($key)) {
-            throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
-                .' of "' . $key . '" must be a non-empty string');
-        }
-        $result = $this->db->select(['id' => $key]);
-        if (count($result)) {
-            return $result->current()->getArrayCopy();
-        }
-        return false;
-    }
-
-    /**
-     * Determine if a subscription matching the key exists
-     *
-     * @param  string $key
-     * @return bool
-     * @throws PubSubHubbub\Exception\InvalidArgumentException
-     */
-    public function hasSubscription($key)
-    {
-        if (empty($key) || !is_string($key)) {
-            throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
-                .' of "' . $key . '" must be a non-empty string');
-        }
-        $result = $this->db->select(['id' => $key]);
-        if (count($result)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Delete a subscription
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function deleteSubscription($key)
-    {
-        $result = $this->db->select(['id' => $key]);
-        if (count($result)) {
-            $this->db->delete(
-                ['id' => $key]
-            );
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get a new DateTime or the one injected for testing
-     *
-     * @return DateTime
-     */
-    public function getNow()
-    {
-        if (null === $this->now) {
-            return new DateTime();
-        }
-        return $this->now;
-    }
-
-    /**
-     * Set a DateTime instance for assisting with unit testing
-     *
-     * @param DateTime $now
-     * @return Subscription
-     */
-    public function setNow(DateTime $now)
-    {
-        $this->now = $now;
-        return $this;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
deleted file mode 100644
index 09e7d75..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Model;
-
-interface SubscriptionPersistenceInterface
-{
-    /**
-     * Save subscription to RDMBS
-     *
-     * @param array $data The key must be stored here as a $data['id'] entry
-     * @return bool
-     */
-    public function setSubscription(array $data);
-
-    /**
-     * Get subscription by ID/key
-     *
-     * @param  string $key
-     * @return array
-     */
-    public function getSubscription($key);
-
-    /**
-     * Determine if a subscription matching the key exists
-     *
-     * @param  string $key
-     * @return bool
-     */
-    public function hasSubscription($key);
-
-    /**
-     * Delete a subscription
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function deleteSubscription($key);
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
deleted file mode 100644
index a930a70..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-use Zend\Escaper\Escaper;
-use Zend\Feed\Reader;
-use Zend\Http;
-
-class PubSubHubbub
-{
-    /**
-     * Verification Modes
-     */
-    const VERIFICATION_MODE_SYNC  = 'sync';
-    const VERIFICATION_MODE_ASYNC = 'async';
-
-    /**
-     * Subscription States
-     */
-    const SUBSCRIPTION_VERIFIED    = 'verified';
-    const SUBSCRIPTION_NOTVERIFIED = 'not_verified';
-    const SUBSCRIPTION_TODELETE    = 'to_delete';
-
-    /**
-     * @var Escaper
-     */
-    protected static $escaper;
-
-    /**
-     * Singleton instance if required of the HTTP client
-     *
-     * @var Http\Client
-     */
-    protected static $httpClient = null;
-
-    /**
-     * Simple utility function which imports any feed URL and
-     * determines the existence of Hub Server endpoints. This works
-     * best if directly given an instance of Zend\Feed\Reader\Atom|Rss
-     * to leverage off.
-     *
-     * @param  \Zend\Feed\Reader\Feed\AbstractFeed|string $source
-     * @return array
-     * @throws Exception\InvalidArgumentException
-     */
-    public static function detectHubs($source)
-    {
-        if (is_string($source)) {
-            $feed = Reader\Reader::import($source);
-        } elseif ($source instanceof Reader\Feed\AbstractFeed) {
-            $feed = $source;
-        } else {
-            throw new Exception\InvalidArgumentException('The source parameter was'
-            . ' invalid, i.e. not a URL string or an instance of type'
-            . ' Zend\Feed\Reader\Feed\AbstractFeed');
-        }
-        return $feed->getHubs();
-    }
-
-    /**
-     * Allows the external environment to make ZendOAuth use a specific
-     * Client instance.
-     *
-     * @param  Http\Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(Http\Client $httpClient)
-    {
-        static::$httpClient = $httpClient;
-    }
-
-    /**
-     * Return the singleton instance of the HTTP Client. Note that
-     * the instance is reset and cleared of previous parameters GET/POST.
-     * Headers are NOT reset but handled by this component if applicable.
-     *
-     * @return Http\Client
-     */
-    public static function getHttpClient()
-    {
-        if (!isset(static::$httpClient)) {
-            static::$httpClient = new Http\Client;
-        } else {
-            static::$httpClient->resetParameters();
-        }
-        return static::$httpClient;
-    }
-
-    /**
-     * Simple mechanism to delete the entire singleton HTTP Client instance
-     * which forces a new instantiation for subsequent requests.
-     *
-     * @return void
-     */
-    public static function clearHttpClient()
-    {
-        static::$httpClient = null;
-    }
-
-    /**
-     * Set the Escaper instance
-     *
-     * If null, resets the instance
-     *
-     * @param  null|Escaper $escaper
-     */
-    public static function setEscaper(Escaper $escaper = null)
-    {
-        static::$escaper = $escaper;
-    }
-
-    /**
-     * Get the Escaper instance
-     *
-     * If none registered, lazy-loads an instance.
-     *
-     * @return Escaper
-     */
-    public static function getEscaper()
-    {
-        if (null === static::$escaper) {
-            static::setEscaper(new Escaper());
-        }
-        return static::$escaper;
-    }
-
-    /**
-     * RFC 3986 safe url encoding method
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-        $escaper    = static::getEscaper();
-        $rawencoded = $escaper->escapeUrl($string);
-        $rfcencoded = str_replace('%7E', '~', $rawencoded);
-        return $rfcencoded;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
deleted file mode 100644
index aed9c8f..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-use Traversable;
-use Zend\Feed\Uri;
-use Zend\Http\Request as HttpRequest;
-use Zend\Stdlib\ArrayUtils;
-
-class Publisher
-{
-    /**
-     * An array of URLs for all Hub Servers used by the Publisher, and to
-     * which all topic update notifications will be sent.
-     *
-     * @var array
-     */
-    protected $hubUrls = [];
-
-    /**
-     * An array of topic (Atom or RSS feed) URLs which have been updated and
-     * whose updated status will be notified to all Hub Servers.
-     *
-     * @var array
-     */
-    protected $updatedTopicUrls = [];
-
-    /**
-     * An array of any errors including keys for 'response', 'hubUrl'.
-     * The response is the actual Zend\Http\Response object.
-     *
-     * @var array
-     */
-    protected $errors = [];
-
-    /**
-     * An array of topic (Atom or RSS feed) URLs which have been updated and
-     * whose updated status will be notified to all Hub Servers.
-     *
-     * @var array
-     */
-    protected $parameters = [];
-
-    /**
-     * Constructor; accepts an array or Zend\Config\Config instance to preset
-     * options for the Publisher without calling all supported setter
-     * methods in turn.
-     *
-     * @param  array|Traversable $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options !== null) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Traversable $options Options array or Traversable object
-     * @return Publisher
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        }
-
-        if (!is_array($options)) {
-            throw new Exception\InvalidArgumentException('Array or Traversable object'
-                                . 'expected, got ' . gettype($options));
-        }
-        if (array_key_exists('hubUrls', $options)) {
-            $this->addHubUrls($options['hubUrls']);
-        }
-        if (array_key_exists('updatedTopicUrls', $options)) {
-            $this->addUpdatedTopicUrls($options['updatedTopicUrls']);
-        }
-        if (array_key_exists('parameters', $options)) {
-            $this->setParameters($options['parameters']);
-        }
-        return $this;
-    }
-
-    /**
-     * Add a Hub Server URL supported by Publisher
-     *
-     * @param  string $url
-     * @return Publisher
-     * @throws Exception\InvalidArgumentException
-     */
-    public function addHubUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . 'URL');
-        }
-        $this->hubUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Hub Server URLs supported by Publisher
-     *
-     * @param  array $urls
-     * @return Publisher
-     */
-    public function addHubUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHubUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a Hub Server URL
-     *
-     * @param  string $url
-     * @return Publisher
-     */
-    public function removeHubUrl($url)
-    {
-        if (!in_array($url, $this->getHubUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->hubUrls);
-        unset($this->hubUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique Hub Server URLs currently available
-     *
-     * @return array
-     */
-    public function getHubUrls()
-    {
-        $this->hubUrls = array_unique($this->hubUrls);
-        return $this->hubUrls;
-    }
-
-    /**
-     * Add a URL to a topic (Atom or RSS feed) which has been updated
-     *
-     * @param  string $url
-     * @return Publisher
-     * @throws Exception\InvalidArgumentException
-     */
-    public function addUpdatedTopicUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . 'URL');
-        }
-        $this->updatedTopicUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Topic URLs which have been updated
-     *
-     * @param  array $urls
-     * @return Publisher
-     */
-    public function addUpdatedTopicUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addUpdatedTopicUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an updated topic URL
-     *
-     * @param  string $url
-     * @return Publisher
-     */
-    public function removeUpdatedTopicUrl($url)
-    {
-        if (!in_array($url, $this->getUpdatedTopicUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->updatedTopicUrls);
-        unset($this->updatedTopicUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique updated topic URLs currently available
-     *
-     * @return array
-     */
-    public function getUpdatedTopicUrls()
-    {
-        $this->updatedTopicUrls = array_unique($this->updatedTopicUrls);
-        return $this->updatedTopicUrls;
-    }
-
-    /**
-     * Notifies a single Hub Server URL of changes
-     *
-     * @param  string $url The Hub Server's URL
-     * @return void
-     * @throws Exception\InvalidArgumentException
-     * @throws Exception\RuntimeException
-     */
-    public function notifyHub($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . 'URL');
-        }
-        $client = $this->_getHttpClient();
-        $client->setUri($url);
-        $response = $client->getResponse();
-        if ($response->getStatusCode() !== 204) {
-            throw new Exception\RuntimeException('Notification to Hub Server '
-                . 'at "' . $url . '" appears to have failed with a status code of "'
-                . $response->getStatusCode() . '" and message "'
-                . $response->getContent() . '"');
-        }
-    }
-
-    /**
-     * Notifies all Hub Server URLs of changes
-     *
-     * If a Hub notification fails, certain data will be retained in an
-     * an array retrieved using getErrors(), if a failure occurs for any Hubs
-     * the isSuccess() check will return FALSE. This method is designed not
-     * to needlessly fail with an Exception/Error unless from Zend\Http\Client.
-     *
-     * @return void
-     * @throws Exception\RuntimeException
-     */
-    public function notifyAll()
-    {
-        $client = $this->_getHttpClient();
-        $hubs   = $this->getHubUrls();
-        if (empty($hubs)) {
-            throw new Exception\RuntimeException('No Hub Server URLs'
-                . ' have been set so no notifications can be sent');
-        }
-        $this->errors = [];
-        foreach ($hubs as $url) {
-            $client->setUri($url);
-            $response = $client->getResponse();
-            if ($response->getStatusCode() !== 204) {
-                $this->errors[] = [
-                    'response' => $response,
-                    'hubUrl' => $url
-                ];
-            }
-        }
-    }
-
-    /**
-     * Add an optional parameter to the update notification requests
-     *
-     * @param  string $name
-     * @param  string|null $value
-     * @return Publisher
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setParameter($name, $value = null)
-    {
-        if (is_array($name)) {
-            $this->setParameters($name);
-            return $this;
-        }
-        if (empty($name) || !is_string($name)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if ($value === null) {
-            $this->removeParameter($name);
-            return $this;
-        }
-        if (empty($value) || (!is_string($value) && $value !== null)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "value"'
-                . ' of "' . $value . '" must be a non-empty string');
-        }
-        $this->parameters[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the update notification requests
-     *
-     * @param  array $parameters
-     * @return Publisher
-     */
-    public function setParameters(array $parameters)
-    {
-        foreach ($parameters as $name => $value) {
-            $this->setParameter($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an optional parameter for the notification requests
-     *
-     * @param  string $name
-     * @return Publisher
-     * @throws Exception\InvalidArgumentException
-     */
-    public function removeParameter($name)
-    {
-        if (empty($name) || !is_string($name)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if (array_key_exists($name, $this->parameters)) {
-            unset($this->parameters[$name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Return an array of optional parameters for notification requests
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Returns a boolean indicator of whether the notifications to Hub
-     * Servers were ALL successful. If even one failed, FALSE is returned.
-     *
-     * @return bool
-     */
-    public function isSuccess()
-    {
-        return !(count($this->errors) != 0);
-    }
-
-    /**
-     * Return an array of errors met from any failures, including keys:
-     * 'response' => the Zend\Http\Response object from the failure
-     * 'hubUrl' => the URL of the Hub Server whose notification failed
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Get a basic prepared HTTP client for use
-     *
-     * @return \Zend\Http\Client
-     * @throws Exception\RuntimeException
-     */
-    protected function _getHttpClient()
-    {
-        $client = PubSubHubbub::getHttpClient();
-        $client->setMethod(HttpRequest::METHOD_POST);
-        $client->setOptions([
-            'useragent' => 'Zend_Feed_Pubsubhubbub_Publisher/' . Version::VERSION,
-        ]);
-        $params   = [];
-        $params[] = 'hub.mode=publish';
-        $topics   = $this->getUpdatedTopicUrls();
-        if (empty($topics)) {
-            throw new Exception\RuntimeException('No updated topic URLs'
-                . ' have been set');
-        }
-        foreach ($topics as $topicUrl) {
-            $params[] = 'hub.url=' . urlencode($topicUrl);
-        }
-        $optParams = $this->getParameters();
-        foreach ($optParams as $name => $value) {
-            $params[] = urlencode($name) . '=' . urlencode($value);
-        }
-        $paramString = implode('&', $params);
-        $client->setRawBody($paramString);
-        return $client;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
deleted file mode 100644
index 802a001..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
+++ /dev/null
@@ -1,837 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-use DateInterval;
-use DateTime;
-use Traversable;
-use Zend\Feed\Uri;
-use Zend\Http\Request as HttpRequest;
-use Zend\Stdlib\ArrayUtils;
-
-class Subscriber
-{
-    /**
-     * An array of URLs for all Hub Servers to subscribe/unsubscribe.
-     *
-     * @var array
-     */
-    protected $hubUrls = [];
-
-    /**
-     * An array of optional parameters to be included in any
-     * (un)subscribe requests.
-     *
-     * @var array
-     */
-    protected $parameters = [];
-
-    /**
-     * The URL of the topic (Rss or Atom feed) which is the subject of
-     * our current intent to subscribe to/unsubscribe from updates from
-     * the currently configured Hub Servers.
-     *
-     * @var string
-     */
-    protected $topicUrl = '';
-
-    /**
-     * The URL Hub Servers must use when communicating with this Subscriber
-     *
-     * @var string
-     */
-    protected $callbackUrl = '';
-
-    /**
-     * The number of seconds for which the subscriber would like to have the
-     * subscription active. Defaults to null, i.e. not sent, to setup a
-     * permanent subscription if possible.
-     *
-     * @var int
-     */
-    protected $leaseSeconds = null;
-
-    /**
-     * The preferred verification mode (sync or async). By default, this
-     * Subscriber prefers synchronous verification, but is considered
-     * desirable to support asynchronous verification if possible.
-     *
-     * Zend\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
-     * order of occurrence in the parameter list determines this preference.
-     *
-     * @var string
-     */
-    protected $preferredVerificationMode = PubSubHubbub::VERIFICATION_MODE_SYNC;
-
-    /**
-     * An array of any errors including keys for 'response', 'hubUrl'.
-     * The response is the actual Zend\Http\Response object.
-     *
-     * @var array
-     */
-    protected $errors = [];
-
-    /**
-     * An array of Hub Server URLs for Hubs operating at this time in
-     * asynchronous verification mode.
-     *
-     * @var array
-     */
-    protected $asyncHubs = [];
-
-    /**
-     * An instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
-     * save any verification tokens associated with a subscription or other.
-     *
-     * @var \Zend\Feed\PubSubHubbub\Model\SubscriptionPersistenceInterface
-     */
-    protected $storage = null;
-
-    /**
-     * An array of authentication credentials for HTTP Basic Authentication
-     * if required by specific Hubs. The array is indexed by Hub Endpoint URI
-     * and the value is a simple array of the username and password to apply.
-     *
-     * @var array
-     */
-    protected $authentications = [];
-
-    /**
-     * Tells the Subscriber to append any subscription identifier to the path
-     * of the base Callback URL. E.g. an identifier "subkey1" would be added
-     * to the callback URL "http://www.example.com/callback" to create a subscription
-     * specific Callback URL of "http://www.example.com/callback/subkey1".
-     *
-     * This is required for all Hubs using the Pubsubhubbub 0.1 Specification.
-     * It should be manually intercepted and passed to the Callback class using
-     * Zend\Feed\Pubsubhubbub\Subscriber\Callback::setSubscriptionKey(). Will
-     * require a route in the form "callback/:subkey" to allow the parameter be
-     * retrieved from an action using the Zend\Controller\Action::\getParam()
-     * method.
-     *
-     * @var string
-     */
-    protected $usePathParameter = false;
-
-    /**
-     * Constructor; accepts an array or Traversable instance to preset
-     * options for the Subscriber without calling all supported setter
-     * methods in turn.
-     *
-     * @param  array|Traversable $options
-     */
-    public function __construct($options = null)
-    {
-        if ($options !== null) {
-            $this->setOptions($options);
-        }
-    }
-
-    /**
-     * Process any injected configuration options
-     *
-     * @param  array|Traversable $options
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        }
-
-        if (!is_array($options)) {
-            throw new Exception\InvalidArgumentException('Array or Traversable object'
-                                . 'expected, got ' . gettype($options));
-        }
-        if (array_key_exists('hubUrls', $options)) {
-            $this->addHubUrls($options['hubUrls']);
-        }
-        if (array_key_exists('callbackUrl', $options)) {
-            $this->setCallbackUrl($options['callbackUrl']);
-        }
-        if (array_key_exists('topicUrl', $options)) {
-            $this->setTopicUrl($options['topicUrl']);
-        }
-        if (array_key_exists('storage', $options)) {
-            $this->setStorage($options['storage']);
-        }
-        if (array_key_exists('leaseSeconds', $options)) {
-            $this->setLeaseSeconds($options['leaseSeconds']);
-        }
-        if (array_key_exists('parameters', $options)) {
-            $this->setParameters($options['parameters']);
-        }
-        if (array_key_exists('authentications', $options)) {
-            $this->addAuthentications($options['authentications']);
-        }
-        if (array_key_exists('usePathParameter', $options)) {
-            $this->usePathParameter($options['usePathParameter']);
-        }
-        if (array_key_exists('preferredVerificationMode', $options)) {
-            $this->setPreferredVerificationMode(
-                $options['preferredVerificationMode']
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Set the topic URL (RSS or Atom feed) to which the intended (un)subscribe
-     * event will relate
-     *
-     * @param  string $url
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setTopicUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                .' of "' . $url . '" must be a non-empty string and a valid'
-                .' URL');
-        }
-        $this->topicUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Set the topic URL (RSS or Atom feed) to which the intended (un)subscribe
-     * event will relate
-     *
-     * @return string
-     * @throws Exception\RuntimeException
-     */
-    public function getTopicUrl()
-    {
-        if (empty($this->topicUrl)) {
-            throw new Exception\RuntimeException('A valid Topic (RSS or Atom'
-                . ' feed) URL MUST be set before attempting any operation');
-        }
-        return $this->topicUrl;
-    }
-
-    /**
-     * Set the number of seconds for which any subscription will remain valid
-     *
-     * @param  int $seconds
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setLeaseSeconds($seconds)
-    {
-        $seconds = intval($seconds);
-        if ($seconds <= 0) {
-            throw new Exception\InvalidArgumentException('Expected lease seconds'
-                . ' must be an integer greater than zero');
-        }
-        $this->leaseSeconds = $seconds;
-        return $this;
-    }
-
-    /**
-     * Get the number of lease seconds on subscriptions
-     *
-     * @return int
-     */
-    public function getLeaseSeconds()
-    {
-        return $this->leaseSeconds;
-    }
-
-    /**
-     * Set the callback URL to be used by Hub Servers when communicating with
-     * this Subscriber
-     *
-     * @param  string $url
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setCallbackUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->callbackUrl = $url;
-        return $this;
-    }
-
-    /**
-     * Get the callback URL to be used by Hub Servers when communicating with
-     * this Subscriber
-     *
-     * @return string
-     * @throws Exception\RuntimeException
-     */
-    public function getCallbackUrl()
-    {
-        if (empty($this->callbackUrl)) {
-            throw new Exception\RuntimeException('A valid Callback URL MUST be'
-                . ' set before attempting any operation');
-        }
-        return $this->callbackUrl;
-    }
-
-    /**
-     * Set preferred verification mode (sync or async). By default, this
-     * Subscriber prefers synchronous verification, but does support
-     * asynchronous if that's the Hub Server's utilised mode.
-     *
-     * Zend\Feed\Pubsubhubbub\Subscriber will always send both modes, whose
-     * order of occurrence in the parameter list determines this preference.
-     *
-     * @param  string $mode Should be 'sync' or 'async'
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setPreferredVerificationMode($mode)
-    {
-        if ($mode !== PubSubHubbub::VERIFICATION_MODE_SYNC
-            && $mode !== PubSubHubbub::VERIFICATION_MODE_ASYNC
-        ) {
-            throw new Exception\InvalidArgumentException('Invalid preferred'
-                . ' mode specified: "' . $mode . '" but should be one of'
-                . ' Zend\Feed\Pubsubhubbub::VERIFICATION_MODE_SYNC or'
-                . ' Zend\Feed\Pubsubhubbub::VERIFICATION_MODE_ASYNC');
-        }
-        $this->preferredVerificationMode = $mode;
-        return $this;
-    }
-
-    /**
-     * Get preferred verification mode (sync or async).
-     *
-     * @return string
-     */
-    public function getPreferredVerificationMode()
-    {
-        return $this->preferredVerificationMode;
-    }
-
-    /**
-     * Add a Hub Server URL supported by Publisher
-     *
-     * @param  string $url
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function addHubUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->hubUrls[] = $url;
-        return $this;
-    }
-
-    /**
-     * Add an array of Hub Server URLs supported by Publisher
-     *
-     * @param  array $urls
-     * @return Subscriber
-     */
-    public function addHubUrls(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHubUrl($url);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove a Hub Server URL
-     *
-     * @param  string $url
-     * @return Subscriber
-     */
-    public function removeHubUrl($url)
-    {
-        if (!in_array($url, $this->getHubUrls())) {
-            return $this;
-        }
-        $key = array_search($url, $this->hubUrls);
-        unset($this->hubUrls[$key]);
-        return $this;
-    }
-
-    /**
-     * Return an array of unique Hub Server URLs currently available
-     *
-     * @return array
-     */
-    public function getHubUrls()
-    {
-        $this->hubUrls = array_unique($this->hubUrls);
-        return $this->hubUrls;
-    }
-
-    /**
-     * Add authentication credentials for a given URL
-     *
-     * @param  string $url
-     * @param  array $authentication
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function addAuthentication($url, array $authentication)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "url"'
-                . ' of "' . $url . '" must be a non-empty string and a valid'
-                . ' URL');
-        }
-        $this->authentications[$url] = $authentication;
-        return $this;
-    }
-
-    /**
-     * Add authentication credentials for hub URLs
-     *
-     * @param  array $authentications
-     * @return Subscriber
-     */
-    public function addAuthentications(array $authentications)
-    {
-        foreach ($authentications as $url => $authentication) {
-            $this->addAuthentication($url, $authentication);
-        }
-        return $this;
-    }
-
-    /**
-     * Get all hub URL authentication credentials
-     *
-     * @return array
-     */
-    public function getAuthentications()
-    {
-        return $this->authentications;
-    }
-
-    /**
-     * Set flag indicating whether or not to use a path parameter
-     *
-     * @param  bool $bool
-     * @return Subscriber
-     */
-    public function usePathParameter($bool = true)
-    {
-        $this->usePathParameter = $bool;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the (un)subscribe requests
-     *
-     * @param  string $name
-     * @param  string|null $value
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setParameter($name, $value = null)
-    {
-        if (is_array($name)) {
-            $this->setParameters($name);
-            return $this;
-        }
-        if (empty($name) || !is_string($name)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if ($value === null) {
-            $this->removeParameter($name);
-            return $this;
-        }
-        if (empty($value) || (!is_string($value) && $value !== null)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "value"'
-                . ' of "' . $value . '" must be a non-empty string');
-        }
-        $this->parameters[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * Add an optional parameter to the (un)subscribe requests
-     *
-     * @param  array $parameters
-     * @return Subscriber
-     */
-    public function setParameters(array $parameters)
-    {
-        foreach ($parameters as $name => $value) {
-            $this->setParameter($name, $value);
-        }
-        return $this;
-    }
-
-    /**
-     * Remove an optional parameter for the (un)subscribe requests
-     *
-     * @param  string $name
-     * @return Subscriber
-     * @throws Exception\InvalidArgumentException
-     */
-    public function removeParameter($name)
-    {
-        if (empty($name) || !is_string($name)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter "name"'
-                . ' of "' . $name . '" must be a non-empty string');
-        }
-        if (array_key_exists($name, $this->parameters)) {
-            unset($this->parameters[$name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Return an array of optional parameters for (un)subscribe requests
-     *
-     * @return array
-     */
-    public function getParameters()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Sets an instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
-     * save any verification tokens associated with a subscription or other.
-     *
-     * @param  Model\SubscriptionPersistenceInterface $storage
-     * @return Subscriber
-     */
-    public function setStorage(Model\SubscriptionPersistenceInterface $storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
-
-    /**
-     * Gets an instance of Zend\Feed\Pubsubhubbub\Storage\StoragePersistence used
-     * to background save any verification tokens associated with a subscription
-     * or other.
-     *
-     * @return Model\SubscriptionPersistenceInterface
-     * @throws Exception\RuntimeException
-     */
-    public function getStorage()
-    {
-        if ($this->storage === null) {
-            throw new Exception\RuntimeException('No storage vehicle '
-                . 'has been set.');
-        }
-        return $this->storage;
-    }
-
-    /**
-     * Subscribe to one or more Hub Servers using the stored Hub URLs
-     * for the given Topic URL (RSS or Atom feed)
-     *
-     * @return void
-     */
-    public function subscribeAll()
-    {
-        $this->_doRequest('subscribe');
-    }
-
-    /**
-     * Unsubscribe from one or more Hub Servers using the stored Hub URLs
-     * for the given Topic URL (RSS or Atom feed)
-     *
-     * @return void
-     */
-    public function unsubscribeAll()
-    {
-        $this->_doRequest('unsubscribe');
-    }
-
-    /**
-     * Returns a boolean indicator of whether the notifications to Hub
-     * Servers were ALL successful. If even one failed, FALSE is returned.
-     *
-     * @return bool
-     */
-    public function isSuccess()
-    {
-        if (count($this->errors) > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return an array of errors met from any failures, including keys:
-     * 'response' => the Zend\Http\Response object from the failure
-     * 'hubUrl' => the URL of the Hub Server whose notification failed
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Return an array of Hub Server URLs who returned a response indicating
-     * operation in Asynchronous Verification Mode, i.e. they will not confirm
-     * any (un)subscription immediately but at a later time (Hubs may be
-     * doing this as a batch process when load balancing)
-     *
-     * @return array
-     */
-    public function getAsyncHubs()
-    {
-        return $this->asyncHubs;
-    }
-
-    /**
-     * Executes an (un)subscribe request
-     *
-     * @param  string $mode
-     * @return void
-     * @throws Exception\RuntimeException
-     */
-    protected function _doRequest($mode)
-    {
-        $client = $this->_getHttpClient();
-        $hubs   = $this->getHubUrls();
-        if (empty($hubs)) {
-            throw new Exception\RuntimeException('No Hub Server URLs'
-                . ' have been set so no subscriptions can be attempted');
-        }
-        $this->errors = [];
-        $this->asyncHubs = [];
-        foreach ($hubs as $url) {
-            if (array_key_exists($url, $this->authentications)) {
-                $auth = $this->authentications[$url];
-                $client->setAuth($auth[0], $auth[1]);
-            }
-            $client->setUri($url);
-            $client->setRawBody($params = $this->_getRequestParameters($url, $mode));
-            $response = $client->send();
-            if ($response->getStatusCode() !== 204
-                && $response->getStatusCode() !== 202
-            ) {
-                $this->errors[] = [
-                    'response' => $response,
-                    'hubUrl'   => $url,
-                ];
-            /**
-             * At first I thought it was needed, but the backend storage will
-             * allow tracking async without any user interference. It's left
-             * here in case the user is interested in knowing what Hubs
-             * are using async verification modes so they may update Models and
-             * move these to asynchronous processes.
-             */
-            } elseif ($response->getStatusCode() == 202) {
-                $this->asyncHubs[] = [
-                    'response' => $response,
-                    'hubUrl'   => $url,
-                ];
-            }
-        }
-    }
-
-    /**
-     * Get a basic prepared HTTP client for use
-     *
-     * @return \Zend\Http\Client
-     */
-    protected function _getHttpClient()
-    {
-        $client = PubSubHubbub::getHttpClient();
-        $client->setMethod(HttpRequest::METHOD_POST);
-        $client->setOptions(['useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
-            . Version::VERSION]);
-        return $client;
-    }
-
-    /**
-     * Return a list of standard protocol/optional parameters for addition to
-     * client's POST body that are specific to the current Hub Server URL
-     *
-     * @param  string $hubUrl
-     * @param  string $mode
-     * @return string
-     * @throws Exception\InvalidArgumentException
-     */
-    protected function _getRequestParameters($hubUrl, $mode)
-    {
-        if (!in_array($mode, ['subscribe', 'unsubscribe'])) {
-            throw new Exception\InvalidArgumentException('Invalid mode specified: "'
-                . $mode . '" which should have been "subscribe" or "unsubscribe"');
-        }
-
-        $params = [
-            'hub.mode'  => $mode,
-            'hub.topic' => $this->getTopicUrl(),
-        ];
-
-        if ($this->getPreferredVerificationMode()
-                == PubSubHubbub::VERIFICATION_MODE_SYNC
-        ) {
-            $vmodes = [
-                PubSubHubbub::VERIFICATION_MODE_SYNC,
-                PubSubHubbub::VERIFICATION_MODE_ASYNC,
-            ];
-        } else {
-            $vmodes = [
-                PubSubHubbub::VERIFICATION_MODE_ASYNC,
-                PubSubHubbub::VERIFICATION_MODE_SYNC,
-            ];
-        }
-        $params['hub.verify'] = [];
-        foreach ($vmodes as $vmode) {
-            $params['hub.verify'][] = $vmode;
-        }
-
-        /**
-         * Establish a persistent verify_token and attach key to callback
-         * URL's path/query_string
-         */
-        $key   = $this->_generateSubscriptionKey($params, $hubUrl);
-        $token = $this->_generateVerifyToken();
-        $params['hub.verify_token'] = $token;
-
-        // Note: query string only usable with PuSH 0.2 Hubs
-        if (!$this->usePathParameter) {
-            $params['hub.callback'] = $this->getCallbackUrl()
-                . '?xhub.subscription=' . PubSubHubbub::urlencode($key);
-        } else {
-            $params['hub.callback'] = rtrim($this->getCallbackUrl(), '/')
-                . '/' . PubSubHubbub::urlencode($key);
-        }
-        if ($mode == 'subscribe' && $this->getLeaseSeconds() !== null) {
-            $params['hub.lease_seconds'] = $this->getLeaseSeconds();
-        }
-
-        // hub.secret not currently supported
-        $optParams = $this->getParameters();
-        foreach ($optParams as $name => $value) {
-            $params[$name] = $value;
-        }
-
-        // store subscription to storage
-        $now = new DateTime();
-        $expires = null;
-        if (isset($params['hub.lease_seconds'])) {
-            $expires = $now->add(new DateInterval('PT' . $params['hub.lease_seconds'] . 'S'))
-                ->format('Y-m-d H:i:s');
-        }
-        $data = [
-            'id'                 => $key,
-            'topic_url'          => $params['hub.topic'],
-            'hub_url'            => $hubUrl,
-            'created_time'       => $now->format('Y-m-d H:i:s'),
-            'lease_seconds'      => $params['hub.lease_seconds'],
-            'verify_token'       => hash('sha256', $params['hub.verify_token']),
-            'secret'             => null,
-            'expiration_time'    => $expires,
-            'subscription_state' => ($mode == 'unsubscribe')? PubSubHubbub::SUBSCRIPTION_TODELETE : PubSubHubbub::SUBSCRIPTION_NOTVERIFIED,
-        ];
-        $this->getStorage()->setSubscription($data);
-
-        return $this->_toByteValueOrderedString(
-            $this->_urlEncode($params)
-        );
-    }
-
-    /**
-     * Simple helper to generate a verification token used in (un)subscribe
-     * requests to a Hub Server. Follows no particular method, which means
-     * it might be improved/changed in future.
-     *
-     * @return string
-     */
-    protected function _generateVerifyToken()
-    {
-        if (!empty($this->testStaticToken)) {
-            return $this->testStaticToken;
-        }
-        return uniqid(rand(), true) . time();
-    }
-
-    /**
-     * Simple helper to generate a verification token used in (un)subscribe
-     * requests to a Hub Server.
-     *
-     * @param array   $params
-     * @param string $hubUrl The Hub Server URL for which this token will apply
-     * @return string
-     */
-    protected function _generateSubscriptionKey(array $params, $hubUrl)
-    {
-        $keyBase = $params['hub.topic'] . $hubUrl;
-        $key     = md5($keyBase);
-
-        return $key;
-    }
-
-    /**
-     * URL Encode an array of parameters
-     *
-     * @param  array $params
-     * @return array
-     */
-    protected function _urlEncode(array $params)
-    {
-        $encoded = [];
-        foreach ($params as $key => $value) {
-            if (is_array($value)) {
-                $ekey = PubSubHubbub::urlencode($key);
-                $encoded[$ekey] = [];
-                foreach ($value as $duplicateKey) {
-                    $encoded[$ekey][]
-                        = PubSubHubbub::urlencode($duplicateKey);
-                }
-            } else {
-                $encoded[PubSubHubbub::urlencode($key)]
-                    = PubSubHubbub::urlencode($value);
-            }
-        }
-        return $encoded;
-    }
-
-    /**
-     * Order outgoing parameters
-     *
-     * @param  array $params
-     * @return array
-     */
-    protected function _toByteValueOrderedString(array $params)
-    {
-        $return = [];
-        uksort($params, 'strnatcmp');
-        foreach ($params as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $keyduplicate) {
-                    $return[] = $key . '=' . $keyduplicate;
-                }
-            } else {
-                $return[] = $key . '=' . $value;
-            }
-        }
-        return implode('&', $return);
-    }
-
-    /**
-     * This is STRICTLY for testing purposes only...
-     */
-    protected $testStaticToken = null;
-
-    final public function setTestStaticToken($token)
-    {
-        $this->testStaticToken = (string) $token;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
deleted file mode 100644
index 56c06c7..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub\Subscriber;
-
-use Zend\Feed\PubSubHubbub;
-use Zend\Feed\PubSubHubbub\Exception;
-use Zend\Feed\Uri;
-
-class Callback extends PubSubHubbub\AbstractCallback
-{
-    /**
-     * Contains the content of any feeds sent as updates to the Callback URL
-     *
-     * @var string
-     */
-    protected $feedUpdate = null;
-
-    /**
-     * Holds a manually set subscription key (i.e. identifies a unique
-     * subscription) which is typical when it is not passed in the query string
-     * but is part of the Callback URL path, requiring manual retrieval e.g.
-     * using a route and the \Zend\Mvc\Router\RouteMatch::getParam() method.
-     *
-     * @var string
-     */
-    protected $subscriptionKey = null;
-
-    /**
-     * After verification, this is set to the verified subscription's data.
-     *
-     * @var array
-     */
-    protected $currentSubscriptionData = null;
-
-    /**
-     * Set a subscription key to use for the current callback request manually.
-     * Required if usePathParameter is enabled for the Subscriber.
-     *
-     * @param  string $key
-     * @return \Zend\Feed\PubSubHubbub\Subscriber\Callback
-     */
-    public function setSubscriptionKey($key)
-    {
-        $this->subscriptionKey = $key;
-        return $this;
-    }
-
-    /**
-     * Handle any callback from a Hub Server responding to a subscription or
-     * unsubscription request. This should be the Hub Server confirming the
-     * the request prior to taking action on it.
-     *
-     * @param  array $httpGetData GET data if available and not in $_GET
-     * @param  bool $sendResponseNow Whether to send response now or when asked
-     * @return void
-     */
-    public function handle(array $httpGetData = null, $sendResponseNow = false)
-    {
-        if ($httpGetData === null) {
-            $httpGetData = $_GET;
-        }
-
-        /**
-         * Handle any feed updates (sorry for the mess :P)
-         *
-         * This DOES NOT attempt to process a feed update. Feed updates
-         * SHOULD be validated/processed by an asynchronous process so as
-         * to avoid holding up responses to the Hub.
-         */
-        $contentType = $this->_getHeader('Content-Type');
-        if (strtolower($_SERVER['REQUEST_METHOD']) == 'post'
-            && $this->_hasValidVerifyToken(null, false)
-            && (stripos($contentType, 'application/atom+xml') === 0
-                || stripos($contentType, 'application/rss+xml') === 0
-                || stripos($contentType, 'application/xml') === 0
-                || stripos($contentType, 'text/xml') === 0
-                || stripos($contentType, 'application/rdf+xml') === 0)
-        ) {
-            $this->setFeedUpdate($this->_getRawBody());
-            $this->getHttpResponse()->setHeader('X-Hub-On-Behalf-Of', $this->getSubscriberCount());
-        /**
-         * Handle any (un)subscribe confirmation requests
-         */
-        } elseif ($this->isValidHubVerification($httpGetData)) {
-            $this->getHttpResponse()->setContent($httpGetData['hub_challenge']);
-
-            switch (strtolower($httpGetData['hub_mode'])) {
-                case 'subscribe':
-                    $data = $this->currentSubscriptionData;
-                    $data['subscription_state'] = PubSubHubbub\PubSubHubbub::SUBSCRIPTION_VERIFIED;
-                    if (isset($httpGetData['hub_lease_seconds'])) {
-                        $data['lease_seconds'] = $httpGetData['hub_lease_seconds'];
-                    }
-                    $this->getStorage()->setSubscription($data);
-                    break;
-                case 'unsubscribe':
-                    $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
-                    $this->getStorage()->deleteSubscription($verifyTokenKey);
-                    break;
-                default:
-                    throw new Exception\RuntimeException(sprintf(
-                        'Invalid hub_mode ("%s") provided',
-                        $httpGetData['hub_mode']
-                    ));
-            }
-        /**
-         * Hey, C'mon! We tried everything else!
-         */
-        } else {
-            $this->getHttpResponse()->setStatusCode(404);
-        }
-
-        if ($sendResponseNow) {
-            $this->sendResponse();
-        }
-    }
-
-    /**
-     * Checks validity of the request simply by making a quick pass and
-     * confirming the presence of all REQUIRED parameters.
-     *
-     * @param  array $httpGetData
-     * @return bool
-     */
-    public function isValidHubVerification(array $httpGetData)
-    {
-        /**
-         * As per the specification, the hub.verify_token is OPTIONAL. This
-         * implementation of Pubsubhubbub considers it REQUIRED and will
-         * always send a hub.verify_token parameter to be echoed back
-         * by the Hub Server. Therefore, its absence is considered invalid.
-         */
-        if (strtolower($_SERVER['REQUEST_METHOD']) !== 'get') {
-            return false;
-        }
-        $required = [
-            'hub_mode',
-            'hub_topic',
-            'hub_challenge',
-            'hub_verify_token',
-        ];
-        foreach ($required as $key) {
-            if (!array_key_exists($key, $httpGetData)) {
-                return false;
-            }
-        }
-        if ($httpGetData['hub_mode'] !== 'subscribe'
-            && $httpGetData['hub_mode'] !== 'unsubscribe'
-        ) {
-            return false;
-        }
-        if ($httpGetData['hub_mode'] == 'subscribe'
-            && !array_key_exists('hub_lease_seconds', $httpGetData)
-        ) {
-            return false;
-        }
-        if (!Uri::factory($httpGetData['hub_topic'])->isValid()) {
-            return false;
-        }
-
-        /**
-         * Attempt to retrieve any Verification Token Key attached to Callback
-         * URL's path by our Subscriber implementation
-         */
-        if (!$this->_hasValidVerifyToken($httpGetData)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Sets a newly received feed (Atom/RSS) sent by a Hub as an update to a
-     * Topic we've subscribed to.
-     *
-     * @param  string $feed
-     * @return \Zend\Feed\PubSubHubbub\Subscriber\Callback
-     */
-    public function setFeedUpdate($feed)
-    {
-        $this->feedUpdate = $feed;
-        return $this;
-    }
-
-    /**
-     * Check if any newly received feed (Atom/RSS) update was received
-     *
-     * @return bool
-     */
-    public function hasFeedUpdate()
-    {
-        if ($this->feedUpdate === null) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Gets a newly received feed (Atom/RSS) sent by a Hub as an update to a
-     * Topic we've subscribed to.
-     *
-     * @return string
-     */
-    public function getFeedUpdate()
-    {
-        return $this->feedUpdate;
-    }
-
-    /**
-     * Check for a valid verify_token. By default attempts to compare values
-     * with that sent from Hub, otherwise merely ascertains its existence.
-     *
-     * @param  array $httpGetData
-     * @param  bool $checkValue
-     * @return bool
-     */
-    protected function _hasValidVerifyToken(array $httpGetData = null, $checkValue = true)
-    {
-        $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
-        if (empty($verifyTokenKey)) {
-            return false;
-        }
-        $verifyTokenExists = $this->getStorage()->hasSubscription($verifyTokenKey);
-        if (!$verifyTokenExists) {
-            return false;
-        }
-        if ($checkValue) {
-            $data = $this->getStorage()->getSubscription($verifyTokenKey);
-            $verifyToken = $data['verify_token'];
-            if ($verifyToken !== hash('sha256', $httpGetData['hub_verify_token'])) {
-                return false;
-            }
-            $this->currentSubscriptionData = $data;
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     * Attempt to detect the verification token key. This would be passed in
-     * the Callback URL (which we are handling with this class!) as a URI
-     * path part (the last part by convention).
-     *
-     * @param  null|array $httpGetData
-     * @return false|string
-     */
-    protected function _detectVerifyTokenKey(array $httpGetData = null)
-    {
-        /**
-         * Available when sub keys encoding in Callback URL path
-         */
-        if (isset($this->subscriptionKey)) {
-            return $this->subscriptionKey;
-        }
-
-        /**
-         * Available only if allowed by PuSH 0.2 Hubs
-         */
-        if (is_array($httpGetData)
-            && isset($httpGetData['xhub_subscription'])
-        ) {
-            return $httpGetData['xhub_subscription'];
-        }
-
-        /**
-         * Available (possibly) if corrupted in transit and not part of $_GET
-         */
-        $params = $this->_parseQueryString();
-        if (isset($params['xhub.subscription'])) {
-            return rawurldecode($params['xhub.subscription']);
-        }
-
-        return false;
-    }
-
-    /**
-     * Build an array of Query String parameters.
-     * This bypasses $_GET which munges parameter names and cannot accept
-     * multiple parameters with the same key.
-     *
-     * @return array|void
-     */
-    protected function _parseQueryString()
-    {
-        $params      = [];
-        $queryString = '';
-        if (isset($_SERVER['QUERY_STRING'])) {
-            $queryString = $_SERVER['QUERY_STRING'];
-        }
-        if (empty($queryString)) {
-            return [];
-        }
-        $parts = explode('&', $queryString);
-        foreach ($parts as $kvpair) {
-            $pair  = explode('=', $kvpair);
-            $key   = rawurldecode($pair[0]);
-            $value = rawurldecode($pair[1]);
-            if (isset($params[$key])) {
-                if (is_array($params[$key])) {
-                    $params[$key][] = $value;
-                } else {
-                    $params[$key] = [$params[$key], $value];
-                }
-            } else {
-                $params[$key] = $value;
-            }
-        }
-        return $params;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
deleted file mode 100644
index 9ac7fb4..0000000
--- a/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\PubSubHubbub;
-
-abstract class Version
-{
-    const VERSION = '2';
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
deleted file mode 100644
index a706ff8..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-
-abstract class AbstractEntry
-{
-    /**
-     * Feed entry data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * DOM document object
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * Entry instance
-     *
-     * @var DOMElement
-     */
-    protected $entry = null;
-
-    /**
-     * Pointer to the current entry
-     *
-     * @var int
-     */
-    protected $entryKey = 0;
-
-    /**
-     * XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * Registered extensions
-     *
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  int $entryKey
-     * @param  null|string $type
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        $this->entry       = $entry;
-        $this->entryKey    = $entryKey;
-        $this->domDocument = $entry->ownerDocument;
-        if ($type !== null) {
-            $this->data['type'] = $type;
-        } else {
-            $this->data['type'] = Reader::detectType($entry);
-        }
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the entry element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->entry;
-    }
-
-    /**
-     * Get the Entry's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get entry as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        $entry = $dom->importNode($this->getElement(), true);
-        $dom->appendChild($entry);
-        return $dom->saveXml();
-    }
-
-    /**
-     * Get the entry type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->data['type'];
-    }
-
-    /**
-     * Get the XPath query object
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        if (!$this->xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-        return $this->xpath;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return \Zend\Feed\Reader\AbstractEntry
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->xpath = $xpath;
-        return $this;
-    }
-
-    /**
-     * Get registered extensions
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Entry)
-     *
-     * @param string $name
-     * @return \Zend\Feed\Reader\Extension\AbstractEntry
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '\Entry', $this->extensions)) {
-            return $this->extensions[$name . '\Entry'];
-        }
-        return;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\BadMethodCallException if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array([$extension, $method], $args);
-            }
-        }
-        throw new Exception\BadMethodCallException('Method: ' . $method
-            . 'does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Load extensions from Zend\Feed\Reader\Reader
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all = Reader::getExtensions();
-        $feed = $all['entry'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            $className = Reader::getPluginLoader()->getClassName($extension);
-            $this->extensions[$extension] = new $className(
-                $this->getElement(), $this->entryKey, $this->data['type']
-            );
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
deleted file mode 100644
index 8cc2347..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-
-abstract class AbstractFeed implements Feed\FeedInterface
-{
-    /**
-     * Parsed feed data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Parsed feed data in the shape of a DOMDocument
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * An array of parsed feed entries
-     *
-     * @var array
-     */
-    protected $entries = [];
-
-    /**
-     * A pointer for the iterator to keep track of the entries array
-     *
-     * @var int
-     */
-    protected $entriesKey = 0;
-
-    /**
-     * The base XPath query used to retrieve feed data
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * Array of loaded extensions
-     *
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * Original Source URI (set if imported from a URI)
-     *
-     * @var string
-     */
-    protected $originalSourceUri = null;
-
-    /**
-     * Constructor
-     *
-     * @param DomDocument $domDocument The DOM object for the feed's XML
-     * @param string $type Feed type
-     */
-    public function __construct(DOMDocument $domDocument, $type = null)
-    {
-        $this->domDocument = $domDocument;
-        $this->xpath = new DOMXPath($this->domDocument);
-
-        if ($type !== null) {
-            $this->data['type'] = $type;
-        } else {
-            $this->data['type'] = Reader::detectType($this->domDocument);
-        }
-        $this->registerNamespaces();
-        $this->indexEntries();
-        $this->loadExtensions();
-    }
-
-    /**
-     * Set an original source URI for the feed being parsed. This value
-     * is returned from getFeedLink() method if the feed does not carry
-     * a self-referencing URI.
-     *
-     * @param string $uri
-     */
-    public function setOriginalSourceUri($uri)
-    {
-        $this->originalSourceUri = $uri;
-    }
-
-    /**
-     * Get an original source URI for the feed being parsed. Returns null if
-     * unset or the feed was not imported from a URI.
-     *
-     * @return string|null
-     */
-    public function getOriginalSourceUri()
-    {
-        return $this->originalSourceUri;
-    }
-
-    /**
-     * Get the number of feed entries.
-     * Required by the Iterator interface.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->entries);
-    }
-
-    /**
-     * Return the current entry
-     *
-     * @return \Zend\Feed\Reader\AbstractEntry
-     */
-    public function current()
-    {
-        if (substr($this->getType(), 0, 3) == 'rss') {
-            $reader = new Entry\RSS($this->entries[$this->key()], $this->key(), $this->getType());
-        } else {
-            $reader = new Entry\Atom($this->entries[$this->key()], $this->key(), $this->getType());
-        }
-
-        $reader->setXpath($this->xpath);
-
-        return $reader;
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the Feed's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get feed as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        return $this->getDomDocument()->saveXml();
-    }
-
-    /**
-     * Get the DOMElement representing the items/feed element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->getDomDocument()->documentElement;
-    }
-
-    /**
-     * Get the DOMXPath object for this feed
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        return $this->xpath;
-    }
-
-    /**
-     * Get the feed type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->data['type'];
-    }
-
-    /**
-     * Return the current feed key
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->entriesKey;
-    }
-
-    /**
-     * Move the feed pointer forward
-     *
-     */
-    public function next()
-    {
-        ++$this->entriesKey;
-    }
-
-    /**
-     * Reset the pointer in the feed object
-     *
-     */
-    public function rewind()
-    {
-        $this->entriesKey = 0;
-    }
-
-    /**
-     * Check to see if the iterator is still valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return 0 <= $this->entriesKey && $this->entriesKey < $this->count();
-    }
-
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array([$extension, $method], $args);
-            }
-        }
-        throw new Exception\BadMethodCallException('Method: ' . $method
-        . 'does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Feed)
-     *
-     * @param string $name
-     * @return \Zend\Feed\Reader\Extension\AbstractFeed
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '\Feed', $this->extensions)) {
-            return $this->extensions[$name . '\Feed'];
-        }
-        return;
-    }
-
-    protected function loadExtensions()
-    {
-        $all     = Reader::getExtensions();
-        $manager = Reader::getExtensionManager();
-        $feed    = $all['feed'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            $plugin = $manager->get($extension);
-            $plugin->setDomDocument($this->getDomDocument());
-            $plugin->setType($this->data['type']);
-            $plugin->setXpath($this->xpath);
-            $this->extensions[$extension] = $plugin;
-        }
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     */
-    abstract protected function indexEntries();
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    abstract protected function registerNamespaces();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection.php
deleted file mode 100644
index f50c1bc..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use ArrayObject;
-
-class Collection extends ArrayObject
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php b/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
deleted file mode 100644
index 749ff5c..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Collection;
-
-use ArrayObject;
-
-abstract class AbstractCollection extends ArrayObject
-{
-    /**
-     * Return a simple array of the most relevant slice of
-     * the collection values. For example, feed categories contain
-     * the category name, domain/URI, and other data. This method would
-     * merely return the most useful data - i.e. the category names.
-     *
-     * @return array
-     */
-    abstract public function getValues();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
deleted file mode 100644
index be956d4..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Collection;
-
-class Author extends AbstractCollection
-{
-    /**
-     * Return a simple array of the most relevant slice of
-     * the author values, i.e. all author names.
-     *
-     * @return array
-     */
-    public function getValues()
-    {
-        $authors = [];
-        foreach ($this->getIterator() as $element) {
-            $authors[] = $element['name'];
-        }
-        return array_unique($authors);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
deleted file mode 100644
index 2f43a07..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Collection;
-
-class Category extends AbstractCollection
-{
-    /**
-     * Return a simple array of the most relevant slice of
-     * the collection values. For example, feed categories contain
-     * the category name, domain/URI, and other data. This method would
-     * merely return the most useful data - i.e. the category names.
-     *
-     * @return array
-     */
-    public function getValues()
-    {
-        $categories = [];
-        foreach ($this->getIterator() as $element) {
-            if (isset($element['label']) && !empty($element['label'])) {
-                $categories[] = $element['label'];
-            } else {
-                $categories[] = $element['term'];
-            }
-        }
-        return array_unique($categories);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
deleted file mode 100644
index cf791c2..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Collection;
-
-use ArrayObject;
-
-class Collection extends ArrayObject
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
deleted file mode 100644
index 1342431..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Entry;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
-
-abstract class AbstractEntry
-{
-    /**
-     * Feed entry data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * DOM document object
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * Entry instance
-     *
-     * @var DOMElement
-     */
-    protected $entry = null;
-
-    /**
-     * Pointer to the current entry
-     *
-     * @var int
-     */
-    protected $entryKey = 0;
-
-    /**
-     * XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * Registered extensions
-     *
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  int $entryKey
-     * @param  string $type
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        $this->entry       = $entry;
-        $this->entryKey    = $entryKey;
-        $this->domDocument = $entry->ownerDocument;
-        if ($type !== null) {
-            $this->data['type'] = $type;
-        } elseif ($this->domDocument !== null) {
-            $this->data['type'] = Reader\Reader::detectType($this->domDocument);
-        } else {
-            $this->data['type'] = Reader\Reader::TYPE_ANY;
-        }
-        $this->loadExtensions();
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the entry element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->entry;
-    }
-
-    /**
-     * Get the Entry's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get entry as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        $dom   = new DOMDocument('1.0', $this->getEncoding());
-        $deep  = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
-        $entry = $dom->importNode($this->getElement(), $deep);
-        $dom->appendChild($entry);
-        return $dom->saveXml();
-    }
-
-    /**
-     * Get the entry type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->data['type'];
-    }
-
-    /**
-     * Get the XPath query object
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        if (!$this->xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-        return $this->xpath;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return AbstractEntry
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->xpath = $xpath;
-        return $this;
-    }
-
-    /**
-     * Get registered extensions
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Entry)
-     *
-     * @param string $name
-     * @return Reader\Extension\AbstractEntry
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '\\Entry', $this->extensions)) {
-            return $this->extensions[$name . '\\Entry'];
-        }
-        return;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\RuntimeException if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array([$extension, $method], $args);
-            }
-        }
-        throw new Exception\RuntimeException(sprintf(
-            'Method: %s does not exist and could not be located on a registered Extension',
-            $method
-        ));
-    }
-
-    /**
-     * Load extensions from Zend\Feed\Reader\Reader
-     *
-     * @return void
-     */
-    protected function loadExtensions()
-    {
-        $all     = Reader\Reader::getExtensions();
-        $manager = Reader\Reader::getExtensionManager();
-        $feed    = $all['entry'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            $plugin = $manager->get($extension);
-            $plugin->setEntryElement($this->getElement());
-            $plugin->setEntryKey($this->entryKey);
-            $plugin->setType($this->data['type']);
-            $this->extensions[$extension] = $plugin;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
deleted file mode 100644
index c68f360..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Entry;
-
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-
-class Atom extends AbstractEntry implements EntryInterface
-{
-    /**
-     * XPath query
-     *
-     * @var string
-     */
-    protected $xpathQuery = '';
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  int $entryKey
-     * @param  string $type
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        parent::__construct($entry, $entryKey, $type);
-
-        // Everyone by now should know XPath indices start from 1 not 0
-        $this->xpathQuery = '//atom:entry[' . ($this->entryKey + 1) . ']';
-
-        $manager    = Reader\Reader::getExtensionManager();
-        $extensions = ['Atom\Entry', 'Thread\Entry', 'DublinCore\Entry'];
-
-        foreach ($extensions as $name) {
-            $extension = $manager->get($name);
-            $extension->setEntryElement($entry);
-            $extension->setEntryKey($entryKey);
-            $extension->setType($type);
-            $this->extensions[$name] = $extension;
-        }
-    }
-
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $people = $this->getExtension('Atom')->getAuthors();
-
-        $this->data['authors'] = $people;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->data)) {
-            return $this->data['content'];
-        }
-
-        $content = $this->getExtension('Atom')->getContent();
-
-        $this->data['content'] = $content;
-
-        return $this->data['content'];
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->data)) {
-            return $this->data['datecreated'];
-        }
-
-        $dateCreated = $this->getExtension('Atom')->getDateCreated();
-
-        $this->data['datecreated'] = $dateCreated;
-
-        return $this->data['datecreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $dateModified = $this->getExtension('Atom')->getDateModified();
-
-        $this->data['datemodified'] = $dateModified;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = $this->getExtension('Atom')->getDescription();
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->data)) {
-            return $this->data['enclosure'];
-        }
-
-        $enclosure = $this->getExtension('Atom')->getEnclosure();
-
-        $this->data['enclosure'] = $enclosure;
-
-        return $this->data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->getExtension('Atom')->getId();
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->data['links'][$index])) {
-            return $this->data['links'][$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->data)) {
-            return $this->data['links'];
-        }
-
-        $links = $this->getExtension('Atom')->getLinks();
-
-        $this->data['links'] = $links;
-
-        return $this->data['links'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->getExtension('Atom')->getTitle();
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return int
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->data)) {
-            return $this->data['commentcount'];
-        }
-
-        $commentcount = $this->getExtension('Thread')->getCommentCount();
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Atom')->getCommentCount();
-        }
-
-        $this->data['commentcount'] = $commentcount;
-
-        return $this->data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->data)) {
-            return $this->data['commentlink'];
-        }
-
-        $commentlink = $this->getExtension('Atom')->getCommentLink();
-
-        $this->data['commentlink'] = $commentlink;
-
-        return $this->data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink()
-    {
-        if (array_key_exists('commentfeedlink', $this->data)) {
-            return $this->data['commentfeedlink'];
-        }
-
-        $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink();
-
-        $this->data['commentfeedlink'] = $commentfeedlink;
-
-        return $this->data['commentfeedlink'];
-    }
-
-    /**
-     * Get category data as a Reader\Reader_Collection_Category object
-     *
-     * @return Reader\Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        $categoryCollection = $this->getExtension('Atom')->getCategories();
-
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get source feed metadata from the entry
-     *
-     * @return Reader\Feed\Atom\Source|null
-     */
-    public function getSource()
-    {
-        if (array_key_exists('source', $this->data)) {
-            return $this->data['source'];
-        }
-
-        $source = $this->getExtension('Atom')->getSource();
-
-        $this->data['source'] = $source;
-
-        return $this->data['source'];
-    }
-
-    /**
-     * Set the XPath query (incl. on all Extensions)
-     *
-     * @param DOMXPath $xpath
-     * @return void
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        parent::setXpath($xpath);
-        foreach ($this->extensions as $extension) {
-            $extension->setXpath($this->xpath);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
deleted file mode 100644
index c5e5fb2..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Entry;
-
-use Zend\Feed\Reader\Collection\Category;
-
-interface EntryInterface
-{
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0);
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors();
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent();
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated();
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified();
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription();
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return \stdClass
-     */
-    public function getEnclosure();
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId();
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0);
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks();
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink();
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle();
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return int
-     */
-    public function getCommentCount();
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink();
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink();
-
-    /**
-     * Get all categories
-     *
-     * @return Category
-     */
-    public function getCategories();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
deleted file mode 100644
index b55fdad..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Entry;
-
-use DateTime;
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
-
-class Rss extends AbstractEntry implements EntryInterface
-{
-    /**
-     * XPath query for RDF
-     *
-     * @var string
-     */
-    protected $xpathQueryRdf = '';
-
-    /**
-     * XPath query for RSS
-     *
-     * @var string
-     */
-    protected $xpathQueryRss = '';
-
-    /**
-     * Constructor
-     *
-     * @param  DOMElement $entry
-     * @param  string $entryKey
-     * @param  string $type
-     */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
-    {
-        parent::__construct($entry, $entryKey, $type);
-        $this->xpathQueryRss = '//item[' . ($this->entryKey+1) . ']';
-        $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
-
-        $manager    = Reader\Reader::getExtensionManager();
-        $extensions = [
-            'DublinCore\Entry',
-            'Content\Entry',
-            'Atom\Entry',
-            'WellFormedWeb\Entry',
-            'Slash\Entry',
-            'Thread\Entry',
-        ];
-        foreach ($extensions as $name) {
-            $extension = $manager->get($name);
-            $extension->setEntryElement($entry);
-            $extension->setEntryKey($entryKey);
-            $extension->setType($type);
-            $this->extensions[$name] = $extension;
-        }
-    }
-
-    /**
-     * Get an author entry
-     *
-     * @param int $index
-     * @return string
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = [];
-        $authorsDc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authorsDc)) {
-            foreach ($authorsDc as $author) {
-                $authors[] = [
-                    'name' => $author['name']
-                ];
-            }
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-        && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query($this->xpathQueryRss . '//author');
-        } else {
-            $list = $this->xpath->query($this->xpathQueryRdf . '//rss:author');
-        }
-        if ($list->length) {
-            foreach ($list as $author) {
-                $string = trim($author->nodeValue);
-                $data = [];
-                // Pretty rough parsing - but it's a catchall
-                if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
-                    $data['email'] = trim($matches[0]);
-                    if (preg_match("/\((.*)\)$/", $string, $matches)) {
-                        $data['name'] = $matches[1];
-                    }
-                    $authors[] = $data;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = $this->getExtension('Atom')->getAuthors();
-        } else {
-            $authors = new Reader\Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        }
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->data)) {
-            return $this->data['content'];
-        }
-
-        $content = $this->getExtension('Content')->getContent();
-
-        if (!$content) {
-            $content = $this->getDescription();
-        }
-
-        if (empty($content)) {
-            $content = $this->getExtension('Atom')->getContent();
-        }
-
-        $this->data['content'] = $content;
-
-        return $this->data['content'];
-    }
-
-    /**
-     * Get the entry's date of creation
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        return $this->getDateModified();
-    }
-
-    /**
-     * Get the entry's date of modification
-     *
-     * @throws Exception\RuntimeException
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $dateModified = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/pubDate)');
-            if ($dateModified) {
-                $dateModifiedParsed = strtotime($dateModified);
-                if ($dateModifiedParsed) {
-                    $date = new DateTime('@' . $dateModifiedParsed);
-                } else {
-                    $dateStandards = [DateTime::RSS, DateTime::RFC822,
-                                           DateTime::RFC2822, null];
-                    foreach ($dateStandards as $standard) {
-                        try {
-                            $date = date_create_from_format($standard, $dateModified);
-                            break;
-                        } catch (\Exception $e) {
-                            if ($standard === null) {
-                                throw new Exception\RuntimeException(
-                                    'Could not load date due to unrecognised'
-                                    .' format (should follow RFC 822 or 2822):'
-                                    . $e->getMessage(),
-                                    0, $e
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('DublinCore')->getDate();
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('Atom')->getDateModified();
-        }
-
-        if (!$date) {
-            $date = null;
-        }
-
-        $this->data['datemodified'] = $date;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $description = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/description)');
-        } else {
-            $description = $this->xpath->evaluate('string(' . $this->xpathQueryRdf . '/rss:description)');
-        }
-
-        if (!$description) {
-            $description = $this->getExtension('DublinCore')->getDescription();
-        }
-
-        if (empty($description)) {
-            $description = $this->getExtension('Atom')->getDescription();
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->data)) {
-            return $this->data['enclosure'];
-        }
-
-        $enclosure = null;
-
-        if ($this->getType() == Reader\Reader::TYPE_RSS_20) {
-            $nodeList = $this->xpath->query($this->xpathQueryRss . '/enclosure');
-
-            if ($nodeList->length > 0) {
-                $enclosure = new \stdClass();
-                $enclosure->url    = $nodeList->item(0)->getAttribute('url');
-                $enclosure->length = $nodeList->item(0)->getAttribute('length');
-                $enclosure->type   = $nodeList->item(0)->getAttribute('type');
-            }
-        }
-
-        if (!$enclosure) {
-            $enclosure = $this->getExtension('Atom')->getEnclosure();
-        }
-
-        $this->data['enclosure'] = $enclosure;
-
-        return $this->data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $id = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/guid)');
-        }
-
-        if (!$id) {
-            $id = $this->getExtension('DublinCore')->getId();
-        }
-
-        if (empty($id)) {
-            $id = $this->getExtension('Atom')->getId();
-        }
-
-        if (!$id) {
-            if ($this->getPermalink()) {
-                $id = $this->getPermalink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->data['links'][$index])) {
-            return $this->data['links'][$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->data)) {
-            return $this->data['links'];
-        }
-
-        $links = [];
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query($this->xpathQueryRss . '//link');
-        } else {
-            $list = $this->xpath->query($this->xpathQueryRdf . '//rss:link');
-        }
-
-        if (!$list->length) {
-            $links = $this->getExtension('Atom')->getLinks();
-        } else {
-            foreach ($list as $link) {
-                $links[] = $link->nodeValue;
-            }
-        }
-
-        $this->data['links'] = $links;
-
-        return $this->data['links'];
-    }
-
-    /**
-     * Get all categories
-     *
-     * @return Reader\Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query($this->xpathQueryRss . '//category');
-        } else {
-            $list = $this->xpath->query($this->xpathQueryRdf . '//rss:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Reader\Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->nodeValue,
-                    'scheme' => $category->getAttribute('domain'),
-                    'label' => $category->nodeValue,
-                ];
-            }
-        } else {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('Atom')->getCategories();
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $title = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/title)');
-        } else {
-            $title = $this->xpath->evaluate('string(' . $this->xpathQueryRdf . '/rss:title)');
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('DublinCore')->getTitle();
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('Atom')->getTitle();
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return string|null
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->data)) {
-            return $this->data['commentcount'];
-        }
-
-        $commentcount = $this->getExtension('Slash')->getCommentCount();
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Thread')->getCommentCount();
-        }
-
-        if (!$commentcount) {
-            $commentcount = $this->getExtension('Atom')->getCommentCount();
-        }
-
-        if (!$commentcount) {
-            $commentcount = null;
-        }
-
-        $this->data['commentcount'] = $commentcount;
-
-        return $this->data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->data)) {
-            return $this->data['commentlink'];
-        }
-
-        $commentlink = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $commentlink = $this->xpath->evaluate('string(' . $this->xpathQueryRss . '/comments)');
-        }
-
-        if (!$commentlink) {
-            $commentlink = $this->getExtension('Atom')->getCommentLink();
-        }
-
-        if (!$commentlink) {
-            $commentlink = null;
-        }
-
-        $this->data['commentlink'] = $commentlink;
-
-        return $this->data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @return string
-     */
-    public function getCommentFeedLink()
-    {
-        if (array_key_exists('commentfeedlink', $this->data)) {
-            return $this->data['commentfeedlink'];
-        }
-
-        $commentfeedlink = $this->getExtension('WellFormedWeb')->getCommentFeedLink();
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rss');
-        }
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = $this->getExtension('Atom')->getCommentFeedLink('rdf');
-        }
-
-        if (!$commentfeedlink) {
-            $commentfeedlink = null;
-        }
-
-        $this->data['commentfeedlink'] = $commentfeedlink;
-
-        return $this->data['commentfeedlink'];
-    }
-
-    /**
-     * Set the XPath query (incl. on all Extensions)
-     *
-     * @param DOMXPath $xpath
-     * @return void
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        parent::setXpath($xpath);
-        foreach ($this->extensions as $extension) {
-            $extension->setXpath($this->xpath);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
deleted file mode 100644
index 008c57e..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
deleted file mode 100644
index e5e664a..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception\ExceptionInterface as Exception;
-
-interface ExceptionInterface extends Exception
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
deleted file mode 100644
index 646b767..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
deleted file mode 100644
index d876e7f..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
deleted file mode 100644
index c589146..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-
-abstract class AbstractEntry
-{
-    /**
-     * Feed entry data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * DOM document object
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * Entry instance
-     *
-     * @var DOMElement
-     */
-    protected $entry = null;
-
-    /**
-     * Pointer to the current entry
-     *
-     * @var int
-     */
-    protected $entryKey = 0;
-
-    /**
-     * XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * XPath query
-     *
-     * @var string
-     */
-    protected $xpathPrefix = '';
-
-    /**
-     * Set the entry DOMElement
-     *
-     * Has side effect of setting the DOMDocument for the entry.
-     *
-     * @param  DOMElement $entry
-     * @return AbstractEntry
-     */
-    public function setEntryElement(DOMElement $entry)
-    {
-        $this->entry = $entry;
-        $this->domDocument = $entry->ownerDocument;
-        return $this;
-    }
-
-    /**
-     * Get the entry DOMElement
-     *
-     * @return DOMElement
-     */
-    public function getEntryElement()
-    {
-        return $this->entry;
-    }
-
-    /**
-     * Set the entry key
-     *
-     * @param  string $entryKey
-     * @return AbstractEntry
-     */
-    public function setEntryKey($entryKey)
-    {
-        $this->entryKey = $entryKey;
-        return $this;
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the Entry's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        return $assumed;
-    }
-
-    /**
-     * Set the entry type
-     *
-     * Has side effect of setting xpath prefix
-     *
-     * @param  string $type
-     * @return AbstractEntry
-     */
-    public function setType($type)
-    {
-        if (null === $type) {
-            $this->data['type'] = null;
-            return $this;
-        }
-
-        $this->data['type'] = $type;
-        if ($type === Reader\Reader::TYPE_RSS_10
-            || $type === Reader\Reader::TYPE_RSS_090
-        ) {
-            $this->setXpathPrefix('//rss:item[' . ($this->entryKey + 1) . ']');
-            return $this;
-        }
-
-        if ($type === Reader\Reader::TYPE_ATOM_10
-            || $type === Reader\Reader::TYPE_ATOM_03
-        ) {
-            $this->setXpathPrefix('//atom:entry[' . ($this->entryKey + 1) . ']');
-            return $this;
-        }
-
-        $this->setXpathPrefix('//item[' . ($this->entryKey + 1) . ']');
-        return $this;
-    }
-
-    /**
-     * Get the entry type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        $type = $this->data['type'];
-        if ($type === null) {
-            $type = Reader\Reader::detectType($this->getEntryElement(), true);
-            $this->setType($type);
-        }
-
-        return $type;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return AbstractEntry
-     */
-    public function setXpath(DOMXPath $xpath)
-    {
-        $this->xpath = $xpath;
-        $this->registerNamespaces();
-        return $this;
-    }
-
-    /**
-     * Get the XPath query object
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        if (!$this->xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-        return $this->xpath;
-    }
-
-    /**
-     * Serialize the entry to an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get the XPath prefix
-     *
-     * @return string
-     */
-    public function getXpathPrefix()
-    {
-        return $this->xpathPrefix;
-    }
-
-    /**
-     * Set the XPath prefix
-     *
-     * @param  string $prefix
-     * @return AbstractEntry
-     */
-    public function setXpathPrefix($prefix)
-    {
-        $this->xpathPrefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * Register XML namespaces
-     *
-     * @return void
-     */
-    abstract protected function registerNamespaces();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
deleted file mode 100644
index d61414a..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension;
-
-use DOMDocument;
-use DOMXPath;
-use Zend\Feed\Reader;
-
-abstract class AbstractFeed
-{
-    /**
-     * Parsed feed data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Parsed feed data in the shape of a DOMDocument
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * The base XPath query used to retrieve feed data
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * The XPath prefix
-     *
-     * @var string
-     */
-    protected $xpathPrefix = '';
-
-    /**
-     * Set the DOM document
-     *
-     * @param  DOMDocument $dom
-     * @return AbstractFeed
-     */
-    public function setDomDocument(DOMDocument $dom)
-    {
-        $this->domDocument = $dom;
-        return $this;
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the Feed's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        return $assumed;
-    }
-
-    /**
-     * Set the feed type
-     *
-     * @param  string $type
-     * @return AbstractFeed
-     */
-    public function setType($type)
-    {
-        $this->data['type'] = $type;
-        return $this;
-    }
-
-    /**
-     * Get the feed type
-     *
-     * If null, it will attempt to autodetect the type.
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        $type = $this->data['type'];
-        if (null === $type) {
-            $type = Reader\Reader::detectType($this->getDomDocument());
-            $this->setType($type);
-        }
-        return $type;
-    }
-
-    /**
-     * Return the feed as an array
-     *
-     * @return array
-     */
-    public function toArray() // untested
-    {
-        return $this->data;
-    }
-
-    /**
-     * Set the XPath query
-     *
-     * @param  DOMXPath $xpath
-     * @return AbstractEntry
-     */
-    public function setXpath(DOMXPath $xpath = null)
-    {
-        if (null === $xpath) {
-            $this->xpath = null;
-            return $this;
-        }
-
-        $this->xpath = $xpath;
-        $this->registerNamespaces();
-        return $this;
-    }
-
-    /**
-     * Get the DOMXPath object
-     *
-     * @return string
-     */
-    public function getXpath()
-    {
-        if (null === $this->xpath) {
-            $this->setXpath(new DOMXPath($this->getDomDocument()));
-        }
-
-        return $this->xpath;
-    }
-
-    /**
-     * Get the XPath prefix
-     *
-     * @return string
-     */
-    public function getXpathPrefix()
-    {
-        return $this->xpathPrefix;
-    }
-
-    /**
-     * Set the XPath prefix
-     *
-     * @param string $prefix
-     * @return void
-     */
-    public function setXpathPrefix($prefix)
-    {
-        $this->xpathPrefix = $prefix;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    abstract protected function registerNamespaces();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
deleted file mode 100644
index 9d06ad3..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
+++ /dev/null
@@ -1,634 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Atom;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use stdClass;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-use Zend\Feed\Uri;
-
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the specified author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return Collection\Author
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = [];
-        $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
-
-        if (!$list->length) {
-            /**
-             * TODO: Limit query to feed level els only!
-             */
-            $list = $this->getXpath()->query('//atom:author');
-        }
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $author = $this->getAuthorFromElement($author);
-                if (!empty($author)) {
-                    $authors[] = $author;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = new Collection\Author();
-        } else {
-            $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        }
-
-        $this->data['authors'] = $authors;
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (array_key_exists('content', $this->data)) {
-            return $this->data['content'];
-        }
-
-        $content = null;
-
-        $el = $this->getXpath()->query($this->getXpathPrefix() . '/atom:content');
-        if ($el->length > 0) {
-            $el = $el->item(0);
-            $type = $el->getAttribute('type');
-            switch ($type) {
-                case '':
-                case 'text':
-                case 'text/plain':
-                case 'html':
-                case 'text/html':
-                    $content = $el->nodeValue;
-                    break;
-                case 'xhtml':
-                    $this->getXpath()->registerNamespace('xhtml', 'http://www.w3.org/1999/xhtml');
-                    $xhtml = $this->getXpath()->query(
-                        $this->getXpathPrefix() . '/atom:content/xhtml:div'
-                    )->item(0);
-                    $d = new DOMDocument('1.0', $this->getEncoding());
-                    $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
-                    $xhtmls = $d->importNode($xhtml, $deep);
-                    $d->appendChild($xhtmls);
-                    $content = $this->collectXhtml(
-                        $d->saveXML(),
-                        $d->lookupPrefix('http://www.w3.org/1999/xhtml')
-                    );
-                    break;
-            }
-        }
-
-        if (!$content) {
-            $content = $this->getDescription();
-        }
-
-        $this->data['content'] = trim($content);
-
-        return $this->data['content'];
-    }
-
-    /**
-     * Parse out XHTML to remove the namespacing
-     *
-     * @param $xhtml
-     * @param $prefix
-     * @return mixed
-     */
-    protected function collectXhtml($xhtml, $prefix)
-    {
-        if (!empty($prefix)) {
-            $prefix = $prefix . ':';
-        }
-        $matches = [
-            "/<\?xml[^<]*>[^<]*<" . $prefix . "div[^<]*/",
-            "/<\/" . $prefix . "div>\s*$/"
-        ];
-        $xhtml = preg_replace($matches, '', $xhtml);
-        if (!empty($prefix)) {
-            $xhtml = preg_replace("/(<[\/]?)" . $prefix . "([a-zA-Z]+)/", '$1$2', $xhtml);
-        }
-        return $xhtml;
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->data)) {
-            return $this->data['datecreated'];
-        }
-
-        $date = null;
-
-        if ($this->getAtomType() === Reader\Reader::TYPE_ATOM_03) {
-            $dateCreated = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:created)');
-        } else {
-            $dateCreated = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:published)');
-        }
-
-        if ($dateCreated) {
-            $date = new DateTime($dateCreated);
-        }
-
-        $this->data['datecreated'] = $date;
-
-        return $this->data['datecreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->getAtomType() === Reader\Reader::TYPE_ATOM_03) {
-            $dateModified = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:modified)');
-        } else {
-            $dateModified = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:updated)');
-        }
-
-        if ($dateModified) {
-            $date = new DateTime($dateModified);
-        }
-
-        $this->data['datemodified'] = $date;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:summary)');
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the entry enclosure
-     *
-     * @return string
-     */
-    public function getEnclosure()
-    {
-        if (array_key_exists('enclosure', $this->data)) {
-            return $this->data['enclosure'];
-        }
-
-        $enclosure = null;
-
-        $nodeList = $this->getXpath()->query($this->getXpathPrefix() . '/atom:link[@rel="enclosure"]');
-
-        if ($nodeList->length > 0) {
-            $enclosure         = new stdClass();
-            $enclosure->url    = $nodeList->item(0)->getAttribute('href');
-            $enclosure->length = $nodeList->item(0)->getAttribute('length');
-            $enclosure->type   = $nodeList->item(0)->getAttribute('type');
-        }
-
-        $this->data['enclosure'] = $enclosure;
-
-        return $this->data['enclosure'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
-
-        if (!$id) {
-            if ($this->getPermalink()) {
-                $id = $this->getPermalink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the base URI of the feed (if set).
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->data)) {
-            return $this->data['baseUrl'];
-        }
-
-        $baseUrl = $this->getXpath()->evaluate(
-            'string('
-            . $this->getXpathPrefix()
-            . '/@xml:base[1]'
-            . ')'
-        );
-
-        if (!$baseUrl) {
-            $baseUrl = $this->getXpath()->evaluate('string(//@xml:base[1])');
-        }
-
-        if (!$baseUrl) {
-            $baseUrl = null;
-        }
-
-        $this->data['baseUrl'] = $baseUrl;
-
-        return $this->data['baseUrl'];
-    }
-
-    /**
-     * Get a specific link
-     *
-     * @param  int $index
-     * @return string
-     */
-    public function getLink($index = 0)
-    {
-        if (!array_key_exists('links', $this->data)) {
-            $this->getLinks();
-        }
-
-        if (isset($this->data['links'][$index])) {
-            return $this->data['links'][$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (array_key_exists('links', $this->data)) {
-            return $this->data['links'];
-        }
-
-        $links = [];
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="alternate"]/@href' . '|' .
-            $this->getXpathPrefix() . '//atom:link[not(@rel)]/@href'
-        );
-
-        if ($list->length) {
-            foreach ($list as $link) {
-                $links[] = $this->absolutiseUri($link->value);
-            }
-        }
-
-        $this->data['links'] = $links;
-
-        return $this->data['links'];
-    }
-
-    /**
-     * Get a permalink to the entry
-     *
-     * @return string
-     */
-    public function getPermalink()
-    {
-        return $this->getLink(0);
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return int
-     */
-    public function getCommentCount()
-    {
-        if (array_key_exists('commentcount', $this->data)) {
-            return $this->data['commentcount'];
-        }
-
-        $count = null;
-
-        $this->getXpath()->registerNamespace('thread10', 'http://purl.org/syndication/thread/1.0');
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies"]/@thread10:count'
-        );
-
-        if ($list->length) {
-            $count = $list->item(0)->value;
-        }
-
-        $this->data['commentcount'] = $count;
-
-        return $this->data['commentcount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (array_key_exists('commentlink', $this->data)) {
-            return $this->data['commentlink'];
-        }
-
-        $link = null;
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="text/html"]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->value;
-            $link = $this->absolutiseUri($link);
-        }
-
-        $this->data['commentlink'] = $link;
-
-        return $this->data['commentlink'];
-    }
-
-    /**
-     * Returns a URI pointing to a feed of all comments for this entry
-     *
-     * @param string $type
-     * @return string
-     */
-    public function getCommentFeedLink($type = 'atom')
-    {
-        if (array_key_exists('commentfeedlink', $this->data)) {
-            return $this->data['commentfeedlink'];
-        }
-
-        $link = null;
-
-        $list = $this->getXpath()->query(
-            $this->getXpathPrefix() . '//atom:link[@rel="replies" and @type="application/' . $type.'+xml"]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->value;
-            $link = $this->absolutiseUri($link);
-        }
-
-        $this->data['commentfeedlink'] = $link;
-
-        return $this->data['commentfeedlink'];
-    }
-
-    /**
-     * Get all categories
-     *
-     * @return Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        if ($this->getAtomType() == Reader\Reader::TYPE_ATOM_10) {
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:category');
-        } else {
-            /**
-             * Since Atom 0.3 did not support categories, it would have used the
-             * Dublin Core extension. However there is a small possibility Atom 0.3
-             * may have been retrofitted to use Atom 1.0 instead.
-             */
-            $this->getXpath()->registerNamespace('atom10', Reader\Reader::NAMESPACE_ATOM_10);
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '//atom10:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->getAttribute('term'),
-                    'scheme' => $category->getAttribute('scheme'),
-                    'label' => $category->getAttribute('label')
-                ];
-            }
-        } else {
-            return new Collection\Category;
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get source feed metadata from the entry
-     *
-     * @return Reader\Feed\Atom\Source|null
-     */
-    public function getSource()
-    {
-        if (array_key_exists('source', $this->data)) {
-            return $this->data['source'];
-        }
-
-        $source = null;
-        // TODO: Investigate why _getAtomType() fails here. Is it even needed?
-        if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
-            $list = $this->getXpath()->query($this->getXpathPrefix() . '/atom:source[1]');
-            if ($list->length) {
-                $element = $list->item(0);
-                $source = new Reader\Feed\Atom\Source($element, $this->getXpathPrefix());
-            }
-        }
-
-        $this->data['source'] = $source;
-        return $this->data['source'];
-    }
-
-    /**
-     *  Attempt to absolutise the URI, i.e. if a relative URI apply the
-     *  xml:base value as a prefix to turn into an absolute URI.
-     *
-     * @param $link
-     * @return string
-     */
-    protected function absolutiseUri($link)
-    {
-        if (!Uri::factory($link)->isAbsolute()) {
-            if ($this->getBaseUrl() !== null) {
-                $link = $this->getBaseUrl() . $link;
-                if (!Uri::factory($link)->isValid()) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-
-    /**
-     * Get an author entry
-     *
-     * @param DOMElement $element
-     * @return string
-     */
-    protected function getAuthorFromElement(DOMElement $element)
-    {
-        $author = [];
-
-        $emailNode = $element->getElementsByTagName('email');
-        $nameNode  = $element->getElementsByTagName('name');
-        $uriNode   = $element->getElementsByTagName('uri');
-
-        if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) {
-            $author['email'] = $emailNode->item(0)->nodeValue;
-        }
-
-        if ($nameNode->length && strlen($nameNode->item(0)->nodeValue) > 0) {
-            $author['name'] = $nameNode->item(0)->nodeValue;
-        }
-
-        if ($uriNode->length && strlen($uriNode->item(0)->nodeValue) > 0) {
-            $author['uri'] = $uriNode->item(0)->nodeValue;
-        }
-
-        if (empty($author)) {
-            return;
-        }
-        return $author;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    protected function registerNamespaces()
-    {
-        switch ($this->getAtomType()) {
-            case Reader\Reader::TYPE_ATOM_03:
-                $this->getXpath()->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_03);
-                break;
-            default:
-                $this->getXpath()->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_10);
-                break;
-        }
-    }
-
-    /**
-     * Detect the presence of any Atom namespaces in use
-     *
-     * @return string
-     */
-    protected function getAtomType()
-    {
-        $dom = $this->getDomDocument();
-        $prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
-        $prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
-        if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_03)
-        || !empty($prefixAtom03)) {
-            return Reader\Reader::TYPE_ATOM_03;
-        }
-        if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
-        || !empty($prefixAtom10)) {
-            return Reader\Reader::TYPE_ATOM_10;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
deleted file mode 100644
index dc5a59f..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Atom;
-
-use DateTime;
-use DOMElement;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-use Zend\Feed\Uri;
-
-class Feed extends Extension\AbstractFeed
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return Collection\Author
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $list = $this->xpath->query('//atom:author');
-
-        $authors = [];
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $author = $this->getAuthorFromElement($author);
-                if (!empty($author)) {
-                    $authors[] = $author;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = new Collection\Author();
-        } else {
-            $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        }
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->data)) {
-            return $this->data['copyright'];
-        }
-
-        $copyright = null;
-
-        if ($this->getType() === Reader\Reader::TYPE_ATOM_03) {
-            $copyright = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:copyright)');
-        } else {
-            $copyright = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:rights)');
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->data['copyright'] = $copyright;
-
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return DateTime|null
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->data)) {
-            return $this->data['datecreated'];
-        }
-
-        $date = null;
-
-        if ($this->getType() === Reader\Reader::TYPE_ATOM_03) {
-            $dateCreated = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:created)');
-        } else {
-            $dateCreated = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:published)');
-        }
-
-        if ($dateCreated) {
-            $date = new DateTime($dateCreated);
-        }
-
-        $this->data['datecreated'] = $date;
-
-        return $this->data['datecreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return DateTime|null
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->getType() === Reader\Reader::TYPE_ATOM_03) {
-            $dateModified = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:modified)');
-        } else {
-            $dateModified = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:updated)');
-        }
-
-        if ($dateModified) {
-            $date = new DateTime($dateModified);
-        }
-
-        $this->data['datemodified'] = $date;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = null;
-
-        if ($this->getType() === Reader\Reader::TYPE_ATOM_03) {
-            $description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:tagline)');
-        } else {
-            $description = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:subtitle)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->data)) {
-            return $this->data['generator'];
-        }
-        // TODO: Add uri support
-        $generator = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:generator)');
-
-        if (!$generator) {
-            $generator = null;
-        }
-
-        $this->data['generator'] = $generator;
-
-        return $this->data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:id)');
-
-        if (!$id) {
-            if ($this->getLink()) {
-                $id = $this->getLink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->data)) {
-            return $this->data['language'];
-        }
-
-        $language = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:lang)');
-
-        if (!$language) {
-            $language = $this->xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->data['language'] = $language;
-
-        return $this->data['language'];
-    }
-
-    /**
-     * Get the feed image
-     *
-     * @return array|null
-     */
-    public function getImage()
-    {
-        if (array_key_exists('image', $this->data)) {
-            return $this->data['image'];
-        }
-
-        $imageUrl = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:logo)');
-
-        if (!$imageUrl) {
-            $image = null;
-        } else {
-            $image = ['uri' => $imageUrl];
-        }
-
-        $this->data['image'] = $image;
-
-        return $this->data['image'];
-    }
-
-    /**
-     * Get the base URI of the feed (if set).
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->data)) {
-            return $this->data['baseUrl'];
-        }
-
-        $baseUrl = $this->xpath->evaluate('string(//@xml:base[1])');
-
-        if (!$baseUrl) {
-            $baseUrl = null;
-        }
-        $this->data['baseUrl'] = $baseUrl;
-
-        return $this->data['baseUrl'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->data)) {
-            return $this->data['link'];
-        }
-
-        $link = null;
-
-        $list = $this->xpath->query(
-            $this->getXpathPrefix() . '/atom:link[@rel="alternate"]/@href' . '|' .
-            $this->getXpathPrefix() . '/atom:link[not(@rel)]/@href'
-        );
-
-        if ($list->length) {
-            $link = $list->item(0)->nodeValue;
-            $link = $this->absolutiseUri($link);
-        }
-
-        $this->data['link'] = $link;
-
-        return $this->data['link'];
-    }
-
-    /**
-     * Get a link to the feed's XML Url
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->data)) {
-            return $this->data['feedlink'];
-        }
-
-        $link = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:link[@rel="self"]/@href)');
-
-        $link = $this->absolutiseUri($link);
-
-        $this->data['feedlink'] = $link;
-
-        return $this->data['feedlink'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->data)) {
-            return $this->data['hubs'];
-        }
-        $hubs = [];
-
-        $list = $this->xpath->query($this->getXpathPrefix()
-            . '//atom:link[@rel="hub"]/@href');
-
-        if ($list->length) {
-            foreach ($list as $uri) {
-                $hubs[] = $this->absolutiseUri($uri->nodeValue);
-            }
-        } else {
-            $hubs = null;
-        }
-
-        $this->data['hubs'] = $hubs;
-
-        return $this->data['hubs'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/atom:title)');
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get all categories
-     *
-     * @return Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
-            $list = $this->xpath->query($this->getXpathPrefix() . '/atom:category');
-        } else {
-            /**
-             * Since Atom 0.3 did not support categories, it would have used the
-             * Dublin Core extension. However there is a small possibility Atom 0.3
-             * may have been retrofittied to use Atom 1.0 instead.
-             */
-            $this->xpath->registerNamespace('atom10', Reader\Reader::NAMESPACE_ATOM_10);
-            $list = $this->xpath->query($this->getXpathPrefix() . '/atom10:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->getAttribute('term'),
-                    'scheme' => $category->getAttribute('scheme'),
-                    'label' => $category->getAttribute('label')
-                ];
-            }
-        } else {
-            return new Collection\Category;
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get an author entry in RSS format
-     *
-     * @param  DOMElement $element
-     * @return string
-     */
-    protected function getAuthorFromElement(DOMElement $element)
-    {
-        $author = [];
-
-        $emailNode = $element->getElementsByTagName('email');
-        $nameNode  = $element->getElementsByTagName('name');
-        $uriNode   = $element->getElementsByTagName('uri');
-
-        if ($emailNode->length && strlen($emailNode->item(0)->nodeValue) > 0) {
-            $author['email'] = $emailNode->item(0)->nodeValue;
-        }
-
-        if ($nameNode->length && strlen($nameNode->item(0)->nodeValue) > 0) {
-            $author['name'] = $nameNode->item(0)->nodeValue;
-        }
-
-        if ($uriNode->length && strlen($uriNode->item(0)->nodeValue) > 0) {
-            $author['uri'] = $uriNode->item(0)->nodeValue;
-        }
-
-        if (empty($author)) {
-            return;
-        }
-        return $author;
-    }
-
-    /**
-     *  Attempt to absolutise the URI, i.e. if a relative URI apply the
-     *  xml:base value as a prefix to turn into an absolute URI.
-     */
-    protected function absolutiseUri($link)
-    {
-        if (!Uri::factory($link)->isAbsolute()) {
-            if ($this->getBaseUrl() !== null) {
-                $link = $this->getBaseUrl() . $link;
-                if (!Uri::factory($link)->isValid()) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     */
-    protected function registerNamespaces()
-    {
-        if ($this->getType() == Reader\Reader::TYPE_ATOM_10
-            || $this->getType() == Reader\Reader::TYPE_ATOM_03
-        ) {
-            return; // pre-registered at Feed level
-        }
-        $atomDetected = $this->getAtomType();
-        switch ($atomDetected) {
-            case Reader\Reader::TYPE_ATOM_03:
-                $this->xpath->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_03);
-                break;
-            default:
-                $this->xpath->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_10);
-                break;
-        }
-    }
-
-    /**
-     * Detect the presence of any Atom namespaces in use
-     */
-    protected function getAtomType()
-    {
-        $dom = $this->getDomDocument();
-        $prefixAtom03 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_03);
-        $prefixAtom10 = $dom->lookupPrefix(Reader\Reader::NAMESPACE_ATOM_10);
-        if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_10)
-            || !empty($prefixAtom10)
-        ) {
-            return Reader\Reader::TYPE_ATOM_10;
-        }
-        if ($dom->isDefaultNamespace(Reader\Reader::NAMESPACE_ATOM_03)
-            || !empty($prefixAtom03)
-        ) {
-            return Reader\Reader::TYPE_ATOM_03;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
deleted file mode 100644
index 539848f..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Content;
-
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Extension;
-
-class Entry extends Extension\AbstractEntry
-{
-    public function getContent()
-    {
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $content = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/content:encoded)');
-        } else {
-            $content = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/content:encoded)');
-        }
-        return $content;
-    }
-
-    /**
-     * Register RSS Content Module namespace
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
deleted file mode 100644
index a75a5c4..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\CreativeCommons;
-
-use Zend\Feed\Reader\Extension;
-
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the entry license
-     *
-     * @param int $index
-     * @return string|null
-     */
-    public function getLicense($index = 0)
-    {
-        $licenses = $this->getLicenses();
-
-        if (isset($licenses[$index])) {
-            return $licenses[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get the entry licenses
-     *
-     * @return array
-     */
-    public function getLicenses()
-    {
-        $name = 'licenses';
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $licenses = [];
-        $list = $this->xpath->evaluate($this->getXpathPrefix() . '//cc:license');
-
-        if ($list->length) {
-            foreach ($list as $license) {
-                $licenses[] = $license->nodeValue;
-            }
-
-            $licenses = array_unique($licenses);
-        } else {
-            $cc = new Feed();
-            $licenses = $cc->getLicenses();
-        }
-
-        $this->data[$name] = $licenses;
-
-        return $this->data[$name];
-    }
-
-    /**
-     * Register Creative Commons namespaces
-     *
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('cc', 'http://backend.userland.com/creativeCommonsRssModule');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
deleted file mode 100644
index 8532a88..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\CreativeCommons;
-
-use Zend\Feed\Reader\Extension;
-
-class Feed extends Extension\AbstractFeed
-{
-    /**
-     * Get the entry license
-     *
-     * @param int $index
-     * @return string|null
-     */
-    public function getLicense($index = 0)
-    {
-        $licenses = $this->getLicenses();
-
-        if (isset($licenses[$index])) {
-            return $licenses[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get the entry licenses
-     *
-     * @return array
-     */
-    public function getLicenses()
-    {
-        $name = 'licenses';
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $licenses = [];
-        $list = $this->xpath->evaluate('channel/cc:license');
-
-        if ($list->length) {
-            foreach ($list as $license) {
-                $licenses[] = $license->nodeValue;
-            }
-
-            $licenses = array_unique($licenses);
-        }
-
-        $this->data[$name] = $licenses;
-
-        return $this->data[$name];
-    }
-
-    /**
-     * Register Creative Commons namespaces
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('cc', 'http://backend.userland.com/creativeCommonsRssModule');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
deleted file mode 100644
index 1b42f58..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\DublinCore;
-
-use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get an author entry
-     *
-     * @param int $index
-     * @return string
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = [];
-        $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');
-
-        if (!$list->length) {
-            $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:creator');
-        }
-        if (!$list->length) {
-            $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:publisher');
-
-            if (!$list->length) {
-                $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:publisher');
-            }
-        }
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $authors[] = [
-                    'name' => $author->nodeValue
-                ];
-            }
-            $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        } else {
-            $authors = null;
-        }
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get categories (subjects under DC)
-     *
-     * @return Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');
-
-        if (!$list->length) {
-            $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->nodeValue,
-                    'scheme' => null,
-                    'label' => $category->nodeValue,
-                ];
-            }
-        } else {
-            $categoryCollection = new Collection\Category;
-        }
-
-        $this->data['categories'] = $categoryCollection;
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        return $this->getDescription();
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
-
-        if (!$description) {
-            $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
-
-        if (!$id) {
-            $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
-
-        if (!$title) {
-            $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     *
-     *
-     * @return DateTime|null
-     */
-    public function getDate()
-    {
-        if (array_key_exists('date', $this->data)) {
-            return $this->data['date'];
-        }
-
-        $d    = null;
-        $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
-
-        if (!$date) {
-            $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
-        }
-
-        if ($date) {
-            $d = new DateTime($date);
-        }
-
-        $this->data['date'] = $d;
-
-        return $this->data['date'];
-    }
-
-    /**
-     * Register DC namespaces
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->getXpath()->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
-        $this->getXpath()->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
deleted file mode 100644
index 9e33958..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\DublinCore;
-
-use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Extension;
-
-class Feed extends Extension\AbstractFeed
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = [];
-        $list    = $this->getXpath()->query('//dc11:creator');
-
-        if (!$list->length) {
-            $list = $this->getXpath()->query('//dc10:creator');
-        }
-        if (!$list->length) {
-            $list = $this->getXpath()->query('//dc11:publisher');
-
-            if (!$list->length) {
-                $list = $this->getXpath()->query('//dc10:publisher');
-            }
-        }
-
-        if ($list->length) {
-            foreach ($list as $author) {
-                $authors[] = [
-                    'name' => $author->nodeValue
-                ];
-            }
-            $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        } else {
-            $authors = null;
-        }
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->data)) {
-            return $this->data['copyright'];
-        }
-
-        $copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');
-
-        if (!$copyright) {
-            $copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:rights)');
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->data['copyright'] = $copyright;
-
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
-
-        if (!$description) {
-            $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:description)');
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
-
-        if (!$id) {
-            $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:identifier)');
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->data)) {
-            return $this->data['language'];
-        }
-
-        $language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');
-
-        if (!$language) {
-            $language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:language)');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->data['language'] = $language;
-
-        return $this->data['language'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
-
-        if (!$title) {
-            $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:title)');
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     *
-     *
-     * @return DateTime|null
-     */
-    public function getDate()
-    {
-        if (array_key_exists('date', $this->data)) {
-            return $this->data['date'];
-        }
-
-        $d = null;
-        $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:date)');
-
-        if (!$date) {
-            $date = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc10:date)');
-        }
-
-        if ($date) {
-            $d = new DateTime($date);
-        }
-
-        $this->data['date'] = $d;
-
-        return $this->data['date'];
-    }
-
-    /**
-     * Get categories (subjects under DC)
-     *
-     * @return Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:subject');
-
-        if (!$list->length) {
-            $list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc10:subject');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->nodeValue,
-                    'scheme' => null,
-                    'label' => $category->nodeValue,
-                ];
-            }
-        } else {
-            $categoryCollection = new Collection\Category;
-        }
-
-        $this->data['categories'] = $categoryCollection;
-        return $this->data['categories'];
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->getXpath()->registerNamespace('dc10', 'http://purl.org/dc/elements/1.0/');
-        $this->getXpath()->registerNamespace('dc11', 'http://purl.org/dc/elements/1.1/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
deleted file mode 100644
index 5aec2fd..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Podcast;
-
-use Zend\Feed\Reader\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the entry author
-     *
-     * @return string
-     */
-    public function getCastAuthor()
-    {
-        if (isset($this->data['author'])) {
-            return $this->data['author'];
-        }
-
-        $author = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
-
-        if (!$author) {
-            $author = null;
-        }
-
-        $this->data['author'] = $author;
-
-        return $this->data['author'];
-    }
-
-    /**
-     * Get the entry block
-     *
-     * @return string
-     */
-    public function getBlock()
-    {
-        if (isset($this->data['block'])) {
-            return $this->data['block'];
-        }
-
-        $block = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
-
-        if (!$block) {
-            $block = null;
-        }
-
-        $this->data['block'] = $block;
-
-        return $this->data['block'];
-    }
-
-    /**
-     * Get the entry duration
-     *
-     * @return string
-     */
-    public function getDuration()
-    {
-        if (isset($this->data['duration'])) {
-            return $this->data['duration'];
-        }
-
-        $duration = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:duration)');
-
-        if (!$duration) {
-            $duration = null;
-        }
-
-        $this->data['duration'] = $duration;
-
-        return $this->data['duration'];
-    }
-
-    /**
-     * Get the entry explicit
-     *
-     * @return string
-     */
-    public function getExplicit()
-    {
-        if (isset($this->data['explicit'])) {
-            return $this->data['explicit'];
-        }
-
-        $explicit = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
-
-        if (!$explicit) {
-            $explicit = null;
-        }
-
-        $this->data['explicit'] = $explicit;
-
-        return $this->data['explicit'];
-    }
-
-    /**
-     * Get the entry keywords
-     *
-     * @return string
-     */
-    public function getKeywords()
-    {
-        if (isset($this->data['keywords'])) {
-            return $this->data['keywords'];
-        }
-
-        $keywords = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
-
-        if (!$keywords) {
-            $keywords = null;
-        }
-
-        $this->data['keywords'] = $keywords;
-
-        return $this->data['keywords'];
-    }
-
-    /**
-     * Get the entry subtitle
-     *
-     * @return string
-     */
-    public function getSubtitle()
-    {
-        if (isset($this->data['subtitle'])) {
-            return $this->data['subtitle'];
-        }
-
-        $subtitle = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
-
-        if (!$subtitle) {
-            $subtitle = null;
-        }
-
-        $this->data['subtitle'] = $subtitle;
-
-        return $this->data['subtitle'];
-    }
-
-    /**
-     * Get the entry summary
-     *
-     * @return string
-     */
-    public function getSummary()
-    {
-        if (isset($this->data['summary'])) {
-            return $this->data['summary'];
-        }
-
-        $summary = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
-
-        if (!$summary) {
-            $summary = null;
-        }
-
-        $this->data['summary'] = $summary;
-
-        return $this->data['summary'];
-    }
-
-    /**
-     * Register iTunes namespace
-     *
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
deleted file mode 100644
index 4ae7bf3..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Podcast;
-
-use DOMText;
-use Zend\Feed\Reader\Extension;
-
-/**
-*/
-class Feed extends Extension\AbstractFeed
-{
-    /**
-     * Get the entry author
-     *
-     * @return string
-     */
-    public function getCastAuthor()
-    {
-        if (isset($this->data['author'])) {
-            return $this->data['author'];
-        }
-
-        $author = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:author)');
-
-        if (!$author) {
-            $author = null;
-        }
-
-        $this->data['author'] = $author;
-
-        return $this->data['author'];
-    }
-
-    /**
-     * Get the entry block
-     *
-     * @return string
-     */
-    public function getBlock()
-    {
-        if (isset($this->data['block'])) {
-            return $this->data['block'];
-        }
-
-        $block = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:block)');
-
-        if (!$block) {
-            $block = null;
-        }
-
-        $this->data['block'] = $block;
-
-        return $this->data['block'];
-    }
-
-    /**
-     * Get the entry category
-     *
-     * @return array|null
-     */
-    public function getItunesCategories()
-    {
-        if (isset($this->data['categories'])) {
-            return $this->data['categories'];
-        }
-
-        $categoryList = $this->xpath->query($this->getXpathPrefix() . '/itunes:category');
-
-        $categories = [];
-
-        if ($categoryList->length > 0) {
-            foreach ($categoryList as $node) {
-                $children = null;
-
-                if ($node->childNodes->length > 0) {
-                    $children = [];
-
-                    foreach ($node->childNodes as $childNode) {
-                        if (!($childNode instanceof DOMText)) {
-                            $children[$childNode->getAttribute('text')] = null;
-                        }
-                    }
-                }
-
-                $categories[$node->getAttribute('text')] = $children;
-            }
-        }
-
-        if (!$categories) {
-            $categories = null;
-        }
-
-        $this->data['categories'] = $categories;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Get the entry explicit
-     *
-     * @return string
-     */
-    public function getExplicit()
-    {
-        if (isset($this->data['explicit'])) {
-            return $this->data['explicit'];
-        }
-
-        $explicit = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:explicit)');
-
-        if (!$explicit) {
-            $explicit = null;
-        }
-
-        $this->data['explicit'] = $explicit;
-
-        return $this->data['explicit'];
-    }
-
-    /**
-     * Get the entry image
-     *
-     * @return string
-     */
-    public function getItunesImage()
-    {
-        if (isset($this->data['image'])) {
-            return $this->data['image'];
-        }
-
-        $image = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:image/@href)');
-
-        if (!$image) {
-            $image = null;
-        }
-
-        $this->data['image'] = $image;
-
-        return $this->data['image'];
-    }
-
-    /**
-     * Get the entry keywords
-     *
-     * @return string
-     */
-    public function getKeywords()
-    {
-        if (isset($this->data['keywords'])) {
-            return $this->data['keywords'];
-        }
-
-        $keywords = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:keywords)');
-
-        if (!$keywords) {
-            $keywords = null;
-        }
-
-        $this->data['keywords'] = $keywords;
-
-        return $this->data['keywords'];
-    }
-
-    /**
-     * Get the entry's new feed url
-     *
-     * @return string
-     */
-    public function getNewFeedUrl()
-    {
-        if (isset($this->data['new-feed-url'])) {
-            return $this->data['new-feed-url'];
-        }
-
-        $newFeedUrl = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:new-feed-url)');
-
-        if (!$newFeedUrl) {
-            $newFeedUrl = null;
-        }
-
-        $this->data['new-feed-url'] = $newFeedUrl;
-
-        return $this->data['new-feed-url'];
-    }
-
-    /**
-     * Get the entry owner
-     *
-     * @return string
-     */
-    public function getOwner()
-    {
-        if (isset($this->data['owner'])) {
-            return $this->data['owner'];
-        }
-
-        $owner = null;
-
-        $email = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:email)');
-        $name  = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:owner/itunes:name)');
-
-        if (!empty($email)) {
-            $owner = $email . (empty($name) ? '' : ' (' . $name . ')');
-        } elseif (!empty($name)) {
-            $owner = $name;
-        }
-
-        if (!$owner) {
-            $owner = null;
-        }
-
-        $this->data['owner'] = $owner;
-
-        return $this->data['owner'];
-    }
-
-    /**
-     * Get the entry subtitle
-     *
-     * @return string
-     */
-    public function getSubtitle()
-    {
-        if (isset($this->data['subtitle'])) {
-            return $this->data['subtitle'];
-        }
-
-        $subtitle = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:subtitle)');
-
-        if (!$subtitle) {
-            $subtitle = null;
-        }
-
-        $this->data['subtitle'] = $subtitle;
-
-        return $this->data['subtitle'];
-    }
-
-    /**
-     * Get the entry summary
-     *
-     * @return string
-     */
-    public function getSummary()
-    {
-        if (isset($this->data['summary'])) {
-            return $this->data['summary'];
-        }
-
-        $summary = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/itunes:summary)');
-
-        if (!$summary) {
-            $summary = null;
-        }
-
-        $this->data['summary'] = $summary;
-
-        return $this->data['summary'];
-    }
-
-    /**
-     * Register iTunes namespace
-     *
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('itunes', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
deleted file mode 100644
index 4bd01fe..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Slash;
-
-use Zend\Feed\Reader\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the entry section
-     *
-     * @return string|null
-     */
-    public function getSection()
-    {
-        return $this->getData('section');
-    }
-
-    /**
-     * Get the entry department
-     *
-     * @return string|null
-     */
-    public function getDepartment()
-    {
-        return $this->getData('department');
-    }
-
-    /**
-     * Get the entry hit_parade
-     *
-     * @return array
-     */
-    public function getHitParade()
-    {
-        $name = 'hit_parade';
-
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
-        }
-
-        $stringParade = $this->getData($name);
-        $hitParade    = [];
-
-        if (!empty($stringParade)) {
-            $stringParade = explode(',', $stringParade);
-
-            foreach ($stringParade as $hit) {
-                $hitParade[] = $hit + 0; //cast to integer
-            }
-        }
-
-        $this->data[$name] = $hitParade;
-        return $hitParade;
-    }
-
-    /**
-     * Get the entry comments
-     *
-     * @return int
-     */
-    public function getCommentCount()
-    {
-        $name = 'comments';
-
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
-        }
-
-        $comments = $this->getData($name, 'string');
-
-        if (!$comments) {
-            $this->data[$name] = null;
-            return $this->data[$name];
-        }
-
-        return $comments;
-    }
-
-    /**
-     * Get the entry data specified by name
-     * @param string $name
-     * @param string $type
-     *
-     * @return mixed|null
-     */
-    protected function getData($name, $type = 'string')
-    {
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $data = $this->xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/slash10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Slash namespaces
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('slash10', 'http://purl.org/rss/1.0/modules/slash/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
deleted file mode 100644
index 09f12dd..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Syndication;
-
-use DateTime;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Extension;
-
-class Feed extends Extension\AbstractFeed
-{
-    /**
-     * Get update period
-     *
-     * @return string
-     * @throws Reader\Exception\InvalidArgumentException
-     */
-    public function getUpdatePeriod()
-    {
-        $name = 'updatePeriod';
-        $period = $this->getData($name);
-
-        if ($period === null) {
-            $this->data[$name] = 'daily';
-            return 'daily'; //Default specified by spec
-        }
-
-        switch ($period) {
-            case 'hourly':
-            case 'daily':
-            case 'weekly':
-            case 'yearly':
-                return $period;
-            default:
-                throw new Reader\Exception\InvalidArgumentException("Feed specified invalid update period: '$period'."
-                    .  " Must be one of hourly, daily, weekly or yearly"
-                );
-        }
-    }
-
-    /**
-     * Get update frequency
-     *
-     * @return int
-     */
-    public function getUpdateFrequency()
-    {
-        $name = 'updateFrequency';
-        $freq = $this->getData($name, 'number');
-
-        if (!$freq || $freq < 1) {
-            $this->data[$name] = 1;
-            return 1;
-        }
-
-        return $freq;
-    }
-
-    /**
-     * Get update frequency as ticks
-     *
-     * @return int
-     */
-    public function getUpdateFrequencyAsTicks()
-    {
-        $name = 'updateFrequency';
-        $freq = $this->getData($name, 'number');
-
-        if (!$freq || $freq < 1) {
-            $this->data[$name] = 1;
-            $freq = 1;
-        }
-
-        $period = $this->getUpdatePeriod();
-        $ticks = 1;
-
-        switch ($period) {
-            case 'yearly':
-                $ticks *= 52; //TODO: fix generalisation, how?
-                // no break
-            case 'weekly':
-                $ticks *= 7;
-                // no break
-            case 'daily':
-                $ticks *= 24;
-                // no break
-            case 'hourly':
-                $ticks *= 3600;
-                break;
-            default: //Never arrive here, exception thrown in getPeriod()
-                break;
-        }
-
-        return $ticks / $freq;
-    }
-
-    /**
-     * Get update base
-     *
-     * @return DateTime|null
-     */
-    public function getUpdateBase()
-    {
-        $updateBase = $this->getData('updateBase');
-        $date = null;
-        if ($updateBase) {
-            $date = DateTime::createFromFormat(DateTime::W3C, $updateBase);
-        }
-        return $date;
-    }
-
-    /**
-     * Get the entry data specified by name
-     *
-     * @param string $name
-     * @param string $type
-     * @return mixed|null
-     */
-    private function getData($name, $type = 'string')
-    {
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $data = $this->xpath->evaluate($type . '(' . $this->getXpathPrefix() . '/syn10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Syndication namespaces
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('syn10', 'http://purl.org/rss/1.0/modules/syndication/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
deleted file mode 100644
index e5de5bb..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\Thread;
-
-use Zend\Feed\Reader\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the "in-reply-to" value
-     *
-     * @return string
-     */
-    public function getInReplyTo()
-    {
-        // TODO: to be implemented
-    }
-
-    // TODO: Implement "replies" and "updated" constructs from standard
-
-    /**
-     * Get the total number of threaded responses (i.e comments)
-     *
-     * @return int|null
-     */
-    public function getCommentCount()
-    {
-        return $this->getData('total');
-    }
-
-    /**
-     * Get the entry data specified by name
-     *
-     * @param  string $name
-     * @return mixed|null
-     */
-    protected function getData($name)
-    {
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $data = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/thread10:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Atom Thread Extension 1.0 namespace
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('thread10', 'http://purl.org/syndication/thread/1.0');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
deleted file mode 100644
index 42fafb4..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Extension\WellFormedWeb;
-
-use Zend\Feed\Reader\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractEntry
-{
-    /**
-     * Get the entry comment Uri
-     *
-     * @return string|null
-     */
-    public function getCommentFeedLink()
-    {
-        $name = 'commentRss';
-        if (array_key_exists($name, $this->data)) {
-            return $this->data[$name];
-        }
-
-        $data = $this->xpath->evaluate('string(' . $this->getXpathPrefix() . '/wfw:' . $name . ')');
-
-        if (!$data) {
-            $data = null;
-        }
-
-        $this->data[$name] = $data;
-
-        return $data;
-    }
-
-    /**
-     * Register Slash namespaces
-     *
-     * @return void
-     */
-    protected function registerNamespaces()
-    {
-        $this->xpath->registerNamespace('wfw', 'http://wellformedweb.org/CommentAPI/');
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
deleted file mode 100644
index 6740cc9..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-/**
- * Default implementation of ExtensionManagerInterface
- *
- * Decorator of ExtensionPluginManager.
- */
-class ExtensionManager implements ExtensionManagerInterface
-{
-    protected $pluginManager;
-
-    /**
-     * Constructor
-     *
-     * Seeds the extension manager with a plugin manager; if none provided,
-     * creates an instance.
-     *
-     * @param  null|ExtensionPluginManager $pluginManager
-     */
-    public function __construct(ExtensionPluginManager $pluginManager = null)
-    {
-        if (null === $pluginManager) {
-            $pluginManager = new ExtensionPluginManager();
-        }
-        $this->pluginManager = $pluginManager;
-    }
-
-    /**
-     * Method overloading
-     *
-     * Proxy to composed ExtensionPluginManager instance.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\BadMethodCallException
-     */
-    public function __call($method, $args)
-    {
-        if (!method_exists($this->pluginManager, $method)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                'Method by name of %s does not exist in %s',
-                $method,
-                __CLASS__
-            ));
-        }
-        return call_user_func_array([$this->pluginManager, $method], $args);
-    }
-
-    /**
-     * Get the named extension
-     *
-     * @param  string $name
-     * @return Extension\AbstractEntry|Extension\AbstractFeed
-     */
-    public function get($name)
-    {
-        return $this->pluginManager->get($name);
-    }
-
-    /**
-     * Do we have the named extension?
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function has($name)
-    {
-        return $this->pluginManager->has($name);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
deleted file mode 100644
index 70ec37d..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-interface ExtensionManagerInterface
-{
-    /**
-     * Do we have the extension?
-     *
-     * @param  string $extension
-     * @return bool
-     */
-    public function has($extension);
-
-    /**
-     * Retrieve the extension
-     *
-     * @param  string $extension
-     * @return mixed
-     */
-    public function get($extension);
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
deleted file mode 100644
index 431be12..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use Zend\ServiceManager\AbstractPluginManager;
-
-/**
- * Plugin manager implementation for feed reader extensions based on the
- * AbstractPluginManager.
- *
- * Validation checks that we have an Extension\AbstractEntry or
- * Extension\AbstractFeed.
- */
-class ExtensionPluginManager extends AbstractPluginManager
-{
-    /**
-     * Default set of extension classes
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'atomentry'            => 'Zend\Feed\Reader\Extension\Atom\Entry',
-        'atomfeed'             => 'Zend\Feed\Reader\Extension\Atom\Feed',
-        'contententry'         => 'Zend\Feed\Reader\Extension\Content\Entry',
-        'creativecommonsentry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
-        'creativecommonsfeed'  => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
-        'dublincoreentry'      => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
-        'dublincorefeed'       => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
-        'podcastentry'         => 'Zend\Feed\Reader\Extension\Podcast\Entry',
-        'podcastfeed'          => 'Zend\Feed\Reader\Extension\Podcast\Feed',
-        'slashentry'           => 'Zend\Feed\Reader\Extension\Slash\Entry',
-        'syndicationfeed'      => 'Zend\Feed\Reader\Extension\Syndication\Feed',
-        'threadentry'          => 'Zend\Feed\Reader\Extension\Thread\Entry',
-        'wellformedwebentry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
-    ];
-
-    /**
-     * Do not share instances
-     *
-     * @var bool
-     */
-    protected $shareByDefault = false;
-
-    /**
-     * Validate the plugin
-     *
-     * Checks that the extension loaded is of a valid type.
-     *
-     * @param  mixed $plugin
-     * @return void
-     * @throws Exception\InvalidArgumentException if invalid
-     */
-    public function validatePlugin($plugin)
-    {
-        if ($plugin instanceof Extension\AbstractEntry
-            || $plugin instanceof Extension\AbstractFeed
-        ) {
-            // we're okay
-            return;
-        }
-
-        throw new Exception\InvalidArgumentException(sprintf(
-            'Plugin of type %s is invalid; must implement %s\Extension\AbstractFeed '
-            . 'or %s\Extension\AbstractEntry',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
-            __NAMESPACE__,
-            __NAMESPACE__
-        ));
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
deleted file mode 100644
index 78b671d..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Feed;
-
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Exception;
-
-/**
-*/
-abstract class AbstractFeed implements FeedInterface
-{
-    /**
-     * Parsed feed data
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Parsed feed data in the shape of a DOMDocument
-     *
-     * @var DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * An array of parsed feed entries
-     *
-     * @var array
-     */
-    protected $entries = [];
-
-    /**
-     * A pointer for the iterator to keep track of the entries array
-     *
-     * @var int
-     */
-    protected $entriesKey = 0;
-
-    /**
-     * The base XPath query used to retrieve feed data
-     *
-     * @var DOMXPath
-     */
-    protected $xpath = null;
-
-    /**
-     * Array of loaded extensions
-     *
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * Original Source URI (set if imported from a URI)
-     *
-     * @var string
-     */
-    protected $originalSourceUri = null;
-
-    /**
-     * Constructor
-     *
-     * @param DOMDocument $domDocument The DOM object for the feed's XML
-     * @param string $type Feed type
-     */
-    public function __construct(DOMDocument $domDocument, $type = null)
-    {
-        $this->domDocument = $domDocument;
-        $this->xpath = new DOMXPath($this->domDocument);
-
-        if ($type !== null) {
-            $this->data['type'] = $type;
-        } else {
-            $this->data['type'] = Reader\Reader::detectType($this->domDocument);
-        }
-        $this->registerNamespaces();
-        $this->indexEntries();
-        $this->loadExtensions();
-    }
-
-    /**
-     * Set an original source URI for the feed being parsed. This value
-     * is returned from getFeedLink() method if the feed does not carry
-     * a self-referencing URI.
-     *
-     * @param string $uri
-     */
-    public function setOriginalSourceUri($uri)
-    {
-        $this->originalSourceUri = $uri;
-    }
-
-    /**
-     * Get an original source URI for the feed being parsed. Returns null if
-     * unset or the feed was not imported from a URI.
-     *
-     * @return string|null
-     */
-    public function getOriginalSourceUri()
-    {
-        return $this->originalSourceUri;
-    }
-
-    /**
-     * Get the number of feed entries.
-     * Required by the Iterator interface.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->entries);
-    }
-
-    /**
-     * Return the current entry
-     *
-     * @return \Zend\Feed\Reader\Entry\EntryInterface
-     */
-    public function current()
-    {
-        if (substr($this->getType(), 0, 3) == 'rss') {
-            $reader = new Reader\Entry\Rss($this->entries[$this->key()], $this->key(), $this->getType());
-        } else {
-            $reader = new Reader\Entry\Atom($this->entries[$this->key()], $this->key(), $this->getType());
-        }
-
-        $reader->setXpath($this->xpath);
-
-        return $reader;
-    }
-
-    /**
-     * Get the DOM
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Get the Feed's encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        $assumed = $this->getDomDocument()->encoding;
-        if (empty($assumed)) {
-            $assumed = 'UTF-8';
-        }
-        return $assumed;
-    }
-
-    /**
-     * Get feed as xml
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        return $this->getDomDocument()->saveXml();
-    }
-
-    /**
-     * Get the DOMElement representing the items/feed element
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->getDomDocument()->documentElement;
-    }
-
-    /**
-     * Get the DOMXPath object for this feed
-     *
-     * @return DOMXPath
-     */
-    public function getXpath()
-    {
-        return $this->xpath;
-    }
-
-    /**
-     * Get the feed type
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->data['type'];
-    }
-
-    /**
-     * Return the current feed key
-     *
-     * @return int
-     */
-    public function key()
-    {
-        return $this->entriesKey;
-    }
-
-    /**
-     * Move the feed pointer forward
-     *
-     */
-    public function next()
-    {
-        ++$this->entriesKey;
-    }
-
-    /**
-     * Reset the pointer in the feed object
-     *
-     */
-    public function rewind()
-    {
-        $this->entriesKey = 0;
-    }
-
-    /**
-     * Check to see if the iterator is still valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return 0 <= $this->entriesKey && $this->entriesKey < $this->count();
-    }
-
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            if (method_exists($extension, $method)) {
-                return call_user_func_array([$extension, $method], $args);
-            }
-        }
-        throw new Exception\BadMethodCallException('Method: ' . $method
-        . 'does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Feed)
-     *
-     * @param string $name
-     * @return \Zend\Feed\Reader\Extension\AbstractFeed
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '\\Feed', $this->extensions)) {
-            return $this->extensions[$name . '\\Feed'];
-        }
-        return;
-    }
-
-    protected function loadExtensions()
-    {
-        $all     = Reader\Reader::getExtensions();
-        $manager = Reader\Reader::getExtensionManager();
-        $feed    = $all['feed'];
-        foreach ($feed as $extension) {
-            if (in_array($extension, $all['core'])) {
-                continue;
-            }
-            if (!$manager->has($extension)) {
-                throw new Exception\RuntimeException(sprintf('Unable to load extension "%s"; cannot find class', $extension));
-            }
-            $plugin = $manager->get($extension);
-            $plugin->setDomDocument($this->getDomDocument());
-            $plugin->setType($this->data['type']);
-            $plugin->setXpath($this->xpath);
-            $this->extensions[$extension] = $plugin;
-        }
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     */
-    abstract protected function indexEntries();
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    abstract protected function registerNamespaces();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
deleted file mode 100644
index 3706470..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Feed;
-
-use DOMDocument;
-use Zend\Feed\Reader;
-
-/**
-*/
-class Atom extends AbstractFeed
-{
-    /**
-     * Constructor
-     *
-     * @param  DOMDocument $dom
-     * @param  string $type
-     */
-    public function __construct(DOMDocument $dom, $type = null)
-    {
-        parent::__construct($dom, $type);
-        $manager = Reader\Reader::getExtensionManager();
-
-        $atomFeed = $manager->get('Atom\Feed');
-        $atomFeed->setDomDocument($dom);
-        $atomFeed->setType($this->data['type']);
-        $atomFeed->setXpath($this->xpath);
-        $this->extensions['Atom\\Feed'] = $atomFeed;
-
-        $atomFeed = $manager->get('DublinCore\Feed');
-        $atomFeed->setDomDocument($dom);
-        $atomFeed->setType($this->data['type']);
-        $atomFeed->setXpath($this->xpath);
-        $this->extensions['DublinCore\\Feed'] = $atomFeed;
-
-        foreach ($this->extensions as $extension) {
-            $extension->setXpathPrefix('/atom:feed');
-        }
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = $this->getExtension('Atom')->getAuthors();
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->data)) {
-            return $this->data['copyright'];
-        }
-
-        $copyright = $this->getExtension('Atom')->getCopyright();
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->data['copyright'] = $copyright;
-
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        if (array_key_exists('datecreated', $this->data)) {
-            return $this->data['datecreated'];
-        }
-
-        $dateCreated = $this->getExtension('Atom')->getDateCreated();
-
-        if (!$dateCreated) {
-            $dateCreated = null;
-        }
-
-        $this->data['datecreated'] = $dateCreated;
-
-        return $this->data['datecreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $dateModified = $this->getExtension('Atom')->getDateModified();
-
-        if (!$dateModified) {
-            $dateModified = null;
-        }
-
-        $this->data['datemodified'] = $dateModified;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the feed lastBuild date. This is not implemented in Atom.
-     *
-     * @return string|null
-     */
-    public function getLastBuildDate()
-    {
-        return;
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        $description = $this->getExtension('Atom')->getDescription();
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->data)) {
-            return $this->data['generator'];
-        }
-
-        $generator = $this->getExtension('Atom')->getGenerator();
-
-        $this->data['generator'] = $generator;
-
-        return $this->data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = $this->getExtension('Atom')->getId();
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->data)) {
-            return $this->data['language'];
-        }
-
-        $language = $this->getExtension('Atom')->getLanguage();
-
-        if (!$language) {
-            $language = $this->xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->data['language'] = $language;
-
-        return $this->data['language'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (array_key_exists('baseUrl', $this->data)) {
-            return $this->data['baseUrl'];
-        }
-
-        $baseUrl = $this->getExtension('Atom')->getBaseUrl();
-
-        $this->data['baseUrl'] = $baseUrl;
-
-        return $this->data['baseUrl'];
-    }
-
-    /**
-     * Get a link to the source website
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->data)) {
-            return $this->data['link'];
-        }
-
-        $link = $this->getExtension('Atom')->getLink();
-
-        $this->data['link'] = $link;
-
-        return $this->data['link'];
-    }
-
-    /**
-     * Get feed image data
-     *
-     * @return array|null
-     */
-    public function getImage()
-    {
-        if (array_key_exists('image', $this->data)) {
-            return $this->data['image'];
-        }
-
-        $link = $this->getExtension('Atom')->getImage();
-
-        $this->data['image'] = $link;
-
-        return $this->data['image'];
-    }
-
-    /**
-     * Get a link to the feed's XML Url
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->data)) {
-            return $this->data['feedlink'];
-        }
-
-        $link = $this->getExtension('Atom')->getFeedLink();
-
-        if ($link === null || empty($link)) {
-            $link = $this->getOriginalSourceUri();
-        }
-
-        $this->data['feedlink'] = $link;
-
-        return $this->data['feedlink'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        $title = $this->getExtension('Atom')->getTitle();
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->data)) {
-            return $this->data['hubs'];
-        }
-
-        $hubs = $this->getExtension('Atom')->getHubs();
-
-        $this->data['hubs'] = $hubs;
-
-        return $this->data['hubs'];
-    }
-
-    /**
-     * Get all categories
-     *
-     * @return Reader\Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        $categoryCollection = $this->getExtension('Atom')->getCategories();
-
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     * @return void
-     */
-    protected function indexEntries()
-    {
-        if ($this->getType() == Reader\Reader::TYPE_ATOM_10 ||
-            $this->getType() == Reader\Reader::TYPE_ATOM_03) {
-            $entries = $this->xpath->evaluate('//atom:entry');
-
-            foreach ($entries as $index => $entry) {
-                $this->entries[$index] = $entry;
-            }
-        }
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    protected function registerNamespaces()
-    {
-        switch ($this->data['type']) {
-            case Reader\Reader::TYPE_ATOM_03:
-                $this->xpath->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_03);
-                break;
-            case Reader\Reader::TYPE_ATOM_10:
-            default:
-                $this->xpath->registerNamespace('atom', Reader\Reader::NAMESPACE_ATOM_10);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
deleted file mode 100644
index 4f15b55..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Feed\Atom;
-
-use DOMElement;
-use DOMXPath;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Feed;
-
-/**
-*/
-class Source extends Feed\Atom
-{
-    /**
-     * Constructor: Create a Source object which is largely just a normal
-     * Zend\Feed\Reader\AbstractFeed object only designed to retrieve feed level
-     * metadata from an Atom entry's source element.
-     *
-     * @param DOMElement $source
-     * @param string $xpathPrefix Passed from parent Entry object
-     * @param string $type Nearly always Atom 1.0
-     */
-    public function __construct(DOMElement $source, $xpathPrefix, $type = Reader\Reader::TYPE_ATOM_10)
-    {
-        $this->domDocument = $source->ownerDocument;
-        $this->xpath = new DOMXPath($this->domDocument);
-        $this->data['type'] = $type;
-        $this->registerNamespaces();
-        $this->loadExtensions();
-
-        $manager = Reader\Reader::getExtensionManager();
-        $extensions = ['Atom\Feed', 'DublinCore\Feed'];
-
-        foreach ($extensions as $name) {
-            $extension = $manager->get($name);
-            $extension->setDomDocument($this->domDocument);
-            $extension->setType($this->data['type']);
-            $extension->setXpath($this->xpath);
-            $this->extensions[$name] = $extension;
-        }
-
-        foreach ($this->extensions as $extension) {
-            $extension->setXpathPrefix(rtrim($xpathPrefix, '/') . '/atom:source');
-        }
-    }
-
-    /**
-     * Since this is not an Entry carrier but a vehicle for Feed metadata, any
-     * applicable Entry methods are stubbed out and do nothing.
-     */
-
-    /**
-     * @return void
-     */
-    public function count()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    public function current()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    public function key()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    public function next()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    public function rewind()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    public function valid()
-    {
-    }
-
-    /**
-     * @return void
-     */
-    protected function indexEntries()
-    {
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php b/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
deleted file mode 100644
index 441ba92..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Feed;
-
-use Countable;
-use Iterator;
-
-/**
-*/
-interface FeedInterface extends Iterator, Countable
-{
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0);
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors();
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright();
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated();
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified();
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription();
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator();
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId();
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage();
-
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink();
-
-    /**
-     * Get a link to the XML feed
-     *
-     * @return string|null
-     */
-    public function getFeedLink();
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle();
-
-    /**
-     * Get all categories
-     *
-     * @return \Zend\Feed\Reader\Collection\Category
-     */
-    public function getCategories();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
deleted file mode 100644
index 1a148b2..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
+++ /dev/null
@@ -1,694 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Feed;
-
-use DateTime;
-use DOMDocument;
-use Zend\Feed\Reader;
-use Zend\Feed\Reader\Collection;
-use Zend\Feed\Reader\Exception;
-
-/**
-*/
-class Rss extends AbstractFeed
-{
-    /**
-     * Constructor
-     *
-     * @param  DOMDocument $dom
-     * @param  string $type
-     */
-    public function __construct(DOMDocument $dom, $type = null)
-    {
-        parent::__construct($dom, $type);
-
-        $manager = Reader\Reader::getExtensionManager();
-
-        $feed = $manager->get('DublinCore\Feed');
-        $feed->setDomDocument($dom);
-        $feed->setType($this->data['type']);
-        $feed->setXpath($this->xpath);
-        $this->extensions['DublinCore\Feed'] = $feed;
-
-        $feed = $manager->get('Atom\Feed');
-        $feed->setDomDocument($dom);
-        $feed->setType($this->data['type']);
-        $feed->setXpath($this->xpath);
-        $this->extensions['Atom\Feed'] = $feed;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-            && $this->getType() !== Reader\Reader::TYPE_RSS_090
-        ) {
-            $xpathPrefix = '/rss/channel';
-        } else {
-            $xpathPrefix = '/rdf:RDF/rss:channel';
-        }
-        foreach ($this->extensions as $extension) {
-            $extension->setXpathPrefix($xpathPrefix);
-        }
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        $authors = $this->getAuthors();
-
-        if (isset($authors[$index])) {
-            return $authors[$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (array_key_exists('authors', $this->data)) {
-            return $this->data['authors'];
-        }
-
-        $authors = [];
-        $authorsDc = $this->getExtension('DublinCore')->getAuthors();
-        if (!empty($authorsDc)) {
-            foreach ($authorsDc as $author) {
-                $authors[] = [
-                    'name' => $author['name']
-                ];
-            }
-        }
-
-        /**
-         * Technically RSS doesn't specific author element use at the feed level
-         * but it's supported on a "just in case" basis.
-         */
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10
-        && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query('//author');
-        } else {
-            $list = $this->xpath->query('//rss:author');
-        }
-        if ($list->length) {
-            foreach ($list as $author) {
-                $string = trim($author->nodeValue);
-                $data = [];
-                // Pretty rough parsing - but it's a catchall
-                if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
-                    $data['email'] = trim($matches[0]);
-                    if (preg_match("/\((.*)\)$/", $string, $matches)) {
-                        $data['name'] = $matches[1];
-                    }
-                    $authors[] = $data;
-                }
-            }
-        }
-
-        if (count($authors) == 0) {
-            $authors = $this->getExtension('Atom')->getAuthors();
-        } else {
-            $authors = new Reader\Collection\Author(
-                Reader\Reader::arrayUnique($authors)
-            );
-        }
-
-        if (count($authors) == 0) {
-            $authors = null;
-        }
-
-        $this->data['authors'] = $authors;
-
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (array_key_exists('copyright', $this->data)) {
-            return $this->data['copyright'];
-        }
-
-        $copyright = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $copyright = $this->xpath->evaluate('string(/rss/channel/copyright)');
-        }
-
-        if (!$copyright && $this->getExtension('DublinCore') !== null) {
-            $copyright = $this->getExtension('DublinCore')->getCopyright();
-        }
-
-        if (empty($copyright)) {
-            $copyright = $this->getExtension('Atom')->getCopyright();
-        }
-
-        if (!$copyright) {
-            $copyright = null;
-        }
-
-        $this->data['copyright'] = $copyright;
-
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        return $this->getDateModified();
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return DateTime
-     * @throws Exception\RuntimeException
-     */
-    public function getDateModified()
-    {
-        if (array_key_exists('datemodified', $this->data)) {
-            return $this->data['datemodified'];
-        }
-
-        $date = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $dateModified = $this->xpath->evaluate('string(/rss/channel/pubDate)');
-            if (!$dateModified) {
-                $dateModified = $this->xpath->evaluate('string(/rss/channel/lastBuildDate)');
-            }
-            if ($dateModified) {
-                $dateModifiedParsed = strtotime($dateModified);
-                if ($dateModifiedParsed) {
-                    $date = new DateTime('@' . $dateModifiedParsed);
-                } else {
-                    $dateStandards = [DateTime::RSS, DateTime::RFC822,
-                                           DateTime::RFC2822, null];
-                    foreach ($dateStandards as $standard) {
-                        try {
-                            $date = DateTime::createFromFormat($standard, $dateModified);
-                            break;
-                        } catch (\Exception $e) {
-                            if ($standard === null) {
-                                throw new Exception\RuntimeException(
-                                    'Could not load date due to unrecognised'
-                                    .' format (should follow RFC 822 or 2822):'
-                                    . $e->getMessage(),
-                                    0, $e
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('DublinCore')->getDate();
-        }
-
-        if (!$date) {
-            $date = $this->getExtension('Atom')->getDateModified();
-        }
-
-        if (!$date) {
-            $date = null;
-        }
-
-        $this->data['datemodified'] = $date;
-
-        return $this->data['datemodified'];
-    }
-
-    /**
-     * Get the feed lastBuild date
-     *
-     * @throws Exception\RuntimeException
-     * @return DateTime
-     */
-    public function getLastBuildDate()
-    {
-        if (array_key_exists('lastBuildDate', $this->data)) {
-            return $this->data['lastBuildDate'];
-        }
-
-        $date = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $lastBuildDate = $this->xpath->evaluate('string(/rss/channel/lastBuildDate)');
-            if ($lastBuildDate) {
-                $lastBuildDateParsed = strtotime($lastBuildDate);
-                if ($lastBuildDateParsed) {
-                    $date = new DateTime('@' . $lastBuildDateParsed);
-                } else {
-                    $dateStandards = [DateTime::RSS, DateTime::RFC822,
-                                           DateTime::RFC2822, null];
-                    foreach ($dateStandards as $standard) {
-                        try {
-                            $date = DateTime::createFromFormat($standard, $lastBuildDateParsed);
-                            break;
-                        } catch (\Exception $e) {
-                            if ($standard === null) {
-                                throw new Exception\RuntimeException(
-                                    'Could not load date due to unrecognised'
-                                    .' format (should follow RFC 822 or 2822):'
-                                    . $e->getMessage(),
-                                    0, $e
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$date) {
-            $date = null;
-        }
-
-        $this->data['lastBuildDate'] = $date;
-
-        return $this->data['lastBuildDate'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (array_key_exists('description', $this->data)) {
-            return $this->data['description'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $description = $this->xpath->evaluate('string(/rss/channel/description)');
-        } else {
-            $description = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:description)');
-        }
-
-        if (!$description && $this->getExtension('DublinCore') !== null) {
-            $description = $this->getExtension('DublinCore')->getDescription();
-        }
-
-        if (empty($description)) {
-            $description = $this->getExtension('Atom')->getDescription();
-        }
-
-        if (!$description) {
-            $description = null;
-        }
-
-        $this->data['description'] = $description;
-
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (array_key_exists('id', $this->data)) {
-            return $this->data['id'];
-        }
-
-        $id = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $id = $this->xpath->evaluate('string(/rss/channel/guid)');
-        }
-
-        if (!$id && $this->getExtension('DublinCore') !== null) {
-            $id = $this->getExtension('DublinCore')->getId();
-        }
-
-        if (empty($id)) {
-            $id = $this->getExtension('Atom')->getId();
-        }
-
-        if (!$id) {
-            if ($this->getLink()) {
-                $id = $this->getLink();
-            } elseif ($this->getTitle()) {
-                $id = $this->getTitle();
-            } else {
-                $id = null;
-            }
-        }
-
-        $this->data['id'] = $id;
-
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the feed image data
-     *
-     * @return array|null
-     */
-    public function getImage()
-    {
-        if (array_key_exists('image', $this->data)) {
-            return $this->data['image'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query('/rss/channel/image');
-            $prefix = '/rss/channel/image[1]';
-        } else {
-            $list = $this->xpath->query('/rdf:RDF/rss:channel/rss:image');
-            $prefix = '/rdf:RDF/rss:channel/rss:image[1]';
-        }
-        if ($list->length > 0) {
-            $image = [];
-            $value = $this->xpath->evaluate('string(' . $prefix . '/url)');
-            if ($value) {
-                $image['uri'] = $value;
-            }
-            $value = $this->xpath->evaluate('string(' . $prefix . '/link)');
-            if ($value) {
-                $image['link'] = $value;
-            }
-            $value = $this->xpath->evaluate('string(' . $prefix . '/title)');
-            if ($value) {
-                $image['title'] = $value;
-            }
-            $value = $this->xpath->evaluate('string(' . $prefix . '/height)');
-            if ($value) {
-                $image['height'] = $value;
-            }
-            $value = $this->xpath->evaluate('string(' . $prefix . '/width)');
-            if ($value) {
-                $image['width'] = $value;
-            }
-            $value = $this->xpath->evaluate('string(' . $prefix . '/description)');
-            if ($value) {
-                $image['description'] = $value;
-            }
-        } else {
-            $image = null;
-        }
-
-        $this->data['image'] = $image;
-
-        return $this->data['image'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (array_key_exists('language', $this->data)) {
-            return $this->data['language'];
-        }
-
-        $language = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $language = $this->xpath->evaluate('string(/rss/channel/language)');
-        }
-
-        if (!$language && $this->getExtension('DublinCore') !== null) {
-            $language = $this->getExtension('DublinCore')->getLanguage();
-        }
-
-        if (empty($language)) {
-            $language = $this->getExtension('Atom')->getLanguage();
-        }
-
-        if (!$language) {
-            $language = $this->xpath->evaluate('string(//@xml:lang[1])');
-        }
-
-        if (!$language) {
-            $language = null;
-        }
-
-        $this->data['language'] = $language;
-
-        return $this->data['language'];
-    }
-
-    /**
-     * Get a link to the feed
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (array_key_exists('link', $this->data)) {
-            return $this->data['link'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $link = $this->xpath->evaluate('string(/rss/channel/link)');
-        } else {
-            $link = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:link)');
-        }
-
-        if (empty($link)) {
-            $link = $this->getExtension('Atom')->getLink();
-        }
-
-        if (!$link) {
-            $link = null;
-        }
-
-        $this->data['link'] = $link;
-
-        return $this->data['link'];
-    }
-
-    /**
-     * Get a link to the feed XML
-     *
-     * @return string|null
-     */
-    public function getFeedLink()
-    {
-        if (array_key_exists('feedlink', $this->data)) {
-            return $this->data['feedlink'];
-        }
-
-        $link = $this->getExtension('Atom')->getFeedLink();
-
-        if ($link === null || empty($link)) {
-            $link = $this->getOriginalSourceUri();
-        }
-
-        $this->data['feedlink'] = $link;
-
-        return $this->data['feedlink'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (array_key_exists('generator', $this->data)) {
-            return $this->data['generator'];
-        }
-
-        $generator = null;
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $generator = $this->xpath->evaluate('string(/rss/channel/generator)');
-        }
-
-        if (!$generator) {
-            if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-                $generator = $this->xpath->evaluate('string(/rss/channel/atom:generator)');
-            } else {
-                $generator = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/atom:generator)');
-            }
-        }
-
-        if (empty($generator)) {
-            $generator = $this->getExtension('Atom')->getGenerator();
-        }
-
-        if (!$generator) {
-            $generator = null;
-        }
-
-        $this->data['generator'] = $generator;
-
-        return $this->data['generator'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (array_key_exists('title', $this->data)) {
-            return $this->data['title'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $title = $this->xpath->evaluate('string(/rss/channel/title)');
-        } else {
-            $title = $this->xpath->evaluate('string(/rdf:RDF/rss:channel/rss:title)');
-        }
-
-        if (!$title && $this->getExtension('DublinCore') !== null) {
-            $title = $this->getExtension('DublinCore')->getTitle();
-        }
-
-        if (!$title) {
-            $title = $this->getExtension('Atom')->getTitle();
-        }
-
-        if (!$title) {
-            $title = null;
-        }
-
-        $this->data['title'] = $title;
-
-        return $this->data['title'];
-    }
-
-    /**
-     * Get an array of any supported Pusubhubbub endpoints
-     *
-     * @return array|null
-     */
-    public function getHubs()
-    {
-        if (array_key_exists('hubs', $this->data)) {
-            return $this->data['hubs'];
-        }
-
-        $hubs = $this->getExtension('Atom')->getHubs();
-
-        if (empty($hubs)) {
-            $hubs = null;
-        } else {
-            $hubs = array_unique($hubs);
-        }
-
-        $this->data['hubs'] = $hubs;
-
-        return $this->data['hubs'];
-    }
-
-    /**
-     * Get all categories
-     *
-     * @return Reader\Collection\Category
-     */
-    public function getCategories()
-    {
-        if (array_key_exists('categories', $this->data)) {
-            return $this->data['categories'];
-        }
-
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
-            $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $list = $this->xpath->query('/rss/channel//category');
-        } else {
-            $list = $this->xpath->query('/rdf:RDF/rss:channel//rss:category');
-        }
-
-        if ($list->length) {
-            $categoryCollection = new Collection\Category;
-            foreach ($list as $category) {
-                $categoryCollection[] = [
-                    'term' => $category->nodeValue,
-                    'scheme' => $category->getAttribute('domain'),
-                    'label' => $category->nodeValue,
-                ];
-            }
-        } else {
-            $categoryCollection = $this->getExtension('DublinCore')->getCategories();
-        }
-
-        if (count($categoryCollection) == 0) {
-            $categoryCollection = $this->getExtension('Atom')->getCategories();
-        }
-
-        $this->data['categories'] = $categoryCollection;
-
-        return $this->data['categories'];
-    }
-
-    /**
-     * Read all entries to the internal entries array
-     *
-     */
-    protected function indexEntries()
-    {
-        if ($this->getType() !== Reader\Reader::TYPE_RSS_10 && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
-            $entries = $this->xpath->evaluate('//item');
-        } else {
-            $entries = $this->xpath->evaluate('//rss:item');
-        }
-
-        foreach ($entries as $index => $entry) {
-            $this->entries[$index] = $entry;
-        }
-    }
-
-    /**
-     * Register the default namespaces for the current feed format
-     *
-     */
-    protected function registerNamespaces()
-    {
-        switch ($this->data['type']) {
-            case Reader\Reader::TYPE_RSS_10:
-                $this->xpath->registerNamespace('rdf', Reader\Reader::NAMESPACE_RDF);
-                $this->xpath->registerNamespace('rss', Reader\Reader::NAMESPACE_RSS_10);
-                break;
-
-            case Reader\Reader::TYPE_RSS_090:
-                $this->xpath->registerNamespace('rdf', Reader\Reader::NAMESPACE_RDF);
-                $this->xpath->registerNamespace('rss', Reader\Reader::NAMESPACE_RSS_090);
-                break;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/FeedSet.php b/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
deleted file mode 100644
index d890532..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use ArrayObject;
-use DOMNodeList;
-use Zend\Feed\Uri;
-
-class FeedSet extends ArrayObject
-{
-    public $rss = null;
-
-    public $rdf = null;
-
-    public $atom = null;
-
-    /**
-     * Import a DOMNodeList from any document containing a set of links
-     * for alternate versions of a document, which will normally refer to
-     * RSS/RDF/Atom feeds for the current document.
-     *
-     * All such links are stored internally, however the first instance of
-     * each RSS, RDF or Atom type has its URI stored as a public property
-     * as a shortcut where the use case is simply to get a quick feed ref.
-     *
-     * Note that feeds are not loaded at this point, but will be lazy
-     * loaded automatically when each links 'feed' array key is accessed.
-     *
-     * @param DOMNodeList $links
-     * @param string $uri
-     * @return void
-     */
-    public function addLinks(DOMNodeList $links, $uri)
-    {
-        foreach ($links as $link) {
-            if (strtolower($link->getAttribute('rel')) !== 'alternate'
-                || !$link->getAttribute('type') || !$link->getAttribute('href')) {
-                continue;
-            }
-            if (!isset($this->rss) && $link->getAttribute('type') == 'application/rss+xml') {
-                $this->rss = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif (!isset($this->atom) && $link->getAttribute('type') == 'application/atom+xml') {
-                $this->atom = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
-            } elseif (!isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
-                $this->rdf = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
-            }
-            $this[] = new static([
-                'rel' => 'alternate',
-                'type' => $link->getAttribute('type'),
-                'href' => $this->absolutiseUri(trim($link->getAttribute('href')), $uri),
-            ]);
-        }
-    }
-
-    /**
-     *  Attempt to turn a relative URI into an absolute URI
-     */
-    protected function absolutiseUri($link, $uri = null)
-    {
-        $linkUri = Uri::factory($link);
-        if (!$linkUri->isAbsolute() or !$linkUri->isValid()) {
-            if ($uri !== null) {
-                $uri = Uri::factory($uri);
-
-                if ($link[0] !== '/') {
-                    $link = $uri->getPath() . '/' . $link;
-                }
-
-                $link   = sprintf(
-                    '%s://%s/%s',
-                    ($uri->getScheme() ?: 'http'),
-                    $uri->getHost(),
-                    $this->canonicalizePath($link)
-                );
-
-                if (!Uri::factory($link)->isValid()) {
-                    $link = null;
-                }
-            }
-        }
-        return $link;
-    }
-
-    /**
-     *  Canonicalize relative path
-     */
-    protected function canonicalizePath($path)
-    {
-        $parts = array_filter(explode('/', $path));
-        $absolutes = [];
-        foreach ($parts as $part) {
-            if ('.' == $part) {
-                continue;
-            }
-            if ('..' == $part) {
-                array_pop($absolutes);
-            } else {
-                $absolutes[] = $part;
-            }
-        }
-        return implode('/', $absolutes);
-    }
-
-    /**
-     * Supports lazy loading of feeds using Reader::import() but
-     * delegates any other operations to the parent class.
-     *
-     * @param string $offset
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        if ($offset == 'feed' && !$this->offsetExists('feed')) {
-            if (!$this->offsetExists('href')) {
-                return;
-            }
-            $feed = Reader::import($this->offsetGet('href'));
-            $this->offsetSet('feed', $feed);
-            return $feed;
-        }
-        return parent::offsetGet($offset);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
deleted file mode 100644
index 1387981..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Http;
-
-interface ClientInterface
-{
-    /**
-     * Make a GET request to a given URI
-     *
-     * @param  string $uri
-     * @return ResponseInterface
-     */
-    public function get($uri);
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
deleted file mode 100644
index 96b422e..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader\Http;
-
-interface ResponseInterface
-{
-    /**
-     * Retrieve the response body
-     *
-     * @return string
-     */
-    public function getBody();
-
-    /**
-     * Retrieve the HTTP response status code
-     *
-     * @return int
-     */
-    public function getStatusCode();
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/Reader.php b/vendor/zendframework/zend-feed/src/Reader/Reader.php
deleted file mode 100644
index 09bdcf4..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/Reader.php
+++ /dev/null
@@ -1,676 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-use DOMDocument;
-use DOMXPath;
-use Zend\Cache\Storage\StorageInterface as CacheStorage;
-use Zend\Http as ZendHttp;
-use Zend\Stdlib\ErrorHandler;
-
-/**
-*/
-class Reader implements ReaderImportInterface
-{
-    /**
-     * Namespace constants
-     */
-    const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
-    const NAMESPACE_ATOM_10  = 'http://www.w3.org/2005/Atom';
-    const NAMESPACE_RDF      = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    const NAMESPACE_RSS_090  = 'http://my.netscape.com/rdf/simple/0.9/';
-    const NAMESPACE_RSS_10   = 'http://purl.org/rss/1.0/';
-
-    /**
-     * Feed type constants
-     */
-    const TYPE_ANY              = 'any';
-    const TYPE_ATOM_03          = 'atom-03';
-    const TYPE_ATOM_10          = 'atom-10';
-    const TYPE_ATOM_10_ENTRY    = 'atom-10-entry';
-    const TYPE_ATOM_ANY         = 'atom';
-    const TYPE_RSS_090          = 'rss-090';
-    const TYPE_RSS_091          = 'rss-091';
-    const TYPE_RSS_091_NETSCAPE = 'rss-091n';
-    const TYPE_RSS_091_USERLAND = 'rss-091u';
-    const TYPE_RSS_092          = 'rss-092';
-    const TYPE_RSS_093          = 'rss-093';
-    const TYPE_RSS_094          = 'rss-094';
-    const TYPE_RSS_10           = 'rss-10';
-    const TYPE_RSS_20           = 'rss-20';
-    const TYPE_RSS_ANY          = 'rss';
-
-    /**
-     * Cache instance
-     *
-     * @var CacheStorage
-     */
-    protected static $cache = null;
-
-    /**
-     * HTTP client object to use for retrieving feeds
-     *
-     * @var ZendHttp\Client
-     */
-    protected static $httpClient = null;
-
-    /**
-     * Override HTTP PUT and DELETE request methods?
-     *
-     * @var bool
-     */
-    protected static $httpMethodOverride = false;
-
-    protected static $httpConditionalGet = false;
-
-    protected static $extensionManager = null;
-
-    protected static $extensions = [
-        'feed' => [
-            'DublinCore\Feed',
-            'Atom\Feed'
-        ],
-        'entry' => [
-            'Content\Entry',
-            'DublinCore\Entry',
-            'Atom\Entry'
-        ],
-        'core' => [
-            'DublinCore\Feed',
-            'Atom\Feed',
-            'Content\Entry',
-            'DublinCore\Entry',
-            'Atom\Entry'
-        ]
-    ];
-
-    /**
-     * Get the Feed cache
-     *
-     * @return CacheStorage
-     */
-    public static function getCache()
-    {
-        return static::$cache;
-    }
-
-    /**
-     * Set the feed cache
-     *
-     * @param  CacheStorage $cache
-     * @return void
-     */
-    public static function setCache(CacheStorage $cache)
-    {
-        static::$cache = $cache;
-    }
-
-    /**
-     * Set the HTTP client instance
-     *
-     * Sets the HTTP client object to use for retrieving the feeds.
-     *
-     * @param  ZendHttp\Client $httpClient
-     * @return void
-     */
-    public static function setHttpClient(ZendHttp\Client $httpClient)
-    {
-        static::$httpClient = $httpClient;
-    }
-
-    /**
-     * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
-     *
-     * @return ZendHttp\Client
-     */
-    public static function getHttpClient()
-    {
-        if (!static::$httpClient instanceof ZendHttp\Client) {
-            static::$httpClient = new ZendHttp\Client();
-        }
-
-        return static::$httpClient;
-    }
-
-    /**
-     * Toggle using POST instead of PUT and DELETE HTTP methods
-     *
-     * Some feed implementations do not accept PUT and DELETE HTTP
-     * methods, or they can't be used because of proxies or other
-     * measures. This allows turning on using POST where PUT and
-     * DELETE would normally be used; in addition, an
-     * X-Method-Override header will be sent with a value of PUT or
-     * DELETE as appropriate.
-     *
-     * @param  bool $override Whether to override PUT and DELETE.
-     * @return void
-     */
-    public static function setHttpMethodOverride($override = true)
-    {
-        static::$httpMethodOverride = $override;
-    }
-
-    /**
-     * Get the HTTP override state
-     *
-     * @return bool
-     */
-    public static function getHttpMethodOverride()
-    {
-        return static::$httpMethodOverride;
-    }
-
-    /**
-     * Set the flag indicating whether or not to use HTTP conditional GET
-     *
-     * @param  bool $bool
-     * @return void
-     */
-    public static function useHttpConditionalGet($bool = true)
-    {
-        static::$httpConditionalGet = $bool;
-    }
-
-    /**
-     * Import a feed by providing a URI
-     *
-     * @param  string $uri The URI to the feed
-     * @param  string $etag OPTIONAL Last received ETag for this resource
-     * @param  string $lastModified OPTIONAL Last-Modified value for this resource
-     * @return Feed\FeedInterface
-     * @throws Exception\RuntimeException
-     */
-    public static function import($uri, $etag = null, $lastModified = null)
-    {
-        $cache       = self::getCache();
-        $client      = self::getHttpClient();
-        $client->resetParameters();
-        $headers = new ZendHttp\Headers();
-        $client->setHeaders($headers);
-        $client->setUri($uri);
-        $cacheId = 'Zend_Feed_Reader_' . md5($uri);
-
-        if (static::$httpConditionalGet && $cache) {
-            $data = $cache->getItem($cacheId);
-            if ($data) {
-                if ($etag === null) {
-                    $etag = $cache->getItem($cacheId . '_etag');
-                }
-                if ($lastModified === null) {
-                    $lastModified = $cache->getItem($cacheId . '_lastmodified');
-                }
-                if ($etag) {
-                    $headers->addHeaderLine('If-None-Match', $etag);
-                }
-                if ($lastModified) {
-                    $headers->addHeaderLine('If-Modified-Since', $lastModified);
-                }
-            }
-            $response = $client->send();
-            if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            if ($response->getStatusCode() == 304) {
-                $responseXml = $data;
-            } else {
-                $responseXml = $response->getBody();
-                $cache->setItem($cacheId, $responseXml);
-                if ($response->getHeaders()->get('ETag')) {
-                    $cache->setItem($cacheId . '_etag', $response->getHeaders()->get('ETag')->getFieldValue());
-                }
-                if ($response->getHeaders()->get('Last-Modified')) {
-                    $cache->setItem($cacheId . '_lastmodified', $response->getHeaders()->get('Last-Modified')->getFieldValue());
-                }
-            }
-            return static::importString($responseXml);
-        } elseif ($cache) {
-            $data = $cache->getItem($cacheId);
-            if ($data) {
-                return static::importString($data);
-            }
-            $response = $client->send();
-            if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            $responseXml = $response->getBody();
-            $cache->setItem($cacheId, $responseXml);
-            return static::importString($responseXml);
-        } else {
-            $response = $client->send();
-            if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            $reader = static::importString($response->getBody());
-            $reader->setOriginalSourceUri($uri);
-            return $reader;
-        }
-    }
-
-    /**
-     * Import a feed from a remote URI
-     *
-     * Performs similarly to import(), except it uses the HTTP client passed to
-     * the method, and does not take into account cached data.
-     *
-     * Primary purpose is to make it possible to use the Reader with alternate
-     * HTTP client implementations.
-     *
-     * @param  string $uri
-     * @param  Http\ClientInterface $client
-     * @return self
-     * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
-     */
-    public static function importRemoteFeed($uri, Http\ClientInterface $client)
-    {
-        $response = $client->get($uri);
-        if (!$response instanceof Http\ResponseInterface) {
-            throw new Exception\RuntimeException(sprintf(
-                'Did not receive a %s\Http\ResponseInterface from the provided HTTP client; received "%s"',
-                __NAMESPACE__,
-                (is_object($response) ? get_class($response) : gettype($response))
-            ));
-        }
-
-        if ((int) $response->getStatusCode() !== 200) {
-            throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-        }
-        $reader = static::importString($response->getBody());
-        $reader->setOriginalSourceUri($uri);
-        return $reader;
-    }
-
-    /**
-     * Import a feed from a string
-     *
-     * @param  string $string
-     * @return Feed\FeedInterface
-     * @throws Exception\InvalidArgumentException
-     * @throws Exception\RuntimeException
-     */
-    public static function importString($string)
-    {
-        $trimmed = trim($string);
-        if (!is_string($string) || empty($trimmed)) {
-            throw new Exception\InvalidArgumentException('Only non empty strings are allowed as input');
-        }
-
-        $libxmlErrflag = libxml_use_internal_errors(true);
-        $oldValue = libxml_disable_entity_loader(true);
-        $dom = new DOMDocument;
-        $status = $dom->loadXML(trim($string));
-        foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                throw new Exception\InvalidArgumentException(
-                    'Invalid XML: Detected use of illegal DOCTYPE'
-                );
-            }
-        }
-        libxml_disable_entity_loader($oldValue);
-        libxml_use_internal_errors($libxmlErrflag);
-
-        if (!$status) {
-            // Build error message
-            $error = libxml_get_last_error();
-            if ($error && $error->message) {
-                $error->message = trim($error->message);
-                $errormsg = "DOMDocument cannot parse XML: {$error->message}";
-            } else {
-                $errormsg = "DOMDocument cannot parse XML: Please check the XML document's validity";
-            }
-            throw new Exception\RuntimeException($errormsg);
-        }
-
-        $type = static::detectType($dom);
-
-        static::registerCoreExtensions();
-
-        if (substr($type, 0, 3) == 'rss') {
-            $reader = new Feed\Rss($dom, $type);
-        } elseif (substr($type, 8, 5) == 'entry') {
-            $reader = new Entry\Atom($dom->documentElement, 0, self::TYPE_ATOM_10);
-        } elseif (substr($type, 0, 4) == 'atom') {
-            $reader = new Feed\Atom($dom, $type);
-        } else {
-            throw new Exception\RuntimeException('The URI used does not point to a '
-            . 'valid Atom, RSS or RDF feed that Zend\Feed\Reader can parse.');
-        }
-        return $reader;
-    }
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @throws Exception\RuntimeException
-     * @return Feed\FeedInterface
-     */
-    public static function importFile($filename)
-    {
-        ErrorHandler::start();
-        $feed = file_get_contents($filename);
-        $err  = ErrorHandler::stop();
-        if ($feed === false) {
-            throw new Exception\RuntimeException("File '{$filename}' could not be loaded", 0, $err);
-        }
-        return static::importString($feed);
-    }
-
-    /**
-     * Find feed links
-     *
-     * @param $uri
-     * @return FeedSet
-     * @throws Exception\RuntimeException
-     */
-    public static function findFeedLinks($uri)
-    {
-        $client = static::getHttpClient();
-        $client->setUri($uri);
-        $response = $client->send();
-        if ($response->getStatusCode() !== 200) {
-            throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode());
-        }
-        $responseHtml = $response->getBody();
-        $libxmlErrflag = libxml_use_internal_errors(true);
-        $oldValue = libxml_disable_entity_loader(true);
-        $dom = new DOMDocument;
-        $status = $dom->loadHTML(trim($responseHtml));
-        libxml_disable_entity_loader($oldValue);
-        libxml_use_internal_errors($libxmlErrflag);
-        if (!$status) {
-            // Build error message
-            $error = libxml_get_last_error();
-            if ($error && $error->message) {
-                $error->message = trim($error->message);
-                $errormsg = "DOMDocument cannot parse HTML: {$error->message}";
-            } else {
-                $errormsg = "DOMDocument cannot parse HTML: Please check the XML document's validity";
-            }
-            throw new Exception\RuntimeException($errormsg);
-        }
-        $feedSet = new FeedSet;
-        $links = $dom->getElementsByTagName('link');
-        $feedSet->addLinks($links, $uri);
-        return $feedSet;
-    }
-
-    /**
-     * Detect the feed type of the provided feed
-     *
-     * @param  Feed\AbstractFeed|DOMDocument|string $feed
-     * @param  bool $specOnly
-     * @return string
-     * @throws Exception\InvalidArgumentException
-     * @throws Exception\RuntimeException
-     */
-    public static function detectType($feed, $specOnly = false)
-    {
-        if ($feed instanceof Feed\AbstractFeed) {
-            $dom = $feed->getDomDocument();
-        } elseif ($feed instanceof DOMDocument) {
-            $dom = $feed;
-        } elseif (is_string($feed) && !empty($feed)) {
-            ErrorHandler::start(E_NOTICE|E_WARNING);
-            ini_set('track_errors', 1);
-            $oldValue = libxml_disable_entity_loader(true);
-            $dom = new DOMDocument;
-            $status = $dom->loadXML($feed);
-            foreach ($dom->childNodes as $child) {
-                if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                    throw new Exception\InvalidArgumentException(
-                        'Invalid XML: Detected use of illegal DOCTYPE'
-                    );
-                }
-            }
-            libxml_disable_entity_loader($oldValue);
-            ini_restore('track_errors');
-            ErrorHandler::stop();
-            if (!$status) {
-                if (!isset($phpErrormsg)) {
-                    if (function_exists('xdebug_is_enabled')) {
-                        $phpErrormsg = '(error message not available, when XDebug is running)';
-                    } else {
-                        $phpErrormsg = '(error message not available)';
-                    }
-                }
-                throw new Exception\RuntimeException("DOMDocument cannot parse XML: $phpErrormsg");
-            }
-        } else {
-            throw new Exception\InvalidArgumentException('Invalid object/scalar provided: must'
-            . ' be of type Zend\Feed\Reader\Feed, DomDocument or string');
-        }
-        $xpath = new DOMXPath($dom);
-
-        if ($xpath->query('/rss')->length) {
-            $type = self::TYPE_RSS_ANY;
-            $version = $xpath->evaluate('string(/rss/@version)');
-
-            if (strlen($version) > 0) {
-                switch ($version) {
-                    case '2.0':
-                        $type = self::TYPE_RSS_20;
-                        break;
-
-                    case '0.94':
-                        $type = self::TYPE_RSS_094;
-                        break;
-
-                    case '0.93':
-                        $type = self::TYPE_RSS_093;
-                        break;
-
-                    case '0.92':
-                        $type = self::TYPE_RSS_092;
-                        break;
-
-                    case '0.91':
-                        $type = self::TYPE_RSS_091;
-                        break;
-                }
-            }
-
-            return $type;
-        }
-
-        $xpath->registerNamespace('rdf', self::NAMESPACE_RDF);
-
-        if ($xpath->query('/rdf:RDF')->length) {
-            $xpath->registerNamespace('rss', self::NAMESPACE_RSS_10);
-
-            if ($xpath->query('/rdf:RDF/rss:channel')->length
-                || $xpath->query('/rdf:RDF/rss:image')->length
-                || $xpath->query('/rdf:RDF/rss:item')->length
-                || $xpath->query('/rdf:RDF/rss:textinput')->length
-            ) {
-                return self::TYPE_RSS_10;
-            }
-
-            $xpath->registerNamespace('rss', self::NAMESPACE_RSS_090);
-
-            if ($xpath->query('/rdf:RDF/rss:channel')->length
-                || $xpath->query('/rdf:RDF/rss:image')->length
-                || $xpath->query('/rdf:RDF/rss:item')->length
-                || $xpath->query('/rdf:RDF/rss:textinput')->length
-            ) {
-                return self::TYPE_RSS_090;
-            }
-        }
-
-        $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_10);
-
-        if ($xpath->query('//atom:feed')->length) {
-            return self::TYPE_ATOM_10;
-        }
-
-        if ($xpath->query('//atom:entry')->length) {
-            if ($specOnly == true) {
-                return self::TYPE_ATOM_10;
-            } else {
-                return self::TYPE_ATOM_10_ENTRY;
-            }
-        }
-
-        $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_03);
-
-        if ($xpath->query('//atom:feed')->length) {
-            return self::TYPE_ATOM_03;
-        }
-
-        return self::TYPE_ANY;
-    }
-
-    /**
-     * Set plugin manager for use with Extensions
-     *
-     * @param ExtensionManagerInterface $extensionManager
-     */
-    public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
-    {
-        static::$extensionManager = $extensionManager;
-    }
-
-    /**
-     * Get plugin manager for use with Extensions
-     *
-     * @return ExtensionManagerInterface
-     */
-    public static function getExtensionManager()
-    {
-        if (!isset(static::$extensionManager)) {
-            static::setExtensionManager(new StandaloneExtensionManager());
-        }
-        return static::$extensionManager;
-    }
-
-    /**
-     * Register an Extension by name
-     *
-     * @param  string $name
-     * @return void
-     * @throws Exception\RuntimeException if unable to resolve Extension class
-     */
-    public static function registerExtension($name)
-    {
-        $feedName  = $name . '\Feed';
-        $entryName = $name . '\Entry';
-        $manager   = static::getExtensionManager();
-        if (static::isRegistered($name)) {
-            if ($manager->has($feedName) || $manager->has($entryName)) {
-                return;
-            }
-        }
-
-        if (!$manager->has($feedName) && !$manager->has($entryName)) {
-            throw new Exception\RuntimeException('Could not load extension: ' . $name
-                . ' using Plugin Loader. Check prefix paths are configured and extension exists.');
-        }
-        if ($manager->has($feedName)) {
-            static::$extensions['feed'][] = $feedName;
-        }
-        if ($manager->has($entryName)) {
-            static::$extensions['entry'][] = $entryName;
-        }
-    }
-
-    /**
-     * Is a given named Extension registered?
-     *
-     * @param  string $extensionName
-     * @return bool
-     */
-    public static function isRegistered($extensionName)
-    {
-        $feedName  = $extensionName . '\Feed';
-        $entryName = $extensionName . '\Entry';
-        if (in_array($feedName, static::$extensions['feed'])
-            || in_array($entryName, static::$extensions['entry'])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get a list of extensions
-     *
-     * @return array
-     */
-    public static function getExtensions()
-    {
-        return static::$extensions;
-    }
-
-    /**
-     * Reset class state to defaults
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        static::$cache              = null;
-        static::$httpClient         = null;
-        static::$httpMethodOverride = false;
-        static::$httpConditionalGet = false;
-        static::$extensionManager   = null;
-        static::$extensions         = [
-            'feed' => [
-                'DublinCore\Feed',
-                'Atom\Feed'
-            ],
-            'entry' => [
-                'Content\Entry',
-                'DublinCore\Entry',
-                'Atom\Entry'
-            ],
-            'core' => [
-                'DublinCore\Feed',
-                'Atom\Feed',
-                'Content\Entry',
-                'DublinCore\Entry',
-                'Atom\Entry'
-            ]
-        ];
-    }
-
-    /**
-     * Register core (default) extensions
-     *
-     * @return void
-     */
-    protected static function registerCoreExtensions()
-    {
-        static::registerExtension('DublinCore');
-        static::registerExtension('Content');
-        static::registerExtension('Atom');
-        static::registerExtension('Slash');
-        static::registerExtension('WellFormedWeb');
-        static::registerExtension('Thread');
-        static::registerExtension('Podcast');
-    }
-
-    /**
-     * Utility method to apply array_unique operation to a multidimensional
-     * array.
-     *
-     * @param array
-     * @return array
-     */
-    public static function arrayUnique(array $array)
-    {
-        foreach ($array as &$value) {
-            $value = serialize($value);
-        }
-        $array = array_unique($array);
-        foreach ($array as &$value) {
-            $value = unserialize($value);
-        }
-        return $array;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php b/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
deleted file mode 100644
index 0a2edd1..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-interface ReaderImportInterface
-{
-    /**
-     * Import a feed by providing a URI
-     *
-     * @param  string $uri The URI to the feed
-     * @param  string $etag OPTIONAL Last received ETag for this resource
-     * @param  string $lastModified OPTIONAL Last-Modified value for this resource
-     * @return Feed\FeedInterface
-     * @throws Exception\RuntimeException
-     */
-    public static function import($uri, $etag = null, $lastModified = null);
-
-    /**
-     * Import a feed from a remote URI
-     *
-     * Performs similarly to import(), except it uses the HTTP client passed to
-     * the method, and does not take into account cached data.
-     *
-     * Primary purpose is to make it possible to use the Reader with alternate
-     * HTTP client implementations.
-     *
-     * @param  string $uri
-     * @param  Http\ClientInterface $client
-     * @return self
-     * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
-     */
-    public static function importRemoteFeed($uri, Http\ClientInterface $client);
-
-
-    /**
-     * Import a feed from a string
-     *
-     * @param  string $string
-     * @return Feed\FeedInterface
-     * @throws Exception\InvalidArgumentException
-     * @throws Exception\RuntimeException
-     */
-    public static function importString($string);
-
-
-    /**
-     * Imports a feed from a file located at $filename.
-     *
-     * @param  string $filename
-     * @throws Exception\RuntimeException
-     * @return Feed\FeedInterface
-     */
-    public static function importFile($filename);
-}
diff --git a/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php b/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
deleted file mode 100644
index 9d9fcad..0000000
--- a/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Reader;
-
-class StandaloneExtensionManager implements ExtensionManagerInterface
-{
-    private $extensions = [
-        'Atom\Entry'            => 'Zend\Feed\Reader\Extension\Atom\Entry',
-        'Atom\Feed'             => 'Zend\Feed\Reader\Extension\Atom\Feed',
-        'Content\Entry'         => 'Zend\Feed\Reader\Extension\Content\Entry',
-        'CreativeCommons\Entry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
-        'CreativeCommons\Feed'  => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
-        'DublinCore\Entry'      => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
-        'DublinCore\Feed'       => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
-        'Podcast\Entry'         => 'Zend\Feed\Reader\Extension\Podcast\Entry',
-        'Podcast\Feed'          => 'Zend\Feed\Reader\Extension\Podcast\Feed',
-        'Slash\Entry'           => 'Zend\Feed\Reader\Extension\Slash\Entry',
-        'Syndication\Feed'      => 'Zend\Feed\Reader\Extension\Syndication\Feed',
-        'Thread\Entry'          => 'Zend\Feed\Reader\Extension\Thread\Entry',
-        'WellFormedWeb\Entry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
-    ];
-
-    /**
-     * Do we have the extension?
-     *
-     * @param  string $extension
-     * @return bool
-     */
-    public function has($extension)
-    {
-        return array_key_exists($extension, $this->extensions);
-    }
-
-    /**
-     * Retrieve the extension
-     *
-     * @param  string $extension
-     * @return Extension\AbstractEntry|Extension\AbstractFeed
-     */
-    public function get($extension)
-    {
-        $class = $this->extensions[$extension];
-        return new $class();
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Uri.php b/vendor/zendframework/zend-feed/src/Uri.php
deleted file mode 100644
index 818433f..0000000
--- a/vendor/zendframework/zend-feed/src/Uri.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed;
-
-class Uri
-{
-    /**
-     * @var string
-     */
-    protected $fragment;
-
-    /**
-     * @var string
-     */
-    protected $host;
-
-    /**
-     * @var string
-     */
-    protected $pass;
-
-    /**
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * @var int
-     */
-    protected $port;
-
-    /**
-     * @var string
-     */
-    protected $query;
-
-    /**
-     * @var string
-     */
-    protected $scheme;
-
-    /**
-     * @var string
-     */
-    protected $user;
-
-    /**
-     * @var bool
-     */
-    protected $valid;
-
-    /**
-     * Valid schemes
-     */
-    protected $validSchemes = [
-        'http',
-        'https',
-        'file',
-    ];
-
-    /**
-     * @param  string $uri
-     */
-    public function __construct($uri)
-    {
-        $parsed = parse_url($uri);
-        if (false === $parsed) {
-            $this->valid = false;
-            return;
-        }
-
-        $this->scheme   = isset($parsed['scheme'])   ? $parsed['scheme']   : null;
-        $this->host     = isset($parsed['host'])     ? $parsed['host']     : null;
-        $this->port     = isset($parsed['port'])     ? $parsed['port']     : null;
-        $this->user     = isset($parsed['user'])     ? $parsed['user']     : null;
-        $this->pass     = isset($parsed['pass'])     ? $parsed['pass']     : null;
-        $this->path     = isset($parsed['path'])     ? $parsed['path']     : null;
-        $this->query    = isset($parsed['query'])    ? $parsed['query']    : null;
-        $this->fragment = isset($parsed['fragment']) ? $parsed['fragment'] : null;
-    }
-
-    /**
-     * Create an instance
-     *
-     * Useful for chained validations
-     *
-     * @param  string $uri
-     * @return self
-     */
-    public static function factory($uri)
-    {
-        return new static($uri);
-    }
-
-    /**
-     * Retrieve the host
-     *
-     * @return string
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Retrieve the URI path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Retrieve the scheme
-     *
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * Is the URI valid?
-     *
-     * @return bool
-     */
-    public function isValid()
-    {
-        if (false === $this->valid) {
-            return false;
-        }
-
-        if ($this->scheme && !in_array($this->scheme, $this->validSchemes)) {
-            return false;
-        }
-
-        if ($this->host) {
-            if ($this->path && substr($this->path, 0, 1) != '/') {
-                return false;
-            }
-            return true;
-        }
-
-        // no host, but user and/or port... what?
-        if ($this->user || $this->port) {
-            return false;
-        }
-
-        if ($this->path) {
-            // Check path-only (no host) URI
-            if (substr($this->path, 0, 2) == '//') {
-                return false;
-            }
-            return true;
-        }
-
-        if (! ($this->query || $this->fragment)) {
-            // No host, path, query or fragment - this is not a valid URI
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Is the URI absolute?
-     *
-     * @return bool
-     */
-    public function isAbsolute()
-    {
-        return ($this->scheme !== null);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
deleted file mode 100644
index 5659b47..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
+++ /dev/null
@@ -1,846 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use DateTime;
-use Zend\Feed\Uri;
-use Zend\Validator;
-
-class AbstractFeed
-{
-    /**
-     * Contains all Feed level date to append in feed output
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $type = null;
-
-    /**
-     * @var $extensions
-     */
-    protected $extensions;
-
-    /**
-     * Constructor: Primarily triggers the registration of core extensions and
-     * loads those appropriate to this data container.
-     *
-     */
-    public function __construct()
-    {
-        Writer::registerCoreExtensions();
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Set a single author
-     *
-     * The following option keys are supported:
-     * 'name'  => (string) The name
-     * 'email' => (string) An optional email
-     * 'uri'   => (string) An optional and valid URI
-     *
-     * @param array $author
-     * @throws Exception\InvalidArgumentException If any value of $author not follow the format.
-     * @return AbstractFeed
-     */
-    public function addAuthor(array $author)
-    {
-        // Check array values
-        if (!array_key_exists('name', $author)
-            || empty($author['name'])
-            || !is_string($author['name'])
-        ) {
-            throw new Exception\InvalidArgumentException(
-                'Invalid parameter: author array must include a "name" key with a non-empty string value');
-        }
-
-        if (isset($author['email'])) {
-            if (empty($author['email']) || !is_string($author['email'])) {
-                throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "email" array value must be a non-empty string');
-            }
-        }
-        if (isset($author['uri'])) {
-            if (empty($author['uri']) || !is_string($author['uri']) ||
-                !Uri::factory($author['uri'])->isValid()
-            ) {
-                throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
-            }
-        }
-
-        $this->data['authors'][] = $author;
-
-        return $this;
-    }
-
-    /**
-     * Set an array with feed authors
-     *
-     * @see addAuthor
-     * @param array $authors
-     * @return AbstractFeed
-     */
-    public function addAuthors(array $authors)
-    {
-        foreach ($authors as $author) {
-            $this->addAuthor($author);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the copyright entry
-     *
-     * @param  string      $copyright
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setCopyright($copyright)
-    {
-        if (empty($copyright) || !is_string($copyright)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['copyright'] = $copyright;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed creation date
-     *
-     * @param null|int|DateTime
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setDateCreated($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
-                                                         . ' passed as parameter');
-        }
-        $this->data['dateCreated'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed modification date
-     *
-     * @param null|int|DateTime
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setDateModified($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
-                                                         . ' passed as parameter');
-        }
-        $this->data['dateModified'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed last-build date. Ignored for Atom 1.0.
-     *
-     * @param null|int|DateTime
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setLastBuildDate($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
-                                                         . ' passed as parameter');
-        }
-        $this->data['lastBuildDate'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed description
-     *
-     * @param string $description
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setDescription($description)
-    {
-        if (empty($description) || !is_string($description)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['description'] = $description;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed generator entry
-     *
-     * @param array|string $name
-     * @param null|string $version
-     * @param null|string $uri
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setGenerator($name, $version = null, $uri = null)
-    {
-        if (is_array($name)) {
-            $data = $name;
-            if (empty($data['name']) || !is_string($data['name'])) {
-                throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
-            }
-            $generator = ['name' => $data['name']];
-            if (isset($data['version'])) {
-                if (empty($data['version']) || !is_string($data['version'])) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
-                }
-                $generator['version'] = $data['version'];
-            }
-            if (isset($data['uri'])) {
-                if (empty($data['uri']) || !is_string($data['uri']) || !Uri::factory($data['uri'])->isValid()) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
-                }
-                $generator['uri'] = $data['uri'];
-            }
-        } else {
-            if (empty($name) || !is_string($name)) {
-                throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
-            }
-            $generator = ['name' => $name];
-            if (isset($version)) {
-                if (empty($version) || !is_string($version)) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
-                }
-                $generator['version'] = $version;
-            }
-            if (isset($uri)) {
-                if (empty($uri) || !is_string($uri) || !Uri::factory($uri)->isValid()) {
-                    throw new Exception\InvalidArgumentException('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI');
-                }
-                $generator['uri'] = $uri;
-            }
-        }
-        $this->data['generator'] = $generator;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed ID - URI or URN (via PCRE pattern) supported
-     *
-     * @param string $id
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setId($id)
-    {
-        if ((empty($id) || !is_string($id) || !Uri::factory($id)->isValid())
-            && !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id)
-            && !$this->_validateTagUri($id)
-        ) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Validate a URI using the tag scheme (RFC 4151)
-     *
-     * @param string $id
-     * @return bool
-     */
-    protected function _validateTagUri($id)
-    {
-        if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
-            $dvalid = false;
-            $date = $matches['date'];
-            $d6 = strtotime($date);
-            if ((strlen($date) == 4) && $date <= date('Y')) {
-                $dvalid = true;
-            } elseif ((strlen($date) == 7) && ($d6 < strtotime("now"))) {
-                $dvalid = true;
-            } elseif ((strlen($date) == 10) && ($d6 < strtotime("now"))) {
-                $dvalid = true;
-            }
-            $validator = new Validator\EmailAddress;
-            if ($validator->isValid($matches['name'])) {
-                $nvalid = true;
-            } else {
-                $nvalid = $validator->isValid('info@' . $matches['name']);
-            }
-            return $dvalid && $nvalid;
-        }
-        return false;
-    }
-
-    /**
-     * Set a feed image (URI at minimum). Parameter is a single array with the
-     * required key 'uri'. When rendering as RSS, the required keys are 'uri',
-     * 'title' and 'link'. RSS also specifies three optional parameters 'width',
-     * 'height' and 'description'. Only 'uri' is required and used for Atom rendering.
-     *
-     * @param array $data
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setImage(array $data)
-    {
-        if (empty($data['uri']) || !is_string($data['uri'])
-            || !Uri::factory($data['uri'])->isValid()
-        ) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter \'uri\''
-            . ' must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['image'] = $data;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed language
-     *
-     * @param string $language
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setLanguage($language)
-    {
-        if (empty($language) || !is_string($language)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['language'] = $language;
-
-        return $this;
-    }
-
-    /**
-     * Set a link to the HTML source
-     *
-     * @param string $link
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['link'] = $link;
-
-        return $this;
-    }
-
-    /**
-     * Set a link to an XML feed for any feed type/version
-     *
-     * @param string $link
-     * @param string $type
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setFeedLink($link, $type)
-    {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI');
-        }
-        if (!in_array(strtolower($type), ['rss', 'rdf', 'atom'])) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom');
-        }
-        $this->data['feedLinks'][strtolower($type)] = $link;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed title
-     *
-     * @param string $title
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setTitle($title)
-    {
-        if (empty($title) || !is_string($title)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['title'] = $title;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed character encoding
-     *
-     * @param string $encoding
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['encoding'] = $encoding;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed's base URL
-     *
-     * @param string $url
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function setBaseUrl($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
-            . ' must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['baseUrl'] = $url;
-
-        return $this;
-    }
-
-    /**
-     * Add a Pubsubhubbub hub endpoint URL
-     *
-     * @param string $url
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function addHub($url)
-    {
-        if (empty($url) || !is_string($url) || !Uri::factory($url)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "url" array value'
-            . ' must be a non-empty string and valid URI/IRI');
-        }
-        if (!isset($this->data['hubs'])) {
-            $this->data['hubs'] = [];
-        }
-        $this->data['hubs'][] = $url;
-
-        return $this;
-    }
-
-    /**
-     * Add Pubsubhubbub hub endpoint URLs
-     *
-     * @param array $urls
-     * @return AbstractFeed
-     */
-    public function addHubs(array $urls)
-    {
-        foreach ($urls as $url) {
-            $this->addHub($url);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add a feed category
-     *
-     * @param array $category
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractFeed
-     */
-    public function addCategory(array $category)
-    {
-        if (!isset($category['term'])) {
-            throw new Exception\InvalidArgumentException('Each category must be an array and '
-            . 'contain at least a "term" element containing the machine '
-            . ' readable category name');
-        }
-        if (isset($category['scheme'])) {
-            if (empty($category['scheme'])
-                || !is_string($category['scheme'])
-                || !Uri::factory($category['scheme'])->isValid()
-            ) {
-                throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
-                . ' a category must be a valid URI');
-            }
-        }
-        if (!isset($this->data['categories'])) {
-            $this->data['categories'] = [];
-        }
-        $this->data['categories'][] = $category;
-
-        return $this;
-    }
-
-    /**
-     * Set an array of feed categories
-     *
-     * @param array $categories
-     * @return AbstractFeed
-     */
-    public function addCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get a single author
-     *
-     * @param  int $index
-     * @return string|null
-     */
-    public function getAuthor($index = 0)
-    {
-        if (isset($this->data['authors'][$index])) {
-            return $this->data['authors'][$index];
-        }
-
-        return;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (!array_key_exists('authors', $this->data)) {
-            return;
-        }
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the copyright entry
-     *
-     * @return string|null
-     */
-    public function getCopyright()
-    {
-        if (!array_key_exists('copyright', $this->data)) {
-            return;
-        }
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the feed creation date
-     *
-     * @return string|null
-     */
-    public function getDateCreated()
-    {
-        if (!array_key_exists('dateCreated', $this->data)) {
-            return;
-        }
-        return $this->data['dateCreated'];
-    }
-
-    /**
-     * Get the feed modification date
-     *
-     * @return string|null
-     */
-    public function getDateModified()
-    {
-        if (!array_key_exists('dateModified', $this->data)) {
-            return;
-        }
-        return $this->data['dateModified'];
-    }
-
-    /**
-     * Get the feed last-build date
-     *
-     * @return string|null
-     */
-    public function getLastBuildDate()
-    {
-        if (!array_key_exists('lastBuildDate', $this->data)) {
-            return;
-        }
-        return $this->data['lastBuildDate'];
-    }
-
-    /**
-     * Get the feed description
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        if (!array_key_exists('description', $this->data)) {
-            return;
-        }
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the feed generator entry
-     *
-     * @return string|null
-     */
-    public function getGenerator()
-    {
-        if (!array_key_exists('generator', $this->data)) {
-            return;
-        }
-        return $this->data['generator'];
-    }
-
-    /**
-     * Get the feed ID
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        if (!array_key_exists('id', $this->data)) {
-            return;
-        }
-        return $this->data['id'];
-    }
-
-    /**
-     * Get the feed image URI
-     *
-     * @return array
-     */
-    public function getImage()
-    {
-        if (!array_key_exists('image', $this->data)) {
-            return;
-        }
-        return $this->data['image'];
-    }
-
-    /**
-     * Get the feed language
-     *
-     * @return string|null
-     */
-    public function getLanguage()
-    {
-        if (!array_key_exists('language', $this->data)) {
-            return;
-        }
-        return $this->data['language'];
-    }
-
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (!array_key_exists('link', $this->data)) {
-            return;
-        }
-        return $this->data['link'];
-    }
-
-    /**
-     * Get a link to the XML feed
-     *
-     * @return string|null
-     */
-    public function getFeedLinks()
-    {
-        if (!array_key_exists('feedLinks', $this->data)) {
-            return;
-        }
-        return $this->data['feedLinks'];
-    }
-
-    /**
-     * Get the feed title
-     *
-     * @return string|null
-     */
-    public function getTitle()
-    {
-        if (!array_key_exists('title', $this->data)) {
-            return;
-        }
-        return $this->data['title'];
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->data)) {
-            return 'UTF-8';
-        }
-        return $this->data['encoding'];
-    }
-
-    /**
-     * Get the feed's base url
-     *
-     * @return string|null
-     */
-    public function getBaseUrl()
-    {
-        if (!array_key_exists('baseUrl', $this->data)) {
-            return;
-        }
-        return $this->data['baseUrl'];
-    }
-
-    /**
-     * Get the URLs used as Pubsubhubbub hubs endpoints
-     *
-     * @return string|null
-     */
-    public function getHubs()
-    {
-        if (!array_key_exists('hubs', $this->data)) {
-            return;
-        }
-        return $this->data['hubs'];
-    }
-
-    /**
-     * Get the feed categories
-     *
-     * @return string|null
-     */
-    public function getCategories()
-    {
-        if (!array_key_exists('categories', $this->data)) {
-            return;
-        }
-        return $this->data['categories'];
-    }
-
-    /**
-     * Resets the instance and deletes all data
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->data = [];
-    }
-
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     * @return AbstractFeed
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     * @return AbstractFeed
-     */
-    public function remove($name)
-    {
-        if (isset($this->data[$name])) {
-            unset($this->data[$name]);
-        }
-        return $this;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\BadMethodCallException if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            try {
-                return call_user_func_array([$extension, $method], $args);
-            } catch (Exception\BadMethodCallException $e) {
-            }
-        }
-        throw new Exception\BadMethodCallException(
-            'Method: ' . $method . ' does not exist and could not be located on a registered Extension'
-        );
-    }
-
-    /**
-     * Load extensions from Zend\Feed\Writer\Writer
-     *
-     * @throws Exception\RuntimeException
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all     = Writer::getExtensions();
-        $manager = Writer::getExtensionManager();
-        $exts    = $all['feed'];
-        foreach ($exts as $ext) {
-            if (!$manager->has($ext)) {
-                throw new Exception\RuntimeException(sprintf('Unable to load extension "%s"; could not resolve to class', $ext));
-            }
-            $this->extensions[$ext] = $manager->get($ext);
-            $this->extensions[$ext]->setEncoding($this->getEncoding());
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Deleted.php b/vendor/zendframework/zend-feed/src/Writer/Deleted.php
deleted file mode 100644
index 3211026..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Deleted.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use DateTime;
-use Zend\Feed\Uri;
-
-/**
-*/
-class Deleted
-{
-    /**
-     * Internal array containing all data associated with this entry or item.
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $type = null;
-
-    /**
-     * Set the feed character encoding
-     *
-     * @param  $encoding
-     * @throws Exception\InvalidArgumentException
-     * @return string|null
-     * @return Deleted
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['encoding'] = $encoding;
-
-        return $this;
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->data)) {
-            return 'UTF-8';
-        }
-        return $this->data['encoding'];
-    }
-
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     * @return Deleted
-     */
-    public function remove($name)
-    {
-        if (isset($this->data[$name])) {
-            unset($this->data[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     * @return Deleted
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Set reference
-     *
-     * @param $reference
-     * @throws Exception\InvalidArgumentException
-     * @return Deleted
-     */
-    public function setReference($reference)
-    {
-        if (empty($reference) || !is_string($reference)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: reference must be a non-empty string');
-        }
-        $this->data['reference'] = $reference;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getReference()
-    {
-        if (!array_key_exists('reference', $this->data)) {
-            return;
-        }
-        return $this->data['reference'];
-    }
-
-    /**
-     * Set when
-     *
-     * @param null|string|DateTime $date
-     * @throws Exception\InvalidArgumentException
-     * @return Deleted
-     */
-    public function setWhen($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp'
-            . ' passed as parameter');
-        }
-        $this->data['when'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * @return DateTime
-     */
-    public function getWhen()
-    {
-        if (!array_key_exists('when', $this->data)) {
-            return;
-        }
-        return $this->data['when'];
-    }
-
-    /**
-     * Set by
-     *
-     * @param array $by
-     * @throws Exception\InvalidArgumentException
-     * @return Deleted
-     */
-    public function setBy(array $by)
-    {
-        $author = [];
-        if (!array_key_exists('name', $by)
-            || empty($by['name'])
-            || !is_string($by['name'])
-        ) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: author array must include a'
-            . ' "name" key with a non-empty string value');
-        }
-        $author['name'] = $by['name'];
-        if (isset($by['email'])) {
-            if (empty($by['email']) || !is_string($by['email'])) {
-                throw new Exception\InvalidArgumentException('Invalid parameter: "email" array'
-                . ' value must be a non-empty string');
-            }
-            $author['email'] = $by['email'];
-        }
-        if (isset($by['uri'])) {
-            if (empty($by['uri'])
-                || !is_string($by['uri'])
-                || !Uri::factory($by['uri'])->isValid()
-            ) {
-                throw new Exception\InvalidArgumentException('Invalid parameter: "uri" array value must'
-                 . ' be a non-empty string and valid URI/IRI');
-            }
-            $author['uri'] = $by['uri'];
-        }
-        $this->data['by'] = $author;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBy()
-    {
-        if (!array_key_exists('by', $this->data)) {
-            return;
-        }
-        return $this->data['by'];
-    }
-
-    /**
-     * @param string $comment
-     * @return Deleted
-     */
-    public function setComment($comment)
-    {
-        $this->data['comment'] = $comment;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getComment()
-    {
-        if (!array_key_exists('comment', $this->data)) {
-            return;
-        }
-        return $this->data['comment'];
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Entry.php
deleted file mode 100644
index a802ffa..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Entry.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use DateTime;
-use Zend\Feed\Uri;
-
-/**
-*/
-class Entry
-{
-    /**
-     * Internal array containing all data associated with this entry or item.
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Registered extensions
-     *
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $type = null;
-
-    /**
-     * Constructor: Primarily triggers the registration of core extensions and
-     * loads those appropriate to this data container.
-     *
-     */
-    public function __construct()
-    {
-        Writer::registerCoreExtensions();
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Set a single author
-     *
-     * The following option keys are supported:
-     * 'name'  => (string) The name
-     * 'email' => (string) An optional email
-     * 'uri'   => (string) An optional and valid URI
-     *
-     * @param array $author
-     * @throws Exception\InvalidArgumentException If any value of $author not follow the format.
-     * @return Entry
-     */
-    public function addAuthor(array $author)
-    {
-        // Check array values
-        if (!array_key_exists('name', $author)
-            || empty($author['name'])
-            || !is_string($author['name'])
-        ) {
-            throw new Exception\InvalidArgumentException(
-                'Invalid parameter: author array must include a "name" key with a non-empty string value');
-        }
-
-        if (isset($author['email'])) {
-            if (empty($author['email']) || !is_string($author['email'])) {
-                throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "email" array value must be a non-empty string');
-            }
-        }
-        if (isset($author['uri'])) {
-            if (empty($author['uri']) || !is_string($author['uri']) ||
-                !Uri::factory($author['uri'])->isValid()
-            ) {
-                throw new Exception\InvalidArgumentException(
-                    'Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI');
-            }
-        }
-
-        $this->data['authors'][] = $author;
-
-        return $this;
-    }
-
-    /**
-     * Set an array with feed authors
-     *
-     * @see addAuthor
-     * @param array $authors
-     * @return Entry
-     */
-    public function addAuthors(array $authors)
-    {
-        foreach ($authors as $author) {
-            $this->addAuthor($author);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the feed character encoding
-     *
-     * @param string $encoding
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setEncoding($encoding)
-    {
-        if (empty($encoding) || !is_string($encoding)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['encoding'] = $encoding;
-
-        return $this;
-    }
-
-    /**
-     * Get the feed character encoding
-     *
-     * @return string|null
-     */
-    public function getEncoding()
-    {
-        if (!array_key_exists('encoding', $this->data)) {
-            return 'UTF-8';
-        }
-        return $this->data['encoding'];
-    }
-
-    /**
-     * Set the copyright entry
-     *
-     * @param string $copyright
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setCopyright($copyright)
-    {
-        if (empty($copyright) || !is_string($copyright)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['copyright'] = $copyright;
-
-        return $this;
-    }
-
-    /**
-     * Set the entry's content
-     *
-     * @param string $content
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setContent($content)
-    {
-        if (empty($content) || !is_string($content)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['content'] = $content;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed creation date
-     *
-     * @param null|int|DateTime $date
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setDateCreated($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp passed as parameter');
-        }
-        $this->data['dateCreated'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed modification date
-     *
-     * @param null|int|DateTime $date
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setDateModified($date = null)
-    {
-        if ($date === null) {
-            $date = new DateTime();
-        } elseif (is_int($date)) {
-            $date = new DateTime('@' . $date);
-        } elseif (!$date instanceof DateTime) {
-            throw new Exception\InvalidArgumentException('Invalid DateTime object or UNIX Timestamp passed as parameter');
-        }
-        $this->data['dateModified'] = $date;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed description
-     *
-     * @param string $description
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setDescription($description)
-    {
-        if (empty($description) || !is_string($description)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['description'] = $description;
-
-        return $this;
-    }
-
-    /**
-     * Set the feed ID
-     *
-     * @param string $id
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setId($id)
-    {
-        if (empty($id) || !is_string($id)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['id'] = $id;
-
-        return $this;
-    }
-
-    /**
-     * Set a link to the HTML source of this entry
-     *
-     * @param string $link
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['link'] = $link;
-
-        return $this;
-    }
-
-    /**
-     * Set the number of comments associated with this entry
-     *
-     * @param int $count
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setCommentCount($count)
-    {
-        if (!is_numeric($count) || (int) $count != $count || (int) $count < 0) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "count" must be a positive integer number or zero');
-        }
-        $this->data['commentCount'] = (int) $count;
-
-        return $this;
-    }
-
-    /**
-     * Set a link to a HTML page containing comments associated with this entry
-     *
-     * @param string $link
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setCommentLink($link)
-    {
-        if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
-        }
-        $this->data['commentLink'] = $link;
-
-        return $this;
-    }
-
-    /**
-     * Set a link to an XML feed for any comments associated with this entry
-     *
-     * @param array $link
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setCommentFeedLink(array $link)
-    {
-        if (!isset($link['uri']) || !is_string($link['uri']) || !Uri::factory($link['uri'])->isValid()) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
-        }
-        if (!isset($link['type']) || !in_array($link['type'], ['atom', 'rss', 'rdf'])) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: "type" must be one'
-            . ' of "atom", "rss" or "rdf"');
-        }
-        if (!isset($this->data['commentFeedLinks'])) {
-            $this->data['commentFeedLinks'] = [];
-        }
-        $this->data['commentFeedLinks'][] = $link;
-
-        return $this;
-    }
-
-    /**
-     * Set a links to an XML feed for any comments associated with this entry.
-     * Each link is an array with keys "uri" and "type", where type is one of:
-     * "atom", "rss" or "rdf".
-     *
-     * @param array $links
-     * @return Entry
-     */
-    public function setCommentFeedLinks(array $links)
-    {
-        foreach ($links as $link) {
-            $this->setCommentFeedLink($link);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the feed title
-     *
-     * @param string $title
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setTitle($title)
-    {
-        if (empty($title) || !is_string($title)) {
-            throw new Exception\InvalidArgumentException('Invalid parameter: parameter must be a non-empty string');
-        }
-        $this->data['title'] = $title;
-
-        return $this;
-    }
-
-    /**
-     * Get an array with feed authors
-     *
-     * @return array
-     */
-    public function getAuthors()
-    {
-        if (!array_key_exists('authors', $this->data)) {
-            return;
-        }
-        return $this->data['authors'];
-    }
-
-    /**
-     * Get the entry content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        if (!array_key_exists('content', $this->data)) {
-            return;
-        }
-        return $this->data['content'];
-    }
-
-    /**
-     * Get the entry copyright information
-     *
-     * @return string
-     */
-    public function getCopyright()
-    {
-        if (!array_key_exists('copyright', $this->data)) {
-            return;
-        }
-        return $this->data['copyright'];
-    }
-
-    /**
-     * Get the entry creation date
-     *
-     * @return string
-     */
-    public function getDateCreated()
-    {
-        if (!array_key_exists('dateCreated', $this->data)) {
-            return;
-        }
-        return $this->data['dateCreated'];
-    }
-
-    /**
-     * Get the entry modification date
-     *
-     * @return string
-     */
-    public function getDateModified()
-    {
-        if (!array_key_exists('dateModified', $this->data)) {
-            return;
-        }
-        return $this->data['dateModified'];
-    }
-
-    /**
-     * Get the entry description
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        if (!array_key_exists('description', $this->data)) {
-            return;
-        }
-        return $this->data['description'];
-    }
-
-    /**
-     * Get the entry ID
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (!array_key_exists('id', $this->data)) {
-            return;
-        }
-        return $this->data['id'];
-    }
-
-    /**
-     * Get a link to the HTML source
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        if (!array_key_exists('link', $this->data)) {
-            return;
-        }
-        return $this->data['link'];
-    }
-
-
-    /**
-     * Get all links
-     *
-     * @return array
-     */
-    public function getLinks()
-    {
-        if (!array_key_exists('links', $this->data)) {
-            return;
-        }
-        return $this->data['links'];
-    }
-
-    /**
-     * Get the entry title
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        if (!array_key_exists('title', $this->data)) {
-            return;
-        }
-        return $this->data['title'];
-    }
-
-    /**
-     * Get the number of comments/replies for current entry
-     *
-     * @return int
-     */
-    public function getCommentCount()
-    {
-        if (!array_key_exists('commentCount', $this->data)) {
-            return;
-        }
-        return $this->data['commentCount'];
-    }
-
-    /**
-     * Returns a URI pointing to the HTML page where comments can be made on this entry
-     *
-     * @return string
-     */
-    public function getCommentLink()
-    {
-        if (!array_key_exists('commentLink', $this->data)) {
-            return;
-        }
-        return $this->data['commentLink'];
-    }
-
-    /**
-     * Returns an array of URIs pointing to a feed of all comments for this entry
-     * where the array keys indicate the feed type (atom, rss or rdf).
-     *
-     * @return string
-     */
-    public function getCommentFeedLinks()
-    {
-        if (!array_key_exists('commentFeedLinks', $this->data)) {
-            return;
-        }
-        return $this->data['commentFeedLinks'];
-    }
-
-    /**
-     * Add an entry category
-     *
-     * @param array $category
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function addCategory(array $category)
-    {
-        if (!isset($category['term'])) {
-            throw new Exception\InvalidArgumentException('Each category must be an array and '
-            . 'contain at least a "term" element containing the machine '
-            . ' readable category name');
-        }
-        if (isset($category['scheme'])) {
-            if (empty($category['scheme'])
-                || !is_string($category['scheme'])
-                || !Uri::factory($category['scheme'])->isValid()
-            ) {
-                throw new Exception\InvalidArgumentException('The Atom scheme or RSS domain of'
-                . ' a category must be a valid URI');
-            }
-        }
-        if (!isset($this->data['categories'])) {
-            $this->data['categories'] = [];
-        }
-        $this->data['categories'][] = $category;
-
-        return $this;
-    }
-
-    /**
-     * Set an array of entry categories
-     *
-     * @param array $categories
-     * @return Entry
-     */
-    public function addCategories(array $categories)
-    {
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the entry categories
-     *
-     * @return string|null
-     */
-    public function getCategories()
-    {
-        if (!array_key_exists('categories', $this->data)) {
-            return;
-        }
-        return $this->data['categories'];
-    }
-
-    /**
-     * Adds an enclosure to the entry. The array parameter may contain the
-     * keys 'uri', 'type' and 'length'. Only 'uri' is required for Atom, though the
-     * others must also be provided or RSS rendering (where they are required)
-     * will throw an Exception.
-     *
-     * @param array $enclosure
-     * @throws Exception\InvalidArgumentException
-     * @return Entry
-     */
-    public function setEnclosure(array $enclosure)
-    {
-        if (!isset($enclosure['uri'])) {
-            throw new Exception\InvalidArgumentException('Enclosure "uri" is not set');
-        }
-        if (!Uri::factory($enclosure['uri'])->isValid()) {
-            throw new Exception\InvalidArgumentException('Enclosure "uri" is not a valid URI/IRI');
-        }
-        $this->data['enclosure'] = $enclosure;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve an array of all enclosures to be added to entry.
-     *
-     * @return array
-     */
-    public function getEnclosure()
-    {
-        if (!array_key_exists('enclosure', $this->data)) {
-            return;
-        }
-        return $this->data['enclosure'];
-    }
-
-    /**
-     * Unset a specific data point
-     *
-     * @param string $name
-     * @return Entry
-     */
-    public function remove($name)
-    {
-        if (isset($this->data[$name])) {
-            unset($this->data[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get registered extensions
-     *
-     * @return array
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Return an Extension object with the matching name (postfixed with _Entry)
-     *
-     * @param string $name
-     * @return object
-     */
-    public function getExtension($name)
-    {
-        if (array_key_exists($name . '\\Entry', $this->extensions)) {
-            return $this->extensions[$name . '\\Entry'];
-        }
-        return;
-    }
-
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     * @return Entry
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Method overloading: call given method on first extension implementing it
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\BadMethodCallException if no extensions implements the method
-     */
-    public function __call($method, $args)
-    {
-        foreach ($this->extensions as $extension) {
-            try {
-                return call_user_func_array([$extension, $method], $args);
-            } catch (\BadMethodCallException $e) {
-            }
-        }
-        throw new Exception\BadMethodCallException('Method: ' . $method
-            . ' does not exist and could not be located on a registered Extension');
-    }
-
-    /**
-     * Creates a new Zend\Feed\Writer\Source data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return Source
-     */
-    public function createSource()
-    {
-        $source = new Source;
-        if ($this->getEncoding()) {
-            $source->setEncoding($this->getEncoding());
-        }
-        $source->setType($this->getType());
-        return $source;
-    }
-
-    /**
-     * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
-     * the feed data container's internal group of entries.
-     *
-     * @param Source $source
-     * @return Entry
-     */
-    public function setSource(Source $source)
-    {
-        $this->data['source'] = $source;
-        return $this;
-    }
-
-    /**
-     * @return Source
-     */
-    public function getSource()
-    {
-        if (isset($this->data['source'])) {
-            return $this->data['source'];
-        }
-        return;
-    }
-
-    /**
-     * Load extensions from Zend\Feed\Writer\Writer
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        $all     = Writer::getExtensions();
-        $manager = Writer::getExtensionManager();
-        $exts    = $all['entry'];
-        foreach ($exts as $ext) {
-            $this->extensions[$ext] = $manager->get($ext);
-            $this->extensions[$ext]->setEncoding($this->getEncoding());
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
deleted file mode 100644
index b2ea2be..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- */
-class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
deleted file mode 100644
index ee8bdaf..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-/**
- * Feed exceptions
- *
- * Interface to represent exceptions that occur during Feed operations.
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
deleted file mode 100644
index d8c4a8b..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-/**
- * Feed exceptions
- *
- * Class to represent exceptions that occur during Feed operations.
- */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
deleted file mode 100644
index ae8ee36..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Exception;
-
-use Zend\Feed\Exception;
-
-class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php b/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
deleted file mode 100644
index 1a32b47..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension;
-
-use DOMDocument;
-use DOMElement;
-
-/**
-*/
-abstract class AbstractRenderer implements RendererInterface
-{
-    /**
-     * @var DOMDocument
-     */
-    protected $dom = null;
-
-    /**
-     * @var mixed
-     */
-    protected $entry = null;
-
-    /**
-     * @var DOMElement
-     */
-    protected $base = null;
-
-    /**
-     * @var mixed
-     */
-    protected $container = null;
-
-    /**
-     * @var string
-     */
-    protected $type = null;
-
-    /**
-     * @var DOMElement
-     */
-    protected $rootElement = null;
-
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $encoding = 'UTF-8';
-
-    /**
-     * Set the data container
-     *
-     * @param  mixed $container
-     * @return AbstractRenderer
-     */
-    public function setDataContainer($container)
-    {
-        $this->container = $container;
-        return $this;
-    }
-
-    /**
-     * Set feed encoding
-     *
-     * @param  string $enc
-     * @return AbstractRenderer
-     */
-    public function setEncoding($enc)
-    {
-        $this->encoding = $enc;
-        return $this;
-    }
-
-    /**
-     * Get feed encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Set DOMDocument and DOMElement on which to operate
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $base
-     * @return AbstractRenderer
-     */
-    public function setDomDocument(DOMDocument $dom, DOMElement $base)
-    {
-        $this->dom  = $dom;
-        $this->base = $base;
-        return $this;
-    }
-
-    /**
-     * Get data container being rendered
-     *
-     * @return mixed
-     */
-    public function getDataContainer()
-    {
-        return $this->container;
-    }
-
-    /**
-     * Set feed type
-     *
-     * @param  string $type
-     * @return AbstractRenderer
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-        return $this;
-    }
-
-    /**
-     * Get feedtype
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Set root element of document
-     *
-     * @param  DOMElement $root
-     * @return AbstractRenderer
-     */
-    public function setRootElement(DOMElement $root)
-    {
-        $this->rootElement = $root;
-        return $this;
-    }
-
-    /**
-     * Get root element
-     *
-     * @return DOMElement
-     */
-    public function getRootElement()
-    {
-        return $this->rootElement;
-    }
-
-    /**
-     * Append namespaces to feed
-     *
-     * @return void
-     */
-    abstract protected function _appendNamespaces();
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
deleted file mode 100644
index 25571c0..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\Atom\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Feed extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render feed
-     *
-     * @return void
-     */
-    public function render()
-    {
-        /**
-         * RSS 2.0 only. Used mainly to include Atom links and
-         * Pubsubhubbub Hub endpoint URIs under the Atom namespace
-         */
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setFeedLinks($this->dom, $this->base);
-        $this->_setHubs($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append namespaces to root element of feed
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:atom',
-            'http://www.w3.org/2005/Atom');
-    }
-
-    /**
-     * Set feed link elements
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || empty($flinks)) {
-            return;
-        }
-        foreach ($flinks as $type => $href) {
-            if (strtolower($type) == $this->getType()) { // issue 2605
-                $mime  = 'application/' . strtolower($type) . '+xml';
-                $flink = $dom->createElement('atom:link');
-                $root->appendChild($flink);
-                $flink->setAttribute('rel', 'self');
-                $flink->setAttribute('type', $mime);
-                $flink->setAttribute('href', $href);
-            }
-        }
-        $this->called = true;
-    }
-
-    /**
-     * Set PuSH hubs
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setHubs(DOMDocument $dom, DOMElement $root)
-    {
-        $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs || empty($hubs)) {
-            return;
-        }
-        foreach ($hubs as $hubUrl) {
-            $hub = $dom->createElement('atom:link');
-            $hub->setAttribute('rel', 'hub');
-            $hub->setAttribute('href', $hubUrl);
-            $root->appendChild($hub);
-        }
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
deleted file mode 100644
index 939b249..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\Content\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setContent($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append namespaces to root element
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:content',
-            'http://purl.org/rss/1.0/modules/content/');
-    }
-
-    /**
-     * Set entry content
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setContent(DOMDocument $dom, DOMElement $root)
-    {
-        $content = $this->getDataContainer()->getContent();
-        if (!$content) {
-            return;
-        }
-        $element = $dom->createElement('content:encoded');
-        $root->appendChild($element);
-        $cdata = $dom->createCDATASection($content);
-        $element->appendChild($cdata);
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
deleted file mode 100644
index 5cc86cd..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setAuthors($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append namespaces to entry
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');
-    }
-
-    /**
-     * Set entry author elements
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('dc:creator');
-            if (array_key_exists('name', $data)) {
-                $text = $dom->createTextNode($data['name']);
-                $author->appendChild($text);
-                $root->appendChild($author);
-            }
-        }
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
deleted file mode 100644
index 160b5a4..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\DublinCore\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Feed extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render feed
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return;
-        }
-        $this->_setAuthors($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append namespaces to feed element
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:dc',
-            'http://purl.org/dc/elements/1.1/');
-    }
-
-    /**
-     * Set feed authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('dc:creator');
-            if (array_key_exists('name', $data)) {
-                $text = $dom->createTextNode($data['name']);
-                $author->appendChild($text);
-                $root->appendChild($author);
-            }
-        }
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
deleted file mode 100644
index 595689a..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\ITunes;
-
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Extension;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
-
-/**
-*/
-class Entry
-{
-    /**
-     * Array of Feed data for rendering by Extension's renderers
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $encoding = 'UTF-8';
-
-    /**
-     * The used string wrapper supporting encoding
-     *
-     * @var StringWrapperInterface
-     */
-    protected $stringWrapper;
-
-    public function __construct()
-    {
-        $this->stringWrapper = StringUtils::getWrapper($this->encoding);
-    }
-
-    /**
-     * Set feed encoding
-     *
-     * @param  string $enc
-     * @return Entry
-     */
-    public function setEncoding($enc)
-    {
-        $this->stringWrapper = StringUtils::getWrapper($enc);
-        $this->encoding      = $enc;
-        return $this;
-    }
-
-    /**
-     * Get feed encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Set a block value of "yes" or "no". You may also set an empty string.
-     *
-     * @param  string
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesBlock($value)
-    {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
-            . ' contain alphabetic characters');
-        }
-
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->data['block'] = $value;
-    }
-
-    /**
-     * Add authors to itunes entry
-     *
-     * @param  array $values
-     * @return Entry
-     */
-    public function addItunesAuthors(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesAuthor($value);
-        }
-        return $this;
-    }
-
-    /**
-     * Add author to itunes entry
-     *
-     * @param  string $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function addItunesAuthor($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
-            . ' contain a maximum of 255 characters each');
-        }
-        if (!isset($this->data['authors'])) {
-            $this->data['authors'] = [];
-        }
-        $this->data['authors'][] = $value;
-        return $this;
-    }
-
-    /**
-     * Set duration
-     *
-     * @param  int $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesDuration($value)
-    {
-        $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
-        ) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
-            . ' be of a specified [[HH:]MM:]SS format');
-        }
-        $this->data['duration'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set "explicit" flag
-     *
-     * @param  bool $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesExplicit($value)
-    {
-        if (!in_array($value, ['yes', 'no', 'clean'])) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
-            . ' be one of "yes", "no" or "clean"');
-        }
-        $this->data['explicit'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set keywords
-     *
-     * @param  array $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesKeywords(array $value)
-    {
-        if (count($value) > 12) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
-            . ' contain a maximum of 12 terms');
-        }
-
-        $concat = implode(',', $value);
-        if ($this->stringWrapper->strlen($concat) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
-            . ' have a concatenated length of 255 chars where terms are delimited'
-            . ' by a comma');
-        }
-        $this->data['keywords'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set subtitle
-     *
-     * @param  string $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesSubtitle($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "subtitle" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->data['subtitle'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set summary
-     *
-     * @param  string $value
-     * @return Entry
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesSummary($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 4000) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "summary" may only'
-            . ' contain a maximum of 4000 characters');
-        }
-        $this->data['summary'] = $value;
-        return $this;
-    }
-
-    /**
-     * Overloading to itunes specific setters
-     *
-     * @param  string $method
-     * @param  array $params
-     * @throws Writer\Exception\BadMethodCallException
-     * @return mixed
-     */
-    public function __call($method, array $params)
-    {
-        $point = lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
-        ) {
-            throw new Writer\Exception\BadMethodCallException(
-                'invalid method: ' . $method
-            );
-        }
-        if (!array_key_exists($point, $this->data)
-            || empty($this->data[$point])
-        ) {
-            return;
-        }
-        return $this->data[$point];
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
deleted file mode 100644
index 0b21b3b..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\ITunes;
-
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Stdlib\StringUtils;
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
-
-/**
-*/
-class Feed
-{
-    /**
-     * Array of Feed data for rendering by Extension's renderers
-     *
-     * @var array
-     */
-    protected $data = [];
-
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $encoding = 'UTF-8';
-
-    /**
-     * The used string wrapper supporting encoding
-     *
-     * @var StringWrapperInterface
-     */
-    protected $stringWrapper;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->stringWrapper = StringUtils::getWrapper($this->encoding);
-    }
-
-    /**
-     * Set feed encoding
-     *
-     * @param  string $enc
-     * @return Feed
-     */
-    public function setEncoding($enc)
-    {
-        $this->stringWrapper = StringUtils::getWrapper($enc);
-        $this->encoding      = $enc;
-        return $this;
-    }
-
-    /**
-     * Get feed encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Set a block value of "yes" or "no". You may also set an empty string.
-     *
-     * @param  string
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesBlock($value)
-    {
-        if (!ctype_alpha($value) && strlen($value) > 0) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
-            . ' contain alphabetic characters');
-        }
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "block" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->data['block'] = $value;
-        return $this;
-    }
-
-    /**
-     * Add feed authors
-     *
-     * @param  array $values
-     * @return Feed
-     */
-    public function addItunesAuthors(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesAuthor($value);
-        }
-        return $this;
-    }
-
-    /**
-     * Add feed author
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function addItunesAuthor($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "author" may only'
-            . ' contain a maximum of 255 characters each');
-        }
-        if (!isset($this->data['authors'])) {
-            $this->data['authors'] = [];
-        }
-        $this->data['authors'][] = $value;
-        return $this;
-    }
-
-    /**
-     * Set feed categories
-     *
-     * @param  array $values
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesCategories(array $values)
-    {
-        if (!isset($this->data['categories'])) {
-            $this->data['categories'] = [];
-        }
-        foreach ($values as $key => $value) {
-            if (!is_array($value)) {
-                if ($this->stringWrapper->strlen($value) > 255) {
-                    throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
-                    . ' contain a maximum of 255 characters each');
-                }
-                $this->data['categories'][] = $value;
-            } else {
-                if ($this->stringWrapper->strlen($key) > 255) {
-                    throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
-                    . ' contain a maximum of 255 characters each');
-                }
-                $this->data['categories'][$key] = [];
-                foreach ($value as $val) {
-                    if ($this->stringWrapper->strlen($val) > 255) {
-                        throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
-                        . ' contain a maximum of 255 characters each');
-                    }
-                    $this->data['categories'][$key][] = $val;
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Set feed image (icon)
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesImage($value)
-    {
-        if (!Uri::factory($value)->isValid()) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
-            . ' be a valid URI/IRI');
-        }
-        if (!in_array(substr($value, -3), ['jpg', 'png'])) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
-            . ' use file extension "jpg" or "png" which must be the last three'
-            . ' characters of the URI (i.e. no query string or fragment)');
-        }
-        $this->data['image'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set feed cumulative duration
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesDuration($value)
-    {
-        $value = (string) $value;
-        if (!ctype_digit($value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value)
-            && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value)
-        ) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "duration" may only'
-            . ' be of a specified [[HH:]MM:]SS format');
-        }
-        $this->data['duration'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set "explicit" flag
-     *
-     * @param  bool $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesExplicit($value)
-    {
-        if (!in_array($value, ['yes', 'no', 'clean'])) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
-            . ' be one of "yes", "no" or "clean"');
-        }
-        $this->data['explicit'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set feed keywords
-     *
-     * @param  array $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesKeywords(array $value)
-    {
-        if (count($value) > 12) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
-            . ' contain a maximum of 12 terms');
-        }
-        $concat = implode(',', $value);
-        if ($this->stringWrapper->strlen($concat) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "keywords" may only'
-            . ' have a concatenated length of 255 chars where terms are delimited'
-            . ' by a comma');
-        }
-        $this->data['keywords'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set new feed URL
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesNewFeedUrl($value)
-    {
-        if (!Uri::factory($value)->isValid()) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "newFeedUrl" may only'
-            . ' be a valid URI/IRI');
-        }
-        $this->data['newFeedUrl'] = $value;
-        return $this;
-    }
-
-    /**
-     * Add feed owners
-     *
-     * @param  array $values
-     * @return Feed
-     */
-    public function addItunesOwners(array $values)
-    {
-        foreach ($values as $value) {
-            $this->addItunesOwner($value);
-        }
-        return $this;
-    }
-
-    /**
-     * Add feed owner
-     *
-     * @param  array $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function addItunesOwner(array $value)
-    {
-        if (!isset($value['name']) || !isset($value['email'])) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" must'
-            . ' be an array containing keys "name" and "email"');
-        }
-        if ($this->stringWrapper->strlen($value['name']) > 255
-            || $this->stringWrapper->strlen($value['email']) > 255
-        ) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "owner" may only'
-            . ' contain a maximum of 255 characters each for "name" and "email"');
-        }
-        if (!isset($this->data['owners'])) {
-            $this->data['owners'] = [];
-        }
-        $this->data['owners'][] = $value;
-        return $this;
-    }
-
-    /**
-     * Set feed subtitle
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesSubtitle($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 255) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "subtitle" may only'
-            . ' contain a maximum of 255 characters');
-        }
-        $this->data['subtitle'] = $value;
-        return $this;
-    }
-
-    /**
-     * Set feed summary
-     *
-     * @param  string $value
-     * @return Feed
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function setItunesSummary($value)
-    {
-        if ($this->stringWrapper->strlen($value) > 4000) {
-            throw new Writer\Exception\InvalidArgumentException('invalid parameter: "summary" may only'
-            . ' contain a maximum of 4000 characters');
-        }
-        $this->data['summary'] = $value;
-        return $this;
-    }
-
-    /**
-     * Overloading: proxy to internal setters
-     *
-     * @param  string $method
-     * @param  array $params
-     * @return mixed
-     * @throws Writer\Exception\BadMethodCallException
-     */
-    public function __call($method, array $params)
-    {
-        $point = lcfirst(substr($method, 9));
-        if (!method_exists($this, 'setItunes' . ucfirst($point))
-            && !method_exists($this, 'addItunes' . ucfirst($point))
-        ) {
-            throw new Writer\Exception\BadMethodCallException(
-                'invalid method: ' . $method
-            );
-        }
-        if (!array_key_exists($point, $this->data) || empty($this->data[$point])) {
-            return;
-        }
-        return $this->data[$point];
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
deleted file mode 100644
index ed8f732..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        $this->_setAuthors($this->dom, $this->base);
-        $this->_setBlock($this->dom, $this->base);
-        $this->_setDuration($this->dom, $this->base);
-        $this->_setExplicit($this->dom, $this->base);
-        $this->_setKeywords($this->dom, $this->base);
-        $this->_setSubtitle($this->dom, $this->base);
-        $this->_setSummary($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append namespaces to entry root
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-
-    /**
-     * Set entry authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $author) {
-            $el = $dom->createElement('itunes:author');
-            $text = $dom->createTextNode($author);
-            $el->appendChild($text);
-            $root->appendChild($el);
-            $this->called = true;
-        }
-    }
-
-    /**
-     * Set itunes block
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBlock(DOMDocument $dom, DOMElement $root)
-    {
-        $block = $this->getDataContainer()->getItunesBlock();
-        if ($block === null) {
-            return;
-        }
-        $el = $dom->createElement('itunes:block');
-        $text = $dom->createTextNode($block);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set entry duration
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDuration(DOMDocument $dom, DOMElement $root)
-    {
-        $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
-            return;
-        }
-        $el = $dom->createElement('itunes:duration');
-        $text = $dom->createTextNode($duration);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set explicit flag
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setExplicit(DOMDocument $dom, DOMElement $root)
-    {
-        $explicit = $this->getDataContainer()->getItunesExplicit();
-        if ($explicit === null) {
-            return;
-        }
-        $el = $dom->createElement('itunes:explicit');
-        $text = $dom->createTextNode($explicit);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set entry keywords
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setKeywords(DOMDocument $dom, DOMElement $root)
-    {
-        $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:keywords');
-        $text = $dom->createTextNode(implode(',', $keywords));
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set entry subtitle
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
-    {
-        $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
-            return;
-        }
-        $el = $dom->createElement('itunes:subtitle');
-        $text = $dom->createTextNode($subtitle);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set entry summary
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setSummary(DOMDocument $dom, DOMElement $root)
-    {
-        $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
-            return;
-        }
-        $el = $dom->createElement('itunes:summary');
-        $text = $dom->createTextNode($summary);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
deleted file mode 100644
index d978f03..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\ITunes\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Feed extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render feed
-     *
-     * @return void
-     */
-    public function render()
-    {
-        $this->_setAuthors($this->dom, $this->base);
-        $this->_setBlock($this->dom, $this->base);
-        $this->_setCategories($this->dom, $this->base);
-        $this->_setImage($this->dom, $this->base);
-        $this->_setDuration($this->dom, $this->base);
-        $this->_setExplicit($this->dom, $this->base);
-        $this->_setKeywords($this->dom, $this->base);
-        $this->_setNewFeedUrl($this->dom, $this->base);
-        $this->_setOwners($this->dom, $this->base);
-        $this->_setSubtitle($this->dom, $this->base);
-        $this->_setSummary($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append feed namespaces
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:itunes',
-            'http://www.itunes.com/dtds/podcast-1.0.dtd');
-    }
-
-    /**
-     * Set feed authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getItunesAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $author) {
-            $el = $dom->createElement('itunes:author');
-            $text = $dom->createTextNode($author);
-            $el->appendChild($text);
-            $root->appendChild($el);
-        }
-        $this->called = true;
-    }
-
-    /**
-     * Set feed itunes block
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBlock(DOMDocument $dom, DOMElement $root)
-    {
-        $block = $this->getDataContainer()->getItunesBlock();
-        if ($block === null) {
-            return;
-        }
-        $el = $dom->createElement('itunes:block');
-        $text = $dom->createTextNode($block);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed categories
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $cats = $this->getDataContainer()->getItunesCategories();
-        if (!$cats || empty($cats)) {
-            return;
-        }
-        foreach ($cats as $key => $cat) {
-            if (!is_array($cat)) {
-                $el = $dom->createElement('itunes:category');
-                $el->setAttribute('text', $cat);
-                $root->appendChild($el);
-            } else {
-                $el = $dom->createElement('itunes:category');
-                $el->setAttribute('text', $key);
-                $root->appendChild($el);
-                foreach ($cat as $subcat) {
-                    $el2 = $dom->createElement('itunes:category');
-                    $el2->setAttribute('text', $subcat);
-                    $el->appendChild($el2);
-                }
-            }
-        }
-        $this->called = true;
-    }
-
-    /**
-     * Set feed image (icon)
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setImage(DOMDocument $dom, DOMElement $root)
-    {
-        $image = $this->getDataContainer()->getItunesImage();
-        if (!$image) {
-            return;
-        }
-        $el = $dom->createElement('itunes:image');
-        $el->setAttribute('href', $image);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed cumulative duration
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDuration(DOMDocument $dom, DOMElement $root)
-    {
-        $duration = $this->getDataContainer()->getItunesDuration();
-        if (!$duration) {
-            return;
-        }
-        $el = $dom->createElement('itunes:duration');
-        $text = $dom->createTextNode($duration);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set explicit flag
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setExplicit(DOMDocument $dom, DOMElement $root)
-    {
-        $explicit = $this->getDataContainer()->getItunesExplicit();
-        if ($explicit === null) {
-            return;
-        }
-        $el = $dom->createElement('itunes:explicit');
-        $text = $dom->createTextNode($explicit);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed keywords
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setKeywords(DOMDocument $dom, DOMElement $root)
-    {
-        $keywords = $this->getDataContainer()->getItunesKeywords();
-        if (!$keywords || empty($keywords)) {
-            return;
-        }
-        $el = $dom->createElement('itunes:keywords');
-        $text = $dom->createTextNode(implode(',', $keywords));
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed's new URL
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setNewFeedUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $url = $this->getDataContainer()->getItunesNewFeedUrl();
-        if (!$url) {
-            return;
-        }
-        $el = $dom->createElement('itunes:new-feed-url');
-        $text = $dom->createTextNode($url);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed owners
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setOwners(DOMDocument $dom, DOMElement $root)
-    {
-        $owners = $this->getDataContainer()->getItunesOwners();
-        if (!$owners || empty($owners)) {
-            return;
-        }
-        foreach ($owners as $owner) {
-            $el = $dom->createElement('itunes:owner');
-            $name = $dom->createElement('itunes:name');
-            $text = $dom->createTextNode($owner['name']);
-            $name->appendChild($text);
-            $email = $dom->createElement('itunes:email');
-            $text = $dom->createTextNode($owner['email']);
-            $email->appendChild($text);
-            $root->appendChild($el);
-            $el->appendChild($name);
-            $el->appendChild($email);
-        }
-        $this->called = true;
-    }
-
-    /**
-     * Set feed subtitle
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setSubtitle(DOMDocument $dom, DOMElement $root)
-    {
-        $subtitle = $this->getDataContainer()->getItunesSubtitle();
-        if (!$subtitle) {
-            return;
-        }
-        $el = $dom->createElement('itunes:subtitle');
-        $text = $dom->createTextNode($subtitle);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-
-    /**
-     * Set feed summary
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setSummary(DOMDocument $dom, DOMElement $root)
-    {
-        $summary = $this->getDataContainer()->getItunesSummary();
-        if (!$summary) {
-            return;
-        }
-        $el = $dom->createElement('itunes:summary');
-        $text = $dom->createTextNode($summary);
-        $el->appendChild($text);
-        $root->appendChild($el);
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php b/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
deleted file mode 100644
index 9afe88b..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension;
-
-use DOMDocument;
-use DOMElement;
-
-/**
-*/
-interface RendererInterface
-{
-    /**
-     * Set the data container
-     *
-     * @param  mixed $container
-     * @return void
-     */
-    public function setDataContainer($container);
-
-    /**
-     * Retrieve container
-     *
-     * @return mixed
-     */
-    public function getDataContainer();
-
-    /**
-     * Set DOMDocument and DOMElement on which to operate
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $base
-     * @return void
-     */
-    public function setDomDocument(DOMDocument $dom, DOMElement $base);
-
-    /**
-     * Render
-     *
-     * @return void
-     */
-    public function render();
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
deleted file mode 100644
index c74cb02..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\Slash\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return; // RSS 2.0 only
-        }
-        $this->_setCommentCount($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append entry namespaces
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:slash',
-            'http://purl.org/rss/1.0/modules/slash/');
-    }
-
-    /**
-     * Set entry comment count
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
-    {
-        $count = $this->getDataContainer()->getCommentCount();
-        if (!$count) {
-            $count = 0;
-        }
-        $tcount = $this->dom->createElement('slash:comments');
-        $tcount->nodeValue = $count;
-        $root->appendChild($tcount);
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
deleted file mode 100644
index 6f19641..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\Threading\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'rss') {
-            return; // Atom 1.0 only
-        }
-        $this->_setCommentLink($this->dom, $this->base);
-        $this->_setCommentFeedLinks($this->dom, $this->base);
-        $this->_setCommentCount($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append entry namespaces
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:thr',
-            'http://purl.org/syndication/thread/1.0');
-    }
-
-    /**
-     * Set comment link
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
-    {
-        $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
-            return;
-        }
-        $clink = $this->dom->createElement('link');
-        $clink->setAttribute('rel', 'replies');
-        $clink->setAttribute('type', 'text/html');
-        $clink->setAttribute('href', $link);
-        $count = $this->getDataContainer()->getCommentCount();
-        if ($count !== null) {
-            $clink->setAttribute('thr:count', $count);
-        }
-        $root->appendChild($clink);
-        $this->called = true;
-    }
-
-    /**
-     * Set comment feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
-            return;
-        }
-        foreach ($links as $link) {
-            $flink = $this->dom->createElement('link');
-            $flink->setAttribute('rel', 'replies');
-            $flink->setAttribute('type', 'application/' . $link['type'] . '+xml');
-            $flink->setAttribute('href', $link['uri']);
-            $count = $this->getDataContainer()->getCommentCount();
-            if ($count !== null) {
-                $flink->setAttribute('thr:count', $count);
-            }
-            $root->appendChild($flink);
-            $this->called = true;
-        }
-    }
-
-    /**
-     * Set entry comment count
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentCount(DOMDocument $dom, DOMElement $root)
-    {
-        $count = $this->getDataContainer()->getCommentCount();
-        if ($count === null) {
-            return;
-        }
-        $tcount = $this->dom->createElement('thr:total');
-        $tcount->nodeValue = $count;
-        $root->appendChild($tcount);
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
deleted file mode 100644
index 48c0d8f..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Extension\WellFormedWeb\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer\Extension;
-
-/**
-*/
-class Entry extends Extension\AbstractRenderer
-{
-    /**
-     * Set to TRUE if a rendering method actually renders something. This
-     * is used to prevent premature appending of a XML namespace declaration
-     * until an element which requires it is actually appended.
-     *
-     * @var bool
-     */
-    protected $called = false;
-
-    /**
-     * Render entry
-     *
-     * @return void
-     */
-    public function render()
-    {
-        if (strtolower($this->getType()) == 'atom') {
-            return; // RSS 2.0 only
-        }
-        $this->_setCommentFeedLinks($this->dom, $this->base);
-        if ($this->called) {
-            $this->_appendNamespaces();
-        }
-    }
-
-    /**
-     * Append entry namespaces
-     *
-     * @return void
-     */
-    protected function _appendNamespaces()
-    {
-        $this->getRootElement()->setAttribute('xmlns:wfw',
-            'http://wellformedweb.org/CommentAPI/');
-    }
-
-    /**
-     * Set entry comment feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $links = $this->getDataContainer()->getCommentFeedLinks();
-        if (!$links || empty($links)) {
-            return;
-        }
-        foreach ($links as $link) {
-            if ($link['type'] == 'rss') {
-                $flink = $this->dom->createElement('wfw:commentRss');
-                $text = $dom->createTextNode($link['uri']);
-                $flink->appendChild($text);
-                $root->appendChild($flink);
-            }
-        }
-        $this->called = true;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
deleted file mode 100644
index b0e0e3b..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-/**
- * Default implementation of ExtensionManagerInterface
- *
- * Decorator of ExtensionPluginManager.
- */
-class ExtensionManager implements ExtensionManagerInterface
-{
-    protected $pluginManager;
-
-    /**
-     * Constructor
-     *
-     * Seeds the extension manager with a plugin manager; if none provided,
-     * creates an instance.
-     *
-     * @param  null|ExtensionPluginManager $pluginManager
-     */
-    public function __construct(ExtensionPluginManager $pluginManager = null)
-    {
-        if (null === $pluginManager) {
-            $pluginManager = new ExtensionPluginManager();
-        }
-        $this->pluginManager = $pluginManager;
-    }
-
-    /**
-     * Method overloading
-     *
-     * Proxy to composed ExtensionPluginManager instance.
-     *
-     * @param  string $method
-     * @param  array $args
-     * @return mixed
-     * @throws Exception\BadMethodCallException
-     */
-    public function __call($method, $args)
-    {
-        if (!method_exists($this->pluginManager, $method)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                'Method by name of %s does not exist in %s',
-                $method,
-                __CLASS__
-            ));
-        }
-        return call_user_func_array([$this->pluginManager, $method], $args);
-    }
-
-    /**
-     * Get the named extension
-     *
-     * @param  string $name
-     * @return Extension\AbstractRenderer
-     */
-    public function get($name)
-    {
-        return $this->pluginManager->get($name);
-    }
-
-    /**
-     * Do we have the named extension?
-     *
-     * @param  string $name
-     * @return bool
-     */
-    public function has($name)
-    {
-        return $this->pluginManager->has($name);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
deleted file mode 100644
index b0e28a0..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-interface ExtensionManagerInterface
-{
-    /**
-     * Do we have the extension?
-     *
-     * @param  string $extension
-     * @return bool
-     */
-    public function has($extension);
-
-    /**
-     * Retrieve the extension
-     *
-     * @param  string $extension
-     * @return mixed
-     */
-    public function get($extension);
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
deleted file mode 100644
index 8586b48..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use Zend\ServiceManager\AbstractPluginManager;
-
-/**
- * Plugin manager implementation for feed writer extensions
- *
- * Validation checks that we have an Entry, Feed, or Extension\AbstractRenderer.
- */
-class ExtensionPluginManager extends AbstractPluginManager
-{
-    /**
-     * Default set of extension classes
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'atomrendererfeed'           => 'Zend\Feed\Writer\Extension\Atom\Renderer\Feed',
-        'contentrendererentry'       => 'Zend\Feed\Writer\Extension\Content\Renderer\Entry',
-        'dublincorerendererentry'    => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry',
-        'dublincorerendererfeed'     => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Feed',
-        'itunesentry'                => 'Zend\Feed\Writer\Extension\ITunes\Entry',
-        'itunesfeed'                 => 'Zend\Feed\Writer\Extension\ITunes\Feed',
-        'itunesrendererentry'        => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Entry',
-        'itunesrendererfeed'         => 'Zend\Feed\Writer\Extension\ITunes\Renderer\Feed',
-        'slashrendererentry'         => 'Zend\Feed\Writer\Extension\Slash\Renderer\Entry',
-        'threadingrendererentry'     => 'Zend\Feed\Writer\Extension\Threading\Renderer\Entry',
-        'wellformedwebrendererentry' => 'Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry',
-    ];
-
-    /**
-     * Do not share instances
-     *
-     * @var bool
-     */
-    protected $shareByDefault = false;
-
-    /**
-     * Validate the plugin
-     *
-     * Checks that the extension loaded is of a valid type.
-     *
-     * @param  mixed $plugin
-     * @return void
-     * @throws Exception\InvalidArgumentException if invalid
-     */
-    public function validatePlugin($plugin)
-    {
-        if ($plugin instanceof Extension\AbstractRenderer) {
-            // we're okay
-            return;
-        }
-
-        if ('Feed' == substr(get_class($plugin), -4)) {
-            // we're okay
-            return;
-        }
-
-        if ('Entry' == substr(get_class($plugin), -5)) {
-            // we're okay
-            return;
-        }
-
-        throw new Exception\InvalidArgumentException(sprintf(
-            'Plugin of type %s is invalid; must implement %s\Extension\RendererInterface '
-            . 'or the classname must end in "Feed" or "Entry"',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin)),
-            __NAMESPACE__
-        ));
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Feed.php
deleted file mode 100644
index 5d01232..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Feed.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use Countable;
-use Iterator;
-
-/**
-*/
-class Feed extends AbstractFeed implements Iterator, Countable
-{
-    /**
-     * Contains all entry objects
-     *
-     * @var array
-     */
-    protected $entries = [];
-
-    /**
-     * A pointer for the iterator to keep track of the entries array
-     *
-     * @var int
-     */
-    protected $entriesKey = 0;
-
-    /**
-     * Creates a new Zend\Feed\Writer\Entry data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return \Zend\Feed\Writer\Entry
-     */
-    public function createEntry()
-    {
-        $entry = new Entry;
-        if ($this->getEncoding()) {
-            $entry->setEncoding($this->getEncoding());
-        }
-        $entry->setType($this->getType());
-        return $entry;
-    }
-
-    /**
-     * Appends a Zend\Feed\Writer\Deleted object representing a new entry tombstone
-     * to the feed data container's internal group of entries.
-     *
-     * @param Deleted $deleted
-     * @return void
-     */
-    public function addTombstone(Deleted $deleted)
-    {
-        $this->entries[] = $deleted;
-    }
-
-    /**
-     * Creates a new Zend\Feed\Writer\Deleted data container for use. This is NOT
-     * added to the current feed automatically, but is necessary to create a
-     * container with some initial values preset based on the current feed data.
-     *
-     * @return Deleted
-     */
-    public function createTombstone()
-    {
-        $deleted = new Deleted;
-        if ($this->getEncoding()) {
-            $deleted->setEncoding($this->getEncoding());
-        }
-        $deleted->setType($this->getType());
-        return $deleted;
-    }
-
-    /**
-     * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
-     * the feed data container's internal group of entries.
-     *
-     * @param Entry $entry
-     * @return Feed
-     */
-    public function addEntry(Entry $entry)
-    {
-        $this->entries[] = $entry;
-        return $this;
-    }
-
-    /**
-     * Removes a specific indexed entry from the internal queue. Entries must be
-     * added to a feed container in order to be indexed.
-     *
-     * @param int $index
-     * @throws Exception\InvalidArgumentException
-     * @return Feed
-     */
-    public function removeEntry($index)
-    {
-        if (!isset($this->entries[$index])) {
-            throw new Exception\InvalidArgumentException('Undefined index: ' . $index . '. Entry does not exist.');
-        }
-        unset($this->entries[$index]);
-
-        return $this;
-    }
-
-    /**
-     * Retrieve a specific indexed entry from the internal queue. Entries must be
-     * added to a feed container in order to be indexed.
-     *
-     * @param int $index
-     * @throws Exception\InvalidArgumentException
-     */
-    public function getEntry($index = 0)
-    {
-        if (isset($this->entries[$index])) {
-            return $this->entries[$index];
-        }
-        throw new Exception\InvalidArgumentException('Undefined index: ' . $index . '. Entry does not exist.');
-    }
-
-    /**
-     * Orders all indexed entries by date, thus offering date ordered readable
-     * content where a parser (or Homo Sapien) ignores the generic rule that
-     * XML element order is irrelevant and has no intrinsic meaning.
-     *
-     * Using this method will alter the original indexation.
-     *
-     * @return Feed
-     */
-    public function orderByDate()
-    {
-        /**
-         * Could do with some improvement for performance perhaps
-         */
-        $timestamp = time();
-        $entries = [];
-        foreach ($this->entries as $entry) {
-            if ($entry->getDateModified()) {
-                $timestamp = (int) $entry->getDateModified()->getTimestamp();
-            } elseif ($entry->getDateCreated()) {
-                $timestamp = (int) $entry->getDateCreated()->getTimestamp();
-            }
-            $entries[$timestamp] = $entry;
-        }
-        krsort($entries, SORT_NUMERIC);
-        $this->entries = array_values($entries);
-
-        return $this;
-    }
-
-    /**
-     * Get the number of feed entries.
-     * Required by the Iterator interface.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->entries);
-    }
-
-    /**
-     * Return the current entry
-     *
-     * @return Entry
-     */
-    public function current()
-    {
-        return $this->entries[$this->key()];
-    }
-
-    /**
-     * Return the current feed key
-     *
-     * @return mixed
-     */
-    public function key()
-    {
-        return $this->entriesKey;
-    }
-
-    /**
-     * Move the feed pointer forward
-     *
-     * @return void
-     */
-    public function next()
-    {
-        ++$this->entriesKey;
-    }
-
-    /**
-     * Reset the pointer in the feed object
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        $this->entriesKey = 0;
-    }
-
-    /**
-     * Check to see if the iterator is still valid
-     *
-     * @return bool
-     */
-    public function valid()
-    {
-        return 0 <= $this->entriesKey && $this->entriesKey < $this->count();
-    }
-
-    /**
-     * Attempt to build and return the feed resulting from the data set
-     *
-     * @param  string  $type The feed type "rss" or "atom" to export as
-     * @param  bool    $ignoreExceptions
-     * @throws Exception\InvalidArgumentException
-     * @return string
-     */
-    public function export($type, $ignoreExceptions = false)
-    {
-        $this->setType(strtolower($type));
-        $type = ucfirst($this->getType());
-        if ($type !== 'Rss' && $type !== 'Atom') {
-            throw new Exception\InvalidArgumentException('Invalid feed type specified: ' . $type . '.'
-            . ' Should be one of "rss" or "atom".');
-        }
-        $renderClass = 'Zend\\Feed\\Writer\\Renderer\\Feed\\' . $type;
-        $renderer = new $renderClass($this);
-        if ($ignoreExceptions) {
-            $renderer->ignoreExceptions();
-        }
-        return $renderer->render()->saveXml();
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php b/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
deleted file mode 100644
index 99b528c..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-use Traversable;
-
-abstract class FeedFactory
-{
-    /**
-     * Create and return a Feed based on data provided.
-     *
-     * @param  array|Traversable $data
-     * @throws Exception\InvalidArgumentException
-     * @return Feed
-     */
-    public static function factory($data)
-    {
-        if (!is_array($data) && !$data instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects an array or Traversable argument; received "%s"',
-                __METHOD__,
-                (is_object($data) ? get_class($data) : gettype($data))
-            ));
-        }
-
-        $feed = new Feed();
-
-        foreach ($data as $key => $value) {
-            // Setters
-            $key    = static::convertKey($key);
-            $method = 'set' . $key;
-            if (method_exists($feed, $method)) {
-                switch ($method) {
-                    case 'setfeedlink':
-                        if (!is_array($value)) {
-                            // Need an array
-                            break;
-                        }
-                        if (!array_key_exists('link', $value) || !array_key_exists('type', $value)) {
-                            // Need both keys to set this correctly
-                            break;
-                        }
-                        $feed->setFeedLink($value['link'], $value['type']);
-                        break;
-                    default:
-                        $feed->$method($value);
-                        break;
-                }
-                continue;
-            }
-
-            // Entries
-            if ('entries' == $key) {
-                static::createEntries($value, $feed);
-                continue;
-            }
-        }
-
-        return $feed;
-    }
-
-    /**
-     * Normalize a key
-     *
-     * @param  string $key
-     * @return string
-     */
-    protected static function convertKey($key)
-    {
-        $key = str_replace('_', '', strtolower($key));
-        return $key;
-    }
-
-    /**
-     * Create and attach entries to a feed
-     *
-     * @param  array|Traversable $entries
-     * @param  Feed $feed
-     * @throws Exception\InvalidArgumentException
-     * @return void
-     */
-    protected static function createEntries($entries, Feed $feed)
-    {
-        if (!is_array($entries) && !$entries instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s::factory expects the "entries" value to be an array or Traversable; received "%s"',
-                get_called_class(),
-                (is_object($entries) ? get_class($entries) : gettype($entries))
-            ));
-        }
-
-        foreach ($entries as $data) {
-            if (!is_array($data) && !$data instanceof Traversable && !$data instanceof Entry) {
-                throw new Exception\InvalidArgumentException(sprintf(
-                    '%s expects an array, Traversable, or Zend\Feed\Writer\Entry argument; received "%s"',
-                    __METHOD__,
-                    (is_object($data) ? get_class($data) : gettype($data))
-                ));
-            }
-
-            // Use case 1: Entry item
-            if ($data instanceof Entry) {
-                $feed->addEntry($data);
-                continue;
-            }
-
-            // Use case 2: iterate item and populate entry
-            $entry = $feed->createEntry();
-            foreach ($data as $key => $value) {
-                $key    = static::convertKey($key);
-                $method = 'set' . $key;
-                if (!method_exists($entry, $method)) {
-                    continue;
-                }
-                $entry->$method($value);
-            }
-            $feed->addEntry($entry);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
deleted file mode 100644
index a609ca7..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-
-/**
-*/
-class AbstractRenderer
-{
-    /**
-     * Extensions
-     * @var array
-     */
-    protected $extensions = [];
-
-    /**
-     * @var Writer\AbstractFeed
-     */
-    protected $container = null;
-
-    /**
-     * @var DOMDocument
-     */
-    protected $dom = null;
-
-    /**
-     * @var bool
-     */
-    protected $ignoreExceptions = false;
-
-    /**
-     * @var array
-     */
-    protected $exceptions = [];
-
-    /**
-     * Encoding of all text values
-     *
-     * @var string
-     */
-    protected $encoding = 'UTF-8';
-
-    /**
-     * Holds the value "atom" or "rss" depending on the feed type set when
-     * when last exported.
-     *
-     * @var string
-     */
-    protected $type = null;
-
-    /**
-     * @var DOMElement
-     */
-    protected $rootElement = null;
-
-    /**
-     * Constructor
-     *
-     * @param Writer\AbstractFeed $container
-     */
-    public function __construct($container)
-    {
-        $this->container = $container;
-        $this->setType($container->getType());
-        $this->_loadExtensions();
-    }
-
-    /**
-     * Save XML to string
-     *
-     * @return string
-     */
-    public function saveXml()
-    {
-        return $this->getDomDocument()->saveXml();
-    }
-
-    /**
-     * Get DOM document
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->dom;
-    }
-
-    /**
-     * Get document element from DOM
-     *
-     * @return DOMElement
-     */
-    public function getElement()
-    {
-        return $this->getDomDocument()->documentElement;
-    }
-
-    /**
-     * Get data container of items being rendered
-     *
-     * @return Writer\AbstractFeed
-     */
-    public function getDataContainer()
-    {
-        return $this->container;
-    }
-
-    /**
-     * Set feed encoding
-     *
-     * @param  string $enc
-     * @return AbstractRenderer
-     */
-    public function setEncoding($enc)
-    {
-        $this->encoding = $enc;
-        return $this;
-    }
-
-    /**
-     * Get feed encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Indicate whether or not to ignore exceptions
-     *
-     * @param  bool $bool
-     * @return AbstractRenderer
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    public function ignoreExceptions($bool = true)
-    {
-        if (!is_bool($bool)) {
-            throw new Writer\Exception\InvalidArgumentException('Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)');
-        }
-        $this->ignoreExceptions = $bool;
-        return $this;
-    }
-
-    /**
-     * Get exception list
-     *
-     * @return array
-     */
-    public function getExceptions()
-    {
-        return $this->exceptions;
-    }
-
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Sets the absolute root element for the XML feed being generated. This
-     * helps simplify the appending of namespace declarations, but also ensures
-     * namespaces are added to the root element - not scattered across the entire
-     * XML file - may assist namespace unsafe parsers and looks pretty ;).
-     *
-     * @param DOMElement $root
-     */
-    public function setRootElement(DOMElement $root)
-    {
-        $this->rootElement = $root;
-    }
-
-    /**
-     * Retrieve the absolute root element for the XML feed being generated.
-     *
-     * @return DOMElement
-     */
-    public function getRootElement()
-    {
-        return $this->rootElement;
-    }
-
-    /**
-     * Load extensions from Zend\Feed\Writer\Writer
-     *
-     * @return void
-     */
-    protected function _loadExtensions()
-    {
-        Writer\Writer::registerCoreExtensions();
-        $manager = Writer\Writer::getExtensionManager();
-        $all = Writer\Writer::getExtensions();
-        if (stripos(get_class($this), 'entry')) {
-            $exts = $all['entryRenderer'];
-        } else {
-            $exts = $all['feedRenderer'];
-        }
-        foreach ($exts as $extension) {
-            $plugin = $manager->get($extension);
-            $plugin->setDataContainer($this->getDataContainer());
-            $plugin->setEncoding($this->getEncoding());
-            $this->extensions[$extension] = $plugin;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
deleted file mode 100644
index dced034..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Entry;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Validator;
-
-class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Entry $container
-     */
-    public function __construct(Writer\Entry $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render atom entry
-     *
-     * @return Atom
-     */
-    public function render()
-    {
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $entry = $this->dom->createElementNS(Writer\Writer::NAMESPACE_ATOM_10, 'entry');
-        $this->dom->appendChild($entry);
-
-        $this->_setSource($this->dom, $entry);
-        $this->_setTitle($this->dom, $entry);
-        $this->_setDescription($this->dom, $entry);
-        $this->_setDateCreated($this->dom, $entry);
-        $this->_setDateModified($this->dom, $entry);
-        $this->_setLink($this->dom, $entry);
-        $this->_setId($this->dom, $entry);
-        $this->_setAuthors($this->dom, $entry);
-        $this->_setEnclosure($this->dom, $entry);
-        $this->_setContent($this->dom, $entry);
-        $this->_setCategories($this->dom, $entry);
-
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDOMDocument($this->getDOMDocument(), $entry);
-            $ext->render();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set entry title
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getTitle()) {
-            $message = 'Atom 1.0 entry elements MUST contain exactly one'
-            . ' atom:title element but a title has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $title->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection($this->getDataContainer()->getTitle());
-        $title->appendChild($cdata);
-    }
-
-    /**
-     * Set entry description
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()) {
-            return; // unless src content or base64
-        }
-        $subtitle = $dom->createElement('summary');
-        $root->appendChild($subtitle);
-        $subtitle->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection(
-            $this->getDataContainer()->getDescription()
-        );
-        $subtitle->appendChild($cdata);
-    }
-
-    /**
-     * Set date entry was modified
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateModified()) {
-            $message = 'Atom 1.0 entry elements MUST contain exactly one'
-            . ' atom:updated element but a modification date has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $updated = $dom->createElement('updated');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set date entry was created
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        $el = $dom->createElement('published');
-        $root->appendChild($el);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateCreated()->format(DateTime::ATOM)
-        );
-        $el->appendChild($text);
-    }
-
-    /**
-     * Set entry authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->container->getAuthors();
-        if ((!$authors || empty($authors))) {
-            /**
-             * This will actually trigger an Exception at the feed level if
-             * a feed level author is not set.
-             */
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('author');
-            $name = $this->dom->createElement('name');
-            $author->appendChild($name);
-            $root->appendChild($author);
-            $text = $dom->createTextNode($data['name']);
-            $name->appendChild($text);
-            if (array_key_exists('email', $data)) {
-                $email = $this->dom->createElement('email');
-                $author->appendChild($email);
-                $text = $dom->createTextNode($data['email']);
-                $email->appendChild($text);
-            }
-            if (array_key_exists('uri', $data)) {
-                $uri = $this->dom->createElement('uri');
-                $author->appendChild($uri);
-                $text = $dom->createTextNode($data['uri']);
-                $uri->appendChild($text);
-            }
-        }
-    }
-
-    /**
-     * Set entry enclosure
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->container->getEnclosure();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $enclosure = $this->dom->createElement('link');
-        $enclosure->setAttribute('rel', 'enclosure');
-        if (isset($data['type'])) {
-            $enclosure->setAttribute('type', $data['type']);
-        }
-        if (isset($data['length'])) {
-            $enclosure->setAttribute('length', $data['length']);
-        }
-        $enclosure->setAttribute('href', $data['uri']);
-        $root->appendChild($enclosure);
-    }
-
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $link->setAttribute('rel', 'alternate');
-        $link->setAttribute('type', 'text/html');
-        $link->setAttribute('href', $this->getDataContainer()->getLink());
-    }
-
-    /**
-     * Set entry identifier
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            $message = 'Atom 1.0 entry elements MUST contain exactly one '
-            . 'atom:id element, or as an alternative, we can use the same '
-            . 'value as atom:link however neither a suitable link nor an '
-            . 'id have been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink()
-            );
-        }
-        if (!Uri::factory($this->getDataContainer()->getId())->isValid()
-            && !preg_match(
-                "#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#",
-                $this->getDataContainer()->getId()
-            )
-            && !$this->_validateTagUri($this->getDataContainer()->getId())
-        ) {
-            throw new Writer\Exception\InvalidArgumentException('Atom 1.0 IDs must be a valid URI/IRI');
-        }
-        $id = $dom->createElement('id');
-        $root->appendChild($id);
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-    }
-
-    /**
-     * Validate a URI using the tag scheme (RFC 4151)
-     *
-     * @param string $id
-     * @return bool
-     */
-    protected function _validateTagUri($id)
-    {
-        if (preg_match(
-            '/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/',
-            $id,
-            $matches
-        )) {
-            $dvalid = false;
-            $date = $matches['date'];
-            $d6 = strtotime($date);
-            if ((strlen($date) == 4) && $date <= date('Y')) {
-                $dvalid = true;
-            } elseif ((strlen($date) == 7) && ($d6 < strtotime("now"))) {
-                $dvalid = true;
-            } elseif ((strlen($date) == 10) && ($d6 < strtotime("now"))) {
-                $dvalid = true;
-            }
-            $validator = new Validator\EmailAddress;
-            if ($validator->isValid($matches['name'])) {
-                $nvalid = true;
-            } else {
-                $nvalid = $validator->isValid('info@' . $matches['name']);
-            }
-            return $dvalid && $nvalid;
-        }
-        return false;
-    }
-
-    /**
-     * Set entry content
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setContent(DOMDocument $dom, DOMElement $root)
-    {
-        $content = $this->getDataContainer()->getContent();
-        if (!$content && !$this->getDataContainer()->getLink()) {
-            $message = 'Atom 1.0 entry elements MUST contain exactly one '
-            . 'atom:content element, or as an alternative, at least one link '
-            . 'with a rel attribute of "alternate" to indicate an alternate '
-            . 'method to consume the content.';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        if (!$content) {
-            return;
-        }
-        $element = $dom->createElement('content');
-        $element->setAttribute('type', 'xhtml');
-        $xhtmlElement = $this->_loadXhtml($content);
-        $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
-        $xhtml = $dom->importNode($xhtmlElement, $deep);
-        $element->appendChild($xhtml);
-        $root->appendChild($element);
-    }
-
-    /**
-     * Load a HTML string and attempt to normalise to XML
-     */
-    protected function _loadXhtml($content)
-    {
-        if (class_exists('tidy', false)) {
-            $tidy = new \tidy;
-            $config = [
-                'output-xhtml' => true,
-                'show-body-only' => true,
-                'quote-nbsp' => false
-            ];
-            $encoding = str_replace('-', '', $this->getEncoding());
-            $tidy->parseString($content, $config, $encoding);
-            $tidy->cleanRepair();
-            $xhtml = (string) $tidy;
-        } else {
-            $xhtml = $content;
-        }
-        $xhtml = preg_replace([
-            "/(<[\/]?)([a-zA-Z]+)/"
-        ], '$1xhtml:$2', $xhtml);
-        $dom = new DOMDocument('1.0', $this->getEncoding());
-        $dom->loadXML(
-            '<xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">'
-            . $xhtml
-            . '</xhtml:div>'
-        );
-        return $dom->documentElement;
-    }
-
-    /**
-     * Set entry categories
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            $category->setAttribute('term', $cat['term']);
-            if (isset($cat['label'])) {
-                $category->setAttribute('label', $cat['label']);
-            } else {
-                $category->setAttribute('label', $cat['term']);
-            }
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('scheme', $cat['scheme']);
-            }
-            $root->appendChild($category);
-        }
-    }
-
-    /**
-     * Append Source element (Atom 1.0 Feed Metadata)
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setSource(DOMDocument $dom, DOMElement $root)
-    {
-        $source = $this->getDataContainer()->getSource();
-        if (!$source) {
-            return;
-        }
-        $renderer = new Renderer\Feed\AtomSource($source);
-        $renderer->setType($this->getType());
-        $element = $renderer->render()->getElement();
-        $imported = $dom->importNode($element, true);
-        $root->appendChild($imported);
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
deleted file mode 100644
index 8519bd9..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Entry\Atom;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Deleted $container
-     */
-    public function __construct(Writer\Deleted $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render atom entry
-     *
-     * @return Writer\Renderer\Entry\Atom
-     */
-    public function render()
-    {
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $entry = $this->dom->createElement('at:deleted-entry');
-        $this->dom->appendChild($entry);
-
-        $entry->setAttribute('ref', $this->container->getReference());
-        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
-
-        $this->_setBy($this->dom, $entry);
-        $this->_setComment($this->dom, $entry);
-
-        return $this;
-    }
-
-    /**
-     * Set tombstone comment
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setComment(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getComment()) {
-            return;
-        }
-        $c = $dom->createElement('at:comment');
-        $root->appendChild($c);
-        $c->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection($this->getDataContainer()->getComment());
-        $c->appendChild($cdata);
-    }
-
-    /**
-     * Set entry authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBy(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->container->getBy();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $author = $this->dom->createElement('at:by');
-        $name = $this->dom->createElement('name');
-        $author->appendChild($name);
-        $root->appendChild($author);
-        $text = $dom->createTextNode($data['name']);
-        $name->appendChild($text);
-        if (array_key_exists('email', $data)) {
-            $email = $this->dom->createElement('email');
-            $author->appendChild($email);
-            $text = $dom->createTextNode($data['email']);
-            $email->appendChild($text);
-        }
-        if (array_key_exists('uri', $data)) {
-            $uri = $this->dom->createElement('uri');
-            $author->appendChild($uri);
-            $text = $dom->createTextNode($data['uri']);
-            $uri->appendChild($text);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
deleted file mode 100644
index f0db3e9..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Entry;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-/**
-*/
-class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Deleted $container
-     */
-    public function __construct(Writer\Deleted $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render atom entry
-     *
-     * @return \Zend\Feed\Writer\Renderer\Entry\Atom
-     */
-    public function render()
-    {
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $entry = $this->dom->createElement('at:deleted-entry');
-        $this->dom->appendChild($entry);
-
-        $entry->setAttribute('ref', $this->container->getReference());
-        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
-
-        $this->_setBy($this->dom, $entry);
-        $this->_setComment($this->dom, $entry);
-
-        return $this;
-    }
-
-    /**
-     * Set tombstone comment
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setComment(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getComment()) {
-            return;
-        }
-        $c = $dom->createElement('at:comment');
-        $root->appendChild($c);
-        $c->setAttribute('type', 'html');
-        $cdata = $dom->createCDATASection($this->getDataContainer()->getComment());
-        $c->appendChild($cdata);
-    }
-
-    /**
-     * Set entry authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBy(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->container->getBy();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        $author = $this->dom->createElement('at:by');
-        $name = $this->dom->createElement('name');
-        $author->appendChild($name);
-        $root->appendChild($author);
-        $text = $dom->createTextNode($data['name']);
-        $name->appendChild($text);
-        if (array_key_exists('email', $data)) {
-            $email = $this->dom->createElement('email');
-            $author->appendChild($email);
-            $text = $dom->createTextNode($data['email']);
-            $email->appendChild($text);
-        }
-        if (array_key_exists('uri', $data)) {
-            $uri = $this->dom->createElement('uri');
-            $author->appendChild($uri);
-            $text = $dom->createTextNode($data['uri']);
-            $uri->appendChild($text);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
deleted file mode 100644
index 3edb4fd..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Entry;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-/**
-*/
-class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Entry $container
-     */
-    public function __construct(Writer\Entry $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render RSS entry
-     *
-     * @return Rss
-     */
-    public function render()
-    {
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $this->dom->substituteEntities = false;
-        $entry = $this->dom->createElement('item');
-        $this->dom->appendChild($entry);
-
-        $this->_setTitle($this->dom, $entry);
-        $this->_setDescription($this->dom, $entry);
-        $this->_setDateCreated($this->dom, $entry);
-        $this->_setDateModified($this->dom, $entry);
-        $this->_setLink($this->dom, $entry);
-        $this->_setId($this->dom, $entry);
-        $this->_setAuthors($this->dom, $entry);
-        $this->_setEnclosure($this->dom, $entry);
-        $this->_setCommentLink($this->dom, $entry);
-        $this->_setCategories($this->dom, $entry);
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDOMDocument($this->getDOMDocument(), $entry);
-            $ext->render();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set entry title
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
-            $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
-            . ' title element but a title has not been set. In addition, there'
-            . ' is no description as required in the absence of a title.';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set entry description
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()
-        && !$this->getDataContainer()->getTitle()) {
-            $message = 'RSS 2.0 entry elements SHOULD contain exactly one'
-            . ' description element but a description has not been set. In'
-            . ' addition, there is no title element as required in the absence'
-            . ' of a description.';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        if (!$this->getDataContainer()->getDescription()) {
-            return;
-        }
-        $subtitle = $dom->createElement('description');
-        $root->appendChild($subtitle);
-        $text = $dom->createCDATASection($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date entry was last modified
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateModified()) {
-            return;
-        }
-
-        $updated = $dom->createElement('pubDate');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::RSS)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set date entry was created
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if (!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-
-    /**
-     * Set entry authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->container->getAuthors();
-        if ((!$authors || empty($authors))) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('author');
-            $name = $data['name'];
-            if (array_key_exists('email', $data)) {
-                $name = $data['email'] . ' (' . $data['name'] . ')';
-            }
-            $text = $dom->createTextNode($name);
-            $author->appendChild($text);
-            $root->appendChild($author);
-        }
-    }
-
-    /**
-     * Set entry enclosure
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
-    {
-        $data = $this->container->getEnclosure();
-        if ((!$data || empty($data))) {
-            return;
-        }
-        if (!isset($data['type'])) {
-            $exception = new Writer\Exception\InvalidArgumentException('Enclosure "type" is not set');
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        if (!isset($data['length'])) {
-            $exception = new Writer\Exception\InvalidArgumentException('Enclosure "length" is not set');
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        if ((int) $data['length'] < 0 || !ctype_digit((string) $data['length'])) {
-            $exception = new Writer\Exception\InvalidArgumentException('Enclosure "length" must be an integer'
-            . ' indicating the content\'s length in bytes');
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        $enclosure = $this->dom->createElement('enclosure');
-        $enclosure->setAttribute('type', $data['type']);
-        $enclosure->setAttribute('length', $data['length']);
-        $enclosure->setAttribute('url', $data['uri']);
-        $root->appendChild($enclosure);
-    }
-
-    /**
-     * Set link to entry
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $text = $dom->createTextNode($this->getDataContainer()->getLink());
-        $link->appendChild($text);
-    }
-
-    /**
-     * Set entry identifier
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            return;
-        }
-
-        $id = $dom->createElement('guid');
-        $root->appendChild($id);
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-        if (!Uri::factory($this->getDataContainer()->getId())->isValid()) {
-            $id->setAttribute('isPermaLink', 'false');
-        }
-    }
-
-    /**
-     * Set link to entry comments
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCommentLink(DOMDocument $dom, DOMElement $root)
-    {
-        $link = $this->getDataContainer()->getCommentLink();
-        if (!$link) {
-            return;
-        }
-        $clink = $this->dom->createElement('comments');
-        $text = $dom->createTextNode($link);
-        $clink->appendChild($text);
-        $root->appendChild($clink);
-    }
-
-    /**
-     * Set entry categories
-     *
-     * @param DOMDocument $dom
-     * @param DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('domain', $cat['scheme']);
-            }
-            $text = $dom->createCDATASection($cat['term']);
-            $category->appendChild($text);
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
deleted file mode 100644
index a5400a6..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
+++ /dev/null
@@ -1,403 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Feed\Writer\Version;
-
-/**
-*/
-class AbstractAtom extends Renderer\AbstractRenderer
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\AbstractFeed $container
-     */
-    public function __construct($container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Set feed language
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLanguage(DOMDocument $dom, DOMElement $root)
-    {
-        if ($this->getDataContainer()->getLanguage()) {
-            $root->setAttribute('xml:lang', $this->getDataContainer()
-                ->getLanguage());
-        }
-    }
-
-    /**
-     * Set feed title
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getTitle()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-            . ' atom:title element but a title has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $title->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set feed description
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()) {
-            return;
-        }
-        $subtitle = $dom->createElement('subtitle');
-        $root->appendChild($subtitle);
-        $subtitle->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date feed was last modified
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateModified()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-            . ' atom:updated element but a modification date has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $updated = $dom->createElement('updated');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set feed generator string
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Version::VERSION, 'http://framework.zend.com');
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-
-    /**
-     * Set link to feed
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $link->setAttribute('rel', 'alternate');
-        $link->setAttribute('type', 'text/html');
-        $link->setAttribute('href', $this->getDataContainer()->getLink());
-    }
-
-    /**
-     * Set feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || !array_key_exists('atom', $flinks)) {
-            $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
-            . 'element with a rel attribute value of "self".  This is the '
-            . 'preferred URI for retrieving Atom Feed Documents representing '
-            . 'this Atom feed but a feed link has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        foreach ($flinks as $type => $href) {
-            $mime = 'application/' . strtolower($type) . '+xml';
-            $flink = $dom->createElement('link');
-            $root->appendChild($flink);
-            $flink->setAttribute('rel', 'self');
-            $flink->setAttribute('type', $mime);
-            $flink->setAttribute('href', $href);
-        }
-    }
-
-    /**
-     * Set feed authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->container->getAuthors();
-        if (!$authors || empty($authors)) {
-            /**
-             * Technically we should defer an exception until we can check
-             * that all entries contain an author. If any entry is missing
-             * an author, then a missing feed author element is invalid
-             */
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('author');
-            $name = $this->dom->createElement('name');
-            $author->appendChild($name);
-            $root->appendChild($author);
-            $text = $dom->createTextNode($data['name']);
-            $name->appendChild($text);
-            if (array_key_exists('email', $data)) {
-                $email = $this->dom->createElement('email');
-                $author->appendChild($email);
-                $text = $dom->createTextNode($data['email']);
-                $email->appendChild($text);
-            }
-            if (array_key_exists('uri', $data)) {
-                $uri = $this->dom->createElement('uri');
-                $author->appendChild($uri);
-                $text = $dom->createTextNode($data['uri']);
-                $uri->appendChild($text);
-            }
-        }
-    }
-
-    /**
-     * Set feed identifier
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one '
-            . 'atom:id element, or as an alternative, we can use the same '
-            . 'value as atom:link however neither a suitable link nor an '
-            . 'id have been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        $id = $dom->createElement('id');
-        $root->appendChild($id);
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-    }
-
-    /**
-     * Set feed copyright
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCopyright(DOMDocument $dom, DOMElement $root)
-    {
-        $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
-            return;
-        }
-        $copy = $dom->createElement('rights');
-        $root->appendChild($copy);
-        $text = $dom->createTextNode($copyright);
-        $copy->appendChild($text);
-    }
-
-    /**
-     * Set feed level logo (image)
-     *
-     * @param DOMDocument $dom
-     * @param DOMElement $root
-     * @return void
-     */
-    protected function _setImage(DOMDocument $dom, DOMElement $root)
-    {
-        $image = $this->getDataContainer()->getImage();
-        if (!$image) {
-            return;
-        }
-        $img = $dom->createElement('logo');
-        $root->appendChild($img);
-        $text = $dom->createTextNode($image['uri']);
-        $img->appendChild($text);
-    }
-
-    /**
-     * Set date feed was created
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if (!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-
-    /**
-     * Set base URL to feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
-            return;
-        }
-        $root->setAttribute('xml:base', $baseUrl);
-    }
-
-    /**
-     * Set hubs to which this feed pushes
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setHubs(DOMDocument $dom, DOMElement $root)
-    {
-        $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs) {
-            return;
-        }
-        foreach ($hubs as $hubUrl) {
-            $hub = $dom->createElement('link');
-            $hub->setAttribute('rel', 'hub');
-            $hub->setAttribute('href', $hubUrl);
-            $root->appendChild($hub);
-        }
-    }
-
-    /**
-     * Set feed categories
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            $category->setAttribute('term', $cat['term']);
-            if (isset($cat['label'])) {
-                $category->setAttribute('label', $cat['label']);
-            } else {
-                $category->setAttribute('label', $cat['term']);
-            }
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('scheme', $cat['scheme']);
-            }
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
deleted file mode 100644
index 939babc..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed;
-
-use DOMDocument;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-/**
-*/
-class Atom extends AbstractAtom implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Feed $container
-     */
-    public function __construct(Writer\Feed $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render Atom feed
-     *
-     * @return Atom
-     */
-    public function render()
-    {
-        if (!$this->container->getEncoding()) {
-            $this->container->setEncoding('UTF-8');
-        }
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $root = $this->dom->createElementNS(
-            Writer\Writer::NAMESPACE_ATOM_10,
-            'feed'
-        );
-        $this->setRootElement($root);
-        $this->dom->appendChild($root);
-        $this->_setLanguage($this->dom, $root);
-        $this->_setBaseUrl($this->dom, $root);
-        $this->_setTitle($this->dom, $root);
-        $this->_setDescription($this->dom, $root);
-        $this->_setImage($this->dom, $root);
-        $this->_setDateCreated($this->dom, $root);
-        $this->_setDateModified($this->dom, $root);
-        $this->_setGenerator($this->dom, $root);
-        $this->_setLink($this->dom, $root);
-        $this->_setFeedLinks($this->dom, $root);
-        $this->_setId($this->dom, $root);
-        $this->_setAuthors($this->dom, $root);
-        $this->_setCopyright($this->dom, $root);
-        $this->_setCategories($this->dom, $root);
-        $this->_setHubs($this->dom, $root);
-
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDOMDocument($this->getDOMDocument(), $root);
-            $ext->render();
-        }
-
-        foreach ($this->container as $entry) {
-            if ($this->getDataContainer()->getEncoding()) {
-                $entry->setEncoding($this->getDataContainer()->getEncoding());
-            }
-            if ($entry instanceof Writer\Entry) {
-                $renderer = new Renderer\Entry\Atom($entry);
-            } else {
-                if (!$this->dom->documentElement->hasAttribute('xmlns:at')) {
-                    $this->dom->documentElement->setAttribute(
-                        'xmlns:at',
-                        'http://purl.org/atompub/tombstones/1.0'
-                    );
-                }
-                $renderer = new Renderer\Entry\AtomDeleted($entry);
-            }
-            if ($this->ignoreExceptions === true) {
-                $renderer->ignoreExceptions();
-            }
-            $renderer->setType($this->getType());
-            $renderer->setRootElement($this->dom->documentElement);
-            $renderer->render();
-            $element = $renderer->getElement();
-            $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
-            $imported = $this->dom->importNode($element, $deep);
-            $root->appendChild($imported);
-        }
-        return $this;
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
deleted file mode 100644
index 20fc8df..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed\Atom;
-
-use Datetime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed;
-use Zend\Feed\Writer\Version;
-
-class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
-{
-    /**
-     * Constructor
-     *
-     * @param  \Zend\Feed\Writer\Feed $container
-     */
-    public function __construct($container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Set feed language
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLanguage(DOMDocument $dom, DOMElement $root)
-    {
-        if ($this->getDataContainer()->getLanguage()) {
-            $root->setAttribute('xml:lang', $this->getDataContainer()
-                ->getLanguage());
-        }
-    }
-
-    /**
-     * Set feed title
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Feed\Exception\InvalidArgumentException
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getTitle()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-                . ' atom:title element but a title has not been set';
-            $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $title->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set feed description
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()) {
-            return;
-        }
-        $subtitle = $dom->createElement('subtitle');
-        $root->appendChild($subtitle);
-        $subtitle->setAttribute('type', 'text');
-        $text = $dom->createTextNode($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date feed was last modified
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Feed\Exception\InvalidArgumentException
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateModified()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one'
-                . ' atom:updated element but a modification date has not been set';
-            $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $updated = $dom->createElement('updated');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set feed generator string
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator('Zend_Feed_Writer',
-                Version::VERSION, 'http://framework.zend.com');
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-
-    /**
-     * Set link to feed
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getLink()) {
-            return;
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $link->setAttribute('rel', 'alternate');
-        $link->setAttribute('type', 'text/html');
-        $link->setAttribute('href', $this->getDataContainer()->getLink());
-    }
-
-    /**
-     * Set feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Feed\Exception\InvalidArgumentException
-     */
-    protected function _setFeedLinks(DOMDocument $dom, DOMElement $root)
-    {
-        $flinks = $this->getDataContainer()->getFeedLinks();
-        if (!$flinks || !array_key_exists('atom', $flinks)) {
-            $message = 'Atom 1.0 feed elements SHOULD contain one atom:link '
-                . 'element with a rel attribute value of "self".  This is the '
-                . 'preferred URI for retrieving Atom Feed Documents representing '
-                . 'this Atom feed but a feed link has not been set';
-            $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        foreach ($flinks as $type => $href) {
-            $mime = 'application/' . strtolower($type) . '+xml';
-            $flink = $dom->createElement('link');
-            $root->appendChild($flink);
-            $flink->setAttribute('rel', 'self');
-            $flink->setAttribute('type', $mime);
-            $flink->setAttribute('href', $href);
-        }
-    }
-
-    /**
-     * Set feed authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->container->getAuthors();
-        if (!$authors || empty($authors)) {
-            /**
-             * Technically we should defer an exception until we can check
-             * that all entries contain an author. If any entry is missing
-             * an author, then a missing feed author element is invalid
-             */
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('author');
-            $name = $this->dom->createElement('name');
-            $author->appendChild($name);
-            $root->appendChild($author);
-            $text = $dom->createTextNode($data['name']);
-            $name->appendChild($text);
-            if (array_key_exists('email', $data)) {
-                $email = $this->dom->createElement('email');
-                $author->appendChild($email);
-                $text = $dom->createTextNode($data['email']);
-                $email->appendChild($text);
-            }
-            if (array_key_exists('uri', $data)) {
-                $uri = $this->dom->createElement('uri');
-                $author->appendChild($uri);
-                $text = $dom->createTextNode($data['uri']);
-                $uri->appendChild($text);
-            }
-        }
-    }
-
-    /**
-     * Set feed identifier
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Feed\Exception\InvalidArgumentException
-     */
-    protected function _setId(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getId()
-        && !$this->getDataContainer()->getLink()) {
-            $message = 'Atom 1.0 feed elements MUST contain exactly one '
-                . 'atom:id element, or as an alternative, we can use the same '
-                . 'value as atom:link however neither a suitable link nor an '
-                . 'id have been set';
-            $exception = new Feed\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (!$this->getDataContainer()->getId()) {
-            $this->getDataContainer()->setId(
-                $this->getDataContainer()->getLink());
-        }
-        $id = $dom->createElement('id');
-        $root->appendChild($id);
-        $text = $dom->createTextNode($this->getDataContainer()->getId());
-        $id->appendChild($text);
-    }
-
-    /**
-     * Set feed copyright
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCopyright(DOMDocument $dom, DOMElement $root)
-    {
-        $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
-            return;
-        }
-        $copy = $dom->createElement('rights');
-        $root->appendChild($copy);
-        $text = $dom->createTextNode($copyright);
-        $copy->appendChild($text);
-    }
-    /**
-     * Set feed level logo (image)
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setImage(DOMDocument $dom, DOMElement $root)
-    {
-        $image = $this->getDataContainer()->getImage();
-        if (!$image) {
-            return;
-        }
-        $img = $dom->createElement('logo');
-        $root->appendChild($img);
-        $text = $dom->createTextNode($image['uri']);
-        $img->appendChild($text);
-    }
-
-    /**
-     * Set date feed was created
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if (!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-
-    /**
-     * Set base URL to feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
-            return;
-        }
-        $root->setAttribute('xml:base', $baseUrl);
-    }
-
-    /**
-     * Set hubs to which this feed pushes
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setHubs(DOMDocument $dom, DOMElement $root)
-    {
-        $hubs = $this->getDataContainer()->getHubs();
-        if (!$hubs) {
-            return;
-        }
-        foreach ($hubs as $hubUrl) {
-            $hub = $dom->createElement('link');
-            $hub->setAttribute('rel', 'hub');
-            $hub->setAttribute('href', $hubUrl);
-            $root->appendChild($hub);
-        }
-    }
-
-    /**
-     * Set feed categories
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            $category->setAttribute('term', $cat['term']);
-            if (isset($cat['label'])) {
-                $category->setAttribute('label', $cat['label']);
-            } else {
-                $category->setAttribute('label', $cat['term']);
-            }
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('scheme', $cat['scheme']);
-            }
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
deleted file mode 100644
index 3793db0..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed\Atom;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-class Source extends AbstractAtom implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Source $container
-     */
-    public function __construct(Writer\Source $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render Atom Feed Metadata (Source element)
-     *
-     * @return Writer\Renderer\Feed\Atom
-     */
-    public function render()
-    {
-        if (!$this->container->getEncoding()) {
-            $this->container->setEncoding('UTF-8');
-        }
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $root = $this->dom->createElement('source');
-        $this->setRootElement($root);
-        $this->dom->appendChild($root);
-        $this->_setLanguage($this->dom, $root);
-        $this->_setBaseUrl($this->dom, $root);
-        $this->_setTitle($this->dom, $root);
-        $this->_setDescription($this->dom, $root);
-        $this->_setDateCreated($this->dom, $root);
-        $this->_setDateModified($this->dom, $root);
-        $this->_setGenerator($this->dom, $root);
-        $this->_setLink($this->dom, $root);
-        $this->_setFeedLinks($this->dom, $root);
-        $this->_setId($this->dom, $root);
-        $this->_setAuthors($this->dom, $root);
-        $this->_setCopyright($this->dom, $root);
-        $this->_setCategories($this->dom, $root);
-
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDomDocument($this->getDomDocument(), $root);
-            $ext->render();
-        }
-        return $this;
-    }
-
-    /**
-     * Set feed generator string
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getGenerator()) {
-            return;
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
deleted file mode 100644
index d552b80..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed;
-
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-
-/**
-*/
-class AtomSource extends AbstractAtom implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Source $container
-     */
-    public function __construct(Writer\Source $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render Atom Feed Metadata (Source element)
-     *
-     * @return \Zend\Feed\Writer\Renderer\Feed\Atom
-     */
-    public function render()
-    {
-        if (!$this->container->getEncoding()) {
-            $this->container->setEncoding('UTF-8');
-        }
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $root = $this->dom->createElement('source');
-        $this->setRootElement($root);
-        $this->dom->appendChild($root);
-        $this->_setLanguage($this->dom, $root);
-        $this->_setBaseUrl($this->dom, $root);
-        $this->_setTitle($this->dom, $root);
-        $this->_setDescription($this->dom, $root);
-        $this->_setDateCreated($this->dom, $root);
-        $this->_setDateModified($this->dom, $root);
-        $this->_setGenerator($this->dom, $root);
-        $this->_setLink($this->dom, $root);
-        $this->_setFeedLinks($this->dom, $root);
-        $this->_setId($this->dom, $root);
-        $this->_setAuthors($this->dom, $root);
-        $this->_setCopyright($this->dom, $root);
-        $this->_setCategories($this->dom, $root);
-
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDOMDocument($this->getDOMDocument(), $root);
-            $ext->render();
-        }
-        return $this;
-    }
-
-    /**
-     * Set feed generator string
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getGenerator()) {
-            return;
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $text = $dom->createTextNode($gdata['name']);
-        $generator->appendChild($text);
-        if (array_key_exists('uri', $gdata)) {
-            $generator->setAttribute('uri', $gdata['uri']);
-        }
-        if (array_key_exists('version', $gdata)) {
-            $generator->setAttribute('version', $gdata['version']);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
deleted file mode 100644
index be902b8..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
+++ /dev/null
@@ -1,488 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer\Feed;
-
-use DateTime;
-use DOMDocument;
-use DOMElement;
-use Zend\Feed\Uri;
-use Zend\Feed\Writer;
-use Zend\Feed\Writer\Renderer;
-use Zend\Feed\Writer\Version;
-
-/**
-*/
-class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterface
-{
-    /**
-     * Constructor
-     *
-     * @param  Writer\Feed $container
-     */
-    public function __construct(Writer\Feed $container)
-    {
-        parent::__construct($container);
-    }
-
-    /**
-     * Render RSS feed
-     *
-     * @return self
-     */
-    public function render()
-    {
-        $this->dom = new DOMDocument('1.0', $this->container->getEncoding());
-        $this->dom->formatOutput = true;
-        $this->dom->substituteEntities = false;
-        $rss = $this->dom->createElement('rss');
-        $this->setRootElement($rss);
-        $rss->setAttribute('version', '2.0');
-
-        $channel = $this->dom->createElement('channel');
-        $rss->appendChild($channel);
-        $this->dom->appendChild($rss);
-        $this->_setLanguage($this->dom, $channel);
-        $this->_setBaseUrl($this->dom, $channel);
-        $this->_setTitle($this->dom, $channel);
-        $this->_setDescription($this->dom, $channel);
-        $this->_setImage($this->dom, $channel);
-        $this->_setDateCreated($this->dom, $channel);
-        $this->_setDateModified($this->dom, $channel);
-        $this->_setLastBuildDate($this->dom, $channel);
-        $this->_setGenerator($this->dom, $channel);
-        $this->_setLink($this->dom, $channel);
-        $this->_setAuthors($this->dom, $channel);
-        $this->_setCopyright($this->dom, $channel);
-        $this->_setCategories($this->dom, $channel);
-
-        foreach ($this->extensions as $ext) {
-            $ext->setType($this->getType());
-            $ext->setRootElement($this->getRootElement());
-            $ext->setDOMDocument($this->getDOMDocument(), $channel);
-            $ext->render();
-        }
-
-        foreach ($this->container as $entry) {
-            if ($this->getDataContainer()->getEncoding()) {
-                $entry->setEncoding($this->getDataContainer()->getEncoding());
-            }
-            if ($entry instanceof Writer\Entry) {
-                $renderer = new Renderer\Entry\Rss($entry);
-            } else {
-                continue;
-            }
-            if ($this->ignoreExceptions === true) {
-                $renderer->ignoreExceptions();
-            }
-            $renderer->setType($this->getType());
-            $renderer->setRootElement($this->dom->documentElement);
-            $renderer->render();
-            $element = $renderer->getElement();
-            $deep = version_compare(PHP_VERSION, '7', 'ge') ? 1 : true;
-            $imported = $this->dom->importNode($element, $deep);
-            $channel->appendChild($imported);
-        }
-        return $this;
-    }
-
-    /**
-     * Set feed language
-     *
-     * @param DOMDocument $dom
-     * @param DOMElement $root
-     * @return void
-     */
-    protected function _setLanguage(DOMDocument $dom, DOMElement $root)
-    {
-        $lang = $this->getDataContainer()->getLanguage();
-        if (!$lang) {
-            return;
-        }
-        $language = $dom->createElement('language');
-        $root->appendChild($language);
-        $language->nodeValue = $lang;
-    }
-
-    /**
-     * Set feed title
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setTitle(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getTitle()) {
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' title element but a title has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $title = $dom->createElement('title');
-        $root->appendChild($title);
-        $text = $dom->createTextNode($this->getDataContainer()->getTitle());
-        $title->appendChild($text);
-    }
-
-    /**
-     * Set feed description
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setDescription(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDescription()) {
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' description element but one has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        $subtitle = $dom->createElement('description');
-        $root->appendChild($subtitle);
-        $text = $dom->createTextNode($this->getDataContainer()->getDescription());
-        $subtitle->appendChild($text);
-    }
-
-    /**
-     * Set date feed was last modified
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateModified(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateModified()) {
-            return;
-        }
-
-        $updated = $dom->createElement('pubDate');
-        $root->appendChild($updated);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::RSS)
-        );
-        $updated->appendChild($text);
-    }
-
-    /**
-     * Set feed generator string
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setGenerator(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getGenerator()) {
-            $this->getDataContainer()->setGenerator(
-                'Zend_Feed_Writer',
-                Version::VERSION,
-                'http://framework.zend.com'
-            );
-        }
-
-        $gdata = $this->getDataContainer()->getGenerator();
-        $generator = $dom->createElement('generator');
-        $root->appendChild($generator);
-        $name = $gdata['name'];
-        if (array_key_exists('version', $gdata)) {
-            $name .= ' ' . $gdata['version'];
-        }
-        if (array_key_exists('uri', $gdata)) {
-            $name .= ' (' . $gdata['uri'] . ')';
-        }
-        $text = $dom->createTextNode($name);
-        $generator->appendChild($text);
-    }
-
-    /**
-     * Set link to feed
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setLink(DOMDocument $dom, DOMElement $root)
-    {
-        $value = $this->getDataContainer()->getLink();
-        if (!$value) {
-            $message = 'RSS 2.0 feed elements MUST contain exactly one'
-            . ' link element but one has not been set';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-        $link = $dom->createElement('link');
-        $root->appendChild($link);
-        $text = $dom->createTextNode($value);
-        $link->appendChild($text);
-        if (!Uri::factory($value)->isValid()) {
-            $link->setAttribute('isPermaLink', 'false');
-        }
-    }
-
-    /**
-     * Set feed authors
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setAuthors(DOMDocument $dom, DOMElement $root)
-    {
-        $authors = $this->getDataContainer()->getAuthors();
-        if (!$authors || empty($authors)) {
-            return;
-        }
-        foreach ($authors as $data) {
-            $author = $this->dom->createElement('author');
-            $name = $data['name'];
-            if (array_key_exists('email', $data)) {
-                $name = $data['email'] . ' (' . $data['name'] . ')';
-            }
-            $text = $dom->createTextNode($name);
-            $author->appendChild($text);
-            $root->appendChild($author);
-        }
-    }
-
-    /**
-     * Set feed copyright
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCopyright(DOMDocument $dom, DOMElement $root)
-    {
-        $copyright = $this->getDataContainer()->getCopyright();
-        if (!$copyright) {
-            return;
-        }
-        $copy = $dom->createElement('copyright');
-        $root->appendChild($copy);
-        $text = $dom->createTextNode($copyright);
-        $copy->appendChild($text);
-    }
-
-    /**
-     * Set feed channel image
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     * @throws Writer\Exception\InvalidArgumentException
-     */
-    protected function _setImage(DOMDocument $dom, DOMElement $root)
-    {
-        $image = $this->getDataContainer()->getImage();
-        if (!$image) {
-            return;
-        }
-
-        if (!isset($image['title']) || empty($image['title'])
-            || !is_string($image['title'])
-        ) {
-            $message = 'RSS 2.0 feed images must include a title';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        if (empty($image['link']) || !is_string($image['link'])
-            || !Uri::factory($image['link'])->isValid()
-        ) {
-            $message = 'Invalid parameter: parameter \'link\''
-            . ' must be a non-empty string and valid URI/IRI';
-            $exception = new Writer\Exception\InvalidArgumentException($message);
-            if (!$this->ignoreExceptions) {
-                throw $exception;
-            } else {
-                $this->exceptions[] = $exception;
-                return;
-            }
-        }
-
-        $img   = $dom->createElement('image');
-        $root->appendChild($img);
-
-        $url   = $dom->createElement('url');
-        $text  = $dom->createTextNode($image['uri']);
-        $url->appendChild($text);
-
-        $title = $dom->createElement('title');
-        $text  = $dom->createTextNode($image['title']);
-        $title->appendChild($text);
-
-        $link  = $dom->createElement('link');
-        $text  = $dom->createTextNode($image['link']);
-        $link->appendChild($text);
-
-        $img->appendChild($url);
-        $img->appendChild($title);
-        $img->appendChild($link);
-
-        if (isset($image['height'])) {
-            if (!ctype_digit((string) $image['height']) || $image['height'] > 400) {
-                $message = 'Invalid parameter: parameter \'height\''
-                         . ' must be an integer not exceeding 400';
-                $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
-                    throw $exception;
-                } else {
-                    $this->exceptions[] = $exception;
-                    return;
-                }
-            }
-            $height = $dom->createElement('height');
-            $text   = $dom->createTextNode($image['height']);
-            $height->appendChild($text);
-            $img->appendChild($height);
-        }
-        if (isset($image['width'])) {
-            if (!ctype_digit((string) $image['width']) || $image['width'] > 144) {
-                $message = 'Invalid parameter: parameter \'width\''
-                         . ' must be an integer not exceeding 144';
-                $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
-                    throw $exception;
-                } else {
-                    $this->exceptions[] = $exception;
-                    return;
-                }
-            }
-            $width = $dom->createElement('width');
-            $text  = $dom->createTextNode($image['width']);
-            $width->appendChild($text);
-            $img->appendChild($width);
-        }
-        if (isset($image['description'])) {
-            if (empty($image['description']) || !is_string($image['description'])) {
-                $message = 'Invalid parameter: parameter \'description\''
-                         . ' must be a non-empty string';
-                $exception = new Writer\Exception\InvalidArgumentException($message);
-                if (!$this->ignoreExceptions) {
-                    throw $exception;
-                } else {
-                    $this->exceptions[] = $exception;
-                    return;
-                }
-            }
-            $desc = $dom->createElement('description');
-            $text = $dom->createTextNode($image['description']);
-            $desc->appendChild($text);
-            $img->appendChild($desc);
-        }
-    }
-
-    /**
-     * Set date feed was created
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getDateCreated()) {
-            return;
-        }
-        if (!$this->getDataContainer()->getDateModified()) {
-            $this->getDataContainer()->setDateModified(
-                $this->getDataContainer()->getDateCreated()
-            );
-        }
-    }
-
-    /**
-     * Set date feed last build date
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setLastBuildDate(DOMDocument $dom, DOMElement $root)
-    {
-        if (!$this->getDataContainer()->getLastBuildDate()) {
-            return;
-        }
-
-        $lastBuildDate = $dom->createElement('lastBuildDate');
-        $root->appendChild($lastBuildDate);
-        $text = $dom->createTextNode(
-            $this->getDataContainer()->getLastBuildDate()->format(DateTime::RSS)
-        );
-        $lastBuildDate->appendChild($text);
-    }
-
-    /**
-     * Set base URL to feed links
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setBaseUrl(DOMDocument $dom, DOMElement $root)
-    {
-        $baseUrl = $this->getDataContainer()->getBaseUrl();
-        if (!$baseUrl) {
-            return;
-        }
-        $root->setAttribute('xml:base', $baseUrl);
-    }
-
-    /**
-     * Set feed categories
-     *
-     * @param  DOMDocument $dom
-     * @param  DOMElement $root
-     * @return void
-     */
-    protected function _setCategories(DOMDocument $dom, DOMElement $root)
-    {
-        $categories = $this->getDataContainer()->getCategories();
-        if (!$categories) {
-            return;
-        }
-        foreach ($categories as $cat) {
-            $category = $dom->createElement('category');
-            if (isset($cat['scheme'])) {
-                $category->setAttribute('domain', $cat['scheme']);
-            }
-            $text = $dom->createTextNode($cat['term']);
-            $category->appendChild($text);
-            $root->appendChild($category);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
deleted file mode 100644
index 24738ef..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer\Renderer;
-
-use DOMDocument;
-use DOMElement;
-
-/**
-*/
-interface RendererInterface
-{
-    /**
-     * Render feed/entry
-     *
-     * @return void
-     */
-    public function render();
-
-    /**
-     * Save feed and/or entry to XML and return string
-     *
-     * @return string
-     */
-    public function saveXml();
-
-    /**
-     * Get DOM document
-     *
-     * @return DOMDocument
-     */
-    public function getDomDocument();
-
-    /**
-     * Get document element from DOM
-     *
-     * @return DOMElement
-     */
-    public function getElement();
-
-    /**
-     * Get data container containing feed items
-     *
-     * @return mixed
-     */
-    public function getDataContainer();
-
-    /**
-     * Should exceptions be ignored?
-     *
-     * @return mixed
-     */
-    public function ignoreExceptions();
-
-    /**
-     * Get list of thrown exceptions
-     *
-     * @return array
-     */
-    public function getExceptions();
-
-    /**
-     * Set the current feed type being exported to "rss" or "atom". This allows
-     * other objects to gracefully choose whether to execute or not, depending
-     * on their appropriateness for the current type, e.g. renderers.
-     *
-     * @param string $type
-     */
-    public function setType($type);
-
-    /**
-     * Retrieve the current or last feed type exported.
-     *
-     * @return string Value will be "rss" or "atom"
-     */
-    public function getType();
-
-    /**
-     * Sets the absolute root element for the XML feed being generated. This
-     * helps simplify the appending of namespace declarations, but also ensures
-     * namespaces are added to the root element - not scattered across the entire
-     * XML file - may assist namespace unsafe parsers and looks pretty ;).
-     *
-     * @param DOMElement $root
-     */
-    public function setRootElement(DOMElement $root);
-
-    /**
-     * Retrieve the absolute root element for the XML feed being generated.
-     *
-     * @return DOMElement
-     */
-    public function getRootElement();
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Source.php b/vendor/zendframework/zend-feed/src/Writer/Source.php
deleted file mode 100644
index 23affa7..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Source.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-/**
-*/
-class Source extends AbstractFeed
-{
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Version.php b/vendor/zendframework/zend-feed/src/Writer/Version.php
deleted file mode 100644
index 08351ca..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Version.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-abstract class Version
-{
-    const VERSION = '2';
-}
diff --git a/vendor/zendframework/zend-feed/src/Writer/Writer.php b/vendor/zendframework/zend-feed/src/Writer/Writer.php
deleted file mode 100644
index a4f95bf..0000000
--- a/vendor/zendframework/zend-feed/src/Writer/Writer.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Feed\Writer;
-
-/**
-*/
-class Writer
-{
-    /**
-     * Namespace constants
-     */
-    const NAMESPACE_ATOM_03  = 'http://purl.org/atom/ns#';
-    const NAMESPACE_ATOM_10  = 'http://www.w3.org/2005/Atom';
-    const NAMESPACE_RDF      = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
-    const NAMESPACE_RSS_090  = 'http://my.netscape.com/rdf/simple/0.9/';
-    const NAMESPACE_RSS_10   = 'http://purl.org/rss/1.0/';
-
-    /**
-     * Feed type constants
-     */
-    const TYPE_ANY              = 'any';
-    const TYPE_ATOM_03          = 'atom-03';
-    const TYPE_ATOM_10          = 'atom-10';
-    const TYPE_ATOM_ANY         = 'atom';
-    const TYPE_RSS_090          = 'rss-090';
-    const TYPE_RSS_091          = 'rss-091';
-    const TYPE_RSS_091_NETSCAPE = 'rss-091n';
-    const TYPE_RSS_091_USERLAND = 'rss-091u';
-    const TYPE_RSS_092          = 'rss-092';
-    const TYPE_RSS_093          = 'rss-093';
-    const TYPE_RSS_094          = 'rss-094';
-    const TYPE_RSS_10           = 'rss-10';
-    const TYPE_RSS_20           = 'rss-20';
-    const TYPE_RSS_ANY          = 'rss';
-
-    /**
-     * @var ExtensionManagerInterface
-     */
-    protected static $extensionManager = null;
-
-    /**
-     * Array of registered extensions by class postfix (after the base class
-     * name) across four categories - data containers and renderers for entry
-     * and feed levels.
-     *
-     * @var array
-     */
-    protected static $extensions = [
-        'entry'         => [],
-        'feed'          => [],
-        'entryRenderer' => [],
-        'feedRenderer'  => [],
-    ];
-
-    /**
-     * Set plugin loader for use with Extensions
-     *
-     * @param ExtensionManagerInterface
-     */
-    public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
-    {
-        static::$extensionManager = $extensionManager;
-    }
-
-    /**
-     * Get plugin manager for use with Extensions
-     *
-     * @return ExtensionManagerInterface
-     */
-    public static function getExtensionManager()
-    {
-        if (!isset(static::$extensionManager)) {
-            static::setExtensionManager(new ExtensionManager());
-        }
-        return static::$extensionManager;
-    }
-
-    /**
-     * Register an Extension by name
-     *
-     * @param  string $name
-     * @return void
-     * @throws Exception\RuntimeException if unable to resolve Extension class
-     */
-    public static function registerExtension($name)
-    {
-        $feedName          = $name . '\Feed';
-        $entryName         = $name . '\Entry';
-        $feedRendererName  = $name . '\Renderer\Feed';
-        $entryRendererName = $name . '\Renderer\Entry';
-        $manager           = static::getExtensionManager();
-        if (static::isRegistered($name)) {
-            if ($manager->has($feedName)
-                || $manager->has($entryName)
-                || $manager->has($feedRendererName)
-                || $manager->has($entryRendererName)
-            ) {
-                return;
-            }
-        }
-        if (!$manager->has($feedName)
-            && !$manager->has($entryName)
-            && !$manager->has($feedRendererName)
-            && !$manager->has($entryRendererName)
-        ) {
-            throw new Exception\RuntimeException('Could not load extension: ' . $name
-                . 'using Plugin Loader. Check prefix paths are configured and extension exists.');
-        }
-        if ($manager->has($feedName)) {
-            static::$extensions['feed'][] = $feedName;
-        }
-        if ($manager->has($entryName)) {
-            static::$extensions['entry'][] = $entryName;
-        }
-        if ($manager->has($feedRendererName)) {
-            static::$extensions['feedRenderer'][] = $feedRendererName;
-        }
-        if ($manager->has($entryRendererName)) {
-            static::$extensions['entryRenderer'][] = $entryRendererName;
-        }
-    }
-
-    /**
-     * Is a given named Extension registered?
-     *
-     * @param  string $extensionName
-     * @return bool
-     */
-    public static function isRegistered($extensionName)
-    {
-        $feedName          = $extensionName . '\Feed';
-        $entryName         = $extensionName . '\Entry';
-        $feedRendererName  = $extensionName . '\Renderer\Feed';
-        $entryRendererName = $extensionName . '\Renderer\Entry';
-        if (in_array($feedName, static::$extensions['feed'])
-            || in_array($entryName, static::$extensions['entry'])
-            || in_array($feedRendererName, static::$extensions['feedRenderer'])
-            || in_array($entryRendererName, static::$extensions['entryRenderer'])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get a list of extensions
-     *
-     * @return array
-     */
-    public static function getExtensions()
-    {
-        return static::$extensions;
-    }
-
-    /**
-     * Reset class state to defaults
-     *
-     * @return void
-     */
-    public static function reset()
-    {
-        static::$extensionManager = null;
-        static::$extensions   = [
-            'entry'         => [],
-            'feed'          => [],
-            'entryRenderer' => [],
-            'feedRenderer'  => [],
-        ];
-    }
-
-    /**
-     * Register core (default) extensions
-     *
-     * @return void
-     */
-    public static function registerCoreExtensions()
-    {
-        static::registerExtension('DublinCore');
-        static::registerExtension('Content');
-        static::registerExtension('Atom');
-        static::registerExtension('Slash');
-        static::registerExtension('WellFormedWeb');
-        static::registerExtension('Threading');
-        static::registerExtension('ITunes');
-    }
-
-    public static function lcfirst($str)
-    {
-        $str[0] = strtolower($str[0]);
-        return $str;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/CHANGELOG.md b/vendor/zendframework/zend-hydrator/CHANGELOG.md
deleted file mode 100644
index 6911686..0000000
--- a/vendor/zendframework/zend-hydrator/CHANGELOG.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 1.0.0 - 2015-09-17
-
-Initial release. This ports all hydrator classes and functionality from
-[zend-stdlib](https://github.com/zendframework/zend-stdlib) to a standalone
-repository. All final keywords are removed, to allow a deprecation cycle in the
-zend-stdlib component.
-
-Please note: the following classes will be marked as `final` for a version 2.0.0
-release to immediately follow 1.0.0:
-
-- `Zend\Hydrator\NamingStrategy\IdentityNamingStrategy`
-- `Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy`
-- `Zend\Hydrator\NamingStrategy\CompositeNamingStrategy`
-- `Zend\Hydrator\Strategy\ExplodeStrategy`
-- `Zend\Hydrator\Strategy\StrategyChain`
-- `Zend\Hydrator\Strategy\DateTimeFormatterStrategy`
-- `Zend\Hydrator\Strategy\BooleanStrategy`
-
-As such, you should not extend them.
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
diff --git a/vendor/zendframework/zend-hydrator/CONTRIBUTING.md b/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
deleted file mode 100644
index ddfff50..0000000
--- a/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-hydrator/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-hydrator.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
-standards checks, and provides configuration for our selected checks.
-`phpcs` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/phpcs
-```
-
-`phpcs` also provides a tool that can automatically fix many CS issues,
-`phpcbf`:
-
-```console
-$ ./vendor/bin/phpcbf
-```
-
-If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-hydrator)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-hydrator.git
-   $ cd zend-hydrator
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-hydrator.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-hydrator.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/vendor/zendframework/zend-hydrator/LICENSE.md b/vendor/zendframework/zend-hydrator/LICENSE.md
deleted file mode 100644
index dbb1b49..0000000
--- a/vendor/zendframework/zend-hydrator/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 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.
-
-- 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.
-
-- Neither the name of Zend Technologies USA, Inc. 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 OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-hydrator/README.md b/vendor/zendframework/zend-hydrator/README.md
deleted file mode 100644
index 7608334..0000000
--- a/vendor/zendframework/zend-hydrator/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# zend-hydrator
-
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-hydrator.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-hydrator)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-hydrator/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-hydrator?branch=master)
-
-`Zend\Hydrator` provides utilities for mapping arrays to objects, and vice
-versa, including facilities for filtering which data is mapped as well as
-providing mechanisms for mapping nested structures.
-
-- File issues at https://github.com/zendframework/zend-hydrator/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/vendor/zendframework/zend-hydrator/composer.json b/vendor/zendframework/zend-hydrator/composer.json
deleted file mode 100644
index 21b4afe..0000000
--- a/vendor/zendframework/zend-hydrator/composer.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "zendframework/zend-hydrator",
-    "description": " ",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2",
-        "hydrator"
-    ],
-    "homepage": "https://github.com/zendframework/zend-hydrator",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Hydrator\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.5",
-        "zendframework/zend-stdlib": "^2.5.1"
-    },
-    "require-dev": {
-        "zendframework/zend-eventmanager": "^2.5.1",
-        "zendframework/zend-inputfilter": "^2.5.1",
-        "zendframework/zend-serializer": "^2.5.1",
-        "zendframework/zend-servicemanager": "^2.5.1",
-        "zendframework/zend-filter": "^2.5.1",
-        "phpunit/PHPUnit": "~4.0",
-        "squizlabs/php_codesniffer": "^2.0@dev"
-    },
-    "suggest": {
-        "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
-        "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
-        "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage",
-        "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Hydrator\\": "test/"
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/phpcs.xml b/vendor/zendframework/zend-hydrator/phpcs.xml
deleted file mode 100644
index e994eae..0000000
--- a/vendor/zendframework/zend-hydrator/phpcs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Zend Framework coding standard">
-    <description>Zend Framework coding standard</description>
-
-    <!-- display progress -->
-    <arg value="p"/>
-    <arg name="colors"/>
-
-    <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
-        <properties>
-            <property name="ignoreBlankLines" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Paths to check -->
-    <file>src</file>
-    <file>test</file>
-</ruleset>
diff --git a/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php b/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
deleted file mode 100644
index 6f3f0a9..0000000
--- a/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ArrayObject;
-
-abstract class AbstractHydrator implements
-    HydratorInterface,
-    StrategyEnabledInterface,
-    FilterEnabledInterface,
-    NamingStrategyEnabledInterface
-{
-    /**
-     * The list with strategies that this hydrator has.
-     *
-     * @var ArrayObject
-     */
-    protected $strategies;
-
-    /**
-     * An instance of NamingStrategy\NamingStrategyInterface
-     *
-     * @var NamingStrategy\NamingStrategyInterface
-     */
-    protected $namingStrategy;
-
-    /**
-     * Composite to filter the methods, that need to be hydrated
-     *
-     * @var Filter\FilterComposite
-     */
-    protected $filterComposite;
-
-    /**
-     * Initializes a new instance of this class.
-     */
-    public function __construct()
-    {
-        $this->strategies = new ArrayObject();
-        $this->filterComposite = new Filter\FilterComposite();
-    }
-
-    /**
-     * Gets the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to get.
-     *
-     * @throws Exception\InvalidArgumentException
-     * @return Strategy\StrategyInterface
-     */
-    public function getStrategy($name)
-    {
-        if (isset($this->strategies[$name])) {
-            return $this->strategies[$name];
-        }
-
-        if (!isset($this->strategies['*'])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s: no strategy by name of "%s", and no wildcard strategy present',
-                __METHOD__,
-                $name
-            ));
-        }
-
-        return $this->strategies['*'];
-    }
-
-    /**
-     * Checks if the strategy with the given name exists.
-     *
-     * @param string $name The name of the strategy to check for.
-     * @return bool
-     */
-    public function hasStrategy($name)
-    {
-        return array_key_exists($name, $this->strategies)
-               || array_key_exists('*', $this->strategies);
-    }
-
-    /**
-     * Adds the given strategy under the given name.
-     *
-     * @param string $name The name of the strategy to register.
-     * @param Strategy\StrategyInterface $strategy The strategy to register.
-     * @return HydratorInterface
-     */
-    public function addStrategy($name, Strategy\StrategyInterface $strategy)
-    {
-        $this->strategies[$name] = $strategy;
-        return $this;
-    }
-
-    /**
-     * Removes the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to remove.
-     * @return HydratorInterface
-     */
-    public function removeStrategy($name)
-    {
-        unset($this->strategies[$name]);
-        return $this;
-    }
-
-    /**
-     * Converts a value for extraction. If no strategy exists the plain value is returned.
-     *
-     * @param  string $name  The name of the strategy to use.
-     * @param  mixed  $value  The value that should be converted.
-     * @param  mixed  $object The object is optionally provided as context.
-     * @return mixed
-     */
-    public function extractValue($name, $value, $object = null)
-    {
-        if ($this->hasStrategy($name)) {
-            $strategy = $this->getStrategy($name);
-            $value = $strategy->extract($value, $object);
-        }
-        return $value;
-    }
-
-    /**
-     * Converts a value for hydration. If no strategy exists the plain value is returned.
-     *
-     * @param string $name The name of the strategy to use.
-     * @param mixed $value The value that should be converted.
-     * @param array $data The whole data is optionally provided as context.
-     * @return mixed
-     */
-    public function hydrateValue($name, $value, $data = null)
-    {
-        if ($this->hasStrategy($name)) {
-            $strategy = $this->getStrategy($name);
-            $value = $strategy->hydrate($value, $data);
-        }
-        return $value;
-    }
-
-    /**
-     * Convert a name for extraction. If no naming strategy exists, the plain value is returned.
-     *
-     * @param string $name    The name to convert.
-     * @param null   $object  The object is optionally provided as context.
-     * @return mixed
-     */
-    public function extractName($name, $object = null)
-    {
-        if ($this->hasNamingStrategy()) {
-            $name = $this->getNamingStrategy()->extract($name, $object);
-        }
-        return $name;
-    }
-
-    /**
-     * Converts a value for hydration. If no naming strategy exists, the plain value is returned.
-     *
-     * @param string $name  The name to convert.
-     * @param array  $data  The whole data is optionally provided as context.
-     * @return mixed
-     */
-    public function hydrateName($name, $data = null)
-    {
-        if ($this->hasNamingStrategy()) {
-            $name = $this->getNamingStrategy()->hydrate($name, $data);
-        }
-        return $name;
-    }
-
-    /**
-     * Get the filter instance
-     *
-     * @return Filter\FilterComposite
-     */
-    public function getFilter()
-    {
-        return $this->filterComposite;
-    }
-
-    /**
-     * Add a new filter to take care of what needs to be hydrated.
-     * To exclude e.g. the method getServiceLocator:
-     *
-     * <code>
-     * $composite->addFilter("servicelocator",
-     *     function ($property) {
-     *         list($class, $method) = explode('::', $property);
-     *         if ($method === 'getServiceLocator') {
-     *             return false;
-     *         }
-     *         return true;
-     *     }, FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param string $name Index in the composite
-     * @param callable|Filter\FilterInterface $filter
-     * @param int $condition
-     * @return Filter\FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
-    {
-        return $this->filterComposite->addFilter($name, $filter, $condition);
-    }
-
-    /**
-     * Check whether a specific filter exists at key $name or not
-     *
-     * @param string $name Index in the composite
-     * @return bool
-     */
-    public function hasFilter($name)
-    {
-        return $this->filterComposite->hasFilter($name);
-    }
-
-    /**
-     * Remove a filter from the composition.
-     * To not extract "has" methods, you simply need to unregister it
-     *
-     * <code>
-     * $filterComposite->removeFilter('has');
-     * </code>
-     *
-     * @param $name
-     * @return Filter\FilterComposite
-     */
-    public function removeFilter($name)
-    {
-        return $this->filterComposite->removeFilter($name);
-    }
-
-    /**
-     * Adds the given naming strategy
-     *
-     * @param NamingStrategy\NamingStrategyInterface $strategy The naming to register.
-     * @return self
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
-    {
-        $this->namingStrategy = $strategy;
-
-        return $this;
-    }
-
-    /**
-     * Gets the naming strategy.
-     *
-     * @return NamingStrategy\NamingStrategyInterface
-     */
-    public function getNamingStrategy()
-    {
-        return $this->namingStrategy;
-    }
-
-    /**
-     * Checks if a naming strategy exists.
-     *
-     * @return bool
-     */
-    public function hasNamingStrategy()
-    {
-        return isset($this->namingStrategy);
-    }
-
-    /**
-     * Removes the naming strategy
-     *
-     * @return self
-     */
-    public function removeNamingStrategy()
-    {
-        $this->namingStrategy = null;
-
-        return $this;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php b/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
deleted file mode 100644
index fa384ad..0000000
--- a/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\EventManager;
-use Zend\EventManager\EventManagerAwareInterface;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Hydrator\HydratorInterface;
-
-/**
- * Aggregate hydrator that composes multiple hydrators via events
- */
-class AggregateHydrator implements HydratorInterface, EventManagerAwareInterface
-{
-    const DEFAULT_PRIORITY = 1;
-
-    /**
-     * @var EventManagerInterface|null
-     */
-    protected $eventManager;
-
-    /**
-     * Attaches the provided hydrator to the list of hydrators to be used while hydrating/extracting data
-     *
-     * @param HydratorInterface $hydrator
-     * @param int $priority
-     */
-    public function add(HydratorInterface $hydrator, $priority = self::DEFAULT_PRIORITY)
-    {
-        $this->getEventManager()->attachAggregate(new HydratorListener($hydrator), $priority);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($object)
-    {
-        $event = new ExtractEvent($this, $object);
-
-        $this->getEventManager()->trigger($event);
-
-        return $event->getExtractedData();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate(array $data, $object)
-    {
-        $event = new HydrateEvent($this, $object, $data);
-
-        $this->getEventManager()->trigger($event);
-
-        return $event->getHydratedObject();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setEventManager(EventManagerInterface $eventManager)
-    {
-        $eventManager->setIdentifiers([__CLASS__, get_class($this)]);
-
-        $this->eventManager = $eventManager;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getEventManager()
-    {
-        if (null === $this->eventManager) {
-            $this->setEventManager(new EventManager());
-        }
-
-        return $this->eventManager;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php b/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
deleted file mode 100644
index 1395917..0000000
--- a/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\Event;
-
-/**
- * Event triggered when the {@see AggregateHydrator} extracts
- * data from an object
- */
-class ExtractEvent extends Event
-{
-    const EVENT_EXTRACT = 'extract';
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $name = self::EVENT_EXTRACT;
-
-    /**
-     * @var object
-     */
-    protected $extractionObject;
-
-    /**
-     * @var array
-     */
-    protected $extractedData = [];
-
-    /**
-     * @param object $target
-     * @param object $extractionObject
-     */
-    public function __construct($target, $extractionObject)
-    {
-        $this->target           = $target;
-        $this->extractionObject = $extractionObject;
-    }
-
-    /**
-     * Retrieves the object from which data is extracted
-     *
-     * @return object
-     */
-    public function getExtractionObject()
-    {
-        return $this->extractionObject;
-    }
-
-    /**
-     * @param object $extractionObject
-     *
-     * @return void
-     */
-    public function setExtractionObject($extractionObject)
-    {
-        $this->extractionObject = $extractionObject;
-    }
-
-    /**
-     * Retrieves the data that has been extracted
-     *
-     * @return array
-     */
-    public function getExtractedData()
-    {
-        return $this->extractedData;
-    }
-
-    /**
-     * @param array $extractedData
-     *
-     * @return void
-     */
-    public function setExtractedData(array $extractedData)
-    {
-        $this->extractedData = $extractedData;
-    }
-
-    /**
-     * Merge provided data with the extracted data
-     *
-     * @param array $additionalData
-     *
-     * @return void
-     */
-    public function mergeExtractedData(array $additionalData)
-    {
-        $this->extractedData = array_merge($this->extractedData, $additionalData);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php b/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
deleted file mode 100644
index 7865964..0000000
--- a/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\Event;
-
-/**
- * Event triggered when the {@see AggregateHydrator} hydrates
- * data into an object
- */
-class HydrateEvent extends Event
-{
-    const EVENT_HYDRATE = 'hydrate';
-
-    /**
-     * {@inheritDoc}
-     */
-    protected $name = self::EVENT_HYDRATE;
-
-    /**
-     * @var object
-     */
-    protected $hydratedObject;
-
-    /**
-     * @var array
-     */
-    protected $hydrationData;
-
-    /**
-     * @param object $target
-     * @param object $hydratedObject
-     * @param array  $hydrationData
-     */
-    public function __construct($target, $hydratedObject, array $hydrationData)
-    {
-        $this->target         = $target;
-        $this->hydratedObject = $hydratedObject;
-        $this->hydrationData  = $hydrationData;
-    }
-
-    /**
-     * Retrieves the object that is being hydrated
-     *
-     * @return object
-     */
-    public function getHydratedObject()
-    {
-        return $this->hydratedObject;
-    }
-
-    /**
-     * @param object $hydratedObject
-     */
-    public function setHydratedObject($hydratedObject)
-    {
-        $this->hydratedObject = $hydratedObject;
-    }
-
-    /**
-     * Retrieves the data that is being used for hydration
-     *
-     * @return array
-     */
-    public function getHydrationData()
-    {
-        return $this->hydrationData;
-    }
-
-    /**
-     * @param array $hydrationData
-     */
-    public function setHydrationData(array $hydrationData)
-    {
-        $this->hydrationData = $hydrationData;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php b/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
deleted file mode 100644
index c8260a4..0000000
--- a/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Aggregate;
-
-use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\Hydrator\HydratorInterface;
-
-/**
- * Aggregate listener wrapping around a hydrator.
- *
- * Listens to {@see HydrateEvent::EVENT_HYDRATE} and {@see ExtractEvent::EVENT_EXTRACT}
- */
-class HydratorListener extends AbstractListenerAggregate
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @param HydratorInterface $hydrator
-     */
-    public function __construct(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function attach(EventManagerInterface $events, $priority = 1)
-    {
-        $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, [$this, 'onHydrate'], $priority);
-        $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, [$this, 'onExtract'], $priority);
-    }
-
-    /**
-     * Callback to be used when {@see HydrateEvent::EVENT_HYDRATE} is triggered
-     *
-     * @param HydrateEvent $event
-     * @return object
-     * @internal
-     */
-    public function onHydrate(HydrateEvent $event)
-    {
-        $object = $this->hydrator->hydrate($event->getHydrationData(), $event->getHydratedObject());
-        $event->setHydratedObject($object);
-        return $object;
-    }
-
-    /**
-     * Callback to be used when {@see ExtractEvent::EVENT_EXTRACT} is triggered
-     *
-     * @param ExtractEvent $event
-     * @return array
-     * @internal
-     */
-    public function onExtract(ExtractEvent $event)
-    {
-        $data = $this->hydrator->extract($event->getExtractionObject());
-        $event->mergeExtractedData($data);
-        return $data;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/ArraySerializable.php b/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
deleted file mode 100644
index 24edee5..0000000
--- a/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-class ArraySerializable extends AbstractHydrator
-{
-    /**
-     * Extract values from the provided object
-     *
-     * Extracts values via the object's getArrayCopy() method.
-     *
-     * @param  object $object
-     * @return array
-     * @throws Exception\BadMethodCallException for an $object not implementing getArrayCopy()
-     */
-    public function extract($object)
-    {
-        if (! is_callable([$object, 'getArrayCopy'])) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided object to implement getArrayCopy()', __METHOD__)
-            );
-        }
-
-        $data   = $object->getArrayCopy();
-        $filter = $this->getFilter();
-
-        foreach ($data as $name => $value) {
-            if (!$filter->filter($name)) {
-                unset($data[$name]);
-                continue;
-            }
-            $extractedName = $this->extractName($name, $object);
-            // replace the original key with extracted, if differ
-            if ($extractedName !== $name) {
-                unset($data[$name]);
-                $name = $extractedName;
-            }
-            $data[$name] = $this->extractValue($name, $value, $object);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Hydrate an object
-     *
-     * Hydrates an object by passing $data to either its exchangeArray() or
-     * populate() method.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate()
-     */
-    public function hydrate(array $data, $object)
-    {
-        $replacement = [];
-        foreach ($data as $key => $value) {
-            $name = $this->hydrateName($key, $data);
-            $replacement[$name] = $this->hydrateValue($name, $value, $data);
-        }
-
-        if (is_callable([$object, 'exchangeArray'])) {
-            $object->exchangeArray($replacement);
-        } elseif (is_callable([$object, 'populate'])) {
-            $object->populate($replacement);
-        } else {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
-            );
-        }
-        return $object;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/ClassMethods.php b/vendor/zendframework/zend-hydrator/src/ClassMethods.php
deleted file mode 100644
index 80cce84..0000000
--- a/vendor/zendframework/zend-hydrator/src/ClassMethods.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
-
-class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
-{
-    /**
-     * Holds the names of the methods used for hydration, indexed by class::property name,
-     * false if the hydration method is not callable/usable for hydration purposes
-     *
-     * @var string[]|bool[]
-     */
-    private $hydrationMethodsCache = [];
-
-    /**
-     * A map of extraction methods to property name to be used during extraction, indexed
-     * by class name and method name
-     *
-     * @var string[][]
-     */
-    private $extractionMethodsCache = [];
-
-    /**
-     * Flag defining whether array keys are underscore-separated (true) or camel case (false)
-     *
-     * @var bool
-     */
-    protected $underscoreSeparatedKeys = true;
-
-    /**
-     * @var Filter\FilterInterface
-     */
-    private $callableMethodFilter;
-
-    /**
-     * Define if extract values will use camel case or name with underscore
-     * @param bool|array $underscoreSeparatedKeys
-     */
-    public function __construct($underscoreSeparatedKeys = true)
-    {
-        parent::__construct();
-        $this->setUnderscoreSeparatedKeys($underscoreSeparatedKeys);
-
-        $this->callableMethodFilter = new Filter\OptionalParametersFilter();
-
-        $this->filterComposite->addFilter('is', new Filter\IsFilter());
-        $this->filterComposite->addFilter('has', new Filter\HasFilter());
-        $this->filterComposite->addFilter('get', new Filter\GetFilter());
-        $this->filterComposite->addFilter(
-            'parameter',
-            new Filter\OptionalParametersFilter(),
-            Filter\FilterComposite::CONDITION_AND
-        );
-    }
-
-    /**
-     * @param  array|Traversable                 $options
-     * @return ClassMethods
-     * @throws Exception\InvalidArgumentException
-     */
-    public function setOptions($options)
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        } elseif (!is_array($options)) {
-            throw new Exception\InvalidArgumentException(
-                'The options parameter must be an array or a Traversable'
-            );
-        }
-        if (isset($options['underscoreSeparatedKeys'])) {
-            $this->setUnderscoreSeparatedKeys($options['underscoreSeparatedKeys']);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  bool      $underscoreSeparatedKeys
-     * @return ClassMethods
-     */
-    public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
-    {
-        $this->underscoreSeparatedKeys = (bool) $underscoreSeparatedKeys;
-
-        if ($this->underscoreSeparatedKeys) {
-            $this->setNamingStrategy(new NamingStrategy\UnderscoreNamingStrategy);
-        } elseif ($this->getNamingStrategy() instanceof NamingStrategy\UnderscoreNamingStrategy) {
-            $this->removeNamingStrategy();
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getUnderscoreSeparatedKeys()
-    {
-        return $this->underscoreSeparatedKeys;
-    }
-
-    /**
-     * Extract values from an object with class methods
-     *
-     * Extracts the getter/setter of the given $object.
-     *
-     * @param  object                           $object
-     * @return array
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function extract($object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)',
-                __METHOD__
-            ));
-        }
-
-        $objectClass = get_class($object);
-
-        // reset the hydrator's hydrator's cache for this object, as the filter may be per-instance
-        if ($object instanceof Filter\FilterProviderInterface) {
-            $this->extractionMethodsCache[$objectClass] = null;
-        }
-
-        // pass 1 - finding out which properties can be extracted, with which methods (populate hydration cache)
-        if (! isset($this->extractionMethodsCache[$objectClass])) {
-            $this->extractionMethodsCache[$objectClass] = [];
-            $filter                                     = $this->filterComposite;
-            $methods                                    = get_class_methods($object);
-
-            if ($object instanceof Filter\FilterProviderInterface) {
-                $filter = new Filter\FilterComposite(
-                    [$object->getFilter()],
-                    [new Filter\MethodMatchFilter('getFilter')]
-                );
-            }
-
-            foreach ($methods as $method) {
-                $methodFqn = $objectClass . '::' . $method;
-
-                if (! ($filter->filter($methodFqn) && $this->callableMethodFilter->filter($methodFqn))) {
-                    continue;
-                }
-
-                $attribute = $method;
-
-                if (strpos($method, 'get') === 0) {
-                    $attribute = substr($method, 3);
-                    if (!property_exists($object, $attribute)) {
-                        $attribute = lcfirst($attribute);
-                    }
-                }
-
-                $this->extractionMethodsCache[$objectClass][$method] = $attribute;
-            }
-        }
-
-        $values = [];
-
-        // pass 2 - actually extract data
-        foreach ($this->extractionMethodsCache[$objectClass] as $methodName => $attributeName) {
-            $realAttributeName          = $this->extractName($attributeName, $object);
-            $values[$realAttributeName] = $this->extractValue($realAttributeName, $object->$methodName(), $object);
-        }
-
-        return $values;
-    }
-
-    /**
-     * Hydrate an object by populating getter/setter methods
-     *
-     * Hydrates an object by getter/setter methods of the object.
-     *
-     * @param  array                            $data
-     * @param  object                           $object
-     * @return object
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function hydrate(array $data, $object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)',
-                __METHOD__
-            ));
-        }
-
-        $objectClass = get_class($object);
-
-        foreach ($data as $property => $value) {
-            $propertyFqn = $objectClass . '::$' . $property;
-
-            if (! isset($this->hydrationMethodsCache[$propertyFqn])) {
-                $setterName = 'set' . ucfirst($this->hydrateName($property, $data));
-
-                $this->hydrationMethodsCache[$propertyFqn] = is_callable([$object, $setterName])
-                    ? $setterName
-                    : false;
-            }
-
-            if ($this->hydrationMethodsCache[$propertyFqn]) {
-                $object->{$this->hydrationMethodsCache[$propertyFqn]}($this->hydrateValue($property, $value, $data));
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
-    {
-        $this->resetCaches();
-
-        return parent::addFilter($name, $filter, $condition);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeFilter($name)
-    {
-        $this->resetCaches();
-
-        return parent::removeFilter($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
-    {
-        $this->resetCaches();
-
-        return parent::setNamingStrategy($strategy);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function removeNamingStrategy()
-    {
-        $this->resetCaches();
-
-        return parent::removeNamingStrategy();
-    }
-
-    /**
-     * Reset all local hydration/extraction caches
-     */
-    private function resetCaches()
-    {
-        $this->hydrationMethodsCache = $this->extractionMethodsCache = [];
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php b/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
deleted file mode 100644
index a6f3f94..0000000
--- a/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-class DelegatingHydrator implements HydratorInterface
-{
-    /**
-     * @var ServiceLocatorInterface
-     */
-    protected $hydrators;
-
-    /**
-     * Constructor
-     *
-     * @param ServiceLocatorInterface $hydrators
-     */
-    public function __construct(ServiceLocatorInterface $hydrators)
-    {
-        $this->hydrators = $hydrators;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hydrate(array $data, $object)
-    {
-        return $this->getHydrator($object)->hydrate($data, $object);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function extract($object)
-    {
-        return $this->getHydrator($object)->extract($object);
-    }
-
-    /**
-     * Gets hydrator of an object
-     *
-     * @param  object $object
-     * @return HydratorInterface
-     */
-    protected function getHydrator($object)
-    {
-        return $this->hydrators->get(get_class($object));
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php b/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
deleted file mode 100644
index 89f2841..0000000
--- a/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
-class DelegatingHydratorFactory implements FactoryInterface
-{
-    /**
-     * Creates DelegatingHydrator
-     *
-     * @param  ServiceLocatorInterface $serviceLocator
-     * @return DelegatingHydrator
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        // Assume that this factory is registered with the HydratorManager,
-        // and just pass it directly on.
-        return new DelegatingHydrator($serviceLocator);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php
deleted file mode 100644
index a8503e2..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Bad method call exception
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php b/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php
deleted file mode 100644
index 40baf4f..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/DomainException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Domain exception
- */
-class DomainException extends \DomainException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 888c6a0..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Exception marker interface
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php
deleted file mode 100644
index ff5fd8e..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/ExtensionNotLoadedException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Extension not loaded exception
- */
-class ExtensionNotLoadedException extends RuntimeException
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 56c2d14..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Invalid Argument Exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php b/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php
deleted file mode 100644
index 263e9fb..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/InvalidCallbackException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Invalid callback exception
- */
-class InvalidCallbackException extends DomainException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php b/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php
deleted file mode 100644
index 89ff89c..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/LogicException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Logic exception
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php b/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php
deleted file mode 100644
index 766ece2..0000000
--- a/vendor/zendframework/zend-hydrator/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Exception;
-
-/**
- * Runtime exception
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php b/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php
deleted file mode 100644
index 6b3c07f..0000000
--- a/vendor/zendframework/zend-hydrator/src/ExtractionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface ExtractionInterface
-{
-    /**
-     * Extract values from an object
-     *
-     * @param  object $object
-     * @return array
-     */
-    public function extract($object);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php b/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php
deleted file mode 100644
index 6790713..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/FilterComposite.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ArrayObject;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class FilterComposite implements FilterInterface
-{
-    /**
-     * @var ArrayObject
-     */
-    protected $orFilter;
-
-    /**
-     * @var ArrayObject
-     */
-    protected $andFilter;
-
-    /**
-     * Constant to add with "or" conditition
-     */
-    const CONDITION_OR = 1;
-
-    /**
-     * Constant to add with "and" conditition
-     */
-    const CONDITION_AND = 2;
-
-    /**
-     * Define default Filter
-     *
-     * @param  array $orFilter
-     * @param  array $andFilter
-     * @throws InvalidArgumentException
-     */
-    public function __construct($orFilter = [], $andFilter = [])
-    {
-        array_walk(
-            $orFilter,
-            function ($value, $key) {
-                if (!is_callable($value) && !$value instanceof FilterInterface) {
-                    throw new InvalidArgumentException(
-                        'The value of ' . $key . ' should be either a callable or ' .
-                        'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-                    );
-                }
-            }
-        );
-
-        array_walk(
-            $andFilter,
-            function ($value, $key) {
-                if (!is_callable($value) && !$value instanceof FilterInterface) {
-                    throw new InvalidArgumentException(
-                        'The value of ' . $key . '  should be either a callable or ' .
-                        'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-                    );
-                }
-            }
-        );
-
-        $this->orFilter = new ArrayObject($orFilter);
-        $this->andFilter = new ArrayObject($andFilter);
-    }
-
-    /**
-     * Add a filter to the composite. Has to be indexed with $name in
-     * order to identify a specific filter.
-     *
-     * This example will exclude all methods from the hydration, that starts with 'getService'
-     * <code>
-     * $composite->addFilter('exclude',
-     *     function ($method) {
-     *         if (preg_match('/^getService/', $method) {
-     *             return false;
-     *         }
-     *         return true;
-     *     }, FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param  string                   $name
-     * @param  callable|FilterInterface $filter
-     * @param  int                      $condition Can be either
-     *     FilterComposite::CONDITION_OR or FilterComposite::CONDITION_AND
-     * @throws InvalidArgumentException
-     * @return FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = self::CONDITION_OR)
-    {
-        if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
-            throw new InvalidArgumentException(
-                'The value of ' . $name . ' should be either a callable or ' .
-                'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
-            );
-        }
-
-        if ($condition === self::CONDITION_OR) {
-            $this->orFilter[$name] = $filter;
-        } elseif ($condition === self::CONDITION_AND) {
-            $this->andFilter[$name] = $filter;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove a filter from the composition
-     *
-     * @param $name string Identifier for the filter
-     * @return FilterComposite
-     */
-    public function removeFilter($name)
-    {
-        if (isset($this->orFilter[$name])) {
-            unset($this->orFilter[$name]);
-        }
-
-        if (isset($this->andFilter[$name])) {
-            unset($this->andFilter[$name]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Check if $name has a filter registered
-     *
-     * @param $name string Identifier for the filter
-     * @return bool
-     */
-    public function hasFilter($name)
-    {
-        return isset($this->orFilter[$name]) || isset($this->andFilter[$name]);
-    }
-
-    /**
-     * Filter the composite based on the AND and OR condition
-     * Will return true if one from the "or conditions" and all from
-     * the "and condition" returns true. Otherwise false
-     *
-     * @param $property string Parameter will be e.g. Parent\Namespace\Class::method
-     * @return bool
-     */
-    public function filter($property)
-    {
-        $andCount = count($this->andFilter);
-        $orCount = count($this->orFilter);
-        // return true if no filters are registered
-        if ($orCount === 0 && $andCount === 0) {
-            return true;
-        } elseif ($orCount === 0 && $andCount !== 0) {
-            $returnValue = true;
-        } else {
-            $returnValue = false;
-        }
-
-        // Check if 1 from the or filters return true
-        foreach ($this->orFilter as $filter) {
-            if (is_callable($filter)) {
-                if ($filter($property) === true) {
-                    $returnValue = true;
-                    break;
-                }
-                continue;
-            } else {
-                if ($filter->filter($property) === true) {
-                    $returnValue = true;
-                    break;
-                }
-            }
-        }
-
-        // Check if all of the and condition return true
-        foreach ($this->andFilter as $filter) {
-            if (is_callable($filter)) {
-                if ($filter($property) === false) {
-                    return false;
-                }
-                continue;
-            } else {
-                if ($filter->filter($property) === false) {
-                    return false;
-                }
-            }
-        }
-
-        return $returnValue;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php b/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
deleted file mode 100644
index fb49918..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-interface FilterInterface
-{
-    /**
-     * Should return true, if the given filter
-     * does not match
-     *
-     * @param string $property The name of the property
-     * @return bool
-     */
-    public function filter($property);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php b/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php
deleted file mode 100644
index 2826c33..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/FilterProviderInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-interface FilterProviderInterface
-{
-    /**
-     * Provides a filter for hydration
-     *
-     * @return FilterInterface
-     */
-    public function getFilter();
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php
deleted file mode 100644
index 220a1b5..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/GetFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class GetFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 3) === 'get') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php
deleted file mode 100644
index d1ba4f9..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/HasFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class HasFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 3) === 'has') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php
deleted file mode 100644
index b74fcd7..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/IsFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class IsFilter implements FilterInterface
-{
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-
-        if (substr($property, $pos, 2) === 'is') {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php
deleted file mode 100644
index 865b578..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/MethodMatchFilter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-class MethodMatchFilter implements FilterInterface
-{
-    /**
-     * The method to exclude
-     * @var string
-     */
-    protected $method = null;
-
-    /**
-     * Either an exclude or an include
-     * @var bool
-     */
-    protected $exclude = null;
-
-    /**
-     * @param string $method The method to exclude or include
-     * @param bool $exclude If the method should be excluded
-     */
-    public function __construct($method, $exclude = true)
-    {
-        $this->method = $method;
-        $this->exclude = $exclude;
-    }
-
-    public function filter($property)
-    {
-        $pos = strpos($property, '::');
-        if ($pos !== false) {
-            $pos += 2;
-        } else {
-            $pos = 0;
-        }
-        if (substr($property, $pos) === $this->method) {
-            return !$this->exclude;
-        }
-        return $this->exclude;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
deleted file mode 100644
index abd8ee6..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ReflectionException;
-use ReflectionMethod;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class NumberOfParameterFilter implements FilterInterface
-{
-    /**
-     * The number of parameters beeing accepted
-     * @var int
-     */
-    protected $numberOfParameters = null;
-
-    /**
-     * @param int $numberOfParameters Number of accepted parameters
-     */
-    public function __construct($numberOfParameters = 0)
-    {
-        $this->numberOfParameters = (int) $numberOfParameters;
-    }
-
-    /**
-     * @param string $property the name of the property
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function filter($property)
-    {
-        try {
-            $reflectionMethod = new ReflectionMethod($property);
-        } catch (ReflectionException $exception) {
-            throw new InvalidArgumentException(
-                "Method $property doesn't exist"
-            );
-        }
-
-        return $reflectionMethod->getNumberOfParameters() === $this->numberOfParameters;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
deleted file mode 100644
index 25775d7..0000000
--- a/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Filter;
-
-use ReflectionException;
-use ReflectionMethod;
-use ReflectionParameter;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-/**
- * Filter that includes methods which have no parameters or only optional parameters
- */
-class OptionalParametersFilter implements FilterInterface
-{
-    /**
-     * Map of methods already analyzed
-     * by {@see OptionalParametersFilter::filter()},
-     * cached for performance reasons
-     *
-     * @var bool[]
-     */
-    protected static $propertiesCache = [];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function filter($property)
-    {
-        if (isset(static::$propertiesCache[$property])) {
-            return static::$propertiesCache[$property];
-        }
-
-        try {
-            $reflectionMethod = new ReflectionMethod($property);
-        } catch (ReflectionException $exception) {
-            throw new InvalidArgumentException(sprintf('Method %s doesn\'t exist', $property));
-        }
-
-        $mandatoryParameters = array_filter(
-            $reflectionMethod->getParameters(),
-            function (ReflectionParameter $parameter) {
-                return ! $parameter->isOptional();
-            }
-        );
-
-        return static::$propertiesCache[$property] = empty($mandatoryParameters);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php b/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
deleted file mode 100644
index f95f8b4..0000000
--- a/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface FilterEnabledInterface extends Filter\FilterProviderInterface
-{
-    /**
-     * Add a new filter to take care of what needs to be hydrated.
-     * To exclude e.g. the method getServiceLocator:
-     *
-     * <code>
-     * $composite->addFilter(
-     *     "servicelocator",
-     *     function ($property) {
-     *         list($class, $method) = explode('::', $property);
-     *         if ($method === 'getServiceLocator') {
-     *             return false;
-     *         }
-     *         return true;
-     *     },
-     *     FilterComposite::CONDITION_AND
-     * );
-     * </code>
-     *
-     * @param string $name Index in the composite
-     * @param callable|Filter\FilterInterface $filter
-     * @param int $condition
-     * @return Filter\FilterComposite
-     */
-    public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR);
-
-    /**
-     * Check whether a specific filter exists at key $name or not
-     *
-     * @param string $name Index in the composite
-     * @return bool
-     */
-    public function hasFilter($name);
-
-    /**
-     * Remove a filter from the composition.
-     * To not extract "has" methods, you simply need to unregister it
-     *
-     * <code>
-     * $filterComposite->removeFilter('has');
-     * </code>
-     *
-     * @param $name
-     * @return Filter\FilterComposite
-     */
-    public function removeFilter($name);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydrationInterface.php b/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
deleted file mode 100644
index ca28983..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydrationInterface
-{
-    /**
-     * Hydrate $object with the provided $data.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     */
-    public function hydrate(array $data, $object);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php b/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php
deleted file mode 100644
index 8c89bc6..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydratorAwareInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydratorAwareInterface
-{
-    /**
-     * Set hydrator
-     *
-     * @param  HydratorInterface $hydrator
-     * @return HydratorAwareInterface
-     */
-    public function setHydrator(HydratorInterface $hydrator);
-
-    /**
-     * Retrieve hydrator
-     *
-     * @return HydratorInterface
-     */
-    public function getHydrator();
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php b/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php
deleted file mode 100644
index 76c1989..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydratorAwareTrait.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-trait HydratorAwareTrait
-{
-    /**
-     * Hydrator instance
-     *
-     * @var HydratorInterface
-     * @access protected
-     */
-    protected $hydrator = null;
-
-    /**
-     * Set hydrator
-     *
-     * @param  HydratorInterface $hydrator
-     * @return self
-     * @access public
-     */
-    public function setHydrator(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-
-        return $this;
-    }
-
-    /**
-     * Retrieve hydrator
-     *
-     * @param void
-     * @return null|HydratorInterface
-     * @access public
-     */
-    public function getHydrator()
-    {
-        return $this->hydrator;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorInterface.php b/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
deleted file mode 100644
index a48effa..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface HydratorInterface extends HydrationInterface, ExtractionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php b/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php
deleted file mode 100644
index 20efbbf..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydratorOptionsInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Traversable;
-
-interface HydratorOptionsInterface
-{
-    /**
-     * @param  array|Traversable $options
-     * @return self
-     */
-    public function setOptions($options);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php b/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php
deleted file mode 100644
index de13dd1..0000000
--- a/vendor/zendframework/zend-hydrator/src/HydratorPluginManager.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use Zend\ServiceManager\AbstractPluginManager;
-
-/**
- * Plugin manager implementation for hydrators.
- *
- * Enforces that adapters retrieved are instances of HydratorInterface
- */
-class HydratorPluginManager extends AbstractPluginManager
-{
-    /**
-     * Whether or not to share by default
-     *
-     * @var bool
-     */
-    protected $shareByDefault = false;
-
-    /**
-     * Default aliases
-     *
-     * @var array
-     */
-    protected $aliases = [
-        'delegatinghydrator' => 'Zend\Hydrator\DelegatingHydrator',
-    ];
-
-    /**
-     * Default set of adapters
-     *
-     * @var array
-     */
-    protected $invokableClasses = [
-        'arrayserializable' => 'Zend\Hydrator\ArraySerializable',
-        'classmethods'      => 'Zend\Hydrator\ClassMethods',
-        'objectproperty'    => 'Zend\Hydrator\ObjectProperty',
-        'reflection'        => 'Zend\Hydrator\Reflection'
-    ];
-
-    /**
-     * Default factory-based adapters
-     *
-     * @var array
-     */
-    protected $factories = [
-        'Zend\Hydrator\DelegatingHydrator' => 'Zend\Hydrator\DelegatingHydratorFactory',
-    ];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function validatePlugin($plugin)
-    {
-        if ($plugin instanceof HydratorInterface) {
-            // we're okay
-            return;
-        }
-
-        throw new Exception\RuntimeException(sprintf(
-            'Plugin of type %s is invalid; must implement Zend\Hydrator\HydratorInterface',
-            (is_object($plugin) ? get_class($plugin) : gettype($plugin))
-        ));
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php b/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
deleted file mode 100644
index 8e14f03..0000000
--- a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use ArrayIterator;
-use Zend\Hydrator\HydratorInterface;
-
-class HydratingArrayIterator extends HydratingIteratorIterator
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @var object
-     */
-    protected $prototype;
-
-    /**
-     * @param HydratorInterface $hydrator
-     * @param array $data
-     * @param string|object $prototype Object, or class name to use for prototype.
-     */
-    public function __construct(HydratorInterface $hydrator, array $data, $prototype)
-    {
-        parent::__construct($hydrator, new ArrayIterator($data), $prototype);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php b/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php
deleted file mode 100644
index ec31040..0000000
--- a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use Iterator;
-use Zend\Hydrator\HydratorInterface;
-
-interface HydratingIteratorInterface extends Iterator
-{
-    /**
-     * This sets the prototype to hydrate.
-     *
-     * This prototype can be the name of the class or the object itself;
-     * iteration will clone the object.
-     *
-     * @param string|object $prototype
-     */
-    public function setPrototype($prototype);
-
-    /**
-     * Sets the hydrator to use during iteration.
-     *
-     * @param HydratorInterface $hydrator
-     */
-    public function setHydrator(HydratorInterface $hydrator);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php b/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php
deleted file mode 100644
index 53e09f0..0000000
--- a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingIteratorIterator.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Iterator;
-
-use Iterator;
-use IteratorIterator;
-use Zend\Hydrator\Exception\InvalidArgumentException;
-use Zend\Hydrator\HydratorInterface;
-
-class HydratingIteratorIterator extends IteratorIterator implements HydratingIteratorInterface
-{
-    /**
-     * @var HydratorInterface
-     */
-    protected $hydrator;
-
-    /**
-     * @var object
-     */
-    protected $prototype;
-
-    /**
-     * @param HydratorInterface $hydrator
-     * @param Iterator $data
-     * @param string|object $prototype Object or class name to use for prototype.
-     */
-    public function __construct(HydratorInterface $hydrator, Iterator $data, $prototype)
-    {
-        $this->setHydrator($hydrator);
-        $this->setPrototype($prototype);
-        parent::__construct($data);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setPrototype($prototype)
-    {
-        if (is_object($prototype)) {
-            $this->prototype = $prototype;
-            return;
-        }
-
-        if (!class_exists($prototype)) {
-            throw new InvalidArgumentException(
-                sprintf('Method %s was passed an invalid class name: %s', __METHOD__, $prototype)
-            );
-        }
-
-        $this->prototype = new $prototype;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setHydrator(HydratorInterface $hydrator)
-    {
-        $this->hydrator = $hydrator;
-    }
-
-    /**
-     * @return object Returns hydrated clone of $prototype
-     */
-    public function current()
-    {
-        $currentValue = parent::current();
-        $object       = clone $this->prototype;
-        $this->hydrator->hydrate($currentValue, $object);
-        return $object;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
deleted file mode 100644
index c6333e2..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class ArrayMapNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var string[]
-     */
-    private $extractionMap = [];
-
-    /**
-     * @var string[]
-     */
-    private $hydrationMap = [];
-
-    /**
-     * Constructor
-     *
-     * @param array $extractionMap A map of string keys and values for symmetric translation of hydrated
-     *                             and extracted field names
-     */
-    public function __construct(array $extractionMap)
-    {
-        $this->extractionMap = $extractionMap;
-        $this->hydrationMap  = array_flip($extractionMap);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        return isset($this->hydrationMap[$name]) ? $this->hydrationMap[$name] : $name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        return isset($this->extractionMap[$name]) ? $this->extractionMap[$name] : $name;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
deleted file mode 100644
index c2bae8c..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class CompositeNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var array
-     */
-    private $namingStrategies = [];
-
-    /**
-     * @var NamingStrategyInterface
-     */
-    private $defaultNamingStrategy;
-
-    /**
-     * @param NamingStrategyInterface[]    $strategies            indexed by the name they translate
-     * @param NamingStrategyInterface|null $defaultNamingStrategy
-     */
-    public function __construct(array $strategies, NamingStrategyInterface $defaultNamingStrategy = null)
-    {
-        $this->namingStrategies = array_map(
-            function (NamingStrategyInterface $strategy) {
-                // this callback is here only to ensure type-safety
-                return $strategy;
-            },
-            $strategies
-        );
-
-        $this->defaultNamingStrategy = $defaultNamingStrategy ?: new IdentityNamingStrategy();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        $strategy = isset($this->namingStrategies[$name])
-            ? $this->namingStrategies[$name]
-            : $this->defaultNamingStrategy;
-
-        return $strategy->extract($name);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        $strategy = isset($this->namingStrategies[$name])
-            ? $this->namingStrategies[$name]
-            : $this->defaultNamingStrategy;
-
-        return $strategy->hydrate($name);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
deleted file mode 100644
index 59e3fed..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-class IdentityNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($name)
-    {
-        return $name;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($name)
-    {
-        return $name;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php
deleted file mode 100644
index 7846bce..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/MapNamingStrategy.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-class MapNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * Map for hydrate name conversion.
-     *
-     * @var array
-     */
-    protected $mapping = [];
-
-    /**
-     * Reversed map for extract name conversion.
-     *
-     * @var array
-     */
-    protected $reverse = [];
-
-    /**
-     * Initialize.
-     *
-     * @param array $mapping Map for name conversion on hydration
-     * @param array $reverse Reverse map for name conversion on extraction
-     */
-    public function __construct(array $mapping, array $reverse = null)
-    {
-        $this->mapping = $mapping;
-        $this->reverse = $reverse ?: $this->flipMapping($mapping);
-    }
-
-    /**
-     * Safelly flip mapping array.
-     *
-     * @param  array                    $array Array to flip
-     * @return array                    Flipped array
-     * @throws InvalidArgumentException
-     */
-    protected function flipMapping(array $array)
-    {
-        array_walk($array, function ($value) {
-            if (!is_string($value) && !is_int($value)) {
-                throw new InvalidArgumentException('Mapping array can\'t be flipped because of invalid value');
-            }
-        });
-
-        return array_flip($array);
-    }
-
-    /**
-     * Converts the given name so that it can be extracted by the hydrator.
-     *
-     * @param  string $name The original name
-     * @return mixed  The hydrated name
-     */
-    public function hydrate($name)
-    {
-        if (array_key_exists($name, $this->mapping)) {
-            return $this->mapping[$name];
-        }
-
-        return $name;
-    }
-
-    /**
-     * Converts the given name so that it can be hydrated by the hydrator.
-     *
-     * @param  string $name The original name
-     * @return mixed  The extracted name
-     */
-    public function extract($name)
-    {
-        if (array_key_exists($name, $this->reverse)) {
-            return $this->reverse[$name];
-        }
-
-        return $name;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
deleted file mode 100644
index cb7ca94..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-/**
- * Allow property extraction / hydration for hydrator
- */
-interface NamingStrategyInterface
-{
-    /**
-     * Converts the given name so that it can be extracted by the hydrator.
-     *
-     * @param string $name   The original name
-     * @param object $object (optional) The original object for context.
-     * @return mixed         The hydrated name
-     */
-    public function hydrate($name);
-
-    /**
-     * Converts the given name so that it can be hydrated by the hydrator.
-     *
-     * @param string $name The original name
-     * @param array  $data (optional) The original data for context.
-     * @return mixed The extracted name
-     */
-    public function extract($name);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php
deleted file mode 100644
index 7fdfa53..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategy/UnderscoreNamingStrategy.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\NamingStrategy;
-
-use Zend\Filter\FilterChain;
-
-class UnderscoreNamingStrategy implements NamingStrategyInterface
-{
-    /**
-     * @var FilterChain|null
-     */
-    protected static $camelCaseToUnderscoreFilter;
-
-    /**
-     * @var FilterChain|null
-     */
-    protected static $underscoreToStudlyCaseFilter;
-
-    /**
-     * Remove underscores and capitalize letters
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function hydrate($name)
-    {
-        return $this->getUnderscoreToStudlyCaseFilter()->filter($name);
-    }
-
-    /**
-     * Remove capitalized letters and prepend underscores.
-     *
-     * @param  string $name
-     * @return string
-     */
-    public function extract($name)
-    {
-        return $this->getCamelCaseToUnderscoreFilter()->filter($name);
-    }
-
-    /**
-     * @return FilterChain
-     */
-    protected function getUnderscoreToStudlyCaseFilter()
-    {
-        if (static::$underscoreToStudlyCaseFilter instanceof FilterChain) {
-            return static::$underscoreToStudlyCaseFilter;
-        }
-
-        $filter = new FilterChain();
-
-        $filter->attachByName('WordUnderscoreToStudlyCase');
-
-        return static::$underscoreToStudlyCaseFilter = $filter;
-    }
-
-    /**
-     * @return FilterChain
-     */
-    protected function getCamelCaseToUnderscoreFilter()
-    {
-        if (static::$camelCaseToUnderscoreFilter instanceof FilterChain) {
-            return static::$camelCaseToUnderscoreFilter;
-        }
-
-        $filter = new FilterChain();
-
-        $filter->attachByName('WordCamelCaseToUnderscore');
-        $filter->attachByName('StringToLower');
-
-        return static::$camelCaseToUnderscoreFilter = $filter;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php b/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
deleted file mode 100644
index c01a527..0000000
--- a/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface NamingStrategyEnabledInterface
-{
-    /**
-     * Adds the given naming strategy
-     *
-     * @param NamingStrategy\NamingStrategyInterface $strategy The naming to register.
-     * @return self
-     */
-    public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy);
-
-    /**
-     * Gets the naming strategy.
-     *
-     * @return NamingStrategy\NamingStrategyInterface
-     */
-    public function getNamingStrategy();
-
-    /**
-     * Checks if a naming strategy exists.
-     *
-     * @return bool
-     */
-    public function hasNamingStrategy();
-
-    /**
-     * Removes the naming with the given name.
-     *
-     * @return self
-     */
-    public function removeNamingStrategy();
-}
diff --git a/vendor/zendframework/zend-hydrator/src/ObjectProperty.php b/vendor/zendframework/zend-hydrator/src/ObjectProperty.php
deleted file mode 100644
index db68fb2..0000000
--- a/vendor/zendframework/zend-hydrator/src/ObjectProperty.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ReflectionClass;
-use ReflectionProperty;
-
-class ObjectProperty extends AbstractHydrator
-{
-    /**
-     * @var array[] indexed by class name and then property name
-     */
-    private static $skippedPropertiesCache = [];
-
-    /**
-     * {@inheritDoc}
-     *
-     * Extracts the accessible non-static properties of the given $object.
-     *
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function extract($object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
-            );
-        }
-
-        $data   = get_object_vars($object);
-        $filter = $this->getFilter();
-
-        foreach ($data as $name => $value) {
-            // Filter keys, removing any we don't want
-            if (! $filter->filter($name)) {
-                unset($data[$name]);
-                continue;
-            }
-
-            // Replace name if extracted differ
-            $extracted = $this->extractName($name, $object);
-
-            if ($extracted !== $name) {
-                unset($data[$name]);
-                $name = $extracted;
-            }
-
-            $data[$name] = $this->extractValue($name, $value, $object);
-        }
-
-        return $data;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Hydrate an object by populating public properties
-     *
-     * Hydrates an object by setting public properties of the object.
-     *
-     * @throws Exception\BadMethodCallException for a non-object $object
-     */
-    public function hydrate(array $data, $object)
-    {
-        if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
-            );
-        }
-
-        $properties = & self::$skippedPropertiesCache[get_class($object)];
-
-        if (! isset($properties)) {
-            $reflection = new ReflectionClass($object);
-            $properties = array_fill_keys(
-                array_map(
-                    function (ReflectionProperty $property) {
-                        return $property->getName();
-                    },
-                    $reflection->getProperties(
-                        ReflectionProperty::IS_PRIVATE
-                        + ReflectionProperty::IS_PROTECTED
-                        + ReflectionProperty::IS_STATIC
-                    )
-                ),
-                true
-            );
-        }
-
-        foreach ($data as $name => $value) {
-            $property = $this->hydrateName($name, $data);
-
-            if (isset($properties[$property])) {
-                continue;
-            }
-
-            $object->$property = $this->hydrateValue($property, $value, $data);
-        }
-
-        return $object;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Reflection.php b/vendor/zendframework/zend-hydrator/src/Reflection.php
deleted file mode 100644
index 019748b..0000000
--- a/vendor/zendframework/zend-hydrator/src/Reflection.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-use ReflectionClass;
-use ReflectionProperty;
-
-class Reflection extends AbstractHydrator
-{
-    /**
-     * Simple in-memory array cache of ReflectionProperties used.
-     * @var ReflectionProperty[]
-     */
-    protected static $reflProperties = [];
-
-    /**
-     * Extract values from an object
-     *
-     * @param  object $object
-     * @return array
-     */
-    public function extract($object)
-    {
-        $result = [];
-        foreach (self::getReflProperties($object) as $property) {
-            $propertyName = $this->extractName($property->getName(), $object);
-            if (!$this->filterComposite->filter($propertyName)) {
-                continue;
-            }
-
-            $value = $property->getValue($object);
-            $result[$propertyName] = $this->extractValue($propertyName, $value, $object);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Hydrate $object with the provided $data.
-     *
-     * @param  array $data
-     * @param  object $object
-     * @return object
-     */
-    public function hydrate(array $data, $object)
-    {
-        $reflProperties = self::getReflProperties($object);
-        foreach ($data as $key => $value) {
-            $name = $this->hydrateName($key, $data);
-            if (isset($reflProperties[$name])) {
-                $reflProperties[$name]->setValue($object, $this->hydrateValue($name, $value, $data));
-            }
-        }
-        return $object;
-    }
-
-    /**
-     * Get a reflection properties from in-memory cache and lazy-load if
-     * class has not been loaded.
-     *
-     * @param  string|object $input
-     * @throws Exception\InvalidArgumentException
-     * @return ReflectionProperty[]
-     */
-    protected static function getReflProperties($input)
-    {
-        if (is_object($input)) {
-            $input = get_class($input);
-        } elseif (!is_string($input)) {
-            throw new Exception\InvalidArgumentException('Input must be a string or an object.');
-        }
-
-        if (isset(static::$reflProperties[$input])) {
-            return static::$reflProperties[$input];
-        }
-
-        static::$reflProperties[$input] = [];
-        $reflClass                      = new ReflectionClass($input);
-        $reflProperties                 = $reflClass->getProperties();
-
-        foreach ($reflProperties as $property) {
-            $property->setAccessible(true);
-            static::$reflProperties[$input][$property->getName()] = $property;
-        }
-
-        return static::$reflProperties[$input];
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
deleted file mode 100644
index dcb3a42..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-
-/**
- * This Strategy extracts and hydrates int and string values to Boolean values
- */
-class BooleanStrategy implements StrategyInterface
-{
-    /**
-     * @var int|string
-     */
-    private $trueValue;
-
-    /**
-     * @var int|string
-     */
-    private $falseValue;
-
-    /**
-     * @param int|string $trueValue
-     * @param int|string $falseValue
-     * @throws InvalidArgumentException
-     */
-    public function __construct($trueValue, $falseValue)
-    {
-        if (!is_int($trueValue) && !is_string($trueValue)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to instantiate BooleanStrategy. Expected int or string as $trueValue. %s was given',
-                is_object($trueValue) ? get_class($trueValue) : gettype($trueValue)
-            ));
-        }
-
-        if (!is_int($falseValue) && !is_string($falseValue)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to instantiate BooleanStrategy. Expected int or string as $falseValue. %s was given',
-                is_object($falseValue) ? get_class($falseValue) : gettype($falseValue)
-            ));
-        }
-
-        $this->trueValue  = $trueValue;
-        $this->falseValue = $falseValue;
-    }
-
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param  bool $value The original value.
-     * @throws InvalidArgumentException
-     * @return int|string Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        if (!is_bool($value)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to extract. Expected bool. %s was given.',
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        return $value === true ? $this->trueValue : $this->falseValue;
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param  int|string $value The original value.
-     * @throws InvalidArgumentException
-     * @return bool Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        if (!is_string($value) && !is_int($value)) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to hydrate. Expected string or int. %s was given.',
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        if ($value === $this->trueValue) {
-            return true;
-        }
-
-        if ($value === $this->falseValue) {
-            return false;
-        }
-
-        throw new InvalidArgumentException(sprintf(
-            'Unexpected value %s can\'t be hydrated. Expect %s or %s as Value.',
-            $value,
-            $this->trueValue,
-            $this->falseValue
-        ));
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
deleted file mode 100644
index 1f6526d..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class ClosureStrategy implements StrategyInterface
-{
-    /**
-     * Function, used in extract method, default:
-     *
-     * <code>
-     * function ($value) {
-     *     return $value;
-     * };
-     * </code>
-     *
-     * @var callable
-     */
-    protected $extractFunc = null;
-
-    /**
-     * Function, used in hydrate method, default:
-     *
-     * <code>
-     * function ($value) {
-     *     return $value;
-     * };
-     * </code>
-     *
-     * @var callable
-     */
-    protected $hydrateFunc = null;
-
-    /**
-     * You can describe how your values will extract and hydrate, like this:
-     *
-     * <code>
-     * $hydrator->addStrategy('category', new ClosureStrategy(
-     *     function (Category $value) {
-     *         return (int) $value->id;
-     *     },
-     *     function ($value) {
-     *         return new Category((int) $value);
-     *     }
-     * ));
-     * </code>
-     *
-     * @param callable $extractFunc - anonymous function, that extract values
-     *     from object
-     * @param callable $hydrateFunc - anonymous function, that hydrate values
-     *     into object
-     */
-    public function __construct($extractFunc = null, $hydrateFunc = null)
-    {
-        if (isset($extractFunc)) {
-            if (!is_callable($extractFunc)) {
-                throw new \Exception('$extractFunc must be callable');
-            }
-
-            $this->extractFunc = $extractFunc;
-        } else {
-            $this->extractFunc = function ($value) {
-                return $value;
-            };
-        }
-
-        if (isset($hydrateFunc)) {
-            if (!is_callable($hydrateFunc)) {
-                throw new \Exception('$hydrateFunc must be callable');
-            }
-
-            $this->hydrateFunc = $hydrateFunc;
-        } else {
-            $this->hydrateFunc = function ($value) {
-                return $value;
-            };
-        }
-    }
-
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param  mixed $value  The original value.
-     * @param  array $object The object is optionally provided as context.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value, $object = null)
-    {
-        $func = $this->extractFunc;
-
-        return $func($value, $object);
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param  mixed $value The original value.
-     * @param  array $data  The whole data is optionally provided as context.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value, $data = null)
-    {
-        $func = $this->hydrateFunc;
-
-        return $func($value, $data);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
deleted file mode 100644
index 62dda71..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use DateTime;
-use DateTimeZone;
-
-class DateTimeFormatterStrategy implements StrategyInterface
-{
-    /**
-     * @var string
-     */
-    private $format;
-
-    /**
-     * @var DateTimeZone|null
-     */
-    private $timezone;
-
-    /**
-     * Constructor
-     *
-     * @param string            $format
-     * @param DateTimeZone|null $timezone
-     */
-    public function __construct($format = DateTime::RFC3339, DateTimeZone $timezone = null)
-    {
-        $this->format   = (string) $format;
-        $this->timezone = $timezone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Converts to date time string
-     *
-     * @param mixed|DateTime $value
-     *
-     * @return mixed|string
-     */
-    public function extract($value)
-    {
-        if ($value instanceof DateTime) {
-            return $value->format($this->format);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Converts date time string to DateTime instance for injecting to object
-     *
-     * {@inheritDoc}
-     *
-     * @param mixed|string $value
-     *
-     * @return mixed|DateTime
-     */
-    public function hydrate($value)
-    {
-        if ($value === '' || $value === null) {
-            return;
-        }
-
-        if ($this->timezone) {
-            $hydrated = DateTime::createFromFormat($this->format, $value, $this->timezone);
-        } else {
-            $hydrated = DateTime::createFromFormat($this->format, $value);
-        }
-
-        return $hydrated ?: $value;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
deleted file mode 100644
index 6fb8f45..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class DefaultStrategy implements StrategyInterface
-{
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        return $value;
-    }
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        return $value;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php b/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php
deleted file mode 100644
index 6c16ec7..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy\Exception;
-
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php
deleted file mode 100644
index c3175de..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy\Exception;
-
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php
deleted file mode 100644
index 4eb54d6..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/ExplodeStrategy.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-class ExplodeStrategy implements StrategyInterface
-{
-    /**
-     * @var string
-     */
-    private $valueDelimiter;
-
-    /**
-     * @var int|null
-     */
-    private $explodeLimit;
-
-    /**
-     * Constructor
-     *
-     * @param string   $delimiter    String that the values will be split upon
-     * @param int|null $explodeLimit Explode limit
-     */
-    public function __construct($delimiter = ',', $explodeLimit = null)
-    {
-        $this->setValueDelimiter($delimiter);
-
-        $this->explodeLimit = ($explodeLimit === null) ? null : (int) $explodeLimit;
-    }
-
-    /**
-     * Sets the delimiter string that the values will be split upon
-     *
-     * @param  string $delimiter
-     * @return self
-     */
-    private function setValueDelimiter($delimiter)
-    {
-        if (!is_string($delimiter)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects Delimiter to be string, %s provided instead',
-                __METHOD__,
-                is_object($delimiter) ? get_class($delimiter) : gettype($delimiter)
-            ));
-        }
-
-        if (empty($delimiter)) {
-            throw new Exception\InvalidArgumentException('Delimiter cannot be empty.');
-        }
-
-        $this->valueDelimiter = $delimiter;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Split a string by delimiter
-     *
-     * @param string|null $value
-     *
-     * @return string[]
-     *
-     * @throws Exception\InvalidArgumentException
-     */
-    public function hydrate($value)
-    {
-        if (null === $value) {
-            return [];
-        }
-
-        if (!(is_string($value) || is_numeric($value))) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects argument 1 to be string, %s provided instead',
-                __METHOD__,
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        if ($this->explodeLimit !== null) {
-            return explode($this->valueDelimiter, $value, $this->explodeLimit);
-        }
-
-        return explode($this->valueDelimiter, $value);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Join array elements with delimiter
-     *
-     * @param string[] $value The original value.
-     *
-     * @return string|null
-     */
-    public function extract($value)
-    {
-        if (!is_array($value)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects argument 1 to be array, %s provided instead',
-                __METHOD__,
-                is_object($value) ? get_class($value) : gettype($value)
-            ));
-        }
-
-        return empty($value) ? null : implode($this->valueDelimiter, $value);
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
deleted file mode 100644
index bc49e7b..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Zend\Hydrator\Exception\InvalidArgumentException;
-use Zend\Serializer\Adapter\AdapterInterface as SerializerAdapter;
-use Zend\Serializer\Serializer as SerializerFactory;
-
-class SerializableStrategy implements StrategyInterface
-{
-    /**
-     * @var string|SerializerAdapter
-     */
-    protected $serializer;
-
-    /**
-     * @var array
-     */
-    protected $serializerOptions = [];
-
-    /**
-     *
-     * @param mixed $serializer string or SerializerAdapter
-     * @param mixed $serializerOptions
-     */
-    public function __construct($serializer, $serializerOptions = null)
-    {
-        $this->setSerializer($serializer);
-        if ($serializerOptions) {
-            $this->setSerializerOptions($serializerOptions);
-        }
-    }
-
-    /**
-     * Serialize the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value)
-    {
-        $serializer = $this->getSerializer();
-        return $serializer->serialize($value);
-    }
-
-    /**
-     * Unserialize the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value)
-    {
-        $serializer = $this->getSerializer();
-        return $serializer->unserialize($value);
-    }
-
-    /**
-     * Set serializer
-     *
-     * @param  string|SerializerAdapter $serializer
-     * @return SerializableStrategy
-     */
-    public function setSerializer($serializer)
-    {
-        if (!is_string($serializer) && !$serializer instanceof SerializerAdapter) {
-            throw new InvalidArgumentException(sprintf(
-                '%s expects either a string serializer name or Zend\Serializer\Adapter\AdapterInterface instance; '
-                . 'received "%s"',
-                __METHOD__,
-                (is_object($serializer) ? get_class($serializer) : gettype($serializer))
-            ));
-        }
-        $this->serializer = $serializer;
-        return $this;
-    }
-
-    /**
-     * Get serializer
-     *
-     * @return SerializerAdapter
-     */
-    public function getSerializer()
-    {
-        if (is_string($this->serializer)) {
-            $options = $this->getSerializerOptions();
-            $this->setSerializer(SerializerFactory::factory($this->serializer, $options));
-        } elseif (null === $this->serializer) {
-            $this->setSerializer(SerializerFactory::getDefaultAdapter());
-        }
-
-        return $this->serializer;
-    }
-
-    /**
-     * Set configuration options for instantiating a serializer adapter
-     *
-     * @param  mixed $serializerOptions
-     * @return SerializableStrategy
-     */
-    public function setSerializerOptions($serializerOptions)
-    {
-        $this->serializerOptions = $serializerOptions;
-        return $this;
-    }
-
-    /**
-     * Get configuration options for instantiating a serializer adapter
-     *
-     * @return mixed
-     */
-    public function getSerializerOptions()
-    {
-        return $this->serializerOptions;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
deleted file mode 100644
index 49d514d..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
-
-class StrategyChain implements StrategyInterface
-{
-    /**
-     * Strategy chain for extraction
-     *
-     * @var StrategyInterface[]
-     */
-    private $extractionStrategies;
-
-    /**
-     * Strategy chain for hydration
-     *
-     * @var StrategyInterface[]
-     */
-    private $hydrationStrategies;
-
-    /**
-     * Constructor
-     *
-     * @param array|Traversable $extractionStrategies
-     */
-    public function __construct($extractionStrategies)
-    {
-        $extractionStrategies = ArrayUtils::iteratorToArray($extractionStrategies);
-        $this->extractionStrategies = array_map(
-            function (StrategyInterface $strategy) {
-                // this callback is here only to ensure type-safety
-                return $strategy;
-            },
-            $extractionStrategies
-        );
-
-        $this->hydrationStrategies = array_reverse($extractionStrategies);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function extract($value)
-    {
-        foreach ($this->extractionStrategies as $strategy) {
-            $value = $strategy->extract($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function hydrate($value)
-    {
-        foreach ($this->hydrationStrategies as $strategy) {
-            $value = $strategy->hydrate($value);
-        }
-
-        return $value;
-    }
-}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
deleted file mode 100644
index a705593..0000000
--- a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator\Strategy;
-
-/**
- * @todo v3.0, add optional object/data to extract/hydrate.
- */
-interface StrategyInterface
-{
-    /**
-     * Converts the given value so that it can be extracted by the hydrator.
-     *
-     * @param mixed   $value The original value.
-     * @param object $object (optional) The original object for context.
-     * @return mixed Returns the value that should be extracted.
-     */
-    public function extract($value);
-
-    /**
-     * Converts the given value so that it can be hydrated by the hydrator.
-     *
-     * @param mixed $value The original value.
-     * @param array  $data (optional) The original data for context.
-     * @return mixed Returns the value that should be hydrated.
-     */
-    public function hydrate($value);
-}
diff --git a/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php b/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php
deleted file mode 100644
index 3c85b78..0000000
--- a/vendor/zendframework/zend-hydrator/src/StrategyEnabledInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Hydrator;
-
-interface StrategyEnabledInterface
-{
-    /**
-     * Adds the given strategy under the given name.
-     *
-     * @param string $name The name of the strategy to register.
-     * @param Strategy\StrategyInterface $strategy The strategy to register.
-     * @return self
-     */
-    public function addStrategy($name, Strategy\StrategyInterface $strategy);
-
-    /**
-     * Gets the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to get.
-     * @return Strategy\StrategyInterface
-     */
-    public function getStrategy($name);
-
-    /**
-     * Checks if the strategy with the given name exists.
-     *
-     * @param string $name The name of the strategy to check for.
-     * @return bool
-     */
-    public function hasStrategy($name);
-
-    /**
-     * Removes the strategy with the given name.
-     *
-     * @param string $name The name of the strategy to remove.
-     * @return self
-     */
-    public function removeStrategy($name);
-}
diff --git a/vendor/zendframework/zend-stdlib/CHANGELOG.md b/vendor/zendframework/zend-stdlib/CHANGELOG.md
deleted file mode 100644
index 5ce14e6..0000000
--- a/vendor/zendframework/zend-stdlib/CHANGELOG.md
+++ /dev/null
@@ -1,203 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file, in reverse chronological order by release.
-
-## 2.7.3 - 2015-09-24
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#27](https://github.com/zendframework/zend-stdlib/pull/27) fixes a race
-  condition in the `FastPriorityQueue::remove()` logic that occurs when removing
-  items iteratively from the same priority of a queue.
-
-## 2.7.2 - 2015-09-23
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#26](https://github.com/zendframework/zend-stdlib/pull/26) fixes a subtle
-  inheritance issue with deprecation in the hydrators, and updates the
-  `HydratorInterface` to also extend the zend-hydrator `HydratorInterface` to
-  ensure LSP is preserved.
-
-## 2.7.1 - 2015-09-22
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#24](https://github.com/zendframework/zend-stdlib/pull/24) fixes an import in
-  `FastPriorityQueue` to alias `SplPriorityQueue` in order to disambiguate with
-  the local override present in the component.
-
-## 2.7.0 - 2015-09-22
-
-### Added
-
-- [#19](https://github.com/zendframework/zend-stdlib/pull/19) adds a new
-  `FastPriorityQueue` implementation. It follows the same signature as
-  `SplPriorityQueue`, but uses a performance-optimized algorithm:
-
-  - inserts are 2x faster than `SplPriorityQueue` and 3x faster than the
-    `Zend\Stdlib\PriorityQueue` implementation.
-  - extracts are 4x faster than `SplPriorityQueue` and 4-5x faster than the
-    `Zend\Stdlib\PriorityQueue` implementation.
-
-  The intention is to use this as a drop-in replacement in the
-  `zend-eventmanager` component to provide performance benefits.
-
-### Deprecated
-
-- [#20](https://github.com/zendframework/zend-stdlib/pull/20) deprecates *all
-  hydrator* classes, in favor of the new [zend-hydrator](https://github.com/zendframework/zend-hydrator)
-  component. All classes were updated to extend their zend-hydrator equivalents,
-  and marked as `@deprecated`, indicating the equivalent class from the other
-  repository.
-
-  Users *should* immediately start changing their code to use the zend-hydrator
-  equivalents; in most cases, this can be as easy as removing the `Stdlib`
-  namespace from import statements or hydrator configuration. Hydrators will be
-  removed entirely from zend-stdlib in v3.0, and all future updates to hydrators
-  will occur in the zend-hydrator library.
-
-  Changes with backwards compatibility implications:
-
-  - Users implementing `Zend\Stdlib\Hydrator\HydratorAwareInterface` will need to
-    update their `setHydrator()` implementation to typehint on
-    `Zend\Hydrator\HydratorInterface`. This can be done by changing the import
-    statement for that interface as follows:
-
-    ```php
-    // Replace this:
-    use Zend\Stdlib\Hydrator\HydratorInterface;
-    // with this:
-    use Zend\Hydrator\HydratorInterface;
-    ```
-
-    If you are not using imports, change the typehint within the signature itself:
-
-    ```php
-    // Replace this:
-    public function setHydrator(\Zend\Stdlib\Hydrator\HydratorInterface $hydrator)
-    // with this:
-    public function setHydrator(\Zend\Hydrator\HydratorInterface $hydrator)
-    ```
-
-    If you are using `Zend\Stdlib\Hydrator\HydratorAwareTrait`, no changes are
-    necessary, unless you override that method.
-
-  - If you were catching hydrator-generated exceptions, these were previously in
-    the `Zend\Stdlib\Exception` namespace. You will need to update your code to
-    catch exceptions in the `Zend\Hydrator\Exception` namespace.
-
-  - Users who *do* migrate to zend-hydrator may end up in a situation where
-    their code will not work with existing libraries that are still type-hinting
-    on the zend-stdlib interfaces. We will be attempting to address that ASAP,
-    but the deprecation within zend-stdlib is necessary as a first step.
-
-    In the meantime, you can write hydrators targeting zend-stdlib still in
-    order to guarantee compatibility.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.6.0 - 2015-07-21
-
-### Added
-
-- [#13](https://github.com/zendframework/zend-stdlib/pull/13) adds
-  `Zend\Stdlib\Hydrator\Iterator`, which provides mechanisms for hydrating
-  objects when iterating a traversable. This allows creating generic collection
-  resultsets; the original idea was pulled from
-  [PhlyMongo](https://github.com/phly/PhlyMongo), where it was used to hydrate
-  collections retrieved from MongoDB.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 2.5.2 - 2015-07-21
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
-  count incrementation during insert in PriorityList, ensuring that incrementation only
-  occurs when the item inserted was not previously present in the list.
-
-## 2.4.4 - 2015-07-21
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- [#9](https://github.com/zendframework/zend-stdlib/pull/9) fixes an issue with
-  count incrementation during insert in PriorityList, ensuring that incrementation only
-  occurs when the item inserted was not previously present in the list.
diff --git a/vendor/zendframework/zend-stdlib/CONTRIBUTING.md b/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
deleted file mode 100644
index 1083b84..0000000
--- a/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
+++ /dev/null
@@ -1,239 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-stdlib/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-stdlib.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
-```
-
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
-```
-
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Benchmarks
-
-We provide benchmark tests for zend-stdlib under the directory [benchmark/](benchmark/),
-using.  [athletic](https://github.com/polyfractal/athletic).  You can execute
-the benchmarks running the following command:
-
-```bash
-$ ./vendor/bin/athletic -p benchmark
-```
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-stdlib)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-stdlib.git
-   $ cd zend-stdlib
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-stdlib.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-stdlib.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/vendor/zendframework/zend-stdlib/LICENSE.md b/vendor/zendframework/zend-stdlib/LICENSE.md
deleted file mode 100644
index dbb1b49..0000000
--- a/vendor/zendframework/zend-stdlib/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 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.
-
-- 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.
-
-- Neither the name of Zend Technologies USA, Inc. 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 OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-stdlib/README.md b/vendor/zendframework/zend-stdlib/README.md
deleted file mode 100644
index d87d00c..0000000
--- a/vendor/zendframework/zend-stdlib/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# zend-stdlib
-
-[![Build Status](https://secure.travis-ci.org/zendframework/zend-stdlib.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-stdlib)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-stdlib/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-stdlib?branch=master)
-
-`Zend\Stdlib` is a set of components that implements general purpose utility
-class for different scopes like:
-
-- array utilities functions;
-- hydrators;
-- json serializable interfaces;
-- general messaging systems;
-- string wrappers;
-- etc.
-
----
-
-- File issues at https://github.com/zendframework/zend-stdlib/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php
deleted file mode 100644
index 8fa7527..0000000
--- a/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace ZendBench\Stdlib;
-
-use Athletic\AthleticEvent;
-use Zend\Stdlib\FastPriorityQueue;
-use Zend\Stdlib\PriorityQueue;
-use Zend\Stdlib\SplPriorityQueue;
-
-class ExtractPriorityQueue extends AthleticEvent
-{
-    public function classSetUp()
-    {
-        $this->splPriorityQueue  = new SplPriorityQueue();
-        $this->fastPriorityQueue = new FastPriorityQueue();
-        $this->priorityQueue     = new PriorityQueue();
-
-        for ($i = 0; $i < 5000; $i += 1) {
-            $priority = rand(1, 100);
-            $this->splPriorityQueue->insert('foo', $priority);
-            $this->fastPriorityQueue->insert('foo', $priority);
-            $this->priorityQueue->insert('foo', $priority);
-        }
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function extractSplPriorityQueue()
-    {
-        $this->splPriorityQueue->extract();
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function extractPriorityQueue()
-    {
-        $this->priorityQueue->extract();
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function extractFastPriorityQueue()
-    {
-        $this->fastPriorityQueue->extract();
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php
deleted file mode 100644
index 561c535..0000000
--- a/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace ZendBench\Stdlib;
-
-use Athletic\AthleticEvent;
-use Zend\Stdlib\FastPriorityQueue;
-use Zend\Stdlib\PriorityQueue;
-use Zend\Stdlib\SplPriorityQueue;
-
-class InsertPriorityQueue extends AthleticEvent
-{
-    public function classSetUp()
-    {
-        $this->splPriorityQueue  = new SplPriorityQueue();
-        $this->fastPriorityQueue = new FastPriorityQueue();
-        $this->priorityQueue     = new PriorityQueue();
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function insertSplPriorityQueue()
-    {
-        $this->splPriorityQueue->insert('foo', rand(1, 100));
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function insertPriorityQueue()
-    {
-        $this->priorityQueue->insert('foo', rand(1, 100));
-    }
-
-    /**
-     * @iterations 5000
-     */
-    public function insertFastPriorityQueue()
-    {
-        $this->fastPriorityQueue->insert('foo', rand(1, 100));
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php
deleted file mode 100644
index 1cfd35b..0000000
--- a/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace ZendBench\Stdlib;
-
-use Athletic\AthleticEvent;
-use Zend\Stdlib\FastPriorityQueue;
-use Zend\Stdlib\PriorityQueue;
-
-class RemovePriorityQueue extends AthleticEvent
-{
-    public function classSetUp()
-    {
-        $this->fastPriorityQueue = new FastPriorityQueue();
-        $this->priorityQueue     = new PriorityQueue();
-
-        for ($i = 0; $i < 1000; $i += 1) {
-            $priority = rand(1, 100);
-            $this->fastPriorityQueue->insert('foo', $priority);
-            $this->priorityQueue->insert('foo', $priority);
-        }
-    }
-
-    /**
-     * @iterations 1000
-     */
-    public function removePriorityQueue()
-    {
-        $this->priorityQueue->remove('foo');
-    }
-
-    /**
-     * @iterations 1000
-     */
-    public function removeFastPriorityQueue()
-    {
-        $this->fastPriorityQueue->remove('foo');
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/composer.json b/vendor/zendframework/zend-stdlib/composer.json
deleted file mode 100644
index 4a5ecd5..0000000
--- a/vendor/zendframework/zend-stdlib/composer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "name": "zendframework/zend-stdlib",
-    "description": " ",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "zf2",
-        "stdlib"
-    ],
-    "homepage": "https://github.com/zendframework/zend-stdlib",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Stdlib\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.5",
-        "zendframework/zend-hydrator": "~1.0"
-    },
-    "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-inputfilter": "~2.5",
-        "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-filter": "~2.5",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0",
-        "athletic/athletic": "~0.1"
-    },
-    "suggest": {
-        "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-        "zendframework/zend-serializer": "Zend\\Serializer component",
-        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
-        "zendframework/zend-filter": "To support naming strategy hydrator usage"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Stdlib\\": "test/",
-            "ZendBench\\Stdlib\\": "benchmark/"
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/AbstractOptions.php b/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
deleted file mode 100644
index 812e1ca..0000000
--- a/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Traversable;
-
-abstract class AbstractOptions implements ParameterObjectInterface
-{
-    /**
-     * We use the __ prefix to avoid collisions with properties in
-     * user-implementations.
-     *
-     * @var bool
-     */
-    protected $__strictMode__ = true;
-
-    /**
-     * Constructor
-     *
-     * @param  array|Traversable|null $options
-     */
-    public function __construct($options = null)
-    {
-        if (null !== $options) {
-            $this->setFromArray($options);
-        }
-    }
-
-    /**
-     * Set one or more configuration properties
-     *
-     * @param  array|Traversable|AbstractOptions $options
-     * @throws Exception\InvalidArgumentException
-     * @return AbstractOptions Provides fluent interface
-     */
-    public function setFromArray($options)
-    {
-        if ($options instanceof self) {
-            $options = $options->toArray();
-        }
-
-        if (!is_array($options) && !$options instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(
-                sprintf(
-                    'Parameter provided to %s must be an %s, %s or %s',
-                    __METHOD__,
-                    'array',
-                    'Traversable',
-                    'Zend\Stdlib\AbstractOptions'
-                )
-            );
-        }
-
-        foreach ($options as $key => $value) {
-            $this->__set($key, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Cast to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = [];
-        $transform = function ($letters) {
-            $letter = array_shift($letters);
-            return '_' . strtolower($letter);
-        };
-        foreach ($this as $key => $value) {
-            if ($key === '__strictMode__') {
-                continue;
-            }
-            $normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key);
-            $array[$normalizedKey] = $value;
-        }
-        return $array;
-    }
-
-    /**
-     * Set a configuration property
-     *
-     * @see ParameterObject::__set()
-     * @param string $key
-     * @param mixed $value
-     * @throws Exception\BadMethodCallException
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        $setter = 'set' . str_replace('_', '', $key);
-
-        if (is_callable([$this, $setter])) {
-            $this->{$setter}($value);
-
-            return;
-        }
-
-        if ($this->__strictMode__) {
-            throw new Exception\BadMethodCallException(sprintf(
-                'The option "%s" does not have a callable "%s" ("%s") setter method which must be defined',
-                $key,
-                'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key))),
-                $setter
-            ));
-        }
-    }
-
-    /**
-     * Get a configuration property
-     *
-     * @see ParameterObject::__get()
-     * @param string $key
-     * @throws Exception\BadMethodCallException
-     * @return mixed
-     */
-    public function __get($key)
-    {
-        $getter = 'get' . str_replace('_', '', $key);
-
-        if (is_callable([$this, $getter])) {
-            return $this->{$getter}();
-        }
-
-        throw new Exception\BadMethodCallException(sprintf(
-            'The option "%s" does not have a callable "%s" getter method which must be defined',
-            $key,
-            'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))
-        ));
-    }
-
-    /**
-     * Test if a configuration property is null
-     * @see ParameterObject::__isset()
-     * @param string $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        $getter = 'get' . str_replace('_', '', $key);
-
-        return method_exists($this, $getter) && null !== $this->__get($key);
-    }
-
-    /**
-     * Set a configuration property to NULL
-     *
-     * @see ParameterObject::__unset()
-     * @param string $key
-     * @throws Exception\InvalidArgumentException
-     * @return void
-     */
-    public function __unset($key)
-    {
-        try {
-            $this->__set($key, null);
-        } catch (Exception\BadMethodCallException $e) {
-            throw new Exception\InvalidArgumentException(
-                'The class property $' . $key . ' cannot be unset as'
-                . ' NULL is an invalid value for it',
-                0,
-                $e
-            );
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayObject.php b/vendor/zendframework/zend-stdlib/src/ArrayObject.php
deleted file mode 100644
index e890084..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayObject.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ArrayAccess;
-use Countable;
-use IteratorAggregate;
-use Serializable;
-
-/**
- * Custom framework ArrayObject implementation
- *
- * Extends version-specific "abstract" implementation.
- */
-class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Countable
-{
-    /**
-     * Properties of the object have their normal functionality
-     * when accessed as list (var_dump, foreach, etc.).
-     */
-    const STD_PROP_LIST = 1;
-
-    /**
-     * Entries can be accessed as properties (read and write).
-     */
-    const ARRAY_AS_PROPS = 2;
-
-    /**
-     * @var array
-     */
-    protected $storage;
-
-    /**
-     * @var int
-     */
-    protected $flag;
-
-    /**
-     * @var string
-     */
-    protected $iteratorClass;
-
-    /**
-     * @var array
-     */
-    protected $protectedProperties;
-
-    /**
-     * Constructor
-     *
-     * @param array  $input
-     * @param int    $flags
-     * @param string $iteratorClass
-     */
-    public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
-    {
-        $this->setFlags($flags);
-        $this->storage = $input;
-        $this->setIteratorClass($iteratorClass);
-        $this->protectedProperties = array_keys(get_object_vars($this));
-    }
-
-    /**
-     * Returns whether the requested key exists
-     *
-     * @param  mixed $key
-     * @return bool
-     */
-    public function __isset($key)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            return $this->offsetExists($key);
-        }
-        if (in_array($key, $this->protectedProperties)) {
-            throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
-        }
-
-        return isset($this->$key);
-    }
-
-    /**
-     * Sets the value at the specified key to value
-     *
-     * @param  mixed $key
-     * @param  mixed $value
-     * @return void
-     */
-    public function __set($key, $value)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            return $this->offsetSet($key, $value);
-        }
-        if (in_array($key, $this->protectedProperties)) {
-            throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
-        }
-        $this->$key = $value;
-    }
-
-    /**
-     * Unsets the value at the specified key
-     *
-     * @param  mixed $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            return $this->offsetUnset($key);
-        }
-        if (in_array($key, $this->protectedProperties)) {
-            throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
-        }
-        unset($this->$key);
-    }
-
-    /**
-     * Returns the value at the specified key by reference
-     *
-     * @param  mixed $key
-     * @return mixed
-     */
-    public function &__get($key)
-    {
-        $ret = null;
-        if ($this->flag == self::ARRAY_AS_PROPS) {
-            $ret =& $this->offsetGet($key);
-
-            return $ret;
-        }
-        if (in_array($key, $this->protectedProperties)) {
-            throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
-        }
-
-        return $this->$key;
-    }
-
-    /**
-     * Appends the value
-     *
-     * @param  mixed $value
-     * @return void
-     */
-    public function append($value)
-    {
-        $this->storage[] = $value;
-    }
-
-    /**
-     * Sort the entries by value
-     *
-     * @return void
-     */
-    public function asort()
-    {
-        asort($this->storage);
-    }
-
-    /**
-     * Get the number of public properties in the ArrayObject
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->storage);
-    }
-
-    /**
-     * Exchange the array for another one.
-     *
-     * @param  array|ArrayObject $data
-     * @return array
-     */
-    public function exchangeArray($data)
-    {
-        if (!is_array($data) && !is_object($data)) {
-            throw new Exception\InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
-        }
-
-        if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
-            $data = $data->getArrayCopy();
-        }
-        if (!is_array($data)) {
-            $data = (array) $data;
-        }
-
-        $storage = $this->storage;
-
-        $this->storage = $data;
-
-        return $storage;
-    }
-
-    /**
-     * Creates a copy of the ArrayObject.
-     *
-     * @return array
-     */
-    public function getArrayCopy()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * Gets the behavior flags.
-     *
-     * @return int
-     */
-    public function getFlags()
-    {
-        return $this->flag;
-    }
-
-    /**
-     * Create a new iterator from an ArrayObject instance
-     *
-     * @return \Iterator
-     */
-    public function getIterator()
-    {
-        $class = $this->iteratorClass;
-
-        return new $class($this->storage);
-    }
-
-    /**
-     * Gets the iterator classname for the ArrayObject.
-     *
-     * @return string
-     */
-    public function getIteratorClass()
-    {
-        return $this->iteratorClass;
-    }
-
-    /**
-     * Sort the entries by key
-     *
-     * @return void
-     */
-    public function ksort()
-    {
-        ksort($this->storage);
-    }
-
-    /**
-     * Sort an array using a case insensitive "natural order" algorithm
-     *
-     * @return void
-     */
-    public function natcasesort()
-    {
-        natcasesort($this->storage);
-    }
-
-    /**
-     * Sort entries using a "natural order" algorithm
-     *
-     * @return void
-     */
-    public function natsort()
-    {
-        natsort($this->storage);
-    }
-
-    /**
-     * Returns whether the requested key exists
-     *
-     * @param  mixed $key
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return isset($this->storage[$key]);
-    }
-
-    /**
-     * Returns the value at the specified key
-     *
-     * @param  mixed $key
-     * @return mixed
-     */
-    public function &offsetGet($key)
-    {
-        $ret = null;
-        if (!$this->offsetExists($key)) {
-            return $ret;
-        }
-        $ret =& $this->storage[$key];
-
-        return $ret;
-    }
-
-    /**
-     * Sets the value at the specified key to value
-     *
-     * @param  mixed $key
-     * @param  mixed $value
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        $this->storage[$key] = $value;
-    }
-
-    /**
-     * Unsets the value at the specified key
-     *
-     * @param  mixed $key
-     * @return void
-     */
-    public function offsetUnset($key)
-    {
-        if ($this->offsetExists($key)) {
-            unset($this->storage[$key]);
-        }
-    }
-
-    /**
-     * Serialize an ArrayObject
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize(get_object_vars($this));
-    }
-
-    /**
-     * Sets the behavior flags
-     *
-     * @param  int  $flags
-     * @return void
-     */
-    public function setFlags($flags)
-    {
-        $this->flag = $flags;
-    }
-
-    /**
-     * Sets the iterator classname for the ArrayObject
-     *
-     * @param  string $class
-     * @return void
-     */
-    public function setIteratorClass($class)
-    {
-        if (class_exists($class)) {
-            $this->iteratorClass = $class;
-
-            return ;
-        }
-
-        if (strpos($class, '\\') === 0) {
-            $class = '\\' . $class;
-            if (class_exists($class)) {
-                $this->iteratorClass = $class;
-
-                return ;
-            }
-        }
-
-        throw new Exception\InvalidArgumentException('The iterator class does not exist');
-    }
-
-    /**
-     * Sort the entries with a user-defined comparison function and maintain key association
-     *
-     * @param  callable $function
-     * @return void
-     */
-    public function uasort($function)
-    {
-        if (is_callable($function)) {
-            uasort($this->storage, $function);
-        }
-    }
-
-    /**
-     * Sort the entries by keys using a user-defined comparison function
-     *
-     * @param  callable $function
-     * @return void
-     */
-    public function uksort($function)
-    {
-        if (is_callable($function)) {
-            uksort($this->storage, $function);
-        }
-    }
-
-    /**
-     * Unserialize an ArrayObject
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        $ar                        = unserialize($data);
-        $this->protectedProperties = array_keys(get_object_vars($this));
-
-        $this->setFlags($ar['flag']);
-        $this->exchangeArray($ar['storage']);
-        $this->setIteratorClass($ar['iteratorClass']);
-
-        foreach ($ar as $k => $v) {
-            switch ($k) {
-                case 'flag':
-                    $this->setFlags($v);
-                    break;
-                case 'storage':
-                    $this->exchangeArray($v);
-                    break;
-                case 'iteratorClass':
-                    $this->setIteratorClass($v);
-                    break;
-                case 'protectedProperties':
-                    continue;
-                default:
-                    $this->__set($k, $v);
-            }
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php b/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
deleted file mode 100644
index dcf8471..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface ArraySerializableInterface
-{
-    /**
-     * Exchange internal values from provided array
-     *
-     * @param  array $array
-     * @return void
-     */
-    public function exchangeArray(array $array);
-
-    /**
-     * Return an array representation of the object
-     *
-     * @return array
-     */
-    public function getArrayCopy();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayStack.php b/vendor/zendframework/zend-stdlib/src/ArrayStack.php
deleted file mode 100644
index 39d02aa..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayStack.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ArrayIterator;
-use ArrayObject as PhpArrayObject;
-
-/**
- * ArrayObject that acts as a stack with regards to iteration
- */
-class ArrayStack extends PhpArrayObject
-{
-    /**
-     * Retrieve iterator
-     *
-     * Retrieve an array copy of the object, reverse its order, and return an
-     * ArrayIterator with that reversed array.
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        $array = $this->getArrayCopy();
-        return new ArrayIterator(array_reverse($array));
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
deleted file mode 100644
index 17e3ae3..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Traversable;
-use Zend\Stdlib\ArrayUtils\MergeRemoveKey;
-use Zend\Stdlib\ArrayUtils\MergeReplaceKeyInterface;
-
-/**
- * Utility class for testing and manipulation of PHP arrays.
- *
- * Declared abstract, as we have no need for instantiation.
- */
-abstract class ArrayUtils
-{
-    /**
-     * Compatibility Flag for ArrayUtils::filter
-     */
-    const ARRAY_FILTER_USE_BOTH = 1;
-
-    /**
-     * Compatibility Flag for ArrayUtils::filter
-     */
-    const ARRAY_FILTER_USE_KEY  = 2;
-
-    /**
-     * Test whether an array contains one or more string keys
-     *
-     * @param  mixed $value
-     * @param  bool  $allowEmpty    Should an empty array() return true
-     * @return bool
-     */
-    public static function hasStringKeys($value, $allowEmpty = false)
-    {
-        if (!is_array($value)) {
-            return false;
-        }
-
-        if (!$value) {
-            return $allowEmpty;
-        }
-
-        return count(array_filter(array_keys($value), 'is_string')) > 0;
-    }
-
-    /**
-     * Test whether an array contains one or more integer keys
-     *
-     * @param  mixed $value
-     * @param  bool  $allowEmpty    Should an empty array() return true
-     * @return bool
-     */
-    public static function hasIntegerKeys($value, $allowEmpty = false)
-    {
-        if (!is_array($value)) {
-            return false;
-        }
-
-        if (!$value) {
-            return $allowEmpty;
-        }
-
-        return count(array_filter(array_keys($value), 'is_int')) > 0;
-    }
-
-    /**
-     * Test whether an array contains one or more numeric keys.
-     *
-     * A numeric key can be one of the following:
-     * - an integer 1,
-     * - a string with a number '20'
-     * - a string with negative number: '-1000'
-     * - a float: 2.2120, -78.150999
-     * - a string with float:  '4000.99999', '-10.10'
-     *
-     * @param  mixed $value
-     * @param  bool  $allowEmpty    Should an empty array() return true
-     * @return bool
-     */
-    public static function hasNumericKeys($value, $allowEmpty = false)
-    {
-        if (!is_array($value)) {
-            return false;
-        }
-
-        if (!$value) {
-            return $allowEmpty;
-        }
-
-        return count(array_filter(array_keys($value), 'is_numeric')) > 0;
-    }
-
-    /**
-     * Test whether an array is a list
-     *
-     * A list is a collection of values assigned to continuous integer keys
-     * starting at 0 and ending at count() - 1.
-     *
-     * For example:
-     * <code>
-     * $list = array('a', 'b', 'c', 'd');
-     * $list = array(
-     *     0 => 'foo',
-     *     1 => 'bar',
-     *     2 => array('foo' => 'baz'),
-     * );
-     * </code>
-     *
-     * @param  mixed $value
-     * @param  bool  $allowEmpty    Is an empty list a valid list?
-     * @return bool
-     */
-    public static function isList($value, $allowEmpty = false)
-    {
-        if (!is_array($value)) {
-            return false;
-        }
-
-        if (!$value) {
-            return $allowEmpty;
-        }
-
-        return (array_values($value) === $value);
-    }
-
-    /**
-     * Test whether an array is a hash table.
-     *
-     * An array is a hash table if:
-     *
-     * 1. Contains one or more non-integer keys, or
-     * 2. Integer keys are non-continuous or misaligned (not starting with 0)
-     *
-     * For example:
-     * <code>
-     * $hash = array(
-     *     'foo' => 15,
-     *     'bar' => false,
-     * );
-     * $hash = array(
-     *     1995  => 'Birth of PHP',
-     *     2009  => 'PHP 5.3.0',
-     *     2012  => 'PHP 5.4.0',
-     * );
-     * $hash = array(
-     *     'formElement,
-     *     'options' => array( 'debug' => true ),
-     * );
-     * </code>
-     *
-     * @param  mixed $value
-     * @param  bool  $allowEmpty    Is an empty array() a valid hash table?
-     * @return bool
-     */
-    public static function isHashTable($value, $allowEmpty = false)
-    {
-        if (!is_array($value)) {
-            return false;
-        }
-
-        if (!$value) {
-            return $allowEmpty;
-        }
-
-        return (array_values($value) !== $value);
-    }
-
-    /**
-     * Checks if a value exists in an array.
-     *
-     * Due to "foo" == 0 === TRUE with in_array when strict = false, an option
-     * has been added to prevent this. When $strict = 0/false, the most secure
-     * non-strict check is implemented. if $strict = -1, the default in_array
-     * non-strict behaviour is used.
-     *
-     * @param mixed $needle
-     * @param array $haystack
-     * @param int|bool $strict
-     * @return bool
-     */
-    public static function inArray($needle, array $haystack, $strict = false)
-    {
-        if (!$strict) {
-            if (is_int($needle) || is_float($needle)) {
-                $needle = (string) $needle;
-            }
-            if (is_string($needle)) {
-                foreach ($haystack as &$h) {
-                    if (is_int($h) || is_float($h)) {
-                        $h = (string) $h;
-                    }
-                }
-            }
-        }
-        return in_array($needle, $haystack, $strict);
-    }
-
-    /**
-     * Convert an iterator to an array.
-     *
-     * Converts an iterator to an array. The $recursive flag, on by default,
-     * hints whether or not you want to do so recursively.
-     *
-     * @param  array|Traversable  $iterator     The array or Traversable object to convert
-     * @param  bool               $recursive    Recursively check all nested structures
-     * @throws Exception\InvalidArgumentException if $iterator is not an array or a Traversable object
-     * @return array
-     */
-    public static function iteratorToArray($iterator, $recursive = true)
-    {
-        if (!is_array($iterator) && !$iterator instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable object');
-        }
-
-        if (!$recursive) {
-            if (is_array($iterator)) {
-                return $iterator;
-            }
-
-            return iterator_to_array($iterator);
-        }
-
-        if (method_exists($iterator, 'toArray')) {
-            return $iterator->toArray();
-        }
-
-        $array = [];
-        foreach ($iterator as $key => $value) {
-            if (is_scalar($value)) {
-                $array[$key] = $value;
-                continue;
-            }
-
-            if ($value instanceof Traversable) {
-                $array[$key] = static::iteratorToArray($value, $recursive);
-                continue;
-            }
-
-            if (is_array($value)) {
-                $array[$key] = static::iteratorToArray($value, $recursive);
-                continue;
-            }
-
-            $array[$key] = $value;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Merge two arrays together.
-     *
-     * If an integer key exists in both arrays and preserveNumericKeys is false, the value
-     * from the second array will be appended to the first array. If both values are arrays, they
-     * are merged together, else the value of the second array overwrites the one of the first array.
-     *
-     * @param  array $a
-     * @param  array $b
-     * @param  bool  $preserveNumericKeys
-     * @return array
-     */
-    public static function merge(array $a, array $b, $preserveNumericKeys = false)
-    {
-        foreach ($b as $key => $value) {
-            if ($value instanceof MergeReplaceKeyInterface) {
-                $a[$key] = $value->getData();
-            } elseif (isset($a[$key]) || array_key_exists($key, $a)) {
-                if ($value instanceof MergeRemoveKey) {
-                    unset($a[$key]);
-                } elseif (!$preserveNumericKeys && is_int($key)) {
-                    $a[] = $value;
-                } elseif (is_array($value) && is_array($a[$key])) {
-                    $a[$key] = static::merge($a[$key], $value, $preserveNumericKeys);
-                } else {
-                    $a[$key] = $value;
-                }
-            } else {
-                if (!$value instanceof MergeRemoveKey) {
-                    $a[$key] = $value;
-                }
-            }
-        }
-
-        return $a;
-    }
-
-    /**
-     * Compatibility Method for array_filter on <5.6 systems
-     *
-     * @param array $data
-     * @param callable $callback
-     * @param null|int $flag
-     * @return array
-     */
-    public static function filter(array $data, $callback, $flag = null)
-    {
-        if (! is_callable($callback)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Second parameter of %s must be callable',
-                __METHOD__
-            ));
-        }
-
-        if (version_compare(PHP_VERSION, '5.6.0') >= 0) {
-            return array_filter($data, $callback, $flag);
-        }
-
-        $output = [];
-        foreach ($data as $key => $value) {
-            $params = [$value];
-
-            if ($flag === static::ARRAY_FILTER_USE_BOTH) {
-                $params[] = $key;
-            }
-
-            if ($flag === static::ARRAY_FILTER_USE_KEY) {
-                $params = [$key];
-            }
-
-            $response = call_user_func_array($callback, $params);
-            if ($response) {
-                $output[$key] = $value;
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
deleted file mode 100644
index 7c4d097..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayUtils;
-
-final class MergeRemoveKey
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
deleted file mode 100644
index 24c1df4..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayUtils;
-
-final class MergeReplaceKey implements MergeReplaceKeyInterface
-{
-    /**
-     * @var mixed
-     */
-    protected $data;
-
-    /**
-     * @param mixed $data
-     */
-    public function __construct($data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
deleted file mode 100644
index 725cf11..0000000
--- a/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayUtils;
-
-/**
- * Marker interface: can be used to replace keys completely in {@see ArrayUtils::merge()} operations
- */
-interface MergeReplaceKeyInterface
-{
-    /**
-     * @return mixed
-     */
-    public function getData();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/CallbackHandler.php b/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
deleted file mode 100644
index dc6bc74..0000000
--- a/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ReflectionClass;
-
-/**
- * CallbackHandler
- *
- * A handler for an event, event, filterchain, etc. Abstracts PHP callbacks,
- * primarily to allow for lazy-loading and ensuring availability of default
- * arguments (currying).
- */
-class CallbackHandler
-{
-    /**
-     * @var string|array|callable PHP callback to invoke
-     */
-    protected $callback;
-
-    /**
-     * Callback metadata, if any
-     * @var array
-     */
-    protected $metadata;
-
-    /**
-     * Constructor
-     *
-     * @param  string|array|object|callable $callback PHP callback
-     * @param  array                        $metadata  Callback metadata
-     */
-    public function __construct($callback, array $metadata = [])
-    {
-        $this->metadata  = $metadata;
-        $this->registerCallback($callback);
-    }
-
-    /**
-     * Registers the callback provided in the constructor
-     *
-     * @param  callable $callback
-     * @throws Exception\InvalidCallbackException
-     * @return void
-     */
-    protected function registerCallback($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new Exception\InvalidCallbackException('Invalid callback provided; not callable');
-        }
-
-        $this->callback = $callback;
-    }
-
-    /**
-     * Retrieve registered callback
-     *
-     * @return callable
-     */
-    public function getCallback()
-    {
-        return $this->callback;
-    }
-
-    /**
-     * Invoke handler
-     *
-     * @param  array $args Arguments to pass to callback
-     * @return mixed
-     */
-    public function call(array $args = [])
-    {
-        $callback = $this->getCallback();
-        $argCount = count($args);
-
-        if (is_string($callback)) {
-            $result = $this->validateStringCallbackFor54($callback);
-
-            if ($result !== true && $argCount <= 3) {
-                $callback       = $result;
-                // Minor performance tweak, if the callback gets called more
-                // than once
-                $this->callback = $result;
-            }
-        }
-
-        // Minor performance tweak; use call_user_func() until > 3 arguments
-        // reached
-        switch ($argCount) {
-            case 0:
-                return $callback();
-            case 1:
-                return $callback(array_shift($args));
-            case 2:
-                $arg1 = array_shift($args);
-                $arg2 = array_shift($args);
-                return $callback($arg1, $arg2);
-            case 3:
-                $arg1 = array_shift($args);
-                $arg2 = array_shift($args);
-                $arg3 = array_shift($args);
-                return $callback($arg1, $arg2, $arg3);
-            default:
-                return call_user_func_array($callback, $args);
-        }
-    }
-
-    /**
-     * Invoke as functor
-     *
-     * @return mixed
-     */
-    public function __invoke()
-    {
-        return $this->call(func_get_args());
-    }
-
-    /**
-     * Get all callback metadata
-     *
-     * @return array
-     */
-    public function getMetadata()
-    {
-        return $this->metadata;
-    }
-
-    /**
-     * Retrieve a single metadatum
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function getMetadatum($name)
-    {
-        if (array_key_exists($name, $this->metadata)) {
-            return $this->metadata[$name];
-        }
-        return;
-    }
-
-    /**
-     * Validate a static method call
-     *
-     *
-     * @param  string $callback
-     * @return true|array
-     * @throws Exception\InvalidCallbackException if invalid
-     */
-    protected function validateStringCallbackFor54($callback)
-    {
-        if (!strstr($callback, '::')) {
-            return true;
-        }
-
-        list($class, $method) = explode('::', $callback, 2);
-
-        if (!class_exists($class)) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a class that does not exist',
-                $callback
-            ));
-        }
-
-        $r = new ReflectionClass($class);
-        if (!$r->hasMethod($method)) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a method that does not exist',
-                $callback
-            ));
-        }
-        $m = $r->getMethod($method);
-        if (!$m->isStatic()) {
-            throw new Exception\InvalidCallbackException(sprintf(
-                'Static method call "%s" refers to a method that is not static',
-                $callback
-            ));
-        }
-
-        // returning a non boolean value may not be nice for a validate method,
-        // but that allows the usage of a static string callback without using
-        // the call_user_func function.
-        return [$class, $method];
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/DateTime.php b/vendor/zendframework/zend-stdlib/src/DateTime.php
deleted file mode 100644
index cdab67d..0000000
--- a/vendor/zendframework/zend-stdlib/src/DateTime.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use DateTimeZone;
-
-trigger_error('DateTime extension deprecated as of ZF 2.1.4; use the \DateTime constructor to parse extended ISO8601 dates instead', E_USER_DEPRECATED);
-
-/**
- * DateTime
- *
- * An extension of the \DateTime object.
- *
- * @deprecated
- */
-class DateTime extends \DateTime
-{
-    /**
-     * The DateTime::ISO8601 constant used by php's native DateTime object does
-     * not allow for fractions of a second. This function better handles ISO8601
-     * formatted date strings.
-     *
-     * @param  string       $time
-     * @param  DateTimeZone $timezone
-     * @return mixed
-     */
-    public static function createFromISO8601($time, DateTimeZone $timezone = null)
-    {
-        $format = self::ISO8601;
-        if (isset($time[19]) && $time[19] === '.') {
-            $format = 'Y-m-d\TH:i:s.uO';
-        }
-
-        if ($timezone !== null) {
-            return self::createFromFormat($format, $time, $timezone);
-        }
-
-        return self::createFromFormat($format, $time);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php b/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
deleted file mode 100644
index 4f74d1e..0000000
--- a/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface DispatchableInterface
-{
-    /**
-     * Dispatch a request
-     *
-     * @param RequestInterface $request
-     * @param null|ResponseInterface $response
-     * @return Response|mixed
-     */
-    public function dispatch(RequestInterface $request, ResponseInterface $response = null);
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ErrorHandler.php b/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
deleted file mode 100644
index a849620..0000000
--- a/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ErrorException;
-
-/**
- * ErrorHandler that can be used to catch internal PHP errors
- * and convert to an ErrorException instance.
- */
-abstract class ErrorHandler
-{
-    /**
-     * Active stack
-     *
-     * @var array
-     */
-    protected static $stack = [];
-
-    /**
-     * Check if this error handler is active
-     *
-     * @return bool
-     */
-    public static function started()
-    {
-        return (bool) static::getNestedLevel();
-    }
-
-    /**
-     * Get the current nested level
-     *
-     * @return int
-     */
-    public static function getNestedLevel()
-    {
-        return count(static::$stack);
-    }
-
-    /**
-     * Starting the error handler
-     *
-     * @param int $errorLevel
-     */
-    public static function start($errorLevel = \E_WARNING)
-    {
-        if (!static::$stack) {
-            set_error_handler([get_called_class(), 'addError'], $errorLevel);
-        }
-
-        static::$stack[] = null;
-    }
-
-    /**
-     * Stopping the error handler
-     *
-     * @param  bool $throw Throw the ErrorException if any
-     * @return null|ErrorException
-     * @throws ErrorException If an error has been catched and $throw is true
-     */
-    public static function stop($throw = false)
-    {
-        $errorException = null;
-
-        if (static::$stack) {
-            $errorException = array_pop(static::$stack);
-
-            if (!static::$stack) {
-                restore_error_handler();
-            }
-
-            if ($errorException && $throw) {
-                throw $errorException;
-            }
-        }
-
-        return $errorException;
-    }
-
-    /**
-     * Stop all active handler
-     *
-     * @return void
-     */
-    public static function clean()
-    {
-        if (static::$stack) {
-            restore_error_handler();
-        }
-
-        static::$stack = [];
-    }
-
-    /**
-     * Add an error to the stack
-     *
-     * @param int    $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param int    $errline
-     * @return void
-     */
-    public static function addError($errno, $errstr = '', $errfile = '', $errline = 0)
-    {
-        $stack = & static::$stack[count(static::$stack) - 1];
-        $stack = new ErrorException($errstr, 0, $errno, $errfile, $errline, $stack);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
deleted file mode 100644
index 0254e45..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Bad method call exception
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php b/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
deleted file mode 100644
index 6d2ac71..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Domain exception
- */
-class DomainException extends \DomainException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
deleted file mode 100644
index 60b795f..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Exception marker interface
- */
-interface ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
deleted file mode 100644
index 4b51475..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Extension not loaded exception
- */
-class ExtensionNotLoadedException extends RuntimeException
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
deleted file mode 100644
index 8028c47..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Invalid Argument Exception
- */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php b/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
deleted file mode 100644
index aa36f98..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Invalid callback exception
- */
-class InvalidCallbackException extends DomainException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php b/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
deleted file mode 100644
index 087ac0e..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Logic exception
- */
-class LogicException extends \LogicException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php b/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
deleted file mode 100644
index f3891d6..0000000
--- a/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Exception;
-
-/**
- * Runtime exception
- */
-class RuntimeException extends \RuntimeException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php b/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
deleted file mode 100644
index 6c84720..0000000
--- a/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Extractor;
-
-use Zend\Hydrator\ExtractionInterface as BaseExtractionInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\ExtractionInterface from zendframework/zend-hydrator instead.
- */
-interface ExtractionInterface extends BaseExtractionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php b/vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php
deleted file mode 100644
index 16d2bcc..0000000
--- a/vendor/zendframework/zend-stdlib/src/FastPriorityQueue.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Iterator;
-use Countable;
-use Serializable;
-use SplPriorityQueue as PhpSplPriorityQueue;
-
-/**
- * This is an efficient implementation of an integer priority queue in PHP
- *
- * This class acts like a queue with insert() and extract(), removing the
- * elements from the queue and it also acts like an Iterator without removing
- * the elements. This behaviour can be used in mixed scenarios with high
- * performance boost.
- */
-class FastPriorityQueue implements Iterator, Countable, Serializable
-{
-    const EXTR_DATA     = PhpSplPriorityQueue::EXTR_DATA;
-    const EXTR_PRIORITY = PhpSplPriorityQueue::EXTR_PRIORITY;
-    const EXTR_BOTH     = PhpSplPriorityQueue::EXTR_BOTH;
-
-    /**
-     * @var integer
-     */
-    protected $extractFlag = self::EXTR_DATA;
-
-    /**
-     * Elements of the queue, divided by priorities
-     *
-     * @var array
-     */
-    protected $values = [];
-
-    /**
-     * Array of priorities
-     *
-     * @var array
-     */
-    protected $priorities = [];
-
-    /**
-     * Array of priorities used for the iteration
-     *
-     * @var array
-     */
-    protected $subPriorities = [];
-
-    /**
-     * Max priority
-     *
-     * @var integer
-     */
-    protected $maxPriority = 0;
-
-    /**
-     * Total number of elements in the queue
-     *
-     * @var integer
-     */
-    protected $count = 0;
-
-    /**
-     * Index of the current element in the queue
-     *
-     * @var integer
-     */
-    protected $index = 0;
-
-    /**
-     * Sub index of the current element in the same priority level
-     *
-     * @var integer
-     */
-    protected $subIndex = 0;
-
-    /**
-     * Insert an element in the queue with a specified priority
-     *
-     * @param mixed $value
-     * @param integer $priority a positive integer
-     */
-    public function insert($value, $priority)
-    {
-        if (! is_int($priority)) {
-            throw new Exception\InvalidArgumentException('The priority must be an integer');
-        }
-        $this->values[$priority][] = $value;
-        if (! isset($this->priorities[$priority])) {
-            $this->priorities[$priority] = $priority;
-            $this->maxPriority           = max($priority, $this->maxPriority);
-        }
-        ++$this->count;
-    }
-
-    /**
-     * Extract an element in the queue according to the priority and the
-     * order of insertion
-     *
-     * @return mixed
-     */
-    public function extract()
-    {
-        if (! $this->valid()) {
-            return false;
-        }
-        $value = $this->current();
-        $this->nextAndRemove();
-        return $value;
-    }
-
-    /**
-     * Remove an item from the queue
-     *
-     * This is different than {@link extract()}; its purpose is to dequeue an
-     * item.
-     *
-     * Note: this removes the first item matching the provided item found. If
-     * the same item has been added multiple times, it will not remove other
-     * instances.
-     *
-     * @param  mixed $datum
-     * @return bool False if the item was not found, true otherwise.
-     */
-    public function remove($datum)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if (current($this->values[$this->maxPriority]) === $datum) {
-                $index = key($this->values[$this->maxPriority]);
-                unset($this->values[$this->maxPriority][$index]);
-                --$this->count;
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-    /**
-     * Get the total number of elements in the queue
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->count;
-    }
-
-    /**
-     * Get the current element in the queue
-     *
-     * @return mixed
-     */
-    public function current()
-    {
-        switch ($this->extractFlag) {
-            case self::EXTR_DATA:
-                return current($this->values[$this->maxPriority]);
-            case self::EXTR_PRIORITY:
-                return $this->maxPriority;
-            case self::EXTR_BOTH:
-                return [
-                    'data'     => current($this->values[$this->maxPriority]),
-                    'priority' => $this->maxPriority
-                ];
-        }
-    }
-
-    /**
-     * Get the index of the current element in the queue
-     *
-     * @return integer
-     */
-    public function key()
-    {
-        return $this->index;
-    }
-
-    /**
-     * Set the iterator pointer to the next element in the queue
-     * removing the previous element
-     */
-    protected function nextAndRemove()
-    {
-        if (false === next($this->values[$this->maxPriority])) {
-            unset($this->priorities[$this->maxPriority]);
-            unset($this->values[$this->maxPriority]);
-            $this->maxPriority = empty($this->priorities) ? 0 : max($this->priorities);
-            $this->subIndex    = -1;
-        }
-        ++$this->index;
-        ++$this->subIndex;
-        --$this->count;
-    }
-
-    /**
-     * Set the iterator pointer to the next element in the queue
-     * without removing the previous element
-     */
-    public function next()
-    {
-        if (false === next($this->values[$this->maxPriority])) {
-            unset($this->subPriorities[$this->maxPriority]);
-            reset($this->values[$this->maxPriority]);
-            $this->maxPriority = empty($this->subPriorities) ? 0 : max($this->subPriorities);
-            $this->subIndex    = -1;
-        }
-        ++$this->index;
-        ++$this->subIndex;
-    }
-
-    /**
-     * Check if the current iterator is valid
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return isset($this->values[$this->maxPriority]);
-    }
-
-    /**
-     * Rewind the current iterator
-     */
-    public function rewind()
-    {
-        $this->subPriorities = $this->priorities;
-        $this->maxPriority   = empty($this->priorities) ? 0 : max($this->priorities);
-        $this->index         = 0;
-        $this->subIndex      = 0;
-    }
-
-    /**
-     * Serialize to an array
-     *
-     * Array will be priority => data pairs
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = [];
-        foreach (clone $this as $item) {
-            $array[] = $item;
-        }
-        return $array;
-    }
-
-    /**
-     * Serialize
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        $clone = clone $this;
-        $clone->setExtractFlags(self::EXTR_BOTH);
-
-        $data = [];
-        foreach ($clone as $item) {
-            $data[] = $item;
-        }
-
-        return serialize($data);
-    }
-
-    /**
-     * Deserialize
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        foreach (unserialize($data) as $item) {
-            $this->insert($item['data'], $item['priority']);
-        }
-    }
-
-    /**
-     * Set the extract flag
-     *
-     * @param integer $flag
-     */
-    public function setExtractFlags($flag)
-    {
-        switch ($flag) {
-            case self::EXTR_DATA:
-            case self::EXTR_PRIORITY:
-            case self::EXTR_BOTH:
-                $this->extractFlag = $flag;
-                break;
-            default:
-                throw new Exception\InvalidArgumentException("The extract flag specified is not valid");
-        }
-    }
-
-    /**
-     * Check if the queue is empty
-     *
-     * @return boolean
-     */
-    public function isEmpty()
-    {
-        return empty($this->values);
-    }
-
-    /**
-     * Does the queue contain the given datum?
-     *
-     * @param  mixed $datum
-     * @return bool
-     */
-    public function contains($datum)
-    {
-        foreach ($this->values as $values) {
-            if (in_array($datum, $values)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Does the queue have an item with the given priority?
-     *
-     * @param  int $priority
-     * @return bool
-     */
-    public function hasPriority($priority)
-    {
-        return isset($this->values[$priority]);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Glob.php b/vendor/zendframework/zend-stdlib/src/Glob.php
deleted file mode 100644
index 5358740..0000000
--- a/vendor/zendframework/zend-stdlib/src/Glob.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-/**
- * Wrapper for glob with fallback if GLOB_BRACE is not available.
- */
-abstract class Glob
-{
-    /**#@+
-     * Glob constants.
-     */
-    const GLOB_MARK     = 0x01;
-    const GLOB_NOSORT   = 0x02;
-    const GLOB_NOCHECK  = 0x04;
-    const GLOB_NOESCAPE = 0x08;
-    const GLOB_BRACE    = 0x10;
-    const GLOB_ONLYDIR  = 0x20;
-    const GLOB_ERR      = 0x40;
-    /**#@-*/
-
-    /**
-     * Find pathnames matching a pattern.
-     *
-     * @see    http://docs.php.net/glob
-     * @param  string  $pattern
-     * @param  int $flags
-     * @param  bool $forceFallback
-     * @return array
-     * @throws Exception\RuntimeException
-     */
-    public static function glob($pattern, $flags = 0, $forceFallback = false)
-    {
-        if (!defined('GLOB_BRACE') || $forceFallback) {
-            return static::fallbackGlob($pattern, $flags);
-        }
-
-        return static::systemGlob($pattern, $flags);
-    }
-
-    /**
-     * Use the glob function provided by the system.
-     *
-     * @param  string  $pattern
-     * @param  int     $flags
-     * @return array
-     * @throws Exception\RuntimeException
-     */
-    protected static function systemGlob($pattern, $flags)
-    {
-        if ($flags) {
-            $flagMap = [
-                self::GLOB_MARK     => GLOB_MARK,
-                self::GLOB_NOSORT   => GLOB_NOSORT,
-                self::GLOB_NOCHECK  => GLOB_NOCHECK,
-                self::GLOB_NOESCAPE => GLOB_NOESCAPE,
-                self::GLOB_BRACE    => GLOB_BRACE,
-                self::GLOB_ONLYDIR  => GLOB_ONLYDIR,
-                self::GLOB_ERR      => GLOB_ERR,
-            ];
-
-            $globFlags = 0;
-
-            foreach ($flagMap as $internalFlag => $globFlag) {
-                if ($flags & $internalFlag) {
-                    $globFlags |= $globFlag;
-                }
-            }
-        } else {
-            $globFlags = 0;
-        }
-
-        ErrorHandler::start();
-        $res = glob($pattern, $globFlags);
-        $err = ErrorHandler::stop();
-        if ($res === false) {
-            throw new Exception\RuntimeException("glob('{$pattern}', {$globFlags}) failed", 0, $err);
-        }
-        return $res;
-    }
-
-    /**
-     * Expand braces manually, then use the system glob.
-     *
-     * @param  string  $pattern
-     * @param  int     $flags
-     * @return array
-     * @throws Exception\RuntimeException
-     */
-    protected static function fallbackGlob($pattern, $flags)
-    {
-        if (!$flags & self::GLOB_BRACE) {
-            return static::systemGlob($pattern, $flags);
-        }
-
-        $flags &= ~self::GLOB_BRACE;
-        $length = strlen($pattern);
-        $paths  = [];
-
-        if ($flags & self::GLOB_NOESCAPE) {
-            $begin = strpos($pattern, '{');
-        } else {
-            $begin = 0;
-
-            while (true) {
-                if ($begin === $length) {
-                    $begin = false;
-                    break;
-                } elseif ($pattern[$begin] === '\\' && ($begin + 1) < $length) {
-                    $begin++;
-                } elseif ($pattern[$begin] === '{') {
-                    break;
-                }
-
-                $begin++;
-            }
-        }
-
-        if ($begin === false) {
-            return static::systemGlob($pattern, $flags);
-        }
-
-        $next = static::nextBraceSub($pattern, $begin + 1, $flags);
-
-        if ($next === null) {
-            return static::systemGlob($pattern, $flags);
-        }
-
-        $rest = $next;
-
-        while ($pattern[$rest] !== '}') {
-            $rest = static::nextBraceSub($pattern, $rest + 1, $flags);
-
-            if ($rest === null) {
-                return static::systemGlob($pattern, $flags);
-            }
-        }
-
-        $p = $begin + 1;
-
-        while (true) {
-            $subPattern = substr($pattern, 0, $begin)
-                        . substr($pattern, $p, $next - $p)
-                        . substr($pattern, $rest + 1);
-
-            $result = static::fallbackGlob($subPattern, $flags | self::GLOB_BRACE);
-
-            if ($result) {
-                $paths = array_merge($paths, $result);
-            }
-
-            if ($pattern[$next] === '}') {
-                break;
-            }
-
-            $p    = $next + 1;
-            $next = static::nextBraceSub($pattern, $p, $flags);
-        }
-
-        return array_unique($paths);
-    }
-
-    /**
-     * Find the end of the sub-pattern in a brace expression.
-     *
-     * @param  string  $pattern
-     * @param  int $begin
-     * @param  int $flags
-     * @return int|null
-     */
-    protected static function nextBraceSub($pattern, $begin, $flags)
-    {
-        $length  = strlen($pattern);
-        $depth   = 0;
-        $current = $begin;
-
-        while ($current < $length) {
-            if (!$flags & self::GLOB_NOESCAPE && $pattern[$current] === '\\') {
-                if (++$current === $length) {
-                    break;
-                }
-
-                $current++;
-            } else {
-                if (($pattern[$current] === '}' && $depth-- === 0) || ($pattern[$current] === ',' && $depth === 0)) {
-                    break;
-                } elseif ($pattern[$current++] === '{') {
-                    $depth++;
-                }
-            }
-        }
-
-        return ($current < $length ? $current : null);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
deleted file mode 100644
index 95bc516..0000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-/**
- * An aggregate for all guard traits
- */
-trait AllGuardsTrait
-{
-    use ArrayOrTraversableGuardTrait;
-    use EmptyGuardTrait;
-    use NullGuardTrait;
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
deleted file mode 100644
index e6959a5..0000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-use Traversable;
-
-/**
- * Provide a guard method for array or Traversable data
- */
-trait ArrayOrTraversableGuardTrait
-{
-    /**
-     * Verifies that the data is an array or Traversable
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    protected function guardForArrayOrTraversable(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
-    ) {
-        if (!is_array($data) && !($data instanceof Traversable)) {
-            $message = sprintf(
-                "%s must be an array or Traversable, [%s] given",
-                $dataName,
-                is_object($data) ? get_class($data) : gettype($data)
-            );
-            throw new $exceptionClass($message);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
deleted file mode 100644
index c6751cc..0000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-/**
- * Provide a guard method against empty data
- */
-trait EmptyGuardTrait
-{
-    /**
-     * Verify that the data is not empty
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    protected function guardAgainstEmpty(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
-    ) {
-        if (empty($data)) {
-            $message = sprintf('%s cannot be empty', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php b/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
deleted file mode 100644
index 4fe4cca..0000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-use Traversable;
-
-/**
- * Static guard helper class
- *
- * Bridges the gap for allowing refactoring until traits can be used by default.
- *
- * @deprecated
- */
-abstract class GuardUtils
-{
-    const DEFAULT_EXCEPTION_CLASS = 'Zend\Stdlib\Exception\InvalidArgumentException';
-
-    /**
-     * Verifies that the data is an array or Traversable
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardForArrayOrTraversable(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (!is_array($data) && !($data instanceof Traversable)) {
-            $message = sprintf(
-                '%s must be an array or Traversable, [%s] given',
-                $dataName,
-                is_object($data) ? get_class($data) : gettype($data)
-            );
-            throw new $exceptionClass($message);
-        }
-    }
-
-    /**
-     * Verify that the data is not empty
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardAgainstEmpty(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (empty($data)) {
-            $message = sprintf('%s cannot be empty', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-
-    /**
-     * Verify that the data is not null
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    public static function guardAgainstNull(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
-    ) {
-        if (null === $data) {
-            $message = sprintf('%s cannot be null', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
deleted file mode 100644
index eac7162..0000000
--- a/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Guard;
-
-/**
- * Provide a guard method against null data
- */
-trait NullGuardTrait
-{
-    /**
-     * Verify that the data is not null
-     *
-     * @param  mixed  $data           the data to verify
-     * @param  string $dataName       the data name
-     * @param  string $exceptionClass FQCN for the exception
-     * @throws \Exception
-     */
-    protected function guardAgainstNull(
-        $data,
-        $dataName = 'Argument',
-        $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
-    ) {
-        if (null === $data) {
-            $message = sprintf('%s cannot be null', $dataName);
-            throw new $exceptionClass($message);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
deleted file mode 100644
index a4cf08a..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\AbstractHydrator as BaseAbstractHydrator;
-
-/**
- * @deprecated Use Zend\Hydrator\AbstractHydrator from zendframework/zend-hydrator instead.
- */
-abstract class AbstractHydrator extends BaseAbstractHydrator implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
deleted file mode 100644
index 62c6b32..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\AggregateHydrator as BaseAggregateHydrator;
-use Zend\Stdlib\Hydrator\HydratorInterface;
-
-/**
- * Aggregate hydrator that composes multiple hydrators via events
- *
- * @deprecated Use Zend\Hydrator\Aggregate\AggregateHydrator from zendframework/zend-hydrator instead.
- */
-class AggregateHydrator extends BaseAggregateHydrator implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
deleted file mode 100644
index 9563efb..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\ExtractEvent as BaseExtractEvent;
-
-/**
- * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} extracts
- * data from an object
- *
- * @deprecated Use Zend\Hydrator\Aggregate\ExtractEvent from zendframework/zend-hydrator instead.
- */
-class ExtractEvent extends BaseExtractEvent
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
deleted file mode 100644
index 29c9fd6..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\HydrateEvent as BaseHydrateEvent;
-
-/**
- * Event triggered when the {@see \Zend\Stdlib\Hydrator\Aggregate\AggregateHydrator} hydrates
- * data into an object
- *
- * @deprecated Use Zend\Hydrator\Aggregate\HydrateEvent from zendframework/zend-hydrator instead.
- */
-class HydrateEvent extends BaseHydrateEvent
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
deleted file mode 100644
index e15cae4..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Aggregate;
-
-use Zend\Hydrator\Aggregate\HydratorListener as BaseHydratorListener;
-
-/**
- * Aggregate listener wrapping around a hydrator. Listens
- * to {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_HYDRATE} and
- * {@see \Zend\Stdlib\Hydrator\Aggregate::EVENT_EXTRACT}
- *
- * @deprecated Use Zend\Hydrator\Aggregate\HydratorListener from zendframework/zend-hydrator instead.
- */
-class HydratorListener extends BaseHydratorListener
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php b/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
deleted file mode 100644
index 415a44d..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ArraySerializable as BaseArraySerializable;
-
-/**
- * @deprecated Use Zend\Hydrator\ArraySerializable from zendframework/zend-hydrator instead.
- */
-class ArraySerializable extends BaseArraySerializable implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php b/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
deleted file mode 100644
index ee6bdad..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ClassMethods as BaseClassMethods;
-
-/**
- * @deprecated Use Zend\Hydrator\ClassMethods from zendframework/zend-hydrator instead.
- */
-class ClassMethods extends BaseClassMethods implements HydratorInterface, HydratorOptionsInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
deleted file mode 100644
index eb65d95..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\DelegatingHydrator as BaseDelegatingHydrator;
-
-/**
- * @deprecated Use Zend\Hydrator\DelegatingHydrator from zendframework/zend-hydrator instead.
- */
-class DelegatingHydrator extends BaseDelegatingHydrator implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php b/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
deleted file mode 100644
index 170308d..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\DelegatingHydratorFactory as BaseDelegatingHydratorFactory;
-
-/**
- * @deprecated Use Zend\Hydrator\DelegatingHydratorFactory from zendframework/zend-hydrator instead.
- */
-class DelegatingHydratorFactory extends BaseDelegatingHydratorFactory
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
deleted file mode 100644
index b230c97..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterComposite as BaseFilterComposite;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterComposite from zendframework/zend-hydrator instead.
- */
-class FilterComposite extends BaseFilterComposite implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
deleted file mode 100644
index 95c4e24..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterInterface as BaseFilterInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterInterface from zendframework/zend-hydrator instead.
- */
-interface FilterInterface extends BaseFilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
deleted file mode 100644
index 142ddf1..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\FilterProviderInterface as BaseFilterProviderInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\FilterProviderInterface from zendframework/zend-hydrator instead.
- */
-interface FilterProviderInterface extends BaseFilterProviderInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
deleted file mode 100644
index ca7dd3c..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\GetFilter as BaseGetFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\GetFilter from zendframework/zend-hydrator instead.
- */
-class GetFilter extends BaseGetFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
deleted file mode 100644
index af00600..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\HasFilter as BaseHasFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\HasFilter from zendframework/zend-hydrator instead.
- */
-class HasFilter extends BaseHasFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
deleted file mode 100644
index 9e51643..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\IsFilter as BaseIsFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\IsFilter from zendframework/zend-hydrator instead.
- */
-class IsFilter extends BaseIsFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
deleted file mode 100644
index 471849c..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\MethodMatchFilter as BaseMethodMatchFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\MethodMatchFilter from zendframework/zend-hydrator instead.
- */
-class MethodMatchFilter extends BaseMethodMatchFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
deleted file mode 100644
index 95309b1..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\NumberOfParameterFilter as BaseNumberOfParameterFilter;
-
-/**
- * @deprecated Use Zend\Hydrator\Filter\NumberOfParameterFilter from zendframework/zend-hydrator instead.
- */
-class NumberOfParameterFilter extends BaseNumberOfParameterFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
deleted file mode 100644
index 07c8dfd..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright      Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license        http://framework.zend.com/license/new-bsd New BSD License
- */
-namespace Zend\Stdlib\Hydrator\Filter;
-
-use Zend\Hydrator\Filter\OptionalParametersFilter as BaseOptionalParametersFilter;
-
-/**
- * Filter that includes methods which have no parameters or only optional parameters
- *
- * @deprecated Use Zend\Hydrator\Filter\OptionalParametersFilter from zendframework/zend-hydrator instead.
- */
-class OptionalParametersFilter extends BaseOptionalParametersFilter implements FilterInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
deleted file mode 100644
index 9643f14..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\FilterEnabledInterface as BaseFilterEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\FilterEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface FilterEnabledInterface extends BaseFilterEnabledInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
deleted file mode 100644
index 8395169..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydrationInterface as BaseHydrationInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydrationInterface from zendframework/zend-hydrator instead.
- */
-interface HydrationInterface extends BaseHydrationInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
deleted file mode 100644
index 625a609..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorAwareInterface as BaseHydratorAwareInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorAwareInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorAwareInterface extends BaseHydratorAwareInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
deleted file mode 100644
index e7d6082..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorAwareTrait as BaseHydratorAwareTrait;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorAwareTrait from zendframework/zend-hydrator instead.
- */
-trait HydratorAwareTrait
-{
-    use BaseHydratorAwareTrait;
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
deleted file mode 100644
index 14f143a..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Stdlib\Extractor\ExtractionInterface;
-use Zend\Hydrator\HydratorInterface as BaseHydratorInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorInterface extends BaseHydratorInterface, HydrationInterface, ExtractionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
deleted file mode 100644
index dfda925..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorOptionsInterface as BaseHydratorOptionsInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\HydratorOptionsInterface from zendframework/zend-hydrator instead.
- */
-interface HydratorOptionsInterface extends BaseHydratorOptionsInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php b/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
deleted file mode 100644
index 6b7049b..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\HydratorPluginManager as BaseHydratorPluginManager;
-
-/**
- * Plugin manager implementation for hydrators.
- *
- * Enforces that adapters retrieved are instances of HydratorInterface
- *
- * @deprecated Use Zend\Hydrator\HydratorPluginManager from zendframework/zend-hydrator instead.
- */
-class HydratorPluginManager extends BaseHydratorPluginManager
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
deleted file mode 100644
index f51befe..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingArrayIterator as BaseHydratingArrayIterator;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingArrayIterator from zendframework/zend-hydrator instead.
- */
-class HydratingArrayIterator extends BaseHydratingArrayIterator implements HydratingIteratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
deleted file mode 100644
index 81a9999..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingIteratorInterface as BaseHydratingIteratorInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingIteratorInterface from zendframework/zend-hydrator instead.
- */
-interface HydratingIteratorInterface extends BaseHydratingIteratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
deleted file mode 100644
index 1d2ac7a..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Iterator;
-
-use Zend\Hydrator\Iterator\HydratingIteratorIterator as BaseHydratingIteratorIterator;
-
-/**
- * @deprecated Use Zend\Hydrator\Iterator\HydratingIteratorIterator from zendframework/zend-hydrator instead.
- */
-class HydratingIteratorIterator extends BaseHydratingIteratorIterator implements HydratingIteratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
deleted file mode 100644
index d440c53..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy as BaseArrayMapNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy from zendframework/zend-hydrator instead.
- */
-class ArrayMapNamingStrategy extends BaseArrayMapNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
deleted file mode 100644
index d529a8b..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\CompositeNamingStrategy as BaseCompositeNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\CompositeNamingStrategy from zendframework/zend-hydrator instead.
- */
-class CompositeNamingStrategy extends BaseCompositeNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
deleted file mode 100644
index be57839..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\IdentityNamingStrategy as BaseIdentityNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\IdentityNamingStrategy from zendframework/zend-hydrator instead.
- */
-class IdentityNamingStrategy extends BaseIdentityNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
deleted file mode 100644
index 59e3f7f..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\MapNamingStrategy as BaseMapNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\MapNamingStrategy from zendframework/zend-hydrator instead.
- */
-class MapNamingStrategy extends BaseMapNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
deleted file mode 100644
index 4d82ee1..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\NamingStrategyInterface as BaseNamingStrategyInterface;
-
-/**
- * Allow property extraction / hydration for hydrator
- *
- * @deprecated Use Zend\Hydrator\NamingStrategy\NamingStrategyInterface from zendframework/zend-hydrator instead.
- */
-interface NamingStrategyInterface extends BaseNamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
deleted file mode 100644
index 2b9d6ef..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\NamingStrategy;
-
-use Zend\Hydrator\NamingStrategy\UnderscoreNamingStrategy as BaseUnderscoreNamingStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\UnderscoreNamingStrategy from zendframework/zend-hydrator instead.
- */
-class UnderscoreNamingStrategy extends BaseUnderscoreNamingStrategy implements NamingStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
deleted file mode 100644
index 8f8acab..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\NamingStrategyEnabledInterface as BaseNamingStrategyEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\NamingStrategy\NamingStrategyEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface NamingStrategyEnabledInterface extends BaseNamingStrategyEnabledInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php b/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
deleted file mode 100644
index c846fe5..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\ObjectProperty as BaseObjectProperty;
-
-/**
- * @deprecated Use Zend\Hydrator\ObjectProperty from zendframework/zend-hydrator instead.
- */
-class ObjectProperty extends BaseObjectProperty implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
deleted file mode 100644
index 22d8cdf..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\Reflection as BaseReflection;
-
-/**
- * @deprecated Use Zend\Hydrator\Reflection from zendframework/zend-hydrator instead.
- */
-class Reflection extends BaseReflection implements HydratorInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
deleted file mode 100644
index d89f507..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\BooleanStrategy as BaseBooleanStrategy;
-
-/**
- * This Strategy extracts and hydrates int and string values to Boolean values
- *
- * @deprecated Use Zend\Hydrator\Strategy\BooleanStrategy from zendframework/zend-hydrator instead.
- */
-class BooleanStrategy extends BaseBooleanStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
deleted file mode 100644
index 3257222..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\ClosureStrategy as BaseClosureStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\ClosureStrategy from zendframework/zend-hydrator instead.
- */
-class ClosureStrategy extends BaseClosureStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
deleted file mode 100644
index 8e633f3..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\DateTimeFormatterStrategy as BaseDateTimeFormatterStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\DateTimeFormatterStrategy from zendframework/zend-hydrator instead.
- */
-class DateTimeFormatterStrategy extends BaseDateTimeFormatterStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
deleted file mode 100644
index 155c82f..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\DefaultStrategy as BaseDefaultStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\DefaultStrategy from zendframework/zend-hydrator instead.
- */
-class DefaultStrategy extends BaseDefaultStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
deleted file mode 100644
index 16a921b..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy\Exception;
-
-use Zend\Hydrator\Strategy\Exception;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\Exception\ExceptionInterface from zendframework/zend-hydrator instead.
- */
-interface ExceptionInterface extends Exception\ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
deleted file mode 100644
index 10f69a2..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy\Exception;
-
-use Zend\Hydrator\Strategy\Exception\InvalidArgumentException as BaseInvalidArgumentException;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\Exception\InvalidArgumentException from zendframework/zend-hydrator instead.
- */
-class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
deleted file mode 100644
index ca7e585..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\ExplodeStrategy as BaseExplodeStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\ExplodeStrategy from zendframework/zend-hydrator instead.
- */
-class ExplodeStrategy extends BaseExplodeStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
deleted file mode 100644
index 0452792..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\SerializableStrategy as BaseSerializableStrategy;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\SerializableStrategy from zendframework/zend-hydrator instead.
- */
-class SerializableStrategy extends BaseSerializableStrategy implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
deleted file mode 100644
index 33d2bc1..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\StrategyChain as BaseStrategyChain;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyChain from zendframework/zend-hydrator instead.
- */
-class StrategyChain extends BaseStrategyChain implements StrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
deleted file mode 100644
index a1eb8e9..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator\Strategy;
-
-use Zend\Hydrator\Strategy\StrategyInterface as BaseStrategyInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyInterface from zendframework/zend-hydrator instead.
- */
-interface StrategyInterface extends BaseStrategyInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php b/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
deleted file mode 100644
index 9c058a71..0000000
--- a/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\Hydrator;
-
-use Zend\Hydrator\StrategyEnabledInterface as BaseStrategyEnabledInterface;
-
-/**
- * @deprecated Use Zend\Hydrator\Strategy\StrategyEnabledInterface from zendframework/zend-hydrator instead.
- */
-interface StrategyEnabledInterface extends BaseStrategyEnabledInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/InitializableInterface.php b/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
deleted file mode 100644
index f78bede..0000000
--- a/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-/**
- * Interface to allow objects to have initialization logic
- */
-interface InitializableInterface
-{
-    /**
-     * Init an object
-     *
-     * @return void
-     */
-    public function init();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/JsonSerializable.php b/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
deleted file mode 100644
index 16cc244..0000000
--- a/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface JsonSerializable extends \JsonSerializable
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Message.php b/vendor/zendframework/zend-stdlib/src/Message.php
deleted file mode 100644
index 12d5bb3..0000000
--- a/vendor/zendframework/zend-stdlib/src/Message.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Traversable;
-
-class Message implements MessageInterface
-{
-    /**
-     * @var array
-     */
-    protected $metadata = [];
-
-    /**
-     * @var string
-     */
-    protected $content = '';
-
-    /**
-     * Set message metadata
-     *
-     * Non-destructive setting of message metadata; always adds to the metadata, never overwrites
-     * the entire metadata container.
-     *
-     * @param  string|int|array|Traversable $spec
-     * @param  mixed $value
-     * @throws Exception\InvalidArgumentException
-     * @return Message
-     */
-    public function setMetadata($spec, $value = null)
-    {
-        if (is_scalar($spec)) {
-            $this->metadata[$spec] = $value;
-            return $this;
-        }
-        if (!is_array($spec) && !$spec instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected a string, array, or Traversable argument in first position; received "%s"',
-                (is_object($spec) ? get_class($spec) : gettype($spec))
-            ));
-        }
-        foreach ($spec as $key => $value) {
-            $this->metadata[$key] = $value;
-        }
-        return $this;
-    }
-
-    /**
-     * Retrieve all metadata or a single metadatum as specified by key
-     *
-     * @param  null|string|int $key
-     * @param  null|mixed $default
-     * @throws Exception\InvalidArgumentException
-     * @return mixed
-     */
-    public function getMetadata($key = null, $default = null)
-    {
-        if (null === $key) {
-            return $this->metadata;
-        }
-
-        if (!is_scalar($key)) {
-            throw new Exception\InvalidArgumentException('Non-scalar argument provided for key');
-        }
-
-        if (array_key_exists($key, $this->metadata)) {
-            return $this->metadata[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Set message content
-     *
-     * @param  mixed $value
-     * @return Message
-     */
-    public function setContent($value)
-    {
-        $this->content = $value;
-        return $this;
-    }
-
-    /**
-     * Get message content
-     *
-     * @return mixed
-     */
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        $request = '';
-        foreach ($this->getMetadata() as $key => $value) {
-            $request .= sprintf(
-                "%s: %s\r\n",
-                (string) $key,
-                (string) $value
-            );
-        }
-        $request .= "\r\n" . $this->getContent();
-        return $request;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/MessageInterface.php b/vendor/zendframework/zend-stdlib/src/MessageInterface.php
deleted file mode 100644
index 28d8857..0000000
--- a/vendor/zendframework/zend-stdlib/src/MessageInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface MessageInterface
-{
-    /**
-     * Set metadata
-     *
-     * @param  string|int|array|\Traversable $spec
-     * @param  mixed $value
-     */
-    public function setMetadata($spec, $value = null);
-
-    /**
-     * Get metadata
-     *
-     * @param  null|string|int $key
-     * @return mixed
-     */
-    public function getMetadata($key = null);
-
-    /**
-     * Set content
-     *
-     * @param  mixed $content
-     * @return mixed
-     */
-    public function setContent($content);
-
-    /**
-     * Get content
-     *
-     * @return mixed
-     */
-    public function getContent();
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php b/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
deleted file mode 100644
index 676a6e2..0000000
--- a/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface ParameterObjectInterface
-{
-    /**
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($key, $value);
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public function __get($key);
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-    public function __isset($key);
-
-    /**
-     * @param string $key
-     * @return void
-     */
-    public function __unset($key);
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Parameters.php b/vendor/zendframework/zend-stdlib/src/Parameters.php
deleted file mode 100644
index ab5ada9..0000000
--- a/vendor/zendframework/zend-stdlib/src/Parameters.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ArrayObject as PhpArrayObject;
-
-class Parameters extends PhpArrayObject implements ParametersInterface
-{
-    /**
-     * Constructor
-     *
-     * Enforces that we have an array, and enforces parameter access to array
-     * elements.
-     *
-     * @param  array $values
-     */
-    public function __construct(array $values = null)
-    {
-        if (null === $values) {
-            $values = [];
-        }
-        parent::__construct($values, ArrayObject::ARRAY_AS_PROPS);
-    }
-
-    /**
-     * Populate from native PHP array
-     *
-     * @param  array $values
-     * @return void
-     */
-    public function fromArray(array $values)
-    {
-        $this->exchangeArray($values);
-    }
-
-    /**
-     * Populate from query string
-     *
-     * @param  string $string
-     * @return void
-     */
-    public function fromString($string)
-    {
-        $array = [];
-        parse_str($string, $array);
-        $this->fromArray($array);
-    }
-
-    /**
-     * Serialize to native PHP array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->getArrayCopy();
-    }
-
-    /**
-     * Serialize to query string
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return http_build_query($this);
-    }
-
-    /**
-     * Retrieve by key
-     *
-     * Returns null if the key does not exist.
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function offsetGet($name)
-    {
-        if ($this->offsetExists($name)) {
-            return parent::offsetGet($name);
-        }
-        return;
-    }
-
-    /**
-     * @param string $name
-     * @param mixed $default optional default value
-     * @return mixed
-     */
-    public function get($name, $default = null)
-    {
-        if ($this->offsetExists($name)) {
-            return parent::offsetGet($name);
-        }
-        return $default;
-    }
-
-    /**
-     * @param string $name
-     * @param mixed $value
-     * @return Parameters
-     */
-    public function set($name, $value)
-    {
-        $this[$name] = $value;
-        return $this;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ParametersInterface.php b/vendor/zendframework/zend-stdlib/src/ParametersInterface.php
deleted file mode 100644
index feeda58..0000000
--- a/vendor/zendframework/zend-stdlib/src/ParametersInterface.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use ArrayAccess;
-use Countable;
-use Serializable;
-use Traversable;
-
-/*
- * Basically, an ArrayObject. You could simply define something like:
- *     class QueryParams extends ArrayObject implements Parameters {}
- * and have 90% of the functionality
- */
-interface ParametersInterface extends ArrayAccess, Countable, Serializable, Traversable
-{
-    /**
-     * Constructor
-     *
-     * @param array $values
-     */
-    public function __construct(array $values = null);
-
-    /**
-     * From array
-     *
-     * Allow deserialization from standard array
-     *
-     * @param array $values
-     * @return mixed
-     */
-    public function fromArray(array $values);
-
-    /**
-     * From string
-     *
-     * Allow deserialization from raw body; e.g., for PUT requests
-     *
-     * @param $string
-     * @return mixed
-     */
-    public function fromString($string);
-
-    /**
-     * To array
-     *
-     * Allow serialization back to standard array
-     *
-     * @return mixed
-     */
-    public function toArray();
-
-    /**
-     * To string
-     *
-     * Allow serialization to query format; e.g., for PUT or POST requests
-     *
-     * @return mixed
-     */
-    public function toString();
-
-    /**
-     * Get
-     *
-     * @param string $name
-     * @param mixed|null $default
-     * @return mixed
-     */
-    public function get($name, $default = null);
-
-    /**
-     * Set
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return ParametersInterface
-     */
-    public function set($name, $value);
-}
diff --git a/vendor/zendframework/zend-stdlib/src/PriorityList.php b/vendor/zendframework/zend-stdlib/src/PriorityList.php
deleted file mode 100644
index b318f26..0000000
--- a/vendor/zendframework/zend-stdlib/src/PriorityList.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Countable;
-use Iterator;
-
-class PriorityList implements Iterator, Countable
-{
-    const EXTR_DATA     = 0x00000001;
-    const EXTR_PRIORITY = 0x00000002;
-    const EXTR_BOTH     = 0x00000003;
-    /**
-     * Internal list of all items.
-     *
-     * @var array[]
-     */
-    protected $items = [];
-
-    /**
-     * Serial assigned to items to preserve LIFO.
-     *
-     * @var int
-     */
-    protected $serial = 0;
-
-    /**
-     * Serial order mode
-     * @var integer
-     */
-    protected $isLIFO = 1;
-
-    /**
-     * Internal counter to avoid usage of count().
-     *
-     * @var int
-     */
-    protected $count = 0;
-
-    /**
-     * Whether the list was already sorted.
-     *
-     * @var bool
-     */
-    protected $sorted = false;
-
-    /**
-     * Insert a new item.
-     *
-     * @param  string  $name
-     * @param  mixed   $value
-     * @param  int     $priority
-     *
-     * @return void
-     */
-    public function insert($name, $value, $priority = 0)
-    {
-        if (!isset($this->items[$name])) {
-            $this->count++;
-        }
-
-        $this->sorted = false;
-
-        $this->items[$name] = [
-            'data'     => $value,
-            'priority' => (int) $priority,
-            'serial'   => $this->serial++,
-        ];
-    }
-
-    /**
-     * @param string $name
-     * @param int    $priority
-     *
-     * @return $this
-     *
-     * @throws \Exception
-     */
-    public function setPriority($name, $priority)
-    {
-        if (!isset($this->items[$name])) {
-            throw new \Exception("item $name not found");
-        }
-
-        $this->items[$name]['priority'] = (int) $priority;
-        $this->sorted                   = false;
-
-        return $this;
-    }
-
-    /**
-     * Remove a item.
-     *
-     * @param  string $name
-     * @return void
-     */
-    public function remove($name)
-    {
-        if (isset($this->items[$name])) {
-            $this->count--;
-        }
-
-        unset($this->items[$name]);
-    }
-
-    /**
-     * Remove all items.
-     *
-     * @return void
-     */
-    public function clear()
-    {
-        $this->items  = [];
-        $this->serial = 0;
-        $this->count  = 0;
-        $this->sorted = false;
-    }
-
-    /**
-     * Get a item.
-     *
-     * @param  string $name
-     * @return mixed
-     */
-    public function get($name)
-    {
-        if (!isset($this->items[$name])) {
-            return;
-        }
-
-        return $this->items[$name]['data'];
-    }
-
-    /**
-     * Sort all items.
-     *
-     * @return void
-     */
-    protected function sort()
-    {
-        if (!$this->sorted) {
-            uasort($this->items, [$this, 'compare']);
-            $this->sorted = true;
-        }
-    }
-
-    /**
-     * Compare the priority of two items.
-     *
-     * @param  array $item1,
-     * @param  array $item2
-     * @return int
-     */
-    protected function compare(array $item1, array $item2)
-    {
-        return ($item1['priority'] === $item2['priority'])
-            ? ($item1['serial']   > $item2['serial']   ? -1 : 1) * $this->isLIFO
-            : ($item1['priority'] > $item2['priority'] ? -1 : 1);
-    }
-
-    /**
-     * Get/Set serial order mode
-     *
-     * @param bool|null $flag
-     *
-     * @return bool
-     */
-    public function isLIFO($flag = null)
-    {
-        if ($flag !== null) {
-            $isLifo = $flag === true ? 1 : -1;
-
-            if ($isLifo !== $this->isLIFO) {
-                $this->isLIFO = $isLifo;
-                $this->sorted = false;
-            }
-        }
-
-        return 1 === $this->isLIFO;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function rewind()
-    {
-        $this->sort();
-        reset($this->items);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function current()
-    {
-        $this->sorted || $this->sort();
-        $node = current($this->items);
-
-        return $node ? $node['data'] : false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function key()
-    {
-        $this->sorted || $this->sort();
-        return key($this->items);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function next()
-    {
-        $node = next($this->items);
-
-        return $node ? $node['data'] : false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function valid()
-    {
-        return current($this->items) !== false;
-    }
-
-    /**
-     * @return self
-     */
-    public function getIterator()
-    {
-        return clone $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function count()
-    {
-        return $this->count;
-    }
-
-    /**
-     * Return list as array
-     *
-     * @param int $flag
-     *
-     * @return array
-     */
-    public function toArray($flag = self::EXTR_DATA)
-    {
-        $this->sort();
-
-        if ($flag == self::EXTR_BOTH) {
-            return $this->items;
-        }
-
-        return array_map(
-            function ($item) use ($flag) {
-                return ($flag == PriorityList::EXTR_PRIORITY) ? $item['priority'] : $item['data'];
-            },
-            $this->items
-        );
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/PriorityQueue.php b/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
deleted file mode 100644
index eded6ad..0000000
--- a/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Countable;
-use IteratorAggregate;
-use Serializable;
-
-/**
- * Re-usable, serializable priority queue implementation
- *
- * SplPriorityQueue acts as a heap; on iteration, each item is removed from the
- * queue. If you wish to re-use such a queue, you need to clone it first. This
- * makes for some interesting issues if you wish to delete items from the queue,
- * or, as already stated, iterate over it multiple times.
- *
- * This class aggregates items for the queue itself, but also composes an
- * "inner" iterator in the form of an SplPriorityQueue object for performing
- * the actual iteration.
- */
-class PriorityQueue implements Countable, IteratorAggregate, Serializable
-{
-    const EXTR_DATA     = 0x00000001;
-    const EXTR_PRIORITY = 0x00000002;
-    const EXTR_BOTH     = 0x00000003;
-
-    /**
-     * Inner queue class to use for iteration
-     * @var string
-     */
-    protected $queueClass = 'Zend\Stdlib\SplPriorityQueue';
-
-    /**
-     * Actual items aggregated in the priority queue. Each item is an array
-     * with keys "data" and "priority".
-     * @var array
-     */
-    protected $items      = [];
-
-    /**
-     * Inner queue object
-     * @var SplPriorityQueue
-     */
-    protected $queue;
-
-    /**
-     * Insert an item into the queue
-     *
-     * Priority defaults to 1 (low priority) if none provided.
-     *
-     * @param  mixed $data
-     * @param  int $priority
-     * @return PriorityQueue
-     */
-    public function insert($data, $priority = 1)
-    {
-        $priority = (int) $priority;
-        $this->items[] = [
-            'data'     => $data,
-            'priority' => $priority,
-        ];
-        $this->getQueue()->insert($data, $priority);
-        return $this;
-    }
-
-    /**
-     * Remove an item from the queue
-     *
-     * This is different than {@link extract()}; its purpose is to dequeue an
-     * item.
-     *
-     * This operation is potentially expensive, as it requires
-     * re-initialization and re-population of the inner queue.
-     *
-     * Note: this removes the first item matching the provided item found. If
-     * the same item has been added multiple times, it will not remove other
-     * instances.
-     *
-     * @param  mixed $datum
-     * @return bool False if the item was not found, true otherwise.
-     */
-    public function remove($datum)
-    {
-        $found = false;
-        foreach ($this->items as $key => $item) {
-            if ($item['data'] === $datum) {
-                $found = true;
-                break;
-            }
-        }
-        if ($found) {
-            unset($this->items[$key]);
-            $this->queue = null;
-
-            if (!$this->isEmpty()) {
-                $queue = $this->getQueue();
-                foreach ($this->items as $item) {
-                    $queue->insert($item['data'], $item['priority']);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Is the queue empty?
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return (0 === $this->count());
-    }
-
-    /**
-     * How many items are in the queue?
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->items);
-    }
-
-    /**
-     * Peek at the top node in the queue, based on priority.
-     *
-     * @return mixed
-     */
-    public function top()
-    {
-        return $this->getIterator()->top();
-    }
-
-    /**
-     * Extract a node from the inner queue and sift up
-     *
-     * @return mixed
-     */
-    public function extract()
-    {
-        return $this->getQueue()->extract();
-    }
-
-    /**
-     * Retrieve the inner iterator
-     *
-     * SplPriorityQueue acts as a heap, which typically implies that as items
-     * are iterated, they are also removed. This does not work for situations
-     * where the queue may be iterated multiple times. As such, this class
-     * aggregates the values, and also injects an SplPriorityQueue. This method
-     * retrieves the inner queue object, and clones it for purposes of
-     * iteration.
-     *
-     * @return SplPriorityQueue
-     */
-    public function getIterator()
-    {
-        $queue = $this->getQueue();
-        return clone $queue;
-    }
-
-    /**
-     * Serialize the data structure
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize($this->items);
-    }
-
-    /**
-     * Unserialize a string into a PriorityQueue object
-     *
-     * Serialization format is compatible with {@link Zend\Stdlib\SplPriorityQueue}
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        foreach (unserialize($data) as $item) {
-            $this->insert($item['data'], $item['priority']);
-        }
-    }
-
-    /**
-     * Serialize to an array
-     *
-     * By default, returns only the item data, and in the order registered (not
-     * sorted). You may provide one of the EXTR_* flags as an argument, allowing
-     * the ability to return priorities or both data and priority.
-     *
-     * @param  int $flag
-     * @return array
-     */
-    public function toArray($flag = self::EXTR_DATA)
-    {
-        switch ($flag) {
-            case self::EXTR_BOTH:
-                return $this->items;
-            case self::EXTR_PRIORITY:
-                return array_map(function ($item) {
-                    return $item['priority'];
-                }, $this->items);
-            case self::EXTR_DATA:
-            default:
-                return array_map(function ($item) {
-                    return $item['data'];
-                }, $this->items);
-        }
-    }
-
-    /**
-     * Specify the internal queue class
-     *
-     * Please see {@link getIterator()} for details on the necessity of an
-     * internal queue class. The class provided should extend SplPriorityQueue.
-     *
-     * @param  string $class
-     * @return PriorityQueue
-     */
-    public function setInternalQueueClass($class)
-    {
-        $this->queueClass = (string) $class;
-        return $this;
-    }
-
-    /**
-     * Does the queue contain the given datum?
-     *
-     * @param  mixed $datum
-     * @return bool
-     */
-    public function contains($datum)
-    {
-        foreach ($this->items as $item) {
-            if ($item['data'] === $datum) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Does the queue have an item with the given priority?
-     *
-     * @param  int $priority
-     * @return bool
-     */
-    public function hasPriority($priority)
-    {
-        foreach ($this->items as $item) {
-            if ($item['priority'] === $priority) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the inner priority queue instance
-     *
-     * @throws Exception\DomainException
-     * @return SplPriorityQueue
-     */
-    protected function getQueue()
-    {
-        if (null === $this->queue) {
-            $this->queue = new $this->queueClass();
-            if (!$this->queue instanceof \SplPriorityQueue) {
-                throw new Exception\DomainException(sprintf(
-                    'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"',
-                    get_class($this->queue)
-                ));
-            }
-        }
-        return $this->queue;
-    }
-
-    /**
-     * Add support for deep cloning
-     *
-     * @return void
-     */
-    public function __clone()
-    {
-        if (null !== $this->queue) {
-            $this->queue = clone $this->queue;
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Request.php b/vendor/zendframework/zend-stdlib/src/Request.php
deleted file mode 100644
index 7c08403..0000000
--- a/vendor/zendframework/zend-stdlib/src/Request.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-class Request extends Message implements RequestInterface
-{
-    // generic request implementation
-}
diff --git a/vendor/zendframework/zend-stdlib/src/RequestInterface.php b/vendor/zendframework/zend-stdlib/src/RequestInterface.php
deleted file mode 100644
index c2bac31..0000000
--- a/vendor/zendframework/zend-stdlib/src/RequestInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface RequestInterface extends MessageInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/Response.php b/vendor/zendframework/zend-stdlib/src/Response.php
deleted file mode 100644
index f3074ba..0000000
--- a/vendor/zendframework/zend-stdlib/src/Response.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-class Response extends Message implements ResponseInterface
-{
-    // generic response implementation
-}
diff --git a/vendor/zendframework/zend-stdlib/src/ResponseInterface.php b/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
deleted file mode 100644
index fe94d30..0000000
--- a/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-interface ResponseInterface extends MessageInterface
-{
-}
diff --git a/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php b/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
deleted file mode 100644
index 28b365d..0000000
--- a/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Serializable;
-
-/**
- * Serializable version of SplPriorityQueue
- *
- * Also, provides predictable heap order for datums added with the same priority
- * (i.e., they will be emitted in the same order they are enqueued).
- */
-class SplPriorityQueue extends \SplPriorityQueue implements Serializable
-{
-    /**
-     * @var int Seed used to ensure queue order for items of the same priority
-     */
-    protected $serial = PHP_INT_MAX;
-
-    /**
-     * Insert a value with a given priority
-     *
-     * Utilizes {@var $serial} to ensure that values of equal priority are
-     * emitted in the same order in which they are inserted.
-     *
-     * @param  mixed $datum
-     * @param  mixed $priority
-     * @return void
-     */
-    public function insert($datum, $priority)
-    {
-        if (!is_array($priority)) {
-            $priority = [$priority, $this->serial--];
-        }
-        parent::insert($datum, $priority);
-    }
-
-    /**
-     * Serialize to an array
-     *
-     * Array will be priority => data pairs
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = [];
-        foreach (clone $this as $item) {
-            $array[] = $item;
-        }
-        return $array;
-    }
-
-    /**
-     * Serialize
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        $clone = clone $this;
-        $clone->setExtractFlags(self::EXTR_BOTH);
-
-        $data = [];
-        foreach ($clone as $item) {
-            $data[] = $item;
-        }
-
-        return serialize($data);
-    }
-
-    /**
-     * Deserialize
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        foreach (unserialize($data) as $item) {
-            $this->insert($item['data'], $item['priority']);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/SplQueue.php b/vendor/zendframework/zend-stdlib/src/SplQueue.php
deleted file mode 100644
index 51d8daf..0000000
--- a/vendor/zendframework/zend-stdlib/src/SplQueue.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Serializable;
-
-/**
- * Serializable version of SplQueue
- */
-class SplQueue extends \SplQueue implements Serializable
-{
-    /**
-     * Return an array representing the queue
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = [];
-        foreach ($this as $item) {
-            $array[] = $item;
-        }
-        return $array;
-    }
-
-    /**
-     * Serialize
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize($this->toArray());
-    }
-
-    /**
-     * Unserialize
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        foreach (unserialize($data) as $item) {
-            $this->push($item);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/SplStack.php b/vendor/zendframework/zend-stdlib/src/SplStack.php
deleted file mode 100644
index 6ba2739..0000000
--- a/vendor/zendframework/zend-stdlib/src/SplStack.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Serializable;
-
-/**
- * Serializable version of SplStack
- */
-class SplStack extends \SplStack implements Serializable
-{
-    /**
-     * Serialize to an array representing the stack
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $array = [];
-        foreach ($this as $item) {
-            $array[] = $item;
-        }
-        return $array;
-    }
-
-    /**
-     * Serialize
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize($this->toArray());
-    }
-
-    /**
-     * Unserialize
-     *
-     * @param  string $data
-     * @return void
-     */
-    public function unserialize($data)
-    {
-        foreach (unserialize($data) as $item) {
-            $this->unshift($item);
-        }
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringUtils.php b/vendor/zendframework/zend-stdlib/src/StringUtils.php
deleted file mode 100644
index 575cf2a..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringUtils.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib;
-
-use Zend\Stdlib\StringWrapper\StringWrapperInterface;
-
-/**
- * Utility class for handling strings of different character encodings
- * using available PHP extensions.
- *
- * Declared abstract, as we have no need for instantiation.
- */
-abstract class StringUtils
-{
-    /**
-     * Ordered list of registered string wrapper instances
-     *
-     * @var StringWrapperInterface[]
-     */
-    protected static $wrapperRegistry = null;
-
-    /**
-     * A list of known single-byte character encodings (upper-case)
-     *
-     * @var string[]
-     */
-    protected static $singleByteEncodings = [
-        'ASCII', '7BIT', '8BIT',
-        'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4', 'ISO-8859-5',
-        'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9', 'ISO-8859-10',
-        'ISO-8859-11', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
-        'CP-1251', 'CP-1252',
-        // TODO
-    ];
-
-    /**
-     * Is PCRE compiled with Unicode support?
-     *
-     * @var bool
-     **/
-    protected static $hasPcreUnicodeSupport = null;
-
-    /**
-     * Get registered wrapper classes
-     *
-     * @return string[]
-     */
-    public static function getRegisteredWrappers()
-    {
-        if (static::$wrapperRegistry === null) {
-            static::$wrapperRegistry = [];
-
-            if (extension_loaded('intl')) {
-                static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Intl';
-            }
-
-            if (extension_loaded('mbstring')) {
-                static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\MbString';
-            }
-
-            if (extension_loaded('iconv')) {
-                static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Iconv';
-            }
-
-            static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Native';
-        }
-
-        return static::$wrapperRegistry;
-    }
-
-    /**
-     * Register a string wrapper class
-     *
-     * @param string $wrapper
-     * @return void
-     */
-    public static function registerWrapper($wrapper)
-    {
-        $wrapper = (string) $wrapper;
-        if (!in_array($wrapper, static::$wrapperRegistry, true)) {
-            static::$wrapperRegistry[] = $wrapper;
-        }
-    }
-
-    /**
-     * Unregister a string wrapper class
-     *
-     * @param string $wrapper
-     * @return void
-     */
-    public static function unregisterWrapper($wrapper)
-    {
-        $index = array_search((string) $wrapper, static::$wrapperRegistry, true);
-        if ($index !== false) {
-            unset(static::$wrapperRegistry[$index]);
-        }
-    }
-
-    /**
-     * Reset all registered wrappers so the default wrappers will be used
-     *
-     * @return void
-     */
-    public static function resetRegisteredWrappers()
-    {
-        static::$wrapperRegistry = null;
-    }
-
-    /**
-     * Get the first string wrapper supporting the given character encoding
-     * and supports to convert into the given convert encoding.
-     *
-     * @param string      $encoding        Character encoding to support
-     * @param string|null $convertEncoding OPTIONAL character encoding to convert in
-     * @return StringWrapperInterface
-     * @throws Exception\RuntimeException If no wrapper supports given character encodings
-     */
-    public static function getWrapper($encoding = 'UTF-8', $convertEncoding = null)
-    {
-        foreach (static::getRegisteredWrappers() as $wrapperClass) {
-            if ($wrapperClass::isSupported($encoding, $convertEncoding)) {
-                $wrapper = new $wrapperClass($encoding, $convertEncoding);
-                $wrapper->setEncoding($encoding, $convertEncoding);
-                return $wrapper;
-            }
-        }
-
-        throw new Exception\RuntimeException(
-            'No wrapper found supporting "' . $encoding . '"'
-            . (($convertEncoding !== null) ? ' and "' . $convertEncoding . '"' : '')
-        );
-    }
-
-    /**
-     * Get a list of all known single-byte character encodings
-     *
-     * @return string[]
-     */
-    public static function getSingleByteEncodings()
-    {
-        return static::$singleByteEncodings;
-    }
-
-    /**
-     * Check if a given encoding is a known single-byte character encoding
-     *
-     * @param string $encoding
-     * @return bool
-     */
-    public static function isSingleByteEncoding($encoding)
-    {
-        return in_array(strtoupper($encoding), static::$singleByteEncodings);
-    }
-
-    /**
-     * Check if a given string is valid UTF-8 encoded
-     *
-     * @param string $str
-     * @return bool
-     */
-    public static function isValidUtf8($str)
-    {
-        return is_string($str) && ($str === '' || preg_match('/^./su', $str) == 1);
-    }
-
-    /**
-     * Is PCRE compiled with Unicode support?
-     *
-     * @return bool
-     */
-    public static function hasPcreUnicodeSupport()
-    {
-        if (static::$hasPcreUnicodeSupport === null) {
-            ErrorHandler::start();
-            static::$hasPcreUnicodeSupport = defined('PREG_BAD_UTF8_OFFSET_ERROR') && preg_match('/\pL/u', 'a') == 1;
-            ErrorHandler::stop();
-        }
-        return static::$hasPcreUnicodeSupport;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
deleted file mode 100644
index 3e395cc..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\StringUtils;
-
-abstract class AbstractStringWrapper implements StringWrapperInterface
-{
-    /**
-     * The character encoding working on
-     * @var string|null
-     */
-    protected $encoding = 'UTF-8';
-
-    /**
-     * An optionally character encoding to convert to
-     * @var string|null
-     */
-    protected $convertEncoding;
-
-    /**
-     * Check if the given character encoding is supported by this wrapper
-     * and the character encoding to convert to is also supported.
-     *
-     * @param  string      $encoding
-     * @param  string|null $convertEncoding
-     * @return bool
-     */
-    public static function isSupported($encoding, $convertEncoding = null)
-    {
-        $supportedEncodings = static::getSupportedEncodings();
-
-        if (!in_array(strtoupper($encoding), $supportedEncodings)) {
-            return false;
-        }
-
-        if ($convertEncoding !== null && !in_array(strtoupper($convertEncoding), $supportedEncodings)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Set character encoding working with and convert to
-     *
-     * @param string      $encoding         The character encoding to work with
-     * @param string|null $convertEncoding  The character encoding to convert to
-     * @return StringWrapperInterface
-     */
-    public function setEncoding($encoding, $convertEncoding = null)
-    {
-        $supportedEncodings = static::getSupportedEncodings();
-
-        $encodingUpper = strtoupper($encoding);
-        if (!in_array($encodingUpper, $supportedEncodings)) {
-            throw new Exception\InvalidArgumentException(
-                'Wrapper doesn\'t support character encoding "' . $encoding . '"'
-            );
-        }
-
-        if ($convertEncoding !== null) {
-            $convertEncodingUpper = strtoupper($convertEncoding);
-            if (!in_array($convertEncodingUpper, $supportedEncodings)) {
-                throw new Exception\InvalidArgumentException(
-                    'Wrapper doesn\'t support character encoding "' . $convertEncoding . '"'
-                );
-            }
-
-            $this->convertEncoding = $convertEncodingUpper;
-        } else {
-            $this->convertEncoding = null;
-        }
-        $this->encoding = $encodingUpper;
-
-        return $this;
-    }
-
-    /**
-     * Get the defined character encoding to work with
-     *
-     * @return string
-     * @throws Exception\LogicException If no encoding was defined
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Get the defined character encoding to convert to
-     *
-     * @return string|null
-    */
-    public function getConvertEncoding()
-    {
-        return $this->convertEncoding;
-    }
-
-    /**
-     * Convert a string from defined character encoding to the defined convert encoding
-     *
-     * @param string  $str
-     * @param bool $reverse
-     * @return string|false
-     */
-    public function convert($str, $reverse = false)
-    {
-        $encoding        = $this->getEncoding();
-        $convertEncoding = $this->getConvertEncoding();
-        if ($convertEncoding === null) {
-            throw new Exception\LogicException(
-                'No convert encoding defined'
-            );
-        }
-
-        if ($encoding === $convertEncoding) {
-            return $str;
-        }
-
-        $from = $reverse ? $convertEncoding : $encoding;
-        $to   = $reverse ? $encoding : $convertEncoding;
-        throw new Exception\RuntimeException(sprintf(
-            'Converting from "%s" to "%s" isn\'t supported by this string wrapper',
-            $from,
-            $to
-        ));
-    }
-
-    /**
-     * Wraps a string to a given number of characters
-     *
-     * @param  string  $string
-     * @param  int $width
-     * @param  string  $break
-     * @param  bool $cut
-     * @return string|false
-     */
-    public function wordWrap($string, $width = 75, $break = "\n", $cut = false)
-    {
-        $string = (string) $string;
-        if ($string === '') {
-            return '';
-        }
-
-        $break = (string) $break;
-        if ($break === '') {
-            throw new Exception\InvalidArgumentException('Break string cannot be empty');
-        }
-
-        $width = (int) $width;
-        if ($width === 0 && $cut) {
-            throw new Exception\InvalidArgumentException('Cannot force cut when width is zero');
-        }
-
-        if (StringUtils::isSingleByteEncoding($this->getEncoding())) {
-            return wordwrap($string, $width, $break, $cut);
-        }
-
-        $stringWidth = $this->strlen($string);
-        $breakWidth  = $this->strlen($break);
-
-        $result    = '';
-        $lastStart = $lastSpace = 0;
-
-        for ($current = 0; $current < $stringWidth; $current++) {
-            $char = $this->substr($string, $current, 1);
-
-            $possibleBreak = $char;
-            if ($breakWidth !== 1) {
-                $possibleBreak = $this->substr($string, $current, $breakWidth);
-            }
-
-            if ($possibleBreak === $break) {
-                $result    .= $this->substr($string, $lastStart, $current - $lastStart + $breakWidth);
-                $current   += $breakWidth - 1;
-                $lastStart  = $lastSpace = $current + 1;
-                continue;
-            }
-
-            if ($char === ' ') {
-                if ($current - $lastStart >= $width) {
-                    $result    .= $this->substr($string, $lastStart, $current - $lastStart) . $break;
-                    $lastStart  = $current + 1;
-                }
-
-                $lastSpace = $current;
-                continue;
-            }
-
-            if ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) {
-                $result    .= $this->substr($string, $lastStart, $current - $lastStart) . $break;
-                $lastStart  = $lastSpace = $current;
-                continue;
-            }
-
-            if ($current - $lastStart >= $width && $lastStart < $lastSpace) {
-                $result    .= $this->substr($string, $lastStart, $lastSpace - $lastStart) . $break;
-                $lastStart  = $lastSpace = $lastSpace + 1;
-                continue;
-            }
-        }
-
-        if ($lastStart !== $current) {
-            $result .= $this->substr($string, $lastStart, $current - $lastStart);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Pad a string to a certain length with another string
-     *
-     * @param  string  $input
-     * @param  int $padLength
-     * @param  string  $padString
-     * @param  int $padType
-     * @return string
-     */
-    public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)
-    {
-        if (StringUtils::isSingleByteEncoding($this->getEncoding())) {
-            return str_pad($input, $padLength, $padString, $padType);
-        }
-
-        $lengthOfPadding = $padLength - $this->strlen($input);
-        if ($lengthOfPadding <= 0) {
-            return $input;
-        }
-
-        $padStringLength = $this->strlen($padString);
-        if ($padStringLength === 0) {
-            return $input;
-        }
-
-        $repeatCount = floor($lengthOfPadding / $padStringLength);
-
-        if ($padType === STR_PAD_BOTH) {
-            $repeatCountLeft = $repeatCountRight = ($repeatCount - $repeatCount % 2) / 2;
-
-            $lastStringLength       = $lengthOfPadding - 2 * $repeatCountLeft * $padStringLength;
-            $lastStringLeftLength   = $lastStringRightLength = floor($lastStringLength / 2);
-            $lastStringRightLength += $lastStringLength % 2;
-
-            $lastStringLeft  = $this->substr($padString, 0, $lastStringLeftLength);
-            $lastStringRight = $this->substr($padString, 0, $lastStringRightLength);
-
-            return str_repeat($padString, $repeatCountLeft) . $lastStringLeft
-                . $input
-                . str_repeat($padString, $repeatCountRight) . $lastStringRight;
-        }
-
-        $lastString = $this->substr($padString, 0, $lengthOfPadding % $padStringLength);
-
-        if ($padType === STR_PAD_LEFT) {
-            return str_repeat($padString, $repeatCount) . $lastString . $input;
-        }
-
-        return $input . str_repeat($padString, $repeatCount) . $lastString;
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
deleted file mode 100644
index 46413ab..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-use Zend\Stdlib\Exception;
-
-class Iconv extends AbstractStringWrapper
-{
-    /**
-     * List of supported character sets (upper case)
-     *
-     * @var string[]
-     * @link http://www.gnu.org/software/libiconv/
-     */
-    protected static $encodings = [
-        // European languages
-        'ASCII',
-        'ISO-8859-1',
-        'ISO-8859-2',
-        'ISO-8859-3',
-        'ISO-8859-4',
-        'ISO-8859-5',
-        'ISO-8859-7',
-        'ISO-8859-9',
-        'ISO-8859-10',
-        'ISO-8859-13',
-        'ISO-8859-14',
-        'ISO-8859-15',
-        'ISO-8859-16',
-        'KOI8-R',
-        'KOI8-U',
-        'KOI8-RU',
-        'CP1250',
-        'CP1251',
-        'CP1252',
-        'CP1253',
-        'CP1254',
-        'CP1257',
-        'CP850',
-        'CP866',
-        'CP1131',
-        'MACROMAN',
-        'MACCENTRALEUROPE',
-        'MACICELAND',
-        'MACCROATIAN',
-        'MACROMANIA',
-        'MACCYRILLIC',
-        'MACUKRAINE',
-        'MACGREEK',
-        'MACTURKISH',
-        'MACINTOSH',
-
-        // Semitic languages
-        'ISO-8859-6',
-        'ISO-8859-8',
-        'CP1255',
-        'CP1256',
-        'CP862',
-        'MACHEBREW',
-        'MACARABIC',
-
-        // Japanese
-        'EUC-JP',
-        'SHIFT_JIS',
-        'CP932',
-        'ISO-2022-JP',
-        'ISO-2022-JP-2',
-        'ISO-2022-JP-1',
-
-        // Chinese
-        'EUC-CN',
-        'HZ',
-        'GBK',
-        'CP936',
-        'GB18030',
-        'EUC-TW',
-        'BIG5',
-        'CP950',
-        'BIG5-HKSCS',
-        'BIG5-HKSCS:2004',
-        'BIG5-HKSCS:2001',
-        'BIG5-HKSCS:1999',
-        'ISO-2022-CN',
-        'ISO-2022-CN-EXT',
-
-        // Korean
-        'EUC-KR',
-        'CP949',
-        'ISO-2022-KR',
-        'JOHAB',
-
-        // Armenian
-        'ARMSCII-8',
-
-        // Georgian
-        'GEORGIAN-ACADEMY',
-        'GEORGIAN-PS',
-
-        // Tajik
-        'KOI8-T',
-
-        // Kazakh
-        'PT154',
-        'RK1048',
-
-        // Thai
-        'ISO-8859-11',
-        'TIS-620',
-        'CP874',
-        'MACTHAI',
-
-        // Laotian
-        'MULELAO-1',
-        'CP1133',
-
-        // Vietnamese
-        'VISCII',
-        'TCVN',
-        'CP1258',
-
-        // Platform specifics
-        'HP-ROMAN8',
-        'NEXTSTEP',
-
-        // Full Unicode
-        'UTF-8',
-        'UCS-2',
-        'UCS-2BE',
-        'UCS-2LE',
-        'UCS-4',
-        'UCS-4BE',
-        'UCS-4LE',
-        'UTF-16',
-        'UTF-16BE',
-        'UTF-16LE',
-        'UTF-32',
-        'UTF-32BE',
-        'UTF-32LE',
-        'UTF-7',
-        'C99',
-        'JAVA',
-
-        /* Commented out because that's internal encodings not existing in real world
-        // Full Unicode, in terms of uint16_t or uint32_t (with machine dependent endianness and alignment)
-        'UCS-2-INTERNAL',
-        'UCS-4-INTERNAL',
-
-        // Locale dependent, in terms of `char' or `wchar_t' (with machine dependent endianness and alignment,
-        // and with OS and locale dependent semantics)
-        'char',
-        'wchar_t',
-        '', // The empty encoding name is equivalent to "char": it denotes the locale dependent character encoding.
-        */
-
-        // When configured with the option --enable-extra-encodings,
-        // it also provides support for a few extra encodings:
-
-        // European languages
-        'CP437',
-        'CP737',
-        'CP775',
-        'CP852',
-        'CP853',
-        'CP855',
-        'CP857',
-        'CP858',
-        'CP860',
-        'CP861',
-        'CP863',
-        'CP865',
-        'CP869',
-        'CP1125',
-
-        // Semitic languages
-        'CP864',
-
-        // Japanese
-        'EUC-JISX0213',
-        'Shift_JISX0213',
-        'ISO-2022-JP-3',
-
-        // Chinese
-        'BIG5-2003', // (experimental)
-
-        // Turkmen
-        'TDS565',
-
-        // Platform specifics
-        'ATARIST',
-        'RISCOS-LATIN1',
-    ];
-
-    /**
-     * Get a list of supported character encodings
-     *
-     * @return string[]
-     */
-    public static function getSupportedEncodings()
-    {
-        return static::$encodings;
-    }
-
-    /**
-     * Constructor
-     *
-     * @throws Exception\ExtensionNotLoadedException
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('iconv')) {
-            throw new Exception\ExtensionNotLoadedException(
-                'PHP extension "iconv" is required for this wrapper'
-            );
-        }
-    }
-
-    /**
-     * Returns the length of the given string
-     *
-     * @param string $str
-     * @return int|false
-     */
-    public function strlen($str)
-    {
-        return iconv_strlen($str, $this->getEncoding());
-    }
-
-    /**
-     * Returns the portion of string specified by the start and length parameters
-     *
-     * @param string   $str
-     * @param int      $offset
-     * @param int|null $length
-     * @return string|false
-     */
-    public function substr($str, $offset = 0, $length = null)
-    {
-        return iconv_substr($str, $offset, $length, $this->getEncoding());
-    }
-
-    /**
-     * Find the position of the first occurrence of a substring in a string
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param int    $offset
-     * @return int|false
-     */
-    public function strpos($haystack, $needle, $offset = 0)
-    {
-        return iconv_strpos($haystack, $needle, $offset, $this->getEncoding());
-    }
-
-    /**
-     * Convert a string from defined encoding to the defined convert encoding
-     *
-     * @param string  $str
-     * @param bool $reverse
-     * @return string|false
-     */
-    public function convert($str, $reverse = false)
-    {
-        $encoding        = $this->getEncoding();
-        $convertEncoding = $this->getConvertEncoding();
-        if ($convertEncoding === null) {
-            throw new Exception\LogicException(
-                'No convert encoding defined'
-            );
-        }
-
-        if ($encoding === $convertEncoding) {
-            return $str;
-        }
-
-        $fromEncoding = $reverse ? $convertEncoding : $encoding;
-        $toEncoding   = $reverse ? $encoding : $convertEncoding;
-
-        // automatically add "//IGNORE" to not stop converting on invalid characters
-        // invalid characters triggers a notice anyway
-        return iconv($fromEncoding, $toEncoding . '//IGNORE', $str);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
deleted file mode 100644
index eaab28f..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-use Zend\Stdlib\Exception;
-
-class Intl extends AbstractStringWrapper
-{
-    /**
-     * List of supported character sets (upper case)
-     *
-     * @var string[]
-     */
-    protected static $encodings = ['UTF-8'];
-
-    /**
-     * Get a list of supported character encodings
-     *
-     * @return string[]
-     */
-    public static function getSupportedEncodings()
-    {
-        return static::$encodings;
-    }
-
-    /**
-     * Constructor
-     *
-     * @throws Exception\ExtensionNotLoadedException
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('intl')) {
-            throw new Exception\ExtensionNotLoadedException(
-                'PHP extension "intl" is required for this wrapper'
-            );
-        }
-    }
-
-    /**
-     * Returns the length of the given string
-     *
-     * @param string $str
-     * @return int|false
-     */
-    public function strlen($str)
-    {
-        return grapheme_strlen($str);
-    }
-
-    /**
-     * Returns the portion of string specified by the start and length parameters
-     *
-     * @param string   $str
-     * @param int      $offset
-     * @param int|null $length
-     * @return string|false
-     */
-    public function substr($str, $offset = 0, $length = null)
-    {
-        // Due fix of PHP #62759 The third argument returns an empty string if is 0 or null.
-        if ($length !== null) {
-            return grapheme_substr($str, $offset, $length);
-        }
-
-        return grapheme_substr($str, $offset);
-    }
-
-    /**
-     * Find the position of the first occurrence of a substring in a string
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param int    $offset
-     * @return int|false
-     */
-    public function strpos($haystack, $needle, $offset = 0)
-    {
-        return grapheme_strpos($haystack, $needle, $offset);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
deleted file mode 100644
index d6db185..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-use Zend\Stdlib\Exception;
-
-class MbString extends AbstractStringWrapper
-{
-    /**
-     * List of supported character sets (upper case)
-     *
-     * @var null|string[]
-     * @link http://php.net/manual/mbstring.supported-encodings.php
-     */
-    protected static $encodings = null;
-
-    /**
-     * Get a list of supported character encodings
-     *
-     * @return string[]
-     */
-    public static function getSupportedEncodings()
-    {
-        if (static::$encodings === null) {
-            static::$encodings = array_map('strtoupper', mb_list_encodings());
-
-            // FIXME: Converting € (UTF-8) to ISO-8859-16 gives a wrong result
-            $indexIso885916 = array_search('ISO-8859-16', static::$encodings, true);
-            if ($indexIso885916 !== false) {
-                unset(static::$encodings[$indexIso885916]);
-            }
-        }
-
-        return static::$encodings;
-    }
-
-    /**
-     * Constructor
-     *
-     * @throws Exception\ExtensionNotLoadedException
-     */
-    public function __construct()
-    {
-        if (!extension_loaded('mbstring')) {
-            throw new Exception\ExtensionNotLoadedException(
-                'PHP extension "mbstring" is required for this wrapper'
-            );
-        }
-    }
-
-    /**
-     * Returns the length of the given string
-     *
-     * @param string $str
-     * @return int|false
-     */
-    public function strlen($str)
-    {
-        return mb_strlen($str, $this->getEncoding());
-    }
-
-    /**
-     * Returns the portion of string specified by the start and length parameters
-     *
-     * @param string   $str
-     * @param int      $offset
-     * @param int|null $length
-     * @return string|false
-     */
-    public function substr($str, $offset = 0, $length = null)
-    {
-        return mb_substr($str, $offset, $length, $this->getEncoding());
-    }
-
-    /**
-     * Find the position of the first occurrence of a substring in a string
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param int    $offset
-     * @return int|false
-     */
-    public function strpos($haystack, $needle, $offset = 0)
-    {
-        return mb_strpos($haystack, $needle, $offset, $this->getEncoding());
-    }
-
-    /**
-     * Convert a string from defined encoding to the defined convert encoding
-     *
-     * @param string  $str
-     * @param bool $reverse
-     * @return string|false
-     */
-    public function convert($str, $reverse = false)
-    {
-        $encoding        = $this->getEncoding();
-        $convertEncoding = $this->getConvertEncoding();
-
-        if ($convertEncoding === null) {
-            throw new Exception\LogicException(
-                'No convert encoding defined'
-            );
-        }
-
-        if ($encoding === $convertEncoding) {
-            return $str;
-        }
-
-        $fromEncoding = $reverse ? $convertEncoding : $encoding;
-        $toEncoding   = $reverse ? $encoding : $convertEncoding;
-        return mb_convert_encoding($str, $toEncoding, $fromEncoding);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
deleted file mode 100644
index 38b3c10..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\StringUtils;
-
-class Native extends AbstractStringWrapper
-{
-    /**
-     * The character encoding working on
-     * (overwritten to change defaut encoding)
-     *
-     * @var string
-     */
-    protected $encoding = 'ASCII';
-
-    /**
-     * Check if the given character encoding is supported by this wrapper
-     * and the character encoding to convert to is also supported.
-     *
-     * @param  string      $encoding
-     * @param  string|null $convertEncoding
-     * @return bool
-     */
-    public static function isSupported($encoding, $convertEncoding = null)
-    {
-        $encodingUpper      = strtoupper($encoding);
-        $supportedEncodings = static::getSupportedEncodings();
-
-        if (!in_array($encodingUpper, $supportedEncodings)) {
-            return false;
-        }
-
-        // This adapter doesn't support to convert between encodings
-        if ($convertEncoding !== null && $encodingUpper !== strtoupper($convertEncoding)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get a list of supported character encodings
-     *
-     * @return string[]
-     */
-    public static function getSupportedEncodings()
-    {
-        return StringUtils::getSingleByteEncodings();
-    }
-
-    /**
-     * Set character encoding working with and convert to
-     *
-     * @param string      $encoding         The character encoding to work with
-     * @param string|null $convertEncoding  The character encoding to convert to
-     * @return StringWrapperInterface
-     */
-    public function setEncoding($encoding, $convertEncoding = null)
-    {
-        $supportedEncodings = static::getSupportedEncodings();
-
-        $encodingUpper = strtoupper($encoding);
-        if (!in_array($encodingUpper, $supportedEncodings)) {
-            throw new Exception\InvalidArgumentException(
-                'Wrapper doesn\'t support character encoding "' . $encoding . '"'
-            );
-        }
-
-        if ($encodingUpper !== strtoupper($convertEncoding)) {
-            $this->convertEncoding = $encodingUpper;
-        }
-
-        if ($convertEncoding !== null) {
-            if ($encodingUpper !== strtoupper($convertEncoding)) {
-                throw new Exception\InvalidArgumentException(
-                    'Wrapper doesn\'t support to convert between character encodings'
-                );
-            }
-
-            $this->convertEncoding = $encodingUpper;
-        } else {
-            $this->convertEncoding = null;
-        }
-        $this->encoding = $encodingUpper;
-
-        return $this;
-    }
-
-    /**
-     * Returns the length of the given string
-     *
-     * @param string $str
-     * @return int|false
-     */
-    public function strlen($str)
-    {
-        return strlen($str);
-    }
-
-    /**
-     * Returns the portion of string specified by the start and length parameters
-     *
-     * @param string   $str
-     * @param int      $offset
-     * @param int|null $length
-     * @return string|false
-     */
-    public function substr($str, $offset = 0, $length = null)
-    {
-        return substr($str, $offset, $length);
-    }
-
-    /**
-     * Find the position of the first occurrence of a substring in a string
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param int    $offset
-     * @return int|false
-     */
-    public function strpos($haystack, $needle, $offset = 0)
-    {
-        return strpos($haystack, $needle, $offset);
-    }
-}
diff --git a/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php b/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
deleted file mode 100644
index f25b325..0000000
--- a/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\StringWrapper;
-
-interface StringWrapperInterface
-{
-    /**
-     * Check if the given character encoding is supported by this wrapper
-     * and the character encoding to convert to is also supported.
-     *
-     * @param string      $encoding
-     * @param string|null $convertEncoding
-     */
-    public static function isSupported($encoding, $convertEncoding = null);
-
-    /**
-     * Get a list of supported character encodings
-     *
-     * @return string[]
-     */
-    public static function getSupportedEncodings();
-
-    /**
-     * Set character encoding working with and convert to
-     *
-     * @param string      $encoding         The character encoding to work with
-     * @param string|null $convertEncoding  The character encoding to convert to
-     * @return StringWrapperInterface
-     */
-    public function setEncoding($encoding, $convertEncoding = null);
-
-    /**
-     * Get the defined character encoding to work with (upper case)
-     *
-     * @return string
-     */
-    public function getEncoding();
-
-    /**
-     * Get the defined character encoding to convert to (upper case)
-     *
-     * @return string|null
-     */
-    public function getConvertEncoding();
-
-    /**
-     * Returns the length of the given string
-     *
-     * @param string $str
-     * @return int|false
-     */
-    public function strlen($str);
-
-    /**
-     * Returns the portion of string specified by the start and length parameters
-     *
-     * @param string   $str
-     * @param int      $offset
-     * @param int|null $length
-     * @return string|false
-     */
-    public function substr($str, $offset = 0, $length = null);
-
-    /**
-     * Find the position of the first occurrence of a substring in a string
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param int    $offset
-     * @return int|false
-     */
-    public function strpos($haystack, $needle, $offset = 0);
-
-    /**
-     * Convert a string from defined encoding to the defined convert encoding
-     *
-     * @param string  $str
-     * @param bool $reverse
-     * @return string|false
-     */
-    public function convert($str, $reverse = false);
-
-    /**
-     * Wraps a string to a given number of characters
-     *
-     * @param  string  $str
-     * @param  int $width
-     * @param  string  $break
-     * @param  bool $cut
-     * @return string
-     */
-    public function wordWrap($str, $width = 75, $break = "\n", $cut = false);
-
-    /**
-     * Pad a string to a certain length with another string
-     *
-     * @param  string  $input
-     * @param  int $padLength
-     * @param  string  $padString
-     * @param  int $padType
-     * @return string
-     */
-    public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT);
-}
diff --git a/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php b/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
deleted file mode 100644
index f8670cc..0000000
--- a/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @deprecated
- */
-
-/**
- * Legacy purposes only, to prevent code that references it from breaking.
- */
-trigger_error('Polyfill autoload support (file library/Zend/Stdlib/compatibility/autoload.php) is no longer necessary; please remove your require statement referencing this file', E_USER_DEPRECATED);